From 57a4388e2defa2ba73b72a27061f2bc69c65a506 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 7 Jan 2023 15:48:50 -0500 Subject: [PATCH 0001/1181] Revert "Vulkan, OpenGL: Hook up storage buffer alignment code" This reverts commit 9e2997c4b6456031622602002924617690e32a13. --- src/video_core/buffer_cache/buffer_cache.h | 13 +++---------- src/video_core/renderer_opengl/gl_buffer_cache.h | 4 ---- src/video_core/renderer_opengl/gl_shader_cache.cpp | 1 - src/video_core/renderer_vulkan/vk_buffer_cache.cpp | 4 ---- src/video_core/renderer_vulkan/vk_buffer_cache.h | 2 -- .../renderer_vulkan/vk_pipeline_cache.cpp | 1 - 6 files changed, 3 insertions(+), 22 deletions(-) diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 627917ab6..06fd40851 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -1938,21 +1938,14 @@ typename BufferCache

::Binding BufferCache

::StorageBufferBinding(GPUVAddr s bool is_written) const { const GPUVAddr gpu_addr = gpu_memory->Read(ssbo_addr); const u32 size = gpu_memory->Read(ssbo_addr + 8); - const u32 alignment = runtime.GetStorageBufferAlignment(); - - const GPUVAddr aligned_gpu_addr = Common::AlignDown(gpu_addr, alignment); - const u32 aligned_size = - Common::AlignUp(static_cast(gpu_addr - aligned_gpu_addr) + size, alignment); - - const std::optional cpu_addr = gpu_memory->GpuToCpuAddress(aligned_gpu_addr); + const std::optional cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr); if (!cpu_addr || size == 0) { return NULL_BINDING; } - - const VAddr cpu_end = Common::AlignUp(*cpu_addr + aligned_size, Core::Memory::YUZU_PAGESIZE); + const VAddr cpu_end = Common::AlignUp(*cpu_addr + size, Core::Memory::YUZU_PAGESIZE); const Binding binding{ .cpu_addr = *cpu_addr, - .size = is_written ? aligned_size : static_cast(cpu_end - *cpu_addr), + .size = is_written ? size : static_cast(cpu_end - *cpu_addr), .buffer_id = BufferId{}, }; return binding; diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.h b/src/video_core/renderer_opengl/gl_buffer_cache.h index bb1962073..a8c3f8b67 100644 --- a/src/video_core/renderer_opengl/gl_buffer_cache.h +++ b/src/video_core/renderer_opengl/gl_buffer_cache.h @@ -160,10 +160,6 @@ public: return device.CanReportMemoryUsage(); } - u32 GetStorageBufferAlignment() const { - return static_cast(device.GetShaderStorageBufferAlignment()); - } - private: static constexpr std::array PABO_LUT{ GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV, GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV, diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index 7dd854e0f..9442193de 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -236,7 +236,6 @@ ShaderCache::ShaderCache(RasterizerOpenGL& rasterizer_, Core::Frontend::EmuWindo .needs_demote_reorder = device.IsAmd(), .support_snorm_render_buffer = false, .support_viewport_index_layer = device.HasVertexViewportLayer(), - .min_ssbo_alignment = static_cast(device.GetShaderStorageBufferAlignment()), .support_geometry_shader_passthrough = device.HasGeometryShaderPassthrough(), } { if (use_asynchronous_shaders) { diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp index 1cfb4c2ff..b0153a502 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp @@ -330,10 +330,6 @@ bool BufferCacheRuntime::CanReportMemoryUsage() const { return device.CanReportMemoryUsage(); } -u32 BufferCacheRuntime::GetStorageBufferAlignment() const { - return static_cast(device.GetStorageBufferAlignment()); -} - void BufferCacheRuntime::Finish() { scheduler.Finish(); } diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.h b/src/video_core/renderer_vulkan/vk_buffer_cache.h index 06539c733..183b33632 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.h +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h @@ -73,8 +73,6 @@ public: bool CanReportMemoryUsage() const; - u32 GetStorageBufferAlignment() const; - [[nodiscard]] StagingBufferRef UploadStagingBuffer(size_t size); [[nodiscard]] StagingBufferRef DownloadStagingBuffer(size_t size); diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index 7e69b11d8..0684cceed 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -344,7 +344,6 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, const Device& device driver_id == VK_DRIVER_ID_AMD_PROPRIETARY || driver_id == VK_DRIVER_ID_AMD_OPEN_SOURCE, .support_snorm_render_buffer = true, .support_viewport_index_layer = device.IsExtShaderViewportIndexLayerSupported(), - .min_ssbo_alignment = static_cast(device.GetStorageBufferAlignment()), .support_geometry_shader_passthrough = device.IsNvGeometryShaderPassthroughSupported(), }; From 505923f0f36fe5095c3fad7037ba1315b0cbad0e Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 7 Jan 2023 15:50:58 -0500 Subject: [PATCH 0002/1181] Revert "shader_recompiler: Align SSBO offsets to meet host requirements" This reverts commit 8804a4eb23e0c4f3e4bab03dee7c204bd38bf21e. --- .../frontend/maxwell/translate_program.cpp | 2 +- src/shader_recompiler/host_translate_info.h | 1 - .../ir_opt/global_memory_to_storage_buffer_pass.cpp | 13 ++++--------- src/shader_recompiler/ir_opt/passes.h | 2 +- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/shader_recompiler/frontend/maxwell/translate_program.cpp b/src/shader_recompiler/frontend/maxwell/translate_program.cpp index a3b99e24d..9dd3365a8 100644 --- a/src/shader_recompiler/frontend/maxwell/translate_program.cpp +++ b/src/shader_recompiler/frontend/maxwell/translate_program.cpp @@ -292,7 +292,7 @@ IR::Program TranslateProgram(ObjectPool& inst_pool, ObjectPool low_addr{TrackLowAddress(&inst)}) { @@ -416,10 +415,7 @@ IR::U32 StorageOffset(IR::Block& block, IR::Inst& inst, StorageBufferAddr buffer } // Subtract the least significant 32 bits from the guest offset. The result is the storage // buffer offset in bytes. - IR::U32 low_cbuf{ir.GetCbuf(ir.Imm32(buffer.index), ir.Imm32(buffer.offset))}; - - // Align the offset base to match the host alignment requirements - low_cbuf = ir.BitwiseAnd(low_cbuf, ir.Imm32(~(alignment - 1U))); + const IR::U32 low_cbuf{ir.GetCbuf(ir.Imm32(buffer.index), ir.Imm32(buffer.offset))}; return ir.ISub(offset, low_cbuf); } @@ -514,7 +510,7 @@ void Replace(IR::Block& block, IR::Inst& inst, const IR::U32& storage_index, } } // Anonymous namespace -void GlobalMemoryToStorageBufferPass(IR::Program& program, const HostTranslateInfo& host_info) { +void GlobalMemoryToStorageBufferPass(IR::Program& program) { StorageInfo info; for (IR::Block* const block : program.post_order_blocks) { for (IR::Inst& inst : block->Instructions()) { @@ -538,8 +534,7 @@ void GlobalMemoryToStorageBufferPass(IR::Program& program, const HostTranslateIn const IR::U32 index{IR::Value{static_cast(info.set.index_of(it))}}; IR::Block* const block{storage_inst.block}; IR::Inst* const inst{storage_inst.inst}; - const IR::U32 offset{ - StorageOffset(*block, *inst, storage_buffer, host_info.min_ssbo_alignment)}; + const IR::U32 offset{StorageOffset(*block, *inst, storage_buffer)}; Replace(*block, *inst, index, offset); } } diff --git a/src/shader_recompiler/ir_opt/passes.h b/src/shader_recompiler/ir_opt/passes.h index 4ffad1172..1f8f2ba95 100644 --- a/src/shader_recompiler/ir_opt/passes.h +++ b/src/shader_recompiler/ir_opt/passes.h @@ -15,7 +15,7 @@ namespace Shader::Optimization { void CollectShaderInfoPass(Environment& env, IR::Program& program); void ConstantPropagationPass(Environment& env, IR::Program& program); void DeadCodeEliminationPass(IR::Program& program); -void GlobalMemoryToStorageBufferPass(IR::Program& program, const HostTranslateInfo& host_info); +void GlobalMemoryToStorageBufferPass(IR::Program& program); void IdentityRemovalPass(IR::Program& program); void LowerFp16ToFp32(IR::Program& program); void LowerInt64ToInt32(IR::Program& program); From 4653effad8e45667752a6e7cc8413e5e94a3f6c0 Mon Sep 17 00:00:00 2001 From: Jonas Gutenschwager Date: Thu, 19 Jan 2023 15:13:23 +0100 Subject: [PATCH 0003/1181] add volume quicksetting with volume slider --- src/yuzu/main.cpp | 105 +++++++++++++++++++++++++++++++++++----------- src/yuzu/main.h | 9 ++++ 2 files changed, 90 insertions(+), 24 deletions(-) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 571eacf9f..b85541619 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -957,6 +957,38 @@ void GMainWindow::InitializeWidgets() { tas_label->setFocusPolicy(Qt::NoFocus); statusBar()->insertPermanentWidget(0, tas_label); + volume_popup = new QWidget(this); + volume_popup->setWindowFlags(Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint | Qt::Popup); + volume_popup->setLayout(new QVBoxLayout()); + volume_popup->setMinimumWidth(200); + + volume_slider = new QSlider(Qt::Horizontal); + volume_slider->setObjectName(QStringLiteral("volume_slider")); + volume_slider->setMaximum(200); + volume_slider->setPageStep(5); + connect(volume_slider, &QSlider::valueChanged, this, [this](int percentage) { + Settings::values.audio_muted = false; + const auto volume = static_cast(percentage); + Settings::values.volume.SetValue(volume); + UpdateVolumeUI(); + }); + volume_popup->layout()->addWidget(volume_slider); + + volume_button = new QPushButton(); + volume_button->setObjectName(QStringLiteral("TogglableStatusBarButton")); + volume_button->setFocusPolicy(Qt::NoFocus); + volume_button->setCheckable(true); + UpdateVolumeUI(); + connect(volume_button, &QPushButton::clicked, this, [&] { + UpdateVolumeUI(); + volume_popup->setVisible(!volume_popup->isVisible()); + QRect rect = volume_button->geometry(); + QPoint bottomLeft = statusBar()->mapToGlobal(rect.topLeft()); + bottomLeft.setY(bottomLeft.y() - volume_popup->geometry().height()); + volume_popup->setGeometry(QRect(bottomLeft, QSize(rect.width(), rect.height()))); + }); + statusBar()->insertPermanentWidget(0, volume_button); + // setup AA button aa_status_button = new QPushButton(); aa_status_button->setObjectName(QStringLiteral("TogglableStatusBarButton")); @@ -1124,30 +1156,9 @@ void GMainWindow::InitializeHotkeys() { &GMainWindow::OnToggleAdaptingFilter); connect_shortcut(QStringLiteral("Change Docked Mode"), &GMainWindow::OnToggleDockedMode); connect_shortcut(QStringLiteral("Change GPU Accuracy"), &GMainWindow::OnToggleGpuAccuracy); - connect_shortcut(QStringLiteral("Audio Mute/Unmute"), - [] { Settings::values.audio_muted = !Settings::values.audio_muted; }); - connect_shortcut(QStringLiteral("Audio Volume Down"), [] { - const auto current_volume = static_cast(Settings::values.volume.GetValue()); - int step = 5; - if (current_volume <= 30) { - step = 2; - } - if (current_volume <= 6) { - step = 1; - } - Settings::values.volume.SetValue(std::max(current_volume - step, 0)); - }); - connect_shortcut(QStringLiteral("Audio Volume Up"), [] { - const auto current_volume = static_cast(Settings::values.volume.GetValue()); - int step = 5; - if (current_volume < 30) { - step = 2; - } - if (current_volume < 6) { - step = 1; - } - Settings::values.volume.SetValue(current_volume + step); - }); + connect_shortcut(QStringLiteral("Audio Mute/Unmute"), &GMainWindow::OnMute); + connect_shortcut(QStringLiteral("Audio Volume Down"), &GMainWindow::OnDecreaseVolume); + connect_shortcut(QStringLiteral("Audio Volume Up"), &GMainWindow::OnIncreaseVolume); connect_shortcut(QStringLiteral("Toggle Framerate Limit"), [] { Settings::values.use_speed_limit.SetValue(!Settings::values.use_speed_limit.GetValue()); }); @@ -3462,6 +3473,39 @@ void GMainWindow::OnToggleGpuAccuracy() { UpdateGPUAccuracyButton(); } +void GMainWindow::OnMute() { + Settings::values.audio_muted = !Settings::values.audio_muted; + UpdateVolumeUI(); +} + +void GMainWindow::OnDecreaseVolume() { + Settings::values.audio_muted = false; + const auto current_volume = static_cast(Settings::values.volume.GetValue()); + int step = 5; + if (current_volume <= 30) { + step = 2; + } + if (current_volume <= 6) { + step = 1; + } + Settings::values.volume.SetValue(std::max(current_volume - step, 0)); + UpdateVolumeUI(); +} + +void GMainWindow::OnIncreaseVolume() { + Settings::values.audio_muted = false; + const auto current_volume = static_cast(Settings::values.volume.GetValue()); + int step = 5; + if (current_volume < 30) { + step = 2; + } + if (current_volume < 6) { + step = 1; + } + Settings::values.volume.SetValue(current_volume + step); + UpdateVolumeUI(); +} + void GMainWindow::OnToggleAdaptingFilter() { auto filter = Settings::values.scaling_filter.GetValue(); if (filter == Settings::ScalingFilter::LastFilter) { @@ -3924,6 +3968,18 @@ void GMainWindow::UpdateAAText() { } } +void GMainWindow::UpdateVolumeUI() { + const auto volume_value = static_cast(Settings::values.volume.GetValue()); + volume_slider->setValue(volume_value); + if (Settings::values.audio_muted) { + volume_button->setChecked(false); + volume_button->setText(tr("VOLUME: MUTE", "Volume percentage (e.g. 50%)")); + } else { + volume_button->setChecked(true); + volume_button->setText(tr("VOLUME: %1%", "Volume percentage (e.g. 50%)").arg(volume_value)); + } +} + void GMainWindow::UpdateStatusButtons() { renderer_status_button->setChecked(Settings::values.renderer_backend.GetValue() == Settings::RendererBackend::Vulkan); @@ -3932,6 +3988,7 @@ void GMainWindow::UpdateStatusButtons() { UpdateDockedButton(); UpdateFilterText(); UpdateAAText(); + UpdateVolumeUI(); } void GMainWindow::UpdateUISettings() { diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 0f61abc7a..a23b373a5 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -37,6 +37,8 @@ class QLabel; class MultiplayerState; class QPushButton; class QProgressDialog; +class QSlider; +class QHBoxLayout; class WaitTreeWidget; enum class GameListOpenTarget; enum class GameListRemoveTarget; @@ -312,6 +314,9 @@ private slots: void OnMenuRecentFile(); void OnConfigure(); void OnConfigureTas(); + void OnDecreaseVolume(); + void OnIncreaseVolume(); + void OnMute(); void OnTasStartStop(); void OnTasRecord(); void OnTasReset(); @@ -364,6 +369,7 @@ private: void UpdateAPIText(); void UpdateFilterText(); void UpdateAAText(); + void UpdateVolumeUI(); void UpdateStatusBar(); void UpdateGPUAccuracyButton(); void UpdateStatusButtons(); @@ -412,6 +418,9 @@ private: QPushButton* dock_status_button = nullptr; QPushButton* filter_status_button = nullptr; QPushButton* aa_status_button = nullptr; + QPushButton* volume_button = nullptr; + QWidget* volume_popup = nullptr; + QSlider* volume_slider = nullptr; QTimer status_bar_update_timer; std::unique_ptr config; From a84ad180e8e16ed04de5551b2f72349e2ec4d215 Mon Sep 17 00:00:00 2001 From: EBADBEEF Date: Sun, 22 Jan 2023 23:36:40 -0800 Subject: [PATCH 0004/1181] qt: add option to disable controller applet - add checkbox to disable the controller applet UI - when controller applet is disabled, use the yuzu-cmd fallback controller applet that applies controller config based on rules - See https://github.com/yuzu-emu/yuzu/issues/8552 for some discussion --- src/yuzu/configuration/config.cpp | 2 ++ src/yuzu/configuration/configure_general.cpp | 4 ++++ src/yuzu/configuration/configure_general.ui | 7 +++++++ src/yuzu/main.cpp | 1 + src/yuzu/uisettings.h | 2 ++ 5 files changed, 16 insertions(+) diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index fd3bb30e1..1f1ef658c 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -836,6 +836,7 @@ void Config::ReadUIValues() { ReadBasicSetting(UISettings::values.pause_when_in_background); ReadBasicSetting(UISettings::values.mute_when_in_background); ReadBasicSetting(UISettings::values.hide_mouse); + ReadBasicSetting(UISettings::values.controller_applet_disabled); ReadBasicSetting(UISettings::values.disable_web_applet); qt_config->endGroup(); @@ -1456,6 +1457,7 @@ void Config::SaveUIValues() { WriteBasicSetting(UISettings::values.pause_when_in_background); WriteBasicSetting(UISettings::values.mute_when_in_background); WriteBasicSetting(UISettings::values.hide_mouse); + WriteBasicSetting(UISettings::values.controller_applet_disabled); WriteBasicSetting(UISettings::values.disable_web_applet); qt_config->endGroup(); diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index 7ade01ba6..7783f362a 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp @@ -44,6 +44,8 @@ void ConfigureGeneral::SetConfiguration() { ui->toggle_background_pause->setChecked(UISettings::values.pause_when_in_background.GetValue()); ui->toggle_background_mute->setChecked(UISettings::values.mute_when_in_background.GetValue()); ui->toggle_hide_mouse->setChecked(UISettings::values.hide_mouse.GetValue()); + ui->toggle_controller_applet_disabled->setEnabled(runtime_lock); + ui->toggle_controller_applet_disabled->setChecked(UISettings::values.controller_applet_disabled.GetValue()); ui->toggle_speed_limit->setChecked(Settings::values.use_speed_limit.GetValue()); ui->speed_limit->setValue(Settings::values.speed_limit.GetValue()); @@ -90,6 +92,7 @@ void ConfigureGeneral::ApplyConfiguration() { UISettings::values.pause_when_in_background = ui->toggle_background_pause->isChecked(); UISettings::values.mute_when_in_background = ui->toggle_background_mute->isChecked(); UISettings::values.hide_mouse = ui->toggle_hide_mouse->isChecked(); + UISettings::values.controller_applet_disabled = ui->toggle_controller_applet_disabled->isChecked(); // Guard if during game and set to game-specific value if (Settings::values.use_speed_limit.UsingGlobal()) { @@ -136,6 +139,7 @@ void ConfigureGeneral::SetupPerGameUI() { ui->toggle_user_on_boot->setVisible(false); ui->toggle_background_pause->setVisible(false); ui->toggle_hide_mouse->setVisible(false); + ui->toggle_controller_applet_disabled->setVisible(false); ui->button_reset_defaults->setVisible(false); diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui index 5b90b1109..2fa8324fb 100644 --- a/src/yuzu/configuration/configure_general.ui +++ b/src/yuzu/configuration/configure_general.ui @@ -103,6 +103,13 @@ + + + + Disable controller applet + + + diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 571eacf9f..e57e02652 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1562,6 +1562,7 @@ bool GMainWindow::LoadROM(const QString& filename, u64 program_id, std::size_t p system->SetAppletFrontendSet({ std::make_unique(*this), // Amiibo Settings + (UISettings::values.controller_applet_disabled.GetValue() == true) ? nullptr : std::make_unique(*this), // Controller Selector std::make_unique(*this), // Error Display nullptr, // Mii Editor diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h index db43b7033..20a517d34 100644 --- a/src/yuzu/uisettings.h +++ b/src/yuzu/uisettings.h @@ -77,6 +77,8 @@ struct Values { Settings::Setting pause_when_in_background{false, "pauseWhenInBackground"}; Settings::Setting mute_when_in_background{false, "muteWhenInBackground"}; Settings::Setting hide_mouse{true, "hideInactiveMouse"}; + Settings::Setting controller_applet_disabled{false, "disableControllerApplet"}; + // Set when Vulkan is known to crash the application bool has_broken_vulkan = false; From 6a1b089a501aca93cd275d853ef8f34a62b904c5 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 25 Jan 2023 21:16:04 -0500 Subject: [PATCH 0005/1181] main: Enable High DPI fixes for Qt >= 5.14 This uses Qt's new high DPI application attributes for scaling the current window. However, these aren't perfect as scaling with non integer scales will cause artifacts in UI, icons and other elements. Therefore, we use a heuristic to select an appropriate integer scale value depending on the current screen resolution and applies this to the application. --- src/yuzu/main.cpp | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 62aaf41bf..82e4adfe0 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -4400,6 +4400,46 @@ void GMainWindow::changeEvent(QEvent* event) { #undef main #endif +static void SetHighDPIAttributes() { + // Create a temporary QApplication. + int temp_argc = 0; + char** temp_argv = nullptr; + QApplication temp{temp_argc, temp_argv}; + + // Get the current screen geometry. + const QScreen* primary_screen = QGuiApplication::primaryScreen(); + if (primary_screen == nullptr) { + return; + } + + const QRect screen_rect = primary_screen->geometry(); + const int real_width = screen_rect.width(); + const int real_height = screen_rect.height(); + const float real_ratio = primary_screen->logicalDotsPerInch() / 96.0f; + + // Recommended minimum width and height for proper window fit. + // Any screen with a lower resolution than this will still have a scale of 1. + constexpr float minimum_width = 1350.0f; + constexpr float minimum_height = 900.0f; + + const float width_ratio = std::max(1.0f, real_width / minimum_width); + const float height_ratio = std::max(1.0f, real_height / minimum_height); + + // Get the lower of the 2 ratios and truncate, this is the maximum integer scale. + const float max_ratio = std::trunc(std::min(width_ratio, height_ratio)); + + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); + + if (max_ratio > real_ratio) { + QApplication::setHighDpiScaleFactorRoundingPolicy( + Qt::HighDpiScaleFactorRoundingPolicy::Round); + } else { + QApplication::setHighDpiScaleFactorRoundingPolicy( + Qt::HighDpiScaleFactorRoundingPolicy::Floor); + } +} + int main(int argc, char* argv[]) { std::unique_ptr config = std::make_unique(); bool has_broken_vulkan = false; @@ -4455,6 +4495,8 @@ int main(int argc, char* argv[]) { } #endif + SetHighDPIAttributes(); + #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // Disables the "?" button on all dialogs. Disabled by default on Qt6. QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton); @@ -4462,6 +4504,7 @@ int main(int argc, char* argv[]) { // Enables the core to make the qt created contexts current on std::threads QCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity); + QApplication app(argc, argv); #ifdef _WIN32 From 5be85c556ed05cd9d751fb7b3f8a331800ee573d Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 25 Jan 2023 21:16:04 -0500 Subject: [PATCH 0006/1181] main: Use passthrough scaling for non-windows OSes They should be better than windows when handling fractional scaling ratios. --- src/yuzu/main.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 82e4adfe0..53249426c 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -4401,6 +4401,10 @@ void GMainWindow::changeEvent(QEvent* event) { #endif static void SetHighDPIAttributes() { +#ifdef _WIN32 + // For Windows, we want to avoid scaling artifacts on fractional scaling ratios. + // This is done by setting the optimal scaling policy for the primary screen. + // Create a temporary QApplication. int temp_argc = 0; char** temp_argv = nullptr; @@ -4428,9 +4432,6 @@ static void SetHighDPIAttributes() { // Get the lower of the 2 ratios and truncate, this is the maximum integer scale. const float max_ratio = std::trunc(std::min(width_ratio, height_ratio)); - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - if (max_ratio > real_ratio) { QApplication::setHighDpiScaleFactorRoundingPolicy( Qt::HighDpiScaleFactorRoundingPolicy::Round); @@ -4438,6 +4439,14 @@ static void SetHighDPIAttributes() { QApplication::setHighDpiScaleFactorRoundingPolicy( Qt::HighDpiScaleFactorRoundingPolicy::Floor); } +#else + // Other OSes should be better than Windows at fractional scaling. + QApplication::setHighDpiScaleFactorRoundingPolicy( + Qt::HighDpiScaleFactorRoundingPolicy::PassThrough); +#endif + + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); } int main(int argc, char* argv[]) { From ad6cec71ecd61aa2533d9efa89b68837516f8464 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 25 Jan 2023 21:16:05 -0500 Subject: [PATCH 0007/1181] main: Convert to device independent coordinates for scaling devicePixelRatioF() returns the scaling ratio when high dpi scaling is enabled. When high dpi scaling is enabled, the raw screen coordinate system is scaled to device independent coordinates. --- src/yuzu/applets/qt_software_keyboard.cpp | 2 +- src/yuzu/main.cpp | 17 +++++++++++------ src/yuzu/util/overlay_dialog.cpp | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/yuzu/applets/qt_software_keyboard.cpp b/src/yuzu/applets/qt_software_keyboard.cpp index 734b0ea40..4ae49506d 100644 --- a/src/yuzu/applets/qt_software_keyboard.cpp +++ b/src/yuzu/applets/qt_software_keyboard.cpp @@ -575,7 +575,7 @@ void QtSoftwareKeyboardDialog::MoveAndResizeWindow(QPoint pos, QSize size) { QDialog::resize(size); // High DPI - const float dpi_scale = qApp->screenAt(pos)->logicalDotsPerInch() / 96.0f; + const float dpi_scale = screen()->logicalDotsPerInch() / 96.0f; RescaleKeyboardElements(size.width(), size.height(), dpi_scale); } diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 53249426c..ee8ea82fd 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -680,8 +680,10 @@ void GMainWindow::SoftwareKeyboardShowNormal() { const auto y = layout.screen.top; const auto w = layout.screen.GetWidth(); const auto h = layout.screen.GetHeight(); + const auto scale_ratio = devicePixelRatioF(); - software_keyboard->ShowNormalKeyboard(render_window->mapToGlobal(QPoint(x, y)), QSize(w, h)); + software_keyboard->ShowNormalKeyboard(render_window->mapToGlobal(QPoint(x, y) / scale_ratio), + QSize(w, h) / scale_ratio); } void GMainWindow::SoftwareKeyboardShowTextCheck( @@ -714,9 +716,11 @@ void GMainWindow::SoftwareKeyboardShowInline( (1.0f - appear_parameters.key_top_scale_y)))); const auto w = static_cast(layout.screen.GetWidth() * appear_parameters.key_top_scale_x); const auto h = static_cast(layout.screen.GetHeight() * appear_parameters.key_top_scale_y); + const auto scale_ratio = devicePixelRatioF(); software_keyboard->ShowInlineKeyboard(std::move(appear_parameters), - render_window->mapToGlobal(QPoint(x, y)), QSize(w, h)); + render_window->mapToGlobal(QPoint(x, y) / scale_ratio), + QSize(w, h) / scale_ratio); } void GMainWindow::SoftwareKeyboardHideInline() { @@ -796,10 +800,11 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url, } const auto& layout = render_window->GetFramebufferLayout(); - web_browser_view.resize(layout.screen.GetWidth(), layout.screen.GetHeight()); - web_browser_view.move(layout.screen.left, layout.screen.top + menuBar()->height()); - web_browser_view.setZoomFactor(static_cast(layout.screen.GetWidth()) / - static_cast(Layout::ScreenUndocked::Width)); + const auto scale_ratio = devicePixelRatioF(); + web_browser_view.resize(layout.screen.GetWidth() / scale_ratio, + layout.screen.GetHeight() / scale_ratio); + web_browser_view.move(layout.screen.left / scale_ratio, + (layout.screen.top / scale_ratio) + menuBar()->height()); web_browser_view.setFocus(); web_browser_view.show(); diff --git a/src/yuzu/util/overlay_dialog.cpp b/src/yuzu/util/overlay_dialog.cpp index 796f5bf41..ee35a3e15 100644 --- a/src/yuzu/util/overlay_dialog.cpp +++ b/src/yuzu/util/overlay_dialog.cpp @@ -163,7 +163,7 @@ void OverlayDialog::MoveAndResizeWindow() { const auto height = static_cast(parentWidget()->height()); // High DPI - const float dpi_scale = parentWidget()->windowHandle()->screen()->logicalDotsPerInch() / 96.0f; + const float dpi_scale = screen()->logicalDotsPerInch() / 96.0f; const auto title_text_font_size = BASE_TITLE_FONT_SIZE * (height / BASE_HEIGHT) / dpi_scale; const auto body_text_font_size = From 08feba2b5656828059206ac51cfa71b273be794f Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Sun, 29 Jan 2023 13:31:47 -0500 Subject: [PATCH 0008/1181] emit_glsl_image: Implement TXQ with MSAA textures Also fixes for texture buffers, which do not have mips eithers. --- .../backend/glsl/emit_glsl_image.cpp | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_image.cpp b/src/shader_recompiler/backend/glsl/emit_glsl_image.cpp index 4be2c25ec..f335c8af0 100644 --- a/src/shader_recompiler/backend/glsl/emit_glsl_image.cpp +++ b/src/shader_recompiler/backend/glsl/emit_glsl_image.cpp @@ -25,6 +25,13 @@ std::string Image(EmitContext& ctx, const IR::TextureInstInfo& info, const IR::V return fmt::format("img{}{}", def.binding, index_offset); } +bool IsTextureMsaa(EmitContext& ctx, const IR::TextureInstInfo& info) { + if (info.type == TextureType::Buffer) { + return false; + } + return ctx.info.texture_descriptors.at(info.descriptor_index).is_multisample; +} + std::string CastToIntVec(std::string_view value, const IR::TextureInstInfo& info) { switch (info.type) { case TextureType::Color1D: @@ -463,26 +470,33 @@ void EmitImageQueryDimensions(EmitContext& ctx, IR::Inst& inst, const IR::Value& std::string_view lod, const IR::Value& skip_mips_val) { const auto info{inst.Flags()}; const auto texture{Texture(ctx, info, index)}; + const bool is_msaa{IsTextureMsaa(ctx, info)}; const bool skip_mips{skip_mips_val.U1()}; - const auto mips{ - [&] { return skip_mips ? "0u" : fmt::format("uint(textureQueryLevels({}))", texture); }}; + const auto mips{skip_mips ? "0u" : fmt::format("uint(textureQueryLevels({}))", texture)}; + if (is_msaa && !skip_mips) { + throw NotImplementedException("EmitImageQueryDimensions MSAA QueryLevels"); + } + if (info.type == TextureType::Buffer && !skip_mips) { + throw NotImplementedException("EmitImageQueryDimensions TextureType::Buffer QueryLevels"); + } + const bool uses_lod{!is_msaa && info.type != TextureType::Buffer}; + const auto lod_str{uses_lod ? fmt::format(",int({})", lod) : ""}; switch (info.type) { case TextureType::Color1D: - return ctx.AddU32x4("{}=uvec4(uint(textureSize({},int({}))),0u,0u,{});", inst, texture, lod, - mips()); + return ctx.AddU32x4("{}=uvec4(uint(textureSize({}{})),0u,0u,{});", inst, texture, lod_str, + mips); case TextureType::ColorArray1D: case TextureType::Color2D: case TextureType::ColorCube: case TextureType::Color2DRect: - return ctx.AddU32x4("{}=uvec4(uvec2(textureSize({},int({}))),0u,{});", inst, texture, lod, - mips()); + return ctx.AddU32x4("{}=uvec4(uvec2(textureSize({}{})),0u,{});", inst, texture, lod_str, + mips); case TextureType::ColorArray2D: case TextureType::Color3D: case TextureType::ColorArrayCube: - return ctx.AddU32x4("{}=uvec4(uvec3(textureSize({},int({}))),{});", inst, texture, lod, - mips()); + return ctx.AddU32x4("{}=uvec4(uvec3(textureSize({}{})),{});", inst, texture, lod_str, mips); case TextureType::Buffer: - throw NotImplementedException("EmitImageQueryDimensions Texture buffers"); + return ctx.AddU32x4("{}=uvec4(uint(textureSize({})),0u,0u,{});", inst, texture, mips); } throw LogicError("Unspecified image type {}", info.type.Value()); } From a1d8306bfdd24edd5c61761b79e72be32c5aaff4 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Sun, 29 Jan 2023 13:42:34 -0500 Subject: [PATCH 0009/1181] emit_glasm_image: Fix TXQ with MSAA textures --- .../backend/glasm/emit_glasm_image.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/shader_recompiler/backend/glasm/emit_glasm_image.cpp b/src/shader_recompiler/backend/glasm/emit_glasm_image.cpp index b7bc11416..85ee27333 100644 --- a/src/shader_recompiler/backend/glasm/emit_glasm_image.cpp +++ b/src/shader_recompiler/backend/glasm/emit_glasm_image.cpp @@ -59,6 +59,13 @@ std::string Image(EmitContext& ctx, IR::TextureInstInfo info, } } +bool IsTextureMsaa(EmitContext& ctx, const IR::TextureInstInfo& info) { + if (info.type == TextureType::Buffer) { + return false; + } + return ctx.info.texture_descriptors.at(info.descriptor_index).is_multisample; +} + std::string_view TextureType(IR::TextureInstInfo info, bool is_ms = false) { if (info.is_depth) { switch (info.type) { @@ -535,7 +542,8 @@ void EmitImageQueryDimensions(EmitContext& ctx, IR::Inst& inst, const IR::Value& ScalarS32 lod, [[maybe_unused]] const IR::Value& skip_mips) { const auto info{inst.Flags()}; const std::string texture{Texture(ctx, info, index)}; - const std::string_view type{TextureType(info)}; + const bool is_msaa{IsTextureMsaa(ctx, info)}; + const std::string_view type{TextureType(info, is_msaa)}; ctx.Add("TXQ {},{},{},{};", inst, lod, texture, type); } From a63e17566ab32ab05d784f465ef38a7f3f3db919 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Sun, 29 Jan 2023 13:47:30 -0500 Subject: [PATCH 0010/1181] spirv: Fix TXQ with MSAA textures --- .../backend/spirv/emit_spirv_image.cpp | 25 +++++++++++++------ .../backend/spirv/spirv_emit_context.cpp | 1 + .../backend/spirv/spirv_emit_context.h | 1 + 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp index 3b969d915..02073c420 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp @@ -201,6 +201,13 @@ Id Image(EmitContext& ctx, const IR::Value& index, IR::TextureInstInfo info) { } } +bool IsTextureMsaa(EmitContext& ctx, const IR::TextureInstInfo& info) { + if (info.type == TextureType::Buffer) { + return false; + } + return ctx.textures.at(info.descriptor_index).is_multisample; +} + Id Decorate(EmitContext& ctx, IR::Inst* inst, Id sample) { const auto info{inst->Flags()}; if (info.relaxed_precision != 0) { @@ -452,24 +459,26 @@ Id EmitImageQueryDimensions(EmitContext& ctx, IR::Inst* inst, const IR::Value& i const Id zero{ctx.u32_zero_value}; const bool skip_mips{skip_mips_val.U1()}; const auto mips{[&] { return skip_mips ? zero : ctx.OpImageQueryLevels(ctx.U32[1], image); }}; + const bool is_msaa{IsTextureMsaa(ctx, info)}; + const bool uses_lod{!is_msaa && info.type != TextureType::Buffer}; + const auto query{[&](Id type) { + return uses_lod ? ctx.OpImageQuerySizeLod(type, image, lod) + : ctx.OpImageQuerySize(type, image); + }}; switch (info.type) { case TextureType::Color1D: - return ctx.OpCompositeConstruct(ctx.U32[4], ctx.OpImageQuerySizeLod(ctx.U32[1], image, lod), - zero, zero, mips()); + return ctx.OpCompositeConstruct(ctx.U32[4], query(ctx.U32[1]), zero, zero, mips()); case TextureType::ColorArray1D: case TextureType::Color2D: case TextureType::ColorCube: case TextureType::Color2DRect: - return ctx.OpCompositeConstruct(ctx.U32[4], ctx.OpImageQuerySizeLod(ctx.U32[2], image, lod), - zero, mips()); + return ctx.OpCompositeConstruct(ctx.U32[4], query(ctx.U32[2]), zero, mips()); case TextureType::ColorArray2D: case TextureType::Color3D: case TextureType::ColorArrayCube: - return ctx.OpCompositeConstruct(ctx.U32[4], ctx.OpImageQuerySizeLod(ctx.U32[3], image, lod), - mips()); + return ctx.OpCompositeConstruct(ctx.U32[4], query(ctx.U32[3]), mips()); case TextureType::Buffer: - return ctx.OpCompositeConstruct(ctx.U32[4], ctx.OpImageQuerySize(ctx.U32[1], image), zero, - zero, mips()); + return ctx.OpCompositeConstruct(ctx.U32[4], query(ctx.U32[1]), zero, zero, mips()); } throw LogicError("Unspecified image type {}", info.type.Value()); } diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp index 3b97721e1..d48d4860e 100644 --- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp +++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp @@ -1288,6 +1288,7 @@ void EmitContext::DefineTextures(const Info& info, u32& binding, u32& scaling_in .pointer_type = pointer_type, .image_type = image_type, .count = desc.count, + .is_multisample = desc.is_multisample, }); if (profile.supported_spirv >= 0x00010400) { interfaces.push_back(id); diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.h b/src/shader_recompiler/backend/spirv/spirv_emit_context.h index dbc5c55b9..768a4fbb5 100644 --- a/src/shader_recompiler/backend/spirv/spirv_emit_context.h +++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.h @@ -35,6 +35,7 @@ struct TextureDefinition { Id pointer_type; Id image_type; u32 count; + bool is_multisample; }; struct TextureBufferDefinition { From 01eeda74a65611b833de871a188db30a12f51fa3 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Sun, 29 Jan 2023 20:26:49 -0500 Subject: [PATCH 0011/1181] gl_graphics_pipeline: Force context flush when loading shader cache --- src/video_core/renderer_opengl/gl_graphics_pipeline.cpp | 7 ++++--- src/video_core/renderer_opengl/gl_graphics_pipeline.h | 2 +- src/video_core/renderer_opengl/gl_shader_cache.cpp | 9 +++++---- src/video_core/renderer_opengl/gl_shader_cache.h | 3 ++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp index c115dabe1..29491e762 100644 --- a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp +++ b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp @@ -176,7 +176,7 @@ GraphicsPipeline::GraphicsPipeline(const Device& device, TextureCache& texture_c std::array sources, std::array, 5> sources_spirv, const std::array& infos, - const GraphicsPipelineKey& key_) + const GraphicsPipelineKey& key_, bool force_context_flush) : texture_cache{texture_cache_}, buffer_cache{buffer_cache_}, program_manager{program_manager_}, state_tracker{state_tracker_}, key{key_} { if (shader_notify) { @@ -231,7 +231,8 @@ GraphicsPipeline::GraphicsPipeline(const Device& device, TextureCache& texture_c const bool in_parallel = thread_worker != nullptr; const auto backend = device.GetShaderBackend(); auto func{[this, sources = std::move(sources), sources_spirv = std::move(sources_spirv), - shader_notify, backend, in_parallel](ShaderContext::Context*) mutable { + shader_notify, backend, in_parallel, + force_context_flush](ShaderContext::Context*) mutable { for (size_t stage = 0; stage < 5; ++stage) { switch (backend) { case Settings::ShaderBackend::GLSL: @@ -251,7 +252,7 @@ GraphicsPipeline::GraphicsPipeline(const Device& device, TextureCache& texture_c break; } } - if (in_parallel) { + if (force_context_flush || in_parallel) { std::scoped_lock lock{built_mutex}; built_fence.Create(); // Flush this context to ensure compilation commands and fence are in the GPU pipe. diff --git a/src/video_core/renderer_opengl/gl_graphics_pipeline.h b/src/video_core/renderer_opengl/gl_graphics_pipeline.h index 1c06b3655..7bab3be0a 100644 --- a/src/video_core/renderer_opengl/gl_graphics_pipeline.h +++ b/src/video_core/renderer_opengl/gl_graphics_pipeline.h @@ -78,7 +78,7 @@ public: std::array sources, std::array, 5> sources_spirv, const std::array& infos, - const GraphicsPipelineKey& key_); + const GraphicsPipelineKey& key_, bool force_context_flush = false); void Configure(bool is_indexed) { configure_func(this, is_indexed); diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index 7dd854e0f..15812b678 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -307,7 +307,7 @@ void ShaderCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading, env_ptrs.push_back(&env); } ctx->pools.ReleaseContents(); - auto pipeline{CreateGraphicsPipeline(ctx->pools, key, MakeSpan(env_ptrs), false)}; + auto pipeline{CreateGraphicsPipeline(ctx->pools, key, MakeSpan(env_ptrs), false, true)}; std::scoped_lock lock{state.mutex}; if (pipeline) { graphics_cache.emplace(key, std::move(pipeline)); @@ -439,7 +439,8 @@ std::unique_ptr ShaderCache::CreateGraphicsPipeline() { std::unique_ptr ShaderCache::CreateGraphicsPipeline( ShaderContext::ShaderPools& pools, const GraphicsPipelineKey& key, - std::span envs, bool build_in_parallel) try { + std::span envs, bool use_shader_workers, + bool force_context_flush) try { LOG_INFO(Render_OpenGL, "0x{:016x}", key.Hash()); size_t env_index{}; u32 total_storage_buffers{}; @@ -531,10 +532,10 @@ std::unique_ptr ShaderCache::CreateGraphicsPipeline( } previous_program = &program; } - auto* const thread_worker{build_in_parallel ? workers.get() : nullptr}; + auto* const thread_worker{use_shader_workers ? workers.get() : nullptr}; return std::make_unique(device, texture_cache, buffer_cache, program_manager, state_tracker, thread_worker, &shader_notify, sources, - sources_spirv, infos, key); + sources_spirv, infos, key, force_context_flush); } catch (Shader::Exception& exception) { LOG_ERROR(Render_OpenGL, "{}", exception.what()); diff --git a/src/video_core/renderer_opengl/gl_shader_cache.h b/src/video_core/renderer_opengl/gl_shader_cache.h index f82420592..50f610cd0 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.h +++ b/src/video_core/renderer_opengl/gl_shader_cache.h @@ -50,7 +50,8 @@ private: std::unique_ptr CreateGraphicsPipeline( ShaderContext::ShaderPools& pools, const GraphicsPipelineKey& key, - std::span envs, bool build_in_parallel); + std::span envs, bool use_shader_workers, + bool force_context_flush = false); std::unique_ptr CreateComputePipeline(const ComputePipelineKey& key, const VideoCommon::ShaderInfo* shader); From 720ff380978e4e353ec878953c261b3a1b6451d7 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Sun, 29 Jan 2023 21:04:46 -0500 Subject: [PATCH 0012/1181] gl_compute_pipeline: Force context flush when loading shader cache --- .../renderer_opengl/gl_compute_pipeline.cpp | 23 ++++++++++++++++++- .../renderer_opengl/gl_compute_pipeline.h | 10 +++++++- .../renderer_opengl/gl_shader_cache.cpp | 8 +++---- .../renderer_opengl/gl_shader_cache.h | 3 ++- 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp b/src/video_core/renderer_opengl/gl_compute_pipeline.cpp index 26d066004..1a0cea9b7 100644 --- a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp +++ b/src/video_core/renderer_opengl/gl_compute_pipeline.cpp @@ -30,7 +30,7 @@ bool ComputePipelineKey::operator==(const ComputePipelineKey& rhs) const noexcep ComputePipeline::ComputePipeline(const Device& device, TextureCache& texture_cache_, BufferCache& buffer_cache_, ProgramManager& program_manager_, const Shader::Info& info_, std::string code, - std::vector code_v) + std::vector code_v, bool force_context_flush) : texture_cache{texture_cache_}, buffer_cache{buffer_cache_}, program_manager{program_manager_}, info{info_} { switch (device.GetShaderBackend()) { @@ -63,6 +63,15 @@ ComputePipeline::ComputePipeline(const Device& device, TextureCache& texture_cac writes_global_memory = !use_storage_buffers && std::ranges::any_of(info.storage_buffers_descriptors, [](const auto& desc) { return desc.is_written; }); + if (force_context_flush) { + std::scoped_lock lock{built_mutex}; + built_fence.Create(); + // Flush this context to ensure compilation commands and fence are in the GPU pipe. + glFlush(); + built_condvar.notify_one(); + } else { + is_built = true; + } } void ComputePipeline::Configure() { @@ -142,6 +151,9 @@ void ComputePipeline::Configure() { } texture_cache.FillComputeImageViews(std::span(views.data(), views.size())); + if (!is_built) { + WaitForBuild(); + } if (assembly_program.handle != 0) { program_manager.BindComputeAssemblyProgram(assembly_program.handle); } else { @@ -223,4 +235,13 @@ void ComputePipeline::Configure() { } } +void ComputePipeline::WaitForBuild() { + if (built_fence.handle == 0) { + std::unique_lock lock{built_mutex}; + built_condvar.wait(lock, [this] { return built_fence.handle != 0; }); + } + ASSERT(glClientWaitSync(built_fence.handle, 0, GL_TIMEOUT_IGNORED) != GL_WAIT_FAILED); + is_built = true; +} + } // namespace OpenGL diff --git a/src/video_core/renderer_opengl/gl_compute_pipeline.h b/src/video_core/renderer_opengl/gl_compute_pipeline.h index 6534dec32..9bcc72b59 100644 --- a/src/video_core/renderer_opengl/gl_compute_pipeline.h +++ b/src/video_core/renderer_opengl/gl_compute_pipeline.h @@ -50,7 +50,8 @@ class ComputePipeline { public: explicit ComputePipeline(const Device& device, TextureCache& texture_cache_, BufferCache& buffer_cache_, ProgramManager& program_manager_, - const Shader::Info& info_, std::string code, std::vector code_v); + const Shader::Info& info_, std::string code, std::vector code_v, + bool force_context_flush = false); void Configure(); @@ -65,6 +66,8 @@ public: } private: + void WaitForBuild(); + TextureCache& texture_cache; BufferCache& buffer_cache; Tegra::MemoryManager* gpu_memory; @@ -81,6 +84,11 @@ private: bool use_storage_buffers{}; bool writes_global_memory{}; + + std::mutex built_mutex; + std::condition_variable built_condvar; + OGLSync built_fence{}; + bool is_built{false}; }; } // namespace OpenGL diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index 15812b678..626ea7dcb 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -286,7 +286,7 @@ void ShaderCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading, file.read(reinterpret_cast(&key), sizeof(key)); queue_work([this, key, env = std::move(env), &state, &callback](Context* ctx) mutable { ctx->pools.ReleaseContents(); - auto pipeline{CreateComputePipeline(ctx->pools, key, env)}; + auto pipeline{CreateComputePipeline(ctx->pools, key, env, true)}; std::scoped_lock lock{state.mutex}; if (pipeline) { compute_cache.emplace(key, std::move(pipeline)); @@ -560,8 +560,8 @@ std::unique_ptr ShaderCache::CreateComputePipeline( } std::unique_ptr ShaderCache::CreateComputePipeline( - ShaderContext::ShaderPools& pools, const ComputePipelineKey& key, - Shader::Environment& env) try { + ShaderContext::ShaderPools& pools, const ComputePipelineKey& key, Shader::Environment& env, + bool force_context_flush) try { LOG_INFO(Render_OpenGL, "0x{:016x}", key.Hash()); Shader::Maxwell::Flow::CFG cfg{env, pools.flow_block, env.StartAddress()}; @@ -590,7 +590,7 @@ std::unique_ptr ShaderCache::CreateComputePipeline( } return std::make_unique(device, texture_cache, buffer_cache, program_manager, - program.info, code, code_spirv); + program.info, code, code_spirv, force_context_flush); } catch (Shader::Exception& exception) { LOG_ERROR(Render_OpenGL, "{}", exception.what()); return nullptr; diff --git a/src/video_core/renderer_opengl/gl_shader_cache.h b/src/video_core/renderer_opengl/gl_shader_cache.h index 50f610cd0..6b9732fca 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.h +++ b/src/video_core/renderer_opengl/gl_shader_cache.h @@ -58,7 +58,8 @@ private: std::unique_ptr CreateComputePipeline(ShaderContext::ShaderPools& pools, const ComputePipelineKey& key, - Shader::Environment& env); + Shader::Environment& env, + bool force_context_flush = false); std::unique_ptr CreateWorkers() const; From 6ef4bee98e381754f1ac5a51ba1b310d8004286d Mon Sep 17 00:00:00 2001 From: The yuzu Community Date: Wed, 1 Feb 2023 06:21:50 +0000 Subject: [PATCH 0013/1181] Update translations (2023-02-01) --- dist/languages/ca.ts | 1182 ++++++++++++++++------------- dist/languages/cs.ts | 1184 ++++++++++++++++------------- dist/languages/da.ts | 1180 ++++++++++++++++------------- dist/languages/de.ts | 1234 +++++++++++++++++------------- dist/languages/el.ts | 1188 ++++++++++++++++------------- dist/languages/es.ts | 1309 ++++++++++++++++++-------------- dist/languages/fr.ts | 1186 ++++++++++++++++------------- dist/languages/id.ts | 1182 ++++++++++++++++------------- dist/languages/it.ts | 1186 ++++++++++++++++------------- dist/languages/ja_JP.ts | 1186 ++++++++++++++++------------- dist/languages/ko_KR.ts | 1255 +++++++++++++++++-------------- dist/languages/nb.ts | 1182 ++++++++++++++++------------- dist/languages/nl.ts | 1196 ++++++++++++++++------------- dist/languages/pl.ts | 1575 ++++++++++++++++++++++----------------- dist/languages/pt_BR.ts | 1192 ++++++++++++++++------------- dist/languages/pt_PT.ts | 1192 ++++++++++++++++------------- dist/languages/ru_RU.ts | 1268 +++++++++++++++++-------------- dist/languages/sv.ts | 1196 ++++++++++++++++------------- dist/languages/tr_TR.ts | 1186 ++++++++++++++++------------- dist/languages/uk.ts | 1236 +++++++++++++++++------------- dist/languages/zh_CN.ts | 1254 +++++++++++++++++-------------- dist/languages/zh_TW.ts | 1186 ++++++++++++++++------------- 22 files changed, 15282 insertions(+), 11653 deletions(-) diff --git a/dist/languages/ca.ts b/dist/languages/ca.ts index bee0882c1..81835e749 100644 --- a/dist/languages/ca.ts +++ b/dist/languages/ca.ts @@ -926,102 +926,112 @@ This would ban both their forum username and their IP address. Desactivar macro JIT - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + + + + + Disable Macro HLE + + + + When checked, yuzu will log statistics about the compiled pipeline cache Quan està marcat, yuzu registrarà estadístiques sobre la cache de canonada compilada - + Enable Shader Feedback Activar informació de shaders - + When checked, it executes shaders without loop logic changes Quan està marcat, s'executaran els shaders sense canvis de lògica de bucle - + Disable Loop safety checks Desactivar comprovacions de seguretat de bucles - + Debugging Depuració - + Enable Verbose Reporting Services** Activa els serveis d'informes detallats** - + Enable FS Access Log Activar registre d'accés al FS - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** - + Create Minidump After Crash - + Advanced Avançat - + Kiosk (Quest) Mode Mode quiosc (Quest) - + Enable CPU Debugging Activar depuració de la CPU - + Enable Debug Asserts Activar alertes de depuració - + Enable Auto-Stub** Activar Auto-Stub** - + Enable All Controller Types Activar tots els tipus de controladors - + Disable Web Applet Desactivar el Web Applet - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Perform Startup Vulkan Check - + **This will be reset automatically when yuzu closes. **Això es restablirà automàticament quan es tanqui yuzu. @@ -1036,12 +1046,12 @@ This would ban both their forum username and their IP address. - + Web applet not compiled - + MiniDump creation not compiled @@ -1092,13 +1102,13 @@ This would ban both their forum username and their IP address. - + Audio Àudio - + CPU CPU @@ -1114,13 +1124,13 @@ This would ban both their forum username and their IP address. - + General General - + Graphics Gràfics @@ -1136,7 +1146,7 @@ This would ban both their forum username and their IP address. - + Controls Controls @@ -1152,7 +1162,7 @@ This would ban both their forum username and their IP address. - + System Sistema @@ -1415,7 +1425,7 @@ This would ban both their forum username and their IP address. - + None Cap @@ -1526,112 +1536,127 @@ This would ban both their forum username and their IP address. + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: Filtre d'adaptació de finestra: - + Nearest Neighbor Veí més proper - + Bilinear Bilineal - + Bicubic Bicúbic - + Gaussian Gaussià - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ Super Resolution (només Vulkan) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: Mètode d'anti-aliasing - + FXAA FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Utilitza un color de fons global - + Set background color: Configura un color de fons: - + Background Color: Color de fons: @@ -1676,76 +1701,96 @@ This would ban both their forum username and their IP address. - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync evita que la pantalla s'esquinci, però algunes tarjetes gràfiques tenen un rendiment menor amb VSync actiu. Mantén-lo actiu si no notes una diferència de rendiment. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + - Use VSync + Force maximum clocks (Vulkan only) + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. + VSync evita que la pantalla s'esquinci, però algunes tarjetes gràfiques tenen un rendiment menor amb VSync actiu. Mantén-lo actiu si no notes una diferència de rendiment. + + + + Use VSync + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Activa la compilació asíncrona de shaders, el qual podria reduir el tartamudeig dels shaders. Aquesta funcionalitat és experimental. - + Use asynchronous shader building (Hack) Utilitzar la construcció de shaders asíncrona (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Habilita el temps ràpid de la GPU. Aquesta opció obligarà a la majoria dels jocs a executar-se a la seva resolució nativa més alta. - + Use Fast GPU Time (Hack) Utilitzar temps ràpid a la GPU (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Use pessimistic buffer flushes (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + Anisotropic Filtering: Filtrat anisotròpic: - + Automatic Automàtic - + Default Valor predeterminat - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2133,7 +2178,7 @@ This would ban both their forum username and their IP address. - + Configure Configurar @@ -2159,6 +2204,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu Necessita reiniciar yuzu @@ -2178,22 +2224,27 @@ This would ban both their forum username and their IP address. Navegació del controlador - + + Enable direct JoyCon driver + + + + Enable mouse panning Activar desplaçament del ratolí - + Mouse sensitivity Sensibilitat del ratolí - + % % - + Motion / Touch Moviment / Tàctil @@ -2305,7 +2356,7 @@ This would ban both their forum username and their IP address. - + Left Stick Palanca esquerra @@ -2399,14 +2450,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2425,7 +2476,7 @@ This would ban both their forum username and their IP address. - + Plus Més @@ -2438,15 +2489,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2503,236 +2554,236 @@ This would ban both their forum username and their IP address. - + Right Stick Palanca dreta - - - - + + + + Clear Esborrar - - - - - + + + + + [not set] [no establert] - - + + Invert button Botó d'inversió - - + + Toggle button Botó commutador - - + + Invert axis Invertir eixos - - - + + + Set threshold Configurar llindar - - + + Choose a value between 0% and 100% Esculli un valor entre 0% i 100% - + Toggle axis - + Set gyro threshold Configurar llindar giroscopi - + Map Analog Stick Configuració de palanca analògica - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Després de prémer D'acord, primer moveu el joystick horitzontalment i després verticalment. Per invertir els eixos, primer moveu el joystick verticalment i després horitzontalment. - + Center axis Centrar eixos - - + + Deadzone: %1% Zona morta: %1% - - + + Modifier Range: %1% Rang del modificador: %1% - - + + Pro Controller Controlador Pro - + Dual Joycons Joycons duals - + Left Joycon Joycon esquerra - + Right Joycon Joycon dret - + Handheld Portàtil - + GameCube Controller Controlador de GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Controlador NES - + SNES Controller Controlador SNES - + N64 Controller Controlador N64 - + Sega Genesis Sega Genesis - + Start / Pause Inici / Pausa - + Z Z - + Control Stick Palanca de control - + C-Stick C-Stick - + Shake! Sacseja! - + [waiting] [esperant] - + New Profile Nou perfil - + Enter a profile name: Introdueixi un nom de perfil: - - + + Create Input Profile Crear perfil d'entrada - + The given profile name is not valid! El nom de perfil introduït no és vàlid! - + Failed to create the input profile "%1" Error al crear el perfil d'entrada "%1" - + Delete Input Profile Eliminar perfil d'entrada - + Failed to delete the input profile "%1" Error al eliminar el perfil d'entrada "%1" - + Load Input Profile Carregar perfil d'entrada - + Failed to load the input profile "%1" Error al carregar el perfil d'entrada "%1" - + Save Input Profile Guardar perfil d'entrada - + Failed to save the input profile "%1" Error al guardar el perfil d'entrada "%1" @@ -2780,7 +2831,7 @@ Per invertir els eixos, primer moveu el joystick verticalment i després horitzo - + Configure Configuració @@ -2816,7 +2867,7 @@ Per invertir els eixos, primer moveu el joystick verticalment i després horitzo - + Test Provar @@ -2836,77 +2887,77 @@ Per invertir els eixos, primer moveu el joystick verticalment i després horitzo <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Més Informació</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters El número de port té caràcters invàlids - + Port has to be in range 0 and 65353 El port ha d'estar entre el rang 0 i 65353 - + IP address is not valid l'Adreça IP no és vàlida - + This UDP server already exists Aquest servidor UDP ja existeix - + Unable to add more than 8 servers No és possible afegir més de 8 servidors - + Testing Provant - + Configuring Configurant - + Test Successful Prova exitosa - + Successfully received data from the server. S'han rebut dades des del servidor correctament. - + Test Failed Prova fallida - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. No s'han pogut rebre dades vàlides des del servidor.<br>Si us plau, verifiqui que el servidor està configurat correctament i que la direcció i el port són correctes.  - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. La prova del UDP o la configuració de la calibració està en curs.<br>Si us plau, esperi a que acabi el procés. @@ -3234,7 +3285,7 @@ UUID: %2 - Ring Sensor Parameters + Virtual Ring Sensor Parameters @@ -3255,33 +3306,90 @@ UUID: %2 Zona morta: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Restaurar els valors predeterminats - + Clear Esborrar - + [not set] [no establert] - + Invert axis Invertir eixos - - + + Deadzone: %1% Zona morta: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Configurant + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [esperant] @@ -3586,8 +3694,8 @@ UUID: %2 - English - Anglès + American English + @@ -3720,22 +3828,27 @@ UUID: %2 Regenerar - + System settings are available only when game is not running. Els paràmetres del sistema només estan disponibles quan el joc no s'està executant. - + + Warning: "%1" is not a valid language for region "%2" + + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Això reemplaçarà la seva Switch virtual actual amb una nova. La seva Switch virtual actual no serà recuperable. Això podria tenir efectes inesperats en els jocs. Això pot fallar si fa servir una partida guardada amb una configuració desactualitzada. Continuar? - + Warning Avís - + Console ID: 0x%1 ID de la consola: 0x%1 @@ -3806,7 +3919,7 @@ UUID: %2 Configuració TAS - + Select TAS Load Directory... Selecciona el directori de càrrega TAS... @@ -4362,7 +4475,7 @@ Arrossegui els punts per a canviar la posició, o faci doble clic a les cel·les Controlador J1 - + &Controller P1 &Controlador J1 @@ -4375,42 +4488,37 @@ Arrossegui els punts per a canviar la posició, o faci doble clic a les cel·les - - IP Address + + Server Address - - IP + + <html><head/><body><p>Server address of the host</p></body></html> - - <html><head/><body><p>IPv4 address of the host</p></body></html> - - - - + Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> - + Nickname - + Password - + Connect @@ -4418,12 +4526,12 @@ Arrossegui els punts per a canviar la posició, o faci doble clic a les cel·les DirectConnectWindow - + Connecting - + Connect @@ -4494,472 +4602,482 @@ Arrossegui els punts per a canviar la posició, o faci doble clic a les cel·les Temps que costa emular un fotograma de la Switch, sense tenir en compte la limitació de fotogrames o la sincronització vertical. Per a una emulació òptima, aquest valor hauria de ser com a màxim de 16.67 ms. - + &Clear Recent Files &Esborrar arxius recents - + &Continue &Continuar - + &Pause &Pausar - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu està executant un joc - + Warning Outdated Game Format Advertència format del joc desfasat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Està utilitzant el format de directori de ROM deconstruït per a aquest joc, que és un format desactualitzat que ha sigut reemplaçat per altres, com NCA, NAX, XCI o NSP. Els directoris de ROM deconstruïts careixen d'icones, metadades i suport d'actualitzacions.<br><br>Per a obtenir una explicació dels diversos formats de Switch que suporta yuzu,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>faci una ullada a la nostra wiki</a>. Aquest missatge no es tornarà a mostrar. - - + + Error while loading ROM! Error carregant la ROM! - + The ROM format is not supported. El format de la ROM no està suportat. - + An error occurred initializing the video core. S'ha produït un error inicialitzant el nucli de vídeo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu ha trobat un error mentre executava el nucli de vídeo. Això sol ser causat per controladors de la GPU obsolets, inclosos els integrats. Si us plau, consulti el registre per a més detalls. Per obtenir més informació sobre com accedir al registre, consulti la següent pàgina: <a href='https://yuzu-emu.org/help/reference/log-files/'>Com carregar el fitxer de registre</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Error al carregar la ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Si us plau, segueixi <a href='https://yuzu-emu.org/help/quickstart/'>la guia d'inici de yuzu</a> per a bolcar de nou els seus fitxers.<br>Pot consultar la wiki de yuzu wiki</a> o el Discord de yuzu</a> per obtenir ajuda. - + An unknown error occurred. Please see the log for more details. S'ha produït un error desconegut. Si us plau, consulti el registre per a més detalls. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Dades de partides guardades - + Mod Data Dades de mods - + Error Opening %1 Folder Error obrint la carpeta %1 - - + + Folder does not exist! La carpeta no existeix! - + Error Opening Transferable Shader Cache Error obrint la cache transferible de shaders - + Failed to create the shader cache directory for this title. No s'ha pogut crear el directori de la cache dels shaders per aquest títol. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Eliminar entrada - - - - - - + + + + + + Successfully Removed S'ha eliminat correctament - + Successfully removed the installed base game. S'ha eliminat correctament el joc base instal·lat. - + The base game is not installed in the NAND and cannot be removed. El joc base no està instal·lat a la NAND i no pot ser eliminat. - + Successfully removed the installed update. S'ha eliminat correctament l'actualització instal·lada. - + There is no update installed for this title. No hi ha cap actualització instal·lada per aquest títol. - + There are no DLC installed for this title. No hi ha cap DLC instal·lat per aquest títol. - + Successfully removed %1 installed DLC. S'ha eliminat correctament %1 DLC instal·lat/s. - + Delete OpenGL Transferable Shader Cache? Desitja eliminar la cache transferible de shaders d'OpenGL? - + Delete Vulkan Transferable Shader Cache? Desitja eliminar la cache transferible de shaders de Vulkan? - + Delete All Transferable Shader Caches? Desitja eliminar totes les caches transferibles de shaders? - + Remove Custom Game Configuration? Desitja eliminar la configuració personalitzada del joc? - + Remove File Eliminar arxiu - - + + Error Removing Transferable Shader Cache Error eliminant la cache transferible de shaders - - + + A shader cache for this title does not exist. No existeix una cache de shaders per aquest títol. - + Successfully removed the transferable shader cache. S'ha eliminat correctament la cache transferible de shaders. - + Failed to remove the transferable shader cache. No s'ha pogut eliminar la cache transferible de shaders. - - + + Error Removing Vulkan Driver Pipeline Cache + + + + + Failed to remove the driver pipeline cache. + + + + + Error Removing Transferable Shader Caches Error al eliminar les caches de shaders transferibles - + Successfully removed the transferable shader caches. Caches de shaders transferibles eliminades correctament. - + Failed to remove the transferable shader cache directory. No s'ha pogut eliminar el directori de caches de shaders transferibles. - - + + Error Removing Custom Configuration Error eliminant la configuració personalitzada - + A custom configuration for this title does not exist. No existeix una configuració personalitzada per aquest joc. - + Successfully removed the custom game configuration. S'ha eliminat correctament la configuració personalitzada del joc. - + Failed to remove the custom game configuration. No s'ha pogut eliminar la configuració personalitzada del joc. - - + + RomFS Extraction Failed! La extracció de RomFS ha fallat! - + There was an error copying the RomFS files or the user cancelled the operation. S'ha produït un error copiant els arxius RomFS o l'usuari ha cancel·lat la operació. - + Full Completa - + Skeleton Esquelet - + Select RomFS Dump Mode Seleccioni el mode de bolcat de RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Si us plau, seleccioni la forma en que desitja bolcar la RomFS.<br>Completa copiarà tots els arxius al nou directori mentre que<br>esquelet només crearà l'estructura de directoris. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root No hi ha suficient espai lliure a %1 per extreure el RomFS. Si us plau, alliberi espai o esculli un altre directori de bolcat a Emulació > Configuració > Sistema > Sistema d'arxius > Carpeta arrel de bolcat - + Extracting RomFS... Extraient RomFS... - - + + Cancel Cancel·la - + RomFS Extraction Succeeded! Extracció de RomFS completada correctament! - + The operation completed successfully. L'operació s'ha completat correctament. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Error obrint %1 - + Select Directory Seleccionar directori - + Properties Propietats - + The game properties could not be loaded. Les propietats del joc no s'han pogut carregar. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Executable de Switch (%1);;Tots els Arxius (*.*) - + Load File Carregar arxiu - + Open Extracted ROM Directory Obrir el directori de la ROM extreta - + Invalid Directory Selected Directori seleccionat invàlid - + The directory you have selected does not contain a 'main' file. El directori que ha seleccionat no conté un arxiu 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Arxiu de Switch Instal·lable (*.nca *.nsp *.xci);;Arxiu de Continguts Nintendo (*.nca);;Paquet d'enviament Nintendo (*.nsp);;Imatge de Cartutx NX (*.xci) - + Install Files Instal·lar arxius - + %n file(s) remaining %n arxiu(s) restants%n arxiu(s) restants - + Installing file "%1"... Instal·lant arxiu "%1"... - + Install Results Resultats instal·lació - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Per evitar possibles conflictes, no recomanem als usuaris que instal·lin jocs base a la NAND. Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i DLCs. - + %n file(s) were newly installed %n nou(s) arxiu(s) s'ha(n) instal·lat @@ -4967,7 +5085,7 @@ Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i - + %n file(s) were overwritten %n arxiu(s) s'han sobreescrit @@ -4975,7 +5093,7 @@ Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i - + %n file(s) failed to install %n arxiu(s) no s'han instal·lat @@ -4983,377 +5101,377 @@ Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i - + System Application Aplicació del sistema - + System Archive Arxiu del sistema - + System Application Update Actualització de l'aplicació del sistema - + Firmware Package (Type A) Paquet de firmware (Tipus A) - + Firmware Package (Type B) Paquet de firmware (Tipus B) - + Game Joc - + Game Update Actualització de joc - + Game DLC DLC del joc - + Delta Title Títol delta - + Select NCA Install Type... Seleccioni el tipus d'instal·lació NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Seleccioni el tipus de títol que desitja instal·lar aquest NCA com a: (En la majoria dels casos, el valor predeterminat 'Joc' està bé.) - + Failed to Install Ha fallat la instal·lació - + The title type you selected for the NCA is invalid. El tipus de títol seleccionat per el NCA és invàlid. - + File not found Arxiu no trobat - + File "%1" not found Arxiu "%1" no trobat - + OK D'acord - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Falta el compte de yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Per tal d'enviar un cas de prova de compatibilitat de joc, ha de vincular el seu compte de yuzu.<br><br/>Per a vincular el seu compte de yuzu, vagi a Emulació & gt; Configuració & gt; Web. - + Error opening URL Error obrint URL - + Unable to open the URL "%1". No es pot obrir la URL "%1". - + TAS Recording Gravació TAS - + Overwrite file of player 1? Sobreescriure l'arxiu del jugador 1? - + Invalid config detected Configuració invàlida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. El controlador del mode portàtil no es pot fer servir en el mode acoblat. Es seleccionarà el controlador Pro en el seu lloc. - - + + Amiibo Amiibo - - + + The current amiibo has been removed L'amiibo actual ha sigut eliminat - + Error Error - - + + The current game is not looking for amiibos El joc actual no està buscant amiibos - + Amiibo File (%1);; All Files (*.*) Arxiu Amiibo (%1);; Tots els Arxius (*.*) - + Load Amiibo Carregar Amiibo - + Error loading Amiibo data Error al carregar les dades d'Amiibo - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Captura de pantalla - + PNG Image (*.png) Imatge PNG (*.png) - + TAS state: Running %1/%2 Estat TAS: executant %1/%2 - + TAS state: Recording %1 Estat TAS: gravant %1 - + TAS state: Idle %1/%2 Estat TAS: inactiu %1/%2 - + TAS State: Invalid Estat TAS: invàlid - + &Stop Running &Parar l'execució - + &Start &Iniciar - + Stop R&ecording Parar g&ravació - + R&ecord G&ravar - + Building: %n shader(s) Construint: %n shader(s)Construint: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escala: %1x - + Speed: %1% / %2% Velocitat: %1% / %2% - + Speed: %1% Velocitat: %1% - + Game: %1 FPS (Unlocked) Joc: %1 FPS (desbloquejat) - + Game: %1 FPS Joc: %1 FPS - + Frame: %1 ms Fotograma: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR ERROR GPU - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST MÉS PROPER - - + + BILINEAR BILINEAL - + BICUBIC BICÚBIC - + GAUSSIAN GAUSSIÀ - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA SENSE AA - + FXAA FXAA - + SMAA - + Confirm Key Rederivation Confirmi la clau de rederivació - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5370,37 +5488,37 @@ i opcionalment faci còpies de seguretat. Això eliminarà els arxius de les claus generats automàticament i tornarà a executar el mòdul de derivació de claus. - + Missing fuses Falten fusibles - + - Missing BOOT0 - Falta BOOT0 - + - Missing BCPKG2-1-Normal-Main - Falta BCPKG2-1-Normal-Main - + - Missing PRODINFO - Falta PRODINFO - + Derivation Components Missing Falten components de derivació - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Falten les claus d'encriptació. <br>Si us plau, segueixi <a href='https://yuzu-emu.org/help/quickstart/'>la guia ràpida de yuzu</a> per a obtenir totes les seves claus, firmware i jocs.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5409,39 +5527,39 @@ Això pot prendre fins a un minut depenent del rendiment del seu sistema. - + Deriving Keys Derivant claus - + Select RomFS Dump Target Seleccioni el destinatari per a bolcar el RomFS - + Please select which RomFS you would like to dump. Si us plau, seleccioni quin RomFS desitja bolcar. - + Are you sure you want to close yuzu? Està segur de que vol tancar yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Està segur de que vol aturar l'emulació? Qualsevol progrés no guardat es perdrà. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5453,44 +5571,44 @@ Desitja tancar-lo de totes maneres? GRenderWindow - - + + OpenGL not available! OpenGL no disponible! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu no ha estat compilat amb suport per OpenGL. - - + + Error while initializing OpenGL! Error al inicialitzar OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. La seva GPU no suporta OpenGL, o no té instal·lat els últims controladors gràfics. - + Error while initializing OpenGL 4.6! Error inicialitzant OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 La seva GPU no suporta OpenGL 4.6, o no té instal·lats els últims controladors gràfics.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 És possible que la seva GPU no suporti una o més extensions necessàries d'OpenGL. Si us plau, asseguris de tenir els últims controladors de la tarjeta gràfica.<br><br>GL Renderer:<br>%1<br><br>Extensions no suportades:<br>%2 @@ -5992,7 +6110,7 @@ Debug Message: Instal·lar - + Install Files to NAND Instal·lar arxius a la NAND @@ -6000,7 +6118,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 El text no pot contenir cap dels següents caràcters @@ -6653,7 +6771,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE INICI/PAUSAR @@ -6702,31 +6820,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [no establert] @@ -6737,14 +6855,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Eix %1%2 @@ -6755,262 +6873,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [desconegut] - + - + Left Esquerra - + - + Right Dreta - + - + Down Avall - + - + Up Amunt - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Inici - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle Cercle - - + + Cross Creu - - + + Square Cuadrat - - + + Triangle Triangle - - + + Share Compartir - - + + Options Opcions - - + + [undefined] [indefinit] - + %1%2 %1%2 - - + + [invalid] [invàlid] - - - - + + + + %1%2Hat %3 %1%2Rotació %3 - - - - - - + + + + + + %1%2Axis %3 %1%2Eix %3 - - + + %1%2Axis %3,%4,%5 %1%2Eixos %3,%4,%5 - - + + %1%2Motion %3 %1%2Moviment %3 - - - - + + + + %1%2Button %3 %1%2Botó %3 - - + + [unused] [sense ús] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Més + + + + Minus + Menys + + + + Home Inici - + + Capture + Captura + + + Touch Tàctil - + Wheel Indicates the mouse wheel Roda - + Backward Enrere - + Forward Endavant - + Task Tasca - + Extra Extra - + %1%2%3 %1%2%3 diff --git a/dist/languages/cs.ts b/dist/languages/cs.ts index d0f71808d..bafb8997b 100644 --- a/dist/languages/cs.ts +++ b/dist/languages/cs.ts @@ -918,102 +918,112 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj Zakázat Makro JIT - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + + + + + Disable Macro HLE + + + + When checked, yuzu will log statistics about the compiled pipeline cache Když je zaškrtnuto, yuzu bude logovat statistiky o kompilované mezipaměti pipelinu - + Enable Shader Feedback Povolit Shader Feedback - + When checked, it executes shaders without loop logic changes Když je zaškrtnuto, shadery budou exekutovány bez změn logických smyček. - + Disable Loop safety checks - + Debugging Ladění - + Enable Verbose Reporting Services** - + Enable FS Access Log - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** - + Create Minidump After Crash - + Advanced Pokročilé - + Kiosk (Quest) Mode Předváděcí (Quest/Kiosk) režim - + Enable CPU Debugging - + Enable Debug Asserts Povolit Debug Asserts - + Enable Auto-Stub** - + Enable All Controller Types - + Disable Web Applet Zakázat Web Applet - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Perform Startup Vulkan Check - + **This will be reset automatically when yuzu closes. @@ -1028,12 +1038,12 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + Web applet not compiled - + MiniDump creation not compiled @@ -1084,13 +1094,13 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + Audio Zvuk - + CPU CPU @@ -1106,13 +1116,13 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + General Obecné - + Graphics Grafika @@ -1128,7 +1138,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + Controls Ovládání @@ -1144,7 +1154,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + System Systém @@ -1407,7 +1417,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + None Žádné @@ -1518,112 +1528,127 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - 2X (1440p/2160p) + 1.5X (1080p/1620p) [EXPERIMENTAL] - 3X (2160p/3240p) + 2X (1440p/2160p) - 4X (2880p/4320p) + 3X (2160p/3240p) - 5X (3600p/5400p) + 4X (2880p/4320p) + 5X (3600p/5400p) + + + + 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: - + Nearest Neighbor - + Bilinear - + Bicubic - + Gaussian - + ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) + + AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: - + FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Použít globální barvu pozadí - + Set background color: Nastavit barvu pozadí: - + Background Color: Barva Pozadí: @@ -1668,76 +1693,96 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - V-Sync brání obrazovce před trháním, ale některé grafické karty mají menší výkon se zapnutým V-Sync. Nechte toto zapnuté, pokud si nevšimnete žádných rozdílů ve výkonu. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + - Use VSync + Force maximum clocks (Vulkan only) - Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. - Zapnout asynchronní kompilaci shaderů, která může snížit zasekávání shaderů. Tato funkce je experimentální. + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. + V-Sync brání obrazovce před trháním, ale některé grafické karty mají menší výkon se zapnutým V-Sync. Nechte toto zapnuté, pokud si nevšimnete žádných rozdílů ve výkonu. - Use asynchronous shader building (Hack) + Use VSync - Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. + Zapnout asynchronní kompilaci shaderů, která může snížit zasekávání shaderů. Tato funkce je experimentální. - Use Fast GPU Time (Hack) + Use asynchronous shader building (Hack) - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. + Use Fast GPU Time (Hack) + + + + + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + + + + Use pessimistic buffer flushes (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + Anisotropic Filtering: Anizotropní filtrování: - + Automatic - + Default Výchozí - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2125,7 +2170,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + Configure Nastavení @@ -2151,6 +2196,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj + Requires restarting yuzu @@ -2170,22 +2216,27 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + + Enable direct JoyCon driver + + + + Enable mouse panning Povolit naklánění myší - + Mouse sensitivity Citlivost myši - + % % - + Motion / Touch Pohyb / Dotyk @@ -2297,7 +2348,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + Left Stick Levá Páčka @@ -2391,14 +2442,14 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + L L - + ZL ZL @@ -2417,7 +2468,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + Plus Plus @@ -2430,15 +2481,15 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - - + + R R - + ZR ZR @@ -2495,236 +2546,236 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + Right Stick Pravá páčka - - - - + + + + Clear Vyčistit - - - - - + + + + + [not set] [nenastaveno] - - + + Invert button - - + + Toggle button Přepnout tlačítko - - + + Invert axis Převrátit osy - - - + + + Set threshold - - + + Choose a value between 0% and 100% - + Toggle axis - + Set gyro threshold - + Map Analog Stick Namapovat analogovou páčku - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Po stisknutí OK nejprve posuňte joystick horizontálně, poté vertikálně. Pro převrácení os nejprve posuňte joystick vertikálně, poté horizontálně. - + Center axis - - + + Deadzone: %1% Deadzone: %1% - - + + Modifier Range: %1% Rozsah modifikátoru: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Dual Joycons - + Left Joycon Levý Joycon - + Right Joycon Pravý Joycon - + Handheld V rukou - + GameCube Controller Ovladač GameCube - + Poke Ball Plus - + NES Controller - + SNES Controller - + N64 Controller - + Sega Genesis - + Start / Pause Start / Pause - + Z Z - + Control Stick Control Stick - + C-Stick C-Stick - + Shake! Shake! - + [waiting] [čekání] - + New Profile Nový profil - + Enter a profile name: Zadejte název profilu: - - + + Create Input Profile Vytvořit profil vstupu - + The given profile name is not valid! Zadaný název profilu není platný! - + Failed to create the input profile "%1" Nepodařilo se vytvořit profil vstupu "%1" - + Delete Input Profile Odstranit profil vstupu - + Failed to delete the input profile "%1" Nepodařilo se odstranit profil vstupu "%1" - + Load Input Profile Načíst profil vstupu - + Failed to load the input profile "%1" Nepodařilo se načíst profil vstupu "%1" - + Save Input Profile Uložit profil vstupu - + Failed to save the input profile "%1" Nepodařilo se uložit profil vstupu "%1" @@ -2772,7 +2823,7 @@ Pro převrácení os nejprve posuňte joystick vertikálně, poté horizontáln - + Configure Konfigurovat @@ -2808,7 +2859,7 @@ Pro převrácení os nejprve posuňte joystick vertikálně, poté horizontáln - + Test Test @@ -2828,77 +2879,77 @@ Pro převrácení os nejprve posuňte joystick vertikálně, poté horizontáln <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Dozvědět se více</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters Číslo portu obsahuje neplatné znaky - + Port has to be in range 0 and 65353 Port musí být v rozsahu 0 až 65353 - + IP address is not valid IP adresa není platná - + This UDP server already exists UDP server již existuje - + Unable to add more than 8 servers Není možné přidat více než 8 serverů - + Testing Testování - + Configuring Nastavování - + Test Successful Test byl úspěšný - + Successfully received data from the server. Úspěšně jsme získali data ze serveru. - + Test Failed Test byl neúspěšný - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Nedostali jsme platná data ze serveru.<br>Prosím zkontrolujte, že váš server je nastaven správně a že adresa a port jsou zadány správně. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. Probíhá test UDP nebo konfigurace kalibrace.<br>Prosím vyčkejte na dokončení. @@ -3226,7 +3277,7 @@ UUID: %2 - Ring Sensor Parameters + Virtual Ring Sensor Parameters @@ -3247,33 +3298,90 @@ UUID: %2 Deadzone: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Vrátit výchozí nastavení - + Clear Vymazat - + [not set] [nenastaveno] - + Invert axis Převrátit osy - - + + Deadzone: %1% Deadzone: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Nastavování + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [čekání] @@ -3578,8 +3686,8 @@ UUID: %2 - English - Angličtina (English) + American English + @@ -3712,22 +3820,27 @@ UUID: %2 Přegenerovat - + System settings are available only when game is not running. Systémová nastavení jsou dostupná pouze, pokud hra neběží. - + + Warning: "%1" is not a valid language for region "%2" + + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Toto vymění váš virtuální Switch za nový. Váš aktuální virtuální Switch nebude možno navrátit. Tohle může mít nečekané následky ve hrách. Tohle může selhat pokud použijete starý konfig savu. Pokračovat? - + Warning Varování - + Console ID: 0x%1 ID Konzole: 0x%1 @@ -3798,7 +3911,7 @@ UUID: %2 - + Select TAS Load Directory... @@ -4354,7 +4467,7 @@ Táhněte body pro změnu pozice nebo dvojitě klikněte na buňky tabulky pro z Ovladač P1 - + &Controller P1 &Ovladač P1 @@ -4367,42 +4480,37 @@ Táhněte body pro změnu pozice nebo dvojitě klikněte na buňky tabulky pro z - - IP Address + + Server Address - - IP + + <html><head/><body><p>Server address of the host</p></body></html> - - <html><head/><body><p>IPv4 address of the host</p></body></html> - - - - + Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> - + Nickname - + Password - + Connect @@ -4410,12 +4518,12 @@ Táhněte body pro změnu pozice nebo dvojitě klikněte na buňky tabulky pro z DirectConnectWindow - + Connecting - + Connect @@ -4485,860 +4593,870 @@ Táhněte body pro změnu pozice nebo dvojitě klikněte na buňky tabulky pro z Čas potřebný na emulaci framu scény, nepočítá se limit nebo v-sync. Pro plnou rychlost by se tohle mělo pohybovat okolo 16.67 ms. - + &Clear Recent Files &Vymazat poslední soubory - + &Continue &Pokračovat - + &Pause &Pauza - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Varování Zastaralý Formát Hry - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Používáte rozbalený formát hry, který je zastaralý a byl nahrazen jinými jako NCA, NAX, XCI, nebo NSP. Rozbalená ROM nemá ikony, metadata, a podporu updatů.<br><br>Pro vysvětlení všech možných podporovaných typů, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>zkoukni naší wiki</a>. Tato zpráva se nebude znova zobrazovat. - - + + Error while loading ROM! Chyba při načítání ROM! - + The ROM format is not supported. Tento formát ROM není podporován. - + An error occurred initializing the video core. Nastala chyba při inicializaci jádra videa. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Chyba při načítání ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Pro extrakci souborů postupujte podle <a href='https://yuzu-emu.org/help/quickstart/'>rychlého průvodce yuzu</a>. Nápovědu naleznete na <br>wiki</a> nebo na Discordu</a>. - + An unknown error occurred. Please see the log for more details. Nastala chyba. Koukni do logu. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Uložit data - + Mod Data Módovat Data - + Error Opening %1 Folder Chyba otevírání složky %1 - - + + Folder does not exist! Složka neexistuje! - + Error Opening Transferable Shader Cache Chyba při otevírání přenositelné mezipaměti shaderů - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Odebrat položku - - - - - - + + + + + + Successfully Removed Úspěšně odebráno - + Successfully removed the installed base game. Úspěšně odebrán nainstalovaný základ hry. - + The base game is not installed in the NAND and cannot be removed. Základ hry není nainstalovaný na NAND a nemůže být odstraněn. - + Successfully removed the installed update. Úspěšně odebrána nainstalovaná aktualizace. - + There is no update installed for this title. Není nainstalovaná žádná aktualizace pro tento titul. - + There are no DLC installed for this title. Není nainstalované žádné DLC pro tento titul. - + Successfully removed %1 installed DLC. Úspěšně odstraněno %1 nainstalovaných DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? Odstranit vlastní konfiguraci hry? - + Remove File Odstranit soubor - - + + Error Removing Transferable Shader Cache Chyba při odstraňování přenositelné mezipaměti shaderů - - + + A shader cache for this title does not exist. Mezipaměť shaderů pro tento titul neexistuje. - + Successfully removed the transferable shader cache. Přenositelná mezipaměť shaderů úspěšně odstraněna - + Failed to remove the transferable shader cache. Nepodařilo se odstranit přenositelnou mezipaměť shaderů - - - Error Removing Transferable Shader Caches + + Error Removing Vulkan Driver Pipeline Cache + Failed to remove the driver pipeline cache. + + + + + + Error Removing Transferable Shader Caches + + + + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Chyba při odstraňování vlastní konfigurace hry - + A custom configuration for this title does not exist. Vlastní konfigurace hry pro tento titul neexistuje. - + Successfully removed the custom game configuration. Úspěšně odstraněna vlastní konfigurace hry. - + Failed to remove the custom game configuration. Nepodařilo se odstranit vlastní konfiguraci hry. - - + + RomFS Extraction Failed! Extrakce RomFS se nepovedla! - + There was an error copying the RomFS files or the user cancelled the operation. Nastala chyba při kopírování RomFS souborů, nebo uživatel operaci zrušil. - + Full Plný - + Skeleton Kostra - + Select RomFS Dump Mode Vyber RomFS Dump Mode - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Vyber jak by si chtěl RomFS vypsat.<br>Plné zkopíruje úplně všechno, ale<br>kostra zkopíruje jen strukturu složky. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Extrahuji RomFS... - - + + Cancel Zrušit - + RomFS Extraction Succeeded! Extrakce RomFS se povedla! - + The operation completed successfully. Operace byla dokončena úspěšně. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Chyba při otevírání %1 - + Select Directory Vybraná Složka - + Properties Vlastnosti - + The game properties could not be loaded. Herní vlastnosti nemohly být načteny. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Executable (%1);;Všechny soubory (*.*) - + Load File Načíst soubor - + Open Extracted ROM Directory Otevřít složku s extrahovanou ROM - + Invalid Directory Selected Vybraná složka je neplatná - + The directory you have selected does not contain a 'main' file. Složka kterou jste vybrali neobsahuje soubor "main" - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Instalovatelný soubor pro Switch (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Instalovat Soubory - + %n file(s) remaining - + Installing file "%1"... Instalování souboru "%1"... - + Install Results Výsledek instalace - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Abychom předešli možným konfliktům, nedoporučujeme uživatelům instalovat základní hry na paměť NAND. Tuto funkci prosím používejte pouze k instalaci aktualizací a DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systémová Aplikace - + System Archive Systémový archív - + System Application Update Systémový Update Aplikace - + Firmware Package (Type A) Firmware-ový baliček (Typu A) - + Firmware Package (Type B) Firmware-ový baliček (Typu B) - + Game Hra - + Game Update Update Hry - + Game DLC Herní DLC - + Delta Title Delta Title - + Select NCA Install Type... Vyberte typ instalace NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Vyberte typ title-u, který chcete nainstalovat tenhle NCA jako: (Většinou základní "game" stačí.) - + Failed to Install Chyba v instalaci - + The title type you selected for the NCA is invalid. Tento typ pro tento NCA není platný. - + File not found Soubor nenalezen - + File "%1" not found Soubor "%1" nenalezen - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Chybí účet yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Pro přidání recenze kompatibility je třeba mít účet yuzu<br><br/>Pro nalinkování yuzu účtu jdi do Emulace &gt; Konfigurace &gt; Web. - + Error opening URL Chyba při otevírání URL - + Unable to open the URL "%1". Nelze otevřít URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected Zjištěno neplatné nastavení - + Handheld controller can't be used on docked mode. Pro controller will be selected. Ruční ovladač nelze používat v dokovacím režimu. Bude vybrán ovladač Pro Controller. - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Soubor Amiibo (%1);; Všechny Soubory (*.*) - + Load Amiibo Načíst Amiibo - + Error loading Amiibo data Chyba načítání Amiiba - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Pořídit Snímek Obrazovky - + PNG Image (*.png) PNG Image (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Rychlost: %1% / %2% - + Speed: %1% Rychlost: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Hra: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMÁLNÍ - + GPU HIGH GPU VYSOKÝ - + GPU EXTREME GPU EXTRÉMNÍ - + GPU ERROR GPU ERROR - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA - + SMAA - + Confirm Key Rederivation Potvďte Rederivaci Klíčů - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5355,37 +5473,37 @@ a udělejte si zálohu. Toto vymaže věechny vaše automaticky generované klíče a znova spustí modul derivace klíčů. - + Missing fuses Chybí Fuses - + - Missing BOOT0 - Chybí BOOT0 - + - Missing BCPKG2-1-Normal-Main - Chybí BCPKG2-1-Normal-Main - + - Missing PRODINFO - Chybí PRODINFO - + Derivation Components Missing Chybé odvozené komponenty - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5394,39 +5512,39 @@ Tohle může zabrat až minutu podle výkonu systému. - + Deriving Keys Derivuji Klíče - + Select RomFS Dump Target Vyberte Cíl vypsaní RomFS - + Please select which RomFS you would like to dump. Vyberte, kterou RomFS chcete vypsat. - + Are you sure you want to close yuzu? Jste si jist, že chcete zavřít yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Jste si jist, že chcete ukončit emulaci? Jakýkolic neuložený postup bude ztracen. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5438,44 +5556,44 @@ Opravdu si přejete ukončit tuto aplikaci? GRenderWindow - - + + OpenGL not available! OpenGL není k dispozici! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu nebylo sestaveno s OpenGL podporou. - - + + Error while initializing OpenGL! Chyba při inicializaci OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Vaše grafická karta pravděpodobně nepodporuje OpenGL nebo nejsou nainstalovány nejnovější ovladače. - + Error while initializing OpenGL 4.6! Chyba při inicializaci OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Vaše grafická karta pravděpodobně nepodporuje OpenGL 4.6 nebo nejsou nainstalovány nejnovější ovladače.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Vaše grafická karta pravděpodobně nepodporuje jedno nebo více rozšíření OpenGL. Ujistěte se prosím, že jsou nainstalovány nejnovější ovladače.<br><br>GL Renderer:<br>%1<br><br>Nepodporované rozšíření:<br>%2 @@ -5977,7 +6095,7 @@ Debug Message: Nainstalovat - + Install Files to NAND Instalovat soubory na NAND @@ -5985,7 +6103,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 @@ -6637,7 +6755,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE START/PAUSE @@ -6686,31 +6804,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [Nenastaveno] @@ -6721,14 +6839,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Osa %1%2 @@ -6739,262 +6857,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [Neznámá] - + - + Left Doleva - + - + Right Doprava - + - + Down Dolů - + - + Up Nahoru - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Start - - + + L1 - - + + L2 - - + + L3 - - + + R1 - - + + R2 - - + + R3 - - + + Circle - - + + Cross - - + + Square - - + + Triangle - - + + Share - - + + Options - - + + [undefined] - + %1%2 %1%2 - - + + [invalid] - - - - + + + + %1%2Hat %3 - - - - - - + + + + + + %1%2Axis %3 - - + + %1%2Axis %3,%4,%5 - - + + %1%2Motion %3 - - - - + + + + %1%2Button %3 - - + + [unused] [nepoužito] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Plus + + + + Minus + Minus + + + + Home Home - + + Capture + Capture + + + Touch Dotyk - + Wheel Indicates the mouse wheel - + Backward - + Forward - + Task - + Extra - + %1%2%3 diff --git a/dist/languages/da.ts b/dist/languages/da.ts index 94f90dcea..b88b1b756 100644 --- a/dist/languages/da.ts +++ b/dist/languages/da.ts @@ -934,102 +934,112 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse.Deaktivér Makro-JIT - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + + + + + Disable Macro HLE + + + + When checked, yuzu will log statistics about the compiled pipeline cache Når valgt, vil yuzu logføre statistikker om det kompilerede rørlinje-mellemlager - + Enable Shader Feedback Aktivér Shader-Tilbagemelding - + When checked, it executes shaders without loop logic changes Når valgt, eksekverer den shadere, uden loop-logik-forandringer - + Disable Loop safety checks Deaktivér Loop-sikkerhedskontrol - + Debugging Fejlfinding - + Enable Verbose Reporting Services** Aktivér Vitterlig Rapporteringstjeneste - + Enable FS Access Log Aktivér FS-Tilgangslog - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. Aktivér dette, for at udgyde den senest genererede lyd-kommandoliste til konsollen. Påvirker kun spil, som gør brug af lyd-renderingen. - + Dump Audio Commands To Console** Dump Lydkommandoer Til Konsol** - + Create Minidump After Crash Opret Minidump Efter Nedbrud - + Advanced Avanceret - + Kiosk (Quest) Mode Kiosk (Rejse)-Tilstand - + Enable CPU Debugging Aktivér CPU-Fejlfinding - + Enable Debug Asserts Aktivér Fejlfindingshævdelser - + Enable Auto-Stub** Aktivér Automatisk Stub** - + Enable All Controller Types Aktivér Alle Kontrolenhedstyper - + Disable Web Applet Deaktivér Net-Applet - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. Gør Yuzu i stand til at kontrollere for et funktionelt Vulkan-miljø, når programmet starter op. Deaktivering af dette forårsager problemer med at eksterne programmer ser Yuzu. - + Perform Startup Vulkan Check Udfør Vulkan-Kontrol Under Opstart - + **This will be reset automatically when yuzu closes. **Dette vil automatisk blive nulstillet, når yuzu lukkes. @@ -1044,12 +1054,12 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse.Yuzu kræver en genstart, for at anvende denne indstilling. - + Web applet not compiled Net-applet ikke kompileret - + MiniDump creation not compiled MiniDump oprettelse ikke kompileret @@ -1100,13 +1110,13 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + Audio Lyd - + CPU CPU @@ -1122,13 +1132,13 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + General Generelt - + Graphics Grafik @@ -1144,7 +1154,7 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + Controls Styring @@ -1160,7 +1170,7 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + System System @@ -1423,7 +1433,7 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + None Ingen @@ -1534,112 +1544,127 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: Vinduestilpassende Filter: - + Nearest Neighbor Nærmeste Nabo - + Bilinear Bilineær - + Bicubic Bikubisk - + Gaussian Gausisk - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ Superopløsning (Kun Vulkan) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: Anti-Aliaseringsmetode: - + FXAA FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Brug global baggrundsfarve - + Set background color: Angiv baggrundsfarve: - + Background Color: Baggrundsfarve: @@ -1684,76 +1709,96 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + + + + + Force maximum clocks (Vulkan only) + + + + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. VSync forhindrer skærmen i at frynse, men nogle grafikkort har lavere ydeevne med VSync aktiveret. Behold det aktiveret, hvis du ikke bemærker en forskel i ydeevne. - + Use VSync Brug VSync - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Aktiverer asynkron shader-kompilering, hvilket kan reducere shader-stammen. Denne funktion er eksperimentiel. - + Use asynchronous shader building (Hack) Brug asynkron shader-opbygning (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Aktiverer Hurtig GPU-Tid. Denne valgmulighed vil tvinge de fleste spil, til at køre i deres højeste indbyggede opløsning. - + Use Fast GPU Time (Hack) Brug Hurtig GPU-Tid (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Use pessimistic buffer flushes (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + Anisotropic Filtering: Anisotropisk Filtrering: - + Automatic - + Default Standard - + 2x - + 4x - + 8x - + 16x @@ -2141,7 +2186,7 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + Configure Konfigurér @@ -2167,6 +2212,7 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. + Requires restarting yuzu Kræver genstart af yuzu @@ -2186,22 +2232,27 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + + Enable direct JoyCon driver + + + + Enable mouse panning Aktivér kig med mus - + Mouse sensitivity Mus-følsomhed - + % % - + Motion / Touch Bevægelse / Berøring @@ -2313,7 +2364,7 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + Left Stick Venstre Styrepind @@ -2407,14 +2458,14 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + L L - + ZL ZL @@ -2433,7 +2484,7 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + Plus Plus @@ -2446,15 +2497,15 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - - + + R R - + ZR ZR @@ -2511,236 +2562,236 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + Right Stick Højre Styrepind - - - - + + + + Clear Ryd - - - - - + + + + + [not set] [ikke indstillet] - - + + Invert button - - + + Toggle button Funktionsskifteknap - - + + Invert axis Omvend akser - - - + + + Set threshold Angiv tærskel - - + + Choose a value between 0% and 100% Vælg en værdi imellem 0% og 100% - + Toggle axis - + Set gyro threshold - + Map Analog Stick Tilsted Analog Pind - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Bevæg, efter tryk på OK, først din styrepind vandret og så lodret. Bevæg, for at omvende akserne, først din styrepind lodret og så vandret. - + Center axis - - + + Deadzone: %1% Dødzone: %1% - - + + Modifier Range: %1% Forandringsrækkevidde: %1% - - + + Pro Controller Pro-Styringsenhed - + Dual Joycons Dobbelt-Joycon - + Left Joycon Venstre Joycon - + Right Joycon Højre Joycon - + Handheld Håndholdt - + GameCube Controller GameCube-Styringsenhed - + Poke Ball Plus - + NES Controller - + SNES Controller - + N64 Controller - + Sega Genesis - + Start / Pause Start / Pause - + Z Z - + Control Stick Styrepind - + C-Stick C-Pind - + Shake! Ryst! - + [waiting] [venter] - + New Profile Ny Profil - + Enter a profile name: Indtast et profilnavn: - - + + Create Input Profile Opret Input-Profil - + The given profile name is not valid! Det angivne profilnavn er ikke gyldigt! - + Failed to create the input profile "%1" Oprettelse af input-profil "%1" mislykkedes - + Delete Input Profile Slet Input-Profil - + Failed to delete the input profile "%1" Sletning af input-profil "%1" mislykkedes - + Load Input Profile Indlæs Input-Profil - + Failed to load the input profile "%1" Indlæsning af input-profil "%1" mislykkedes - + Save Input Profile Gem Input-Profil - + Failed to save the input profile "%1" Lagring af input-profil "%1" mislykkedes @@ -2788,7 +2839,7 @@ Bevæg, for at omvende akserne, først din styrepind lodret og så vandret. - + Configure Konfigurér @@ -2824,7 +2875,7 @@ Bevæg, for at omvende akserne, først din styrepind lodret og så vandret. - + Test Afprøv @@ -2844,77 +2895,77 @@ Bevæg, for at omvende akserne, først din styrepind lodret og så vandret.<a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Find Ud Af Mere</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters Portnummer indeholder ugyldige tegn - + Port has to be in range 0 and 65353 Port skal være imellem 0 and 65353 - + IP address is not valid IP-adresse er ikke gyldig - + This UDP server already exists Denne UDP-server eksisterer allerede - + Unable to add more than 8 servers Ude af stand til, at tilføje mere end 8 servere - + Testing Afprøvning - + Configuring Konfigurér - + Test Successful Afprøvning Lykkedes - + Successfully received data from the server. Modtagelse af data fra serveren lykkedes. - + Test Failed Afprøvning Mislykkedes - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Kunne ikke modtage gyldig data fra serveren.<br>Bekræft venligst, at serveren er opsat korrekt, og at adressen og porten er korrekte. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. UDP-Afprøvnings- eller -kalibreringskonfiguration er i gang.<br>vent venligst på, at de bliver færdige. @@ -3242,7 +3293,7 @@ UUID: %2 - Ring Sensor Parameters + Virtual Ring Sensor Parameters @@ -3263,33 +3314,90 @@ UUID: %2 Dødzone: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Gendan Standarder - + Clear Ryd - + [not set] [ikke indstillet] - + Invert axis Omvend akser - - + + Deadzone: %1% Dødzone: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Konfigurér + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [venter] @@ -3594,8 +3702,8 @@ UUID: %2 - English - Engelsk + American English + @@ -3728,22 +3836,27 @@ UUID: %2 Regenerér - + System settings are available only when game is not running. Systemindstillinger er kun tilgængelige, når spil ikke kører. - + + Warning: "%1" is not a valid language for region "%2" + + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Dette vil erstatte din nuværende virtuelle Switch med en ny. Din nuværende virtuelle Switch vil ikke kunne gendannes. Dette kan have uforudsete konsekvenser i spil. Dette kan fejle, hvis du bruger en forældet konfiguration fra gemte data. Fortsæt? - + Warning Advarsel - + Console ID: 0x%1 Konsol-ID: 0x%1 @@ -3814,7 +3927,7 @@ UUID: %2 TAS-Konfiguration - + Select TAS Load Directory... Vælg TAS-Indlæsningsmappe... @@ -4370,7 +4483,7 @@ Træk punkter, for at skifte position, eller dobbeltklik i tabelceller, for at r Styringsenhed P1 - + &Controller P1 &Styringsenhed P1 @@ -4383,42 +4496,37 @@ Træk punkter, for at skifte position, eller dobbeltklik i tabelceller, for at r - - IP Address + + Server Address - - IP + + <html><head/><body><p>Server address of the host</p></body></html> - - <html><head/><body><p>IPv4 address of the host</p></body></html> - - - - + Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> - + Nickname - + Password - + Connect @@ -4426,12 +4534,12 @@ Træk punkter, for at skifte position, eller dobbeltklik i tabelceller, for at r DirectConnectWindow - + Connecting - + Connect @@ -4501,858 +4609,868 @@ Træk punkter, for at skifte position, eller dobbeltklik i tabelceller, for at r - + &Clear Recent Files - + &Continue - + &Pause - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Advarsel, Forældet Spilformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. - - + + Error while loading ROM! Fejl under indlæsning af ROM! - + The ROM format is not supported. ROM-formatet understøttes ikke. - + An error occurred initializing the video core. Der skete en fejl under initialisering af video-kerne. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. - + (64-bit) - + (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit - + Closing software... - + Save Data - + Mod Data - + Error Opening %1 Folder Fejl ved Åbning af %1 Mappe - - + + Folder does not exist! Mappe eksisterer ikke! - + Error Opening Transferable Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + Remove File - - + + Error Removing Transferable Shader Cache - - + + A shader cache for this title does not exist. - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - - - Error Removing Transferable Shader Caches + + Error Removing Vulkan Driver Pipeline Cache + Failed to remove the driver pipeline cache. + + + + + + Error Removing Transferable Shader Caches + + + + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! RomFS-Udpakning Mislykkedes! - + There was an error copying the RomFS files or the user cancelled the operation. Der skete en fejl ved kopiering af RomFS-filerne, eller brugeren afbrød opgaven. - + Full Fuld - + Skeleton Skelet - + Select RomFS Dump Mode Vælg RomFS-Nedfældelsestilstand - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Udpakker RomFS... - - + + Cancel Afbryd - + RomFS Extraction Succeeded! RomFS-Udpakning Lykkedes! - + The operation completed successfully. Fuldførelse af opgaven lykkedes. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Fejl ved Åbning af %1 - + Select Directory Vælg Mappe - + Properties Egenskaber - + The game properties could not be loaded. Spil-egenskaberne kunne ikke indlæses. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch-Eksekverbar (%1);;Alle filer (*.*) - + Load File Indlæs Fil - + Open Extracted ROM Directory Åbn Udpakket ROM-Mappe - + Invalid Directory Selected Ugyldig Mappe Valgt - + The directory you have selected does not contain a 'main' file. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files - + %n file(s) remaining - + Installing file "%1"... Installér fil "%1"... - + Install Results - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systemapplikation - + System Archive Systemarkiv - + System Application Update Systemapplikationsopdatering - + Firmware Package (Type A) Firmwarepakke (Type A) - + Firmware Package (Type B) Firmwarepakke (Type B) - + Game Spil - + Game Update Spilopdatering - + Game DLC Spiludvidelse - + Delta Title Delta-Titel - + Select NCA Install Type... Vælg NCA-Installationstype... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) - + Failed to Install Installation mislykkedes - + The title type you selected for the NCA is invalid. - + File not found Fil ikke fundet - + File "%1" not found Fil "%1" ikke fundet - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Manglende yuzu-Konto - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. - + Error opening URL - + Unable to open the URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo-Fil (%1);; Alle Filer (*.*) - + Load Amiibo Indlæs Amiibo - + Error loading Amiibo data Fejl ved indlæsning af Amiibo-data - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Optag Skærmbillede - + PNG Image (*.png) PNG-Billede (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Hastighed: %1% / %2% - + Speed: %1% Hastighed: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Spil: %1 FPS - + Frame: %1 ms Billede: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL - + VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA FXAA - + SMAA - + Confirm Key Rederivation - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5363,76 +5481,76 @@ This will delete your autogenerated key files and re-run the key derivation modu - + Missing fuses - + - Missing BOOT0 - + - Missing BCPKG2-1-Normal-Main - + - Missing PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. - + Deriving Keys - + Select RomFS Dump Target - + Please select which RomFS you would like to dump. - + Are you sure you want to close yuzu? Er du sikker på, at du vil lukke yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Er du sikker på, at du vil stoppe emulereingen? Enhver ulagret data, vil gå tabt. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5442,44 +5560,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. - - + + Error while initializing OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. - + Error while initializing OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 @@ -5981,7 +6099,7 @@ Debug Message: Installér - + Install Files to NAND @@ -5989,7 +6107,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 @@ -6637,7 +6755,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE @@ -6686,31 +6804,31 @@ p, li { white-space: pre-wrap; } - + Shift Skift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [ikke indstillet] @@ -6721,14 +6839,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Akse %1%2 @@ -6739,262 +6857,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [ukendt] - + - + Left Venstre - + - + Right Højre - + - + Down ed - + - + Up Op - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Start - - + + L1 - - + + L2 - - + + L3 - - + + R1 - - + + R2 - - + + R3 - - + + Circle - - + + Cross - - + + Square - - + + Triangle - - + + Share - - + + Options - - + + [undefined] - + %1%2 - - + + [invalid] - - - - + + + + %1%2Hat %3 - - - - - - + + + + + + %1%2Axis %3 - - + + %1%2Axis %3,%4,%5 - - + + %1%2Motion %3 - - - - + + + + %1%2Button %3 - - + + [unused] [ubrugt] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Plus + + + + Minus + Minus + + + + Home Hjem - + + Capture + Optag + + + Touch Berøring - + Wheel Indicates the mouse wheel - + Backward - + Forward - + Task - + Extra - + %1%2%3 diff --git a/dist/languages/de.ts b/dist/languages/de.ts index eae45f337..6e4468f6f 100644 --- a/dist/languages/de.ts +++ b/dist/languages/de.ts @@ -240,7 +240,7 @@ This would ban both their forum username and their IP address. <html><head/><body><p>Does the game boot?</p></body></html> - + <html><head/><body>Startet das Spiel?</p></body></html> @@ -270,12 +270,12 @@ This would ban both their forum username and their IP address. Yes The game works without crashes - + Ja Das Spiel funktioniert ohne Abstürze. No The game crashes or freezes during gameplay - + Nein Das Spiel funktioniert nicht fehlerfrei. (Stürzt ab oder freezed) @@ -285,12 +285,12 @@ This would ban both their forum username and their IP address. Yes The game can be finished without any workarounds - + Ja Das Spiel kann ohne Workarounds abgeschlossen werden. No The game can't progress past a certain area - + Nein Spezielle Bereiche des Spieles können nicht abgeschlossen werden. @@ -330,7 +330,7 @@ This would ban both their forum username and their IP address. None Audio is played perfectly - + Keine Audio wird perfekt abgespielt @@ -767,7 +767,7 @@ This would ban both their forum username and their IP address. Enable Host MMU Emulation (exclusive memory instructions) - + Aktiviere Host MMU Emulation (exlusive memory instructions). @@ -914,102 +914,112 @@ This would ban both their forum username and their IP address. Macro-JIT deaktivieren - - When checked, yuzu will log statistics about the compiled pipeline cache + + When checked, it disables the macro HLE functions. Enabling this makes games run slower - + + Disable Macro HLE + Deaktiviert Macro-HLE + + + + When checked, yuzu will log statistics about the compiled pipeline cache + Wenn ausgewählt wird yuzu Log Statistiken über den kompilierte Pipeline Chache sammeln. + + + Enable Shader Feedback Shader-Feedback aktivieren - + When checked, it executes shaders without loop logic changes - + Disable Loop safety checks - + Debugging Debugging - + Enable Verbose Reporting Services** - + Enable FS Access Log FS-Zugriffslog aktivieren - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** - + Create Minidump After Crash - + Advanced Erweitert - + Kiosk (Quest) Mode Kiosk(Quest)-Modus - + Enable CPU Debugging CPU Debugging aktivieren - + Enable Debug Asserts aktiviere Debug-Meldungen - + Enable Auto-Stub** Auto-Stub** aktivieren - + Enable All Controller Types - + Disable Web Applet Deaktiviere die Web Applikation - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Perform Startup Vulkan Check - + **This will be reset automatically when yuzu closes. **Dies wird automatisch beim Schließen von yuzu zurückgesetzt. @@ -1024,12 +1034,12 @@ This would ban both their forum username and their IP address. yuzu muss neugestartet werden, damit diese Einstellungen übernommen werden können. - + Web applet not compiled - + Web-Applet nicht kompiliert - + MiniDump creation not compiled @@ -1080,13 +1090,13 @@ This would ban both their forum username and their IP address. - + Audio Audio - + CPU CPU @@ -1102,13 +1112,13 @@ This would ban both their forum username and their IP address. - + General Allgemein - + Graphics Grafik @@ -1124,7 +1134,7 @@ This would ban both their forum username and their IP address. - + Controls Steuerung @@ -1140,7 +1150,7 @@ This would ban both their forum username and their IP address. - + System System @@ -1326,7 +1336,7 @@ This would ban both their forum username and their IP address. Extended memory layout (6GB DRAM) - + Erweitertes Speicherlayout (6GB DRAM) @@ -1403,7 +1413,7 @@ This would ban both their forum username and their IP address. - + None Keiner @@ -1514,112 +1524,127 @@ This would ban both their forum username and their IP address. + 1.5X (1080p/1620p) [EXPERIMENTAL] + 1.5X (1080p/1620p) [EXPERIMENTELL] + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + 7X (5040p/7560p) + + + + 8X (5760p/8640p) + 8X (5760p/8640p) + + + Window Adapting Filter: - + Nearest Neighbor - + Bilinear Bilinear - + Bicubic Bikubisch - + Gaussian - + Gaussian - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ Super Resolution (nur Vulkan) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: Kantenglättungs-Methode: - + FXAA FXAA - + SMAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% 100% - - + + Use global background color Globale Hintergrundfarbe verwenden - + Set background color: Hintergrundfarbe: - + Background Color: Hintergrundfarbe: @@ -1664,76 +1689,96 @@ This would ban both their forum username and their IP address. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + + + + + Force maximum clocks (Vulkan only) + + + + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. VSync verhindert Screen-Tearing, aber manche Grafikkarten haben eine schlechtere Leistung, wenn es aktiviert ist. Wenn du keinen Unterschied merkst, lasse es aktiviert. - + Use VSync VSync verwenden - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Nutze asynchrone Shader-Kompilierung. Dies kann Stottern durch Shader reduzieren. Dieses Feature ist experimentell. - + Use asynchronous shader building (Hack) - + Aktiviere asynchrones Shader Kompilieren. (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Use Fast GPU Time (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Use pessimistic buffer flushes (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + Vulkan-Pipeline-Cache verwernden + + + Anisotropic Filtering: Anisotrope Filterung: - + Automatic Automatisch - + Default Standard - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2121,7 +2166,7 @@ This would ban both their forum username and their IP address. - + Configure Konfigurieren @@ -2147,6 +2192,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu Erfordet Neustart von yuzu @@ -2166,22 +2212,27 @@ This would ban both their forum username and their IP address. Controller-Navigation - + + Enable direct JoyCon driver + + + + Enable mouse panning Maus-Panning aktivieren - + Mouse sensitivity Maus-Empfindlichkeit - + % % - + Motion / Touch Bewegung / Touch @@ -2246,7 +2297,7 @@ This would ban both their forum username and their IP address. Use global input configuration - + Verwende globale Eingabe-Konfiguration @@ -2293,7 +2344,7 @@ This would ban both their forum username and their IP address. - + Left Stick Linker Analogstick @@ -2387,14 +2438,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2413,7 +2464,7 @@ This would ban both their forum username and their IP address. - + Plus Plus @@ -2426,15 +2477,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2491,236 +2542,236 @@ This would ban both their forum username and their IP address. - + Right Stick Rechter Analogstick - - - - + + + + Clear Löschen - - - - - + + + + + [not set] [nicht belegt] - - + + Invert button Knopf invertieren - - + + Toggle button Taste umschalten - - + + Invert axis Achsen umkehren - - - + + + Set threshold - - + + Choose a value between 0% and 100% Wert zwischen 0% und 100% wählen - + Toggle axis - + Set gyro threshold - + Map Analog Stick Analog-Stick festlegen - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Nach dem Drücken von OK den Joystick zuerst horizontal, dann vertikal bewegen. Um die Achsen umzukehren, bewege den Joystick zuerst vertikal und dann horizontal. - + Center axis Achse zentrieren - - + + Deadzone: %1% Deadzone: %1% - - + + Modifier Range: %1% Modifikator-Radius: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Zwei Joycons - + Left Joycon Linker Joycon - + Right Joycon Rechter Joycon - + Handheld Handheld - + GameCube Controller GameCube-Controller - + Poke Ball Plus Poke-Ball Plus - + NES Controller NES Controller - + SNES Controller SNES Controller - + N64 Controller N64 Controller - + Sega Genesis Sega Genesis - + Start / Pause Start / Pause - + Z Z - + Control Stick Analog Stick - + C-Stick C-Stick - + Shake! Schütteln! - + [waiting] [wartet] - + New Profile Neues Profil - + Enter a profile name: Profilnamen eingeben: - - + + Create Input Profile Eingabeprofil erstellen - + The given profile name is not valid! Angegebener Profilname ist nicht gültig! - + Failed to create the input profile "%1" Erstellen des Eingabeprofils "%1" ist fehlgeschlagen - + Delete Input Profile Eingabeprofil löschen - + Failed to delete the input profile "%1" Löschen des Eingabeprofils "%1" ist fehlgeschlagen - + Load Input Profile Eingabeprofil laden - + Failed to load the input profile "%1" Laden des Eingabeprofils "%1" ist fehlgeschlagen - + Save Input Profile Eingabeprofil speichern - + Failed to save the input profile "%1" Speichern des Eingabeprofils "%1" ist fehlgeschlagen @@ -2768,7 +2819,7 @@ Um die Achsen umzukehren, bewege den Joystick zuerst vertikal und dann horizonta - + Configure Einrichtung @@ -2804,7 +2855,7 @@ Um die Achsen umzukehren, bewege den Joystick zuerst vertikal und dann horizonta - + Test Testen @@ -2824,77 +2875,77 @@ Um die Achsen umzukehren, bewege den Joystick zuerst vertikal und dann horizonta <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Mehr erfahren</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters Port-Nummer hat ungültige Zeichen - + Port has to be in range 0 and 65353 Port muss zwischen 0 und 65353 liegen - + IP address is not valid IP Adresse ist ungültig - + This UDP server already exists Dieser UDP-Server existiert bereits - + Unable to add more than 8 servers Es können nicht mehr als 8 Server hinzugefügt werden - + Testing Testen - + Configuring Einrichten - + Test Successful Test erfolgreich - + Successfully received data from the server. Daten wurden erfolgreich vom Server empfangen. - + Test Failed Test fehlgeschlagen - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Konnte keine Daten vom Server empfangen.<br>Prüfe bitte, dass der Server korrekt eingerichtet wurde und dass Adresse und Port korrekt sind. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. UDP-Test oder Kalibration wird gerade durchgeführt.<br>Bitte warte einen Moment. @@ -3222,7 +3273,7 @@ UUID: %2 - Ring Sensor Parameters + Virtual Ring Sensor Parameters @@ -3243,33 +3294,90 @@ UUID: %2 Deadzone: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Standardwerte wiederherstellen - + Clear Löschen - + [not set] [nicht belegt] - + Invert axis Achsen umkehren - - + + Deadzone: %1% Deadzone: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Einrichten + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [wartet] @@ -3574,8 +3682,8 @@ UUID: %2 - English - Englisch + American English + Amerikanisches Englisch @@ -3675,7 +3783,7 @@ UUID: %2 Device Name - + Gerätename @@ -3708,22 +3816,27 @@ UUID: %2 Neu generieren - + System settings are available only when game is not running. Die Systemeinstellungen sind nur verfügbar, wenn kein Spiel aktiv ist. - + + Warning: "%1" is not a valid language for region "%2" + + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Dieser Vorgang wird deine momentane "virtuelle Switch" mit einer Neuen ersetzen. Deine momentane "virtuelle Switch" wird nicht wiederherstellbar sein. Dies könnte einige unerwartete Effekte in manchen Spielen mit sich bringen. Zudem könnte der Prozess fehlschlagen, wenn zu alte Daten verwendet werden. Möchtest du den Vorgang fortsetzen? - + Warning Warnung - + Console ID: 0x%1 Konsolen ID: 0x%1 @@ -3794,9 +3907,9 @@ UUID: %2 TAS-Konfiguration - + Select TAS Load Directory... - + TAS-Lade-Verzeichnis auswählen... @@ -4350,7 +4463,7 @@ Ziehe die Punkte mit deiner Maus, um ihre Position zu ändern. Doppelklicke auf Controller P1 - + &Controller P1 &Controller P1 @@ -4363,42 +4476,37 @@ Ziehe die Punkte mit deiner Maus, um ihre Position zu ändern. Doppelklicke auf Direkt verbinden - - IP Address - IP-Addresse + + Server Address + - - IP - IP + + <html><head/><body><p>Server address of the host</p></body></html> + - - <html><head/><body><p>IPv4 address of the host</p></body></html> - <html><head/><body><p>IPv4 Addresse des Hosts</p></body></html> - - - + Port Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> - + Nickname Nickname - + Password Passwort - + Connect Verbinden @@ -4406,12 +4514,12 @@ Ziehe die Punkte mit deiner Maus, um ihre Position zu ändern. Doppelklicke auf DirectConnectWindow - + Connecting Verbinde - + Connect Verbinden @@ -4481,472 +4589,482 @@ Ziehe die Punkte mit deiner Maus, um ihre Position zu ändern. Doppelklicke auf Zeit, die gebraucht wurde, um einen Switch-Frame zu emulieren, ohne Framelimit oder V-Sync. Für eine Emulation bei voller Geschwindigkeit sollte dieser Wert bei höchstens 16.67ms liegen. - + &Clear Recent Files &Zuletzt geladene Dateien leeren - + &Continue &Fortsetzen - + &Pause &Pause - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu betreibt ein Speil - + Warning Outdated Game Format Warnung veraltetes Spielformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Du nutzt eine entpackte ROM-Ordnerstruktur für dieses Spiel, welches ein veraltetes Format ist und von anderen Formaten wie NCA, NAX, XCI oder NSP überholt wurde. Entpackte ROM-Ordner unterstützen keine Icons, Metadaten oder Updates.<br><br><a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Unser Wiki</a> enthält eine Erklärung der verschiedenen Formate, die yuzu unterstützt. Diese Nachricht wird nicht noch einmal angezeigt. - - + + Error while loading ROM! ROM konnte nicht geladen werden! - + The ROM format is not supported. ROM-Format wird nicht unterstützt. - + An error occurred initializing the video core. Beim Initialisieren des Video-Kerns ist ein Fehler aufgetreten. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. ROM konnte nicht geladen werden! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Bitte folge der <a href='https://yuzu-emu.org/help/quickstart/'>yuzu-Schnellstart-Anleitung</a> um deine Dateien zu extrahieren.<br>Hilfe findest du im yuzu-Wiki</a> oder dem yuzu-Discord</a>. - + An unknown error occurred. Please see the log for more details. Ein unbekannter Fehler ist aufgetreten. Bitte prüfe die Log-Dateien auf mögliche Fehlermeldungen. - + (64-bit) (64-Bit) - + (32-bit) (32-Bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Schließe Software... - + Save Data Speicherdaten - + Mod Data Mod-Daten - + Error Opening %1 Folder Konnte Verzeichnis %1 nicht öffnen - - + + Folder does not exist! Verzeichnis existiert nicht! - + Error Opening Transferable Shader Cache Fehler beim Öffnen des transferierbaren Shader-Caches - + Failed to create the shader cache directory for this title. - + Fehler beim erstellen des Shader-Cache-Ordner für den ausgewählten Titel. - + Error Removing Contents - + Error Removing Update Fehler beim Entfernen des Updates - + Error Removing DLC Fehler beim Entfernen des DLCs - + Remove Installed Game Contents? - + Installierten Spiele-Content entfernen? - + Remove Installed Game Update? Installierte Spiele-Updates entfernen? - + Remove Installed Game DLC? Installierte Spiele-DLCs entfernen? - + Remove Entry Eintrag entfernen - - - - - - + + + + + + Successfully Removed Erfolgreich entfernt - + Successfully removed the installed base game. Das Spiel wurde entfernt. - + The base game is not installed in the NAND and cannot be removed. Das Spiel ist nicht im NAND installiert und kann somit nicht entfernt werden. - + Successfully removed the installed update. Das Update wurde entfernt. - + There is no update installed for this title. Es ist kein Update für diesen Titel installiert. - + There are no DLC installed for this title. Es sind keine DLC für diesen Titel installiert. - + Successfully removed %1 installed DLC. %1 DLC entfernt. - + Delete OpenGL Transferable Shader Cache? Transferierbaren OpenGL Shader Cache löschen? - + Delete Vulkan Transferable Shader Cache? Transferierbaren Vulkan Shader Cache löschen? - + Delete All Transferable Shader Caches? Alle transferierbaren Shader Caches löschen? - + Remove Custom Game Configuration? Spiel-Einstellungen entfernen? - + Remove File Datei entfernen - - + + Error Removing Transferable Shader Cache Fehler beim Entfernen - - + + A shader cache for this title does not exist. Es existiert kein Shader-Cache für diesen Titel. - + Successfully removed the transferable shader cache. Der transferierbare Shader-Cache wurde entfernt. - + Failed to remove the transferable shader cache. Konnte den transferierbaren Shader-Cache nicht entfernen. - - + + Error Removing Vulkan Driver Pipeline Cache + Fehler beim Entfernen des Vulkan-Pipeline-Cache + + + + Failed to remove the driver pipeline cache. + Fehler beim Entfernen des Driver-Pipeline-Cache + + + + Error Removing Transferable Shader Caches Fehler beim Entfernen der transferierbaren Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Fehler beim Entfernen - + A custom configuration for this title does not exist. Es existieren keine Spiel-Einstellungen für dieses Spiel. - + Successfully removed the custom game configuration. Die Spiel-Einstellungen wurden entfernt. - + Failed to remove the custom game configuration. Die Spiel-Einstellungen konnten nicht entfernt werden. - - + + RomFS Extraction Failed! RomFS-Extraktion fehlgeschlagen! - + There was an error copying the RomFS files or the user cancelled the operation. Das RomFS konnte wegen eines Fehlers oder Abbruchs nicht kopiert werden. - + Full Komplett - + Skeleton Nur Ordnerstruktur - + Select RomFS Dump Mode RomFS Extraktions-Modus auswählen - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Bitte wähle, wie das RomFS gespeichert werden soll.<br>"Full" wird alle Dateien des Spiels extrahieren, während <br>"Skeleton" nur die Ordnerstruktur erstellt. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Es ist nicht genügend Speicher (%1) vorhanden um das RomFS zu entpacken. Bitte sorge für genügend Speicherplatze oder wähle ein anderes Verzeichnis aus. (Emulation > Konfiguration > System > Dateisystem > Dump Root) - + Extracting RomFS... RomFS wird extrahiert... - - + + Cancel Abbrechen - + RomFS Extraction Succeeded! RomFS wurde extrahiert! - + The operation completed successfully. Der Vorgang wurde erfolgreich abgeschlossen. - - - - - + + + + + Create Shortcut Verknüpfung erstellen - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Icon erstellen - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Fehler beim Öffnen von %1 - + Select Directory Verzeichnis auswählen - + Properties Einstellungen - + The game properties could not be loaded. Spiel-Einstellungen konnten nicht geladen werden. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch-Programme (%1);;Alle Dateien (*.*) - + Load File Datei laden - + Open Extracted ROM Directory Öffne das extrahierte ROM-Verzeichnis - + Invalid Directory Selected Ungültiges Verzeichnis ausgewählt - + The directory you have selected does not contain a 'main' file. Das Verzeichnis, das du ausgewählt hast, enthält keine 'main'-Datei. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Installierbares Switch-Programm (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submissions Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Dateien installieren - + %n file(s) remaining %n Datei verbleibend%n Dateien verbleibend - + Installing file "%1"... Datei "%1" wird installiert... - + Install Results NAND-Installation - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Um Konflikte zu vermeiden, raten wir Nutzern davon ab, Spiele im NAND zu installieren. Bitte nutze diese Funktion nur zum Installieren von Updates und DLC. - + %n file(s) were newly installed %n file was newly installed @@ -4954,389 +5072,389 @@ Bitte nutze diese Funktion nur zum Installieren von Updates und DLC. - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systemanwendung - + System Archive Systemarchiv - + System Application Update Systemanwendungsupdate - + Firmware Package (Type A) Firmware-Paket (Typ A) - + Firmware Package (Type B) Firmware-Paket (Typ B) - + Game Spiel - + Game Update Spiel-Update - + Game DLC Spiel-DLC - + Delta Title Delta-Titel - + Select NCA Install Type... Wähle den NCA-Installationstyp aus... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Bitte wähle, als was diese NCA installiert werden soll: (In den meisten Fällen sollte die Standardeinstellung 'Spiel' ausreichen.) - + Failed to Install Installation fehlgeschlagen - + The title type you selected for the NCA is invalid. Der Titel-Typ, den du für diese NCA ausgewählt hast, ist ungültig. - + File not found Datei nicht gefunden - + File "%1" not found Datei "%1" nicht gefunden - + OK OK - - + + Hardware requirements not met Hardwareanforderungen nicht erfüllt - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Fehlender yuzu-Account - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Um einen Kompatibilitätsbericht abzuschicken, musst du einen yuzu-Account mit yuzu verbinden.<br><br/>Um einen yuzu-Account zu verbinden, prüfe die Einstellungen unter Emulation &gt; Konfiguration &gt; Web. - + Error opening URL Fehler beim Öffnen der URL - + Unable to open the URL "%1". URL "%1" kann nicht geöffnet werden. - + TAS Recording TAS Aufnahme - + Overwrite file of player 1? Datei von Spieler 1 überschreiben? - + Invalid config detected Ungültige Konfiguration erkannt - + Handheld controller can't be used on docked mode. Pro controller will be selected. Handheld-Controller können nicht im Dock verwendet werden. Der Pro-Controller wird verwendet. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Das aktuelle Amiibo wurde entfernt - + Error Fehler - - + + The current game is not looking for amiibos Das aktuelle Spiel sucht nicht nach Amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo-Datei (%1);; Alle Dateien (*.*) - + Load Amiibo Amiibo laden - + Error loading Amiibo data Fehler beim Laden der Amiibo-Daten - + The selected file is not a valid amiibo Die ausgewählte Datei ist keine gültige Amiibo - + The selected file is already on use Die ausgewählte Datei wird bereits verwendet - + An unknown error occurred Ein unbekannter Fehler ist aufgetreten - + Capture Screenshot Screenshot aufnehmen - + PNG Image (*.png) PNG Bild (*.png) - + TAS state: Running %1/%2 TAS Zustand: Läuft %1/%2 - + TAS state: Recording %1 TAS Zustand: Aufnahme %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid TAS Zustand: Ungültig - + &Stop Running - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Skalierung: %1x - + Speed: %1% / %2% Geschwindigkeit: %1% / %2% - + Speed: %1% Geschwindigkeit: %1% - + Game: %1 FPS (Unlocked) Spiel: %1 FPS (Unbegrenzt) - + Game: %1 FPS Spiel: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HOCH - + GPU EXTREME GPU EXTREM - + GPU ERROR GPU FEHLER - + DOCKED DOCKED - + HANDHELD HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST NÄCHSTER - - + + BILINEAR BILINEAR - + BICUBIC BIKUBISCH - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA - + KEIN AA - + FXAA FXAA - + SMAA - + SMAA - + Confirm Key Rederivation Schlüsselableitung bestätigen - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5349,37 +5467,37 @@ This will delete your autogenerated key files and re-run the key derivation modu Dieser Prozess wird die generierten Schlüsseldateien löschen und die Schlüsselableitung neu starten. - + Missing fuses Fuses fehlen - + - Missing BOOT0 - BOOT0 fehlt - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main fehlt - + - Missing PRODINFO - PRODINFO fehlt - + Derivation Components Missing Derivationskomponenten fehlen - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5387,39 +5505,39 @@ on your system's performance. Dies könnte, je nach Leistung deines Systems, bis zu einer Minute dauern. - + Deriving Keys Schlüsselableitung - + Select RomFS Dump Target RomFS wählen - + Please select which RomFS you would like to dump. Wähle, welches RomFS du speichern möchtest. - + Are you sure you want to close yuzu? Bist du sicher, dass du yuzu beenden willst? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Bist du sicher, dass du die Emulation stoppen willst? Jeder nicht gespeicherte Fortschritt geht verloren. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5431,44 +5549,44 @@ Möchtest du dies umgehen und sie trotzdem beenden? GRenderWindow - - + + OpenGL not available! OpenGL nicht verfügbar! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu wurde nicht mit OpenGL-Unterstützung kompiliert. - - + + Error while initializing OpenGL! Fehler beim Initialisieren von OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Deine Grafikkarte unterstützt kein OpenGL oder du hast nicht den neusten Treiber installiert. - + Error while initializing OpenGL 4.6! Fehler beim Initialisieren von OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Deine Grafikkarte unterstützt OpenGL 4.6 nicht, oder du benutzt nicht die neuste Treiberversion.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Deine Grafikkarte unterstützt anscheinend nicht eine oder mehrere von yuzu benötigten OpenGL-Erweiterungen. Bitte stelle sicher, dass du den neusten Grafiktreiber installiert hast.<br><br>GL Renderer:<br>%1<br><br>Nicht unterstützte Erweiterungen:<br>%2 @@ -5574,7 +5692,7 @@ Möchtest du dies umgehen und sie trotzdem beenden? Add to Desktop - + Zum Desktop hinzufügen @@ -5818,7 +5936,7 @@ Debug Message: Audio Mute/Unmute - + Audio aktivieren / deaktivieren @@ -5970,7 +6088,7 @@ Debug Message: Installieren - + Install Files to NAND Dateien im NAND installieren @@ -5978,10 +6096,10 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 - + Der Text darf keines der folgenden Zeichen enthalten: %1 @@ -6631,7 +6749,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE START/PAUSE @@ -6680,31 +6798,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Strg - + Alt Alt - - - - + + + + [not set] [nicht gesetzt] @@ -6715,14 +6833,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Achse %1%2 @@ -6733,262 +6851,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [unbekannt] - + - + Left Links - + - + Right Rechts - + - + Down Runter - + - + Up Hoch - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Start - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle Kreis - - + + Cross Kreuz - - + + Square Quadrat - - + + Triangle Dreieck - - + + Share Teilen - - + + Options Optionen - - + + [undefined] [undefiniert] - + %1%2 %1%2 - - + + [invalid] [ungültig] - - - - + + + + %1%2Hat %3 - - - - - - + + + + + + %1%2Axis %3 %1%2Achse %3 - - + + %1%2Axis %3,%4,%5 %1%2Achse %3,%4,%5 - - + + %1%2Motion %3 %1%2Bewegung %3 - - - - + + + + %1%2Button %3 %1%2Knopf %3 - - + + [unused] [unbenutzt] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Plus + + + + Minus + Minus + + + + Home Home - + + Capture + Screenshot + + + Touch Touch - + Wheel Indicates the mouse wheel Mausrad - + Backward Rückwärts - + Forward Vorwärts - + Task Aufgabe - + Extra Extra - + %1%2%3 %1%2%3 diff --git a/dist/languages/el.ts b/dist/languages/el.ts index 09e3ff297..f6673c345 100644 --- a/dist/languages/el.ts +++ b/dist/languages/el.ts @@ -918,102 +918,112 @@ This would ban both their forum username and their IP address. Απενεργοποίηση του Macro JIT - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + + + + + Disable Macro HLE + + + + When checked, yuzu will log statistics about the compiled pipeline cache - + Enable Shader Feedback Ενεργοποίηση Shader Feedback - + When checked, it executes shaders without loop logic changes Όταν είναι επιλεγμένο, εκτελεί shaders χωρίς αλλαγές στη λογική του βρόχου - + Disable Loop safety checks Απενεργοποίηση των ελέγχων ασφαλείας βρόχου - + Debugging Εντοπισμός Σφαλμάτων - + Enable Verbose Reporting Services** - + Enable FS Access Log - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** - + Create Minidump After Crash Δημιουργία Minidump μετά από κατάρρευση - + Advanced Προχωρημένα - + Kiosk (Quest) Mode - + Enable CPU Debugging Ενεργοποίηση Εντοπισμού Σφαλμάτων CPU - + Enable Debug Asserts Ενεργοποίηση Βεβαιώσεων Εντοπισμού Σφαλμάτων - + Enable Auto-Stub** Ενεργοποίηση Auto-Stub** - + Enable All Controller Types - + Disable Web Applet - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. Επιτρέπει στο yuzu να ελέγχει για ένα λειτουργικό περιβάλλον Vulkan κατά την εκκίνηση του προγράμματος. Απενεργοποιήστε το αν αυτό προκαλεί προβλήματα με τα εξωτερικά προγράμματα που βλέπουν το yuzu. - + Perform Startup Vulkan Check Εκτέλεση ελέγχου Vulkan κατά την εκκίνηση - + **This will be reset automatically when yuzu closes. **Αυτό θα μηδενιστεί αυτόματα όταν το yuzu κλείσει. @@ -1028,12 +1038,12 @@ This would ban both their forum username and their IP address. το yuzu πρέπει να επανεκκινηθεί για να εφαρμοστεί αυτή η ρύθμιση. - + Web applet not compiled Το web applet δεν έχει συσταθεί - + MiniDump creation not compiled Δημιουργία MiniDump που δεν έχει συσταθεί @@ -1084,13 +1094,13 @@ This would ban both their forum username and their IP address. - + Audio Ήχος - + CPU CPU @@ -1106,13 +1116,13 @@ This would ban both their forum username and their IP address. - + General Γενικά - + Graphics Γραφικά @@ -1128,7 +1138,7 @@ This would ban both their forum username and their IP address. - + Controls Χειρισμός @@ -1144,7 +1154,7 @@ This would ban both their forum username and their IP address. - + System Σύστημα @@ -1407,7 +1417,7 @@ This would ban both their forum username and their IP address. - + None Κανένα @@ -1518,112 +1528,127 @@ This would ban both their forum username and their IP address. + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: Φίλτρο Προσαρμογής Παραθύρου: - + Nearest Neighbor Πλησιέστερος Γείτονας - + Bilinear Διγραμμικό - + Bicubic Δικυβικό - + Gaussian Gaussian - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ Super Resolution (μόνο Vulkan) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: Μέθοδος Anti-Aliasing: - + FXAA FXAA - + SMAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - + 100% - - + + Use global background color Χρησιμοποιήστε καθολικό χρώμα φόντου - + Set background color: Ορισμός χρώματος φόντου: - + Background Color: Χρώμα Φόντου: @@ -1668,76 +1693,96 @@ This would ban both their forum username and their IP address. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + + + + + Force maximum clocks (Vulkan only) + + + + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. Το VSync αποτρέπει το "σκίσιμο" της οθόνης, αλλά ορισμένες κάρτες γραφικών έχουν χαμηλότερη απόδοση με ενεργοποιημένο το VSync. Διατηρήστε το ενεργοποιημένο εάν δεν παρατηρείτε διαφορά απόδοσης. - + Use VSync Χρήση VSync - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Ενεργοποιεί τη σύνταξη ασύγχρονων shader, η οποία μπορεί να μειώσει το shader stutter. Αυτή η δυνατότητα είναι πειραματική. - + Use asynchronous shader building (Hack) Χρήση ασύγχρονης σύνταξης σκίασης (Τέχνασμα) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Ενεργοποιεί τον Γοργό Ρυθμό GPU. Αυτή η επιλογή θα αναγκάσει τα περισσότερα παιχνίδια να εκτελούνται στην υψηλότερη εγγενή τους ανάλυση. - + Use Fast GPU Time (Hack) Χρήση Γοργού Ρυθμού GPU (Τέχνασμα) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. Ενεργοποιεί περιστασιακές εκκαθαρίσεις των ρυθμιστικών διαύλων. Αυτή η επιλογή θα αναγκάσει τους μη τροποποιημένους ρυθμιστικούς διαύλους να εκκαθαριστούν, πράγμα που μπορεί να κοστίσει σε απόδοση. - + Use pessimistic buffer flushes (Hack) Χρήση περιστασιακών εκκαθαρίσεων ρυθμιστικού διαύλου (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + Anisotropic Filtering: Ανισοτροπικό Φιλτράρισμα: - + Automatic Αυτόματα - + Default Προεπιλεγμένο - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2125,7 +2170,7 @@ This would ban both their forum username and their IP address. - + Configure Διαμόρφωση @@ -2151,6 +2196,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu Απαιτεί επανεκκίνηση του yuzu @@ -2170,22 +2216,27 @@ This would ban both their forum username and their IP address. Πλοήγηση χειριστηρίου - + + Enable direct JoyCon driver + + + + Enable mouse panning Ενεργοποιήστε τη μετατόπιση του ποντικιού - + Mouse sensitivity Ευαισθησία ποντικιού - + % % - + Motion / Touch @@ -2297,7 +2348,7 @@ This would ban both their forum username and their IP address. - + Left Stick Αριστερό Stick @@ -2391,14 +2442,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2417,7 +2468,7 @@ This would ban both their forum username and their IP address. - + Plus Συν @@ -2430,15 +2481,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2495,236 +2546,236 @@ This would ban both their forum username and their IP address. - + Right Stick Δεξιός Μοχλός - - - - + + + + Clear Καθαρισμός - - - - - + + + + + [not set] [άδειο] - - + + Invert button Κουμπί αντιστροφής - - + + Toggle button Κουμπί εναλλαγής - - + + Invert axis Αντιστροφή άξονα - - - + + + Set threshold Ορισμός ορίου - - + + Choose a value between 0% and 100% Επιλέξτε μια τιμή μεταξύ 0% και 100% - + Toggle axis Εναλλαγή αξόνων - + Set gyro threshold Ρύθμιση κατωφλίου γυροσκοπίου - + Map Analog Stick Χαρτογράφηση Αναλογικού Stick - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Αφού πατήσετε OK, μετακινήστε πρώτα το joystick σας οριζόντια και μετά κατακόρυφα. Για να αντιστρέψετε τους άξονες, μετακινήστε πρώτα το joystick κατακόρυφα και μετά οριζόντια. - + Center axis Κεντρικός άξονας - - + + Deadzone: %1% Νεκρή Ζώνη: %1% - - + + Modifier Range: %1% Εύρος Τροποποιητή: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Διπλά Joycons - + Left Joycon Αριστερό Joycon - + Right Joycon Δεξί Joycon - + Handheld Handheld - + GameCube Controller Χειριστήριο GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Χειριστήριο NES - + SNES Controller Χειριστήριο SNES - + N64 Controller Χειριστήριο N64 - + Sega Genesis Sega Genesis - + Start / Pause - + Z Z - + Control Stick - + C-Stick C-Stick - + Shake! - + [waiting] [αναμονή] - + New Profile Νέο Προφίλ - + Enter a profile name: Εισαγάγετε ένα όνομα προφίλ: - - + + Create Input Profile Δημιουργία Προφίλ Χειρισμού - + The given profile name is not valid! Το όνομα του προφίλ δεν είναι έγκυρο! - + Failed to create the input profile "%1" Η δημιουργία του προφίλ χειρισμού "%1" απέτυχε - + Delete Input Profile Διαγραφή Προφίλ Χειρισμού - + Failed to delete the input profile "%1" Η διαγραφή του προφίλ χειρισμού "%1" απέτυχε - + Load Input Profile Φόρτωση Προφίλ Χειρισμού - + Failed to load the input profile "%1" Η φόρτωση του προφίλ χειρισμού "%1" απέτυχε - + Save Input Profile Αποθήκευση Προφίλ Χειρισμού - + Failed to save the input profile "%1" Η αποθήκευση του προφίλ χειρισμού "%1" απέτυχε @@ -2772,7 +2823,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Configure Διαμόρφωση @@ -2784,7 +2835,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< CemuhookUDP Config - + CemuhookUDP Config @@ -2808,7 +2859,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Test Τεστ @@ -2828,77 +2879,77 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters Ο αριθμός θύρας έχει μη έγκυρους χαρακτήρες - + Port has to be in range 0 and 65353 Η θύρα πρέπει να ανήκει στο εύρος 0 και 65353 - + IP address is not valid Η διεύθυνση IP δεν είναι έγκυρη - + This UDP server already exists Αυτός ο διακομιστής UDP υπάρχει ήδη - + Unable to add more than 8 servers Δεν είναι δυνατή η προσθήκη περισσότερων από 8 διακομιστών - + Testing Δοκιμή - + Configuring Διαμόρφωση - + Test Successful Τεστ Επιτυχές - + Successfully received data from the server. Λήφθηκαν με επιτυχία δεδομένα από τον διακομιστή. - + Test Failed Η Δοκιμή Απέτυχε - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Δεν ήταν δυνατή η λήψη έγκυρων δεδομένων από τον διακομιστή.<br>Βεβαιωθείτε ότι ο διακομιστής έχει ρυθμιστεί σωστά και ότι η διεύθυνση και η θύρα είναι σωστές. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. Η δοκιμή UDP ή η διαμόρφωση βαθμονόμησης είναι σε εξέλιξη.<br>Παρακαλώ περιμένετε να τελειώσουν. @@ -3226,7 +3277,7 @@ UUID: %2 - Ring Sensor Parameters + Virtual Ring Sensor Parameters @@ -3247,33 +3298,90 @@ UUID: %2 Νεκρή Ζώνη: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Επαναφορά Προεπιλογών - + Clear Καθαρισμός - + [not set] [μη ορισμένο] - + Invert axis Αντιστροφή άξονα - - + + Deadzone: %1% Νεκρή Ζώνη: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Διαμόρφωση + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [αναμονή] @@ -3578,8 +3686,8 @@ UUID: %2 - English - Αγγλικά + American English + @@ -3712,22 +3820,27 @@ UUID: %2 Εκ Νέου Αντικατάσταση - + System settings are available only when game is not running. Οι ρυθμίσεις συστήματος είναι διαθέσιμες μόνο όταν το παιχνίδι δεν εκτελείται. - + + Warning: "%1" is not a valid language for region "%2" + + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Αυτό θα αντικαταστήσει το τρέχων εικονικό σας Switch με ένα νέο, και το παλιό δεν θα είναι πια ανακτήσιμο. Αυτό μπορεί να έχει απροσδόκητα αποτελέσματα στα παιχνίδια. Επίσης, μπορεί να αποτύχει εάν χρησιμοποιείτε ένα ξεπερασμένο μέσο αποθήκευσης παιχνιδιού. Συνέχιση; - + Warning Προσοχή - + Console ID: 0x%1 Console ID: 0x%1 @@ -3798,7 +3911,7 @@ UUID: %2 Ρυθμίσεις TAS - + Select TAS Load Directory... @@ -4353,7 +4466,7 @@ Drag points to change position, or double-click table cells to edit values. - + &Controller P1 @@ -4366,42 +4479,37 @@ Drag points to change position, or double-click table cells to edit values. - - IP Address + + Server Address - - IP + + <html><head/><body><p>Server address of the host</p></body></html> - - <html><head/><body><p>IPv4 address of the host</p></body></html> - - - - + Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> - + Nickname - + Password - + Connect @@ -4409,12 +4517,12 @@ Drag points to change position, or double-click table cells to edit values. DirectConnectWindow - + Connecting - + Connect @@ -4484,33 +4592,33 @@ Drag points to change position, or double-click table cells to edit values. - + &Clear Recent Files - + &Continue &Συνέχεια - + &Pause &Παύση - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Μη μεταφρασμένη συμβολοσειρά @@ -4518,829 +4626,839 @@ Drag points to change position, or double-click table cells to edit values. - - + + Error while loading ROM! Σφάλμα κατά τη φόρτωση της ROM! - + The ROM format is not supported. - + An error occurred initializing the video core. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Εμφανίστηκε ένα απροσδιόριστο σφάλμα. Ανατρέξτε στο αρχείο καταγραφής για περισσότερες λεπτομέρειες. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Αποθήκευση δεδομένων - + Mod Data - + Error Opening %1 Folder - - + + Folder does not exist! Ο φάκελος δεν υπάρχει! - + Error Opening Transferable Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + Remove File Αφαίρεση Αρχείου - - + + Error Removing Transferable Shader Cache - - + + A shader cache for this title does not exist. - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - - - Error Removing Transferable Shader Caches + + Error Removing Vulkan Driver Pipeline Cache + Failed to remove the driver pipeline cache. + + + + + + Error Removing Transferable Shader Caches + + + + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! - + There was an error copying the RomFS files or the user cancelled the operation. - + Full - + Skeleton - + Select RomFS Dump Mode Επιλογή λειτουργίας απόρριψης RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Μη αποθηκευμένη μετάφραση. Παρακαλούμε επιλέξτε τον τρόπο με τον οποίο θα θέλατε να γίνει η απόρριψη της RomFS.<br> Η επιλογή Πλήρης θα αντιγράψει όλα τα αρχεία στο νέο κατάλογο, ενώ η επιλογή <br> Σκελετός θα δημιουργήσει μόνο τη δομή του καταλόγου. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... - - + + Cancel Ακύρωση - + RomFS Extraction Succeeded! - + The operation completed successfully. Η επέμβαση ολοκληρώθηκε με επιτυχία. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 - + Select Directory Επιλογή καταλόγου - + Properties Ιδιότητες - + The game properties could not be loaded. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. - + Load File Φόρτωση αρχείου - + Open Extracted ROM Directory - + Invalid Directory Selected - + The directory you have selected does not contain a 'main' file. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files - + %n file(s) remaining - + Installing file "%1"... - + Install Results Αποτελέσματα εγκατάστασης - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Εφαρμογή συστήματος - + System Archive - + System Application Update - + Firmware Package (Type A) - + Firmware Package (Type B) - + Game Παιχνίδι - + Game Update Ενημέρωση παιχνιδιού - + Game DLC DLC παιχνιδιού - + Delta Title - + Select NCA Install Type... Επιλέξτε τον τύπο εγκατάστασης NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) - + Failed to Install - + The title type you selected for the NCA is invalid. - + File not found Το αρχείο δεν βρέθηκε - + File "%1" not found Το αρχείο "%1" δεν βρέθηκε - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. - + Error opening URL Σφάλμα κατα το άνοιγμα του URL - + Unable to open the URL "%1". Αδυναμία ανοίγματος του URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo Amiibo - - + + The current amiibo has been removed - + Error Σφάλμα - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) - + Load Amiibo Φόρτωση Amiibo - + Error loading Amiibo data Σφάλμα φόρτωσης δεδομένων Amiibo - + The selected file is not a valid amiibo Το επιλεγμένο αρχείο δεν αποτελεί έγκυρο amiibo - + The selected file is already on use Το επιλεγμένο αρχείο χρησιμοποιείται ήδη - + An unknown error occurred - + Capture Screenshot Λήψη στιγμιότυπου οθόνης - + PNG Image (*.png) Εικόνα PBG (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Έναρξη - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Κλίμακα: %1x - + Speed: %1% / %2% Ταχύτητα: %1% / %2% - + Speed: %1% Ταχύτητα: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS - + Frame: %1 ms Καρέ: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR FSR - - + + NO AA - + FXAA FXAA - + SMAA - + SMAA - + Confirm Key Rederivation - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5351,76 +5469,76 @@ This will delete your autogenerated key files and re-run the key derivation modu - + Missing fuses - + - Missing BOOT0 - Λείπει το BOOT0 - + - Missing BCPKG2-1-Normal-Main - Λείπει το BCPKG2-1-Normal-Main - + - Missing PRODINFO - Λείπει το PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. - + Deriving Keys - + Select RomFS Dump Target - + Please select which RomFS you would like to dump. - + Are you sure you want to close yuzu? Είστε σίγουροι ότι θέλετε να κλείσετε το yuzu; - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5430,44 +5548,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! Το OpenGL δεν είναι διαθέσιμο! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. - - + + Error while initializing OpenGL! Σφάλμα κατα την αρχικοποίηση του OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. - + Error while initializing OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 @@ -5969,7 +6087,7 @@ Debug Message: Εγκατάσταση - + Install Files to NAND @@ -5977,7 +6095,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 @@ -6628,7 +6746,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE @@ -6677,31 +6795,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [μη ορισμένο] @@ -6712,14 +6830,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Άξονας%1%2 @@ -6730,262 +6848,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [άγνωστο] - + - + Left Αριστερά - + - + Right Δεξιά - + - + Down Κάτω - + - + Up Πάνω - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X Χ - - + + Y Υ - - + + Start - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle - - + + Cross - - + + Square - - + + Triangle - - + + Share - - + + Options - - + + [undefined] - + %1%2 - - + + [invalid] - - - - + + + + %1%2Hat %3 - - - - - - + + + + + + %1%2Axis %3 - - + + %1%2Axis %3,%4,%5 - - + + %1%2Motion %3 - - - - + + + + %1%2Button %3 - - + + [unused] [άδειο] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Συν + + + + Minus + Μείον + + + + Home Αρχική - + + Capture + Στιγμιότυπο + + + Touch - + Wheel Indicates the mouse wheel - + Backward - + Forward - + Task - + Extra - + %1%2%3 %1%2%3 diff --git a/dist/languages/es.ts b/dist/languages/es.ts index c4025d9c4..dde787a15 100644 --- a/dist/languages/es.ts +++ b/dist/languages/es.ts @@ -784,7 +784,7 @@ Esto banearía su nombre del foro y su dirección IP. Enable Host MMU Emulation (exclusive memory instructions) - Habilitar Emulacion MMU del anfitrión (Instrucciones de memoria exclusiva) + Activar emulación MMU del anfitrión (Instrucciones de memoria exclusiva) @@ -800,7 +800,7 @@ Esto banearía su nombre del foro y su dirección IP. Enable recompilation of exclusive memory instructions - Habilitar recompilación de las instrucciones de memoria exclusiva + Activar recompilación de las instrucciones de memoria exclusiva @@ -808,12 +808,15 @@ Esto banearía su nombre del foro y su dirección IP. <div style="white-space: nowrap">This optimization speeds up memory accesses by allowing invalid memory accesses to succeed.</div> <div style="white-space: nowrap">Enabling it reduces the overhead of all memory accesses and has no impact on programs that don't access invalid memory.</div> - + + <div style="white-space: nowrap">Esta optimización acelera los accesos a la memoria al permitir que los accesos no válidos tengan éxito.</div> + <div style="white-space: nowrap">Activarlo reduce la sobrecarga de todos los accesos a la memoria y no tiene ningún impacto en los programas que no acceden a la memoria no válida.</div> + Enable fallbacks for invalid memory accesses - + Activar fallbacks para accesos inválidos de memoria @@ -861,7 +864,7 @@ Esto banearía su nombre del foro y su dirección IP. When checked, the max size of the log increases from 100 MB to 1 GB - Cuando se marque, el tamaño maximo del registro aumenta de 100 MB a 1 GB + Al activarlo, el tamaño máximo del registro aumenta de 100 MB a 1 GB. @@ -886,7 +889,7 @@ Esto banearía su nombre del foro y su dirección IP. When checked, the graphics API enters a slower debugging mode - Cuando esté marcado, la API gráfica entrará en un modo de depuración más lento. + Al activarlo, la API gráfica entrará en un modo de depuración más lento. @@ -896,7 +899,7 @@ Esto banearía su nombre del foro y su dirección IP. When checked, it enables Nsight Aftermath crash dumps - Cuando esté marcado, activará los volcados de los fallos Nsight Aftermath + Al activarlo, se habilitan los volcados Nsight Aftermath de bloqueos o errores. @@ -906,17 +909,17 @@ Esto banearía su nombre del foro y su dirección IP. When checked, it will dump all the original assembler shaders from the disk shader cache or game as found - Al activarlo, esto volcará todos los sombreadores originales del ensamblador de la caché de sombreadores en disco o del juego encontrado + Al activarlo, se volcarán todos los shaders del ensamblador original de la caché de sombreadores en disco o del juego tal y como se encuentren. Dump Game Shaders - Volcar sombreadores del juego + Volcar shaders del juego When checked, it will dump all the macro programs of the GPU - Cuando esté activado, se volcarán todos los programas macro de la GPU + Al activarlo, se volcarán todos los programas macro de la GPU. @@ -926,7 +929,7 @@ Esto banearía su nombre del foro y su dirección IP. When checked, it disables the macro Just In Time compiler. Enabling this makes games run slower - Cuando esté marcado, se desactiva el compilador de macro Just In Time. Activar esto hace que los juegos se ejecuten más lento. + Al activarlo, se desactiva el compilador de macro Just In Time. Activar esto hace que los juegos se ejecuten más lento. @@ -934,102 +937,112 @@ Esto banearía su nombre del foro y su dirección IP. Desactivar macro JIT - - When checked, yuzu will log statistics about the compiled pipeline cache - Cuando esté marcado, yuzu hará un registro de las estadísticas del caché de tubería compilado + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + Al activarlo, desactiva las funciones de macro HLE. Activar esto hace que los juegos se ejecuten más lento. - + + Disable Macro HLE + Desactivar Macro HLE + + + + When checked, yuzu will log statistics about the compiled pipeline cache + Al activarlo, yuzu realizará un registro de estadísticas del caché de canalización compilado. + + + Enable Shader Feedback Activar información de shaders - + When checked, it executes shaders without loop logic changes - Cuando esté marcado, se ejecutarán los shaders sin cambios de bucles lógicos. + Al activarlo, se ejecutarán los shaders sin cambios en bucles lógicos. - + Disable Loop safety checks Desactivar comprobaciones de seguridad de bucles - + Debugging Depuración - + Enable Verbose Reporting Services** Activar servicios de reporte detallados** - + Enable FS Access Log Activar registro de acceso FS - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. Activa esta opción para mostrar en la consola la última lista de comandos de audio generada. Solo afecta a los juegos que utilizan el renderizador de audio. - + Dump Audio Commands To Console** Volcar comandos de audio a la consola** - + Create Minidump After Crash Crear mini volcado tras un crash - + Advanced Avanzado - + Kiosk (Quest) Mode Modo quiosco (Quest) - + Enable CPU Debugging Activar depuración de la CPU - + Enable Debug Asserts Activar alertas de depuración - + Enable Auto-Stub** Activar Auto-Stub** - + Enable All Controller Types - Habilitar todo tipo de controles + Activar todos los tipos de controladores - + Disable Web Applet Desactivar Web applet - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. Permite que yuzu compruebe si el entorno de Vulkan funciona cuando el programa se inicia. Desactiva esto si está causando problemas con los programas externos ligados a yuzu. - + Perform Startup Vulkan Check Realizar comprobación de Vulkan al ejecutar - + **This will be reset automatically when yuzu closes. **Esto se reiniciará automáticamente cuando yuzu se cierre. @@ -1044,12 +1057,12 @@ Esto banearía su nombre del foro y su dirección IP. Para aplicar estos ajustes es necesario reiniciar yuzu. - + Web applet not compiled La web applet no se ha compilado - + MiniDump creation not compiled La creación del mini volcado no se ha compilado @@ -1100,13 +1113,13 @@ Esto banearía su nombre del foro y su dirección IP. - + Audio Audio - + CPU CPU @@ -1122,13 +1135,13 @@ Esto banearía su nombre del foro y su dirección IP. - + General General - + Graphics Gráficos @@ -1144,7 +1157,7 @@ Esto banearía su nombre del foro y su dirección IP. - + Controls Controles @@ -1160,7 +1173,7 @@ Esto banearía su nombre del foro y su dirección IP. - + System Sistema @@ -1366,7 +1379,7 @@ Esto banearía su nombre del foro y su dirección IP. Mute audio when in background - Silenciar audio cuando esté en segundo plano + Silenciar audio en segundo plano @@ -1423,7 +1436,7 @@ Esto banearía su nombre del foro y su dirección IP. - + None Ninguno @@ -1435,7 +1448,7 @@ Esto banearía su nombre del foro y su dirección IP. Use disk pipeline cache - Usar caché de shaders de tubería + Usar caché de canalización en disco @@ -1534,124 +1547,139 @@ Esto banearía su nombre del foro y su dirección IP. + 1.5X (1080p/1620p) [EXPERIMENTAL] + x1.5 (1080p/1620p) [EXPERIMENTAL] + + + 2X (1440p/2160p) x2 (1440p/2160p) - + 3X (2160p/3240p) x3 (2160p/3240p) - + 4X (2880p/4320p) x4 (2880p/4320p) - + 5X (3600p/5400p) x5 (3600p/5400p) - + 6X (4320p/6480p) x6 (4320p/6480p) - + + 7X (5040p/7560p) + x7 (5040p/7560p) + + + + 8X (5760p/8640p) + x8 (5760p/8640p) + + + Window Adapting Filter: Filtro adaptable de ventana: - + Nearest Neighbor Vecino más próximo - + Bilinear Bilineal - + Bicubic Bicúbico - + Gaussian Gaussiano - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ Super Resolution (Solo Vulkan) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: Método de Anti-Aliasing: - + FXAA FXAA - + SMAA - + SMAA - + Use global FSR Sharpness - + Usar nitidez global FSR - + Set FSR Sharpness - + Ajustar nitidez FSR - + FSR Sharpness: - + Nitidez FSR: - + 100% - + 100% - - + + Use global background color Usar el color de fondo global - + Set background color: Establecer el color de fondo: - + Background Color: Color de fondo: GLASM (Assembly Shaders, NVIDIA Only) - GLASM (Assembly shaders, sólo NVIDIA) + GLASM (Shaders de ensamblado, sólo NVIDIA) SPIR-V (Experimental, Mesa Only) - + SPIR-V (Experimental, sólo Mesa) @@ -1684,76 +1712,96 @@ Esto banearía su nombre del foro y su dirección IP. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + Ejecuta los procesos en segundo plano mientras espera las instrucciones gráficas para evitar que la GPU reduzca su velocidad de reloj. + + + + Force maximum clocks (Vulkan only) + Forzar relojes máximos (sólo Vulkan) + + + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. El VSync evita que la pantalla se distorsione, pero algunas tarjetas gráficas tienen un menor rendimiento con el VSync activado. Mantenlo activado si no notas diferencias en el rendimiento. - + Use VSync Usar VSync - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Activa la compilación de shaders en modo asíncrono, lo que puede reducir la sobrecarga de shaders. Esta función es experimental. - + Use asynchronous shader building (Hack) Usar la construcción de shaders asíncronos (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Activa el tiempo rápido de GPU. Esta opción hará que muchos juegos estén forzados a ejecutarse en su resolución nativa máxima. - + Use Fast GPU Time (Hack) Usar tiempo rápido en la GPU (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. Activa el flujo de búferes pesado. Esta opción forzará el flujo de los búferes no modificados, lo que puede afectar al rendimiento. - + Use pessimistic buffer flushes (Hack) Utilizar flujos de búferes pesados (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + Activa la caché de canalización específica del fabricante de la GPU. Esta opción puede mejorar significativamente el tiempo de carga de sombreadores en los casos en los que el controlador de Vulkan no almacena internamente archivos de caché de canalización. + + + + Use Vulkan pipeline cache + Usar caché de canalización de Vulkan + + + Anisotropic Filtering: Filtrado anisotrópico: - + Automatic Automático - + Default Valor predeterminado - + 2x x2 - + 4x x4 - + 8x x8 - + 16x x16 @@ -2141,7 +2189,7 @@ Esto banearía su nombre del foro y su dirección IP. - + Configure Configurar @@ -2167,6 +2215,7 @@ Esto banearía su nombre del foro y su dirección IP. + Requires restarting yuzu Requiere reiniciar yuzu @@ -2186,22 +2235,27 @@ Esto banearía su nombre del foro y su dirección IP. Navegación de controles - + + Enable direct JoyCon driver + + + + Enable mouse panning Activar desplazamiento del ratón - + Mouse sensitivity Sensibilidad del ratón - + % % - + Motion / Touch Movimiento / táctil @@ -2221,57 +2275,57 @@ Esto banearía su nombre del foro y su dirección IP. Input Profiles - + Perfiles de entrada Player 1 Profile - + Perfil del jugador 1 Player 2 Profile - + Perfil del jugador 2 Player 3 Profile - + Perfil del jugador 3 Player 4 Profile - + Perfil del jugador 4 Player 5 Profile - + Perfil del jugador 5 Player 6 Profile - + Perfil del jugador 6 Player 7 Profile - + Perfil del jugador 7 Player 8 Profile - + Perfil del jugador 8 Use global input configuration - + Utilizar la configuración global de entrada Player %1 profile - + Perfil del jugador %1 @@ -2313,7 +2367,7 @@ Esto banearía su nombre del foro y su dirección IP. - + Left Stick Palanca izquierda @@ -2407,14 +2461,14 @@ Esto banearía su nombre del foro y su dirección IP. - + L L - + ZL ZL @@ -2433,7 +2487,7 @@ Esto banearía su nombre del foro y su dirección IP. - + Plus Más @@ -2446,15 +2500,15 @@ Esto banearía su nombre del foro y su dirección IP. - - + + R R - + ZR ZR @@ -2511,236 +2565,236 @@ Esto banearía su nombre del foro y su dirección IP. - + Right Stick Palanca derecha - - - - + + + + Clear Borrar - - - - - + + + + + [not set] [no definido] - - + + Invert button Invertir botón - - + + Toggle button Alternar botón - - + + Invert axis Invertir ejes - - - + + + Set threshold Configurar umbral - - + + Choose a value between 0% and 100% Seleccione un valor entre 0% y 100%. - + Toggle axis Alternar ejes - + Set gyro threshold Configurar umbral del Giroscopio - + Map Analog Stick Configuración de palanca analógico - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Después de pulsar OK, mueve primero el joystick de manera horizontal, y luego verticalmente. Para invertir los ejes, mueve primero el joystick de manera vertical, y luego horizontalmente. - + Center axis Centrar ejes - - + + Deadzone: %1% Punto muerto: %1% - - + + Modifier Range: %1% Rango del modificador: %1% - - + + Pro Controller Controlador Pro - + Dual Joycons Joycons duales - + Left Joycon Joycon izquierdo - + Right Joycon Joycon derecho - + Handheld Portátil - + GameCube Controller Controlador de GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Controlador NES - + SNES Controller Controlador SNES - + N64 Controller Controlador N64 - + Sega Genesis Sega Genesis - + Start / Pause Inicio / Pausa - + Z Z - + Control Stick Palanca de control - + C-Stick C-Stick - + Shake! ¡Agita! - + [waiting] [esperando] - + New Profile Nuevo perfil - + Enter a profile name: Introduce un nombre de perfil: - - + + Create Input Profile Crear perfil de entrada - + The given profile name is not valid! ¡El nombre de perfil introducido no es válido! - + Failed to create the input profile "%1" Error al crear el perfil de entrada "%1" - + Delete Input Profile Eliminar perfil de entrada - + Failed to delete the input profile "%1" Error al eliminar el perfil de entrada "%1" - + Load Input Profile Cargar perfil de entrada - + Failed to load the input profile "%1" Error al cargar el perfil de entrada "%1" - + Save Input Profile Guardar perfil de entrada - + Failed to save the input profile "%1" Error al guardar el perfil de entrada "%1" @@ -2788,7 +2842,7 @@ Para invertir los ejes, mueve primero el joystick de manera vertical, y luego ho - + Configure Configurar @@ -2824,7 +2878,7 @@ Para invertir los ejes, mueve primero el joystick de manera vertical, y luego ho - + Test Probar @@ -2844,77 +2898,77 @@ Para invertir los ejes, mueve primero el joystick de manera vertical, y luego ho <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Más información</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters El número del puerto tiene caracteres que no son válidos - + Port has to be in range 0 and 65353 El puerto debe estar en un rango entre 0 y 65353 - + IP address is not valid Dirección IP no válida - + This UDP server already exists Este servidor UDP ya existe - + Unable to add more than 8 servers No es posible añadir más de 8 servidores - + Testing Probando - + Configuring Configurando - + Test Successful Prueba existosa - + Successfully received data from the server. Se han recibido con éxito los datos del servidor. - + Test Failed Prueba fallida - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. No se han podido recibir datos válidos del servidor.<br>Por favor, verifica que el servidor esté configurado correctamente y que la dirección y el puerto sean correctos. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. La prueba de UDP o la configuración de la calibración está en curso.<br>Por favor, espera a que termine el proceso. @@ -3032,7 +3086,7 @@ Para invertir los ejes, mueve primero el joystick de manera vertical, y luego ho Input Profiles - + Perfiles de entrada @@ -3243,8 +3297,8 @@ UUID: %2 - Ring Sensor Parameters - Parámetros del sensor Ring + Virtual Ring Sensor Parameters + @@ -3264,33 +3318,90 @@ UUID: %2 Punto muerto: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Restaurar valores predeterminados - + Clear Limpiar - + [not set] [no definido] - + Invert axis Invertir ejes - - + + Deadzone: %1% Punto muerto: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Configurando + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [esperando] @@ -3595,8 +3706,8 @@ UUID: %2 - English - Inglés (english) + American English + Inglés estadounidense @@ -3696,7 +3807,7 @@ UUID: %2 Device Name - + Nombre del dispositivo @@ -3729,22 +3840,27 @@ UUID: %2 Regenerar - + System settings are available only when game is not running. Los ajustes del sistema sólo se encuentran disponibles cuando no se esté ejecutando ningún juego. - + + Warning: "%1" is not a valid language for region "%2" + Aviso: "%1" no es un idioma válido para la región "%2" + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Esto reemplazará tu Switch virtual con una nueva. Tu Switch virtual actual no será recuperable. Esto podría causar efectos inesperados en determinados juegos. Si usas un archivo de guardado de configuración obsoleto, esto podría fallar. ¿Continuar? - + Warning Advertencia - + Console ID: 0x%1 ID de consola: 0x%1 @@ -3815,7 +3931,7 @@ UUID: %2 Configuración TAS - + Select TAS Load Directory... Selecciona el directorio de carga TAS... @@ -4371,7 +4487,7 @@ Arrastra los puntos para cambiar de posición, o haz doble clic en las celdas de Controlador J1 - + &Controller P1 &Controlador J1 @@ -4384,42 +4500,37 @@ Arrastra los puntos para cambiar de posición, o haz doble clic en las celdas de Conexión directa - - IP Address - Dirección IP + + Server Address + - - IP - IP + + <html><head/><body><p>Server address of the host</p></body></html> + - - <html><head/><body><p>IPv4 address of the host</p></body></html> - <html><head/><body><p>Dirección IPv4 del anfitrión</p></body></html> - - - + Port Puerto - + <html><head/><body><p>Port number the host is listening on</p></body></html> <html><head/><body><p>Número de puerto en el que el anfitrión está trabajando</p></body></html> - + Nickname Apodo - + Password Contraseña - + Connect Conectar @@ -4427,12 +4538,12 @@ Arrastra los puntos para cambiar de posición, o haz doble clic en las celdas de DirectConnectWindow - + Connecting Conectando - + Connect Conectar @@ -4503,472 +4614,482 @@ Arrastra los puntos para cambiar de posición, o haz doble clic en las celdas de Tiempo que lleva emular un fotograma de la Switch, sin tener en cuenta la limitación de fotogramas o sincronización vertical. Para una emulación óptima, este valor debería ser como máximo de 16.67 ms. - + &Clear Recent Files &Eliminar archivos recientes - + &Continue &Continuar - + &Pause &Pausar - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu está ejecutando un juego - + Warning Outdated Game Format Advertencia: formato del juego obsoleto - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Está utilizando el formato de directorio de ROM deconstruido para este juego, que es un formato desactualizado que ha sido reemplazado por otros, como los NCA, NAX, XCI o NSP. Los directorios de ROM deconstruidos carecen de íconos, metadatos y soporte de actualizaciones.<br><br>Para ver una explicación de los diversos formatos de Switch que soporta yuzu,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>echa un vistazo a nuestra wiki</a>. Este mensaje no se volverá a mostrar. - - + + Error while loading ROM! ¡Error al cargar la ROM! - + The ROM format is not supported. El formato de la ROM no es compatible. - + An error occurred initializing the video core. Se ha producido un error al inicializar el núcleo de video. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu ha encontrado un error al ejecutar el núcleo de video. Esto suele ocurrir al no tener los controladores de la GPU actualizados, incluyendo los integrados. Por favor, revisa el registro para más detalles. Para más información sobre cómo acceder al registro, por favor, consulta la siguiente página: <a href='https://yuzu-emu.org/help/reference/log-files/'>Como cargar el archivo de registro</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. ¡Error al cargar la ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Por favor, sigue <a href='https://yuzu-emu.org/help/quickstart/'>la guía de inicio rápido de yuzu</a> para revolcar los archivos.<br>Puedes consultar la wiki de yuzu</a> o el Discord de yuzu</a> para obtener ayuda. - + An unknown error occurred. Please see the log for more details. Error desconocido. Por favor, consulte el archivo de registro para ver más detalles. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Cerrando software... - + Save Data Datos de guardado - + Mod Data Datos de mods - + Error Opening %1 Folder Error al abrir la carpeta %1 - - + + Folder does not exist! ¡La carpeta no existe! - + Error Opening Transferable Shader Cache Error al abrir el caché transferible de shaders - + Failed to create the shader cache directory for this title. No se pudo crear el directorio de la caché de los shaders para este título. - + Error Removing Contents Error al eliminar el contenido - + Error Removing Update Error al eliminar la actualización - + Error Removing DLC Error al eliminar el DLC - + Remove Installed Game Contents? ¿Eliminar el contenido del juego instalado? - + Remove Installed Game Update? ¿Eliminar la actualización del juego instalado? - + Remove Installed Game DLC? ¿Eliminar el DLC del juego instalado? - + Remove Entry Eliminar entrada - - - - - - + + + + + + Successfully Removed Se ha eliminado con éxito - + Successfully removed the installed base game. Se ha eliminado con éxito el juego base instalado. - + The base game is not installed in the NAND and cannot be removed. El juego base no está instalado en el NAND y no se puede eliminar. - + Successfully removed the installed update. Se ha eliminado con éxito la actualización instalada. - + There is no update installed for this title. No hay ninguna actualización instalada para este título. - + There are no DLC installed for this title. No hay ningún DLC instalado para este título. - + Successfully removed %1 installed DLC. Se ha eliminado con éxito %1 DLC instalado(s). - + Delete OpenGL Transferable Shader Cache? ¿Deseas eliminar el caché transferible de shaders de OpenGL? - + Delete Vulkan Transferable Shader Cache? ¿Deseas eliminar el caché transferible de shaders de Vulkan? - + Delete All Transferable Shader Caches? ¿Deseas eliminar todo el caché transferible de shaders? - + Remove Custom Game Configuration? ¿Deseas eliminar la configuración personalizada del juego? - + Remove File Eliminar archivo - - + + Error Removing Transferable Shader Cache Error al eliminar la caché de shaders transferibles - - + + A shader cache for this title does not exist. No existe caché de shaders para este título. - + Successfully removed the transferable shader cache. El caché de shaders transferibles se ha eliminado con éxito. - + Failed to remove the transferable shader cache. No se ha podido eliminar la caché de shaders transferibles. - - + + Error Removing Vulkan Driver Pipeline Cache + Error al eliminar la caché de canalización del controlador Vulkan + + + + Failed to remove the driver pipeline cache. + No se ha podido eliminar la caché de canalización del controlador. + + + + Error Removing Transferable Shader Caches Error al eliminar las cachés de shaders transferibles - + Successfully removed the transferable shader caches. Cachés de shaders transferibles eliminadas con éxito. - + Failed to remove the transferable shader cache directory. No se ha podido eliminar el directorio de cachés de shaders transferibles. - - + + Error Removing Custom Configuration Error al eliminar la configuración personalizada del juego - + A custom configuration for this title does not exist. No existe una configuración personalizada para este título. - + Successfully removed the custom game configuration. Se eliminó con éxito la configuración personalizada del juego. - + Failed to remove the custom game configuration. No se ha podido eliminar la configuración personalizada del juego. - - + + RomFS Extraction Failed! ¡La extracción de RomFS ha fallado! - + There was an error copying the RomFS files or the user cancelled the operation. Se ha producido un error al copiar los archivos RomFS o el usuario ha cancelado la operación. - + Full Completo - + Skeleton En secciones - + Select RomFS Dump Mode Elegir método de volcado de RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Por favor, selecciona el método en que quieres volcar el RomFS.<br>Completo copiará todos los archivos al nuevo directorio <br> mientras que en secciones solo creará la estructura del directorio. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root No hay suficiente espacio en %1 para extraer el RomFS. Por favor, libera espacio o elige otro directorio de volcado en Emulación > Configuración > Sistema > Sistema de archivos > Raíz de volcado - + Extracting RomFS... Extrayendo RomFS... - - + + Cancel Cancelar - + RomFS Extraction Succeeded! ¡La extracción RomFS ha tenido éxito! - + The operation completed successfully. La operación se completó con éxito. - - - - - + + + + + Create Shortcut - + Crear acceso directo - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Esto creará un acceso directo a la AppImage actual. Esto puede no funcionar bien si se actualiza. ¿Continuar? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + No se puede crear un acceso directo en el escritorio. La ruta "%1" no existe. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + No se puede crear un acceso directo en el menú de aplicaciones. La ruta "%1" no existe y no se puede crear. - + Create Icon - + Crear icono - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + No se puede crear el archivo de icono. La ruta "%1" no existe y no se puede crear. - + Start %1 with the yuzu Emulator - + Iniciar %1 con el Emulador yuzu - + Failed to create a shortcut at %1 - + Error al crear un acceso directo en %1 - + Successfully created a shortcut to %1 - + Se ha creado un acceso directo a %1 - + Error Opening %1 Error al intentar abrir %1 - + Select Directory Seleccionar directorio - + Properties Propiedades - + The game properties could not be loaded. No se pueden cargar las propiedades del juego. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Ejecutable de Switch (%1);;Todos los archivos (*.*) - + Load File Cargar archivo - + Open Extracted ROM Directory Abrir el directorio de la ROM extraída - + Invalid Directory Selected Directorio seleccionado no válido - + The directory you have selected does not contain a 'main' file. El directorio que ha seleccionado no contiene ningún archivo 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Archivo de Switch Instalable (*.nca *.nsp *.xci);;Archivo de contenidos de Nintendo (*.nca);;Paquete de envío de Nintendo (*.nsp);;Imagen de cartucho NX (*.xci) - + Install Files Instalar archivos - + %n file(s) remaining %n archivo(s) restantes%n archivo(s) restantes%n archivo(s) restantes - + Installing file "%1"... Instalando el archivo "%1"... - + Install Results Instalar resultados - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Para evitar posibles conflictos, no se recomienda a los usuarios que instalen juegos base en el NAND. Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + %n file(s) were newly installed %n archivo(s) recién instalado/s @@ -4977,7 +5098,7 @@ Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + %n file(s) were overwritten %n archivo(s) recién sobreescrito/s @@ -4986,7 +5107,7 @@ Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + %n file(s) failed to install %n archivo(s) no se instaló/instalaron @@ -4995,377 +5116,377 @@ Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + System Application Aplicación del sistema - + System Archive Archivo del sistema - + System Application Update Actualización de la aplicación del sistema - + Firmware Package (Type A) Paquete de firmware (Tipo A) - + Firmware Package (Type B) Paquete de firmware (Tipo B) - + Game Juego - + Game Update Actualización de juego - + Game DLC DLC del juego - + Delta Title Titulo delta - + Select NCA Install Type... Seleccione el tipo de instalación NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Seleccione el tipo de título en el que deseas instalar este NCA como: (En la mayoría de los casos, el 'Juego' predeterminado está bien). - + Failed to Install Fallo en la instalación - + The title type you selected for the NCA is invalid. El tipo de título que seleccionó para el NCA no es válido. - + File not found Archivo no encontrado - + File "%1" not found Archivo "%1" no encontrado - + OK Aceptar - - + + Hardware requirements not met No se cumplen los requisitos de hardware - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. El sistema no cumple los requisitos de hardware recomendados. Los informes de compatibilidad se han desactivado. - + Missing yuzu Account Falta la cuenta de Yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Para enviar un caso de prueba de compatibilidad de juegos, debes vincular tu cuenta de yuzu.<br><br/> Para vincular tu cuenta de yuzu, ve a Emulación &gt; Configuración &gt; Web. - + Error opening URL Error al abrir la URL - + Unable to open the URL "%1". No se puede abrir la URL "%1". - + TAS Recording Grabación TAS - + Overwrite file of player 1? ¿Sobrescribir archivo del jugador 1? - + Invalid config detected Configuración no válida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. El controlador del modo portátil no puede ser usado en el modo sobremesa. Se seleccionará el controlador Pro en su lugar. - - + + Amiibo Amiibo - - + + The current amiibo has been removed El amiibo actual ha sido eliminado - + Error Error - - + + The current game is not looking for amiibos El juego actual no está buscando amiibos - + Amiibo File (%1);; All Files (*.*) Archivo amiibo (%1);; Todos los archivos (*.*) - + Load Amiibo Cargar amiibo - + Error loading Amiibo data Error al cargar los datos Amiibo - + The selected file is not a valid amiibo El archivo seleccionado no es un amiibo válido - + The selected file is already on use El archivo seleccionado ya se encuentra en uso - + An unknown error occurred Ha ocurrido un error inesperado - + Capture Screenshot Captura de pantalla - + PNG Image (*.png) Imagen PNG (*.png) - + TAS state: Running %1/%2 Estado TAS: ejecutando %1/%2 - + TAS state: Recording %1 Estado TAS: grabando %1 - + TAS state: Idle %1/%2 Estado TAS: inactivo %1/%2 - + TAS State: Invalid Estado TAS: nulo - + &Stop Running &Parar de ejecutar - + &Start &Iniciar - + Stop R&ecording Pausar g&rabación - + R&ecord G&rabar - + Building: %n shader(s) Creando: %n shader(s)Construyendo: %n shader(s)Construyendo: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escalado: %1x - + Speed: %1% / %2% Velocidad: %1% / %2% - + Speed: %1% Velocidad: %1% - + Game: %1 FPS (Unlocked) Juego: %1 FPS (desbloqueado) - + Game: %1 FPS Juego: %1 FPS - + Frame: %1 ms Fotogramas: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR GPU ERROR - + DOCKED SOBREMESA - + HANDHELD PORTÁTIL - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NULL - + NEAREST PRÓXIMO - - + + BILINEAR BILINEAL - + BICUBIC BICÚBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA NO AA - + FXAA FXAA - + SMAA - + SMAA - + Confirm Key Rederivation Confirmar la clave de rederivación - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5382,37 +5503,37 @@ es lo que quieres hacer si es necesario. Esto eliminará los archivos de las claves generadas automáticamente y volverá a ejecutar el módulo de derivación de claves. - + Missing fuses Faltan fuses - + - Missing BOOT0 - Falta BOOT0 - + - Missing BCPKG2-1-Normal-Main - Falta BCPKG2-1-Normal-Main - + - Missing PRODINFO - Falta PRODINFO - + Derivation Components Missing Faltan componentes de derivación - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Faltan las claves de encriptación. <br>Por favor, sigue <a href='https://yuzu-emu.org/help/quickstart/'>la guía rápida de yuzu</a> para obtener todas tus claves, firmware y juegos.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5421,39 +5542,39 @@ Esto puede llevar unos minutos dependiendo del rendimiento de su sistema. - + Deriving Keys Obtención de claves - + Select RomFS Dump Target Selecciona el destinatario para volcar el RomFS - + Please select which RomFS you would like to dump. Por favor, seleccione los RomFS que deseas volcar. - + Are you sure you want to close yuzu? ¿Estás seguro de que quieres cerrar yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. ¿Estás seguro de que quieres detener la emulación? Cualquier progreso no guardado se perderá. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5465,44 +5586,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! ¡OpenGL no está disponible! - + OpenGL shared contexts are not supported. - + Los contextos compartidos de OpenGL no son compatibles. - + yuzu has not been compiled with OpenGL support. yuzu no ha sido compilado con soporte de OpenGL. - - + + Error while initializing OpenGL! ¡Error al inicializar OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Tu GPU no soporta OpenGL, o no tienes instalados los últimos controladores gráficos. - + Error while initializing OpenGL 4.6! ¡Error al iniciar OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Tu GPU no soporta OpenGL 4.6, o no tienes instalado el último controlador de la tarjeta gráfica.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Es posible que la GPU no soporte una o más extensiones necesarias de OpenGL . Por favor, asegúrate de tener los últimos controladores de la tarjeta gráfica.<br><br>GL Renderer:<br>%1<br><br>Extensiones no soportadas:<br>%2 @@ -5537,7 +5658,7 @@ Would you like to bypass this and exit anyway? Open Transferable Pipeline Cache - Abrir caché transferible de shaders en tubería + Abrir caché de canalización de shaders transferibles @@ -5562,17 +5683,17 @@ Would you like to bypass this and exit anyway? Remove OpenGL Pipeline Cache - Eliminar caché en tubería de OpenGL + Eliminar caché de canalización de OpenGL Remove Vulkan Pipeline Cache - Eliminar caché en tubería de Vulkan + Eliminar caché de canalización de Vulkan Remove All Pipeline Caches - Eliminar todas las cachés en tubería + Eliminar todas las cachés de canalización @@ -5603,17 +5724,17 @@ Would you like to bypass this and exit anyway? Create Shortcut - + Crear Acceso directo Add to Desktop - + Añadir al Escritorio Add to Applications Menu - + Añadir al menú de Aplicaciones @@ -5795,7 +5916,7 @@ Would you like to bypass this and exit anyway? (Leave blank for open game) - (Dejar en blanco para juego libre) + (Dejar vacío para crear sala abierta) @@ -5815,7 +5936,7 @@ Would you like to bypass this and exit anyway? Load Previous Ban List - Cargar lista de vetos anterior + Cargar lista de vetos anteriores @@ -6005,7 +6126,7 @@ Mensaje de depuración: Instalar - + Install Files to NAND Instalar archivos al NAND... @@ -6013,7 +6134,7 @@ Mensaje de depuración: LimitableInputDialog - + The text can't contain any of the following characters: %1 El texto no puede tener ninguno de estos caracteres: @@ -6312,7 +6433,7 @@ Mensaje de depuración: &Direct Connect to Room - &Conexión directa a la sala + &Conexión directa a una sala @@ -6670,7 +6791,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE INICIO/PAUSAR @@ -6719,31 +6840,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [no definido] @@ -6754,14 +6875,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Eje %1%2 @@ -6772,262 +6893,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [desconocido] - + - + Left Izquierda - + - + Right Derecha - + - + Down Abajo - + - + Up Arriba - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Comenzar - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle Círculo - - + + Cross Cruz - - + + Square Cuadrado - - + + Triangle Triángulo - - + + Share Compartir - - + + Options Opciones - - + + [undefined] [sin definir] - + %1%2 %1%2 - - + + [invalid] [inválido] - - - - + + + + %1%2Hat %3 %1%2Rotación %3 - - - - - - + + + + + + %1%2Axis %3 %1%2Eje %3 - - + + %1%2Axis %3,%4,%5 %1%2Eje %3,%4,%5 - - + + %1%2Motion %3 %1%2Movimiento %3 - - - - + + + + %1%2Button %3 %1%2Botón %3 - - + + [unused] [no usado] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Más + + + + Minus + Menos + + + + Home Inicio - + + Capture + Captura + + + Touch Táctil - + Wheel Indicates the mouse wheel Rueda - + Backward Atrás - + Forward Adelante - + Task Tarea - + Extra Extra - + %1%2%3 %1%2%3 diff --git a/dist/languages/fr.ts b/dist/languages/fr.ts index d7d94dd30..b5119f409 100644 --- a/dist/languages/fr.ts +++ b/dist/languages/fr.ts @@ -936,102 +936,112 @@ Cette option améliore la vitesse en réduisant la précision des instructions f Désactiver les macros JIT - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + + + + + Disable Macro HLE + + + + When checked, yuzu will log statistics about the compiled pipeline cache Lorsque la case est cochée, yuzu enregistrera les journaux de statistiques à propos de la cache de pipeline compilée - + Enable Shader Feedback Activer le retour d'information des shaders - + When checked, it executes shaders without loop logic changes Lorsque la case est cochée, exécuter les shaders sans changer la boucle de logique - + Disable Loop safety checks Désactiver les vérifications de boucle - + Debugging Débogage - + Enable Verbose Reporting Services** Activer les services de rapport verbeux** - + Enable FS Access Log Activer la journalisation des accès du système de fichiers - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. Activez cette option pour afficher la dernière liste de commandes audio générée sur la console. N'affecte que les jeux utilisant le moteur de rendu audio. - + Dump Audio Commands To Console** Déversez les commandes audio à la console** - + Create Minidump After Crash Crée un Minidump après un crash - + Advanced Avancé - + Kiosk (Quest) Mode Mode Kiosk (Quest) - + Enable CPU Debugging Activer le Débogage CPU - + Enable Debug Asserts Activer les assertions de débogage - + Enable Auto-Stub** Activer l'Auto-Stub** - + Enable All Controller Types Activer tous les types de contrôleurs - + Disable Web Applet Désactiver l'applet web - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. Active yuzu pour chercher pour un environnement Vulkan fonctionnel quand le programme démarre. Desactiver ceci si cela cause des problèmes avec des programmes externes. - + Perform Startup Vulkan Check Performe un check de Vulkan au démarrage - + **This will be reset automatically when yuzu closes. **Ces options seront réinitialisées automatiquement lorsque yuzu fermera. @@ -1046,12 +1056,12 @@ Cette option améliore la vitesse en réduisant la précision des instructions f yuzu doit redémarrer pour appliquer ce paramètre. - + Web applet not compiled Applet Web non compilé - + MiniDump creation not compiled Création de MiniDump non compilé @@ -1102,13 +1112,13 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + Audio Son - + CPU CPU @@ -1124,13 +1134,13 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + General Général - + Graphics Vidéo @@ -1146,7 +1156,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + Controls Contrôles @@ -1162,7 +1172,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + System Système @@ -1425,7 +1435,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + None Aucune @@ -1536,112 +1546,127 @@ Cette option améliore la vitesse en réduisant la précision des instructions f + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: Filtre de fenêtre adaptatif - + Nearest Neighbor Plus proche voisin - + Bilinear Bilinéaire - + Bicubic Bicubique - + Gaussian Gaussien - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ Super Resolution (Vulkan seulement) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: Méthode d'anticrénelage : - + FXAA FXAA - + SMAA - + Use global FSR Sharpness Utiliser la netteté FSR globale - + Set FSR Sharpness Définir la netteté FSR - + FSR Sharpness: Netteté FSR : - + 100% 100% - - + + Use global background color Utiliser une couleur d'arrière-plan globale - + Set background color: Définir la couleur d'arrière-plan : - + Background Color: Couleur de L’arrière plan : @@ -1686,76 +1711,96 @@ Cette option améliore la vitesse en réduisant la précision des instructions f + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + + + + + Force maximum clocks (Vulkan only) + + + + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. La VSync empêche les déchirements de l'image, mais cela peut causer des baisses de performances sur certaines cartes graphiques. Gardez la activée si vous ne voyez pas de différence. - + Use VSync Utiliser VSync - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Active la compilation de shaders asynchrone, qui peut réduire les saccades des shaders. Cette fonctionnalité est expérimentale. - + Use asynchronous shader building (Hack) Utiliser la compilation asynchrone des shaders (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Active le Temps GPU Rapide. Cette option forcera la plupart des jeux à utiliser leur plus grande résolution native. - + Use Fast GPU Time (Hack) Utiliser le Temps GPU Rapide (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. Active les vidages de tampon pessimistes. Cette option va forcer les tampons non-modifiés à être vidé, cela peut affecter la performance. - + Use pessimistic buffer flushes (Hack) Utiliser des vidages de tampon pessimistes (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + Anisotropic Filtering: Filtrage anisotropique : - + Automatic Automatique - + Default Défaut - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2143,7 +2188,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + Configure Configurer @@ -2169,6 +2214,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f + Requires restarting yuzu Nécessite de redémarrer yuzu @@ -2188,22 +2234,27 @@ Cette option améliore la vitesse en réduisant la précision des instructions f Manette de navigation - + + Enable direct JoyCon driver + + + + Enable mouse panning Activer le mouvement panorama avec la souris - + Mouse sensitivity Sensibilité de la souris - + % % - + Motion / Touch La motion / Toucher @@ -2315,7 +2366,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + Left Stick Stick Gauche @@ -2409,14 +2460,14 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + L L - + ZL ZL @@ -2435,7 +2486,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + Plus Plus @@ -2448,15 +2499,15 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - - + + R R - + ZR ZR @@ -2513,236 +2564,236 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + Right Stick Stick Droit - - - - + + + + Clear Effacer - - - - - + + + + + [not set] [non défini] - - + + Invert button Inverser les boutons - - + + Toggle button Bouton d'activation - - + + Invert axis Inverser l'axe - - - + + + Set threshold Définir le seuil - - + + Choose a value between 0% and 100% Choisissez une valeur entre 0% et 100% - + Toggle axis Basculer les axes - + Set gyro threshold Définir le seuil du gyroscope - + Map Analog Stick Mapper le stick analogique - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Après avoir appuyé sur OK, bougez d'abord votre joystick horizontalement, puis verticalement. Pour inverser les axes, bougez d'abord votre joystick verticalement, puis horizontalement. - + Center axis Axe central - - + + Deadzone: %1% Zone morte : %1% - - + + Modifier Range: %1% Modification de la course : %1% - - + + Pro Controller Pro Controller - + Dual Joycons Deux Joycons - + Left Joycon Joycon de gauche - + Right Joycon Joycon de droit - + Handheld Mode Portable - + GameCube Controller Manette GameCube - + Poke Ball Plus Poké Ball Plus - + NES Controller Manette NES - + SNES Controller Manette SNES - + N64 Controller Manette N64 - + Sega Genesis Sega Genesis - + Start / Pause Start / Pause - + Z Z - + Control Stick Stick de contrôle - + C-Stick C-Stick - + Shake! Secouez ! - + [waiting] [en attente] - + New Profile Nouveau Profil - + Enter a profile name: Entrez un nom de profil : - - + + Create Input Profile Créer un profil d'entrée - + The given profile name is not valid! Le nom de profil donné est invalide ! - + Failed to create the input profile "%1" Échec de la création du profil d'entrée "%1" - + Delete Input Profile Supprimer le profil d'entrée - + Failed to delete the input profile "%1" Échec de la suppression du profil d'entrée "%1" - + Load Input Profile Charger le profil d'entrée - + Failed to load the input profile "%1" Échec du chargement du profil d'entrée "%1" - + Save Input Profile Sauvegarder le profil d'entrée - + Failed to save the input profile "%1" Échec de la sauvegarde du profil d'entrée "%1" @@ -2790,7 +2841,7 @@ Pour inverser les axes, bougez d'abord votre joystick verticalement, puis h - + Configure Configurer @@ -2826,7 +2877,7 @@ Pour inverser les axes, bougez d'abord votre joystick verticalement, puis h - + Test Tester @@ -2846,77 +2897,77 @@ Pour inverser les axes, bougez d'abord votre joystick verticalement, puis h <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Plus d'informations</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters Le numéro de port contient des caractères invalides - + Port has to be in range 0 and 65353 Le port doit être entre 0 et 65353 - + IP address is not valid L'adresse IP n'est pas valide - + This UDP server already exists Ce serveur UDP existe déjà - + Unable to add more than 8 servers Impossible d'ajouter plus de 8 serveurs - + Testing Essai - + Configuring Configuration - + Test Successful Test réussi - + Successfully received data from the server. Données reçues du serveur avec succès. - + Test Failed Test échoué - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Impossible de recevoir des données valides du serveur.<br>Veuillez vérifier que le serveur est correctement configuré et que l'adresse et le port sont corrects. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. Le test UDP ou la configuration de l'étalonnage est en cours.<br>Veuillez attendre qu'ils se terminent. @@ -3245,8 +3296,8 @@ UUID : %2 - Ring Sensor Parameters - Paramètres du Capteur de l'Anneau + Virtual Ring Sensor Parameters + @@ -3266,33 +3317,90 @@ UUID : %2 Zone morte : 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Restaurer les défauts - + Clear Effacer - + [not set] [non défini] - + Invert axis Inverser l'axe - - + + Deadzone: %1% Zone morte : %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Configuration + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [En attente] @@ -3597,8 +3705,8 @@ UUID : %2 - English - Anglais + American English + @@ -3731,22 +3839,27 @@ UUID : %2 Regénérer - + System settings are available only when game is not running. Les paramètres systèmes ne sont accessibles que lorsque le jeu n'est pas en cours. - + + Warning: "%1" is not a valid language for region "%2" + + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Ceci remplacera la Switch virtuelle actuelle par une nouvelle. La Switch actuelle ne sera plus récupérable. cela peut entrainer des effets non désirés pendant le jeu. Ceci peut échouer si une configuration de sauvegarde périmée est utilisée. Continuer ? - + Warning Avertissement - + Console ID: 0x%1 ID de la Console : 0x%1 @@ -3817,7 +3930,7 @@ UUID : %2 Configuration du TAS - + Select TAS Load Directory... Sélectionner le dossier de chargement du TAS... @@ -4373,7 +4486,7 @@ Faites glisser les points pour modifier la position ou double-cliquez sur les ce Contrôleur joueur 1 - + &Controller P1 &Contrôleur joueur 1 @@ -4386,42 +4499,37 @@ Faites glisser les points pour modifier la position ou double-cliquez sur les ce Connexion directe - - IP Address - Adresse IP + + Server Address + - - IP - IP + + <html><head/><body><p>Server address of the host</p></body></html> + - - <html><head/><body><p>IPv4 address of the host</p></body></html> - <html><head/><body><p>Adresse IPv4 de l'hôte</p></body></html> - - - + Port Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> <html><head/><body><p>Numéro de port sur lequel l'hôte écoute</p></body></html> - + Nickname Surnom - + Password Mot de passe - + Connect Connecter @@ -4429,12 +4537,12 @@ Faites glisser les points pour modifier la position ou double-cliquez sur les ce DirectConnectWindow - + Connecting Connexion - + Connect Connecter @@ -4505,860 +4613,870 @@ Faites glisser les points pour modifier la position ou double-cliquez sur les ce Temps pris pour émuler une image par seconde de la switch, sans compter le limiteur d'image par seconde ou la synchronisation verticale. Pour une émulation à pleine vitesse, ceci devrait être au maximum à 16.67 ms. - + &Clear Recent Files &Effacer les fichiers récents - + &Continue &Continuer - + &Pause &Pause - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu exécute un jeu - + Warning Outdated Game Format Avertissement : Le Format de jeu est dépassé - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Vous utilisez un format de ROM déconstruite pour ce jeu, qui est donc un format dépassé qui à été remplacer par d'autre. Par exemple les formats NCA, NAX, XCI, ou NSP. Les destinations de ROM déconstruites manque des icônes, des métadonnée et du support de mise à jour.<br><br>Pour une explication des divers formats Switch que yuzu supporte, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Regardez dans le wiki</a>. Ce message ne sera pas montré une autre fois. - - + + Error while loading ROM! Erreur lors du chargement de la ROM ! - + The ROM format is not supported. Le format de la ROM n'est pas supporté. - + An error occurred initializing the video core. Une erreur s'est produite lors de l'initialisation du noyau dédié à la vidéo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu a rencontré une erreur en exécutant le cœur vidéo. Cela est généralement causé par des pilotes graphiques trop anciens. Veuillez consulter les logs pour plus d'informations. Pour savoir comment accéder aux logs, veuillez vous référer à la page suivante : <a href='https://yuzu-emu.org/help/reference/log-files/'>Comment partager un fichier de log </a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Erreur lors du chargement de la ROM ! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Veuillez suivre <a href='https://yuzu-emu.org/help/quickstart/'>le guide de démarrage rapide yuzu</a> pour retransférer vos fichiers.<br>Vous pouvez vous référer au wiki yuzu</a> ou le Discord yuzu</a> pour de l'assistance. - + An unknown error occurred. Please see the log for more details. Une erreur inconnue est survenue. Veuillez consulter le journal des logs pour plus de détails. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Enregistrer les données - + Mod Data Donnés du Mod - + Error Opening %1 Folder Erreur dans l'ouverture du dossier %1. - - + + Folder does not exist! Le dossier n'existe pas ! - + Error Opening Transferable Shader Cache Erreur lors de l'ouverture des Shader Cache Transferable - + Failed to create the shader cache directory for this title. Impossible de créer le dossier de cache du shader pour ce jeu. - + Error Removing Contents Erreur en enlevant le contenu - + Error Removing Update Erreur en enlevant la Mise à Jour - + Error Removing DLC Erreur en enlevant le DLC - + Remove Installed Game Contents? Enlever les données des jeux installés ? - + Remove Installed Game Update? Enlever la mise à jour du jeu installé ? - + Remove Installed Game DLC? Enlever le DLC du jeu installé ? - + Remove Entry Supprimer l'entrée - - - - - - + + + + + + Successfully Removed Supprimé avec succès - + Successfully removed the installed base game. Suppression du jeu de base installé avec succès. - + The base game is not installed in the NAND and cannot be removed. Le jeu de base n'est pas installé dans la NAND et ne peut pas être supprimé. - + Successfully removed the installed update. Suppression de la mise à jour installée avec succès. - + There is no update installed for this title. Il n'y a pas de mise à jour installée pour ce titre. - + There are no DLC installed for this title. Il n'y a pas de DLC installé pour ce titre. - + Successfully removed %1 installed DLC. Suppression de %1 DLC installé(s) avec succès. - + Delete OpenGL Transferable Shader Cache? Supprimer la Cache OpenGL de Shader Transférable? - + Delete Vulkan Transferable Shader Cache? Supprimer la Cache Vulkan de Shader Transférable? - + Delete All Transferable Shader Caches? Supprimer Toutes les Caches de Shader Transférable? - + Remove Custom Game Configuration? Supprimer la configuration personnalisée du jeu? - + Remove File Supprimer fichier - - + + Error Removing Transferable Shader Cache Erreur lors de la suppression du cache de shader transférable - - + + A shader cache for this title does not exist. Un shader cache pour ce titre n'existe pas. - + Successfully removed the transferable shader cache. Suppression du cache de shader transférable avec succès. - + Failed to remove the transferable shader cache. Échec de la suppression du cache de shader transférable. - - + + Error Removing Vulkan Driver Pipeline Cache + + + + + Failed to remove the driver pipeline cache. + + + + + Error Removing Transferable Shader Caches Erreur durant la Suppression des Caches de Shader Transférable - + Successfully removed the transferable shader caches. Suppression des caches de shader transférable effectuée avec succès. - + Failed to remove the transferable shader cache directory. Impossible de supprimer le dossier de la cache de shader transférable. - - + + Error Removing Custom Configuration Erreur lors de la suppression de la configuration personnalisée - + A custom configuration for this title does not exist. Il n'existe pas de configuration personnalisée pour ce titre. - + Successfully removed the custom game configuration. Suppression de la configuration de jeu personnalisée avec succès. - + Failed to remove the custom game configuration. Échec de la suppression de la configuration personnalisée du jeu. - - + + RomFS Extraction Failed! L'extraction de la RomFS a échoué ! - + There was an error copying the RomFS files or the user cancelled the operation. Une erreur s'est produite lors de la copie des fichiers RomFS ou l'utilisateur a annulé l'opération. - + Full Plein - + Skeleton Squelette - + Select RomFS Dump Mode Sélectionnez le mode d'extraction de la RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Veuillez sélectionner la manière dont vous souhaitez que le fichier RomFS soit extrait.<br>Full copiera tous les fichiers dans le nouveau répertoire, tandis que<br>skeleton créera uniquement la structure de répertoires. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Il n'y a pas assez d'espace libre dans %1 pour extraire la RomFS. Veuillez libérer de l'espace ou sélectionner un autre dossier d'extraction dans Émulation > Configurer > Système > Système de fichiers > Extraire la racine - + Extracting RomFS... Extraction de la RomFS ... - - + + Cancel Annuler - + RomFS Extraction Succeeded! Extraction de la RomFS réussi ! - + The operation completed successfully. L'opération s'est déroulée avec succès. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Erreur lors de l'ouverture %1 - + Select Directory Sélectionner un répertoire - + Properties Propriétés - + The game properties could not be loaded. Les propriétés du jeu n'ont pas pu être chargées. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Exécutable Switch (%1);;Tous les fichiers (*.*) - + Load File Charger un fichier - + Open Extracted ROM Directory Ouvrir le dossier des ROM extraites - + Invalid Directory Selected Destination sélectionnée invalide - + The directory you have selected does not contain a 'main' file. Le répertoire que vous avez sélectionné ne contient pas de fichier "main". - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Fichier Switch installable (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Installer les fichiers - + %n file(s) remaining %n fichier restant%n fichiers restants%n fichiers restants - + Installing file "%1"... Installation du fichier "%1" ... - + Install Results Résultats d'installation - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Pour éviter d'éventuels conflits, nous déconseillons aux utilisateurs d'installer des jeux de base sur la NAND. Veuillez n'utiliser cette fonctionnalité que pour installer des mises à jour et des DLC. - + %n file(s) were newly installed %n fichier a été nouvellement installé%n fichiers ont été nouvellement installés%n fichiers ont été nouvellement installés - + %n file(s) were overwritten %n fichier a été écrasé%n fichiers ont été écrasés%n fichiers ont été écrasés - + %n file(s) failed to install %n fichier n'a pas pu être installé%n fichiers n'ont pas pu être installés%n fichiers n'ont pas pu être installés - + System Application Application Système - + System Archive Archive Système - + System Application Update Mise à jour de l'application système - + Firmware Package (Type A) Paquet micrologiciel (Type A) - + Firmware Package (Type B) Paquet micrologiciel (Type B) - + Game Jeu - + Game Update Mise à jour de jeu - + Game DLC DLC de jeu - + Delta Title Titre Delta - + Select NCA Install Type... Sélectionner le type d'installation du NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Veuillez sélectionner le type de titre auquel vous voulez installer ce NCA : (Dans la plupart des cas, le titre par défaut : 'Jeu' est correct.) - + Failed to Install Échec de l'installation - + The title type you selected for the NCA is invalid. Le type de titre que vous avez sélectionné pour le NCA n'est pas valide. - + File not found Fichier non trouvé - + File "%1" not found Fichier "%1" non trouvé - + OK OK - - + + Hardware requirements not met Éxigences matérielles non respectées - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Votre système ne correspond pas aux éxigences matérielles. Les rapports de comptabilité ont été désactivés. - + Missing yuzu Account Compte yuzu manquant - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Pour soumettre un test de compatibilité pour un jeu, vous devez lier votre compte yuzu.<br><br/>Pour lier votre compte yuzu, aller à Emulation &gt; Configuration&gt; Web. - + Error opening URL Erreur lors de l'ouverture de l'URL - + Unable to open the URL "%1". Impossible d'ouvrir l'URL "%1". - + TAS Recording Enregistrement TAS - + Overwrite file of player 1? Écraser le fichier du joueur 1 ? - + Invalid config detected Configuration invalide détectée - + Handheld controller can't be used on docked mode. Pro controller will be selected. Contrôleur portable ne peut pas être utilisé en mode téléviseur. La manette Pro sera sélectionnée. - - + + Amiibo Amiibo - - + + The current amiibo has been removed L'amiibo actuel a été retiré - + Error Erreur - - + + The current game is not looking for amiibos Le jeu actuel ne cherche pas d'amiibos. - + Amiibo File (%1);; All Files (*.*) Fichier Amiibo (%1);; Tous les fichiers (*.*) - + Load Amiibo Charger un Amiibo - + Error loading Amiibo data Erreur lors du chargement des données Amiibo - + The selected file is not a valid amiibo Le fichier choisi n'est pas un amiibo valide - + The selected file is already on use Le fichier sélectionné est déjà utilisé - + An unknown error occurred Une erreur inconnue s'est produite - + Capture Screenshot Capture d'écran - + PNG Image (*.png) Image PNG (*.png) - + TAS state: Running %1/%2 État du TAS : En cours d'exécution %1/%2 - + TAS state: Recording %1 État du TAS : Enregistrement %1 - + TAS state: Idle %1/%2 État du TAS : Inactif %1:%2 - + TAS State: Invalid État du TAS : Invalide - + &Stop Running &Stopper l'exécution - + &Start &Start - + Stop R&ecording Stopper l'en&registrement - + R&ecord En&registrer - + Building: %n shader(s) Compilation: %n shaderCompilation : %n shadersCompilation : %n shaders - + Scale: %1x %1 is the resolution scaling factor Échelle : %1x - + Speed: %1% / %2% Vitesse : %1% / %2% - + Speed: %1% Vitesse : %1% - + Game: %1 FPS (Unlocked) Jeu : %1 IPS (Débloqué) - + Game: %1 FPS Jeu : %1 FPS - + Frame: %1 ms Frame : %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HAUT - + GPU EXTREME GPU EXTRÊME - + GPU ERROR GPU ERREUR - + DOCKED MODE TV - + HANDHELD PORTABLE - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST PLUS PROCHE - - + + BILINEAR BILINÉAIRE - + BICUBIC BICUBIQUE - + GAUSSIAN GAUSSIEN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA AUCUN AA - + FXAA FXAA - + SMAA - + Confirm Key Rederivation Confirmer la réinstallation de la clé - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5375,37 +5493,37 @@ et éventuellement faites des sauvegardes. Cela supprimera vos fichiers de clé générés automatiquement et ré exécutera le module d'installation de clé. - + Missing fuses Fusibles manquants - + - Missing BOOT0 - BOOT0 manquant - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main manquant - + - Missing PRODINFO - PRODINFO manquant - + Derivation Components Missing Composants de dérivation manquants - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Les clés de chiffrement sont manquantes. <br>Veuillez suivre <a href='https://yuzu-emu.org/help/quickstart/'>le guide de démarrage rapide yuzu</a> pour obtenir tous vos clés, firmware et jeux.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5414,39 +5532,39 @@ Cela peut prendre jusqu'à une minute en fonction des performances de votre système. - + Deriving Keys Installation des clés - + Select RomFS Dump Target Sélectionner la cible d'extraction du RomFS - + Please select which RomFS you would like to dump. Veuillez sélectionner quel RomFS vous voulez extraire. - + Are you sure you want to close yuzu? Êtes vous sûr de vouloir fermer yuzu ? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Êtes-vous sûr d'arrêter l'émulation ? Tout progrès non enregistré sera perdu. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5458,44 +5576,44 @@ Voulez-vous ignorer ceci and quitter quand même ? GRenderWindow - - + + OpenGL not available! OpenGL n'est pas disponible ! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu n'a pas été compilé avec le support OpenGL. - - + + Error while initializing OpenGL! Erreur lors de l'initialisation d'OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Votre GPU peut ne pas prendre en charge OpenGL, ou vous n'avez pas les derniers pilotes graphiques. - + Error while initializing OpenGL 4.6! Erreur lors de l'initialisation d'OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Votre GPU peut ne pas prendre en charge OpenGL 4.6 ou vous ne disposez pas du dernier pilote graphique: %1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Votre GPU peut ne pas prendre en charge une ou plusieurs extensions OpenGL requises. Veuillez vous assurer que vous disposez du dernier pilote graphique.<br><br>GL Renderer :<br>%1<br><br>Extensions non prises en charge :<br>%2 @@ -5998,7 +6116,7 @@ Message de débogage : Installer - + Install Files to NAND Installer des fichiers sur la NAND @@ -6006,7 +6124,7 @@ Message de débogage : LimitableInputDialog - + The text can't contain any of the following characters: %1 Le texte ne peut contenir aucun des caractères suivants : @@ -6663,7 +6781,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE Démarrer/Pause @@ -6712,31 +6830,31 @@ p, li { white-space: pre-wrap; } - + Shift Maj - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [non défini] @@ -6747,14 +6865,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Axe %1%2 @@ -6765,262 +6883,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [inconnu] - + - + Left Gauche - + - + Right Droite - + - + Down Bas - + - + Up Haut - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Start - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle Cercle - - + + Cross Croix - - + + Square Carré - - + + Triangle Triangle - - + + Share Partager - - + + Options Options - - + + [undefined] [non défini] - + %1%2 %1%2 - - + + [invalid] [invalide] - - - - + + + + %1%2Hat %3 %1%2Chapeau %3 - - - - - - + + + + + + %1%2Axis %3 %1%2Axe %3 - - + + %1%2Axis %3,%4,%5 %1%2Axe %3,%4,%5 - - + + %1%2Motion %3 %1%2Mouvement %3 - - - - + + + + %1%2Button %3 %1%2Bouton %3 - - + + [unused] [inutilisé] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Plus + + + + Minus + Moins + + + + Home Home - + + Capture + Capturer + + + Touch Tactile - + Wheel Indicates the mouse wheel Molette - + Backward Reculer - + Forward Avancer - + Task Tâche - + Extra Extra - + %1%2%3 %1%2%3 diff --git a/dist/languages/id.ts b/dist/languages/id.ts index e50f6388c..1b014248a 100644 --- a/dist/languages/id.ts +++ b/dist/languages/id.ts @@ -893,102 +893,112 @@ Memungkinkan berbagai macam optimasi IR. Matikan Macro JIT - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + + + + + Disable Macro HLE + + + + When checked, yuzu will log statistics about the compiled pipeline cache Saat dinyalakan, yuzu akan mencatat statstik tentang pipeline cache yang disusun - + Enable Shader Feedback Nyalakan Umpan Balik Shader - + When checked, it executes shaders without loop logic changes Saat dinyalakan, akan menjalankan shader tanpa perubahan logika loop - + Disable Loop safety checks Matikan cek keamanan Loop - + Debugging Pengawakutuan - + Enable Verbose Reporting Services** Nyalakan Layanan Laporan Bertele-tele** - + Enable FS Access Log Nyalakan Log Akses FS - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** - + Create Minidump After Crash - + Advanced Lanjutan - + Kiosk (Quest) Mode Mode Kiosk (Pencarian) - + Enable CPU Debugging Nyalakan Pengawakutuan CPU - + Enable Debug Asserts Nyalakan Awakutu Assert - + Enable Auto-Stub** - + Enable All Controller Types Aktifkan Semua Jenis Controller - + Disable Web Applet Matikan Applet Web - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Perform Startup Vulkan Check - + **This will be reset automatically when yuzu closes. **Ini akan diatur ulang secara otomatis ketika yuzu ditutup. @@ -1003,12 +1013,12 @@ Memungkinkan berbagai macam optimasi IR. - + Web applet not compiled - + MiniDump creation not compiled @@ -1059,13 +1069,13 @@ Memungkinkan berbagai macam optimasi IR. - + Audio Audio - + CPU CPU @@ -1081,13 +1091,13 @@ Memungkinkan berbagai macam optimasi IR. - + General Umum - + Graphics Grafis @@ -1103,7 +1113,7 @@ Memungkinkan berbagai macam optimasi IR. - + Controls Kendali @@ -1119,7 +1129,7 @@ Memungkinkan berbagai macam optimasi IR. - + System Sistem @@ -1382,7 +1392,7 @@ Memungkinkan berbagai macam optimasi IR. - + None Tak ada @@ -1493,112 +1503,127 @@ Memungkinkan berbagai macam optimasi IR. + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: Filter Menyelaraskan dengan Layar: - + Nearest Neighbor Nearest Neighbor - + Bilinear Biliner - + Bicubic Bikubik - + Gaussian Gaussian - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) + + AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: Metode Anti-Aliasing: - + FXAA FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Gunakan warna latar global - + Set background color: Setel warna latar: - + Background Color: Warna Latar: @@ -1643,76 +1668,96 @@ Memungkinkan berbagai macam optimasi IR. - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync mencegah robekan layar, tapi beberapa kartu grafis memiliki performa yang lebih rendah dengan VSnyc dinyalakan. Biarkan menyala jika anda tidak memerhatikan perbedaan performa. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + - Use VSync + Force maximum clocks (Vulkan only) - Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. - + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. + VSync mencegah robekan layar, tapi beberapa kartu grafis memiliki performa yang lebih rendah dengan VSnyc dinyalakan. Biarkan menyala jika anda tidak memerhatikan perbedaan performa. - Use asynchronous shader building (Hack) + Use VSync - Enables Fast GPU Time. This option will force most games to run at their highest native resolution. + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. - Use Fast GPU Time (Hack) + Use asynchronous shader building (Hack) - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. + Use Fast GPU Time (Hack) + + + + + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + + + + Use pessimistic buffer flushes (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + Anisotropic Filtering: Anisotropic Filtering: - + Automatic Otomatis - + Default Bawaan - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2100,7 +2145,7 @@ Memungkinkan berbagai macam optimasi IR. - + Configure Konfigurasi @@ -2126,6 +2171,7 @@ Memungkinkan berbagai macam optimasi IR. + Requires restarting yuzu Memerlukan mengulang yuzu @@ -2145,22 +2191,27 @@ Memungkinkan berbagai macam optimasi IR. - + + Enable direct JoyCon driver + + + + Enable mouse panning Nyalakan geseran tetikus - + Mouse sensitivity Sensitivitas mouse - + % % - + Motion / Touch Gerakan / Sentuhan @@ -2272,7 +2323,7 @@ Memungkinkan berbagai macam optimasi IR. - + Left Stick Stik Kiri @@ -2366,14 +2417,14 @@ Memungkinkan berbagai macam optimasi IR. - + L L - + ZL ZL @@ -2392,7 +2443,7 @@ Memungkinkan berbagai macam optimasi IR. - + Plus Tambah @@ -2405,15 +2456,15 @@ Memungkinkan berbagai macam optimasi IR. - - + + R R - + ZR ZR @@ -2470,236 +2521,236 @@ Memungkinkan berbagai macam optimasi IR. - + Right Stick Stik Kanan - - - - + + + + Clear Bersihkan - - - - - + + + + + [not set] [belum diatur] - - + + Invert button Balikkan tombol - - + + Toggle button Atur tombol - - + + Invert axis Balikkan poros - - - + + + Set threshold Atur batasan - - + + Choose a value between 0% and 100% Pilih sebuah angka diantara 0% dan 100% - + Toggle axis - + Set gyro threshold - + Map Analog Stick Petakan Stik Analog - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Setelah menekan OK, pertama gerakkan joystik secara mendatar, lalu tegak lurus. Untuk membalikkan sumbu, pertama gerakkan joystik secara tegak lurus, lalu mendatar. - + Center axis - - + + Deadzone: %1% Titik Mati: %1% - - + + Modifier Range: %1% Rentang Pengubah: %1% - - + + Pro Controller Kontroler Pro - + Dual Joycons Joycon Dual - + Left Joycon Joycon Kiri - + Right Joycon Joycon Kanan - + Handheld Jinjing - + GameCube Controller Kontroler GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Kontroler NES - + SNES Controller Kontroler SNES - + N64 Controller Kontroler N64 - + Sega Genesis Sega Genesis - + Start / Pause Mulai / Jeda - + Z Z - + Control Stick Stik Kendali - + C-Stick C-Stick - + Shake! Getarkan! - + [waiting] [menunggu] - + New Profile Profil Baru - + Enter a profile name: Masukkan nama profil: - - + + Create Input Profile Ciptakan Profil Masukan - + The given profile name is not valid! Nama profil yang diberi tidak sah! - + Failed to create the input profile "%1" Gagal membuat profil masukan "%1" - + Delete Input Profile Hapus Profil Masukan - + Failed to delete the input profile "%1" Gagal menghapus profil masukan "%1" - + Load Input Profile Muat Profil Masukan - + Failed to load the input profile "%1" Gagal memuat profil masukan "%1" - + Save Input Profile Simpat Profil Masukan - + Failed to save the input profile "%1" Gagal menyimpan profil masukan "%1" @@ -2747,7 +2798,7 @@ Untuk membalikkan sumbu, pertama gerakkan joystik secara tegak lurus, lalu menda - + Configure Konfigurasi @@ -2783,7 +2834,7 @@ Untuk membalikkan sumbu, pertama gerakkan joystik secara tegak lurus, lalu menda - + Test Uji coba @@ -2803,77 +2854,77 @@ Untuk membalikkan sumbu, pertama gerakkan joystik secara tegak lurus, lalu menda <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Pelajari lebih lanjut</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters Terdapat karakter tidak sah di angka port - + Port has to be in range 0 and 65353 Port harus berada dalam jangkauan 0 dan 65353 - + IP address is not valid Alamat IP tidak sah - + This UDP server already exists Server UDP ini sudah ada - + Unable to add more than 8 servers Tidak dapat menambah lebih dari 8 server - + Testing Menguji - + Configuring Mengkonfigur - + Test Successful Tes Berhasil - + Successfully received data from the server. Berhasil menerima data dari server. - + Test Failed Uji coba Gagal - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Tidak dapat menerima data yang sah dari server.<br>Mohon periksa bahwa server telah diatur dengan benar dan alamat dan port sudah sesuai. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. Uji coba UDP atau kalibrasi konfigurasi sedang berjalan.<br>Mohon tunggu hingga selesai. @@ -3201,7 +3252,7 @@ UUID: %2 - Ring Sensor Parameters + Virtual Ring Sensor Parameters @@ -3222,33 +3273,90 @@ UUID: %2 Titik Mati: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Kembalikan ke Semula - + Clear Bersihkan - + [not set] [belum diatur] - + Invert axis Balikkan poros - - + + Deadzone: %1% Titik Mati: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Mengkonfigur + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [menunggu] @@ -3553,8 +3661,8 @@ UUID: %2 - English - Inggris + American English + @@ -3687,22 +3795,27 @@ UUID: %2 Hasilkan Ulang - + System settings are available only when game is not running. Pengaturan sistem hanya tersedia saat permainan tidak dijalankan. - + + Warning: "%1" is not a valid language for region "%2" + + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Ini akan mengganti Switch virtual Anda dengan yang baru. Switch virtual Anda saat ini tidak akan bisa dipulihkan. Ini mungkin akan menyebabkan kesan tak terkira di dalam permainan. Ini juga mungkin akan gagal jika Anda menggunakan simpanan konfigurasi yang lawas. Lanjutkan? - + Warning Peringatan - + Console ID: 0x%1 ID Konsol: 0x%1 @@ -3773,7 +3886,7 @@ UUID: %2 - + Select TAS Load Directory... @@ -4328,7 +4441,7 @@ Drag points to change position, or double-click table cells to edit values.Kontroler P1 - + &Controller P1 %Kontroler P1 @@ -4341,42 +4454,37 @@ Drag points to change position, or double-click table cells to edit values. - - IP Address + + Server Address - - IP + + <html><head/><body><p>Server address of the host</p></body></html> - - <html><head/><body><p>IPv4 address of the host</p></body></html> - - - - + Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> - + Nickname - + Password - + Connect @@ -4384,12 +4492,12 @@ Drag points to change position, or double-click table cells to edit values. DirectConnectWindow - + Connecting - + Connect @@ -4459,862 +4567,872 @@ Drag points to change position, or double-click table cells to edit values.Waktu yang diperlukan untuk mengemulasikan bingkai Switch, tak menghitung pembatas bingkai atau v-sync. Agar emulasi berkecepatan penuh, ini harus 16.67 mdtk. - + &Clear Recent Files &Bersihkan Berkas Baru-baru Ini - + &Continue &Lanjutkan - + &Pause &Jeda - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu sedang menjalankan game - + Warning Outdated Game Format Peringatan Format Permainan yang Usang - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Anda menggunakan format direktori ROM yang sudah didekonstruksi untuk permainan ini, yang mana itu merupakan format lawas yang sudah tergantikan oleh yang lain seperti NCA, NAX, XCI, atau NSP. Direktori ROM yang sudah didekonstruksi kekurangan ikon, metadata, dan dukungan pembaruan.<br><br>Untuk penjelasan berbagai format Switch yang didukung yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>periksa wiki kami</a>. Pesan ini tidak akan ditampilkan lagi. - - + + Error while loading ROM! Kesalahan ketika memuat ROM! - + The ROM format is not supported. Format ROM tak didukung. - + An error occurred initializing the video core. Terjadi kesalahan ketika menginisialisasi inti video. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu telah mengalami error saat menjalankan inti video. Ini biasanya disebabkan oleh pemicu piranti (driver) GPU yang usang, termasuk yang terintegrasi. Mohon lihat catatan untuk informasi lebih rinci. Untuk informasi cara mengakses catatan, mohon lihat halaman berikut: <a href='https://yuzu-emu.org/help/reference/log-files/'>Cara Mengupload Berkas Catatan</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Terjadi kesalahan yang tak diketahui. Mohon lihat catatan untuk informasi lebih rinci. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Simpan Data - + Mod Data Mod Data - + Error Opening %1 Folder Gagal Membuka Folder %1 - - + + Folder does not exist! Folder tak ada! - + Error Opening Transferable Shader Cache Gagal Ketika Membuka Tembolok Shader yang Dapat Ditransfer - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Hapus Masukan - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. Tidak ada DLC yang terinstall untuk judul ini. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + Remove File Hapus File - - + + Error Removing Transferable Shader Cache Kesalahan Menghapus Transferable Shader Cache - - + + A shader cache for this title does not exist. Cache shader bagi judul ini tidak ada - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - - - Error Removing Transferable Shader Caches + + Error Removing Vulkan Driver Pipeline Cache + Failed to remove the driver pipeline cache. + + + + + + Error Removing Transferable Shader Caches + + + + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Kesalahan Menghapus Konfigurasi Buatan - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! Pengekstrakan RomFS Gagal! - + There was an error copying the RomFS files or the user cancelled the operation. Terjadi kesalahan ketika menyalin berkas RomFS atau dibatalkan oleh pengguna. - + Full Penuh - + Skeleton Skeleton - + Select RomFS Dump Mode Pilih Mode Dump RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Mohon pilih cara RomFS akan di-dump.<br>FPenuh akan menyalin seluruh berkas ke dalam direktori baru sementara <br>jerangkong hanya akan menciptakan struktur direktorinya saja. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Mengekstrak RomFS... - - + + Cancel Batal - + RomFS Extraction Succeeded! Pengekstrakan RomFS Berhasil! - + The operation completed successfully. Operasi selesai dengan sukses, - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Gagal membuka %1 - + Select Directory Pilih Direktori - + Properties Properti - + The game properties could not be loaded. Properti permainan tak dapat dimuat. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Eksekutabel Switch (%1);;Semua Berkas (*.*) - + Load File Muat Berkas - + Open Extracted ROM Directory Buka Direktori ROM Terekstrak - + Invalid Directory Selected Direktori Terpilih Tidak Sah - + The directory you have selected does not contain a 'main' file. Direktori yang Anda pilih tak memiliki berkas 'utama.' - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Install File - + %n file(s) remaining - + Installing file "%1"... Memasang berkas "%1"... - + Install Results Hasil Install - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed %n file(s) baru diinstall - + %n file(s) were overwritten %n file(s) telah ditimpa - + %n file(s) failed to install %n file(s) gagal di install - + System Application Aplikasi Sistem - + System Archive Arsip Sistem - + System Application Update Pembaruan Aplikasi Sistem - + Firmware Package (Type A) Paket Perangkat Tegar (Tipe A) - + Firmware Package (Type B) Paket Perangkat Tegar (Tipe B) - + Game Permainan - + Game Update Pembaruan Permainan - + Game DLC DLC Permainan - + Delta Title Judul Delta - + Select NCA Install Type... Pilih Tipe Pemasangan NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Mohon pilih jenis judul yang Anda ingin pasang sebagai NCA ini: (Dalam kebanyakan kasus, pilihan bawaan 'Permainan' tidak apa-apa`.) - + Failed to Install Gagal Memasang - + The title type you selected for the NCA is invalid. Jenis judul yang Anda pilih untuk NCA tidak sah. - + File not found Berkas tak ditemukan - + File "%1" not found Berkas "%1" tak ditemukan - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Akun yuzu Hilang - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Agar dapat mengirimkan berkas uju kompatibilitas permainan, Anda harus menautkan akun yuzu Anda.<br><br/>TUntuk mennautkan akun yuzu Anda, pergi ke Emulasi &gt; Konfigurasi &gt; Web. - + Error opening URL Kesalahan saat membuka URL - + Unable to open the URL "%1". Tidak dapat membuka URL "%1". - + TAS Recording Rekaman TAS - + Overwrite file of player 1? Timpa file pemain 1? - + Invalid config detected Konfigurasi tidak sah terdeteksi - + Handheld controller can't be used on docked mode. Pro controller will be selected. Kontroller jinjing tidak bisa digunakan dalam mode dock. Kontroller Pro akan dipilih - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Berkas Amiibo (%1);; Semua Berkas (*.*) - + Load Amiibo Muat Amiibo - + Error loading Amiibo data Gagal memuat data Amiibo - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Tangkapan Layar - + PNG Image (*.png) Berkas PNG (*.png) - + TAS state: Running %1/%2 Status TAS: Berjalan %1/%2 - + TAS state: Recording %1 Status TAS: Merekam %1 - + TAS state: Idle %1/%2 Status TAS: Diam %1/%2 - + TAS State: Invalid Status TAS: Tidak Valid - + &Stop Running &Matikan - + &Start &Mulai - + Stop R&ecording Berhenti Mer&ekam - + R&ecord R&ekam - + Building: %n shader(s) Membangun: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Skala: %1x - + Speed: %1% / %2% Kecepatan: %1% / %2% - + Speed: %1% Kecepatan: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Permainan: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU TINGGI - + GPU EXTREME GPU EKSTRIM - + GPU ERROR KESALAHAN GPU - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST NEAREST - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA TANPA AA - + FXAA FXAA - + SMAA - + Confirm Key Rederivation - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5325,76 +5443,76 @@ This will delete your autogenerated key files and re-run the key derivation modu - + Missing fuses - + - Missing BOOT0 - Kehilangan BOOT0 - + - Missing BCPKG2-1-Normal-Main - Kehilangan BCPKG2-1-Normal-Main - + - Missing PRODINFO - Kehilangan PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. - + Deriving Keys - + Select RomFS Dump Target - + Please select which RomFS you would like to dump. - + Are you sure you want to close yuzu? Apakah anda yakin ingin menutup yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5404,44 +5522,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGL tidak tersedia! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. - - + + Error while initializing OpenGL! Terjadi kesalahan menginisialisasi OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. VGA anda mungkin tidak mendukung OpenGL, atau anda tidak memiliki pemacu piranti (driver) grafis terbaharu. - + Error while initializing OpenGL 4.6! Terjadi kesalahan menginisialisasi OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 VGA anda mungkin tidak mendukung OpenGL 4.6, atau anda tidak memiliki pemacu piranti (driver) grafis terbaharu.<br><br>Pemuat GL:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 VGA anda mungkin tidak mendukung satu atau lebih ekstensi OpenGL. Mohon pastikan bahwa anda memiliki pemacu piranti (driver) grafis terbaharu.<br><br>Pemuat GL:<br>%1<br><br>Ekstensi yang tidak didukung:<br>%2 @@ -5943,7 +6061,7 @@ Debug Message: Install - + Install Files to NAND Install File ke NAND @@ -5951,7 +6069,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 @@ -6599,7 +6717,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE @@ -6648,31 +6766,31 @@ p, li { white-space: pre-wrap; } - + Shift - + Ctrl - + Alt - - - - + + + + [not set] [belum diatur] @@ -6683,14 +6801,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 @@ -6701,262 +6819,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] - + - + Left Kiri - + - + Right Kanan - + - + Down Bawah - + - + Up Atas - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Mulai - - + + L1 - - + + L2 - - + + L3 - - + + R1 - - + + R2 - - + + R3 - - + + Circle - - + + Cross - - + + Square - - + + Triangle - - + + Share - - + + Options - - + + [undefined] - + %1%2 - - + + [invalid] - - - - + + + + %1%2Hat %3 - - - - - - + + + + + + %1%2Axis %3 - - + + %1%2Axis %3,%4,%5 - - + + %1%2Motion %3 %1%2Gerakan %3 - - - - + + + + %1%2Button %3 - - + + [unused] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Tambah + + + + Minus + Kurang + + + + Home Home - + + Capture + Tangkapan + + + Touch Sentuh - + Wheel Indicates the mouse wheel - + Backward - + Forward - + Task - + Extra - + %1%2%3 diff --git a/dist/languages/it.ts b/dist/languages/it.ts index b41728cb7..d205de5f6 100644 --- a/dist/languages/it.ts +++ b/dist/languages/it.ts @@ -922,102 +922,112 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP.Disabilita JIT macro - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + Quando l'opzione è selezionata, disabilita le funzioni HLE delle macro. Abilitare questa opzione rende i giochi più lenti + + + + Disable Macro HLE + Disabilita HLE macro + + + When checked, yuzu will log statistics about the compiled pipeline cache - + Enable Shader Feedback - + When checked, it executes shaders without loop logic changes - + Disable Loop safety checks - + Debugging Debug - + Enable Verbose Reporting Services** - + Enable FS Access Log Abilita log di accesso al FS - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** - + Create Minidump After Crash Crea Minidump dopo un arresto anomalo - + Advanced Avanzate - + Kiosk (Quest) Mode Modalità Kiosk (Quest) - + Enable CPU Debugging Abilita il debug della CPU - + Enable Debug Asserts Abilita le asserzioni di debug - + Enable Auto-Stub** Abilita stub automatico** - + Enable All Controller Types Abilita tutti i tipi di controller - + Disable Web Applet Disabilita l'applet web - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Perform Startup Vulkan Check Esegui controllo di Vulkan all'avvio - + **This will be reset automatically when yuzu closes. **L'opzione verrà automaticamente ripristinata alla chiusura di yuzu. @@ -1032,12 +1042,12 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP.yuzu dev'essere riavviato affinché questa opzione venga applicata. - + Web applet not compiled Applet web non compilato - + MiniDump creation not compiled Creazione MiniDump non compilata @@ -1088,13 +1098,13 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + Audio Audio - + CPU CPU @@ -1110,13 +1120,13 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + General Generale - + Graphics Grafica @@ -1132,7 +1142,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + Controls Comandi @@ -1148,7 +1158,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + System Sistema @@ -1411,7 +1421,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + None Nessuno @@ -1522,112 +1532,127 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: Filtro di adattamento alla finestra: - + Nearest Neighbor Nearest neighbor - + Bilinear Bilineare - + Bicubic Bicubico - + Gaussian Gaussiano - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ Super Resolution (solo Vulkan) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: Metodo di anti-aliasing: - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness Usa la nitidezza FSR globale - + Set FSR Sharpness Imposta la nitidezza FSR - + FSR Sharpness: Nitidezza FSR: - + 100% 100% - - + + Use global background color Usa il colore di sfondo globale - + Set background color: Imposta il colore di sfondo: - + Background Color: Colore dello sfondo: @@ -1672,76 +1697,96 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + + + + + Force maximum clocks (Vulkan only) + + + + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. Il VSync evita il tearing dello schermo, ma alcune schede video hanno prestazioni peggiori quando il VSync è abilitato. Lascialo abilitato se non noti una differenza nelle prestazioni. - + Use VSync Utilizza VSync - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Abilita la compilazione degli shader asincrona, che può ridurre gli scatti causati dagli shader. Questa funzione è sperimentale. - + Use asynchronous shader building (Hack) Utilizza la compilazione asincrona degli shader (espediente) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Use Fast GPU Time (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Use pessimistic buffer flushes (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + Anisotropic Filtering: Filtro anisotropico: - + Automatic Automatico - + Default Predefinito - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2129,7 +2174,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + Configure Configura @@ -2155,6 +2200,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. + Requires restarting yuzu Richiede il riavvio di yuzu @@ -2174,22 +2220,27 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP.Navigazione con il controller - + + Enable direct JoyCon driver + + + + Enable mouse panning Abilita il mouse panning - + Mouse sensitivity Sensibilità del mouse - + % % - + Motion / Touch Movimento/tocco @@ -2301,7 +2352,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + Left Stick Levetta sinistra @@ -2395,14 +2446,14 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + L L - + ZL ZL @@ -2421,7 +2472,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + Plus Più @@ -2434,15 +2485,15 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - - + + R R - + ZR ZR @@ -2499,236 +2550,236 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + Right Stick Levetta destra - - - - + + + + Clear Cancella - - - - - + + + + + [not set] [non impost.] - - + + Invert button Inverti pulsante - - + + Toggle button Premi il pulsante - - + + Invert axis Inverti asse - - - + + + Set threshold Imposta soglia - - + + Choose a value between 0% and 100% Scegli un valore compreso tra 0% e 100% - + Toggle axis - + Set gyro threshold - + Map Analog Stick Mappa la levetta analogica - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Dopo aver premuto OK, prima muovi la levetta orizzontalmente, e poi verticalmente. Per invertire gli assi, prima muovi la levetta verticalmente, e poi orizzontalmente. - + Center axis Centra asse - - + + Deadzone: %1% Zona morta: %1% - - + + Modifier Range: %1% Modifica raggio: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Due Joycon - + Left Joycon Joycon sinistro - + Right Joycon Joycon destro - + Handheld Portatile - + GameCube Controller Controller GameCube - + Poke Ball Plus Poké Ball Plus - + NES Controller Controller NES - + SNES Controller Controller SNES - + N64 Controller Controller N64 - + Sega Genesis Sega Genesis - + Start / Pause Avvia / Metti in pausa - + Z Z - + Control Stick Levetta di Controllo - + C-Stick Levetta C - + Shake! Scuoti! - + [waiting] [in attesa] - + New Profile Nuovo profilo - + Enter a profile name: Inserisci un nome profilo: - - + + Create Input Profile Crea un profilo di input - + The given profile name is not valid! Il nome profilo inserito non è valido! - + Failed to create the input profile "%1" Impossibile creare il profilo di input "%1" - + Delete Input Profile Elimina un profilo di input - + Failed to delete the input profile "%1" Impossibile eliminare il profilo di input "%1" - + Load Input Profile Carica un profilo di input - + Failed to load the input profile "%1" Impossibile caricare il profilo di input "%1" - + Save Input Profile Salva un profilo di Input - + Failed to save the input profile "%1" Impossibile creare il profilo di input "%1" @@ -2776,7 +2827,7 @@ Per invertire gli assi, prima muovi la levetta verticalmente, e poi orizzontalme - + Configure Configura @@ -2812,7 +2863,7 @@ Per invertire gli assi, prima muovi la levetta verticalmente, e poi orizzontalme - + Test Test @@ -2832,77 +2883,77 @@ Per invertire gli assi, prima muovi la levetta verticalmente, e poi orizzontalme <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Per saperne di più</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters Il numero di porta contiene caratteri non validi - + Port has to be in range 0 and 65353 La valore della porta deve essere compreso tra 0 e 65353 inclusi - + IP address is not valid Indirizzo IP non valido - + This UDP server already exists Questo server UDP esiste già - + Unable to add more than 8 servers Impossibile aggiungere più di 8 server - + Testing Testando - + Configuring Configurando - + Test Successful Test riuscito - + Successfully received data from the server. Ricevuti con successo dati dal server. - + Test Failed Test fallito - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Impossibile ricevere dati validi dal server.<br> Verificare che il server sia impostato correttamente e che indirizzo e porta siano corretti. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. È in corso il test UDP o la configurazione della calibrazione,<br> attendere che finiscano. @@ -3231,7 +3282,7 @@ UUID: %2 - Ring Sensor Parameters + Virtual Ring Sensor Parameters @@ -3252,33 +3303,90 @@ UUID: %2 Zona morta: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Ripristina valori predefiniti - + Clear Cancella - + [not set] [non impost.] - + Invert axis Inverti asse - - + + Deadzone: %1% Zona morta: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Configurando + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [in attesa] @@ -3583,8 +3691,8 @@ UUID: %2 - English - Inglese (English) + American English + Inglese americano @@ -3717,22 +3825,27 @@ UUID: %2 Rigenera - + System settings are available only when game is not running. Le impostazioni di sistema sono disponibili solamente quando il gioco non è in esecuzione. - + + Warning: "%1" is not a valid language for region "%2" + Attenzione: "%1" non è una lingua valida per la regione "%2" + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Questo rimpiazzerà la tua Switch virtuale con una nuova. La tua Switch virtuale non sarà recuperabile. Questo potrebbe avere effetti indesiderati nei giochi. Questo potrebbe fallire, se usi un salvataggio non aggiornato. Desideri continuare? - + Warning Attenzione - + Console ID: 0x%1 ID Console: 0x%1 @@ -3803,7 +3916,7 @@ UUID: %2 Configurazione TAS - + Select TAS Load Directory... Seleziona la cartella di caricamento TAS... @@ -4359,7 +4472,7 @@ Trascina i punti per cambiare posizione, oppure clicca due volte la cella in tab Controller G1 - + &Controller P1 &Controller G1 @@ -4372,42 +4485,37 @@ Trascina i punti per cambiare posizione, oppure clicca due volte la cella in tab Collegamento diretto - - IP Address - Indirizzo IP + + Server Address + - - IP - IP + + <html><head/><body><p>Server address of the host</p></body></html> + - - <html><head/><body><p>IPv4 address of the host</p></body></html> - <html><head/><body><p>Indirizzo IPv4 dell'host</p></body></html> - - - + Port Porta - + <html><head/><body><p>Port number the host is listening on</p></body></html> <html><head/><body><p>Numero della porta sulla quale l'host è in ascolto</p></body></html> - + Nickname Nickname - + Password Password - + Connect Connetti @@ -4415,12 +4523,12 @@ Trascina i punti per cambiare posizione, oppure clicca due volte la cella in tab DirectConnectWindow - + Connecting Connessione in corso - + Connect Connetti @@ -4490,472 +4598,482 @@ Trascina i punti per cambiare posizione, oppure clicca due volte la cella in tab Tempo necessario per emulare un fotogramma della Switch, senza tenere conto del limite al framerate o del V-Sync. Per un'emulazione alla massima velocità, il valore non dovrebbe essere superiore a 16.67 ms. - + &Clear Recent Files &Cancella i file recenti - + &Continue &Continua - + &Pause &Pausa - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Formato del gioco obsoleto - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Stai usando una cartella con dentro una ROM decostruita come formato per avviare questo gioco, è un formato obsoleto ed è stato sostituito da altri come NCA, NAX, XCI o NSP. Le ROM decostruite non hanno icone, metadata e non supportano gli aggiornamenti. <br><br>Per una spiegazione sui vari formati di Switch che yuzu supporta, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>controlla la nostra wiki</a>. Questo messaggio non verrà più mostrato. - - + + Error while loading ROM! Errore nel caricamento della ROM! - + The ROM format is not supported. Il formato della ROM non è supportato. - + An error occurred initializing the video core. È stato riscontrato un errore nell'inizializzazione del core video. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Errore nel caricamento della ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Segui <a href='https://yuzu-emu.org/help/quickstart/'>la guida introduttiva di yuzu</a> per rifare il dump dei file.<br>Puoi fare riferimento alla wiki di yuzu</a> o al server Discord di yuzu</a> per assistenza. - + An unknown error occurred. Please see the log for more details. Si è verificato un errore sconosciuto. Visualizza il log per maggiori dettagli. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Chiusura del software in corso... - + Save Data Dati di salvataggio - + Mod Data Dati delle mod - + Error Opening %1 Folder Errore nell'apertura della cartella %1 - - + + Folder does not exist! La cartella non esiste! - + Error Opening Transferable Shader Cache Errore nell'apertura della cache trasferibile degli shader - + Failed to create the shader cache directory for this title. Impossibile creare la cartella della cache degli shader per questo titolo. - + Error Removing Contents Errore nella rimozione del contentuto - + Error Removing Update Errore nella rimozione dell'aggiornamento - + Error Removing DLC Errore nella rimozione del DLC - + Remove Installed Game Contents? Rimuovere il contenuto del gioco installato? - + Remove Installed Game Update? Rimuovere l'aggiornamento installato? - + Remove Installed Game DLC? Rimuovere il DLC installato? - + Remove Entry Rimuovi voce - - - - - - + + + + + + Successfully Removed Rimozione completata - + Successfully removed the installed base game. Il gioco base installato è stato rimosso con successo. - + The base game is not installed in the NAND and cannot be removed. Il gioco base non è installato su NAND e non può essere rimosso. - + Successfully removed the installed update. Aggiornamento rimosso con successo. - + There is no update installed for this title. Non c'è alcun aggiornamento installato per questo gioco. - + There are no DLC installed for this title. Non c'è alcun DLC installato per questo gioco. - + Successfully removed %1 installed DLC. %1 DLC rimossi con successo. - + Delete OpenGL Transferable Shader Cache? Vuoi rimuovere la cache trasferibile degli shader OpenGL? - + Delete Vulkan Transferable Shader Cache? Vuoi rimuovere la cache trasferibile degli shader Vulkan? - + Delete All Transferable Shader Caches? Vuoi rimuovere tutte le cache trasferibili degli shader? - + Remove Custom Game Configuration? Rimuovere la configurazione personalizzata del gioco? - + Remove File Rimuovi file - - + + Error Removing Transferable Shader Cache Errore nella rimozione della cache trasferibile degli shader - - + + A shader cache for this title does not exist. Per questo titolo non esiste una cache degli shader. - + Successfully removed the transferable shader cache. La cache trasferibile degli shader è stata rimossa con successo. - + Failed to remove the transferable shader cache. Impossibile rimuovere la cache trasferibile degli shader. - - + + Error Removing Vulkan Driver Pipeline Cache + Errore nella rimozione della cache delle pipeline del driver Vulkan + + + + Failed to remove the driver pipeline cache. + Impossibile rimuovere la cache delle pipeline del driver. + + + + Error Removing Transferable Shader Caches Errore nella rimozione delle cache trasferibili degli shader - + Successfully removed the transferable shader caches. Le cache trasferibili degli shader sono state rimosse con successo. - + Failed to remove the transferable shader cache directory. Impossibile rimuovere la cartella della cache trasferibile degli shader. - - + + Error Removing Custom Configuration Errore nella rimozione della configurazione personalizzata - + A custom configuration for this title does not exist. Non esiste una configurazione personalizzata per questo gioco. - + Successfully removed the custom game configuration. La configurazione personalizzata del gioco è stata rimossa con successo. - + Failed to remove the custom game configuration. Impossibile rimuovere la configurazione personalizzata del gioco. - - + + RomFS Extraction Failed! Estrazione RomFS fallita! - + There was an error copying the RomFS files or the user cancelled the operation. C'è stato un errore nella copia dei file del RomFS o l'operazione è stata annullata dall'utente. - + Full Completa - + Skeleton Cartelle - + Select RomFS Dump Mode Seleziona la modalità di estrazione della RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Seleziona come vorresti estrarre la RomFS. <br>La modalità Completa copierà tutti i file in una nuova cartella mentre<br>la modalità Cartelle creerà solamente le cartelle e le sottocartelle. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Estrazione RomFS in corso... - - + + Cancel Annulla - + RomFS Extraction Succeeded! Estrazione RomFS riuscita! - + The operation completed successfully. L'operazione è stata completata con successo. - - - - - + + + + + Create Shortcut Crea scorciatoia - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Verrà creata una scorciatoia all'AppImage attuale. Potrebbe non funzionare correttamente se effettui un aggiornamento. Vuoi continuare? - + Cannot create shortcut on desktop. Path "%1" does not exist. Impossibile creare la scorciatoia sul desktop. Il percorso "%1" non esiste. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Impossibile creare la scorciatoia nel menù delle applicazioni. Il percorso "%1" non esiste e non può essere creato. - + Create Icon Crea icona - + Cannot create icon file. Path "%1" does not exist and cannot be created. Impossibile creare il file dell'icona. Il percorso "%1" non esiste e non può essere creato. - + Start %1 with the yuzu Emulator Avvia %1 con l'emulatore yuzu - + Failed to create a shortcut at %1 Impossibile creare la scorciatoia in %1 - + Successfully created a shortcut to %1 Scorciatoia creata con successo in %1 - + Error Opening %1 Errore nell'apertura di %1 - + Select Directory Seleziona cartella - + Properties Proprietà - + The game properties could not be loaded. Non è stato possibile caricare le proprietà del gioco. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Eseguibile Switch (%1);;Tutti i file (*.*) - + Load File Carica file - + Open Extracted ROM Directory Apri cartella ROM estratta - + Invalid Directory Selected Cartella selezionata non valida - + The directory you have selected does not contain a 'main' file. La cartella che hai selezionato non contiene un file "main". - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) File installabili Switch (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Installa file - + %n file(s) remaining %n file rimanente%n file rimanenti%n file rimanenti - + Installing file "%1"... Installazione del file "%1"... - + Install Results Risultati dell'installazione - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Per evitare possibli conflitti, sconsigliamo di installare i giochi base su NAND. Usa questa funzione solo per installare aggiornamenti e DLC. - + %n file(s) were newly installed %n nuovo file è stato installato @@ -4964,7 +5082,7 @@ Usa questa funzione solo per installare aggiornamenti e DLC. - + %n file(s) were overwritten %n file è stato sovrascritto @@ -4973,7 +5091,7 @@ Usa questa funzione solo per installare aggiornamenti e DLC. - + %n file(s) failed to install %n file non è stato installato a causa di errori @@ -4982,378 +5100,378 @@ Usa questa funzione solo per installare aggiornamenti e DLC. - + System Application Applicazione di sistema - + System Archive Archivio di sistema - + System Application Update Aggiornamento di un'applicazione di sistema - + Firmware Package (Type A) Pacchetto firmware (tipo A) - + Firmware Package (Type B) Pacchetto firmware (tipo B) - + Game Gioco - + Game Update Aggiornamento di gioco - + Game DLC DLC - + Delta Title Titolo delta - + Select NCA Install Type... Seleziona il tipo di installazione NCA - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Seleziona il tipo del file NCA da installare: (Nella maggior parte dei casi, il valore predefinito 'Gioco' va bene.) - + Failed to Install Installazione fallita - + The title type you selected for the NCA is invalid. Il tipo che hai selezionato per l'NCA non è valido. - + File not found File non trovato - + File "%1" not found File "%1" non trovato - + OK OK - - + + Hardware requirements not met Requisiti hardware non soddisfatti - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Il tuo sistema non soddisfa i requisiti hardware consigliati. La funzionalità di segnalazione della compatibilità è stata disattivata. - + Missing yuzu Account Account di yuzu non trovato - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Per segnalare la compatibilità di un gioco, devi collegare il tuo account yuzu. <br><br/>Per collegare il tuo account yuzu, vai su Emulazione &gt; Configurazione &gt; Web. - + Error opening URL Errore aprendo l'URL - + Unable to open the URL "%1". Impossibile aprire l'URL "% 1". - + TAS Recording - + Overwrite file of player 1? Vuoi sovrascrivere il file del giocatore 1? - + Invalid config detected Trovata configurazione invalida - + Handheld controller can't be used on docked mode. Pro controller will be selected. Il controller portatile non può essere utilizzato in modalità dock. Verrà selezionato il controller Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed L'Amiibo corrente è stato rimosso - + Error Errore - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) File Amiibo (%1);; Tutti i file (*.*) - + Load Amiibo Carica Amiibo - + Error loading Amiibo data Errore nel caricamento dei dati dell'Amiibo - + The selected file is not a valid amiibo Il file selezionato non è un Amiibo valido - + The selected file is already on use Il file selezionato è già in uso - + An unknown error occurred Si è verificato un errore sconosciuto - + Capture Screenshot Cattura screenshot - + PNG Image (*.png) Immagine PNG (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running &Interrompi - + &Start &Avvia - + Stop R&ecording Interrompi r&egistrazione - + R&ecord R&egistra - + Building: %n shader(s) Compilazione di %n shaderCompilazione di %n shaderCompilazione di %n shader - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Velocità: %1% / %2% - + Speed: %1% Velocità: %1% - + Game: %1 FPS (Unlocked) Gioco: %1 FPS (Sbloccati) - + Game: %1 FPS Gioco: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMALE - + GPU HIGH GPU ALTA - + GPU EXTREME GPU ESTREMA - + GPU ERROR ERRORE GPU - + DOCKED DOCK - + HANDHELD PORTATILE - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST NEAREST - - + + BILINEAR BILINEARE - + BICUBIC BICUBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA NO AA - + FXAA FXAA - + SMAA SMAA - + Confirm Key Rederivation Conferma ri-derivazione chiavi - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5370,37 +5488,37 @@ e facoltativamente fai dei backup. Questo eliminerà i tuoi file di chiavi autogenerati e ri-avvierà il processo di derivazione delle chiavi. - + Missing fuses Fusi mancanti - + - Missing BOOT0 - BOOT0 mancante - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main mancante - + - Missing PRODINFO - PRODINFO mancante - + Derivation Components Missing Componenti di derivazione mancanti - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Chiavi di crittografia mancanti. <br>Segui <a href='https://yuzu-emu.org/help/quickstart/'>la guida introduttiva di yuzu</a> per ottenere tutte le tue chiavi, il tuo firmware e i tuoi giochi.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5409,39 +5527,39 @@ Questa operazione potrebbe durare fino a un minuto in base alle prestazioni del tuo sistema. - + Deriving Keys Derivazione chiavi - + Select RomFS Dump Target Seleziona Target dell'Estrazione del RomFS - + Please select which RomFS you would like to dump. Seleziona quale RomFS vorresti estrarre. - + Are you sure you want to close yuzu? Sei sicuro di voler chiudere yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Sei sicuro di voler arrestare l'emulazione? Tutti i progressi non salvati verranno perduti. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5453,44 +5571,44 @@ Desideri uscire comunque? GRenderWindow - - + + OpenGL not available! OpenGL non disponibile! - + OpenGL shared contexts are not supported. Gli shared context di OpenGL non sono supportati. - + yuzu has not been compiled with OpenGL support. yuzu non è stato compilato con il supporto OpenGL. - - + + Error while initializing OpenGL! Errore durante l'inizializzazione di OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. La tua GPU potrebbe non supportare OpenGL, o non hai installato l'ultima versione dei driver video. - + Error while initializing OpenGL 4.6! Errore durante l'inizializzazione di OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 La tua GPU potrebbe non supportare OpenGL 4.6, o non hai installato l'ultima versione dei driver video.<br><br>Renderer GL:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 La tua GPU potrebbe non supportare una o più estensioni OpenGL richieste. Assicurati di aver installato i driver video più recenti.<br><br>Renderer GL:<br>%1<br><br>Estensioni non supportate:<br>%2 @@ -5674,7 +5792,7 @@ Desideri uscire comunque? Game starts, but crashes or major glitches prevent it from being completed. - Il gioco parte, ma presenta degli arresti anomali o dei glitch importanti che ne impediscono il completamento. + Il gioco parte, ma non può essere completato a causa di arresti anomali o di glitch importanti. @@ -5993,7 +6111,7 @@ Messaggio di debug: Installa - + Install Files to NAND Installa file su NAND @@ -6001,7 +6119,7 @@ Messaggio di debug: LimitableInputDialog - + The text can't contain any of the following characters: %1 Il testo non può contenere i seguenti caratteri: @@ -6657,7 +6775,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE AVVIA/PAUSA @@ -6706,31 +6824,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [non impost.] @@ -6741,14 +6859,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Asse %1%2 @@ -6759,262 +6877,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [sconosciuto] - + - + Left Sinistra - + - + Right Destra - + - + Down Giù - + - + Up Su - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Start - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle Cerchio - - + + Cross Croce - - + + Square Quadrato - - + + Triangle Triangolo - - + + Share Condividi - - + + Options Opzioni - - + + [undefined] - + %1%2 %1%2 - - + + [invalid] [non valido] - - - - + + + + %1%2Hat %3 - - - - - - + + + + + + %1%2Axis %3 %1%2Asse %3 - - + + %1%2Axis %3,%4,%5 %1%2Asse %3,%4,%5 - - + + %1%2Motion %3 - - - - + + + + %1%2Button %3 %1%2Pulsante %3 - - + + [unused] [inutilizzato] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Più + + + + Minus + Meno + + + + Home Home - + + Capture + Cattura + + + Touch Touch - + Wheel Indicates the mouse wheel Rotella - + Backward Indietro - + Forward Avanti - + Task - + Extra - + %1%2%3 %1%2%3 diff --git a/dist/languages/ja_JP.ts b/dist/languages/ja_JP.ts index 59f4aa738..377c6b522 100644 --- a/dist/languages/ja_JP.ts +++ b/dist/languages/ja_JP.ts @@ -934,102 +934,112 @@ This would ban both their forum username and their IP address. Macro JITを無効化 - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + + + + + Disable Macro HLE + + + + When checked, yuzu will log statistics about the compiled pipeline cache チェックすると、コンパイルしたパイプラインキャッシュの統計情報をロギングします - + Enable Shader Feedback シェーダフィードバックの有効j化 - + When checked, it executes shaders without loop logic changes チェックすると、ループロジックを変更せずにシェーダーを実行します。 - + Disable Loop safety checks ループ安全性チェックの無効化 - + Debugging デバッグ - + Enable Verbose Reporting Services** 詳細なレポートサービスの有効化** - + Enable FS Access Log FSアクセスログの有効化 - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. これを有効にすると、最新のオーディオコマンドリストがコンソールに出力されます。オーディオレンダラーを使用するゲームにのみ影響します。 - + Dump Audio Commands To Console** - + Create Minidump After Crash クラッシュ時にミニダンプを生成 - + Advanced 高度 - + Kiosk (Quest) Mode Kiosk (Quest) Mode - + Enable CPU Debugging CPUデバッグの有効化 - + Enable Debug Asserts デバッグアサートの有効化 - + Enable Auto-Stub** 自動スタブの有効化** - + Enable All Controller Types すべてのコントローラタイプを有効にする - + Disable Web Applet Webアプレットの無効化 - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Perform Startup Vulkan Check - + **This will be reset automatically when yuzu closes. ** yuzuを終了したときに自動的にリセットされます。 @@ -1044,12 +1054,12 @@ This would ban both their forum username and their IP address. この設定を適用するには yuzu を再起動する必要があります. - + Web applet not compiled - + MiniDump creation not compiled @@ -1100,13 +1110,13 @@ This would ban both their forum username and their IP address. - + Audio サウンド - + CPU CPU @@ -1122,13 +1132,13 @@ This would ban both their forum username and their IP address. - + General 全般 - + Graphics グラフィック @@ -1144,7 +1154,7 @@ This would ban both their forum username and their IP address. - + Controls 操作 @@ -1160,7 +1170,7 @@ This would ban both their forum username and their IP address. - + System システム @@ -1423,7 +1433,7 @@ This would ban both their forum username and their IP address. - + None なし @@ -1534,112 +1544,127 @@ This would ban both their forum username and their IP address. + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: ウィンドウ　アダプティング　フィルター: - + Nearest Neighbor Nearest Neighbor - + Bilinear Bilinear - + Bicubic Bicubic - + Gaussian Gaussian - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ Super Resolution (Vulkan のみ) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: アンチエイリアス方式: - + FXAA FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color 共通設定を使用 - + Set background color: 背景色の設定： - + Background Color: 背景色： @@ -1684,76 +1709,96 @@ This would ban both their forum username and their IP address. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + + + + + Force maximum clocks (Vulkan only) + + + + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. VSyncは画面のちらつきを防ぎますが、一部のグラフィックカードではパフォーマンスが低下します。パフォーマンス低下を感じない限り、有効のままにしてください。 - + Use VSync VSyncを使用 - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. 非同期でのシェーダーのコンパイルを有効にします。シェーダーのスタッターが減少する場合があります。この機能は実験的です。 - + Use asynchronous shader building (Hack) 非同期でのシェーダー構築を使用 (ハック) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. 高速なGPUタイミングを有効にします。このオプションは、ほとんどのゲームをその最高のネイティブ解像度で実行することを強制します。 - + Use Fast GPU Time (Hack) 高速なGPUタイミングを有効化(ハック) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. 悲観的なバッファフラッシュを有効にします. このオプションは, 変更されていないバッファを強制的にフラッシュさせるので, パフォーマンスが低下する可能性があります. - + Use pessimistic buffer flushes (Hack) 悲観的なバッファフラッシュを使用 (ハック) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + Anisotropic Filtering: 異方性フィルタリング： - + Automatic 自動 - + Default デフォルト - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2141,7 +2186,7 @@ This would ban both their forum username and their IP address. - + Configure 設定 @@ -2167,6 +2212,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu yuzuの再起動が必要 @@ -2186,22 +2232,27 @@ This would ban both their forum username and their IP address. - + + Enable direct JoyCon driver + + + + Enable mouse panning - + Mouse sensitivity マウス感度 - + % % - + Motion / Touch モーション / タッチ @@ -2313,7 +2364,7 @@ This would ban both their forum username and their IP address. - + Left Stick Lスティック @@ -2407,14 +2458,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2433,7 +2484,7 @@ This would ban both their forum username and their IP address. - + Plus + @@ -2446,15 +2497,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2511,236 +2562,236 @@ This would ban both their forum username and their IP address. - + Right Stick Rスティック - - - - + + + + Clear クリア - - - - - + + + + + [not set] [未設定] - - + + Invert button ボタンを反転 - - + + Toggle button - - + + Invert axis 軸を反転 - - - + + + Set threshold しきい値を設定 - - + + Choose a value between 0% and 100% 0%から100%の間の値を選択してください - + Toggle axis - + Set gyro threshold ジャイロのしきい値を設定 - + Map Analog Stick アナログスティックをマップ - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. OKを押した後、スティックを水平方向に動かし、次に垂直方向に動かしてください。 軸を反転させる場合、 最初に垂直方向に動かし、次に水平方向に動かしてください。 - + Center axis - - + + Deadzone: %1% デッドゾーン：%1% - - + + Modifier Range: %1% 変更範囲：%1% - - + + Pro Controller Proコントローラ - + Dual Joycons Joy-Con(L/R) - + Left Joycon Joy-Con(L) - + Right Joycon Joy-Con(R) - + Handheld 携帯モード - + GameCube Controller ゲームキューブコントローラ - + Poke Ball Plus モンスターボールプラス - + NES Controller ファミコン・コントローラー - + SNES Controller スーパーファミコン・コントローラー - + N64 Controller ニンテンドウ64・コントローラー - + Sega Genesis メガドライブ - + Start / Pause スタート/ ポーズ - + Z Z - + Control Stick - + C-Stick Cスティック - + Shake! 振ってください - + [waiting] [待機中] - + New Profile 新規プロファイル - + Enter a profile name: プロファイル名を入力: - - + + Create Input Profile 入力プロファイルを作成 - + The given profile name is not valid! プロファイル名が無効です! - + Failed to create the input profile "%1" 入力プロファイル "%1" の作成に失敗しました - + Delete Input Profile 入力プロファイルを削除 - + Failed to delete the input profile "%1" 入力プロファイル "%1" の削除に失敗しました - + Load Input Profile 入力プロファイルをロード - + Failed to load the input profile "%1" 入力プロファイル "%1" のロードに失敗しました - + Save Input Profile 入力プロファイルをセーブ - + Failed to save the input profile "%1" 入力プロファイル "%1" のセーブに失敗しました @@ -2788,7 +2839,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Configure 設定 @@ -2824,7 +2875,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Test テスト @@ -2844,77 +2895,77 @@ To invert the axes, first move your joystick vertically, and then horizontally.< <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">さらに詳しく</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters ポート番号に無効な文字が含まれています - + Port has to be in range 0 and 65353 ポート番号は0から65353の間で設定してください - + IP address is not valid IPアドレスが無効です - + This UDP server already exists このUDPサーバはすでに存在してます - + Unable to add more than 8 servers 8個以上のサーバを追加することはできません - + Testing テスト中 - + Configuring 設定中 - + Test Successful テスト成功 - + Successfully received data from the server. サーバーからのデータ受信に成功しました。 - + Test Failed テスト失敗 - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. 有効なデータを受信できませんでした。<br>サーバーが正しくセットアップされ、アドレスとポートが正しいことを確認してください。 - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. UDPテストまたはキャリブレーション実行中です。<br>完了までお待ちください。 @@ -3242,8 +3293,8 @@ UUID: %2 - Ring Sensor Parameters - センサーパラメータ + Virtual Ring Sensor Parameters + @@ -3263,33 +3314,90 @@ UUID: %2 デッドゾーン：0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults デフォルトに戻す - + Clear クリア - + [not set] [未設定] - + Invert axis 軸を反転 - - + + Deadzone: %1% デッドゾーン：%1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + 設定中 + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [入力待ち] @@ -3594,8 +3702,8 @@ UUID: %2 - English - English + American English + @@ -3728,22 +3836,27 @@ UUID: %2 再作成 - + System settings are available only when game is not running. システム設定はゲーム未実行時にのみ変更できます。 - + + Warning: "%1" is not a valid language for region "%2" + + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? 仮想Switchコンソールを再作成しようとしています。現在使用中の仮想Switchコンソールを後から復旧させることはできません。ゲームに予期せぬ影響を与える可能性があり、古い設定などを使うと失敗するかもしれませんが、それでも続行しますか？ - + Warning 警告 - + Console ID: 0x%1 コンソールID： 0x%1 @@ -3814,7 +3927,7 @@ UUID: %2 TAS 設定 - + Select TAS Load Directory... TAS ロードディレクトリを選択... @@ -4370,7 +4483,7 @@ Drag points to change position, or double-click table cells to edit values.Controller P1 - + &Controller P1 &Controller P1 @@ -4383,42 +4496,37 @@ Drag points to change position, or double-click table cells to edit values.ダイレクト接続 - - IP Address - IPアドレス + + Server Address + - - IP - IP + + <html><head/><body><p>Server address of the host</p></body></html> + - - <html><head/><body><p>IPv4 address of the host</p></body></html> - <html><head/><body><p>ホストのIPv4アドレス</p></body></html> - - - + Port ポート - + <html><head/><body><p>Port number the host is listening on</p></body></html> <html><head/><body><p>ホストの待ち受けポート番号</p></body></html> - + Nickname ニックネーム - + Password パスワード - + Connect 接続 @@ -4426,12 +4534,12 @@ Drag points to change position, or double-click table cells to edit values. DirectConnectWindow - + Connecting 接続中 - + Connect 接続 @@ -4502,863 +4610,873 @@ Drag points to change position, or double-click table cells to edit values.Switchフレームをエミュレートするのにかかる時間で、フレームリミットやV-Syncは含まれません。フルスピードエミュレーションの場合、最大で16.67ミリ秒になります。 - + &Clear Recent Files 最近のファイルをクリア(&C) - + &Continue 再開(&C) - + &Pause 中断(&P) - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzuはゲームを起動しています - + Warning Outdated Game Format 古いゲームフォーマットの警告 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. このゲームでは、分解されたROMディレクトリフォーマットを使用しています。これは、NCA、NAX、XCI、またはNSPなどに取って代わられた古いフォーマットです。分解されたROMディレクトリには、アイコン、メタデータ、およびアップデートサポートがありません。<br><br>yuzuがサポートするSwitchフォーマットの説明については、<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>wikiをチェックしてください</a>。このメッセージは二度と表示されません。 - - + + Error while loading ROM! ROMロード中にエラーが発生しました！ - + The ROM format is not supported. このROMフォーマットはサポートされていません。 - + An error occurred initializing the video core. ビデオコア初期化中にエラーが発生しました。 - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzuは、ビデオコアの実行中にエラーが発生しました。これは通常、内蔵GPUも含め、古いGPUドライバが原因です。詳しくはログをご覧ください。ログへのアクセス方法については、以下のページをご覧ください:<a href='https://yuzu-emu.org/help/reference/log-files/'>ログファイルのアップロード方法について</a>。 - + Error while loading ROM! %1 %1 signifies a numeric error code. ROMのロード中にエラー! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br><a href='https://yuzu-emu.org/help/quickstart/'>yuzuクイックスタートガイド</a>を参照してファイルを再ダンプしてください。<br>またはyuzu wiki及び</a>yuzu Discord</a>を参照するとよいでしょう。 - + An unknown error occurred. Please see the log for more details. 不明なエラーが発生しました。詳細はログを確認して下さい。 - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data データのセーブ - + Mod Data Modデータ - + Error Opening %1 Folder ”%1”フォルダを開けませんでした - - + + Folder does not exist! フォルダが存在しません！ - + Error Opening Transferable Shader Cache シェーダキャッシュを開けませんでした - + Failed to create the shader cache directory for this title. このタイトル用のシェーダキャッシュディレクトリの作成に失敗しました - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry エントリ削除 - - - - - - + + + + + + Successfully Removed 削除しました - + Successfully removed the installed base game. インストールされたゲームを正常に削除しました。 - + The base game is not installed in the NAND and cannot be removed. ゲームはNANDにインストールされていないため、削除できません。 - + Successfully removed the installed update. インストールされたアップデートを正常に削除しました。 - + There is no update installed for this title. このタイトルのアップデートはインストールされていません。 - + There are no DLC installed for this title. このタイトルにはDLCがインストールされていません。 - + Successfully removed %1 installed DLC. ％1にインストールされたDLCを正常に削除しました。 - + Delete OpenGL Transferable Shader Cache? 転送可能なOpenGLシェーダキャッシュを削除しますか? - + Delete Vulkan Transferable Shader Cache? 転送可能なVulkanシェーダキャッシュを削除しますか? - + Delete All Transferable Shader Caches? 転送可能なすべてのシェーダキャッシュを削除しますか? - + Remove Custom Game Configuration? このタイトルのカスタム設定を削除しますか？ - + Remove File ファイル削除 - - + + Error Removing Transferable Shader Cache 転送可能なシェーダーキャッシュの削除エラー - - + + A shader cache for this title does not exist. このタイトル用のシェーダキャッシュは存在しません。 - + Successfully removed the transferable shader cache. 転送可能なシェーダーキャッシュが正常に削除されました。 - + Failed to remove the transferable shader cache. 転送可能なシェーダーキャッシュを削除できませんでした。 - - + + Error Removing Vulkan Driver Pipeline Cache + + + + + Failed to remove the driver pipeline cache. + + + + + Error Removing Transferable Shader Caches 転送可能なシェーダキャッシュの削除エラー - + Successfully removed the transferable shader caches. 転送可能なシェーダキャッシュを正常に削除しました。 - + Failed to remove the transferable shader cache directory. 転送可能なシェーダキャッシュディレクトリの削除に失敗しました。 - - + + Error Removing Custom Configuration カスタム設定の削除エラー - + A custom configuration for this title does not exist. このタイトルのカスタム設定は存在しません。 - + Successfully removed the custom game configuration. カスタム設定を正常に削除しました。 - + Failed to remove the custom game configuration. カスタム設定の削除に失敗しました。 - - + + RomFS Extraction Failed! RomFSの解析に失敗しました！ - + There was an error copying the RomFS files or the user cancelled the operation. RomFSファイルをコピー中にエラーが発生したか、ユーザー操作によりキャンセルされました。 - + Full フル - + Skeleton スケルトン - + Select RomFS Dump Mode RomFSダンプモードの選択 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. RomFSのダンプ方法を選択してください。<br>”完全”はすべてのファイルが新しいディレクトリにコピーされます。<br>”スケルトン”はディレクトリ構造を作成するだけです。 - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 に RomFS を展開するための十分な空き領域がありません。Emulation > Configure > System > Filesystem > Dump Root で、空き容量を確保するか、別のダンプディレクトリを選択してください。 - + Extracting RomFS... RomFSを解析中... - - + + Cancel キャンセル - + RomFS Extraction Succeeded! RomFS解析成功！ - + The operation completed successfully. 操作は成功しました。 - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 ”%1”を開けませんでした - + Select Directory ディレクトリの選択 - + Properties プロパティ - + The game properties could not be loaded. ゲームプロパティをロード出来ませんでした。 - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch実行ファイル (%1);;すべてのファイル (*.*) - + Load File ファイルのロード - + Open Extracted ROM Directory 展開されているROMディレクトリを開く - + Invalid Directory Selected 無効なディレクトリが選択されました - + The directory you have selected does not contain a 'main' file. 選択されたディレクトリに”main”ファイルが見つかりませんでした。 - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) インストール可能なスイッチファイル (*.nca *.nsp *.xci);;任天堂コンテンツアーカイブ (*.nca);;任天堂サブミッションパッケージ (*.nsp);;NXカートリッジイメージ (*.xci) - + Install Files ファイルのインストール - + %n file(s) remaining 残り %n ファイル - + Installing file "%1"... "%1"ファイルをインストールしています・・・ - + Install Results インストール結果 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 競合を避けるため、NANDにゲーム本体をインストールすることはお勧めしません。 この機能は、アップデートやDLCのインストールにのみ使用してください。 - + %n file(s) were newly installed %n ファイルが新たにインストールされました - + %n file(s) were overwritten %n ファイルが上書きされました - + %n file(s) failed to install %n ファイルのインストールに失敗しました - + System Application システムアプリケーション - + System Archive システムアーカイブ - + System Application Update システムアプリケーションアップデート - + Firmware Package (Type A) ファームウェアパッケージ（Type A） - + Firmware Package (Type B) ファームウェアパッケージ（Type B） - + Game ゲーム - + Game Update ゲームアップデート - + Game DLC ゲームDLC - + Delta Title 差分タイトル - + Select NCA Install Type... NCAインストール種別を選択・・・ - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) インストールするNCAタイトル種別を選択して下さい： （ほとんどの場合、デフォルトの”ゲーム”で問題ありません。） - + Failed to Install インストール失敗 - + The title type you selected for the NCA is invalid. 選択されたNCAのタイトル種別が無効です。 - + File not found ファイルが存在しません - + File "%1" not found ファイル”%1”が存在しません - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account yuzuアカウントが存在しません - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. ゲームの互換性テストケースを送信するには、yuzuアカウントをリンクする必要があります。<br><br/>yuzuアカウントをリンクするには、エミュレーション ＞ 設定 ＞ Web から行います。 - + Error opening URL URLオープンエラー - + Unable to open the URL "%1". URL"%1"を開けません。 - + TAS Recording TAS 記録中 - + Overwrite file of player 1? プレイヤー1のファイルを上書きしますか? - + Invalid config detected 無効な設定を検出しました - + Handheld controller can't be used on docked mode. Pro controller will be selected. 携帯コントローラはドックモードで使用できないため、Proコントローラが選択されます。 - - + + Amiibo Amiibo - - + + The current amiibo has been removed 現在の amiibo は削除されました - + Error エラー - - + + The current game is not looking for amiibos 現在のゲームはamiiboを要求しません - + Amiibo File (%1);; All Files (*.*) amiiboファイル (%1);;すべてのファイル (*.*) - + Load Amiibo amiiboのロード - + Error loading Amiibo data amiiboデータ読み込み中にエラーが発生しました - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot スクリーンショットのキャプチャ - + PNG Image (*.png) PNG画像 (*.png) - + TAS state: Running %1/%2 TAS 状態: 実行中 %1/%2 - + TAS state: Recording %1 TAS 状態: 記録中 %1 - + TAS state: Idle %1/%2 TAS 状態: アイドル %1/%2 - + TAS State: Invalid TAS 状態: 無効 - + &Stop Running 実行停止(&S) - + &Start 実行(&S) - + Stop R&ecording 記録停止(&R) - + R&ecord 記録(&R) - + Building: %n shader(s) 構築中: %n シェーダー - + Scale: %1x %1 is the resolution scaling factor 拡大率: %1x - + Speed: %1% / %2% 速度：%1% / %2% - + Speed: %1% 速度：%1% - + Game: %1 FPS (Unlocked) Game: %1 FPS（制限解除） - + Game: %1 FPS ゲーム：%1 FPS - + Frame: %1 ms フレーム：%1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HIGH - + GPU EXTREME GPU EXTREME - + GPU ERROR GPU ERROR - + DOCKED DOCKED - + HANDHELD HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST NEAREST - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA NO AA - + FXAA FXAA - + SMAA - + Confirm Key Rederivation キーの再取得確認 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5375,37 +5493,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 実行すると、自動生成された鍵ファイルが削除され、鍵生成モジュールが再実行されます。 - + Missing fuses ヒューズがありません - + - Missing BOOT0 - BOOT0がありません - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Mainがありません - + - Missing PRODINFO - PRODINFOがありません - + Derivation Components Missing 派生コンポーネントがありません - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 暗号化キーがありません。<br>キー、ファームウェア、ゲームを取得するには<a href='https://yuzu-emu.org/help/quickstart/'>yuzu クイックスタートガイド</a>を参照ください。<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5414,39 +5532,39 @@ on your system's performance. 1分以上かかります。 - + Deriving Keys 派生キー - + Select RomFS Dump Target RomFSダンプターゲットの選択 - + Please select which RomFS you would like to dump. ダンプしたいRomFSを選択して下さい。 - + Are you sure you want to close yuzu? yuzuを終了しますか？ - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. エミュレーションを停止しますか？セーブされていない進行状況は失われます。 - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5458,44 +5576,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGLは使用できません！ - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzuはOpenGLサポート付きでコンパイルされていません。 - - + + Error while initializing OpenGL! OpenGL初期化エラー - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. GPUがOpenGLをサポートしていないか、グラフィックスドライバーが最新ではありません。 - + Error while initializing OpenGL 4.6! OpenGL4.6初期化エラー! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 GPUがOpenGL4.6をサポートしていないか、グラフィックスドライバーが最新ではありません。<br><br>GL レンダラ:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 GPUが1つ以上の必要なOpenGL拡張機能をサポートしていない可能性があります。最新のグラフィックドライバを使用していることを確認してください。<br><br>GL レンダラ:<br>%1<br><br>サポートされていない拡張機能:<br>%2 @@ -5998,7 +6116,7 @@ Debug Message: インストール - + Install Files to NAND ファイルをNANDへインストール @@ -6006,7 +6124,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 テキストに以下の文字を含めることはできません: @@ -6662,7 +6780,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE スタート/ ポーズ @@ -6711,31 +6829,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [未設定] @@ -6746,14 +6864,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 軸 %1%2 @@ -6764,262 +6882,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [不明] - + - + Left 左 - + - + Right 右 - + - + Down 下 - + - + Up 上 - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start 開始 - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle マル - - + + Cross バツ - - + + Square 四角 - - + + Triangle 三角 - - + + Share Share - - + + Options Options - - + + [undefined] [未定義] - + %1%2 %1%2 - - + + [invalid] [無効] - - - - + + + + %1%2Hat %3 - - - - - - + + + + + + %1%2Axis %3 - - + + %1%2Axis %3,%4,%5 - - + + %1%2Motion %3 - - - - + + + + %1%2Button %3 %1%2ボタン %3 - - + + [unused] [未使用] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + + + + + + Minus + - + + + + Home HOME - + + Capture + キャプチャ + + + Touch タッチの設定 - + Wheel Indicates the mouse wheel ホイール - + Backward 後ろ - + Forward 前 - + Task - + Extra - + %1%2%3 %1%2%3 diff --git a/dist/languages/ko_KR.ts b/dist/languages/ko_KR.ts index 120ec1c21..6bed72a64 100644 --- a/dist/languages/ko_KR.ts +++ b/dist/languages/ko_KR.ts @@ -809,12 +809,15 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">This optimization speeds up memory accesses by allowing invalid memory accesses to succeed.</div> <div style="white-space: nowrap">Enabling it reduces the overhead of all memory accesses and has no impact on programs that don't access invalid memory.</div> - + + <div style="white-space: nowrap">이 최적화는 유효하지 않은 메모리 접속에 성공하도록 허용하여 메모리 접속 속도를 높입니다.</div> + <div style="white-space: nowrap">이를 활성화하면 모든 메모리 접속의 오버헤드가 줄어들고 유효하지 않은 메모리에 접속하지 않는 프로그램에는 영향을 미치지 않습니다.</div> + Enable fallbacks for invalid memory accesses - + 유효하지 않은 메모리 접속에 대한 폴백 활성화 @@ -935,102 +938,112 @@ This would ban both their forum username and their IP address. Macro JIT 비활성화 - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + 선택하면 매크로 HLE 기능이 비활성화됩니다. 이 기능을 활성화하면 게임 실행 속도가 느려짐 + + + + Disable Macro HLE + 매크로 HLE 비활성화 + + + When checked, yuzu will log statistics about the compiled pipeline cache 선택하면 yuzu는 컴파일된 파이프라인 캐시에 대한 통계를 기록합니다. - + Enable Shader Feedback 셰이더 피드백 활성화 - + When checked, it executes shaders without loop logic changes 체크 시 루프 로직 변경 없이 셰이더 실행 - + Disable Loop safety checks 루프 안전 검사 비활성화 - + Debugging 디버깅 - + Enable Verbose Reporting Services** 자세한 리포팅 서비스 활성화** - + Enable FS Access Log FS 액세스 로그 활성화 - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. 이 옵션을 활성화하면 가장 최근에 생성된 오디오 명령어 목록을 콘솔에 출력할 수 있습니다. 오디오 렌더러를 사용하는 게임에만 영향을 줍니다. - + Dump Audio Commands To Console** 콘솔에 오디오 명령어 덤프 - + Create Minidump After Crash 충돌후 미니덤프 생성 - + Advanced 고급 - + Kiosk (Quest) Mode Kiosk (Quest) 모드 - + Enable CPU Debugging CPU 디버깅 활성화 - + Enable Debug Asserts 디버그 에러 검출 활성화 - + Enable Auto-Stub** 자동 스텁 활성화** - + Enable All Controller Types 모든 컨트롤러 유형 활성화 - + Disable Web Applet 웹 애플릿 비활성화 - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. 프로그램 시작시 yuzu가 Vulkan 환경을 확인할 수 있도록 합니다. 외부 프로그램에서 유자를 보는 데 문제가 있는 경우 이 기능을 비활성화합니다. - + Perform Startup Vulkan Check 시작시 Vulkan 검사 수행 - + **This will be reset automatically when yuzu closes. **Yuzu가 종료되면 자동으로 재설정됩니다. @@ -1045,12 +1058,12 @@ This would ban both their forum username and their IP address. 이 설정을 적용하려면 yuzu를 다시 시작해야 합니다. - + Web applet not compiled 웹 애플릿이 컴파일되지 않음 - + MiniDump creation not compiled MiniDump 생성이 컴파일되지 않음 @@ -1101,13 +1114,13 @@ This would ban both their forum username and their IP address. - + Audio 오디오 - + CPU CPU @@ -1123,13 +1136,13 @@ This would ban both their forum username and their IP address. - + General 일반 - + Graphics 그래픽 @@ -1145,7 +1158,7 @@ This would ban both their forum username and their IP address. - + Controls 조작 @@ -1161,7 +1174,7 @@ This would ban both their forum username and their IP address. - + System 시스템 @@ -1424,7 +1437,7 @@ This would ban both their forum username and their IP address. - + None 없음 @@ -1535,112 +1548,127 @@ This would ban both their forum username and their IP address. + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: 윈도우 적응형 필터: - + Nearest Neighbor Nearest Neighbor - + Bilinear 이중선형 - + Bicubic 고등차수보간 - + Gaussian 가우시안 - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ 슈퍼 해상도 (Vulkan 전용) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: 안티에일리어싱 방식: - + FXAA FXAA - + SMAA - + SMAA - + Use global FSR Sharpness 글로벌 FSR 선명도 사용 - + Set FSR Sharpness FSR 선명도 설정 - + FSR Sharpness: FSR 선명도: - + 100% 100% - - + + Use global background color 전역 배경색 사용 - + Set background color: 배경색 설정: - + Background Color: 배경색: @@ -1652,7 +1680,7 @@ This would ban both their forum username and their IP address. SPIR-V (Experimental, Mesa Only) - + SPIR-V (실험용, Mesa 전용) @@ -1685,76 +1713,96 @@ This would ban both their forum username and their IP address. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + 실행은 GPU가 클럭 속도를 낮추지 않도록 그래픽 명령을 기다리는 동안 백그라운드에서 작동합니다. + + + + Force maximum clocks (Vulkan only) + 강제 최대 클록 (Vulkan 전용) + + + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. 수직 동기화는 화면 찢어짐 현상을 예방하지만, 몇몇의 그래픽카드는 수직 동기화로 인해 성능이 감소합니다. 성능의 변화를 느끼지 않는다면 활성화하는 것이 좋습니다. - + Use VSync 수직 동기화 사용 - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. 비동기 셰이더 컴파일을 활성화하여 셰이더의 버벅임을 감소시킬 수 있습니다. 이 기능은 실험적 기능입니다. - + Use asynchronous shader building (Hack) 비동기식 셰이더 빌드 사용(Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. 빠른 GPU 시간을 활성화합니다. 이 옵션을 사용하면 대부분의 게임이 가장 높은 기본 해상도에서 실행됩니다. - + Use Fast GPU Time (Hack) 빠른 GPU 시간 사용(Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. 비관적 버퍼 플러시를 활성화합니다. 이 옵션은 수정되지 않은 버퍼를 강제로 비우므로 성능이 저하될 수 있습니다. - + Use pessimistic buffer flushes (Hack) 비관적 버퍼 플러시 사용(Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + GPU 공급업체별 파이프라인 캐시를 활성화합니다. 이 옵션은 Vulkan 드라이버가 파이프라인 캐시 파일을 내부에 저장하지 않는 경우 셰이더 로딩 시간을 크게 개선할 수 있습니다. + + + + Use Vulkan pipeline cache + Vulkan 파이프라인 캐시 사용 + + + Anisotropic Filtering: 비등방성 필터링: - + Automatic 자동 - + Default 기본값 - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2142,7 +2190,7 @@ This would ban both their forum username and their IP address. - + Configure 설정 @@ -2168,6 +2216,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu yuzu를 다시 시작해야 합니다. @@ -2187,22 +2236,27 @@ This would ban both their forum username and their IP address. 컨트롤러 탐색 - + + Enable direct JoyCon driver + + + + Enable mouse panning 마우스 패닝 활성화 - + Mouse sensitivity 마우스 감도 - + % % - + Motion / Touch 모션 컨트롤/ 터치 @@ -2222,57 +2276,57 @@ This would ban both their forum username and their IP address. Input Profiles - + 입력 프로파일 Player 1 Profile - + 플레이어 1 프로파일 Player 2 Profile - + 플레이어 2 프로파일 Player 3 Profile - + 플레이어 3 프로파일 Player 4 Profile - + 플레이어 4 프로파일 Player 5 Profile - + 플레이어 5 프로파일 Player 6 Profile - + 플레이어 6 프로파일 Player 7 Profile - + 플레이어 7 프로파일 Player 8 Profile - + 플레이어 8 프로파일 Use global input configuration - + 글로벌 입력 구성 사용 Player %1 profile - + 플레이어 %1 프로파일 @@ -2314,7 +2368,7 @@ This would ban both their forum username and their IP address. - + Left Stick L 스틱 @@ -2408,14 +2462,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2434,7 +2488,7 @@ This would ban both their forum username and their IP address. - + Plus + @@ -2447,15 +2501,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2512,236 +2566,236 @@ This would ban both their forum username and their IP address. - + Right Stick R 스틱 - - - - + + + + Clear 초기화 - - - - - + + + + + [not set] [설정 안 됨] - - + + Invert button 버튼 반전 - - + + Toggle button 토글 버튼 - - + + Invert axis 축 뒤집기 - - - + + + Set threshold 임계값 설정 - - + + Choose a value between 0% and 100% 0%에서 100% 안의 값을 고르세요 - + Toggle axis axis 토글 - + Set gyro threshold 자이로 임계값 설정 - + Map Analog Stick 아날로그 스틱 맵핑 - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. OK 버튼을 누른 후에 먼저 조이스틱을 수평으로 움직이고, 그 다음 수직으로 움직이세요. 축을 뒤집으려면 수직으로 먼저 움직인 뒤에 수평으로 움직이세요. - + Center axis 중심축 - - + + Deadzone: %1% 데드존: %1% - - + + Modifier Range: %1% 수정자 범위: %1% - - + + Pro Controller 프로 컨트롤러 - + Dual Joycons 듀얼 조이콘 - + Left Joycon 왼쪽 조이콘 - + Right Joycon 오른쪽 조이콘 - + Handheld 휴대 모드 - + GameCube Controller GameCube 컨트롤러 - + Poke Ball Plus 몬스터볼 Plus - + NES Controller NES 컨트롤러 - + SNES Controller SNES 컨트롤러 - + N64 Controller N64 컨트롤러 - + Sega Genesis 세가 제네시스 - + Start / Pause 시작 / 일시중지 - + Z Z - + Control Stick 컨트롤 스틱 - + C-Stick C-Stick - + Shake! 흔드세요! - + [waiting] [대기중] - + New Profile 새 프로필 - + Enter a profile name: 프로필 이름을 입력하세요: - - + + Create Input Profile 입력 프로필 생성 - + The given profile name is not valid! 해당 프로필 이름은 사용할 수 없습니다! - + Failed to create the input profile "%1" "%1" 입력 프로필 생성 실패 - + Delete Input Profile 입력 프로필 삭제 - + Failed to delete the input profile "%1" "%1" 입력 프로필 삭제 실패 - + Load Input Profile 입력 프로필 불러오기 - + Failed to load the input profile "%1" "%1" 입력 프로필 불러오기 실패 - + Save Input Profile 입력 프로필 저장 - + Failed to save the input profile "%1" "%1" 입력 프로필 저장 실패 @@ -2789,7 +2843,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Configure 설정 @@ -2825,7 +2879,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Test 테스트 @@ -2845,77 +2899,77 @@ To invert the axes, first move your joystick vertically, and then horizontally.< <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">자세히 알아보기</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters 포트 번호에 유효하지 않은 글자가 있습니다. - + Port has to be in range 0 and 65353 포트 번호는 0부터 65353까지이어야 합니다. - + IP address is not valid IP 주소가 유효하지 않습니다. - + This UDP server already exists 해당 UDP 서버는 이미 존재합니다. - + Unable to add more than 8 servers 8개보다 많은 서버를 추가하실 수는 없습니다. - + Testing 테스트 중 - + Configuring 설정 중 - + Test Successful 테스트 성공 - + Successfully received data from the server. 서버에서 성공적으로 데이터를 받았습니다. - + Test Failed 테스트 실패 - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. 서버에서 유효한 데이터를 수신할 수 없습니다.<br>서버가 올바르게 설정되어 있고 주소와 포트가 올바른지 확인하십시오. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. UDP 테스트와 교정 설정이 진행 중입니다.<br>끝날 때까지 기다려주세요. @@ -3033,7 +3087,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< Input Profiles - + 입력 프로파일 @@ -3244,8 +3298,8 @@ UUID: %2 - Ring Sensor Parameters - 링 센서 매개변수 + Virtual Ring Sensor Parameters + @@ -3265,33 +3319,90 @@ UUID: %2 데드존: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults 기본값으로 초기화 - + Clear 초기화 - + [not set] [설정 안 됨] - + Invert axis 축 뒤집기 - - + + Deadzone: %1% 데드존: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + 설정 중 + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [대기중] @@ -3596,8 +3707,8 @@ UUID: %2 - English - 영어 (English) + American English + 미국 영어 @@ -3697,7 +3808,7 @@ UUID: %2 Device Name - + 장치 이름 @@ -3730,22 +3841,27 @@ UUID: %2 재생성 - + System settings are available only when game is not running. 시스템 설정은 게임이 꺼져 있을 때만 수정 가능합니다. - + + Warning: "%1" is not a valid language for region "%2" + 경고: "%1"은(는) 지역 "%2"에 유효한 언어가 아님 + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? 현재 사용하는 가상 Switch를 새로운 가상 Switch로 교체 합니다. 기존의 가상 Switch는 복구가 불가능해집니다. 게임에 예상치 못한 영향을 끼칠 수도 있습니다. 오래된 게임 설정을 사용할 경우 실패할 수도 있습니다. 계속하시겠습니까? - + Warning 경고 - + Console ID: 0x%1 콘솔 ID: 0x%1 @@ -3816,7 +3932,7 @@ UUID: %2 TAS 설정 - + Select TAS Load Directory... TAS 로드 디렉토리 선택... @@ -4372,7 +4488,7 @@ Drag points to change position, or double-click table cells to edit values.컨트롤러 P1 - + &Controller P1 컨트롤러 P1(&C) @@ -4385,42 +4501,37 @@ Drag points to change position, or double-click table cells to edit values.직접 연결 - - IP Address - IP 주소 + + Server Address + - - IP - IP + + <html><head/><body><p>Server address of the host</p></body></html> + - - <html><head/><body><p>IPv4 address of the host</p></body></html> - <html><head/><body><p>호스트의 IPv4 주소</p></body></html> - - - + Port 포트 - + <html><head/><body><p>Port number the host is listening on</p></body></html> <html><head/><body><p>호스트가 수신 대기 중인 포트 번호</p></body></html> - + Nickname 별명 - + Password 비밀번호 - + Connect 연결 @@ -4428,12 +4539,12 @@ Drag points to change position, or double-click table cells to edit values. DirectConnectWindow - + Connecting 연결중 - + Connect 연결 @@ -4504,863 +4615,873 @@ Drag points to change position, or double-click table cells to edit values.프레임 제한이나 수직 동기화를 계산하지 않고 Switch 프레임을 에뮬레이션 하는 데 걸린 시간. 최대 속도로 에뮬레이트 중일 때에는 대부분 16.67 ms 근처입니다. - + &Clear Recent Files Clear Recent Files(&C) - + &Continue 재개(&C) - + &Pause 일시중지(&P) - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu가 게임을 실행중입니다 - + Warning Outdated Game Format 오래된 게임 포맷 경고 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. 이 게임 파일은 '분해된 ROM 디렉토리'라는 오래된 포맷을 사용하고 있습니다. 해당 포맷은 NCA, NAX, XCI 또는 NSP와 같은 다른 포맷으로 대체되었으며 분해된 ROM 디렉토리에는 아이콘, 메타 데이터 및 업데이트가 지원되지 않습니다.<br><br>yuzu가 지원하는 다양한 Switch 포맷에 대한 설명은 <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>위키를 확인하세요.</a> 이 메시지는 다시 표시되지 않습니다. - - + + Error while loading ROM! ROM 로드 중 오류 발생! - + The ROM format is not supported. 지원되지 않는 롬 포맷입니다. - + An error occurred initializing the video core. 비디오 코어를 초기화하는 동안 오류가 발생했습니다. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. 비디오 코어를 실행하는 동안 yuzu에 오류가 발생했습니다. 이것은 일반적으로 통합 드라이버를 포함하여 오래된 GPU 드라이버로 인해 발생합니다. 자세한 내용은 로그를 참조하십시오. 로그 액세스에 대한 자세한 내용은 <a href='https://yuzu-emu.org/help/reference/log-files/'>로그 파일 업로드 방법</a> 페이지를 참조하세요. - + Error while loading ROM! %1 %1 signifies a numeric error code. ROM 불러오는 중 오류 발생! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>파일들을 다시 덤프하기 위해<a href='https://yuzu-emu.org/help/quickstart/'>yuzu 빠른 시작 가이드</a> 를 따라주세요.<br>도움이 필요할 시 yuzu 위키</a> 를 참고하거나 yuzu 디스코드</a> 를 이용해보세요. - + An unknown error occurred. Please see the log for more details. 알 수 없는 오류가 발생했습니다. 자세한 내용은 로그를 참고하십시오. - + (64-bit) (64비트) - + (32-bit) (32비트) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + 소프트웨어를 닫는 중... - + Save Data 세이브 데이터 - + Mod Data 모드 데이터 - + Error Opening %1 Folder %1 폴더 열기 오류 - - + + Folder does not exist! 폴더가 존재하지 않습니다! - + Error Opening Transferable Shader Cache 전송 가능한 셰이더 캐시 열기 오류 - + Failed to create the shader cache directory for this title. 이 타이틀에 대한 셰이더 캐시 디렉토리를 생성하지 못했습니다. - + Error Removing Contents 콘텐츠 제거 중 오류 발생 - + Error Removing Update 업데이트 제거 오류 - + Error Removing DLC DLC 제거 오류 - + Remove Installed Game Contents? 설치된 게임 콘텐츠를 제거하겠습니까? - + Remove Installed Game Update? 설치된 게임 업데이트를 제거하겠습니까? - + Remove Installed Game DLC? 설치된 게임 DLC를 제거하겠습니까? - + Remove Entry 항목 제거 - - - - - - + + + + + + Successfully Removed 삭제 완료 - + Successfully removed the installed base game. 설치된 기본 게임을 성공적으로 제거했습니다. - + The base game is not installed in the NAND and cannot be removed. 기본 게임은 NAND에 설치되어 있지 않으며 제거 할 수 없습니다. - + Successfully removed the installed update. 설치된 업데이트를 성공적으로 제거했습니다. - + There is no update installed for this title. 이 타이틀에 대해 설치된 업데이트가 없습니다. - + There are no DLC installed for this title. 이 타이틀에 설치된 DLC가 없습니다. - + Successfully removed %1 installed DLC. 설치된 %1 DLC를 성공적으로 제거했습니다. - + Delete OpenGL Transferable Shader Cache? OpenGL 전송 가능한 셰이더 캐시를 삭제하시겠습니까? - + Delete Vulkan Transferable Shader Cache? Vulkan 전송 가능한 셰이더 캐시를 삭제하시겠습니까? - + Delete All Transferable Shader Caches? 모든 전송 가능한 셰이더 캐시를 삭제하시겠습니까? - + Remove Custom Game Configuration? 사용자 지정 게임 구성을 제거 하시겠습니까? - + Remove File 파일 제거 - - + + Error Removing Transferable Shader Cache 전송 가능한 셰이더 캐시 제거 오류 - - + + A shader cache for this title does not exist. 이 타이틀에 대한 셰이더 캐시가 존재하지 않습니다. - + Successfully removed the transferable shader cache. 전송 가능한 셰이더 캐시를 성공적으로 제거했습니다. - + Failed to remove the transferable shader cache. 전송 가능한 셰이더 캐시를 제거하지 못했습니다. - - + + Error Removing Vulkan Driver Pipeline Cache + Vulkan 드라이버 파이프라인 캐시 제거 오류 + + + + Failed to remove the driver pipeline cache. + 드라이버 파이프라인 캐시를 제거하지 못했습니다. + + + + Error Removing Transferable Shader Caches 전송 가능한 셰이더 캐시 제거 오류 - + Successfully removed the transferable shader caches. 전송 가능한 셰이더 캐시를 성공적으로 제거했습니다. - + Failed to remove the transferable shader cache directory. 전송 가능한 셰이더 캐시 디렉토리를 제거하지 못했습니다. - - + + Error Removing Custom Configuration 사용자 지정 구성 제거 오류 - + A custom configuration for this title does not exist. 이 타이틀에 대한 사용자 지정 구성이 존재하지 않습니다. - + Successfully removed the custom game configuration. 사용자 지정 게임 구성을 성공적으로 제거했습니다. - + Failed to remove the custom game configuration. 사용자 지정 게임 구성을 제거하지 못했습니다. - - + + RomFS Extraction Failed! RomFS 추출 실패! - + There was an error copying the RomFS files or the user cancelled the operation. RomFS 파일을 복사하는 중에 오류가 발생했거나 사용자가 작업을 취소했습니다. - + Full 전체 - + Skeleton 뼈대 - + Select RomFS Dump Mode RomFS 덤프 모드 선택 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. RomFS 덤프 방법을 선택하십시오.<br>전체는 모든 파일을 새 디렉토리에 복사하고<br>뼈대는 디렉토리 구조 만 생성합니다. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1에 RomFS를 추출하기에 충분한 여유 공간이 없습니다. 공간을 확보하거나 에뮬레이견 > 설정 > 시스템 > 파일시스템 > 덤프 경로에서 다른 덤프 디렉토리를 선택하십시오. - + Extracting RomFS... RomFS 추출 중... - - + + Cancel 취소 - + RomFS Extraction Succeeded! RomFS 추출이 성공했습니다! - + The operation completed successfully. 작업이 성공적으로 완료되었습니다. - - - - - + + + + + Create Shortcut - + 바로가기 만들기 - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + 현재 AppImage에 대한 바로 가기가 생성됩니다. 업데이트하면 제대로 작동하지 않을 수 있습니다. 계속합니까? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + 바탕 화면에 바로가기를 만들 수 없습니다. 경로 "%1"이(가) 존재하지 않습니다. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + 애플리케이션 메뉴에서 바로가기를 만들 수 없습니다. 경로 "%1"이(가) 존재하지 않으며 생성할 수 없습니다. - + Create Icon - + 아이콘 만들기 - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + 아이콘 파일을 만들 수 없습니다. 경로 "%1"이(가) 존재하지 않으며 생성할 수 없습니다. - + Start %1 with the yuzu Emulator - + yuzu 에뮬레이터로 %1 시작 - + Failed to create a shortcut at %1 - + %1에서 바로가기를 만들기 실패 - + Successfully created a shortcut to %1 - + %1 바로가기를 성공적으로 만듬 - + Error Opening %1 %1 열기 오류 - + Select Directory 경로 선택 - + Properties 속성 - + The game properties could not be loaded. 게임 속성을 로드 할 수 없습니다. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch 실행파일 (%1);;모든 파일 (*.*) - + Load File 파일 로드 - + Open Extracted ROM Directory 추출된 ROM 디렉토리 열기 - + Invalid Directory Selected 잘못된 디렉토리 선택 - + The directory you have selected does not contain a 'main' file. 선택한 디렉토리에 'main'파일이 없습니다. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) 설치 가능한 Switch 파일 (*.nca *.nsp *.xci);;Nintendo 컨텐츠 아카이브 (*.nca);;Nintendo 서브미션 패키지 (*.nsp);;NX 카트리지 이미지 (*.xci) - + Install Files 파일 설치 - + %n file(s) remaining %n개의 파일이 남음 - + Installing file "%1"... 파일 "%1" 설치 중... - + Install Results 설치 결과 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 충돌을 피하기 위해, 낸드에 베이스 게임을 설치하는 것을 권장하지 않습니다. 이 기능은 업데이트나 DLC를 설치할 때에만 사용해주세요. - + %n file(s) were newly installed %n개의 파일이 새로 설치되었습니다. - + %n file(s) were overwritten %n개의 파일을 덮어썼습니다. - + %n file(s) failed to install %n개의 파일을 설치하지 못했습니다. - + System Application 시스템 애플리케이션 - + System Archive 시스템 아카이브 - + System Application Update 시스템 애플리케이션 업데이트 - + Firmware Package (Type A) 펌웨어 패키지 (A타입) - + Firmware Package (Type B) 펌웨어 패키지 (B타입) - + Game 게임 - + Game Update 게임 업데이트 - + Game DLC 게임 DLC - + Delta Title 델타 타이틀 - + Select NCA Install Type... NCA 설치 유형 선택... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) 이 NCA를 설치할 타이틀 유형을 선택하세요: (대부분의 경우 기본값인 '게임'이 괜찮습니다.) - + Failed to Install 설치 실패 - + The title type you selected for the NCA is invalid. NCA 타이틀 유형이 유효하지 않습니다. - + File not found 파일을 찾을 수 없음 - + File "%1" not found 파일 "%1"을 찾을 수 없습니다 - + OK OK - - + + Hardware requirements not met 하드웨어 요구 사항이 충족되지 않음 - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. 시스템이 권장 하드웨어 요구 사항을 충족하지 않습니다. 호환성 보고가 비활성화되었습니다. - + Missing yuzu Account yuzu 계정 누락 - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. 게임 호환성 테스트 결과를 제출하려면 yuzu 계정을 연결해야합니다.<br><br/>yuzu 계정을 연결하려면 에뮬레이션 &gt; 설정 &gt; 웹으로 가세요. - + Error opening URL URL 열기 오류 - + Unable to open the URL "%1". URL "%1"을 열 수 없습니다. - + TAS Recording TAS 레코딩 - + Overwrite file of player 1? 플레이어 1의 파일을 덮어쓰시겠습니까? - + Invalid config detected 유효하지 않은 설정 감지 - + Handheld controller can't be used on docked mode. Pro controller will be selected. 휴대 모드용 컨트롤러는 거치 모드에서 사용할 수 없습니다. 프로 컨트롤러로 대신 선택됩니다. - - + + Amiibo Amiibo - - + + The current amiibo has been removed 현재 amiibo가 제거되었습니다. - + Error 오류 - - + + The current game is not looking for amiibos 현재 게임은 amiibo를 찾고 있지 않습니다 - + Amiibo File (%1);; All Files (*.*) Amiibo 파일 (%1);; 모든 파일 (*.*) - + Load Amiibo Amiibo 로드 - + Error loading Amiibo data Amiibo 데이터 로드 오류 - + The selected file is not a valid amiibo 선택한 파일은 유효한 amiibo가 아닙니다 - + The selected file is already on use 선택한 파일은 이미 사용 중입니다 - + An unknown error occurred 알수없는 오류가 발생했습니다 - + Capture Screenshot 스크린샷 캡처 - + PNG Image (*.png) PNG 이미지 (*.png) - + TAS state: Running %1/%2 TAS 상태: %1/%2 실행 중 - + TAS state: Recording %1 TAS 상태: 레코딩 %1 - + TAS state: Idle %1/%2 TAS 상태: 유휴 %1/%2 - + TAS State: Invalid TAS 상태: 유효하지 않음 - + &Stop Running 실행 중지(&S) - + &Start 시작(&S) - + Stop R&ecording 레코딩 중지(&e) - + R&ecord 레코드(&R) - + Building: %n shader(s) 빌드중: %n개 셰이더 - + Scale: %1x %1 is the resolution scaling factor 스케일: %1x - + Speed: %1% / %2% 속도: %1% / %2% - + Speed: %1% 속도: %1% - + Game: %1 FPS (Unlocked) 게임: %1 FPS (제한없음) - + Game: %1 FPS 게임: %1 FPS - + Frame: %1 ms 프레임: %1 ms - + GPU NORMAL GPU 보통 - + GPU HIGH GPU 높음 - + GPU EXTREME GPU 굉장함 - + GPU ERROR GPU 오류 - + DOCKED 거치 모드 - + HANDHELD 휴대 모드 - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NULL - + NEAREST NEAREST - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA AA 없음 - + FXAA FXAA - + SMAA - + SMAA - + Confirm Key Rederivation 키 재생성 확인 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5377,37 +5498,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 자동 생성되었던 키 파일들이 삭제되고 키 생성 모듈이 다시 실행됩니다. - + Missing fuses fuses 누락 - + - Missing BOOT0 - BOOT0 누락 - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main 누락 - + - Missing PRODINFO - PRODINFO 누락 - + Derivation Components Missing 파생 구성 요소 누락 - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 암호화 키가 없습니다. <br>모든 키, 펌웨어 및 게임을 얻으려면 <a href='https://yuzu-emu.org/help/quickstart/'>yuzu 빠른 시작 가이드</a>를 따르세요.<br><br> <small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5416,39 +5537,39 @@ on your system's performance. 소요될 수 있습니다. - + Deriving Keys 파생 키 - + Select RomFS Dump Target RomFS 덤프 대상 선택 - + Please select which RomFS you would like to dump. 덤프할 RomFS를 선택하십시오. - + Are you sure you want to close yuzu? yuzu를 닫으시겠습니까? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. 에뮬레이션을 중지하시겠습니까? 모든 저장되지 않은 진행 상황은 사라집니다. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5460,44 +5581,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGL을 사용할 수 없습니다! - + OpenGL shared contexts are not supported. - + OpenGL 공유 컨텍스트는 지원되지 않습니다. - + yuzu has not been compiled with OpenGL support. yuzu는 OpenGL 지원으로 컴파일되지 않았습니다. - - + + Error while initializing OpenGL! OpenGL을 초기화하는 동안 오류가 발생했습니다! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. 사용하시는 GPU가 OpenGL을 지원하지 않거나, 최신 그래픽 드라이버가 설치되어 있지 않습니다. - + Error while initializing OpenGL 4.6! OpenGL 4.6 초기화 중 오류 발생! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 사용하시는 GPU가 OpenGL 4.6을 지원하지 않거나 최신 그래픽 드라이버가 설치되어 있지 않습니다. <br><br>GL 렌더링 장치:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 사용하시는 GPU가 1개 이상의 OpenGL 확장 기능을 지원하지 않습니다. 최신 그래픽 드라이버가 설치되어 있는지 확인하세요. <br><br>GL 렌더링 장치:<br>%1<br><br>지원하지 않는 확장 기능:<br>%2 @@ -5598,17 +5719,17 @@ Would you like to bypass this and exit anyway? Create Shortcut - + 바로가기 만들기 Add to Desktop - + 데스크톱에 추가 Add to Applications Menu - + 애플리케이션 메뉴에 추가 @@ -6000,7 +6121,7 @@ Debug Message: 설치 - + Install Files to NAND NAND에 파일 설치 @@ -6008,7 +6129,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 텍스트는 다음 문자를 포함할 수 없습니다: @@ -6665,7 +6786,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE 시작/일시중지 @@ -6714,31 +6835,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [설정 안 됨] @@ -6749,14 +6870,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 축 %1%2 @@ -6767,262 +6888,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [알 수 없음] - + - + Left 왼쪽 - + - + Right 오른쪽 - + - + Down 아래 - + - + Up 위 - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Start - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle 동그라미 - - + + Cross 엑스 - - + + Square 네모 - - + + Triangle 세모 - - + + Share Share - - + + Options Options - - + + [undefined] [설정안됨] - + %1%2 %1%2 - - + + [invalid] [유효하지않음] - - - - + + + + %1%2Hat %3 %1%2방향키 %3 - - - - - - + + + + + + %1%2Axis %3 %1%2Axis %3 - - + + %1%2Axis %3,%4,%5 %1%2Axis %3,%4,%5 - - + + %1%2Motion %3 %1%2모션 %3 - - - - + + + + %1%2Button %3 %1%2버튼 %3 - - + + [unused] [미사용] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Plus + + + + Minus + Minus + + + + Home 홈 - + + Capture + 캡쳐 + + + Touch 터치 - + Wheel Indicates the mouse wheel 휠 - + Backward 뒤로가기 - + Forward 앞으로가기 - + Task Task - + Extra Extra - + %1%2%3 %1%2%3 diff --git a/dist/languages/nb.ts b/dist/languages/nb.ts index 105fab761..4f4fdee65 100644 --- a/dist/languages/nb.ts +++ b/dist/languages/nb.ts @@ -909,102 +909,112 @@ This would ban both their forum username and their IP address. - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + + + + + Disable Macro HLE + + + + When checked, yuzu will log statistics about the compiled pipeline cache - + Enable Shader Feedback Slå på shader-tilbakemelding - + When checked, it executes shaders without loop logic changes Når dette er på kjører shader-e uten endring i løkkelogikk - + Disable Loop safety checks - + Debugging Feilsøking - + Enable Verbose Reporting Services** - + Enable FS Access Log - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** - + Create Minidump After Crash - + Advanced Avansert - + Kiosk (Quest) Mode - + Enable CPU Debugging Slå på prosessorfeilsøking - + Enable Debug Asserts - + Enable Auto-Stub** - + Enable All Controller Types - + Disable Web Applet Slå av web-applet - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Perform Startup Vulkan Check - + **This will be reset automatically when yuzu closes. **Dette blir automatisk tilbakestilt når yuzu lukkes. @@ -1019,12 +1029,12 @@ This would ban both their forum username and their IP address. - + Web applet not compiled - + MiniDump creation not compiled @@ -1075,13 +1085,13 @@ This would ban both their forum username and their IP address. - + Audio Lyd - + CPU CPU @@ -1097,13 +1107,13 @@ This would ban both their forum username and their IP address. - + General Generelt - + Graphics Grafikk @@ -1119,7 +1129,7 @@ This would ban both their forum username and their IP address. - + Controls Kontrollere @@ -1135,7 +1145,7 @@ This would ban both their forum username and their IP address. - + System System @@ -1398,7 +1408,7 @@ This would ban both their forum username and their IP address. - + None Ingen @@ -1509,112 +1519,127 @@ This would ban both their forum username and their IP address. + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: - + Nearest Neighbor Nærmeste nabo - + Bilinear Bilineær - + Bicubic Bikubisk - + Gaussian Gaussisk - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ Super Resolution (kun med Vulkan) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: Anti-aliasing–metode: - + FXAA FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Bruk global bakgrunnsfarge - + Set background color: Velg bakgrunnsfarge: - + Background Color: Bakgrunnsfarge: @@ -1659,76 +1684,96 @@ This would ban both their forum username and their IP address. - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync hindrer skjermen fra å brytes, men noen grafikkort har lavere ytelse med VSync på. Behold det på hvis du ikke legger merke til forskjell i ytelse. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + - Use VSync + Force maximum clocks (Vulkan only) + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. + VSync hindrer skjermen fra å brytes, men noen grafikkort har lavere ytelse med VSync på. Behold det på hvis du ikke legger merke til forskjell i ytelse. + + + + Use VSync + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Slår på asynkron shader-kompilering, som kan redusere shader-hakking. Denne funksjonaliteten er eksperimentell. - + Use asynchronous shader building (Hack) Bruk asynkron shader-bygging (hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Use Fast GPU Time (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Use pessimistic buffer flushes (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + Anisotropic Filtering: Anisotropisk filtrering: - + Automatic Automatisk - + Default Standard - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2116,7 +2161,7 @@ This would ban both their forum username and their IP address. - + Configure Konfigurer @@ -2142,6 +2187,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu Krever omstart av yuzu @@ -2161,22 +2207,27 @@ This would ban both their forum username and their IP address. Kontrollernavigasjon - + + Enable direct JoyCon driver + + + + Enable mouse panning Slå på musepanorering - + Mouse sensitivity Musesensitivitet - + % % - + Motion / Touch Bevegelse / Touch @@ -2288,7 +2339,7 @@ This would ban both their forum username and their IP address. - + Left Stick Venstre Pinne @@ -2382,14 +2433,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2408,7 +2459,7 @@ This would ban both their forum username and their IP address. - + Plus Pluss @@ -2421,15 +2472,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2486,236 +2537,236 @@ This would ban both their forum username and their IP address. - + Right Stick Høyre Pinne - - - - + + + + Clear Fjern - - - - - + + + + + [not set] [ikke satt] - - + + Invert button Inverter knapp - - + + Toggle button Veksle knapp - - + + Invert axis Inverter akse - - - + + + Set threshold Set grense - - + + Choose a value between 0% and 100% Velg en verdi mellom 0% og 100% - + Toggle axis - + Set gyro threshold - + Map Analog Stick - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Etter du har trykker på OK, flytt først stikken horisontalt, og så vertikalt. For å invertere aksene, flytt først stikken vertikalt, og så horistonalt. - + Center axis Senterakse - - + + Deadzone: %1% Dødsone: %1% - - + + Modifier Range: %1% Modifikatorområde: %1% - - + + Pro Controller Pro-Kontroller - + Dual Joycons Doble Joycons - + Left Joycon Venstre Joycon - + Right Joycon Høyre Joycon - + Handheld Håndholdt - + GameCube Controller GameCube-kontroller - + Poke Ball Plus Poke Ball Plus - + NES Controller NES-kontroller - + SNES Controller SNES-kontroller - + N64 Controller N64-kontroller - + Sega Genesis Sega Genesis - + Start / Pause Start / paus - + Z Z - + Control Stick Kontrollstikke - + C-Stick C-stikke - + Shake! Rist! - + [waiting] [venter] - + New Profile Ny Profil - + Enter a profile name: Skriv inn et profilnavn: - - + + Create Input Profile Lag inndataprofil - + The given profile name is not valid! Det oppgitte profilenavnet er ugyldig! - + Failed to create the input profile "%1" Klarte ikke lage inndataprofil "%1" - + Delete Input Profile Slett inndataprofil - + Failed to delete the input profile "%1" Klarte ikke slette inndataprofil "%1" - + Load Input Profile Last inn inndataprofil - + Failed to load the input profile "%1" Klarte ikke laste inn inndataprofil "%1" - + Save Input Profile Lagre inndataprofil - + Failed to save the input profile "%1" Klarte ikke lagre inndataprofil "%1" @@ -2763,7 +2814,7 @@ For å invertere aksene, flytt først stikken vertikalt, og så horistonalt. - + Configure Konfigurer @@ -2799,7 +2850,7 @@ For å invertere aksene, flytt først stikken vertikalt, og så horistonalt. - + Test Test @@ -2819,77 +2870,77 @@ For å invertere aksene, flytt først stikken vertikalt, og så horistonalt.<a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Lær Mer</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters Portnummeret har ugyldige tegn - + Port has to be in range 0 and 65353 Porten må være i intervallet 0 til 65353 - + IP address is not valid IP-adressen er ugyldig - + This UDP server already exists Denne UDP-tjeneren eksisterer allerede - + Unable to add more than 8 servers Kan ikke legge til mer enn 8 tjenere - + Testing Testing - + Configuring Konfigurering - + Test Successful Test Vellykket - + Successfully received data from the server. Mottatt data fra serveren vellykket. - + Test Failed Test Feilet - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Kunne ikke motta gyldig data fra serveren.<br>Vennligst bekreft at serveren er satt opp riktig og at adressen og porten er riktige. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. UDP-Test eller kalibrasjonskonfigurering er i fremgang.<br>Vennligst vent for dem til å bli ferdig. @@ -3217,7 +3268,7 @@ UUID: %2 - Ring Sensor Parameters + Virtual Ring Sensor Parameters @@ -3238,33 +3289,90 @@ UUID: %2 Dødsone: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Gjenopprett Standardverdier - + Clear Fjern - + [not set] [ikke satt] - + Invert axis Inverter akse - - + + Deadzone: %1% Dødsone: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Konfigurering + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [venter] @@ -3569,8 +3677,8 @@ UUID: %2 - English - Engelsk + American English + @@ -3703,22 +3811,27 @@ UUID: %2 Regenerer - + System settings are available only when game is not running. Systeminnstillinger er bare tilgjengelige når ingen spill kjører. - + + Warning: "%1" is not a valid language for region "%2" + + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Dette vil erstatte din nåværende virtuelle Switch med en ny en. Din nåværende virtuelle Switch vil ikke kunne bli gjenopprettet. Dette kan ha uventede effekter i spill. Dette kan feile om du bruker en utdatert lagret-spill konfigurasjon. Fortsette? - + Warning Advarsel - + Console ID: 0x%1 Konsoll-ID: 0x%1 @@ -3789,7 +3902,7 @@ UUID: %2 TAS-konfigurasjon - + Select TAS Load Directory... Velg TAS-lastemappe... @@ -4345,7 +4458,7 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re Kontroller P1 - + &Controller P1 @@ -4358,42 +4471,37 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re - - IP Address + + Server Address - - IP + + <html><head/><body><p>Server address of the host</p></body></html> - - <html><head/><body><p>IPv4 address of the host</p></body></html> - - - - + Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> - + Nickname - + Password - + Connect @@ -4401,12 +4509,12 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re DirectConnectWindow - + Connecting - + Connect @@ -4476,471 +4584,481 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re Tid det tar for å emulere et Switch bilde. Teller ikke med bildebegrensing eller v-sync. For full-hastighet emulering burde dette være 16.67 ms. på det høyeste. - + &Clear Recent Files - + &Continue - + &Pause &Paus - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping Et spill kjører i yuzu - + Warning Outdated Game Format Advarsel: Utdatert Spillformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Du bruker en dekonstruert ROM-mappe for dette spillet, som er et utdatert format som har blitt erstattet av andre formater som NCA, NAX, XCI, eller NSP. Dekonstruerte ROM-mapper mangler ikoner, metadata, og oppdateringsstøtte.<br><br>For en forklaring på diverse Switch-formater som yuzu støtter,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>sjekk vår wiki</a>. Denne meldingen vil ikke bli vist igjen. - - + + Error while loading ROM! Feil under innlasting av ROM! - + The ROM format is not supported. Dette ROM-formatet er ikke støttet. - + An error occurred initializing the video core. En feil oppstod under initialisering av videokjernen. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu har oppdaget en feil under kjøring av videokjernen. Dette er vanligvis forårsaket av utdaterte GPU-drivere, inkludert for integrert grafikk. Vennligst sjekk loggen for flere detaljer. For mer informasjon om å finne loggen, besøk følgende side: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Uploadd the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Feil under lasting av ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. En ukjent feil oppstod. Se loggen for flere detaljer. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Lagre Data - + Mod Data Mod Data - + Error Opening %1 Folder Feil Under Åpning av %1 Mappen - - + + Folder does not exist! Mappen eksisterer ikke! - + Error Opening Transferable Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Fjern oppføring - - - - - - + + + + + + Successfully Removed Fjerning lykkes - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. Grunnspillet er ikke installert i NAND og kan ikke bli fjernet. - + Successfully removed the installed update. Fjernet vellykket den installerte oppdateringen. - + There is no update installed for this title. Det er ingen oppdatering installert for denne tittelen. - + There are no DLC installed for this title. Det er ingen DLC installert for denne tittelen. - + Successfully removed %1 installed DLC. Fjernet vellykket %1 installerte DLC-er. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? Fjern Tilpasset Spillkonfigurasjon? - + Remove File Fjern Fil - - + + Error Removing Transferable Shader Cache Feil under fjerning av overførbar shader cache - - + + A shader cache for this title does not exist. - + Successfully removed the transferable shader cache. Lykkes i å fjerne den overførbare shader cachen. - + Failed to remove the transferable shader cache. Feil under fjerning av den overførbare shader cachen. - - - Error Removing Transferable Shader Caches + + Error Removing Vulkan Driver Pipeline Cache + Failed to remove the driver pipeline cache. + + + + + + Error Removing Transferable Shader Caches + + + + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Feil Under Fjerning Av Tilpasset Konfigurasjon - + A custom configuration for this title does not exist. En tilpasset konfigurasjon for denne tittelen finnes ikke. - + Successfully removed the custom game configuration. Fjernet vellykket den tilpassede spillkonfigurasjonen. - + Failed to remove the custom game configuration. Feil under fjerning av den tilpassede spillkonfigurasjonen. - - + + RomFS Extraction Failed! Utvinning av RomFS Feilet! - + There was an error copying the RomFS files or the user cancelled the operation. Det oppstod en feil under kopiering av RomFS filene eller så kansellerte brukeren operasjonen. - + Full Fullstendig - + Skeleton Skjelett - + Select RomFS Dump Mode Velg RomFS Dump Modus - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Velg hvordan du vil dumpe RomFS.<br>Fullstendig vil kopiere alle filene til en ny mappe mens <br>skjelett vil bare skape mappestrukturen. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Utvinner RomFS... - - + + Cancel Avbryt - + RomFS Extraction Succeeded! RomFS Utpakking lyktes! - + The operation completed successfully. Operasjonen fullført vellykket. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Feil ved åpning av %1 - + Select Directory Velg Mappe - + Properties Egenskaper - + The game properties could not be loaded. Spillets egenskaper kunne ikke bli lastet inn. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Kjørbar Fil (%1);;Alle Filer (*.*) - + Load File Last inn Fil - + Open Extracted ROM Directory Åpne Utpakket ROM Mappe - + Invalid Directory Selected Ugyldig Mappe Valgt - + The directory you have selected does not contain a 'main' file. Mappen du valgte inneholder ikke en 'main' fil. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Installerbar Switch-Fil (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xcI) - + Install Files Installer Filer - + %n file(s) remaining %n fil gjenstår%n filer gjenstår - + Installing file "%1"... Installerer fil "%1"... - + Install Results Insallasjonsresultater - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed %n fil ble nylig installert @@ -4948,7 +5066,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) were overwritten %n fil ble overskrevet @@ -4956,7 +5074,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) failed to install %n fil ble ikke installert @@ -4964,377 +5082,377 @@ Please, only use this feature to install updates and DLC. - + System Application Systemapplikasjon - + System Archive Systemarkiv - + System Application Update Systemapplikasjonsoppdatering - + Firmware Package (Type A) Firmware Pakke (Type A) - + Firmware Package (Type B) Firmware-Pakke (Type B) - + Game Spill - + Game Update Spilloppdatering - + Game DLC Spill tilleggspakke - + Delta Title Delta Tittel - + Select NCA Install Type... Velg NCA Installasjonstype... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Vennligst velg typen tittel du vil installere denne NCA-en som: (I de fleste tilfellene, standarden 'Spill' fungerer.) - + Failed to Install Feil under Installasjon - + The title type you selected for the NCA is invalid. Titteltypen du valgte for NCA-en er ugyldig. - + File not found Fil ikke funnet - + File "%1" not found Filen "%1" ikke funnet - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Mangler yuzu Bruker - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. For å sende inn et testtilfelle for spillkompatibilitet, må du linke yuzu-brukeren din.<br><br/>For å linke yuzu-brukeren din, gå til Emulasjon &gt; Konfigurasjon &gt; Nett. - + Error opening URL Feil under åpning av URL - + Unable to open the URL "%1". Kunne ikke åpne URL "%1". - + TAS Recording TAS-innspilling - + Overwrite file of player 1? Overskriv filen til spiller 1? - + Invalid config detected Ugyldig konfigurasjon oppdaget - + Handheld controller can't be used on docked mode. Pro controller will be selected. Håndholdt kontroller kan ikke brukes i dokket modus. Pro-kontroller vil bli valgt. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Den valgte amiibo-en har blitt fjernet - + Error Feil - - + + The current game is not looking for amiibos Det kjørende spillet sjekker ikke for amiibo-er - + Amiibo File (%1);; All Files (*.*) Amiibo-Fil (%1);; Alle Filer (*.*) - + Load Amiibo Last inn Amiibo - + Error loading Amiibo data Feil ved lasting av Amiibo data - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Ta Skjermbilde - + PNG Image (*.png) PNG Bilde (*.png) - + TAS state: Running %1/%2 TAS-tilstand: Kjører %1/%2 - + TAS state: Recording %1 TAS-tilstand: Spiller inn %1 - + TAS state: Idle %1/%2 TAS-tilstand: Venter %1%2 - + TAS State: Invalid TAS-tilstand: Ugyldig - + &Stop Running &Stopp kjøring - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) Bygger: %n shaderBygger: %n shader-e - + Scale: %1x %1 is the resolution scaling factor Skala: %1x - + Speed: %1% / %2% Hastighet: %1% / %2% - + Speed: %1% Hastighet: %1% - + Game: %1 FPS (Unlocked) Spill: %1 FPS (ubegrenset) - + Game: %1 FPS Spill: %1 FPS - + Frame: %1 ms Ramme: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HØY - + GPU EXTREME GPU EKSTREM - + GPU ERROR GPU FEIL - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST NÆRMESTE - - + + BILINEAR BILINEÆR - + BICUBIC BIKUBISK - + GAUSSIAN GAUSSISK - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA INGEN AA - + FXAA FXAA - + SMAA - + Confirm Key Rederivation Bekreft Nøkkel-Redirevasjon - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5351,37 +5469,37 @@ og eventuelt lag backups. Dette vil slette dine autogenererte nøkkel-filer og kjøre nøkkel-derivasjonsmodulen på nytt. - + Missing fuses Mangler fuses - + - Missing BOOT0 - Mangler BOOT0 - + - Missing BCPKG2-1-Normal-Main - Mangler BCPKG2-1-Normal-Main - + - Missing PRODINFO - Mangler PRODINFO - + Derivation Components Missing Derivasjonskomponenter Mangler - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Krypteringsnøkler mangler. <br>Vennligst følg <a href='https://yuzu-emu.org/help/quickstart/'>yuzus oppstartsguide</a> for å få alle nøklene, fastvaren og spillene dine.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5390,39 +5508,39 @@ Dette kan ta opp til et minutt avhengig av systemytelsen din. - + Deriving Keys Deriverer Nøkler - + Select RomFS Dump Target Velg RomFS Dump-Mål - + Please select which RomFS you would like to dump. Vennligst velg hvilken RomFS du vil dumpe. - + Are you sure you want to close yuzu? Er du sikker på at du vil lukke yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Er du sikker på at du vil stoppe emulasjonen? All ulagret fremgang vil bli tapt. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5434,44 +5552,44 @@ Vil du overstyre dette og lukke likevel? GRenderWindow - - + + OpenGL not available! OpenGL ikke tilgjengelig! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu har ikke blitt kompilert med OpenGL-støtte. - - + + Error while initializing OpenGL! Feil under initialisering av OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Det kan hende at GPU-en din ikke støtter OpenGL, eller at du ikke har den nyeste grafikkdriveren. - + Error while initializing OpenGL 4.6! Feil under initialisering av OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Det kan hende at GPU-en din ikke støtter OpenGL 4.6, eller at du ikke har den nyeste grafikkdriveren.<br><br>GL-renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Det kan hende at GPU-en din ikke støtter én eller flere nødvendige OpenGL-utvidelser. Vennligst sørg for at du har den nyeste grafikkdriveren.<br><br>GL-renderer: <br>%1<br><br>Ikke-støttede utvidelser:<br>%2 @@ -5973,7 +6091,7 @@ Debug Message: Installer - + Install Files to NAND Installer filer til NAND @@ -5981,7 +6099,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 Teksten kan ikke inneholde noen av de følgende tegnene: @@ -6634,7 +6752,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE START/PAUS @@ -6683,31 +6801,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [ikke satt] @@ -6718,14 +6836,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Akse %1%2 @@ -6736,262 +6854,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [ukjent] - + - + Left Venstre - + - + Right Høyre - + - + Down Ned - + - + Up Opp - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Start - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle Sirkel - - + + Cross Kryss - - + + Square Firkant - - + + Triangle Trekant - - + + Share Del - - + + Options Instillinger - - + + [undefined] [udefinert] - + %1%2 - - + + [invalid] [ugyldig] - - - - + + + + %1%2Hat %3 - - - - - - + + + + + + %1%2Axis %3 %1%2Akse %3 - - + + %1%2Axis %3,%4,%5 %1%2Akse %3,%4,%5 - - + + %1%2Motion %3 %1%2Bevegelse %3 - - - - + + + + %1%2Button %3 %1%2Knapp %3 - - + + [unused] [ubrukt] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Pluss + + + + Minus + Minus + + + + Home Hjem - + + Capture + + + + Touch Touch - + Wheel Indicates the mouse wheel Hjul - + Backward Bakover - + Forward Fremover - + Task - + Extra Ekstra - + %1%2%3 %1%2%3 diff --git a/dist/languages/nl.ts b/dist/languages/nl.ts index 280e974cb..eb78511ef 100644 --- a/dist/languages/nl.ts +++ b/dist/languages/nl.ts @@ -905,103 +905,113 @@ This would ban both their forum username and their IP address. Disable Macro JIT Schakel Macro JIT uit - - - When checked, yuzu will log statistics about the compiled pipeline cache - - - Enable Shader Feedback + When checked, it disables the macro HLE functions. Enabling this makes games run slower - - When checked, it executes shaders without loop logic changes + + Disable Macro HLE - Disable Loop safety checks + When checked, yuzu will log statistics about the compiled pipeline cache + + + + + Enable Shader Feedback - Debugging - Debugging + When checked, it executes shaders without loop logic changes + - - Enable Verbose Reporting Services** + + Disable Loop safety checks + Debugging + Debugging + + + + Enable Verbose Reporting Services** + + + + Enable FS Access Log - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** - + Create Minidump After Crash - + Advanced Geavanceerd - + Kiosk (Quest) Mode Kiosk (Quest) Modus - + Enable CPU Debugging - + Enable Debug Asserts Schakel Debug asserties in - + Enable Auto-Stub** - + Enable All Controller Types - + Disable Web Applet - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Perform Startup Vulkan Check - + **This will be reset automatically when yuzu closes. **Deze optie wordt automatisch gereset wanneer yuzu is gesloten. @@ -1016,12 +1026,12 @@ This would ban both their forum username and their IP address. - + Web applet not compiled - + MiniDump creation not compiled @@ -1073,13 +1083,13 @@ This would ban both their forum username and their IP address. - + Audio Geluid - + CPU CPU @@ -1095,13 +1105,13 @@ This would ban both their forum username and their IP address. - + General Algemeen - + Graphics Grafisch @@ -1117,7 +1127,7 @@ This would ban both their forum username and their IP address. - + Controls Bediening @@ -1133,7 +1143,7 @@ This would ban both their forum username and their IP address. - + System Systeem @@ -1396,7 +1406,7 @@ This would ban both their forum username and their IP address. - + None Geen @@ -1507,112 +1517,127 @@ This would ban both their forum username and their IP address. - 2X (1440p/2160p) + 1.5X (1080p/1620p) [EXPERIMENTAL] - 3X (2160p/3240p) + 2X (1440p/2160p) - 4X (2880p/4320p) + 3X (2160p/3240p) - 5X (3600p/5400p) + 4X (2880p/4320p) + 5X (3600p/5400p) + + + + 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: - + Nearest Neighbor - + Bilinear - + Bicubic - + Gaussian - + ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) + + AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: - + FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Gebruik globale achtergrondkleur - + Set background color: Gebruik achtergrondkleur: - + Background Color: Achtergrondkleur: @@ -1657,76 +1682,96 @@ This would ban both their forum username and their IP address. - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync voorkomt dat het scherm beweegt, maar sommige grafische kaarten geven lagere prestaties wanneer VSync is ingeschakeld. Hou het aan als je geen prestatie verschil merkt. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + - Use VSync + Force maximum clocks (Vulkan only) - Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. - Laat shaders asynchroon compileren, wat haperingen kunnen verminderen. Deze instelling is experimenteel. + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. + VSync voorkomt dat het scherm beweegt, maar sommige grafische kaarten geven lagere prestaties wanneer VSync is ingeschakeld. Hou het aan als je geen prestatie verschil merkt. - Use asynchronous shader building (Hack) + Use VSync - Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. + Laat shaders asynchroon compileren, wat haperingen kunnen verminderen. Deze instelling is experimenteel. - Use Fast GPU Time (Hack) + Use asynchronous shader building (Hack) - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. + Use Fast GPU Time (Hack) + + + + + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + + + + Use pessimistic buffer flushes (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + Anisotropic Filtering: Anisotrope Filtering: - + Automatic - + Default Standaard - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2114,7 +2159,7 @@ This would ban both their forum username and their IP address. - + Configure Configureer @@ -2140,6 +2185,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu @@ -2159,22 +2205,27 @@ This would ban both their forum username and their IP address. - + + Enable direct JoyCon driver + + + + Enable mouse panning Schakel muis panning in - + Mouse sensitivity Muis Gevoeligheid - + % % - + Motion / Touch Beweging / Touch @@ -2286,7 +2337,7 @@ This would ban both their forum username and their IP address. - + Left Stick Linker Stick @@ -2380,14 +2431,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2406,7 +2457,7 @@ This would ban both their forum username and their IP address. - + Plus Plus: @@ -2419,15 +2470,15 @@ This would ban both their forum username and their IP address. - - + + R R: - + ZR ZR @@ -2484,236 +2535,236 @@ This would ban both their forum username and their IP address. - + Right Stick Rechter Stick - - - - + + + + Clear Verwijder - - - - - + + + + + [not set] [niet ingesteld] - - + + Invert button - - + + Toggle button Shakel Knop - - + + Invert axis Spiegel As - - - + + + Set threshold - - + + Choose a value between 0% and 100% - + Toggle axis - + Set gyro threshold - + Map Analog Stick Zet Analoge Stick - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Na OK in te drukken, beweeg je joystick eerst horizontaal en dan verticaal. Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. - + Center axis - - + + Deadzone: %1% Deadzone: %1% - - + + Modifier Range: %1% Bewerk Range: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Twee Joycons - + Left Joycon Linker Joycon - + Right Joycon Rechter Joycon - + Handheld Mobiel - + GameCube Controller GameCube Controller - + Poke Ball Plus - + NES Controller - + SNES Controller - + N64 Controller - + Sega Genesis - + Start / Pause Start / Pauze - + Z Z - + Control Stick Control Stick - + C-Stick C-Stick - + Shake! Shudden! - + [waiting] [aan het wachten] - + New Profile Nieuw Profiel - + Enter a profile name: Voer nieuwe gebruikersnaam in: - - + + Create Input Profile Creëer een nieuw Invoer Profiel - + The given profile name is not valid! De ingevoerde Profiel naam is niet geldig - + Failed to create the input profile "%1" Het is mislukt om Invoer Profiel "%1 te Creëer - + Delete Input Profile Verwijder invoer profiel - + Failed to delete the input profile "%1" Het is mislukt om Invoer Profiel "%1 te Verwijderen - + Load Input Profile Laad invoer profiel - + Failed to load the input profile "%1" Het is mislukt om Invoer Profiel "%1 te Laden - + Save Input Profile Sla Invoer profiel op - + Failed to save the input profile "%1" Het is mislukt om Invoer Profiel "%1 Op te slaan @@ -2761,7 +2812,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. - + Configure Configureer @@ -2797,7 +2848,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. - + Test Test @@ -2817,77 +2868,77 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Leer Meer</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu Yuzu - + Port number has invalid characters Poortnummer bevat ongeldige tekens - + Port has to be in range 0 and 65353 Poort moet in bereik 0 en 65353 zijn - + IP address is not valid IP adress is niet geldig - + This UDP server already exists Deze UDP server bestaat al - + Unable to add more than 8 servers Kan niet meer dan 8 servers toevoegen - + Testing Testen - + Configuring Configureren - + Test Successful Test Succesvol - + Successfully received data from the server. De data van de server is succesvol ontvangen. - + Test Failed Test Gefaald - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Kan niet de juiste data van de server ontvangen.<br>Verifieer dat de server is goed opgezet en dat het adres en poort correct zijn. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. UDP Test of calibratie configuratie is bezig.<br>Wacht alstublieft totdat het voltooid is. @@ -3215,7 +3266,7 @@ UUID: %2 - Ring Sensor Parameters + Virtual Ring Sensor Parameters @@ -3236,33 +3287,90 @@ UUID: %2 Deadzone: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Standaard Herstellen - + Clear Verwijder - + [not set] [niet ingesteld] - + Invert axis Spiegel As - - + + Deadzone: %1% Deadzone: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Configureren + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [aan het wachten] @@ -3567,8 +3675,8 @@ UUID: %2 - English - Engels (English) + American English + @@ -3701,22 +3809,27 @@ UUID: %2 Herstel - + System settings are available only when game is not running. Systeeminstellingen zijn enkel toegankelijk wanneer er geen game draait. - + + Warning: "%1" is not a valid language for region "%2" + + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Dit vervangt je huidige virtuele Switch met een nieuwe. Je huidige virtuele Switch kan dan niet meer worden hersteld. Dit kan onverwachte effecten hebben in spellen. Dit werkt niet als je een oude config savegame gebruikt. Doorgaan? - + Warning Waarschuwing - + Console ID: 0x%1 Console ID: 0x%1 @@ -3787,7 +3900,7 @@ UUID: %2 - + Select TAS Load Directory... @@ -4343,7 +4456,7 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen - + &Controller P1 @@ -4356,42 +4469,37 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen - - IP Address + + Server Address - - IP + + <html><head/><body><p>Server address of the host</p></body></html> - - <html><head/><body><p>IPv4 address of the host</p></body></html> - - - - + Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> - + Nickname - + Password - + Connect @@ -4399,12 +4507,12 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen DirectConnectWindow - + Connecting - + Connect @@ -4474,859 +4582,869 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Tijd gebruikt om een frame van de Switch te emuleren, waarbij framelimiteren of v-sync niet wordt meegerekend. Voor emulatie op volledige snelheid zou dit maximaal 16.67 ms zijn. - + &Clear Recent Files - + &Continue - + &Pause &Pauzeren - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Waarschuwing Verouderd Spel Formaat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Je gebruikt gedeconstrueerd ROM map formaat voor dit Spel, dit is een verouderd formaat en is vervangen door formaten zoals NCA, NAX, XCI of NSP. Gedeconstrueerd ROM map heeft geen iconen, metadata en update understeuning.<br><br>Voor een uitleg over welke Switch formaten yuzu ondersteund, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>kijk op onze wiki</a>. Dit bericht word niet nog een keer weergegeven. - - + + Error while loading ROM! Fout tijdens het laden van een ROM! - + The ROM format is not supported. Het formaat van de ROM is niet ondersteunt. - + An error occurred initializing the video core. Er is een fout opgetreden tijdens het initialiseren van de videokern. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Een onbekende fout heeft plaatsgevonden. Kijk in de log voor meer details. - + (64-bit) - + (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit - + Closing software... - + Save Data Save Data - + Mod Data Mod Data - + Error Opening %1 Folder Fout tijdens het openen van %1 folder - - + + Folder does not exist! Folder bestaat niet! - + Error Opening Transferable Shader Cache Fout Bij Het Openen Van Overdraagbare Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + Remove File - - + + Error Removing Transferable Shader Cache - - + + A shader cache for this title does not exist. Er bestaat geen shader cache voor deze game - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - - - Error Removing Transferable Shader Caches + + Error Removing Vulkan Driver Pipeline Cache + Failed to remove the driver pipeline cache. + + + + + + Error Removing Transferable Shader Caches + + + + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! RomFS Extractie Mislukt! - + There was an error copying the RomFS files or the user cancelled the operation. Er was een fout tijdens het kopiëren van de RomFS bestanden of de gebruiker heeft de operatie geannuleerd. - + Full Vol - + Skeleton Skelet - + Select RomFS Dump Mode Selecteer RomFS Dump Mode - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Selecteer alstublieft hoe je de RomFS wilt dumpen.<br>Volledig kopieërd alle bestanden in een map terwijl <br> skelet maakt alleen het map structuur. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... RomFS uitpakken... - - + + Cancel Annuleren - + RomFS Extraction Succeeded! RomFS Extractie Geslaagd! - + The operation completed successfully. De operatie is succesvol voltooid. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Fout bij openen %1 - + Select Directory Selecteer Map - + Properties Eigenschappen - + The game properties could not be loaded. De eigenschappen van de game kunnen niet geladen worden. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Executable (%1);;Alle bestanden (*.*) - + Load File Laad Bestand - + Open Extracted ROM Directory Open Gedecomprimeerd ROM Map - + Invalid Directory Selected Ongeldige Map Geselecteerd - + The directory you have selected does not contain a 'main' file. De map die je hebt geselecteerd bevat geen 'main' bestand. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files - + %n file(s) remaining - + Installing file "%1"... Bestand "%1" Installeren... - + Install Results - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systeem Applicatie - + System Archive Systeem Archief - + System Application Update Systeem Applicatie Update - + Firmware Package (Type A) Filmware Pakket (Type A) - + Firmware Package (Type B) Filmware Pakket (Type B) - + Game Game - + Game Update Game Update - + Game DLC Game DLC - + Delta Title Delta Titel - + Select NCA Install Type... Selecteer NCA Installatie Type... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Selecteer het type titel hoe je wilt dat deze NCA installeerd: (In de meeste gevallen is de standaard 'Game' juist.) - + Failed to Install Installatie Mislukt - + The title type you selected for the NCA is invalid. Het type title dat je hebt geselecteerd voor de NCA is ongeldig. - + File not found Bestand niet gevonden - + File "%1" not found Bestand "%1" niet gevonden - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Je yuzu account mist - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Om game campatibiliteit te raporteren, moet je je yuzu account koppelen.<br><br/> Om je yuzu account te koppelen, ga naar Emulatie &gt; Configuratie &gt; Web. - + Error opening URL - + Unable to open the URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo Bestand (%1);; Alle Bestanden (*.*) - + Load Amiibo Laad Amiibo - + Error loading Amiibo data Fout tijdens het laden van de Amiibo data - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Screenshot Vastleggen - + PNG Image (*.png) PNG afbeelding (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Snelheid: %1% / %2% - + Speed: %1% Snelheid: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Game: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL - + VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA - + SMAA - + Confirm Key Rederivation Bevestig Sleutel Herafleiding - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5343,37 +5461,37 @@ en optioneel maak backups. Dit zal je automatisch gegenereerde sleutel bestanden verwijderen en de sleutel verkrijger module opnieuw starten - + Missing fuses - + - Missing BOOT0 - + - Missing BCPKG2-1-Normal-Main - + - Missing PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5381,39 +5499,39 @@ on your system's performance. op je systeem's performatie. - + Deriving Keys Sleutels afleiden - + Select RomFS Dump Target Selecteer RomFS Dump Doel - + Please select which RomFS you would like to dump. Selecteer welke RomFS je zou willen dumpen. - + Are you sure you want to close yuzu? Weet je zeker dat je yuzu wilt sluiten? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Weet je zeker dat je de emulatie wilt stoppen? Alle onopgeslagen voortgang will verloren gaan. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5425,44 +5543,44 @@ Wilt u dit omzeilen en toch afsluiten? GRenderWindow - - + + OpenGL not available! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. - - + + Error while initializing OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. - + Error while initializing OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 @@ -5964,7 +6082,7 @@ Debug Message: Installeren - + Install Files to NAND Installeer Bestanden naar NAND @@ -5972,7 +6090,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 @@ -6620,7 +6738,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE @@ -6669,31 +6787,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [niet aangegeven] @@ -6704,14 +6822,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Axis %1%2 @@ -6722,262 +6840,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [onbekend] - + - + Left Links: - + - + Right Rechts: - + - + Down Beneden: - + - + Up Boven: - + Z Z - + R R: - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Start - - + + L1 - - + + L2 - - + + L3 - - + + R1 - - + + R2 - - + + R3 - - + + Circle - - + + Cross - - + + Square - - + + Triangle - - + + Share - - + + Options - - + + [undefined] - + %1%2 %1%2 - - + + [invalid] - - - - + + + + %1%2Hat %3 - - - - - - + + + + + + %1%2Axis %3 - - + + %1%2Axis %3,%4,%5 - - + + %1%2Motion %3 - - - - + + + + %1%2Button %3 - - + + [unused] [ongebruikt] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Plus: + + + + Minus + Min + + + + Home Home: - + + Capture + Vastleggen + + + Touch Touch - + Wheel Indicates the mouse wheel - + Backward - + Forward - + Task - + Extra - + %1%2%3 diff --git a/dist/languages/pl.ts b/dist/languages/pl.ts index c198f0381..b5046fbac 100644 --- a/dist/languages/pl.ts +++ b/dist/languages/pl.ts @@ -82,7 +82,7 @@ p, li { white-space: pre-wrap; } Room Window - + Okno pokoju @@ -180,7 +180,7 @@ To zbanuje jego/jej nick na forum, oraz jego/jej adres IP. Room Window - + Okno pokoju @@ -213,7 +213,7 @@ To zbanuje jego/jej nick na forum, oraz jego/jej adres IP. %1 - %2 (%3/%4 members) - connected - + %1 - %2 (%3/%4 członków) - połączono @@ -242,102 +242,102 @@ To zbanuje jego/jej nick na forum, oraz jego/jej adres IP. <html><head/><body><p>Does the game boot?</p></body></html> - + <html><head/><body><p>Czy gra się uruchamia?</p></body></html> Yes The game starts to output video or audio - + Tak, gra zaczyna pokazywać obraz lub słychać dźwięk. No The game doesn't get past the "Launching..." screen - + Nie, gra nie przechodzi przez ekran "Ładowania..." Yes The game gets past the intro/menu and into gameplay - + Tak, gra przechodzi przez intro/ekran główny oraz do rozgrywki. No The game crashes or freezes while loading or using the menu - + Nie, gra zawiesza się podczas ładowania lub poruszania się w menu. <html><head/><body><p>Does the game reach gameplay?</p></body></html> - + <html><head/><body><p>Czy gra dociera do rozgrywki?</p></body></html> Yes The game works without crashes - + Tak, gra działa bezawaryjnie. No The game crashes or freezes during gameplay - + Nie, gra się zawiesza podczas rozgrywki. <html><head/><body><p>Does the game work without crashing, freezing or locking up during gameplay?</p></body></html> - + <html><head/><body><p>Czy gra działa bezawaryjnie podczas rozgrywki?</p></body></html> Yes The game can be finished without any workarounds - + Tak, gra może być ukończona bez żadnych obejść. No The game can't progress past a certain area - + Nie, w grze nie można przejść do określonego obszaru. <html><head/><body><p>Is the game completely playable from start to finish?</p></body></html> - + <html><head/><body><p>Czy gra jest kompletnie grywalna od początku aż do jej końca?</p></body></html> Major The game has major graphical errors - + Poważne, gra posiada poważne problemy graficzne. Minor The game has minor graphical errors - + Drobne, gra zawiera drobne błędy graficzne. None Everything is rendered as it looks on the Nintendo Switch - + Żadnych, Wszystko jest renderowane tak jak wygląda na Nintendo Switchu. <html><head/><body><p>Does the game have any graphical glitches?</p></body></html> - + <html><head/><body><p>Czy gra posiada jakieś błędy graficzne?</p></body></html> Major The game has major audio errors - + Poważne, gra posiada poważne problemy dźwiękowe. Minor The game has minor audio errors - + Drobne, gra zawiera drobne błędy dźwiękowe. None Audio is played perfectly - + Żadnych, Dźwięk jest odtwarzany perfekcyjnie. <html><head/><body><p>Does the game have any audio glitches / missing effects?</p></body></html> - + <html><head/><body><p>Czy gra posiada jakiekolwiek błędy dźwiękowe/brakujące efekty?</p></body></html> @@ -425,12 +425,12 @@ To zbanuje jego/jej nick na forum, oraz jego/jej adres IP. Select where the image of the emulated camera comes from. It may be a virtual camera or a real camera. - + Wybierz skąd zdjęcie emulowanej kamery pochodzi. Może być to wirtualna lub prawdziwa kamera. Camera Image Source: - + Źródło zdjęcia kamery: @@ -440,7 +440,7 @@ To zbanuje jego/jej nick na forum, oraz jego/jej adres IP. Preview - + Podgląd @@ -450,7 +450,7 @@ To zbanuje jego/jej nick na forum, oraz jego/jej adres IP. Click to preview - + Kliknij aby obejrzeć podgląd @@ -503,7 +503,7 @@ To zbanuje jego/jej nick na forum, oraz jego/jej adres IP. Paranoid (disables most optimizations) - + Paranoiczne (wyłącza większość optymalizacji) @@ -592,12 +592,13 @@ Wyłączenie tej opcji może pozwolić grze na zapis lub odczyt pamięci emulato <div>This option improves speed by relying only on the semantics of cmpxchg to ensure safety of exclusive access instructions. Please note this may result in deadlocks and other race conditions.</div> - + + <div>Ta opcja poprawia szybkość, opierając się wyłącznie na semantyce cmpxchg w celu zapewnienia bezpieczeństwa instrukcji dostępu wyłącznego. Należy pamiętać, że może to spowodować awarie gier.</div> Ignore global monitor - + Ignoruj ogólne monitorowanie @@ -760,7 +761,7 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d Enable Host MMU Emulation (general memory instructions) - + Włącz emulację MMU gościa (ogólne instrukcje pamięci) @@ -769,12 +770,16 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d <div style="white-space: nowrap">Enabling it causes guest exclusive memory reads/writes to be done directly into memory and make use of Host's MMU.</div> <div style="white-space: nowrap">Disabling this forces all exclusive memory accesses to use Software MMU Emulation.</div> - + + <div style="white-space: nowrap">Ta optymalizacja przyspiesza wyłączny dostęp do pamięci przez program gościa. + <div style="white-space: nowrap"> Włączenie tej opcji powoduje, że wyłączne odczyty/zapisy pamięci gościa są wykonywane bezpośrednio w pamięci i korzystają z MMU hosta .</div> + <div style="white-space: nowrap">Wyłączenie tej opcji wymusza, aby wszystkie wyłączne dostępy do pamięci korzystały z programowej emulacji MMU.</div> + Enable Host MMU Emulation (exclusive memory instructions) - + Włącz emulację Host MMU (ekskluzywne instrukcje dotyczące pamięci) @@ -782,12 +787,14 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d <div style="white-space: nowrap">This optimization speeds up exclusive memory accesses by the guest program.</div> <div style="white-space: nowrap">Enabling it reduces the overhead of fastmem failure of exclusive memory accesses.</div> - + + <div style="white-space: nowrap">Ta optymalizacja przyspiesza wyłączny dostęp do pamięci przez program gościa.</div> + <div style="white-space: nowrap">Włączenie go zmniejsza narzut związany z awarią fastmem w przypadku wyłącznego dostępu do pamięci.</div> Enable recompilation of exclusive memory instructions - + Włącz rekompilację wyłącznych instrukcji pamięci @@ -795,12 +802,15 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d <div style="white-space: nowrap">This optimization speeds up memory accesses by allowing invalid memory accesses to succeed.</div> <div style="white-space: nowrap">Enabling it reduces the overhead of all memory accesses and has no impact on programs that don't access invalid memory.</div> - + + <div style="white-space: nowrap">Ta optymalizacja przyspiesza dostęp do pamięci, umożliwiając pomyślne uzyskanie nieprawidłowego dostępu do pamięci.</div> + <div style="white-space: nowrap">Włączenie zmniejsza narzut wszystkich dostępów do pamięci i nie ma wpływu na programy, które nie uzyskują dostępu do nieprawidłowej pamięci.</div> + Enable fallbacks for invalid memory accesses - + Włącz rezerwę dla nieprawidłowych dostępów do pamięci @@ -813,7 +823,7 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d Debugger - + Debuger @@ -903,12 +913,12 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d When checked, it will dump all the macro programs of the GPU - + Kiedy jest zaznaczone, będą zrzucane wszystkie makro programy GPU Dump Maxwell Macros - + Zrzuć Makra Maxwell @@ -921,124 +931,134 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d Wyłącz Makro JIT - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + Kiedy jest zaznaczone, wyłączane są funkcje makra HLE. Włączenie tego powoduje spadek wydajności w grach. + + + + Disable Macro HLE + Wyłącz makra HLE + + + When checked, yuzu will log statistics about the compiled pipeline cache Po zaznaczeniu, yuzu będzie rejestrować statystyki dotyczące skompilowanej pamięci podręcznej. - + Enable Shader Feedback Włącz funkcję Feedbacku Shaderów - + When checked, it executes shaders without loop logic changes Gdy zaznaczone, używa shaderów bez zmian logicznych pętli - + Disable Loop safety checks Wyłącz Zapętlanie sprawdzania bezpieczeństwa - + Debugging Debugowanie - + Enable Verbose Reporting Services** Włącz Pełne Usługi Raportowania** - + Enable FS Access Log Włącz dziennik Dostępu FS - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Włącz tę opcję, aby wyświetlić ostatnio wygenerowaną listę poleceń dźwiękowych na konsoli. Wpływa tylko na gry korzystające z renderera dźwięku. - + Dump Audio Commands To Console** - + Zrzuć polecenia audio do konsoli** - + Create Minidump After Crash - + Utwórz mini zrzut po awarii - + Advanced Zaawansowane - + Kiosk (Quest) Mode Tryb Kiosk (Quest) - + Enable CPU Debugging Włącz Debugowanie CPU - + Enable Debug Asserts Włącz potwierdzenia debugowania - + Enable Auto-Stub** Włącz Auto-Stub** - + Enable All Controller Types - + Włącz wszystkie Typy Kontrolerów - + Disable Web Applet Wyłącz Aplet internetowy - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Umożliwia yuzu sprawdzanie działającego środowiska Vulkan podczas uruchamiania programu. Wyłącz to, jeśli powoduje to problemy z zewnętrznymi programami widzącymi yuzu. - + Perform Startup Vulkan Check - + Przeprowadź sprawdzanie uruchamiania Vulkana - + **This will be reset automatically when yuzu closes. **To zresetuje się automatycznie po wyłączeniu yuzu. Restart Required - + Ponowne uruchomienie jest wymagane yuzu is required to restart in order to apply this setting. - + yuzu wymaga ponownego uruchomienia w przypadku zastosowania tego ustawienia. - + Web applet not compiled - + Aplet sieciowy nie został skompilowany - + MiniDump creation not compiled - + Tworzenie mini zrzutów nie zostało skompilowane @@ -1087,13 +1107,13 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d - + Audio Dźwięk - + CPU CPU @@ -1109,13 +1129,13 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d - + General Ogólne - + Graphics Grafika @@ -1131,7 +1151,7 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d - + Controls Sterowanie @@ -1147,7 +1167,7 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d - + System System @@ -1333,7 +1353,7 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d Extended memory layout (6GB DRAM) - + Rozszerzony układ pamięci (6GB DRAM) @@ -1410,7 +1430,7 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d - + None Żadny @@ -1492,7 +1512,7 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d Force 16:10 - + Wymuś 16:10 @@ -1521,112 +1541,127 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: Filtr Adaptującego Okna: - + Nearest Neighbor Najbliższy Sąsiad - + Bilinear Bilinearny - + Bicubic Bikubiczny - + Gaussian Gauss - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ Super Rozdzielczość (Tylko Vulkan) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: Metoda Anty-Aliasingu: - + FXAA FXAA - + SMAA - + SMAA - + Use global FSR Sharpness - + Użyj globalnej ostrości FSR - + Set FSR Sharpness - + Ustaw ostrość FSR - + FSR Sharpness: - + Ostrość FSR: - + 100% - + 100% - - + + Use global background color Ustaw globalny kolor tła - + Set background color: Ustaw kolor tła: - + Background Color: Kolor tła @@ -1638,7 +1673,7 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d SPIR-V (Experimental, Mesa Only) - + SPIR-V (Eksperymentalne, Tylko Mesa) @@ -1671,77 +1706,97 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + Uruchamia pracę w tle podczas oczekiwania na komendy graficzne aby GPU nie obniżało taktowania. + + + + Force maximum clocks (Vulkan only) + Wymuś maksymalne zegary (Tylko Vulkan) + + + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. VSync zapobiega rozwarstwianiu obrazu, ale niektóre karty graficzne mogą działać wolniej używając VSync. Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + Use VSync Używaj VSync - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Włącza asynchroniczną kompilację shaderów, co może zmniejszyć zacinanie się shaderów. Ta funkcja jest eksperymentalna. - + Use asynchronous shader building (Hack) Użyj asynchronicznego budowania shaderów (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Włącza Szybszy Czas GPU. Ta opcja zmusza większość gier do wyświetlania w swojej najwyższej natywnej rozdzielczości. - + Use Fast GPU Time (Hack) Użyj Szybszego Czasu GPU (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Włącza pesymistyczne opróżnianie bufora. Ta opcja wymusi opróżnianie niezmodyfikowanych buforów, gdzie to wpłynie na wydajność. - + Use pessimistic buffer flushes (Hack) - + Użyj pesymistycznego opróżniania buforów (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + Włącza pamięć podręczną strumienia specyficzną dla dostawcy GPU. Ta opcja może znacznie skrócić czas ładowania modułu cieniującego w przypadkach, gdy sterownik Vulkan nie przechowuje wewnętrznie plików pamięci podręcznej strumienia. + + + + Use Vulkan pipeline cache + Użyj pamięci podręcznej strumienia dla Vulkana + + + Anisotropic Filtering: Filtrowanie anizotropowe: - + Automatic Automatyczne - + Default Domyślne - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2129,19 +2184,19 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + Configure Konfiguruj Ring Controller - + Kontroler Ring Infrared Camera - + Kamera podczerwieni @@ -2155,6 +2210,7 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. + Requires restarting yuzu Należy zrestartować yuzu @@ -2174,22 +2230,27 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności.Nawigacja Kontrolerem - + + Enable direct JoyCon driver + + + + Enable mouse panning Włącz panoramowanie myszą - + Mouse sensitivity Czułość myszy - + % % - + Motion / Touch Ruch / Dotyk @@ -2209,57 +2270,57 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. Input Profiles - + Profil wejściowy Player 1 Profile - + Profil gracza 1 Player 2 Profile - + Profil gracza 2 Player 3 Profile - + Profil gracza 3 Player 4 Profile - + Profil gracza 4 Player 5 Profile - + Profil gracza 5 Player 6 Profile - + Profil gracza 6 Player 7 Profile - + Profil gracza 7 Player 8 Profile - + Profil gracza 8 Use global input configuration - + Użyj globalnej konfiguracji wejściowej Player %1 profile - + Profil %1 gracza @@ -2301,7 +2362,7 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + Left Stick Lewa gałka @@ -2395,14 +2456,14 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + L L - + ZL ZL @@ -2421,7 +2482,7 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + Plus Plus @@ -2434,15 +2495,15 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - - + + R R - + ZR ZR @@ -2499,236 +2560,236 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + Right Stick Prawa gałka - - - - + + + + Clear Wyczyść - - - - - + + + + + [not set] [nie ustawione] - - + + Invert button Odwróć przycisk - - + + Toggle button Przycisk Toggle - - + + Invert axis Odwróć oś - - - + + + Set threshold Ustaw próg - - + + Choose a value between 0% and 100% Wybierz wartość od 0% do 100% - + Toggle axis - + Przełącz oś - + Set gyro threshold Ustaw próg gyro - + Map Analog Stick Przypisz Drążek Analogowy - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Po naciśnięciu OK, najpierw przesuń joystick w poziomie, a następnie w pionie. Aby odwrócić osie, najpierw przesuń joystick pionowo, a następnie poziomo. - + Center axis - + Środkowa oś - - + + Deadzone: %1% Martwa strefa: %1% - - + + Modifier Range: %1% Zasięg Modyfikatora: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Para Joyconów - + Left Joycon Lewy Joycon - + Right Joycon Prawy Joycon - + Handheld Handheld - + GameCube Controller Kontroler GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Kontroler NES/Pegasus - + SNES Controller Kontroler SNES - + N64 Controller Kontroler N64 - + Sega Genesis Sega Mega Drive - + Start / Pause Start / Pauza - + Z Z - + Control Stick Lewa gałka - + C-Stick C-gałka - + Shake! Potrząśnij! - + [waiting] [oczekiwanie] - + New Profile Nowy profil - + Enter a profile name: Wpisz nazwę profilu: - - + + Create Input Profile Utwórz profil wejściowy - + The given profile name is not valid! Podana nazwa profilu jest nieprawidłowa! - + Failed to create the input profile "%1" Nie udało się utworzyć profilu wejściowego "%1" - + Delete Input Profile Usuń profil wejściowy - + Failed to delete the input profile "%1" Nie udało się usunąć profilu wejściowego "%1" - + Load Input Profile Załaduj profil wejściowy - + Failed to load the input profile "%1" Nie udało się wczytać profilu wejściowego "%1" - + Save Input Profile Zapisz profil wejściowy - + Failed to save the input profile "%1" Nie udało się zapisać profilu wejściowego "%1" @@ -2776,7 +2837,7 @@ Aby odwrócić osie, najpierw przesuń joystick pionowo, a następnie poziomo. - + Configure Konfiguruj @@ -2812,7 +2873,7 @@ Aby odwrócić osie, najpierw przesuń joystick pionowo, a następnie poziomo. - + Test Test @@ -2832,77 +2893,77 @@ Aby odwrócić osie, najpierw przesuń joystick pionowo, a następnie poziomo.<a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Dowiedz się więcej</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters Port zawiera nieprawidłowe znaki - + Port has to be in range 0 and 65353 Port musi być w zakresie 0-65353 - + IP address is not valid Adres IP nie jest prawidłowy - + This UDP server already exists Ten serwer UDP już istnieje - + Unable to add more than 8 servers Nie można dodać więcej niż 8 serwerów - + Testing Testowanie - + Configuring Konfigurowanie - + Test Successful Test Udany - + Successfully received data from the server. Pomyślnie odebrano dane z serwera. - + Test Failed Test nieudany - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Nie można odebrać poprawnych danych z serwera.<br>Sprawdź, czy serwer jest poprawnie skonfigurowany, a adres i port są prawidłowe. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. Trwa konfiguracja testu UDP lub kalibracji.<br>Poczekaj na zakończenie. @@ -3020,7 +3081,7 @@ Aby odwrócić osie, najpierw przesuń joystick pionowo, a następnie poziomo. Input Profiles - + Profil wejściowy @@ -3202,7 +3263,7 @@ Aby odwrócić osie, najpierw przesuń joystick pionowo, a następnie poziomo. Delete this user? All of the user's save data will be deleted. - + Czy usunąć tego użytkownika? Wszystkie dane zapisu użytkownika zostaną usunięte. @@ -3213,7 +3274,8 @@ Aby odwrócić osie, najpierw przesuń joystick pionowo, a następnie poziomo. Name: %1 UUID: %2 - + Nazwa: %1 +UUID: %2 @@ -3226,24 +3288,24 @@ UUID: %2 If you want to use this controller configure player 1 as right controller and player 2 as dual joycon before starting the game to allow this controller to be detected properly. - + Jeżeli zamierzasz używać tego kontrolera, skonfiguruj Gracza 1 jako prawy kontroler oraz Gracza 2 jako podwójnego JoyCona przed uruchomieniem gry aby zezwolić temu kontrolerowi na jego poprawne wykrycie. - Ring Sensor Parameters + Virtual Ring Sensor Parameters Pull - + Ciągnij Push - + Pchaj @@ -3251,33 +3313,90 @@ UUID: %2 Martwa strefa: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Przywróć domyślne - + Clear Wyczyść - + [not set] [nie ustawione] - + Invert axis Odwróć oś - - + + Deadzone: %1% Martwa strefa: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Konfigurowanie + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [oczekiwanie] @@ -3582,8 +3701,8 @@ UUID: %2 - English - Angielski (English) + American English + Angielski Amerykański @@ -3683,7 +3802,7 @@ UUID: %2 Device Name - + Nazwa urządzenia @@ -3716,22 +3835,27 @@ UUID: %2 Wygeneruj ponownie - + System settings are available only when game is not running. Ustawienia systemu są dostępne tylko wtedy, gdy gra nie jest uruchomiona. - + + Warning: "%1" is not a valid language for region "%2" + Uwaga: "%1" nie jest poprawnym językiem dla regionu "%2" + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? To zamieni twojego obecnego Switch'a z nowym. Twojego obecnego Switch'a nie będzie można przywrócić. To może wywołać nieoczekiwane problemy w grach. To może nie zadziałać, jeśli używasz nieaktualnej konfiguracji zapisu gry. Kontynuować? - + Warning Ostrzeżenie - + Console ID: 0x%1 Identyfikator konsoli: 0x%1 @@ -3802,7 +3926,7 @@ UUID: %2 Konfiguracja TAS - + Select TAS Load Directory... Wybierz Ścieżkę Załadowania TAS-a @@ -4042,7 +4166,7 @@ Przeciągnij punkty, aby zmienić pozycję, lub kliknij dwukrotnie komórki tabe Show Compatibility List - + Pokaż listę kompatybilności @@ -4052,12 +4176,12 @@ Przeciągnij punkty, aby zmienić pozycję, lub kliknij dwukrotnie komórki tabe Show Size Column - + Pokaż kolumnę rozmiarów Show File Types Column - + Pokaż kolumnę typów plików @@ -4241,7 +4365,7 @@ Przeciągnij punkty, aby zmienić pozycję, lub kliknij dwukrotnie komórki tabe Web Service configuration can only be changed when a public room isn't being hosted. - + Konfigurację usług sieciowych można tylko zmienić kiedy pokój publiczny nie jest hostowany. @@ -4319,7 +4443,7 @@ Przeciągnij punkty, aby zmienić pozycję, lub kliknij dwukrotnie komórki tabe Unverified, please click Verify before saving configuration Tooltip - + Niezweryfikowany, kliknij proszę przycisk Weryfikacji przed zapisaniem konfiguracji @@ -4331,7 +4455,7 @@ Przeciągnij punkty, aby zmienić pozycję, lub kliknij dwukrotnie komórki tabe Verified Tooltip - + Zweryfikowany @@ -4358,7 +4482,7 @@ Przeciągnij punkty, aby zmienić pozycję, lub kliknij dwukrotnie komórki tabe Kontroler P1 - + &Controller P1 &Kontroler P1 @@ -4368,45 +4492,40 @@ Przeciągnij punkty, aby zmienić pozycję, lub kliknij dwukrotnie komórki tabe Direct Connect + Bezpośrednie połączenie + + + + Server Address - - IP Address - Adres IP + + <html><head/><body><p>Server address of the host</p></body></html> + - - IP - IP - - - - <html><head/><body><p>IPv4 address of the host</p></body></html> - <html><head/><body><p>Adres IPv4 hosta</p></body></html> - - - + Port Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> - + <html><head/><body><p>Numer portu, na którym nasłuchuje host</p></body></html> - + Nickname Nick - + Password Hasło - + Connect Połącz @@ -4414,12 +4533,12 @@ Przeciągnij punkty, aby zmienić pozycję, lub kliknij dwukrotnie komórki tabe DirectConnectWindow - + Connecting Łączenie - + Connect Połącz @@ -4439,12 +4558,12 @@ Przeciągnij punkty, aby zmienić pozycję, lub kliknij dwukrotnie komórki tabe Broken Vulkan Installation Detected - + Wykryto uszkodzoną instalację Vulkana Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Inicjalizacja Vulkana nie powiodła się podczas uruchamiania.<br><br>Kliknij<a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>tutaj aby uzyskać instrukcje dotyczące rozwiązania tego problemu</a>. @@ -4490,473 +4609,483 @@ Przeciągnij punkty, aby zmienić pozycję, lub kliknij dwukrotnie komórki tabe Czas potrzebny do emulacji klatki na sekundę Switcha, nie licząc ograniczania klatek ani v-sync. Dla emulacji pełnej szybkości powinno to wynosić co najwyżej 16,67 ms. - + &Clear Recent Files &Usuń Ostatnie pliki - + &Continue &Kontynuuj - + &Pause &Pauza - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu jest w trakcie gry - + Warning Outdated Game Format OSTRZEŻENIE! Nieaktualny format gry - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Używasz zdekonstruowanego formatu katalogu ROM dla tej gry, który jest przestarzałym formatem, który został zastąpiony przez inne, takie jak NCA, NAX, XCI lub NSP. W zdekonstruowanych katalogach ROM brakuje ikon, metadanych i obsługi aktualizacji.<br><br> Aby znaleźć wyjaśnienie różnych formatów Switch obsługiwanych przez yuzu,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'> sprawdź nasze wiki</a>. Ta wiadomość nie pojawi się ponownie. - - + + Error while loading ROM! Błąd podczas wczytywania ROMu! - + The ROM format is not supported. Ten format ROMu nie jest wspierany. - + An error occurred initializing the video core. Wystąpił błąd podczas inicjowania rdzenia wideo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu napotkał błąd podczas uruchamiania rdzenia wideo. Jest to zwykle spowodowane przestarzałymi sterownikami GPU, w tym zintegrowanymi. Więcej szczegółów znajdziesz w pliku log. Więcej informacji na temat dostępu do log-u można znaleźć na następującej stronie: <a href='https://yuzu-emu.org/help/reference/log-files/'>Jak przesłać plik log</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Błąd podczas wczytywania ROMu! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Postępuj zgodnie z<a href='https://yuzu-emu.org/help/quickstart/'>yuzu quickstart guide</a> aby zrzucić ponownie swoje pliki.<br>Możesz odwołać się do wiki yuzu</a>lub discord yuzu </a> po pomoc. - + An unknown error occurred. Please see the log for more details. Wystąpił nieznany błąd. Więcej informacji można znaleźć w pliku log. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Zamykanie aplikacji... - + Save Data Zapis danych - + Mod Data Dane modów - + Error Opening %1 Folder Błąd podczas otwarcia folderu %1 - - + + Folder does not exist! Folder nie istnieje! - + Error Opening Transferable Shader Cache Błąd podczas otwierania przenośnej pamięci podręcznej Shaderów. - + Failed to create the shader cache directory for this title. Nie udało się stworzyć ścieżki shaderów dla tego tytułu. - + Error Removing Contents - + Błąd podczas usuwania zawartości - + Error Removing Update - + Błąd podczas usuwania aktualizacji - + Error Removing DLC - + Błąd podczas usuwania dodatków - + Remove Installed Game Contents? - + Czy usunąć zainstalowaną zawartość gry? - + Remove Installed Game Update? - + Czy usunąć zainstalowaną aktualizację gry? - + Remove Installed Game DLC? - + Czy usunąć zainstalowane dodatki gry? - + Remove Entry Usuń wpis - - - - - - + + + + + + Successfully Removed Pomyślnie usunięto - + Successfully removed the installed base game. Pomyślnie usunięto zainstalowaną grę. - + The base game is not installed in the NAND and cannot be removed. Gra nie jest zainstalowana w NAND i nie może zostać usunięta. - + Successfully removed the installed update. Pomyślnie usunięto zainstalowaną łatkę. - + There is no update installed for this title. Brak zainstalowanych łatek dla tego tytułu. - + There are no DLC installed for this title. Brak zainstalowanych DLC dla tego tytułu. - + Successfully removed %1 installed DLC. Pomyślnie usunięto %1 zainstalowane DLC. - + Delete OpenGL Transferable Shader Cache? Usunąć Transferowalne Shadery OpenGL? - + Delete Vulkan Transferable Shader Cache? Usunąć Transferowalne Shadery Vulkan? - + Delete All Transferable Shader Caches? Usunąć Wszystkie Transferowalne Shadery? - + Remove Custom Game Configuration? Usunąć niestandardową konfigurację gry? - + Remove File Usuń plik - - + + Error Removing Transferable Shader Cache Błąd podczas usuwania przenośnej pamięci podręcznej Shaderów. - - + + A shader cache for this title does not exist. Pamięć podręczna Shaderów dla tego tytułu nie istnieje. - + Successfully removed the transferable shader cache. Pomyślnie usunięto przenośną pamięć podręczną Shaderów. - + Failed to remove the transferable shader cache. Nie udało się usunąć przenośnej pamięci Shaderów. - - + + Error Removing Vulkan Driver Pipeline Cache + Błąd podczas usuwania pamięci podręcznej strumienia sterownika Vulkana + + + + Failed to remove the driver pipeline cache. + Błąd podczas usuwania pamięci podręcznej strumienia sterownika. + + + + Error Removing Transferable Shader Caches Błąd podczas usuwania Transferowalnych Shaderów - + Successfully removed the transferable shader caches. Pomyślnie usunięto transferowalne shadery. - + Failed to remove the transferable shader cache directory. Nie udało się usunąć ścieżki transferowalnych shaderów. - - + + Error Removing Custom Configuration Błąd podczas usuwania niestandardowej konfiguracji - + A custom configuration for this title does not exist. Niestandardowa konfiguracja nie istnieje dla tego tytułu. - + Successfully removed the custom game configuration. Pomyślnie usunięto niestandardową konfiguracje gry. - + Failed to remove the custom game configuration. Nie udało się usunąć niestandardowej konfiguracji gry. - - + + RomFS Extraction Failed! Wypakowanie RomFS nieudane! - + There was an error copying the RomFS files or the user cancelled the operation. Wystąpił błąd podczas kopiowania plików RomFS lub użytkownik anulował operację. - + Full Pełny - + Skeleton Szkielet - + Select RomFS Dump Mode Wybierz tryb zrzutu RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Proszę wybrać w jaki sposób chcesz, aby zrzut pliku RomFS został wykonany. <br>Pełna kopia ze wszystkimi plikami do nowego folderu, gdy <br>skielet utworzy tylko strukturę folderu. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Nie ma wystarczająco miejsca w %1 aby wyodrębnić RomFS. Zwolnij trochę miejsca, albo zmień ścieżkę zrzutu RomFs w Emulacja> Konfiguruj> System> System Plików> Źródło Zrzutu - + Extracting RomFS... Wypakowywanie RomFS... - - + + Cancel Anuluj - + RomFS Extraction Succeeded! Wypakowanie RomFS zakończone pomyślnie! - + The operation completed successfully. Operacja zakończona sukcesem. - - - - - + + + + + Create Shortcut - + Utwórz skrót - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Utworzy to skrót do obecnego AppImage. Może nie działać dobrze po aktualizacji. Kontynuować? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Nie można utworzyć skrótu na pulpicie. Ścieżka "%1" nie istnieje. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Nie można utworzyć skrótu w menu aplikacji. Ścieżka "%1" nie istnieje oraz nie może być utworzona. - + Create Icon - + Utwórz ikonę - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Nie można utworzyć pliku ikony. Ścieżka "%1" nie istnieje oraz nie może być utworzona. - + Start %1 with the yuzu Emulator - + Włącz %1 z emulatorem yuzu - + Failed to create a shortcut at %1 - + Nie udało się utworzyć skrótu pod %1 - + Successfully created a shortcut to %1 - + Pomyślnie utworzono skrót do %1 - + Error Opening %1 Błąd podczas otwierania %1 - + Select Directory Wybierz folder... - + Properties Właściwości - + The game properties could not be loaded. Właściwości tej gry nie mogły zostać załadowane. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Plik wykonywalny Switcha (%1);;Wszystkie pliki (*.*) - + Load File Załaduj plik... - + Open Extracted ROM Directory Otwórz folder wypakowanego ROMu - + Invalid Directory Selected Wybrano niewłaściwy folder - + The directory you have selected does not contain a 'main' file. Folder wybrany przez ciebie nie zawiera 'głownego' pliku. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Instalacyjne pliki Switch'a (*.nca *.nsp *.xci);;Archiwum zawartości Nintendo (*.nca);;Pakiet poddany Nintendo (*.nsp);;Obraz z kartridża NX (*.xci) - + Install Files Zainstaluj pliki - + %n file(s) remaining 1 plik został%n plików zostało%n plików zostało%n plików zostało - + Installing file "%1"... Instalowanie pliku "%1"... - + Install Results Wynik instalacji - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Aby uniknąć ewentualnych konfliktów, odradzamy użytkownikom instalowanie gier na NAND. Proszę, używaj tej funkcji tylko do instalowania łatek i DLC. - + %n file(s) were newly installed 1 nowy plik został zainstalowany @@ -4966,389 +5095,389 @@ Proszę, używaj tej funkcji tylko do instalowania łatek i DLC. - + %n file(s) were overwritten 1 plik został nadpisany%n plików zostało nadpisane%n plików zostało nadpisane%n plików zostało nadpisane - + %n file(s) failed to install 1 pliku nie udało się zainstalować%n plików nie udało się zainstalować%n plików nie udało się zainstalować%n plików nie udało się zainstalować - + System Application Aplikacja systemowa - + System Archive Archiwum systemu - + System Application Update Aktualizacja aplikacji systemowej - + Firmware Package (Type A) Paczka systemowa (Typ A) - + Firmware Package (Type B) Paczka systemowa (Typ B) - + Game Gra - + Game Update Aktualizacja gry - + Game DLC Dodatek do gry - + Delta Title Tytuł Delta - + Select NCA Install Type... Wybierz typ instalacji NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Wybierz typ tytułu, do którego chcesz zainstalować ten NCA, jako: (W większości przypadków domyślna "gra" jest w porządku.) - + Failed to Install Instalacja nieudana - + The title type you selected for the NCA is invalid. Typ tytułu wybrany dla NCA jest nieprawidłowy. - + File not found Nie znaleziono pliku - + File "%1" not found Nie znaleziono pliku "%1" - + OK OK - - + + Hardware requirements not met - + Wymagania sprzętowe nie są spełnione - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Twój system nie spełnia rekomendowanych wymagań sprzętowych. Raportowanie kompatybilności zostało wyłączone. - + Missing yuzu Account Brakuje konta Yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Aby przesłać test zgodności gry, musisz połączyć swoje konto yuzu.<br><br/> Aby połączyć swoje konto yuzu, przejdź do opcji Emulacja &gt; Konfiguracja &gt; Sieć. - + Error opening URL Błąd otwierania adresu URL - + Unable to open the URL "%1". Nie można otworzyć adresu URL "%1". - + TAS Recording Nagrywanie TAS - + Overwrite file of player 1? Nadpisać plik gracza 1? - + Invalid config detected Wykryto nieprawidłową konfigurację - + Handheld controller can't be used on docked mode. Pro controller will be selected. Nie można używać kontrolera handheld w trybie zadokowanym. Zostanie wybrany kontroler Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Amiibo zostało "zdjęte" - + Error Błąd - - + + The current game is not looking for amiibos Ta gra nie szuka amiibo - + Amiibo File (%1);; All Files (*.*) Plik Amiibo (%1);;Wszyskie pliki (*.*) - + Load Amiibo Załaduj Amiibo - + Error loading Amiibo data Błąd podczas ładowania pliku danych Amiibo - + The selected file is not a valid amiibo - + Wybrany plik nie jest poprawnym amiibo - + The selected file is already on use - + Wybrany plik jest już w użyciu - + An unknown error occurred - + Wystąpił nieznany błąd - + Capture Screenshot Zrób zrzut ekranu - + PNG Image (*.png) Obrazek PNG (*.png) - + TAS state: Running %1/%2 Status TAS: Działa %1%2 - + TAS state: Recording %1 Status TAS: Nagrywa %1 - + TAS state: Idle %1/%2 Status TAS: Bezczynny %1%2 - + TAS State: Invalid Status TAS: Niepoprawny - + &Stop Running &Wyłącz - + &Start &Start - + Stop R&ecording Przestań N&agrywać - + R&ecord N&agraj - + Building: %n shader(s) Budowanie shaderaBudowanie: %n shaderówBudowanie: %n shaderówBudowanie: %n shaderów - + Scale: %1x %1 is the resolution scaling factor Skala: %1x - + Speed: %1% / %2% Prędkość: %1% / %2% - + Speed: %1% Prędkość: %1% - + Game: %1 FPS (Unlocked) Gra: %1 FPS (Odblokowane) - + Game: %1 FPS Gra: %1 FPS - + Frame: %1 ms Klatka: %1 ms - + GPU NORMAL GPU NORMALNE - + GPU HIGH GPU WYSOKIE - + GPU EXTREME GPU EKSTREMALNE - + GPU ERROR BŁĄD GPU - + DOCKED TRYB ZADOKOWANY - + HANDHELD TRYB PRZENOŚNY - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + Zero - + NEAREST NAJBLIŻSZY - - + + BILINEAR BILINEARNY - + BICUBIC BIKUBICZNY - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA BEZ AA - + FXAA FXAA - + SMAA - + SMAA - + Confirm Key Rederivation Potwierdź ponowną aktywacje klucza - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5365,37 +5494,37 @@ i opcjonalnie tworzyć kopie zapasowe. Spowoduje to usunięcie wygenerowanych automatycznie plików kluczy i ponowne uruchomienie modułu pochodnego klucza. - + Missing fuses Brakujące bezpieczniki - + - Missing BOOT0 - Brak BOOT0 - + - Missing BCPKG2-1-Normal-Main - Brak BCPKG2-1-Normal-Main - + - Missing PRODINFO - Brak PRODINFO - + Derivation Components Missing Brak komponentów wyprowadzania - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Brakuje elementów, które mogą uniemożliwić zakończenie wyprowadzania kluczy. <br>Postępuj zgodnie z <a href='https://yuzu-emu.org/help/quickstart/'>yuzu quickstart guide</a> aby zdobyć wszystkie swoje klucze i gry.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5404,39 +5533,39 @@ Zależnie od tego może potrwać do minuty na wydajność twojego systemu. - + Deriving Keys Wyprowadzanie kluczy... - + Select RomFS Dump Target Wybierz cel zrzutu RomFS - + Please select which RomFS you would like to dump. Proszę wybrać RomFS, jakie chcesz zrzucić. - + Are you sure you want to close yuzu? Czy na pewno chcesz zamknąć yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Czy na pewno chcesz zatrzymać emulację? Wszystkie niezapisane postępy zostaną utracone. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5448,44 +5577,44 @@ Czy chcesz to ominąć i mimo to wyjść? GRenderWindow - - + + OpenGL not available! OpenGL niedostępny! - + OpenGL shared contexts are not supported. - + Współdzielone konteksty OpenGL nie są obsługiwane. - + yuzu has not been compiled with OpenGL support. yuzu nie zostało skompilowane z obsługą OpenGL. - - + + Error while initializing OpenGL! Błąd podczas inicjowania OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Twoja karta graficzna może nie obsługiwać OpenGL lub nie masz najnowszych sterowników karty graficznej. - + Error while initializing OpenGL 4.6! Błąd podczas inicjowania OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Twoja karta graficzna może nie obsługiwać OpenGL 4.6 lub nie masz najnowszych sterowników karty graficznej.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Twoja karta graficzna może nie obsługiwać co najmniej jednego wymaganego rozszerzenia OpenGL. Upewnij się, że masz najnowsze sterowniki karty graficznej<br><br>GL Renderer:<br>%1<br><br>Nieobsługiwane rozszerzenia:<br>%2 @@ -5586,17 +5715,17 @@ Czy chcesz to ominąć i mimo to wyjść? Create Shortcut - + Utwórz skrót Add to Desktop - + Dodaj do pulpitu Add to Applications Menu - + Dodaj do menu aplikacji @@ -5664,12 +5793,12 @@ Czy chcesz to ominąć i mimo to wyjść? Ingame - + W grze Game starts, but crashes or major glitches prevent it from being completed. - + Gra uruchamia się, ale awarie lub poważne błędy uniemożliwiają jej ukończenie. @@ -5679,17 +5808,17 @@ Czy chcesz to ominąć i mimo to wyjść? Game can be played without issues. - + Można grać bez problemów. Playable - + Grywalna Game functions with minor graphical or audio glitches and is playable from start to finish. - + Gra działa z drobnymi błędami graficznymi lub dźwiękowymi oraz jest grywalna od początku aż do końca. @@ -5699,7 +5828,7 @@ Czy chcesz to ominąć i mimo to wyjść? Game loads, but is unable to progress past the Start Screen. - + Gra się ładuje, ale nie może przejść przez ekran początkowy. @@ -5778,7 +5907,7 @@ Czy chcesz to ominąć i mimo to wyjść? (Leave blank for open game) - + (Zostaw puste dla otwartej gry) @@ -5798,7 +5927,7 @@ Czy chcesz to ominąć i mimo to wyjść? Load Previous Ban List - + Załaduj poprzednią listę banów @@ -5808,12 +5937,12 @@ Czy chcesz to ominąć i mimo to wyjść? Unlisted - + Nie katalogowany Host Room - + Pokój hosta @@ -5827,7 +5956,8 @@ Czy chcesz to ominąć i mimo to wyjść? Failed to announce the room to the public lobby. In order to host a room publicly, you must have a valid yuzu account configured in Emulation -> Configure -> Web. If you do not want to publish a room in the public lobby, then select Unlisted instead. Debug Message: - + Nie udało się ogłosić pokoju w publicznym lobby. Aby udostępnić pokój publicznie, musisz mieć ważne konto yuzu skonfigurowane w Emulacja -> Konfiguruj... -> Sieć. Jeśli nie chcesz publikować pokoju w publicznym lobby, zamiast tego wybierz opcję Niepubliczny. +Komunikat debugowania: @@ -5861,17 +5991,17 @@ Debug Message: Main Window - + Okno główne Audio Volume Down - + Zmniejsz głośność dźwięku Audio Volume Up - + Zwiększ głośność dźwięku @@ -5881,17 +6011,17 @@ Debug Message: Change Adapting Filter - + Zmień filtr adaptacyjny Change Docked Mode - + Zmień tryb dokowania Change GPU Accuracy - + Zmień dokładność GPU @@ -5936,37 +6066,37 @@ Debug Message: TAS Record - + Nagrywanie TAS TAS Reset - + Reset TAS TAS Start/Stop - + TAS Start/Stop Toggle Filter Bar - + Pokaż pasek filtrowania Toggle Framerate Limit - + Przełącz limit liczby klatek na sekundę Toggle Mouse Panning - + Włącz przesuwanie myszką Toggle Status Bar - + Przełącz pasek stanu @@ -5987,7 +6117,7 @@ Debug Message: Zainstaluj - + Install Files to NAND Zainstaluj pliki na NAND @@ -5995,7 +6125,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 Tekst nie może zawierać tych znaków: @@ -6045,7 +6175,7 @@ Debug Message: Public Room Browser - + Przeglądarka publicznych pokoi @@ -6061,7 +6191,7 @@ Debug Message: Search - + Szukaj @@ -6189,7 +6319,7 @@ Debug Message: &Multiplayer - + &Multiplayer @@ -6279,27 +6409,27 @@ Debug Message: &Browse Public Game Lobby - + &Przeglądaj publiczne lobby gier &Create Room - + &Utwórz Pokój &Leave Room - + &Wyjdź z Pokoju &Direct Connect to Room - + &Bezpośrednie połączenie z pokojem &Show Current Room - + &Pokaż bieżący pokój @@ -6390,7 +6520,7 @@ Debug Message: Ban List - + Lista banów @@ -6401,22 +6531,22 @@ Debug Message: Unban - + Unban Subject - + Temat Type - + Typ Forum Username - + Nazwa użytkownika forum @@ -6434,12 +6564,12 @@ Debug Message: Current connection status - + Bieżący stan połączenia Not Connected. Click here to find a room! - + Nie połączono. Kliknij tutaj aby znaleźć pokój! @@ -6465,7 +6595,8 @@ Debug Message: Failed to update the room information. Please check your Internet connection and try hosting the room again. Debug Message: - + Nie udało się zaktualizować informacji o pokoju. Sprawdź swoje połączenie internetowe i spróbuj ponownie zahostować pokój. +Komunikat debugowania: @@ -6498,7 +6629,7 @@ Debug Message: You must choose a Preferred Game to host a room. If you do not have any games in your game list yet, add a game folder by clicking on the plus icon in the game list. - + Aby hostować pokój, musisz wybrać preferowaną grę. Jeżeli nie posiadasz żadnej gry w twojej liście gier, dodaj folder z grami poprzez kliknięcie ikonki plusa w liście gier. @@ -6508,7 +6639,7 @@ Debug Message: Unable to connect to the host. Verify that the connection settings are correct. If you still cannot connect, contact the room host and verify that the host is properly configured with the external port forwarded. - + Nie można nawiązać połączenia z hostem. Sprawdź czy ustawienia sieciowe są poprawne. Jeżeli wciąż nie będziesz mógł nawiązać połączenia, skontaktuj się z hostem pokoju oraz sprawdźcie czy host ma poprawne skonfigurowane przekazywanie portów. @@ -6533,12 +6664,12 @@ Debug Message: Incorrect password. - + Niepoprawne hasło. An unknown error occurred. If this error continues to occur, please open an issue - + Wystąpił nieznany błąd. Jeśli ten błąd będzie się powtarzał, otwórz problem @@ -6558,7 +6689,7 @@ Debug Message: You do not have enough permission to perform this action. - + Nie masz wystarczających uprawnień żeby przeprowadzić tę czynność. @@ -6571,18 +6702,20 @@ Możliwe, że opuścił/a pokój. No valid network interface is selected. Please go to Configure -> System -> Network and make a selection. - + Nie wybrano prawidłowego interfejsu sieciowego. +Przejdź do Konfiguruj... -> System -> Sieć i dokonaj wyboru. Game already running - + Gra już działa Joining a room when the game is already running is discouraged and can cause the room feature not to work correctly. Proceed anyway? - + Dołączanie do pokoju, gdy gra jest już uruchomiona, jest odradzane i może spowodować nieprawidłowe działanie funkcji pokoju. +Czy kontynuować mimo to? @@ -6649,7 +6782,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE START/PAUZA @@ -6698,31 +6831,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [nie ustawione] @@ -6733,14 +6866,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Oś %1%2 @@ -6751,262 +6884,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [nieznane] - + - + Left Lewo - + - + Right Prawo - + - + Down Dół - + - + Up Góra - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Start - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle Kółko - - + + Cross Krzyż - - + + Square Kwadrat - - + + Triangle Trójkąt - - + + Share Udostępnij - - + + Options Opcje - - + + [undefined] [niezdefiniowane] - + %1%2 %1%2 - - + + [invalid] [niepoprawne] - - - - + + + + %1%2Hat %3 %1%2Drążek %3 - - - - - - + + + + + + %1%2Axis %3 %1%2Oś %3 - - + + %1%2Axis %3,%4,%5 %1%2Oś %3,%4,%5 - - + + %1%2Motion %3 %1%2Ruch %3 - - - - + + + + %1%2Button %3 %1%2Przycisk %3 - - + + [unused] [nieużywane] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Plus + + + + Minus + Minus + + + + Home Home - + + Capture + Zrzut ekranu + + + Touch Dotyk - + Wheel Indicates the mouse wheel Kółko - + Backward Do tyłu - + Forward Do przodu - + Task Zadanie - + Extra Dodatkowe - + %1%2%3 %1%2%3 @@ -7016,22 +7195,22 @@ p, li { white-space: pre-wrap; } Amiibo Settings - + Ustawienia Amiibo Amiibo Info - + Informacje o Amiibo Series - + Seria Type - + Typ @@ -7041,52 +7220,52 @@ p, li { white-space: pre-wrap; } Amiibo Data - + Dane Amiibo Custom Name - + Niestandardowa Nazwa Owner - + Właściciel Creation Date - + Data Utworzenia dd/MM/yyyy - + dd/MM/yyyy Modification Date - + Data Modyfikacji dd/MM/yyyy - + dd/MM/yyyy Game Data - + Dane gry Game Id - + ID Gry Mount Amiibo - + Zamontuj Amiibo @@ -7096,32 +7275,32 @@ p, li { white-space: pre-wrap; } File Path - + Ścieżka pliku No game data present - + Brak danych gry The following amiibo data will be formatted: - + Następujące dane amiibo zostaną sformatowane: The following game data will removed: - + Następujące dane gry zostaną usunięte: Set nickname and owner: - + Ustaw nick oraz właściciela: Do you wish to restore this amiibo? - + Czy chcesz odnowić to amiibo? diff --git a/dist/languages/pt_BR.ts b/dist/languages/pt_BR.ts index 0fb30e3fa..18e133b2b 100644 --- a/dist/languages/pt_BR.ts +++ b/dist/languages/pt_BR.ts @@ -247,22 +247,22 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Yes The game starts to output video or audio - + Sim. O jogo começou por vídeo ou áudio. No The game doesn't get past the "Launching..." screen - + Não O Jogo não passou da tela de inicialização "Launching..." Yes The game gets past the intro/menu and into gameplay - + Sim O Jogo passou da tela de menu/introdução e começou o gameplay No The game crashes or freezes while loading or using the menu - + Não O jogo travou e/ou apresentou falhas graves durante o carregamento ou utilizando o menu @@ -934,102 +934,112 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP.Desativar macro JIT - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + + + + + Disable Macro HLE + + + + When checked, yuzu will log statistics about the compiled pipeline cache Quando ativado, o yuzu registrará estatísticas sobre o cache de pipeline compilado - + Enable Shader Feedback Ativar Feedback de Shaders - + When checked, it executes shaders without loop logic changes Quando ativado, executa shaders sem mudanças de lógica de loop - + Disable Loop safety checks Desativar verificação de segurança de loops - + Debugging Depuração - + Enable Verbose Reporting Services** Ativar serviços de relatório detalhado** - + Enable FS Access Log Ativar acesso de registro FS - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** - + Create Minidump After Crash - + Advanced Avançado - + Kiosk (Quest) Mode Modo quiosque (Quest) - + Enable CPU Debugging Ativar depuração de CPU - + Enable Debug Asserts Ativar asserções de depuração - + Enable Auto-Stub** Ativar auto-esboço** - + Enable All Controller Types Ativar todos os tipos de controles - + Disable Web Applet Desativar o applet da web - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Perform Startup Vulkan Check - + **This will be reset automatically when yuzu closes. **Isto será restaurado automaticamente assim que o yuzu for fechado. @@ -1044,12 +1054,12 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Web applet not compiled - + MiniDump creation not compiled @@ -1100,13 +1110,13 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Audio Áudio - + CPU CPU @@ -1122,13 +1132,13 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + General Geral - + Graphics Gráficos @@ -1144,7 +1154,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Controls Controles @@ -1160,7 +1170,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + System Sistema @@ -1423,7 +1433,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + None Nenhum @@ -1534,112 +1544,127 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: Filtro de adaptação de janela: - + Nearest Neighbor Vizinho mais próximo - + Bilinear Bilinear - + Bicubic Bicúbico - + Gaussian Gaussiano - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ Super Resolution (somente Vulkan) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: Método de Anti-Aliasing - + FXAA FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Usar cor de fundo global - + Set background color: Configurar cor de fundo: - + Background Color: Cor de fundo: @@ -1684,76 +1709,96 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - A sincronização vertical (VSync) evita que as imagens do jogo pareçam cortadas, porém algumas placas gráficas apresentam redução de desempenho quando estiver ativa. Deixe-a ativada se você não reparar alguma diferença de desempenho. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + - Use VSync + Force maximum clocks (Vulkan only) + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. + A sincronização vertical (VSync) evita que as imagens do jogo pareçam cortadas, porém algumas placas gráficas apresentam redução de desempenho quando estiver ativa. Deixe-a ativada se você não reparar alguma diferença de desempenho. + + + + Use VSync + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Realiza a compilação de shaders de forma assíncrona, o que pode reduzir engasgos de shaders. Esta opção é experimental. - + Use asynchronous shader building (Hack) Usar compilação assíncrona de shaders (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Ativa um tempo de resposta rápido da GPU. Esta opção forçará a maioria dos jogos a rodar em sua resolução nativa mais alta. - + Use Fast GPU Time (Hack) Usar tempo de resposta rápido da GPU (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Use pessimistic buffer flushes (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + Anisotropic Filtering: Filtragem anisotrópica: - + Automatic Automático - + Default Padrão - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2141,7 +2186,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Configure Configurar @@ -2167,6 +2212,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. + Requires restarting yuzu Requer reiniciar o yuzu @@ -2186,22 +2232,27 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP.Navegação com controle - + + Enable direct JoyCon driver + + + + Enable mouse panning Ativar o giro do mouse - + Mouse sensitivity Sensibilidade do mouse - + % % - + Motion / Touch Movimento/toque @@ -2313,7 +2364,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Left Stick Analógico esquerdo @@ -2407,14 +2458,14 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + L L - + ZL ZL @@ -2433,7 +2484,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Plus Mais @@ -2446,15 +2497,15 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - - + + R R - + ZR ZR @@ -2511,236 +2562,236 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Right Stick Analógico direito - - - - + + + + Clear Limpar - - - - - + + + + + [not set] [não definido] - - + + Invert button Inverter botão - - + + Toggle button Alternar pressionamento do botão - - + + Invert axis Inverter eixo - - - + + + Set threshold Definir limite - - + + Choose a value between 0% and 100% Escolha um valor entre 0% e 100% - + Toggle axis - + Set gyro threshold Definir limite do giroscópio - + Map Analog Stick Mapear analógico - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Após pressionar OK, mova o seu direcional analógico primeiro horizontalmente e depois verticalmente. Para inverter os eixos, mova seu analógico primeiro verticalmente e depois horizontalmente. - + Center axis Eixo central - - + + Deadzone: %1% Zona morta: %1% - - + + Modifier Range: %1% Alcance de modificador: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Par de Joycons - + Left Joycon Joycon Esquerdo - + Right Joycon Joycon Direito - + Handheld Portátil - + GameCube Controller Controle de GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Controle NES - + SNES Controller Controle SNES - + N64 Controller Controle N64 - + Sega Genesis Mega Drive - + Start / Pause Iniciar / Pausar - + Z Z - + Control Stick Direcional de controle - + C-Stick C-Stick - + Shake! Balance! - + [waiting] [esperando] - + New Profile Novo perfil - + Enter a profile name: Insira um nome para o perfil: - - + + Create Input Profile Criar perfil de controle - + The given profile name is not valid! O nome de perfil inserido não é válido! - + Failed to create the input profile "%1" Falha ao criar o perfil de controle "%1" - + Delete Input Profile Excluir perfil de controle - + Failed to delete the input profile "%1" Falha ao excluir o perfil de controle "%1" - + Load Input Profile Carregar perfil de controle - + Failed to load the input profile "%1" Falha ao carregar o perfil de controle "%1" - + Save Input Profile Salvar perfil de controle - + Failed to save the input profile "%1" Falha ao salvar o perfil de controle "%1" @@ -2788,7 +2839,7 @@ Para inverter os eixos, mova seu analógico primeiro verticalmente e depois hori - + Configure Configurar @@ -2824,7 +2875,7 @@ Para inverter os eixos, mova seu analógico primeiro verticalmente e depois hori - + Test Teste @@ -2844,77 +2895,77 @@ Para inverter os eixos, mova seu analógico primeiro verticalmente e depois hori <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Saiba mais</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters O número da porta tem caracteres inválidos - + Port has to be in range 0 and 65353 A porta tem que estar entre 0 e 65353 - + IP address is not valid O endereço IP não é válido - + This UDP server already exists Este servidor UDP já existe - + Unable to add more than 8 servers Não é possível adicionar mais de 8 servidores - + Testing Testando - + Configuring Configurando - + Test Successful Teste bem-sucedido - + Successfully received data from the server. Dados foram recebidos do servidor com sucesso. - + Test Failed O teste falhou - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Não foi possível receber dados válidos do servidor.<br>Verifique se o servidor foi configurado corretamente e o endereço e porta estão corretos. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. Um teste UDP ou configuração de calibração está em curso no momento.<br>Aguarde até a sua conclusão. @@ -3242,8 +3293,8 @@ UUID: %2 - Ring Sensor Parameters - Parâmetros do Sensor de Anel + Virtual Ring Sensor Parameters + @@ -3263,33 +3314,90 @@ UUID: %2 Zona morta: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Restaurar padrões - + Clear Limpar - + [not set] [não definido] - + Invert axis Inverter eixo - - + + Deadzone: %1% Zona morta: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Configurando + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [aguardando] @@ -3594,8 +3702,8 @@ UUID: %2 - English - Inglês (English) + American English + @@ -3728,22 +3836,27 @@ UUID: %2 Regerar - + System settings are available only when game is not running. As configurações de sistema são acessíveis apenas quando não houver nenhum jogo em execução. - + + Warning: "%1" is not a valid language for region "%2" + + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Isto substituirá o seu Switch virtual atual por um novo. O seu Switch virtual atual não poderá ser recuperado. Isto pode causar efeitos inesperados em jogos. Isto pode falhar caso você use um jogo salvo com configurações desatualizadas registradas nele. Continuar? - + Warning Aviso - + Console ID: 0x%1 ID do console: 0x%1 @@ -3814,7 +3927,7 @@ UUID: %2 Configurar TAS - + Select TAS Load Directory... Selecionar diretório de carregamento TAS @@ -4370,7 +4483,7 @@ Mova os pontos para mudar a posição, ou clique duas vezes nas células da tabe Controle J1 - + &Controller P1 &Controle J1 @@ -4383,42 +4496,37 @@ Mova os pontos para mudar a posição, ou clique duas vezes nas células da tabe - - IP Address + + Server Address - - IP + + <html><head/><body><p>Server address of the host</p></body></html> - - <html><head/><body><p>IPv4 address of the host</p></body></html> - - - - + Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> - + Nickname - + Password - + Connect @@ -4426,12 +4534,12 @@ Mova os pontos para mudar a posição, ou clique duas vezes nas células da tabe DirectConnectWindow - + Connecting - + Connect @@ -4502,472 +4610,482 @@ Mova os pontos para mudar a posição, ou clique duas vezes nas células da tabe Tempo que leva para emular um quadro do Switch, sem considerar o limitador de taxa de quadros ou a sincronização vertical. Um valor menor ou igual a 16.67 ms indica que a emulação está em velocidade plena. - + &Clear Recent Files &Limpar arquivos recentes - + &Continue &Continuar - + &Pause &Pausar - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu está rodando um jogo - + Warning Outdated Game Format Aviso - formato de jogo desatualizado - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Você está usando neste jogo o formato de ROM desconstruída e extraída em uma pasta, que é um formato desatualizado que foi substituído por outros, como NCA, NAX, XCI ou NSP. Pastas desconstruídas de ROMs não possuem ícones, metadados e suporte a atualizações.<br><br>Para saber mais sobre os vários formatos de ROMs de Switch compatíveis com o yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>confira a nossa wiki</a>. Esta mensagem não será exibida novamente. - - + + Error while loading ROM! Erro ao carregar a ROM! - + The ROM format is not supported. O formato da ROM não é suportado. - + An error occurred initializing the video core. Ocorreu um erro ao inicializar o núcleo de vídeo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu encontrou um erro enquanto rodando o núcleo de vídeo. Normalmente isto é causado por drivers de GPU desatualizados, incluindo integrados. Por favor veja o registro para mais detalhes. Para mais informações em acesso ao registro por favor veja a seguinte página: <a href='https://yuzu-emu.org/help/reference/log-files/'>Como fazer envio de arquivo de registro</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Erro ao carregar a ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>o guia de início rápido</a> para reextrair os seus arquivos.<br>Você pode consultar a wiki do yuzu</a> ou o Discord do yuzu</a> para obter ajuda. - + An unknown error occurred. Please see the log for more details. Ocorreu um erro desconhecido. Consulte o registro para mais detalhes. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Dados de jogos salvos - + Mod Data Dados de mods - + Error Opening %1 Folder Erro ao abrir a pasta %1 - - + + Folder does not exist! A pasta não existe! - + Error Opening Transferable Shader Cache Erro ao abrir o cache de shaders transferível - + Failed to create the shader cache directory for this title. Falha ao criar o diretório de cache de shaders para este título. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Remover item - - - - - - + + + + + + Successfully Removed Removido com sucesso - + Successfully removed the installed base game. O jogo base foi removido com sucesso. - + The base game is not installed in the NAND and cannot be removed. O jogo base não está instalado na NAND e não pode ser removido. - + Successfully removed the installed update. A atualização instalada foi removida com sucesso. - + There is no update installed for this title. Não há nenhuma atualização instalada para este título. - + There are no DLC installed for this title. Não há nenhum DLC instalado para este título. - + Successfully removed %1 installed DLC. %1 DLC(s) instalados foram removidos com sucesso. - + Delete OpenGL Transferable Shader Cache? Apagar o cache de shaders transferível do OpenGL? - + Delete Vulkan Transferable Shader Cache? Apagar o cache de shaders transferível do Vulkan? - + Delete All Transferable Shader Caches? Apagar todos os caches de shaders transferíveis? - + Remove Custom Game Configuration? Remover configurações customizadas do jogo? - + Remove File Remover arquivo - - + + Error Removing Transferable Shader Cache Erro ao remover cache de shaders transferível - - + + A shader cache for this title does not exist. Não existe um cache de shaders para este título. - + Successfully removed the transferable shader cache. O cache de shaders transferível foi removido com sucesso. - + Failed to remove the transferable shader cache. Falha ao remover o cache de shaders transferível. - - + + Error Removing Vulkan Driver Pipeline Cache + + + + + Failed to remove the driver pipeline cache. + + + + + Error Removing Transferable Shader Caches Erro ao remover os caches de shaders transferíveis - + Successfully removed the transferable shader caches. Os caches de shaders transferíveis foram removidos com sucesso. - + Failed to remove the transferable shader cache directory. Falha ao remover o diretório do cache de shaders transferível. - - + + Error Removing Custom Configuration Erro ao remover as configurações customizadas do jogo. - + A custom configuration for this title does not exist. Não há uma configuração customizada para este título. - + Successfully removed the custom game configuration. As configurações customizadas do jogo foram removidas com sucesso. - + Failed to remove the custom game configuration. Falha ao remover as configurações customizadas do jogo. - - + + RomFS Extraction Failed! Falha ao extrair RomFS! - + There was an error copying the RomFS files or the user cancelled the operation. Houve um erro ao copiar os arquivos RomFS ou o usuário cancelou a operação. - + Full Extração completa - + Skeleton Apenas estrutura - + Select RomFS Dump Mode Selecione o modo de extração do RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Selecione a forma como você gostaria que o RomFS seja extraído.<br>"Extração completa" copiará todos os arquivos para a nova pasta, enquanto que <br>"Apenas estrutura" criará apenas a estrutura de pastas. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Não há espaço suficiente em %1 para extrair o RomFS. Por favor abra espaço ou selecione um diretório diferente em Emulação > Configurar > Sistema > Sistema de arquivos > Extrair raiz - + Extracting RomFS... Extraindo RomFS... - - + + Cancel Cancelar - + RomFS Extraction Succeeded! Extração do RomFS concluida! - + The operation completed successfully. A operação foi concluída com sucesso. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Erro ao abrir %1 - + Select Directory Selecionar pasta - + Properties Propriedades - + The game properties could not be loaded. As propriedades do jogo não puderam ser carregadas. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Executável do Switch (%1);;Todos os arquivos (*.*) - + Load File Carregar arquivo - + Open Extracted ROM Directory Abrir pasta da ROM extraída - + Invalid Directory Selected Pasta inválida selecionada - + The directory you have selected does not contain a 'main' file. A pasta que você selecionou não contém um arquivo 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Arquivo de Switch instalável (*.nca *.nsp *.xci);; Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Instalar arquivos - + %n file(s) remaining %n arquivo restante%n arquivo(s) restante(s)%n arquivo(s) restante(s) - + Installing file "%1"... Instalando arquivo "%1"... - + Install Results Resultados da instalação - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Para evitar possíveis conflitos, desencorajamos que os usuários instalem os jogos base na NAND. Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + %n file(s) were newly installed %n arquivo(s) instalado(s) @@ -4976,7 +5094,7 @@ Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + %n file(s) were overwritten %n arquivo(s) sobrescrito(s) @@ -4985,7 +5103,7 @@ Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + %n file(s) failed to install %n arquivo(s) não instalado(s) @@ -4994,377 +5112,377 @@ Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + System Application Aplicativo do sistema - + System Archive Arquivo do sistema - + System Application Update Atualização de aplicativo do sistema - + Firmware Package (Type A) Pacote de firmware (tipo A) - + Firmware Package (Type B) Pacote de firmware (tipo B) - + Game Jogo - + Game Update Atualização de jogo - + Game DLC DLC de jogo - + Delta Title Título delta - + Select NCA Install Type... Selecione o tipo de instalação do NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Selecione o tipo de título como o qual você gostaria de instalar este NCA: (Na maioria dos casos, o padrão 'Jogo' serve bem.) - + Failed to Install Falha ao instalar - + The title type you selected for the NCA is invalid. O tipo de título que você selecionou para o NCA é inválido. - + File not found Arquivo não encontrado - + File "%1" not found Arquivo "%1" não encontrado - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Conta do yuzu faltando - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Para enviar um caso de teste de compatibilidade de jogo, você precisa entrar com a sua conta do yuzu.<br><br/>Para isso, vá para Emulação &gt; Configurar... &gt; Rede. - + Error opening URL Erro ao abrir URL - + Unable to open the URL "%1". Não foi possível abrir o URL "%1". - + TAS Recording Gravando TAS - + Overwrite file of player 1? Sobrescrever arquivo do jogador 1? - + Invalid config detected Configuração inválida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. O controle portátil não pode ser usado no modo encaixado na base. O Pro Controller será selecionado. - - + + Amiibo Amiibo - - + + The current amiibo has been removed O amiibo atual foi removido - + Error Erro - - + + The current game is not looking for amiibos O jogo atual não está procurando amiibos - + Amiibo File (%1);; All Files (*.*) Arquivo Amiibo (%1);; Todos os arquivos (*.*) - + Load Amiibo Carregar Amiibo - + Error loading Amiibo data Erro ao carregar dados do Amiibo - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Capturar tela - + PNG Image (*.png) Imagem PNG (*.png) - + TAS state: Running %1/%2 Situação TAS: Rodando %1%2 - + TAS state: Recording %1 Situação TAS: Gravando %1 - + TAS state: Idle %1/%2 Situação TAS: Repouso %1%2 - + TAS State: Invalid Situação TAS: Inválido - + &Stop Running &Parar de rodar - + &Start &Iniciar - + Stop R&ecording Parar G&ravação - + R&ecord G&ravação - + Building: %n shader(s) Compilando: %n shader(s)Compilando: %n shader(s)Compilando: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escala: %1x - + Speed: %1% / %2% Velocidade: %1% / %2% - + Speed: %1% Velocidade: %1% - + Game: %1 FPS (Unlocked) Jogo: %1 FPS (Desbloqueado) - + Game: %1 FPS Jogo: %1 FPS - + Frame: %1 ms Quadro: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR ERRO DE GPU - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST VIZINHO - - + + BILINEAR BILINEAR - + BICUBIC BICÚBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA Sem AA - + FXAA FXAA - + SMAA - + Confirm Key Rederivation Confirmar rederivação de chave - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5381,37 +5499,37 @@ e opcionalmente faça cópias de segurança. Isto excluirá o seus arquivos de chaves geradas automaticamente, e reexecutar o módulo de derivação de chaves. - + Missing fuses Faltando fusíveis - + - Missing BOOT0 - Faltando BOOT0 - + - Missing BCPKG2-1-Normal-Main - Faltando BCPKG2-1-Normal-Main - + - Missing PRODINFO - Faltando PRODINFO - + Derivation Components Missing Faltando componentes de derivação - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Chaves de encriptação faltando. <br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>o guia de início rápido</a> para extrair suas chaves, firmware e jogos. <br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5420,39 +5538,39 @@ Isto pode demorar até um minuto, dependendo do desempenho do seu sistema. - + Deriving Keys Derivando chaves - + Select RomFS Dump Target Selecionar alvo de extração do RomFS - + Please select which RomFS you would like to dump. Selecione qual RomFS você quer extrair. - + Are you sure you want to close yuzu? Você deseja mesmo fechar o yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Deseja mesmo parar a emulação? Qualquer progresso não salvo será perdido. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5464,44 +5582,44 @@ Deseja ignorar isso e sair mesmo assim? GRenderWindow - - + + OpenGL not available! OpenGL não disponível! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. O yuzu não foi compilado com suporte para OpenGL. - - + + Error while initializing OpenGL! Erro ao inicializar o OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Sua GPU pode não suportar OpenGL, ou você não possui o driver gráfico mais recente. - + Error while initializing OpenGL 4.6! Erro ao inicializar o OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Sua GPU pode não suportar o OpenGL 4.6, ou você não possui os drivers gráficos mais recentes.<br><br>Renderizador GL:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Sua GPU pode não suportar uma ou mais extensões necessárias do OpenGL. Verifique se você possui a última versão dos drivers gráficos.<br><br>Renderizador GL:<br>%1<br><br>Extensões não suportadas:<br>%2 @@ -6003,7 +6121,7 @@ Debug Message: Instalar - + Install Files to NAND Instalar arquivos para a NAND @@ -6011,7 +6129,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 O texto não pode conter nenhum dos seguintes caracteres: @@ -6664,7 +6782,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE INICIAR/PAUSAR @@ -6713,31 +6831,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [não definido] @@ -6748,14 +6866,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Eixo %1%2 @@ -6766,262 +6884,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [desconhecido] - + - + Left Esquerda - + - + Right Direita - + - + Down Baixo - + - + Up Cima - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Start - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle Círculo - - + + Cross Cruz - - + + Square Quadrado - - + + Triangle Triângulo - - + + Share Compartilhar - - + + Options Opções - - + + [undefined] [indefinido] - + %1%2 %1%2 - - + + [invalid] [inválido] - - - - + + + + %1%2Hat %3 %1%2Direcional %3 - - - - - - + + + + + + %1%2Axis %3 %1%2Eixo %3 - - + + %1%2Axis %3,%4,%5 %1%2Eixo %3,%4,%5 - - + + %1%2Motion %3 %1%2Movimentação %3 - - - - + + + + %1%2Button %3 %1%2Botão %3 - - + + [unused] [não utilizado] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Mais + + + + Minus + Menos + + + + Home Botão Home - + + Capture + Capturar + + + Touch Toque - + Wheel Indicates the mouse wheel Volante - + Backward Para trás - + Forward Para a frente - + Task Tarefa - + Extra Extra - + %1%2%3 %1%2%3 diff --git a/dist/languages/pt_PT.ts b/dist/languages/pt_PT.ts index 4b6c2ec45..df5855573 100644 --- a/dist/languages/pt_PT.ts +++ b/dist/languages/pt_PT.ts @@ -247,22 +247,22 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Yes The game starts to output video or audio - + Sim. O jogo começou por vídeo ou áudio. No The game doesn't get past the "Launching..." screen - + Não. O Jogo não passou da tela de inicialização "Launching..." Yes The game gets past the intro/menu and into gameplay - + Sim O Jogo passou da tela de menu/introdução e começou o gameplay No The game crashes or freezes while loading or using the menu - + Não O jogo travou e/ou apresentou falhas graves durante o carregamento ou utilizando o menu @@ -924,102 +924,112 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP.Desactivar Macro JIT - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + + + + + Disable Macro HLE + + + + When checked, yuzu will log statistics about the compiled pipeline cache Quando ativado, o yuzu registrará estatísticas sobre o cache de pipeline compilado - + Enable Shader Feedback Ativar Feedback de Shaders - + When checked, it executes shaders without loop logic changes Quando ativado, executa shaders sem mudanças de lógica de loop - + Disable Loop safety checks Desativar verificação de segurança de loops - + Debugging Depuração - + Enable Verbose Reporting Services** Ativar serviços de relatório detalhado** - + Enable FS Access Log Ativar acesso de registro FS - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** - + Create Minidump After Crash - + Advanced Avançado - + Kiosk (Quest) Mode Modo Quiosque (Quest) - + Enable CPU Debugging Ativar depuração de CPU - + Enable Debug Asserts Ativar asserções de depuração - + Enable Auto-Stub** Ativar auto-esboço** - + Enable All Controller Types Ativar todos os tipos de controles - + Disable Web Applet Desativar Web Applet - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Perform Startup Vulkan Check - + **This will be reset automatically when yuzu closes. **Isto será restaurado automaticamente assim que o yuzu for fechado. @@ -1034,12 +1044,12 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Web applet not compiled - + MiniDump creation not compiled @@ -1090,13 +1100,13 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Audio Audio - + CPU CPU @@ -1112,13 +1122,13 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + General Geral - + Graphics Gráficos @@ -1134,7 +1144,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Controls Controlos @@ -1150,7 +1160,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + System Sistema @@ -1413,7 +1423,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + None Nenhum @@ -1524,112 +1534,127 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: Filtro de adaptação de janela: - + Nearest Neighbor Vizinho mais próximo - + Bilinear Bilinear - + Bicubic Bicúbico - + Gaussian Gaussiano - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ Super Resolution (somente Vulkan) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: Método de Anti-Aliasing - + FXAA FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Usar cor de fundo global - + Set background color: Definir cor de fundo: - + Background Color: Cor de fundo: @@ -1674,76 +1699,96 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - O Vsync previne cortes na imagem, mas algumas placas gráficas têm performance mais baixa com o Vsync activo. Mantém-no activo se não notares diferença na performance. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + - Use VSync + Force maximum clocks (Vulkan only) + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. + O Vsync previne cortes na imagem, mas algumas placas gráficas têm performance mais baixa com o Vsync activo. Mantém-no activo se não notares diferença na performance. + + + + Use VSync + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Activa a compilação de shader assíncrona, podendo reduzir o engasgue do shader. Esta função é experimental. - + Use asynchronous shader building (Hack) Usar compilação assíncrona de shaders (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Ativa um tempo de resposta rápido da GPU. Esta opção forçará a maioria dos jogos a rodar em sua resolução nativa mais alta. - + Use Fast GPU Time (Hack) Usar tempo de resposta rápido da GPU (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Use pessimistic buffer flushes (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + Anisotropic Filtering: Filtro Anisotrópico: - + Automatic Automático - + Default Padrão - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2131,7 +2176,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Configure Configurar @@ -2157,6 +2202,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. + Requires restarting yuzu Requer reiniciar o yuzu @@ -2176,22 +2222,27 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP.Navegação com controle - + + Enable direct JoyCon driver + + + + Enable mouse panning Ativar o giro do mouse - + Mouse sensitivity Sensibilidade do rato - + % % - + Motion / Touch Movimento / Toque @@ -2303,7 +2354,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Left Stick Analógico Esquerdo @@ -2397,14 +2448,14 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + L L - + ZL ZL @@ -2423,7 +2474,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Plus Mais @@ -2436,15 +2487,15 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - - + + R R - + ZR ZR @@ -2501,236 +2552,236 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Right Stick Analógico Direito - - - - + + + + Clear Limpar - - - - - + + + + + [not set] [não definido] - - + + Invert button Inverter botão - - + + Toggle button Alternar pressionamento do botão - - + + Invert axis Inverter eixo - - - + + + Set threshold Definir limite - - + + Choose a value between 0% and 100% Escolha um valor entre 0% e 100% - + Toggle axis - + Set gyro threshold Definir limite do giroscópio - + Map Analog Stick Mapear analógicos - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Após pressionar OK, mova o seu analógico primeiro horizontalmente e depois verticalmente. Para inverter os eixos, mova o seu analógico primeiro verticalmente e depois horizontalmente. - + Center axis Eixo central - - + + Deadzone: %1% Ponto Morto: %1% - - + + Modifier Range: %1% Modificador de Alcance: %1% - - + + Pro Controller Comando Pro - + Dual Joycons Joycons Duplos - + Left Joycon Joycon Esquerdo - + Right Joycon Joycon Direito - + Handheld Portátil - + GameCube Controller Controlador de depuração - + Poke Ball Plus Poke Ball Plus - + NES Controller Controle NES - + SNES Controller Controle SNES - + N64 Controller Controle N64 - + Sega Genesis Mega Drive - + Start / Pause Iniciar / Pausar - + Z Z - + Control Stick Direcional de controle - + C-Stick C-Stick - + Shake! Abane! - + [waiting] [em espera] - + New Profile Novo Perfil - + Enter a profile name: Introduza um novo nome de perfil: - - + + Create Input Profile Criar perfil de controlo - + The given profile name is not valid! O nome de perfil dado não é válido! - + Failed to create the input profile "%1" Falha ao criar o perfil de controlo "%1" - + Delete Input Profile Apagar Perfil de Controlo - + Failed to delete the input profile "%1" Falha ao apagar o perfil de controlo "%1" - + Load Input Profile Carregar perfil de controlo - + Failed to load the input profile "%1" Falha ao carregar o perfil de controlo "%1" - + Save Input Profile Guardar perfil de controlo - + Failed to save the input profile "%1" Falha ao guardar o perfil de controlo "%1" @@ -2778,7 +2829,7 @@ Para inverter os eixos, mova o seu analógico primeiro verticalmente e depois ho - + Configure Configurar @@ -2814,7 +2865,7 @@ Para inverter os eixos, mova o seu analógico primeiro verticalmente e depois ho - + Test Testar @@ -2834,77 +2885,77 @@ Para inverter os eixos, mova o seu analógico primeiro verticalmente e depois ho <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Saber Mais</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters O número da porta tem caracteres inválidos - + Port has to be in range 0 and 65353 A porta tem que estar entre 0 e 65353 - + IP address is not valid O endereço IP não é válido - + This UDP server already exists Este servidor UDP já existe - + Unable to add more than 8 servers Não é possível adicionar mais de 8 servidores - + Testing Testando - + Configuring Configurando - + Test Successful Teste Bem-Sucedido - + Successfully received data from the server. Dados recebidos do servidor com êxito. - + Test Failed Teste Falhou - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Não foi possível receber dados válidos do servidor.<br>Por favor verifica que o servidor está configurado correctamente e o endereço e porta estão correctos. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. Teste UDP ou configuração de calibragem em progresso.<br> Por favor espera que termine. @@ -3232,8 +3283,8 @@ UUID: %2 - Ring Sensor Parameters - Parâmetros do sensor do anel + Virtual Ring Sensor Parameters + @@ -3253,33 +3304,90 @@ UUID: %2 Ponto Morto: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Restaurar Padrões - + Clear Limpar - + [not set] [não definido] - + Invert axis Inverter eixo - - + + Deadzone: %1% Ponto Morto: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Configurando + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [em espera] @@ -3584,8 +3692,8 @@ UUID: %2 - English - Inglês + American English + @@ -3718,22 +3826,27 @@ UUID: %2 Regenerar - + System settings are available only when game is not running. As configurações do sistema estão disponíveis apenas quando o jogo não está em execução. - + + Warning: "%1" is not a valid language for region "%2" + + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Isto substituirá o seu Switch virtual actual por um novo. Seu Switch virtual actual não será recuperável. Isso pode ter efeitos inesperados nos jogos. Isto pode falhar, se você usar uma gravação de jogo de configuração desatualizado. Continuar? - + Warning Aviso - + Console ID: 0x%1 ID da Consola: 0x%1 @@ -3804,7 +3917,7 @@ UUID: %2 Configurar TAS - + Select TAS Load Directory... Selecionar diretório de carregamento TAS @@ -4360,7 +4473,7 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta Comando J1 - + &Controller P1 &Comando J1 @@ -4373,42 +4486,37 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta - - IP Address + + Server Address - - IP + + <html><head/><body><p>Server address of the host</p></body></html> - - <html><head/><body><p>IPv4 address of the host</p></body></html> - - - - + Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> - + Nickname - + Password - + Connect @@ -4416,12 +4524,12 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta DirectConnectWindow - + Connecting - + Connect @@ -4492,860 +4600,870 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta Tempo gasto para emular um frame da Switch, sem contar o a limitação de quadros ou o v-sync. Para emulação de velocidade máxima, esta deve ser no máximo 16.67 ms. - + &Clear Recent Files &Limpar arquivos recentes - + &Continue &Continuar - + &Pause &Pausa - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu está rodando um jogo - + Warning Outdated Game Format Aviso de Formato de Jogo Desactualizado - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Você está usando o formato de directório ROM desconstruído para este jogo, que é um formato desactualizado que foi substituído por outros, como NCA, NAX, XCI ou NSP. Os directórios de ROM não construídos não possuem ícones, metadados e suporte de actualização.<br><br>Para uma explicação dos vários formatos de Switch que o yuzu suporta,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Verifique a nossa Wiki</a>. Esta mensagem não será mostrada novamente. - - + + Error while loading ROM! Erro ao carregar o ROM! - + The ROM format is not supported. O formato do ROM não é suportado. - + An error occurred initializing the video core. Ocorreu um erro ao inicializar o núcleo do vídeo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu encontrou um erro enquanto rodando o núcleo de vídeo. Normalmente isto é causado por drivers de GPU desatualizados, incluindo integrados. Por favor veja o registro para mais detalhes. Para mais informações em acesso ao registro por favor veja a seguinte página: <a href='https://yuzu-emu.org/help/reference/log-files/'>Como fazer envio de arquivo de registro</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Erro ao carregar a ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>a guia de início rápido do yuzu</a> para fazer o redespejo dos seus arquivos.<br>Você pode consultar a wiki do yuzu</a> ou o Discord do yuzu</a> para obter ajuda. - + An unknown error occurred. Please see the log for more details. Ocorreu um erro desconhecido. Por favor, veja o log para mais detalhes. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Save Data - + Mod Data Mod Data - + Error Opening %1 Folder Erro ao abrir a pasta %1 - - + + Folder does not exist! A Pasta não existe! - + Error Opening Transferable Shader Cache Erro ao abrir os Shader Cache transferíveis - + Failed to create the shader cache directory for this title. Falha ao criar o diretório de cache de shaders para este título. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Remover Entrada - - - - - - + + + + + + Successfully Removed Removido com Sucesso - + Successfully removed the installed base game. Removida a instalação do jogo base com sucesso. - + The base game is not installed in the NAND and cannot be removed. O jogo base não está instalado no NAND e não pode ser removido. - + Successfully removed the installed update. Removida a actualização instalada com sucesso. - + There is no update installed for this title. Não há actualização instalada neste título. - + There are no DLC installed for this title. Não há DLC instalado neste título. - + Successfully removed %1 installed DLC. Removido DLC instalado %1 com sucesso. - + Delete OpenGL Transferable Shader Cache? Apagar o cache de shaders transferível do OpenGL? - + Delete Vulkan Transferable Shader Cache? Apagar o cache de shaders transferível do Vulkan? - + Delete All Transferable Shader Caches? Apagar todos os caches de shaders transferíveis? - + Remove Custom Game Configuration? Remover Configuração Personalizada do Jogo? - + Remove File Remover Ficheiro - - + + Error Removing Transferable Shader Cache Error ao Remover Cache de Shader Transferível - - + + A shader cache for this title does not exist. O Shader Cache para este titulo não existe. - + Successfully removed the transferable shader cache. Removido a Cache de Shader Transferível com Sucesso. - + Failed to remove the transferable shader cache. Falha ao remover a cache de shader transferível. - - + + Error Removing Vulkan Driver Pipeline Cache + + + + + Failed to remove the driver pipeline cache. + + + + + Error Removing Transferable Shader Caches Erro ao remover os caches de shaders transferíveis - + Successfully removed the transferable shader caches. Os caches de shaders transferíveis foram removidos com sucesso. - + Failed to remove the transferable shader cache directory. Falha ao remover o diretório do cache de shaders transferível. - - + + Error Removing Custom Configuration Erro ao Remover Configuração Personalizada - + A custom configuration for this title does not exist. Não existe uma configuração personalizada para este titúlo. - + Successfully removed the custom game configuration. Removida a configuração personalizada do jogo com sucesso. - + Failed to remove the custom game configuration. Falha ao remover a configuração personalizada do jogo. - - + + RomFS Extraction Failed! A Extração de RomFS falhou! - + There was an error copying the RomFS files or the user cancelled the operation. Houve um erro ao copiar os arquivos RomFS ou o usuário cancelou a operação. - + Full Cheio - + Skeleton Esqueleto - + Select RomFS Dump Mode Selecione o modo de despejo do RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Por favor, selecione a forma como você gostaria que o RomFS fosse despejado<br>Full irá copiar todos os arquivos para o novo diretório enquanto<br>skeleton criará apenas a estrutura de diretórios. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Não há espaço suficiente em %1 para extrair o RomFS. Por favor abra espaço ou selecione um diretório diferente em Emulação > Configurar > Sistema > Sistema de arquivos > Extrair raiz - + Extracting RomFS... Extraindo o RomFS ... - - + + Cancel Cancelar - + RomFS Extraction Succeeded! Extração de RomFS Bem-Sucedida! - + The operation completed successfully. A operação foi completa com sucesso. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Erro ao abrir %1 - + Select Directory Selecione o Diretório - + Properties Propriedades - + The game properties could not be loaded. As propriedades do jogo não puderam ser carregadas. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Executáveis Switch (%1);;Todos os Ficheiros (*.*) - + Load File Carregar Ficheiro - + Open Extracted ROM Directory Abrir o directório ROM extraído - + Invalid Directory Selected Diretório inválido selecionado - + The directory you have selected does not contain a 'main' file. O diretório que você selecionou não contém um arquivo 'Main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Ficheiro Switch Instalável (*.nca *.nsp *.xci);;Arquivo de Conteúdo Nintendo (*.nca);;Pacote de Envio Nintendo (*.nsp);;Imagem de Cartucho NX (*.xci) - + Install Files Instalar Ficheiros - + %n file(s) remaining - + Installing file "%1"... Instalando arquivo "%1"... - + Install Results Instalar Resultados - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Para evitar possíveis conflitos, desencorajamos que os utilizadores instalem os jogos base na NAND. Por favor, use esse recurso apenas para instalar atualizações e DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Aplicação do sistema - + System Archive Arquivo do sistema - + System Application Update Atualização do aplicativo do sistema - + Firmware Package (Type A) Pacote de Firmware (Tipo A) - + Firmware Package (Type B) Pacote de Firmware (Tipo B) - + Game Jogo - + Game Update Actualização do Jogo - + Game DLC DLC do Jogo - + Delta Title Título Delta - + Select NCA Install Type... Selecione o tipo de instalação do NCA ... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Por favor, selecione o tipo de título que você gostaria de instalar este NCA como: (Na maioria dos casos, o padrão 'Jogo' é suficiente). - + Failed to Install Falha na instalação - + The title type you selected for the NCA is invalid. O tipo de título que você selecionou para o NCA é inválido. - + File not found Arquivo não encontrado - + File "%1" not found Arquivo "%1" não encontrado - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Conta Yuzu Ausente - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Para enviar um caso de teste de compatibilidade de jogos, você deve vincular sua conta yuzu.<br><br/>Para vincular sua conta yuzu, vá para Emulação &gt; Configuração &gt; Rede. - + Error opening URL Erro ao abrir URL - + Unable to open the URL "%1". Não foi possível abrir o URL "%1". - + TAS Recording Gravando TAS - + Overwrite file of player 1? Sobrescrever arquivo do jogador 1? - + Invalid config detected Configação inválida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. O comando portátil não pode ser usado no modo encaixado na base. O Pro controller será selecionado. - - + + Amiibo Amiibo - - + + The current amiibo has been removed O amiibo atual foi removido - + Error Erro - - + + The current game is not looking for amiibos O jogo atual não está procurando amiibos - + Amiibo File (%1);; All Files (*.*) Arquivo Amiibo (%1);; Todos os Arquivos (*.*) - + Load Amiibo Carregar Amiibo - + Error loading Amiibo data Erro ao carregar dados do Amiibo - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Captura de Tela - + PNG Image (*.png) Imagem PNG (*.png) - + TAS state: Running %1/%2 Situação TAS: Rodando %1%2 - + TAS state: Recording %1 Situação TAS: Gravando %1 - + TAS state: Idle %1/%2 Situação TAS: Repouso %1%2 - + TAS State: Invalid Situação TAS: Inválido - + &Stop Running &Parar de rodar - + &Start &Começar - + Stop R&ecording Parar G&ravação - + R&ecord G&ravação - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escala: %1x - + Speed: %1% / %2% Velocidade: %1% / %2% - + Speed: %1% Velocidade: %1% - + Game: %1 FPS (Unlocked) Jogo: %1 FPS (Desbloqueado) - + Game: %1 FPS Jogo: %1 FPS - + Frame: %1 ms Quadro: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR ERRO DE GPU - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST VIZINHO - - + + BILINEAR BILINEAR - + BICUBIC BICÚBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA Sem AA - + FXAA FXAA - + SMAA - + Confirm Key Rederivation Confirme a rederivação da chave - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5362,37 +5480,37 @@ e opcionalmente faça backups. Isso irá excluir os seus arquivos de chave gerados automaticamente e executará novamente o módulo de derivação de chave. - + Missing fuses Fusíveis em Falta - + - Missing BOOT0 - BOOT0 em Falta - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main em Falta - + - Missing PRODINFO - PRODINFO em Falta - + Derivation Components Missing Componentes de Derivação em Falta - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Chaves de encriptação faltando. <br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>o guia de início rápido</a> para extrair suas chaves, firmware e jogos. <br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5401,39 +5519,39 @@ Isto pode demorar até um minuto, dependendo do desempenho do seu sistema. - + Deriving Keys Derivando Chaves - + Select RomFS Dump Target Selecione o destino de despejo do RomFS - + Please select which RomFS you would like to dump. Por favor, selecione qual o RomFS que você gostaria de despejar. - + Are you sure you want to close yuzu? Tem a certeza que quer fechar o yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Tem a certeza de que quer parar a emulação? Qualquer progresso não salvo será perdido. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5445,44 +5563,44 @@ Deseja ignorar isso e sair mesmo assim? GRenderWindow - - + + OpenGL not available! OpenGL não está disponível! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu não foi compilado com suporte OpenGL. - - + + Error while initializing OpenGL! Erro ao inicializar OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. O seu GPU pode não suportar OpenGL, ou não tem os drivers gráficos mais recentes. - + Error while initializing OpenGL 4.6! Erro ao inicializar o OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 O teu GPU pode não suportar OpenGL 4.6, ou não tem os drivers gráficos mais recentes. - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Sua GPU pode não suportar uma ou mais extensões necessárias do OpenGL. Verifique se você possui a última versão dos drivers gráficos.<br><br>Renderizador GL:<br>%1<br><br>Extensões não suportadas:<br>%2 @@ -5984,7 +6102,7 @@ Debug Message: Instalar - + Install Files to NAND Instalar Ficheiros no NAND @@ -5992,7 +6110,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 O texto não pode conter nenhum dos seguintes caracteres: @@ -6645,7 +6763,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE INICIAR/PAUSAR @@ -6694,31 +6812,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [não configurado] @@ -6729,14 +6847,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Eixo %1%2 @@ -6747,262 +6865,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [Desconhecido] - + - + Left Esquerda - + - + Right Direita - + - + Down Baixo - + - + Up Cima - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Começar - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle Círculo - - + + Cross Cruz - - + + Square Quadrado - - + + Triangle Triângulo - - + + Share Compartilhar - - + + Options Opções - - + + [undefined] [indefinido] - + %1%2 %1%2 - - + + [invalid] [inválido] - - - - + + + + %1%2Hat %3 %1%2Direcional %3 - - - - - - + + + + + + %1%2Axis %3 %1%2Eixo %3 - - + + %1%2Axis %3,%4,%5 %1%2Eixo %3,%4,%5 - - + + %1%2Motion %3 %1%2Movimentação %3 - - - - + + + + %1%2Button %3 %1%2Botão %3 - - + + [unused] [sem uso] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Mais + + + + Minus + Menos + + + + Home Home - + + Capture + Capturar + + + Touch Toque - + Wheel Indicates the mouse wheel Volante - + Backward Para trás - + Forward Para a frente - + Task Tarefa - + Extra Extra - + %1%2%3 %1%2%3 diff --git a/dist/languages/ru_RU.ts b/dist/languages/ru_RU.ts index 801532b20..1f38b5a3d 100644 --- a/dist/languages/ru_RU.ts +++ b/dist/languages/ru_RU.ts @@ -891,105 +891,115 @@ This would ban both their forum username and their IP address. Disable Macro JIT - Отключить Макрос JIT - - - - When checked, yuzu will log statistics about the compiled pipeline cache - Если включено, yuzu будет записывать статистику о скомпилированном кэше конвейера + Отключить Macro JIT - Enable Shader Feedback - Включить обратную связь о шейдерах + When checked, it disables the macro HLE functions. Enabling this makes games run slower + - - When checked, it executes shaders without loop logic changes + + Disable Macro HLE + When checked, yuzu will log statistics about the compiled pipeline cache + Если включено, yuzu будет записывать статистику о скомпилированном кэше конвейера + + + + Enable Shader Feedback + Включить обратную связь о шейдерах + + + + When checked, it executes shaders without loop logic changes + + + + Disable Loop safety checks - + Debugging Отладка - + Enable Verbose Reporting Services** - + Enable FS Access Log - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** - + Create Minidump After Crash - + Создавать мини-дамп после краша - + Advanced Расширенные - + Kiosk (Quest) Mode Режим киоска (Квест) - + Enable CPU Debugging Включить отладку ЦП - + Enable Debug Asserts - + Включить отладочные утверждения - + Enable Auto-Stub** - + Enable All Controller Types Включить все типы контроллеров - + Disable Web Applet Отключить веб-апплет - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. Позволяет yuzu проверять наличие рабочей среды Vulkan при запуске программы. Отключите эту опцию, если это вызывает проблемы с тем, что внешние программы видят yuzu. - + Perform Startup Vulkan Check Выполнять проверку Vulkan при запуске - + **This will be reset automatically when yuzu closes. **Это будет автоматически сброшено после закрытия yuzu. @@ -1004,14 +1014,14 @@ This would ban both their forum username and their IP address. yuzu необходимо перезапустить, чтобы применить эту настройку. - + Web applet not compiled Веб-апплет не скомпилирован - + MiniDump creation not compiled - + Создание мини-дампа не скомпилировано @@ -1060,13 +1070,13 @@ This would ban both their forum username and their IP address. - + Audio Звук - + CPU ЦП @@ -1082,13 +1092,13 @@ This would ban both their forum username and their IP address. - + General Общие - + Graphics Графика @@ -1104,7 +1114,7 @@ This would ban both their forum username and their IP address. - + Controls Управление @@ -1120,7 +1130,7 @@ This would ban both their forum username and their IP address. - + System Система @@ -1383,7 +1393,7 @@ This would ban both their forum username and their IP address. - + None Выкл. @@ -1494,112 +1504,127 @@ This would ban both their forum username and their IP address. + 1.5X (1080p/1620p) [EXPERIMENTAL] + 1.5X (1080p/1620p) [ЭКСПЕРИМЕНТАЛЬНО] + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + 7X (5040p/7560p) + + + + 8X (5760p/8640p) + 8X (5760p/8640p) + + + Window Adapting Filter: Фильтр адаптации окна: - + Nearest Neighbor Ближайший сосед - + Bilinear Билинейный - + Bicubic Бикубический - + Gaussian Гаусс - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ Super Resolution (Только для Vulkan) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: Метод сглаживания: - + FXAA FXAA - + SMAA - + SMAA - + Use global FSR Sharpness Использовать глобальную резкость FSR - + Set FSR Sharpness Установить резкость FSR - + FSR Sharpness: Резкость FSR: - + 100% 100% - - + + Use global background color Использовать общий фоновый цвет - + Set background color: Установить фоновый цвет: - + Background Color: Фоновый цвет: @@ -1611,7 +1636,7 @@ This would ban both their forum username and their IP address. SPIR-V (Experimental, Mesa Only) - + SPIR-V (Экспериментально, только для Mesa) @@ -1644,76 +1669,96 @@ This would ban both their forum username and their IP address. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + Выполняет работу в фоновом режиме в ожидании графических команд, не позволяя ГП снижать тактовую частоту. + + + + Force maximum clocks (Vulkan only) + Принудительно заставить максимальную тактовую частоту (только для Vulkan) + + + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. Вертикальная синхронизация предотвращает разрывы экрана, но некоторые видеокарты имеют более низкую производительность при вертикальной синхронизации. Оставляйте включенным если вы не замечаете разницы в производительности. - + Use VSync Использовать вертикальную синхронизацию - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Включает асинхронную компиляцию шейдеров, что уменьшит зависания из-за шейдеров. Функция является экспериментальной. - + Use asynchronous shader building (Hack) Использовать асинхронное построение шейдеров (Хак) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Включает функцию Fast GPU Time. Этот параметр заставит большинство игр работать в максимальном родном разрешении. - + Use Fast GPU Time (Hack) Включить Fast GPU Time (Хак) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. Включает пессимистическую очистку буферов. Эта опция заставляет промывать немодифицированные буферы, что может снизить производительность. - + Use pessimistic buffer flushes (Hack) Использовать пессимистическую очистку буферов (Хак) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + Включает кэш конвейера, специфичный для производителя ГП. Эта опция может значительно улучшить время загрузки шейдеров в тех случаях, когда драйвер Vulkan не хранит внутренние файлы кэша конвейера. + + + + Use Vulkan pipeline cache + Использовать конвейерный кэш Vulkan + + + Anisotropic Filtering: Анизотропная фильтрация: - + Automatic Автоматически - + Default Стандартная - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2101,7 +2146,7 @@ This would ban both their forum username and their IP address. - + Configure Настроить @@ -2127,6 +2172,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu Требует перезапуск yuzu @@ -2146,22 +2192,27 @@ This would ban both their forum username and their IP address. Навигация контроллера - + + Enable direct JoyCon driver + + + + Enable mouse panning Включить панорамирование мыши - + Mouse sensitivity Чувствительность мыши - + % % - + Motion / Touch Движение и сенсор @@ -2181,57 +2232,57 @@ This would ban both their forum username and their IP address. Input Profiles - + Профили управления Player 1 Profile - + Профиль игрока 1 Player 2 Profile - + Профиль игрока 2 Player 3 Profile - + Профиль игрока 3 Player 4 Profile - + Профиль игрока 4 Player 5 Profile - + Профиль игрока 5 Player 6 Profile - + Профиль игрока 6 Player 7 Profile - + Профиль игрока 7 Player 8 Profile - + Профиль игрока 8 Use global input configuration - + Использовать глобальную настройку управления Player %1 profile - + Профиль игрока %1 @@ -2273,7 +2324,7 @@ This would ban both their forum username and their IP address. - + Left Stick Левый мини-джойстик @@ -2367,14 +2418,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2393,7 +2444,7 @@ This would ban both their forum username and their IP address. - + Plus Плюс @@ -2406,15 +2457,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2471,236 +2522,236 @@ This would ban both their forum username and their IP address. - + Right Stick Правый мини-джойстик - - - - + + + + Clear Очистить - - - - - + + + + + [not set] [не задано] - - + + Invert button Инвертировать кнопку - - + + Toggle button Переключить кнопку - - + + Invert axis Инвертировать оси - - - + + + Set threshold Установить порог - - + + Choose a value between 0% and 100% Выберите значение между 0% и 100% - + Toggle axis Переключить оси - + Set gyro threshold Установить порог гироскопа - + Map Analog Stick Задать аналоговый мини-джойстик - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. После нажатия на ОК, двигайте ваш мини-джойстик горизонтально, а затем вертикально. Чтобы инвертировать оси, сначала двигайте ваш мини-джойстик вертикально, а затем горизонтально. - + Center axis Центрировать оси - - + + Deadzone: %1% Мёртвая зона: %1% - - + + Modifier Range: %1% Диапазон модификатора: %1% - - + + Pro Controller Контроллер Pro - + Dual Joycons Двойные Joy-Con'ы - + Left Joycon Левый Joy-Сon - + Right Joycon Правый Joy-Сon - + Handheld Портативный - + GameCube Controller Контроллер GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Контроллер NES - + SNES Controller Контроллер SNES - + N64 Controller Контроллер N64 - + Sega Genesis Sega Genesis - + Start / Pause Старт / Пауза - + Z Z - + Control Stick Мини-джойстик управления - + C-Stick C-Джойстик - + Shake! Встряхните! - + [waiting] [ожидание] - + New Profile Новый профиль - + Enter a profile name: Введите имя профиля: - - + + Create Input Profile Создать профиль управления - + The given profile name is not valid! Заданное имя профиля недействительно! - + Failed to create the input profile "%1" Не удалось создать профиль управления "%1" - + Delete Input Profile Удалить профиль управления - + Failed to delete the input profile "%1" Не удалось удалить профиль управления "%1" - + Load Input Profile Загрузить профиль управления - + Failed to load the input profile "%1" Не удалось загрузить профиль управления "%1" - + Save Input Profile Сохранить профиль управления - + Failed to save the input profile "%1" Не удалось сохранить профиль управления "%1" @@ -2748,7 +2799,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Configure Настроить @@ -2784,7 +2835,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Test Тест @@ -2804,77 +2855,77 @@ To invert the axes, first move your joystick vertically, and then horizontally.< <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Узнать больше</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters Номер порта содержит недопустимые символы - + Port has to be in range 0 and 65353 Порт должен быть в районе от 0 до 65353 - + IP address is not valid IP-адрес недействителен - + This UDP server already exists Этот UDP сервер уже существует - + Unable to add more than 8 servers Невозможно добавить более 8 серверов - + Testing Тестирование - + Configuring Настройка - + Test Successful Тест успешен - + Successfully received data from the server. Успешно получена информация с сервера - + Test Failed Тест провален - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Не удалось получить действительные данные с сервера.<br>Убедитесь, что сервер правильно настроен, а также проверьте адрес и порт. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. Тест UDP или калибрация в процессе.<br>Пожалуйста, подождите завершения. @@ -2992,7 +3043,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< Input Profiles - + Профили управления @@ -3203,8 +3254,8 @@ UUID: %2 - Ring Sensor Parameters - Параметры сенсора Ring + Virtual Ring Sensor Parameters + @@ -3224,33 +3275,90 @@ UUID: %2 Мёртвая зона: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults По умолчанию - + Clear Очистить - + [not set] [не задано] - + Invert axis Инвертировать оси - - + + Deadzone: %1% Мёртвая зона: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Настройка + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [ожидание] @@ -3555,8 +3663,8 @@ UUID: %2 - English - Английский (English) + American English + Американский Английский @@ -3656,7 +3764,7 @@ UUID: %2 Device Name - + Название устройства @@ -3689,22 +3797,27 @@ UUID: %2 Перегенерировать - + System settings are available only when game is not running. Настройки системы доступны только тогда, когда игра не запущена. - + + Warning: "%1" is not a valid language for region "%2" + Внимание: язык "%1" не подходит для региона "%2" + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Это заменит ваш текущий виртуальный Switch новым. Ваш текущий виртуальный Switch будет безвозвратно потерян. Это может иметь неожиданные последствия в играх. Может не сработать, если вы используете устаревшую конфигурацию сохраненных игр. Продолжить? - + Warning Внимание - + Console ID: 0x%1 ID консоли: 0x%1 @@ -3775,7 +3888,7 @@ UUID: %2 Настройка TAS - + Select TAS Load Directory... Выбрать папку загрузки TAS... @@ -4331,7 +4444,7 @@ Drag points to change position, or double-click table cells to edit values.Контроллер P1 - + &Controller P1 [&C] Контроллер P1 @@ -4344,42 +4457,37 @@ Drag points to change position, or double-click table cells to edit values.Прямое подключение - - IP Address - IP-адрес + + Server Address + - - IP - IP + + <html><head/><body><p>Server address of the host</p></body></html> + - - <html><head/><body><p>IPv4 address of the host</p></body></html> - <html><head/><body><p>IPv4-адрес хоста</p></body></html> - - - + Port Порт - + <html><head/><body><p>Port number the host is listening on</p></body></html> <html><head/><body><p>Номер порта, который прослушивается хостом</p></body></html> - + Nickname Псевдоним - + Password Пароль - + Connect Подключиться @@ -4387,12 +4495,12 @@ Drag points to change position, or double-click table cells to edit values. DirectConnectWindow - + Connecting Подключение - + Connect Подключиться @@ -4463,472 +4571,482 @@ Drag points to change position, or double-click table cells to edit values.Время, которое нужно для эмуляции 1 кадра Switch, не принимая во внимание ограничение FPS или вертикальную синхронизацию. Для эмуляции в полной скорости значение должно быть не больше 16,67 мс. - + &Clear Recent Files [&C] Очистить недавние файлы - + &Continue [&C] Продолжить - + &Pause [&P] Пауза - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping В yuzu запущена игра - + Warning Outdated Game Format Предупреждение устаревший формат игры - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Для этой игры вы используете разархивированный формат ROM'а, который является устаревшим и был заменен другими, такими как NCA, NAX, XCI или NSP. В разархивированных каталогах ROM'а отсутствуют иконки, метаданные и поддержка обновлений. <br><br>Для получения информации о различных форматах Switch, поддерживаемых yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>просмотрите нашу вики</a>. Это сообщение больше не будет отображаться. - - + + Error while loading ROM! Ошибка при загрузке ROM'а! - + The ROM format is not supported. Формат ROM'а не поддерживается. - + An error occurred initializing the video core. Произошла ошибка при инициализации видеоядра. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu столкнулся с ошибкой при запуске видеоядра. Обычно это вызвано устаревшими драйверами ГП, включая интегрированные. Проверьте журнал для получения более подробной информации. Дополнительную информацию о доступе к журналу смотрите на следующей странице: <a href='https://yuzu-emu.org/help/reference/log-files/'>Как загрузить файл журнала</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Ошибка при загрузке ROM'а! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Пожалуйста, следуйте <a href='https://yuzu-emu.org/help/quickstart/'>краткому руководству пользователя yuzu</a> чтобы пере-дампить ваши файлы<br>Вы можете обратиться к вики yuzu</a> или Discord yuzu</a> для помощи. - + An unknown error occurred. Please see the log for more details. Произошла неизвестная ошибка. Пожалуйста, проверьте журнал для подробностей. - + (64-bit) (64-х битный) - + (32-bit) (32-х битный) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Закрываем программу... - + Save Data Сохранения - + Mod Data Данные модов - + Error Opening %1 Folder Ошибка при открытии папки %1 - - + + Folder does not exist! Папка не существует! - + Error Opening Transferable Shader Cache Ошибка при открытии переносного кэша шейдеров - + Failed to create the shader cache directory for this title. Не удалось создать папку кэша шейдеров для этой игры. - + Error Removing Contents Ошибка при удалении содержимого - + Error Removing Update Ошибка при удалении обновлений - + Error Removing DLC Ошибка при удалении DLC - + Remove Installed Game Contents? Удалить установленное содержимое игр? - + Remove Installed Game Update? Удалить установленные обновления игры? - + Remove Installed Game DLC? Удалить установленные DLC игры? - + Remove Entry Удалить запись - - - - - - + + + + + + Successfully Removed Успешно удалено - + Successfully removed the installed base game. Установленная игра успешно удалена. - + The base game is not installed in the NAND and cannot be removed. Игра не установлена в NAND и не может быть удалена. - + Successfully removed the installed update. Установленное обновление успешно удалено. - + There is no update installed for this title. Для этой игры не было установлено обновление. - + There are no DLC installed for this title. Для этой игры не были установлены DLC. - + Successfully removed %1 installed DLC. Установленное DLC %1 было успешно удалено - + Delete OpenGL Transferable Shader Cache? Удалить переносной кэш шейдеров OpenGL? - + Delete Vulkan Transferable Shader Cache? Удалить переносной кэш шейдеров Vulkan? - + Delete All Transferable Shader Caches? Удалить весь переносной кэш шейдеров? - + Remove Custom Game Configuration? Удалить пользовательскую настройку игры? - + Remove File Удалить файл - - + + Error Removing Transferable Shader Cache Ошибка при удалении переносного кэша шейдеров - - + + A shader cache for this title does not exist. Кэш шейдеров для этой игры не существует. - + Successfully removed the transferable shader cache. Переносной кэш шейдеров успешно удалён. - + Failed to remove the transferable shader cache. Не удалось удалить переносной кэш шейдеров. - - + + Error Removing Vulkan Driver Pipeline Cache + Ошибка при удалении конвейерного кэша Vulkan + + + + Failed to remove the driver pipeline cache. + Не удалось удалить конвейерный кэш шейдеров. + + + + Error Removing Transferable Shader Caches Ошибка при удалении переносного кэша шейдеров - + Successfully removed the transferable shader caches. Переносной кэш шейдеров успешно удален. - + Failed to remove the transferable shader cache directory. Ошибка при удалении папки переносного кэша шейдеров. - - + + Error Removing Custom Configuration Ошибка при удалении пользовательской настройки - + A custom configuration for this title does not exist. Пользовательская настройка для этой игры не существует. - + Successfully removed the custom game configuration. Пользовательская настройка игры успешно удалена. - + Failed to remove the custom game configuration. Не удалось удалить пользовательскую настройку игры. - - + + RomFS Extraction Failed! Не удалось извлечь RomFS! - + There was an error copying the RomFS files or the user cancelled the operation. Произошла ошибка при копировании файлов RomFS или пользователь отменил операцию. - + Full Полный - + Skeleton Скелет - + Select RomFS Dump Mode Выберите режим дампа RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Пожалуйста, выберите, как вы хотите выполнить дамп RomFS. <br>Полный скопирует все файлы в новую папку, в то время как <br>скелет создаст только структуру папок. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root В %1 недостаточно свободного места для извлечения RomFS. Пожалуйста, освободите место или выберите другую папку для дампа в Эмуляция > Настройка > Система > Файловая система > Корень дампа - + Extracting RomFS... Извлечение RomFS... - - + + Cancel Отмена - + RomFS Extraction Succeeded! Извлечение RomFS прошло успешно! - + The operation completed successfully. Операция выполнена. - - - - - + + + + + Create Shortcut - + Создать ярлык - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Это создаст ярлык для текущего AppImage. Он может не работать после обновлений. Продолжить? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Не удается создать ярлык на рабочем столе. Путь "%1" не существует. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Невозможно создать ярлык в меню приложений. Путь "%1" не существует и не может быть создан. - + Create Icon - + Создать иконку - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Невозможно создать файл иконки. Путь "%1" не существует и не может быть создан. - + Start %1 with the yuzu Emulator - + Запустить %1 с помощью эмулятора yuzu - + Failed to create a shortcut at %1 - + Не удалось создать ярлык в %1 - + Successfully created a shortcut to %1 - + Успешно создан ярлык в %1 - + Error Opening %1 Ошибка открытия %1 - + Select Directory Выбрать папку - + Properties Свойства - + The game properties could not be loaded. Не удалось загрузить свойства игры. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Исполняемый файл Switch (%1);;Все файлы (*.*) - + Load File Загрузить файл - + Open Extracted ROM Directory Открыть папку извлечённого ROM'а - + Invalid Directory Selected Выбрана недопустимая папка - + The directory you have selected does not contain a 'main' file. Папка, которую вы выбрали, не содержит файла 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Устанавливаемый файл Switch (*.nca, *.nsp, *.xci);;Архив контента Nintendo (*.nca);;Пакет подачи Nintendo (*.nsp);;Образ картриджа NX (*.xci) - + Install Files Установить файлы - + %n file(s) remaining Остался %n файлОсталось %n файл(ов)Осталось %n файл(ов)Осталось %n файл(ов) - + Installing file "%1"... Установка файла "%1"... - + Install Results Результаты установки - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Чтобы избежать возможных конфликтов, мы не рекомендуем пользователям устанавливать игры в NAND. Пожалуйста, используйте эту функцию только для установки обновлений и DLC. - + %n file(s) were newly installed %n файл был недавно установлен @@ -4938,7 +5056,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) were overwritten %n файл был перезаписан @@ -4948,7 +5066,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) failed to install %n файл не удалось установить @@ -4958,377 +5076,377 @@ Please, only use this feature to install updates and DLC. - + System Application Системное приложение - + System Archive Системный архив - + System Application Update Обновление системного приложения - + Firmware Package (Type A) Пакет прошивки (Тип А) - + Firmware Package (Type B) Пакет прошивки (Тип Б) - + Game Игра - + Game Update Обновление игры - + Game DLC DLC игры - + Delta Title Дельта-титул - + Select NCA Install Type... Выберите тип установки NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Пожалуйста, выберите тип приложения, который вы хотите установить для этого NCA: (В большинстве случаев, подходит стандартный выбор «Игра».) - + Failed to Install Ошибка установки - + The title type you selected for the NCA is invalid. Тип приложения, который вы выбрали для NCA, недействителен. - + File not found Файл не найден - + File "%1" not found Файл "%1" не найден - + OK ОК - - + + Hardware requirements not met Не удовлетворены системные требования - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Ваша система не соответствует рекомендуемым системным требованиям. Отчеты о совместимости были отключены. - + Missing yuzu Account Отсутствует аккаунт yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Чтобы отправить отчет о совместимости игры, необходимо привязать свою учетную запись yuzu.<br><br/>Чтобы привязать свою учетную запись yuzu, перейдите в раздел Эмуляция &gt; Параметры &gt; Сеть. - + Error opening URL Ошибка при открытии URL - + Unable to open the URL "%1". Не удалось открыть URL: "%1". - + TAS Recording Запись TAS - + Overwrite file of player 1? Перезаписать файл игрока 1? - + Invalid config detected Обнаружена недопустимая конфигурация - + Handheld controller can't be used on docked mode. Pro controller will be selected. Портативный контроллер не может быть использован в режиме док-станции. Будет выбран контроллер Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Текущий amiibo был убран - + Error Ошибка - - + + The current game is not looking for amiibos Текущая игра не ищет amiibo - + Amiibo File (%1);; All Files (*.*) Файл Amiibo (%1);; Все Файлы (*.*) - + Load Amiibo Загрузить Amiibo - + Error loading Amiibo data Ошибка загрузки данных Amiibo - + The selected file is not a valid amiibo Выбранный файл не является допустимым amiibo - + The selected file is already on use Выбранный файл уже используется - + An unknown error occurred Произошла неизвестная ошибка - + Capture Screenshot Сделать скриншот - + PNG Image (*.png) Изображение PNG (*.png) - + TAS state: Running %1/%2 Состояние TAS: Выполняется %1/%2 - + TAS state: Recording %1 Состояние TAS: Записывается %1 - + TAS state: Idle %1/%2 Состояние TAS: Простой %1/%2 - + TAS State: Invalid Состояние TAS: Неверное - + &Stop Running [&S] Остановка - + &Start [&S] Начать - + Stop R&ecording [&E] Закончить запись - + R&ecord [&E] Запись - + Building: %n shader(s) Постройка: %n шейдерПостройка: %n шейдер(ов)Постройка: %n шейдер(ов)Постройка: %n шейдер(ов) - + Scale: %1x %1 is the resolution scaling factor Масштаб: %1x - + Speed: %1% / %2% Скорость: %1% / %2% - + Speed: %1% Скорость: %1% - + Game: %1 FPS (Unlocked) Игра: %1 FPS (Неограниченно) - + Game: %1 FPS Игра: %1 FPS - + Frame: %1 ms Кадр: %1 мс - + GPU NORMAL ГП НОРМАЛЬНО - + GPU HIGH ГП ВЫСОКО - + GPU EXTREME ГП ЭКСТРИМ - + GPU ERROR ГП ОШИБКА - + DOCKED В ДОК-СТАНЦИИ - + HANDHELD ПОРТАТИВНЫЙ - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NULL - + NEAREST БЛИЖАЙШИЙ - - + + BILINEAR БИЛИНЕЙНЫЙ - + BICUBIC БИКУБИЧЕСКИЙ - + GAUSSIAN ГАУСС - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA БЕЗ СГЛАЖИВАНИЯ - + FXAA FXAA - + SMAA - + SMAA - + Confirm Key Rederivation Подтвердите перерасчет ключа - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5339,43 +5457,43 @@ This will delete your autogenerated key files and re-run the key derivation modu Вы собираетесь принудительно пересчитать все ваши ключи. Если вы не знаете, что это значит или что вы делаете, это потенциально разрушительное действие. -Пожалуйста, убедитесь, что это то, что вы хотите +Пожалуйста, убедитесь, что это то, что вы хотите сделать и при желании сделайте резервные копии. Это удалит ваши автоматически сгенерированные файлы ключей и повторно запустит модуль расчета ключей. - + Missing fuses Отсутствуют предохранители - + - Missing BOOT0 - Отсутствует BOOT0 - + - Missing BCPKG2-1-Normal-Main - Отсутствует BCPKG2-1-Normal-Main - + - Missing PRODINFO - Отсутствует PRODINFO - + Derivation Components Missing Компоненты расчета отсутствуют - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Ключи шифрования отсутствуют. <br>Пожалуйста, следуйте <a href='https://yuzu-emu.org/help/quickstart/'>краткому руководству пользователя yuzu</a>, чтобы получить все ваши ключи, прошивку и игры.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5384,39 +5502,39 @@ on your system's performance. от производительности вашей системы. - + Deriving Keys Получение ключей - + Select RomFS Dump Target Выберите цель для дампа RomFS - + Please select which RomFS you would like to dump. Пожалуйста, выберите, какой RomFS вы хотите сдампить. - + Are you sure you want to close yuzu? Вы уверены, что хотите закрыть yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Вы уверены, что хотите остановить эмуляцию? Любой несохраненный прогресс будет потерян. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5428,44 +5546,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGL не доступен! - + OpenGL shared contexts are not supported. - + Общие контексты OpenGL не поддерживаются. - + yuzu has not been compiled with OpenGL support. yuzu не был скомпилирован с поддержкой OpenGL. - - + + Error while initializing OpenGL! Ошибка при инициализации OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Ваш ГП может не поддерживать OpenGL, или у вас установлен устаревший графический драйвер. - + Error while initializing OpenGL 4.6! Ошибка при инициализации OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Ваш ГП может не поддерживать OpenGL 4.6, или у вас установлен устаревший графический драйвер.<br><br>Рендерер GL:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Ваш ГП может не поддерживать одно или несколько требуемых расширений OpenGL. Пожалуйста, убедитесь в том, что у вас установлен последний графический драйвер.<br><br>Рендерер GL:<br>%1<br><br>Неподдерживаемые расширения:<br>%2 @@ -5566,17 +5684,17 @@ Would you like to bypass this and exit anyway? Create Shortcut - + Создать ярлык Add to Desktop - + Добавить на Рабочий стол Add to Applications Menu - + Добавить в меню приложений @@ -5968,7 +6086,7 @@ Debug Message: Установить - + Install Files to NAND Установить файлы в NAND @@ -5976,7 +6094,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 В тексте недопустимы следующие символы: @@ -6633,7 +6751,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE СТАРТ/ПАУЗА @@ -6682,31 +6800,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [не задано] @@ -6717,14 +6835,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Ось %1%2 @@ -6735,262 +6853,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [неизвестно] - + - + Left Влево - + - + Right Вправо - + - + Down Вниз - + - + Up Вверх - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Start - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle Круг - - + + Cross Крестик - - + + Square Квадрат - - + + Triangle Треугольник - - + + Share Share - - + + Options Options - - + + [undefined] [не определено] - + %1%2 %1%2 - - + + [invalid] [недопустимо] - - - - + + + + %1%2Hat %3 %1%2Крест. %3 - - - - - - + + + + + + %1%2Axis %3 %1%2Ось %3 - - + + %1%2Axis %3,%4,%5 %1%2Ось %3,%4,%5 - - + + %1%2Motion %3 %1%2Движение %3 - - - - + + + + %1%2Button %3 %1%2Кнопка %3 - - + + [unused] [не используется] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Плюс + + + + Minus + Минус + + + + Home Home - + + Capture + Захват + + + Touch Сенсор - + Wheel Indicates the mouse wheel Колёсико - + Backward Назад - + Forward Вперёд - + Task Задача - + Extra Дополнительная - + %1%2%3 %1%2%3 diff --git a/dist/languages/sv.ts b/dist/languages/sv.ts index 2b9738cb3..efb6ebfe3 100644 --- a/dist/languages/sv.ts +++ b/dist/languages/sv.ts @@ -913,103 +913,113 @@ avgjord kod.</div> Disable Macro JIT Stäng av Macro JIT - - - When checked, yuzu will log statistics about the compiled pipeline cache - - - Enable Shader Feedback + When checked, it disables the macro HLE functions. Enabling this makes games run slower - - When checked, it executes shaders without loop logic changes + + Disable Macro HLE - Disable Loop safety checks + When checked, yuzu will log statistics about the compiled pipeline cache + + + + + Enable Shader Feedback - Debugging - Felsökning + When checked, it executes shaders without loop logic changes + - - Enable Verbose Reporting Services** + + Disable Loop safety checks + Debugging + Felsökning + + + + Enable Verbose Reporting Services** + + + + Enable FS Access Log - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** - + Create Minidump After Crash - + Advanced Avancerat - + Kiosk (Quest) Mode Kiosk(Quest)-läge - + Enable CPU Debugging - + Enable Debug Asserts - + Enable Auto-Stub** - + Enable All Controller Types - + Disable Web Applet - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Perform Startup Vulkan Check - + **This will be reset automatically when yuzu closes. @@ -1024,12 +1034,12 @@ avgjord kod.</div> - + Web applet not compiled - + MiniDump creation not compiled @@ -1080,13 +1090,13 @@ avgjord kod.</div> - + Audio Ljud - + CPU CPU @@ -1102,13 +1112,13 @@ avgjord kod.</div> - + General Allmänt - + Graphics Grafik @@ -1124,7 +1134,7 @@ avgjord kod.</div> - + Controls Kontroller @@ -1140,7 +1150,7 @@ avgjord kod.</div> - + System System @@ -1403,7 +1413,7 @@ avgjord kod.</div> - + None Ingen @@ -1514,112 +1524,127 @@ avgjord kod.</div> - 2X (1440p/2160p) + 1.5X (1080p/1620p) [EXPERIMENTAL] - 3X (2160p/3240p) + 2X (1440p/2160p) - 4X (2880p/4320p) + 3X (2160p/3240p) - 5X (3600p/5400p) + 4X (2880p/4320p) + 5X (3600p/5400p) + + + + 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: - + Nearest Neighbor - + Bilinear - + Bicubic - + Gaussian - + ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) + + AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: - + FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Använd global bakgrundsfärg - + Set background color: Sätt backgrundsfärg: - + Background Color: Bakgrundsfärg: @@ -1664,76 +1689,96 @@ avgjord kod.</div> - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync hindrar skärmen från tearing, men vissa grafikkort har lägre prestanda med VSync på. Ha det på om du inte noterar någon prestandaskillnad. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + - Use VSync + Force maximum clocks (Vulkan only) - Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. - Sätt på asynchronous shader-kompilering, vilket kan minska shader stutter. Denna funktion är experimentiell. + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. + VSync hindrar skärmen från tearing, men vissa grafikkort har lägre prestanda med VSync på. Ha det på om du inte noterar någon prestandaskillnad. - Use asynchronous shader building (Hack) + Use VSync - Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. + Sätt på asynchronous shader-kompilering, vilket kan minska shader stutter. Denna funktion är experimentiell. - Use Fast GPU Time (Hack) + Use asynchronous shader building (Hack) - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. + Use Fast GPU Time (Hack) + + + + + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + + + + Use pessimistic buffer flushes (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + Anisotropic Filtering: Anisotropisk filtrering: - + Automatic - + Default Standard - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2121,7 +2166,7 @@ avgjord kod.</div> - + Configure Konfigurera @@ -2147,6 +2192,7 @@ avgjord kod.</div> + Requires restarting yuzu @@ -2166,22 +2212,27 @@ avgjord kod.</div> - + + Enable direct JoyCon driver + + + + Enable mouse panning - + Mouse sensitivity - + % % - + Motion / Touch Rörelse / Touch @@ -2293,7 +2344,7 @@ avgjord kod.</div> - + Left Stick Vänster Spak @@ -2387,14 +2438,14 @@ avgjord kod.</div> - + L L - + ZL ZL @@ -2413,7 +2464,7 @@ avgjord kod.</div> - + Plus Pluss @@ -2426,15 +2477,15 @@ avgjord kod.</div> - - + + R R - + ZR ZR @@ -2491,235 +2542,235 @@ avgjord kod.</div> - + Right Stick Höger Spak - - - - + + + + Clear Rensa - - - - - + + + + + [not set] [ej angett] - - + + Invert button - - + + Toggle button - - + + Invert axis - - - + + + Set threshold - - + + Choose a value between 0% and 100% - + Toggle axis - + Set gyro threshold - + Map Analog Stick - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. - + Center axis - - + + Deadzone: %1% Dödzon: %1% - - + + Modifier Range: %1% Modifieringsräckvidd: %1% - - + + Pro Controller Prokontroller - + Dual Joycons Dubbla Joycons - + Left Joycon Vänster Joycon - + Right Joycon Höger Joycon - + Handheld Handhållen - + GameCube Controller GameCube-kontroll - + Poke Ball Plus Poke Ball Plus - + NES Controller NES-kontroll - + SNES Controller SNES-kontroll - + N64 Controller N64-kontroll - + Sega Genesis Sega Genesis - + Start / Pause - + Z Z - + Control Stick - + C-Stick - + Shake! - + [waiting] [väntar] - + New Profile Ny profil - + Enter a profile name: - - + + Create Input Profile - + The given profile name is not valid! - + Failed to create the input profile "%1" - + Delete Input Profile - + Failed to delete the input profile "%1" - + Load Input Profile - + Failed to load the input profile "%1" - + Save Input Profile - + Failed to save the input profile "%1" @@ -2767,7 +2818,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Configure Konfigurera @@ -2803,7 +2854,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Test Test @@ -2823,77 +2874,77 @@ To invert the axes, first move your joystick vertically, and then horizontally.< <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Lär dig mer</span></a> - + %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters - + Port has to be in range 0 and 65353 - + IP address is not valid - + This UDP server already exists - + Unable to add more than 8 servers - + Testing Testar - + Configuring Konfigurerar - + Test Successful Test framgångsrikt - + Successfully received data from the server. Tog emot data från servern framgångsrikt - + Test Failed Test misslyckades - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Kunde inte ta emot giltig data från servern.<br>Var vänlig verifiera att servern är korrekt uppsatt och att adressen och porten är korrekta. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. UDP Test eller kalibreringskonfiguration är igång.<br>Var vänlig vänta för dem att slutföras. @@ -3221,7 +3272,7 @@ UUID: %2 - Ring Sensor Parameters + Virtual Ring Sensor Parameters @@ -3242,33 +3293,90 @@ UUID: %2 Dödzon: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Återställ till standard - + Clear Rensa - + [not set] [ej angett] - + Invert axis - - + + Deadzone: %1% Dödzon: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Konfigurerar + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [väntar] @@ -3573,8 +3681,8 @@ UUID: %2 - English - Engelska + American English + @@ -3707,22 +3815,27 @@ UUID: %2 Regenerera - + System settings are available only when game is not running. Systeminställningar är endast tillgängliga när spel inte körs. - + + Warning: "%1" is not a valid language for region "%2" + + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Detta kommer att ersätta nuvarande virtuell Switch med en ny. Nuvarande virtuell Switch kommer att permanent tas bort. Detta kan ha oväntade konsekvenser i spel. Detta kan misslyckas om en utdaterad konfig sparning används. Vill du fortsätta? - + Warning Varning - + Console ID: 0x%1 Konsol ID: 0x%1 @@ -3793,7 +3906,7 @@ UUID: %2 - + Select TAS Load Directory... @@ -4349,7 +4462,7 @@ Dra punkter för att ändra position, eller dubbelklicka tabellceller för att r - + &Controller P1 @@ -4362,42 +4475,37 @@ Dra punkter för att ändra position, eller dubbelklicka tabellceller för att r - - IP Address + + Server Address - - IP + + <html><head/><body><p>Server address of the host</p></body></html> - - <html><head/><body><p>IPv4 address of the host</p></body></html> - - - - + Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> - + Nickname - + Password - + Connect @@ -4405,12 +4513,12 @@ Dra punkter för att ändra position, eller dubbelklicka tabellceller för att r DirectConnectWindow - + Connecting - + Connect @@ -4480,859 +4588,869 @@ Dra punkter för att ändra position, eller dubbelklicka tabellceller för att r Tid det tar att emulera en Switch bild, utan att räkna med framelimiting eller v-sync. För emulering på full hastighet så ska det vara som mest 16.67 ms. - + &Clear Recent Files - + &Continue - + &Pause &Paus - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Varning Föråldrat Spelformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Du använder det dekonstruerade ROM-formatet för det här spelet. Det är ett föråldrat format som har överträffats av andra som NCA, NAX, XCI eller NSP. Dekonstruerade ROM-kataloger saknar ikoner, metadata och uppdatering.<br><br>För en förklaring av de olika format som yuzu stöder, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>kolla in vår wiki</a>. Det här meddelandet visas inte igen. - - + + Error while loading ROM! Fel vid laddning av ROM! - + The ROM format is not supported. ROM-formatet stöds inte. - + An error occurred initializing the video core. Ett fel inträffade vid initiering av videokärnan. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Ett okänt fel har uppstått. Se loggen för mer information. - + (64-bit) - + (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit - + Closing software... - + Save Data Spardata - + Mod Data Mod-data - + Error Opening %1 Folder Fel Öppnar %1 Mappen - - + + Folder does not exist! Mappen finns inte! - + Error Opening Transferable Shader Cache Fel Under Öppning Av Överförbar Shadercache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Ta bort katalog - - - - - - + + + + + + Successfully Removed Framgångsrikt borttagen - + Successfully removed the installed base game. Tog bort det installerade basspelet framgångsrikt. - + The base game is not installed in the NAND and cannot be removed. Basspelet är inte installerat i NAND och kan inte tas bort. - + Successfully removed the installed update. Tog bort den installerade uppdateringen framgångsrikt. - + There is no update installed for this title. Det finns ingen uppdatering installerad för denna titel. - + There are no DLC installed for this title. Det finns inga DLC installerade för denna titel. - + Successfully removed %1 installed DLC. Tog framgångsrikt bort den %1 installerade DLCn. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? Ta Bort Anpassad Spelkonfiguration? - + Remove File Radera fil - - + + Error Removing Transferable Shader Cache Fel När Överförbar Shader Cache Raderades - - + + A shader cache for this title does not exist. En shader cache för denna titel existerar inte. - + Successfully removed the transferable shader cache. Raderade den överförbara shadercachen framgångsrikt. - + Failed to remove the transferable shader cache. Misslyckades att ta bort den överförbara shadercache - - - Error Removing Transferable Shader Caches + + Error Removing Vulkan Driver Pipeline Cache + Failed to remove the driver pipeline cache. + + + + + + Error Removing Transferable Shader Caches + + + + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Fel När Anpassad Konfiguration Raderades - + A custom configuration for this title does not exist. En anpassad konfiguration för denna titel existerar inte. - + Successfully removed the custom game configuration. Tog bort den anpassade spelkonfigurationen framgångsrikt. - + Failed to remove the custom game configuration. Misslyckades att ta bort den anpassade spelkonfigurationen. - - + + RomFS Extraction Failed! RomFS Extraktion Misslyckades! - + There was an error copying the RomFS files or the user cancelled the operation. Det uppstod ett fel vid kopiering av RomFS filer eller användaren avbröt operationen. - + Full Full - + Skeleton Skelett - + Select RomFS Dump Mode Välj RomFS Dump-Läge - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Välj hur du vill att RomFS ska dumpas. <br>Full kommer att kopiera alla filer i den nya katalogen medan <br>skelett bara skapar katalogstrukturen. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Extraherar RomFS... - - + + Cancel Avbryt - + RomFS Extraction Succeeded! RomFS Extraktion Lyckades! - + The operation completed successfully. Operationen var lyckad. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Fel under öppning av %1 - + Select Directory Välj Katalog - + Properties Egenskaper - + The game properties could not be loaded. Spelegenskaperna kunde inte laddas. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Körbar (%1);;Alla Filer (*.*) - + Load File Ladda Fil - + Open Extracted ROM Directory Öppna Extraherad ROM-Katalog - + Invalid Directory Selected Ogiltig Katalog Vald - + The directory you have selected does not contain a 'main' file. Katalogen du har valt innehåller inte en 'main'-fil. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Installerbar Switch-fil (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Installera filer - + %n file(s) remaining - + Installing file "%1"... Installerar Fil "%1"... - + Install Results Installera resultat - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systemapplikation - + System Archive Systemarkiv - + System Application Update Systemapplikationsuppdatering - + Firmware Package (Type A) Firmwarepaket (Typ A) - + Firmware Package (Type B) Firmwarepaket (Typ B) - + Game Spel - + Game Update Speluppdatering - + Game DLC Spel DLC - + Delta Title Delta Titel - + Select NCA Install Type... Välj NCA-Installationsläge... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Välj vilken typ av titel du vill installera som: (I de flesta fallen, standard 'Spel' är bra.) - + Failed to Install Misslyckades med Installationen - + The title type you selected for the NCA is invalid. Den titeltyp du valt för NCA är ogiltig. - + File not found Filen hittades inte - + File "%1" not found Filen "%1" hittades inte - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account yuzu Konto hittades inte - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. För att skicka ett spelkompatibilitetstest, du måste länka ditt yuzu-konto.<br><br/>För att länka ditt yuzu-konto, gå till Emulering &gt, Konfigurering &gt, Web. - + Error opening URL Fel när URL öppnades - + Unable to open the URL "%1". Oförmögen att öppna URL:en "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo - - + + The current amiibo has been removed - + Error Fel - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo Fil (%1);; Alla Filer (*.*) - + Load Amiibo Ladda Amiibo - + Error loading Amiibo data Fel vid laddning av Amiibodata - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Skärmdump - + PNG Image (*.png) PNG Bild (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Hastighet: %1% / %2% - + Speed: %1% Hastighet: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Spel: %1 FPS - + Frame: %1 ms Ruta: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA - + SMAA - + Confirm Key Rederivation Bekräfta Nyckel Rederivering - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5349,37 +5467,37 @@ och eventuellt göra säkerhetskopior. Detta raderar dina autogenererade nyckelfiler och kör nyckelderivationsmodulen. - + Missing fuses Saknade säkringar - + - Missing BOOT0 - Saknar BOOT0 - + - Missing BCPKG2-1-Normal-Main - Saknar BCPKG2-1-Normal-Main - + - Missing PRODINFO - Saknar PRODINFO - + Derivation Components Missing Deriveringsdelar saknas - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5388,39 +5506,39 @@ Detta kan ta upp till en minut beroende på systemets prestanda. - + Deriving Keys Härleda Nycklar - + Select RomFS Dump Target Välj RomFS Dumpa Mål - + Please select which RomFS you would like to dump. Välj vilken RomFS du vill dumpa. - + Are you sure you want to close yuzu? Är du säker på att du vill stänga yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Är du säker på att du vill stoppa emuleringen? Du kommer att förlora osparade framsteg. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5432,44 +5550,44 @@ Vill du strunta i detta och avsluta ändå? GRenderWindow - - + + OpenGL not available! OpenGL inte tillgängligt! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu har inte komilerats med OpenGL support. - - + + Error while initializing OpenGL! Fel under initialisering av OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. - + Error while initializing OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 @@ -5971,7 +6089,7 @@ Debug Message: Installera - + Install Files to NAND Installera filer till NAND @@ -5979,7 +6097,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 @@ -6627,7 +6745,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE START/PAUSE @@ -6676,31 +6794,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [inte inställd] @@ -6711,14 +6829,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Axel %1%2 @@ -6729,262 +6847,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [okänd] - + - + Left Vänster - + - + Right Höger - + - + Down Ner - + - + Up Upp - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Start - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle Cirkel - - + + Cross Kors - - + + Square Fyrkant - - + + Triangle Triangel - - + + Share Dela - - + + Options Val - - + + [undefined] [odefinerad] - + %1%2 %1%2 - - + + [invalid] [felaktig] - - - - + + + + %1%2Hat %3 %1%2Hatt %3 - - - - - - + + + + + + %1%2Axis %3 %1%2Axel %3 - - + + %1%2Axis %3,%4,%5 %1%2Axel %3,%4%5 - - + + %1%2Motion %3 %1%2Rörelse %3 - - - - + + + + %1%2Button %3 %1%2Knapp %3 - - + + [unused] [oanvänd] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Pluss + + + + Minus + Minus + + + + Home Hem - + + Capture + Fånga + + + Touch Touch - + Wheel Indicates the mouse wheel Hjul - + Backward Bakåt - + Forward Framåt - + Task Åtgärd - + Extra Extra - + %1%2%3 %1%2%3 diff --git a/dist/languages/tr_TR.ts b/dist/languages/tr_TR.ts index 4ec3b0bbc..bff93ae69 100644 --- a/dist/languages/tr_TR.ts +++ b/dist/languages/tr_TR.ts @@ -922,102 +922,112 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra Macro JIT'i devre dışı bırak - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + + + + + Disable Macro HLE + + + + When checked, yuzu will log statistics about the compiled pipeline cache Etkinleştirildiğinde, yuzu derlenen pipeline cache istatistiklerini log'a kaydeder. - + Enable Shader Feedback Shader Geribildirimini Etkinleştir - + When checked, it executes shaders without loop logic changes İşaretlendiğinde shaderları döngü mantık değişimleri olmaksızın uygular - + Disable Loop safety checks Döngü güvenliği kontrolünü devre dışı bırak - + Debugging Hata ayıklama - + Enable Verbose Reporting Services** Detaylı Raporlama Hizmetini Etkinleştir - + Enable FS Access Log FS Erişim Kaydını Etkinleştir - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** Konsola Ses Komutlarını Aktar** - + Create Minidump After Crash - + Advanced Gelişmiş - + Kiosk (Quest) Mode Kiosk (Quest) Modu - + Enable CPU Debugging CPU Hata Ayıklama Modu'nu Etkinleştir - + Enable Debug Asserts Hata Ayıklama Assert'lerini Etkinleştir - + Enable Auto-Stub** Auto-Stub'ı Etkinleştir - + Enable All Controller Types Bütün Kontrolcü Türlerini Etkinleştir - + Disable Web Applet Web Uygulamasını Devre Dışı Bırak - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Perform Startup Vulkan Check - + **This will be reset automatically when yuzu closes. **Bu yuzu kapandığında otomatik olarak eski haline dönecektir. @@ -1032,12 +1042,12 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra yuzu'nun bu ayarı uygulayabilmesi için yeniden başlatılması gereklidir. - + Web applet not compiled - + MiniDump creation not compiled @@ -1088,13 +1098,13 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + Audio Ses - + CPU CPU @@ -1110,13 +1120,13 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + General Genel - + Graphics Grafikler @@ -1132,7 +1142,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + Controls Kontroller @@ -1148,7 +1158,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + System Sistem @@ -1411,7 +1421,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + None Yok @@ -1522,112 +1532,127 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: Pencereye Uyarlı Filtre: - + Nearest Neighbor En Yakın Komşu Algoritması - + Bilinear Bilinear - + Bicubic Bicubic - + Gaussian Gausyen - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ Super Resolution (Vulkan'a Özel) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: Kenar Yumuşatma Yöntemi: - + FXAA FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Global arka plan rengini kullan - + Set background color: Arka plan rengini ayarla: - + Background Color: Arkaplan Rengi: @@ -1672,76 +1697,96 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + + + + + Force maximum clocks (Vulkan only) + + + + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. VSync ekrandaki yırtılmaları önler fakat bazı ekran kartları VSync etkinleştirildiğinde daha düşük performans verebilir. Eğer bir fark görmüyorsanız etkinleştirin. - + Use VSync VSync Kullan - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Asenkronize shader derlemesini aktive eder. Bunu etkinleştirmek takılmaları azaltabilir. Bu özellik deneyseldir. - + Use asynchronous shader building (Hack) Asenkronize shader derlemesini kullan (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Hızlı GPU Saati'ni etkinleştir. Bu seçenek çoğu oyunu en yüksek gerçek çözünürlükte çalıştırır. - + Use Fast GPU Time (Hack) Hızlı GPU Saati Kullan (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Use pessimistic buffer flushes (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + Anisotropic Filtering: Anisotropic Filtering: - + Automatic Otomatik - + Default Varsayılan - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2129,7 +2174,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + Configure Yapılandır @@ -2155,6 +2200,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra + Requires restarting yuzu Yuzu'yu yeniden başlatmayı gerektirir @@ -2174,22 +2220,27 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra Kontrolcü navigasyonu - + + Enable direct JoyCon driver + + + + Enable mouse panning Mouse ile kaydırmayı etkinleştir - + Mouse sensitivity Fare hassasiyeti - + % % - + Motion / Touch Hareket / Dokunmatik @@ -2301,7 +2352,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + Left Stick Sol Analog @@ -2395,14 +2446,14 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + L L - + ZL ZL @@ -2421,7 +2472,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + Plus Artı @@ -2434,15 +2485,15 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - - + + R R - + ZR ZR @@ -2499,236 +2550,236 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + Right Stick Sağ Analog - - - - + + + + Clear Temizle - - - - - + + + + + [not set] [belirlenmedi] - - + + Invert button Tuşları ters çevir - - + + Toggle button Tuşu Aç/Kapa - - + + Invert axis Ekseni ters çevir - - - + + + Set threshold Alt sınır ayarla - - + + Choose a value between 0% and 100% %0 ve %100 arasında bir değer seçin - + Toggle axis - + Set gyro threshold - + Map Analog Stick Analog Çubuğu Ayarla - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Tamama bastıktan sonra, joystikinizi önce yatay sonra dikey olarak hareket ettirin. Eksenleri ters çevirmek için, önce joystickinizi dikey sonra yatay olarak hareket ettirin. - + Center axis - - + + Deadzone: %1% Ölü Bölge: %1% - - + + Modifier Range: %1% Düzenleyici Aralığı: %1% - - + + Pro Controller Pro Controller - + Dual Joycons İkili Joyconlar - + Left Joycon Sol Joycon - + Right Joycon Sağ Joycon - + Handheld Handheld - + GameCube Controller GameCube Kontrolcüsü - + Poke Ball Plus Poke Ball Plus - + NES Controller NES Kontrolcüsü - + SNES Controller SNES Kontrolcüsü - + N64 Controller N64 Kontrolcüsü - + Sega Genesis Sega Genesis - + Start / Pause Başlat / Duraklat - + Z Z - + Control Stick Kontrol Çubuğu - + C-Stick C-Çubuğu - + Shake! Salla! - + [waiting] [bekleniyor] - + New Profile Yeni Profil - + Enter a profile name: Bir profil ismi girin: - - + + Create Input Profile Kontrol Profili Oluştur - + The given profile name is not valid! Girilen profil ismi geçerli değil! - + Failed to create the input profile "%1" "%1" kontrol profili oluşturulamadı - + Delete Input Profile Kontrol Profilini Kaldır - + Failed to delete the input profile "%1" "%1" kontrol profili kaldırılamadı - + Load Input Profile Kontrol Profilini Yükle - + Failed to load the input profile "%1" "%1" kontrol profili yüklenemedi - + Save Input Profile Kontrol Profilini Kaydet - + Failed to save the input profile "%1" "%1" kontrol profili kaydedilemedi @@ -2776,7 +2827,7 @@ Eksenleri ters çevirmek için, önce joystickinizi dikey sonra yatay olarak har - + Configure Yapılandır @@ -2812,7 +2863,7 @@ Eksenleri ters çevirmek için, önce joystickinizi dikey sonra yatay olarak har - + Test Test @@ -2832,77 +2883,77 @@ Eksenleri ters çevirmek için, önce joystickinizi dikey sonra yatay olarak har <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Daha Fazlası</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters Port numarasında geçersiz karakterler var - + Port has to be in range 0 and 65353 Port 0 ila 65353 aralığında olmalıdır - + IP address is not valid IP adresi geçerli değil - + This UDP server already exists Bu UDP sunucusu zaten var - + Unable to add more than 8 servers 8'den fazla server eklenemez - + Testing Test Ediliyor - + Configuring Yapılandırılıyor - + Test Successful Test Başarılı - + Successfully received data from the server. Bilgi başarıyla sunucudan kaldırıldı. - + Test Failed Test Başarısız - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Serverdan geçerli veri alınamadı.<br>Lütfen sunucunun doğru ayarlandığını ya da adres ve portun doğru olduğunu kontrol edin. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. UDP testi ya da yapılandırılması devrede.<br>Lütfen bitmesini bekleyin. @@ -3230,8 +3281,8 @@ UUID: %2 - Ring Sensor Parameters - Ring Sensör Parametreleri + Virtual Ring Sensor Parameters + @@ -3251,33 +3302,90 @@ UUID: %2 Ölü Bölge: %0 - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Varsayılana Döndür - + Clear Temizle - + [not set] [belirlenmedi] - + Invert axis Ekseni ters çevir - - + + Deadzone: %1% Ölü Bölge: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Yapılandırılıyor + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [bekleniyor] @@ -3582,8 +3690,8 @@ UUID: %2 - English - İngilizce + American English + @@ -3716,22 +3824,27 @@ UUID: %2 Yeniden oluştur - + System settings are available only when game is not running. Sistem ayarlarına sadece oyun çalışmıyorken erişilebilir. - + + Warning: "%1" is not a valid language for region "%2" + + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Bu sanal Switchinizi yeni biriyle değiştirir. Geçerli sanal switchiniz geri getirilemez. Bu oyunlarda beklenmeyen etkilere neden olabilir. Eski bir oyun yapılandırma kayıt dosyası kullanıyorsanız bu başarısız olabilir. Devam? - + Warning Uyarı - + Console ID: 0x%1 Konsol ID: 0x%1 @@ -3802,7 +3915,7 @@ UUID: %2 TAS Yapılandırması - + Select TAS Load Directory... Tas Yükleme Dizini Seçin @@ -4358,7 +4471,7 @@ Noktanın konumunu değiştirmek için sürükleyin ya da sayıların üstüne Kontrolcü O1 - + &Controller P1 &Kontrolcü O1 @@ -4371,42 +4484,37 @@ Noktanın konumunu değiştirmek için sürükleyin ya da sayıların üstüne Direkt Bağlan - - IP Address - IP Adresi + + Server Address + - - IP - IP + + <html><head/><body><p>Server address of the host</p></body></html> + - - <html><head/><body><p>IPv4 address of the host</p></body></html> - <html><head/><body><p>Ana bilgisayarın IPv4 adresi</p></body></html> - - - + Port Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> <html><head/><body><p>Ana bilgisayarın dinlediği port numarası</p></body></html> - + Nickname Lakap - + Password Şifre - + Connect Bağlan @@ -4414,12 +4522,12 @@ Noktanın konumunu değiştirmek için sürükleyin ya da sayıların üstüne DirectConnectWindow - + Connecting Bağlanılıyor - + Connect Bağlan @@ -4489,472 +4597,482 @@ Noktanın konumunu değiştirmek için sürükleyin ya da sayıların üstüne Bir Switch karesini emüle etmekte geçen zaman, karelimitleme ve v-sync hariç. Tam hız emülasyon için bu en çok 16,67 ms olmalı. - + &Clear Recent Files &Son Dosyaları Temizle - + &Continue &Devam Et - + &Pause &Duraklat - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu şu anda bir oyun çalıştırıyor - + Warning Outdated Game Format Uyarı, Eski Oyun Formatı - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Bu oyun için dekonstrükte ROM formatı kullanıyorsunuz, bu fromatın yerine NCA, NAX, XCI ve NSP formatları kullanılmaktadır. Dekonstrükte ROM formatları ikon, üst veri ve güncelleme desteği içermemektedir.<br><br>Yuzu'nun desteklediği çeşitli Switch formatları için<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Wiki'yi ziyaret edin</a>. Bu mesaj yeniden gösterilmeyecektir. - - + + Error while loading ROM! ROM yüklenirken hata oluştu! - + The ROM format is not supported. Bu ROM biçimi desteklenmiyor. - + An error occurred initializing the video core. Video çekirdeğini başlatılırken bir hata oluştu. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu video çekirdeğini çalıştırırken bir hatayla karşılaştı. Bu sorun genellikle eski GPU sürücüleri sebebiyle ortaya çıkar. Daha fazla detay için lütfen log dosyasına bakın. Log dosyasını incelemeye dair daha fazla bilgi için lütfen bu sayfaya ulaşın: <a href='https://yuzu-emu.org/help/reference/log-files/'>Log dosyası nasıl yüklenir</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. ROM yüklenirken hata oluştu! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Lütfen dosyalarınızı yeniden dump etmek için<a href='https://yuzu-emu.org/help/quickstart/'>yuzu hızlı başlangıç kılavuzu'nu</a> takip edin.<br> Yardım için yuzu wiki</a>veya yuzu Discord'una</a> bakabilirsiniz. - + An unknown error occurred. Please see the log for more details. Bilinmeyen bir hata oluştu. Lütfen daha fazla detay için kütüğe göz atınız. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Kayıt Verisi - + Mod Data Mod Verisi - + Error Opening %1 Folder %1 klasörü açılırken hata - - + + Folder does not exist! Klasör mevcut değil! - + Error Opening Transferable Shader Cache Transfer Edilebilir Shader Cache'ini Açarken Bir Hata Oluştu - + Failed to create the shader cache directory for this title. Bu oyun için shader cache konumu oluşturulamadı. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Girdiyi Kaldır - - - - - - + + + + + + Successfully Removed Başarıyla Kaldırıldı - + Successfully removed the installed base game. Yüklenmiş oyun başarıyla kaldırıldı. - + The base game is not installed in the NAND and cannot be removed. Asıl oyun NAND'de kurulu değil ve kaldırılamaz. - + Successfully removed the installed update. Yüklenmiş güncelleme başarıyla kaldırıldı. - + There is no update installed for this title. Bu oyun için yüklenmiş bir güncelleme yok. - + There are no DLC installed for this title. Bu oyun için yüklenmiş bir DLC yok. - + Successfully removed %1 installed DLC. %1 yüklenmiş DLC başarıyla kaldırıldı. - + Delete OpenGL Transferable Shader Cache? OpenGL Transfer Edilebilir Shader Cache'ini Kaldırmak İstediğinize Emin Misiniz? - + Delete Vulkan Transferable Shader Cache? Vulkan Transfer Edilebilir Shader Cache'ini Kaldırmak İstediğinize Emin Misiniz? - + Delete All Transferable Shader Caches? Tüm Transfer Edilebilir Shader Cache'leri Kaldırmak İstediğinize Emin Misiniz? - + Remove Custom Game Configuration? Oyuna Özel Yapılandırmayı Kaldırmak İstediğinize Emin Misiniz? - + Remove File Dosyayı Sil - - + + Error Removing Transferable Shader Cache Transfer Edilebilir Shader Cache Kaldırılırken Bir Hata Oluştu - - + + A shader cache for this title does not exist. Bu oyun için oluşturulmuş bir shader cache yok. - + Successfully removed the transferable shader cache. Transfer edilebilir shader cache başarıyla kaldırıldı. - + Failed to remove the transferable shader cache. Transfer edilebilir shader cache kaldırılamadı. - - + + Error Removing Vulkan Driver Pipeline Cache + + + + + Failed to remove the driver pipeline cache. + + + + + Error Removing Transferable Shader Caches Transfer Edilebilir Shader Cache'ler Kaldırılırken Bir Hata Oluştu - + Successfully removed the transferable shader caches. Transfer edilebilir shader cacheler başarıyla kaldırıldı. - + Failed to remove the transferable shader cache directory. Transfer edilebilir shader cache konumu kaldırılamadı. - - + + Error Removing Custom Configuration Oyuna Özel Yapılandırma Kaldırılırken Bir Hata Oluştu. - + A custom configuration for this title does not exist. Bu oyun için bir özel yapılandırma yok. - + Successfully removed the custom game configuration. Oyuna özel yapılandırma başarıyla kaldırıldı. - + Failed to remove the custom game configuration. Oyuna özel yapılandırma kaldırılamadı. - - + + RomFS Extraction Failed! RomFS Çıkartımı Başarısız! - + There was an error copying the RomFS files or the user cancelled the operation. RomFS dosyaları kopyalanırken bir hata oluştu veya kullanıcı işlemi iptal etti. - + Full Full - + Skeleton Çerçeve - + Select RomFS Dump Mode RomFS Dump Modunu Seçiniz - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Lütfen RomFS'in nasıl dump edilmesini istediğinizi seçin.<br>"Full" tüm dosyaları yeni bir klasöre kopyalarken <br>"skeleton" sadece klasör yapısını oluşturur. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 konumunda RomFS çıkarmaya yetecek alan yok. Lütfen yer açın ya da Emülasyon > Yapılandırma > Sistem > Dosya Sistemi > Dump konumu kısmından farklı bir çıktı konumu belirleyin. - + Extracting RomFS... RomFS çıkartılıyor... - - + + Cancel İptal - + RomFS Extraction Succeeded! RomFS Çıkartımı Başarılı! - + The operation completed successfully. İşlem başarıyla tamamlandı. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 %1 Açılırken Bir Hata Oluştu - + Select Directory Klasör Seç - + Properties Özellikler - + The game properties could not be loaded. Oyun özellikleri yüklenemedi. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Çalıştırılabilir Dosyası (%1);;Tüm Dosyalar (*.*) - + Load File Dosya Aç - + Open Extracted ROM Directory Çıkartılmış ROM klasörünü aç - + Invalid Directory Selected Geçersiz Klasör Seçildi - + The directory you have selected does not contain a 'main' file. Seçtiğiniz klasör bir "main" dosyası içermiyor. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Yüklenilebilir Switch Dosyası (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submissions Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Dosya Kur - + %n file(s) remaining %n dosya kaldı%n dosya kaldı - + Installing file "%1"... "%1" dosyası kuruluyor... - + Install Results Kurulum Sonuçları - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Olası çakışmaları önlemek için oyunları NAND'e yüklememenizi tavsiye ediyoruz. Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + %n file(s) were newly installed %n dosya güncel olarak yüklendi @@ -4962,7 +5080,7 @@ Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + %n file(s) were overwritten %n dosyanın üstüne yazıldı @@ -4970,7 +5088,7 @@ Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + %n file(s) failed to install %n dosya yüklenemedi @@ -4978,377 +5096,377 @@ Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + System Application Sistem Uygulaması - + System Archive Sistem Arşivi - + System Application Update Sistem Uygulama Güncellemesi - + Firmware Package (Type A) Yazılım Paketi (Tür A) - + Firmware Package (Type B) Yazılım Paketi (Tür B) - + Game Oyun - + Game Update Oyun Güncellemesi - + Game DLC Oyun DLC'si - + Delta Title Delta Başlık - + Select NCA Install Type... NCA Kurulum Tipi Seçin... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Lütfen bu NCA dosyası için belirlemek istediğiniz başlık türünü seçiniz: (Çoğu durumda, varsayılan olan 'Oyun' kullanılabilir.) - + Failed to Install Kurulum Başarısız Oldu - + The title type you selected for the NCA is invalid. NCA için seçtiğiniz başlık türü geçersiz - + File not found Dosya Bulunamadı - + File "%1" not found Dosya "%1" Bulunamadı - + OK Tamam - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Kayıp yuzu Hesabı - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Oyun uyumluluk test çalışması göndermek için öncelikle yuzu hesabınla giriş yapmanız gerekiyor.<br><br/>Yuzu hesabınızla giriş yapmak için, Emülasyon &gt; Yapılandırma &gt; Web'e gidiniz. - + Error opening URL URL açılırken bir hata oluştu - + Unable to open the URL "%1". URL "%1" açılamıyor. - + TAS Recording TAS kayıtta - + Overwrite file of player 1? Oyuncu 1'in dosyasının üstüne yazılsın mı? - + Invalid config detected Geçersiz yapılandırma tespit edildi - + Handheld controller can't be used on docked mode. Pro controller will be selected. Handheld kontrolcü dock modunda kullanılamaz. Pro kontrolcü seçilecek. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Amiibo kaldırıldı - + Error Hata - - + + The current game is not looking for amiibos Aktif oyun amiibo beklemiyor - + Amiibo File (%1);; All Files (*.*) Amiibo Dosyası (%1);; Tüm Dosyalar (*.*) - + Load Amiibo Amiibo Yükle - + Error loading Amiibo data Amiibo verisi yüklenirken hata - + The selected file is not a valid amiibo Seçtiğiniz dosya geçerli bir amiibo değil - + The selected file is already on use Seçtiğiniz dosya hali hazırda kullanılıyor - + An unknown error occurred - + Capture Screenshot Ekran Görüntüsü Al - + PNG Image (*.png) PNG görüntüsü (*.png) - + TAS state: Running %1/%2 TAS durumu: %1%2 çalışıyor - + TAS state: Recording %1 TAS durumu: %1 kaydediliyor - + TAS state: Idle %1/%2 TAS durumu: %1%2 boşta - + TAS State: Invalid TAS durumu: Geçersiz - + &Stop Running &Çalıştırmayı durdur - + &Start &Başlat - + Stop R&ecording K&aydetmeyi Durdur - + R&ecord K&aydet - + Building: %n shader(s) Oluşturuluyor: %n shaderOluşturuluyor: %n shader - + Scale: %1x %1 is the resolution scaling factor Ölçek: %1x - + Speed: %1% / %2% Hız %1% / %2% - + Speed: %1% Hız: %1% - + Game: %1 FPS (Unlocked) Oyun: %1 FPS (Sınırsız) - + Game: %1 FPS Oyun: %1 FPS - + Frame: %1 ms Kare: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU YÜKSEK - + GPU EXTREME GPU EKSTREM - + GPU ERROR GPU HATASI - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST EN YAKIN - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSYEN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA AA YOK - + FXAA FXAA - + SMAA - + Confirm Key Rederivation Anahtar Yeniden Türetimini Onayla - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5365,37 +5483,37 @@ ve opsiyonel olarak yedekler alın. Bu sizin otomatik oluşturulmuş anahtar dosyalarınızı silecek ve anahtar türetme modülünü tekrar çalıştıracak. - + Missing fuses Anahtarlar Kayıp - + - Missing BOOT0 - BOOT0 Kayıp - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main Kayıp - + - Missing PRODINFO - PRODINFO Kayıp - + Derivation Components Missing Türeten Bileşenleri Kayıp - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Şifreleme anahtarları eksik. <br>Lütfen takip edin<a href='https://yuzu-emu.org/help/quickstart/'>yuzu hızlı başlangıç kılavuzunu</a>tüm anahtarlarınızı, aygıt yazılımınızı ve oyunlarınızı almada.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5404,39 +5522,39 @@ Bu sistem performansınıza bağlı olarak bir dakika kadar zaman alabilir. - + Deriving Keys Anahtarlar Türetiliyor - + Select RomFS Dump Target RomFS Dump Hedefini Seçiniz - + Please select which RomFS you would like to dump. Lütfen dump etmek istediğiniz RomFS'i seçiniz. - + Are you sure you want to close yuzu? yuzu'yu kapatmak istediğinizden emin misiniz? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Emülasyonu durdurmak istediğinizden emin misiniz? Kaydedilmemiş veriler kaybolur. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5448,44 +5566,44 @@ Görmezden gelip kapatmak ister misiniz? GRenderWindow - - + + OpenGL not available! OpenGL kullanıma uygun değil! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. Yuzu OpenGL desteklememektedir. - - + + Error while initializing OpenGL! OpenGl başlatılırken bir hata oluştu! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. GPU'nuz OpenGL desteklemiyor veya güncel bir grafik sürücüsüne sahip değilsiniz. - + Error while initializing OpenGL 4.6! OpenGl 4.6 başlatılırken bir hata oluştu! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 GPU'nuz OpenGL 4.6'yı desteklemiyor veya güncel bir grafik sürücüsüne sahip değilsiniz.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 GPU'nuz gereken bir yada daha fazla OpenGL eklentisini desteklemiyor Lütfen güncel bir grafik sürücüsüne sahip olduğunuzdan emin olun.<br><br>GL Renderer:<br>%1<br><br> Desteklenmeyen Eklentiler:<br>%2 @@ -5987,7 +6105,7 @@ Debug Message: Kur - + Install Files to NAND NAND'e Dosya Kur @@ -5995,7 +6113,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 Yazı bu karakterleri içeremez: @@ -6652,7 +6770,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE BAŞLAT/DURAKLAT @@ -6701,31 +6819,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [belirlenmedi] @@ -6736,14 +6854,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Eksen %1%2 @@ -6754,262 +6872,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [bilinmeyen] - + - + Left Sol - + - + Right Sağ - + - + Down Aşağı - + - + Up Yukarı - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Start - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle Yuvarlak - - + + Cross Çarpı - - + + Square Kare - - + + Triangle Üçgen - - + + Share Share - - + + Options Options - - + + [undefined] [belirsiz] - + %1%2 %1%2 - - + + [invalid] [geçersiz] - - - - + + + + %1%2Hat %3 %1%2Hat %3 - - - - - - + + + + + + %1%2Axis %3 %1%2Eksen %3 - - + + %1%2Axis %3,%4,%5 %1%2Eksen %3,%4,%5 - - + + %1%2Motion %3 %1%2Hareket %3 - - - - + + + + %1%2Button %3 %1%2Tuş %3 - - + + [unused] [kullanılmayan] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Artı + + + + Minus + Eksi + + + + Home Home - + + Capture + Kaydet + + + Touch Dokunmatik - + Wheel Indicates the mouse wheel Fare Tekerleği - + Backward Geri - + Forward İleri - + Task - + Extra Ekstra - + %1%2%3 %1%2%3 diff --git a/dist/languages/uk.ts b/dist/languages/uk.ts index 48c77dc80..9c4d48029 100644 --- a/dist/languages/uk.ts +++ b/dist/languages/uk.ts @@ -893,103 +893,113 @@ This would ban both their forum username and their IP address. Disable Macro JIT Вимкнути Макрос JIT - - - When checked, yuzu will log statistics about the compiled pipeline cache - Якщо увімкнено, yuzu записуватиме статистику про скомпільований кеш конвеєра - - Enable Shader Feedback - Увімкнути зворотний зв'язок про шейдери + When checked, it disables the macro HLE functions. Enabling this makes games run slower + - - When checked, it executes shaders without loop logic changes + + Disable Macro HLE + When checked, yuzu will log statistics about the compiled pipeline cache + Якщо увімкнено, yuzu записуватиме статистику про скомпільований кеш конвеєра + + + + Enable Shader Feedback + Увімкнути зворотний зв'язок про шейдери + + + + When checked, it executes shaders without loop logic changes + + + + Disable Loop safety checks - + Debugging Налагодження - + Enable Verbose Reporting Services** - + Enable FS Access Log - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** - + Create Minidump After Crash - + Advanced Розширені - + Kiosk (Quest) Mode Режим кіоску (Квест) - + Enable CPU Debugging Увімкнути налагодження ЦП - + Enable Debug Asserts - + Enable Auto-Stub** - + Enable All Controller Types Увімкнути всі типи контролерів - + Disable Web Applet Вимкнути веб-аплет - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. Дозволяє yuzu перевіряти наявність робочого середовища Vulkan під час запуску програми. Вимкніть цю опцію, якщо це викликає проблеми з тим, що зовнішні програми бачать yuzu. - + Perform Startup Vulkan Check Виконувати перевірку Vulkan під час запуску - + **This will be reset automatically when yuzu closes. **Це буде автоматично скинуто після закриття yuzu. @@ -1004,12 +1014,12 @@ This would ban both their forum username and their IP address. yuzu потрібно перезапустити, щоб застосувати це налаштування. - + Web applet not compiled Веб-аплет не скомпільовано - + MiniDump creation not compiled @@ -1060,13 +1070,13 @@ This would ban both their forum username and their IP address. - + Audio Аудіо - + CPU ЦП @@ -1082,13 +1092,13 @@ This would ban both their forum username and their IP address. - + General Загальні - + Graphics Графіка @@ -1104,7 +1114,7 @@ This would ban both their forum username and their IP address. - + Controls Керування @@ -1120,7 +1130,7 @@ This would ban both their forum username and their IP address. - + System Система @@ -1383,7 +1393,7 @@ This would ban both their forum username and their IP address. - + None Вимкнено @@ -1494,112 +1504,127 @@ This would ban both their forum username and their IP address. + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: Фільтр адаптації вікна: - + Nearest Neighbor Найближчий сусід - + Bilinear Білінійне - + Bicubic Бікубічне - + Gaussian Гауса - + ScaleForce ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ Super Resolution (Лише для Vulkan) + + AMD FidelityFX™️ Super Resolution + - + Anti-Aliasing Method: Метод згладжування: - + FXAA FXAA - + SMAA - + SMAA - + Use global FSR Sharpness Використовувати глобальну різкість FSR - + Set FSR Sharpness Встановити різкість FSR - + FSR Sharpness: Різкість FSR: - + 100% 100% - - + + Use global background color Використовувати глобальний фоновий колір - + Set background color: Встановити фоновий колір: - + Background Color: Фоновий колір: @@ -1611,7 +1636,7 @@ This would ban both their forum username and their IP address. SPIR-V (Experimental, Mesa Only) - + SPIR-V (Експериментально, лише для Mesa) @@ -1644,76 +1669,96 @@ This would ban both their forum username and their IP address. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + Виконує роботу у фоновому режимі в очікуванні графічних команд, не даючи змоги ГП знижувати тактову частоту. + + + + Force maximum clocks (Vulkan only) + Примусово змусити максимальну тактову частоту (тільки для Vulkan) + + + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. Вертикальна синхронізація запобігає розривам екрана, але деякі відеокарти мають нижчу продуктивність при вертикальній синхронізації. Залишайте увімкненим, якщо ви не помічаєте різниці в продуктивності. - + Use VSync Використувати вертикальну сінхронізацію - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Вмикає асинхронну компіляцію шейдерів, що зменшить зависання через шейдери. Функція є експериментальною. - + Use asynchronous shader building (Hack) Використовувати асинхронну побудову шейдерів (хак) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Вмикає функцію Fast GPU Time. Цей параметр змусить більшість ігор працювати в максимальній рідній роздільній здатності. - + Use Fast GPU Time (Hack) Увімкнути Fast GPU Time (Хак) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. Вмикає песимістичне очищення буферів. Ця опція змушує промивати немодифіковані буфери, що може знизити продуктивність. - + Use pessimistic buffer flushes (Hack) Використовувати песимістичне очищення буферів (Хак) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + Вмикає кеш конвеєра, специфічний для виробника GPU. Ця опція може значно поліпшити час завантаження шейдерів у тих випадках, коли драйвер Vulkan не зберігає внутрішні файли кешу конвеєра. + + + + Use Vulkan pipeline cache + Використовувати конвеєрний кеш Vulkan + + + Anisotropic Filtering: Анізотропна фільтрація: - + Automatic Автоматично - + Default За замовчуванням - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2101,7 +2146,7 @@ This would ban both their forum username and their IP address. - + Configure Налаштувати @@ -2127,6 +2172,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu Потребує перезапуску yuzu @@ -2146,22 +2192,27 @@ This would ban both their forum username and their IP address. Навігація контролера - + + Enable direct JoyCon driver + + + + Enable mouse panning Увімкнути панорамування миші - + Mouse sensitivity Чутливість миші - + % % - + Motion / Touch Рух і сенсор @@ -2231,7 +2282,7 @@ This would ban both their forum username and their IP address. Player %1 profile - + Профіль гравця %1 @@ -2273,7 +2324,7 @@ This would ban both their forum username and their IP address. - + Left Stick Лівий міні-джойстик @@ -2367,14 +2418,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2393,7 +2444,7 @@ This would ban both their forum username and their IP address. - + Plus Плюс @@ -2406,15 +2457,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2471,236 +2522,236 @@ This would ban both their forum username and their IP address. - + Right Stick Правий міні-джойстик - - - - + + + + Clear Очистити - - - - - + + + + + [not set] [не задано] - - + + Invert button Інвертувати кнопку - - + + Toggle button Переключити кнопку - - + + Invert axis Інвертувати осі - - - + + + Set threshold Встановити поріг - - + + Choose a value between 0% and 100% Оберіть значення між 0% і 100% - + Toggle axis Переключити осі - + Set gyro threshold Встановити поріг гіроскопа - + Map Analog Stick Задати аналоговий міні-джойстик - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Після натискання на ОК, рухайте ваш міні-джойстик горизонтально, а потім вертикально. Щоб інвертувати осі, спочатку рухайте ваш міні-джойстик вертикально, а потім горизонтально. - + Center axis Центрувати осі - - + + Deadzone: %1% Мертва зона: %1% - - + + Modifier Range: %1% Діапазон модифікатора: %1% - - + + Pro Controller Контролер Pro - + Dual Joycons Подвійні Joy-Con'и - + Left Joycon Лівий Joy-Con - + Right Joycon Правий Joy-Con - + Handheld Портативний - + GameCube Controller Контролер GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Контролер NES - + SNES Controller Контролер SNES - + N64 Controller Контролер N64 - + Sega Genesis Sega Genesis - + Start / Pause Старт / Пауза - + Z Z - + Control Stick Міні-джойстик керування - + C-Stick C-Джойстик - + Shake! Потрусіть! - + [waiting] [очікування] - + New Profile Новий профіль - + Enter a profile name: Введіть ім'я профілю: - - + + Create Input Profile Створити профіль контролю - + The given profile name is not valid! Задане ім'я профілю недійсне! - + Failed to create the input profile "%1" Не вдалося створити профіль контролю "%1" - + Delete Input Profile Видалити профіль контролю - + Failed to delete the input profile "%1" Не вдалося видалити профіль контролю "%1" - + Load Input Profile Завантажити профіль контролю - + Failed to load the input profile "%1" Не вдалося завантажити профіль контролю "%1" - + Save Input Profile Зберегти профіль контролю - + Failed to save the input profile "%1" Не вдалося зберегти профіль контролю "%1" @@ -2748,7 +2799,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Configure Налаштувати @@ -2784,7 +2835,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Test Тест @@ -2804,77 +2855,77 @@ To invert the axes, first move your joystick vertically, and then horizontally.< <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Дізнатися більше</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters Номер порту містить неприпустимі символи - + Port has to be in range 0 and 65353 Порт повинен бути в районі від 0 до 65353 - + IP address is not valid IP-адреса недійсна - + This UDP server already exists Цей UDP сервер уже існує - + Unable to add more than 8 servers Неможливо додати більше 8 серверів - + Testing Тестування - + Configuring Налаштування - + Test Successful Тест успішний - + Successfully received data from the server. Успішно отримано інформацію із сервера - + Test Failed Тест провалено - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Не вдалося отримати дійсні дані з сервера.<br>Переконайтеся, що сервер правильно налаштований, а також перевірте адресу та порт. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. Тест UDP або калібрація в процесі.<br>Будь ласка, зачекайте завершення. @@ -3203,8 +3254,8 @@ UUID: %2 - Ring Sensor Parameters - Параметри сенсора Ring + Virtual Ring Sensor Parameters + @@ -3224,33 +3275,90 @@ UUID: %2 Мертва зона: 0% - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults За замовчуванням - + Clear Очистити - + [not set] [не задано] - + Invert axis Інвертувати осі - - + + Deadzone: %1% Мертва зона: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Налаштування + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [очікування] @@ -3555,8 +3663,8 @@ UUID: %2 - English - Англійська (English) + American English + Американська Англійська @@ -3656,7 +3764,7 @@ UUID: %2 Device Name - + Назва пристрою @@ -3689,22 +3797,27 @@ UUID: %2 Перегенерувати - + System settings are available only when game is not running. Налаштування системи доступні тільки тоді, коли гру не запущено. - + + Warning: "%1" is not a valid language for region "%2" + Увага: мова "%1" не підходить для регіону "%2" + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? Це замінить ваш поточний віртуальний Switch новим. Ваш поточний віртуальний Switch буде безповоротно втрачено. Це може мати несподівані наслідки в іграх. Може не спрацювати, якщо ви використовуєте застарілу конфігурацію збережених ігор. Продовжити? - + Warning Увага - + Console ID: 0x%1 Ідентифікатор консолі: 0x%1 @@ -3775,7 +3888,7 @@ UUID: %2 Налаштування TAS - + Select TAS Load Directory... Обрати папку завантаження TAS... @@ -4331,7 +4444,7 @@ Drag points to change position, or double-click table cells to edit values.Контролер P1 - + &Controller P1 [&C] Контролер P1 @@ -4344,42 +4457,37 @@ Drag points to change position, or double-click table cells to edit values.Пряме підключення - - IP Address - IP-адреса + + Server Address + - - IP - IP + + <html><head/><body><p>Server address of the host</p></body></html> + - - <html><head/><body><p>IPv4 address of the host</p></body></html> - <html><head/><body><p>IPv4 адреса хоста</p></body></html> - - - + Port Порт - + <html><head/><body><p>Port number the host is listening on</p></body></html> <html><head/><body><p>Номер порту, який прослуховується хостом</p></body></html> - + Nickname Псевдонім - + Password Пароль - + Connect Підключитися @@ -4387,12 +4495,12 @@ Drag points to change position, or double-click table cells to edit values. DirectConnectWindow - + Connecting Підключення - + Connect Підключитися @@ -4463,472 +4571,482 @@ Drag points to change position, or double-click table cells to edit values.Час, який потрібен для емуляції 1 кадру Switch, не беручи до уваги обмеження FPS або вертикальну синхронізацію. Для емуляції в повній швидкості значення має бути не більше 16,67 мс. - + &Clear Recent Files [&C] Очистити нещодавні файли - + &Continue [&C] Продовжити - + &Pause [&P] Пауза - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping В yuzu запущено гру - + Warning Outdated Game Format Попередження застарілий формат гри - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Для цієї гри ви використовуєте розархівований формат ROM'а, який є застарілим і був замінений іншими, такими як NCA, NAX, XCI або NSP. У розархівованих каталогах ROM'а відсутні іконки, метадані та підтримка оновлень. <br><br>Для отримання інформації про різні формати Switch, підтримувані yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>перегляньте нашу вікі</a>. Це повідомлення більше не буде відображатися. - - + + Error while loading ROM! Помилка під час завантаження ROM! - + The ROM format is not supported. Формат ROM'а не підтримується. - + An error occurred initializing the video core. Сталася помилка під час ініціалізації відеоядра. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu зіткнувся з помилкою під час запуску відеоядра. Зазвичай це спричинено застарілими драйверами ГП, включно з інтегрованими. Перевірте журнал для отримання більш детальної інформації. Додаткову інформацію про доступ до журналу дивіться на наступній сторінці: <a href='https://yuzu-emu.org/help/reference/log-files/'>Як завантажити файл журналу</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Помилка під час завантаження ROM'а! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Будь ласка, дотримуйтесь <a href='https://yuzu-emu.org/help/quickstart/'>короткого керівництва користувача yuzu</a> щоб пере-дампити ваші файли<br>Ви можете звернутися до вікі yuzu</a> або Discord yuzu</a> для допомоги - + An unknown error occurred. Please see the log for more details. Сталася невідома помилка. Будь ласка, перевірте журнал для подробиць. - + (64-bit) (64-бітний) - + (32-bit) (32-бітний) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Закриваємо програму... - + Save Data Збереження - + Mod Data Дані модів - + Error Opening %1 Folder Помилка під час відкриття папки %1 - - + + Folder does not exist! Папка не існує! - + Error Opening Transferable Shader Cache Помилка під час відкриття переносного кешу шейдерів - + Failed to create the shader cache directory for this title. Не вдалося створити папку кешу шейдерів для цієї гри. - + Error Removing Contents Помилка під час видалення вмісту - + Error Removing Update Помилка під час видалення оновлень - + Error Removing DLC Помилка під час видалення DLC - + Remove Installed Game Contents? Видалити встановлений вміст ігор? - + Remove Installed Game Update? Видалити встановлені оновлення гри? - + Remove Installed Game DLC? Видалити встановлені DLC гри? - + Remove Entry Видалити запис - - - - - - + + + + + + Successfully Removed Успішно видалено - + Successfully removed the installed base game. Встановлену гру успішно видалено. - + The base game is not installed in the NAND and cannot be removed. Гру не встановлено в NAND і не може буде видалено. - + Successfully removed the installed update. Встановлене оновлення успішно видалено. - + There is no update installed for this title. Для цієї гри не було встановлено оновлення. - + There are no DLC installed for this title. Для цієї гри не було встановлено DLC. - + Successfully removed %1 installed DLC. Встановлений DLC %1 було успішно видалено - + Delete OpenGL Transferable Shader Cache? Видалити переносний кеш шейдерів OpenGL? - + Delete Vulkan Transferable Shader Cache? Видалити переносний кеш шейдерів Vulkan? - + Delete All Transferable Shader Caches? Видалити весь переносний кеш шейдерів? - + Remove Custom Game Configuration? Видалити користувацьке налаштування гри? - + Remove File Видалити файл - - + + Error Removing Transferable Shader Cache Помилка під час видалення переносного кешу шейдерів - - + + A shader cache for this title does not exist. Кеш шейдерів для цієї гри не існує. - + Successfully removed the transferable shader cache. Переносний кеш шейдерів успішно видалено. - + Failed to remove the transferable shader cache. Не вдалося видалити переносний кеш шейдерів. - - + + Error Removing Vulkan Driver Pipeline Cache + Помилка під час видалення конвеєрного кешу Vulkan + + + + Failed to remove the driver pipeline cache. + Не вдалося видалити конвеєрний кеш шейдерів. + + + + Error Removing Transferable Shader Caches Помилка під час видалення переносного кешу шейдерів - + Successfully removed the transferable shader caches. Переносний кеш шейдерів успішно видалено. - + Failed to remove the transferable shader cache directory. Помилка під час видалення папки переносного кешу шейдерів. - - + + Error Removing Custom Configuration Помилка під час видалення користувацького налаштування - + A custom configuration for this title does not exist. Користувацьких налаштувань для цієї гри не існує. - + Successfully removed the custom game configuration. Користувацьке налаштування гри успішно видалено. - + Failed to remove the custom game configuration. Не вдалося видалити користувацьке налаштування гри. - - + + RomFS Extraction Failed! Не вдалося вилучити RomFS! - + There was an error copying the RomFS files or the user cancelled the operation. Сталася помилка під час копіювання файлів RomFS або користувач скасував операцію. - + Full Повний - + Skeleton Скелет - + Select RomFS Dump Mode Виберіть режим дампа RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Будь ласка, виберіть, як ви хочете виконати дамп RomFS <br>Повний скопіює всі файли в нову папку, тоді як <br>скелет створить лише структуру папок. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root В %1 недостатньо вільного місця для вилучення RomFS. Будь ласка, звільніть місце або виберіть іншу папку для дампа в Емуляція > Налаштування > Система > Файлова система > Корінь дампа - + Extracting RomFS... Вилучення RomFS... - - + + Cancel Скасувати - + RomFS Extraction Succeeded! Вилучення RomFS пройшло успішно! - + The operation completed successfully. Операція завершилася успішно. - - - - - + + + + + Create Shortcut - + Створити ярлик - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Це створить ярлик для поточного AppImage. Він може не працювати після оновлень. Продовжити? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Не вдається створити ярлик на робочому столі. Шлях "%1" не існує. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Неможливо створити ярлик у меню додатків. Шлях "%1" не існує і не може бути створений. - + Create Icon - + Створити іконку - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Неможливо створити файл іконки. Шлях "%1" не існує і не може бути створений. - + Start %1 with the yuzu Emulator - + Запустити %1 за допомогою емулятора yuzu - + Failed to create a shortcut at %1 - + Не вдалося створити ярлик у %1 - + Successfully created a shortcut to %1 - + Успішно створено ярлик у %1 - + Error Opening %1 Помилка відкриття %1 - + Select Directory Обрати папку - + Properties Властивості - + The game properties could not be loaded. Не вдалося завантажити властивості гри. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Виконуваний файл Switch (%1);;Усі файли (*.*) - + Load File Завантажити файл - + Open Extracted ROM Directory Відкрити папку вилученого ROM'а - + Invalid Directory Selected Вибрано неприпустиму папку - + The directory you have selected does not contain a 'main' file. Папка, яку ви вибрали, не містить файлу 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Встановлюваний файл Switch (*.nca, *.nsp, *.xci);;Архів контенту Nintendo (*.nca);;Пакет подачі Nintendo (*.nsp);;Образ картриджа NX (*.xci) - + Install Files Встановити файли - + %n file(s) remaining Залишився %n файлЗалишилося %n файл(ів)Залишилося %n файл(ів)Залишилося %n файл(ів) - + Installing file "%1"... Встановлення файлу "%1"... - + Install Results Результати встановлення - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Щоб уникнути можливих конфліктів, ми не рекомендуємо користувачам встановлювати ігри в NAND. Будь ласка, використовуйте цю функцію тільки для встановлення оновлень і завантажуваного контенту. - + %n file(s) were newly installed %n файл було нещодавно встановлено @@ -4938,7 +5056,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) were overwritten %n файл було перезаписано @@ -4948,7 +5066,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) failed to install %n файл не вдалося встановити @@ -4958,377 +5076,377 @@ Please, only use this feature to install updates and DLC. - + System Application Системний додаток - + System Archive Системний архів - + System Application Update Оновлення системного додатку - + Firmware Package (Type A) Пакет прошивки (Тип А) - + Firmware Package (Type B) Пакет прошивки (Тип Б) - + Game Гра - + Game Update Оновлення гри - + Game DLC DLC до гри - + Delta Title Дельта-титул - + Select NCA Install Type... Виберіть тип установки NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Будь ласка, виберіть тип додатку, який ви хочете встановити для цього NCA: (У більшості випадків, підходить стандартний вибір "Гра".) - + Failed to Install Помилка встановлення - + The title type you selected for the NCA is invalid. Тип додатку, який ви вибрали для NCA, недійсний. - + File not found Файл не знайдено - + File "%1" not found Файл "%1" не знайдено - + OK ОК - - + + Hardware requirements not met Не задоволені системні вимоги - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Ваша система не відповідає рекомендованим системним вимогам. Звіти про сумісність було вимкнено. - + Missing yuzu Account Відсутній обліковий запис yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Щоб надіслати звіт про сумісність гри, необхідно прив'язати свій обліковий запис yuzu. <br><br/>Щоб прив'язати свій обліковий запис yuzu, перейдіть у розділ Емуляція &gt; Параметри &gt; Мережа. - + Error opening URL Помилка під час відкриття URL - + Unable to open the URL "%1". Не вдалося відкрити URL: "%1". - + TAS Recording Запис TAS - + Overwrite file of player 1? Перезаписати файл гравця 1? - + Invalid config detected Виявлено неприпустиму конфігурацію - + Handheld controller can't be used on docked mode. Pro controller will be selected. Портативний контролер не може бути використаний у режимі док-станції. Буде обрано контролер Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Поточний amiibo було прибрано - + Error Помилка - - + + The current game is not looking for amiibos Поточна гра не шукає amiibo - + Amiibo File (%1);; All Files (*.*) Файл Amiibo (%1);; Всі Файли (*.*) - + Load Amiibo Завантажити Amiibo - + Error loading Amiibo data Помилка під час завантаження даних Amiibo - + The selected file is not a valid amiibo Обраний файл не є допустимим amiibo - + The selected file is already on use Обраний файл уже використовується - + An unknown error occurred Виникла невідома помилка - + Capture Screenshot Зробити знімок екрану - + PNG Image (*.png) Зображення PNG (*.png) - + TAS state: Running %1/%2 Стан TAS: Виконується %1/%2 - + TAS state: Recording %1 Стан TAS: Записується %1 - + TAS state: Idle %1/%2 Стан TAS: Простий %1/%2 - + TAS State: Invalid Стан TAS: Неприпустимий - + &Stop Running [&S] Зупинка - + &Start [&S] Почати - + Stop R&ecording [&E] Закінчити запис - + R&ecord [&E] Запис - + Building: %n shader(s) Побудова: %n шейдерПобудова: %n шейдер(ів)Побудова: %n шейдер(ів)Побудова: %n шейдер(ів) - + Scale: %1x %1 is the resolution scaling factor Масштаб: %1x - + Speed: %1% / %2% Швидкість: %1% / %2% - + Speed: %1% Швидкість: %1% - + Game: %1 FPS (Unlocked) Гра: %1 FPS (Необмежено) - + Game: %1 FPS Гра: %1 FPS - + Frame: %1 ms Кадр: %1 мс - + GPU NORMAL ГП НОРМАЛЬНО - + GPU HIGH ГП ВИСОКО - + GPU EXTREME ГП ЕКСТРИМ - + GPU ERROR ГП ПОМИЛКА - + DOCKED В ДОК-СТАНЦІЇ - + HANDHELD ПОРТАТИВНИЙ - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NULL - + NEAREST НАЙБЛИЖЧІЙ - - + + BILINEAR БІЛІНІЙНИЙ - + BICUBIC БІКУБІЧНИЙ - + GAUSSIAN ГАУС - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA БЕЗ ЗГЛАДЖУВАННЯ - + FXAA FXAA - + SMAA - + SMAA - + Confirm Key Rederivation Підтвердіть перерахунок ключа - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5345,37 +5463,37 @@ This will delete your autogenerated key files and re-run the key derivation modu Це видалить ваші автоматично згенеровані файли ключів і повторно запустить модуль розрахунку ключів. - + Missing fuses Відсутні запобіжники - + - Missing BOOT0 - Відсутній BOOT0 - + - Missing BCPKG2-1-Normal-Main - Відсутній BCPKG2-1-Normal-Main - + - Missing PRODINFO - Відсутній PRODINFO - + Derivation Components Missing Компоненти розрахунку відсутні - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Ключі шифрування відсутні.<br>Будь ласка, дотримуйтесь <a href='https://yuzu-emu.org/help/quickstart/'>короткого керівництва користувача yuzu</a>, щоб отримати всі ваші ключі, прошивку та ігри<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5384,39 +5502,39 @@ on your system's performance. від продуктивності вашої системи. - + Deriving Keys Отримання ключів - + Select RomFS Dump Target Оберіть ціль для дампа RomFS - + Please select which RomFS you would like to dump. Будь ласка, виберіть, який RomFS ви хочете здампити. - + Are you sure you want to close yuzu? Ви впевнені, що хочете закрити yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Ви впевнені, що хочете зупинити емуляцію? Будь-який незбережений прогрес буде втрачено. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5428,44 +5546,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGL недоступний! - + OpenGL shared contexts are not supported. - + Загальні контексти OpenGL не підтримуються. - + yuzu has not been compiled with OpenGL support. yuzu не було зібрано з підтримкою OpenGL. - - + + Error while initializing OpenGL! Помилка під час ініціалізації OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Ваш ГП може не підтримувати OpenGL, або у вас встановлено застарілий графічний драйвер. - + Error while initializing OpenGL 4.6! Помилка під час ініціалізації OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Ваш ГП може не підтримувати OpenGL 4.6, або у вас встановлено застарілий графічний драйвер.<br><br>Рендерер GL:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Ваш ГП може не підтримувати одне або кілька необхідних розширень OpenGL. Будь ласка, переконайтеся в тому, що у вас встановлено останній графічний драйвер.<br><br>Рендерер GL:<br>%1<br><br>Розширення, що не підтримуються:<br>%2 @@ -5566,17 +5684,17 @@ Would you like to bypass this and exit anyway? Create Shortcut - + Створити ярлик Add to Desktop - + Додати на Робочий стіл Add to Applications Menu - + Додати до меню застосунків @@ -5968,7 +6086,7 @@ Debug Message: Встановити - + Install Files to NAND Встановити файли в NAND @@ -5976,7 +6094,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 У тексті неприпустимі такі символи: @@ -6633,7 +6751,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE СТАРТ/ПАУЗА @@ -6682,31 +6800,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [не задано] @@ -6717,14 +6835,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Ось %1%2 @@ -6735,262 +6853,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [невідомо] - + - + Left Вліво - + - + Right Вправо - + - + Down Вниз - + - + Up Вгору - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Start - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle Кружечок - - + + Cross Хрестик - - + + Square Квадратик - - + + Triangle Трикутничок - - + + Share Share - - + + Options Options - - + + [undefined] [невизначено] - + %1%2 %1%2 - - + + [invalid] [неприпустимо] - - - - + + + + %1%2Hat %3 %1%2Напр. %3 - - - - - - + + + + + + %1%2Axis %3 %1%2Ось %3 - - + + %1%2Axis %3,%4,%5 %1%2Ось %3,%4,%5 - - + + %1%2Motion %3 %1%2Рух %3 - - - - + + + + %1%2Button %3 %1%2Кнопка %3 - - + + [unused] [не використаний] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Плюс + + + + Minus + Мінус + + + + Home Home - + + Capture + Захоплення + + + Touch Сенсор - + Wheel Indicates the mouse wheel Коліщатко - + Backward Назад - + Forward Вперед - + Task Задача - + Extra Додаткова - + %1%2%3 %1%2%3 diff --git a/dist/languages/zh_CN.ts b/dist/languages/zh_CN.ts index abbe2b408..6fc0ade17 100644 --- a/dist/languages/zh_CN.ts +++ b/dist/languages/zh_CN.ts @@ -267,17 +267,17 @@ This would ban both their forum username and their IP address. <html><head/><body><p>Does the game reach gameplay?</p></body></html> - <html><head/><body><p>游戏是否具有游戏性？</p></body></html> + <html><head/><body><p>游戏是否可玩？</p></body></html> Yes The game works without crashes - 是的，游戏运行时没有崩溃 + 没有，游戏运行时没有崩溃 No The game crashes or freezes during gameplay - 不，游戏运行时出现卡死或崩溃 + 有，游戏运行时出现卡死或崩溃 @@ -287,12 +287,12 @@ This would ban both their forum username and their IP address. Yes The game can be finished without any workarounds - 没有，可以顺利地完成游戏过程 + 是的，可以顺利地完成游戏过程 No The game can't progress past a certain area - 有，游戏在特定区段无法继续 + 不，游戏在特定区段无法继续 @@ -526,7 +526,7 @@ This would ban both their forum username and their IP address. <div>This option improves speed by reducing accuracy of fused-multiply-add instructions on CPUs without native FMA support.</div> -<div>该选项通过降低积和熔加运算的精度而提高模拟器在不支持 FMA 指令集 CPU 上的运行速度。</div> +<div>该选项通过降低积和熔加运算的精度来提高模拟器在不支持 FMA 指令集 CPU 上的运行速度。</div> @@ -552,7 +552,7 @@ This would ban both their forum username and their IP address. <div>This option improves the speed of 32 bits ASIMD floating-point functions by running with incorrect rounding modes.</div> -<div>该选项通过在不正确的舍入模式下运行，能提高 32 位 ASIMD 浮点函数的运行速度。</div> +<div>该选项通过不正确的舍入模式来提高 32 位 ASIMD 浮点函数的运行速度。</div> @@ -931,105 +931,115 @@ This would ban both their forum username and their IP address. Disable Macro JIT - 禁用宏 JIT + 禁用宏即时编译 - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + 启用时，将禁用宏高阶模拟。这会降低游戏运行速度。 + + + + Disable Macro HLE + 禁用宏高阶模拟 + + + When checked, yuzu will log statistics about the compiled pipeline cache 选中时，yuzu 将记录有关已编译着色器缓存的统计信息。 - + Enable Shader Feedback 启用着色器反馈 - + When checked, it executes shaders without loop logic changes 启用后，yuzu 在执行着色器时，不会修改循环结构的条件判断 - + Disable Loop safety checks 禁用循环体安全检查 - + Debugging 调试选项 - + Enable Verbose Reporting Services** 启用详细报告服务** - + Enable FS Access Log 启用文件系统访问记录 - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. 启用此选项会将最新的音频命令列表输出到控制台。只影响使用音频渲染器的游戏。 - + Dump Audio Commands To Console** 将音频命令转储至控制台** - + Create Minidump After Crash 微型故障转储 - + Advanced 高级选项 - + Kiosk (Quest) Mode Kiosk (Quest) 模式 - + Enable CPU Debugging 启用 CPU 模拟调试 - + Enable Debug Asserts 启用调试 - + Enable Auto-Stub** 启用自动函数打桩（Auto-Stub）** - + Enable All Controller Types 启用其他类型的控制器 - + Disable Web Applet 禁用 Web 应用程序 - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. 允许 yuzu 在启动时检查 Vulkan 环境是否正常工作。如果是其他程序导致 yuzu 出现相关问题，请禁用此选项。 - + Perform Startup Vulkan Check 启动时进行 Vulkan 检测 - + **This will be reset automatically when yuzu closes. **该选项将在 yuzu 关闭时自动重置。 @@ -1044,12 +1054,12 @@ This would ban both their forum username and their IP address. 重启 yuzu 后才能应用此设置。 - + Web applet not compiled Web 应用程序未编译 - + MiniDump creation not compiled 微型转储未编译 @@ -1059,7 +1069,7 @@ This would ban both their forum username and their IP address. Configure Debug Controller - 调试控制器设置 + 控制器调试设置 @@ -1100,13 +1110,13 @@ This would ban both their forum username and their IP address. - + Audio 声音 - + CPU CPU @@ -1122,13 +1132,13 @@ This would ban both their forum username and their IP address. - + General 通用 - + Graphics 图形 @@ -1144,7 +1154,7 @@ This would ban both their forum username and their IP address. - + Controls 控制 @@ -1160,7 +1170,7 @@ This would ban both their forum username and their IP address. - + System 系统 @@ -1320,7 +1330,7 @@ This would ban both their forum username and their IP address. Form - Form + 类型 @@ -1394,7 +1404,7 @@ This would ban both their forum username and their IP address. Form - Form + 类型 @@ -1423,7 +1433,7 @@ This would ban both their forum username and their IP address. - + None 无 @@ -1534,112 +1544,127 @@ This would ban both their forum username and their IP address. + 1.5X (1080p/1620p) [EXPERIMENTAL] + 1.5X (1080p/1620p) [实验性] + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + 7X (5040p/7560p) + + + + 8X (5760p/8640p) + 8X (5760p/8640p) + + + Window Adapting Filter: 窗口滤镜： - + Nearest Neighbor 近邻取样 - + Bilinear 双线性过滤 - + Bicubic 双三线过滤 - + Gaussian 高斯模糊 - + ScaleForce 强制缩放 - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ 超级分辨率锐画技术 (仅限 Vulkan 模式) + + AMD FidelityFX™️ Super Resolution + AMD FidelityFX™️ 超级分辨率锐画技术 - + Anti-Aliasing Method: 抗锯齿方式： - + FXAA 快速近似抗锯齿 - + SMAA 子像素形态学抗锯齿 - + Use global FSR Sharpness 启用全局 FSR 锐化 - + Set FSR Sharpness 设置 FSR 锐化 - + FSR Sharpness: FSR 锐化度： - + 100% 100% - - + + Use global background color 使用全局背景颜色 - + Set background color: 设置背景颜色: - + Background Color: 背景颜色: @@ -1684,76 +1709,96 @@ This would ban both their forum username and their IP address. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + 在后台运行的同时等待图形命令，以防止 GPU 降低时钟速度。 + + + + Force maximum clocks (Vulkan only) + 强制最大时钟 (仅限 Vulkan 模式) + + + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. 垂直同步可防止画面产生撕裂感。但启用垂直同步后，某些设备性能可能会有所降低。如果您没有感到性能差异，请保持启用状态。 - + Use VSync 启用垂直同步 - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. 启用异步着色器编译，这可能会减少着色器卡顿。实验性功能。 - + Use asynchronous shader building (Hack) 启用异步着色器构建 (不稳定) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. 启用快速 GPU 时钟。此选项将强制大多数游戏以其最高分辨率运行。 - + Use Fast GPU Time (Hack) 启用快速 GPU 时钟 (不稳定) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. 启用悲观缓冲区刷新。此选项将强制刷新未修改的缓冲区，可能会降低性能。 - + Use pessimistic buffer flushes (Hack) 启用悲观缓冲区刷新 (不稳定) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + 启用 GPU 供应商专用的管线缓存。在 Vulkan 驱动程序内部不存储管线缓存的情况下，此选项可显著提高着色器加载速度。 + + + + Use Vulkan pipeline cache + 启用 Vulkan 管线缓存 + + + Anisotropic Filtering: 各向异性过滤： - + Automatic 自动 - + Default 系统默认 - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1811,7 +1856,7 @@ This would ban both their forum username and their IP address. The entered key sequence is already assigned to: %1 - 输入的密钥序列已分配给: %1 + 输入的按键序列已分配给: %1 @@ -1851,7 +1896,7 @@ This would ban both their forum username and their IP address. The default key sequence is already assigned to: %1 - 默认密钥序列已分配给: %1 + 默认的按键序列已分配给: %1 @@ -2141,7 +2186,7 @@ This would ban both their forum username and their IP address. - + Configure 设置 @@ -2167,6 +2212,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu 需要重启 yuzu @@ -2186,22 +2232,27 @@ This would ban both their forum username and their IP address. 控制器导航 - + + Enable direct JoyCon driver + 启用 JoyCon 直接驱动 + + + Enable mouse panning 启用鼠标平移 - + Mouse sensitivity 鼠标灵敏度 - + % % - + Motion / Touch 体感/触摸 @@ -2313,7 +2364,7 @@ This would ban both their forum username and their IP address. - + Left Stick 左摇杆 @@ -2407,14 +2458,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2433,7 +2484,7 @@ This would ban both their forum username and their IP address. - + Plus ＋ @@ -2446,15 +2497,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2511,236 +2562,236 @@ This would ban both their forum username and their IP address. - + Right Stick 右摇杆 - - - - + + + + Clear 清除 - - - - - + + + + + [not set] [未设置] - - + + Invert button 反转按钮 - - + + Toggle button 切换按键 - - + + Invert axis 体感方向倒置 - - - + + + Set threshold 阈值设定 - - + + Choose a value between 0% and 100% 选择一个介于 0% 和 100% 之间的值 - + Toggle axis 切换轴 - + Set gyro threshold 陀螺仪阈值设定 - + Map Analog Stick 映射摇杆 - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. 在按下确定后，首先水平移动你的手柄，然后垂直移动它。 如果要使体感方向倒置，首先垂直移动你的手柄，然后水平移动它。 - + Center axis 中心轴 - - + + Deadzone: %1% 摇杆死区：%1% - - + + Modifier Range: %1% 摇杆灵敏度：%1% - - + + Pro Controller Pro Controller - + Dual Joycons 双 Joycons 手柄 - + Left Joycon 左 Joycon 手柄 - + Right Joycon 右 Joycon 手柄 - + Handheld 掌机模式 - + GameCube Controller GameCube 控制器 - + Poke Ball Plus 精灵球 PLUS - + NES Controller NES 控制器 - + SNES Controller SNES 控制器 - + N64 Controller N64 控制器 - + Sega Genesis 世嘉创世纪 - + Start / Pause 开始 / 暂停 - + Z Z - + Control Stick 控制摇杆 - + C-Stick C 摇杆 - + Shake! 摇动！ - + [waiting] [等待中] - + New Profile - 保存自定义设置 + 新建自定义设置 - + Enter a profile name: 输入配置文件名称： - - + + Create Input Profile 新建输入配置文件 - + The given profile name is not valid! 输入的配置文件名称无效！ - + Failed to create the input profile "%1" 新建输入配置文件 "%1" 失败 - + Delete Input Profile 删除输入配置文件 - + Failed to delete the input profile "%1" 删除输入配置文件 "%1" 失败 - + Load Input Profile 加载输入配置文件 - + Failed to load the input profile "%1" 加载输入配置文件 "%1" 失败 - + Save Input Profile 保存输入配置文件 - + Failed to save the input profile "%1" 保存输入配置文件 "%1" 失败 @@ -2788,7 +2839,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Configure 设置 @@ -2824,7 +2875,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Test 测试 @@ -2844,77 +2895,77 @@ To invert the axes, first move your joystick vertically, and then horizontally.< <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">了解更多</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters 端口号中包含无效字符 - + Port has to be in range 0 and 65353 端口必须为 0 到 65353 之间 - + IP address is not valid 无效的 IP 地址 - + This UDP server already exists 此 UDP 服务器已存在 - + Unable to add more than 8 servers 最多只能添加 8 个服务器 - + Testing 测试中 - + Configuring 配置中 - + Test Successful 测试成功 - + Successfully received data from the server. 已成功地从服务器获取数据。 - + Test Failed 测试失败 - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. 无法从服务器获取数据。<br>请验证服务器是否正在运行，以及地址和端口是否配置正确。 - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. UDP 测试或触摸校准正在进行中。<br>请耐心等待。 @@ -3243,8 +3294,8 @@ UUID: %2 - Ring Sensor Parameters - 健身环传感器参数 + Virtual Ring Sensor Parameters + 虚拟健身环传感器参数 @@ -3264,33 +3315,90 @@ UUID: %2 摇杆死区：0% - + + Direct Joycon Driver + Joycon 直接驱动 + + + + Enable Ring Input + 启用健身环输入 + + + + + Enable + 启用 + + + + Ring Sensor Value + 健身环传感器参数 + + + + + Not connected + 未连接 + + + Restore Defaults 恢复默认 - + Clear 清除 - + [not set] [未设置] - + Invert axis 体感方向倒置 - - + + Deadzone: %1% 摇杆死区：%1% - + + Error enabling ring input + 启用健身环输入时出错 + + + + Direct Joycon driver is not enabled + 未启用 Joycon 直接驱动 + + + + Configuring + 配置中 + + + + The current mapped device doesn't support the ring controller + 当前映射的设备不支持健身环控制器 + + + + The current mapped device doesn't have a ring attached + 当前映射的设备未连接健身环控制器 + + + + Unexpected driver result %1 + 意外的驱动结果： %1 + + + [waiting] [请按键] @@ -3300,7 +3408,7 @@ UUID: %2 Form - Form + 类型 @@ -3595,8 +3703,8 @@ UUID: %2 - English - 英语 + American English + 美式英语 @@ -3729,22 +3837,27 @@ UUID: %2 重置 ID - + System settings are available only when game is not running. 只有当游戏不在运行时，系统设置才可用。 - + + Warning: "%1" is not a valid language for region "%2" + 警告：“ %1 ”并不是“ %2 ”地区的有效语言 + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? 这将使用一个新的虚拟 Switch 取代你当前的虚拟 Switch。您当前的虚拟 Switch 将无法恢复。在部分游戏中可能会出现意外效果。如果你使用一个过时的配置存档这可能会失败。确定要继续吗？ - + Warning 警告 - + Console ID: 0x%1 设备 ID: 0x%1 @@ -3815,7 +3928,7 @@ UUID: %2 TAS 设置 - + Select TAS Load Directory... 选择 TAS 载入目录... @@ -3879,7 +3992,7 @@ Drag points to change position, or double-click table cells to edit values. New Profile - 保存自定义设置 + 新建自定义设置 @@ -4035,7 +4148,7 @@ Drag points to change position, or double-click table cells to edit values. Note: Changing language will apply your configuration. - 注意: 切换语言将应用您的配置。 + 注意: 切换语言将直接应用您当前的配置。 @@ -4208,7 +4321,7 @@ Drag points to change position, or double-click table cells to edit values. Form - Form + 类型 @@ -4371,7 +4484,7 @@ Drag points to change position, or double-click table cells to edit values.控制器 P1 - + &Controller P1 控制器 P1 (&C) @@ -4384,42 +4497,37 @@ Drag points to change position, or double-click table cells to edit values.直接连接 - - IP Address - IP 地址 + + Server Address + 服务器地址 - - IP - IP + + <html><head/><body><p>Server address of the host</p></body></html> + <html><head/><body><p>服务器地址</p></body></html> - - <html><head/><body><p>IPv4 address of the host</p></body></html> - <html><head/><body><p>服务器 IPv4 地址</p></body></html> - - - + Port 端口 - + <html><head/><body><p>Port number the host is listening on</p></body></html> - <html><head/><body><p>服务器端口</p></body> + <html><head/><body><p>服务器端口</p></body></html> - + Nickname 昵称 - + Password 密码 - + Connect 连接 @@ -4427,12 +4535,12 @@ Drag points to change position, or double-click table cells to edit values. DirectConnectWindow - + Connecting 连接中 - + Connect 连接 @@ -4490,7 +4598,7 @@ Drag points to change position, or double-click table cells to edit values. Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. - 当前的模拟速度。高于或低于 100% 的值表示模拟正在运行得比实际 Switch 更快或更慢。 + 当前的模拟速度。高于或低于 100% 的值表示运行速度比实际的 Switch 更快或更慢。 @@ -4503,863 +4611,873 @@ Drag points to change position, or double-click table cells to edit values.在不计算速度限制和垂直同步的情况下，模拟一个 Switch 帧的实际时间。若要进行全速模拟，这个数值不应超过 16.67 毫秒。 - + &Clear Recent Files 清除最近文件 (&C) - + &Continue 继续 (&C) - + &Pause 暂停 (&P) - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu 正在运行中 - + Warning Outdated Game Format 过时游戏格式警告 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. 目前使用的游戏为解体的 ROM 目录格式，这是一种过时的格式，已被其他格式替代，如 NCA，NAX，XCI 或 NSP。解体的 ROM 目录缺少图标、元数据和更新支持。<br><br>有关 yuzu 支持的各种 Switch 格式的说明，<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>请查看我们的 wiki</a>。此消息将不会再次出现。 - - + + Error while loading ROM! 加载 ROM 时出错！ - + The ROM format is not supported. 该 ROM 格式不受支持。 - + An error occurred initializing the video core. - 在初始化视频核心时发生错误。 + 初始化视频核心时发生错误 - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu 在运行视频核心时发生错误。这可能是由 GPU 驱动程序过旧造成的。有关详细信息，请参阅日志文件。关于日志文件的更多信息，请参考以下页面：<a href='https://yuzu-emu.org/help/reference/log-files/'>如何上传日志文件</a>。 - + Error while loading ROM! %1 %1 signifies a numeric error code. 加载 ROM 时出错！ %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>请参考<a href='https://yuzu-emu.org/help/quickstart/'>yuzu 快速导航</a>以获取相关文件。<br>您可以参考 yuzu 的 wiki 页面</a>或 Discord 社区</a>以获得帮助。 - + An unknown error occurred. Please see the log for more details. 发生了未知错误。请查看日志了解详情。 - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... 正在关闭… - + Save Data 保存数据 - + Mod Data Mod 数据 - + Error Opening %1 Folder 打开 %1 文件夹时出错 - - + + Folder does not exist! 文件夹不存在！ - + Error Opening Transferable Shader Cache 打开可转移着色器缓存时出错 - + Failed to create the shader cache directory for this title. 为该游戏创建着色器缓存目录时失败。 - + Error Removing Contents 删除内容时出错 - + Error Removing Update 删除更新时出错 - + Error Removing DLC 删除 DLC 时出错 - + Remove Installed Game Contents? 删除已安装的游戏内容？ - + Remove Installed Game Update? 删除已安装的游戏更新？ - + Remove Installed Game DLC? 删除已安装的游戏 DLC 内容？ - + Remove Entry 删除项目 - - - - - - + + + + + + Successfully Removed 删除成功 - + Successfully removed the installed base game. 成功删除已安装的游戏。 - + The base game is not installed in the NAND and cannot be removed. 该游戏未安装于 NAND 中，无法删除。 - + Successfully removed the installed update. 成功删除已安装的游戏更新。 - + There is no update installed for this title. 这个游戏没有任何已安装的更新。 - + There are no DLC installed for this title. 这个游戏没有任何已安装的 DLC 。 - + Successfully removed %1 installed DLC. 成功删除游戏 %1 安装的 DLC 。 - + Delete OpenGL Transferable Shader Cache? 删除 OpenGL 模式的着色器缓存？ - + Delete Vulkan Transferable Shader Cache? 删除 Vulkan 模式的着色器缓存？ - + Delete All Transferable Shader Caches? 删除所有的着色器缓存？ - + Remove Custom Game Configuration? 移除自定义游戏设置？ - + Remove File 删除文件 - - + + Error Removing Transferable Shader Cache 删除着色器缓存时出错 - - + + A shader cache for this title does not exist. 这个游戏的着色器缓存不存在。 - + Successfully removed the transferable shader cache. 成功删除着色器缓存。 - + Failed to remove the transferable shader cache. 删除着色器缓存失败。 - - + + Error Removing Vulkan Driver Pipeline Cache + 删除 Vulkan 驱动程序管线缓存时出错 + + + + Failed to remove the driver pipeline cache. + 删除驱动程序管线缓存失败。 + + + + Error Removing Transferable Shader Caches 删除着色器缓存时出错 - + Successfully removed the transferable shader caches. 着色器缓存删除成功。 - + Failed to remove the transferable shader cache directory. 删除着色器缓存目录失败。 - - + + Error Removing Custom Configuration 移除自定义游戏设置时出错 - + A custom configuration for this title does not exist. 这个游戏的自定义设置不存在。 - + Successfully removed the custom game configuration. 成功移除自定义游戏设置。 - + Failed to remove the custom game configuration. 移除自定义游戏设置失败。 - - + + RomFS Extraction Failed! RomFS 提取失败！ - + There was an error copying the RomFS files or the user cancelled the operation. 复制 RomFS 文件时出错，或用户取消了操作。 - + Full 完整 - + Skeleton 框架 - + Select RomFS Dump Mode 选择 RomFS 转储模式 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. - 请选择希望 RomFS 转储的方式。<br>“Full” 会将所有文件复制到新目录中，而<br>“Skeleton” 只会创建目录结构。 + 请选择 RomFS 转储的方式。<br>“完整” 会将所有文件复制到新目录中，而<br>“框架” 只会创建目录结构。 - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 没有足够的空间用于提取 RomFS。请保持足够的空间或于模拟—>设置—>系统—>文件系统—>转储根目录中选择一个其他目录。 - + Extracting RomFS... 正在提取 RomFS... - - + + Cancel 取消 - + RomFS Extraction Succeeded! RomFS 提取成功！ - + The operation completed successfully. 操作成功完成。 - - - - - + + + + + Create Shortcut 创建快捷方式 - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? 这将为当前的游戏创建快捷方式。但在其更新后，快捷方式可能无法正常工作。是否继续？ - + Cannot create shortcut on desktop. Path "%1" does not exist. 无法在桌面创建快捷方式。路径“ %1 ”不存在。 - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. 无法在应用程序菜单中创建快捷方式。路径“ %1 ”不存在且无法被创建。 - + Create Icon 创建图标 - + Cannot create icon file. Path "%1" does not exist and cannot be created. 无法创建图标文件。路径“ %1 ”不存在且无法被创建。 - + Start %1 with the yuzu Emulator 使用 yuzu 启动 %1 - + Failed to create a shortcut at %1 在 %1 处创建快捷方式时失败 - + Successfully created a shortcut to %1 成功地在 %1 处创建快捷方式 - + Error Opening %1 打开 %1 时出错 - + Select Directory 选择目录 - + Properties 属性 - + The game properties could not be loaded. 无法加载该游戏的属性信息。 - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch 可执行文件 (%1);;所有文件 (*.*) - + Load File 加载文件 - + Open Extracted ROM Directory 打开提取的 ROM 目录 - + Invalid Directory Selected 选择的目录无效 - + The directory you have selected does not contain a 'main' file. 选择的目录不包含 “main” 文件。 - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - 可安装的 Switch 文件 (*.nca *.nsp *.xci);;任天堂内容档案 (*.nca);;任天堂应用包 (*.nsp);;NX 卡带镜像 (*.xci) + 可安装 Switch 文件 (*.nca *.nsp *.xci);;任天堂内容档案 (*.nca);;任天堂应用包 (*.nsp);;NX 卡带镜像 (*.xci) - + Install Files 安装文件 - + %n file(s) remaining 剩余 %n 个文件 - + Installing file "%1"... 正在安装文件 "%1"... - + Install Results 安装结果 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 为了避免可能存在的冲突，我们不建议将游戏本体安装到 NAND 中。 此功能仅用于安装游戏更新和 DLC 。 - + %n file(s) were newly installed 最近安装了 %n 个文件 - + %n file(s) were overwritten %n 个文件被覆盖 - + %n file(s) failed to install %n 个文件安装失败 - + System Application 系统应用 - + System Archive 系统档案 - + System Application Update 系统应用更新 - + Firmware Package (Type A) 固件包 (A型) - + Firmware Package (Type B) 固件包 (B型) - + Game 游戏 - + Game Update 游戏更新 - + Game DLC 游戏 DLC - + Delta Title 差量程序 - + Select NCA Install Type... 选择 NCA 安装类型... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) 请选择此 NCA 的程序类型： （在大多数情况下，选择默认的“游戏”即可。） - + Failed to Install 安装失败 - + The title type you selected for the NCA is invalid. 选择的 NCA 程序类型无效。 - + File not found 找不到文件 - + File "%1" not found 文件 "%1" 未找到 - + OK 确定 - - + + Hardware requirements not met 硬件不满足要求 - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - 您的系统不满足运行 yuzu 推荐的推荐配置。兼容性报告已被禁用。 + 您的系统不满足运行 yuzu 的推荐配置。兼容性报告已被禁用。 - + Missing yuzu Account 未设置 yuzu 账户 - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. 要提交游戏兼容性测试用例，您必须设置您的 yuzu 帐户。<br><br/>要设置您的 yuzu 帐户，请转到模拟 &gt; 设置 &gt; 网络。 - + Error opening URL 打开 URL 时出错 - + Unable to open the URL "%1". 无法打开 URL : "%1" 。 - + TAS Recording TAS 录制中 - + Overwrite file of player 1? 覆盖玩家 1 的文件？ - + Invalid config detected 检测到无效配置 - + Handheld controller can't be used on docked mode. Pro controller will be selected. 掌机手柄无法在主机模式中使用。将会选择 Pro controller。 - - + + Amiibo Amiibo - - + + The current amiibo has been removed 当前的 Amiibo 已被移除。 - + Error 错误 - - + + The current game is not looking for amiibos 当前游戏并没有在寻找 Amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo 文件 (%1);; 全部文件 (*.*) - + Load Amiibo 加载 Amiibo - + Error loading Amiibo data 加载 Amiibo 数据时出错 - + The selected file is not a valid amiibo 选择的文件并不是有效的 amiibo - + The selected file is already on use 选择的文件已在使用中 - + An unknown error occurred 发生了未知错误 - + Capture Screenshot 捕获截图 - + PNG Image (*.png) PNG 图像 (*.png) - + TAS state: Running %1/%2 TAS 状态：正在运行 %1/%2 - + TAS state: Recording %1 TAS 状态：正在录制 %1 - + TAS state: Idle %1/%2 TAS 状态：空闲 %1/%2 - + TAS State: Invalid TAS 状态：无效 - + &Stop Running 停止运行 (&S) - + &Start 开始 (&S) - + Stop R&ecording 停止录制 (&E) - + R&ecord 录制 (&E) - + Building: %n shader(s) 正在编译 %n 个着色器文件 - + Scale: %1x %1 is the resolution scaling factor 缩放比例: %1x - + Speed: %1% / %2% 速度: %1% / %2% - + Speed: %1% 速度: %1% - + Game: %1 FPS (Unlocked) - 游戏: %1 FPS (未锁定) + FPS: %1 (未锁定) - + Game: %1 FPS FPS: %1 - + Frame: %1 ms - 帧延迟：%1 毫秒 + 帧延迟: %1 毫秒 - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HIGH - + GPU EXTREME GPU EXTREME - + GPU ERROR GPU ERROR - + DOCKED 主机模式 - + HANDHELD 掌机模式 - + OPENGL OPENGL - + VULKAN VULKAN - + NULL 无 - + NEAREST 邻近取样 - - + + BILINEAR 双线性过滤 - + BICUBIC 双三线过滤 - + GAUSSIAN 高斯模糊 - + SCALEFORCE 强制缩放 - + FSR FSR - - + + NO AA 抗锯齿关 - + FXAA FXAA - + SMAA SMAA - + Confirm Key Rederivation 确认重新生成密钥 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5375,37 +5493,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 这将删除您自动生成的密钥文件并重新运行密钥生成模块。 - + Missing fuses 项目丢失 - + - Missing BOOT0 - 丢失 BOOT0 - + - Missing BCPKG2-1-Normal-Main - 丢失 BCPKG2-1-Normal-Main - + - Missing PRODINFO - 丢失 PRODINFO - + Derivation Components Missing 组件丢失 - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 密钥缺失。<br>请查看<a href='https://yuzu-emu.org/help/quickstart/'>yuzu 快速导航</a>以获得你的密钥、固件和游戏。<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5414,39 +5532,39 @@ on your system's performance. 您的系统性能。 - + Deriving Keys 生成密钥 - + Select RomFS Dump Target 选择 RomFS 转储目标 - + Please select which RomFS you would like to dump. 请选择希望转储的 RomFS。 - + Are you sure you want to close yuzu? 您确定要关闭 yuzu 吗？ - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. 您确定要停止模拟吗？未保存的进度将会丢失。 - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5458,44 +5576,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGL 模式不可用！ - + OpenGL shared contexts are not supported. 不支持 OpenGL 共享上下文。 - + yuzu has not been compiled with OpenGL support. yuzu 没有使用 OpenGL 进行编译。 - - + + Error while initializing OpenGL! 初始化 OpenGL 时出错！ - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. 您的 GPU 可能不支持 OpenGL ，或者您没有安装最新的显卡驱动。 - + Error while initializing OpenGL 4.6! 初始化 OpenGL 4.6 时出错！ - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 您的 GPU 可能不支持 OpenGL 4.6 ，或者您没有安装最新的显卡驱动。<br><br>GL 渲染器：<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 您的 GPU 可能不支持某些必需的 OpenGL 扩展。请确保您已经安装最新的显卡驱动。<br><br>GL 渲染器：<br>%1<br><br>不支持的扩展：<br>%2 @@ -5704,7 +5822,7 @@ Would you like to bypass this and exit anyway? Intro/Menu - 开场 / 菜单 + 开场/菜单 @@ -5714,12 +5832,12 @@ Would you like to bypass this and exit anyway? Won't Boot - 无法打开 + 无法启动 The game crashes when attempting to startup. - 在启动游戏时直接崩溃了。 + 在启动游戏时直接崩溃。 @@ -5737,7 +5855,7 @@ Would you like to bypass this and exit anyway? Double-click to add a new folder to the game list - 双击以添加新的游戏文件夹 + 双击添加新的游戏文件夹 @@ -5998,7 +6116,7 @@ Debug Message: 安装 - + Install Files to NAND 安装文件到 NAND @@ -6006,7 +6124,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 文本中不能包含以下字符： @@ -6092,7 +6210,7 @@ Debug Message: Password Required to Join - 加入此房间需要密码 + 需要密码 @@ -6663,7 +6781,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE 开始/暂停 @@ -6712,31 +6830,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [未设置] @@ -6747,14 +6865,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 轴 %1%2 @@ -6765,262 +6883,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [未知] - + - + Left 左 - + - + Right 右 - + - + Down 下 - + - + Up 上 - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start 开始 - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle ○ - - + + Cross ╳ - - + + Square □ - - + + Triangle Δ - - + + Share 分享 - - + + Options 选项 - - + + [undefined] [未指定] - + %1%2 %1%2 - - + + [invalid] [无效] - - - - + + + + %1%2Hat %3 %1%2Hat 控制器 %3 - - - - - - + + + + + + %1%2Axis %3 %1%2轴 %3 - - + + %1%2Axis %3,%4,%5 %1%2轴 %3,%4,%5 - - + + %1%2Motion %3 %1%2体感 %3 - - - - + + + + %1%2Button %3 %1%2按键 %3 - - + + [unused] [未使用] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + 左摇杆 + + + + Stick R + 右摇杆 + + + + Plus + ＋ + + + + Minus + － + + + + Home Home - + + Capture + 截图 + + + Touch 触摸 - + Wheel Indicates the mouse wheel 鼠标滚轮 - + Backward 后退 - + Forward 前进 - + Task 任务键 - + Extra 额外按键 - + %1%2%3 %1%2%3 @@ -7493,7 +7657,7 @@ p, li { white-space: pre-wrap; } Enter a hotkey - 键入热键 + 输入热键 @@ -7558,12 +7722,12 @@ p, li { white-space: pre-wrap; } paused - 暂停 + 已暂停 sleeping - 睡眠 + 睡眠中 diff --git a/dist/languages/zh_TW.ts b/dist/languages/zh_TW.ts index 5ef629e41..364cb8556 100644 --- a/dist/languages/zh_TW.ts +++ b/dist/languages/zh_TW.ts @@ -936,102 +936,112 @@ This would ban both their forum username and their IP address. 停用 Macro JIT - + + When checked, it disables the macro HLE functions. Enabling this makes games run slower + 启用时，将禁用宏高阶模拟。这会降低游戏运行速度。 + + + + Disable Macro HLE + 禁用宏高阶模拟 + + + When checked, yuzu will log statistics about the compiled pipeline cache 啟用時 yuzu 將記錄有關編譯著色器快取的統計資訊。 - + Enable Shader Feedback 啟用著色器回饋 - + When checked, it executes shaders without loop logic changes 啟用時 yuzu 在執行著色器時，不會修改循環結構的條件判斷。 - + Disable Loop safety checks 停用循環安全檢查 - + Debugging 偵錯 - + Enable Verbose Reporting Services** 啟用詳細報告服務 - + Enable FS Access Log 啟用檔案系統存取記錄 - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. 启用此选项会将最新的音频命令列表输出到控制台。只影响使用音频渲染器的游戏。 - + Dump Audio Commands To Console** 将音频命令转储至控制台** - + Create Minidump After Crash 微型故障转储 - + Advanced 進階 - + Kiosk (Quest) Mode Kiosk (Quest) 模式 - + Enable CPU Debugging 啟用 CPU 模擬偵錯 - + Enable Debug Asserts 啟用偵錯 - + Enable Auto-Stub** 啟用自動偵錯** - + Enable All Controller Types 启用其他控制器 - + Disable Web Applet 停用 Web Applet - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. 允许 yuzu 在启动时检查 Vulkan 环境是否正常工作。如果是其他程序导致 yuzu 出现此问题，请禁用此选项。 - + Perform Startup Vulkan Check 启动时进行 Vulkan 检测 - + **This will be reset automatically when yuzu closes. **當 yuzu 關閉時會自動重設。 @@ -1046,12 +1056,12 @@ This would ban both their forum username and their IP address. 重启 yuzu 后才能应用此设置。 - + Web applet not compiled Web 应用程序未编译 - + MiniDump creation not compiled 小型转储创建未编译 @@ -1102,13 +1112,13 @@ This would ban both their forum username and their IP address. - + Audio 音訊 - + CPU CPU @@ -1124,13 +1134,13 @@ This would ban both their forum username and their IP address. - + General 一般 - + Graphics 圖形 @@ -1146,7 +1156,7 @@ This would ban both their forum username and their IP address. - + Controls 控制 @@ -1162,7 +1172,7 @@ This would ban both their forum username and their IP address. - + System 系統 @@ -1425,7 +1435,7 @@ This would ban both their forum username and their IP address. - + None 無 @@ -1536,112 +1546,127 @@ This would ban both their forum username and their IP address. + 1.5X (1080p/1620p) [EXPERIMENTAL] + 1.5X (1080p/1620p) [实验性] + + + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + + 7X (5040p/7560p) + 7X (5040p/7560p) + + + + 8X (5760p/8640p) + 8X (5760p/8640p) + + + Window Adapting Filter: 視窗濾鏡： - + Nearest Neighbor 最近鄰域 - + Bilinear 雙線性 - + Bicubic 雙三次 - + Gaussian 高斯 - + ScaleForce 強制縮放 - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - AMD FidelityFX™️ 超高畫質技術 (僅限 Vulkan 模式) + + AMD FidelityFX™️ Super Resolution + AMD FidelityFX™️ 超级分辨率锐画技术 - + Anti-Aliasing Method: 抗鋸齒方式： - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness 启用全局 FSR 锐化 - + Set FSR Sharpness 设置 FSR 锐化 - + FSR Sharpness: FSR 锐化度： - + 100% 100% - - + + Use global background color 使用全域背景顏色 - + Set background color: 設定背景顏色： - + Background Color: 背景顏色: @@ -1686,76 +1711,96 @@ This would ban both their forum username and their IP address. + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + 在后台运行的同时等待图形命令，以防止 GPU 降低时钟速度。 + + + + Force maximum clocks (Vulkan only) + 强制最大时钟 (仅限 Vulkan 模式) + + + VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. 垂直同步可防止畫面撕裂，但啟用後某些顯示卡效能可能會降低。如果您沒有發現效能降低，請保持啟用。 - + Use VSync 启用垂直同步 - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. 啟用非同步著色器編譯，可能會減少著色器不流暢的問題。實驗性功能。 - + Use asynchronous shader building (Hack) 使用非同步著色器編譯（不穩定） - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. 啟用快速 GPU 時間。此選項將強制大多數遊戲以其最高解析度執行。 - + Use Fast GPU Time (Hack) 使用快速 GPU 時間（不穩定） - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. 启用悲观缓冲区刷新。此选项将强制刷新未修改的缓冲区，可能会降低性能。 - + Use pessimistic buffer flushes (Hack) 启用悲观缓冲区刷新 (不稳定) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + 启用 GPU 专用的管线缓存。在 Vulkan 驱动程序内部不存储管线缓存的情况下，此选项可显著提高着色器加载速度。 + + + + Use Vulkan pipeline cache + 启用 Vulkan 管线缓存 + + + Anisotropic Filtering: 各向異性過濾： - + Automatic 自動 - + Default 預設 - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2143,7 +2188,7 @@ This would ban both their forum username and their IP address. - + Configure 設定 @@ -2169,6 +2214,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu 需要重新啟動 yuzu @@ -2188,22 +2234,27 @@ This would ban both their forum username and their IP address. 控制器导航 - + + Enable direct JoyCon driver + 启用 JoyCon 直接驱动 + + + Enable mouse panning 啟用滑鼠平移 - + Mouse sensitivity 滑鼠靈敏度 - + % % - + Motion / Touch 體感/觸控 @@ -2315,7 +2366,7 @@ This would ban both their forum username and their IP address. - + Left Stick 左搖桿 @@ -2409,14 +2460,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2435,7 +2486,7 @@ This would ban both their forum username and their IP address. - + Plus ＋ @@ -2448,15 +2499,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2513,236 +2564,236 @@ This would ban both their forum username and their IP address. - + Right Stick 右搖桿 - - - - + + + + Clear 清除 - - - - - + + + + + [not set] [未設定] - - + + Invert button 無效按鈕 - - + + Toggle button 切換按鍵 - - + + Invert axis 方向反轉 - - - + + + Set threshold 設定閾值 - - + + Choose a value between 0% and 100% 選擇介於 0% 和 100% 之間的值 - + Toggle axis 切换轴 - + Set gyro threshold 陀螺仪阈值设定 - + Map Analog Stick 搖桿映射 - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. 按下確定後，先水平再上下移動您的搖桿。 要反轉方向，則先上下再水平移動您的搖桿。 - + Center axis 中心轴 - - + + Deadzone: %1% 無感帶：%1% - - + + Modifier Range: %1% 輕推靈敏度：%1% - - + + Pro Controller Pro 手把 - + Dual Joycons 雙 Joycon 手把 - + Left Joycon 左 Joycon 手把 - + Right Joycon 右 Joycon 手把 - + Handheld 掌機模式 - + GameCube Controller GameCube 手把 - + Poke Ball Plus 精靈球 PLUS - + NES Controller NES 控制器 - + SNES Controller SNES 控制器 - + N64 Controller N64 控制器 - + Sega Genesis Mega Drive - + Start / Pause 開始 / 暫停 - + Z Z - + Control Stick 控制搖桿 - + C-Stick C 搖桿 - + Shake! 搖動！ - + [waiting] [等待中] - + New Profile 新增設定檔 - + Enter a profile name: 輸入設定檔名稱： - - + + Create Input Profile 建立輸入設定檔 - + The given profile name is not valid! 輸入的設定檔名稱無效！ - + Failed to create the input profile "%1" 建立輸入設定檔「%1」失敗 - + Delete Input Profile 刪除輸入設定檔 - + Failed to delete the input profile "%1" 刪除輸入設定檔「%1」失敗 - + Load Input Profile 載入輸入設定檔 - + Failed to load the input profile "%1" 載入輸入設定檔「%1」失敗 - + Save Input Profile 儲存輸入設定檔 - + Failed to save the input profile "%1" 儲存輸入設定檔「%1」失敗 @@ -2790,7 +2841,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Configure 設定 @@ -2826,7 +2877,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< - + Test 測試 @@ -2846,77 +2897,77 @@ To invert the axes, first move your joystick vertically, and then horizontally.< <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">了解更多</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters 連線埠中包含無效字元 - + Port has to be in range 0 and 65353 連線埠必須為 0 到 65353 之間 - + IP address is not valid 無效的 IP 位址 - + This UDP server already exists 此 UDP 伺服器已存在 - + Unable to add more than 8 servers 最多只能新增 8 個伺服器 - + Testing 測試中 - + Configuring 設定中 - + Test Successful 測試成功 - + Successfully received data from the server. 已成功從伺服器取得資料 - + Test Failed 測試失敗 - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. 無法從伺服器取得有效的資料。<br>請檢查伺服器是否正確設定以及位址和連接埠是否正確。 - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. UDP 測試或觸控校正進行中。<br>請耐心等候。 @@ -3245,8 +3296,8 @@ UUID: %2 - Ring Sensor Parameters - 环形传感器参数 + Virtual Ring Sensor Parameters + 虚拟健身环传感器参数 @@ -3266,33 +3317,90 @@ UUID: %2 無感帶：0% - + + Direct Joycon Driver + Joycon 直接驱动 + + + + Enable Ring Input + 启用健身环输入 + + + + + Enable + 启用 + + + + Ring Sensor Value + 健身环传感器参数 + + + + + Not connected + 未连接 + + + Restore Defaults 還原預設值 - + Clear 清除 - + [not set] [未設定] - + Invert axis 方向反轉 - - + + Deadzone: %1% 無感帶：%1% - + + Error enabling ring input + 启用健身环输入时出错 + + + + Direct Joycon driver is not enabled + 未启用 Joycon 直接驱动 + + + + Configuring + 設定中 + + + + The current mapped device doesn't support the ring controller + 当前映射的输入设备不支持健身环控制器 + + + + The current mapped device doesn't have a ring attached + 当前映射的设备未连接健身环控制器 + + + + Unexpected driver result %1 + 意外的驱动结果： %1 + + + [waiting] [請按按鍵] @@ -3597,8 +3705,8 @@ UUID: %2 - English - 英文 (English) + American English + 美式英语 @@ -3731,22 +3839,27 @@ UUID: %2 重新產生 - + System settings are available only when game is not running. 僅在遊戲未執行時才能修改使用者設定檔 - + + Warning: "%1" is not a valid language for region "%2" + 警告：“ %1 ”并不是“ %2 ”地区的有效语言。 + + + This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? 這會使用新的虛擬 Switch 取代你目前的虛擬 Switch，且將無法還原目前的虛擬 Switch。在部分遊戲中可能會出現意外後果。此動作可能因您使用過時的設定存檔而失敗。確定要繼續嗎？ - + Warning 警告 - + Console ID: 0x%1 主機 ID：0x%1 @@ -3817,7 +3930,7 @@ UUID: %2 TAS 設定 - + Select TAS Load Directory... 選擇 TAS 載入資料夾... @@ -4373,7 +4486,7 @@ Drag points to change position, or double-click table cells to edit values.Controller P1 - + &Controller P1 &Controller P1 @@ -4386,42 +4499,37 @@ Drag points to change position, or double-click table cells to edit values.直接连接 - - IP Address - IP 地址 + + Server Address + 服务器地址 - - IP - IP + + <html><head/><body><p>Server address of the host</p></body></html> + <html><head/><body><p>服务器地址</p></body></html> - - <html><head/><body><p>IPv4 address of the host</p></body></html> - <html><head/><body><p>服务器 IPv4 地址</p></body></html> - - - + Port 端口 - + <html><head/><body><p>Port number the host is listening on</p></body></html> <html><head/><body><p>服务器端口</p></body> - + Nickname 昵称 - + Password 密码 - + Connect 连接 @@ -4429,12 +4537,12 @@ Drag points to change position, or double-click table cells to edit values. DirectConnectWindow - + Connecting 连接中 - + Connect 连接 @@ -4505,862 +4613,872 @@ Drag points to change position, or double-click table cells to edit values.在不考慮幀數限制和垂直同步的情況下模擬一個 Switch 畫格的實際時間，若要全速模擬，此數值不得超過 16.67 毫秒。 - + &Clear Recent Files 清除最近的檔案(&C) - + &Continue 繼續(&C) - + &Pause &暫停 - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu 正在執行中 - + Warning Outdated Game Format 過時遊戲格式警告 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. 此遊戲為解構的 ROM 資料夾格式，這是一種過時的格式，已被其他格式取代，如 NCA、NAX、XCI、NSP。解構的 ROM 目錄缺少圖示、中繼資料和更新支援。<br><br>有關 yuzu 支援的各種 Switch 格式說明，<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>請參閱我們的 wiki </a>。此訊息將不再顯示。 - - + + Error while loading ROM! 載入 ROM 時發生錯誤！ - + The ROM format is not supported. 此 ROM 格式不支援 - + An error occurred initializing the video core. 初始化視訊核心時發生錯誤 - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu 在執行視訊核心時發生錯誤。 這可能是 GPU 驅動程序過舊造成的。 詳細資訊請查閱日誌檔案。 關於日誌檔案的更多資訊，請參考以下頁面：<a href='https://yuzu-emu.org/help/reference/log-files/'>如何上傳日誌檔案</a>。 - + Error while loading ROM! %1 %1 signifies a numeric error code. 載入 ROM 時發生錯誤！%1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>請參閱 <a href='https://yuzu-emu.org/help/quickstart/'>yuzu 快速指引</a>以重新傾印檔案。<br>您可以前往 yuzu 的 wiki</a> 或 Discord 社群</a>以獲得幫助。 - + An unknown error occurred. Please see the log for more details. 發生未知錯誤，請檢視紀錄了解細節。 - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... 正在关闭… - + Save Data 儲存資料 - + Mod Data 模組資料 - + Error Opening %1 Folder 開啟資料夾 %1 時發生錯誤 - - + + Folder does not exist! 資料夾不存在 - + Error Opening Transferable Shader Cache 開啟通用著色器快取位置時發生錯誤 - + Failed to create the shader cache directory for this title. 無法新增此遊戲的著色器快取資料夾。 - + Error Removing Contents 删除内容时出错 - + Error Removing Update 删除更新时出错 - + Error Removing DLC 删除 DLC 时出错 - + Remove Installed Game Contents? 删除已安装的游戏内容？ - + Remove Installed Game Update? 删除已安装的游戏更新？ - + Remove Installed Game DLC? 删除已安装的游戏 DLC 内容？ - + Remove Entry 移除項目 - - - - - - + + + + + + Successfully Removed 移除成功 - + Successfully removed the installed base game. 成功移除已安裝的遊戲。 - + The base game is not installed in the NAND and cannot be removed. 此遊戲並非安裝在內部儲存空間，因此無法移除。 - + Successfully removed the installed update. 成功移除已安裝的遊戲更新。 - + There is no update installed for this title. 此遊戲沒有已安裝的更新。 - + There are no DLC installed for this title. 此遊戲沒有已安裝的 DLC。 - + Successfully removed %1 installed DLC. 成功移除遊戲 %1 已安裝的 DLC。 - + Delete OpenGL Transferable Shader Cache? 刪除 OpenGL 模式的著色器快取？ - + Delete Vulkan Transferable Shader Cache? 刪除 Vulkan 模式的著色器快取？ - + Delete All Transferable Shader Caches? 刪除所有的著色器快取？ - + Remove Custom Game Configuration? 移除額外遊戲設定？ - + Remove File 刪除檔案 - - + + Error Removing Transferable Shader Cache 刪除通用著色器快取時發生錯誤 - - + + A shader cache for this title does not exist. 此遊戲沒有著色器快取 - + Successfully removed the transferable shader cache. 成功刪除著色器快取。 - + Failed to remove the transferable shader cache. 刪除通用著色器快取失敗。 - - + + Error Removing Vulkan Driver Pipeline Cache + 移除 Vulkan 驱动程序管线缓存时出错 + + + + Failed to remove the driver pipeline cache. + 删除驱动程序管线缓存失败。 + + + + Error Removing Transferable Shader Caches 刪除通用著色器快取時發生錯誤 - + Successfully removed the transferable shader caches. 成功刪除通用著色器快取。 - + Failed to remove the transferable shader cache directory. 無法刪除著色器快取資料夾。 - - + + Error Removing Custom Configuration 移除額外遊戲設定時發生錯誤 - + A custom configuration for this title does not exist. 此遊戲沒有額外設定。 - + Successfully removed the custom game configuration. 成功移除額外遊戲設定。 - + Failed to remove the custom game configuration. 移除額外遊戲設定失敗。 - - + + RomFS Extraction Failed! RomFS 抽取失敗！ - + There was an error copying the RomFS files or the user cancelled the operation. 複製 RomFS 檔案時發生錯誤或使用者取消動作。 - + Full 全部 - + Skeleton 部分 - + Select RomFS Dump Mode 選擇RomFS傾印模式 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. 請選擇如何傾印 RomFS。<br>「全部」會複製所有檔案到新資料夾中，而<br>「部分」只會建立資料夾結構。 - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 沒有足夠的空間用於抽取 RomFS。請確保有足夠的空間或於模擬 > 設定 >系統 >檔案系統 > 傾印根目錄中選擇其他資料夾。 - + Extracting RomFS... 抽取 RomFS 中... - - + + Cancel 取消 - + RomFS Extraction Succeeded! RomFS 抽取完成！ - + The operation completed successfully. 動作已成功完成 - - - - - + + + + + Create Shortcut 创建快捷方式 - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? 这将为当前的软件镜像创建快捷方式。但在其更新后，快捷方式可能无法正常使用。是否继续？ - + Cannot create shortcut on desktop. Path "%1" does not exist. 无法在桌面创建快捷方式。路径“ %1 ”不存在。 - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. 无法在应用程序菜单中创建快捷方式。路径“ %1 ”不存在且无法被创建。 - + Create Icon 创建图标 - + Cannot create icon file. Path "%1" does not exist and cannot be created. 无法创建图标文件。路径“ %1 ”不存在且无法被创建。 - + Start %1 with the yuzu Emulator 使用 yuzu 启动 %1 - + Failed to create a shortcut at %1 在 %1 处创建快捷方式时失败 - + Successfully created a shortcut to %1 成功地在 %1 处创建快捷方式 - + Error Opening %1 開啟 %1 時發生錯誤 - + Select Directory 選擇資料夾 - + Properties 屬性 - + The game properties could not be loaded. 無法載入遊戲屬性 - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch 執行檔 (%1);;所有檔案 (*.*) - + Load File 開啟檔案 - + Open Extracted ROM Directory 開啟已抽取的 ROM 資料夾 - + Invalid Directory Selected 選擇的資料夾無效 - + The directory you have selected does not contain a 'main' file. 選擇的資料夾未包含「main」檔案。 - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) 可安装的 Switch 檔案 (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX 卡帶映像 (*.xci) - + Install Files 安裝檔案 - + %n file(s) remaining 剩餘 %n 個檔案 - + Installing file "%1"... 正在安裝檔案「%1」... - + Install Results 安裝結果 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 為了避免潛在的衝突，不建議將遊戲本體安裝至內部儲存空間。 此功能僅用於安裝遊戲更新和 DLC。 - + %n file(s) were newly installed 最近安裝了 %n 個檔案 - + %n file(s) were overwritten %n 個檔案被取代 - + %n file(s) failed to install %n 個檔案安裝失敗 - + System Application 系統應用程式 - + System Archive 系統檔案 - + System Application Update 系統應用程式更新 - + Firmware Package (Type A) 韌體包(A型) - + Firmware Package (Type B) 韌體包(B型) - + Game 遊戲 - + Game Update 遊戲更新 - + Game DLC 遊戲 DLC - + Delta Title Delta Title - + Select NCA Install Type... 選擇 NCA 安裝類型... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) 請選擇此 NCA 的安裝類型： （在多數情況下，選擇預設的「遊戲」即可。） - + Failed to Install 安裝失敗 - + The title type you selected for the NCA is invalid. 選擇的 NCA 安裝類型無效。 - + File not found 找不到檔案 - + File "%1" not found 找不到「%1」檔案 - + OK 確定 - - + + Hardware requirements not met 硬件不满足要求 - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. 您的系统不满足运行 yuzu 推荐的推荐配置。兼容性报告已被禁用。 - + Missing yuzu Account 未設定 yuzu 帳號 - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. 為了上傳相容性測試結果，您必須登入 yuzu 帳號。<br><br/>欲登入 yuzu 帳號請至模擬 &gt; 設定 &gt; 網路。 - + Error opening URL 開啟 URL 時發生錯誤 - + Unable to open the URL "%1". 無法開啟 URL：「%1」。 - + TAS Recording TAS 錄製 - + Overwrite file of player 1? 覆寫玩家 1 的檔案？ - + Invalid config detected 偵測到無效設定 - + Handheld controller can't be used on docked mode. Pro controller will be selected. 掌機手把無法在主機模式中使用。將會選擇 Pro 手把。 - - + + Amiibo Amiibo - - + + The current amiibo has been removed 当前的 Amiibo 已被移除。 - + Error 错误 - - + + The current game is not looking for amiibos 当前游戏并没有在寻找 Amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo 檔案 (%1);; 所有檔案 (*.*) - + Load Amiibo 開啟 Amiibo - + Error loading Amiibo data 載入 Amiibo 資料時發生錯誤 - + The selected file is not a valid amiibo 选择的文件并不是有效的 amiibo - + The selected file is already on use 选择的文件已在使用中 - + An unknown error occurred 发生了未知错误 - + Capture Screenshot 截圖 - + PNG Image (*.png) PNG 圖片 (*.png) - + TAS state: Running %1/%2 TAS 狀態：正在執行 %1/%2 - + TAS state: Recording %1 TAS 狀態：正在錄製 %1 - + TAS state: Idle %1/%2 TAS 狀態：閒置 %1/%2 - + TAS State: Invalid TAS 狀態：無效 - + &Stop Running &停止執行 - + &Start 開始(&S) - + Stop R&ecording 停止錄製 - + R&ecord 錄製 (&E) - + Building: %n shader(s) 正在編譯 %n 個著色器檔案 - + Scale: %1x %1 is the resolution scaling factor 縮放比例：%1x - + Speed: %1% / %2% 速度：%1% / %2% - + Speed: %1% 速度：%1% - + Game: %1 FPS (Unlocked) 遊戲: %1 FPS（未限制） - + Game: %1 FPS 遊戲：%1 FPS - + Frame: %1 ms 畫格延遲：%1 ms - + GPU NORMAL GPU 一般效能 - + GPU HIGH GPU 高效能 - + GPU EXTREME GPU 最高效能 - + GPU ERROR GPU 錯誤 - + DOCKED 主机模式 - + HANDHELD 掌机模式 - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST 最近鄰域 - - + + BILINEAR 雙線性 - + BICUBIC 雙三次 - + GAUSSIAN 高斯 - + SCALEFORCE 強制縮放 - + FSR FSR - - + + NO AA 抗鋸齒關 - + FXAA FXAA - + SMAA SMAA - + Confirm Key Rederivation 確認重新產生金鑰 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5376,37 +5494,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 這將刪除您自動產生的金鑰檔案並重新執行產生金鑰模組。 - + Missing fuses 遺失項目 - + - Missing BOOT0 - 遺失 BOOT0 - + - Missing BCPKG2-1-Normal-Main - 遺失 BCPKG2-1-Normal-Main - + - Missing PRODINFO - 遺失 PRODINFO - + Derivation Components Missing 遺失產生元件 - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 缺少加密金鑰。 <br>請按照<a href='https://yuzu-emu.org/help/quickstart/'>《Yuzu快速入門指南》來取得所有金鑰、韌體、遊戲<br><br><small>(%1)。 - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5415,39 +5533,39 @@ on your system's performance. 您的系統效能。 - + Deriving Keys 產生金鑰 - + Select RomFS Dump Target 選擇 RomFS 傾印目標 - + Please select which RomFS you would like to dump. 請選擇希望傾印的 RomFS。 - + Are you sure you want to close yuzu? 您確定要關閉 yuzu 嗎? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. 您確定要停止模擬嗎？未儲存的進度將會遺失。 - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5459,44 +5577,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! 無法使用 OpenGL 模式！ - + OpenGL shared contexts are not supported. 不支持 OpenGL 共享上下文。 - + yuzu has not been compiled with OpenGL support. yuzu 未以支援 OpenGL 的方式編譯。 - - + + Error while initializing OpenGL! 初始化 OpenGL 時發生錯誤！ - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. 您的 GPU 可能不支援 OpenGL，或是未安裝最新的圖形驅動程式 - + Error while initializing OpenGL 4.6! 初始化 OpenGL 4.6 時發生錯誤！ - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 您的 GPU 可能不支援 OpenGL 4.6，或是未安裝最新的圖形驅動程式<br><br>GL 渲染器：<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 您的 GPU 可能不支援某些必需的 OpenGL 功能。請確保您已安裝最新的圖形驅動程式。<br><br>GL 渲染器：<br>%1<br><br>不支援的功能：<br>%2 @@ -5999,7 +6117,7 @@ Debug Message: 安裝 - + Install Files to NAND 安裝檔案至內部儲存空間 @@ -6007,7 +6125,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 文字中不能包含以下字元：%1 @@ -6663,7 +6781,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE 開始 / 暫停 @@ -6712,31 +6830,31 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt - - - - + + + + [not set] [未設定] @@ -6747,14 +6865,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Axis %1%2 @@ -6765,262 +6883,308 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [未知] - + - + Left 左 - + - + Right 右 - + - + Down 下 - + - + Up 上 - + Z Z - + R R - + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start 開始 - - + + L1 L1 - - + + L2 L2 - - + + L3 L3 - - + + R1 R1 - - + + R2 R2 - - + + R3 R3 - - + + Circle ○ - - + + Cross ╳ - - + + Square □ - - + + Triangle Δ - - + + Share 分享 - - + + Options 選項 - - + + [undefined] [未指定] - + %1%2 %1%2 - - + + [invalid] [無效] - - - - + + + + %1%2Hat %3 %1%2Hat 控制器 %3 - - - - - - + + + + + + %1%2Axis %3 %1%2軸 %3 - - + + %1%2Axis %3,%4,%5 %1%2軸 %3,%4,%5 - - + + %1%2Motion %3 %1%2體感 %3 - - - - + + + + %1%2Button %3 %1%2按鈕 %3 - - + + [unused] [未使用] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + 左摇杆 + + + + Stick R + 右摇杆 + + + + Plus + ＋ + + + + Minus + － + + + + Home HOME - + + Capture + 截圖 + + + Touch 觸控 - + Wheel Indicates the mouse wheel 滑鼠滾輪 - + Backward 後退 - + Forward 前進 - + Task 任務鍵 - + Extra 額外按鍵 - + %1%2%3 %1%2%3 From 75e81885b0bd38ece84a94b2d323b05d788f8741 Mon Sep 17 00:00:00 2001 From: german77 Date: Sat, 28 Jan 2023 18:19:15 -0600 Subject: [PATCH 0014/1181] input_common: Implement turbo buttons --- src/common/input.h | 2 + src/core/hid/emulated_controller.cpp | 75 ++++++++++++++++++- src/core/hid/emulated_controller.h | 6 ++ src/core/hle/service/hid/controllers/npad.cpp | 3 + src/input_common/input_poller.cpp | 30 +++++--- .../configuration/configure_input_player.cpp | 17 +++-- 6 files changed, 115 insertions(+), 18 deletions(-) diff --git a/src/common/input.h b/src/common/input.h index d61cd7ca8..b5748a6c8 100644 --- a/src/common/input.h +++ b/src/common/input.h @@ -130,6 +130,8 @@ struct ButtonStatus { bool inverted{}; // Press once to activate, press again to release bool toggle{}; + // Spams the button when active + bool turbo{}; // Internal lock for the toggle status bool locked{}; }; diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index 0e06468da..631aa6ad2 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp @@ -12,6 +12,7 @@ namespace Core::HID { constexpr s32 HID_JOYSTICK_MAX = 0x7fff; constexpr s32 HID_TRIGGER_MAX = 0x7fff; +constexpr u32 TURBO_BUTTON_DELAY = 4; // Use a common UUID for TAS and Virtual Gamepad constexpr Common::UUID TAS_UUID = Common::UUID{{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xA5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}}; @@ -447,6 +448,7 @@ void EmulatedController::ReloadInput() { }, }); } + turbo_button_state = 0; } void EmulatedController::UnloadInput() { @@ -687,6 +689,7 @@ void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback } current_status.toggle = new_status.toggle; + current_status.turbo = new_status.turbo; current_status.uuid = uuid; // Update button status with current @@ -1548,7 +1551,7 @@ NpadButtonState EmulatedController::GetNpadButtons() const { if (is_configuring) { return {}; } - return controller.npad_button_state; + return {controller.npad_button_state.raw & GetTurboButtonMask()}; } DebugPadButton EmulatedController::GetDebugPadButtons() const { @@ -1656,4 +1659,74 @@ void EmulatedController::DeleteCallback(int key) { } callback_list.erase(iterator); } + +void EmulatedController::TurboButtonUpdate() { + turbo_button_state = (turbo_button_state + 1) % (TURBO_BUTTON_DELAY * 2); +} + +NpadButton EmulatedController::GetTurboButtonMask() const { + // Apply no mask when disabled + if (turbo_button_state < TURBO_BUTTON_DELAY) { + return {NpadButton::All}; + } + + NpadButtonState button_mask{}; + for (std::size_t index = 0; index < controller.button_values.size(); ++index) { + if (!controller.button_values[index].turbo) { + continue; + } + + switch (index) { + case Settings::NativeButton::A: + button_mask.a.Assign(1); + break; + case Settings::NativeButton::B: + button_mask.b.Assign(1); + break; + case Settings::NativeButton::X: + button_mask.x.Assign(1); + break; + case Settings::NativeButton::Y: + button_mask.y.Assign(1); + break; + case Settings::NativeButton::L: + button_mask.l.Assign(1); + break; + case Settings::NativeButton::R: + button_mask.r.Assign(1); + break; + case Settings::NativeButton::ZL: + button_mask.zl.Assign(1); + break; + case Settings::NativeButton::ZR: + button_mask.zr.Assign(1); + break; + case Settings::NativeButton::DLeft: + button_mask.left.Assign(1); + break; + case Settings::NativeButton::DUp: + button_mask.up.Assign(1); + break; + case Settings::NativeButton::DRight: + button_mask.right.Assign(1); + break; + case Settings::NativeButton::DDown: + button_mask.down.Assign(1); + break; + case Settings::NativeButton::SL: + button_mask.left_sl.Assign(1); + button_mask.right_sl.Assign(1); + break; + case Settings::NativeButton::SR: + button_mask.left_sr.Assign(1); + button_mask.right_sr.Assign(1); + break; + default: + break; + } + } + + return static_cast(~button_mask.raw); +} + } // namespace Core::HID diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index 3ac77b2b5..b02bf35c4 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h @@ -411,6 +411,9 @@ public: */ void DeleteCallback(int key); + /// Swaps the state of the turbo buttons + void TurboButtonUpdate(); + private: /// creates input devices from params void LoadDevices(); @@ -511,6 +514,8 @@ private: */ void TriggerOnChange(ControllerTriggerType type, bool is_service_update); + NpadButton GetTurboButtonMask() const; + const NpadIdType npad_id_type; NpadStyleIndex npad_type{NpadStyleIndex::None}; NpadStyleIndex original_npad_type{NpadStyleIndex::None}; @@ -520,6 +525,7 @@ private: bool system_buttons_enabled{true}; f32 motion_sensitivity{0.01f}; bool force_update_motion{false}; + u32 turbo_button_state{0}; // Temporary values to avoid doing changes while the controller is in configuring mode NpadStyleIndex tmp_npad_type{NpadStyleIndex::None}; diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 5713f1288..3afda9e3f 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -428,6 +428,9 @@ void Controller_NPad::RequestPadStateUpdate(Core::HID::NpadIdType npad_id) { return; } + // This function is unique to yuzu for the turbo buttons to work properly + controller.device->TurboButtonUpdate(); + auto& pad_entry = controller.npad_pad_state; auto& trigger_entry = controller.npad_trigger_state; const auto button_state = controller.device->GetNpadButtons(); diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cpp index 15cbf7e5f..8c6a6521a 100644 --- a/src/input_common/input_poller.cpp +++ b/src/input_common/input_poller.cpp @@ -16,10 +16,10 @@ public: class InputFromButton final : public Common::Input::InputDevice { public: - explicit InputFromButton(PadIdentifier identifier_, int button_, bool toggle_, bool inverted_, - InputEngine* input_engine_) - : identifier(identifier_), button(button_), toggle(toggle_), inverted(inverted_), - input_engine(input_engine_) { + explicit InputFromButton(PadIdentifier identifier_, int button_, bool turbo_, bool toggle_, + bool inverted_, InputEngine* input_engine_) + : identifier(identifier_), button(button_), turbo(turbo_), toggle(toggle_), + inverted(inverted_), input_engine(input_engine_) { UpdateCallback engine_callback{[this]() { OnChange(); }}; const InputIdentifier input_identifier{ .identifier = identifier, @@ -40,6 +40,7 @@ public: .value = input_engine->GetButton(identifier, button), .inverted = inverted, .toggle = toggle, + .turbo = turbo, }; } @@ -68,6 +69,7 @@ public: private: const PadIdentifier identifier; const int button; + const bool turbo; const bool toggle; const bool inverted; int callback_key; @@ -77,10 +79,10 @@ private: class InputFromHatButton final : public Common::Input::InputDevice { public: - explicit InputFromHatButton(PadIdentifier identifier_, int button_, u8 direction_, bool toggle_, - bool inverted_, InputEngine* input_engine_) - : identifier(identifier_), button(button_), direction(direction_), toggle(toggle_), - inverted(inverted_), input_engine(input_engine_) { + explicit InputFromHatButton(PadIdentifier identifier_, int button_, u8 direction_, bool turbo_, + bool toggle_, bool inverted_, InputEngine* input_engine_) + : identifier(identifier_), button(button_), direction(direction_), turbo(turbo_), + toggle(toggle_), inverted(inverted_), input_engine(input_engine_) { UpdateCallback engine_callback{[this]() { OnChange(); }}; const InputIdentifier input_identifier{ .identifier = identifier, @@ -101,6 +103,7 @@ public: .value = input_engine->GetHatButton(identifier, button, direction), .inverted = inverted, .toggle = toggle, + .turbo = turbo, }; } @@ -130,6 +133,7 @@ private: const PadIdentifier identifier; const int button; const u8 direction; + const bool turbo; const bool toggle; const bool inverted; int callback_key; @@ -853,14 +857,15 @@ std::unique_ptr InputFactory::CreateButtonDevice( const auto keyboard_key = params.Get("code", 0); const auto toggle = params.Get("toggle", false) != 0; const auto inverted = params.Get("inverted", false) != 0; + const auto turbo = params.Get("turbo", false) != 0; input_engine->PreSetController(identifier); input_engine->PreSetButton(identifier, button_id); input_engine->PreSetButton(identifier, keyboard_key); if (keyboard_key != 0) { - return std::make_unique(identifier, keyboard_key, toggle, inverted, + return std::make_unique(identifier, keyboard_key, turbo, toggle, inverted, input_engine.get()); } - return std::make_unique(identifier, button_id, toggle, inverted, + return std::make_unique(identifier, button_id, turbo, toggle, inverted, input_engine.get()); } @@ -876,11 +881,12 @@ std::unique_ptr InputFactory::CreateHatButtonDevice( const auto direction = input_engine->GetHatButtonId(params.Get("direction", "")); const auto toggle = params.Get("toggle", false) != 0; const auto inverted = params.Get("inverted", false) != 0; + const auto turbo = params.Get("turbo", false) != 0; input_engine->PreSetController(identifier); input_engine->PreSetHatButton(identifier, button_id); - return std::make_unique(identifier, button_id, direction, toggle, inverted, - input_engine.get()); + return std::make_unique(identifier, button_id, direction, turbo, toggle, + inverted, input_engine.get()); } std::unique_ptr InputFactory::CreateStickDevice( diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 4b7e3b01b..723690e71 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -182,12 +182,13 @@ QString ConfigureInputPlayer::ButtonToText(const Common::ParamPackage& param) { const QString toggle = QString::fromStdString(param.Get("toggle", false) ? "~" : ""); const QString inverted = QString::fromStdString(param.Get("inverted", false) ? "!" : ""); const QString invert = QString::fromStdString(param.Get("invert", "+") == "-" ? "-" : ""); + const QString turbo = QString::fromStdString(param.Get("turbo", false) ? "$" : ""); const auto common_button_name = input_subsystem->GetButtonName(param); // Retrieve the names from Qt if (param.Get("engine", "") == "keyboard") { const QString button_str = GetKeyName(param.Get("code", 0)); - return QObject::tr("%1%2%3").arg(toggle, inverted, button_str); + return QObject::tr("%1%2%3%4").arg(turbo, toggle, inverted, button_str); } if (common_button_name == Common::Input::ButtonNames::Invalid) { @@ -201,7 +202,7 @@ QString ConfigureInputPlayer::ButtonToText(const Common::ParamPackage& param) { if (common_button_name == Common::Input::ButtonNames::Value) { if (param.Has("hat")) { const QString hat = GetDirectionName(param.Get("direction", "")); - return QObject::tr("%1%2Hat %3").arg(toggle, inverted, hat); + return QObject::tr("%1%2%3Hat %4").arg(turbo, toggle, inverted, hat); } if (param.Has("axis")) { const QString axis = QString::fromStdString(param.Get("axis", "")); @@ -219,13 +220,13 @@ QString ConfigureInputPlayer::ButtonToText(const Common::ParamPackage& param) { } if (param.Has("button")) { const QString button = QString::fromStdString(param.Get("button", "")); - return QObject::tr("%1%2Button %3").arg(toggle, inverted, button); + return QObject::tr("%1%2%3Button %4").arg(turbo, toggle, inverted, button); } } QString button_name = GetButtonName(common_button_name); if (param.Has("hat")) { - return QObject::tr("%1%2Hat %3").arg(toggle, inverted, button_name); + return QObject::tr("%1%2%3Hat %4").arg(turbo, toggle, inverted, button_name); } if (param.Has("axis")) { return QObject::tr("%1%2Axis %3").arg(toggle, inverted, button_name); @@ -234,7 +235,7 @@ QString ConfigureInputPlayer::ButtonToText(const Common::ParamPackage& param) { return QObject::tr("%1%2Axis %3").arg(toggle, inverted, button_name); } if (param.Has("button")) { - return QObject::tr("%1%2Button %3").arg(toggle, inverted, button_name); + return QObject::tr("%1%2%3Button %4").arg(turbo, toggle, inverted, button_name); } return QObject::tr("[unknown]"); @@ -395,6 +396,12 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i button_map[button_id]->setText(ButtonToText(param)); emulated_controller->SetButtonParam(button_id, param); }); + context_menu.addAction(tr("Turbo button"), [&] { + const bool turbo_value = !param.Get("turbo", false); + param.Set("turbo", turbo_value); + button_map[button_id]->setText(ButtonToText(param)); + emulated_controller->SetButtonParam(button_id, param); + }); } if (param.Has("axis")) { context_menu.addAction(tr("Invert axis"), [&] { From ce1895497dd6a1ab87a6ab56d344b6f5e1e36ee7 Mon Sep 17 00:00:00 2001 From: german77 Date: Sun, 29 Jan 2023 12:23:30 -0600 Subject: [PATCH 0015/1181] yuzu: config: Draw turbo buttons with a different color --- .../configure_input_player_widget.cpp | 35 +++++++++++-------- .../configure_input_player_widget.h | 2 ++ 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp index 68af6c20c..c287220fc 100644 --- a/src/yuzu/configuration/configure_input_player_widget.cpp +++ b/src/yuzu/configuration/configure_input_player_widget.cpp @@ -81,7 +81,6 @@ void PlayerControlPreview::UpdateColors() { colors.outline = QColor(0, 0, 0); colors.primary = QColor(225, 225, 225); colors.button = QColor(109, 111, 114); - colors.button2 = QColor(109, 111, 114); colors.button2 = QColor(77, 80, 84); colors.slider_arrow = QColor(65, 68, 73); colors.font2 = QColor(0, 0, 0); @@ -100,6 +99,7 @@ void PlayerControlPreview::UpdateColors() { colors.led_off = QColor(170, 238, 255); colors.indicator2 = QColor(59, 165, 93); colors.charging = QColor(250, 168, 26); + colors.button_turbo = QColor(217, 158, 4); colors.left = colors.primary; colors.right = colors.primary; @@ -2469,7 +2469,6 @@ void PlayerControlPreview::DrawJoystickDot(QPainter& p, const QPointF center, void PlayerControlPreview::DrawRoundButton(QPainter& p, QPointF center, const Common::Input::ButtonStatus& pressed, float width, float height, Direction direction, float radius) { - p.setBrush(button_color); if (pressed.value) { switch (direction) { case Direction::Left: @@ -2487,16 +2486,16 @@ void PlayerControlPreview::DrawRoundButton(QPainter& p, QPointF center, case Direction::None: break; } - p.setBrush(colors.highlight); } QRectF rect = {center.x() - width, center.y() - height, width * 2.0f, height * 2.0f}; + p.setBrush(GetButtonColor(button_color, pressed.value, pressed.turbo)); p.drawRoundedRect(rect, radius, radius); } void PlayerControlPreview::DrawMinusButton(QPainter& p, const QPointF center, const Common::Input::ButtonStatus& pressed, int button_size) { p.setPen(colors.outline); - p.setBrush(pressed.value ? colors.highlight : colors.button); + p.setBrush(GetButtonColor(colors.button, pressed.value, pressed.turbo)); DrawRectangle(p, center, button_size, button_size / 3.0f); } void PlayerControlPreview::DrawPlusButton(QPainter& p, const QPointF center, @@ -2504,7 +2503,7 @@ void PlayerControlPreview::DrawPlusButton(QPainter& p, const QPointF center, int button_size) { // Draw outer line p.setPen(colors.outline); - p.setBrush(pressed.value ? colors.highlight : colors.button); + p.setBrush(GetButtonColor(colors.button, pressed.value, pressed.turbo)); DrawRectangle(p, center, button_size, button_size / 3.0f); DrawRectangle(p, center, button_size / 3.0f, button_size); @@ -2526,7 +2525,7 @@ void PlayerControlPreview::DrawGCButtonX(QPainter& p, const QPointF center, } p.setPen(colors.outline); - p.setBrush(pressed.value ? colors.highlight : colors.button); + p.setBrush(GetButtonColor(colors.button, pressed.value, pressed.turbo)); DrawPolygon(p, button_x); } @@ -2539,7 +2538,7 @@ void PlayerControlPreview::DrawGCButtonY(QPainter& p, const QPointF center, } p.setPen(colors.outline); - p.setBrush(pressed.value ? colors.highlight : colors.button); + p.setBrush(GetButtonColor(colors.button, pressed.value, pressed.turbo)); DrawPolygon(p, button_x); } @@ -2553,17 +2552,15 @@ void PlayerControlPreview::DrawGCButtonZ(QPainter& p, const QPointF center, } p.setPen(colors.outline); - p.setBrush(pressed.value ? colors.highlight : colors.button2); + p.setBrush(GetButtonColor(colors.button2, pressed.value, pressed.turbo)); DrawPolygon(p, button_x); } void PlayerControlPreview::DrawCircleButton(QPainter& p, const QPointF center, const Common::Input::ButtonStatus& pressed, float button_size) { - p.setBrush(button_color); - if (pressed.value) { - p.setBrush(colors.highlight); - } + + p.setBrush(GetButtonColor(button_color, pressed.value, pressed.turbo)); p.drawEllipse(center, button_size, button_size); } @@ -2620,7 +2617,7 @@ void PlayerControlPreview::DrawArrowButton(QPainter& p, const QPointF center, // Draw arrow button p.setPen(pressed.value ? colors.highlight : colors.button); - p.setBrush(pressed.value ? colors.highlight : colors.button); + p.setBrush(GetButtonColor(colors.button, pressed.value, pressed.turbo)); DrawPolygon(p, arrow_button); switch (direction) { @@ -2672,10 +2669,20 @@ void PlayerControlPreview::DrawTriggerButton(QPainter& p, const QPointF center, // Draw arrow button p.setPen(colors.outline); - p.setBrush(pressed.value ? colors.highlight : colors.button); + p.setBrush(GetButtonColor(colors.button, pressed.value, pressed.turbo)); DrawPolygon(p, qtrigger_button); } +QColor PlayerControlPreview::GetButtonColor(QColor default_color, bool is_pressed, bool turbo) { + if (is_pressed && turbo) { + return colors.button_turbo; + } + if (is_pressed) { + return colors.highlight; + } + return default_color; +} + void PlayerControlPreview::DrawBattery(QPainter& p, QPointF center, Common::Input::BatteryLevel battery) { if (battery == Common::Input::BatteryLevel::None) { diff --git a/src/yuzu/configuration/configure_input_player_widget.h b/src/yuzu/configuration/configure_input_player_widget.h index b258c6d77..0e9e95e85 100644 --- a/src/yuzu/configuration/configure_input_player_widget.h +++ b/src/yuzu/configuration/configure_input_player_widget.h @@ -81,6 +81,7 @@ private: QColor right{}; QColor button{}; QColor button2{}; + QColor button_turbo{}; QColor font{}; QColor font2{}; QColor highlight{}; @@ -183,6 +184,7 @@ private: const Common::Input::ButtonStatus& pressed, float size = 1.0f); void DrawTriggerButton(QPainter& p, QPointF center, Direction direction, const Common::Input::ButtonStatus& pressed); + QColor GetButtonColor(QColor default_color, bool is_pressed, bool turbo); // Draw battery functions void DrawBattery(QPainter& p, QPointF center, Common::Input::BatteryLevel battery); From 7d1c3a3f59d4dd55c012bdd46d4ec092d141e814 Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 29 Jan 2023 15:03:29 -0500 Subject: [PATCH 0016/1181] kernel: add KDeviceAddressSpace --- src/core/CMakeLists.txt | 2 + src/core/hle/kernel/init/init_slab_setup.cpp | 2 + .../hle/kernel/k_device_address_space.cpp | 150 ++++++++++++++++++ src/core/hle/kernel/k_device_address_space.h | 60 +++++++ src/core/hle/kernel/kernel.h | 4 + src/core/hle/kernel/svc_types.h | 14 ++ 6 files changed, 232 insertions(+) create mode 100644 src/core/hle/kernel/k_device_address_space.cpp create mode 100644 src/core/hle/kernel/k_device_address_space.h diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 3eee1cfbe..112c61b80 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -195,6 +195,8 @@ add_library(core STATIC hle/kernel/k_condition_variable.cpp hle/kernel/k_condition_variable.h hle/kernel/k_debug.h + hle/kernel/k_device_address_space.cpp + hle/kernel/k_device_address_space.h hle/kernel/k_dynamic_page_manager.h hle/kernel/k_dynamic_resource_manager.h hle/kernel/k_dynamic_slab_heap.h diff --git a/src/core/hle/kernel/init/init_slab_setup.cpp b/src/core/hle/kernel/init/init_slab_setup.cpp index 7b363eb1e..571acf4b2 100644 --- a/src/core/hle/kernel/init/init_slab_setup.cpp +++ b/src/core/hle/kernel/init/init_slab_setup.cpp @@ -11,6 +11,7 @@ #include "core/hle/kernel/init/init_slab_setup.h" #include "core/hle/kernel/k_code_memory.h" #include "core/hle/kernel/k_debug.h" +#include "core/hle/kernel/k_device_address_space.h" #include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_event_info.h" #include "core/hle/kernel/k_memory_layout.h" @@ -43,6 +44,7 @@ namespace Kernel::Init { HANDLER(KSharedMemoryInfo, (SLAB_COUNT(KSharedMemory) * 8), ##__VA_ARGS__) \ HANDLER(KTransferMemory, (SLAB_COUNT(KTransferMemory)), ##__VA_ARGS__) \ HANDLER(KCodeMemory, (SLAB_COUNT(KCodeMemory)), ##__VA_ARGS__) \ + HANDLER(KDeviceAddressSpace, (SLAB_COUNT(KDeviceAddressSpace)), ##__VA_ARGS__) \ HANDLER(KSession, (SLAB_COUNT(KSession)), ##__VA_ARGS__) \ HANDLER(KThreadLocalPage, \ (SLAB_COUNT(KProcess) + (SLAB_COUNT(KProcess) + SLAB_COUNT(KThread)) / 8), \ diff --git a/src/core/hle/kernel/k_device_address_space.cpp b/src/core/hle/kernel/k_device_address_space.cpp new file mode 100644 index 000000000..27659ea3b --- /dev/null +++ b/src/core/hle/kernel/k_device_address_space.cpp @@ -0,0 +1,150 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "common/assert.h" +#include "core/core.h" +#include "core/hle/kernel/k_device_address_space.h" +#include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/svc_results.h" + +namespace Kernel { + +KDeviceAddressSpace::KDeviceAddressSpace(KernelCore& kernel_) + : KAutoObjectWithSlabHeapAndContainer(kernel_), m_lock(kernel_), m_is_initialized(false) {} +KDeviceAddressSpace::~KDeviceAddressSpace() = default; + +void KDeviceAddressSpace::Initialize() { + // This just forwards to the device page table manager. + // KDevicePageTable::Initialize(); +} + +// Member functions. +Result KDeviceAddressSpace::Initialize(u64 address, u64 size) { + // Initialize the device page table. + // R_TRY(m_table.Initialize(address, size)); + + // Set member variables. + m_space_address = address; + m_space_size = size; + m_is_initialized = true; + + R_SUCCEED(); +} + +void KDeviceAddressSpace::Finalize() { + // Finalize the table. + // m_table.Finalize(); +} + +Result KDeviceAddressSpace::Attach(Svc::DeviceName device_name) { + // Lock the address space. + KScopedLightLock lk(m_lock); + + // Attach. + // R_RETURN(m_table.Attach(device_name, m_space_address, m_space_size)); + R_SUCCEED(); +} + +Result KDeviceAddressSpace::Detach(Svc::DeviceName device_name) { + // Lock the address space. + KScopedLightLock lk(m_lock); + + // Detach. + // R_RETURN(m_table.Detach(device_name)); + R_SUCCEED(); +} + +Result KDeviceAddressSpace::Map(KPageTable* page_table, VAddr process_address, size_t size, + u64 device_address, u32 option, bool is_aligned) { + // Check that the address falls within the space. + R_UNLESS((m_space_address <= device_address && + device_address + size - 1 <= m_space_address + m_space_size - 1), + ResultInvalidCurrentMemory); + + // Decode the option. + const Svc::MapDeviceAddressSpaceOption option_pack{option}; + const auto device_perm = option_pack.permission.Value(); + const auto flags = option_pack.flags.Value(); + const auto reserved = option_pack.reserved.Value(); + + // Validate the option. + // TODO: It is likely that this check for flags == none is only on NX board. + R_UNLESS(flags == Svc::MapDeviceAddressSpaceFlag::None, ResultInvalidEnumValue); + R_UNLESS(reserved == 0, ResultInvalidEnumValue); + + // Lock the address space. + KScopedLightLock lk(m_lock); + + // Lock the page table to prevent concurrent device mapping operations. + // KScopedLightLock pt_lk = page_table->AcquireDeviceMapLock(); + + // Lock the pages. + bool is_io{}; + R_TRY(page_table->LockForMapDeviceAddressSpace(std::addressof(is_io), process_address, size, + ConvertToKMemoryPermission(device_perm), + is_aligned, true)); + + // Ensure that if we fail, we don't keep unmapped pages locked. + ON_RESULT_FAILURE { + ASSERT(page_table->UnlockForDeviceAddressSpace(process_address, size) == ResultSuccess); + }; + + // Check that the io status is allowable. + if (is_io) { + R_UNLESS(static_cast(flags & Svc::MapDeviceAddressSpaceFlag::NotIoRegister) == 0, + ResultInvalidCombination); + } + + // Map the pages. + { + // Perform the mapping. + // R_TRY(m_table.Map(page_table, process_address, size, device_address, device_perm, + // is_aligned, is_io)); + + // Ensure that we unmap the pages if we fail to update the protections. + // NOTE: Nintendo does not check the result of this unmap call. + // ON_RESULT_FAILURE { m_table.Unmap(device_address, size); }; + + // Update the protections in accordance with how much we mapped. + // R_TRY(page_table->UnlockForDeviceAddressSpacePartialMap(process_address, size)); + } + + // We succeeded. + R_SUCCEED(); +} + +Result KDeviceAddressSpace::Unmap(KPageTable* page_table, VAddr process_address, size_t size, + u64 device_address) { + // Check that the address falls within the space. + R_UNLESS((m_space_address <= device_address && + device_address + size - 1 <= m_space_address + m_space_size - 1), + ResultInvalidCurrentMemory); + + // Lock the address space. + KScopedLightLock lk(m_lock); + + // Lock the page table to prevent concurrent device mapping operations. + // KScopedLightLock pt_lk = page_table->AcquireDeviceMapLock(); + + // Lock the pages. + R_TRY(page_table->LockForUnmapDeviceAddressSpace(process_address, size, true)); + + // Unmap the pages. + { + // If we fail to unmap, we want to do a partial unlock. + // ON_RESULT_FAILURE { + // ASSERT(page_table->UnlockForDeviceAddressSpacePartialMap(process_address, size) == + // ResultSuccess); + // }; + + // Perform the unmap. + // R_TRY(m_table.Unmap(page_table, process_address, size, device_address)); + } + + // Unlock the pages. + ASSERT(page_table->UnlockForDeviceAddressSpace(process_address, size) == ResultSuccess); + + R_SUCCEED(); +} + +} // namespace Kernel diff --git a/src/core/hle/kernel/k_device_address_space.h b/src/core/hle/kernel/k_device_address_space.h new file mode 100644 index 000000000..4709df995 --- /dev/null +++ b/src/core/hle/kernel/k_device_address_space.h @@ -0,0 +1,60 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include + +#include "common/common_types.h" +#include "core/hle/kernel/k_page_table.h" +#include "core/hle/kernel/slab_helpers.h" +#include "core/hle/result.h" + +namespace Kernel { + +class KDeviceAddressSpace final + : public KAutoObjectWithSlabHeapAndContainer { + KERNEL_AUTOOBJECT_TRAITS(KDeviceAddressSpace, KAutoObject); + +public: + explicit KDeviceAddressSpace(KernelCore& kernel); + ~KDeviceAddressSpace(); + + Result Initialize(u64 address, u64 size); + void Finalize(); + + bool IsInitialized() const { + return m_is_initialized; + } + static void PostDestroy(uintptr_t arg) {} + + Result Attach(Svc::DeviceName device_name); + Result Detach(Svc::DeviceName device_name); + + Result MapByForce(KPageTable* page_table, VAddr process_address, size_t size, + u64 device_address, u32 option) { + R_RETURN(this->Map(page_table, process_address, size, device_address, option, false)); + } + + Result MapAligned(KPageTable* page_table, VAddr process_address, size_t size, + u64 device_address, u32 option) { + R_RETURN(this->Map(page_table, process_address, size, device_address, option, true)); + } + + Result Unmap(KPageTable* page_table, VAddr process_address, size_t size, u64 device_address); + + static void Initialize(); + +private: + Result Map(KPageTable* page_table, VAddr process_address, size_t size, u64 device_address, + u32 option, bool is_aligned); + +private: + KLightLock m_lock; + // KDevicePageTable m_table; + u64 m_space_address{}; + u64 m_space_size{}; + bool m_is_initialized{}; +}; + +} // namespace Kernel diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 8d22f8d2c..5f52e1e95 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -35,6 +35,7 @@ class GlobalSchedulerContext; class KAutoObjectWithListContainer; class KClientSession; class KDebug; +class KDeviceAddressSpace; class KDynamicPageManager; class KEvent; class KEventInfo; @@ -359,6 +360,8 @@ public: return slab_heap_container->transfer_memory; } else if constexpr (std::is_same_v) { return slab_heap_container->code_memory; + } else if constexpr (std::is_same_v) { + return slab_heap_container->device_address_space; } else if constexpr (std::is_same_v) { return slab_heap_container->page_buffer; } else if constexpr (std::is_same_v) { @@ -431,6 +434,7 @@ private: KSlabHeap thread; KSlabHeap transfer_memory; KSlabHeap code_memory; + KSlabHeap device_address_space; KSlabHeap page_buffer; KSlabHeap thread_local_page; KSlabHeap session_request; diff --git a/src/core/hle/kernel/svc_types.h b/src/core/hle/kernel/svc_types.h index 9c2f9998a..e90c35601 100644 --- a/src/core/hle/kernel/svc_types.h +++ b/src/core/hle/kernel/svc_types.h @@ -5,6 +5,7 @@ #include +#include "common/bit_field.h" #include "common/common_funcs.h" #include "common/common_types.h" @@ -498,6 +499,19 @@ enum class MemoryMapping : u32 { Memory = 2, }; +enum class MapDeviceAddressSpaceFlag : u32 { + None = (0U << 0), + NotIoRegister = (1U << 0), +}; +DECLARE_ENUM_FLAG_OPERATORS(MapDeviceAddressSpaceFlag); + +union MapDeviceAddressSpaceOption { + u32 raw; + BitField<0, 16, MemoryPermission> permission; + BitField<16, 1, MapDeviceAddressSpaceFlag> flags; + BitField<17, 15, u32> reserved; +}; + enum class KernelDebugType : u32 { Thread = 0, ThreadCallStack = 1, From 2f2e88c3fb064c7e37982fffe023a5e545d2e6bd Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Thu, 2 Feb 2023 09:51:23 -0600 Subject: [PATCH 0017/1181] input_common: Simplify stick from button --- .../helpers/stick_from_buttons.cpp | 45 ++++++------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/src/input_common/helpers/stick_from_buttons.cpp b/src/input_common/helpers/stick_from_buttons.cpp index 096c23b07..a6be6dac1 100644 --- a/src/input_common/helpers/stick_from_buttons.cpp +++ b/src/input_common/helpers/stick_from_buttons.cpp @@ -15,6 +15,9 @@ public: // do not play nicely with the theoretical maximum range. // Using a value one lower from the maximum emulates real stick behavior. static constexpr float MAX_RANGE = 32766.0f / 32767.0f; + static constexpr float TAU = Common::PI * 2.0f; + // Use wider angle to ease the transition. + static constexpr float APERTURE = TAU * 0.15f; using Button = std::unique_ptr; @@ -61,30 +64,23 @@ public: } bool IsAngleGreater(float old_angle, float new_angle) const { - constexpr float TAU = Common::PI * 2.0f; - // Use wider angle to ease the transition. - constexpr float aperture = TAU * 0.15f; - const float top_limit = new_angle + aperture; + const float top_limit = new_angle + APERTURE; return (old_angle > new_angle && old_angle <= top_limit) || (old_angle + TAU > new_angle && old_angle + TAU <= top_limit); } bool IsAngleSmaller(float old_angle, float new_angle) const { - constexpr float TAU = Common::PI * 2.0f; - // Use wider angle to ease the transition. - constexpr float aperture = TAU * 0.15f; - const float bottom_limit = new_angle - aperture; + const float bottom_limit = new_angle - APERTURE; return (old_angle >= bottom_limit && old_angle < new_angle) || (old_angle - TAU >= bottom_limit && old_angle - TAU < new_angle); } float GetAngle(std::chrono::time_point now) const { - constexpr float TAU = Common::PI * 2.0f; float new_angle = angle; auto time_difference = static_cast( - std::chrono::duration_cast(now - last_update).count()); - time_difference /= 1000.0f * 1000.0f; + std::chrono::duration_cast(now - last_update).count()); + time_difference /= 1000.0f; if (time_difference > 0.5f) { time_difference = 0.5f; } @@ -201,8 +197,6 @@ public: } void UpdateStatus() { - const float coef = modifier_status.value ? modifier_scale : MAX_RANGE; - bool r = right_status; bool l = left_status; bool u = up_status; @@ -220,7 +214,7 @@ public: // Move if a key is pressed if (r || l || u || d) { - amplitude = coef; + amplitude = modifier_status.value ? modifier_scale : MAX_RANGE; } else { amplitude = 0; } @@ -274,30 +268,17 @@ public: Common::Input::StickStatus status{}; status.x.properties = properties; status.y.properties = properties; + if (Settings::values.emulate_analog_keyboard) { const auto now = std::chrono::steady_clock::now(); - float angle_ = GetAngle(now); + const float angle_ = GetAngle(now); status.x.raw_value = std::cos(angle_) * amplitude; status.y.raw_value = std::sin(angle_) * amplitude; return status; } - constexpr float SQRT_HALF = 0.707106781f; - int x = 0, y = 0; - if (right_status) { - ++x; - } - if (left_status) { - --x; - } - if (up_status) { - ++y; - } - if (down_status) { - --y; - } - const float coef = modifier_status.value ? modifier_scale : MAX_RANGE; - status.x.raw_value = static_cast(x) * coef * (y == 0 ? 1.0f : SQRT_HALF); - status.y.raw_value = static_cast(y) * coef * (x == 0 ? 1.0f : SQRT_HALF); + + status.x.raw_value = std::cos(goal_angle) * amplitude; + status.y.raw_value = std::sin(goal_angle) * amplitude; return status; } From b01698775b468a04e4d0a9bdd86035ff00e6decb Mon Sep 17 00:00:00 2001 From: liamwhite Date: Thu, 2 Feb 2023 15:53:28 -0500 Subject: [PATCH 0018/1181] Revert "hle_ipc: Use std::span to avoid heap allocations/copies when calling ReadBuffer" --- src/common/string_util.cpp | 2 +- src/common/string_util.h | 3 +- src/core/hle/kernel/hle_ipc.cpp | 30 +------ src/core/hle/kernel/hle_ipc.h | 8 +- src/core/hle/service/am/am.cpp | 2 +- src/core/hle/service/audio/audren_u.cpp | 2 +- src/core/hle/service/audio/hwopus.cpp | 2 +- src/core/hle/service/es/es.cpp | 2 +- src/core/hle/service/filesystem/fsp_srv.cpp | 9 +- src/core/hle/service/glue/arp.cpp | 3 +- src/core/hle/service/hid/controllers/npad.cpp | 5 +- src/core/hle/service/hid/controllers/npad.h | 3 +- src/core/hle/service/hid/hid.cpp | 4 +- src/core/hle/service/hid/hidbus/hidbus_base.h | 3 +- src/core/hle/service/hid/hidbus/ringcon.cpp | 2 +- src/core/hle/service/hid/hidbus/ringcon.h | 3 +- src/core/hle/service/hid/hidbus/starlink.cpp | 2 +- src/core/hle/service/hid/hidbus/starlink.h | 2 +- src/core/hle/service/hid/hidbus/stubbed.cpp | 2 +- src/core/hle/service/hid/hidbus/stubbed.h | 2 +- src/core/hle/service/jit/jit.cpp | 4 +- src/core/hle/service/ldn/ldn.cpp | 4 +- src/core/hle/service/nvdrv/devices/nvdevice.h | 10 +-- .../service/nvdrv/devices/nvdisp_disp0.cpp | 8 +- .../hle/service/nvdrv/devices/nvdisp_disp0.h | 10 +-- .../service/nvdrv/devices/nvhost_as_gpu.cpp | 26 +++--- .../hle/service/nvdrv/devices/nvhost_as_gpu.h | 28 +++--- .../hle/service/nvdrv/devices/nvhost_ctrl.cpp | 21 ++--- .../hle/service/nvdrv/devices/nvhost_ctrl.h | 22 ++--- .../service/nvdrv/devices/nvhost_ctrl_gpu.cpp | 31 +++---- .../service/nvdrv/devices/nvhost_ctrl_gpu.h | 32 +++---- .../hle/service/nvdrv/devices/nvhost_gpu.cpp | 35 ++++---- .../hle/service/nvdrv/devices/nvhost_gpu.h | 36 ++++---- .../service/nvdrv/devices/nvhost_nvdec.cpp | 8 +- .../hle/service/nvdrv/devices/nvhost_nvdec.h | 10 +-- .../nvdrv/devices/nvhost_nvdec_common.cpp | 17 ++-- .../nvdrv/devices/nvhost_nvdec_common.h | 14 +-- .../service/nvdrv/devices/nvhost_nvjpg.cpp | 10 +-- .../hle/service/nvdrv/devices/nvhost_nvjpg.h | 12 +-- .../hle/service/nvdrv/devices/nvhost_vic.cpp | 8 +- .../hle/service/nvdrv/devices/nvhost_vic.h | 10 +-- src/core/hle/service/nvdrv/devices/nvmap.cpp | 20 ++--- src/core/hle/service/nvdrv/devices/nvmap.h | 22 ++--- src/core/hle/service/nvdrv/nvdrv.cpp | 8 +- src/core/hle/service/nvdrv/nvdrv.h | 12 +-- .../nvflinger/buffer_queue_producer.cpp | 4 +- .../nvflinger/graphic_buffer_producer.cpp | 2 +- .../nvflinger/graphic_buffer_producer.h | 4 +- src/core/hle/service/nvflinger/parcel.h | 87 +++++++++---------- src/core/hle/service/prepo/prepo.cpp | 8 +- src/core/hle/service/sockets/bsd.cpp | 15 ++-- src/core/hle/service/sockets/bsd.h | 23 +++-- src/core/hle/service/sockets/sfdnsres.cpp | 2 +- src/core/hle/service/ssl/ssl.cpp | 8 +- src/core/hle/service/vi/vi.cpp | 4 +- src/core/internal_network/network.cpp | 4 +- src/core/internal_network/socket_proxy.cpp | 4 +- src/core/internal_network/socket_proxy.h | 5 +- src/core/internal_network/sockets.h | 9 +- src/core/reporter.cpp | 2 +- src/core/reporter.h | 4 +- 61 files changed, 326 insertions(+), 368 deletions(-) diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index e0b6180c5..b26db4796 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -30,7 +30,7 @@ std::string ToUpper(std::string str) { return str; } -std::string StringFromBuffer(std::span data) { +std::string StringFromBuffer(const std::vector& data) { return std::string(data.begin(), std::find(data.begin(), data.end(), '\0')); } diff --git a/src/common/string_util.h b/src/common/string_util.h index f8aecc875..ce18a33cf 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -5,7 +5,6 @@ #pragma once #include -#include #include #include #include "common/common_types.h" @@ -18,7 +17,7 @@ namespace Common { /// Make a string uppercase [[nodiscard]] std::string ToUpper(std::string str); -[[nodiscard]] std::string StringFromBuffer(std::span data); +[[nodiscard]] std::string StringFromBuffer(const std::vector& data); [[nodiscard]] std::string StripSpaces(const std::string& s); [[nodiscard]] std::string StripQuotes(const std::string& s); diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index 494151eef..738b6d0f1 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp @@ -11,7 +11,6 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/logging/log.h" -#include "common/scratch_buffer.h" #include "core/hle/ipc_helpers.h" #include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/k_auto_object.h" @@ -326,7 +325,7 @@ Result HLERequestContext::WriteToOutgoingCommandBuffer(KThread& requesting_threa return ResultSuccess; } -std::vector HLERequestContext::ReadBufferCopy(std::size_t buffer_index) const { +std::vector HLERequestContext::ReadBuffer(std::size_t buffer_index) const { const bool is_buffer_a{BufferDescriptorA().size() > buffer_index && BufferDescriptorA()[buffer_index].Size()}; if (is_buffer_a) { @@ -346,33 +345,6 @@ std::vector HLERequestContext::ReadBufferCopy(std::size_t buffer_index) cons } } -std::span HLERequestContext::ReadBuffer(std::size_t buffer_index) const { - static thread_local std::array, 2> read_buffer_a; - static thread_local std::array, 2> read_buffer_x; - - const bool is_buffer_a{BufferDescriptorA().size() > buffer_index && - BufferDescriptorA()[buffer_index].Size()}; - if (is_buffer_a) { - ASSERT_OR_EXECUTE_MSG( - BufferDescriptorA().size() > buffer_index, { return {}; }, - "BufferDescriptorA invalid buffer_index {}", buffer_index); - auto& read_buffer = read_buffer_a[buffer_index]; - read_buffer.resize_destructive(BufferDescriptorA()[buffer_index].Size()); - memory.ReadBlock(BufferDescriptorA()[buffer_index].Address(), read_buffer.data(), - read_buffer.size()); - return read_buffer; - } else { - ASSERT_OR_EXECUTE_MSG( - BufferDescriptorX().size() > buffer_index, { return {}; }, - "BufferDescriptorX invalid buffer_index {}", buffer_index); - auto& read_buffer = read_buffer_x[buffer_index]; - read_buffer.resize_destructive(BufferDescriptorX()[buffer_index].Size()); - memory.ReadBlock(BufferDescriptorX()[buffer_index].Address(), read_buffer.data(), - read_buffer.size()); - return read_buffer; - } -} - std::size_t HLERequestContext::WriteBuffer(const void* buffer, std::size_t size, std::size_t buffer_index) const { if (size == 0) { diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index 5bf4f171b..e252b5f4b 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include @@ -271,11 +270,8 @@ public: return domain_message_header.has_value(); } - /// Helper function to get a span of a buffer using the appropriate buffer descriptor - [[nodiscard]] std::span ReadBuffer(std::size_t buffer_index = 0) const; - - /// Helper function to read a copy of a buffer using the appropriate buffer descriptor - [[nodiscard]] std::vector ReadBufferCopy(std::size_t buffer_index = 0) const; + /// Helper function to read a buffer using the appropriate buffer descriptor + [[nodiscard]] std::vector ReadBuffer(std::size_t buffer_index = 0) const; /// Helper function to write a buffer using the appropriate buffer descriptor std::size_t WriteBuffer(const void* buffer, std::size_t size, diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index ebcf6e164..22999c942 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -1124,7 +1124,7 @@ void IStorageAccessor::Write(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 offset{rp.Pop()}; - const auto data{ctx.ReadBuffer()}; + const std::vector data{ctx.ReadBuffer()}; const std::size_t size{std::min(data.size(), backing.GetSize() - offset)}; LOG_DEBUG(Service_AM, "called, offset={}, size={}", offset, size); diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index 0ee28752c..3a1c231b6 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp @@ -112,7 +112,7 @@ private: void RequestUpdate(Kernel::HLERequestContext& ctx) { LOG_TRACE(Service_Audio, "called"); - const auto input{ctx.ReadBuffer(0)}; + std::vector input{ctx.ReadBuffer(0)}; // These buffers are written manually to avoid an issue with WriteBuffer throwing errors for // checking size 0. Performance size is 0 for most games. diff --git a/src/core/hle/service/audio/hwopus.cpp b/src/core/hle/service/audio/hwopus.cpp index e01f87356..825fb8bcc 100644 --- a/src/core/hle/service/audio/hwopus.cpp +++ b/src/core/hle/service/audio/hwopus.cpp @@ -93,7 +93,7 @@ private: ctx.WriteBuffer(samples); } - bool DecodeOpusData(u32& consumed, u32& sample_count, std::span input, + bool DecodeOpusData(u32& consumed, u32& sample_count, const std::vector& input, std::vector& output, u64* out_performance_time) const { const auto start_time = std::chrono::steady_clock::now(); const std::size_t raw_output_sz = output.size() * sizeof(opus_int16); diff --git a/src/core/hle/service/es/es.cpp b/src/core/hle/service/es/es.cpp index fb8686859..d183e5829 100644 --- a/src/core/hle/service/es/es.cpp +++ b/src/core/hle/service/es/es.cpp @@ -122,7 +122,7 @@ private: void ImportTicket(Kernel::HLERequestContext& ctx) { const auto ticket = ctx.ReadBuffer(); - [[maybe_unused]] const auto cert = ctx.ReadBuffer(1); + const auto cert = ctx.ReadBuffer(1); if (ticket.size() < sizeof(Core::Crypto::Ticket)) { LOG_ERROR(Service_ETicket, "The input buffer is not large enough!"); diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index cab44bf9c..fbb16a7da 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp_srv.cpp @@ -190,7 +190,7 @@ private: return; } - const auto data = ctx.ReadBuffer(); + const std::vector data = ctx.ReadBuffer(); ASSERT_MSG( static_cast(data.size()) <= length, @@ -401,8 +401,11 @@ public: } void RenameFile(Kernel::HLERequestContext& ctx) { - const std::string src_name = Common::StringFromBuffer(ctx.ReadBuffer(0)); - const std::string dst_name = Common::StringFromBuffer(ctx.ReadBuffer(1)); + std::vector buffer = ctx.ReadBuffer(0); + const std::string src_name = Common::StringFromBuffer(buffer); + + buffer = ctx.ReadBuffer(1); + const std::string dst_name = Common::StringFromBuffer(buffer); LOG_DEBUG(Service_FS, "called. file '{}' to file '{}'", src_name, dst_name); diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp index ce21b69e3..49b6d45fe 100644 --- a/src/core/hle/service/glue/arp.cpp +++ b/src/core/hle/service/glue/arp.cpp @@ -228,8 +228,7 @@ private: return; } - // TODO: Can this be a span? - control = ctx.ReadBufferCopy(); + control = ctx.ReadBuffer(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 513ea485a..3afda9e3f 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -758,12 +758,11 @@ Core::HID::NpadStyleTag Controller_NPad::GetSupportedStyleSet() const { return hid_core.GetSupportedStyleTag(); } -void Controller_NPad::SetSupportedNpadIdTypes(std::span data) { - const auto length = data.size(); +void Controller_NPad::SetSupportedNpadIdTypes(u8* data, std::size_t length) { ASSERT(length > 0 && (length % sizeof(u32)) == 0); supported_npad_id_types.clear(); supported_npad_id_types.resize(length / sizeof(u32)); - std::memcpy(supported_npad_id_types.data(), data.data(), length); + std::memcpy(supported_npad_id_types.data(), data, length); } void Controller_NPad::GetSupportedNpadIdTypes(u32* data, std::size_t max_length) { diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 1f7d33459..1a589cca2 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -6,7 +6,6 @@ #include #include #include -#include #include "common/bit_field.h" #include "common/common_types.h" @@ -96,7 +95,7 @@ public: void SetSupportedStyleSet(Core::HID::NpadStyleTag style_set); Core::HID::NpadStyleTag GetSupportedStyleSet() const; - void SetSupportedNpadIdTypes(std::span data); + void SetSupportedNpadIdTypes(u8* data, std::size_t length); void GetSupportedNpadIdTypes(u32* data, std::size_t max_length); std::size_t GetSupportedNpadIdTypesSize() const; diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index f15f1a6bb..bf28440c6 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -1026,7 +1026,7 @@ void Hid::SetSupportedNpadIdType(Kernel::HLERequestContext& ctx) { const auto applet_resource_user_id{rp.Pop()}; applet_resource->GetController(HidController::NPad) - .SetSupportedNpadIdTypes(ctx.ReadBuffer()); + .SetSupportedNpadIdTypes(ctx.ReadBuffer().data(), ctx.GetReadBufferSize()); LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id); @@ -2104,7 +2104,7 @@ void Hid::WritePalmaRgbLedPatternEntry(Kernel::HLERequestContext& ctx) { const auto connection_handle{rp.PopRaw()}; const auto unknown{rp.Pop()}; - [[maybe_unused]] const auto buffer = ctx.ReadBuffer(); + const auto buffer = ctx.ReadBuffer(); LOG_WARNING(Service_HID, "(STUBBED) called, connection_handle={}, unknown={}", connection_handle.npad_id, unknown); diff --git a/src/core/hle/service/hid/hidbus/hidbus_base.h b/src/core/hle/service/hid/hidbus/hidbus_base.h index 65e301137..d3960f506 100644 --- a/src/core/hle/service/hid/hidbus/hidbus_base.h +++ b/src/core/hle/service/hid/hidbus/hidbus_base.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include "common/common_types.h" #include "core/hle/result.h" @@ -151,7 +150,7 @@ public: } // Assigns a command from data - virtual bool SetCommand(std::span data) { + virtual bool SetCommand(const std::vector& data) { return {}; } diff --git a/src/core/hle/service/hid/hidbus/ringcon.cpp b/src/core/hle/service/hid/hidbus/ringcon.cpp index 35847cbdd..78ed47014 100644 --- a/src/core/hle/service/hid/hidbus/ringcon.cpp +++ b/src/core/hle/service/hid/hidbus/ringcon.cpp @@ -116,7 +116,7 @@ std::vector RingController::GetReply() const { } } -bool RingController::SetCommand(std::span data) { +bool RingController::SetCommand(const std::vector& data) { if (data.size() < 4) { LOG_ERROR(Service_HID, "Command size not supported {}", data.size()); command = RingConCommands::Error; diff --git a/src/core/hle/service/hid/hidbus/ringcon.h b/src/core/hle/service/hid/hidbus/ringcon.h index c2fb386b1..845ce85a5 100644 --- a/src/core/hle/service/hid/hidbus/ringcon.h +++ b/src/core/hle/service/hid/hidbus/ringcon.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include "common/common_types.h" #include "core/hle/service/hid/hidbus/hidbus_base.h" @@ -32,7 +31,7 @@ public: u8 GetDeviceId() const override; // Assigns a command from data - bool SetCommand(std::span data) override; + bool SetCommand(const std::vector& data) override; // Returns a reply from a command std::vector GetReply() const override; diff --git a/src/core/hle/service/hid/hidbus/starlink.cpp b/src/core/hle/service/hid/hidbus/starlink.cpp index d0e760314..dd439f60a 100644 --- a/src/core/hle/service/hid/hidbus/starlink.cpp +++ b/src/core/hle/service/hid/hidbus/starlink.cpp @@ -42,7 +42,7 @@ std::vector Starlink::GetReply() const { return {}; } -bool Starlink::SetCommand(std::span data) { +bool Starlink::SetCommand(const std::vector& data) { LOG_ERROR(Service_HID, "Command not implemented"); return false; } diff --git a/src/core/hle/service/hid/hidbus/starlink.h b/src/core/hle/service/hid/hidbus/starlink.h index 07c800e6e..0b1b7ba49 100644 --- a/src/core/hle/service/hid/hidbus/starlink.h +++ b/src/core/hle/service/hid/hidbus/starlink.h @@ -29,7 +29,7 @@ public: u8 GetDeviceId() const override; // Assigns a command from data - bool SetCommand(std::span data) override; + bool SetCommand(const std::vector& data) override; // Returns a reply from a command std::vector GetReply() const override; diff --git a/src/core/hle/service/hid/hidbus/stubbed.cpp b/src/core/hle/service/hid/hidbus/stubbed.cpp index 07632c872..e477443e3 100644 --- a/src/core/hle/service/hid/hidbus/stubbed.cpp +++ b/src/core/hle/service/hid/hidbus/stubbed.cpp @@ -43,7 +43,7 @@ std::vector HidbusStubbed::GetReply() const { return {}; } -bool HidbusStubbed::SetCommand(std::span data) { +bool HidbusStubbed::SetCommand(const std::vector& data) { LOG_ERROR(Service_HID, "Command not implemented"); return false; } diff --git a/src/core/hle/service/hid/hidbus/stubbed.h b/src/core/hle/service/hid/hidbus/stubbed.h index 38eaa0ecc..91165ceff 100644 --- a/src/core/hle/service/hid/hidbus/stubbed.h +++ b/src/core/hle/service/hid/hidbus/stubbed.h @@ -29,7 +29,7 @@ public: u8 GetDeviceId() const override; // Assigns a command from data - bool SetCommand(std::span data) override; + bool SetCommand(const std::vector& data) override; // Returns a reply from a command std::vector GetReply() const override; diff --git a/src/core/hle/service/jit/jit.cpp b/src/core/hle/service/jit/jit.cpp index 1295a44c7..8f2920c51 100644 --- a/src/core/hle/service/jit/jit.cpp +++ b/src/core/hle/service/jit/jit.cpp @@ -62,7 +62,7 @@ public: const auto parameters{rp.PopRaw()}; // Optional input/output buffers - const auto input_buffer{ctx.CanReadBuffer() ? ctx.ReadBuffer() : std::span()}; + std::vector input_buffer{ctx.CanReadBuffer() ? ctx.ReadBuffer() : std::vector()}; std::vector output_buffer(ctx.CanWriteBuffer() ? ctx.GetWriteBufferSize() : 0); // Function call prototype: @@ -132,7 +132,7 @@ public: const auto command{rp.PopRaw()}; // Optional input/output buffers - const auto input_buffer{ctx.CanReadBuffer() ? ctx.ReadBuffer() : std::span()}; + std::vector input_buffer{ctx.CanReadBuffer() ? ctx.ReadBuffer() : std::vector()}; std::vector output_buffer(ctx.CanWriteBuffer() ? ctx.GetWriteBufferSize() : 0); // Function call prototype: diff --git a/src/core/hle/service/ldn/ldn.cpp b/src/core/hle/service/ldn/ldn.cpp index e5099d61f..c49c61cff 100644 --- a/src/core/hle/service/ldn/ldn.cpp +++ b/src/core/hle/service/ldn/ldn.cpp @@ -412,7 +412,7 @@ public: } void SetAdvertiseData(Kernel::HLERequestContext& ctx) { - const auto read_buffer = ctx.ReadBuffer(); + std::vector read_buffer = ctx.ReadBuffer(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(lan_discovery.SetAdvertiseData(read_buffer)); @@ -464,7 +464,7 @@ public: parameters.security_config.passphrase_size, parameters.security_config.security_mode, parameters.local_communication_version); - const auto read_buffer = ctx.ReadBuffer(); + const std::vector read_buffer = ctx.ReadBuffer(); if (read_buffer.size() != sizeof(NetworkInfo)) { LOG_ERROR(Frontend, "NetworkInfo doesn't match read_buffer size!"); IPC::ResponseBuilder rb{ctx, 2}; diff --git a/src/core/hle/service/nvdrv/devices/nvdevice.h b/src/core/hle/service/nvdrv/devices/nvdevice.h index c562e04d2..204b0e757 100644 --- a/src/core/hle/service/nvdrv/devices/nvdevice.h +++ b/src/core/hle/service/nvdrv/devices/nvdevice.h @@ -3,9 +3,7 @@ #pragma once -#include #include - #include "common/common_types.h" #include "core/hle/service/nvdrv/nvdata.h" @@ -33,7 +31,7 @@ public: * @param output A buffer where the output data will be written to. * @returns The result code of the ioctl. */ - virtual NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, + virtual NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) = 0; /** @@ -44,8 +42,8 @@ public: * @param output A buffer where the output data will be written to. * @returns The result code of the ioctl. */ - virtual NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) = 0; + virtual NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) = 0; /** * Handles an ioctl3 request. @@ -55,7 +53,7 @@ public: * @param inline_output A buffer where the inlined output data will be written to. * @returns The result code of the ioctl. */ - virtual NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, + virtual NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output, std::vector& inline_output) = 0; /** diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp index 5a5b2e305..4122fc98d 100644 --- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp +++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp @@ -17,19 +17,19 @@ nvdisp_disp0::nvdisp_disp0(Core::System& system_, NvCore::Container& core) : nvdevice{system_}, container{core}, nvmap{core.GetNvMapFile()} {} nvdisp_disp0::~nvdisp_disp0() = default; -NvResult nvdisp_disp0::Ioctl1(DeviceFD fd, Ioctl command, std::span input, +NvResult nvdisp_disp0::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvdisp_disp0::Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) { +NvResult nvdisp_disp0::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvdisp_disp0::Ioctl3(DeviceFD fd, Ioctl command, std::span input, +NvResult nvdisp_disp0::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output, std::vector& inline_output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h index 81bd7960a..04217ab12 100644 --- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h +++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h @@ -25,12 +25,12 @@ public: explicit nvdisp_disp0(Core::System& system_, NvCore::Container& core); ~nvdisp_disp0() override; - NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, - std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, + std::vector& output, std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp index 681bd0867..b635e6ed1 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp @@ -27,7 +27,7 @@ nvhost_as_gpu::nvhost_as_gpu(Core::System& system_, Module& module_, NvCore::Con nvhost_as_gpu::~nvhost_as_gpu() = default; -NvResult nvhost_as_gpu::Ioctl1(DeviceFD fd, Ioctl command, std::span input, +NvResult nvhost_as_gpu::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) { switch (command.group) { case 'A': @@ -60,13 +60,13 @@ NvResult nvhost_as_gpu::Ioctl1(DeviceFD fd, Ioctl command, std::span i return NvResult::NotImplemented; } -NvResult nvhost_as_gpu::Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) { +NvResult nvhost_as_gpu::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvhost_as_gpu::Ioctl3(DeviceFD fd, Ioctl command, std::span input, +NvResult nvhost_as_gpu::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output, std::vector& inline_output) { switch (command.group) { case 'A': @@ -87,7 +87,7 @@ NvResult nvhost_as_gpu::Ioctl3(DeviceFD fd, Ioctl command, std::span i void nvhost_as_gpu::OnOpen(DeviceFD fd) {} void nvhost_as_gpu::OnClose(DeviceFD fd) {} -NvResult nvhost_as_gpu::AllocAsEx(std::span input, std::vector& output) { +NvResult nvhost_as_gpu::AllocAsEx(const std::vector& input, std::vector& output) { IoctlAllocAsEx params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -141,7 +141,7 @@ NvResult nvhost_as_gpu::AllocAsEx(std::span input, std::vector& ou return NvResult::Success; } -NvResult nvhost_as_gpu::AllocateSpace(std::span input, std::vector& output) { +NvResult nvhost_as_gpu::AllocateSpace(const std::vector& input, std::vector& output) { IoctlAllocSpace params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -220,7 +220,7 @@ void nvhost_as_gpu::FreeMappingLocked(u64 offset) { mapping_map.erase(offset); } -NvResult nvhost_as_gpu::FreeSpace(std::span input, std::vector& output) { +NvResult nvhost_as_gpu::FreeSpace(const std::vector& input, std::vector& output) { IoctlFreeSpace params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -266,7 +266,7 @@ NvResult nvhost_as_gpu::FreeSpace(std::span input, std::vector& ou return NvResult::Success; } -NvResult nvhost_as_gpu::Remap(std::span input, std::vector& output) { +NvResult nvhost_as_gpu::Remap(const std::vector& input, std::vector& output) { const auto num_entries = input.size() / sizeof(IoctlRemapEntry); LOG_DEBUG(Service_NVDRV, "called, num_entries=0x{:X}", num_entries); @@ -320,7 +320,7 @@ NvResult nvhost_as_gpu::Remap(std::span input, std::vector& output return NvResult::Success; } -NvResult nvhost_as_gpu::MapBufferEx(std::span input, std::vector& output) { +NvResult nvhost_as_gpu::MapBufferEx(const std::vector& input, std::vector& output) { IoctlMapBufferEx params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -424,7 +424,7 @@ NvResult nvhost_as_gpu::MapBufferEx(std::span input, std::vector& return NvResult::Success; } -NvResult nvhost_as_gpu::UnmapBuffer(std::span input, std::vector& output) { +NvResult nvhost_as_gpu::UnmapBuffer(const std::vector& input, std::vector& output) { IoctlUnmapBuffer params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -463,7 +463,7 @@ NvResult nvhost_as_gpu::UnmapBuffer(std::span input, std::vector& return NvResult::Success; } -NvResult nvhost_as_gpu::BindChannel(std::span input, std::vector& output) { +NvResult nvhost_as_gpu::BindChannel(const std::vector& input, std::vector& output) { IoctlBindChannel params{}; std::memcpy(¶ms, input.data(), input.size()); LOG_DEBUG(Service_NVDRV, "called, fd={:X}", params.fd); @@ -492,7 +492,7 @@ void nvhost_as_gpu::GetVARegionsImpl(IoctlGetVaRegions& params) { }; } -NvResult nvhost_as_gpu::GetVARegions(std::span input, std::vector& output) { +NvResult nvhost_as_gpu::GetVARegions(const std::vector& input, std::vector& output) { IoctlGetVaRegions params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -511,7 +511,7 @@ NvResult nvhost_as_gpu::GetVARegions(std::span input, std::vector& return NvResult::Success; } -NvResult nvhost_as_gpu::GetVARegions(std::span input, std::vector& output, +NvResult nvhost_as_gpu::GetVARegions(const std::vector& input, std::vector& output, std::vector& inline_output) { IoctlGetVaRegions params{}; std::memcpy(¶ms, input.data(), input.size()); diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h index 1aba8d579..86fe71c75 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h @@ -47,12 +47,12 @@ public: explicit nvhost_as_gpu(Core::System& system_, Module& module, NvCore::Container& core); ~nvhost_as_gpu() override; - NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, - std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, + std::vector& output, std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; @@ -138,17 +138,17 @@ private: static_assert(sizeof(IoctlGetVaRegions) == 16 + sizeof(VaRegion) * 2, "IoctlGetVaRegions is incorrect size"); - NvResult AllocAsEx(std::span input, std::vector& output); - NvResult AllocateSpace(std::span input, std::vector& output); - NvResult Remap(std::span input, std::vector& output); - NvResult MapBufferEx(std::span input, std::vector& output); - NvResult UnmapBuffer(std::span input, std::vector& output); - NvResult FreeSpace(std::span input, std::vector& output); - NvResult BindChannel(std::span input, std::vector& output); + NvResult AllocAsEx(const std::vector& input, std::vector& output); + NvResult AllocateSpace(const std::vector& input, std::vector& output); + NvResult Remap(const std::vector& input, std::vector& output); + NvResult MapBufferEx(const std::vector& input, std::vector& output); + NvResult UnmapBuffer(const std::vector& input, std::vector& output); + NvResult FreeSpace(const std::vector& input, std::vector& output); + NvResult BindChannel(const std::vector& input, std::vector& output); void GetVARegionsImpl(IoctlGetVaRegions& params); - NvResult GetVARegions(std::span input, std::vector& output); - NvResult GetVARegions(std::span input, std::vector& output, + NvResult GetVARegions(const std::vector& input, std::vector& output); + NvResult GetVARegions(const std::vector& input, std::vector& output, std::vector& inline_output); void FreeMappingLocked(u64 offset); diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index 0cdde82a7..eee11fab8 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp @@ -34,7 +34,7 @@ nvhost_ctrl::~nvhost_ctrl() { } } -NvResult nvhost_ctrl::Ioctl1(DeviceFD fd, Ioctl command, std::span input, +NvResult nvhost_ctrl::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) { switch (command.group) { case 0x0: @@ -63,13 +63,13 @@ NvResult nvhost_ctrl::Ioctl1(DeviceFD fd, Ioctl command, std::span inp return NvResult::NotImplemented; } -NvResult nvhost_ctrl::Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) { +NvResult nvhost_ctrl::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvhost_ctrl::Ioctl3(DeviceFD fd, Ioctl command, std::span input, +NvResult nvhost_ctrl::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output, std::vector& inline_outpu) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; @@ -79,7 +79,7 @@ void nvhost_ctrl::OnOpen(DeviceFD fd) {} void nvhost_ctrl::OnClose(DeviceFD fd) {} -NvResult nvhost_ctrl::NvOsGetConfigU32(std::span input, std::vector& output) { +NvResult nvhost_ctrl::NvOsGetConfigU32(const std::vector& input, std::vector& output) { IocGetConfigParams params{}; std::memcpy(¶ms, input.data(), sizeof(params)); LOG_TRACE(Service_NVDRV, "called, setting={}!{}", params.domain_str.data(), @@ -87,7 +87,7 @@ NvResult nvhost_ctrl::NvOsGetConfigU32(std::span input, std::vector input, std::vector& output, +NvResult nvhost_ctrl::IocCtrlEventWait(const std::vector& input, std::vector& output, bool is_allocation) { IocCtrlEventWaitParams params{}; std::memcpy(¶ms, input.data(), sizeof(params)); @@ -231,7 +231,7 @@ NvResult nvhost_ctrl::FreeEvent(u32 slot) { return NvResult::Success; } -NvResult nvhost_ctrl::IocCtrlEventRegister(std::span input, std::vector& output) { +NvResult nvhost_ctrl::IocCtrlEventRegister(const std::vector& input, std::vector& output) { IocCtrlEventRegisterParams params{}; std::memcpy(¶ms, input.data(), sizeof(params)); const u32 event_id = params.user_event_id; @@ -252,7 +252,8 @@ NvResult nvhost_ctrl::IocCtrlEventRegister(std::span input, std::vecto return NvResult::Success; } -NvResult nvhost_ctrl::IocCtrlEventUnregister(std::span input, std::vector& output) { +NvResult nvhost_ctrl::IocCtrlEventUnregister(const std::vector& input, + std::vector& output) { IocCtrlEventUnregisterParams params{}; std::memcpy(¶ms, input.data(), sizeof(params)); const u32 event_id = params.user_event_id & 0x00FF; @@ -262,7 +263,7 @@ NvResult nvhost_ctrl::IocCtrlEventUnregister(std::span input, std::vec return FreeEvent(event_id); } -NvResult nvhost_ctrl::IocCtrlEventUnregisterBatch(std::span input, +NvResult nvhost_ctrl::IocCtrlEventUnregisterBatch(const std::vector& input, std::vector& output) { IocCtrlEventUnregisterBatchParams params{}; std::memcpy(¶ms, input.data(), sizeof(params)); @@ -281,7 +282,7 @@ NvResult nvhost_ctrl::IocCtrlEventUnregisterBatch(std::span input, return NvResult::Success; } -NvResult nvhost_ctrl::IocCtrlClearEventWait(std::span input, std::vector& output) { +NvResult nvhost_ctrl::IocCtrlClearEventWait(const std::vector& input, std::vector& output) { IocCtrlEventClearParams params{}; std::memcpy(¶ms, input.data(), sizeof(params)); diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h index dd2e7888a..0b56d7070 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h @@ -25,12 +25,12 @@ public: NvCore::Container& core); ~nvhost_ctrl() override; - NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, - std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, + std::vector& output, std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; @@ -186,13 +186,13 @@ private: static_assert(sizeof(IocCtrlEventUnregisterBatchParams) == 8, "IocCtrlEventKill is incorrect size"); - NvResult NvOsGetConfigU32(std::span input, std::vector& output); - NvResult IocCtrlEventWait(std::span input, std::vector& output, + NvResult NvOsGetConfigU32(const std::vector& input, std::vector& output); + NvResult IocCtrlEventWait(const std::vector& input, std::vector& output, bool is_allocation); - NvResult IocCtrlEventRegister(std::span input, std::vector& output); - NvResult IocCtrlEventUnregister(std::span input, std::vector& output); - NvResult IocCtrlEventUnregisterBatch(std::span input, std::vector& output); - NvResult IocCtrlClearEventWait(std::span input, std::vector& output); + NvResult IocCtrlEventRegister(const std::vector& input, std::vector& output); + NvResult IocCtrlEventUnregister(const std::vector& input, std::vector& output); + NvResult IocCtrlEventUnregisterBatch(const std::vector& input, std::vector& output); + NvResult IocCtrlClearEventWait(const std::vector& input, std::vector& output); NvResult FreeEvent(u32 slot); diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp index be3c083db..b97813fbc 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp @@ -21,7 +21,7 @@ nvhost_ctrl_gpu::~nvhost_ctrl_gpu() { events_interface.FreeEvent(unknown_event); } -NvResult nvhost_ctrl_gpu::Ioctl1(DeviceFD fd, Ioctl command, std::span input, +NvResult nvhost_ctrl_gpu::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) { switch (command.group) { case 'G': @@ -53,13 +53,13 @@ NvResult nvhost_ctrl_gpu::Ioctl1(DeviceFD fd, Ioctl command, std::span return NvResult::NotImplemented; } -NvResult nvhost_ctrl_gpu::Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) { +NvResult nvhost_ctrl_gpu::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvhost_ctrl_gpu::Ioctl3(DeviceFD fd, Ioctl command, std::span input, +NvResult nvhost_ctrl_gpu::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output, std::vector& inline_output) { switch (command.group) { case 'G': @@ -82,7 +82,8 @@ NvResult nvhost_ctrl_gpu::Ioctl3(DeviceFD fd, Ioctl command, std::span void nvhost_ctrl_gpu::OnOpen(DeviceFD fd) {} void nvhost_ctrl_gpu::OnClose(DeviceFD fd) {} -NvResult nvhost_ctrl_gpu::GetCharacteristics(std::span input, std::vector& output) { +NvResult nvhost_ctrl_gpu::GetCharacteristics(const std::vector& input, + std::vector& output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlCharacteristics params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -127,7 +128,7 @@ NvResult nvhost_ctrl_gpu::GetCharacteristics(std::span input, std::vec return NvResult::Success; } -NvResult nvhost_ctrl_gpu::GetCharacteristics(std::span input, std::vector& output, +NvResult nvhost_ctrl_gpu::GetCharacteristics(const std::vector& input, std::vector& output, std::vector& inline_output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlCharacteristics params{}; @@ -175,7 +176,7 @@ NvResult nvhost_ctrl_gpu::GetCharacteristics(std::span input, std::vec return NvResult::Success; } -NvResult nvhost_ctrl_gpu::GetTPCMasks(std::span input, std::vector& output) { +NvResult nvhost_ctrl_gpu::GetTPCMasks(const std::vector& input, std::vector& output) { IoctlGpuGetTpcMasksArgs params{}; std::memcpy(¶ms, input.data(), input.size()); LOG_DEBUG(Service_NVDRV, "called, mask_buffer_size=0x{:X}", params.mask_buffer_size); @@ -186,7 +187,7 @@ NvResult nvhost_ctrl_gpu::GetTPCMasks(std::span input, std::vector return NvResult::Success; } -NvResult nvhost_ctrl_gpu::GetTPCMasks(std::span input, std::vector& output, +NvResult nvhost_ctrl_gpu::GetTPCMasks(const std::vector& input, std::vector& output, std::vector& inline_output) { IoctlGpuGetTpcMasksArgs params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -199,7 +200,7 @@ NvResult nvhost_ctrl_gpu::GetTPCMasks(std::span input, std::vector return NvResult::Success; } -NvResult nvhost_ctrl_gpu::GetActiveSlotMask(std::span input, std::vector& output) { +NvResult nvhost_ctrl_gpu::GetActiveSlotMask(const std::vector& input, std::vector& output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlActiveSlotMask params{}; @@ -212,7 +213,7 @@ NvResult nvhost_ctrl_gpu::GetActiveSlotMask(std::span input, std::vect return NvResult::Success; } -NvResult nvhost_ctrl_gpu::ZCullGetCtxSize(std::span input, std::vector& output) { +NvResult nvhost_ctrl_gpu::ZCullGetCtxSize(const std::vector& input, std::vector& output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlZcullGetCtxSize params{}; @@ -224,7 +225,7 @@ NvResult nvhost_ctrl_gpu::ZCullGetCtxSize(std::span input, std::vector return NvResult::Success; } -NvResult nvhost_ctrl_gpu::ZCullGetInfo(std::span input, std::vector& output) { +NvResult nvhost_ctrl_gpu::ZCullGetInfo(const std::vector& input, std::vector& output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlNvgpuGpuZcullGetInfoArgs params{}; @@ -247,7 +248,7 @@ NvResult nvhost_ctrl_gpu::ZCullGetInfo(std::span input, std::vector input, std::vector& output) { +NvResult nvhost_ctrl_gpu::ZBCSetTable(const std::vector& input, std::vector& output) { LOG_WARNING(Service_NVDRV, "(STUBBED) called"); IoctlZbcSetTable params{}; @@ -263,7 +264,7 @@ NvResult nvhost_ctrl_gpu::ZBCSetTable(std::span input, std::vector return NvResult::Success; } -NvResult nvhost_ctrl_gpu::ZBCQueryTable(std::span input, std::vector& output) { +NvResult nvhost_ctrl_gpu::ZBCQueryTable(const std::vector& input, std::vector& output) { LOG_WARNING(Service_NVDRV, "(STUBBED) called"); IoctlZbcQueryTable params{}; @@ -273,7 +274,7 @@ NvResult nvhost_ctrl_gpu::ZBCQueryTable(std::span input, std::vector input, std::vector& output) { +NvResult nvhost_ctrl_gpu::FlushL2(const std::vector& input, std::vector& output) { LOG_WARNING(Service_NVDRV, "(STUBBED) called"); IoctlFlushL2 params{}; @@ -283,7 +284,7 @@ NvResult nvhost_ctrl_gpu::FlushL2(std::span input, std::vector& ou return NvResult::Success; } -NvResult nvhost_ctrl_gpu::GetGpuTime(std::span input, std::vector& output) { +NvResult nvhost_ctrl_gpu::GetGpuTime(const std::vector& input, std::vector& output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlGetGpuTime params{}; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h index b9333d9d3..1e8f254e2 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h @@ -21,12 +21,12 @@ public: explicit nvhost_ctrl_gpu(Core::System& system_, EventInterface& events_interface_); ~nvhost_ctrl_gpu() override; - NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, - std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, + std::vector& output, std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; @@ -151,21 +151,21 @@ private: }; static_assert(sizeof(IoctlGetGpuTime) == 0x10, "IoctlGetGpuTime is incorrect size"); - NvResult GetCharacteristics(std::span input, std::vector& output); - NvResult GetCharacteristics(std::span input, std::vector& output, + NvResult GetCharacteristics(const std::vector& input, std::vector& output); + NvResult GetCharacteristics(const std::vector& input, std::vector& output, std::vector& inline_output); - NvResult GetTPCMasks(std::span input, std::vector& output); - NvResult GetTPCMasks(std::span input, std::vector& output, + NvResult GetTPCMasks(const std::vector& input, std::vector& output); + NvResult GetTPCMasks(const std::vector& input, std::vector& output, std::vector& inline_output); - NvResult GetActiveSlotMask(std::span input, std::vector& output); - NvResult ZCullGetCtxSize(std::span input, std::vector& output); - NvResult ZCullGetInfo(std::span input, std::vector& output); - NvResult ZBCSetTable(std::span input, std::vector& output); - NvResult ZBCQueryTable(std::span input, std::vector& output); - NvResult FlushL2(std::span input, std::vector& output); - NvResult GetGpuTime(std::span input, std::vector& output); + NvResult GetActiveSlotMask(const std::vector& input, std::vector& output); + NvResult ZCullGetCtxSize(const std::vector& input, std::vector& output); + NvResult ZCullGetInfo(const std::vector& input, std::vector& output); + NvResult ZBCSetTable(const std::vector& input, std::vector& output); + NvResult ZBCQueryTable(const std::vector& input, std::vector& output); + NvResult FlushL2(const std::vector& input, std::vector& output); + NvResult GetGpuTime(const std::vector& input, std::vector& output); EventInterface& events_interface; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp index d2308fffc..e123564c6 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp @@ -46,7 +46,7 @@ nvhost_gpu::~nvhost_gpu() { syncpoint_manager.FreeSyncpoint(channel_syncpoint); } -NvResult nvhost_gpu::Ioctl1(DeviceFD fd, Ioctl command, std::span input, +NvResult nvhost_gpu::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) { switch (command.group) { case 0x0: @@ -98,8 +98,8 @@ NvResult nvhost_gpu::Ioctl1(DeviceFD fd, Ioctl command, std::span inpu return NvResult::NotImplemented; }; -NvResult nvhost_gpu::Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) { +NvResult nvhost_gpu::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) { switch (command.group) { case 'H': switch (command.cmd) { @@ -112,7 +112,7 @@ NvResult nvhost_gpu::Ioctl2(DeviceFD fd, Ioctl command, std::span inpu return NvResult::NotImplemented; } -NvResult nvhost_gpu::Ioctl3(DeviceFD fd, Ioctl command, std::span input, +NvResult nvhost_gpu::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output, std::vector& inline_output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; @@ -121,7 +121,7 @@ NvResult nvhost_gpu::Ioctl3(DeviceFD fd, Ioctl command, std::span inpu void nvhost_gpu::OnOpen(DeviceFD fd) {} void nvhost_gpu::OnClose(DeviceFD fd) {} -NvResult nvhost_gpu::SetNVMAPfd(std::span input, std::vector& output) { +NvResult nvhost_gpu::SetNVMAPfd(const std::vector& input, std::vector& output) { IoctlSetNvmapFD params{}; std::memcpy(¶ms, input.data(), input.size()); LOG_DEBUG(Service_NVDRV, "called, fd={}", params.nvmap_fd); @@ -130,7 +130,7 @@ NvResult nvhost_gpu::SetNVMAPfd(std::span input, std::vector& outp return NvResult::Success; } -NvResult nvhost_gpu::SetClientData(std::span input, std::vector& output) { +NvResult nvhost_gpu::SetClientData(const std::vector& input, std::vector& output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlClientData params{}; @@ -139,7 +139,7 @@ NvResult nvhost_gpu::SetClientData(std::span input, std::vector& o return NvResult::Success; } -NvResult nvhost_gpu::GetClientData(std::span input, std::vector& output) { +NvResult nvhost_gpu::GetClientData(const std::vector& input, std::vector& output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlClientData params{}; @@ -149,7 +149,7 @@ NvResult nvhost_gpu::GetClientData(std::span input, std::vector& o return NvResult::Success; } -NvResult nvhost_gpu::ZCullBind(std::span input, std::vector& output) { +NvResult nvhost_gpu::ZCullBind(const std::vector& input, std::vector& output) { std::memcpy(&zcull_params, input.data(), input.size()); LOG_DEBUG(Service_NVDRV, "called, gpu_va={:X}, mode={:X}", zcull_params.gpu_va, zcull_params.mode); @@ -158,7 +158,7 @@ NvResult nvhost_gpu::ZCullBind(std::span input, std::vector& outpu return NvResult::Success; } -NvResult nvhost_gpu::SetErrorNotifier(std::span input, std::vector& output) { +NvResult nvhost_gpu::SetErrorNotifier(const std::vector& input, std::vector& output) { IoctlSetErrorNotifier params{}; std::memcpy(¶ms, input.data(), input.size()); LOG_WARNING(Service_NVDRV, "(STUBBED) called, offset={:X}, size={:X}, mem={:X}", params.offset, @@ -168,14 +168,14 @@ NvResult nvhost_gpu::SetErrorNotifier(std::span input, std::vector return NvResult::Success; } -NvResult nvhost_gpu::SetChannelPriority(std::span input, std::vector& output) { +NvResult nvhost_gpu::SetChannelPriority(const std::vector& input, std::vector& output) { std::memcpy(&channel_priority, input.data(), input.size()); LOG_DEBUG(Service_NVDRV, "(STUBBED) called, priority={:X}", channel_priority); return NvResult::Success; } -NvResult nvhost_gpu::AllocGPFIFOEx2(std::span input, std::vector& output) { +NvResult nvhost_gpu::AllocGPFIFOEx2(const std::vector& input, std::vector& output) { IoctlAllocGpfifoEx2 params{}; std::memcpy(¶ms, input.data(), input.size()); LOG_WARNING(Service_NVDRV, @@ -197,7 +197,7 @@ NvResult nvhost_gpu::AllocGPFIFOEx2(std::span input, std::vector& return NvResult::Success; } -NvResult nvhost_gpu::AllocateObjectContext(std::span input, std::vector& output) { +NvResult nvhost_gpu::AllocateObjectContext(const std::vector& input, std::vector& output) { IoctlAllocObjCtx params{}; std::memcpy(¶ms, input.data(), input.size()); LOG_WARNING(Service_NVDRV, "(STUBBED) called, class_num={:X}, flags={:X}", params.class_num, @@ -293,7 +293,7 @@ NvResult nvhost_gpu::SubmitGPFIFOImpl(IoctlSubmitGpfifo& params, std::vector return NvResult::Success; } -NvResult nvhost_gpu::SubmitGPFIFOBase(std::span input, std::vector& output, +NvResult nvhost_gpu::SubmitGPFIFOBase(const std::vector& input, std::vector& output, bool kickoff) { if (input.size() < sizeof(IoctlSubmitGpfifo)) { UNIMPLEMENTED(); @@ -314,7 +314,8 @@ NvResult nvhost_gpu::SubmitGPFIFOBase(std::span input, std::vector return SubmitGPFIFOImpl(params, output, std::move(entries)); } -NvResult nvhost_gpu::SubmitGPFIFOBase(std::span input, std::span input_inline, +NvResult nvhost_gpu::SubmitGPFIFOBase(const std::vector& input, + const std::vector& input_inline, std::vector& output) { if (input.size() < sizeof(IoctlSubmitGpfifo)) { UNIMPLEMENTED(); @@ -327,7 +328,7 @@ NvResult nvhost_gpu::SubmitGPFIFOBase(std::span input, std::span input, std::vector& output) { +NvResult nvhost_gpu::GetWaitbase(const std::vector& input, std::vector& output) { IoctlGetWaitbase params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlGetWaitbase)); LOG_INFO(Service_NVDRV, "called, unknown=0x{:X}", params.unknown); @@ -337,7 +338,7 @@ NvResult nvhost_gpu::GetWaitbase(std::span input, std::vector& out return NvResult::Success; } -NvResult nvhost_gpu::ChannelSetTimeout(std::span input, std::vector& output) { +NvResult nvhost_gpu::ChannelSetTimeout(const std::vector& input, std::vector& output) { IoctlChannelSetTimeout params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlChannelSetTimeout)); LOG_INFO(Service_NVDRV, "called, timeout=0x{:X}", params.timeout); @@ -345,7 +346,7 @@ NvResult nvhost_gpu::ChannelSetTimeout(std::span input, std::vector input, std::vector& output) { +NvResult nvhost_gpu::ChannelSetTimeslice(const std::vector& input, std::vector& output) { IoctlSetTimeslice params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlSetTimeslice)); LOG_INFO(Service_NVDRV, "called, timeslice=0x{:X}", params.timeslice); diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h index 3ca58202d..1e4ecd55b 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h @@ -40,12 +40,12 @@ public: NvCore::Container& core); ~nvhost_gpu() override; - NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, - std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, + std::vector& output, std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; @@ -186,23 +186,23 @@ private: u32_le channel_priority{}; u32_le channel_timeslice{}; - NvResult SetNVMAPfd(std::span input, std::vector& output); - NvResult SetClientData(std::span input, std::vector& output); - NvResult GetClientData(std::span input, std::vector& output); - NvResult ZCullBind(std::span input, std::vector& output); - NvResult SetErrorNotifier(std::span input, std::vector& output); - NvResult SetChannelPriority(std::span input, std::vector& output); - NvResult AllocGPFIFOEx2(std::span input, std::vector& output); - NvResult AllocateObjectContext(std::span input, std::vector& output); + NvResult SetNVMAPfd(const std::vector& input, std::vector& output); + NvResult SetClientData(const std::vector& input, std::vector& output); + NvResult GetClientData(const std::vector& input, std::vector& output); + NvResult ZCullBind(const std::vector& input, std::vector& output); + NvResult SetErrorNotifier(const std::vector& input, std::vector& output); + NvResult SetChannelPriority(const std::vector& input, std::vector& output); + NvResult AllocGPFIFOEx2(const std::vector& input, std::vector& output); + NvResult AllocateObjectContext(const std::vector& input, std::vector& output); NvResult SubmitGPFIFOImpl(IoctlSubmitGpfifo& params, std::vector& output, Tegra::CommandList&& entries); - NvResult SubmitGPFIFOBase(std::span input, std::vector& output, + NvResult SubmitGPFIFOBase(const std::vector& input, std::vector& output, bool kickoff = false); - NvResult SubmitGPFIFOBase(std::span input, std::span input_inline, + NvResult SubmitGPFIFOBase(const std::vector& input, const std::vector& input_inline, std::vector& output); - NvResult GetWaitbase(std::span input, std::vector& output); - NvResult ChannelSetTimeout(std::span input, std::vector& output); - NvResult ChannelSetTimeslice(std::span input, std::vector& output); + NvResult GetWaitbase(const std::vector& input, std::vector& output); + NvResult ChannelSetTimeout(const std::vector& input, std::vector& output); + NvResult ChannelSetTimeslice(const std::vector& input, std::vector& output); EventInterface& events_interface; NvCore::Container& core; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp index 0c7aee1b8..1703f9cc3 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp @@ -15,7 +15,7 @@ nvhost_nvdec::nvhost_nvdec(Core::System& system_, NvCore::Container& core_) : nvhost_nvdec_common{system_, core_, NvCore::ChannelType::NvDec} {} nvhost_nvdec::~nvhost_nvdec() = default; -NvResult nvhost_nvdec::Ioctl1(DeviceFD fd, Ioctl command, std::span input, +NvResult nvhost_nvdec::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) { switch (command.group) { case 0x0: @@ -55,13 +55,13 @@ NvResult nvhost_nvdec::Ioctl1(DeviceFD fd, Ioctl command, std::span in return NvResult::NotImplemented; } -NvResult nvhost_nvdec::Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) { +NvResult nvhost_nvdec::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvhost_nvdec::Ioctl3(DeviceFD fd, Ioctl command, std::span input, +NvResult nvhost_nvdec::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output, std::vector& inline_output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h index 0d615bbcb..c1b4e53e8 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h @@ -13,12 +13,12 @@ public: explicit nvhost_nvdec(Core::System& system_, NvCore::Container& core); ~nvhost_nvdec() override; - NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, - std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, + std::vector& output, std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp index 7bcef105b..99eede702 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp @@ -23,7 +23,7 @@ namespace { // Copies count amount of type T from the input vector into the dst vector. // Returns the number of bytes written into dst. template -std::size_t SliceVectors(std::span input, std::vector& dst, std::size_t count, +std::size_t SliceVectors(const std::vector& input, std::vector& dst, std::size_t count, std::size_t offset) { if (dst.empty()) { return 0; @@ -63,7 +63,7 @@ nvhost_nvdec_common::~nvhost_nvdec_common() { core.Host1xDeviceFile().syncpts_accumulated.push_back(channel_syncpoint); } -NvResult nvhost_nvdec_common::SetNVMAPfd(std::span input) { +NvResult nvhost_nvdec_common::SetNVMAPfd(const std::vector& input) { IoctlSetNvmapFD params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlSetNvmapFD)); LOG_DEBUG(Service_NVDRV, "called, fd={}", params.nvmap_fd); @@ -72,7 +72,7 @@ NvResult nvhost_nvdec_common::SetNVMAPfd(std::span input) { return NvResult::Success; } -NvResult nvhost_nvdec_common::Submit(DeviceFD fd, std::span input, +NvResult nvhost_nvdec_common::Submit(DeviceFD fd, const std::vector& input, std::vector& output) { IoctlSubmit params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlSubmit)); @@ -121,7 +121,7 @@ NvResult nvhost_nvdec_common::Submit(DeviceFD fd, std::span input, return NvResult::Success; } -NvResult nvhost_nvdec_common::GetSyncpoint(std::span input, std::vector& output) { +NvResult nvhost_nvdec_common::GetSyncpoint(const std::vector& input, std::vector& output) { IoctlGetSyncpoint params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlGetSyncpoint)); LOG_DEBUG(Service_NVDRV, "called GetSyncpoint, id={}", params.param); @@ -133,7 +133,7 @@ NvResult nvhost_nvdec_common::GetSyncpoint(std::span input, std::vecto return NvResult::Success; } -NvResult nvhost_nvdec_common::GetWaitbase(std::span input, std::vector& output) { +NvResult nvhost_nvdec_common::GetWaitbase(const std::vector& input, std::vector& output) { IoctlGetWaitbase params{}; LOG_CRITICAL(Service_NVDRV, "called WAITBASE"); std::memcpy(¶ms, input.data(), sizeof(IoctlGetWaitbase)); @@ -142,7 +142,7 @@ NvResult nvhost_nvdec_common::GetWaitbase(std::span input, std::vector return NvResult::Success; } -NvResult nvhost_nvdec_common::MapBuffer(std::span input, std::vector& output) { +NvResult nvhost_nvdec_common::MapBuffer(const std::vector& input, std::vector& output) { IoctlMapBuffer params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlMapBuffer)); std::vector cmd_buffer_handles(params.num_entries); @@ -159,7 +159,7 @@ NvResult nvhost_nvdec_common::MapBuffer(std::span input, std::vector input, std::vector& output) { +NvResult nvhost_nvdec_common::UnmapBuffer(const std::vector& input, std::vector& output) { IoctlMapBuffer params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlMapBuffer)); std::vector cmd_buffer_handles(params.num_entries); @@ -173,7 +173,8 @@ NvResult nvhost_nvdec_common::UnmapBuffer(std::span input, std::vector return NvResult::Success; } -NvResult nvhost_nvdec_common::SetSubmitTimeout(std::span input, std::vector& output) { +NvResult nvhost_nvdec_common::SetSubmitTimeout(const std::vector& input, + std::vector& output) { std::memcpy(&submit_timeout, input.data(), input.size()); LOG_WARNING(Service_NVDRV, "(STUBBED) called"); return NvResult::Success; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h index 5af26a26f..fe76100c8 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h @@ -107,13 +107,13 @@ protected: static_assert(sizeof(IoctlMapBuffer) == 0x0C, "IoctlMapBuffer is incorrect size"); /// Ioctl command implementations - NvResult SetNVMAPfd(std::span input); - NvResult Submit(DeviceFD fd, std::span input, std::vector& output); - NvResult GetSyncpoint(std::span input, std::vector& output); - NvResult GetWaitbase(std::span input, std::vector& output); - NvResult MapBuffer(std::span input, std::vector& output); - NvResult UnmapBuffer(std::span input, std::vector& output); - NvResult SetSubmitTimeout(std::span input, std::vector& output); + NvResult SetNVMAPfd(const std::vector& input); + NvResult Submit(DeviceFD fd, const std::vector& input, std::vector& output); + NvResult GetSyncpoint(const std::vector& input, std::vector& output); + NvResult GetWaitbase(const std::vector& input, std::vector& output); + NvResult MapBuffer(const std::vector& input, std::vector& output); + NvResult UnmapBuffer(const std::vector& input, std::vector& output); + NvResult SetSubmitTimeout(const std::vector& input, std::vector& output); Kernel::KEvent* QueryEvent(u32 event_id) override; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp index 39f30e7c8..bdbc2f9e1 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp @@ -12,7 +12,7 @@ namespace Service::Nvidia::Devices { nvhost_nvjpg::nvhost_nvjpg(Core::System& system_) : nvdevice{system_} {} nvhost_nvjpg::~nvhost_nvjpg() = default; -NvResult nvhost_nvjpg::Ioctl1(DeviceFD fd, Ioctl command, std::span input, +NvResult nvhost_nvjpg::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) { switch (command.group) { case 'H': @@ -31,13 +31,13 @@ NvResult nvhost_nvjpg::Ioctl1(DeviceFD fd, Ioctl command, std::span in return NvResult::NotImplemented; } -NvResult nvhost_nvjpg::Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) { +NvResult nvhost_nvjpg::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvhost_nvjpg::Ioctl3(DeviceFD fd, Ioctl command, std::span input, +NvResult nvhost_nvjpg::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output, std::vector& inline_output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; @@ -46,7 +46,7 @@ NvResult nvhost_nvjpg::Ioctl3(DeviceFD fd, Ioctl command, std::span in void nvhost_nvjpg::OnOpen(DeviceFD fd) {} void nvhost_nvjpg::OnClose(DeviceFD fd) {} -NvResult nvhost_nvjpg::SetNVMAPfd(std::span input, std::vector& output) { +NvResult nvhost_nvjpg::SetNVMAPfd(const std::vector& input, std::vector& output) { IoctlSetNvmapFD params{}; std::memcpy(¶ms, input.data(), input.size()); LOG_DEBUG(Service_NVDRV, "called, fd={}", params.nvmap_fd); diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h index 41b57e872..440e7d371 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h @@ -15,12 +15,12 @@ public: explicit nvhost_nvjpg(Core::System& system_); ~nvhost_nvjpg() override; - NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, - std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, + std::vector& output, std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; @@ -33,7 +33,7 @@ private: s32_le nvmap_fd{}; - NvResult SetNVMAPfd(std::span input, std::vector& output); + NvResult SetNVMAPfd(const std::vector& input, std::vector& output); }; } // namespace Service::Nvidia::Devices diff --git a/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp b/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp index b0ea402a7..73f97136e 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp @@ -15,7 +15,7 @@ nvhost_vic::nvhost_vic(Core::System& system_, NvCore::Container& core_) nvhost_vic::~nvhost_vic() = default; -NvResult nvhost_vic::Ioctl1(DeviceFD fd, Ioctl command, std::span input, +NvResult nvhost_vic::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) { switch (command.group) { case 0x0: @@ -55,13 +55,13 @@ NvResult nvhost_vic::Ioctl1(DeviceFD fd, Ioctl command, std::span inpu return NvResult::NotImplemented; } -NvResult nvhost_vic::Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) { +NvResult nvhost_vic::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvhost_vic::Ioctl3(DeviceFD fd, Ioctl command, std::span input, +NvResult nvhost_vic::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output, std::vector& inline_output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_vic.h b/src/core/hle/service/nvdrv/devices/nvhost_vic.h index b5e350a83..f164caafb 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_vic.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_vic.h @@ -12,12 +12,12 @@ public: explicit nvhost_vic(Core::System& system_, NvCore::Container& core); ~nvhost_vic(); - NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, - std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, + std::vector& output, std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; diff --git a/src/core/hle/service/nvdrv/devices/nvmap.cpp b/src/core/hle/service/nvdrv/devices/nvmap.cpp index 29c1e0f01..fa29db758 100644 --- a/src/core/hle/service/nvdrv/devices/nvmap.cpp +++ b/src/core/hle/service/nvdrv/devices/nvmap.cpp @@ -25,7 +25,7 @@ nvmap::nvmap(Core::System& system_, NvCore::Container& container_) nvmap::~nvmap() = default; -NvResult nvmap::Ioctl1(DeviceFD fd, Ioctl command, std::span input, +NvResult nvmap::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) { switch (command.group) { case 0x1: @@ -54,13 +54,13 @@ NvResult nvmap::Ioctl1(DeviceFD fd, Ioctl command, std::span input, return NvResult::NotImplemented; } -NvResult nvmap::Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) { +NvResult nvmap::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvmap::Ioctl3(DeviceFD fd, Ioctl command, std::span input, +NvResult nvmap::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output, std::vector& inline_output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; @@ -69,7 +69,7 @@ NvResult nvmap::Ioctl3(DeviceFD fd, Ioctl command, std::span input, void nvmap::OnOpen(DeviceFD fd) {} void nvmap::OnClose(DeviceFD fd) {} -NvResult nvmap::IocCreate(std::span input, std::vector& output) { +NvResult nvmap::IocCreate(const std::vector& input, std::vector& output) { IocCreateParams params; std::memcpy(¶ms, input.data(), sizeof(params)); LOG_DEBUG(Service_NVDRV, "called, size=0x{:08X}", params.size); @@ -89,7 +89,7 @@ NvResult nvmap::IocCreate(std::span input, std::vector& output) { return NvResult::Success; } -NvResult nvmap::IocAlloc(std::span input, std::vector& output) { +NvResult nvmap::IocAlloc(const std::vector& input, std::vector& output) { IocAllocParams params; std::memcpy(¶ms, input.data(), sizeof(params)); LOG_DEBUG(Service_NVDRV, "called, addr={:X}", params.address); @@ -137,7 +137,7 @@ NvResult nvmap::IocAlloc(std::span input, std::vector& output) { return result; } -NvResult nvmap::IocGetId(std::span input, std::vector& output) { +NvResult nvmap::IocGetId(const std::vector& input, std::vector& output) { IocGetIdParams params; std::memcpy(¶ms, input.data(), sizeof(params)); @@ -161,7 +161,7 @@ NvResult nvmap::IocGetId(std::span input, std::vector& output) { return NvResult::Success; } -NvResult nvmap::IocFromId(std::span input, std::vector& output) { +NvResult nvmap::IocFromId(const std::vector& input, std::vector& output) { IocFromIdParams params; std::memcpy(¶ms, input.data(), sizeof(params)); @@ -192,7 +192,7 @@ NvResult nvmap::IocFromId(std::span input, std::vector& output) { return NvResult::Success; } -NvResult nvmap::IocParam(std::span input, std::vector& output) { +NvResult nvmap::IocParam(const std::vector& input, std::vector& output) { enum class ParamTypes { Size = 1, Alignment = 2, Base = 3, Heap = 4, Kind = 5, Compr = 6 }; IocParamParams params; @@ -241,7 +241,7 @@ NvResult nvmap::IocParam(std::span input, std::vector& output) { return NvResult::Success; } -NvResult nvmap::IocFree(std::span input, std::vector& output) { +NvResult nvmap::IocFree(const std::vector& input, std::vector& output) { IocFreeParams params; std::memcpy(¶ms, input.data(), sizeof(params)); diff --git a/src/core/hle/service/nvdrv/devices/nvmap.h b/src/core/hle/service/nvdrv/devices/nvmap.h index 82bd3b118..e9bfd0358 100644 --- a/src/core/hle/service/nvdrv/devices/nvmap.h +++ b/src/core/hle/service/nvdrv/devices/nvmap.h @@ -26,12 +26,12 @@ public: nvmap(const nvmap&) = delete; nvmap& operator=(const nvmap&) = delete; - NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, - std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, + std::vector& output, std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; @@ -106,12 +106,12 @@ private: }; static_assert(sizeof(IocGetIdParams) == 8, "IocGetIdParams has wrong size"); - NvResult IocCreate(std::span input, std::vector& output); - NvResult IocAlloc(std::span input, std::vector& output); - NvResult IocGetId(std::span input, std::vector& output); - NvResult IocFromId(std::span input, std::vector& output); - NvResult IocParam(std::span input, std::vector& output); - NvResult IocFree(std::span input, std::vector& output); + NvResult IocCreate(const std::vector& input, std::vector& output); + NvResult IocAlloc(const std::vector& input, std::vector& output); + NvResult IocGetId(const std::vector& input, std::vector& output); + NvResult IocFromId(const std::vector& input, std::vector& output); + NvResult IocParam(const std::vector& input, std::vector& output); + NvResult IocFree(const std::vector& input, std::vector& output); NvCore::Container& container; NvCore::NvMap& file; diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index 52d27e755..6fc8565c0 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -124,7 +124,7 @@ DeviceFD Module::Open(const std::string& device_name) { return fd; } -NvResult Module::Ioctl1(DeviceFD fd, Ioctl command, std::span input, +NvResult Module::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output) { if (fd < 0) { LOG_ERROR(Service_NVDRV, "Invalid DeviceFD={}!", fd); @@ -141,8 +141,8 @@ NvResult Module::Ioctl1(DeviceFD fd, Ioctl command, std::span input, return itr->second->Ioctl1(fd, command, input, output); } -NvResult Module::Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output) { +NvResult Module::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output) { if (fd < 0) { LOG_ERROR(Service_NVDRV, "Invalid DeviceFD={}!", fd); return NvResult::InvalidState; @@ -158,7 +158,7 @@ NvResult Module::Ioctl2(DeviceFD fd, Ioctl command, std::span input, return itr->second->Ioctl2(fd, command, input, inline_input, output); } -NvResult Module::Ioctl3(DeviceFD fd, Ioctl command, std::span input, +NvResult Module::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, std::vector& output, std::vector& inline_output) { if (fd < 0) { LOG_ERROR(Service_NVDRV, "Invalid DeviceFD={}!", fd); diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.h index b09b6e585..f3c81bd88 100644 --- a/src/core/hle/service/nvdrv/nvdrv.h +++ b/src/core/hle/service/nvdrv/nvdrv.h @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include @@ -80,13 +79,14 @@ public: DeviceFD Open(const std::string& device_name); /// Sends an ioctl command to the specified file descriptor. - NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output); + NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, + std::vector& output); - NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, - std::span inline_input, std::vector& output); + NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, + const std::vector& inline_input, std::vector& output); - NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, - std::vector& inline_output); + NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, + std::vector& output, std::vector& inline_output); /// Closes a device file descriptor and returns operation success. NvResult Close(DeviceFD fd); diff --git a/src/core/hle/service/nvflinger/buffer_queue_producer.cpp b/src/core/hle/service/nvflinger/buffer_queue_producer.cpp index bcbe05b0d..e601b5da1 100644 --- a/src/core/hle/service/nvflinger/buffer_queue_producer.cpp +++ b/src/core/hle/service/nvflinger/buffer_queue_producer.cpp @@ -815,8 +815,8 @@ Status BufferQueueProducer::SetPreallocatedBuffer(s32 slot, void BufferQueueProducer::Transact(Kernel::HLERequestContext& ctx, TransactionId code, u32 flags) { Status status{Status::NoError}; - InputParcel parcel_in{ctx.ReadBuffer()}; - OutputParcel parcel_out{}; + Parcel parcel_in{ctx.ReadBuffer()}; + Parcel parcel_out{}; switch (code) { case TransactionId::Connect: { diff --git a/src/core/hle/service/nvflinger/graphic_buffer_producer.cpp b/src/core/hle/service/nvflinger/graphic_buffer_producer.cpp index 769e8c0a3..4043c91f1 100644 --- a/src/core/hle/service/nvflinger/graphic_buffer_producer.cpp +++ b/src/core/hle/service/nvflinger/graphic_buffer_producer.cpp @@ -9,7 +9,7 @@ namespace Service::android { -QueueBufferInput::QueueBufferInput(InputParcel& parcel) { +QueueBufferInput::QueueBufferInput(Parcel& parcel) { parcel.ReadFlattened(*this); } diff --git a/src/core/hle/service/nvflinger/graphic_buffer_producer.h b/src/core/hle/service/nvflinger/graphic_buffer_producer.h index 2969f0fd5..6ea327bbe 100644 --- a/src/core/hle/service/nvflinger/graphic_buffer_producer.h +++ b/src/core/hle/service/nvflinger/graphic_buffer_producer.h @@ -14,11 +14,11 @@ namespace Service::android { -class InputParcel; +class Parcel; #pragma pack(push, 1) struct QueueBufferInput final { - explicit QueueBufferInput(InputParcel& parcel); + explicit QueueBufferInput(Parcel& parcel); void Deflate(s64* timestamp_, bool* is_auto_timestamp_, Common::Rectangle* crop_, NativeWindowScalingMode* scaling_mode_, NativeWindowTransform* transform_, diff --git a/src/core/hle/service/nvflinger/parcel.h b/src/core/hle/service/nvflinger/parcel.h index d1b6201e0..f3fa2587d 100644 --- a/src/core/hle/service/nvflinger/parcel.h +++ b/src/core/hle/service/nvflinger/parcel.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include #include "common/alignment.h" @@ -13,17 +12,18 @@ namespace Service::android { -struct ParcelHeader { - u32 data_size; - u32 data_offset; - u32 objects_size; - u32 objects_offset; -}; -static_assert(sizeof(ParcelHeader) == 16, "ParcelHeader has wrong size"); - -class InputParcel final { +class Parcel final { public: - explicit InputParcel(std::span in_data) : read_buffer(std::move(in_data)) { + static constexpr std::size_t DefaultBufferSize = 0x40; + + Parcel() : buffer(DefaultBufferSize) {} + + template + explicit Parcel(const T& out_data) : buffer(DefaultBufferSize) { + Write(out_data); + } + + explicit Parcel(std::vector in_data) : buffer(std::move(in_data)) { DeserializeHeader(); [[maybe_unused]] const std::u16string token = ReadInterfaceToken(); } @@ -31,9 +31,9 @@ public: template void Read(T& val) { static_assert(std::is_trivially_copyable_v, "T must be trivially copyable."); - ASSERT(read_index + sizeof(T) <= read_buffer.size()); + ASSERT(read_index + sizeof(T) <= buffer.size()); - std::memcpy(&val, read_buffer.data() + read_index, sizeof(T)); + std::memcpy(&val, buffer.data() + read_index, sizeof(T)); read_index += sizeof(T); read_index = Common::AlignUp(read_index, 4); } @@ -62,10 +62,10 @@ public: template T ReadUnaligned() { static_assert(std::is_trivially_copyable_v, "T must be trivially copyable."); - ASSERT(read_index + sizeof(T) <= read_buffer.size()); + ASSERT(read_index + sizeof(T) <= buffer.size()); T val; - std::memcpy(&val, read_buffer.data() + read_index, sizeof(T)); + std::memcpy(&val, buffer.data() + read_index, sizeof(T)); read_index += sizeof(T); return val; } @@ -101,31 +101,6 @@ public: return token; } - void DeserializeHeader() { - ASSERT(read_buffer.size() > sizeof(ParcelHeader)); - - ParcelHeader header{}; - std::memcpy(&header, read_buffer.data(), sizeof(ParcelHeader)); - - read_index = header.data_offset; - } - -private: - std::span read_buffer; - std::size_t read_index = 0; -}; - -class OutputParcel final { -public: - static constexpr std::size_t DefaultBufferSize = 0x40; - - OutputParcel() : buffer(DefaultBufferSize) {} - - template - explicit OutputParcel(const T& out_data) : buffer(DefaultBufferSize) { - Write(out_data); - } - template void Write(const T& val) { static_assert(std::is_trivially_copyable_v, "T must be trivially copyable."); @@ -158,20 +133,40 @@ public: WriteObject(ptr.get()); } + void DeserializeHeader() { + ASSERT(buffer.size() > sizeof(Header)); + + Header header{}; + std::memcpy(&header, buffer.data(), sizeof(Header)); + + read_index = header.data_offset; + } + std::vector Serialize() const { - ParcelHeader header{}; - header.data_size = static_cast(write_index - sizeof(ParcelHeader)); - header.data_offset = sizeof(ParcelHeader); + ASSERT(read_index == 0); + + Header header{}; + header.data_size = static_cast(write_index - sizeof(Header)); + header.data_offset = sizeof(Header); header.objects_size = 4; - header.objects_offset = static_cast(sizeof(ParcelHeader) + header.data_size); - std::memcpy(buffer.data(), &header, sizeof(ParcelHeader)); + header.objects_offset = static_cast(sizeof(Header) + header.data_size); + std::memcpy(buffer.data(), &header, sizeof(Header)); return buffer; } private: + struct Header { + u32 data_size; + u32 data_offset; + u32 objects_size; + u32 objects_offset; + }; + static_assert(sizeof(Header) == 16, "ParcelHeader has wrong size"); + mutable std::vector buffer; - std::size_t write_index = sizeof(ParcelHeader); + std::size_t read_index = 0; + std::size_t write_index = sizeof(Header); }; } // namespace Service::android diff --git a/src/core/hle/service/prepo/prepo.cpp b/src/core/hle/service/prepo/prepo.cpp index 01040b32a..78f897d3e 100644 --- a/src/core/hle/service/prepo/prepo.cpp +++ b/src/core/hle/service/prepo/prepo.cpp @@ -63,7 +63,7 @@ private: return ctx.ReadBuffer(1); } - return std::span{}; + return std::vector{}; }(); LOG_DEBUG(Service_PREPO, @@ -90,7 +90,7 @@ private: return ctx.ReadBuffer(1); } - return std::span{}; + return std::vector{}; }(); LOG_DEBUG(Service_PREPO, @@ -142,7 +142,7 @@ private: return ctx.ReadBuffer(1); } - return std::span{}; + return std::vector{}; }(); LOG_DEBUG(Service_PREPO, "called, title_id={:016X}, data1_size={:016X}, data2_size={:016X}", @@ -166,7 +166,7 @@ private: return ctx.ReadBuffer(1); } - return std::span{}; + return std::vector{}; }(); LOG_DEBUG(Service_PREPO, diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp index bdb499268..9e94a462f 100644 --- a/src/core/hle/service/sockets/bsd.cpp +++ b/src/core/hle/service/sockets/bsd.cpp @@ -208,6 +208,7 @@ void BSD::Bind(Kernel::HLERequestContext& ctx) { const s32 fd = rp.Pop(); LOG_DEBUG(Service, "called. fd={} addrlen={}", fd, ctx.GetReadBufferSize()); + BuildErrnoResponse(ctx, BindImpl(fd, ctx.ReadBuffer())); } @@ -311,7 +312,7 @@ void BSD::SetSockOpt(Kernel::HLERequestContext& ctx) { const u32 level = rp.Pop(); const OptName optname = static_cast(rp.Pop()); - const auto buffer = ctx.ReadBuffer(); + const std::vector buffer = ctx.ReadBuffer(); const u8* optval = buffer.empty() ? nullptr : buffer.data(); size_t optlen = buffer.size(); @@ -488,7 +489,7 @@ std::pair BSD::SocketImpl(Domain domain, Type type, Protocol protoco return {fd, Errno::SUCCESS}; } -std::pair BSD::PollImpl(std::vector& write_buffer, std::span read_buffer, +std::pair BSD::PollImpl(std::vector& write_buffer, std::vector read_buffer, s32 nfds, s32 timeout) { if (write_buffer.size() < nfds * sizeof(PollFD)) { return {-1, Errno::INVAL}; @@ -583,7 +584,7 @@ std::pair BSD::AcceptImpl(s32 fd, std::vector& write_buffer) { return {new_fd, Errno::SUCCESS}; } -Errno BSD::BindImpl(s32 fd, std::span addr) { +Errno BSD::BindImpl(s32 fd, const std::vector& addr) { if (!IsFileDescriptorValid(fd)) { return Errno::BADF; } @@ -594,7 +595,7 @@ Errno BSD::BindImpl(s32 fd, std::span addr) { return Translate(file_descriptors[fd]->socket->Bind(Translate(addr_in))); } -Errno BSD::ConnectImpl(s32 fd, std::span addr) { +Errno BSD::ConnectImpl(s32 fd, const std::vector& addr) { if (!IsFileDescriptorValid(fd)) { return Errno::BADF; } @@ -799,15 +800,15 @@ std::pair BSD::RecvFromImpl(s32 fd, u32 flags, std::vector& mess return {ret, bsd_errno}; } -std::pair BSD::SendImpl(s32 fd, u32 flags, std::span message) { +std::pair BSD::SendImpl(s32 fd, u32 flags, const std::vector& message) { if (!IsFileDescriptorValid(fd)) { return {-1, Errno::BADF}; } return Translate(file_descriptors[fd]->socket->Send(message, flags)); } -std::pair BSD::SendToImpl(s32 fd, u32 flags, std::span message, - std::span addr) { +std::pair BSD::SendToImpl(s32 fd, u32 flags, const std::vector& message, + const std::vector& addr) { if (!IsFileDescriptorValid(fd)) { return {-1, Errno::BADF}; } diff --git a/src/core/hle/service/sockets/bsd.h b/src/core/hle/service/sockets/bsd.h index 56bb3f8b1..81e855e0f 100644 --- a/src/core/hle/service/sockets/bsd.h +++ b/src/core/hle/service/sockets/bsd.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include #include "common/common_types.h" @@ -45,7 +44,7 @@ private: s32 nfds; s32 timeout; - std::span read_buffer; + std::vector read_buffer; std::vector write_buffer; s32 ret{}; Errno bsd_errno{}; @@ -66,7 +65,7 @@ private: void Response(Kernel::HLERequestContext& ctx); s32 fd; - std::span addr; + std::vector addr; Errno bsd_errno{}; }; @@ -99,7 +98,7 @@ private: s32 fd; u32 flags; - std::span message; + std::vector message; s32 ret{}; Errno bsd_errno{}; }; @@ -110,8 +109,8 @@ private: s32 fd; u32 flags; - std::span message; - std::span addr; + std::vector message; + std::vector addr; s32 ret{}; Errno bsd_errno{}; }; @@ -144,11 +143,11 @@ private: void ExecuteWork(Kernel::HLERequestContext& ctx, Work work); std::pair SocketImpl(Domain domain, Type type, Protocol protocol); - std::pair PollImpl(std::vector& write_buffer, std::span read_buffer, + std::pair PollImpl(std::vector& write_buffer, std::vector read_buffer, s32 nfds, s32 timeout); std::pair AcceptImpl(s32 fd, std::vector& write_buffer); - Errno BindImpl(s32 fd, std::span addr); - Errno ConnectImpl(s32 fd, std::span addr); + Errno BindImpl(s32 fd, const std::vector& addr); + Errno ConnectImpl(s32 fd, const std::vector& addr); Errno GetPeerNameImpl(s32 fd, std::vector& write_buffer); Errno GetSockNameImpl(s32 fd, std::vector& write_buffer); Errno ListenImpl(s32 fd, s32 backlog); @@ -158,9 +157,9 @@ private: std::pair RecvImpl(s32 fd, u32 flags, std::vector& message); std::pair RecvFromImpl(s32 fd, u32 flags, std::vector& message, std::vector& addr); - std::pair SendImpl(s32 fd, u32 flags, std::span message); - std::pair SendToImpl(s32 fd, u32 flags, std::span message, - std::span addr); + std::pair SendImpl(s32 fd, u32 flags, const std::vector& message); + std::pair SendToImpl(s32 fd, u32 flags, const std::vector& message, + const std::vector& addr); Errno CloseImpl(s32 fd); s32 FindFreeFileDescriptorHandle() noexcept; diff --git a/src/core/hle/service/sockets/sfdnsres.cpp b/src/core/hle/service/sockets/sfdnsres.cpp index e96eda7f3..097c37d7a 100644 --- a/src/core/hle/service/sockets/sfdnsres.cpp +++ b/src/core/hle/service/sockets/sfdnsres.cpp @@ -243,4 +243,4 @@ void SFDNSRES::GetAddrInfoRequestWithOptions(Kernel::HLERequestContext& ctx) { rb.Push(0); } -} // namespace Service::Sockets +} // namespace Service::Sockets \ No newline at end of file diff --git a/src/core/hle/service/ssl/ssl.cpp b/src/core/hle/service/ssl/ssl.cpp index dcf47083f..3735e0452 100644 --- a/src/core/hle/service/ssl/ssl.cpp +++ b/src/core/hle/service/ssl/ssl.cpp @@ -101,7 +101,7 @@ private: void ImportServerPki(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto certificate_format = rp.PopEnum(); - [[maybe_unused]] const auto pkcs_12_certificates = ctx.ReadBuffer(0); + const auto pkcs_12_certificates = ctx.ReadBuffer(0); constexpr u64 server_id = 0; @@ -113,13 +113,13 @@ private: } void ImportClientPki(Kernel::HLERequestContext& ctx) { - [[maybe_unused]] const auto pkcs_12_certificate = ctx.ReadBuffer(0); - [[maybe_unused]] const auto ascii_password = [&ctx] { + const auto pkcs_12_certificate = ctx.ReadBuffer(0); + const auto ascii_password = [&ctx] { if (ctx.CanReadBuffer(1)) { return ctx.ReadBuffer(1); } - return std::span{}; + return std::vector{}; }(); constexpr u64 client_id = 0; diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index 2fb631183..bb283e74e 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -603,7 +603,7 @@ private: return; } - const auto parcel = android::OutputParcel{NativeWindow{*buffer_queue_id}}; + const auto parcel = android::Parcel{NativeWindow{*buffer_queue_id}}; const auto buffer_size = ctx.WriteBuffer(parcel.Serialize()); IPC::ResponseBuilder rb{ctx, 4}; @@ -649,7 +649,7 @@ private: return; } - const auto parcel = android::OutputParcel{NativeWindow{*buffer_queue_id}}; + const auto parcel = android::Parcel{NativeWindow{*buffer_queue_id}}; const auto buffer_size = ctx.WriteBuffer(parcel.Serialize()); IPC::ResponseBuilder rb{ctx, 6}; diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index 7494fb62d..282ea1ff9 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -550,7 +550,7 @@ std::pair Socket::RecvFrom(int flags, std::vector& message, Sock return {-1, GetAndLogLastError()}; } -std::pair Socket::Send(std::span message, int flags) { +std::pair Socket::Send(const std::vector& message, int flags) { ASSERT(message.size() < static_cast(std::numeric_limits::max())); ASSERT(flags == 0); @@ -563,7 +563,7 @@ std::pair Socket::Send(std::span message, int flags) { return {-1, GetAndLogLastError()}; } -std::pair Socket::SendTo(u32 flags, std::span message, +std::pair Socket::SendTo(u32 flags, const std::vector& message, const SockAddrIn* addr) { ASSERT(flags == 0); diff --git a/src/core/internal_network/socket_proxy.cpp b/src/core/internal_network/socket_proxy.cpp index 7a77171c2..1e1c42cea 100644 --- a/src/core/internal_network/socket_proxy.cpp +++ b/src/core/internal_network/socket_proxy.cpp @@ -182,7 +182,7 @@ std::pair ProxySocket::ReceivePacket(int flags, std::vector& mes return {static_cast(read_bytes), Errno::SUCCESS}; } -std::pair ProxySocket::Send(std::span message, int flags) { +std::pair ProxySocket::Send(const std::vector& message, int flags) { LOG_WARNING(Network, "(STUBBED) called"); ASSERT(message.size() < static_cast(std::numeric_limits::max())); ASSERT(flags == 0); @@ -200,7 +200,7 @@ void ProxySocket::SendPacket(ProxyPacket& packet) { } } -std::pair ProxySocket::SendTo(u32 flags, std::span message, +std::pair ProxySocket::SendTo(u32 flags, const std::vector& message, const SockAddrIn* addr) { ASSERT(flags == 0); diff --git a/src/core/internal_network/socket_proxy.h b/src/core/internal_network/socket_proxy.h index 9421492bc..f12b5f567 100644 --- a/src/core/internal_network/socket_proxy.h +++ b/src/core/internal_network/socket_proxy.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include #include @@ -49,11 +48,11 @@ public: std::pair ReceivePacket(int flags, std::vector& message, SockAddrIn* addr, std::size_t max_length); - std::pair Send(std::span message, int flags) override; + std::pair Send(const std::vector& message, int flags) override; void SendPacket(ProxyPacket& packet); - std::pair SendTo(u32 flags, std::span message, + std::pair SendTo(u32 flags, const std::vector& message, const SockAddrIn* addr) override; Errno SetLinger(bool enable, u32 linger) override; diff --git a/src/core/internal_network/sockets.h b/src/core/internal_network/sockets.h index 4c7489258..2e328c645 100644 --- a/src/core/internal_network/sockets.h +++ b/src/core/internal_network/sockets.h @@ -5,7 +5,6 @@ #include #include -#include #include #if defined(_WIN32) @@ -67,9 +66,9 @@ public: virtual std::pair RecvFrom(int flags, std::vector& message, SockAddrIn* addr) = 0; - virtual std::pair Send(std::span message, int flags) = 0; + virtual std::pair Send(const std::vector& message, int flags) = 0; - virtual std::pair SendTo(u32 flags, std::span message, + virtual std::pair SendTo(u32 flags, const std::vector& message, const SockAddrIn* addr) = 0; virtual Errno SetLinger(bool enable, u32 linger) = 0; @@ -139,9 +138,9 @@ public: std::pair RecvFrom(int flags, std::vector& message, SockAddrIn* addr) override; - std::pair Send(std::span message, int flags) override; + std::pair Send(const std::vector& message, int flags) override; - std::pair SendTo(u32 flags, std::span message, + std::pair SendTo(u32 flags, const std::vector& message, const SockAddrIn* addr) override; Errno SetLinger(bool enable, u32 linger) override; diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp index 59dfb8767..77821e047 100644 --- a/src/core/reporter.cpp +++ b/src/core/reporter.cpp @@ -312,7 +312,7 @@ void Reporter::SaveUnimplementedAppletReport( } void Reporter::SavePlayReport(PlayReportType type, u64 title_id, - const std::vector>& data, + const std::vector>& data, std::optional process_id, std::optional user_id) const { if (!IsReportingEnabled()) { return; diff --git a/src/core/reporter.h b/src/core/reporter.h index bb11f8e7c..9fdb9d6c1 100644 --- a/src/core/reporter.h +++ b/src/core/reporter.h @@ -5,7 +5,6 @@ #include #include -#include #include #include #include "common/common_types.h" @@ -57,8 +56,7 @@ public: System, }; - void SavePlayReport(PlayReportType type, u64 title_id, - const std::vector>& data, + void SavePlayReport(PlayReportType type, u64 title_id, const std::vector>& data, std::optional process_id = {}, std::optional user_id = {}) const; // Used by error applet From 54ab154696857a7bca93cce151d902f70e7be832 Mon Sep 17 00:00:00 2001 From: Luke Sawczak Date: Wed, 1 Feb 2023 20:10:54 -0500 Subject: [PATCH 0019/1181] added 'Hide empty rooms' toggle to lobby fixed typo fixed typo fixed typo clang --- src/yuzu/multiplayer/lobby.cpp | 16 ++++++++++++++++ src/yuzu/multiplayer/lobby.h | 2 ++ src/yuzu/multiplayer/lobby.ui | 7 +++++++ 3 files changed, 25 insertions(+) diff --git a/src/yuzu/multiplayer/lobby.cpp b/src/yuzu/multiplayer/lobby.cpp index 08c275696..6c93e3511 100644 --- a/src/yuzu/multiplayer/lobby.cpp +++ b/src/yuzu/multiplayer/lobby.cpp @@ -77,6 +77,7 @@ Lobby::Lobby(QWidget* parent, QStandardItemModel* list, // UI Buttons connect(ui->refresh_list, &QPushButton::clicked, this, &Lobby::RefreshLobby); connect(ui->games_owned, &QCheckBox::toggled, proxy, &LobbyFilterProxyModel::SetFilterOwned); + connect(ui->hide_empty, &QCheckBox::toggled, proxy, &LobbyFilterProxyModel::SetFilterEmpty); connect(ui->hide_full, &QCheckBox::toggled, proxy, &LobbyFilterProxyModel::SetFilterFull); connect(ui->search, &QLineEdit::textChanged, proxy, &LobbyFilterProxyModel::SetFilterSearch); connect(ui->room_list, &QTreeView::doubleClicked, this, &Lobby::OnJoinRoom); @@ -329,6 +330,16 @@ bool LobbyFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex& s return true; } + // filter by empty rooms + if (filter_empty) { + QModelIndex member_list = sourceModel()->index(sourceRow, Column::MEMBER, sourceParent); + int player_count = + sourceModel()->data(member_list, LobbyItemMemberList::MemberListRole).toList().size(); + if (player_count == 0) { + return false; + } + } + // filter by filled rooms if (filter_full) { QModelIndex member_list = sourceModel()->index(sourceRow, Column::MEMBER, sourceParent); @@ -399,6 +410,11 @@ void LobbyFilterProxyModel::SetFilterOwned(bool filter) { invalidate(); } +void LobbyFilterProxyModel::SetFilterEmpty(bool filter) { + filter_empty = filter; + invalidate(); +} + void LobbyFilterProxyModel::SetFilterFull(bool filter) { filter_full = filter; invalidate(); diff --git a/src/yuzu/multiplayer/lobby.h b/src/yuzu/multiplayer/lobby.h index 300dad13e..2674ae7c3 100644 --- a/src/yuzu/multiplayer/lobby.h +++ b/src/yuzu/multiplayer/lobby.h @@ -130,12 +130,14 @@ public: public slots: void SetFilterOwned(bool); + void SetFilterEmpty(bool); void SetFilterFull(bool); void SetFilterSearch(const QString&); private: QStandardItemModel* game_list; bool filter_owned = false; + bool filter_empty = false; bool filter_full = false; QString filter_search; }; diff --git a/src/yuzu/multiplayer/lobby.ui b/src/yuzu/multiplayer/lobby.ui index 4c9901c9a..0ef0ef762 100644 --- a/src/yuzu/multiplayer/lobby.ui +++ b/src/yuzu/multiplayer/lobby.ui @@ -77,6 +77,13 @@ + + + + Hide Empty Rooms + + + From 2d2522693e7d453bf10a8246f704350b69e12ebc Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Fri, 3 Feb 2023 00:08:45 -0500 Subject: [PATCH 0020/1181] Revert "Merge pull request #9718 from yuzu-emu/revert-9508-hle-ipc-buffer-span" This reverts commit 25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd, reversing changes made to af20e25081f97d55b451606c87922e2b49f0d363. --- src/common/string_util.cpp | 2 +- src/common/string_util.h | 3 +- src/core/hle/kernel/hle_ipc.cpp | 30 ++++++- src/core/hle/kernel/hle_ipc.h | 8 +- src/core/hle/service/am/am.cpp | 2 +- src/core/hle/service/audio/audren_u.cpp | 2 +- src/core/hle/service/audio/hwopus.cpp | 2 +- src/core/hle/service/es/es.cpp | 2 +- src/core/hle/service/filesystem/fsp_srv.cpp | 9 +- src/core/hle/service/glue/arp.cpp | 3 +- src/core/hle/service/hid/controllers/npad.cpp | 5 +- src/core/hle/service/hid/controllers/npad.h | 3 +- src/core/hle/service/hid/hid.cpp | 4 +- src/core/hle/service/hid/hidbus/hidbus_base.h | 3 +- src/core/hle/service/hid/hidbus/ringcon.cpp | 2 +- src/core/hle/service/hid/hidbus/ringcon.h | 3 +- src/core/hle/service/hid/hidbus/starlink.cpp | 2 +- src/core/hle/service/hid/hidbus/starlink.h | 2 +- src/core/hle/service/hid/hidbus/stubbed.cpp | 2 +- src/core/hle/service/hid/hidbus/stubbed.h | 2 +- src/core/hle/service/jit/jit.cpp | 4 +- src/core/hle/service/ldn/ldn.cpp | 4 +- src/core/hle/service/nvdrv/devices/nvdevice.h | 10 ++- .../service/nvdrv/devices/nvdisp_disp0.cpp | 8 +- .../hle/service/nvdrv/devices/nvdisp_disp0.h | 10 +-- .../service/nvdrv/devices/nvhost_as_gpu.cpp | 26 +++--- .../hle/service/nvdrv/devices/nvhost_as_gpu.h | 28 +++--- .../hle/service/nvdrv/devices/nvhost_ctrl.cpp | 21 +++-- .../hle/service/nvdrv/devices/nvhost_ctrl.h | 22 ++--- .../service/nvdrv/devices/nvhost_ctrl_gpu.cpp | 31 ++++--- .../service/nvdrv/devices/nvhost_ctrl_gpu.h | 32 +++---- .../hle/service/nvdrv/devices/nvhost_gpu.cpp | 35 ++++---- .../hle/service/nvdrv/devices/nvhost_gpu.h | 36 ++++---- .../service/nvdrv/devices/nvhost_nvdec.cpp | 8 +- .../hle/service/nvdrv/devices/nvhost_nvdec.h | 10 +-- .../nvdrv/devices/nvhost_nvdec_common.cpp | 17 ++-- .../nvdrv/devices/nvhost_nvdec_common.h | 14 +-- .../service/nvdrv/devices/nvhost_nvjpg.cpp | 10 +-- .../hle/service/nvdrv/devices/nvhost_nvjpg.h | 12 +-- .../hle/service/nvdrv/devices/nvhost_vic.cpp | 8 +- .../hle/service/nvdrv/devices/nvhost_vic.h | 10 +-- src/core/hle/service/nvdrv/devices/nvmap.cpp | 20 ++--- src/core/hle/service/nvdrv/devices/nvmap.h | 22 ++--- src/core/hle/service/nvdrv/nvdrv.cpp | 8 +- src/core/hle/service/nvdrv/nvdrv.h | 12 +-- .../nvflinger/buffer_queue_producer.cpp | 4 +- .../nvflinger/graphic_buffer_producer.cpp | 2 +- .../nvflinger/graphic_buffer_producer.h | 4 +- src/core/hle/service/nvflinger/parcel.h | 87 ++++++++++--------- src/core/hle/service/prepo/prepo.cpp | 8 +- src/core/hle/service/sockets/bsd.cpp | 15 ++-- src/core/hle/service/sockets/bsd.h | 23 ++--- src/core/hle/service/sockets/sfdnsres.cpp | 2 +- src/core/hle/service/ssl/ssl.cpp | 8 +- src/core/hle/service/vi/vi.cpp | 4 +- src/core/internal_network/network.cpp | 4 +- src/core/internal_network/socket_proxy.cpp | 4 +- src/core/internal_network/socket_proxy.h | 5 +- src/core/internal_network/sockets.h | 9 +- src/core/reporter.cpp | 2 +- src/core/reporter.h | 4 +- 61 files changed, 368 insertions(+), 326 deletions(-) diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index b26db4796..e0b6180c5 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -30,7 +30,7 @@ std::string ToUpper(std::string str) { return str; } -std::string StringFromBuffer(const std::vector& data) { +std::string StringFromBuffer(std::span data) { return std::string(data.begin(), std::find(data.begin(), data.end(), '\0')); } diff --git a/src/common/string_util.h b/src/common/string_util.h index ce18a33cf..f8aecc875 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -5,6 +5,7 @@ #pragma once #include +#include #include #include #include "common/common_types.h" @@ -17,7 +18,7 @@ namespace Common { /// Make a string uppercase [[nodiscard]] std::string ToUpper(std::string str); -[[nodiscard]] std::string StringFromBuffer(const std::vector& data); +[[nodiscard]] std::string StringFromBuffer(std::span data); [[nodiscard]] std::string StripSpaces(const std::string& s); [[nodiscard]] std::string StripQuotes(const std::string& s); diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index 738b6d0f1..494151eef 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp @@ -11,6 +11,7 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/logging/log.h" +#include "common/scratch_buffer.h" #include "core/hle/ipc_helpers.h" #include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/k_auto_object.h" @@ -325,7 +326,7 @@ Result HLERequestContext::WriteToOutgoingCommandBuffer(KThread& requesting_threa return ResultSuccess; } -std::vector HLERequestContext::ReadBuffer(std::size_t buffer_index) const { +std::vector HLERequestContext::ReadBufferCopy(std::size_t buffer_index) const { const bool is_buffer_a{BufferDescriptorA().size() > buffer_index && BufferDescriptorA()[buffer_index].Size()}; if (is_buffer_a) { @@ -345,6 +346,33 @@ std::vector HLERequestContext::ReadBuffer(std::size_t buffer_index) const { } } +std::span HLERequestContext::ReadBuffer(std::size_t buffer_index) const { + static thread_local std::array, 2> read_buffer_a; + static thread_local std::array, 2> read_buffer_x; + + const bool is_buffer_a{BufferDescriptorA().size() > buffer_index && + BufferDescriptorA()[buffer_index].Size()}; + if (is_buffer_a) { + ASSERT_OR_EXECUTE_MSG( + BufferDescriptorA().size() > buffer_index, { return {}; }, + "BufferDescriptorA invalid buffer_index {}", buffer_index); + auto& read_buffer = read_buffer_a[buffer_index]; + read_buffer.resize_destructive(BufferDescriptorA()[buffer_index].Size()); + memory.ReadBlock(BufferDescriptorA()[buffer_index].Address(), read_buffer.data(), + read_buffer.size()); + return read_buffer; + } else { + ASSERT_OR_EXECUTE_MSG( + BufferDescriptorX().size() > buffer_index, { return {}; }, + "BufferDescriptorX invalid buffer_index {}", buffer_index); + auto& read_buffer = read_buffer_x[buffer_index]; + read_buffer.resize_destructive(BufferDescriptorX()[buffer_index].Size()); + memory.ReadBlock(BufferDescriptorX()[buffer_index].Address(), read_buffer.data(), + read_buffer.size()); + return read_buffer; + } +} + std::size_t HLERequestContext::WriteBuffer(const void* buffer, std::size_t size, std::size_t buffer_index) const { if (size == 0) { diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index e252b5f4b..5bf4f171b 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -270,8 +271,11 @@ public: return domain_message_header.has_value(); } - /// Helper function to read a buffer using the appropriate buffer descriptor - [[nodiscard]] std::vector ReadBuffer(std::size_t buffer_index = 0) const; + /// Helper function to get a span of a buffer using the appropriate buffer descriptor + [[nodiscard]] std::span ReadBuffer(std::size_t buffer_index = 0) const; + + /// Helper function to read a copy of a buffer using the appropriate buffer descriptor + [[nodiscard]] std::vector ReadBufferCopy(std::size_t buffer_index = 0) const; /// Helper function to write a buffer using the appropriate buffer descriptor std::size_t WriteBuffer(const void* buffer, std::size_t size, diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 22999c942..ebcf6e164 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -1124,7 +1124,7 @@ void IStorageAccessor::Write(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 offset{rp.Pop()}; - const std::vector data{ctx.ReadBuffer()}; + const auto data{ctx.ReadBuffer()}; const std::size_t size{std::min(data.size(), backing.GetSize() - offset)}; LOG_DEBUG(Service_AM, "called, offset={}, size={}", offset, size); diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index 3a1c231b6..0ee28752c 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp @@ -112,7 +112,7 @@ private: void RequestUpdate(Kernel::HLERequestContext& ctx) { LOG_TRACE(Service_Audio, "called"); - std::vector input{ctx.ReadBuffer(0)}; + const auto input{ctx.ReadBuffer(0)}; // These buffers are written manually to avoid an issue with WriteBuffer throwing errors for // checking size 0. Performance size is 0 for most games. diff --git a/src/core/hle/service/audio/hwopus.cpp b/src/core/hle/service/audio/hwopus.cpp index 825fb8bcc..e01f87356 100644 --- a/src/core/hle/service/audio/hwopus.cpp +++ b/src/core/hle/service/audio/hwopus.cpp @@ -93,7 +93,7 @@ private: ctx.WriteBuffer(samples); } - bool DecodeOpusData(u32& consumed, u32& sample_count, const std::vector& input, + bool DecodeOpusData(u32& consumed, u32& sample_count, std::span input, std::vector& output, u64* out_performance_time) const { const auto start_time = std::chrono::steady_clock::now(); const std::size_t raw_output_sz = output.size() * sizeof(opus_int16); diff --git a/src/core/hle/service/es/es.cpp b/src/core/hle/service/es/es.cpp index d183e5829..fb8686859 100644 --- a/src/core/hle/service/es/es.cpp +++ b/src/core/hle/service/es/es.cpp @@ -122,7 +122,7 @@ private: void ImportTicket(Kernel::HLERequestContext& ctx) { const auto ticket = ctx.ReadBuffer(); - const auto cert = ctx.ReadBuffer(1); + [[maybe_unused]] const auto cert = ctx.ReadBuffer(1); if (ticket.size() < sizeof(Core::Crypto::Ticket)) { LOG_ERROR(Service_ETicket, "The input buffer is not large enough!"); diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index fbb16a7da..cab44bf9c 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp_srv.cpp @@ -190,7 +190,7 @@ private: return; } - const std::vector data = ctx.ReadBuffer(); + const auto data = ctx.ReadBuffer(); ASSERT_MSG( static_cast(data.size()) <= length, @@ -401,11 +401,8 @@ public: } void RenameFile(Kernel::HLERequestContext& ctx) { - std::vector buffer = ctx.ReadBuffer(0); - const std::string src_name = Common::StringFromBuffer(buffer); - - buffer = ctx.ReadBuffer(1); - const std::string dst_name = Common::StringFromBuffer(buffer); + const std::string src_name = Common::StringFromBuffer(ctx.ReadBuffer(0)); + const std::string dst_name = Common::StringFromBuffer(ctx.ReadBuffer(1)); LOG_DEBUG(Service_FS, "called. file '{}' to file '{}'", src_name, dst_name); diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp index 49b6d45fe..ce21b69e3 100644 --- a/src/core/hle/service/glue/arp.cpp +++ b/src/core/hle/service/glue/arp.cpp @@ -228,7 +228,8 @@ private: return; } - control = ctx.ReadBuffer(); + // TODO: Can this be a span? + control = ctx.ReadBufferCopy(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 3afda9e3f..513ea485a 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -758,11 +758,12 @@ Core::HID::NpadStyleTag Controller_NPad::GetSupportedStyleSet() const { return hid_core.GetSupportedStyleTag(); } -void Controller_NPad::SetSupportedNpadIdTypes(u8* data, std::size_t length) { +void Controller_NPad::SetSupportedNpadIdTypes(std::span data) { + const auto length = data.size(); ASSERT(length > 0 && (length % sizeof(u32)) == 0); supported_npad_id_types.clear(); supported_npad_id_types.resize(length / sizeof(u32)); - std::memcpy(supported_npad_id_types.data(), data, length); + std::memcpy(supported_npad_id_types.data(), data.data(), length); } void Controller_NPad::GetSupportedNpadIdTypes(u32* data, std::size_t max_length) { diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 1a589cca2..1f7d33459 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -6,6 +6,7 @@ #include #include #include +#include #include "common/bit_field.h" #include "common/common_types.h" @@ -95,7 +96,7 @@ public: void SetSupportedStyleSet(Core::HID::NpadStyleTag style_set); Core::HID::NpadStyleTag GetSupportedStyleSet() const; - void SetSupportedNpadIdTypes(u8* data, std::size_t length); + void SetSupportedNpadIdTypes(std::span data); void GetSupportedNpadIdTypes(u32* data, std::size_t max_length); std::size_t GetSupportedNpadIdTypesSize() const; diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index bf28440c6..f15f1a6bb 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -1026,7 +1026,7 @@ void Hid::SetSupportedNpadIdType(Kernel::HLERequestContext& ctx) { const auto applet_resource_user_id{rp.Pop()}; applet_resource->GetController(HidController::NPad) - .SetSupportedNpadIdTypes(ctx.ReadBuffer().data(), ctx.GetReadBufferSize()); + .SetSupportedNpadIdTypes(ctx.ReadBuffer()); LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id); @@ -2104,7 +2104,7 @@ void Hid::WritePalmaRgbLedPatternEntry(Kernel::HLERequestContext& ctx) { const auto connection_handle{rp.PopRaw()}; const auto unknown{rp.Pop()}; - const auto buffer = ctx.ReadBuffer(); + [[maybe_unused]] const auto buffer = ctx.ReadBuffer(); LOG_WARNING(Service_HID, "(STUBBED) called, connection_handle={}, unknown={}", connection_handle.npad_id, unknown); diff --git a/src/core/hle/service/hid/hidbus/hidbus_base.h b/src/core/hle/service/hid/hidbus/hidbus_base.h index d3960f506..65e301137 100644 --- a/src/core/hle/service/hid/hidbus/hidbus_base.h +++ b/src/core/hle/service/hid/hidbus/hidbus_base.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include "common/common_types.h" #include "core/hle/result.h" @@ -150,7 +151,7 @@ public: } // Assigns a command from data - virtual bool SetCommand(const std::vector& data) { + virtual bool SetCommand(std::span data) { return {}; } diff --git a/src/core/hle/service/hid/hidbus/ringcon.cpp b/src/core/hle/service/hid/hidbus/ringcon.cpp index 78ed47014..35847cbdd 100644 --- a/src/core/hle/service/hid/hidbus/ringcon.cpp +++ b/src/core/hle/service/hid/hidbus/ringcon.cpp @@ -116,7 +116,7 @@ std::vector RingController::GetReply() const { } } -bool RingController::SetCommand(const std::vector& data) { +bool RingController::SetCommand(std::span data) { if (data.size() < 4) { LOG_ERROR(Service_HID, "Command size not supported {}", data.size()); command = RingConCommands::Error; diff --git a/src/core/hle/service/hid/hidbus/ringcon.h b/src/core/hle/service/hid/hidbus/ringcon.h index 845ce85a5..c2fb386b1 100644 --- a/src/core/hle/service/hid/hidbus/ringcon.h +++ b/src/core/hle/service/hid/hidbus/ringcon.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include "common/common_types.h" #include "core/hle/service/hid/hidbus/hidbus_base.h" @@ -31,7 +32,7 @@ public: u8 GetDeviceId() const override; // Assigns a command from data - bool SetCommand(const std::vector& data) override; + bool SetCommand(std::span data) override; // Returns a reply from a command std::vector GetReply() const override; diff --git a/src/core/hle/service/hid/hidbus/starlink.cpp b/src/core/hle/service/hid/hidbus/starlink.cpp index dd439f60a..d0e760314 100644 --- a/src/core/hle/service/hid/hidbus/starlink.cpp +++ b/src/core/hle/service/hid/hidbus/starlink.cpp @@ -42,7 +42,7 @@ std::vector Starlink::GetReply() const { return {}; } -bool Starlink::SetCommand(const std::vector& data) { +bool Starlink::SetCommand(std::span data) { LOG_ERROR(Service_HID, "Command not implemented"); return false; } diff --git a/src/core/hle/service/hid/hidbus/starlink.h b/src/core/hle/service/hid/hidbus/starlink.h index 0b1b7ba49..07c800e6e 100644 --- a/src/core/hle/service/hid/hidbus/starlink.h +++ b/src/core/hle/service/hid/hidbus/starlink.h @@ -29,7 +29,7 @@ public: u8 GetDeviceId() const override; // Assigns a command from data - bool SetCommand(const std::vector& data) override; + bool SetCommand(std::span data) override; // Returns a reply from a command std::vector GetReply() const override; diff --git a/src/core/hle/service/hid/hidbus/stubbed.cpp b/src/core/hle/service/hid/hidbus/stubbed.cpp index e477443e3..07632c872 100644 --- a/src/core/hle/service/hid/hidbus/stubbed.cpp +++ b/src/core/hle/service/hid/hidbus/stubbed.cpp @@ -43,7 +43,7 @@ std::vector HidbusStubbed::GetReply() const { return {}; } -bool HidbusStubbed::SetCommand(const std::vector& data) { +bool HidbusStubbed::SetCommand(std::span data) { LOG_ERROR(Service_HID, "Command not implemented"); return false; } diff --git a/src/core/hle/service/hid/hidbus/stubbed.h b/src/core/hle/service/hid/hidbus/stubbed.h index 91165ceff..38eaa0ecc 100644 --- a/src/core/hle/service/hid/hidbus/stubbed.h +++ b/src/core/hle/service/hid/hidbus/stubbed.h @@ -29,7 +29,7 @@ public: u8 GetDeviceId() const override; // Assigns a command from data - bool SetCommand(const std::vector& data) override; + bool SetCommand(std::span data) override; // Returns a reply from a command std::vector GetReply() const override; diff --git a/src/core/hle/service/jit/jit.cpp b/src/core/hle/service/jit/jit.cpp index 8f2920c51..1295a44c7 100644 --- a/src/core/hle/service/jit/jit.cpp +++ b/src/core/hle/service/jit/jit.cpp @@ -62,7 +62,7 @@ public: const auto parameters{rp.PopRaw()}; // Optional input/output buffers - std::vector input_buffer{ctx.CanReadBuffer() ? ctx.ReadBuffer() : std::vector()}; + const auto input_buffer{ctx.CanReadBuffer() ? ctx.ReadBuffer() : std::span()}; std::vector output_buffer(ctx.CanWriteBuffer() ? ctx.GetWriteBufferSize() : 0); // Function call prototype: @@ -132,7 +132,7 @@ public: const auto command{rp.PopRaw()}; // Optional input/output buffers - std::vector input_buffer{ctx.CanReadBuffer() ? ctx.ReadBuffer() : std::vector()}; + const auto input_buffer{ctx.CanReadBuffer() ? ctx.ReadBuffer() : std::span()}; std::vector output_buffer(ctx.CanWriteBuffer() ? ctx.GetWriteBufferSize() : 0); // Function call prototype: diff --git a/src/core/hle/service/ldn/ldn.cpp b/src/core/hle/service/ldn/ldn.cpp index c49c61cff..e5099d61f 100644 --- a/src/core/hle/service/ldn/ldn.cpp +++ b/src/core/hle/service/ldn/ldn.cpp @@ -412,7 +412,7 @@ public: } void SetAdvertiseData(Kernel::HLERequestContext& ctx) { - std::vector read_buffer = ctx.ReadBuffer(); + const auto read_buffer = ctx.ReadBuffer(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(lan_discovery.SetAdvertiseData(read_buffer)); @@ -464,7 +464,7 @@ public: parameters.security_config.passphrase_size, parameters.security_config.security_mode, parameters.local_communication_version); - const std::vector read_buffer = ctx.ReadBuffer(); + const auto read_buffer = ctx.ReadBuffer(); if (read_buffer.size() != sizeof(NetworkInfo)) { LOG_ERROR(Frontend, "NetworkInfo doesn't match read_buffer size!"); IPC::ResponseBuilder rb{ctx, 2}; diff --git a/src/core/hle/service/nvdrv/devices/nvdevice.h b/src/core/hle/service/nvdrv/devices/nvdevice.h index 204b0e757..c562e04d2 100644 --- a/src/core/hle/service/nvdrv/devices/nvdevice.h +++ b/src/core/hle/service/nvdrv/devices/nvdevice.h @@ -3,7 +3,9 @@ #pragma once +#include #include + #include "common/common_types.h" #include "core/hle/service/nvdrv/nvdata.h" @@ -31,7 +33,7 @@ public: * @param output A buffer where the output data will be written to. * @returns The result code of the ioctl. */ - virtual NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, + virtual NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) = 0; /** @@ -42,8 +44,8 @@ public: * @param output A buffer where the output data will be written to. * @returns The result code of the ioctl. */ - virtual NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) = 0; + virtual NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) = 0; /** * Handles an ioctl3 request. @@ -53,7 +55,7 @@ public: * @param inline_output A buffer where the inlined output data will be written to. * @returns The result code of the ioctl. */ - virtual NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, + virtual NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, std::vector& inline_output) = 0; /** diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp index 4122fc98d..5a5b2e305 100644 --- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp +++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp @@ -17,19 +17,19 @@ nvdisp_disp0::nvdisp_disp0(Core::System& system_, NvCore::Container& core) : nvdevice{system_}, container{core}, nvmap{core.GetNvMapFile()} {} nvdisp_disp0::~nvdisp_disp0() = default; -NvResult nvdisp_disp0::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvdisp_disp0::Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvdisp_disp0::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) { +NvResult nvdisp_disp0::Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvdisp_disp0::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvdisp_disp0::Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, std::vector& inline_output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h index 04217ab12..81bd7960a 100644 --- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h +++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h @@ -25,12 +25,12 @@ public: explicit nvdisp_disp0(Core::System& system_, NvCore::Container& core); ~nvdisp_disp0() override; - NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, - std::vector& output, std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, + std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp index b635e6ed1..681bd0867 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp @@ -27,7 +27,7 @@ nvhost_as_gpu::nvhost_as_gpu(Core::System& system_, Module& module_, NvCore::Con nvhost_as_gpu::~nvhost_as_gpu() = default; -NvResult nvhost_as_gpu::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvhost_as_gpu::Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) { switch (command.group) { case 'A': @@ -60,13 +60,13 @@ NvResult nvhost_as_gpu::Ioctl1(DeviceFD fd, Ioctl command, const std::vector return NvResult::NotImplemented; } -NvResult nvhost_as_gpu::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) { +NvResult nvhost_as_gpu::Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvhost_as_gpu::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvhost_as_gpu::Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, std::vector& inline_output) { switch (command.group) { case 'A': @@ -87,7 +87,7 @@ NvResult nvhost_as_gpu::Ioctl3(DeviceFD fd, Ioctl command, const std::vector void nvhost_as_gpu::OnOpen(DeviceFD fd) {} void nvhost_as_gpu::OnClose(DeviceFD fd) {} -NvResult nvhost_as_gpu::AllocAsEx(const std::vector& input, std::vector& output) { +NvResult nvhost_as_gpu::AllocAsEx(std::span input, std::vector& output) { IoctlAllocAsEx params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -141,7 +141,7 @@ NvResult nvhost_as_gpu::AllocAsEx(const std::vector& input, std::vector& return NvResult::Success; } -NvResult nvhost_as_gpu::AllocateSpace(const std::vector& input, std::vector& output) { +NvResult nvhost_as_gpu::AllocateSpace(std::span input, std::vector& output) { IoctlAllocSpace params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -220,7 +220,7 @@ void nvhost_as_gpu::FreeMappingLocked(u64 offset) { mapping_map.erase(offset); } -NvResult nvhost_as_gpu::FreeSpace(const std::vector& input, std::vector& output) { +NvResult nvhost_as_gpu::FreeSpace(std::span input, std::vector& output) { IoctlFreeSpace params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -266,7 +266,7 @@ NvResult nvhost_as_gpu::FreeSpace(const std::vector& input, std::vector& return NvResult::Success; } -NvResult nvhost_as_gpu::Remap(const std::vector& input, std::vector& output) { +NvResult nvhost_as_gpu::Remap(std::span input, std::vector& output) { const auto num_entries = input.size() / sizeof(IoctlRemapEntry); LOG_DEBUG(Service_NVDRV, "called, num_entries=0x{:X}", num_entries); @@ -320,7 +320,7 @@ NvResult nvhost_as_gpu::Remap(const std::vector& input, std::vector& out return NvResult::Success; } -NvResult nvhost_as_gpu::MapBufferEx(const std::vector& input, std::vector& output) { +NvResult nvhost_as_gpu::MapBufferEx(std::span input, std::vector& output) { IoctlMapBufferEx params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -424,7 +424,7 @@ NvResult nvhost_as_gpu::MapBufferEx(const std::vector& input, std::vector& input, std::vector& output) { +NvResult nvhost_as_gpu::UnmapBuffer(std::span input, std::vector& output) { IoctlUnmapBuffer params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -463,7 +463,7 @@ NvResult nvhost_as_gpu::UnmapBuffer(const std::vector& input, std::vector& input, std::vector& output) { +NvResult nvhost_as_gpu::BindChannel(std::span input, std::vector& output) { IoctlBindChannel params{}; std::memcpy(¶ms, input.data(), input.size()); LOG_DEBUG(Service_NVDRV, "called, fd={:X}", params.fd); @@ -492,7 +492,7 @@ void nvhost_as_gpu::GetVARegionsImpl(IoctlGetVaRegions& params) { }; } -NvResult nvhost_as_gpu::GetVARegions(const std::vector& input, std::vector& output) { +NvResult nvhost_as_gpu::GetVARegions(std::span input, std::vector& output) { IoctlGetVaRegions params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -511,7 +511,7 @@ NvResult nvhost_as_gpu::GetVARegions(const std::vector& input, std::vector& input, std::vector& output, +NvResult nvhost_as_gpu::GetVARegions(std::span input, std::vector& output, std::vector& inline_output) { IoctlGetVaRegions params{}; std::memcpy(¶ms, input.data(), input.size()); diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h index 86fe71c75..1aba8d579 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h @@ -47,12 +47,12 @@ public: explicit nvhost_as_gpu(Core::System& system_, Module& module, NvCore::Container& core); ~nvhost_as_gpu() override; - NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, - std::vector& output, std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, + std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; @@ -138,17 +138,17 @@ private: static_assert(sizeof(IoctlGetVaRegions) == 16 + sizeof(VaRegion) * 2, "IoctlGetVaRegions is incorrect size"); - NvResult AllocAsEx(const std::vector& input, std::vector& output); - NvResult AllocateSpace(const std::vector& input, std::vector& output); - NvResult Remap(const std::vector& input, std::vector& output); - NvResult MapBufferEx(const std::vector& input, std::vector& output); - NvResult UnmapBuffer(const std::vector& input, std::vector& output); - NvResult FreeSpace(const std::vector& input, std::vector& output); - NvResult BindChannel(const std::vector& input, std::vector& output); + NvResult AllocAsEx(std::span input, std::vector& output); + NvResult AllocateSpace(std::span input, std::vector& output); + NvResult Remap(std::span input, std::vector& output); + NvResult MapBufferEx(std::span input, std::vector& output); + NvResult UnmapBuffer(std::span input, std::vector& output); + NvResult FreeSpace(std::span input, std::vector& output); + NvResult BindChannel(std::span input, std::vector& output); void GetVARegionsImpl(IoctlGetVaRegions& params); - NvResult GetVARegions(const std::vector& input, std::vector& output); - NvResult GetVARegions(const std::vector& input, std::vector& output, + NvResult GetVARegions(std::span input, std::vector& output); + NvResult GetVARegions(std::span input, std::vector& output, std::vector& inline_output); void FreeMappingLocked(u64 offset); diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index eee11fab8..0cdde82a7 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp @@ -34,7 +34,7 @@ nvhost_ctrl::~nvhost_ctrl() { } } -NvResult nvhost_ctrl::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvhost_ctrl::Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) { switch (command.group) { case 0x0: @@ -63,13 +63,13 @@ NvResult nvhost_ctrl::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& return NvResult::NotImplemented; } -NvResult nvhost_ctrl::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) { +NvResult nvhost_ctrl::Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvhost_ctrl::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvhost_ctrl::Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, std::vector& inline_outpu) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; @@ -79,7 +79,7 @@ void nvhost_ctrl::OnOpen(DeviceFD fd) {} void nvhost_ctrl::OnClose(DeviceFD fd) {} -NvResult nvhost_ctrl::NvOsGetConfigU32(const std::vector& input, std::vector& output) { +NvResult nvhost_ctrl::NvOsGetConfigU32(std::span input, std::vector& output) { IocGetConfigParams params{}; std::memcpy(¶ms, input.data(), sizeof(params)); LOG_TRACE(Service_NVDRV, "called, setting={}!{}", params.domain_str.data(), @@ -87,7 +87,7 @@ NvResult nvhost_ctrl::NvOsGetConfigU32(const std::vector& input, std::vector return NvResult::ConfigVarNotFound; // Returns error on production mode } -NvResult nvhost_ctrl::IocCtrlEventWait(const std::vector& input, std::vector& output, +NvResult nvhost_ctrl::IocCtrlEventWait(std::span input, std::vector& output, bool is_allocation) { IocCtrlEventWaitParams params{}; std::memcpy(¶ms, input.data(), sizeof(params)); @@ -231,7 +231,7 @@ NvResult nvhost_ctrl::FreeEvent(u32 slot) { return NvResult::Success; } -NvResult nvhost_ctrl::IocCtrlEventRegister(const std::vector& input, std::vector& output) { +NvResult nvhost_ctrl::IocCtrlEventRegister(std::span input, std::vector& output) { IocCtrlEventRegisterParams params{}; std::memcpy(¶ms, input.data(), sizeof(params)); const u32 event_id = params.user_event_id; @@ -252,8 +252,7 @@ NvResult nvhost_ctrl::IocCtrlEventRegister(const std::vector& input, std::ve return NvResult::Success; } -NvResult nvhost_ctrl::IocCtrlEventUnregister(const std::vector& input, - std::vector& output) { +NvResult nvhost_ctrl::IocCtrlEventUnregister(std::span input, std::vector& output) { IocCtrlEventUnregisterParams params{}; std::memcpy(¶ms, input.data(), sizeof(params)); const u32 event_id = params.user_event_id & 0x00FF; @@ -263,7 +262,7 @@ NvResult nvhost_ctrl::IocCtrlEventUnregister(const std::vector& input, return FreeEvent(event_id); } -NvResult nvhost_ctrl::IocCtrlEventUnregisterBatch(const std::vector& input, +NvResult nvhost_ctrl::IocCtrlEventUnregisterBatch(std::span input, std::vector& output) { IocCtrlEventUnregisterBatchParams params{}; std::memcpy(¶ms, input.data(), sizeof(params)); @@ -282,7 +281,7 @@ NvResult nvhost_ctrl::IocCtrlEventUnregisterBatch(const std::vector& input, return NvResult::Success; } -NvResult nvhost_ctrl::IocCtrlClearEventWait(const std::vector& input, std::vector& output) { +NvResult nvhost_ctrl::IocCtrlClearEventWait(std::span input, std::vector& output) { IocCtrlEventClearParams params{}; std::memcpy(¶ms, input.data(), sizeof(params)); diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h index 0b56d7070..dd2e7888a 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h @@ -25,12 +25,12 @@ public: NvCore::Container& core); ~nvhost_ctrl() override; - NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, - std::vector& output, std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, + std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; @@ -186,13 +186,13 @@ private: static_assert(sizeof(IocCtrlEventUnregisterBatchParams) == 8, "IocCtrlEventKill is incorrect size"); - NvResult NvOsGetConfigU32(const std::vector& input, std::vector& output); - NvResult IocCtrlEventWait(const std::vector& input, std::vector& output, + NvResult NvOsGetConfigU32(std::span input, std::vector& output); + NvResult IocCtrlEventWait(std::span input, std::vector& output, bool is_allocation); - NvResult IocCtrlEventRegister(const std::vector& input, std::vector& output); - NvResult IocCtrlEventUnregister(const std::vector& input, std::vector& output); - NvResult IocCtrlEventUnregisterBatch(const std::vector& input, std::vector& output); - NvResult IocCtrlClearEventWait(const std::vector& input, std::vector& output); + NvResult IocCtrlEventRegister(std::span input, std::vector& output); + NvResult IocCtrlEventUnregister(std::span input, std::vector& output); + NvResult IocCtrlEventUnregisterBatch(std::span input, std::vector& output); + NvResult IocCtrlClearEventWait(std::span input, std::vector& output); NvResult FreeEvent(u32 slot); diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp index b97813fbc..be3c083db 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp @@ -21,7 +21,7 @@ nvhost_ctrl_gpu::~nvhost_ctrl_gpu() { events_interface.FreeEvent(unknown_event); } -NvResult nvhost_ctrl_gpu::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvhost_ctrl_gpu::Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) { switch (command.group) { case 'G': @@ -53,13 +53,13 @@ NvResult nvhost_ctrl_gpu::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) { +NvResult nvhost_ctrl_gpu::Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvhost_ctrl_gpu::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvhost_ctrl_gpu::Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, std::vector& inline_output) { switch (command.group) { case 'G': @@ -82,8 +82,7 @@ NvResult nvhost_ctrl_gpu::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, - std::vector& output) { +NvResult nvhost_ctrl_gpu::GetCharacteristics(std::span input, std::vector& output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlCharacteristics params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -128,7 +127,7 @@ NvResult nvhost_ctrl_gpu::GetCharacteristics(const std::vector& input, return NvResult::Success; } -NvResult nvhost_ctrl_gpu::GetCharacteristics(const std::vector& input, std::vector& output, +NvResult nvhost_ctrl_gpu::GetCharacteristics(std::span input, std::vector& output, std::vector& inline_output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlCharacteristics params{}; @@ -176,7 +175,7 @@ NvResult nvhost_ctrl_gpu::GetCharacteristics(const std::vector& input, std:: return NvResult::Success; } -NvResult nvhost_ctrl_gpu::GetTPCMasks(const std::vector& input, std::vector& output) { +NvResult nvhost_ctrl_gpu::GetTPCMasks(std::span input, std::vector& output) { IoctlGpuGetTpcMasksArgs params{}; std::memcpy(¶ms, input.data(), input.size()); LOG_DEBUG(Service_NVDRV, "called, mask_buffer_size=0x{:X}", params.mask_buffer_size); @@ -187,7 +186,7 @@ NvResult nvhost_ctrl_gpu::GetTPCMasks(const std::vector& input, std::vector< return NvResult::Success; } -NvResult nvhost_ctrl_gpu::GetTPCMasks(const std::vector& input, std::vector& output, +NvResult nvhost_ctrl_gpu::GetTPCMasks(std::span input, std::vector& output, std::vector& inline_output) { IoctlGpuGetTpcMasksArgs params{}; std::memcpy(¶ms, input.data(), input.size()); @@ -200,7 +199,7 @@ NvResult nvhost_ctrl_gpu::GetTPCMasks(const std::vector& input, std::vector< return NvResult::Success; } -NvResult nvhost_ctrl_gpu::GetActiveSlotMask(const std::vector& input, std::vector& output) { +NvResult nvhost_ctrl_gpu::GetActiveSlotMask(std::span input, std::vector& output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlActiveSlotMask params{}; @@ -213,7 +212,7 @@ NvResult nvhost_ctrl_gpu::GetActiveSlotMask(const std::vector& input, std::v return NvResult::Success; } -NvResult nvhost_ctrl_gpu::ZCullGetCtxSize(const std::vector& input, std::vector& output) { +NvResult nvhost_ctrl_gpu::ZCullGetCtxSize(std::span input, std::vector& output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlZcullGetCtxSize params{}; @@ -225,7 +224,7 @@ NvResult nvhost_ctrl_gpu::ZCullGetCtxSize(const std::vector& input, std::vec return NvResult::Success; } -NvResult nvhost_ctrl_gpu::ZCullGetInfo(const std::vector& input, std::vector& output) { +NvResult nvhost_ctrl_gpu::ZCullGetInfo(std::span input, std::vector& output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlNvgpuGpuZcullGetInfoArgs params{}; @@ -248,7 +247,7 @@ NvResult nvhost_ctrl_gpu::ZCullGetInfo(const std::vector& input, std::vector return NvResult::Success; } -NvResult nvhost_ctrl_gpu::ZBCSetTable(const std::vector& input, std::vector& output) { +NvResult nvhost_ctrl_gpu::ZBCSetTable(std::span input, std::vector& output) { LOG_WARNING(Service_NVDRV, "(STUBBED) called"); IoctlZbcSetTable params{}; @@ -264,7 +263,7 @@ NvResult nvhost_ctrl_gpu::ZBCSetTable(const std::vector& input, std::vector< return NvResult::Success; } -NvResult nvhost_ctrl_gpu::ZBCQueryTable(const std::vector& input, std::vector& output) { +NvResult nvhost_ctrl_gpu::ZBCQueryTable(std::span input, std::vector& output) { LOG_WARNING(Service_NVDRV, "(STUBBED) called"); IoctlZbcQueryTable params{}; @@ -274,7 +273,7 @@ NvResult nvhost_ctrl_gpu::ZBCQueryTable(const std::vector& input, std::vecto return NvResult::Success; } -NvResult nvhost_ctrl_gpu::FlushL2(const std::vector& input, std::vector& output) { +NvResult nvhost_ctrl_gpu::FlushL2(std::span input, std::vector& output) { LOG_WARNING(Service_NVDRV, "(STUBBED) called"); IoctlFlushL2 params{}; @@ -284,7 +283,7 @@ NvResult nvhost_ctrl_gpu::FlushL2(const std::vector& input, std::vector& return NvResult::Success; } -NvResult nvhost_ctrl_gpu::GetGpuTime(const std::vector& input, std::vector& output) { +NvResult nvhost_ctrl_gpu::GetGpuTime(std::span input, std::vector& output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlGetGpuTime params{}; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h index 1e8f254e2..b9333d9d3 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h @@ -21,12 +21,12 @@ public: explicit nvhost_ctrl_gpu(Core::System& system_, EventInterface& events_interface_); ~nvhost_ctrl_gpu() override; - NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, - std::vector& output, std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, + std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; @@ -151,21 +151,21 @@ private: }; static_assert(sizeof(IoctlGetGpuTime) == 0x10, "IoctlGetGpuTime is incorrect size"); - NvResult GetCharacteristics(const std::vector& input, std::vector& output); - NvResult GetCharacteristics(const std::vector& input, std::vector& output, + NvResult GetCharacteristics(std::span input, std::vector& output); + NvResult GetCharacteristics(std::span input, std::vector& output, std::vector& inline_output); - NvResult GetTPCMasks(const std::vector& input, std::vector& output); - NvResult GetTPCMasks(const std::vector& input, std::vector& output, + NvResult GetTPCMasks(std::span input, std::vector& output); + NvResult GetTPCMasks(std::span input, std::vector& output, std::vector& inline_output); - NvResult GetActiveSlotMask(const std::vector& input, std::vector& output); - NvResult ZCullGetCtxSize(const std::vector& input, std::vector& output); - NvResult ZCullGetInfo(const std::vector& input, std::vector& output); - NvResult ZBCSetTable(const std::vector& input, std::vector& output); - NvResult ZBCQueryTable(const std::vector& input, std::vector& output); - NvResult FlushL2(const std::vector& input, std::vector& output); - NvResult GetGpuTime(const std::vector& input, std::vector& output); + NvResult GetActiveSlotMask(std::span input, std::vector& output); + NvResult ZCullGetCtxSize(std::span input, std::vector& output); + NvResult ZCullGetInfo(std::span input, std::vector& output); + NvResult ZBCSetTable(std::span input, std::vector& output); + NvResult ZBCQueryTable(std::span input, std::vector& output); + NvResult FlushL2(std::span input, std::vector& output); + NvResult GetGpuTime(std::span input, std::vector& output); EventInterface& events_interface; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp index e123564c6..d2308fffc 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp @@ -46,7 +46,7 @@ nvhost_gpu::~nvhost_gpu() { syncpoint_manager.FreeSyncpoint(channel_syncpoint); } -NvResult nvhost_gpu::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvhost_gpu::Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) { switch (command.group) { case 0x0: @@ -98,8 +98,8 @@ NvResult nvhost_gpu::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& i return NvResult::NotImplemented; }; -NvResult nvhost_gpu::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) { +NvResult nvhost_gpu::Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) { switch (command.group) { case 'H': switch (command.cmd) { @@ -112,7 +112,7 @@ NvResult nvhost_gpu::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& i return NvResult::NotImplemented; } -NvResult nvhost_gpu::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvhost_gpu::Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, std::vector& inline_output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; @@ -121,7 +121,7 @@ NvResult nvhost_gpu::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& i void nvhost_gpu::OnOpen(DeviceFD fd) {} void nvhost_gpu::OnClose(DeviceFD fd) {} -NvResult nvhost_gpu::SetNVMAPfd(const std::vector& input, std::vector& output) { +NvResult nvhost_gpu::SetNVMAPfd(std::span input, std::vector& output) { IoctlSetNvmapFD params{}; std::memcpy(¶ms, input.data(), input.size()); LOG_DEBUG(Service_NVDRV, "called, fd={}", params.nvmap_fd); @@ -130,7 +130,7 @@ NvResult nvhost_gpu::SetNVMAPfd(const std::vector& input, std::vector& o return NvResult::Success; } -NvResult nvhost_gpu::SetClientData(const std::vector& input, std::vector& output) { +NvResult nvhost_gpu::SetClientData(std::span input, std::vector& output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlClientData params{}; @@ -139,7 +139,7 @@ NvResult nvhost_gpu::SetClientData(const std::vector& input, std::vector return NvResult::Success; } -NvResult nvhost_gpu::GetClientData(const std::vector& input, std::vector& output) { +NvResult nvhost_gpu::GetClientData(std::span input, std::vector& output) { LOG_DEBUG(Service_NVDRV, "called"); IoctlClientData params{}; @@ -149,7 +149,7 @@ NvResult nvhost_gpu::GetClientData(const std::vector& input, std::vector return NvResult::Success; } -NvResult nvhost_gpu::ZCullBind(const std::vector& input, std::vector& output) { +NvResult nvhost_gpu::ZCullBind(std::span input, std::vector& output) { std::memcpy(&zcull_params, input.data(), input.size()); LOG_DEBUG(Service_NVDRV, "called, gpu_va={:X}, mode={:X}", zcull_params.gpu_va, zcull_params.mode); @@ -158,7 +158,7 @@ NvResult nvhost_gpu::ZCullBind(const std::vector& input, std::vector& ou return NvResult::Success; } -NvResult nvhost_gpu::SetErrorNotifier(const std::vector& input, std::vector& output) { +NvResult nvhost_gpu::SetErrorNotifier(std::span input, std::vector& output) { IoctlSetErrorNotifier params{}; std::memcpy(¶ms, input.data(), input.size()); LOG_WARNING(Service_NVDRV, "(STUBBED) called, offset={:X}, size={:X}, mem={:X}", params.offset, @@ -168,14 +168,14 @@ NvResult nvhost_gpu::SetErrorNotifier(const std::vector& input, std::vector< return NvResult::Success; } -NvResult nvhost_gpu::SetChannelPriority(const std::vector& input, std::vector& output) { +NvResult nvhost_gpu::SetChannelPriority(std::span input, std::vector& output) { std::memcpy(&channel_priority, input.data(), input.size()); LOG_DEBUG(Service_NVDRV, "(STUBBED) called, priority={:X}", channel_priority); return NvResult::Success; } -NvResult nvhost_gpu::AllocGPFIFOEx2(const std::vector& input, std::vector& output) { +NvResult nvhost_gpu::AllocGPFIFOEx2(std::span input, std::vector& output) { IoctlAllocGpfifoEx2 params{}; std::memcpy(¶ms, input.data(), input.size()); LOG_WARNING(Service_NVDRV, @@ -197,7 +197,7 @@ NvResult nvhost_gpu::AllocGPFIFOEx2(const std::vector& input, std::vector& input, std::vector& output) { +NvResult nvhost_gpu::AllocateObjectContext(std::span input, std::vector& output) { IoctlAllocObjCtx params{}; std::memcpy(¶ms, input.data(), input.size()); LOG_WARNING(Service_NVDRV, "(STUBBED) called, class_num={:X}, flags={:X}", params.class_num, @@ -293,7 +293,7 @@ NvResult nvhost_gpu::SubmitGPFIFOImpl(IoctlSubmitGpfifo& params, std::vector return NvResult::Success; } -NvResult nvhost_gpu::SubmitGPFIFOBase(const std::vector& input, std::vector& output, +NvResult nvhost_gpu::SubmitGPFIFOBase(std::span input, std::vector& output, bool kickoff) { if (input.size() < sizeof(IoctlSubmitGpfifo)) { UNIMPLEMENTED(); @@ -314,8 +314,7 @@ NvResult nvhost_gpu::SubmitGPFIFOBase(const std::vector& input, std::vector< return SubmitGPFIFOImpl(params, output, std::move(entries)); } -NvResult nvhost_gpu::SubmitGPFIFOBase(const std::vector& input, - const std::vector& input_inline, +NvResult nvhost_gpu::SubmitGPFIFOBase(std::span input, std::span input_inline, std::vector& output) { if (input.size() < sizeof(IoctlSubmitGpfifo)) { UNIMPLEMENTED(); @@ -328,7 +327,7 @@ NvResult nvhost_gpu::SubmitGPFIFOBase(const std::vector& input, return SubmitGPFIFOImpl(params, output, std::move(entries)); } -NvResult nvhost_gpu::GetWaitbase(const std::vector& input, std::vector& output) { +NvResult nvhost_gpu::GetWaitbase(std::span input, std::vector& output) { IoctlGetWaitbase params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlGetWaitbase)); LOG_INFO(Service_NVDRV, "called, unknown=0x{:X}", params.unknown); @@ -338,7 +337,7 @@ NvResult nvhost_gpu::GetWaitbase(const std::vector& input, std::vector& return NvResult::Success; } -NvResult nvhost_gpu::ChannelSetTimeout(const std::vector& input, std::vector& output) { +NvResult nvhost_gpu::ChannelSetTimeout(std::span input, std::vector& output) { IoctlChannelSetTimeout params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlChannelSetTimeout)); LOG_INFO(Service_NVDRV, "called, timeout=0x{:X}", params.timeout); @@ -346,7 +345,7 @@ NvResult nvhost_gpu::ChannelSetTimeout(const std::vector& input, std::vector return NvResult::Success; } -NvResult nvhost_gpu::ChannelSetTimeslice(const std::vector& input, std::vector& output) { +NvResult nvhost_gpu::ChannelSetTimeslice(std::span input, std::vector& output) { IoctlSetTimeslice params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlSetTimeslice)); LOG_INFO(Service_NVDRV, "called, timeslice=0x{:X}", params.timeslice); diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h index 1e4ecd55b..3ca58202d 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h @@ -40,12 +40,12 @@ public: NvCore::Container& core); ~nvhost_gpu() override; - NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, - std::vector& output, std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, + std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; @@ -186,23 +186,23 @@ private: u32_le channel_priority{}; u32_le channel_timeslice{}; - NvResult SetNVMAPfd(const std::vector& input, std::vector& output); - NvResult SetClientData(const std::vector& input, std::vector& output); - NvResult GetClientData(const std::vector& input, std::vector& output); - NvResult ZCullBind(const std::vector& input, std::vector& output); - NvResult SetErrorNotifier(const std::vector& input, std::vector& output); - NvResult SetChannelPriority(const std::vector& input, std::vector& output); - NvResult AllocGPFIFOEx2(const std::vector& input, std::vector& output); - NvResult AllocateObjectContext(const std::vector& input, std::vector& output); + NvResult SetNVMAPfd(std::span input, std::vector& output); + NvResult SetClientData(std::span input, std::vector& output); + NvResult GetClientData(std::span input, std::vector& output); + NvResult ZCullBind(std::span input, std::vector& output); + NvResult SetErrorNotifier(std::span input, std::vector& output); + NvResult SetChannelPriority(std::span input, std::vector& output); + NvResult AllocGPFIFOEx2(std::span input, std::vector& output); + NvResult AllocateObjectContext(std::span input, std::vector& output); NvResult SubmitGPFIFOImpl(IoctlSubmitGpfifo& params, std::vector& output, Tegra::CommandList&& entries); - NvResult SubmitGPFIFOBase(const std::vector& input, std::vector& output, + NvResult SubmitGPFIFOBase(std::span input, std::vector& output, bool kickoff = false); - NvResult SubmitGPFIFOBase(const std::vector& input, const std::vector& input_inline, + NvResult SubmitGPFIFOBase(std::span input, std::span input_inline, std::vector& output); - NvResult GetWaitbase(const std::vector& input, std::vector& output); - NvResult ChannelSetTimeout(const std::vector& input, std::vector& output); - NvResult ChannelSetTimeslice(const std::vector& input, std::vector& output); + NvResult GetWaitbase(std::span input, std::vector& output); + NvResult ChannelSetTimeout(std::span input, std::vector& output); + NvResult ChannelSetTimeslice(std::span input, std::vector& output); EventInterface& events_interface; NvCore::Container& core; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp index 1703f9cc3..0c7aee1b8 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp @@ -15,7 +15,7 @@ nvhost_nvdec::nvhost_nvdec(Core::System& system_, NvCore::Container& core_) : nvhost_nvdec_common{system_, core_, NvCore::ChannelType::NvDec} {} nvhost_nvdec::~nvhost_nvdec() = default; -NvResult nvhost_nvdec::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvhost_nvdec::Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) { switch (command.group) { case 0x0: @@ -55,13 +55,13 @@ NvResult nvhost_nvdec::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& return NvResult::NotImplemented; } -NvResult nvhost_nvdec::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) { +NvResult nvhost_nvdec::Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvhost_nvdec::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvhost_nvdec::Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, std::vector& inline_output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h index c1b4e53e8..0d615bbcb 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h @@ -13,12 +13,12 @@ public: explicit nvhost_nvdec(Core::System& system_, NvCore::Container& core); ~nvhost_nvdec() override; - NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, - std::vector& output, std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, + std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp index 99eede702..7bcef105b 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp @@ -23,7 +23,7 @@ namespace { // Copies count amount of type T from the input vector into the dst vector. // Returns the number of bytes written into dst. template -std::size_t SliceVectors(const std::vector& input, std::vector& dst, std::size_t count, +std::size_t SliceVectors(std::span input, std::vector& dst, std::size_t count, std::size_t offset) { if (dst.empty()) { return 0; @@ -63,7 +63,7 @@ nvhost_nvdec_common::~nvhost_nvdec_common() { core.Host1xDeviceFile().syncpts_accumulated.push_back(channel_syncpoint); } -NvResult nvhost_nvdec_common::SetNVMAPfd(const std::vector& input) { +NvResult nvhost_nvdec_common::SetNVMAPfd(std::span input) { IoctlSetNvmapFD params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlSetNvmapFD)); LOG_DEBUG(Service_NVDRV, "called, fd={}", params.nvmap_fd); @@ -72,7 +72,7 @@ NvResult nvhost_nvdec_common::SetNVMAPfd(const std::vector& input) { return NvResult::Success; } -NvResult nvhost_nvdec_common::Submit(DeviceFD fd, const std::vector& input, +NvResult nvhost_nvdec_common::Submit(DeviceFD fd, std::span input, std::vector& output) { IoctlSubmit params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlSubmit)); @@ -121,7 +121,7 @@ NvResult nvhost_nvdec_common::Submit(DeviceFD fd, const std::vector& input, return NvResult::Success; } -NvResult nvhost_nvdec_common::GetSyncpoint(const std::vector& input, std::vector& output) { +NvResult nvhost_nvdec_common::GetSyncpoint(std::span input, std::vector& output) { IoctlGetSyncpoint params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlGetSyncpoint)); LOG_DEBUG(Service_NVDRV, "called GetSyncpoint, id={}", params.param); @@ -133,7 +133,7 @@ NvResult nvhost_nvdec_common::GetSyncpoint(const std::vector& input, std::ve return NvResult::Success; } -NvResult nvhost_nvdec_common::GetWaitbase(const std::vector& input, std::vector& output) { +NvResult nvhost_nvdec_common::GetWaitbase(std::span input, std::vector& output) { IoctlGetWaitbase params{}; LOG_CRITICAL(Service_NVDRV, "called WAITBASE"); std::memcpy(¶ms, input.data(), sizeof(IoctlGetWaitbase)); @@ -142,7 +142,7 @@ NvResult nvhost_nvdec_common::GetWaitbase(const std::vector& input, std::vec return NvResult::Success; } -NvResult nvhost_nvdec_common::MapBuffer(const std::vector& input, std::vector& output) { +NvResult nvhost_nvdec_common::MapBuffer(std::span input, std::vector& output) { IoctlMapBuffer params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlMapBuffer)); std::vector cmd_buffer_handles(params.num_entries); @@ -159,7 +159,7 @@ NvResult nvhost_nvdec_common::MapBuffer(const std::vector& input, std::vecto return NvResult::Success; } -NvResult nvhost_nvdec_common::UnmapBuffer(const std::vector& input, std::vector& output) { +NvResult nvhost_nvdec_common::UnmapBuffer(std::span input, std::vector& output) { IoctlMapBuffer params{}; std::memcpy(¶ms, input.data(), sizeof(IoctlMapBuffer)); std::vector cmd_buffer_handles(params.num_entries); @@ -173,8 +173,7 @@ NvResult nvhost_nvdec_common::UnmapBuffer(const std::vector& input, std::vec return NvResult::Success; } -NvResult nvhost_nvdec_common::SetSubmitTimeout(const std::vector& input, - std::vector& output) { +NvResult nvhost_nvdec_common::SetSubmitTimeout(std::span input, std::vector& output) { std::memcpy(&submit_timeout, input.data(), input.size()); LOG_WARNING(Service_NVDRV, "(STUBBED) called"); return NvResult::Success; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h index fe76100c8..5af26a26f 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h @@ -107,13 +107,13 @@ protected: static_assert(sizeof(IoctlMapBuffer) == 0x0C, "IoctlMapBuffer is incorrect size"); /// Ioctl command implementations - NvResult SetNVMAPfd(const std::vector& input); - NvResult Submit(DeviceFD fd, const std::vector& input, std::vector& output); - NvResult GetSyncpoint(const std::vector& input, std::vector& output); - NvResult GetWaitbase(const std::vector& input, std::vector& output); - NvResult MapBuffer(const std::vector& input, std::vector& output); - NvResult UnmapBuffer(const std::vector& input, std::vector& output); - NvResult SetSubmitTimeout(const std::vector& input, std::vector& output); + NvResult SetNVMAPfd(std::span input); + NvResult Submit(DeviceFD fd, std::span input, std::vector& output); + NvResult GetSyncpoint(std::span input, std::vector& output); + NvResult GetWaitbase(std::span input, std::vector& output); + NvResult MapBuffer(std::span input, std::vector& output); + NvResult UnmapBuffer(std::span input, std::vector& output); + NvResult SetSubmitTimeout(std::span input, std::vector& output); Kernel::KEvent* QueryEvent(u32 event_id) override; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp index bdbc2f9e1..39f30e7c8 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp @@ -12,7 +12,7 @@ namespace Service::Nvidia::Devices { nvhost_nvjpg::nvhost_nvjpg(Core::System& system_) : nvdevice{system_} {} nvhost_nvjpg::~nvhost_nvjpg() = default; -NvResult nvhost_nvjpg::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvhost_nvjpg::Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) { switch (command.group) { case 'H': @@ -31,13 +31,13 @@ NvResult nvhost_nvjpg::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& return NvResult::NotImplemented; } -NvResult nvhost_nvjpg::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) { +NvResult nvhost_nvjpg::Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvhost_nvjpg::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvhost_nvjpg::Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, std::vector& inline_output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; @@ -46,7 +46,7 @@ NvResult nvhost_nvjpg::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& void nvhost_nvjpg::OnOpen(DeviceFD fd) {} void nvhost_nvjpg::OnClose(DeviceFD fd) {} -NvResult nvhost_nvjpg::SetNVMAPfd(const std::vector& input, std::vector& output) { +NvResult nvhost_nvjpg::SetNVMAPfd(std::span input, std::vector& output) { IoctlSetNvmapFD params{}; std::memcpy(¶ms, input.data(), input.size()); LOG_DEBUG(Service_NVDRV, "called, fd={}", params.nvmap_fd); diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h index 440e7d371..41b57e872 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h @@ -15,12 +15,12 @@ public: explicit nvhost_nvjpg(Core::System& system_); ~nvhost_nvjpg() override; - NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, - std::vector& output, std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, + std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; @@ -33,7 +33,7 @@ private: s32_le nvmap_fd{}; - NvResult SetNVMAPfd(const std::vector& input, std::vector& output); + NvResult SetNVMAPfd(std::span input, std::vector& output); }; } // namespace Service::Nvidia::Devices diff --git a/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp b/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp index 73f97136e..b0ea402a7 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp @@ -15,7 +15,7 @@ nvhost_vic::nvhost_vic(Core::System& system_, NvCore::Container& core_) nvhost_vic::~nvhost_vic() = default; -NvResult nvhost_vic::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvhost_vic::Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) { switch (command.group) { case 0x0: @@ -55,13 +55,13 @@ NvResult nvhost_vic::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& i return NvResult::NotImplemented; } -NvResult nvhost_vic::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) { +NvResult nvhost_vic::Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvhost_vic::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvhost_vic::Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, std::vector& inline_output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_vic.h b/src/core/hle/service/nvdrv/devices/nvhost_vic.h index f164caafb..b5e350a83 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_vic.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_vic.h @@ -12,12 +12,12 @@ public: explicit nvhost_vic(Core::System& system_, NvCore::Container& core); ~nvhost_vic(); - NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, - std::vector& output, std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, + std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; diff --git a/src/core/hle/service/nvdrv/devices/nvmap.cpp b/src/core/hle/service/nvdrv/devices/nvmap.cpp index fa29db758..29c1e0f01 100644 --- a/src/core/hle/service/nvdrv/devices/nvmap.cpp +++ b/src/core/hle/service/nvdrv/devices/nvmap.cpp @@ -25,7 +25,7 @@ nvmap::nvmap(Core::System& system_, NvCore::Container& container_) nvmap::~nvmap() = default; -NvResult nvmap::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvmap::Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) { switch (command.group) { case 0x1: @@ -54,13 +54,13 @@ NvResult nvmap::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, return NvResult::NotImplemented; } -NvResult nvmap::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) { +NvResult nvmap::Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; } -NvResult nvmap::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult nvmap::Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, std::vector& inline_output) { UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw); return NvResult::NotImplemented; @@ -69,7 +69,7 @@ NvResult nvmap::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, void nvmap::OnOpen(DeviceFD fd) {} void nvmap::OnClose(DeviceFD fd) {} -NvResult nvmap::IocCreate(const std::vector& input, std::vector& output) { +NvResult nvmap::IocCreate(std::span input, std::vector& output) { IocCreateParams params; std::memcpy(¶ms, input.data(), sizeof(params)); LOG_DEBUG(Service_NVDRV, "called, size=0x{:08X}", params.size); @@ -89,7 +89,7 @@ NvResult nvmap::IocCreate(const std::vector& input, std::vector& output) return NvResult::Success; } -NvResult nvmap::IocAlloc(const std::vector& input, std::vector& output) { +NvResult nvmap::IocAlloc(std::span input, std::vector& output) { IocAllocParams params; std::memcpy(¶ms, input.data(), sizeof(params)); LOG_DEBUG(Service_NVDRV, "called, addr={:X}", params.address); @@ -137,7 +137,7 @@ NvResult nvmap::IocAlloc(const std::vector& input, std::vector& output) return result; } -NvResult nvmap::IocGetId(const std::vector& input, std::vector& output) { +NvResult nvmap::IocGetId(std::span input, std::vector& output) { IocGetIdParams params; std::memcpy(¶ms, input.data(), sizeof(params)); @@ -161,7 +161,7 @@ NvResult nvmap::IocGetId(const std::vector& input, std::vector& output) return NvResult::Success; } -NvResult nvmap::IocFromId(const std::vector& input, std::vector& output) { +NvResult nvmap::IocFromId(std::span input, std::vector& output) { IocFromIdParams params; std::memcpy(¶ms, input.data(), sizeof(params)); @@ -192,7 +192,7 @@ NvResult nvmap::IocFromId(const std::vector& input, std::vector& output) return NvResult::Success; } -NvResult nvmap::IocParam(const std::vector& input, std::vector& output) { +NvResult nvmap::IocParam(std::span input, std::vector& output) { enum class ParamTypes { Size = 1, Alignment = 2, Base = 3, Heap = 4, Kind = 5, Compr = 6 }; IocParamParams params; @@ -241,7 +241,7 @@ NvResult nvmap::IocParam(const std::vector& input, std::vector& output) return NvResult::Success; } -NvResult nvmap::IocFree(const std::vector& input, std::vector& output) { +NvResult nvmap::IocFree(std::span input, std::vector& output) { IocFreeParams params; std::memcpy(¶ms, input.data(), sizeof(params)); diff --git a/src/core/hle/service/nvdrv/devices/nvmap.h b/src/core/hle/service/nvdrv/devices/nvmap.h index e9bfd0358..82bd3b118 100644 --- a/src/core/hle/service/nvdrv/devices/nvmap.h +++ b/src/core/hle/service/nvdrv/devices/nvmap.h @@ -26,12 +26,12 @@ public: nvmap(const nvmap&) = delete; nvmap& operator=(const nvmap&) = delete; - NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, + NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) override; - NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) override; - NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, - std::vector& output, std::vector& inline_output) override; + NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) override; + NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, + std::vector& inline_output) override; void OnOpen(DeviceFD fd) override; void OnClose(DeviceFD fd) override; @@ -106,12 +106,12 @@ private: }; static_assert(sizeof(IocGetIdParams) == 8, "IocGetIdParams has wrong size"); - NvResult IocCreate(const std::vector& input, std::vector& output); - NvResult IocAlloc(const std::vector& input, std::vector& output); - NvResult IocGetId(const std::vector& input, std::vector& output); - NvResult IocFromId(const std::vector& input, std::vector& output); - NvResult IocParam(const std::vector& input, std::vector& output); - NvResult IocFree(const std::vector& input, std::vector& output); + NvResult IocCreate(std::span input, std::vector& output); + NvResult IocAlloc(std::span input, std::vector& output); + NvResult IocGetId(std::span input, std::vector& output); + NvResult IocFromId(std::span input, std::vector& output); + NvResult IocParam(std::span input, std::vector& output); + NvResult IocFree(std::span input, std::vector& output); NvCore::Container& container; NvCore::NvMap& file; diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index 6fc8565c0..52d27e755 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -124,7 +124,7 @@ DeviceFD Module::Open(const std::string& device_name) { return fd; } -NvResult Module::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult Module::Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output) { if (fd < 0) { LOG_ERROR(Service_NVDRV, "Invalid DeviceFD={}!", fd); @@ -141,8 +141,8 @@ NvResult Module::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input return itr->second->Ioctl1(fd, command, input, output); } -NvResult Module::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output) { +NvResult Module::Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output) { if (fd < 0) { LOG_ERROR(Service_NVDRV, "Invalid DeviceFD={}!", fd); return NvResult::InvalidState; @@ -158,7 +158,7 @@ NvResult Module::Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input return itr->second->Ioctl2(fd, command, input, inline_input, output); } -NvResult Module::Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, +NvResult Module::Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, std::vector& inline_output) { if (fd < 0) { LOG_ERROR(Service_NVDRV, "Invalid DeviceFD={}!", fd); diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.h index f3c81bd88..b09b6e585 100644 --- a/src/core/hle/service/nvdrv/nvdrv.h +++ b/src/core/hle/service/nvdrv/nvdrv.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -79,14 +80,13 @@ public: DeviceFD Open(const std::string& device_name); /// Sends an ioctl command to the specified file descriptor. - NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector& input, - std::vector& output); + NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span input, std::vector& output); - NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector& input, - const std::vector& inline_input, std::vector& output); + NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span input, + std::span inline_input, std::vector& output); - NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector& input, - std::vector& output, std::vector& inline_output); + NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span input, std::vector& output, + std::vector& inline_output); /// Closes a device file descriptor and returns operation success. NvResult Close(DeviceFD fd); diff --git a/src/core/hle/service/nvflinger/buffer_queue_producer.cpp b/src/core/hle/service/nvflinger/buffer_queue_producer.cpp index e601b5da1..bcbe05b0d 100644 --- a/src/core/hle/service/nvflinger/buffer_queue_producer.cpp +++ b/src/core/hle/service/nvflinger/buffer_queue_producer.cpp @@ -815,8 +815,8 @@ Status BufferQueueProducer::SetPreallocatedBuffer(s32 slot, void BufferQueueProducer::Transact(Kernel::HLERequestContext& ctx, TransactionId code, u32 flags) { Status status{Status::NoError}; - Parcel parcel_in{ctx.ReadBuffer()}; - Parcel parcel_out{}; + InputParcel parcel_in{ctx.ReadBuffer()}; + OutputParcel parcel_out{}; switch (code) { case TransactionId::Connect: { diff --git a/src/core/hle/service/nvflinger/graphic_buffer_producer.cpp b/src/core/hle/service/nvflinger/graphic_buffer_producer.cpp index 4043c91f1..769e8c0a3 100644 --- a/src/core/hle/service/nvflinger/graphic_buffer_producer.cpp +++ b/src/core/hle/service/nvflinger/graphic_buffer_producer.cpp @@ -9,7 +9,7 @@ namespace Service::android { -QueueBufferInput::QueueBufferInput(Parcel& parcel) { +QueueBufferInput::QueueBufferInput(InputParcel& parcel) { parcel.ReadFlattened(*this); } diff --git a/src/core/hle/service/nvflinger/graphic_buffer_producer.h b/src/core/hle/service/nvflinger/graphic_buffer_producer.h index 6ea327bbe..2969f0fd5 100644 --- a/src/core/hle/service/nvflinger/graphic_buffer_producer.h +++ b/src/core/hle/service/nvflinger/graphic_buffer_producer.h @@ -14,11 +14,11 @@ namespace Service::android { -class Parcel; +class InputParcel; #pragma pack(push, 1) struct QueueBufferInput final { - explicit QueueBufferInput(Parcel& parcel); + explicit QueueBufferInput(InputParcel& parcel); void Deflate(s64* timestamp_, bool* is_auto_timestamp_, Common::Rectangle* crop_, NativeWindowScalingMode* scaling_mode_, NativeWindowTransform* transform_, diff --git a/src/core/hle/service/nvflinger/parcel.h b/src/core/hle/service/nvflinger/parcel.h index f3fa2587d..d1b6201e0 100644 --- a/src/core/hle/service/nvflinger/parcel.h +++ b/src/core/hle/service/nvflinger/parcel.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include #include "common/alignment.h" @@ -12,18 +13,17 @@ namespace Service::android { -class Parcel final { +struct ParcelHeader { + u32 data_size; + u32 data_offset; + u32 objects_size; + u32 objects_offset; +}; +static_assert(sizeof(ParcelHeader) == 16, "ParcelHeader has wrong size"); + +class InputParcel final { public: - static constexpr std::size_t DefaultBufferSize = 0x40; - - Parcel() : buffer(DefaultBufferSize) {} - - template - explicit Parcel(const T& out_data) : buffer(DefaultBufferSize) { - Write(out_data); - } - - explicit Parcel(std::vector in_data) : buffer(std::move(in_data)) { + explicit InputParcel(std::span in_data) : read_buffer(std::move(in_data)) { DeserializeHeader(); [[maybe_unused]] const std::u16string token = ReadInterfaceToken(); } @@ -31,9 +31,9 @@ public: template void Read(T& val) { static_assert(std::is_trivially_copyable_v, "T must be trivially copyable."); - ASSERT(read_index + sizeof(T) <= buffer.size()); + ASSERT(read_index + sizeof(T) <= read_buffer.size()); - std::memcpy(&val, buffer.data() + read_index, sizeof(T)); + std::memcpy(&val, read_buffer.data() + read_index, sizeof(T)); read_index += sizeof(T); read_index = Common::AlignUp(read_index, 4); } @@ -62,10 +62,10 @@ public: template T ReadUnaligned() { static_assert(std::is_trivially_copyable_v, "T must be trivially copyable."); - ASSERT(read_index + sizeof(T) <= buffer.size()); + ASSERT(read_index + sizeof(T) <= read_buffer.size()); T val; - std::memcpy(&val, buffer.data() + read_index, sizeof(T)); + std::memcpy(&val, read_buffer.data() + read_index, sizeof(T)); read_index += sizeof(T); return val; } @@ -101,6 +101,31 @@ public: return token; } + void DeserializeHeader() { + ASSERT(read_buffer.size() > sizeof(ParcelHeader)); + + ParcelHeader header{}; + std::memcpy(&header, read_buffer.data(), sizeof(ParcelHeader)); + + read_index = header.data_offset; + } + +private: + std::span read_buffer; + std::size_t read_index = 0; +}; + +class OutputParcel final { +public: + static constexpr std::size_t DefaultBufferSize = 0x40; + + OutputParcel() : buffer(DefaultBufferSize) {} + + template + explicit OutputParcel(const T& out_data) : buffer(DefaultBufferSize) { + Write(out_data); + } + template void Write(const T& val) { static_assert(std::is_trivially_copyable_v, "T must be trivially copyable."); @@ -133,40 +158,20 @@ public: WriteObject(ptr.get()); } - void DeserializeHeader() { - ASSERT(buffer.size() > sizeof(Header)); - - Header header{}; - std::memcpy(&header, buffer.data(), sizeof(Header)); - - read_index = header.data_offset; - } - std::vector Serialize() const { - ASSERT(read_index == 0); - - Header header{}; - header.data_size = static_cast(write_index - sizeof(Header)); - header.data_offset = sizeof(Header); + ParcelHeader header{}; + header.data_size = static_cast(write_index - sizeof(ParcelHeader)); + header.data_offset = sizeof(ParcelHeader); header.objects_size = 4; - header.objects_offset = static_cast(sizeof(Header) + header.data_size); - std::memcpy(buffer.data(), &header, sizeof(Header)); + header.objects_offset = static_cast(sizeof(ParcelHeader) + header.data_size); + std::memcpy(buffer.data(), &header, sizeof(ParcelHeader)); return buffer; } private: - struct Header { - u32 data_size; - u32 data_offset; - u32 objects_size; - u32 objects_offset; - }; - static_assert(sizeof(Header) == 16, "ParcelHeader has wrong size"); - mutable std::vector buffer; - std::size_t read_index = 0; - std::size_t write_index = sizeof(Header); + std::size_t write_index = sizeof(ParcelHeader); }; } // namespace Service::android diff --git a/src/core/hle/service/prepo/prepo.cpp b/src/core/hle/service/prepo/prepo.cpp index 78f897d3e..01040b32a 100644 --- a/src/core/hle/service/prepo/prepo.cpp +++ b/src/core/hle/service/prepo/prepo.cpp @@ -63,7 +63,7 @@ private: return ctx.ReadBuffer(1); } - return std::vector{}; + return std::span{}; }(); LOG_DEBUG(Service_PREPO, @@ -90,7 +90,7 @@ private: return ctx.ReadBuffer(1); } - return std::vector{}; + return std::span{}; }(); LOG_DEBUG(Service_PREPO, @@ -142,7 +142,7 @@ private: return ctx.ReadBuffer(1); } - return std::vector{}; + return std::span{}; }(); LOG_DEBUG(Service_PREPO, "called, title_id={:016X}, data1_size={:016X}, data2_size={:016X}", @@ -166,7 +166,7 @@ private: return ctx.ReadBuffer(1); } - return std::vector{}; + return std::span{}; }(); LOG_DEBUG(Service_PREPO, diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp index 9e94a462f..bdb499268 100644 --- a/src/core/hle/service/sockets/bsd.cpp +++ b/src/core/hle/service/sockets/bsd.cpp @@ -208,7 +208,6 @@ void BSD::Bind(Kernel::HLERequestContext& ctx) { const s32 fd = rp.Pop(); LOG_DEBUG(Service, "called. fd={} addrlen={}", fd, ctx.GetReadBufferSize()); - BuildErrnoResponse(ctx, BindImpl(fd, ctx.ReadBuffer())); } @@ -312,7 +311,7 @@ void BSD::SetSockOpt(Kernel::HLERequestContext& ctx) { const u32 level = rp.Pop(); const OptName optname = static_cast(rp.Pop()); - const std::vector buffer = ctx.ReadBuffer(); + const auto buffer = ctx.ReadBuffer(); const u8* optval = buffer.empty() ? nullptr : buffer.data(); size_t optlen = buffer.size(); @@ -489,7 +488,7 @@ std::pair BSD::SocketImpl(Domain domain, Type type, Protocol protoco return {fd, Errno::SUCCESS}; } -std::pair BSD::PollImpl(std::vector& write_buffer, std::vector read_buffer, +std::pair BSD::PollImpl(std::vector& write_buffer, std::span read_buffer, s32 nfds, s32 timeout) { if (write_buffer.size() < nfds * sizeof(PollFD)) { return {-1, Errno::INVAL}; @@ -584,7 +583,7 @@ std::pair BSD::AcceptImpl(s32 fd, std::vector& write_buffer) { return {new_fd, Errno::SUCCESS}; } -Errno BSD::BindImpl(s32 fd, const std::vector& addr) { +Errno BSD::BindImpl(s32 fd, std::span addr) { if (!IsFileDescriptorValid(fd)) { return Errno::BADF; } @@ -595,7 +594,7 @@ Errno BSD::BindImpl(s32 fd, const std::vector& addr) { return Translate(file_descriptors[fd]->socket->Bind(Translate(addr_in))); } -Errno BSD::ConnectImpl(s32 fd, const std::vector& addr) { +Errno BSD::ConnectImpl(s32 fd, std::span addr) { if (!IsFileDescriptorValid(fd)) { return Errno::BADF; } @@ -800,15 +799,15 @@ std::pair BSD::RecvFromImpl(s32 fd, u32 flags, std::vector& mess return {ret, bsd_errno}; } -std::pair BSD::SendImpl(s32 fd, u32 flags, const std::vector& message) { +std::pair BSD::SendImpl(s32 fd, u32 flags, std::span message) { if (!IsFileDescriptorValid(fd)) { return {-1, Errno::BADF}; } return Translate(file_descriptors[fd]->socket->Send(message, flags)); } -std::pair BSD::SendToImpl(s32 fd, u32 flags, const std::vector& message, - const std::vector& addr) { +std::pair BSD::SendToImpl(s32 fd, u32 flags, std::span message, + std::span addr) { if (!IsFileDescriptorValid(fd)) { return {-1, Errno::BADF}; } diff --git a/src/core/hle/service/sockets/bsd.h b/src/core/hle/service/sockets/bsd.h index 81e855e0f..56bb3f8b1 100644 --- a/src/core/hle/service/sockets/bsd.h +++ b/src/core/hle/service/sockets/bsd.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include #include "common/common_types.h" @@ -44,7 +45,7 @@ private: s32 nfds; s32 timeout; - std::vector read_buffer; + std::span read_buffer; std::vector write_buffer; s32 ret{}; Errno bsd_errno{}; @@ -65,7 +66,7 @@ private: void Response(Kernel::HLERequestContext& ctx); s32 fd; - std::vector addr; + std::span addr; Errno bsd_errno{}; }; @@ -98,7 +99,7 @@ private: s32 fd; u32 flags; - std::vector message; + std::span message; s32 ret{}; Errno bsd_errno{}; }; @@ -109,8 +110,8 @@ private: s32 fd; u32 flags; - std::vector message; - std::vector addr; + std::span message; + std::span addr; s32 ret{}; Errno bsd_errno{}; }; @@ -143,11 +144,11 @@ private: void ExecuteWork(Kernel::HLERequestContext& ctx, Work work); std::pair SocketImpl(Domain domain, Type type, Protocol protocol); - std::pair PollImpl(std::vector& write_buffer, std::vector read_buffer, + std::pair PollImpl(std::vector& write_buffer, std::span read_buffer, s32 nfds, s32 timeout); std::pair AcceptImpl(s32 fd, std::vector& write_buffer); - Errno BindImpl(s32 fd, const std::vector& addr); - Errno ConnectImpl(s32 fd, const std::vector& addr); + Errno BindImpl(s32 fd, std::span addr); + Errno ConnectImpl(s32 fd, std::span addr); Errno GetPeerNameImpl(s32 fd, std::vector& write_buffer); Errno GetSockNameImpl(s32 fd, std::vector& write_buffer); Errno ListenImpl(s32 fd, s32 backlog); @@ -157,9 +158,9 @@ private: std::pair RecvImpl(s32 fd, u32 flags, std::vector& message); std::pair RecvFromImpl(s32 fd, u32 flags, std::vector& message, std::vector& addr); - std::pair SendImpl(s32 fd, u32 flags, const std::vector& message); - std::pair SendToImpl(s32 fd, u32 flags, const std::vector& message, - const std::vector& addr); + std::pair SendImpl(s32 fd, u32 flags, std::span message); + std::pair SendToImpl(s32 fd, u32 flags, std::span message, + std::span addr); Errno CloseImpl(s32 fd); s32 FindFreeFileDescriptorHandle() noexcept; diff --git a/src/core/hle/service/sockets/sfdnsres.cpp b/src/core/hle/service/sockets/sfdnsres.cpp index 097c37d7a..e96eda7f3 100644 --- a/src/core/hle/service/sockets/sfdnsres.cpp +++ b/src/core/hle/service/sockets/sfdnsres.cpp @@ -243,4 +243,4 @@ void SFDNSRES::GetAddrInfoRequestWithOptions(Kernel::HLERequestContext& ctx) { rb.Push(0); } -} // namespace Service::Sockets \ No newline at end of file +} // namespace Service::Sockets diff --git a/src/core/hle/service/ssl/ssl.cpp b/src/core/hle/service/ssl/ssl.cpp index 3735e0452..dcf47083f 100644 --- a/src/core/hle/service/ssl/ssl.cpp +++ b/src/core/hle/service/ssl/ssl.cpp @@ -101,7 +101,7 @@ private: void ImportServerPki(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto certificate_format = rp.PopEnum(); - const auto pkcs_12_certificates = ctx.ReadBuffer(0); + [[maybe_unused]] const auto pkcs_12_certificates = ctx.ReadBuffer(0); constexpr u64 server_id = 0; @@ -113,13 +113,13 @@ private: } void ImportClientPki(Kernel::HLERequestContext& ctx) { - const auto pkcs_12_certificate = ctx.ReadBuffer(0); - const auto ascii_password = [&ctx] { + [[maybe_unused]] const auto pkcs_12_certificate = ctx.ReadBuffer(0); + [[maybe_unused]] const auto ascii_password = [&ctx] { if (ctx.CanReadBuffer(1)) { return ctx.ReadBuffer(1); } - return std::vector{}; + return std::span{}; }(); constexpr u64 client_id = 0; diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index bb283e74e..2fb631183 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -603,7 +603,7 @@ private: return; } - const auto parcel = android::Parcel{NativeWindow{*buffer_queue_id}}; + const auto parcel = android::OutputParcel{NativeWindow{*buffer_queue_id}}; const auto buffer_size = ctx.WriteBuffer(parcel.Serialize()); IPC::ResponseBuilder rb{ctx, 4}; @@ -649,7 +649,7 @@ private: return; } - const auto parcel = android::Parcel{NativeWindow{*buffer_queue_id}}; + const auto parcel = android::OutputParcel{NativeWindow{*buffer_queue_id}}; const auto buffer_size = ctx.WriteBuffer(parcel.Serialize()); IPC::ResponseBuilder rb{ctx, 6}; diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index 282ea1ff9..7494fb62d 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -550,7 +550,7 @@ std::pair Socket::RecvFrom(int flags, std::vector& message, Sock return {-1, GetAndLogLastError()}; } -std::pair Socket::Send(const std::vector& message, int flags) { +std::pair Socket::Send(std::span message, int flags) { ASSERT(message.size() < static_cast(std::numeric_limits::max())); ASSERT(flags == 0); @@ -563,7 +563,7 @@ std::pair Socket::Send(const std::vector& message, int flags) { return {-1, GetAndLogLastError()}; } -std::pair Socket::SendTo(u32 flags, const std::vector& message, +std::pair Socket::SendTo(u32 flags, std::span message, const SockAddrIn* addr) { ASSERT(flags == 0); diff --git a/src/core/internal_network/socket_proxy.cpp b/src/core/internal_network/socket_proxy.cpp index 1e1c42cea..7a77171c2 100644 --- a/src/core/internal_network/socket_proxy.cpp +++ b/src/core/internal_network/socket_proxy.cpp @@ -182,7 +182,7 @@ std::pair ProxySocket::ReceivePacket(int flags, std::vector& mes return {static_cast(read_bytes), Errno::SUCCESS}; } -std::pair ProxySocket::Send(const std::vector& message, int flags) { +std::pair ProxySocket::Send(std::span message, int flags) { LOG_WARNING(Network, "(STUBBED) called"); ASSERT(message.size() < static_cast(std::numeric_limits::max())); ASSERT(flags == 0); @@ -200,7 +200,7 @@ void ProxySocket::SendPacket(ProxyPacket& packet) { } } -std::pair ProxySocket::SendTo(u32 flags, const std::vector& message, +std::pair ProxySocket::SendTo(u32 flags, std::span message, const SockAddrIn* addr) { ASSERT(flags == 0); diff --git a/src/core/internal_network/socket_proxy.h b/src/core/internal_network/socket_proxy.h index f12b5f567..9421492bc 100644 --- a/src/core/internal_network/socket_proxy.h +++ b/src/core/internal_network/socket_proxy.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include #include @@ -48,11 +49,11 @@ public: std::pair ReceivePacket(int flags, std::vector& message, SockAddrIn* addr, std::size_t max_length); - std::pair Send(const std::vector& message, int flags) override; + std::pair Send(std::span message, int flags) override; void SendPacket(ProxyPacket& packet); - std::pair SendTo(u32 flags, const std::vector& message, + std::pair SendTo(u32 flags, std::span message, const SockAddrIn* addr) override; Errno SetLinger(bool enable, u32 linger) override; diff --git a/src/core/internal_network/sockets.h b/src/core/internal_network/sockets.h index 2e328c645..4c7489258 100644 --- a/src/core/internal_network/sockets.h +++ b/src/core/internal_network/sockets.h @@ -5,6 +5,7 @@ #include #include +#include #include #if defined(_WIN32) @@ -66,9 +67,9 @@ public: virtual std::pair RecvFrom(int flags, std::vector& message, SockAddrIn* addr) = 0; - virtual std::pair Send(const std::vector& message, int flags) = 0; + virtual std::pair Send(std::span message, int flags) = 0; - virtual std::pair SendTo(u32 flags, const std::vector& message, + virtual std::pair SendTo(u32 flags, std::span message, const SockAddrIn* addr) = 0; virtual Errno SetLinger(bool enable, u32 linger) = 0; @@ -138,9 +139,9 @@ public: std::pair RecvFrom(int flags, std::vector& message, SockAddrIn* addr) override; - std::pair Send(const std::vector& message, int flags) override; + std::pair Send(std::span message, int flags) override; - std::pair SendTo(u32 flags, const std::vector& message, + std::pair SendTo(u32 flags, std::span message, const SockAddrIn* addr) override; Errno SetLinger(bool enable, u32 linger) override; diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp index 77821e047..59dfb8767 100644 --- a/src/core/reporter.cpp +++ b/src/core/reporter.cpp @@ -312,7 +312,7 @@ void Reporter::SaveUnimplementedAppletReport( } void Reporter::SavePlayReport(PlayReportType type, u64 title_id, - const std::vector>& data, + const std::vector>& data, std::optional process_id, std::optional user_id) const { if (!IsReportingEnabled()) { return; diff --git a/src/core/reporter.h b/src/core/reporter.h index 9fdb9d6c1..bb11f8e7c 100644 --- a/src/core/reporter.h +++ b/src/core/reporter.h @@ -5,6 +5,7 @@ #include #include +#include #include #include #include "common/common_types.h" @@ -56,7 +57,8 @@ public: System, }; - void SavePlayReport(PlayReportType type, u64 title_id, const std::vector>& data, + void SavePlayReport(PlayReportType type, u64 title_id, + const std::vector>& data, std::optional process_id = {}, std::optional user_id = {}) const; // Used by error applet From 979e4d9950bc7241460524a06e09e87147904d1a Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Fri, 3 Feb 2023 00:10:10 -0500 Subject: [PATCH 0021/1181] fsp_srv: Copy HLE Read Buffer for OutputAccessLogToSdCard --- src/core/hle/service/filesystem/fsp_srv.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index cab44bf9c..447d624e1 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp_srv.cpp @@ -1083,7 +1083,7 @@ void FSP_SRV::GetGlobalAccessLogMode(Kernel::HLERequestContext& ctx) { } void FSP_SRV::OutputAccessLogToSdCard(Kernel::HLERequestContext& ctx) { - const auto raw = ctx.ReadBuffer(); + const auto raw = ctx.ReadBufferCopy(); auto log = Common::StringFromFixedZeroTerminatedBuffer( reinterpret_cast(raw.data()), raw.size()); From 2a491f7aaa6977b7818b37a87fb8d2be8d1351c9 Mon Sep 17 00:00:00 2001 From: Jonas Gutenschwager Date: Sat, 4 Feb 2023 00:00:20 +0100 Subject: [PATCH 0022/1181] remove disambiguation argument from mute text Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> --- src/yuzu/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index b85541619..c278620ab 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -3973,7 +3973,7 @@ void GMainWindow::UpdateVolumeUI() { volume_slider->setValue(volume_value); if (Settings::values.audio_muted) { volume_button->setChecked(false); - volume_button->setText(tr("VOLUME: MUTE", "Volume percentage (e.g. 50%)")); + volume_button->setText(tr("VOLUME: MUTE")); } else { volume_button->setChecked(true); volume_button->setText(tr("VOLUME: %1%", "Volume percentage (e.g. 50%)").arg(volume_value)); From 4678f534638ebeb40b1fd56798c480ab5ab27059 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Sat, 4 Feb 2023 00:13:47 -0500 Subject: [PATCH 0023/1181] shader_recompiler/value.h: Remove lingering references to S32 --- src/shader_recompiler/frontend/ir/value.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/shader_recompiler/frontend/ir/value.h b/src/shader_recompiler/frontend/ir/value.h index 22e89dd1b..c27546b0e 100644 --- a/src/shader_recompiler/frontend/ir/value.h +++ b/src/shader_recompiler/frontend/ir/value.h @@ -43,7 +43,6 @@ public: explicit Value(u8 value) noexcept; explicit Value(u16 value) noexcept; explicit Value(u32 value) noexcept; - explicit Value(s32 value) noexcept; explicit Value(f32 value) noexcept; explicit Value(u64 value) noexcept; explicit Value(f64 value) noexcept; @@ -66,7 +65,6 @@ public: [[nodiscard]] u8 U8() const; [[nodiscard]] u16 U16() const; [[nodiscard]] u32 U32() const; - [[nodiscard]] s32 S32() const; [[nodiscard]] f32 F32() const; [[nodiscard]] u64 U64() const; [[nodiscard]] f64 F64() const; @@ -86,7 +84,6 @@ private: u8 imm_u8; u16 imm_u16; u32 imm_u32; - s32 imm_s32; f32 imm_f32; u64 imm_u64; f64 imm_f64; @@ -378,14 +375,6 @@ inline u32 Value::U32() const { return imm_u32; } -inline s32 Value::S32() const { - if (IsIdentity()) { - return inst->Arg(0).S32(); - } - DEBUG_ASSERT(type == Type::S32); - return imm_s32; -} - inline f32 Value::F32() const { if (IsIdentity()) { return inst->Arg(0).F32(); From 424643f9af91ff704f1bebfd9150f8ff153bdda5 Mon Sep 17 00:00:00 2001 From: german77 Date: Sat, 4 Feb 2023 10:31:12 -0600 Subject: [PATCH 0024/1181] yuzu_cmd: Fix touch input --- src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 44 ++++++++------------- src/yuzu_cmd/emu_window/emu_window_sdl2.h | 10 ++--- 2 files changed, 21 insertions(+), 33 deletions(-) diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index 31f28a507..e2dfe3a9b 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp @@ -32,10 +32,6 @@ EmuWindow_SDL2::~EmuWindow_SDL2() { SDL_Quit(); } -void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) { - input_subsystem->GetMouse()->MouseMove(x, y, 0, 0, 0, 0); -} - InputCommon::MouseButton EmuWindow_SDL2::SDLButtonToMouseButton(u32 button) const { switch (button) { case SDL_BUTTON_LEFT: @@ -53,44 +49,36 @@ InputCommon::MouseButton EmuWindow_SDL2::SDLButtonToMouseButton(u32 button) cons } } +std::pair EmuWindow_SDL2::MouseToTouchPos(s32 touch_x, s32 touch_y) const { + int w, h; + SDL_GetWindowSize(render_window, &w, &h); + const float fx = static_cast(touch_x) / w; + const float fy = static_cast(touch_y) / h; + + return {std::clamp(fx, 0.0f, 1.0f), std::clamp(fy, 0.0f, 1.0f)}; +} + void EmuWindow_SDL2::OnMouseButton(u32 button, u8 state, s32 x, s32 y) { const auto mouse_button = SDLButtonToMouseButton(button); if (state == SDL_PRESSED) { - input_subsystem->GetMouse()->PressButton(x, y, 0, 0, mouse_button); + const auto [touch_x, touch_y] = MouseToTouchPos(x, y); + input_subsystem->GetMouse()->PressButton(x, y, touch_x, touch_y, mouse_button); } else { input_subsystem->GetMouse()->ReleaseButton(mouse_button); } } -std::pair EmuWindow_SDL2::TouchToPixelPos(float touch_x, float touch_y) const { - int w, h; - SDL_GetWindowSize(render_window, &w, &h); - - touch_x *= w; - touch_y *= h; - - return {static_cast(std::max(std::round(touch_x), 0.0f)), - static_cast(std::max(std::round(touch_y), 0.0f))}; +void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) { + const auto [touch_x, touch_y] = MouseToTouchPos(x, y); + input_subsystem->GetMouse()->MouseMove(x, y, touch_x, touch_y, 0, 0); } void EmuWindow_SDL2::OnFingerDown(float x, float y, std::size_t id) { - int width, height; - SDL_GetWindowSize(render_window, &width, &height); - const auto [px, py] = TouchToPixelPos(x, y); - const float fx = px * 1.0f / width; - const float fy = py * 1.0f / height; - - input_subsystem->GetTouchScreen()->TouchPressed(fx, fy, id); + input_subsystem->GetTouchScreen()->TouchPressed(x, y, id); } void EmuWindow_SDL2::OnFingerMotion(float x, float y, std::size_t id) { - int width, height; - SDL_GetWindowSize(render_window, &width, &height); - const auto [px, py] = TouchToPixelPos(x, y); - const float fx = px * 1.0f / width; - const float fy = py * 1.0f / height; - - input_subsystem->GetTouchScreen()->TouchMoved(fx, fy, id); + input_subsystem->GetTouchScreen()->TouchMoved(x, y, id); } void EmuWindow_SDL2::OnFingerUp() { diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.h b/src/yuzu_cmd/emu_window/emu_window_sdl2.h index 25c23e2a5..d9b453dee 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.h +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.h @@ -38,17 +38,17 @@ protected: /// Called by WaitEvent when a key is pressed or released. void OnKeyEvent(int key, u8 state); - /// Called by WaitEvent when the mouse moves. - void OnMouseMotion(s32 x, s32 y); - /// Converts a SDL mouse button into MouseInput mouse button InputCommon::MouseButton SDLButtonToMouseButton(u32 button) const; + /// Translates pixel position to float position + std::pair MouseToTouchPos(s32 touch_x, s32 touch_y) const; + /// Called by WaitEvent when a mouse button is pressed or released void OnMouseButton(u32 button, u8 state, s32 x, s32 y); - /// Translates pixel position (0..1) to pixel positions - std::pair TouchToPixelPos(float touch_x, float touch_y) const; + /// Called by WaitEvent when the mouse moves. + void OnMouseMotion(s32 x, s32 y); /// Called by WaitEvent when a finger starts touching the touchscreen void OnFingerDown(float x, float y, std::size_t id); From ebca59b8e9f7304e8880c3db64c383d9ddc4a7b8 Mon Sep 17 00:00:00 2001 From: german77 Date: Sat, 4 Feb 2023 10:59:14 -0600 Subject: [PATCH 0025/1181] yuzu_cmd: Fix mismatching controller input --- src/yuzu_cmd/config.cpp | 3 +++ src/yuzu_cmd/default_ini.h | 13 +++++++++++++ src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 527017282..9c34cdc6e 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -176,6 +176,9 @@ void Config::ReadValues() { Settings::values.debug_pad_analogs[i] = default_param; } + ReadSetting("ControlsGeneral", Settings::values.enable_raw_input); + ReadSetting("ControlsGeneral", Settings::values.enable_joycon_driver); + ReadSetting("ControlsGeneral", Settings::values.emulate_analog_keyboard); ReadSetting("ControlsGeneral", Settings::values.vibration_enabled); ReadSetting("ControlsGeneral", Settings::values.enable_accurate_vibrations); ReadSetting("ControlsGeneral", Settings::values.motion_enabled); diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 67d230462..3f3651dbe 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -14,6 +14,7 @@ const char* sdl2_config_file = # Escape characters $0 (for ':'), $1 (for ',') and $2 (for '$') can be used in values # Indicates if this player should be connected at boot +# 0 (default): Disabled, 1: Enabled connected= # for button input, the following devices are available: @@ -94,6 +95,18 @@ motionright= # 0 (default): Disabled, 1: Enabled debug_pad_enabled = +# Enable sdl raw input. Allows to configure up to 8 xinput controllers. +# 0 (default): Disabled, 1: Enabled +enable_raw_input = + +# Enable yuzu joycon driver instead of SDL drive. +# 0: Disabled, 1 (default): Enabled +enable_joycon_driver = + +# Emulates an analog input from buttons. Allowing to dial any angle. +# 0 (default): Disabled, 1: Enabled +emulate_analog_keyboard = + # Whether to enable or disable vibration # 0: Disabled, 1 (default): Enabled vibration_enabled= diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index e2dfe3a9b..5450b8c38 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp @@ -18,11 +18,11 @@ EmuWindow_SDL2::EmuWindow_SDL2(InputCommon::InputSubsystem* input_subsystem_, Core::System& system_) : input_subsystem{input_subsystem_}, system{system_} { - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) { + input_subsystem->Initialize(); + if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) < 0) { LOG_CRITICAL(Frontend, "Failed to initialize SDL2! Exiting..."); exit(1); } - input_subsystem->Initialize(); SDL_SetMainReady(); } From 3cd0b816cc924446e2da5fcdb5af8b3597830ffa Mon Sep 17 00:00:00 2001 From: german77 Date: Sat, 4 Feb 2023 11:32:14 -0600 Subject: [PATCH 0026/1181] yuzu_cmd: Order arguments alphabetically and port arguments from Qt --- src/yuzu_cmd/yuzu.cpp | 57 ++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 91133569d..d1f7b1d49 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -62,13 +62,15 @@ __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1; static void PrintHelp(const char* argv0) { std::cout << "Usage: " << argv0 << " [options] \n" + "-c, --config Load the specified configuration file\n" + "-f, --fullscreen Start in fullscreen mode\n" + "-g, --game File path of the game to load\n" + "-h, --help Display this help and exit\n" "-m, --multiplayer=nick:password@address:port" " Nickname, password, address and port for multiplayer\n" - "-f, --fullscreen Start in fullscreen mode\n" - "-h, --help Display this help and exit\n" - "-v, --version Output version information and exit\n" "-p, --program Pass following string as arguments to executable\n" - "-c, --config Load the specified configuration file\n"; + "-u, --user Select a specific user profile from 0 to 7\n" + "-v, --version Output version information and exit\n"; } static void PrintVersion() { @@ -199,6 +201,7 @@ int main(int argc, char** argv) { std::string filepath; std::optional config_path; std::string program_args; + std::optional selected_user; bool use_multiplayer = false; bool fullscreen = false; @@ -209,12 +212,14 @@ int main(int argc, char** argv) { static struct option long_options[] = { // clang-format off - {"multiplayer", required_argument, 0, 'm'}, + {"config", required_argument, 0, 'c'}, {"fullscreen", no_argument, 0, 'f'}, {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'v'}, + {"game", required_argument, 0, 'g'}, + {"multiplayer", required_argument, 0, 'm'}, {"program", optional_argument, 0, 'p'}, - {"config", required_argument, 0, 'c'}, + {"user", required_argument, 0, 'u'}, + {"version", no_argument, 0, 'v'}, {0, 0, 0, 0}, // clang-format on }; @@ -223,6 +228,21 @@ int main(int argc, char** argv) { int arg = getopt_long(argc, argv, "g:fhvp::c:", long_options, &option_index); if (arg != -1) { switch (static_cast(arg)) { + case 'c': + config_path = optarg; + break; + case 'f': + fullscreen = true; + LOG_INFO(Frontend, "Starting in fullscreen mode..."); + break; + case 'h': + PrintHelp(argv[0]); + return 0; + case 'g': { + const std::string str_arg(optarg); + filepath = str_arg; + break; + } case 'm': { use_multiplayer = true; const std::string str_arg(optarg); @@ -255,23 +275,16 @@ int main(int argc, char** argv) { } break; } - case 'f': - fullscreen = true; - LOG_INFO(Frontend, "Starting in fullscreen mode..."); - break; - case 'h': - PrintHelp(argv[0]); - return 0; - case 'v': - PrintVersion(); - return 0; case 'p': program_args = argv[optind]; ++optind; break; - case 'c': - config_path = optarg; - break; + case 'u': + selected_user = atoi(optarg); + return 0; + case 'v': + PrintVersion(); + return 0; } } else { #ifdef _WIN32 @@ -295,6 +308,10 @@ int main(int argc, char** argv) { Settings::values.program_args = program_args; } + if (selected_user.has_value()) { + Settings::values.current_user = std::clamp(*selected_user, 0, 7); + } + #ifdef _WIN32 LocalFree(argv_w); #endif From 923c17f1ae36ab7ed4666230282b303d70734f2e Mon Sep 17 00:00:00 2001 From: Sorab Date: Fri, 3 Feb 2023 15:49:29 +1100 Subject: [PATCH 0027/1181] Add Game Icon for Discord RPC Connected to Yuzu Compatibility Page --- src/yuzu/CMakeLists.txt | 2 +- src/yuzu/discord_impl.cpp | 67 +++++++++++++++++++++++++++++++++++---- 2 files changed, 61 insertions(+), 8 deletions(-) diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index dfc675cc8..06d982d9b 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -353,7 +353,7 @@ if (USE_DISCORD_PRESENCE) discord_impl.cpp discord_impl.h ) - target_link_libraries(yuzu PRIVATE DiscordRPC::discord-rpc) + target_link_libraries(yuzu PRIVATE DiscordRPC::discord-rpc httplib::httplib) target_compile_definitions(yuzu PRIVATE -DUSE_DISCORD_PRESENCE) endif() diff --git a/src/yuzu/discord_impl.cpp b/src/yuzu/discord_impl.cpp index c351e9b83..de0c307d4 100644 --- a/src/yuzu/discord_impl.cpp +++ b/src/yuzu/discord_impl.cpp @@ -4,7 +4,10 @@ #include #include #include +#include +#include #include "common/common_types.h" +#include "common/string_util.h" #include "core/core.h" #include "core/loader/loader.h" #include "yuzu/discord_impl.h" @@ -14,7 +17,6 @@ namespace DiscordRPC { DiscordImpl::DiscordImpl(Core::System& system_) : system{system_} { DiscordEventHandlers handlers{}; - // The number is the client ID for yuzu, it's used for images and the // application name Discord_Initialize("712465656758665259", &handlers, 1, nullptr); @@ -29,23 +31,74 @@ void DiscordImpl::Pause() { Discord_ClearPresence(); } +static std::string GetGameString(const std::string& title) { + // Convert to lowercase + std::string icon_name = Common::ToLower(title); + + // Replace spaces with dashes + std::replace(icon_name.begin(), icon_name.end(), ' ', '-'); + + // Remove non-alphanumeric characters but keep dashes + std::erase_if(icon_name, [](char c) { return !std::isalnum(c) && c != '-'; }); + + // Remove dashes from the start and end of the string + icon_name.erase(icon_name.begin(), std::find_if(icon_name.begin(), icon_name.end(), + [](int ch) { return ch != '-'; })); + icon_name.erase( + std::find_if(icon_name.rbegin(), icon_name.rend(), [](int ch) { return ch != '-'; }).base(), + icon_name.end()); + + // Remove double dashes + icon_name.erase(std::unique(icon_name.begin(), icon_name.end(), + [](char a, char b) { return a == '-' && b == '-'; }), + icon_name.end()); + + return icon_name; +} + void DiscordImpl::Update() { s64 start_time = std::chrono::duration_cast( std::chrono::system_clock::now().time_since_epoch()) .count(); + const std::string default_text = "yuzu is an emulator for the Nintendo Switch"; + const std::string default_image = "yuzu_logo"; + std::string game_cover_url = "https://yuzu-emu.org"; std::string title; + + DiscordRichPresence presence{}; + if (system.IsPoweredOn()) { system.GetAppLoader().ReadTitle(title); - } - DiscordRichPresence presence{}; - presence.largeImageKey = "yuzu_logo"; - presence.largeImageText = "yuzu is an emulator for the Nintendo Switch"; - if (system.IsPoweredOn()) { + + // Used to format Icon URL for yuzu website game compatibility page + std::string icon_name = GetGameString(title); + + // New Check for game cover + httplib::Client cli(game_cover_url); + + if (auto res = cli.Head(fmt::format("/images/game/boxart/{}.png", icon_name).c_str())) { + if (res->status == 200) { + game_cover_url += fmt::format("/images/game/boxart/{}.png", icon_name); + } else { + game_cover_url = "yuzu_logo"; + } + } else { + game_cover_url = "yuzu_logo"; + } + + presence.largeImageKey = game_cover_url.c_str(); + presence.largeImageText = title.c_str(); + + presence.smallImageKey = default_image.c_str(); + presence.smallImageText = default_text.c_str(); presence.state = title.c_str(); presence.details = "Currently in game"; } else { - presence.details = "Not in game"; + presence.largeImageKey = default_image.c_str(); + presence.largeImageText = default_text.c_str(); + presence.details = "Currently not in game"; } + presence.startTimestamp = start_time; Discord_UpdatePresence(&presence); } From 92eb091ddb9dfd96e59a75937e185079a63626e3 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 4 Oct 2022 20:15:40 -0400 Subject: [PATCH 0028/1181] kernel/svc: Split implementations into separate files --- src/core/CMakeLists.txt | 37 +- src/core/hle/kernel/svc.cpp | 2686 +---------------- src/core/hle/kernel/svc.h | 156 + src/core/hle/kernel/svc/svc_activity.cpp | 44 + .../hle/kernel/svc/svc_address_arbiter.cpp | 113 + .../kernel/svc/svc_address_translation.cpp | 6 + src/core/hle/kernel/svc/svc_cache.cpp | 31 + src/core/hle/kernel/svc/svc_code_memory.cpp | 154 + .../hle/kernel/svc/svc_condition_variable.cpp | 69 + src/core/hle/kernel/svc/svc_debug.cpp | 6 + src/core/hle/kernel/svc/svc_debug_string.cpp | 25 + .../kernel/svc/svc_device_address_space.cpp | 6 + src/core/hle/kernel/svc/svc_event.cpp | 111 + src/core/hle/kernel/svc/svc_exception.cpp | 121 + src/core/hle/kernel/svc/svc_info.cpp | 282 ++ .../hle/kernel/svc/svc_interrupt_event.cpp | 6 + src/core/hle/kernel/svc/svc_io_pool.cpp | 6 + src/core/hle/kernel/svc/svc_ipc.cpp | 89 + src/core/hle/kernel/svc/svc_kernel_debug.cpp | 19 + src/core/hle/kernel/svc/svc_light_ipc.cpp | 6 + src/core/hle/kernel/svc/svc_lock.cpp | 57 + src/core/hle/kernel/svc/svc_memory.cpp | 189 ++ .../hle/kernel/svc/svc_physical_memory.cpp | 137 + src/core/hle/kernel/svc/svc_port.cpp | 71 + .../hle/kernel/svc/svc_power_management.cpp | 6 + src/core/hle/kernel/svc/svc_process.cpp | 124 + .../hle/kernel/svc/svc_process_memory.cpp | 274 ++ src/core/hle/kernel/svc/svc_processor.cpp | 21 + src/core/hle/kernel/svc/svc_query_memory.cpp | 55 + src/core/hle/kernel/svc/svc_register.cpp | 6 + .../hle/kernel/svc/svc_resource_limit.cpp | 95 + .../kernel/svc/svc_secure_monitor_call.cpp | 6 + src/core/hle/kernel/svc/svc_session.cpp | 103 + src/core/hle/kernel/svc/svc_shared_memory.cpp | 106 + .../hle/kernel/svc/svc_synchronization.cpp | 139 + src/core/hle/kernel/svc/svc_thread.cpp | 396 +++ .../hle/kernel/svc/svc_thread_profiler.cpp | 6 + src/core/hle/kernel/svc/svc_tick.cpp | 33 + .../hle/kernel/svc/svc_transfer_memory.cpp | 79 + src/core/hle/kernel/svc_wrap.h | 8 +- 40 files changed, 3196 insertions(+), 2688 deletions(-) create mode 100644 src/core/hle/kernel/svc/svc_activity.cpp create mode 100644 src/core/hle/kernel/svc/svc_address_arbiter.cpp create mode 100644 src/core/hle/kernel/svc/svc_address_translation.cpp create mode 100644 src/core/hle/kernel/svc/svc_cache.cpp create mode 100644 src/core/hle/kernel/svc/svc_code_memory.cpp create mode 100644 src/core/hle/kernel/svc/svc_condition_variable.cpp create mode 100644 src/core/hle/kernel/svc/svc_debug.cpp create mode 100644 src/core/hle/kernel/svc/svc_debug_string.cpp create mode 100644 src/core/hle/kernel/svc/svc_device_address_space.cpp create mode 100644 src/core/hle/kernel/svc/svc_event.cpp create mode 100644 src/core/hle/kernel/svc/svc_exception.cpp create mode 100644 src/core/hle/kernel/svc/svc_info.cpp create mode 100644 src/core/hle/kernel/svc/svc_interrupt_event.cpp create mode 100644 src/core/hle/kernel/svc/svc_io_pool.cpp create mode 100644 src/core/hle/kernel/svc/svc_ipc.cpp create mode 100644 src/core/hle/kernel/svc/svc_kernel_debug.cpp create mode 100644 src/core/hle/kernel/svc/svc_light_ipc.cpp create mode 100644 src/core/hle/kernel/svc/svc_lock.cpp create mode 100644 src/core/hle/kernel/svc/svc_memory.cpp create mode 100644 src/core/hle/kernel/svc/svc_physical_memory.cpp create mode 100644 src/core/hle/kernel/svc/svc_port.cpp create mode 100644 src/core/hle/kernel/svc/svc_power_management.cpp create mode 100644 src/core/hle/kernel/svc/svc_process.cpp create mode 100644 src/core/hle/kernel/svc/svc_process_memory.cpp create mode 100644 src/core/hle/kernel/svc/svc_processor.cpp create mode 100644 src/core/hle/kernel/svc/svc_query_memory.cpp create mode 100644 src/core/hle/kernel/svc/svc_register.cpp create mode 100644 src/core/hle/kernel/svc/svc_resource_limit.cpp create mode 100644 src/core/hle/kernel/svc/svc_secure_monitor_call.cpp create mode 100644 src/core/hle/kernel/svc/svc_session.cpp create mode 100644 src/core/hle/kernel/svc/svc_shared_memory.cpp create mode 100644 src/core/hle/kernel/svc/svc_synchronization.cpp create mode 100644 src/core/hle/kernel/svc/svc_thread.cpp create mode 100644 src/core/hle/kernel/svc/svc_thread_profiler.cpp create mode 100644 src/core/hle/kernel/svc/svc_tick.cpp create mode 100644 src/core/hle/kernel/svc/svc_transfer_memory.cpp diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 112c61b80..f16072e6c 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -298,7 +298,42 @@ add_library(core STATIC hle/kernel/svc.h hle/kernel/svc_common.h hle/kernel/svc_types.h - hle/kernel/svc_wrap.h + hle/kernel/svc/svc_activity.cpp + hle/kernel/svc/svc_address_arbiter.cpp + hle/kernel/svc/svc_address_translation.cpp + hle/kernel/svc/svc_cache.cpp + hle/kernel/svc/svc_code_memory.cpp + hle/kernel/svc/svc_condition_variable.cpp + hle/kernel/svc/svc_debug.cpp + hle/kernel/svc/svc_debug_string.cpp + hle/kernel/svc/svc_device_address_space.cpp + hle/kernel/svc/svc_event.cpp + hle/kernel/svc/svc_exception.cpp + hle/kernel/svc/svc_info.cpp + hle/kernel/svc/svc_interrupt_event.cpp + hle/kernel/svc/svc_io_pool.cpp + hle/kernel/svc/svc_ipc.cpp + hle/kernel/svc/svc_kernel_debug.cpp + hle/kernel/svc/svc_light_ipc.cpp + hle/kernel/svc/svc_lock.cpp + hle/kernel/svc/svc_memory.cpp + hle/kernel/svc/svc_physical_memory.cpp + hle/kernel/svc/svc_port.cpp + hle/kernel/svc/svc_power_management.cpp + hle/kernel/svc/svc_process.cpp + hle/kernel/svc/svc_process_memory.cpp + hle/kernel/svc/svc_processor.cpp + hle/kernel/svc/svc_query_memory.cpp + hle/kernel/svc/svc_register.cpp + hle/kernel/svc/svc_resource_limit.cpp + hle/kernel/svc/svc_secure_monitor_call.cpp + hle/kernel/svc/svc_session.cpp + hle/kernel/svc/svc_shared_memory.cpp + hle/kernel/svc/svc_synchronization.cpp + hle/kernel/svc/svc_thread.cpp + hle/kernel/svc/svc_thread_profiler.cpp + hle/kernel/svc/svc_tick.cpp + hle/kernel/svc/svc_transfer_memory.cpp hle/result.h hle/service/acc/acc.cpp hle/service/acc/acc.h diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 67fa5d71c..4cb6f40a0 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -1,2697 +1,16 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include -#include -#include -#include -#include - -#include "common/alignment.h" -#include "common/assert.h" -#include "common/common_funcs.h" -#include "common/fiber.h" -#include "common/logging/log.h" -#include "common/scope_exit.h" -#include "core/core.h" -#include "core/core_timing.h" -#include "core/debugger/debugger.h" -#include "core/hle/kernel/k_client_port.h" -#include "core/hle/kernel/k_client_session.h" -#include "core/hle/kernel/k_code_memory.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_handle_table.h" -#include "core/hle/kernel/k_memory_block.h" -#include "core/hle/kernel/k_memory_layout.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_port.h" +#include "common/common_types.h" #include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/kernel/k_resource_limit.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_session.h" -#include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/kernel/k_synchronization_object.h" #include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_thread_queue.h" -#include "core/hle/kernel/k_transfer_memory.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/physical_core.h" #include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" -#include "core/hle/kernel/svc_types.h" #include "core/hle/kernel/svc_wrap.h" #include "core/hle/result.h" -#include "core/memory.h" -#include "core/reporter.h" namespace Kernel::Svc { namespace { -// Checks if address + size is greater than the given address -// This can return false if the size causes an overflow of a 64-bit type -// or if the given size is zero. -constexpr bool IsValidAddressRange(VAddr address, u64 size) { - return address + size > address; -} - -// Helper function that performs the common sanity checks for svcMapMemory -// and svcUnmapMemory. This is doable, as both functions perform their sanitizing -// in the same order. -Result MapUnmapMemorySanityChecks(const KPageTable& manager, VAddr dst_addr, VAddr src_addr, - u64 size) { - if (!Common::Is4KBAligned(dst_addr)) { - LOG_ERROR(Kernel_SVC, "Destination address is not aligned to 4KB, 0x{:016X}", dst_addr); - return ResultInvalidAddress; - } - - if (!Common::Is4KBAligned(src_addr)) { - LOG_ERROR(Kernel_SVC, "Source address is not aligned to 4KB, 0x{:016X}", src_addr); - return ResultInvalidSize; - } - - if (size == 0) { - LOG_ERROR(Kernel_SVC, "Size is 0"); - return ResultInvalidSize; - } - - if (!Common::Is4KBAligned(size)) { - LOG_ERROR(Kernel_SVC, "Size is not aligned to 4KB, 0x{:016X}", size); - return ResultInvalidSize; - } - - if (!IsValidAddressRange(dst_addr, size)) { - LOG_ERROR(Kernel_SVC, - "Destination is not a valid address range, addr=0x{:016X}, size=0x{:016X}", - dst_addr, size); - return ResultInvalidCurrentMemory; - } - - if (!IsValidAddressRange(src_addr, size)) { - LOG_ERROR(Kernel_SVC, "Source is not a valid address range, addr=0x{:016X}, size=0x{:016X}", - src_addr, size); - return ResultInvalidCurrentMemory; - } - - if (!manager.IsInsideAddressSpace(src_addr, size)) { - LOG_ERROR(Kernel_SVC, - "Source is not within the address space, addr=0x{:016X}, size=0x{:016X}", - src_addr, size); - return ResultInvalidCurrentMemory; - } - - if (manager.IsOutsideStackRegion(dst_addr, size)) { - LOG_ERROR(Kernel_SVC, - "Destination is not within the stack region, addr=0x{:016X}, size=0x{:016X}", - dst_addr, size); - return ResultInvalidMemoryRegion; - } - - if (manager.IsInsideHeapRegion(dst_addr, size)) { - LOG_ERROR(Kernel_SVC, - "Destination does not fit within the heap region, addr=0x{:016X}, " - "size=0x{:016X}", - dst_addr, size); - return ResultInvalidMemoryRegion; - } - - if (manager.IsInsideAliasRegion(dst_addr, size)) { - LOG_ERROR(Kernel_SVC, - "Destination does not fit within the map region, addr=0x{:016X}, " - "size=0x{:016X}", - dst_addr, size); - return ResultInvalidMemoryRegion; - } - - return ResultSuccess; -} - -enum class ResourceLimitValueType { - CurrentValue, - LimitValue, - PeakValue, -}; - -} // Anonymous namespace - -/// Set the process heap to a given Size. It can both extend and shrink the heap. -static Result SetHeapSize(Core::System& system, VAddr* out_address, u64 size) { - LOG_TRACE(Kernel_SVC, "called, heap_size=0x{:X}", size); - - // Validate size. - R_UNLESS(Common::IsAligned(size, HeapSizeAlignment), ResultInvalidSize); - R_UNLESS(size < MainMemorySizeMax, ResultInvalidSize); - - // Set the heap size. - R_TRY(system.Kernel().CurrentProcess()->PageTable().SetHeapSize(out_address, size)); - - return ResultSuccess; -} - -static Result SetHeapSize32(Core::System& system, u32* heap_addr, u32 heap_size) { - VAddr temp_heap_addr{}; - const Result result{SetHeapSize(system, &temp_heap_addr, heap_size)}; - *heap_addr = static_cast(temp_heap_addr); - return result; -} - -constexpr bool IsValidSetMemoryPermission(MemoryPermission perm) { - switch (perm) { - case MemoryPermission::None: - case MemoryPermission::Read: - case MemoryPermission::ReadWrite: - return true; - default: - return false; - } -} - -static Result SetMemoryPermission(Core::System& system, VAddr address, u64 size, - MemoryPermission perm) { - LOG_DEBUG(Kernel_SVC, "called, address=0x{:016X}, size=0x{:X}, perm=0x{:08X", address, size, - perm); - - // Validate address / size. - R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); - R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); - R_UNLESS(size > 0, ResultInvalidSize); - R_UNLESS((address < address + size), ResultInvalidCurrentMemory); - - // Validate the permission. - R_UNLESS(IsValidSetMemoryPermission(perm), ResultInvalidNewMemoryPermission); - - // Validate that the region is in range for the current process. - auto& page_table = system.Kernel().CurrentProcess()->PageTable(); - R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory); - - // Set the memory attribute. - return page_table.SetMemoryPermission(address, size, perm); -} - -static Result SetMemoryAttribute(Core::System& system, VAddr address, u64 size, u32 mask, - u32 attr) { - LOG_DEBUG(Kernel_SVC, - "called, address=0x{:016X}, size=0x{:X}, mask=0x{:08X}, attribute=0x{:08X}", address, - size, mask, attr); - - // Validate address / size. - R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); - R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); - R_UNLESS(size > 0, ResultInvalidSize); - R_UNLESS((address < address + size), ResultInvalidCurrentMemory); - - // Validate the attribute and mask. - constexpr u32 SupportedMask = static_cast(MemoryAttribute::Uncached); - R_UNLESS((mask | attr) == mask, ResultInvalidCombination); - R_UNLESS((mask | attr | SupportedMask) == SupportedMask, ResultInvalidCombination); - - // Validate that the region is in range for the current process. - auto& page_table{system.Kernel().CurrentProcess()->PageTable()}; - R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory); - - // Set the memory attribute. - return page_table.SetMemoryAttribute(address, size, mask, attr); -} - -static Result SetMemoryAttribute32(Core::System& system, u32 address, u32 size, u32 mask, - u32 attr) { - return SetMemoryAttribute(system, address, size, mask, attr); -} - -/// Maps a memory range into a different range. -static Result MapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size) { - LOG_TRACE(Kernel_SVC, "called, dst_addr=0x{:X}, src_addr=0x{:X}, size=0x{:X}", dst_addr, - src_addr, size); - - auto& page_table{system.Kernel().CurrentProcess()->PageTable()}; - - if (const Result result{MapUnmapMemorySanityChecks(page_table, dst_addr, src_addr, size)}; - result.IsError()) { - return result; - } - - return page_table.MapMemory(dst_addr, src_addr, size); -} - -static Result MapMemory32(Core::System& system, u32 dst_addr, u32 src_addr, u32 size) { - return MapMemory(system, dst_addr, src_addr, size); -} - -/// Unmaps a region that was previously mapped with svcMapMemory -static Result UnmapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size) { - LOG_TRACE(Kernel_SVC, "called, dst_addr=0x{:X}, src_addr=0x{:X}, size=0x{:X}", dst_addr, - src_addr, size); - - auto& page_table{system.Kernel().CurrentProcess()->PageTable()}; - - if (const Result result{MapUnmapMemorySanityChecks(page_table, dst_addr, src_addr, size)}; - result.IsError()) { - return result; - } - - return page_table.UnmapMemory(dst_addr, src_addr, size); -} - -static Result UnmapMemory32(Core::System& system, u32 dst_addr, u32 src_addr, u32 size) { - return UnmapMemory(system, dst_addr, src_addr, size); -} - -template -Result CreateSession(Core::System& system, Handle* out_server, Handle* out_client, u64 name) { - auto& process = *system.CurrentProcess(); - auto& handle_table = process.GetHandleTable(); - - // Declare the session we're going to allocate. - T* session; - - // Reserve a new session from the process resource limit. - // FIXME: LimitableResource_SessionCountMax - KScopedResourceReservation session_reservation(&process, LimitableResource::SessionCountMax); - if (session_reservation.Succeeded()) { - session = T::Create(system.Kernel()); - } else { - return ResultLimitReached; - - // // We couldn't reserve a session. Check that we support dynamically expanding the - // // resource limit. - // R_UNLESS(process.GetResourceLimit() == - // &system.Kernel().GetSystemResourceLimit(), ResultLimitReached); - // R_UNLESS(KTargetSystem::IsDynamicResourceLimitsEnabled(), ResultLimitReached()); - - // // Try to allocate a session from unused slab memory. - // session = T::CreateFromUnusedSlabMemory(); - // R_UNLESS(session != nullptr, ResultLimitReached); - // ON_RESULT_FAILURE { session->Close(); }; - - // // If we're creating a KSession, we want to add two KSessionRequests to the heap, to - // // prevent request exhaustion. - // // NOTE: Nintendo checks if session->DynamicCast() != nullptr, but there's - // // no reason to not do this statically. - // if constexpr (std::same_as) { - // for (size_t i = 0; i < 2; i++) { - // KSessionRequest* request = KSessionRequest::CreateFromUnusedSlabMemory(); - // R_UNLESS(request != nullptr, ResultLimitReached); - // request->Close(); - // } - // } - - // We successfully allocated a session, so add the object we allocated to the resource - // limit. - // system.Kernel().GetSystemResourceLimit().Reserve(LimitableResource::SessionCountMax, 1); - } - - // Check that we successfully created a session. - R_UNLESS(session != nullptr, ResultOutOfResource); - - // Initialize the session. - session->Initialize(nullptr, fmt::format("{}", name)); - - // Commit the session reservation. - session_reservation.Commit(); - - // Ensure that we clean up the session (and its only references are handle table) on function - // end. - SCOPE_EXIT({ - session->GetClientSession().Close(); - session->GetServerSession().Close(); - }); - - // Register the session. - T::Register(system.Kernel(), session); - - // Add the server session to the handle table. - R_TRY(handle_table.Add(out_server, &session->GetServerSession())); - - // Add the client session to the handle table. - const auto result = handle_table.Add(out_client, &session->GetClientSession()); - - if (!R_SUCCEEDED(result)) { - // Ensure that we maintaing a clean handle state on exit. - handle_table.Remove(*out_server); - } - - return result; -} - -static Result CreateSession(Core::System& system, Handle* out_server, Handle* out_client, - u32 is_light, u64 name) { - if (is_light) { - // return CreateSession(system, out_server, out_client, name); - return ResultUnknown; - } else { - return CreateSession(system, out_server, out_client, name); - } -} - -/// Connect to an OS service given the port name, returns the handle to the port to out -static Result ConnectToNamedPort(Core::System& system, Handle* out, VAddr port_name_address) { - auto& memory = system.Memory(); - if (!memory.IsValidVirtualAddress(port_name_address)) { - LOG_ERROR(Kernel_SVC, - "Port Name Address is not a valid virtual address, port_name_address=0x{:016X}", - port_name_address); - return ResultNotFound; - } - - static constexpr std::size_t PortNameMaxLength = 11; - // Read 1 char beyond the max allowed port name to detect names that are too long. - const std::string port_name = memory.ReadCString(port_name_address, PortNameMaxLength + 1); - if (port_name.size() > PortNameMaxLength) { - LOG_ERROR(Kernel_SVC, "Port name is too long, expected {} but got {}", PortNameMaxLength, - port_name.size()); - return ResultOutOfRange; - } - - LOG_TRACE(Kernel_SVC, "called port_name={}", port_name); - - // Get the current handle table. - auto& kernel = system.Kernel(); - auto& handle_table = kernel.CurrentProcess()->GetHandleTable(); - - // Find the client port. - auto port = kernel.CreateNamedServicePort(port_name); - if (!port) { - LOG_ERROR(Kernel_SVC, "tried to connect to unknown port: {}", port_name); - return ResultNotFound; - } - - // Reserve a handle for the port. - // NOTE: Nintendo really does write directly to the output handle here. - R_TRY(handle_table.Reserve(out)); - auto handle_guard = SCOPE_GUARD({ handle_table.Unreserve(*out); }); - - // Create a session. - KClientSession* session{}; - R_TRY(port->CreateSession(std::addressof(session))); - - kernel.RegisterNamedServiceHandler(port_name, &port->GetParent()->GetServerPort()); - - // Register the session in the table, close the extra reference. - handle_table.Register(*out, session); - session->Close(); - - // We succeeded. - handle_guard.Cancel(); - return ResultSuccess; -} - -static Result ConnectToNamedPort32(Core::System& system, Handle* out_handle, - u32 port_name_address) { - - return ConnectToNamedPort(system, out_handle, port_name_address); -} - -/// Makes a blocking IPC call to a service. -static Result SendSyncRequest(Core::System& system, Handle handle) { - auto& kernel = system.Kernel(); - - // Create the wait queue. - KThreadQueue wait_queue(kernel); - - // Get the client session from its handle. - KScopedAutoObject session = - kernel.CurrentProcess()->GetHandleTable().GetObject(handle); - R_UNLESS(session.IsNotNull(), ResultInvalidHandle); - - LOG_TRACE(Kernel_SVC, "called handle=0x{:08X}({})", handle, session->GetName()); - - return session->SendSyncRequest(); -} - -static Result SendSyncRequest32(Core::System& system, Handle handle) { - return SendSyncRequest(system, handle); -} - -static Result ReplyAndReceive(Core::System& system, s32* out_index, Handle* handles, - s32 num_handles, Handle reply_target, s64 timeout_ns) { - auto& kernel = system.Kernel(); - auto& handle_table = GetCurrentThread(kernel).GetOwnerProcess()->GetHandleTable(); - - // Convert handle list to object table. - std::vector objs(num_handles); - R_UNLESS( - handle_table.GetMultipleObjects(objs.data(), handles, num_handles), - ResultInvalidHandle); - - // Ensure handles are closed when we're done. - SCOPE_EXIT({ - for (auto i = 0; i < num_handles; ++i) { - objs[i]->Close(); - } - }); - - // Reply to the target, if one is specified. - if (reply_target != InvalidHandle) { - KScopedAutoObject session = handle_table.GetObject(reply_target); - R_UNLESS(session.IsNotNull(), ResultInvalidHandle); - - // If we fail to reply, we want to set the output index to -1. - // ON_RESULT_FAILURE { *out_index = -1; }; - - // Send the reply. - // R_TRY(session->SendReply()); - - Result rc = session->SendReply(); - if (!R_SUCCEEDED(rc)) { - *out_index = -1; - return rc; - } - } - - // Wait for a message. - while (true) { - // Wait for an object. - s32 index; - Result result = KSynchronizationObject::Wait(kernel, &index, objs.data(), - static_cast(objs.size()), timeout_ns); - if (result == ResultTimedOut) { - return result; - } - - // Receive the request. - if (R_SUCCEEDED(result)) { - KServerSession* session = objs[index]->DynamicCast(); - if (session != nullptr) { - result = session->ReceiveRequest(); - if (result == ResultNotFound) { - continue; - } - } - } - - *out_index = index; - return result; - } -} - -/// Get the ID for the specified thread. -static Result GetThreadId(Core::System& system, u64* out_thread_id, Handle thread_handle) { - // Get the thread from its handle. - KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(thread_handle); - R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); - - // Get the thread's id. - *out_thread_id = thread->GetId(); - return ResultSuccess; -} - -static Result GetThreadId32(Core::System& system, u32* out_thread_id_low, u32* out_thread_id_high, - Handle thread_handle) { - u64 out_thread_id{}; - const Result result{GetThreadId(system, &out_thread_id, thread_handle)}; - - *out_thread_id_low = static_cast(out_thread_id >> 32); - *out_thread_id_high = static_cast(out_thread_id & std::numeric_limits::max()); - - return result; -} - -/// Gets the ID of the specified process or a specified thread's owning process. -static Result GetProcessId(Core::System& system, u64* out_process_id, Handle handle) { - LOG_DEBUG(Kernel_SVC, "called handle=0x{:08X}", handle); - - // Get the object from the handle table. - KScopedAutoObject obj = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject( - static_cast(handle)); - R_UNLESS(obj.IsNotNull(), ResultInvalidHandle); - - // Get the process from the object. - KProcess* process = nullptr; - if (KProcess* p = obj->DynamicCast(); p != nullptr) { - // The object is a process, so we can use it directly. - process = p; - } else if (KThread* t = obj->DynamicCast(); t != nullptr) { - // The object is a thread, so we want to use its parent. - process = reinterpret_cast(obj.GetPointerUnsafe())->GetOwnerProcess(); - } else { - // TODO(bunnei): This should also handle debug objects before returning. - UNIMPLEMENTED_MSG("Debug objects not implemented"); - } - - // Make sure the target process exists. - R_UNLESS(process != nullptr, ResultInvalidHandle); - - // Get the process id. - *out_process_id = process->GetId(); - - return ResultSuccess; -} - -static Result GetProcessId32(Core::System& system, u32* out_process_id_low, - u32* out_process_id_high, Handle handle) { - u64 out_process_id{}; - const auto result = GetProcessId(system, &out_process_id, handle); - *out_process_id_low = static_cast(out_process_id); - *out_process_id_high = static_cast(out_process_id >> 32); - return result; -} - -/// Wait for the given handles to synchronize, timeout after the specified nanoseconds -static Result WaitSynchronization(Core::System& system, s32* index, VAddr handles_address, - s32 num_handles, s64 nano_seconds) { - LOG_TRACE(Kernel_SVC, "called handles_address=0x{:X}, num_handles={}, nano_seconds={}", - handles_address, num_handles, nano_seconds); - - // Ensure number of handles is valid. - R_UNLESS(0 <= num_handles && num_handles <= ArgumentHandleCountMax, ResultOutOfRange); - - auto& kernel = system.Kernel(); - std::vector objs(num_handles); - const auto& handle_table = kernel.CurrentProcess()->GetHandleTable(); - Handle* handles = system.Memory().GetPointer(handles_address); - - // Copy user handles. - if (num_handles > 0) { - // Convert the handles to objects. - R_UNLESS(handle_table.GetMultipleObjects(objs.data(), handles, - num_handles), - ResultInvalidHandle); - for (const auto& obj : objs) { - kernel.RegisterInUseObject(obj); - } - } - - // Ensure handles are closed when we're done. - SCOPE_EXIT({ - for (s32 i = 0; i < num_handles; ++i) { - kernel.UnregisterInUseObject(objs[i]); - objs[i]->Close(); - } - }); - - return KSynchronizationObject::Wait(kernel, index, objs.data(), static_cast(objs.size()), - nano_seconds); -} - -static Result WaitSynchronization32(Core::System& system, u32 timeout_low, u32 handles_address, - s32 num_handles, u32 timeout_high, s32* index) { - const s64 nano_seconds{(static_cast(timeout_high) << 32) | static_cast(timeout_low)}; - return WaitSynchronization(system, index, handles_address, num_handles, nano_seconds); -} - -/// Resumes a thread waiting on WaitSynchronization -static Result CancelSynchronization(Core::System& system, Handle handle) { - LOG_TRACE(Kernel_SVC, "called handle=0x{:X}", handle); - - // Get the thread from its handle. - KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(handle); - R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); - - // Cancel the thread's wait. - thread->WaitCancel(); - return ResultSuccess; -} - -static Result CancelSynchronization32(Core::System& system, Handle handle) { - return CancelSynchronization(system, handle); -} - -/// Attempts to locks a mutex -static Result ArbitrateLock(Core::System& system, Handle thread_handle, VAddr address, u32 tag) { - LOG_TRACE(Kernel_SVC, "called thread_handle=0x{:08X}, address=0x{:X}, tag=0x{:08X}", - thread_handle, address, tag); - - // Validate the input address. - if (IsKernelAddress(address)) { - LOG_ERROR(Kernel_SVC, "Attempting to arbitrate a lock on a kernel address (address={:08X})", - address); - return ResultInvalidCurrentMemory; - } - if (!Common::IsAligned(address, sizeof(u32))) { - LOG_ERROR(Kernel_SVC, "Input address must be 4 byte aligned (address: {:08X})", address); - return ResultInvalidAddress; - } - - return system.Kernel().CurrentProcess()->WaitForAddress(thread_handle, address, tag); -} - -static Result ArbitrateLock32(Core::System& system, Handle thread_handle, u32 address, u32 tag) { - return ArbitrateLock(system, thread_handle, address, tag); -} - -/// Unlock a mutex -static Result ArbitrateUnlock(Core::System& system, VAddr address) { - LOG_TRACE(Kernel_SVC, "called address=0x{:X}", address); - - // Validate the input address. - if (IsKernelAddress(address)) { - LOG_ERROR(Kernel_SVC, - "Attempting to arbitrate an unlock on a kernel address (address={:08X})", - address); - return ResultInvalidCurrentMemory; - } - if (!Common::IsAligned(address, sizeof(u32))) { - LOG_ERROR(Kernel_SVC, "Input address must be 4 byte aligned (address: {:08X})", address); - return ResultInvalidAddress; - } - - return system.Kernel().CurrentProcess()->SignalToAddress(address); -} - -static Result ArbitrateUnlock32(Core::System& system, u32 address) { - return ArbitrateUnlock(system, address); -} - -/// Break program execution -static void Break(Core::System& system, u32 reason, u64 info1, u64 info2) { - BreakReason break_reason = - static_cast(reason & ~static_cast(BreakReason::NotificationOnlyFlag)); - bool notification_only = (reason & static_cast(BreakReason::NotificationOnlyFlag)) != 0; - - bool has_dumped_buffer{}; - std::vector debug_buffer; - - const auto handle_debug_buffer = [&](VAddr addr, u64 sz) { - if (sz == 0 || addr == 0 || has_dumped_buffer) { - return; - } - - auto& memory = system.Memory(); - - // This typically is an error code so we're going to assume this is the case - if (sz == sizeof(u32)) { - LOG_CRITICAL(Debug_Emulated, "debug_buffer_err_code={:X}", memory.Read32(addr)); - } else { - // We don't know what's in here so we'll hexdump it - debug_buffer.resize(sz); - memory.ReadBlock(addr, debug_buffer.data(), sz); - std::string hexdump; - for (std::size_t i = 0; i < debug_buffer.size(); i++) { - hexdump += fmt::format("{:02X} ", debug_buffer[i]); - if (i != 0 && i % 16 == 0) { - hexdump += '\n'; - } - } - LOG_CRITICAL(Debug_Emulated, "debug_buffer=\n{}", hexdump); - } - has_dumped_buffer = true; - }; - switch (break_reason) { - case BreakReason::Panic: - LOG_CRITICAL(Debug_Emulated, "Userspace PANIC! info1=0x{:016X}, info2=0x{:016X}", info1, - info2); - handle_debug_buffer(info1, info2); - break; - case BreakReason::Assert: - LOG_CRITICAL(Debug_Emulated, "Userspace Assertion failed! info1=0x{:016X}, info2=0x{:016X}", - info1, info2); - handle_debug_buffer(info1, info2); - break; - case BreakReason::User: - LOG_WARNING(Debug_Emulated, "Userspace Break! 0x{:016X} with size 0x{:016X}", info1, info2); - handle_debug_buffer(info1, info2); - break; - case BreakReason::PreLoadDll: - LOG_INFO(Debug_Emulated, - "Userspace Attempting to load an NRO at 0x{:016X} with size 0x{:016X}", info1, - info2); - break; - case BreakReason::PostLoadDll: - LOG_INFO(Debug_Emulated, "Userspace Loaded an NRO at 0x{:016X} with size 0x{:016X}", info1, - info2); - break; - case BreakReason::PreUnloadDll: - LOG_INFO(Debug_Emulated, - "Userspace Attempting to unload an NRO at 0x{:016X} with size 0x{:016X}", info1, - info2); - break; - case BreakReason::PostUnloadDll: - LOG_INFO(Debug_Emulated, "Userspace Unloaded an NRO at 0x{:016X} with size 0x{:016X}", - info1, info2); - break; - case BreakReason::CppException: - LOG_CRITICAL(Debug_Emulated, "Signalling debugger. Uncaught C++ exception encountered."); - break; - default: - LOG_WARNING( - Debug_Emulated, - "Signalling debugger, Unknown break reason {:#X}, info1=0x{:016X}, info2=0x{:016X}", - reason, info1, info2); - handle_debug_buffer(info1, info2); - break; - } - - system.GetReporter().SaveSvcBreakReport(reason, notification_only, info1, info2, - has_dumped_buffer ? std::make_optional(debug_buffer) - : std::nullopt); - - if (!notification_only) { - LOG_CRITICAL( - Debug_Emulated, - "Emulated program broke execution! reason=0x{:016X}, info1=0x{:016X}, info2=0x{:016X}", - reason, info1, info2); - - handle_debug_buffer(info1, info2); - - auto* const current_thread = GetCurrentThreadPointer(system.Kernel()); - const auto thread_processor_id = current_thread->GetActiveCore(); - system.ArmInterface(static_cast(thread_processor_id)).LogBacktrace(); - } - - if (system.DebuggerEnabled()) { - auto* thread = system.Kernel().GetCurrentEmuThread(); - system.GetDebugger().NotifyThreadStopped(thread); - thread->RequestSuspend(Kernel::SuspendType::Debug); - } -} - -static void Break32(Core::System& system, u32 reason, u32 info1, u32 info2) { - Break(system, reason, info1, info2); -} - -/// Used to output a message on a debug hardware unit - does nothing on a retail unit -static void OutputDebugString(Core::System& system, VAddr address, u64 len) { - if (len == 0) { - return; - } - - std::string str(len, '\0'); - system.Memory().ReadBlock(address, str.data(), str.size()); - LOG_DEBUG(Debug_Emulated, "{}", str); -} - -static void OutputDebugString32(Core::System& system, u32 address, u32 len) { - OutputDebugString(system, address, len); -} - -/// Gets system/memory information for the current process -static Result GetInfo(Core::System& system, u64* result, u64 info_id, Handle handle, - u64 info_sub_id) { - LOG_TRACE(Kernel_SVC, "called info_id=0x{:X}, info_sub_id=0x{:X}, handle=0x{:08X}", info_id, - info_sub_id, handle); - - const auto info_id_type = static_cast(info_id); - - switch (info_id_type) { - case InfoType::CoreMask: - case InfoType::PriorityMask: - case InfoType::AliasRegionAddress: - case InfoType::AliasRegionSize: - case InfoType::HeapRegionAddress: - case InfoType::HeapRegionSize: - case InfoType::AslrRegionAddress: - case InfoType::AslrRegionSize: - case InfoType::StackRegionAddress: - case InfoType::StackRegionSize: - case InfoType::TotalMemorySize: - case InfoType::UsedMemorySize: - case InfoType::SystemResourceSizeTotal: - case InfoType::SystemResourceSizeUsed: - case InfoType::ProgramId: - case InfoType::UserExceptionContextAddress: - case InfoType::TotalNonSystemMemorySize: - case InfoType::UsedNonSystemMemorySize: - case InfoType::IsApplication: - case InfoType::FreeThreadCount: { - if (info_sub_id != 0) { - LOG_ERROR(Kernel_SVC, "Info sub id is non zero! info_id={}, info_sub_id={}", info_id, - info_sub_id); - return ResultInvalidEnumValue; - } - - const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); - KScopedAutoObject process = handle_table.GetObject(handle); - if (process.IsNull()) { - LOG_ERROR(Kernel_SVC, "Process is not valid! info_id={}, info_sub_id={}, handle={:08X}", - info_id, info_sub_id, handle); - return ResultInvalidHandle; - } - - switch (info_id_type) { - case InfoType::CoreMask: - *result = process->GetCoreMask(); - return ResultSuccess; - - case InfoType::PriorityMask: - *result = process->GetPriorityMask(); - return ResultSuccess; - - case InfoType::AliasRegionAddress: - *result = process->PageTable().GetAliasRegionStart(); - return ResultSuccess; - - case InfoType::AliasRegionSize: - *result = process->PageTable().GetAliasRegionSize(); - return ResultSuccess; - - case InfoType::HeapRegionAddress: - *result = process->PageTable().GetHeapRegionStart(); - return ResultSuccess; - - case InfoType::HeapRegionSize: - *result = process->PageTable().GetHeapRegionSize(); - return ResultSuccess; - - case InfoType::AslrRegionAddress: - *result = process->PageTable().GetAliasCodeRegionStart(); - return ResultSuccess; - - case InfoType::AslrRegionSize: - *result = process->PageTable().GetAliasCodeRegionSize(); - return ResultSuccess; - - case InfoType::StackRegionAddress: - *result = process->PageTable().GetStackRegionStart(); - return ResultSuccess; - - case InfoType::StackRegionSize: - *result = process->PageTable().GetStackRegionSize(); - return ResultSuccess; - - case InfoType::TotalMemorySize: - *result = process->GetTotalPhysicalMemoryAvailable(); - return ResultSuccess; - - case InfoType::UsedMemorySize: - *result = process->GetTotalPhysicalMemoryUsed(); - return ResultSuccess; - - case InfoType::SystemResourceSizeTotal: - *result = process->GetSystemResourceSize(); - return ResultSuccess; - - case InfoType::SystemResourceSizeUsed: - LOG_WARNING(Kernel_SVC, "(STUBBED) Attempted to query system resource usage"); - *result = process->GetSystemResourceUsage(); - return ResultSuccess; - - case InfoType::ProgramId: - *result = process->GetProgramID(); - return ResultSuccess; - - case InfoType::UserExceptionContextAddress: - *result = process->GetProcessLocalRegionAddress(); - return ResultSuccess; - - case InfoType::TotalNonSystemMemorySize: - *result = process->GetTotalPhysicalMemoryAvailableWithoutSystemResource(); - return ResultSuccess; - - case InfoType::UsedNonSystemMemorySize: - *result = process->GetTotalPhysicalMemoryUsedWithoutSystemResource(); - return ResultSuccess; - - case InfoType::FreeThreadCount: - *result = process->GetFreeThreadCount(); - return ResultSuccess; - - default: - break; - } - - LOG_ERROR(Kernel_SVC, "Unimplemented svcGetInfo id=0x{:016X}", info_id); - return ResultInvalidEnumValue; - } - - case InfoType::DebuggerAttached: - *result = 0; - return ResultSuccess; - - case InfoType::ResourceLimit: { - if (handle != 0) { - LOG_ERROR(Kernel, "Handle is non zero! handle={:08X}", handle); - return ResultInvalidHandle; - } - - if (info_sub_id != 0) { - LOG_ERROR(Kernel, "Info sub id is non zero! info_id={}, info_sub_id={}", info_id, - info_sub_id); - return ResultInvalidCombination; - } - - KProcess* const current_process = system.Kernel().CurrentProcess(); - KHandleTable& handle_table = current_process->GetHandleTable(); - const auto resource_limit = current_process->GetResourceLimit(); - if (!resource_limit) { - *result = Svc::InvalidHandle; - // Yes, the kernel considers this a successful operation. - return ResultSuccess; - } - - Handle resource_handle{}; - R_TRY(handle_table.Add(&resource_handle, resource_limit)); - - *result = resource_handle; - return ResultSuccess; - } - - case InfoType::RandomEntropy: - if (handle != 0) { - LOG_ERROR(Kernel_SVC, "Process Handle is non zero, expected 0 result but got {:016X}", - handle); - return ResultInvalidHandle; - } - - if (info_sub_id >= KProcess::RANDOM_ENTROPY_SIZE) { - LOG_ERROR(Kernel_SVC, "Entropy size is out of range, expected {} but got {}", - KProcess::RANDOM_ENTROPY_SIZE, info_sub_id); - return ResultInvalidCombination; - } - - *result = system.Kernel().CurrentProcess()->GetRandomEntropy(info_sub_id); - return ResultSuccess; - - case InfoType::InitialProcessIdRange: - LOG_WARNING(Kernel_SVC, - "(STUBBED) Attempted to query privileged process id bounds, returned 0"); - *result = 0; - return ResultSuccess; - - case InfoType::ThreadTickCount: { - constexpr u64 num_cpus = 4; - if (info_sub_id != 0xFFFFFFFFFFFFFFFF && info_sub_id >= num_cpus) { - LOG_ERROR(Kernel_SVC, "Core count is out of range, expected {} but got {}", num_cpus, - info_sub_id); - return ResultInvalidCombination; - } - - KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject( - static_cast(handle)); - if (thread.IsNull()) { - LOG_ERROR(Kernel_SVC, "Thread handle does not exist, handle=0x{:08X}", - static_cast(handle)); - return ResultInvalidHandle; - } - - const auto& core_timing = system.CoreTiming(); - const auto& scheduler = *system.Kernel().CurrentScheduler(); - const auto* const current_thread = GetCurrentThreadPointer(system.Kernel()); - const bool same_thread = current_thread == thread.GetPointerUnsafe(); - - const u64 prev_ctx_ticks = scheduler.GetLastContextSwitchTime(); - u64 out_ticks = 0; - if (same_thread && info_sub_id == 0xFFFFFFFFFFFFFFFF) { - const u64 thread_ticks = current_thread->GetCpuTime(); - - out_ticks = thread_ticks + (core_timing.GetCPUTicks() - prev_ctx_ticks); - } else if (same_thread && info_sub_id == system.Kernel().CurrentPhysicalCoreIndex()) { - out_ticks = core_timing.GetCPUTicks() - prev_ctx_ticks; - } - - *result = out_ticks; - return ResultSuccess; - } - case InfoType::IdleTickCount: { - // Verify the input handle is invalid. - R_UNLESS(handle == InvalidHandle, ResultInvalidHandle); - - // Verify the requested core is valid. - const bool core_valid = - (info_sub_id == 0xFFFFFFFFFFFFFFFF) || - (info_sub_id == static_cast(system.Kernel().CurrentPhysicalCoreIndex())); - R_UNLESS(core_valid, ResultInvalidCombination); - - // Get the idle tick count. - *result = system.Kernel().CurrentScheduler()->GetIdleThread()->GetCpuTime(); - return ResultSuccess; - } - case InfoType::MesosphereCurrentProcess: { - // Verify the input handle is invalid. - R_UNLESS(handle == InvalidHandle, ResultInvalidHandle); - - // Verify the sub-type is valid. - R_UNLESS(info_sub_id == 0, ResultInvalidCombination); - - // Get the handle table. - KProcess* current_process = system.Kernel().CurrentProcess(); - KHandleTable& handle_table = current_process->GetHandleTable(); - - // Get a new handle for the current process. - Handle tmp; - R_TRY(handle_table.Add(&tmp, current_process)); - - // Set the output. - *result = tmp; - - // We succeeded. - return ResultSuccess; - } - default: - LOG_ERROR(Kernel_SVC, "Unimplemented svcGetInfo id=0x{:016X}", info_id); - return ResultInvalidEnumValue; - } -} - -static Result GetInfo32(Core::System& system, u32* result_low, u32* result_high, u32 sub_id_low, - u32 info_id, u32 handle, u32 sub_id_high) { - const u64 sub_id{u64{sub_id_low} | (u64{sub_id_high} << 32)}; - u64 res_value{}; - - const Result result{GetInfo(system, &res_value, info_id, handle, sub_id)}; - *result_high = static_cast(res_value >> 32); - *result_low = static_cast(res_value & std::numeric_limits::max()); - - return result; -} - -/// Maps memory at a desired address -static Result MapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { - LOG_DEBUG(Kernel_SVC, "called, addr=0x{:016X}, size=0x{:X}", addr, size); - - if (!Common::Is4KBAligned(addr)) { - LOG_ERROR(Kernel_SVC, "Address is not aligned to 4KB, 0x{:016X}", addr); - return ResultInvalidAddress; - } - - if (!Common::Is4KBAligned(size)) { - LOG_ERROR(Kernel_SVC, "Size is not aligned to 4KB, 0x{:X}", size); - return ResultInvalidSize; - } - - if (size == 0) { - LOG_ERROR(Kernel_SVC, "Size is zero"); - return ResultInvalidSize; - } - - if (!(addr < addr + size)) { - LOG_ERROR(Kernel_SVC, "Size causes 64-bit overflow of address"); - return ResultInvalidMemoryRegion; - } - - KProcess* const current_process{system.Kernel().CurrentProcess()}; - auto& page_table{current_process->PageTable()}; - - if (current_process->GetSystemResourceSize() == 0) { - LOG_ERROR(Kernel_SVC, "System Resource Size is zero"); - return ResultInvalidState; - } - - if (!page_table.IsInsideAddressSpace(addr, size)) { - LOG_ERROR(Kernel_SVC, - "Address is not within the address space, addr=0x{:016X}, size=0x{:016X}", addr, - size); - return ResultInvalidMemoryRegion; - } - - if (page_table.IsOutsideAliasRegion(addr, size)) { - LOG_ERROR(Kernel_SVC, - "Address is not within the alias region, addr=0x{:016X}, size=0x{:016X}", addr, - size); - return ResultInvalidMemoryRegion; - } - - return page_table.MapPhysicalMemory(addr, size); -} - -static Result MapPhysicalMemory32(Core::System& system, u32 addr, u32 size) { - return MapPhysicalMemory(system, addr, size); -} - -/// Unmaps memory previously mapped via MapPhysicalMemory -static Result UnmapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { - LOG_DEBUG(Kernel_SVC, "called, addr=0x{:016X}, size=0x{:X}", addr, size); - - if (!Common::Is4KBAligned(addr)) { - LOG_ERROR(Kernel_SVC, "Address is not aligned to 4KB, 0x{:016X}", addr); - return ResultInvalidAddress; - } - - if (!Common::Is4KBAligned(size)) { - LOG_ERROR(Kernel_SVC, "Size is not aligned to 4KB, 0x{:X}", size); - return ResultInvalidSize; - } - - if (size == 0) { - LOG_ERROR(Kernel_SVC, "Size is zero"); - return ResultInvalidSize; - } - - if (!(addr < addr + size)) { - LOG_ERROR(Kernel_SVC, "Size causes 64-bit overflow of address"); - return ResultInvalidMemoryRegion; - } - - KProcess* const current_process{system.Kernel().CurrentProcess()}; - auto& page_table{current_process->PageTable()}; - - if (current_process->GetSystemResourceSize() == 0) { - LOG_ERROR(Kernel_SVC, "System Resource Size is zero"); - return ResultInvalidState; - } - - if (!page_table.IsInsideAddressSpace(addr, size)) { - LOG_ERROR(Kernel_SVC, - "Address is not within the address space, addr=0x{:016X}, size=0x{:016X}", addr, - size); - return ResultInvalidMemoryRegion; - } - - if (page_table.IsOutsideAliasRegion(addr, size)) { - LOG_ERROR(Kernel_SVC, - "Address is not within the alias region, addr=0x{:016X}, size=0x{:016X}", addr, - size); - return ResultInvalidMemoryRegion; - } - - return page_table.UnmapPhysicalMemory(addr, size); -} - -static Result UnmapPhysicalMemory32(Core::System& system, u32 addr, u32 size) { - return UnmapPhysicalMemory(system, addr, size); -} - -/// Sets the thread activity -static Result SetThreadActivity(Core::System& system, Handle thread_handle, - ThreadActivity thread_activity) { - LOG_DEBUG(Kernel_SVC, "called, handle=0x{:08X}, activity=0x{:08X}", thread_handle, - thread_activity); - - // Validate the activity. - constexpr auto IsValidThreadActivity = [](ThreadActivity activity) { - return activity == ThreadActivity::Runnable || activity == ThreadActivity::Paused; - }; - R_UNLESS(IsValidThreadActivity(thread_activity), ResultInvalidEnumValue); - - // Get the thread from its handle. - KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(thread_handle); - R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); - - // Check that the activity is being set on a non-current thread for the current process. - R_UNLESS(thread->GetOwnerProcess() == system.Kernel().CurrentProcess(), ResultInvalidHandle); - R_UNLESS(thread.GetPointerUnsafe() != GetCurrentThreadPointer(system.Kernel()), ResultBusy); - - // Set the activity. - R_TRY(thread->SetActivity(thread_activity)); - - return ResultSuccess; -} - -static Result SetThreadActivity32(Core::System& system, Handle thread_handle, - Svc::ThreadActivity thread_activity) { - return SetThreadActivity(system, thread_handle, thread_activity); -} - -/// Gets the thread context -static Result GetThreadContext(Core::System& system, VAddr out_context, Handle thread_handle) { - LOG_DEBUG(Kernel_SVC, "called, out_context=0x{:08X}, thread_handle=0x{:X}", out_context, - thread_handle); - - auto& kernel = system.Kernel(); - - // Get the thread from its handle. - KScopedAutoObject thread = - kernel.CurrentProcess()->GetHandleTable().GetObject(thread_handle); - R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); - - // Require the handle be to a non-current thread in the current process. - const auto* current_process = kernel.CurrentProcess(); - R_UNLESS(current_process == thread->GetOwnerProcess(), ResultInvalidId); - - // Verify that the thread isn't terminated. - R_UNLESS(thread->GetState() != ThreadState::Terminated, ResultTerminationRequested); - - /// Check that the thread is not the current one. - /// NOTE: Nintendo does not check this, and thus the following loop will deadlock. - R_UNLESS(thread.GetPointerUnsafe() != GetCurrentThreadPointer(kernel), ResultInvalidId); - - // Try to get the thread context until the thread isn't current on any core. - while (true) { - KScopedSchedulerLock sl{kernel}; - - // TODO(bunnei): Enforce that thread is suspended for debug here. - - // If the thread's raw state isn't runnable, check if it's current on some core. - if (thread->GetRawState() != ThreadState::Runnable) { - bool current = false; - for (auto i = 0; i < static_cast(Core::Hardware::NUM_CPU_CORES); ++i) { - if (thread.GetPointerUnsafe() == kernel.Scheduler(i).GetSchedulerCurrentThread()) { - current = true; - break; - } - } - - // If the thread is current, retry until it isn't. - if (current) { - continue; - } - } - - // Get the thread context. - std::vector context; - R_TRY(thread->GetThreadContext3(context)); - - // Copy the thread context to user space. - system.Memory().WriteBlock(out_context, context.data(), context.size()); - - return ResultSuccess; - } - - return ResultSuccess; -} - -static Result GetThreadContext32(Core::System& system, u32 out_context, Handle thread_handle) { - return GetThreadContext(system, out_context, thread_handle); -} - -/// Gets the priority for the specified thread -static Result GetThreadPriority(Core::System& system, u32* out_priority, Handle handle) { - LOG_TRACE(Kernel_SVC, "called"); - - // Get the thread from its handle. - KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(handle); - R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); - - // Get the thread's priority. - *out_priority = thread->GetPriority(); - return ResultSuccess; -} - -static Result GetThreadPriority32(Core::System& system, u32* out_priority, Handle handle) { - return GetThreadPriority(system, out_priority, handle); -} - -/// Sets the priority for the specified thread -static Result SetThreadPriority(Core::System& system, Handle thread_handle, u32 priority) { - // Get the current process. - KProcess& process = *system.Kernel().CurrentProcess(); - - // Validate the priority. - R_UNLESS(HighestThreadPriority <= priority && priority <= LowestThreadPriority, - ResultInvalidPriority); - R_UNLESS(process.CheckThreadPriority(priority), ResultInvalidPriority); - - // Get the thread from its handle. - KScopedAutoObject thread = process.GetHandleTable().GetObject(thread_handle); - R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); - - // Set the thread priority. - thread->SetBasePriority(priority); - return ResultSuccess; -} - -static Result SetThreadPriority32(Core::System& system, Handle thread_handle, u32 priority) { - return SetThreadPriority(system, thread_handle, priority); -} - -/// Get which CPU core is executing the current thread -static u32 GetCurrentProcessorNumber(Core::System& system) { - LOG_TRACE(Kernel_SVC, "called"); - return static_cast(system.CurrentPhysicalCore().CoreIndex()); -} - -static u32 GetCurrentProcessorNumber32(Core::System& system) { - return GetCurrentProcessorNumber(system); -} - -namespace { - -constexpr bool IsValidSharedMemoryPermission(Svc::MemoryPermission perm) { - switch (perm) { - case Svc::MemoryPermission::Read: - case Svc::MemoryPermission::ReadWrite: - return true; - default: - return false; - } -} - -[[maybe_unused]] constexpr bool IsValidRemoteSharedMemoryPermission(Svc::MemoryPermission perm) { - return IsValidSharedMemoryPermission(perm) || perm == Svc::MemoryPermission::DontCare; -} - -constexpr bool IsValidProcessMemoryPermission(Svc::MemoryPermission perm) { - switch (perm) { - case Svc::MemoryPermission::None: - case Svc::MemoryPermission::Read: - case Svc::MemoryPermission::ReadWrite: - case Svc::MemoryPermission::ReadExecute: - return true; - default: - return false; - } -} - -constexpr bool IsValidMapCodeMemoryPermission(Svc::MemoryPermission perm) { - return perm == Svc::MemoryPermission::ReadWrite; -} - -constexpr bool IsValidMapToOwnerCodeMemoryPermission(Svc::MemoryPermission perm) { - return perm == Svc::MemoryPermission::Read || perm == Svc::MemoryPermission::ReadExecute; -} - -constexpr bool IsValidUnmapCodeMemoryPermission(Svc::MemoryPermission perm) { - return perm == Svc::MemoryPermission::None; -} - -constexpr bool IsValidUnmapFromOwnerCodeMemoryPermission(Svc::MemoryPermission perm) { - return perm == Svc::MemoryPermission::None; -} - -} // Anonymous namespace - -static Result MapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, u64 size, - Svc::MemoryPermission map_perm) { - LOG_TRACE(Kernel_SVC, - "called, shared_memory_handle=0x{:X}, addr=0x{:X}, size=0x{:X}, permissions=0x{:08X}", - shmem_handle, address, size, map_perm); - - // Validate the address/size. - R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); - R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); - R_UNLESS(size > 0, ResultInvalidSize); - R_UNLESS((address < address + size), ResultInvalidCurrentMemory); - - // Validate the permission. - R_UNLESS(IsValidSharedMemoryPermission(map_perm), ResultInvalidNewMemoryPermission); - - // Get the current process. - auto& process = *system.Kernel().CurrentProcess(); - auto& page_table = process.PageTable(); - - // Get the shared memory. - KScopedAutoObject shmem = process.GetHandleTable().GetObject(shmem_handle); - R_UNLESS(shmem.IsNotNull(), ResultInvalidHandle); - - // Verify that the mapping is in range. - R_UNLESS(page_table.CanContain(address, size, KMemoryState::Shared), ResultInvalidMemoryRegion); - - // Add the shared memory to the process. - R_TRY(process.AddSharedMemory(shmem.GetPointerUnsafe(), address, size)); - - // Ensure that we clean up the shared memory if we fail to map it. - auto guard = - SCOPE_GUARD({ process.RemoveSharedMemory(shmem.GetPointerUnsafe(), address, size); }); - - // Map the shared memory. - R_TRY(shmem->Map(process, address, size, map_perm)); - - // We succeeded. - guard.Cancel(); - return ResultSuccess; -} - -static Result MapSharedMemory32(Core::System& system, Handle shmem_handle, u32 address, u32 size, - Svc::MemoryPermission map_perm) { - return MapSharedMemory(system, shmem_handle, address, size, map_perm); -} - -static Result UnmapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, - u64 size) { - // Validate the address/size. - R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); - R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); - R_UNLESS(size > 0, ResultInvalidSize); - R_UNLESS((address < address + size), ResultInvalidCurrentMemory); - - // Get the current process. - auto& process = *system.Kernel().CurrentProcess(); - auto& page_table = process.PageTable(); - - // Get the shared memory. - KScopedAutoObject shmem = process.GetHandleTable().GetObject(shmem_handle); - R_UNLESS(shmem.IsNotNull(), ResultInvalidHandle); - - // Verify that the mapping is in range. - R_UNLESS(page_table.CanContain(address, size, KMemoryState::Shared), ResultInvalidMemoryRegion); - - // Unmap the shared memory. - R_TRY(shmem->Unmap(process, address, size)); - - // Remove the shared memory from the process. - process.RemoveSharedMemory(shmem.GetPointerUnsafe(), address, size); - - return ResultSuccess; -} - -static Result UnmapSharedMemory32(Core::System& system, Handle shmem_handle, u32 address, - u32 size) { - return UnmapSharedMemory(system, shmem_handle, address, size); -} - -static Result SetProcessMemoryPermission(Core::System& system, Handle process_handle, VAddr address, - u64 size, Svc::MemoryPermission perm) { - LOG_TRACE(Kernel_SVC, - "called, process_handle=0x{:X}, addr=0x{:X}, size=0x{:X}, permissions=0x{:08X}", - process_handle, address, size, perm); - - // Validate the address/size. - R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); - R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); - R_UNLESS(size > 0, ResultInvalidSize); - R_UNLESS((address < address + size), ResultInvalidCurrentMemory); - R_UNLESS(address == static_cast(address), ResultInvalidCurrentMemory); - R_UNLESS(size == static_cast(size), ResultInvalidCurrentMemory); - - // Validate the memory permission. - R_UNLESS(IsValidProcessMemoryPermission(perm), ResultInvalidNewMemoryPermission); - - // Get the process from its handle. - KScopedAutoObject process = - system.CurrentProcess()->GetHandleTable().GetObject(process_handle); - R_UNLESS(process.IsNotNull(), ResultInvalidHandle); - - // Validate that the address is in range. - auto& page_table = process->PageTable(); - R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory); - - // Set the memory permission. - return page_table.SetProcessMemoryPermission(address, size, perm); -} - -static Result MapProcessMemory(Core::System& system, VAddr dst_address, Handle process_handle, - VAddr src_address, u64 size) { - LOG_TRACE(Kernel_SVC, - "called, dst_address=0x{:X}, process_handle=0x{:X}, src_address=0x{:X}, size=0x{:X}", - dst_address, process_handle, src_address, size); - - // Validate the address/size. - R_UNLESS(Common::IsAligned(dst_address, PageSize), ResultInvalidAddress); - R_UNLESS(Common::IsAligned(src_address, PageSize), ResultInvalidAddress); - R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); - R_UNLESS(size > 0, ResultInvalidSize); - R_UNLESS((dst_address < dst_address + size), ResultInvalidCurrentMemory); - R_UNLESS((src_address < src_address + size), ResultInvalidCurrentMemory); - - // Get the processes. - KProcess* dst_process = system.CurrentProcess(); - KScopedAutoObject src_process = - dst_process->GetHandleTable().GetObjectWithoutPseudoHandle(process_handle); - R_UNLESS(src_process.IsNotNull(), ResultInvalidHandle); - - // Get the page tables. - auto& dst_pt = dst_process->PageTable(); - auto& src_pt = src_process->PageTable(); - - // Validate that the mapping is in range. - R_UNLESS(src_pt.Contains(src_address, size), ResultInvalidCurrentMemory); - R_UNLESS(dst_pt.CanContain(dst_address, size, KMemoryState::SharedCode), - ResultInvalidMemoryRegion); - - // Create a new page group. - KPageGroup pg{system.Kernel(), dst_pt.GetBlockInfoManager()}; - R_TRY(src_pt.MakeAndOpenPageGroup( - std::addressof(pg), src_address, size / PageSize, KMemoryState::FlagCanMapProcess, - KMemoryState::FlagCanMapProcess, KMemoryPermission::None, KMemoryPermission::None, - KMemoryAttribute::All, KMemoryAttribute::None)); - - // Map the group. - R_TRY(dst_pt.MapPageGroup(dst_address, pg, KMemoryState::SharedCode, - KMemoryPermission::UserReadWrite)); - - return ResultSuccess; -} - -static Result UnmapProcessMemory(Core::System& system, VAddr dst_address, Handle process_handle, - VAddr src_address, u64 size) { - LOG_TRACE(Kernel_SVC, - "called, dst_address=0x{:X}, process_handle=0x{:X}, src_address=0x{:X}, size=0x{:X}", - dst_address, process_handle, src_address, size); - - // Validate the address/size. - R_UNLESS(Common::IsAligned(dst_address, PageSize), ResultInvalidAddress); - R_UNLESS(Common::IsAligned(src_address, PageSize), ResultInvalidAddress); - R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); - R_UNLESS(size > 0, ResultInvalidSize); - R_UNLESS((dst_address < dst_address + size), ResultInvalidCurrentMemory); - R_UNLESS((src_address < src_address + size), ResultInvalidCurrentMemory); - - // Get the processes. - KProcess* dst_process = system.CurrentProcess(); - KScopedAutoObject src_process = - dst_process->GetHandleTable().GetObjectWithoutPseudoHandle(process_handle); - R_UNLESS(src_process.IsNotNull(), ResultInvalidHandle); - - // Get the page tables. - auto& dst_pt = dst_process->PageTable(); - auto& src_pt = src_process->PageTable(); - - // Validate that the mapping is in range. - R_UNLESS(src_pt.Contains(src_address, size), ResultInvalidCurrentMemory); - R_UNLESS(dst_pt.CanContain(dst_address, size, KMemoryState::SharedCode), - ResultInvalidMemoryRegion); - - // Unmap the memory. - R_TRY(dst_pt.UnmapProcessMemory(dst_address, size, src_pt, src_address)); - - return ResultSuccess; -} - -static Result CreateCodeMemory(Core::System& system, Handle* out, VAddr address, size_t size) { - LOG_TRACE(Kernel_SVC, "called, address=0x{:X}, size=0x{:X}", address, size); - - // Get kernel instance. - auto& kernel = system.Kernel(); - - // Validate address / size. - R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); - R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); - R_UNLESS(size > 0, ResultInvalidSize); - R_UNLESS((address < address + size), ResultInvalidCurrentMemory); - - // Create the code memory. - - KCodeMemory* code_mem = KCodeMemory::Create(kernel); - R_UNLESS(code_mem != nullptr, ResultOutOfResource); - - // Verify that the region is in range. - R_UNLESS(system.CurrentProcess()->PageTable().Contains(address, size), - ResultInvalidCurrentMemory); - - // Initialize the code memory. - R_TRY(code_mem->Initialize(system.DeviceMemory(), address, size)); - - // Register the code memory. - KCodeMemory::Register(kernel, code_mem); - - // Add the code memory to the handle table. - R_TRY(system.CurrentProcess()->GetHandleTable().Add(out, code_mem)); - - code_mem->Close(); - - return ResultSuccess; -} - -static Result CreateCodeMemory32(Core::System& system, Handle* out, u32 address, u32 size) { - return CreateCodeMemory(system, out, address, size); -} - -static Result ControlCodeMemory(Core::System& system, Handle code_memory_handle, u32 operation, - VAddr address, size_t size, Svc::MemoryPermission perm) { - - LOG_TRACE(Kernel_SVC, - "called, code_memory_handle=0x{:X}, operation=0x{:X}, address=0x{:X}, size=0x{:X}, " - "permission=0x{:X}", - code_memory_handle, operation, address, size, perm); - - // Validate the address / size. - R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); - R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); - R_UNLESS(size > 0, ResultInvalidSize); - R_UNLESS((address < address + size), ResultInvalidCurrentMemory); - - // Get the code memory from its handle. - KScopedAutoObject code_mem = - system.CurrentProcess()->GetHandleTable().GetObject(code_memory_handle); - R_UNLESS(code_mem.IsNotNull(), ResultInvalidHandle); - - // NOTE: Here, Atmosphere extends the SVC to allow code memory operations on one's own process. - // This enables homebrew usage of these SVCs for JIT. - - // Perform the operation. - switch (static_cast(operation)) { - case CodeMemoryOperation::Map: { - // Check that the region is in range. - R_UNLESS( - system.CurrentProcess()->PageTable().CanContain(address, size, KMemoryState::CodeOut), - ResultInvalidMemoryRegion); - - // Check the memory permission. - R_UNLESS(IsValidMapCodeMemoryPermission(perm), ResultInvalidNewMemoryPermission); - - // Map the memory. - R_TRY(code_mem->Map(address, size)); - } break; - case CodeMemoryOperation::Unmap: { - // Check that the region is in range. - R_UNLESS( - system.CurrentProcess()->PageTable().CanContain(address, size, KMemoryState::CodeOut), - ResultInvalidMemoryRegion); - - // Check the memory permission. - R_UNLESS(IsValidUnmapCodeMemoryPermission(perm), ResultInvalidNewMemoryPermission); - - // Unmap the memory. - R_TRY(code_mem->Unmap(address, size)); - } break; - case CodeMemoryOperation::MapToOwner: { - // Check that the region is in range. - R_UNLESS(code_mem->GetOwner()->PageTable().CanContain(address, size, - KMemoryState::GeneratedCode), - ResultInvalidMemoryRegion); - - // Check the memory permission. - R_UNLESS(IsValidMapToOwnerCodeMemoryPermission(perm), ResultInvalidNewMemoryPermission); - - // Map the memory to its owner. - R_TRY(code_mem->MapToOwner(address, size, perm)); - } break; - case CodeMemoryOperation::UnmapFromOwner: { - // Check that the region is in range. - R_UNLESS(code_mem->GetOwner()->PageTable().CanContain(address, size, - KMemoryState::GeneratedCode), - ResultInvalidMemoryRegion); - - // Check the memory permission. - R_UNLESS(IsValidUnmapFromOwnerCodeMemoryPermission(perm), ResultInvalidNewMemoryPermission); - - // Unmap the memory from its owner. - R_TRY(code_mem->UnmapFromOwner(address, size)); - } break; - default: - return ResultInvalidEnumValue; - } - - return ResultSuccess; -} - -static Result ControlCodeMemory32(Core::System& system, Handle code_memory_handle, u32 operation, - u64 address, u64 size, Svc::MemoryPermission perm) { - return ControlCodeMemory(system, code_memory_handle, operation, address, size, perm); -} - -static Result QueryProcessMemory(Core::System& system, VAddr memory_info_address, - VAddr page_info_address, Handle process_handle, VAddr address) { - LOG_TRACE(Kernel_SVC, "called process=0x{:08X} address={:X}", process_handle, address); - const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); - KScopedAutoObject process = handle_table.GetObject(process_handle); - if (process.IsNull()) { - LOG_ERROR(Kernel_SVC, "Process handle does not exist, process_handle=0x{:08X}", - process_handle); - return ResultInvalidHandle; - } - - auto& memory{system.Memory()}; - const auto memory_info{process->PageTable().QueryInfo(address).GetSvcMemoryInfo()}; - - memory.Write64(memory_info_address + 0x00, memory_info.base_address); - memory.Write64(memory_info_address + 0x08, memory_info.size); - memory.Write32(memory_info_address + 0x10, static_cast(memory_info.state) & 0xff); - memory.Write32(memory_info_address + 0x14, static_cast(memory_info.attribute)); - memory.Write32(memory_info_address + 0x18, static_cast(memory_info.permission)); - memory.Write32(memory_info_address + 0x1c, memory_info.ipc_count); - memory.Write32(memory_info_address + 0x20, memory_info.device_count); - memory.Write32(memory_info_address + 0x24, 0); - - // Page info appears to be currently unused by the kernel and is always set to zero. - memory.Write32(page_info_address, 0); - - return ResultSuccess; -} - -static Result QueryMemory(Core::System& system, VAddr memory_info_address, VAddr page_info_address, - VAddr query_address) { - LOG_TRACE(Kernel_SVC, - "called, memory_info_address=0x{:016X}, page_info_address=0x{:016X}, " - "query_address=0x{:016X}", - memory_info_address, page_info_address, query_address); - - return QueryProcessMemory(system, memory_info_address, page_info_address, CurrentProcess, - query_address); -} - -static Result QueryMemory32(Core::System& system, u32 memory_info_address, u32 page_info_address, - u32 query_address) { - return QueryMemory(system, memory_info_address, page_info_address, query_address); -} - -static Result MapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst_address, - u64 src_address, u64 size) { - LOG_DEBUG(Kernel_SVC, - "called. process_handle=0x{:08X}, dst_address=0x{:016X}, " - "src_address=0x{:016X}, size=0x{:016X}", - process_handle, dst_address, src_address, size); - - if (!Common::Is4KBAligned(src_address)) { - LOG_ERROR(Kernel_SVC, "src_address is not page-aligned (src_address=0x{:016X}).", - src_address); - return ResultInvalidAddress; - } - - if (!Common::Is4KBAligned(dst_address)) { - LOG_ERROR(Kernel_SVC, "dst_address is not page-aligned (dst_address=0x{:016X}).", - dst_address); - return ResultInvalidAddress; - } - - if (size == 0 || !Common::Is4KBAligned(size)) { - LOG_ERROR(Kernel_SVC, "Size is zero or not page-aligned (size=0x{:016X})", size); - return ResultInvalidSize; - } - - if (!IsValidAddressRange(dst_address, size)) { - LOG_ERROR(Kernel_SVC, - "Destination address range overflows the address space (dst_address=0x{:016X}, " - "size=0x{:016X}).", - dst_address, size); - return ResultInvalidCurrentMemory; - } - - if (!IsValidAddressRange(src_address, size)) { - LOG_ERROR(Kernel_SVC, - "Source address range overflows the address space (src_address=0x{:016X}, " - "size=0x{:016X}).", - src_address, size); - return ResultInvalidCurrentMemory; - } - - const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); - KScopedAutoObject process = handle_table.GetObject(process_handle); - if (process.IsNull()) { - LOG_ERROR(Kernel_SVC, "Invalid process handle specified (handle=0x{:08X}).", - process_handle); - return ResultInvalidHandle; - } - - auto& page_table = process->PageTable(); - if (!page_table.IsInsideAddressSpace(src_address, size)) { - LOG_ERROR(Kernel_SVC, - "Source address range is not within the address space (src_address=0x{:016X}, " - "size=0x{:016X}).", - src_address, size); - return ResultInvalidCurrentMemory; - } - - if (!page_table.IsInsideASLRRegion(dst_address, size)) { - LOG_ERROR(Kernel_SVC, - "Destination address range is not within the ASLR region (dst_address=0x{:016X}, " - "size=0x{:016X}).", - dst_address, size); - return ResultInvalidMemoryRegion; - } - - return page_table.MapCodeMemory(dst_address, src_address, size); -} - -static Result UnmapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst_address, - u64 src_address, u64 size) { - LOG_DEBUG(Kernel_SVC, - "called. process_handle=0x{:08X}, dst_address=0x{:016X}, src_address=0x{:016X}, " - "size=0x{:016X}", - process_handle, dst_address, src_address, size); - - if (!Common::Is4KBAligned(dst_address)) { - LOG_ERROR(Kernel_SVC, "dst_address is not page-aligned (dst_address=0x{:016X}).", - dst_address); - return ResultInvalidAddress; - } - - if (!Common::Is4KBAligned(src_address)) { - LOG_ERROR(Kernel_SVC, "src_address is not page-aligned (src_address=0x{:016X}).", - src_address); - return ResultInvalidAddress; - } - - if (size == 0 || !Common::Is4KBAligned(size)) { - LOG_ERROR(Kernel_SVC, "Size is zero or not page-aligned (size=0x{:016X}).", size); - return ResultInvalidSize; - } - - if (!IsValidAddressRange(dst_address, size)) { - LOG_ERROR(Kernel_SVC, - "Destination address range overflows the address space (dst_address=0x{:016X}, " - "size=0x{:016X}).", - dst_address, size); - return ResultInvalidCurrentMemory; - } - - if (!IsValidAddressRange(src_address, size)) { - LOG_ERROR(Kernel_SVC, - "Source address range overflows the address space (src_address=0x{:016X}, " - "size=0x{:016X}).", - src_address, size); - return ResultInvalidCurrentMemory; - } - - const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); - KScopedAutoObject process = handle_table.GetObject(process_handle); - if (process.IsNull()) { - LOG_ERROR(Kernel_SVC, "Invalid process handle specified (handle=0x{:08X}).", - process_handle); - return ResultInvalidHandle; - } - - auto& page_table = process->PageTable(); - if (!page_table.IsInsideAddressSpace(src_address, size)) { - LOG_ERROR(Kernel_SVC, - "Source address range is not within the address space (src_address=0x{:016X}, " - "size=0x{:016X}).", - src_address, size); - return ResultInvalidCurrentMemory; - } - - if (!page_table.IsInsideASLRRegion(dst_address, size)) { - LOG_ERROR(Kernel_SVC, - "Destination address range is not within the ASLR region (dst_address=0x{:016X}, " - "size=0x{:016X}).", - dst_address, size); - return ResultInvalidMemoryRegion; - } - - return page_table.UnmapCodeMemory(dst_address, src_address, size, - KPageTable::ICacheInvalidationStrategy::InvalidateAll); -} - -/// Exits the current process -static void ExitProcess(Core::System& system) { - auto* current_process = system.Kernel().CurrentProcess(); - - LOG_INFO(Kernel_SVC, "Process {} exiting", current_process->GetProcessID()); - ASSERT_MSG(current_process->GetState() == KProcess::State::Running, - "Process has already exited"); - - system.Exit(); -} - -static void ExitProcess32(Core::System& system) { - ExitProcess(system); -} - -namespace { - -constexpr bool IsValidVirtualCoreId(int32_t core_id) { - return (0 <= core_id && core_id < static_cast(Core::Hardware::NUM_CPU_CORES)); -} - -} // Anonymous namespace - -/// Creates a new thread -static Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point, u64 arg, - VAddr stack_bottom, u32 priority, s32 core_id) { - LOG_DEBUG(Kernel_SVC, - "called entry_point=0x{:08X}, arg=0x{:08X}, stack_bottom=0x{:08X}, " - "priority=0x{:08X}, core_id=0x{:08X}", - entry_point, arg, stack_bottom, priority, core_id); - - // Adjust core id, if it's the default magic. - auto& kernel = system.Kernel(); - auto& process = *kernel.CurrentProcess(); - if (core_id == IdealCoreUseProcessValue) { - core_id = process.GetIdealCoreId(); - } - - // Validate arguments. - if (!IsValidVirtualCoreId(core_id)) { - LOG_ERROR(Kernel_SVC, "Invalid Core ID specified (id={})", core_id); - return ResultInvalidCoreId; - } - if (((1ULL << core_id) & process.GetCoreMask()) == 0) { - LOG_ERROR(Kernel_SVC, "Core ID doesn't fall within allowable cores (id={})", core_id); - return ResultInvalidCoreId; - } - - if (HighestThreadPriority > priority || priority > LowestThreadPriority) { - LOG_ERROR(Kernel_SVC, "Invalid priority specified (priority={})", priority); - return ResultInvalidPriority; - } - if (!process.CheckThreadPriority(priority)) { - LOG_ERROR(Kernel_SVC, "Invalid allowable thread priority (priority={})", priority); - return ResultInvalidPriority; - } - - // Reserve a new thread from the process resource limit (waiting up to 100ms). - KScopedResourceReservation thread_reservation( - kernel.CurrentProcess(), LimitableResource::ThreadCountMax, 1, - system.CoreTiming().GetGlobalTimeNs().count() + 100000000); - if (!thread_reservation.Succeeded()) { - LOG_ERROR(Kernel_SVC, "Could not reserve a new thread"); - return ResultLimitReached; - } - - // Create the thread. - KThread* thread = KThread::Create(kernel); - if (!thread) { - LOG_ERROR(Kernel_SVC, "Unable to create new threads. Thread creation limit reached."); - return ResultOutOfResource; - } - SCOPE_EXIT({ thread->Close(); }); - - // Initialize the thread. - { - KScopedLightLock lk{process.GetStateLock()}; - R_TRY(KThread::InitializeUserThread(system, thread, entry_point, arg, stack_bottom, - priority, core_id, &process)); - } - - // Set the thread name for debugging purposes. - thread->SetName(fmt::format("thread[entry_point={:X}, handle={:X}]", entry_point, *out_handle)); - - // Commit the thread reservation. - thread_reservation.Commit(); - - // Register the new thread. - KThread::Register(kernel, thread); - - // Add the thread to the handle table. - R_TRY(process.GetHandleTable().Add(out_handle, thread)); - - return ResultSuccess; -} - -static Result CreateThread32(Core::System& system, Handle* out_handle, u32 priority, - u32 entry_point, u32 arg, u32 stack_top, s32 processor_id) { - return CreateThread(system, out_handle, entry_point, arg, stack_top, priority, processor_id); -} - -/// Starts the thread for the provided handle -static Result StartThread(Core::System& system, Handle thread_handle) { - LOG_DEBUG(Kernel_SVC, "called thread=0x{:08X}", thread_handle); - - // Get the thread from its handle. - KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(thread_handle); - R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); - - // Try to start the thread. - R_TRY(thread->Run()); - - // If we succeeded, persist a reference to the thread. - thread->Open(); - system.Kernel().RegisterInUseObject(thread.GetPointerUnsafe()); - - return ResultSuccess; -} - -static Result StartThread32(Core::System& system, Handle thread_handle) { - return StartThread(system, thread_handle); -} - -/// Called when a thread exits -static void ExitThread(Core::System& system) { - LOG_DEBUG(Kernel_SVC, "called, pc=0x{:08X}", system.CurrentArmInterface().GetPC()); - - auto* const current_thread = GetCurrentThreadPointer(system.Kernel()); - system.GlobalSchedulerContext().RemoveThread(current_thread); - current_thread->Exit(); - system.Kernel().UnregisterInUseObject(current_thread); -} - -static void ExitThread32(Core::System& system) { - ExitThread(system); -} - -/// Sleep the current thread -static void SleepThread(Core::System& system, s64 nanoseconds) { - auto& kernel = system.Kernel(); - const auto yield_type = static_cast(nanoseconds); - - LOG_TRACE(Kernel_SVC, "called nanoseconds={}", nanoseconds); - - // When the input tick is positive, sleep. - if (nanoseconds > 0) { - // Convert the timeout from nanoseconds to ticks. - // NOTE: Nintendo does not use this conversion logic in WaitSynchronization... - - // Sleep. - // NOTE: Nintendo does not check the result of this sleep. - static_cast(GetCurrentThread(kernel).Sleep(nanoseconds)); - } else if (yield_type == Svc::YieldType::WithoutCoreMigration) { - KScheduler::YieldWithoutCoreMigration(kernel); - } else if (yield_type == Svc::YieldType::WithCoreMigration) { - KScheduler::YieldWithCoreMigration(kernel); - } else if (yield_type == Svc::YieldType::ToAnyThread) { - KScheduler::YieldToAnyThread(kernel); - } else { - // Nintendo does nothing at all if an otherwise invalid value is passed. - ASSERT_MSG(false, "Unimplemented sleep yield type '{:016X}'!", nanoseconds); - } -} - -static void SleepThread32(Core::System& system, u32 nanoseconds_low, u32 nanoseconds_high) { - const auto nanoseconds = static_cast(u64{nanoseconds_low} | (u64{nanoseconds_high} << 32)); - SleepThread(system, nanoseconds); -} - -/// Wait process wide key atomic -static Result WaitProcessWideKeyAtomic(Core::System& system, VAddr address, VAddr cv_key, u32 tag, - s64 timeout_ns) { - LOG_TRACE(Kernel_SVC, "called address={:X}, cv_key={:X}, tag=0x{:08X}, timeout_ns={}", address, - cv_key, tag, timeout_ns); - - // Validate input. - if (IsKernelAddress(address)) { - LOG_ERROR(Kernel_SVC, "Attempted to wait on kernel address (address={:08X})", address); - return ResultInvalidCurrentMemory; - } - if (!Common::IsAligned(address, sizeof(s32))) { - LOG_ERROR(Kernel_SVC, "Address must be 4 byte aligned (address={:08X})", address); - return ResultInvalidAddress; - } - - // Convert timeout from nanoseconds to ticks. - s64 timeout{}; - if (timeout_ns > 0) { - const s64 offset_tick(timeout_ns); - if (offset_tick > 0) { - timeout = offset_tick + 2; - if (timeout <= 0) { - timeout = std::numeric_limits::max(); - } - } else { - timeout = std::numeric_limits::max(); - } - } else { - timeout = timeout_ns; - } - - // Wait on the condition variable. - return system.Kernel().CurrentProcess()->WaitConditionVariable( - address, Common::AlignDown(cv_key, sizeof(u32)), tag, timeout); -} - -static Result WaitProcessWideKeyAtomic32(Core::System& system, u32 address, u32 cv_key, u32 tag, - u32 timeout_ns_low, u32 timeout_ns_high) { - const auto timeout_ns = static_cast(timeout_ns_low | (u64{timeout_ns_high} << 32)); - return WaitProcessWideKeyAtomic(system, address, cv_key, tag, timeout_ns); -} - -/// Signal process wide key -static void SignalProcessWideKey(Core::System& system, VAddr cv_key, s32 count) { - LOG_TRACE(Kernel_SVC, "called, cv_key=0x{:X}, count=0x{:08X}", cv_key, count); - - // Signal the condition variable. - return system.Kernel().CurrentProcess()->SignalConditionVariable( - Common::AlignDown(cv_key, sizeof(u32)), count); -} - -static void SignalProcessWideKey32(Core::System& system, u32 cv_key, s32 count) { - SignalProcessWideKey(system, cv_key, count); -} - -namespace { - -constexpr bool IsValidSignalType(Svc::SignalType type) { - switch (type) { - case Svc::SignalType::Signal: - case Svc::SignalType::SignalAndIncrementIfEqual: - case Svc::SignalType::SignalAndModifyByWaitingCountIfEqual: - return true; - default: - return false; - } -} - -constexpr bool IsValidArbitrationType(Svc::ArbitrationType type) { - switch (type) { - case Svc::ArbitrationType::WaitIfLessThan: - case Svc::ArbitrationType::DecrementAndWaitIfLessThan: - case Svc::ArbitrationType::WaitIfEqual: - return true; - default: - return false; - } -} - -} // namespace - -// Wait for an address (via Address Arbiter) -static Result WaitForAddress(Core::System& system, VAddr address, Svc::ArbitrationType arb_type, - s32 value, s64 timeout_ns) { - LOG_TRACE(Kernel_SVC, "called, address=0x{:X}, arb_type=0x{:X}, value=0x{:X}, timeout_ns={}", - address, arb_type, value, timeout_ns); - - // Validate input. - if (IsKernelAddress(address)) { - LOG_ERROR(Kernel_SVC, "Attempting to wait on kernel address (address={:08X})", address); - return ResultInvalidCurrentMemory; - } - if (!Common::IsAligned(address, sizeof(s32))) { - LOG_ERROR(Kernel_SVC, "Wait address must be 4 byte aligned (address={:08X})", address); - return ResultInvalidAddress; - } - if (!IsValidArbitrationType(arb_type)) { - LOG_ERROR(Kernel_SVC, "Invalid arbitration type specified (type={})", arb_type); - return ResultInvalidEnumValue; - } - - // Convert timeout from nanoseconds to ticks. - s64 timeout{}; - if (timeout_ns > 0) { - const s64 offset_tick(timeout_ns); - if (offset_tick > 0) { - timeout = offset_tick + 2; - if (timeout <= 0) { - timeout = std::numeric_limits::max(); - } - } else { - timeout = std::numeric_limits::max(); - } - } else { - timeout = timeout_ns; - } - - return system.Kernel().CurrentProcess()->WaitAddressArbiter(address, arb_type, value, timeout); -} - -static Result WaitForAddress32(Core::System& system, u32 address, Svc::ArbitrationType arb_type, - s32 value, u32 timeout_ns_low, u32 timeout_ns_high) { - const auto timeout = static_cast(timeout_ns_low | (u64{timeout_ns_high} << 32)); - return WaitForAddress(system, address, arb_type, value, timeout); -} - -// Signals to an address (via Address Arbiter) -static Result SignalToAddress(Core::System& system, VAddr address, Svc::SignalType signal_type, - s32 value, s32 count) { - LOG_TRACE(Kernel_SVC, "called, address=0x{:X}, signal_type=0x{:X}, value=0x{:X}, count=0x{:X}", - address, signal_type, value, count); - - // Validate input. - if (IsKernelAddress(address)) { - LOG_ERROR(Kernel_SVC, "Attempting to signal to a kernel address (address={:08X})", address); - return ResultInvalidCurrentMemory; - } - if (!Common::IsAligned(address, sizeof(s32))) { - LOG_ERROR(Kernel_SVC, "Signaled address must be 4 byte aligned (address={:08X})", address); - return ResultInvalidAddress; - } - if (!IsValidSignalType(signal_type)) { - LOG_ERROR(Kernel_SVC, "Invalid signal type specified (type={})", signal_type); - return ResultInvalidEnumValue; - } - - return system.Kernel().CurrentProcess()->SignalAddressArbiter(address, signal_type, value, - count); -} - -static void SynchronizePreemptionState(Core::System& system) { - auto& kernel = system.Kernel(); - - // Lock the scheduler. - KScopedSchedulerLock sl{kernel}; - - // If the current thread is pinned, unpin it. - KProcess* cur_process = system.Kernel().CurrentProcess(); - const auto core_id = GetCurrentCoreId(kernel); - - if (cur_process->GetPinnedThread(core_id) == GetCurrentThreadPointer(kernel)) { - // Clear the current thread's interrupt flag. - GetCurrentThread(kernel).ClearInterruptFlag(); - - // Unpin the current thread. - cur_process->UnpinCurrentThread(core_id); - } -} - -static Result SignalToAddress32(Core::System& system, u32 address, Svc::SignalType signal_type, - s32 value, s32 count) { - return SignalToAddress(system, address, signal_type, value, count); -} - -static void KernelDebug([[maybe_unused]] Core::System& system, - [[maybe_unused]] u32 kernel_debug_type, [[maybe_unused]] u64 param1, - [[maybe_unused]] u64 param2, [[maybe_unused]] u64 param3) { - // Intentionally do nothing, as this does nothing in released kernel binaries. -} - -static void ChangeKernelTraceState([[maybe_unused]] Core::System& system, - [[maybe_unused]] u32 trace_state) { - // Intentionally do nothing, as this does nothing in released kernel binaries. -} - -/// This returns the total CPU ticks elapsed since the CPU was powered-on -static u64 GetSystemTick(Core::System& system) { - LOG_TRACE(Kernel_SVC, "called"); - - auto& core_timing = system.CoreTiming(); - - // Returns the value of cntpct_el0 (https://switchbrew.org/wiki/SVC#svcGetSystemTick) - const u64 result{core_timing.GetClockTicks()}; - - if (!system.Kernel().IsMulticore()) { - core_timing.AddTicks(400U); - } - - return result; -} - -static void GetSystemTick32(Core::System& system, u32* time_low, u32* time_high) { - const auto time = GetSystemTick(system); - *time_low = static_cast(time); - *time_high = static_cast(time >> 32); -} - -/// Close a handle -static Result CloseHandle(Core::System& system, Handle handle) { - LOG_TRACE(Kernel_SVC, "Closing handle 0x{:08X}", handle); - - // Remove the handle. - R_UNLESS(system.Kernel().CurrentProcess()->GetHandleTable().Remove(handle), - ResultInvalidHandle); - - return ResultSuccess; -} - -static Result CloseHandle32(Core::System& system, Handle handle) { - return CloseHandle(system, handle); -} - -/// Clears the signaled state of an event or process. -static Result ResetSignal(Core::System& system, Handle handle) { - LOG_DEBUG(Kernel_SVC, "called handle 0x{:08X}", handle); - - // Get the current handle table. - const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); - - // Try to reset as readable event. - { - KScopedAutoObject readable_event = handle_table.GetObject(handle); - if (readable_event.IsNotNull()) { - return readable_event->Reset(); - } - } - - // Try to reset as process. - { - KScopedAutoObject process = handle_table.GetObject(handle); - if (process.IsNotNull()) { - return process->Reset(); - } - } - - LOG_ERROR(Kernel_SVC, "invalid handle (0x{:08X})", handle); - - return ResultInvalidHandle; -} - -static Result ResetSignal32(Core::System& system, Handle handle) { - return ResetSignal(system, handle); -} - -namespace { - -constexpr bool IsValidTransferMemoryPermission(MemoryPermission perm) { - switch (perm) { - case MemoryPermission::None: - case MemoryPermission::Read: - case MemoryPermission::ReadWrite: - return true; - default: - return false; - } -} - -} // Anonymous namespace - -/// Creates a TransferMemory object -static Result CreateTransferMemory(Core::System& system, Handle* out, VAddr address, u64 size, - MemoryPermission map_perm) { - auto& kernel = system.Kernel(); - - // Validate the size. - R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); - R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); - R_UNLESS(size > 0, ResultInvalidSize); - R_UNLESS((address < address + size), ResultInvalidCurrentMemory); - - // Validate the permissions. - R_UNLESS(IsValidTransferMemoryPermission(map_perm), ResultInvalidNewMemoryPermission); - - // Get the current process and handle table. - auto& process = *kernel.CurrentProcess(); - auto& handle_table = process.GetHandleTable(); - - // Reserve a new transfer memory from the process resource limit. - KScopedResourceReservation trmem_reservation(kernel.CurrentProcess(), - LimitableResource::TransferMemoryCountMax); - R_UNLESS(trmem_reservation.Succeeded(), ResultLimitReached); - - // Create the transfer memory. - KTransferMemory* trmem = KTransferMemory::Create(kernel); - R_UNLESS(trmem != nullptr, ResultOutOfResource); - - // Ensure the only reference is in the handle table when we're done. - SCOPE_EXIT({ trmem->Close(); }); - - // Ensure that the region is in range. - R_UNLESS(process.PageTable().Contains(address, size), ResultInvalidCurrentMemory); - - // Initialize the transfer memory. - R_TRY(trmem->Initialize(address, size, map_perm)); - - // Commit the reservation. - trmem_reservation.Commit(); - - // Register the transfer memory. - KTransferMemory::Register(kernel, trmem); - - // Add the transfer memory to the handle table. - R_TRY(handle_table.Add(out, trmem)); - - return ResultSuccess; -} - -static Result CreateTransferMemory32(Core::System& system, Handle* out, u32 address, u32 size, - MemoryPermission map_perm) { - return CreateTransferMemory(system, out, address, size, map_perm); -} - -static Result GetThreadCoreMask(Core::System& system, Handle thread_handle, s32* out_core_id, - u64* out_affinity_mask) { - LOG_TRACE(Kernel_SVC, "called, handle=0x{:08X}", thread_handle); - - // Get the thread from its handle. - KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(thread_handle); - R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); - - // Get the core mask. - R_TRY(thread->GetCoreMask(out_core_id, out_affinity_mask)); - - return ResultSuccess; -} - -static Result GetThreadCoreMask32(Core::System& system, Handle thread_handle, s32* out_core_id, - u32* out_affinity_mask_low, u32* out_affinity_mask_high) { - u64 out_affinity_mask{}; - const auto result = GetThreadCoreMask(system, thread_handle, out_core_id, &out_affinity_mask); - *out_affinity_mask_high = static_cast(out_affinity_mask >> 32); - *out_affinity_mask_low = static_cast(out_affinity_mask); - return result; -} - -static Result SetThreadCoreMask(Core::System& system, Handle thread_handle, s32 core_id, - u64 affinity_mask) { - // Determine the core id/affinity mask. - if (core_id == IdealCoreUseProcessValue) { - core_id = system.Kernel().CurrentProcess()->GetIdealCoreId(); - affinity_mask = (1ULL << core_id); - } else { - // Validate the affinity mask. - const u64 process_core_mask = system.Kernel().CurrentProcess()->GetCoreMask(); - R_UNLESS((affinity_mask | process_core_mask) == process_core_mask, ResultInvalidCoreId); - R_UNLESS(affinity_mask != 0, ResultInvalidCombination); - - // Validate the core id. - if (IsValidVirtualCoreId(core_id)) { - R_UNLESS(((1ULL << core_id) & affinity_mask) != 0, ResultInvalidCombination); - } else { - R_UNLESS(core_id == IdealCoreNoUpdate || core_id == IdealCoreDontCare, - ResultInvalidCoreId); - } - } - - // Get the thread from its handle. - KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(thread_handle); - R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); - - // Set the core mask. - R_TRY(thread->SetCoreMask(core_id, affinity_mask)); - - return ResultSuccess; -} - -static Result SetThreadCoreMask32(Core::System& system, Handle thread_handle, s32 core_id, - u32 affinity_mask_low, u32 affinity_mask_high) { - const auto affinity_mask = u64{affinity_mask_low} | (u64{affinity_mask_high} << 32); - return SetThreadCoreMask(system, thread_handle, core_id, affinity_mask); -} - -static Result SignalEvent(Core::System& system, Handle event_handle) { - LOG_DEBUG(Kernel_SVC, "called, event_handle=0x{:08X}", event_handle); - - // Get the current handle table. - const KHandleTable& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); - - // Get the event. - KScopedAutoObject event = handle_table.GetObject(event_handle); - R_UNLESS(event.IsNotNull(), ResultInvalidHandle); - - return event->Signal(); -} - -static Result SignalEvent32(Core::System& system, Handle event_handle) { - return SignalEvent(system, event_handle); -} - -static Result ClearEvent(Core::System& system, Handle event_handle) { - LOG_TRACE(Kernel_SVC, "called, event_handle=0x{:08X}", event_handle); - - // Get the current handle table. - const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); - - // Try to clear the writable event. - { - KScopedAutoObject event = handle_table.GetObject(event_handle); - if (event.IsNotNull()) { - return event->Clear(); - } - } - - // Try to clear the readable event. - { - KScopedAutoObject readable_event = handle_table.GetObject(event_handle); - if (readable_event.IsNotNull()) { - return readable_event->Clear(); - } - } - - LOG_ERROR(Kernel_SVC, "Event handle does not exist, event_handle=0x{:08X}", event_handle); - - return ResultInvalidHandle; -} - -static Result ClearEvent32(Core::System& system, Handle event_handle) { - return ClearEvent(system, event_handle); -} - -static Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_read) { - LOG_DEBUG(Kernel_SVC, "called"); - - // Get the kernel reference and handle table. - auto& kernel = system.Kernel(); - auto& handle_table = kernel.CurrentProcess()->GetHandleTable(); - - // Reserve a new event from the process resource limit - KScopedResourceReservation event_reservation(kernel.CurrentProcess(), - LimitableResource::EventCountMax); - R_UNLESS(event_reservation.Succeeded(), ResultLimitReached); - - // Create a new event. - KEvent* event = KEvent::Create(kernel); - R_UNLESS(event != nullptr, ResultOutOfResource); - - // Initialize the event. - event->Initialize(kernel.CurrentProcess()); - - // Commit the thread reservation. - event_reservation.Commit(); - - // Ensure that we clean up the event (and its only references are handle table) on function end. - SCOPE_EXIT({ - event->GetReadableEvent().Close(); - event->Close(); - }); - - // Register the event. - KEvent::Register(kernel, event); - - // Add the event to the handle table. - R_TRY(handle_table.Add(out_write, event)); - - // Ensure that we maintaing a clean handle state on exit. - auto handle_guard = SCOPE_GUARD({ handle_table.Remove(*out_write); }); - - // Add the readable event to the handle table. - R_TRY(handle_table.Add(out_read, std::addressof(event->GetReadableEvent()))); - - // We succeeded. - handle_guard.Cancel(); - return ResultSuccess; -} - -static Result CreateEvent32(Core::System& system, Handle* out_write, Handle* out_read) { - return CreateEvent(system, out_write, out_read); -} - -static Result GetProcessInfo(Core::System& system, u64* out, Handle process_handle, u32 type) { - LOG_DEBUG(Kernel_SVC, "called, handle=0x{:08X}, type=0x{:X}", process_handle, type); - - const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); - KScopedAutoObject process = handle_table.GetObject(process_handle); - if (process.IsNull()) { - LOG_ERROR(Kernel_SVC, "Process handle does not exist, process_handle=0x{:08X}", - process_handle); - return ResultInvalidHandle; - } - - const auto info_type = static_cast(type); - if (info_type != ProcessInfoType::ProcessState) { - LOG_ERROR(Kernel_SVC, "Expected info_type to be ProcessState but got {} instead", type); - return ResultInvalidEnumValue; - } - - *out = static_cast(process->GetState()); - return ResultSuccess; -} - -static Result CreateResourceLimit(Core::System& system, Handle* out_handle) { - LOG_DEBUG(Kernel_SVC, "called"); - - // Create a new resource limit. - auto& kernel = system.Kernel(); - KResourceLimit* resource_limit = KResourceLimit::Create(kernel); - R_UNLESS(resource_limit != nullptr, ResultOutOfResource); - - // Ensure we don't leak a reference to the limit. - SCOPE_EXIT({ resource_limit->Close(); }); - - // Initialize the resource limit. - resource_limit->Initialize(&system.CoreTiming()); - - // Register the limit. - KResourceLimit::Register(kernel, resource_limit); - - // Add the limit to the handle table. - R_TRY(kernel.CurrentProcess()->GetHandleTable().Add(out_handle, resource_limit)); - - return ResultSuccess; -} - -static Result GetResourceLimitLimitValue(Core::System& system, u64* out_limit_value, - Handle resource_limit_handle, LimitableResource which) { - LOG_DEBUG(Kernel_SVC, "called, resource_limit_handle={:08X}, which={}", resource_limit_handle, - which); - - // Validate the resource. - R_UNLESS(IsValidResourceType(which), ResultInvalidEnumValue); - - // Get the resource limit. - auto& kernel = system.Kernel(); - KScopedAutoObject resource_limit = - kernel.CurrentProcess()->GetHandleTable().GetObject(resource_limit_handle); - R_UNLESS(resource_limit.IsNotNull(), ResultInvalidHandle); - - // Get the limit value. - *out_limit_value = resource_limit->GetLimitValue(which); - - return ResultSuccess; -} - -static Result GetResourceLimitCurrentValue(Core::System& system, u64* out_current_value, - Handle resource_limit_handle, LimitableResource which) { - LOG_DEBUG(Kernel_SVC, "called, resource_limit_handle={:08X}, which={}", resource_limit_handle, - which); - - // Validate the resource. - R_UNLESS(IsValidResourceType(which), ResultInvalidEnumValue); - - // Get the resource limit. - auto& kernel = system.Kernel(); - KScopedAutoObject resource_limit = - kernel.CurrentProcess()->GetHandleTable().GetObject(resource_limit_handle); - R_UNLESS(resource_limit.IsNotNull(), ResultInvalidHandle); - - // Get the current value. - *out_current_value = resource_limit->GetCurrentValue(which); - - return ResultSuccess; -} - -static Result SetResourceLimitLimitValue(Core::System& system, Handle resource_limit_handle, - LimitableResource which, u64 limit_value) { - LOG_DEBUG(Kernel_SVC, "called, resource_limit_handle={:08X}, which={}, limit_value={}", - resource_limit_handle, which, limit_value); - - // Validate the resource. - R_UNLESS(IsValidResourceType(which), ResultInvalidEnumValue); - - // Get the resource limit. - auto& kernel = system.Kernel(); - KScopedAutoObject resource_limit = - kernel.CurrentProcess()->GetHandleTable().GetObject(resource_limit_handle); - R_UNLESS(resource_limit.IsNotNull(), ResultInvalidHandle); - - // Set the limit value. - R_TRY(resource_limit->SetLimitValue(which, limit_value)); - - return ResultSuccess; -} - -static Result GetProcessList(Core::System& system, u32* out_num_processes, VAddr out_process_ids, - u32 out_process_ids_size) { - LOG_DEBUG(Kernel_SVC, "called. out_process_ids=0x{:016X}, out_process_ids_size={}", - out_process_ids, out_process_ids_size); - - // If the supplied size is negative or greater than INT32_MAX / sizeof(u64), bail. - if ((out_process_ids_size & 0xF0000000) != 0) { - LOG_ERROR(Kernel_SVC, - "Supplied size outside [0, 0x0FFFFFFF] range. out_process_ids_size={}", - out_process_ids_size); - return ResultOutOfRange; - } - - const auto& kernel = system.Kernel(); - const auto total_copy_size = out_process_ids_size * sizeof(u64); - - if (out_process_ids_size > 0 && !kernel.CurrentProcess()->PageTable().IsInsideAddressSpace( - out_process_ids, total_copy_size)) { - LOG_ERROR(Kernel_SVC, "Address range outside address space. begin=0x{:016X}, end=0x{:016X}", - out_process_ids, out_process_ids + total_copy_size); - return ResultInvalidCurrentMemory; - } - - auto& memory = system.Memory(); - const auto& process_list = kernel.GetProcessList(); - const auto num_processes = process_list.size(); - const auto copy_amount = std::min(std::size_t{out_process_ids_size}, num_processes); - - for (std::size_t i = 0; i < copy_amount; ++i) { - memory.Write64(out_process_ids, process_list[i]->GetProcessID()); - out_process_ids += sizeof(u64); - } - - *out_num_processes = static_cast(num_processes); - return ResultSuccess; -} - -static Result GetThreadList(Core::System& system, u32* out_num_threads, VAddr out_thread_ids, - u32 out_thread_ids_size, Handle debug_handle) { - // TODO: Handle this case when debug events are supported. - UNIMPLEMENTED_IF(debug_handle != InvalidHandle); - - LOG_DEBUG(Kernel_SVC, "called. out_thread_ids=0x{:016X}, out_thread_ids_size={}", - out_thread_ids, out_thread_ids_size); - - // If the size is negative or larger than INT32_MAX / sizeof(u64) - if ((out_thread_ids_size & 0xF0000000) != 0) { - LOG_ERROR(Kernel_SVC, "Supplied size outside [0, 0x0FFFFFFF] range. size={}", - out_thread_ids_size); - return ResultOutOfRange; - } - - auto* const current_process = system.Kernel().CurrentProcess(); - const auto total_copy_size = out_thread_ids_size * sizeof(u64); - - if (out_thread_ids_size > 0 && - !current_process->PageTable().IsInsideAddressSpace(out_thread_ids, total_copy_size)) { - LOG_ERROR(Kernel_SVC, "Address range outside address space. begin=0x{:016X}, end=0x{:016X}", - out_thread_ids, out_thread_ids + total_copy_size); - return ResultInvalidCurrentMemory; - } - - auto& memory = system.Memory(); - const auto& thread_list = current_process->GetThreadList(); - const auto num_threads = thread_list.size(); - const auto copy_amount = std::min(std::size_t{out_thread_ids_size}, num_threads); - - auto list_iter = thread_list.cbegin(); - for (std::size_t i = 0; i < copy_amount; ++i, ++list_iter) { - memory.Write64(out_thread_ids, (*list_iter)->GetThreadID()); - out_thread_ids += sizeof(u64); - } - - *out_num_threads = static_cast(num_threads); - return ResultSuccess; -} - -static Result FlushProcessDataCache32(Core::System& system, Handle process_handle, u64 address, - u64 size) { - // Validate address/size. - R_UNLESS(size > 0, ResultInvalidSize); - R_UNLESS(address == static_cast(address), ResultInvalidCurrentMemory); - R_UNLESS(size == static_cast(size), ResultInvalidCurrentMemory); - - // Get the process from its handle. - KScopedAutoObject process = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(process_handle); - R_UNLESS(process.IsNotNull(), ResultInvalidHandle); - - // Verify the region is within range. - auto& page_table = process->PageTable(); - R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory); - - // Perform the operation. - R_RETURN(system.Memory().FlushDataCache(*process, address, size)); -} - -namespace { struct FunctionDef { using Func = void(Core::System&); @@ -2699,6 +18,7 @@ struct FunctionDef { Func* func; const char* name; }; + } // namespace static const FunctionDef SVC_Table_32[] = { diff --git a/src/core/hle/kernel/svc.h b/src/core/hle/kernel/svc.h index 13f061b83..b599f9a3d 100644 --- a/src/core/hle/kernel/svc.h +++ b/src/core/hle/kernel/svc.h @@ -4,6 +4,8 @@ #pragma once #include "common/common_types.h" +#include "core/hle/kernel/svc_types.h" +#include "core/hle/result.h" namespace Core { class System; @@ -13,4 +15,158 @@ namespace Kernel::Svc { void Call(Core::System& system, u32 immediate); +Result SetHeapSize(Core::System& system, VAddr* out_address, u64 size); +Result SetMemoryPermission(Core::System& system, VAddr address, u64 size, MemoryPermission perm); +Result SetMemoryAttribute(Core::System& system, VAddr address, u64 size, u32 mask, u32 attr); +Result MapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size); +Result UnmapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size); +Result QueryMemory(Core::System& system, VAddr memory_info_address, VAddr page_info_address, + VAddr query_address); +void ExitProcess(Core::System& system); +Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point, u64 arg, + VAddr stack_bottom, u32 priority, s32 core_id); +Result StartThread(Core::System& system, Handle thread_handle); +void ExitThread(Core::System& system); +void SleepThread(Core::System& system, s64 nanoseconds); +Result GetThreadPriority(Core::System& system, u32* out_priority, Handle handle); +Result SetThreadPriority(Core::System& system, Handle thread_handle, u32 priority); +Result GetThreadCoreMask(Core::System& system, Handle thread_handle, s32* out_core_id, + u64* out_affinity_mask); +Result SetThreadCoreMask(Core::System& system, Handle thread_handle, s32 core_id, + u64 affinity_mask); +u32 GetCurrentProcessorNumber(Core::System& system); +Result SignalEvent(Core::System& system, Handle event_handle); +Result ClearEvent(Core::System& system, Handle event_handle); +Result MapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, u64 size, + MemoryPermission map_perm); +Result UnmapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, u64 size); +Result CreateTransferMemory(Core::System& system, Handle* out, VAddr address, u64 size, + MemoryPermission map_perm); +Result CloseHandle(Core::System& system, Handle handle); +Result ResetSignal(Core::System& system, Handle handle); +Result WaitSynchronization(Core::System& system, s32* index, VAddr handles_address, s32 num_handles, + s64 nano_seconds); +Result CancelSynchronization(Core::System& system, Handle handle); +Result ArbitrateLock(Core::System& system, Handle thread_handle, VAddr address, u32 tag); +Result ArbitrateUnlock(Core::System& system, VAddr address); +Result WaitProcessWideKeyAtomic(Core::System& system, VAddr address, VAddr cv_key, u32 tag, + s64 timeout_ns); +void SignalProcessWideKey(Core::System& system, VAddr cv_key, s32 count); +u64 GetSystemTick(Core::System& system); +Result ConnectToNamedPort(Core::System& system, Handle* out, VAddr port_name_address); +Result SendSyncRequest(Core::System& system, Handle handle); +Result GetProcessId(Core::System& system, u64* out_process_id, Handle handle); +Result GetThreadId(Core::System& system, u64* out_thread_id, Handle thread_handle); +void Break(Core::System& system, u32 reason, u64 info1, u64 info2); +void OutputDebugString(Core::System& system, VAddr address, u64 len); +Result GetInfo(Core::System& system, u64* result, u64 info_id, Handle handle, u64 info_sub_id); +Result MapPhysicalMemory(Core::System& system, VAddr addr, u64 size); +Result UnmapPhysicalMemory(Core::System& system, VAddr addr, u64 size); +Result GetResourceLimitLimitValue(Core::System& system, u64* out_limit_value, + Handle resource_limit_handle, LimitableResource which); +Result GetResourceLimitCurrentValue(Core::System& system, u64* out_current_value, + Handle resource_limit_handle, LimitableResource which); +Result SetThreadActivity(Core::System& system, Handle thread_handle, + ThreadActivity thread_activity); +Result GetThreadContext(Core::System& system, VAddr out_context, Handle thread_handle); +Result WaitForAddress(Core::System& system, VAddr address, ArbitrationType arb_type, s32 value, + s64 timeout_ns); +Result SignalToAddress(Core::System& system, VAddr address, SignalType signal_type, s32 value, + s32 count); +void SynchronizePreemptionState(Core::System& system); +void KernelDebug(Core::System& system, u32 kernel_debug_type, u64 param1, u64 param2, u64 param3); +void ChangeKernelTraceState(Core::System& system, u32 trace_state); +Result CreateSession(Core::System& system, Handle* out_server, Handle* out_client, u32 is_light, + u64 name); +Result ReplyAndReceive(Core::System& system, s32* out_index, Handle* handles, s32 num_handles, + Handle reply_target, s64 timeout_ns); +Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_read); +Result CreateCodeMemory(Core::System& system, Handle* out, VAddr address, size_t size); +Result ControlCodeMemory(Core::System& system, Handle code_memory_handle, u32 operation, + VAddr address, size_t size, MemoryPermission perm); +Result GetProcessList(Core::System& system, u32* out_num_processes, VAddr out_process_ids, + u32 out_process_ids_size); +Result GetThreadList(Core::System& system, u32* out_num_threads, VAddr out_thread_ids, + u32 out_thread_ids_size, Handle debug_handle); +Result SetProcessMemoryPermission(Core::System& system, Handle process_handle, VAddr address, + u64 size, MemoryPermission perm); +Result MapProcessMemory(Core::System& system, VAddr dst_address, Handle process_handle, + VAddr src_address, u64 size); +Result UnmapProcessMemory(Core::System& system, VAddr dst_address, Handle process_handle, + VAddr src_address, u64 size); +Result QueryProcessMemory(Core::System& system, VAddr memory_info_address, VAddr page_info_address, + Handle process_handle, VAddr address); +Result MapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst_address, + u64 src_address, u64 size); +Result UnmapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst_address, + u64 src_address, u64 size); +Result GetProcessInfo(Core::System& system, u64* out, Handle process_handle, u32 type); +Result CreateResourceLimit(Core::System& system, Handle* out_handle); +Result SetResourceLimitLimitValue(Core::System& system, Handle resource_limit_handle, + LimitableResource which, u64 limit_value); + +// + +Result SetHeapSize32(Core::System& system, u32* heap_addr, u32 heap_size); +Result SetMemoryAttribute32(Core::System& system, u32 address, u32 size, u32 mask, u32 attr); +Result MapMemory32(Core::System& system, u32 dst_addr, u32 src_addr, u32 size); +Result UnmapMemory32(Core::System& system, u32 dst_addr, u32 src_addr, u32 size); +Result QueryMemory32(Core::System& system, u32 memory_info_address, u32 page_info_address, + u32 query_address); +void ExitProcess32(Core::System& system); +Result CreateThread32(Core::System& system, Handle* out_handle, u32 priority, u32 entry_point, + u32 arg, u32 stack_top, s32 processor_id); +Result StartThread32(Core::System& system, Handle thread_handle); +void ExitThread32(Core::System& system); +void SleepThread32(Core::System& system, u32 nanoseconds_low, u32 nanoseconds_high); +Result GetThreadPriority32(Core::System& system, u32* out_priority, Handle handle); +Result SetThreadPriority32(Core::System& system, Handle thread_handle, u32 priority); +Result GetThreadCoreMask32(Core::System& system, Handle thread_handle, s32* out_core_id, + u32* out_affinity_mask_low, u32* out_affinity_mask_high); +Result SetThreadCoreMask32(Core::System& system, Handle thread_handle, s32 core_id, + u32 affinity_mask_low, u32 affinity_mask_high); +u32 GetCurrentProcessorNumber32(Core::System& system); +Result SignalEvent32(Core::System& system, Handle event_handle); +Result ClearEvent32(Core::System& system, Handle event_handle); +Result MapSharedMemory32(Core::System& system, Handle shmem_handle, u32 address, u32 size, + MemoryPermission map_perm); +Result UnmapSharedMemory32(Core::System& system, Handle shmem_handle, u32 address, u32 size); +Result CreateTransferMemory32(Core::System& system, Handle* out, u32 address, u32 size, + MemoryPermission map_perm); +Result CloseHandle32(Core::System& system, Handle handle); +Result ResetSignal32(Core::System& system, Handle handle); +Result WaitSynchronization32(Core::System& system, u32 timeout_low, u32 handles_address, + s32 num_handles, u32 timeout_high, s32* index); +Result CancelSynchronization32(Core::System& system, Handle handle); +Result ArbitrateLock32(Core::System& system, Handle thread_handle, u32 address, u32 tag); +Result ArbitrateUnlock32(Core::System& system, u32 address); +Result WaitProcessWideKeyAtomic32(Core::System& system, u32 address, u32 cv_key, u32 tag, + u32 timeout_ns_low, u32 timeout_ns_high); +void SignalProcessWideKey32(Core::System& system, u32 cv_key, s32 count); +void GetSystemTick32(Core::System& system, u32* time_low, u32* time_high); +Result ConnectToNamedPort32(Core::System& system, Handle* out_handle, u32 port_name_address); +Result SendSyncRequest32(Core::System& system, Handle handle); +Result GetProcessId32(Core::System& system, u32* out_process_id_low, u32* out_process_id_high, + Handle handle); +Result GetThreadId32(Core::System& system, u32* out_thread_id_low, u32* out_thread_id_high, + Handle thread_handle); +void Break32(Core::System& system, u32 reason, u32 info1, u32 info2); +void OutputDebugString32(Core::System& system, u32 address, u32 len); +Result GetInfo32(Core::System& system, u32* result_low, u32* result_high, u32 sub_id_low, + u32 info_id, u32 handle, u32 sub_id_high); +Result MapPhysicalMemory32(Core::System& system, u32 addr, u32 size); +Result UnmapPhysicalMemory32(Core::System& system, u32 addr, u32 size); +Result SetThreadActivity32(Core::System& system, Handle thread_handle, + ThreadActivity thread_activity); +Result GetThreadContext32(Core::System& system, u32 out_context, Handle thread_handle); +Result WaitForAddress32(Core::System& system, u32 address, ArbitrationType arb_type, s32 value, + u32 timeout_ns_low, u32 timeout_ns_high); +Result SignalToAddress32(Core::System& system, u32 address, SignalType signal_type, s32 value, + s32 count); +Result CreateEvent32(Core::System& system, Handle* out_write, Handle* out_read); +Result CreateCodeMemory32(Core::System& system, Handle* out, u32 address, u32 size); +Result ControlCodeMemory32(Core::System& system, Handle code_memory_handle, u32 operation, + u64 address, u64 size, MemoryPermission perm); +Result FlushProcessDataCache32(Core::System& system, Handle process_handle, u64 address, u64 size); + } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_activity.cpp b/src/core/hle/kernel/svc/svc_activity.cpp new file mode 100644 index 000000000..8774a5c98 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_activity.cpp @@ -0,0 +1,44 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/k_thread.h" +#include "core/hle/kernel/svc.h" +#include "core/hle/kernel/svc_results.h" + +namespace Kernel::Svc { + +/// Sets the thread activity +Result SetThreadActivity(Core::System& system, Handle thread_handle, + ThreadActivity thread_activity) { + LOG_DEBUG(Kernel_SVC, "called, handle=0x{:08X}, activity=0x{:08X}", thread_handle, + thread_activity); + + // Validate the activity. + constexpr auto IsValidThreadActivity = [](ThreadActivity activity) { + return activity == ThreadActivity::Runnable || activity == ThreadActivity::Paused; + }; + R_UNLESS(IsValidThreadActivity(thread_activity), ResultInvalidEnumValue); + + // Get the thread from its handle. + KScopedAutoObject thread = + system.Kernel().CurrentProcess()->GetHandleTable().GetObject(thread_handle); + R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); + + // Check that the activity is being set on a non-current thread for the current process. + R_UNLESS(thread->GetOwnerProcess() == system.Kernel().CurrentProcess(), ResultInvalidHandle); + R_UNLESS(thread.GetPointerUnsafe() != GetCurrentThreadPointer(system.Kernel()), ResultBusy); + + // Set the activity. + R_TRY(thread->SetActivity(thread_activity)); + + return ResultSuccess; +} + +Result SetThreadActivity32(Core::System& system, Handle thread_handle, + ThreadActivity thread_activity) { + return SetThreadActivity(system, thread_handle, thread_activity); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_address_arbiter.cpp b/src/core/hle/kernel/svc/svc_address_arbiter.cpp new file mode 100644 index 000000000..842107726 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_address_arbiter.cpp @@ -0,0 +1,113 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/hle/kernel/k_memory_layout.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/svc.h" +#include "core/hle/kernel/svc_results.h" +#include "core/hle/kernel/svc_types.h" + +namespace Kernel::Svc { +namespace { + +constexpr bool IsValidSignalType(Svc::SignalType type) { + switch (type) { + case Svc::SignalType::Signal: + case Svc::SignalType::SignalAndIncrementIfEqual: + case Svc::SignalType::SignalAndModifyByWaitingCountIfEqual: + return true; + default: + return false; + } +} + +constexpr bool IsValidArbitrationType(Svc::ArbitrationType type) { + switch (type) { + case Svc::ArbitrationType::WaitIfLessThan: + case Svc::ArbitrationType::DecrementAndWaitIfLessThan: + case Svc::ArbitrationType::WaitIfEqual: + return true; + default: + return false; + } +} + +} // namespace + +// Wait for an address (via Address Arbiter) +Result WaitForAddress(Core::System& system, VAddr address, ArbitrationType arb_type, s32 value, + s64 timeout_ns) { + LOG_TRACE(Kernel_SVC, "called, address=0x{:X}, arb_type=0x{:X}, value=0x{:X}, timeout_ns={}", + address, arb_type, value, timeout_ns); + + // Validate input. + if (IsKernelAddress(address)) { + LOG_ERROR(Kernel_SVC, "Attempting to wait on kernel address (address={:08X})", address); + return ResultInvalidCurrentMemory; + } + if (!Common::IsAligned(address, sizeof(s32))) { + LOG_ERROR(Kernel_SVC, "Wait address must be 4 byte aligned (address={:08X})", address); + return ResultInvalidAddress; + } + if (!IsValidArbitrationType(arb_type)) { + LOG_ERROR(Kernel_SVC, "Invalid arbitration type specified (type={})", arb_type); + return ResultInvalidEnumValue; + } + + // Convert timeout from nanoseconds to ticks. + s64 timeout{}; + if (timeout_ns > 0) { + const s64 offset_tick(timeout_ns); + if (offset_tick > 0) { + timeout = offset_tick + 2; + if (timeout <= 0) { + timeout = std::numeric_limits::max(); + } + } else { + timeout = std::numeric_limits::max(); + } + } else { + timeout = timeout_ns; + } + + return system.Kernel().CurrentProcess()->WaitAddressArbiter(address, arb_type, value, timeout); +} + +Result WaitForAddress32(Core::System& system, u32 address, ArbitrationType arb_type, s32 value, + u32 timeout_ns_low, u32 timeout_ns_high) { + const auto timeout = static_cast(timeout_ns_low | (u64{timeout_ns_high} << 32)); + return WaitForAddress(system, address, arb_type, value, timeout); +} + +// Signals to an address (via Address Arbiter) +Result SignalToAddress(Core::System& system, VAddr address, SignalType signal_type, s32 value, + s32 count) { + LOG_TRACE(Kernel_SVC, "called, address=0x{:X}, signal_type=0x{:X}, value=0x{:X}, count=0x{:X}", + address, signal_type, value, count); + + // Validate input. + if (IsKernelAddress(address)) { + LOG_ERROR(Kernel_SVC, "Attempting to signal to a kernel address (address={:08X})", address); + return ResultInvalidCurrentMemory; + } + if (!Common::IsAligned(address, sizeof(s32))) { + LOG_ERROR(Kernel_SVC, "Signaled address must be 4 byte aligned (address={:08X})", address); + return ResultInvalidAddress; + } + if (!IsValidSignalType(signal_type)) { + LOG_ERROR(Kernel_SVC, "Invalid signal type specified (type={})", signal_type); + return ResultInvalidEnumValue; + } + + return system.Kernel().CurrentProcess()->SignalAddressArbiter(address, signal_type, value, + count); +} + +Result SignalToAddress32(Core::System& system, u32 address, SignalType signal_type, s32 value, + s32 count) { + return SignalToAddress(system, address, signal_type, value, count); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_address_translation.cpp b/src/core/hle/kernel/svc/svc_address_translation.cpp new file mode 100644 index 000000000..299e22ae6 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_address_translation.cpp @@ -0,0 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc {} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_cache.cpp b/src/core/hle/kernel/svc/svc_cache.cpp new file mode 100644 index 000000000..42167d35b --- /dev/null +++ b/src/core/hle/kernel/svc/svc_cache.cpp @@ -0,0 +1,31 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/svc.h" +#include "core/hle/kernel/svc_results.h" +#include "core/hle/kernel/svc_types.h" + +namespace Kernel::Svc { + +Result FlushProcessDataCache32(Core::System& system, Handle process_handle, u64 address, u64 size) { + // Validate address/size. + R_UNLESS(size > 0, ResultInvalidSize); + R_UNLESS(address == static_cast(address), ResultInvalidCurrentMemory); + R_UNLESS(size == static_cast(size), ResultInvalidCurrentMemory); + + // Get the process from its handle. + KScopedAutoObject process = + system.Kernel().CurrentProcess()->GetHandleTable().GetObject(process_handle); + R_UNLESS(process.IsNotNull(), ResultInvalidHandle); + + // Verify the region is within range. + auto& page_table = process->PageTable(); + R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory); + + // Perform the operation. + R_RETURN(system.Memory().FlushDataCache(*process, address, size)); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_code_memory.cpp b/src/core/hle/kernel/svc/svc_code_memory.cpp new file mode 100644 index 000000000..4cb21e101 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_code_memory.cpp @@ -0,0 +1,154 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/hle/kernel/k_code_memory.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { +namespace { + +constexpr bool IsValidMapCodeMemoryPermission(MemoryPermission perm) { + return perm == MemoryPermission::ReadWrite; +} + +constexpr bool IsValidMapToOwnerCodeMemoryPermission(MemoryPermission perm) { + return perm == MemoryPermission::Read || perm == MemoryPermission::ReadExecute; +} + +constexpr bool IsValidUnmapCodeMemoryPermission(MemoryPermission perm) { + return perm == MemoryPermission::None; +} + +constexpr bool IsValidUnmapFromOwnerCodeMemoryPermission(MemoryPermission perm) { + return perm == MemoryPermission::None; +} + +} // namespace + +Result CreateCodeMemory(Core::System& system, Handle* out, VAddr address, size_t size) { + LOG_TRACE(Kernel_SVC, "called, address=0x{:X}, size=0x{:X}", address, size); + + // Get kernel instance. + auto& kernel = system.Kernel(); + + // Validate address / size. + R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); + R_UNLESS(size > 0, ResultInvalidSize); + R_UNLESS((address < address + size), ResultInvalidCurrentMemory); + + // Create the code memory. + + KCodeMemory* code_mem = KCodeMemory::Create(kernel); + R_UNLESS(code_mem != nullptr, ResultOutOfResource); + + // Verify that the region is in range. + R_UNLESS(system.CurrentProcess()->PageTable().Contains(address, size), + ResultInvalidCurrentMemory); + + // Initialize the code memory. + R_TRY(code_mem->Initialize(system.DeviceMemory(), address, size)); + + // Register the code memory. + KCodeMemory::Register(kernel, code_mem); + + // Add the code memory to the handle table. + R_TRY(system.CurrentProcess()->GetHandleTable().Add(out, code_mem)); + + code_mem->Close(); + + return ResultSuccess; +} + +Result CreateCodeMemory32(Core::System& system, Handle* out, u32 address, u32 size) { + return CreateCodeMemory(system, out, address, size); +} + +Result ControlCodeMemory(Core::System& system, Handle code_memory_handle, u32 operation, + VAddr address, size_t size, MemoryPermission perm) { + + LOG_TRACE(Kernel_SVC, + "called, code_memory_handle=0x{:X}, operation=0x{:X}, address=0x{:X}, size=0x{:X}, " + "permission=0x{:X}", + code_memory_handle, operation, address, size, perm); + + // Validate the address / size. + R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); + R_UNLESS(size > 0, ResultInvalidSize); + R_UNLESS((address < address + size), ResultInvalidCurrentMemory); + + // Get the code memory from its handle. + KScopedAutoObject code_mem = + system.CurrentProcess()->GetHandleTable().GetObject(code_memory_handle); + R_UNLESS(code_mem.IsNotNull(), ResultInvalidHandle); + + // NOTE: Here, Atmosphere extends the SVC to allow code memory operations on one's own process. + // This enables homebrew usage of these SVCs for JIT. + + // Perform the operation. + switch (static_cast(operation)) { + case CodeMemoryOperation::Map: { + // Check that the region is in range. + R_UNLESS( + system.CurrentProcess()->PageTable().CanContain(address, size, KMemoryState::CodeOut), + ResultInvalidMemoryRegion); + + // Check the memory permission. + R_UNLESS(IsValidMapCodeMemoryPermission(perm), ResultInvalidNewMemoryPermission); + + // Map the memory. + R_TRY(code_mem->Map(address, size)); + } break; + case CodeMemoryOperation::Unmap: { + // Check that the region is in range. + R_UNLESS( + system.CurrentProcess()->PageTable().CanContain(address, size, KMemoryState::CodeOut), + ResultInvalidMemoryRegion); + + // Check the memory permission. + R_UNLESS(IsValidUnmapCodeMemoryPermission(perm), ResultInvalidNewMemoryPermission); + + // Unmap the memory. + R_TRY(code_mem->Unmap(address, size)); + } break; + case CodeMemoryOperation::MapToOwner: { + // Check that the region is in range. + R_UNLESS(code_mem->GetOwner()->PageTable().CanContain(address, size, + KMemoryState::GeneratedCode), + ResultInvalidMemoryRegion); + + // Check the memory permission. + R_UNLESS(IsValidMapToOwnerCodeMemoryPermission(perm), ResultInvalidNewMemoryPermission); + + // Map the memory to its owner. + R_TRY(code_mem->MapToOwner(address, size, perm)); + } break; + case CodeMemoryOperation::UnmapFromOwner: { + // Check that the region is in range. + R_UNLESS(code_mem->GetOwner()->PageTable().CanContain(address, size, + KMemoryState::GeneratedCode), + ResultInvalidMemoryRegion); + + // Check the memory permission. + R_UNLESS(IsValidUnmapFromOwnerCodeMemoryPermission(perm), ResultInvalidNewMemoryPermission); + + // Unmap the memory from its owner. + R_TRY(code_mem->UnmapFromOwner(address, size)); + } break; + default: + return ResultInvalidEnumValue; + } + + return ResultSuccess; +} + +Result ControlCodeMemory32(Core::System& system, Handle code_memory_handle, u32 operation, + u64 address, u64 size, MemoryPermission perm) { + return ControlCodeMemory(system, code_memory_handle, operation, address, size, perm); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_condition_variable.cpp b/src/core/hle/kernel/svc/svc_condition_variable.cpp new file mode 100644 index 000000000..d6cfc87c5 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_condition_variable.cpp @@ -0,0 +1,69 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/hle/kernel/k_memory_layout.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/svc.h" +#include "core/hle/kernel/svc_results.h" + +namespace Kernel::Svc { + +/// Wait process wide key atomic +Result WaitProcessWideKeyAtomic(Core::System& system, VAddr address, VAddr cv_key, u32 tag, + s64 timeout_ns) { + LOG_TRACE(Kernel_SVC, "called address={:X}, cv_key={:X}, tag=0x{:08X}, timeout_ns={}", address, + cv_key, tag, timeout_ns); + + // Validate input. + if (IsKernelAddress(address)) { + LOG_ERROR(Kernel_SVC, "Attempted to wait on kernel address (address={:08X})", address); + return ResultInvalidCurrentMemory; + } + if (!Common::IsAligned(address, sizeof(s32))) { + LOG_ERROR(Kernel_SVC, "Address must be 4 byte aligned (address={:08X})", address); + return ResultInvalidAddress; + } + + // Convert timeout from nanoseconds to ticks. + s64 timeout{}; + if (timeout_ns > 0) { + const s64 offset_tick(timeout_ns); + if (offset_tick > 0) { + timeout = offset_tick + 2; + if (timeout <= 0) { + timeout = std::numeric_limits::max(); + } + } else { + timeout = std::numeric_limits::max(); + } + } else { + timeout = timeout_ns; + } + + // Wait on the condition variable. + return system.Kernel().CurrentProcess()->WaitConditionVariable( + address, Common::AlignDown(cv_key, sizeof(u32)), tag, timeout); +} + +Result WaitProcessWideKeyAtomic32(Core::System& system, u32 address, u32 cv_key, u32 tag, + u32 timeout_ns_low, u32 timeout_ns_high) { + const auto timeout_ns = static_cast(timeout_ns_low | (u64{timeout_ns_high} << 32)); + return WaitProcessWideKeyAtomic(system, address, cv_key, tag, timeout_ns); +} + +/// Signal process wide key +void SignalProcessWideKey(Core::System& system, VAddr cv_key, s32 count) { + LOG_TRACE(Kernel_SVC, "called, cv_key=0x{:X}, count=0x{:08X}", cv_key, count); + + // Signal the condition variable. + return system.Kernel().CurrentProcess()->SignalConditionVariable( + Common::AlignDown(cv_key, sizeof(u32)), count); +} + +void SignalProcessWideKey32(Core::System& system, u32 cv_key, s32 count) { + SignalProcessWideKey(system, cv_key, count); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_debug.cpp b/src/core/hle/kernel/svc/svc_debug.cpp new file mode 100644 index 000000000..299e22ae6 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_debug.cpp @@ -0,0 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc {} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_debug_string.cpp b/src/core/hle/kernel/svc/svc_debug_string.cpp new file mode 100644 index 000000000..486e62cc4 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_debug_string.cpp @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/hle/kernel/svc.h" +#include "core/memory.h" + +namespace Kernel::Svc { + +/// Used to output a message on a debug hardware unit - does nothing on a retail unit +void OutputDebugString(Core::System& system, VAddr address, u64 len) { + if (len == 0) { + return; + } + + std::string str(len, '\0'); + system.Memory().ReadBlock(address, str.data(), str.size()); + LOG_DEBUG(Debug_Emulated, "{}", str); +} + +void OutputDebugString32(Core::System& system, u32 address, u32 len) { + OutputDebugString(system, address, len); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_device_address_space.cpp b/src/core/hle/kernel/svc/svc_device_address_space.cpp new file mode 100644 index 000000000..299e22ae6 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_device_address_space.cpp @@ -0,0 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc {} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_event.cpp b/src/core/hle/kernel/svc/svc_event.cpp new file mode 100644 index 000000000..885f02f50 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_event.cpp @@ -0,0 +1,111 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "common/scope_exit.h" +#include "core/core.h" +#include "core/hle/kernel/k_event.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/k_scoped_resource_reservation.h" +#include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { + +Result SignalEvent(Core::System& system, Handle event_handle) { + LOG_DEBUG(Kernel_SVC, "called, event_handle=0x{:08X}", event_handle); + + // Get the current handle table. + const KHandleTable& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + + // Get the event. + KScopedAutoObject event = handle_table.GetObject(event_handle); + R_UNLESS(event.IsNotNull(), ResultInvalidHandle); + + return event->Signal(); +} + +Result SignalEvent32(Core::System& system, Handle event_handle) { + return SignalEvent(system, event_handle); +} + +Result ClearEvent(Core::System& system, Handle event_handle) { + LOG_TRACE(Kernel_SVC, "called, event_handle=0x{:08X}", event_handle); + + // Get the current handle table. + const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + + // Try to clear the writable event. + { + KScopedAutoObject event = handle_table.GetObject(event_handle); + if (event.IsNotNull()) { + return event->Clear(); + } + } + + // Try to clear the readable event. + { + KScopedAutoObject readable_event = handle_table.GetObject(event_handle); + if (readable_event.IsNotNull()) { + return readable_event->Clear(); + } + } + + LOG_ERROR(Kernel_SVC, "Event handle does not exist, event_handle=0x{:08X}", event_handle); + + return ResultInvalidHandle; +} + +Result ClearEvent32(Core::System& system, Handle event_handle) { + return ClearEvent(system, event_handle); +} + +Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_read) { + LOG_DEBUG(Kernel_SVC, "called"); + + // Get the kernel reference and handle table. + auto& kernel = system.Kernel(); + auto& handle_table = kernel.CurrentProcess()->GetHandleTable(); + + // Reserve a new event from the process resource limit + KScopedResourceReservation event_reservation(kernel.CurrentProcess(), + LimitableResource::EventCountMax); + R_UNLESS(event_reservation.Succeeded(), ResultLimitReached); + + // Create a new event. + KEvent* event = KEvent::Create(kernel); + R_UNLESS(event != nullptr, ResultOutOfResource); + + // Initialize the event. + event->Initialize(kernel.CurrentProcess()); + + // Commit the thread reservation. + event_reservation.Commit(); + + // Ensure that we clean up the event (and its only references are handle table) on function end. + SCOPE_EXIT({ + event->GetReadableEvent().Close(); + event->Close(); + }); + + // Register the event. + KEvent::Register(kernel, event); + + // Add the event to the handle table. + R_TRY(handle_table.Add(out_write, event)); + + // Ensure that we maintaing a clean handle state on exit. + auto handle_guard = SCOPE_GUARD({ handle_table.Remove(*out_write); }); + + // Add the readable event to the handle table. + R_TRY(handle_table.Add(out_read, std::addressof(event->GetReadableEvent()))); + + // We succeeded. + handle_guard.Cancel(); + return ResultSuccess; +} + +Result CreateEvent32(Core::System& system, Handle* out_write, Handle* out_read) { + return CreateEvent(system, out_write, out_read); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_exception.cpp b/src/core/hle/kernel/svc/svc_exception.cpp new file mode 100644 index 000000000..fb9f133c1 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_exception.cpp @@ -0,0 +1,121 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/debugger/debugger.h" +#include "core/hle/kernel/k_thread.h" +#include "core/hle/kernel/svc.h" +#include "core/hle/kernel/svc_types.h" +#include "core/memory.h" +#include "core/reporter.h" + +namespace Kernel::Svc { + +/// Break program execution +void Break(Core::System& system, u32 reason, u64 info1, u64 info2) { + BreakReason break_reason = + static_cast(reason & ~static_cast(BreakReason::NotificationOnlyFlag)); + bool notification_only = (reason & static_cast(BreakReason::NotificationOnlyFlag)) != 0; + + bool has_dumped_buffer{}; + std::vector debug_buffer; + + const auto handle_debug_buffer = [&](VAddr addr, u64 sz) { + if (sz == 0 || addr == 0 || has_dumped_buffer) { + return; + } + + auto& memory = system.Memory(); + + // This typically is an error code so we're going to assume this is the case + if (sz == sizeof(u32)) { + LOG_CRITICAL(Debug_Emulated, "debug_buffer_err_code={:X}", memory.Read32(addr)); + } else { + // We don't know what's in here so we'll hexdump it + debug_buffer.resize(sz); + memory.ReadBlock(addr, debug_buffer.data(), sz); + std::string hexdump; + for (std::size_t i = 0; i < debug_buffer.size(); i++) { + hexdump += fmt::format("{:02X} ", debug_buffer[i]); + if (i != 0 && i % 16 == 0) { + hexdump += '\n'; + } + } + LOG_CRITICAL(Debug_Emulated, "debug_buffer=\n{}", hexdump); + } + has_dumped_buffer = true; + }; + switch (break_reason) { + case BreakReason::Panic: + LOG_CRITICAL(Debug_Emulated, "Userspace PANIC! info1=0x{:016X}, info2=0x{:016X}", info1, + info2); + handle_debug_buffer(info1, info2); + break; + case BreakReason::Assert: + LOG_CRITICAL(Debug_Emulated, "Userspace Assertion failed! info1=0x{:016X}, info2=0x{:016X}", + info1, info2); + handle_debug_buffer(info1, info2); + break; + case BreakReason::User: + LOG_WARNING(Debug_Emulated, "Userspace Break! 0x{:016X} with size 0x{:016X}", info1, info2); + handle_debug_buffer(info1, info2); + break; + case BreakReason::PreLoadDll: + LOG_INFO(Debug_Emulated, + "Userspace Attempting to load an NRO at 0x{:016X} with size 0x{:016X}", info1, + info2); + break; + case BreakReason::PostLoadDll: + LOG_INFO(Debug_Emulated, "Userspace Loaded an NRO at 0x{:016X} with size 0x{:016X}", info1, + info2); + break; + case BreakReason::PreUnloadDll: + LOG_INFO(Debug_Emulated, + "Userspace Attempting to unload an NRO at 0x{:016X} with size 0x{:016X}", info1, + info2); + break; + case BreakReason::PostUnloadDll: + LOG_INFO(Debug_Emulated, "Userspace Unloaded an NRO at 0x{:016X} with size 0x{:016X}", + info1, info2); + break; + case BreakReason::CppException: + LOG_CRITICAL(Debug_Emulated, "Signalling debugger. Uncaught C++ exception encountered."); + break; + default: + LOG_WARNING( + Debug_Emulated, + "Signalling debugger, Unknown break reason {:#X}, info1=0x{:016X}, info2=0x{:016X}", + reason, info1, info2); + handle_debug_buffer(info1, info2); + break; + } + + system.GetReporter().SaveSvcBreakReport(reason, notification_only, info1, info2, + has_dumped_buffer ? std::make_optional(debug_buffer) + : std::nullopt); + + if (!notification_only) { + LOG_CRITICAL( + Debug_Emulated, + "Emulated program broke execution! reason=0x{:016X}, info1=0x{:016X}, info2=0x{:016X}", + reason, info1, info2); + + handle_debug_buffer(info1, info2); + + auto* const current_thread = GetCurrentThreadPointer(system.Kernel()); + const auto thread_processor_id = current_thread->GetActiveCore(); + system.ArmInterface(static_cast(thread_processor_id)).LogBacktrace(); + } + + if (system.DebuggerEnabled()) { + auto* thread = system.Kernel().GetCurrentEmuThread(); + system.GetDebugger().NotifyThreadStopped(thread); + thread->RequestSuspend(Kernel::SuspendType::Debug); + } +} + +void Break32(Core::System& system, u32 reason, u32 info1, u32 info2) { + Break(system, reason, info1, info2); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_info.cpp b/src/core/hle/kernel/svc/svc_info.cpp new file mode 100644 index 000000000..df5dd85a4 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_info.cpp @@ -0,0 +1,282 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/core_timing.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/k_resource_limit.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { + +/// Gets system/memory information for the current process +Result GetInfo(Core::System& system, u64* result, u64 info_id, Handle handle, u64 info_sub_id) { + LOG_TRACE(Kernel_SVC, "called info_id=0x{:X}, info_sub_id=0x{:X}, handle=0x{:08X}", info_id, + info_sub_id, handle); + + const auto info_id_type = static_cast(info_id); + + switch (info_id_type) { + case InfoType::CoreMask: + case InfoType::PriorityMask: + case InfoType::AliasRegionAddress: + case InfoType::AliasRegionSize: + case InfoType::HeapRegionAddress: + case InfoType::HeapRegionSize: + case InfoType::AslrRegionAddress: + case InfoType::AslrRegionSize: + case InfoType::StackRegionAddress: + case InfoType::StackRegionSize: + case InfoType::TotalMemorySize: + case InfoType::UsedMemorySize: + case InfoType::SystemResourceSizeTotal: + case InfoType::SystemResourceSizeUsed: + case InfoType::ProgramId: + case InfoType::UserExceptionContextAddress: + case InfoType::TotalNonSystemMemorySize: + case InfoType::UsedNonSystemMemorySize: + case InfoType::IsApplication: + case InfoType::FreeThreadCount: { + if (info_sub_id != 0) { + LOG_ERROR(Kernel_SVC, "Info sub id is non zero! info_id={}, info_sub_id={}", info_id, + info_sub_id); + return ResultInvalidEnumValue; + } + + const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + KScopedAutoObject process = handle_table.GetObject(handle); + if (process.IsNull()) { + LOG_ERROR(Kernel_SVC, "Process is not valid! info_id={}, info_sub_id={}, handle={:08X}", + info_id, info_sub_id, handle); + return ResultInvalidHandle; + } + + switch (info_id_type) { + case InfoType::CoreMask: + *result = process->GetCoreMask(); + return ResultSuccess; + + case InfoType::PriorityMask: + *result = process->GetPriorityMask(); + return ResultSuccess; + + case InfoType::AliasRegionAddress: + *result = process->PageTable().GetAliasRegionStart(); + return ResultSuccess; + + case InfoType::AliasRegionSize: + *result = process->PageTable().GetAliasRegionSize(); + return ResultSuccess; + + case InfoType::HeapRegionAddress: + *result = process->PageTable().GetHeapRegionStart(); + return ResultSuccess; + + case InfoType::HeapRegionSize: + *result = process->PageTable().GetHeapRegionSize(); + return ResultSuccess; + + case InfoType::AslrRegionAddress: + *result = process->PageTable().GetAliasCodeRegionStart(); + return ResultSuccess; + + case InfoType::AslrRegionSize: + *result = process->PageTable().GetAliasCodeRegionSize(); + return ResultSuccess; + + case InfoType::StackRegionAddress: + *result = process->PageTable().GetStackRegionStart(); + return ResultSuccess; + + case InfoType::StackRegionSize: + *result = process->PageTable().GetStackRegionSize(); + return ResultSuccess; + + case InfoType::TotalMemorySize: + *result = process->GetTotalPhysicalMemoryAvailable(); + return ResultSuccess; + + case InfoType::UsedMemorySize: + *result = process->GetTotalPhysicalMemoryUsed(); + return ResultSuccess; + + case InfoType::SystemResourceSizeTotal: + *result = process->GetSystemResourceSize(); + return ResultSuccess; + + case InfoType::SystemResourceSizeUsed: + LOG_WARNING(Kernel_SVC, "(STUBBED) Attempted to query system resource usage"); + *result = process->GetSystemResourceUsage(); + return ResultSuccess; + + case InfoType::ProgramId: + *result = process->GetProgramID(); + return ResultSuccess; + + case InfoType::UserExceptionContextAddress: + *result = process->GetProcessLocalRegionAddress(); + return ResultSuccess; + + case InfoType::TotalNonSystemMemorySize: + *result = process->GetTotalPhysicalMemoryAvailableWithoutSystemResource(); + return ResultSuccess; + + case InfoType::UsedNonSystemMemorySize: + *result = process->GetTotalPhysicalMemoryUsedWithoutSystemResource(); + return ResultSuccess; + + case InfoType::FreeThreadCount: + *result = process->GetFreeThreadCount(); + return ResultSuccess; + + default: + break; + } + + LOG_ERROR(Kernel_SVC, "Unimplemented svcGetInfo id=0x{:016X}", info_id); + return ResultInvalidEnumValue; + } + + case InfoType::DebuggerAttached: + *result = 0; + return ResultSuccess; + + case InfoType::ResourceLimit: { + if (handle != 0) { + LOG_ERROR(Kernel, "Handle is non zero! handle={:08X}", handle); + return ResultInvalidHandle; + } + + if (info_sub_id != 0) { + LOG_ERROR(Kernel, "Info sub id is non zero! info_id={}, info_sub_id={}", info_id, + info_sub_id); + return ResultInvalidCombination; + } + + KProcess* const current_process = system.Kernel().CurrentProcess(); + KHandleTable& handle_table = current_process->GetHandleTable(); + const auto resource_limit = current_process->GetResourceLimit(); + if (!resource_limit) { + *result = Svc::InvalidHandle; + // Yes, the kernel considers this a successful operation. + return ResultSuccess; + } + + Handle resource_handle{}; + R_TRY(handle_table.Add(&resource_handle, resource_limit)); + + *result = resource_handle; + return ResultSuccess; + } + + case InfoType::RandomEntropy: + if (handle != 0) { + LOG_ERROR(Kernel_SVC, "Process Handle is non zero, expected 0 result but got {:016X}", + handle); + return ResultInvalidHandle; + } + + if (info_sub_id >= KProcess::RANDOM_ENTROPY_SIZE) { + LOG_ERROR(Kernel_SVC, "Entropy size is out of range, expected {} but got {}", + KProcess::RANDOM_ENTROPY_SIZE, info_sub_id); + return ResultInvalidCombination; + } + + *result = system.Kernel().CurrentProcess()->GetRandomEntropy(info_sub_id); + return ResultSuccess; + + case InfoType::InitialProcessIdRange: + LOG_WARNING(Kernel_SVC, + "(STUBBED) Attempted to query privileged process id bounds, returned 0"); + *result = 0; + return ResultSuccess; + + case InfoType::ThreadTickCount: { + constexpr u64 num_cpus = 4; + if (info_sub_id != 0xFFFFFFFFFFFFFFFF && info_sub_id >= num_cpus) { + LOG_ERROR(Kernel_SVC, "Core count is out of range, expected {} but got {}", num_cpus, + info_sub_id); + return ResultInvalidCombination; + } + + KScopedAutoObject thread = + system.Kernel().CurrentProcess()->GetHandleTable().GetObject( + static_cast(handle)); + if (thread.IsNull()) { + LOG_ERROR(Kernel_SVC, "Thread handle does not exist, handle=0x{:08X}", + static_cast(handle)); + return ResultInvalidHandle; + } + + const auto& core_timing = system.CoreTiming(); + const auto& scheduler = *system.Kernel().CurrentScheduler(); + const auto* const current_thread = GetCurrentThreadPointer(system.Kernel()); + const bool same_thread = current_thread == thread.GetPointerUnsafe(); + + const u64 prev_ctx_ticks = scheduler.GetLastContextSwitchTime(); + u64 out_ticks = 0; + if (same_thread && info_sub_id == 0xFFFFFFFFFFFFFFFF) { + const u64 thread_ticks = current_thread->GetCpuTime(); + + out_ticks = thread_ticks + (core_timing.GetCPUTicks() - prev_ctx_ticks); + } else if (same_thread && info_sub_id == system.Kernel().CurrentPhysicalCoreIndex()) { + out_ticks = core_timing.GetCPUTicks() - prev_ctx_ticks; + } + + *result = out_ticks; + return ResultSuccess; + } + case InfoType::IdleTickCount: { + // Verify the input handle is invalid. + R_UNLESS(handle == InvalidHandle, ResultInvalidHandle); + + // Verify the requested core is valid. + const bool core_valid = + (info_sub_id == 0xFFFFFFFFFFFFFFFF) || + (info_sub_id == static_cast(system.Kernel().CurrentPhysicalCoreIndex())); + R_UNLESS(core_valid, ResultInvalidCombination); + + // Get the idle tick count. + *result = system.Kernel().CurrentScheduler()->GetIdleThread()->GetCpuTime(); + return ResultSuccess; + } + case InfoType::MesosphereCurrentProcess: { + // Verify the input handle is invalid. + R_UNLESS(handle == InvalidHandle, ResultInvalidHandle); + + // Verify the sub-type is valid. + R_UNLESS(info_sub_id == 0, ResultInvalidCombination); + + // Get the handle table. + KProcess* current_process = system.Kernel().CurrentProcess(); + KHandleTable& handle_table = current_process->GetHandleTable(); + + // Get a new handle for the current process. + Handle tmp; + R_TRY(handle_table.Add(&tmp, current_process)); + + // Set the output. + *result = tmp; + + // We succeeded. + return ResultSuccess; + } + default: + LOG_ERROR(Kernel_SVC, "Unimplemented svcGetInfo id=0x{:016X}", info_id); + return ResultInvalidEnumValue; + } +} + +Result GetInfo32(Core::System& system, u32* result_low, u32* result_high, u32 sub_id_low, + u32 info_id, u32 handle, u32 sub_id_high) { + const u64 sub_id{u64{sub_id_low} | (u64{sub_id_high} << 32)}; + u64 res_value{}; + + const Result result{GetInfo(system, &res_value, info_id, handle, sub_id)}; + *result_high = static_cast(res_value >> 32); + *result_low = static_cast(res_value & std::numeric_limits::max()); + + return result; +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_interrupt_event.cpp b/src/core/hle/kernel/svc/svc_interrupt_event.cpp new file mode 100644 index 000000000..299e22ae6 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_interrupt_event.cpp @@ -0,0 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc {} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_io_pool.cpp b/src/core/hle/kernel/svc/svc_io_pool.cpp new file mode 100644 index 000000000..299e22ae6 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_io_pool.cpp @@ -0,0 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc {} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_ipc.cpp b/src/core/hle/kernel/svc/svc_ipc.cpp new file mode 100644 index 000000000..dbb68e89a --- /dev/null +++ b/src/core/hle/kernel/svc/svc_ipc.cpp @@ -0,0 +1,89 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "common/scope_exit.h" +#include "core/core.h" +#include "core/hle/kernel/k_client_session.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/k_server_session.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { + +/// Makes a blocking IPC call to a service. +Result SendSyncRequest(Core::System& system, Handle handle) { + auto& kernel = system.Kernel(); + + // Get the client session from its handle. + KScopedAutoObject session = + kernel.CurrentProcess()->GetHandleTable().GetObject(handle); + R_UNLESS(session.IsNotNull(), ResultInvalidHandle); + + LOG_TRACE(Kernel_SVC, "called handle=0x{:08X}({})", handle, session->GetName()); + + return session->SendSyncRequest(); +} + +Result SendSyncRequest32(Core::System& system, Handle handle) { + return SendSyncRequest(system, handle); +} + +Result ReplyAndReceive(Core::System& system, s32* out_index, Handle* handles, s32 num_handles, + Handle reply_target, s64 timeout_ns) { + auto& kernel = system.Kernel(); + auto& handle_table = GetCurrentThread(kernel).GetOwnerProcess()->GetHandleTable(); + + // Convert handle list to object table. + std::vector objs(num_handles); + R_UNLESS( + handle_table.GetMultipleObjects(objs.data(), handles, num_handles), + ResultInvalidHandle); + + // Ensure handles are closed when we're done. + SCOPE_EXIT({ + for (auto i = 0; i < num_handles; ++i) { + objs[i]->Close(); + } + }); + + // Reply to the target, if one is specified. + if (reply_target != InvalidHandle) { + KScopedAutoObject session = handle_table.GetObject(reply_target); + R_UNLESS(session.IsNotNull(), ResultInvalidHandle); + + // If we fail to reply, we want to set the output index to -1. + ON_RESULT_FAILURE { + *out_index = -1; + }; + + // Send the reply. + R_TRY(session->SendReply()); + } + + // Wait for a message. + while (true) { + // Wait for an object. + s32 index; + Result result = KSynchronizationObject::Wait(kernel, &index, objs.data(), + static_cast(objs.size()), timeout_ns); + if (result == ResultTimedOut) { + return result; + } + + // Receive the request. + if (R_SUCCEEDED(result)) { + KServerSession* session = objs[index]->DynamicCast(); + if (session != nullptr) { + result = session->ReceiveRequest(); + if (result == ResultNotFound) { + continue; + } + } + } + + *out_index = index; + return result; + } +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_kernel_debug.cpp b/src/core/hle/kernel/svc/svc_kernel_debug.cpp new file mode 100644 index 000000000..454255e7a --- /dev/null +++ b/src/core/hle/kernel/svc/svc_kernel_debug.cpp @@ -0,0 +1,19 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { + +void KernelDebug([[maybe_unused]] Core::System& system, [[maybe_unused]] u32 kernel_debug_type, + [[maybe_unused]] u64 param1, [[maybe_unused]] u64 param2, + [[maybe_unused]] u64 param3) { + // Intentionally do nothing, as this does nothing in released kernel binaries. +} + +void ChangeKernelTraceState([[maybe_unused]] Core::System& system, + [[maybe_unused]] u32 trace_state) { + // Intentionally do nothing, as this does nothing in released kernel binaries. +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_light_ipc.cpp b/src/core/hle/kernel/svc/svc_light_ipc.cpp new file mode 100644 index 000000000..299e22ae6 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_light_ipc.cpp @@ -0,0 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc {} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_lock.cpp b/src/core/hle/kernel/svc/svc_lock.cpp new file mode 100644 index 000000000..45f2a6553 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_lock.cpp @@ -0,0 +1,57 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/hle/kernel/k_memory_layout.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { + +/// Attempts to locks a mutex +Result ArbitrateLock(Core::System& system, Handle thread_handle, VAddr address, u32 tag) { + LOG_TRACE(Kernel_SVC, "called thread_handle=0x{:08X}, address=0x{:X}, tag=0x{:08X}", + thread_handle, address, tag); + + // Validate the input address. + if (IsKernelAddress(address)) { + LOG_ERROR(Kernel_SVC, "Attempting to arbitrate a lock on a kernel address (address={:08X})", + address); + return ResultInvalidCurrentMemory; + } + if (!Common::IsAligned(address, sizeof(u32))) { + LOG_ERROR(Kernel_SVC, "Input address must be 4 byte aligned (address: {:08X})", address); + return ResultInvalidAddress; + } + + return system.Kernel().CurrentProcess()->WaitForAddress(thread_handle, address, tag); +} + +Result ArbitrateLock32(Core::System& system, Handle thread_handle, u32 address, u32 tag) { + return ArbitrateLock(system, thread_handle, address, tag); +} + +/// Unlock a mutex +Result ArbitrateUnlock(Core::System& system, VAddr address) { + LOG_TRACE(Kernel_SVC, "called address=0x{:X}", address); + + // Validate the input address. + if (IsKernelAddress(address)) { + LOG_ERROR(Kernel_SVC, + "Attempting to arbitrate an unlock on a kernel address (address={:08X})", + address); + return ResultInvalidCurrentMemory; + } + if (!Common::IsAligned(address, sizeof(u32))) { + LOG_ERROR(Kernel_SVC, "Input address must be 4 byte aligned (address: {:08X})", address); + return ResultInvalidAddress; + } + + return system.Kernel().CurrentProcess()->SignalToAddress(address); +} + +Result ArbitrateUnlock32(Core::System& system, u32 address) { + return ArbitrateUnlock(system, address); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_memory.cpp b/src/core/hle/kernel/svc/svc_memory.cpp new file mode 100644 index 000000000..f78b1239b --- /dev/null +++ b/src/core/hle/kernel/svc/svc_memory.cpp @@ -0,0 +1,189 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { +namespace { + +constexpr bool IsValidSetMemoryPermission(MemoryPermission perm) { + switch (perm) { + case MemoryPermission::None: + case MemoryPermission::Read: + case MemoryPermission::ReadWrite: + return true; + default: + return false; + } +} + +// Checks if address + size is greater than the given address +// This can return false if the size causes an overflow of a 64-bit type +// or if the given size is zero. +constexpr bool IsValidAddressRange(VAddr address, u64 size) { + return address + size > address; +} + +// Helper function that performs the common sanity checks for svcMapMemory +// and svcUnmapMemory. This is doable, as both functions perform their sanitizing +// in the same order. +Result MapUnmapMemorySanityChecks(const KPageTable& manager, VAddr dst_addr, VAddr src_addr, + u64 size) { + if (!Common::Is4KBAligned(dst_addr)) { + LOG_ERROR(Kernel_SVC, "Destination address is not aligned to 4KB, 0x{:016X}", dst_addr); + return ResultInvalidAddress; + } + + if (!Common::Is4KBAligned(src_addr)) { + LOG_ERROR(Kernel_SVC, "Source address is not aligned to 4KB, 0x{:016X}", src_addr); + return ResultInvalidSize; + } + + if (size == 0) { + LOG_ERROR(Kernel_SVC, "Size is 0"); + return ResultInvalidSize; + } + + if (!Common::Is4KBAligned(size)) { + LOG_ERROR(Kernel_SVC, "Size is not aligned to 4KB, 0x{:016X}", size); + return ResultInvalidSize; + } + + if (!IsValidAddressRange(dst_addr, size)) { + LOG_ERROR(Kernel_SVC, + "Destination is not a valid address range, addr=0x{:016X}, size=0x{:016X}", + dst_addr, size); + return ResultInvalidCurrentMemory; + } + + if (!IsValidAddressRange(src_addr, size)) { + LOG_ERROR(Kernel_SVC, "Source is not a valid address range, addr=0x{:016X}, size=0x{:016X}", + src_addr, size); + return ResultInvalidCurrentMemory; + } + + if (!manager.IsInsideAddressSpace(src_addr, size)) { + LOG_ERROR(Kernel_SVC, + "Source is not within the address space, addr=0x{:016X}, size=0x{:016X}", + src_addr, size); + return ResultInvalidCurrentMemory; + } + + if (manager.IsOutsideStackRegion(dst_addr, size)) { + LOG_ERROR(Kernel_SVC, + "Destination is not within the stack region, addr=0x{:016X}, size=0x{:016X}", + dst_addr, size); + return ResultInvalidMemoryRegion; + } + + if (manager.IsInsideHeapRegion(dst_addr, size)) { + LOG_ERROR(Kernel_SVC, + "Destination does not fit within the heap region, addr=0x{:016X}, " + "size=0x{:016X}", + dst_addr, size); + return ResultInvalidMemoryRegion; + } + + if (manager.IsInsideAliasRegion(dst_addr, size)) { + LOG_ERROR(Kernel_SVC, + "Destination does not fit within the map region, addr=0x{:016X}, " + "size=0x{:016X}", + dst_addr, size); + return ResultInvalidMemoryRegion; + } + + return ResultSuccess; +} + +} // namespace + +Result SetMemoryPermission(Core::System& system, VAddr address, u64 size, MemoryPermission perm) { + LOG_DEBUG(Kernel_SVC, "called, address=0x{:016X}, size=0x{:X}, perm=0x{:08X", address, size, + perm); + + // Validate address / size. + R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); + R_UNLESS(size > 0, ResultInvalidSize); + R_UNLESS((address < address + size), ResultInvalidCurrentMemory); + + // Validate the permission. + R_UNLESS(IsValidSetMemoryPermission(perm), ResultInvalidNewMemoryPermission); + + // Validate that the region is in range for the current process. + auto& page_table = system.Kernel().CurrentProcess()->PageTable(); + R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory); + + // Set the memory attribute. + return page_table.SetMemoryPermission(address, size, perm); +} + +Result SetMemoryAttribute(Core::System& system, VAddr address, u64 size, u32 mask, u32 attr) { + LOG_DEBUG(Kernel_SVC, + "called, address=0x{:016X}, size=0x{:X}, mask=0x{:08X}, attribute=0x{:08X}", address, + size, mask, attr); + + // Validate address / size. + R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); + R_UNLESS(size > 0, ResultInvalidSize); + R_UNLESS((address < address + size), ResultInvalidCurrentMemory); + + // Validate the attribute and mask. + constexpr u32 SupportedMask = static_cast(MemoryAttribute::Uncached); + R_UNLESS((mask | attr) == mask, ResultInvalidCombination); + R_UNLESS((mask | attr | SupportedMask) == SupportedMask, ResultInvalidCombination); + + // Validate that the region is in range for the current process. + auto& page_table{system.Kernel().CurrentProcess()->PageTable()}; + R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory); + + // Set the memory attribute. + return page_table.SetMemoryAttribute(address, size, mask, attr); +} + +Result SetMemoryAttribute32(Core::System& system, u32 address, u32 size, u32 mask, u32 attr) { + return SetMemoryAttribute(system, address, size, mask, attr); +} + +/// Maps a memory range into a different range. +Result MapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size) { + LOG_TRACE(Kernel_SVC, "called, dst_addr=0x{:X}, src_addr=0x{:X}, size=0x{:X}", dst_addr, + src_addr, size); + + auto& page_table{system.Kernel().CurrentProcess()->PageTable()}; + + if (const Result result{MapUnmapMemorySanityChecks(page_table, dst_addr, src_addr, size)}; + result.IsError()) { + return result; + } + + return page_table.MapMemory(dst_addr, src_addr, size); +} + +Result MapMemory32(Core::System& system, u32 dst_addr, u32 src_addr, u32 size) { + return MapMemory(system, dst_addr, src_addr, size); +} + +/// Unmaps a region that was previously mapped with svcMapMemory +Result UnmapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size) { + LOG_TRACE(Kernel_SVC, "called, dst_addr=0x{:X}, src_addr=0x{:X}, size=0x{:X}", dst_addr, + src_addr, size); + + auto& page_table{system.Kernel().CurrentProcess()->PageTable()}; + + if (const Result result{MapUnmapMemorySanityChecks(page_table, dst_addr, src_addr, size)}; + result.IsError()) { + return result; + } + + return page_table.UnmapMemory(dst_addr, src_addr, size); +} + +Result UnmapMemory32(Core::System& system, u32 dst_addr, u32 src_addr, u32 size) { + return UnmapMemory(system, dst_addr, src_addr, size); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_physical_memory.cpp b/src/core/hle/kernel/svc/svc_physical_memory.cpp new file mode 100644 index 000000000..0fc262203 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_physical_memory.cpp @@ -0,0 +1,137 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { + +/// Set the process heap to a given Size. It can both extend and shrink the heap. +Result SetHeapSize(Core::System& system, VAddr* out_address, u64 size) { + LOG_TRACE(Kernel_SVC, "called, heap_size=0x{:X}", size); + + // Validate size. + R_UNLESS(Common::IsAligned(size, HeapSizeAlignment), ResultInvalidSize); + R_UNLESS(size < MainMemorySizeMax, ResultInvalidSize); + + // Set the heap size. + R_TRY(system.Kernel().CurrentProcess()->PageTable().SetHeapSize(out_address, size)); + + return ResultSuccess; +} + +Result SetHeapSize32(Core::System& system, u32* heap_addr, u32 heap_size) { + VAddr temp_heap_addr{}; + const Result result{SetHeapSize(system, &temp_heap_addr, heap_size)}; + *heap_addr = static_cast(temp_heap_addr); + return result; +} + +/// Maps memory at a desired address +Result MapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { + LOG_DEBUG(Kernel_SVC, "called, addr=0x{:016X}, size=0x{:X}", addr, size); + + if (!Common::Is4KBAligned(addr)) { + LOG_ERROR(Kernel_SVC, "Address is not aligned to 4KB, 0x{:016X}", addr); + return ResultInvalidAddress; + } + + if (!Common::Is4KBAligned(size)) { + LOG_ERROR(Kernel_SVC, "Size is not aligned to 4KB, 0x{:X}", size); + return ResultInvalidSize; + } + + if (size == 0) { + LOG_ERROR(Kernel_SVC, "Size is zero"); + return ResultInvalidSize; + } + + if (!(addr < addr + size)) { + LOG_ERROR(Kernel_SVC, "Size causes 64-bit overflow of address"); + return ResultInvalidMemoryRegion; + } + + KProcess* const current_process{system.Kernel().CurrentProcess()}; + auto& page_table{current_process->PageTable()}; + + if (current_process->GetSystemResourceSize() == 0) { + LOG_ERROR(Kernel_SVC, "System Resource Size is zero"); + return ResultInvalidState; + } + + if (!page_table.IsInsideAddressSpace(addr, size)) { + LOG_ERROR(Kernel_SVC, + "Address is not within the address space, addr=0x{:016X}, size=0x{:016X}", addr, + size); + return ResultInvalidMemoryRegion; + } + + if (page_table.IsOutsideAliasRegion(addr, size)) { + LOG_ERROR(Kernel_SVC, + "Address is not within the alias region, addr=0x{:016X}, size=0x{:016X}", addr, + size); + return ResultInvalidMemoryRegion; + } + + return page_table.MapPhysicalMemory(addr, size); +} + +Result MapPhysicalMemory32(Core::System& system, u32 addr, u32 size) { + return MapPhysicalMemory(system, addr, size); +} + +/// Unmaps memory previously mapped via MapPhysicalMemory +Result UnmapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { + LOG_DEBUG(Kernel_SVC, "called, addr=0x{:016X}, size=0x{:X}", addr, size); + + if (!Common::Is4KBAligned(addr)) { + LOG_ERROR(Kernel_SVC, "Address is not aligned to 4KB, 0x{:016X}", addr); + return ResultInvalidAddress; + } + + if (!Common::Is4KBAligned(size)) { + LOG_ERROR(Kernel_SVC, "Size is not aligned to 4KB, 0x{:X}", size); + return ResultInvalidSize; + } + + if (size == 0) { + LOG_ERROR(Kernel_SVC, "Size is zero"); + return ResultInvalidSize; + } + + if (!(addr < addr + size)) { + LOG_ERROR(Kernel_SVC, "Size causes 64-bit overflow of address"); + return ResultInvalidMemoryRegion; + } + + KProcess* const current_process{system.Kernel().CurrentProcess()}; + auto& page_table{current_process->PageTable()}; + + if (current_process->GetSystemResourceSize() == 0) { + LOG_ERROR(Kernel_SVC, "System Resource Size is zero"); + return ResultInvalidState; + } + + if (!page_table.IsInsideAddressSpace(addr, size)) { + LOG_ERROR(Kernel_SVC, + "Address is not within the address space, addr=0x{:016X}, size=0x{:016X}", addr, + size); + return ResultInvalidMemoryRegion; + } + + if (page_table.IsOutsideAliasRegion(addr, size)) { + LOG_ERROR(Kernel_SVC, + "Address is not within the alias region, addr=0x{:016X}, size=0x{:016X}", addr, + size); + return ResultInvalidMemoryRegion; + } + + return page_table.UnmapPhysicalMemory(addr, size); +} + +Result UnmapPhysicalMemory32(Core::System& system, u32 addr, u32 size) { + return UnmapPhysicalMemory(system, addr, size); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_port.cpp b/src/core/hle/kernel/svc/svc_port.cpp new file mode 100644 index 000000000..cdfe0dd16 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_port.cpp @@ -0,0 +1,71 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "common/scope_exit.h" +#include "core/core.h" +#include "core/hle/kernel/k_client_port.h" +#include "core/hle/kernel/k_client_session.h" +#include "core/hle/kernel/k_port.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { + +/// Connect to an OS service given the port name, returns the handle to the port to out +Result ConnectToNamedPort(Core::System& system, Handle* out, VAddr port_name_address) { + auto& memory = system.Memory(); + if (!memory.IsValidVirtualAddress(port_name_address)) { + LOG_ERROR(Kernel_SVC, + "Port Name Address is not a valid virtual address, port_name_address=0x{:016X}", + port_name_address); + return ResultNotFound; + } + + static constexpr std::size_t PortNameMaxLength = 11; + // Read 1 char beyond the max allowed port name to detect names that are too long. + const std::string port_name = memory.ReadCString(port_name_address, PortNameMaxLength + 1); + if (port_name.size() > PortNameMaxLength) { + LOG_ERROR(Kernel_SVC, "Port name is too long, expected {} but got {}", PortNameMaxLength, + port_name.size()); + return ResultOutOfRange; + } + + LOG_TRACE(Kernel_SVC, "called port_name={}", port_name); + + // Get the current handle table. + auto& kernel = system.Kernel(); + auto& handle_table = kernel.CurrentProcess()->GetHandleTable(); + + // Find the client port. + auto port = kernel.CreateNamedServicePort(port_name); + if (!port) { + LOG_ERROR(Kernel_SVC, "tried to connect to unknown port: {}", port_name); + return ResultNotFound; + } + + // Reserve a handle for the port. + // NOTE: Nintendo really does write directly to the output handle here. + R_TRY(handle_table.Reserve(out)); + auto handle_guard = SCOPE_GUARD({ handle_table.Unreserve(*out); }); + + // Create a session. + KClientSession* session{}; + R_TRY(port->CreateSession(std::addressof(session))); + + kernel.RegisterNamedServiceHandler(port_name, &port->GetParent()->GetServerPort()); + + // Register the session in the table, close the extra reference. + handle_table.Register(*out, session); + session->Close(); + + // We succeeded. + handle_guard.Cancel(); + return ResultSuccess; +} + +Result ConnectToNamedPort32(Core::System& system, Handle* out_handle, u32 port_name_address) { + + return ConnectToNamedPort(system, out_handle, port_name_address); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_power_management.cpp b/src/core/hle/kernel/svc/svc_power_management.cpp new file mode 100644 index 000000000..299e22ae6 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_power_management.cpp @@ -0,0 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc {} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_process.cpp b/src/core/hle/kernel/svc/svc_process.cpp new file mode 100644 index 000000000..d6c8b4561 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_process.cpp @@ -0,0 +1,124 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { + +/// Exits the current process +void ExitProcess(Core::System& system) { + auto* current_process = system.Kernel().CurrentProcess(); + + LOG_INFO(Kernel_SVC, "Process {} exiting", current_process->GetProcessID()); + ASSERT_MSG(current_process->GetState() == KProcess::State::Running, + "Process has already exited"); + + system.Exit(); +} + +void ExitProcess32(Core::System& system) { + ExitProcess(system); +} + +/// Gets the ID of the specified process or a specified thread's owning process. +Result GetProcessId(Core::System& system, u64* out_process_id, Handle handle) { + LOG_DEBUG(Kernel_SVC, "called handle=0x{:08X}", handle); + + // Get the object from the handle table. + KScopedAutoObject obj = + system.Kernel().CurrentProcess()->GetHandleTable().GetObject( + static_cast(handle)); + R_UNLESS(obj.IsNotNull(), ResultInvalidHandle); + + // Get the process from the object. + KProcess* process = nullptr; + if (KProcess* p = obj->DynamicCast(); p != nullptr) { + // The object is a process, so we can use it directly. + process = p; + } else if (KThread* t = obj->DynamicCast(); t != nullptr) { + // The object is a thread, so we want to use its parent. + process = reinterpret_cast(obj.GetPointerUnsafe())->GetOwnerProcess(); + } else { + // TODO(bunnei): This should also handle debug objects before returning. + UNIMPLEMENTED_MSG("Debug objects not implemented"); + } + + // Make sure the target process exists. + R_UNLESS(process != nullptr, ResultInvalidHandle); + + // Get the process id. + *out_process_id = process->GetId(); + + return ResultSuccess; +} + +Result GetProcessId32(Core::System& system, u32* out_process_id_low, u32* out_process_id_high, + Handle handle) { + u64 out_process_id{}; + const auto result = GetProcessId(system, &out_process_id, handle); + *out_process_id_low = static_cast(out_process_id); + *out_process_id_high = static_cast(out_process_id >> 32); + return result; +} + +Result GetProcessList(Core::System& system, u32* out_num_processes, VAddr out_process_ids, + u32 out_process_ids_size) { + LOG_DEBUG(Kernel_SVC, "called. out_process_ids=0x{:016X}, out_process_ids_size={}", + out_process_ids, out_process_ids_size); + + // If the supplied size is negative or greater than INT32_MAX / sizeof(u64), bail. + if ((out_process_ids_size & 0xF0000000) != 0) { + LOG_ERROR(Kernel_SVC, + "Supplied size outside [0, 0x0FFFFFFF] range. out_process_ids_size={}", + out_process_ids_size); + return ResultOutOfRange; + } + + const auto& kernel = system.Kernel(); + const auto total_copy_size = out_process_ids_size * sizeof(u64); + + if (out_process_ids_size > 0 && !kernel.CurrentProcess()->PageTable().IsInsideAddressSpace( + out_process_ids, total_copy_size)) { + LOG_ERROR(Kernel_SVC, "Address range outside address space. begin=0x{:016X}, end=0x{:016X}", + out_process_ids, out_process_ids + total_copy_size); + return ResultInvalidCurrentMemory; + } + + auto& memory = system.Memory(); + const auto& process_list = kernel.GetProcessList(); + const auto num_processes = process_list.size(); + const auto copy_amount = std::min(std::size_t{out_process_ids_size}, num_processes); + + for (std::size_t i = 0; i < copy_amount; ++i) { + memory.Write64(out_process_ids, process_list[i]->GetProcessID()); + out_process_ids += sizeof(u64); + } + + *out_num_processes = static_cast(num_processes); + return ResultSuccess; +} + +Result GetProcessInfo(Core::System& system, u64* out, Handle process_handle, u32 type) { + LOG_DEBUG(Kernel_SVC, "called, handle=0x{:08X}, type=0x{:X}", process_handle, type); + + const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + KScopedAutoObject process = handle_table.GetObject(process_handle); + if (process.IsNull()) { + LOG_ERROR(Kernel_SVC, "Process handle does not exist, process_handle=0x{:08X}", + process_handle); + return ResultInvalidHandle; + } + + const auto info_type = static_cast(type); + if (info_type != ProcessInfoType::ProcessState) { + LOG_ERROR(Kernel_SVC, "Expected info_type to be ProcessState but got {} instead", type); + return ResultInvalidEnumValue; + } + + *out = static_cast(process->GetState()); + return ResultSuccess; +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_process_memory.cpp b/src/core/hle/kernel/svc/svc_process_memory.cpp new file mode 100644 index 000000000..b6ac43af2 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_process_memory.cpp @@ -0,0 +1,274 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { +namespace { + +constexpr bool IsValidAddressRange(VAddr address, u64 size) { + return address + size > address; +} + +constexpr bool IsValidProcessMemoryPermission(Svc::MemoryPermission perm) { + switch (perm) { + case Svc::MemoryPermission::None: + case Svc::MemoryPermission::Read: + case Svc::MemoryPermission::ReadWrite: + case Svc::MemoryPermission::ReadExecute: + return true; + default: + return false; + } +} + +} // namespace + +Result SetProcessMemoryPermission(Core::System& system, Handle process_handle, VAddr address, + u64 size, Svc::MemoryPermission perm) { + LOG_TRACE(Kernel_SVC, + "called, process_handle=0x{:X}, addr=0x{:X}, size=0x{:X}, permissions=0x{:08X}", + process_handle, address, size, perm); + + // Validate the address/size. + R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); + R_UNLESS(size > 0, ResultInvalidSize); + R_UNLESS((address < address + size), ResultInvalidCurrentMemory); + R_UNLESS(address == static_cast(address), ResultInvalidCurrentMemory); + R_UNLESS(size == static_cast(size), ResultInvalidCurrentMemory); + + // Validate the memory permission. + R_UNLESS(IsValidProcessMemoryPermission(perm), ResultInvalidNewMemoryPermission); + + // Get the process from its handle. + KScopedAutoObject process = + system.CurrentProcess()->GetHandleTable().GetObject(process_handle); + R_UNLESS(process.IsNotNull(), ResultInvalidHandle); + + // Validate that the address is in range. + auto& page_table = process->PageTable(); + R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory); + + // Set the memory permission. + return page_table.SetProcessMemoryPermission(address, size, perm); +} + +Result MapProcessMemory(Core::System& system, VAddr dst_address, Handle process_handle, + VAddr src_address, u64 size) { + LOG_TRACE(Kernel_SVC, + "called, dst_address=0x{:X}, process_handle=0x{:X}, src_address=0x{:X}, size=0x{:X}", + dst_address, process_handle, src_address, size); + + // Validate the address/size. + R_UNLESS(Common::IsAligned(dst_address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(src_address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); + R_UNLESS(size > 0, ResultInvalidSize); + R_UNLESS((dst_address < dst_address + size), ResultInvalidCurrentMemory); + R_UNLESS((src_address < src_address + size), ResultInvalidCurrentMemory); + + // Get the processes. + KProcess* dst_process = system.CurrentProcess(); + KScopedAutoObject src_process = + dst_process->GetHandleTable().GetObjectWithoutPseudoHandle(process_handle); + R_UNLESS(src_process.IsNotNull(), ResultInvalidHandle); + + // Get the page tables. + auto& dst_pt = dst_process->PageTable(); + auto& src_pt = src_process->PageTable(); + + // Validate that the mapping is in range. + R_UNLESS(src_pt.Contains(src_address, size), ResultInvalidCurrentMemory); + R_UNLESS(dst_pt.CanContain(dst_address, size, KMemoryState::SharedCode), + ResultInvalidMemoryRegion); + + // Create a new page group. + KPageGroup pg{system.Kernel(), dst_pt.GetBlockInfoManager()}; + R_TRY(src_pt.MakeAndOpenPageGroup( + std::addressof(pg), src_address, size / PageSize, KMemoryState::FlagCanMapProcess, + KMemoryState::FlagCanMapProcess, KMemoryPermission::None, KMemoryPermission::None, + KMemoryAttribute::All, KMemoryAttribute::None)); + + // Map the group. + R_TRY(dst_pt.MapPageGroup(dst_address, pg, KMemoryState::SharedCode, + KMemoryPermission::UserReadWrite)); + + return ResultSuccess; +} + +Result UnmapProcessMemory(Core::System& system, VAddr dst_address, Handle process_handle, + VAddr src_address, u64 size) { + LOG_TRACE(Kernel_SVC, + "called, dst_address=0x{:X}, process_handle=0x{:X}, src_address=0x{:X}, size=0x{:X}", + dst_address, process_handle, src_address, size); + + // Validate the address/size. + R_UNLESS(Common::IsAligned(dst_address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(src_address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); + R_UNLESS(size > 0, ResultInvalidSize); + R_UNLESS((dst_address < dst_address + size), ResultInvalidCurrentMemory); + R_UNLESS((src_address < src_address + size), ResultInvalidCurrentMemory); + + // Get the processes. + KProcess* dst_process = system.CurrentProcess(); + KScopedAutoObject src_process = + dst_process->GetHandleTable().GetObjectWithoutPseudoHandle(process_handle); + R_UNLESS(src_process.IsNotNull(), ResultInvalidHandle); + + // Get the page tables. + auto& dst_pt = dst_process->PageTable(); + auto& src_pt = src_process->PageTable(); + + // Validate that the mapping is in range. + R_UNLESS(src_pt.Contains(src_address, size), ResultInvalidCurrentMemory); + R_UNLESS(dst_pt.CanContain(dst_address, size, KMemoryState::SharedCode), + ResultInvalidMemoryRegion); + + // Unmap the memory. + R_TRY(dst_pt.UnmapProcessMemory(dst_address, size, src_pt, src_address)); + + return ResultSuccess; +} + +Result MapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst_address, + u64 src_address, u64 size) { + LOG_DEBUG(Kernel_SVC, + "called. process_handle=0x{:08X}, dst_address=0x{:016X}, " + "src_address=0x{:016X}, size=0x{:016X}", + process_handle, dst_address, src_address, size); + + if (!Common::Is4KBAligned(src_address)) { + LOG_ERROR(Kernel_SVC, "src_address is not page-aligned (src_address=0x{:016X}).", + src_address); + return ResultInvalidAddress; + } + + if (!Common::Is4KBAligned(dst_address)) { + LOG_ERROR(Kernel_SVC, "dst_address is not page-aligned (dst_address=0x{:016X}).", + dst_address); + return ResultInvalidAddress; + } + + if (size == 0 || !Common::Is4KBAligned(size)) { + LOG_ERROR(Kernel_SVC, "Size is zero or not page-aligned (size=0x{:016X})", size); + return ResultInvalidSize; + } + + if (!IsValidAddressRange(dst_address, size)) { + LOG_ERROR(Kernel_SVC, + "Destination address range overflows the address space (dst_address=0x{:016X}, " + "size=0x{:016X}).", + dst_address, size); + return ResultInvalidCurrentMemory; + } + + if (!IsValidAddressRange(src_address, size)) { + LOG_ERROR(Kernel_SVC, + "Source address range overflows the address space (src_address=0x{:016X}, " + "size=0x{:016X}).", + src_address, size); + return ResultInvalidCurrentMemory; + } + + const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + KScopedAutoObject process = handle_table.GetObject(process_handle); + if (process.IsNull()) { + LOG_ERROR(Kernel_SVC, "Invalid process handle specified (handle=0x{:08X}).", + process_handle); + return ResultInvalidHandle; + } + + auto& page_table = process->PageTable(); + if (!page_table.IsInsideAddressSpace(src_address, size)) { + LOG_ERROR(Kernel_SVC, + "Source address range is not within the address space (src_address=0x{:016X}, " + "size=0x{:016X}).", + src_address, size); + return ResultInvalidCurrentMemory; + } + + if (!page_table.IsInsideASLRRegion(dst_address, size)) { + LOG_ERROR(Kernel_SVC, + "Destination address range is not within the ASLR region (dst_address=0x{:016X}, " + "size=0x{:016X}).", + dst_address, size); + return ResultInvalidMemoryRegion; + } + + return page_table.MapCodeMemory(dst_address, src_address, size); +} + +Result UnmapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst_address, + u64 src_address, u64 size) { + LOG_DEBUG(Kernel_SVC, + "called. process_handle=0x{:08X}, dst_address=0x{:016X}, src_address=0x{:016X}, " + "size=0x{:016X}", + process_handle, dst_address, src_address, size); + + if (!Common::Is4KBAligned(dst_address)) { + LOG_ERROR(Kernel_SVC, "dst_address is not page-aligned (dst_address=0x{:016X}).", + dst_address); + return ResultInvalidAddress; + } + + if (!Common::Is4KBAligned(src_address)) { + LOG_ERROR(Kernel_SVC, "src_address is not page-aligned (src_address=0x{:016X}).", + src_address); + return ResultInvalidAddress; + } + + if (size == 0 || !Common::Is4KBAligned(size)) { + LOG_ERROR(Kernel_SVC, "Size is zero or not page-aligned (size=0x{:016X}).", size); + return ResultInvalidSize; + } + + if (!IsValidAddressRange(dst_address, size)) { + LOG_ERROR(Kernel_SVC, + "Destination address range overflows the address space (dst_address=0x{:016X}, " + "size=0x{:016X}).", + dst_address, size); + return ResultInvalidCurrentMemory; + } + + if (!IsValidAddressRange(src_address, size)) { + LOG_ERROR(Kernel_SVC, + "Source address range overflows the address space (src_address=0x{:016X}, " + "size=0x{:016X}).", + src_address, size); + return ResultInvalidCurrentMemory; + } + + const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + KScopedAutoObject process = handle_table.GetObject(process_handle); + if (process.IsNull()) { + LOG_ERROR(Kernel_SVC, "Invalid process handle specified (handle=0x{:08X}).", + process_handle); + return ResultInvalidHandle; + } + + auto& page_table = process->PageTable(); + if (!page_table.IsInsideAddressSpace(src_address, size)) { + LOG_ERROR(Kernel_SVC, + "Source address range is not within the address space (src_address=0x{:016X}, " + "size=0x{:016X}).", + src_address, size); + return ResultInvalidCurrentMemory; + } + + if (!page_table.IsInsideASLRRegion(dst_address, size)) { + LOG_ERROR(Kernel_SVC, + "Destination address range is not within the ASLR region (dst_address=0x{:016X}, " + "size=0x{:016X}).", + dst_address, size); + return ResultInvalidMemoryRegion; + } + + return page_table.UnmapCodeMemory(dst_address, src_address, size, + KPageTable::ICacheInvalidationStrategy::InvalidateAll); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_processor.cpp b/src/core/hle/kernel/svc/svc_processor.cpp new file mode 100644 index 000000000..8561cf74f --- /dev/null +++ b/src/core/hle/kernel/svc/svc_processor.cpp @@ -0,0 +1,21 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "common/logging/log.h" +#include "core/core.h" +#include "core/hle/kernel/physical_core.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { + +/// Get which CPU core is executing the current thread +u32 GetCurrentProcessorNumber(Core::System& system) { + LOG_TRACE(Kernel_SVC, "called"); + return static_cast(system.CurrentPhysicalCore().CoreIndex()); +} + +u32 GetCurrentProcessorNumber32(Core::System& system) { + return GetCurrentProcessorNumber(system); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_query_memory.cpp b/src/core/hle/kernel/svc/svc_query_memory.cpp new file mode 100644 index 000000000..aac3b2eca --- /dev/null +++ b/src/core/hle/kernel/svc/svc_query_memory.cpp @@ -0,0 +1,55 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { + +Result QueryMemory(Core::System& system, VAddr memory_info_address, VAddr page_info_address, + VAddr query_address) { + LOG_TRACE(Kernel_SVC, + "called, memory_info_address=0x{:016X}, page_info_address=0x{:016X}, " + "query_address=0x{:016X}", + memory_info_address, page_info_address, query_address); + + return QueryProcessMemory(system, memory_info_address, page_info_address, CurrentProcess, + query_address); +} + +Result QueryMemory32(Core::System& system, u32 memory_info_address, u32 page_info_address, + u32 query_address) { + return QueryMemory(system, memory_info_address, page_info_address, query_address); +} + +Result QueryProcessMemory(Core::System& system, VAddr memory_info_address, VAddr page_info_address, + Handle process_handle, VAddr address) { + LOG_TRACE(Kernel_SVC, "called process=0x{:08X} address={:X}", process_handle, address); + const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + KScopedAutoObject process = handle_table.GetObject(process_handle); + if (process.IsNull()) { + LOG_ERROR(Kernel_SVC, "Process handle does not exist, process_handle=0x{:08X}", + process_handle); + return ResultInvalidHandle; + } + + auto& memory{system.Memory()}; + const auto memory_info{process->PageTable().QueryInfo(address).GetSvcMemoryInfo()}; + + memory.Write64(memory_info_address + 0x00, memory_info.base_address); + memory.Write64(memory_info_address + 0x08, memory_info.size); + memory.Write32(memory_info_address + 0x10, static_cast(memory_info.state) & 0xff); + memory.Write32(memory_info_address + 0x14, static_cast(memory_info.attribute)); + memory.Write32(memory_info_address + 0x18, static_cast(memory_info.permission)); + memory.Write32(memory_info_address + 0x1c, memory_info.ipc_count); + memory.Write32(memory_info_address + 0x20, memory_info.device_count); + memory.Write32(memory_info_address + 0x24, 0); + + // Page info appears to be currently unused by the kernel and is always set to zero. + memory.Write32(page_info_address, 0); + + return ResultSuccess; +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_register.cpp b/src/core/hle/kernel/svc/svc_register.cpp new file mode 100644 index 000000000..299e22ae6 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_register.cpp @@ -0,0 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc {} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_resource_limit.cpp b/src/core/hle/kernel/svc/svc_resource_limit.cpp new file mode 100644 index 000000000..679ba10fa --- /dev/null +++ b/src/core/hle/kernel/svc/svc_resource_limit.cpp @@ -0,0 +1,95 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "common/scope_exit.h" +#include "core/core.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/k_resource_limit.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { + +Result CreateResourceLimit(Core::System& system, Handle* out_handle) { + LOG_DEBUG(Kernel_SVC, "called"); + + // Create a new resource limit. + auto& kernel = system.Kernel(); + KResourceLimit* resource_limit = KResourceLimit::Create(kernel); + R_UNLESS(resource_limit != nullptr, ResultOutOfResource); + + // Ensure we don't leak a reference to the limit. + SCOPE_EXIT({ resource_limit->Close(); }); + + // Initialize the resource limit. + resource_limit->Initialize(&system.CoreTiming()); + + // Register the limit. + KResourceLimit::Register(kernel, resource_limit); + + // Add the limit to the handle table. + R_TRY(kernel.CurrentProcess()->GetHandleTable().Add(out_handle, resource_limit)); + + return ResultSuccess; +} + +Result GetResourceLimitLimitValue(Core::System& system, u64* out_limit_value, + Handle resource_limit_handle, LimitableResource which) { + LOG_DEBUG(Kernel_SVC, "called, resource_limit_handle={:08X}, which={}", resource_limit_handle, + which); + + // Validate the resource. + R_UNLESS(IsValidResourceType(which), ResultInvalidEnumValue); + + // Get the resource limit. + auto& kernel = system.Kernel(); + KScopedAutoObject resource_limit = + kernel.CurrentProcess()->GetHandleTable().GetObject(resource_limit_handle); + R_UNLESS(resource_limit.IsNotNull(), ResultInvalidHandle); + + // Get the limit value. + *out_limit_value = resource_limit->GetLimitValue(which); + + return ResultSuccess; +} + +Result GetResourceLimitCurrentValue(Core::System& system, u64* out_current_value, + Handle resource_limit_handle, LimitableResource which) { + LOG_DEBUG(Kernel_SVC, "called, resource_limit_handle={:08X}, which={}", resource_limit_handle, + which); + + // Validate the resource. + R_UNLESS(IsValidResourceType(which), ResultInvalidEnumValue); + + // Get the resource limit. + auto& kernel = system.Kernel(); + KScopedAutoObject resource_limit = + kernel.CurrentProcess()->GetHandleTable().GetObject(resource_limit_handle); + R_UNLESS(resource_limit.IsNotNull(), ResultInvalidHandle); + + // Get the current value. + *out_current_value = resource_limit->GetCurrentValue(which); + + return ResultSuccess; +} + +Result SetResourceLimitLimitValue(Core::System& system, Handle resource_limit_handle, + LimitableResource which, u64 limit_value) { + LOG_DEBUG(Kernel_SVC, "called, resource_limit_handle={:08X}, which={}, limit_value={}", + resource_limit_handle, which, limit_value); + + // Validate the resource. + R_UNLESS(IsValidResourceType(which), ResultInvalidEnumValue); + + // Get the resource limit. + auto& kernel = system.Kernel(); + KScopedAutoObject resource_limit = + kernel.CurrentProcess()->GetHandleTable().GetObject(resource_limit_handle); + R_UNLESS(resource_limit.IsNotNull(), ResultInvalidHandle); + + // Set the limit value. + R_TRY(resource_limit->SetLimitValue(which, limit_value)); + + return ResultSuccess; +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_secure_monitor_call.cpp b/src/core/hle/kernel/svc/svc_secure_monitor_call.cpp new file mode 100644 index 000000000..299e22ae6 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_secure_monitor_call.cpp @@ -0,0 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc {} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_session.cpp b/src/core/hle/kernel/svc/svc_session.cpp new file mode 100644 index 000000000..dac8ce33c --- /dev/null +++ b/src/core/hle/kernel/svc/svc_session.cpp @@ -0,0 +1,103 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "common/scope_exit.h" +#include "core/core.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/k_scoped_resource_reservation.h" +#include "core/hle/kernel/k_session.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { +namespace { + +template +Result CreateSession(Core::System& system, Handle* out_server, Handle* out_client, u64 name) { + auto& process = *system.CurrentProcess(); + auto& handle_table = process.GetHandleTable(); + + // Declare the session we're going to allocate. + T* session; + + // Reserve a new session from the process resource limit. + // FIXME: LimitableResource_SessionCountMax + KScopedResourceReservation session_reservation(&process, LimitableResource::SessionCountMax); + if (session_reservation.Succeeded()) { + session = T::Create(system.Kernel()); + } else { + return ResultLimitReached; + + // // We couldn't reserve a session. Check that we support dynamically expanding the + // // resource limit. + // R_UNLESS(process.GetResourceLimit() == + // &system.Kernel().GetSystemResourceLimit(), ResultLimitReached); + // R_UNLESS(KTargetSystem::IsDynamicResourceLimitsEnabled(), ResultLimitReached()); + + // // Try to allocate a session from unused slab memory. + // session = T::CreateFromUnusedSlabMemory(); + // R_UNLESS(session != nullptr, ResultLimitReached); + // ON_RESULT_FAILURE { session->Close(); }; + + // // If we're creating a KSession, we want to add two KSessionRequests to the heap, to + // // prevent request exhaustion. + // // NOTE: Nintendo checks if session->DynamicCast() != nullptr, but there's + // // no reason to not do this statically. + // if constexpr (std::same_as) { + // for (size_t i = 0; i < 2; i++) { + // KSessionRequest* request = KSessionRequest::CreateFromUnusedSlabMemory(); + // R_UNLESS(request != nullptr, ResultLimitReached); + // request->Close(); + // } + // } + + // We successfully allocated a session, so add the object we allocated to the resource + // limit. + // system.Kernel().GetSystemResourceLimit().Reserve(LimitableResource::SessionCountMax, 1); + } + + // Check that we successfully created a session. + R_UNLESS(session != nullptr, ResultOutOfResource); + + // Initialize the session. + session->Initialize(nullptr, fmt::format("{}", name)); + + // Commit the session reservation. + session_reservation.Commit(); + + // Ensure that we clean up the session (and its only references are handle table) on function + // end. + SCOPE_EXIT({ + session->GetClientSession().Close(); + session->GetServerSession().Close(); + }); + + // Register the session. + T::Register(system.Kernel(), session); + + // Add the server session to the handle table. + R_TRY(handle_table.Add(out_server, &session->GetServerSession())); + + // Add the client session to the handle table. + const auto result = handle_table.Add(out_client, &session->GetClientSession()); + + if (!R_SUCCEEDED(result)) { + // Ensure that we maintaing a clean handle state on exit. + handle_table.Remove(*out_server); + } + + return result; +} + +} // namespace + +Result CreateSession(Core::System& system, Handle* out_server, Handle* out_client, u32 is_light, + u64 name) { + if (is_light) { + // return CreateSession(system, out_server, out_client, name); + return ResultUnknown; + } else { + return CreateSession(system, out_server, out_client, name); + } +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_shared_memory.cpp b/src/core/hle/kernel/svc/svc_shared_memory.cpp new file mode 100644 index 000000000..d465bcbe7 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_shared_memory.cpp @@ -0,0 +1,106 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "common/scope_exit.h" +#include "core/core.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/k_shared_memory.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { +namespace { + +constexpr bool IsValidSharedMemoryPermission(MemoryPermission perm) { + switch (perm) { + case MemoryPermission::Read: + case MemoryPermission::ReadWrite: + return true; + default: + return false; + } +} + +[[maybe_unused]] constexpr bool IsValidRemoteSharedMemoryPermission(MemoryPermission perm) { + return IsValidSharedMemoryPermission(perm) || perm == MemoryPermission::DontCare; +} + +} // namespace + +Result MapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, u64 size, + Svc::MemoryPermission map_perm) { + LOG_TRACE(Kernel_SVC, + "called, shared_memory_handle=0x{:X}, addr=0x{:X}, size=0x{:X}, permissions=0x{:08X}", + shmem_handle, address, size, map_perm); + + // Validate the address/size. + R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); + R_UNLESS(size > 0, ResultInvalidSize); + R_UNLESS((address < address + size), ResultInvalidCurrentMemory); + + // Validate the permission. + R_UNLESS(IsValidSharedMemoryPermission(map_perm), ResultInvalidNewMemoryPermission); + + // Get the current process. + auto& process = *system.Kernel().CurrentProcess(); + auto& page_table = process.PageTable(); + + // Get the shared memory. + KScopedAutoObject shmem = process.GetHandleTable().GetObject(shmem_handle); + R_UNLESS(shmem.IsNotNull(), ResultInvalidHandle); + + // Verify that the mapping is in range. + R_UNLESS(page_table.CanContain(address, size, KMemoryState::Shared), ResultInvalidMemoryRegion); + + // Add the shared memory to the process. + R_TRY(process.AddSharedMemory(shmem.GetPointerUnsafe(), address, size)); + + // Ensure that we clean up the shared memory if we fail to map it. + auto guard = + SCOPE_GUARD({ process.RemoveSharedMemory(shmem.GetPointerUnsafe(), address, size); }); + + // Map the shared memory. + R_TRY(shmem->Map(process, address, size, map_perm)); + + // We succeeded. + guard.Cancel(); + return ResultSuccess; +} + +Result MapSharedMemory32(Core::System& system, Handle shmem_handle, u32 address, u32 size, + Svc::MemoryPermission map_perm) { + return MapSharedMemory(system, shmem_handle, address, size, map_perm); +} + +Result UnmapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, u64 size) { + // Validate the address/size. + R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); + R_UNLESS(size > 0, ResultInvalidSize); + R_UNLESS((address < address + size), ResultInvalidCurrentMemory); + + // Get the current process. + auto& process = *system.Kernel().CurrentProcess(); + auto& page_table = process.PageTable(); + + // Get the shared memory. + KScopedAutoObject shmem = process.GetHandleTable().GetObject(shmem_handle); + R_UNLESS(shmem.IsNotNull(), ResultInvalidHandle); + + // Verify that the mapping is in range. + R_UNLESS(page_table.CanContain(address, size, KMemoryState::Shared), ResultInvalidMemoryRegion); + + // Unmap the shared memory. + R_TRY(shmem->Unmap(process, address, size)); + + // Remove the shared memory from the process. + process.RemoveSharedMemory(shmem.GetPointerUnsafe(), address, size); + + return ResultSuccess; +} + +Result UnmapSharedMemory32(Core::System& system, Handle shmem_handle, u32 address, u32 size) { + return UnmapSharedMemory(system, shmem_handle, address, size); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_synchronization.cpp b/src/core/hle/kernel/svc/svc_synchronization.cpp new file mode 100644 index 000000000..1bf6a612a --- /dev/null +++ b/src/core/hle/kernel/svc/svc_synchronization.cpp @@ -0,0 +1,139 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "common/scope_exit.h" +#include "core/core.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/k_readable_event.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { + +/// Close a handle +Result CloseHandle(Core::System& system, Handle handle) { + LOG_TRACE(Kernel_SVC, "Closing handle 0x{:08X}", handle); + + // Remove the handle. + R_UNLESS(system.Kernel().CurrentProcess()->GetHandleTable().Remove(handle), + ResultInvalidHandle); + + return ResultSuccess; +} + +Result CloseHandle32(Core::System& system, Handle handle) { + return CloseHandle(system, handle); +} + +/// Clears the signaled state of an event or process. +Result ResetSignal(Core::System& system, Handle handle) { + LOG_DEBUG(Kernel_SVC, "called handle 0x{:08X}", handle); + + // Get the current handle table. + const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + + // Try to reset as readable event. + { + KScopedAutoObject readable_event = handle_table.GetObject(handle); + if (readable_event.IsNotNull()) { + return readable_event->Reset(); + } + } + + // Try to reset as process. + { + KScopedAutoObject process = handle_table.GetObject(handle); + if (process.IsNotNull()) { + return process->Reset(); + } + } + + LOG_ERROR(Kernel_SVC, "invalid handle (0x{:08X})", handle); + + return ResultInvalidHandle; +} + +Result ResetSignal32(Core::System& system, Handle handle) { + return ResetSignal(system, handle); +} + +/// Wait for the given handles to synchronize, timeout after the specified nanoseconds +Result WaitSynchronization(Core::System& system, s32* index, VAddr handles_address, s32 num_handles, + s64 nano_seconds) { + LOG_TRACE(Kernel_SVC, "called handles_address=0x{:X}, num_handles={}, nano_seconds={}", + handles_address, num_handles, nano_seconds); + + // Ensure number of handles is valid. + R_UNLESS(0 <= num_handles && num_handles <= ArgumentHandleCountMax, ResultOutOfRange); + + auto& kernel = system.Kernel(); + std::vector objs(num_handles); + const auto& handle_table = kernel.CurrentProcess()->GetHandleTable(); + Handle* handles = system.Memory().GetPointer(handles_address); + + // Copy user handles. + if (num_handles > 0) { + // Convert the handles to objects. + R_UNLESS(handle_table.GetMultipleObjects(objs.data(), handles, + num_handles), + ResultInvalidHandle); + for (const auto& obj : objs) { + kernel.RegisterInUseObject(obj); + } + } + + // Ensure handles are closed when we're done. + SCOPE_EXIT({ + for (s32 i = 0; i < num_handles; ++i) { + kernel.UnregisterInUseObject(objs[i]); + objs[i]->Close(); + } + }); + + return KSynchronizationObject::Wait(kernel, index, objs.data(), static_cast(objs.size()), + nano_seconds); +} + +Result WaitSynchronization32(Core::System& system, u32 timeout_low, u32 handles_address, + s32 num_handles, u32 timeout_high, s32* index) { + const s64 nano_seconds{(static_cast(timeout_high) << 32) | static_cast(timeout_low)}; + return WaitSynchronization(system, index, handles_address, num_handles, nano_seconds); +} + +/// Resumes a thread waiting on WaitSynchronization +Result CancelSynchronization(Core::System& system, Handle handle) { + LOG_TRACE(Kernel_SVC, "called handle=0x{:X}", handle); + + // Get the thread from its handle. + KScopedAutoObject thread = + system.Kernel().CurrentProcess()->GetHandleTable().GetObject(handle); + R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); + + // Cancel the thread's wait. + thread->WaitCancel(); + return ResultSuccess; +} + +Result CancelSynchronization32(Core::System& system, Handle handle) { + return CancelSynchronization(system, handle); +} + +void SynchronizePreemptionState(Core::System& system) { + auto& kernel = system.Kernel(); + + // Lock the scheduler. + KScopedSchedulerLock sl{kernel}; + + // If the current thread is pinned, unpin it. + KProcess* cur_process = system.Kernel().CurrentProcess(); + const auto core_id = GetCurrentCoreId(kernel); + + if (cur_process->GetPinnedThread(core_id) == GetCurrentThreadPointer(kernel)) { + // Clear the current thread's interrupt flag. + GetCurrentThread(kernel).ClearInterruptFlag(); + + // Unpin the current thread. + cur_process->UnpinCurrentThread(core_id); + } +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_thread.cpp b/src/core/hle/kernel/svc/svc_thread.cpp new file mode 100644 index 000000000..dd9f8e8b1 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_thread.cpp @@ -0,0 +1,396 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "common/scope_exit.h" +#include "core/core.h" +#include "core/core_timing.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/k_scoped_resource_reservation.h" +#include "core/hle/kernel/k_thread.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { +namespace { + +constexpr bool IsValidVirtualCoreId(int32_t core_id) { + return (0 <= core_id && core_id < static_cast(Core::Hardware::NUM_CPU_CORES)); +} + +} // Anonymous namespace + +/// Creates a new thread +Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point, u64 arg, + VAddr stack_bottom, u32 priority, s32 core_id) { + LOG_DEBUG(Kernel_SVC, + "called entry_point=0x{:08X}, arg=0x{:08X}, stack_bottom=0x{:08X}, " + "priority=0x{:08X}, core_id=0x{:08X}", + entry_point, arg, stack_bottom, priority, core_id); + + // Adjust core id, if it's the default magic. + auto& kernel = system.Kernel(); + auto& process = *kernel.CurrentProcess(); + if (core_id == IdealCoreUseProcessValue) { + core_id = process.GetIdealCoreId(); + } + + // Validate arguments. + if (!IsValidVirtualCoreId(core_id)) { + LOG_ERROR(Kernel_SVC, "Invalid Core ID specified (id={})", core_id); + return ResultInvalidCoreId; + } + if (((1ULL << core_id) & process.GetCoreMask()) == 0) { + LOG_ERROR(Kernel_SVC, "Core ID doesn't fall within allowable cores (id={})", core_id); + return ResultInvalidCoreId; + } + + if (HighestThreadPriority > priority || priority > LowestThreadPriority) { + LOG_ERROR(Kernel_SVC, "Invalid priority specified (priority={})", priority); + return ResultInvalidPriority; + } + if (!process.CheckThreadPriority(priority)) { + LOG_ERROR(Kernel_SVC, "Invalid allowable thread priority (priority={})", priority); + return ResultInvalidPriority; + } + + // Reserve a new thread from the process resource limit (waiting up to 100ms). + KScopedResourceReservation thread_reservation( + kernel.CurrentProcess(), LimitableResource::ThreadCountMax, 1, + system.CoreTiming().GetGlobalTimeNs().count() + 100000000); + if (!thread_reservation.Succeeded()) { + LOG_ERROR(Kernel_SVC, "Could not reserve a new thread"); + return ResultLimitReached; + } + + // Create the thread. + KThread* thread = KThread::Create(kernel); + if (!thread) { + LOG_ERROR(Kernel_SVC, "Unable to create new threads. Thread creation limit reached."); + return ResultOutOfResource; + } + SCOPE_EXIT({ thread->Close(); }); + + // Initialize the thread. + { + KScopedLightLock lk{process.GetStateLock()}; + R_TRY(KThread::InitializeUserThread(system, thread, entry_point, arg, stack_bottom, + priority, core_id, &process)); + } + + // Set the thread name for debugging purposes. + thread->SetName(fmt::format("thread[entry_point={:X}, handle={:X}]", entry_point, *out_handle)); + + // Commit the thread reservation. + thread_reservation.Commit(); + + // Register the new thread. + KThread::Register(kernel, thread); + + // Add the thread to the handle table. + R_TRY(process.GetHandleTable().Add(out_handle, thread)); + + return ResultSuccess; +} + +Result CreateThread32(Core::System& system, Handle* out_handle, u32 priority, u32 entry_point, + u32 arg, u32 stack_top, s32 processor_id) { + return CreateThread(system, out_handle, entry_point, arg, stack_top, priority, processor_id); +} + +/// Starts the thread for the provided handle +Result StartThread(Core::System& system, Handle thread_handle) { + LOG_DEBUG(Kernel_SVC, "called thread=0x{:08X}", thread_handle); + + // Get the thread from its handle. + KScopedAutoObject thread = + system.Kernel().CurrentProcess()->GetHandleTable().GetObject(thread_handle); + R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); + + // Try to start the thread. + R_TRY(thread->Run()); + + // If we succeeded, persist a reference to the thread. + thread->Open(); + system.Kernel().RegisterInUseObject(thread.GetPointerUnsafe()); + + return ResultSuccess; +} + +Result StartThread32(Core::System& system, Handle thread_handle) { + return StartThread(system, thread_handle); +} + +/// Called when a thread exits +void ExitThread(Core::System& system) { + LOG_DEBUG(Kernel_SVC, "called, pc=0x{:08X}", system.CurrentArmInterface().GetPC()); + + auto* const current_thread = GetCurrentThreadPointer(system.Kernel()); + system.GlobalSchedulerContext().RemoveThread(current_thread); + current_thread->Exit(); + system.Kernel().UnregisterInUseObject(current_thread); +} + +void ExitThread32(Core::System& system) { + ExitThread(system); +} + +/// Sleep the current thread +void SleepThread(Core::System& system, s64 nanoseconds) { + auto& kernel = system.Kernel(); + const auto yield_type = static_cast(nanoseconds); + + LOG_TRACE(Kernel_SVC, "called nanoseconds={}", nanoseconds); + + // When the input tick is positive, sleep. + if (nanoseconds > 0) { + // Convert the timeout from nanoseconds to ticks. + // NOTE: Nintendo does not use this conversion logic in WaitSynchronization... + + // Sleep. + // NOTE: Nintendo does not check the result of this sleep. + static_cast(GetCurrentThread(kernel).Sleep(nanoseconds)); + } else if (yield_type == Svc::YieldType::WithoutCoreMigration) { + KScheduler::YieldWithoutCoreMigration(kernel); + } else if (yield_type == Svc::YieldType::WithCoreMigration) { + KScheduler::YieldWithCoreMigration(kernel); + } else if (yield_type == Svc::YieldType::ToAnyThread) { + KScheduler::YieldToAnyThread(kernel); + } else { + // Nintendo does nothing at all if an otherwise invalid value is passed. + ASSERT_MSG(false, "Unimplemented sleep yield type '{:016X}'!", nanoseconds); + } +} + +void SleepThread32(Core::System& system, u32 nanoseconds_low, u32 nanoseconds_high) { + const auto nanoseconds = static_cast(u64{nanoseconds_low} | (u64{nanoseconds_high} << 32)); + SleepThread(system, nanoseconds); +} + +/// Gets the thread context +Result GetThreadContext(Core::System& system, VAddr out_context, Handle thread_handle) { + LOG_DEBUG(Kernel_SVC, "called, out_context=0x{:08X}, thread_handle=0x{:X}", out_context, + thread_handle); + + auto& kernel = system.Kernel(); + + // Get the thread from its handle. + KScopedAutoObject thread = + kernel.CurrentProcess()->GetHandleTable().GetObject(thread_handle); + R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); + + // Require the handle be to a non-current thread in the current process. + const auto* current_process = kernel.CurrentProcess(); + R_UNLESS(current_process == thread->GetOwnerProcess(), ResultInvalidId); + + // Verify that the thread isn't terminated. + R_UNLESS(thread->GetState() != ThreadState::Terminated, ResultTerminationRequested); + + /// Check that the thread is not the current one. + /// NOTE: Nintendo does not check this, and thus the following loop will deadlock. + R_UNLESS(thread.GetPointerUnsafe() != GetCurrentThreadPointer(kernel), ResultInvalidId); + + // Try to get the thread context until the thread isn't current on any core. + while (true) { + KScopedSchedulerLock sl{kernel}; + + // TODO(bunnei): Enforce that thread is suspended for debug here. + + // If the thread's raw state isn't runnable, check if it's current on some core. + if (thread->GetRawState() != ThreadState::Runnable) { + bool current = false; + for (auto i = 0; i < static_cast(Core::Hardware::NUM_CPU_CORES); ++i) { + if (thread.GetPointerUnsafe() == kernel.Scheduler(i).GetSchedulerCurrentThread()) { + current = true; + break; + } + } + + // If the thread is current, retry until it isn't. + if (current) { + continue; + } + } + + // Get the thread context. + std::vector context; + R_TRY(thread->GetThreadContext3(context)); + + // Copy the thread context to user space. + system.Memory().WriteBlock(out_context, context.data(), context.size()); + + return ResultSuccess; + } + + return ResultSuccess; +} + +Result GetThreadContext32(Core::System& system, u32 out_context, Handle thread_handle) { + return GetThreadContext(system, out_context, thread_handle); +} + +/// Gets the priority for the specified thread +Result GetThreadPriority(Core::System& system, u32* out_priority, Handle handle) { + LOG_TRACE(Kernel_SVC, "called"); + + // Get the thread from its handle. + KScopedAutoObject thread = + system.Kernel().CurrentProcess()->GetHandleTable().GetObject(handle); + R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); + + // Get the thread's priority. + *out_priority = thread->GetPriority(); + return ResultSuccess; +} + +Result GetThreadPriority32(Core::System& system, u32* out_priority, Handle handle) { + return GetThreadPriority(system, out_priority, handle); +} + +/// Sets the priority for the specified thread +Result SetThreadPriority(Core::System& system, Handle thread_handle, u32 priority) { + // Get the current process. + KProcess& process = *system.Kernel().CurrentProcess(); + + // Validate the priority. + R_UNLESS(HighestThreadPriority <= priority && priority <= LowestThreadPriority, + ResultInvalidPriority); + R_UNLESS(process.CheckThreadPriority(priority), ResultInvalidPriority); + + // Get the thread from its handle. + KScopedAutoObject thread = process.GetHandleTable().GetObject(thread_handle); + R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); + + // Set the thread priority. + thread->SetBasePriority(priority); + return ResultSuccess; +} + +Result SetThreadPriority32(Core::System& system, Handle thread_handle, u32 priority) { + return SetThreadPriority(system, thread_handle, priority); +} + +Result GetThreadList(Core::System& system, u32* out_num_threads, VAddr out_thread_ids, + u32 out_thread_ids_size, Handle debug_handle) { + // TODO: Handle this case when debug events are supported. + UNIMPLEMENTED_IF(debug_handle != InvalidHandle); + + LOG_DEBUG(Kernel_SVC, "called. out_thread_ids=0x{:016X}, out_thread_ids_size={}", + out_thread_ids, out_thread_ids_size); + + // If the size is negative or larger than INT32_MAX / sizeof(u64) + if ((out_thread_ids_size & 0xF0000000) != 0) { + LOG_ERROR(Kernel_SVC, "Supplied size outside [0, 0x0FFFFFFF] range. size={}", + out_thread_ids_size); + return ResultOutOfRange; + } + + auto* const current_process = system.Kernel().CurrentProcess(); + const auto total_copy_size = out_thread_ids_size * sizeof(u64); + + if (out_thread_ids_size > 0 && + !current_process->PageTable().IsInsideAddressSpace(out_thread_ids, total_copy_size)) { + LOG_ERROR(Kernel_SVC, "Address range outside address space. begin=0x{:016X}, end=0x{:016X}", + out_thread_ids, out_thread_ids + total_copy_size); + return ResultInvalidCurrentMemory; + } + + auto& memory = system.Memory(); + const auto& thread_list = current_process->GetThreadList(); + const auto num_threads = thread_list.size(); + const auto copy_amount = std::min(std::size_t{out_thread_ids_size}, num_threads); + + auto list_iter = thread_list.cbegin(); + for (std::size_t i = 0; i < copy_amount; ++i, ++list_iter) { + memory.Write64(out_thread_ids, (*list_iter)->GetThreadID()); + out_thread_ids += sizeof(u64); + } + + *out_num_threads = static_cast(num_threads); + return ResultSuccess; +} + +Result GetThreadCoreMask(Core::System& system, Handle thread_handle, s32* out_core_id, + u64* out_affinity_mask) { + LOG_TRACE(Kernel_SVC, "called, handle=0x{:08X}", thread_handle); + + // Get the thread from its handle. + KScopedAutoObject thread = + system.Kernel().CurrentProcess()->GetHandleTable().GetObject(thread_handle); + R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); + + // Get the core mask. + R_TRY(thread->GetCoreMask(out_core_id, out_affinity_mask)); + + return ResultSuccess; +} + +Result GetThreadCoreMask32(Core::System& system, Handle thread_handle, s32* out_core_id, + u32* out_affinity_mask_low, u32* out_affinity_mask_high) { + u64 out_affinity_mask{}; + const auto result = GetThreadCoreMask(system, thread_handle, out_core_id, &out_affinity_mask); + *out_affinity_mask_high = static_cast(out_affinity_mask >> 32); + *out_affinity_mask_low = static_cast(out_affinity_mask); + return result; +} + +Result SetThreadCoreMask(Core::System& system, Handle thread_handle, s32 core_id, + u64 affinity_mask) { + // Determine the core id/affinity mask. + if (core_id == IdealCoreUseProcessValue) { + core_id = system.Kernel().CurrentProcess()->GetIdealCoreId(); + affinity_mask = (1ULL << core_id); + } else { + // Validate the affinity mask. + const u64 process_core_mask = system.Kernel().CurrentProcess()->GetCoreMask(); + R_UNLESS((affinity_mask | process_core_mask) == process_core_mask, ResultInvalidCoreId); + R_UNLESS(affinity_mask != 0, ResultInvalidCombination); + + // Validate the core id. + if (IsValidVirtualCoreId(core_id)) { + R_UNLESS(((1ULL << core_id) & affinity_mask) != 0, ResultInvalidCombination); + } else { + R_UNLESS(core_id == IdealCoreNoUpdate || core_id == IdealCoreDontCare, + ResultInvalidCoreId); + } + } + + // Get the thread from its handle. + KScopedAutoObject thread = + system.Kernel().CurrentProcess()->GetHandleTable().GetObject(thread_handle); + R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); + + // Set the core mask. + R_TRY(thread->SetCoreMask(core_id, affinity_mask)); + + return ResultSuccess; +} + +Result SetThreadCoreMask32(Core::System& system, Handle thread_handle, s32 core_id, + u32 affinity_mask_low, u32 affinity_mask_high) { + const auto affinity_mask = u64{affinity_mask_low} | (u64{affinity_mask_high} << 32); + return SetThreadCoreMask(system, thread_handle, core_id, affinity_mask); +} + +/// Get the ID for the specified thread. +Result GetThreadId(Core::System& system, u64* out_thread_id, Handle thread_handle) { + // Get the thread from its handle. + KScopedAutoObject thread = + system.Kernel().CurrentProcess()->GetHandleTable().GetObject(thread_handle); + R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); + + // Get the thread's id. + *out_thread_id = thread->GetId(); + return ResultSuccess; +} + +Result GetThreadId32(Core::System& system, u32* out_thread_id_low, u32* out_thread_id_high, + Handle thread_handle) { + u64 out_thread_id{}; + const Result result{GetThreadId(system, &out_thread_id, thread_handle)}; + + *out_thread_id_low = static_cast(out_thread_id >> 32); + *out_thread_id_high = static_cast(out_thread_id & std::numeric_limits::max()); + + return result; +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_thread_profiler.cpp b/src/core/hle/kernel/svc/svc_thread_profiler.cpp new file mode 100644 index 000000000..299e22ae6 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_thread_profiler.cpp @@ -0,0 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc {} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_tick.cpp b/src/core/hle/kernel/svc/svc_tick.cpp new file mode 100644 index 000000000..e9b4fd5a6 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_tick.cpp @@ -0,0 +1,33 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/core_timing.h" +#include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { + +/// This returns the total CPU ticks elapsed since the CPU was powered-on +u64 GetSystemTick(Core::System& system) { + LOG_TRACE(Kernel_SVC, "called"); + + auto& core_timing = system.CoreTiming(); + + // Returns the value of cntpct_el0 (https://switchbrew.org/wiki/SVC#svcGetSystemTick) + const u64 result{core_timing.GetClockTicks()}; + + if (!system.Kernel().IsMulticore()) { + core_timing.AddTicks(400U); + } + + return result; +} + +void GetSystemTick32(Core::System& system, u32* time_low, u32* time_high) { + const auto time = GetSystemTick(system); + *time_low = static_cast(time); + *time_high = static_cast(time >> 32); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_transfer_memory.cpp b/src/core/hle/kernel/svc/svc_transfer_memory.cpp new file mode 100644 index 000000000..b14ae24a1 --- /dev/null +++ b/src/core/hle/kernel/svc/svc_transfer_memory.cpp @@ -0,0 +1,79 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "common/scope_exit.h" +#include "core/core.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/k_scoped_resource_reservation.h" +#include "core/hle/kernel/k_transfer_memory.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { +namespace { + +constexpr bool IsValidTransferMemoryPermission(MemoryPermission perm) { + switch (perm) { + case MemoryPermission::None: + case MemoryPermission::Read: + case MemoryPermission::ReadWrite: + return true; + default: + return false; + } +} + +} // Anonymous namespace + +/// Creates a TransferMemory object +Result CreateTransferMemory(Core::System& system, Handle* out, VAddr address, u64 size, + MemoryPermission map_perm) { + auto& kernel = system.Kernel(); + + // Validate the size. + R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); + R_UNLESS(size > 0, ResultInvalidSize); + R_UNLESS((address < address + size), ResultInvalidCurrentMemory); + + // Validate the permissions. + R_UNLESS(IsValidTransferMemoryPermission(map_perm), ResultInvalidNewMemoryPermission); + + // Get the current process and handle table. + auto& process = *kernel.CurrentProcess(); + auto& handle_table = process.GetHandleTable(); + + // Reserve a new transfer memory from the process resource limit. + KScopedResourceReservation trmem_reservation(kernel.CurrentProcess(), + LimitableResource::TransferMemoryCountMax); + R_UNLESS(trmem_reservation.Succeeded(), ResultLimitReached); + + // Create the transfer memory. + KTransferMemory* trmem = KTransferMemory::Create(kernel); + R_UNLESS(trmem != nullptr, ResultOutOfResource); + + // Ensure the only reference is in the handle table when we're done. + SCOPE_EXIT({ trmem->Close(); }); + + // Ensure that the region is in range. + R_UNLESS(process.PageTable().Contains(address, size), ResultInvalidCurrentMemory); + + // Initialize the transfer memory. + R_TRY(trmem->Initialize(address, size, map_perm)); + + // Commit the reservation. + trmem_reservation.Commit(); + + // Register the transfer memory. + KTransferMemory::Register(kernel, trmem); + + // Add the transfer memory to the handle table. + R_TRY(handle_table.Add(out, trmem)); + + return ResultSuccess; +} + +Result CreateTransferMemory32(Core::System& system, Handle* out, u32 address, u32 size, + MemoryPermission map_perm) { + return CreateTransferMemory(system, out, address, size, map_perm); +} +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc_wrap.h b/src/core/hle/kernel/svc_wrap.h index 1ea8c7fbc..052be40dd 100644 --- a/src/core/hle/kernel/svc_wrap.h +++ b/src/core/hle/kernel/svc_wrap.h @@ -172,11 +172,11 @@ void SvcWrap64(Core::System& system) { } // Used by GetResourceLimitLimitValue. -template +template void SvcWrap64(Core::System& system) { u64 param_1 = 0; const u32 retval = func(system, ¶m_1, static_cast(Param(system, 1)), - static_cast(Param(system, 2))) + static_cast(Param(system, 2))) .raw; system.CurrentArmInterface().SetReg(1, param_1); @@ -189,10 +189,10 @@ void SvcWrap64(Core::System& system) { } // Used by SetResourceLimitLimitValue -template +template void SvcWrap64(Core::System& system) { FuncReturn(system, func(system, static_cast(Param(system, 0)), - static_cast(Param(system, 1)), Param(system, 2)) + static_cast(Param(system, 1)), Param(system, 2)) .raw); } From 3f852c61d1b30fd7b55a5161c55c3f0667718d70 Mon Sep 17 00:00:00 2001 From: Merry Date: Sun, 5 Feb 2023 21:49:32 +0000 Subject: [PATCH 0029/1181] dynarmic: Update to 6.4.5 --- externals/dynarmic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/dynarmic b/externals/dynarmic index befe547d5..165621a87 160000 --- a/externals/dynarmic +++ b/externals/dynarmic @@ -1 +1 @@ -Subproject commit befe547d5631024a70d81d2ccee808bbfcb3854e +Subproject commit 165621a872ffb802c7a26ef5900e1e62681f1a88 From 8ae2a664d21850593f639e17f0a409d6e3e97069 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Sun, 5 Feb 2023 22:27:35 +0000 Subject: [PATCH 0030/1181] Remove fake vertex bindings when dynamic state is enabled --- .../renderer_vulkan/vk_graphics_pipeline.cpp | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index f91bb5a1d..baedc4424 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -548,31 +548,7 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) { static_vector vertex_bindings; static_vector vertex_binding_divisors; static_vector vertex_attributes; - if (key.state.dynamic_vertex_input) { - const size_t num_vertex_arrays = std::min( - key.state.attributes.size(), static_cast(device.GetMaxVertexInputBindings())); - for (size_t index = 0; index < num_vertex_arrays; ++index) { - const u32 type = key.state.DynamicAttributeType(index); - if (!stage_infos[0].loads.Generic(index) || type == 0) { - continue; - } - vertex_attributes.push_back({ - .location = static_cast(index), - .binding = 0, - .format = type == 1 ? VK_FORMAT_R32_SFLOAT - : type == 2 ? VK_FORMAT_R32_SINT - : VK_FORMAT_R32_UINT, - .offset = 0, - }); - } - if (!vertex_attributes.empty()) { - vertex_bindings.push_back({ - .binding = 0, - .stride = 4, - .inputRate = VK_VERTEX_INPUT_RATE_VERTEX, - }); - } - } else { + if (!key.state.dynamic_vertex_input) { const size_t num_vertex_arrays = std::min( Maxwell::NumVertexArrays, static_cast(device.GetMaxVertexInputBindings())); for (size_t index = 0; index < num_vertex_arrays; ++index) { From 69eaad18a5c421ae07f2a297cb2d8471014dc874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Locatti?= <42481638+goldenx86@users.noreply.github.com> Date: Mon, 6 Feb 2023 06:01:51 -0300 Subject: [PATCH 0031/1181] Update yuzu_cmd's default_ini.h Rename FSR, add missing resolution multipliers, and SMAA --- src/yuzu_cmd/default_ini.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 3f3651dbe..cf3cc4c4e 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -286,11 +286,14 @@ vulkan_device = # 0: 0.5x (360p/540p) [EXPERIMENTAL] # 1: 0.75x (540p/810p) [EXPERIMENTAL] # 2 (default): 1x (720p/1080p) -# 3: 2x (1440p/2160p) -# 4: 3x (2160p/3240p) -# 5: 4x (2880p/4320p) -# 6: 5x (3600p/5400p) -# 7: 6x (4320p/6480p) +# 3: 1.5x (1080p/1620p) [EXPERIMENTAL] +# 4: 2x (1440p/2160p) +# 5: 3x (2160p/3240p) +# 6: 4x (2880p/4320p) +# 7: 5x (3600p/5400p) +# 8: 6x (4320p/6480p) +# 9: 7x (5040p/7560p) +# 10: 8x (5760/8640p) resolution_setup = # Pixel filter to use when up- or down-sampling rendered frames. @@ -299,11 +302,11 @@ resolution_setup = # 2: Bicubic # 3: Gaussian # 4: ScaleForce -# 5: AMD FidelityFX™️ Super Resolution [Vulkan Only] +# 5: AMD FidelityFX™️ Super Resolution scaling_filter = # Anti-Aliasing (AA) -# 0 (default): None, 1: FXAA +# 0 (default): None, 1: FXAA, 2: SMAA anti_aliasing = # Whether to use fullscreen or borderless window mode From 82c2a3da9f453c3f9debc1e531d162e530405070 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 6 Feb 2023 13:14:27 -0500 Subject: [PATCH 0032/1181] kernel: fix compilation with older gcc --- src/core/hle/kernel/k_capabilities.cpp | 8 ++++---- src/core/hle/kernel/physical_core.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/hle/kernel/k_capabilities.cpp b/src/core/hle/kernel/k_capabilities.cpp index 64f1d7371..2907cc6e3 100644 --- a/src/core/hle/kernel/k_capabilities.cpp +++ b/src/core/hle/kernel/k_capabilities.cpp @@ -203,23 +203,23 @@ Result KCapabilities::ProcessMapRegionCapability(const u32 cap, F f) { Result KCapabilities::MapRegion_(const u32 cap, KPageTable* page_table) { // Map each region into the process's page table. - R_RETURN(ProcessMapRegionCapability( + return ProcessMapRegionCapability( cap, [](KMemoryRegionType region_type, KMemoryPermission perm) -> Result { // R_RETURN(page_table->MapRegion(region_type, perm)); UNIMPLEMENTED(); R_SUCCEED(); - })); + }); } Result KCapabilities::CheckMapRegion(KernelCore& kernel, const u32 cap) { // Check that each region has a physical backing store. - R_RETURN(ProcessMapRegionCapability( + return ProcessMapRegionCapability( cap, [&](KMemoryRegionType region_type, KMemoryPermission perm) -> Result { R_UNLESS(kernel.MemoryLayout().GetPhysicalMemoryRegionTree().FindFirstDerived( region_type) != nullptr, ResultOutOfRange); R_SUCCEED(); - })); + }); } Result KCapabilities::SetInterruptPairCapability(const u32 cap) { diff --git a/src/core/hle/kernel/physical_core.h b/src/core/hle/kernel/physical_core.h index fb2ba4c6b..fb8e7933e 100644 --- a/src/core/hle/kernel/physical_core.h +++ b/src/core/hle/kernel/physical_core.h @@ -3,6 +3,7 @@ #pragma once +#include #include #include #include From 2415d37ea296e8856267375989a8b95cebe2575a Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 5 Feb 2023 14:22:02 -0500 Subject: [PATCH 0033/1181] kernel/svc: switch to generated wrappers --- src/core/CMakeLists.txt | 1 + src/core/arm/arm_interface.h | 1 + src/core/hle/kernel/svc.cpp | 4846 +++++++++++++++-- src/core/hle/kernel/svc.h | 660 ++- src/core/hle/kernel/svc/svc_activity.cpp | 23 +- .../hle/kernel/svc/svc_address_arbiter.cpp | 23 +- .../kernel/svc/svc_address_translation.cpp | 46 +- src/core/hle/kernel/svc/svc_cache.cpp | 69 +- src/core/hle/kernel/svc/svc_code_memory.cpp | 34 +- .../hle/kernel/svc/svc_condition_variable.cpp | 22 +- src/core/hle/kernel/svc/svc_debug.cpp | 190 +- src/core/hle/kernel/svc/svc_debug_string.cpp | 16 +- .../kernel/svc/svc_device_address_space.cpp | 249 +- src/core/hle/kernel/svc/svc_event.cpp | 33 +- src/core/hle/kernel/svc/svc_exception.cpp | 32 +- src/core/hle/kernel/svc/svc_info.cpp | 35 +- .../hle/kernel/svc/svc_insecure_memory.cpp | 35 + .../hle/kernel/svc/svc_interrupt_event.cpp | 21 +- src/core/hle/kernel/svc/svc_io_pool.cpp | 67 +- src/core/hle/kernel/svc/svc_ipc.cpp | 97 +- src/core/hle/kernel/svc/svc_kernel_debug.cpp | 26 +- src/core/hle/kernel/svc/svc_light_ipc.cpp | 69 +- src/core/hle/kernel/svc/svc_lock.cpp | 21 +- src/core/hle/kernel/svc/svc_memory.cpp | 48 +- .../hle/kernel/svc/svc_physical_memory.cpp | 74 +- src/core/hle/kernel/svc/svc_port.cpp | 55 +- .../hle/kernel/svc/svc_power_management.cpp | 17 +- src/core/hle/kernel/svc/svc_process.cpp | 112 +- .../hle/kernel/svc/svc_process_memory.cpp | 50 + src/core/hle/kernel/svc/svc_processor.cpp | 10 +- src/core/hle/kernel/svc/svc_query_memory.cpp | 54 +- src/core/hle/kernel/svc/svc_register.cpp | 23 +- .../hle/kernel/svc/svc_resource_limit.cpp | 60 +- .../kernel/svc/svc_secure_monitor_call.cpp | 49 +- src/core/hle/kernel/svc/svc_session.cpp | 29 +- src/core/hle/kernel/svc/svc_shared_memory.cpp | 41 +- .../hle/kernel/svc/svc_synchronization.cpp | 60 +- src/core/hle/kernel/svc/svc_thread.cpp | 163 +- .../hle/kernel/svc/svc_thread_profiler.cpp | 56 +- src/core/hle/kernel/svc/svc_tick.cpp | 14 +- .../hle/kernel/svc/svc_transfer_memory.cpp | 44 +- src/core/hle/kernel/svc_generator.py | 716 +++ src/core/hle/kernel/svc_results.h | 1 + src/core/hle/kernel/svc_types.h | 11 + src/core/hle/kernel/svc_wrap.h | 733 --- 45 files changed, 7467 insertions(+), 1569 deletions(-) create mode 100644 src/core/hle/kernel/svc/svc_insecure_memory.cpp create mode 100644 src/core/hle/kernel/svc_generator.py delete mode 100644 src/core/hle/kernel/svc_wrap.h diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f16072e6c..8ef1fcaa8 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -310,6 +310,7 @@ add_library(core STATIC hle/kernel/svc/svc_event.cpp hle/kernel/svc/svc_exception.cpp hle/kernel/svc/svc_info.cpp + hle/kernel/svc/svc_insecure_memory.cpp hle/kernel/svc/svc_interrupt_event.cpp hle/kernel/svc/svc_io_pool.cpp hle/kernel/svc/svc_ipc.cpp diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index 7d62d030e..c40771c97 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h @@ -5,6 +5,7 @@ #include #include +#include #include #include diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 4cb6f40a0..4ef57356e 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -1,449 +1,4435 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/common_types.h" +// This file is automatically generated using svc_generator.py. + +#include + +#include "core/arm/arm_interface.h" +#include "core/core.h" #include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_thread.h" #include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_wrap.h" -#include "core/hle/result.h" namespace Kernel::Svc { -namespace { -struct FunctionDef { - using Func = void(Core::System&); - - u32 id; - Func* func; - const char* name; -}; - -} // namespace - -static const FunctionDef SVC_Table_32[] = { - {0x00, nullptr, "Unknown0"}, - {0x01, SvcWrap32, "SetHeapSize32"}, - {0x02, nullptr, "SetMemoryPermission32"}, - {0x03, SvcWrap32, "SetMemoryAttribute32"}, - {0x04, SvcWrap32, "MapMemory32"}, - {0x05, SvcWrap32, "UnmapMemory32"}, - {0x06, SvcWrap32, "QueryMemory32"}, - {0x07, SvcWrap32, "ExitProcess32"}, - {0x08, SvcWrap32, "CreateThread32"}, - {0x09, SvcWrap32, "StartThread32"}, - {0x0a, SvcWrap32, "ExitThread32"}, - {0x0b, SvcWrap32, "SleepThread32"}, - {0x0c, SvcWrap32, "GetThreadPriority32"}, - {0x0d, SvcWrap32, "SetThreadPriority32"}, - {0x0e, SvcWrap32, "GetThreadCoreMask32"}, - {0x0f, SvcWrap32, "SetThreadCoreMask32"}, - {0x10, SvcWrap32, "GetCurrentProcessorNumber32"}, - {0x11, SvcWrap32, "SignalEvent32"}, - {0x12, SvcWrap32, "ClearEvent32"}, - {0x13, SvcWrap32, "MapSharedMemory32"}, - {0x14, SvcWrap32, "UnmapSharedMemory32"}, - {0x15, SvcWrap32, "CreateTransferMemory32"}, - {0x16, SvcWrap32, "CloseHandle32"}, - {0x17, SvcWrap32, "ResetSignal32"}, - {0x18, SvcWrap32, "WaitSynchronization32"}, - {0x19, SvcWrap32, "CancelSynchronization32"}, - {0x1a, SvcWrap32, "ArbitrateLock32"}, - {0x1b, SvcWrap32, "ArbitrateUnlock32"}, - {0x1c, SvcWrap32, "WaitProcessWideKeyAtomic32"}, - {0x1d, SvcWrap32, "SignalProcessWideKey32"}, - {0x1e, SvcWrap32, "GetSystemTick32"}, - {0x1f, SvcWrap32, "ConnectToNamedPort32"}, - {0x20, nullptr, "SendSyncRequestLight32"}, - {0x21, SvcWrap32, "SendSyncRequest32"}, - {0x22, nullptr, "SendSyncRequestWithUserBuffer32"}, - {0x23, nullptr, "SendAsyncRequestWithUserBuffer32"}, - {0x24, SvcWrap32, "GetProcessId32"}, - {0x25, SvcWrap32, "GetThreadId32"}, - {0x26, SvcWrap32, "Break32"}, - {0x27, SvcWrap32, "OutputDebugString32"}, - {0x28, nullptr, "ReturnFromException32"}, - {0x29, SvcWrap32, "GetInfo32"}, - {0x2a, nullptr, "FlushEntireDataCache32"}, - {0x2b, nullptr, "FlushDataCache32"}, - {0x2c, SvcWrap32, "MapPhysicalMemory32"}, - {0x2d, SvcWrap32, "UnmapPhysicalMemory32"}, - {0x2e, nullptr, "GetDebugFutureThreadInfo32"}, - {0x2f, nullptr, "GetLastThreadInfo32"}, - {0x30, nullptr, "GetResourceLimitLimitValue32"}, - {0x31, nullptr, "GetResourceLimitCurrentValue32"}, - {0x32, SvcWrap32, "SetThreadActivity32"}, - {0x33, SvcWrap32, "GetThreadContext32"}, - {0x34, SvcWrap32, "WaitForAddress32"}, - {0x35, SvcWrap32, "SignalToAddress32"}, - {0x36, SvcWrap32, "SynchronizePreemptionState32"}, - {0x37, nullptr, "GetResourceLimitPeakValue32"}, - {0x38, nullptr, "Unknown38"}, - {0x39, nullptr, "CreateIoPool32"}, - {0x3a, nullptr, "CreateIoRegion32"}, - {0x3b, nullptr, "Unknown3b"}, - {0x3c, nullptr, "KernelDebug32"}, - {0x3d, nullptr, "ChangeKernelTraceState32"}, - {0x3e, nullptr, "Unknown3e"}, - {0x3f, nullptr, "Unknown3f"}, - {0x40, nullptr, "CreateSession32"}, - {0x41, nullptr, "AcceptSession32"}, - {0x42, nullptr, "ReplyAndReceiveLight32"}, - {0x43, nullptr, "ReplyAndReceive32"}, - {0x44, nullptr, "ReplyAndReceiveWithUserBuffer32"}, - {0x45, SvcWrap32, "CreateEvent32"}, - {0x46, nullptr, "MapIoRegion32"}, - {0x47, nullptr, "UnmapIoRegion32"}, - {0x48, nullptr, "MapPhysicalMemoryUnsafe32"}, - {0x49, nullptr, "UnmapPhysicalMemoryUnsafe32"}, - {0x4a, nullptr, "SetUnsafeLimit32"}, - {0x4b, SvcWrap32, "CreateCodeMemory32"}, - {0x4c, SvcWrap32, "ControlCodeMemory32"}, - {0x4d, nullptr, "SleepSystem32"}, - {0x4e, nullptr, "ReadWriteRegister32"}, - {0x4f, nullptr, "SetProcessActivity32"}, - {0x50, nullptr, "CreateSharedMemory32"}, - {0x51, nullptr, "MapTransferMemory32"}, - {0x52, nullptr, "UnmapTransferMemory32"}, - {0x53, nullptr, "CreateInterruptEvent32"}, - {0x54, nullptr, "QueryPhysicalAddress32"}, - {0x55, nullptr, "QueryIoMapping32"}, - {0x56, nullptr, "CreateDeviceAddressSpace32"}, - {0x57, nullptr, "AttachDeviceAddressSpace32"}, - {0x58, nullptr, "DetachDeviceAddressSpace32"}, - {0x59, nullptr, "MapDeviceAddressSpaceByForce32"}, - {0x5a, nullptr, "MapDeviceAddressSpaceAligned32"}, - {0x5b, nullptr, "MapDeviceAddressSpace32"}, - {0x5c, nullptr, "UnmapDeviceAddressSpace32"}, - {0x5d, nullptr, "InvalidateProcessDataCache32"}, - {0x5e, nullptr, "StoreProcessDataCache32"}, - {0x5F, SvcWrap32, "FlushProcessDataCache32"}, - {0x60, nullptr, "StoreProcessDataCache32"}, - {0x61, nullptr, "BreakDebugProcess32"}, - {0x62, nullptr, "TerminateDebugProcess32"}, - {0x63, nullptr, "GetDebugEvent32"}, - {0x64, nullptr, "ContinueDebugEvent32"}, - {0x65, nullptr, "GetProcessList32"}, - {0x66, nullptr, "GetThreadList"}, - {0x67, nullptr, "GetDebugThreadContext32"}, - {0x68, nullptr, "SetDebugThreadContext32"}, - {0x69, nullptr, "QueryDebugProcessMemory32"}, - {0x6A, nullptr, "ReadDebugProcessMemory32"}, - {0x6B, nullptr, "WriteDebugProcessMemory32"}, - {0x6C, nullptr, "SetHardwareBreakPoint32"}, - {0x6D, nullptr, "GetDebugThreadParam32"}, - {0x6E, nullptr, "Unknown6E"}, - {0x6f, nullptr, "GetSystemInfo32"}, - {0x70, nullptr, "CreatePort32"}, - {0x71, nullptr, "ManageNamedPort32"}, - {0x72, nullptr, "ConnectToPort32"}, - {0x73, nullptr, "SetProcessMemoryPermission32"}, - {0x74, nullptr, "MapProcessMemory32"}, - {0x75, nullptr, "UnmapProcessMemory32"}, - {0x76, nullptr, "QueryProcessMemory32"}, - {0x77, nullptr, "MapProcessCodeMemory32"}, - {0x78, nullptr, "UnmapProcessCodeMemory32"}, - {0x79, nullptr, "CreateProcess32"}, - {0x7A, nullptr, "StartProcess32"}, - {0x7B, nullptr, "TerminateProcess32"}, - {0x7C, nullptr, "GetProcessInfo32"}, - {0x7D, nullptr, "CreateResourceLimit32"}, - {0x7E, nullptr, "SetResourceLimitLimitValue32"}, - {0x7F, nullptr, "CallSecureMonitor32"}, - {0x80, nullptr, "Unknown"}, - {0x81, nullptr, "Unknown"}, - {0x82, nullptr, "Unknown"}, - {0x83, nullptr, "Unknown"}, - {0x84, nullptr, "Unknown"}, - {0x85, nullptr, "Unknown"}, - {0x86, nullptr, "Unknown"}, - {0x87, nullptr, "Unknown"}, - {0x88, nullptr, "Unknown"}, - {0x89, nullptr, "Unknown"}, - {0x8A, nullptr, "Unknown"}, - {0x8B, nullptr, "Unknown"}, - {0x8C, nullptr, "Unknown"}, - {0x8D, nullptr, "Unknown"}, - {0x8E, nullptr, "Unknown"}, - {0x8F, nullptr, "Unknown"}, - {0x90, nullptr, "Unknown"}, - {0x91, nullptr, "Unknown"}, - {0x92, nullptr, "Unknown"}, - {0x93, nullptr, "Unknown"}, - {0x94, nullptr, "Unknown"}, - {0x95, nullptr, "Unknown"}, - {0x96, nullptr, "Unknown"}, - {0x97, nullptr, "Unknown"}, - {0x98, nullptr, "Unknown"}, - {0x99, nullptr, "Unknown"}, - {0x9A, nullptr, "Unknown"}, - {0x9B, nullptr, "Unknown"}, - {0x9C, nullptr, "Unknown"}, - {0x9D, nullptr, "Unknown"}, - {0x9E, nullptr, "Unknown"}, - {0x9F, nullptr, "Unknown"}, - {0xA0, nullptr, "Unknown"}, - {0xA1, nullptr, "Unknown"}, - {0xA2, nullptr, "Unknown"}, - {0xA3, nullptr, "Unknown"}, - {0xA4, nullptr, "Unknown"}, - {0xA5, nullptr, "Unknown"}, - {0xA6, nullptr, "Unknown"}, - {0xA7, nullptr, "Unknown"}, - {0xA8, nullptr, "Unknown"}, - {0xA9, nullptr, "Unknown"}, - {0xAA, nullptr, "Unknown"}, - {0xAB, nullptr, "Unknown"}, - {0xAC, nullptr, "Unknown"}, - {0xAD, nullptr, "Unknown"}, - {0xAE, nullptr, "Unknown"}, - {0xAF, nullptr, "Unknown"}, - {0xB0, nullptr, "Unknown"}, - {0xB1, nullptr, "Unknown"}, - {0xB2, nullptr, "Unknown"}, - {0xB3, nullptr, "Unknown"}, - {0xB4, nullptr, "Unknown"}, - {0xB5, nullptr, "Unknown"}, - {0xB6, nullptr, "Unknown"}, - {0xB7, nullptr, "Unknown"}, - {0xB8, nullptr, "Unknown"}, - {0xB9, nullptr, "Unknown"}, - {0xBA, nullptr, "Unknown"}, - {0xBB, nullptr, "Unknown"}, - {0xBC, nullptr, "Unknown"}, - {0xBD, nullptr, "Unknown"}, - {0xBE, nullptr, "Unknown"}, - {0xBF, nullptr, "Unknown"}, -}; - -static const FunctionDef SVC_Table_64[] = { - {0x00, nullptr, "Unknown0"}, - {0x01, SvcWrap64, "SetHeapSize"}, - {0x02, SvcWrap64, "SetMemoryPermission"}, - {0x03, SvcWrap64, "SetMemoryAttribute"}, - {0x04, SvcWrap64, "MapMemory"}, - {0x05, SvcWrap64, "UnmapMemory"}, - {0x06, SvcWrap64, "QueryMemory"}, - {0x07, SvcWrap64, "ExitProcess"}, - {0x08, SvcWrap64, "CreateThread"}, - {0x09, SvcWrap64, "StartThread"}, - {0x0A, SvcWrap64, "ExitThread"}, - {0x0B, SvcWrap64, "SleepThread"}, - {0x0C, SvcWrap64, "GetThreadPriority"}, - {0x0D, SvcWrap64, "SetThreadPriority"}, - {0x0E, SvcWrap64, "GetThreadCoreMask"}, - {0x0F, SvcWrap64, "SetThreadCoreMask"}, - {0x10, SvcWrap64, "GetCurrentProcessorNumber"}, - {0x11, SvcWrap64, "SignalEvent"}, - {0x12, SvcWrap64, "ClearEvent"}, - {0x13, SvcWrap64, "MapSharedMemory"}, - {0x14, SvcWrap64, "UnmapSharedMemory"}, - {0x15, SvcWrap64, "CreateTransferMemory"}, - {0x16, SvcWrap64, "CloseHandle"}, - {0x17, SvcWrap64, "ResetSignal"}, - {0x18, SvcWrap64, "WaitSynchronization"}, - {0x19, SvcWrap64, "CancelSynchronization"}, - {0x1A, SvcWrap64, "ArbitrateLock"}, - {0x1B, SvcWrap64, "ArbitrateUnlock"}, - {0x1C, SvcWrap64, "WaitProcessWideKeyAtomic"}, - {0x1D, SvcWrap64, "SignalProcessWideKey"}, - {0x1E, SvcWrap64, "GetSystemTick"}, - {0x1F, SvcWrap64, "ConnectToNamedPort"}, - {0x20, nullptr, "SendSyncRequestLight"}, - {0x21, SvcWrap64, "SendSyncRequest"}, - {0x22, nullptr, "SendSyncRequestWithUserBuffer"}, - {0x23, nullptr, "SendAsyncRequestWithUserBuffer"}, - {0x24, SvcWrap64, "GetProcessId"}, - {0x25, SvcWrap64, "GetThreadId"}, - {0x26, SvcWrap64, "Break"}, - {0x27, SvcWrap64, "OutputDebugString"}, - {0x28, nullptr, "ReturnFromException"}, - {0x29, SvcWrap64, "GetInfo"}, - {0x2A, nullptr, "FlushEntireDataCache"}, - {0x2B, nullptr, "FlushDataCache"}, - {0x2C, SvcWrap64, "MapPhysicalMemory"}, - {0x2D, SvcWrap64, "UnmapPhysicalMemory"}, - {0x2E, nullptr, "GetFutureThreadInfo"}, - {0x2F, nullptr, "GetLastThreadInfo"}, - {0x30, SvcWrap64, "GetResourceLimitLimitValue"}, - {0x31, SvcWrap64, "GetResourceLimitCurrentValue"}, - {0x32, SvcWrap64, "SetThreadActivity"}, - {0x33, SvcWrap64, "GetThreadContext"}, - {0x34, SvcWrap64, "WaitForAddress"}, - {0x35, SvcWrap64, "SignalToAddress"}, - {0x36, SvcWrap64, "SynchronizePreemptionState"}, - {0x37, nullptr, "GetResourceLimitPeakValue"}, - {0x38, nullptr, "Unknown38"}, - {0x39, nullptr, "CreateIoPool"}, - {0x3A, nullptr, "CreateIoRegion"}, - {0x3B, nullptr, "Unknown3B"}, - {0x3C, SvcWrap64, "KernelDebug"}, - {0x3D, SvcWrap64, "ChangeKernelTraceState"}, - {0x3E, nullptr, "Unknown3e"}, - {0x3F, nullptr, "Unknown3f"}, - {0x40, SvcWrap64, "CreateSession"}, - {0x41, nullptr, "AcceptSession"}, - {0x42, nullptr, "ReplyAndReceiveLight"}, - {0x43, SvcWrap64, "ReplyAndReceive"}, - {0x44, nullptr, "ReplyAndReceiveWithUserBuffer"}, - {0x45, SvcWrap64, "CreateEvent"}, - {0x46, nullptr, "MapIoRegion"}, - {0x47, nullptr, "UnmapIoRegion"}, - {0x48, nullptr, "MapPhysicalMemoryUnsafe"}, - {0x49, nullptr, "UnmapPhysicalMemoryUnsafe"}, - {0x4A, nullptr, "SetUnsafeLimit"}, - {0x4B, SvcWrap64, "CreateCodeMemory"}, - {0x4C, SvcWrap64, "ControlCodeMemory"}, - {0x4D, nullptr, "SleepSystem"}, - {0x4E, nullptr, "ReadWriteRegister"}, - {0x4F, nullptr, "SetProcessActivity"}, - {0x50, nullptr, "CreateSharedMemory"}, - {0x51, nullptr, "MapTransferMemory"}, - {0x52, nullptr, "UnmapTransferMemory"}, - {0x53, nullptr, "CreateInterruptEvent"}, - {0x54, nullptr, "QueryPhysicalAddress"}, - {0x55, nullptr, "QueryIoMapping"}, - {0x56, nullptr, "CreateDeviceAddressSpace"}, - {0x57, nullptr, "AttachDeviceAddressSpace"}, - {0x58, nullptr, "DetachDeviceAddressSpace"}, - {0x59, nullptr, "MapDeviceAddressSpaceByForce"}, - {0x5A, nullptr, "MapDeviceAddressSpaceAligned"}, - {0x5B, nullptr, "MapDeviceAddressSpace"}, - {0x5C, nullptr, "UnmapDeviceAddressSpace"}, - {0x5D, nullptr, "InvalidateProcessDataCache"}, - {0x5E, nullptr, "StoreProcessDataCache"}, - {0x5F, nullptr, "FlushProcessDataCache"}, - {0x60, nullptr, "DebugActiveProcess"}, - {0x61, nullptr, "BreakDebugProcess"}, - {0x62, nullptr, "TerminateDebugProcess"}, - {0x63, nullptr, "GetDebugEvent"}, - {0x64, nullptr, "ContinueDebugEvent"}, - {0x65, SvcWrap64, "GetProcessList"}, - {0x66, SvcWrap64, "GetThreadList"}, - {0x67, nullptr, "GetDebugThreadContext"}, - {0x68, nullptr, "SetDebugThreadContext"}, - {0x69, nullptr, "QueryDebugProcessMemory"}, - {0x6A, nullptr, "ReadDebugProcessMemory"}, - {0x6B, nullptr, "WriteDebugProcessMemory"}, - {0x6C, nullptr, "SetHardwareBreakPoint"}, - {0x6D, nullptr, "GetDebugThreadParam"}, - {0x6E, nullptr, "Unknown6E"}, - {0x6F, nullptr, "GetSystemInfo"}, - {0x70, nullptr, "CreatePort"}, - {0x71, nullptr, "ManageNamedPort"}, - {0x72, nullptr, "ConnectToPort"}, - {0x73, SvcWrap64, "SetProcessMemoryPermission"}, - {0x74, SvcWrap64, "MapProcessMemory"}, - {0x75, SvcWrap64, "UnmapProcessMemory"}, - {0x76, SvcWrap64, "QueryProcessMemory"}, - {0x77, SvcWrap64, "MapProcessCodeMemory"}, - {0x78, SvcWrap64, "UnmapProcessCodeMemory"}, - {0x79, nullptr, "CreateProcess"}, - {0x7A, nullptr, "StartProcess"}, - {0x7B, nullptr, "TerminateProcess"}, - {0x7C, SvcWrap64, "GetProcessInfo"}, - {0x7D, SvcWrap64, "CreateResourceLimit"}, - {0x7E, SvcWrap64, "SetResourceLimitLimitValue"}, - {0x7F, nullptr, "CallSecureMonitor"}, - {0x80, nullptr, "Unknown"}, - {0x81, nullptr, "Unknown"}, - {0x82, nullptr, "Unknown"}, - {0x83, nullptr, "Unknown"}, - {0x84, nullptr, "Unknown"}, - {0x85, nullptr, "Unknown"}, - {0x86, nullptr, "Unknown"}, - {0x87, nullptr, "Unknown"}, - {0x88, nullptr, "Unknown"}, - {0x89, nullptr, "Unknown"}, - {0x8A, nullptr, "Unknown"}, - {0x8B, nullptr, "Unknown"}, - {0x8C, nullptr, "Unknown"}, - {0x8D, nullptr, "Unknown"}, - {0x8E, nullptr, "Unknown"}, - {0x8F, nullptr, "Unknown"}, - {0x90, nullptr, "Unknown"}, - {0x91, nullptr, "Unknown"}, - {0x92, nullptr, "Unknown"}, - {0x93, nullptr, "Unknown"}, - {0x94, nullptr, "Unknown"}, - {0x95, nullptr, "Unknown"}, - {0x96, nullptr, "Unknown"}, - {0x97, nullptr, "Unknown"}, - {0x98, nullptr, "Unknown"}, - {0x99, nullptr, "Unknown"}, - {0x9A, nullptr, "Unknown"}, - {0x9B, nullptr, "Unknown"}, - {0x9C, nullptr, "Unknown"}, - {0x9D, nullptr, "Unknown"}, - {0x9E, nullptr, "Unknown"}, - {0x9F, nullptr, "Unknown"}, - {0xA0, nullptr, "Unknown"}, - {0xA1, nullptr, "Unknown"}, - {0xA2, nullptr, "Unknown"}, - {0xA3, nullptr, "Unknown"}, - {0xA4, nullptr, "Unknown"}, - {0xA5, nullptr, "Unknown"}, - {0xA6, nullptr, "Unknown"}, - {0xA7, nullptr, "Unknown"}, - {0xA8, nullptr, "Unknown"}, - {0xA9, nullptr, "Unknown"}, - {0xAA, nullptr, "Unknown"}, - {0xAB, nullptr, "Unknown"}, - {0xAC, nullptr, "Unknown"}, - {0xAD, nullptr, "Unknown"}, - {0xAE, nullptr, "Unknown"}, - {0xAF, nullptr, "Unknown"}, - {0xB0, nullptr, "Unknown"}, - {0xB1, nullptr, "Unknown"}, - {0xB2, nullptr, "Unknown"}, - {0xB3, nullptr, "Unknown"}, - {0xB4, nullptr, "Unknown"}, - {0xB5, nullptr, "Unknown"}, - {0xB6, nullptr, "Unknown"}, - {0xB7, nullptr, "Unknown"}, - {0xB8, nullptr, "Unknown"}, - {0xB9, nullptr, "Unknown"}, - {0xBA, nullptr, "Unknown"}, - {0xBB, nullptr, "Unknown"}, - {0xBC, nullptr, "Unknown"}, - {0xBD, nullptr, "Unknown"}, - {0xBE, nullptr, "Unknown"}, - {0xBF, nullptr, "Unknown"}, -}; - -static const FunctionDef* GetSVCInfo32(u32 func_num) { - if (func_num >= std::size(SVC_Table_32)) { - LOG_ERROR(Kernel_SVC, "Unknown svc=0x{:02X}", func_num); - return nullptr; - } - return &SVC_Table_32[func_num]; +static uint32_t GetReg32(Core::System& system, int n) { + return static_cast(system.CurrentArmInterface().GetReg(n)); } -static const FunctionDef* GetSVCInfo64(u32 func_num) { - if (func_num >= std::size(SVC_Table_64)) { - LOG_ERROR(Kernel_SVC, "Unknown svc=0x{:02X}", func_num); - return nullptr; - } - return &SVC_Table_64[func_num]; +static void SetReg32(Core::System& system, int n, uint32_t result) { + system.CurrentArmInterface().SetReg(n, static_cast(result)); } -void Call(Core::System& system, u32 immediate) { +static uint64_t GetReg64(Core::System& system, int n) { + return system.CurrentArmInterface().GetReg(n); +} + +static void SetReg64(Core::System& system, int n, uint64_t result) { + system.CurrentArmInterface().SetReg(n, result); +} + +// Like bit_cast, but handles the case when the source and dest +// are differently-sized. +template + requires(std::is_trivial_v && std::is_trivially_copyable_v) +static To Convert(const From& from) { + To to{}; + + if constexpr (sizeof(To) >= sizeof(From)) { + std::memcpy(&to, &from, sizeof(From)); + } else { + std::memcpy(&to, &from, sizeof(To)); + } + + return to; +} + +// clang-format off +static_assert(sizeof(ArbitrationType) == 4); +static_assert(sizeof(BreakReason) == 4); +static_assert(sizeof(CodeMemoryOperation) == 4); +static_assert(sizeof(DebugThreadParam) == 4); +static_assert(sizeof(DeviceName) == 4); +static_assert(sizeof(HardwareBreakPointRegisterName) == 4); +static_assert(sizeof(Handle) == 4); +static_assert(sizeof(InfoType) == 4); +static_assert(sizeof(InterruptType) == 4); +static_assert(sizeof(IoPoolType) == 4); +static_assert(sizeof(KernelDebugType) == 4); +static_assert(sizeof(KernelTraceState) == 4); +static_assert(sizeof(LimitableResource) == 4); +static_assert(sizeof(MemoryMapping) == 4); +static_assert(sizeof(MemoryPermission) == 4); +static_assert(sizeof(PageInfo) == 4); +static_assert(sizeof(ProcessActivity) == 4); +static_assert(sizeof(ProcessInfoType) == 4); +static_assert(sizeof(Result) == 4); +static_assert(sizeof(SignalType) == 4); +static_assert(sizeof(SystemInfoType) == 4); +static_assert(sizeof(ThreadActivity) == 4); +static_assert(sizeof(ilp32::LastThreadContext) == 16); +static_assert(sizeof(ilp32::PhysicalMemoryInfo) == 16); +static_assert(sizeof(ilp32::SecureMonitorArguments) == 32); +static_assert(sizeof(lp64::LastThreadContext) == 32); +static_assert(sizeof(lp64::PhysicalMemoryInfo) == 24); +static_assert(sizeof(lp64::SecureMonitorArguments) == 64); +static_assert(sizeof(bool) == 1); +static_assert(sizeof(int32_t) == 4); +static_assert(sizeof(int64_t) == 8); +static_assert(sizeof(uint32_t) == 4); +static_assert(sizeof(uint64_t) == 8); + +static void SvcWrap_SetHeapSize64From32(Core::System& system) { + Result ret{}; + + uintptr_t out_address{}; + uint32_t size{}; + + size = Convert(GetReg32(system, 1)); + + ret = SetHeapSize64From32(system, &out_address, size); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_address)); +} + +static void SvcWrap_SetMemoryPermission64From32(Core::System& system) { + Result ret{}; + + uint32_t address{}; + uint32_t size{}; + MemoryPermission perm{}; + + address = Convert(GetReg32(system, 0)); + size = Convert(GetReg32(system, 1)); + perm = Convert(GetReg32(system, 2)); + + ret = SetMemoryPermission64From32(system, address, size, perm); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_SetMemoryAttribute64From32(Core::System& system) { + Result ret{}; + + uint32_t address{}; + uint32_t size{}; + uint32_t mask{}; + uint32_t attr{}; + + address = Convert(GetReg32(system, 0)); + size = Convert(GetReg32(system, 1)); + mask = Convert(GetReg32(system, 2)); + attr = Convert(GetReg32(system, 3)); + + ret = SetMemoryAttribute64From32(system, address, size, mask, attr); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_MapMemory64From32(Core::System& system) { + Result ret{}; + + uint32_t dst_address{}; + uint32_t src_address{}; + uint32_t size{}; + + dst_address = Convert(GetReg32(system, 0)); + src_address = Convert(GetReg32(system, 1)); + size = Convert(GetReg32(system, 2)); + + ret = MapMemory64From32(system, dst_address, src_address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapMemory64From32(Core::System& system) { + Result ret{}; + + uint32_t dst_address{}; + uint32_t src_address{}; + uint32_t size{}; + + dst_address = Convert(GetReg32(system, 0)); + src_address = Convert(GetReg32(system, 1)); + size = Convert(GetReg32(system, 2)); + + ret = UnmapMemory64From32(system, dst_address, src_address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_QueryMemory64From32(Core::System& system) { + Result ret{}; + + PageInfo out_page_info{}; + uint32_t out_memory_info{}; + uint32_t address{}; + + out_memory_info = Convert(GetReg32(system, 0)); + address = Convert(GetReg32(system, 2)); + + ret = QueryMemory64From32(system, out_memory_info, &out_page_info, address); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_page_info)); +} + +static void SvcWrap_ExitProcess64From32(Core::System& system) { + ExitProcess64From32(system); +} + +static void SvcWrap_CreateThread64From32(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint32_t func{}; + uint32_t arg{}; + uint32_t stack_bottom{}; + int32_t priority{}; + int32_t core_id{}; + + func = Convert(GetReg32(system, 1)); + arg = Convert(GetReg32(system, 2)); + stack_bottom = Convert(GetReg32(system, 3)); + priority = Convert(GetReg32(system, 0)); + core_id = Convert(GetReg32(system, 4)); + + ret = CreateThread64From32(system, &out_handle, func, arg, stack_bottom, priority, core_id); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_handle)); +} + +static void SvcWrap_StartThread64From32(Core::System& system) { + Result ret{}; + + Handle thread_handle{}; + + thread_handle = Convert(GetReg32(system, 0)); + + ret = StartThread64From32(system, thread_handle); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_ExitThread64From32(Core::System& system) { + ExitThread64From32(system); +} + +static void SvcWrap_SleepThread64From32(Core::System& system) { + int64_t ns{}; + + std::array ns_gather{}; + ns_gather[0] = GetReg32(system, 0); + ns_gather[1] = GetReg32(system, 1); + ns = Convert(ns_gather); + + SleepThread64From32(system, ns); +} + +static void SvcWrap_GetThreadPriority64From32(Core::System& system) { + Result ret{}; + + int32_t out_priority{}; + Handle thread_handle{}; + + thread_handle = Convert(GetReg32(system, 1)); + + ret = GetThreadPriority64From32(system, &out_priority, thread_handle); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_priority)); +} + +static void SvcWrap_SetThreadPriority64From32(Core::System& system) { + Result ret{}; + + Handle thread_handle{}; + int32_t priority{}; + + thread_handle = Convert(GetReg32(system, 0)); + priority = Convert(GetReg32(system, 1)); + + ret = SetThreadPriority64From32(system, thread_handle, priority); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_GetThreadCoreMask64From32(Core::System& system) { + Result ret{}; + + int32_t out_core_id{}; + uint64_t out_affinity_mask{}; + Handle thread_handle{}; + + thread_handle = Convert(GetReg32(system, 2)); + + ret = GetThreadCoreMask64From32(system, &out_core_id, &out_affinity_mask, thread_handle); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_core_id)); + auto out_affinity_mask_scatter = Convert>(out_affinity_mask); + SetReg32(system, 2, out_affinity_mask_scatter[0]); + SetReg32(system, 3, out_affinity_mask_scatter[1]); +} + +static void SvcWrap_SetThreadCoreMask64From32(Core::System& system) { + Result ret{}; + + Handle thread_handle{}; + int32_t core_id{}; + uint64_t affinity_mask{}; + + thread_handle = Convert(GetReg32(system, 0)); + core_id = Convert(GetReg32(system, 1)); + std::array affinity_mask_gather{}; + affinity_mask_gather[0] = GetReg32(system, 2); + affinity_mask_gather[1] = GetReg32(system, 3); + affinity_mask = Convert(affinity_mask_gather); + + ret = SetThreadCoreMask64From32(system, thread_handle, core_id, affinity_mask); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_GetCurrentProcessorNumber64From32(Core::System& system) { + int32_t ret{}; + + ret = GetCurrentProcessorNumber64From32(system); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_SignalEvent64From32(Core::System& system) { + Result ret{}; + + Handle event_handle{}; + + event_handle = Convert(GetReg32(system, 0)); + + ret = SignalEvent64From32(system, event_handle); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_ClearEvent64From32(Core::System& system) { + Result ret{}; + + Handle event_handle{}; + + event_handle = Convert(GetReg32(system, 0)); + + ret = ClearEvent64From32(system, event_handle); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_MapSharedMemory64From32(Core::System& system) { + Result ret{}; + + Handle shmem_handle{}; + uint32_t address{}; + uint32_t size{}; + MemoryPermission map_perm{}; + + shmem_handle = Convert(GetReg32(system, 0)); + address = Convert(GetReg32(system, 1)); + size = Convert(GetReg32(system, 2)); + map_perm = Convert(GetReg32(system, 3)); + + ret = MapSharedMemory64From32(system, shmem_handle, address, size, map_perm); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapSharedMemory64From32(Core::System& system) { + Result ret{}; + + Handle shmem_handle{}; + uint32_t address{}; + uint32_t size{}; + + shmem_handle = Convert(GetReg32(system, 0)); + address = Convert(GetReg32(system, 1)); + size = Convert(GetReg32(system, 2)); + + ret = UnmapSharedMemory64From32(system, shmem_handle, address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_CreateTransferMemory64From32(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint32_t address{}; + uint32_t size{}; + MemoryPermission map_perm{}; + + address = Convert(GetReg32(system, 1)); + size = Convert(GetReg32(system, 2)); + map_perm = Convert(GetReg32(system, 3)); + + ret = CreateTransferMemory64From32(system, &out_handle, address, size, map_perm); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_handle)); +} + +static void SvcWrap_CloseHandle64From32(Core::System& system) { + Result ret{}; + + Handle handle{}; + + handle = Convert(GetReg32(system, 0)); + + ret = CloseHandle64From32(system, handle); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_ResetSignal64From32(Core::System& system) { + Result ret{}; + + Handle handle{}; + + handle = Convert(GetReg32(system, 0)); + + ret = ResetSignal64From32(system, handle); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_WaitSynchronization64From32(Core::System& system) { + Result ret{}; + + int32_t out_index{}; + uint32_t handles{}; + int32_t num_handles{}; + int64_t timeout_ns{}; + + handles = Convert(GetReg32(system, 1)); + num_handles = Convert(GetReg32(system, 2)); + std::array timeout_ns_gather{}; + timeout_ns_gather[0] = GetReg32(system, 0); + timeout_ns_gather[1] = GetReg32(system, 3); + timeout_ns = Convert(timeout_ns_gather); + + ret = WaitSynchronization64From32(system, &out_index, handles, num_handles, timeout_ns); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_index)); +} + +static void SvcWrap_CancelSynchronization64From32(Core::System& system) { + Result ret{}; + + Handle handle{}; + + handle = Convert(GetReg32(system, 0)); + + ret = CancelSynchronization64From32(system, handle); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_ArbitrateLock64From32(Core::System& system) { + Result ret{}; + + Handle thread_handle{}; + uint32_t address{}; + uint32_t tag{}; + + thread_handle = Convert(GetReg32(system, 0)); + address = Convert(GetReg32(system, 1)); + tag = Convert(GetReg32(system, 2)); + + ret = ArbitrateLock64From32(system, thread_handle, address, tag); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_ArbitrateUnlock64From32(Core::System& system) { + Result ret{}; + + uint32_t address{}; + + address = Convert(GetReg32(system, 0)); + + ret = ArbitrateUnlock64From32(system, address); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_WaitProcessWideKeyAtomic64From32(Core::System& system) { + Result ret{}; + + uint32_t address{}; + uint32_t cv_key{}; + uint32_t tag{}; + int64_t timeout_ns{}; + + address = Convert(GetReg32(system, 0)); + cv_key = Convert(GetReg32(system, 1)); + tag = Convert(GetReg32(system, 2)); + std::array timeout_ns_gather{}; + timeout_ns_gather[0] = GetReg32(system, 3); + timeout_ns_gather[1] = GetReg32(system, 4); + timeout_ns = Convert(timeout_ns_gather); + + ret = WaitProcessWideKeyAtomic64From32(system, address, cv_key, tag, timeout_ns); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_SignalProcessWideKey64From32(Core::System& system) { + uint32_t cv_key{}; + int32_t count{}; + + cv_key = Convert(GetReg32(system, 0)); + count = Convert(GetReg32(system, 1)); + + SignalProcessWideKey64From32(system, cv_key, count); +} + +static void SvcWrap_GetSystemTick64From32(Core::System& system) { + int64_t ret{}; + + ret = GetSystemTick64From32(system); + + auto ret_scatter = Convert>(ret); + SetReg32(system, 0, ret_scatter[0]); + SetReg32(system, 1, ret_scatter[1]); +} + +static void SvcWrap_ConnectToNamedPort64From32(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint32_t name{}; + + name = Convert(GetReg32(system, 1)); + + ret = ConnectToNamedPort64From32(system, &out_handle, name); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_handle)); +} + +static void SvcWrap_SendSyncRequest64From32(Core::System& system) { + Result ret{}; + + Handle session_handle{}; + + session_handle = Convert(GetReg32(system, 0)); + + ret = SendSyncRequest64From32(system, session_handle); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_SendSyncRequestWithUserBuffer64From32(Core::System& system) { + Result ret{}; + + uint32_t message_buffer{}; + uint32_t message_buffer_size{}; + Handle session_handle{}; + + message_buffer = Convert(GetReg32(system, 0)); + message_buffer_size = Convert(GetReg32(system, 1)); + session_handle = Convert(GetReg32(system, 2)); + + ret = SendSyncRequestWithUserBuffer64From32(system, message_buffer, message_buffer_size, session_handle); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_SendAsyncRequestWithUserBuffer64From32(Core::System& system) { + Result ret{}; + + Handle out_event_handle{}; + uint32_t message_buffer{}; + uint32_t message_buffer_size{}; + Handle session_handle{}; + + message_buffer = Convert(GetReg32(system, 1)); + message_buffer_size = Convert(GetReg32(system, 2)); + session_handle = Convert(GetReg32(system, 3)); + + ret = SendAsyncRequestWithUserBuffer64From32(system, &out_event_handle, message_buffer, message_buffer_size, session_handle); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_event_handle)); +} + +static void SvcWrap_GetProcessId64From32(Core::System& system) { + Result ret{}; + + uint64_t out_process_id{}; + Handle process_handle{}; + + process_handle = Convert(GetReg32(system, 1)); + + ret = GetProcessId64From32(system, &out_process_id, process_handle); + + SetReg32(system, 0, Convert(ret)); + auto out_process_id_scatter = Convert>(out_process_id); + SetReg32(system, 1, out_process_id_scatter[0]); + SetReg32(system, 2, out_process_id_scatter[1]); +} + +static void SvcWrap_GetThreadId64From32(Core::System& system) { + Result ret{}; + + uint64_t out_thread_id{}; + Handle thread_handle{}; + + thread_handle = Convert(GetReg32(system, 1)); + + ret = GetThreadId64From32(system, &out_thread_id, thread_handle); + + SetReg32(system, 0, Convert(ret)); + auto out_thread_id_scatter = Convert>(out_thread_id); + SetReg32(system, 1, out_thread_id_scatter[0]); + SetReg32(system, 2, out_thread_id_scatter[1]); +} + +static void SvcWrap_Break64From32(Core::System& system) { + BreakReason break_reason{}; + uint32_t arg{}; + uint32_t size{}; + + break_reason = Convert(GetReg32(system, 0)); + arg = Convert(GetReg32(system, 1)); + size = Convert(GetReg32(system, 2)); + + Break64From32(system, break_reason, arg, size); +} + +static void SvcWrap_OutputDebugString64From32(Core::System& system) { + Result ret{}; + + uint32_t debug_str{}; + uint32_t len{}; + + debug_str = Convert(GetReg32(system, 0)); + len = Convert(GetReg32(system, 1)); + + ret = OutputDebugString64From32(system, debug_str, len); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_ReturnFromException64From32(Core::System& system) { + Result result{}; + + result = Convert(GetReg32(system, 0)); + + ReturnFromException64From32(system, result); +} + +static void SvcWrap_GetInfo64From32(Core::System& system) { + Result ret{}; + + uint64_t out{}; + InfoType info_type{}; + Handle handle{}; + uint64_t info_subtype{}; + + info_type = Convert(GetReg32(system, 1)); + handle = Convert(GetReg32(system, 2)); + std::array info_subtype_gather{}; + info_subtype_gather[0] = GetReg32(system, 0); + info_subtype_gather[1] = GetReg32(system, 3); + info_subtype = Convert(info_subtype_gather); + + ret = GetInfo64From32(system, &out, info_type, handle, info_subtype); + + SetReg32(system, 0, Convert(ret)); + auto out_scatter = Convert>(out); + SetReg32(system, 1, out_scatter[0]); + SetReg32(system, 2, out_scatter[1]); +} + +static void SvcWrap_FlushEntireDataCache64From32(Core::System& system) { + FlushEntireDataCache64From32(system); +} + +static void SvcWrap_FlushDataCache64From32(Core::System& system) { + Result ret{}; + + uint32_t address{}; + uint32_t size{}; + + address = Convert(GetReg32(system, 0)); + size = Convert(GetReg32(system, 1)); + + ret = FlushDataCache64From32(system, address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_MapPhysicalMemory64From32(Core::System& system) { + Result ret{}; + + uint32_t address{}; + uint32_t size{}; + + address = Convert(GetReg32(system, 0)); + size = Convert(GetReg32(system, 1)); + + ret = MapPhysicalMemory64From32(system, address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapPhysicalMemory64From32(Core::System& system) { + Result ret{}; + + uint32_t address{}; + uint32_t size{}; + + address = Convert(GetReg32(system, 0)); + size = Convert(GetReg32(system, 1)); + + ret = UnmapPhysicalMemory64From32(system, address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_GetDebugFutureThreadInfo64From32(Core::System& system) { + Result ret{}; + + ilp32::LastThreadContext out_context{}; + uint64_t out_thread_id{}; + Handle debug_handle{}; + int64_t ns{}; + + debug_handle = Convert(GetReg32(system, 2)); + std::array ns_gather{}; + ns_gather[0] = GetReg32(system, 0); + ns_gather[1] = GetReg32(system, 1); + ns = Convert(ns_gather); + + ret = GetDebugFutureThreadInfo64From32(system, &out_context, &out_thread_id, debug_handle, ns); + + SetReg32(system, 0, Convert(ret)); + auto out_context_scatter = Convert>(out_context); + SetReg32(system, 1, out_context_scatter[0]); + SetReg32(system, 2, out_context_scatter[1]); + SetReg32(system, 3, out_context_scatter[2]); + SetReg32(system, 4, out_context_scatter[3]); + auto out_thread_id_scatter = Convert>(out_thread_id); + SetReg32(system, 5, out_thread_id_scatter[0]); + SetReg32(system, 6, out_thread_id_scatter[1]); +} + +static void SvcWrap_GetLastThreadInfo64From32(Core::System& system) { + Result ret{}; + + ilp32::LastThreadContext out_context{}; + uintptr_t out_tls_address{}; + uint32_t out_flags{}; + + ret = GetLastThreadInfo64From32(system, &out_context, &out_tls_address, &out_flags); + + SetReg32(system, 0, Convert(ret)); + auto out_context_scatter = Convert>(out_context); + SetReg32(system, 1, out_context_scatter[0]); + SetReg32(system, 2, out_context_scatter[1]); + SetReg32(system, 3, out_context_scatter[2]); + SetReg32(system, 4, out_context_scatter[3]); + SetReg32(system, 5, Convert(out_tls_address)); + SetReg32(system, 6, Convert(out_flags)); +} + +static void SvcWrap_GetResourceLimitLimitValue64From32(Core::System& system) { + Result ret{}; + + int64_t out_limit_value{}; + Handle resource_limit_handle{}; + LimitableResource which{}; + + resource_limit_handle = Convert(GetReg32(system, 1)); + which = Convert(GetReg32(system, 2)); + + ret = GetResourceLimitLimitValue64From32(system, &out_limit_value, resource_limit_handle, which); + + SetReg32(system, 0, Convert(ret)); + auto out_limit_value_scatter = Convert>(out_limit_value); + SetReg32(system, 1, out_limit_value_scatter[0]); + SetReg32(system, 2, out_limit_value_scatter[1]); +} + +static void SvcWrap_GetResourceLimitCurrentValue64From32(Core::System& system) { + Result ret{}; + + int64_t out_current_value{}; + Handle resource_limit_handle{}; + LimitableResource which{}; + + resource_limit_handle = Convert(GetReg32(system, 1)); + which = Convert(GetReg32(system, 2)); + + ret = GetResourceLimitCurrentValue64From32(system, &out_current_value, resource_limit_handle, which); + + SetReg32(system, 0, Convert(ret)); + auto out_current_value_scatter = Convert>(out_current_value); + SetReg32(system, 1, out_current_value_scatter[0]); + SetReg32(system, 2, out_current_value_scatter[1]); +} + +static void SvcWrap_SetThreadActivity64From32(Core::System& system) { + Result ret{}; + + Handle thread_handle{}; + ThreadActivity thread_activity{}; + + thread_handle = Convert(GetReg32(system, 0)); + thread_activity = Convert(GetReg32(system, 1)); + + ret = SetThreadActivity64From32(system, thread_handle, thread_activity); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_GetThreadContext364From32(Core::System& system) { + Result ret{}; + + uint32_t out_context{}; + Handle thread_handle{}; + + out_context = Convert(GetReg32(system, 0)); + thread_handle = Convert(GetReg32(system, 1)); + + ret = GetThreadContext364From32(system, out_context, thread_handle); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_WaitForAddress64From32(Core::System& system) { + Result ret{}; + + uint32_t address{}; + ArbitrationType arb_type{}; + int32_t value{}; + int64_t timeout_ns{}; + + address = Convert(GetReg32(system, 0)); + arb_type = Convert(GetReg32(system, 1)); + value = Convert(GetReg32(system, 2)); + std::array timeout_ns_gather{}; + timeout_ns_gather[0] = GetReg32(system, 3); + timeout_ns_gather[1] = GetReg32(system, 4); + timeout_ns = Convert(timeout_ns_gather); + + ret = WaitForAddress64From32(system, address, arb_type, value, timeout_ns); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_SignalToAddress64From32(Core::System& system) { + Result ret{}; + + uint32_t address{}; + SignalType signal_type{}; + int32_t value{}; + int32_t count{}; + + address = Convert(GetReg32(system, 0)); + signal_type = Convert(GetReg32(system, 1)); + value = Convert(GetReg32(system, 2)); + count = Convert(GetReg32(system, 3)); + + ret = SignalToAddress64From32(system, address, signal_type, value, count); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_SynchronizePreemptionState64From32(Core::System& system) { + SynchronizePreemptionState64From32(system); +} + +static void SvcWrap_GetResourceLimitPeakValue64From32(Core::System& system) { + Result ret{}; + + int64_t out_peak_value{}; + Handle resource_limit_handle{}; + LimitableResource which{}; + + resource_limit_handle = Convert(GetReg32(system, 1)); + which = Convert(GetReg32(system, 2)); + + ret = GetResourceLimitPeakValue64From32(system, &out_peak_value, resource_limit_handle, which); + + SetReg32(system, 0, Convert(ret)); + auto out_peak_value_scatter = Convert>(out_peak_value); + SetReg32(system, 1, out_peak_value_scatter[0]); + SetReg32(system, 2, out_peak_value_scatter[1]); +} + +static void SvcWrap_CreateIoPool64From32(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + IoPoolType which{}; + + which = Convert(GetReg32(system, 1)); + + ret = CreateIoPool64From32(system, &out_handle, which); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_handle)); +} + +static void SvcWrap_CreateIoRegion64From32(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + Handle io_pool{}; + uint64_t physical_address{}; + uint32_t size{}; + MemoryMapping mapping{}; + MemoryPermission perm{}; + + io_pool = Convert(GetReg32(system, 1)); + std::array physical_address_gather{}; + physical_address_gather[0] = GetReg32(system, 2); + physical_address_gather[1] = GetReg32(system, 3); + physical_address = Convert(physical_address_gather); + size = Convert(GetReg32(system, 0)); + mapping = Convert(GetReg32(system, 4)); + perm = Convert(GetReg32(system, 5)); + + ret = CreateIoRegion64From32(system, &out_handle, io_pool, physical_address, size, mapping, perm); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_handle)); +} + +static void SvcWrap_KernelDebug64From32(Core::System& system) { + KernelDebugType kern_debug_type{}; + uint64_t arg0{}; + uint64_t arg1{}; + uint64_t arg2{}; + + kern_debug_type = Convert(GetReg32(system, 0)); + std::array arg0_gather{}; + arg0_gather[0] = GetReg32(system, 2); + arg0_gather[1] = GetReg32(system, 3); + arg0 = Convert(arg0_gather); + std::array arg1_gather{}; + arg1_gather[0] = GetReg32(system, 1); + arg1_gather[1] = GetReg32(system, 4); + arg1 = Convert(arg1_gather); + std::array arg2_gather{}; + arg2_gather[0] = GetReg32(system, 5); + arg2_gather[1] = GetReg32(system, 6); + arg2 = Convert(arg2_gather); + + KernelDebug64From32(system, kern_debug_type, arg0, arg1, arg2); +} + +static void SvcWrap_ChangeKernelTraceState64From32(Core::System& system) { + KernelTraceState kern_trace_state{}; + + kern_trace_state = Convert(GetReg32(system, 0)); + + ChangeKernelTraceState64From32(system, kern_trace_state); +} + +static void SvcWrap_CreateSession64From32(Core::System& system) { + Result ret{}; + + Handle out_server_session_handle{}; + Handle out_client_session_handle{}; + bool is_light{}; + uint32_t name{}; + + is_light = Convert(GetReg32(system, 2)); + name = Convert(GetReg32(system, 3)); + + ret = CreateSession64From32(system, &out_server_session_handle, &out_client_session_handle, is_light, name); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_server_session_handle)); + SetReg32(system, 2, Convert(out_client_session_handle)); +} + +static void SvcWrap_AcceptSession64From32(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + Handle port{}; + + port = Convert(GetReg32(system, 1)); + + ret = AcceptSession64From32(system, &out_handle, port); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_handle)); +} + +static void SvcWrap_ReplyAndReceive64From32(Core::System& system) { + Result ret{}; + + int32_t out_index{}; + uint32_t handles{}; + int32_t num_handles{}; + Handle reply_target{}; + int64_t timeout_ns{}; + + handles = Convert(GetReg32(system, 1)); + num_handles = Convert(GetReg32(system, 2)); + reply_target = Convert(GetReg32(system, 3)); + std::array timeout_ns_gather{}; + timeout_ns_gather[0] = GetReg32(system, 0); + timeout_ns_gather[1] = GetReg32(system, 4); + timeout_ns = Convert(timeout_ns_gather); + + ret = ReplyAndReceive64From32(system, &out_index, handles, num_handles, reply_target, timeout_ns); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_index)); +} + +static void SvcWrap_ReplyAndReceiveWithUserBuffer64From32(Core::System& system) { + Result ret{}; + + int32_t out_index{}; + uint32_t message_buffer{}; + uint32_t message_buffer_size{}; + uint32_t handles{}; + int32_t num_handles{}; + Handle reply_target{}; + int64_t timeout_ns{}; + + message_buffer = Convert(GetReg32(system, 1)); + message_buffer_size = Convert(GetReg32(system, 2)); + handles = Convert(GetReg32(system, 3)); + num_handles = Convert(GetReg32(system, 0)); + reply_target = Convert(GetReg32(system, 4)); + std::array timeout_ns_gather{}; + timeout_ns_gather[0] = GetReg32(system, 5); + timeout_ns_gather[1] = GetReg32(system, 6); + timeout_ns = Convert(timeout_ns_gather); + + ret = ReplyAndReceiveWithUserBuffer64From32(system, &out_index, message_buffer, message_buffer_size, handles, num_handles, reply_target, timeout_ns); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_index)); +} + +static void SvcWrap_CreateEvent64From32(Core::System& system) { + Result ret{}; + + Handle out_write_handle{}; + Handle out_read_handle{}; + + ret = CreateEvent64From32(system, &out_write_handle, &out_read_handle); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_write_handle)); + SetReg32(system, 2, Convert(out_read_handle)); +} + +static void SvcWrap_MapIoRegion64From32(Core::System& system) { + Result ret{}; + + Handle io_region{}; + uint32_t address{}; + uint32_t size{}; + MemoryPermission perm{}; + + io_region = Convert(GetReg32(system, 0)); + address = Convert(GetReg32(system, 1)); + size = Convert(GetReg32(system, 2)); + perm = Convert(GetReg32(system, 3)); + + ret = MapIoRegion64From32(system, io_region, address, size, perm); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapIoRegion64From32(Core::System& system) { + Result ret{}; + + Handle io_region{}; + uint32_t address{}; + uint32_t size{}; + + io_region = Convert(GetReg32(system, 0)); + address = Convert(GetReg32(system, 1)); + size = Convert(GetReg32(system, 2)); + + ret = UnmapIoRegion64From32(system, io_region, address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_MapPhysicalMemoryUnsafe64From32(Core::System& system) { + Result ret{}; + + uint32_t address{}; + uint32_t size{}; + + address = Convert(GetReg32(system, 0)); + size = Convert(GetReg32(system, 1)); + + ret = MapPhysicalMemoryUnsafe64From32(system, address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapPhysicalMemoryUnsafe64From32(Core::System& system) { + Result ret{}; + + uint32_t address{}; + uint32_t size{}; + + address = Convert(GetReg32(system, 0)); + size = Convert(GetReg32(system, 1)); + + ret = UnmapPhysicalMemoryUnsafe64From32(system, address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_SetUnsafeLimit64From32(Core::System& system) { + Result ret{}; + + uint32_t limit{}; + + limit = Convert(GetReg32(system, 0)); + + ret = SetUnsafeLimit64From32(system, limit); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_CreateCodeMemory64From32(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint32_t address{}; + uint32_t size{}; + + address = Convert(GetReg32(system, 1)); + size = Convert(GetReg32(system, 2)); + + ret = CreateCodeMemory64From32(system, &out_handle, address, size); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_handle)); +} + +static void SvcWrap_ControlCodeMemory64From32(Core::System& system) { + Result ret{}; + + Handle code_memory_handle{}; + CodeMemoryOperation operation{}; + uint64_t address{}; + uint64_t size{}; + MemoryPermission perm{}; + + code_memory_handle = Convert(GetReg32(system, 0)); + operation = Convert(GetReg32(system, 1)); + std::array address_gather{}; + address_gather[0] = GetReg32(system, 2); + address_gather[1] = GetReg32(system, 3); + address = Convert(address_gather); + std::array size_gather{}; + size_gather[0] = GetReg32(system, 4); + size_gather[1] = GetReg32(system, 5); + size = Convert(size_gather); + perm = Convert(GetReg32(system, 6)); + + ret = ControlCodeMemory64From32(system, code_memory_handle, operation, address, size, perm); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_SleepSystem64From32(Core::System& system) { + SleepSystem64From32(system); +} + +static void SvcWrap_ReadWriteRegister64From32(Core::System& system) { + Result ret{}; + + uint32_t out_value{}; + uint64_t address{}; + uint32_t mask{}; + uint32_t value{}; + + std::array address_gather{}; + address_gather[0] = GetReg32(system, 2); + address_gather[1] = GetReg32(system, 3); + address = Convert(address_gather); + mask = Convert(GetReg32(system, 0)); + value = Convert(GetReg32(system, 1)); + + ret = ReadWriteRegister64From32(system, &out_value, address, mask, value); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_value)); +} + +static void SvcWrap_SetProcessActivity64From32(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + ProcessActivity process_activity{}; + + process_handle = Convert(GetReg32(system, 0)); + process_activity = Convert(GetReg32(system, 1)); + + ret = SetProcessActivity64From32(system, process_handle, process_activity); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_CreateSharedMemory64From32(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint32_t size{}; + MemoryPermission owner_perm{}; + MemoryPermission remote_perm{}; + + size = Convert(GetReg32(system, 1)); + owner_perm = Convert(GetReg32(system, 2)); + remote_perm = Convert(GetReg32(system, 3)); + + ret = CreateSharedMemory64From32(system, &out_handle, size, owner_perm, remote_perm); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_handle)); +} + +static void SvcWrap_MapTransferMemory64From32(Core::System& system) { + Result ret{}; + + Handle trmem_handle{}; + uint32_t address{}; + uint32_t size{}; + MemoryPermission owner_perm{}; + + trmem_handle = Convert(GetReg32(system, 0)); + address = Convert(GetReg32(system, 1)); + size = Convert(GetReg32(system, 2)); + owner_perm = Convert(GetReg32(system, 3)); + + ret = MapTransferMemory64From32(system, trmem_handle, address, size, owner_perm); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapTransferMemory64From32(Core::System& system) { + Result ret{}; + + Handle trmem_handle{}; + uint32_t address{}; + uint32_t size{}; + + trmem_handle = Convert(GetReg32(system, 0)); + address = Convert(GetReg32(system, 1)); + size = Convert(GetReg32(system, 2)); + + ret = UnmapTransferMemory64From32(system, trmem_handle, address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_CreateInterruptEvent64From32(Core::System& system) { + Result ret{}; + + Handle out_read_handle{}; + int32_t interrupt_id{}; + InterruptType interrupt_type{}; + + interrupt_id = Convert(GetReg32(system, 1)); + interrupt_type = Convert(GetReg32(system, 2)); + + ret = CreateInterruptEvent64From32(system, &out_read_handle, interrupt_id, interrupt_type); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_read_handle)); +} + +static void SvcWrap_QueryPhysicalAddress64From32(Core::System& system) { + Result ret{}; + + ilp32::PhysicalMemoryInfo out_info{}; + uint32_t address{}; + + address = Convert(GetReg32(system, 1)); + + ret = QueryPhysicalAddress64From32(system, &out_info, address); + + SetReg32(system, 0, Convert(ret)); + auto out_info_scatter = Convert>(out_info); + SetReg32(system, 1, out_info_scatter[0]); + SetReg32(system, 2, out_info_scatter[1]); + SetReg32(system, 3, out_info_scatter[2]); + SetReg32(system, 4, out_info_scatter[3]); +} + +static void SvcWrap_QueryIoMapping64From32(Core::System& system) { + Result ret{}; + + uintptr_t out_address{}; + uintptr_t out_size{}; + uint64_t physical_address{}; + uint32_t size{}; + + std::array physical_address_gather{}; + physical_address_gather[0] = GetReg32(system, 2); + physical_address_gather[1] = GetReg32(system, 3); + physical_address = Convert(physical_address_gather); + size = Convert(GetReg32(system, 0)); + + ret = QueryIoMapping64From32(system, &out_address, &out_size, physical_address, size); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_address)); + SetReg32(system, 2, Convert(out_size)); +} + +static void SvcWrap_CreateDeviceAddressSpace64From32(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint64_t das_address{}; + uint64_t das_size{}; + + std::array das_address_gather{}; + das_address_gather[0] = GetReg32(system, 2); + das_address_gather[1] = GetReg32(system, 3); + das_address = Convert(das_address_gather); + std::array das_size_gather{}; + das_size_gather[0] = GetReg32(system, 0); + das_size_gather[1] = GetReg32(system, 1); + das_size = Convert(das_size_gather); + + ret = CreateDeviceAddressSpace64From32(system, &out_handle, das_address, das_size); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_handle)); +} + +static void SvcWrap_AttachDeviceAddressSpace64From32(Core::System& system) { + Result ret{}; + + DeviceName device_name{}; + Handle das_handle{}; + + device_name = Convert(GetReg32(system, 0)); + das_handle = Convert(GetReg32(system, 1)); + + ret = AttachDeviceAddressSpace64From32(system, device_name, das_handle); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_DetachDeviceAddressSpace64From32(Core::System& system) { + Result ret{}; + + DeviceName device_name{}; + Handle das_handle{}; + + device_name = Convert(GetReg32(system, 0)); + das_handle = Convert(GetReg32(system, 1)); + + ret = DetachDeviceAddressSpace64From32(system, device_name, das_handle); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_MapDeviceAddressSpaceByForce64From32(Core::System& system) { + Result ret{}; + + Handle das_handle{}; + Handle process_handle{}; + uint64_t process_address{}; + uint32_t size{}; + uint64_t device_address{}; + uint32_t option{}; + + das_handle = Convert(GetReg32(system, 0)); + process_handle = Convert(GetReg32(system, 1)); + std::array process_address_gather{}; + process_address_gather[0] = GetReg32(system, 2); + process_address_gather[1] = GetReg32(system, 3); + process_address = Convert(process_address_gather); + size = Convert(GetReg32(system, 4)); + std::array device_address_gather{}; + device_address_gather[0] = GetReg32(system, 5); + device_address_gather[1] = GetReg32(system, 6); + device_address = Convert(device_address_gather); + option = Convert(GetReg32(system, 7)); + + ret = MapDeviceAddressSpaceByForce64From32(system, das_handle, process_handle, process_address, size, device_address, option); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_MapDeviceAddressSpaceAligned64From32(Core::System& system) { + Result ret{}; + + Handle das_handle{}; + Handle process_handle{}; + uint64_t process_address{}; + uint32_t size{}; + uint64_t device_address{}; + uint32_t option{}; + + das_handle = Convert(GetReg32(system, 0)); + process_handle = Convert(GetReg32(system, 1)); + std::array process_address_gather{}; + process_address_gather[0] = GetReg32(system, 2); + process_address_gather[1] = GetReg32(system, 3); + process_address = Convert(process_address_gather); + size = Convert(GetReg32(system, 4)); + std::array device_address_gather{}; + device_address_gather[0] = GetReg32(system, 5); + device_address_gather[1] = GetReg32(system, 6); + device_address = Convert(device_address_gather); + option = Convert(GetReg32(system, 7)); + + ret = MapDeviceAddressSpaceAligned64From32(system, das_handle, process_handle, process_address, size, device_address, option); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapDeviceAddressSpace64From32(Core::System& system) { + Result ret{}; + + Handle das_handle{}; + Handle process_handle{}; + uint64_t process_address{}; + uint32_t size{}; + uint64_t device_address{}; + + das_handle = Convert(GetReg32(system, 0)); + process_handle = Convert(GetReg32(system, 1)); + std::array process_address_gather{}; + process_address_gather[0] = GetReg32(system, 2); + process_address_gather[1] = GetReg32(system, 3); + process_address = Convert(process_address_gather); + size = Convert(GetReg32(system, 4)); + std::array device_address_gather{}; + device_address_gather[0] = GetReg32(system, 5); + device_address_gather[1] = GetReg32(system, 6); + device_address = Convert(device_address_gather); + + ret = UnmapDeviceAddressSpace64From32(system, das_handle, process_handle, process_address, size, device_address); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_InvalidateProcessDataCache64From32(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + uint64_t address{}; + uint64_t size{}; + + process_handle = Convert(GetReg32(system, 0)); + std::array address_gather{}; + address_gather[0] = GetReg32(system, 2); + address_gather[1] = GetReg32(system, 3); + address = Convert(address_gather); + std::array size_gather{}; + size_gather[0] = GetReg32(system, 1); + size_gather[1] = GetReg32(system, 4); + size = Convert(size_gather); + + ret = InvalidateProcessDataCache64From32(system, process_handle, address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_StoreProcessDataCache64From32(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + uint64_t address{}; + uint64_t size{}; + + process_handle = Convert(GetReg32(system, 0)); + std::array address_gather{}; + address_gather[0] = GetReg32(system, 2); + address_gather[1] = GetReg32(system, 3); + address = Convert(address_gather); + std::array size_gather{}; + size_gather[0] = GetReg32(system, 1); + size_gather[1] = GetReg32(system, 4); + size = Convert(size_gather); + + ret = StoreProcessDataCache64From32(system, process_handle, address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_FlushProcessDataCache64From32(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + uint64_t address{}; + uint64_t size{}; + + process_handle = Convert(GetReg32(system, 0)); + std::array address_gather{}; + address_gather[0] = GetReg32(system, 2); + address_gather[1] = GetReg32(system, 3); + address = Convert(address_gather); + std::array size_gather{}; + size_gather[0] = GetReg32(system, 1); + size_gather[1] = GetReg32(system, 4); + size = Convert(size_gather); + + ret = FlushProcessDataCache64From32(system, process_handle, address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_DebugActiveProcess64From32(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint64_t process_id{}; + + std::array process_id_gather{}; + process_id_gather[0] = GetReg32(system, 2); + process_id_gather[1] = GetReg32(system, 3); + process_id = Convert(process_id_gather); + + ret = DebugActiveProcess64From32(system, &out_handle, process_id); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_handle)); +} + +static void SvcWrap_BreakDebugProcess64From32(Core::System& system) { + Result ret{}; + + Handle debug_handle{}; + + debug_handle = Convert(GetReg32(system, 0)); + + ret = BreakDebugProcess64From32(system, debug_handle); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_TerminateDebugProcess64From32(Core::System& system) { + Result ret{}; + + Handle debug_handle{}; + + debug_handle = Convert(GetReg32(system, 0)); + + ret = TerminateDebugProcess64From32(system, debug_handle); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_GetDebugEvent64From32(Core::System& system) { + Result ret{}; + + uint32_t out_info{}; + Handle debug_handle{}; + + out_info = Convert(GetReg32(system, 0)); + debug_handle = Convert(GetReg32(system, 1)); + + ret = GetDebugEvent64From32(system, out_info, debug_handle); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_ContinueDebugEvent64From32(Core::System& system) { + Result ret{}; + + Handle debug_handle{}; + uint32_t flags{}; + uint32_t thread_ids{}; + int32_t num_thread_ids{}; + + debug_handle = Convert(GetReg32(system, 0)); + flags = Convert(GetReg32(system, 1)); + thread_ids = Convert(GetReg32(system, 2)); + num_thread_ids = Convert(GetReg32(system, 3)); + + ret = ContinueDebugEvent64From32(system, debug_handle, flags, thread_ids, num_thread_ids); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_GetProcessList64From32(Core::System& system) { + Result ret{}; + + int32_t out_num_processes{}; + uint32_t out_process_ids{}; + int32_t max_out_count{}; + + out_process_ids = Convert(GetReg32(system, 1)); + max_out_count = Convert(GetReg32(system, 2)); + + ret = GetProcessList64From32(system, &out_num_processes, out_process_ids, max_out_count); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_num_processes)); +} + +static void SvcWrap_GetThreadList64From32(Core::System& system) { + Result ret{}; + + int32_t out_num_threads{}; + uint32_t out_thread_ids{}; + int32_t max_out_count{}; + Handle debug_handle{}; + + out_thread_ids = Convert(GetReg32(system, 1)); + max_out_count = Convert(GetReg32(system, 2)); + debug_handle = Convert(GetReg32(system, 3)); + + ret = GetThreadList64From32(system, &out_num_threads, out_thread_ids, max_out_count, debug_handle); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_num_threads)); +} + +static void SvcWrap_GetDebugThreadContext64From32(Core::System& system) { + Result ret{}; + + uint32_t out_context{}; + Handle debug_handle{}; + uint64_t thread_id{}; + uint32_t context_flags{}; + + out_context = Convert(GetReg32(system, 0)); + debug_handle = Convert(GetReg32(system, 1)); + std::array thread_id_gather{}; + thread_id_gather[0] = GetReg32(system, 2); + thread_id_gather[1] = GetReg32(system, 3); + thread_id = Convert(thread_id_gather); + context_flags = Convert(GetReg32(system, 4)); + + ret = GetDebugThreadContext64From32(system, out_context, debug_handle, thread_id, context_flags); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_SetDebugThreadContext64From32(Core::System& system) { + Result ret{}; + + Handle debug_handle{}; + uint64_t thread_id{}; + uint32_t context{}; + uint32_t context_flags{}; + + debug_handle = Convert(GetReg32(system, 0)); + std::array thread_id_gather{}; + thread_id_gather[0] = GetReg32(system, 2); + thread_id_gather[1] = GetReg32(system, 3); + thread_id = Convert(thread_id_gather); + context = Convert(GetReg32(system, 1)); + context_flags = Convert(GetReg32(system, 4)); + + ret = SetDebugThreadContext64From32(system, debug_handle, thread_id, context, context_flags); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_QueryDebugProcessMemory64From32(Core::System& system) { + Result ret{}; + + PageInfo out_page_info{}; + uint32_t out_memory_info{}; + Handle process_handle{}; + uint32_t address{}; + + out_memory_info = Convert(GetReg32(system, 0)); + process_handle = Convert(GetReg32(system, 2)); + address = Convert(GetReg32(system, 3)); + + ret = QueryDebugProcessMemory64From32(system, out_memory_info, &out_page_info, process_handle, address); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_page_info)); +} + +static void SvcWrap_ReadDebugProcessMemory64From32(Core::System& system) { + Result ret{}; + + uint32_t buffer{}; + Handle debug_handle{}; + uint32_t address{}; + uint32_t size{}; + + buffer = Convert(GetReg32(system, 0)); + debug_handle = Convert(GetReg32(system, 1)); + address = Convert(GetReg32(system, 2)); + size = Convert(GetReg32(system, 3)); + + ret = ReadDebugProcessMemory64From32(system, buffer, debug_handle, address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_WriteDebugProcessMemory64From32(Core::System& system) { + Result ret{}; + + Handle debug_handle{}; + uint32_t buffer{}; + uint32_t address{}; + uint32_t size{}; + + debug_handle = Convert(GetReg32(system, 0)); + buffer = Convert(GetReg32(system, 1)); + address = Convert(GetReg32(system, 2)); + size = Convert(GetReg32(system, 3)); + + ret = WriteDebugProcessMemory64From32(system, debug_handle, buffer, address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_SetHardwareBreakPoint64From32(Core::System& system) { + Result ret{}; + + HardwareBreakPointRegisterName name{}; + uint64_t flags{}; + uint64_t value{}; + + name = Convert(GetReg32(system, 0)); + std::array flags_gather{}; + flags_gather[0] = GetReg32(system, 2); + flags_gather[1] = GetReg32(system, 3); + flags = Convert(flags_gather); + std::array value_gather{}; + value_gather[0] = GetReg32(system, 1); + value_gather[1] = GetReg32(system, 4); + value = Convert(value_gather); + + ret = SetHardwareBreakPoint64From32(system, name, flags, value); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_GetDebugThreadParam64From32(Core::System& system) { + Result ret{}; + + uint64_t out_64{}; + uint32_t out_32{}; + Handle debug_handle{}; + uint64_t thread_id{}; + DebugThreadParam param{}; + + debug_handle = Convert(GetReg32(system, 2)); + std::array thread_id_gather{}; + thread_id_gather[0] = GetReg32(system, 0); + thread_id_gather[1] = GetReg32(system, 1); + thread_id = Convert(thread_id_gather); + param = Convert(GetReg32(system, 3)); + + ret = GetDebugThreadParam64From32(system, &out_64, &out_32, debug_handle, thread_id, param); + + SetReg32(system, 0, Convert(ret)); + auto out_64_scatter = Convert>(out_64); + SetReg32(system, 1, out_64_scatter[0]); + SetReg32(system, 2, out_64_scatter[1]); + SetReg32(system, 3, Convert(out_32)); +} + +static void SvcWrap_GetSystemInfo64From32(Core::System& system) { + Result ret{}; + + uint64_t out{}; + SystemInfoType info_type{}; + Handle handle{}; + uint64_t info_subtype{}; + + info_type = Convert(GetReg32(system, 1)); + handle = Convert(GetReg32(system, 2)); + std::array info_subtype_gather{}; + info_subtype_gather[0] = GetReg32(system, 0); + info_subtype_gather[1] = GetReg32(system, 3); + info_subtype = Convert(info_subtype_gather); + + ret = GetSystemInfo64From32(system, &out, info_type, handle, info_subtype); + + SetReg32(system, 0, Convert(ret)); + auto out_scatter = Convert>(out); + SetReg32(system, 1, out_scatter[0]); + SetReg32(system, 2, out_scatter[1]); +} + +static void SvcWrap_CreatePort64From32(Core::System& system) { + Result ret{}; + + Handle out_server_handle{}; + Handle out_client_handle{}; + int32_t max_sessions{}; + bool is_light{}; + uint32_t name{}; + + max_sessions = Convert(GetReg32(system, 2)); + is_light = Convert(GetReg32(system, 3)); + name = Convert(GetReg32(system, 0)); + + ret = CreatePort64From32(system, &out_server_handle, &out_client_handle, max_sessions, is_light, name); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_server_handle)); + SetReg32(system, 2, Convert(out_client_handle)); +} + +static void SvcWrap_ManageNamedPort64From32(Core::System& system) { + Result ret{}; + + Handle out_server_handle{}; + uint32_t name{}; + int32_t max_sessions{}; + + name = Convert(GetReg32(system, 1)); + max_sessions = Convert(GetReg32(system, 2)); + + ret = ManageNamedPort64From32(system, &out_server_handle, name, max_sessions); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_server_handle)); +} + +static void SvcWrap_ConnectToPort64From32(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + Handle port{}; + + port = Convert(GetReg32(system, 1)); + + ret = ConnectToPort64From32(system, &out_handle, port); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_handle)); +} + +static void SvcWrap_SetProcessMemoryPermission64From32(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + uint64_t address{}; + uint64_t size{}; + MemoryPermission perm{}; + + process_handle = Convert(GetReg32(system, 0)); + std::array address_gather{}; + address_gather[0] = GetReg32(system, 2); + address_gather[1] = GetReg32(system, 3); + address = Convert(address_gather); + std::array size_gather{}; + size_gather[0] = GetReg32(system, 1); + size_gather[1] = GetReg32(system, 4); + size = Convert(size_gather); + perm = Convert(GetReg32(system, 5)); + + ret = SetProcessMemoryPermission64From32(system, process_handle, address, size, perm); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_MapProcessMemory64From32(Core::System& system) { + Result ret{}; + + uint32_t dst_address{}; + Handle process_handle{}; + uint64_t src_address{}; + uint32_t size{}; + + dst_address = Convert(GetReg32(system, 0)); + process_handle = Convert(GetReg32(system, 1)); + std::array src_address_gather{}; + src_address_gather[0] = GetReg32(system, 2); + src_address_gather[1] = GetReg32(system, 3); + src_address = Convert(src_address_gather); + size = Convert(GetReg32(system, 4)); + + ret = MapProcessMemory64From32(system, dst_address, process_handle, src_address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapProcessMemory64From32(Core::System& system) { + Result ret{}; + + uint32_t dst_address{}; + Handle process_handle{}; + uint64_t src_address{}; + uint32_t size{}; + + dst_address = Convert(GetReg32(system, 0)); + process_handle = Convert(GetReg32(system, 1)); + std::array src_address_gather{}; + src_address_gather[0] = GetReg32(system, 2); + src_address_gather[1] = GetReg32(system, 3); + src_address = Convert(src_address_gather); + size = Convert(GetReg32(system, 4)); + + ret = UnmapProcessMemory64From32(system, dst_address, process_handle, src_address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_QueryProcessMemory64From32(Core::System& system) { + Result ret{}; + + PageInfo out_page_info{}; + uint32_t out_memory_info{}; + Handle process_handle{}; + uint64_t address{}; + + out_memory_info = Convert(GetReg32(system, 0)); + process_handle = Convert(GetReg32(system, 2)); + std::array address_gather{}; + address_gather[0] = GetReg32(system, 1); + address_gather[1] = GetReg32(system, 3); + address = Convert(address_gather); + + ret = QueryProcessMemory64From32(system, out_memory_info, &out_page_info, process_handle, address); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_page_info)); +} + +static void SvcWrap_MapProcessCodeMemory64From32(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + uint64_t dst_address{}; + uint64_t src_address{}; + uint64_t size{}; + + process_handle = Convert(GetReg32(system, 0)); + std::array dst_address_gather{}; + dst_address_gather[0] = GetReg32(system, 2); + dst_address_gather[1] = GetReg32(system, 3); + dst_address = Convert(dst_address_gather); + std::array src_address_gather{}; + src_address_gather[0] = GetReg32(system, 1); + src_address_gather[1] = GetReg32(system, 4); + src_address = Convert(src_address_gather); + std::array size_gather{}; + size_gather[0] = GetReg32(system, 5); + size_gather[1] = GetReg32(system, 6); + size = Convert(size_gather); + + ret = MapProcessCodeMemory64From32(system, process_handle, dst_address, src_address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapProcessCodeMemory64From32(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + uint64_t dst_address{}; + uint64_t src_address{}; + uint64_t size{}; + + process_handle = Convert(GetReg32(system, 0)); + std::array dst_address_gather{}; + dst_address_gather[0] = GetReg32(system, 2); + dst_address_gather[1] = GetReg32(system, 3); + dst_address = Convert(dst_address_gather); + std::array src_address_gather{}; + src_address_gather[0] = GetReg32(system, 1); + src_address_gather[1] = GetReg32(system, 4); + src_address = Convert(src_address_gather); + std::array size_gather{}; + size_gather[0] = GetReg32(system, 5); + size_gather[1] = GetReg32(system, 6); + size = Convert(size_gather); + + ret = UnmapProcessCodeMemory64From32(system, process_handle, dst_address, src_address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_CreateProcess64From32(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint32_t parameters{}; + uint32_t caps{}; + int32_t num_caps{}; + + parameters = Convert(GetReg32(system, 1)); + caps = Convert(GetReg32(system, 2)); + num_caps = Convert(GetReg32(system, 3)); + + ret = CreateProcess64From32(system, &out_handle, parameters, caps, num_caps); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_handle)); +} + +static void SvcWrap_StartProcess64From32(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + int32_t priority{}; + int32_t core_id{}; + uint64_t main_thread_stack_size{}; + + process_handle = Convert(GetReg32(system, 0)); + priority = Convert(GetReg32(system, 1)); + core_id = Convert(GetReg32(system, 2)); + std::array main_thread_stack_size_gather{}; + main_thread_stack_size_gather[0] = GetReg32(system, 3); + main_thread_stack_size_gather[1] = GetReg32(system, 4); + main_thread_stack_size = Convert(main_thread_stack_size_gather); + + ret = StartProcess64From32(system, process_handle, priority, core_id, main_thread_stack_size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_TerminateProcess64From32(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + + process_handle = Convert(GetReg32(system, 0)); + + ret = TerminateProcess64From32(system, process_handle); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_GetProcessInfo64From32(Core::System& system) { + Result ret{}; + + int64_t out_info{}; + Handle process_handle{}; + ProcessInfoType info_type{}; + + process_handle = Convert(GetReg32(system, 1)); + info_type = Convert(GetReg32(system, 2)); + + ret = GetProcessInfo64From32(system, &out_info, process_handle, info_type); + + SetReg32(system, 0, Convert(ret)); + auto out_info_scatter = Convert>(out_info); + SetReg32(system, 1, out_info_scatter[0]); + SetReg32(system, 2, out_info_scatter[1]); +} + +static void SvcWrap_CreateResourceLimit64From32(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + + ret = CreateResourceLimit64From32(system, &out_handle); + + SetReg32(system, 0, Convert(ret)); + SetReg32(system, 1, Convert(out_handle)); +} + +static void SvcWrap_SetResourceLimitLimitValue64From32(Core::System& system) { + Result ret{}; + + Handle resource_limit_handle{}; + LimitableResource which{}; + int64_t limit_value{}; + + resource_limit_handle = Convert(GetReg32(system, 0)); + which = Convert(GetReg32(system, 1)); + std::array limit_value_gather{}; + limit_value_gather[0] = GetReg32(system, 2); + limit_value_gather[1] = GetReg32(system, 3); + limit_value = Convert(limit_value_gather); + + ret = SetResourceLimitLimitValue64From32(system, resource_limit_handle, which, limit_value); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_MapInsecureMemory64From32(Core::System& system) { + Result ret{}; + + uint32_t address{}; + uint32_t size{}; + + address = Convert(GetReg32(system, 0)); + size = Convert(GetReg32(system, 1)); + + ret = MapInsecureMemory64From32(system, address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapInsecureMemory64From32(Core::System& system) { + Result ret{}; + + uint32_t address{}; + uint32_t size{}; + + address = Convert(GetReg32(system, 0)); + size = Convert(GetReg32(system, 1)); + + ret = UnmapInsecureMemory64From32(system, address, size); + + SetReg32(system, 0, Convert(ret)); +} + +static void SvcWrap_SetHeapSize64(Core::System& system) { + Result ret{}; + + uintptr_t out_address{}; + uint64_t size{}; + + size = Convert(GetReg64(system, 1)); + + ret = SetHeapSize64(system, &out_address, size); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_address)); +} + +static void SvcWrap_SetMemoryPermission64(Core::System& system) { + Result ret{}; + + uint64_t address{}; + uint64_t size{}; + MemoryPermission perm{}; + + address = Convert(GetReg64(system, 0)); + size = Convert(GetReg64(system, 1)); + perm = Convert(GetReg64(system, 2)); + + ret = SetMemoryPermission64(system, address, size, perm); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_SetMemoryAttribute64(Core::System& system) { + Result ret{}; + + uint64_t address{}; + uint64_t size{}; + uint32_t mask{}; + uint32_t attr{}; + + address = Convert(GetReg64(system, 0)); + size = Convert(GetReg64(system, 1)); + mask = Convert(GetReg64(system, 2)); + attr = Convert(GetReg64(system, 3)); + + ret = SetMemoryAttribute64(system, address, size, mask, attr); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_MapMemory64(Core::System& system) { + Result ret{}; + + uint64_t dst_address{}; + uint64_t src_address{}; + uint64_t size{}; + + dst_address = Convert(GetReg64(system, 0)); + src_address = Convert(GetReg64(system, 1)); + size = Convert(GetReg64(system, 2)); + + ret = MapMemory64(system, dst_address, src_address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapMemory64(Core::System& system) { + Result ret{}; + + uint64_t dst_address{}; + uint64_t src_address{}; + uint64_t size{}; + + dst_address = Convert(GetReg64(system, 0)); + src_address = Convert(GetReg64(system, 1)); + size = Convert(GetReg64(system, 2)); + + ret = UnmapMemory64(system, dst_address, src_address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_QueryMemory64(Core::System& system) { + Result ret{}; + + PageInfo out_page_info{}; + uint64_t out_memory_info{}; + uint64_t address{}; + + out_memory_info = Convert(GetReg64(system, 0)); + address = Convert(GetReg64(system, 2)); + + ret = QueryMemory64(system, out_memory_info, &out_page_info, address); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_page_info)); +} + +static void SvcWrap_ExitProcess64(Core::System& system) { + ExitProcess64(system); +} + +static void SvcWrap_CreateThread64(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint64_t func{}; + uint64_t arg{}; + uint64_t stack_bottom{}; + int32_t priority{}; + int32_t core_id{}; + + func = Convert(GetReg64(system, 1)); + arg = Convert(GetReg64(system, 2)); + stack_bottom = Convert(GetReg64(system, 3)); + priority = Convert(GetReg64(system, 4)); + core_id = Convert(GetReg64(system, 5)); + + ret = CreateThread64(system, &out_handle, func, arg, stack_bottom, priority, core_id); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_handle)); +} + +static void SvcWrap_StartThread64(Core::System& system) { + Result ret{}; + + Handle thread_handle{}; + + thread_handle = Convert(GetReg64(system, 0)); + + ret = StartThread64(system, thread_handle); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_ExitThread64(Core::System& system) { + ExitThread64(system); +} + +static void SvcWrap_SleepThread64(Core::System& system) { + int64_t ns{}; + + ns = Convert(GetReg64(system, 0)); + + SleepThread64(system, ns); +} + +static void SvcWrap_GetThreadPriority64(Core::System& system) { + Result ret{}; + + int32_t out_priority{}; + Handle thread_handle{}; + + thread_handle = Convert(GetReg64(system, 1)); + + ret = GetThreadPriority64(system, &out_priority, thread_handle); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_priority)); +} + +static void SvcWrap_SetThreadPriority64(Core::System& system) { + Result ret{}; + + Handle thread_handle{}; + int32_t priority{}; + + thread_handle = Convert(GetReg64(system, 0)); + priority = Convert(GetReg64(system, 1)); + + ret = SetThreadPriority64(system, thread_handle, priority); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_GetThreadCoreMask64(Core::System& system) { + Result ret{}; + + int32_t out_core_id{}; + uint64_t out_affinity_mask{}; + Handle thread_handle{}; + + thread_handle = Convert(GetReg64(system, 2)); + + ret = GetThreadCoreMask64(system, &out_core_id, &out_affinity_mask, thread_handle); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_core_id)); + SetReg64(system, 2, Convert(out_affinity_mask)); +} + +static void SvcWrap_SetThreadCoreMask64(Core::System& system) { + Result ret{}; + + Handle thread_handle{}; + int32_t core_id{}; + uint64_t affinity_mask{}; + + thread_handle = Convert(GetReg64(system, 0)); + core_id = Convert(GetReg64(system, 1)); + affinity_mask = Convert(GetReg64(system, 2)); + + ret = SetThreadCoreMask64(system, thread_handle, core_id, affinity_mask); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_GetCurrentProcessorNumber64(Core::System& system) { + int32_t ret{}; + + ret = GetCurrentProcessorNumber64(system); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_SignalEvent64(Core::System& system) { + Result ret{}; + + Handle event_handle{}; + + event_handle = Convert(GetReg64(system, 0)); + + ret = SignalEvent64(system, event_handle); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_ClearEvent64(Core::System& system) { + Result ret{}; + + Handle event_handle{}; + + event_handle = Convert(GetReg64(system, 0)); + + ret = ClearEvent64(system, event_handle); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_MapSharedMemory64(Core::System& system) { + Result ret{}; + + Handle shmem_handle{}; + uint64_t address{}; + uint64_t size{}; + MemoryPermission map_perm{}; + + shmem_handle = Convert(GetReg64(system, 0)); + address = Convert(GetReg64(system, 1)); + size = Convert(GetReg64(system, 2)); + map_perm = Convert(GetReg64(system, 3)); + + ret = MapSharedMemory64(system, shmem_handle, address, size, map_perm); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapSharedMemory64(Core::System& system) { + Result ret{}; + + Handle shmem_handle{}; + uint64_t address{}; + uint64_t size{}; + + shmem_handle = Convert(GetReg64(system, 0)); + address = Convert(GetReg64(system, 1)); + size = Convert(GetReg64(system, 2)); + + ret = UnmapSharedMemory64(system, shmem_handle, address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_CreateTransferMemory64(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint64_t address{}; + uint64_t size{}; + MemoryPermission map_perm{}; + + address = Convert(GetReg64(system, 1)); + size = Convert(GetReg64(system, 2)); + map_perm = Convert(GetReg64(system, 3)); + + ret = CreateTransferMemory64(system, &out_handle, address, size, map_perm); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_handle)); +} + +static void SvcWrap_CloseHandle64(Core::System& system) { + Result ret{}; + + Handle handle{}; + + handle = Convert(GetReg64(system, 0)); + + ret = CloseHandle64(system, handle); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_ResetSignal64(Core::System& system) { + Result ret{}; + + Handle handle{}; + + handle = Convert(GetReg64(system, 0)); + + ret = ResetSignal64(system, handle); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_WaitSynchronization64(Core::System& system) { + Result ret{}; + + int32_t out_index{}; + uint64_t handles{}; + int32_t num_handles{}; + int64_t timeout_ns{}; + + handles = Convert(GetReg64(system, 1)); + num_handles = Convert(GetReg64(system, 2)); + timeout_ns = Convert(GetReg64(system, 3)); + + ret = WaitSynchronization64(system, &out_index, handles, num_handles, timeout_ns); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_index)); +} + +static void SvcWrap_CancelSynchronization64(Core::System& system) { + Result ret{}; + + Handle handle{}; + + handle = Convert(GetReg64(system, 0)); + + ret = CancelSynchronization64(system, handle); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_ArbitrateLock64(Core::System& system) { + Result ret{}; + + Handle thread_handle{}; + uint64_t address{}; + uint32_t tag{}; + + thread_handle = Convert(GetReg64(system, 0)); + address = Convert(GetReg64(system, 1)); + tag = Convert(GetReg64(system, 2)); + + ret = ArbitrateLock64(system, thread_handle, address, tag); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_ArbitrateUnlock64(Core::System& system) { + Result ret{}; + + uint64_t address{}; + + address = Convert(GetReg64(system, 0)); + + ret = ArbitrateUnlock64(system, address); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_WaitProcessWideKeyAtomic64(Core::System& system) { + Result ret{}; + + uint64_t address{}; + uint64_t cv_key{}; + uint32_t tag{}; + int64_t timeout_ns{}; + + address = Convert(GetReg64(system, 0)); + cv_key = Convert(GetReg64(system, 1)); + tag = Convert(GetReg64(system, 2)); + timeout_ns = Convert(GetReg64(system, 3)); + + ret = WaitProcessWideKeyAtomic64(system, address, cv_key, tag, timeout_ns); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_SignalProcessWideKey64(Core::System& system) { + uint64_t cv_key{}; + int32_t count{}; + + cv_key = Convert(GetReg64(system, 0)); + count = Convert(GetReg64(system, 1)); + + SignalProcessWideKey64(system, cv_key, count); +} + +static void SvcWrap_GetSystemTick64(Core::System& system) { + int64_t ret{}; + + ret = GetSystemTick64(system); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_ConnectToNamedPort64(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint64_t name{}; + + name = Convert(GetReg64(system, 1)); + + ret = ConnectToNamedPort64(system, &out_handle, name); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_handle)); +} + +static void SvcWrap_SendSyncRequest64(Core::System& system) { + Result ret{}; + + Handle session_handle{}; + + session_handle = Convert(GetReg64(system, 0)); + + ret = SendSyncRequest64(system, session_handle); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_SendSyncRequestWithUserBuffer64(Core::System& system) { + Result ret{}; + + uint64_t message_buffer{}; + uint64_t message_buffer_size{}; + Handle session_handle{}; + + message_buffer = Convert(GetReg64(system, 0)); + message_buffer_size = Convert(GetReg64(system, 1)); + session_handle = Convert(GetReg64(system, 2)); + + ret = SendSyncRequestWithUserBuffer64(system, message_buffer, message_buffer_size, session_handle); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_SendAsyncRequestWithUserBuffer64(Core::System& system) { + Result ret{}; + + Handle out_event_handle{}; + uint64_t message_buffer{}; + uint64_t message_buffer_size{}; + Handle session_handle{}; + + message_buffer = Convert(GetReg64(system, 1)); + message_buffer_size = Convert(GetReg64(system, 2)); + session_handle = Convert(GetReg64(system, 3)); + + ret = SendAsyncRequestWithUserBuffer64(system, &out_event_handle, message_buffer, message_buffer_size, session_handle); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_event_handle)); +} + +static void SvcWrap_GetProcessId64(Core::System& system) { + Result ret{}; + + uint64_t out_process_id{}; + Handle process_handle{}; + + process_handle = Convert(GetReg64(system, 1)); + + ret = GetProcessId64(system, &out_process_id, process_handle); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_process_id)); +} + +static void SvcWrap_GetThreadId64(Core::System& system) { + Result ret{}; + + uint64_t out_thread_id{}; + Handle thread_handle{}; + + thread_handle = Convert(GetReg64(system, 1)); + + ret = GetThreadId64(system, &out_thread_id, thread_handle); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_thread_id)); +} + +static void SvcWrap_Break64(Core::System& system) { + BreakReason break_reason{}; + uint64_t arg{}; + uint64_t size{}; + + break_reason = Convert(GetReg64(system, 0)); + arg = Convert(GetReg64(system, 1)); + size = Convert(GetReg64(system, 2)); + + Break64(system, break_reason, arg, size); +} + +static void SvcWrap_OutputDebugString64(Core::System& system) { + Result ret{}; + + uint64_t debug_str{}; + uint64_t len{}; + + debug_str = Convert(GetReg64(system, 0)); + len = Convert(GetReg64(system, 1)); + + ret = OutputDebugString64(system, debug_str, len); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_ReturnFromException64(Core::System& system) { + Result result{}; + + result = Convert(GetReg64(system, 0)); + + ReturnFromException64(system, result); +} + +static void SvcWrap_GetInfo64(Core::System& system) { + Result ret{}; + + uint64_t out{}; + InfoType info_type{}; + Handle handle{}; + uint64_t info_subtype{}; + + info_type = Convert(GetReg64(system, 1)); + handle = Convert(GetReg64(system, 2)); + info_subtype = Convert(GetReg64(system, 3)); + + ret = GetInfo64(system, &out, info_type, handle, info_subtype); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out)); +} + +static void SvcWrap_FlushEntireDataCache64(Core::System& system) { + FlushEntireDataCache64(system); +} + +static void SvcWrap_FlushDataCache64(Core::System& system) { + Result ret{}; + + uint64_t address{}; + uint64_t size{}; + + address = Convert(GetReg64(system, 0)); + size = Convert(GetReg64(system, 1)); + + ret = FlushDataCache64(system, address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_MapPhysicalMemory64(Core::System& system) { + Result ret{}; + + uint64_t address{}; + uint64_t size{}; + + address = Convert(GetReg64(system, 0)); + size = Convert(GetReg64(system, 1)); + + ret = MapPhysicalMemory64(system, address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapPhysicalMemory64(Core::System& system) { + Result ret{}; + + uint64_t address{}; + uint64_t size{}; + + address = Convert(GetReg64(system, 0)); + size = Convert(GetReg64(system, 1)); + + ret = UnmapPhysicalMemory64(system, address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_GetDebugFutureThreadInfo64(Core::System& system) { + Result ret{}; + + lp64::LastThreadContext out_context{}; + uint64_t out_thread_id{}; + Handle debug_handle{}; + int64_t ns{}; + + debug_handle = Convert(GetReg64(system, 2)); + ns = Convert(GetReg64(system, 3)); + + ret = GetDebugFutureThreadInfo64(system, &out_context, &out_thread_id, debug_handle, ns); + + SetReg64(system, 0, Convert(ret)); + auto out_context_scatter = Convert>(out_context); + SetReg64(system, 1, out_context_scatter[0]); + SetReg64(system, 2, out_context_scatter[1]); + SetReg64(system, 3, out_context_scatter[2]); + SetReg64(system, 4, out_context_scatter[3]); + SetReg64(system, 5, Convert(out_thread_id)); +} + +static void SvcWrap_GetLastThreadInfo64(Core::System& system) { + Result ret{}; + + lp64::LastThreadContext out_context{}; + uintptr_t out_tls_address{}; + uint32_t out_flags{}; + + ret = GetLastThreadInfo64(system, &out_context, &out_tls_address, &out_flags); + + SetReg64(system, 0, Convert(ret)); + auto out_context_scatter = Convert>(out_context); + SetReg64(system, 1, out_context_scatter[0]); + SetReg64(system, 2, out_context_scatter[1]); + SetReg64(system, 3, out_context_scatter[2]); + SetReg64(system, 4, out_context_scatter[3]); + SetReg64(system, 5, Convert(out_tls_address)); + SetReg64(system, 6, Convert(out_flags)); +} + +static void SvcWrap_GetResourceLimitLimitValue64(Core::System& system) { + Result ret{}; + + int64_t out_limit_value{}; + Handle resource_limit_handle{}; + LimitableResource which{}; + + resource_limit_handle = Convert(GetReg64(system, 1)); + which = Convert(GetReg64(system, 2)); + + ret = GetResourceLimitLimitValue64(system, &out_limit_value, resource_limit_handle, which); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_limit_value)); +} + +static void SvcWrap_GetResourceLimitCurrentValue64(Core::System& system) { + Result ret{}; + + int64_t out_current_value{}; + Handle resource_limit_handle{}; + LimitableResource which{}; + + resource_limit_handle = Convert(GetReg64(system, 1)); + which = Convert(GetReg64(system, 2)); + + ret = GetResourceLimitCurrentValue64(system, &out_current_value, resource_limit_handle, which); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_current_value)); +} + +static void SvcWrap_SetThreadActivity64(Core::System& system) { + Result ret{}; + + Handle thread_handle{}; + ThreadActivity thread_activity{}; + + thread_handle = Convert(GetReg64(system, 0)); + thread_activity = Convert(GetReg64(system, 1)); + + ret = SetThreadActivity64(system, thread_handle, thread_activity); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_GetThreadContext364(Core::System& system) { + Result ret{}; + + uint64_t out_context{}; + Handle thread_handle{}; + + out_context = Convert(GetReg64(system, 0)); + thread_handle = Convert(GetReg64(system, 1)); + + ret = GetThreadContext364(system, out_context, thread_handle); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_WaitForAddress64(Core::System& system) { + Result ret{}; + + uint64_t address{}; + ArbitrationType arb_type{}; + int32_t value{}; + int64_t timeout_ns{}; + + address = Convert(GetReg64(system, 0)); + arb_type = Convert(GetReg64(system, 1)); + value = Convert(GetReg64(system, 2)); + timeout_ns = Convert(GetReg64(system, 3)); + + ret = WaitForAddress64(system, address, arb_type, value, timeout_ns); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_SignalToAddress64(Core::System& system) { + Result ret{}; + + uint64_t address{}; + SignalType signal_type{}; + int32_t value{}; + int32_t count{}; + + address = Convert(GetReg64(system, 0)); + signal_type = Convert(GetReg64(system, 1)); + value = Convert(GetReg64(system, 2)); + count = Convert(GetReg64(system, 3)); + + ret = SignalToAddress64(system, address, signal_type, value, count); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_SynchronizePreemptionState64(Core::System& system) { + SynchronizePreemptionState64(system); +} + +static void SvcWrap_GetResourceLimitPeakValue64(Core::System& system) { + Result ret{}; + + int64_t out_peak_value{}; + Handle resource_limit_handle{}; + LimitableResource which{}; + + resource_limit_handle = Convert(GetReg64(system, 1)); + which = Convert(GetReg64(system, 2)); + + ret = GetResourceLimitPeakValue64(system, &out_peak_value, resource_limit_handle, which); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_peak_value)); +} + +static void SvcWrap_CreateIoPool64(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + IoPoolType which{}; + + which = Convert(GetReg64(system, 1)); + + ret = CreateIoPool64(system, &out_handle, which); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_handle)); +} + +static void SvcWrap_CreateIoRegion64(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + Handle io_pool{}; + uint64_t physical_address{}; + uint64_t size{}; + MemoryMapping mapping{}; + MemoryPermission perm{}; + + io_pool = Convert(GetReg64(system, 1)); + physical_address = Convert(GetReg64(system, 2)); + size = Convert(GetReg64(system, 3)); + mapping = Convert(GetReg64(system, 4)); + perm = Convert(GetReg64(system, 5)); + + ret = CreateIoRegion64(system, &out_handle, io_pool, physical_address, size, mapping, perm); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_handle)); +} + +static void SvcWrap_KernelDebug64(Core::System& system) { + KernelDebugType kern_debug_type{}; + uint64_t arg0{}; + uint64_t arg1{}; + uint64_t arg2{}; + + kern_debug_type = Convert(GetReg64(system, 0)); + arg0 = Convert(GetReg64(system, 1)); + arg1 = Convert(GetReg64(system, 2)); + arg2 = Convert(GetReg64(system, 3)); + + KernelDebug64(system, kern_debug_type, arg0, arg1, arg2); +} + +static void SvcWrap_ChangeKernelTraceState64(Core::System& system) { + KernelTraceState kern_trace_state{}; + + kern_trace_state = Convert(GetReg64(system, 0)); + + ChangeKernelTraceState64(system, kern_trace_state); +} + +static void SvcWrap_CreateSession64(Core::System& system) { + Result ret{}; + + Handle out_server_session_handle{}; + Handle out_client_session_handle{}; + bool is_light{}; + uint64_t name{}; + + is_light = Convert(GetReg64(system, 2)); + name = Convert(GetReg64(system, 3)); + + ret = CreateSession64(system, &out_server_session_handle, &out_client_session_handle, is_light, name); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_server_session_handle)); + SetReg64(system, 2, Convert(out_client_session_handle)); +} + +static void SvcWrap_AcceptSession64(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + Handle port{}; + + port = Convert(GetReg64(system, 1)); + + ret = AcceptSession64(system, &out_handle, port); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_handle)); +} + +static void SvcWrap_ReplyAndReceive64(Core::System& system) { + Result ret{}; + + int32_t out_index{}; + uint64_t handles{}; + int32_t num_handles{}; + Handle reply_target{}; + int64_t timeout_ns{}; + + handles = Convert(GetReg64(system, 1)); + num_handles = Convert(GetReg64(system, 2)); + reply_target = Convert(GetReg64(system, 3)); + timeout_ns = Convert(GetReg64(system, 4)); + + ret = ReplyAndReceive64(system, &out_index, handles, num_handles, reply_target, timeout_ns); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_index)); +} + +static void SvcWrap_ReplyAndReceiveWithUserBuffer64(Core::System& system) { + Result ret{}; + + int32_t out_index{}; + uint64_t message_buffer{}; + uint64_t message_buffer_size{}; + uint64_t handles{}; + int32_t num_handles{}; + Handle reply_target{}; + int64_t timeout_ns{}; + + message_buffer = Convert(GetReg64(system, 1)); + message_buffer_size = Convert(GetReg64(system, 2)); + handles = Convert(GetReg64(system, 3)); + num_handles = Convert(GetReg64(system, 4)); + reply_target = Convert(GetReg64(system, 5)); + timeout_ns = Convert(GetReg64(system, 6)); + + ret = ReplyAndReceiveWithUserBuffer64(system, &out_index, message_buffer, message_buffer_size, handles, num_handles, reply_target, timeout_ns); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_index)); +} + +static void SvcWrap_CreateEvent64(Core::System& system) { + Result ret{}; + + Handle out_write_handle{}; + Handle out_read_handle{}; + + ret = CreateEvent64(system, &out_write_handle, &out_read_handle); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_write_handle)); + SetReg64(system, 2, Convert(out_read_handle)); +} + +static void SvcWrap_MapIoRegion64(Core::System& system) { + Result ret{}; + + Handle io_region{}; + uint64_t address{}; + uint64_t size{}; + MemoryPermission perm{}; + + io_region = Convert(GetReg64(system, 0)); + address = Convert(GetReg64(system, 1)); + size = Convert(GetReg64(system, 2)); + perm = Convert(GetReg64(system, 3)); + + ret = MapIoRegion64(system, io_region, address, size, perm); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapIoRegion64(Core::System& system) { + Result ret{}; + + Handle io_region{}; + uint64_t address{}; + uint64_t size{}; + + io_region = Convert(GetReg64(system, 0)); + address = Convert(GetReg64(system, 1)); + size = Convert(GetReg64(system, 2)); + + ret = UnmapIoRegion64(system, io_region, address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_MapPhysicalMemoryUnsafe64(Core::System& system) { + Result ret{}; + + uint64_t address{}; + uint64_t size{}; + + address = Convert(GetReg64(system, 0)); + size = Convert(GetReg64(system, 1)); + + ret = MapPhysicalMemoryUnsafe64(system, address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapPhysicalMemoryUnsafe64(Core::System& system) { + Result ret{}; + + uint64_t address{}; + uint64_t size{}; + + address = Convert(GetReg64(system, 0)); + size = Convert(GetReg64(system, 1)); + + ret = UnmapPhysicalMemoryUnsafe64(system, address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_SetUnsafeLimit64(Core::System& system) { + Result ret{}; + + uint64_t limit{}; + + limit = Convert(GetReg64(system, 0)); + + ret = SetUnsafeLimit64(system, limit); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_CreateCodeMemory64(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint64_t address{}; + uint64_t size{}; + + address = Convert(GetReg64(system, 1)); + size = Convert(GetReg64(system, 2)); + + ret = CreateCodeMemory64(system, &out_handle, address, size); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_handle)); +} + +static void SvcWrap_ControlCodeMemory64(Core::System& system) { + Result ret{}; + + Handle code_memory_handle{}; + CodeMemoryOperation operation{}; + uint64_t address{}; + uint64_t size{}; + MemoryPermission perm{}; + + code_memory_handle = Convert(GetReg64(system, 0)); + operation = Convert(GetReg64(system, 1)); + address = Convert(GetReg64(system, 2)); + size = Convert(GetReg64(system, 3)); + perm = Convert(GetReg64(system, 4)); + + ret = ControlCodeMemory64(system, code_memory_handle, operation, address, size, perm); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_SleepSystem64(Core::System& system) { + SleepSystem64(system); +} + +static void SvcWrap_ReadWriteRegister64(Core::System& system) { + Result ret{}; + + uint32_t out_value{}; + uint64_t address{}; + uint32_t mask{}; + uint32_t value{}; + + address = Convert(GetReg64(system, 1)); + mask = Convert(GetReg64(system, 2)); + value = Convert(GetReg64(system, 3)); + + ret = ReadWriteRegister64(system, &out_value, address, mask, value); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_value)); +} + +static void SvcWrap_SetProcessActivity64(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + ProcessActivity process_activity{}; + + process_handle = Convert(GetReg64(system, 0)); + process_activity = Convert(GetReg64(system, 1)); + + ret = SetProcessActivity64(system, process_handle, process_activity); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_CreateSharedMemory64(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint64_t size{}; + MemoryPermission owner_perm{}; + MemoryPermission remote_perm{}; + + size = Convert(GetReg64(system, 1)); + owner_perm = Convert(GetReg64(system, 2)); + remote_perm = Convert(GetReg64(system, 3)); + + ret = CreateSharedMemory64(system, &out_handle, size, owner_perm, remote_perm); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_handle)); +} + +static void SvcWrap_MapTransferMemory64(Core::System& system) { + Result ret{}; + + Handle trmem_handle{}; + uint64_t address{}; + uint64_t size{}; + MemoryPermission owner_perm{}; + + trmem_handle = Convert(GetReg64(system, 0)); + address = Convert(GetReg64(system, 1)); + size = Convert(GetReg64(system, 2)); + owner_perm = Convert(GetReg64(system, 3)); + + ret = MapTransferMemory64(system, trmem_handle, address, size, owner_perm); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapTransferMemory64(Core::System& system) { + Result ret{}; + + Handle trmem_handle{}; + uint64_t address{}; + uint64_t size{}; + + trmem_handle = Convert(GetReg64(system, 0)); + address = Convert(GetReg64(system, 1)); + size = Convert(GetReg64(system, 2)); + + ret = UnmapTransferMemory64(system, trmem_handle, address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_CreateInterruptEvent64(Core::System& system) { + Result ret{}; + + Handle out_read_handle{}; + int32_t interrupt_id{}; + InterruptType interrupt_type{}; + + interrupt_id = Convert(GetReg64(system, 1)); + interrupt_type = Convert(GetReg64(system, 2)); + + ret = CreateInterruptEvent64(system, &out_read_handle, interrupt_id, interrupt_type); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_read_handle)); +} + +static void SvcWrap_QueryPhysicalAddress64(Core::System& system) { + Result ret{}; + + lp64::PhysicalMemoryInfo out_info{}; + uint64_t address{}; + + address = Convert(GetReg64(system, 1)); + + ret = QueryPhysicalAddress64(system, &out_info, address); + + SetReg64(system, 0, Convert(ret)); + auto out_info_scatter = Convert>(out_info); + SetReg64(system, 1, out_info_scatter[0]); + SetReg64(system, 2, out_info_scatter[1]); + SetReg64(system, 3, out_info_scatter[2]); +} + +static void SvcWrap_QueryIoMapping64(Core::System& system) { + Result ret{}; + + uintptr_t out_address{}; + uintptr_t out_size{}; + uint64_t physical_address{}; + uint64_t size{}; + + physical_address = Convert(GetReg64(system, 2)); + size = Convert(GetReg64(system, 3)); + + ret = QueryIoMapping64(system, &out_address, &out_size, physical_address, size); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_address)); + SetReg64(system, 2, Convert(out_size)); +} + +static void SvcWrap_CreateDeviceAddressSpace64(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint64_t das_address{}; + uint64_t das_size{}; + + das_address = Convert(GetReg64(system, 1)); + das_size = Convert(GetReg64(system, 2)); + + ret = CreateDeviceAddressSpace64(system, &out_handle, das_address, das_size); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_handle)); +} + +static void SvcWrap_AttachDeviceAddressSpace64(Core::System& system) { + Result ret{}; + + DeviceName device_name{}; + Handle das_handle{}; + + device_name = Convert(GetReg64(system, 0)); + das_handle = Convert(GetReg64(system, 1)); + + ret = AttachDeviceAddressSpace64(system, device_name, das_handle); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_DetachDeviceAddressSpace64(Core::System& system) { + Result ret{}; + + DeviceName device_name{}; + Handle das_handle{}; + + device_name = Convert(GetReg64(system, 0)); + das_handle = Convert(GetReg64(system, 1)); + + ret = DetachDeviceAddressSpace64(system, device_name, das_handle); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_MapDeviceAddressSpaceByForce64(Core::System& system) { + Result ret{}; + + Handle das_handle{}; + Handle process_handle{}; + uint64_t process_address{}; + uint64_t size{}; + uint64_t device_address{}; + uint32_t option{}; + + das_handle = Convert(GetReg64(system, 0)); + process_handle = Convert(GetReg64(system, 1)); + process_address = Convert(GetReg64(system, 2)); + size = Convert(GetReg64(system, 3)); + device_address = Convert(GetReg64(system, 4)); + option = Convert(GetReg64(system, 5)); + + ret = MapDeviceAddressSpaceByForce64(system, das_handle, process_handle, process_address, size, device_address, option); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_MapDeviceAddressSpaceAligned64(Core::System& system) { + Result ret{}; + + Handle das_handle{}; + Handle process_handle{}; + uint64_t process_address{}; + uint64_t size{}; + uint64_t device_address{}; + uint32_t option{}; + + das_handle = Convert(GetReg64(system, 0)); + process_handle = Convert(GetReg64(system, 1)); + process_address = Convert(GetReg64(system, 2)); + size = Convert(GetReg64(system, 3)); + device_address = Convert(GetReg64(system, 4)); + option = Convert(GetReg64(system, 5)); + + ret = MapDeviceAddressSpaceAligned64(system, das_handle, process_handle, process_address, size, device_address, option); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapDeviceAddressSpace64(Core::System& system) { + Result ret{}; + + Handle das_handle{}; + Handle process_handle{}; + uint64_t process_address{}; + uint64_t size{}; + uint64_t device_address{}; + + das_handle = Convert(GetReg64(system, 0)); + process_handle = Convert(GetReg64(system, 1)); + process_address = Convert(GetReg64(system, 2)); + size = Convert(GetReg64(system, 3)); + device_address = Convert(GetReg64(system, 4)); + + ret = UnmapDeviceAddressSpace64(system, das_handle, process_handle, process_address, size, device_address); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_InvalidateProcessDataCache64(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + uint64_t address{}; + uint64_t size{}; + + process_handle = Convert(GetReg64(system, 0)); + address = Convert(GetReg64(system, 1)); + size = Convert(GetReg64(system, 2)); + + ret = InvalidateProcessDataCache64(system, process_handle, address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_StoreProcessDataCache64(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + uint64_t address{}; + uint64_t size{}; + + process_handle = Convert(GetReg64(system, 0)); + address = Convert(GetReg64(system, 1)); + size = Convert(GetReg64(system, 2)); + + ret = StoreProcessDataCache64(system, process_handle, address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_FlushProcessDataCache64(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + uint64_t address{}; + uint64_t size{}; + + process_handle = Convert(GetReg64(system, 0)); + address = Convert(GetReg64(system, 1)); + size = Convert(GetReg64(system, 2)); + + ret = FlushProcessDataCache64(system, process_handle, address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_DebugActiveProcess64(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint64_t process_id{}; + + process_id = Convert(GetReg64(system, 1)); + + ret = DebugActiveProcess64(system, &out_handle, process_id); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_handle)); +} + +static void SvcWrap_BreakDebugProcess64(Core::System& system) { + Result ret{}; + + Handle debug_handle{}; + + debug_handle = Convert(GetReg64(system, 0)); + + ret = BreakDebugProcess64(system, debug_handle); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_TerminateDebugProcess64(Core::System& system) { + Result ret{}; + + Handle debug_handle{}; + + debug_handle = Convert(GetReg64(system, 0)); + + ret = TerminateDebugProcess64(system, debug_handle); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_GetDebugEvent64(Core::System& system) { + Result ret{}; + + uint64_t out_info{}; + Handle debug_handle{}; + + out_info = Convert(GetReg64(system, 0)); + debug_handle = Convert(GetReg64(system, 1)); + + ret = GetDebugEvent64(system, out_info, debug_handle); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_ContinueDebugEvent64(Core::System& system) { + Result ret{}; + + Handle debug_handle{}; + uint32_t flags{}; + uint64_t thread_ids{}; + int32_t num_thread_ids{}; + + debug_handle = Convert(GetReg64(system, 0)); + flags = Convert(GetReg64(system, 1)); + thread_ids = Convert(GetReg64(system, 2)); + num_thread_ids = Convert(GetReg64(system, 3)); + + ret = ContinueDebugEvent64(system, debug_handle, flags, thread_ids, num_thread_ids); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_GetProcessList64(Core::System& system) { + Result ret{}; + + int32_t out_num_processes{}; + uint64_t out_process_ids{}; + int32_t max_out_count{}; + + out_process_ids = Convert(GetReg64(system, 1)); + max_out_count = Convert(GetReg64(system, 2)); + + ret = GetProcessList64(system, &out_num_processes, out_process_ids, max_out_count); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_num_processes)); +} + +static void SvcWrap_GetThreadList64(Core::System& system) { + Result ret{}; + + int32_t out_num_threads{}; + uint64_t out_thread_ids{}; + int32_t max_out_count{}; + Handle debug_handle{}; + + out_thread_ids = Convert(GetReg64(system, 1)); + max_out_count = Convert(GetReg64(system, 2)); + debug_handle = Convert(GetReg64(system, 3)); + + ret = GetThreadList64(system, &out_num_threads, out_thread_ids, max_out_count, debug_handle); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_num_threads)); +} + +static void SvcWrap_GetDebugThreadContext64(Core::System& system) { + Result ret{}; + + uint64_t out_context{}; + Handle debug_handle{}; + uint64_t thread_id{}; + uint32_t context_flags{}; + + out_context = Convert(GetReg64(system, 0)); + debug_handle = Convert(GetReg64(system, 1)); + thread_id = Convert(GetReg64(system, 2)); + context_flags = Convert(GetReg64(system, 3)); + + ret = GetDebugThreadContext64(system, out_context, debug_handle, thread_id, context_flags); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_SetDebugThreadContext64(Core::System& system) { + Result ret{}; + + Handle debug_handle{}; + uint64_t thread_id{}; + uint64_t context{}; + uint32_t context_flags{}; + + debug_handle = Convert(GetReg64(system, 0)); + thread_id = Convert(GetReg64(system, 1)); + context = Convert(GetReg64(system, 2)); + context_flags = Convert(GetReg64(system, 3)); + + ret = SetDebugThreadContext64(system, debug_handle, thread_id, context, context_flags); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_QueryDebugProcessMemory64(Core::System& system) { + Result ret{}; + + PageInfo out_page_info{}; + uint64_t out_memory_info{}; + Handle process_handle{}; + uint64_t address{}; + + out_memory_info = Convert(GetReg64(system, 0)); + process_handle = Convert(GetReg64(system, 2)); + address = Convert(GetReg64(system, 3)); + + ret = QueryDebugProcessMemory64(system, out_memory_info, &out_page_info, process_handle, address); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_page_info)); +} + +static void SvcWrap_ReadDebugProcessMemory64(Core::System& system) { + Result ret{}; + + uint64_t buffer{}; + Handle debug_handle{}; + uint64_t address{}; + uint64_t size{}; + + buffer = Convert(GetReg64(system, 0)); + debug_handle = Convert(GetReg64(system, 1)); + address = Convert(GetReg64(system, 2)); + size = Convert(GetReg64(system, 3)); + + ret = ReadDebugProcessMemory64(system, buffer, debug_handle, address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_WriteDebugProcessMemory64(Core::System& system) { + Result ret{}; + + Handle debug_handle{}; + uint64_t buffer{}; + uint64_t address{}; + uint64_t size{}; + + debug_handle = Convert(GetReg64(system, 0)); + buffer = Convert(GetReg64(system, 1)); + address = Convert(GetReg64(system, 2)); + size = Convert(GetReg64(system, 3)); + + ret = WriteDebugProcessMemory64(system, debug_handle, buffer, address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_SetHardwareBreakPoint64(Core::System& system) { + Result ret{}; + + HardwareBreakPointRegisterName name{}; + uint64_t flags{}; + uint64_t value{}; + + name = Convert(GetReg64(system, 0)); + flags = Convert(GetReg64(system, 1)); + value = Convert(GetReg64(system, 2)); + + ret = SetHardwareBreakPoint64(system, name, flags, value); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_GetDebugThreadParam64(Core::System& system) { + Result ret{}; + + uint64_t out_64{}; + uint32_t out_32{}; + Handle debug_handle{}; + uint64_t thread_id{}; + DebugThreadParam param{}; + + debug_handle = Convert(GetReg64(system, 2)); + thread_id = Convert(GetReg64(system, 3)); + param = Convert(GetReg64(system, 4)); + + ret = GetDebugThreadParam64(system, &out_64, &out_32, debug_handle, thread_id, param); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_64)); + SetReg64(system, 2, Convert(out_32)); +} + +static void SvcWrap_GetSystemInfo64(Core::System& system) { + Result ret{}; + + uint64_t out{}; + SystemInfoType info_type{}; + Handle handle{}; + uint64_t info_subtype{}; + + info_type = Convert(GetReg64(system, 1)); + handle = Convert(GetReg64(system, 2)); + info_subtype = Convert(GetReg64(system, 3)); + + ret = GetSystemInfo64(system, &out, info_type, handle, info_subtype); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out)); +} + +static void SvcWrap_CreatePort64(Core::System& system) { + Result ret{}; + + Handle out_server_handle{}; + Handle out_client_handle{}; + int32_t max_sessions{}; + bool is_light{}; + uint64_t name{}; + + max_sessions = Convert(GetReg64(system, 2)); + is_light = Convert(GetReg64(system, 3)); + name = Convert(GetReg64(system, 4)); + + ret = CreatePort64(system, &out_server_handle, &out_client_handle, max_sessions, is_light, name); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_server_handle)); + SetReg64(system, 2, Convert(out_client_handle)); +} + +static void SvcWrap_ManageNamedPort64(Core::System& system) { + Result ret{}; + + Handle out_server_handle{}; + uint64_t name{}; + int32_t max_sessions{}; + + name = Convert(GetReg64(system, 1)); + max_sessions = Convert(GetReg64(system, 2)); + + ret = ManageNamedPort64(system, &out_server_handle, name, max_sessions); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_server_handle)); +} + +static void SvcWrap_ConnectToPort64(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + Handle port{}; + + port = Convert(GetReg64(system, 1)); + + ret = ConnectToPort64(system, &out_handle, port); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_handle)); +} + +static void SvcWrap_SetProcessMemoryPermission64(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + uint64_t address{}; + uint64_t size{}; + MemoryPermission perm{}; + + process_handle = Convert(GetReg64(system, 0)); + address = Convert(GetReg64(system, 1)); + size = Convert(GetReg64(system, 2)); + perm = Convert(GetReg64(system, 3)); + + ret = SetProcessMemoryPermission64(system, process_handle, address, size, perm); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_MapProcessMemory64(Core::System& system) { + Result ret{}; + + uint64_t dst_address{}; + Handle process_handle{}; + uint64_t src_address{}; + uint64_t size{}; + + dst_address = Convert(GetReg64(system, 0)); + process_handle = Convert(GetReg64(system, 1)); + src_address = Convert(GetReg64(system, 2)); + size = Convert(GetReg64(system, 3)); + + ret = MapProcessMemory64(system, dst_address, process_handle, src_address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapProcessMemory64(Core::System& system) { + Result ret{}; + + uint64_t dst_address{}; + Handle process_handle{}; + uint64_t src_address{}; + uint64_t size{}; + + dst_address = Convert(GetReg64(system, 0)); + process_handle = Convert(GetReg64(system, 1)); + src_address = Convert(GetReg64(system, 2)); + size = Convert(GetReg64(system, 3)); + + ret = UnmapProcessMemory64(system, dst_address, process_handle, src_address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_QueryProcessMemory64(Core::System& system) { + Result ret{}; + + PageInfo out_page_info{}; + uint64_t out_memory_info{}; + Handle process_handle{}; + uint64_t address{}; + + out_memory_info = Convert(GetReg64(system, 0)); + process_handle = Convert(GetReg64(system, 2)); + address = Convert(GetReg64(system, 3)); + + ret = QueryProcessMemory64(system, out_memory_info, &out_page_info, process_handle, address); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_page_info)); +} + +static void SvcWrap_MapProcessCodeMemory64(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + uint64_t dst_address{}; + uint64_t src_address{}; + uint64_t size{}; + + process_handle = Convert(GetReg64(system, 0)); + dst_address = Convert(GetReg64(system, 1)); + src_address = Convert(GetReg64(system, 2)); + size = Convert(GetReg64(system, 3)); + + ret = MapProcessCodeMemory64(system, process_handle, dst_address, src_address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapProcessCodeMemory64(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + uint64_t dst_address{}; + uint64_t src_address{}; + uint64_t size{}; + + process_handle = Convert(GetReg64(system, 0)); + dst_address = Convert(GetReg64(system, 1)); + src_address = Convert(GetReg64(system, 2)); + size = Convert(GetReg64(system, 3)); + + ret = UnmapProcessCodeMemory64(system, process_handle, dst_address, src_address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_CreateProcess64(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + uint64_t parameters{}; + uint64_t caps{}; + int32_t num_caps{}; + + parameters = Convert(GetReg64(system, 1)); + caps = Convert(GetReg64(system, 2)); + num_caps = Convert(GetReg64(system, 3)); + + ret = CreateProcess64(system, &out_handle, parameters, caps, num_caps); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_handle)); +} + +static void SvcWrap_StartProcess64(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + int32_t priority{}; + int32_t core_id{}; + uint64_t main_thread_stack_size{}; + + process_handle = Convert(GetReg64(system, 0)); + priority = Convert(GetReg64(system, 1)); + core_id = Convert(GetReg64(system, 2)); + main_thread_stack_size = Convert(GetReg64(system, 3)); + + ret = StartProcess64(system, process_handle, priority, core_id, main_thread_stack_size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_TerminateProcess64(Core::System& system) { + Result ret{}; + + Handle process_handle{}; + + process_handle = Convert(GetReg64(system, 0)); + + ret = TerminateProcess64(system, process_handle); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_GetProcessInfo64(Core::System& system) { + Result ret{}; + + int64_t out_info{}; + Handle process_handle{}; + ProcessInfoType info_type{}; + + process_handle = Convert(GetReg64(system, 1)); + info_type = Convert(GetReg64(system, 2)); + + ret = GetProcessInfo64(system, &out_info, process_handle, info_type); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_info)); +} + +static void SvcWrap_CreateResourceLimit64(Core::System& system) { + Result ret{}; + + Handle out_handle{}; + + ret = CreateResourceLimit64(system, &out_handle); + + SetReg64(system, 0, Convert(ret)); + SetReg64(system, 1, Convert(out_handle)); +} + +static void SvcWrap_SetResourceLimitLimitValue64(Core::System& system) { + Result ret{}; + + Handle resource_limit_handle{}; + LimitableResource which{}; + int64_t limit_value{}; + + resource_limit_handle = Convert(GetReg64(system, 0)); + which = Convert(GetReg64(system, 1)); + limit_value = Convert(GetReg64(system, 2)); + + ret = SetResourceLimitLimitValue64(system, resource_limit_handle, which, limit_value); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_MapInsecureMemory64(Core::System& system) { + Result ret{}; + + uint64_t address{}; + uint64_t size{}; + + address = Convert(GetReg64(system, 0)); + size = Convert(GetReg64(system, 1)); + + ret = MapInsecureMemory64(system, address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void SvcWrap_UnmapInsecureMemory64(Core::System& system) { + Result ret{}; + + uint64_t address{}; + uint64_t size{}; + + address = Convert(GetReg64(system, 0)); + size = Convert(GetReg64(system, 1)); + + ret = UnmapInsecureMemory64(system, address, size); + + SetReg64(system, 0, Convert(ret)); +} + +static void Call32(Core::System& system, u32 imm) { + switch (static_cast(imm)) { + case SvcId::SetHeapSize: + return SvcWrap_SetHeapSize64From32(system); + case SvcId::SetMemoryPermission: + return SvcWrap_SetMemoryPermission64From32(system); + case SvcId::SetMemoryAttribute: + return SvcWrap_SetMemoryAttribute64From32(system); + case SvcId::MapMemory: + return SvcWrap_MapMemory64From32(system); + case SvcId::UnmapMemory: + return SvcWrap_UnmapMemory64From32(system); + case SvcId::QueryMemory: + return SvcWrap_QueryMemory64From32(system); + case SvcId::ExitProcess: + return SvcWrap_ExitProcess64From32(system); + case SvcId::CreateThread: + return SvcWrap_CreateThread64From32(system); + case SvcId::StartThread: + return SvcWrap_StartThread64From32(system); + case SvcId::ExitThread: + return SvcWrap_ExitThread64From32(system); + case SvcId::SleepThread: + return SvcWrap_SleepThread64From32(system); + case SvcId::GetThreadPriority: + return SvcWrap_GetThreadPriority64From32(system); + case SvcId::SetThreadPriority: + return SvcWrap_SetThreadPriority64From32(system); + case SvcId::GetThreadCoreMask: + return SvcWrap_GetThreadCoreMask64From32(system); + case SvcId::SetThreadCoreMask: + return SvcWrap_SetThreadCoreMask64From32(system); + case SvcId::GetCurrentProcessorNumber: + return SvcWrap_GetCurrentProcessorNumber64From32(system); + case SvcId::SignalEvent: + return SvcWrap_SignalEvent64From32(system); + case SvcId::ClearEvent: + return SvcWrap_ClearEvent64From32(system); + case SvcId::MapSharedMemory: + return SvcWrap_MapSharedMemory64From32(system); + case SvcId::UnmapSharedMemory: + return SvcWrap_UnmapSharedMemory64From32(system); + case SvcId::CreateTransferMemory: + return SvcWrap_CreateTransferMemory64From32(system); + case SvcId::CloseHandle: + return SvcWrap_CloseHandle64From32(system); + case SvcId::ResetSignal: + return SvcWrap_ResetSignal64From32(system); + case SvcId::WaitSynchronization: + return SvcWrap_WaitSynchronization64From32(system); + case SvcId::CancelSynchronization: + return SvcWrap_CancelSynchronization64From32(system); + case SvcId::ArbitrateLock: + return SvcWrap_ArbitrateLock64From32(system); + case SvcId::ArbitrateUnlock: + return SvcWrap_ArbitrateUnlock64From32(system); + case SvcId::WaitProcessWideKeyAtomic: + return SvcWrap_WaitProcessWideKeyAtomic64From32(system); + case SvcId::SignalProcessWideKey: + return SvcWrap_SignalProcessWideKey64From32(system); + case SvcId::GetSystemTick: + return SvcWrap_GetSystemTick64From32(system); + case SvcId::ConnectToNamedPort: + return SvcWrap_ConnectToNamedPort64From32(system); + case SvcId::SendSyncRequestLight: + return SvcWrap_SendSyncRequestLight64From32(system); + case SvcId::SendSyncRequest: + return SvcWrap_SendSyncRequest64From32(system); + case SvcId::SendSyncRequestWithUserBuffer: + return SvcWrap_SendSyncRequestWithUserBuffer64From32(system); + case SvcId::SendAsyncRequestWithUserBuffer: + return SvcWrap_SendAsyncRequestWithUserBuffer64From32(system); + case SvcId::GetProcessId: + return SvcWrap_GetProcessId64From32(system); + case SvcId::GetThreadId: + return SvcWrap_GetThreadId64From32(system); + case SvcId::Break: + return SvcWrap_Break64From32(system); + case SvcId::OutputDebugString: + return SvcWrap_OutputDebugString64From32(system); + case SvcId::ReturnFromException: + return SvcWrap_ReturnFromException64From32(system); + case SvcId::GetInfo: + return SvcWrap_GetInfo64From32(system); + case SvcId::FlushEntireDataCache: + return SvcWrap_FlushEntireDataCache64From32(system); + case SvcId::FlushDataCache: + return SvcWrap_FlushDataCache64From32(system); + case SvcId::MapPhysicalMemory: + return SvcWrap_MapPhysicalMemory64From32(system); + case SvcId::UnmapPhysicalMemory: + return SvcWrap_UnmapPhysicalMemory64From32(system); + case SvcId::GetDebugFutureThreadInfo: + return SvcWrap_GetDebugFutureThreadInfo64From32(system); + case SvcId::GetLastThreadInfo: + return SvcWrap_GetLastThreadInfo64From32(system); + case SvcId::GetResourceLimitLimitValue: + return SvcWrap_GetResourceLimitLimitValue64From32(system); + case SvcId::GetResourceLimitCurrentValue: + return SvcWrap_GetResourceLimitCurrentValue64From32(system); + case SvcId::SetThreadActivity: + return SvcWrap_SetThreadActivity64From32(system); + case SvcId::GetThreadContext3: + return SvcWrap_GetThreadContext364From32(system); + case SvcId::WaitForAddress: + return SvcWrap_WaitForAddress64From32(system); + case SvcId::SignalToAddress: + return SvcWrap_SignalToAddress64From32(system); + case SvcId::SynchronizePreemptionState: + return SvcWrap_SynchronizePreemptionState64From32(system); + case SvcId::GetResourceLimitPeakValue: + return SvcWrap_GetResourceLimitPeakValue64From32(system); + case SvcId::CreateIoPool: + return SvcWrap_CreateIoPool64From32(system); + case SvcId::CreateIoRegion: + return SvcWrap_CreateIoRegion64From32(system); + case SvcId::KernelDebug: + return SvcWrap_KernelDebug64From32(system); + case SvcId::ChangeKernelTraceState: + return SvcWrap_ChangeKernelTraceState64From32(system); + case SvcId::CreateSession: + return SvcWrap_CreateSession64From32(system); + case SvcId::AcceptSession: + return SvcWrap_AcceptSession64From32(system); + case SvcId::ReplyAndReceiveLight: + return SvcWrap_ReplyAndReceiveLight64From32(system); + case SvcId::ReplyAndReceive: + return SvcWrap_ReplyAndReceive64From32(system); + case SvcId::ReplyAndReceiveWithUserBuffer: + return SvcWrap_ReplyAndReceiveWithUserBuffer64From32(system); + case SvcId::CreateEvent: + return SvcWrap_CreateEvent64From32(system); + case SvcId::MapIoRegion: + return SvcWrap_MapIoRegion64From32(system); + case SvcId::UnmapIoRegion: + return SvcWrap_UnmapIoRegion64From32(system); + case SvcId::MapPhysicalMemoryUnsafe: + return SvcWrap_MapPhysicalMemoryUnsafe64From32(system); + case SvcId::UnmapPhysicalMemoryUnsafe: + return SvcWrap_UnmapPhysicalMemoryUnsafe64From32(system); + case SvcId::SetUnsafeLimit: + return SvcWrap_SetUnsafeLimit64From32(system); + case SvcId::CreateCodeMemory: + return SvcWrap_CreateCodeMemory64From32(system); + case SvcId::ControlCodeMemory: + return SvcWrap_ControlCodeMemory64From32(system); + case SvcId::SleepSystem: + return SvcWrap_SleepSystem64From32(system); + case SvcId::ReadWriteRegister: + return SvcWrap_ReadWriteRegister64From32(system); + case SvcId::SetProcessActivity: + return SvcWrap_SetProcessActivity64From32(system); + case SvcId::CreateSharedMemory: + return SvcWrap_CreateSharedMemory64From32(system); + case SvcId::MapTransferMemory: + return SvcWrap_MapTransferMemory64From32(system); + case SvcId::UnmapTransferMemory: + return SvcWrap_UnmapTransferMemory64From32(system); + case SvcId::CreateInterruptEvent: + return SvcWrap_CreateInterruptEvent64From32(system); + case SvcId::QueryPhysicalAddress: + return SvcWrap_QueryPhysicalAddress64From32(system); + case SvcId::QueryIoMapping: + return SvcWrap_QueryIoMapping64From32(system); + case SvcId::CreateDeviceAddressSpace: + return SvcWrap_CreateDeviceAddressSpace64From32(system); + case SvcId::AttachDeviceAddressSpace: + return SvcWrap_AttachDeviceAddressSpace64From32(system); + case SvcId::DetachDeviceAddressSpace: + return SvcWrap_DetachDeviceAddressSpace64From32(system); + case SvcId::MapDeviceAddressSpaceByForce: + return SvcWrap_MapDeviceAddressSpaceByForce64From32(system); + case SvcId::MapDeviceAddressSpaceAligned: + return SvcWrap_MapDeviceAddressSpaceAligned64From32(system); + case SvcId::UnmapDeviceAddressSpace: + return SvcWrap_UnmapDeviceAddressSpace64From32(system); + case SvcId::InvalidateProcessDataCache: + return SvcWrap_InvalidateProcessDataCache64From32(system); + case SvcId::StoreProcessDataCache: + return SvcWrap_StoreProcessDataCache64From32(system); + case SvcId::FlushProcessDataCache: + return SvcWrap_FlushProcessDataCache64From32(system); + case SvcId::DebugActiveProcess: + return SvcWrap_DebugActiveProcess64From32(system); + case SvcId::BreakDebugProcess: + return SvcWrap_BreakDebugProcess64From32(system); + case SvcId::TerminateDebugProcess: + return SvcWrap_TerminateDebugProcess64From32(system); + case SvcId::GetDebugEvent: + return SvcWrap_GetDebugEvent64From32(system); + case SvcId::ContinueDebugEvent: + return SvcWrap_ContinueDebugEvent64From32(system); + case SvcId::GetProcessList: + return SvcWrap_GetProcessList64From32(system); + case SvcId::GetThreadList: + return SvcWrap_GetThreadList64From32(system); + case SvcId::GetDebugThreadContext: + return SvcWrap_GetDebugThreadContext64From32(system); + case SvcId::SetDebugThreadContext: + return SvcWrap_SetDebugThreadContext64From32(system); + case SvcId::QueryDebugProcessMemory: + return SvcWrap_QueryDebugProcessMemory64From32(system); + case SvcId::ReadDebugProcessMemory: + return SvcWrap_ReadDebugProcessMemory64From32(system); + case SvcId::WriteDebugProcessMemory: + return SvcWrap_WriteDebugProcessMemory64From32(system); + case SvcId::SetHardwareBreakPoint: + return SvcWrap_SetHardwareBreakPoint64From32(system); + case SvcId::GetDebugThreadParam: + return SvcWrap_GetDebugThreadParam64From32(system); + case SvcId::GetSystemInfo: + return SvcWrap_GetSystemInfo64From32(system); + case SvcId::CreatePort: + return SvcWrap_CreatePort64From32(system); + case SvcId::ManageNamedPort: + return SvcWrap_ManageNamedPort64From32(system); + case SvcId::ConnectToPort: + return SvcWrap_ConnectToPort64From32(system); + case SvcId::SetProcessMemoryPermission: + return SvcWrap_SetProcessMemoryPermission64From32(system); + case SvcId::MapProcessMemory: + return SvcWrap_MapProcessMemory64From32(system); + case SvcId::UnmapProcessMemory: + return SvcWrap_UnmapProcessMemory64From32(system); + case SvcId::QueryProcessMemory: + return SvcWrap_QueryProcessMemory64From32(system); + case SvcId::MapProcessCodeMemory: + return SvcWrap_MapProcessCodeMemory64From32(system); + case SvcId::UnmapProcessCodeMemory: + return SvcWrap_UnmapProcessCodeMemory64From32(system); + case SvcId::CreateProcess: + return SvcWrap_CreateProcess64From32(system); + case SvcId::StartProcess: + return SvcWrap_StartProcess64From32(system); + case SvcId::TerminateProcess: + return SvcWrap_TerminateProcess64From32(system); + case SvcId::GetProcessInfo: + return SvcWrap_GetProcessInfo64From32(system); + case SvcId::CreateResourceLimit: + return SvcWrap_CreateResourceLimit64From32(system); + case SvcId::SetResourceLimitLimitValue: + return SvcWrap_SetResourceLimitLimitValue64From32(system); + case SvcId::CallSecureMonitor: + return SvcWrap_CallSecureMonitor64From32(system); + case SvcId::MapInsecureMemory: + return SvcWrap_MapInsecureMemory64From32(system); + case SvcId::UnmapInsecureMemory: + return SvcWrap_UnmapInsecureMemory64From32(system); + default: + LOG_CRITICAL(Kernel_SVC, "Unknown SVC {:x}!", imm); + break; + } +} + +static void Call64(Core::System& system, u32 imm) { + switch (static_cast(imm)) { + case SvcId::SetHeapSize: + return SvcWrap_SetHeapSize64(system); + case SvcId::SetMemoryPermission: + return SvcWrap_SetMemoryPermission64(system); + case SvcId::SetMemoryAttribute: + return SvcWrap_SetMemoryAttribute64(system); + case SvcId::MapMemory: + return SvcWrap_MapMemory64(system); + case SvcId::UnmapMemory: + return SvcWrap_UnmapMemory64(system); + case SvcId::QueryMemory: + return SvcWrap_QueryMemory64(system); + case SvcId::ExitProcess: + return SvcWrap_ExitProcess64(system); + case SvcId::CreateThread: + return SvcWrap_CreateThread64(system); + case SvcId::StartThread: + return SvcWrap_StartThread64(system); + case SvcId::ExitThread: + return SvcWrap_ExitThread64(system); + case SvcId::SleepThread: + return SvcWrap_SleepThread64(system); + case SvcId::GetThreadPriority: + return SvcWrap_GetThreadPriority64(system); + case SvcId::SetThreadPriority: + return SvcWrap_SetThreadPriority64(system); + case SvcId::GetThreadCoreMask: + return SvcWrap_GetThreadCoreMask64(system); + case SvcId::SetThreadCoreMask: + return SvcWrap_SetThreadCoreMask64(system); + case SvcId::GetCurrentProcessorNumber: + return SvcWrap_GetCurrentProcessorNumber64(system); + case SvcId::SignalEvent: + return SvcWrap_SignalEvent64(system); + case SvcId::ClearEvent: + return SvcWrap_ClearEvent64(system); + case SvcId::MapSharedMemory: + return SvcWrap_MapSharedMemory64(system); + case SvcId::UnmapSharedMemory: + return SvcWrap_UnmapSharedMemory64(system); + case SvcId::CreateTransferMemory: + return SvcWrap_CreateTransferMemory64(system); + case SvcId::CloseHandle: + return SvcWrap_CloseHandle64(system); + case SvcId::ResetSignal: + return SvcWrap_ResetSignal64(system); + case SvcId::WaitSynchronization: + return SvcWrap_WaitSynchronization64(system); + case SvcId::CancelSynchronization: + return SvcWrap_CancelSynchronization64(system); + case SvcId::ArbitrateLock: + return SvcWrap_ArbitrateLock64(system); + case SvcId::ArbitrateUnlock: + return SvcWrap_ArbitrateUnlock64(system); + case SvcId::WaitProcessWideKeyAtomic: + return SvcWrap_WaitProcessWideKeyAtomic64(system); + case SvcId::SignalProcessWideKey: + return SvcWrap_SignalProcessWideKey64(system); + case SvcId::GetSystemTick: + return SvcWrap_GetSystemTick64(system); + case SvcId::ConnectToNamedPort: + return SvcWrap_ConnectToNamedPort64(system); + case SvcId::SendSyncRequestLight: + return SvcWrap_SendSyncRequestLight64(system); + case SvcId::SendSyncRequest: + return SvcWrap_SendSyncRequest64(system); + case SvcId::SendSyncRequestWithUserBuffer: + return SvcWrap_SendSyncRequestWithUserBuffer64(system); + case SvcId::SendAsyncRequestWithUserBuffer: + return SvcWrap_SendAsyncRequestWithUserBuffer64(system); + case SvcId::GetProcessId: + return SvcWrap_GetProcessId64(system); + case SvcId::GetThreadId: + return SvcWrap_GetThreadId64(system); + case SvcId::Break: + return SvcWrap_Break64(system); + case SvcId::OutputDebugString: + return SvcWrap_OutputDebugString64(system); + case SvcId::ReturnFromException: + return SvcWrap_ReturnFromException64(system); + case SvcId::GetInfo: + return SvcWrap_GetInfo64(system); + case SvcId::FlushEntireDataCache: + return SvcWrap_FlushEntireDataCache64(system); + case SvcId::FlushDataCache: + return SvcWrap_FlushDataCache64(system); + case SvcId::MapPhysicalMemory: + return SvcWrap_MapPhysicalMemory64(system); + case SvcId::UnmapPhysicalMemory: + return SvcWrap_UnmapPhysicalMemory64(system); + case SvcId::GetDebugFutureThreadInfo: + return SvcWrap_GetDebugFutureThreadInfo64(system); + case SvcId::GetLastThreadInfo: + return SvcWrap_GetLastThreadInfo64(system); + case SvcId::GetResourceLimitLimitValue: + return SvcWrap_GetResourceLimitLimitValue64(system); + case SvcId::GetResourceLimitCurrentValue: + return SvcWrap_GetResourceLimitCurrentValue64(system); + case SvcId::SetThreadActivity: + return SvcWrap_SetThreadActivity64(system); + case SvcId::GetThreadContext3: + return SvcWrap_GetThreadContext364(system); + case SvcId::WaitForAddress: + return SvcWrap_WaitForAddress64(system); + case SvcId::SignalToAddress: + return SvcWrap_SignalToAddress64(system); + case SvcId::SynchronizePreemptionState: + return SvcWrap_SynchronizePreemptionState64(system); + case SvcId::GetResourceLimitPeakValue: + return SvcWrap_GetResourceLimitPeakValue64(system); + case SvcId::CreateIoPool: + return SvcWrap_CreateIoPool64(system); + case SvcId::CreateIoRegion: + return SvcWrap_CreateIoRegion64(system); + case SvcId::KernelDebug: + return SvcWrap_KernelDebug64(system); + case SvcId::ChangeKernelTraceState: + return SvcWrap_ChangeKernelTraceState64(system); + case SvcId::CreateSession: + return SvcWrap_CreateSession64(system); + case SvcId::AcceptSession: + return SvcWrap_AcceptSession64(system); + case SvcId::ReplyAndReceiveLight: + return SvcWrap_ReplyAndReceiveLight64(system); + case SvcId::ReplyAndReceive: + return SvcWrap_ReplyAndReceive64(system); + case SvcId::ReplyAndReceiveWithUserBuffer: + return SvcWrap_ReplyAndReceiveWithUserBuffer64(system); + case SvcId::CreateEvent: + return SvcWrap_CreateEvent64(system); + case SvcId::MapIoRegion: + return SvcWrap_MapIoRegion64(system); + case SvcId::UnmapIoRegion: + return SvcWrap_UnmapIoRegion64(system); + case SvcId::MapPhysicalMemoryUnsafe: + return SvcWrap_MapPhysicalMemoryUnsafe64(system); + case SvcId::UnmapPhysicalMemoryUnsafe: + return SvcWrap_UnmapPhysicalMemoryUnsafe64(system); + case SvcId::SetUnsafeLimit: + return SvcWrap_SetUnsafeLimit64(system); + case SvcId::CreateCodeMemory: + return SvcWrap_CreateCodeMemory64(system); + case SvcId::ControlCodeMemory: + return SvcWrap_ControlCodeMemory64(system); + case SvcId::SleepSystem: + return SvcWrap_SleepSystem64(system); + case SvcId::ReadWriteRegister: + return SvcWrap_ReadWriteRegister64(system); + case SvcId::SetProcessActivity: + return SvcWrap_SetProcessActivity64(system); + case SvcId::CreateSharedMemory: + return SvcWrap_CreateSharedMemory64(system); + case SvcId::MapTransferMemory: + return SvcWrap_MapTransferMemory64(system); + case SvcId::UnmapTransferMemory: + return SvcWrap_UnmapTransferMemory64(system); + case SvcId::CreateInterruptEvent: + return SvcWrap_CreateInterruptEvent64(system); + case SvcId::QueryPhysicalAddress: + return SvcWrap_QueryPhysicalAddress64(system); + case SvcId::QueryIoMapping: + return SvcWrap_QueryIoMapping64(system); + case SvcId::CreateDeviceAddressSpace: + return SvcWrap_CreateDeviceAddressSpace64(system); + case SvcId::AttachDeviceAddressSpace: + return SvcWrap_AttachDeviceAddressSpace64(system); + case SvcId::DetachDeviceAddressSpace: + return SvcWrap_DetachDeviceAddressSpace64(system); + case SvcId::MapDeviceAddressSpaceByForce: + return SvcWrap_MapDeviceAddressSpaceByForce64(system); + case SvcId::MapDeviceAddressSpaceAligned: + return SvcWrap_MapDeviceAddressSpaceAligned64(system); + case SvcId::UnmapDeviceAddressSpace: + return SvcWrap_UnmapDeviceAddressSpace64(system); + case SvcId::InvalidateProcessDataCache: + return SvcWrap_InvalidateProcessDataCache64(system); + case SvcId::StoreProcessDataCache: + return SvcWrap_StoreProcessDataCache64(system); + case SvcId::FlushProcessDataCache: + return SvcWrap_FlushProcessDataCache64(system); + case SvcId::DebugActiveProcess: + return SvcWrap_DebugActiveProcess64(system); + case SvcId::BreakDebugProcess: + return SvcWrap_BreakDebugProcess64(system); + case SvcId::TerminateDebugProcess: + return SvcWrap_TerminateDebugProcess64(system); + case SvcId::GetDebugEvent: + return SvcWrap_GetDebugEvent64(system); + case SvcId::ContinueDebugEvent: + return SvcWrap_ContinueDebugEvent64(system); + case SvcId::GetProcessList: + return SvcWrap_GetProcessList64(system); + case SvcId::GetThreadList: + return SvcWrap_GetThreadList64(system); + case SvcId::GetDebugThreadContext: + return SvcWrap_GetDebugThreadContext64(system); + case SvcId::SetDebugThreadContext: + return SvcWrap_SetDebugThreadContext64(system); + case SvcId::QueryDebugProcessMemory: + return SvcWrap_QueryDebugProcessMemory64(system); + case SvcId::ReadDebugProcessMemory: + return SvcWrap_ReadDebugProcessMemory64(system); + case SvcId::WriteDebugProcessMemory: + return SvcWrap_WriteDebugProcessMemory64(system); + case SvcId::SetHardwareBreakPoint: + return SvcWrap_SetHardwareBreakPoint64(system); + case SvcId::GetDebugThreadParam: + return SvcWrap_GetDebugThreadParam64(system); + case SvcId::GetSystemInfo: + return SvcWrap_GetSystemInfo64(system); + case SvcId::CreatePort: + return SvcWrap_CreatePort64(system); + case SvcId::ManageNamedPort: + return SvcWrap_ManageNamedPort64(system); + case SvcId::ConnectToPort: + return SvcWrap_ConnectToPort64(system); + case SvcId::SetProcessMemoryPermission: + return SvcWrap_SetProcessMemoryPermission64(system); + case SvcId::MapProcessMemory: + return SvcWrap_MapProcessMemory64(system); + case SvcId::UnmapProcessMemory: + return SvcWrap_UnmapProcessMemory64(system); + case SvcId::QueryProcessMemory: + return SvcWrap_QueryProcessMemory64(system); + case SvcId::MapProcessCodeMemory: + return SvcWrap_MapProcessCodeMemory64(system); + case SvcId::UnmapProcessCodeMemory: + return SvcWrap_UnmapProcessCodeMemory64(system); + case SvcId::CreateProcess: + return SvcWrap_CreateProcess64(system); + case SvcId::StartProcess: + return SvcWrap_StartProcess64(system); + case SvcId::TerminateProcess: + return SvcWrap_TerminateProcess64(system); + case SvcId::GetProcessInfo: + return SvcWrap_GetProcessInfo64(system); + case SvcId::CreateResourceLimit: + return SvcWrap_CreateResourceLimit64(system); + case SvcId::SetResourceLimitLimitValue: + return SvcWrap_SetResourceLimitLimitValue64(system); + case SvcId::CallSecureMonitor: + return SvcWrap_CallSecureMonitor64(system); + case SvcId::MapInsecureMemory: + return SvcWrap_MapInsecureMemory64(system); + case SvcId::UnmapInsecureMemory: + return SvcWrap_UnmapInsecureMemory64(system); + default: + LOG_CRITICAL(Kernel_SVC, "Unknown SVC {:x}!", imm); + break; + } +} +// clang-format on + +void Call(Core::System& system, u32 imm) { auto& kernel = system.Kernel(); kernel.EnterSVCProfile(); - auto* thread = GetCurrentThreadPointer(kernel); - thread->SetIsCallingSvc(); - - const FunctionDef* info = system.CurrentProcess()->Is64BitProcess() ? GetSVCInfo64(immediate) - : GetSVCInfo32(immediate); - if (info) { - if (info->func) { - info->func(system); - } else { - LOG_CRITICAL(Kernel_SVC, "Unimplemented SVC function {}(..)", info->name); - } + if (system.CurrentProcess()->Is64BitProcess()) { + Call64(system, imm); } else { - LOG_CRITICAL(Kernel_SVC, "Unknown SVC function 0x{:X}", immediate); + Call32(system, imm); } kernel.ExitSVCProfile(); diff --git a/src/core/hle/kernel/svc.h b/src/core/hle/kernel/svc.h index b599f9a3d..36e619959 100644 --- a/src/core/hle/kernel/svc.h +++ b/src/core/hle/kernel/svc.h @@ -1,172 +1,536 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#pragma once +// This file is automatically generated using svc_generator.py. -#include "common/common_types.h" -#include "core/hle/kernel/svc_types.h" -#include "core/hle/result.h" +#pragma once namespace Core { class System; } +#include "common/common_types.h" +#include "core/hle/kernel/svc_types.h" +#include "core/hle/result.h" + namespace Kernel::Svc { -void Call(Core::System& system, u32 immediate); - -Result SetHeapSize(Core::System& system, VAddr* out_address, u64 size); -Result SetMemoryPermission(Core::System& system, VAddr address, u64 size, MemoryPermission perm); -Result SetMemoryAttribute(Core::System& system, VAddr address, u64 size, u32 mask, u32 attr); -Result MapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size); -Result UnmapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size); -Result QueryMemory(Core::System& system, VAddr memory_info_address, VAddr page_info_address, - VAddr query_address); +// clang-format off +Result SetHeapSize(Core::System& system, uintptr_t* out_address, uint64_t size); +Result SetMemoryPermission(Core::System& system, uint64_t address, uint64_t size, MemoryPermission perm); +Result SetMemoryAttribute(Core::System& system, uint64_t address, uint64_t size, uint32_t mask, uint32_t attr); +Result MapMemory(Core::System& system, uint64_t dst_address, uint64_t src_address, uint64_t size); +Result UnmapMemory(Core::System& system, uint64_t dst_address, uint64_t src_address, uint64_t size); +Result QueryMemory(Core::System& system, uint64_t out_memory_info, PageInfo* out_page_info, uint64_t address); void ExitProcess(Core::System& system); -Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point, u64 arg, - VAddr stack_bottom, u32 priority, s32 core_id); +Result CreateThread(Core::System& system, Handle* out_handle, uint64_t func, uint64_t arg, uint64_t stack_bottom, int32_t priority, int32_t core_id); Result StartThread(Core::System& system, Handle thread_handle); void ExitThread(Core::System& system); -void SleepThread(Core::System& system, s64 nanoseconds); -Result GetThreadPriority(Core::System& system, u32* out_priority, Handle handle); -Result SetThreadPriority(Core::System& system, Handle thread_handle, u32 priority); -Result GetThreadCoreMask(Core::System& system, Handle thread_handle, s32* out_core_id, - u64* out_affinity_mask); -Result SetThreadCoreMask(Core::System& system, Handle thread_handle, s32 core_id, - u64 affinity_mask); -u32 GetCurrentProcessorNumber(Core::System& system); +void SleepThread(Core::System& system, int64_t ns); +Result GetThreadPriority(Core::System& system, int32_t* out_priority, Handle thread_handle); +Result SetThreadPriority(Core::System& system, Handle thread_handle, int32_t priority); +Result GetThreadCoreMask(Core::System& system, int32_t* out_core_id, uint64_t* out_affinity_mask, Handle thread_handle); +Result SetThreadCoreMask(Core::System& system, Handle thread_handle, int32_t core_id, uint64_t affinity_mask); +int32_t GetCurrentProcessorNumber(Core::System& system); Result SignalEvent(Core::System& system, Handle event_handle); Result ClearEvent(Core::System& system, Handle event_handle); -Result MapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, u64 size, - MemoryPermission map_perm); -Result UnmapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, u64 size); -Result CreateTransferMemory(Core::System& system, Handle* out, VAddr address, u64 size, - MemoryPermission map_perm); +Result MapSharedMemory(Core::System& system, Handle shmem_handle, uint64_t address, uint64_t size, MemoryPermission map_perm); +Result UnmapSharedMemory(Core::System& system, Handle shmem_handle, uint64_t address, uint64_t size); +Result CreateTransferMemory(Core::System& system, Handle* out_handle, uint64_t address, uint64_t size, MemoryPermission map_perm); Result CloseHandle(Core::System& system, Handle handle); Result ResetSignal(Core::System& system, Handle handle); -Result WaitSynchronization(Core::System& system, s32* index, VAddr handles_address, s32 num_handles, - s64 nano_seconds); +Result WaitSynchronization(Core::System& system, int32_t* out_index, uint64_t handles, int32_t num_handles, int64_t timeout_ns); Result CancelSynchronization(Core::System& system, Handle handle); -Result ArbitrateLock(Core::System& system, Handle thread_handle, VAddr address, u32 tag); -Result ArbitrateUnlock(Core::System& system, VAddr address); -Result WaitProcessWideKeyAtomic(Core::System& system, VAddr address, VAddr cv_key, u32 tag, - s64 timeout_ns); -void SignalProcessWideKey(Core::System& system, VAddr cv_key, s32 count); -u64 GetSystemTick(Core::System& system); -Result ConnectToNamedPort(Core::System& system, Handle* out, VAddr port_name_address); -Result SendSyncRequest(Core::System& system, Handle handle); -Result GetProcessId(Core::System& system, u64* out_process_id, Handle handle); -Result GetThreadId(Core::System& system, u64* out_thread_id, Handle thread_handle); -void Break(Core::System& system, u32 reason, u64 info1, u64 info2); -void OutputDebugString(Core::System& system, VAddr address, u64 len); -Result GetInfo(Core::System& system, u64* result, u64 info_id, Handle handle, u64 info_sub_id); -Result MapPhysicalMemory(Core::System& system, VAddr addr, u64 size); -Result UnmapPhysicalMemory(Core::System& system, VAddr addr, u64 size); -Result GetResourceLimitLimitValue(Core::System& system, u64* out_limit_value, - Handle resource_limit_handle, LimitableResource which); -Result GetResourceLimitCurrentValue(Core::System& system, u64* out_current_value, - Handle resource_limit_handle, LimitableResource which); -Result SetThreadActivity(Core::System& system, Handle thread_handle, - ThreadActivity thread_activity); -Result GetThreadContext(Core::System& system, VAddr out_context, Handle thread_handle); -Result WaitForAddress(Core::System& system, VAddr address, ArbitrationType arb_type, s32 value, - s64 timeout_ns); -Result SignalToAddress(Core::System& system, VAddr address, SignalType signal_type, s32 value, - s32 count); +Result ArbitrateLock(Core::System& system, Handle thread_handle, uint64_t address, uint32_t tag); +Result ArbitrateUnlock(Core::System& system, uint64_t address); +Result WaitProcessWideKeyAtomic(Core::System& system, uint64_t address, uint64_t cv_key, uint32_t tag, int64_t timeout_ns); +void SignalProcessWideKey(Core::System& system, uint64_t cv_key, int32_t count); +int64_t GetSystemTick(Core::System& system); +Result ConnectToNamedPort(Core::System& system, Handle* out_handle, uint64_t name); +Result SendSyncRequest(Core::System& system, Handle session_handle); +Result SendSyncRequestWithUserBuffer(Core::System& system, uint64_t message_buffer, uint64_t message_buffer_size, Handle session_handle); +Result SendAsyncRequestWithUserBuffer(Core::System& system, Handle* out_event_handle, uint64_t message_buffer, uint64_t message_buffer_size, Handle session_handle); +Result GetProcessId(Core::System& system, uint64_t* out_process_id, Handle process_handle); +Result GetThreadId(Core::System& system, uint64_t* out_thread_id, Handle thread_handle); +void Break(Core::System& system, BreakReason break_reason, uint64_t arg, uint64_t size); +Result OutputDebugString(Core::System& system, uint64_t debug_str, uint64_t len); +void ReturnFromException(Core::System& system, Result result); +Result GetInfo(Core::System& system, uint64_t* out, InfoType info_type, Handle handle, uint64_t info_subtype); +void FlushEntireDataCache(Core::System& system); +Result FlushDataCache(Core::System& system, uint64_t address, uint64_t size); +Result MapPhysicalMemory(Core::System& system, uint64_t address, uint64_t size); +Result UnmapPhysicalMemory(Core::System& system, uint64_t address, uint64_t size); +Result GetDebugFutureThreadInfo(Core::System& system, lp64::LastThreadContext* out_context, uint64_t* out_thread_id, Handle debug_handle, int64_t ns); +Result GetLastThreadInfo(Core::System& system, lp64::LastThreadContext* out_context, uintptr_t* out_tls_address, uint32_t* out_flags); +Result GetResourceLimitLimitValue(Core::System& system, int64_t* out_limit_value, Handle resource_limit_handle, LimitableResource which); +Result GetResourceLimitCurrentValue(Core::System& system, int64_t* out_current_value, Handle resource_limit_handle, LimitableResource which); +Result SetThreadActivity(Core::System& system, Handle thread_handle, ThreadActivity thread_activity); +Result GetThreadContext3(Core::System& system, uint64_t out_context, Handle thread_handle); +Result WaitForAddress(Core::System& system, uint64_t address, ArbitrationType arb_type, int32_t value, int64_t timeout_ns); +Result SignalToAddress(Core::System& system, uint64_t address, SignalType signal_type, int32_t value, int32_t count); void SynchronizePreemptionState(Core::System& system); -void KernelDebug(Core::System& system, u32 kernel_debug_type, u64 param1, u64 param2, u64 param3); -void ChangeKernelTraceState(Core::System& system, u32 trace_state); -Result CreateSession(Core::System& system, Handle* out_server, Handle* out_client, u32 is_light, - u64 name); -Result ReplyAndReceive(Core::System& system, s32* out_index, Handle* handles, s32 num_handles, - Handle reply_target, s64 timeout_ns); -Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_read); -Result CreateCodeMemory(Core::System& system, Handle* out, VAddr address, size_t size); -Result ControlCodeMemory(Core::System& system, Handle code_memory_handle, u32 operation, - VAddr address, size_t size, MemoryPermission perm); -Result GetProcessList(Core::System& system, u32* out_num_processes, VAddr out_process_ids, - u32 out_process_ids_size); -Result GetThreadList(Core::System& system, u32* out_num_threads, VAddr out_thread_ids, - u32 out_thread_ids_size, Handle debug_handle); -Result SetProcessMemoryPermission(Core::System& system, Handle process_handle, VAddr address, - u64 size, MemoryPermission perm); -Result MapProcessMemory(Core::System& system, VAddr dst_address, Handle process_handle, - VAddr src_address, u64 size); -Result UnmapProcessMemory(Core::System& system, VAddr dst_address, Handle process_handle, - VAddr src_address, u64 size); -Result QueryProcessMemory(Core::System& system, VAddr memory_info_address, VAddr page_info_address, - Handle process_handle, VAddr address); -Result MapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst_address, - u64 src_address, u64 size); -Result UnmapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst_address, - u64 src_address, u64 size); -Result GetProcessInfo(Core::System& system, u64* out, Handle process_handle, u32 type); +Result GetResourceLimitPeakValue(Core::System& system, int64_t* out_peak_value, Handle resource_limit_handle, LimitableResource which); +Result CreateIoPool(Core::System& system, Handle* out_handle, IoPoolType which); +Result CreateIoRegion(Core::System& system, Handle* out_handle, Handle io_pool, uint64_t physical_address, uint64_t size, MemoryMapping mapping, MemoryPermission perm); +void KernelDebug(Core::System& system, KernelDebugType kern_debug_type, uint64_t arg0, uint64_t arg1, uint64_t arg2); +void ChangeKernelTraceState(Core::System& system, KernelTraceState kern_trace_state); +Result CreateSession(Core::System& system, Handle* out_server_session_handle, Handle* out_client_session_handle, bool is_light, uint64_t name); +Result AcceptSession(Core::System& system, Handle* out_handle, Handle port); +Result ReplyAndReceive(Core::System& system, int32_t* out_index, uint64_t handles, int32_t num_handles, Handle reply_target, int64_t timeout_ns); +Result ReplyAndReceiveWithUserBuffer(Core::System& system, int32_t* out_index, uint64_t message_buffer, uint64_t message_buffer_size, uint64_t handles, int32_t num_handles, Handle reply_target, int64_t timeout_ns); +Result CreateEvent(Core::System& system, Handle* out_write_handle, Handle* out_read_handle); +Result MapIoRegion(Core::System& system, Handle io_region, uint64_t address, uint64_t size, MemoryPermission perm); +Result UnmapIoRegion(Core::System& system, Handle io_region, uint64_t address, uint64_t size); +Result MapPhysicalMemoryUnsafe(Core::System& system, uint64_t address, uint64_t size); +Result UnmapPhysicalMemoryUnsafe(Core::System& system, uint64_t address, uint64_t size); +Result SetUnsafeLimit(Core::System& system, uint64_t limit); +Result CreateCodeMemory(Core::System& system, Handle* out_handle, uint64_t address, uint64_t size); +Result ControlCodeMemory(Core::System& system, Handle code_memory_handle, CodeMemoryOperation operation, uint64_t address, uint64_t size, MemoryPermission perm); +void SleepSystem(Core::System& system); +Result ReadWriteRegister(Core::System& system, uint32_t* out_value, uint64_t address, uint32_t mask, uint32_t value); +Result SetProcessActivity(Core::System& system, Handle process_handle, ProcessActivity process_activity); +Result CreateSharedMemory(Core::System& system, Handle* out_handle, uint64_t size, MemoryPermission owner_perm, MemoryPermission remote_perm); +Result MapTransferMemory(Core::System& system, Handle trmem_handle, uint64_t address, uint64_t size, MemoryPermission owner_perm); +Result UnmapTransferMemory(Core::System& system, Handle trmem_handle, uint64_t address, uint64_t size); +Result CreateInterruptEvent(Core::System& system, Handle* out_read_handle, int32_t interrupt_id, InterruptType interrupt_type); +Result QueryPhysicalAddress(Core::System& system, lp64::PhysicalMemoryInfo* out_info, uint64_t address); +Result QueryIoMapping(Core::System& system, uintptr_t* out_address, uintptr_t* out_size, uint64_t physical_address, uint64_t size); +Result CreateDeviceAddressSpace(Core::System& system, Handle* out_handle, uint64_t das_address, uint64_t das_size); +Result AttachDeviceAddressSpace(Core::System& system, DeviceName device_name, Handle das_handle); +Result DetachDeviceAddressSpace(Core::System& system, DeviceName device_name, Handle das_handle); +Result MapDeviceAddressSpaceByForce(Core::System& system, Handle das_handle, Handle process_handle, uint64_t process_address, uint64_t size, uint64_t device_address, uint32_t option); +Result MapDeviceAddressSpaceAligned(Core::System& system, Handle das_handle, Handle process_handle, uint64_t process_address, uint64_t size, uint64_t device_address, uint32_t option); +Result UnmapDeviceAddressSpace(Core::System& system, Handle das_handle, Handle process_handle, uint64_t process_address, uint64_t size, uint64_t device_address); +Result InvalidateProcessDataCache(Core::System& system, Handle process_handle, uint64_t address, uint64_t size); +Result StoreProcessDataCache(Core::System& system, Handle process_handle, uint64_t address, uint64_t size); +Result FlushProcessDataCache(Core::System& system, Handle process_handle, uint64_t address, uint64_t size); +Result DebugActiveProcess(Core::System& system, Handle* out_handle, uint64_t process_id); +Result BreakDebugProcess(Core::System& system, Handle debug_handle); +Result TerminateDebugProcess(Core::System& system, Handle debug_handle); +Result GetDebugEvent(Core::System& system, uint64_t out_info, Handle debug_handle); +Result ContinueDebugEvent(Core::System& system, Handle debug_handle, uint32_t flags, uint64_t thread_ids, int32_t num_thread_ids); +Result GetProcessList(Core::System& system, int32_t* out_num_processes, uint64_t out_process_ids, int32_t max_out_count); +Result GetThreadList(Core::System& system, int32_t* out_num_threads, uint64_t out_thread_ids, int32_t max_out_count, Handle debug_handle); +Result GetDebugThreadContext(Core::System& system, uint64_t out_context, Handle debug_handle, uint64_t thread_id, uint32_t context_flags); +Result SetDebugThreadContext(Core::System& system, Handle debug_handle, uint64_t thread_id, uint64_t context, uint32_t context_flags); +Result QueryDebugProcessMemory(Core::System& system, uint64_t out_memory_info, PageInfo* out_page_info, Handle process_handle, uint64_t address); +Result ReadDebugProcessMemory(Core::System& system, uint64_t buffer, Handle debug_handle, uint64_t address, uint64_t size); +Result WriteDebugProcessMemory(Core::System& system, Handle debug_handle, uint64_t buffer, uint64_t address, uint64_t size); +Result SetHardwareBreakPoint(Core::System& system, HardwareBreakPointRegisterName name, uint64_t flags, uint64_t value); +Result GetDebugThreadParam(Core::System& system, uint64_t* out_64, uint32_t* out_32, Handle debug_handle, uint64_t thread_id, DebugThreadParam param); +Result GetSystemInfo(Core::System& system, uint64_t* out, SystemInfoType info_type, Handle handle, uint64_t info_subtype); +Result CreatePort(Core::System& system, Handle* out_server_handle, Handle* out_client_handle, int32_t max_sessions, bool is_light, uint64_t name); +Result ManageNamedPort(Core::System& system, Handle* out_server_handle, uint64_t name, int32_t max_sessions); +Result ConnectToPort(Core::System& system, Handle* out_handle, Handle port); +Result SetProcessMemoryPermission(Core::System& system, Handle process_handle, uint64_t address, uint64_t size, MemoryPermission perm); +Result MapProcessMemory(Core::System& system, uint64_t dst_address, Handle process_handle, uint64_t src_address, uint64_t size); +Result UnmapProcessMemory(Core::System& system, uint64_t dst_address, Handle process_handle, uint64_t src_address, uint64_t size); +Result QueryProcessMemory(Core::System& system, uint64_t out_memory_info, PageInfo* out_page_info, Handle process_handle, uint64_t address); +Result MapProcessCodeMemory(Core::System& system, Handle process_handle, uint64_t dst_address, uint64_t src_address, uint64_t size); +Result UnmapProcessCodeMemory(Core::System& system, Handle process_handle, uint64_t dst_address, uint64_t src_address, uint64_t size); +Result CreateProcess(Core::System& system, Handle* out_handle, uint64_t parameters, uint64_t caps, int32_t num_caps); +Result StartProcess(Core::System& system, Handle process_handle, int32_t priority, int32_t core_id, uint64_t main_thread_stack_size); +Result TerminateProcess(Core::System& system, Handle process_handle); +Result GetProcessInfo(Core::System& system, int64_t* out_info, Handle process_handle, ProcessInfoType info_type); Result CreateResourceLimit(Core::System& system, Handle* out_handle); -Result SetResourceLimitLimitValue(Core::System& system, Handle resource_limit_handle, - LimitableResource which, u64 limit_value); +Result SetResourceLimitLimitValue(Core::System& system, Handle resource_limit_handle, LimitableResource which, int64_t limit_value); +Result MapInsecureMemory(Core::System& system, uint64_t address, uint64_t size); +Result UnmapInsecureMemory(Core::System& system, uint64_t address, uint64_t size); -// +Result SetHeapSize64From32(Core::System& system, uintptr_t* out_address, uint32_t size); +Result SetMemoryPermission64From32(Core::System& system, uint32_t address, uint32_t size, MemoryPermission perm); +Result SetMemoryAttribute64From32(Core::System& system, uint32_t address, uint32_t size, uint32_t mask, uint32_t attr); +Result MapMemory64From32(Core::System& system, uint32_t dst_address, uint32_t src_address, uint32_t size); +Result UnmapMemory64From32(Core::System& system, uint32_t dst_address, uint32_t src_address, uint32_t size); +Result QueryMemory64From32(Core::System& system, uint32_t out_memory_info, PageInfo* out_page_info, uint32_t address); +void ExitProcess64From32(Core::System& system); +Result CreateThread64From32(Core::System& system, Handle* out_handle, uint32_t func, uint32_t arg, uint32_t stack_bottom, int32_t priority, int32_t core_id); +Result StartThread64From32(Core::System& system, Handle thread_handle); +void ExitThread64From32(Core::System& system); +void SleepThread64From32(Core::System& system, int64_t ns); +Result GetThreadPriority64From32(Core::System& system, int32_t* out_priority, Handle thread_handle); +Result SetThreadPriority64From32(Core::System& system, Handle thread_handle, int32_t priority); +Result GetThreadCoreMask64From32(Core::System& system, int32_t* out_core_id, uint64_t* out_affinity_mask, Handle thread_handle); +Result SetThreadCoreMask64From32(Core::System& system, Handle thread_handle, int32_t core_id, uint64_t affinity_mask); +int32_t GetCurrentProcessorNumber64From32(Core::System& system); +Result SignalEvent64From32(Core::System& system, Handle event_handle); +Result ClearEvent64From32(Core::System& system, Handle event_handle); +Result MapSharedMemory64From32(Core::System& system, Handle shmem_handle, uint32_t address, uint32_t size, MemoryPermission map_perm); +Result UnmapSharedMemory64From32(Core::System& system, Handle shmem_handle, uint32_t address, uint32_t size); +Result CreateTransferMemory64From32(Core::System& system, Handle* out_handle, uint32_t address, uint32_t size, MemoryPermission map_perm); +Result CloseHandle64From32(Core::System& system, Handle handle); +Result ResetSignal64From32(Core::System& system, Handle handle); +Result WaitSynchronization64From32(Core::System& system, int32_t* out_index, uint32_t handles, int32_t num_handles, int64_t timeout_ns); +Result CancelSynchronization64From32(Core::System& system, Handle handle); +Result ArbitrateLock64From32(Core::System& system, Handle thread_handle, uint32_t address, uint32_t tag); +Result ArbitrateUnlock64From32(Core::System& system, uint32_t address); +Result WaitProcessWideKeyAtomic64From32(Core::System& system, uint32_t address, uint32_t cv_key, uint32_t tag, int64_t timeout_ns); +void SignalProcessWideKey64From32(Core::System& system, uint32_t cv_key, int32_t count); +int64_t GetSystemTick64From32(Core::System& system); +Result ConnectToNamedPort64From32(Core::System& system, Handle* out_handle, uint32_t name); +Result SendSyncRequest64From32(Core::System& system, Handle session_handle); +Result SendSyncRequestWithUserBuffer64From32(Core::System& system, uint32_t message_buffer, uint32_t message_buffer_size, Handle session_handle); +Result SendAsyncRequestWithUserBuffer64From32(Core::System& system, Handle* out_event_handle, uint32_t message_buffer, uint32_t message_buffer_size, Handle session_handle); +Result GetProcessId64From32(Core::System& system, uint64_t* out_process_id, Handle process_handle); +Result GetThreadId64From32(Core::System& system, uint64_t* out_thread_id, Handle thread_handle); +void Break64From32(Core::System& system, BreakReason break_reason, uint32_t arg, uint32_t size); +Result OutputDebugString64From32(Core::System& system, uint32_t debug_str, uint32_t len); +void ReturnFromException64From32(Core::System& system, Result result); +Result GetInfo64From32(Core::System& system, uint64_t* out, InfoType info_type, Handle handle, uint64_t info_subtype); +void FlushEntireDataCache64From32(Core::System& system); +Result FlushDataCache64From32(Core::System& system, uint32_t address, uint32_t size); +Result MapPhysicalMemory64From32(Core::System& system, uint32_t address, uint32_t size); +Result UnmapPhysicalMemory64From32(Core::System& system, uint32_t address, uint32_t size); +Result GetDebugFutureThreadInfo64From32(Core::System& system, ilp32::LastThreadContext* out_context, uint64_t* out_thread_id, Handle debug_handle, int64_t ns); +Result GetLastThreadInfo64From32(Core::System& system, ilp32::LastThreadContext* out_context, uintptr_t* out_tls_address, uint32_t* out_flags); +Result GetResourceLimitLimitValue64From32(Core::System& system, int64_t* out_limit_value, Handle resource_limit_handle, LimitableResource which); +Result GetResourceLimitCurrentValue64From32(Core::System& system, int64_t* out_current_value, Handle resource_limit_handle, LimitableResource which); +Result SetThreadActivity64From32(Core::System& system, Handle thread_handle, ThreadActivity thread_activity); +Result GetThreadContext364From32(Core::System& system, uint32_t out_context, Handle thread_handle); +Result WaitForAddress64From32(Core::System& system, uint32_t address, ArbitrationType arb_type, int32_t value, int64_t timeout_ns); +Result SignalToAddress64From32(Core::System& system, uint32_t address, SignalType signal_type, int32_t value, int32_t count); +void SynchronizePreemptionState64From32(Core::System& system); +Result GetResourceLimitPeakValue64From32(Core::System& system, int64_t* out_peak_value, Handle resource_limit_handle, LimitableResource which); +Result CreateIoPool64From32(Core::System& system, Handle* out_handle, IoPoolType which); +Result CreateIoRegion64From32(Core::System& system, Handle* out_handle, Handle io_pool, uint64_t physical_address, uint32_t size, MemoryMapping mapping, MemoryPermission perm); +void KernelDebug64From32(Core::System& system, KernelDebugType kern_debug_type, uint64_t arg0, uint64_t arg1, uint64_t arg2); +void ChangeKernelTraceState64From32(Core::System& system, KernelTraceState kern_trace_state); +Result CreateSession64From32(Core::System& system, Handle* out_server_session_handle, Handle* out_client_session_handle, bool is_light, uint32_t name); +Result AcceptSession64From32(Core::System& system, Handle* out_handle, Handle port); +Result ReplyAndReceive64From32(Core::System& system, int32_t* out_index, uint32_t handles, int32_t num_handles, Handle reply_target, int64_t timeout_ns); +Result ReplyAndReceiveWithUserBuffer64From32(Core::System& system, int32_t* out_index, uint32_t message_buffer, uint32_t message_buffer_size, uint32_t handles, int32_t num_handles, Handle reply_target, int64_t timeout_ns); +Result CreateEvent64From32(Core::System& system, Handle* out_write_handle, Handle* out_read_handle); +Result MapIoRegion64From32(Core::System& system, Handle io_region, uint32_t address, uint32_t size, MemoryPermission perm); +Result UnmapIoRegion64From32(Core::System& system, Handle io_region, uint32_t address, uint32_t size); +Result MapPhysicalMemoryUnsafe64From32(Core::System& system, uint32_t address, uint32_t size); +Result UnmapPhysicalMemoryUnsafe64From32(Core::System& system, uint32_t address, uint32_t size); +Result SetUnsafeLimit64From32(Core::System& system, uint32_t limit); +Result CreateCodeMemory64From32(Core::System& system, Handle* out_handle, uint32_t address, uint32_t size); +Result ControlCodeMemory64From32(Core::System& system, Handle code_memory_handle, CodeMemoryOperation operation, uint64_t address, uint64_t size, MemoryPermission perm); +void SleepSystem64From32(Core::System& system); +Result ReadWriteRegister64From32(Core::System& system, uint32_t* out_value, uint64_t address, uint32_t mask, uint32_t value); +Result SetProcessActivity64From32(Core::System& system, Handle process_handle, ProcessActivity process_activity); +Result CreateSharedMemory64From32(Core::System& system, Handle* out_handle, uint32_t size, MemoryPermission owner_perm, MemoryPermission remote_perm); +Result MapTransferMemory64From32(Core::System& system, Handle trmem_handle, uint32_t address, uint32_t size, MemoryPermission owner_perm); +Result UnmapTransferMemory64From32(Core::System& system, Handle trmem_handle, uint32_t address, uint32_t size); +Result CreateInterruptEvent64From32(Core::System& system, Handle* out_read_handle, int32_t interrupt_id, InterruptType interrupt_type); +Result QueryPhysicalAddress64From32(Core::System& system, ilp32::PhysicalMemoryInfo* out_info, uint32_t address); +Result QueryIoMapping64From32(Core::System& system, uintptr_t* out_address, uintptr_t* out_size, uint64_t physical_address, uint32_t size); +Result CreateDeviceAddressSpace64From32(Core::System& system, Handle* out_handle, uint64_t das_address, uint64_t das_size); +Result AttachDeviceAddressSpace64From32(Core::System& system, DeviceName device_name, Handle das_handle); +Result DetachDeviceAddressSpace64From32(Core::System& system, DeviceName device_name, Handle das_handle); +Result MapDeviceAddressSpaceByForce64From32(Core::System& system, Handle das_handle, Handle process_handle, uint64_t process_address, uint32_t size, uint64_t device_address, uint32_t option); +Result MapDeviceAddressSpaceAligned64From32(Core::System& system, Handle das_handle, Handle process_handle, uint64_t process_address, uint32_t size, uint64_t device_address, uint32_t option); +Result UnmapDeviceAddressSpace64From32(Core::System& system, Handle das_handle, Handle process_handle, uint64_t process_address, uint32_t size, uint64_t device_address); +Result InvalidateProcessDataCache64From32(Core::System& system, Handle process_handle, uint64_t address, uint64_t size); +Result StoreProcessDataCache64From32(Core::System& system, Handle process_handle, uint64_t address, uint64_t size); +Result FlushProcessDataCache64From32(Core::System& system, Handle process_handle, uint64_t address, uint64_t size); +Result DebugActiveProcess64From32(Core::System& system, Handle* out_handle, uint64_t process_id); +Result BreakDebugProcess64From32(Core::System& system, Handle debug_handle); +Result TerminateDebugProcess64From32(Core::System& system, Handle debug_handle); +Result GetDebugEvent64From32(Core::System& system, uint32_t out_info, Handle debug_handle); +Result ContinueDebugEvent64From32(Core::System& system, Handle debug_handle, uint32_t flags, uint32_t thread_ids, int32_t num_thread_ids); +Result GetProcessList64From32(Core::System& system, int32_t* out_num_processes, uint32_t out_process_ids, int32_t max_out_count); +Result GetThreadList64From32(Core::System& system, int32_t* out_num_threads, uint32_t out_thread_ids, int32_t max_out_count, Handle debug_handle); +Result GetDebugThreadContext64From32(Core::System& system, uint32_t out_context, Handle debug_handle, uint64_t thread_id, uint32_t context_flags); +Result SetDebugThreadContext64From32(Core::System& system, Handle debug_handle, uint64_t thread_id, uint32_t context, uint32_t context_flags); +Result QueryDebugProcessMemory64From32(Core::System& system, uint32_t out_memory_info, PageInfo* out_page_info, Handle process_handle, uint32_t address); +Result ReadDebugProcessMemory64From32(Core::System& system, uint32_t buffer, Handle debug_handle, uint32_t address, uint32_t size); +Result WriteDebugProcessMemory64From32(Core::System& system, Handle debug_handle, uint32_t buffer, uint32_t address, uint32_t size); +Result SetHardwareBreakPoint64From32(Core::System& system, HardwareBreakPointRegisterName name, uint64_t flags, uint64_t value); +Result GetDebugThreadParam64From32(Core::System& system, uint64_t* out_64, uint32_t* out_32, Handle debug_handle, uint64_t thread_id, DebugThreadParam param); +Result GetSystemInfo64From32(Core::System& system, uint64_t* out, SystemInfoType info_type, Handle handle, uint64_t info_subtype); +Result CreatePort64From32(Core::System& system, Handle* out_server_handle, Handle* out_client_handle, int32_t max_sessions, bool is_light, uint32_t name); +Result ManageNamedPort64From32(Core::System& system, Handle* out_server_handle, uint32_t name, int32_t max_sessions); +Result ConnectToPort64From32(Core::System& system, Handle* out_handle, Handle port); +Result SetProcessMemoryPermission64From32(Core::System& system, Handle process_handle, uint64_t address, uint64_t size, MemoryPermission perm); +Result MapProcessMemory64From32(Core::System& system, uint32_t dst_address, Handle process_handle, uint64_t src_address, uint32_t size); +Result UnmapProcessMemory64From32(Core::System& system, uint32_t dst_address, Handle process_handle, uint64_t src_address, uint32_t size); +Result QueryProcessMemory64From32(Core::System& system, uint32_t out_memory_info, PageInfo* out_page_info, Handle process_handle, uint64_t address); +Result MapProcessCodeMemory64From32(Core::System& system, Handle process_handle, uint64_t dst_address, uint64_t src_address, uint64_t size); +Result UnmapProcessCodeMemory64From32(Core::System& system, Handle process_handle, uint64_t dst_address, uint64_t src_address, uint64_t size); +Result CreateProcess64From32(Core::System& system, Handle* out_handle, uint32_t parameters, uint32_t caps, int32_t num_caps); +Result StartProcess64From32(Core::System& system, Handle process_handle, int32_t priority, int32_t core_id, uint64_t main_thread_stack_size); +Result TerminateProcess64From32(Core::System& system, Handle process_handle); +Result GetProcessInfo64From32(Core::System& system, int64_t* out_info, Handle process_handle, ProcessInfoType info_type); +Result CreateResourceLimit64From32(Core::System& system, Handle* out_handle); +Result SetResourceLimitLimitValue64From32(Core::System& system, Handle resource_limit_handle, LimitableResource which, int64_t limit_value); +Result MapInsecureMemory64From32(Core::System& system, uint32_t address, uint32_t size); +Result UnmapInsecureMemory64From32(Core::System& system, uint32_t address, uint32_t size); -Result SetHeapSize32(Core::System& system, u32* heap_addr, u32 heap_size); -Result SetMemoryAttribute32(Core::System& system, u32 address, u32 size, u32 mask, u32 attr); -Result MapMemory32(Core::System& system, u32 dst_addr, u32 src_addr, u32 size); -Result UnmapMemory32(Core::System& system, u32 dst_addr, u32 src_addr, u32 size); -Result QueryMemory32(Core::System& system, u32 memory_info_address, u32 page_info_address, - u32 query_address); -void ExitProcess32(Core::System& system); -Result CreateThread32(Core::System& system, Handle* out_handle, u32 priority, u32 entry_point, - u32 arg, u32 stack_top, s32 processor_id); -Result StartThread32(Core::System& system, Handle thread_handle); -void ExitThread32(Core::System& system); -void SleepThread32(Core::System& system, u32 nanoseconds_low, u32 nanoseconds_high); -Result GetThreadPriority32(Core::System& system, u32* out_priority, Handle handle); -Result SetThreadPriority32(Core::System& system, Handle thread_handle, u32 priority); -Result GetThreadCoreMask32(Core::System& system, Handle thread_handle, s32* out_core_id, - u32* out_affinity_mask_low, u32* out_affinity_mask_high); -Result SetThreadCoreMask32(Core::System& system, Handle thread_handle, s32 core_id, - u32 affinity_mask_low, u32 affinity_mask_high); -u32 GetCurrentProcessorNumber32(Core::System& system); -Result SignalEvent32(Core::System& system, Handle event_handle); -Result ClearEvent32(Core::System& system, Handle event_handle); -Result MapSharedMemory32(Core::System& system, Handle shmem_handle, u32 address, u32 size, - MemoryPermission map_perm); -Result UnmapSharedMemory32(Core::System& system, Handle shmem_handle, u32 address, u32 size); -Result CreateTransferMemory32(Core::System& system, Handle* out, u32 address, u32 size, - MemoryPermission map_perm); -Result CloseHandle32(Core::System& system, Handle handle); -Result ResetSignal32(Core::System& system, Handle handle); -Result WaitSynchronization32(Core::System& system, u32 timeout_low, u32 handles_address, - s32 num_handles, u32 timeout_high, s32* index); -Result CancelSynchronization32(Core::System& system, Handle handle); -Result ArbitrateLock32(Core::System& system, Handle thread_handle, u32 address, u32 tag); -Result ArbitrateUnlock32(Core::System& system, u32 address); -Result WaitProcessWideKeyAtomic32(Core::System& system, u32 address, u32 cv_key, u32 tag, - u32 timeout_ns_low, u32 timeout_ns_high); -void SignalProcessWideKey32(Core::System& system, u32 cv_key, s32 count); -void GetSystemTick32(Core::System& system, u32* time_low, u32* time_high); -Result ConnectToNamedPort32(Core::System& system, Handle* out_handle, u32 port_name_address); -Result SendSyncRequest32(Core::System& system, Handle handle); -Result GetProcessId32(Core::System& system, u32* out_process_id_low, u32* out_process_id_high, - Handle handle); -Result GetThreadId32(Core::System& system, u32* out_thread_id_low, u32* out_thread_id_high, - Handle thread_handle); -void Break32(Core::System& system, u32 reason, u32 info1, u32 info2); -void OutputDebugString32(Core::System& system, u32 address, u32 len); -Result GetInfo32(Core::System& system, u32* result_low, u32* result_high, u32 sub_id_low, - u32 info_id, u32 handle, u32 sub_id_high); -Result MapPhysicalMemory32(Core::System& system, u32 addr, u32 size); -Result UnmapPhysicalMemory32(Core::System& system, u32 addr, u32 size); -Result SetThreadActivity32(Core::System& system, Handle thread_handle, - ThreadActivity thread_activity); -Result GetThreadContext32(Core::System& system, u32 out_context, Handle thread_handle); -Result WaitForAddress32(Core::System& system, u32 address, ArbitrationType arb_type, s32 value, - u32 timeout_ns_low, u32 timeout_ns_high); -Result SignalToAddress32(Core::System& system, u32 address, SignalType signal_type, s32 value, - s32 count); -Result CreateEvent32(Core::System& system, Handle* out_write, Handle* out_read); -Result CreateCodeMemory32(Core::System& system, Handle* out, u32 address, u32 size); -Result ControlCodeMemory32(Core::System& system, Handle code_memory_handle, u32 operation, - u64 address, u64 size, MemoryPermission perm); -Result FlushProcessDataCache32(Core::System& system, Handle process_handle, u64 address, u64 size); +Result SetHeapSize64(Core::System& system, uintptr_t* out_address, uint64_t size); +Result SetMemoryPermission64(Core::System& system, uint64_t address, uint64_t size, MemoryPermission perm); +Result SetMemoryAttribute64(Core::System& system, uint64_t address, uint64_t size, uint32_t mask, uint32_t attr); +Result MapMemory64(Core::System& system, uint64_t dst_address, uint64_t src_address, uint64_t size); +Result UnmapMemory64(Core::System& system, uint64_t dst_address, uint64_t src_address, uint64_t size); +Result QueryMemory64(Core::System& system, uint64_t out_memory_info, PageInfo* out_page_info, uint64_t address); +void ExitProcess64(Core::System& system); +Result CreateThread64(Core::System& system, Handle* out_handle, uint64_t func, uint64_t arg, uint64_t stack_bottom, int32_t priority, int32_t core_id); +Result StartThread64(Core::System& system, Handle thread_handle); +void ExitThread64(Core::System& system); +void SleepThread64(Core::System& system, int64_t ns); +Result GetThreadPriority64(Core::System& system, int32_t* out_priority, Handle thread_handle); +Result SetThreadPriority64(Core::System& system, Handle thread_handle, int32_t priority); +Result GetThreadCoreMask64(Core::System& system, int32_t* out_core_id, uint64_t* out_affinity_mask, Handle thread_handle); +Result SetThreadCoreMask64(Core::System& system, Handle thread_handle, int32_t core_id, uint64_t affinity_mask); +int32_t GetCurrentProcessorNumber64(Core::System& system); +Result SignalEvent64(Core::System& system, Handle event_handle); +Result ClearEvent64(Core::System& system, Handle event_handle); +Result MapSharedMemory64(Core::System& system, Handle shmem_handle, uint64_t address, uint64_t size, MemoryPermission map_perm); +Result UnmapSharedMemory64(Core::System& system, Handle shmem_handle, uint64_t address, uint64_t size); +Result CreateTransferMemory64(Core::System& system, Handle* out_handle, uint64_t address, uint64_t size, MemoryPermission map_perm); +Result CloseHandle64(Core::System& system, Handle handle); +Result ResetSignal64(Core::System& system, Handle handle); +Result WaitSynchronization64(Core::System& system, int32_t* out_index, uint64_t handles, int32_t num_handles, int64_t timeout_ns); +Result CancelSynchronization64(Core::System& system, Handle handle); +Result ArbitrateLock64(Core::System& system, Handle thread_handle, uint64_t address, uint32_t tag); +Result ArbitrateUnlock64(Core::System& system, uint64_t address); +Result WaitProcessWideKeyAtomic64(Core::System& system, uint64_t address, uint64_t cv_key, uint32_t tag, int64_t timeout_ns); +void SignalProcessWideKey64(Core::System& system, uint64_t cv_key, int32_t count); +int64_t GetSystemTick64(Core::System& system); +Result ConnectToNamedPort64(Core::System& system, Handle* out_handle, uint64_t name); +Result SendSyncRequest64(Core::System& system, Handle session_handle); +Result SendSyncRequestWithUserBuffer64(Core::System& system, uint64_t message_buffer, uint64_t message_buffer_size, Handle session_handle); +Result SendAsyncRequestWithUserBuffer64(Core::System& system, Handle* out_event_handle, uint64_t message_buffer, uint64_t message_buffer_size, Handle session_handle); +Result GetProcessId64(Core::System& system, uint64_t* out_process_id, Handle process_handle); +Result GetThreadId64(Core::System& system, uint64_t* out_thread_id, Handle thread_handle); +void Break64(Core::System& system, BreakReason break_reason, uint64_t arg, uint64_t size); +Result OutputDebugString64(Core::System& system, uint64_t debug_str, uint64_t len); +void ReturnFromException64(Core::System& system, Result result); +Result GetInfo64(Core::System& system, uint64_t* out, InfoType info_type, Handle handle, uint64_t info_subtype); +void FlushEntireDataCache64(Core::System& system); +Result FlushDataCache64(Core::System& system, uint64_t address, uint64_t size); +Result MapPhysicalMemory64(Core::System& system, uint64_t address, uint64_t size); +Result UnmapPhysicalMemory64(Core::System& system, uint64_t address, uint64_t size); +Result GetDebugFutureThreadInfo64(Core::System& system, lp64::LastThreadContext* out_context, uint64_t* out_thread_id, Handle debug_handle, int64_t ns); +Result GetLastThreadInfo64(Core::System& system, lp64::LastThreadContext* out_context, uintptr_t* out_tls_address, uint32_t* out_flags); +Result GetResourceLimitLimitValue64(Core::System& system, int64_t* out_limit_value, Handle resource_limit_handle, LimitableResource which); +Result GetResourceLimitCurrentValue64(Core::System& system, int64_t* out_current_value, Handle resource_limit_handle, LimitableResource which); +Result SetThreadActivity64(Core::System& system, Handle thread_handle, ThreadActivity thread_activity); +Result GetThreadContext364(Core::System& system, uint64_t out_context, Handle thread_handle); +Result WaitForAddress64(Core::System& system, uint64_t address, ArbitrationType arb_type, int32_t value, int64_t timeout_ns); +Result SignalToAddress64(Core::System& system, uint64_t address, SignalType signal_type, int32_t value, int32_t count); +void SynchronizePreemptionState64(Core::System& system); +Result GetResourceLimitPeakValue64(Core::System& system, int64_t* out_peak_value, Handle resource_limit_handle, LimitableResource which); +Result CreateIoPool64(Core::System& system, Handle* out_handle, IoPoolType which); +Result CreateIoRegion64(Core::System& system, Handle* out_handle, Handle io_pool, uint64_t physical_address, uint64_t size, MemoryMapping mapping, MemoryPermission perm); +void KernelDebug64(Core::System& system, KernelDebugType kern_debug_type, uint64_t arg0, uint64_t arg1, uint64_t arg2); +void ChangeKernelTraceState64(Core::System& system, KernelTraceState kern_trace_state); +Result CreateSession64(Core::System& system, Handle* out_server_session_handle, Handle* out_client_session_handle, bool is_light, uint64_t name); +Result AcceptSession64(Core::System& system, Handle* out_handle, Handle port); +Result ReplyAndReceive64(Core::System& system, int32_t* out_index, uint64_t handles, int32_t num_handles, Handle reply_target, int64_t timeout_ns); +Result ReplyAndReceiveWithUserBuffer64(Core::System& system, int32_t* out_index, uint64_t message_buffer, uint64_t message_buffer_size, uint64_t handles, int32_t num_handles, Handle reply_target, int64_t timeout_ns); +Result CreateEvent64(Core::System& system, Handle* out_write_handle, Handle* out_read_handle); +Result MapIoRegion64(Core::System& system, Handle io_region, uint64_t address, uint64_t size, MemoryPermission perm); +Result UnmapIoRegion64(Core::System& system, Handle io_region, uint64_t address, uint64_t size); +Result MapPhysicalMemoryUnsafe64(Core::System& system, uint64_t address, uint64_t size); +Result UnmapPhysicalMemoryUnsafe64(Core::System& system, uint64_t address, uint64_t size); +Result SetUnsafeLimit64(Core::System& system, uint64_t limit); +Result CreateCodeMemory64(Core::System& system, Handle* out_handle, uint64_t address, uint64_t size); +Result ControlCodeMemory64(Core::System& system, Handle code_memory_handle, CodeMemoryOperation operation, uint64_t address, uint64_t size, MemoryPermission perm); +void SleepSystem64(Core::System& system); +Result ReadWriteRegister64(Core::System& system, uint32_t* out_value, uint64_t address, uint32_t mask, uint32_t value); +Result SetProcessActivity64(Core::System& system, Handle process_handle, ProcessActivity process_activity); +Result CreateSharedMemory64(Core::System& system, Handle* out_handle, uint64_t size, MemoryPermission owner_perm, MemoryPermission remote_perm); +Result MapTransferMemory64(Core::System& system, Handle trmem_handle, uint64_t address, uint64_t size, MemoryPermission owner_perm); +Result UnmapTransferMemory64(Core::System& system, Handle trmem_handle, uint64_t address, uint64_t size); +Result CreateInterruptEvent64(Core::System& system, Handle* out_read_handle, int32_t interrupt_id, InterruptType interrupt_type); +Result QueryPhysicalAddress64(Core::System& system, lp64::PhysicalMemoryInfo* out_info, uint64_t address); +Result QueryIoMapping64(Core::System& system, uintptr_t* out_address, uintptr_t* out_size, uint64_t physical_address, uint64_t size); +Result CreateDeviceAddressSpace64(Core::System& system, Handle* out_handle, uint64_t das_address, uint64_t das_size); +Result AttachDeviceAddressSpace64(Core::System& system, DeviceName device_name, Handle das_handle); +Result DetachDeviceAddressSpace64(Core::System& system, DeviceName device_name, Handle das_handle); +Result MapDeviceAddressSpaceByForce64(Core::System& system, Handle das_handle, Handle process_handle, uint64_t process_address, uint64_t size, uint64_t device_address, uint32_t option); +Result MapDeviceAddressSpaceAligned64(Core::System& system, Handle das_handle, Handle process_handle, uint64_t process_address, uint64_t size, uint64_t device_address, uint32_t option); +Result UnmapDeviceAddressSpace64(Core::System& system, Handle das_handle, Handle process_handle, uint64_t process_address, uint64_t size, uint64_t device_address); +Result InvalidateProcessDataCache64(Core::System& system, Handle process_handle, uint64_t address, uint64_t size); +Result StoreProcessDataCache64(Core::System& system, Handle process_handle, uint64_t address, uint64_t size); +Result FlushProcessDataCache64(Core::System& system, Handle process_handle, uint64_t address, uint64_t size); +Result DebugActiveProcess64(Core::System& system, Handle* out_handle, uint64_t process_id); +Result BreakDebugProcess64(Core::System& system, Handle debug_handle); +Result TerminateDebugProcess64(Core::System& system, Handle debug_handle); +Result GetDebugEvent64(Core::System& system, uint64_t out_info, Handle debug_handle); +Result ContinueDebugEvent64(Core::System& system, Handle debug_handle, uint32_t flags, uint64_t thread_ids, int32_t num_thread_ids); +Result GetProcessList64(Core::System& system, int32_t* out_num_processes, uint64_t out_process_ids, int32_t max_out_count); +Result GetThreadList64(Core::System& system, int32_t* out_num_threads, uint64_t out_thread_ids, int32_t max_out_count, Handle debug_handle); +Result GetDebugThreadContext64(Core::System& system, uint64_t out_context, Handle debug_handle, uint64_t thread_id, uint32_t context_flags); +Result SetDebugThreadContext64(Core::System& system, Handle debug_handle, uint64_t thread_id, uint64_t context, uint32_t context_flags); +Result QueryDebugProcessMemory64(Core::System& system, uint64_t out_memory_info, PageInfo* out_page_info, Handle process_handle, uint64_t address); +Result ReadDebugProcessMemory64(Core::System& system, uint64_t buffer, Handle debug_handle, uint64_t address, uint64_t size); +Result WriteDebugProcessMemory64(Core::System& system, Handle debug_handle, uint64_t buffer, uint64_t address, uint64_t size); +Result SetHardwareBreakPoint64(Core::System& system, HardwareBreakPointRegisterName name, uint64_t flags, uint64_t value); +Result GetDebugThreadParam64(Core::System& system, uint64_t* out_64, uint32_t* out_32, Handle debug_handle, uint64_t thread_id, DebugThreadParam param); +Result GetSystemInfo64(Core::System& system, uint64_t* out, SystemInfoType info_type, Handle handle, uint64_t info_subtype); +Result CreatePort64(Core::System& system, Handle* out_server_handle, Handle* out_client_handle, int32_t max_sessions, bool is_light, uint64_t name); +Result ManageNamedPort64(Core::System& system, Handle* out_server_handle, uint64_t name, int32_t max_sessions); +Result ConnectToPort64(Core::System& system, Handle* out_handle, Handle port); +Result SetProcessMemoryPermission64(Core::System& system, Handle process_handle, uint64_t address, uint64_t size, MemoryPermission perm); +Result MapProcessMemory64(Core::System& system, uint64_t dst_address, Handle process_handle, uint64_t src_address, uint64_t size); +Result UnmapProcessMemory64(Core::System& system, uint64_t dst_address, Handle process_handle, uint64_t src_address, uint64_t size); +Result QueryProcessMemory64(Core::System& system, uint64_t out_memory_info, PageInfo* out_page_info, Handle process_handle, uint64_t address); +Result MapProcessCodeMemory64(Core::System& system, Handle process_handle, uint64_t dst_address, uint64_t src_address, uint64_t size); +Result UnmapProcessCodeMemory64(Core::System& system, Handle process_handle, uint64_t dst_address, uint64_t src_address, uint64_t size); +Result CreateProcess64(Core::System& system, Handle* out_handle, uint64_t parameters, uint64_t caps, int32_t num_caps); +Result StartProcess64(Core::System& system, Handle process_handle, int32_t priority, int32_t core_id, uint64_t main_thread_stack_size); +Result TerminateProcess64(Core::System& system, Handle process_handle); +Result GetProcessInfo64(Core::System& system, int64_t* out_info, Handle process_handle, ProcessInfoType info_type); +Result CreateResourceLimit64(Core::System& system, Handle* out_handle); +Result SetResourceLimitLimitValue64(Core::System& system, Handle resource_limit_handle, LimitableResource which, int64_t limit_value); +Result MapInsecureMemory64(Core::System& system, uint64_t address, uint64_t size); +Result UnmapInsecureMemory64(Core::System& system, uint64_t address, uint64_t size); + +enum class SvcId : u32 { + SetHeapSize = 0x1, + SetMemoryPermission = 0x2, + SetMemoryAttribute = 0x3, + MapMemory = 0x4, + UnmapMemory = 0x5, + QueryMemory = 0x6, + ExitProcess = 0x7, + CreateThread = 0x8, + StartThread = 0x9, + ExitThread = 0xa, + SleepThread = 0xb, + GetThreadPriority = 0xc, + SetThreadPriority = 0xd, + GetThreadCoreMask = 0xe, + SetThreadCoreMask = 0xf, + GetCurrentProcessorNumber = 0x10, + SignalEvent = 0x11, + ClearEvent = 0x12, + MapSharedMemory = 0x13, + UnmapSharedMemory = 0x14, + CreateTransferMemory = 0x15, + CloseHandle = 0x16, + ResetSignal = 0x17, + WaitSynchronization = 0x18, + CancelSynchronization = 0x19, + ArbitrateLock = 0x1a, + ArbitrateUnlock = 0x1b, + WaitProcessWideKeyAtomic = 0x1c, + SignalProcessWideKey = 0x1d, + GetSystemTick = 0x1e, + ConnectToNamedPort = 0x1f, + SendSyncRequestLight = 0x20, + SendSyncRequest = 0x21, + SendSyncRequestWithUserBuffer = 0x22, + SendAsyncRequestWithUserBuffer = 0x23, + GetProcessId = 0x24, + GetThreadId = 0x25, + Break = 0x26, + OutputDebugString = 0x27, + ReturnFromException = 0x28, + GetInfo = 0x29, + FlushEntireDataCache = 0x2a, + FlushDataCache = 0x2b, + MapPhysicalMemory = 0x2c, + UnmapPhysicalMemory = 0x2d, + GetDebugFutureThreadInfo = 0x2e, + GetLastThreadInfo = 0x2f, + GetResourceLimitLimitValue = 0x30, + GetResourceLimitCurrentValue = 0x31, + SetThreadActivity = 0x32, + GetThreadContext3 = 0x33, + WaitForAddress = 0x34, + SignalToAddress = 0x35, + SynchronizePreemptionState = 0x36, + GetResourceLimitPeakValue = 0x37, + CreateIoPool = 0x39, + CreateIoRegion = 0x3a, + KernelDebug = 0x3c, + ChangeKernelTraceState = 0x3d, + CreateSession = 0x40, + AcceptSession = 0x41, + ReplyAndReceiveLight = 0x42, + ReplyAndReceive = 0x43, + ReplyAndReceiveWithUserBuffer = 0x44, + CreateEvent = 0x45, + MapIoRegion = 0x46, + UnmapIoRegion = 0x47, + MapPhysicalMemoryUnsafe = 0x48, + UnmapPhysicalMemoryUnsafe = 0x49, + SetUnsafeLimit = 0x4a, + CreateCodeMemory = 0x4b, + ControlCodeMemory = 0x4c, + SleepSystem = 0x4d, + ReadWriteRegister = 0x4e, + SetProcessActivity = 0x4f, + CreateSharedMemory = 0x50, + MapTransferMemory = 0x51, + UnmapTransferMemory = 0x52, + CreateInterruptEvent = 0x53, + QueryPhysicalAddress = 0x54, + QueryIoMapping = 0x55, + CreateDeviceAddressSpace = 0x56, + AttachDeviceAddressSpace = 0x57, + DetachDeviceAddressSpace = 0x58, + MapDeviceAddressSpaceByForce = 0x59, + MapDeviceAddressSpaceAligned = 0x5a, + UnmapDeviceAddressSpace = 0x5c, + InvalidateProcessDataCache = 0x5d, + StoreProcessDataCache = 0x5e, + FlushProcessDataCache = 0x5f, + DebugActiveProcess = 0x60, + BreakDebugProcess = 0x61, + TerminateDebugProcess = 0x62, + GetDebugEvent = 0x63, + ContinueDebugEvent = 0x64, + GetProcessList = 0x65, + GetThreadList = 0x66, + GetDebugThreadContext = 0x67, + SetDebugThreadContext = 0x68, + QueryDebugProcessMemory = 0x69, + ReadDebugProcessMemory = 0x6a, + WriteDebugProcessMemory = 0x6b, + SetHardwareBreakPoint = 0x6c, + GetDebugThreadParam = 0x6d, + GetSystemInfo = 0x6f, + CreatePort = 0x70, + ManageNamedPort = 0x71, + ConnectToPort = 0x72, + SetProcessMemoryPermission = 0x73, + MapProcessMemory = 0x74, + UnmapProcessMemory = 0x75, + QueryProcessMemory = 0x76, + MapProcessCodeMemory = 0x77, + UnmapProcessCodeMemory = 0x78, + CreateProcess = 0x79, + StartProcess = 0x7a, + TerminateProcess = 0x7b, + GetProcessInfo = 0x7c, + CreateResourceLimit = 0x7d, + SetResourceLimitLimitValue = 0x7e, + CallSecureMonitor = 0x7f, + MapInsecureMemory = 0x90, + UnmapInsecureMemory = 0x91, +}; +// clang-format on + +// Custom ABI. +Result ReplyAndReceiveLight(Core::System& system, Handle handle, uint32_t* args); +Result ReplyAndReceiveLight64From32(Core::System& system, Handle handle, uint32_t* args); +Result ReplyAndReceiveLight64(Core::System& system, Handle handle, uint32_t* args); + +Result SendSyncRequestLight(Core::System& system, Handle session_handle, uint32_t* args); +Result SendSyncRequestLight64From32(Core::System& system, Handle session_handle, uint32_t* args); +Result SendSyncRequestLight64(Core::System& system, Handle session_handle, uint32_t* args); + +void CallSecureMonitor(Core::System& system, lp64::SecureMonitorArguments* args); +void CallSecureMonitor64From32(Core::System& system, ilp32::SecureMonitorArguments* args); +void CallSecureMonitor64(Core::System& system, lp64::SecureMonitorArguments* args); + +// Defined in svc_light_ipc.cpp. +void SvcWrap_ReplyAndReceiveLight64From32(Core::System& system); +void SvcWrap_ReplyAndReceiveLight64(Core::System& system); + +void SvcWrap_SendSyncRequestLight64From32(Core::System& system); +void SvcWrap_SendSyncRequestLight64(Core::System& system); + +// Defined in svc_secure_monitor_call.cpp. +void SvcWrap_CallSecureMonitor64From32(Core::System& system); +void SvcWrap_CallSecureMonitor64(Core::System& system); + +// Perform a supervisor call by index. +void Call(Core::System& system, u32 imm); } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_activity.cpp b/src/core/hle/kernel/svc/svc_activity.cpp index 8774a5c98..1dcdb7a15 100644 --- a/src/core/hle/kernel/svc/svc_activity.cpp +++ b/src/core/hle/kernel/svc/svc_activity.cpp @@ -36,9 +36,30 @@ Result SetThreadActivity(Core::System& system, Handle thread_handle, return ResultSuccess; } -Result SetThreadActivity32(Core::System& system, Handle thread_handle, +Result SetProcessActivity(Core::System& system, Handle process_handle, + ProcessActivity process_activity) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result SetThreadActivity64(Core::System& system, Handle thread_handle, ThreadActivity thread_activity) { return SetThreadActivity(system, thread_handle, thread_activity); } +Result SetProcessActivity64(Core::System& system, Handle process_handle, + ProcessActivity process_activity) { + return SetProcessActivity(system, process_handle, process_activity); +} + +Result SetThreadActivity64From32(Core::System& system, Handle thread_handle, + ThreadActivity thread_activity) { + return SetThreadActivity(system, thread_handle, thread_activity); +} + +Result SetProcessActivity64From32(Core::System& system, Handle process_handle, + ProcessActivity process_activity) { + return SetProcessActivity(system, process_handle, process_activity); +} + } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_address_arbiter.cpp b/src/core/hle/kernel/svc/svc_address_arbiter.cpp index 842107726..e6a5d2ae5 100644 --- a/src/core/hle/kernel/svc/svc_address_arbiter.cpp +++ b/src/core/hle/kernel/svc/svc_address_arbiter.cpp @@ -75,12 +75,6 @@ Result WaitForAddress(Core::System& system, VAddr address, ArbitrationType arb_t return system.Kernel().CurrentProcess()->WaitAddressArbiter(address, arb_type, value, timeout); } -Result WaitForAddress32(Core::System& system, u32 address, ArbitrationType arb_type, s32 value, - u32 timeout_ns_low, u32 timeout_ns_high) { - const auto timeout = static_cast(timeout_ns_low | (u64{timeout_ns_high} << 32)); - return WaitForAddress(system, address, arb_type, value, timeout); -} - // Signals to an address (via Address Arbiter) Result SignalToAddress(Core::System& system, VAddr address, SignalType signal_type, s32 value, s32 count) { @@ -105,9 +99,24 @@ Result SignalToAddress(Core::System& system, VAddr address, SignalType signal_ty count); } -Result SignalToAddress32(Core::System& system, u32 address, SignalType signal_type, s32 value, +Result WaitForAddress64(Core::System& system, VAddr address, ArbitrationType arb_type, s32 value, + s64 timeout_ns) { + return WaitForAddress(system, address, arb_type, value, timeout_ns); +} + +Result SignalToAddress64(Core::System& system, VAddr address, SignalType signal_type, s32 value, s32 count) { return SignalToAddress(system, address, signal_type, value, count); } +Result WaitForAddress64From32(Core::System& system, u32 address, ArbitrationType arb_type, + s32 value, s64 timeout_ns) { + return WaitForAddress(system, address, arb_type, value, timeout_ns); +} + +Result SignalToAddress64From32(Core::System& system, u32 address, SignalType signal_type, s32 value, + s32 count) { + return SignalToAddress(system, address, signal_type, value, count); +} + } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_address_translation.cpp b/src/core/hle/kernel/svc/svc_address_translation.cpp index 299e22ae6..c25e144cd 100644 --- a/src/core/hle/kernel/svc/svc_address_translation.cpp +++ b/src/core/hle/kernel/svc/svc_address_translation.cpp @@ -2,5 +2,49 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/hle/kernel/svc.h" +#include "core/hle/kernel/svc_results.h" -namespace Kernel::Svc {} // namespace Kernel::Svc +namespace Kernel::Svc { + +Result QueryPhysicalAddress(Core::System& system, lp64::PhysicalMemoryInfo* out_info, + uint64_t address) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result QueryIoMapping(Core::System& system, uintptr_t* out_address, uintptr_t* out_size, + uint64_t physical_address, uint64_t size) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result QueryPhysicalAddress64(Core::System& system, lp64::PhysicalMemoryInfo* out_info, + uint64_t address) { + R_RETURN(QueryPhysicalAddress(system, out_info, address)); +} + +Result QueryIoMapping64(Core::System& system, uintptr_t* out_address, uintptr_t* out_size, + uint64_t physical_address, uint64_t size) { + R_RETURN(QueryIoMapping(system, out_address, out_size, physical_address, size)); +} + +Result QueryPhysicalAddress64From32(Core::System& system, ilp32::PhysicalMemoryInfo* out_info, + uint32_t address) { + lp64::PhysicalMemoryInfo info{}; + R_TRY(QueryPhysicalAddress(system, std::addressof(info), address)); + + *out_info = { + .physical_address = info.physical_address, + .virtual_address = static_cast(info.virtual_address), + .size = static_cast(info.size), + }; + R_SUCCEED(); +} + +Result QueryIoMapping64From32(Core::System& system, uintptr_t* out_address, uintptr_t* out_size, + uint64_t physical_address, uint32_t size) { + R_RETURN(QueryIoMapping(system, reinterpret_cast(out_address), + reinterpret_cast(out_size), physical_address, size)); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_cache.cpp b/src/core/hle/kernel/svc/svc_cache.cpp index 42167d35b..b5404760e 100644 --- a/src/core/hle/kernel/svc/svc_cache.cpp +++ b/src/core/hle/kernel/svc/svc_cache.cpp @@ -9,7 +9,28 @@ namespace Kernel::Svc { -Result FlushProcessDataCache32(Core::System& system, Handle process_handle, u64 address, u64 size) { +void FlushEntireDataCache(Core::System& system) { + UNIMPLEMENTED(); +} + +Result FlushDataCache(Core::System& system, VAddr address, size_t size) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result InvalidateProcessDataCache(Core::System& system, Handle process_handle, uint64_t address, + uint64_t size) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result StoreProcessDataCache(Core::System& system, Handle process_handle, uint64_t address, + uint64_t size) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result FlushProcessDataCache(Core::System& system, Handle process_handle, u64 address, u64 size) { // Validate address/size. R_UNLESS(size > 0, ResultInvalidSize); R_UNLESS(address == static_cast(address), ResultInvalidCurrentMemory); @@ -28,4 +49,50 @@ Result FlushProcessDataCache32(Core::System& system, Handle process_handle, u64 R_RETURN(system.Memory().FlushDataCache(*process, address, size)); } +void FlushEntireDataCache64(Core::System& system) { + FlushEntireDataCache(system); +} + +Result FlushDataCache64(Core::System& system, VAddr address, size_t size) { + R_RETURN(FlushDataCache(system, address, size)); +} + +Result InvalidateProcessDataCache64(Core::System& system, Handle process_handle, uint64_t address, + uint64_t size) { + R_RETURN(InvalidateProcessDataCache(system, process_handle, address, size)); +} + +Result StoreProcessDataCache64(Core::System& system, Handle process_handle, uint64_t address, + uint64_t size) { + R_RETURN(StoreProcessDataCache(system, process_handle, address, size)); +} + +Result FlushProcessDataCache64(Core::System& system, Handle process_handle, uint64_t address, + uint64_t size) { + R_RETURN(FlushProcessDataCache(system, process_handle, address, size)); +} + +void FlushEntireDataCache64From32(Core::System& system) { + return FlushEntireDataCache(system); +} + +Result FlushDataCache64From32(Core::System& system, uint32_t address, uint32_t size) { + R_RETURN(FlushDataCache(system, address, size)); +} + +Result InvalidateProcessDataCache64From32(Core::System& system, Handle process_handle, + uint64_t address, uint64_t size) { + R_RETURN(InvalidateProcessDataCache(system, process_handle, address, size)); +} + +Result StoreProcessDataCache64From32(Core::System& system, Handle process_handle, uint64_t address, + uint64_t size) { + R_RETURN(StoreProcessDataCache(system, process_handle, address, size)); +} + +Result FlushProcessDataCache64From32(Core::System& system, Handle process_handle, uint64_t address, + uint64_t size) { + R_RETURN(FlushProcessDataCache(system, process_handle, address, size)); +} + } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_code_memory.cpp b/src/core/hle/kernel/svc/svc_code_memory.cpp index 4cb21e101..ec256b757 100644 --- a/src/core/hle/kernel/svc/svc_code_memory.cpp +++ b/src/core/hle/kernel/svc/svc_code_memory.cpp @@ -63,12 +63,9 @@ Result CreateCodeMemory(Core::System& system, Handle* out, VAddr address, size_t return ResultSuccess; } -Result CreateCodeMemory32(Core::System& system, Handle* out, u32 address, u32 size) { - return CreateCodeMemory(system, out, address, size); -} - -Result ControlCodeMemory(Core::System& system, Handle code_memory_handle, u32 operation, - VAddr address, size_t size, MemoryPermission perm) { +Result ControlCodeMemory(Core::System& system, Handle code_memory_handle, + CodeMemoryOperation operation, VAddr address, size_t size, + MemoryPermission perm) { LOG_TRACE(Kernel_SVC, "called, code_memory_handle=0x{:X}, operation=0x{:X}, address=0x{:X}, size=0x{:X}, " @@ -90,7 +87,7 @@ Result ControlCodeMemory(Core::System& system, Handle code_memory_handle, u32 op // This enables homebrew usage of these SVCs for JIT. // Perform the operation. - switch (static_cast(operation)) { + switch (operation) { case CodeMemoryOperation::Map: { // Check that the region is in range. R_UNLESS( @@ -146,9 +143,26 @@ Result ControlCodeMemory(Core::System& system, Handle code_memory_handle, u32 op return ResultSuccess; } -Result ControlCodeMemory32(Core::System& system, Handle code_memory_handle, u32 operation, - u64 address, u64 size, MemoryPermission perm) { - return ControlCodeMemory(system, code_memory_handle, operation, address, size, perm); +Result CreateCodeMemory64(Core::System& system, Handle* out_handle, uint64_t address, + uint64_t size) { + R_RETURN(CreateCodeMemory(system, out_handle, address, size)); +} + +Result ControlCodeMemory64(Core::System& system, Handle code_memory_handle, + CodeMemoryOperation operation, uint64_t address, uint64_t size, + MemoryPermission perm) { + R_RETURN(ControlCodeMemory(system, code_memory_handle, operation, address, size, perm)); +} + +Result CreateCodeMemory64From32(Core::System& system, Handle* out_handle, uint32_t address, + uint32_t size) { + R_RETURN(CreateCodeMemory(system, out_handle, address, size)); +} + +Result ControlCodeMemory64From32(Core::System& system, Handle code_memory_handle, + CodeMemoryOperation operation, uint64_t address, uint64_t size, + MemoryPermission perm) { + R_RETURN(ControlCodeMemory(system, code_memory_handle, operation, address, size, perm)); } } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_condition_variable.cpp b/src/core/hle/kernel/svc/svc_condition_variable.cpp index d6cfc87c5..b59a33e68 100644 --- a/src/core/hle/kernel/svc/svc_condition_variable.cpp +++ b/src/core/hle/kernel/svc/svc_condition_variable.cpp @@ -47,12 +47,6 @@ Result WaitProcessWideKeyAtomic(Core::System& system, VAddr address, VAddr cv_ke address, Common::AlignDown(cv_key, sizeof(u32)), tag, timeout); } -Result WaitProcessWideKeyAtomic32(Core::System& system, u32 address, u32 cv_key, u32 tag, - u32 timeout_ns_low, u32 timeout_ns_high) { - const auto timeout_ns = static_cast(timeout_ns_low | (u64{timeout_ns_high} << 32)); - return WaitProcessWideKeyAtomic(system, address, cv_key, tag, timeout_ns); -} - /// Signal process wide key void SignalProcessWideKey(Core::System& system, VAddr cv_key, s32 count) { LOG_TRACE(Kernel_SVC, "called, cv_key=0x{:X}, count=0x{:08X}", cv_key, count); @@ -62,7 +56,21 @@ void SignalProcessWideKey(Core::System& system, VAddr cv_key, s32 count) { Common::AlignDown(cv_key, sizeof(u32)), count); } -void SignalProcessWideKey32(Core::System& system, u32 cv_key, s32 count) { +Result WaitProcessWideKeyAtomic64(Core::System& system, uint64_t address, uint64_t cv_key, + uint32_t tag, int64_t timeout_ns) { + R_RETURN(WaitProcessWideKeyAtomic(system, address, cv_key, tag, timeout_ns)); +} + +void SignalProcessWideKey64(Core::System& system, uint64_t cv_key, int32_t count) { + SignalProcessWideKey(system, cv_key, count); +} + +Result WaitProcessWideKeyAtomic64From32(Core::System& system, uint32_t address, uint32_t cv_key, + uint32_t tag, int64_t timeout_ns) { + R_RETURN(WaitProcessWideKeyAtomic(system, address, cv_key, tag, timeout_ns)); +} + +void SignalProcessWideKey64From32(Core::System& system, uint32_t cv_key, int32_t count) { SignalProcessWideKey(system, cv_key, count); } diff --git a/src/core/hle/kernel/svc/svc_debug.cpp b/src/core/hle/kernel/svc/svc_debug.cpp index 299e22ae6..a14050fa7 100644 --- a/src/core/hle/kernel/svc/svc_debug.cpp +++ b/src/core/hle/kernel/svc/svc_debug.cpp @@ -2,5 +2,193 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/hle/kernel/svc.h" +#include "core/hle/kernel/svc_results.h" -namespace Kernel::Svc {} // namespace Kernel::Svc +namespace Kernel::Svc { + +Result DebugActiveProcess(Core::System& system, Handle* out_handle, uint64_t process_id) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result BreakDebugProcess(Core::System& system, Handle debug_handle) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result TerminateDebugProcess(Core::System& system, Handle debug_handle) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result GetDebugEvent(Core::System& system, uint64_t out_info, Handle debug_handle) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result ContinueDebugEvent(Core::System& system, Handle debug_handle, uint32_t flags, + uint64_t user_thread_ids, int32_t num_thread_ids) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result GetDebugThreadContext(Core::System& system, uint64_t out_context, Handle debug_handle, + uint64_t thread_id, uint32_t context_flags) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result SetDebugThreadContext(Core::System& system, Handle debug_handle, uint64_t thread_id, + uint64_t user_context, uint32_t context_flags) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result QueryDebugProcessMemory(Core::System& system, uint64_t out_memory_info, + PageInfo* out_page_info, Handle debug_handle, uintptr_t address) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result ReadDebugProcessMemory(Core::System& system, uintptr_t buffer, Handle debug_handle, + uintptr_t address, size_t size) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result WriteDebugProcessMemory(Core::System& system, Handle debug_handle, uintptr_t buffer, + uintptr_t address, size_t size) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result SetHardwareBreakPoint(Core::System& system, HardwareBreakPointRegisterName name, + uint64_t flags, uint64_t value) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result GetDebugThreadParam(Core::System& system, uint64_t* out_64, uint32_t* out_32, + Handle debug_handle, uint64_t thread_id, DebugThreadParam param) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result DebugActiveProcess64(Core::System& system, Handle* out_handle, uint64_t process_id) { + R_RETURN(DebugActiveProcess(system, out_handle, process_id)); +} + +Result BreakDebugProcess64(Core::System& system, Handle debug_handle) { + R_RETURN(BreakDebugProcess(system, debug_handle)); +} + +Result TerminateDebugProcess64(Core::System& system, Handle debug_handle) { + R_RETURN(TerminateDebugProcess(system, debug_handle)); +} + +Result GetDebugEvent64(Core::System& system, uint64_t out_info, Handle debug_handle) { + R_RETURN(GetDebugEvent(system, out_info, debug_handle)); +} + +Result ContinueDebugEvent64(Core::System& system, Handle debug_handle, uint32_t flags, + uint64_t thread_ids, int32_t num_thread_ids) { + R_RETURN(ContinueDebugEvent(system, debug_handle, flags, thread_ids, num_thread_ids)); +} + +Result GetDebugThreadContext64(Core::System& system, uint64_t out_context, Handle debug_handle, + uint64_t thread_id, uint32_t context_flags) { + R_RETURN(GetDebugThreadContext(system, out_context, debug_handle, thread_id, context_flags)); +} + +Result SetDebugThreadContext64(Core::System& system, Handle debug_handle, uint64_t thread_id, + uint64_t context, uint32_t context_flags) { + R_RETURN(SetDebugThreadContext(system, debug_handle, thread_id, context, context_flags)); +} + +Result QueryDebugProcessMemory64(Core::System& system, uint64_t out_memory_info, + PageInfo* out_page_info, Handle debug_handle, uint64_t address) { + R_RETURN( + QueryDebugProcessMemory(system, out_memory_info, out_page_info, debug_handle, address)); +} + +Result ReadDebugProcessMemory64(Core::System& system, uint64_t buffer, Handle debug_handle, + uint64_t address, uint64_t size) { + R_RETURN(ReadDebugProcessMemory(system, buffer, debug_handle, address, size)); +} + +Result WriteDebugProcessMemory64(Core::System& system, Handle debug_handle, uint64_t buffer, + uint64_t address, uint64_t size) { + R_RETURN(WriteDebugProcessMemory(system, debug_handle, buffer, address, size)); +} + +Result SetHardwareBreakPoint64(Core::System& system, HardwareBreakPointRegisterName name, + uint64_t flags, uint64_t value) { + R_RETURN(SetHardwareBreakPoint(system, name, flags, value)); +} + +Result GetDebugThreadParam64(Core::System& system, uint64_t* out_64, uint32_t* out_32, + Handle debug_handle, uint64_t thread_id, DebugThreadParam param) { + R_RETURN(GetDebugThreadParam(system, out_64, out_32, debug_handle, thread_id, param)); +} + +Result DebugActiveProcess64From32(Core::System& system, Handle* out_handle, uint64_t process_id) { + R_RETURN(DebugActiveProcess(system, out_handle, process_id)); +} + +Result BreakDebugProcess64From32(Core::System& system, Handle debug_handle) { + R_RETURN(BreakDebugProcess(system, debug_handle)); +} + +Result TerminateDebugProcess64From32(Core::System& system, Handle debug_handle) { + R_RETURN(TerminateDebugProcess(system, debug_handle)); +} + +Result GetDebugEvent64From32(Core::System& system, uint32_t out_info, Handle debug_handle) { + R_RETURN(GetDebugEvent(system, out_info, debug_handle)); +} + +Result ContinueDebugEvent64From32(Core::System& system, Handle debug_handle, uint32_t flags, + uint32_t thread_ids, int32_t num_thread_ids) { + R_RETURN(ContinueDebugEvent(system, debug_handle, flags, thread_ids, num_thread_ids)); +} + +Result GetDebugThreadContext64From32(Core::System& system, uint32_t out_context, + Handle debug_handle, uint64_t thread_id, + uint32_t context_flags) { + R_RETURN(GetDebugThreadContext(system, out_context, debug_handle, thread_id, context_flags)); +} + +Result SetDebugThreadContext64From32(Core::System& system, Handle debug_handle, uint64_t thread_id, + uint32_t context, uint32_t context_flags) { + R_RETURN(SetDebugThreadContext(system, debug_handle, thread_id, context, context_flags)); +} + +Result QueryDebugProcessMemory64From32(Core::System& system, uint32_t out_memory_info, + PageInfo* out_page_info, Handle debug_handle, + uint32_t address) { + R_RETURN( + QueryDebugProcessMemory(system, out_memory_info, out_page_info, debug_handle, address)); +} + +Result ReadDebugProcessMemory64From32(Core::System& system, uint32_t buffer, Handle debug_handle, + uint32_t address, uint32_t size) { + R_RETURN(ReadDebugProcessMemory(system, buffer, debug_handle, address, size)); +} + +Result WriteDebugProcessMemory64From32(Core::System& system, Handle debug_handle, uint32_t buffer, + uint32_t address, uint32_t size) { + R_RETURN(WriteDebugProcessMemory(system, debug_handle, buffer, address, size)); +} + +Result SetHardwareBreakPoint64From32(Core::System& system, HardwareBreakPointRegisterName name, + uint64_t flags, uint64_t value) { + R_RETURN(SetHardwareBreakPoint(system, name, flags, value)); +} + +Result GetDebugThreadParam64From32(Core::System& system, uint64_t* out_64, uint32_t* out_32, + Handle debug_handle, uint64_t thread_id, + DebugThreadParam param) { + R_RETURN(GetDebugThreadParam(system, out_64, out_32, debug_handle, thread_id, param)); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_debug_string.cpp b/src/core/hle/kernel/svc/svc_debug_string.cpp index 486e62cc4..d4bf062d1 100644 --- a/src/core/hle/kernel/svc/svc_debug_string.cpp +++ b/src/core/hle/kernel/svc/svc_debug_string.cpp @@ -8,18 +8,22 @@ namespace Kernel::Svc { /// Used to output a message on a debug hardware unit - does nothing on a retail unit -void OutputDebugString(Core::System& system, VAddr address, u64 len) { - if (len == 0) { - return; - } +Result OutputDebugString(Core::System& system, VAddr address, u64 len) { + R_SUCCEED_IF(len == 0); std::string str(len, '\0'); system.Memory().ReadBlock(address, str.data(), str.size()); LOG_DEBUG(Debug_Emulated, "{}", str); + + R_SUCCEED(); } -void OutputDebugString32(Core::System& system, u32 address, u32 len) { - OutputDebugString(system, address, len); +Result OutputDebugString64(Core::System& system, uint64_t debug_str, uint64_t len) { + R_RETURN(OutputDebugString(system, debug_str, len)); +} + +Result OutputDebugString64From32(Core::System& system, uint32_t debug_str, uint32_t len) { + R_RETURN(OutputDebugString(system, debug_str, len)); } } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_device_address_space.cpp b/src/core/hle/kernel/svc/svc_device_address_space.cpp index 299e22ae6..cdc453c35 100644 --- a/src/core/hle/kernel/svc/svc_device_address_space.cpp +++ b/src/core/hle/kernel/svc/svc_device_address_space.cpp @@ -1,6 +1,253 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "common/alignment.h" +#include "common/scope_exit.h" +#include "core/core.h" +#include "core/hle/kernel/k_device_address_space.h" +#include "core/hle/kernel/k_process.h" #include "core/hle/kernel/svc.h" -namespace Kernel::Svc {} // namespace Kernel::Svc +namespace Kernel::Svc { + +constexpr inline u64 DeviceAddressSpaceAlignMask = (1ULL << 22) - 1; + +constexpr bool IsProcessAndDeviceAligned(uint64_t process_address, uint64_t device_address) { + return (process_address & DeviceAddressSpaceAlignMask) == + (device_address & DeviceAddressSpaceAlignMask); +} + +Result CreateDeviceAddressSpace(Core::System& system, Handle* out, uint64_t das_address, + uint64_t das_size) { + // Validate input. + R_UNLESS(Common::IsAligned(das_address, PageSize), ResultInvalidMemoryRegion); + R_UNLESS(Common::IsAligned(das_size, PageSize), ResultInvalidMemoryRegion); + R_UNLESS(das_size > 0, ResultInvalidMemoryRegion); + R_UNLESS((das_address < das_address + das_size), ResultInvalidMemoryRegion); + + // Create the device address space. + KDeviceAddressSpace* das = KDeviceAddressSpace::Create(system.Kernel()); + R_UNLESS(das != nullptr, ResultOutOfResource); + SCOPE_EXIT({ das->Close(); }); + + // Initialize the device address space. + R_TRY(das->Initialize(das_address, das_size)); + + // Register the device address space. + KDeviceAddressSpace::Register(system.Kernel(), das); + + // Add to the handle table. + R_TRY(system.CurrentProcess()->GetHandleTable().Add(out, das)); + + R_SUCCEED(); +} + +Result AttachDeviceAddressSpace(Core::System& system, DeviceName device_name, Handle das_handle) { + // Get the device address space. + KScopedAutoObject das = + system.CurrentProcess()->GetHandleTable().GetObject(das_handle); + R_UNLESS(das.IsNotNull(), ResultInvalidHandle); + + // Attach. + R_RETURN(das->Attach(device_name)); +} + +Result DetachDeviceAddressSpace(Core::System& system, DeviceName device_name, Handle das_handle) { + // Get the device address space. + KScopedAutoObject das = + system.CurrentProcess()->GetHandleTable().GetObject(das_handle); + R_UNLESS(das.IsNotNull(), ResultInvalidHandle); + + // Detach. + R_RETURN(das->Detach(device_name)); +} + +constexpr bool IsValidDeviceMemoryPermission(MemoryPermission device_perm) { + switch (device_perm) { + case MemoryPermission::Read: + case MemoryPermission::Write: + case MemoryPermission::ReadWrite: + return true; + default: + return false; + } +} + +Result MapDeviceAddressSpaceByForce(Core::System& system, Handle das_handle, Handle process_handle, + uint64_t process_address, size_t size, uint64_t device_address, + u32 option) { + // Decode the option. + const MapDeviceAddressSpaceOption option_pack{option}; + const auto device_perm = option_pack.permission; + const auto reserved = option_pack.reserved; + + // Validate input. + R_UNLESS(Common::IsAligned(process_address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(device_address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); + R_UNLESS(size > 0, ResultInvalidSize); + R_UNLESS((process_address < process_address + size), ResultInvalidCurrentMemory); + R_UNLESS((device_address < device_address + size), ResultInvalidMemoryRegion); + R_UNLESS((process_address == static_cast(process_address)), + ResultInvalidCurrentMemory); + R_UNLESS(IsValidDeviceMemoryPermission(device_perm), ResultInvalidNewMemoryPermission); + R_UNLESS(reserved == 0, ResultInvalidEnumValue); + + // Get the device address space. + KScopedAutoObject das = + system.CurrentProcess()->GetHandleTable().GetObject(das_handle); + R_UNLESS(das.IsNotNull(), ResultInvalidHandle); + + // Get the process. + KScopedAutoObject process = + system.CurrentProcess()->GetHandleTable().GetObject(process_handle); + R_UNLESS(process.IsNotNull(), ResultInvalidHandle); + + // Validate that the process address is within range. + auto& page_table = process->PageTable(); + R_UNLESS(page_table.Contains(process_address, size), ResultInvalidCurrentMemory); + + // Map. + R_RETURN( + das->MapByForce(std::addressof(page_table), process_address, size, device_address, option)); +} + +Result MapDeviceAddressSpaceAligned(Core::System& system, Handle das_handle, Handle process_handle, + uint64_t process_address, size_t size, uint64_t device_address, + u32 option) { + // Decode the option. + const MapDeviceAddressSpaceOption option_pack{option}; + const auto device_perm = option_pack.permission; + const auto reserved = option_pack.reserved; + + // Validate input. + R_UNLESS(Common::IsAligned(process_address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(device_address, PageSize), ResultInvalidAddress); + R_UNLESS(IsProcessAndDeviceAligned(process_address, device_address), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); + R_UNLESS(size > 0, ResultInvalidSize); + R_UNLESS((process_address < process_address + size), ResultInvalidCurrentMemory); + R_UNLESS((device_address < device_address + size), ResultInvalidMemoryRegion); + R_UNLESS((process_address == static_cast(process_address)), + ResultInvalidCurrentMemory); + R_UNLESS(IsValidDeviceMemoryPermission(device_perm), ResultInvalidNewMemoryPermission); + R_UNLESS(reserved == 0, ResultInvalidEnumValue); + + // Get the device address space. + KScopedAutoObject das = + system.CurrentProcess()->GetHandleTable().GetObject(das_handle); + R_UNLESS(das.IsNotNull(), ResultInvalidHandle); + + // Get the process. + KScopedAutoObject process = + system.CurrentProcess()->GetHandleTable().GetObject(process_handle); + R_UNLESS(process.IsNotNull(), ResultInvalidHandle); + + // Validate that the process address is within range. + auto& page_table = process->PageTable(); + R_UNLESS(page_table.Contains(process_address, size), ResultInvalidCurrentMemory); + + // Map. + R_RETURN( + das->MapAligned(std::addressof(page_table), process_address, size, device_address, option)); +} + +Result UnmapDeviceAddressSpace(Core::System& system, Handle das_handle, Handle process_handle, + uint64_t process_address, size_t size, uint64_t device_address) { + // Validate input. + R_UNLESS(Common::IsAligned(process_address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(device_address, PageSize), ResultInvalidAddress); + R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); + R_UNLESS(size > 0, ResultInvalidSize); + R_UNLESS((process_address < process_address + size), ResultInvalidCurrentMemory); + R_UNLESS((device_address < device_address + size), ResultInvalidMemoryRegion); + R_UNLESS((process_address == static_cast(process_address)), + ResultInvalidCurrentMemory); + + // Get the device address space. + KScopedAutoObject das = + system.CurrentProcess()->GetHandleTable().GetObject(das_handle); + R_UNLESS(das.IsNotNull(), ResultInvalidHandle); + + // Get the process. + KScopedAutoObject process = + system.CurrentProcess()->GetHandleTable().GetObject(process_handle); + R_UNLESS(process.IsNotNull(), ResultInvalidHandle); + + // Validate that the process address is within range. + auto& page_table = process->PageTable(); + R_UNLESS(page_table.Contains(process_address, size), ResultInvalidCurrentMemory); + + R_RETURN(das->Unmap(std::addressof(page_table), process_address, size, device_address)); +} + +Result CreateDeviceAddressSpace64(Core::System& system, Handle* out_handle, uint64_t das_address, + uint64_t das_size) { + R_RETURN(CreateDeviceAddressSpace(system, out_handle, das_address, das_size)); +} + +Result AttachDeviceAddressSpace64(Core::System& system, DeviceName device_name, Handle das_handle) { + R_RETURN(AttachDeviceAddressSpace(system, device_name, das_handle)); +} + +Result DetachDeviceAddressSpace64(Core::System& system, DeviceName device_name, Handle das_handle) { + R_RETURN(DetachDeviceAddressSpace(system, device_name, das_handle)); +} + +Result MapDeviceAddressSpaceByForce64(Core::System& system, Handle das_handle, + Handle process_handle, uint64_t process_address, + uint64_t size, uint64_t device_address, u32 option) { + R_RETURN(MapDeviceAddressSpaceByForce(system, das_handle, process_handle, process_address, size, + device_address, option)); +} + +Result MapDeviceAddressSpaceAligned64(Core::System& system, Handle das_handle, + Handle process_handle, uint64_t process_address, + uint64_t size, uint64_t device_address, u32 option) { + R_RETURN(MapDeviceAddressSpaceAligned(system, das_handle, process_handle, process_address, size, + device_address, option)); +} + +Result UnmapDeviceAddressSpace64(Core::System& system, Handle das_handle, Handle process_handle, + uint64_t process_address, uint64_t size, uint64_t device_address) { + R_RETURN(UnmapDeviceAddressSpace(system, das_handle, process_handle, process_address, size, + device_address)); +} + +Result CreateDeviceAddressSpace64From32(Core::System& system, Handle* out_handle, + uint64_t das_address, uint64_t das_size) { + R_RETURN(CreateDeviceAddressSpace(system, out_handle, das_address, das_size)); +} + +Result AttachDeviceAddressSpace64From32(Core::System& system, DeviceName device_name, + Handle das_handle) { + R_RETURN(AttachDeviceAddressSpace(system, device_name, das_handle)); +} + +Result DetachDeviceAddressSpace64From32(Core::System& system, DeviceName device_name, + Handle das_handle) { + R_RETURN(DetachDeviceAddressSpace(system, device_name, das_handle)); +} + +Result MapDeviceAddressSpaceByForce64From32(Core::System& system, Handle das_handle, + Handle process_handle, uint64_t process_address, + uint32_t size, uint64_t device_address, u32 option) { + R_RETURN(MapDeviceAddressSpaceByForce(system, das_handle, process_handle, process_address, size, + device_address, option)); +} + +Result MapDeviceAddressSpaceAligned64From32(Core::System& system, Handle das_handle, + Handle process_handle, uint64_t process_address, + uint32_t size, uint64_t device_address, u32 option) { + R_RETURN(MapDeviceAddressSpaceAligned(system, das_handle, process_handle, process_address, size, + device_address, option)); +} + +Result UnmapDeviceAddressSpace64From32(Core::System& system, Handle das_handle, + Handle process_handle, uint64_t process_address, + uint32_t size, uint64_t device_address) { + R_RETURN(UnmapDeviceAddressSpace(system, das_handle, process_handle, process_address, size, + device_address)); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_event.cpp b/src/core/hle/kernel/svc/svc_event.cpp index 885f02f50..e8fb9efbc 100644 --- a/src/core/hle/kernel/svc/svc_event.cpp +++ b/src/core/hle/kernel/svc/svc_event.cpp @@ -24,10 +24,6 @@ Result SignalEvent(Core::System& system, Handle event_handle) { return event->Signal(); } -Result SignalEvent32(Core::System& system, Handle event_handle) { - return SignalEvent(system, event_handle); -} - Result ClearEvent(Core::System& system, Handle event_handle) { LOG_TRACE(Kernel_SVC, "called, event_handle=0x{:08X}", event_handle); @@ -55,10 +51,6 @@ Result ClearEvent(Core::System& system, Handle event_handle) { return ResultInvalidHandle; } -Result ClearEvent32(Core::System& system, Handle event_handle) { - return ClearEvent(system, event_handle); -} - Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_read) { LOG_DEBUG(Kernel_SVC, "called"); @@ -104,8 +96,29 @@ Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_read) { return ResultSuccess; } -Result CreateEvent32(Core::System& system, Handle* out_write, Handle* out_read) { - return CreateEvent(system, out_write, out_read); +Result SignalEvent64(Core::System& system, Handle event_handle) { + R_RETURN(SignalEvent(system, event_handle)); +} + +Result ClearEvent64(Core::System& system, Handle event_handle) { + R_RETURN(ClearEvent(system, event_handle)); +} + +Result CreateEvent64(Core::System& system, Handle* out_write_handle, Handle* out_read_handle) { + R_RETURN(CreateEvent(system, out_write_handle, out_read_handle)); +} + +Result SignalEvent64From32(Core::System& system, Handle event_handle) { + R_RETURN(SignalEvent(system, event_handle)); +} + +Result ClearEvent64From32(Core::System& system, Handle event_handle) { + R_RETURN(ClearEvent(system, event_handle)); +} + +Result CreateEvent64From32(Core::System& system, Handle* out_write_handle, + Handle* out_read_handle) { + R_RETURN(CreateEvent(system, out_write_handle, out_read_handle)); } } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_exception.cpp b/src/core/hle/kernel/svc/svc_exception.cpp index fb9f133c1..c2782908d 100644 --- a/src/core/hle/kernel/svc/svc_exception.cpp +++ b/src/core/hle/kernel/svc/svc_exception.cpp @@ -12,10 +12,10 @@ namespace Kernel::Svc { /// Break program execution -void Break(Core::System& system, u32 reason, u64 info1, u64 info2) { +void Break(Core::System& system, BreakReason reason, u64 info1, u64 info2) { BreakReason break_reason = - static_cast(reason & ~static_cast(BreakReason::NotificationOnlyFlag)); - bool notification_only = (reason & static_cast(BreakReason::NotificationOnlyFlag)) != 0; + reason & static_cast(~BreakReason::NotificationOnlyFlag); + bool notification_only = True(reason & BreakReason::NotificationOnlyFlag); bool has_dumped_buffer{}; std::vector debug_buffer; @@ -90,9 +90,9 @@ void Break(Core::System& system, u32 reason, u64 info1, u64 info2) { break; } - system.GetReporter().SaveSvcBreakReport(reason, notification_only, info1, info2, - has_dumped_buffer ? std::make_optional(debug_buffer) - : std::nullopt); + system.GetReporter().SaveSvcBreakReport( + static_cast(reason), notification_only, info1, info2, + has_dumped_buffer ? std::make_optional(debug_buffer) : std::nullopt); if (!notification_only) { LOG_CRITICAL( @@ -114,8 +114,24 @@ void Break(Core::System& system, u32 reason, u64 info1, u64 info2) { } } -void Break32(Core::System& system, u32 reason, u32 info1, u32 info2) { - Break(system, reason, info1, info2); +void ReturnFromException(Core::System& system, Result result) { + UNIMPLEMENTED(); +} + +void Break64(Core::System& system, BreakReason break_reason, uint64_t arg, uint64_t size) { + Break(system, break_reason, arg, size); +} + +void Break64From32(Core::System& system, BreakReason break_reason, uint32_t arg, uint32_t size) { + Break(system, break_reason, arg, size); +} + +void ReturnFromException64(Core::System& system, Result result) { + ReturnFromException(system, result); +} + +void ReturnFromException64From32(Core::System& system, Result result) { + ReturnFromException(system, result); } } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_info.cpp b/src/core/hle/kernel/svc/svc_info.cpp index df5dd85a4..75097c7f9 100644 --- a/src/core/hle/kernel/svc/svc_info.cpp +++ b/src/core/hle/kernel/svc/svc_info.cpp @@ -10,11 +10,12 @@ namespace Kernel::Svc { /// Gets system/memory information for the current process -Result GetInfo(Core::System& system, u64* result, u64 info_id, Handle handle, u64 info_sub_id) { +Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle handle, + u64 info_sub_id) { LOG_TRACE(Kernel_SVC, "called info_id=0x{:X}, info_sub_id=0x{:X}, handle=0x{:08X}", info_id, info_sub_id, handle); - const auto info_id_type = static_cast(info_id); + u32 info_id = static_cast(info_id_type); switch (info_id_type) { case InfoType::CoreMask: @@ -267,16 +268,30 @@ Result GetInfo(Core::System& system, u64* result, u64 info_id, Handle handle, u6 } } -Result GetInfo32(Core::System& system, u32* result_low, u32* result_high, u32 sub_id_low, - u32 info_id, u32 handle, u32 sub_id_high) { - const u64 sub_id{u64{sub_id_low} | (u64{sub_id_high} << 32)}; - u64 res_value{}; +Result GetSystemInfo(Core::System& system, uint64_t* out, SystemInfoType info_type, Handle handle, + uint64_t info_subtype) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} - const Result result{GetInfo(system, &res_value, info_id, handle, sub_id)}; - *result_high = static_cast(res_value >> 32); - *result_low = static_cast(res_value & std::numeric_limits::max()); +Result GetInfo64(Core::System& system, uint64_t* out, InfoType info_type, Handle handle, + uint64_t info_subtype) { + R_RETURN(GetInfo(system, out, info_type, handle, info_subtype)); +} - return result; +Result GetSystemInfo64(Core::System& system, uint64_t* out, SystemInfoType info_type, Handle handle, + uint64_t info_subtype) { + R_RETURN(GetSystemInfo(system, out, info_type, handle, info_subtype)); +} + +Result GetInfo64From32(Core::System& system, uint64_t* out, InfoType info_type, Handle handle, + uint64_t info_subtype) { + R_RETURN(GetInfo(system, out, info_type, handle, info_subtype)); +} + +Result GetSystemInfo64From32(Core::System& system, uint64_t* out, SystemInfoType info_type, + Handle handle, uint64_t info_subtype) { + R_RETURN(GetSystemInfo(system, out, info_type, handle, info_subtype)); } } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_insecure_memory.cpp b/src/core/hle/kernel/svc/svc_insecure_memory.cpp new file mode 100644 index 000000000..79882685d --- /dev/null +++ b/src/core/hle/kernel/svc/svc_insecure_memory.cpp @@ -0,0 +1,35 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/hle/kernel/svc.h" +#include "core/hle/kernel/svc_results.h" + +namespace Kernel::Svc { + +Result MapInsecureMemory(Core::System& system, uintptr_t address, size_t size) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result UnmapInsecureMemory(Core::System& system, uintptr_t address, size_t size) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result MapInsecureMemory64(Core::System& system, uint64_t address, uint64_t size) { + R_RETURN(MapInsecureMemory(system, address, size)); +} + +Result UnmapInsecureMemory64(Core::System& system, uint64_t address, uint64_t size) { + R_RETURN(UnmapInsecureMemory(system, address, size)); +} + +Result MapInsecureMemory64From32(Core::System& system, uint32_t address, uint32_t size) { + R_RETURN(MapInsecureMemory(system, address, size)); +} + +Result UnmapInsecureMemory64From32(Core::System& system, uint32_t address, uint32_t size) { + R_RETURN(UnmapInsecureMemory(system, address, size)); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_interrupt_event.cpp b/src/core/hle/kernel/svc/svc_interrupt_event.cpp index 299e22ae6..768b30a1f 100644 --- a/src/core/hle/kernel/svc/svc_interrupt_event.cpp +++ b/src/core/hle/kernel/svc/svc_interrupt_event.cpp @@ -2,5 +2,24 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/hle/kernel/svc.h" +#include "core/hle/kernel/svc_results.h" -namespace Kernel::Svc {} // namespace Kernel::Svc +namespace Kernel::Svc { + +Result CreateInterruptEvent(Core::System& system, Handle* out, int32_t interrupt_id, + InterruptType type) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result CreateInterruptEvent64(Core::System& system, Handle* out_read_handle, int32_t interrupt_id, + InterruptType interrupt_type) { + R_RETURN(CreateInterruptEvent(system, out_read_handle, interrupt_id, interrupt_type)); +} + +Result CreateInterruptEvent64From32(Core::System& system, Handle* out_read_handle, + int32_t interrupt_id, InterruptType interrupt_type) { + R_RETURN(CreateInterruptEvent(system, out_read_handle, interrupt_id, interrupt_type)); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_io_pool.cpp b/src/core/hle/kernel/svc/svc_io_pool.cpp index 299e22ae6..33f3d69bf 100644 --- a/src/core/hle/kernel/svc/svc_io_pool.cpp +++ b/src/core/hle/kernel/svc/svc_io_pool.cpp @@ -2,5 +2,70 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/hle/kernel/svc.h" +#include "core/hle/kernel/svc_results.h" -namespace Kernel::Svc {} // namespace Kernel::Svc +namespace Kernel::Svc { + +Result CreateIoPool(Core::System& system, Handle* out, IoPoolType pool_type) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result CreateIoRegion(Core::System& system, Handle* out, Handle io_pool_handle, uint64_t phys_addr, + size_t size, MemoryMapping mapping, MemoryPermission perm) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result MapIoRegion(Core::System& system, Handle io_region_handle, uintptr_t address, size_t size, + MemoryPermission map_perm) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result UnmapIoRegion(Core::System& system, Handle io_region_handle, uintptr_t address, + size_t size) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result CreateIoPool64(Core::System& system, Handle* out_handle, IoPoolType pool_type) { + R_RETURN(CreateIoPool(system, out_handle, pool_type)); +} + +Result CreateIoRegion64(Core::System& system, Handle* out_handle, Handle io_pool, + uint64_t physical_address, uint64_t size, MemoryMapping mapping, + MemoryPermission perm) { + R_RETURN(CreateIoRegion(system, out_handle, io_pool, physical_address, size, mapping, perm)); +} + +Result MapIoRegion64(Core::System& system, Handle io_region, uint64_t address, uint64_t size, + MemoryPermission perm) { + R_RETURN(MapIoRegion(system, io_region, address, size, perm)); +} + +Result UnmapIoRegion64(Core::System& system, Handle io_region, uint64_t address, uint64_t size) { + R_RETURN(UnmapIoRegion(system, io_region, address, size)); +} + +Result CreateIoPool64From32(Core::System& system, Handle* out_handle, IoPoolType pool_type) { + R_RETURN(CreateIoPool(system, out_handle, pool_type)); +} + +Result CreateIoRegion64From32(Core::System& system, Handle* out_handle, Handle io_pool, + uint64_t physical_address, uint32_t size, MemoryMapping mapping, + MemoryPermission perm) { + R_RETURN(CreateIoRegion(system, out_handle, io_pool, physical_address, size, mapping, perm)); +} + +Result MapIoRegion64From32(Core::System& system, Handle io_region, uint32_t address, uint32_t size, + MemoryPermission perm) { + R_RETURN(MapIoRegion(system, io_region, address, size, perm)); +} + +Result UnmapIoRegion64From32(Core::System& system, Handle io_region, uint32_t address, + uint32_t size) { + R_RETURN(UnmapIoRegion(system, io_region, address, size)); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_ipc.cpp b/src/core/hle/kernel/svc/svc_ipc.cpp index dbb68e89a..97ce49dde 100644 --- a/src/core/hle/kernel/svc/svc_ipc.cpp +++ b/src/core/hle/kernel/svc/svc_ipc.cpp @@ -24,20 +24,37 @@ Result SendSyncRequest(Core::System& system, Handle handle) { return session->SendSyncRequest(); } -Result SendSyncRequest32(Core::System& system, Handle handle) { - return SendSyncRequest(system, handle); +Result SendSyncRequestWithUserBuffer(Core::System& system, uint64_t message_buffer, + uint64_t message_buffer_size, Handle session_handle) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); } -Result ReplyAndReceive(Core::System& system, s32* out_index, Handle* handles, s32 num_handles, +Result SendAsyncRequestWithUserBuffer(Core::System& system, Handle* out_event_handle, + uint64_t message_buffer, uint64_t message_buffer_size, + Handle session_handle) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result ReplyAndReceive(Core::System& system, s32* out_index, uint64_t handles_addr, s32 num_handles, Handle reply_target, s64 timeout_ns) { auto& kernel = system.Kernel(); auto& handle_table = GetCurrentThread(kernel).GetOwnerProcess()->GetHandleTable(); + R_UNLESS(0 <= num_handles && num_handles <= ArgumentHandleCountMax, ResultOutOfRange); + R_UNLESS(system.Memory().IsValidVirtualAddressRange( + handles_addr, static_cast(sizeof(Handle) * num_handles)), + ResultInvalidPointer); + + std::vector handles(num_handles); + system.Memory().ReadBlock(handles_addr, handles.data(), sizeof(Handle) * num_handles); + // Convert handle list to object table. std::vector objs(num_handles); - R_UNLESS( - handle_table.GetMultipleObjects(objs.data(), handles, num_handles), - ResultInvalidHandle); + R_UNLESS(handle_table.GetMultipleObjects(objs.data(), handles.data(), + num_handles), + ResultInvalidHandle); // Ensure handles are closed when we're done. SCOPE_EXIT({ @@ -86,4 +103,72 @@ Result ReplyAndReceive(Core::System& system, s32* out_index, Handle* handles, s3 } } +Result ReplyAndReceiveWithUserBuffer(Core::System& system, int32_t* out_index, + uint64_t message_buffer, uint64_t message_buffer_size, + uint64_t handles, int32_t num_handles, Handle reply_target, + int64_t timeout_ns) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result SendSyncRequest64(Core::System& system, Handle session_handle) { + R_RETURN(SendSyncRequest(system, session_handle)); +} + +Result SendSyncRequestWithUserBuffer64(Core::System& system, uint64_t message_buffer, + uint64_t message_buffer_size, Handle session_handle) { + R_RETURN( + SendSyncRequestWithUserBuffer(system, message_buffer, message_buffer_size, session_handle)); +} + +Result SendAsyncRequestWithUserBuffer64(Core::System& system, Handle* out_event_handle, + uint64_t message_buffer, uint64_t message_buffer_size, + Handle session_handle) { + R_RETURN(SendAsyncRequestWithUserBuffer(system, out_event_handle, message_buffer, + message_buffer_size, session_handle)); +} + +Result ReplyAndReceive64(Core::System& system, int32_t* out_index, uint64_t handles, + int32_t num_handles, Handle reply_target, int64_t timeout_ns) { + R_RETURN(ReplyAndReceive(system, out_index, handles, num_handles, reply_target, timeout_ns)); +} + +Result ReplyAndReceiveWithUserBuffer64(Core::System& system, int32_t* out_index, + uint64_t message_buffer, uint64_t message_buffer_size, + uint64_t handles, int32_t num_handles, Handle reply_target, + int64_t timeout_ns) { + R_RETURN(ReplyAndReceiveWithUserBuffer(system, out_index, message_buffer, message_buffer_size, + handles, num_handles, reply_target, timeout_ns)); +} + +Result SendSyncRequest64From32(Core::System& system, Handle session_handle) { + R_RETURN(SendSyncRequest(system, session_handle)); +} + +Result SendSyncRequestWithUserBuffer64From32(Core::System& system, uint32_t message_buffer, + uint32_t message_buffer_size, Handle session_handle) { + R_RETURN( + SendSyncRequestWithUserBuffer(system, message_buffer, message_buffer_size, session_handle)); +} + +Result SendAsyncRequestWithUserBuffer64From32(Core::System& system, Handle* out_event_handle, + uint32_t message_buffer, uint32_t message_buffer_size, + Handle session_handle) { + R_RETURN(SendAsyncRequestWithUserBuffer(system, out_event_handle, message_buffer, + message_buffer_size, session_handle)); +} + +Result ReplyAndReceive64From32(Core::System& system, int32_t* out_index, uint32_t handles, + int32_t num_handles, Handle reply_target, int64_t timeout_ns) { + R_RETURN(ReplyAndReceive(system, out_index, handles, num_handles, reply_target, timeout_ns)); +} + +Result ReplyAndReceiveWithUserBuffer64From32(Core::System& system, int32_t* out_index, + uint32_t message_buffer, uint32_t message_buffer_size, + uint32_t handles, int32_t num_handles, + Handle reply_target, int64_t timeout_ns) { + R_RETURN(ReplyAndReceiveWithUserBuffer(system, out_index, message_buffer, message_buffer_size, + handles, num_handles, reply_target, timeout_ns)); +} + } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_kernel_debug.cpp b/src/core/hle/kernel/svc/svc_kernel_debug.cpp index 454255e7a..cee048279 100644 --- a/src/core/hle/kernel/svc/svc_kernel_debug.cpp +++ b/src/core/hle/kernel/svc/svc_kernel_debug.cpp @@ -5,15 +5,31 @@ namespace Kernel::Svc { -void KernelDebug([[maybe_unused]] Core::System& system, [[maybe_unused]] u32 kernel_debug_type, - [[maybe_unused]] u64 param1, [[maybe_unused]] u64 param2, - [[maybe_unused]] u64 param3) { +void KernelDebug(Core::System& system, KernelDebugType kernel_debug_type, u64 arg0, u64 arg1, + u64 arg2) { // Intentionally do nothing, as this does nothing in released kernel binaries. } -void ChangeKernelTraceState([[maybe_unused]] Core::System& system, - [[maybe_unused]] u32 trace_state) { +void ChangeKernelTraceState(Core::System& system, KernelTraceState trace_state) { // Intentionally do nothing, as this does nothing in released kernel binaries. } +void KernelDebug64(Core::System& system, KernelDebugType kern_debug_type, uint64_t arg0, + uint64_t arg1, uint64_t arg2) { + KernelDebug(system, kern_debug_type, arg0, arg1, arg2); +} + +void ChangeKernelTraceState64(Core::System& system, KernelTraceState kern_trace_state) { + ChangeKernelTraceState(system, kern_trace_state); +} + +void KernelDebug64From32(Core::System& system, KernelDebugType kern_debug_type, uint64_t arg0, + uint64_t arg1, uint64_t arg2) { + KernelDebug(system, kern_debug_type, arg0, arg1, arg2); +} + +void ChangeKernelTraceState64From32(Core::System& system, KernelTraceState kern_trace_state) { + ChangeKernelTraceState(system, kern_trace_state); +} + } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_light_ipc.cpp b/src/core/hle/kernel/svc/svc_light_ipc.cpp index 299e22ae6..b76ce984c 100644 --- a/src/core/hle/kernel/svc/svc_light_ipc.cpp +++ b/src/core/hle/kernel/svc/svc_light_ipc.cpp @@ -1,6 +1,73 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "core/arm/arm_interface.h" +#include "core/core.h" #include "core/hle/kernel/svc.h" +#include "core/hle/kernel/svc_results.h" -namespace Kernel::Svc {} // namespace Kernel::Svc +namespace Kernel::Svc { + +Result SendSyncRequestLight(Core::System& system, Handle session_handle, u32* args) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result ReplyAndReceiveLight(Core::System& system, Handle session_handle, u32* args) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result SendSyncRequestLight64(Core::System& system, Handle session_handle, u32* args) { + R_RETURN(SendSyncRequestLight(system, session_handle, args)); +} + +Result ReplyAndReceiveLight64(Core::System& system, Handle session_handle, u32* args) { + R_RETURN(ReplyAndReceiveLight(system, session_handle, args)); +} + +Result SendSyncRequestLight64From32(Core::System& system, Handle session_handle, u32* args) { + R_RETURN(SendSyncRequestLight(system, session_handle, args)); +} + +Result ReplyAndReceiveLight64From32(Core::System& system, Handle session_handle, u32* args) { + R_RETURN(ReplyAndReceiveLight(system, session_handle, args)); +} + +// Custom ABI implementation for light IPC. + +template +static void SvcWrap_LightIpc(Core::System& system, F&& cb) { + auto& core = system.CurrentArmInterface(); + std::array arguments{}; + + Handle session_handle = static_cast(core.GetReg(0)); + for (int i = 0; i < 7; i++) { + arguments[i] = static_cast(core.GetReg(i + 1)); + } + + Result ret = cb(system, session_handle, arguments.data()); + + core.SetReg(0, ret.raw); + for (int i = 0; i < 7; i++) { + core.SetReg(i + 1, arguments[i]); + } +} + +void SvcWrap_SendSyncRequestLight64(Core::System& system) { + SvcWrap_LightIpc(system, SendSyncRequestLight64); +} + +void SvcWrap_ReplyAndReceiveLight64(Core::System& system) { + SvcWrap_LightIpc(system, ReplyAndReceiveLight64); +} + +void SvcWrap_SendSyncRequestLight64From32(Core::System& system) { + SvcWrap_LightIpc(system, SendSyncRequestLight64From32); +} + +void SvcWrap_ReplyAndReceiveLight64From32(Core::System& system) { + SvcWrap_LightIpc(system, ReplyAndReceiveLight64From32); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_lock.cpp b/src/core/hle/kernel/svc/svc_lock.cpp index 45f2a6553..7005ac30b 100644 --- a/src/core/hle/kernel/svc/svc_lock.cpp +++ b/src/core/hle/kernel/svc/svc_lock.cpp @@ -27,10 +27,6 @@ Result ArbitrateLock(Core::System& system, Handle thread_handle, VAddr address, return system.Kernel().CurrentProcess()->WaitForAddress(thread_handle, address, tag); } -Result ArbitrateLock32(Core::System& system, Handle thread_handle, u32 address, u32 tag) { - return ArbitrateLock(system, thread_handle, address, tag); -} - /// Unlock a mutex Result ArbitrateUnlock(Core::System& system, VAddr address) { LOG_TRACE(Kernel_SVC, "called address=0x{:X}", address); @@ -50,8 +46,21 @@ Result ArbitrateUnlock(Core::System& system, VAddr address) { return system.Kernel().CurrentProcess()->SignalToAddress(address); } -Result ArbitrateUnlock32(Core::System& system, u32 address) { - return ArbitrateUnlock(system, address); +Result ArbitrateLock64(Core::System& system, Handle thread_handle, uint64_t address, uint32_t tag) { + R_RETURN(ArbitrateLock(system, thread_handle, address, tag)); +} + +Result ArbitrateUnlock64(Core::System& system, uint64_t address) { + R_RETURN(ArbitrateUnlock(system, address)); +} + +Result ArbitrateLock64From32(Core::System& system, Handle thread_handle, uint32_t address, + uint32_t tag) { + R_RETURN(ArbitrateLock(system, thread_handle, address, tag)); +} + +Result ArbitrateUnlock64From32(Core::System& system, uint32_t address) { + R_RETURN(ArbitrateUnlock(system, address)); } } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_memory.cpp b/src/core/hle/kernel/svc/svc_memory.cpp index f78b1239b..21f818da6 100644 --- a/src/core/hle/kernel/svc/svc_memory.cpp +++ b/src/core/hle/kernel/svc/svc_memory.cpp @@ -144,10 +144,6 @@ Result SetMemoryAttribute(Core::System& system, VAddr address, u64 size, u32 mas return page_table.SetMemoryAttribute(address, size, mask, attr); } -Result SetMemoryAttribute32(Core::System& system, u32 address, u32 size, u32 mask, u32 attr) { - return SetMemoryAttribute(system, address, size, mask, attr); -} - /// Maps a memory range into a different range. Result MapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size) { LOG_TRACE(Kernel_SVC, "called, dst_addr=0x{:X}, src_addr=0x{:X}, size=0x{:X}", dst_addr, @@ -163,10 +159,6 @@ Result MapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size) return page_table.MapMemory(dst_addr, src_addr, size); } -Result MapMemory32(Core::System& system, u32 dst_addr, u32 src_addr, u32 size) { - return MapMemory(system, dst_addr, src_addr, size); -} - /// Unmaps a region that was previously mapped with svcMapMemory Result UnmapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size) { LOG_TRACE(Kernel_SVC, "called, dst_addr=0x{:X}, src_addr=0x{:X}, size=0x{:X}", dst_addr, @@ -182,8 +174,44 @@ Result UnmapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 siz return page_table.UnmapMemory(dst_addr, src_addr, size); } -Result UnmapMemory32(Core::System& system, u32 dst_addr, u32 src_addr, u32 size) { - return UnmapMemory(system, dst_addr, src_addr, size); +Result SetMemoryPermission64(Core::System& system, uint64_t address, uint64_t size, + MemoryPermission perm) { + R_RETURN(SetMemoryPermission(system, address, size, perm)); +} + +Result SetMemoryAttribute64(Core::System& system, uint64_t address, uint64_t size, uint32_t mask, + uint32_t attr) { + R_RETURN(SetMemoryAttribute(system, address, size, mask, attr)); +} + +Result MapMemory64(Core::System& system, uint64_t dst_address, uint64_t src_address, + uint64_t size) { + R_RETURN(MapMemory(system, dst_address, src_address, size)); +} + +Result UnmapMemory64(Core::System& system, uint64_t dst_address, uint64_t src_address, + uint64_t size) { + R_RETURN(UnmapMemory(system, dst_address, src_address, size)); +} + +Result SetMemoryPermission64From32(Core::System& system, uint32_t address, uint32_t size, + MemoryPermission perm) { + R_RETURN(SetMemoryPermission(system, address, size, perm)); +} + +Result SetMemoryAttribute64From32(Core::System& system, uint32_t address, uint32_t size, + uint32_t mask, uint32_t attr) { + R_RETURN(SetMemoryAttribute(system, address, size, mask, attr)); +} + +Result MapMemory64From32(Core::System& system, uint32_t dst_address, uint32_t src_address, + uint32_t size) { + R_RETURN(MapMemory(system, dst_address, src_address, size)); +} + +Result UnmapMemory64From32(Core::System& system, uint32_t dst_address, uint32_t src_address, + uint32_t size) { + R_RETURN(UnmapMemory(system, dst_address, src_address, size)); } } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_physical_memory.cpp b/src/core/hle/kernel/svc/svc_physical_memory.cpp index 0fc262203..8d00e1fc3 100644 --- a/src/core/hle/kernel/svc/svc_physical_memory.cpp +++ b/src/core/hle/kernel/svc/svc_physical_memory.cpp @@ -21,13 +21,6 @@ Result SetHeapSize(Core::System& system, VAddr* out_address, u64 size) { return ResultSuccess; } -Result SetHeapSize32(Core::System& system, u32* heap_addr, u32 heap_size) { - VAddr temp_heap_addr{}; - const Result result{SetHeapSize(system, &temp_heap_addr, heap_size)}; - *heap_addr = static_cast(temp_heap_addr); - return result; -} - /// Maps memory at a desired address Result MapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { LOG_DEBUG(Kernel_SVC, "called, addr=0x{:016X}, size=0x{:X}", addr, size); @@ -77,10 +70,6 @@ Result MapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { return page_table.MapPhysicalMemory(addr, size); } -Result MapPhysicalMemory32(Core::System& system, u32 addr, u32 size) { - return MapPhysicalMemory(system, addr, size); -} - /// Unmaps memory previously mapped via MapPhysicalMemory Result UnmapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { LOG_DEBUG(Kernel_SVC, "called, addr=0x{:016X}, size=0x{:X}", addr, size); @@ -130,8 +119,67 @@ Result UnmapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { return page_table.UnmapPhysicalMemory(addr, size); } -Result UnmapPhysicalMemory32(Core::System& system, u32 addr, u32 size) { - return UnmapPhysicalMemory(system, addr, size); +Result MapPhysicalMemoryUnsafe(Core::System& system, uint64_t address, uint64_t size) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result UnmapPhysicalMemoryUnsafe(Core::System& system, uint64_t address, uint64_t size) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result SetUnsafeLimit(Core::System& system, uint64_t limit) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result SetHeapSize64(Core::System& system, uint64_t* out_address, uint64_t size) { + R_RETURN(SetHeapSize(system, out_address, size)); +} + +Result MapPhysicalMemory64(Core::System& system, uint64_t address, uint64_t size) { + R_RETURN(MapPhysicalMemory(system, address, size)); +} + +Result UnmapPhysicalMemory64(Core::System& system, uint64_t address, uint64_t size) { + R_RETURN(UnmapPhysicalMemory(system, address, size)); +} + +Result MapPhysicalMemoryUnsafe64(Core::System& system, uint64_t address, uint64_t size) { + R_RETURN(MapPhysicalMemoryUnsafe(system, address, size)); +} + +Result UnmapPhysicalMemoryUnsafe64(Core::System& system, uint64_t address, uint64_t size) { + R_RETURN(UnmapPhysicalMemoryUnsafe(system, address, size)); +} + +Result SetUnsafeLimit64(Core::System& system, uint64_t limit) { + R_RETURN(SetUnsafeLimit(system, limit)); +} + +Result SetHeapSize64From32(Core::System& system, uintptr_t* out_address, uint32_t size) { + R_RETURN(SetHeapSize(system, out_address, size)); +} + +Result MapPhysicalMemory64From32(Core::System& system, uint32_t address, uint32_t size) { + R_RETURN(MapPhysicalMemory(system, address, size)); +} + +Result UnmapPhysicalMemory64From32(Core::System& system, uint32_t address, uint32_t size) { + R_RETURN(UnmapPhysicalMemory(system, address, size)); +} + +Result MapPhysicalMemoryUnsafe64From32(Core::System& system, uint32_t address, uint32_t size) { + R_RETURN(MapPhysicalMemoryUnsafe(system, address, size)); +} + +Result UnmapPhysicalMemoryUnsafe64From32(Core::System& system, uint32_t address, uint32_t size) { + R_RETURN(UnmapPhysicalMemoryUnsafe(system, address, size)); +} + +Result SetUnsafeLimit64From32(Core::System& system, uint32_t limit) { + R_RETURN(SetUnsafeLimit(system, limit)); } } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_port.cpp b/src/core/hle/kernel/svc/svc_port.cpp index cdfe0dd16..2e5d228bb 100644 --- a/src/core/hle/kernel/svc/svc_port.cpp +++ b/src/core/hle/kernel/svc/svc_port.cpp @@ -63,9 +63,60 @@ Result ConnectToNamedPort(Core::System& system, Handle* out, VAddr port_name_add return ResultSuccess; } -Result ConnectToNamedPort32(Core::System& system, Handle* out_handle, u32 port_name_address) { +Result CreatePort(Core::System& system, Handle* out_server, Handle* out_client, + int32_t max_sessions, bool is_light, uintptr_t name) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} - return ConnectToNamedPort(system, out_handle, port_name_address); +Result ConnectToPort(Core::System& system, Handle* out_handle, Handle port) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result ManageNamedPort(Core::System& system, Handle* out_server_handle, uint64_t name, + int32_t max_sessions) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result ConnectToNamedPort64(Core::System& system, Handle* out_handle, uint64_t name) { + R_RETURN(ConnectToNamedPort(system, out_handle, name)); +} + +Result CreatePort64(Core::System& system, Handle* out_server_handle, Handle* out_client_handle, + int32_t max_sessions, bool is_light, uint64_t name) { + R_RETURN( + CreatePort(system, out_server_handle, out_client_handle, max_sessions, is_light, name)); +} + +Result ManageNamedPort64(Core::System& system, Handle* out_server_handle, uint64_t name, + int32_t max_sessions) { + R_RETURN(ManageNamedPort(system, out_server_handle, name, max_sessions)); +} + +Result ConnectToPort64(Core::System& system, Handle* out_handle, Handle port) { + R_RETURN(ConnectToPort(system, out_handle, port)); +} + +Result ConnectToNamedPort64From32(Core::System& system, Handle* out_handle, uint32_t name) { + R_RETURN(ConnectToNamedPort(system, out_handle, name)); +} + +Result CreatePort64From32(Core::System& system, Handle* out_server_handle, + Handle* out_client_handle, int32_t max_sessions, bool is_light, + uint32_t name) { + R_RETURN( + CreatePort(system, out_server_handle, out_client_handle, max_sessions, is_light, name)); +} + +Result ManageNamedPort64From32(Core::System& system, Handle* out_server_handle, uint32_t name, + int32_t max_sessions) { + R_RETURN(ManageNamedPort(system, out_server_handle, name, max_sessions)); +} + +Result ConnectToPort64From32(Core::System& system, Handle* out_handle, Handle port) { + R_RETURN(ConnectToPort(system, out_handle, port)); } } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_power_management.cpp b/src/core/hle/kernel/svc/svc_power_management.cpp index 299e22ae6..f605a0317 100644 --- a/src/core/hle/kernel/svc/svc_power_management.cpp +++ b/src/core/hle/kernel/svc/svc_power_management.cpp @@ -2,5 +2,20 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/hle/kernel/svc.h" +#include "core/hle/kernel/svc_results.h" -namespace Kernel::Svc {} // namespace Kernel::Svc +namespace Kernel::Svc { + +void SleepSystem(Core::System& system) { + UNIMPLEMENTED(); +} + +void SleepSystem64(Core::System& system) { + return SleepSystem(system); +} + +void SleepSystem64From32(Core::System& system) { + return SleepSystem(system); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_process.cpp b/src/core/hle/kernel/svc/svc_process.cpp index d6c8b4561..d2c20aad2 100644 --- a/src/core/hle/kernel/svc/svc_process.cpp +++ b/src/core/hle/kernel/svc/svc_process.cpp @@ -18,10 +18,6 @@ void ExitProcess(Core::System& system) { system.Exit(); } -void ExitProcess32(Core::System& system) { - ExitProcess(system); -} - /// Gets the ID of the specified process or a specified thread's owning process. Result GetProcessId(Core::System& system, u64* out_process_id, Handle handle) { LOG_DEBUG(Kernel_SVC, "called handle=0x{:08X}", handle); @@ -54,17 +50,8 @@ Result GetProcessId(Core::System& system, u64* out_process_id, Handle handle) { return ResultSuccess; } -Result GetProcessId32(Core::System& system, u32* out_process_id_low, u32* out_process_id_high, - Handle handle) { - u64 out_process_id{}; - const auto result = GetProcessId(system, &out_process_id, handle); - *out_process_id_low = static_cast(out_process_id); - *out_process_id_high = static_cast(out_process_id >> 32); - return result; -} - -Result GetProcessList(Core::System& system, u32* out_num_processes, VAddr out_process_ids, - u32 out_process_ids_size) { +Result GetProcessList(Core::System& system, s32* out_num_processes, VAddr out_process_ids, + int32_t out_process_ids_size) { LOG_DEBUG(Kernel_SVC, "called. out_process_ids=0x{:016X}, out_process_ids_size={}", out_process_ids, out_process_ids_size); @@ -89,7 +76,8 @@ Result GetProcessList(Core::System& system, u32* out_num_processes, VAddr out_pr auto& memory = system.Memory(); const auto& process_list = kernel.GetProcessList(); const auto num_processes = process_list.size(); - const auto copy_amount = std::min(std::size_t{out_process_ids_size}, num_processes); + const auto copy_amount = + std::min(static_cast(out_process_ids_size), num_processes); for (std::size_t i = 0; i < copy_amount; ++i) { memory.Write64(out_process_ids, process_list[i]->GetProcessID()); @@ -100,8 +88,9 @@ Result GetProcessList(Core::System& system, u32* out_num_processes, VAddr out_pr return ResultSuccess; } -Result GetProcessInfo(Core::System& system, u64* out, Handle process_handle, u32 type) { - LOG_DEBUG(Kernel_SVC, "called, handle=0x{:08X}, type=0x{:X}", process_handle, type); +Result GetProcessInfo(Core::System& system, s64* out, Handle process_handle, + ProcessInfoType info_type) { + LOG_DEBUG(Kernel_SVC, "called, handle=0x{:08X}, type=0x{:X}", process_handle, info_type); const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); KScopedAutoObject process = handle_table.GetObject(process_handle); @@ -111,14 +100,95 @@ Result GetProcessInfo(Core::System& system, u64* out, Handle process_handle, u32 return ResultInvalidHandle; } - const auto info_type = static_cast(type); if (info_type != ProcessInfoType::ProcessState) { - LOG_ERROR(Kernel_SVC, "Expected info_type to be ProcessState but got {} instead", type); + LOG_ERROR(Kernel_SVC, "Expected info_type to be ProcessState but got {} instead", + info_type); return ResultInvalidEnumValue; } - *out = static_cast(process->GetState()); + *out = static_cast(process->GetState()); return ResultSuccess; } +Result CreateProcess(Core::System& system, Handle* out_handle, uint64_t parameters, uint64_t caps, + int32_t num_caps) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result StartProcess(Core::System& system, Handle process_handle, int32_t priority, int32_t core_id, + uint64_t main_thread_stack_size) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result TerminateProcess(Core::System& system, Handle process_handle) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +void ExitProcess64(Core::System& system) { + ExitProcess(system); +} + +Result GetProcessId64(Core::System& system, uint64_t* out_process_id, Handle process_handle) { + R_RETURN(GetProcessId(system, out_process_id, process_handle)); +} + +Result GetProcessList64(Core::System& system, int32_t* out_num_processes, uint64_t out_process_ids, + int32_t max_out_count) { + R_RETURN(GetProcessList(system, out_num_processes, out_process_ids, max_out_count)); +} + +Result CreateProcess64(Core::System& system, Handle* out_handle, uint64_t parameters, uint64_t caps, + int32_t num_caps) { + R_RETURN(CreateProcess(system, out_handle, parameters, caps, num_caps)); +} + +Result StartProcess64(Core::System& system, Handle process_handle, int32_t priority, + int32_t core_id, uint64_t main_thread_stack_size) { + R_RETURN(StartProcess(system, process_handle, priority, core_id, main_thread_stack_size)); +} + +Result TerminateProcess64(Core::System& system, Handle process_handle) { + R_RETURN(TerminateProcess(system, process_handle)); +} + +Result GetProcessInfo64(Core::System& system, int64_t* out_info, Handle process_handle, + ProcessInfoType info_type) { + R_RETURN(GetProcessInfo(system, out_info, process_handle, info_type)); +} + +void ExitProcess64From32(Core::System& system) { + ExitProcess(system); +} + +Result GetProcessId64From32(Core::System& system, uint64_t* out_process_id, Handle process_handle) { + R_RETURN(GetProcessId(system, out_process_id, process_handle)); +} + +Result GetProcessList64From32(Core::System& system, int32_t* out_num_processes, + uint32_t out_process_ids, int32_t max_out_count) { + R_RETURN(GetProcessList(system, out_num_processes, out_process_ids, max_out_count)); +} + +Result CreateProcess64From32(Core::System& system, Handle* out_handle, uint32_t parameters, + uint32_t caps, int32_t num_caps) { + R_RETURN(CreateProcess(system, out_handle, parameters, caps, num_caps)); +} + +Result StartProcess64From32(Core::System& system, Handle process_handle, int32_t priority, + int32_t core_id, uint64_t main_thread_stack_size) { + R_RETURN(StartProcess(system, process_handle, priority, core_id, main_thread_stack_size)); +} + +Result TerminateProcess64From32(Core::System& system, Handle process_handle) { + R_RETURN(TerminateProcess(system, process_handle)); +} + +Result GetProcessInfo64From32(Core::System& system, int64_t* out_info, Handle process_handle, + ProcessInfoType info_type) { + R_RETURN(GetProcessInfo(system, out_info, process_handle, info_type)); +} + } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_process_memory.cpp b/src/core/hle/kernel/svc/svc_process_memory.cpp index b6ac43af2..dbe24e139 100644 --- a/src/core/hle/kernel/svc/svc_process_memory.cpp +++ b/src/core/hle/kernel/svc/svc_process_memory.cpp @@ -271,4 +271,54 @@ Result UnmapProcessCodeMemory(Core::System& system, Handle process_handle, u64 d KPageTable::ICacheInvalidationStrategy::InvalidateAll); } +Result SetProcessMemoryPermission64(Core::System& system, Handle process_handle, uint64_t address, + uint64_t size, MemoryPermission perm) { + R_RETURN(SetProcessMemoryPermission(system, process_handle, address, size, perm)); +} + +Result MapProcessMemory64(Core::System& system, uint64_t dst_address, Handle process_handle, + uint64_t src_address, uint64_t size) { + R_RETURN(MapProcessMemory(system, dst_address, process_handle, src_address, size)); +} + +Result UnmapProcessMemory64(Core::System& system, uint64_t dst_address, Handle process_handle, + uint64_t src_address, uint64_t size) { + R_RETURN(UnmapProcessMemory(system, dst_address, process_handle, src_address, size)); +} + +Result MapProcessCodeMemory64(Core::System& system, Handle process_handle, uint64_t dst_address, + uint64_t src_address, uint64_t size) { + R_RETURN(MapProcessCodeMemory(system, process_handle, dst_address, src_address, size)); +} + +Result UnmapProcessCodeMemory64(Core::System& system, Handle process_handle, uint64_t dst_address, + uint64_t src_address, uint64_t size) { + R_RETURN(UnmapProcessCodeMemory(system, process_handle, dst_address, src_address, size)); +} + +Result SetProcessMemoryPermission64From32(Core::System& system, Handle process_handle, + uint64_t address, uint64_t size, MemoryPermission perm) { + R_RETURN(SetProcessMemoryPermission(system, process_handle, address, size, perm)); +} + +Result MapProcessMemory64From32(Core::System& system, uint32_t dst_address, Handle process_handle, + uint64_t src_address, uint32_t size) { + R_RETURN(MapProcessMemory(system, dst_address, process_handle, src_address, size)); +} + +Result UnmapProcessMemory64From32(Core::System& system, uint32_t dst_address, Handle process_handle, + uint64_t src_address, uint32_t size) { + R_RETURN(UnmapProcessMemory(system, dst_address, process_handle, src_address, size)); +} + +Result MapProcessCodeMemory64From32(Core::System& system, Handle process_handle, + uint64_t dst_address, uint64_t src_address, uint64_t size) { + R_RETURN(MapProcessCodeMemory(system, process_handle, dst_address, src_address, size)); +} + +Result UnmapProcessCodeMemory64From32(Core::System& system, Handle process_handle, + uint64_t dst_address, uint64_t src_address, uint64_t size) { + R_RETURN(UnmapProcessCodeMemory(system, process_handle, dst_address, src_address, size)); +} + } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_processor.cpp b/src/core/hle/kernel/svc/svc_processor.cpp index 8561cf74f..7602ce6c0 100644 --- a/src/core/hle/kernel/svc/svc_processor.cpp +++ b/src/core/hle/kernel/svc/svc_processor.cpp @@ -9,12 +9,16 @@ namespace Kernel::Svc { /// Get which CPU core is executing the current thread -u32 GetCurrentProcessorNumber(Core::System& system) { +int32_t GetCurrentProcessorNumber(Core::System& system) { LOG_TRACE(Kernel_SVC, "called"); - return static_cast(system.CurrentPhysicalCore().CoreIndex()); + return static_cast(system.CurrentPhysicalCore().CoreIndex()); } -u32 GetCurrentProcessorNumber32(Core::System& system) { +int32_t GetCurrentProcessorNumber64(Core::System& system) { + return GetCurrentProcessorNumber(system); +} + +int32_t GetCurrentProcessorNumber64From32(Core::System& system) { return GetCurrentProcessorNumber(system); } diff --git a/src/core/hle/kernel/svc/svc_query_memory.cpp b/src/core/hle/kernel/svc/svc_query_memory.cpp index aac3b2eca..db140a341 100644 --- a/src/core/hle/kernel/svc/svc_query_memory.cpp +++ b/src/core/hle/kernel/svc/svc_query_memory.cpp @@ -7,24 +7,20 @@ namespace Kernel::Svc { -Result QueryMemory(Core::System& system, VAddr memory_info_address, VAddr page_info_address, +Result QueryMemory(Core::System& system, uint64_t out_memory_info, PageInfo* out_page_info, VAddr query_address) { LOG_TRACE(Kernel_SVC, - "called, memory_info_address=0x{:016X}, page_info_address=0x{:016X}, " + "called, out_memory_info=0x{:016X}, " "query_address=0x{:016X}", - memory_info_address, page_info_address, query_address); + out_memory_info, query_address); - return QueryProcessMemory(system, memory_info_address, page_info_address, CurrentProcess, + // Query memory is just QueryProcessMemory on the current process. + return QueryProcessMemory(system, out_memory_info, out_page_info, CurrentProcess, query_address); } -Result QueryMemory32(Core::System& system, u32 memory_info_address, u32 page_info_address, - u32 query_address) { - return QueryMemory(system, memory_info_address, page_info_address, query_address); -} - -Result QueryProcessMemory(Core::System& system, VAddr memory_info_address, VAddr page_info_address, - Handle process_handle, VAddr address) { +Result QueryProcessMemory(Core::System& system, uint64_t out_memory_info, PageInfo* out_page_info, + Handle process_handle, uint64_t address) { LOG_TRACE(Kernel_SVC, "called process=0x{:08X} address={:X}", process_handle, address); const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); KScopedAutoObject process = handle_table.GetObject(process_handle); @@ -37,19 +33,33 @@ Result QueryProcessMemory(Core::System& system, VAddr memory_info_address, VAddr auto& memory{system.Memory()}; const auto memory_info{process->PageTable().QueryInfo(address).GetSvcMemoryInfo()}; - memory.Write64(memory_info_address + 0x00, memory_info.base_address); - memory.Write64(memory_info_address + 0x08, memory_info.size); - memory.Write32(memory_info_address + 0x10, static_cast(memory_info.state) & 0xff); - memory.Write32(memory_info_address + 0x14, static_cast(memory_info.attribute)); - memory.Write32(memory_info_address + 0x18, static_cast(memory_info.permission)); - memory.Write32(memory_info_address + 0x1c, memory_info.ipc_count); - memory.Write32(memory_info_address + 0x20, memory_info.device_count); - memory.Write32(memory_info_address + 0x24, 0); + memory.WriteBlock(out_memory_info, &memory_info, sizeof(memory_info)); - // Page info appears to be currently unused by the kernel and is always set to zero. - memory.Write32(page_info_address, 0); + //! This is supposed to be part of the QueryInfo call. + *out_page_info = {}; - return ResultSuccess; + R_SUCCEED(); +} + +Result QueryMemory64(Core::System& system, uint64_t out_memory_info, PageInfo* out_page_info, + uint64_t address) { + R_RETURN(QueryMemory(system, out_memory_info, out_page_info, address)); +} + +Result QueryProcessMemory64(Core::System& system, uint64_t out_memory_info, PageInfo* out_page_info, + Handle process_handle, uint64_t address) { + R_RETURN(QueryProcessMemory(system, out_memory_info, out_page_info, process_handle, address)); +} + +Result QueryMemory64From32(Core::System& system, uint32_t out_memory_info, PageInfo* out_page_info, + uint32_t address) { + R_RETURN(QueryMemory(system, out_memory_info, out_page_info, address)); +} + +Result QueryProcessMemory64From32(Core::System& system, uint32_t out_memory_info, + PageInfo* out_page_info, Handle process_handle, + uint64_t address) { + R_RETURN(QueryProcessMemory(system, out_memory_info, out_page_info, process_handle, address)); } } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_register.cpp b/src/core/hle/kernel/svc/svc_register.cpp index 299e22ae6..b883e6618 100644 --- a/src/core/hle/kernel/svc/svc_register.cpp +++ b/src/core/hle/kernel/svc/svc_register.cpp @@ -2,5 +2,26 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/hle/kernel/svc.h" +#include "core/hle/kernel/svc_results.h" -namespace Kernel::Svc {} // namespace Kernel::Svc +namespace Kernel::Svc { + +Result ReadWriteRegister(Core::System& system, uint32_t* out, uint64_t address, uint32_t mask, + uint32_t value) { + *out = 0; + + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result ReadWriteRegister64(Core::System& system, uint32_t* out_value, uint64_t address, + uint32_t mask, uint32_t value) { + R_RETURN(ReadWriteRegister(system, out_value, address, mask, value)); +} + +Result ReadWriteRegister64From32(Core::System& system, uint32_t* out_value, uint64_t address, + uint32_t mask, uint32_t value) { + R_RETURN(ReadWriteRegister(system, out_value, address, mask, value)); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_resource_limit.cpp b/src/core/hle/kernel/svc/svc_resource_limit.cpp index 679ba10fa..ebc886028 100644 --- a/src/core/hle/kernel/svc/svc_resource_limit.cpp +++ b/src/core/hle/kernel/svc/svc_resource_limit.cpp @@ -32,7 +32,7 @@ Result CreateResourceLimit(Core::System& system, Handle* out_handle) { return ResultSuccess; } -Result GetResourceLimitLimitValue(Core::System& system, u64* out_limit_value, +Result GetResourceLimitLimitValue(Core::System& system, s64* out_limit_value, Handle resource_limit_handle, LimitableResource which) { LOG_DEBUG(Kernel_SVC, "called, resource_limit_handle={:08X}, which={}", resource_limit_handle, which); @@ -52,7 +52,7 @@ Result GetResourceLimitLimitValue(Core::System& system, u64* out_limit_value, return ResultSuccess; } -Result GetResourceLimitCurrentValue(Core::System& system, u64* out_current_value, +Result GetResourceLimitCurrentValue(Core::System& system, s64* out_current_value, Handle resource_limit_handle, LimitableResource which) { LOG_DEBUG(Kernel_SVC, "called, resource_limit_handle={:08X}, which={}", resource_limit_handle, which); @@ -73,7 +73,7 @@ Result GetResourceLimitCurrentValue(Core::System& system, u64* out_current_value } Result SetResourceLimitLimitValue(Core::System& system, Handle resource_limit_handle, - LimitableResource which, u64 limit_value) { + LimitableResource which, s64 limit_value) { LOG_DEBUG(Kernel_SVC, "called, resource_limit_handle={:08X}, which={}, limit_value={}", resource_limit_handle, which, limit_value); @@ -92,4 +92,58 @@ Result SetResourceLimitLimitValue(Core::System& system, Handle resource_limit_ha return ResultSuccess; } +Result GetResourceLimitPeakValue(Core::System& system, int64_t* out_peak_value, + Handle resource_limit_handle, LimitableResource which) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result GetResourceLimitLimitValue64(Core::System& system, int64_t* out_limit_value, + Handle resource_limit_handle, LimitableResource which) { + R_RETURN(GetResourceLimitLimitValue(system, out_limit_value, resource_limit_handle, which)); +} + +Result GetResourceLimitCurrentValue64(Core::System& system, int64_t* out_current_value, + Handle resource_limit_handle, LimitableResource which) { + R_RETURN(GetResourceLimitCurrentValue(system, out_current_value, resource_limit_handle, which)); +} + +Result GetResourceLimitPeakValue64(Core::System& system, int64_t* out_peak_value, + Handle resource_limit_handle, LimitableResource which) { + R_RETURN(GetResourceLimitPeakValue(system, out_peak_value, resource_limit_handle, which)); +} + +Result CreateResourceLimit64(Core::System& system, Handle* out_handle) { + R_RETURN(CreateResourceLimit(system, out_handle)); +} + +Result SetResourceLimitLimitValue64(Core::System& system, Handle resource_limit_handle, + LimitableResource which, int64_t limit_value) { + R_RETURN(SetResourceLimitLimitValue(system, resource_limit_handle, which, limit_value)); +} + +Result GetResourceLimitLimitValue64From32(Core::System& system, int64_t* out_limit_value, + Handle resource_limit_handle, LimitableResource which) { + R_RETURN(GetResourceLimitLimitValue(system, out_limit_value, resource_limit_handle, which)); +} + +Result GetResourceLimitCurrentValue64From32(Core::System& system, int64_t* out_current_value, + Handle resource_limit_handle, LimitableResource which) { + R_RETURN(GetResourceLimitCurrentValue(system, out_current_value, resource_limit_handle, which)); +} + +Result GetResourceLimitPeakValue64From32(Core::System& system, int64_t* out_peak_value, + Handle resource_limit_handle, LimitableResource which) { + R_RETURN(GetResourceLimitPeakValue(system, out_peak_value, resource_limit_handle, which)); +} + +Result CreateResourceLimit64From32(Core::System& system, Handle* out_handle) { + R_RETURN(CreateResourceLimit(system, out_handle)); +} + +Result SetResourceLimitLimitValue64From32(Core::System& system, Handle resource_limit_handle, + LimitableResource which, int64_t limit_value) { + R_RETURN(SetResourceLimitLimitValue(system, resource_limit_handle, which, limit_value)); +} + } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_secure_monitor_call.cpp b/src/core/hle/kernel/svc/svc_secure_monitor_call.cpp index 299e22ae6..20f6ec643 100644 --- a/src/core/hle/kernel/svc/svc_secure_monitor_call.cpp +++ b/src/core/hle/kernel/svc/svc_secure_monitor_call.cpp @@ -1,6 +1,53 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "core/core.h" +#include "core/hle/kernel/physical_core.h" #include "core/hle/kernel/svc.h" -namespace Kernel::Svc {} // namespace Kernel::Svc +namespace Kernel::Svc { + +void CallSecureMonitor(Core::System& system, lp64::SecureMonitorArguments* args) { + UNIMPLEMENTED(); +} + +void CallSecureMonitor64(Core::System& system, lp64::SecureMonitorArguments* args) { + CallSecureMonitor(system, args); +} + +void CallSecureMonitor64From32(Core::System& system, ilp32::SecureMonitorArguments* args) { + // CallSecureMonitor64From32 is not supported. + UNIMPLEMENTED_MSG("CallSecureMonitor64From32"); +} + +// Custom ABI for CallSecureMonitor. + +void SvcWrap_CallSecureMonitor64(Core::System& system) { + auto& core = system.CurrentPhysicalCore().ArmInterface(); + lp64::SecureMonitorArguments args{}; + for (int i = 0; i < 8; i++) { + args.r[i] = core.GetReg(i); + } + + CallSecureMonitor64(system, &args); + + for (int i = 0; i < 8; i++) { + core.SetReg(i, args.r[i]); + } +} + +void SvcWrap_CallSecureMonitor64From32(Core::System& system) { + auto& core = system.CurrentPhysicalCore().ArmInterface(); + ilp32::SecureMonitorArguments args{}; + for (int i = 0; i < 8; i++) { + args.r[i] = static_cast(core.GetReg(i)); + } + + CallSecureMonitor64From32(system, &args); + + for (int i = 0; i < 8; i++) { + core.SetReg(i, args.r[i]); + } +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_session.cpp b/src/core/hle/kernel/svc/svc_session.cpp index dac8ce33c..0deb61b62 100644 --- a/src/core/hle/kernel/svc/svc_session.cpp +++ b/src/core/hle/kernel/svc/svc_session.cpp @@ -90,14 +90,39 @@ Result CreateSession(Core::System& system, Handle* out_server, Handle* out_clien } // namespace -Result CreateSession(Core::System& system, Handle* out_server, Handle* out_client, u32 is_light, +Result CreateSession(Core::System& system, Handle* out_server, Handle* out_client, bool is_light, u64 name) { if (is_light) { // return CreateSession(system, out_server, out_client, name); - return ResultUnknown; + return ResultNotImplemented; } else { return CreateSession(system, out_server, out_client, name); } } +Result AcceptSession(Core::System& system, Handle* out_handle, Handle port_handle) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result CreateSession64(Core::System& system, Handle* out_server_session_handle, + Handle* out_client_session_handle, bool is_light, uint64_t name) { + R_RETURN(CreateSession(system, out_server_session_handle, out_client_session_handle, is_light, + name)); +} + +Result AcceptSession64(Core::System& system, Handle* out_handle, Handle port) { + R_RETURN(AcceptSession(system, out_handle, port)); +} + +Result CreateSession64From32(Core::System& system, Handle* out_server_session_handle, + Handle* out_client_session_handle, bool is_light, uint32_t name) { + R_RETURN(CreateSession(system, out_server_session_handle, out_client_session_handle, is_light, + name)); +} + +Result AcceptSession64From32(Core::System& system, Handle* out_handle, Handle port) { + R_RETURN(AcceptSession(system, out_handle, port)); +} + } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_shared_memory.cpp b/src/core/hle/kernel/svc/svc_shared_memory.cpp index d465bcbe7..40d6260e3 100644 --- a/src/core/hle/kernel/svc/svc_shared_memory.cpp +++ b/src/core/hle/kernel/svc/svc_shared_memory.cpp @@ -67,11 +67,6 @@ Result MapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, return ResultSuccess; } -Result MapSharedMemory32(Core::System& system, Handle shmem_handle, u32 address, u32 size, - Svc::MemoryPermission map_perm) { - return MapSharedMemory(system, shmem_handle, address, size, map_perm); -} - Result UnmapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, u64 size) { // Validate the address/size. R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); @@ -99,8 +94,40 @@ Result UnmapSharedMemory(Core::System& system, Handle shmem_handle, VAddr addres return ResultSuccess; } -Result UnmapSharedMemory32(Core::System& system, Handle shmem_handle, u32 address, u32 size) { - return UnmapSharedMemory(system, shmem_handle, address, size); +Result CreateSharedMemory(Core::System& system, Handle* out_handle, uint64_t size, + MemoryPermission owner_perm, MemoryPermission remote_perm) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result MapSharedMemory64(Core::System& system, Handle shmem_handle, uint64_t address, uint64_t size, + MemoryPermission map_perm) { + R_RETURN(MapSharedMemory(system, shmem_handle, address, size, map_perm)); +} + +Result UnmapSharedMemory64(Core::System& system, Handle shmem_handle, uint64_t address, + uint64_t size) { + R_RETURN(UnmapSharedMemory(system, shmem_handle, address, size)); +} + +Result CreateSharedMemory64(Core::System& system, Handle* out_handle, uint64_t size, + MemoryPermission owner_perm, MemoryPermission remote_perm) { + R_RETURN(CreateSharedMemory(system, out_handle, size, owner_perm, remote_perm)); +} + +Result MapSharedMemory64From32(Core::System& system, Handle shmem_handle, uint32_t address, + uint32_t size, MemoryPermission map_perm) { + R_RETURN(MapSharedMemory(system, shmem_handle, address, size, map_perm)); +} + +Result UnmapSharedMemory64From32(Core::System& system, Handle shmem_handle, uint32_t address, + uint32_t size) { + R_RETURN(UnmapSharedMemory(system, shmem_handle, address, size)); +} + +Result CreateSharedMemory64From32(Core::System& system, Handle* out_handle, uint32_t size, + MemoryPermission owner_perm, MemoryPermission remote_perm) { + R_RETURN(CreateSharedMemory(system, out_handle, size, owner_perm, remote_perm)); } } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_synchronization.cpp b/src/core/hle/kernel/svc/svc_synchronization.cpp index 1bf6a612a..e516a3800 100644 --- a/src/core/hle/kernel/svc/svc_synchronization.cpp +++ b/src/core/hle/kernel/svc/svc_synchronization.cpp @@ -20,10 +20,6 @@ Result CloseHandle(Core::System& system, Handle handle) { return ResultSuccess; } -Result CloseHandle32(Core::System& system, Handle handle) { - return CloseHandle(system, handle); -} - /// Clears the signaled state of an event or process. Result ResetSignal(Core::System& system, Handle handle) { LOG_DEBUG(Kernel_SVC, "called handle 0x{:08X}", handle); @@ -52,10 +48,6 @@ Result ResetSignal(Core::System& system, Handle handle) { return ResultInvalidHandle; } -Result ResetSignal32(Core::System& system, Handle handle) { - return ResetSignal(system, handle); -} - /// Wait for the given handles to synchronize, timeout after the specified nanoseconds Result WaitSynchronization(Core::System& system, s32* index, VAddr handles_address, s32 num_handles, s64 nano_seconds) { @@ -93,12 +85,6 @@ Result WaitSynchronization(Core::System& system, s32* index, VAddr handles_addre nano_seconds); } -Result WaitSynchronization32(Core::System& system, u32 timeout_low, u32 handles_address, - s32 num_handles, u32 timeout_high, s32* index) { - const s64 nano_seconds{(static_cast(timeout_high) << 32) | static_cast(timeout_low)}; - return WaitSynchronization(system, index, handles_address, num_handles, nano_seconds); -} - /// Resumes a thread waiting on WaitSynchronization Result CancelSynchronization(Core::System& system, Handle handle) { LOG_TRACE(Kernel_SVC, "called handle=0x{:X}", handle); @@ -113,10 +99,6 @@ Result CancelSynchronization(Core::System& system, Handle handle) { return ResultSuccess; } -Result CancelSynchronization32(Core::System& system, Handle handle) { - return CancelSynchronization(system, handle); -} - void SynchronizePreemptionState(Core::System& system) { auto& kernel = system.Kernel(); @@ -136,4 +118,46 @@ void SynchronizePreemptionState(Core::System& system) { } } +Result CloseHandle64(Core::System& system, Handle handle) { + R_RETURN(CloseHandle(system, handle)); +} + +Result ResetSignal64(Core::System& system, Handle handle) { + R_RETURN(ResetSignal(system, handle)); +} + +Result WaitSynchronization64(Core::System& system, int32_t* out_index, uint64_t handles, + int32_t num_handles, int64_t timeout_ns) { + R_RETURN(WaitSynchronization(system, out_index, handles, num_handles, timeout_ns)); +} + +Result CancelSynchronization64(Core::System& system, Handle handle) { + R_RETURN(CancelSynchronization(system, handle)); +} + +void SynchronizePreemptionState64(Core::System& system) { + SynchronizePreemptionState(system); +} + +Result CloseHandle64From32(Core::System& system, Handle handle) { + R_RETURN(CloseHandle(system, handle)); +} + +Result ResetSignal64From32(Core::System& system, Handle handle) { + R_RETURN(ResetSignal(system, handle)); +} + +Result WaitSynchronization64From32(Core::System& system, int32_t* out_index, uint32_t handles, + int32_t num_handles, int64_t timeout_ns) { + R_RETURN(WaitSynchronization(system, out_index, handles, num_handles, timeout_ns)); +} + +Result CancelSynchronization64From32(Core::System& system, Handle handle) { + R_RETURN(CancelSynchronization(system, handle)); +} + +void SynchronizePreemptionState64From32(Core::System& system) { + SynchronizePreemptionState(system); +} + } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_thread.cpp b/src/core/hle/kernel/svc/svc_thread.cpp index dd9f8e8b1..3e325c998 100644 --- a/src/core/hle/kernel/svc/svc_thread.cpp +++ b/src/core/hle/kernel/svc/svc_thread.cpp @@ -20,7 +20,7 @@ constexpr bool IsValidVirtualCoreId(int32_t core_id) { /// Creates a new thread Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point, u64 arg, - VAddr stack_bottom, u32 priority, s32 core_id) { + VAddr stack_bottom, s32 priority, s32 core_id) { LOG_DEBUG(Kernel_SVC, "called entry_point=0x{:08X}, arg=0x{:08X}, stack_bottom=0x{:08X}, " "priority=0x{:08X}, core_id=0x{:08X}", @@ -91,11 +91,6 @@ Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point, return ResultSuccess; } -Result CreateThread32(Core::System& system, Handle* out_handle, u32 priority, u32 entry_point, - u32 arg, u32 stack_top, s32 processor_id) { - return CreateThread(system, out_handle, entry_point, arg, stack_top, priority, processor_id); -} - /// Starts the thread for the provided handle Result StartThread(Core::System& system, Handle thread_handle) { LOG_DEBUG(Kernel_SVC, "called thread=0x{:08X}", thread_handle); @@ -115,10 +110,6 @@ Result StartThread(Core::System& system, Handle thread_handle) { return ResultSuccess; } -Result StartThread32(Core::System& system, Handle thread_handle) { - return StartThread(system, thread_handle); -} - /// Called when a thread exits void ExitThread(Core::System& system) { LOG_DEBUG(Kernel_SVC, "called, pc=0x{:08X}", system.CurrentArmInterface().GetPC()); @@ -129,10 +120,6 @@ void ExitThread(Core::System& system) { system.Kernel().UnregisterInUseObject(current_thread); } -void ExitThread32(Core::System& system) { - ExitThread(system); -} - /// Sleep the current thread void SleepThread(Core::System& system, s64 nanoseconds) { auto& kernel = system.Kernel(); @@ -160,13 +147,8 @@ void SleepThread(Core::System& system, s64 nanoseconds) { } } -void SleepThread32(Core::System& system, u32 nanoseconds_low, u32 nanoseconds_high) { - const auto nanoseconds = static_cast(u64{nanoseconds_low} | (u64{nanoseconds_high} << 32)); - SleepThread(system, nanoseconds); -} - /// Gets the thread context -Result GetThreadContext(Core::System& system, VAddr out_context, Handle thread_handle) { +Result GetThreadContext3(Core::System& system, VAddr out_context, Handle thread_handle) { LOG_DEBUG(Kernel_SVC, "called, out_context=0x{:08X}, thread_handle=0x{:X}", out_context, thread_handle); @@ -223,12 +205,8 @@ Result GetThreadContext(Core::System& system, VAddr out_context, Handle thread_h return ResultSuccess; } -Result GetThreadContext32(Core::System& system, u32 out_context, Handle thread_handle) { - return GetThreadContext(system, out_context, thread_handle); -} - /// Gets the priority for the specified thread -Result GetThreadPriority(Core::System& system, u32* out_priority, Handle handle) { +Result GetThreadPriority(Core::System& system, s32* out_priority, Handle handle) { LOG_TRACE(Kernel_SVC, "called"); // Get the thread from its handle. @@ -241,12 +219,8 @@ Result GetThreadPriority(Core::System& system, u32* out_priority, Handle handle) return ResultSuccess; } -Result GetThreadPriority32(Core::System& system, u32* out_priority, Handle handle) { - return GetThreadPriority(system, out_priority, handle); -} - /// Sets the priority for the specified thread -Result SetThreadPriority(Core::System& system, Handle thread_handle, u32 priority) { +Result SetThreadPriority(Core::System& system, Handle thread_handle, s32 priority) { // Get the current process. KProcess& process = *system.Kernel().CurrentProcess(); @@ -264,12 +238,8 @@ Result SetThreadPriority(Core::System& system, Handle thread_handle, u32 priorit return ResultSuccess; } -Result SetThreadPriority32(Core::System& system, Handle thread_handle, u32 priority) { - return SetThreadPriority(system, thread_handle, priority); -} - -Result GetThreadList(Core::System& system, u32* out_num_threads, VAddr out_thread_ids, - u32 out_thread_ids_size, Handle debug_handle) { +Result GetThreadList(Core::System& system, s32* out_num_threads, VAddr out_thread_ids, + s32 out_thread_ids_size, Handle debug_handle) { // TODO: Handle this case when debug events are supported. UNIMPLEMENTED_IF(debug_handle != InvalidHandle); @@ -296,7 +266,7 @@ Result GetThreadList(Core::System& system, u32* out_num_threads, VAddr out_threa auto& memory = system.Memory(); const auto& thread_list = current_process->GetThreadList(); const auto num_threads = thread_list.size(); - const auto copy_amount = std::min(std::size_t{out_thread_ids_size}, num_threads); + const auto copy_amount = std::min(static_cast(out_thread_ids_size), num_threads); auto list_iter = thread_list.cbegin(); for (std::size_t i = 0; i < copy_amount; ++i, ++list_iter) { @@ -308,8 +278,8 @@ Result GetThreadList(Core::System& system, u32* out_num_threads, VAddr out_threa return ResultSuccess; } -Result GetThreadCoreMask(Core::System& system, Handle thread_handle, s32* out_core_id, - u64* out_affinity_mask) { +Result GetThreadCoreMask(Core::System& system, s32* out_core_id, u64* out_affinity_mask, + Handle thread_handle) { LOG_TRACE(Kernel_SVC, "called, handle=0x{:08X}", thread_handle); // Get the thread from its handle. @@ -323,15 +293,6 @@ Result GetThreadCoreMask(Core::System& system, Handle thread_handle, s32* out_co return ResultSuccess; } -Result GetThreadCoreMask32(Core::System& system, Handle thread_handle, s32* out_core_id, - u32* out_affinity_mask_low, u32* out_affinity_mask_high) { - u64 out_affinity_mask{}; - const auto result = GetThreadCoreMask(system, thread_handle, out_core_id, &out_affinity_mask); - *out_affinity_mask_high = static_cast(out_affinity_mask >> 32); - *out_affinity_mask_low = static_cast(out_affinity_mask); - return result; -} - Result SetThreadCoreMask(Core::System& system, Handle thread_handle, s32 core_id, u64 affinity_mask) { // Determine the core id/affinity mask. @@ -364,12 +325,6 @@ Result SetThreadCoreMask(Core::System& system, Handle thread_handle, s32 core_id return ResultSuccess; } -Result SetThreadCoreMask32(Core::System& system, Handle thread_handle, s32 core_id, - u32 affinity_mask_low, u32 affinity_mask_high) { - const auto affinity_mask = u64{affinity_mask_low} | (u64{affinity_mask_high} << 32); - return SetThreadCoreMask(system, thread_handle, core_id, affinity_mask); -} - /// Get the ID for the specified thread. Result GetThreadId(Core::System& system, u64* out_thread_id, Handle thread_handle) { // Get the thread from its handle. @@ -382,15 +337,101 @@ Result GetThreadId(Core::System& system, u64* out_thread_id, Handle thread_handl return ResultSuccess; } -Result GetThreadId32(Core::System& system, u32* out_thread_id_low, u32* out_thread_id_high, - Handle thread_handle) { - u64 out_thread_id{}; - const Result result{GetThreadId(system, &out_thread_id, thread_handle)}; +Result CreateThread64(Core::System& system, Handle* out_handle, uint64_t func, uint64_t arg, + uint64_t stack_bottom, int32_t priority, int32_t core_id) { + R_RETURN(CreateThread(system, out_handle, func, arg, stack_bottom, priority, core_id)); +} - *out_thread_id_low = static_cast(out_thread_id >> 32); - *out_thread_id_high = static_cast(out_thread_id & std::numeric_limits::max()); +Result StartThread64(Core::System& system, Handle thread_handle) { + R_RETURN(StartThread(system, thread_handle)); +} - return result; +void ExitThread64(Core::System& system) { + return ExitThread(system); +} + +void SleepThread64(Core::System& system, int64_t ns) { + return SleepThread(system, ns); +} + +Result GetThreadPriority64(Core::System& system, int32_t* out_priority, Handle thread_handle) { + R_RETURN(GetThreadPriority(system, out_priority, thread_handle)); +} + +Result SetThreadPriority64(Core::System& system, Handle thread_handle, int32_t priority) { + R_RETURN(SetThreadPriority(system, thread_handle, priority)); +} + +Result GetThreadCoreMask64(Core::System& system, int32_t* out_core_id, uint64_t* out_affinity_mask, + Handle thread_handle) { + R_RETURN(GetThreadCoreMask(system, out_core_id, out_affinity_mask, thread_handle)); +} + +Result SetThreadCoreMask64(Core::System& system, Handle thread_handle, int32_t core_id, + uint64_t affinity_mask) { + R_RETURN(SetThreadCoreMask(system, thread_handle, core_id, affinity_mask)); +} + +Result GetThreadId64(Core::System& system, uint64_t* out_thread_id, Handle thread_handle) { + R_RETURN(GetThreadId(system, out_thread_id, thread_handle)); +} + +Result GetThreadContext364(Core::System& system, uint64_t out_context, Handle thread_handle) { + R_RETURN(GetThreadContext3(system, out_context, thread_handle)); +} + +Result GetThreadList64(Core::System& system, int32_t* out_num_threads, uint64_t out_thread_ids, + int32_t max_out_count, Handle debug_handle) { + R_RETURN(GetThreadList(system, out_num_threads, out_thread_ids, max_out_count, debug_handle)); +} + +Result CreateThread64From32(Core::System& system, Handle* out_handle, uint32_t func, uint32_t arg, + uint32_t stack_bottom, int32_t priority, int32_t core_id) { + R_RETURN(CreateThread(system, out_handle, func, arg, stack_bottom, priority, core_id)); +} + +Result StartThread64From32(Core::System& system, Handle thread_handle) { + R_RETURN(StartThread(system, thread_handle)); +} + +void ExitThread64From32(Core::System& system) { + return ExitThread(system); +} + +void SleepThread64From32(Core::System& system, int64_t ns) { + return SleepThread(system, ns); +} + +Result GetThreadPriority64From32(Core::System& system, int32_t* out_priority, + Handle thread_handle) { + R_RETURN(GetThreadPriority(system, out_priority, thread_handle)); +} + +Result SetThreadPriority64From32(Core::System& system, Handle thread_handle, int32_t priority) { + R_RETURN(SetThreadPriority(system, thread_handle, priority)); +} + +Result GetThreadCoreMask64From32(Core::System& system, int32_t* out_core_id, + uint64_t* out_affinity_mask, Handle thread_handle) { + R_RETURN(GetThreadCoreMask(system, out_core_id, out_affinity_mask, thread_handle)); +} + +Result SetThreadCoreMask64From32(Core::System& system, Handle thread_handle, int32_t core_id, + uint64_t affinity_mask) { + R_RETURN(SetThreadCoreMask(system, thread_handle, core_id, affinity_mask)); +} + +Result GetThreadId64From32(Core::System& system, uint64_t* out_thread_id, Handle thread_handle) { + R_RETURN(GetThreadId(system, out_thread_id, thread_handle)); +} + +Result GetThreadContext364From32(Core::System& system, uint32_t out_context, Handle thread_handle) { + R_RETURN(GetThreadContext3(system, out_context, thread_handle)); +} + +Result GetThreadList64From32(Core::System& system, int32_t* out_num_threads, + uint32_t out_thread_ids, int32_t max_out_count, Handle debug_handle) { + R_RETURN(GetThreadList(system, out_num_threads, out_thread_ids, max_out_count, debug_handle)); } } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_thread_profiler.cpp b/src/core/hle/kernel/svc/svc_thread_profiler.cpp index 299e22ae6..40de7708b 100644 --- a/src/core/hle/kernel/svc/svc_thread_profiler.cpp +++ b/src/core/hle/kernel/svc/svc_thread_profiler.cpp @@ -2,5 +2,59 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/hle/kernel/svc.h" +#include "core/hle/kernel/svc_results.h" -namespace Kernel::Svc {} // namespace Kernel::Svc +namespace Kernel::Svc { + +Result GetDebugFutureThreadInfo(Core::System& system, lp64::LastThreadContext* out_context, + uint64_t* out_thread_id, Handle debug_handle, int64_t ns) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result GetLastThreadInfo(Core::System& system, lp64::LastThreadContext* out_context, + uint64_t* out_tls_address, uint32_t* out_flags) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result GetDebugFutureThreadInfo64(Core::System& system, lp64::LastThreadContext* out_context, + uint64_t* out_thread_id, Handle debug_handle, int64_t ns) { + R_RETURN(GetDebugFutureThreadInfo(system, out_context, out_thread_id, debug_handle, ns)); +} + +Result GetLastThreadInfo64(Core::System& system, lp64::LastThreadContext* out_context, + uint64_t* out_tls_address, uint32_t* out_flags) { + R_RETURN(GetLastThreadInfo(system, out_context, out_tls_address, out_flags)); +} + +Result GetDebugFutureThreadInfo64From32(Core::System& system, ilp32::LastThreadContext* out_context, + uint64_t* out_thread_id, Handle debug_handle, int64_t ns) { + lp64::LastThreadContext context{}; + R_TRY( + GetDebugFutureThreadInfo(system, std::addressof(context), out_thread_id, debug_handle, ns)); + + *out_context = { + .fp = static_cast(context.fp), + .sp = static_cast(context.sp), + .lr = static_cast(context.lr), + .pc = static_cast(context.pc), + }; + R_SUCCEED(); +} + +Result GetLastThreadInfo64From32(Core::System& system, ilp32::LastThreadContext* out_context, + uint64_t* out_tls_address, uint32_t* out_flags) { + lp64::LastThreadContext context{}; + R_TRY(GetLastThreadInfo(system, std::addressof(context), out_tls_address, out_flags)); + + *out_context = { + .fp = static_cast(context.fp), + .sp = static_cast(context.sp), + .lr = static_cast(context.lr), + .pc = static_cast(context.pc), + }; + R_SUCCEED(); +} + +} // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_tick.cpp b/src/core/hle/kernel/svc/svc_tick.cpp index e9b4fd5a6..561336482 100644 --- a/src/core/hle/kernel/svc/svc_tick.cpp +++ b/src/core/hle/kernel/svc/svc_tick.cpp @@ -9,7 +9,7 @@ namespace Kernel::Svc { /// This returns the total CPU ticks elapsed since the CPU was powered-on -u64 GetSystemTick(Core::System& system) { +int64_t GetSystemTick(Core::System& system) { LOG_TRACE(Kernel_SVC, "called"); auto& core_timing = system.CoreTiming(); @@ -21,13 +21,15 @@ u64 GetSystemTick(Core::System& system) { core_timing.AddTicks(400U); } - return result; + return static_cast(result); } -void GetSystemTick32(Core::System& system, u32* time_low, u32* time_high) { - const auto time = GetSystemTick(system); - *time_low = static_cast(time); - *time_high = static_cast(time >> 32); +int64_t GetSystemTick64(Core::System& system) { + return GetSystemTick(system); +} + +int64_t GetSystemTick64From32(Core::System& system) { + return GetSystemTick(system); } } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc/svc_transfer_memory.cpp b/src/core/hle/kernel/svc/svc_transfer_memory.cpp index b14ae24a1..a4c040e49 100644 --- a/src/core/hle/kernel/svc/svc_transfer_memory.cpp +++ b/src/core/hle/kernel/svc/svc_transfer_memory.cpp @@ -72,8 +72,46 @@ Result CreateTransferMemory(Core::System& system, Handle* out, VAddr address, u6 return ResultSuccess; } -Result CreateTransferMemory32(Core::System& system, Handle* out, u32 address, u32 size, - MemoryPermission map_perm) { - return CreateTransferMemory(system, out, address, size, map_perm); +Result MapTransferMemory(Core::System& system, Handle trmem_handle, uint64_t address, uint64_t size, + MemoryPermission owner_perm) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); } + +Result UnmapTransferMemory(Core::System& system, Handle trmem_handle, uint64_t address, + uint64_t size) { + UNIMPLEMENTED(); + R_THROW(ResultNotImplemented); +} + +Result MapTransferMemory64(Core::System& system, Handle trmem_handle, uint64_t address, + uint64_t size, MemoryPermission owner_perm) { + R_RETURN(MapTransferMemory(system, trmem_handle, address, size, owner_perm)); +} + +Result UnmapTransferMemory64(Core::System& system, Handle trmem_handle, uint64_t address, + uint64_t size) { + R_RETURN(UnmapTransferMemory(system, trmem_handle, address, size)); +} + +Result CreateTransferMemory64(Core::System& system, Handle* out_handle, uint64_t address, + uint64_t size, MemoryPermission map_perm) { + R_RETURN(CreateTransferMemory(system, out_handle, address, size, map_perm)); +} + +Result MapTransferMemory64From32(Core::System& system, Handle trmem_handle, uint32_t address, + uint32_t size, MemoryPermission owner_perm) { + R_RETURN(MapTransferMemory(system, trmem_handle, address, size, owner_perm)); +} + +Result UnmapTransferMemory64From32(Core::System& system, Handle trmem_handle, uint32_t address, + uint32_t size) { + R_RETURN(UnmapTransferMemory(system, trmem_handle, address, size)); +} + +Result CreateTransferMemory64From32(Core::System& system, Handle* out_handle, uint32_t address, + uint32_t size, MemoryPermission map_perm) { + R_RETURN(CreateTransferMemory(system, out_handle, address, size, map_perm)); +} + } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc_generator.py b/src/core/hle/kernel/svc_generator.py new file mode 100644 index 000000000..b0a5707ec --- /dev/null +++ b/src/core/hle/kernel/svc_generator.py @@ -0,0 +1,716 @@ +# SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +# SPDX-License-Identifier: GPL-2.0-or-later + +# Raw SVC definitions from the kernel. +# +# Avoid modifying the prototypes; see below for how to customize generation +# for a given typename. +SVCS = [ + [0x01, "Result SetHeapSize(Address* out_address, Size size);"], + [0x02, "Result SetMemoryPermission(Address address, Size size, MemoryPermission perm);"], + [0x03, "Result SetMemoryAttribute(Address address, Size size, uint32_t mask, uint32_t attr);"], + [0x04, "Result MapMemory(Address dst_address, Address src_address, Size size);"], + [0x05, "Result UnmapMemory(Address dst_address, Address src_address, Size size);"], + [0x06, "Result QueryMemory(Address out_memory_info, PageInfo* out_page_info, Address address);"], + [0x07, "void ExitProcess();"], + [0x08, "Result CreateThread(Handle* out_handle, ThreadFunc func, Address arg, Address stack_bottom, int32_t priority, int32_t core_id);"], + [0x09, "Result StartThread(Handle thread_handle);"], + [0x0A, "void ExitThread();"], + [0x0B, "void SleepThread(int64_t ns);"], + [0x0C, "Result GetThreadPriority(int32_t* out_priority, Handle thread_handle);"], + [0x0D, "Result SetThreadPriority(Handle thread_handle, int32_t priority);"], + [0x0E, "Result GetThreadCoreMask(int32_t* out_core_id, uint64_t* out_affinity_mask, Handle thread_handle);"], + [0x0F, "Result SetThreadCoreMask(Handle thread_handle, int32_t core_id, uint64_t affinity_mask);"], + [0x10, "int32_t GetCurrentProcessorNumber();"], + [0x11, "Result SignalEvent(Handle event_handle);"], + [0x12, "Result ClearEvent(Handle event_handle);"], + [0x13, "Result MapSharedMemory(Handle shmem_handle, Address address, Size size, MemoryPermission map_perm);"], + [0x14, "Result UnmapSharedMemory(Handle shmem_handle, Address address, Size size);"], + [0x15, "Result CreateTransferMemory(Handle* out_handle, Address address, Size size, MemoryPermission map_perm);"], + [0x16, "Result CloseHandle(Handle handle);"], + [0x17, "Result ResetSignal(Handle handle);"], + [0x18, "Result WaitSynchronization(int32_t* out_index, Address handles, int32_t num_handles, int64_t timeout_ns);"], + [0x19, "Result CancelSynchronization(Handle handle);"], + [0x1A, "Result ArbitrateLock(Handle thread_handle, Address address, uint32_t tag);"], + [0x1B, "Result ArbitrateUnlock(Address address);"], + [0x1C, "Result WaitProcessWideKeyAtomic(Address address, Address cv_key, uint32_t tag, int64_t timeout_ns);"], + [0x1D, "void SignalProcessWideKey(Address cv_key, int32_t count);"], + [0x1E, "int64_t GetSystemTick();"], + [0x1F, "Result ConnectToNamedPort(Handle* out_handle, Address name);"], + [0x20, "Result SendSyncRequestLight(Handle session_handle);"], + [0x21, "Result SendSyncRequest(Handle session_handle);"], + [0x22, "Result SendSyncRequestWithUserBuffer(Address message_buffer, Size message_buffer_size, Handle session_handle);"], + [0x23, "Result SendAsyncRequestWithUserBuffer(Handle* out_event_handle, Address message_buffer, Size message_buffer_size, Handle session_handle);"], + [0x24, "Result GetProcessId(uint64_t* out_process_id, Handle process_handle);"], + [0x25, "Result GetThreadId(uint64_t* out_thread_id, Handle thread_handle);"], + [0x26, "void Break(BreakReason break_reason, Address arg, Size size);"], + [0x27, "Result OutputDebugString(Address debug_str, Size len);"], + [0x28, "void ReturnFromException(Result result);"], + [0x29, "Result GetInfo(uint64_t* out, InfoType info_type, Handle handle, uint64_t info_subtype);"], + [0x2A, "void FlushEntireDataCache();"], + [0x2B, "Result FlushDataCache(Address address, Size size);"], + [0x2C, "Result MapPhysicalMemory(Address address, Size size);"], + [0x2D, "Result UnmapPhysicalMemory(Address address, Size size);"], + [0x2E, "Result GetDebugFutureThreadInfo(LastThreadContext* out_context, uint64_t* out_thread_id, Handle debug_handle, int64_t ns);"], + [0x2F, "Result GetLastThreadInfo(LastThreadContext* out_context, Address* out_tls_address, uint32_t* out_flags);"], + [0x30, "Result GetResourceLimitLimitValue(int64_t* out_limit_value, Handle resource_limit_handle, LimitableResource which);"], + [0x31, "Result GetResourceLimitCurrentValue(int64_t* out_current_value, Handle resource_limit_handle, LimitableResource which);"], + [0x32, "Result SetThreadActivity(Handle thread_handle, ThreadActivity thread_activity);"], + [0x33, "Result GetThreadContext3(Address out_context, Handle thread_handle);"], + [0x34, "Result WaitForAddress(Address address, ArbitrationType arb_type, int32_t value, int64_t timeout_ns);"], + [0x35, "Result SignalToAddress(Address address, SignalType signal_type, int32_t value, int32_t count);"], + [0x36, "void SynchronizePreemptionState();"], + [0x37, "Result GetResourceLimitPeakValue(int64_t* out_peak_value, Handle resource_limit_handle, LimitableResource which);"], + + [0x39, "Result CreateIoPool(Handle* out_handle, IoPoolType which);"], + [0x3A, "Result CreateIoRegion(Handle* out_handle, Handle io_pool, PhysicalAddress physical_address, Size size, MemoryMapping mapping, MemoryPermission perm);"], + + [0x3C, "void KernelDebug(KernelDebugType kern_debug_type, uint64_t arg0, uint64_t arg1, uint64_t arg2);"], + [0x3D, "void ChangeKernelTraceState(KernelTraceState kern_trace_state);"], + + [0x40, "Result CreateSession(Handle* out_server_session_handle, Handle* out_client_session_handle, bool is_light, Address name);"], + [0x41, "Result AcceptSession(Handle* out_handle, Handle port);"], + [0x42, "Result ReplyAndReceiveLight(Handle handle);"], + [0x43, "Result ReplyAndReceive(int32_t* out_index, Address handles, int32_t num_handles, Handle reply_target, int64_t timeout_ns);"], + [0x44, "Result ReplyAndReceiveWithUserBuffer(int32_t* out_index, Address message_buffer, Size message_buffer_size, Address handles, int32_t num_handles, Handle reply_target, int64_t timeout_ns);"], + [0x45, "Result CreateEvent(Handle* out_write_handle, Handle* out_read_handle);"], + [0x46, "Result MapIoRegion(Handle io_region, Address address, Size size, MemoryPermission perm);"], + [0x47, "Result UnmapIoRegion(Handle io_region, Address address, Size size);"], + [0x48, "Result MapPhysicalMemoryUnsafe(Address address, Size size);"], + [0x49, "Result UnmapPhysicalMemoryUnsafe(Address address, Size size);"], + [0x4A, "Result SetUnsafeLimit(Size limit);"], + [0x4B, "Result CreateCodeMemory(Handle* out_handle, Address address, Size size);"], + [0x4C, "Result ControlCodeMemory(Handle code_memory_handle, CodeMemoryOperation operation, uint64_t address, uint64_t size, MemoryPermission perm);"], + [0x4D, "void SleepSystem();"], + [0x4E, "Result ReadWriteRegister(uint32_t* out_value, PhysicalAddress address, uint32_t mask, uint32_t value);"], + [0x4F, "Result SetProcessActivity(Handle process_handle, ProcessActivity process_activity);"], + [0x50, "Result CreateSharedMemory(Handle* out_handle, Size size, MemoryPermission owner_perm, MemoryPermission remote_perm);"], + [0x51, "Result MapTransferMemory(Handle trmem_handle, Address address, Size size, MemoryPermission owner_perm);"], + [0x52, "Result UnmapTransferMemory(Handle trmem_handle, Address address, Size size);"], + [0x53, "Result CreateInterruptEvent(Handle* out_read_handle, int32_t interrupt_id, InterruptType interrupt_type);"], + [0x54, "Result QueryPhysicalAddress(PhysicalMemoryInfo* out_info, Address address);"], + [0x55, "Result QueryIoMapping(Address* out_address, Size* out_size, PhysicalAddress physical_address, Size size);"], + [0x56, "Result CreateDeviceAddressSpace(Handle* out_handle, uint64_t das_address, uint64_t das_size);"], + [0x57, "Result AttachDeviceAddressSpace(DeviceName device_name, Handle das_handle);"], + [0x58, "Result DetachDeviceAddressSpace(DeviceName device_name, Handle das_handle);"], + [0x59, "Result MapDeviceAddressSpaceByForce(Handle das_handle, Handle process_handle, uint64_t process_address, Size size, uint64_t device_address, uint32_t option);"], + [0x5A, "Result MapDeviceAddressSpaceAligned(Handle das_handle, Handle process_handle, uint64_t process_address, Size size, uint64_t device_address, uint32_t option);"], + [0x5C, "Result UnmapDeviceAddressSpace(Handle das_handle, Handle process_handle, uint64_t process_address, Size size, uint64_t device_address);"], + [0x5D, "Result InvalidateProcessDataCache(Handle process_handle, uint64_t address, uint64_t size);"], + [0x5E, "Result StoreProcessDataCache(Handle process_handle, uint64_t address, uint64_t size);"], + [0x5F, "Result FlushProcessDataCache(Handle process_handle, uint64_t address, uint64_t size);"], + [0x60, "Result DebugActiveProcess(Handle* out_handle, uint64_t process_id);"], + [0x61, "Result BreakDebugProcess(Handle debug_handle);"], + [0x62, "Result TerminateDebugProcess(Handle debug_handle);"], + [0x63, "Result GetDebugEvent(Address out_info, Handle debug_handle);"], + [0x64, "Result ContinueDebugEvent(Handle debug_handle, uint32_t flags, Address thread_ids, int32_t num_thread_ids);"], + [0x65, "Result GetProcessList(int32_t* out_num_processes, Address out_process_ids, int32_t max_out_count);"], + [0x66, "Result GetThreadList(int32_t* out_num_threads, Address out_thread_ids, int32_t max_out_count, Handle debug_handle);"], + [0x67, "Result GetDebugThreadContext(Address out_context, Handle debug_handle, uint64_t thread_id, uint32_t context_flags);"], + [0x68, "Result SetDebugThreadContext(Handle debug_handle, uint64_t thread_id, Address context, uint32_t context_flags);"], + [0x69, "Result QueryDebugProcessMemory(Address out_memory_info, PageInfo* out_page_info, Handle process_handle, Address address);"], + [0x6A, "Result ReadDebugProcessMemory(Address buffer, Handle debug_handle, Address address, Size size);"], + [0x6B, "Result WriteDebugProcessMemory(Handle debug_handle, Address buffer, Address address, Size size);"], + [0x6C, "Result SetHardwareBreakPoint(HardwareBreakPointRegisterName name, uint64_t flags, uint64_t value);"], + [0x6D, "Result GetDebugThreadParam(uint64_t* out_64, uint32_t* out_32, Handle debug_handle, uint64_t thread_id, DebugThreadParam param);"], + + [0x6F, "Result GetSystemInfo(uint64_t* out, SystemInfoType info_type, Handle handle, uint64_t info_subtype);"], + [0x70, "Result CreatePort(Handle* out_server_handle, Handle* out_client_handle, int32_t max_sessions, bool is_light, Address name);"], + [0x71, "Result ManageNamedPort(Handle* out_server_handle, Address name, int32_t max_sessions);"], + [0x72, "Result ConnectToPort(Handle* out_handle, Handle port);"], + [0x73, "Result SetProcessMemoryPermission(Handle process_handle, uint64_t address, uint64_t size, MemoryPermission perm);"], + [0x74, "Result MapProcessMemory(Address dst_address, Handle process_handle, uint64_t src_address, Size size);"], + [0x75, "Result UnmapProcessMemory(Address dst_address, Handle process_handle, uint64_t src_address, Size size);"], + [0x76, "Result QueryProcessMemory(Address out_memory_info, PageInfo* out_page_info, Handle process_handle, uint64_t address);"], + [0x77, "Result MapProcessCodeMemory(Handle process_handle, uint64_t dst_address, uint64_t src_address, uint64_t size);"], + [0x78, "Result UnmapProcessCodeMemory(Handle process_handle, uint64_t dst_address, uint64_t src_address, uint64_t size);"], + [0x79, "Result CreateProcess(Handle* out_handle, Address parameters, Address caps, int32_t num_caps);"], + [0x7A, "Result StartProcess(Handle process_handle, int32_t priority, int32_t core_id, uint64_t main_thread_stack_size);"], + [0x7B, "Result TerminateProcess(Handle process_handle);"], + [0x7C, "Result GetProcessInfo(int64_t* out_info, Handle process_handle, ProcessInfoType info_type);"], + [0x7D, "Result CreateResourceLimit(Handle* out_handle);"], + [0x7E, "Result SetResourceLimitLimitValue(Handle resource_limit_handle, LimitableResource which, int64_t limit_value);"], + [0x7F, "void CallSecureMonitor(SecureMonitorArguments args);"], + + [0x90, "Result MapInsecureMemory(Address address, Size size);"], + [0x91, "Result UnmapInsecureMemory(Address address, Size size);"], +] + +# These use a custom ABI, and therefore require custom wrappers +SKIP_WRAPPERS = { + 0x20: "SendSyncRequestLight", + 0x42: "ReplyAndReceiveLight", + 0x7F: "CallSecureMonitor", +} + +BIT_32 = 0 +BIT_64 = 1 + +REG_SIZES = [4, 8] +SUFFIX_NAMES = ["64From32", "64"] +TYPE_SIZES = { + # SVC types + "ArbitrationType": 4, + "BreakReason": 4, + "CodeMemoryOperation": 4, + "DebugThreadParam": 4, + "DeviceName": 4, + "HardwareBreakPointRegisterName": 4, + "Handle": 4, + "InfoType": 4, + "InterruptType": 4, + "IoPoolType": 4, + "KernelDebugType": 4, + "KernelTraceState": 4, + "LimitableResource": 4, + "MemoryMapping": 4, + "MemoryPermission": 4, + "PageInfo": 4, + "ProcessActivity": 4, + "ProcessInfoType": 4, + "Result": 4, + "SignalType": 4, + "SystemInfoType": 4, + "ThreadActivity": 4, + + # Arch-specific types + "ilp32::LastThreadContext": 16, + "ilp32::PhysicalMemoryInfo": 16, + "ilp32::SecureMonitorArguments": 32, + "lp64::LastThreadContext": 32, + "lp64::PhysicalMemoryInfo": 24, + "lp64::SecureMonitorArguments": 64, + + # Generic types + "bool": 1, + "int32_t": 4, + "int64_t": 8, + "uint32_t": 4, + "uint64_t": 8, + "void": 0, +} + +TYPE_REPLACEMENTS = { + "Address": ["uint32_t", "uint64_t"], + "LastThreadContext": ["ilp32::LastThreadContext", "lp64::LastThreadContext"], + "PhysicalAddress": ["uint64_t", "uint64_t"], + "PhysicalMemoryInfo": ["ilp32::PhysicalMemoryInfo", "lp64::PhysicalMemoryInfo"], + "SecureMonitorArguments": ["ilp32::SecureMonitorArguments", "lp64::SecureMonitorArguments"], + "Size": ["uint32_t", "uint64_t"], + "ThreadFunc": ["uint32_t", "uint64_t"], +} + +# Statically verify that the hardcoded sizes match the intended +# sizes in C++. +def emit_size_check(): + lines = [] + + for type, size in TYPE_SIZES.items(): + if type != "void": + lines.append(f"static_assert(sizeof({type}) == {size});") + + return "\n".join(lines) + + +# Replaces a type with an arch-specific one, if it exists. +def substitute_type(name, bitness): + if name in TYPE_REPLACEMENTS: + return TYPE_REPLACEMENTS[name][bitness] + else: + return name + + +class Argument: + def __init__(self, type_name, var_name, is_output, is_outptr, is_address): + self.type_name = type_name + self.var_name = var_name + self.is_output = is_output + self.is_outptr = is_outptr + self.is_address = is_address + + +# Parses C-style string declarations for SVCs. +def parse_declaration(declaration, bitness): + return_type, rest = declaration.split(" ", 1) + func_name, rest = rest.split("(", 1) + arg_names, rest = rest.split(")", 1) + argument_types = [] + + return_type = substitute_type(return_type, bitness) + assert return_type in TYPE_SIZES, f"Unknown type '{return_type}'" + + if arg_names: + for arg_name in arg_names.split(", "): + type_name, var_name = arg_name.replace("*", "").split(" ", 1) + + # All outputs must contain out_ in the name. + is_output = var_name == "out" or var_name.find("out_") != -1 + + # User-pointer outputs are not written to registers. + is_outptr = is_output and arg_name.find("*") == -1 + + # Special handling is performed for output addresses to avoid awkwardness + # in conversion for the 32-bit equivalents. + is_address = is_output and not is_outptr and \ + type_name in ["Address", "Size"] + type_name = substitute_type(type_name, bitness) + + assert type_name in TYPE_SIZES, f"Unknown type '{type_name}'" + + argument_types.append( + Argument(type_name, var_name, is_output, is_outptr, is_address)) + + return (return_type, func_name, argument_types) + + +class RegisterAllocator: + def __init__(self, num_regs, byte_size, parameter_count): + self.registers = {} + self.num_regs = num_regs + self.byte_size = byte_size + self.parameter_count = parameter_count + + # Mark the given register as allocated, for use in layout + # calculation if the NGRN exceeds the ABI parameter count. + def allocate(self, i): + assert i not in self.registers, f"Register R{i} already allocated" + self.registers[i] = True + return i + + # Calculate the next available location for a register; + # the NGRN has exceeded the ABI parameter count. + def allocate_first_free(self): + for i in range(0, self.num_regs): + if i in self.registers: + continue + + self.allocate(i) + return i + + assert False, "No registers available" + + # Add a single register at the given NGRN. + # If the index exceeds the ABI parameter count, try to find a + # location to add it. Returns the output location and increment. + def add_single(self, ngrn): + if ngrn >= self.parameter_count: + return (self.allocate_first_free(), 0) + else: + return (self.allocate(ngrn), 1) + + # Add registers at the given NGRN for a data type of + # the given size. Returns the output locations and increment. + def add(self, ngrn, data_size, align=True): + if data_size <= self.byte_size: + r, i = self.add_single(ngrn) + return ([r], i) + + regs = [] + inc = ngrn % 2 if align else 0 + remaining_size = data_size + while remaining_size > 0: + r, i = self.add_single(ngrn + inc) + regs.append(r) + inc += i + remaining_size -= self.byte_size + + return (regs, inc) + + +def reg_alloc(bitness): + if bitness == 0: + # aapcs32: 4 4-byte registers + return RegisterAllocator(8, 4, 4) + elif bitness == 1: + # aapcs64: 8 8-byte registers + return RegisterAllocator(8, 8, 8) + + +# Converts a parsed SVC declaration into register lists for +# the return value, outputs, and inputs. +def get_registers(parse_result, bitness): + output_alloc = reg_alloc(bitness) + input_alloc = reg_alloc(bitness) + return_type, _, arguments = parse_result + + return_write = [] + output_writes = [] + input_reads = [] + + input_ngrn = 0 + output_ngrn = 0 + + # Run the input calculation. + for arg in arguments: + if arg.is_output and not arg.is_outptr: + input_ngrn += 1 + continue + + regs, increment = input_alloc.add( + input_ngrn, TYPE_SIZES[arg.type_name], align=True) + input_reads.append([arg.type_name, arg.var_name, regs]) + input_ngrn += increment + + # Include the return value if this SVC returns a value. + if return_type != "void": + regs, increment = output_alloc.add( + output_ngrn, TYPE_SIZES[return_type], align=False) + return_write.append([return_type, regs]) + output_ngrn += increment + + # Run the output calculation. + for arg in arguments: + if not arg.is_output or arg.is_outptr: + continue + + regs, increment = output_alloc.add( + output_ngrn, TYPE_SIZES[arg.type_name], align=False) + output_writes.append( + [arg.type_name, arg.var_name, regs, arg.is_address]) + output_ngrn += increment + + return (return_write, output_writes, input_reads) + + +# Collects possibly multiple source registers into the named C++ value. +def emit_gather(sources, name, type_name, reg_size): + get_fn = f"GetReg{reg_size*8}" + + if len(sources) == 1: + s, = sources + line = f"{name} = Convert<{type_name}>({get_fn}(system, {s}));" + return [line] + + var_type = f"std::array" + lines = [ + f"{var_type} {name}_gather{{}};" + ] + for i in range(0, len(sources)): + lines.append( + f"{name}_gather[{i}] = {get_fn}(system, {sources[i]});") + + lines.append(f"{name} = Convert<{type_name}>({name}_gather);") + return lines + + +# Produces one or more statements which assign the named C++ value +# into possibly multiple registers. +def emit_scatter(destinations, name, reg_size): + set_fn = f"SetReg{reg_size*8}" + reg_type = f"uint{reg_size*8}_t" + + if len(destinations) == 1: + d, = destinations + line = f"{set_fn}(system, {d}, Convert<{reg_type}>({name}));" + return [line] + + var_type = f"std::array<{reg_type}, {len(destinations)}>" + lines = [ + f"auto {name}_scatter = Convert<{var_type}>({name});" + ] + + for i in range(0, len(destinations)): + lines.append( + f"{set_fn}(system, {destinations[i]}, {name}_scatter[{i}]);") + + return lines + + +def emit_lines(lines, indent=' '): + output_lines = [] + first = True + for line in lines: + if line and not first: + output_lines.append(indent + line) + else: + output_lines.append(line) + first = False + + return "\n".join(output_lines) + + +# Emit a C++ function to wrap a guest SVC. +def emit_wrapper(wrapped_fn, suffix, register_info, arguments, byte_size): + return_write, output_writes, input_reads = register_info + lines = [ + f"static void SvcWrap_{wrapped_fn}{suffix}(Core::System& system) {{" + ] + + # Get everything ready. + for return_type, _ in return_write: + lines.append(f"{return_type} ret{{}};") + if return_write: + lines.append("") + + for output_type, var_name, _, is_address in output_writes: + output_type = "uintptr_t" if is_address else output_type + lines.append(f"{output_type} {var_name}{{}};") + for input_type, var_name, _ in input_reads: + lines.append(f"{input_type} {var_name}{{}};") + + if output_writes or input_reads: + lines.append("") + + for input_type, var_name, sources in input_reads: + lines += emit_gather(sources, var_name, input_type, byte_size) + if input_reads: + lines.append("") + + # Build the call. + call_arguments = ["system"] + for arg in arguments: + if arg.is_output and not arg.is_outptr: + call_arguments.append(f"&{arg.var_name}") + else: + call_arguments.append(arg.var_name) + + line = "" + if return_write: + line += "ret = " + + line += f"{wrapped_fn}{suffix}({', '.join(call_arguments)});" + lines.append(line) + + if return_write or output_writes: + lines.append("") + + # Write back the return value and outputs. + for _, destinations in return_write: + lines += emit_scatter(destinations, "ret", byte_size) + for _, var_name, destinations, _ in output_writes: + lines += emit_scatter(destinations, var_name, byte_size) + + # Finish. + return emit_lines(lines) + "\n}" + + +COPYRIGHT = """\ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +// This file is automatically generated using svc_generator.py. +""" + +PROLOGUE_H = """ +#pragma once + +namespace Core { +class System; +} + +#include "common/common_types.h" +#include "core/hle/kernel/svc_types.h" +#include "core/hle/result.h" + +namespace Kernel::Svc { + +// clang-format off +""" + +EPILOGUE_H = """ +// clang-format on + +// Custom ABI. +Result ReplyAndReceiveLight(Core::System& system, Handle handle, uint32_t* args); +Result ReplyAndReceiveLight64From32(Core::System& system, Handle handle, uint32_t* args); +Result ReplyAndReceiveLight64(Core::System& system, Handle handle, uint32_t* args); + +Result SendSyncRequestLight(Core::System& system, Handle session_handle, uint32_t* args); +Result SendSyncRequestLight64From32(Core::System& system, Handle session_handle, uint32_t* args); +Result SendSyncRequestLight64(Core::System& system, Handle session_handle, uint32_t* args); + +void CallSecureMonitor(Core::System& system, lp64::SecureMonitorArguments* args); +void CallSecureMonitor64From32(Core::System& system, ilp32::SecureMonitorArguments* args); +void CallSecureMonitor64(Core::System& system, lp64::SecureMonitorArguments* args); + +// Defined in svc_light_ipc.cpp. +void SvcWrap_ReplyAndReceiveLight64From32(Core::System& system); +void SvcWrap_ReplyAndReceiveLight64(Core::System& system); + +void SvcWrap_SendSyncRequestLight64From32(Core::System& system); +void SvcWrap_SendSyncRequestLight64(Core::System& system); + +// Defined in svc_secure_monitor_call.cpp. +void SvcWrap_CallSecureMonitor64From32(Core::System& system); +void SvcWrap_CallSecureMonitor64(Core::System& system); + +// Perform a supervisor call by index. +void Call(Core::System& system, u32 imm); + +} // namespace Kernel::Svc +""" + +PROLOGUE_CPP = """ +#include + +#include "core/arm/arm_interface.h" +#include "core/core.h" +#include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/svc.h" + +namespace Kernel::Svc { + +static uint32_t GetReg32(Core::System& system, int n) { + return static_cast(system.CurrentArmInterface().GetReg(n)); +} + +static void SetReg32(Core::System& system, int n, uint32_t result) { + system.CurrentArmInterface().SetReg(n, static_cast(result)); +} + +static uint64_t GetReg64(Core::System& system, int n) { + return system.CurrentArmInterface().GetReg(n); +} + +static void SetReg64(Core::System& system, int n, uint64_t result) { + system.CurrentArmInterface().SetReg(n, result); +} + +// Like bit_cast, but handles the case when the source and dest +// are differently-sized. +template + requires(std::is_trivial_v && std::is_trivially_copyable_v) +static To Convert(const From& from) { + To to{}; + + if constexpr (sizeof(To) >= sizeof(From)) { + std::memcpy(&to, &from, sizeof(From)); + } else { + std::memcpy(&to, &from, sizeof(To)); + } + + return to; +} + +// clang-format off +""" + +EPILOGUE_CPP = """ +// clang-format on + +void Call(Core::System& system, u32 imm) { + auto& kernel = system.Kernel(); + kernel.EnterSVCProfile(); + + if (system.CurrentProcess()->Is64BitProcess()) { + Call64(system, imm); + } else { + Call32(system, imm); + } + + kernel.ExitSVCProfile(); +} + +} // namespace Kernel::Svc +""" + + +def emit_call(bitness, names, suffix): + bit_size = REG_SIZES[bitness]*8 + indent = " " + lines = [ + f"static void Call{bit_size}(Core::System& system, u32 imm) {{", + f"{indent}switch (static_cast(imm)) {{" + ] + + for _, name in names: + lines.append(f"{indent}case SvcId::{name}:") + lines.append(f"{indent*2}return SvcWrap_{name}{suffix}(system);") + + lines.append(f"{indent}default:") + lines.append( + f"{indent*2}LOG_CRITICAL(Kernel_SVC, \"Unknown SVC {{:x}}!\", imm);") + lines.append(f"{indent*2}break;") + lines.append(f"{indent}}}") + lines.append("}") + + return "\n".join(lines) + + +def build_fn_declaration(return_type, name, arguments): + arg_list = ["Core::System& system"] + for arg in arguments: + type_name = "uintptr_t" if arg.is_address else arg.type_name + pointer = "*" if arg.is_output and not arg.is_outptr else "" + arg_list.append(f"{type_name}{pointer} {arg.var_name}") + + return f"{return_type} {name}({', '.join(arg_list)});" + + +def build_enum_declarations(): + lines = ["enum class SvcId : u32 {"] + indent = " " + + for imm, decl in SVCS: + _, name, _ = parse_declaration(decl, BIT_64) + lines.append(f"{indent}{name} = {hex(imm)},") + + lines.append("};") + return "\n".join(lines) + + +def main(): + arch_fw_declarations = [[], []] + svc_fw_declarations = [] + wrapper_fns = [] + names = [] + + for imm, decl in SVCS: + return_type, name, arguments = parse_declaration(decl, BIT_64) + + if imm not in SKIP_WRAPPERS: + svc_fw_declarations.append( + build_fn_declaration(return_type, name, arguments)) + + names.append([imm, name]) + + for bitness in range(2): + byte_size = REG_SIZES[bitness] + suffix = SUFFIX_NAMES[bitness] + + for imm, decl in SVCS: + if imm in SKIP_WRAPPERS: + continue + + parse_result = parse_declaration(decl, bitness) + return_type, name, arguments = parse_result + + register_info = get_registers(parse_result, bitness) + wrapper_fns.append( + emit_wrapper(name, suffix, register_info, arguments, byte_size)) + arch_fw_declarations[bitness].append( + build_fn_declaration(return_type, name + suffix, arguments)) + + call_32 = emit_call(BIT_32, names, SUFFIX_NAMES[BIT_32]) + call_64 = emit_call(BIT_64, names, SUFFIX_NAMES[BIT_64]) + enum_decls = build_enum_declarations() + + with open("svc.h", "w") as f: + f.write(COPYRIGHT) + f.write(PROLOGUE_H) + f.write("\n".join(svc_fw_declarations)) + f.write("\n\n") + f.write("\n".join(arch_fw_declarations[BIT_32])) + f.write("\n\n") + f.write("\n".join(arch_fw_declarations[BIT_64])) + f.write("\n\n") + f.write(enum_decls) + f.write(EPILOGUE_H) + + with open("svc.cpp", "w") as f: + f.write(COPYRIGHT) + f.write(PROLOGUE_CPP) + f.write(emit_size_check()) + f.write("\n\n") + f.write("\n\n".join(wrapper_fns)) + f.write("\n\n") + f.write(call_32) + f.write("\n\n") + f.write(call_64) + f.write(EPILOGUE_CPP) + + print(f"Done (emitted {len(names)} definitions)") + + +if __name__ == "__main__": + main() diff --git a/src/core/hle/kernel/svc_results.h b/src/core/hle/kernel/svc_results.h index b7ca53085..e1ad78607 100644 --- a/src/core/hle/kernel/svc_results.h +++ b/src/core/hle/kernel/svc_results.h @@ -11,6 +11,7 @@ namespace Kernel { constexpr Result ResultOutOfSessions{ErrorModule::Kernel, 7}; constexpr Result ResultInvalidArgument{ErrorModule::Kernel, 14}; +constexpr Result ResultNotImplemented{ErrorModule::Kernel, 33}; constexpr Result ResultNoSynchronizationObject{ErrorModule::Kernel, 57}; constexpr Result ResultTerminationRequested{ErrorModule::Kernel, 59}; constexpr Result ResultInvalidSize{ErrorModule::Kernel, 101}; diff --git a/src/core/hle/kernel/svc_types.h b/src/core/hle/kernel/svc_types.h index e90c35601..542c13461 100644 --- a/src/core/hle/kernel/svc_types.h +++ b/src/core/hle/kernel/svc_types.h @@ -168,6 +168,7 @@ enum class BreakReason : u32 { NotificationOnlyFlag = 0x80000000, }; +DECLARE_ENUM_FLAG_OPERATORS(BreakReason); enum class DebugEvent : u32 { CreateProcess = 0, @@ -596,6 +597,11 @@ enum class ProcessInfoType : u32 { ProcessState = 0, }; +enum class ProcessActivity : u32 { + Runnable, + Paused, +}; + struct CreateProcessParameter { std::array name; u32 version; @@ -611,4 +617,9 @@ static_assert(sizeof(CreateProcessParameter) == 0x30); constexpr size_t NumSupervisorCalls = 0xC0; using SvcAccessFlagSet = std::bitset; +enum class InitialProcessIdRangeInfo : u64 { + Minimum = 0, + Maximum = 1, +}; + } // namespace Kernel::Svc diff --git a/src/core/hle/kernel/svc_wrap.h b/src/core/hle/kernel/svc_wrap.h deleted file mode 100644 index 052be40dd..000000000 --- a/src/core/hle/kernel/svc_wrap.h +++ /dev/null @@ -1,733 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "common/common_types.h" -#include "core/arm/arm_interface.h" -#include "core/core.h" -#include "core/hle/kernel/svc_types.h" -#include "core/hle/result.h" -#include "core/memory.h" - -namespace Kernel { - -static inline u64 Param(const Core::System& system, int n) { - return system.CurrentArmInterface().GetReg(n); -} - -static inline u32 Param32(const Core::System& system, int n) { - return static_cast(system.CurrentArmInterface().GetReg(n)); -} - -/** - * HLE a function return from the current ARM userland process - * @param system System context - * @param result Result to return - */ -static inline void FuncReturn(Core::System& system, u64 result) { - system.CurrentArmInterface().SetReg(0, result); -} - -static inline void FuncReturn32(Core::System& system, u32 result) { - system.CurrentArmInterface().SetReg(0, (u64)result); -} - -//////////////////////////////////////////////////////////////////////////////////////////////////// -// Function wrappers that return type Result - -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, Param(system, 0)).raw); -} - -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, Param(system, 0), Param(system, 1)).raw); -} - -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, static_cast(Param(system, 0))).raw); -} - -template -void SvcWrap64(Core::System& system) { - FuncReturn( - system, - func(system, static_cast(Param(system, 0)), static_cast(Param(system, 1))).raw); -} - -// Used by SetThreadActivity -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, static_cast(Param(system, 0)), - static_cast(Param(system, 1))) - .raw); -} - -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, static_cast(Param(system, 0)), Param(system, 1), - Param(system, 2), Param(system, 3)) - .raw); -} - -// Used by MapProcessMemory and UnmapProcessMemory -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, Param(system, 0), static_cast(Param(system, 1)), - Param(system, 2), Param(system, 3)) - .raw); -} - -// Used by ControlCodeMemory -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, static_cast(Param(system, 0)), - static_cast(Param(system, 1)), Param(system, 2), Param(system, 3), - static_cast(Param(system, 4))) - .raw); -} - -template -void SvcWrap64(Core::System& system) { - u32 param = 0; - const u32 retval = func(system, ¶m).raw; - system.CurrentArmInterface().SetReg(1, param); - FuncReturn(system, retval); -} - -template -void SvcWrap64(Core::System& system) { - u32 param_1 = 0; - const u32 retval = func(system, ¶m_1, static_cast(Param(system, 1))).raw; - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -template -void SvcWrap64(Core::System& system) { - u32 param_1 = 0; - u32 param_2 = 0; - const u32 retval = func(system, ¶m_1, ¶m_2).raw; - - auto& arm_interface = system.CurrentArmInterface(); - arm_interface.SetReg(1, param_1); - arm_interface.SetReg(2, param_2); - - FuncReturn(system, retval); -} - -template -void SvcWrap64(Core::System& system) { - u32 param_1 = 0; - const u32 retval = func(system, ¶m_1, Param(system, 1)).raw; - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -template -void SvcWrap64(Core::System& system) { - u32 param_1 = 0; - const u32 retval = - func(system, ¶m_1, Param(system, 1), static_cast(Param(system, 2))).raw; - - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -template -void SvcWrap64(Core::System& system) { - u64 param_1 = 0; - const u32 retval = func(system, ¶m_1, static_cast(Param(system, 1))).raw; - - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, Param(system, 0), static_cast(Param(system, 1))).raw); -} - -template -void SvcWrap64(Core::System& system) { - u64 param_1 = 0; - const u32 retval = func(system, ¶m_1, Param(system, 1)).raw; - - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -template -void SvcWrap64(Core::System& system) { - u64 param_1 = 0; - const u32 retval = func(system, ¶m_1, static_cast(Param(system, 1)), - static_cast(Param(system, 2))) - .raw; - - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -// Used by GetResourceLimitLimitValue. -template -void SvcWrap64(Core::System& system) { - u64 param_1 = 0; - const u32 retval = func(system, ¶m_1, static_cast(Param(system, 1)), - static_cast(Param(system, 2))) - .raw; - - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, static_cast(Param(system, 0)), Param(system, 1)).raw); -} - -// Used by SetResourceLimitLimitValue -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, static_cast(Param(system, 0)), - static_cast(Param(system, 1)), Param(system, 2)) - .raw); -} - -// Used by SetThreadCoreMask -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, static_cast(Param(system, 0)), - static_cast(Param(system, 1)), Param(system, 2)) - .raw); -} - -// Used by GetThreadCoreMask -template -void SvcWrap64(Core::System& system) { - s32 param_1 = 0; - u64 param_2 = 0; - const Result retval = func(system, static_cast(Param(system, 2)), ¶m_1, ¶m_2); - - system.CurrentArmInterface().SetReg(1, param_1); - system.CurrentArmInterface().SetReg(2, param_2); - FuncReturn(system, retval.raw); -} - -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, Param(system, 0), Param(system, 1), - static_cast(Param(system, 2)), static_cast(Param(system, 3))) - .raw); -} - -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, Param(system, 0), Param(system, 1), - static_cast(Param(system, 2)), Param(system, 3)) - .raw); -} - -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, static_cast(Param(system, 0)), Param(system, 1), - static_cast(Param(system, 2))) - .raw); -} - -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, Param(system, 0), Param(system, 1), Param(system, 2)).raw); -} - -template -void SvcWrap64(Core::System& system) { - FuncReturn( - system, - func(system, Param(system, 0), Param(system, 1), static_cast(Param(system, 2))).raw); -} - -// Used by SetMemoryPermission -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, Param(system, 0), Param(system, 1), - static_cast(Param(system, 2))) - .raw); -} - -// Used by MapSharedMemory -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, static_cast(Param(system, 0)), Param(system, 1), - Param(system, 2), static_cast(Param(system, 3))) - .raw); -} - -template -void SvcWrap64(Core::System& system) { - FuncReturn( - system, - func(system, static_cast(Param(system, 0)), Param(system, 1), Param(system, 2)).raw); -} - -// Used by WaitSynchronization -template -void SvcWrap64(Core::System& system) { - s32 param_1 = 0; - const u32 retval = func(system, ¶m_1, Param(system, 1), static_cast(Param(system, 2)), - static_cast(Param(system, 3))) - .raw; - - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system, Param(system, 0), Param(system, 1), - static_cast(Param(system, 2)), static_cast(Param(system, 3))) - .raw); -} - -// Used by GetInfo -template -void SvcWrap64(Core::System& system) { - u64 param_1 = 0; - const u32 retval = func(system, ¶m_1, Param(system, 1), - static_cast(Param(system, 2)), Param(system, 3)) - .raw; - - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -template -void SvcWrap64(Core::System& system) { - u32 param_1 = 0; - const u32 retval = func(system, ¶m_1, Param(system, 1), Param(system, 2), Param(system, 3), - static_cast(Param(system, 4)), static_cast(Param(system, 5))) - .raw; - - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -// Used by CreateTransferMemory -template -void SvcWrap64(Core::System& system) { - u32 param_1 = 0; - const u32 retval = func(system, ¶m_1, Param(system, 1), Param(system, 2), - static_cast(Param(system, 3))) - .raw; - - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -// Used by CreateCodeMemory -template -void SvcWrap64(Core::System& system) { - u32 param_1 = 0; - const u32 retval = func(system, ¶m_1, Param(system, 1), Param(system, 2)).raw; - - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -template -void SvcWrap64(Core::System& system) { - u32 param_1 = 0; - const u32 retval = func(system, ¶m_1, Param(system, 1), static_cast(Param(system, 2)), - static_cast(Param(system, 3))) - .raw; - - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -// Used by CreateSession -template -void SvcWrap64(Core::System& system) { - Handle param_1 = 0; - Handle param_2 = 0; - const u32 retval = func(system, ¶m_1, ¶m_2, static_cast(Param(system, 2)), - static_cast(Param(system, 3))) - .raw; - - system.CurrentArmInterface().SetReg(1, param_1); - system.CurrentArmInterface().SetReg(2, param_2); - FuncReturn(system, retval); -} - -// Used by ReplyAndReceive -template -void SvcWrap64(Core::System& system) { - s32 param_1 = 0; - s32 num_handles = static_cast(Param(system, 2)); - - std::vector handles(num_handles); - system.Memory().ReadBlock(Param(system, 1), handles.data(), num_handles * sizeof(Handle)); - - const u32 retval = func(system, ¶m_1, handles.data(), num_handles, - static_cast(Param(system, 3)), static_cast(Param(system, 4))) - .raw; - - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -// Used by WaitForAddress -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, - func(system, Param(system, 0), static_cast(Param(system, 1)), - static_cast(Param(system, 2)), static_cast(Param(system, 3))) - .raw); -} - -// Used by SignalToAddress -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, - func(system, Param(system, 0), static_cast(Param(system, 1)), - static_cast(Param(system, 2)), static_cast(Param(system, 3))) - .raw); -} - -//////////////////////////////////////////////////////////////////////////////////////////////////// -// Function wrappers that return type u32 - -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system)); -} - -//////////////////////////////////////////////////////////////////////////////////////////////////// -// Function wrappers that return type u64 - -template -void SvcWrap64(Core::System& system) { - FuncReturn(system, func(system)); -} - -//////////////////////////////////////////////////////////////////////////////////////////////////// -/// Function wrappers that return type void - -template -void SvcWrap64(Core::System& system) { - func(system); -} - -template -void SvcWrap64(Core::System& system) { - func(system, static_cast(Param(system, 0))); -} - -template -void SvcWrap64(Core::System& system) { - func(system, static_cast(Param(system, 0)), Param(system, 1), Param(system, 2), - Param(system, 3)); -} - -template -void SvcWrap64(Core::System& system) { - func(system, static_cast(Param(system, 0))); -} - -template -void SvcWrap64(Core::System& system) { - func(system, Param(system, 0), static_cast(Param(system, 1))); -} - -template -void SvcWrap64(Core::System& system) { - func(system, Param(system, 0), Param(system, 1)); -} - -template -void SvcWrap64(Core::System& system) { - func(system, Param(system, 0), Param(system, 1), Param(system, 2)); -} - -template -void SvcWrap64(Core::System& system) { - func(system, static_cast(Param(system, 0)), Param(system, 1), Param(system, 2)); -} - -// Used by QueryMemory32, ArbitrateLock32 -template -void SvcWrap32(Core::System& system) { - FuncReturn32(system, - func(system, Param32(system, 0), Param32(system, 1), Param32(system, 2)).raw); -} - -// Used by Break32 -template -void SvcWrap32(Core::System& system) { - func(system, Param32(system, 0), Param32(system, 1), Param32(system, 2)); -} - -// Used by ExitProcess32, ExitThread32 -template -void SvcWrap32(Core::System& system) { - func(system); -} - -// Used by GetCurrentProcessorNumber32 -template -void SvcWrap32(Core::System& system) { - FuncReturn32(system, func(system)); -} - -// Used by SleepThread32 -template -void SvcWrap32(Core::System& system) { - func(system, Param32(system, 0), Param32(system, 1)); -} - -// Used by CreateThread32 -template -void SvcWrap32(Core::System& system) { - Handle param_1 = 0; - - const u32 retval = func(system, ¶m_1, Param32(system, 0), Param32(system, 1), - Param32(system, 2), Param32(system, 3), Param32(system, 4)) - .raw; - - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -// Used by GetInfo32 -template -void SvcWrap32(Core::System& system) { - u32 param_1 = 0; - u32 param_2 = 0; - - const u32 retval = func(system, ¶m_1, ¶m_2, Param32(system, 0), Param32(system, 1), - Param32(system, 2), Param32(system, 3)) - .raw; - - system.CurrentArmInterface().SetReg(1, param_1); - system.CurrentArmInterface().SetReg(2, param_2); - FuncReturn(system, retval); -} - -// Used by GetThreadPriority32, ConnectToNamedPort32 -template -void SvcWrap32(Core::System& system) { - u32 param_1 = 0; - const u32 retval = func(system, ¶m_1, Param32(system, 1)).raw; - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -// Used by GetThreadId32 -template -void SvcWrap32(Core::System& system) { - u32 param_1 = 0; - u32 param_2 = 0; - - const u32 retval = func(system, ¶m_1, ¶m_2, Param32(system, 1)).raw; - system.CurrentArmInterface().SetReg(1, param_1); - system.CurrentArmInterface().SetReg(2, param_2); - FuncReturn(system, retval); -} - -// Used by GetSystemTick32 -template -void SvcWrap32(Core::System& system) { - u32 param_1 = 0; - u32 param_2 = 0; - - func(system, ¶m_1, ¶m_2); - system.CurrentArmInterface().SetReg(0, param_1); - system.CurrentArmInterface().SetReg(1, param_2); -} - -// Used by CreateEvent32 -template -void SvcWrap32(Core::System& system) { - Handle param_1 = 0; - Handle param_2 = 0; - - const u32 retval = func(system, ¶m_1, ¶m_2).raw; - system.CurrentArmInterface().SetReg(1, param_1); - system.CurrentArmInterface().SetReg(2, param_2); - FuncReturn(system, retval); -} - -// Used by GetThreadId32 -template -void SvcWrap32(Core::System& system) { - u32 param_1 = 0; - u32 param_2 = 0; - u32 param_3 = 0; - - const u32 retval = func(system, Param32(system, 2), ¶m_1, ¶m_2, ¶m_3).raw; - system.CurrentArmInterface().SetReg(1, param_1); - system.CurrentArmInterface().SetReg(2, param_2); - system.CurrentArmInterface().SetReg(3, param_3); - FuncReturn(system, retval); -} - -// Used by GetThreadCoreMask32 -template -void SvcWrap32(Core::System& system) { - s32 param_1 = 0; - u32 param_2 = 0; - u32 param_3 = 0; - - const u32 retval = func(system, Param32(system, 2), ¶m_1, ¶m_2, ¶m_3).raw; - system.CurrentArmInterface().SetReg(1, param_1); - system.CurrentArmInterface().SetReg(2, param_2); - system.CurrentArmInterface().SetReg(3, param_3); - FuncReturn(system, retval); -} - -// Used by SignalProcessWideKey32 -template -void SvcWrap32(Core::System& system) { - func(system, static_cast(Param(system, 0)), static_cast(Param(system, 1))); -} - -// Used by SetThreadActivity32 -template -void SvcWrap32(Core::System& system) { - const u32 retval = func(system, static_cast(Param(system, 0)), - static_cast(Param(system, 1))) - .raw; - FuncReturn(system, retval); -} - -// Used by SetThreadPriority32 -template -void SvcWrap32(Core::System& system) { - const u32 retval = - func(system, static_cast(Param(system, 0)), static_cast(Param(system, 1))).raw; - FuncReturn(system, retval); -} - -// Used by SetMemoryAttribute32 -template -void SvcWrap32(Core::System& system) { - const u32 retval = - func(system, static_cast(Param(system, 0)), static_cast(Param(system, 1)), - static_cast(Param(system, 2)), static_cast(Param(system, 3))) - .raw; - FuncReturn(system, retval); -} - -// Used by MapSharedMemory32 -template -void SvcWrap32(Core::System& system) { - const u32 retval = func(system, static_cast(Param(system, 0)), - static_cast(Param(system, 1)), static_cast(Param(system, 2)), - static_cast(Param(system, 3))) - .raw; - FuncReturn(system, retval); -} - -// Used by SetThreadCoreMask32 -template -void SvcWrap32(Core::System& system) { - const u32 retval = - func(system, static_cast(Param(system, 0)), static_cast(Param(system, 1)), - static_cast(Param(system, 2)), static_cast(Param(system, 3))) - .raw; - FuncReturn(system, retval); -} - -// Used by WaitProcessWideKeyAtomic32 -template -void SvcWrap32(Core::System& system) { - const u32 retval = - func(system, static_cast(Param(system, 0)), static_cast(Param(system, 1)), - static_cast(Param(system, 2)), static_cast(Param(system, 3)), - static_cast(Param(system, 4))) - .raw; - FuncReturn(system, retval); -} - -// Used by WaitForAddress32 -template -void SvcWrap32(Core::System& system) { - const u32 retval = func(system, static_cast(Param(system, 0)), - static_cast(Param(system, 1)), - static_cast(Param(system, 2)), static_cast(Param(system, 3)), - static_cast(Param(system, 4))) - .raw; - FuncReturn(system, retval); -} - -// Used by SignalToAddress32 -template -void SvcWrap32(Core::System& system) { - const u32 retval = func(system, static_cast(Param(system, 0)), - static_cast(Param(system, 1)), - static_cast(Param(system, 2)), static_cast(Param(system, 3))) - .raw; - FuncReturn(system, retval); -} - -// Used by SendSyncRequest32, ArbitrateUnlock32 -template -void SvcWrap32(Core::System& system) { - FuncReturn(system, func(system, static_cast(Param(system, 0))).raw); -} - -// Used by CreateTransferMemory32 -template -void SvcWrap32(Core::System& system) { - Handle handle = 0; - const u32 retval = func(system, &handle, Param32(system, 1), Param32(system, 2), - static_cast(Param32(system, 3))) - .raw; - system.CurrentArmInterface().SetReg(1, handle); - FuncReturn(system, retval); -} - -// Used by WaitSynchronization32 -template -void SvcWrap32(Core::System& system) { - s32 param_1 = 0; - const u32 retval = func(system, Param32(system, 0), Param32(system, 1), Param32(system, 2), - Param32(system, 3), ¶m_1) - .raw; - system.CurrentArmInterface().SetReg(1, param_1); - FuncReturn(system, retval); -} - -// Used by CreateCodeMemory32 -template -void SvcWrap32(Core::System& system) { - Handle handle = 0; - - const u32 retval = func(system, &handle, Param32(system, 1), Param32(system, 2)).raw; - - system.CurrentArmInterface().SetReg(1, handle); - FuncReturn(system, retval); -} - -// Used by ControlCodeMemory32 -template -void SvcWrap32(Core::System& system) { - const u32 retval = - func(system, Param32(system, 0), Param32(system, 1), Param(system, 2), Param(system, 4), - static_cast(Param32(system, 6))) - .raw; - - FuncReturn(system, retval); -} - -// Used by Invalidate/Store/FlushProcessDataCache32 -template -void SvcWrap32(Core::System& system) { - const u64 address = (Param(system, 3) << 32) | Param(system, 2); - const u64 size = (Param(system, 4) << 32) | Param(system, 1); - FuncReturn32(system, func(system, Param32(system, 0), address, size).raw); -} - -} // namespace Kernel From 8551ac60080451f2defd3fead38abf331a48f964 Mon Sep 17 00:00:00 2001 From: Behunin Date: Tue, 7 Feb 2023 17:21:17 -0700 Subject: [PATCH 0034/1181] Remove OnCommandListEndCommand Call rasterizer->ReleaseFences() directly --- src/video_core/gpu.cpp | 2 +- src/video_core/gpu_thread.cpp | 6 ------ src/video_core/gpu_thread.h | 8 +------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index c6d54be63..7024a19cf 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp @@ -99,7 +99,7 @@ struct GPU::Impl { /// Signal the ending of command list. void OnCommandListEnd() { - gpu_thread.OnCommandListEnd(); + rasterizer->ReleaseFences(); } /// Request a host GPU memory flush from the CPU. diff --git a/src/video_core/gpu_thread.cpp b/src/video_core/gpu_thread.cpp index 164a5252a..9c103c0d4 100644 --- a/src/video_core/gpu_thread.cpp +++ b/src/video_core/gpu_thread.cpp @@ -40,8 +40,6 @@ static void RunThread(std::stop_token stop_token, Core::System& system, scheduler.Push(submit_list->channel, std::move(submit_list->entries)); } else if (const auto* data = std::get_if(&next.data)) { renderer.SwapBuffers(data->framebuffer ? &*data->framebuffer : nullptr); - } else if (std::holds_alternative(next.data)) { - rasterizer->ReleaseFences(); } else if (std::holds_alternative(next.data)) { system.GPU().TickWork(); } else if (const auto* flush = std::get_if(&next.data)) { @@ -110,10 +108,6 @@ void ThreadManager::FlushAndInvalidateRegion(VAddr addr, u64 size) { rasterizer->OnCPUWrite(addr, size); } -void ThreadManager::OnCommandListEnd() { - PushCommand(OnCommandListEndCommand()); -} - u64 ThreadManager::PushCommand(CommandData&& command_data, bool block) { if (!is_async) { // In synchronous GPU mode, block the caller until the command has executed diff --git a/src/video_core/gpu_thread.h b/src/video_core/gpu_thread.h index c71a419c7..90bcb5958 100644 --- a/src/video_core/gpu_thread.h +++ b/src/video_core/gpu_thread.h @@ -77,16 +77,12 @@ struct FlushAndInvalidateRegionCommand final { u64 size; }; -/// Command called within the gpu, to schedule actions after a command list end -struct OnCommandListEndCommand final {}; - /// Command to make the gpu look into pending requests struct GPUTickCommand final {}; using CommandData = std::variant; + InvalidateRegionCommand, FlushAndInvalidateRegionCommand, GPUTickCommand>; struct CommandDataContainer { CommandDataContainer() = default; @@ -134,8 +130,6 @@ public: /// Notify rasterizer that any caches of the specified region should be flushed and invalidated void FlushAndInvalidateRegion(VAddr addr, u64 size); - void OnCommandListEnd(); - void TickGPU(); private: From c27006e99d8cba4386a88b3fe5141eac7ef7deeb Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Tue, 7 Feb 2023 21:10:15 -0600 Subject: [PATCH 0035/1181] service: hid: Return error if arguments of SetSupportedNpadIdType is invalid --- src/core/hle/service/hid/controllers/npad.cpp | 12 ++++++++++-- src/core/hle/service/hid/controllers/npad.h | 2 +- src/core/hle/service/hid/errors.h | 1 + src/core/hle/service/hid/hid.cpp | 6 +++--- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 513ea485a..80eba22e8 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -758,12 +758,20 @@ Core::HID::NpadStyleTag Controller_NPad::GetSupportedStyleSet() const { return hid_core.GetSupportedStyleTag(); } -void Controller_NPad::SetSupportedNpadIdTypes(std::span data) { +Result Controller_NPad::SetSupportedNpadIdTypes(std::span data) { + constexpr std::size_t max_number_npad_ids = 0xa; const auto length = data.size(); ASSERT(length > 0 && (length % sizeof(u32)) == 0); + const std::size_t elements = length / sizeof(u32); + + if (elements > max_number_npad_ids) { + return InvalidArraySize; + } + supported_npad_id_types.clear(); - supported_npad_id_types.resize(length / sizeof(u32)); + supported_npad_id_types.resize(elements); std::memcpy(supported_npad_id_types.data(), data.data(), length); + return ResultSuccess; } void Controller_NPad::GetSupportedNpadIdTypes(u32* data, std::size_t max_length) { diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 1f7d33459..02cc00920 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -96,7 +96,7 @@ public: void SetSupportedStyleSet(Core::HID::NpadStyleTag style_set); Core::HID::NpadStyleTag GetSupportedStyleSet() const; - void SetSupportedNpadIdTypes(std::span data); + Result SetSupportedNpadIdTypes(std::span data); void GetSupportedNpadIdTypes(u32* data, std::size_t max_length); std::size_t GetSupportedNpadIdTypesSize() const; diff --git a/src/core/hle/service/hid/errors.h b/src/core/hle/service/hid/errors.h index 76208e9a4..9585bdaf0 100644 --- a/src/core/hle/service/hid/errors.h +++ b/src/core/hle/service/hid/errors.h @@ -18,6 +18,7 @@ constexpr Result NpadIsDualJoycon{ErrorModule::HID, 601}; constexpr Result NpadIsSameType{ErrorModule::HID, 602}; constexpr Result InvalidNpadId{ErrorModule::HID, 709}; constexpr Result NpadNotConnected{ErrorModule::HID, 710}; +constexpr Result InvalidArraySize{ErrorModule::HID, 715}; constexpr Result InvalidPalmaHandle{ErrorModule::HID, 3302}; } // namespace Service::HID diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index f15f1a6bb..ac2c0c76d 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -1025,13 +1025,13 @@ void Hid::SetSupportedNpadIdType(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; - applet_resource->GetController(HidController::NPad) - .SetSupportedNpadIdTypes(ctx.ReadBuffer()); + const auto result = applet_resource->GetController(HidController::NPad) + .SetSupportedNpadIdTypes(ctx.ReadBuffer()); LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); + rb.Push(result); } void Hid::ActivateNpad(Kernel::HLERequestContext& ctx) { From 04139cb3edeb4b596e89c98435afd19ed6be85fb Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Wed, 8 Feb 2023 19:34:39 -0500 Subject: [PATCH 0036/1181] glsl_emit_context: Remove redeclarations of gl_SampleID and gl_SampleMask These built-ins seem to be available without needing to be declared for fragment shaders, similar i.e. to gl_FragDepth --- src/shader_recompiler/backend/glsl/glsl_emit_context.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/shader_recompiler/backend/glsl/glsl_emit_context.cpp b/src/shader_recompiler/backend/glsl/glsl_emit_context.cpp index 1b006e811..c3c2281bb 100644 --- a/src/shader_recompiler/backend/glsl/glsl_emit_context.cpp +++ b/src/shader_recompiler/backend/glsl/glsl_emit_context.cpp @@ -310,12 +310,6 @@ EmitContext::EmitContext(IR::Program& program, Bindings& bindings, const Profile if (runtime_info.force_early_z) { header += "layout(early_fragment_tests)in;"; } - if (info.uses_sample_id) { - header += "in int gl_SampleID;"; - } - if (info.stores_sample_mask) { - header += "out int gl_SampleMask[];"; - } break; case Stage::Compute: stage_name = "cs"; From eb9f16dce48f517ea33aad4a59e369bc51fdf26a Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Wed, 8 Feb 2023 18:31:52 -0500 Subject: [PATCH 0037/1181] buffer_base: Partially revert changes from #9559 This fixes a regression where Yoshi's Crafted World (and potentially other titles) would enter an infinite loop when GPU Accuracy was set to "Normal" --- src/tests/video_core/buffer_base.cpp | 2 +- src/video_core/buffer_cache/buffer_base.h | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/tests/video_core/buffer_base.cpp b/src/tests/video_core/buffer_base.cpp index 1275cca24..734dbf4b6 100644 --- a/src/tests/video_core/buffer_base.cpp +++ b/src/tests/video_core/buffer_base.cpp @@ -538,7 +538,7 @@ TEST_CASE("BufferBase: Cached write downloads") { int num = 0; buffer.ForEachDownloadRangeAndClear(c, WORD, [&](u64 offset, u64 size) { ++num; }); buffer.ForEachUploadRange(c, WORD, [&](u64 offset, u64 size) { ++num; }); - REQUIRE(num == 1); + REQUIRE(num == 0); REQUIRE(!buffer.IsRegionCpuModified(c + PAGE, PAGE)); REQUIRE(!buffer.IsRegionGpuModified(c + PAGE, PAGE)); buffer.FlushCachedWrites(); diff --git a/src/video_core/buffer_cache/buffer_base.h b/src/video_core/buffer_cache/buffer_base.h index c47b7d866..92d77eef2 100644 --- a/src/video_core/buffer_cache/buffer_base.h +++ b/src/video_core/buffer_cache/buffer_base.h @@ -430,7 +430,7 @@ private: if (query_begin >= SizeBytes() || size < 0) { return; } - [[maybe_unused]] u64* const untracked_words = Array(); + u64* const untracked_words = Array(); u64* const state_words = Array(); const u64 query_end = query_begin + std::min(static_cast(size), SizeBytes()); u64* const words_begin = state_words + query_begin / BYTES_PER_WORD; @@ -483,7 +483,7 @@ private: NotifyRasterizer(word_index, current_bits, ~u64{0}); } // Exclude CPU modified pages when visiting GPU pages - const u64 word = current_word; + const u64 word = current_word & ~(type == Type::GPU ? untracked_words[word_index] : 0); u64 page = page_begin; page_begin = 0; @@ -531,7 +531,7 @@ private: [[nodiscard]] bool IsRegionModified(u64 offset, u64 size) const noexcept { static_assert(type != Type::Untracked); - [[maybe_unused]] const u64* const untracked_words = Array(); + const u64* const untracked_words = Array(); const u64* const state_words = Array(); const u64 num_query_words = size / BYTES_PER_WORD + 1; const u64 word_begin = offset / BYTES_PER_WORD; @@ -539,7 +539,8 @@ private: const u64 page_limit = Common::DivCeil(offset + size, BYTES_PER_PAGE); u64 page_index = (offset / BYTES_PER_PAGE) % PAGES_PER_WORD; for (u64 word_index = word_begin; word_index < word_end; ++word_index, page_index = 0) { - const u64 word = state_words[word_index]; + const u64 off_word = type == Type::GPU ? untracked_words[word_index] : 0; + const u64 word = state_words[word_index] & ~off_word; if (word == 0) { continue; } @@ -563,7 +564,7 @@ private: [[nodiscard]] std::pair ModifiedRegion(u64 offset, u64 size) const noexcept { static_assert(type != Type::Untracked); - [[maybe_unused]] const u64* const untracked_words = Array(); + const u64* const untracked_words = Array(); const u64* const state_words = Array(); const u64 num_query_words = size / BYTES_PER_WORD + 1; const u64 word_begin = offset / BYTES_PER_WORD; @@ -573,7 +574,8 @@ private: u64 begin = std::numeric_limits::max(); u64 end = 0; for (u64 word_index = word_begin; word_index < word_end; ++word_index) { - const u64 word = state_words[word_index]; + const u64 off_word = type == Type::GPU ? untracked_words[word_index] : 0; + const u64 word = state_words[word_index] & ~off_word; if (word == 0) { continue; } From 5e9fa5def5cf5ae3f00cc354a0b1363123dc6930 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Thu, 9 Feb 2023 19:05:20 -0600 Subject: [PATCH 0038/1181] core: hid: Use gyro thresholds modes set by the game --- src/core/hid/emulated_controller.cpp | 22 ++++++++++++++++++- src/core/hid/emulated_controller.h | 5 ++++- src/core/hid/hid_types.h | 7 ++++++ src/core/hid/motion_input.cpp | 12 ++++++---- src/core/hid/motion_input.h | 15 +++++++++++++ src/core/hle/service/hid/controllers/npad.cpp | 7 ++++-- src/core/hle/service/hid/controllers/npad.h | 14 ++++-------- src/core/hle/service/hid/hid.cpp | 6 ++--- 8 files changed, 67 insertions(+), 21 deletions(-) diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index 631aa6ad2..6d5a3dead 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp @@ -957,7 +957,7 @@ void EmulatedController::SetMotion(const Common::Input::CallbackStatus& callback raw_status.gyro.y.value, raw_status.gyro.z.value, }); - emulated.SetGyroThreshold(raw_status.gyro.x.properties.threshold); + emulated.SetUserGyroThreshold(raw_status.gyro.x.properties.threshold); emulated.UpdateRotation(raw_status.delta_timestamp); emulated.UpdateOrientation(raw_status.delta_timestamp); force_update_motion = raw_status.force_update; @@ -1284,6 +1284,26 @@ void EmulatedController::SetLedPattern() { } } +void EmulatedController::SetGyroscopeZeroDriftMode(GyroscopeZeroDriftMode mode) { + for (auto& motion : controller.motion_values) { + switch (mode) { + case GyroscopeZeroDriftMode::Loose: + motion_sensitivity = motion.emulated.IsAtRestLoose; + motion.emulated.SetGyroThreshold(motion.emulated.ThresholdLoose); + break; + case GyroscopeZeroDriftMode::Tight: + motion_sensitivity = motion.emulated.IsAtRestThight; + motion.emulated.SetGyroThreshold(motion.emulated.ThresholdThight); + break; + case GyroscopeZeroDriftMode::Standard: + default: + motion_sensitivity = motion.emulated.IsAtRestStandard; + motion.emulated.SetGyroThreshold(motion.emulated.ThresholdStandard); + break; + } + } +} + void EmulatedController::SetSupportedNpadStyleTag(NpadStyleTag supported_styles) { supported_style_tag = supported_styles; if (!is_connected) { diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index b02bf35c4..a9da465a2 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h @@ -398,6 +398,9 @@ public: /// Asks the output device to change the player led pattern void SetLedPattern(); + /// Changes sensitivity of the motion sensor + void SetGyroscopeZeroDriftMode(GyroscopeZeroDriftMode mode); + /** * Adds a callback to the list of events * @param update_callback A ConsoleUpdateCallback that will be triggered @@ -523,7 +526,7 @@ private: bool is_connected{false}; bool is_configuring{false}; bool system_buttons_enabled{true}; - f32 motion_sensitivity{0.01f}; + f32 motion_sensitivity{Core::HID::MotionInput::IsAtRestStandard}; bool force_update_motion{false}; u32 turbo_button_state{0}; diff --git a/src/core/hid/hid_types.h b/src/core/hid/hid_types.h index e3b1cfbc6..6b35f448c 100644 --- a/src/core/hid/hid_types.h +++ b/src/core/hid/hid_types.h @@ -282,6 +282,13 @@ enum class VibrationGcErmCommand : u64 { StopHard = 2, }; +// This is nn::hid::GyroscopeZeroDriftMode +enum class GyroscopeZeroDriftMode : u32 { + Loose = 0, + Standard = 1, + Tight = 2, +}; + // This is nn::hid::NpadStyleTag struct NpadStyleTag { union { diff --git a/src/core/hid/motion_input.cpp b/src/core/hid/motion_input.cpp index b1f658e62..eef6edf4b 100644 --- a/src/core/hid/motion_input.cpp +++ b/src/core/hid/motion_input.cpp @@ -9,7 +9,7 @@ namespace Core::HID { MotionInput::MotionInput() { // Initialize PID constants with default values SetPID(0.3f, 0.005f, 0.0f); - SetGyroThreshold(0.007f); + SetGyroThreshold(ThresholdStandard); } void MotionInput::SetPID(f32 new_kp, f32 new_ki, f32 new_kd) { @@ -26,11 +26,11 @@ void MotionInput::SetGyroscope(const Common::Vec3f& gyroscope) { gyro = gyroscope - gyro_bias; // Auto adjust drift to minimize drift - if (!IsMoving(0.1f)) { + if (!IsMoving(IsAtRestRelaxed)) { gyro_bias = (gyro_bias * 0.9999f) + (gyroscope * 0.0001f); } - if (gyro.Length() < gyro_threshold) { + if (gyro.Length() < gyro_threshold * user_gyro_threshold) { gyro = {}; } else { only_accelerometer = false; @@ -49,6 +49,10 @@ void MotionInput::SetGyroThreshold(f32 threshold) { gyro_threshold = threshold; } +void MotionInput::SetUserGyroThreshold(f32 threshold) { + user_gyro_threshold = threshold / ThresholdStandard; +} + void MotionInput::EnableReset(bool reset) { reset_enabled = reset; } @@ -208,7 +212,7 @@ void MotionInput::ResetOrientation() { if (!reset_enabled || only_accelerometer) { return; } - if (!IsMoving(0.5f) && accel.z <= -0.9f) { + if (!IsMoving(IsAtRestRelaxed) && accel.z <= -0.9f) { ++reset_counter; if (reset_counter > 900) { quat.w = 0; diff --git a/src/core/hid/motion_input.h b/src/core/hid/motion_input.h index f5fd90db5..9180bb9aa 100644 --- a/src/core/hid/motion_input.h +++ b/src/core/hid/motion_input.h @@ -11,6 +11,15 @@ namespace Core::HID { class MotionInput { public: + static constexpr float ThresholdLoose = 0.01f; + static constexpr float ThresholdStandard = 0.007f; + static constexpr float ThresholdThight = 0.002f; + + static constexpr float IsAtRestRelaxed = 0.05f; + static constexpr float IsAtRestLoose = 0.02f; + static constexpr float IsAtRestStandard = 0.01f; + static constexpr float IsAtRestThight = 0.005f; + explicit MotionInput(); MotionInput(const MotionInput&) = default; @@ -26,6 +35,9 @@ public: void SetGyroBias(const Common::Vec3f& bias); void SetGyroThreshold(f32 threshold); + /// Applies a modifier on top of the normal gyro threshold + void SetUserGyroThreshold(f32 threshold); + void EnableReset(bool reset); void ResetRotations(); @@ -74,6 +86,9 @@ private: // Minimum gyro amplitude to detect if the device is moving f32 gyro_threshold = 0.0f; + // Multiplies gyro_threshold by this value + f32 user_gyro_threshold = 0.0f; + // Number of invalid sequential data u32 reset_counter = 0; diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 80eba22e8..ba6f04d8d 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -1132,7 +1132,8 @@ Result Controller_NPad::DisconnectNpad(Core::HID::NpadIdType npad_id) { return ResultSuccess; } Result Controller_NPad::SetGyroscopeZeroDriftMode( - const Core::HID::SixAxisSensorHandle& sixaxis_handle, GyroscopeZeroDriftMode drift_mode) { + const Core::HID::SixAxisSensorHandle& sixaxis_handle, + Core::HID::GyroscopeZeroDriftMode drift_mode) { const auto is_valid = VerifyValidSixAxisSensorHandle(sixaxis_handle); if (is_valid.IsError()) { LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw); @@ -1140,14 +1141,16 @@ Result Controller_NPad::SetGyroscopeZeroDriftMode( } auto& sixaxis = GetSixaxisState(sixaxis_handle); + auto& controller = GetControllerFromHandle(sixaxis_handle); sixaxis.gyroscope_zero_drift_mode = drift_mode; + controller.device->SetGyroscopeZeroDriftMode(drift_mode); return ResultSuccess; } Result Controller_NPad::GetGyroscopeZeroDriftMode( const Core::HID::SixAxisSensorHandle& sixaxis_handle, - GyroscopeZeroDriftMode& drift_mode) const { + Core::HID::GyroscopeZeroDriftMode& drift_mode) const { const auto is_valid = VerifyValidSixAxisSensorHandle(sixaxis_handle); if (is_valid.IsError()) { LOG_ERROR(Service_HID, "Invalid handle, error_code={}", is_valid.raw); diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 02cc00920..a5998c453 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -52,13 +52,6 @@ public: // When the controller is requesting a motion update for the shared memory void OnMotionUpdate(const Core::Timing::CoreTiming& core_timing) override; - // This is nn::hid::GyroscopeZeroDriftMode - enum class GyroscopeZeroDriftMode : u32 { - Loose = 0, - Standard = 1, - Tight = 2, - }; - // This is nn::hid::NpadJoyHoldType enum class NpadJoyHoldType : u64 { Vertical = 0, @@ -146,9 +139,9 @@ public: Result DisconnectNpad(Core::HID::NpadIdType npad_id); Result SetGyroscopeZeroDriftMode(const Core::HID::SixAxisSensorHandle& sixaxis_handle, - GyroscopeZeroDriftMode drift_mode); + Core::HID::GyroscopeZeroDriftMode drift_mode); Result GetGyroscopeZeroDriftMode(const Core::HID::SixAxisSensorHandle& sixaxis_handle, - GyroscopeZeroDriftMode& drift_mode) const; + Core::HID::GyroscopeZeroDriftMode& drift_mode) const; Result IsSixAxisSensorAtRest(const Core::HID::SixAxisSensorHandle& sixaxis_handle, bool& is_at_rest) const; Result IsFirmwareUpdateAvailableForSixAxisSensor( @@ -489,7 +482,8 @@ private: Core::HID::SixAxisSensorFusionParameters fusion{}; Core::HID::SixAxisSensorCalibrationParameter calibration{}; Core::HID::SixAxisSensorIcInformation ic_information{}; - GyroscopeZeroDriftMode gyroscope_zero_drift_mode{GyroscopeZeroDriftMode::Standard}; + Core::HID::GyroscopeZeroDriftMode gyroscope_zero_drift_mode{ + Core::HID::GyroscopeZeroDriftMode::Standard}; }; struct NpadControllerData { diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index ac2c0c76d..5a1aa0903 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -712,7 +712,7 @@ void Hid::ResetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { void Hid::SetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto sixaxis_handle{rp.PopRaw()}; - const auto drift_mode{rp.PopEnum()}; + const auto drift_mode{rp.PopEnum()}; const auto applet_resource_user_id{rp.Pop()}; auto& controller = GetAppletResource()->GetController(HidController::NPad); @@ -739,7 +739,7 @@ void Hid::GetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { const auto parameters{rp.PopRaw()}; - auto drift_mode{Controller_NPad::GyroscopeZeroDriftMode::Standard}; + auto drift_mode{Core::HID::GyroscopeZeroDriftMode::Standard}; auto& controller = GetAppletResource()->GetController(HidController::NPad); const auto result = controller.GetGyroscopeZeroDriftMode(parameters.sixaxis_handle, drift_mode); @@ -764,7 +764,7 @@ void Hid::ResetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { const auto parameters{rp.PopRaw()}; - const auto drift_mode{Controller_NPad::GyroscopeZeroDriftMode::Standard}; + const auto drift_mode{Core::HID::GyroscopeZeroDriftMode::Standard}; auto& controller = GetAppletResource()->GetController(HidController::NPad); const auto result = controller.SetGyroscopeZeroDriftMode(parameters.sixaxis_handle, drift_mode); From 7c0dcea96cef421b6f670cdc5e7b1b3ed63bf939 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Thu, 9 Feb 2023 19:38:03 -0600 Subject: [PATCH 0039/1181] audio: cubeb: Fix yuzu crashing when it test for latency --- src/audio_core/sink/cubeb_sink.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/audio_core/sink/cubeb_sink.cpp b/src/audio_core/sink/cubeb_sink.cpp index 32c1b1cb3..9133f5388 100644 --- a/src/audio_core/sink/cubeb_sink.cpp +++ b/src/audio_core/sink/cubeb_sink.cpp @@ -302,11 +302,21 @@ std::vector ListCubebSinkDevices(bool capture) { std::vector device_list; cubeb* ctx; +#ifdef _WIN32 + auto com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED); +#endif + if (cubeb_init(&ctx, "yuzu Device Enumerator", nullptr) != CUBEB_OK) { LOG_CRITICAL(Audio_Sink, "cubeb_init failed"); return {}; } +#ifdef _WIN32 + if (SUCCEEDED(com_init_result)) { + CoUninitialize(); + } +#endif + auto type{capture ? CUBEB_DEVICE_TYPE_INPUT : CUBEB_DEVICE_TYPE_OUTPUT}; cubeb_device_collection collection; if (cubeb_enumerate_devices(ctx, type, &collection) != CUBEB_OK) { @@ -329,12 +339,22 @@ std::vector ListCubebSinkDevices(bool capture) { u32 GetCubebLatency() { cubeb* ctx; +#ifdef _WIN32 + auto com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED); +#endif + if (cubeb_init(&ctx, "yuzu Latency Getter", nullptr) != CUBEB_OK) { LOG_CRITICAL(Audio_Sink, "cubeb_init failed"); // Return a large latency so we choose SDL instead. return 10000u; } +#ifdef _WIN32 + if (SUCCEEDED(com_init_result)) { + CoUninitialize(); + } +#endif + cubeb_stream_params params{}; params.rate = TargetSampleRate; params.channels = 2; From acba9a6b769f96a35e02669d87ce7b19fc47b025 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Thu, 9 Feb 2023 19:59:12 -0600 Subject: [PATCH 0040/1181] input_common: Reintroduce custom pro controller support --- src/common/settings.h | 1 + src/input_common/drivers/joycon.cpp | 49 ++++++++++++++++++- src/input_common/drivers/joycon.h | 1 + src/input_common/drivers/sdl_driver.cpp | 18 ++++++- src/input_common/helpers/joycon_driver.cpp | 3 +- src/yuzu/configuration/config.cpp | 2 + .../configure_input_advanced.cpp | 2 + .../configuration/configure_input_advanced.ui | 22 +++++++-- src/yuzu_cmd/config.cpp | 1 + 9 files changed, 92 insertions(+), 7 deletions(-) diff --git a/src/common/settings.h b/src/common/settings.h index 64db66f37..6d27dd5ee 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -488,6 +488,7 @@ struct Values { Setting enable_raw_input{false, "enable_raw_input"}; Setting controller_navigation{true, "controller_navigation"}; Setting enable_joycon_driver{true, "enable_joycon_driver"}; + Setting enable_procon_driver{false, "enable_procon_driver"}; SwitchableSetting vibration_enabled{true, "vibration_enabled"}; SwitchableSetting enable_accurate_vibrations{false, "enable_accurate_vibrations"}; diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp index 4fcfb4510..afc33db57 100644 --- a/src/input_common/drivers/joycon.cpp +++ b/src/input_common/drivers/joycon.cpp @@ -16,7 +16,7 @@ namespace InputCommon { Joycons::Joycons(const std::string& input_engine_) : InputEngine(input_engine_) { // Avoid conflicting with SDL driver - if (!Settings::values.enable_joycon_driver) { + if (!Settings::values.enable_joycon_driver && !Settings::values.enable_procon_driver) { return; } LOG_INFO(Input, "Joycon driver Initialization started"); @@ -46,6 +46,12 @@ void Joycons::Reset() { } device->Stop(); } + for (const auto& device : pro_controller) { + if (!device) { + continue; + } + device->Stop(); + } SDL_hid_exit(); } @@ -61,6 +67,11 @@ void Joycons::Setup() { PreSetController(GetIdentifier(port, Joycon::ControllerType::Right)); device = std::make_shared(port++); } + port = 0; + for (auto& device : pro_controller) { + PreSetController(GetIdentifier(port, Joycon::ControllerType::Pro)); + device = std::make_shared(port++); + } scan_thread = std::jthread([this](std::stop_token stop_token) { ScanThread(stop_token); }); } @@ -116,6 +127,9 @@ bool Joycons::IsDeviceNew(SDL_hid_device_info* device_info) const { // Check if device already exist switch (type) { case Joycon::ControllerType::Left: + if (!Settings::values.enable_joycon_driver) { + return false; + } for (const auto& device : left_joycons) { if (is_handle_identical(device)) { return false; @@ -123,12 +137,25 @@ bool Joycons::IsDeviceNew(SDL_hid_device_info* device_info) const { } break; case Joycon::ControllerType::Right: + if (!Settings::values.enable_joycon_driver) { + return false; + } for (const auto& device : right_joycons) { if (is_handle_identical(device)) { return false; } } break; + case Joycon::ControllerType::Pro: + if (!Settings::values.enable_procon_driver) { + return false; + } + for (const auto& device : pro_controller) { + if (is_handle_identical(device)) { + return false; + } + } + break; default: return false; } @@ -199,6 +226,14 @@ std::shared_ptr Joycons::GetNextFreeHandle( return *unconnected_device; } } + if (type == Joycon::ControllerType::Pro) { + const auto unconnected_device = std::ranges::find_if( + pro_controller, [](auto& device) { return !device->IsConnected(); }); + + if (unconnected_device != pro_controller.end()) { + return *unconnected_device; + } + } return nullptr; } @@ -409,6 +444,15 @@ std::shared_ptr Joycons::GetHandle(PadIdentifier identifie } } + if (type == Joycon::ControllerType::Pro) { + const auto matching_device = std::ranges::find_if( + pro_controller, [is_handle_active](auto& device) { return is_handle_active(device); }); + + if (matching_device != pro_controller.end()) { + return *matching_device; + } + } + return nullptr; } @@ -455,6 +499,9 @@ std::vector Joycons::GetInputDevices() const { for (const auto& controller : right_joycons) { add_entry(controller); } + for (const auto& controller : pro_controller) { + add_entry(controller); + } // List dual joycon pairs for (std::size_t i = 0; i < MaxSupportedControllers; i++) { diff --git a/src/input_common/drivers/joycon.h b/src/input_common/drivers/joycon.h index 2149ab7fd..473ba1b9e 100644 --- a/src/input_common/drivers/joycon.h +++ b/src/input_common/drivers/joycon.h @@ -106,6 +106,7 @@ private: // Joycon types are split by type to ease supporting dualjoycon configurations std::array, MaxSupportedControllers> left_joycons{}; std::array, MaxSupportedControllers> right_joycons{}; + std::array, MaxSupportedControllers> pro_controller{}; }; } // namespace InputCommon diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index d975eb815..88cacd615 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp @@ -343,6 +343,14 @@ void SDLDriver::InitJoystick(int joystick_index) { } } + if (Settings::values.enable_procon_driver) { + if (guid.uuid[5] == 0x05 && guid.uuid[4] == 0x7e && guid.uuid[8] == 0x09) { + LOG_WARNING(Input, "Preferring joycon driver for device index {}", joystick_index); + SDL_JoystickClose(sdl_joystick); + return; + } + } + std::scoped_lock lock{joystick_map_mutex}; if (joystick_map.find(guid) == joystick_map.end()) { auto joystick = std::make_shared(guid, 0, sdl_joystick, sdl_gamecontroller); @@ -465,13 +473,19 @@ SDLDriver::SDLDriver(std::string input_engine_) : InputEngine(std::move(input_en SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, "1"); SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1"); - // Disable hidapi drivers for switch controllers when the custom joycon driver is enabled + // Disable hidapi drivers for joycon controllers when the custom joycon driver is enabled if (Settings::values.enable_joycon_driver) { SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS, "0"); } else { SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS, "1"); } - SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_SWITCH, "1"); + + // Disable hidapi drivers for pro controllers when the custom joycon driver is enabled + if (Settings::values.enable_procon_driver) { + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_SWITCH, "0"); + } else { + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_SWITCH, "1"); + } // Disable hidapi driver for xbox. Already default on Windows, this causes conflict with native // driver on Linux. diff --git a/src/input_common/helpers/joycon_driver.cpp b/src/input_common/helpers/joycon_driver.cpp index 8f94c9f45..e65b6b845 100644 --- a/src/input_common/helpers/joycon_driver.cpp +++ b/src/input_common/helpers/joycon_driver.cpp @@ -543,9 +543,10 @@ void JoyconDriver::SetCallbacks(const JoyconCallbacks& callbacks) { DriverResult JoyconDriver::GetDeviceType(SDL_hid_device_info* device_info, ControllerType& controller_type) { - static constexpr std::array, 2> supported_devices{ + static constexpr std::array, 6> supported_devices{ std::pair{0x2006, ControllerType::Left}, {0x2007, ControllerType::Right}, + {0x2009, ControllerType::Pro}, }; constexpr u16 nintendo_vendor_id = 0x057e; diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 35fef506a..31209fb2e 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -441,6 +441,7 @@ void Config::ReadControlValues() { Settings::values.mouse_panning = false; ReadBasicSetting(Settings::values.mouse_panning_sensitivity); ReadBasicSetting(Settings::values.enable_joycon_driver); + ReadBasicSetting(Settings::values.enable_procon_driver); ReadBasicSetting(Settings::values.tas_enable); ReadBasicSetting(Settings::values.tas_loop); @@ -1141,6 +1142,7 @@ void Config::SaveControlValues() { WriteGlobalSetting(Settings::values.motion_enabled); WriteBasicSetting(Settings::values.enable_raw_input); WriteBasicSetting(Settings::values.enable_joycon_driver); + WriteBasicSetting(Settings::values.enable_procon_driver); WriteBasicSetting(Settings::values.keyboard_enabled); WriteBasicSetting(Settings::values.emulate_analog_keyboard); WriteBasicSetting(Settings::values.mouse_panning_sensitivity); diff --git a/src/yuzu/configuration/configure_input_advanced.cpp b/src/yuzu/configuration/configure_input_advanced.cpp index 77b976e74..8d81322f3 100644 --- a/src/yuzu/configuration/configure_input_advanced.cpp +++ b/src/yuzu/configuration/configure_input_advanced.cpp @@ -139,6 +139,7 @@ void ConfigureInputAdvanced::ApplyConfiguration() { Settings::values.enable_ring_controller = ui->enable_ring_controller->isChecked(); Settings::values.enable_ir_sensor = ui->enable_ir_sensor->isChecked(); Settings::values.enable_joycon_driver = ui->enable_joycon_driver->isChecked(); + Settings::values.enable_procon_driver = ui->enable_procon_driver->isChecked(); } void ConfigureInputAdvanced::LoadConfiguration() { @@ -174,6 +175,7 @@ void ConfigureInputAdvanced::LoadConfiguration() { ui->enable_ring_controller->setChecked(Settings::values.enable_ring_controller.GetValue()); ui->enable_ir_sensor->setChecked(Settings::values.enable_ir_sensor.GetValue()); ui->enable_joycon_driver->setChecked(Settings::values.enable_joycon_driver.GetValue()); + ui->enable_procon_driver->setChecked(Settings::values.enable_procon_driver.GetValue()); UpdateUIEnabled(); } diff --git a/src/yuzu/configuration/configure_input_advanced.ui b/src/yuzu/configuration/configure_input_advanced.ui index 75d96d3ab..0eb2b34bc 100644 --- a/src/yuzu/configuration/configure_input_advanced.ui +++ b/src/yuzu/configuration/configure_input_advanced.ui @@ -2712,6 +2712,22 @@ + + + Requires restarting yuzu + + + + 0 + 23 + + + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + @@ -2724,7 +2740,7 @@ - + Mouse sensitivity @@ -2746,14 +2762,14 @@ - + Motion / Touch - + Configure diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 9c34cdc6e..3b6dce296 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -178,6 +178,7 @@ void Config::ReadValues() { ReadSetting("ControlsGeneral", Settings::values.enable_raw_input); ReadSetting("ControlsGeneral", Settings::values.enable_joycon_driver); + ReadSetting("ControlsGeneral", Settings::values.enable_procon_driver); ReadSetting("ControlsGeneral", Settings::values.emulate_analog_keyboard); ReadSetting("ControlsGeneral", Settings::values.vibration_enabled); ReadSetting("ControlsGeneral", Settings::values.enable_accurate_vibrations); From 3fbb93e5c92849fe3d747211222a15cab2b11610 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Thu, 9 Feb 2023 22:56:33 -0500 Subject: [PATCH 0041/1181] main: Re-add QtWebEngine zoom factor For some reason, I had removed this in https://github.com/yuzu-emu/yuzu/pull/4949/commits/ad6cec71ecd61aa2533d9efa89b68837516f8464 This should fix any improperly scaled web applets. --- src/yuzu/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index f28268e9b..c278d8dab 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -805,6 +805,8 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url, layout.screen.GetHeight() / scale_ratio); web_browser_view.move(layout.screen.left / scale_ratio, (layout.screen.top / scale_ratio) + menuBar()->height()); + web_browser_view.setZoomFactor(static_cast(layout.screen.GetWidth() / scale_ratio) / + static_cast(Layout::ScreenUndocked::Width)); web_browser_view.setFocus(); web_browser_view.show(); From 36b70dec05d18403177fcee42e7a6a05cf7a1d48 Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 10 Feb 2023 09:13:58 -0500 Subject: [PATCH 0042/1181] kernel: avoid usage of bit_cast --- src/core/hle/kernel/svc_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/hle/kernel/svc_version.h b/src/core/hle/kernel/svc_version.h index e4f47b34b..3eb95aa7b 100644 --- a/src/core/hle/kernel/svc_version.h +++ b/src/core/hle/kernel/svc_version.h @@ -35,11 +35,11 @@ constexpr inline u32 EncodeKernelVersion(u32 major, u32 minor) { } constexpr inline u32 GetKernelMajorVersion(u32 encoded) { - return std::bit_cast(encoded).Value(); + return decltype(KernelVersion::major_version)::ExtractValue(encoded); } constexpr inline u32 GetKernelMinorVersion(u32 encoded) { - return std::bit_cast(encoded).Value(); + return decltype(KernelVersion::minor_version)::ExtractValue(encoded); } // Nintendo doesn't support programs targeting SVC versions < 3.0. From 9bdcb1070f65e115cbe3871cf4ad36fdc6f36429 Mon Sep 17 00:00:00 2001 From: Merry Date: Fri, 10 Feb 2023 20:12:58 +0000 Subject: [PATCH 0043/1181] biquad_filter: Fix rounding in ApplyBiquadFilterInt --- .../renderer/command/effect/biquad_filter.cpp | 32 +++++++------------ src/audio_core/renderer/voice/voice_state.h | 8 ++--- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/src/audio_core/renderer/command/effect/biquad_filter.cpp b/src/audio_core/renderer/command/effect/biquad_filter.cpp index edb30ce72..52f775bfa 100644 --- a/src/audio_core/renderer/command/effect/biquad_filter.cpp +++ b/src/audio_core/renderer/command/effect/biquad_filter.cpp @@ -4,6 +4,7 @@ #include "audio_core/renderer/adsp/command_list_processor.h" #include "audio_core/renderer/command/effect/biquad_filter.h" #include "audio_core/renderer/voice/voice_state.h" +#include "common/bit_cast.h" namespace AudioCore::AudioRenderer { /** @@ -26,8 +27,8 @@ void ApplyBiquadFilterFloat(std::span output, std::span input, Common::FixedPoint<50, 14>::from_base(b_[2]).to_double()}; std::array a{Common::FixedPoint<50, 14>::from_base(a_[0]).to_double(), Common::FixedPoint<50, 14>::from_base(a_[1]).to_double()}; - std::array s{state.s0.to_double(), state.s1.to_double(), state.s2.to_double(), - state.s3.to_double()}; + std::array s{Common::BitCast(state.s0), Common::BitCast(state.s1), + Common::BitCast(state.s2), Common::BitCast(state.s3)}; for (u32 i = 0; i < sample_count; i++) { f64 in_sample{static_cast(input[i])}; @@ -41,10 +42,10 @@ void ApplyBiquadFilterFloat(std::span output, std::span input, s[2] = sample; } - state.s0 = s[0]; - state.s1 = s[1]; - state.s2 = s[2]; - state.s3 = s[3]; + state.s0 = Common::BitCast(s[0]); + state.s1 = Common::BitCast(s[1]); + state.s2 = Common::BitCast(s[2]); + state.s3 = Common::BitCast(s[3]); } /** @@ -58,29 +59,20 @@ void ApplyBiquadFilterFloat(std::span output, std::span input, * @param sample_count - Number of samples to process. */ static void ApplyBiquadFilterInt(std::span output, std::span input, - std::array& b_, std::array& a_, + std::array& b, std::array& a, VoiceState::BiquadFilterState& state, const u32 sample_count) { constexpr s64 min{std::numeric_limits::min()}; constexpr s64 max{std::numeric_limits::max()}; - std::array, 3> b{ - Common::FixedPoint<50, 14>::from_base(b_[0]), - Common::FixedPoint<50, 14>::from_base(b_[1]), - Common::FixedPoint<50, 14>::from_base(b_[2]), - }; - std::array, 3> a{ - Common::FixedPoint<50, 14>::from_base(a_[0]), - Common::FixedPoint<50, 14>::from_base(a_[1]), - }; for (u32 i = 0; i < sample_count; i++) { - s64 in_sample{input[i]}; - auto sample{in_sample * b[0] + state.s0}; - const auto out_sample{std::clamp(sample.to_long(), min, max)}; + const s64 in_sample{input[i]}; + const s64 sample{in_sample * b[0] + state.s0}; + const s64 out_sample{std::clamp((sample + (1 << 13)) >> 14, min, max)}; output[i] = static_cast(out_sample); state.s0 = state.s1 + b[1] * in_sample + a[0] * out_sample; - state.s1 = 0 + b[2] * in_sample + a[1] * out_sample; + state.s1 = b[2] * in_sample + a[1] * out_sample; } } diff --git a/src/audio_core/renderer/voice/voice_state.h b/src/audio_core/renderer/voice/voice_state.h index d5497e2fb..ce947233f 100644 --- a/src/audio_core/renderer/voice/voice_state.h +++ b/src/audio_core/renderer/voice/voice_state.h @@ -19,10 +19,10 @@ struct VoiceState { * State of the voice's biquad filter. */ struct BiquadFilterState { - Common::FixedPoint<50, 14> s0; - Common::FixedPoint<50, 14> s1; - Common::FixedPoint<50, 14> s2; - Common::FixedPoint<50, 14> s3; + s64 s0; + s64 s1; + s64 s2; + s64 s3; }; /** From 3c60bc36a15888c401f745641efe0170d0531e4f Mon Sep 17 00:00:00 2001 From: Merry Date: Fri, 10 Feb 2023 20:43:34 +0000 Subject: [PATCH 0044/1181] biquad_filter: Clamp f64 in ApplyBiquadFilterFloat --- src/audio_core/renderer/command/effect/biquad_filter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/audio_core/renderer/command/effect/biquad_filter.cpp b/src/audio_core/renderer/command/effect/biquad_filter.cpp index 52f775bfa..dea6423dc 100644 --- a/src/audio_core/renderer/command/effect/biquad_filter.cpp +++ b/src/audio_core/renderer/command/effect/biquad_filter.cpp @@ -20,8 +20,8 @@ namespace AudioCore::AudioRenderer { void ApplyBiquadFilterFloat(std::span output, std::span input, std::array& b_, std::array& a_, VoiceState::BiquadFilterState& state, const u32 sample_count) { - constexpr s64 min{std::numeric_limits::min()}; - constexpr s64 max{std::numeric_limits::max()}; + constexpr f64 min{std::numeric_limits::min()}; + constexpr f64 max{std::numeric_limits::max()}; std::array b{Common::FixedPoint<50, 14>::from_base(b_[0]).to_double(), Common::FixedPoint<50, 14>::from_base(b_[1]).to_double(), Common::FixedPoint<50, 14>::from_base(b_[2]).to_double()}; @@ -34,7 +34,7 @@ void ApplyBiquadFilterFloat(std::span output, std::span input, f64 in_sample{static_cast(input[i])}; auto sample{in_sample * b[0] + s[0] * b[1] + s[1] * b[2] + s[2] * a[0] + s[3] * a[1]}; - output[i] = static_cast(std::clamp(static_cast(sample), min, max)); + output[i] = static_cast(std::clamp(sample, min, max)); s[1] = s[0]; s[0] = in_sample; From 5e746da9817f9fee8f0d182c6fcc766ccf816017 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Fri, 10 Feb 2023 20:43:06 -0500 Subject: [PATCH 0045/1181] kernel: Refactor thread_local variable usage On MSVC at least, there seems to be a non-trivial overhead to calling GetHostThreadId(). This slightly reworks the host_thread_id variable to reduce some of the complexity around its usage, along with some small refactors around current_thread and dummy thread --- src/core/hle/kernel/kernel.cpp | 43 ++++++++++++++-------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index d9eafe261..ece20a643 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -367,23 +367,21 @@ struct KernelCore::Impl { current_process = process; } - static inline thread_local u32 host_thread_id = UINT32_MAX; + static inline thread_local u8 host_thread_id = UINT8_MAX; - /// Gets the host thread ID for the caller, allocating a new one if this is the first time - u32 GetHostThreadId(std::size_t core_id) { - if (host_thread_id == UINT32_MAX) { - // The first four slots are reserved for CPU core threads - ASSERT(core_id < Core::Hardware::NUM_CPU_CORES); - host_thread_id = static_cast(core_id); - } + /// Sets the host thread ID for the caller. + u32 SetHostThreadId(std::size_t core_id) { + // This should only be called during core init. + ASSERT(host_thread_id == UINT8_MAX); + + // The first four slots are reserved for CPU core threads + ASSERT(core_id < Core::Hardware::NUM_CPU_CORES); + host_thread_id = static_cast(core_id); return host_thread_id; } - /// Gets the host thread ID for the caller, allocating a new one if this is the first time - u32 GetHostThreadId() { - if (host_thread_id == UINT32_MAX) { - host_thread_id = next_host_thread_id++; - } + /// Gets the host thread ID for the caller + u32 GetHostThreadId() const { return host_thread_id; } @@ -391,23 +389,19 @@ struct KernelCore::Impl { KThread* GetHostDummyThread(KThread* existing_thread) { auto initialize = [this](KThread* thread) { ASSERT(KThread::InitializeDummyThread(thread, nullptr).IsSuccess()); - thread->SetName(fmt::format("DummyThread:{}", GetHostThreadId())); + thread->SetName(fmt::format("DummyThread:{}", next_host_thread_id++)); return thread; }; thread_local KThread raw_thread{system.Kernel()}; - thread_local KThread* thread = nullptr; - if (thread == nullptr) { - thread = (existing_thread == nullptr) ? initialize(&raw_thread) : existing_thread; - } - + thread_local KThread* thread = existing_thread ? existing_thread : initialize(&raw_thread); return thread; } /// Registers a CPU core thread by allocating a host thread ID for it void RegisterCoreThread(std::size_t core_id) { ASSERT(core_id < Core::Hardware::NUM_CPU_CORES); - const auto this_id = GetHostThreadId(core_id); + const auto this_id = SetHostThreadId(core_id); if (!is_multicore) { single_core_thread_id = this_id; } @@ -415,7 +409,6 @@ struct KernelCore::Impl { /// Registers a new host thread by allocating a host thread ID for it void RegisterHostThread(KThread* existing_thread) { - [[maybe_unused]] const auto this_id = GetHostThreadId(); [[maybe_unused]] const auto dummy_thread = GetHostDummyThread(existing_thread); } @@ -445,11 +438,9 @@ struct KernelCore::Impl { static inline thread_local KThread* current_thread{nullptr}; KThread* GetCurrentEmuThread() { - const auto thread_id = GetCurrentHostThreadID(); - if (thread_id >= Core::Hardware::NUM_CPU_CORES) { - return GetHostDummyThread(nullptr); + if (!current_thread) { + current_thread = GetHostDummyThread(nullptr); } - return current_thread; } @@ -1002,7 +993,7 @@ const Kernel::PhysicalCore& KernelCore::CurrentPhysicalCore() const { } Kernel::KScheduler* KernelCore::CurrentScheduler() { - u32 core_id = impl->GetCurrentHostThreadID(); + const u32 core_id = impl->GetCurrentHostThreadID(); if (core_id >= Core::Hardware::NUM_CPU_CORES) { // This is expected when called from not a guest thread return {}; From e79270507b88f20c9d6e0307ead451ad776b528a Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 10 Feb 2023 21:03:39 -0800 Subject: [PATCH 0046/1181] core: kernel: k_process: Use application system resource. --- src/core/hle/kernel/k_process.cpp | 2 +- src/core/hle/kernel/kernel.cpp | 8 ++++++++ src/core/hle/kernel/kernel.h | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp index e201bb0cd..0e4283a0c 100644 --- a/src/core/hle/kernel/k_process.cpp +++ b/src/core/hle/kernel/k_process.cpp @@ -370,7 +370,7 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std: // Initialize proces address space if (const Result result{page_table.InitializeForProcess( metadata.GetAddressSpaceType(), false, false, false, KMemoryManager::Pool::Application, - 0x8000000, code_size, &kernel.GetSystemSystemResource(), resource_limit)}; + 0x8000000, code_size, &kernel.GetAppSystemResource(), resource_limit)}; result.IsError()) { R_RETURN(result); } diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index d9eafe261..5b72eaaa1 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -1146,6 +1146,14 @@ const KMemoryManager& KernelCore::MemoryManager() const { return *impl->memory_manager; } +KSystemResource& KernelCore::GetAppSystemResource() { + return *impl->app_system_resource; +} + +const KSystemResource& KernelCore::GetAppSystemResource() const { + return *impl->app_system_resource; +} + KSystemResource& KernelCore::GetSystemSystemResource() { return *impl->sys_system_resource; } diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 5f52e1e95..af0ae0e98 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -246,6 +246,12 @@ public: /// Gets the virtual memory manager for the kernel. const KMemoryManager& MemoryManager() const; + /// Gets the application resource manager. + KSystemResource& GetAppSystemResource(); + + /// Gets the application resource manager. + const KSystemResource& GetAppSystemResource() const; + /// Gets the system resource manager. KSystemResource& GetSystemSystemResource(); From 19e1ea6a02f6593ed47180e6591ae91eede20c18 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Fri, 10 Feb 2023 21:06:34 +0000 Subject: [PATCH 0047/1181] Fix depop prepare receiving bad mix infos and writing out of bounds, and update aux a bit, may help --- .../renderer/command/command_generator.cpp | 2 +- .../renderer/command/effect/aux_.cpp | 78 +++++++++---------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/audio_core/renderer/command/command_generator.cpp b/src/audio_core/renderer/command/command_generator.cpp index 2ea50d128..fba84c7bd 100644 --- a/src/audio_core/renderer/command/command_generator.cpp +++ b/src/audio_core/renderer/command/command_generator.cpp @@ -46,7 +46,7 @@ void CommandGenerator::GenerateDataSourceCommand(VoiceInfo& voice_info, while (destination != nullptr) { if (destination->IsConfigured()) { auto mix_id{destination->GetMixId()}; - if (mix_id < mix_context.GetCount()) { + if (mix_id < mix_context.GetCount() && mix_id != UnusedSplitterId) { auto mix_info{mix_context.GetInfo(mix_id)}; command_buffer.GenerateDepopPrepareCommand( voice_info.node_id, voice_state, render_context.depop_buffer, diff --git a/src/audio_core/renderer/command/effect/aux_.cpp b/src/audio_core/renderer/command/effect/aux_.cpp index e76db893f..0c69dcc28 100644 --- a/src/audio_core/renderer/command/effect/aux_.cpp +++ b/src/audio_core/renderer/command/effect/aux_.cpp @@ -4,6 +4,7 @@ #include "audio_core/renderer/adsp/command_list_processor.h" #include "audio_core/renderer/command/effect/aux_.h" #include "audio_core/renderer/effect/aux_.h" +#include "core/core.h" #include "core/memory.h" namespace AudioCore::AudioRenderer { @@ -40,11 +41,10 @@ static void ResetAuxBufferDsp(Core::Memory::Memory& memory, const CpuAddr aux_in * @param update_count - If non-zero, send_info_ will be updated. * @return Number of samples written. */ -static u32 WriteAuxBufferDsp(Core::Memory::Memory& memory, const CpuAddr send_info_, - [[maybe_unused]] u32 sample_count, const CpuAddr send_buffer, - const u32 count_max, std::span input, - const u32 write_count_, const u32 write_offset, - const u32 update_count) { +static u32 WriteAuxBufferDsp(Core::Memory::Memory& memory, CpuAddr send_info_, + [[maybe_unused]] u32 sample_count, CpuAddr send_buffer, u32 count_max, + std::span input, u32 write_count_, u32 write_offset, + u32 update_count) { if (write_count_ > count_max) { LOG_ERROR(Service_Audio, "write_count must be smaller than count_max! write_count {}, count_max {}", @@ -52,6 +52,11 @@ static u32 WriteAuxBufferDsp(Core::Memory::Memory& memory, const CpuAddr send_in return 0; } + if (send_info_ == 0) { + LOG_ERROR(Service_Audio, "send_info_ is 0!"); + return 0; + } + if (input.empty()) { LOG_ERROR(Service_Audio, "input buffer is empty!"); return 0; @@ -66,35 +71,30 @@ static u32 WriteAuxBufferDsp(Core::Memory::Memory& memory, const CpuAddr send_in return 0; } - AuxInfo::AuxInfoDsp send_info{}; - memory.ReadBlockUnsafe(send_info_, &send_info, sizeof(AuxInfo::AuxInfoDsp)); + auto send_info{reinterpret_cast(memory.GetPointer(send_info_))}; - u32 target_write_offset{send_info.write_offset + write_offset}; - if (target_write_offset > count_max || write_count_ == 0) { + u32 target_write_offset{send_info->write_offset + write_offset}; + if (target_write_offset > count_max) { return 0; } u32 write_count{write_count_}; - u32 write_pos{0}; + u32 read_pos{0}; while (write_count > 0) { u32 to_write{std::min(count_max - target_write_offset, write_count)}; - - if (to_write > 0) { + if (to_write) { memory.WriteBlockUnsafe(send_buffer + target_write_offset * sizeof(s32), - &input[write_pos], to_write * sizeof(s32)); + &input[read_pos], to_write * sizeof(s32)); } - target_write_offset = (target_write_offset + to_write) % count_max; write_count -= to_write; - write_pos += to_write; + read_pos += to_write; } if (update_count) { - send_info.write_offset = (send_info.write_offset + update_count) % count_max; + send_info->write_offset = (send_info->write_offset + update_count) % count_max; } - memory.WriteBlockUnsafe(send_info_, &send_info, sizeof(AuxInfo::AuxInfoDsp)); - return write_count_; } @@ -102,7 +102,7 @@ static u32 WriteAuxBufferDsp(Core::Memory::Memory& memory, const CpuAddr send_in * Read the given memory at return_buffer into the output mix buffer, and update return_info_ if * update_count is set, to notify the game that an update happened. * - * @param memory - Core memory for writing. + * @param memory - Core memory for reading. * @param return_info_ - Meta information for where to read the mix buffer. * @param return_buffer - Memory address to read the samples from. * @param count_max - Maximum number of samples in the receiving buffer. @@ -112,16 +112,21 @@ static u32 WriteAuxBufferDsp(Core::Memory::Memory& memory, const CpuAddr send_in * @param update_count - If non-zero, send_info_ will be updated. * @return Number of samples read. */ -static u32 ReadAuxBufferDsp(Core::Memory::Memory& memory, const CpuAddr return_info_, - const CpuAddr return_buffer, const u32 count_max, std::span output, - const u32 count_, const u32 read_offset, const u32 update_count) { +static u32 ReadAuxBufferDsp(Core::Memory::Memory& memory, CpuAddr return_info_, + CpuAddr return_buffer, u32 count_max, std::span output, + u32 read_count_, u32 read_offset, u32 update_count) { if (count_max == 0) { return 0; } - if (count_ > count_max) { + if (read_count_ > count_max) { LOG_ERROR(Service_Audio, "count must be smaller than count_max! count {}, count_max {}", - count_, count_max); + read_count_, count_max); + return 0; + } + + if (return_info_ == 0) { + LOG_ERROR(Service_Audio, "return_info_ is 0!"); return 0; } @@ -135,36 +140,31 @@ static u32 ReadAuxBufferDsp(Core::Memory::Memory& memory, const CpuAddr return_i return 0; } - AuxInfo::AuxInfoDsp return_info{}; - memory.ReadBlockUnsafe(return_info_, &return_info, sizeof(AuxInfo::AuxInfoDsp)); + auto return_info{reinterpret_cast(memory.GetPointer(return_info_))}; - u32 target_read_offset{return_info.read_offset + read_offset}; + u32 target_read_offset{return_info->read_offset + read_offset}; if (target_read_offset > count_max) { return 0; } - u32 read_count{count_}; - u32 read_pos{0}; + u32 read_count{read_count_}; + u32 write_pos{0}; while (read_count > 0) { u32 to_read{std::min(count_max - target_read_offset, read_count)}; - - if (to_read > 0) { + if (to_read) { memory.ReadBlockUnsafe(return_buffer + target_read_offset * sizeof(s32), - &output[read_pos], to_read * sizeof(s32)); + &output[write_pos], to_read * sizeof(s32)); } - target_read_offset = (target_read_offset + to_read) % count_max; read_count -= to_read; - read_pos += to_read; + write_pos += to_read; } if (update_count) { - return_info.read_offset = (return_info.read_offset + update_count) % count_max; + return_info->read_offset = (return_info->read_offset + update_count) % count_max; } - memory.WriteBlockUnsafe(return_info_, &return_info, sizeof(AuxInfo::AuxInfoDsp)); - - return count_; + return read_count_; } void AuxCommand::Dump([[maybe_unused]] const ADSP::CommandListProcessor& processor, @@ -189,7 +189,7 @@ void AuxCommand::Process(const ADSP::CommandListProcessor& processor) { update_count)}; if (read != processor.sample_count) { - std::memset(&output_buffer[read], 0, processor.sample_count - read); + std::memset(&output_buffer[read], 0, (processor.sample_count - read) * sizeof(s32)); } } else { ResetAuxBufferDsp(*processor.memory, send_buffer_info); From 4adf39edf20189831343242a9268b8c1c59d3ab5 Mon Sep 17 00:00:00 2001 From: FengChen Date: Sat, 11 Feb 2023 22:18:54 +0800 Subject: [PATCH 0048/1181] video_core: Speed up video frame data copy --- src/video_core/host1x/vic.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/video_core/host1x/vic.cpp b/src/video_core/host1x/vic.cpp index 36a04e4e0..10d7ef884 100644 --- a/src/video_core/host1x/vic.cpp +++ b/src/video_core/host1x/vic.cpp @@ -189,9 +189,7 @@ void Vic::WriteYUVFrame(const AVFrame* frame, const VicConfig& config) { for (std::size_t y = 0; y < frame_height; ++y) { const std::size_t src = y * stride; const std::size_t dst = y * aligned_width; - for (std::size_t x = 0; x < frame_width; ++x) { - luma_buffer[dst + x] = luma_src[src + x]; - } + std::memcpy(luma_buffer.data() + dst, luma_src + src, frame_width); } host1x.MemoryManager().WriteBlock(output_surface_luma_address, luma_buffer.data(), luma_buffer.size()); @@ -205,15 +203,15 @@ void Vic::WriteYUVFrame(const AVFrame* frame, const VicConfig& config) { // Frame from FFmpeg software // Populate chroma buffer from both channels with interleaving. const std::size_t half_width = frame_width / 2; + u8* chroma_buffer_data = chroma_buffer.data(); const u8* chroma_b_src = frame->data[1]; const u8* chroma_r_src = frame->data[2]; for (std::size_t y = 0; y < half_height; ++y) { const std::size_t src = y * half_stride; const std::size_t dst = y * aligned_width; - for (std::size_t x = 0; x < half_width; ++x) { - chroma_buffer[dst + x * 2] = chroma_b_src[src + x]; - chroma_buffer[dst + x * 2 + 1] = chroma_r_src[src + x]; + chroma_buffer_data[dst + x * 2] = chroma_b_src[src + x]; + chroma_buffer_data[dst + x * 2 + 1] = chroma_r_src[src + x]; } } break; @@ -225,9 +223,7 @@ void Vic::WriteYUVFrame(const AVFrame* frame, const VicConfig& config) { for (std::size_t y = 0; y < half_height; ++y) { const std::size_t src = y * stride; const std::size_t dst = y * aligned_width; - for (std::size_t x = 0; x < frame_width; ++x) { - chroma_buffer[dst + x] = chroma_src[src + x]; - } + std::memcpy(chroma_buffer.data() + dst, chroma_src + src, frame_width); } break; } From 2e02ed8bb574255383667969a46280d435964c2c Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Sat, 11 Feb 2023 16:27:43 +0000 Subject: [PATCH 0049/1181] Add fallback for memory read/write in case the address goes over a 4K page --- .../renderer/command/effect/aux_.cpp | 76 ++++++++++++++++--- 1 file changed, 64 insertions(+), 12 deletions(-) diff --git a/src/audio_core/renderer/command/effect/aux_.cpp b/src/audio_core/renderer/command/effect/aux_.cpp index 0c69dcc28..c5650effa 100644 --- a/src/audio_core/renderer/command/effect/aux_.cpp +++ b/src/audio_core/renderer/command/effect/aux_.cpp @@ -20,10 +20,24 @@ static void ResetAuxBufferDsp(Core::Memory::Memory& memory, const CpuAddr aux_in return; } - auto info{reinterpret_cast(memory.GetPointer(aux_info))}; - info->read_offset = 0; - info->write_offset = 0; - info->total_sample_count = 0; + AuxInfo::AuxInfoDsp info{}; + auto info_ptr{&info}; + bool host_safe{(aux_info & Core::Memory::YUZU_PAGEMASK) <= + (Core::Memory::YUZU_PAGESIZE - sizeof(AuxInfo::AuxInfoDsp))}; + + if (host_safe) [[likely]] { + info_ptr = memory.GetPointer(aux_info); + } else { + memory.ReadBlockUnsafe(aux_info, info_ptr, sizeof(AuxInfo::AuxInfoDsp)); + } + + info_ptr->read_offset = 0; + info_ptr->write_offset = 0; + info_ptr->total_sample_count = 0; + + if (!host_safe) [[unlikely]] { + memory.WriteBlockUnsafe(aux_info, info_ptr, sizeof(AuxInfo::AuxInfoDsp)); + } } /** @@ -71,9 +85,18 @@ static u32 WriteAuxBufferDsp(Core::Memory::Memory& memory, CpuAddr send_info_, return 0; } - auto send_info{reinterpret_cast(memory.GetPointer(send_info_))}; + AuxInfo::AuxInfoDsp send_info{}; + auto send_ptr = &send_info; + bool host_safe = (send_info_ & Core::Memory::YUZU_PAGEMASK) <= + (Core::Memory::YUZU_PAGESIZE - sizeof(AuxInfo::AuxInfoDsp)); - u32 target_write_offset{send_info->write_offset + write_offset}; + if (host_safe) [[likely]] { + send_ptr = memory.GetPointer(send_info_); + } else { + memory.ReadBlockUnsafe(send_info_, send_ptr, sizeof(AuxInfo::AuxInfoDsp)); + } + + u32 target_write_offset{send_ptr->write_offset + write_offset}; if (target_write_offset > count_max) { return 0; } @@ -82,7 +105,13 @@ static u32 WriteAuxBufferDsp(Core::Memory::Memory& memory, CpuAddr send_info_, u32 read_pos{0}; while (write_count > 0) { u32 to_write{std::min(count_max - target_write_offset, write_count)}; - if (to_write) { + const auto write_addr = send_buffer + target_write_offset * sizeof(s32); + bool write_safe{(write_addr & Core::Memory::YUZU_PAGEMASK) <= + (Core::Memory::YUZU_PAGESIZE - (write_addr + to_write * sizeof(s32)))}; + if (write_safe) [[likely]] { + auto ptr = memory.GetPointer(write_addr); + std::memcpy(ptr, &input[read_pos], to_write * sizeof(s32)); + } else { memory.WriteBlockUnsafe(send_buffer + target_write_offset * sizeof(s32), &input[read_pos], to_write * sizeof(s32)); } @@ -92,7 +121,11 @@ static u32 WriteAuxBufferDsp(Core::Memory::Memory& memory, CpuAddr send_info_, } if (update_count) { - send_info->write_offset = (send_info->write_offset + update_count) % count_max; + send_ptr->write_offset = (send_ptr->write_offset + update_count) % count_max; + } + + if (!host_safe) [[unlikely]] { + memory.WriteBlockUnsafe(send_info_, send_ptr, sizeof(AuxInfo::AuxInfoDsp)); } return write_count_; @@ -140,9 +173,18 @@ static u32 ReadAuxBufferDsp(Core::Memory::Memory& memory, CpuAddr return_info_, return 0; } - auto return_info{reinterpret_cast(memory.GetPointer(return_info_))}; + AuxInfo::AuxInfoDsp return_info{}; + auto return_ptr = &return_info; + bool host_safe = (return_info_ & Core::Memory::YUZU_PAGEMASK) <= + (Core::Memory::YUZU_PAGESIZE - sizeof(AuxInfo::AuxInfoDsp)); - u32 target_read_offset{return_info->read_offset + read_offset}; + if (host_safe) [[likely]] { + return_ptr = memory.GetPointer(return_info_); + } else { + memory.ReadBlockUnsafe(return_info_, return_ptr, sizeof(AuxInfo::AuxInfoDsp)); + } + + u32 target_read_offset{return_ptr->read_offset + read_offset}; if (target_read_offset > count_max) { return 0; } @@ -151,7 +193,13 @@ static u32 ReadAuxBufferDsp(Core::Memory::Memory& memory, CpuAddr return_info_, u32 write_pos{0}; while (read_count > 0) { u32 to_read{std::min(count_max - target_read_offset, read_count)}; - if (to_read) { + const auto read_addr = return_buffer + target_read_offset * sizeof(s32); + bool read_safe{(read_addr & Core::Memory::YUZU_PAGEMASK) <= + (Core::Memory::YUZU_PAGESIZE - (read_addr + to_read * sizeof(s32)))}; + if (read_safe) [[likely]] { + auto ptr = memory.GetPointer(read_addr); + std::memcpy(&output[write_pos], ptr, to_read * sizeof(s32)); + } else { memory.ReadBlockUnsafe(return_buffer + target_read_offset * sizeof(s32), &output[write_pos], to_read * sizeof(s32)); } @@ -161,7 +209,11 @@ static u32 ReadAuxBufferDsp(Core::Memory::Memory& memory, CpuAddr return_info_, } if (update_count) { - return_info->read_offset = (return_info->read_offset + update_count) % count_max; + return_ptr->read_offset = (return_ptr->read_offset + update_count) % count_max; + } + + if (!host_safe) [[unlikely]] { + memory.WriteBlockUnsafe(return_info_, return_ptr, sizeof(AuxInfo::AuxInfoDsp)); } return read_count_; From 868ab0d3b44a707960467ec714aec658b8f187be Mon Sep 17 00:00:00 2001 From: Colin Kinloch Date: Sat, 11 Feb 2023 17:51:53 +0000 Subject: [PATCH 0050/1181] kernel/svc: Fix undefined info_id --- src/core/hle/kernel/svc/svc_info.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/hle/kernel/svc/svc_info.cpp b/src/core/hle/kernel/svc/svc_info.cpp index 75097c7f9..ad56e2fe6 100644 --- a/src/core/hle/kernel/svc/svc_info.cpp +++ b/src/core/hle/kernel/svc/svc_info.cpp @@ -12,8 +12,8 @@ namespace Kernel::Svc { /// Gets system/memory information for the current process Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle handle, u64 info_sub_id) { - LOG_TRACE(Kernel_SVC, "called info_id=0x{:X}, info_sub_id=0x{:X}, handle=0x{:08X}", info_id, - info_sub_id, handle); + LOG_TRACE(Kernel_SVC, "called info_id=0x{:X}, info_sub_id=0x{:X}, handle=0x{:08X}", + info_id_type, info_sub_id, handle); u32 info_id = static_cast(info_id_type); From 93cf2b3ca8edeb1e8f1e00182f920b8d50664ed5 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:33:57 -0500 Subject: [PATCH 0051/1181] texture_cache: OpenGL: Implement MSAA uploads and copies --- src/video_core/host_shaders/CMakeLists.txt | 2 ++ .../convert_msaa_to_non_msaa.comp | 30 +++++++++++++++++ .../convert_non_msaa_to_msaa.comp | 29 ++++++++++++++++ .../renderer_opengl/gl_texture_cache.cpp | 8 +++++ .../renderer_opengl/gl_texture_cache.h | 9 ++++- .../renderer_opengl/util_shaders.cpp | 33 ++++++++++++++++++- src/video_core/renderer_opengl/util_shaders.h | 5 +++ .../renderer_vulkan/vk_texture_cache.cpp | 5 +++ .../renderer_vulkan/vk_texture_cache.h | 7 ++++ src/video_core/texture_cache/formatter.cpp | 3 ++ src/video_core/texture_cache/texture_cache.h | 14 ++++---- src/video_core/texture_cache/util.cpp | 5 --- 12 files changed, 136 insertions(+), 14 deletions(-) create mode 100644 src/video_core/host_shaders/convert_msaa_to_non_msaa.comp create mode 100644 src/video_core/host_shaders/convert_non_msaa_to_msaa.comp diff --git a/src/video_core/host_shaders/CMakeLists.txt b/src/video_core/host_shaders/CMakeLists.txt index 52cd5bb81..2442c3c29 100644 --- a/src/video_core/host_shaders/CMakeLists.txt +++ b/src/video_core/host_shaders/CMakeLists.txt @@ -22,6 +22,8 @@ set(SHADER_FILES convert_d24s8_to_abgr8.frag convert_depth_to_float.frag convert_float_to_depth.frag + convert_msaa_to_non_msaa.comp + convert_non_msaa_to_msaa.comp convert_s8d24_to_abgr8.frag full_screen_triangle.vert fxaa.frag diff --git a/src/video_core/host_shaders/convert_msaa_to_non_msaa.comp b/src/video_core/host_shaders/convert_msaa_to_non_msaa.comp new file mode 100644 index 000000000..fc3854d18 --- /dev/null +++ b/src/video_core/host_shaders/convert_msaa_to_non_msaa.comp @@ -0,0 +1,30 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#version 450 core +layout (local_size_x = 8, local_size_y = 8, local_size_z = 1) in; + +layout (binding = 0, rgba8) uniform readonly restrict image2DMSArray msaa_in; +layout (binding = 1, rgba8) uniform writeonly restrict image2DArray output_img; + +void main() { + const ivec3 coords = ivec3(gl_GlobalInvocationID); + if (any(greaterThanEqual(coords, imageSize(msaa_in)))) { + return; + } + + // TODO: Specialization constants for num_samples? + const int num_samples = imageSamples(msaa_in); + for (int curr_sample = 0; curr_sample < num_samples; ++curr_sample) { + const vec4 pixel = imageLoad(msaa_in, coords, curr_sample); + + const int single_sample_x = 2 * coords.x + (curr_sample & 1); + const int single_sample_y = 2 * coords.y + ((curr_sample / 2) & 1); + const ivec3 dest_coords = ivec3(single_sample_x, single_sample_y, coords.z); + + if (any(greaterThanEqual(dest_coords, imageSize(output_img)))) { + continue; + } + imageStore(output_img, dest_coords, pixel); + } +} diff --git a/src/video_core/host_shaders/convert_non_msaa_to_msaa.comp b/src/video_core/host_shaders/convert_non_msaa_to_msaa.comp new file mode 100644 index 000000000..dedd962f1 --- /dev/null +++ b/src/video_core/host_shaders/convert_non_msaa_to_msaa.comp @@ -0,0 +1,29 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#version 450 core +layout (local_size_x = 8, local_size_y = 8, local_size_z = 1) in; + +layout (binding = 0, rgba8) uniform readonly restrict image2DArray img_in; +layout (binding = 1, rgba8) uniform writeonly restrict image2DMSArray output_msaa; + +void main() { + const ivec3 coords = ivec3(gl_GlobalInvocationID); + if (any(greaterThanEqual(coords, imageSize(output_msaa)))) { + return; + } + + // TODO: Specialization constants for num_samples? + const int num_samples = imageSamples(output_msaa); + for (int curr_sample = 0; curr_sample < num_samples; ++curr_sample) { + const int single_sample_x = 2 * coords.x + (curr_sample & 1); + const int single_sample_y = 2 * coords.y + ((curr_sample / 2) & 1); + const ivec3 single_coords = ivec3(single_sample_x, single_sample_y, coords.z); + + if (any(greaterThanEqual(single_coords, imageSize(img_in)))) { + continue; + } + const vec4 pixel = imageLoad(img_in, single_coords); + imageStore(output_msaa, coords, curr_sample, pixel); + } +} diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index 9f7ce7414..eb6e43a08 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -557,6 +557,14 @@ void TextureCacheRuntime::CopyImage(Image& dst_image, Image& src_image, } } +void TextureCacheRuntime::CopyImageMSAA(Image& dst_image, Image& src_image, + std::span copies) { + LOG_DEBUG(Render_OpenGL, "Copying from {} samples to {} samples", src_image.info.num_samples, + dst_image.info.num_samples); + // TODO: Leverage the format conversion pass if possible/accurate. + util_shaders.CopyMSAA(dst_image, src_image, copies); +} + void TextureCacheRuntime::ReinterpretImage(Image& dst, Image& src, std::span copies) { LOG_DEBUG(Render_OpenGL, "Converting {} to {}", src.info.format, dst.info.format); diff --git a/src/video_core/renderer_opengl/gl_texture_cache.h b/src/video_core/renderer_opengl/gl_texture_cache.h index 5d9d370f2..e30875496 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.h +++ b/src/video_core/renderer_opengl/gl_texture_cache.h @@ -93,12 +93,19 @@ public: return device.CanReportMemoryUsage(); } - bool ShouldReinterpret([[maybe_unused]] Image& dst, [[maybe_unused]] Image& src) { + bool ShouldReinterpret([[maybe_unused]] Image& dst, + [[maybe_unused]] Image& src) const noexcept { + return true; + } + + bool CanUploadMSAA() const noexcept { return true; } void CopyImage(Image& dst, Image& src, std::span copies); + void CopyImageMSAA(Image& dst, Image& src, std::span copies); + void ReinterpretImage(Image& dst, Image& src, std::span copies); void ConvertImage(Framebuffer* dst, ImageView& dst_view, ImageView& src_view) { diff --git a/src/video_core/renderer_opengl/util_shaders.cpp b/src/video_core/renderer_opengl/util_shaders.cpp index 404def62e..2c7ac210b 100644 --- a/src/video_core/renderer_opengl/util_shaders.cpp +++ b/src/video_core/renderer_opengl/util_shaders.cpp @@ -12,6 +12,8 @@ #include "video_core/host_shaders/astc_decoder_comp.h" #include "video_core/host_shaders/block_linear_unswizzle_2d_comp.h" #include "video_core/host_shaders/block_linear_unswizzle_3d_comp.h" +#include "video_core/host_shaders/convert_msaa_to_non_msaa_comp.h" +#include "video_core/host_shaders/convert_non_msaa_to_msaa_comp.h" #include "video_core/host_shaders/opengl_convert_s8d24_comp.h" #include "video_core/host_shaders/opengl_copy_bc4_comp.h" #include "video_core/host_shaders/pitch_unswizzle_comp.h" @@ -51,7 +53,9 @@ UtilShaders::UtilShaders(ProgramManager& program_manager_) block_linear_unswizzle_3d_program(MakeProgram(BLOCK_LINEAR_UNSWIZZLE_3D_COMP)), pitch_unswizzle_program(MakeProgram(PITCH_UNSWIZZLE_COMP)), copy_bc4_program(MakeProgram(OPENGL_COPY_BC4_COMP)), - convert_s8d24_program(MakeProgram(OPENGL_CONVERT_S8D24_COMP)) { + convert_s8d24_program(MakeProgram(OPENGL_CONVERT_S8D24_COMP)), + convert_ms_to_nonms_program(MakeProgram(CONVERT_MSAA_TO_NON_MSAA_COMP)), + convert_nonms_to_ms_program(MakeProgram(CONVERT_NON_MSAA_TO_MSAA_COMP)) { const auto swizzle_table = Tegra::Texture::MakeSwizzleTable(); swizzle_table_buffer.Create(); glNamedBufferStorage(swizzle_table_buffer.handle, sizeof(swizzle_table), &swizzle_table, 0); @@ -269,6 +273,33 @@ void UtilShaders::ConvertS8D24(Image& dst_image, std::span copi program_manager.RestoreGuestCompute(); } +void UtilShaders::CopyMSAA(Image& dst_image, Image& src_image, + std::span copies) { + const bool is_ms_to_non_ms = src_image.info.num_samples > 1 && dst_image.info.num_samples == 1; + const auto program_handle = + is_ms_to_non_ms ? convert_ms_to_nonms_program.handle : convert_nonms_to_ms_program.handle; + program_manager.BindComputeProgram(program_handle); + + for (const ImageCopy& copy : copies) { + ASSERT(copy.src_subresource.base_layer == 0); + ASSERT(copy.src_subresource.num_layers == 1); + ASSERT(copy.dst_subresource.base_layer == 0); + ASSERT(copy.dst_subresource.num_layers == 1); + + glBindImageTexture(0, src_image.StorageHandle(), copy.src_subresource.base_level, GL_TRUE, + 0, GL_READ_ONLY, GL_RGBA8); + glBindImageTexture(1, dst_image.StorageHandle(), copy.dst_subresource.base_level, GL_TRUE, + 0, GL_WRITE_ONLY, GL_RGBA8); + + const u32 num_dispatches_x = Common::DivCeil(copy.extent.width, 8U); + const u32 num_dispatches_y = Common::DivCeil(copy.extent.height, 8U); + const u32 num_dispatches_z = copy.extent.depth; + + glDispatchCompute(num_dispatches_x, num_dispatches_y, num_dispatches_z); + } + program_manager.RestoreGuestCompute(); +} + GLenum StoreFormat(u32 bytes_per_block) { switch (bytes_per_block) { case 1: diff --git a/src/video_core/renderer_opengl/util_shaders.h b/src/video_core/renderer_opengl/util_shaders.h index 44efb6ecf..9013808e7 100644 --- a/src/video_core/renderer_opengl/util_shaders.h +++ b/src/video_core/renderer_opengl/util_shaders.h @@ -40,6 +40,9 @@ public: void ConvertS8D24(Image& dst_image, std::span copies); + void CopyMSAA(Image& dst_image, Image& src_image, + std::span copies); + private: ProgramManager& program_manager; @@ -51,6 +54,8 @@ private: OGLProgram pitch_unswizzle_program; OGLProgram copy_bc4_program; OGLProgram convert_s8d24_program; + OGLProgram convert_ms_to_nonms_program; + OGLProgram convert_nonms_to_ms_program; }; GLenum StoreFormat(u32 bytes_per_block); diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index d39372ec4..9b85dfb5e 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -1230,6 +1230,11 @@ void TextureCacheRuntime::CopyImage(Image& dst, Image& src, }); } +void TextureCacheRuntime::CopyImageMSAA(Image& dst, Image& src, + std::span copies) { + UNIMPLEMENTED_MSG("Copying images with different samples is not implemented in Vulkan."); +} + u64 TextureCacheRuntime::GetDeviceLocalMemory() const { return device.GetDeviceLocalMemory(); } diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index 1f27a3589..b9ee83de7 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h @@ -70,6 +70,8 @@ public: void CopyImage(Image& dst, Image& src, std::span copies); + void CopyImageMSAA(Image& dst, Image& src, std::span copies); + bool ShouldReinterpret(Image& dst, Image& src); void ReinterpretImage(Image& dst, Image& src, std::span copies); @@ -80,6 +82,11 @@ public: return false; } + bool CanUploadMSAA() const noexcept { + // TODO: Implement buffer to MSAA uploads + return false; + } + void AccelerateImageUpload(Image&, const StagingBufferRef&, std::span); diff --git a/src/video_core/texture_cache/formatter.cpp b/src/video_core/texture_cache/formatter.cpp index 418890126..30f72361d 100644 --- a/src/video_core/texture_cache/formatter.cpp +++ b/src/video_core/texture_cache/formatter.cpp @@ -22,6 +22,9 @@ std::string Name(const ImageBase& image) { const u32 num_layers = image.info.resources.layers; const u32 num_levels = image.info.resources.levels; std::string resource; + if (image.info.num_samples > 1) { + resource += fmt::format(":{}xMSAA", image.info.num_samples); + } if (num_layers > 1) { resource += fmt::format(":L{}", num_layers); } diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 1b01990a4..3e2cbb0b0 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -773,7 +773,7 @@ void TextureCache

::RefreshContents(Image& image, ImageId image_id) { image.flags &= ~ImageFlagBits::CpuModified; TrackImage(image, image_id); - if (image.info.num_samples > 1) { + if (image.info.num_samples > 1 && !runtime.CanUploadMSAA()) { LOG_WARNING(HW_GPU, "MSAA image uploads are not implemented"); return; } @@ -1167,14 +1167,14 @@ ImageId TextureCache

::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA if (True(overlap.flags & ImageFlagBits::GpuModified)) { new_image.flags |= ImageFlagBits::GpuModified; } + const auto& resolution = Settings::values.resolution_info; + const SubresourceBase base = new_image.TryFindBase(overlap.gpu_addr).value(); + const u32 up_scale = can_rescale ? resolution.up_scale : 1; + const u32 down_shift = can_rescale ? resolution.down_shift : 0; + auto copies = MakeShrinkImageCopies(new_info, overlap.info, base, up_scale, down_shift); if (overlap.info.num_samples != new_image.info.num_samples) { - LOG_WARNING(HW_GPU, "Copying between images with different samples is not implemented"); + runtime.CopyImageMSAA(new_image, overlap, std::move(copies)); } else { - const auto& resolution = Settings::values.resolution_info; - const SubresourceBase base = new_image.TryFindBase(overlap.gpu_addr).value(); - const u32 up_scale = can_rescale ? resolution.up_scale : 1; - const u32 down_shift = can_rescale ? resolution.down_shift : 0; - auto copies = MakeShrinkImageCopies(new_info, overlap.info, base, up_scale, down_shift); runtime.CopyImage(new_image, overlap, std::move(copies)); } if (True(overlap.flags & ImageFlagBits::Tracked)) { diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cpp index 03acc68d9..697f86641 100644 --- a/src/video_core/texture_cache/util.cpp +++ b/src/video_core/texture_cache/util.cpp @@ -573,10 +573,6 @@ u32 CalculateUnswizzledSizeBytes(const ImageInfo& info) noexcept { if (info.type == ImageType::Buffer) { return info.size.width * BytesPerBlock(info.format); } - if (info.num_samples > 1) { - // Multisample images can't be uploaded or downloaded to the host - return 0; - } if (info.type == ImageType::Linear) { return info.pitch * Common::DivCeil(info.size.height, DefaultBlockHeight(info.format)); } @@ -703,7 +699,6 @@ ImageViewType RenderTargetImageViewType(const ImageInfo& info) noexcept { std::vector MakeShrinkImageCopies(const ImageInfo& dst, const ImageInfo& src, SubresourceBase base, u32 up_scale, u32 down_shift) { ASSERT(dst.resources.levels >= src.resources.levels); - ASSERT(dst.num_samples == src.num_samples); const bool is_dst_3d = dst.type == ImageType::e3D; if (is_dst_3d) { From 9df92bad2a39dd6e33f0eaffb5c189480839a153 Mon Sep 17 00:00:00 2001 From: m-HD <62751363+m-HD@users.noreply.github.com> Date: Sun, 12 Feb 2023 02:58:39 +0100 Subject: [PATCH 0052/1181] Update settings.cpp added missing graphical settings to RestoreGlobalState() --- src/common/settings.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common/settings.cpp b/src/common/settings.cpp index b1a2aa8b2..49b41c158 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -199,7 +199,11 @@ void RestoreGlobalState(bool is_powered_on) { values.renderer_backend.SetGlobal(true); values.renderer_force_max_clock.SetGlobal(true); values.vulkan_device.SetGlobal(true); + values.fullscreen_mode.SetGlobal(true); values.aspect_ratio.SetGlobal(true); + values.resolution_setup.SetGlobal(true); + values.scaling_filter.SetGlobal(true); + values.anti_aliasing.SetGlobal(true); values.max_anisotropy.SetGlobal(true); values.use_speed_limit.SetGlobal(true); values.speed_limit.SetGlobal(true); From d6677b50f68f8c1733ea91403f590b5c94fabc18 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sun, 12 Feb 2023 19:51:41 -0500 Subject: [PATCH 0053/1181] main: Fix borderless fullscreen for high dpi scaled displays On Windows, a borderless window will be treated the same as exclusive fullscreen when the window geometry matches the physical dimensions of the screen. However, with High DPI scaling, when the devicePixelRatioF() is > 1, the borderless window apparently is not treated as exclusive fullscreen and functions correctly. One can verify and replicate this behavior by using a high resolution (4K) display, and switching between 100% and 200% scaling in Windows' display settings. At 100%, without the addition of 1, it is treated as exclusive fullscreen. At 200%, with or without the addition of 1, it is treated as borderless windowed. Therefore, we can use (read: abuse) this difference in behavior to fix this issue for those with higher resolution displays when the Qt scaling ratio is > 1. Should this behavior be changed in the future, please revisit this workaround. --- src/yuzu/main.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index c278d8dab..62dfc526a 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -3167,8 +3167,20 @@ void GMainWindow::ShowFullscreen() { window->hide(); window->setWindowFlags(window->windowFlags() | Qt::FramelessWindowHint); const auto screen_geometry = GuessCurrentScreen(window)->geometry(); + // NB: On Windows, a borderless window will be treated the same as exclusive fullscreen + // when the window geometry matches the physical dimensions of the screen. + // However, with High DPI scaling, when the devicePixelRatioF() is > 1, the borderless + // window apparently is not treated as exclusive fullscreen and functions correctly. + // One can verify and replicate this behavior by using a high resolution (4K) display, + // and switching between 100% and 200% scaling in Windows' display settings. + // At 100%, without the addition of 1, it is treated as exclusive fullscreen. + // At 200%, with or without the addition of 1, it is treated as borderless windowed. + // Therefore, we can use (read: abuse) this difference in behavior to fix this issue for + // those with higher resolution displays when the Qt scaling ratio is > 1. + // Should this behavior be changed in the future, please revisit this workaround. + const bool must_add_one = devicePixelRatioF() == 1.0f; window->setGeometry(screen_geometry.x(), screen_geometry.y(), screen_geometry.width(), - screen_geometry.height() + 1); + screen_geometry.height() + (must_add_one ? 1 : 0)); window->raise(); window->showNormal(); }; From 4363ca304afb0b615481c7d49e863a2c429cc5c6 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 13 Feb 2023 10:44:41 -0500 Subject: [PATCH 0054/1181] kernel: use GetCurrentProcess --- src/core/hle/kernel/k_client_port.cpp | 1 + src/core/hle/kernel/k_code_memory.cpp | 8 ++--- src/core/hle/kernel/k_condition_variable.cpp | 8 ++--- src/core/hle/kernel/k_handle_table.h | 2 +- src/core/hle/kernel/k_interrupt_manager.cpp | 2 +- src/core/hle/kernel/k_scheduler.cpp | 14 ++++---- src/core/hle/kernel/k_session.cpp | 1 + src/core/hle/kernel/k_thread.cpp | 8 +++++ src/core/hle/kernel/k_thread.h | 2 ++ src/core/hle/kernel/k_transfer_memory.cpp | 2 +- src/core/hle/kernel/svc.cpp | 2 +- src/core/hle/kernel/svc/svc_activity.cpp | 5 +-- .../hle/kernel/svc/svc_address_arbiter.cpp | 6 ++-- src/core/hle/kernel/svc/svc_cache.cpp | 2 +- src/core/hle/kernel/svc/svc_code_memory.cpp | 23 +++++++------ .../hle/kernel/svc/svc_condition_variable.cpp | 8 ++--- .../kernel/svc/svc_device_address_space.cpp | 33 +++++++++++-------- src/core/hle/kernel/svc/svc_event.cpp | 10 +++--- src/core/hle/kernel/svc/svc_info.cpp | 14 ++++---- src/core/hle/kernel/svc/svc_ipc.cpp | 6 ++-- src/core/hle/kernel/svc/svc_lock.cpp | 4 +-- src/core/hle/kernel/svc/svc_memory.cpp | 8 ++--- .../hle/kernel/svc/svc_physical_memory.cpp | 6 ++-- src/core/hle/kernel/svc/svc_port.cpp | 2 +- src/core/hle/kernel/svc/svc_process.cpp | 14 ++++---- .../hle/kernel/svc/svc_process_memory.cpp | 10 +++--- src/core/hle/kernel/svc/svc_query_memory.cpp | 2 +- .../hle/kernel/svc/svc_resource_limit.cpp | 20 +++++------ src/core/hle/kernel/svc/svc_session.cpp | 2 +- src/core/hle/kernel/svc/svc_shared_memory.cpp | 4 +-- .../hle/kernel/svc/svc_synchronization.cpp | 10 +++--- src/core/hle/kernel/svc/svc_thread.cpp | 30 ++++++++--------- .../hle/kernel/svc/svc_transfer_memory.cpp | 4 +-- src/core/hle/kernel/svc_generator.py | 2 +- 34 files changed, 147 insertions(+), 128 deletions(-) diff --git a/src/core/hle/kernel/k_client_port.cpp b/src/core/hle/kernel/k_client_port.cpp index 2ec623a58..9a540987b 100644 --- a/src/core/hle/kernel/k_client_port.cpp +++ b/src/core/hle/kernel/k_client_port.cpp @@ -60,6 +60,7 @@ bool KClientPort::IsSignaled() const { Result KClientPort::CreateSession(KClientSession** out) { // Reserve a new session from the resource limit. + //! FIXME: we are reserving this from the wrong resource limit! KScopedResourceReservation session_reservation(kernel.CurrentProcess()->GetResourceLimit(), LimitableResource::SessionCountMax); R_UNLESS(session_reservation.Succeeded(), ResultLimitReached); diff --git a/src/core/hle/kernel/k_code_memory.cpp b/src/core/hle/kernel/k_code_memory.cpp index 884eba001..6c44a9e99 100644 --- a/src/core/hle/kernel/k_code_memory.cpp +++ b/src/core/hle/kernel/k_code_memory.cpp @@ -21,7 +21,7 @@ KCodeMemory::KCodeMemory(KernelCore& kernel_) Result KCodeMemory::Initialize(Core::DeviceMemory& device_memory, VAddr addr, size_t size) { // Set members. - m_owner = kernel.CurrentProcess(); + m_owner = GetCurrentProcessPointer(kernel); // Get the owner page table. auto& page_table = m_owner->PageTable(); @@ -74,7 +74,7 @@ Result KCodeMemory::Map(VAddr address, size_t size) { R_UNLESS(!m_is_mapped, ResultInvalidState); // Map the memory. - R_TRY(kernel.CurrentProcess()->PageTable().MapPageGroup( + R_TRY(GetCurrentProcess(kernel).PageTable().MapPageGroup( address, *m_page_group, KMemoryState::CodeOut, KMemoryPermission::UserReadWrite)); // Mark ourselves as mapped. @@ -91,8 +91,8 @@ Result KCodeMemory::Unmap(VAddr address, size_t size) { KScopedLightLock lk(m_lock); // Unmap the memory. - R_TRY(kernel.CurrentProcess()->PageTable().UnmapPageGroup(address, *m_page_group, - KMemoryState::CodeOut)); + R_TRY(GetCurrentProcess(kernel).PageTable().UnmapPageGroup(address, *m_page_group, + KMemoryState::CodeOut)); // Mark ourselves as unmapped. m_is_mapped = false; diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cpp index 0c6b20db3..3f0be1c3f 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/core/hle/kernel/k_condition_variable.cpp @@ -164,8 +164,8 @@ Result KConditionVariable::WaitForAddress(Handle handle, VAddr addr, u32 value) R_SUCCEED_IF(test_tag != (handle | Svc::HandleWaitMask)); // Get the lock owner thread. - owner_thread = kernel.CurrentProcess() - ->GetHandleTable() + owner_thread = GetCurrentProcess(kernel) + .GetHandleTable() .GetObjectWithoutPseudoHandle(handle) .ReleasePointerUnsafe(); R_UNLESS(owner_thread != nullptr, ResultInvalidHandle); @@ -213,8 +213,8 @@ void KConditionVariable::SignalImpl(KThread* thread) { thread->EndWait(ResultSuccess); } else { // Get the previous owner. - KThread* owner_thread = kernel.CurrentProcess() - ->GetHandleTable() + KThread* owner_thread = GetCurrentProcess(kernel) + .GetHandleTable() .GetObjectWithoutPseudoHandle( static_cast(prev_tag & ~Svc::HandleWaitMask)) .ReleasePointerUnsafe(); diff --git a/src/core/hle/kernel/k_handle_table.h b/src/core/hle/kernel/k_handle_table.h index 37a24e7d9..1bf68e6b0 100644 --- a/src/core/hle/kernel/k_handle_table.h +++ b/src/core/hle/kernel/k_handle_table.h @@ -90,7 +90,7 @@ public: // Handle pseudo-handles. if constexpr (std::derived_from) { if (handle == Svc::PseudoHandle::CurrentProcess) { - auto* const cur_process = m_kernel.CurrentProcess(); + auto* const cur_process = GetCurrentProcessPointer(m_kernel); ASSERT(cur_process != nullptr); return cur_process; } diff --git a/src/core/hle/kernel/k_interrupt_manager.cpp b/src/core/hle/kernel/k_interrupt_manager.cpp index 4a6b60d26..fe6a20168 100644 --- a/src/core/hle/kernel/k_interrupt_manager.cpp +++ b/src/core/hle/kernel/k_interrupt_manager.cpp @@ -16,7 +16,7 @@ void HandleInterrupt(KernelCore& kernel, s32 core_id) { auto& current_thread = GetCurrentThread(kernel); - if (auto* process = kernel.CurrentProcess(); process) { + if (auto* process = GetCurrentProcessPointer(kernel); process) { // If the user disable count is set, we may need to pin the current thread. if (current_thread.GetUserDisableCount() && !process->GetPinnedThread(core_id)) { KScopedSchedulerLock sl{kernel}; diff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/core/hle/kernel/k_scheduler.cpp index d6676904b..d6c214237 100644 --- a/src/core/hle/kernel/k_scheduler.cpp +++ b/src/core/hle/kernel/k_scheduler.cpp @@ -328,7 +328,7 @@ u64 KScheduler::UpdateHighestPriorityThreadsImpl(KernelCore& kernel) { } void KScheduler::SwitchThread(KThread* next_thread) { - KProcess* const cur_process = kernel.CurrentProcess(); + KProcess* const cur_process = GetCurrentProcessPointer(kernel); KThread* const cur_thread = GetCurrentThreadPointer(kernel); // We never want to schedule a null thread, so use the idle thread if we don't have a next. @@ -689,11 +689,11 @@ void KScheduler::RotateScheduledQueue(KernelCore& kernel, s32 core_id, s32 prior void KScheduler::YieldWithoutCoreMigration(KernelCore& kernel) { // Validate preconditions. ASSERT(CanSchedule(kernel)); - ASSERT(kernel.CurrentProcess() != nullptr); + ASSERT(GetCurrentProcessPointer(kernel) != nullptr); // Get the current thread and process. KThread& cur_thread = GetCurrentThread(kernel); - KProcess& cur_process = *kernel.CurrentProcess(); + KProcess& cur_process = GetCurrentProcess(kernel); // If the thread's yield count matches, there's nothing for us to do. if (cur_thread.GetYieldScheduleCount() == cur_process.GetScheduledCount()) { @@ -728,11 +728,11 @@ void KScheduler::YieldWithoutCoreMigration(KernelCore& kernel) { void KScheduler::YieldWithCoreMigration(KernelCore& kernel) { // Validate preconditions. ASSERT(CanSchedule(kernel)); - ASSERT(kernel.CurrentProcess() != nullptr); + ASSERT(GetCurrentProcessPointer(kernel) != nullptr); // Get the current thread and process. KThread& cur_thread = GetCurrentThread(kernel); - KProcess& cur_process = *kernel.CurrentProcess(); + KProcess& cur_process = GetCurrentProcess(kernel); // If the thread's yield count matches, there's nothing for us to do. if (cur_thread.GetYieldScheduleCount() == cur_process.GetScheduledCount()) { @@ -816,11 +816,11 @@ void KScheduler::YieldWithCoreMigration(KernelCore& kernel) { void KScheduler::YieldToAnyThread(KernelCore& kernel) { // Validate preconditions. ASSERT(CanSchedule(kernel)); - ASSERT(kernel.CurrentProcess() != nullptr); + ASSERT(GetCurrentProcessPointer(kernel) != nullptr); // Get the current thread and process. KThread& cur_thread = GetCurrentThread(kernel); - KProcess& cur_process = *kernel.CurrentProcess(); + KProcess& cur_process = GetCurrentProcess(kernel); // If the thread's yield count matches, there's nothing for us to do. if (cur_thread.GetYieldScheduleCount() == cur_process.GetScheduledCount()) { diff --git a/src/core/hle/kernel/k_session.cpp b/src/core/hle/kernel/k_session.cpp index b6f6fe9d9..819f39f12 100644 --- a/src/core/hle/kernel/k_session.cpp +++ b/src/core/hle/kernel/k_session.cpp @@ -33,6 +33,7 @@ void KSession::Initialize(KClientPort* port_, const std::string& name_) { name = name_; // Set our owner process. + //! FIXME: this is the wrong process! process = kernel.CurrentProcess(); process->Open(); diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index 84ff3c64b..2d3da9d66 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -1266,6 +1266,14 @@ KThread& GetCurrentThread(KernelCore& kernel) { return *GetCurrentThreadPointer(kernel); } +KProcess* GetCurrentProcessPointer(KernelCore& kernel) { + return GetCurrentThread(kernel).GetOwnerProcess(); +} + +KProcess& GetCurrentProcess(KernelCore& kernel) { + return *GetCurrentProcessPointer(kernel); +} + s32 GetCurrentCoreId(KernelCore& kernel) { return GetCurrentThread(kernel).GetCurrentCore(); } diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h index 8b8dc51be..ca82ce3b6 100644 --- a/src/core/hle/kernel/k_thread.h +++ b/src/core/hle/kernel/k_thread.h @@ -110,6 +110,8 @@ enum class StepState : u32 { void SetCurrentThread(KernelCore& kernel, KThread* thread); [[nodiscard]] KThread* GetCurrentThreadPointer(KernelCore& kernel); [[nodiscard]] KThread& GetCurrentThread(KernelCore& kernel); +[[nodiscard]] KProcess* GetCurrentProcessPointer(KernelCore& kernel); +[[nodiscard]] KProcess& GetCurrentProcess(KernelCore& kernel); [[nodiscard]] s32 GetCurrentCoreId(KernelCore& kernel); class KThread final : public KAutoObjectWithSlabHeapAndContainer, diff --git a/src/core/hle/kernel/k_transfer_memory.cpp b/src/core/hle/kernel/k_transfer_memory.cpp index 9f34c2d46..faa5c73b5 100644 --- a/src/core/hle/kernel/k_transfer_memory.cpp +++ b/src/core/hle/kernel/k_transfer_memory.cpp @@ -16,7 +16,7 @@ KTransferMemory::~KTransferMemory() = default; Result KTransferMemory::Initialize(VAddr address_, std::size_t size_, Svc::MemoryPermission owner_perm_) { // Set members. - owner = kernel.CurrentProcess(); + owner = GetCurrentProcessPointer(kernel); // TODO(bunnei): Lock for transfer memory diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 4ef57356e..1072da8cc 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -4426,7 +4426,7 @@ void Call(Core::System& system, u32 imm) { auto& kernel = system.Kernel(); kernel.EnterSVCProfile(); - if (system.CurrentProcess()->Is64BitProcess()) { + if (GetCurrentProcess(system.Kernel()).Is64BitProcess()) { Call64(system, imm); } else { Call32(system, imm); diff --git a/src/core/hle/kernel/svc/svc_activity.cpp b/src/core/hle/kernel/svc/svc_activity.cpp index 1dcdb7a15..2e7b680d0 100644 --- a/src/core/hle/kernel/svc/svc_activity.cpp +++ b/src/core/hle/kernel/svc/svc_activity.cpp @@ -23,11 +23,12 @@ Result SetThreadActivity(Core::System& system, Handle thread_handle, // Get the thread from its handle. KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(thread_handle); + GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject(thread_handle); R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); // Check that the activity is being set on a non-current thread for the current process. - R_UNLESS(thread->GetOwnerProcess() == system.Kernel().CurrentProcess(), ResultInvalidHandle); + R_UNLESS(thread->GetOwnerProcess() == GetCurrentProcessPointer(system.Kernel()), + ResultInvalidHandle); R_UNLESS(thread.GetPointerUnsafe() != GetCurrentThreadPointer(system.Kernel()), ResultBusy); // Set the activity. diff --git a/src/core/hle/kernel/svc/svc_address_arbiter.cpp b/src/core/hle/kernel/svc/svc_address_arbiter.cpp index e6a5d2ae5..998bd3f22 100644 --- a/src/core/hle/kernel/svc/svc_address_arbiter.cpp +++ b/src/core/hle/kernel/svc/svc_address_arbiter.cpp @@ -72,7 +72,7 @@ Result WaitForAddress(Core::System& system, VAddr address, ArbitrationType arb_t timeout = timeout_ns; } - return system.Kernel().CurrentProcess()->WaitAddressArbiter(address, arb_type, value, timeout); + return GetCurrentProcess(system.Kernel()).WaitAddressArbiter(address, arb_type, value, timeout); } // Signals to an address (via Address Arbiter) @@ -95,8 +95,8 @@ Result SignalToAddress(Core::System& system, VAddr address, SignalType signal_ty return ResultInvalidEnumValue; } - return system.Kernel().CurrentProcess()->SignalAddressArbiter(address, signal_type, value, - count); + return GetCurrentProcess(system.Kernel()) + .SignalAddressArbiter(address, signal_type, value, count); } Result WaitForAddress64(Core::System& system, VAddr address, ArbitrationType arb_type, s32 value, diff --git a/src/core/hle/kernel/svc/svc_cache.cpp b/src/core/hle/kernel/svc/svc_cache.cpp index b5404760e..598b71da5 100644 --- a/src/core/hle/kernel/svc/svc_cache.cpp +++ b/src/core/hle/kernel/svc/svc_cache.cpp @@ -38,7 +38,7 @@ Result FlushProcessDataCache(Core::System& system, Handle process_handle, u64 ad // Get the process from its handle. KScopedAutoObject process = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(process_handle); + GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject(process_handle); R_UNLESS(process.IsNotNull(), ResultInvalidHandle); // Verify the region is within range. diff --git a/src/core/hle/kernel/svc/svc_code_memory.cpp b/src/core/hle/kernel/svc/svc_code_memory.cpp index ec256b757..538ff1c71 100644 --- a/src/core/hle/kernel/svc/svc_code_memory.cpp +++ b/src/core/hle/kernel/svc/svc_code_memory.cpp @@ -46,7 +46,7 @@ Result CreateCodeMemory(Core::System& system, Handle* out, VAddr address, size_t R_UNLESS(code_mem != nullptr, ResultOutOfResource); // Verify that the region is in range. - R_UNLESS(system.CurrentProcess()->PageTable().Contains(address, size), + R_UNLESS(GetCurrentProcess(system.Kernel()).PageTable().Contains(address, size), ResultInvalidCurrentMemory); // Initialize the code memory. @@ -56,7 +56,7 @@ Result CreateCodeMemory(Core::System& system, Handle* out, VAddr address, size_t KCodeMemory::Register(kernel, code_mem); // Add the code memory to the handle table. - R_TRY(system.CurrentProcess()->GetHandleTable().Add(out, code_mem)); + R_TRY(GetCurrentProcess(system.Kernel()).GetHandleTable().Add(out, code_mem)); code_mem->Close(); @@ -79,8 +79,9 @@ Result ControlCodeMemory(Core::System& system, Handle code_memory_handle, R_UNLESS((address < address + size), ResultInvalidCurrentMemory); // Get the code memory from its handle. - KScopedAutoObject code_mem = - system.CurrentProcess()->GetHandleTable().GetObject(code_memory_handle); + KScopedAutoObject code_mem = GetCurrentProcess(system.Kernel()) + .GetHandleTable() + .GetObject(code_memory_handle); R_UNLESS(code_mem.IsNotNull(), ResultInvalidHandle); // NOTE: Here, Atmosphere extends the SVC to allow code memory operations on one's own process. @@ -90,9 +91,10 @@ Result ControlCodeMemory(Core::System& system, Handle code_memory_handle, switch (operation) { case CodeMemoryOperation::Map: { // Check that the region is in range. - R_UNLESS( - system.CurrentProcess()->PageTable().CanContain(address, size, KMemoryState::CodeOut), - ResultInvalidMemoryRegion); + R_UNLESS(GetCurrentProcess(system.Kernel()) + .PageTable() + .CanContain(address, size, KMemoryState::CodeOut), + ResultInvalidMemoryRegion); // Check the memory permission. R_UNLESS(IsValidMapCodeMemoryPermission(perm), ResultInvalidNewMemoryPermission); @@ -102,9 +104,10 @@ Result ControlCodeMemory(Core::System& system, Handle code_memory_handle, } break; case CodeMemoryOperation::Unmap: { // Check that the region is in range. - R_UNLESS( - system.CurrentProcess()->PageTable().CanContain(address, size, KMemoryState::CodeOut), - ResultInvalidMemoryRegion); + R_UNLESS(GetCurrentProcess(system.Kernel()) + .PageTable() + .CanContain(address, size, KMemoryState::CodeOut), + ResultInvalidMemoryRegion); // Check the memory permission. R_UNLESS(IsValidUnmapCodeMemoryPermission(perm), ResultInvalidNewMemoryPermission); diff --git a/src/core/hle/kernel/svc/svc_condition_variable.cpp b/src/core/hle/kernel/svc/svc_condition_variable.cpp index b59a33e68..8ad1a0b8f 100644 --- a/src/core/hle/kernel/svc/svc_condition_variable.cpp +++ b/src/core/hle/kernel/svc/svc_condition_variable.cpp @@ -43,8 +43,8 @@ Result WaitProcessWideKeyAtomic(Core::System& system, VAddr address, VAddr cv_ke } // Wait on the condition variable. - return system.Kernel().CurrentProcess()->WaitConditionVariable( - address, Common::AlignDown(cv_key, sizeof(u32)), tag, timeout); + return GetCurrentProcess(system.Kernel()) + .WaitConditionVariable(address, Common::AlignDown(cv_key, sizeof(u32)), tag, timeout); } /// Signal process wide key @@ -52,8 +52,8 @@ void SignalProcessWideKey(Core::System& system, VAddr cv_key, s32 count) { LOG_TRACE(Kernel_SVC, "called, cv_key=0x{:X}, count=0x{:08X}", cv_key, count); // Signal the condition variable. - return system.Kernel().CurrentProcess()->SignalConditionVariable( - Common::AlignDown(cv_key, sizeof(u32)), count); + return GetCurrentProcess(system.Kernel()) + .SignalConditionVariable(Common::AlignDown(cv_key, sizeof(u32)), count); } Result WaitProcessWideKeyAtomic64(Core::System& system, uint64_t address, uint64_t cv_key, diff --git a/src/core/hle/kernel/svc/svc_device_address_space.cpp b/src/core/hle/kernel/svc/svc_device_address_space.cpp index cdc453c35..f68c0e6a9 100644 --- a/src/core/hle/kernel/svc/svc_device_address_space.cpp +++ b/src/core/hle/kernel/svc/svc_device_address_space.cpp @@ -37,15 +37,16 @@ Result CreateDeviceAddressSpace(Core::System& system, Handle* out, uint64_t das_ KDeviceAddressSpace::Register(system.Kernel(), das); // Add to the handle table. - R_TRY(system.CurrentProcess()->GetHandleTable().Add(out, das)); + R_TRY(GetCurrentProcess(system.Kernel()).GetHandleTable().Add(out, das)); R_SUCCEED(); } Result AttachDeviceAddressSpace(Core::System& system, DeviceName device_name, Handle das_handle) { // Get the device address space. - KScopedAutoObject das = - system.CurrentProcess()->GetHandleTable().GetObject(das_handle); + KScopedAutoObject das = GetCurrentProcess(system.Kernel()) + .GetHandleTable() + .GetObject(das_handle); R_UNLESS(das.IsNotNull(), ResultInvalidHandle); // Attach. @@ -54,8 +55,9 @@ Result AttachDeviceAddressSpace(Core::System& system, DeviceName device_name, Ha Result DetachDeviceAddressSpace(Core::System& system, DeviceName device_name, Handle das_handle) { // Get the device address space. - KScopedAutoObject das = - system.CurrentProcess()->GetHandleTable().GetObject(das_handle); + KScopedAutoObject das = GetCurrentProcess(system.Kernel()) + .GetHandleTable() + .GetObject(das_handle); R_UNLESS(das.IsNotNull(), ResultInvalidHandle); // Detach. @@ -94,13 +96,14 @@ Result MapDeviceAddressSpaceByForce(Core::System& system, Handle das_handle, Han R_UNLESS(reserved == 0, ResultInvalidEnumValue); // Get the device address space. - KScopedAutoObject das = - system.CurrentProcess()->GetHandleTable().GetObject(das_handle); + KScopedAutoObject das = GetCurrentProcess(system.Kernel()) + .GetHandleTable() + .GetObject(das_handle); R_UNLESS(das.IsNotNull(), ResultInvalidHandle); // Get the process. KScopedAutoObject process = - system.CurrentProcess()->GetHandleTable().GetObject(process_handle); + GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject(process_handle); R_UNLESS(process.IsNotNull(), ResultInvalidHandle); // Validate that the process address is within range. @@ -134,13 +137,14 @@ Result MapDeviceAddressSpaceAligned(Core::System& system, Handle das_handle, Han R_UNLESS(reserved == 0, ResultInvalidEnumValue); // Get the device address space. - KScopedAutoObject das = - system.CurrentProcess()->GetHandleTable().GetObject(das_handle); + KScopedAutoObject das = GetCurrentProcess(system.Kernel()) + .GetHandleTable() + .GetObject(das_handle); R_UNLESS(das.IsNotNull(), ResultInvalidHandle); // Get the process. KScopedAutoObject process = - system.CurrentProcess()->GetHandleTable().GetObject(process_handle); + GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject(process_handle); R_UNLESS(process.IsNotNull(), ResultInvalidHandle); // Validate that the process address is within range. @@ -165,13 +169,14 @@ Result UnmapDeviceAddressSpace(Core::System& system, Handle das_handle, Handle p ResultInvalidCurrentMemory); // Get the device address space. - KScopedAutoObject das = - system.CurrentProcess()->GetHandleTable().GetObject(das_handle); + KScopedAutoObject das = GetCurrentProcess(system.Kernel()) + .GetHandleTable() + .GetObject(das_handle); R_UNLESS(das.IsNotNull(), ResultInvalidHandle); // Get the process. KScopedAutoObject process = - system.CurrentProcess()->GetHandleTable().GetObject(process_handle); + GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject(process_handle); R_UNLESS(process.IsNotNull(), ResultInvalidHandle); // Validate that the process address is within range. diff --git a/src/core/hle/kernel/svc/svc_event.cpp b/src/core/hle/kernel/svc/svc_event.cpp index e8fb9efbc..a948493e8 100644 --- a/src/core/hle/kernel/svc/svc_event.cpp +++ b/src/core/hle/kernel/svc/svc_event.cpp @@ -15,7 +15,7 @@ Result SignalEvent(Core::System& system, Handle event_handle) { LOG_DEBUG(Kernel_SVC, "called, event_handle=0x{:08X}", event_handle); // Get the current handle table. - const KHandleTable& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + const KHandleTable& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable(); // Get the event. KScopedAutoObject event = handle_table.GetObject(event_handle); @@ -28,7 +28,7 @@ Result ClearEvent(Core::System& system, Handle event_handle) { LOG_TRACE(Kernel_SVC, "called, event_handle=0x{:08X}", event_handle); // Get the current handle table. - const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable(); // Try to clear the writable event. { @@ -56,10 +56,10 @@ Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_read) { // Get the kernel reference and handle table. auto& kernel = system.Kernel(); - auto& handle_table = kernel.CurrentProcess()->GetHandleTable(); + auto& handle_table = GetCurrentProcess(kernel).GetHandleTable(); // Reserve a new event from the process resource limit - KScopedResourceReservation event_reservation(kernel.CurrentProcess(), + KScopedResourceReservation event_reservation(GetCurrentProcessPointer(kernel), LimitableResource::EventCountMax); R_UNLESS(event_reservation.Succeeded(), ResultLimitReached); @@ -68,7 +68,7 @@ Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_read) { R_UNLESS(event != nullptr, ResultOutOfResource); // Initialize the event. - event->Initialize(kernel.CurrentProcess()); + event->Initialize(GetCurrentProcessPointer(kernel)); // Commit the thread reservation. event_reservation.Commit(); diff --git a/src/core/hle/kernel/svc/svc_info.cpp b/src/core/hle/kernel/svc/svc_info.cpp index ad56e2fe6..58dc47508 100644 --- a/src/core/hle/kernel/svc/svc_info.cpp +++ b/src/core/hle/kernel/svc/svc_info.cpp @@ -44,7 +44,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle return ResultInvalidEnumValue; } - const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable(); KScopedAutoObject process = handle_table.GetObject(handle); if (process.IsNull()) { LOG_ERROR(Kernel_SVC, "Process is not valid! info_id={}, info_sub_id={}, handle={:08X}", @@ -154,7 +154,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle return ResultInvalidCombination; } - KProcess* const current_process = system.Kernel().CurrentProcess(); + KProcess* const current_process = GetCurrentProcessPointer(system.Kernel()); KHandleTable& handle_table = current_process->GetHandleTable(); const auto resource_limit = current_process->GetResourceLimit(); if (!resource_limit) { @@ -183,7 +183,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle return ResultInvalidCombination; } - *result = system.Kernel().CurrentProcess()->GetRandomEntropy(info_sub_id); + *result = GetCurrentProcess(system.Kernel()).GetRandomEntropy(info_sub_id); return ResultSuccess; case InfoType::InitialProcessIdRange: @@ -200,9 +200,9 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle return ResultInvalidCombination; } - KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject( - static_cast(handle)); + KScopedAutoObject thread = GetCurrentProcess(system.Kernel()) + .GetHandleTable() + .GetObject(static_cast(handle)); if (thread.IsNull()) { LOG_ERROR(Kernel_SVC, "Thread handle does not exist, handle=0x{:08X}", static_cast(handle)); @@ -249,7 +249,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle R_UNLESS(info_sub_id == 0, ResultInvalidCombination); // Get the handle table. - KProcess* current_process = system.Kernel().CurrentProcess(); + KProcess* current_process = GetCurrentProcessPointer(system.Kernel()); KHandleTable& handle_table = current_process->GetHandleTable(); // Get a new handle for the current process. diff --git a/src/core/hle/kernel/svc/svc_ipc.cpp b/src/core/hle/kernel/svc/svc_ipc.cpp index 97ce49dde..a7a2c3b92 100644 --- a/src/core/hle/kernel/svc/svc_ipc.cpp +++ b/src/core/hle/kernel/svc/svc_ipc.cpp @@ -12,11 +12,9 @@ namespace Kernel::Svc { /// Makes a blocking IPC call to a service. Result SendSyncRequest(Core::System& system, Handle handle) { - auto& kernel = system.Kernel(); - // Get the client session from its handle. KScopedAutoObject session = - kernel.CurrentProcess()->GetHandleTable().GetObject(handle); + GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject(handle); R_UNLESS(session.IsNotNull(), ResultInvalidHandle); LOG_TRACE(Kernel_SVC, "called handle=0x{:08X}({})", handle, session->GetName()); @@ -40,7 +38,7 @@ Result SendAsyncRequestWithUserBuffer(Core::System& system, Handle* out_event_ha Result ReplyAndReceive(Core::System& system, s32* out_index, uint64_t handles_addr, s32 num_handles, Handle reply_target, s64 timeout_ns) { auto& kernel = system.Kernel(); - auto& handle_table = GetCurrentThread(kernel).GetOwnerProcess()->GetHandleTable(); + auto& handle_table = GetCurrentProcess(kernel).GetHandleTable(); R_UNLESS(0 <= num_handles && num_handles <= ArgumentHandleCountMax, ResultOutOfRange); R_UNLESS(system.Memory().IsValidVirtualAddressRange( diff --git a/src/core/hle/kernel/svc/svc_lock.cpp b/src/core/hle/kernel/svc/svc_lock.cpp index 7005ac30b..f3d3e140b 100644 --- a/src/core/hle/kernel/svc/svc_lock.cpp +++ b/src/core/hle/kernel/svc/svc_lock.cpp @@ -24,7 +24,7 @@ Result ArbitrateLock(Core::System& system, Handle thread_handle, VAddr address, return ResultInvalidAddress; } - return system.Kernel().CurrentProcess()->WaitForAddress(thread_handle, address, tag); + return GetCurrentProcess(system.Kernel()).WaitForAddress(thread_handle, address, tag); } /// Unlock a mutex @@ -43,7 +43,7 @@ Result ArbitrateUnlock(Core::System& system, VAddr address) { return ResultInvalidAddress; } - return system.Kernel().CurrentProcess()->SignalToAddress(address); + return GetCurrentProcess(system.Kernel()).SignalToAddress(address); } Result ArbitrateLock64(Core::System& system, Handle thread_handle, uint64_t address, uint32_t tag) { diff --git a/src/core/hle/kernel/svc/svc_memory.cpp b/src/core/hle/kernel/svc/svc_memory.cpp index 21f818da6..214bcd073 100644 --- a/src/core/hle/kernel/svc/svc_memory.cpp +++ b/src/core/hle/kernel/svc/svc_memory.cpp @@ -113,7 +113,7 @@ Result SetMemoryPermission(Core::System& system, VAddr address, u64 size, Memory R_UNLESS(IsValidSetMemoryPermission(perm), ResultInvalidNewMemoryPermission); // Validate that the region is in range for the current process. - auto& page_table = system.Kernel().CurrentProcess()->PageTable(); + auto& page_table = GetCurrentProcess(system.Kernel()).PageTable(); R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory); // Set the memory attribute. @@ -137,7 +137,7 @@ Result SetMemoryAttribute(Core::System& system, VAddr address, u64 size, u32 mas R_UNLESS((mask | attr | SupportedMask) == SupportedMask, ResultInvalidCombination); // Validate that the region is in range for the current process. - auto& page_table{system.Kernel().CurrentProcess()->PageTable()}; + auto& page_table{GetCurrentProcess(system.Kernel()).PageTable()}; R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory); // Set the memory attribute. @@ -149,7 +149,7 @@ Result MapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size) LOG_TRACE(Kernel_SVC, "called, dst_addr=0x{:X}, src_addr=0x{:X}, size=0x{:X}", dst_addr, src_addr, size); - auto& page_table{system.Kernel().CurrentProcess()->PageTable()}; + auto& page_table{GetCurrentProcess(system.Kernel()).PageTable()}; if (const Result result{MapUnmapMemorySanityChecks(page_table, dst_addr, src_addr, size)}; result.IsError()) { @@ -164,7 +164,7 @@ Result UnmapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 siz LOG_TRACE(Kernel_SVC, "called, dst_addr=0x{:X}, src_addr=0x{:X}, size=0x{:X}", dst_addr, src_addr, size); - auto& page_table{system.Kernel().CurrentProcess()->PageTable()}; + auto& page_table{GetCurrentProcess(system.Kernel()).PageTable()}; if (const Result result{MapUnmapMemorySanityChecks(page_table, dst_addr, src_addr, size)}; result.IsError()) { diff --git a/src/core/hle/kernel/svc/svc_physical_memory.cpp b/src/core/hle/kernel/svc/svc_physical_memory.cpp index 8d00e1fc3..a1f534454 100644 --- a/src/core/hle/kernel/svc/svc_physical_memory.cpp +++ b/src/core/hle/kernel/svc/svc_physical_memory.cpp @@ -16,7 +16,7 @@ Result SetHeapSize(Core::System& system, VAddr* out_address, u64 size) { R_UNLESS(size < MainMemorySizeMax, ResultInvalidSize); // Set the heap size. - R_TRY(system.Kernel().CurrentProcess()->PageTable().SetHeapSize(out_address, size)); + R_TRY(GetCurrentProcess(system.Kernel()).PageTable().SetHeapSize(out_address, size)); return ResultSuccess; } @@ -45,7 +45,7 @@ Result MapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { return ResultInvalidMemoryRegion; } - KProcess* const current_process{system.Kernel().CurrentProcess()}; + KProcess* const current_process{GetCurrentProcessPointer(system.Kernel())}; auto& page_table{current_process->PageTable()}; if (current_process->GetSystemResourceSize() == 0) { @@ -94,7 +94,7 @@ Result UnmapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { return ResultInvalidMemoryRegion; } - KProcess* const current_process{system.Kernel().CurrentProcess()}; + KProcess* const current_process{GetCurrentProcessPointer(system.Kernel())}; auto& page_table{current_process->PageTable()}; if (current_process->GetSystemResourceSize() == 0) { diff --git a/src/core/hle/kernel/svc/svc_port.cpp b/src/core/hle/kernel/svc/svc_port.cpp index 2e5d228bb..2b7cebde5 100644 --- a/src/core/hle/kernel/svc/svc_port.cpp +++ b/src/core/hle/kernel/svc/svc_port.cpp @@ -34,7 +34,7 @@ Result ConnectToNamedPort(Core::System& system, Handle* out, VAddr port_name_add // Get the current handle table. auto& kernel = system.Kernel(); - auto& handle_table = kernel.CurrentProcess()->GetHandleTable(); + auto& handle_table = GetCurrentProcess(kernel).GetHandleTable(); // Find the client port. auto port = kernel.CreateNamedServicePort(port_name); diff --git a/src/core/hle/kernel/svc/svc_process.cpp b/src/core/hle/kernel/svc/svc_process.cpp index d2c20aad2..c35d2be76 100644 --- a/src/core/hle/kernel/svc/svc_process.cpp +++ b/src/core/hle/kernel/svc/svc_process.cpp @@ -9,7 +9,7 @@ namespace Kernel::Svc { /// Exits the current process void ExitProcess(Core::System& system) { - auto* current_process = system.Kernel().CurrentProcess(); + auto* current_process = GetCurrentProcessPointer(system.Kernel()); LOG_INFO(Kernel_SVC, "Process {} exiting", current_process->GetProcessID()); ASSERT_MSG(current_process->GetState() == KProcess::State::Running, @@ -23,9 +23,9 @@ Result GetProcessId(Core::System& system, u64* out_process_id, Handle handle) { LOG_DEBUG(Kernel_SVC, "called handle=0x{:08X}", handle); // Get the object from the handle table. - KScopedAutoObject obj = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject( - static_cast(handle)); + KScopedAutoObject obj = GetCurrentProcess(system.Kernel()) + .GetHandleTable() + .GetObject(static_cast(handle)); R_UNLESS(obj.IsNotNull(), ResultInvalidHandle); // Get the process from the object. @@ -63,10 +63,10 @@ Result GetProcessList(Core::System& system, s32* out_num_processes, VAddr out_pr return ResultOutOfRange; } - const auto& kernel = system.Kernel(); + auto& kernel = system.Kernel(); const auto total_copy_size = out_process_ids_size * sizeof(u64); - if (out_process_ids_size > 0 && !kernel.CurrentProcess()->PageTable().IsInsideAddressSpace( + if (out_process_ids_size > 0 && !GetCurrentProcess(kernel).PageTable().IsInsideAddressSpace( out_process_ids, total_copy_size)) { LOG_ERROR(Kernel_SVC, "Address range outside address space. begin=0x{:016X}, end=0x{:016X}", out_process_ids, out_process_ids + total_copy_size); @@ -92,7 +92,7 @@ Result GetProcessInfo(Core::System& system, s64* out, Handle process_handle, ProcessInfoType info_type) { LOG_DEBUG(Kernel_SVC, "called, handle=0x{:08X}, type=0x{:X}", process_handle, info_type); - const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable(); KScopedAutoObject process = handle_table.GetObject(process_handle); if (process.IsNull()) { LOG_ERROR(Kernel_SVC, "Process handle does not exist, process_handle=0x{:08X}", diff --git a/src/core/hle/kernel/svc/svc_process_memory.cpp b/src/core/hle/kernel/svc/svc_process_memory.cpp index dbe24e139..4dfd9e5bb 100644 --- a/src/core/hle/kernel/svc/svc_process_memory.cpp +++ b/src/core/hle/kernel/svc/svc_process_memory.cpp @@ -45,7 +45,7 @@ Result SetProcessMemoryPermission(Core::System& system, Handle process_handle, V // Get the process from its handle. KScopedAutoObject process = - system.CurrentProcess()->GetHandleTable().GetObject(process_handle); + GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject(process_handle); R_UNLESS(process.IsNotNull(), ResultInvalidHandle); // Validate that the address is in range. @@ -71,7 +71,7 @@ Result MapProcessMemory(Core::System& system, VAddr dst_address, Handle process_ R_UNLESS((src_address < src_address + size), ResultInvalidCurrentMemory); // Get the processes. - KProcess* dst_process = system.CurrentProcess(); + KProcess* dst_process = GetCurrentProcessPointer(system.Kernel()); KScopedAutoObject src_process = dst_process->GetHandleTable().GetObjectWithoutPseudoHandle(process_handle); R_UNLESS(src_process.IsNotNull(), ResultInvalidHandle); @@ -114,7 +114,7 @@ Result UnmapProcessMemory(Core::System& system, VAddr dst_address, Handle proces R_UNLESS((src_address < src_address + size), ResultInvalidCurrentMemory); // Get the processes. - KProcess* dst_process = system.CurrentProcess(); + KProcess* dst_process = GetCurrentProcessPointer(system.Kernel()); KScopedAutoObject src_process = dst_process->GetHandleTable().GetObjectWithoutPseudoHandle(process_handle); R_UNLESS(src_process.IsNotNull(), ResultInvalidHandle); @@ -174,7 +174,7 @@ Result MapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst return ResultInvalidCurrentMemory; } - const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable(); KScopedAutoObject process = handle_table.GetObject(process_handle); if (process.IsNull()) { LOG_ERROR(Kernel_SVC, "Invalid process handle specified (handle=0x{:08X}).", @@ -242,7 +242,7 @@ Result UnmapProcessCodeMemory(Core::System& system, Handle process_handle, u64 d return ResultInvalidCurrentMemory; } - const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable(); KScopedAutoObject process = handle_table.GetObject(process_handle); if (process.IsNull()) { LOG_ERROR(Kernel_SVC, "Invalid process handle specified (handle=0x{:08X}).", diff --git a/src/core/hle/kernel/svc/svc_query_memory.cpp b/src/core/hle/kernel/svc/svc_query_memory.cpp index db140a341..ee75ad370 100644 --- a/src/core/hle/kernel/svc/svc_query_memory.cpp +++ b/src/core/hle/kernel/svc/svc_query_memory.cpp @@ -22,7 +22,7 @@ Result QueryMemory(Core::System& system, uint64_t out_memory_info, PageInfo* out Result QueryProcessMemory(Core::System& system, uint64_t out_memory_info, PageInfo* out_page_info, Handle process_handle, uint64_t address) { LOG_TRACE(Kernel_SVC, "called process=0x{:08X} address={:X}", process_handle, address); - const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable(); KScopedAutoObject process = handle_table.GetObject(process_handle); if (process.IsNull()) { LOG_ERROR(Kernel_SVC, "Process handle does not exist, process_handle=0x{:08X}", diff --git a/src/core/hle/kernel/svc/svc_resource_limit.cpp b/src/core/hle/kernel/svc/svc_resource_limit.cpp index ebc886028..88166299e 100644 --- a/src/core/hle/kernel/svc/svc_resource_limit.cpp +++ b/src/core/hle/kernel/svc/svc_resource_limit.cpp @@ -27,7 +27,7 @@ Result CreateResourceLimit(Core::System& system, Handle* out_handle) { KResourceLimit::Register(kernel, resource_limit); // Add the limit to the handle table. - R_TRY(kernel.CurrentProcess()->GetHandleTable().Add(out_handle, resource_limit)); + R_TRY(GetCurrentProcess(kernel).GetHandleTable().Add(out_handle, resource_limit)); return ResultSuccess; } @@ -41,9 +41,9 @@ Result GetResourceLimitLimitValue(Core::System& system, s64* out_limit_value, R_UNLESS(IsValidResourceType(which), ResultInvalidEnumValue); // Get the resource limit. - auto& kernel = system.Kernel(); - KScopedAutoObject resource_limit = - kernel.CurrentProcess()->GetHandleTable().GetObject(resource_limit_handle); + KScopedAutoObject resource_limit = GetCurrentProcess(system.Kernel()) + .GetHandleTable() + .GetObject(resource_limit_handle); R_UNLESS(resource_limit.IsNotNull(), ResultInvalidHandle); // Get the limit value. @@ -61,9 +61,9 @@ Result GetResourceLimitCurrentValue(Core::System& system, s64* out_current_value R_UNLESS(IsValidResourceType(which), ResultInvalidEnumValue); // Get the resource limit. - auto& kernel = system.Kernel(); - KScopedAutoObject resource_limit = - kernel.CurrentProcess()->GetHandleTable().GetObject(resource_limit_handle); + KScopedAutoObject resource_limit = GetCurrentProcess(system.Kernel()) + .GetHandleTable() + .GetObject(resource_limit_handle); R_UNLESS(resource_limit.IsNotNull(), ResultInvalidHandle); // Get the current value. @@ -81,9 +81,9 @@ Result SetResourceLimitLimitValue(Core::System& system, Handle resource_limit_ha R_UNLESS(IsValidResourceType(which), ResultInvalidEnumValue); // Get the resource limit. - auto& kernel = system.Kernel(); - KScopedAutoObject resource_limit = - kernel.CurrentProcess()->GetHandleTable().GetObject(resource_limit_handle); + KScopedAutoObject resource_limit = GetCurrentProcess(system.Kernel()) + .GetHandleTable() + .GetObject(resource_limit_handle); R_UNLESS(resource_limit.IsNotNull(), ResultInvalidHandle); // Set the limit value. diff --git a/src/core/hle/kernel/svc/svc_session.cpp b/src/core/hle/kernel/svc/svc_session.cpp index 0deb61b62..00fd1605e 100644 --- a/src/core/hle/kernel/svc/svc_session.cpp +++ b/src/core/hle/kernel/svc/svc_session.cpp @@ -13,7 +13,7 @@ namespace { template Result CreateSession(Core::System& system, Handle* out_server, Handle* out_client, u64 name) { - auto& process = *system.CurrentProcess(); + auto& process = GetCurrentProcess(system.Kernel()); auto& handle_table = process.GetHandleTable(); // Declare the session we're going to allocate. diff --git a/src/core/hle/kernel/svc/svc_shared_memory.cpp b/src/core/hle/kernel/svc/svc_shared_memory.cpp index 40d6260e3..18e0dc904 100644 --- a/src/core/hle/kernel/svc/svc_shared_memory.cpp +++ b/src/core/hle/kernel/svc/svc_shared_memory.cpp @@ -42,7 +42,7 @@ Result MapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, R_UNLESS(IsValidSharedMemoryPermission(map_perm), ResultInvalidNewMemoryPermission); // Get the current process. - auto& process = *system.Kernel().CurrentProcess(); + auto& process = GetCurrentProcess(system.Kernel()); auto& page_table = process.PageTable(); // Get the shared memory. @@ -75,7 +75,7 @@ Result UnmapSharedMemory(Core::System& system, Handle shmem_handle, VAddr addres R_UNLESS((address < address + size), ResultInvalidCurrentMemory); // Get the current process. - auto& process = *system.Kernel().CurrentProcess(); + auto& process = GetCurrentProcess(system.Kernel()); auto& page_table = process.PageTable(); // Get the shared memory. diff --git a/src/core/hle/kernel/svc/svc_synchronization.cpp b/src/core/hle/kernel/svc/svc_synchronization.cpp index e516a3800..1a8f7e191 100644 --- a/src/core/hle/kernel/svc/svc_synchronization.cpp +++ b/src/core/hle/kernel/svc/svc_synchronization.cpp @@ -14,7 +14,7 @@ Result CloseHandle(Core::System& system, Handle handle) { LOG_TRACE(Kernel_SVC, "Closing handle 0x{:08X}", handle); // Remove the handle. - R_UNLESS(system.Kernel().CurrentProcess()->GetHandleTable().Remove(handle), + R_UNLESS(GetCurrentProcess(system.Kernel()).GetHandleTable().Remove(handle), ResultInvalidHandle); return ResultSuccess; @@ -25,7 +25,7 @@ Result ResetSignal(Core::System& system, Handle handle) { LOG_DEBUG(Kernel_SVC, "called handle 0x{:08X}", handle); // Get the current handle table. - const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); + const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable(); // Try to reset as readable event. { @@ -59,7 +59,7 @@ Result WaitSynchronization(Core::System& system, s32* index, VAddr handles_addre auto& kernel = system.Kernel(); std::vector objs(num_handles); - const auto& handle_table = kernel.CurrentProcess()->GetHandleTable(); + const auto& handle_table = GetCurrentProcess(kernel).GetHandleTable(); Handle* handles = system.Memory().GetPointer(handles_address); // Copy user handles. @@ -91,7 +91,7 @@ Result CancelSynchronization(Core::System& system, Handle handle) { // Get the thread from its handle. KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(handle); + GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject(handle); R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); // Cancel the thread's wait. @@ -106,7 +106,7 @@ void SynchronizePreemptionState(Core::System& system) { KScopedSchedulerLock sl{kernel}; // If the current thread is pinned, unpin it. - KProcess* cur_process = system.Kernel().CurrentProcess(); + KProcess* cur_process = GetCurrentProcessPointer(kernel); const auto core_id = GetCurrentCoreId(kernel); if (cur_process->GetPinnedThread(core_id) == GetCurrentThreadPointer(kernel)) { diff --git a/src/core/hle/kernel/svc/svc_thread.cpp b/src/core/hle/kernel/svc/svc_thread.cpp index 3e325c998..b39807841 100644 --- a/src/core/hle/kernel/svc/svc_thread.cpp +++ b/src/core/hle/kernel/svc/svc_thread.cpp @@ -28,7 +28,7 @@ Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point, // Adjust core id, if it's the default magic. auto& kernel = system.Kernel(); - auto& process = *kernel.CurrentProcess(); + auto& process = GetCurrentProcess(kernel); if (core_id == IdealCoreUseProcessValue) { core_id = process.GetIdealCoreId(); } @@ -53,9 +53,9 @@ Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point, } // Reserve a new thread from the process resource limit (waiting up to 100ms). - KScopedResourceReservation thread_reservation( - kernel.CurrentProcess(), LimitableResource::ThreadCountMax, 1, - system.CoreTiming().GetGlobalTimeNs().count() + 100000000); + KScopedResourceReservation thread_reservation(&process, LimitableResource::ThreadCountMax, 1, + system.CoreTiming().GetGlobalTimeNs().count() + + 100000000); if (!thread_reservation.Succeeded()) { LOG_ERROR(Kernel_SVC, "Could not reserve a new thread"); return ResultLimitReached; @@ -97,7 +97,7 @@ Result StartThread(Core::System& system, Handle thread_handle) { // Get the thread from its handle. KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(thread_handle); + GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject(thread_handle); R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); // Try to start the thread. @@ -156,11 +156,11 @@ Result GetThreadContext3(Core::System& system, VAddr out_context, Handle thread_ // Get the thread from its handle. KScopedAutoObject thread = - kernel.CurrentProcess()->GetHandleTable().GetObject(thread_handle); + GetCurrentProcess(kernel).GetHandleTable().GetObject(thread_handle); R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); // Require the handle be to a non-current thread in the current process. - const auto* current_process = kernel.CurrentProcess(); + const auto* current_process = GetCurrentProcessPointer(kernel); R_UNLESS(current_process == thread->GetOwnerProcess(), ResultInvalidId); // Verify that the thread isn't terminated. @@ -211,7 +211,7 @@ Result GetThreadPriority(Core::System& system, s32* out_priority, Handle handle) // Get the thread from its handle. KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(handle); + GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject(handle); R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); // Get the thread's priority. @@ -222,7 +222,7 @@ Result GetThreadPriority(Core::System& system, s32* out_priority, Handle handle) /// Sets the priority for the specified thread Result SetThreadPriority(Core::System& system, Handle thread_handle, s32 priority) { // Get the current process. - KProcess& process = *system.Kernel().CurrentProcess(); + KProcess& process = GetCurrentProcess(system.Kernel()); // Validate the priority. R_UNLESS(HighestThreadPriority <= priority && priority <= LowestThreadPriority, @@ -253,7 +253,7 @@ Result GetThreadList(Core::System& system, s32* out_num_threads, VAddr out_threa return ResultOutOfRange; } - auto* const current_process = system.Kernel().CurrentProcess(); + auto* const current_process = GetCurrentProcessPointer(system.Kernel()); const auto total_copy_size = out_thread_ids_size * sizeof(u64); if (out_thread_ids_size > 0 && @@ -284,7 +284,7 @@ Result GetThreadCoreMask(Core::System& system, s32* out_core_id, u64* out_affini // Get the thread from its handle. KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(thread_handle); + GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject(thread_handle); R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); // Get the core mask. @@ -297,11 +297,11 @@ Result SetThreadCoreMask(Core::System& system, Handle thread_handle, s32 core_id u64 affinity_mask) { // Determine the core id/affinity mask. if (core_id == IdealCoreUseProcessValue) { - core_id = system.Kernel().CurrentProcess()->GetIdealCoreId(); + core_id = GetCurrentProcess(system.Kernel()).GetIdealCoreId(); affinity_mask = (1ULL << core_id); } else { // Validate the affinity mask. - const u64 process_core_mask = system.Kernel().CurrentProcess()->GetCoreMask(); + const u64 process_core_mask = GetCurrentProcess(system.Kernel()).GetCoreMask(); R_UNLESS((affinity_mask | process_core_mask) == process_core_mask, ResultInvalidCoreId); R_UNLESS(affinity_mask != 0, ResultInvalidCombination); @@ -316,7 +316,7 @@ Result SetThreadCoreMask(Core::System& system, Handle thread_handle, s32 core_id // Get the thread from its handle. KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(thread_handle); + GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject(thread_handle); R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); // Set the core mask. @@ -329,7 +329,7 @@ Result SetThreadCoreMask(Core::System& system, Handle thread_handle, s32 core_id Result GetThreadId(Core::System& system, u64* out_thread_id, Handle thread_handle) { // Get the thread from its handle. KScopedAutoObject thread = - system.Kernel().CurrentProcess()->GetHandleTable().GetObject(thread_handle); + GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject(thread_handle); R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); // Get the thread's id. diff --git a/src/core/hle/kernel/svc/svc_transfer_memory.cpp b/src/core/hle/kernel/svc/svc_transfer_memory.cpp index a4c040e49..7ffc24adf 100644 --- a/src/core/hle/kernel/svc/svc_transfer_memory.cpp +++ b/src/core/hle/kernel/svc/svc_transfer_memory.cpp @@ -39,11 +39,11 @@ Result CreateTransferMemory(Core::System& system, Handle* out, VAddr address, u6 R_UNLESS(IsValidTransferMemoryPermission(map_perm), ResultInvalidNewMemoryPermission); // Get the current process and handle table. - auto& process = *kernel.CurrentProcess(); + auto& process = GetCurrentProcess(kernel); auto& handle_table = process.GetHandleTable(); // Reserve a new transfer memory from the process resource limit. - KScopedResourceReservation trmem_reservation(kernel.CurrentProcess(), + KScopedResourceReservation trmem_reservation(&process, LimitableResource::TransferMemoryCountMax); R_UNLESS(trmem_reservation.Succeeded(), ResultLimitReached); diff --git a/src/core/hle/kernel/svc_generator.py b/src/core/hle/kernel/svc_generator.py index b0a5707ec..34d2ac659 100644 --- a/src/core/hle/kernel/svc_generator.py +++ b/src/core/hle/kernel/svc_generator.py @@ -592,7 +592,7 @@ void Call(Core::System& system, u32 imm) { auto& kernel = system.Kernel(); kernel.EnterSVCProfile(); - if (system.CurrentProcess()->Is64BitProcess()) { + if (GetCurrentProcess(system.Kernel()).Is64BitProcess()) { Call64(system, imm); } else { Call32(system, imm); From 3a90ed99be4225bc7b3d5ee93c6032a4f38a487f Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Mon, 13 Feb 2023 16:21:29 +0000 Subject: [PATCH 0055/1181] Fix biquad filter command's state buffer offset --- src/audio_core/renderer/command/command_buffer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/audio_core/renderer/command/command_buffer.cpp b/src/audio_core/renderer/command/command_buffer.cpp index 8c6fe97e7..0bd418306 100644 --- a/src/audio_core/renderer/command/command_buffer.cpp +++ b/src/audio_core/renderer/command/command_buffer.cpp @@ -251,8 +251,8 @@ void CommandBuffer::GenerateBiquadFilterCommand(const s32 node_id, EffectInfoBas const auto& parameter{ *reinterpret_cast(effect_info.GetParameter())}; - const auto state{ - reinterpret_cast(effect_info.GetStateBuffer())}; + const auto state{reinterpret_cast( + effect_info.GetStateBuffer() + channel * sizeof(VoiceState::BiquadFilterState))}; cmd.input = buffer_offset + parameter.inputs[channel]; cmd.output = buffer_offset + parameter.outputs[channel]; From ceda2d280e8a3030c1e23083c5cea9158387fe4c Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 13 Feb 2023 11:21:43 -0500 Subject: [PATCH 0056/1181] general: rename CurrentProcess to ApplicationProcess --- src/audio_core/renderer/system.cpp | 2 +- src/audio_core/sink/sink_stream.cpp | 4 +- src/core/arm/arm_interface.cpp | 6 +-- src/core/core.cpp | 42 ++++++++--------- src/core/core.h | 18 ++++---- src/core/debugger/gdbstub.cpp | 28 +++++------ src/core/file_sys/savedata_factory.cpp | 2 +- src/core/hle/ipc_helpers.h | 2 +- src/core/hle/kernel/k_client_port.cpp | 2 +- src/core/hle/kernel/k_handle_table.h | 3 +- src/core/hle/kernel/k_session.cpp | 2 +- src/core/hle/kernel/kernel.cpp | 46 +++++++++---------- src/core/hle/kernel/kernel.h | 24 +++++----- src/core/hle/service/acc/acc.cpp | 4 +- src/core/hle/service/am/am.cpp | 22 +++++---- .../hle/service/am/applets/applet_error.cpp | 2 +- .../am/applets/applet_general_backend.cpp | 2 +- .../service/am/applets/applet_web_browser.cpp | 2 +- src/core/hle/service/aoc/aoc_u.cpp | 6 +-- src/core/hle/service/audio/audren_u.cpp | 2 +- src/core/hle/service/bcat/bcat_module.cpp | 10 ++-- src/core/hle/service/fatal/fatal.cpp | 2 +- .../hle/service/filesystem/filesystem.cpp | 4 +- src/core/hle/service/filesystem/fsp_srv.cpp | 5 +- src/core/hle/service/hid/hid.cpp | 8 ++-- src/core/hle/service/hid/hidbus.cpp | 4 +- src/core/hle/service/hid/irs.cpp | 8 ++-- src/core/hle/service/jit/jit.cpp | 4 +- src/core/hle/service/ldr/ldr.cpp | 13 +++--- src/core/hle/service/nfp/nfp_device.cpp | 2 +- .../hle/service/nvdrv/devices/nvhost_ctrl.cpp | 4 +- src/core/hle/service/nvdrv/devices/nvmap.cpp | 4 +- src/core/hle/service/pctl/pctl_module.cpp | 2 +- src/core/hle/service/prepo/prepo.cpp | 4 +- src/core/loader/nso.cpp | 2 +- src/core/memory.cpp | 10 ++-- src/core/memory/cheat_engine.cpp | 6 +-- src/core/reporter.cpp | 10 ++-- src/yuzu/bootmanager.cpp | 2 +- src/yuzu/main.cpp | 6 +-- src/yuzu_cmd/yuzu.cpp | 2 +- 41 files changed, 169 insertions(+), 164 deletions(-) diff --git a/src/audio_core/renderer/system.cpp b/src/audio_core/renderer/system.cpp index 4fac30c7c..31cbee282 100644 --- a/src/audio_core/renderer/system.cpp +++ b/src/audio_core/renderer/system.cpp @@ -127,7 +127,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, render_device = params.rendering_device; execution_mode = params.execution_mode; - core.Memory().ZeroBlock(*core.Kernel().CurrentProcess(), transfer_memory->GetSourceAddress(), + core.Memory().ZeroBlock(*core.ApplicationProcess(), transfer_memory->GetSourceAddress(), transfer_memory_size); // Note: We're not actually using the transfer memory because it's a pain to code for. diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index 06c2a876e..76889b375 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -270,7 +270,7 @@ void SinkStream::Stall() { if (stalled_lock) { return; } - stalled_lock = system.StallProcesses(); + stalled_lock = system.StallApplication(); } void SinkStream::Unstall() { @@ -278,7 +278,7 @@ void SinkStream::Unstall() { if (!stalled_lock) { return; } - system.UnstallProcesses(); + system.UnstallApplication(); stalled_lock.unlock(); } diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp index 8aa7b9641..4a331d4c1 100644 --- a/src/core/arm/arm_interface.cpp +++ b/src/core/arm/arm_interface.cpp @@ -43,9 +43,9 @@ void ARM_Interface::SymbolicateBacktrace(Core::System& system, std::vector symbols; for (const auto& module : modules) { - symbols.insert_or_assign(module.second, - Symbols::GetSymbols(module.first, system.Memory(), - system.CurrentProcess()->Is64BitProcess())); + symbols.insert_or_assign( + module.second, Symbols::GetSymbols(module.first, system.Memory(), + system.ApplicationProcess()->Is64BitProcess())); } for (auto& entry : out) { diff --git a/src/core/core.cpp b/src/core/core.cpp index 47292cd78..fb9b25d12 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -186,7 +186,7 @@ struct System::Impl { void Run() { std::unique_lock lk(suspend_guard); - kernel.Suspend(false); + kernel.SuspendApplication(false); core_timing.SyncPause(false); is_paused.store(false, std::memory_order_relaxed); } @@ -195,7 +195,7 @@ struct System::Impl { std::unique_lock lk(suspend_guard); core_timing.SyncPause(true); - kernel.Suspend(true); + kernel.SuspendApplication(true); is_paused.store(true, std::memory_order_relaxed); } @@ -203,17 +203,17 @@ struct System::Impl { return is_paused.load(std::memory_order_relaxed); } - std::unique_lock StallProcesses() { + std::unique_lock StallApplication() { std::unique_lock lk(suspend_guard); - kernel.Suspend(true); + kernel.SuspendApplication(true); core_timing.SyncPause(true); return lk; } - void UnstallProcesses() { + void UnstallApplication() { if (!IsPaused()) { core_timing.SyncPause(false); - kernel.Suspend(false); + kernel.SuspendApplication(false); } } @@ -221,7 +221,7 @@ struct System::Impl { debugger = std::make_unique(system, port); } - SystemResultStatus SetupForMainProcess(System& system, Frontend::EmuWindow& emu_window) { + SystemResultStatus SetupForApplicationProcess(System& system, Frontend::EmuWindow& emu_window) { LOG_DEBUG(Core, "initialized OK"); // Setting changes may require a full system reinitialization (e.g., disabling multicore). @@ -273,7 +273,7 @@ struct System::Impl { return SystemResultStatus::ErrorGetLoader; } - SystemResultStatus init_result{SetupForMainProcess(system, emu_window)}; + SystemResultStatus init_result{SetupForApplicationProcess(system, emu_window)}; if (init_result != SystemResultStatus::Success) { LOG_CRITICAL(Core, "Failed to initialize system (Error {})!", static_cast(init_result)); @@ -302,7 +302,7 @@ struct System::Impl { static_cast(SystemResultStatus::ErrorLoader) + static_cast(load_result)); } AddGlueRegistrationForProcess(*app_loader, *main_process); - kernel.MakeCurrentProcess(main_process); + kernel.MakeApplicationProcess(main_process); kernel.InitializeCores(); // Initialize cheat engine @@ -585,12 +585,12 @@ void System::DetachDebugger() { } } -std::unique_lock System::StallProcesses() { - return impl->StallProcesses(); +std::unique_lock System::StallApplication() { + return impl->StallApplication(); } -void System::UnstallProcesses() { - impl->UnstallProcesses(); +void System::UnstallApplication() { + impl->UnstallApplication(); } void System::InitializeDebugger() { @@ -648,8 +648,8 @@ const Kernel::GlobalSchedulerContext& System::GlobalSchedulerContext() const { return impl->kernel.GlobalSchedulerContext(); } -Kernel::KProcess* System::CurrentProcess() { - return impl->kernel.CurrentProcess(); +Kernel::KProcess* System::ApplicationProcess() { + return impl->kernel.ApplicationProcess(); } Core::DeviceMemory& System::DeviceMemory() { @@ -660,8 +660,8 @@ const Core::DeviceMemory& System::DeviceMemory() const { return *impl->device_memory; } -const Kernel::KProcess* System::CurrentProcess() const { - return impl->kernel.CurrentProcess(); +const Kernel::KProcess* System::ApplicationProcess() const { + return impl->kernel.ApplicationProcess(); } ARM_Interface& System::ArmInterface(std::size_t core_index) { @@ -760,8 +760,8 @@ const Core::SpeedLimiter& System::SpeedLimiter() const { return impl->speed_limiter; } -u64 System::GetCurrentProcessProgramID() const { - return impl->kernel.CurrentProcess()->GetProgramID(); +u64 System::GetApplicationProcessProgramID() const { + return impl->kernel.ApplicationProcess()->GetProgramID(); } Loader::ResultStatus System::GetGameName(std::string& out) const { @@ -880,11 +880,11 @@ bool System::GetExitLock() const { return impl->exit_lock; } -void System::SetCurrentProcessBuildID(const CurrentBuildProcessID& id) { +void System::SetApplicationProcessBuildID(const CurrentBuildProcessID& id) { impl->build_id = id; } -const System::CurrentBuildProcessID& System::GetCurrentProcessBuildID() const { +const System::CurrentBuildProcessID& System::GetApplicationProcessBuildID() const { return impl->build_id; } diff --git a/src/core/core.h b/src/core/core.h index fb5cda2f5..0042ac170 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -184,8 +184,8 @@ public: /// Forcibly detach the debugger if it is running. void DetachDebugger(); - std::unique_lock StallProcesses(); - void UnstallProcesses(); + std::unique_lock StallApplication(); + void UnstallApplication(); /** * Initialize the debugger. @@ -295,11 +295,11 @@ public: /// Gets the manager for the guest device memory [[nodiscard]] const Core::DeviceMemory& DeviceMemory() const; - /// Provides a pointer to the current process - [[nodiscard]] Kernel::KProcess* CurrentProcess(); + /// Provides a pointer to the application process + [[nodiscard]] Kernel::KProcess* ApplicationProcess(); - /// Provides a constant pointer to the current process. - [[nodiscard]] const Kernel::KProcess* CurrentProcess() const; + /// Provides a constant pointer to the application process. + [[nodiscard]] const Kernel::KProcess* ApplicationProcess() const; /// Provides a reference to the core timing instance. [[nodiscard]] Timing::CoreTiming& CoreTiming(); @@ -331,7 +331,7 @@ public: /// Provides a constant reference to the speed limiter [[nodiscard]] const Core::SpeedLimiter& SpeedLimiter() const; - [[nodiscard]] u64 GetCurrentProcessProgramID() const; + [[nodiscard]] u64 GetApplicationProcessProgramID() const; /// Gets the name of the current game [[nodiscard]] Loader::ResultStatus GetGameName(std::string& out) const; @@ -396,8 +396,8 @@ public: void SetExitLock(bool locked); [[nodiscard]] bool GetExitLock() const; - void SetCurrentProcessBuildID(const CurrentBuildProcessID& id); - [[nodiscard]] const CurrentBuildProcessID& GetCurrentProcessBuildID() const; + void SetApplicationProcessBuildID(const CurrentBuildProcessID& id); + [[nodiscard]] const CurrentBuildProcessID& GetApplicationProcessBuildID() const; /// Register a host thread as an emulated CPU Core. void RegisterCoreThread(std::size_t id); diff --git a/src/core/debugger/gdbstub.cpp b/src/core/debugger/gdbstub.cpp index 9c02b7b31..945ec528e 100644 --- a/src/core/debugger/gdbstub.cpp +++ b/src/core/debugger/gdbstub.cpp @@ -96,7 +96,7 @@ static std::string EscapeXML(std::string_view data) { GDBStub::GDBStub(DebuggerBackend& backend_, Core::System& system_) : DebuggerFrontend(backend_), system{system_} { - if (system.CurrentProcess()->Is64BitProcess()) { + if (system.ApplicationProcess()->Is64BitProcess()) { arch = std::make_unique(); } else { arch = std::make_unique(); @@ -340,15 +340,15 @@ void GDBStub::HandleBreakpointInsert(std::string_view command) { success = true; break; case BreakpointType::WriteWatch: - success = system.CurrentProcess()->InsertWatchpoint(system, addr, size, - Kernel::DebugWatchpointType::Write); + success = system.ApplicationProcess()->InsertWatchpoint(system, addr, size, + Kernel::DebugWatchpointType::Write); break; case BreakpointType::ReadWatch: - success = system.CurrentProcess()->InsertWatchpoint(system, addr, size, - Kernel::DebugWatchpointType::Read); + success = system.ApplicationProcess()->InsertWatchpoint(system, addr, size, + Kernel::DebugWatchpointType::Read); break; case BreakpointType::AccessWatch: - success = system.CurrentProcess()->InsertWatchpoint( + success = system.ApplicationProcess()->InsertWatchpoint( system, addr, size, Kernel::DebugWatchpointType::ReadOrWrite); break; case BreakpointType::Hardware: @@ -391,15 +391,15 @@ void GDBStub::HandleBreakpointRemove(std::string_view command) { break; } case BreakpointType::WriteWatch: - success = system.CurrentProcess()->RemoveWatchpoint(system, addr, size, - Kernel::DebugWatchpointType::Write); + success = system.ApplicationProcess()->RemoveWatchpoint(system, addr, size, + Kernel::DebugWatchpointType::Write); break; case BreakpointType::ReadWatch: - success = system.CurrentProcess()->RemoveWatchpoint(system, addr, size, - Kernel::DebugWatchpointType::Read); + success = system.ApplicationProcess()->RemoveWatchpoint(system, addr, size, + Kernel::DebugWatchpointType::Read); break; case BreakpointType::AccessWatch: - success = system.CurrentProcess()->RemoveWatchpoint( + success = system.ApplicationProcess()->RemoveWatchpoint( system, addr, size, Kernel::DebugWatchpointType::ReadOrWrite); break; case BreakpointType::Hardware: @@ -482,7 +482,7 @@ static std::optional GetNameFromThreadType64(Core::Memory::Memory& static std::optional GetThreadName(Core::System& system, const Kernel::KThread* thread) { - if (system.CurrentProcess()->Is64BitProcess()) { + if (system.ApplicationProcess()->Is64BitProcess()) { return GetNameFromThreadType64(system.Memory(), thread); } else { return GetNameFromThreadType32(system.Memory(), thread); @@ -555,7 +555,7 @@ void GDBStub::HandleQuery(std::string_view command) { SendReply(fmt::format("TextSeg={:x}", main->first)); } else { SendReply(fmt::format("TextSeg={:x}", - system.CurrentProcess()->PageTable().GetCodeRegionStart())); + system.ApplicationProcess()->PageTable().GetCodeRegionStart())); } } else if (command.starts_with("Xfer:libraries:read::")) { Loader::AppLoader::Modules modules; @@ -729,7 +729,7 @@ void GDBStub::HandleRcmd(const std::vector& command) { std::string_view command_str{reinterpret_cast(&command[0]), command.size()}; std::string reply; - auto* process = system.CurrentProcess(); + auto* process = system.ApplicationProcess(); auto& page_table = process->PageTable(); const char* commands = "Commands:\n" diff --git a/src/core/file_sys/savedata_factory.cpp b/src/core/file_sys/savedata_factory.cpp index 1567da231..769065b6f 100644 --- a/src/core/file_sys/savedata_factory.cpp +++ b/src/core/file_sys/savedata_factory.cpp @@ -172,7 +172,7 @@ std::string SaveDataFactory::GetFullPath(Core::System& system, VirtualDir dir, // be interpreted as the title id of the current process. if (type == SaveDataType::SaveData || type == SaveDataType::DeviceSaveData) { if (title_id == 0) { - title_id = system.GetCurrentProcessProgramID(); + title_id = system.GetApplicationProcessProgramID(); } } diff --git a/src/core/hle/ipc_helpers.h b/src/core/hle/ipc_helpers.h index a86bec252..38d6cfaff 100644 --- a/src/core/hle/ipc_helpers.h +++ b/src/core/hle/ipc_helpers.h @@ -148,7 +148,7 @@ public: if (context->GetManager()->IsDomain()) { context->AddDomainObject(std::move(iface)); } else { - kernel.CurrentProcess()->GetResourceLimit()->Reserve( + kernel.ApplicationProcess()->GetResourceLimit()->Reserve( Kernel::LimitableResource::SessionCountMax, 1); auto* session = Kernel::KSession::Create(kernel); diff --git a/src/core/hle/kernel/k_client_port.cpp b/src/core/hle/kernel/k_client_port.cpp index 9a540987b..c72a91a76 100644 --- a/src/core/hle/kernel/k_client_port.cpp +++ b/src/core/hle/kernel/k_client_port.cpp @@ -61,7 +61,7 @@ bool KClientPort::IsSignaled() const { Result KClientPort::CreateSession(KClientSession** out) { // Reserve a new session from the resource limit. //! FIXME: we are reserving this from the wrong resource limit! - KScopedResourceReservation session_reservation(kernel.CurrentProcess()->GetResourceLimit(), + KScopedResourceReservation session_reservation(kernel.ApplicationProcess()->GetResourceLimit(), LimitableResource::SessionCountMax); R_UNLESS(session_reservation.Succeeded(), ResultLimitReached); diff --git a/src/core/hle/kernel/k_handle_table.h b/src/core/hle/kernel/k_handle_table.h index 1bf68e6b0..d7660630c 100644 --- a/src/core/hle/kernel/k_handle_table.h +++ b/src/core/hle/kernel/k_handle_table.h @@ -90,7 +90,8 @@ public: // Handle pseudo-handles. if constexpr (std::derived_from) { if (handle == Svc::PseudoHandle::CurrentProcess) { - auto* const cur_process = GetCurrentProcessPointer(m_kernel); + //! FIXME: this is the wrong process! + auto* const cur_process = m_kernel.ApplicationProcess(); ASSERT(cur_process != nullptr); return cur_process; } diff --git a/src/core/hle/kernel/k_session.cpp b/src/core/hle/kernel/k_session.cpp index 819f39f12..7e677c028 100644 --- a/src/core/hle/kernel/k_session.cpp +++ b/src/core/hle/kernel/k_session.cpp @@ -34,7 +34,7 @@ void KSession::Initialize(KClientPort* port_, const std::string& name_) { // Set our owner process. //! FIXME: this is the wrong process! - process = kernel.CurrentProcess(); + process = kernel.ApplicationProcess(); process->Open(); // Set our port. diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 5b72eaaa1..b1922659d 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -102,13 +102,13 @@ struct KernelCore::Impl { void InitializeCores() { for (u32 core_id = 0; core_id < Core::Hardware::NUM_CPU_CORES; core_id++) { - cores[core_id]->Initialize((*current_process).Is64BitProcess()); - system.Memory().SetCurrentPageTable(*current_process, core_id); + cores[core_id]->Initialize((*application_process).Is64BitProcess()); + system.Memory().SetCurrentPageTable(*application_process, core_id); } } - void CloseCurrentProcess() { - KProcess* old_process = current_process.exchange(nullptr); + void CloseApplicationProcess() { + KProcess* old_process = application_process.exchange(nullptr); if (old_process == nullptr) { return; } @@ -182,7 +182,7 @@ struct KernelCore::Impl { } } - CloseCurrentProcess(); + CloseApplicationProcess(); // Track kernel objects that were not freed on shutdown { @@ -363,8 +363,8 @@ struct KernelCore::Impl { } } - void MakeCurrentProcess(KProcess* process) { - current_process = process; + void MakeApplicationProcess(KProcess* process) { + application_process = process; } static inline thread_local u32 host_thread_id = UINT32_MAX; @@ -821,7 +821,7 @@ struct KernelCore::Impl { // Lists all processes that exist in the current session. std::vector process_list; - std::atomic current_process{}; + std::atomic application_process{}; std::unique_ptr global_scheduler_context; std::unique_ptr hardware_timer; @@ -941,20 +941,20 @@ void KernelCore::AppendNewProcess(KProcess* process) { impl->process_list.push_back(process); } -void KernelCore::MakeCurrentProcess(KProcess* process) { - impl->MakeCurrentProcess(process); +void KernelCore::MakeApplicationProcess(KProcess* process) { + impl->MakeApplicationProcess(process); } -KProcess* KernelCore::CurrentProcess() { - return impl->current_process; +KProcess* KernelCore::ApplicationProcess() { + return impl->application_process; } -const KProcess* KernelCore::CurrentProcess() const { - return impl->current_process; +const KProcess* KernelCore::ApplicationProcess() const { + return impl->application_process; } -void KernelCore::CloseCurrentProcess() { - impl->CloseCurrentProcess(); +void KernelCore::CloseApplicationProcess() { + impl->CloseApplicationProcess(); } const std::vector& KernelCore::GetProcessList() const { @@ -1202,12 +1202,12 @@ const Kernel::KSharedMemory& KernelCore::GetHidBusSharedMem() const { return *impl->hidbus_shared_mem; } -void KernelCore::Suspend(bool suspended) { +void KernelCore::SuspendApplication(bool suspended) { const bool should_suspend{exception_exited || suspended}; const auto activity = should_suspend ? ProcessActivity::Paused : ProcessActivity::Runnable; - //! This refers to the application process, not the current process. - KScopedAutoObject process = CurrentProcess(); + // Get the application process. + KScopedAutoObject process = ApplicationProcess(); if (process.IsNull()) { return; } @@ -1218,8 +1218,8 @@ void KernelCore::Suspend(bool suspended) { // Wait for process execution to stop. bool must_wait{should_suspend}; - // KernelCore::Suspend must be called from locked context, or we - // could race another call to SetActivity, interfering with waiting. + // KernelCore::SuspendApplication must be called from locked context, + // or we could race another call to SetActivity, interfering with waiting. while (must_wait) { KScopedSchedulerLock sl{*this}; @@ -1253,9 +1253,9 @@ bool KernelCore::IsShuttingDown() const { return impl->IsShuttingDown(); } -void KernelCore::ExceptionalExit() { +void KernelCore::ExceptionalExitApplication() { exception_exited = true; - Suspend(true); + SuspendApplication(true); } void KernelCore::EnterSVCProfile() { diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index af0ae0e98..a236e6b42 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -131,17 +131,17 @@ public: /// Adds the given shared pointer to an internal list of active processes. void AppendNewProcess(KProcess* process); - /// Makes the given process the new current process. - void MakeCurrentProcess(KProcess* process); + /// Makes the given process the new application process. + void MakeApplicationProcess(KProcess* process); - /// Retrieves a pointer to the current process. - KProcess* CurrentProcess(); + /// Retrieves a pointer to the application process. + KProcess* ApplicationProcess(); - /// Retrieves a const pointer to the current process. - const KProcess* CurrentProcess() const; + /// Retrieves a const pointer to the application process. + const KProcess* ApplicationProcess() const; - /// Closes the current process. - void CloseCurrentProcess(); + /// Closes the application process. + void CloseApplicationProcess(); /// Retrieves the list of processes. const std::vector& GetProcessList() const; @@ -288,11 +288,11 @@ public: /// Gets the shared memory object for HIDBus services. const Kernel::KSharedMemory& GetHidBusSharedMem() const; - /// Suspend/unsuspend all processes. - void Suspend(bool suspend); + /// Suspend/unsuspend application process. + void SuspendApplication(bool suspend); - /// Exceptional exit all processes. - void ExceptionalExit(); + /// Exceptional exit application process. + void ExceptionalExitApplication(); /// Notify emulated CPU cores to shut down. void ShutdownCores(); diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index 6d1084fd1..1495d64de 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -762,7 +762,7 @@ Result Module::Interface::InitializeApplicationInfoBase() { // processes emulated. As we don't actually have pid support we should assume we're just using // our own process const auto launch_property = - system.GetARPManager().GetLaunchProperty(system.GetCurrentProcessProgramID()); + system.GetARPManager().GetLaunchProperty(system.GetApplicationProcessProgramID()); if (launch_property.Failed()) { LOG_ERROR(Service_ACC, "Failed to get launch property"); @@ -806,7 +806,7 @@ void Module::Interface::IsUserAccountSwitchLocked(Kernel::HLERequestContext& ctx bool is_locked = false; if (res != Loader::ResultStatus::Success) { - const FileSys::PatchManager pm{system.GetCurrentProcessProgramID(), + const FileSys::PatchManager pm{system.GetApplicationProcessProgramID(), system.GetFileSystemController(), system.GetContentProvider()}; const auto nacp_unique = pm.GetControlMetadata().first; diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index ebcf6e164..615dd65f3 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -79,7 +79,7 @@ IWindowController::IWindowController(Core::System& system_) IWindowController::~IWindowController() = default; void IWindowController::GetAppletResourceUserId(Kernel::HLERequestContext& ctx) { - const u64 process_id = system.CurrentProcess()->GetProcessID(); + const u64 process_id = system.ApplicationProcess()->GetProcessID(); LOG_DEBUG(Service_AM, "called. Process ID=0x{:016X}", process_id); @@ -1252,7 +1252,7 @@ void ILibraryAppletCreator::CreateTransferMemoryStorage(Kernel::HLERequestContex } auto transfer_mem = - system.CurrentProcess()->GetHandleTable().GetObject(handle); + system.ApplicationProcess()->GetHandleTable().GetObject(handle); if (transfer_mem.IsNull()) { LOG_ERROR(Service_AM, "transfer_mem is a nullptr for handle={:08X}", handle); @@ -1286,7 +1286,7 @@ void ILibraryAppletCreator::CreateHandleStorage(Kernel::HLERequestContext& ctx) } auto transfer_mem = - system.CurrentProcess()->GetHandleTable().GetObject(handle); + system.ApplicationProcess()->GetHandleTable().GetObject(handle); if (transfer_mem.IsNull()) { LOG_ERROR(Service_AM, "transfer_mem is a nullptr for handle={:08X}", handle); @@ -1465,11 +1465,12 @@ void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) { const auto backend = BCAT::CreateBackendFromSettings(system, [this](u64 tid) { return system.GetFileSystemController().GetBCATDirectory(tid); }); - const auto build_id_full = system.GetCurrentProcessBuildID(); + const auto build_id_full = system.GetApplicationProcessBuildID(); u64 build_id{}; std::memcpy(&build_id, build_id_full.data(), sizeof(u64)); - auto data = backend->GetLaunchParameter({system.GetCurrentProcessProgramID(), build_id}); + auto data = + backend->GetLaunchParameter({system.GetApplicationProcessProgramID(), build_id}); if (data.has_value()) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); @@ -1521,7 +1522,7 @@ void IApplicationFunctions::EnsureSaveData(Kernel::HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called, uid={:016X}{:016X}", user_id[1], user_id[0]); FileSys::SaveDataAttribute attribute{}; - attribute.title_id = system.GetCurrentProcessProgramID(); + attribute.title_id = system.GetApplicationProcessProgramID(); attribute.user_id = user_id; attribute.type = FileSys::SaveDataType::SaveData; const auto res = system.GetFileSystemController().CreateSaveData( @@ -1551,7 +1552,7 @@ void IApplicationFunctions::GetDisplayVersion(Kernel::HLERequestContext& ctx) { std::array version_string{}; const auto res = [this] { - const auto title_id = system.GetCurrentProcessProgramID(); + const auto title_id = system.GetApplicationProcessProgramID(); const FileSys::PatchManager pm{title_id, system.GetFileSystemController(), system.GetContentProvider()}; @@ -1588,7 +1589,7 @@ void IApplicationFunctions::GetDesiredLanguage(Kernel::HLERequestContext& ctx) { u32 supported_languages = 0; const auto res = [this] { - const auto title_id = system.GetCurrentProcessProgramID(); + const auto title_id = system.GetApplicationProcessProgramID(); const FileSys::PatchManager pm{title_id, system.GetFileSystemController(), system.GetContentProvider()}; @@ -1696,7 +1697,8 @@ void IApplicationFunctions::ExtendSaveData(Kernel::HLERequestContext& ctx) { static_cast(type), user_id[1], user_id[0], new_normal_size, new_journal_size); system.GetFileSystemController().WriteSaveDataSize( - type, system.GetCurrentProcessProgramID(), user_id, {new_normal_size, new_journal_size}); + type, system.GetApplicationProcessProgramID(), user_id, + {new_normal_size, new_journal_size}); IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); @@ -1720,7 +1722,7 @@ void IApplicationFunctions::GetSaveDataSize(Kernel::HLERequestContext& ctx) { user_id[0]); const auto size = system.GetFileSystemController().ReadSaveDataSize( - type, system.GetCurrentProcessProgramID(), user_id); + type, system.GetApplicationProcessProgramID(), user_id); IPC::ResponseBuilder rb{ctx, 6}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/am/applets/applet_error.cpp b/src/core/hle/service/am/applets/applet_error.cpp index bae0d99a6..b013896b4 100644 --- a/src/core/hle/service/am/applets/applet_error.cpp +++ b/src/core/hle/service/am/applets/applet_error.cpp @@ -166,7 +166,7 @@ void Error::Execute() { } const auto callback = [this] { DisplayCompleted(); }; - const auto title_id = system.GetCurrentProcessProgramID(); + const auto title_id = system.GetApplicationProcessProgramID(); const auto& reporter{system.GetReporter()}; switch (mode) { diff --git a/src/core/hle/service/am/applets/applet_general_backend.cpp b/src/core/hle/service/am/applets/applet_general_backend.cpp index e50acdaf6..1eefa85e3 100644 --- a/src/core/hle/service/am/applets/applet_general_backend.cpp +++ b/src/core/hle/service/am/applets/applet_general_backend.cpp @@ -186,7 +186,7 @@ void PhotoViewer::Execute() { const auto callback = [this] { ViewFinished(); }; switch (mode) { case PhotoViewerAppletMode::CurrentApp: - frontend.ShowPhotosForApplication(system.GetCurrentProcessProgramID(), callback); + frontend.ShowPhotosForApplication(system.GetApplicationProcessProgramID(), callback); break; case PhotoViewerAppletMode::AllApps: frontend.ShowAllPhotos(callback); diff --git a/src/core/hle/service/am/applets/applet_web_browser.cpp b/src/core/hle/service/am/applets/applet_web_browser.cpp index 14aa6f69e..f061bae80 100644 --- a/src/core/hle/service/am/applets/applet_web_browser.cpp +++ b/src/core/hle/service/am/applets/applet_web_browser.cpp @@ -393,7 +393,7 @@ void WebBrowser::InitializeOffline() { switch (document_kind) { case DocumentKind::OfflineHtmlPage: default: - title_id = system.GetCurrentProcessProgramID(); + title_id = system.GetApplicationProcessProgramID(); nca_type = FileSys::ContentRecordType::HtmlDocument; additional_paths = "html-document"; break; diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp index 368ccd52f..7264f23f9 100644 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ b/src/core/hle/service/aoc/aoc_u.cpp @@ -155,7 +155,7 @@ void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); - const auto current = system.GetCurrentProcessProgramID(); + const auto current = system.GetApplicationProcessProgramID(); const auto& disabled = Settings::values.disabled_addons[current]; if (std::find(disabled.begin(), disabled.end(), "DLC") != disabled.end()) { @@ -182,7 +182,7 @@ void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { LOG_DEBUG(Service_AOC, "called with offset={}, count={}, process_id={}", offset, count, process_id); - const auto current = system.GetCurrentProcessProgramID(); + const auto current = system.GetApplicationProcessProgramID(); std::vector out; const auto& disabled = Settings::values.disabled_addons[current]; @@ -228,7 +228,7 @@ void AOC_U::GetAddOnContentBaseId(Kernel::HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); - const auto title_id = system.GetCurrentProcessProgramID(); + const auto title_id = system.GetApplicationProcessProgramID(); const FileSys::PatchManager pm{title_id, system.GetFileSystemController(), system.GetContentProvider()}; diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index 0ee28752c..7d730421d 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp @@ -455,7 +455,7 @@ void AudRenU::OpenAudioRenderer(Kernel::HLERequestContext& ctx) { return; } - const auto& handle_table{system.CurrentProcess()->GetHandleTable()}; + const auto& handle_table{system.ApplicationProcess()->GetHandleTable()}; auto process{handle_table.GetObject(process_handle)}; auto transfer_memory{ process->GetHandleTable().GetObject(transfer_memory_handle)}; diff --git a/src/core/hle/service/bcat/bcat_module.cpp b/src/core/hle/service/bcat/bcat_module.cpp index cbe690a5d..6e6fed227 100644 --- a/src/core/hle/service/bcat/bcat_module.cpp +++ b/src/core/hle/service/bcat/bcat_module.cpp @@ -176,8 +176,8 @@ private: void RequestSyncDeliveryCache(Kernel::HLERequestContext& ctx) { LOG_DEBUG(Service_BCAT, "called"); - backend.Synchronize({system.GetCurrentProcessProgramID(), - GetCurrentBuildID(system.GetCurrentProcessBuildID())}, + backend.Synchronize({system.GetApplicationProcessProgramID(), + GetCurrentBuildID(system.GetApplicationProcessBuildID())}, GetProgressBackend(SyncType::Normal)); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -193,8 +193,8 @@ private: LOG_DEBUG(Service_BCAT, "called, name={}", name); - backend.SynchronizeDirectory({system.GetCurrentProcessProgramID(), - GetCurrentBuildID(system.GetCurrentProcessBuildID())}, + backend.SynchronizeDirectory({system.GetApplicationProcessProgramID(), + GetCurrentBuildID(system.GetApplicationProcessBuildID())}, name, GetProgressBackend(SyncType::Directory)); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -554,7 +554,7 @@ private: void Module::Interface::CreateDeliveryCacheStorageService(Kernel::HLERequestContext& ctx) { LOG_DEBUG(Service_BCAT, "called"); - const auto title_id = system.GetCurrentProcessProgramID(); + const auto title_id = system.GetApplicationProcessProgramID(); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); rb.PushIpcInterface(system, fsc.GetBCATDirectory(title_id)); diff --git a/src/core/hle/service/fatal/fatal.cpp b/src/core/hle/service/fatal/fatal.cpp index 27675615b..2e5919330 100644 --- a/src/core/hle/service/fatal/fatal.cpp +++ b/src/core/hle/service/fatal/fatal.cpp @@ -63,7 +63,7 @@ enum class FatalType : u32 { }; static void GenerateErrorReport(Core::System& system, Result error_code, const FatalInfo& info) { - const auto title_id = system.GetCurrentProcessProgramID(); + const auto title_id = system.GetApplicationProcessProgramID(); std::string crash_report = fmt::format( "Yuzu {}-{} crash report\n" "Title ID: {:016x}\n" diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp index 11c604a0f..177447bc1 100644 --- a/src/core/hle/service/filesystem/filesystem.cpp +++ b/src/core/hle/service/filesystem/filesystem.cpp @@ -317,7 +317,7 @@ ResultVal FileSystemController::OpenRomFSCurrentProcess() return ResultUnknown; } - return romfs_factory->OpenCurrentProcess(system.GetCurrentProcessProgramID()); + return romfs_factory->OpenCurrentProcess(system.GetApplicationProcessProgramID()); } ResultVal FileSystemController::OpenPatchedRomFS( @@ -502,7 +502,7 @@ FileSys::SaveDataSize FileSystemController::ReadSaveDataSize(FileSys::SaveDataTy const auto res = system.GetAppLoader().ReadControlData(nacp); if (res != Loader::ResultStatus::Success) { - const FileSys::PatchManager pm{system.GetCurrentProcessProgramID(), + const FileSys::PatchManager pm{system.GetApplicationProcessProgramID(), system.GetFileSystemController(), system.GetContentProvider()}; const auto metadata = pm.GetControlMetadata(); diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index 447d624e1..e76346ca9 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp_srv.cpp @@ -1036,8 +1036,9 @@ void FSP_SRV::OpenDataStorageWithProgramIndex(Kernel::HLERequestContext& ctx) { LOG_DEBUG(Service_FS, "called, program_index={}", program_index); - auto patched_romfs = fsc.OpenPatchedRomFSWithProgramIndex( - system.GetCurrentProcessProgramID(), program_index, FileSys::ContentRecordType::Program); + auto patched_romfs = + fsc.OpenPatchedRomFSWithProgramIndex(system.GetApplicationProcessProgramID(), program_index, + FileSys::ContentRecordType::Program); if (patched_romfs.Failed()) { // TODO: Find the right error code to use here diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 5a1aa0903..b0d06ee55 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -1830,7 +1830,7 @@ void Hid::InitializeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { ASSERT_MSG(t_mem_1_size == 0x1000, "t_mem_1_size is not 0x1000 bytes"); ASSERT_MSG(t_mem_2_size == 0x7F000, "t_mem_2_size is not 0x7F000 bytes"); - auto t_mem_1 = system.CurrentProcess()->GetHandleTable().GetObject( + auto t_mem_1 = system.ApplicationProcess()->GetHandleTable().GetObject( t_mem_1_handle); if (t_mem_1.IsNull()) { @@ -1840,7 +1840,7 @@ void Hid::InitializeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { return; } - auto t_mem_2 = system.CurrentProcess()->GetHandleTable().GetObject( + auto t_mem_2 = system.ApplicationProcess()->GetHandleTable().GetObject( t_mem_2_handle); if (t_mem_2.IsNull()) { @@ -2127,8 +2127,8 @@ void Hid::WritePalmaWaveEntry(Kernel::HLERequestContext& ctx) { ASSERT_MSG(t_mem_size == 0x3000, "t_mem_size is not 0x3000 bytes"); - auto t_mem = - system.CurrentProcess()->GetHandleTable().GetObject(t_mem_handle); + auto t_mem = system.ApplicationProcess()->GetHandleTable().GetObject( + t_mem_handle); if (t_mem.IsNull()) { LOG_ERROR(Service_HID, "t_mem is a nullptr for handle=0x{:08X}", t_mem_handle); diff --git a/src/core/hle/service/hid/hidbus.cpp b/src/core/hle/service/hid/hidbus.cpp index 17252a84a..bd94e8f3d 100644 --- a/src/core/hle/service/hid/hidbus.cpp +++ b/src/core/hle/service/hid/hidbus.cpp @@ -449,8 +449,8 @@ void HidBus::EnableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx) { ASSERT_MSG(t_mem_size == 0x1000, "t_mem_size is not 0x1000 bytes"); - auto t_mem = - system.CurrentProcess()->GetHandleTable().GetObject(t_mem_handle); + auto t_mem = system.ApplicationProcess()->GetHandleTable().GetObject( + t_mem_handle); if (t_mem.IsNull()) { LOG_ERROR(Service_HID, "t_mem is a nullptr for handle=0x{:08X}", t_mem_handle); diff --git a/src/core/hle/service/hid/irs.cpp b/src/core/hle/service/hid/irs.cpp index 52f402c56..3bd418e92 100644 --- a/src/core/hle/service/hid/irs.cpp +++ b/src/core/hle/service/hid/irs.cpp @@ -196,8 +196,8 @@ void IRS::RunImageTransferProcessor(Kernel::HLERequestContext& ctx) { const auto parameters{rp.PopRaw()}; const auto t_mem_handle{ctx.GetCopyHandle(0)}; - auto t_mem = - system.CurrentProcess()->GetHandleTable().GetObject(t_mem_handle); + auto t_mem = system.ApplicationProcess()->GetHandleTable().GetObject( + t_mem_handle); if (t_mem.IsNull()) { LOG_ERROR(Service_IRS, "t_mem is a nullptr for handle=0x{:08X}", t_mem_handle); @@ -445,8 +445,8 @@ void IRS::RunImageTransferExProcessor(Kernel::HLERequestContext& ctx) { const auto parameters{rp.PopRaw()}; const auto t_mem_handle{ctx.GetCopyHandle(0)}; - auto t_mem = - system.CurrentProcess()->GetHandleTable().GetObject(t_mem_handle); + auto t_mem = system.ApplicationProcess()->GetHandleTable().GetObject( + t_mem_handle); u8* transfer_memory = system.Memory().GetPointer(t_mem->GetSourceAddress()); diff --git a/src/core/hle/service/jit/jit.cpp b/src/core/hle/service/jit/jit.cpp index 1295a44c7..47a1277ea 100644 --- a/src/core/hle/service/jit/jit.cpp +++ b/src/core/hle/service/jit/jit.cpp @@ -353,9 +353,9 @@ public: return; } - // Fetch using the handle table for the current process here, + // Fetch using the handle table for the application process here, // since we are not multiprocess yet. - const auto& handle_table{system.CurrentProcess()->GetHandleTable()}; + const auto& handle_table{system.ApplicationProcess()->GetHandleTable()}; auto process{handle_table.GetObject(process_handle)}; if (process.IsNull()) { diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index 652441bc2..2d4d6fe3e 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp @@ -246,7 +246,7 @@ public: return; } - if (system.GetCurrentProcessProgramID() != header.application_id) { + if (system.GetApplicationProcessProgramID() != header.application_id) { LOG_ERROR(Service_LDR, "Attempting to load NRR with title ID other than current process. (actual " "{:016X})!", @@ -542,15 +542,16 @@ public: } // Map memory for the NRO - const auto map_result{MapNro(system.CurrentProcess(), nro_address, nro_size, bss_address, - bss_size, nro_size + bss_size)}; + const auto map_result{MapNro(system.ApplicationProcess(), nro_address, nro_size, + bss_address, bss_size, nro_size + bss_size)}; if (map_result.Failed()) { IPC::ResponseBuilder rb{ctx, 2}; rb.Push(map_result.Code()); } // Load the NRO into the mapped memory - if (const auto result{LoadNro(system.CurrentProcess(), header, nro_address, *map_result)}; + if (const auto result{ + LoadNro(system.ApplicationProcess(), header, nro_address, *map_result)}; result.IsError()) { IPC::ResponseBuilder rb{ctx, 2}; rb.Push(map_result.Code()); @@ -570,7 +571,7 @@ public: Result UnmapNro(const NROInfo& info) { // Each region must be unmapped separately to validate memory state - auto& page_table{system.CurrentProcess()->PageTable()}; + auto& page_table{system.ApplicationProcess()->PageTable()}; if (info.bss_size != 0) { CASCADE_CODE(page_table.UnmapCodeMemory( @@ -641,7 +642,7 @@ public: LOG_WARNING(Service_LDR, "(STUBBED) called"); initialized = true; - current_map_addr = system.CurrentProcess()->PageTable().GetAliasCodeRegionStart(); + current_map_addr = system.ApplicationProcess()->PageTable().GetAliasCodeRegionStart(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfp/nfp_device.cpp index e67a76f55..7a6bbbba7 100644 --- a/src/core/hle/service/nfp/nfp_device.cpp +++ b/src/core/hle/service/nfp/nfp_device.cpp @@ -618,7 +618,7 @@ Result NfpDevice::RecreateApplicationArea(u32 access_id, std::span dat sizeof(ApplicationArea) - data.size()); // TODO: Investigate why the title id needs to be moddified - tag_data.title_id = system.GetCurrentProcessProgramID(); + tag_data.title_id = system.GetApplicationProcessProgramID(); tag_data.title_id = tag_data.title_id | 0x30000000ULL; tag_data.settings.settings.appdata_initialized.Assign(1); tag_data.application_area_id = access_id; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index 0cdde82a7..e12025560 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp @@ -150,9 +150,9 @@ NvResult nvhost_ctrl::IocCtrlEventWait(std::span input, std::vector 2) { { - auto lk = system.StallProcesses(); + auto lk = system.StallApplication(); host1x_syncpoint_manager.WaitHost(fence_id, target_value); - system.UnstallProcesses(); + system.UnstallApplication(); } params.value.raw = target_value; return true; diff --git a/src/core/hle/service/nvdrv/devices/nvmap.cpp b/src/core/hle/service/nvdrv/devices/nvmap.cpp index 29c1e0f01..277afe0b4 100644 --- a/src/core/hle/service/nvdrv/devices/nvmap.cpp +++ b/src/core/hle/service/nvdrv/devices/nvmap.cpp @@ -127,7 +127,7 @@ NvResult nvmap::IocAlloc(std::span input, std::vector& output) { return result; } bool is_out_io{}; - ASSERT(system.CurrentProcess() + ASSERT(system.ApplicationProcess() ->PageTable() .LockForMapDeviceAddressSpace(&is_out_io, handle_description->address, handle_description->size, @@ -254,7 +254,7 @@ NvResult nvmap::IocFree(std::span input, std::vector& output) { if (auto freeInfo{file.FreeHandle(params.handle, false)}) { if (freeInfo->can_unlock) { - ASSERT(system.CurrentProcess() + ASSERT(system.ApplicationProcess() ->PageTable() .UnlockForDeviceAddressSpace(freeInfo->address, freeInfo->size) .IsSuccess()); diff --git a/src/core/hle/service/pctl/pctl_module.cpp b/src/core/hle/service/pctl/pctl_module.cpp index 2a123b42d..083609b34 100644 --- a/src/core/hle/service/pctl/pctl_module.cpp +++ b/src/core/hle/service/pctl/pctl_module.cpp @@ -187,7 +187,7 @@ private: // TODO(ogniK): Recovery flag initialization for pctl:r - const auto tid = system.GetCurrentProcessProgramID(); + const auto tid = system.GetApplicationProcessProgramID(); if (tid != 0) { const FileSys::PatchManager pm{tid, system.GetFileSystemController(), system.GetContentProvider()}; diff --git a/src/core/hle/service/prepo/prepo.cpp b/src/core/hle/service/prepo/prepo.cpp index 01040b32a..90c5f8756 100644 --- a/src/core/hle/service/prepo/prepo.cpp +++ b/src/core/hle/service/prepo/prepo.cpp @@ -71,7 +71,7 @@ private: Type, process_id, data1.size(), data2.size()); const auto& reporter{system.GetReporter()}; - reporter.SavePlayReport(Type, system.GetCurrentProcessProgramID(), {data1, data2}, + reporter.SavePlayReport(Type, system.GetApplicationProcessProgramID(), {data1, data2}, process_id); IPC::ResponseBuilder rb{ctx, 2}; @@ -99,7 +99,7 @@ private: Type, user_id[1], user_id[0], process_id, data1.size(), data2.size()); const auto& reporter{system.GetReporter()}; - reporter.SavePlayReport(Type, system.GetCurrentProcessProgramID(), {data1, data2}, + reporter.SavePlayReport(Type, system.GetApplicationProcessProgramID(), {data1, data2}, process_id, user_id); IPC::ResponseBuilder rb{ctx, 2}; diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 4c3b3c655..a5c384fb5 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp @@ -145,7 +145,7 @@ std::optional AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core:: // Apply cheats if they exist and the program has a valid title ID if (pm) { - system.SetCurrentProcessBuildID(nso_header.build_id); + system.SetApplicationProcessBuildID(nso_header.build_id); const auto cheats = pm->CreateCheatList(nso_header.build_id); if (!cheats.empty()) { system.RegisterCheatList(cheats, nso_header.build_id, load_base, image_size); diff --git a/src/core/memory.cpp b/src/core/memory.cpp index af9660b55..4397fcfb1 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -247,11 +247,11 @@ struct Memory::Impl { } void ReadBlock(const VAddr src_addr, void* dest_buffer, const std::size_t size) { - ReadBlockImpl(*system.CurrentProcess(), src_addr, dest_buffer, size); + ReadBlockImpl(*system.ApplicationProcess(), src_addr, dest_buffer, size); } void ReadBlockUnsafe(const VAddr src_addr, void* dest_buffer, const std::size_t size) { - ReadBlockImpl(*system.CurrentProcess(), src_addr, dest_buffer, size); + ReadBlockImpl(*system.ApplicationProcess(), src_addr, dest_buffer, size); } template @@ -279,11 +279,11 @@ struct Memory::Impl { } void WriteBlock(const VAddr dest_addr, const void* src_buffer, const std::size_t size) { - WriteBlockImpl(*system.CurrentProcess(), dest_addr, src_buffer, size); + WriteBlockImpl(*system.ApplicationProcess(), dest_addr, src_buffer, size); } void WriteBlockUnsafe(const VAddr dest_addr, const void* src_buffer, const std::size_t size) { - WriteBlockImpl(*system.CurrentProcess(), dest_addr, src_buffer, size); + WriteBlockImpl(*system.ApplicationProcess(), dest_addr, src_buffer, size); } void ZeroBlock(const Kernel::KProcess& process, const VAddr dest_addr, const std::size_t size) { @@ -711,7 +711,7 @@ void Memory::UnmapRegion(Common::PageTable& page_table, VAddr base, u64 size) { } bool Memory::IsValidVirtualAddress(const VAddr vaddr) const { - const Kernel::KProcess& process = *system.CurrentProcess(); + const Kernel::KProcess& process = *system.ApplicationProcess(); const auto& page_table = process.PageTable().PageTableImpl(); const size_t page = vaddr >> YUZU_PAGEBITS; if (page >= page_table.pointers.size()) { diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp index ffdbacc18..44ee39648 100644 --- a/src/core/memory/cheat_engine.cpp +++ b/src/core/memory/cheat_engine.cpp @@ -191,10 +191,10 @@ void CheatEngine::Initialize() { }); core_timing.ScheduleLoopingEvent(CHEAT_ENGINE_NS, CHEAT_ENGINE_NS, event); - metadata.process_id = system.CurrentProcess()->GetProcessID(); - metadata.title_id = system.GetCurrentProcessProgramID(); + metadata.process_id = system.ApplicationProcess()->GetProcessID(); + metadata.title_id = system.GetApplicationProcessProgramID(); - const auto& page_table = system.CurrentProcess()->PageTable(); + const auto& page_table = system.ApplicationProcess()->PageTable(); metadata.heap_extents = { .base = page_table.GetHeapRegionStart(), .size = page_table.GetHeapRegionSize(), diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp index 59dfb8767..708ae17aa 100644 --- a/src/core/reporter.cpp +++ b/src/core/reporter.cpp @@ -110,7 +110,7 @@ json GetProcessorStateData(const std::string& architecture, u64 entry_point, u64 } json GetProcessorStateDataAuto(Core::System& system) { - const auto* process{system.CurrentProcess()}; + const auto* process{system.ApplicationProcess()}; auto& arm{system.CurrentArmInterface()}; Core::ARM_Interface::ThreadContext64 context{}; @@ -234,7 +234,7 @@ void Reporter::SaveSvcBreakReport(u32 type, bool signal_debugger, u64 info1, u64 } const auto timestamp = GetTimestamp(); - const auto title_id = system.GetCurrentProcessProgramID(); + const auto title_id = system.GetApplicationProcessProgramID(); auto out = GetFullDataAuto(timestamp, title_id, system); auto break_out = json{ @@ -261,7 +261,7 @@ void Reporter::SaveUnimplementedFunctionReport(Kernel::HLERequestContext& ctx, u } const auto timestamp = GetTimestamp(); - const auto title_id = system.GetCurrentProcessProgramID(); + const auto title_id = system.GetApplicationProcessProgramID(); auto out = GetFullDataAuto(timestamp, title_id, system); auto function_out = GetHLERequestContextData(ctx, system.Memory()); @@ -283,7 +283,7 @@ void Reporter::SaveUnimplementedAppletReport( } const auto timestamp = GetTimestamp(); - const auto title_id = system.GetCurrentProcessProgramID(); + const auto title_id = system.GetApplicationProcessProgramID(); auto out = GetFullDataAuto(timestamp, title_id, system); out["applet_common_args"] = { @@ -376,7 +376,7 @@ void Reporter::SaveUserReport() const { } const auto timestamp = GetTimestamp(); - const auto title_id = system.GetCurrentProcessProgramID(); + const auto title_id = system.GetApplicationProcessProgramID(); SaveToFile(GetFullDataAuto(timestamp, title_id, system), GetPath("user_report", title_id, timestamp)); diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index d65991734..352300e88 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -67,7 +67,7 @@ void EmuThread::run() { emit LoadProgress(VideoCore::LoadCallbackStage::Prepare, 0, 0); if (Settings::values.use_disk_shader_cache.GetValue()) { m_system.Renderer().ReadRasterizer()->LoadDiskResources( - m_system.GetCurrentProcessProgramID(), stop_token, + m_system.GetApplicationProcessProgramID(), stop_token, [this](VideoCore::LoadCallbackStage stage, std::size_t value, std::size_t total) { emit LoadProgress(stage, value, total); }); diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index c278d8dab..94ae441e5 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1779,7 +1779,7 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t std::filesystem::path{Common::U16StringFromBuffer(filename.utf16(), filename.size())} .filename()); } - const bool is_64bit = system->Kernel().CurrentProcess()->Is64BitProcess(); + const bool is_64bit = system->Kernel().ApplicationProcess()->Is64BitProcess(); const auto instruction_set_suffix = is_64bit ? tr("(64-bit)") : tr("(32-bit)"); title_name = tr("%1 %2", "%1 is the title name. %2 indicates if the title is 64-bit or 32-bit") .arg(QString::fromStdString(title_name), instruction_set_suffix) @@ -3532,7 +3532,7 @@ void GMainWindow::OnToggleGraphicsAPI() { } void GMainWindow::OnConfigurePerGame() { - const u64 title_id = system->GetCurrentProcessProgramID(); + const u64 title_id = system->GetApplicationProcessProgramID(); OpenPerGameConfiguration(title_id, current_game_path.toStdString()); } @@ -3691,7 +3691,7 @@ void GMainWindow::OnCaptureScreenshot() { return; } - const u64 title_id = system->GetCurrentProcessProgramID(); + const u64 title_id = system->GetApplicationProcessProgramID(); const auto screenshot_path = QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::ScreenshotsDir)); const auto date = diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index d1f7b1d49..77edd58ca 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -405,7 +405,7 @@ int main(int argc, char** argv) { if (Settings::values.use_disk_shader_cache.GetValue()) { system.Renderer().ReadRasterizer()->LoadDiskResources( - system.GetCurrentProcessProgramID(), std::stop_token{}, + system.GetApplicationProcessProgramID(), std::stop_token{}, [](VideoCore::LoadCallbackStage, size_t value, size_t total) {}); } From 45e13b03f372230dbf780f3fa87dd88f388af605 Mon Sep 17 00:00:00 2001 From: arades79 Date: Sat, 11 Feb 2023 13:28:03 -0500 Subject: [PATCH 0057/1181] add static lifetime to constexpr values to force compile time evaluation where possible Signed-off-by: arades79 --- .../renderer/adsp/audio_renderer.cpp | 4 +- .../renderer/command/data_source/decode.cpp | 8 +- .../renderer/command/effect/biquad_filter.cpp | 8 +- .../renderer/command/effect/i3dl2_reverb.cpp | 8 +- .../renderer/command/effect/light_limiter.cpp | 4 +- .../renderer/command/effect/reverb.cpp | 8 +- .../renderer/command/resample/upsample.cpp | 12 +-- .../renderer/command/sink/circular_buffer.cpp | 4 +- .../renderer/command/sink/device.cpp | 4 +- src/audio_core/renderer/system_manager.cpp | 2 +- src/audio_core/renderer/voice/voice_info.cpp | 4 +- src/audio_core/sink/sink_stream.cpp | 12 +-- src/common/fixed_point.h | 12 +-- src/common/hex_util.h | 2 +- src/common/tiny_mt.h | 8 +- src/core/core.cpp | 2 +- src/core/core_timing.cpp | 2 +- src/core/debugger/gdbstub_arch.cpp | 4 +- src/core/file_sys/ips_layer.cpp | 8 +- src/core/file_sys/program_metadata.cpp | 2 +- src/core/file_sys/registered_cache.cpp | 2 +- src/core/hid/emulated_devices.cpp | 2 +- .../board/nintendo/nx/k_system_control.cpp | 4 +- src/core/hle/kernel/init/init_slab_setup.cpp | 4 +- src/core/hle/kernel/k_capabilities.cpp | 6 +- src/core/hle/kernel/k_memory_manager.h | 6 +- src/core/hle/kernel/k_page_heap.cpp | 2 +- src/core/hle/kernel/k_page_table.cpp | 4 +- src/core/hle/kernel/kernel.cpp | 42 ++++---- src/core/hle/kernel/process_capability.cpp | 2 +- src/core/hle/kernel/svc/svc_activity.cpp | 2 +- src/core/hle/kernel/svc/svc_info.cpp | 2 +- src/core/hle/kernel/svc/svc_memory.cpp | 2 +- src/core/hle/service/acc/acc.cpp | 2 +- src/core/hle/service/am/am.cpp | 6 +- .../am/applets/applet_software_keyboard.cpp | 8 +- src/core/hle/service/apm/apm_controller.cpp | 2 +- src/core/hle/service/audio/audctl.cpp | 4 +- src/core/hle/service/audio/hwopus.cpp | 2 +- src/core/hle/service/caps/caps_u.cpp | 4 +- src/core/hle/service/filesystem/fsp_srv.cpp | 2 +- src/core/hle/service/hid/controllers/npad.cpp | 6 +- src/core/hle/service/mii/mii_manager.cpp | 2 +- src/core/hle/service/nfp/amiibo_crypto.cpp | 12 +-- src/core/hle/service/nifm/nifm.cpp | 2 +- .../service/nvdrv/core/syncpoint_manager.cpp | 4 +- .../nvflinger/buffer_queue_consumer.cpp | 2 +- src/core/hle/service/olsc/olsc.cpp | 2 +- src/core/hle/service/prepo/prepo.cpp | 4 +- src/core/hle/service/sockets/sfdnsres.cpp | 4 +- src/core/hle/service/ssl/ssl.cpp | 4 +- .../hle/service/time/time_zone_manager.cpp | 8 +- src/core/hle/service/vi/vi.cpp | 8 +- src/core/perf_stats.cpp | 2 +- src/core/telemetry_session.cpp | 4 +- src/input_common/drivers/gc_adapter.cpp | 8 +- src/input_common/drivers/joycon.cpp | 4 +- src/input_common/drivers/mouse.cpp | 2 +- src/input_common/drivers/sdl_driver.cpp | 8 +- src/input_common/drivers/udp_client.cpp | 2 +- src/input_common/helpers/joycon_driver.cpp | 4 +- .../helpers/joycon_protocol/calibration.cpp | 12 +-- .../joycon_protocol/common_protocol.cpp | 14 +-- .../helpers/joycon_protocol/irs.cpp | 6 +- .../helpers/joycon_protocol/nfc.cpp | 8 +- .../helpers/joycon_protocol/ringcon.cpp | 2 +- .../backend/glsl/emit_glsl_integer.cpp | 2 +- .../backend/spirv/emit_spirv_integer.cpp | 2 +- ...oating_point_conversion_floating_point.cpp | 2 +- .../floating_point_conversion_integer.cpp | 4 +- .../impl/integer_add_three_input.cpp | 2 +- src/tests/common/fibers.cpp | 2 +- .../calibration_configuration_job.cpp | 4 +- src/video_core/buffer_cache/buffer_cache.h | 8 +- src/video_core/dma_pusher.cpp | 2 +- src/video_core/engines/fermi_2d.cpp | 2 +- src/video_core/engines/maxwell_3d.cpp | 2 +- .../engines/sw_blitter/converter.cpp | 10 +- src/video_core/gpu.cpp | 4 +- src/video_core/host1x/codecs/vp9.cpp | 4 +- src/video_core/query_cache.h | 2 +- .../renderer_opengl/gl_compute_pipeline.cpp | 3 +- src/video_core/renderer_opengl/gl_device.cpp | 4 +- .../renderer_opengl/gl_graphics_pipeline.cpp | 3 +- .../renderer_opengl/renderer_opengl.cpp | 4 +- src/video_core/renderer_vulkan/blit_image.cpp | 5 +- .../renderer_vulkan/vk_blit_screen.cpp | 4 +- .../renderer_vulkan/vk_compute_pipeline.cpp | 3 +- .../renderer_vulkan/vk_graphics_pipeline.cpp | 3 +- .../renderer_vulkan/vk_rasterizer.cpp | 6 +- src/video_core/renderer_vulkan/vk_smaa.cpp | 37 +++---- .../vk_staging_buffer_pool.cpp | 2 +- .../renderer_vulkan/vk_swapchain.cpp | 2 +- .../renderer_vulkan/vk_turbo_mode.cpp | 4 +- src/video_core/surface.cpp | 2 +- src/video_core/textures/decoders.cpp | 2 +- .../vulkan_common/vulkan_wrapper.cpp | 4 +- src/yuzu/bootmanager.cpp | 2 +- .../configure_input_player_widget.cpp | 98 +++++++++---------- src/yuzu/game_list.cpp | 4 +- src/yuzu/main.cpp | 6 +- 101 files changed, 309 insertions(+), 303 deletions(-) diff --git a/src/audio_core/renderer/adsp/audio_renderer.cpp b/src/audio_core/renderer/adsp/audio_renderer.cpp index d982ef630..5bafd4c06 100644 --- a/src/audio_core/renderer/adsp/audio_renderer.cpp +++ b/src/audio_core/renderer/adsp/audio_renderer.cpp @@ -132,7 +132,7 @@ void AudioRenderer::CreateSinkStreams() { } void AudioRenderer::ThreadFunc() { - constexpr char name[]{"AudioRenderer"}; + constexpr static char name[]{"AudioRenderer"}; MicroProfileOnThreadCreate(name); Common::SetCurrentThreadName(name); Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical); @@ -144,7 +144,7 @@ void AudioRenderer::ThreadFunc() { mailbox->ADSPSendMessage(RenderMessage::AudioRenderer_InitializeOK); - constexpr u64 max_process_time{2'304'000ULL}; + constexpr static u64 max_process_time{2'304'000ULL}; while (true) { auto message{mailbox->ADSPWaitMessage()}; diff --git a/src/audio_core/renderer/command/data_source/decode.cpp b/src/audio_core/renderer/command/data_source/decode.cpp index ff5d31bd6..68a0aa15d 100644 --- a/src/audio_core/renderer/command/data_source/decode.cpp +++ b/src/audio_core/renderer/command/data_source/decode.cpp @@ -27,8 +27,8 @@ constexpr std::array PitchBySrcQuality = {4, 8, 4}; template static u32 DecodePcm(Core::Memory::Memory& memory, std::span out_buffer, const DecodeArg& req) { - constexpr s32 min{std::numeric_limits::min()}; - constexpr s32 max{std::numeric_limits::max()}; + constexpr static s32 min{std::numeric_limits::min()}; + constexpr static s32 max{std::numeric_limits::max()}; if (req.buffer == 0 || req.buffer_size == 0) { return 0; @@ -101,8 +101,8 @@ static u32 DecodePcm(Core::Memory::Memory& memory, std::span out_buffer, */ static u32 DecodeAdpcm(Core::Memory::Memory& memory, std::span out_buffer, const DecodeArg& req) { - constexpr u32 SamplesPerFrame{14}; - constexpr u32 NibblesPerFrame{16}; + constexpr static u32 SamplesPerFrame{14}; + constexpr static u32 NibblesPerFrame{16}; if (req.buffer == 0 || req.buffer_size == 0) { return 0; diff --git a/src/audio_core/renderer/command/effect/biquad_filter.cpp b/src/audio_core/renderer/command/effect/biquad_filter.cpp index dea6423dc..84fb6ae7a 100644 --- a/src/audio_core/renderer/command/effect/biquad_filter.cpp +++ b/src/audio_core/renderer/command/effect/biquad_filter.cpp @@ -20,8 +20,8 @@ namespace AudioCore::AudioRenderer { void ApplyBiquadFilterFloat(std::span output, std::span input, std::array& b_, std::array& a_, VoiceState::BiquadFilterState& state, const u32 sample_count) { - constexpr f64 min{std::numeric_limits::min()}; - constexpr f64 max{std::numeric_limits::max()}; + constexpr static f64 min{std::numeric_limits::min()}; + constexpr static f64 max{std::numeric_limits::max()}; std::array b{Common::FixedPoint<50, 14>::from_base(b_[0]).to_double(), Common::FixedPoint<50, 14>::from_base(b_[1]).to_double(), Common::FixedPoint<50, 14>::from_base(b_[2]).to_double()}; @@ -61,8 +61,8 @@ void ApplyBiquadFilterFloat(std::span output, std::span input, static void ApplyBiquadFilterInt(std::span output, std::span input, std::array& b, std::array& a, VoiceState::BiquadFilterState& state, const u32 sample_count) { - constexpr s64 min{std::numeric_limits::min()}; - constexpr s64 max{std::numeric_limits::max()}; + constexpr static s64 min{std::numeric_limits::min()}; + constexpr static s64 max{std::numeric_limits::max()}; for (u32 i = 0; i < sample_count; i++) { const s64 in_sample{input[i]}; diff --git a/src/audio_core/renderer/command/effect/i3dl2_reverb.cpp b/src/audio_core/renderer/command/effect/i3dl2_reverb.cpp index 2187d8a65..98217cd2d 100644 --- a/src/audio_core/renderer/command/effect/i3dl2_reverb.cpp +++ b/src/audio_core/renderer/command/effect/i3dl2_reverb.cpp @@ -244,16 +244,16 @@ template static void ApplyI3dl2ReverbEffect(I3dl2ReverbInfo::State& state, std::span> inputs, std::span> outputs, const u32 sample_count) { - constexpr std::array OutTapIndexes1Ch{ + constexpr static std::array OutTapIndexes1Ch{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - constexpr std::array OutTapIndexes2Ch{ + constexpr static std::array OutTapIndexes2Ch{ 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, }; - constexpr std::array OutTapIndexes4Ch{ + constexpr static std::array OutTapIndexes4Ch{ 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0, 3, 3, 3, }; - constexpr std::array OutTapIndexes6Ch{ + constexpr static std::array OutTapIndexes6Ch{ 2, 0, 0, 1, 1, 1, 1, 4, 4, 4, 1, 1, 1, 0, 0, 0, 0, 5, 5, 5, }; diff --git a/src/audio_core/renderer/command/effect/light_limiter.cpp b/src/audio_core/renderer/command/effect/light_limiter.cpp index e8fb0e2fc..410e5dac0 100644 --- a/src/audio_core/renderer/command/effect/light_limiter.cpp +++ b/src/audio_core/renderer/command/effect/light_limiter.cpp @@ -50,8 +50,8 @@ static void ApplyLightLimiterEffect(const LightLimiterInfo::ParameterVersion2& p std::vector>& inputs, std::vector>& outputs, const u32 sample_count, LightLimiterInfo::StatisticsInternal* statistics) { - constexpr s64 min{std::numeric_limits::min()}; - constexpr s64 max{std::numeric_limits::max()}; + constexpr static s64 min{std::numeric_limits::min()}; + constexpr static s64 max{std::numeric_limits::max()}; const auto recip_estimate = [](f64 a) -> f64 { s32 q, s; diff --git a/src/audio_core/renderer/command/effect/reverb.cpp b/src/audio_core/renderer/command/effect/reverb.cpp index 427489214..ffe108268 100644 --- a/src/audio_core/renderer/command/effect/reverb.cpp +++ b/src/audio_core/renderer/command/effect/reverb.cpp @@ -252,16 +252,16 @@ template static void ApplyReverbEffect(const ReverbInfo::ParameterVersion2& params, ReverbInfo::State& state, std::vector>& inputs, std::vector>& outputs, const u32 sample_count) { - constexpr std::array OutTapIndexes1Ch{ + constexpr static std::array OutTapIndexes1Ch{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - constexpr std::array OutTapIndexes2Ch{ + constexpr static std::array OutTapIndexes2Ch{ 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, }; - constexpr std::array OutTapIndexes4Ch{ + constexpr static std::array OutTapIndexes4Ch{ 0, 0, 1, 1, 0, 1, 2, 2, 3, 3, }; - constexpr std::array OutTapIndexes6Ch{ + constexpr static std::array OutTapIndexes6Ch{ 0, 0, 1, 1, 2, 2, 4, 4, 5, 5, }; diff --git a/src/audio_core/renderer/command/resample/upsample.cpp b/src/audio_core/renderer/command/resample/upsample.cpp index 5f7db12ca..4bd604754 100644 --- a/src/audio_core/renderer/command/resample/upsample.cpp +++ b/src/audio_core/renderer/command/resample/upsample.cpp @@ -19,24 +19,24 @@ namespace AudioCore::AudioRenderer { static void SrcProcessFrame(std::span output, std::span input, const u32 target_sample_count, const u32 source_sample_count, UpsamplerState* state) { - constexpr u32 WindowSize = 10; - constexpr std::array, WindowSize> WindowedSinc1{ + constexpr static u32 WindowSize = 10; + constexpr static std::array, WindowSize> WindowedSinc1{ 0.95376587f, -0.12872314f, 0.060028076f, -0.032470703f, 0.017669678f, -0.009124756f, 0.004272461f, -0.001739502f, 0.000579834f, -0.000091552734f, }; - constexpr std::array, WindowSize> WindowedSinc2{ + constexpr static std::array, WindowSize> WindowedSinc2{ 0.8230896f, -0.19161987f, 0.093444824f, -0.05090332f, 0.027557373f, -0.014038086f, 0.0064697266f, -0.002532959f, 0.00079345703f, -0.00012207031f, }; - constexpr std::array, WindowSize> WindowedSinc3{ + constexpr static std::array, WindowSize> WindowedSinc3{ 0.6298828f, -0.19274902f, 0.09725952f, -0.05319214f, 0.028625488f, -0.014373779f, 0.006500244f, -0.0024719238f, 0.0007324219f, -0.000091552734f, }; - constexpr std::array, WindowSize> WindowedSinc4{ + constexpr static std::array, WindowSize> WindowedSinc4{ 0.4057312f, -0.1468811f, 0.07601929f, -0.041656494f, 0.022216797f, -0.011016846f, 0.004852295f, -0.0017700195f, 0.00048828125f, -0.000030517578f, }; - constexpr std::array, WindowSize> WindowedSinc5{ + constexpr static std::array, WindowSize> WindowedSinc5{ 0.1854248f, -0.075164795f, 0.03967285f, -0.021728516f, 0.011474609f, -0.005584717f, 0.0024108887f, -0.0008239746f, 0.00021362305f, 0.0f, }; diff --git a/src/audio_core/renderer/command/sink/circular_buffer.cpp b/src/audio_core/renderer/command/sink/circular_buffer.cpp index ded5afc94..1989873db 100644 --- a/src/audio_core/renderer/command/sink/circular_buffer.cpp +++ b/src/audio_core/renderer/command/sink/circular_buffer.cpp @@ -21,8 +21,8 @@ void CircularBufferSinkCommand::Dump([[maybe_unused]] const ADSP::CommandListPro } void CircularBufferSinkCommand::Process(const ADSP::CommandListProcessor& processor) { - constexpr s32 min{std::numeric_limits::min()}; - constexpr s32 max{std::numeric_limits::max()}; + constexpr static s32 min{std::numeric_limits::min()}; + constexpr static s32 max{std::numeric_limits::max()}; std::vector output(processor.sample_count); for (u32 channel = 0; channel < input_count; channel++) { diff --git a/src/audio_core/renderer/command/sink/device.cpp b/src/audio_core/renderer/command/sink/device.cpp index e88372a75..2f2e82ae2 100644 --- a/src/audio_core/renderer/command/sink/device.cpp +++ b/src/audio_core/renderer/command/sink/device.cpp @@ -20,8 +20,8 @@ void DeviceSinkCommand::Dump([[maybe_unused]] const ADSP::CommandListProcessor& } void DeviceSinkCommand::Process(const ADSP::CommandListProcessor& processor) { - constexpr s32 min = std::numeric_limits::min(); - constexpr s32 max = std::numeric_limits::max(); + constexpr static s32 min = std::numeric_limits::min(); + constexpr static s32 max = std::numeric_limits::max(); auto stream{processor.GetOutputSinkStream()}; stream->SetSystemChannels(input_count); diff --git a/src/audio_core/renderer/system_manager.cpp b/src/audio_core/renderer/system_manager.cpp index f66b2b890..a8517014e 100644 --- a/src/audio_core/renderer/system_manager.cpp +++ b/src/audio_core/renderer/system_manager.cpp @@ -94,7 +94,7 @@ bool SystemManager::Remove(System& system_) { } void SystemManager::ThreadFunc() { - constexpr char name[]{"AudioRenderSystemManager"}; + constexpr static char name[]{"AudioRenderSystemManager"}; MicroProfileOnThreadCreate(name); Common::SetCurrentThreadName(name); Common::SetCurrentThreadPriority(Common::ThreadPriority::High); diff --git a/src/audio_core/renderer/voice/voice_info.cpp b/src/audio_core/renderer/voice/voice_info.cpp index 1849eeb57..2b3705647 100644 --- a/src/audio_core/renderer/voice/voice_info.cpp +++ b/src/audio_core/renderer/voice/voice_info.cpp @@ -177,7 +177,7 @@ void VoiceInfo::UpdateWaveBuffer(std::span error_info, switch (sample_format_) { case SampleFormat::PcmInt16: { - constexpr auto byte_size{GetSampleFormatByteSize(SampleFormat::PcmInt16)}; + constexpr static auto byte_size{GetSampleFormatByteSize(SampleFormat::PcmInt16)}; if (wave_buffer_internal.start_offset * byte_size > wave_buffer_internal.size || wave_buffer_internal.end_offset * byte_size > wave_buffer_internal.size) { LOG_ERROR(Service_Audio, "Invalid PCM16 start/end wavebuffer sizes!"); @@ -188,7 +188,7 @@ void VoiceInfo::UpdateWaveBuffer(std::span error_info, } break; case SampleFormat::PcmFloat: { - constexpr auto byte_size{GetSampleFormatByteSize(SampleFormat::PcmFloat)}; + constexpr static auto byte_size{GetSampleFormatByteSize(SampleFormat::PcmFloat)}; if (wave_buffer_internal.start_offset * byte_size > wave_buffer_internal.size || wave_buffer_internal.end_offset * byte_size > wave_buffer_internal.size) { LOG_ERROR(Service_Audio, "Invalid PCMFloat start/end wavebuffer sizes!"); diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index 06c2a876e..fa3cee3ea 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -24,8 +24,8 @@ void SinkStream::AppendBuffer(SinkBuffer& buffer, std::vector& samples) { return; } - constexpr s32 min{std::numeric_limits::min()}; - constexpr s32 max{std::numeric_limits::max()}; + constexpr static s32 min{std::numeric_limits::min()}; + constexpr static s32 max{std::numeric_limits::max()}; auto yuzu_volume{Settings::Volume()}; if (yuzu_volume > 1.0f) { @@ -35,7 +35,7 @@ void SinkStream::AppendBuffer(SinkBuffer& buffer, std::vector& samples) { if (system_channels == 6 && device_channels == 2) { // We're given 6 channels, but our device only outputs 2, so downmix. - constexpr std::array down_mix_coeff{1.0f, 0.707f, 0.251f, 0.707f}; + constexpr static std::array down_mix_coeff{1.0f, 0.707f, 0.251f, 0.707f}; for (u32 read_index = 0, write_index = 0; read_index < samples.size(); read_index += system_channels, write_index += device_channels) { @@ -106,8 +106,8 @@ void SinkStream::AppendBuffer(SinkBuffer& buffer, std::vector& samples) { } std::vector SinkStream::ReleaseBuffer(u64 num_samples) { - constexpr s32 min = std::numeric_limits::min(); - constexpr s32 max = std::numeric_limits::max(); + constexpr static s32 min = std::numeric_limits::min(); + constexpr static s32 max = std::numeric_limits::max(); auto samples{samples_buffer.Pop(num_samples)}; @@ -202,7 +202,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz // If we're paused or going to shut down, we don't want to consume buffers as coretiming is // paused and we'll desync, so just play silence. if (system.IsPaused() || system.IsShuttingDown()) { - constexpr std::array silence{}; + constexpr static std::array silence{}; for (size_t i = frames_written; i < num_frames; i++) { std::memcpy(&output_buffer[i * frame_size], &silence[0], frame_size_bytes); } diff --git a/src/common/fixed_point.h b/src/common/fixed_point.h index f899b0d54..29b80c328 100644 --- a/src/common/fixed_point.h +++ b/src/common/fixed_point.h @@ -107,7 +107,7 @@ constexpr FixedPoint divide( using next_type = typename FixedPoint::next_type; using base_type = typename FixedPoint::base_type; - constexpr size_t fractional_bits = FixedPoint::fractional_bits; + constexpr static size_t fractional_bits = FixedPoint::fractional_bits; next_type t(numerator.to_raw()); t <<= fractional_bits; @@ -127,7 +127,7 @@ constexpr FixedPoint divide( using unsigned_type = typename FixedPoint::unsigned_type; - constexpr int bits = FixedPoint::total_bits; + constexpr static int bits = FixedPoint::total_bits; if (denominator == 0) { throw divide_by_zero(); @@ -198,7 +198,7 @@ constexpr FixedPoint multiply( using next_type = typename FixedPoint::next_type; using base_type = typename FixedPoint::base_type; - constexpr size_t fractional_bits = FixedPoint::fractional_bits; + constexpr static size_t fractional_bits = FixedPoint::fractional_bits; next_type t(static_cast(lhs.to_raw()) * static_cast(rhs.to_raw())); t >>= fractional_bits; @@ -216,9 +216,9 @@ constexpr FixedPoint multiply( using base_type = typename FixedPoint::base_type; - constexpr size_t fractional_bits = FixedPoint::fractional_bits; - constexpr base_type integer_mask = FixedPoint::integer_mask; - constexpr base_type fractional_mask = FixedPoint::fractional_mask; + constexpr static size_t fractional_bits = FixedPoint::fractional_bits; + constexpr static base_type integer_mask = FixedPoint::integer_mask; + constexpr static base_type fractional_mask = FixedPoint::fractional_mask; // more costly but doesn't need a larger type const base_type a_hi = (lhs.to_raw() & integer_mask) >> fractional_bits; diff --git a/src/common/hex_util.h b/src/common/hex_util.h index a00904939..6b024588b 100644 --- a/src/common/hex_util.h +++ b/src/common/hex_util.h @@ -47,7 +47,7 @@ template static_assert(std::is_same_v, "Underlying type within the contiguous container must be u8."); - constexpr std::size_t pad_width = 2; + constexpr static std::size_t pad_width = 2; std::string out; out.reserve(std::size(data) * pad_width); diff --git a/src/common/tiny_mt.h b/src/common/tiny_mt.h index 5d5ebf158..4689fd55b 100644 --- a/src/common/tiny_mt.h +++ b/src/common/tiny_mt.h @@ -223,7 +223,7 @@ public: float GenerateRandomF32() { // Floats have 24 bits of mantissa. - constexpr u32 MantissaBits = 24; + constexpr static u32 MantissaBits = 24; return static_cast(GenerateRandomU24()) * (1.0f / (1U << MantissaBits)); } @@ -234,9 +234,9 @@ public: // Nintendo does not. They use (32 - 5) = 27 bits from the first rnd32() // call, and (32 - 6) bits from the second. We'll do what they do, but // There's not a clear reason why. - constexpr u32 MantissaBits = 53; - constexpr u32 Shift1st = (64 - MantissaBits) / 2; - constexpr u32 Shift2nd = (64 - MantissaBits) - Shift1st; + constexpr static u32 MantissaBits = 53; + constexpr static u32 Shift1st = (64 - MantissaBits) / 2; + constexpr static u32 Shift2nd = (64 - MantissaBits) - Shift1st; const u32 first = (this->GenerateRandomU32() >> Shift1st); const u32 second = (this->GenerateRandomU32() >> Shift2nd); diff --git a/src/core/core.cpp b/src/core/core.cpp index 47292cd78..7ba13ab51 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -361,7 +361,7 @@ struct System::Impl { // Log last frame performance stats if game was loded if (perf_stats) { const auto perf_results = GetAndResetPerfStats(); - constexpr auto performance = Common::Telemetry::FieldType::Performance; + constexpr static auto performance = Common::Telemetry::FieldType::Performance; telemetry_session->AddField(performance, "Shutdown_EmulationSpeed", perf_results.emulation_speed * 100.0); diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 6bac6722f..5214e88b8 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -45,7 +45,7 @@ CoreTiming::~CoreTiming() { } void CoreTiming::ThreadEntry(CoreTiming& instance) { - constexpr char name[] = "HostTiming"; + constexpr static char name[] = "HostTiming"; MicroProfileOnThreadCreate(name); Common::SetCurrentThreadName(name); Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical); diff --git a/src/core/debugger/gdbstub_arch.cpp b/src/core/debugger/gdbstub_arch.cpp index 4bef09bd7..b13c473bb 100644 --- a/src/core/debugger/gdbstub_arch.cpp +++ b/src/core/debugger/gdbstub_arch.cpp @@ -42,7 +42,7 @@ static void PutSIMDRegister(std::array& simd_regs, size_t offset, const // For sample XML files see the GDB source /gdb/features // This XML defines what the registers are for this specific ARM device std::string GDBStubA64::GetTargetXML() const { - constexpr const char* target_xml = + constexpr static const char* target_xml = R"( @@ -271,7 +271,7 @@ u32 GDBStubA64::BreakpointInstruction() const { } std::string GDBStubA32::GetTargetXML() const { - constexpr const char* target_xml = + constexpr static const char* target_xml = R"( diff --git a/src/core/file_sys/ips_layer.cpp b/src/core/file_sys/ips_layer.cpp index 5aab428bb..0a86e8b0a 100644 --- a/src/core/file_sys/ips_layer.cpp +++ b/src/core/file_sys/ips_layer.cpp @@ -41,12 +41,12 @@ static IPSFileType IdentifyMagic(const std::vector& magic) { return IPSFileType::Error; } - constexpr std::array patch_magic{{'P', 'A', 'T', 'C', 'H'}}; + constexpr static std::array patch_magic{{'P', 'A', 'T', 'C', 'H'}}; if (std::equal(magic.begin(), magic.end(), patch_magic.begin())) { return IPSFileType::IPS; } - constexpr std::array ips32_magic{{'I', 'P', 'S', '3', '2'}}; + constexpr static std::array ips32_magic{{'I', 'P', 'S', '3', '2'}}; if (std::equal(magic.begin(), magic.end(), ips32_magic.begin())) { return IPSFileType::IPS32; } @@ -55,12 +55,12 @@ static IPSFileType IdentifyMagic(const std::vector& magic) { } static bool IsEOF(IPSFileType type, const std::vector& data) { - constexpr std::array eof{{'E', 'O', 'F'}}; + constexpr static std::array eof{{'E', 'O', 'F'}}; if (type == IPSFileType::IPS && std::equal(data.begin(), data.end(), eof.begin())) { return true; } - constexpr std::array eeof{{'E', 'E', 'O', 'F'}}; + constexpr static std::array eeof{{'E', 'E', 'O', 'F'}}; return type == IPSFileType::IPS32 && std::equal(data.begin(), data.end(), eeof.begin()); } diff --git a/src/core/file_sys/program_metadata.cpp b/src/core/file_sys/program_metadata.cpp index f00479bd3..cb172f574 100644 --- a/src/core/file_sys/program_metadata.cpp +++ b/src/core/file_sys/program_metadata.cpp @@ -97,7 +97,7 @@ Loader::ResultStatus ProgramMetadata::Load(VirtualFile file) { /*static*/ ProgramMetadata ProgramMetadata::GetDefault() { // Allow use of cores 0~3 and thread priorities 1~63. - constexpr u32 default_thread_info_capability = 0x30007F7; + constexpr static u32 default_thread_info_capability = 0x30007F7; ProgramMetadata result; diff --git a/src/core/file_sys/registered_cache.cpp b/src/core/file_sys/registered_cache.cpp index 878d832c2..0f1f76949 100644 --- a/src/core/file_sys/registered_cache.cpp +++ b/src/core/file_sys/registered_cache.cpp @@ -71,7 +71,7 @@ static std::string GetRelativePathFromNcaID(const std::array& nca_id, bo } static std::string GetCNMTName(TitleType type, u64 title_id) { - constexpr std::array TITLE_TYPE_NAMES{ + constexpr static std::array TITLE_TYPE_NAMES{ "SystemProgram", "SystemData", "SystemUpdate", diff --git a/src/core/hid/emulated_devices.cpp b/src/core/hid/emulated_devices.cpp index 836f32c0f..e380da3a4 100644 --- a/src/core/hid/emulated_devices.cpp +++ b/src/core/hid/emulated_devices.cpp @@ -213,7 +213,7 @@ void EmulatedDevices::SetKeyboardButton(const Common::Input::CallbackStatus& cal } void EmulatedDevices::UpdateKey(std::size_t key_index, bool status) { - constexpr std::size_t KEYS_PER_BYTE = 8; + constexpr static std::size_t KEYS_PER_BYTE = 8; auto& entry = device_status.keyboard_state.key[key_index / KEYS_PER_BYTE]; const u8 mask = static_cast(1 << (key_index % KEYS_PER_BYTE)); if (status) { diff --git a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp index c10b7bf30..49098d2c9 100644 --- a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp +++ b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp @@ -114,13 +114,13 @@ size_t KSystemControl::Init::GetAppletPoolSize() { }(); // Return (possibly) adjusted size. - constexpr size_t ExtraSystemMemoryForAtmosphere = 33_MiB; + constexpr static size_t ExtraSystemMemoryForAtmosphere = 33_MiB; return base_pool_size - ExtraSystemMemoryForAtmosphere - KTraceBufferSize; } size_t KSystemControl::Init::GetMinimumNonSecureSystemPoolSize() { // Verify that our minimum is at least as large as Nintendo's. - constexpr size_t MinimumSize = RequiredNonSecureSystemMemorySize; + constexpr static size_t MinimumSize = RequiredNonSecureSystemMemorySize; static_assert(MinimumSize >= 0x29C8000); return MinimumSize; diff --git a/src/core/hle/kernel/init/init_slab_setup.cpp b/src/core/hle/kernel/init/init_slab_setup.cpp index 571acf4b2..951326a85 100644 --- a/src/core/hle/kernel/init/init_slab_setup.cpp +++ b/src/core/hle/kernel/init/init_slab_setup.cpp @@ -129,7 +129,7 @@ VAddr InitializeSlabHeap(Core::System& system, KMemoryLayout& memory_layout, VAd } size_t CalculateSlabHeapGapSize() { - constexpr size_t KernelSlabHeapGapSize = 2_MiB - 320_KiB; + constexpr static size_t KernelSlabHeapGapSize = 2_MiB - 320_KiB; static_assert(KernelSlabHeapGapSize <= KernelSlabHeapGapsSizeMax); return KernelSlabHeapGapSize; } @@ -272,7 +272,7 @@ void KPageBufferSlabHeap::Initialize(Core::System& system) { kernel.GetSystemResourceLimit()->Reserve(LimitableResource::PhysicalMemoryMax, slab_size)); // Allocate memory for the slab. - constexpr auto AllocateOption = KMemoryManager::EncodeOption( + constexpr static auto AllocateOption = KMemoryManager::EncodeOption( KMemoryManager::Pool::System, KMemoryManager::Direction::FromFront); const PAddr slab_address = kernel.MemoryManager().AllocateAndOpenContinuous(num_pages, 1, AllocateOption); diff --git a/src/core/hle/kernel/k_capabilities.cpp b/src/core/hle/kernel/k_capabilities.cpp index 2907cc6e3..374bc2c06 100644 --- a/src/core/hle/kernel/k_capabilities.cpp +++ b/src/core/hle/kernel/k_capabilities.cpp @@ -21,8 +21,8 @@ Result KCapabilities::InitializeForKIP(std::span kern_caps, KPageTabl m_program_type = 0; // Initial processes may run on all cores. - constexpr u64 VirtMask = Core::Hardware::VirtualCoreMask; - constexpr u64 PhysMask = Core::Hardware::ConvertVirtualCoreMaskToPhysical(VirtMask); + constexpr static u64 VirtMask = Core::Hardware::VirtualCoreMask; + constexpr static u64 PhysMask = Core::Hardware::ConvertVirtualCoreMaskToPhysical(VirtMask); m_core_mask = VirtMask; m_phys_core_mask = PhysMask; @@ -170,7 +170,7 @@ Result KCapabilities::MapIoPage_(const u32 cap, KPageTable* page_table) { template Result KCapabilities::ProcessMapRegionCapability(const u32 cap, F f) { // Define the allowed memory regions. - constexpr std::array MemoryRegions{ + constexpr static std::array MemoryRegions{ KMemoryRegionType_None, KMemoryRegionType_KernelTraceBuffer, KMemoryRegionType_OnMemoryBootImage, diff --git a/src/core/hle/kernel/k_memory_manager.h b/src/core/hle/kernel/k_memory_manager.h index 401d4e644..d13549b5e 100644 --- a/src/core/hle/kernel/k_memory_manager.h +++ b/src/core/hle/kernel/k_memory_manager.h @@ -121,7 +121,7 @@ public: } size_t GetSize(Pool pool) { - constexpr Direction GetSizeDirection = Direction::FromFront; + constexpr static Direction GetSizeDirection = Direction::FromFront; size_t total = 0; for (auto* manager = this->GetFirstManager(pool, GetSizeDirection); manager != nullptr; manager = this->GetNextManager(manager, GetSizeDirection)) { @@ -142,7 +142,7 @@ public: size_t GetFreeSize(Pool pool) { KScopedLightLock lk(m_pool_locks[static_cast(pool)]); - constexpr Direction GetSizeDirection = Direction::FromFront; + constexpr static Direction GetSizeDirection = Direction::FromFront; size_t total = 0; for (auto* manager = this->GetFirstManager(pool, GetSizeDirection); manager != nullptr; manager = this->GetNextManager(manager, GetSizeDirection)) { @@ -154,7 +154,7 @@ public: void DumpFreeList(Pool pool) { KScopedLightLock lk(m_pool_locks[static_cast(pool)]); - constexpr Direction DumpDirection = Direction::FromFront; + constexpr static Direction DumpDirection = Direction::FromFront; for (auto* manager = this->GetFirstManager(pool, DumpDirection); manager != nullptr; manager = this->GetNextManager(manager, DumpDirection)) { manager->DumpFreeList(); diff --git a/src/core/hle/kernel/k_page_heap.cpp b/src/core/hle/kernel/k_page_heap.cpp index 7b02c7d8b..ffebf0a35 100644 --- a/src/core/hle/kernel/k_page_heap.cpp +++ b/src/core/hle/kernel/k_page_heap.cpp @@ -68,7 +68,7 @@ PAddr KPageHeap::AllocateByRandom(s32 index, size_t num_pages, size_t align_page const size_t align_shift = std::countr_zero(align_size); // Decide on a block to allocate from. - constexpr size_t MinimumPossibleAlignmentsForRandomAllocation = 4; + constexpr static size_t MinimumPossibleAlignmentsForRandomAllocation = 4; { // By default, we'll want to look at all blocks larger than our current one. s32 max_blocks = static_cast(m_num_blocks); diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp index 2e13d5d0d..d3e0334ed 100644 --- a/src/core/hle/kernel/k_page_table.cpp +++ b/src/core/hle/kernel/k_page_table.cpp @@ -134,7 +134,7 @@ Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type } // Set code regions and determine remaining - constexpr size_t RegionAlignment{2_MiB}; + constexpr static size_t RegionAlignment{2_MiB}; VAddr process_code_start{}; VAddr process_code_end{}; size_t stack_region_size{}; @@ -2624,7 +2624,7 @@ Result KPageTable::SetMemoryAttribute(VAddr addr, size_t size, u32 mask, u32 att KMemoryPermission old_perm; KMemoryAttribute old_attr; size_t num_allocator_blocks; - constexpr auto AttributeTestMask = + constexpr static auto AttributeTestMask = ~(KMemoryAttribute::SetMask | KMemoryAttribute::DeviceShared); R_TRY(this->CheckMemoryState( std::addressof(old_state), std::addressof(old_perm), std::addressof(old_attr), diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 5b72eaaa1..563e2681b 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -254,7 +254,7 @@ struct KernelCore::Impl { system_resource_limit->Reserve(LimitableResource::PhysicalMemoryMax, kernel_size); // Reserve secure applet memory, introduced in firmware 5.0.0 - constexpr u64 secure_applet_memory_size{4_MiB}; + constexpr static u64 secure_applet_memory_size{4_MiB}; ASSERT(system_resource_limit->Reserve(LimitableResource::PhysicalMemoryMax, secure_applet_memory_size)); } @@ -477,9 +477,9 @@ struct KernelCore::Impl { const VAddr code_end_virt_addr = KernelVirtualAddressCodeEnd; // Setup the containing kernel region. - constexpr size_t KernelRegionSize = 1_GiB; - constexpr size_t KernelRegionAlign = 1_GiB; - constexpr VAddr kernel_region_start = + constexpr static size_t KernelRegionSize = 1_GiB; + constexpr static size_t KernelRegionAlign = 1_GiB; + constexpr static VAddr kernel_region_start = Common::AlignDown(code_start_virt_addr, KernelRegionAlign); size_t kernel_region_size = KernelRegionSize; if (!(kernel_region_start + KernelRegionSize - 1 <= KernelVirtualAddressSpaceLast)) { @@ -489,11 +489,11 @@ struct KernelCore::Impl { kernel_region_start, kernel_region_size, KMemoryRegionType_Kernel)); // Setup the code region. - constexpr size_t CodeRegionAlign = PageSize; - constexpr VAddr code_region_start = + constexpr static size_t CodeRegionAlign = PageSize; + constexpr static VAddr code_region_start = Common::AlignDown(code_start_virt_addr, CodeRegionAlign); - constexpr VAddr code_region_end = Common::AlignUp(code_end_virt_addr, CodeRegionAlign); - constexpr size_t code_region_size = code_region_end - code_region_start; + constexpr static VAddr code_region_end = Common::AlignUp(code_end_virt_addr, CodeRegionAlign); + constexpr static size_t code_region_size = code_region_end - code_region_start; ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert( code_region_start, code_region_size, KMemoryRegionType_KernelCode)); @@ -524,8 +524,8 @@ struct KernelCore::Impl { } // Decide on the actual size for the misc region. - constexpr size_t MiscRegionAlign = KernelAslrAlignment; - constexpr size_t MiscRegionMinimumSize = 32_MiB; + constexpr static size_t MiscRegionAlign = KernelAslrAlignment; + constexpr static size_t MiscRegionMinimumSize = 32_MiB; const size_t misc_region_size = Common::AlignUp( std::max(misc_region_needed_size, MiscRegionMinimumSize), MiscRegionAlign); ASSERT(misc_region_size > 0); @@ -541,8 +541,8 @@ struct KernelCore::Impl { const bool use_extra_resources = KSystemControl::Init::ShouldIncreaseThreadResourceLimit(); // Setup the stack region. - constexpr size_t StackRegionSize = 14_MiB; - constexpr size_t StackRegionAlign = KernelAslrAlignment; + constexpr static size_t StackRegionSize = 14_MiB; + constexpr static size_t StackRegionAlign = KernelAslrAlignment; const VAddr stack_region_start = memory_layout->GetVirtualMemoryRegionTree().GetRandomAlignedRegion( StackRegionSize, StackRegionAlign, KMemoryRegionType_Kernel); @@ -563,7 +563,7 @@ struct KernelCore::Impl { const PAddr code_end_phys_addr = code_start_phys_addr + code_region_size; const PAddr slab_start_phys_addr = code_end_phys_addr; const PAddr slab_end_phys_addr = slab_start_phys_addr + slab_region_size; - constexpr size_t SlabRegionAlign = KernelAslrAlignment; + constexpr static size_t SlabRegionAlign = KernelAslrAlignment; const size_t slab_region_needed_size = Common::AlignUp(code_end_phys_addr + slab_region_size, SlabRegionAlign) - Common::AlignDown(code_end_phys_addr, SlabRegionAlign); @@ -575,8 +575,8 @@ struct KernelCore::Impl { slab_region_start, slab_region_size, KMemoryRegionType_KernelSlab)); // Setup the temp region. - constexpr size_t TempRegionSize = 128_MiB; - constexpr size_t TempRegionAlign = KernelAslrAlignment; + constexpr static size_t TempRegionSize = 128_MiB; + constexpr static size_t TempRegionAlign = KernelAslrAlignment; const VAddr temp_region_start = memory_layout->GetVirtualMemoryRegionTree().GetRandomAlignedRegion( TempRegionSize, TempRegionAlign, KMemoryRegionType_Kernel); @@ -656,7 +656,7 @@ struct KernelCore::Impl { ASSERT(linear_extents.GetEndAddress() != 0); // Setup the linear mapping region. - constexpr size_t LinearRegionAlign = 1_GiB; + constexpr static size_t LinearRegionAlign = 1_GiB; const PAddr aligned_linear_phys_start = Common::AlignDown(linear_extents.GetAddress(), LinearRegionAlign); const size_t linear_region_size = @@ -737,11 +737,11 @@ struct KernelCore::Impl { void InitializeHackSharedMemory() { // Setup memory regions for emulated processes // TODO(bunnei): These should not be hardcoded regions initialized within the kernel - constexpr std::size_t hid_size{0x40000}; - constexpr std::size_t font_size{0x1100000}; - constexpr std::size_t irs_size{0x8000}; - constexpr std::size_t time_size{0x1000}; - constexpr std::size_t hidbus_size{0x1000}; + constexpr static std::size_t hid_size{0x40000}; + constexpr static std::size_t font_size{0x1100000}; + constexpr static std::size_t irs_size{0x8000}; + constexpr static std::size_t time_size{0x1000}; + constexpr static std::size_t hidbus_size{0x1000}; hid_shared_mem = KSharedMemory::Create(system.Kernel()); font_shared_mem = KSharedMemory::Create(system.Kernel()); diff --git a/src/core/hle/kernel/process_capability.cpp b/src/core/hle/kernel/process_capability.cpp index 773319ad8..de322cbf9 100644 --- a/src/core/hle/kernel/process_capability.cpp +++ b/src/core/hle/kernel/process_capability.cpp @@ -306,7 +306,7 @@ Result ProcessCapabilities::HandleMapRegionFlags(u32 flags, KPageTable& page_tab } Result ProcessCapabilities::HandleInterruptFlags(u32 flags) { - constexpr u32 interrupt_ignore_value = 0x3FF; + constexpr static u32 interrupt_ignore_value = 0x3FF; const u32 interrupt0 = (flags >> 12) & 0x3FF; const u32 interrupt1 = (flags >> 22) & 0x3FF; diff --git a/src/core/hle/kernel/svc/svc_activity.cpp b/src/core/hle/kernel/svc/svc_activity.cpp index 1dcdb7a15..0fd1b3d4c 100644 --- a/src/core/hle/kernel/svc/svc_activity.cpp +++ b/src/core/hle/kernel/svc/svc_activity.cpp @@ -16,7 +16,7 @@ Result SetThreadActivity(Core::System& system, Handle thread_handle, thread_activity); // Validate the activity. - constexpr auto IsValidThreadActivity = [](ThreadActivity activity) { + constexpr static auto IsValidThreadActivity = [](ThreadActivity activity) { return activity == ThreadActivity::Runnable || activity == ThreadActivity::Paused; }; R_UNLESS(IsValidThreadActivity(thread_activity), ResultInvalidEnumValue); diff --git a/src/core/hle/kernel/svc/svc_info.cpp b/src/core/hle/kernel/svc/svc_info.cpp index ad56e2fe6..c30ba0295 100644 --- a/src/core/hle/kernel/svc/svc_info.cpp +++ b/src/core/hle/kernel/svc/svc_info.cpp @@ -193,7 +193,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle return ResultSuccess; case InfoType::ThreadTickCount: { - constexpr u64 num_cpus = 4; + constexpr static u64 num_cpus = 4; if (info_sub_id != 0xFFFFFFFFFFFFFFFF && info_sub_id >= num_cpus) { LOG_ERROR(Kernel_SVC, "Core count is out of range, expected {} but got {}", num_cpus, info_sub_id); diff --git a/src/core/hle/kernel/svc/svc_memory.cpp b/src/core/hle/kernel/svc/svc_memory.cpp index 21f818da6..7045c5e69 100644 --- a/src/core/hle/kernel/svc/svc_memory.cpp +++ b/src/core/hle/kernel/svc/svc_memory.cpp @@ -132,7 +132,7 @@ Result SetMemoryAttribute(Core::System& system, VAddr address, u64 size, u32 mas R_UNLESS((address < address + size), ResultInvalidCurrentMemory); // Validate the attribute and mask. - constexpr u32 SupportedMask = static_cast(MemoryAttribute::Uncached); + constexpr static u32 SupportedMask = static_cast(MemoryAttribute::Uncached); R_UNLESS((mask | attr) == mask, ResultInvalidCombination); R_UNLESS((mask | attr | SupportedMask) == SupportedMask, ResultInvalidCombination); diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index 6d1084fd1..5b87bb18c 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -871,7 +871,7 @@ void Module::Interface::StoreSaveDataThumbnailApplication(Kernel::HLERequestCont // TODO(ogniK): Check if application ID is zero on acc initialize. As we don't have a reliable // way of confirming things like the TID, we're going to assume a non zero value for the time // being. - constexpr u64 tid{1}; + constexpr static u64 tid{1}; StoreSaveDataThumbnail(ctx, uuid, tid); } diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index ebcf6e164..01f03effe 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -1086,7 +1086,7 @@ private: // We require a non-zero handle to be valid. Using 0xdeadbeef allows us to trace if this is // actually used anywhere - constexpr u64 handle = 0xdeadbeef; + constexpr static u64 handle = 0xdeadbeef; IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); @@ -1570,7 +1570,7 @@ void IApplicationFunctions::GetDisplayVersion(Kernel::HLERequestContext& ctx) { const auto& version = res.first->GetVersionString(); std::copy(version.begin(), version.end(), version_string.begin()); } else { - constexpr char default_version[]{"1.0.0"}; + constexpr static char default_version[]{"1.0.0"}; std::memcpy(version_string.data(), default_version, sizeof(default_version)); } @@ -1638,7 +1638,7 @@ void IApplicationFunctions::GetDesiredLanguage(Kernel::HLERequestContext& ctx) { void IApplicationFunctions::IsGamePlayRecordingSupported(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); - constexpr bool gameplay_recording_supported = false; + constexpr static bool gameplay_recording_supported = false; IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/am/applets/applet_software_keyboard.cpp b/src/core/hle/service/am/applets/applet_software_keyboard.cpp index c18236045..962371a99 100644 --- a/src/core/hle/service/am/applets/applet_software_keyboard.cpp +++ b/src/core/hle/service/am/applets/applet_software_keyboard.cpp @@ -1180,7 +1180,7 @@ void SoftwareKeyboard::ReplyChangedStringV2() { .cursor_position{current_cursor_position}, }; - constexpr u8 flag = 0; + constexpr static u8 flag = 0; std::memcpy(reply.data() + REPLY_BASE_SIZE, current_text.data(), current_text.size() * sizeof(char16_t)); @@ -1204,7 +1204,7 @@ void SoftwareKeyboard::ReplyMovedCursorV2() { .cursor_position{current_cursor_position}, }; - constexpr u8 flag = 0; + constexpr static u8 flag = 0; std::memcpy(reply.data() + REPLY_BASE_SIZE, current_text.data(), current_text.size() * sizeof(char16_t)); @@ -1232,7 +1232,7 @@ void SoftwareKeyboard::ReplyChangedStringUtf8V2() { .cursor_position{current_cursor_position}, }; - constexpr u8 flag = 0; + constexpr static u8 flag = 0; std::memcpy(reply.data() + REPLY_BASE_SIZE, utf8_current_text.data(), utf8_current_text.size()); std::memcpy(reply.data() + REPLY_BASE_SIZE + REPLY_UTF8_SIZE, &changed_string_arg, @@ -1257,7 +1257,7 @@ void SoftwareKeyboard::ReplyMovedCursorUtf8V2() { .cursor_position{current_cursor_position}, }; - constexpr u8 flag = 0; + constexpr static u8 flag = 0; std::memcpy(reply.data() + REPLY_BASE_SIZE, utf8_current_text.data(), utf8_current_text.size()); std::memcpy(reply.data() + REPLY_BASE_SIZE + REPLY_UTF8_SIZE, &moved_cursor_arg, diff --git a/src/core/hle/service/apm/apm_controller.cpp b/src/core/hle/service/apm/apm_controller.cpp index d6de84066..7236f586d 100644 --- a/src/core/hle/service/apm/apm_controller.cpp +++ b/src/core/hle/service/apm/apm_controller.cpp @@ -56,7 +56,7 @@ void Controller::SetPerformanceConfiguration(PerformanceMode mode, } void Controller::SetFromCpuBoostMode(CpuBoostMode mode) { - constexpr std::array BOOST_MODE_TO_CONFIG_MAP{{ + constexpr static std::array BOOST_MODE_TO_CONFIG_MAP{{ PerformanceConfiguration::Config7, PerformanceConfiguration::Config13, PerformanceConfiguration::Config15, diff --git a/src/core/hle/service/audio/audctl.cpp b/src/core/hle/service/audio/audctl.cpp index 5abf22ba4..654d2c493 100644 --- a/src/core/hle/service/audio/audctl.cpp +++ b/src/core/hle/service/audio/audctl.cpp @@ -77,7 +77,7 @@ void AudCtl::GetTargetVolumeMin(Kernel::HLERequestContext& ctx) { // This service function is currently hardcoded on the // actual console to this value (as of 8.0.0). - constexpr s32 target_min_volume = 0; + constexpr static s32 target_min_volume = 0; IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); @@ -89,7 +89,7 @@ void AudCtl::GetTargetVolumeMax(Kernel::HLERequestContext& ctx) { // This service function is currently hardcoded on the // actual console to this value (as of 8.0.0). - constexpr s32 target_max_volume = 15; + constexpr static s32 target_max_volume = 15; IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/audio/hwopus.cpp b/src/core/hle/service/audio/hwopus.cpp index e01f87356..fe975157c 100644 --- a/src/core/hle/service/audio/hwopus.cpp +++ b/src/core/hle/service/audio/hwopus.cpp @@ -209,7 +209,7 @@ private: std::size_t WorkerBufferSize(u32 channel_count) { ASSERT_MSG(channel_count == 1 || channel_count == 2, "Invalid channel count"); - constexpr int num_streams = 1; + constexpr static int num_streams = 1; const int num_stereo_streams = channel_count == 2 ? 1 : 0; return opus_multistream_decoder_get_size(num_streams, num_stereo_streams); } diff --git a/src/core/hle/service/caps/caps_u.cpp b/src/core/hle/service/caps/caps_u.cpp index 5fbba8673..1c2694645 100644 --- a/src/core/hle/service/caps/caps_u.cpp +++ b/src/core/hle/service/caps/caps_u.cpp @@ -77,8 +77,8 @@ void CAPS_U::GetAlbumContentsFileListForApplication(Kernel::HLERequestContext& c // TODO: Update this when we implement the album. // Currently we do not have a method of accessing album entries, set this to 0 for now. - constexpr u32 total_entries_1{}; - constexpr u32 total_entries_2{}; + constexpr static u32 total_entries_1{}; + constexpr static u32 total_entries_2{}; LOG_WARNING( Service_Capture, diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index 447d624e1..f95ad9253 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp_srv.cpp @@ -942,7 +942,7 @@ void FSP_SRV::ReadSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute( const auto parameters = rp.PopRaw(); // Stub this to None for now, backend needs an impl to read/write the SaveDataExtraData - constexpr auto flags = static_cast(FileSys::SaveDataFlags::None); + constexpr static auto flags = static_cast(FileSys::SaveDataFlags::None); LOG_WARNING(Service_FS, "(STUBBED) called, flags={}, space_id={}, attribute.title_id={:016X}\n" diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index ba6f04d8d..f4485141c 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -439,7 +439,7 @@ void Controller_NPad::RequestPadStateUpdate(Core::HID::NpadIdType npad_id) { using btn = Core::HID::NpadButton; pad_entry.npad_buttons.raw = btn::None; if (controller_type != Core::HID::NpadStyleIndex::JoyconLeft) { - constexpr btn right_button_mask = btn::A | btn::B | btn::X | btn::Y | btn::StickR | btn::R | + constexpr static btn right_button_mask = btn::A | btn::B | btn::X | btn::Y | btn::StickR | btn::R | btn::ZR | btn::Plus | btn::StickRLeft | btn::StickRUp | btn::StickRRight | btn::StickRDown; pad_entry.npad_buttons.raw = button_state.raw & right_button_mask; @@ -447,7 +447,7 @@ void Controller_NPad::RequestPadStateUpdate(Core::HID::NpadIdType npad_id) { } if (controller_type != Core::HID::NpadStyleIndex::JoyconRight) { - constexpr btn left_button_mask = + constexpr static btn left_button_mask = btn::Left | btn::Up | btn::Right | btn::Down | btn::StickL | btn::L | btn::ZL | btn::Minus | btn::StickLLeft | btn::StickLUp | btn::StickLRight | btn::StickLDown; pad_entry.npad_buttons.raw |= button_state.raw & left_button_mask; @@ -759,7 +759,7 @@ Core::HID::NpadStyleTag Controller_NPad::GetSupportedStyleSet() const { } Result Controller_NPad::SetSupportedNpadIdTypes(std::span data) { - constexpr std::size_t max_number_npad_ids = 0xa; + constexpr static std::size_t max_number_npad_ids = 0xa; const auto length = data.size(); ASSERT(length > 0 && (length % sizeof(u32)) == 0); const std::size_t elements = length / sizeof(u32); diff --git a/src/core/hle/service/mii/mii_manager.cpp b/src/core/hle/service/mii/mii_manager.cpp index 3a2fe938f..a1b187b63 100644 --- a/src/core/hle/service/mii/mii_manager.cpp +++ b/src/core/hle/service/mii/mii_manager.cpp @@ -670,7 +670,7 @@ ResultVal> MiiManager::GetDefault(SourceFlag source_ } Result MiiManager::GetIndex([[maybe_unused]] const CharInfo& info, u32& index) { - constexpr u32 INVALID_INDEX{0xFFFFFFFF}; + constexpr static u32 INVALID_INDEX{0xFFFFFFFF}; index = INVALID_INDEX; diff --git a/src/core/hle/service/nfp/amiibo_crypto.cpp b/src/core/hle/service/nfp/amiibo_crypto.cpp index ffb2f959c..0d9c3d0f6 100644 --- a/src/core/hle/service/nfp/amiibo_crypto.cpp +++ b/src/core/hle/service/nfp/amiibo_crypto.cpp @@ -35,7 +35,7 @@ bool IsAmiiboValid(const EncryptedNTAG215File& ntag_file) { LOG_DEBUG(Service_NFP, "tag_CFG1=0x{0:x}", ntag_file.CFG1); // Validate UUID - constexpr u8 CT = 0x88; // As defined in `ISO / IEC 14443 - 3` + constexpr static u8 CT = 0x88; // As defined in `ISO / IEC 14443 - 3` if ((CT ^ ntag_file.uuid.uid[0] ^ ntag_file.uuid.uid[1] ^ ntag_file.uuid.uid[2]) != ntag_file.uuid.uid[3]) { return false; @@ -247,7 +247,7 @@ void Cipher(const DerivedKeys& keys, const NTAG215File& in_data, NTAG215File& ou mbedtls_aes_setkey_enc(&aes, keys.aes_key.data(), aes_key_size); memcpy(nonce_counter.data(), keys.aes_iv.data(), sizeof(keys.aes_iv)); - constexpr std::size_t encrypted_data_size = HMAC_TAG_START - SETTINGS_START; + constexpr static std::size_t encrypted_data_size = HMAC_TAG_START - SETTINGS_START; mbedtls_aes_crypt_ctr(&aes, encrypted_data_size, &nc_off, nonce_counter.data(), stream_block.data(), reinterpret_cast(&in_data.settings), @@ -317,13 +317,13 @@ bool DecodeAmiibo(const EncryptedNTAG215File& encrypted_tag_data, NTAG215File& t Cipher(data_keys, encoded_data, tag_data); // Regenerate tag HMAC. Note: order matters, data HMAC depends on tag HMAC! - constexpr std::size_t input_length = DYNAMIC_LOCK_START - UUID_START; + constexpr static std::size_t input_length = DYNAMIC_LOCK_START - UUID_START; mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tag_keys.hmac_key.data(), sizeof(HmacKey), reinterpret_cast(&tag_data.uid), input_length, reinterpret_cast(&tag_data.hmac_tag)); // Regenerate data HMAC - constexpr std::size_t input_length2 = DYNAMIC_LOCK_START - WRITE_COUNTER_START; + constexpr static std::size_t input_length2 = DYNAMIC_LOCK_START - WRITE_COUNTER_START; mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), data_keys.hmac_key.data(), sizeof(HmacKey), reinterpret_cast(&tag_data.write_counter), input_length2, @@ -357,8 +357,8 @@ bool EncodeAmiibo(const NTAG215File& tag_data, EncryptedNTAG215File& encrypted_t NTAG215File encoded_tag_data{}; // Generate tag HMAC - constexpr std::size_t input_length = DYNAMIC_LOCK_START - UUID_START; - constexpr std::size_t input_length2 = HMAC_TAG_START - WRITE_COUNTER_START; + constexpr static std::size_t input_length = DYNAMIC_LOCK_START - UUID_START; + constexpr static std::size_t input_length2 = HMAC_TAG_START - WRITE_COUNTER_START; mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tag_keys.hmac_key.data(), sizeof(HmacKey), reinterpret_cast(&tag_data.uid), input_length, reinterpret_cast(&encoded_tag_data.hmac_tag)); diff --git a/src/core/hle/service/nifm/nifm.cpp b/src/core/hle/service/nifm/nifm.cpp index 5d32adf64..df4f60d59 100644 --- a/src/core/hle/service/nifm/nifm.cpp +++ b/src/core/hle/service/nifm/nifm.cpp @@ -512,7 +512,7 @@ void IGeneralService::GetInternetConnectionStatus(Kernel::HLERequestContext& ctx }; static_assert(sizeof(Output) == 0x3, "Output has incorrect size."); - constexpr Output out{}; + constexpr static Output out{}; IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp b/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp index aba51d280..1f0e05df6 100644 --- a/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp +++ b/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp @@ -9,8 +9,8 @@ namespace Service::Nvidia::NvCore { SyncpointManager::SyncpointManager(Tegra::Host1x::Host1x& host1x_) : host1x{host1x_} { - constexpr u32 VBlank0SyncpointId{26}; - constexpr u32 VBlank1SyncpointId{27}; + constexpr static u32 VBlank0SyncpointId{26}; + constexpr static u32 VBlank1SyncpointId{27}; // Reserve both vblank syncpoints as client managed as they use Continuous Mode // Refer to section 14.3.5.3 of the TRM for more information on Continuous Mode diff --git a/src/core/hle/service/nvflinger/buffer_queue_consumer.cpp b/src/core/hle/service/nvflinger/buffer_queue_consumer.cpp index 0767e548d..3f41aa0d9 100644 --- a/src/core/hle/service/nvflinger/buffer_queue_consumer.cpp +++ b/src/core/hle/service/nvflinger/buffer_queue_consumer.cpp @@ -45,7 +45,7 @@ Status BufferQueueConsumer::AcquireBuffer(BufferItem* out_buffer, // If expected_present is specified, we may not want to return a buffer yet. if (expected_present.count() != 0) { - constexpr auto MAX_REASONABLE_NSEC = 1000000000LL; // 1 second + constexpr static auto MAX_REASONABLE_NSEC = 1000000000LL; // 1 second // The expected_present argument indicates when the buffer is expected to be presented // on-screen. diff --git a/src/core/hle/service/olsc/olsc.cpp b/src/core/hle/service/olsc/olsc.cpp index 530e1be3b..fbae10e7d 100644 --- a/src/core/hle/service/olsc/olsc.cpp +++ b/src/core/hle/service/olsc/olsc.cpp @@ -55,7 +55,7 @@ private: LOG_WARNING(Service_OLSC, "(STUBBED) called"); // backup_setting is set to 0 since real value is unknown - constexpr u64 backup_setting = 0; + constexpr static u64 backup_setting = 0; IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/prepo/prepo.cpp b/src/core/hle/service/prepo/prepo.cpp index 01040b32a..155d6a00b 100644 --- a/src/core/hle/service/prepo/prepo.cpp +++ b/src/core/hle/service/prepo/prepo.cpp @@ -116,7 +116,7 @@ private: void GetTransmissionStatus(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_PREPO, "(STUBBED) called"); - constexpr s32 status = 0; + constexpr static s32 status = 0; IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); @@ -126,7 +126,7 @@ private: void GetSystemSessionId(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_PREPO, "(STUBBED) called"); - constexpr u64 system_session_id = 0; + constexpr static u64 system_session_id = 0; IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); rb.Push(system_session_id); diff --git a/src/core/hle/service/sockets/sfdnsres.cpp b/src/core/hle/service/sockets/sfdnsres.cpp index e96eda7f3..831a51a67 100644 --- a/src/core/hle/service/sockets/sfdnsres.cpp +++ b/src/core/hle/service/sockets/sfdnsres.cpp @@ -92,7 +92,7 @@ static std::vector SerializeAddrInfo(const addrinfo* addrinfo, s32 result_co static_assert(sizeof(SerializedResponseHeader) == 0x18, "Response header size must be 0x18 bytes"); - constexpr auto header_size = sizeof(SerializedResponseHeader); + constexpr static auto header_size = sizeof(SerializedResponseHeader); const auto addr_size = current->ai_addr && current->ai_addrlen > 0 ? current->ai_addrlen : 4; const auto canonname_size = current->ai_canonname ? strlen(current->ai_canonname) + 1 : 1; @@ -103,7 +103,7 @@ static std::vector SerializeAddrInfo(const addrinfo* addrinfo, s32 result_co // Header in network byte order SerializedResponseHeader header{}; - constexpr auto HEADER_MAGIC = 0xBEEFCAFE; + constexpr static auto HEADER_MAGIC = 0xBEEFCAFE; header.magic = htonl(HEADER_MAGIC); header.family = htonl(current->ai_family); header.flags = htonl(current->ai_flags); diff --git a/src/core/hle/service/ssl/ssl.cpp b/src/core/hle/service/ssl/ssl.cpp index dcf47083f..ceb491224 100644 --- a/src/core/hle/service/ssl/ssl.cpp +++ b/src/core/hle/service/ssl/ssl.cpp @@ -103,7 +103,7 @@ private: const auto certificate_format = rp.PopEnum(); [[maybe_unused]] const auto pkcs_12_certificates = ctx.ReadBuffer(0); - constexpr u64 server_id = 0; + constexpr static u64 server_id = 0; LOG_WARNING(Service_SSL, "(STUBBED) called, certificate_format={}", certificate_format); @@ -122,7 +122,7 @@ private: return std::span{}; }(); - constexpr u64 client_id = 0; + constexpr static u64 client_id = 0; LOG_WARNING(Service_SSL, "(STUBBED) called"); diff --git a/src/core/hle/service/time/time_zone_manager.cpp b/src/core/hle/service/time/time_zone_manager.cpp index f9ada7c93..7b94b33f7 100644 --- a/src/core/hle/service/time/time_zone_manager.cpp +++ b/src/core/hle/service/time/time_zone_manager.cpp @@ -286,7 +286,7 @@ static constexpr int TransitionTime(int year, Rule rule, int offset) { } static bool ParsePosixName(const char* name, TimeZoneRule& rule) { - constexpr char default_rule[]{",M4.1.0,M10.5.0"}; + constexpr static char default_rule[]{",M4.1.0,M10.5.0"}; const char* std_name{name}; int std_len{}; int offset{}; @@ -512,8 +512,8 @@ static bool ParseTimeZoneBinary(TimeZoneRule& time_zone_rule, FileSys::VirtualFi return {}; } - constexpr s32 time_zone_max_leaps{50}; - constexpr s32 time_zone_max_chars{50}; + constexpr static s32 time_zone_max_leaps{50}; + constexpr static s32 time_zone_max_chars{50}; if (!(0 <= header.leap_count && header.leap_count < time_zone_max_leaps && 0 < header.type_count && header.type_count < s32(time_zone_rule.ttis.size()) && 0 <= header.time_count && header.time_count < s32(time_zone_rule.ats.size()) && @@ -610,7 +610,7 @@ static bool ParseTimeZoneBinary(TimeZoneRule& time_zone_rule, FileSys::VirtualFi if (bytes_read < 0) { return {}; } - constexpr s32 time_zone_name_max{255}; + constexpr static s32 time_zone_name_max{255}; if (bytes_read > (time_zone_name_max + 1)) { return {}; } diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index 2fb631183..66c8fd38a 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -725,8 +725,8 @@ private: // TODO: Figure out what these are - constexpr s64 unknown_result_1 = 0; - constexpr s64 unknown_result_2 = 0; + constexpr static s64 unknown_result_1 = 0; + constexpr static s64 unknown_result_2 = 0; IPC::ResponseBuilder rb{ctx, 6}; rb.Push(unknown_result_1); @@ -740,8 +740,8 @@ private: const auto height = rp.Pop(); LOG_DEBUG(Service_VI, "called width={}, height={}", width, height); - constexpr u64 base_size = 0x20000; - constexpr u64 alignment = 0x1000; + constexpr static u64 base_size = 0x20000; + constexpr static u64 alignment = 0x1000; const auto texture_size = width * height * 4; const auto out_size = (texture_size + base_size - 1) / base_size * base_size; diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp index f09c176f8..9cf361986 100644 --- a/src/core/perf_stats.cpp +++ b/src/core/perf_stats.cpp @@ -121,7 +121,7 @@ PerfStatsResults PerfStats::GetAndResetStats(microseconds current_system_time_us double PerfStats::GetLastFrameTimeScale() const { std::scoped_lock lock{object_mutex}; - constexpr double FRAME_LENGTH = 1.0 / 60; + constexpr static double FRAME_LENGTH = 1.0 / 60; return duration_cast(previous_frame_length).count() / FRAME_LENGTH; } diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp index 8d5f2be2f..3bcdd9a99 100644 --- a/src/core/telemetry_session.cpp +++ b/src/core/telemetry_session.cpp @@ -34,7 +34,7 @@ static u64 GenerateTelemetryId() { mbedtls_entropy_context entropy; mbedtls_entropy_init(&entropy); mbedtls_ctr_drbg_context ctr_drbg; - constexpr std::array personalization{{"yuzu Telemetry ID"}}; + constexpr static std::array personalization{{"yuzu Telemetry ID"}}; mbedtls_ctr_drbg_init(&ctr_drbg); ASSERT(mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, @@ -225,7 +225,7 @@ void TelemetrySession::AddInitialInfo(Loader::AppLoader& app_loader, Telemetry::AppendOSInfo(field_collection); // Log user configuration information - constexpr auto field_type = Telemetry::FieldType::UserConfig; + constexpr static auto field_type = Telemetry::FieldType::UserConfig; AddField(field_type, "Audio_SinkId", Settings::values.sink_id.GetValue()); AddField(field_type, "Core_UseMultiCore", Settings::values.use_multi_core.GetValue()); AddField(field_type, "Renderer_Backend", diff --git a/src/input_common/drivers/gc_adapter.cpp b/src/input_common/drivers/gc_adapter.cpp index d09ff178b..a4faab15e 100644 --- a/src/input_common/drivers/gc_adapter.cpp +++ b/src/input_common/drivers/gc_adapter.cpp @@ -223,8 +223,8 @@ void GCAdapter::AdapterScanThread(std::stop_token stop_token) { } bool GCAdapter::Setup() { - constexpr u16 nintendo_vid = 0x057e; - constexpr u16 gc_adapter_pid = 0x0337; + constexpr static u16 nintendo_vid = 0x057e; + constexpr static u16 gc_adapter_pid = 0x0337; usb_adapter_handle = std::make_unique(libusb_ctx->get(), nintendo_vid, gc_adapter_pid); if (!usb_adapter_handle->get()) { @@ -346,7 +346,7 @@ void GCAdapter::UpdateVibrations() { // Use 8 states to keep the switching between on/off fast enough for // a human to feel different vibration strenght // More states == more rumble strengths == slower update time - constexpr u8 vibration_states = 8; + constexpr static u8 vibration_states = 8; vibration_counter = (vibration_counter + 1) % vibration_states; @@ -363,7 +363,7 @@ void GCAdapter::SendVibrations() { return; } s32 size{}; - constexpr u8 rumble_command = 0x11; + constexpr static u8 rumble_command = 0x11; const u8 p1 = pads[0].enable_vibration; const u8 p2 = pads[1].enable_vibration; const u8 p3 = pads[2].enable_vibration; diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp index afc33db57..a93bb5c25 100644 --- a/src/input_common/drivers/joycon.cpp +++ b/src/input_common/drivers/joycon.cpp @@ -77,7 +77,7 @@ void Joycons::Setup() { } void Joycons::ScanThread(std::stop_token stop_token) { - constexpr u16 nintendo_vendor_id = 0x057e; + constexpr static u16 nintendo_vendor_id = 0x057e; Common::SetCurrentThreadName("JoyconScanThread"); do { @@ -390,7 +390,7 @@ void Joycons::OnMotionUpdate(std::size_t port, Joycon::ControllerType type, int void Joycons::OnRingConUpdate(f32 ring_data) { // To simplify ring detection it will always be mapped to an empty identifier for all // controllers - constexpr PadIdentifier identifier = { + constexpr static PadIdentifier identifier = { .guid = Common::UUID{}, .port = 0, .pad = 0, diff --git a/src/input_common/drivers/mouse.cpp b/src/input_common/drivers/mouse.cpp index faf9cbdc3..dfa93d58a 100644 --- a/src/input_common/drivers/mouse.cpp +++ b/src/input_common/drivers/mouse.cpp @@ -37,7 +37,7 @@ Mouse::Mouse(std::string input_engine_) : InputEngine(std::move(input_engine_)) void Mouse::UpdateThread(std::stop_token stop_token) { Common::SetCurrentThreadName("Mouse"); - constexpr int update_time = 10; + constexpr static int update_time = 10; while (!stop_token.stop_requested()) { if (Settings::values.mouse_panning && !Settings::values.mouse_enabled) { // Slow movement by 4% diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index 88cacd615..53ebae2d6 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp @@ -63,7 +63,7 @@ public: } bool UpdateMotion(SDL_ControllerSensorEvent event) { - constexpr float gravity_constant = 9.80665f; + constexpr static float gravity_constant = 9.80665f; std::scoped_lock lock{mutex}; const u64 time_difference = event.timestamp - last_motion_update; last_motion_update = event.timestamp; @@ -109,7 +109,7 @@ public: } bool RumblePlay(const Common::Input::VibrationStatus vibration) { - constexpr u32 rumble_max_duration_ms = 1000; + constexpr static u32 rumble_max_duration_ms = 1000; if (sdl_controller) { return SDL_GameControllerRumble( sdl_controller.get(), static_cast(vibration.low_amplitude), @@ -616,7 +616,7 @@ bool SDLDriver::IsVibrationEnabled(const PadIdentifier& identifier) { const auto joystick = GetSDLJoystickByGUID(identifier.guid.RawString(), static_cast(identifier.port)); - constexpr Common::Input::VibrationStatus test_vibration{ + constexpr static Common::Input::VibrationStatus test_vibration{ .low_amplitude = 1, .low_frequency = 160.0f, .high_amplitude = 1, @@ -624,7 +624,7 @@ bool SDLDriver::IsVibrationEnabled(const PadIdentifier& identifier) { .type = Common::Input::VibrationAmplificationType::Exponential, }; - constexpr Common::Input::VibrationStatus zero_vibration{ + constexpr static Common::Input::VibrationStatus zero_vibration{ .low_amplitude = 0, .low_frequency = 160.0f, .high_amplitude = 0, diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp index 808b21069..ae49f0478 100644 --- a/src/input_common/drivers/udp_client.cpp +++ b/src/input_common/drivers/udp_client.cpp @@ -599,7 +599,7 @@ CalibrationConfigurationJob::CalibrationConfigurationJob( Status current_status{Status::Initialized}; SocketCallback callback{[](Response::Version) {}, [](Response::PortInfo) {}, [&](Response::PadData data) { - constexpr u16 CALIBRATION_THRESHOLD = 100; + constexpr static u16 CALIBRATION_THRESHOLD = 100; if (current_status == Status::Initialized) { // Receiving data means the communication is ready now diff --git a/src/input_common/helpers/joycon_driver.cpp b/src/input_common/helpers/joycon_driver.cpp index e65b6b845..6ab16cde6 100644 --- a/src/input_common/helpers/joycon_driver.cpp +++ b/src/input_common/helpers/joycon_driver.cpp @@ -129,7 +129,7 @@ void JoyconDriver::InputThread(std::stop_token stop_token) { input_thread_running = true; // Max update rate is 5ms, ensure we are always able to read a bit faster - constexpr int ThreadDelay = 2; + constexpr static int ThreadDelay = 2; std::vector buffer(MaxBufferSize); while (!stop_token.stop_requested()) { @@ -548,7 +548,7 @@ DriverResult JoyconDriver::GetDeviceType(SDL_hid_device_info* device_info, {0x2007, ControllerType::Right}, {0x2009, ControllerType::Pro}, }; - constexpr u16 nintendo_vendor_id = 0x057e; + constexpr static u16 nintendo_vendor_id = 0x057e; controller_type = ControllerType::None; if (device_info->vendor_id != nintendo_vendor_id) { diff --git a/src/input_common/helpers/joycon_protocol/calibration.cpp b/src/input_common/helpers/joycon_protocol/calibration.cpp index d8f040f75..69e3379cf 100644 --- a/src/input_common/helpers/joycon_protocol/calibration.cpp +++ b/src/input_common/helpers/joycon_protocol/calibration.cpp @@ -129,7 +129,7 @@ DriverResult CalibrationProtocol::GetImuCalibration(MotionCalibration& calibrati DriverResult CalibrationProtocol::GetRingCalibration(RingCalibration& calibration, s16 current_value) { - constexpr s16 DefaultRingRange{800}; + constexpr static s16 DefaultRingRange{800}; // TODO: Get default calibration form ring itself if (ring_data_max == 0 && ring_data_min == 0) { @@ -168,8 +168,8 @@ u16 CalibrationProtocol::GetYAxisCalibrationValue(std::span block) const { } void CalibrationProtocol::ValidateCalibration(JoyStickCalibration& calibration) { - constexpr u16 DefaultStickCenter{0x800}; - constexpr u16 DefaultStickRange{0x6cc}; + constexpr static u16 DefaultStickCenter{0x800}; + constexpr static u16 DefaultStickRange{0x6cc}; calibration.x.center = ValidateValue(calibration.x.center, DefaultStickCenter); calibration.x.max = ValidateValue(calibration.x.max, DefaultStickRange); @@ -181,9 +181,9 @@ void CalibrationProtocol::ValidateCalibration(JoyStickCalibration& calibration) } void CalibrationProtocol::ValidateCalibration(MotionCalibration& calibration) { - constexpr s16 DefaultAccelerometerScale{0x4000}; - constexpr s16 DefaultGyroScale{0x3be7}; - constexpr s16 DefaultOffset{0}; + constexpr static s16 DefaultAccelerometerScale{0x4000}; + constexpr static s16 DefaultGyroScale{0x3be7}; + constexpr static s16 DefaultOffset{0}; for (auto& sensor : calibration.accelerometer) { sensor.scale = ValidateValue(sensor.scale, DefaultAccelerometerScale); diff --git a/src/input_common/helpers/joycon_protocol/common_protocol.cpp b/src/input_common/helpers/joycon_protocol/common_protocol.cpp index 2b42a4555..95c3923b0 100644 --- a/src/input_common/helpers/joycon_protocol/common_protocol.cpp +++ b/src/input_common/helpers/joycon_protocol/common_protocol.cpp @@ -72,8 +72,8 @@ DriverResult JoyconCommonProtocol::SendRawData(std::span buffer) { DriverResult JoyconCommonProtocol::GetSubCommandResponse(SubCommand sc, SubCommandResponse& output) { - constexpr int timeout_mili = 66; - constexpr int MaxTries = 15; + constexpr static int timeout_mili = 66; + constexpr static int MaxTries = 15; int tries = 0; do { @@ -157,8 +157,8 @@ DriverResult JoyconCommonProtocol::SendVibrationReport(std::span buffe } DriverResult JoyconCommonProtocol::ReadRawSPI(SpiAddress addr, std::span output) { - constexpr std::size_t HeaderSize = 5; - constexpr std::size_t MaxTries = 10; + constexpr static std::size_t HeaderSize = 5; + constexpr static std::size_t MaxTries = 10; std::size_t tries = 0; SubCommandResponse response{}; std::array buffer{}; @@ -216,8 +216,8 @@ DriverResult JoyconCommonProtocol::ConfigureMCU(const MCUConfig& config) { DriverResult JoyconCommonProtocol::GetMCUDataResponse(ReportMode report_mode, MCUCommandResponse& output) { - constexpr int TimeoutMili = 200; - constexpr int MaxTries = 9; + constexpr static int TimeoutMili = 200; + constexpr static int MaxTries = 9; int tries = 0; do { @@ -265,7 +265,7 @@ DriverResult JoyconCommonProtocol::SendMCUData(ReportMode report_mode, SubComman DriverResult JoyconCommonProtocol::WaitSetMCUMode(ReportMode report_mode, MCUMode mode) { MCUCommandResponse output{}; - constexpr std::size_t MaxTries{8}; + constexpr static std::size_t MaxTries{8}; std::size_t tries{}; do { diff --git a/src/input_common/helpers/joycon_protocol/irs.cpp b/src/input_common/helpers/joycon_protocol/irs.cpp index 731fd5981..5c07f698b 100644 --- a/src/input_common/helpers/joycon_protocol/irs.cpp +++ b/src/input_common/helpers/joycon_protocol/irs.cpp @@ -131,7 +131,7 @@ DriverResult IrsProtocol::RequestImage(std::span buffer) { DriverResult IrsProtocol::ConfigureIrs() { LOG_DEBUG(Input, "Configure IRS"); - constexpr std::size_t max_tries = 28; + constexpr static std::size_t max_tries = 28; SubCommandResponse output{}; std::size_t tries = 0; @@ -166,7 +166,7 @@ DriverResult IrsProtocol::ConfigureIrs() { DriverResult IrsProtocol::WriteRegistersStep1() { LOG_DEBUG(Input, "WriteRegistersStep1"); DriverResult result{DriverResult::Success}; - constexpr std::size_t max_tries = 28; + constexpr static std::size_t max_tries = 28; SubCommandResponse output{}; std::size_t tries = 0; @@ -226,7 +226,7 @@ DriverResult IrsProtocol::WriteRegistersStep1() { DriverResult IrsProtocol::WriteRegistersStep2() { LOG_DEBUG(Input, "WriteRegistersStep2"); - constexpr std::size_t max_tries = 28; + constexpr static std::size_t max_tries = 28; SubCommandResponse output{}; std::size_t tries = 0; diff --git a/src/input_common/helpers/joycon_protocol/nfc.cpp b/src/input_common/helpers/joycon_protocol/nfc.cpp index eeba82986..6b8f38aec 100644 --- a/src/input_common/helpers/joycon_protocol/nfc.cpp +++ b/src/input_common/helpers/joycon_protocol/nfc.cpp @@ -109,7 +109,7 @@ bool NfcProtocol::HasAmiibo() { } DriverResult NfcProtocol::WaitUntilNfcIsReady() { - constexpr std::size_t timeout_limit = 10; + constexpr static std::size_t timeout_limit = 10; MCUCommandResponse output{}; std::size_t tries = 0; @@ -131,7 +131,7 @@ DriverResult NfcProtocol::WaitUntilNfcIsReady() { DriverResult NfcProtocol::StartPolling(TagFoundData& data) { LOG_DEBUG(Input, "Start Polling for tag"); - constexpr std::size_t timeout_limit = 7; + constexpr static std::size_t timeout_limit = 7; MCUCommandResponse output{}; std::size_t tries = 0; @@ -155,7 +155,7 @@ DriverResult NfcProtocol::StartPolling(TagFoundData& data) { } DriverResult NfcProtocol::ReadTag(const TagFoundData& data) { - constexpr std::size_t timeout_limit = 10; + constexpr static std::size_t timeout_limit = 10; MCUCommandResponse output{}; std::size_t tries = 0; @@ -224,7 +224,7 @@ DriverResult NfcProtocol::ReadTag(const TagFoundData& data) { } DriverResult NfcProtocol::GetAmiiboData(std::vector& ntag_data) { - constexpr std::size_t timeout_limit = 10; + constexpr static std::size_t timeout_limit = 10; MCUCommandResponse output{}; std::size_t tries = 0; diff --git a/src/input_common/helpers/joycon_protocol/ringcon.cpp b/src/input_common/helpers/joycon_protocol/ringcon.cpp index 190cef812..9056e64dc 100644 --- a/src/input_common/helpers/joycon_protocol/ringcon.cpp +++ b/src/input_common/helpers/joycon_protocol/ringcon.cpp @@ -69,7 +69,7 @@ DriverResult RingConProtocol::StartRingconPolling() { DriverResult RingConProtocol::IsRingConnected(bool& is_connected) { LOG_DEBUG(Input, "IsRingConnected"); - constexpr std::size_t max_tries = 28; + constexpr static std::size_t max_tries = 28; SubCommandResponse output{}; std::size_t tries = 0; is_connected = false; diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_integer.cpp b/src/shader_recompiler/backend/glsl/emit_glsl_integer.cpp index 49397c9b2..06599c1b0 100644 --- a/src/shader_recompiler/backend/glsl/emit_glsl_integer.cpp +++ b/src/shader_recompiler/backend/glsl/emit_glsl_integer.cpp @@ -39,7 +39,7 @@ void EmitIAdd32(EmitContext& ctx, IR::Inst& inst, std::string_view a, std::strin // which may be overwritten by the result of the addition if (IR::Inst * overflow{inst.GetAssociatedPseudoOperation(IR::Opcode::GetOverflowFromOp)}) { // https://stackoverflow.com/questions/55468823/how-to-detect-integer-overflow-in-c - constexpr u32 s32_max{static_cast(std::numeric_limits::max())}; + constexpr static u32 s32_max{static_cast(std::numeric_limits::max())}; const auto sub_a{fmt::format("{}u-{}", s32_max, a)}; const auto positive_result{fmt::format("int({})>int({})", b, sub_a)}; const auto negative_result{fmt::format("int({})GetAssociatedPseudoOperation(IR::Opcode::GetOverflowFromOp)}) { // https://stackoverflow.com/questions/55468823/how-to-detect-integer-overflow-in-c - constexpr u32 s32_max{static_cast(std::numeric_limits::max())}; + constexpr static u32 s32_max{static_cast(std::numeric_limits::max())}; const Id is_positive{ctx.OpSGreaterThanEqual(ctx.U1, a, ctx.u32_zero_value)}; const Id sub_a{ctx.OpISub(ctx.U32[1], ctx.Const(s32_max), a)}; diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_floating_point.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_floating_point.cpp index 7f3dccc52..15ad55a43 100644 --- a/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_floating_point.cpp +++ b/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_floating_point.cpp @@ -48,7 +48,7 @@ void F2F(TranslatorVisitor& v, u64 insn, const IR::F16F32F64& src_a, bool abs) { BitField<8, 2, FloatFormat> dst_size; [[nodiscard]] RoundingOp RoundingOperation() const { - constexpr u64 rounding_mask = 0x0B; + constexpr static u64 rounding_mask = 0x0B; return static_cast(rounding_op.Value() & rounding_mask); } } const f2f{insn}; diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_integer.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_integer.cpp index 85c18d942..429733187 100644 --- a/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_integer.cpp +++ b/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_integer.cpp @@ -176,11 +176,11 @@ void TranslateF2I(TranslatorVisitor& v, u64 insn, const IR::F16F32F64& src_a) { (f2i.src_format == SrcFormat::F64) != (f2i.dest_format == DestFormat::I64); if (special_nan_cases) { if (f2i.dest_format == DestFormat::I32) { - constexpr u32 nan_value = 0x8000'0000U; + constexpr static u32 nan_value = 0x8000'0000U; handled_special_case = true; result = IR::U32{v.ir.Select(v.ir.FPIsNan(op_a), v.ir.Imm32(nan_value), result)}; } else if (f2i.dest_format == DestFormat::I64) { - constexpr u64 nan_value = 0x8000'0000'0000'0000ULL; + constexpr static u64 nan_value = 0x8000'0000'0000'0000ULL; handled_special_case = true; result = IR::U64{v.ir.Select(v.ir.FPIsNan(op_a), v.ir.Imm64(nan_value), result)}; } diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/integer_add_three_input.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/integer_add_three_input.cpp index 3d9877359..3c8ef62e2 100644 --- a/src/shader_recompiler/frontend/maxwell/translate/impl/integer_add_three_input.cpp +++ b/src/shader_recompiler/frontend/maxwell/translate/impl/integer_add_three_input.cpp @@ -19,7 +19,7 @@ enum class Half : u64 { }; [[nodiscard]] IR::U32 IntegerHalf(IR::IREmitter& ir, const IR::U32& value, Half half) { - constexpr bool is_signed{false}; + constexpr static bool is_signed{false}; switch (half) { case Half::All: return value; diff --git a/src/tests/common/fibers.cpp b/src/tests/common/fibers.cpp index ecad7583f..c0b22d0ee 100644 --- a/src/tests/common/fibers.cpp +++ b/src/tests/common/fibers.cpp @@ -76,7 +76,7 @@ void TestControl1::ExecuteThread(u32 id) { * doing all the work required. */ TEST_CASE("Fibers::Setup", "[common]") { - constexpr std::size_t num_threads = 7; + constexpr static std::size_t num_threads = 7; TestControl1 test_control{}; test_control.thread_fibers.resize(num_threads); test_control.work_fibers.resize(num_threads); diff --git a/src/tests/input_common/calibration_configuration_job.cpp b/src/tests/input_common/calibration_configuration_job.cpp index 516ff1b30..8d3951ee6 100644 --- a/src/tests/input_common/calibration_configuration_job.cpp +++ b/src/tests/input_common/calibration_configuration_job.cpp @@ -35,8 +35,8 @@ public: } void Run(const std::vector touch_movement_path) { - constexpr size_t HeaderSize = sizeof(InputCommon::CemuhookUDP::Header); - constexpr size_t PadDataSize = + constexpr static size_t HeaderSize = sizeof(InputCommon::CemuhookUDP::Header); + constexpr static size_t PadDataSize = sizeof(InputCommon::CemuhookUDP::Message); REQUIRE(touch_movement_path.size() > 0); diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 627917ab6..b650d0e59 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -890,8 +890,8 @@ void BufferCache

::CommitAsyncFlushesHigh() { buffer_id, }); // Align up to avoid cache conflicts - constexpr u64 align = 8ULL; - constexpr u64 mask = ~(align - 1ULL); + constexpr static u64 align = 8ULL; + constexpr static u64 mask = ~(align - 1ULL); total_size_bytes += (new_size + align - 1) & mask; largest_copy = std::max(largest_copy, new_size); }; @@ -1843,8 +1843,8 @@ void BufferCache

::DownloadBufferMemory(Buffer& buffer, VAddr cpu_addr, u64 si .size = new_size, }); // Align up to avoid cache conflicts - constexpr u64 align = 256ULL; - constexpr u64 mask = ~(align - 1ULL); + constexpr static u64 align = 256ULL; + constexpr static u64 mask = ~(align - 1ULL); total_size_bytes += (new_size + align - 1) & mask; largest_copy = std::max(largest_copy, new_size); }; diff --git a/src/video_core/dma_pusher.cpp b/src/video_core/dma_pusher.cpp index 551929824..72ad3ccc8 100644 --- a/src/video_core/dma_pusher.cpp +++ b/src/video_core/dma_pusher.cpp @@ -75,7 +75,7 @@ bool DmaPusher::Step() { // Push buffer non-empty, read a word command_headers.resize_destructive(command_list_header.size); - constexpr u32 MacroRegistersStart = 0xE00; + constexpr static u32 MacroRegistersStart = 0xE00; if (dma_state.method < MacroRegistersStart) { if (Settings::IsGPULevelHigh()) { memory_manager.ReadBlock(dma_state.dma_get, command_headers.data(), diff --git a/src/video_core/engines/fermi_2d.cpp b/src/video_core/engines/fermi_2d.cpp index a126c359c..40176821b 100644 --- a/src/video_core/engines/fermi_2d.cpp +++ b/src/video_core/engines/fermi_2d.cpp @@ -72,7 +72,7 @@ void Fermi2D::Blit() { UNIMPLEMENTED_IF_MSG(regs.clip_enable != 0, "Clipped blit enabled"); const auto& args = regs.pixels_from_memory; - constexpr s64 null_derivate = 1ULL << 32; + constexpr static s64 null_derivate = 1ULL << 32; Surface src = regs.src; const auto bytes_per_pixel = BytesPerBlock(PixelFormatFromRenderTargetFormat(src.format)); const bool delegate_to_gpu = src.width > 512 && src.height > 512 && bytes_per_pixel <= 8 && diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index ae9da6290..3c1af92c4 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp @@ -258,7 +258,7 @@ u32 Maxwell3D::GetMaxCurrentVertices() { size_t Maxwell3D::EstimateIndexBufferSize() { GPUVAddr start_address = regs.index_buffer.StartAddress(); GPUVAddr end_address = regs.index_buffer.EndAddress(); - constexpr std::array max_sizes = { + constexpr static std::array max_sizes = { std::numeric_limits::max(), std::numeric_limits::max(), std::numeric_limits::max(), std::numeric_limits::max()}; const size_t byte_size = regs.index_buffer.FormatSizeInBytes(); diff --git a/src/video_core/engines/sw_blitter/converter.cpp b/src/video_core/engines/sw_blitter/converter.cpp index 2419b5632..11674c748 100644 --- a/src/video_core/engines/sw_blitter/converter.cpp +++ b/src/video_core/engines/sw_blitter/converter.cpp @@ -694,16 +694,16 @@ private: }; const auto force_to_fp16 = [](f32 base_value) { u32 tmp = Common::BitCast(base_value); - constexpr size_t fp32_mantissa_bits = 23; - constexpr size_t fp16_mantissa_bits = 10; - constexpr size_t mantissa_mask = + constexpr static size_t fp32_mantissa_bits = 23; + constexpr static size_t fp16_mantissa_bits = 10; + constexpr static size_t mantissa_mask = ~((1ULL << (fp32_mantissa_bits - fp16_mantissa_bits)) - 1ULL); tmp = tmp & static_cast(mantissa_mask); // TODO: force the exponent within the range of half float. Not needed in UNORM / SNORM return Common::BitCast(tmp); }; const auto from_fp_n = [&sign_extend](u32 base_value, size_t bits, size_t mantissa) { - constexpr size_t fp32_mantissa_bits = 23; + constexpr static size_t fp32_mantissa_bits = 23; size_t shift_towards = fp32_mantissa_bits - mantissa; const u32 new_value = static_cast(sign_extend(base_value, bits) << shift_towards) & (~(1U << 31)); @@ -770,7 +770,7 @@ private: component_mask[which_component]; }; const auto to_fp_n = [](f32 base_value, size_t bits, size_t mantissa) { - constexpr size_t fp32_mantissa_bits = 23; + constexpr static size_t fp32_mantissa_bits = 23; u32 tmp_value = Common::BitCast(std::max(base_value, 0.0f)); size_t shift_towards = fp32_mantissa_bits - mantissa; return tmp_value >> shift_towards; diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index 7024a19cf..caf241eac 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp @@ -194,8 +194,8 @@ struct GPU::Impl { [[nodiscard]] u64 GetTicks() const { // This values were reversed engineered by fincs from NVN // The gpu clock is reported in units of 385/625 nanoseconds - constexpr u64 gpu_ticks_num = 384; - constexpr u64 gpu_ticks_den = 625; + constexpr static u64 gpu_ticks_num = 384; + constexpr static u64 gpu_ticks_den = 625; u64 nanoseconds = system.CoreTiming().GetGlobalTimeNs().count(); if (Settings::values.use_fast_gpu_time.GetValue()) { diff --git a/src/video_core/host1x/codecs/vp9.cpp b/src/video_core/host1x/codecs/vp9.cpp index cf40c9012..bb691f7d8 100644 --- a/src/video_core/host1x/codecs/vp9.cpp +++ b/src/video_core/host1x/codecs/vp9.cpp @@ -283,7 +283,7 @@ void VP9::EncodeTermSubExp(VpxRangeEncoder& writer, s32 value) { } else { value -= 64; - constexpr s32 size = 8; + constexpr static s32 size = 8; const s32 mask = (1 << size) - 191; @@ -307,7 +307,7 @@ bool VP9::WriteLessThan(VpxRangeEncoder& writer, s32 value, s32 test) { void VP9::WriteCoefProbabilityUpdate(VpxRangeEncoder& writer, s32 tx_mode, const std::array& new_prob, const std::array& old_prob) { - constexpr u32 block_bytes = 2 * 2 * 6 * 6 * 3; + constexpr static u32 block_bytes = 2 * 2 * 6 * 6 * 3; const auto needs_update = [&](u32 base_index) { return !std::equal(new_prob.begin() + base_index, diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.h index 00ce53e3e..c9b482bbe 100644 --- a/src/video_core/query_cache.h +++ b/src/video_core/query_cache.h @@ -281,7 +281,7 @@ public: explicit HostCounterBase(std::shared_ptr dependency_) : dependency{std::move(dependency_)}, depth{dependency ? (dependency->Depth() + 1) : 0} { // Avoid nesting too many dependencies to avoid a stack overflow when these are deleted. - constexpr u64 depth_threshold = 96; + constexpr static u64 depth_threshold = 96; if (depth > depth_threshold) { depth = 0; base_result = dependency->Query(); diff --git a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp b/src/video_core/renderer_opengl/gl_compute_pipeline.cpp index 1a0cea9b7..e49b04975 100644 --- a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp +++ b/src/video_core/renderer_opengl/gl_compute_pipeline.cpp @@ -162,7 +162,8 @@ void ComputePipeline::Configure() { buffer_cache.UnbindComputeTextureBuffers(); size_t texbuf_index{}; const auto add_buffer{[&](const auto& desc) { - constexpr bool is_image = std::is_same_v; + constexpr static bool is_image = + std::is_same_v; for (u32 i = 0; i < desc.count; ++i) { bool is_written{false}; if constexpr (is_image) { diff --git a/src/video_core/renderer_opengl/gl_device.cpp b/src/video_core/renderer_opengl/gl_device.cpp index 22ed16ebf..a5e27de73 100644 --- a/src/video_core/renderer_opengl/gl_device.cpp +++ b/src/video_core/renderer_opengl/gl_device.cpp @@ -126,9 +126,9 @@ Device::Device(Core::Frontend::EmuWindow& emu_window) { const bool is_intel = vendor_name == "Intel"; #ifdef __unix__ - constexpr bool is_linux = true; + constexpr static bool is_linux = true; #else - constexpr bool is_linux = false; + constexpr static bool is_linux = false; #endif bool disable_fast_buffer_sub_data = false; diff --git a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp index 29491e762..c409d6ae7 100644 --- a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp +++ b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp @@ -385,7 +385,8 @@ void GraphicsPipeline::ConfigureImpl(bool is_indexed) { const auto bind_stage_info{[&](size_t stage) LAMBDA_FORCEINLINE { size_t index{}; const auto add_buffer{[&](const auto& desc) { - constexpr bool is_image = std::is_same_v; + constexpr static bool is_image = + std::is_same_v; for (u32 i = 0; i < desc.count; ++i) { bool is_written{false}; if constexpr (is_image) { diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 2a74c1d05..5d25b8a7d 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -237,7 +237,7 @@ void RendererOpenGL::LoadFBToScreenInfo(const Tegra::FramebufferConfig& framebuf screen_info.display_texture = screen_info.texture.resource.handle; // TODO(Rodrigo): Read this from HLE - constexpr u32 block_height_log2 = 4; + constexpr static u32 block_height_log2 = 4; const auto pixel_format{ VideoCore::Surface::PixelFormatFromGPUPixelFormat(framebuffer.pixel_format)}; const u32 bytes_per_pixel{VideoCore::Surface::BytesPerBlock(pixel_format)}; @@ -375,7 +375,7 @@ void RendererOpenGL::AddTelemetryFields() { LOG_INFO(Render_OpenGL, "GL_VENDOR: {}", gpu_vendor); LOG_INFO(Render_OpenGL, "GL_RENDERER: {}", gpu_model); - constexpr auto user_system = Common::Telemetry::FieldType::UserSystem; + constexpr static auto user_system = Common::Telemetry::FieldType::UserSystem; telemetry_session.AddField(user_system, "GPU_Vendor", std::string(gpu_vendor)); telemetry_session.AddField(user_system, "GPU_Model", std::string(gpu_model)); telemetry_session.AddField(user_system, "GPU_OpenGL_Version", std::string(gl_version)); diff --git a/src/video_core/renderer_vulkan/blit_image.cpp b/src/video_core/renderer_vulkan/blit_image.cpp index cf2964a3f..334087119 100644 --- a/src/video_core/renderer_vulkan/blit_image.cpp +++ b/src/video_core/renderer_vulkan/blit_image.cpp @@ -358,8 +358,9 @@ VkExtent2D GetConversionExtent(const ImageView& src_image_view) { void TransitionImageLayout(vk::CommandBuffer& cmdbuf, VkImage image, VkImageLayout target_layout, VkImageLayout source_layout = VK_IMAGE_LAYOUT_GENERAL) { - constexpr VkFlags flags{VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | - VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_SHADER_READ_BIT}; + constexpr static VkFlags flags{VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | + VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | + VK_ACCESS_SHADER_READ_BIT}; const VkImageMemoryBarrier barrier{ .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, .pNext = nullptr, diff --git a/src/video_core/renderer_vulkan/vk_blit_screen.cpp b/src/video_core/renderer_vulkan/vk_blit_screen.cpp index 2f0cc27e8..34a86a407 100644 --- a/src/video_core/renderer_vulkan/vk_blit_screen.cpp +++ b/src/video_core/renderer_vulkan/vk_blit_screen.cpp @@ -175,7 +175,7 @@ VkSemaphore BlitScreen::Draw(const Tegra::FramebufferConfig& framebuffer, const u8* const host_ptr = cpu_memory.GetPointer(framebuffer_addr); // TODO(Rodrigo): Read this from HLE - constexpr u32 block_height_log2 = 4; + constexpr static u32 block_height_log2 = 4; const u32 bytes_per_pixel = GetBytesPerPixel(framebuffer); const u64 linear_size{GetSizeInBytes(framebuffer)}; const u64 tiled_size{Tegra::Texture::CalculateSize(true, bytes_per_pixel, @@ -1482,7 +1482,7 @@ u64 BlitScreen::CalculateBufferSize(const Tegra::FramebufferConfig& framebuffer) u64 BlitScreen::GetRawImageOffset(const Tegra::FramebufferConfig& framebuffer, std::size_t image_index) const { - constexpr auto first_image_offset = static_cast(sizeof(BufferData)); + constexpr static auto first_image_offset = static_cast(sizeof(BufferData)); return first_image_offset + GetSizeInBytes(framebuffer) * image_index; } diff --git a/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp b/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp index 2a0f0dbf0..326260b41 100644 --- a/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp @@ -172,7 +172,8 @@ void ComputePipeline::Configure(Tegra::Engines::KeplerCompute& kepler_compute, buffer_cache.UnbindComputeTextureBuffers(); size_t index{}; const auto add_buffer{[&](const auto& desc) { - constexpr bool is_image = std::is_same_v; + constexpr static bool is_image = + std::is_same_v; for (u32 i = 0; i < desc.count; ++i) { bool is_written{false}; if constexpr (is_image) { diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index baedc4424..bdab00597 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -398,7 +398,8 @@ void GraphicsPipeline::ConfigureImpl(bool is_indexed) { const auto bind_stage_info{[&](size_t stage) LAMBDA_FORCEINLINE { size_t index{}; const auto add_buffer{[&](const auto& desc) { - constexpr bool is_image = std::is_same_v; + constexpr static bool is_image = + std::is_same_v; for (u32 i = 0; i < desc.count; ++i) { bool is_written{false}; if constexpr (is_image) { diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 719edbcfb..3d50f8edb 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -1109,9 +1109,9 @@ void RasterizerVulkan::UpdateDepthBiasEnable(Tegra::Engines::Maxwell3D::Regs& re if (!state_tracker.TouchDepthBiasEnable()) { return; } - constexpr size_t POINT = 0; - constexpr size_t LINE = 1; - constexpr size_t POLYGON = 2; + constexpr static size_t POINT = 0; + constexpr static size_t LINE = 1; + constexpr static size_t POLYGON = 2; static constexpr std::array POLYGON_OFFSET_ENABLE_LUT = { POINT, // Points LINE, // Lines diff --git a/src/video_core/renderer_vulkan/vk_smaa.cpp b/src/video_core/renderer_vulkan/vk_smaa.cpp index 8eb735489..1cd354003 100644 --- a/src/video_core/renderer_vulkan/vk_smaa.cpp +++ b/src/video_core/renderer_vulkan/vk_smaa.cpp @@ -55,8 +55,9 @@ std::pair CreateWrappedImage(const Device& device, void TransitionImageLayout(vk::CommandBuffer& cmdbuf, VkImage image, VkImageLayout target_layout, VkImageLayout source_layout = VK_IMAGE_LAYOUT_GENERAL) { - constexpr VkFlags flags{VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | - VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_SHADER_READ_BIT}; + constexpr static VkFlags flags{VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | + VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | + VK_ACCESS_SHADER_READ_BIT}; const VkImageMemoryBarrier barrier{ .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, .pNext = nullptr, @@ -152,7 +153,7 @@ vk::RenderPass CreateWrappedRenderPass(const Device& device, VkFormat format) { .finalLayout = VK_IMAGE_LAYOUT_GENERAL, }; - constexpr VkAttachmentReference color_attachment_ref{ + constexpr static VkAttachmentReference color_attachment_ref{ .attachment = 0, .layout = VK_IMAGE_LAYOUT_GENERAL, }; @@ -170,7 +171,7 @@ vk::RenderPass CreateWrappedRenderPass(const Device& device, VkFormat format) { .pPreserveAttachments = nullptr, }; - constexpr VkSubpassDependency dependency{ + constexpr static VkSubpassDependency dependency{ .srcSubpass = VK_SUBPASS_EXTERNAL, .dstSubpass = 0, .srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, @@ -328,7 +329,7 @@ vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderp }, }}; - constexpr VkPipelineVertexInputStateCreateInfo vertex_input_ci{ + constexpr static VkPipelineVertexInputStateCreateInfo vertex_input_ci{ .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO, .pNext = nullptr, .flags = 0, @@ -338,7 +339,7 @@ vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderp .pVertexAttributeDescriptions = nullptr, }; - constexpr VkPipelineInputAssemblyStateCreateInfo input_assembly_ci{ + constexpr static VkPipelineInputAssemblyStateCreateInfo input_assembly_ci{ .sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO, .pNext = nullptr, .flags = 0, @@ -346,7 +347,7 @@ vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderp .primitiveRestartEnable = VK_FALSE, }; - constexpr VkPipelineViewportStateCreateInfo viewport_state_ci{ + constexpr static VkPipelineViewportStateCreateInfo viewport_state_ci{ .sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO, .pNext = nullptr, .flags = 0, @@ -356,7 +357,7 @@ vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderp .pScissors = nullptr, }; - constexpr VkPipelineRasterizationStateCreateInfo rasterization_ci{ + constexpr static VkPipelineRasterizationStateCreateInfo rasterization_ci{ .sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO, .pNext = nullptr, .flags = 0, @@ -372,7 +373,7 @@ vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderp .lineWidth = 1.0f, }; - constexpr VkPipelineMultisampleStateCreateInfo multisampling_ci{ + constexpr static VkPipelineMultisampleStateCreateInfo multisampling_ci{ .sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO, .pNext = nullptr, .flags = 0, @@ -384,7 +385,7 @@ vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderp .alphaToOneEnable = VK_FALSE, }; - constexpr VkPipelineColorBlendAttachmentState color_blend_attachment{ + constexpr static VkPipelineColorBlendAttachmentState color_blend_attachment{ .blendEnable = VK_FALSE, .srcColorBlendFactor = VK_BLEND_FACTOR_ZERO, .dstColorBlendFactor = VK_BLEND_FACTOR_ZERO, @@ -407,7 +408,7 @@ vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderp .blendConstants = {0.0f, 0.0f, 0.0f, 0.0f}, }; - constexpr std::array dynamic_states{ + constexpr static std::array dynamic_states{ VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR, }; @@ -468,7 +469,7 @@ VkWriteDescriptorSet CreateWriteDescriptorSet(std::vector } void ClearColorImage(vk::CommandBuffer& cmdbuf, VkImage image) { - constexpr std::array subresources{{{ + constexpr static std::array subresources{{{ .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, .baseMipLevel = 0, .levelCount = 1, @@ -528,8 +529,8 @@ SMAA::SMAA(const Device& device, MemoryAllocator& allocator, size_t image_count, } void SMAA::CreateImages() { - constexpr VkExtent2D area_extent{AREATEX_WIDTH, AREATEX_HEIGHT}; - constexpr VkExtent2D search_extent{SEARCHTEX_WIDTH, SEARCHTEX_HEIGHT}; + constexpr static VkExtent2D area_extent{AREATEX_WIDTH, AREATEX_HEIGHT}; + constexpr static VkExtent2D search_extent{SEARCHTEX_WIDTH, SEARCHTEX_HEIGHT}; std::tie(m_static_images[Area], m_static_buffer_commits[Area]) = CreateWrappedImage(m_device, m_allocator, area_extent, VK_FORMAT_R8G8_UNORM); @@ -586,12 +587,12 @@ void SMAA::CreateSampler() { void SMAA::CreateShaders() { // These match the order of the SMAAStage enum - constexpr std::array vert_shader_sources{ + constexpr static std::array vert_shader_sources{ ARRAY_TO_SPAN(SMAA_EDGE_DETECTION_VERT_SPV), ARRAY_TO_SPAN(SMAA_BLENDING_WEIGHT_CALCULATION_VERT_SPV), ARRAY_TO_SPAN(SMAA_NEIGHBORHOOD_BLENDING_VERT_SPV), }; - constexpr std::array frag_shader_sources{ + constexpr static std::array frag_shader_sources{ ARRAY_TO_SPAN(SMAA_EDGE_DETECTION_FRAG_SPV), ARRAY_TO_SPAN(SMAA_BLENDING_WEIGHT_CALCULATION_FRAG_SPV), ARRAY_TO_SPAN(SMAA_NEIGHBORHOOD_BLENDING_FRAG_SPV), @@ -675,8 +676,8 @@ void SMAA::UploadImages(Scheduler& scheduler) { return; } - constexpr VkExtent2D area_extent{AREATEX_WIDTH, AREATEX_HEIGHT}; - constexpr VkExtent2D search_extent{SEARCHTEX_WIDTH, SEARCHTEX_HEIGHT}; + constexpr static VkExtent2D area_extent{AREATEX_WIDTH, AREATEX_HEIGHT}; + constexpr static VkExtent2D search_extent{SEARCHTEX_WIDTH, SEARCHTEX_HEIGHT}; UploadImage(m_device, m_allocator, scheduler, m_static_images[Area], area_extent, VK_FORMAT_R8G8_UNORM, ARRAY_TO_SPAN(areaTexBytes)); diff --git a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp index 74ca77216..172b6ed95 100644 --- a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp @@ -299,7 +299,7 @@ void StagingBufferPool::ReleaseCache(MemoryUsage usage) { } void StagingBufferPool::ReleaseLevel(StagingBuffersCache& cache, size_t log2) { - constexpr size_t deletions_per_tick = 16; + constexpr static size_t deletions_per_tick = 16; auto& staging = cache[log2]; auto& entries = staging.entries; const size_t old_size = entries.size(); diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp index b6810eef9..0b24a98eb 100644 --- a/src/video_core/renderer_vulkan/vk_swapchain.cpp +++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp @@ -53,7 +53,7 @@ VkPresentModeKHR ChooseSwapPresentMode(vk::Span modes) { } VkExtent2D ChooseSwapExtent(const VkSurfaceCapabilitiesKHR& capabilities, u32 width, u32 height) { - constexpr auto undefined_size{std::numeric_limits::max()}; + constexpr static auto undefined_size{std::numeric_limits::max()}; if (capabilities.currentExtent.width != undefined_size) { return capabilities.currentExtent; } diff --git a/src/video_core/renderer_vulkan/vk_turbo_mode.cpp b/src/video_core/renderer_vulkan/vk_turbo_mode.cpp index c42594149..38c7e533d 100644 --- a/src/video_core/renderer_vulkan/vk_turbo_mode.cpp +++ b/src/video_core/renderer_vulkan/vk_turbo_mode.cpp @@ -48,7 +48,7 @@ void TurboMode::Run(std::stop_token stop_token) { auto commit = m_allocator.Commit(buffer, MemoryUsage::DeviceLocal); // Create the descriptor pool to contain our descriptor. - constexpr VkDescriptorPoolSize pool_size{ + constexpr static VkDescriptorPoolSize pool_size{ .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, .descriptorCount = 1, }; @@ -63,7 +63,7 @@ void TurboMode::Run(std::stop_token stop_token) { }); // Create the descriptor set layout from the pool. - constexpr VkDescriptorSetLayoutBinding layout_binding{ + constexpr static VkDescriptorSetLayoutBinding layout_binding{ .binding = 0, .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, .descriptorCount = 1, diff --git a/src/video_core/surface.cpp b/src/video_core/surface.cpp index 1a76d4178..e69855cad 100644 --- a/src/video_core/surface.cpp +++ b/src/video_core/surface.cpp @@ -371,7 +371,7 @@ std::pair GetASTCBlockSize(PixelFormat format) { } u64 EstimatedDecompressedSize(u64 base_size, PixelFormat format) { - constexpr u64 RGBA8_PIXEL_SIZE = 4; + constexpr static u64 RGBA8_PIXEL_SIZE = 4; const u64 base_block_size = static_cast(DefaultBlockWidth(format)) * static_cast(DefaultBlockHeight(format)) * RGBA8_PIXEL_SIZE; return (base_size * base_block_size) / BytesPerBlock(format); diff --git a/src/video_core/textures/decoders.cpp b/src/video_core/textures/decoders.cpp index 59120cd09..436f228b3 100644 --- a/src/video_core/textures/decoders.cpp +++ b/src/video_core/textures/decoders.cpp @@ -29,7 +29,7 @@ constexpr u32 pdep(u32 value) { template void incrpdep(u32& value) { - constexpr u32 swizzled_incr = pdep(incr_amount); + constexpr static u32 swizzled_incr = pdep(incr_amount); value = ((value | ~mask) + swizzled_incr) & mask; } diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cpp index 486d4dfaf..7efe83c9a 100644 --- a/src/video_core/vulkan_common/vulkan_wrapper.cpp +++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp @@ -495,9 +495,9 @@ VkResult Free(VkDevice device, VkCommandPool handle, Span buffe Instance Instance::Create(u32 version, Span layers, Span extensions, InstanceDispatch& dispatch) { #ifdef __APPLE__ - constexpr VkFlags ci_flags{VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR}; + constexpr static VkFlags ci_flags{VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR}; #else - constexpr VkFlags ci_flags{}; + constexpr static VkFlags ci_flags{}; #endif const VkApplicationInfo application_info{ diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index d65991734..c2b144b78 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -720,7 +720,7 @@ void GRenderWindow::TouchEndEvent() { void GRenderWindow::InitializeCamera() { #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA - constexpr auto camera_update_ms = std::chrono::milliseconds{50}; // (50ms, 20Hz) + constexpr static auto camera_update_ms = std::chrono::milliseconds{50}; // (50ms, 20Hz) if (!Settings::values.enable_ir_sensor) { return; } diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp index c287220fc..fa8afc2d9 100644 --- a/src/yuzu/configuration/configure_input_player_widget.cpp +++ b/src/yuzu/configuration/configure_input_player_widget.cpp @@ -317,9 +317,9 @@ void PlayerControlPreview::DrawLeftController(QPainter& p, const QPointF center) // D-pad constants const QPointF dpad_center = center + QPoint(9, 14); - constexpr int dpad_distance = 23; - constexpr int dpad_radius = 11; - constexpr float dpad_arrow_size = 1.2f; + constexpr static int dpad_distance = 23; + constexpr static int dpad_radius = 11; + constexpr static float dpad_arrow_size = 1.2f; // D-pad buttons p.setPen(colors.outline); @@ -439,9 +439,9 @@ void PlayerControlPreview::DrawRightController(QPainter& p, const QPointF center // Face buttons constants const QPointF face_center = center + QPoint(-9, -73); - constexpr int face_distance = 23; - constexpr int face_radius = 11; - constexpr float text_size = 1.1f; + constexpr static int face_distance = 23; + constexpr static int face_radius = 11; + constexpr static float text_size = 1.1f; // Face buttons p.setPen(colors.outline); @@ -559,9 +559,9 @@ void PlayerControlPreview::DrawDualController(QPainter& p, const QPointF center) // Face buttons constants const QPointF face_center = center + QPoint(65, -65); - constexpr int face_distance = 20; - constexpr int face_radius = 10; - constexpr float text_size = 1.0f; + constexpr static int face_distance = 20; + constexpr static int face_radius = 10; + constexpr static float text_size = 1.0f; // Face buttons p.setPen(colors.outline); @@ -581,9 +581,9 @@ void PlayerControlPreview::DrawDualController(QPainter& p, const QPointF center) // D-pad constants const QPointF dpad_center = center + QPoint(-65, 12); - constexpr int dpad_distance = 20; - constexpr int dpad_radius = 10; - constexpr float dpad_arrow_size = 1.1f; + constexpr static int dpad_distance = 20; + constexpr static int dpad_radius = 10; + constexpr static float dpad_arrow_size = 1.1f; // D-pad buttons p.setPen(colors.outline); @@ -651,9 +651,9 @@ void PlayerControlPreview::DrawHandheldController(QPainter& p, const QPointF cen // Face buttons constants const QPointF face_center = center + QPoint(171, -41); - constexpr float face_distance = 12.8f; - constexpr float face_radius = 6.4f; - constexpr float text_size = 0.6f; + constexpr static float face_distance = 12.8f; + constexpr static float face_radius = 6.4f; + constexpr static float text_size = 0.6f; // Face buttons p.setPen(colors.outline); @@ -673,9 +673,9 @@ void PlayerControlPreview::DrawHandheldController(QPainter& p, const QPointF cen // D-pad constants const QPointF dpad_center = center + QPoint(-171, 8); - constexpr float dpad_distance = 12.8f; - constexpr float dpad_radius = 6.4f; - constexpr float dpad_arrow_size = 0.68f; + constexpr static float dpad_distance = 12.8f; + constexpr static float dpad_radius = 6.4f; + constexpr static float dpad_arrow_size = 0.68f; // D-pad buttons p.setPen(colors.outline); @@ -754,9 +754,9 @@ void PlayerControlPreview::DrawProController(QPainter& p, const QPointF center) // Face buttons constants const QPointF face_center = center + QPoint(105, -56); - constexpr int face_distance = 31; - constexpr int face_radius = 15; - constexpr float text_size = 1.5f; + constexpr static int face_distance = 31; + constexpr static int face_radius = 15; + constexpr static float text_size = 1.5f; // Face buttons p.setPen(colors.outline); @@ -846,7 +846,7 @@ void PlayerControlPreview::DrawGCController(QPainter& p, const QPointF center) { using namespace Settings::NativeButton; // Face buttons constants - constexpr float text_size = 1.1f; + constexpr static float text_size = 1.1f; // Face buttons p.setPen(colors.outline); @@ -1497,7 +1497,7 @@ void PlayerControlPreview::DrawProBody(QPainter& p, const QPointF center) { std::array qleft_handle; std::array qright_handle; std::array qbody; - constexpr int radius1 = 32; + constexpr static int radius1 = 32; for (std::size_t point = 0; point < pro_left_handle.size() / 2; ++point) { const float left_x = pro_left_handle[point * 2 + 0]; @@ -1539,7 +1539,7 @@ void PlayerControlPreview::DrawGCBody(QPainter& p, const QPointF center) { std::array qbody; std::array left_hex; std::array right_hex; - constexpr float angle = 2 * 3.1415f / 8; + constexpr static float angle = 2 * 3.1415f / 8; for (std::size_t point = 0; point < gc_left_body.size() / 2; ++point) { const float body_x = gc_left_body[point * 2 + 0]; @@ -1676,9 +1676,9 @@ void PlayerControlPreview::DrawDualBody(QPainter& p, const QPointF center) { std::array qright_joycon_slider_topview; std::array qleft_joycon_topview; std::array qright_joycon_topview; - constexpr float size = 1.61f; - constexpr float size2 = 0.9f; - constexpr float offset = 209.3f; + constexpr static float size = 1.61f; + constexpr static float size2 = 0.9f; + constexpr static float offset = 209.3f; for (std::size_t point = 0; point < left_joycon_body.size() / 2; ++point) { const float body_x = left_joycon_body[point * 2 + 0]; @@ -1767,10 +1767,10 @@ void PlayerControlPreview::DrawLeftBody(QPainter& p, const QPointF center) { std::array qleft_joycon_slider; std::array qleft_joycon_slider_topview; std::array qleft_joycon_topview; - constexpr float size = 1.78f; - constexpr float size2 = 1.1115f; - constexpr float offset = 312.39f; - constexpr float offset2 = 335; + constexpr static float size = 1.78f; + constexpr static float size2 = 1.1115f; + constexpr static float offset = 312.39f; + constexpr static float offset2 = 335; for (std::size_t point = 0; point < left_joycon_body.size() / 2; ++point) { left_joycon[point] = center + QPointF(left_joycon_body[point * 2] * size + offset, @@ -1867,10 +1867,10 @@ void PlayerControlPreview::DrawRightBody(QPainter& p, const QPointF center) { std::array qright_joycon_slider; std::array qright_joycon_slider_topview; std::array qright_joycon_topview; - constexpr float size = 1.78f; - constexpr float size2 = 1.1115f; - constexpr float offset = 312.39f; - constexpr float offset2 = 335; + constexpr static float size = 1.78f; + constexpr static float size2 = 1.1115f; + constexpr static float offset = 312.39f; + constexpr static float offset2 = 335; for (std::size_t point = 0; point < left_joycon_body.size() / 2; ++point) { right_joycon[point] = center + QPointF(-left_joycon_body[point * 2] * size - offset, @@ -2068,8 +2068,8 @@ void PlayerControlPreview::DrawDualTriggers(QPainter& p, const QPointF center, const Common::Input::ButtonStatus& right_pressed) { std::array qleft_trigger; std::array qright_trigger; - constexpr float size = 1.62f; - constexpr float offset = 210.6f; + constexpr static float size = 1.62f; + constexpr static float offset = 210.6f; for (std::size_t point = 0; point < left_joycon_trigger.size() / 2; ++point) { const float left_trigger_x = left_joycon_trigger[point * 2 + 0]; const float left_trigger_y = left_joycon_trigger[point * 2 + 1]; @@ -2097,7 +2097,7 @@ void PlayerControlPreview::DrawDualTriggersTopView( const Common::Input::ButtonStatus& right_pressed) { std::array qleft_trigger; std::array qright_trigger; - constexpr float size = 0.9f; + constexpr static float size = 0.9f; for (std::size_t point = 0; point < left_joystick_L_topview.size() / 2; ++point) { const float top_view_x = left_joystick_L_topview[point * 2 + 0]; @@ -2134,7 +2134,7 @@ void PlayerControlPreview::DrawDualZTriggersTopView( const Common::Input::ButtonStatus& right_pressed) { std::array qleft_trigger; std::array qright_trigger; - constexpr float size = 0.9f; + constexpr static float size = 0.9f; for (std::size_t point = 0; point < left_joystick_ZL_topview.size() / 2; ++point) { qleft_trigger[point] = @@ -2167,8 +2167,8 @@ void PlayerControlPreview::DrawDualZTriggersTopView( void PlayerControlPreview::DrawLeftTriggers(QPainter& p, const QPointF center, const Common::Input::ButtonStatus& left_pressed) { std::array qleft_trigger; - constexpr float size = 1.78f; - constexpr float offset = 311.5f; + constexpr static float size = 1.78f; + constexpr static float offset = 311.5f; for (std::size_t point = 0; point < left_joycon_trigger.size() / 2; ++point) { qleft_trigger[point] = center + QPointF(left_joycon_trigger[point * 2] * size + offset, @@ -2184,8 +2184,8 @@ void PlayerControlPreview::DrawLeftTriggers(QPainter& p, const QPointF center, void PlayerControlPreview::DrawLeftZTriggers(QPainter& p, const QPointF center, const Common::Input::ButtonStatus& left_pressed) { std::array qleft_trigger; - constexpr float size = 1.1115f; - constexpr float offset2 = 335; + constexpr static float size = 1.1115f; + constexpr static float offset2 = 335; for (std::size_t point = 0; point < left_joycon_sideview_zl.size() / 2; ++point) { qleft_trigger[point] = center + QPointF(left_joycon_sideview_zl[point * 2] * size + offset2, @@ -2241,8 +2241,8 @@ void PlayerControlPreview::DrawLeftZTriggersTopView( void PlayerControlPreview::DrawRightTriggers(QPainter& p, const QPointF center, const Common::Input::ButtonStatus& right_pressed) { std::array qright_trigger; - constexpr float size = 1.78f; - constexpr float offset = 311.5f; + constexpr static float size = 1.78f; + constexpr static float offset = 311.5f; for (std::size_t point = 0; point < left_joycon_trigger.size() / 2; ++point) { qright_trigger[point] = center + QPointF(-left_joycon_trigger[point * 2] * size - offset, @@ -2258,8 +2258,8 @@ void PlayerControlPreview::DrawRightTriggers(QPainter& p, const QPointF center, void PlayerControlPreview::DrawRightZTriggers(QPainter& p, const QPointF center, const Common::Input::ButtonStatus& right_pressed) { std::array qright_trigger; - constexpr float size = 1.1115f; - constexpr float offset2 = 335; + constexpr static float size = 1.1115f; + constexpr static float offset2 = 335; for (std::size_t point = 0; point < left_joycon_sideview_zl.size() / 2; ++point) { qright_trigger[point] = @@ -2433,7 +2433,7 @@ void PlayerControlPreview::DrawRawJoystick(QPainter& p, QPointF center_left, QPo void PlayerControlPreview::DrawJoystickProperties( QPainter& p, const QPointF center, const Common::Input::AnalogProperties& properties) { - constexpr float size = 45.0f; + constexpr static float size = 45.0f; const float range = size * properties.range; const float deadzone = size * properties.deadzone; @@ -2453,7 +2453,7 @@ void PlayerControlPreview::DrawJoystickProperties( void PlayerControlPreview::DrawJoystickDot(QPainter& p, const QPointF center, const Common::Input::StickStatus& stick, bool raw) { - constexpr float size = 45.0f; + constexpr static float size = 45.0f; const float range = size * stick.x.properties.range; if (raw) { diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp index 22aa19c56..2e73c2719 100644 --- a/src/yuzu/game_list.cpp +++ b/src/yuzu/game_list.cpp @@ -476,8 +476,8 @@ void GameList::DonePopulating(const QStringList& watch_list) { // Workaround: Add the watch paths in chunks to allow the gui to refresh // This prevents the UI from stalling when a large number of watch paths are added // Also artificially caps the watcher to a certain number of directories - constexpr int LIMIT_WATCH_DIRECTORIES = 5000; - constexpr int SLICE_SIZE = 25; + constexpr static int LIMIT_WATCH_DIRECTORIES = 5000; + constexpr static int SLICE_SIZE = 25; int len = std::min(static_cast(watch_list.size()), LIMIT_WATCH_DIRECTORIES); for (int i = 0; i < len; i += SLICE_SIZE) { watcher->addPaths(watch_list.mid(i, i + SLICE_SIZE)); diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 62dfc526a..68abde028 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -219,7 +219,7 @@ static void LogRuntimes() { #ifdef _MSC_VER // It is possible that the name of the dll will change. // vcruntime140.dll is for 2015 and onwards - constexpr char runtime_dll_name[] = "vcruntime140.dll"; + constexpr static char runtime_dll_name[] = "vcruntime140.dll"; UINT sz = GetFileVersionInfoSizeA(runtime_dll_name, nullptr); bool runtime_version_inspection_worked = false; if (sz > 0) { @@ -4490,8 +4490,8 @@ static void SetHighDPIAttributes() { // Recommended minimum width and height for proper window fit. // Any screen with a lower resolution than this will still have a scale of 1. - constexpr float minimum_width = 1350.0f; - constexpr float minimum_height = 900.0f; + constexpr static float minimum_width = 1350.0f; + constexpr static float minimum_height = 900.0f; const float width_ratio = std::max(1.0f, real_width / minimum_width); const float height_ratio = std::max(1.0f, real_height / minimum_height); From 392a029ef4d162eb14bc3f32f86e422d9bf5d232 Mon Sep 17 00:00:00 2001 From: arades79 Date: Sat, 11 Feb 2023 13:57:59 -0500 Subject: [PATCH 0058/1181] don't use static inside constexpr function Signed-off-by: arades79 --- src/common/fixed_point.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/fixed_point.h b/src/common/fixed_point.h index 29b80c328..f899b0d54 100644 --- a/src/common/fixed_point.h +++ b/src/common/fixed_point.h @@ -107,7 +107,7 @@ constexpr FixedPoint divide( using next_type = typename FixedPoint::next_type; using base_type = typename FixedPoint::base_type; - constexpr static size_t fractional_bits = FixedPoint::fractional_bits; + constexpr size_t fractional_bits = FixedPoint::fractional_bits; next_type t(numerator.to_raw()); t <<= fractional_bits; @@ -127,7 +127,7 @@ constexpr FixedPoint divide( using unsigned_type = typename FixedPoint::unsigned_type; - constexpr static int bits = FixedPoint::total_bits; + constexpr int bits = FixedPoint::total_bits; if (denominator == 0) { throw divide_by_zero(); @@ -198,7 +198,7 @@ constexpr FixedPoint multiply( using next_type = typename FixedPoint::next_type; using base_type = typename FixedPoint::base_type; - constexpr static size_t fractional_bits = FixedPoint::fractional_bits; + constexpr size_t fractional_bits = FixedPoint::fractional_bits; next_type t(static_cast(lhs.to_raw()) * static_cast(rhs.to_raw())); t >>= fractional_bits; @@ -216,9 +216,9 @@ constexpr FixedPoint multiply( using base_type = typename FixedPoint::base_type; - constexpr static size_t fractional_bits = FixedPoint::fractional_bits; - constexpr static base_type integer_mask = FixedPoint::integer_mask; - constexpr static base_type fractional_mask = FixedPoint::fractional_mask; + constexpr size_t fractional_bits = FixedPoint::fractional_bits; + constexpr base_type integer_mask = FixedPoint::integer_mask; + constexpr base_type fractional_mask = FixedPoint::fractional_mask; // more costly but doesn't need a larger type const base_type a_hi = (lhs.to_raw() & integer_mask) >> fractional_bits; From 26e44a3be4d5d7299c5b38e5d521957fd856e134 Mon Sep 17 00:00:00 2001 From: arades79 Date: Sat, 11 Feb 2023 14:27:14 -0500 Subject: [PATCH 0059/1181] apply clang-format Signed-off-by: arades79 --- src/core/hle/kernel/kernel.cpp | 3 ++- src/core/hle/service/hid/controllers/npad.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 563e2681b..e9270c6f3 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -492,7 +492,8 @@ struct KernelCore::Impl { constexpr static size_t CodeRegionAlign = PageSize; constexpr static VAddr code_region_start = Common::AlignDown(code_start_virt_addr, CodeRegionAlign); - constexpr static VAddr code_region_end = Common::AlignUp(code_end_virt_addr, CodeRegionAlign); + constexpr static VAddr code_region_end = + Common::AlignUp(code_end_virt_addr, CodeRegionAlign); constexpr static size_t code_region_size = code_region_end - code_region_start; ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert( code_region_start, code_region_size, KMemoryRegionType_KernelCode)); diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index f4485141c..d5dcd5567 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -439,9 +439,9 @@ void Controller_NPad::RequestPadStateUpdate(Core::HID::NpadIdType npad_id) { using btn = Core::HID::NpadButton; pad_entry.npad_buttons.raw = btn::None; if (controller_type != Core::HID::NpadStyleIndex::JoyconLeft) { - constexpr static btn right_button_mask = btn::A | btn::B | btn::X | btn::Y | btn::StickR | btn::R | - btn::ZR | btn::Plus | btn::StickRLeft | btn::StickRUp | - btn::StickRRight | btn::StickRDown; + constexpr static btn right_button_mask = btn::A | btn::B | btn::X | btn::Y | btn::StickR | + btn::R | btn::ZR | btn::Plus | btn::StickRLeft | + btn::StickRUp | btn::StickRRight | btn::StickRDown; pad_entry.npad_buttons.raw = button_state.raw & right_button_mask; pad_entry.r_stick = stick_state.right; } From 683019878fc939b418a65e1c5d84b066596d7655 Mon Sep 17 00:00:00 2001 From: arades79 Date: Tue, 14 Feb 2023 11:13:47 -0500 Subject: [PATCH 0060/1181] remove static from pointer sized or smaller types for aesthetics, change constexpr static to static constexpr for consistency Signed-off-by: arades79 --- .../renderer/adsp/audio_renderer.cpp | 4 +- .../renderer/command/data_source/decode.cpp | 8 +- .../renderer/command/effect/biquad_filter.cpp | 8 +- .../renderer/command/effect/i3dl2_reverb.cpp | 8 +- .../renderer/command/effect/light_limiter.cpp | 4 +- .../renderer/command/effect/reverb.cpp | 8 +- .../renderer/command/resample/upsample.cpp | 12 +-- .../renderer/command/sink/circular_buffer.cpp | 4 +- .../renderer/command/sink/device.cpp | 4 +- src/audio_core/renderer/system_manager.cpp | 2 +- src/audio_core/renderer/voice/voice_info.cpp | 4 +- src/audio_core/sink/sink_stream.cpp | 12 +-- src/common/hex_util.h | 2 +- src/common/tiny_mt.h | 8 +- src/core/core.cpp | 2 +- src/core/core_timing.cpp | 2 +- src/core/file_sys/ips_layer.cpp | 8 +- src/core/file_sys/program_metadata.cpp | 2 +- src/core/file_sys/registered_cache.cpp | 2 +- src/core/hid/emulated_devices.cpp | 2 +- .../board/nintendo/nx/k_system_control.cpp | 4 +- src/core/hle/kernel/init/init_slab_setup.cpp | 4 +- src/core/hle/kernel/k_capabilities.cpp | 6 +- src/core/hle/kernel/k_memory_manager.h | 6 +- src/core/hle/kernel/k_page_heap.cpp | 2 +- src/core/hle/kernel/k_page_table.cpp | 4 +- src/core/hle/kernel/kernel.cpp | 43 ++++---- src/core/hle/kernel/process_capability.cpp | 2 +- src/core/hle/kernel/svc/svc_activity.cpp | 2 +- src/core/hle/kernel/svc/svc_info.cpp | 2 +- src/core/hle/kernel/svc/svc_memory.cpp | 2 +- src/core/hle/service/acc/acc.cpp | 2 +- src/core/hle/service/am/am.cpp | 6 +- .../am/applets/applet_software_keyboard.cpp | 8 +- src/core/hle/service/apm/apm_controller.cpp | 2 +- src/core/hle/service/audio/audctl.cpp | 4 +- src/core/hle/service/audio/hwopus.cpp | 2 +- src/core/hle/service/caps/caps_u.cpp | 4 +- src/core/hle/service/filesystem/fsp_srv.cpp | 2 +- src/core/hle/service/hid/controllers/npad.cpp | 10 +- src/core/hle/service/mii/mii_manager.cpp | 2 +- src/core/hle/service/nfp/amiibo_crypto.cpp | 12 +-- src/core/hle/service/nifm/nifm.cpp | 2 +- .../service/nvdrv/core/syncpoint_manager.cpp | 4 +- .../service/nvdrv/core/syncpoint_manager.h | 2 +- .../nvflinger/buffer_queue_consumer.cpp | 2 +- src/core/hle/service/olsc/olsc.cpp | 2 +- src/core/hle/service/prepo/prepo.cpp | 4 +- src/core/hle/service/sockets/sfdnsres.cpp | 4 +- src/core/hle/service/ssl/ssl.cpp | 4 +- .../hle/service/time/time_zone_manager.cpp | 8 +- src/core/hle/service/vi/vi.cpp | 8 +- src/core/perf_stats.cpp | 2 +- src/core/telemetry_session.cpp | 4 +- src/input_common/drivers/gc_adapter.cpp | 8 +- src/input_common/drivers/joycon.cpp | 4 +- src/input_common/drivers/mouse.cpp | 2 +- src/input_common/drivers/sdl_driver.cpp | 8 +- src/input_common/drivers/udp_client.cpp | 2 +- src/input_common/helpers/joycon_driver.cpp | 4 +- .../helpers/joycon_protocol/calibration.cpp | 12 +-- .../joycon_protocol/common_protocol.cpp | 14 +-- .../helpers/joycon_protocol/irs.cpp | 6 +- .../helpers/joycon_protocol/nfc.cpp | 8 +- .../helpers/joycon_protocol/ringcon.cpp | 2 +- .../backend/glsl/emit_glsl_integer.cpp | 2 +- .../backend/spirv/emit_spirv_integer.cpp | 2 +- ...oating_point_conversion_floating_point.cpp | 2 +- .../floating_point_conversion_integer.cpp | 4 +- .../impl/integer_add_three_input.cpp | 2 +- src/tests/common/fibers.cpp | 2 +- .../calibration_configuration_job.cpp | 4 +- src/video_core/buffer_cache/buffer_cache.h | 8 +- src/video_core/dma_pusher.cpp | 2 +- src/video_core/engines/fermi_2d.cpp | 2 +- src/video_core/engines/maxwell_3d.cpp | 2 +- .../engines/sw_blitter/converter.cpp | 10 +- src/video_core/gpu.cpp | 4 +- src/video_core/host1x/codecs/vp9.cpp | 4 +- src/video_core/memory_manager.h | 2 +- src/video_core/query_cache.h | 2 +- .../renderer_opengl/gl_compute_pipeline.cpp | 3 +- src/video_core/renderer_opengl/gl_device.cpp | 4 +- .../renderer_opengl/gl_graphics_pipeline.cpp | 3 +- .../renderer_opengl/renderer_opengl.cpp | 4 +- src/video_core/renderer_vulkan/blit_image.cpp | 5 +- .../renderer_vulkan/vk_blit_screen.cpp | 4 +- .../renderer_vulkan/vk_compute_pipeline.cpp | 3 +- .../renderer_vulkan/vk_graphics_pipeline.cpp | 3 +- .../renderer_vulkan/vk_rasterizer.cpp | 6 +- src/video_core/renderer_vulkan/vk_smaa.cpp | 37 ++++--- .../vk_staging_buffer_pool.cpp | 2 +- .../renderer_vulkan/vk_swapchain.cpp | 2 +- .../renderer_vulkan/vk_texture_cache.h | 2 +- .../renderer_vulkan/vk_turbo_mode.cpp | 4 +- src/video_core/surface.cpp | 2 +- src/video_core/textures/decoders.cpp | 2 +- .../vulkan_common/vulkan_wrapper.cpp | 4 +- src/yuzu/bootmanager.cpp | 2 +- .../configure_input_player_widget.cpp | 98 +++++++++---------- src/yuzu/game_list.cpp | 4 +- src/yuzu/main.cpp | 6 +- 102 files changed, 300 insertions(+), 307 deletions(-) diff --git a/src/audio_core/renderer/adsp/audio_renderer.cpp b/src/audio_core/renderer/adsp/audio_renderer.cpp index 5bafd4c06..78c15629b 100644 --- a/src/audio_core/renderer/adsp/audio_renderer.cpp +++ b/src/audio_core/renderer/adsp/audio_renderer.cpp @@ -132,7 +132,7 @@ void AudioRenderer::CreateSinkStreams() { } void AudioRenderer::ThreadFunc() { - constexpr static char name[]{"AudioRenderer"}; + static constexpr char name[]{"AudioRenderer"}; MicroProfileOnThreadCreate(name); Common::SetCurrentThreadName(name); Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical); @@ -144,7 +144,7 @@ void AudioRenderer::ThreadFunc() { mailbox->ADSPSendMessage(RenderMessage::AudioRenderer_InitializeOK); - constexpr static u64 max_process_time{2'304'000ULL}; + constexpr u64 max_process_time{2'304'000ULL}; while (true) { auto message{mailbox->ADSPWaitMessage()}; diff --git a/src/audio_core/renderer/command/data_source/decode.cpp b/src/audio_core/renderer/command/data_source/decode.cpp index 68a0aa15d..ff5d31bd6 100644 --- a/src/audio_core/renderer/command/data_source/decode.cpp +++ b/src/audio_core/renderer/command/data_source/decode.cpp @@ -27,8 +27,8 @@ constexpr std::array PitchBySrcQuality = {4, 8, 4}; template static u32 DecodePcm(Core::Memory::Memory& memory, std::span out_buffer, const DecodeArg& req) { - constexpr static s32 min{std::numeric_limits::min()}; - constexpr static s32 max{std::numeric_limits::max()}; + constexpr s32 min{std::numeric_limits::min()}; + constexpr s32 max{std::numeric_limits::max()}; if (req.buffer == 0 || req.buffer_size == 0) { return 0; @@ -101,8 +101,8 @@ static u32 DecodePcm(Core::Memory::Memory& memory, std::span out_buffer, */ static u32 DecodeAdpcm(Core::Memory::Memory& memory, std::span out_buffer, const DecodeArg& req) { - constexpr static u32 SamplesPerFrame{14}; - constexpr static u32 NibblesPerFrame{16}; + constexpr u32 SamplesPerFrame{14}; + constexpr u32 NibblesPerFrame{16}; if (req.buffer == 0 || req.buffer_size == 0) { return 0; diff --git a/src/audio_core/renderer/command/effect/biquad_filter.cpp b/src/audio_core/renderer/command/effect/biquad_filter.cpp index 84fb6ae7a..dea6423dc 100644 --- a/src/audio_core/renderer/command/effect/biquad_filter.cpp +++ b/src/audio_core/renderer/command/effect/biquad_filter.cpp @@ -20,8 +20,8 @@ namespace AudioCore::AudioRenderer { void ApplyBiquadFilterFloat(std::span output, std::span input, std::array& b_, std::array& a_, VoiceState::BiquadFilterState& state, const u32 sample_count) { - constexpr static f64 min{std::numeric_limits::min()}; - constexpr static f64 max{std::numeric_limits::max()}; + constexpr f64 min{std::numeric_limits::min()}; + constexpr f64 max{std::numeric_limits::max()}; std::array b{Common::FixedPoint<50, 14>::from_base(b_[0]).to_double(), Common::FixedPoint<50, 14>::from_base(b_[1]).to_double(), Common::FixedPoint<50, 14>::from_base(b_[2]).to_double()}; @@ -61,8 +61,8 @@ void ApplyBiquadFilterFloat(std::span output, std::span input, static void ApplyBiquadFilterInt(std::span output, std::span input, std::array& b, std::array& a, VoiceState::BiquadFilterState& state, const u32 sample_count) { - constexpr static s64 min{std::numeric_limits::min()}; - constexpr static s64 max{std::numeric_limits::max()}; + constexpr s64 min{std::numeric_limits::min()}; + constexpr s64 max{std::numeric_limits::max()}; for (u32 i = 0; i < sample_count; i++) { const s64 in_sample{input[i]}; diff --git a/src/audio_core/renderer/command/effect/i3dl2_reverb.cpp b/src/audio_core/renderer/command/effect/i3dl2_reverb.cpp index 98217cd2d..27d8b9844 100644 --- a/src/audio_core/renderer/command/effect/i3dl2_reverb.cpp +++ b/src/audio_core/renderer/command/effect/i3dl2_reverb.cpp @@ -244,16 +244,16 @@ template static void ApplyI3dl2ReverbEffect(I3dl2ReverbInfo::State& state, std::span> inputs, std::span> outputs, const u32 sample_count) { - constexpr static std::array OutTapIndexes1Ch{ + static constexpr std::array OutTapIndexes1Ch{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - constexpr static std::array OutTapIndexes2Ch{ + static constexpr std::array OutTapIndexes2Ch{ 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, }; - constexpr static std::array OutTapIndexes4Ch{ + static constexpr std::array OutTapIndexes4Ch{ 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0, 3, 3, 3, }; - constexpr static std::array OutTapIndexes6Ch{ + static constexpr std::array OutTapIndexes6Ch{ 2, 0, 0, 1, 1, 1, 1, 4, 4, 4, 1, 1, 1, 0, 0, 0, 0, 5, 5, 5, }; diff --git a/src/audio_core/renderer/command/effect/light_limiter.cpp b/src/audio_core/renderer/command/effect/light_limiter.cpp index 410e5dac0..e8fb0e2fc 100644 --- a/src/audio_core/renderer/command/effect/light_limiter.cpp +++ b/src/audio_core/renderer/command/effect/light_limiter.cpp @@ -50,8 +50,8 @@ static void ApplyLightLimiterEffect(const LightLimiterInfo::ParameterVersion2& p std::vector>& inputs, std::vector>& outputs, const u32 sample_count, LightLimiterInfo::StatisticsInternal* statistics) { - constexpr static s64 min{std::numeric_limits::min()}; - constexpr static s64 max{std::numeric_limits::max()}; + constexpr s64 min{std::numeric_limits::min()}; + constexpr s64 max{std::numeric_limits::max()}; const auto recip_estimate = [](f64 a) -> f64 { s32 q, s; diff --git a/src/audio_core/renderer/command/effect/reverb.cpp b/src/audio_core/renderer/command/effect/reverb.cpp index ffe108268..6fe844ff0 100644 --- a/src/audio_core/renderer/command/effect/reverb.cpp +++ b/src/audio_core/renderer/command/effect/reverb.cpp @@ -252,16 +252,16 @@ template static void ApplyReverbEffect(const ReverbInfo::ParameterVersion2& params, ReverbInfo::State& state, std::vector>& inputs, std::vector>& outputs, const u32 sample_count) { - constexpr static std::array OutTapIndexes1Ch{ + static constexpr std::array OutTapIndexes1Ch{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - constexpr static std::array OutTapIndexes2Ch{ + static constexpr std::array OutTapIndexes2Ch{ 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, }; - constexpr static std::array OutTapIndexes4Ch{ + static constexpr std::array OutTapIndexes4Ch{ 0, 0, 1, 1, 0, 1, 2, 2, 3, 3, }; - constexpr static std::array OutTapIndexes6Ch{ + static constexpr std::array OutTapIndexes6Ch{ 0, 0, 1, 1, 2, 2, 4, 4, 5, 5, }; diff --git a/src/audio_core/renderer/command/resample/upsample.cpp b/src/audio_core/renderer/command/resample/upsample.cpp index 4bd604754..86ddee1a4 100644 --- a/src/audio_core/renderer/command/resample/upsample.cpp +++ b/src/audio_core/renderer/command/resample/upsample.cpp @@ -19,24 +19,24 @@ namespace AudioCore::AudioRenderer { static void SrcProcessFrame(std::span output, std::span input, const u32 target_sample_count, const u32 source_sample_count, UpsamplerState* state) { - constexpr static u32 WindowSize = 10; - constexpr static std::array, WindowSize> WindowedSinc1{ + static constexpr u32 WindowSize = 10; + static constexpr std::array, WindowSize> WindowedSinc1{ 0.95376587f, -0.12872314f, 0.060028076f, -0.032470703f, 0.017669678f, -0.009124756f, 0.004272461f, -0.001739502f, 0.000579834f, -0.000091552734f, }; - constexpr static std::array, WindowSize> WindowedSinc2{ + static constexpr std::array, WindowSize> WindowedSinc2{ 0.8230896f, -0.19161987f, 0.093444824f, -0.05090332f, 0.027557373f, -0.014038086f, 0.0064697266f, -0.002532959f, 0.00079345703f, -0.00012207031f, }; - constexpr static std::array, WindowSize> WindowedSinc3{ + static constexpr std::array, WindowSize> WindowedSinc3{ 0.6298828f, -0.19274902f, 0.09725952f, -0.05319214f, 0.028625488f, -0.014373779f, 0.006500244f, -0.0024719238f, 0.0007324219f, -0.000091552734f, }; - constexpr static std::array, WindowSize> WindowedSinc4{ + static constexpr std::array, WindowSize> WindowedSinc4{ 0.4057312f, -0.1468811f, 0.07601929f, -0.041656494f, 0.022216797f, -0.011016846f, 0.004852295f, -0.0017700195f, 0.00048828125f, -0.000030517578f, }; - constexpr static std::array, WindowSize> WindowedSinc5{ + static constexpr std::array, WindowSize> WindowedSinc5{ 0.1854248f, -0.075164795f, 0.03967285f, -0.021728516f, 0.011474609f, -0.005584717f, 0.0024108887f, -0.0008239746f, 0.00021362305f, 0.0f, }; diff --git a/src/audio_core/renderer/command/sink/circular_buffer.cpp b/src/audio_core/renderer/command/sink/circular_buffer.cpp index 1989873db..ded5afc94 100644 --- a/src/audio_core/renderer/command/sink/circular_buffer.cpp +++ b/src/audio_core/renderer/command/sink/circular_buffer.cpp @@ -21,8 +21,8 @@ void CircularBufferSinkCommand::Dump([[maybe_unused]] const ADSP::CommandListPro } void CircularBufferSinkCommand::Process(const ADSP::CommandListProcessor& processor) { - constexpr static s32 min{std::numeric_limits::min()}; - constexpr static s32 max{std::numeric_limits::max()}; + constexpr s32 min{std::numeric_limits::min()}; + constexpr s32 max{std::numeric_limits::max()}; std::vector output(processor.sample_count); for (u32 channel = 0; channel < input_count; channel++) { diff --git a/src/audio_core/renderer/command/sink/device.cpp b/src/audio_core/renderer/command/sink/device.cpp index 2f2e82ae2..e88372a75 100644 --- a/src/audio_core/renderer/command/sink/device.cpp +++ b/src/audio_core/renderer/command/sink/device.cpp @@ -20,8 +20,8 @@ void DeviceSinkCommand::Dump([[maybe_unused]] const ADSP::CommandListProcessor& } void DeviceSinkCommand::Process(const ADSP::CommandListProcessor& processor) { - constexpr static s32 min = std::numeric_limits::min(); - constexpr static s32 max = std::numeric_limits::max(); + constexpr s32 min = std::numeric_limits::min(); + constexpr s32 max = std::numeric_limits::max(); auto stream{processor.GetOutputSinkStream()}; stream->SetSystemChannels(input_count); diff --git a/src/audio_core/renderer/system_manager.cpp b/src/audio_core/renderer/system_manager.cpp index a8517014e..ce631f810 100644 --- a/src/audio_core/renderer/system_manager.cpp +++ b/src/audio_core/renderer/system_manager.cpp @@ -94,7 +94,7 @@ bool SystemManager::Remove(System& system_) { } void SystemManager::ThreadFunc() { - constexpr static char name[]{"AudioRenderSystemManager"}; + static constexpr char name[]{"AudioRenderSystemManager"}; MicroProfileOnThreadCreate(name); Common::SetCurrentThreadName(name); Common::SetCurrentThreadPriority(Common::ThreadPriority::High); diff --git a/src/audio_core/renderer/voice/voice_info.cpp b/src/audio_core/renderer/voice/voice_info.cpp index 2b3705647..1849eeb57 100644 --- a/src/audio_core/renderer/voice/voice_info.cpp +++ b/src/audio_core/renderer/voice/voice_info.cpp @@ -177,7 +177,7 @@ void VoiceInfo::UpdateWaveBuffer(std::span error_info, switch (sample_format_) { case SampleFormat::PcmInt16: { - constexpr static auto byte_size{GetSampleFormatByteSize(SampleFormat::PcmInt16)}; + constexpr auto byte_size{GetSampleFormatByteSize(SampleFormat::PcmInt16)}; if (wave_buffer_internal.start_offset * byte_size > wave_buffer_internal.size || wave_buffer_internal.end_offset * byte_size > wave_buffer_internal.size) { LOG_ERROR(Service_Audio, "Invalid PCM16 start/end wavebuffer sizes!"); @@ -188,7 +188,7 @@ void VoiceInfo::UpdateWaveBuffer(std::span error_info, } break; case SampleFormat::PcmFloat: { - constexpr static auto byte_size{GetSampleFormatByteSize(SampleFormat::PcmFloat)}; + constexpr auto byte_size{GetSampleFormatByteSize(SampleFormat::PcmFloat)}; if (wave_buffer_internal.start_offset * byte_size > wave_buffer_internal.size || wave_buffer_internal.end_offset * byte_size > wave_buffer_internal.size) { LOG_ERROR(Service_Audio, "Invalid PCMFloat start/end wavebuffer sizes!"); diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index fa3cee3ea..2fb5f9758 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -24,8 +24,8 @@ void SinkStream::AppendBuffer(SinkBuffer& buffer, std::vector& samples) { return; } - constexpr static s32 min{std::numeric_limits::min()}; - constexpr static s32 max{std::numeric_limits::max()}; + constexpr s32 min{std::numeric_limits::min()}; + constexpr s32 max{std::numeric_limits::max()}; auto yuzu_volume{Settings::Volume()}; if (yuzu_volume > 1.0f) { @@ -35,7 +35,7 @@ void SinkStream::AppendBuffer(SinkBuffer& buffer, std::vector& samples) { if (system_channels == 6 && device_channels == 2) { // We're given 6 channels, but our device only outputs 2, so downmix. - constexpr static std::array down_mix_coeff{1.0f, 0.707f, 0.251f, 0.707f}; + static constexpr std::array down_mix_coeff{1.0f, 0.707f, 0.251f, 0.707f}; for (u32 read_index = 0, write_index = 0; read_index < samples.size(); read_index += system_channels, write_index += device_channels) { @@ -106,8 +106,8 @@ void SinkStream::AppendBuffer(SinkBuffer& buffer, std::vector& samples) { } std::vector SinkStream::ReleaseBuffer(u64 num_samples) { - constexpr static s32 min = std::numeric_limits::min(); - constexpr static s32 max = std::numeric_limits::max(); + constexpr s32 min = std::numeric_limits::min(); + constexpr s32 max = std::numeric_limits::max(); auto samples{samples_buffer.Pop(num_samples)}; @@ -202,7 +202,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz // If we're paused or going to shut down, we don't want to consume buffers as coretiming is // paused and we'll desync, so just play silence. if (system.IsPaused() || system.IsShuttingDown()) { - constexpr static std::array silence{}; + static constexpr std::array silence{}; for (size_t i = frames_written; i < num_frames; i++) { std::memcpy(&output_buffer[i * frame_size], &silence[0], frame_size_bytes); } diff --git a/src/common/hex_util.h b/src/common/hex_util.h index 6b024588b..a00904939 100644 --- a/src/common/hex_util.h +++ b/src/common/hex_util.h @@ -47,7 +47,7 @@ template static_assert(std::is_same_v, "Underlying type within the contiguous container must be u8."); - constexpr static std::size_t pad_width = 2; + constexpr std::size_t pad_width = 2; std::string out; out.reserve(std::size(data) * pad_width); diff --git a/src/common/tiny_mt.h b/src/common/tiny_mt.h index 4689fd55b..5d5ebf158 100644 --- a/src/common/tiny_mt.h +++ b/src/common/tiny_mt.h @@ -223,7 +223,7 @@ public: float GenerateRandomF32() { // Floats have 24 bits of mantissa. - constexpr static u32 MantissaBits = 24; + constexpr u32 MantissaBits = 24; return static_cast(GenerateRandomU24()) * (1.0f / (1U << MantissaBits)); } @@ -234,9 +234,9 @@ public: // Nintendo does not. They use (32 - 5) = 27 bits from the first rnd32() // call, and (32 - 6) bits from the second. We'll do what they do, but // There's not a clear reason why. - constexpr static u32 MantissaBits = 53; - constexpr static u32 Shift1st = (64 - MantissaBits) / 2; - constexpr static u32 Shift2nd = (64 - MantissaBits) - Shift1st; + constexpr u32 MantissaBits = 53; + constexpr u32 Shift1st = (64 - MantissaBits) / 2; + constexpr u32 Shift2nd = (64 - MantissaBits) - Shift1st; const u32 first = (this->GenerateRandomU32() >> Shift1st); const u32 second = (this->GenerateRandomU32() >> Shift2nd); diff --git a/src/core/core.cpp b/src/core/core.cpp index 7ba13ab51..47292cd78 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -361,7 +361,7 @@ struct System::Impl { // Log last frame performance stats if game was loded if (perf_stats) { const auto perf_results = GetAndResetPerfStats(); - constexpr static auto performance = Common::Telemetry::FieldType::Performance; + constexpr auto performance = Common::Telemetry::FieldType::Performance; telemetry_session->AddField(performance, "Shutdown_EmulationSpeed", perf_results.emulation_speed * 100.0); diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 5214e88b8..3a63b52e3 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -45,7 +45,7 @@ CoreTiming::~CoreTiming() { } void CoreTiming::ThreadEntry(CoreTiming& instance) { - constexpr static char name[] = "HostTiming"; + static constexpr char name[] = "HostTiming"; MicroProfileOnThreadCreate(name); Common::SetCurrentThreadName(name); Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical); diff --git a/src/core/file_sys/ips_layer.cpp b/src/core/file_sys/ips_layer.cpp index 0a86e8b0a..efdf18cee 100644 --- a/src/core/file_sys/ips_layer.cpp +++ b/src/core/file_sys/ips_layer.cpp @@ -41,12 +41,12 @@ static IPSFileType IdentifyMagic(const std::vector& magic) { return IPSFileType::Error; } - constexpr static std::array patch_magic{{'P', 'A', 'T', 'C', 'H'}}; + static constexpr std::array patch_magic{{'P', 'A', 'T', 'C', 'H'}}; if (std::equal(magic.begin(), magic.end(), patch_magic.begin())) { return IPSFileType::IPS; } - constexpr static std::array ips32_magic{{'I', 'P', 'S', '3', '2'}}; + static constexpr std::array ips32_magic{{'I', 'P', 'S', '3', '2'}}; if (std::equal(magic.begin(), magic.end(), ips32_magic.begin())) { return IPSFileType::IPS32; } @@ -55,12 +55,12 @@ static IPSFileType IdentifyMagic(const std::vector& magic) { } static bool IsEOF(IPSFileType type, const std::vector& data) { - constexpr static std::array eof{{'E', 'O', 'F'}}; + static constexpr std::array eof{{'E', 'O', 'F'}}; if (type == IPSFileType::IPS && std::equal(data.begin(), data.end(), eof.begin())) { return true; } - constexpr static std::array eeof{{'E', 'E', 'O', 'F'}}; + static constexpr std::array eeof{{'E', 'E', 'O', 'F'}}; return type == IPSFileType::IPS32 && std::equal(data.begin(), data.end(), eeof.begin()); } diff --git a/src/core/file_sys/program_metadata.cpp b/src/core/file_sys/program_metadata.cpp index cb172f574..f00479bd3 100644 --- a/src/core/file_sys/program_metadata.cpp +++ b/src/core/file_sys/program_metadata.cpp @@ -97,7 +97,7 @@ Loader::ResultStatus ProgramMetadata::Load(VirtualFile file) { /*static*/ ProgramMetadata ProgramMetadata::GetDefault() { // Allow use of cores 0~3 and thread priorities 1~63. - constexpr static u32 default_thread_info_capability = 0x30007F7; + constexpr u32 default_thread_info_capability = 0x30007F7; ProgramMetadata result; diff --git a/src/core/file_sys/registered_cache.cpp b/src/core/file_sys/registered_cache.cpp index 0f1f76949..a6960170c 100644 --- a/src/core/file_sys/registered_cache.cpp +++ b/src/core/file_sys/registered_cache.cpp @@ -71,7 +71,7 @@ static std::string GetRelativePathFromNcaID(const std::array& nca_id, bo } static std::string GetCNMTName(TitleType type, u64 title_id) { - constexpr static std::array TITLE_TYPE_NAMES{ + static constexpr std::array TITLE_TYPE_NAMES{ "SystemProgram", "SystemData", "SystemUpdate", diff --git a/src/core/hid/emulated_devices.cpp b/src/core/hid/emulated_devices.cpp index e380da3a4..836f32c0f 100644 --- a/src/core/hid/emulated_devices.cpp +++ b/src/core/hid/emulated_devices.cpp @@ -213,7 +213,7 @@ void EmulatedDevices::SetKeyboardButton(const Common::Input::CallbackStatus& cal } void EmulatedDevices::UpdateKey(std::size_t key_index, bool status) { - constexpr static std::size_t KEYS_PER_BYTE = 8; + constexpr std::size_t KEYS_PER_BYTE = 8; auto& entry = device_status.keyboard_state.key[key_index / KEYS_PER_BYTE]; const u8 mask = static_cast(1 << (key_index % KEYS_PER_BYTE)); if (status) { diff --git a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp index 49098d2c9..c10b7bf30 100644 --- a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp +++ b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp @@ -114,13 +114,13 @@ size_t KSystemControl::Init::GetAppletPoolSize() { }(); // Return (possibly) adjusted size. - constexpr static size_t ExtraSystemMemoryForAtmosphere = 33_MiB; + constexpr size_t ExtraSystemMemoryForAtmosphere = 33_MiB; return base_pool_size - ExtraSystemMemoryForAtmosphere - KTraceBufferSize; } size_t KSystemControl::Init::GetMinimumNonSecureSystemPoolSize() { // Verify that our minimum is at least as large as Nintendo's. - constexpr static size_t MinimumSize = RequiredNonSecureSystemMemorySize; + constexpr size_t MinimumSize = RequiredNonSecureSystemMemorySize; static_assert(MinimumSize >= 0x29C8000); return MinimumSize; diff --git a/src/core/hle/kernel/init/init_slab_setup.cpp b/src/core/hle/kernel/init/init_slab_setup.cpp index 951326a85..571acf4b2 100644 --- a/src/core/hle/kernel/init/init_slab_setup.cpp +++ b/src/core/hle/kernel/init/init_slab_setup.cpp @@ -129,7 +129,7 @@ VAddr InitializeSlabHeap(Core::System& system, KMemoryLayout& memory_layout, VAd } size_t CalculateSlabHeapGapSize() { - constexpr static size_t KernelSlabHeapGapSize = 2_MiB - 320_KiB; + constexpr size_t KernelSlabHeapGapSize = 2_MiB - 320_KiB; static_assert(KernelSlabHeapGapSize <= KernelSlabHeapGapsSizeMax); return KernelSlabHeapGapSize; } @@ -272,7 +272,7 @@ void KPageBufferSlabHeap::Initialize(Core::System& system) { kernel.GetSystemResourceLimit()->Reserve(LimitableResource::PhysicalMemoryMax, slab_size)); // Allocate memory for the slab. - constexpr static auto AllocateOption = KMemoryManager::EncodeOption( + constexpr auto AllocateOption = KMemoryManager::EncodeOption( KMemoryManager::Pool::System, KMemoryManager::Direction::FromFront); const PAddr slab_address = kernel.MemoryManager().AllocateAndOpenContinuous(num_pages, 1, AllocateOption); diff --git a/src/core/hle/kernel/k_capabilities.cpp b/src/core/hle/kernel/k_capabilities.cpp index 374bc2c06..2907cc6e3 100644 --- a/src/core/hle/kernel/k_capabilities.cpp +++ b/src/core/hle/kernel/k_capabilities.cpp @@ -21,8 +21,8 @@ Result KCapabilities::InitializeForKIP(std::span kern_caps, KPageTabl m_program_type = 0; // Initial processes may run on all cores. - constexpr static u64 VirtMask = Core::Hardware::VirtualCoreMask; - constexpr static u64 PhysMask = Core::Hardware::ConvertVirtualCoreMaskToPhysical(VirtMask); + constexpr u64 VirtMask = Core::Hardware::VirtualCoreMask; + constexpr u64 PhysMask = Core::Hardware::ConvertVirtualCoreMaskToPhysical(VirtMask); m_core_mask = VirtMask; m_phys_core_mask = PhysMask; @@ -170,7 +170,7 @@ Result KCapabilities::MapIoPage_(const u32 cap, KPageTable* page_table) { template Result KCapabilities::ProcessMapRegionCapability(const u32 cap, F f) { // Define the allowed memory regions. - constexpr static std::array MemoryRegions{ + constexpr std::array MemoryRegions{ KMemoryRegionType_None, KMemoryRegionType_KernelTraceBuffer, KMemoryRegionType_OnMemoryBootImage, diff --git a/src/core/hle/kernel/k_memory_manager.h b/src/core/hle/kernel/k_memory_manager.h index d13549b5e..401d4e644 100644 --- a/src/core/hle/kernel/k_memory_manager.h +++ b/src/core/hle/kernel/k_memory_manager.h @@ -121,7 +121,7 @@ public: } size_t GetSize(Pool pool) { - constexpr static Direction GetSizeDirection = Direction::FromFront; + constexpr Direction GetSizeDirection = Direction::FromFront; size_t total = 0; for (auto* manager = this->GetFirstManager(pool, GetSizeDirection); manager != nullptr; manager = this->GetNextManager(manager, GetSizeDirection)) { @@ -142,7 +142,7 @@ public: size_t GetFreeSize(Pool pool) { KScopedLightLock lk(m_pool_locks[static_cast(pool)]); - constexpr static Direction GetSizeDirection = Direction::FromFront; + constexpr Direction GetSizeDirection = Direction::FromFront; size_t total = 0; for (auto* manager = this->GetFirstManager(pool, GetSizeDirection); manager != nullptr; manager = this->GetNextManager(manager, GetSizeDirection)) { @@ -154,7 +154,7 @@ public: void DumpFreeList(Pool pool) { KScopedLightLock lk(m_pool_locks[static_cast(pool)]); - constexpr static Direction DumpDirection = Direction::FromFront; + constexpr Direction DumpDirection = Direction::FromFront; for (auto* manager = this->GetFirstManager(pool, DumpDirection); manager != nullptr; manager = this->GetNextManager(manager, DumpDirection)) { manager->DumpFreeList(); diff --git a/src/core/hle/kernel/k_page_heap.cpp b/src/core/hle/kernel/k_page_heap.cpp index ffebf0a35..7b02c7d8b 100644 --- a/src/core/hle/kernel/k_page_heap.cpp +++ b/src/core/hle/kernel/k_page_heap.cpp @@ -68,7 +68,7 @@ PAddr KPageHeap::AllocateByRandom(s32 index, size_t num_pages, size_t align_page const size_t align_shift = std::countr_zero(align_size); // Decide on a block to allocate from. - constexpr static size_t MinimumPossibleAlignmentsForRandomAllocation = 4; + constexpr size_t MinimumPossibleAlignmentsForRandomAllocation = 4; { // By default, we'll want to look at all blocks larger than our current one. s32 max_blocks = static_cast(m_num_blocks); diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp index d3e0334ed..2e13d5d0d 100644 --- a/src/core/hle/kernel/k_page_table.cpp +++ b/src/core/hle/kernel/k_page_table.cpp @@ -134,7 +134,7 @@ Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type } // Set code regions and determine remaining - constexpr static size_t RegionAlignment{2_MiB}; + constexpr size_t RegionAlignment{2_MiB}; VAddr process_code_start{}; VAddr process_code_end{}; size_t stack_region_size{}; @@ -2624,7 +2624,7 @@ Result KPageTable::SetMemoryAttribute(VAddr addr, size_t size, u32 mask, u32 att KMemoryPermission old_perm; KMemoryAttribute old_attr; size_t num_allocator_blocks; - constexpr static auto AttributeTestMask = + constexpr auto AttributeTestMask = ~(KMemoryAttribute::SetMask | KMemoryAttribute::DeviceShared); R_TRY(this->CheckMemoryState( std::addressof(old_state), std::addressof(old_perm), std::addressof(old_attr), diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index e9270c6f3..5b72eaaa1 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -254,7 +254,7 @@ struct KernelCore::Impl { system_resource_limit->Reserve(LimitableResource::PhysicalMemoryMax, kernel_size); // Reserve secure applet memory, introduced in firmware 5.0.0 - constexpr static u64 secure_applet_memory_size{4_MiB}; + constexpr u64 secure_applet_memory_size{4_MiB}; ASSERT(system_resource_limit->Reserve(LimitableResource::PhysicalMemoryMax, secure_applet_memory_size)); } @@ -477,9 +477,9 @@ struct KernelCore::Impl { const VAddr code_end_virt_addr = KernelVirtualAddressCodeEnd; // Setup the containing kernel region. - constexpr static size_t KernelRegionSize = 1_GiB; - constexpr static size_t KernelRegionAlign = 1_GiB; - constexpr static VAddr kernel_region_start = + constexpr size_t KernelRegionSize = 1_GiB; + constexpr size_t KernelRegionAlign = 1_GiB; + constexpr VAddr kernel_region_start = Common::AlignDown(code_start_virt_addr, KernelRegionAlign); size_t kernel_region_size = KernelRegionSize; if (!(kernel_region_start + KernelRegionSize - 1 <= KernelVirtualAddressSpaceLast)) { @@ -489,12 +489,11 @@ struct KernelCore::Impl { kernel_region_start, kernel_region_size, KMemoryRegionType_Kernel)); // Setup the code region. - constexpr static size_t CodeRegionAlign = PageSize; - constexpr static VAddr code_region_start = + constexpr size_t CodeRegionAlign = PageSize; + constexpr VAddr code_region_start = Common::AlignDown(code_start_virt_addr, CodeRegionAlign); - constexpr static VAddr code_region_end = - Common::AlignUp(code_end_virt_addr, CodeRegionAlign); - constexpr static size_t code_region_size = code_region_end - code_region_start; + constexpr VAddr code_region_end = Common::AlignUp(code_end_virt_addr, CodeRegionAlign); + constexpr size_t code_region_size = code_region_end - code_region_start; ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert( code_region_start, code_region_size, KMemoryRegionType_KernelCode)); @@ -525,8 +524,8 @@ struct KernelCore::Impl { } // Decide on the actual size for the misc region. - constexpr static size_t MiscRegionAlign = KernelAslrAlignment; - constexpr static size_t MiscRegionMinimumSize = 32_MiB; + constexpr size_t MiscRegionAlign = KernelAslrAlignment; + constexpr size_t MiscRegionMinimumSize = 32_MiB; const size_t misc_region_size = Common::AlignUp( std::max(misc_region_needed_size, MiscRegionMinimumSize), MiscRegionAlign); ASSERT(misc_region_size > 0); @@ -542,8 +541,8 @@ struct KernelCore::Impl { const bool use_extra_resources = KSystemControl::Init::ShouldIncreaseThreadResourceLimit(); // Setup the stack region. - constexpr static size_t StackRegionSize = 14_MiB; - constexpr static size_t StackRegionAlign = KernelAslrAlignment; + constexpr size_t StackRegionSize = 14_MiB; + constexpr size_t StackRegionAlign = KernelAslrAlignment; const VAddr stack_region_start = memory_layout->GetVirtualMemoryRegionTree().GetRandomAlignedRegion( StackRegionSize, StackRegionAlign, KMemoryRegionType_Kernel); @@ -564,7 +563,7 @@ struct KernelCore::Impl { const PAddr code_end_phys_addr = code_start_phys_addr + code_region_size; const PAddr slab_start_phys_addr = code_end_phys_addr; const PAddr slab_end_phys_addr = slab_start_phys_addr + slab_region_size; - constexpr static size_t SlabRegionAlign = KernelAslrAlignment; + constexpr size_t SlabRegionAlign = KernelAslrAlignment; const size_t slab_region_needed_size = Common::AlignUp(code_end_phys_addr + slab_region_size, SlabRegionAlign) - Common::AlignDown(code_end_phys_addr, SlabRegionAlign); @@ -576,8 +575,8 @@ struct KernelCore::Impl { slab_region_start, slab_region_size, KMemoryRegionType_KernelSlab)); // Setup the temp region. - constexpr static size_t TempRegionSize = 128_MiB; - constexpr static size_t TempRegionAlign = KernelAslrAlignment; + constexpr size_t TempRegionSize = 128_MiB; + constexpr size_t TempRegionAlign = KernelAslrAlignment; const VAddr temp_region_start = memory_layout->GetVirtualMemoryRegionTree().GetRandomAlignedRegion( TempRegionSize, TempRegionAlign, KMemoryRegionType_Kernel); @@ -657,7 +656,7 @@ struct KernelCore::Impl { ASSERT(linear_extents.GetEndAddress() != 0); // Setup the linear mapping region. - constexpr static size_t LinearRegionAlign = 1_GiB; + constexpr size_t LinearRegionAlign = 1_GiB; const PAddr aligned_linear_phys_start = Common::AlignDown(linear_extents.GetAddress(), LinearRegionAlign); const size_t linear_region_size = @@ -738,11 +737,11 @@ struct KernelCore::Impl { void InitializeHackSharedMemory() { // Setup memory regions for emulated processes // TODO(bunnei): These should not be hardcoded regions initialized within the kernel - constexpr static std::size_t hid_size{0x40000}; - constexpr static std::size_t font_size{0x1100000}; - constexpr static std::size_t irs_size{0x8000}; - constexpr static std::size_t time_size{0x1000}; - constexpr static std::size_t hidbus_size{0x1000}; + constexpr std::size_t hid_size{0x40000}; + constexpr std::size_t font_size{0x1100000}; + constexpr std::size_t irs_size{0x8000}; + constexpr std::size_t time_size{0x1000}; + constexpr std::size_t hidbus_size{0x1000}; hid_shared_mem = KSharedMemory::Create(system.Kernel()); font_shared_mem = KSharedMemory::Create(system.Kernel()); diff --git a/src/core/hle/kernel/process_capability.cpp b/src/core/hle/kernel/process_capability.cpp index de322cbf9..773319ad8 100644 --- a/src/core/hle/kernel/process_capability.cpp +++ b/src/core/hle/kernel/process_capability.cpp @@ -306,7 +306,7 @@ Result ProcessCapabilities::HandleMapRegionFlags(u32 flags, KPageTable& page_tab } Result ProcessCapabilities::HandleInterruptFlags(u32 flags) { - constexpr static u32 interrupt_ignore_value = 0x3FF; + constexpr u32 interrupt_ignore_value = 0x3FF; const u32 interrupt0 = (flags >> 12) & 0x3FF; const u32 interrupt1 = (flags >> 22) & 0x3FF; diff --git a/src/core/hle/kernel/svc/svc_activity.cpp b/src/core/hle/kernel/svc/svc_activity.cpp index 0fd1b3d4c..baafefaeb 100644 --- a/src/core/hle/kernel/svc/svc_activity.cpp +++ b/src/core/hle/kernel/svc/svc_activity.cpp @@ -16,7 +16,7 @@ Result SetThreadActivity(Core::System& system, Handle thread_handle, thread_activity); // Validate the activity. - constexpr static auto IsValidThreadActivity = [](ThreadActivity activity) { + static constexpr auto IsValidThreadActivity = [](ThreadActivity activity) { return activity == ThreadActivity::Runnable || activity == ThreadActivity::Paused; }; R_UNLESS(IsValidThreadActivity(thread_activity), ResultInvalidEnumValue); diff --git a/src/core/hle/kernel/svc/svc_info.cpp b/src/core/hle/kernel/svc/svc_info.cpp index c30ba0295..ad56e2fe6 100644 --- a/src/core/hle/kernel/svc/svc_info.cpp +++ b/src/core/hle/kernel/svc/svc_info.cpp @@ -193,7 +193,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle return ResultSuccess; case InfoType::ThreadTickCount: { - constexpr static u64 num_cpus = 4; + constexpr u64 num_cpus = 4; if (info_sub_id != 0xFFFFFFFFFFFFFFFF && info_sub_id >= num_cpus) { LOG_ERROR(Kernel_SVC, "Core count is out of range, expected {} but got {}", num_cpus, info_sub_id); diff --git a/src/core/hle/kernel/svc/svc_memory.cpp b/src/core/hle/kernel/svc/svc_memory.cpp index 7045c5e69..21f818da6 100644 --- a/src/core/hle/kernel/svc/svc_memory.cpp +++ b/src/core/hle/kernel/svc/svc_memory.cpp @@ -132,7 +132,7 @@ Result SetMemoryAttribute(Core::System& system, VAddr address, u64 size, u32 mas R_UNLESS((address < address + size), ResultInvalidCurrentMemory); // Validate the attribute and mask. - constexpr static u32 SupportedMask = static_cast(MemoryAttribute::Uncached); + constexpr u32 SupportedMask = static_cast(MemoryAttribute::Uncached); R_UNLESS((mask | attr) == mask, ResultInvalidCombination); R_UNLESS((mask | attr | SupportedMask) == SupportedMask, ResultInvalidCombination); diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index 5b87bb18c..6d1084fd1 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -871,7 +871,7 @@ void Module::Interface::StoreSaveDataThumbnailApplication(Kernel::HLERequestCont // TODO(ogniK): Check if application ID is zero on acc initialize. As we don't have a reliable // way of confirming things like the TID, we're going to assume a non zero value for the time // being. - constexpr static u64 tid{1}; + constexpr u64 tid{1}; StoreSaveDataThumbnail(ctx, uuid, tid); } diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 01f03effe..8d5c8a3a3 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -1086,7 +1086,7 @@ private: // We require a non-zero handle to be valid. Using 0xdeadbeef allows us to trace if this is // actually used anywhere - constexpr static u64 handle = 0xdeadbeef; + constexpr u64 handle = 0xdeadbeef; IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); @@ -1570,7 +1570,7 @@ void IApplicationFunctions::GetDisplayVersion(Kernel::HLERequestContext& ctx) { const auto& version = res.first->GetVersionString(); std::copy(version.begin(), version.end(), version_string.begin()); } else { - constexpr static char default_version[]{"1.0.0"}; + static constexpr char default_version[]{"1.0.0"}; std::memcpy(version_string.data(), default_version, sizeof(default_version)); } @@ -1638,7 +1638,7 @@ void IApplicationFunctions::GetDesiredLanguage(Kernel::HLERequestContext& ctx) { void IApplicationFunctions::IsGamePlayRecordingSupported(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); - constexpr static bool gameplay_recording_supported = false; + constexpr bool gameplay_recording_supported = false; IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/am/applets/applet_software_keyboard.cpp b/src/core/hle/service/am/applets/applet_software_keyboard.cpp index 962371a99..c18236045 100644 --- a/src/core/hle/service/am/applets/applet_software_keyboard.cpp +++ b/src/core/hle/service/am/applets/applet_software_keyboard.cpp @@ -1180,7 +1180,7 @@ void SoftwareKeyboard::ReplyChangedStringV2() { .cursor_position{current_cursor_position}, }; - constexpr static u8 flag = 0; + constexpr u8 flag = 0; std::memcpy(reply.data() + REPLY_BASE_SIZE, current_text.data(), current_text.size() * sizeof(char16_t)); @@ -1204,7 +1204,7 @@ void SoftwareKeyboard::ReplyMovedCursorV2() { .cursor_position{current_cursor_position}, }; - constexpr static u8 flag = 0; + constexpr u8 flag = 0; std::memcpy(reply.data() + REPLY_BASE_SIZE, current_text.data(), current_text.size() * sizeof(char16_t)); @@ -1232,7 +1232,7 @@ void SoftwareKeyboard::ReplyChangedStringUtf8V2() { .cursor_position{current_cursor_position}, }; - constexpr static u8 flag = 0; + constexpr u8 flag = 0; std::memcpy(reply.data() + REPLY_BASE_SIZE, utf8_current_text.data(), utf8_current_text.size()); std::memcpy(reply.data() + REPLY_BASE_SIZE + REPLY_UTF8_SIZE, &changed_string_arg, @@ -1257,7 +1257,7 @@ void SoftwareKeyboard::ReplyMovedCursorUtf8V2() { .cursor_position{current_cursor_position}, }; - constexpr static u8 flag = 0; + constexpr u8 flag = 0; std::memcpy(reply.data() + REPLY_BASE_SIZE, utf8_current_text.data(), utf8_current_text.size()); std::memcpy(reply.data() + REPLY_BASE_SIZE + REPLY_UTF8_SIZE, &moved_cursor_arg, diff --git a/src/core/hle/service/apm/apm_controller.cpp b/src/core/hle/service/apm/apm_controller.cpp index 7236f586d..227fdd0cf 100644 --- a/src/core/hle/service/apm/apm_controller.cpp +++ b/src/core/hle/service/apm/apm_controller.cpp @@ -56,7 +56,7 @@ void Controller::SetPerformanceConfiguration(PerformanceMode mode, } void Controller::SetFromCpuBoostMode(CpuBoostMode mode) { - constexpr static std::array BOOST_MODE_TO_CONFIG_MAP{{ + static constexpr std::array BOOST_MODE_TO_CONFIG_MAP{{ PerformanceConfiguration::Config7, PerformanceConfiguration::Config13, PerformanceConfiguration::Config15, diff --git a/src/core/hle/service/audio/audctl.cpp b/src/core/hle/service/audio/audctl.cpp index 654d2c493..5abf22ba4 100644 --- a/src/core/hle/service/audio/audctl.cpp +++ b/src/core/hle/service/audio/audctl.cpp @@ -77,7 +77,7 @@ void AudCtl::GetTargetVolumeMin(Kernel::HLERequestContext& ctx) { // This service function is currently hardcoded on the // actual console to this value (as of 8.0.0). - constexpr static s32 target_min_volume = 0; + constexpr s32 target_min_volume = 0; IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); @@ -89,7 +89,7 @@ void AudCtl::GetTargetVolumeMax(Kernel::HLERequestContext& ctx) { // This service function is currently hardcoded on the // actual console to this value (as of 8.0.0). - constexpr static s32 target_max_volume = 15; + constexpr s32 target_max_volume = 15; IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/audio/hwopus.cpp b/src/core/hle/service/audio/hwopus.cpp index fe975157c..e01f87356 100644 --- a/src/core/hle/service/audio/hwopus.cpp +++ b/src/core/hle/service/audio/hwopus.cpp @@ -209,7 +209,7 @@ private: std::size_t WorkerBufferSize(u32 channel_count) { ASSERT_MSG(channel_count == 1 || channel_count == 2, "Invalid channel count"); - constexpr static int num_streams = 1; + constexpr int num_streams = 1; const int num_stereo_streams = channel_count == 2 ? 1 : 0; return opus_multistream_decoder_get_size(num_streams, num_stereo_streams); } diff --git a/src/core/hle/service/caps/caps_u.cpp b/src/core/hle/service/caps/caps_u.cpp index 1c2694645..5fbba8673 100644 --- a/src/core/hle/service/caps/caps_u.cpp +++ b/src/core/hle/service/caps/caps_u.cpp @@ -77,8 +77,8 @@ void CAPS_U::GetAlbumContentsFileListForApplication(Kernel::HLERequestContext& c // TODO: Update this when we implement the album. // Currently we do not have a method of accessing album entries, set this to 0 for now. - constexpr static u32 total_entries_1{}; - constexpr static u32 total_entries_2{}; + constexpr u32 total_entries_1{}; + constexpr u32 total_entries_2{}; LOG_WARNING( Service_Capture, diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index f95ad9253..447d624e1 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp_srv.cpp @@ -942,7 +942,7 @@ void FSP_SRV::ReadSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute( const auto parameters = rp.PopRaw(); // Stub this to None for now, backend needs an impl to read/write the SaveDataExtraData - constexpr static auto flags = static_cast(FileSys::SaveDataFlags::None); + constexpr auto flags = static_cast(FileSys::SaveDataFlags::None); LOG_WARNING(Service_FS, "(STUBBED) called, flags={}, space_id={}, attribute.title_id={:016X}\n" diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index d5dcd5567..ba6f04d8d 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -439,15 +439,15 @@ void Controller_NPad::RequestPadStateUpdate(Core::HID::NpadIdType npad_id) { using btn = Core::HID::NpadButton; pad_entry.npad_buttons.raw = btn::None; if (controller_type != Core::HID::NpadStyleIndex::JoyconLeft) { - constexpr static btn right_button_mask = btn::A | btn::B | btn::X | btn::Y | btn::StickR | - btn::R | btn::ZR | btn::Plus | btn::StickRLeft | - btn::StickRUp | btn::StickRRight | btn::StickRDown; + constexpr btn right_button_mask = btn::A | btn::B | btn::X | btn::Y | btn::StickR | btn::R | + btn::ZR | btn::Plus | btn::StickRLeft | btn::StickRUp | + btn::StickRRight | btn::StickRDown; pad_entry.npad_buttons.raw = button_state.raw & right_button_mask; pad_entry.r_stick = stick_state.right; } if (controller_type != Core::HID::NpadStyleIndex::JoyconRight) { - constexpr static btn left_button_mask = + constexpr btn left_button_mask = btn::Left | btn::Up | btn::Right | btn::Down | btn::StickL | btn::L | btn::ZL | btn::Minus | btn::StickLLeft | btn::StickLUp | btn::StickLRight | btn::StickLDown; pad_entry.npad_buttons.raw |= button_state.raw & left_button_mask; @@ -759,7 +759,7 @@ Core::HID::NpadStyleTag Controller_NPad::GetSupportedStyleSet() const { } Result Controller_NPad::SetSupportedNpadIdTypes(std::span data) { - constexpr static std::size_t max_number_npad_ids = 0xa; + constexpr std::size_t max_number_npad_ids = 0xa; const auto length = data.size(); ASSERT(length > 0 && (length % sizeof(u32)) == 0); const std::size_t elements = length / sizeof(u32); diff --git a/src/core/hle/service/mii/mii_manager.cpp b/src/core/hle/service/mii/mii_manager.cpp index a1b187b63..3a2fe938f 100644 --- a/src/core/hle/service/mii/mii_manager.cpp +++ b/src/core/hle/service/mii/mii_manager.cpp @@ -670,7 +670,7 @@ ResultVal> MiiManager::GetDefault(SourceFlag source_ } Result MiiManager::GetIndex([[maybe_unused]] const CharInfo& info, u32& index) { - constexpr static u32 INVALID_INDEX{0xFFFFFFFF}; + constexpr u32 INVALID_INDEX{0xFFFFFFFF}; index = INVALID_INDEX; diff --git a/src/core/hle/service/nfp/amiibo_crypto.cpp b/src/core/hle/service/nfp/amiibo_crypto.cpp index 0d9c3d0f6..ffb2f959c 100644 --- a/src/core/hle/service/nfp/amiibo_crypto.cpp +++ b/src/core/hle/service/nfp/amiibo_crypto.cpp @@ -35,7 +35,7 @@ bool IsAmiiboValid(const EncryptedNTAG215File& ntag_file) { LOG_DEBUG(Service_NFP, "tag_CFG1=0x{0:x}", ntag_file.CFG1); // Validate UUID - constexpr static u8 CT = 0x88; // As defined in `ISO / IEC 14443 - 3` + constexpr u8 CT = 0x88; // As defined in `ISO / IEC 14443 - 3` if ((CT ^ ntag_file.uuid.uid[0] ^ ntag_file.uuid.uid[1] ^ ntag_file.uuid.uid[2]) != ntag_file.uuid.uid[3]) { return false; @@ -247,7 +247,7 @@ void Cipher(const DerivedKeys& keys, const NTAG215File& in_data, NTAG215File& ou mbedtls_aes_setkey_enc(&aes, keys.aes_key.data(), aes_key_size); memcpy(nonce_counter.data(), keys.aes_iv.data(), sizeof(keys.aes_iv)); - constexpr static std::size_t encrypted_data_size = HMAC_TAG_START - SETTINGS_START; + constexpr std::size_t encrypted_data_size = HMAC_TAG_START - SETTINGS_START; mbedtls_aes_crypt_ctr(&aes, encrypted_data_size, &nc_off, nonce_counter.data(), stream_block.data(), reinterpret_cast(&in_data.settings), @@ -317,13 +317,13 @@ bool DecodeAmiibo(const EncryptedNTAG215File& encrypted_tag_data, NTAG215File& t Cipher(data_keys, encoded_data, tag_data); // Regenerate tag HMAC. Note: order matters, data HMAC depends on tag HMAC! - constexpr static std::size_t input_length = DYNAMIC_LOCK_START - UUID_START; + constexpr std::size_t input_length = DYNAMIC_LOCK_START - UUID_START; mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tag_keys.hmac_key.data(), sizeof(HmacKey), reinterpret_cast(&tag_data.uid), input_length, reinterpret_cast(&tag_data.hmac_tag)); // Regenerate data HMAC - constexpr static std::size_t input_length2 = DYNAMIC_LOCK_START - WRITE_COUNTER_START; + constexpr std::size_t input_length2 = DYNAMIC_LOCK_START - WRITE_COUNTER_START; mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), data_keys.hmac_key.data(), sizeof(HmacKey), reinterpret_cast(&tag_data.write_counter), input_length2, @@ -357,8 +357,8 @@ bool EncodeAmiibo(const NTAG215File& tag_data, EncryptedNTAG215File& encrypted_t NTAG215File encoded_tag_data{}; // Generate tag HMAC - constexpr static std::size_t input_length = DYNAMIC_LOCK_START - UUID_START; - constexpr static std::size_t input_length2 = HMAC_TAG_START - WRITE_COUNTER_START; + constexpr std::size_t input_length = DYNAMIC_LOCK_START - UUID_START; + constexpr std::size_t input_length2 = HMAC_TAG_START - WRITE_COUNTER_START; mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), tag_keys.hmac_key.data(), sizeof(HmacKey), reinterpret_cast(&tag_data.uid), input_length, reinterpret_cast(&encoded_tag_data.hmac_tag)); diff --git a/src/core/hle/service/nifm/nifm.cpp b/src/core/hle/service/nifm/nifm.cpp index df4f60d59..5d32adf64 100644 --- a/src/core/hle/service/nifm/nifm.cpp +++ b/src/core/hle/service/nifm/nifm.cpp @@ -512,7 +512,7 @@ void IGeneralService::GetInternetConnectionStatus(Kernel::HLERequestContext& ctx }; static_assert(sizeof(Output) == 0x3, "Output has incorrect size."); - constexpr static Output out{}; + constexpr Output out{}; IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp b/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp index 1f0e05df6..aba51d280 100644 --- a/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp +++ b/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp @@ -9,8 +9,8 @@ namespace Service::Nvidia::NvCore { SyncpointManager::SyncpointManager(Tegra::Host1x::Host1x& host1x_) : host1x{host1x_} { - constexpr static u32 VBlank0SyncpointId{26}; - constexpr static u32 VBlank1SyncpointId{27}; + constexpr u32 VBlank0SyncpointId{26}; + constexpr u32 VBlank1SyncpointId{27}; // Reserve both vblank syncpoints as client managed as they use Continuous Mode // Refer to section 14.3.5.3 of the TRM for more information on Continuous Mode diff --git a/src/core/hle/service/nvdrv/core/syncpoint_manager.h b/src/core/hle/service/nvdrv/core/syncpoint_manager.h index 4f2cefae5..7728ff596 100644 --- a/src/core/hle/service/nvdrv/core/syncpoint_manager.h +++ b/src/core/hle/service/nvdrv/core/syncpoint_manager.h @@ -124,7 +124,7 @@ private: //!< value }; - constexpr static std::size_t SyncpointCount{192}; + static constexpr std::size_t SyncpointCount{192}; std::array syncpoints{}; std::mutex reservation_lock; diff --git a/src/core/hle/service/nvflinger/buffer_queue_consumer.cpp b/src/core/hle/service/nvflinger/buffer_queue_consumer.cpp index 3f41aa0d9..0767e548d 100644 --- a/src/core/hle/service/nvflinger/buffer_queue_consumer.cpp +++ b/src/core/hle/service/nvflinger/buffer_queue_consumer.cpp @@ -45,7 +45,7 @@ Status BufferQueueConsumer::AcquireBuffer(BufferItem* out_buffer, // If expected_present is specified, we may not want to return a buffer yet. if (expected_present.count() != 0) { - constexpr static auto MAX_REASONABLE_NSEC = 1000000000LL; // 1 second + constexpr auto MAX_REASONABLE_NSEC = 1000000000LL; // 1 second // The expected_present argument indicates when the buffer is expected to be presented // on-screen. diff --git a/src/core/hle/service/olsc/olsc.cpp b/src/core/hle/service/olsc/olsc.cpp index fbae10e7d..530e1be3b 100644 --- a/src/core/hle/service/olsc/olsc.cpp +++ b/src/core/hle/service/olsc/olsc.cpp @@ -55,7 +55,7 @@ private: LOG_WARNING(Service_OLSC, "(STUBBED) called"); // backup_setting is set to 0 since real value is unknown - constexpr static u64 backup_setting = 0; + constexpr u64 backup_setting = 0; IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/prepo/prepo.cpp b/src/core/hle/service/prepo/prepo.cpp index 155d6a00b..01040b32a 100644 --- a/src/core/hle/service/prepo/prepo.cpp +++ b/src/core/hle/service/prepo/prepo.cpp @@ -116,7 +116,7 @@ private: void GetTransmissionStatus(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_PREPO, "(STUBBED) called"); - constexpr static s32 status = 0; + constexpr s32 status = 0; IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); @@ -126,7 +126,7 @@ private: void GetSystemSessionId(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_PREPO, "(STUBBED) called"); - constexpr static u64 system_session_id = 0; + constexpr u64 system_session_id = 0; IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); rb.Push(system_session_id); diff --git a/src/core/hle/service/sockets/sfdnsres.cpp b/src/core/hle/service/sockets/sfdnsres.cpp index 831a51a67..e96eda7f3 100644 --- a/src/core/hle/service/sockets/sfdnsres.cpp +++ b/src/core/hle/service/sockets/sfdnsres.cpp @@ -92,7 +92,7 @@ static std::vector SerializeAddrInfo(const addrinfo* addrinfo, s32 result_co static_assert(sizeof(SerializedResponseHeader) == 0x18, "Response header size must be 0x18 bytes"); - constexpr static auto header_size = sizeof(SerializedResponseHeader); + constexpr auto header_size = sizeof(SerializedResponseHeader); const auto addr_size = current->ai_addr && current->ai_addrlen > 0 ? current->ai_addrlen : 4; const auto canonname_size = current->ai_canonname ? strlen(current->ai_canonname) + 1 : 1; @@ -103,7 +103,7 @@ static std::vector SerializeAddrInfo(const addrinfo* addrinfo, s32 result_co // Header in network byte order SerializedResponseHeader header{}; - constexpr static auto HEADER_MAGIC = 0xBEEFCAFE; + constexpr auto HEADER_MAGIC = 0xBEEFCAFE; header.magic = htonl(HEADER_MAGIC); header.family = htonl(current->ai_family); header.flags = htonl(current->ai_flags); diff --git a/src/core/hle/service/ssl/ssl.cpp b/src/core/hle/service/ssl/ssl.cpp index ceb491224..dcf47083f 100644 --- a/src/core/hle/service/ssl/ssl.cpp +++ b/src/core/hle/service/ssl/ssl.cpp @@ -103,7 +103,7 @@ private: const auto certificate_format = rp.PopEnum(); [[maybe_unused]] const auto pkcs_12_certificates = ctx.ReadBuffer(0); - constexpr static u64 server_id = 0; + constexpr u64 server_id = 0; LOG_WARNING(Service_SSL, "(STUBBED) called, certificate_format={}", certificate_format); @@ -122,7 +122,7 @@ private: return std::span{}; }(); - constexpr static u64 client_id = 0; + constexpr u64 client_id = 0; LOG_WARNING(Service_SSL, "(STUBBED) called"); diff --git a/src/core/hle/service/time/time_zone_manager.cpp b/src/core/hle/service/time/time_zone_manager.cpp index 7b94b33f7..973f7837a 100644 --- a/src/core/hle/service/time/time_zone_manager.cpp +++ b/src/core/hle/service/time/time_zone_manager.cpp @@ -286,7 +286,7 @@ static constexpr int TransitionTime(int year, Rule rule, int offset) { } static bool ParsePosixName(const char* name, TimeZoneRule& rule) { - constexpr static char default_rule[]{",M4.1.0,M10.5.0"}; + static constexpr char default_rule[]{",M4.1.0,M10.5.0"}; const char* std_name{name}; int std_len{}; int offset{}; @@ -512,8 +512,8 @@ static bool ParseTimeZoneBinary(TimeZoneRule& time_zone_rule, FileSys::VirtualFi return {}; } - constexpr static s32 time_zone_max_leaps{50}; - constexpr static s32 time_zone_max_chars{50}; + constexpr s32 time_zone_max_leaps{50}; + constexpr s32 time_zone_max_chars{50}; if (!(0 <= header.leap_count && header.leap_count < time_zone_max_leaps && 0 < header.type_count && header.type_count < s32(time_zone_rule.ttis.size()) && 0 <= header.time_count && header.time_count < s32(time_zone_rule.ats.size()) && @@ -610,7 +610,7 @@ static bool ParseTimeZoneBinary(TimeZoneRule& time_zone_rule, FileSys::VirtualFi if (bytes_read < 0) { return {}; } - constexpr static s32 time_zone_name_max{255}; + constexpr s32 time_zone_name_max{255}; if (bytes_read > (time_zone_name_max + 1)) { return {}; } diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index 66c8fd38a..2fb631183 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -725,8 +725,8 @@ private: // TODO: Figure out what these are - constexpr static s64 unknown_result_1 = 0; - constexpr static s64 unknown_result_2 = 0; + constexpr s64 unknown_result_1 = 0; + constexpr s64 unknown_result_2 = 0; IPC::ResponseBuilder rb{ctx, 6}; rb.Push(unknown_result_1); @@ -740,8 +740,8 @@ private: const auto height = rp.Pop(); LOG_DEBUG(Service_VI, "called width={}, height={}", width, height); - constexpr static u64 base_size = 0x20000; - constexpr static u64 alignment = 0x1000; + constexpr u64 base_size = 0x20000; + constexpr u64 alignment = 0x1000; const auto texture_size = width * height * 4; const auto out_size = (texture_size + base_size - 1) / base_size * base_size; diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp index 9cf361986..f09c176f8 100644 --- a/src/core/perf_stats.cpp +++ b/src/core/perf_stats.cpp @@ -121,7 +121,7 @@ PerfStatsResults PerfStats::GetAndResetStats(microseconds current_system_time_us double PerfStats::GetLastFrameTimeScale() const { std::scoped_lock lock{object_mutex}; - constexpr static double FRAME_LENGTH = 1.0 / 60; + constexpr double FRAME_LENGTH = 1.0 / 60; return duration_cast(previous_frame_length).count() / FRAME_LENGTH; } diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp index 3bcdd9a99..9178b00ca 100644 --- a/src/core/telemetry_session.cpp +++ b/src/core/telemetry_session.cpp @@ -34,7 +34,7 @@ static u64 GenerateTelemetryId() { mbedtls_entropy_context entropy; mbedtls_entropy_init(&entropy); mbedtls_ctr_drbg_context ctr_drbg; - constexpr static std::array personalization{{"yuzu Telemetry ID"}}; + static constexpr std::array personalization{{"yuzu Telemetry ID"}}; mbedtls_ctr_drbg_init(&ctr_drbg); ASSERT(mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, @@ -225,7 +225,7 @@ void TelemetrySession::AddInitialInfo(Loader::AppLoader& app_loader, Telemetry::AppendOSInfo(field_collection); // Log user configuration information - constexpr static auto field_type = Telemetry::FieldType::UserConfig; + constexpr auto field_type = Telemetry::FieldType::UserConfig; AddField(field_type, "Audio_SinkId", Settings::values.sink_id.GetValue()); AddField(field_type, "Core_UseMultiCore", Settings::values.use_multi_core.GetValue()); AddField(field_type, "Renderer_Backend", diff --git a/src/input_common/drivers/gc_adapter.cpp b/src/input_common/drivers/gc_adapter.cpp index a4faab15e..d09ff178b 100644 --- a/src/input_common/drivers/gc_adapter.cpp +++ b/src/input_common/drivers/gc_adapter.cpp @@ -223,8 +223,8 @@ void GCAdapter::AdapterScanThread(std::stop_token stop_token) { } bool GCAdapter::Setup() { - constexpr static u16 nintendo_vid = 0x057e; - constexpr static u16 gc_adapter_pid = 0x0337; + constexpr u16 nintendo_vid = 0x057e; + constexpr u16 gc_adapter_pid = 0x0337; usb_adapter_handle = std::make_unique(libusb_ctx->get(), nintendo_vid, gc_adapter_pid); if (!usb_adapter_handle->get()) { @@ -346,7 +346,7 @@ void GCAdapter::UpdateVibrations() { // Use 8 states to keep the switching between on/off fast enough for // a human to feel different vibration strenght // More states == more rumble strengths == slower update time - constexpr static u8 vibration_states = 8; + constexpr u8 vibration_states = 8; vibration_counter = (vibration_counter + 1) % vibration_states; @@ -363,7 +363,7 @@ void GCAdapter::SendVibrations() { return; } s32 size{}; - constexpr static u8 rumble_command = 0x11; + constexpr u8 rumble_command = 0x11; const u8 p1 = pads[0].enable_vibration; const u8 p2 = pads[1].enable_vibration; const u8 p3 = pads[2].enable_vibration; diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp index a93bb5c25..b4cd39a20 100644 --- a/src/input_common/drivers/joycon.cpp +++ b/src/input_common/drivers/joycon.cpp @@ -77,7 +77,7 @@ void Joycons::Setup() { } void Joycons::ScanThread(std::stop_token stop_token) { - constexpr static u16 nintendo_vendor_id = 0x057e; + constexpr u16 nintendo_vendor_id = 0x057e; Common::SetCurrentThreadName("JoyconScanThread"); do { @@ -390,7 +390,7 @@ void Joycons::OnMotionUpdate(std::size_t port, Joycon::ControllerType type, int void Joycons::OnRingConUpdate(f32 ring_data) { // To simplify ring detection it will always be mapped to an empty identifier for all // controllers - constexpr static PadIdentifier identifier = { + static constexpr PadIdentifier identifier = { .guid = Common::UUID{}, .port = 0, .pad = 0, diff --git a/src/input_common/drivers/mouse.cpp b/src/input_common/drivers/mouse.cpp index dfa93d58a..faf9cbdc3 100644 --- a/src/input_common/drivers/mouse.cpp +++ b/src/input_common/drivers/mouse.cpp @@ -37,7 +37,7 @@ Mouse::Mouse(std::string input_engine_) : InputEngine(std::move(input_engine_)) void Mouse::UpdateThread(std::stop_token stop_token) { Common::SetCurrentThreadName("Mouse"); - constexpr static int update_time = 10; + constexpr int update_time = 10; while (!stop_token.stop_requested()) { if (Settings::values.mouse_panning && !Settings::values.mouse_enabled) { // Slow movement by 4% diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index 53ebae2d6..5c20b3426 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp @@ -63,7 +63,7 @@ public: } bool UpdateMotion(SDL_ControllerSensorEvent event) { - constexpr static float gravity_constant = 9.80665f; + constexpr float gravity_constant = 9.80665f; std::scoped_lock lock{mutex}; const u64 time_difference = event.timestamp - last_motion_update; last_motion_update = event.timestamp; @@ -109,7 +109,7 @@ public: } bool RumblePlay(const Common::Input::VibrationStatus vibration) { - constexpr static u32 rumble_max_duration_ms = 1000; + constexpr u32 rumble_max_duration_ms = 1000; if (sdl_controller) { return SDL_GameControllerRumble( sdl_controller.get(), static_cast(vibration.low_amplitude), @@ -616,7 +616,7 @@ bool SDLDriver::IsVibrationEnabled(const PadIdentifier& identifier) { const auto joystick = GetSDLJoystickByGUID(identifier.guid.RawString(), static_cast(identifier.port)); - constexpr static Common::Input::VibrationStatus test_vibration{ + static constexpr Common::Input::VibrationStatus test_vibration{ .low_amplitude = 1, .low_frequency = 160.0f, .high_amplitude = 1, @@ -624,7 +624,7 @@ bool SDLDriver::IsVibrationEnabled(const PadIdentifier& identifier) { .type = Common::Input::VibrationAmplificationType::Exponential, }; - constexpr static Common::Input::VibrationStatus zero_vibration{ + static constexpr Common::Input::VibrationStatus zero_vibration{ .low_amplitude = 0, .low_frequency = 160.0f, .high_amplitude = 0, diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp index ae49f0478..808b21069 100644 --- a/src/input_common/drivers/udp_client.cpp +++ b/src/input_common/drivers/udp_client.cpp @@ -599,7 +599,7 @@ CalibrationConfigurationJob::CalibrationConfigurationJob( Status current_status{Status::Initialized}; SocketCallback callback{[](Response::Version) {}, [](Response::PortInfo) {}, [&](Response::PadData data) { - constexpr static u16 CALIBRATION_THRESHOLD = 100; + constexpr u16 CALIBRATION_THRESHOLD = 100; if (current_status == Status::Initialized) { // Receiving data means the communication is ready now diff --git a/src/input_common/helpers/joycon_driver.cpp b/src/input_common/helpers/joycon_driver.cpp index 6ab16cde6..e65b6b845 100644 --- a/src/input_common/helpers/joycon_driver.cpp +++ b/src/input_common/helpers/joycon_driver.cpp @@ -129,7 +129,7 @@ void JoyconDriver::InputThread(std::stop_token stop_token) { input_thread_running = true; // Max update rate is 5ms, ensure we are always able to read a bit faster - constexpr static int ThreadDelay = 2; + constexpr int ThreadDelay = 2; std::vector buffer(MaxBufferSize); while (!stop_token.stop_requested()) { @@ -548,7 +548,7 @@ DriverResult JoyconDriver::GetDeviceType(SDL_hid_device_info* device_info, {0x2007, ControllerType::Right}, {0x2009, ControllerType::Pro}, }; - constexpr static u16 nintendo_vendor_id = 0x057e; + constexpr u16 nintendo_vendor_id = 0x057e; controller_type = ControllerType::None; if (device_info->vendor_id != nintendo_vendor_id) { diff --git a/src/input_common/helpers/joycon_protocol/calibration.cpp b/src/input_common/helpers/joycon_protocol/calibration.cpp index 69e3379cf..d8f040f75 100644 --- a/src/input_common/helpers/joycon_protocol/calibration.cpp +++ b/src/input_common/helpers/joycon_protocol/calibration.cpp @@ -129,7 +129,7 @@ DriverResult CalibrationProtocol::GetImuCalibration(MotionCalibration& calibrati DriverResult CalibrationProtocol::GetRingCalibration(RingCalibration& calibration, s16 current_value) { - constexpr static s16 DefaultRingRange{800}; + constexpr s16 DefaultRingRange{800}; // TODO: Get default calibration form ring itself if (ring_data_max == 0 && ring_data_min == 0) { @@ -168,8 +168,8 @@ u16 CalibrationProtocol::GetYAxisCalibrationValue(std::span block) const { } void CalibrationProtocol::ValidateCalibration(JoyStickCalibration& calibration) { - constexpr static u16 DefaultStickCenter{0x800}; - constexpr static u16 DefaultStickRange{0x6cc}; + constexpr u16 DefaultStickCenter{0x800}; + constexpr u16 DefaultStickRange{0x6cc}; calibration.x.center = ValidateValue(calibration.x.center, DefaultStickCenter); calibration.x.max = ValidateValue(calibration.x.max, DefaultStickRange); @@ -181,9 +181,9 @@ void CalibrationProtocol::ValidateCalibration(JoyStickCalibration& calibration) } void CalibrationProtocol::ValidateCalibration(MotionCalibration& calibration) { - constexpr static s16 DefaultAccelerometerScale{0x4000}; - constexpr static s16 DefaultGyroScale{0x3be7}; - constexpr static s16 DefaultOffset{0}; + constexpr s16 DefaultAccelerometerScale{0x4000}; + constexpr s16 DefaultGyroScale{0x3be7}; + constexpr s16 DefaultOffset{0}; for (auto& sensor : calibration.accelerometer) { sensor.scale = ValidateValue(sensor.scale, DefaultAccelerometerScale); diff --git a/src/input_common/helpers/joycon_protocol/common_protocol.cpp b/src/input_common/helpers/joycon_protocol/common_protocol.cpp index 95c3923b0..2b42a4555 100644 --- a/src/input_common/helpers/joycon_protocol/common_protocol.cpp +++ b/src/input_common/helpers/joycon_protocol/common_protocol.cpp @@ -72,8 +72,8 @@ DriverResult JoyconCommonProtocol::SendRawData(std::span buffer) { DriverResult JoyconCommonProtocol::GetSubCommandResponse(SubCommand sc, SubCommandResponse& output) { - constexpr static int timeout_mili = 66; - constexpr static int MaxTries = 15; + constexpr int timeout_mili = 66; + constexpr int MaxTries = 15; int tries = 0; do { @@ -157,8 +157,8 @@ DriverResult JoyconCommonProtocol::SendVibrationReport(std::span buffe } DriverResult JoyconCommonProtocol::ReadRawSPI(SpiAddress addr, std::span output) { - constexpr static std::size_t HeaderSize = 5; - constexpr static std::size_t MaxTries = 10; + constexpr std::size_t HeaderSize = 5; + constexpr std::size_t MaxTries = 10; std::size_t tries = 0; SubCommandResponse response{}; std::array buffer{}; @@ -216,8 +216,8 @@ DriverResult JoyconCommonProtocol::ConfigureMCU(const MCUConfig& config) { DriverResult JoyconCommonProtocol::GetMCUDataResponse(ReportMode report_mode, MCUCommandResponse& output) { - constexpr static int TimeoutMili = 200; - constexpr static int MaxTries = 9; + constexpr int TimeoutMili = 200; + constexpr int MaxTries = 9; int tries = 0; do { @@ -265,7 +265,7 @@ DriverResult JoyconCommonProtocol::SendMCUData(ReportMode report_mode, SubComman DriverResult JoyconCommonProtocol::WaitSetMCUMode(ReportMode report_mode, MCUMode mode) { MCUCommandResponse output{}; - constexpr static std::size_t MaxTries{8}; + constexpr std::size_t MaxTries{8}; std::size_t tries{}; do { diff --git a/src/input_common/helpers/joycon_protocol/irs.cpp b/src/input_common/helpers/joycon_protocol/irs.cpp index 5c07f698b..731fd5981 100644 --- a/src/input_common/helpers/joycon_protocol/irs.cpp +++ b/src/input_common/helpers/joycon_protocol/irs.cpp @@ -131,7 +131,7 @@ DriverResult IrsProtocol::RequestImage(std::span buffer) { DriverResult IrsProtocol::ConfigureIrs() { LOG_DEBUG(Input, "Configure IRS"); - constexpr static std::size_t max_tries = 28; + constexpr std::size_t max_tries = 28; SubCommandResponse output{}; std::size_t tries = 0; @@ -166,7 +166,7 @@ DriverResult IrsProtocol::ConfigureIrs() { DriverResult IrsProtocol::WriteRegistersStep1() { LOG_DEBUG(Input, "WriteRegistersStep1"); DriverResult result{DriverResult::Success}; - constexpr static std::size_t max_tries = 28; + constexpr std::size_t max_tries = 28; SubCommandResponse output{}; std::size_t tries = 0; @@ -226,7 +226,7 @@ DriverResult IrsProtocol::WriteRegistersStep1() { DriverResult IrsProtocol::WriteRegistersStep2() { LOG_DEBUG(Input, "WriteRegistersStep2"); - constexpr static std::size_t max_tries = 28; + constexpr std::size_t max_tries = 28; SubCommandResponse output{}; std::size_t tries = 0; diff --git a/src/input_common/helpers/joycon_protocol/nfc.cpp b/src/input_common/helpers/joycon_protocol/nfc.cpp index 6b8f38aec..eeba82986 100644 --- a/src/input_common/helpers/joycon_protocol/nfc.cpp +++ b/src/input_common/helpers/joycon_protocol/nfc.cpp @@ -109,7 +109,7 @@ bool NfcProtocol::HasAmiibo() { } DriverResult NfcProtocol::WaitUntilNfcIsReady() { - constexpr static std::size_t timeout_limit = 10; + constexpr std::size_t timeout_limit = 10; MCUCommandResponse output{}; std::size_t tries = 0; @@ -131,7 +131,7 @@ DriverResult NfcProtocol::WaitUntilNfcIsReady() { DriverResult NfcProtocol::StartPolling(TagFoundData& data) { LOG_DEBUG(Input, "Start Polling for tag"); - constexpr static std::size_t timeout_limit = 7; + constexpr std::size_t timeout_limit = 7; MCUCommandResponse output{}; std::size_t tries = 0; @@ -155,7 +155,7 @@ DriverResult NfcProtocol::StartPolling(TagFoundData& data) { } DriverResult NfcProtocol::ReadTag(const TagFoundData& data) { - constexpr static std::size_t timeout_limit = 10; + constexpr std::size_t timeout_limit = 10; MCUCommandResponse output{}; std::size_t tries = 0; @@ -224,7 +224,7 @@ DriverResult NfcProtocol::ReadTag(const TagFoundData& data) { } DriverResult NfcProtocol::GetAmiiboData(std::vector& ntag_data) { - constexpr static std::size_t timeout_limit = 10; + constexpr std::size_t timeout_limit = 10; MCUCommandResponse output{}; std::size_t tries = 0; diff --git a/src/input_common/helpers/joycon_protocol/ringcon.cpp b/src/input_common/helpers/joycon_protocol/ringcon.cpp index 9056e64dc..190cef812 100644 --- a/src/input_common/helpers/joycon_protocol/ringcon.cpp +++ b/src/input_common/helpers/joycon_protocol/ringcon.cpp @@ -69,7 +69,7 @@ DriverResult RingConProtocol::StartRingconPolling() { DriverResult RingConProtocol::IsRingConnected(bool& is_connected) { LOG_DEBUG(Input, "IsRingConnected"); - constexpr static std::size_t max_tries = 28; + constexpr std::size_t max_tries = 28; SubCommandResponse output{}; std::size_t tries = 0; is_connected = false; diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_integer.cpp b/src/shader_recompiler/backend/glsl/emit_glsl_integer.cpp index 06599c1b0..49397c9b2 100644 --- a/src/shader_recompiler/backend/glsl/emit_glsl_integer.cpp +++ b/src/shader_recompiler/backend/glsl/emit_glsl_integer.cpp @@ -39,7 +39,7 @@ void EmitIAdd32(EmitContext& ctx, IR::Inst& inst, std::string_view a, std::strin // which may be overwritten by the result of the addition if (IR::Inst * overflow{inst.GetAssociatedPseudoOperation(IR::Opcode::GetOverflowFromOp)}) { // https://stackoverflow.com/questions/55468823/how-to-detect-integer-overflow-in-c - constexpr static u32 s32_max{static_cast(std::numeric_limits::max())}; + constexpr u32 s32_max{static_cast(std::numeric_limits::max())}; const auto sub_a{fmt::format("{}u-{}", s32_max, a)}; const auto positive_result{fmt::format("int({})>int({})", b, sub_a)}; const auto negative_result{fmt::format("int({})GetAssociatedPseudoOperation(IR::Opcode::GetOverflowFromOp)}) { // https://stackoverflow.com/questions/55468823/how-to-detect-integer-overflow-in-c - constexpr static u32 s32_max{static_cast(std::numeric_limits::max())}; + constexpr u32 s32_max{static_cast(std::numeric_limits::max())}; const Id is_positive{ctx.OpSGreaterThanEqual(ctx.U1, a, ctx.u32_zero_value)}; const Id sub_a{ctx.OpISub(ctx.U32[1], ctx.Const(s32_max), a)}; diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_floating_point.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_floating_point.cpp index 15ad55a43..7f3dccc52 100644 --- a/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_floating_point.cpp +++ b/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_floating_point.cpp @@ -48,7 +48,7 @@ void F2F(TranslatorVisitor& v, u64 insn, const IR::F16F32F64& src_a, bool abs) { BitField<8, 2, FloatFormat> dst_size; [[nodiscard]] RoundingOp RoundingOperation() const { - constexpr static u64 rounding_mask = 0x0B; + constexpr u64 rounding_mask = 0x0B; return static_cast(rounding_op.Value() & rounding_mask); } } const f2f{insn}; diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_integer.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_integer.cpp index 429733187..85c18d942 100644 --- a/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_integer.cpp +++ b/src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_conversion_integer.cpp @@ -176,11 +176,11 @@ void TranslateF2I(TranslatorVisitor& v, u64 insn, const IR::F16F32F64& src_a) { (f2i.src_format == SrcFormat::F64) != (f2i.dest_format == DestFormat::I64); if (special_nan_cases) { if (f2i.dest_format == DestFormat::I32) { - constexpr static u32 nan_value = 0x8000'0000U; + constexpr u32 nan_value = 0x8000'0000U; handled_special_case = true; result = IR::U32{v.ir.Select(v.ir.FPIsNan(op_a), v.ir.Imm32(nan_value), result)}; } else if (f2i.dest_format == DestFormat::I64) { - constexpr static u64 nan_value = 0x8000'0000'0000'0000ULL; + constexpr u64 nan_value = 0x8000'0000'0000'0000ULL; handled_special_case = true; result = IR::U64{v.ir.Select(v.ir.FPIsNan(op_a), v.ir.Imm64(nan_value), result)}; } diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/integer_add_three_input.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/integer_add_three_input.cpp index 3c8ef62e2..3d9877359 100644 --- a/src/shader_recompiler/frontend/maxwell/translate/impl/integer_add_three_input.cpp +++ b/src/shader_recompiler/frontend/maxwell/translate/impl/integer_add_three_input.cpp @@ -19,7 +19,7 @@ enum class Half : u64 { }; [[nodiscard]] IR::U32 IntegerHalf(IR::IREmitter& ir, const IR::U32& value, Half half) { - constexpr static bool is_signed{false}; + constexpr bool is_signed{false}; switch (half) { case Half::All: return value; diff --git a/src/tests/common/fibers.cpp b/src/tests/common/fibers.cpp index c0b22d0ee..ecad7583f 100644 --- a/src/tests/common/fibers.cpp +++ b/src/tests/common/fibers.cpp @@ -76,7 +76,7 @@ void TestControl1::ExecuteThread(u32 id) { * doing all the work required. */ TEST_CASE("Fibers::Setup", "[common]") { - constexpr static std::size_t num_threads = 7; + constexpr std::size_t num_threads = 7; TestControl1 test_control{}; test_control.thread_fibers.resize(num_threads); test_control.work_fibers.resize(num_threads); diff --git a/src/tests/input_common/calibration_configuration_job.cpp b/src/tests/input_common/calibration_configuration_job.cpp index 8d3951ee6..516ff1b30 100644 --- a/src/tests/input_common/calibration_configuration_job.cpp +++ b/src/tests/input_common/calibration_configuration_job.cpp @@ -35,8 +35,8 @@ public: } void Run(const std::vector touch_movement_path) { - constexpr static size_t HeaderSize = sizeof(InputCommon::CemuhookUDP::Header); - constexpr static size_t PadDataSize = + constexpr size_t HeaderSize = sizeof(InputCommon::CemuhookUDP::Header); + constexpr size_t PadDataSize = sizeof(InputCommon::CemuhookUDP::Message); REQUIRE(touch_movement_path.size() > 0); diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index b650d0e59..627917ab6 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -890,8 +890,8 @@ void BufferCache

::CommitAsyncFlushesHigh() { buffer_id, }); // Align up to avoid cache conflicts - constexpr static u64 align = 8ULL; - constexpr static u64 mask = ~(align - 1ULL); + constexpr u64 align = 8ULL; + constexpr u64 mask = ~(align - 1ULL); total_size_bytes += (new_size + align - 1) & mask; largest_copy = std::max(largest_copy, new_size); }; @@ -1843,8 +1843,8 @@ void BufferCache

::DownloadBufferMemory(Buffer& buffer, VAddr cpu_addr, u64 si .size = new_size, }); // Align up to avoid cache conflicts - constexpr static u64 align = 256ULL; - constexpr static u64 mask = ~(align - 1ULL); + constexpr u64 align = 256ULL; + constexpr u64 mask = ~(align - 1ULL); total_size_bytes += (new_size + align - 1) & mask; largest_copy = std::max(largest_copy, new_size); }; diff --git a/src/video_core/dma_pusher.cpp b/src/video_core/dma_pusher.cpp index 72ad3ccc8..551929824 100644 --- a/src/video_core/dma_pusher.cpp +++ b/src/video_core/dma_pusher.cpp @@ -75,7 +75,7 @@ bool DmaPusher::Step() { // Push buffer non-empty, read a word command_headers.resize_destructive(command_list_header.size); - constexpr static u32 MacroRegistersStart = 0xE00; + constexpr u32 MacroRegistersStart = 0xE00; if (dma_state.method < MacroRegistersStart) { if (Settings::IsGPULevelHigh()) { memory_manager.ReadBlock(dma_state.dma_get, command_headers.data(), diff --git a/src/video_core/engines/fermi_2d.cpp b/src/video_core/engines/fermi_2d.cpp index 40176821b..a126c359c 100644 --- a/src/video_core/engines/fermi_2d.cpp +++ b/src/video_core/engines/fermi_2d.cpp @@ -72,7 +72,7 @@ void Fermi2D::Blit() { UNIMPLEMENTED_IF_MSG(regs.clip_enable != 0, "Clipped blit enabled"); const auto& args = regs.pixels_from_memory; - constexpr static s64 null_derivate = 1ULL << 32; + constexpr s64 null_derivate = 1ULL << 32; Surface src = regs.src; const auto bytes_per_pixel = BytesPerBlock(PixelFormatFromRenderTargetFormat(src.format)); const bool delegate_to_gpu = src.width > 512 && src.height > 512 && bytes_per_pixel <= 8 && diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index 3c1af92c4..7195f2bc1 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp @@ -258,7 +258,7 @@ u32 Maxwell3D::GetMaxCurrentVertices() { size_t Maxwell3D::EstimateIndexBufferSize() { GPUVAddr start_address = regs.index_buffer.StartAddress(); GPUVAddr end_address = regs.index_buffer.EndAddress(); - constexpr static std::array max_sizes = { + static constexpr std::array max_sizes = { std::numeric_limits::max(), std::numeric_limits::max(), std::numeric_limits::max(), std::numeric_limits::max()}; const size_t byte_size = regs.index_buffer.FormatSizeInBytes(); diff --git a/src/video_core/engines/sw_blitter/converter.cpp b/src/video_core/engines/sw_blitter/converter.cpp index 11674c748..2419b5632 100644 --- a/src/video_core/engines/sw_blitter/converter.cpp +++ b/src/video_core/engines/sw_blitter/converter.cpp @@ -694,16 +694,16 @@ private: }; const auto force_to_fp16 = [](f32 base_value) { u32 tmp = Common::BitCast(base_value); - constexpr static size_t fp32_mantissa_bits = 23; - constexpr static size_t fp16_mantissa_bits = 10; - constexpr static size_t mantissa_mask = + constexpr size_t fp32_mantissa_bits = 23; + constexpr size_t fp16_mantissa_bits = 10; + constexpr size_t mantissa_mask = ~((1ULL << (fp32_mantissa_bits - fp16_mantissa_bits)) - 1ULL); tmp = tmp & static_cast(mantissa_mask); // TODO: force the exponent within the range of half float. Not needed in UNORM / SNORM return Common::BitCast(tmp); }; const auto from_fp_n = [&sign_extend](u32 base_value, size_t bits, size_t mantissa) { - constexpr static size_t fp32_mantissa_bits = 23; + constexpr size_t fp32_mantissa_bits = 23; size_t shift_towards = fp32_mantissa_bits - mantissa; const u32 new_value = static_cast(sign_extend(base_value, bits) << shift_towards) & (~(1U << 31)); @@ -770,7 +770,7 @@ private: component_mask[which_component]; }; const auto to_fp_n = [](f32 base_value, size_t bits, size_t mantissa) { - constexpr static size_t fp32_mantissa_bits = 23; + constexpr size_t fp32_mantissa_bits = 23; u32 tmp_value = Common::BitCast(std::max(base_value, 0.0f)); size_t shift_towards = fp32_mantissa_bits - mantissa; return tmp_value >> shift_towards; diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index caf241eac..7024a19cf 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp @@ -194,8 +194,8 @@ struct GPU::Impl { [[nodiscard]] u64 GetTicks() const { // This values were reversed engineered by fincs from NVN // The gpu clock is reported in units of 385/625 nanoseconds - constexpr static u64 gpu_ticks_num = 384; - constexpr static u64 gpu_ticks_den = 625; + constexpr u64 gpu_ticks_num = 384; + constexpr u64 gpu_ticks_den = 625; u64 nanoseconds = system.CoreTiming().GetGlobalTimeNs().count(); if (Settings::values.use_fast_gpu_time.GetValue()) { diff --git a/src/video_core/host1x/codecs/vp9.cpp b/src/video_core/host1x/codecs/vp9.cpp index bb691f7d8..cf40c9012 100644 --- a/src/video_core/host1x/codecs/vp9.cpp +++ b/src/video_core/host1x/codecs/vp9.cpp @@ -283,7 +283,7 @@ void VP9::EncodeTermSubExp(VpxRangeEncoder& writer, s32 value) { } else { value -= 64; - constexpr static s32 size = 8; + constexpr s32 size = 8; const s32 mask = (1 << size) - 191; @@ -307,7 +307,7 @@ bool VP9::WriteLessThan(VpxRangeEncoder& writer, s32 value, s32 test) { void VP9::WriteCoefProbabilityUpdate(VpxRangeEncoder& writer, s32 tx_mode, const std::array& new_prob, const std::array& old_prob) { - constexpr static u32 block_bytes = 2 * 2 * 6 * 6 * 3; + constexpr u32 block_bytes = 2 * 2 * 6 * 6 * 3; const auto needs_update = [&](u32 base_index) { return !std::equal(new_prob.begin() + base_index, diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h index 9ebfb6179..cf56392ef 100644 --- a/src/video_core/memory_manager.h +++ b/src/video_core/memory_manager.h @@ -216,7 +216,7 @@ private: std::vector big_page_continous; std::vector> page_stash{}; - constexpr static size_t continous_bits = 64; + static constexpr size_t continous_bits = 64; const size_t unique_identifier; std::unique_ptr accumulator; diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.h index c9b482bbe..00ce53e3e 100644 --- a/src/video_core/query_cache.h +++ b/src/video_core/query_cache.h @@ -281,7 +281,7 @@ public: explicit HostCounterBase(std::shared_ptr dependency_) : dependency{std::move(dependency_)}, depth{dependency ? (dependency->Depth() + 1) : 0} { // Avoid nesting too many dependencies to avoid a stack overflow when these are deleted. - constexpr static u64 depth_threshold = 96; + constexpr u64 depth_threshold = 96; if (depth > depth_threshold) { depth = 0; base_result = dependency->Query(); diff --git a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp b/src/video_core/renderer_opengl/gl_compute_pipeline.cpp index e49b04975..1a0cea9b7 100644 --- a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp +++ b/src/video_core/renderer_opengl/gl_compute_pipeline.cpp @@ -162,8 +162,7 @@ void ComputePipeline::Configure() { buffer_cache.UnbindComputeTextureBuffers(); size_t texbuf_index{}; const auto add_buffer{[&](const auto& desc) { - constexpr static bool is_image = - std::is_same_v; + constexpr bool is_image = std::is_same_v; for (u32 i = 0; i < desc.count; ++i) { bool is_written{false}; if constexpr (is_image) { diff --git a/src/video_core/renderer_opengl/gl_device.cpp b/src/video_core/renderer_opengl/gl_device.cpp index a5e27de73..22ed16ebf 100644 --- a/src/video_core/renderer_opengl/gl_device.cpp +++ b/src/video_core/renderer_opengl/gl_device.cpp @@ -126,9 +126,9 @@ Device::Device(Core::Frontend::EmuWindow& emu_window) { const bool is_intel = vendor_name == "Intel"; #ifdef __unix__ - constexpr static bool is_linux = true; + constexpr bool is_linux = true; #else - constexpr static bool is_linux = false; + constexpr bool is_linux = false; #endif bool disable_fast_buffer_sub_data = false; diff --git a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp index c409d6ae7..29491e762 100644 --- a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp +++ b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp @@ -385,8 +385,7 @@ void GraphicsPipeline::ConfigureImpl(bool is_indexed) { const auto bind_stage_info{[&](size_t stage) LAMBDA_FORCEINLINE { size_t index{}; const auto add_buffer{[&](const auto& desc) { - constexpr static bool is_image = - std::is_same_v; + constexpr bool is_image = std::is_same_v; for (u32 i = 0; i < desc.count; ++i) { bool is_written{false}; if constexpr (is_image) { diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 5d25b8a7d..2a74c1d05 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -237,7 +237,7 @@ void RendererOpenGL::LoadFBToScreenInfo(const Tegra::FramebufferConfig& framebuf screen_info.display_texture = screen_info.texture.resource.handle; // TODO(Rodrigo): Read this from HLE - constexpr static u32 block_height_log2 = 4; + constexpr u32 block_height_log2 = 4; const auto pixel_format{ VideoCore::Surface::PixelFormatFromGPUPixelFormat(framebuffer.pixel_format)}; const u32 bytes_per_pixel{VideoCore::Surface::BytesPerBlock(pixel_format)}; @@ -375,7 +375,7 @@ void RendererOpenGL::AddTelemetryFields() { LOG_INFO(Render_OpenGL, "GL_VENDOR: {}", gpu_vendor); LOG_INFO(Render_OpenGL, "GL_RENDERER: {}", gpu_model); - constexpr static auto user_system = Common::Telemetry::FieldType::UserSystem; + constexpr auto user_system = Common::Telemetry::FieldType::UserSystem; telemetry_session.AddField(user_system, "GPU_Vendor", std::string(gpu_vendor)); telemetry_session.AddField(user_system, "GPU_Model", std::string(gpu_model)); telemetry_session.AddField(user_system, "GPU_OpenGL_Version", std::string(gl_version)); diff --git a/src/video_core/renderer_vulkan/blit_image.cpp b/src/video_core/renderer_vulkan/blit_image.cpp index 334087119..cf2964a3f 100644 --- a/src/video_core/renderer_vulkan/blit_image.cpp +++ b/src/video_core/renderer_vulkan/blit_image.cpp @@ -358,9 +358,8 @@ VkExtent2D GetConversionExtent(const ImageView& src_image_view) { void TransitionImageLayout(vk::CommandBuffer& cmdbuf, VkImage image, VkImageLayout target_layout, VkImageLayout source_layout = VK_IMAGE_LAYOUT_GENERAL) { - constexpr static VkFlags flags{VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | - VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | - VK_ACCESS_SHADER_READ_BIT}; + constexpr VkFlags flags{VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | + VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_SHADER_READ_BIT}; const VkImageMemoryBarrier barrier{ .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, .pNext = nullptr, diff --git a/src/video_core/renderer_vulkan/vk_blit_screen.cpp b/src/video_core/renderer_vulkan/vk_blit_screen.cpp index 34a86a407..2f0cc27e8 100644 --- a/src/video_core/renderer_vulkan/vk_blit_screen.cpp +++ b/src/video_core/renderer_vulkan/vk_blit_screen.cpp @@ -175,7 +175,7 @@ VkSemaphore BlitScreen::Draw(const Tegra::FramebufferConfig& framebuffer, const u8* const host_ptr = cpu_memory.GetPointer(framebuffer_addr); // TODO(Rodrigo): Read this from HLE - constexpr static u32 block_height_log2 = 4; + constexpr u32 block_height_log2 = 4; const u32 bytes_per_pixel = GetBytesPerPixel(framebuffer); const u64 linear_size{GetSizeInBytes(framebuffer)}; const u64 tiled_size{Tegra::Texture::CalculateSize(true, bytes_per_pixel, @@ -1482,7 +1482,7 @@ u64 BlitScreen::CalculateBufferSize(const Tegra::FramebufferConfig& framebuffer) u64 BlitScreen::GetRawImageOffset(const Tegra::FramebufferConfig& framebuffer, std::size_t image_index) const { - constexpr static auto first_image_offset = static_cast(sizeof(BufferData)); + constexpr auto first_image_offset = static_cast(sizeof(BufferData)); return first_image_offset + GetSizeInBytes(framebuffer) * image_index; } diff --git a/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp b/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp index 326260b41..2a0f0dbf0 100644 --- a/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp @@ -172,8 +172,7 @@ void ComputePipeline::Configure(Tegra::Engines::KeplerCompute& kepler_compute, buffer_cache.UnbindComputeTextureBuffers(); size_t index{}; const auto add_buffer{[&](const auto& desc) { - constexpr static bool is_image = - std::is_same_v; + constexpr bool is_image = std::is_same_v; for (u32 i = 0; i < desc.count; ++i) { bool is_written{false}; if constexpr (is_image) { diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index bdab00597..baedc4424 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -398,8 +398,7 @@ void GraphicsPipeline::ConfigureImpl(bool is_indexed) { const auto bind_stage_info{[&](size_t stage) LAMBDA_FORCEINLINE { size_t index{}; const auto add_buffer{[&](const auto& desc) { - constexpr static bool is_image = - std::is_same_v; + constexpr bool is_image = std::is_same_v; for (u32 i = 0; i < desc.count; ++i) { bool is_written{false}; if constexpr (is_image) { diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 3d50f8edb..719edbcfb 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -1109,9 +1109,9 @@ void RasterizerVulkan::UpdateDepthBiasEnable(Tegra::Engines::Maxwell3D::Regs& re if (!state_tracker.TouchDepthBiasEnable()) { return; } - constexpr static size_t POINT = 0; - constexpr static size_t LINE = 1; - constexpr static size_t POLYGON = 2; + constexpr size_t POINT = 0; + constexpr size_t LINE = 1; + constexpr size_t POLYGON = 2; static constexpr std::array POLYGON_OFFSET_ENABLE_LUT = { POINT, // Points LINE, // Lines diff --git a/src/video_core/renderer_vulkan/vk_smaa.cpp b/src/video_core/renderer_vulkan/vk_smaa.cpp index 1cd354003..f8735189d 100644 --- a/src/video_core/renderer_vulkan/vk_smaa.cpp +++ b/src/video_core/renderer_vulkan/vk_smaa.cpp @@ -55,9 +55,8 @@ std::pair CreateWrappedImage(const Device& device, void TransitionImageLayout(vk::CommandBuffer& cmdbuf, VkImage image, VkImageLayout target_layout, VkImageLayout source_layout = VK_IMAGE_LAYOUT_GENERAL) { - constexpr static VkFlags flags{VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | - VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | - VK_ACCESS_SHADER_READ_BIT}; + constexpr VkFlags flags{VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | + VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_SHADER_READ_BIT}; const VkImageMemoryBarrier barrier{ .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, .pNext = nullptr, @@ -153,7 +152,7 @@ vk::RenderPass CreateWrappedRenderPass(const Device& device, VkFormat format) { .finalLayout = VK_IMAGE_LAYOUT_GENERAL, }; - constexpr static VkAttachmentReference color_attachment_ref{ + constexpr VkAttachmentReference color_attachment_ref{ .attachment = 0, .layout = VK_IMAGE_LAYOUT_GENERAL, }; @@ -171,7 +170,7 @@ vk::RenderPass CreateWrappedRenderPass(const Device& device, VkFormat format) { .pPreserveAttachments = nullptr, }; - constexpr static VkSubpassDependency dependency{ + constexpr VkSubpassDependency dependency{ .srcSubpass = VK_SUBPASS_EXTERNAL, .dstSubpass = 0, .srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, @@ -329,7 +328,7 @@ vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderp }, }}; - constexpr static VkPipelineVertexInputStateCreateInfo vertex_input_ci{ + constexpr VkPipelineVertexInputStateCreateInfo vertex_input_ci{ .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO, .pNext = nullptr, .flags = 0, @@ -339,7 +338,7 @@ vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderp .pVertexAttributeDescriptions = nullptr, }; - constexpr static VkPipelineInputAssemblyStateCreateInfo input_assembly_ci{ + constexpr VkPipelineInputAssemblyStateCreateInfo input_assembly_ci{ .sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO, .pNext = nullptr, .flags = 0, @@ -347,7 +346,7 @@ vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderp .primitiveRestartEnable = VK_FALSE, }; - constexpr static VkPipelineViewportStateCreateInfo viewport_state_ci{ + constexpr VkPipelineViewportStateCreateInfo viewport_state_ci{ .sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO, .pNext = nullptr, .flags = 0, @@ -357,7 +356,7 @@ vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderp .pScissors = nullptr, }; - constexpr static VkPipelineRasterizationStateCreateInfo rasterization_ci{ + constexpr VkPipelineRasterizationStateCreateInfo rasterization_ci{ .sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO, .pNext = nullptr, .flags = 0, @@ -373,7 +372,7 @@ vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderp .lineWidth = 1.0f, }; - constexpr static VkPipelineMultisampleStateCreateInfo multisampling_ci{ + constexpr VkPipelineMultisampleStateCreateInfo multisampling_ci{ .sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO, .pNext = nullptr, .flags = 0, @@ -385,7 +384,7 @@ vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderp .alphaToOneEnable = VK_FALSE, }; - constexpr static VkPipelineColorBlendAttachmentState color_blend_attachment{ + constexpr VkPipelineColorBlendAttachmentState color_blend_attachment{ .blendEnable = VK_FALSE, .srcColorBlendFactor = VK_BLEND_FACTOR_ZERO, .dstColorBlendFactor = VK_BLEND_FACTOR_ZERO, @@ -408,7 +407,7 @@ vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderp .blendConstants = {0.0f, 0.0f, 0.0f, 0.0f}, }; - constexpr static std::array dynamic_states{ + constexpr std::array dynamic_states{ VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR, }; @@ -469,7 +468,7 @@ VkWriteDescriptorSet CreateWriteDescriptorSet(std::vector } void ClearColorImage(vk::CommandBuffer& cmdbuf, VkImage image) { - constexpr static std::array subresources{{{ + static constexpr std::array subresources{{{ .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, .baseMipLevel = 0, .levelCount = 1, @@ -529,8 +528,8 @@ SMAA::SMAA(const Device& device, MemoryAllocator& allocator, size_t image_count, } void SMAA::CreateImages() { - constexpr static VkExtent2D area_extent{AREATEX_WIDTH, AREATEX_HEIGHT}; - constexpr static VkExtent2D search_extent{SEARCHTEX_WIDTH, SEARCHTEX_HEIGHT}; + static constexpr VkExtent2D area_extent{AREATEX_WIDTH, AREATEX_HEIGHT}; + static constexpr VkExtent2D search_extent{SEARCHTEX_WIDTH, SEARCHTEX_HEIGHT}; std::tie(m_static_images[Area], m_static_buffer_commits[Area]) = CreateWrappedImage(m_device, m_allocator, area_extent, VK_FORMAT_R8G8_UNORM); @@ -587,12 +586,12 @@ void SMAA::CreateSampler() { void SMAA::CreateShaders() { // These match the order of the SMAAStage enum - constexpr static std::array vert_shader_sources{ + static constexpr std::array vert_shader_sources{ ARRAY_TO_SPAN(SMAA_EDGE_DETECTION_VERT_SPV), ARRAY_TO_SPAN(SMAA_BLENDING_WEIGHT_CALCULATION_VERT_SPV), ARRAY_TO_SPAN(SMAA_NEIGHBORHOOD_BLENDING_VERT_SPV), }; - constexpr static std::array frag_shader_sources{ + static constexpr std::array frag_shader_sources{ ARRAY_TO_SPAN(SMAA_EDGE_DETECTION_FRAG_SPV), ARRAY_TO_SPAN(SMAA_BLENDING_WEIGHT_CALCULATION_FRAG_SPV), ARRAY_TO_SPAN(SMAA_NEIGHBORHOOD_BLENDING_FRAG_SPV), @@ -676,8 +675,8 @@ void SMAA::UploadImages(Scheduler& scheduler) { return; } - constexpr static VkExtent2D area_extent{AREATEX_WIDTH, AREATEX_HEIGHT}; - constexpr static VkExtent2D search_extent{SEARCHTEX_WIDTH, SEARCHTEX_HEIGHT}; + static constexpr VkExtent2D area_extent{AREATEX_WIDTH, AREATEX_HEIGHT}; + static constexpr VkExtent2D search_extent{SEARCHTEX_WIDTH, SEARCHTEX_HEIGHT}; UploadImage(m_device, m_allocator, scheduler, m_static_images[Area], area_extent, VK_FORMAT_R8G8_UNORM, ARRAY_TO_SPAN(areaTexBytes)); diff --git a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp index 172b6ed95..74ca77216 100644 --- a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp @@ -299,7 +299,7 @@ void StagingBufferPool::ReleaseCache(MemoryUsage usage) { } void StagingBufferPool::ReleaseLevel(StagingBuffersCache& cache, size_t log2) { - constexpr static size_t deletions_per_tick = 16; + constexpr size_t deletions_per_tick = 16; auto& staging = cache[log2]; auto& entries = staging.entries; const size_t old_size = entries.size(); diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp index 0b24a98eb..b6810eef9 100644 --- a/src/video_core/renderer_vulkan/vk_swapchain.cpp +++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp @@ -53,7 +53,7 @@ VkPresentModeKHR ChooseSwapPresentMode(vk::Span modes) { } VkExtent2D ChooseSwapExtent(const VkSurfaceCapabilitiesKHR& capabilities, u32 width, u32 height) { - constexpr static auto undefined_size{std::numeric_limits::max()}; + constexpr auto undefined_size{std::numeric_limits::max()}; if (capabilities.currentExtent.width != undefined_size) { return capabilities.currentExtent; } diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index b9ee83de7..0ce39616f 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h @@ -113,7 +113,7 @@ public: std::optional astc_decoder_pass; const Settings::ResolutionScalingInfo& resolution; - constexpr static size_t indexing_slots = 8 * sizeof(size_t); + static constexpr size_t indexing_slots = 8 * sizeof(size_t); std::array buffers{}; std::array, indexing_slots> buffer_commits{}; }; diff --git a/src/video_core/renderer_vulkan/vk_turbo_mode.cpp b/src/video_core/renderer_vulkan/vk_turbo_mode.cpp index 38c7e533d..db04943eb 100644 --- a/src/video_core/renderer_vulkan/vk_turbo_mode.cpp +++ b/src/video_core/renderer_vulkan/vk_turbo_mode.cpp @@ -48,7 +48,7 @@ void TurboMode::Run(std::stop_token stop_token) { auto commit = m_allocator.Commit(buffer, MemoryUsage::DeviceLocal); // Create the descriptor pool to contain our descriptor. - constexpr static VkDescriptorPoolSize pool_size{ + static constexpr VkDescriptorPoolSize pool_size{ .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, .descriptorCount = 1, }; @@ -63,7 +63,7 @@ void TurboMode::Run(std::stop_token stop_token) { }); // Create the descriptor set layout from the pool. - constexpr static VkDescriptorSetLayoutBinding layout_binding{ + static constexpr VkDescriptorSetLayoutBinding layout_binding{ .binding = 0, .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, .descriptorCount = 1, diff --git a/src/video_core/surface.cpp b/src/video_core/surface.cpp index e69855cad..1a76d4178 100644 --- a/src/video_core/surface.cpp +++ b/src/video_core/surface.cpp @@ -371,7 +371,7 @@ std::pair GetASTCBlockSize(PixelFormat format) { } u64 EstimatedDecompressedSize(u64 base_size, PixelFormat format) { - constexpr static u64 RGBA8_PIXEL_SIZE = 4; + constexpr u64 RGBA8_PIXEL_SIZE = 4; const u64 base_block_size = static_cast(DefaultBlockWidth(format)) * static_cast(DefaultBlockHeight(format)) * RGBA8_PIXEL_SIZE; return (base_size * base_block_size) / BytesPerBlock(format); diff --git a/src/video_core/textures/decoders.cpp b/src/video_core/textures/decoders.cpp index 436f228b3..95bcdd37b 100644 --- a/src/video_core/textures/decoders.cpp +++ b/src/video_core/textures/decoders.cpp @@ -29,7 +29,7 @@ constexpr u32 pdep(u32 value) { template void incrpdep(u32& value) { - constexpr static u32 swizzled_incr = pdep(incr_amount); + static constexpr u32 swizzled_incr = pdep(incr_amount); value = ((value | ~mask) + swizzled_incr) & mask; } diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cpp index 7efe83c9a..486d4dfaf 100644 --- a/src/video_core/vulkan_common/vulkan_wrapper.cpp +++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp @@ -495,9 +495,9 @@ VkResult Free(VkDevice device, VkCommandPool handle, Span buffe Instance Instance::Create(u32 version, Span layers, Span extensions, InstanceDispatch& dispatch) { #ifdef __APPLE__ - constexpr static VkFlags ci_flags{VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR}; + constexpr VkFlags ci_flags{VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR}; #else - constexpr static VkFlags ci_flags{}; + constexpr VkFlags ci_flags{}; #endif const VkApplicationInfo application_info{ diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index c2b144b78..d65991734 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -720,7 +720,7 @@ void GRenderWindow::TouchEndEvent() { void GRenderWindow::InitializeCamera() { #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA - constexpr static auto camera_update_ms = std::chrono::milliseconds{50}; // (50ms, 20Hz) + constexpr auto camera_update_ms = std::chrono::milliseconds{50}; // (50ms, 20Hz) if (!Settings::values.enable_ir_sensor) { return; } diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp index fa8afc2d9..c287220fc 100644 --- a/src/yuzu/configuration/configure_input_player_widget.cpp +++ b/src/yuzu/configuration/configure_input_player_widget.cpp @@ -317,9 +317,9 @@ void PlayerControlPreview::DrawLeftController(QPainter& p, const QPointF center) // D-pad constants const QPointF dpad_center = center + QPoint(9, 14); - constexpr static int dpad_distance = 23; - constexpr static int dpad_radius = 11; - constexpr static float dpad_arrow_size = 1.2f; + constexpr int dpad_distance = 23; + constexpr int dpad_radius = 11; + constexpr float dpad_arrow_size = 1.2f; // D-pad buttons p.setPen(colors.outline); @@ -439,9 +439,9 @@ void PlayerControlPreview::DrawRightController(QPainter& p, const QPointF center // Face buttons constants const QPointF face_center = center + QPoint(-9, -73); - constexpr static int face_distance = 23; - constexpr static int face_radius = 11; - constexpr static float text_size = 1.1f; + constexpr int face_distance = 23; + constexpr int face_radius = 11; + constexpr float text_size = 1.1f; // Face buttons p.setPen(colors.outline); @@ -559,9 +559,9 @@ void PlayerControlPreview::DrawDualController(QPainter& p, const QPointF center) // Face buttons constants const QPointF face_center = center + QPoint(65, -65); - constexpr static int face_distance = 20; - constexpr static int face_radius = 10; - constexpr static float text_size = 1.0f; + constexpr int face_distance = 20; + constexpr int face_radius = 10; + constexpr float text_size = 1.0f; // Face buttons p.setPen(colors.outline); @@ -581,9 +581,9 @@ void PlayerControlPreview::DrawDualController(QPainter& p, const QPointF center) // D-pad constants const QPointF dpad_center = center + QPoint(-65, 12); - constexpr static int dpad_distance = 20; - constexpr static int dpad_radius = 10; - constexpr static float dpad_arrow_size = 1.1f; + constexpr int dpad_distance = 20; + constexpr int dpad_radius = 10; + constexpr float dpad_arrow_size = 1.1f; // D-pad buttons p.setPen(colors.outline); @@ -651,9 +651,9 @@ void PlayerControlPreview::DrawHandheldController(QPainter& p, const QPointF cen // Face buttons constants const QPointF face_center = center + QPoint(171, -41); - constexpr static float face_distance = 12.8f; - constexpr static float face_radius = 6.4f; - constexpr static float text_size = 0.6f; + constexpr float face_distance = 12.8f; + constexpr float face_radius = 6.4f; + constexpr float text_size = 0.6f; // Face buttons p.setPen(colors.outline); @@ -673,9 +673,9 @@ void PlayerControlPreview::DrawHandheldController(QPainter& p, const QPointF cen // D-pad constants const QPointF dpad_center = center + QPoint(-171, 8); - constexpr static float dpad_distance = 12.8f; - constexpr static float dpad_radius = 6.4f; - constexpr static float dpad_arrow_size = 0.68f; + constexpr float dpad_distance = 12.8f; + constexpr float dpad_radius = 6.4f; + constexpr float dpad_arrow_size = 0.68f; // D-pad buttons p.setPen(colors.outline); @@ -754,9 +754,9 @@ void PlayerControlPreview::DrawProController(QPainter& p, const QPointF center) // Face buttons constants const QPointF face_center = center + QPoint(105, -56); - constexpr static int face_distance = 31; - constexpr static int face_radius = 15; - constexpr static float text_size = 1.5f; + constexpr int face_distance = 31; + constexpr int face_radius = 15; + constexpr float text_size = 1.5f; // Face buttons p.setPen(colors.outline); @@ -846,7 +846,7 @@ void PlayerControlPreview::DrawGCController(QPainter& p, const QPointF center) { using namespace Settings::NativeButton; // Face buttons constants - constexpr static float text_size = 1.1f; + constexpr float text_size = 1.1f; // Face buttons p.setPen(colors.outline); @@ -1497,7 +1497,7 @@ void PlayerControlPreview::DrawProBody(QPainter& p, const QPointF center) { std::array qleft_handle; std::array qright_handle; std::array qbody; - constexpr static int radius1 = 32; + constexpr int radius1 = 32; for (std::size_t point = 0; point < pro_left_handle.size() / 2; ++point) { const float left_x = pro_left_handle[point * 2 + 0]; @@ -1539,7 +1539,7 @@ void PlayerControlPreview::DrawGCBody(QPainter& p, const QPointF center) { std::array qbody; std::array left_hex; std::array right_hex; - constexpr static float angle = 2 * 3.1415f / 8; + constexpr float angle = 2 * 3.1415f / 8; for (std::size_t point = 0; point < gc_left_body.size() / 2; ++point) { const float body_x = gc_left_body[point * 2 + 0]; @@ -1676,9 +1676,9 @@ void PlayerControlPreview::DrawDualBody(QPainter& p, const QPointF center) { std::array qright_joycon_slider_topview; std::array qleft_joycon_topview; std::array qright_joycon_topview; - constexpr static float size = 1.61f; - constexpr static float size2 = 0.9f; - constexpr static float offset = 209.3f; + constexpr float size = 1.61f; + constexpr float size2 = 0.9f; + constexpr float offset = 209.3f; for (std::size_t point = 0; point < left_joycon_body.size() / 2; ++point) { const float body_x = left_joycon_body[point * 2 + 0]; @@ -1767,10 +1767,10 @@ void PlayerControlPreview::DrawLeftBody(QPainter& p, const QPointF center) { std::array qleft_joycon_slider; std::array qleft_joycon_slider_topview; std::array qleft_joycon_topview; - constexpr static float size = 1.78f; - constexpr static float size2 = 1.1115f; - constexpr static float offset = 312.39f; - constexpr static float offset2 = 335; + constexpr float size = 1.78f; + constexpr float size2 = 1.1115f; + constexpr float offset = 312.39f; + constexpr float offset2 = 335; for (std::size_t point = 0; point < left_joycon_body.size() / 2; ++point) { left_joycon[point] = center + QPointF(left_joycon_body[point * 2] * size + offset, @@ -1867,10 +1867,10 @@ void PlayerControlPreview::DrawRightBody(QPainter& p, const QPointF center) { std::array qright_joycon_slider; std::array qright_joycon_slider_topview; std::array qright_joycon_topview; - constexpr static float size = 1.78f; - constexpr static float size2 = 1.1115f; - constexpr static float offset = 312.39f; - constexpr static float offset2 = 335; + constexpr float size = 1.78f; + constexpr float size2 = 1.1115f; + constexpr float offset = 312.39f; + constexpr float offset2 = 335; for (std::size_t point = 0; point < left_joycon_body.size() / 2; ++point) { right_joycon[point] = center + QPointF(-left_joycon_body[point * 2] * size - offset, @@ -2068,8 +2068,8 @@ void PlayerControlPreview::DrawDualTriggers(QPainter& p, const QPointF center, const Common::Input::ButtonStatus& right_pressed) { std::array qleft_trigger; std::array qright_trigger; - constexpr static float size = 1.62f; - constexpr static float offset = 210.6f; + constexpr float size = 1.62f; + constexpr float offset = 210.6f; for (std::size_t point = 0; point < left_joycon_trigger.size() / 2; ++point) { const float left_trigger_x = left_joycon_trigger[point * 2 + 0]; const float left_trigger_y = left_joycon_trigger[point * 2 + 1]; @@ -2097,7 +2097,7 @@ void PlayerControlPreview::DrawDualTriggersTopView( const Common::Input::ButtonStatus& right_pressed) { std::array qleft_trigger; std::array qright_trigger; - constexpr static float size = 0.9f; + constexpr float size = 0.9f; for (std::size_t point = 0; point < left_joystick_L_topview.size() / 2; ++point) { const float top_view_x = left_joystick_L_topview[point * 2 + 0]; @@ -2134,7 +2134,7 @@ void PlayerControlPreview::DrawDualZTriggersTopView( const Common::Input::ButtonStatus& right_pressed) { std::array qleft_trigger; std::array qright_trigger; - constexpr static float size = 0.9f; + constexpr float size = 0.9f; for (std::size_t point = 0; point < left_joystick_ZL_topview.size() / 2; ++point) { qleft_trigger[point] = @@ -2167,8 +2167,8 @@ void PlayerControlPreview::DrawDualZTriggersTopView( void PlayerControlPreview::DrawLeftTriggers(QPainter& p, const QPointF center, const Common::Input::ButtonStatus& left_pressed) { std::array qleft_trigger; - constexpr static float size = 1.78f; - constexpr static float offset = 311.5f; + constexpr float size = 1.78f; + constexpr float offset = 311.5f; for (std::size_t point = 0; point < left_joycon_trigger.size() / 2; ++point) { qleft_trigger[point] = center + QPointF(left_joycon_trigger[point * 2] * size + offset, @@ -2184,8 +2184,8 @@ void PlayerControlPreview::DrawLeftTriggers(QPainter& p, const QPointF center, void PlayerControlPreview::DrawLeftZTriggers(QPainter& p, const QPointF center, const Common::Input::ButtonStatus& left_pressed) { std::array qleft_trigger; - constexpr static float size = 1.1115f; - constexpr static float offset2 = 335; + constexpr float size = 1.1115f; + constexpr float offset2 = 335; for (std::size_t point = 0; point < left_joycon_sideview_zl.size() / 2; ++point) { qleft_trigger[point] = center + QPointF(left_joycon_sideview_zl[point * 2] * size + offset2, @@ -2241,8 +2241,8 @@ void PlayerControlPreview::DrawLeftZTriggersTopView( void PlayerControlPreview::DrawRightTriggers(QPainter& p, const QPointF center, const Common::Input::ButtonStatus& right_pressed) { std::array qright_trigger; - constexpr static float size = 1.78f; - constexpr static float offset = 311.5f; + constexpr float size = 1.78f; + constexpr float offset = 311.5f; for (std::size_t point = 0; point < left_joycon_trigger.size() / 2; ++point) { qright_trigger[point] = center + QPointF(-left_joycon_trigger[point * 2] * size - offset, @@ -2258,8 +2258,8 @@ void PlayerControlPreview::DrawRightTriggers(QPainter& p, const QPointF center, void PlayerControlPreview::DrawRightZTriggers(QPainter& p, const QPointF center, const Common::Input::ButtonStatus& right_pressed) { std::array qright_trigger; - constexpr static float size = 1.1115f; - constexpr static float offset2 = 335; + constexpr float size = 1.1115f; + constexpr float offset2 = 335; for (std::size_t point = 0; point < left_joycon_sideview_zl.size() / 2; ++point) { qright_trigger[point] = @@ -2433,7 +2433,7 @@ void PlayerControlPreview::DrawRawJoystick(QPainter& p, QPointF center_left, QPo void PlayerControlPreview::DrawJoystickProperties( QPainter& p, const QPointF center, const Common::Input::AnalogProperties& properties) { - constexpr static float size = 45.0f; + constexpr float size = 45.0f; const float range = size * properties.range; const float deadzone = size * properties.deadzone; @@ -2453,7 +2453,7 @@ void PlayerControlPreview::DrawJoystickProperties( void PlayerControlPreview::DrawJoystickDot(QPainter& p, const QPointF center, const Common::Input::StickStatus& stick, bool raw) { - constexpr static float size = 45.0f; + constexpr float size = 45.0f; const float range = size * stick.x.properties.range; if (raw) { diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp index 2e73c2719..22aa19c56 100644 --- a/src/yuzu/game_list.cpp +++ b/src/yuzu/game_list.cpp @@ -476,8 +476,8 @@ void GameList::DonePopulating(const QStringList& watch_list) { // Workaround: Add the watch paths in chunks to allow the gui to refresh // This prevents the UI from stalling when a large number of watch paths are added // Also artificially caps the watcher to a certain number of directories - constexpr static int LIMIT_WATCH_DIRECTORIES = 5000; - constexpr static int SLICE_SIZE = 25; + constexpr int LIMIT_WATCH_DIRECTORIES = 5000; + constexpr int SLICE_SIZE = 25; int len = std::min(static_cast(watch_list.size()), LIMIT_WATCH_DIRECTORIES); for (int i = 0; i < len; i += SLICE_SIZE) { watcher->addPaths(watch_list.mid(i, i + SLICE_SIZE)); diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 68abde028..1e6778ada 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -219,7 +219,7 @@ static void LogRuntimes() { #ifdef _MSC_VER // It is possible that the name of the dll will change. // vcruntime140.dll is for 2015 and onwards - constexpr static char runtime_dll_name[] = "vcruntime140.dll"; + static constexpr char runtime_dll_name[] = "vcruntime140.dll"; UINT sz = GetFileVersionInfoSizeA(runtime_dll_name, nullptr); bool runtime_version_inspection_worked = false; if (sz > 0) { @@ -4490,8 +4490,8 @@ static void SetHighDPIAttributes() { // Recommended minimum width and height for proper window fit. // Any screen with a lower resolution than this will still have a scale of 1. - constexpr static float minimum_width = 1350.0f; - constexpr static float minimum_height = 900.0f; + constexpr float minimum_width = 1350.0f; + constexpr float minimum_height = 900.0f; const float width_ratio = std::max(1.0f, real_width / minimum_width); const float height_ratio = std::max(1.0f, real_height / minimum_height); From 880b6e9795e2a86d8f31f437c9ac7d356e7790a5 Mon Sep 17 00:00:00 2001 From: arades79 Date: Tue, 14 Feb 2023 11:33:42 -0500 Subject: [PATCH 0061/1181] use a string view to skip allocation Signed-off-by: arades79 --- src/core/debugger/gdbstub_arch.cpp | 14 ++++---------- src/core/debugger/gdbstub_arch.h | 6 +++--- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/core/debugger/gdbstub_arch.cpp b/src/core/debugger/gdbstub_arch.cpp index b13c473bb..f3dd517bd 100644 --- a/src/core/debugger/gdbstub_arch.cpp +++ b/src/core/debugger/gdbstub_arch.cpp @@ -41,9 +41,8 @@ static void PutSIMDRegister(std::array& simd_regs, size_t offset, const // For sample XML files see the GDB source /gdb/features // This XML defines what the registers are for this specific ARM device -std::string GDBStubA64::GetTargetXML() const { - constexpr static const char* target_xml = - R"( +constexpr std::string_view GDBStubA64::GetTargetXML() const { + return R"( aarch64 @@ -178,8 +177,6 @@ std::string GDBStubA64::GetTargetXML() const { )"; - - return target_xml; } std::string GDBStubA64::RegRead(const Kernel::KThread* thread, size_t id) const { @@ -270,9 +267,8 @@ u32 GDBStubA64::BreakpointInstruction() const { return 0xd4200000; } -std::string GDBStubA32::GetTargetXML() const { - constexpr static const char* target_xml = - R"( +constexpr std::string_view GDBStubA32::GetTargetXML() const { + return R"( arm @@ -378,8 +374,6 @@ std::string GDBStubA32::GetTargetXML() const { )"; - - return target_xml; } std::string GDBStubA32::RegRead(const Kernel::KThread* thread, size_t id) const { diff --git a/src/core/debugger/gdbstub_arch.h b/src/core/debugger/gdbstub_arch.h index 2540d6456..1958fdf88 100644 --- a/src/core/debugger/gdbstub_arch.h +++ b/src/core/debugger/gdbstub_arch.h @@ -16,7 +16,7 @@ namespace Core { class GDBStubArch { public: virtual ~GDBStubArch() = default; - virtual std::string GetTargetXML() const = 0; + virtual constexpr std::string_view GetTargetXML() const = 0; virtual std::string RegRead(const Kernel::KThread* thread, size_t id) const = 0; virtual void RegWrite(Kernel::KThread* thread, size_t id, std::string_view value) const = 0; virtual std::string ReadRegisters(const Kernel::KThread* thread) const = 0; @@ -27,7 +27,7 @@ public: class GDBStubA64 final : public GDBStubArch { public: - std::string GetTargetXML() const override; + constexpr std::string_view GetTargetXML() const override; std::string RegRead(const Kernel::KThread* thread, size_t id) const override; void RegWrite(Kernel::KThread* thread, size_t id, std::string_view value) const override; std::string ReadRegisters(const Kernel::KThread* thread) const override; @@ -47,7 +47,7 @@ private: class GDBStubA32 final : public GDBStubArch { public: - std::string GetTargetXML() const override; + constexpr std::string_view GetTargetXML() const override; std::string RegRead(const Kernel::KThread* thread, size_t id) const override; void RegWrite(Kernel::KThread* thread, size_t id, std::string_view value) const override; std::string ReadRegisters(const Kernel::KThread* thread) const override; From 79fbdfca170a8eec71f8e037df9132cfc6fc5f44 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 14 Feb 2023 12:38:21 -0500 Subject: [PATCH 0062/1181] service: remove deleted services --- src/core/CMakeLists.txt | 16 -- src/core/hle/service/am/am.cpp | 2 - src/core/hle/service/am/tcap.cpp | 22 --- src/core/hle/service/am/tcap.h | 20 --- src/core/hle/service/apm/apm.cpp | 2 - src/core/hle/service/audio/auddbg.cpp | 21 --- src/core/hle/service/audio/auddbg.h | 20 --- src/core/hle/service/audio/audin_a.cpp | 23 --- src/core/hle/service/audio/audin_a.h | 20 --- src/core/hle/service/audio/audio.cpp | 14 -- src/core/hle/service/audio/audout_a.cpp | 25 --- src/core/hle/service/audio/audout_a.h | 20 --- src/core/hle/service/audio/audren_a.cpp | 27 ---- src/core/hle/service/audio/audren_a.h | 20 --- src/core/hle/service/audio/codecctl.cpp | 29 ---- src/core/hle/service/audio/codecctl.h | 20 --- src/core/hle/service/hid/hid.cpp | 14 -- src/core/hle/service/pcv/pcv.cpp | 28 ---- src/core/hle/service/service.cpp | 2 - src/core/hle/service/sockets/ethc.cpp | 42 ----- src/core/hle/service/sockets/ethc.h | 26 ---- src/core/hle/service/sockets/sockets.cpp | 4 - src/core/hle/service/wlan/wlan.cpp | 186 ----------------------- src/core/hle/service/wlan/wlan.h | 18 --- 24 files changed, 621 deletions(-) delete mode 100644 src/core/hle/service/am/tcap.cpp delete mode 100644 src/core/hle/service/am/tcap.h delete mode 100644 src/core/hle/service/audio/auddbg.cpp delete mode 100644 src/core/hle/service/audio/auddbg.h delete mode 100644 src/core/hle/service/audio/audin_a.cpp delete mode 100644 src/core/hle/service/audio/audin_a.h delete mode 100644 src/core/hle/service/audio/audout_a.cpp delete mode 100644 src/core/hle/service/audio/audout_a.h delete mode 100644 src/core/hle/service/audio/audren_a.cpp delete mode 100644 src/core/hle/service/audio/audren_a.h delete mode 100644 src/core/hle/service/audio/codecctl.cpp delete mode 100644 src/core/hle/service/audio/codecctl.h delete mode 100644 src/core/hle/service/sockets/ethc.cpp delete mode 100644 src/core/hle/service/sockets/ethc.h delete mode 100644 src/core/hle/service/wlan/wlan.cpp delete mode 100644 src/core/hle/service/wlan/wlan.h diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 8ef1fcaa8..16ced4595 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -384,8 +384,6 @@ add_library(core STATIC hle/service/am/omm.h hle/service/am/spsm.cpp hle/service/am/spsm.h - hle/service/am/tcap.cpp - hle/service/am/tcap.h hle/service/aoc/aoc_u.cpp hle/service/aoc/aoc_u.h hle/service/apm/apm.cpp @@ -396,28 +394,18 @@ add_library(core STATIC hle/service/apm/apm_interface.h hle/service/audio/audctl.cpp hle/service/audio/audctl.h - hle/service/audio/auddbg.cpp - hle/service/audio/auddbg.h - hle/service/audio/audin_a.cpp - hle/service/audio/audin_a.h hle/service/audio/audin_u.cpp hle/service/audio/audin_u.h hle/service/audio/audio.cpp hle/service/audio/audio.h - hle/service/audio/audout_a.cpp - hle/service/audio/audout_a.h hle/service/audio/audout_u.cpp hle/service/audio/audout_u.h hle/service/audio/audrec_a.cpp hle/service/audio/audrec_a.h hle/service/audio/audrec_u.cpp hle/service/audio/audrec_u.h - hle/service/audio/audren_a.cpp - hle/service/audio/audren_a.h hle/service/audio/audren_u.cpp hle/service/audio/audren_u.h - hle/service/audio/codecctl.cpp - hle/service/audio/codecctl.h hle/service/audio/errors.h hle/service/audio/hwopus.cpp hle/service/audio/hwopus.h @@ -712,8 +700,6 @@ add_library(core STATIC hle/service/sm/sm_controller.h hle/service/sockets/bsd.cpp hle/service/sockets/bsd.h - hle/service/sockets/ethc.cpp - hle/service/sockets/ethc.h hle/service/sockets/nsd.cpp hle/service/sockets/nsd.h hle/service/sockets/sfdnsres.cpp @@ -780,8 +766,6 @@ add_library(core STATIC hle/service/vi/vi_s.h hle/service/vi/vi_u.cpp hle/service/vi/vi_u.h - hle/service/wlan/wlan.cpp - hle/service/wlan/wlan.h internal_network/network.cpp internal_network/network.h internal_network/network_interface.cpp diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index ebcf6e164..3a96611b6 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -24,7 +24,6 @@ #include "core/hle/service/am/idle.h" #include "core/hle/service/am/omm.h" #include "core/hle/service/am/spsm.h" -#include "core/hle/service/am/tcap.h" #include "core/hle/service/apm/apm_controller.h" #include "core/hle/service/apm/apm_interface.h" #include "core/hle/service/bcat/backend/backend.h" @@ -1838,7 +1837,6 @@ void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger std::make_shared(system)->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); } IHomeMenuFunctions::IHomeMenuFunctions(Core::System& system_) diff --git a/src/core/hle/service/am/tcap.cpp b/src/core/hle/service/am/tcap.cpp deleted file mode 100644 index 818420e22..000000000 --- a/src/core/hle/service/am/tcap.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "core/hle/service/am/tcap.h" - -namespace Service::AM { - -TCAP::TCAP(Core::System& system_) : ServiceFramework{system_, "tcap"} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "GetContinuousHighSkinTemperatureEvent"}, - {1, nullptr, "SetOperationMode"}, - {2, nullptr, "LoadAndApplySettings"}, - }; - // clang-format on - - RegisterHandlers(functions); -} - -TCAP::~TCAP() = default; - -} // namespace Service::AM diff --git a/src/core/hle/service/am/tcap.h b/src/core/hle/service/am/tcap.h deleted file mode 100644 index 6b2148c29..000000000 --- a/src/core/hle/service/am/tcap.h +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "core/hle/service/service.h" - -namespace Core { -class System; -} - -namespace Service::AM { - -class TCAP final : public ServiceFramework { -public: - explicit TCAP(Core::System& system_); - ~TCAP() override; -}; - -} // namespace Service::AM diff --git a/src/core/hle/service/apm/apm.cpp b/src/core/hle/service/apm/apm.cpp index 8a338d9b1..44b2927a6 100644 --- a/src/core/hle/service/apm/apm.cpp +++ b/src/core/hle/service/apm/apm.cpp @@ -14,8 +14,6 @@ void InstallInterfaces(Core::System& system) { auto module_ = std::make_shared(); std::make_shared(system, module_, system.GetAPMController(), "apm") ->InstallAsService(system.ServiceManager()); - std::make_shared(system, module_, system.GetAPMController(), "apm:p") - ->InstallAsService(system.ServiceManager()); std::make_shared(system, module_, system.GetAPMController(), "apm:am") ->InstallAsService(system.ServiceManager()); std::make_shared(system, system.GetAPMController()) diff --git a/src/core/hle/service/audio/auddbg.cpp b/src/core/hle/service/audio/auddbg.cpp deleted file mode 100644 index 5541af300..000000000 --- a/src/core/hle/service/audio/auddbg.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "core/hle/service/audio/auddbg.h" - -namespace Service::Audio { - -AudDbg::AudDbg(Core::System& system_, const char* name) : ServiceFramework{system_, name} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "RequestSuspendForDebug"}, - {1, nullptr, "RequestResumeForDebug"}, - }; - // clang-format on - - RegisterHandlers(functions); -} - -AudDbg::~AudDbg() = default; - -} // namespace Service::Audio diff --git a/src/core/hle/service/audio/auddbg.h b/src/core/hle/service/audio/auddbg.h deleted file mode 100644 index 8f26be5dc..000000000 --- a/src/core/hle/service/audio/auddbg.h +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "core/hle/service/service.h" - -namespace Core { -class System; -} - -namespace Service::Audio { - -class AudDbg final : public ServiceFramework { -public: - explicit AudDbg(Core::System& system_, const char* name); - ~AudDbg() override; -}; - -} // namespace Service::Audio diff --git a/src/core/hle/service/audio/audin_a.cpp b/src/core/hle/service/audio/audin_a.cpp deleted file mode 100644 index 98f4a6048..000000000 --- a/src/core/hle/service/audio/audin_a.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "core/hle/service/audio/audin_a.h" - -namespace Service::Audio { - -AudInA::AudInA(Core::System& system_) : ServiceFramework{system_, "audin:a"} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "RequestSuspend"}, - {1, nullptr, "RequestResume"}, - {2, nullptr, "GetProcessMasterVolume"}, - {3, nullptr, "SetProcessMasterVolume"}, - }; - // clang-format on - - RegisterHandlers(functions); -} - -AudInA::~AudInA() = default; - -} // namespace Service::Audio diff --git a/src/core/hle/service/audio/audin_a.h b/src/core/hle/service/audio/audin_a.h deleted file mode 100644 index 19a927de5..000000000 --- a/src/core/hle/service/audio/audin_a.h +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "core/hle/service/service.h" - -namespace Core { -class System; -} - -namespace Service::Audio { - -class AudInA final : public ServiceFramework { -public: - explicit AudInA(Core::System& system_); - ~AudInA() override; -}; - -} // namespace Service::Audio diff --git a/src/core/hle/service/audio/audio.cpp b/src/core/hle/service/audio/audio.cpp index 97da71dfa..ed36e3448 100644 --- a/src/core/hle/service/audio/audio.cpp +++ b/src/core/hle/service/audio/audio.cpp @@ -2,17 +2,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/hle/service/audio/audctl.h" -#include "core/hle/service/audio/auddbg.h" -#include "core/hle/service/audio/audin_a.h" #include "core/hle/service/audio/audin_u.h" #include "core/hle/service/audio/audio.h" -#include "core/hle/service/audio/audout_a.h" #include "core/hle/service/audio/audout_u.h" #include "core/hle/service/audio/audrec_a.h" #include "core/hle/service/audio/audrec_u.h" -#include "core/hle/service/audio/audren_a.h" #include "core/hle/service/audio/audren_u.h" -#include "core/hle/service/audio/codecctl.h" #include "core/hle/service/audio/hwopus.h" #include "core/hle/service/service.h" @@ -20,21 +15,12 @@ namespace Service::Audio { void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); - - std::make_shared(system, "audin:d")->InstallAsService(service_manager); - std::make_shared(system, "audout:d")->InstallAsService(service_manager); - std::make_shared(system, "audrec:d")->InstallAsService(service_manager); - std::make_shared(system, "audren:d")->InstallAsService(service_manager); } } // namespace Service::Audio diff --git a/src/core/hle/service/audio/audout_a.cpp b/src/core/hle/service/audio/audout_a.cpp deleted file mode 100644 index 5ecb99236..000000000 --- a/src/core/hle/service/audio/audout_a.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "core/hle/service/audio/audout_a.h" - -namespace Service::Audio { - -AudOutA::AudOutA(Core::System& system_) : ServiceFramework{system_, "audout:a"} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "RequestSuspend"}, - {1, nullptr, "RequestResume"}, - {2, nullptr, "GetProcessMasterVolume"}, - {3, nullptr, "SetProcessMasterVolume"}, - {4, nullptr, "GetProcessRecordVolume"}, - {5, nullptr, "SetProcessRecordVolume"}, - }; - // clang-format on - - RegisterHandlers(functions); -} - -AudOutA::~AudOutA() = default; - -} // namespace Service::Audio diff --git a/src/core/hle/service/audio/audout_a.h b/src/core/hle/service/audio/audout_a.h deleted file mode 100644 index f641cffeb..000000000 --- a/src/core/hle/service/audio/audout_a.h +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "core/hle/service/service.h" - -namespace Core { -class System; -} - -namespace Service::Audio { - -class AudOutA final : public ServiceFramework { -public: - explicit AudOutA(Core::System& system_); - ~AudOutA() override; -}; - -} // namespace Service::Audio diff --git a/src/core/hle/service/audio/audren_a.cpp b/src/core/hle/service/audio/audren_a.cpp deleted file mode 100644 index e775ac3bf..000000000 --- a/src/core/hle/service/audio/audren_a.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "core/hle/service/audio/audren_a.h" - -namespace Service::Audio { - -AudRenA::AudRenA(Core::System& system_) : ServiceFramework{system_, "audren:a"} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "RequestSuspend"}, - {1, nullptr, "RequestResume"}, - {2, nullptr, "GetProcessMasterVolume"}, - {3, nullptr, "SetProcessMasterVolume"}, - {4, nullptr, "RegisterAppletResourceUserId"}, - {5, nullptr, "UnregisterAppletResourceUserId"}, - {6, nullptr, "GetProcessRecordVolume"}, - {7, nullptr, "SetProcessRecordVolume"}, - }; - // clang-format on - - RegisterHandlers(functions); -} - -AudRenA::~AudRenA() = default; - -} // namespace Service::Audio diff --git a/src/core/hle/service/audio/audren_a.h b/src/core/hle/service/audio/audren_a.h deleted file mode 100644 index 9e08b4245..000000000 --- a/src/core/hle/service/audio/audren_a.h +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "core/hle/service/service.h" - -namespace Core { -class System; -} - -namespace Service::Audio { - -class AudRenA final : public ServiceFramework { -public: - explicit AudRenA(Core::System& system_); - ~AudRenA() override; -}; - -} // namespace Service::Audio diff --git a/src/core/hle/service/audio/codecctl.cpp b/src/core/hle/service/audio/codecctl.cpp deleted file mode 100644 index 81b956d7e..000000000 --- a/src/core/hle/service/audio/codecctl.cpp +++ /dev/null @@ -1,29 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "core/hle/service/audio/codecctl.h" - -namespace Service::Audio { - -CodecCtl::CodecCtl(Core::System& system_) : ServiceFramework{system_, "codecctl"} { - static const FunctionInfo functions[] = { - {0, nullptr, "Initialize"}, - {1, nullptr, "Finalize"}, - {2, nullptr, "Sleep"}, - {3, nullptr, "Wake"}, - {4, nullptr, "SetVolume"}, - {5, nullptr, "GetVolumeMax"}, - {6, nullptr, "GetVolumeMin"}, - {7, nullptr, "SetActiveTarget"}, - {8, nullptr, "GetActiveTarget"}, - {9, nullptr, "BindHeadphoneMicJackInterrupt"}, - {10, nullptr, "IsHeadphoneMicJackInserted"}, - {11, nullptr, "ClearHeadphoneMicJackInterrupt"}, - {12, nullptr, "IsRequested"}, - }; - RegisterHandlers(functions); -} - -CodecCtl::~CodecCtl() = default; - -} // namespace Service::Audio diff --git a/src/core/hle/service/audio/codecctl.h b/src/core/hle/service/audio/codecctl.h deleted file mode 100644 index 34da98212..000000000 --- a/src/core/hle/service/audio/codecctl.h +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "core/hle/service/service.h" - -namespace Core { -class System; -} - -namespace Service::Audio { - -class CodecCtl final : public ServiceFramework { -public: - explicit CodecCtl(Core::System& system_); - ~CodecCtl() override; -}; - -} // namespace Service::Audio diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 5a1aa0903..cd6d000ef 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -2734,25 +2734,11 @@ private: } }; -class HidTmp final : public ServiceFramework { -public: - explicit HidTmp(Core::System& system_) : ServiceFramework{system_, "hid:tmp"} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "GetConsoleSixAxisSensorCalibrationValues"}, - }; - // clang-format on - - RegisterHandlers(functions); - } -}; - void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { std::make_shared(system)->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); diff --git a/src/core/hle/service/pcv/pcv.cpp b/src/core/hle/service/pcv/pcv.cpp index f7a497a14..98037a8d4 100644 --- a/src/core/hle/service/pcv/pcv.cpp +++ b/src/core/hle/service/pcv/pcv.cpp @@ -52,32 +52,6 @@ public: } }; -class PCV_ARB final : public ServiceFramework { -public: - explicit PCV_ARB(Core::System& system_) : ServiceFramework{system_, "pcv:arb"} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "ReleaseControl"}, - }; - // clang-format on - - RegisterHandlers(functions); - } -}; - -class PCV_IMM final : public ServiceFramework { -public: - explicit PCV_IMM(Core::System& system_) : ServiceFramework{system_, "pcv:imm"} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "SetClockRate"}, - }; - // clang-format on - - RegisterHandlers(functions); - } -}; - class IClkrstSession final : public ServiceFramework { public: explicit IClkrstSession(Core::System& system_, DeviceCode deivce_code_) @@ -169,8 +143,6 @@ public: void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); std::make_shared(system, "clkrst")->InstallAsService(sm); std::make_shared(system, "clkrst:i")->InstallAsService(sm); std::make_shared(system)->InstallAsService(sm); diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 0de67f1e1..1ffc1c694 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -68,7 +68,6 @@ #include "core/hle/service/time/time.h" #include "core/hle/service/usb/usb.h" #include "core/hle/service/vi/vi.h" -#include "core/hle/service/wlan/wlan.h" #include "core/reporter.h" namespace Service { @@ -306,7 +305,6 @@ Services::Services(std::shared_ptr& sm, Core::System& system Time::InstallInterfaces(system); USB::InstallInterfaces(*sm, system); VI::InstallInterfaces(*sm, system, *nv_flinger, *hos_binder_driver_server); - WLAN::InstallInterfaces(*sm, system); } Services::~Services() = default; diff --git a/src/core/hle/service/sockets/ethc.cpp b/src/core/hle/service/sockets/ethc.cpp deleted file mode 100644 index c12ea999b..000000000 --- a/src/core/hle/service/sockets/ethc.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "core/hle/service/sockets/ethc.h" - -namespace Service::Sockets { - -ETHC_C::ETHC_C(Core::System& system_) : ServiceFramework{system_, "ethc:c"} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "Initialize"}, - {1, nullptr, "Cancel"}, - {2, nullptr, "GetResult"}, - {3, nullptr, "GetMediaList"}, - {4, nullptr, "SetMediaType"}, - {5, nullptr, "GetMediaType"}, - {6, nullptr, "Unknown6"}, - }; - // clang-format on - - RegisterHandlers(functions); -} - -ETHC_C::~ETHC_C() = default; - -ETHC_I::ETHC_I(Core::System& system_) : ServiceFramework{system_, "ethc:i"} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "GetReadableHandle"}, - {1, nullptr, "Cancel"}, - {2, nullptr, "GetResult"}, - {3, nullptr, "GetInterfaceList"}, - {4, nullptr, "GetInterfaceCount"}, - }; - // clang-format on - - RegisterHandlers(functions); -} - -ETHC_I::~ETHC_I() = default; - -} // namespace Service::Sockets diff --git a/src/core/hle/service/sockets/ethc.h b/src/core/hle/service/sockets/ethc.h deleted file mode 100644 index 7c5759a96..000000000 --- a/src/core/hle/service/sockets/ethc.h +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "core/hle/service/service.h" - -namespace Core { -class System; -} - -namespace Service::Sockets { - -class ETHC_C final : public ServiceFramework { -public: - explicit ETHC_C(Core::System& system_); - ~ETHC_C() override; -}; - -class ETHC_I final : public ServiceFramework { -public: - explicit ETHC_I(Core::System& system_); - ~ETHC_I() override; -}; - -} // namespace Service::Sockets diff --git a/src/core/hle/service/sockets/sockets.cpp b/src/core/hle/service/sockets/sockets.cpp index 8d3ba6f96..b191b5cf5 100644 --- a/src/core/hle/service/sockets/sockets.cpp +++ b/src/core/hle/service/sockets/sockets.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/hle/service/sockets/bsd.h" -#include "core/hle/service/sockets/ethc.h" #include "core/hle/service/sockets/nsd.h" #include "core/hle/service/sockets/sfdnsres.h" #include "core/hle/service/sockets/sockets.h" @@ -14,9 +13,6 @@ void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system std::make_shared(system, "bsd:u")->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system, "nsd:a")->InstallAsService(service_manager); std::make_shared(system, "nsd:u")->InstallAsService(service_manager); diff --git a/src/core/hle/service/wlan/wlan.cpp b/src/core/hle/service/wlan/wlan.cpp deleted file mode 100644 index 226e3034c..000000000 --- a/src/core/hle/service/wlan/wlan.cpp +++ /dev/null @@ -1,186 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include - -#include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" -#include "core/hle/service/wlan/wlan.h" - -namespace Service::WLAN { - -class WLANInfra final : public ServiceFramework { -public: - explicit WLANInfra(Core::System& system_) : ServiceFramework{system_, "wlan:inf"} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "OpenMode"}, - {1, nullptr, "CloseMode"}, - {2, nullptr, "GetMacAddress"}, - {3, nullptr, "StartScan"}, - {4, nullptr, "StopScan"}, - {5, nullptr, "Connect"}, - {6, nullptr, "CancelConnect"}, - {7, nullptr, "Disconnect"}, - {8, nullptr, "GetConnectionEvent"}, - {9, nullptr, "GetConnectionStatus"}, - {10, nullptr, "GetState"}, - {11, nullptr, "GetScanResult"}, - {12, nullptr, "GetRssi"}, - {13, nullptr, "ChangeRxAntenna"}, - {14, nullptr, "GetFwVersion"}, - {15, nullptr, "RequestSleep"}, - {16, nullptr, "RequestWakeUp"}, - {17, nullptr, "RequestIfUpDown"}, - {18, nullptr, "Unknown18"}, - {19, nullptr, "Unknown19"}, - {20, nullptr, "Unknown20"}, - {21, nullptr, "Unknown21"}, - {22, nullptr, "Unknown22"}, - {23, nullptr, "Unknown23"}, - {24, nullptr, "Unknown24"}, - {25, nullptr, "Unknown25"}, - {26, nullptr, "Unknown26"}, - {27, nullptr, "Unknown27"}, - {28, nullptr, "Unknown28"}, - {29, nullptr, "Unknown29"}, - {30, nullptr, "Unknown30"}, - {31, nullptr, "Unknown31"}, - {32, nullptr, "Unknown32"}, - {33, nullptr, "Unknown33"}, - {34, nullptr, "Unknown34"}, - {35, nullptr, "Unknown35"}, - {36, nullptr, "Unknown36"}, - {37, nullptr, "Unknown37"}, - {38, nullptr, "Unknown38"}, - }; - // clang-format on - - RegisterHandlers(functions); - } -}; - -class WLANLocal final : public ServiceFramework { -public: - explicit WLANLocal(Core::System& system_) : ServiceFramework{system_, "wlan:lcl"} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "Unknown0"}, - {1, nullptr, "Unknown1"}, - {2, nullptr, "Unknown2"}, - {3, nullptr, "Unknown3"}, - {4, nullptr, "Unknown4"}, - {5, nullptr, "Unknown5"}, - {6, nullptr, "GetMacAddress"}, - {7, nullptr, "CreateBss"}, - {8, nullptr, "DestroyBss"}, - {9, nullptr, "StartScan"}, - {10, nullptr, "StopScan"}, - {11, nullptr, "Connect"}, - {12, nullptr, "CancelConnect"}, - {13, nullptr, "Join"}, - {14, nullptr, "CancelJoin"}, - {15, nullptr, "Disconnect"}, - {16, nullptr, "SetBeaconLostCount"}, - {17, nullptr, "Unknown17"}, - {18, nullptr, "Unknown18"}, - {19, nullptr, "Unknown19"}, - {20, nullptr, "GetBssIndicationEvent"}, - {21, nullptr, "GetBssIndicationInfo"}, - {22, nullptr, "GetState"}, - {23, nullptr, "GetAllowedChannels"}, - {24, nullptr, "AddIe"}, - {25, nullptr, "DeleteIe"}, - {26, nullptr, "Unknown26"}, - {27, nullptr, "Unknown27"}, - {28, nullptr, "CreateRxEntry"}, - {29, nullptr, "DeleteRxEntry"}, - {30, nullptr, "Unknown30"}, - {31, nullptr, "Unknown31"}, - {32, nullptr, "AddMatchingDataToRxEntry"}, - {33, nullptr, "RemoveMatchingDataFromRxEntry"}, - {34, nullptr, "GetScanResult"}, - {35, nullptr, "Unknown35"}, - {36, nullptr, "SetActionFrameWithBeacon"}, - {37, nullptr, "CancelActionFrameWithBeacon"}, - {38, nullptr, "CreateRxEntryForActionFrame"}, - {39, nullptr, "DeleteRxEntryForActionFrame"}, - {40, nullptr, "Unknown40"}, - {41, nullptr, "Unknown41"}, - {42, nullptr, "CancelGetActionFrame"}, - {43, nullptr, "GetRssi"}, - {44, nullptr, "Unknown44"}, - {45, nullptr, "Unknown45"}, - {46, nullptr, "Unknown46"}, - {47, nullptr, "Unknown47"}, - {48, nullptr, "Unknown48"}, - {49, nullptr, "Unknown49"}, - {50, nullptr, "Unknown50"}, - {51, nullptr, "Unknown51"}, - }; - // clang-format on - - RegisterHandlers(functions); - } -}; - -class WLANLocalGetFrame final : public ServiceFramework { -public: - explicit WLANLocalGetFrame(Core::System& system_) : ServiceFramework{system_, "wlan:lg"} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "Unknown"}, - }; - // clang-format on - - RegisterHandlers(functions); - } -}; - -class WLANSocketGetFrame final : public ServiceFramework { -public: - explicit WLANSocketGetFrame(Core::System& system_) : ServiceFramework{system_, "wlan:sg"} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "Unknown"}, - }; - // clang-format on - - RegisterHandlers(functions); - } -}; - -class WLANSocketManager final : public ServiceFramework { -public: - explicit WLANSocketManager(Core::System& system_) : ServiceFramework{system_, "wlan:soc"} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "Unknown0"}, - {1, nullptr, "Unknown1"}, - {2, nullptr, "Unknown2"}, - {3, nullptr, "Unknown3"}, - {4, nullptr, "Unknown4"}, - {5, nullptr, "Unknown5"}, - {6, nullptr, "GetMacAddress"}, - {7, nullptr, "SwitchTsfTimerFunction"}, - {8, nullptr, "Unknown8"}, - {9, nullptr, "Unknown9"}, - {10, nullptr, "Unknown10"}, - {11, nullptr, "Unknown11"}, - {12, nullptr, "Unknown12"}, - }; - // clang-format on - - RegisterHandlers(functions); - } -}; - -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); -} - -} // namespace Service::WLAN diff --git a/src/core/hle/service/wlan/wlan.h b/src/core/hle/service/wlan/wlan.h deleted file mode 100644 index 535c3bf0d..000000000 --- a/src/core/hle/service/wlan/wlan.h +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -namespace Core { -class System; -} - -namespace Service::SM { -class ServiceManager; -} - -namespace Service::WLAN { - -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); - -} // namespace Service::WLAN From 139b645aa23045463c3b0919f47be03a330c87f9 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Tue, 14 Feb 2023 18:55:46 +0000 Subject: [PATCH 0063/1181] Allow >1 cpu threads on video decoding, disable multi-frame decoding --- src/video_core/host1x/codecs/codec.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/video_core/host1x/codecs/codec.cpp b/src/video_core/host1x/codecs/codec.cpp index 42e7d6e4f..3e9022dce 100644 --- a/src/video_core/host1x/codecs/codec.cpp +++ b/src/video_core/host1x/codecs/codec.cpp @@ -152,6 +152,8 @@ bool Codec::CreateGpuAvDevice() { void Codec::InitializeAvCodecContext() { av_codec_ctx = avcodec_alloc_context3(av_codec); av_opt_set(av_codec_ctx->priv_data, "tune", "zerolatency", 0); + av_codec_ctx->thread_count = 0; + av_codec_ctx->thread_type &= ~FF_THREAD_FRAME; } void Codec::InitializeGpuDecoder() { From 3b50906f00a4edba31372111d627df4a7ed9d14b Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Tue, 14 Feb 2023 00:22:39 +0000 Subject: [PATCH 0064/1181] Reimplement the invalidate_texture_data_cache register --- src/video_core/engines/maxwell_3d.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index ae9da6290..c501513e4 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp @@ -186,6 +186,7 @@ bool Maxwell3D::IsMethodExecutable(u32 method) { case MAXWELL3D_REG_INDEX(launch_dma): case MAXWELL3D_REG_INDEX(inline_data): case MAXWELL3D_REG_INDEX(fragment_barrier): + case MAXWELL3D_REG_INDEX(invalidate_texture_data_cache): case MAXWELL3D_REG_INDEX(tiled_cache_barrier): return true; default: @@ -375,6 +376,9 @@ void Maxwell3D::ProcessMethodCall(u32 method, u32 argument, u32 nonshadow_argume return; case MAXWELL3D_REG_INDEX(fragment_barrier): return rasterizer->FragmentBarrier(); + case MAXWELL3D_REG_INDEX(invalidate_texture_data_cache): + rasterizer->InvalidateGPUCache(); + return rasterizer->WaitForIdle(); case MAXWELL3D_REG_INDEX(tiled_cache_barrier): return rasterizer->TiledCacheBarrier(); default: From 58a2c19982c4baaf6f3ef59a313be25f7dc5eed1 Mon Sep 17 00:00:00 2001 From: liamwhite Date: Tue, 14 Feb 2023 16:29:35 -0500 Subject: [PATCH 0065/1181] Revert "main: Fix borderless fullscreen for high dpi scaled displays" --- src/yuzu/main.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 62dfc526a..c278d8dab 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -3167,20 +3167,8 @@ void GMainWindow::ShowFullscreen() { window->hide(); window->setWindowFlags(window->windowFlags() | Qt::FramelessWindowHint); const auto screen_geometry = GuessCurrentScreen(window)->geometry(); - // NB: On Windows, a borderless window will be treated the same as exclusive fullscreen - // when the window geometry matches the physical dimensions of the screen. - // However, with High DPI scaling, when the devicePixelRatioF() is > 1, the borderless - // window apparently is not treated as exclusive fullscreen and functions correctly. - // One can verify and replicate this behavior by using a high resolution (4K) display, - // and switching between 100% and 200% scaling in Windows' display settings. - // At 100%, without the addition of 1, it is treated as exclusive fullscreen. - // At 200%, with or without the addition of 1, it is treated as borderless windowed. - // Therefore, we can use (read: abuse) this difference in behavior to fix this issue for - // those with higher resolution displays when the Qt scaling ratio is > 1. - // Should this behavior be changed in the future, please revisit this workaround. - const bool must_add_one = devicePixelRatioF() == 1.0f; window->setGeometry(screen_geometry.x(), screen_geometry.y(), screen_geometry.width(), - screen_geometry.height() + (must_add_one ? 1 : 0)); + screen_geometry.height() + 1); window->raise(); window->showNormal(); }; From 98631b45b6012f997081dc76c6908dcba8df729b Mon Sep 17 00:00:00 2001 From: arades79 Date: Tue, 14 Feb 2023 19:14:29 -0500 Subject: [PATCH 0066/1181] remove constexpr from virtual function Signed-off-by: arades79 --- src/core/debugger/gdbstub_arch.cpp | 4 ++-- src/core/debugger/gdbstub_arch.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/debugger/gdbstub_arch.cpp b/src/core/debugger/gdbstub_arch.cpp index f3dd517bd..831c48513 100644 --- a/src/core/debugger/gdbstub_arch.cpp +++ b/src/core/debugger/gdbstub_arch.cpp @@ -41,7 +41,7 @@ static void PutSIMDRegister(std::array& simd_regs, size_t offset, const // For sample XML files see the GDB source /gdb/features // This XML defines what the registers are for this specific ARM device -constexpr std::string_view GDBStubA64::GetTargetXML() const { +std::string_view GDBStubA64::GetTargetXML() const { return R"( @@ -267,7 +267,7 @@ u32 GDBStubA64::BreakpointInstruction() const { return 0xd4200000; } -constexpr std::string_view GDBStubA32::GetTargetXML() const { +std::string_view GDBStubA32::GetTargetXML() const { return R"( diff --git a/src/core/debugger/gdbstub_arch.h b/src/core/debugger/gdbstub_arch.h index 1958fdf88..34530c788 100644 --- a/src/core/debugger/gdbstub_arch.h +++ b/src/core/debugger/gdbstub_arch.h @@ -16,7 +16,7 @@ namespace Core { class GDBStubArch { public: virtual ~GDBStubArch() = default; - virtual constexpr std::string_view GetTargetXML() const = 0; + virtual std::string_view GetTargetXML() const = 0; virtual std::string RegRead(const Kernel::KThread* thread, size_t id) const = 0; virtual void RegWrite(Kernel::KThread* thread, size_t id, std::string_view value) const = 0; virtual std::string ReadRegisters(const Kernel::KThread* thread) const = 0; @@ -27,7 +27,7 @@ public: class GDBStubA64 final : public GDBStubArch { public: - constexpr std::string_view GetTargetXML() const override; + std::string_view GetTargetXML() const override; std::string RegRead(const Kernel::KThread* thread, size_t id) const override; void RegWrite(Kernel::KThread* thread, size_t id, std::string_view value) const override; std::string ReadRegisters(const Kernel::KThread* thread) const override; @@ -47,7 +47,7 @@ private: class GDBStubA32 final : public GDBStubArch { public: - constexpr std::string_view GetTargetXML() const override; + std::string_view GetTargetXML() const override; std::string RegRead(const Kernel::KThread* thread, size_t id) const override; void RegWrite(Kernel::KThread* thread, size_t id, std::string_view value) const override; std::string ReadRegisters(const Kernel::KThread* thread) const override; From 57aaf00a0c7db0c5a98f6609afdc1dbaf41c32ef Mon Sep 17 00:00:00 2001 From: german77 Date: Wed, 15 Feb 2023 20:57:45 -0600 Subject: [PATCH 0067/1181] Qt: Fix mouse scalling --- src/yuzu/bootmanager.cpp | 24 ++++++++---------------- src/yuzu/bootmanager.h | 2 -- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 352300e88..a64e63a39 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -401,12 +401,6 @@ qreal GRenderWindow::windowPixelRatio() const { return devicePixelRatioF(); } -std::pair GRenderWindow::ScaleTouch(const QPointF& pos) const { - const qreal pixel_ratio = windowPixelRatio(); - return {static_cast(std::max(std::round(pos.x() * pixel_ratio), qreal{0.0})), - static_cast(std::max(std::round(pos.y() * pixel_ratio), qreal{0.0}))}; -} - void GRenderWindow::closeEvent(QCloseEvent* event) { emit Closed(); QWidget::closeEvent(event); @@ -649,10 +643,9 @@ void GRenderWindow::mousePressEvent(QMouseEvent* event) { // Qt sometimes returns the parent coordinates. To avoid this we read the global mouse // coordinates and map them to the current render area const auto pos = mapFromGlobal(QCursor::pos()); - const auto [x, y] = ScaleTouch(pos); - const auto [touch_x, touch_y] = MapToTouchScreen(x, y); + const auto [touch_x, touch_y] = MapToTouchScreen(pos.x(), pos.y()); const auto button = QtButtonToMouseButton(event->button()); - input_subsystem->GetMouse()->PressButton(x, y, touch_x, touch_y, button); + input_subsystem->GetMouse()->PressButton(pos.x(), pos.y(), touch_x, touch_y, button); emit MouseActivity(); } @@ -665,11 +658,10 @@ void GRenderWindow::mouseMoveEvent(QMouseEvent* event) { // Qt sometimes returns the parent coordinates. To avoid this we read the global mouse // coordinates and map them to the current render area const auto pos = mapFromGlobal(QCursor::pos()); - const auto [x, y] = ScaleTouch(pos); - const auto [touch_x, touch_y] = MapToTouchScreen(x, y); + const auto [touch_x, touch_y] = MapToTouchScreen(pos.x(), pos.y()); const int center_x = width() / 2; const int center_y = height() / 2; - input_subsystem->GetMouse()->MouseMove(x, y, touch_x, touch_y, center_x, center_y); + input_subsystem->GetMouse()->MouseMove(pos.x(), pos.y(), touch_x, touch_y, center_x, center_y); if (Settings::values.mouse_panning && !Settings::values.mouse_enabled) { QCursor::setPos(mapToGlobal(QPoint{center_x, center_y})); @@ -697,8 +689,8 @@ void GRenderWindow::wheelEvent(QWheelEvent* event) { void GRenderWindow::TouchBeginEvent(const QTouchEvent* event) { QList touch_points = event->touchPoints(); for (const auto& touch_point : touch_points) { - const auto [x, y] = ScaleTouch(touch_point.pos()); - const auto [touch_x, touch_y] = MapToTouchScreen(x, y); + const auto pos = touch_point.pos(); + const auto [touch_x, touch_y] = MapToTouchScreen(pos.x(), pos.y()); input_subsystem->GetTouchScreen()->TouchPressed(touch_x, touch_y, touch_point.id()); } } @@ -707,8 +699,8 @@ void GRenderWindow::TouchUpdateEvent(const QTouchEvent* event) { QList touch_points = event->touchPoints(); input_subsystem->GetTouchScreen()->ClearActiveFlag(); for (const auto& touch_point : touch_points) { - const auto [x, y] = ScaleTouch(touch_point.pos()); - const auto [touch_x, touch_y] = MapToTouchScreen(x, y); + const auto pos = touch_point.pos(); + const auto [touch_x, touch_y] = MapToTouchScreen(pos.x(), pos.y()); input_subsystem->GetTouchScreen()->TouchMoved(touch_x, touch_y, touch_point.id()); } input_subsystem->GetTouchScreen()->ReleaseInactiveTouch(); diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h index 092c6206f..627e19f42 100644 --- a/src/yuzu/bootmanager.h +++ b/src/yuzu/bootmanager.h @@ -184,8 +184,6 @@ public: void CaptureScreenshot(const QString& screenshot_path); - std::pair ScaleTouch(const QPointF& pos) const; - /** * Instructs the window to re-launch the application using the specified program_index. * @param program_index Specifies the index within the application of the program to launch. From 17207939e50b64592f93c623219b70d26272df4d Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Thu, 16 Feb 2023 13:38:50 -0600 Subject: [PATCH 0068/1181] input_common: Split mouse input into individual devices --- src/core/hid/emulated_console.cpp | 3 +- src/core/hid/emulated_devices.cpp | 3 + src/input_common/drivers/mouse.cpp | 67 +++++++++++++------ src/input_common/drivers/mouse.h | 38 +++++++++-- src/input_common/input_mapping.cpp | 4 ++ src/yuzu/bootmanager.cpp | 10 ++- .../configuration/configure_input_player.cpp | 2 +- src/yuzu/configuration/configure_ringcon.cpp | 2 +- src/yuzu/main.cpp | 8 +++ src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 8 ++- 10 files changed, 114 insertions(+), 31 deletions(-) diff --git a/src/core/hid/emulated_console.cpp b/src/core/hid/emulated_console.cpp index 1c91bbe40..17d663379 100644 --- a/src/core/hid/emulated_console.cpp +++ b/src/core/hid/emulated_console.cpp @@ -23,7 +23,8 @@ void EmulatedConsole::SetTouchParams() { // We can't use mouse as touch if native mouse is enabled if (!Settings::values.mouse_enabled) { - touch_params[index++] = Common::ParamPackage{"engine:mouse,axis_x:10,axis_y:11,button:0"}; + touch_params[index++] = + Common::ParamPackage{"engine:mouse,axis_x:0,axis_y:1,button:0,port:2"}; } touch_params[index++] = diff --git a/src/core/hid/emulated_devices.cpp b/src/core/hid/emulated_devices.cpp index 836f32c0f..578a6ff61 100644 --- a/src/core/hid/emulated_devices.cpp +++ b/src/core/hid/emulated_devices.cpp @@ -34,9 +34,12 @@ void EmulatedDevices::ReloadInput() { // First two axis are reserved for mouse position key_index = 2; for (auto& mouse_device : mouse_analog_devices) { + // Mouse axis are only mapped on port 1, pad 0 Common::ParamPackage mouse_params; mouse_params.Set("engine", "mouse"); mouse_params.Set("axis", static_cast(key_index)); + mouse_params.Set("port", 1); + mouse_params.Set("pad", 0); mouse_device = Common::Input::CreateInputDevice(mouse_params); key_index++; } diff --git a/src/input_common/drivers/mouse.cpp b/src/input_common/drivers/mouse.cpp index faf9cbdc3..da50e0a24 100644 --- a/src/input_common/drivers/mouse.cpp +++ b/src/input_common/drivers/mouse.cpp @@ -15,23 +15,39 @@ constexpr int mouse_axis_y = 1; constexpr int wheel_axis_x = 2; constexpr int wheel_axis_y = 3; constexpr int motion_wheel_y = 4; -constexpr int touch_axis_x = 10; -constexpr int touch_axis_y = 11; constexpr PadIdentifier identifier = { .guid = Common::UUID{}, .port = 0, .pad = 0, }; +constexpr PadIdentifier real_mouse_identifier = { + .guid = Common::UUID{}, + .port = 1, + .pad = 0, +}; + +constexpr PadIdentifier touch_identifier = { + .guid = Common::UUID{}, + .port = 2, + .pad = 0, +}; + Mouse::Mouse(std::string input_engine_) : InputEngine(std::move(input_engine_)) { PreSetController(identifier); + PreSetController(real_mouse_identifier); + PreSetController(touch_identifier); + + // Initialize all mouse axis PreSetAxis(identifier, mouse_axis_x); PreSetAxis(identifier, mouse_axis_y); PreSetAxis(identifier, wheel_axis_x); PreSetAxis(identifier, wheel_axis_y); PreSetAxis(identifier, motion_wheel_y); - PreSetAxis(identifier, touch_axis_x); - PreSetAxis(identifier, touch_axis_y); + PreSetAxis(real_mouse_identifier, mouse_axis_x); + PreSetAxis(real_mouse_identifier, mouse_axis_y); + PreSetAxis(touch_identifier, mouse_axis_x); + PreSetAxis(touch_identifier, mouse_axis_y); update_thread = std::jthread([this](std::stop_token stop_token) { UpdateThread(stop_token); }); } @@ -39,7 +55,7 @@ void Mouse::UpdateThread(std::stop_token stop_token) { Common::SetCurrentThreadName("Mouse"); constexpr int update_time = 10; while (!stop_token.stop_requested()) { - if (Settings::values.mouse_panning && !Settings::values.mouse_enabled) { + if (Settings::values.mouse_panning) { // Slow movement by 4% last_mouse_change *= 0.96f; const float sensitivity = @@ -57,17 +73,7 @@ void Mouse::UpdateThread(std::stop_token stop_token) { } } -void Mouse::MouseMove(int x, int y, f32 touch_x, f32 touch_y, int center_x, int center_y) { - // If native mouse is enabled just set the screen coordinates - if (Settings::values.mouse_enabled) { - SetAxis(identifier, mouse_axis_x, touch_x); - SetAxis(identifier, mouse_axis_y, touch_y); - return; - } - - SetAxis(identifier, touch_axis_x, touch_x); - SetAxis(identifier, touch_axis_y, touch_y); - +void Mouse::Move(int x, int y, int center_x, int center_y) { if (Settings::values.mouse_panning) { auto mouse_change = (Common::MakeVec(x, y) - Common::MakeVec(center_x, center_y)).Cast(); @@ -113,20 +119,41 @@ void Mouse::MouseMove(int x, int y, f32 touch_x, f32 touch_y, int center_x, int } } -void Mouse::PressButton(int x, int y, f32 touch_x, f32 touch_y, MouseButton button) { - SetAxis(identifier, touch_axis_x, touch_x); - SetAxis(identifier, touch_axis_y, touch_y); +void Mouse::MouseMove(f32 touch_x, f32 touch_y) { + SetAxis(real_mouse_identifier, mouse_axis_x, touch_x); + SetAxis(real_mouse_identifier, mouse_axis_y, touch_y); +} + +void Mouse::TouchMove(f32 touch_x, f32 touch_y) { + SetAxis(touch_identifier, mouse_axis_x, touch_x); + SetAxis(touch_identifier, mouse_axis_y, touch_y); +} + +void Mouse::PressButton(int x, int y, MouseButton button) { SetButton(identifier, static_cast(button), true); + // Set initial analog parameters mouse_origin = {x, y}; last_mouse_position = {x, y}; button_pressed = true; } +void Mouse::PressMouseButton(MouseButton button) { + SetButton(real_mouse_identifier, static_cast(button), true); +} + +void Mouse::PressTouchButton(f32 touch_x, f32 touch_y, MouseButton button) { + SetAxis(touch_identifier, mouse_axis_x, touch_x); + SetAxis(touch_identifier, mouse_axis_y, touch_y); + SetButton(touch_identifier, static_cast(button), true); +} + void Mouse::ReleaseButton(MouseButton button) { SetButton(identifier, static_cast(button), false); + SetButton(real_mouse_identifier, static_cast(button), false); + SetButton(touch_identifier, static_cast(button), false); - if (!Settings::values.mouse_panning && !Settings::values.mouse_enabled) { + if (!Settings::values.mouse_panning) { SetAxis(identifier, mouse_axis_x, 0); SetAxis(identifier, mouse_axis_y, 0); } diff --git a/src/input_common/drivers/mouse.h b/src/input_common/drivers/mouse.h index 72073cc23..f3b65bdd1 100644 --- a/src/input_common/drivers/mouse.h +++ b/src/input_common/drivers/mouse.h @@ -37,13 +37,43 @@ public: * @param center_x the x-coordinate of the middle of the screen * @param center_y the y-coordinate of the middle of the screen */ - void MouseMove(int x, int y, f32 touch_x, f32 touch_y, int center_x, int center_y); + void Move(int x, int y, int center_x, int center_y); /** - * Sets the status of all buttons bound with the key to pressed - * @param key_code the code of the key to press + * Signals that real mouse has moved. + * @param x the absolute position on the touchscreen of the cursor + * @param y the absolute position on the touchscreen of the cursor */ - void PressButton(int x, int y, f32 touch_x, f32 touch_y, MouseButton button); + void MouseMove(f32 touch_x, f32 touch_y); + + /** + * Signals that touch finger has moved. + * @param x the absolute position on the touchscreen of the cursor + * @param y the absolute position on the touchscreen of the cursor + */ + void TouchMove(f32 touch_x, f32 touch_y); + + /** + * Sets the status of a button to pressed + * @param x the x-coordinate of the cursor + * @param y the y-coordinate of the cursor + * @param button the id of the button to press + */ + void PressButton(int x, int y, MouseButton button); + + /** + * Sets the status of a mouse button to pressed + * @param button the id of the button to press + */ + void PressMouseButton(MouseButton button); + + /** + * Sets the status of touch finger to pressed + * @param x the absolute position on the touchscreen of the cursor + * @param y the absolute position on the touchscreen of the cursor + * @param button the id of the button to press + */ + void PressTouchButton(f32 touch_x, f32 touch_y, MouseButton button); /** * Sets the status of all buttons bound with the key to released diff --git a/src/input_common/input_mapping.cpp b/src/input_common/input_mapping.cpp index d6e49d2c5..6990a86b9 100644 --- a/src/input_common/input_mapping.cpp +++ b/src/input_common/input_mapping.cpp @@ -194,6 +194,10 @@ bool MappingFactory::IsDriverValid(const MappingData& data) const { if (data.engine == "keyboard" && data.pad.port != 0) { return false; } + // Only port 0 can be mapped on the mouse + if (data.engine == "mouse" && data.pad.port != 0) { + return false; + } // To prevent mapping with two devices we disable any UDP except motion if (!Settings::values.enable_udp_controller && data.engine == "cemuhookudp" && data.type != EngineInputType::Motion) { diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index a64e63a39..17acd3933 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -645,7 +645,10 @@ void GRenderWindow::mousePressEvent(QMouseEvent* event) { const auto pos = mapFromGlobal(QCursor::pos()); const auto [touch_x, touch_y] = MapToTouchScreen(pos.x(), pos.y()); const auto button = QtButtonToMouseButton(event->button()); - input_subsystem->GetMouse()->PressButton(pos.x(), pos.y(), touch_x, touch_y, button); + + input_subsystem->GetMouse()->PressMouseButton(button); + input_subsystem->GetMouse()->PressButton(pos.x(), pos.y(), button); + input_subsystem->GetMouse()->PressTouchButton(touch_x, touch_y, button); emit MouseActivity(); } @@ -661,7 +664,10 @@ void GRenderWindow::mouseMoveEvent(QMouseEvent* event) { const auto [touch_x, touch_y] = MapToTouchScreen(pos.x(), pos.y()); const int center_x = width() / 2; const int center_y = height() / 2; - input_subsystem->GetMouse()->MouseMove(pos.x(), pos.y(), touch_x, touch_y, center_x, center_y); + + input_subsystem->GetMouse()->MouseMove(touch_x, touch_y); + input_subsystem->GetMouse()->TouchMove(touch_x, touch_y); + input_subsystem->GetMouse()->Move(pos.x(), pos.y(), center_x, center_y); if (Settings::values.mouse_panning && !Settings::values.mouse_enabled) { QCursor::setPos(mapToGlobal(QPoint{center_x, center_y})); diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 723690e71..50b62293e 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -1490,7 +1490,7 @@ void ConfigureInputPlayer::mousePressEvent(QMouseEvent* event) { } const auto button = GRenderWindow::QtButtonToMouseButton(event->button()); - input_subsystem->GetMouse()->PressButton(0, 0, 0, 0, button); + input_subsystem->GetMouse()->PressButton(0, 0, button); } void ConfigureInputPlayer::wheelEvent(QWheelEvent* event) { diff --git a/src/yuzu/configuration/configure_ringcon.cpp b/src/yuzu/configuration/configure_ringcon.cpp index 1275f10c8..71afbc423 100644 --- a/src/yuzu/configuration/configure_ringcon.cpp +++ b/src/yuzu/configuration/configure_ringcon.cpp @@ -371,7 +371,7 @@ void ConfigureRingController::mousePressEvent(QMouseEvent* event) { } const auto button = GRenderWindow::QtButtonToMouseButton(event->button()); - input_subsystem->GetMouse()->PressButton(0, 0, 0, 0, button); + input_subsystem->GetMouse()->PressButton(0, 0, button); } void ConfigureRingController::keyPressEvent(QKeyEvent* event) { diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index a1c18ff90..a689a32db 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1165,6 +1165,14 @@ void GMainWindow::InitializeHotkeys() { Settings::values.use_speed_limit.SetValue(!Settings::values.use_speed_limit.GetValue()); }); connect_shortcut(QStringLiteral("Toggle Mouse Panning"), [&] { + if (Settings::values.mouse_enabled) { + Settings::values.mouse_panning = false; + QMessageBox::warning( + this, tr("Emulated mouse is enabled"), + tr("Real mouse input and mouse panning are incompatible. Please disable the " + "emulated mouse in input advanced settings to allow mouse panning.")); + return; + } Settings::values.mouse_panning = !Settings::values.mouse_panning; if (Settings::values.mouse_panning) { render_window->installEventFilter(render_window); diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index 5450b8c38..5153cdb79 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp @@ -62,7 +62,9 @@ void EmuWindow_SDL2::OnMouseButton(u32 button, u8 state, s32 x, s32 y) { const auto mouse_button = SDLButtonToMouseButton(button); if (state == SDL_PRESSED) { const auto [touch_x, touch_y] = MouseToTouchPos(x, y); - input_subsystem->GetMouse()->PressButton(x, y, touch_x, touch_y, mouse_button); + input_subsystem->GetMouse()->PressButton(x, y, mouse_button); + input_subsystem->GetMouse()->PressMouseButton(mouse_button); + input_subsystem->GetMouse()->PressTouchButton(touch_x, touch_y, mouse_button); } else { input_subsystem->GetMouse()->ReleaseButton(mouse_button); } @@ -70,7 +72,9 @@ void EmuWindow_SDL2::OnMouseButton(u32 button, u8 state, s32 x, s32 y) { void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) { const auto [touch_x, touch_y] = MouseToTouchPos(x, y); - input_subsystem->GetMouse()->MouseMove(x, y, touch_x, touch_y, 0, 0); + input_subsystem->GetMouse()->Move(x, y, 0, 0); + input_subsystem->GetMouse()->MouseMove(touch_x, touch_y); + input_subsystem->GetMouse()->TouchMove(touch_x, touch_y); } void EmuWindow_SDL2::OnFingerDown(float x, float y, std::size_t id) { From df9c8bdfd9019a42ede7ea90198567ae499afac8 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Thu, 16 Feb 2023 10:53:42 -0600 Subject: [PATCH 0069/1181] yuzu: Write to config file on important config changes --- src/yuzu/configuration/config.cpp | 1 + src/yuzu/game_list.cpp | 1 + src/yuzu/game_list.h | 1 + src/yuzu/main.cpp | 4 ++++ 4 files changed, 7 insertions(+) diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 31209fb2e..db68ed259 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -1103,6 +1103,7 @@ void Config::SaveValues() { SaveRendererValues(); SaveAudioValues(); SaveSystemValues(); + qt_config->sync(); } void Config::SaveAudioValues() { diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp index 22aa19c56..c21828b1d 100644 --- a/src/yuzu/game_list.cpp +++ b/src/yuzu/game_list.cpp @@ -870,6 +870,7 @@ void GameList::ToggleFavorite(u64 program_id) { tree_view->setRowHidden(0, item_model->invisibleRootItem()->index(), true); } } + SaveConfig(); } void GameList::AddFavorite(u64 program_id) { diff --git a/src/yuzu/game_list.h b/src/yuzu/game_list.h index f7ff93ed9..64e5af4c1 100644 --- a/src/yuzu/game_list.h +++ b/src/yuzu/game_list.h @@ -122,6 +122,7 @@ signals: void AddDirectory(); void ShowList(bool show); void PopulatingCompleted(); + void SaveConfig(); private slots: void OnItemExpanded(const QModelIndex& item); diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index a1c18ff90..c2542c3ba 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1271,6 +1271,7 @@ void GMainWindow::ConnectWidgetEvents() { connect(game_list, &GameList::ShowList, this, &GMainWindow::OnGameListShowList); connect(game_list, &GameList::PopulatingCompleted, [this] { multiplayer_state->UpdateGameList(game_list->GetModel()); }); + connect(game_list, &GameList::SaveConfig, this, &GMainWindow::OnSaveConfig); connect(game_list, &GameList::OpenPerGameGeneralRequested, this, &GMainWindow::OnGameListOpenPerGameProperties); @@ -2654,6 +2655,8 @@ void GMainWindow::OnGameListAddDirectory() { } else { LOG_WARNING(Frontend, "Selected directory is already in the game list"); } + + OnSaveConfig(); } void GMainWindow::OnGameListShowList(bool show) { @@ -3380,6 +3383,7 @@ void GMainWindow::OnConfigureTas() { return; } else if (result == QDialog::Accepted) { dialog.ApplyConfiguration(); + OnSaveConfig(); } } From 0a88c7dbbe627583b307933169c07bcd10bc18e1 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Thu, 16 Feb 2023 21:16:28 -0600 Subject: [PATCH 0070/1181] yuzu: Shutdown game on restart to reload per game config --- src/yuzu/main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index c2542c3ba..5560a30bd 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -3018,8 +3018,10 @@ void GMainWindow::OnRestartGame() { if (!system->IsPoweredOn()) { return; } - // Make a copy since BootGame edits game_path - BootGame(QString(current_game_path)); + // Make a copy since ShutdownGame edits game_path + const auto current_game = QString(current_game_path); + ShutdownGame(); + BootGame(current_game); } void GMainWindow::OnPauseGame() { From 1773a1039f7422df4faac08aa366b6a6bbd645e4 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 16 Feb 2023 23:16:08 -0500 Subject: [PATCH 0071/1181] kernel: add KObjectName --- src/core/CMakeLists.txt | 2 + src/core/hle/kernel/init/init_slab_setup.cpp | 2 + src/core/hle/kernel/k_object_name.cpp | 102 +++++++++++++++++++ src/core/hle/kernel/k_object_name.h | 86 ++++++++++++++++ src/core/hle/kernel/kernel.cpp | 14 +++ src/core/hle/kernel/kernel.h | 8 ++ src/core/hle/kernel/svc/svc_port.cpp | 54 +++++++++- 7 files changed, 265 insertions(+), 3 deletions(-) create mode 100644 src/core/hle/kernel/k_object_name.cpp create mode 100644 src/core/hle/kernel/k_object_name.h diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 16ced4595..ff5502d87 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -225,6 +225,8 @@ add_library(core STATIC hle/kernel/k_memory_manager.h hle/kernel/k_memory_region.h hle/kernel/k_memory_region_type.h + hle/kernel/k_object_name.cpp + hle/kernel/k_object_name.h hle/kernel/k_page_bitmap.h hle/kernel/k_page_buffer.cpp hle/kernel/k_page_buffer.h diff --git a/src/core/hle/kernel/init/init_slab_setup.cpp b/src/core/hle/kernel/init/init_slab_setup.cpp index 571acf4b2..abdb5639f 100644 --- a/src/core/hle/kernel/init/init_slab_setup.cpp +++ b/src/core/hle/kernel/init/init_slab_setup.cpp @@ -16,6 +16,7 @@ #include "core/hle/kernel/k_event_info.h" #include "core/hle/kernel/k_memory_layout.h" #include "core/hle/kernel/k_memory_manager.h" +#include "core/hle/kernel/k_object_name.h" #include "core/hle/kernel/k_page_buffer.h" #include "core/hle/kernel/k_port.h" #include "core/hle/kernel/k_process.h" @@ -49,6 +50,7 @@ namespace Kernel::Init { HANDLER(KThreadLocalPage, \ (SLAB_COUNT(KProcess) + (SLAB_COUNT(KProcess) + SLAB_COUNT(KThread)) / 8), \ ##__VA_ARGS__) \ + HANDLER(KObjectName, (SLAB_COUNT(KObjectName)), ##__VA_ARGS__) \ HANDLER(KResourceLimit, (SLAB_COUNT(KResourceLimit)), ##__VA_ARGS__) \ HANDLER(KEventInfo, (SLAB_COUNT(KThread) + SLAB_COUNT(KDebug)), ##__VA_ARGS__) \ HANDLER(KDebug, (SLAB_COUNT(KDebug)), ##__VA_ARGS__) \ diff --git a/src/core/hle/kernel/k_object_name.cpp b/src/core/hle/kernel/k_object_name.cpp new file mode 100644 index 000000000..df3a1c4c5 --- /dev/null +++ b/src/core/hle/kernel/k_object_name.cpp @@ -0,0 +1,102 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/hle/kernel/k_object_name.h" + +namespace Kernel { + +KObjectNameGlobalData::KObjectNameGlobalData(KernelCore& kernel) : m_object_list_lock{kernel} {} +KObjectNameGlobalData::~KObjectNameGlobalData() = default; + +void KObjectName::Initialize(KAutoObject* obj, const char* name) { + // Set member variables. + m_object = obj; + std::strncpy(m_name.data(), name, sizeof(m_name) - 1); + m_name[sizeof(m_name) - 1] = '\x00'; + + // Open a reference to the object we hold. + m_object->Open(); +} + +bool KObjectName::MatchesName(const char* name) const { + return std::strncmp(m_name.data(), name, sizeof(m_name)) == 0; +} + +Result KObjectName::NewFromName(KernelCore& kernel, KAutoObject* obj, const char* name) { + // Create a new object name. + KObjectName* new_name = KObjectName::Allocate(kernel); + R_UNLESS(new_name != nullptr, ResultOutOfResource); + + // Initialize the new name. + new_name->Initialize(obj, name); + + // Check if there's an existing name. + { + // Get the global data. + KObjectNameGlobalData& gd{kernel.ObjectNameGlobalData()}; + + // Ensure we have exclusive access to the global list. + KScopedLightLock lk{gd.GetObjectListLock()}; + + // If the object doesn't exist, put it into the list. + KScopedAutoObject existing_object = FindImpl(kernel, name); + if (existing_object.IsNull()) { + gd.GetObjectList().push_back(*new_name); + R_SUCCEED(); + } + } + + // The object already exists, which is an error condition. Perform cleanup. + obj->Close(); + KObjectName::Free(kernel, new_name); + R_THROW(ResultInvalidState); +} + +Result KObjectName::Delete(KernelCore& kernel, KAutoObject* obj, const char* compare_name) { + // Get the global data. + KObjectNameGlobalData& gd{kernel.ObjectNameGlobalData()}; + + // Ensure we have exclusive access to the global list. + KScopedLightLock lk{gd.GetObjectListLock()}; + + // Find a matching entry in the list, and delete it. + for (auto& name : gd.GetObjectList()) { + if (name.MatchesName(compare_name) && obj == name.GetObject()) { + // We found a match, clean up its resources. + obj->Close(); + gd.GetObjectList().erase(gd.GetObjectList().iterator_to(name)); + KObjectName::Free(kernel, std::addressof(name)); + R_SUCCEED(); + } + } + + // We didn't find the object in the list. + R_THROW(ResultNotFound); +} + +KScopedAutoObject KObjectName::Find(KernelCore& kernel, const char* name) { + // Get the global data. + KObjectNameGlobalData& gd{kernel.ObjectNameGlobalData()}; + + // Ensure we have exclusive access to the global list. + KScopedLightLock lk{gd.GetObjectListLock()}; + + return FindImpl(kernel, name); +} + +KScopedAutoObject KObjectName::FindImpl(KernelCore& kernel, const char* compare_name) { + // Get the global data. + KObjectNameGlobalData& gd{kernel.ObjectNameGlobalData()}; + + // Try to find a matching object in the global list. + for (const auto& name : gd.GetObjectList()) { + if (name.MatchesName(compare_name)) { + return name.GetObject(); + } + } + + // There's no matching entry in the list. + return nullptr; +} + +} // namespace Kernel diff --git a/src/core/hle/kernel/k_object_name.h b/src/core/hle/kernel/k_object_name.h new file mode 100644 index 000000000..b7f943134 --- /dev/null +++ b/src/core/hle/kernel/k_object_name.h @@ -0,0 +1,86 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include +#include +#include + +#include "core/hle/kernel/k_light_lock.h" +#include "core/hle/kernel/slab_helpers.h" +#include "core/hle/kernel/svc_results.h" + +namespace Kernel { + +class KObjectNameGlobalData; + +class KObjectName : public KSlabAllocated, public boost::intrusive::list_base_hook<> { +public: + explicit KObjectName(KernelCore&) {} + virtual ~KObjectName() = default; + + static constexpr size_t NameLengthMax = 12; + using List = boost::intrusive::list; + + static Result NewFromName(KernelCore& kernel, KAutoObject* obj, const char* name); + static Result Delete(KernelCore& kernel, KAutoObject* obj, const char* name); + + static KScopedAutoObject Find(KernelCore& kernel, const char* name); + + template + static Result Delete(KernelCore& kernel, const char* name) { + // Find the object. + KScopedAutoObject obj = Find(kernel, name); + R_UNLESS(obj.IsNotNull(), ResultNotFound); + + // Cast the object to the desired type. + Derived* derived = obj->DynamicCast(); + R_UNLESS(derived != nullptr, ResultNotFound); + + // Check that the object is closed. + R_UNLESS(derived->IsServerClosed(), ResultInvalidState); + + return Delete(kernel, obj.GetPointerUnsafe(), name); + } + + template + requires(std::derived_from) + static KScopedAutoObject Find(KernelCore& kernel, const char* name) { + return Find(kernel, name); + } + +private: + static KScopedAutoObject FindImpl(KernelCore& kernel, const char* name); + + void Initialize(KAutoObject* obj, const char* name); + + bool MatchesName(const char* name) const; + KAutoObject* GetObject() const { + return m_object; + } + +private: + std::array m_name{}; + KAutoObject* m_object{}; +}; + +class KObjectNameGlobalData { +public: + explicit KObjectNameGlobalData(KernelCore& kernel); + ~KObjectNameGlobalData(); + + KLightLock& GetObjectListLock() { + return m_object_list_lock; + } + + KObjectName::List& GetObjectList() { + return m_object_list; + } + +private: + KLightLock m_object_list_lock; + KObjectName::List m_object_list; +}; + +} // namespace Kernel diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index b1922659d..3a68a5633 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -29,6 +29,7 @@ #include "core/hle/kernel/k_hardware_timer.h" #include "core/hle/kernel/k_memory_layout.h" #include "core/hle/kernel/k_memory_manager.h" +#include "core/hle/kernel/k_object_name.h" #include "core/hle/kernel/k_page_buffer.h" #include "core/hle/kernel/k_process.h" #include "core/hle/kernel/k_resource_limit.h" @@ -84,6 +85,7 @@ struct KernelCore::Impl { InitializeShutdownThreads(); InitializePhysicalCores(); InitializePreemption(kernel); + InitializeGlobalData(kernel); // Initialize the Dynamic Slab Heaps. { @@ -194,6 +196,8 @@ struct KernelCore::Impl { } } + object_name_global_data.reset(); + // Ensure that the object list container is finalized and properly shutdown. global_object_list_container->Finalize(); global_object_list_container.reset(); @@ -363,6 +367,10 @@ struct KernelCore::Impl { } } + void InitializeGlobalData(KernelCore& kernel) { + object_name_global_data = std::make_unique(kernel); + } + void MakeApplicationProcess(KProcess* process) { application_process = process; } @@ -838,6 +846,8 @@ struct KernelCore::Impl { std::unique_ptr global_object_list_container; + std::unique_ptr object_name_global_data; + /// Map of named ports managed by the kernel, which can be retrieved using /// the ConnectToPort SVC. std::unordered_map service_interface_factory; @@ -1138,6 +1148,10 @@ void KernelCore::SetCurrentEmuThread(KThread* thread) { impl->SetCurrentEmuThread(thread); } +KObjectNameGlobalData& KernelCore::ObjectNameGlobalData() { + return *impl->object_name_global_data; +} + KMemoryManager& KernelCore::MemoryManager() { return *impl->memory_manager; } diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index a236e6b42..6e0668f7f 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -44,6 +44,8 @@ class KHardwareTimer; class KLinkedListNode; class KMemoryLayout; class KMemoryManager; +class KObjectName; +class KObjectNameGlobalData; class KPageBuffer; class KPageBufferSlabHeap; class KPort; @@ -240,6 +242,9 @@ public: /// Register the current thread as a non CPU core thread. void RegisterHostThread(KThread* existing_thread = nullptr); + /// Gets global data for KObjectName. + KObjectNameGlobalData& ObjectNameGlobalData(); + /// Gets the virtual memory manager for the kernel. KMemoryManager& MemoryManager(); @@ -372,6 +377,8 @@ public: return slab_heap_container->page_buffer; } else if constexpr (std::is_same_v) { return slab_heap_container->thread_local_page; + } else if constexpr (std::is_same_v) { + return slab_heap_container->object_name; } else if constexpr (std::is_same_v) { return slab_heap_container->session_request; } else if constexpr (std::is_same_v) { @@ -443,6 +450,7 @@ private: KSlabHeap device_address_space; KSlabHeap page_buffer; KSlabHeap thread_local_page; + KSlabHeap object_name; KSlabHeap session_request; KSlabHeap secure_system_resource; KSlabHeap event_info; diff --git a/src/core/hle/kernel/svc/svc_port.cpp b/src/core/hle/kernel/svc/svc_port.cpp index 2b7cebde5..2f9bfcb52 100644 --- a/src/core/hle/kernel/svc/svc_port.cpp +++ b/src/core/hle/kernel/svc/svc_port.cpp @@ -5,6 +5,7 @@ #include "core/core.h" #include "core/hle/kernel/k_client_port.h" #include "core/hle/kernel/k_client_session.h" +#include "core/hle/kernel/k_object_name.h" #include "core/hle/kernel/k_port.h" #include "core/hle/kernel/k_process.h" #include "core/hle/kernel/svc.h" @@ -74,10 +75,57 @@ Result ConnectToPort(Core::System& system, Handle* out_handle, Handle port) { R_THROW(ResultNotImplemented); } -Result ManageNamedPort(Core::System& system, Handle* out_server_handle, uint64_t name, +Result ManageNamedPort(Core::System& system, Handle* out_server_handle, uint64_t user_name, int32_t max_sessions) { - UNIMPLEMENTED(); - R_THROW(ResultNotImplemented); + // Copy the provided name from user memory to kernel memory. + std::array name{}; + system.Memory().ReadBlock(user_name, name.data(), sizeof(name)); + + // Validate that sessions and name are valid. + R_UNLESS(max_sessions >= 0, ResultOutOfRange); + R_UNLESS(name[sizeof(name) - 1] == '\x00', ResultOutOfRange); + + if (max_sessions > 0) { + // Get the current handle table. + auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable(); + + // Create a new port. + KPort* port = KPort::Create(system.Kernel()); + R_UNLESS(port != nullptr, ResultOutOfResource); + + // Initialize the new port. + port->Initialize(max_sessions, false, ""); + + // Register the port. + KPort::Register(system.Kernel(), port); + + // Ensure that our only reference to the port is in the handle table when we're done. + SCOPE_EXIT({ + port->GetClientPort().Close(); + port->GetServerPort().Close(); + }); + + // Register the handle in the table. + R_TRY(handle_table.Add(out_server_handle, std::addressof(port->GetServerPort()))); + ON_RESULT_FAILURE { + handle_table.Remove(*out_server_handle); + }; + + // Create a new object name. + R_TRY(KObjectName::NewFromName(system.Kernel(), std::addressof(port->GetClientPort()), + name.data())); + } else /* if (max_sessions == 0) */ { + // Ensure that this else case is correct. + ASSERT(max_sessions == 0); + + // If we're closing, there's no server handle. + *out_server_handle = InvalidHandle; + + // Delete the object. + R_TRY(KObjectName::Delete(system.Kernel(), name.data())); + } + + R_SUCCEED(); } Result ConnectToNamedPort64(Core::System& system, Handle* out_handle, uint64_t name) { From 165ebbb63c19486c1ffb9a4a05a94179e9a47c17 Mon Sep 17 00:00:00 2001 From: german77 Date: Sun, 19 Feb 2023 17:52:44 -0600 Subject: [PATCH 0072/1181] Qt: Reintroduce scaling for touch input --- src/yuzu/bootmanager.cpp | 20 ++++++++++++++------ src/yuzu/bootmanager.h | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 17acd3933..4c7bf28d8 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -401,6 +401,12 @@ qreal GRenderWindow::windowPixelRatio() const { return devicePixelRatioF(); } +std::pair GRenderWindow::ScaleTouch(const QPointF& pos) const { + const qreal pixel_ratio = windowPixelRatio(); + return {static_cast(std::max(std::round(pos.x() * pixel_ratio), qreal{0.0})), + static_cast(std::max(std::round(pos.y() * pixel_ratio), qreal{0.0}))}; +} + void GRenderWindow::closeEvent(QCloseEvent* event) { emit Closed(); QWidget::closeEvent(event); @@ -643,7 +649,8 @@ void GRenderWindow::mousePressEvent(QMouseEvent* event) { // Qt sometimes returns the parent coordinates. To avoid this we read the global mouse // coordinates and map them to the current render area const auto pos = mapFromGlobal(QCursor::pos()); - const auto [touch_x, touch_y] = MapToTouchScreen(pos.x(), pos.y()); + const auto [x, y] = ScaleTouch(pos); + const auto [touch_x, touch_y] = MapToTouchScreen(x, y); const auto button = QtButtonToMouseButton(event->button()); input_subsystem->GetMouse()->PressMouseButton(button); @@ -661,7 +668,8 @@ void GRenderWindow::mouseMoveEvent(QMouseEvent* event) { // Qt sometimes returns the parent coordinates. To avoid this we read the global mouse // coordinates and map them to the current render area const auto pos = mapFromGlobal(QCursor::pos()); - const auto [touch_x, touch_y] = MapToTouchScreen(pos.x(), pos.y()); + const auto [x, y] = ScaleTouch(pos); + const auto [touch_x, touch_y] = MapToTouchScreen(x, y); const int center_x = width() / 2; const int center_y = height() / 2; @@ -695,8 +703,8 @@ void GRenderWindow::wheelEvent(QWheelEvent* event) { void GRenderWindow::TouchBeginEvent(const QTouchEvent* event) { QList touch_points = event->touchPoints(); for (const auto& touch_point : touch_points) { - const auto pos = touch_point.pos(); - const auto [touch_x, touch_y] = MapToTouchScreen(pos.x(), pos.y()); + const auto [x, y] = ScaleTouch(touch_point.pos()); + const auto [touch_x, touch_y] = MapToTouchScreen(x, y); input_subsystem->GetTouchScreen()->TouchPressed(touch_x, touch_y, touch_point.id()); } } @@ -705,8 +713,8 @@ void GRenderWindow::TouchUpdateEvent(const QTouchEvent* event) { QList touch_points = event->touchPoints(); input_subsystem->GetTouchScreen()->ClearActiveFlag(); for (const auto& touch_point : touch_points) { - const auto pos = touch_point.pos(); - const auto [touch_x, touch_y] = MapToTouchScreen(pos.x(), pos.y()); + const auto [x, y] = ScaleTouch(touch_point.pos()); + const auto [touch_x, touch_y] = MapToTouchScreen(x, y); input_subsystem->GetTouchScreen()->TouchMoved(touch_x, touch_y, touch_point.id()); } input_subsystem->GetTouchScreen()->ReleaseInactiveTouch(); diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h index 627e19f42..bb4eca07f 100644 --- a/src/yuzu/bootmanager.h +++ b/src/yuzu/bootmanager.h @@ -147,6 +147,8 @@ public: qreal windowPixelRatio() const; + std::pair ScaleTouch(const QPointF& pos) const; + void closeEvent(QCloseEvent* event) override; void resizeEvent(QResizeEvent* event) override; From 23151ff498993badb341ddf6de5ed38a5833e41c Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 15 Feb 2023 18:16:04 -0500 Subject: [PATCH 0073/1181] core: defer cpu shutdown --- src/core/core.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/core.cpp b/src/core/core.cpp index fb9b25d12..2683533b8 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -380,9 +380,7 @@ struct System::Impl { gpu_core->NotifyShutdown(); } - kernel.ShutdownCores(); - cpu_manager.Shutdown(); - debugger.reset(); + kernel.SuspendApplication(true); if (services) { services->KillNVNFlinger(); } @@ -398,6 +396,9 @@ struct System::Impl { gpu_core.reset(); host1x_core.reset(); perf_stats.reset(); + kernel.ShutdownCores(); + cpu_manager.Shutdown(); + debugger.reset(); kernel.Shutdown(); memory.Reset(); From a9369726147c7499e0016e183d5d56a7b44efe4b Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 18 Feb 2023 16:26:48 -0500 Subject: [PATCH 0074/1181] service: refactor server architecture Converts services to have their own processes --- src/core/CMakeLists.txt | 6 +- src/core/core.cpp | 4 + src/core/core.h | 5 + src/core/debugger/debugger.cpp | 7 +- src/core/debugger/gdbstub.cpp | 6 +- src/core/hle/ipc_helpers.h | 12 +- src/core/hle/kernel/hle_ipc.cpp | 30 +- src/core/hle/kernel/hle_ipc.h | 34 +- src/core/hle/kernel/k_process.cpp | 4 - src/core/hle/kernel/k_thread.cpp | 20 + src/core/hle/kernel/k_thread.h | 4 + src/core/hle/kernel/kernel.cpp | 207 +++++----- src/core/hle/kernel/kernel.h | 69 +--- src/core/hle/kernel/service_thread.cpp | 206 ---------- src/core/hle/kernel/service_thread.h | 29 -- src/core/hle/kernel/svc/svc_info.cpp | 5 + src/core/hle/kernel/svc/svc_port.cpp | 51 +-- src/core/hle/service/acc/acc.cpp | 21 +- src/core/hle/service/acc/acc.h | 3 +- src/core/hle/service/am/am.cpp | 19 +- src/core/hle/service/am/am.h | 4 +- src/core/hle/service/aoc/aoc_u.cpp | 7 +- src/core/hle/service/aoc/aoc_u.h | 3 +- src/core/hle/service/apm/apm.cpp | 20 +- src/core/hle/service/apm/apm.h | 3 +- src/core/hle/service/audio/audin_u.cpp | 5 +- src/core/hle/service/audio/audio.cpp | 21 +- src/core/hle/service/audio/audio.h | 3 +- src/core/hle/service/audio/audout_u.cpp | 10 +- src/core/hle/service/audio/audren_u.cpp | 15 +- src/core/hle/service/bcat/bcat_module.cpp | 26 +- src/core/hle/service/bcat/bcat_module.h | 3 +- src/core/hle/service/bpc/bpc.cpp | 11 +- src/core/hle/service/bpc/bpc.h | 2 +- src/core/hle/service/btdrv/btdrv.cpp | 10 +- src/core/hle/service/btdrv/btdrv.h | 3 +- src/core/hle/service/btm/btm.cpp | 14 +- src/core/hle/service/btm/btm.h | 2 +- src/core/hle/service/caps/caps.cpp | 18 +- src/core/hle/service/caps/caps.h | 3 +- src/core/hle/service/erpt/erpt.cpp | 11 +- src/core/hle/service/erpt/erpt.h | 7 +- src/core/hle/service/es/es.cpp | 8 +- src/core/hle/service/es/es.h | 7 +- src/core/hle/service/eupld/eupld.cpp | 11 +- src/core/hle/service/eupld/eupld.h | 7 +- src/core/hle/service/fatal/fatal.cpp | 10 +- src/core/hle/service/fatal/fatal.h | 2 +- src/core/hle/service/fgm/fgm.cpp | 14 +- src/core/hle/service/fgm/fgm.h | 6 +- .../hle/service/filesystem/filesystem.cpp | 12 +- src/core/hle/service/filesystem/filesystem.h | 2 +- src/core/hle/service/filesystem/fsp_srv.cpp | 13 +- src/core/hle/service/friend/friend.cpp | 22 +- src/core/hle/service/friend/friend.h | 3 +- src/core/hle/service/glue/glue.cpp | 23 +- src/core/hle/service/glue/glue.h | 3 +- src/core/hle/service/grc/grc.cpp | 9 +- src/core/hle/service/grc/grc.h | 6 +- src/core/hle/service/hid/hid.cpp | 21 +- src/core/hle/service/hid/hid.h | 3 +- src/core/hle/service/jit/jit.cpp | 12 +- src/core/hle/service/jit/jit.h | 7 +- src/core/hle/service/kernel_helpers.cpp | 11 +- src/core/hle/service/kernel_helpers.h | 1 + src/core/hle/service/lbl/lbl.cpp | 8 +- src/core/hle/service/lbl/lbl.h | 6 +- src/core/hle/service/ldn/ldn.cpp | 18 +- src/core/hle/service/ldn/ldn.h | 7 +- src/core/hle/service/ldr/ldr.cpp | 18 +- src/core/hle/service/ldr/ldr.h | 7 +- src/core/hle/service/lm/lm.cpp | 8 +- src/core/hle/service/lm/lm.h | 3 +- src/core/hle/service/mig/mig.cpp | 9 +- src/core/hle/service/mig/mig.h | 6 +- src/core/hle/service/mii/mii.cpp | 12 +- src/core/hle/service/mii/mii.h | 6 +- src/core/hle/service/mm/mm_u.cpp | 8 +- src/core/hle/service/mm/mm_u.h | 7 +- src/core/hle/service/mnpp/mnpp_app.cpp | 10 +- src/core/hle/service/mnpp/mnpp_app.h | 7 +- src/core/hle/service/mutex.cpp | 43 +++ src/core/hle/service/mutex.h | 31 ++ src/core/hle/service/ncm/ncm.cpp | 11 +- src/core/hle/service/ncm/ncm.h | 6 +- src/core/hle/service/nfc/nfc.cpp | 15 +- src/core/hle/service/nfc/nfc.h | 6 +- src/core/hle/service/nfp/nfp.cpp | 8 +- src/core/hle/service/nfp/nfp.h | 2 +- src/core/hle/service/ngct/ngct.cpp | 8 +- src/core/hle/service/ngct/ngct.h | 7 +- src/core/hle/service/nifm/nifm.cpp | 15 +- src/core/hle/service/nifm/nifm.h | 7 +- src/core/hle/service/nim/nim.cpp | 15 +- src/core/hle/service/nim/nim.h | 6 +- src/core/hle/service/npns/npns.cpp | 11 +- src/core/hle/service/npns/npns.h | 6 +- src/core/hle/service/ns/ns.cpp | 32 +- src/core/hle/service/ns/ns.h | 3 +- src/core/hle/service/nvdrv/nvdrv.cpp | 23 +- src/core/hle/service/nvdrv/nvdrv.h | 4 +- .../hle/service/nvdrv/nvdrv_interface.cpp | 2 +- src/core/hle/service/olsc/olsc.cpp | 9 +- src/core/hle/service/olsc/olsc.h | 7 +- src/core/hle/service/pcie/pcie.cpp | 9 +- src/core/hle/service/pcie/pcie.h | 6 +- src/core/hle/service/pctl/pctl_module.cpp | 26 +- src/core/hle/service/pctl/pctl_module.h | 3 +- src/core/hle/service/pcv/pcv.cpp | 15 +- src/core/hle/service/pcv/pcv.h | 6 +- src/core/hle/service/pm/pm.cpp | 16 +- src/core/hle/service/pm/pm.h | 3 +- src/core/hle/service/prepo/prepo.cpp | 21 +- src/core/hle/service/prepo/prepo.h | 6 +- src/core/hle/service/psc/psc.cpp | 11 +- src/core/hle/service/psc/psc.h | 2 +- src/core/hle/service/ptm/ptm.cpp | 10 +- src/core/hle/service/ptm/ptm.h | 6 +- src/core/hle/service/server_manager.cpp | 358 ++++++++++++++++++ src/core/hle/service/server_manager.h | 75 ++++ src/core/hle/service/service.cpp | 149 +++----- src/core/hle/service/service.h | 19 +- src/core/hle/service/set/settings.cpp | 15 +- src/core/hle/service/set/settings.h | 7 +- src/core/hle/service/sm/sm.cpp | 32 +- src/core/hle/service/sm/sm.h | 8 +- src/core/hle/service/sm/sm_controller.cpp | 7 +- src/core/hle/service/sockets/bsd.cpp | 3 +- src/core/hle/service/sockets/sockets.cpp | 19 +- src/core/hle/service/sockets/sockets.h | 7 +- src/core/hle/service/spl/spl_module.cpp | 20 +- src/core/hle/service/spl/spl_module.h | 3 +- src/core/hle/service/ssl/ssl.cpp | 9 +- src/core/hle/service/ssl/ssl.h | 7 +- src/core/hle/service/time/time.cpp | 15 +- src/core/hle/service/time/time.h | 3 +- src/core/hle/service/usb/usb.cpp | 17 +- src/core/hle/service/usb/usb.h | 6 +- src/core/hle/service/vi/vi.cpp | 24 +- src/core/hle/service/vi/vi.h | 10 +- 140 files changed, 1388 insertions(+), 1138 deletions(-) delete mode 100644 src/core/hle/kernel/service_thread.cpp delete mode 100644 src/core/hle/kernel/service_thread.h create mode 100644 src/core/hle/service/mutex.cpp create mode 100644 src/core/hle/service/mutex.h create mode 100644 src/core/hle/service/server_manager.cpp create mode 100644 src/core/hle/service/server_manager.h diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index ff5502d87..dcdfcbac5 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -293,8 +293,6 @@ add_library(core STATIC hle/kernel/physical_memory.h hle/kernel/process_capability.cpp hle/kernel/process_capability.h - hle/kernel/service_thread.cpp - hle/kernel/service_thread.h hle/kernel/slab_helpers.h hle/kernel/svc.cpp hle/kernel/svc.h @@ -684,6 +682,10 @@ add_library(core STATIC hle/service/ptm/ts.h hle/service/kernel_helpers.cpp hle/service/kernel_helpers.h + hle/service/mutex.cpp + hle/service/mutex.h + hle/service/server_manager.cpp + hle/service/server_manager.h hle/service/service.cpp hle/service/service.h hle/service/set/set.cpp diff --git a/src/core/core.cpp b/src/core/core.cpp index 2683533b8..4a1372d15 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -939,6 +939,10 @@ const Network::RoomNetwork& System::GetRoomNetwork() const { return impl->room_network; } +void System::RunServer(std::unique_ptr&& server_manager) { + return impl->kernel.RunServer(std::move(server_manager)); +} + void System::RegisterExecuteProgramCallback(ExecuteProgramCallback&& callback) { impl->execute_program_callback = std::move(callback); } diff --git a/src/core/core.h b/src/core/core.h index 0042ac170..91e78672e 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -61,6 +61,8 @@ namespace Glue { class ARPManager; } +class ServerManager; + namespace SM { class ServiceManager; } // namespace SM @@ -417,6 +419,9 @@ public: /// Tells if the system debugger is enabled. [[nodiscard]] bool DebuggerEnabled() const; + /// Runs a server instance until shutdown. + void RunServer(std::unique_ptr&& server_manager); + /// Type used for the frontend to designate a callback for System to re-launch the application /// using a specified program index. using ExecuteProgramCallback = std::function; diff --git a/src/core/debugger/debugger.cpp b/src/core/debugger/debugger.cpp index a9675df76..a1589fecb 100644 --- a/src/core/debugger/debugger.cpp +++ b/src/core/debugger/debugger.cpp @@ -16,6 +16,7 @@ #include "core/debugger/debugger_interface.h" #include "core/debugger/gdbstub.h" #include "core/hle/kernel/global_scheduler_context.h" +#include "core/hle/kernel/k_process.h" #include "core/hle/kernel/k_scheduler.h" template @@ -284,12 +285,12 @@ private: void UpdateActiveThread() { const auto& threads{ThreadList()}; if (std::find(threads.begin(), threads.end(), state->active_thread) == threads.end()) { - state->active_thread = threads[0]; + state->active_thread = threads.front(); } } - const std::vector& ThreadList() { - return system.GlobalSchedulerContext().GetThreadList(); + const std::list& ThreadList() { + return system.ApplicationProcess()->GetThreadList(); } private: diff --git a/src/core/debugger/gdbstub.cpp b/src/core/debugger/gdbstub.cpp index 945ec528e..18afe97e1 100644 --- a/src/core/debugger/gdbstub.cpp +++ b/src/core/debugger/gdbstub.cpp @@ -573,7 +573,7 @@ void GDBStub::HandleQuery(std::string_view command) { SendReply(PaginateBuffer(buffer, command.substr(21))); } else if (command.starts_with("fThreadInfo")) { // beginning of list - const auto& threads = system.GlobalSchedulerContext().GetThreadList(); + const auto& threads = system.ApplicationProcess()->GetThreadList(); std::vector thread_ids; for (const auto& thread : threads) { thread_ids.push_back(fmt::format("{:x}", thread->GetThreadID())); @@ -587,7 +587,7 @@ void GDBStub::HandleQuery(std::string_view command) { buffer += R"()"; buffer += ""; - const auto& threads = system.GlobalSchedulerContext().GetThreadList(); + const auto& threads = system.ApplicationProcess()->GetThreadList(); for (const auto* thread : threads) { auto thread_name{GetThreadName(system, thread)}; if (!thread_name) { @@ -817,7 +817,7 @@ void GDBStub::HandleRcmd(const std::vector& command) { } Kernel::KThread* GDBStub::GetThreadByID(u64 thread_id) { - const auto& threads{system.GlobalSchedulerContext().GetThreadList()}; + const auto& threads{system.ApplicationProcess()->GetThreadList()}; for (auto* thread : threads) { if (thread->GetThreadID() == thread_id) { return thread; diff --git a/src/core/hle/ipc_helpers.h b/src/core/hle/ipc_helpers.h index 38d6cfaff..f8ab55d83 100644 --- a/src/core/hle/ipc_helpers.h +++ b/src/core/hle/ipc_helpers.h @@ -15,6 +15,7 @@ #include "core/hle/kernel/k_resource_limit.h" #include "core/hle/kernel/k_session.h" #include "core/hle/result.h" +#include "core/hle/service/server_manager.h" namespace IPC { @@ -145,7 +146,9 @@ public: template void PushIpcInterface(std::shared_ptr iface) { - if (context->GetManager()->IsDomain()) { + auto manager{context->GetManager()}; + + if (manager->IsDomain()) { context->AddDomainObject(std::move(iface)); } else { kernel.ApplicationProcess()->GetResourceLimit()->Reserve( @@ -153,8 +156,11 @@ public: auto* session = Kernel::KSession::Create(kernel); session->Initialize(nullptr, iface->GetServiceName()); - iface->RegisterSession(&session->GetServerSession(), - std::make_shared(kernel)); + + auto next_manager = std::make_shared( + kernel, manager->GetServerManager()); + next_manager->SetSessionHandler(iface); + manager->GetServerManager().RegisterSession(&session->GetServerSession(), next_manager); context->AddMoveObject(&session->GetClientSession()); } diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index 494151eef..876fbbe53 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp @@ -21,36 +21,18 @@ #include "core/hle/kernel/k_server_session.h" #include "core/hle/kernel/k_thread.h" #include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/service_thread.h" #include "core/memory.h" namespace Kernel { -SessionRequestHandler::SessionRequestHandler(KernelCore& kernel_, const char* service_name_, - ServiceThreadType thread_type) - : kernel{kernel_}, service_thread{thread_type == ServiceThreadType::CreateNew - ? kernel.CreateServiceThread(service_name_) - : kernel.GetDefaultServiceThread()} {} +SessionRequestHandler::SessionRequestHandler(KernelCore& kernel_, const char* service_name_) + : kernel{kernel_} {} -SessionRequestHandler::~SessionRequestHandler() { - kernel.ReleaseServiceThread(service_thread); -} +SessionRequestHandler::~SessionRequestHandler() = default; -void SessionRequestHandler::AcceptSession(KServerPort* server_port) { - auto* server_session = server_port->AcceptSession(); - ASSERT(server_session != nullptr); - - RegisterSession(server_session, std::make_shared(kernel)); -} - -void SessionRequestHandler::RegisterSession(KServerSession* server_session, - std::shared_ptr manager) { - manager->SetSessionHandler(shared_from_this()); - service_thread.RegisterServerSession(server_session, manager); - server_session->Close(); -} - -SessionRequestManager::SessionRequestManager(KernelCore& kernel_) : kernel{kernel_} {} +SessionRequestManager::SessionRequestManager(KernelCore& kernel_, + Service::ServerManager& server_manager_) + : kernel{kernel_}, server_manager{server_manager_} {} SessionRequestManager::~SessionRequestManager() = default; diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index 5bf4f171b..059b21991 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h @@ -31,12 +31,8 @@ class ResponseBuilder; namespace Service { class ServiceFrameworkBase; -} - -enum class ServiceThreadType { - Default, - CreateNew, -}; +class ServerManager; +} // namespace Service namespace Kernel { @@ -53,9 +49,6 @@ class KThread; class KReadableEvent; class KSession; class SessionRequestManager; -class ServiceThread; - -enum class ThreadWakeupReason; /** * Interface implemented by HLE Session handlers. @@ -64,8 +57,7 @@ enum class ThreadWakeupReason; */ class SessionRequestHandler : public std::enable_shared_from_this { public: - SessionRequestHandler(KernelCore& kernel_, const char* service_name_, - ServiceThreadType thread_type); + SessionRequestHandler(KernelCore& kernel_, const char* service_name_); virtual ~SessionRequestHandler(); /** @@ -79,17 +71,8 @@ public: virtual Result HandleSyncRequest(Kernel::KServerSession& session, Kernel::HLERequestContext& context) = 0; - void AcceptSession(KServerPort* server_port); - void RegisterSession(KServerSession* server_session, - std::shared_ptr manager); - - ServiceThread& GetServiceThread() const { - return service_thread; - } - protected: KernelCore& kernel; - ServiceThread& service_thread; }; using SessionRequestHandlerWeakPtr = std::weak_ptr; @@ -102,7 +85,7 @@ using SessionRequestHandlerPtr = std::shared_ptr; */ class SessionRequestManager final { public: - explicit SessionRequestManager(KernelCore& kernel); + explicit SessionRequestManager(KernelCore& kernel, Service::ServerManager& server_manager); ~SessionRequestManager(); bool IsDomain() const { @@ -155,15 +138,15 @@ public: session_handler = std::move(handler); } - ServiceThread& GetServiceThread() const { - return session_handler->GetServiceThread(); - } - bool HasSessionRequestHandler(const HLERequestContext& context) const; Result HandleDomainSyncRequest(KServerSession* server_session, HLERequestContext& context); Result CompleteSyncRequest(KServerSession* server_session, HLERequestContext& context); + Service::ServerManager& GetServerManager() { + return server_manager; + } + private: bool convert_to_domain{}; bool is_domain{}; @@ -172,6 +155,7 @@ private: private: KernelCore& kernel; + Service::ServerManager& server_manager; }; /** diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp index 0e4283a0c..d9c1a0eb3 100644 --- a/src/core/hle/kernel/k_process.cpp +++ b/src/core/hle/kernel/k_process.cpp @@ -119,7 +119,6 @@ void KProcess::DecrementRunningThreadCount() { if (const auto prev = num_running_threads--; prev == 1) { // TODO(bunnei): Process termination to be implemented when multiprocess is supported. - UNIMPLEMENTED_MSG("KProcess termination is not implemennted!"); } } @@ -357,9 +356,6 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std: system_resource_size = metadata.GetSystemResourceSize(); image_size = code_size; - // We currently do not support process-specific system resource - UNIMPLEMENTED_IF(system_resource_size != 0); - KScopedResourceReservation memory_reservation( resource_limit, LimitableResource::PhysicalMemoryMax, code_size + system_resource_size); if (!memory_reservation.Succeeded()) { diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index 2d3da9d66..599d05947 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -29,6 +29,7 @@ #include "core/hle/kernel/k_thread_queue.h" #include "core/hle/kernel/k_worker_task_manager.h" #include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/svc.h" #include "core/hle/kernel/svc_results.h" #include "core/hle/kernel/svc_types.h" #include "core/hle/result.h" @@ -298,6 +299,25 @@ Result KThread::InitializeUserThread(Core::System& system, KThread* thread, KThr ThreadType::User, system.GetCpuManager().GetGuestThreadFunc())); } +Result KThread::InitializeServiceThread(Core::System& system, KThread* thread, + std::function&& func, s32 prio, s32 virt_core, + KProcess* owner) { + system.Kernel().GlobalSchedulerContext().AddThread(thread); + std::function func2{[&system, func{std::move(func)}] { + // Similar to UserModeThreadStarter. + system.Kernel().CurrentScheduler()->OnThreadStart(); + + // Run the guest function. + func(); + + // Exit. + Svc::ExitThread(system); + }}; + + R_RETURN(InitializeThread(thread, {}, {}, {}, prio, virt_core, owner, ThreadType::HighPriority, + std::move(func2))); +} + void KThread::PostDestroy(uintptr_t arg) { KProcess* owner = reinterpret_cast(arg & ~1ULL); const bool resource_limit_release_hint = (arg & 1); diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h index ca82ce3b6..a04de21bc 100644 --- a/src/core/hle/kernel/k_thread.h +++ b/src/core/hle/kernel/k_thread.h @@ -434,6 +434,10 @@ public: VAddr user_stack_top, s32 prio, s32 virt_core, KProcess* owner); + [[nodiscard]] static Result InitializeServiceThread(Core::System& system, KThread* thread, + std::function&& thread_func, + s32 prio, s32 virt_core, KProcess* owner); + public: struct StackParameters { u8 svc_permission[0x10]; diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 2ff253183..ce94d3605 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -34,14 +34,15 @@ #include "core/hle/kernel/k_process.h" #include "core/hle/kernel/k_resource_limit.h" #include "core/hle/kernel/k_scheduler.h" +#include "core/hle/kernel/k_scoped_resource_reservation.h" #include "core/hle/kernel/k_shared_memory.h" #include "core/hle/kernel/k_system_resource.h" #include "core/hle/kernel/k_thread.h" #include "core/hle/kernel/k_worker_task_manager.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/physical_core.h" -#include "core/hle/kernel/service_thread.h" #include "core/hle/result.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/sm/sm.h" #include "core/memory.h" @@ -55,9 +56,7 @@ struct KernelCore::Impl { static constexpr size_t BlockInfoSlabHeapSize = 4000; static constexpr size_t ReservedDynamicPageCount = 64; - explicit Impl(Core::System& system_, KernelCore& kernel_) - : service_threads_manager{1, "ServiceThreadsManager"}, - service_thread_barrier{2}, system{system_} {} + explicit Impl(Core::System& system_, KernelCore& kernel_) : system{system_} {} void SetMulticore(bool is_multi) { is_multicore = is_multi; @@ -98,8 +97,6 @@ struct KernelCore::Impl { InitializeHackSharedMemory(); RegisterHostThread(nullptr); - - default_service_thread = &CreateServiceThread(kernel, "DefaultServiceThread"); } void InitializeCores() { @@ -140,11 +137,6 @@ struct KernelCore::Impl { preemption_event = nullptr; - for (auto& iter : named_ports) { - iter.second->Close(); - } - named_ports.clear(); - exclusive_monitor.reset(); // Cleanup persistent kernel objects @@ -207,8 +199,9 @@ struct KernelCore::Impl { } void CloseServices() { - // Ensures all service threads gracefully shutdown. - ClearServiceThreads(); + // Ensures all servers gracefully shutdown. + std::scoped_lock lk{server_lock}; + server_managers.clear(); } void InitializePhysicalCores() { @@ -761,55 +754,6 @@ struct KernelCore::Impl { "HidBus:SharedMemory"); } - KClientPort* CreateNamedServicePort(std::string name) { - auto search = service_interface_factory.find(name); - if (search == service_interface_factory.end()) { - UNIMPLEMENTED(); - return {}; - } - - return &search->second(system.ServiceManager(), system); - } - - void RegisterNamedServiceHandler(std::string name, KServerPort* server_port) { - auto search = service_interface_handlers.find(name); - if (search == service_interface_handlers.end()) { - return; - } - - search->second(system.ServiceManager(), server_port); - } - - Kernel::ServiceThread& CreateServiceThread(KernelCore& kernel, const std::string& name) { - auto* ptr = new ServiceThread(kernel, name); - - service_threads_manager.QueueWork( - [this, ptr]() { service_threads.emplace(ptr, std::unique_ptr(ptr)); }); - - return *ptr; - } - - void ReleaseServiceThread(Kernel::ServiceThread& service_thread) { - auto* ptr = &service_thread; - - if (ptr == default_service_thread) { - // Nothing to do here, the service is using default_service_thread, which will be - // released on shutdown. - return; - } - - service_threads_manager.QueueWork([this, ptr]() { service_threads.erase(ptr); }); - } - - void ClearServiceThreads() { - service_threads_manager.QueueWork([this] { - service_threads.clear(); - default_service_thread = nullptr; - service_thread_barrier.Sync(); - }); - service_thread_barrier.Sync(); - } - std::mutex registered_objects_lock; std::mutex registered_in_use_objects_lock; @@ -839,14 +783,12 @@ struct KernelCore::Impl { std::unique_ptr object_name_global_data; - /// Map of named ports managed by the kernel, which can be retrieved using - /// the ConnectToPort SVC. - std::unordered_map service_interface_factory; - std::unordered_map service_interface_handlers; - NamedPortTable named_ports; std::unordered_set registered_objects; std::unordered_set registered_in_use_objects; + std::mutex server_lock; + std::vector> server_managers; + std::unique_ptr exclusive_monitor; std::array, Core::Hardware::NUM_CPU_CORES> cores; @@ -881,12 +823,6 @@ struct KernelCore::Impl { // Memory layout std::unique_ptr memory_layout; - // Threads used for services - std::unordered_map> service_threads; - ServiceThread* default_service_thread{}; - Common::ThreadWorker service_threads_manager; - Common::Barrier service_thread_barrier; - std::array shutdown_threads{}; std::array, Core::Hardware::NUM_CPU_CORES> schedulers{}; @@ -1050,23 +986,6 @@ void KernelCore::PrepareReschedule(std::size_t id) { // TODO: Reimplement, this } -void KernelCore::RegisterNamedService(std::string name, ServiceInterfaceFactory&& factory) { - impl->service_interface_factory.emplace(std::move(name), factory); -} - -void KernelCore::RegisterInterfaceForNamedService(std::string name, - ServiceInterfaceHandlerFn&& handler) { - impl->service_interface_handlers.emplace(std::move(name), handler); -} - -KClientPort* KernelCore::CreateNamedServicePort(std::string name) { - return impl->CreateNamedServicePort(std::move(name)); -} - -void KernelCore::RegisterNamedServiceHandler(std::string name, KServerPort* server_port) { - impl->RegisterNamedServiceHandler(std::move(name), server_port); -} - void KernelCore::RegisterKernelObject(KAutoObject* object) { std::scoped_lock lk{impl->registered_objects_lock}; impl->registered_objects.insert(object); @@ -1087,8 +1006,19 @@ void KernelCore::UnregisterInUseObject(KAutoObject* object) { impl->registered_in_use_objects.erase(object); } -bool KernelCore::IsValidNamedPort(NamedPortTable::const_iterator port) const { - return port != impl->named_ports.cend(); +void KernelCore::RunServer(std::unique_ptr&& server_manager) { + auto* manager = server_manager.get(); + + { + std::scoped_lock lk{impl->server_lock}; + if (impl->is_shutting_down) { + return; + } + + impl->server_managers.emplace_back(std::move(server_manager)); + } + + manager->LoopProcess(); } u32 KernelCore::CreateNewObjectID() { @@ -1127,6 +1057,87 @@ void KernelCore::RegisterHostThread(KThread* existing_thread) { } } +static std::jthread RunHostThreadFunc(KernelCore& kernel, KProcess* process, + std::string&& thread_name, std::function&& func) { + // Reserve a new thread from the process resource limit. + KScopedResourceReservation thread_reservation(process, LimitableResource::ThreadCountMax); + ASSERT(thread_reservation.Succeeded()); + + // Initialize the thread. + KThread* thread = KThread::Create(kernel); + ASSERT(R_SUCCEEDED(KThread::InitializeDummyThread(thread, process))); + + // Commit the thread reservation. + thread_reservation.Commit(); + + return std::jthread( + [&kernel, thread, thread_name{std::move(thread_name)}, func{std::move(func)}] { + // Set the thread name. + Common::SetCurrentThreadName(thread_name.c_str()); + + // Register the thread. + kernel.RegisterHostThread(thread); + + // Run the callback. + func(); + + // Close the thread. + // This will free the process if it is the last reference. + thread->Close(); + }); +} + +std::jthread KernelCore::RunOnHostCoreProcess(std::string&& process_name, + std::function func) { + // Make a new process. + KProcess* process = KProcess::Create(*this); + ASSERT(R_SUCCEEDED(KProcess::Initialize(process, System(), "", KProcess::ProcessType::Userland, + GetSystemResourceLimit()))); + + // Ensure that we don't hold onto any extra references. + SCOPE_EXIT({ process->Close(); }); + + // Run the host thread. + return RunHostThreadFunc(*this, process, std::move(process_name), std::move(func)); +} + +std::jthread KernelCore::RunOnHostCoreThread(std::string&& thread_name, + std::function func) { + // Get the current process. + KProcess* process = GetCurrentProcessPointer(*this); + + // Run the host thread. + return RunHostThreadFunc(*this, process, std::move(thread_name), std::move(func)); +} + +void KernelCore::RunOnGuestCoreProcess(std::string&& process_name, std::function func) { + constexpr s32 ServiceThreadPriority = 16; + constexpr s32 ServiceThreadCore = 3; + + // Make a new process. + KProcess* process = KProcess::Create(*this); + ASSERT(R_SUCCEEDED(KProcess::Initialize(process, System(), "", KProcess::ProcessType::Userland, + GetSystemResourceLimit()))); + + // Ensure that we don't hold onto any extra references. + SCOPE_EXIT({ process->Close(); }); + + // Reserve a new thread from the process resource limit. + KScopedResourceReservation thread_reservation(process, LimitableResource::ThreadCountMax); + ASSERT(thread_reservation.Succeeded()); + + // Initialize the thread. + KThread* thread = KThread::Create(*this); + ASSERT(R_SUCCEEDED(KThread::InitializeServiceThread( + System(), thread, std::move(func), ServiceThreadPriority, ServiceThreadCore, process))); + + // Commit the thread reservation. + thread_reservation.Commit(); + + // Begin running the thread. + ASSERT(R_SUCCEEDED(thread->Run())); +} + u32 KernelCore::GetCurrentHostThreadID() const { return impl->GetCurrentHostThreadID(); } @@ -1271,18 +1282,6 @@ void KernelCore::ExitSVCProfile() { MicroProfileLeave(MICROPROFILE_TOKEN(Kernel_SVC), impl->svc_ticks[CurrentPhysicalCoreIndex()]); } -Kernel::ServiceThread& KernelCore::CreateServiceThread(const std::string& name) { - return impl->CreateServiceThread(*this, name); -} - -Kernel::ServiceThread& KernelCore::GetDefaultServiceThread() const { - return *impl->default_service_thread; -} - -void KernelCore::ReleaseServiceThread(Kernel::ServiceThread& service_thread) { - impl->ReleaseServiceThread(service_thread); -} - Init::KSlabResourceCounts& KernelCore::SlabResourceCounts() { return impl->slab_resource_counts; } diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 6e0668f7f..4449f6949 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -9,6 +9,8 @@ #include #include #include + +#include "common/polyfill_thread.h" #include "core/hardware_properties.h" #include "core/hle/kernel/k_auto_object.h" #include "core/hle/kernel/k_slab_heap.h" @@ -24,6 +26,10 @@ class CoreTiming; struct EventType; } // namespace Core::Timing +namespace Service { +class ServerManager; +} + namespace Service::SM { class ServiceManager; } @@ -65,13 +71,6 @@ class KTransferMemory; class KWorkerTaskManager; class KCodeMemory; class PhysicalCore; -class ServiceThread; -class Synchronization; - -using ServiceInterfaceFactory = - std::function; - -using ServiceInterfaceHandlerFn = std::function; namespace Init { struct KSlabResourceCounts; @@ -80,15 +79,8 @@ struct KSlabResourceCounts; template class KSlabHeap; -using EmuThreadHandle = uintptr_t; -constexpr EmuThreadHandle EmuThreadHandleInvalid{}; -constexpr EmuThreadHandle EmuThreadHandleReserved{1ULL << 63}; - /// Represents a single instance of the kernel. class KernelCore { -private: - using NamedPortTable = std::unordered_map; - public: /// Constructs an instance of the kernel using the given System /// instance as a context for any necessary system-related state, @@ -196,18 +188,6 @@ public: void InvalidateCpuInstructionCacheRange(VAddr addr, std::size_t size); - /// Registers a named HLE service, passing a factory used to open a port to that service. - void RegisterNamedService(std::string name, ServiceInterfaceFactory&& factory); - - /// Registers a setup function for the named HLE service. - void RegisterInterfaceForNamedService(std::string name, ServiceInterfaceHandlerFn&& handler); - - /// Opens a port to a service previously registered with RegisterNamedService. - KClientPort* CreateNamedServicePort(std::string name); - - /// Accepts a session on a port created by CreateNamedServicePort. - void RegisterNamedServiceHandler(std::string name, KServerPort* server_port); - /// Registers all kernel objects with the global emulation state, this is purely for tracking /// leaks after emulation has been shutdown. void RegisterKernelObject(KAutoObject* object); @@ -224,8 +204,8 @@ public: /// destroyed during the current emulation session. void UnregisterInUseObject(KAutoObject* object); - /// Determines whether or not the given port is a valid named port. - bool IsValidNamedPort(NamedPortTable::const_iterator port) const; + // Runs the given server manager until shutdown. + void RunServer(std::unique_ptr&& server_manager); /// Gets the current host_thread/guest_thread pointer. KThread* GetCurrentEmuThread() const; @@ -242,6 +222,12 @@ public: /// Register the current thread as a non CPU core thread. void RegisterHostThread(KThread* existing_thread = nullptr); + void RunOnGuestCoreProcess(std::string&& process_name, std::function func); + + std::jthread RunOnHostCoreProcess(std::string&& process_name, std::function func); + + std::jthread RunOnHostCoreThread(std::string&& thread_name, std::function func); + /// Gets global data for KObjectName. KObjectNameGlobalData& ObjectNameGlobalData(); @@ -310,33 +296,6 @@ public: void ExitSVCProfile(); - /** - * Creates a host thread to execute HLE service requests, which are used to execute service - * routines asynchronously. While these are allocated per ServerSession, these need to be owned - * and managed outside of ServerSession to avoid a circular dependency. In general, most - * services can just use the default service thread, and not need their own host service thread. - * See GetDefaultServiceThread. - * @param name String name for the ServerSession creating this thread, used for debug - * purposes. - * @returns A reference to the newly created service thread. - */ - Kernel::ServiceThread& CreateServiceThread(const std::string& name); - - /** - * Gets the default host service thread, which executes HLE service requests. Unless service - * requests need to block on the host, the default service thread should be used in favor of - * creating a new service thread. - * @returns A reference to the default service thread. - */ - Kernel::ServiceThread& GetDefaultServiceThread() const; - - /** - * Releases a HLE service thread, instructing KernelCore to free it. This should be called when - * the ServerSession associated with the thread is destroyed. - * @param service_thread Service thread to release. - */ - void ReleaseServiceThread(Kernel::ServiceThread& service_thread); - /// Workaround for single-core mode when preempting threads while idle. bool IsPhantomModeForSingleCore() const; void SetIsPhantomModeForSingleCore(bool value); diff --git a/src/core/hle/kernel/service_thread.cpp b/src/core/hle/kernel/service_thread.cpp deleted file mode 100644 index 38afa720b..000000000 --- a/src/core/hle/kernel/service_thread.cpp +++ /dev/null @@ -1,206 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include -#include -#include -#include -#include - -#include "common/polyfill_thread.h" -#include "common/scope_exit.h" -#include "common/thread.h" -#include "core/hle/ipc_helpers.h" -#include "core/hle/kernel/hle_ipc.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_session.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/service_thread.h" - -namespace Kernel { - -class ServiceThread::Impl final { -public: - explicit Impl(KernelCore& kernel, const std::string& service_name); - ~Impl(); - - void WaitAndProcessImpl(); - void SessionClosed(KServerSession* server_session, - std::shared_ptr manager); - void LoopProcess(); - - void RegisterServerSession(KServerSession* session, - std::shared_ptr manager); - -private: - KernelCore& kernel; - const std::string m_service_name; - - std::jthread m_host_thread{}; - std::mutex m_session_mutex{}; - std::map> m_sessions{}; - KEvent* m_wakeup_event{}; - KThread* m_thread{}; - std::atomic m_shutdown_requested{}; -}; - -void ServiceThread::Impl::WaitAndProcessImpl() { - // Create local list of waitable sessions. - std::vector objs; - std::vector> managers; - - { - // Lock to get the set. - std::scoped_lock lk{m_session_mutex}; - - // Reserve the needed quantity. - objs.reserve(m_sessions.size() + 1); - managers.reserve(m_sessions.size()); - - // Copy to our local list. - for (const auto& [session, manager] : m_sessions) { - objs.push_back(session); - managers.push_back(manager); - } - - // Insert the wakeup event at the end. - objs.push_back(&m_wakeup_event->GetReadableEvent()); - } - - // Wait on the list of sessions. - s32 index{-1}; - Result rc = KSynchronizationObject::Wait(kernel, &index, objs.data(), - static_cast(objs.size()), -1); - ASSERT(!rc.IsFailure()); - - // If this was the wakeup event, clear it and finish. - if (index >= static_cast(objs.size() - 1)) { - m_wakeup_event->Clear(); - return; - } - - // This event is from a server session. - auto* server_session = static_cast(objs[index]); - auto& manager = managers[index]; - - // Fetch the HLE request context. - std::shared_ptr context; - rc = server_session->ReceiveRequest(&context, manager); - - // If the session was closed, handle that. - if (rc == ResultSessionClosed) { - SessionClosed(server_session, manager); - - // Finish. - return; - } - - // TODO: handle other cases - ASSERT(rc == ResultSuccess); - - // Perform the request. - Result service_rc = manager->CompleteSyncRequest(server_session, *context); - - // Reply to the client. - rc = server_session->SendReplyHLE(); - - if (rc == ResultSessionClosed || service_rc == IPC::ERR_REMOTE_PROCESS_DEAD) { - SessionClosed(server_session, manager); - return; - } - - // TODO: handle other cases - ASSERT(rc == ResultSuccess); - ASSERT(service_rc == ResultSuccess); -} - -void ServiceThread::Impl::SessionClosed(KServerSession* server_session, - std::shared_ptr manager) { - { - // Lock to get the set. - std::scoped_lock lk{m_session_mutex}; - - // Erase the session. - ASSERT(m_sessions.erase(server_session) == 1); - } - - // Close our reference to the server session. - server_session->Close(); -} - -void ServiceThread::Impl::LoopProcess() { - Common::SetCurrentThreadName(m_service_name.c_str()); - - kernel.RegisterHostThread(m_thread); - - while (!m_shutdown_requested.load()) { - WaitAndProcessImpl(); - } -} - -void ServiceThread::Impl::RegisterServerSession(KServerSession* server_session, - std::shared_ptr manager) { - // Open the server session. - server_session->Open(); - - { - // Lock to get the set. - std::scoped_lock lk{m_session_mutex}; - - // Insert the session and manager. - m_sessions[server_session] = manager; - } - - // Signal the wakeup event. - m_wakeup_event->Signal(); -} - -ServiceThread::Impl::~Impl() { - // Shut down the processing thread. - m_shutdown_requested.store(true); - m_wakeup_event->Signal(); - m_host_thread.join(); - - // Close all remaining sessions. - for (const auto& [server_session, manager] : m_sessions) { - server_session->Close(); - } - - // Destroy remaining managers. - m_sessions.clear(); - - // Close event. - m_wakeup_event->GetReadableEvent().Close(); - m_wakeup_event->Close(); - - // Close thread. - m_thread->Close(); -} - -ServiceThread::Impl::Impl(KernelCore& kernel_, const std::string& service_name) - : kernel{kernel_}, m_service_name{service_name} { - // Initialize event. - m_wakeup_event = KEvent::Create(kernel); - m_wakeup_event->Initialize(nullptr); - - // Initialize thread. - m_thread = KThread::Create(kernel); - ASSERT(KThread::InitializeDummyThread(m_thread, nullptr).IsSuccess()); - - // Start thread. - m_host_thread = std::jthread([this] { LoopProcess(); }); -} - -ServiceThread::ServiceThread(KernelCore& kernel, const std::string& name) - : impl{std::make_unique(kernel, name)} {} - -ServiceThread::~ServiceThread() = default; - -void ServiceThread::RegisterServerSession(KServerSession* session, - std::shared_ptr manager) { - impl->RegisterServerSession(session, manager); -} - -} // namespace Kernel diff --git a/src/core/hle/kernel/service_thread.h b/src/core/hle/kernel/service_thread.h deleted file mode 100644 index fb4325531..000000000 --- a/src/core/hle/kernel/service_thread.h +++ /dev/null @@ -1,29 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include -#include - -namespace Kernel { - -class HLERequestContext; -class KernelCore; -class KSession; -class SessionRequestManager; - -class ServiceThread final { -public: - explicit ServiceThread(KernelCore& kernel, const std::string& name); - ~ServiceThread(); - - void RegisterServerSession(KServerSession* session, - std::shared_ptr manager); - -private: - class Impl; - std::unique_ptr impl; -}; - -} // namespace Kernel diff --git a/src/core/hle/kernel/svc/svc_info.cpp b/src/core/hle/kernel/svc/svc_info.cpp index 58dc47508..cbed4dc8c 100644 --- a/src/core/hle/kernel/svc/svc_info.cpp +++ b/src/core/hle/kernel/svc/svc_info.cpp @@ -126,6 +126,11 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle *result = process->GetTotalPhysicalMemoryUsedWithoutSystemResource(); return ResultSuccess; + case InfoType::IsApplication: + LOG_WARNING(Kernel_SVC, "(STUBBED) Assuming process is application"); + *result = true; + return ResultSuccess; + case InfoType::FreeThreadCount: *result = process->GetFreeThreadCount(); return ResultSuccess; diff --git a/src/core/hle/kernel/svc/svc_port.cpp b/src/core/hle/kernel/svc/svc_port.cpp index 2f9bfcb52..ac095b338 100644 --- a/src/core/hle/kernel/svc/svc_port.cpp +++ b/src/core/hle/kernel/svc/svc_port.cpp @@ -12,56 +12,40 @@ namespace Kernel::Svc { -/// Connect to an OS service given the port name, returns the handle to the port to out -Result ConnectToNamedPort(Core::System& system, Handle* out, VAddr port_name_address) { - auto& memory = system.Memory(); - if (!memory.IsValidVirtualAddress(port_name_address)) { - LOG_ERROR(Kernel_SVC, - "Port Name Address is not a valid virtual address, port_name_address=0x{:016X}", - port_name_address); - return ResultNotFound; - } +Result ConnectToNamedPort(Core::System& system, Handle* out, VAddr user_name) { + // Copy the provided name from user memory to kernel memory. + auto string_name = system.Memory().ReadCString(user_name, KObjectName::NameLengthMax); - static constexpr std::size_t PortNameMaxLength = 11; - // Read 1 char beyond the max allowed port name to detect names that are too long. - const std::string port_name = memory.ReadCString(port_name_address, PortNameMaxLength + 1); - if (port_name.size() > PortNameMaxLength) { - LOG_ERROR(Kernel_SVC, "Port name is too long, expected {} but got {}", PortNameMaxLength, - port_name.size()); - return ResultOutOfRange; - } + std::array name{}; + std::strncpy(name.data(), string_name.c_str(), KObjectName::NameLengthMax - 1); - LOG_TRACE(Kernel_SVC, "called port_name={}", port_name); + // Validate that the name is valid. + R_UNLESS(name[sizeof(name) - 1] == '\x00', ResultOutOfRange); // Get the current handle table. - auto& kernel = system.Kernel(); - auto& handle_table = GetCurrentProcess(kernel).GetHandleTable(); + auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable(); // Find the client port. - auto port = kernel.CreateNamedServicePort(port_name); - if (!port) { - LOG_ERROR(Kernel_SVC, "tried to connect to unknown port: {}", port_name); - return ResultNotFound; - } + auto port = KObjectName::Find(system.Kernel(), name.data()); + R_UNLESS(port.IsNotNull(), ResultNotFound); // Reserve a handle for the port. // NOTE: Nintendo really does write directly to the output handle here. R_TRY(handle_table.Reserve(out)); - auto handle_guard = SCOPE_GUARD({ handle_table.Unreserve(*out); }); + ON_RESULT_FAILURE { + handle_table.Unreserve(*out); + }; // Create a session. - KClientSession* session{}; + KClientSession* session; R_TRY(port->CreateSession(std::addressof(session))); - kernel.RegisterNamedServiceHandler(port_name, &port->GetParent()->GetServerPort()); - // Register the session in the table, close the extra reference. handle_table.Register(*out, session); session->Close(); // We succeeded. - handle_guard.Cancel(); - return ResultSuccess; + R_SUCCEED(); } Result CreatePort(Core::System& system, Handle* out_server, Handle* out_client, @@ -77,9 +61,12 @@ Result ConnectToPort(Core::System& system, Handle* out_handle, Handle port) { Result ManageNamedPort(Core::System& system, Handle* out_server_handle, uint64_t user_name, int32_t max_sessions) { + // Copy the provided name from user memory to kernel memory. + auto string_name = system.Memory().ReadCString(user_name, KObjectName::NameLengthMax); + // Copy the provided name from user memory to kernel memory. std::array name{}; - system.Memory().ReadBlock(user_name, name.data(), sizeof(name)); + std::strncpy(name.data(), string_name.c_str(), KObjectName::NameLengthMax - 1); // Validate that sessions and name are valid. R_UNLESS(max_sessions >= 0, ResultOutOfRange); diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index 1495d64de..5eefa2e82 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -25,6 +25,7 @@ #include "core/hle/service/acc/errors.h" #include "core/hle/service/acc/profile_manager.h" #include "core/hle/service/glue/glue_manager.h" +#include "core/hle/service/server_manager.h" #include "core/loader/loader.h" namespace Service::Account { @@ -942,18 +943,20 @@ Module::Interface::Interface(std::shared_ptr module_, Module::Interface::~Interface() = default; -void InstallInterfaces(Core::System& system) { +void LoopProcess(Core::System& system) { auto module = std::make_shared(); auto profile_manager = std::make_shared(); + auto server_manager = std::make_unique(system); - std::make_shared(module, profile_manager, system) - ->InstallAsService(system.ServiceManager()); - std::make_shared(module, profile_manager, system) - ->InstallAsService(system.ServiceManager()); - std::make_shared(module, profile_manager, system) - ->InstallAsService(system.ServiceManager()); - std::make_shared(module, profile_manager, system) - ->InstallAsService(system.ServiceManager()); + server_manager->RegisterNamedService("acc:aa", + std::make_shared(module, profile_manager, system)); + server_manager->RegisterNamedService("acc:su", + std::make_shared(module, profile_manager, system)); + server_manager->RegisterNamedService("acc:u0", + std::make_shared(module, profile_manager, system)); + server_manager->RegisterNamedService("acc:u1", + std::make_shared(module, profile_manager, system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::Account diff --git a/src/core/hle/service/acc/acc.h b/src/core/hle/service/acc/acc.h index 9411b0b92..a2fdafd82 100644 --- a/src/core/hle/service/acc/acc.h +++ b/src/core/hle/service/acc/acc.h @@ -67,7 +67,6 @@ public: }; }; -/// Registers all ACC services with the specified service manager. -void InstallInterfaces(Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::Account diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index beb2da06e..979881512 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -32,6 +32,7 @@ #include "core/hle/service/ns/ns.h" #include "core/hle/service/nvflinger/nvflinger.h" #include "core/hle/service/pm/pm.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/sm/sm.h" #include "core/hle/service/vi/vi.h" #include "core/memory.h" @@ -1828,17 +1829,21 @@ void IApplicationFunctions::PrepareForJit(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger& nvflinger, - Core::System& system) { +void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system) { auto message_queue = std::make_shared(system); // Needed on game boot message_queue->PushMessage(AppletMessageQueue::AppletMessage::FocusStateChanged); - std::make_shared(nvflinger, message_queue, system)->InstallAsService(service_manager); - std::make_shared(nvflinger, message_queue, system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService( + "appletAE", std::make_shared(nvflinger, message_queue, system)); + server_manager->RegisterNamedService( + "appletOE", std::make_shared(nvflinger, message_queue, system)); + server_manager->RegisterNamedService("idle:sys", std::make_shared(system)); + server_manager->RegisterNamedService("omm", std::make_shared(system)); + server_manager->RegisterNamedService("spsm", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } IHomeMenuFunctions::IHomeMenuFunctions(Core::System& system_) diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h index a0fbfcfc5..79e2263d7 100644 --- a/src/core/hle/service/am/am.h +++ b/src/core/hle/service/am/am.h @@ -396,8 +396,6 @@ public: ~IProcessWindingController() override; }; -/// Registers all AM services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger& nvflinger, - Core::System& system); +void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system); } // namespace Service::AM diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp index 7264f23f9..c4cd1d0d5 100644 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ b/src/core/hle/service/aoc/aoc_u.cpp @@ -17,6 +17,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/aoc/aoc_u.h" +#include "core/hle/service/server_manager.h" #include "core/loader/loader.h" namespace Service::AOC { @@ -311,8 +312,10 @@ void AOC_U::CreatePermanentEcPurchasedEventManager(Kernel::HLERequestContext& ct rb.PushIpcInterface(system); } -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { - std::make_shared(system)->InstallAsService(service_manager); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + server_manager->RegisterNamedService("aoc:u", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::AOC diff --git a/src/core/hle/service/aoc/aoc_u.h b/src/core/hle/service/aoc/aoc_u.h index 6c1ce601a..5e7087e50 100644 --- a/src/core/hle/service/aoc/aoc_u.h +++ b/src/core/hle/service/aoc/aoc_u.h @@ -40,7 +40,6 @@ private: Kernel::KEvent* aoc_change_event; }; -/// Registers all AOC services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::AOC diff --git a/src/core/hle/service/apm/apm.cpp b/src/core/hle/service/apm/apm.cpp index 44b2927a6..c23ff293d 100644 --- a/src/core/hle/service/apm/apm.cpp +++ b/src/core/hle/service/apm/apm.cpp @@ -4,20 +4,24 @@ #include "core/core.h" #include "core/hle/service/apm/apm.h" #include "core/hle/service/apm/apm_interface.h" +#include "core/hle/service/server_manager.h" namespace Service::APM { Module::Module() = default; Module::~Module() = default; -void InstallInterfaces(Core::System& system) { - auto module_ = std::make_shared(); - std::make_shared(system, module_, system.GetAPMController(), "apm") - ->InstallAsService(system.ServiceManager()); - std::make_shared(system, module_, system.GetAPMController(), "apm:am") - ->InstallAsService(system.ServiceManager()); - std::make_shared(system, system.GetAPMController()) - ->InstallAsService(system.ServiceManager()); +void LoopProcess(Core::System& system) { + auto module = std::make_shared(); + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService( + "apm", std::make_shared(system, module, system.GetAPMController(), "apm")); + server_manager->RegisterNamedService( + "apm:am", std::make_shared(system, module, system.GetAPMController(), "apm:am")); + server_manager->RegisterNamedService( + "apm:sys", std::make_shared(system, system.GetAPMController())); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::APM diff --git a/src/core/hle/service/apm/apm.h b/src/core/hle/service/apm/apm.h index 0fecc766a..e188b4e44 100644 --- a/src/core/hle/service/apm/apm.h +++ b/src/core/hle/service/apm/apm.h @@ -15,7 +15,6 @@ public: ~Module(); }; -/// Registers all AM services with the specified service manager. -void InstallInterfaces(Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::APM diff --git a/src/core/hle/service/audio/audin_u.cpp b/src/core/hle/service/audio/audin_u.cpp index 053e8f9dd..26dec7147 100644 --- a/src/core/hle/service/audio/audin_u.cpp +++ b/src/core/hle/service/audio/audin_u.cpp @@ -203,9 +203,8 @@ private: }; AudInU::AudInU(Core::System& system_) - : ServiceFramework{system_, "audin:u", ServiceThreadType::CreateNew}, - service_context{system_, "AudInU"}, impl{std::make_unique( - system_)} { + : ServiceFramework{system_, "audin:u"}, service_context{system_, "AudInU"}, + impl{std::make_unique(system_)} { // clang-format off static const FunctionInfo functions[] = { {0, &AudInU::ListAudioIns, "ListAudioIns"}, diff --git a/src/core/hle/service/audio/audio.cpp b/src/core/hle/service/audio/audio.cpp index ed36e3448..dccd16309 100644 --- a/src/core/hle/service/audio/audio.cpp +++ b/src/core/hle/service/audio/audio.cpp @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "core/core.h" #include "core/hle/service/audio/audctl.h" #include "core/hle/service/audio/audin_u.h" #include "core/hle/service/audio/audio.h" @@ -9,18 +10,22 @@ #include "core/hle/service/audio/audrec_u.h" #include "core/hle/service/audio/audren_u.h" #include "core/hle/service/audio/hwopus.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" namespace Service::Audio { -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("audctl", std::make_shared(system)); + server_manager->RegisterNamedService("audout:u", std::make_shared(system)); + server_manager->RegisterNamedService("audin:u", std::make_shared(system)); + server_manager->RegisterNamedService("audrec:a", std::make_shared(system)); + server_manager->RegisterNamedService("audrec:u", std::make_shared(system)); + server_manager->RegisterNamedService("audren:u", std::make_shared(system)); + server_manager->RegisterNamedService("hwopus", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::Audio diff --git a/src/core/hle/service/audio/audio.h b/src/core/hle/service/audio/audio.h index bbb2214e4..d70f022c7 100644 --- a/src/core/hle/service/audio/audio.h +++ b/src/core/hle/service/audio/audio.h @@ -13,7 +13,6 @@ class ServiceManager; namespace Service::Audio { -/// Registers all Audio services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::Audio diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp index 29751f075..991e30ba1 100644 --- a/src/core/hle/service/audio/audout_u.cpp +++ b/src/core/hle/service/audio/audout_u.cpp @@ -26,9 +26,8 @@ public: explicit IAudioOut(Core::System& system_, AudioCore::AudioOut::Manager& manager, size_t session_id, const std::string& device_name, const AudioOutParameter& in_params, u32 handle, u64 applet_resource_user_id) - : ServiceFramework{system_, "IAudioOut", ServiceThreadType::CreateNew}, - service_context{system_, "IAudioOut"}, event{service_context.CreateEvent( - "AudioOutEvent")}, + : ServiceFramework{system_, "IAudioOut"}, service_context{system_, "IAudioOut"}, + event{service_context.CreateEvent("AudioOutEvent")}, impl{std::make_shared(system_, manager, event, session_id)} { // clang-format off @@ -221,9 +220,8 @@ private: }; AudOutU::AudOutU(Core::System& system_) - : ServiceFramework{system_, "audout:u", ServiceThreadType::CreateNew}, - service_context{system_, "AudOutU"}, impl{std::make_unique( - system_)} { + : ServiceFramework{system_, "audout:u"}, service_context{system_, "AudOutU"}, + impl{std::make_unique(system_)} { // clang-format off static const FunctionInfo functions[] = { {0, &AudOutU::ListAudioOuts, "ListAudioOuts"}, diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index 7d730421d..6c12f00a1 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp @@ -35,10 +35,9 @@ public: AudioCore::AudioRendererParameterInternal& params, Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size, u32 process_handle, u64 applet_resource_user_id, s32 session_id) - : ServiceFramework{system_, "IAudioRenderer", ServiceThreadType::CreateNew}, - service_context{system_, "IAudioRenderer"}, rendered_event{service_context.CreateEvent( - "IAudioRendererEvent")}, - manager{manager_}, impl{std::make_unique(system_, manager, rendered_event)} { + : ServiceFramework{system_, "IAudioRenderer"}, service_context{system_, "IAudioRenderer"}, + rendered_event{service_context.CreateEvent("IAudioRendererEvent")}, manager{manager_}, + impl{std::make_unique(system_, manager, rendered_event)} { // clang-format off static const FunctionInfo functions[] = { {0, &IAudioRenderer::GetSampleRate, "GetSampleRate"}, @@ -243,10 +242,8 @@ class IAudioDevice final : public ServiceFramework { public: explicit IAudioDevice(Core::System& system_, u64 applet_resource_user_id, u32 revision, u32 device_num) - : ServiceFramework{system_, "IAudioDevice", ServiceThreadType::CreateNew}, - service_context{system_, "IAudioDevice"}, impl{std::make_unique( - system_, applet_resource_user_id, - revision)}, + : ServiceFramework{system_, "IAudioDevice"}, service_context{system_, "IAudioDevice"}, + impl{std::make_unique(system_, applet_resource_user_id, revision)}, event{service_context.CreateEvent(fmt::format("IAudioDeviceEvent-{}", device_num))} { static const FunctionInfo functions[] = { {0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"}, @@ -421,7 +418,7 @@ private: }; AudRenU::AudRenU(Core::System& system_) - : ServiceFramework{system_, "audren:u", ServiceThreadType::CreateNew}, + : ServiceFramework{system_, "audren:u"}, service_context{system_, "audren:u"}, impl{std::make_unique(system_)} { // clang-format off static const FunctionInfo functions[] = { diff --git a/src/core/hle/service/bcat/bcat_module.cpp b/src/core/hle/service/bcat/bcat_module.cpp index 6e6fed227..1db3f026b 100644 --- a/src/core/hle/service/bcat/bcat_module.cpp +++ b/src/core/hle/service/bcat/bcat_module.cpp @@ -15,6 +15,7 @@ #include "core/hle/service/bcat/bcat.h" #include "core/hle/service/bcat/bcat_module.h" #include "core/hle/service/filesystem/filesystem.h" +#include "core/hle/service/server_manager.h" namespace Service::BCAT { @@ -585,16 +586,23 @@ Module::Interface::Interface(Core::System& system_, std::shared_ptr modu Module::Interface::~Interface() = default; -void InstallInterfaces(Core::System& system) { +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); auto module = std::make_shared(); - std::make_shared(system, module, system.GetFileSystemController(), "bcat:a") - ->InstallAsService(system.ServiceManager()); - std::make_shared(system, module, system.GetFileSystemController(), "bcat:m") - ->InstallAsService(system.ServiceManager()); - std::make_shared(system, module, system.GetFileSystemController(), "bcat:u") - ->InstallAsService(system.ServiceManager()); - std::make_shared(system, module, system.GetFileSystemController(), "bcat:s") - ->InstallAsService(system.ServiceManager()); + + server_manager->RegisterNamedService( + "bcat:a", + std::make_shared(system, module, system.GetFileSystemController(), "bcat:a")); + server_manager->RegisterNamedService( + "bcat:m", + std::make_shared(system, module, system.GetFileSystemController(), "bcat:m")); + server_manager->RegisterNamedService( + "bcat:u", + std::make_shared(system, module, system.GetFileSystemController(), "bcat:u")); + server_manager->RegisterNamedService( + "bcat:s", + std::make_shared(system, module, system.GetFileSystemController(), "bcat:s")); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::BCAT diff --git a/src/core/hle/service/bcat/bcat_module.h b/src/core/hle/service/bcat/bcat_module.h index b2fcf9bfb..0c134d1ff 100644 --- a/src/core/hle/service/bcat/bcat_module.h +++ b/src/core/hle/service/bcat/bcat_module.h @@ -39,8 +39,7 @@ public: }; }; -/// Registers all BCAT services with the specified service manager. -void InstallInterfaces(Core::System& system); +void LoopProcess(Core::System& system); } // namespace BCAT diff --git a/src/core/hle/service/bpc/bpc.cpp b/src/core/hle/service/bpc/bpc.cpp index 466163538..91b15e256 100644 --- a/src/core/hle/service/bpc/bpc.cpp +++ b/src/core/hle/service/bpc/bpc.cpp @@ -4,8 +4,8 @@ #include #include "core/hle/service/bpc/bpc.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" namespace Service::BPC { @@ -54,9 +54,12 @@ public: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("bpc", std::make_shared(system)); + server_manager->RegisterNamedService("bpc:r", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::BPC diff --git a/src/core/hle/service/bpc/bpc.h b/src/core/hle/service/bpc/bpc.h index 8adc2f962..524391ddb 100644 --- a/src/core/hle/service/bpc/bpc.h +++ b/src/core/hle/service/bpc/bpc.h @@ -13,6 +13,6 @@ class ServiceManager; namespace Service::BPC { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::BPC diff --git a/src/core/hle/service/btdrv/btdrv.cpp b/src/core/hle/service/btdrv/btdrv.cpp index ec7e5320c..ed020d03f 100644 --- a/src/core/hle/service/btdrv/btdrv.cpp +++ b/src/core/hle/service/btdrv/btdrv.cpp @@ -7,6 +7,7 @@ #include "core/hle/kernel/k_event.h" #include "core/hle/service/btdrv/btdrv.h" #include "core/hle/service/kernel_helpers.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" #include "core/hle/service/sm/sm.h" @@ -196,9 +197,12 @@ public: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("btdrv", std::make_shared(system)); + server_manager->RegisterNamedService("bt", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::BtDrv diff --git a/src/core/hle/service/btdrv/btdrv.h b/src/core/hle/service/btdrv/btdrv.h index 9cbe2926f..42713860e 100644 --- a/src/core/hle/service/btdrv/btdrv.h +++ b/src/core/hle/service/btdrv/btdrv.h @@ -13,7 +13,6 @@ class System; namespace Service::BtDrv { -/// Registers all BtDrv services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::BtDrv diff --git a/src/core/hle/service/btm/btm.cpp b/src/core/hle/service/btm/btm.cpp index eebf85e03..e068ea87f 100644 --- a/src/core/hle/service/btm/btm.cpp +++ b/src/core/hle/service/btm/btm.cpp @@ -9,6 +9,7 @@ #include "core/hle/kernel/k_event.h" #include "core/hle/service/btm/btm.h" #include "core/hle/service/kernel_helpers.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" namespace Service::BTM { @@ -311,11 +312,14 @@ private: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("btm", std::make_shared(system)); + server_manager->RegisterNamedService("btm:dbg", std::make_shared(system)); + server_manager->RegisterNamedService("btm:sys", std::make_shared(system)); + server_manager->RegisterNamedService("btm:u", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::BTM diff --git a/src/core/hle/service/btm/btm.h b/src/core/hle/service/btm/btm.h index 9dcda1848..a99b34364 100644 --- a/src/core/hle/service/btm/btm.h +++ b/src/core/hle/service/btm/btm.h @@ -13,6 +13,6 @@ class System; namespace Service::BTM { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::BTM diff --git a/src/core/hle/service/caps/caps.cpp b/src/core/hle/service/caps/caps.cpp index 13940a8c9..610fe9940 100644 --- a/src/core/hle/service/caps/caps.cpp +++ b/src/core/hle/service/caps/caps.cpp @@ -8,17 +8,21 @@ #include "core/hle/service/caps/caps_ss.h" #include "core/hle/service/caps/caps_su.h" #include "core/hle/service/caps/caps_u.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" namespace Service::Capture { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("caps:a", std::make_shared(system)); + server_manager->RegisterNamedService("caps:c", std::make_shared(system)); + server_manager->RegisterNamedService("caps:u", std::make_shared(system)); + server_manager->RegisterNamedService("caps:sc", std::make_shared(system)); + server_manager->RegisterNamedService("caps:ss", std::make_shared(system)); + server_manager->RegisterNamedService("caps:su", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::Capture diff --git a/src/core/hle/service/caps/caps.h b/src/core/hle/service/caps/caps.h index 3e89c82cb..15f0ecfaa 100644 --- a/src/core/hle/service/caps/caps.h +++ b/src/core/hle/service/caps/caps.h @@ -90,7 +90,6 @@ struct ApplicationAlbumFileEntry { static_assert(sizeof(ApplicationAlbumFileEntry) == 0x30, "ApplicationAlbumFileEntry has incorrect size."); -/// Registers all Capture services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::Capture diff --git a/src/core/hle/service/erpt/erpt.cpp b/src/core/hle/service/erpt/erpt.cpp index 923c0022a..3ea862fad 100644 --- a/src/core/hle/service/erpt/erpt.cpp +++ b/src/core/hle/service/erpt/erpt.cpp @@ -4,6 +4,7 @@ #include #include "core/hle/service/erpt/erpt.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" #include "core/hle/service/sm/sm.h" @@ -52,9 +53,13 @@ public: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("erpt:c", std::make_shared(system)); + server_manager->RegisterNamedService("erpt:r", std::make_shared(system)); + + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::ERPT diff --git a/src/core/hle/service/erpt/erpt.h b/src/core/hle/service/erpt/erpt.h index 507d626ec..60094f556 100644 --- a/src/core/hle/service/erpt/erpt.h +++ b/src/core/hle/service/erpt/erpt.h @@ -7,13 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::ERPT { -/// Registers all ERPT services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::ERPT diff --git a/src/core/hle/service/es/es.cpp b/src/core/hle/service/es/es.cpp index fb8686859..d9736af4e 100644 --- a/src/core/hle/service/es/es.cpp +++ b/src/core/hle/service/es/es.cpp @@ -4,6 +4,7 @@ #include "core/crypto/key_manager.h" #include "core/hle/ipc_helpers.h" #include "core/hle/service/es/es.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" namespace Service::ES { @@ -307,8 +308,11 @@ private: Core::Crypto::KeyManager& keys = Core::Crypto::KeyManager::Instance(); }; -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { - std::make_shared(system)->InstallAsService(service_manager); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("es", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::ES diff --git a/src/core/hle/service/es/es.h b/src/core/hle/service/es/es.h index 530563550..317680625 100644 --- a/src/core/hle/service/es/es.h +++ b/src/core/hle/service/es/es.h @@ -7,13 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::ES { -/// Registers all ES services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::ES diff --git a/src/core/hle/service/eupld/eupld.cpp b/src/core/hle/service/eupld/eupld.cpp index d1553ace0..3cf27513a 100644 --- a/src/core/hle/service/eupld/eupld.cpp +++ b/src/core/hle/service/eupld/eupld.cpp @@ -4,8 +4,8 @@ #include #include "core/hle/service/eupld/eupld.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" namespace Service::EUPLD { @@ -44,9 +44,12 @@ public: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("eupld:c", std::make_shared(system)); + server_manager->RegisterNamedService("eupld:r", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::EUPLD diff --git a/src/core/hle/service/eupld/eupld.h b/src/core/hle/service/eupld/eupld.h index 5de8219be..8eb0a5b4f 100644 --- a/src/core/hle/service/eupld/eupld.h +++ b/src/core/hle/service/eupld/eupld.h @@ -7,13 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::EUPLD { -/// Registers all EUPLD services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::EUPLD diff --git a/src/core/hle/service/fatal/fatal.cpp b/src/core/hle/service/fatal/fatal.cpp index 2e5919330..3b7b636f3 100644 --- a/src/core/hle/service/fatal/fatal.cpp +++ b/src/core/hle/service/fatal/fatal.cpp @@ -13,6 +13,7 @@ #include "core/hle/service/fatal/fatal.h" #include "core/hle/service/fatal/fatal_p.h" #include "core/hle/service/fatal/fatal_u.h" +#include "core/hle/service/server_manager.h" #include "core/reporter.h" namespace Service::Fatal { @@ -163,10 +164,13 @@ void Module::Interface::ThrowFatalWithCpuContext(Kernel::HLERequestContext& ctx) rb.Push(ResultSuccess); } -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); auto module = std::make_shared(); - std::make_shared(module, system)->InstallAsService(service_manager); - std::make_shared(module, system)->InstallAsService(service_manager); + + server_manager->RegisterNamedService("fatal:p", std::make_shared(module, system)); + server_manager->RegisterNamedService("fatal:u", std::make_shared(module, system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::Fatal diff --git a/src/core/hle/service/fatal/fatal.h b/src/core/hle/service/fatal/fatal.h index a7a310f7b..2e4e4c2f6 100644 --- a/src/core/hle/service/fatal/fatal.h +++ b/src/core/hle/service/fatal/fatal.h @@ -28,6 +28,6 @@ public: }; }; -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::Fatal diff --git a/src/core/hle/service/fgm/fgm.cpp b/src/core/hle/service/fgm/fgm.cpp index 7e9fb0385..612491270 100644 --- a/src/core/hle/service/fgm/fgm.cpp +++ b/src/core/hle/service/fgm/fgm.cpp @@ -5,6 +5,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/fgm/fgm.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" #include "core/hle/service/sm/sm.h" @@ -63,11 +64,14 @@ public: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system, "fgm")->InstallAsService(sm); - std::make_shared(system, "fgm:0")->InstallAsService(sm); - std::make_shared(system, "fgm:9")->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("fgm", std::make_shared(system, "fgm")); + server_manager->RegisterNamedService("fgm:0", std::make_shared(system, "fgm:0")); + server_manager->RegisterNamedService("fgm:9", std::make_shared(system, "fgm:9")); + server_manager->RegisterNamedService("fgm:dbg", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::FGM diff --git a/src/core/hle/service/fgm/fgm.h b/src/core/hle/service/fgm/fgm.h index 077e48812..9d2465c0f 100644 --- a/src/core/hle/service/fgm/fgm.h +++ b/src/core/hle/service/fgm/fgm.h @@ -7,12 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::FGM { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::FGM diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp index 177447bc1..dfcdd3ada 100644 --- a/src/core/hle/service/filesystem/filesystem.cpp +++ b/src/core/hle/service/filesystem/filesystem.cpp @@ -23,6 +23,7 @@ #include "core/hle/service/filesystem/fsp_ldr.h" #include "core/hle/service/filesystem/fsp_pr.h" #include "core/hle/service/filesystem/fsp_srv.h" +#include "core/hle/service/server_manager.h" #include "core/loader/loader.h" namespace Service::FileSystem { @@ -796,10 +797,13 @@ void FileSystemController::CreateFactories(FileSys::VfsFilesystem& vfs, bool ove } } -void InstallInterfaces(Core::System& system) { - std::make_shared(system)->InstallAsService(system.ServiceManager()); - std::make_shared(system)->InstallAsService(system.ServiceManager()); - std::make_shared(system)->InstallAsService(system.ServiceManager()); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("fsp-ldr", std::make_shared(system)); + server_manager->RegisterNamedService("fsp:pr", std::make_shared(system)); + server_manager->RegisterNamedService("fsp-srv", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::FileSystem diff --git a/src/core/hle/service/filesystem/filesystem.h b/src/core/hle/service/filesystem/filesystem.h index 5b27de9fa..a5c1c9d3e 100644 --- a/src/core/hle/service/filesystem/filesystem.h +++ b/src/core/hle/service/filesystem/filesystem.h @@ -139,7 +139,7 @@ private: Core::System& system; }; -void InstallInterfaces(Core::System& system); +void LoopProcess(Core::System& system); // A class that wraps a VfsDirectory with methods that return ResultVal and Result instead of // pointers and booleans. This makes using a VfsDirectory with switch services much easier and diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index e76346ca9..89eddb510 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp_srv.cpp @@ -57,8 +57,7 @@ enum class FileSystemType : u8 { class IStorage final : public ServiceFramework { public: explicit IStorage(Core::System& system_, FileSys::VirtualFile backend_) - : ServiceFramework{system_, "IStorage", ServiceThreadType::CreateNew}, - backend(std::move(backend_)) { + : ServiceFramework{system_, "IStorage"}, backend(std::move(backend_)) { static const FunctionInfo functions[] = { {0, &IStorage::Read, "Read"}, {1, nullptr, "Write"}, @@ -116,8 +115,7 @@ private: class IFile final : public ServiceFramework { public: explicit IFile(Core::System& system_, FileSys::VirtualFile backend_) - : ServiceFramework{system_, "IFile", ServiceThreadType::CreateNew}, - backend(std::move(backend_)) { + : ServiceFramework{system_, "IFile"}, backend(std::move(backend_)) { static const FunctionInfo functions[] = { {0, &IFile::Read, "Read"}, {1, &IFile::Write, "Write"}, @@ -254,8 +252,7 @@ static void BuildEntryIndex(std::vector& entries, const std::vec class IDirectory final : public ServiceFramework { public: explicit IDirectory(Core::System& system_, FileSys::VirtualDir backend_) - : ServiceFramework{system_, "IDirectory", ServiceThreadType::CreateNew}, - backend(std::move(backend_)) { + : ServiceFramework{system_, "IDirectory"}, backend(std::move(backend_)) { static const FunctionInfo functions[] = { {0, &IDirectory::Read, "Read"}, {1, &IDirectory::GetEntryCount, "GetEntryCount"}, @@ -311,8 +308,8 @@ private: class IFileSystem final : public ServiceFramework { public: explicit IFileSystem(Core::System& system_, FileSys::VirtualDir backend_, SizeGetter size_) - : ServiceFramework{system_, "IFileSystem", ServiceThreadType::CreateNew}, - backend{std::move(backend_)}, size{std::move(size_)} { + : ServiceFramework{system_, "IFileSystem"}, backend{std::move(backend_)}, size{std::move( + size_)} { static const FunctionInfo functions[] = { {0, &IFileSystem::CreateFile, "CreateFile"}, {1, &IFileSystem::DeleteFile, "DeleteFile"}, diff --git a/src/core/hle/service/friend/friend.cpp b/src/core/hle/service/friend/friend.cpp index fad532115..fcf10bfeb 100644 --- a/src/core/hle/service/friend/friend.cpp +++ b/src/core/hle/service/friend/friend.cpp @@ -11,6 +11,7 @@ #include "core/hle/service/friend/friend.h" #include "core/hle/service/friend/friend_interface.h" #include "core/hle/service/kernel_helpers.h" +#include "core/hle/service/server_manager.h" namespace Service::Friend { @@ -335,13 +336,22 @@ Module::Interface::Interface(std::shared_ptr module_, Core::System& syst Module::Interface::~Interface() = default; -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); auto module = std::make_shared(); - std::make_shared(module, system, "friend:a")->InstallAsService(service_manager); - std::make_shared(module, system, "friend:m")->InstallAsService(service_manager); - std::make_shared(module, system, "friend:s")->InstallAsService(service_manager); - std::make_shared(module, system, "friend:u")->InstallAsService(service_manager); - std::make_shared(module, system, "friend:v")->InstallAsService(service_manager); + + server_manager->RegisterNamedService("friend:a", + std::make_shared(module, system, "friend:a")); + server_manager->RegisterNamedService("friend:m", + std::make_shared(module, system, "friend:m")); + server_manager->RegisterNamedService("friend:s", + std::make_shared(module, system, "friend:s")); + server_manager->RegisterNamedService("friend:u", + std::make_shared(module, system, "friend:u")); + server_manager->RegisterNamedService("friend:v", + std::make_shared(module, system, "friend:v")); + + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::Friend diff --git a/src/core/hle/service/friend/friend.h b/src/core/hle/service/friend/friend.h index 444da8b35..41be06a4f 100644 --- a/src/core/hle/service/friend/friend.h +++ b/src/core/hle/service/friend/friend.h @@ -27,7 +27,6 @@ public: }; }; -/// Registers all Friend services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::Friend diff --git a/src/core/hle/service/glue/glue.cpp b/src/core/hle/service/glue/glue.cpp index 717f2562b..993c3d21d 100644 --- a/src/core/hle/service/glue/glue.cpp +++ b/src/core/hle/service/glue/glue.cpp @@ -8,25 +8,30 @@ #include "core/hle/service/glue/ectx.h" #include "core/hle/service/glue/glue.h" #include "core/hle/service/glue/notif.h" +#include "core/hle/service/server_manager.h" namespace Service::Glue { -void InstallInterfaces(Core::System& system) { +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + // ARP - std::make_shared(system, system.GetARPManager()) - ->InstallAsService(system.ServiceManager()); - std::make_shared(system, system.GetARPManager()) - ->InstallAsService(system.ServiceManager()); + server_manager->RegisterNamedService("arp:r", + std::make_shared(system, system.GetARPManager())); + server_manager->RegisterNamedService("arp:w", + std::make_shared(system, system.GetARPManager())); // BackGround Task Controller - std::make_shared(system)->InstallAsService(system.ServiceManager()); - std::make_shared(system)->InstallAsService(system.ServiceManager()); + server_manager->RegisterNamedService("bgtc:t", std::make_shared(system)); + server_manager->RegisterNamedService("bgtc:sc", std::make_shared(system)); // Error Context - std::make_shared(system)->InstallAsService(system.ServiceManager()); + server_manager->RegisterNamedService("ectx:aw", std::make_shared(system)); // Notification Services for application - std::make_shared(system)->InstallAsService(system.ServiceManager()); + server_manager->RegisterNamedService("notif:a", std::make_shared(system)); + + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::Glue diff --git a/src/core/hle/service/glue/glue.h b/src/core/hle/service/glue/glue.h index ae7c6d235..2a906f5ad 100644 --- a/src/core/hle/service/glue/glue.h +++ b/src/core/hle/service/glue/glue.h @@ -9,7 +9,6 @@ class System; namespace Service::Glue { -/// Registers all Glue services with the specified service manager. -void InstallInterfaces(Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::Glue diff --git a/src/core/hle/service/grc/grc.cpp b/src/core/hle/service/grc/grc.cpp index 4b684f6d0..64275da36 100644 --- a/src/core/hle/service/grc/grc.cpp +++ b/src/core/hle/service/grc/grc.cpp @@ -4,8 +4,8 @@ #include #include "core/hle/service/grc/grc.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" namespace Service::GRC { @@ -26,8 +26,11 @@ public: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("grc:c", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::GRC diff --git a/src/core/hle/service/grc/grc.h b/src/core/hle/service/grc/grc.h index f8c2f8dab..a3f8a5b90 100644 --- a/src/core/hle/service/grc/grc.h +++ b/src/core/hle/service/grc/grc.h @@ -7,12 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::GRC { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::GRC diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index eb3c45a58..5ec31950a 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -18,6 +18,7 @@ #include "core/hle/service/hid/hidbus.h" #include "core/hle/service/hid/irs.h" #include "core/hle/service/hid/xcd.h" +#include "core/hle/service/server_manager.h" #include "core/memory.h" #include "core/hle/service/hid/controllers/console_sixaxis.h" @@ -2734,16 +2735,20 @@ private: } }; -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); + server_manager->RegisterNamedService("hid", std::make_shared(system)); + server_manager->RegisterNamedService("hidbus", std::make_shared(system)); + server_manager->RegisterNamedService("hid:dbg", std::make_shared(system)); + server_manager->RegisterNamedService("hid:sys", std::make_shared(system)); - std::make_shared(system)->InstallAsService(service_manager); + server_manager->RegisterNamedService("irs", std::make_shared(system)); + server_manager->RegisterNamedService("irs:sys", + std::make_shared(system)); + + server_manager->RegisterNamedService("xcd:sys", std::make_shared(system)); + system.RunServer(std::move(server_manager)); } } // namespace Service::HID diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index b7c2a23ef..dc3c45aba 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -209,7 +209,6 @@ private: KernelHelpers::ServiceContext service_context; }; -/// Registers all HID services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::HID diff --git a/src/core/hle/service/jit/jit.cpp b/src/core/hle/service/jit/jit.cpp index 47a1277ea..005c212dc 100644 --- a/src/core/hle/service/jit/jit.cpp +++ b/src/core/hle/service/jit/jit.cpp @@ -9,6 +9,7 @@ #include "core/hle/result.h" #include "core/hle/service/jit/jit.h" #include "core/hle/service/jit/jit_context.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" #include "core/memory.h" @@ -23,8 +24,8 @@ class IJitEnvironment final : public ServiceFramework { public: explicit IJitEnvironment(Core::System& system_, Kernel::KProcess& process_, CodeRange user_rx, CodeRange user_ro) - : ServiceFramework{system_, "IJitEnvironment", ServiceThreadType::CreateNew}, - process{&process_}, context{system_.Memory()} { + : ServiceFramework{system_, "IJitEnvironment"}, process{&process_}, context{ + system_.Memory()} { // clang-format off static const FunctionInfo functions[] = { {0, &IJitEnvironment::GenerateCode, "GenerateCode"}, @@ -397,8 +398,11 @@ public: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("jit:u", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::JIT diff --git a/src/core/hle/service/jit/jit.h b/src/core/hle/service/jit/jit.h index af0f5b4f3..19014c75a 100644 --- a/src/core/hle/service/jit/jit.h +++ b/src/core/hle/service/jit/jit.h @@ -7,13 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::JIT { -/// Registers all JIT services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::JIT diff --git a/src/core/hle/service/kernel_helpers.cpp b/src/core/hle/service/kernel_helpers.cpp index 42991928e..a39ce5212 100644 --- a/src/core/hle/service/kernel_helpers.cpp +++ b/src/core/hle/service/kernel_helpers.cpp @@ -15,17 +15,24 @@ namespace Service::KernelHelpers { ServiceContext::ServiceContext(Core::System& system_, std::string name_) : kernel(system_.Kernel()) { + if (process = Kernel::GetCurrentProcessPointer(kernel); process != nullptr) { + return; + } + // Create the process. process = Kernel::KProcess::Create(kernel); ASSERT(Kernel::KProcess::Initialize(process, system_, std::move(name_), Kernel::KProcess::ProcessType::KernelInternal, kernel.GetSystemResourceLimit()) .IsSuccess()); + process_created = true; } ServiceContext::~ServiceContext() { - process->Close(); - process = nullptr; + if (process_created) { + process->Close(); + process = nullptr; + } } Kernel::KEvent* ServiceContext::CreateEvent(std::string&& name) { diff --git a/src/core/hle/service/kernel_helpers.h b/src/core/hle/service/kernel_helpers.h index 6415838e5..eca9aefb5 100644 --- a/src/core/hle/service/kernel_helpers.h +++ b/src/core/hle/service/kernel_helpers.h @@ -29,6 +29,7 @@ public: private: Kernel::KernelCore& kernel; Kernel::KProcess* process{}; + bool process_created{false}; }; } // namespace Service::KernelHelpers diff --git a/src/core/hle/service/lbl/lbl.cpp b/src/core/hle/service/lbl/lbl.cpp index c8415e0bf..3f3c68d80 100644 --- a/src/core/hle/service/lbl/lbl.cpp +++ b/src/core/hle/service/lbl/lbl.cpp @@ -7,6 +7,7 @@ #include "common/logging/log.h" #include "core/hle/ipc_helpers.h" #include "core/hle/service/lbl/lbl.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" #include "core/hle/service/sm/sm.h" @@ -319,8 +320,11 @@ private: bool auto_brightness = false; // TODO(ogniK): Move to system settings }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("lbl", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::LBL diff --git a/src/core/hle/service/lbl/lbl.h b/src/core/hle/service/lbl/lbl.h index 6484105c2..e47759c01 100644 --- a/src/core/hle/service/lbl/lbl.h +++ b/src/core/hle/service/lbl/lbl.h @@ -7,12 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::LBL { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::LBL diff --git a/src/core/hle/service/ldn/ldn.cpp b/src/core/hle/service/ldn/ldn.cpp index e5099d61f..4c2abe7d3 100644 --- a/src/core/hle/service/ldn/ldn.cpp +++ b/src/core/hle/service/ldn/ldn.cpp @@ -8,6 +8,7 @@ #include "core/hle/service/ldn/ldn.h" #include "core/hle/service/ldn/ldn_results.h" #include "core/hle/service/ldn/ldn_types.h" +#include "core/hle/service/server_manager.h" #include "core/internal_network/network.h" #include "core/internal_network/network_interface.h" #include "network/network.h" @@ -106,7 +107,7 @@ class IUserLocalCommunicationService final : public ServiceFramework { public: explicit IUserLocalCommunicationService(Core::System& system_) - : ServiceFramework{system_, "IUserLocalCommunicationService", ServiceThreadType::CreateNew}, + : ServiceFramework{system_, "IUserLocalCommunicationService"}, service_context{system, "IUserLocalCommunicationService"}, room_network{system_.GetRoomNetwork()}, lan_discovery{room_network} { // clang-format off @@ -730,12 +731,15 @@ public: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("ldn:m", std::make_shared(system)); + server_manager->RegisterNamedService("ldn:s", std::make_shared(system)); + server_manager->RegisterNamedService("ldn:u", std::make_shared(system)); + server_manager->RegisterNamedService("lp2p:app", std::make_shared(system)); + server_manager->RegisterNamedService("lp2p:sys", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::LDN diff --git a/src/core/hle/service/ldn/ldn.h b/src/core/hle/service/ldn/ldn.h index 6afe2ea6f..fa869fa89 100644 --- a/src/core/hle/service/ldn/ldn.h +++ b/src/core/hle/service/ldn/ldn.h @@ -13,13 +13,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::LDN { -/// Registers all LDN services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::LDN diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index 2d4d6fe3e..c82e189f4 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp @@ -14,6 +14,7 @@ #include "core/hle/kernel/svc_results.h" #include "core/hle/kernel/svc_types.h" #include "core/hle/service/ldr/ldr.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" #include "core/loader/nro.h" #include "core/memory.h" @@ -159,8 +160,7 @@ public: class RelocatableObject final : public ServiceFramework { public: - explicit RelocatableObject(Core::System& system_) - : ServiceFramework{system_, "ldr:ro", ServiceThreadType::CreateNew} { + explicit RelocatableObject(Core::System& system_) : ServiceFramework{system_, "ldr:ro"} { // clang-format off static const FunctionInfo functions[] = { {0, &RelocatableObject::LoadModule, "LoadModule"}, @@ -682,11 +682,15 @@ private: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("ldr:dmnt", std::make_shared(system)); + server_manager->RegisterNamedService("ldr:pm", std::make_shared(system)); + server_manager->RegisterNamedService("ldr:shel", std::make_shared(system)); + server_manager->RegisterNamedService("ldr:ro", std::make_shared(system)); + + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::LDR diff --git a/src/core/hle/service/ldr/ldr.h b/src/core/hle/service/ldr/ldr.h index 25ffd8442..c9281dbfb 100644 --- a/src/core/hle/service/ldr/ldr.h +++ b/src/core/hle/service/ldr/ldr.h @@ -7,13 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::LDR { -/// Registers all LDR services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::LDR diff --git a/src/core/hle/service/lm/lm.cpp b/src/core/hle/service/lm/lm.cpp index ef4b54046..7efd8e0ab 100644 --- a/src/core/hle/service/lm/lm.cpp +++ b/src/core/hle/service/lm/lm.cpp @@ -10,6 +10,7 @@ #include "core/core.h" #include "core/hle/ipc_helpers.h" #include "core/hle/service/lm/lm.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" namespace Service::LM { @@ -351,8 +352,11 @@ private: } }; -void InstallInterfaces(Core::System& system) { - std::make_shared(system)->InstallAsService(system.ServiceManager()); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("lm", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::LM diff --git a/src/core/hle/service/lm/lm.h b/src/core/hle/service/lm/lm.h index 266019c30..0d7c39cbc 100644 --- a/src/core/hle/service/lm/lm.h +++ b/src/core/hle/service/lm/lm.h @@ -9,7 +9,6 @@ class System; namespace Service::LM { -/// Registers all LM services with the specified service manager. -void InstallInterfaces(Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::LM diff --git a/src/core/hle/service/mig/mig.cpp b/src/core/hle/service/mig/mig.cpp index b9fe0cecd..082e470ab 100644 --- a/src/core/hle/service/mig/mig.cpp +++ b/src/core/hle/service/mig/mig.cpp @@ -4,8 +4,8 @@ #include #include "core/hle/service/mig/mig.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" namespace Service::Migration { @@ -32,8 +32,11 @@ public: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("mig:user", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::Migration diff --git a/src/core/hle/service/mig/mig.h b/src/core/hle/service/mig/mig.h index f1641a521..c8ed732a5 100644 --- a/src/core/hle/service/mig/mig.h +++ b/src/core/hle/service/mig/mig.h @@ -7,12 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::Migration { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::Migration diff --git a/src/core/hle/service/mii/mii.cpp b/src/core/hle/service/mii/mii.cpp index 390514fdc..50dc0ac64 100644 --- a/src/core/hle/service/mii/mii.cpp +++ b/src/core/hle/service/mii/mii.cpp @@ -7,8 +7,8 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/mii/mii.h" #include "core/hle/service/mii/mii_manager.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" namespace Service::Mii { @@ -310,11 +310,13 @@ public: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system, "mii:e")->InstallAsService(sm); - std::make_shared(system, "mii:u")->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); - std::make_shared(system)->InstallAsService(sm); + server_manager->RegisterNamedService("mii:e", std::make_shared(system, "mii:e")); + server_manager->RegisterNamedService("mii:u", std::make_shared(system, "mii:u")); + server_manager->RegisterNamedService("miiimg", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::Mii diff --git a/src/core/hle/service/mii/mii.h b/src/core/hle/service/mii/mii.h index 009d80d58..ed4e3f62b 100644 --- a/src/core/hle/service/mii/mii.h +++ b/src/core/hle/service/mii/mii.h @@ -7,12 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::Mii { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::Mii diff --git a/src/core/hle/service/mm/mm_u.cpp b/src/core/hle/service/mm/mm_u.cpp index ba8c0e230..bee72fa1b 100644 --- a/src/core/hle/service/mm/mm_u.cpp +++ b/src/core/hle/service/mm/mm_u.cpp @@ -4,6 +4,7 @@ #include "common/logging/log.h" #include "core/hle/ipc_helpers.h" #include "core/hle/service/mm/mm_u.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/sm/sm.h" namespace Service::MM { @@ -103,8 +104,11 @@ private: u32 id{1}; }; -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { - std::make_shared(system)->InstallAsService(service_manager); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("mm:u", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::MM diff --git a/src/core/hle/service/mm/mm_u.h b/src/core/hle/service/mm/mm_u.h index b40941e35..43117c9b1 100644 --- a/src/core/hle/service/mm/mm_u.h +++ b/src/core/hle/service/mm/mm_u.h @@ -7,13 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::MM { -/// Registers all MM services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::MM diff --git a/src/core/hle/service/mnpp/mnpp_app.cpp b/src/core/hle/service/mnpp/mnpp_app.cpp index c3aad5714..4ce4672b7 100644 --- a/src/core/hle/service/mnpp/mnpp_app.cpp +++ b/src/core/hle/service/mnpp/mnpp_app.cpp @@ -4,7 +4,8 @@ #include "common/logging/log.h" #include "core/hle/ipc_helpers.h" #include "core/hle/service/mnpp/mnpp_app.h" -#include "core/hle/service/sm/sm.h" +#include "core/hle/service/server_manager.h" +#include "core/hle/service/service.h" namespace Service::MNPP { @@ -37,8 +38,11 @@ private: } }; -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { - std::make_shared(system)->InstallAsService(service_manager); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("mnpp:app", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::MNPP diff --git a/src/core/hle/service/mnpp/mnpp_app.h b/src/core/hle/service/mnpp/mnpp_app.h index eec75fe0e..40d0395bd 100644 --- a/src/core/hle/service/mnpp/mnpp_app.h +++ b/src/core/hle/service/mnpp/mnpp_app.h @@ -7,13 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::MNPP { -/// Registers all MNPP services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::MNPP diff --git a/src/core/hle/service/mutex.cpp b/src/core/hle/service/mutex.cpp new file mode 100644 index 000000000..07589a0f0 --- /dev/null +++ b/src/core/hle/service/mutex.cpp @@ -0,0 +1,43 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "core/core.h" +#include "core/hle/kernel/k_event.h" +#include "core/hle/kernel/k_synchronization_object.h" +#include "core/hle/service/mutex.h" + +namespace Service { + +Mutex::Mutex(Core::System& system) : m_system(system) { + m_event = Kernel::KEvent::Create(system.Kernel()); + m_event->Initialize(nullptr); + + ASSERT(R_SUCCEEDED(m_event->Signal())); +} + +Mutex::~Mutex() { + m_event->GetReadableEvent().Close(); + m_event->Close(); +} + +void Mutex::lock() { + // Infinitely retry until we successfully clear the event. + while (R_FAILED(m_event->GetReadableEvent().Reset())) { + s32 index; + Kernel::KSynchronizationObject* obj = &m_event->GetReadableEvent(); + + // The event was already cleared! + // Wait for it to become signaled again. + ASSERT(R_SUCCEEDED( + Kernel::KSynchronizationObject::Wait(m_system.Kernel(), &index, &obj, 1, -1))); + } + + // We successfully cleared the event, and now have exclusive ownership. +} + +void Mutex::unlock() { + // Unlock. + ASSERT(R_SUCCEEDED(m_event->Signal())); +} + +} // namespace Service diff --git a/src/core/hle/service/mutex.h b/src/core/hle/service/mutex.h new file mode 100644 index 000000000..95ac9b117 --- /dev/null +++ b/src/core/hle/service/mutex.h @@ -0,0 +1,31 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "common/common_types.h" + +namespace Core { +class System; +} + +namespace Kernel { +class KEvent; +} + +namespace Service { + +class Mutex { +public: + explicit Mutex(Core::System& system); + ~Mutex(); + + void lock(); + void unlock(); + +private: + Core::System& m_system; + Kernel::KEvent* m_event{}; +}; + +} // namespace Service diff --git a/src/core/hle/service/ncm/ncm.cpp b/src/core/hle/service/ncm/ncm.cpp index 68210a108..e8cd762ad 100644 --- a/src/core/hle/service/ncm/ncm.cpp +++ b/src/core/hle/service/ncm/ncm.cpp @@ -6,8 +6,8 @@ #include "core/file_sys/romfs_factory.h" #include "core/hle/ipc_helpers.h" #include "core/hle/service/ncm/ncm.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" namespace Service::NCM { @@ -131,9 +131,12 @@ public: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("lr", std::make_shared(system)); + server_manager->RegisterNamedService("ncm", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::NCM diff --git a/src/core/hle/service/ncm/ncm.h b/src/core/hle/service/ncm/ncm.h index de3971437..b78efdcd7 100644 --- a/src/core/hle/service/ncm/ncm.h +++ b/src/core/hle/service/ncm/ncm.h @@ -7,12 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::NCM { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::NCM diff --git a/src/core/hle/service/nfc/nfc.cpp b/src/core/hle/service/nfc/nfc.cpp index b17b18ab9..34612b9df 100644 --- a/src/core/hle/service/nfc/nfc.cpp +++ b/src/core/hle/service/nfc/nfc.cpp @@ -9,8 +9,8 @@ #include "core/hle/service/nfc/mifare_user.h" #include "core/hle/service/nfc/nfc.h" #include "core/hle/service/nfc/nfc_user.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" namespace Service::NFC { @@ -154,11 +154,14 @@ private: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("nfc:am", std::make_shared(system)); + server_manager->RegisterNamedService("nfc:mf:u", std::make_shared(system)); + server_manager->RegisterNamedService("nfc:user", std::make_shared(system)); + server_manager->RegisterNamedService("nfc:sys", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::NFC diff --git a/src/core/hle/service/nfc/nfc.h b/src/core/hle/service/nfc/nfc.h index 0107b696c..d15955b75 100644 --- a/src/core/hle/service/nfc/nfc.h +++ b/src/core/hle/service/nfc/nfc.h @@ -7,12 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::NFC { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::NFC diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp index 0cb55ca49..1b59aba8e 100644 --- a/src/core/hle/service/nfp/nfp.cpp +++ b/src/core/hle/service/nfp/nfp.cpp @@ -5,6 +5,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/nfp/nfp.h" #include "core/hle/service/nfp/nfp_user.h" +#include "core/hle/service/server_manager.h" namespace Service::NFP { @@ -36,8 +37,11 @@ private: std::shared_ptr user_interface; }; -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { - std::make_shared(system)->InstallAsService(service_manager); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("nfp:user", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::NFP diff --git a/src/core/hle/service/nfp/nfp.h b/src/core/hle/service/nfp/nfp.h index a25c362b8..a5aac710b 100644 --- a/src/core/hle/service/nfp/nfp.h +++ b/src/core/hle/service/nfp/nfp.h @@ -7,6 +7,6 @@ namespace Service::NFP { -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::NFP diff --git a/src/core/hle/service/ngct/ngct.cpp b/src/core/hle/service/ngct/ngct.cpp index 8af8a835d..76897d05c 100644 --- a/src/core/hle/service/ngct/ngct.cpp +++ b/src/core/hle/service/ngct/ngct.cpp @@ -5,6 +5,7 @@ #include "core/core.h" #include "core/hle/ipc_helpers.h" #include "core/hle/service/ngct/ngct.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" namespace Service::NGCT { @@ -51,8 +52,11 @@ private: } }; -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { - std::make_shared(system)->InstallAsService(system.ServiceManager()); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("ngct:u", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::NGCT diff --git a/src/core/hle/service/ngct/ngct.h b/src/core/hle/service/ngct/ngct.h index 370bd4a25..27c34dad4 100644 --- a/src/core/hle/service/ngct/ngct.h +++ b/src/core/hle/service/ngct/ngct.h @@ -7,13 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::NGCT { -/// Registers all NGCT services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::NGCT diff --git a/src/core/hle/service/nifm/nifm.cpp b/src/core/hle/service/nifm/nifm.cpp index 5d32adf64..3d176b3c2 100644 --- a/src/core/hle/service/nifm/nifm.cpp +++ b/src/core/hle/service/nifm/nifm.cpp @@ -6,6 +6,7 @@ #include "core/hle/kernel/k_event.h" #include "core/hle/service/kernel_helpers.h" #include "core/hle/service/nifm/nifm.h" +#include "core/hle/service/server_manager.h" namespace { @@ -626,10 +627,16 @@ private: } }; -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { - std::make_shared("nifm:a", system)->InstallAsService(service_manager); - std::make_shared("nifm:s", system)->InstallAsService(service_manager); - std::make_shared("nifm:u", system)->InstallAsService(service_manager); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("nifm:a", + std::make_shared("nifm:a", system)); + server_manager->RegisterNamedService("nifm:s", + std::make_shared("nifm:s", system)); + server_manager->RegisterNamedService("nifm:u", + std::make_shared("nifm:u", system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::NIFM diff --git a/src/core/hle/service/nifm/nifm.h b/src/core/hle/service/nifm/nifm.h index 48161be28..b5da7ae12 100644 --- a/src/core/hle/service/nifm/nifm.h +++ b/src/core/hle/service/nifm/nifm.h @@ -12,14 +12,9 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::NIFM { -/// Registers all NIFM services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); class IGeneralService final : public ServiceFramework { public: diff --git a/src/core/hle/service/nim/nim.cpp b/src/core/hle/service/nim/nim.cpp index 5a8a91e0b..aff7cc5bd 100644 --- a/src/core/hle/service/nim/nim.cpp +++ b/src/core/hle/service/nim/nim.cpp @@ -8,8 +8,8 @@ #include "core/hle/kernel/k_event.h" #include "core/hle/service/kernel_helpers.h" #include "core/hle/service/nim/nim.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" namespace Service::NIM { @@ -418,11 +418,14 @@ private: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("nim", std::make_shared(system)); + server_manager->RegisterNamedService("nim:eca", std::make_shared(system)); + server_manager->RegisterNamedService("nim:shp", std::make_shared(system)); + server_manager->RegisterNamedService("ntc", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::NIM diff --git a/src/core/hle/service/nim/nim.h b/src/core/hle/service/nim/nim.h index 8f6ff28e8..e7d599908 100644 --- a/src/core/hle/service/nim/nim.h +++ b/src/core/hle/service/nim/nim.h @@ -7,12 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::NIM { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::NIM diff --git a/src/core/hle/service/npns/npns.cpp b/src/core/hle/service/npns/npns.cpp index 8133711c2..a162e5c54 100644 --- a/src/core/hle/service/npns/npns.cpp +++ b/src/core/hle/service/npns/npns.cpp @@ -4,8 +4,8 @@ #include #include "core/hle/service/npns/npns.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" namespace Service::NPNS { @@ -94,9 +94,12 @@ public: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("npns:s", std::make_shared(system)); + server_manager->RegisterNamedService("npns:u", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::NPNS diff --git a/src/core/hle/service/npns/npns.h b/src/core/hle/service/npns/npns.h index 84e6ec437..0019fca76 100644 --- a/src/core/hle/service/npns/npns.h +++ b/src/core/hle/service/npns/npns.h @@ -7,12 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::NPNS { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::NPNS diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cpp index f59a1a63d..a9291ed5d 100644 --- a/src/core/hle/service/ns/ns.cpp +++ b/src/core/hle/service/ns/ns.cpp @@ -14,6 +14,7 @@ #include "core/hle/service/ns/language.h" #include "core/hle/service/ns/ns.h" #include "core/hle/service/ns/pdm_qry.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/set/set.h" namespace Service::NS { @@ -777,23 +778,26 @@ private: } }; -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); - std::make_shared("ns:am2", system)->InstallAsService(service_manager); - std::make_shared("ns:ec", system)->InstallAsService(service_manager); - std::make_shared("ns:rid", system)->InstallAsService(service_manager); - std::make_shared("ns:rt", system)->InstallAsService(service_manager); - std::make_shared("ns:web", system)->InstallAsService(service_manager); - std::make_shared("ns:ro", system)->InstallAsService(service_manager); + server_manager->RegisterNamedService("ns:am2", std::make_shared("ns:am2", system)); + server_manager->RegisterNamedService("ns:ec", std::make_shared("ns:ec", system)); + server_manager->RegisterNamedService("ns:rid", std::make_shared("ns:rid", system)); + server_manager->RegisterNamedService("ns:rt", std::make_shared("ns:rt", system)); + server_manager->RegisterNamedService("ns:web", std::make_shared("ns:web", system)); + server_manager->RegisterNamedService("ns:ro", std::make_shared("ns:ro", system)); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); + server_manager->RegisterNamedService("ns:dev", std::make_shared(system)); + server_manager->RegisterNamedService("ns:su", std::make_shared(system)); + server_manager->RegisterNamedService("ns:vm", std::make_shared(system)); + server_manager->RegisterNamedService("pdm:qry", std::make_shared(system)); - std::make_shared(system)->InstallAsService(service_manager); - - std::make_shared(system, "pl:s")->InstallAsService(service_manager); - std::make_shared(system, "pl:u")->InstallAsService(service_manager); + server_manager->RegisterNamedService("pl:s", + std::make_shared(system, "pl:s")); + server_manager->RegisterNamedService("pl:u", + std::make_shared(system, "pl:u")); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::NS diff --git a/src/core/hle/service/ns/ns.h b/src/core/hle/service/ns/ns.h index 9c18e935c..797e69a13 100644 --- a/src/core/hle/service/ns/ns.h +++ b/src/core/hle/service/ns/ns.h @@ -117,8 +117,7 @@ private: } }; -/// Registers all NS services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace NS } // namespace Service diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index 52d27e755..a70ea9385 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -24,6 +24,7 @@ #include "core/hle/service/nvdrv/nvdrv_interface.h" #include "core/hle/service/nvdrv/nvmemp.h" #include "core/hle/service/nvflinger/nvflinger.h" +#include "core/hle/service/server_manager.h" #include "video_core/gpu.h" namespace Service::Nvidia { @@ -41,15 +42,19 @@ void EventInterface::FreeEvent(Kernel::KEvent* event) { module.service_context.CloseEvent(event); } -void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger& nvflinger, - Core::System& system) { - auto module_ = std::make_shared(system); - std::make_shared(system, module_, "nvdrv")->InstallAsService(service_manager); - std::make_shared(system, module_, "nvdrv:a")->InstallAsService(service_manager); - std::make_shared(system, module_, "nvdrv:s")->InstallAsService(service_manager); - std::make_shared(system, module_, "nvdrv:t")->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - nvflinger.SetNVDrvInstance(module_); +void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system) { + auto server_manager = std::make_unique(system); + auto module = std::make_shared(system); + server_manager->RegisterNamedService("nvdrv", std::make_shared(system, module, "nvdrv")); + server_manager->RegisterNamedService("nvdrv:a", + std::make_shared(system, module, "nvdrv:a")); + server_manager->RegisterNamedService("nvdrv:s", + std::make_shared(system, module, "nvdrv:s")); + server_manager->RegisterNamedService("nvdrv:t", + std::make_shared(system, module, "nvdrv:t")); + server_manager->RegisterNamedService("nvmemp", std::make_shared(system)); + nvflinger.SetNVDrvInstance(module); + ServerManager::RunServer(std::move(server_manager)); } Module::Module(Core::System& system) diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.h index b09b6e585..b2270cf76 100644 --- a/src/core/hle/service/nvdrv/nvdrv.h +++ b/src/core/hle/service/nvdrv/nvdrv.h @@ -114,8 +114,6 @@ private: std::unordered_map> builders; }; -/// Registers all NVDRV services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger& nvflinger, - Core::System& system); +void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system); } // namespace Service::Nvidia diff --git a/src/core/hle/service/nvdrv/nvdrv_interface.cpp b/src/core/hle/service/nvdrv/nvdrv_interface.cpp index edbdfee43..396fa7ed5 100644 --- a/src/core/hle/service/nvdrv/nvdrv_interface.cpp +++ b/src/core/hle/service/nvdrv/nvdrv_interface.cpp @@ -222,7 +222,7 @@ void NVDRV::DumpGraphicsMemoryInfo(Kernel::HLERequestContext& ctx) { } NVDRV::NVDRV(Core::System& system_, std::shared_ptr nvdrv_, const char* name) - : ServiceFramework{system_, name, ServiceThreadType::CreateNew}, nvdrv{std::move(nvdrv_)} { + : ServiceFramework{system_, name}, nvdrv{std::move(nvdrv_)} { static const FunctionInfo functions[] = { {0, &NVDRV::Open, "Open"}, {1, &NVDRV::Ioctl1, "Ioctl"}, diff --git a/src/core/hle/service/olsc/olsc.cpp b/src/core/hle/service/olsc/olsc.cpp index 530e1be3b..3493f8272 100644 --- a/src/core/hle/service/olsc/olsc.cpp +++ b/src/core/hle/service/olsc/olsc.cpp @@ -3,8 +3,8 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/olsc/olsc.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" namespace Service::OLSC { @@ -72,8 +72,11 @@ private: bool initialized{}; }; -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { - std::make_shared(system)->InstallAsService(service_manager); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("olsc:u", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::OLSC diff --git a/src/core/hle/service/olsc/olsc.h b/src/core/hle/service/olsc/olsc.h index 1522d8d32..620b634fa 100644 --- a/src/core/hle/service/olsc/olsc.h +++ b/src/core/hle/service/olsc/olsc.h @@ -7,13 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::OLSC { -/// Registers all SSL services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::OLSC diff --git a/src/core/hle/service/pcie/pcie.cpp b/src/core/hle/service/pcie/pcie.cpp index 79501b9f9..c6da6eb51 100644 --- a/src/core/hle/service/pcie/pcie.cpp +++ b/src/core/hle/service/pcie/pcie.cpp @@ -4,8 +4,8 @@ #include #include "core/hle/service/pcie/pcie.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" namespace Service::PCIe { @@ -59,8 +59,11 @@ public: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("pcie", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::PCIe diff --git a/src/core/hle/service/pcie/pcie.h b/src/core/hle/service/pcie/pcie.h index cebfd9042..5c2d4b805 100644 --- a/src/core/hle/service/pcie/pcie.h +++ b/src/core/hle/service/pcie/pcie.h @@ -7,12 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::PCIe { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::PCIe diff --git a/src/core/hle/service/pctl/pctl_module.cpp b/src/core/hle/service/pctl/pctl_module.cpp index 083609b34..a4a12a78c 100644 --- a/src/core/hle/service/pctl/pctl_module.cpp +++ b/src/core/hle/service/pctl/pctl_module.cpp @@ -8,6 +8,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/pctl/pctl.h" #include "core/hle/service/pctl/pctl_module.h" +#include "core/hle/service/server_manager.h" namespace Service::PCTL { @@ -393,19 +394,22 @@ Module::Interface::Interface(Core::System& system_, std::shared_ptr modu Module::Interface::~Interface() = default; -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + auto module = std::make_shared(); - std::make_shared(system, module, "pctl", - Capability::Application | Capability::SnsPost | Capability::Status | - Capability::StereoVision) - ->InstallAsService(service_manager); + server_manager->RegisterNamedService( + "pctl", std::make_shared(system, module, "pctl", + Capability::Application | Capability::SnsPost | + Capability::Status | Capability::StereoVision)); // TODO(ogniK): Implement remaining capabilities - std::make_shared(system, module, "pctl:a", Capability::None) - ->InstallAsService(service_manager); - std::make_shared(system, module, "pctl:r", Capability::None) - ->InstallAsService(service_manager); - std::make_shared(system, module, "pctl:s", Capability::None) - ->InstallAsService(service_manager); + server_manager->RegisterNamedService( + "pctl:a", std::make_shared(system, module, "pctl:a", Capability::None)); + server_manager->RegisterNamedService( + "pctl:r", std::make_shared(system, module, "pctl:r", Capability::None)); + server_manager->RegisterNamedService( + "pctl:s", std::make_shared(system, module, "pctl:s", Capability::None)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::PCTL diff --git a/src/core/hle/service/pctl/pctl_module.h b/src/core/hle/service/pctl/pctl_module.h index 6f584530d..4ea77ab21 100644 --- a/src/core/hle/service/pctl/pctl_module.h +++ b/src/core/hle/service/pctl/pctl_module.h @@ -42,7 +42,6 @@ public: }; }; -/// Registers all PCTL services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::PCTL diff --git a/src/core/hle/service/pcv/pcv.cpp b/src/core/hle/service/pcv/pcv.cpp index 98037a8d4..be64b94ea 100644 --- a/src/core/hle/service/pcv/pcv.cpp +++ b/src/core/hle/service/pcv/pcv.cpp @@ -5,8 +5,8 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/pcv/pcv.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" namespace Service::PCV { @@ -141,11 +141,14 @@ public: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system, "clkrst")->InstallAsService(sm); - std::make_shared(system, "clkrst:i")->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("pcv", std::make_shared(system)); + server_manager->RegisterNamedService("clkrst", std::make_shared(system, "clkrst")); + server_manager->RegisterNamedService("clkrst:i", std::make_shared(system, "clkrst:i")); + server_manager->RegisterNamedService("clkrst:a", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::PCV diff --git a/src/core/hle/service/pcv/pcv.h b/src/core/hle/service/pcv/pcv.h index 6b26b6fa7..bf541e6fe 100644 --- a/src/core/hle/service/pcv/pcv.h +++ b/src/core/hle/service/pcv/pcv.h @@ -7,10 +7,6 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::PCV { enum class DeviceCode : u32 { @@ -104,6 +100,6 @@ enum class DeviceCode : u32 { OscClk = 0x40000080 }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::PCV diff --git a/src/core/hle/service/pm/pm.cpp b/src/core/hle/service/pm/pm.cpp index b10e86c8f..02a4ca13b 100644 --- a/src/core/hle/service/pm/pm.cpp +++ b/src/core/hle/service/pm/pm.cpp @@ -6,6 +6,7 @@ #include "core/hle/kernel/k_process.h" #include "core/hle/kernel/kernel.h" #include "core/hle/service/pm/pm.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" namespace Service::PM { @@ -262,12 +263,15 @@ private: const Kernel::KernelCore& kernel; }; -void InstallInterfaces(Core::System& system) { - std::make_shared(system)->InstallAsService(system.ServiceManager()); - std::make_shared(system)->InstallAsService(system.ServiceManager()); - std::make_shared(system, system.Kernel().GetProcessList()) - ->InstallAsService(system.ServiceManager()); - std::make_shared(system)->InstallAsService(system.ServiceManager()); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("pm:bm", std::make_shared(system)); + server_manager->RegisterNamedService("pm:dmnt", std::make_shared(system)); + server_manager->RegisterNamedService( + "pm:info", std::make_shared(system, system.Kernel().GetProcessList())); + server_manager->RegisterNamedService("pm:shell", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::PM diff --git a/src/core/hle/service/pm/pm.h b/src/core/hle/service/pm/pm.h index 060103928..5d4a1a171 100644 --- a/src/core/hle/service/pm/pm.h +++ b/src/core/hle/service/pm/pm.h @@ -14,7 +14,6 @@ enum class SystemBootMode { Maintenance, }; -/// Registers all PM services with the specified service manager. -void InstallInterfaces(Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::PM diff --git a/src/core/hle/service/prepo/prepo.cpp b/src/core/hle/service/prepo/prepo.cpp index 90c5f8756..02af311e8 100644 --- a/src/core/hle/service/prepo/prepo.cpp +++ b/src/core/hle/service/prepo/prepo.cpp @@ -7,6 +7,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/service/acc/profile_manager.h" #include "core/hle/service/prepo/prepo.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" #include "core/reporter.h" @@ -183,12 +184,20 @@ private: } }; -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { - std::make_shared("prepo:a", system)->InstallAsService(service_manager); - std::make_shared("prepo:a2", system)->InstallAsService(service_manager); - std::make_shared("prepo:m", system)->InstallAsService(service_manager); - std::make_shared("prepo:s", system)->InstallAsService(service_manager); - std::make_shared("prepo:u", system)->InstallAsService(service_manager); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("prepo:a", + std::make_shared("prepo:a", system)); + server_manager->RegisterNamedService("prepo:a2", + std::make_shared("prepo:a2", system)); + server_manager->RegisterNamedService("prepo:m", + std::make_shared("prepo:m", system)); + server_manager->RegisterNamedService("prepo:s", + std::make_shared("prepo:s", system)); + server_manager->RegisterNamedService("prepo:u", + std::make_shared("prepo:u", system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::PlayReport diff --git a/src/core/hle/service/prepo/prepo.h b/src/core/hle/service/prepo/prepo.h index 37ea5afad..2c2462f93 100644 --- a/src/core/hle/service/prepo/prepo.h +++ b/src/core/hle/service/prepo/prepo.h @@ -7,12 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::PlayReport { -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::PlayReport diff --git a/src/core/hle/service/psc/psc.cpp b/src/core/hle/service/psc/psc.cpp index 3a9412cf5..1650d2f39 100644 --- a/src/core/hle/service/psc/psc.cpp +++ b/src/core/hle/service/psc/psc.cpp @@ -6,8 +6,8 @@ #include "common/logging/log.h" #include "core/hle/ipc_helpers.h" #include "core/hle/service/psc/psc.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" namespace Service::PSC { @@ -71,9 +71,12 @@ private: } }; -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("psc:c", std::make_shared(system)); + server_manager->RegisterNamedService("psc:m", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::PSC diff --git a/src/core/hle/service/psc/psc.h b/src/core/hle/service/psc/psc.h index d248372c2..459137f42 100644 --- a/src/core/hle/service/psc/psc.h +++ b/src/core/hle/service/psc/psc.h @@ -13,6 +13,6 @@ class ServiceManager; namespace Service::PSC { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::PSC diff --git a/src/core/hle/service/ptm/ptm.cpp b/src/core/hle/service/ptm/ptm.cpp index 4bea995c6..6f0cfe04b 100644 --- a/src/core/hle/service/ptm/ptm.cpp +++ b/src/core/hle/service/ptm/ptm.cpp @@ -7,12 +7,16 @@ #include "core/hle/service/ptm/psm.h" #include "core/hle/service/ptm/ptm.h" #include "core/hle/service/ptm/ts.h" +#include "core/hle/service/server_manager.h" namespace Service::PTM { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) { - std::make_shared(system)->InstallAsService(sm); - std::make_shared(system)->InstallAsService(sm); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("psm", std::make_shared(system)); + server_manager->RegisterNamedService("ts", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::PTM diff --git a/src/core/hle/service/ptm/ptm.h b/src/core/hle/service/ptm/ptm.h index 06224a24e..a0ae03d28 100644 --- a/src/core/hle/service/ptm/ptm.h +++ b/src/core/hle/service/ptm/ptm.h @@ -7,12 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::PTM { -void InstallInterfaces(SM::ServiceManager& sm, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::PTM diff --git a/src/core/hle/service/server_manager.cpp b/src/core/hle/service/server_manager.cpp new file mode 100644 index 000000000..55788ddeb --- /dev/null +++ b/src/core/hle/service/server_manager.cpp @@ -0,0 +1,358 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "common/scope_exit.h" + +#include "core/core.h" +#include "core/hle/ipc_helpers.h" +#include "core/hle/kernel/hle_ipc.h" +#include "core/hle/kernel/k_client_port.h" +#include "core/hle/kernel/k_client_session.h" +#include "core/hle/kernel/k_event.h" +#include "core/hle/kernel/k_object_name.h" +#include "core/hle/kernel/k_port.h" +#include "core/hle/kernel/k_server_port.h" +#include "core/hle/kernel/k_server_session.h" +#include "core/hle/kernel/k_synchronization_object.h" +#include "core/hle/kernel/svc_results.h" +#include "core/hle/service/server_manager.h" +#include "core/hle/service/sm/sm.h" + +namespace Service { + +constexpr size_t MaximumWaitObjects = 0x40; + +enum HandleType { + Port, + Session, + Event, +}; + +ServerManager::ServerManager(Core::System& system) : m_system{system}, m_serve_mutex{system} { + // Initialize event. + m_event = Kernel::KEvent::Create(system.Kernel()); + m_event->Initialize(nullptr); +} + +ServerManager::~ServerManager() { + // Signal stop. + m_stop_source.request_stop(); + m_event->Signal(); + + // Wait for processing to stop. + m_stopped.wait(false); + m_threads.clear(); + + // Clean up ports. + for (const auto& [port, handler] : m_ports) { + port->Close(); + } + + // Clean up sessions. + for (const auto& [session, manager] : m_sessions) { + session->Close(); + } + + // Close event. + m_event->GetReadableEvent().Close(); + m_event->Close(); +} + +void ServerManager::RunServer(std::unique_ptr&& server_manager) { + server_manager->m_system.RunServer(std::move(server_manager)); +} + +Result ServerManager::RegisterSession(Kernel::KServerSession* session, + std::shared_ptr manager) { + ASSERT(m_sessions.size() + m_ports.size() < MaximumWaitObjects); + + // We are taking ownership of the server session, so don't open it. + // Begin tracking the server session. + { + std::scoped_lock ll{m_list_mutex}; + m_sessions.emplace(session, std::move(manager)); + } + + // Signal the wakeup event. + m_event->Signal(); + + R_SUCCEED(); +} + +Result ServerManager::RegisterNamedService(const std::string& service_name, + std::shared_ptr&& handler, + u32 max_sessions) { + ASSERT(m_sessions.size() + m_ports.size() < MaximumWaitObjects); + + // Add the new server to sm:. + ASSERT(R_SUCCEEDED( + m_system.ServiceManager().RegisterService(service_name, max_sessions, handler))); + + // Get the registered port. + auto port = m_system.ServiceManager().GetServicePort(service_name); + ASSERT(port.Succeeded()); + + // Open a new reference to the server port. + (*port)->GetServerPort().Open(); + + // Begin tracking the server port. + { + std::scoped_lock ll{m_list_mutex}; + m_ports.emplace(std::addressof((*port)->GetServerPort()), std::move(handler)); + } + + // Signal the wakeup event. + m_event->Signal(); + + R_SUCCEED(); +} + +Result ServerManager::ManageNamedPort(const std::string& service_name, + std::shared_ptr&& handler, + u32 max_sessions) { + ASSERT(m_sessions.size() + m_ports.size() < MaximumWaitObjects); + + // Create a new port. + auto* port = Kernel::KPort::Create(m_system.Kernel()); + port->Initialize(max_sessions, false, service_name); + + // Register the port. + Kernel::KPort::Register(m_system.Kernel(), port); + + // Ensure that our reference to the port is closed if we fail to register it. + SCOPE_EXIT({ + port->GetClientPort().Close(); + port->GetServerPort().Close(); + }); + + // Register the object name with the kernel. + R_TRY(Kernel::KObjectName::NewFromName(m_system.Kernel(), std::addressof(port->GetClientPort()), + service_name.c_str())); + + // Open a new reference to the server port. + port->GetServerPort().Open(); + + // Begin tracking the server port. + { + std::scoped_lock ll{m_list_mutex}; + m_ports.emplace(std::addressof(port->GetServerPort()), std::move(handler)); + } + + // We succeeded. + R_SUCCEED(); +} + +void ServerManager::StartAdditionalHostThreads(const char* name, size_t num_threads) { + for (size_t i = 0; i < num_threads; i++) { + auto thread_name = fmt::format("{}:{}", name, i + 1); + m_threads.emplace_back(m_system.Kernel().RunOnHostCoreThread( + std::move(thread_name), [&] { this->LoopProcessImpl(); })); + } +} + +Result ServerManager::LoopProcess() { + SCOPE_EXIT({ + m_stopped.store(true); + m_stopped.notify_all(); + }); + + R_RETURN(this->LoopProcessImpl()); +} + +Result ServerManager::LoopProcessImpl() { + while (!m_stop_source.stop_requested()) { + R_TRY(this->WaitAndProcessImpl()); + } + + R_SUCCEED(); +} + +Result ServerManager::WaitAndProcessImpl() { + Kernel::KScopedAutoObject wait_obj; + HandleType wait_type{}; + + // Ensure we are the only thread waiting for this server. + std::unique_lock sl{m_serve_mutex}; + + // If we're done, return before we start waiting. + R_SUCCEED_IF(m_stop_source.stop_requested()); + + // Wait for a tracked object to become signaled. + { + s32 num_objs{}; + std::array wait_types{}; + std::array wait_objs{}; + + const auto AddWaiter{ + [&](Kernel::KSynchronizationObject* synchronization_object, HandleType type) { + // Open a new reference to the object. + synchronization_object->Open(); + + // Insert into the list. + wait_types[num_objs] = type; + wait_objs[num_objs++] = synchronization_object; + }}; + + { + std::scoped_lock ll{m_list_mutex}; + + // Add all of our ports. + for (const auto& [port, handler] : m_ports) { + AddWaiter(port, HandleType::Port); + } + + // Add all of our sessions. + for (const auto& [session, manager] : m_sessions) { + AddWaiter(session, HandleType::Session); + } + } + + // Add the wakeup event. + AddWaiter(std::addressof(m_event->GetReadableEvent()), HandleType::Event); + + // Clean up extra references on exit. + SCOPE_EXIT({ + for (s32 i = 0; i < num_objs; i++) { + wait_objs[i]->Close(); + } + }); + + // Wait for a signal. + s32 out_index{-1}; + R_TRY(Kernel::KSynchronizationObject::Wait(m_system.Kernel(), &out_index, wait_objs.data(), + num_objs, -1)); + ASSERT(out_index >= 0 && out_index < num_objs); + + // Set the output index. + wait_obj = wait_objs[out_index]; + wait_type = wait_types[out_index]; + } + + // Process what we just received, temporarily removing the object so it is + // not processed concurrently by another thread. + { + switch (wait_type) { + case HandleType::Port: { + // Port signaled. + auto* port = wait_obj->DynamicCast(); + std::shared_ptr handler; + + // Remove from tracking. + { + std::scoped_lock ll{m_list_mutex}; + ASSERT(m_ports.contains(port)); + m_ports.at(port).swap(handler); + m_ports.erase(port); + } + + // Allow other threads to serve. + sl.unlock(); + + // Finish. + R_RETURN(this->OnPortEvent(port, std::move(handler))); + } + case HandleType::Session: { + // Session signaled. + auto* session = wait_obj->DynamicCast(); + std::shared_ptr manager; + + // Remove from tracking. + { + std::scoped_lock ll{m_list_mutex}; + ASSERT(m_sessions.contains(session)); + m_sessions.at(session).swap(manager); + m_sessions.erase(session); + } + + // Allow other threads to serve. + sl.unlock(); + + // Finish. + R_RETURN(this->OnSessionEvent(session, std::move(manager))); + } + case HandleType::Event: { + // Clear event and finish. + R_RETURN(m_event->Clear()); + } + default: { + UNREACHABLE(); + } + } + } +} + +Result ServerManager::OnPortEvent(Kernel::KServerPort* port, + std::shared_ptr&& handler) { + // Accept a new server session. + Kernel::KServerSession* session = port->AcceptSession(); + ASSERT(session != nullptr); + + // Create the session manager and install the handler. + auto manager = std::make_shared(m_system.Kernel(), *this); + manager->SetSessionHandler(std::shared_ptr(handler)); + + // Track the server session. + { + std::scoped_lock ll{m_list_mutex}; + m_ports.emplace(port, std::move(handler)); + m_sessions.emplace(session, std::move(manager)); + } + + // Signal the wakeup event. + m_event->Signal(); + + // We succeeded. + R_SUCCEED(); +} + +Result ServerManager::OnSessionEvent(Kernel::KServerSession* session, + std::shared_ptr&& manager) { + Result rc{ResultSuccess}; + Result service_rc{ResultSuccess}; + + // Try to receive a message. + std::shared_ptr context; + rc = session->ReceiveRequest(&context, manager); + + // If the session has been closed, we're done. + if (rc == Kernel::ResultSessionClosed) { + // Close the session. + session->Close(); + + // Finish. + R_SUCCEED(); + } + ASSERT(R_SUCCEEDED(rc)); + + // Complete the request. We have exclusive access to this session. + service_rc = manager->CompleteSyncRequest(session, *context); + + // Send the reply. + rc = session->SendReplyHLE(); + + // If the session has been closed, we're done. + if (rc == Kernel::ResultSessionClosed || service_rc == IPC::ERR_REMOTE_PROCESS_DEAD) { + // Close the session. + session->Close(); + + // Finish. + R_SUCCEED(); + } + + ASSERT(R_SUCCEEDED(rc)); + ASSERT(R_SUCCEEDED(service_rc)); + + // Reinsert the session. + { + std::scoped_lock ll{m_list_mutex}; + m_sessions.emplace(session, std::move(manager)); + } + + // Signal the wakeup event. + m_event->Signal(); + + // We succeeded. + R_SUCCEED(); +} + +} // namespace Service diff --git a/src/core/hle/service/server_manager.h b/src/core/hle/service/server_manager.h new file mode 100644 index 000000000..b26557172 --- /dev/null +++ b/src/core/hle/service/server_manager.h @@ -0,0 +1,75 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include +#include +#include +#include +#include +#include + +#include "common/polyfill_thread.h" +#include "core/hle/result.h" +#include "core/hle/service/mutex.h" + +namespace Core { +class System; +} + +namespace Kernel { +class KEvent; +class KServerPort; +class KServerSession; +class KSynchronizationObject; +class SessionRequestHandler; +class SessionRequestManager; +} // namespace Kernel + +namespace Service { + +class ServerManager { +public: + explicit ServerManager(Core::System& system); + ~ServerManager(); + + Result RegisterSession(Kernel::KServerSession* session, + std::shared_ptr manager); + Result RegisterNamedService(const std::string& service_name, + std::shared_ptr&& handler, + u32 max_sessions = 64); + Result ManageNamedPort(const std::string& service_name, + std::shared_ptr&& handler, + u32 max_sessions = 64); + + Result LoopProcess(); + void StartAdditionalHostThreads(const char* name, size_t num_threads); + + static void RunServer(std::unique_ptr&& server); + +private: + Result LoopProcessImpl(); + Result WaitAndProcessImpl(); + Result OnPortEvent(Kernel::KServerPort* port, + std::shared_ptr&& handler); + Result OnSessionEvent(Kernel::KServerSession* session, + std::shared_ptr&& manager); + +private: + Core::System& m_system; + Mutex m_serve_mutex; + std::mutex m_list_mutex; + + // Guest state tracking + std::map> m_ports{}; + std::map> m_sessions{}; + Kernel::KEvent* m_event{}; + + // Host state tracking + std::atomic m_stopped{}; + std::vector m_threads{}; + std::stop_source m_stop_source{}; +}; + +} // namespace Service diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 1ffc1c694..31021ea03 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -90,44 +90,13 @@ namespace Service { } ServiceFrameworkBase::ServiceFrameworkBase(Core::System& system_, const char* service_name_, - ServiceThreadType thread_type, u32 max_sessions_, - InvokerFn* handler_invoker_) - : SessionRequestHandler(system_.Kernel(), service_name_, thread_type), system{system_}, + u32 max_sessions_, InvokerFn* handler_invoker_) + : SessionRequestHandler(system_.Kernel(), service_name_), system{system_}, service_name{service_name_}, max_sessions{max_sessions_}, handler_invoker{handler_invoker_} {} ServiceFrameworkBase::~ServiceFrameworkBase() { // Wait for other threads to release access before destroying const auto guard = LockService(); - - if (named_port != nullptr) { - named_port->GetClientPort().Close(); - named_port->GetServerPort().Close(); - named_port = nullptr; - } -} - -void ServiceFrameworkBase::InstallAsService(SM::ServiceManager& service_manager) { - const auto guard = LockService(); - - ASSERT(!service_registered); - - service_manager.RegisterService(service_name, max_sessions, shared_from_this()); - service_registered = true; -} - -Kernel::KClientPort& ServiceFrameworkBase::CreatePort() { - const auto guard = LockService(); - - if (named_port == nullptr) { - ASSERT(!service_registered); - - named_port = Kernel::KPort::Create(kernel); - named_port->Initialize(max_sessions, false, service_name); - - service_registered = true; - } - - return named_port->GetClientPort(); } void ServiceFrameworkBase::RegisterHandlersBase(const FunctionInfoBase* functions, std::size_t n) { @@ -244,67 +213,69 @@ Services::Services(std::shared_ptr& sm, Core::System& system : hos_binder_driver_server{std::make_unique(system)}, nv_flinger{std::make_unique(system, *hos_binder_driver_server)} { + auto& kernel = system.Kernel(); + // NVFlinger needs to be accessed by several services like Vi and AppletOE so we instantiate it // here and pass it into the respective InstallInterfaces functions. - system.GetFileSystemController().CreateFactories(*system.GetFilesystem(), false); - system.Kernel().RegisterNamedService("sm:", SM::ServiceManager::InterfaceFactory); - system.Kernel().RegisterInterfaceForNamedService("sm:", SM::ServiceManager::SessionHandler); + // clang-format off + kernel.RunOnHostCoreProcess("audio", [&] { Audio::LoopProcess(system); }).detach(); + kernel.RunOnHostCoreProcess("FS", [&] { FileSystem::LoopProcess(system); }).detach(); + kernel.RunOnHostCoreProcess("jit", [&] { JIT::LoopProcess(system); }).detach(); + kernel.RunOnHostCoreProcess("ldn", [&] { LDN::LoopProcess(system); }).detach(); + kernel.RunOnHostCoreProcess("Loader", [&] { LDR::LoopProcess(system); }).detach(); + kernel.RunOnHostCoreProcess("nvservices", [&] { Nvidia::LoopProcess(*nv_flinger, system); }).detach(); + kernel.RunOnHostCoreProcess("bsdsocket", [&] { Sockets::LoopProcess(system); }).detach(); + kernel.RunOnHostCoreProcess("vi", [&] { VI::LoopProcess(system, *nv_flinger, *hos_binder_driver_server); }).detach(); - Account::InstallInterfaces(system); - AM::InstallInterfaces(*sm, *nv_flinger, system); - AOC::InstallInterfaces(*sm, system); - APM::InstallInterfaces(system); - Audio::InstallInterfaces(*sm, system); - BCAT::InstallInterfaces(system); - BPC::InstallInterfaces(*sm, system); - BtDrv::InstallInterfaces(*sm, system); - BTM::InstallInterfaces(*sm, system); - Capture::InstallInterfaces(*sm, system); - ERPT::InstallInterfaces(*sm, system); - ES::InstallInterfaces(*sm, system); - EUPLD::InstallInterfaces(*sm, system); - Fatal::InstallInterfaces(*sm, system); - FGM::InstallInterfaces(*sm, system); - FileSystem::InstallInterfaces(system); - Friend::InstallInterfaces(*sm, system); - Glue::InstallInterfaces(system); - GRC::InstallInterfaces(*sm, system); - HID::InstallInterfaces(*sm, system); - JIT::InstallInterfaces(*sm, system); - LBL::InstallInterfaces(*sm, system); - LDN::InstallInterfaces(*sm, system); - LDR::InstallInterfaces(*sm, system); - LM::InstallInterfaces(system); - Migration::InstallInterfaces(*sm, system); - Mii::InstallInterfaces(*sm, system); - MM::InstallInterfaces(*sm, system); - MNPP::InstallInterfaces(*sm, system); - NCM::InstallInterfaces(*sm, system); - NFC::InstallInterfaces(*sm, system); - NFP::InstallInterfaces(*sm, system); - NGCT::InstallInterfaces(*sm, system); - NIFM::InstallInterfaces(*sm, system); - NIM::InstallInterfaces(*sm, system); - NPNS::InstallInterfaces(*sm, system); - NS::InstallInterfaces(*sm, system); - Nvidia::InstallInterfaces(*sm, *nv_flinger, system); - OLSC::InstallInterfaces(*sm, system); - PCIe::InstallInterfaces(*sm, system); - PCTL::InstallInterfaces(*sm, system); - PCV::InstallInterfaces(*sm, system); - PlayReport::InstallInterfaces(*sm, system); - PM::InstallInterfaces(system); - PSC::InstallInterfaces(*sm, system); - PTM::InstallInterfaces(*sm, system); - Set::InstallInterfaces(*sm, system); - Sockets::InstallInterfaces(*sm, system); - SPL::InstallInterfaces(*sm, system); - SSL::InstallInterfaces(*sm, system); - Time::InstallInterfaces(system); - USB::InstallInterfaces(*sm, system); - VI::InstallInterfaces(*sm, system, *nv_flinger, *hos_binder_driver_server); + kernel.RunOnGuestCoreProcess("sm", [&] { SM::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("account", [&] { Account::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("am", [&] { AM::LoopProcess(*nv_flinger, system); }); + kernel.RunOnGuestCoreProcess("aoc", [&] { AOC::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("apm", [&] { APM::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("bcat", [&] { BCAT::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("bpc", [&] { BPC::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("btdrv", [&] { BtDrv::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("btm", [&] { BTM::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("capsrv", [&] { Capture::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("erpt", [&] { ERPT::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("es", [&] { ES::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("eupld", [&] { EUPLD::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("fatal", [&] { Fatal::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("fgm", [&] { FGM::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("friends", [&] { Friend::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("glue", [&] { Glue::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("grc", [&] { GRC::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("hid", [&] { HID::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("lbl", [&] { LBL::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("LogManager.Prod", [&] { LM::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("mig", [&] { Migration::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("mii", [&] { Mii::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("mm", [&] { MM::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("mnpp", [&] { MNPP::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("NCM", [&] { NCM::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("nfc", [&] { NFC::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("nfp", [&] { NFP::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("ngct", [&] { NGCT::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("nifm", [&] { NIFM::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("nim", [&] { NIM::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("npns", [&] { NPNS::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("ns", [&] { NS::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("olsc", [&] { OLSC::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("pcie", [&] { PCIe::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("pctl", [&] { PCTL::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("pcv", [&] { PCV::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("prepo", [&] { PlayReport::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("ProcessManager", [&] { PM::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("psc", [&] { PSC::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("ptm", [&] { PTM::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("settings", [&] { Set::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("spl", [&] { SPL::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("ssl", [&] { SSL::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("time", [&] { Time::LoopProcess(system); }); + kernel.RunOnGuestCoreProcess("usb", [&] { USB::LoopProcess(system); }); + // clang-format on } Services::~Services() = default; diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index 22e2119d7..db3b31378 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h @@ -19,8 +19,6 @@ class System; namespace Kernel { class HLERequestContext; -class KClientPort; -class KPort; class KServerSession; class ServiceThread; } // namespace Kernel @@ -67,18 +65,12 @@ public: return max_sessions; } - /// Creates a port pair and registers this service with the given ServiceManager. - void InstallAsService(SM::ServiceManager& service_manager); - /// Invokes a service request routine using the HIPC protocol. void InvokeRequest(Kernel::HLERequestContext& ctx); /// Invokes a service request routine using the HIPC protocol. void InvokeRequestTipc(Kernel::HLERequestContext& ctx); - /// Creates a port pair and registers it on the kernel's global port registry. - Kernel::KClientPort& CreatePort(); - /// Handles a synchronization request for the service. Result HandleSyncRequest(Kernel::KServerSession& session, Kernel::HLERequestContext& context) override; @@ -99,9 +91,6 @@ protected: /// Identifier string used to connect to the service. std::string service_name; - /// Port used by ManageNamedPort. - Kernel::KPort* named_port{}; - private: template friend class ServiceFramework; @@ -116,8 +105,7 @@ private: Kernel::HLERequestContext& ctx); explicit ServiceFrameworkBase(Core::System& system_, const char* service_name_, - ServiceThreadType thread_type, u32 max_sessions_, - InvokerFn* handler_invoker_); + u32 max_sessions_, InvokerFn* handler_invoker_); ~ServiceFrameworkBase() override; void RegisterHandlersBase(const FunctionInfoBase* functions, std::size_t n); @@ -181,15 +169,12 @@ protected: * * @param system_ The system context to construct this service under. * @param service_name_ Name of the service. - * @param thread_type Specifies the thread type for this service. If this is set to CreateNew, - * it creates a new thread for it, otherwise this uses the default thread. * @param max_sessions_ Maximum number of sessions that can be connected to this service at the * same time. */ explicit ServiceFramework(Core::System& system_, const char* service_name_, - ServiceThreadType thread_type = ServiceThreadType::Default, u32 max_sessions_ = ServerSessionCountMax) - : ServiceFrameworkBase(system_, service_name_, thread_type, max_sessions_, Invoker) {} + : ServiceFrameworkBase(system_, service_name_, max_sessions_, Invoker) {} /// Registers handlers in the service. template diff --git a/src/core/hle/service/set/settings.cpp b/src/core/hle/service/set/settings.cpp index 4ebc2a0ec..c48844f77 100644 --- a/src/core/hle/service/set/settings.cpp +++ b/src/core/hle/service/set/settings.cpp @@ -1,20 +1,23 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "core/hle/service/server_manager.h" #include "core/hle/service/set/set.h" #include "core/hle/service/set/set_cal.h" #include "core/hle/service/set/set_fd.h" #include "core/hle/service/set/set_sys.h" #include "core/hle/service/set/settings.h" -#include "core/hle/service/sm/sm.h" namespace Service::Set { -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("set", std::make_shared(system)); + server_manager->RegisterNamedService("set:cal", std::make_shared(system)); + server_manager->RegisterNamedService("set:fd", std::make_shared(system)); + server_manager->RegisterNamedService("set:sys", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::Set diff --git a/src/core/hle/service/set/settings.h b/src/core/hle/service/set/settings.h index 6cd7d634c..03cd4bb66 100644 --- a/src/core/hle/service/set/settings.h +++ b/src/core/hle/service/set/settings.h @@ -7,13 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::Set { -/// Registers all Settings services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::Set diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index 84720094f..0de32b05d 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -12,6 +12,7 @@ #include "core/hle/kernel/k_scoped_resource_reservation.h" #include "core/hle/kernel/k_server_port.h" #include "core/hle/result.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/sm/sm.h" #include "core/hle/service/sm/sm_controller.h" @@ -22,7 +23,9 @@ constexpr Result ERR_ALREADY_REGISTERED(ErrorModule::SM, 4); constexpr Result ERR_INVALID_NAME(ErrorModule::SM, 6); constexpr Result ERR_SERVICE_NOT_REGISTERED(ErrorModule::SM, 7); -ServiceManager::ServiceManager(Kernel::KernelCore& kernel_) : kernel{kernel_} {} +ServiceManager::ServiceManager(Kernel::KernelCore& kernel_) : kernel{kernel_} { + controller_interface = std::make_unique(kernel.System()); +} ServiceManager::~ServiceManager() { for (auto& [name, port] : service_ports) { @@ -43,21 +46,12 @@ static Result ValidateServiceName(const std::string& name) { return ResultSuccess; } -Kernel::KClientPort& ServiceManager::InterfaceFactory(ServiceManager& self, Core::System& system) { - self.sm_interface = std::make_shared(self, system); - self.controller_interface = std::make_unique(system); - return self.sm_interface->CreatePort(); -} - -void ServiceManager::SessionHandler(ServiceManager& self, Kernel::KServerPort* server_port) { - self.sm_interface->AcceptSession(server_port); -} - Result ServiceManager::RegisterService(std::string name, u32 max_sessions, Kernel::SessionRequestHandlerPtr handler) { CASCADE_CODE(ValidateServiceName(name)); + std::scoped_lock lk{lock}; if (registered_services.find(name) != registered_services.end()) { LOG_ERROR(Service_SM, "Service is already registered! service={}", name); return ERR_ALREADY_REGISTERED; @@ -75,6 +69,7 @@ Result ServiceManager::RegisterService(std::string name, u32 max_sessions, Result ServiceManager::UnregisterService(const std::string& name) { CASCADE_CODE(ValidateServiceName(name)); + std::scoped_lock lk{lock}; const auto iter = registered_services.find(name); if (iter == registered_services.end()) { LOG_ERROR(Service_SM, "Server is not registered! service={}", name); @@ -89,6 +84,8 @@ Result ServiceManager::UnregisterService(const std::string& name) { ResultVal ServiceManager::GetServicePort(const std::string& name) { CASCADE_CODE(ValidateServiceName(name)); + + std::scoped_lock lk{lock}; auto it = service_ports.find(name); if (it == service_ports.end()) { LOG_ERROR(Service_SM, "Server is not registered! service={}", name); @@ -154,8 +151,7 @@ ResultVal SM::GetServiceImpl(Kernel::HLERequestContext& // Find the named port. auto port_result = service_manager.GetServicePort(name); - auto service = service_manager.GetService(name); - if (port_result.Failed() || !service) { + if (port_result.Failed()) { LOG_ERROR(Service_SM, "called service={} -> error 0x{:08X}", name, port_result.Code().raw); return port_result.Code(); } @@ -167,7 +163,6 @@ ResultVal SM::GetServiceImpl(Kernel::HLERequestContext& LOG_ERROR(Service_SM, "called service={} -> error 0x{:08X}", name, result.raw); return result; } - service->AcceptSession(&port->GetServerPort()); LOG_DEBUG(Service_SM, "called service={} -> session={}", name, session->GetId()); @@ -212,7 +207,7 @@ void SM::UnregisterService(Kernel::HLERequestContext& ctx) { } SM::SM(ServiceManager& service_manager_, Core::System& system_) - : ServiceFramework{system_, "sm:", ServiceThreadType::Default, 4}, + : ServiceFramework{system_, "sm:", 4}, service_manager{service_manager_}, kernel{system_.Kernel()} { RegisterHandlers({ {0, &SM::Initialize, "Initialize"}, @@ -232,4 +227,11 @@ SM::SM(ServiceManager& service_manager_, Core::System& system_) SM::~SM() = default; +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->ManageNamedPort("sm:", std::make_shared(system.ServiceManager(), system)); + ServerManager::RunServer(std::move(server_manager)); +} + } // namespace Service::SM diff --git a/src/core/hle/service/sm/sm.h b/src/core/hle/service/sm/sm.h index 02a5dde9e..22ca720f8 100644 --- a/src/core/hle/service/sm/sm.h +++ b/src/core/hle/service/sm/sm.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include #include @@ -50,9 +51,6 @@ private: class ServiceManager { public: - static Kernel::KClientPort& InterfaceFactory(ServiceManager& self, Core::System& system); - static void SessionHandler(ServiceManager& self, Kernel::KServerPort* server_port); - explicit ServiceManager(Kernel::KernelCore& kernel_); ~ServiceManager(); @@ -78,6 +76,7 @@ private: std::unique_ptr controller_interface; /// Map of registered services, retrieved using GetServicePort. + std::mutex lock; std::unordered_map registered_services; std::unordered_map service_ports; @@ -85,4 +84,7 @@ private: Kernel::KernelCore& kernel; }; +/// Runs SM services. +void LoopProcess(Core::System& system); + } // namespace Service::SM diff --git a/src/core/hle/service/sm/sm_controller.cpp b/src/core/hle/service/sm/sm_controller.cpp index 1cf9dd1c4..f52522d1d 100644 --- a/src/core/hle/service/sm/sm_controller.cpp +++ b/src/core/hle/service/sm/sm_controller.cpp @@ -10,6 +10,7 @@ #include "core/hle/kernel/k_scoped_resource_reservation.h" #include "core/hle/kernel/k_server_session.h" #include "core/hle/kernel/k_session.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/sm/sm_controller.h" namespace Service::SM { @@ -48,9 +49,9 @@ void Controller::CloneCurrentObject(Kernel::HLERequestContext& ctx) { // Commit the session reservation. session_reservation.Commit(); - // Register with manager. - session_manager->SessionHandler().RegisterSession(&session->GetServerSession(), - session_manager); + // Register with server manager. + session_manager->GetServerManager().RegisterSession(&session->GetServerSession(), + session_manager); // We succeeded. IPC::ResponseBuilder rb{ctx, 2, 0, 1, IPC::ResponseBuilder::Flags::AlwaysMoveHandles}; diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp index bdb499268..790e28504 100644 --- a/src/core/hle/service/sockets/bsd.cpp +++ b/src/core/hle/service/sockets/bsd.cpp @@ -881,8 +881,7 @@ void BSD::OnProxyPacketReceived(const Network::ProxyPacket& packet) { } BSD::BSD(Core::System& system_, const char* name) - : ServiceFramework{system_, name, ServiceThreadType::CreateNew}, room_network{ - system_.GetRoomNetwork()} { + : ServiceFramework{system_, name}, room_network{system_.GetRoomNetwork()} { // clang-format off static const FunctionInfo functions[] = { {0, &BSD::RegisterClient, "RegisterClient"}, diff --git a/src/core/hle/service/sockets/sockets.cpp b/src/core/hle/service/sockets/sockets.cpp index b191b5cf5..676d24e03 100644 --- a/src/core/hle/service/sockets/sockets.cpp +++ b/src/core/hle/service/sockets/sockets.cpp @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "core/hle/service/server_manager.h" #include "core/hle/service/sockets/bsd.h" #include "core/hle/service/sockets/nsd.h" #include "core/hle/service/sockets/sfdnsres.h" @@ -8,15 +9,17 @@ namespace Service::Sockets { -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { - std::make_shared(system, "bsd:s")->InstallAsService(service_manager); - std::make_shared(system, "bsd:u")->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); - std::make_shared(system, "nsd:a")->InstallAsService(service_manager); - std::make_shared(system, "nsd:u")->InstallAsService(service_manager); - - std::make_shared(system)->InstallAsService(service_manager); + server_manager->RegisterNamedService("bsd:s", std::make_shared(system, "bsd:s")); + server_manager->RegisterNamedService("bsd:u", std::make_shared(system, "bsd:u")); + server_manager->RegisterNamedService("bsdcfg", std::make_shared(system)); + server_manager->RegisterNamedService("nsd:a", std::make_shared(system, "nsd:a")); + server_manager->RegisterNamedService("nsd:u", std::make_shared(system, "nsd:u")); + server_manager->RegisterNamedService("sfdnsres", std::make_shared(system)); + server_manager->StartAdditionalHostThreads("bsdsocket", 2); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::Sockets diff --git a/src/core/hle/service/sockets/sockets.h b/src/core/hle/service/sockets/sockets.h index 31b7dad33..c94e80ef6 100644 --- a/src/core/hle/service/sockets/sockets.h +++ b/src/core/hle/service/sockets/sockets.h @@ -10,10 +10,6 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::Sockets { enum class Errno : u32 { @@ -98,7 +94,6 @@ struct Linger { u32 linger; }; -/// Registers all Sockets services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::Sockets diff --git a/src/core/hle/service/spl/spl_module.cpp b/src/core/hle/service/spl/spl_module.cpp index 64eae1ebf..31679e1bb 100644 --- a/src/core/hle/service/spl/spl_module.cpp +++ b/src/core/hle/service/spl/spl_module.cpp @@ -9,6 +9,7 @@ #include "common/settings.h" #include "core/hle/api_version.h" #include "core/hle/ipc_helpers.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/spl/csrng.h" #include "core/hle/service/spl/spl.h" #include "core/hle/service/spl/spl_module.h" @@ -158,15 +159,18 @@ ResultVal Module::Interface::GetConfigImpl(ConfigItem config_item) const { } } -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); auto module = std::make_shared(); - std::make_shared(system, module)->InstallAsService(service_manager); - std::make_shared(system, module)->InstallAsService(service_manager); - std::make_shared(system, module)->InstallAsService(service_manager); - std::make_shared(system, module)->InstallAsService(service_manager); - std::make_shared(system, module)->InstallAsService(service_manager); - std::make_shared(system, module)->InstallAsService(service_manager); - std::make_shared(system, module)->InstallAsService(service_manager); + + server_manager->RegisterNamedService("csrng", std::make_shared(system, module)); + server_manager->RegisterNamedService("spl", std::make_shared(system, module)); + server_manager->RegisterNamedService("spl:mig", std::make_shared(system, module)); + server_manager->RegisterNamedService("spl:fs", std::make_shared(system, module)); + server_manager->RegisterNamedService("spl:ssl", std::make_shared(system, module)); + server_manager->RegisterNamedService("spl:es", std::make_shared(system, module)); + server_manager->RegisterNamedService("spl:manu", std::make_shared(system, module)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::SPL diff --git a/src/core/hle/service/spl/spl_module.h b/src/core/hle/service/spl/spl_module.h index 4c9a3c618..baed9efd7 100644 --- a/src/core/hle/service/spl/spl_module.h +++ b/src/core/hle/service/spl/spl_module.h @@ -41,7 +41,6 @@ public: }; }; -/// Registers all SPL services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::SPL diff --git a/src/core/hle/service/ssl/ssl.cpp b/src/core/hle/service/ssl/ssl.cpp index dcf47083f..57027bdf5 100644 --- a/src/core/hle/service/ssl/ssl.cpp +++ b/src/core/hle/service/ssl/ssl.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/hle/ipc_helpers.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" #include "core/hle/service/ssl/ssl.h" namespace Service::SSL { @@ -173,8 +173,11 @@ private: } }; -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) { - std::make_shared(system)->InstallAsService(service_manager); +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + + server_manager->RegisterNamedService("ssl", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } } // namespace Service::SSL diff --git a/src/core/hle/service/ssl/ssl.h b/src/core/hle/service/ssl/ssl.h index 27b38a003..f6e21bbb3 100644 --- a/src/core/hle/service/ssl/ssl.h +++ b/src/core/hle/service/ssl/ssl.h @@ -7,13 +7,8 @@ namespace Core { class System; } -namespace Service::SM { -class ServiceManager; -} - namespace Service::SSL { -/// Registers all SSL services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system); +void LoopProcess(Core::System& system); } // namespace Service::SSL diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp index f77cdbb43..8020e407c 100644 --- a/src/core/hle/service/time/time.cpp +++ b/src/core/hle/service/time/time.cpp @@ -7,6 +7,7 @@ #include "core/hardware_properties.h" #include "core/hle/ipc_helpers.h" #include "core/hle/kernel/kernel.h" +#include "core/hle/service/server_manager.h" #include "core/hle/service/time/time.h" #include "core/hle/service/time/time_interface.h" #include "core/hle/service/time/time_manager.h" @@ -397,11 +398,17 @@ Module::Interface::Interface(std::shared_ptr module_, Core::System& syst Module::Interface::~Interface() = default; -void InstallInterfaces(Core::System& system) { +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); auto module{std::make_shared()}; - std::make_shared

::RunGarbageCollector() { } --num_iterations; auto& image = slot_images[image_id]; + if (True(image.flags & ImageFlagBits::IsDecoding)) { + // This image is still being decoded, deleting it will invalidate the slot + // used by the async decoder thread. + return false; + } const bool must_download = image.IsSafeDownload() && False(image.flags & ImageFlagBits::BadOverlap); if (!high_priority_mode && @@ -133,6 +138,8 @@ void TextureCache

::TickFrame() { sentenced_images.Tick(); sentenced_framebuffers.Tick(); sentenced_image_view.Tick(); + TickAsyncDecode(); + runtime.TickFrame(); critical_gc = 0; ++frame_tick; @@ -777,6 +784,10 @@ void TextureCache

::RefreshContents(Image& image, ImageId image_id) { LOG_WARNING(HW_GPU, "MSAA image uploads are not implemented"); return; } + if (True(image.flags & ImageFlagBits::AsynchronousDecode)) { + QueueAsyncDecode(image, image_id); + return; + } auto staging = runtime.UploadStagingBuffer(MapSizeBytes(image)); UploadImageContents(image, staging); runtime.InsertUploadMemoryBarrier(); @@ -989,6 +1000,64 @@ u64 TextureCache

::GetScaledImageSizeBytes(const ImageBase& image) { return fitted_size; } +template +void TextureCache

::QueueAsyncDecode(Image& image, ImageId image_id) { + UNIMPLEMENTED_IF(False(image.flags & ImageFlagBits::Converted)); + + image.flags |= ImageFlagBits::IsDecoding; + auto decode = std::make_unique(); + auto* decode_ptr = decode.get(); + decode->image_id = image_id; + async_decodes.push_back(std::move(decode)); + + Common::ScratchBuffer local_unswizzle_data_buffer(image.unswizzled_size_bytes); + const size_t guest_size_bytes = image.guest_size_bytes; + swizzle_data_buffer.resize_destructive(guest_size_bytes); + gpu_memory->ReadBlockUnsafe(image.gpu_addr, swizzle_data_buffer.data(), guest_size_bytes); + auto copies = UnswizzleImage(*gpu_memory, image.gpu_addr, image.info, swizzle_data_buffer, + local_unswizzle_data_buffer); + const size_t out_size = MapSizeBytes(image); + + auto func = [out_size, copies, info = image.info, + input = std::move(local_unswizzle_data_buffer), + async_decode = decode_ptr]() mutable { + async_decode->decoded_data.resize_destructive(out_size); + std::span copies_span{copies.data(), copies.size()}; + ConvertImage(input, info, async_decode->decoded_data, copies_span); + + // TODO: Do we need this lock? + std::unique_lock lock{async_decode->mutex}; + async_decode->copies = std::move(copies); + async_decode->complete = true; + }; + texture_decode_worker.QueueWork(std::move(func)); +} + +template +void TextureCache

::TickAsyncDecode() { + bool has_uploads{}; + auto i = async_decodes.begin(); + while (i != async_decodes.end()) { + auto* async_decode = i->get(); + std::unique_lock lock{async_decode->mutex}; + if (!async_decode->complete) { + ++i; + continue; + } + Image& image = slot_images[async_decode->image_id]; + auto staging = runtime.UploadStagingBuffer(MapSizeBytes(image)); + std::memcpy(staging.mapped_span.data(), async_decode->decoded_data.data(), + async_decode->decoded_data.size()); + image.UploadMemory(staging, async_decode->copies); + image.flags &= ~ImageFlagBits::IsDecoding; + has_uploads = true; + i = async_decodes.erase(i); + } + if (has_uploads) { + runtime.InsertUploadMemoryBarrier(); + } +} + template bool TextureCache

::ScaleUp(Image& image) { const bool has_copy = image.HasScaled(); diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index 485eaabaa..013836933 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h @@ -3,6 +3,7 @@ #pragma once +#include #include #include #include @@ -18,6 +19,7 @@ #include "common/lru_cache.h" #include "common/polyfill_ranges.h" #include "common/scratch_buffer.h" +#include "common/thread_worker.h" #include "video_core/compatible_formats.h" #include "video_core/control/channel_state_cache.h" #include "video_core/delayed_destruction_ring.h" @@ -54,6 +56,14 @@ struct ImageViewInOut { ImageViewId id{}; }; +struct AsyncDecodeContext { + ImageId image_id; + Common::ScratchBuffer decoded_data; + std::vector copies; + std::mutex mutex; + std::atomic_bool complete; +}; + using TextureCacheGPUMap = std::unordered_map, Common::IdentityHash>; class TextureCacheChannelInfo : public ChannelInfo { @@ -377,6 +387,9 @@ private: bool ScaleDown(Image& image); u64 GetScaledImageSizeBytes(const ImageBase& image); + void QueueAsyncDecode(Image& image, ImageId image_id); + void TickAsyncDecode(); + Runtime& runtime; VideoCore::RasterizerInterface& rasterizer; @@ -430,6 +443,9 @@ private: u64 modification_tick = 0; u64 frame_tick = 0; + + Common::ThreadWorker texture_decode_worker{1, "TextureDecoder"}; + std::vector> async_decodes; }; } // namespace VideoCommon From b5bcd8c71b2d5fd0528191990b4e11bc916b5d7a Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Wed, 22 Feb 2023 00:48:12 -0500 Subject: [PATCH 0088/1181] configuration: Add async ASTC decode setting --- src/common/settings.cpp | 2 ++ src/common/settings.h | 1 + .../renderer_opengl/gl_texture_cache.cpp | 17 ++++++++++++++--- .../renderer_vulkan/vk_texture_cache.cpp | 7 ++++--- src/video_core/texture_cache/texture_cache.h | 1 + src/video_core/textures/astc.cpp | 4 ++-- src/yuzu/configuration/config.cpp | 2 ++ .../configure_graphics_advanced.cpp | 7 +++++++ .../configuration/configure_graphics_advanced.h | 1 + .../configure_graphics_advanced.ui | 10 ++++++++++ src/yuzu_cmd/config.cpp | 1 + src/yuzu_cmd/default_ini.h | 4 ++++ 12 files changed, 49 insertions(+), 8 deletions(-) diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 49b41c158..70b02146b 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -59,6 +59,7 @@ void LogSettings() { values.use_asynchronous_gpu_emulation.GetValue()); log_setting("Renderer_NvdecEmulation", values.nvdec_emulation.GetValue()); log_setting("Renderer_AccelerateASTC", values.accelerate_astc.GetValue()); + log_setting("Renderer_AsyncASTC", values.async_astc.GetValue()); log_setting("Renderer_UseVsync", values.use_vsync.GetValue()); log_setting("Renderer_ShaderBackend", values.shader_backend.GetValue()); log_setting("Renderer_UseAsynchronousShaders", values.use_asynchronous_shaders.GetValue()); @@ -212,6 +213,7 @@ void RestoreGlobalState(bool is_powered_on) { values.use_asynchronous_gpu_emulation.SetGlobal(true); values.nvdec_emulation.SetGlobal(true); values.accelerate_astc.SetGlobal(true); + values.async_astc.SetGlobal(true); values.use_vsync.SetGlobal(true); values.shader_backend.SetGlobal(true); values.use_asynchronous_shaders.SetGlobal(true); diff --git a/src/common/settings.h b/src/common/settings.h index 6d27dd5ee..512ecff69 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -453,6 +453,7 @@ struct Values { SwitchableSetting use_asynchronous_gpu_emulation{true, "use_asynchronous_gpu_emulation"}; SwitchableSetting nvdec_emulation{NvdecEmulation::GPU, "nvdec_emulation"}; SwitchableSetting accelerate_astc{true, "accelerate_astc"}; + SwitchableSetting async_astc{false, "async_astc"}; SwitchableSetting use_vsync{true, "use_vsync"}; SwitchableSetting shader_backend{ShaderBackend::GLSL, ShaderBackend::GLSL, ShaderBackend::SPIRV, "shader_backend"}; diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index eb6e43a08..b047e7b3d 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -228,8 +228,9 @@ void ApplySwizzle(GLuint handle, PixelFormat format, std::array TextureCacheRuntime::StagingBuffers::FindBuffer(size_t req Image::Image(TextureCacheRuntime& runtime_, const VideoCommon::ImageInfo& info_, GPUVAddr gpu_addr_, VAddr cpu_addr_) : VideoCommon::ImageBase(info_, gpu_addr_, cpu_addr_), runtime{&runtime_} { - if (CanBeAccelerated(*runtime, info)) { + if (CanBeDecodedAsync(*runtime, info)) { + flags |= ImageFlagBits::AsynchronousDecode; + } else if (CanBeAccelerated(*runtime, info)) { flags |= ImageFlagBits::AcceleratedUpload; } if (IsConverted(runtime->device, info.format, info.type)) { diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index 9b85dfb5e..80adb70eb 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -1256,11 +1256,12 @@ Image::Image(TextureCacheRuntime& runtime_, const ImageInfo& info_, GPUVAddr gpu commit(runtime_.memory_allocator.Commit(original_image, MemoryUsage::DeviceLocal)), aspect_mask(ImageAspectMask(info.format)) { if (IsPixelFormatASTC(info.format) && !runtime->device.IsOptimalAstcSupported()) { - if (Settings::values.accelerate_astc.GetValue()) { + if (Settings::values.async_astc.GetValue()) { + flags |= VideoCommon::ImageFlagBits::AsynchronousDecode; + } else if (Settings::values.accelerate_astc.GetValue()) { flags |= VideoCommon::ImageFlagBits::AcceleratedUpload; - } else { - flags |= VideoCommon::ImageFlagBits::Converted; } + flags |= VideoCommon::ImageFlagBits::Converted; flags |= VideoCommon::ImageFlagBits::CostlyLoad; } if (runtime->device.HasDebuggingToolAttached()) { diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 4159bc796..9dd152fbe 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1003,6 +1003,7 @@ u64 TextureCache

::GetScaledImageSizeBytes(const ImageBase& image) { template void TextureCache

::QueueAsyncDecode(Image& image, ImageId image_id) { UNIMPLEMENTED_IF(False(image.flags & ImageFlagBits::Converted)); + LOG_INFO(HW_GPU, "Queuing async texture decode"); image.flags |= ImageFlagBits::IsDecoding; auto decode = std::make_unique(); diff --git a/src/video_core/textures/astc.cpp b/src/video_core/textures/astc.cpp index e8d7c7863..4381eed1d 100644 --- a/src/video_core/textures/astc.cpp +++ b/src/video_core/textures/astc.cpp @@ -1656,8 +1656,8 @@ void Decompress(std::span data, uint32_t width, uint32_t height, const u32 rows = Common::DivideUp(height, block_height); const u32 cols = Common::DivideUp(width, block_width); - Common::ThreadWorker workers{std::max(std::thread::hardware_concurrency(), 2U) / 2, - "ASTCDecompress"}; + static Common::ThreadWorker workers{std::max(std::thread::hardware_concurrency(), 2U) / 2, + "ASTCDecompress"}; for (u32 z = 0; z < depth; ++z) { const u32 depth_offset = z * height * width * 4; diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index db68ed259..dd1c1e94a 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -707,6 +707,7 @@ void Config::ReadRendererValues() { ReadGlobalSetting(Settings::values.use_asynchronous_gpu_emulation); ReadGlobalSetting(Settings::values.nvdec_emulation); ReadGlobalSetting(Settings::values.accelerate_astc); + ReadGlobalSetting(Settings::values.async_astc); ReadGlobalSetting(Settings::values.use_vsync); ReadGlobalSetting(Settings::values.shader_backend); ReadGlobalSetting(Settings::values.use_asynchronous_shaders); @@ -1350,6 +1351,7 @@ void Config::SaveRendererValues() { static_cast(Settings::values.nvdec_emulation.GetDefault()), Settings::values.nvdec_emulation.UsingGlobal()); WriteGlobalSetting(Settings::values.accelerate_astc); + WriteGlobalSetting(Settings::values.async_astc); WriteGlobalSetting(Settings::values.use_vsync); WriteSetting(QString::fromStdString(Settings::values.shader_backend.GetLabel()), static_cast(Settings::values.shader_backend.GetValue(global)), diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp index cc0155a2c..bbc363322 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.cpp +++ b/src/yuzu/configuration/configure_graphics_advanced.cpp @@ -23,11 +23,13 @@ void ConfigureGraphicsAdvanced::SetConfiguration() { const bool runtime_lock = !system.IsPoweredOn(); ui->use_vsync->setEnabled(runtime_lock); ui->renderer_force_max_clock->setEnabled(runtime_lock); + ui->async_astc->setEnabled(runtime_lock); ui->use_asynchronous_shaders->setEnabled(runtime_lock); ui->anisotropic_filtering_combobox->setEnabled(runtime_lock); ui->renderer_force_max_clock->setChecked(Settings::values.renderer_force_max_clock.GetValue()); ui->use_vsync->setChecked(Settings::values.use_vsync.GetValue()); + ui->async_astc->setChecked(Settings::values.async_astc.GetValue()); ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue()); ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue()); ui->use_pessimistic_flushes->setChecked(Settings::values.use_pessimistic_flushes.GetValue()); @@ -60,6 +62,8 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() { ConfigurationShared::ApplyPerGameSetting(&Settings::values.max_anisotropy, ui->anisotropic_filtering_combobox); ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vsync, ui->use_vsync, use_vsync); + ConfigurationShared::ApplyPerGameSetting(&Settings::values.async_astc, ui->async_astc, + async_astc); ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_shaders, ui->use_asynchronous_shaders, use_asynchronous_shaders); @@ -91,6 +95,7 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { ui->renderer_force_max_clock->setEnabled( Settings::values.renderer_force_max_clock.UsingGlobal()); ui->use_vsync->setEnabled(Settings::values.use_vsync.UsingGlobal()); + ui->async_astc->setEnabled(Settings::values.async_astc.UsingGlobal()); ui->use_asynchronous_shaders->setEnabled( Settings::values.use_asynchronous_shaders.UsingGlobal()); ui->use_fast_gpu_time->setEnabled(Settings::values.use_fast_gpu_time.UsingGlobal()); @@ -108,6 +113,8 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { Settings::values.renderer_force_max_clock, renderer_force_max_clock); ConfigurationShared::SetColoredTristate(ui->use_vsync, Settings::values.use_vsync, use_vsync); + ConfigurationShared::SetColoredTristate(ui->async_astc, Settings::values.async_astc, + async_astc); ConfigurationShared::SetColoredTristate(ui->use_asynchronous_shaders, Settings::values.use_asynchronous_shaders, use_asynchronous_shaders); diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.h index df557d585..bf1b04749 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.h +++ b/src/yuzu/configuration/configure_graphics_advanced.h @@ -38,6 +38,7 @@ private: ConfigurationShared::CheckState renderer_force_max_clock; ConfigurationShared::CheckState use_vsync; + ConfigurationShared::CheckState async_astc; ConfigurationShared::CheckState use_asynchronous_shaders; ConfigurationShared::CheckState use_fast_gpu_time; ConfigurationShared::CheckState use_pessimistic_flushes; diff --git a/src/yuzu/configuration/configure_graphics_advanced.ui b/src/yuzu/configuration/configure_graphics_advanced.ui index 061885e30..a7dbdc18c 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.ui +++ b/src/yuzu/configuration/configure_graphics_advanced.ui @@ -89,6 +89,16 @@ + + + + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + Decode ASTC textures asynchronously (Hack) + + + diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 3b6dce296..464da3231 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -324,6 +324,7 @@ void Config::ReadValues() { ReadSetting("Renderer", Settings::values.use_asynchronous_shaders); ReadSetting("Renderer", Settings::values.nvdec_emulation); ReadSetting("Renderer", Settings::values.accelerate_astc); + ReadSetting("Renderer", Settings::values.async_astc); ReadSetting("Renderer", Settings::values.use_fast_gpu_time); ReadSetting("Renderer", Settings::values.use_pessimistic_flushes); ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache); diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index cf3cc4c4e..20e403400 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -342,6 +342,10 @@ nvdec_emulation = # 0: Off, 1 (default): On accelerate_astc = +# Decode ASTC textures asynchronously. +# 0 (default): Off, 1: On +async_astc = + # Turns on the speed limiter, which will limit the emulation speed to the desired speed limit value # 0: Off, 1: On (default) use_speed_limit = From de4e5db3300cc77694ff154cf3e8a3ba9c9eaf78 Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 24 Feb 2023 12:29:55 -0500 Subject: [PATCH 0089/1181] hid: avoid direct pointer access of transfer memory objects --- .../hid/controllers/console_sixaxis.cpp | 14 +++++----- .../service/hid/controllers/console_sixaxis.h | 13 ++++++--- .../hle/service/hid/controllers/palma.cpp | 2 +- src/core/hle/service/hid/controllers/palma.h | 2 +- src/core/hle/service/hid/hid.cpp | 5 ++-- src/core/hle/service/hid/hid.h | 10 +++++-- src/core/hle/service/hid/hidbus.cpp | 2 +- src/core/hle/service/hid/hidbus.h | 3 +-- .../hle/service/hid/hidbus/hidbus_base.cpp | 7 +++-- src/core/hle/service/hid/hidbus/hidbus_base.h | 12 ++++++--- src/core/hle/service/hid/hidbus/ringcon.cpp | 13 +++++---- src/core/hle/service/hid/hidbus/ringcon.h | 3 +-- src/core/hle/service/hid/hidbus/starlink.cpp | 6 ++--- src/core/hle/service/hid/hidbus/starlink.h | 3 +-- src/core/hle/service/hid/hidbus/stubbed.cpp | 7 +++-- src/core/hle/service/hid/hidbus/stubbed.h | 3 +-- src/core/hle/service/hid/irs.cpp | 8 ++---- src/core/hle/service/hid/irs.h | 8 +++++- .../hid/irsensor/image_transfer_processor.cpp | 27 +++++++++++-------- .../hid/irsensor/image_transfer_processor.h | 12 ++++++--- 20 files changed, 91 insertions(+), 69 deletions(-) diff --git a/src/core/hle/service/hid/controllers/console_sixaxis.cpp b/src/core/hle/service/hid/controllers/console_sixaxis.cpp index bb3cba910..478d38590 100644 --- a/src/core/hle/service/hid/controllers/console_sixaxis.cpp +++ b/src/core/hle/service/hid/controllers/console_sixaxis.cpp @@ -1,17 +1,18 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "core/core.h" #include "core/core_timing.h" #include "core/hid/emulated_console.h" #include "core/hid/hid_core.h" #include "core/hle/service/hid/controllers/console_sixaxis.h" +#include "core/memory.h" namespace Service::HID { constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3C200; -Controller_ConsoleSixAxis::Controller_ConsoleSixAxis(Core::HID::HIDCore& hid_core_, - u8* raw_shared_memory_) - : ControllerBase{hid_core_} { +Controller_ConsoleSixAxis::Controller_ConsoleSixAxis(Core::System& system_, u8* raw_shared_memory_) + : ControllerBase{system_.HIDCore()}, system{system_} { console = hid_core.GetEmulatedConsole(); static_assert(SHARED_MEMORY_OFFSET + sizeof(ConsoleSharedMemory) < shared_memory_size, "ConsoleSharedMemory is bigger than the shared memory"); @@ -26,7 +27,7 @@ void Controller_ConsoleSixAxis::OnInit() {} void Controller_ConsoleSixAxis::OnRelease() {} void Controller_ConsoleSixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) { - if (!IsControllerActivated() || !is_transfer_memory_set) { + if (!IsControllerActivated() || transfer_memory == 0) { seven_sixaxis_lifo.buffer_count = 0; seven_sixaxis_lifo.buffer_tail = 0; return; @@ -59,11 +60,10 @@ void Controller_ConsoleSixAxis::OnUpdate(const Core::Timing::CoreTiming& core_ti // Update seven six axis transfer memory seven_sixaxis_lifo.WriteNextEntry(next_seven_sixaxis_state); - std::memcpy(transfer_memory, &seven_sixaxis_lifo, sizeof(seven_sixaxis_lifo)); + system.Memory().WriteBlock(transfer_memory, &seven_sixaxis_lifo, sizeof(seven_sixaxis_lifo)); } -void Controller_ConsoleSixAxis::SetTransferMemoryPointer(u8* t_mem) { - is_transfer_memory_set = true; +void Controller_ConsoleSixAxis::SetTransferMemoryAddress(VAddr t_mem) { transfer_memory = t_mem; } diff --git a/src/core/hle/service/hid/controllers/console_sixaxis.h b/src/core/hle/service/hid/controllers/console_sixaxis.h index 2fd11538f..8d3e4081b 100644 --- a/src/core/hle/service/hid/controllers/console_sixaxis.h +++ b/src/core/hle/service/hid/controllers/console_sixaxis.h @@ -10,6 +10,10 @@ #include "core/hle/service/hid/controllers/controller_base.h" #include "core/hle/service/hid/ring_lifo.h" +namespace Core { +class System; +} // namespace Core + namespace Core::HID { class EmulatedConsole; } // namespace Core::HID @@ -17,7 +21,7 @@ class EmulatedConsole; namespace Service::HID { class Controller_ConsoleSixAxis final : public ControllerBase { public: - explicit Controller_ConsoleSixAxis(Core::HID::HIDCore& hid_core_, u8* raw_shared_memory_); + explicit Controller_ConsoleSixAxis(Core::System& system_, u8* raw_shared_memory_); ~Controller_ConsoleSixAxis() override; // Called when the controller is initialized @@ -30,7 +34,7 @@ public: void OnUpdate(const Core::Timing::CoreTiming& core_timing) override; // Called on InitializeSevenSixAxisSensor - void SetTransferMemoryPointer(u8* t_mem); + void SetTransferMemoryAddress(VAddr t_mem); // Called on ResetSevenSixAxisSensorTimestamp void ResetTimestamp(); @@ -62,12 +66,13 @@ private: static_assert(sizeof(seven_sixaxis_lifo) == 0xA70, "SevenSixAxisState is an invalid size"); SevenSixAxisState next_seven_sixaxis_state{}; - u8* transfer_memory = nullptr; + VAddr transfer_memory{}; ConsoleSharedMemory* shared_memory = nullptr; Core::HID::EmulatedConsole* console = nullptr; - bool is_transfer_memory_set = false; u64 last_saved_timestamp{}; u64 last_global_timestamp{}; + + Core::System& system; }; } // namespace Service::HID diff --git a/src/core/hle/service/hid/controllers/palma.cpp b/src/core/hle/service/hid/controllers/palma.cpp index 4564ea1e2..bce51285c 100644 --- a/src/core/hle/service/hid/controllers/palma.cpp +++ b/src/core/hle/service/hid/controllers/palma.cpp @@ -152,7 +152,7 @@ Result Controller_Palma::WritePalmaRgbLedPatternEntry(const PalmaConnectionHandl } Result Controller_Palma::WritePalmaWaveEntry(const PalmaConnectionHandle& handle, PalmaWaveSet wave, - u8* t_mem, u64 size) { + VAddr t_mem, u64 size) { if (handle.npad_id != active_handle.npad_id) { return InvalidPalmaHandle; } diff --git a/src/core/hle/service/hid/controllers/palma.h b/src/core/hle/service/hid/controllers/palma.h index 1d7fc94e1..cf62f0dbc 100644 --- a/src/core/hle/service/hid/controllers/palma.h +++ b/src/core/hle/service/hid/controllers/palma.h @@ -125,7 +125,7 @@ public: Result ReadPalmaUniqueCode(const PalmaConnectionHandle& handle); Result SetPalmaUniqueCodeInvalid(const PalmaConnectionHandle& handle); Result WritePalmaRgbLedPatternEntry(const PalmaConnectionHandle& handle, u64 unknown); - Result WritePalmaWaveEntry(const PalmaConnectionHandle& handle, PalmaWaveSet wave, u8* t_mem, + Result WritePalmaWaveEntry(const PalmaConnectionHandle& handle, PalmaWaveSet wave, VAddr t_mem, u64 size); Result SetPalmaDataBaseIdentificationVersion(const PalmaConnectionHandle& handle, s32 database_id_version_); diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index eb3c45a58..48f7bbf95 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -1858,7 +1858,7 @@ void Hid::InitializeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { .ActivateController(); applet_resource->GetController(HidController::ConsoleSixAxisSensor) - .SetTransferMemoryPointer(system.Memory().GetPointer(t_mem_1->GetSourceAddress())); + .SetTransferMemoryAddress(t_mem_1->GetSourceAddress()); LOG_WARNING(Service_HID, "called, t_mem_1_handle=0x{:08X}, t_mem_2_handle=0x{:08X}, " @@ -2145,8 +2145,7 @@ void Hid::WritePalmaWaveEntry(Kernel::HLERequestContext& ctx) { connection_handle.npad_id, wave_set, unknown, t_mem_handle, t_mem_size, size); applet_resource->GetController(HidController::Palma) - .WritePalmaWaveEntry(connection_handle, wave_set, - system.Memory().GetPointer(t_mem->GetSourceAddress()), t_mem_size); + .WritePalmaWaveEntry(connection_handle, wave_set, t_mem->GetSourceAddress(), t_mem_size); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index b7c2a23ef..a397012a5 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -60,9 +60,15 @@ public: private: template void MakeController(HidController controller, u8* shared_memory) { - controllers[static_cast(controller)] = - std::make_unique(system.HIDCore(), shared_memory); + if constexpr (std::is_constructible_v) { + controllers[static_cast(controller)] = + std::make_unique(system, shared_memory); + } else { + controllers[static_cast(controller)] = + std::make_unique(system.HIDCore(), shared_memory); + } } + template void MakeControllerWithServiceContext(HidController controller, u8* shared_memory) { controllers[static_cast(controller)] = diff --git a/src/core/hle/service/hid/hidbus.cpp b/src/core/hle/service/hid/hidbus.cpp index bd94e8f3d..da1c8415c 100644 --- a/src/core/hle/service/hid/hidbus.cpp +++ b/src/core/hle/service/hid/hidbus.cpp @@ -472,7 +472,7 @@ void HidBus::EnableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx) { if (device_index) { auto& device = devices[device_index.value()].device; device->SetPollingMode(polling_mode_); - device->SetTransferMemoryPointer(system.Memory().GetPointer(t_mem->GetSourceAddress())); + device->SetTransferMemoryAddress(t_mem->GetSourceAddress()); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/hid/hidbus.h b/src/core/hle/service/hid/hidbus.h index 8c687f678..9a4702021 100644 --- a/src/core/hle/service/hid/hidbus.h +++ b/src/core/hle/service/hid/hidbus.h @@ -115,8 +115,7 @@ private: void MakeDevice(BusHandle handle) { const auto device_index = GetDeviceIndexFromHandle(handle); if (device_index) { - devices[device_index.value()].device = - std::make_unique(system.HIDCore(), service_context); + devices[device_index.value()].device = std::make_unique(system, service_context); } } diff --git a/src/core/hle/service/hid/hidbus/hidbus_base.cpp b/src/core/hle/service/hid/hidbus/hidbus_base.cpp index b569b3c20..dfd23ec04 100644 --- a/src/core/hle/service/hid/hidbus/hidbus_base.cpp +++ b/src/core/hle/service/hid/hidbus/hidbus_base.cpp @@ -9,8 +9,8 @@ namespace Service::HID { -HidbusBase::HidbusBase(KernelHelpers::ServiceContext& service_context_) - : service_context(service_context_) { +HidbusBase::HidbusBase(Core::System& system_, KernelHelpers::ServiceContext& service_context_) + : system(system_), service_context(service_context_) { send_command_async_event = service_context.CreateEvent("hidbus:SendCommandAsyncEvent"); } HidbusBase::~HidbusBase() = default; @@ -59,8 +59,7 @@ void HidbusBase::DisablePollingMode() { polling_mode_enabled = false; } -void HidbusBase::SetTransferMemoryPointer(u8* t_mem) { - is_transfer_memory_set = true; +void HidbusBase::SetTransferMemoryAddress(VAddr t_mem) { transfer_memory = t_mem; } diff --git a/src/core/hle/service/hid/hidbus/hidbus_base.h b/src/core/hle/service/hid/hidbus/hidbus_base.h index 65e301137..26313264d 100644 --- a/src/core/hle/service/hid/hidbus/hidbus_base.h +++ b/src/core/hle/service/hid/hidbus/hidbus_base.h @@ -8,6 +8,10 @@ #include "common/common_types.h" #include "core/hle/result.h" +namespace Core { +class System; +} + namespace Kernel { class KEvent; class KReadableEvent; @@ -106,7 +110,7 @@ static_assert(sizeof(ButtonOnlyPollingDataAccessor) == 0x2F0, class HidbusBase { public: - explicit HidbusBase(KernelHelpers::ServiceContext& service_context_); + explicit HidbusBase(Core::System& system_, KernelHelpers::ServiceContext& service_context_); virtual ~HidbusBase(); void ActivateDevice(); @@ -134,7 +138,7 @@ public: void DisablePollingMode(); // Called on EnableJoyPollingReceiveMode - void SetTransferMemoryPointer(u8* t_mem); + void SetTransferMemoryAddress(VAddr t_mem); Kernel::KReadableEvent& GetSendCommandAsycEvent() const; @@ -170,9 +174,9 @@ protected: JoyEnableSixAxisDataAccessor enable_sixaxis_data{}; ButtonOnlyPollingDataAccessor button_only_data{}; - u8* transfer_memory{nullptr}; - bool is_transfer_memory_set{}; + VAddr transfer_memory{}; + Core::System& system; Kernel::KEvent* send_command_async_event; KernelHelpers::ServiceContext& service_context; }; diff --git a/src/core/hle/service/hid/hidbus/ringcon.cpp b/src/core/hle/service/hid/hidbus/ringcon.cpp index 35847cbdd..65a2dd521 100644 --- a/src/core/hle/service/hid/hidbus/ringcon.cpp +++ b/src/core/hle/service/hid/hidbus/ringcon.cpp @@ -1,18 +1,20 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "core/core.h" #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" #include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_readable_event.h" #include "core/hle/service/hid/hidbus/ringcon.h" +#include "core/memory.h" namespace Service::HID { -RingController::RingController(Core::HID::HIDCore& hid_core_, +RingController::RingController(Core::System& system_, KernelHelpers::ServiceContext& service_context_) - : HidbusBase(service_context_) { - input = hid_core_.GetEmulatedController(Core::HID::NpadIdType::Player1); + : HidbusBase(system_, service_context_) { + input = system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1); } RingController::~RingController() = default; @@ -38,7 +40,7 @@ void RingController::OnUpdate() { return; } - if (!polling_mode_enabled || !is_transfer_memory_set) { + if (!polling_mode_enabled || transfer_memory == 0) { return; } @@ -62,7 +64,8 @@ void RingController::OnUpdate() { curr_entry.polling_data.out_size = sizeof(ringcon_value); std::memcpy(curr_entry.polling_data.data.data(), &ringcon_value, sizeof(ringcon_value)); - std::memcpy(transfer_memory, &enable_sixaxis_data, sizeof(enable_sixaxis_data)); + system.Memory().WriteBlock(transfer_memory, &enable_sixaxis_data, + sizeof(enable_sixaxis_data)); break; } default: diff --git a/src/core/hle/service/hid/hidbus/ringcon.h b/src/core/hle/service/hid/hidbus/ringcon.h index c2fb386b1..f42f3ea41 100644 --- a/src/core/hle/service/hid/hidbus/ringcon.h +++ b/src/core/hle/service/hid/hidbus/ringcon.h @@ -17,8 +17,7 @@ namespace Service::HID { class RingController final : public HidbusBase { public: - explicit RingController(Core::HID::HIDCore& hid_core_, - KernelHelpers::ServiceContext& service_context_); + explicit RingController(Core::System& system_, KernelHelpers::ServiceContext& service_context_); ~RingController() override; void OnInit() override; diff --git a/src/core/hle/service/hid/hidbus/starlink.cpp b/src/core/hle/service/hid/hidbus/starlink.cpp index d0e760314..36573274e 100644 --- a/src/core/hle/service/hid/hidbus/starlink.cpp +++ b/src/core/hle/service/hid/hidbus/starlink.cpp @@ -8,8 +8,8 @@ namespace Service::HID { constexpr u8 DEVICE_ID = 0x28; -Starlink::Starlink(Core::HID::HIDCore& hid_core_, KernelHelpers::ServiceContext& service_context_) - : HidbusBase(service_context_) {} +Starlink::Starlink(Core::System& system_, KernelHelpers::ServiceContext& service_context_) + : HidbusBase(system_, service_context_) {} Starlink::~Starlink() = default; void Starlink::OnInit() { @@ -27,7 +27,7 @@ void Starlink::OnUpdate() { if (!device_enabled) { return; } - if (!polling_mode_enabled || !is_transfer_memory_set) { + if (!polling_mode_enabled || transfer_memory == 0) { return; } diff --git a/src/core/hle/service/hid/hidbus/starlink.h b/src/core/hle/service/hid/hidbus/starlink.h index 07c800e6e..a276aa88f 100644 --- a/src/core/hle/service/hid/hidbus/starlink.h +++ b/src/core/hle/service/hid/hidbus/starlink.h @@ -14,8 +14,7 @@ namespace Service::HID { class Starlink final : public HidbusBase { public: - explicit Starlink(Core::HID::HIDCore& hid_core_, - KernelHelpers::ServiceContext& service_context_); + explicit Starlink(Core::System& system_, KernelHelpers::ServiceContext& service_context_); ~Starlink() override; void OnInit() override; diff --git a/src/core/hle/service/hid/hidbus/stubbed.cpp b/src/core/hle/service/hid/hidbus/stubbed.cpp index 07632c872..8160b7218 100644 --- a/src/core/hle/service/hid/hidbus/stubbed.cpp +++ b/src/core/hle/service/hid/hidbus/stubbed.cpp @@ -8,9 +8,8 @@ namespace Service::HID { constexpr u8 DEVICE_ID = 0xFF; -HidbusStubbed::HidbusStubbed(Core::HID::HIDCore& hid_core_, - KernelHelpers::ServiceContext& service_context_) - : HidbusBase(service_context_) {} +HidbusStubbed::HidbusStubbed(Core::System& system_, KernelHelpers::ServiceContext& service_context_) + : HidbusBase(system_, service_context_) {} HidbusStubbed::~HidbusStubbed() = default; void HidbusStubbed::OnInit() { @@ -28,7 +27,7 @@ void HidbusStubbed::OnUpdate() { if (!device_enabled) { return; } - if (!polling_mode_enabled || !is_transfer_memory_set) { + if (!polling_mode_enabled || transfer_memory == 0) { return; } diff --git a/src/core/hle/service/hid/hidbus/stubbed.h b/src/core/hle/service/hid/hidbus/stubbed.h index 38eaa0ecc..2e58d42fc 100644 --- a/src/core/hle/service/hid/hidbus/stubbed.h +++ b/src/core/hle/service/hid/hidbus/stubbed.h @@ -14,8 +14,7 @@ namespace Service::HID { class HidbusStubbed final : public HidbusBase { public: - explicit HidbusStubbed(Core::HID::HIDCore& hid_core_, - KernelHelpers::ServiceContext& service_context_); + explicit HidbusStubbed(Core::System& system_, KernelHelpers::ServiceContext& service_context_); ~HidbusStubbed() override; void OnInit() override; diff --git a/src/core/hle/service/hid/irs.cpp b/src/core/hle/service/hid/irs.cpp index 3bd418e92..a40f61fde 100644 --- a/src/core/hle/service/hid/irs.cpp +++ b/src/core/hle/service/hid/irs.cpp @@ -208,8 +208,6 @@ void IRS::RunImageTransferProcessor(Kernel::HLERequestContext& ctx) { ASSERT_MSG(t_mem->GetSize() == parameters.transfer_memory_size, "t_mem has incorrect size"); - u8* transfer_memory = system.Memory().GetPointer(t_mem->GetSourceAddress()); - LOG_INFO(Service_IRS, "called, npad_type={}, npad_id={}, transfer_memory_size={}, transfer_memory_size={}, " "applet_resource_user_id={}", @@ -224,7 +222,7 @@ void IRS::RunImageTransferProcessor(Kernel::HLERequestContext& ctx) { auto& image_transfer_processor = GetProcessor(parameters.camera_handle); image_transfer_processor.SetConfig(parameters.processor_config); - image_transfer_processor.SetTransferMemoryPointer(transfer_memory); + image_transfer_processor.SetTransferMemoryAddress(t_mem->GetSourceAddress()); npad_device->SetPollingMode(Core::HID::EmulatedDeviceIndex::RightIndex, Common::Input::PollingMode::IR); } @@ -448,8 +446,6 @@ void IRS::RunImageTransferExProcessor(Kernel::HLERequestContext& ctx) { auto t_mem = system.ApplicationProcess()->GetHandleTable().GetObject( t_mem_handle); - u8* transfer_memory = system.Memory().GetPointer(t_mem->GetSourceAddress()); - LOG_INFO(Service_IRS, "called, npad_type={}, npad_id={}, transfer_memory_size={}, " "applet_resource_user_id={}", @@ -464,7 +460,7 @@ void IRS::RunImageTransferExProcessor(Kernel::HLERequestContext& ctx) { auto& image_transfer_processor = GetProcessor(parameters.camera_handle); image_transfer_processor.SetConfig(parameters.processor_config); - image_transfer_processor.SetTransferMemoryPointer(transfer_memory); + image_transfer_processor.SetTransferMemoryAddress(t_mem->GetSourceAddress()); npad_device->SetPollingMode(Core::HID::EmulatedDeviceIndex::RightIndex, Common::Input::PollingMode::IR); } diff --git a/src/core/hle/service/hid/irs.h b/src/core/hle/service/hid/irs.h index 2e6115c73..b76ad7854 100644 --- a/src/core/hle/service/hid/irs.h +++ b/src/core/hle/service/hid/irs.h @@ -80,7 +80,13 @@ private: LOG_CRITICAL(Service_IRS, "Invalid index {}", index); return; } - processors[index] = std::make_unique(system.HIDCore(), device_state, index); + + if constexpr (std::is_constructible_v) { + processors[index] = std::make_unique(system, device_state, index); + } else { + processors[index] = std::make_unique(system.HIDCore(), device_state, index); + } } template diff --git a/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp b/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp index 98f0c579d..bc896a1e3 100644 --- a/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp +++ b/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp @@ -1,16 +1,18 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later +#include "core/core.h" #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" #include "core/hle/service/hid/irsensor/image_transfer_processor.h" +#include "core/memory.h" namespace Service::IRS { -ImageTransferProcessor::ImageTransferProcessor(Core::HID::HIDCore& hid_core_, +ImageTransferProcessor::ImageTransferProcessor(Core::System& system_, Core::IrSensor::DeviceFormat& device_format, std::size_t npad_index) - : device{device_format} { - npad_device = hid_core_.GetEmulatedControllerByIndex(npad_index); + : device{device_format}, system{system_} { + npad_device = system.HIDCore().GetEmulatedControllerByIndex(npad_index); Core::HID::ControllerUpdateCallback engine_callback{ .on_change = [this](Core::HID::ControllerTriggerType type) { OnControllerUpdate(type); }, @@ -43,7 +45,7 @@ void ImageTransferProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType if (type != Core::HID::ControllerTriggerType::IrSensor) { return; } - if (!is_transfer_memory_set) { + if (transfer_memory == 0) { return; } @@ -56,14 +58,16 @@ void ImageTransferProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType if (camera_data.format != current_config.origin_format) { LOG_WARNING(Service_IRS, "Wrong Input format {} expected {}", camera_data.format, current_config.origin_format); - memset(transfer_memory, 0, GetDataSize(current_config.trimming_format)); + system.Memory().ZeroBlock(*system.ApplicationProcess(), transfer_memory, + GetDataSize(current_config.trimming_format)); return; } if (current_config.origin_format > current_config.trimming_format) { LOG_WARNING(Service_IRS, "Origin format {} is smaller than trimming format {}", current_config.origin_format, current_config.trimming_format); - memset(transfer_memory, 0, GetDataSize(current_config.trimming_format)); + system.Memory().ZeroBlock(*system.ApplicationProcess(), transfer_memory, + GetDataSize(current_config.trimming_format)); return; } @@ -80,7 +84,8 @@ void ImageTransferProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType "Trimming area ({}, {}, {}, {}) is outside of origin area ({}, {})", current_config.trimming_start_x, current_config.trimming_start_y, trimming_width, trimming_height, origin_width, origin_height); - memset(transfer_memory, 0, GetDataSize(current_config.trimming_format)); + system.Memory().ZeroBlock(*system.ApplicationProcess(), transfer_memory, + GetDataSize(current_config.trimming_format)); return; } @@ -94,7 +99,8 @@ void ImageTransferProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType } } - memcpy(transfer_memory, window_data.data(), GetDataSize(current_config.trimming_format)); + system.Memory().WriteBlock(transfer_memory, window_data.data(), + GetDataSize(current_config.trimming_format)); if (!IsProcessorActive()) { StartProcessor(); @@ -134,8 +140,7 @@ void ImageTransferProcessor::SetConfig( npad_device->SetCameraFormat(current_config.origin_format); } -void ImageTransferProcessor::SetTransferMemoryPointer(u8* t_mem) { - is_transfer_memory_set = true; +void ImageTransferProcessor::SetTransferMemoryAddress(VAddr t_mem) { transfer_memory = t_mem; } @@ -143,7 +148,7 @@ Core::IrSensor::ImageTransferProcessorState ImageTransferProcessor::GetState( std::vector& data) const { const auto size = GetDataSize(current_config.trimming_format); data.resize(size); - memcpy(data.data(), transfer_memory, size); + system.Memory().ReadBlock(transfer_memory, data.data(), size); return processor_state; } diff --git a/src/core/hle/service/hid/irsensor/image_transfer_processor.h b/src/core/hle/service/hid/irsensor/image_transfer_processor.h index 393df492d..7cfe04c8c 100644 --- a/src/core/hle/service/hid/irsensor/image_transfer_processor.h +++ b/src/core/hle/service/hid/irsensor/image_transfer_processor.h @@ -7,6 +7,10 @@ #include "core/hid/irs_types.h" #include "core/hle/service/hid/irsensor/processor_base.h" +namespace Core { +class System; +} + namespace Core::HID { class EmulatedController; } // namespace Core::HID @@ -14,7 +18,7 @@ class EmulatedController; namespace Service::IRS { class ImageTransferProcessor final : public ProcessorBase { public: - explicit ImageTransferProcessor(Core::HID::HIDCore& hid_core_, + explicit ImageTransferProcessor(Core::System& system_, Core::IrSensor::DeviceFormat& device_format, std::size_t npad_index); ~ImageTransferProcessor() override; @@ -33,7 +37,7 @@ public: void SetConfig(Core::IrSensor::PackedImageTransferProcessorExConfig config); // Transfer memory where the image data will be stored - void SetTransferMemoryPointer(u8* t_mem); + void SetTransferMemoryAddress(VAddr t_mem); Core::IrSensor::ImageTransferProcessorState GetState(std::vector& data) const; @@ -67,7 +71,7 @@ private: Core::HID::EmulatedController* npad_device; int callback_key{}; - u8* transfer_memory = nullptr; - bool is_transfer_memory_set = false; + Core::System& system; + VAddr transfer_memory{}; }; } // namespace Service::IRS From 975186ad4d7c67b22f580986979d0520530b41c3 Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 24 Feb 2023 12:50:54 -0500 Subject: [PATCH 0090/1181] am: avoid direct pointer access of transfer memory objects --- src/core/hle/service/am/am.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index beb2da06e..adb482941 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -1260,9 +1260,8 @@ void ILibraryAppletCreator::CreateTransferMemoryStorage(Kernel::HLERequestContex return; } - const u8* const mem_begin = system.Memory().GetPointer(transfer_mem->GetSourceAddress()); - const u8* const mem_end = mem_begin + transfer_mem->GetSize(); - std::vector memory{mem_begin, mem_end}; + std::vector memory(transfer_mem->GetSize()); + system.Memory().ReadBlock(transfer_mem->GetSourceAddress(), memory.data(), memory.size()); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); @@ -1294,9 +1293,8 @@ void ILibraryAppletCreator::CreateHandleStorage(Kernel::HLERequestContext& ctx) return; } - const u8* const mem_begin = system.Memory().GetPointer(transfer_mem->GetSourceAddress()); - const u8* const mem_end = mem_begin + transfer_mem->GetSize(); - std::vector memory{mem_begin, mem_end}; + std::vector memory(transfer_mem->GetSize()); + system.Memory().ReadBlock(transfer_mem->GetSourceAddress(), memory.data(), memory.size()); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); From 39ca7b2928ba130446ba0fd9f0d07eb25baeb4a0 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Fri, 24 Feb 2023 12:52:32 -0600 Subject: [PATCH 0091/1181] core: Update service function tables to 16.0.0+ --- src/core/hle/service/acc/acc.cpp | 8 ++++++++ src/core/hle/service/acc/acc_su.cpp | 4 ++++ src/core/hle/service/am/am.cpp | 6 ++++++ src/core/hle/service/aoc/aoc_u.cpp | 3 +++ src/core/hle/service/audio/hwopus.cpp | 2 ++ src/core/hle/service/hid/hid.cpp | 6 ++++++ src/core/hle/service/hid/hid.h | 1 + src/core/hle/service/ncm/ncm.cpp | 1 + src/core/hle/service/ns/ns.cpp | 12 ++++++++++-- src/core/hle/service/sockets/bsd.cpp | 3 +++ src/core/hle/service/ssl/ssl.cpp | 10 ++++++++++ src/core/hle/service/vi/vi.cpp | 5 +++++ src/core/hle/service/vi/vi_m.cpp | 4 ++++ 13 files changed, 63 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index 1495d64de..1241fcdff 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -76,6 +76,8 @@ public: {141, nullptr, "RefreshNetworkServiceLicenseCacheAsync"}, // 5.0.0+ {142, nullptr, "RefreshNetworkServiceLicenseCacheAsyncIfSecondsElapsed"}, // 5.0.0+ {150, nullptr, "CreateAuthorizationRequest"}, + {160, nullptr, "RequiresUpdateNetworkServiceAccountIdTokenCache"}, + {161, nullptr, "RequireReauthenticationOfNetworkServiceAccount"}, }; // clang-format on @@ -136,7 +138,10 @@ public: {140, nullptr, "GetNetworkServiceLicenseCache"}, // 5.0.0+ {141, nullptr, "RefreshNetworkServiceLicenseCacheAsync"}, // 5.0.0+ {142, nullptr, "RefreshNetworkServiceLicenseCacheAsyncIfSecondsElapsed"}, // 5.0.0+ + {143, nullptr, "GetNetworkServiceLicenseCacheEx"}, {150, nullptr, "CreateAuthorizationRequest"}, + {160, nullptr, "RequiresUpdateNetworkServiceAccountIdTokenCache"}, + {161, nullptr, "RequireReauthenticationOfNetworkServiceAccount"}, {200, nullptr, "IsRegistered"}, {201, nullptr, "RegisterAsync"}, {202, nullptr, "UnregisterAsync"}, @@ -242,6 +247,7 @@ public: {100, nullptr, "GetRequestWithTheme"}, {101, nullptr, "IsNetworkServiceAccountReplaced"}, {199, nullptr, "GetUrlForIntroductionOfExtraMembership"}, // 2.0.0 - 5.1.0 + {200, nullptr, "ApplyAsyncWithAuthorizedToken"}, }; // clang-format on @@ -647,9 +653,11 @@ public: {0, nullptr, "EnsureAuthenticationTokenCacheAsync"}, {1, nullptr, "LoadAuthenticationTokenCache"}, {2, nullptr, "InvalidateAuthenticationTokenCache"}, + {3, nullptr, "IsDeviceAuthenticationTokenCacheAvailable"}, {10, nullptr, "EnsureEdgeTokenCacheAsync"}, {11, nullptr, "LoadEdgeTokenCache"}, {12, nullptr, "InvalidateEdgeTokenCache"}, + {13, nullptr, "IsEdgeTokenCacheAvailable"}, {20, nullptr, "EnsureApplicationAuthenticationCacheAsync"}, {21, nullptr, "LoadApplicationAuthenticationTokenCache"}, {22, nullptr, "LoadApplicationNetworkServiceClientConfigCache"}, diff --git a/src/core/hle/service/acc/acc_su.cpp b/src/core/hle/service/acc/acc_su.cpp index b6bfd6155..d9882ecd3 100644 --- a/src/core/hle/service/acc/acc_su.cpp +++ b/src/core/hle/service/acc/acc_su.cpp @@ -55,6 +55,10 @@ ACC_SU::ACC_SU(std::shared_ptr module_, std::shared_ptr {290, nullptr, "ProxyProcedureForGuestLoginWithNintendoAccount"}, {291, nullptr, "ProxyProcedureForFloatingRegistrationWithNintendoAccount"}, {299, nullptr, "SuspendBackgroundDaemon"}, + {900, nullptr, "SetUserUnqualifiedForDebug"}, + {901, nullptr, "UnsetUserUnqualifiedForDebug"}, + {902, nullptr, "ListUsersUnqualifiedForDebug"}, + {910, nullptr, "RefreshFirmwareSettingsForDebug"}, {997, nullptr, "DebugInvalidateTokenCacheForUser"}, {998, nullptr, "DebugSetUserStateClose"}, {999, nullptr, "DebugSetUserStateOpen"}, diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index beb2da06e..26af499d2 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -226,6 +226,8 @@ IDebugFunctions::IDebugFunctions(Core::System& system_) {30, nullptr, "RequestLaunchApplicationWithUserAndArgumentForDebug"}, {31, nullptr, "RequestLaunchApplicationByApplicationLaunchInfoForDebug"}, {40, nullptr, "GetAppletResourceUsageInfo"}, + {50, nullptr, "AddSystemProgramIdAndAppletIdForDebug"}, + {51, nullptr, "AddOperationConfirmedLibraryAppletIdForDebug"}, {100, nullptr, "SetCpuBoostModeForApplet"}, {101, nullptr, "CancelCpuBoostModeForApplet"}, {110, nullptr, "PushToAppletBoundChannelForDebug"}, @@ -237,6 +239,8 @@ IDebugFunctions::IDebugFunctions(Core::System& system_) {131, nullptr, "FriendInvitationClearApplicationParameter"}, {132, nullptr, "FriendInvitationPushApplicationParameter"}, {140, nullptr, "RestrictPowerOperationForSecureLaunchModeForDebug"}, + {200, nullptr, "CreateFloatingLibraryAppletAccepterForDebug"}, + {300, nullptr, "TerminateAllRunningApplicationsForDebug"}, {900, nullptr, "GetGrcProcessLaunchedSystemEvent"}, }; // clang-format on @@ -1855,6 +1859,8 @@ IHomeMenuFunctions::IHomeMenuFunctions(Core::System& system_) {31, nullptr, "GetWriterLockAccessorEx"}, {40, nullptr, "IsSleepEnabled"}, {41, nullptr, "IsRebootEnabled"}, + {50, nullptr, "LaunchSystemApplet"}, + {51, nullptr, "LaunchStarter"}, {100, nullptr, "PopRequestLaunchApplicationForDebug"}, {110, nullptr, "IsForceTerminateApplicationDisabledForDebug"}, {200, nullptr, "LaunchDevMenu"}, diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp index 7264f23f9..1bbf057cb 100644 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ b/src/core/hle/service/aoc/aoc_u.cpp @@ -129,6 +129,9 @@ AOC_U::AOC_U(Core::System& system_) {101, &AOC_U::CreatePermanentEcPurchasedEventManager, "CreatePermanentEcPurchasedEventManager"}, {110, nullptr, "CreateContentsServiceManager"}, {200, nullptr, "SetRequiredAddOnContentsOnContentsAvailabilityTransition"}, + {300, nullptr, "SetupHostAddOnContent"}, + {301, nullptr, "GetRegisteredAddOnContentPath"}, + {302, nullptr, "UpdateCachedList"}, }; // clang-format on diff --git a/src/core/hle/service/audio/hwopus.cpp b/src/core/hle/service/audio/hwopus.cpp index e01f87356..3db3fe188 100644 --- a/src/core/hle/service/audio/hwopus.cpp +++ b/src/core/hle/service/audio/hwopus.cpp @@ -362,6 +362,8 @@ HwOpus::HwOpus(Core::System& system_) : ServiceFramework{system_, "hwopus"} { {5, &HwOpus::GetWorkBufferSizeEx, "GetWorkBufferSizeEx"}, {6, nullptr, "OpenHardwareOpusDecoderForMultiStreamEx"}, {7, &HwOpus::GetWorkBufferSizeForMultiStreamEx, "GetWorkBufferSizeForMultiStreamEx"}, + {8, nullptr, "GetWorkBufferSizeExEx"}, + {9, nullptr, "GetWorkBufferSizeForMultiStreamExEx"}, }; RegisterHandlers(functions); } diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index eb3c45a58..8c99cec06 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -63,6 +63,7 @@ IAppletResource::IAppletResource(Core::System& system_, MakeControllerWithServiceContext(HidController::NPad, shared_memory); MakeController(HidController::Gesture, shared_memory); MakeController(HidController::ConsoleSixAxisSensor, shared_memory); + MakeController(HidController::DebugMouse, shared_memory); MakeControllerWithServiceContext(HidController::Palma, shared_memory); // Homebrew doesn't try to activate some controllers, so we activate them by default @@ -74,6 +75,7 @@ IAppletResource::IAppletResource(Core::System& system_, GetController(HidController::CaptureButton).SetCommonHeaderOffset(0x5000); GetController(HidController::InputDetector).SetCommonHeaderOffset(0x5200); GetController(HidController::UniquePad).SetCommonHeaderOffset(0x5A00); + GetController(HidController::DebugMouse).SetCommonHeaderOffset(0x3DC00); // Register update callbacks npad_update_event = Core::Timing::CreateEvent( @@ -236,6 +238,7 @@ Hid::Hid(Core::System& system_) {1, &Hid::ActivateDebugPad, "ActivateDebugPad"}, {11, &Hid::ActivateTouchScreen, "ActivateTouchScreen"}, {21, &Hid::ActivateMouse, "ActivateMouse"}, + {26, nullptr, "ActivateDebugMouse"}, {31, &Hid::ActivateKeyboard, "ActivateKeyboard"}, {32, &Hid::SendKeyboardLockKeyEvent, "SendKeyboardLockKeyEvent"}, {40, nullptr, "AcquireXpadIdEventHandle"}, @@ -2380,6 +2383,8 @@ public: {20, nullptr, "DeactivateMouse"}, {21, nullptr, "SetMouseAutoPilotState"}, {22, nullptr, "UnsetMouseAutoPilotState"}, + {25, nullptr, "SetDebugMouseAutoPilotState"}, + {26, nullptr, "UnsetDebugMouseAutoPilotState"}, {30, nullptr, "DeactivateKeyboard"}, {31, nullptr, "SetKeyboardAutoPilotState"}, {32, nullptr, "UnsetKeyboardAutoPilotState"}, @@ -2495,6 +2500,7 @@ public: {2000, nullptr, "DeactivateDigitizer"}, {2001, nullptr, "SetDigitizerAutoPilotState"}, {2002, nullptr, "UnsetDigitizerAutoPilotState"}, + {2002, nullptr, "ReloadFirmwareDebugSettings"}, }; // clang-format on diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index b7c2a23ef..8fc9ed88a 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -33,6 +33,7 @@ enum class HidController : std::size_t { NPad, Gesture, ConsoleSixAxisSensor, + DebugMouse, Palma, MaxControllers, diff --git a/src/core/hle/service/ncm/ncm.cpp b/src/core/hle/service/ncm/ncm.cpp index 68210a108..4c66cfeba 100644 --- a/src/core/hle/service/ncm/ncm.cpp +++ b/src/core/hle/service/ncm/ncm.cpp @@ -124,6 +124,7 @@ public: {12, nullptr, "InactivateContentMetaDatabase"}, {13, nullptr, "InvalidateRightsIdCache"}, {14, nullptr, "GetMemoryReport"}, + {15, nullptr, "ActivateFsContentStorage"}, }; // clang-format on diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cpp index f59a1a63d..e53bdde52 100644 --- a/src/core/hle/service/ns/ns.cpp +++ b/src/core/hle/service/ns/ns.cpp @@ -159,6 +159,8 @@ IApplicationManagerInterface::IApplicationManagerInterface(Core::System& system_ {606, nullptr, "GetContentMetaStorage"}, {607, nullptr, "ListAvailableAddOnContent"}, {609, nullptr, "ListAvailabilityAssuredAddOnContent"}, + {610, nullptr, "GetInstalledContentMetaStorage"}, + {611, nullptr, "PrepareAddOnContent"}, {700, nullptr, "PushDownloadTaskList"}, {701, nullptr, "ClearTaskStatusList"}, {702, nullptr, "RequestDownloadTaskList"}, @@ -228,6 +230,7 @@ IApplicationManagerInterface::IApplicationManagerInterface(Core::System& system_ {1900, nullptr, "IsActiveAccount"}, {1901, nullptr, "RequestDownloadApplicationPrepurchasedRights"}, {1902, nullptr, "GetApplicationTicketInfo"}, + {1903, nullptr, "RequestDownloadApplicationPrepurchasedRightsForAccount"}, {2000, nullptr, "GetSystemDeliveryInfo"}, {2001, nullptr, "SelectLatestSystemDeliveryInfo"}, {2002, nullptr, "VerifyDeliveryProtocolVersion"}, @@ -276,8 +279,11 @@ IApplicationManagerInterface::IApplicationManagerInterface(Core::System& system_ {2352, nullptr, "RequestResolveNoDownloadRightsError"}, {2353, nullptr, "GetApplicationDownloadTaskInfo"}, {2354, nullptr, "PrioritizeApplicationBackgroundTask"}, - {2355, nullptr, "Unknown2355"}, - {2356, nullptr, "Unknown2356"}, + {2355, nullptr, "PreferStorageEfficientUpdate"}, + {2356, nullptr, "RequestStorageEfficientUpdatePreferable"}, + {2357, nullptr, "EnableMultiCoreDownload"}, + {2358, nullptr, "DisableMultiCoreDownload"}, + {2359, nullptr, "IsMultiCoreDownloadEnabled"}, {2400, nullptr, "GetPromotionInfo"}, {2401, nullptr, "CountPromotionInfo"}, {2402, nullptr, "ListPromotionInfo"}, @@ -295,6 +301,7 @@ IApplicationManagerInterface::IApplicationManagerInterface(Core::System& system_ {2519, nullptr, "IsQualificationTransitionSupported"}, {2520, nullptr, "IsQualificationTransitionSupportedByProcessId"}, {2521, nullptr, "GetRightsUserChangedEvent"}, + {2522, nullptr, "IsRomRedirectionAvailable"}, {2800, nullptr, "GetApplicationIdOfPreomia"}, {3000, nullptr, "RegisterDeviceLockKey"}, {3001, nullptr, "UnregisterDeviceLockKey"}, @@ -311,6 +318,7 @@ IApplicationManagerInterface::IApplicationManagerInterface(Core::System& system_ {3012, nullptr, "IsApplicationTitleHidden"}, {3013, nullptr, "IsGameCardEnabled"}, {3014, nullptr, "IsLocalContentShareEnabled"}, + {3050, nullptr, "ListAssignELicenseTaskResult"}, {9999, nullptr, "GetApplicationCertificate"}, }; // clang-format on diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp index bdb499268..330a66409 100644 --- a/src/core/hle/service/sockets/bsd.cpp +++ b/src/core/hle/service/sockets/bsd.cpp @@ -954,6 +954,9 @@ BSDCFG::BSDCFG(Core::System& system_) : ServiceFramework{system_, "bsdcfg"} { {10, nullptr, "ClearArpEntries"}, {11, nullptr, "ClearArpEntries2"}, {12, nullptr, "PrintArpEntries"}, + {13, nullptr, "Unknown13"}, + {14, nullptr, "Unknown14"}, + {15, nullptr, "Unknown15"}, }; // clang-format on diff --git a/src/core/hle/service/ssl/ssl.cpp b/src/core/hle/service/ssl/ssl.cpp index dcf47083f..015208593 100644 --- a/src/core/hle/service/ssl/ssl.cpp +++ b/src/core/hle/service/ssl/ssl.cpp @@ -46,6 +46,14 @@ public: {25, nullptr, "GetCipherInfo"}, {26, nullptr, "SetNextAlpnProto"}, {27, nullptr, "GetNextAlpnProto"}, + {28, nullptr, "SetDtlsSocketDescriptor"}, + {29, nullptr, "GetDtlsHandshakeTimeout"}, + {30, nullptr, "SetPrivateOption"}, + {31, nullptr, "SetSrtpCiphers"}, + {32, nullptr, "GetSrtpCipher"}, + {33, nullptr, "ExportKeyingMaterial"}, + {34, nullptr, "SetIoTimeout"}, + {35, nullptr, "GetIoTimeout"}, }; // clang-format on @@ -69,6 +77,8 @@ public: {9, nullptr, "AddPolicyOid"}, {10, nullptr, "ImportCrl"}, {11, nullptr, "RemoveCrl"}, + {12, nullptr, "ImportClientCertKeyPki"}, + {13, nullptr, "GeneratePrivateKeyAndCert"}, }; RegisterHandlers(functions); } diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index 2fb631183..0915785d2 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -249,6 +249,9 @@ public: {2053, nullptr, "DestroyIndirectProducerEndPoint"}, {2054, nullptr, "CreateIndirectConsumerEndPoint"}, {2055, nullptr, "DestroyIndirectConsumerEndPoint"}, + {2060, nullptr, "CreateWatermarkCompositor"}, + {2062, nullptr, "SetWatermarkText"}, + {2063, nullptr, "SetWatermarkLayerStacks"}, {2300, nullptr, "AcquireLayerTexturePresentingEvent"}, {2301, nullptr, "ReleaseLayerTexturePresentingEvent"}, {2302, nullptr, "GetDisplayHotplugEvent"}, @@ -279,6 +282,8 @@ public: {6011, nullptr, "EnableLayerAutoClearTransitionBuffer"}, {6012, nullptr, "DisableLayerAutoClearTransitionBuffer"}, {6013, nullptr, "SetLayerOpacity"}, + {6014, nullptr, "AttachLayerWatermarkCompositor"}, + {6015, nullptr, "DetachLayerWatermarkCompositor"}, {7000, nullptr, "SetContentVisibility"}, {8000, nullptr, "SetConductorLayer"}, {8001, nullptr, "SetTimestampTracking"}, diff --git a/src/core/hle/service/vi/vi_m.cpp b/src/core/hle/service/vi/vi_m.cpp index 1ab7fe4ab..7ca44354b 100644 --- a/src/core/hle/service/vi/vi_m.cpp +++ b/src/core/hle/service/vi/vi_m.cpp @@ -14,6 +14,10 @@ VI_M::VI_M(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, static const FunctionInfo functions[] = { {2, &VI_M::GetDisplayService, "GetDisplayService"}, {3, nullptr, "GetDisplayServiceWithProxyNameExchange"}, + {100, nullptr, "PrepareFatal"}, + {101, nullptr, "ShowFatal"}, + {102, nullptr, "DrawFatalRectangle"}, + {103, nullptr, "DrawFatalText32"}, }; RegisterHandlers(functions); } From 5e4ea04a64dacd310267417a52e4c4960cd3f269 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Fri, 24 Feb 2023 21:22:27 -0600 Subject: [PATCH 0092/1181] core: hidbus: Fix BusType size --- src/core/hle/service/hid/hidbus.cpp | 26 +++++++++++++------------- src/core/hle/service/hid/hidbus.h | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/core/hle/service/hid/hidbus.cpp b/src/core/hle/service/hid/hidbus.cpp index bd94e8f3d..8dbb2cf50 100644 --- a/src/core/hle/service/hid/hidbus.cpp +++ b/src/core/hle/service/hid/hidbus.cpp @@ -91,7 +91,7 @@ std::optional HidBus::GetDeviceIndexFromHandle(BusHandle handle) co if (handle.abstracted_pad_id == device_handle.abstracted_pad_id && handle.internal_index == device_handle.internal_index && handle.player_number == device_handle.player_number && - handle.bus_type == device_handle.bus_type && + handle.bus_type_id == device_handle.bus_type_id && handle.is_valid == device_handle.is_valid) { return i; } @@ -123,7 +123,7 @@ void HidBus::GetBusHandle(Kernel::HLERequestContext& ctx) { continue; } if (static_cast(handle.player_number) == parameters.npad_id && - handle.bus_type == parameters.bus_type) { + handle.bus_type_id == static_cast(parameters.bus_type)) { is_handle_found = true; handle_index = i; break; @@ -140,7 +140,7 @@ void HidBus::GetBusHandle(Kernel::HLERequestContext& ctx) { .abstracted_pad_id = static_cast(i), .internal_index = static_cast(i), .player_number = static_cast(parameters.npad_id), - .bus_type = parameters.bus_type, + .bus_type_id = static_cast(parameters.bus_type), .is_valid = true, }; handle_index = i; @@ -172,7 +172,7 @@ void HidBus::IsExternalDeviceConnected(Kernel::HLERequestContext& ctx) { LOG_INFO(Service_HID, "Called, abstracted_pad_id={}, bus_type={}, internal_index={}, " "player_number={}, is_valid={}", - bus_handle_.abstracted_pad_id, bus_handle_.bus_type, bus_handle_.internal_index, + bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid); const auto device_index = GetDeviceIndexFromHandle(bus_handle_); @@ -201,7 +201,7 @@ void HidBus::Initialize(Kernel::HLERequestContext& ctx) { LOG_INFO(Service_HID, "called, abstracted_pad_id={} bus_type={} internal_index={} " "player_number={} is_valid={}, applet_resource_user_id={}", - bus_handle_.abstracted_pad_id, bus_handle_.bus_type, bus_handle_.internal_index, + bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid, applet_resource_user_id); is_hidbus_enabled = true; @@ -253,7 +253,7 @@ void HidBus::Finalize(Kernel::HLERequestContext& ctx) { LOG_INFO(Service_HID, "called, abstracted_pad_id={}, bus_type={}, internal_index={}, " "player_number={}, is_valid={}, applet_resource_user_id={}", - bus_handle_.abstracted_pad_id, bus_handle_.bus_type, bus_handle_.internal_index, + bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid, applet_resource_user_id); const auto device_index = GetDeviceIndexFromHandle(bus_handle_); @@ -301,7 +301,7 @@ void HidBus::EnableExternalDevice(Kernel::HLERequestContext& ctx) { "called, enable={}, abstracted_pad_id={}, bus_type={}, internal_index={}, " "player_number={}, is_valid={}, inval={}, applet_resource_user_id{}", parameters.enable, parameters.bus_handle.abstracted_pad_id, - parameters.bus_handle.bus_type, parameters.bus_handle.internal_index, + parameters.bus_handle.bus_type_id, parameters.bus_handle.internal_index, parameters.bus_handle.player_number, parameters.bus_handle.is_valid, parameters.inval, parameters.applet_resource_user_id); @@ -329,7 +329,7 @@ void HidBus::GetExternalDeviceId(Kernel::HLERequestContext& ctx) { LOG_DEBUG(Service_HID, "called, abstracted_pad_id={}, bus_type={}, internal_index={}, player_number={}, " "is_valid={}", - bus_handle_.abstracted_pad_id, bus_handle_.bus_type, bus_handle_.internal_index, + bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid); const auto device_index = GetDeviceIndexFromHandle(bus_handle_); @@ -357,7 +357,7 @@ void HidBus::SendCommandAsync(Kernel::HLERequestContext& ctx) { LOG_DEBUG(Service_HID, "called, data_size={}, abstracted_pad_id={}, bus_type={}, internal_index={}, " "player_number={}, is_valid={}", - data.size(), bus_handle_.abstracted_pad_id, bus_handle_.bus_type, + data.size(), bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid); const auto device_index = GetDeviceIndexFromHandle(bus_handle_); @@ -384,7 +384,7 @@ void HidBus::GetSendCommandAsynceResult(Kernel::HLERequestContext& ctx) { LOG_DEBUG(Service_HID, "called, abstracted_pad_id={}, bus_type={}, internal_index={}, player_number={}, " "is_valid={}", - bus_handle_.abstracted_pad_id, bus_handle_.bus_type, bus_handle_.internal_index, + bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid); const auto device_index = GetDeviceIndexFromHandle(bus_handle_); @@ -413,7 +413,7 @@ void HidBus::SetEventForSendCommandAsycResult(Kernel::HLERequestContext& ctx) { LOG_INFO(Service_HID, "called, abstracted_pad_id={}, bus_type={}, internal_index={}, player_number={}, " "is_valid={}", - bus_handle_.abstracted_pad_id, bus_handle_.bus_type, bus_handle_.internal_index, + bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid); const auto device_index = GetDeviceIndexFromHandle(bus_handle_); @@ -464,7 +464,7 @@ void HidBus::EnableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx) { LOG_INFO(Service_HID, "called, t_mem_handle=0x{:08X}, polling_mode={}, abstracted_pad_id={}, bus_type={}, " "internal_index={}, player_number={}, is_valid={}", - t_mem_handle, polling_mode_, bus_handle_.abstracted_pad_id, bus_handle_.bus_type, + t_mem_handle, polling_mode_, bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid); const auto device_index = GetDeviceIndexFromHandle(bus_handle_); @@ -492,7 +492,7 @@ void HidBus::DisableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx) { LOG_INFO(Service_HID, "called, abstracted_pad_id={}, bus_type={}, internal_index={}, player_number={}, " "is_valid={}", - bus_handle_.abstracted_pad_id, bus_handle_.bus_type, bus_handle_.internal_index, + bus_handle_.abstracted_pad_id, bus_handle_.bus_type_id, bus_handle_.internal_index, bus_handle_.player_number, bus_handle_.is_valid); const auto device_index = GetDeviceIndexFromHandle(bus_handle_); diff --git a/src/core/hle/service/hid/hidbus.h b/src/core/hle/service/hid/hidbus.h index 8c687f678..91c99b01f 100644 --- a/src/core/hle/service/hid/hidbus.h +++ b/src/core/hle/service/hid/hidbus.h @@ -41,7 +41,7 @@ private: }; // This is nn::hidbus::BusType - enum class BusType : u8 { + enum class BusType : u32 { LeftJoyRail, RightJoyRail, InternalBus, // Lark microphone @@ -54,7 +54,7 @@ private: u32 abstracted_pad_id; u8 internal_index; u8 player_number; - BusType bus_type; + u8 bus_type_id; bool is_valid; }; static_assert(sizeof(BusHandle) == 0x8, "BusHandle is an invalid size"); From cfd69e2e586212b5840c3a2236ce08ec4d853233 Mon Sep 17 00:00:00 2001 From: german77 Date: Sat, 25 Feb 2023 10:11:49 -0600 Subject: [PATCH 0093/1181] config: Fix per game Force max clock --- src/yuzu/configuration/config.cpp | 4 +--- src/yuzu/configuration/configure_graphics_advanced.cpp | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index db68ed259..bfed2d038 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -1312,9 +1312,7 @@ void Config::SaveRendererValues() { static_cast(Settings::values.renderer_backend.GetValue(global)), static_cast(Settings::values.renderer_backend.GetDefault()), Settings::values.renderer_backend.UsingGlobal()); - WriteSetting(QString::fromStdString(Settings::values.renderer_force_max_clock.GetLabel()), - static_cast(Settings::values.renderer_force_max_clock.GetValue(global)), - static_cast(Settings::values.renderer_force_max_clock.GetDefault())); + WriteGlobalSetting(Settings::values.renderer_force_max_clock); WriteGlobalSetting(Settings::values.vulkan_device); WriteSetting(QString::fromStdString(Settings::values.fullscreen_mode.GetLabel()), static_cast(Settings::values.fullscreen_mode.GetValue(global)), diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp index cc0155a2c..7ab5d5bf5 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.cpp +++ b/src/yuzu/configuration/configure_graphics_advanced.cpp @@ -45,8 +45,6 @@ void ConfigureGraphicsAdvanced::SetConfiguration() { &Settings::values.max_anisotropy); ConfigurationShared::SetHighlight(ui->label_gpu_accuracy, !Settings::values.gpu_accuracy.UsingGlobal()); - ConfigurationShared::SetHighlight(ui->renderer_force_max_clock, - !Settings::values.renderer_force_max_clock.UsingGlobal()); ConfigurationShared::SetHighlight(ui->af_label, !Settings::values.max_anisotropy.UsingGlobal()); } From 2ce5bb9bd6cddb83810eab98f54b0e4120e55c20 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Sat, 25 Feb 2023 16:24:21 -0500 Subject: [PATCH 0094/1181] buffer_cache: Add logic for non-NVN storage buffer tracking --- .../global_memory_to_storage_buffer_pass.cpp | 8 ++++++- src/video_core/buffer_cache/buffer_cache.h | 24 +++++++++++++++---- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/shader_recompiler/ir_opt/global_memory_to_storage_buffer_pass.cpp b/src/shader_recompiler/ir_opt/global_memory_to_storage_buffer_pass.cpp index 336338e62..d1e59f22e 100644 --- a/src/shader_recompiler/ir_opt/global_memory_to_storage_buffer_pass.cpp +++ b/src/shader_recompiler/ir_opt/global_memory_to_storage_buffer_pass.cpp @@ -35,6 +35,7 @@ struct Bias { u32 index; u32 offset_begin; u32 offset_end; + u32 alignment; }; using boost::container::flat_set; @@ -349,7 +350,8 @@ std::optional Track(const IR::Value& value, const Bias* bias) .index = index.U32(), .offset = offset.U32(), }; - if (!Common::IsAligned(storage_buffer.offset, 16)) { + const u32 alignment{bias ? bias->alignment : 8U}; + if (!Common::IsAligned(storage_buffer.offset, alignment)) { // The SSBO pointer has to be aligned return std::nullopt; } @@ -371,6 +373,7 @@ void CollectStorageBuffers(IR::Block& block, IR::Inst& inst, StorageInfo& info) .index = 0, .offset_begin = 0x110, .offset_end = 0x610, + .alignment = 16, }; // Track the low address of the instruction const std::optional low_addr_info{TrackLowAddress(&inst)}; @@ -386,8 +389,11 @@ void CollectStorageBuffers(IR::Block& block, IR::Inst& inst, StorageInfo& info) storage_buffer = Track(low_addr, nullptr); if (!storage_buffer) { // If that also fails, use NVN fallbacks + LOG_WARNING(Shader, "Storage buffer failed to track, using global memory fallbacks"); return; } + LOG_WARNING(Shader, "Storage buffer tracked without bias, index {} offset {}", + storage_buffer->index, storage_buffer->offset); } // Collect storage buffer and the instruction if (IsGlobalMemoryWrite(inst)) { diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 06fd40851..20faa65da 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -366,7 +366,8 @@ private: void NotifyBufferDeletion(); - [[nodiscard]] Binding StorageBufferBinding(GPUVAddr ssbo_addr, bool is_written = false) const; + [[nodiscard]] Binding StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index, + bool is_written = false) const; [[nodiscard]] TextureBufferBinding GetTextureBufferBinding(GPUVAddr gpu_addr, u32 size, PixelFormat format); @@ -749,7 +750,7 @@ void BufferCache

::BindGraphicsStorageBuffer(size_t stage, size_t ssbo_index, const auto& cbufs = maxwell3d->state.shader_stages[stage]; const GPUVAddr ssbo_addr = cbufs.const_buffers[cbuf_index].address + cbuf_offset; - storage_buffers[stage][ssbo_index] = StorageBufferBinding(ssbo_addr, is_written); + storage_buffers[stage][ssbo_index] = StorageBufferBinding(ssbo_addr, cbuf_index, is_written); } template @@ -789,7 +790,7 @@ void BufferCache

::BindComputeStorageBuffer(size_t ssbo_index, u32 cbuf_index, const auto& cbufs = launch_desc.const_buffer_config; const GPUVAddr ssbo_addr = cbufs[cbuf_index].Address() + cbuf_offset; - compute_storage_buffers[ssbo_index] = StorageBufferBinding(ssbo_addr, is_written); + compute_storage_buffers[ssbo_index] = StorageBufferBinding(ssbo_addr, cbuf_index, is_written); } template @@ -1935,11 +1936,26 @@ void BufferCache

::NotifyBufferDeletion() { template typename BufferCache

::Binding BufferCache

::StorageBufferBinding(GPUVAddr ssbo_addr, + u32 cbuf_index, bool is_written) const { const GPUVAddr gpu_addr = gpu_memory->Read(ssbo_addr); - const u32 size = gpu_memory->Read(ssbo_addr + 8); + const auto size = [&]() { + const bool is_nvn_cbuf = cbuf_index == 0; + // The NVN driver buffer (index 0) is known to pack the SSBO address followed by its size. + if (is_nvn_cbuf) { + return gpu_memory->Read(ssbo_addr + 8); + } + // Other titles (notably Doom Eternal) may use STG/LDG on buffer addresses in custom defined + // cbufs, which do not store the sizes adjacent to the addresses, so use the fully + // mapped buffer size for now. + const u32 memory_layout_size = static_cast(gpu_memory->GetMemoryLayoutSize(gpu_addr)); + LOG_INFO(HW_GPU, "Binding storage buffer for cbuf index {}, MemoryLayoutSize 0x{:X}", + cbuf_index, memory_layout_size); + return memory_layout_size; + }(); const std::optional cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr); if (!cpu_addr || size == 0) { + LOG_WARNING(HW_GPU, "Failed to find storage buffer for cbuf index {}", cbuf_index); return NULL_BINDING; } const VAddr cpu_end = Common::AlignUp(*cpu_addr + size, Core::Memory::YUZU_PAGESIZE); From 60688bf0d5fa6daf40ccd10af82386bc2d32f1fa Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Thu, 16 Feb 2023 19:39:51 -0600 Subject: [PATCH 0095/1181] yuzu: config: Remove player 8 and 9 from config file --- src/common/settings.h | 2 +- src/core/hid/emulated_controller.cpp | 78 ++++++++++++++++--- src/core/hid/emulated_controller.h | 7 +- src/core/hid/hid_types.h | 26 +++++++ src/yuzu/applets/qt_controller.cpp | 9 +-- src/yuzu/configuration/config.cpp | 7 +- .../configure_input_per_game.cpp | 5 +- .../configuration/configure_input_player.cpp | 8 +- 8 files changed, 104 insertions(+), 38 deletions(-) diff --git a/src/common/settings.h b/src/common/settings.h index 6d27dd5ee..9fe764e86 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -481,7 +481,7 @@ struct Values { SwitchableSetting sound_index{1, 0, 2, "sound_index"}; // Controls - InputSetting> players; + InputSetting> players; SwitchableSetting use_docked_mode{true, "use_docked_mode"}; diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index a29c9a6f8..9f0ceca49 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp @@ -82,7 +82,12 @@ Settings::ControllerType EmulatedController::MapNPadToSettingsType(NpadStyleInde } void EmulatedController::ReloadFromSettings() { - const auto player_index = NpadIdTypeToIndex(npad_id_type); + if (npad_id_type == NpadIdType::Other) { + ReloadDebugPadFromSettings(); + return; + } + + const auto player_index = NpadIdTypeToConfigIndex(npad_id_type); const auto& player = Settings::values.players.GetValue()[player_index]; for (std::size_t index = 0; index < player.buttons.size(); ++index) { @@ -111,13 +116,21 @@ void EmulatedController::ReloadFromSettings() { ring_params[0] = Common::ParamPackage(Settings::values.ringcon_analogs); - // Other or debug controller should always be a pro controller - if (npad_id_type != NpadIdType::Other) { - SetNpadStyleIndex(MapSettingsTypeToNPad(player.controller_type)); - original_npad_type = npad_type; - } else { - SetNpadStyleIndex(NpadStyleIndex::ProController); - original_npad_type = npad_type; + SetNpadStyleIndex(MapSettingsTypeToNPad(player.controller_type)); + original_npad_type = npad_type; + + // Player 1 shares config with handheld. Disable controller when handheld is selected + if (npad_id_type == NpadIdType::Player1 && npad_type == NpadStyleIndex::Handheld) { + Disconnect(); + ReloadInput(); + return; + } + + // Handheld shares config with player 1. Disable controller when handheld isn't selected + if (npad_id_type == NpadIdType::Handheld && npad_type != NpadStyleIndex::Handheld) { + Disconnect(); + ReloadInput(); + return; } Disconnect(); @@ -128,6 +141,33 @@ void EmulatedController::ReloadFromSettings() { ReloadInput(); } +void EmulatedController::ReloadDebugPadFromSettings() { + for (std::size_t index = 0; index < Settings::values.debug_pad_buttons.size(); ++index) { + button_params[index] = Common::ParamPackage(Settings::values.debug_pad_buttons[index]); + } + for (std::size_t index = 0; index < Settings::values.debug_pad_analogs.size(); ++index) { + stick_params[index] = Common::ParamPackage(Settings::values.debug_pad_analogs[index]); + } + for (std::size_t index = 0; index < motion_params.size(); ++index) { + motion_params[index] = {}; + } + + controller.color_values = {}; + controller.colors_state.fullkey = {}; + controller.colors_state.left = {}; + controller.colors_state.right = {}; + ring_params[0] = {}; + SetNpadStyleIndex(NpadStyleIndex::ProController); + original_npad_type = npad_type; + + Disconnect(); + if (Settings::values.debug_pad_enabled) { + Connect(); + } + + ReloadInput(); +} + void EmulatedController::LoadDevices() { // TODO(german77): Use more buttons to detect the correct device const auto left_joycon = button_params[Settings::NativeButton::DRight]; @@ -560,9 +600,23 @@ bool EmulatedController::IsConfiguring() const { } void EmulatedController::SaveCurrentConfig() { - const auto player_index = NpadIdTypeToIndex(npad_id_type); + // Other can't alter the config from here + if (npad_id_type == NpadIdType::Other) { + return; + } + + const auto player_index = NpadIdTypeToConfigIndex(npad_id_type); auto& player = Settings::values.players.GetValue()[player_index]; - player.connected = is_connected; + + // Only save the connected status when handheld is connected + if (npad_id_type == NpadIdType::Handheld && npad_type == NpadStyleIndex::Handheld) { + player.connected = is_connected; + } + + if (npad_id_type != NpadIdType::Handheld && npad_type != NpadStyleIndex::Handheld) { + player.connected = is_connected; + } + player.controller_type = MapNPadToSettingsType(npad_type); for (std::size_t index = 0; index < player.buttons.size(); ++index) { player.buttons[index] = button_params[index].Serialize(); @@ -1152,7 +1206,7 @@ bool EmulatedController::SetVibration(std::size_t device_index, VibrationValue v if (!output_devices[device_index]) { return false; } - const auto player_index = NpadIdTypeToIndex(npad_id_type); + const auto player_index = NpadIdTypeToConfigIndex(npad_id_type); const auto& player = Settings::values.players.GetValue()[player_index]; const f32 strength = static_cast(player.vibration_strength) / 100.0f; @@ -1178,7 +1232,7 @@ bool EmulatedController::SetVibration(std::size_t device_index, VibrationValue v } bool EmulatedController::IsVibrationEnabled(std::size_t device_index) { - const auto player_index = NpadIdTypeToIndex(npad_id_type); + const auto player_index = NpadIdTypeToConfigIndex(npad_id_type); const auto& player = Settings::values.players.GetValue()[player_index]; if (!player.vibration_enabled) { diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index a9da465a2..99572b3bd 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h @@ -250,9 +250,14 @@ public: /// Reload all input devices void ReloadInput(); - /// Overrides current mapped devices with the stored configuration and reloads all input devices + /// Overrides current mapped devices with the stored configuration and reloads all input + /// callbacks void ReloadFromSettings(); + /// Overrides current mapped debug pad with the stored configuration and reloads all input + /// callbacks + void ReloadDebugPadFromSettings(); + /// Saves the current mapped configuration void SaveCurrentConfig(); diff --git a/src/core/hid/hid_types.h b/src/core/hid/hid_types.h index 6b35f448c..983f0addd 100644 --- a/src/core/hid/hid_types.h +++ b/src/core/hid/hid_types.h @@ -690,6 +690,32 @@ constexpr size_t NpadIdTypeToIndex(NpadIdType npad_id_type) { } } +/// Converts a NpadIdType to a config array index. +constexpr size_t NpadIdTypeToConfigIndex(NpadIdType npad_id_type) { + switch (npad_id_type) { + case NpadIdType::Player1: + return 0; + case NpadIdType::Player2: + return 1; + case NpadIdType::Player3: + return 2; + case NpadIdType::Player4: + return 3; + case NpadIdType::Player5: + return 4; + case NpadIdType::Player6: + return 5; + case NpadIdType::Player7: + return 6; + case NpadIdType::Player8: + return 7; + case NpadIdType::Other: + case NpadIdType::Handheld: + default: + return 0; + } +} + /// Converts an array index to a NpadIdType constexpr NpadIdType IndexToNpadIdType(size_t index) { switch (index) { diff --git a/src/yuzu/applets/qt_controller.cpp b/src/yuzu/applets/qt_controller.cpp index c30b54499..d22db9f6b 100644 --- a/src/yuzu/applets/qt_controller.cpp +++ b/src/yuzu/applets/qt_controller.cpp @@ -542,19 +542,14 @@ void QtControllerSelectorDialog::UpdateControllerState(std::size_t player_index) const auto player_connected = player_groupboxes[player_index]->isChecked() && controller_type != Core::HID::NpadStyleIndex::Handheld; - if (controller->GetNpadStyleIndex(true) == controller_type && - controller->IsConnected(true) == player_connected) { - return; - } - // Disconnect the controller first. UpdateController(controller, controller_type, false); // Handheld if (player_index == 0) { + auto* handheld = system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld); + UpdateController(handheld, controller_type, false); if (controller_type == Core::HID::NpadStyleIndex::Handheld) { - auto* handheld = - system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld); UpdateController(handheld, Core::HID::NpadStyleIndex::Handheld, player_groupboxes[player_index]->isChecked()); } diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index bfed2d038..f8fae7416 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -212,16 +212,11 @@ void Config::ReadPlayerValue(std::size_t player_index) { } if (player_prefix.isEmpty() && Settings::IsConfiguringGlobal()) { - const auto controller = static_cast( + player.controller_type = static_cast( qt_config ->value(QStringLiteral("%1type").arg(player_prefix), static_cast(Settings::ControllerType::ProController)) .toUInt()); - - if (controller == Settings::ControllerType::LeftJoycon || - controller == Settings::ControllerType::RightJoycon) { - player.controller_type = controller; - } } else { player.connected = ReadSetting(QStringLiteral("%1connected").arg(player_prefix), player_index == 0) diff --git a/src/yuzu/configuration/configure_input_per_game.cpp b/src/yuzu/configuration/configure_input_per_game.cpp index 78e65d468..4e77fe00b 100644 --- a/src/yuzu/configuration/configure_input_per_game.cpp +++ b/src/yuzu/configuration/configure_input_per_game.cpp @@ -57,7 +57,7 @@ void ConfigureInputPerGame::ApplyConfiguration() { } void ConfigureInputPerGame::LoadConfiguration() { - static constexpr size_t HANDHELD_INDEX = 8; + static constexpr size_t HANDHELD_INDEX = 0; auto& hid_core = system.HIDCore(); for (size_t player_index = 0; player_index < profile_comboboxes.size(); ++player_index) { @@ -69,9 +69,6 @@ void ConfigureInputPerGame::LoadConfiguration() { const auto selection_index = player_combobox->currentIndex(); if (selection_index == 0) { Settings::values.players.GetValue()[player_index].profile_name = ""; - if (player_index == 0) { - Settings::values.players.GetValue()[HANDHELD_INDEX] = {}; - } Settings::values.players.SetGlobal(true); emulated_controller->ReloadFromSettings(); continue; diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 50b62293e..93eb10ceb 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -1589,7 +1589,6 @@ void ConfigureInputPlayer::LoadProfile() { } void ConfigureInputPlayer::SaveProfile() { - static constexpr size_t HANDHELD_INDEX = 8; const QString profile_name = ui->comboProfiles->itemText(ui->comboProfiles->currentIndex()); if (profile_name.isEmpty()) { @@ -1598,12 +1597,7 @@ void ConfigureInputPlayer::SaveProfile() { ApplyConfiguration(); - // When we're in handheld mode, only the handheld emulated controller bindings are updated - const bool is_handheld = player_index == 0 && emulated_controller->GetNpadIdType() == - Core::HID::NpadIdType::Handheld; - const auto profile_player_index = is_handheld ? HANDHELD_INDEX : player_index; - - if (!profiles->SaveProfile(profile_name.toStdString(), profile_player_index)) { + if (!profiles->SaveProfile(profile_name.toStdString(), player_index)) { QMessageBox::critical(this, tr("Save Input Profile"), tr("Failed to save the input profile \"%1\"").arg(profile_name)); UpdateInputProfiles(); From ff11fdb07e7264f21b45e23b852bc1c51c870f5c Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Sun, 26 Feb 2023 14:39:13 -0600 Subject: [PATCH 0096/1181] Revert "yuzu: config: Remove player 8 and 9 from config file" --- src/common/settings.h | 2 +- src/core/hid/emulated_controller.cpp | 78 +++---------------- src/core/hid/emulated_controller.h | 7 +- src/core/hid/hid_types.h | 26 ------- src/yuzu/applets/qt_controller.cpp | 9 ++- src/yuzu/configuration/config.cpp | 7 +- .../configure_input_per_game.cpp | 5 +- .../configuration/configure_input_player.cpp | 8 +- 8 files changed, 38 insertions(+), 104 deletions(-) diff --git a/src/common/settings.h b/src/common/settings.h index 4d0694b7d..512ecff69 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -482,7 +482,7 @@ struct Values { SwitchableSetting sound_index{1, 0, 2, "sound_index"}; // Controls - InputSetting> players; + InputSetting> players; SwitchableSetting use_docked_mode{true, "use_docked_mode"}; diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index 9f0ceca49..a29c9a6f8 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp @@ -82,12 +82,7 @@ Settings::ControllerType EmulatedController::MapNPadToSettingsType(NpadStyleInde } void EmulatedController::ReloadFromSettings() { - if (npad_id_type == NpadIdType::Other) { - ReloadDebugPadFromSettings(); - return; - } - - const auto player_index = NpadIdTypeToConfigIndex(npad_id_type); + const auto player_index = NpadIdTypeToIndex(npad_id_type); const auto& player = Settings::values.players.GetValue()[player_index]; for (std::size_t index = 0; index < player.buttons.size(); ++index) { @@ -116,21 +111,13 @@ void EmulatedController::ReloadFromSettings() { ring_params[0] = Common::ParamPackage(Settings::values.ringcon_analogs); - SetNpadStyleIndex(MapSettingsTypeToNPad(player.controller_type)); - original_npad_type = npad_type; - - // Player 1 shares config with handheld. Disable controller when handheld is selected - if (npad_id_type == NpadIdType::Player1 && npad_type == NpadStyleIndex::Handheld) { - Disconnect(); - ReloadInput(); - return; - } - - // Handheld shares config with player 1. Disable controller when handheld isn't selected - if (npad_id_type == NpadIdType::Handheld && npad_type != NpadStyleIndex::Handheld) { - Disconnect(); - ReloadInput(); - return; + // Other or debug controller should always be a pro controller + if (npad_id_type != NpadIdType::Other) { + SetNpadStyleIndex(MapSettingsTypeToNPad(player.controller_type)); + original_npad_type = npad_type; + } else { + SetNpadStyleIndex(NpadStyleIndex::ProController); + original_npad_type = npad_type; } Disconnect(); @@ -141,33 +128,6 @@ void EmulatedController::ReloadFromSettings() { ReloadInput(); } -void EmulatedController::ReloadDebugPadFromSettings() { - for (std::size_t index = 0; index < Settings::values.debug_pad_buttons.size(); ++index) { - button_params[index] = Common::ParamPackage(Settings::values.debug_pad_buttons[index]); - } - for (std::size_t index = 0; index < Settings::values.debug_pad_analogs.size(); ++index) { - stick_params[index] = Common::ParamPackage(Settings::values.debug_pad_analogs[index]); - } - for (std::size_t index = 0; index < motion_params.size(); ++index) { - motion_params[index] = {}; - } - - controller.color_values = {}; - controller.colors_state.fullkey = {}; - controller.colors_state.left = {}; - controller.colors_state.right = {}; - ring_params[0] = {}; - SetNpadStyleIndex(NpadStyleIndex::ProController); - original_npad_type = npad_type; - - Disconnect(); - if (Settings::values.debug_pad_enabled) { - Connect(); - } - - ReloadInput(); -} - void EmulatedController::LoadDevices() { // TODO(german77): Use more buttons to detect the correct device const auto left_joycon = button_params[Settings::NativeButton::DRight]; @@ -600,23 +560,9 @@ bool EmulatedController::IsConfiguring() const { } void EmulatedController::SaveCurrentConfig() { - // Other can't alter the config from here - if (npad_id_type == NpadIdType::Other) { - return; - } - - const auto player_index = NpadIdTypeToConfigIndex(npad_id_type); + const auto player_index = NpadIdTypeToIndex(npad_id_type); auto& player = Settings::values.players.GetValue()[player_index]; - - // Only save the connected status when handheld is connected - if (npad_id_type == NpadIdType::Handheld && npad_type == NpadStyleIndex::Handheld) { - player.connected = is_connected; - } - - if (npad_id_type != NpadIdType::Handheld && npad_type != NpadStyleIndex::Handheld) { - player.connected = is_connected; - } - + player.connected = is_connected; player.controller_type = MapNPadToSettingsType(npad_type); for (std::size_t index = 0; index < player.buttons.size(); ++index) { player.buttons[index] = button_params[index].Serialize(); @@ -1206,7 +1152,7 @@ bool EmulatedController::SetVibration(std::size_t device_index, VibrationValue v if (!output_devices[device_index]) { return false; } - const auto player_index = NpadIdTypeToConfigIndex(npad_id_type); + const auto player_index = NpadIdTypeToIndex(npad_id_type); const auto& player = Settings::values.players.GetValue()[player_index]; const f32 strength = static_cast(player.vibration_strength) / 100.0f; @@ -1232,7 +1178,7 @@ bool EmulatedController::SetVibration(std::size_t device_index, VibrationValue v } bool EmulatedController::IsVibrationEnabled(std::size_t device_index) { - const auto player_index = NpadIdTypeToConfigIndex(npad_id_type); + const auto player_index = NpadIdTypeToIndex(npad_id_type); const auto& player = Settings::values.players.GetValue()[player_index]; if (!player.vibration_enabled) { diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index 99572b3bd..a9da465a2 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h @@ -250,14 +250,9 @@ public: /// Reload all input devices void ReloadInput(); - /// Overrides current mapped devices with the stored configuration and reloads all input - /// callbacks + /// Overrides current mapped devices with the stored configuration and reloads all input devices void ReloadFromSettings(); - /// Overrides current mapped debug pad with the stored configuration and reloads all input - /// callbacks - void ReloadDebugPadFromSettings(); - /// Saves the current mapped configuration void SaveCurrentConfig(); diff --git a/src/core/hid/hid_types.h b/src/core/hid/hid_types.h index 983f0addd..6b35f448c 100644 --- a/src/core/hid/hid_types.h +++ b/src/core/hid/hid_types.h @@ -690,32 +690,6 @@ constexpr size_t NpadIdTypeToIndex(NpadIdType npad_id_type) { } } -/// Converts a NpadIdType to a config array index. -constexpr size_t NpadIdTypeToConfigIndex(NpadIdType npad_id_type) { - switch (npad_id_type) { - case NpadIdType::Player1: - return 0; - case NpadIdType::Player2: - return 1; - case NpadIdType::Player3: - return 2; - case NpadIdType::Player4: - return 3; - case NpadIdType::Player5: - return 4; - case NpadIdType::Player6: - return 5; - case NpadIdType::Player7: - return 6; - case NpadIdType::Player8: - return 7; - case NpadIdType::Other: - case NpadIdType::Handheld: - default: - return 0; - } -} - /// Converts an array index to a NpadIdType constexpr NpadIdType IndexToNpadIdType(size_t index) { switch (index) { diff --git a/src/yuzu/applets/qt_controller.cpp b/src/yuzu/applets/qt_controller.cpp index d22db9f6b..c30b54499 100644 --- a/src/yuzu/applets/qt_controller.cpp +++ b/src/yuzu/applets/qt_controller.cpp @@ -542,14 +542,19 @@ void QtControllerSelectorDialog::UpdateControllerState(std::size_t player_index) const auto player_connected = player_groupboxes[player_index]->isChecked() && controller_type != Core::HID::NpadStyleIndex::Handheld; + if (controller->GetNpadStyleIndex(true) == controller_type && + controller->IsConnected(true) == player_connected) { + return; + } + // Disconnect the controller first. UpdateController(controller, controller_type, false); // Handheld if (player_index == 0) { - auto* handheld = system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld); - UpdateController(handheld, controller_type, false); if (controller_type == Core::HID::NpadStyleIndex::Handheld) { + auto* handheld = + system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld); UpdateController(handheld, Core::HID::NpadStyleIndex::Handheld, player_groupboxes[player_index]->isChecked()); } diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 4dad83b75..bb731276e 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -212,11 +212,16 @@ void Config::ReadPlayerValue(std::size_t player_index) { } if (player_prefix.isEmpty() && Settings::IsConfiguringGlobal()) { - player.controller_type = static_cast( + const auto controller = static_cast( qt_config ->value(QStringLiteral("%1type").arg(player_prefix), static_cast(Settings::ControllerType::ProController)) .toUInt()); + + if (controller == Settings::ControllerType::LeftJoycon || + controller == Settings::ControllerType::RightJoycon) { + player.controller_type = controller; + } } else { player.connected = ReadSetting(QStringLiteral("%1connected").arg(player_prefix), player_index == 0) diff --git a/src/yuzu/configuration/configure_input_per_game.cpp b/src/yuzu/configuration/configure_input_per_game.cpp index 4e77fe00b..78e65d468 100644 --- a/src/yuzu/configuration/configure_input_per_game.cpp +++ b/src/yuzu/configuration/configure_input_per_game.cpp @@ -57,7 +57,7 @@ void ConfigureInputPerGame::ApplyConfiguration() { } void ConfigureInputPerGame::LoadConfiguration() { - static constexpr size_t HANDHELD_INDEX = 0; + static constexpr size_t HANDHELD_INDEX = 8; auto& hid_core = system.HIDCore(); for (size_t player_index = 0; player_index < profile_comboboxes.size(); ++player_index) { @@ -69,6 +69,9 @@ void ConfigureInputPerGame::LoadConfiguration() { const auto selection_index = player_combobox->currentIndex(); if (selection_index == 0) { Settings::values.players.GetValue()[player_index].profile_name = ""; + if (player_index == 0) { + Settings::values.players.GetValue()[HANDHELD_INDEX] = {}; + } Settings::values.players.SetGlobal(true); emulated_controller->ReloadFromSettings(); continue; diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 93eb10ceb..50b62293e 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -1589,6 +1589,7 @@ void ConfigureInputPlayer::LoadProfile() { } void ConfigureInputPlayer::SaveProfile() { + static constexpr size_t HANDHELD_INDEX = 8; const QString profile_name = ui->comboProfiles->itemText(ui->comboProfiles->currentIndex()); if (profile_name.isEmpty()) { @@ -1597,7 +1598,12 @@ void ConfigureInputPlayer::SaveProfile() { ApplyConfiguration(); - if (!profiles->SaveProfile(profile_name.toStdString(), player_index)) { + // When we're in handheld mode, only the handheld emulated controller bindings are updated + const bool is_handheld = player_index == 0 && emulated_controller->GetNpadIdType() == + Core::HID::NpadIdType::Handheld; + const auto profile_player_index = is_handheld ? HANDHELD_INDEX : player_index; + + if (!profiles->SaveProfile(profile_name.toStdString(), profile_player_index)) { QMessageBox::critical(this, tr("Save Input Profile"), tr("Failed to save the input profile \"%1\"").arg(profile_name)); UpdateInputProfiles(); From 71ca956d5c7b0aae19fd49ce7b024bd5d2121518 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Mon, 27 Feb 2023 12:39:31 -0600 Subject: [PATCH 0097/1181] service: btm: Fix handle functions --- src/core/hle/service/btm/btm.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/core/hle/service/btm/btm.cpp b/src/core/hle/service/btm/btm.cpp index eebf85e03..419da36c4 100644 --- a/src/core/hle/service/btm/btm.cpp +++ b/src/core/hle/service/btm/btm.cpp @@ -72,32 +72,36 @@ private: void AcquireBleScanEvent(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_BTM, "(STUBBED) called"); - IPC::ResponseBuilder rb{ctx, 2, 1}; + IPC::ResponseBuilder rb{ctx, 3, 1}; rb.Push(ResultSuccess); + rb.Push(true); rb.PushCopyObjects(scan_event->GetReadableEvent()); } void AcquireBleConnectionEvent(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_BTM, "(STUBBED) called"); - IPC::ResponseBuilder rb{ctx, 2, 1}; + IPC::ResponseBuilder rb{ctx, 3, 1}; rb.Push(ResultSuccess); + rb.Push(true); rb.PushCopyObjects(connection_event->GetReadableEvent()); } void AcquireBleServiceDiscoveryEvent(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_BTM, "(STUBBED) called"); - IPC::ResponseBuilder rb{ctx, 2, 1}; + IPC::ResponseBuilder rb{ctx, 3, 1}; rb.Push(ResultSuccess); + rb.Push(true); rb.PushCopyObjects(service_discovery_event->GetReadableEvent()); } void AcquireBleMtuConfigEvent(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_BTM, "(STUBBED) called"); - IPC::ResponseBuilder rb{ctx, 2, 1}; + IPC::ResponseBuilder rb{ctx, 3, 1}; rb.Push(ResultSuccess); + rb.Push(true); rb.PushCopyObjects(config_event->GetReadableEvent()); } From c38bb96a2c1e3b9e536584403e2acd9623b02b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Locatti?= <42481638+goldenx86@users.noreply.github.com> Date: Mon, 27 Feb 2023 01:01:44 -0300 Subject: [PATCH 0098/1181] Partially apply LTO to only core and video_core projects. --- .ci/templates/build-msvc.yml | 2 +- CMakeLists.txt | 2 ++ src/core/CMakeLists.txt | 4 ++++ src/video_core/CMakeLists.txt | 4 ++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.ci/templates/build-msvc.yml b/.ci/templates/build-msvc.yml index c379dd757..427028e08 100644 --- a/.ci/templates/build-msvc.yml +++ b/.ci/templates/build-msvc.yml @@ -9,7 +9,7 @@ parameters: steps: - script: choco install vulkan-sdk displayName: 'Install vulkan-sdk' -- script: refreshenv && mkdir build && cd build && cmake -E env CXXFLAGS="/Gw /GA /Gr /Ob2" cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_POLICY_DEFAULT_CMP0069=NEW -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DYUZU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release -DYUZU_CRASH_DUMPS=ON .. && cd .. +- script: refreshenv && mkdir build && cd build && cmake -E env CXXFLAGS="/Gw /GA /Gr /Ob2" cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_POLICY_DEFAULT_CMP0069=NEW -DENABLE_LTO=ON -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DYUZU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release -DYUZU_CRASH_DUMPS=ON .. && cd .. displayName: 'Configure CMake' - task: MSBuild@1 displayName: 'Build' diff --git a/CMakeLists.txt b/CMakeLists.txt index 10a3de9e2..274eebe8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,8 @@ option(YUZU_USE_BUNDLED_VCPKG "Use vcpkg for yuzu dependencies" "${MSVC}") option(YUZU_CHECK_SUBMODULES "Check if submodules are present" ON) +option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF) + CMAKE_DEPENDENT_OPTION(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "NOT WIN32" OFF) if (YUZU_USE_BUNDLED_VCPKG) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index ff5502d87..70fa1edf5 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -861,3 +861,7 @@ endif() if (YUZU_USE_PRECOMPILED_HEADERS) target_precompile_headers(core PRIVATE precompiled_headers.h) endif() + +if (YUZU_ENABLE_LTO) + set_property(TARGET core PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) +endif() diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 4742bcbe9..e904573d7 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -330,3 +330,7 @@ endif() if (YUZU_USE_PRECOMPILED_HEADERS) target_precompile_headers(video_core PRIVATE precompiled_headers.h) endif() + +if (YUZU_ENABLE_LTO) + set_property(TARGET video_core PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) +endif() From 0245c5dc4953b11397bd80a7bf658a736f1340e1 Mon Sep 17 00:00:00 2001 From: Alexandre Bouvier Date: Wed, 22 Feb 2023 20:27:05 +0100 Subject: [PATCH 0099/1181] externals: use openssl from vcpkg --- .gitmodules | 3 --- CMakeLists.txt | 6 +++--- externals/CMakeLists.txt | 35 ++++++----------------------------- externals/libressl | 1 - vcpkg.json | 11 ++++++++++- 5 files changed, 19 insertions(+), 37 deletions(-) delete mode 160000 externals/libressl diff --git a/.gitmodules b/.gitmodules index 8e98ee9cb..75c7b5fe0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,9 +13,6 @@ [submodule "dynarmic"] path = externals/dynarmic url = https://github.com/MerryMage/dynarmic.git -[submodule "libressl"] - path = externals/libressl - url = https://github.com/citra-emu/ext-libressl-portable.git [submodule "libusb"] path = externals/libusb/libusb url = https://github.com/libusb/libusb.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 906073602..0f344ffd9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,9 @@ if (YUZU_USE_BUNDLED_VCPKG) if (YUZU_CRASH_DUMPS) list(APPEND VCPKG_MANIFEST_FEATURES "dbghelp") endif() + if (ENABLE_WEB_SERVICE) + list(APPEND VCPKG_MANIFEST_FEATURES "web-service") + endif() include(${CMAKE_SOURCE_DIR}/externals/vcpkg/scripts/buildsystems/vcpkg.cmake) elseif(NOT "$ENV{VCPKG_TOOLCHAIN_FILE}" STREQUAL "") @@ -244,9 +247,6 @@ endif() if (ENABLE_WEB_SERVICE) find_package(cpp-jwt 1.4 CONFIG) find_package(httplib 0.12 MODULE) - if (NOT cpp-jwt_FOUND OR NOT httplib_FOUND) - find_package(OpenSSL 1.1 MODULE COMPONENTS Crypto SSL) - endif() endif() if (YUZU_TESTS) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 966f5e94c..f2a560f04 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -100,41 +100,18 @@ endif() # Sirit add_subdirectory(sirit EXCLUDE_FROM_ALL) -# LibreSSL -if (ENABLE_WEB_SERVICE AND DEFINED OPENSSL_FOUND) - if (WIN32 OR NOT OPENSSL_FOUND) - set(LIBRESSL_SKIP_INSTALL ON) - set(OPENSSLDIR "/etc/ssl/") - add_subdirectory(libressl EXCLUDE_FROM_ALL) - target_include_directories(ssl INTERFACE ./libressl/include) - target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP) - get_directory_property(OPENSSL_LIBRARIES - DIRECTORY libressl - DEFINITION OPENSSL_LIBS) - else() - set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) - endif() -endif() - # httplib if (ENABLE_WEB_SERVICE AND NOT TARGET httplib::httplib) - add_library(httplib INTERFACE) - target_include_directories(httplib INTERFACE ./cpp-httplib) - target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT) - target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES}) - if (WIN32) - target_link_libraries(httplib INTERFACE crypt32 cryptui ws2_32) - endif() - add_library(httplib::httplib ALIAS httplib) + set(HTTPLIB_REQUIRE_OPENSSL ON) + add_subdirectory(cpp-httplib EXCLUDE_FROM_ALL) endif() # cpp-jwt if (ENABLE_WEB_SERVICE AND NOT TARGET cpp-jwt::cpp-jwt) - add_library(cpp-jwt INTERFACE) - target_include_directories(cpp-jwt INTERFACE ./cpp-jwt/include) - target_compile_definitions(cpp-jwt INTERFACE CPP_JWT_USE_VENDORED_NLOHMANN_JSON) - target_link_libraries(cpp-jwt INTERFACE ${OPENSSL_LIBRARIES}) - add_library(cpp-jwt::cpp-jwt ALIAS cpp-jwt) + set(CPP_JWT_BUILD_EXAMPLES OFF) + set(CPP_JWT_BUILD_TESTS OFF) + set(CPP_JWT_USE_VENDORED_NLOHMANN_JSON OFF) + add_subdirectory(cpp-jwt EXCLUDE_FROM_ALL) endif() # Opus diff --git a/externals/libressl b/externals/libressl deleted file mode 160000 index 8929f818f..000000000 --- a/externals/libressl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8929f818fd748fd31a34fec7c04558399e13014a diff --git a/vcpkg.json b/vcpkg.json index ef271f778..fbadca0e6 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "yuzu", "builtin-baseline": "9b22b40c6c61bf0da2d46346dd44a11e90972cc9", "version": "1.0", @@ -35,6 +35,15 @@ "dbghelp": { "description": "Compile Windows crash dump (Minidump) support", "dependencies": [ "dbghelp" ] + }, + "web-service": { + "description": "Enable web services (telemetry, etc.)", + "dependencies": [ + { + "name": "openssl", + "platform": "windows" + } + ] } }, "overrides": [ From 7b8a5413add02004d778252c0b67bf921c1fb7d8 Mon Sep 17 00:00:00 2001 From: Alexandre Bouvier Date: Fri, 24 Feb 2023 23:45:38 +0100 Subject: [PATCH 0100/1181] cmake: support components in find modules --- CMakeLists.txt | 6 +++--- CMakeModules/FindLLVM.cmake | 18 ++++++++++++++---- CMakeModules/Findhttplib.cmake | 12 +++++++++++- CMakeModules/Findinih.cmake | 19 +++++++++++++++---- 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f344ffd9..7a7faa1c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,8 +212,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) # Enforce the search mode of non-required packages for better and shorter failure messages find_package(enet 1.3 MODULE) find_package(fmt 9 REQUIRED) -find_package(inih MODULE) -find_package(LLVM MODULE) +find_package(inih 52 MODULE COMPONENTS INIReader) +find_package(LLVM MODULE COMPONENTS Demangle) find_package(lz4 REQUIRED) find_package(nlohmann_json 3.8 REQUIRED) find_package(Opus 1.3 MODULE) @@ -246,7 +246,7 @@ endif() if (ENABLE_WEB_SERVICE) find_package(cpp-jwt 1.4 CONFIG) - find_package(httplib 0.12 MODULE) + find_package(httplib 0.12 MODULE COMPONENTS OpenSSL) endif() if (YUZU_TESTS) diff --git a/CMakeModules/FindLLVM.cmake b/CMakeModules/FindLLVM.cmake index 513d9a536..efbd0ca46 100644 --- a/CMakeModules/FindLLVM.cmake +++ b/CMakeModules/FindLLVM.cmake @@ -2,15 +2,25 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -find_package(LLVM QUIET CONFIG) +find_package(LLVM QUIET COMPONENTS CONFIG) +if (LLVM_FOUND) + separate_arguments(LLVM_DEFINITIONS) + if (LLVMDemangle IN_LIST LLVM_AVAILABLE_LIBS) + set(LLVM_Demangle_FOUND TRUE) + endif() +endif() include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(LLVM CONFIG_MODE) +find_package_handle_standard_args(LLVM HANDLE_COMPONENTS CONFIG_MODE) -if (LLVM_FOUND AND NOT TARGET LLVM::Demangle) +if (LLVM_FOUND AND LLVM_Demangle_FOUND AND NOT TARGET LLVM::Demangle) add_library(LLVM::Demangle INTERFACE IMPORTED) - llvm_map_components_to_libnames(LLVM_LIBRARIES demangle) target_compile_definitions(LLVM::Demangle INTERFACE ${LLVM_DEFINITIONS}) target_include_directories(LLVM::Demangle INTERFACE ${LLVM_INCLUDE_DIRS}) + # prefer shared LLVM: https://github.com/llvm/llvm-project/issues/34593 + # but use ugly hack because llvm_config doesn't support interface library + add_library(_dummy_lib SHARED EXCLUDE_FROM_ALL src/yuzu/main.cpp) + llvm_config(_dummy_lib USE_SHARED demangle) + get_target_property(LLVM_LIBRARIES _dummy_lib LINK_LIBRARIES) target_link_libraries(LLVM::Demangle INTERFACE ${LLVM_LIBRARIES}) endif() diff --git a/CMakeModules/Findhttplib.cmake b/CMakeModules/Findhttplib.cmake index 861207eb5..48967add9 100644 --- a/CMakeModules/Findhttplib.cmake +++ b/CMakeModules/Findhttplib.cmake @@ -6,13 +6,23 @@ include(FindPackageHandleStandardArgs) find_package(httplib QUIET CONFIG) if (httplib_CONSIDERED_CONFIGS) - find_package_handle_standard_args(httplib CONFIG_MODE) + find_package_handle_standard_args(httplib HANDLE_COMPONENTS CONFIG_MODE) else() find_package(PkgConfig QUIET) pkg_search_module(HTTPLIB QUIET IMPORTED_TARGET cpp-httplib) + if ("-DCPPHTTPLIB_OPENSSL_SUPPORT" IN_LIST HTTPLIB_CFLAGS_OTHER) + set(httplib_OpenSSL_FOUND TRUE) + endif() + if ("-DCPPHTTPLIB_ZLIB_SUPPORT" IN_LIST HTTPLIB_CFLAGS_OTHER) + set(httplib_ZLIB_FOUND TRUE) + endif() + if ("-DCPPHTTPLIB_BROTLI_SUPPORT" IN_LIST HTTPLIB_CFLAGS_OTHER) + set(httplib_Brotli_FOUND TRUE) + endif() find_package_handle_standard_args(httplib REQUIRED_VARS HTTPLIB_INCLUDEDIR VERSION_VAR HTTPLIB_VERSION + HANDLE_COMPONENTS ) endif() diff --git a/CMakeModules/Findinih.cmake b/CMakeModules/Findinih.cmake index b8d38dcff..791befebd 100644 --- a/CMakeModules/Findinih.cmake +++ b/CMakeModules/Findinih.cmake @@ -3,14 +3,25 @@ # SPDX-License-Identifier: GPL-3.0-or-later find_package(PkgConfig QUIET) -pkg_search_module(INIREADER QUIET IMPORTED_TARGET INIReader) +pkg_search_module(INIH QUIET IMPORTED_TARGET inih) +if (INIReader IN_LIST inih_FIND_COMPONENTS) + pkg_search_module(INIREADER QUIET IMPORTED_TARGET INIReader) + if (INIREADER_FOUND) + set(inih_INIReader_FOUND TRUE) + endif() +endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(inih - REQUIRED_VARS INIREADER_LINK_LIBRARIES - VERSION_VAR INIREADER_VERSION + REQUIRED_VARS INIH_LINK_LIBRARIES + VERSION_VAR INIH_VERSION + HANDLE_COMPONENTS ) -if (inih_FOUND AND NOT TARGET inih::INIReader) +if (inih_FOUND AND NOT TARGET inih::inih) + add_library(inih::inih ALIAS PkgConfig::INIH) +endif() + +if (inih_FOUND AND inih_INIReader_FOUND AND NOT TARGET inih::INIReader) add_library(inih::INIReader ALIAS PkgConfig::INIREADER) endif() From 57fd8b1f451f95495167581066e3fcf981f7c054 Mon Sep 17 00:00:00 2001 From: Alexandre Bouvier Date: Tue, 6 Dec 2022 21:01:26 +0100 Subject: [PATCH 0101/1181] cmake: use correct boost imported targets --- CMakeLists.txt | 28 ++-------------------------- src/common/CMakeLists.txt | 2 +- src/core/CMakeLists.txt | 2 +- src/input_common/CMakeLists.txt | 2 +- src/network/CMakeLists.txt | 2 +- src/yuzu/CMakeLists.txt | 2 +- 6 files changed, 7 insertions(+), 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f344ffd9..5f6f86e68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -210,6 +210,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) # ======================================================================= # Enforce the search mode of non-required packages for better and shorter failure messages +find_package(Boost 1.73.0 REQUIRED context) find_package(enet 1.3 MODULE) find_package(fmt 9 REQUIRED) find_package(inih MODULE) @@ -253,19 +254,6 @@ if (YUZU_TESTS) find_package(Catch2 3.0.1 REQUIRED) endif() -find_package(Boost 1.73.0 COMPONENTS context) -if (Boost_FOUND) - set(Boost_LIBRARIES Boost::boost) - # Conditionally add Boost::context only if the found Boost package provides it - # The old version is missing Boost::context, so we want to avoid adding in that case - # The new version requires adding Boost::context to prevent linking issues - if (TARGET Boost::context) - list(APPEND Boost_LIBRARIES Boost::context) - endif() -else() - message(FATAL_ERROR "Boost 1.73.0 or newer not found") -endif() - # boost:asio has functions that require AcceptEx et al if (MINGW) find_library(MSWSOCK_LIBRARY mswsock REQUIRED) @@ -462,14 +450,6 @@ if (ENABLE_SDL2) endif() endif() -# Reexport some targets that are named differently when using the upstream CmakeConfig -# In order to ALIAS targets to a new name, they first need to be IMPORTED_GLOBAL -# Dynarmic checks for target `boost` and so we want to make sure it can find it through our system instead of using their external -if (TARGET Boost::boost) - set_target_properties(Boost::boost PROPERTIES IMPORTED_GLOBAL TRUE) - add_library(boost ALIAS Boost::boost) -endif() - # List of all FFmpeg components required set(FFmpeg_COMPONENTS avcodec @@ -585,11 +565,7 @@ function(create_target_directory_groups target_name) endfunction() # Prevent boost from linking against libs when building -add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY - -DBOOST_SYSTEM_NO_LIB - -DBOOST_DATE_TIME_NO_LIB - -DBOOST_REGEX_NO_LIB -) +target_link_libraries(Boost::headers INTERFACE Boost::disable_autolinking) # Adjustments for MSVC + Ninja if (MSVC AND CMAKE_GENERATOR STREQUAL "Ninja") add_compile_options( diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 9884a4a0b..56b247ac4 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -176,7 +176,7 @@ endif() create_target_directory_groups(common) -target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile Threads::Threads) +target_link_libraries(common PUBLIC Boost::context Boost::headers fmt::fmt microprofile Threads::Threads) target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd LLVM::Demangle) if (YUZU_USE_PRECOMPILED_HEADERS) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 70fa1edf5..696a1f9ea 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -832,7 +832,7 @@ endif() create_target_directory_groups(core) target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core) -target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::opus) +target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::opus) if (MINGW) target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY}) endif() diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt index e3b627e4f..322c29065 100644 --- a/src/input_common/CMakeLists.txt +++ b/src/input_common/CMakeLists.txt @@ -89,7 +89,7 @@ if (ENABLE_LIBUSB) endif() create_target_directory_groups(input_common) -target_link_libraries(input_common PUBLIC core PRIVATE common Boost::boost) +target_link_libraries(input_common PUBLIC core PRIVATE common Boost::headers) if (YUZU_USE_PRECOMPILED_HEADERS) target_precompile_headers(input_common PRIVATE precompiled_headers.h) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 1ab52da59..8e306219f 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -19,7 +19,7 @@ add_library(network STATIC create_target_directory_groups(network) -target_link_libraries(network PRIVATE common enet::enet Boost::boost) +target_link_libraries(network PRIVATE common enet::enet Boost::headers) if (ENABLE_WEB_SERVICE) target_compile_definitions(network PRIVATE -DENABLE_WEB_SERVICE) target_link_libraries(network PRIVATE web_service) diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 06d982d9b..0f8c1e6a6 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -314,7 +314,7 @@ endif() create_target_directory_groups(yuzu) target_link_libraries(yuzu PRIVATE common core input_common network video_core) -target_link_libraries(yuzu PRIVATE Boost::boost glad Qt${QT_MAJOR_VERSION}::Widgets) +target_link_libraries(yuzu PRIVATE Boost::headers glad Qt${QT_MAJOR_VERSION}::Widgets) target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) target_link_libraries(yuzu PRIVATE Vulkan::Headers) From 6efd335eda61861a384155136304d17375f16f7b Mon Sep 17 00:00:00 2001 From: The yuzu Community Date: Wed, 1 Mar 2023 02:49:50 +0000 Subject: [PATCH 0102/1181] Update translations (2023-03-01) --- dist/languages/ca.ts | 741 +++++++++++++------------ dist/languages/cs.ts | 743 +++++++++++++------------ dist/languages/da.ts | 739 ++++++++++++------------ dist/languages/de.ts | 741 +++++++++++++------------ dist/languages/el.ts | 741 +++++++++++++------------ dist/languages/es.ts | 741 +++++++++++++------------ dist/languages/fr.ts | 849 +++++++++++++++------------- dist/languages/id.ts | 739 ++++++++++++------------ dist/languages/it.ts | 815 ++++++++++++++------------- dist/languages/ja_JP.ts | 882 +++++++++++++++-------------- dist/languages/ko_KR.ts | 741 +++++++++++++------------ dist/languages/nb.ts | 741 +++++++++++++------------ dist/languages/nl.ts | 743 +++++++++++++------------ dist/languages/pl.ts | 741 +++++++++++++------------ dist/languages/pt_BR.ts | 1171 ++++++++++++++++++++------------------- dist/languages/pt_PT.ts | 1171 ++++++++++++++++++++------------------- dist/languages/ru_RU.ts | 841 +++++++++++++++------------- dist/languages/sv.ts | 745 +++++++++++++------------ dist/languages/tr_TR.ts | 741 +++++++++++++------------ dist/languages/uk.ts | 805 ++++++++++++++------------- dist/languages/zh_CN.ts | 749 +++++++++++++------------ dist/languages/zh_TW.ts | 741 +++++++++++++------------ 22 files changed, 9448 insertions(+), 8213 deletions(-) diff --git a/dist/languages/ca.ts b/dist/languages/ca.ts index 81835e749..7ab6c106c 100644 --- a/dist/languages/ca.ts +++ b/dist/languages/ca.ts @@ -1721,76 +1721,86 @@ This would ban both their forum username and their IP address. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Activa la compilació asíncrona de shaders, el qual podria reduir el tartamudeig dels shaders. Aquesta funcionalitat és experimental. - + Use asynchronous shader building (Hack) Utilitzar la construcció de shaders asíncrona (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Habilita el temps ràpid de la GPU. Aquesta opció obligarà a la majoria dels jocs a executar-se a la seva resolució nativa més alta. - + Use Fast GPU Time (Hack) Utilitzar temps ràpid a la GPU (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Use pessimistic buffer flushes (Hack) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache - + Anisotropic Filtering: Filtrat anisotròpic: - + Automatic Automàtic - + Default Valor predeterminat - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2178,7 +2188,7 @@ This would ban both their forum username and their IP address. - + Configure Configurar @@ -2205,6 +2215,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu Necessita reiniciar yuzu @@ -2229,22 +2240,27 @@ This would ban both their forum username and their IP address. - + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + Enable mouse panning Activar desplaçament del ratolí - + Mouse sensitivity Sensibilitat del ratolí - + % % - + Motion / Touch Moviment / Tàctil @@ -2356,7 +2372,7 @@ This would ban both their forum username and their IP address. - + Left Stick Palanca esquerra @@ -2450,14 +2466,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2476,7 +2492,7 @@ This would ban both their forum username and their IP address. - + Plus Més @@ -2489,15 +2505,15 @@ This would ban both their forum username and their IP address. - + R R - + ZR ZR @@ -2554,236 +2570,241 @@ This would ban both their forum username and their IP address. - + Right Stick Palanca dreta - - - - + + + + Clear Esborrar - - - - - + + + + + [not set] [no establert] - - + + Invert button Botó d'inversió - - + + Toggle button Botó commutador - - + + Turbo button + + + + + Invert axis Invertir eixos - - - + + + Set threshold Configurar llindar - - + + Choose a value between 0% and 100% Esculli un valor entre 0% i 100% - + Toggle axis - + Set gyro threshold Configurar llindar giroscopi - + Map Analog Stick Configuració de palanca analògica - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Després de prémer D'acord, primer moveu el joystick horitzontalment i després verticalment. Per invertir els eixos, primer moveu el joystick verticalment i després horitzontalment. - + Center axis Centrar eixos - - + + Deadzone: %1% Zona morta: %1% - - + + Modifier Range: %1% Rang del modificador: %1% - - + + Pro Controller Controlador Pro - + Dual Joycons Joycons duals - + Left Joycon Joycon esquerra - + Right Joycon Joycon dret - + Handheld Portàtil - + GameCube Controller Controlador de GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Controlador NES - + SNES Controller Controlador SNES - + N64 Controller Controlador N64 - + Sega Genesis Sega Genesis - + Start / Pause Inici / Pausa - + Z Z - + Control Stick Palanca de control - + C-Stick C-Stick - + Shake! Sacseja! - + [waiting] [esperant] - + New Profile Nou perfil - + Enter a profile name: Introdueixi un nom de perfil: - - + + Create Input Profile Crear perfil d'entrada - + The given profile name is not valid! El nom de perfil introduït no és vàlid! - + Failed to create the input profile "%1" Error al crear el perfil d'entrada "%1" - + Delete Input Profile Eliminar perfil d'entrada - + Failed to delete the input profile "%1" Error al eliminar el perfil d'entrada "%1" - + Load Input Profile Carregar perfil d'entrada - + Failed to load the input profile "%1" Error al carregar el perfil d'entrada "%1" - + Save Input Profile Guardar perfil d'entrada - + Failed to save the input profile "%1" Error al guardar el perfil d'entrada "%1" @@ -4559,525 +4580,535 @@ Arrossegui els punts per a canviar la posició, o faci doble clic a les cel·les - + Loading Web Applet... Carregant Web applet... - - + + Disable Web Applet Desactivar el Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Desactivar l'Applet Web pot provocar comportaments indefinits i només hauria d'utilitzar-se amb Super Mario 3D All-Stars. Estàs segur de que vols desactivar l'Applet Web? (Això pot ser reactivat als paràmetres Debug.) - + The amount of shaders currently being built La quantitat de shaders que s'estan compilant actualment - + The current selected resolution scaling multiplier. El multiplicador d'escala de resolució seleccionat actualment. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Velocitat d'emulació actual. Valors superiors o inferiors a 100% indiquen que l'emulació s'està executant més ràpidament o més lentament que a la Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Quants fotogrames per segon està mostrant el joc actualment. Això variarà d'un joc a un altre i d'una escena a una altra. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Temps que costa emular un fotograma de la Switch, sense tenir en compte la limitació de fotogrames o la sincronització vertical. Per a una emulació òptima, aquest valor hauria de ser com a màxim de 16.67 ms. - + &Clear Recent Files &Esborrar arxius recents - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue &Continuar - + &Pause &Pausar - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu està executant un joc - + Warning Outdated Game Format Advertència format del joc desfasat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Està utilitzant el format de directori de ROM deconstruït per a aquest joc, que és un format desactualitzat que ha sigut reemplaçat per altres, com NCA, NAX, XCI o NSP. Els directoris de ROM deconstruïts careixen d'icones, metadades i suport d'actualitzacions.<br><br>Per a obtenir una explicació dels diversos formats de Switch que suporta yuzu,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>faci una ullada a la nostra wiki</a>. Aquest missatge no es tornarà a mostrar. - - + + Error while loading ROM! Error carregant la ROM! - + The ROM format is not supported. El format de la ROM no està suportat. - + An error occurred initializing the video core. S'ha produït un error inicialitzant el nucli de vídeo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu ha trobat un error mentre executava el nucli de vídeo. Això sol ser causat per controladors de la GPU obsolets, inclosos els integrats. Si us plau, consulti el registre per a més detalls. Per obtenir més informació sobre com accedir al registre, consulti la següent pàgina: <a href='https://yuzu-emu.org/help/reference/log-files/'>Com carregar el fitxer de registre</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Error al carregar la ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Si us plau, segueixi <a href='https://yuzu-emu.org/help/quickstart/'>la guia d'inici de yuzu</a> per a bolcar de nou els seus fitxers.<br>Pot consultar la wiki de yuzu wiki</a> o el Discord de yuzu</a> per obtenir ajuda. - + An unknown error occurred. Please see the log for more details. S'ha produït un error desconegut. Si us plau, consulti el registre per a més detalls. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Dades de partides guardades - + Mod Data Dades de mods - + Error Opening %1 Folder Error obrint la carpeta %1 - - + + Folder does not exist! La carpeta no existeix! - + Error Opening Transferable Shader Cache Error obrint la cache transferible de shaders - + Failed to create the shader cache directory for this title. No s'ha pogut crear el directori de la cache dels shaders per aquest títol. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Eliminar entrada - - - - - - + + + + + + Successfully Removed S'ha eliminat correctament - + Successfully removed the installed base game. S'ha eliminat correctament el joc base instal·lat. - + The base game is not installed in the NAND and cannot be removed. El joc base no està instal·lat a la NAND i no pot ser eliminat. - + Successfully removed the installed update. S'ha eliminat correctament l'actualització instal·lada. - + There is no update installed for this title. No hi ha cap actualització instal·lada per aquest títol. - + There are no DLC installed for this title. No hi ha cap DLC instal·lat per aquest títol. - + Successfully removed %1 installed DLC. S'ha eliminat correctament %1 DLC instal·lat/s. - + Delete OpenGL Transferable Shader Cache? Desitja eliminar la cache transferible de shaders d'OpenGL? - + Delete Vulkan Transferable Shader Cache? Desitja eliminar la cache transferible de shaders de Vulkan? - + Delete All Transferable Shader Caches? Desitja eliminar totes les caches transferibles de shaders? - + Remove Custom Game Configuration? Desitja eliminar la configuració personalitzada del joc? - + Remove File Eliminar arxiu - - + + Error Removing Transferable Shader Cache Error eliminant la cache transferible de shaders - - + + A shader cache for this title does not exist. No existeix una cache de shaders per aquest títol. - + Successfully removed the transferable shader cache. S'ha eliminat correctament la cache transferible de shaders. - + Failed to remove the transferable shader cache. No s'ha pogut eliminar la cache transferible de shaders. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches Error al eliminar les caches de shaders transferibles - + Successfully removed the transferable shader caches. Caches de shaders transferibles eliminades correctament. - + Failed to remove the transferable shader cache directory. No s'ha pogut eliminar el directori de caches de shaders transferibles. - - + + Error Removing Custom Configuration Error eliminant la configuració personalitzada - + A custom configuration for this title does not exist. No existeix una configuració personalitzada per aquest joc. - + Successfully removed the custom game configuration. S'ha eliminat correctament la configuració personalitzada del joc. - + Failed to remove the custom game configuration. No s'ha pogut eliminar la configuració personalitzada del joc. - - + + RomFS Extraction Failed! La extracció de RomFS ha fallat! - + There was an error copying the RomFS files or the user cancelled the operation. S'ha produït un error copiant els arxius RomFS o l'usuari ha cancel·lat la operació. - + Full Completa - + Skeleton Esquelet - + Select RomFS Dump Mode Seleccioni el mode de bolcat de RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Si us plau, seleccioni la forma en que desitja bolcar la RomFS.<br>Completa copiarà tots els arxius al nou directori mentre que<br>esquelet només crearà l'estructura de directoris. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root No hi ha suficient espai lliure a %1 per extreure el RomFS. Si us plau, alliberi espai o esculli un altre directori de bolcat a Emulació > Configuració > Sistema > Sistema d'arxius > Carpeta arrel de bolcat - + Extracting RomFS... Extraient RomFS... - - + + Cancel Cancel·la - + RomFS Extraction Succeeded! Extracció de RomFS completada correctament! - + The operation completed successfully. L'operació s'ha completat correctament. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Error obrint %1 - + Select Directory Seleccionar directori - + Properties Propietats - + The game properties could not be loaded. Les propietats del joc no s'han pogut carregar. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Executable de Switch (%1);;Tots els Arxius (*.*) - + Load File Carregar arxiu - + Open Extracted ROM Directory Obrir el directori de la ROM extreta - + Invalid Directory Selected Directori seleccionat invàlid - + The directory you have selected does not contain a 'main' file. El directori que ha seleccionat no conté un arxiu 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Arxiu de Switch Instal·lable (*.nca *.nsp *.xci);;Arxiu de Continguts Nintendo (*.nca);;Paquet d'enviament Nintendo (*.nsp);;Imatge de Cartutx NX (*.xci) - + Install Files Instal·lar arxius - + %n file(s) remaining %n arxiu(s) restants%n arxiu(s) restants - + Installing file "%1"... Instal·lant arxiu "%1"... - - + + Install Results Resultats instal·lació - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Per evitar possibles conflictes, no recomanem als usuaris que instal·lin jocs base a la NAND. Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i DLCs. - + %n file(s) were newly installed %n nou(s) arxiu(s) s'ha(n) instal·lat @@ -5085,7 +5116,7 @@ Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i - + %n file(s) were overwritten %n arxiu(s) s'han sobreescrit @@ -5093,7 +5124,7 @@ Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i - + %n file(s) failed to install %n arxiu(s) no s'han instal·lat @@ -5101,377 +5132,388 @@ Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i - + System Application Aplicació del sistema - + System Archive Arxiu del sistema - + System Application Update Actualització de l'aplicació del sistema - + Firmware Package (Type A) Paquet de firmware (Tipus A) - + Firmware Package (Type B) Paquet de firmware (Tipus B) - + Game Joc - + Game Update Actualització de joc - + Game DLC DLC del joc - + Delta Title Títol delta - + Select NCA Install Type... Seleccioni el tipus d'instal·lació NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Seleccioni el tipus de títol que desitja instal·lar aquest NCA com a: (En la majoria dels casos, el valor predeterminat 'Joc' està bé.) - + Failed to Install Ha fallat la instal·lació - + The title type you selected for the NCA is invalid. El tipus de títol seleccionat per el NCA és invàlid. - + File not found Arxiu no trobat - + File "%1" not found Arxiu "%1" no trobat - + OK D'acord - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Falta el compte de yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Per tal d'enviar un cas de prova de compatibilitat de joc, ha de vincular el seu compte de yuzu.<br><br/>Per a vincular el seu compte de yuzu, vagi a Emulació & gt; Configuració & gt; Web. - + Error opening URL Error obrint URL - + Unable to open the URL "%1". No es pot obrir la URL "%1". - + TAS Recording Gravació TAS - + Overwrite file of player 1? Sobreescriure l'arxiu del jugador 1? - + Invalid config detected Configuració invàlida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. El controlador del mode portàtil no es pot fer servir en el mode acoblat. Es seleccionarà el controlador Pro en el seu lloc. - - + + Amiibo Amiibo - - + + The current amiibo has been removed L'amiibo actual ha sigut eliminat - + Error Error - - + + The current game is not looking for amiibos El joc actual no està buscant amiibos - + Amiibo File (%1);; All Files (*.*) Arxiu Amiibo (%1);; Tots els Arxius (*.*) - + Load Amiibo Carregar Amiibo - + Error loading Amiibo data Error al carregar les dades d'Amiibo - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Captura de pantalla - + PNG Image (*.png) Imatge PNG (*.png) - + TAS state: Running %1/%2 Estat TAS: executant %1/%2 - + TAS state: Recording %1 Estat TAS: gravant %1 - + TAS state: Idle %1/%2 Estat TAS: inactiu %1/%2 - + TAS State: Invalid Estat TAS: invàlid - + &Stop Running &Parar l'execució - + &Start &Iniciar - + Stop R&ecording Parar g&ravació - + R&ecord G&ravar - + Building: %n shader(s) Construint: %n shader(s)Construint: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escala: %1x - + Speed: %1% / %2% Velocitat: %1% / %2% - + Speed: %1% Velocitat: %1% - + Game: %1 FPS (Unlocked) Joc: %1 FPS (desbloquejat) - + Game: %1 FPS Joc: %1 FPS - + Frame: %1 ms Fotograma: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR ERROR GPU - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST MÉS PROPER - - + + BILINEAR BILINEAL - + BICUBIC BICÚBIC - + GAUSSIAN GAUSSIÀ - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA SENSE AA - + FXAA FXAA - + SMAA - + + VOLUME: MUTE + + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + + + + Confirm Key Rederivation Confirmi la clau de rederivació - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5488,37 +5530,37 @@ i opcionalment faci còpies de seguretat. Això eliminarà els arxius de les claus generats automàticament i tornarà a executar el mòdul de derivació de claus. - + Missing fuses Falten fusibles - + - Missing BOOT0 - Falta BOOT0 - + - Missing BCPKG2-1-Normal-Main - Falta BCPKG2-1-Normal-Main - + - Missing PRODINFO - Falta PRODINFO - + Derivation Components Missing Falten components de derivació - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Falten les claus d'encriptació. <br>Si us plau, segueixi <a href='https://yuzu-emu.org/help/quickstart/'>la guia ràpida de yuzu</a> per a obtenir totes les seves claus, firmware i jocs.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5527,39 +5569,39 @@ Això pot prendre fins a un minut depenent del rendiment del seu sistema. - + Deriving Keys Derivant claus - + Select RomFS Dump Target Seleccioni el destinatari per a bolcar el RomFS - + Please select which RomFS you would like to dump. Si us plau, seleccioni quin RomFS desitja bolcar. - + Are you sure you want to close yuzu? Està segur de que vol tancar yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Està segur de que vol aturar l'emulació? Qualsevol progrés no guardat es perdrà. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5571,44 +5613,44 @@ Desitja tancar-lo de totes maneres? GRenderWindow - - + + OpenGL not available! OpenGL no disponible! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu no ha estat compilat amb suport per OpenGL. - - + + Error while initializing OpenGL! Error al inicialitzar OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. La seva GPU no suporta OpenGL, o no té instal·lat els últims controladors gràfics. - + Error while initializing OpenGL 4.6! Error inicialitzant OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 La seva GPU no suporta OpenGL 4.6, o no té instal·lats els últims controladors gràfics.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 És possible que la seva GPU no suporti una o més extensions necessàries d'OpenGL. Si us plau, asseguris de tenir els últims controladors de la tarjeta gràfica.<br><br>GL Renderer:<br>%1<br><br>Extensions no suportades:<br>%2 @@ -5848,7 +5890,7 @@ Desitja tancar-lo de totes maneres? GameListPlaceholder - + Double-click to add a new folder to the game list Faci doble clic per afegir un nou directori a la llista de jocs @@ -6193,51 +6235,56 @@ Debug Message: + Hide Empty Rooms + + + + Hide Full Rooms - + Refresh Lobby - + Password Required to Join - + Password: - + Players Jugadors - + Room Name - + Preferred Game - + Host - + Refreshing - + Refresh List @@ -6844,7 +6891,7 @@ p, li { white-space: pre-wrap; } - + [not set] [no establert] @@ -6859,10 +6906,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Eix %1%2 @@ -6876,9 +6923,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [desconegut] @@ -7043,15 +7090,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [invàlid] - - %1%2Hat %3 %1%2Rotació %3 @@ -7059,35 +7104,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2Eix %3 - + %1%2Axis %3,%4,%5 %1%2Eixos %3,%4,%5 - + %1%2Motion %3 %1%2Moviment %3 - - %1%2Button %3 %1%2Botó %3 - + [unused] [sense ús] @@ -7174,9 +7217,21 @@ p, li { white-space: pre-wrap; } Extra - - %1%2%3 - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 + diff --git a/dist/languages/cs.ts b/dist/languages/cs.ts index bafb8997b..eb54bd162 100644 --- a/dist/languages/cs.ts +++ b/dist/languages/cs.ts @@ -1713,76 +1713,86 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. - Zapnout asynchronní kompilaci shaderů, která může snížit zasekávání shaderů. Tato funkce je experimentální. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + - Use asynchronous shader building (Hack) + Decode ASTC textures asynchronously (Hack) - Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. + Zapnout asynchronní kompilaci shaderů, která může snížit zasekávání shaderů. Tato funkce je experimentální. - Use Fast GPU Time (Hack) + Use asynchronous shader building (Hack) - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - Use pessimistic buffer flushes (Hack) + Use Fast GPU Time (Hack) - Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + Use pessimistic buffer flushes (Hack) + + + + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + Use Vulkan pipeline cache - + Anisotropic Filtering: Anizotropní filtrování: - + Automatic - + Default Výchozí - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2170,7 +2180,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + Configure Nastavení @@ -2197,6 +2207,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj + Requires restarting yuzu @@ -2221,22 +2232,27 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + Enable mouse panning Povolit naklánění myší - + Mouse sensitivity Citlivost myši - + % % - + Motion / Touch Pohyb / Dotyk @@ -2348,7 +2364,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + Left Stick Levá Páčka @@ -2442,14 +2458,14 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + L L - + ZL ZL @@ -2468,7 +2484,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + Plus Plus @@ -2481,15 +2497,15 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + R R - + ZR ZR @@ -2546,236 +2562,241 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + Right Stick Pravá páčka - - - - + + + + Clear Vyčistit - - - - - + + + + + [not set] [nenastaveno] - - + + Invert button - - + + Toggle button Přepnout tlačítko - - + + Turbo button + + + + + Invert axis Převrátit osy - - - + + + Set threshold - - + + Choose a value between 0% and 100% - + Toggle axis - + Set gyro threshold - + Map Analog Stick Namapovat analogovou páčku - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Po stisknutí OK nejprve posuňte joystick horizontálně, poté vertikálně. Pro převrácení os nejprve posuňte joystick vertikálně, poté horizontálně. - + Center axis - - + + Deadzone: %1% Deadzone: %1% - - + + Modifier Range: %1% Rozsah modifikátoru: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Dual Joycons - + Left Joycon Levý Joycon - + Right Joycon Pravý Joycon - + Handheld V rukou - + GameCube Controller Ovladač GameCube - + Poke Ball Plus - + NES Controller - + SNES Controller - + N64 Controller - + Sega Genesis - + Start / Pause Start / Pause - + Z Z - + Control Stick Control Stick - + C-Stick C-Stick - + Shake! Shake! - + [waiting] [čekání] - + New Profile Nový profil - + Enter a profile name: Zadejte název profilu: - - + + Create Input Profile Vytvořit profil vstupu - + The given profile name is not valid! Zadaný název profilu není platný! - + Failed to create the input profile "%1" Nepodařilo se vytvořit profil vstupu "%1" - + Delete Input Profile Odstranit profil vstupu - + Failed to delete the input profile "%1" Nepodařilo se odstranit profil vstupu "%1" - + Load Input Profile Načíst profil vstupu - + Failed to load the input profile "%1" Nepodařilo se načíst profil vstupu "%1" - + Save Input Profile Uložit profil vstupu - + Failed to save the input profile "%1" Nepodařilo se uložit profil vstupu "%1" @@ -4551,912 +4572,933 @@ Táhněte body pro změnu pozice nebo dvojitě klikněte na buňky tabulky pro z - + Loading Web Applet... Načítání Web Appletu... - - + + Disable Web Applet Zakázat Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Počet aktuálně sestavovaných shaderů - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Aktuální emulační rychlost. Hodnoty vyšší než 100% indikují, že emulace běží rychleji nebo pomaleji než na Switchi. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Kolik snímků za sekundu aktuálně hra zobrazuje. Tohle závisí na hře od hry a scény od scény. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Čas potřebný na emulaci framu scény, nepočítá se limit nebo v-sync. Pro plnou rychlost by se tohle mělo pohybovat okolo 16.67 ms. - + &Clear Recent Files &Vymazat poslední soubory - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue &Pokračovat - + &Pause &Pauza - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Varování Zastaralý Formát Hry - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Používáte rozbalený formát hry, který je zastaralý a byl nahrazen jinými jako NCA, NAX, XCI, nebo NSP. Rozbalená ROM nemá ikony, metadata, a podporu updatů.<br><br>Pro vysvětlení všech možných podporovaných typů, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>zkoukni naší wiki</a>. Tato zpráva se nebude znova zobrazovat. - - + + Error while loading ROM! Chyba při načítání ROM! - + The ROM format is not supported. Tento formát ROM není podporován. - + An error occurred initializing the video core. Nastala chyba při inicializaci jádra videa. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Chyba při načítání ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Pro extrakci souborů postupujte podle <a href='https://yuzu-emu.org/help/quickstart/'>rychlého průvodce yuzu</a>. Nápovědu naleznete na <br>wiki</a> nebo na Discordu</a>. - + An unknown error occurred. Please see the log for more details. Nastala chyba. Koukni do logu. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Uložit data - + Mod Data Módovat Data - + Error Opening %1 Folder Chyba otevírání složky %1 - - + + Folder does not exist! Složka neexistuje! - + Error Opening Transferable Shader Cache Chyba při otevírání přenositelné mezipaměti shaderů - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Odebrat položku - - - - - - + + + + + + Successfully Removed Úspěšně odebráno - + Successfully removed the installed base game. Úspěšně odebrán nainstalovaný základ hry. - + The base game is not installed in the NAND and cannot be removed. Základ hry není nainstalovaný na NAND a nemůže být odstraněn. - + Successfully removed the installed update. Úspěšně odebrána nainstalovaná aktualizace. - + There is no update installed for this title. Není nainstalovaná žádná aktualizace pro tento titul. - + There are no DLC installed for this title. Není nainstalované žádné DLC pro tento titul. - + Successfully removed %1 installed DLC. Úspěšně odstraněno %1 nainstalovaných DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? Odstranit vlastní konfiguraci hry? - + Remove File Odstranit soubor - - + + Error Removing Transferable Shader Cache Chyba při odstraňování přenositelné mezipaměti shaderů - - + + A shader cache for this title does not exist. Mezipaměť shaderů pro tento titul neexistuje. - + Successfully removed the transferable shader cache. Přenositelná mezipaměť shaderů úspěšně odstraněna - + Failed to remove the transferable shader cache. Nepodařilo se odstranit přenositelnou mezipaměť shaderů - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Chyba při odstraňování vlastní konfigurace hry - + A custom configuration for this title does not exist. Vlastní konfigurace hry pro tento titul neexistuje. - + Successfully removed the custom game configuration. Úspěšně odstraněna vlastní konfigurace hry. - + Failed to remove the custom game configuration. Nepodařilo se odstranit vlastní konfiguraci hry. - - + + RomFS Extraction Failed! Extrakce RomFS se nepovedla! - + There was an error copying the RomFS files or the user cancelled the operation. Nastala chyba při kopírování RomFS souborů, nebo uživatel operaci zrušil. - + Full Plný - + Skeleton Kostra - + Select RomFS Dump Mode Vyber RomFS Dump Mode - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Vyber jak by si chtěl RomFS vypsat.<br>Plné zkopíruje úplně všechno, ale<br>kostra zkopíruje jen strukturu složky. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Extrahuji RomFS... - - + + Cancel Zrušit - + RomFS Extraction Succeeded! Extrakce RomFS se povedla! - + The operation completed successfully. Operace byla dokončena úspěšně. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Chyba při otevírání %1 - + Select Directory Vybraná Složka - + Properties Vlastnosti - + The game properties could not be loaded. Herní vlastnosti nemohly být načteny. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Executable (%1);;Všechny soubory (*.*) - + Load File Načíst soubor - + Open Extracted ROM Directory Otevřít složku s extrahovanou ROM - + Invalid Directory Selected Vybraná složka je neplatná - + The directory you have selected does not contain a 'main' file. Složka kterou jste vybrali neobsahuje soubor "main" - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Instalovatelný soubor pro Switch (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Instalovat Soubory - + %n file(s) remaining - + Installing file "%1"... Instalování souboru "%1"... - - + + Install Results Výsledek instalace - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Abychom předešli možným konfliktům, nedoporučujeme uživatelům instalovat základní hry na paměť NAND. Tuto funkci prosím používejte pouze k instalaci aktualizací a DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systémová Aplikace - + System Archive Systémový archív - + System Application Update Systémový Update Aplikace - + Firmware Package (Type A) Firmware-ový baliček (Typu A) - + Firmware Package (Type B) Firmware-ový baliček (Typu B) - + Game Hra - + Game Update Update Hry - + Game DLC Herní DLC - + Delta Title Delta Title - + Select NCA Install Type... Vyberte typ instalace NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Vyberte typ title-u, který chcete nainstalovat tenhle NCA jako: (Většinou základní "game" stačí.) - + Failed to Install Chyba v instalaci - + The title type you selected for the NCA is invalid. Tento typ pro tento NCA není platný. - + File not found Soubor nenalezen - + File "%1" not found Soubor "%1" nenalezen - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Chybí účet yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Pro přidání recenze kompatibility je třeba mít účet yuzu<br><br/>Pro nalinkování yuzu účtu jdi do Emulace &gt; Konfigurace &gt; Web. - + Error opening URL Chyba při otevírání URL - + Unable to open the URL "%1". Nelze otevřít URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected Zjištěno neplatné nastavení - + Handheld controller can't be used on docked mode. Pro controller will be selected. Ruční ovladač nelze používat v dokovacím režimu. Bude vybrán ovladač Pro Controller. - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Soubor Amiibo (%1);; Všechny Soubory (*.*) - + Load Amiibo Načíst Amiibo - + Error loading Amiibo data Chyba načítání Amiiba - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Pořídit Snímek Obrazovky - + PNG Image (*.png) PNG Image (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Rychlost: %1% / %2% - + Speed: %1% Rychlost: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Hra: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMÁLNÍ - + GPU HIGH GPU VYSOKÝ - + GPU EXTREME GPU EXTRÉMNÍ - + GPU ERROR GPU ERROR - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA - + SMAA - + + VOLUME: MUTE + + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + + + + Confirm Key Rederivation Potvďte Rederivaci Klíčů - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5473,37 +5515,37 @@ a udělejte si zálohu. Toto vymaže věechny vaše automaticky generované klíče a znova spustí modul derivace klíčů. - + Missing fuses Chybí Fuses - + - Missing BOOT0 - Chybí BOOT0 - + - Missing BCPKG2-1-Normal-Main - Chybí BCPKG2-1-Normal-Main - + - Missing PRODINFO - Chybí PRODINFO - + Derivation Components Missing Chybé odvozené komponenty - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5512,39 +5554,39 @@ Tohle může zabrat až minutu podle výkonu systému. - + Deriving Keys Derivuji Klíče - + Select RomFS Dump Target Vyberte Cíl vypsaní RomFS - + Please select which RomFS you would like to dump. Vyberte, kterou RomFS chcete vypsat. - + Are you sure you want to close yuzu? Jste si jist, že chcete zavřít yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Jste si jist, že chcete ukončit emulaci? Jakýkolic neuložený postup bude ztracen. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5556,44 +5598,44 @@ Opravdu si přejete ukončit tuto aplikaci? GRenderWindow - - + + OpenGL not available! OpenGL není k dispozici! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu nebylo sestaveno s OpenGL podporou. - - + + Error while initializing OpenGL! Chyba při inicializaci OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Vaše grafická karta pravděpodobně nepodporuje OpenGL nebo nejsou nainstalovány nejnovější ovladače. - + Error while initializing OpenGL 4.6! Chyba při inicializaci OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Vaše grafická karta pravděpodobně nepodporuje OpenGL 4.6 nebo nejsou nainstalovány nejnovější ovladače.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Vaše grafická karta pravděpodobně nepodporuje jedno nebo více rozšíření OpenGL. Ujistěte se prosím, že jsou nainstalovány nejnovější ovladače.<br><br>GL Renderer:<br>%1<br><br>Nepodporované rozšíření:<br>%2 @@ -5833,7 +5875,7 @@ Opravdu si přejete ukončit tuto aplikaci? GameListPlaceholder - + Double-click to add a new folder to the game list Dvojitým kliknutím přidáte novou složku do seznamu her @@ -6177,51 +6219,56 @@ Debug Message: + Hide Empty Rooms + + + + Hide Full Rooms - + Refresh Lobby - + Password Required to Join - + Password: - + Players Hráči - + Room Name - + Preferred Game - + Host - + Refreshing - + Refresh List @@ -6828,7 +6875,7 @@ p, li { white-space: pre-wrap; } - + [not set] [Nenastaveno] @@ -6843,10 +6890,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Osa %1%2 @@ -6860,9 +6907,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [Neznámá] @@ -7027,15 +7074,13 @@ p, li { white-space: pre-wrap; } - + [invalid] - - %1%2Hat %3 @@ -7043,35 +7088,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 - + %1%2Axis %3,%4,%5 - + %1%2Motion %3 - - %1%2Button %3 - + [unused] [nepoužito] @@ -7158,8 +7201,20 @@ p, li { white-space: pre-wrap; } - - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 diff --git a/dist/languages/da.ts b/dist/languages/da.ts index b88b1b756..537a3afe8 100644 --- a/dist/languages/da.ts +++ b/dist/languages/da.ts @@ -1729,76 +1729,86 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Aktiverer asynkron shader-kompilering, hvilket kan reducere shader-stammen. Denne funktion er eksperimentiel. - + Use asynchronous shader building (Hack) Brug asynkron shader-opbygning (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Aktiverer Hurtig GPU-Tid. Denne valgmulighed vil tvinge de fleste spil, til at køre i deres højeste indbyggede opløsning. - + Use Fast GPU Time (Hack) Brug Hurtig GPU-Tid (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Use pessimistic buffer flushes (Hack) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache - + Anisotropic Filtering: Anisotropisk Filtrering: - + Automatic - + Default Standard - + 2x - + 4x - + 8x - + 16x @@ -2186,7 +2196,7 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + Configure Konfigurér @@ -2213,6 +2223,7 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. + Requires restarting yuzu Kræver genstart af yuzu @@ -2237,22 +2248,27 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + Enable mouse panning Aktivér kig med mus - + Mouse sensitivity Mus-følsomhed - + % % - + Motion / Touch Bevægelse / Berøring @@ -2364,7 +2380,7 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + Left Stick Venstre Styrepind @@ -2458,14 +2474,14 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + L L - + ZL ZL @@ -2484,7 +2500,7 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + Plus Plus @@ -2497,15 +2513,15 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + R R - + ZR ZR @@ -2562,236 +2578,241 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + Right Stick Højre Styrepind - - - - + + + + Clear Ryd - - - - - + + + + + [not set] [ikke indstillet] - - + + Invert button - - + + Toggle button Funktionsskifteknap - - + + Turbo button + + + + + Invert axis Omvend akser - - - + + + Set threshold Angiv tærskel - - + + Choose a value between 0% and 100% Vælg en værdi imellem 0% og 100% - + Toggle axis - + Set gyro threshold - + Map Analog Stick Tilsted Analog Pind - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Bevæg, efter tryk på OK, først din styrepind vandret og så lodret. Bevæg, for at omvende akserne, først din styrepind lodret og så vandret. - + Center axis - - + + Deadzone: %1% Dødzone: %1% - - + + Modifier Range: %1% Forandringsrækkevidde: %1% - - + + Pro Controller Pro-Styringsenhed - + Dual Joycons Dobbelt-Joycon - + Left Joycon Venstre Joycon - + Right Joycon Højre Joycon - + Handheld Håndholdt - + GameCube Controller GameCube-Styringsenhed - + Poke Ball Plus - + NES Controller - + SNES Controller - + N64 Controller - + Sega Genesis - + Start / Pause Start / Pause - + Z Z - + Control Stick Styrepind - + C-Stick C-Pind - + Shake! Ryst! - + [waiting] [venter] - + New Profile Ny Profil - + Enter a profile name: Indtast et profilnavn: - - + + Create Input Profile Opret Input-Profil - + The given profile name is not valid! Det angivne profilnavn er ikke gyldigt! - + Failed to create the input profile "%1" Oprettelse af input-profil "%1" mislykkedes - + Delete Input Profile Slet Input-Profil - + Failed to delete the input profile "%1" Sletning af input-profil "%1" mislykkedes - + Load Input Profile Indlæs Input-Profil - + Failed to load the input profile "%1" Indlæsning af input-profil "%1" mislykkedes - + Save Input Profile Gem Input-Profil - + Failed to save the input profile "%1" Lagring af input-profil "%1" mislykkedes @@ -4567,910 +4588,931 @@ Træk punkter, for at skifte position, eller dobbeltklik i tabelceller, for at r - + Loading Web Applet... Indlæser Net-Applet... - - + + Disable Web Applet Deaktivér Net-Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Aktuel emuleringshastighed. Værdier højere eller lavere end 100% indikerer, at emulering kører hurtigere eller langsommere end en Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. - + &Clear Recent Files - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue - + &Pause - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Advarsel, Forældet Spilformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. - - + + Error while loading ROM! Fejl under indlæsning af ROM! - + The ROM format is not supported. ROM-formatet understøttes ikke. - + An error occurred initializing the video core. Der skete en fejl under initialisering af video-kerne. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. - + (64-bit) - + (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit - + Closing software... - + Save Data - + Mod Data - + Error Opening %1 Folder Fejl ved Åbning af %1 Mappe - - + + Folder does not exist! Mappe eksisterer ikke! - + Error Opening Transferable Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + Remove File - - + + Error Removing Transferable Shader Cache - - + + A shader cache for this title does not exist. - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! RomFS-Udpakning Mislykkedes! - + There was an error copying the RomFS files or the user cancelled the operation. Der skete en fejl ved kopiering af RomFS-filerne, eller brugeren afbrød opgaven. - + Full Fuld - + Skeleton Skelet - + Select RomFS Dump Mode Vælg RomFS-Nedfældelsestilstand - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Udpakker RomFS... - - + + Cancel Afbryd - + RomFS Extraction Succeeded! RomFS-Udpakning Lykkedes! - + The operation completed successfully. Fuldførelse af opgaven lykkedes. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Fejl ved Åbning af %1 - + Select Directory Vælg Mappe - + Properties Egenskaber - + The game properties could not be loaded. Spil-egenskaberne kunne ikke indlæses. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch-Eksekverbar (%1);;Alle filer (*.*) - + Load File Indlæs Fil - + Open Extracted ROM Directory Åbn Udpakket ROM-Mappe - + Invalid Directory Selected Ugyldig Mappe Valgt - + The directory you have selected does not contain a 'main' file. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files - + %n file(s) remaining - + Installing file "%1"... Installér fil "%1"... - - + + Install Results - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systemapplikation - + System Archive Systemarkiv - + System Application Update Systemapplikationsopdatering - + Firmware Package (Type A) Firmwarepakke (Type A) - + Firmware Package (Type B) Firmwarepakke (Type B) - + Game Spil - + Game Update Spilopdatering - + Game DLC Spiludvidelse - + Delta Title Delta-Titel - + Select NCA Install Type... Vælg NCA-Installationstype... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) - + Failed to Install Installation mislykkedes - + The title type you selected for the NCA is invalid. - + File not found Fil ikke fundet - + File "%1" not found Fil "%1" ikke fundet - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Manglende yuzu-Konto - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. - + Error opening URL - + Unable to open the URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo-Fil (%1);; Alle Filer (*.*) - + Load Amiibo Indlæs Amiibo - + Error loading Amiibo data Fejl ved indlæsning af Amiibo-data - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Optag Skærmbillede - + PNG Image (*.png) PNG-Billede (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Hastighed: %1% / %2% - + Speed: %1% Hastighed: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Spil: %1 FPS - + Frame: %1 ms Billede: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL - + VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA FXAA - + SMAA - + + VOLUME: MUTE + + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + + + + Confirm Key Rederivation - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5481,76 +5523,76 @@ This will delete your autogenerated key files and re-run the key derivation modu - + Missing fuses - + - Missing BOOT0 - + - Missing BCPKG2-1-Normal-Main - + - Missing PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. - + Deriving Keys - + Select RomFS Dump Target - + Please select which RomFS you would like to dump. - + Are you sure you want to close yuzu? Er du sikker på, at du vil lukke yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Er du sikker på, at du vil stoppe emulereingen? Enhver ulagret data, vil gå tabt. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5560,44 +5602,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. - - + + Error while initializing OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. - + Error while initializing OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 @@ -5837,7 +5879,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list @@ -6181,51 +6223,56 @@ Debug Message: + Hide Empty Rooms + + + + Hide Full Rooms - + Refresh Lobby - + Password Required to Join - + Password: - + Players Spillere - + Room Name - + Preferred Game - + Host - + Refreshing - + Refresh List @@ -6828,7 +6875,7 @@ p, li { white-space: pre-wrap; } - + [not set] [ikke indstillet] @@ -6843,10 +6890,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Akse %1%2 @@ -6860,9 +6907,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [ukendt] @@ -7027,15 +7074,13 @@ p, li { white-space: pre-wrap; } - + [invalid] - - %1%2Hat %3 @@ -7043,35 +7088,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 - + %1%2Axis %3,%4,%5 - + %1%2Motion %3 - - %1%2Button %3 - + [unused] [ubrugt] @@ -7158,8 +7201,20 @@ p, li { white-space: pre-wrap; } - - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 diff --git a/dist/languages/de.ts b/dist/languages/de.ts index 6e4468f6f..f66024779 100644 --- a/dist/languages/de.ts +++ b/dist/languages/de.ts @@ -1709,76 +1709,86 @@ This would ban both their forum username and their IP address. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Nutze asynchrone Shader-Kompilierung. Dies kann Stottern durch Shader reduzieren. Dieses Feature ist experimentell. - + Use asynchronous shader building (Hack) Aktiviere asynchrones Shader Kompilieren. (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Use Fast GPU Time (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Use pessimistic buffer flushes (Hack) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache Vulkan-Pipeline-Cache verwernden - + Anisotropic Filtering: Anisotrope Filterung: - + Automatic Automatisch - + Default Standard - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2166,7 +2176,7 @@ This would ban both their forum username and their IP address. - + Configure Konfigurieren @@ -2193,6 +2203,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu Erfordet Neustart von yuzu @@ -2217,22 +2228,27 @@ This would ban both their forum username and their IP address. - + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + Enable mouse panning Maus-Panning aktivieren - + Mouse sensitivity Maus-Empfindlichkeit - + % % - + Motion / Touch Bewegung / Touch @@ -2344,7 +2360,7 @@ This would ban both their forum username and their IP address. - + Left Stick Linker Analogstick @@ -2438,14 +2454,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2464,7 +2480,7 @@ This would ban both their forum username and their IP address. - + Plus Plus @@ -2477,15 +2493,15 @@ This would ban both their forum username and their IP address. - + R R - + ZR ZR @@ -2542,236 +2558,241 @@ This would ban both their forum username and their IP address. - + Right Stick Rechter Analogstick - - - - + + + + Clear Löschen - - - - - + + + + + [not set] [nicht belegt] - - + + Invert button Knopf invertieren - - + + Toggle button Taste umschalten - - + + Turbo button + + + + + Invert axis Achsen umkehren - - - + + + Set threshold - - + + Choose a value between 0% and 100% Wert zwischen 0% und 100% wählen - + Toggle axis - + Set gyro threshold - + Map Analog Stick Analog-Stick festlegen - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Nach dem Drücken von OK den Joystick zuerst horizontal, dann vertikal bewegen. Um die Achsen umzukehren, bewege den Joystick zuerst vertikal und dann horizontal. - + Center axis Achse zentrieren - - + + Deadzone: %1% Deadzone: %1% - - + + Modifier Range: %1% Modifikator-Radius: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Zwei Joycons - + Left Joycon Linker Joycon - + Right Joycon Rechter Joycon - + Handheld Handheld - + GameCube Controller GameCube-Controller - + Poke Ball Plus Poke-Ball Plus - + NES Controller NES Controller - + SNES Controller SNES Controller - + N64 Controller N64 Controller - + Sega Genesis Sega Genesis - + Start / Pause Start / Pause - + Z Z - + Control Stick Analog Stick - + C-Stick C-Stick - + Shake! Schütteln! - + [waiting] [wartet] - + New Profile Neues Profil - + Enter a profile name: Profilnamen eingeben: - - + + Create Input Profile Eingabeprofil erstellen - + The given profile name is not valid! Angegebener Profilname ist nicht gültig! - + Failed to create the input profile "%1" Erstellen des Eingabeprofils "%1" ist fehlgeschlagen - + Delete Input Profile Eingabeprofil löschen - + Failed to delete the input profile "%1" Löschen des Eingabeprofils "%1" ist fehlgeschlagen - + Load Input Profile Eingabeprofil laden - + Failed to load the input profile "%1" Laden des Eingabeprofils "%1" ist fehlgeschlagen - + Save Input Profile Eingabeprofil speichern - + Failed to save the input profile "%1" Speichern des Eingabeprofils "%1" ist fehlgeschlagen @@ -4547,524 +4568,534 @@ Ziehe die Punkte mit deiner Maus, um ihre Position zu ändern. Doppelklicke auf - + Loading Web Applet... Lade Web-Applet... - - + + Disable Web Applet Deaktiviere die Web Applikation - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Wie viele Shader im Moment kompiliert werden - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Derzeitige Emulations-Geschwindigkeit. Werte höher oder niedriger als 100% zeigen, dass die Emulation scheller oder langsamer läuft als auf einer Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Wie viele Bilder pro Sekunde angezeigt werden variiert von Spiel zu Spiel und von Szene zu Szene. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Zeit, die gebraucht wurde, um einen Switch-Frame zu emulieren, ohne Framelimit oder V-Sync. Für eine Emulation bei voller Geschwindigkeit sollte dieser Wert bei höchstens 16.67ms liegen. - + &Clear Recent Files &Zuletzt geladene Dateien leeren - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue &Fortsetzen - + &Pause &Pause - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu betreibt ein Speil - + Warning Outdated Game Format Warnung veraltetes Spielformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Du nutzt eine entpackte ROM-Ordnerstruktur für dieses Spiel, welches ein veraltetes Format ist und von anderen Formaten wie NCA, NAX, XCI oder NSP überholt wurde. Entpackte ROM-Ordner unterstützen keine Icons, Metadaten oder Updates.<br><br><a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Unser Wiki</a> enthält eine Erklärung der verschiedenen Formate, die yuzu unterstützt. Diese Nachricht wird nicht noch einmal angezeigt. - - + + Error while loading ROM! ROM konnte nicht geladen werden! - + The ROM format is not supported. ROM-Format wird nicht unterstützt. - + An error occurred initializing the video core. Beim Initialisieren des Video-Kerns ist ein Fehler aufgetreten. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. ROM konnte nicht geladen werden! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Bitte folge der <a href='https://yuzu-emu.org/help/quickstart/'>yuzu-Schnellstart-Anleitung</a> um deine Dateien zu extrahieren.<br>Hilfe findest du im yuzu-Wiki</a> oder dem yuzu-Discord</a>. - + An unknown error occurred. Please see the log for more details. Ein unbekannter Fehler ist aufgetreten. Bitte prüfe die Log-Dateien auf mögliche Fehlermeldungen. - + (64-bit) (64-Bit) - + (32-bit) (32-Bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Schließe Software... - + Save Data Speicherdaten - + Mod Data Mod-Daten - + Error Opening %1 Folder Konnte Verzeichnis %1 nicht öffnen - - + + Folder does not exist! Verzeichnis existiert nicht! - + Error Opening Transferable Shader Cache Fehler beim Öffnen des transferierbaren Shader-Caches - + Failed to create the shader cache directory for this title. Fehler beim erstellen des Shader-Cache-Ordner für den ausgewählten Titel. - + Error Removing Contents - + Error Removing Update Fehler beim Entfernen des Updates - + Error Removing DLC Fehler beim Entfernen des DLCs - + Remove Installed Game Contents? Installierten Spiele-Content entfernen? - + Remove Installed Game Update? Installierte Spiele-Updates entfernen? - + Remove Installed Game DLC? Installierte Spiele-DLCs entfernen? - + Remove Entry Eintrag entfernen - - - - - - + + + + + + Successfully Removed Erfolgreich entfernt - + Successfully removed the installed base game. Das Spiel wurde entfernt. - + The base game is not installed in the NAND and cannot be removed. Das Spiel ist nicht im NAND installiert und kann somit nicht entfernt werden. - + Successfully removed the installed update. Das Update wurde entfernt. - + There is no update installed for this title. Es ist kein Update für diesen Titel installiert. - + There are no DLC installed for this title. Es sind keine DLC für diesen Titel installiert. - + Successfully removed %1 installed DLC. %1 DLC entfernt. - + Delete OpenGL Transferable Shader Cache? Transferierbaren OpenGL Shader Cache löschen? - + Delete Vulkan Transferable Shader Cache? Transferierbaren Vulkan Shader Cache löschen? - + Delete All Transferable Shader Caches? Alle transferierbaren Shader Caches löschen? - + Remove Custom Game Configuration? Spiel-Einstellungen entfernen? - + Remove File Datei entfernen - - + + Error Removing Transferable Shader Cache Fehler beim Entfernen - - + + A shader cache for this title does not exist. Es existiert kein Shader-Cache für diesen Titel. - + Successfully removed the transferable shader cache. Der transferierbare Shader-Cache wurde entfernt. - + Failed to remove the transferable shader cache. Konnte den transferierbaren Shader-Cache nicht entfernen. - + Error Removing Vulkan Driver Pipeline Cache Fehler beim Entfernen des Vulkan-Pipeline-Cache - + Failed to remove the driver pipeline cache. Fehler beim Entfernen des Driver-Pipeline-Cache - - + + Error Removing Transferable Shader Caches Fehler beim Entfernen der transferierbaren Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Fehler beim Entfernen - + A custom configuration for this title does not exist. Es existieren keine Spiel-Einstellungen für dieses Spiel. - + Successfully removed the custom game configuration. Die Spiel-Einstellungen wurden entfernt. - + Failed to remove the custom game configuration. Die Spiel-Einstellungen konnten nicht entfernt werden. - - + + RomFS Extraction Failed! RomFS-Extraktion fehlgeschlagen! - + There was an error copying the RomFS files or the user cancelled the operation. Das RomFS konnte wegen eines Fehlers oder Abbruchs nicht kopiert werden. - + Full Komplett - + Skeleton Nur Ordnerstruktur - + Select RomFS Dump Mode RomFS Extraktions-Modus auswählen - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Bitte wähle, wie das RomFS gespeichert werden soll.<br>"Full" wird alle Dateien des Spiels extrahieren, während <br>"Skeleton" nur die Ordnerstruktur erstellt. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Es ist nicht genügend Speicher (%1) vorhanden um das RomFS zu entpacken. Bitte sorge für genügend Speicherplatze oder wähle ein anderes Verzeichnis aus. (Emulation > Konfiguration > System > Dateisystem > Dump Root) - + Extracting RomFS... RomFS wird extrahiert... - - + + Cancel Abbrechen - + RomFS Extraction Succeeded! RomFS wurde extrahiert! - + The operation completed successfully. Der Vorgang wurde erfolgreich abgeschlossen. - - - - - + + + + + Create Shortcut Verknüpfung erstellen - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon Icon erstellen - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Fehler beim Öffnen von %1 - + Select Directory Verzeichnis auswählen - + Properties Einstellungen - + The game properties could not be loaded. Spiel-Einstellungen konnten nicht geladen werden. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch-Programme (%1);;Alle Dateien (*.*) - + Load File Datei laden - + Open Extracted ROM Directory Öffne das extrahierte ROM-Verzeichnis - + Invalid Directory Selected Ungültiges Verzeichnis ausgewählt - + The directory you have selected does not contain a 'main' file. Das Verzeichnis, das du ausgewählt hast, enthält keine 'main'-Datei. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Installierbares Switch-Programm (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submissions Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Dateien installieren - + %n file(s) remaining %n Datei verbleibend%n Dateien verbleibend - + Installing file "%1"... Datei "%1" wird installiert... - - + + Install Results NAND-Installation - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Um Konflikte zu vermeiden, raten wir Nutzern davon ab, Spiele im NAND zu installieren. Bitte nutze diese Funktion nur zum Installieren von Updates und DLC. - + %n file(s) were newly installed %n file was newly installed @@ -5072,389 +5103,400 @@ Bitte nutze diese Funktion nur zum Installieren von Updates und DLC. - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systemanwendung - + System Archive Systemarchiv - + System Application Update Systemanwendungsupdate - + Firmware Package (Type A) Firmware-Paket (Typ A) - + Firmware Package (Type B) Firmware-Paket (Typ B) - + Game Spiel - + Game Update Spiel-Update - + Game DLC Spiel-DLC - + Delta Title Delta-Titel - + Select NCA Install Type... Wähle den NCA-Installationstyp aus... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Bitte wähle, als was diese NCA installiert werden soll: (In den meisten Fällen sollte die Standardeinstellung 'Spiel' ausreichen.) - + Failed to Install Installation fehlgeschlagen - + The title type you selected for the NCA is invalid. Der Titel-Typ, den du für diese NCA ausgewählt hast, ist ungültig. - + File not found Datei nicht gefunden - + File "%1" not found Datei "%1" nicht gefunden - + OK OK - - + + Hardware requirements not met Hardwareanforderungen nicht erfüllt - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Fehlender yuzu-Account - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Um einen Kompatibilitätsbericht abzuschicken, musst du einen yuzu-Account mit yuzu verbinden.<br><br/>Um einen yuzu-Account zu verbinden, prüfe die Einstellungen unter Emulation &gt; Konfiguration &gt; Web. - + Error opening URL Fehler beim Öffnen der URL - + Unable to open the URL "%1". URL "%1" kann nicht geöffnet werden. - + TAS Recording TAS Aufnahme - + Overwrite file of player 1? Datei von Spieler 1 überschreiben? - + Invalid config detected Ungültige Konfiguration erkannt - + Handheld controller can't be used on docked mode. Pro controller will be selected. Handheld-Controller können nicht im Dock verwendet werden. Der Pro-Controller wird verwendet. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Das aktuelle Amiibo wurde entfernt - + Error Fehler - - + + The current game is not looking for amiibos Das aktuelle Spiel sucht nicht nach Amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo-Datei (%1);; Alle Dateien (*.*) - + Load Amiibo Amiibo laden - + Error loading Amiibo data Fehler beim Laden der Amiibo-Daten - + The selected file is not a valid amiibo Die ausgewählte Datei ist keine gültige Amiibo - + The selected file is already on use Die ausgewählte Datei wird bereits verwendet - + An unknown error occurred Ein unbekannter Fehler ist aufgetreten - + Capture Screenshot Screenshot aufnehmen - + PNG Image (*.png) PNG Bild (*.png) - + TAS state: Running %1/%2 TAS Zustand: Läuft %1/%2 - + TAS state: Recording %1 TAS Zustand: Aufnahme %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid TAS Zustand: Ungültig - + &Stop Running - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Skalierung: %1x - + Speed: %1% / %2% Geschwindigkeit: %1% / %2% - + Speed: %1% Geschwindigkeit: %1% - + Game: %1 FPS (Unlocked) Spiel: %1 FPS (Unbegrenzt) - + Game: %1 FPS Spiel: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HOCH - + GPU EXTREME GPU EXTREM - + GPU ERROR GPU FEHLER - + DOCKED DOCKED - + HANDHELD HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST NÄCHSTER - - + + BILINEAR BILINEAR - + BICUBIC BIKUBISCH - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA KEIN AA - + FXAA FXAA - + SMAA SMAA - + + VOLUME: MUTE + LAUTSTÄRKE: STUMM + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + LAUTSTÄRKE: %1% + + + Confirm Key Rederivation Schlüsselableitung bestätigen - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5467,37 +5509,37 @@ This will delete your autogenerated key files and re-run the key derivation modu Dieser Prozess wird die generierten Schlüsseldateien löschen und die Schlüsselableitung neu starten. - + Missing fuses Fuses fehlen - + - Missing BOOT0 - BOOT0 fehlt - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main fehlt - + - Missing PRODINFO - PRODINFO fehlt - + Derivation Components Missing Derivationskomponenten fehlen - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5505,39 +5547,39 @@ on your system's performance. Dies könnte, je nach Leistung deines Systems, bis zu einer Minute dauern. - + Deriving Keys Schlüsselableitung - + Select RomFS Dump Target RomFS wählen - + Please select which RomFS you would like to dump. Wähle, welches RomFS du speichern möchtest. - + Are you sure you want to close yuzu? Bist du sicher, dass du yuzu beenden willst? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Bist du sicher, dass du die Emulation stoppen willst? Jeder nicht gespeicherte Fortschritt geht verloren. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5549,44 +5591,44 @@ Möchtest du dies umgehen und sie trotzdem beenden? GRenderWindow - - + + OpenGL not available! OpenGL nicht verfügbar! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu wurde nicht mit OpenGL-Unterstützung kompiliert. - - + + Error while initializing OpenGL! Fehler beim Initialisieren von OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Deine Grafikkarte unterstützt kein OpenGL oder du hast nicht den neusten Treiber installiert. - + Error while initializing OpenGL 4.6! Fehler beim Initialisieren von OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Deine Grafikkarte unterstützt OpenGL 4.6 nicht, oder du benutzt nicht die neuste Treiberversion.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Deine Grafikkarte unterstützt anscheinend nicht eine oder mehrere von yuzu benötigten OpenGL-Erweiterungen. Bitte stelle sicher, dass du den neusten Grafiktreiber installiert hast.<br><br>GL Renderer:<br>%1<br><br>Nicht unterstützte Erweiterungen:<br>%2 @@ -5826,7 +5868,7 @@ Möchtest du dies umgehen und sie trotzdem beenden? GameListPlaceholder - + Double-click to add a new folder to the game list Doppelklicke, um einen neuen Ordner zur Spieleliste hinzuzufügen. @@ -6170,51 +6212,56 @@ Debug Message: + Hide Empty Rooms + + + + Hide Full Rooms Volle Räume verbergen - + Refresh Lobby Lobby aktualisieren - + Password Required to Join Passwort zum Joinen benötigt - + Password: Passwort: - + Players Spieler - + Room Name Raumname - + Preferred Game Bevorzugtes Spiel - + Host Host - + Refreshing Aktualisiere - + Refresh List Liste aktualisieren @@ -6822,7 +6869,7 @@ p, li { white-space: pre-wrap; } - + [not set] [nicht gesetzt] @@ -6837,10 +6884,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Achse %1%2 @@ -6854,9 +6901,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [unbekannt] @@ -7021,15 +7068,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [ungültig] - - %1%2Hat %3 @@ -7037,35 +7082,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2Achse %3 - + %1%2Axis %3,%4,%5 %1%2Achse %3,%4,%5 - + %1%2Motion %3 %1%2Bewegung %3 - - %1%2Button %3 %1%2Knopf %3 - + [unused] [unbenutzt] @@ -7152,9 +7195,21 @@ p, li { white-space: pre-wrap; } Extra - - %1%2%3 - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 + diff --git a/dist/languages/el.ts b/dist/languages/el.ts index f6673c345..ccd52f76c 100644 --- a/dist/languages/el.ts +++ b/dist/languages/el.ts @@ -1713,76 +1713,86 @@ This would ban both their forum username and their IP address. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Ενεργοποιεί τη σύνταξη ασύγχρονων shader, η οποία μπορεί να μειώσει το shader stutter. Αυτή η δυνατότητα είναι πειραματική. - + Use asynchronous shader building (Hack) Χρήση ασύγχρονης σύνταξης σκίασης (Τέχνασμα) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Ενεργοποιεί τον Γοργό Ρυθμό GPU. Αυτή η επιλογή θα αναγκάσει τα περισσότερα παιχνίδια να εκτελούνται στην υψηλότερη εγγενή τους ανάλυση. - + Use Fast GPU Time (Hack) Χρήση Γοργού Ρυθμού GPU (Τέχνασμα) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. Ενεργοποιεί περιστασιακές εκκαθαρίσεις των ρυθμιστικών διαύλων. Αυτή η επιλογή θα αναγκάσει τους μη τροποποιημένους ρυθμιστικούς διαύλους να εκκαθαριστούν, πράγμα που μπορεί να κοστίσει σε απόδοση. - + Use pessimistic buffer flushes (Hack) Χρήση περιστασιακών εκκαθαρίσεων ρυθμιστικού διαύλου (Hack) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache - + Anisotropic Filtering: Ανισοτροπικό Φιλτράρισμα: - + Automatic Αυτόματα - + Default Προεπιλεγμένο - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2170,7 +2180,7 @@ This would ban both their forum username and their IP address. - + Configure Διαμόρφωση @@ -2197,6 +2207,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu Απαιτεί επανεκκίνηση του yuzu @@ -2221,22 +2232,27 @@ This would ban both their forum username and their IP address. - + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + Enable mouse panning Ενεργοποιήστε τη μετατόπιση του ποντικιού - + Mouse sensitivity Ευαισθησία ποντικιού - + % % - + Motion / Touch @@ -2348,7 +2364,7 @@ This would ban both their forum username and their IP address. - + Left Stick Αριστερό Stick @@ -2442,14 +2458,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2468,7 +2484,7 @@ This would ban both their forum username and their IP address. - + Plus Συν @@ -2481,15 +2497,15 @@ This would ban both their forum username and their IP address. - + R R - + ZR ZR @@ -2546,236 +2562,241 @@ This would ban both their forum username and their IP address. - + Right Stick Δεξιός Μοχλός - - - - + + + + Clear Καθαρισμός - - - - - + + + + + [not set] [άδειο] - - + + Invert button Κουμπί αντιστροφής - - + + Toggle button Κουμπί εναλλαγής - - + + Turbo button + + + + + Invert axis Αντιστροφή άξονα - - - + + + Set threshold Ορισμός ορίου - - + + Choose a value between 0% and 100% Επιλέξτε μια τιμή μεταξύ 0% και 100% - + Toggle axis Εναλλαγή αξόνων - + Set gyro threshold Ρύθμιση κατωφλίου γυροσκοπίου - + Map Analog Stick Χαρτογράφηση Αναλογικού Stick - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Αφού πατήσετε OK, μετακινήστε πρώτα το joystick σας οριζόντια και μετά κατακόρυφα. Για να αντιστρέψετε τους άξονες, μετακινήστε πρώτα το joystick κατακόρυφα και μετά οριζόντια. - + Center axis Κεντρικός άξονας - - + + Deadzone: %1% Νεκρή Ζώνη: %1% - - + + Modifier Range: %1% Εύρος Τροποποιητή: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Διπλά Joycons - + Left Joycon Αριστερό Joycon - + Right Joycon Δεξί Joycon - + Handheld Handheld - + GameCube Controller Χειριστήριο GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Χειριστήριο NES - + SNES Controller Χειριστήριο SNES - + N64 Controller Χειριστήριο N64 - + Sega Genesis Sega Genesis - + Start / Pause - + Z Z - + Control Stick - + C-Stick C-Stick - + Shake! - + [waiting] [αναμονή] - + New Profile Νέο Προφίλ - + Enter a profile name: Εισαγάγετε ένα όνομα προφίλ: - - + + Create Input Profile Δημιουργία Προφίλ Χειρισμού - + The given profile name is not valid! Το όνομα του προφίλ δεν είναι έγκυρο! - + Failed to create the input profile "%1" Η δημιουργία του προφίλ χειρισμού "%1" απέτυχε - + Delete Input Profile Διαγραφή Προφίλ Χειρισμού - + Failed to delete the input profile "%1" Η διαγραφή του προφίλ χειρισμού "%1" απέτυχε - + Load Input Profile Φόρτωση Προφίλ Χειρισμού - + Failed to load the input profile "%1" Η φόρτωση του προφίλ χειρισμού "%1" απέτυχε - + Save Input Profile Αποθήκευση Προφίλ Χειρισμού - + Failed to save the input profile "%1" Η αποθήκευση του προφίλ χειρισμού "%1" απέτυχε @@ -4550,75 +4571,85 @@ Drag points to change position, or double-click table cells to edit values. - + Loading Web Applet... - - + + Disable Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Πόσα καρέ ανά δευτερόλεπτο εμφανίζει το παιχνίδι αυτή τη στιγμή. Αυτό διαφέρει από παιχνίδι σε παιχνίδι και από σκηνή σε σκηνή. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. - + &Clear Recent Files - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue &Συνέχεια - + &Pause &Παύση - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Μη μεταφρασμένη συμβολοσειρά @@ -4626,839 +4657,850 @@ Drag points to change position, or double-click table cells to edit values. - - + + Error while loading ROM! Σφάλμα κατά τη φόρτωση της ROM! - + The ROM format is not supported. - + An error occurred initializing the video core. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Εμφανίστηκε ένα απροσδιόριστο σφάλμα. Ανατρέξτε στο αρχείο καταγραφής για περισσότερες λεπτομέρειες. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Αποθήκευση δεδομένων - + Mod Data - + Error Opening %1 Folder - - + + Folder does not exist! Ο φάκελος δεν υπάρχει! - + Error Opening Transferable Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + Remove File Αφαίρεση Αρχείου - - + + Error Removing Transferable Shader Cache - - + + A shader cache for this title does not exist. - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! - + There was an error copying the RomFS files or the user cancelled the operation. - + Full - + Skeleton - + Select RomFS Dump Mode Επιλογή λειτουργίας απόρριψης RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Μη αποθηκευμένη μετάφραση. Παρακαλούμε επιλέξτε τον τρόπο με τον οποίο θα θέλατε να γίνει η απόρριψη της RomFS.<br> Η επιλογή Πλήρης θα αντιγράψει όλα τα αρχεία στο νέο κατάλογο, ενώ η επιλογή <br> Σκελετός θα δημιουργήσει μόνο τη δομή του καταλόγου. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... - - + + Cancel Ακύρωση - + RomFS Extraction Succeeded! - + The operation completed successfully. Η επέμβαση ολοκληρώθηκε με επιτυχία. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 - + Select Directory Επιλογή καταλόγου - + Properties Ιδιότητες - + The game properties could not be loaded. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. - + Load File Φόρτωση αρχείου - + Open Extracted ROM Directory - + Invalid Directory Selected - + The directory you have selected does not contain a 'main' file. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files - + %n file(s) remaining - + Installing file "%1"... - - + + Install Results Αποτελέσματα εγκατάστασης - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Εφαρμογή συστήματος - + System Archive - + System Application Update - + Firmware Package (Type A) - + Firmware Package (Type B) - + Game Παιχνίδι - + Game Update Ενημέρωση παιχνιδιού - + Game DLC DLC παιχνιδιού - + Delta Title - + Select NCA Install Type... Επιλέξτε τον τύπο εγκατάστασης NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) - + Failed to Install - + The title type you selected for the NCA is invalid. - + File not found Το αρχείο δεν βρέθηκε - + File "%1" not found Το αρχείο "%1" δεν βρέθηκε - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. - + Error opening URL Σφάλμα κατα το άνοιγμα του URL - + Unable to open the URL "%1". Αδυναμία ανοίγματος του URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo Amiibo - - + + The current amiibo has been removed - + Error Σφάλμα - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) - + Load Amiibo Φόρτωση Amiibo - + Error loading Amiibo data Σφάλμα φόρτωσης δεδομένων Amiibo - + The selected file is not a valid amiibo Το επιλεγμένο αρχείο δεν αποτελεί έγκυρο amiibo - + The selected file is already on use Το επιλεγμένο αρχείο χρησιμοποιείται ήδη - + An unknown error occurred - + Capture Screenshot Λήψη στιγμιότυπου οθόνης - + PNG Image (*.png) Εικόνα PBG (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Έναρξη - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Κλίμακα: %1x - + Speed: %1% / %2% Ταχύτητα: %1% / %2% - + Speed: %1% Ταχύτητα: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS - + Frame: %1 ms Καρέ: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR FSR - - + + NO AA - + FXAA FXAA - + SMAA SMAA - + + VOLUME: MUTE + + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + + + + Confirm Key Rederivation - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5469,76 +5511,76 @@ This will delete your autogenerated key files and re-run the key derivation modu - + Missing fuses - + - Missing BOOT0 - Λείπει το BOOT0 - + - Missing BCPKG2-1-Normal-Main - Λείπει το BCPKG2-1-Normal-Main - + - Missing PRODINFO - Λείπει το PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. - + Deriving Keys - + Select RomFS Dump Target - + Please select which RomFS you would like to dump. - + Are you sure you want to close yuzu? Είστε σίγουροι ότι θέλετε να κλείσετε το yuzu; - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5548,44 +5590,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! Το OpenGL δεν είναι διαθέσιμο! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. - - + + Error while initializing OpenGL! Σφάλμα κατα την αρχικοποίηση του OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. - + Error while initializing OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 @@ -5825,7 +5867,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list Διπλο-κλικ για προσθήκη νεου φακέλου στη λίστα παιχνιδιών @@ -6169,51 +6211,56 @@ Debug Message: + Hide Empty Rooms + + + + Hide Full Rooms - + Refresh Lobby - + Password Required to Join - + Password: - + Players - + Room Name - + Preferred Game - + Host - + Refreshing - + Refresh List @@ -6819,7 +6866,7 @@ p, li { white-space: pre-wrap; } - + [not set] [μη ορισμένο] @@ -6834,10 +6881,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Άξονας%1%2 @@ -6851,9 +6898,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [άγνωστο] @@ -7018,15 +7065,13 @@ p, li { white-space: pre-wrap; } - + [invalid] - - %1%2Hat %3 @@ -7034,35 +7079,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 - + %1%2Axis %3,%4,%5 - + %1%2Motion %3 - - %1%2Button %3 - + [unused] [άδειο] @@ -7149,9 +7192,21 @@ p, li { white-space: pre-wrap; } - - %1%2%3 - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 + diff --git a/dist/languages/es.ts b/dist/languages/es.ts index dde787a15..d94e2e729 100644 --- a/dist/languages/es.ts +++ b/dist/languages/es.ts @@ -1732,76 +1732,86 @@ Esto banearía su nombre del foro y su dirección IP. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Activa la compilación de shaders en modo asíncrono, lo que puede reducir la sobrecarga de shaders. Esta función es experimental. - + Use asynchronous shader building (Hack) Usar la construcción de shaders asíncronos (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Activa el tiempo rápido de GPU. Esta opción hará que muchos juegos estén forzados a ejecutarse en su resolución nativa máxima. - + Use Fast GPU Time (Hack) Usar tiempo rápido en la GPU (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. Activa el flujo de búferes pesado. Esta opción forzará el flujo de los búferes no modificados, lo que puede afectar al rendimiento. - + Use pessimistic buffer flushes (Hack) Utilizar flujos de búferes pesados (Hack) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. Activa la caché de canalización específica del fabricante de la GPU. Esta opción puede mejorar significativamente el tiempo de carga de sombreadores en los casos en los que el controlador de Vulkan no almacena internamente archivos de caché de canalización. - + Use Vulkan pipeline cache Usar caché de canalización de Vulkan - + Anisotropic Filtering: Filtrado anisotrópico: - + Automatic Automático - + Default Valor predeterminado - + 2x x2 - + 4x x4 - + 8x x8 - + 16x x16 @@ -2189,7 +2199,7 @@ Esto banearía su nombre del foro y su dirección IP. - + Configure Configurar @@ -2216,6 +2226,7 @@ Esto banearía su nombre del foro y su dirección IP. + Requires restarting yuzu Requiere reiniciar yuzu @@ -2240,22 +2251,27 @@ Esto banearía su nombre del foro y su dirección IP. - + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + Enable mouse panning Activar desplazamiento del ratón - + Mouse sensitivity Sensibilidad del ratón - + % % - + Motion / Touch Movimiento / táctil @@ -2367,7 +2383,7 @@ Esto banearía su nombre del foro y su dirección IP. - + Left Stick Palanca izquierda @@ -2461,14 +2477,14 @@ Esto banearía su nombre del foro y su dirección IP. - + L L - + ZL ZL @@ -2487,7 +2503,7 @@ Esto banearía su nombre del foro y su dirección IP. - + Plus Más @@ -2500,15 +2516,15 @@ Esto banearía su nombre del foro y su dirección IP. - + R R - + ZR ZR @@ -2565,236 +2581,241 @@ Esto banearía su nombre del foro y su dirección IP. - + Right Stick Palanca derecha - - - - + + + + Clear Borrar - - - - - + + + + + [not set] [no definido] - - + + Invert button Invertir botón - - + + Toggle button Alternar botón - - + + Turbo button + + + + + Invert axis Invertir ejes - - - + + + Set threshold Configurar umbral - - + + Choose a value between 0% and 100% Seleccione un valor entre 0% y 100%. - + Toggle axis Alternar ejes - + Set gyro threshold Configurar umbral del Giroscopio - + Map Analog Stick Configuración de palanca analógico - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Después de pulsar OK, mueve primero el joystick de manera horizontal, y luego verticalmente. Para invertir los ejes, mueve primero el joystick de manera vertical, y luego horizontalmente. - + Center axis Centrar ejes - - + + Deadzone: %1% Punto muerto: %1% - - + + Modifier Range: %1% Rango del modificador: %1% - - + + Pro Controller Controlador Pro - + Dual Joycons Joycons duales - + Left Joycon Joycon izquierdo - + Right Joycon Joycon derecho - + Handheld Portátil - + GameCube Controller Controlador de GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Controlador NES - + SNES Controller Controlador SNES - + N64 Controller Controlador N64 - + Sega Genesis Sega Genesis - + Start / Pause Inicio / Pausa - + Z Z - + Control Stick Palanca de control - + C-Stick C-Stick - + Shake! ¡Agita! - + [waiting] [esperando] - + New Profile Nuevo perfil - + Enter a profile name: Introduce un nombre de perfil: - - + + Create Input Profile Crear perfil de entrada - + The given profile name is not valid! ¡El nombre de perfil introducido no es válido! - + Failed to create the input profile "%1" Error al crear el perfil de entrada "%1" - + Delete Input Profile Eliminar perfil de entrada - + Failed to delete the input profile "%1" Error al eliminar el perfil de entrada "%1" - + Load Input Profile Cargar perfil de entrada - + Failed to load the input profile "%1" Error al cargar el perfil de entrada "%1" - + Save Input Profile Guardar perfil de entrada - + Failed to save the input profile "%1" Error al guardar el perfil de entrada "%1" @@ -4571,525 +4592,535 @@ Arrastra los puntos para cambiar de posición, o haz doble clic en las celdas de La inicialización de Vulkan ha fallado durante la ejecución. Haz clic <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>aquí para más información sobre como arreglar el problema</a>. - + Loading Web Applet... Cargando Web applet... - - + + Disable Web Applet Desactivar Web applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Deshabilitar el Applet Web puede causar comportamientos imprevistos y debería solo ser usado con Super Mario 3D All-Stars. ¿Estas seguro que quieres deshabilitar el Applet Web? (Puede ser reactivado en las configuraciones de Depuración.) - + The amount of shaders currently being built La cantidad de shaders que se están construyendo actualmente - + The current selected resolution scaling multiplier. El multiplicador de escala de resolución seleccionado actualmente. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. La velocidad de emulación actual. Los valores superiores o inferiores al 100% indican que la emulación se está ejecutando más rápido o más lento que en una Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. La cantidad de fotogramas por segundo que se está mostrando el juego actualmente. Esto variará de un juego a otro y de una escena a otra. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tiempo que lleva emular un fotograma de la Switch, sin tener en cuenta la limitación de fotogramas o sincronización vertical. Para una emulación óptima, este valor debería ser como máximo de 16.67 ms. - + &Clear Recent Files &Eliminar archivos recientes - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue &Continuar - + &Pause &Pausar - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu está ejecutando un juego - + Warning Outdated Game Format Advertencia: formato del juego obsoleto - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Está utilizando el formato de directorio de ROM deconstruido para este juego, que es un formato desactualizado que ha sido reemplazado por otros, como los NCA, NAX, XCI o NSP. Los directorios de ROM deconstruidos carecen de íconos, metadatos y soporte de actualizaciones.<br><br>Para ver una explicación de los diversos formatos de Switch que soporta yuzu,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>echa un vistazo a nuestra wiki</a>. Este mensaje no se volverá a mostrar. - - + + Error while loading ROM! ¡Error al cargar la ROM! - + The ROM format is not supported. El formato de la ROM no es compatible. - + An error occurred initializing the video core. Se ha producido un error al inicializar el núcleo de video. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu ha encontrado un error al ejecutar el núcleo de video. Esto suele ocurrir al no tener los controladores de la GPU actualizados, incluyendo los integrados. Por favor, revisa el registro para más detalles. Para más información sobre cómo acceder al registro, por favor, consulta la siguiente página: <a href='https://yuzu-emu.org/help/reference/log-files/'>Como cargar el archivo de registro</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. ¡Error al cargar la ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Por favor, sigue <a href='https://yuzu-emu.org/help/quickstart/'>la guía de inicio rápido de yuzu</a> para revolcar los archivos.<br>Puedes consultar la wiki de yuzu</a> o el Discord de yuzu</a> para obtener ayuda. - + An unknown error occurred. Please see the log for more details. Error desconocido. Por favor, consulte el archivo de registro para ver más detalles. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Cerrando software... - + Save Data Datos de guardado - + Mod Data Datos de mods - + Error Opening %1 Folder Error al abrir la carpeta %1 - - + + Folder does not exist! ¡La carpeta no existe! - + Error Opening Transferable Shader Cache Error al abrir el caché transferible de shaders - + Failed to create the shader cache directory for this title. No se pudo crear el directorio de la caché de los shaders para este título. - + Error Removing Contents Error al eliminar el contenido - + Error Removing Update Error al eliminar la actualización - + Error Removing DLC Error al eliminar el DLC - + Remove Installed Game Contents? ¿Eliminar el contenido del juego instalado? - + Remove Installed Game Update? ¿Eliminar la actualización del juego instalado? - + Remove Installed Game DLC? ¿Eliminar el DLC del juego instalado? - + Remove Entry Eliminar entrada - - - - - - + + + + + + Successfully Removed Se ha eliminado con éxito - + Successfully removed the installed base game. Se ha eliminado con éxito el juego base instalado. - + The base game is not installed in the NAND and cannot be removed. El juego base no está instalado en el NAND y no se puede eliminar. - + Successfully removed the installed update. Se ha eliminado con éxito la actualización instalada. - + There is no update installed for this title. No hay ninguna actualización instalada para este título. - + There are no DLC installed for this title. No hay ningún DLC instalado para este título. - + Successfully removed %1 installed DLC. Se ha eliminado con éxito %1 DLC instalado(s). - + Delete OpenGL Transferable Shader Cache? ¿Deseas eliminar el caché transferible de shaders de OpenGL? - + Delete Vulkan Transferable Shader Cache? ¿Deseas eliminar el caché transferible de shaders de Vulkan? - + Delete All Transferable Shader Caches? ¿Deseas eliminar todo el caché transferible de shaders? - + Remove Custom Game Configuration? ¿Deseas eliminar la configuración personalizada del juego? - + Remove File Eliminar archivo - - + + Error Removing Transferable Shader Cache Error al eliminar la caché de shaders transferibles - - + + A shader cache for this title does not exist. No existe caché de shaders para este título. - + Successfully removed the transferable shader cache. El caché de shaders transferibles se ha eliminado con éxito. - + Failed to remove the transferable shader cache. No se ha podido eliminar la caché de shaders transferibles. - + Error Removing Vulkan Driver Pipeline Cache Error al eliminar la caché de canalización del controlador Vulkan - + Failed to remove the driver pipeline cache. No se ha podido eliminar la caché de canalización del controlador. - - + + Error Removing Transferable Shader Caches Error al eliminar las cachés de shaders transferibles - + Successfully removed the transferable shader caches. Cachés de shaders transferibles eliminadas con éxito. - + Failed to remove the transferable shader cache directory. No se ha podido eliminar el directorio de cachés de shaders transferibles. - - + + Error Removing Custom Configuration Error al eliminar la configuración personalizada del juego - + A custom configuration for this title does not exist. No existe una configuración personalizada para este título. - + Successfully removed the custom game configuration. Se eliminó con éxito la configuración personalizada del juego. - + Failed to remove the custom game configuration. No se ha podido eliminar la configuración personalizada del juego. - - + + RomFS Extraction Failed! ¡La extracción de RomFS ha fallado! - + There was an error copying the RomFS files or the user cancelled the operation. Se ha producido un error al copiar los archivos RomFS o el usuario ha cancelado la operación. - + Full Completo - + Skeleton En secciones - + Select RomFS Dump Mode Elegir método de volcado de RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Por favor, selecciona el método en que quieres volcar el RomFS.<br>Completo copiará todos los archivos al nuevo directorio <br> mientras que en secciones solo creará la estructura del directorio. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root No hay suficiente espacio en %1 para extraer el RomFS. Por favor, libera espacio o elige otro directorio de volcado en Emulación > Configuración > Sistema > Sistema de archivos > Raíz de volcado - + Extracting RomFS... Extrayendo RomFS... - - + + Cancel Cancelar - + RomFS Extraction Succeeded! ¡La extracción RomFS ha tenido éxito! - + The operation completed successfully. La operación se completó con éxito. - - - - - + + + + + Create Shortcut Crear acceso directo - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Esto creará un acceso directo a la AppImage actual. Esto puede no funcionar bien si se actualiza. ¿Continuar? - + Cannot create shortcut on desktop. Path "%1" does not exist. No se puede crear un acceso directo en el escritorio. La ruta "%1" no existe. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. No se puede crear un acceso directo en el menú de aplicaciones. La ruta "%1" no existe y no se puede crear. - + Create Icon Crear icono - + Cannot create icon file. Path "%1" does not exist and cannot be created. No se puede crear el archivo de icono. La ruta "%1" no existe y no se puede crear. - + Start %1 with the yuzu Emulator Iniciar %1 con el Emulador yuzu - + Failed to create a shortcut at %1 Error al crear un acceso directo en %1 - + Successfully created a shortcut to %1 Se ha creado un acceso directo a %1 - + Error Opening %1 Error al intentar abrir %1 - + Select Directory Seleccionar directorio - + Properties Propiedades - + The game properties could not be loaded. No se pueden cargar las propiedades del juego. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Ejecutable de Switch (%1);;Todos los archivos (*.*) - + Load File Cargar archivo - + Open Extracted ROM Directory Abrir el directorio de la ROM extraída - + Invalid Directory Selected Directorio seleccionado no válido - + The directory you have selected does not contain a 'main' file. El directorio que ha seleccionado no contiene ningún archivo 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Archivo de Switch Instalable (*.nca *.nsp *.xci);;Archivo de contenidos de Nintendo (*.nca);;Paquete de envío de Nintendo (*.nsp);;Imagen de cartucho NX (*.xci) - + Install Files Instalar archivos - + %n file(s) remaining %n archivo(s) restantes%n archivo(s) restantes%n archivo(s) restantes - + Installing file "%1"... Instalando el archivo "%1"... - - + + Install Results Instalar resultados - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Para evitar posibles conflictos, no se recomienda a los usuarios que instalen juegos base en el NAND. Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + %n file(s) were newly installed %n archivo(s) recién instalado/s @@ -5098,7 +5129,7 @@ Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + %n file(s) were overwritten %n archivo(s) recién sobreescrito/s @@ -5107,7 +5138,7 @@ Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + %n file(s) failed to install %n archivo(s) no se instaló/instalaron @@ -5116,377 +5147,388 @@ Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + System Application Aplicación del sistema - + System Archive Archivo del sistema - + System Application Update Actualización de la aplicación del sistema - + Firmware Package (Type A) Paquete de firmware (Tipo A) - + Firmware Package (Type B) Paquete de firmware (Tipo B) - + Game Juego - + Game Update Actualización de juego - + Game DLC DLC del juego - + Delta Title Titulo delta - + Select NCA Install Type... Seleccione el tipo de instalación NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Seleccione el tipo de título en el que deseas instalar este NCA como: (En la mayoría de los casos, el 'Juego' predeterminado está bien). - + Failed to Install Fallo en la instalación - + The title type you selected for the NCA is invalid. El tipo de título que seleccionó para el NCA no es válido. - + File not found Archivo no encontrado - + File "%1" not found Archivo "%1" no encontrado - + OK Aceptar - - + + Hardware requirements not met No se cumplen los requisitos de hardware - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. El sistema no cumple los requisitos de hardware recomendados. Los informes de compatibilidad se han desactivado. - + Missing yuzu Account Falta la cuenta de Yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Para enviar un caso de prueba de compatibilidad de juegos, debes vincular tu cuenta de yuzu.<br><br/> Para vincular tu cuenta de yuzu, ve a Emulación &gt; Configuración &gt; Web. - + Error opening URL Error al abrir la URL - + Unable to open the URL "%1". No se puede abrir la URL "%1". - + TAS Recording Grabación TAS - + Overwrite file of player 1? ¿Sobrescribir archivo del jugador 1? - + Invalid config detected Configuración no válida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. El controlador del modo portátil no puede ser usado en el modo sobremesa. Se seleccionará el controlador Pro en su lugar. - - + + Amiibo Amiibo - - + + The current amiibo has been removed El amiibo actual ha sido eliminado - + Error Error - - + + The current game is not looking for amiibos El juego actual no está buscando amiibos - + Amiibo File (%1);; All Files (*.*) Archivo amiibo (%1);; Todos los archivos (*.*) - + Load Amiibo Cargar amiibo - + Error loading Amiibo data Error al cargar los datos Amiibo - + The selected file is not a valid amiibo El archivo seleccionado no es un amiibo válido - + The selected file is already on use El archivo seleccionado ya se encuentra en uso - + An unknown error occurred Ha ocurrido un error inesperado - + Capture Screenshot Captura de pantalla - + PNG Image (*.png) Imagen PNG (*.png) - + TAS state: Running %1/%2 Estado TAS: ejecutando %1/%2 - + TAS state: Recording %1 Estado TAS: grabando %1 - + TAS state: Idle %1/%2 Estado TAS: inactivo %1/%2 - + TAS State: Invalid Estado TAS: nulo - + &Stop Running &Parar de ejecutar - + &Start &Iniciar - + Stop R&ecording Pausar g&rabación - + R&ecord G&rabar - + Building: %n shader(s) Creando: %n shader(s)Construyendo: %n shader(s)Construyendo: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escalado: %1x - + Speed: %1% / %2% Velocidad: %1% / %2% - + Speed: %1% Velocidad: %1% - + Game: %1 FPS (Unlocked) Juego: %1 FPS (desbloqueado) - + Game: %1 FPS Juego: %1 FPS - + Frame: %1 ms Fotogramas: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR GPU ERROR - + DOCKED SOBREMESA - + HANDHELD PORTÁTIL - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST PRÓXIMO - - + + BILINEAR BILINEAL - + BICUBIC BICÚBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA NO AA - + FXAA FXAA - + SMAA SMAA - + + VOLUME: MUTE + + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + + + + Confirm Key Rederivation Confirmar la clave de rederivación - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5503,37 +5545,37 @@ es lo que quieres hacer si es necesario. Esto eliminará los archivos de las claves generadas automáticamente y volverá a ejecutar el módulo de derivación de claves. - + Missing fuses Faltan fuses - + - Missing BOOT0 - Falta BOOT0 - + - Missing BCPKG2-1-Normal-Main - Falta BCPKG2-1-Normal-Main - + - Missing PRODINFO - Falta PRODINFO - + Derivation Components Missing Faltan componentes de derivación - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Faltan las claves de encriptación. <br>Por favor, sigue <a href='https://yuzu-emu.org/help/quickstart/'>la guía rápida de yuzu</a> para obtener todas tus claves, firmware y juegos.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5542,39 +5584,39 @@ Esto puede llevar unos minutos dependiendo del rendimiento de su sistema. - + Deriving Keys Obtención de claves - + Select RomFS Dump Target Selecciona el destinatario para volcar el RomFS - + Please select which RomFS you would like to dump. Por favor, seleccione los RomFS que deseas volcar. - + Are you sure you want to close yuzu? ¿Estás seguro de que quieres cerrar yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. ¿Estás seguro de que quieres detener la emulación? Cualquier progreso no guardado se perderá. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5586,44 +5628,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! ¡OpenGL no está disponible! - + OpenGL shared contexts are not supported. Los contextos compartidos de OpenGL no son compatibles. - + yuzu has not been compiled with OpenGL support. yuzu no ha sido compilado con soporte de OpenGL. - - + + Error while initializing OpenGL! ¡Error al inicializar OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Tu GPU no soporta OpenGL, o no tienes instalados los últimos controladores gráficos. - + Error while initializing OpenGL 4.6! ¡Error al iniciar OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Tu GPU no soporta OpenGL 4.6, o no tienes instalado el último controlador de la tarjeta gráfica.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Es posible que la GPU no soporte una o más extensiones necesarias de OpenGL . Por favor, asegúrate de tener los últimos controladores de la tarjeta gráfica.<br><br>GL Renderer:<br>%1<br><br>Extensiones no soportadas:<br>%2 @@ -5863,7 +5905,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list Haz doble clic para agregar un nuevo directorio a la lista de juegos. @@ -6209,51 +6251,56 @@ Mensaje de depuración: + Hide Empty Rooms + + + + Hide Full Rooms Ocultar salas llenas - + Refresh Lobby Actualizar lobby - + Password Required to Join Contraseña necesaria para unirse - + Password: Contraseña: - + Players Jugadores - + Room Name Nombre de sala - + Preferred Game Juego preferente - + Host Anfitrión - + Refreshing Actualizando - + Refresh List Actualizar lista @@ -6864,7 +6911,7 @@ p, li { white-space: pre-wrap; } - + [not set] [no definido] @@ -6879,10 +6926,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Eje %1%2 @@ -6896,9 +6943,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [desconocido] @@ -7063,15 +7110,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [inválido] - - %1%2Hat %3 %1%2Rotación %3 @@ -7079,35 +7124,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2Eje %3 - + %1%2Axis %3,%4,%5 %1%2Eje %3,%4,%5 - + %1%2Motion %3 %1%2Movimiento %3 - - %1%2Button %3 %1%2Botón %3 - + [unused] [no usado] @@ -7194,9 +7237,21 @@ p, li { white-space: pre-wrap; } Extra - - %1%2%3 - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 + diff --git a/dist/languages/fr.ts b/dist/languages/fr.ts index b5119f409..c607faf8f 100644 --- a/dist/languages/fr.ts +++ b/dist/languages/fr.ts @@ -127,7 +127,7 @@ p, li { white-space: pre-wrap; } View Profile - Voir le profile + Voir le profil @@ -938,12 +938,12 @@ Cette option améliore la vitesse en réduisant la précision des instructions f When checked, it disables the macro HLE functions. Enabling this makes games run slower - + Lorsque coché, désactive les fonctions macro HLE. L'activer ralentit les jeux Disable Macro HLE - + Désactiver les macros HLE @@ -1547,7 +1547,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f 1.5X (1080p/1620p) [EXPERIMENTAL] - + 1.5X (1080p/1620p) [EXPÉRIMENTAL] @@ -1577,12 +1577,12 @@ Cette option améliore la vitesse en réduisant la précision des instructions f 7X (5040p/7560p) - + 7X (5040p/7560p) 8X (5760p/8640p) - + 8X (5760p/8640p) @@ -1617,7 +1617,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f AMD FidelityFX™️ Super Resolution - + AMD FidelityFX™️ Super Resolution @@ -1632,7 +1632,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f SMAA - + SMAA @@ -1712,12 +1712,12 @@ Cette option améliore la vitesse en réduisant la précision des instructions f Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - + Les exécutions fonctionnent en arrière-plan en attendant les commandes graphiques pour empêcher le GPU de réduire sa vitesse de fréquence d'horloge. Force maximum clocks (Vulkan only) - + Forcer la fréquence d'horloge maximales (Vulkan uniquement) @@ -1731,76 +1731,86 @@ Cette option améliore la vitesse en réduisant la précision des instructions f + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Active la compilation de shaders asynchrone, qui peut réduire les saccades des shaders. Cette fonctionnalité est expérimentale. - + Use asynchronous shader building (Hack) Utiliser la compilation asynchrone des shaders (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Active le Temps GPU Rapide. Cette option forcera la plupart des jeux à utiliser leur plus grande résolution native. - + Use Fast GPU Time (Hack) Utiliser le Temps GPU Rapide (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. Active les vidages de tampon pessimistes. Cette option va forcer les tampons non-modifiés à être vidé, cela peut affecter la performance. - + Use pessimistic buffer flushes (Hack) Utiliser des vidages de tampon pessimistes (Hack) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Active le cache de pipeline spécifique au fournisseur de GPU. Cette option peut améliorer considérablement le temps de chargement du shader dans les cas où le pilote Vulkan ne stocke pas les fichiers de cache du pipeline en interne. - + Use Vulkan pipeline cache - + Utiliser le cache de pipeline Vulkan - + Anisotropic Filtering: Filtrage anisotropique : - + Automatic Automatique - + Default Défaut - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2188,7 +2198,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + Configure Configurer @@ -2215,6 +2225,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f + Requires restarting yuzu Nécessite de redémarrer yuzu @@ -2236,25 +2247,30 @@ Cette option améliore la vitesse en réduisant la précision des instructions f Enable direct JoyCon driver - + Activer le pilote JoyCon direct - + + Enable direct Pro Controller driver [EXPERIMENTAL] + Activer le pilote Pro Controller direct [EXPERIMENTAL] + + + Enable mouse panning Activer le mouvement panorama avec la souris - + Mouse sensitivity Sensibilité de la souris - + % % - + Motion / Touch La motion / Toucher @@ -2366,7 +2382,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + Left Stick Stick Gauche @@ -2460,14 +2476,14 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + L L - + ZL ZL @@ -2486,7 +2502,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + Plus Plus @@ -2499,15 +2515,15 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + R R - + ZR ZR @@ -2564,236 +2580,241 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + Right Stick Stick Droit - - - - + + + + Clear Effacer - - - - - + + + + + [not set] [non défini] - - + + Invert button Inverser les boutons - - + + Toggle button Bouton d'activation - - + + Turbo button + Bouton Turbo + + + + Invert axis Inverser l'axe - - - + + + Set threshold Définir le seuil - - + + Choose a value between 0% and 100% Choisissez une valeur entre 0% et 100% - + Toggle axis Basculer les axes - + Set gyro threshold Définir le seuil du gyroscope - + Map Analog Stick Mapper le stick analogique - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Après avoir appuyé sur OK, bougez d'abord votre joystick horizontalement, puis verticalement. Pour inverser les axes, bougez d'abord votre joystick verticalement, puis horizontalement. - + Center axis Axe central - - + + Deadzone: %1% Zone morte : %1% - - + + Modifier Range: %1% Modification de la course : %1% - - + + Pro Controller Pro Controller - + Dual Joycons Deux Joycons - + Left Joycon Joycon de gauche - + Right Joycon Joycon de droit - + Handheld Mode Portable - + GameCube Controller Manette GameCube - + Poke Ball Plus Poké Ball Plus - + NES Controller Manette NES - + SNES Controller Manette SNES - + N64 Controller Manette N64 - + Sega Genesis Sega Genesis - + Start / Pause Start / Pause - + Z Z - + Control Stick Stick de contrôle - + C-Stick C-Stick - + Shake! Secouez ! - + [waiting] [en attente] - + New Profile Nouveau Profil - + Enter a profile name: Entrez un nom de profil : - - + + Create Input Profile Créer un profil d'entrée - + The given profile name is not valid! Le nom de profil donné est invalide ! - + Failed to create the input profile "%1" Échec de la création du profil d'entrée "%1" - + Delete Input Profile Supprimer le profil d'entrée - + Failed to delete the input profile "%1" Échec de la suppression du profil d'entrée "%1" - + Load Input Profile Charger le profil d'entrée - + Failed to load the input profile "%1" Échec du chargement du profil d'entrée "%1" - + Save Input Profile Sauvegarder le profil d'entrée - + Failed to save the input profile "%1" Échec de la sauvegarde du profil d'entrée "%1" @@ -3297,7 +3318,7 @@ UUID : %2 Virtual Ring Sensor Parameters - + Paramètres du capteur de l'anneau virtuel @@ -3319,29 +3340,29 @@ UUID : %2 Direct Joycon Driver - + Pilote Joycon direct Enable Ring Input - + Activer la saisie de l'anneau Enable - + Activer Ring Sensor Value - + Valeur du capteur de l'anneau Not connected - + Non connecté @@ -3372,12 +3393,12 @@ UUID : %2 Error enabling ring input - + Erreur lors de l'activation de la saisie de l'anneau Direct Joycon driver is not enabled - + Le pilote direct Joycon n'est pas activé @@ -3387,17 +3408,17 @@ UUID : %2 The current mapped device doesn't support the ring controller - + Le périphérique mappé actuel ne prend pas en charge le contrôleur en anneau The current mapped device doesn't have a ring attached - + L'appareil actuellement mappé n'a pas d'anneau attaché Unexpected driver result %1 - + Résultat de pilote inattendu %1 @@ -3706,7 +3727,7 @@ UUID : %2 American English - + Anglais Américain @@ -3806,7 +3827,7 @@ UUID : %2 Device Name - + Nom de l'appareil @@ -3846,7 +3867,7 @@ UUID : %2 Warning: "%1" is not a valid language for region "%2" - + Attention: "%1" n'est pas une langue valide pour la région "%2" @@ -4501,12 +4522,12 @@ Faites glisser les points pour modifier la position ou double-cliquez sur les ce Server Address - + Adresse du serveur <html><head/><body><p>Server address of the host</p></body></html> - + <html><head/><body><p>Adresse du serveur de l'hôte</p></body></html> @@ -4570,913 +4591,934 @@ Faites glisser les points pour modifier la position ou double-cliquez sur les ce L'initialisation de Vulkan a échoué lors du démarrage.<br><br>Cliquez <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>ici pour obtenir des instructions pour résoudre le problème</a>. - + Loading Web Applet... Chargement du Web Applet... - - + + Disable Web Applet Désactiver l'applet web - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) La désactivation de l'applet Web peut entraîner un comportement indéfini et ne doit être utilisée qu'avec Super Mario 3D All-Stars. Voulez-vous vraiment désactiver l'applet Web ? (Cela peut être réactivé dans les paramètres de débogage.) - + The amount of shaders currently being built La quantité de shaders en cours de construction - + The current selected resolution scaling multiplier. Le multiplicateur de mise à l'échelle de résolution actuellement sélectionné. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Valeur actuelle de la vitesse de l'émulation. Des valeurs plus hautes ou plus basses que 100% indique que l'émulation fonctionne plus vite ou plus lentement qu'une véritable Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Combien d'image par seconde le jeu est en train d'afficher. Ceci vas varier de jeu en jeu et de scènes en scènes. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Temps pris pour émuler une image par seconde de la switch, sans compter le limiteur d'image par seconde ou la synchronisation verticale. Pour une émulation à pleine vitesse, ceci devrait être au maximum à 16.67 ms. - + &Clear Recent Files &Effacer les fichiers récents - + + Emulated mouse is enabled + La souris émulée est activée + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + La saisie réelle de la souris et le panoramique de la souris sont incompatibles. Veuillez désactiver la souris émulée dans les paramètres avancés d'entrée pour permettre le panoramique de la souris. + + + &Continue &Continuer - + &Pause &Pause - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu exécute un jeu - + Warning Outdated Game Format Avertissement : Le Format de jeu est dépassé - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Vous utilisez un format de ROM déconstruite pour ce jeu, qui est donc un format dépassé qui à été remplacer par d'autre. Par exemple les formats NCA, NAX, XCI, ou NSP. Les destinations de ROM déconstruites manque des icônes, des métadonnée et du support de mise à jour.<br><br>Pour une explication des divers formats Switch que yuzu supporte, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Regardez dans le wiki</a>. Ce message ne sera pas montré une autre fois. - - + + Error while loading ROM! Erreur lors du chargement de la ROM ! - + The ROM format is not supported. Le format de la ROM n'est pas supporté. - + An error occurred initializing the video core. Une erreur s'est produite lors de l'initialisation du noyau dédié à la vidéo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu a rencontré une erreur en exécutant le cœur vidéo. Cela est généralement causé par des pilotes graphiques trop anciens. Veuillez consulter les logs pour plus d'informations. Pour savoir comment accéder aux logs, veuillez vous référer à la page suivante : <a href='https://yuzu-emu.org/help/reference/log-files/'>Comment partager un fichier de log </a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Erreur lors du chargement de la ROM ! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Veuillez suivre <a href='https://yuzu-emu.org/help/quickstart/'>le guide de démarrage rapide yuzu</a> pour retransférer vos fichiers.<br>Vous pouvez vous référer au wiki yuzu</a> ou le Discord yuzu</a> pour de l'assistance. - + An unknown error occurred. Please see the log for more details. Une erreur inconnue est survenue. Veuillez consulter le journal des logs pour plus de détails. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Fermeture du logiciel... - + Save Data Enregistrer les données - + Mod Data Donnés du Mod - + Error Opening %1 Folder Erreur dans l'ouverture du dossier %1. - - + + Folder does not exist! Le dossier n'existe pas ! - + Error Opening Transferable Shader Cache Erreur lors de l'ouverture des Shader Cache Transferable - + Failed to create the shader cache directory for this title. Impossible de créer le dossier de cache du shader pour ce jeu. - + Error Removing Contents Erreur en enlevant le contenu - + Error Removing Update Erreur en enlevant la Mise à Jour - + Error Removing DLC Erreur en enlevant le DLC - + Remove Installed Game Contents? - Enlever les données des jeux installés ? + Enlever les données du jeu installé ? - + Remove Installed Game Update? Enlever la mise à jour du jeu installé ? - + Remove Installed Game DLC? Enlever le DLC du jeu installé ? - + Remove Entry Supprimer l'entrée - - - - - - + + + + + + Successfully Removed Supprimé avec succès - + Successfully removed the installed base game. Suppression du jeu de base installé avec succès. - + The base game is not installed in the NAND and cannot be removed. Le jeu de base n'est pas installé dans la NAND et ne peut pas être supprimé. - + Successfully removed the installed update. Suppression de la mise à jour installée avec succès. - + There is no update installed for this title. Il n'y a pas de mise à jour installée pour ce titre. - + There are no DLC installed for this title. Il n'y a pas de DLC installé pour ce titre. - + Successfully removed %1 installed DLC. Suppression de %1 DLC installé(s) avec succès. - + Delete OpenGL Transferable Shader Cache? Supprimer la Cache OpenGL de Shader Transférable? - + Delete Vulkan Transferable Shader Cache? Supprimer la Cache Vulkan de Shader Transférable? - + Delete All Transferable Shader Caches? Supprimer Toutes les Caches de Shader Transférable? - + Remove Custom Game Configuration? Supprimer la configuration personnalisée du jeu? - + Remove File Supprimer fichier - - + + Error Removing Transferable Shader Cache Erreur lors de la suppression du cache de shader transférable - - + + A shader cache for this title does not exist. Un shader cache pour ce titre n'existe pas. - + Successfully removed the transferable shader cache. Suppression du cache de shader transférable avec succès. - + Failed to remove the transferable shader cache. Échec de la suppression du cache de shader transférable. - + Error Removing Vulkan Driver Pipeline Cache - + Erreur lors de la suppression du cache de pipeline de pilotes Vulkan - + Failed to remove the driver pipeline cache. - + Échec de la suppression du cache de pipeline de pilotes. - - + + Error Removing Transferable Shader Caches Erreur durant la Suppression des Caches de Shader Transférable - + Successfully removed the transferable shader caches. Suppression des caches de shader transférable effectuée avec succès. - + Failed to remove the transferable shader cache directory. Impossible de supprimer le dossier de la cache de shader transférable. - - + + Error Removing Custom Configuration Erreur lors de la suppression de la configuration personnalisée - + A custom configuration for this title does not exist. Il n'existe pas de configuration personnalisée pour ce titre. - + Successfully removed the custom game configuration. Suppression de la configuration de jeu personnalisée avec succès. - + Failed to remove the custom game configuration. Échec de la suppression de la configuration personnalisée du jeu. - - + + RomFS Extraction Failed! L'extraction de la RomFS a échoué ! - + There was an error copying the RomFS files or the user cancelled the operation. Une erreur s'est produite lors de la copie des fichiers RomFS ou l'utilisateur a annulé l'opération. - + Full Plein - + Skeleton Squelette - + Select RomFS Dump Mode Sélectionnez le mode d'extraction de la RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Veuillez sélectionner la manière dont vous souhaitez que le fichier RomFS soit extrait.<br>Full copiera tous les fichiers dans le nouveau répertoire, tandis que<br>skeleton créera uniquement la structure de répertoires. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Il n'y a pas assez d'espace libre dans %1 pour extraire la RomFS. Veuillez libérer de l'espace ou sélectionner un autre dossier d'extraction dans Émulation > Configurer > Système > Système de fichiers > Extraire la racine - + Extracting RomFS... Extraction de la RomFS ... - - + + Cancel Annuler - + RomFS Extraction Succeeded! Extraction de la RomFS réussi ! - + The operation completed successfully. L'opération s'est déroulée avec succès. - - - - - + + + + + Create Shortcut - + Créer un raccourci - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - - - - - Cannot create shortcut on desktop. Path "%1" does not exist. - - - - - Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Cela créera un raccourci vers l'AppImage actuelle. Cela peut ne pas fonctionner correctement si vous mettez à jour. Continuer ? + Cannot create shortcut on desktop. Path "%1" does not exist. + Impossible de créer un raccourci sur le bureau. Le chemin "%1" n'existe pas. + + + + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. + Impossible de créer un raccourci dans le menu des applications. Le chemin "%1" n'existe pas et ne peut pas être créé. + + + Create Icon - + Créer une icône - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Impossible de créer le fichier d'icône. Le chemin "%1" n'existe pas et ne peut pas être créé. - + Start %1 with the yuzu Emulator - + Démarrer %1 avec l'émulateur Yuzu - + Failed to create a shortcut at %1 - + Impossible de créer un raccourci vers %1 - + Successfully created a shortcut to %1 - + Création réussie d'un raccourci vers %1 - + Error Opening %1 Erreur lors de l'ouverture %1 - + Select Directory Sélectionner un répertoire - + Properties Propriétés - + The game properties could not be loaded. Les propriétés du jeu n'ont pas pu être chargées. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Exécutable Switch (%1);;Tous les fichiers (*.*) - + Load File Charger un fichier - + Open Extracted ROM Directory Ouvrir le dossier des ROM extraites - + Invalid Directory Selected Destination sélectionnée invalide - + The directory you have selected does not contain a 'main' file. Le répertoire que vous avez sélectionné ne contient pas de fichier "main". - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Fichier Switch installable (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Installer les fichiers - + %n file(s) remaining %n fichier restant%n fichiers restants%n fichiers restants - + Installing file "%1"... Installation du fichier "%1" ... - - + + Install Results Résultats d'installation - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Pour éviter d'éventuels conflits, nous déconseillons aux utilisateurs d'installer des jeux de base sur la NAND. Veuillez n'utiliser cette fonctionnalité que pour installer des mises à jour et des DLC. - + %n file(s) were newly installed %n fichier a été nouvellement installé%n fichiers ont été nouvellement installés%n fichiers ont été nouvellement installés - + %n file(s) were overwritten %n fichier a été écrasé%n fichiers ont été écrasés%n fichiers ont été écrasés - + %n file(s) failed to install %n fichier n'a pas pu être installé%n fichiers n'ont pas pu être installés%n fichiers n'ont pas pu être installés - + System Application Application Système - + System Archive Archive Système - + System Application Update Mise à jour de l'application système - + Firmware Package (Type A) Paquet micrologiciel (Type A) - + Firmware Package (Type B) Paquet micrologiciel (Type B) - + Game Jeu - + Game Update Mise à jour de jeu - + Game DLC DLC de jeu - + Delta Title Titre Delta - + Select NCA Install Type... Sélectionner le type d'installation du NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Veuillez sélectionner le type de titre auquel vous voulez installer ce NCA : (Dans la plupart des cas, le titre par défaut : 'Jeu' est correct.) - + Failed to Install Échec de l'installation - + The title type you selected for the NCA is invalid. Le type de titre que vous avez sélectionné pour le NCA n'est pas valide. - + File not found Fichier non trouvé - + File "%1" not found Fichier "%1" non trouvé - + OK OK - - + + Hardware requirements not met Éxigences matérielles non respectées - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Votre système ne correspond pas aux éxigences matérielles. Les rapports de comptabilité ont été désactivés. - + Missing yuzu Account Compte yuzu manquant - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Pour soumettre un test de compatibilité pour un jeu, vous devez lier votre compte yuzu.<br><br/>Pour lier votre compte yuzu, aller à Emulation &gt; Configuration&gt; Web. - + Error opening URL Erreur lors de l'ouverture de l'URL - + Unable to open the URL "%1". Impossible d'ouvrir l'URL "%1". - + TAS Recording Enregistrement TAS - + Overwrite file of player 1? Écraser le fichier du joueur 1 ? - + Invalid config detected Configuration invalide détectée - + Handheld controller can't be used on docked mode. Pro controller will be selected. Contrôleur portable ne peut pas être utilisé en mode téléviseur. La manette Pro sera sélectionnée. - - + + Amiibo Amiibo - - + + The current amiibo has been removed L'amiibo actuel a été retiré - + Error Erreur - - + + The current game is not looking for amiibos Le jeu actuel ne cherche pas d'amiibos. - + Amiibo File (%1);; All Files (*.*) Fichier Amiibo (%1);; Tous les fichiers (*.*) - + Load Amiibo Charger un Amiibo - + Error loading Amiibo data Erreur lors du chargement des données Amiibo - + The selected file is not a valid amiibo Le fichier choisi n'est pas un amiibo valide - + The selected file is already on use Le fichier sélectionné est déjà utilisé - + An unknown error occurred Une erreur inconnue s'est produite - + Capture Screenshot Capture d'écran - + PNG Image (*.png) Image PNG (*.png) - + TAS state: Running %1/%2 État du TAS : En cours d'exécution %1/%2 - + TAS state: Recording %1 État du TAS : Enregistrement %1 - + TAS state: Idle %1/%2 État du TAS : Inactif %1:%2 - + TAS State: Invalid État du TAS : Invalide - + &Stop Running &Stopper l'exécution - + &Start &Start - + Stop R&ecording Stopper l'en&registrement - + R&ecord En&registrer - + Building: %n shader(s) Compilation: %n shaderCompilation : %n shadersCompilation : %n shaders - + Scale: %1x %1 is the resolution scaling factor Échelle : %1x - + Speed: %1% / %2% Vitesse : %1% / %2% - + Speed: %1% Vitesse : %1% - + Game: %1 FPS (Unlocked) Jeu : %1 IPS (Débloqué) - + Game: %1 FPS Jeu : %1 FPS - + Frame: %1 ms Frame : %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HAUT - + GPU EXTREME GPU EXTRÊME - + GPU ERROR GPU ERREUR - + DOCKED MODE TV - + HANDHELD PORTABLE - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST PLUS PROCHE - - + + BILINEAR BILINÉAIRE - + BICUBIC BICUBIQUE - + GAUSSIAN GAUSSIEN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA AUCUN AA - + FXAA FXAA - + SMAA - + SMAA - + + VOLUME: MUTE + VOLUME: MUET + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + VOLUME: %1% + + + Confirm Key Rederivation Confirmer la réinstallation de la clé - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5493,37 +5535,37 @@ et éventuellement faites des sauvegardes. Cela supprimera vos fichiers de clé générés automatiquement et ré exécutera le module d'installation de clé. - + Missing fuses Fusibles manquants - + - Missing BOOT0 - BOOT0 manquant - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main manquant - + - Missing PRODINFO - PRODINFO manquant - + Derivation Components Missing Composants de dérivation manquants - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Les clés de chiffrement sont manquantes. <br>Veuillez suivre <a href='https://yuzu-emu.org/help/quickstart/'>le guide de démarrage rapide yuzu</a> pour obtenir tous vos clés, firmware et jeux.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5532,39 +5574,39 @@ Cela peut prendre jusqu'à une minute en fonction des performances de votre système. - + Deriving Keys Installation des clés - + Select RomFS Dump Target Sélectionner la cible d'extraction du RomFS - + Please select which RomFS you would like to dump. Veuillez sélectionner quel RomFS vous voulez extraire. - + Are you sure you want to close yuzu? Êtes vous sûr de vouloir fermer yuzu ? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Êtes-vous sûr d'arrêter l'émulation ? Tout progrès non enregistré sera perdu. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5576,44 +5618,44 @@ Voulez-vous ignorer ceci and quitter quand même ? GRenderWindow - - + + OpenGL not available! OpenGL n'est pas disponible ! - + OpenGL shared contexts are not supported. - + Les contextes OpenGL partagés ne sont pas pris en charge. - + yuzu has not been compiled with OpenGL support. yuzu n'a pas été compilé avec le support OpenGL. - - + + Error while initializing OpenGL! Erreur lors de l'initialisation d'OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Votre GPU peut ne pas prendre en charge OpenGL, ou vous n'avez pas les derniers pilotes graphiques. - + Error while initializing OpenGL 4.6! Erreur lors de l'initialisation d'OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Votre GPU peut ne pas prendre en charge OpenGL 4.6 ou vous ne disposez pas du dernier pilote graphique: %1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Votre GPU peut ne pas prendre en charge une ou plusieurs extensions OpenGL requises. Veuillez vous assurer que vous disposez du dernier pilote graphique.<br><br>GL Renderer :<br>%1<br><br>Extensions non prises en charge :<br>%2 @@ -5714,17 +5756,17 @@ Voulez-vous ignorer ceci and quitter quand même ? Create Shortcut - + Créer un raccourci Add to Desktop - + Ajouter au bureau Add to Applications Menu - + Ajouter au menu des applications @@ -5853,7 +5895,7 @@ Voulez-vous ignorer ceci and quitter quand même ? GameListPlaceholder - + Double-click to add a new folder to the game list Double-cliquez pour ajouter un nouveau dossier à la liste de jeux @@ -6199,51 +6241,56 @@ Message de débogage : + Hide Empty Rooms + Masquer les salons vides + + + Hide Full Rooms Masquer les salons complets - + Refresh Lobby Rafraichir le menu - + Password Required to Join Mot de passe requis pour rejoindre - + Password: Mot de passe: - + Players Joueurs - + Room Name Nom du salon - + Preferred Game Jeu préféré - + Host Hôte - + Refreshing Rafraîchissement - + Refresh List Rafraîchir la liste @@ -6854,7 +6901,7 @@ p, li { white-space: pre-wrap; } - + [not set] [non défini] @@ -6869,10 +6916,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Axe %1%2 @@ -6886,9 +6933,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [inconnu] @@ -7053,15 +7100,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [invalide] - - %1%2Hat %3 %1%2Chapeau %3 @@ -7069,35 +7114,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2Axe %3 - + %1%2Axis %3,%4,%5 %1%2Axe %3,%4,%5 - + %1%2Motion %3 %1%2Mouvement %3 - - %1%2Button %3 %1%2Bouton %3 - + [unused] [inutilisé] @@ -7124,12 +7167,12 @@ p, li { white-space: pre-wrap; } Stick L - + Stick Gauche Stick R - + Stick Droit @@ -7184,9 +7227,21 @@ p, li { white-space: pre-wrap; } Extra - - %1%2%3 - %1%2%3 + + %1%2%3%4 + %1%2%3%4 + + + + + %1%2%3Hat %4 + %1%2%3Chapeau %4 + + + + + %1%2%3Button %4 + %1%2%3Bouton %4 diff --git a/dist/languages/id.ts b/dist/languages/id.ts index 1b014248a..3ed7f77ec 100644 --- a/dist/languages/id.ts +++ b/dist/languages/id.ts @@ -1688,76 +1688,86 @@ Memungkinkan berbagai macam optimasi IR. - Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. - Use asynchronous shader building (Hack) + Decode ASTC textures asynchronously (Hack) - Enables Fast GPU Time. This option will force most games to run at their highest native resolution. + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. - Use Fast GPU Time (Hack) + Use asynchronous shader building (Hack) - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - Use pessimistic buffer flushes (Hack) + Use Fast GPU Time (Hack) - Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + Use pessimistic buffer flushes (Hack) + + + + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + Use Vulkan pipeline cache - + Anisotropic Filtering: Anisotropic Filtering: - + Automatic Otomatis - + Default Bawaan - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2145,7 +2155,7 @@ Memungkinkan berbagai macam optimasi IR. - + Configure Konfigurasi @@ -2172,6 +2182,7 @@ Memungkinkan berbagai macam optimasi IR. + Requires restarting yuzu Memerlukan mengulang yuzu @@ -2196,22 +2207,27 @@ Memungkinkan berbagai macam optimasi IR. - + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + Enable mouse panning Nyalakan geseran tetikus - + Mouse sensitivity Sensitivitas mouse - + % % - + Motion / Touch Gerakan / Sentuhan @@ -2323,7 +2339,7 @@ Memungkinkan berbagai macam optimasi IR. - + Left Stick Stik Kiri @@ -2417,14 +2433,14 @@ Memungkinkan berbagai macam optimasi IR. - + L L - + ZL ZL @@ -2443,7 +2459,7 @@ Memungkinkan berbagai macam optimasi IR. - + Plus Tambah @@ -2456,15 +2472,15 @@ Memungkinkan berbagai macam optimasi IR. - + R R - + ZR ZR @@ -2521,236 +2537,241 @@ Memungkinkan berbagai macam optimasi IR. - + Right Stick Stik Kanan - - - - + + + + Clear Bersihkan - - - - - + + + + + [not set] [belum diatur] - - + + Invert button Balikkan tombol - - + + Toggle button Atur tombol - - + + Turbo button + + + + + Invert axis Balikkan poros - - - + + + Set threshold Atur batasan - - + + Choose a value between 0% and 100% Pilih sebuah angka diantara 0% dan 100% - + Toggle axis - + Set gyro threshold - + Map Analog Stick Petakan Stik Analog - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Setelah menekan OK, pertama gerakkan joystik secara mendatar, lalu tegak lurus. Untuk membalikkan sumbu, pertama gerakkan joystik secara tegak lurus, lalu mendatar. - + Center axis - - + + Deadzone: %1% Titik Mati: %1% - - + + Modifier Range: %1% Rentang Pengubah: %1% - - + + Pro Controller Kontroler Pro - + Dual Joycons Joycon Dual - + Left Joycon Joycon Kiri - + Right Joycon Joycon Kanan - + Handheld Jinjing - + GameCube Controller Kontroler GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Kontroler NES - + SNES Controller Kontroler SNES - + N64 Controller Kontroler N64 - + Sega Genesis Sega Genesis - + Start / Pause Mulai / Jeda - + Z Z - + Control Stick Stik Kendali - + C-Stick C-Stick - + Shake! Getarkan! - + [waiting] [menunggu] - + New Profile Profil Baru - + Enter a profile name: Masukkan nama profil: - - + + Create Input Profile Ciptakan Profil Masukan - + The given profile name is not valid! Nama profil yang diberi tidak sah! - + Failed to create the input profile "%1" Gagal membuat profil masukan "%1" - + Delete Input Profile Hapus Profil Masukan - + Failed to delete the input profile "%1" Gagal menghapus profil masukan "%1" - + Load Input Profile Muat Profil Masukan - + Failed to load the input profile "%1" Gagal memuat profil masukan "%1" - + Save Input Profile Simpat Profil Masukan - + Failed to save the input profile "%1" Gagal menyimpan profil masukan "%1" @@ -4525,914 +4546,935 @@ Drag points to change position, or double-click table cells to edit values. - + Loading Web Applet... Memuat Applet Web... - - + + Disable Web Applet Matikan Applet Web - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Jumlah shader yang sedang dibuat - + The current selected resolution scaling multiplier. Pengali skala resolusi yang terpilih. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Kecepatan emulasi saat ini. Nilai yang lebih tinggi atau rendah dari 100% menandakan pengemulasian berjalan lebih cepat atau lambat dibanding Switch aslinya. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Berapa banyak frame per second (bingkai per detik) permainan akan ditampilkan. Ini akan berubah dari berbagai permainan dan pemandangan. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Waktu yang diperlukan untuk mengemulasikan bingkai Switch, tak menghitung pembatas bingkai atau v-sync. Agar emulasi berkecepatan penuh, ini harus 16.67 mdtk. - + &Clear Recent Files &Bersihkan Berkas Baru-baru Ini - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue &Lanjutkan - + &Pause &Jeda - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu sedang menjalankan game - + Warning Outdated Game Format Peringatan Format Permainan yang Usang - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Anda menggunakan format direktori ROM yang sudah didekonstruksi untuk permainan ini, yang mana itu merupakan format lawas yang sudah tergantikan oleh yang lain seperti NCA, NAX, XCI, atau NSP. Direktori ROM yang sudah didekonstruksi kekurangan ikon, metadata, dan dukungan pembaruan.<br><br>Untuk penjelasan berbagai format Switch yang didukung yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>periksa wiki kami</a>. Pesan ini tidak akan ditampilkan lagi. - - + + Error while loading ROM! Kesalahan ketika memuat ROM! - + The ROM format is not supported. Format ROM tak didukung. - + An error occurred initializing the video core. Terjadi kesalahan ketika menginisialisasi inti video. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu telah mengalami error saat menjalankan inti video. Ini biasanya disebabkan oleh pemicu piranti (driver) GPU yang usang, termasuk yang terintegrasi. Mohon lihat catatan untuk informasi lebih rinci. Untuk informasi cara mengakses catatan, mohon lihat halaman berikut: <a href='https://yuzu-emu.org/help/reference/log-files/'>Cara Mengupload Berkas Catatan</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Terjadi kesalahan yang tak diketahui. Mohon lihat catatan untuk informasi lebih rinci. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Simpan Data - + Mod Data Mod Data - + Error Opening %1 Folder Gagal Membuka Folder %1 - - + + Folder does not exist! Folder tak ada! - + Error Opening Transferable Shader Cache Gagal Ketika Membuka Tembolok Shader yang Dapat Ditransfer - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Hapus Masukan - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. Tidak ada DLC yang terinstall untuk judul ini. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + Remove File Hapus File - - + + Error Removing Transferable Shader Cache Kesalahan Menghapus Transferable Shader Cache - - + + A shader cache for this title does not exist. Cache shader bagi judul ini tidak ada - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Kesalahan Menghapus Konfigurasi Buatan - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! Pengekstrakan RomFS Gagal! - + There was an error copying the RomFS files or the user cancelled the operation. Terjadi kesalahan ketika menyalin berkas RomFS atau dibatalkan oleh pengguna. - + Full Penuh - + Skeleton Skeleton - + Select RomFS Dump Mode Pilih Mode Dump RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Mohon pilih cara RomFS akan di-dump.<br>FPenuh akan menyalin seluruh berkas ke dalam direktori baru sementara <br>jerangkong hanya akan menciptakan struktur direktorinya saja. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Mengekstrak RomFS... - - + + Cancel Batal - + RomFS Extraction Succeeded! Pengekstrakan RomFS Berhasil! - + The operation completed successfully. Operasi selesai dengan sukses, - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Gagal membuka %1 - + Select Directory Pilih Direktori - + Properties Properti - + The game properties could not be loaded. Properti permainan tak dapat dimuat. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Eksekutabel Switch (%1);;Semua Berkas (*.*) - + Load File Muat Berkas - + Open Extracted ROM Directory Buka Direktori ROM Terekstrak - + Invalid Directory Selected Direktori Terpilih Tidak Sah - + The directory you have selected does not contain a 'main' file. Direktori yang Anda pilih tak memiliki berkas 'utama.' - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Install File - + %n file(s) remaining - + Installing file "%1"... Memasang berkas "%1"... - - + + Install Results Hasil Install - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed %n file(s) baru diinstall - + %n file(s) were overwritten %n file(s) telah ditimpa - + %n file(s) failed to install %n file(s) gagal di install - + System Application Aplikasi Sistem - + System Archive Arsip Sistem - + System Application Update Pembaruan Aplikasi Sistem - + Firmware Package (Type A) Paket Perangkat Tegar (Tipe A) - + Firmware Package (Type B) Paket Perangkat Tegar (Tipe B) - + Game Permainan - + Game Update Pembaruan Permainan - + Game DLC DLC Permainan - + Delta Title Judul Delta - + Select NCA Install Type... Pilih Tipe Pemasangan NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Mohon pilih jenis judul yang Anda ingin pasang sebagai NCA ini: (Dalam kebanyakan kasus, pilihan bawaan 'Permainan' tidak apa-apa`.) - + Failed to Install Gagal Memasang - + The title type you selected for the NCA is invalid. Jenis judul yang Anda pilih untuk NCA tidak sah. - + File not found Berkas tak ditemukan - + File "%1" not found Berkas "%1" tak ditemukan - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Akun yuzu Hilang - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Agar dapat mengirimkan berkas uju kompatibilitas permainan, Anda harus menautkan akun yuzu Anda.<br><br/>TUntuk mennautkan akun yuzu Anda, pergi ke Emulasi &gt; Konfigurasi &gt; Web. - + Error opening URL Kesalahan saat membuka URL - + Unable to open the URL "%1". Tidak dapat membuka URL "%1". - + TAS Recording Rekaman TAS - + Overwrite file of player 1? Timpa file pemain 1? - + Invalid config detected Konfigurasi tidak sah terdeteksi - + Handheld controller can't be used on docked mode. Pro controller will be selected. Kontroller jinjing tidak bisa digunakan dalam mode dock. Kontroller Pro akan dipilih - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Berkas Amiibo (%1);; Semua Berkas (*.*) - + Load Amiibo Muat Amiibo - + Error loading Amiibo data Gagal memuat data Amiibo - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Tangkapan Layar - + PNG Image (*.png) Berkas PNG (*.png) - + TAS state: Running %1/%2 Status TAS: Berjalan %1/%2 - + TAS state: Recording %1 Status TAS: Merekam %1 - + TAS state: Idle %1/%2 Status TAS: Diam %1/%2 - + TAS State: Invalid Status TAS: Tidak Valid - + &Stop Running &Matikan - + &Start &Mulai - + Stop R&ecording Berhenti Mer&ekam - + R&ecord R&ekam - + Building: %n shader(s) Membangun: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Skala: %1x - + Speed: %1% / %2% Kecepatan: %1% / %2% - + Speed: %1% Kecepatan: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Permainan: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU TINGGI - + GPU EXTREME GPU EKSTRIM - + GPU ERROR KESALAHAN GPU - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST NEAREST - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA TANPA AA - + FXAA FXAA - + SMAA - + + VOLUME: MUTE + + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + + + + Confirm Key Rederivation - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5443,76 +5485,76 @@ This will delete your autogenerated key files and re-run the key derivation modu - + Missing fuses - + - Missing BOOT0 - Kehilangan BOOT0 - + - Missing BCPKG2-1-Normal-Main - Kehilangan BCPKG2-1-Normal-Main - + - Missing PRODINFO - Kehilangan PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. - + Deriving Keys - + Select RomFS Dump Target - + Please select which RomFS you would like to dump. - + Are you sure you want to close yuzu? Apakah anda yakin ingin menutup yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5522,44 +5564,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGL tidak tersedia! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. - - + + Error while initializing OpenGL! Terjadi kesalahan menginisialisasi OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. VGA anda mungkin tidak mendukung OpenGL, atau anda tidak memiliki pemacu piranti (driver) grafis terbaharu. - + Error while initializing OpenGL 4.6! Terjadi kesalahan menginisialisasi OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 VGA anda mungkin tidak mendukung OpenGL 4.6, atau anda tidak memiliki pemacu piranti (driver) grafis terbaharu.<br><br>Pemuat GL:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 VGA anda mungkin tidak mendukung satu atau lebih ekstensi OpenGL. Mohon pastikan bahwa anda memiliki pemacu piranti (driver) grafis terbaharu.<br><br>Pemuat GL:<br>%1<br><br>Ekstensi yang tidak didukung:<br>%2 @@ -5799,7 +5841,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list @@ -6143,51 +6185,56 @@ Debug Message: + Hide Empty Rooms + + + + Hide Full Rooms - + Refresh Lobby - + Password Required to Join - + Password: - + Players Pemain - + Room Name - + Preferred Game - + Host - + Refreshing - + Refresh List @@ -6790,7 +6837,7 @@ p, li { white-space: pre-wrap; } - + [not set] [belum diatur] @@ -6805,10 +6852,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 @@ -6822,9 +6869,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] @@ -6989,15 +7036,13 @@ p, li { white-space: pre-wrap; } - + [invalid] - - %1%2Hat %3 @@ -7005,35 +7050,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 - + %1%2Axis %3,%4,%5 - + %1%2Motion %3 %1%2Gerakan %3 - - %1%2Button %3 - + [unused] @@ -7120,8 +7163,20 @@ p, li { white-space: pre-wrap; } - - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 diff --git a/dist/languages/it.ts b/dist/languages/it.ts index d205de5f6..c535d53ee 100644 --- a/dist/languages/it.ts +++ b/dist/languages/it.ts @@ -1533,7 +1533,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. 1.5X (1080p/1620p) [EXPERIMENTAL] - + 1.5X (1080p/1620p) [SPERIMENTALE] @@ -1563,12 +1563,12 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. 7X (5040p/7560p) - + 7X (5040p/7560p) 8X (5760p/8640p) - + 8X (5760p/8640p) @@ -1603,7 +1603,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. AMD FidelityFX™️ Super Resolution - + AMD FidelityFX™️ Super Resolution @@ -1698,12 +1698,12 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - + Esegue del lavoro in background durante l'attesa dei comandi grafici per evitare che la GPU diminuisca la sua velocità di clock. Force maximum clocks (Vulkan only) - + Forza clock massimi (solo Vulkan) @@ -1717,76 +1717,86 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Abilita la compilazione degli shader asincrona, che può ridurre gli scatti causati dagli shader. Questa funzione è sperimentale. - + Use asynchronous shader building (Hack) Utilizza la compilazione asincrona degli shader (espediente) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Use Fast GPU Time (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Use pessimistic buffer flushes (Hack) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache - + Utilizza la cache delle pipeline di Vulkan - + Anisotropic Filtering: Filtro anisotropico: - + Automatic Automatico - + Default Predefinito - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2174,7 +2184,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + Configure Configura @@ -2201,6 +2211,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. + Requires restarting yuzu Richiede il riavvio di yuzu @@ -2222,25 +2233,30 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. Enable direct JoyCon driver - + Abilita il driver Joycon diretto - + + Enable direct Pro Controller driver [EXPERIMENTAL] + Abilita il driver Pro Controller diretto [SPERIMENTALE] + + + Enable mouse panning Abilita il mouse panning - + Mouse sensitivity Sensibilità del mouse - + % % - + Motion / Touch Movimento/tocco @@ -2352,7 +2368,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + Left Stick Levetta sinistra @@ -2446,14 +2462,14 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + L L - + ZL ZL @@ -2472,7 +2488,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + Plus Più @@ -2485,15 +2501,15 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + R R - + ZR ZR @@ -2550,236 +2566,241 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + Right Stick Levetta destra - - - - + + + + Clear Cancella - - - - - + + + + + [not set] [non impost.] - - + + Invert button Inverti pulsante - - + + Toggle button Premi il pulsante - - + + Turbo button + + + + + Invert axis Inverti asse - - - + + + Set threshold Imposta soglia - - + + Choose a value between 0% and 100% Scegli un valore compreso tra 0% e 100% - + Toggle axis - + Set gyro threshold - + Map Analog Stick Mappa la levetta analogica - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Dopo aver premuto OK, prima muovi la levetta orizzontalmente, e poi verticalmente. Per invertire gli assi, prima muovi la levetta verticalmente, e poi orizzontalmente. - + Center axis Centra asse - - + + Deadzone: %1% Zona morta: %1% - - + + Modifier Range: %1% Modifica raggio: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Due Joycon - + Left Joycon Joycon sinistro - + Right Joycon Joycon destro - + Handheld Portatile - + GameCube Controller Controller GameCube - + Poke Ball Plus Poké Ball Plus - + NES Controller Controller NES - + SNES Controller Controller SNES - + N64 Controller Controller N64 - + Sega Genesis Sega Genesis - + Start / Pause Avvia / Metti in pausa - + Z Z - + Control Stick Levetta di Controllo - + C-Stick Levetta C - + Shake! Scuoti! - + [waiting] [in attesa] - + New Profile Nuovo profilo - + Enter a profile name: Inserisci un nome profilo: - - + + Create Input Profile Crea un profilo di input - + The given profile name is not valid! Il nome profilo inserito non è valido! - + Failed to create the input profile "%1" Impossibile creare il profilo di input "%1" - + Delete Input Profile Elimina un profilo di input - + Failed to delete the input profile "%1" Impossibile eliminare il profilo di input "%1" - + Load Input Profile Carica un profilo di input - + Failed to load the input profile "%1" Impossibile caricare il profilo di input "%1" - + Save Input Profile Salva un profilo di Input - + Failed to save the input profile "%1" Impossibile creare il profilo di input "%1" @@ -2844,7 +2865,7 @@ Per invertire gli assi, prima muovi la levetta verticalmente, e poi orizzontalme You may use any Cemuhook compatible UDP input source to provide motion and touch input. - Dovresti utilizzare qualsiasi sorgente di ingresso UDP compatibile con Cemuhook per fornire input di movimento e tocco. + Puoi utilizzare una qualsiasi sorgente di ingresso UDP compatibile con Cemuhook per fornire input di movimento e tocco. @@ -3220,7 +3241,7 @@ Per invertire gli assi, prima muovi la levetta verticalmente, e poi orizzontalme Error creating user image directory - Errore durante la creazione della cartella delle immagini dell'utente + Impossibile creare la cartella delle immagini dell'utente @@ -3240,7 +3261,7 @@ Per invertire gli assi, prima muovi la levetta verticalmente, e poi orizzontalme Error resizing user image - Errore durante il ridimensionamento dell'immagine utente + Impossibile ridimensionare l'immagine utente @@ -3305,18 +3326,18 @@ UUID: %2 Direct Joycon Driver - + Driver Joycon diretto Enable Ring Input - + Abilita Ring-Con Enable - + Abilita @@ -3327,7 +3348,7 @@ UUID: %2 Not connected - + Non connesso @@ -3358,12 +3379,12 @@ UUID: %2 Error enabling ring input - + Impossibile abilitare il Ring-Con Direct Joycon driver is not enabled - + Il driver Joycon diretto non è abilitato @@ -3373,17 +3394,17 @@ UUID: %2 The current mapped device doesn't support the ring controller - + L'attuale dispositivo mappato non supporta il Ring-Con The current mapped device doesn't have a ring attached - + L'attuale dispositivo mappato non è collegato a un Ring-Con Unexpected driver result %1 - + Risultato imprevisto del driver: %1 @@ -4487,12 +4508,12 @@ Trascina i punti per cambiare posizione, oppure clicca due volte la cella in tab Server Address - + Indirizzo del server <html><head/><body><p>Server address of the host</p></body></html> - + <html><head/><body><p>Indirizzo del server dell'host</p></body></html> @@ -4556,524 +4577,534 @@ Trascina i punti per cambiare posizione, oppure clicca due volte la cella in tab L'inizializzazione di Vulkan è fallita durante l'avvio.<br><br>Clicca <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>qui per istruzioni su come risolvere il problema</a>. - + Loading Web Applet... Caricamento dell'applet web... - - + + Disable Web Applet Disabilita l'applet web - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Il numero di shaders al momento in costruzione - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Velocità corrente dell'emulazione. Valori più alti o più bassi di 100% indicano che l'emulazione sta funzionando più velocemente o lentamente rispetto a una Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Il numero di fotogrammi al secondo che il gioco visualizza attualmente. Può variare in base al gioco e alla situazione. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tempo necessario per emulare un fotogramma della Switch, senza tenere conto del limite al framerate o del V-Sync. Per un'emulazione alla massima velocità, il valore non dovrebbe essere superiore a 16.67 ms. - + &Clear Recent Files &Cancella i file recenti - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue &Continua - + &Pause &Pausa - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Formato del gioco obsoleto - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Stai usando una cartella con dentro una ROM decostruita come formato per avviare questo gioco, è un formato obsoleto ed è stato sostituito da altri come NCA, NAX, XCI o NSP. Le ROM decostruite non hanno icone, metadata e non supportano gli aggiornamenti. <br><br>Per una spiegazione sui vari formati di Switch che yuzu supporta, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>controlla la nostra wiki</a>. Questo messaggio non verrà più mostrato. - - + + Error while loading ROM! Errore nel caricamento della ROM! - + The ROM format is not supported. Il formato della ROM non è supportato. - + An error occurred initializing the video core. È stato riscontrato un errore nell'inizializzazione del core video. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Errore nel caricamento della ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Segui <a href='https://yuzu-emu.org/help/quickstart/'>la guida introduttiva di yuzu</a> per rifare il dump dei file.<br>Puoi fare riferimento alla wiki di yuzu</a> o al server Discord di yuzu</a> per assistenza. - + An unknown error occurred. Please see the log for more details. Si è verificato un errore sconosciuto. Visualizza il log per maggiori dettagli. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Chiusura del software in corso... - + Save Data Dati di salvataggio - + Mod Data Dati delle mod - + Error Opening %1 Folder - Errore nell'apertura della cartella %1 + Impossibile aprire la cartella %1 - - + + Folder does not exist! La cartella non esiste! - + Error Opening Transferable Shader Cache - Errore nell'apertura della cache trasferibile degli shader + Impossibile aprire la cache trasferibile degli shader - + Failed to create the shader cache directory for this title. Impossibile creare la cartella della cache degli shader per questo titolo. - + Error Removing Contents - Errore nella rimozione del contentuto + Impossibile rimuovere il contentuto - + Error Removing Update - Errore nella rimozione dell'aggiornamento + Impossibile rimuovere l'aggiornamento - + Error Removing DLC - Errore nella rimozione del DLC + Impossibile rimuovere il DLC - + Remove Installed Game Contents? Rimuovere il contenuto del gioco installato? - + Remove Installed Game Update? Rimuovere l'aggiornamento installato? - + Remove Installed Game DLC? Rimuovere il DLC installato? - + Remove Entry Rimuovi voce - - - - - - + + + + + + Successfully Removed Rimozione completata - + Successfully removed the installed base game. Il gioco base installato è stato rimosso con successo. - + The base game is not installed in the NAND and cannot be removed. Il gioco base non è installato su NAND e non può essere rimosso. - + Successfully removed the installed update. Aggiornamento rimosso con successo. - + There is no update installed for this title. Non c'è alcun aggiornamento installato per questo gioco. - + There are no DLC installed for this title. Non c'è alcun DLC installato per questo gioco. - + Successfully removed %1 installed DLC. %1 DLC rimossi con successo. - + Delete OpenGL Transferable Shader Cache? Vuoi rimuovere la cache trasferibile degli shader OpenGL? - + Delete Vulkan Transferable Shader Cache? Vuoi rimuovere la cache trasferibile degli shader Vulkan? - + Delete All Transferable Shader Caches? Vuoi rimuovere tutte le cache trasferibili degli shader? - + Remove Custom Game Configuration? Rimuovere la configurazione personalizzata del gioco? - + Remove File Rimuovi file - - + + Error Removing Transferable Shader Cache - Errore nella rimozione della cache trasferibile degli shader + Impossibile rimuovere la cache trasferibile degli shader - - + + A shader cache for this title does not exist. Per questo titolo non esiste una cache degli shader. - + Successfully removed the transferable shader cache. La cache trasferibile degli shader è stata rimossa con successo. - + Failed to remove the transferable shader cache. Impossibile rimuovere la cache trasferibile degli shader. - + Error Removing Vulkan Driver Pipeline Cache - Errore nella rimozione della cache delle pipeline del driver Vulkan + Impossibile rimuovere la cache delle pipeline del driver Vulkan - + Failed to remove the driver pipeline cache. Impossibile rimuovere la cache delle pipeline del driver. - - + + Error Removing Transferable Shader Caches - Errore nella rimozione delle cache trasferibili degli shader + Impossibile rimuovere le cache trasferibili degli shader - + Successfully removed the transferable shader caches. Le cache trasferibili degli shader sono state rimosse con successo. - + Failed to remove the transferable shader cache directory. Impossibile rimuovere la cartella della cache trasferibile degli shader. - - + + Error Removing Custom Configuration - Errore nella rimozione della configurazione personalizzata + Impossibile rimuovere la configurazione personalizzata - + A custom configuration for this title does not exist. Non esiste una configurazione personalizzata per questo gioco. - + Successfully removed the custom game configuration. La configurazione personalizzata del gioco è stata rimossa con successo. - + Failed to remove the custom game configuration. Impossibile rimuovere la configurazione personalizzata del gioco. - - + + RomFS Extraction Failed! Estrazione RomFS fallita! - + There was an error copying the RomFS files or the user cancelled the operation. C'è stato un errore nella copia dei file del RomFS o l'operazione è stata annullata dall'utente. - + Full Completa - + Skeleton Cartelle - + Select RomFS Dump Mode Seleziona la modalità di estrazione della RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Seleziona come vorresti estrarre la RomFS. <br>La modalità Completa copierà tutti i file in una nuova cartella mentre<br>la modalità Cartelle creerà solamente le cartelle e le sottocartelle. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Estrazione RomFS in corso... - - + + Cancel Annulla - + RomFS Extraction Succeeded! Estrazione RomFS riuscita! - + The operation completed successfully. L'operazione è stata completata con successo. - - - - - + + + + + Create Shortcut Crea scorciatoia - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Verrà creata una scorciatoia all'AppImage attuale. Potrebbe non funzionare correttamente se effettui un aggiornamento. Vuoi continuare? - + Cannot create shortcut on desktop. Path "%1" does not exist. Impossibile creare la scorciatoia sul desktop. Il percorso "%1" non esiste. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Impossibile creare la scorciatoia nel menù delle applicazioni. Il percorso "%1" non esiste e non può essere creato. - + Create Icon Crea icona - + Cannot create icon file. Path "%1" does not exist and cannot be created. Impossibile creare il file dell'icona. Il percorso "%1" non esiste e non può essere creato. - + Start %1 with the yuzu Emulator Avvia %1 con l'emulatore yuzu - + Failed to create a shortcut at %1 Impossibile creare la scorciatoia in %1 - + Successfully created a shortcut to %1 Scorciatoia creata con successo in %1 - + Error Opening %1 - Errore nell'apertura di %1 + Impossibile aprire %1 - + Select Directory Seleziona cartella - + Properties Proprietà - + The game properties could not be loaded. Non è stato possibile caricare le proprietà del gioco. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Eseguibile Switch (%1);;Tutti i file (*.*) - + Load File Carica file - + Open Extracted ROM Directory Apri cartella ROM estratta - + Invalid Directory Selected Cartella selezionata non valida - + The directory you have selected does not contain a 'main' file. La cartella che hai selezionato non contiene un file "main". - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) File installabili Switch (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Installa file - + %n file(s) remaining %n file rimanente%n file rimanenti%n file rimanenti - + Installing file "%1"... Installazione del file "%1"... - - + + Install Results Risultati dell'installazione - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Per evitare possibli conflitti, sconsigliamo di installare i giochi base su NAND. Usa questa funzione solo per installare aggiornamenti e DLC. - + %n file(s) were newly installed %n nuovo file è stato installato @@ -5082,7 +5113,7 @@ Usa questa funzione solo per installare aggiornamenti e DLC. - + %n file(s) were overwritten %n file è stato sovrascritto @@ -5091,7 +5122,7 @@ Usa questa funzione solo per installare aggiornamenti e DLC. - + %n file(s) failed to install %n file non è stato installato a causa di errori @@ -5100,378 +5131,389 @@ Usa questa funzione solo per installare aggiornamenti e DLC. - + System Application Applicazione di sistema - + System Archive Archivio di sistema - + System Application Update Aggiornamento di un'applicazione di sistema - + Firmware Package (Type A) Pacchetto firmware (tipo A) - + Firmware Package (Type B) Pacchetto firmware (tipo B) - + Game Gioco - + Game Update Aggiornamento di gioco - + Game DLC DLC - + Delta Title Titolo delta - + Select NCA Install Type... Seleziona il tipo di installazione NCA - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Seleziona il tipo del file NCA da installare: (Nella maggior parte dei casi, il valore predefinito 'Gioco' va bene.) - + Failed to Install Installazione fallita - + The title type you selected for the NCA is invalid. Il tipo che hai selezionato per l'NCA non è valido. - + File not found File non trovato - + File "%1" not found File "%1" non trovato - + OK OK - - + + Hardware requirements not met Requisiti hardware non soddisfatti - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Il tuo sistema non soddisfa i requisiti hardware consigliati. La funzionalità di segnalazione della compatibilità è stata disattivata. - + Missing yuzu Account Account di yuzu non trovato - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Per segnalare la compatibilità di un gioco, devi collegare il tuo account yuzu. <br><br/>Per collegare il tuo account yuzu, vai su Emulazione &gt; Configurazione &gt; Web. - + Error opening URL - Errore aprendo l'URL + Impossibile aprire l'URL - + Unable to open the URL "%1". - Impossibile aprire l'URL "% 1". + Non è stato possibile aprire l'URL "%1". - + TAS Recording - + Overwrite file of player 1? Vuoi sovrascrivere il file del giocatore 1? - + Invalid config detected Trovata configurazione invalida - + Handheld controller can't be used on docked mode. Pro controller will be selected. Il controller portatile non può essere utilizzato in modalità dock. Verrà selezionato il controller Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed L'Amiibo corrente è stato rimosso - + Error Errore - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) File Amiibo (%1);; Tutti i file (*.*) - + Load Amiibo Carica Amiibo - + Error loading Amiibo data - Errore nel caricamento dei dati dell'Amiibo + Impossibile caricare i dati dell'Amiibo - + The selected file is not a valid amiibo Il file selezionato non è un Amiibo valido - + The selected file is already on use Il file selezionato è già in uso - + An unknown error occurred Si è verificato un errore sconosciuto - + Capture Screenshot Cattura screenshot - + PNG Image (*.png) Immagine PNG (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running &Interrompi - + &Start &Avvia - + Stop R&ecording Interrompi r&egistrazione - + R&ecord R&egistra - + Building: %n shader(s) Compilazione di %n shaderCompilazione di %n shaderCompilazione di %n shader - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Velocità: %1% / %2% - + Speed: %1% Velocità: %1% - + Game: %1 FPS (Unlocked) Gioco: %1 FPS (Sbloccati) - + Game: %1 FPS Gioco: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMALE - + GPU HIGH GPU ALTA - + GPU EXTREME GPU ESTREMA - + GPU ERROR ERRORE GPU - + DOCKED DOCK - + HANDHELD PORTATILE - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST NEAREST - - + + BILINEAR BILINEARE - + BICUBIC BICUBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA NO AA - + FXAA FXAA - + SMAA SMAA - + + VOLUME: MUTE + VOLUME: MUTO + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + VOLUME: %1% + + + Confirm Key Rederivation Conferma ri-derivazione chiavi - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5488,37 +5530,37 @@ e facoltativamente fai dei backup. Questo eliminerà i tuoi file di chiavi autogenerati e ri-avvierà il processo di derivazione delle chiavi. - + Missing fuses Fusi mancanti - + - Missing BOOT0 - BOOT0 mancante - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main mancante - + - Missing PRODINFO - PRODINFO mancante - + Derivation Components Missing Componenti di derivazione mancanti - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Chiavi di crittografia mancanti. <br>Segui <a href='https://yuzu-emu.org/help/quickstart/'>la guida introduttiva di yuzu</a> per ottenere tutte le tue chiavi, il tuo firmware e i tuoi giochi.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5527,39 +5569,39 @@ Questa operazione potrebbe durare fino a un minuto in base alle prestazioni del tuo sistema. - + Deriving Keys Derivazione chiavi - + Select RomFS Dump Target Seleziona Target dell'Estrazione del RomFS - + Please select which RomFS you would like to dump. Seleziona quale RomFS vorresti estrarre. - + Are you sure you want to close yuzu? Sei sicuro di voler chiudere yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Sei sicuro di voler arrestare l'emulazione? Tutti i progressi non salvati verranno perduti. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5571,44 +5613,44 @@ Desideri uscire comunque? GRenderWindow - - + + OpenGL not available! OpenGL non disponibile! - + OpenGL shared contexts are not supported. Gli shared context di OpenGL non sono supportati. - + yuzu has not been compiled with OpenGL support. yuzu non è stato compilato con il supporto OpenGL. - - + + Error while initializing OpenGL! Errore durante l'inizializzazione di OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. La tua GPU potrebbe non supportare OpenGL, o non hai installato l'ultima versione dei driver video. - + Error while initializing OpenGL 4.6! Errore durante l'inizializzazione di OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 La tua GPU potrebbe non supportare OpenGL 4.6, o non hai installato l'ultima versione dei driver video.<br><br>Renderer GL:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 La tua GPU potrebbe non supportare una o più estensioni OpenGL richieste. Assicurati di aver installato i driver video più recenti.<br><br>Renderer GL:<br>%1<br><br>Estensioni non supportate:<br>%2 @@ -5848,7 +5890,7 @@ Desideri uscire comunque? GameListPlaceholder - + Double-click to add a new folder to the game list Clicca due volte per aggiungere una nuova cartella alla lista dei giochi @@ -6194,51 +6236,56 @@ Messaggio di debug: + Hide Empty Rooms + Nascondi stanze vuote + + + Hide Full Rooms Nascondi stanze piene - + Refresh Lobby Aggiorna lobby - + Password Required to Join Password richiesta per entrare - + Password: Password: - + Players Giocatori - + Room Name Nome stanza - + Preferred Game Gioco preferito - + Host Host - + Refreshing Aggiornamento in corso - + Refresh List Aggiorna lista @@ -6848,7 +6895,7 @@ p, li { white-space: pre-wrap; } - + [not set] [non impost.] @@ -6863,10 +6910,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Asse %1%2 @@ -6880,9 +6927,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [sconosciuto] @@ -7047,15 +7094,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [non valido] - - %1%2Hat %3 @@ -7063,35 +7108,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2Asse %3 - + %1%2Axis %3,%4,%5 %1%2Asse %3,%4,%5 - + %1%2Motion %3 - - %1%2Button %3 %1%2Pulsante %3 - + [unused] [inutilizzato] @@ -7118,12 +7161,12 @@ p, li { white-space: pre-wrap; } Stick L - + Levetta L Stick R - + Levetta R @@ -7178,9 +7221,21 @@ p, li { white-space: pre-wrap; } - - %1%2%3 - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 + diff --git a/dist/languages/ja_JP.ts b/dist/languages/ja_JP.ts index 377c6b522..36735d864 100644 --- a/dist/languages/ja_JP.ts +++ b/dist/languages/ja_JP.ts @@ -941,7 +941,7 @@ This would ban both their forum username and their IP address. Disable Macro HLE - + Macro HLE を無効化 @@ -1505,17 +1505,17 @@ This would ban both their forum username and their IP address. Force 4:3 - 強制的に 4:3 にする + 強制 4:3 Force 21:9 - 強制的に 21:9 にする + 強制 21:9 Force 16:10 - + 強制 16:10 @@ -1545,7 +1545,7 @@ This would ban both their forum username and their IP address. 1.5X (1080p/1620p) [EXPERIMENTAL] - + 1.5X (1080p/1620p) [実験的] @@ -1575,12 +1575,12 @@ This would ban both their forum username and their IP address. 7X (5040p/7560p) - + 7X (5040p/7560p) 8X (5760p/8640p) - + 8X (5760p/8640p) @@ -1615,7 +1615,7 @@ This would ban both their forum username and their IP address. AMD FidelityFX™️ Super Resolution - + AMD FidelityFX™️ Super Resolution @@ -1630,7 +1630,7 @@ This would ban both their forum username and their IP address. SMAA - + SMAA @@ -1650,7 +1650,7 @@ This would ban both their forum username and their IP address. 100% - + 100% @@ -1676,7 +1676,7 @@ This would ban both their forum username and their IP address. SPIR-V (Experimental, Mesa Only) - + SPIR-V (実験的, Mesa のみ) @@ -1715,7 +1715,7 @@ This would ban both their forum username and their IP address. Force maximum clocks (Vulkan only) - + 強制最大クロック (Vulkan のみ) @@ -1729,76 +1729,86 @@ This would ban both their forum username and their IP address. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. 非同期でのシェーダーのコンパイルを有効にします。シェーダーのスタッターが減少する場合があります。この機能は実験的です。 - + Use asynchronous shader building (Hack) 非同期でのシェーダー構築を使用 (ハック) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. 高速なGPUタイミングを有効にします。このオプションは、ほとんどのゲームをその最高のネイティブ解像度で実行することを強制します。 - + Use Fast GPU Time (Hack) 高速なGPUタイミングを有効化(ハック) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. 悲観的なバッファフラッシュを有効にします. このオプションは, 変更されていないバッファを強制的にフラッシュさせるので, パフォーマンスが低下する可能性があります. - + Use pessimistic buffer flushes (Hack) 悲観的なバッファフラッシュを使用 (ハック) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache - + Vulkan パイプラインキャッシュを使用 - + Anisotropic Filtering: 異方性フィルタリング： - + Automatic 自動 - + Default デフォルト - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2186,7 +2196,7 @@ This would ban both their forum username and their IP address. - + Configure 設定 @@ -2213,6 +2223,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu yuzuの再起動が必要 @@ -2237,22 +2248,27 @@ This would ban both their forum username and their IP address. - + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + Enable mouse panning - + Mouse sensitivity マウス感度 - + % % - + Motion / Touch モーション / タッチ @@ -2272,47 +2288,47 @@ This would ban both their forum username and their IP address. Input Profiles - + 入力プロファイル Player 1 Profile - + プレイヤー1 プロファイル Player 2 Profile - + プレイヤー2 プロファイル Player 3 Profile - + プレイヤー3 プロファイル Player 4 Profile - + プレイヤー4 プロファイル Player 5 Profile - + プレイヤー5 プロファイル Player 6 Profile - + プレイヤー6 プロファイル Player 7 Profile - + プレイヤー7 プロファイル Player 8 Profile - + プレイヤー8 プロファイル @@ -2322,7 +2338,7 @@ This would ban both their forum username and their IP address. Player %1 profile - + プレイヤー%1 プロファイル @@ -2364,7 +2380,7 @@ This would ban both their forum username and their IP address. - + Left Stick Lスティック @@ -2458,14 +2474,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2484,7 +2500,7 @@ This would ban both their forum username and their IP address. - + Plus + @@ -2497,15 +2513,15 @@ This would ban both their forum username and their IP address. - + R R - + ZR ZR @@ -2562,236 +2578,241 @@ This would ban both their forum username and their IP address. - + Right Stick Rスティック - - - - + + + + Clear クリア - - - - - + + + + + [not set] [未設定] - - + + Invert button ボタンを反転 - - + + Toggle button - - + + Turbo button + + + + + Invert axis 軸を反転 - - - + + + Set threshold しきい値を設定 - - + + Choose a value between 0% and 100% 0%から100%の間の値を選択してください - + Toggle axis - + Set gyro threshold ジャイロのしきい値を設定 - + Map Analog Stick アナログスティックをマップ - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. OKを押した後、スティックを水平方向に動かし、次に垂直方向に動かしてください。 軸を反転させる場合、 最初に垂直方向に動かし、次に水平方向に動かしてください。 - + Center axis - - + + Deadzone: %1% デッドゾーン：%1% - - + + Modifier Range: %1% 変更範囲：%1% - - + + Pro Controller Proコントローラ - + Dual Joycons Joy-Con(L/R) - + Left Joycon Joy-Con(L) - + Right Joycon Joy-Con(R) - + Handheld 携帯モード - + GameCube Controller ゲームキューブコントローラ - + Poke Ball Plus モンスターボールプラス - + NES Controller ファミコン・コントローラー - + SNES Controller スーパーファミコン・コントローラー - + N64 Controller ニンテンドウ64・コントローラー - + Sega Genesis メガドライブ - + Start / Pause スタート/ ポーズ - + Z Z - + Control Stick - + C-Stick Cスティック - + Shake! 振ってください - + [waiting] [待機中] - + New Profile 新規プロファイル - + Enter a profile name: プロファイル名を入力: - - + + Create Input Profile 入力プロファイルを作成 - + The given profile name is not valid! プロファイル名が無効です! - + Failed to create the input profile "%1" 入力プロファイル "%1" の作成に失敗しました - + Delete Input Profile 入力プロファイルを削除 - + Failed to delete the input profile "%1" 入力プロファイル "%1" の削除に失敗しました - + Load Input Profile 入力プロファイルをロード - + Failed to load the input profile "%1" 入力プロファイル "%1" のロードに失敗しました - + Save Input Profile 入力プロファイルをセーブ - + Failed to save the input profile "%1" 入力プロファイル "%1" のセーブに失敗しました @@ -3083,7 +3104,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< Input Profiles - + 入力プロファイル @@ -3265,7 +3286,7 @@ To invert the axes, first move your joystick vertically, and then horizontally.< Delete this user? All of the user's save data will be deleted. - + このユーザを削除しますか? このユーザのすべてのセーブデータが削除されます. @@ -3276,7 +3297,8 @@ To invert the axes, first move your joystick vertically, and then horizontally.< Name: %1 UUID: %2 - + 名称: %1 +UUID: %2 @@ -3294,7 +3316,7 @@ UUID: %2 Virtual Ring Sensor Parameters - + 仮想リングセンサー パラメータ @@ -3327,7 +3349,7 @@ UUID: %2 Enable - + 有効 @@ -3338,7 +3360,7 @@ UUID: %2 Not connected - + 接続なし @@ -3703,7 +3725,7 @@ UUID: %2 American English - + アメリカ英語 @@ -3803,7 +3825,7 @@ UUID: %2 Device Name - + デバイス名 @@ -4167,7 +4189,7 @@ Drag points to change position, or double-click table cells to edit values. Show Compatibility List - + 互換性リストを表示 @@ -4177,12 +4199,12 @@ Drag points to change position, or double-click table cells to edit values. Show Size Column - + サイズ列を表示 Show File Types Column - + ファイルタイプ列を表示 @@ -4498,7 +4520,7 @@ Drag points to change position, or double-click table cells to edit values. Server Address - + サーバアドレス @@ -4567,916 +4589,937 @@ Drag points to change position, or double-click table cells to edit values.ブート時にVulkanの初期化に失敗しました。<br><br>この問題を解決するための手順は<a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>こちら</a>。 - + Loading Web Applet... Webアプレットをロード中... - - + + Disable Web Applet Webアプレットの無効化 - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Webアプレットを無効にすると、未定義の動作になる可能性があるため、スーパーマリオ3Dオールスターズでのみ使用するようにしてください。本当にWebアプレットを無効化しますか？ (デバッグ設定で再度有効にすることができます）。 - + The amount of shaders currently being built ビルド中のシェーダー数 - + The current selected resolution scaling multiplier. 現在選択されている解像度の倍率。 - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. 現在のエミュレーション速度。値が100%より高いか低い場合、エミュレーション速度がSwitchより速いか遅いことを示します。 - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. ゲームが現在表示している1秒あたりのフレーム数。これはゲームごと、シーンごとに異なります。 - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Switchフレームをエミュレートするのにかかる時間で、フレームリミットやV-Syncは含まれません。フルスピードエミュレーションの場合、最大で16.67ミリ秒になります。 - + &Clear Recent Files 最近のファイルをクリア(&C) - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue 再開(&C) - + &Pause 中断(&P) - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzuはゲームを起動しています - + Warning Outdated Game Format 古いゲームフォーマットの警告 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. このゲームでは、分解されたROMディレクトリフォーマットを使用しています。これは、NCA、NAX、XCI、またはNSPなどに取って代わられた古いフォーマットです。分解されたROMディレクトリには、アイコン、メタデータ、およびアップデートサポートがありません。<br><br>yuzuがサポートするSwitchフォーマットの説明については、<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>wikiをチェックしてください</a>。このメッセージは二度と表示されません。 - - + + Error while loading ROM! ROMロード中にエラーが発生しました！ - + The ROM format is not supported. このROMフォーマットはサポートされていません。 - + An error occurred initializing the video core. ビデオコア初期化中にエラーが発生しました。 - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzuは、ビデオコアの実行中にエラーが発生しました。これは通常、内蔵GPUも含め、古いGPUドライバが原因です。詳しくはログをご覧ください。ログへのアクセス方法については、以下のページをご覧ください:<a href='https://yuzu-emu.org/help/reference/log-files/'>ログファイルのアップロード方法について</a>。 - + Error while loading ROM! %1 %1 signifies a numeric error code. ROMのロード中にエラー! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br><a href='https://yuzu-emu.org/help/quickstart/'>yuzuクイックスタートガイド</a>を参照してファイルを再ダンプしてください。<br>またはyuzu wiki及び</a>yuzu Discord</a>を参照するとよいでしょう。 - + An unknown error occurred. Please see the log for more details. 不明なエラーが発生しました。詳細はログを確認して下さい。 - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data データのセーブ - + Mod Data Modデータ - + Error Opening %1 Folder ”%1”フォルダを開けませんでした - - + + Folder does not exist! フォルダが存在しません！ - + Error Opening Transferable Shader Cache シェーダキャッシュを開けませんでした - + Failed to create the shader cache directory for this title. このタイトル用のシェーダキャッシュディレクトリの作成に失敗しました - + Error Removing Contents - + コンテンツの削除エラー - + Error Removing Update - + アップデートの削除エラー - + Error Removing DLC - + DLC の削除エラー - + Remove Installed Game Contents? - + インストールされたゲームのコンテンツを削除しますか? - + Remove Installed Game Update? - + インストールされたゲームのアップデートを削除しますか? - + Remove Installed Game DLC? - + インストールされたゲームの DLC を削除しますか? - + Remove Entry エントリ削除 - - - - - - + + + + + + Successfully Removed 削除しました - + Successfully removed the installed base game. インストールされたゲームを正常に削除しました。 - + The base game is not installed in the NAND and cannot be removed. ゲームはNANDにインストールされていないため、削除できません。 - + Successfully removed the installed update. インストールされたアップデートを正常に削除しました。 - + There is no update installed for this title. このタイトルのアップデートはインストールされていません。 - + There are no DLC installed for this title. このタイトルにはDLCがインストールされていません。 - + Successfully removed %1 installed DLC. ％1にインストールされたDLCを正常に削除しました。 - + Delete OpenGL Transferable Shader Cache? 転送可能なOpenGLシェーダキャッシュを削除しますか? - + Delete Vulkan Transferable Shader Cache? 転送可能なVulkanシェーダキャッシュを削除しますか? - + Delete All Transferable Shader Caches? 転送可能なすべてのシェーダキャッシュを削除しますか? - + Remove Custom Game Configuration? このタイトルのカスタム設定を削除しますか？ - + Remove File ファイル削除 - - + + Error Removing Transferable Shader Cache 転送可能なシェーダーキャッシュの削除エラー - - + + A shader cache for this title does not exist. このタイトル用のシェーダキャッシュは存在しません。 - + Successfully removed the transferable shader cache. 転送可能なシェーダーキャッシュが正常に削除されました。 - + Failed to remove the transferable shader cache. 転送可能なシェーダーキャッシュを削除できませんでした。 - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches 転送可能なシェーダキャッシュの削除エラー - + Successfully removed the transferable shader caches. 転送可能なシェーダキャッシュを正常に削除しました。 - + Failed to remove the transferable shader cache directory. 転送可能なシェーダキャッシュディレクトリの削除に失敗しました。 - - + + Error Removing Custom Configuration カスタム設定の削除エラー - + A custom configuration for this title does not exist. このタイトルのカスタム設定は存在しません。 - + Successfully removed the custom game configuration. カスタム設定を正常に削除しました。 - + Failed to remove the custom game configuration. カスタム設定の削除に失敗しました。 - - + + RomFS Extraction Failed! RomFSの解析に失敗しました！ - + There was an error copying the RomFS files or the user cancelled the operation. RomFSファイルをコピー中にエラーが発生したか、ユーザー操作によりキャンセルされました。 - + Full フル - + Skeleton スケルトン - + Select RomFS Dump Mode RomFSダンプモードの選択 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. RomFSのダンプ方法を選択してください。<br>”完全”はすべてのファイルが新しいディレクトリにコピーされます。<br>”スケルトン”はディレクトリ構造を作成するだけです。 - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 に RomFS を展開するための十分な空き領域がありません。Emulation > Configure > System > Filesystem > Dump Root で、空き容量を確保するか、別のダンプディレクトリを選択してください。 - + Extracting RomFS... RomFSを解析中... - - + + Cancel キャンセル - + RomFS Extraction Succeeded! RomFS解析成功！ - + The operation completed successfully. 操作は成功しました。 - - - - - + + + + + Create Shortcut - + ショートカットを作成 - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + アイコンを作成 - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 ”%1”を開けませんでした - + Select Directory ディレクトリの選択 - + Properties プロパティ - + The game properties could not be loaded. ゲームプロパティをロード出来ませんでした。 - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch実行ファイル (%1);;すべてのファイル (*.*) - + Load File ファイルのロード - + Open Extracted ROM Directory 展開されているROMディレクトリを開く - + Invalid Directory Selected 無効なディレクトリが選択されました - + The directory you have selected does not contain a 'main' file. 選択されたディレクトリに”main”ファイルが見つかりませんでした。 - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) インストール可能なスイッチファイル (*.nca *.nsp *.xci);;任天堂コンテンツアーカイブ (*.nca);;任天堂サブミッションパッケージ (*.nsp);;NXカートリッジイメージ (*.xci) - + Install Files ファイルのインストール - + %n file(s) remaining 残り %n ファイル - + Installing file "%1"... "%1"ファイルをインストールしています・・・ - - + + Install Results インストール結果 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 競合を避けるため、NANDにゲーム本体をインストールすることはお勧めしません。 この機能は、アップデートやDLCのインストールにのみ使用してください。 - + %n file(s) were newly installed %n ファイルが新たにインストールされました - + %n file(s) were overwritten %n ファイルが上書きされました - + %n file(s) failed to install %n ファイルのインストールに失敗しました - + System Application システムアプリケーション - + System Archive システムアーカイブ - + System Application Update システムアプリケーションアップデート - + Firmware Package (Type A) ファームウェアパッケージ（Type A） - + Firmware Package (Type B) ファームウェアパッケージ（Type B） - + Game ゲーム - + Game Update ゲームアップデート - + Game DLC ゲームDLC - + Delta Title 差分タイトル - + Select NCA Install Type... NCAインストール種別を選択・・・ - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) インストールするNCAタイトル種別を選択して下さい： （ほとんどの場合、デフォルトの”ゲーム”で問題ありません。） - + Failed to Install インストール失敗 - + The title type you selected for the NCA is invalid. 選択されたNCAのタイトル種別が無効です。 - + File not found ファイルが存在しません - + File "%1" not found ファイル”%1”が存在しません - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account yuzuアカウントが存在しません - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. ゲームの互換性テストケースを送信するには、yuzuアカウントをリンクする必要があります。<br><br/>yuzuアカウントをリンクするには、エミュレーション ＞ 設定 ＞ Web から行います。 - + Error opening URL URLオープンエラー - + Unable to open the URL "%1". URL"%1"を開けません。 - + TAS Recording TAS 記録中 - + Overwrite file of player 1? プレイヤー1のファイルを上書きしますか? - + Invalid config detected 無効な設定を検出しました - + Handheld controller can't be used on docked mode. Pro controller will be selected. 携帯コントローラはドックモードで使用できないため、Proコントローラが選択されます。 - - + + Amiibo Amiibo - - + + The current amiibo has been removed 現在の amiibo は削除されました - + Error エラー - - + + The current game is not looking for amiibos 現在のゲームはamiiboを要求しません - + Amiibo File (%1);; All Files (*.*) amiiboファイル (%1);;すべてのファイル (*.*) - + Load Amiibo amiiboのロード - + Error loading Amiibo data amiiboデータ読み込み中にエラーが発生しました - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot スクリーンショットのキャプチャ - + PNG Image (*.png) PNG画像 (*.png) - + TAS state: Running %1/%2 TAS 状態: 実行中 %1/%2 - + TAS state: Recording %1 TAS 状態: 記録中 %1 - + TAS state: Idle %1/%2 TAS 状態: アイドル %1/%2 - + TAS State: Invalid TAS 状態: 無効 - + &Stop Running 実行停止(&S) - + &Start 実行(&S) - + Stop R&ecording 記録停止(&R) - + R&ecord 記録(&R) - + Building: %n shader(s) 構築中: %n シェーダー - + Scale: %1x %1 is the resolution scaling factor 拡大率: %1x - + Speed: %1% / %2% 速度：%1% / %2% - + Speed: %1% 速度：%1% - + Game: %1 FPS (Unlocked) Game: %1 FPS（制限解除） - + Game: %1 FPS ゲーム：%1 FPS - + Frame: %1 ms フレーム：%1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HIGH - + GPU EXTREME GPU EXTREME - + GPU ERROR GPU ERROR - + DOCKED DOCKED - + HANDHELD HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NULL - + NEAREST NEAREST - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA NO AA - + FXAA FXAA - + SMAA - + SMAA - + + VOLUME: MUTE + 音量: ミュート + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + 音量: %1% + + + Confirm Key Rederivation キーの再取得確認 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5493,37 +5536,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 実行すると、自動生成された鍵ファイルが削除され、鍵生成モジュールが再実行されます。 - + Missing fuses ヒューズがありません - + - Missing BOOT0 - BOOT0がありません - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Mainがありません - + - Missing PRODINFO - PRODINFOがありません - + Derivation Components Missing 派生コンポーネントがありません - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 暗号化キーがありません。<br>キー、ファームウェア、ゲームを取得するには<a href='https://yuzu-emu.org/help/quickstart/'>yuzu クイックスタートガイド</a>を参照ください。<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5532,39 +5575,39 @@ on your system's performance. 1分以上かかります。 - + Deriving Keys 派生キー - + Select RomFS Dump Target RomFSダンプターゲットの選択 - + Please select which RomFS you would like to dump. ダンプしたいRomFSを選択して下さい。 - + Are you sure you want to close yuzu? yuzuを終了しますか？ - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. エミュレーションを停止しますか？セーブされていない進行状況は失われます。 - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5576,44 +5619,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGLは使用できません！ - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzuはOpenGLサポート付きでコンパイルされていません。 - - + + Error while initializing OpenGL! OpenGL初期化エラー - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. GPUがOpenGLをサポートしていないか、グラフィックスドライバーが最新ではありません。 - + Error while initializing OpenGL 4.6! OpenGL4.6初期化エラー! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 GPUがOpenGL4.6をサポートしていないか、グラフィックスドライバーが最新ではありません。<br><br>GL レンダラ:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 GPUが1つ以上の必要なOpenGL拡張機能をサポートしていない可能性があります。最新のグラフィックドライバを使用していることを確認してください。<br><br>GL レンダラ:<br>%1<br><br>サポートされていない拡張機能:<br>%2 @@ -5714,17 +5757,17 @@ Would you like to bypass this and exit anyway? Create Shortcut - + ショートカットを作成 Add to Desktop - + デスクトップに追加 Add to Applications Menu - + アプリケーションメニューに追加 @@ -5853,7 +5896,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list 新しいゲームリストフォルダを追加するにはダブルクリックしてください。 @@ -5891,7 +5934,7 @@ Would you like to bypass this and exit anyway? Preferred Game - + 優先ゲーム @@ -5926,7 +5969,7 @@ Would you like to bypass this and exit anyway? Load Previous Ban List - + 以前の BAN リストをロード @@ -6199,51 +6242,56 @@ Debug Message: + Hide Empty Rooms + 空のルームを隠す + + + Hide Full Rooms 満室のルームを隠す - + Refresh Lobby ロビー更新 - + Password Required to Join 参加にはパスワードが必要です。 - + Password: パスワード: - + Players プレイヤー - + Room Name ルーム名 - + Preferred Game - + 優先ゲーム - + Host ホスト - + Refreshing 更新中 - + Refresh List リスト更新 @@ -6318,7 +6366,7 @@ Debug Message: &Multiplayer - + マルチプレイヤー (&M) @@ -6408,27 +6456,27 @@ Debug Message: &Browse Public Game Lobby - + 公開ゲームロビーを参照 (&B) &Create Room - + ルームを作成 (&C) &Leave Room - + ルームを退出 (&L) &Direct Connect to Room - + ルームに直接接続 (&D) &Show Current Room - + 現在のルームを表示 (&S) @@ -6853,7 +6901,7 @@ p, li { white-space: pre-wrap; } - + [not set] [未設定] @@ -6868,10 +6916,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 軸 %1%2 @@ -6885,9 +6933,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [不明] @@ -7052,15 +7100,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [無効] - - %1%2Hat %3 @@ -7068,35 +7114,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 - + %1%2Axis %3,%4,%5 - + %1%2Motion %3 - - %1%2Button %3 %1%2ボタン %3 - + [unused] [未使用] @@ -7123,12 +7167,12 @@ p, li { white-space: pre-wrap; } Stick L - + L スティック Stick R - + R スティック @@ -7183,9 +7227,21 @@ p, li { white-space: pre-wrap; } - - %1%2%3 - %1%2%3 + + %1%2%3%4 + %1%2%3%4 + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 + @@ -7193,17 +7249,17 @@ p, li { white-space: pre-wrap; } Amiibo Settings - + Amiibo 設定 Amiibo Info - + Amiibo 情報 Series - + シリーズ @@ -7218,7 +7274,7 @@ p, li { white-space: pre-wrap; } Amiibo Data - + Amiibo データ @@ -7233,32 +7289,32 @@ p, li { white-space: pre-wrap; } Creation Date - + 作成日時 dd/MM/yyyy - + yyyy/MM/dd Modification Date - + 更新日時 dd/MM/yyyy - + yyyy/MM/dd Game Data - + ゲームデータ Game Id - + ゲームID @@ -7273,7 +7329,7 @@ p, li { white-space: pre-wrap; } File Path - + ファイルパス diff --git a/dist/languages/ko_KR.ts b/dist/languages/ko_KR.ts index 6bed72a64..cebba03aa 100644 --- a/dist/languages/ko_KR.ts +++ b/dist/languages/ko_KR.ts @@ -1733,76 +1733,86 @@ This would ban both their forum username and their IP address. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. 비동기 셰이더 컴파일을 활성화하여 셰이더의 버벅임을 감소시킬 수 있습니다. 이 기능은 실험적 기능입니다. - + Use asynchronous shader building (Hack) 비동기식 셰이더 빌드 사용(Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. 빠른 GPU 시간을 활성화합니다. 이 옵션을 사용하면 대부분의 게임이 가장 높은 기본 해상도에서 실행됩니다. - + Use Fast GPU Time (Hack) 빠른 GPU 시간 사용(Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. 비관적 버퍼 플러시를 활성화합니다. 이 옵션은 수정되지 않은 버퍼를 강제로 비우므로 성능이 저하될 수 있습니다. - + Use pessimistic buffer flushes (Hack) 비관적 버퍼 플러시 사용(Hack) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. GPU 공급업체별 파이프라인 캐시를 활성화합니다. 이 옵션은 Vulkan 드라이버가 파이프라인 캐시 파일을 내부에 저장하지 않는 경우 셰이더 로딩 시간을 크게 개선할 수 있습니다. - + Use Vulkan pipeline cache Vulkan 파이프라인 캐시 사용 - + Anisotropic Filtering: 비등방성 필터링: - + Automatic 자동 - + Default 기본값 - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2190,7 +2200,7 @@ This would ban both their forum username and their IP address. - + Configure 설정 @@ -2217,6 +2227,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu yuzu를 다시 시작해야 합니다. @@ -2241,22 +2252,27 @@ This would ban both their forum username and their IP address. - + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + Enable mouse panning 마우스 패닝 활성화 - + Mouse sensitivity 마우스 감도 - + % % - + Motion / Touch 모션 컨트롤/ 터치 @@ -2368,7 +2384,7 @@ This would ban both their forum username and their IP address. - + Left Stick L 스틱 @@ -2462,14 +2478,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2488,7 +2504,7 @@ This would ban both their forum username and their IP address. - + Plus + @@ -2501,15 +2517,15 @@ This would ban both their forum username and their IP address. - + R R - + ZR ZR @@ -2566,236 +2582,241 @@ This would ban both their forum username and their IP address. - + Right Stick R 스틱 - - - - + + + + Clear 초기화 - - - - - + + + + + [not set] [설정 안 됨] - - + + Invert button 버튼 반전 - - + + Toggle button 토글 버튼 - - + + Turbo button + + + + + Invert axis 축 뒤집기 - - - + + + Set threshold 임계값 설정 - - + + Choose a value between 0% and 100% 0%에서 100% 안의 값을 고르세요 - + Toggle axis axis 토글 - + Set gyro threshold 자이로 임계값 설정 - + Map Analog Stick 아날로그 스틱 맵핑 - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. OK 버튼을 누른 후에 먼저 조이스틱을 수평으로 움직이고, 그 다음 수직으로 움직이세요. 축을 뒤집으려면 수직으로 먼저 움직인 뒤에 수평으로 움직이세요. - + Center axis 중심축 - - + + Deadzone: %1% 데드존: %1% - - + + Modifier Range: %1% 수정자 범위: %1% - - + + Pro Controller 프로 컨트롤러 - + Dual Joycons 듀얼 조이콘 - + Left Joycon 왼쪽 조이콘 - + Right Joycon 오른쪽 조이콘 - + Handheld 휴대 모드 - + GameCube Controller GameCube 컨트롤러 - + Poke Ball Plus 몬스터볼 Plus - + NES Controller NES 컨트롤러 - + SNES Controller SNES 컨트롤러 - + N64 Controller N64 컨트롤러 - + Sega Genesis 세가 제네시스 - + Start / Pause 시작 / 일시중지 - + Z Z - + Control Stick 컨트롤 스틱 - + C-Stick C-Stick - + Shake! 흔드세요! - + [waiting] [대기중] - + New Profile 새 프로필 - + Enter a profile name: 프로필 이름을 입력하세요: - - + + Create Input Profile 입력 프로필 생성 - + The given profile name is not valid! 해당 프로필 이름은 사용할 수 없습니다! - + Failed to create the input profile "%1" "%1" 입력 프로필 생성 실패 - + Delete Input Profile 입력 프로필 삭제 - + Failed to delete the input profile "%1" "%1" 입력 프로필 삭제 실패 - + Load Input Profile 입력 프로필 불러오기 - + Failed to load the input profile "%1" "%1" 입력 프로필 불러오기 실패 - + Save Input Profile 입력 프로필 저장 - + Failed to save the input profile "%1" "%1" 입력 프로필 저장 실패 @@ -4572,916 +4593,937 @@ Drag points to change position, or double-click table cells to edit values.부팅하는 동안 Vulkan 초기화에 실패했습니다.<br><br>문제 해결 지침을 보려면 <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>여기</a>를 클릭하세요. - + Loading Web Applet... 웹 애플릿을 로드하는 중... - - + + Disable Web Applet 웹 애플릿 비활성화 - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) 웹 애플릿을 비활성화하면 정의되지 않은 동작이 발생할 수 있으며 Super Mario 3D All-Stars에서만 사용해야 합니다. 웹 애플릿을 비활성화하시겠습니까? (디버그 설정에서 다시 활성화할 수 있습니다.) - + The amount of shaders currently being built 현재 생성중인 셰이더의 양 - + The current selected resolution scaling multiplier. 현재 선택된 해상도 배율입니다. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. 현재 에뮬레이션 속도. 100%보다 높거나 낮은 값은 에뮬레이션이 Switch보다 빠르거나 느린 것을 나타냅니다. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. 게임이 현재 표시하고 있는 초당 프레임 수입니다. 이것은 게임마다 다르고 장면마다 다릅니다. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. 프레임 제한이나 수직 동기화를 계산하지 않고 Switch 프레임을 에뮬레이션 하는 데 걸린 시간. 최대 속도로 에뮬레이트 중일 때에는 대부분 16.67 ms 근처입니다. - + &Clear Recent Files Clear Recent Files(&C) - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue 재개(&C) - + &Pause 일시중지(&P) - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu가 게임을 실행중입니다 - + Warning Outdated Game Format 오래된 게임 포맷 경고 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. 이 게임 파일은 '분해된 ROM 디렉토리'라는 오래된 포맷을 사용하고 있습니다. 해당 포맷은 NCA, NAX, XCI 또는 NSP와 같은 다른 포맷으로 대체되었으며 분해된 ROM 디렉토리에는 아이콘, 메타 데이터 및 업데이트가 지원되지 않습니다.<br><br>yuzu가 지원하는 다양한 Switch 포맷에 대한 설명은 <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>위키를 확인하세요.</a> 이 메시지는 다시 표시되지 않습니다. - - + + Error while loading ROM! ROM 로드 중 오류 발생! - + The ROM format is not supported. 지원되지 않는 롬 포맷입니다. - + An error occurred initializing the video core. 비디오 코어를 초기화하는 동안 오류가 발생했습니다. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. 비디오 코어를 실행하는 동안 yuzu에 오류가 발생했습니다. 이것은 일반적으로 통합 드라이버를 포함하여 오래된 GPU 드라이버로 인해 발생합니다. 자세한 내용은 로그를 참조하십시오. 로그 액세스에 대한 자세한 내용은 <a href='https://yuzu-emu.org/help/reference/log-files/'>로그 파일 업로드 방법</a> 페이지를 참조하세요. - + Error while loading ROM! %1 %1 signifies a numeric error code. ROM 불러오는 중 오류 발생! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>파일들을 다시 덤프하기 위해<a href='https://yuzu-emu.org/help/quickstart/'>yuzu 빠른 시작 가이드</a> 를 따라주세요.<br>도움이 필요할 시 yuzu 위키</a> 를 참고하거나 yuzu 디스코드</a> 를 이용해보세요. - + An unknown error occurred. Please see the log for more details. 알 수 없는 오류가 발생했습니다. 자세한 내용은 로그를 참고하십시오. - + (64-bit) (64비트) - + (32-bit) (32비트) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... 소프트웨어를 닫는 중... - + Save Data 세이브 데이터 - + Mod Data 모드 데이터 - + Error Opening %1 Folder %1 폴더 열기 오류 - - + + Folder does not exist! 폴더가 존재하지 않습니다! - + Error Opening Transferable Shader Cache 전송 가능한 셰이더 캐시 열기 오류 - + Failed to create the shader cache directory for this title. 이 타이틀에 대한 셰이더 캐시 디렉토리를 생성하지 못했습니다. - + Error Removing Contents 콘텐츠 제거 중 오류 발생 - + Error Removing Update 업데이트 제거 오류 - + Error Removing DLC DLC 제거 오류 - + Remove Installed Game Contents? 설치된 게임 콘텐츠를 제거하겠습니까? - + Remove Installed Game Update? 설치된 게임 업데이트를 제거하겠습니까? - + Remove Installed Game DLC? 설치된 게임 DLC를 제거하겠습니까? - + Remove Entry 항목 제거 - - - - - - + + + + + + Successfully Removed 삭제 완료 - + Successfully removed the installed base game. 설치된 기본 게임을 성공적으로 제거했습니다. - + The base game is not installed in the NAND and cannot be removed. 기본 게임은 NAND에 설치되어 있지 않으며 제거 할 수 없습니다. - + Successfully removed the installed update. 설치된 업데이트를 성공적으로 제거했습니다. - + There is no update installed for this title. 이 타이틀에 대해 설치된 업데이트가 없습니다. - + There are no DLC installed for this title. 이 타이틀에 설치된 DLC가 없습니다. - + Successfully removed %1 installed DLC. 설치된 %1 DLC를 성공적으로 제거했습니다. - + Delete OpenGL Transferable Shader Cache? OpenGL 전송 가능한 셰이더 캐시를 삭제하시겠습니까? - + Delete Vulkan Transferable Shader Cache? Vulkan 전송 가능한 셰이더 캐시를 삭제하시겠습니까? - + Delete All Transferable Shader Caches? 모든 전송 가능한 셰이더 캐시를 삭제하시겠습니까? - + Remove Custom Game Configuration? 사용자 지정 게임 구성을 제거 하시겠습니까? - + Remove File 파일 제거 - - + + Error Removing Transferable Shader Cache 전송 가능한 셰이더 캐시 제거 오류 - - + + A shader cache for this title does not exist. 이 타이틀에 대한 셰이더 캐시가 존재하지 않습니다. - + Successfully removed the transferable shader cache. 전송 가능한 셰이더 캐시를 성공적으로 제거했습니다. - + Failed to remove the transferable shader cache. 전송 가능한 셰이더 캐시를 제거하지 못했습니다. - + Error Removing Vulkan Driver Pipeline Cache Vulkan 드라이버 파이프라인 캐시 제거 오류 - + Failed to remove the driver pipeline cache. 드라이버 파이프라인 캐시를 제거하지 못했습니다. - - + + Error Removing Transferable Shader Caches 전송 가능한 셰이더 캐시 제거 오류 - + Successfully removed the transferable shader caches. 전송 가능한 셰이더 캐시를 성공적으로 제거했습니다. - + Failed to remove the transferable shader cache directory. 전송 가능한 셰이더 캐시 디렉토리를 제거하지 못했습니다. - - + + Error Removing Custom Configuration 사용자 지정 구성 제거 오류 - + A custom configuration for this title does not exist. 이 타이틀에 대한 사용자 지정 구성이 존재하지 않습니다. - + Successfully removed the custom game configuration. 사용자 지정 게임 구성을 성공적으로 제거했습니다. - + Failed to remove the custom game configuration. 사용자 지정 게임 구성을 제거하지 못했습니다. - - + + RomFS Extraction Failed! RomFS 추출 실패! - + There was an error copying the RomFS files or the user cancelled the operation. RomFS 파일을 복사하는 중에 오류가 발생했거나 사용자가 작업을 취소했습니다. - + Full 전체 - + Skeleton 뼈대 - + Select RomFS Dump Mode RomFS 덤프 모드 선택 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. RomFS 덤프 방법을 선택하십시오.<br>전체는 모든 파일을 새 디렉토리에 복사하고<br>뼈대는 디렉토리 구조 만 생성합니다. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1에 RomFS를 추출하기에 충분한 여유 공간이 없습니다. 공간을 확보하거나 에뮬레이견 > 설정 > 시스템 > 파일시스템 > 덤프 경로에서 다른 덤프 디렉토리를 선택하십시오. - + Extracting RomFS... RomFS 추출 중... - - + + Cancel 취소 - + RomFS Extraction Succeeded! RomFS 추출이 성공했습니다! - + The operation completed successfully. 작업이 성공적으로 완료되었습니다. - - - - - + + + + + Create Shortcut 바로가기 만들기 - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? 현재 AppImage에 대한 바로 가기가 생성됩니다. 업데이트하면 제대로 작동하지 않을 수 있습니다. 계속합니까? - + Cannot create shortcut on desktop. Path "%1" does not exist. 바탕 화면에 바로가기를 만들 수 없습니다. 경로 "%1"이(가) 존재하지 않습니다. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. 애플리케이션 메뉴에서 바로가기를 만들 수 없습니다. 경로 "%1"이(가) 존재하지 않으며 생성할 수 없습니다. - + Create Icon 아이콘 만들기 - + Cannot create icon file. Path "%1" does not exist and cannot be created. 아이콘 파일을 만들 수 없습니다. 경로 "%1"이(가) 존재하지 않으며 생성할 수 없습니다. - + Start %1 with the yuzu Emulator yuzu 에뮬레이터로 %1 시작 - + Failed to create a shortcut at %1 %1에서 바로가기를 만들기 실패 - + Successfully created a shortcut to %1 %1 바로가기를 성공적으로 만듬 - + Error Opening %1 %1 열기 오류 - + Select Directory 경로 선택 - + Properties 속성 - + The game properties could not be loaded. 게임 속성을 로드 할 수 없습니다. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch 실행파일 (%1);;모든 파일 (*.*) - + Load File 파일 로드 - + Open Extracted ROM Directory 추출된 ROM 디렉토리 열기 - + Invalid Directory Selected 잘못된 디렉토리 선택 - + The directory you have selected does not contain a 'main' file. 선택한 디렉토리에 'main'파일이 없습니다. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) 설치 가능한 Switch 파일 (*.nca *.nsp *.xci);;Nintendo 컨텐츠 아카이브 (*.nca);;Nintendo 서브미션 패키지 (*.nsp);;NX 카트리지 이미지 (*.xci) - + Install Files 파일 설치 - + %n file(s) remaining %n개의 파일이 남음 - + Installing file "%1"... 파일 "%1" 설치 중... - - + + Install Results 설치 결과 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 충돌을 피하기 위해, 낸드에 베이스 게임을 설치하는 것을 권장하지 않습니다. 이 기능은 업데이트나 DLC를 설치할 때에만 사용해주세요. - + %n file(s) were newly installed %n개의 파일이 새로 설치되었습니다. - + %n file(s) were overwritten %n개의 파일을 덮어썼습니다. - + %n file(s) failed to install %n개의 파일을 설치하지 못했습니다. - + System Application 시스템 애플리케이션 - + System Archive 시스템 아카이브 - + System Application Update 시스템 애플리케이션 업데이트 - + Firmware Package (Type A) 펌웨어 패키지 (A타입) - + Firmware Package (Type B) 펌웨어 패키지 (B타입) - + Game 게임 - + Game Update 게임 업데이트 - + Game DLC 게임 DLC - + Delta Title 델타 타이틀 - + Select NCA Install Type... NCA 설치 유형 선택... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) 이 NCA를 설치할 타이틀 유형을 선택하세요: (대부분의 경우 기본값인 '게임'이 괜찮습니다.) - + Failed to Install 설치 실패 - + The title type you selected for the NCA is invalid. NCA 타이틀 유형이 유효하지 않습니다. - + File not found 파일을 찾을 수 없음 - + File "%1" not found 파일 "%1"을 찾을 수 없습니다 - + OK OK - - + + Hardware requirements not met 하드웨어 요구 사항이 충족되지 않음 - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. 시스템이 권장 하드웨어 요구 사항을 충족하지 않습니다. 호환성 보고가 비활성화되었습니다. - + Missing yuzu Account yuzu 계정 누락 - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. 게임 호환성 테스트 결과를 제출하려면 yuzu 계정을 연결해야합니다.<br><br/>yuzu 계정을 연결하려면 에뮬레이션 &gt; 설정 &gt; 웹으로 가세요. - + Error opening URL URL 열기 오류 - + Unable to open the URL "%1". URL "%1"을 열 수 없습니다. - + TAS Recording TAS 레코딩 - + Overwrite file of player 1? 플레이어 1의 파일을 덮어쓰시겠습니까? - + Invalid config detected 유효하지 않은 설정 감지 - + Handheld controller can't be used on docked mode. Pro controller will be selected. 휴대 모드용 컨트롤러는 거치 모드에서 사용할 수 없습니다. 프로 컨트롤러로 대신 선택됩니다. - - + + Amiibo Amiibo - - + + The current amiibo has been removed 현재 amiibo가 제거되었습니다. - + Error 오류 - - + + The current game is not looking for amiibos 현재 게임은 amiibo를 찾고 있지 않습니다 - + Amiibo File (%1);; All Files (*.*) Amiibo 파일 (%1);; 모든 파일 (*.*) - + Load Amiibo Amiibo 로드 - + Error loading Amiibo data Amiibo 데이터 로드 오류 - + The selected file is not a valid amiibo 선택한 파일은 유효한 amiibo가 아닙니다 - + The selected file is already on use 선택한 파일은 이미 사용 중입니다 - + An unknown error occurred 알수없는 오류가 발생했습니다 - + Capture Screenshot 스크린샷 캡처 - + PNG Image (*.png) PNG 이미지 (*.png) - + TAS state: Running %1/%2 TAS 상태: %1/%2 실행 중 - + TAS state: Recording %1 TAS 상태: 레코딩 %1 - + TAS state: Idle %1/%2 TAS 상태: 유휴 %1/%2 - + TAS State: Invalid TAS 상태: 유효하지 않음 - + &Stop Running 실행 중지(&S) - + &Start 시작(&S) - + Stop R&ecording 레코딩 중지(&e) - + R&ecord 레코드(&R) - + Building: %n shader(s) 빌드중: %n개 셰이더 - + Scale: %1x %1 is the resolution scaling factor 스케일: %1x - + Speed: %1% / %2% 속도: %1% / %2% - + Speed: %1% 속도: %1% - + Game: %1 FPS (Unlocked) 게임: %1 FPS (제한없음) - + Game: %1 FPS 게임: %1 FPS - + Frame: %1 ms 프레임: %1 ms - + GPU NORMAL GPU 보통 - + GPU HIGH GPU 높음 - + GPU EXTREME GPU 굉장함 - + GPU ERROR GPU 오류 - + DOCKED 거치 모드 - + HANDHELD 휴대 모드 - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST NEAREST - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA AA 없음 - + FXAA FXAA - + SMAA SMAA - + + VOLUME: MUTE + + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + + + + Confirm Key Rederivation 키 재생성 확인 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5498,37 +5540,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 자동 생성되었던 키 파일들이 삭제되고 키 생성 모듈이 다시 실행됩니다. - + Missing fuses fuses 누락 - + - Missing BOOT0 - BOOT0 누락 - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main 누락 - + - Missing PRODINFO - PRODINFO 누락 - + Derivation Components Missing 파생 구성 요소 누락 - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 암호화 키가 없습니다. <br>모든 키, 펌웨어 및 게임을 얻으려면 <a href='https://yuzu-emu.org/help/quickstart/'>yuzu 빠른 시작 가이드</a>를 따르세요.<br><br> <small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5537,39 +5579,39 @@ on your system's performance. 소요될 수 있습니다. - + Deriving Keys 파생 키 - + Select RomFS Dump Target RomFS 덤프 대상 선택 - + Please select which RomFS you would like to dump. 덤프할 RomFS를 선택하십시오. - + Are you sure you want to close yuzu? yuzu를 닫으시겠습니까? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. 에뮬레이션을 중지하시겠습니까? 모든 저장되지 않은 진행 상황은 사라집니다. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5581,44 +5623,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGL을 사용할 수 없습니다! - + OpenGL shared contexts are not supported. OpenGL 공유 컨텍스트는 지원되지 않습니다. - + yuzu has not been compiled with OpenGL support. yuzu는 OpenGL 지원으로 컴파일되지 않았습니다. - - + + Error while initializing OpenGL! OpenGL을 초기화하는 동안 오류가 발생했습니다! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. 사용하시는 GPU가 OpenGL을 지원하지 않거나, 최신 그래픽 드라이버가 설치되어 있지 않습니다. - + Error while initializing OpenGL 4.6! OpenGL 4.6 초기화 중 오류 발생! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 사용하시는 GPU가 OpenGL 4.6을 지원하지 않거나 최신 그래픽 드라이버가 설치되어 있지 않습니다. <br><br>GL 렌더링 장치:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 사용하시는 GPU가 1개 이상의 OpenGL 확장 기능을 지원하지 않습니다. 최신 그래픽 드라이버가 설치되어 있는지 확인하세요. <br><br>GL 렌더링 장치:<br>%1<br><br>지원하지 않는 확장 기능:<br>%2 @@ -5858,7 +5900,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list 더블 클릭하여 게임 목록에 새 폴더 추가 @@ -6204,51 +6246,56 @@ Debug Message: + Hide Empty Rooms + + + + Hide Full Rooms 전체 방 숨기기 - + Refresh Lobby 로비 새로 고침 - + Password Required to Join 입장시 비밀번호가 필요합니다 - + Password: 비밀번호: - + Players 플레이어 - + Room Name 방 이름 - + Preferred Game 선호하는 게임 - + Host 호스트 - + Refreshing 새로 고치는 중 - + Refresh List 새로 고침 목록 @@ -6859,7 +6906,7 @@ p, li { white-space: pre-wrap; } - + [not set] [설정 안 됨] @@ -6874,10 +6921,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 축 %1%2 @@ -6891,9 +6938,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [알 수 없음] @@ -7058,15 +7105,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [유효하지않음] - - %1%2Hat %3 %1%2방향키 %3 @@ -7074,35 +7119,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2Axis %3 - + %1%2Axis %3,%4,%5 %1%2Axis %3,%4,%5 - + %1%2Motion %3 %1%2모션 %3 - - %1%2Button %3 %1%2버튼 %3 - + [unused] [미사용] @@ -7189,9 +7232,21 @@ p, li { white-space: pre-wrap; } Extra - - %1%2%3 - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 + diff --git a/dist/languages/nb.ts b/dist/languages/nb.ts index 4f4fdee65..36d8cc356 100644 --- a/dist/languages/nb.ts +++ b/dist/languages/nb.ts @@ -1704,76 +1704,86 @@ This would ban both their forum username and their IP address. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Slår på asynkron shader-kompilering, som kan redusere shader-hakking. Denne funksjonaliteten er eksperimentell. - + Use asynchronous shader building (Hack) Bruk asynkron shader-bygging (hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Use Fast GPU Time (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Use pessimistic buffer flushes (Hack) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache - + Anisotropic Filtering: Anisotropisk filtrering: - + Automatic Automatisk - + Default Standard - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2161,7 +2171,7 @@ This would ban both their forum username and their IP address. - + Configure Konfigurer @@ -2188,6 +2198,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu Krever omstart av yuzu @@ -2212,22 +2223,27 @@ This would ban both their forum username and their IP address. - + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + Enable mouse panning Slå på musepanorering - + Mouse sensitivity Musesensitivitet - + % % - + Motion / Touch Bevegelse / Touch @@ -2339,7 +2355,7 @@ This would ban both their forum username and their IP address. - + Left Stick Venstre Pinne @@ -2433,14 +2449,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2459,7 +2475,7 @@ This would ban both their forum username and their IP address. - + Plus Pluss @@ -2472,15 +2488,15 @@ This would ban both their forum username and their IP address. - + R R - + ZR ZR @@ -2537,236 +2553,241 @@ This would ban both their forum username and their IP address. - + Right Stick Høyre Pinne - - - - + + + + Clear Fjern - - - - - + + + + + [not set] [ikke satt] - - + + Invert button Inverter knapp - - + + Toggle button Veksle knapp - - + + Turbo button + + + + + Invert axis Inverter akse - - - + + + Set threshold Set grense - - + + Choose a value between 0% and 100% Velg en verdi mellom 0% og 100% - + Toggle axis - + Set gyro threshold - + Map Analog Stick - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Etter du har trykker på OK, flytt først stikken horisontalt, og så vertikalt. For å invertere aksene, flytt først stikken vertikalt, og så horistonalt. - + Center axis Senterakse - - + + Deadzone: %1% Dødsone: %1% - - + + Modifier Range: %1% Modifikatorområde: %1% - - + + Pro Controller Pro-Kontroller - + Dual Joycons Doble Joycons - + Left Joycon Venstre Joycon - + Right Joycon Høyre Joycon - + Handheld Håndholdt - + GameCube Controller GameCube-kontroller - + Poke Ball Plus Poke Ball Plus - + NES Controller NES-kontroller - + SNES Controller SNES-kontroller - + N64 Controller N64-kontroller - + Sega Genesis Sega Genesis - + Start / Pause Start / paus - + Z Z - + Control Stick Kontrollstikke - + C-Stick C-stikke - + Shake! Rist! - + [waiting] [venter] - + New Profile Ny Profil - + Enter a profile name: Skriv inn et profilnavn: - - + + Create Input Profile Lag inndataprofil - + The given profile name is not valid! Det oppgitte profilenavnet er ugyldig! - + Failed to create the input profile "%1" Klarte ikke lage inndataprofil "%1" - + Delete Input Profile Slett inndataprofil - + Failed to delete the input profile "%1" Klarte ikke slette inndataprofil "%1" - + Load Input Profile Last inn inndataprofil - + Failed to load the input profile "%1" Klarte ikke laste inn inndataprofil "%1" - + Save Input Profile Lagre inndataprofil - + Failed to save the input profile "%1" Klarte ikke lagre inndataprofil "%1" @@ -4542,523 +4563,533 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re - + Loading Web Applet... Laster web-applet... - - + + Disable Web Applet Slå av web-applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Antall shader-e som bygges for øyeblikket - + The current selected resolution scaling multiplier. Den valgte oppløsningsskaleringsfaktoren. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Nåværende emuleringshastighet. Verdier høyere eller lavere en 100% indikerer at emuleringen kjører raskere eller tregere enn en Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Hvor mange bilder per sekund spiller viser. Dette vil variere fra spill til spill og scene til scene. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tid det tar for å emulere et Switch bilde. Teller ikke med bildebegrensing eller v-sync. For full-hastighet emulering burde dette være 16.67 ms. på det høyeste. - + &Clear Recent Files - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue - + &Pause &Paus - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping Et spill kjører i yuzu - + Warning Outdated Game Format Advarsel: Utdatert Spillformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Du bruker en dekonstruert ROM-mappe for dette spillet, som er et utdatert format som har blitt erstattet av andre formater som NCA, NAX, XCI, eller NSP. Dekonstruerte ROM-mapper mangler ikoner, metadata, og oppdateringsstøtte.<br><br>For en forklaring på diverse Switch-formater som yuzu støtter,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>sjekk vår wiki</a>. Denne meldingen vil ikke bli vist igjen. - - + + Error while loading ROM! Feil under innlasting av ROM! - + The ROM format is not supported. Dette ROM-formatet er ikke støttet. - + An error occurred initializing the video core. En feil oppstod under initialisering av videokjernen. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu har oppdaget en feil under kjøring av videokjernen. Dette er vanligvis forårsaket av utdaterte GPU-drivere, inkludert for integrert grafikk. Vennligst sjekk loggen for flere detaljer. For mer informasjon om å finne loggen, besøk følgende side: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Uploadd the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Feil under lasting av ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. En ukjent feil oppstod. Se loggen for flere detaljer. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Lagre Data - + Mod Data Mod Data - + Error Opening %1 Folder Feil Under Åpning av %1 Mappen - - + + Folder does not exist! Mappen eksisterer ikke! - + Error Opening Transferable Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Fjern oppføring - - - - - - + + + + + + Successfully Removed Fjerning lykkes - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. Grunnspillet er ikke installert i NAND og kan ikke bli fjernet. - + Successfully removed the installed update. Fjernet vellykket den installerte oppdateringen. - + There is no update installed for this title. Det er ingen oppdatering installert for denne tittelen. - + There are no DLC installed for this title. Det er ingen DLC installert for denne tittelen. - + Successfully removed %1 installed DLC. Fjernet vellykket %1 installerte DLC-er. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? Fjern Tilpasset Spillkonfigurasjon? - + Remove File Fjern Fil - - + + Error Removing Transferable Shader Cache Feil under fjerning av overførbar shader cache - - + + A shader cache for this title does not exist. - + Successfully removed the transferable shader cache. Lykkes i å fjerne den overførbare shader cachen. - + Failed to remove the transferable shader cache. Feil under fjerning av den overførbare shader cachen. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Feil Under Fjerning Av Tilpasset Konfigurasjon - + A custom configuration for this title does not exist. En tilpasset konfigurasjon for denne tittelen finnes ikke. - + Successfully removed the custom game configuration. Fjernet vellykket den tilpassede spillkonfigurasjonen. - + Failed to remove the custom game configuration. Feil under fjerning av den tilpassede spillkonfigurasjonen. - - + + RomFS Extraction Failed! Utvinning av RomFS Feilet! - + There was an error copying the RomFS files or the user cancelled the operation. Det oppstod en feil under kopiering av RomFS filene eller så kansellerte brukeren operasjonen. - + Full Fullstendig - + Skeleton Skjelett - + Select RomFS Dump Mode Velg RomFS Dump Modus - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Velg hvordan du vil dumpe RomFS.<br>Fullstendig vil kopiere alle filene til en ny mappe mens <br>skjelett vil bare skape mappestrukturen. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Utvinner RomFS... - - + + Cancel Avbryt - + RomFS Extraction Succeeded! RomFS Utpakking lyktes! - + The operation completed successfully. Operasjonen fullført vellykket. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Feil ved åpning av %1 - + Select Directory Velg Mappe - + Properties Egenskaper - + The game properties could not be loaded. Spillets egenskaper kunne ikke bli lastet inn. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Kjørbar Fil (%1);;Alle Filer (*.*) - + Load File Last inn Fil - + Open Extracted ROM Directory Åpne Utpakket ROM Mappe - + Invalid Directory Selected Ugyldig Mappe Valgt - + The directory you have selected does not contain a 'main' file. Mappen du valgte inneholder ikke en 'main' fil. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Installerbar Switch-Fil (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xcI) - + Install Files Installer Filer - + %n file(s) remaining %n fil gjenstår%n filer gjenstår - + Installing file "%1"... Installerer fil "%1"... - - + + Install Results Insallasjonsresultater - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed %n fil ble nylig installert @@ -5066,7 +5097,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) were overwritten %n fil ble overskrevet @@ -5074,7 +5105,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) failed to install %n fil ble ikke installert @@ -5082,377 +5113,388 @@ Please, only use this feature to install updates and DLC. - + System Application Systemapplikasjon - + System Archive Systemarkiv - + System Application Update Systemapplikasjonsoppdatering - + Firmware Package (Type A) Firmware Pakke (Type A) - + Firmware Package (Type B) Firmware-Pakke (Type B) - + Game Spill - + Game Update Spilloppdatering - + Game DLC Spill tilleggspakke - + Delta Title Delta Tittel - + Select NCA Install Type... Velg NCA Installasjonstype... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Vennligst velg typen tittel du vil installere denne NCA-en som: (I de fleste tilfellene, standarden 'Spill' fungerer.) - + Failed to Install Feil under Installasjon - + The title type you selected for the NCA is invalid. Titteltypen du valgte for NCA-en er ugyldig. - + File not found Fil ikke funnet - + File "%1" not found Filen "%1" ikke funnet - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Mangler yuzu Bruker - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. For å sende inn et testtilfelle for spillkompatibilitet, må du linke yuzu-brukeren din.<br><br/>For å linke yuzu-brukeren din, gå til Emulasjon &gt; Konfigurasjon &gt; Nett. - + Error opening URL Feil under åpning av URL - + Unable to open the URL "%1". Kunne ikke åpne URL "%1". - + TAS Recording TAS-innspilling - + Overwrite file of player 1? Overskriv filen til spiller 1? - + Invalid config detected Ugyldig konfigurasjon oppdaget - + Handheld controller can't be used on docked mode. Pro controller will be selected. Håndholdt kontroller kan ikke brukes i dokket modus. Pro-kontroller vil bli valgt. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Den valgte amiibo-en har blitt fjernet - + Error Feil - - + + The current game is not looking for amiibos Det kjørende spillet sjekker ikke for amiibo-er - + Amiibo File (%1);; All Files (*.*) Amiibo-Fil (%1);; Alle Filer (*.*) - + Load Amiibo Last inn Amiibo - + Error loading Amiibo data Feil ved lasting av Amiibo data - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Ta Skjermbilde - + PNG Image (*.png) PNG Bilde (*.png) - + TAS state: Running %1/%2 TAS-tilstand: Kjører %1/%2 - + TAS state: Recording %1 TAS-tilstand: Spiller inn %1 - + TAS state: Idle %1/%2 TAS-tilstand: Venter %1%2 - + TAS State: Invalid TAS-tilstand: Ugyldig - + &Stop Running &Stopp kjøring - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) Bygger: %n shaderBygger: %n shader-e - + Scale: %1x %1 is the resolution scaling factor Skala: %1x - + Speed: %1% / %2% Hastighet: %1% / %2% - + Speed: %1% Hastighet: %1% - + Game: %1 FPS (Unlocked) Spill: %1 FPS (ubegrenset) - + Game: %1 FPS Spill: %1 FPS - + Frame: %1 ms Ramme: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HØY - + GPU EXTREME GPU EKSTREM - + GPU ERROR GPU FEIL - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST NÆRMESTE - - + + BILINEAR BILINEÆR - + BICUBIC BIKUBISK - + GAUSSIAN GAUSSISK - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA INGEN AA - + FXAA FXAA - + SMAA - + + VOLUME: MUTE + + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + + + + Confirm Key Rederivation Bekreft Nøkkel-Redirevasjon - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5469,37 +5511,37 @@ og eventuelt lag backups. Dette vil slette dine autogenererte nøkkel-filer og kjøre nøkkel-derivasjonsmodulen på nytt. - + Missing fuses Mangler fuses - + - Missing BOOT0 - Mangler BOOT0 - + - Missing BCPKG2-1-Normal-Main - Mangler BCPKG2-1-Normal-Main - + - Missing PRODINFO - Mangler PRODINFO - + Derivation Components Missing Derivasjonskomponenter Mangler - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Krypteringsnøkler mangler. <br>Vennligst følg <a href='https://yuzu-emu.org/help/quickstart/'>yuzus oppstartsguide</a> for å få alle nøklene, fastvaren og spillene dine.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5508,39 +5550,39 @@ Dette kan ta opp til et minutt avhengig av systemytelsen din. - + Deriving Keys Deriverer Nøkler - + Select RomFS Dump Target Velg RomFS Dump-Mål - + Please select which RomFS you would like to dump. Vennligst velg hvilken RomFS du vil dumpe. - + Are you sure you want to close yuzu? Er du sikker på at du vil lukke yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Er du sikker på at du vil stoppe emulasjonen? All ulagret fremgang vil bli tapt. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5552,44 +5594,44 @@ Vil du overstyre dette og lukke likevel? GRenderWindow - - + + OpenGL not available! OpenGL ikke tilgjengelig! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu har ikke blitt kompilert med OpenGL-støtte. - - + + Error while initializing OpenGL! Feil under initialisering av OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Det kan hende at GPU-en din ikke støtter OpenGL, eller at du ikke har den nyeste grafikkdriveren. - + Error while initializing OpenGL 4.6! Feil under initialisering av OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Det kan hende at GPU-en din ikke støtter OpenGL 4.6, eller at du ikke har den nyeste grafikkdriveren.<br><br>GL-renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Det kan hende at GPU-en din ikke støtter én eller flere nødvendige OpenGL-utvidelser. Vennligst sørg for at du har den nyeste grafikkdriveren.<br><br>GL-renderer: <br>%1<br><br>Ikke-støttede utvidelser:<br>%2 @@ -5829,7 +5871,7 @@ Vil du overstyre dette og lukke likevel? GameListPlaceholder - + Double-click to add a new folder to the game list Dobbeltrykk for å legge til en ny mappe i spillisten @@ -6174,51 +6216,56 @@ Debug Message: + Hide Empty Rooms + + + + Hide Full Rooms - + Refresh Lobby - + Password Required to Join - + Password: - + Players Spillere - + Room Name - + Preferred Game - + Host - + Refreshing - + Refresh List @@ -6825,7 +6872,7 @@ p, li { white-space: pre-wrap; } - + [not set] [ikke satt] @@ -6840,10 +6887,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Akse %1%2 @@ -6857,9 +6904,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [ukjent] @@ -7024,15 +7071,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [ugyldig] - - %1%2Hat %3 @@ -7040,35 +7085,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2Akse %3 - + %1%2Axis %3,%4,%5 %1%2Akse %3,%4,%5 - + %1%2Motion %3 %1%2Bevegelse %3 - - %1%2Button %3 %1%2Knapp %3 - + [unused] [ubrukt] @@ -7155,9 +7198,21 @@ p, li { white-space: pre-wrap; } Ekstra - - %1%2%3 - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 + diff --git a/dist/languages/nl.ts b/dist/languages/nl.ts index eb78511ef..ae8f14661 100644 --- a/dist/languages/nl.ts +++ b/dist/languages/nl.ts @@ -1702,76 +1702,86 @@ This would ban both their forum username and their IP address. - Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. - Laat shaders asynchroon compileren, wat haperingen kunnen verminderen. Deze instelling is experimenteel. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + - Use asynchronous shader building (Hack) + Decode ASTC textures asynchronously (Hack) - Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. + Laat shaders asynchroon compileren, wat haperingen kunnen verminderen. Deze instelling is experimenteel. - Use Fast GPU Time (Hack) + Use asynchronous shader building (Hack) - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - Use pessimistic buffer flushes (Hack) + Use Fast GPU Time (Hack) - Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + Use pessimistic buffer flushes (Hack) + + + + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + Use Vulkan pipeline cache - + Anisotropic Filtering: Anisotrope Filtering: - + Automatic - + Default Standaard - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2159,7 +2169,7 @@ This would ban both their forum username and their IP address. - + Configure Configureer @@ -2186,6 +2196,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu @@ -2210,22 +2221,27 @@ This would ban both their forum username and their IP address. - + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + Enable mouse panning Schakel muis panning in - + Mouse sensitivity Muis Gevoeligheid - + % % - + Motion / Touch Beweging / Touch @@ -2337,7 +2353,7 @@ This would ban both their forum username and their IP address. - + Left Stick Linker Stick @@ -2431,14 +2447,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2457,7 +2473,7 @@ This would ban both their forum username and their IP address. - + Plus Plus: @@ -2470,15 +2486,15 @@ This would ban both their forum username and their IP address. - + R R: - + ZR ZR @@ -2535,236 +2551,241 @@ This would ban both their forum username and their IP address. - + Right Stick Rechter Stick - - - - + + + + Clear Verwijder - - - - - + + + + + [not set] [niet ingesteld] - - + + Invert button - - + + Toggle button Shakel Knop - - + + Turbo button + + + + + Invert axis Spiegel As - - - + + + Set threshold - - + + Choose a value between 0% and 100% - + Toggle axis - + Set gyro threshold - + Map Analog Stick Zet Analoge Stick - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Na OK in te drukken, beweeg je joystick eerst horizontaal en dan verticaal. Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. - + Center axis - - + + Deadzone: %1% Deadzone: %1% - - + + Modifier Range: %1% Bewerk Range: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Twee Joycons - + Left Joycon Linker Joycon - + Right Joycon Rechter Joycon - + Handheld Mobiel - + GameCube Controller GameCube Controller - + Poke Ball Plus - + NES Controller - + SNES Controller - + N64 Controller - + Sega Genesis - + Start / Pause Start / Pauze - + Z Z - + Control Stick Control Stick - + C-Stick C-Stick - + Shake! Shudden! - + [waiting] [aan het wachten] - + New Profile Nieuw Profiel - + Enter a profile name: Voer nieuwe gebruikersnaam in: - - + + Create Input Profile Creëer een nieuw Invoer Profiel - + The given profile name is not valid! De ingevoerde Profiel naam is niet geldig - + Failed to create the input profile "%1" Het is mislukt om Invoer Profiel "%1 te Creëer - + Delete Input Profile Verwijder invoer profiel - + Failed to delete the input profile "%1" Het is mislukt om Invoer Profiel "%1 te Verwijderen - + Load Input Profile Laad invoer profiel - + Failed to load the input profile "%1" Het is mislukt om Invoer Profiel "%1 te Laden - + Save Input Profile Sla Invoer profiel op - + Failed to save the input profile "%1" Het is mislukt om Invoer Profiel "%1 Op te slaan @@ -4540,911 +4561,932 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen - + Loading Web Applet... Web Applet Laden... - - + + Disable Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Huidige emulatie snelheid. Waardes hoger of lager dan 100% betekent dat de emulatie sneller of langzamer loopt dan de Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Hoeveel frames per seconde de game op dit moment weergeeft. Dit zal veranderen van game naar game en van scène naar scène. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tijd gebruikt om een frame van de Switch te emuleren, waarbij framelimiteren of v-sync niet wordt meegerekend. Voor emulatie op volledige snelheid zou dit maximaal 16.67 ms zijn. - + &Clear Recent Files - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue - + &Pause &Pauzeren - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Waarschuwing Verouderd Spel Formaat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Je gebruikt gedeconstrueerd ROM map formaat voor dit Spel, dit is een verouderd formaat en is vervangen door formaten zoals NCA, NAX, XCI of NSP. Gedeconstrueerd ROM map heeft geen iconen, metadata en update understeuning.<br><br>Voor een uitleg over welke Switch formaten yuzu ondersteund, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>kijk op onze wiki</a>. Dit bericht word niet nog een keer weergegeven. - - + + Error while loading ROM! Fout tijdens het laden van een ROM! - + The ROM format is not supported. Het formaat van de ROM is niet ondersteunt. - + An error occurred initializing the video core. Er is een fout opgetreden tijdens het initialiseren van de videokern. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Een onbekende fout heeft plaatsgevonden. Kijk in de log voor meer details. - + (64-bit) - + (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit - + Closing software... - + Save Data Save Data - + Mod Data Mod Data - + Error Opening %1 Folder Fout tijdens het openen van %1 folder - - + + Folder does not exist! Folder bestaat niet! - + Error Opening Transferable Shader Cache Fout Bij Het Openen Van Overdraagbare Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + Remove File - - + + Error Removing Transferable Shader Cache - - + + A shader cache for this title does not exist. Er bestaat geen shader cache voor deze game - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! RomFS Extractie Mislukt! - + There was an error copying the RomFS files or the user cancelled the operation. Er was een fout tijdens het kopiëren van de RomFS bestanden of de gebruiker heeft de operatie geannuleerd. - + Full Vol - + Skeleton Skelet - + Select RomFS Dump Mode Selecteer RomFS Dump Mode - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Selecteer alstublieft hoe je de RomFS wilt dumpen.<br>Volledig kopieërd alle bestanden in een map terwijl <br> skelet maakt alleen het map structuur. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... RomFS uitpakken... - - + + Cancel Annuleren - + RomFS Extraction Succeeded! RomFS Extractie Geslaagd! - + The operation completed successfully. De operatie is succesvol voltooid. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Fout bij openen %1 - + Select Directory Selecteer Map - + Properties Eigenschappen - + The game properties could not be loaded. De eigenschappen van de game kunnen niet geladen worden. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Executable (%1);;Alle bestanden (*.*) - + Load File Laad Bestand - + Open Extracted ROM Directory Open Gedecomprimeerd ROM Map - + Invalid Directory Selected Ongeldige Map Geselecteerd - + The directory you have selected does not contain a 'main' file. De map die je hebt geselecteerd bevat geen 'main' bestand. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files - + %n file(s) remaining - + Installing file "%1"... Bestand "%1" Installeren... - - + + Install Results - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systeem Applicatie - + System Archive Systeem Archief - + System Application Update Systeem Applicatie Update - + Firmware Package (Type A) Filmware Pakket (Type A) - + Firmware Package (Type B) Filmware Pakket (Type B) - + Game Game - + Game Update Game Update - + Game DLC Game DLC - + Delta Title Delta Titel - + Select NCA Install Type... Selecteer NCA Installatie Type... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Selecteer het type titel hoe je wilt dat deze NCA installeerd: (In de meeste gevallen is de standaard 'Game' juist.) - + Failed to Install Installatie Mislukt - + The title type you selected for the NCA is invalid. Het type title dat je hebt geselecteerd voor de NCA is ongeldig. - + File not found Bestand niet gevonden - + File "%1" not found Bestand "%1" niet gevonden - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Je yuzu account mist - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Om game campatibiliteit te raporteren, moet je je yuzu account koppelen.<br><br/> Om je yuzu account te koppelen, ga naar Emulatie &gt; Configuratie &gt; Web. - + Error opening URL - + Unable to open the URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo Bestand (%1);; Alle Bestanden (*.*) - + Load Amiibo Laad Amiibo - + Error loading Amiibo data Fout tijdens het laden van de Amiibo data - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Screenshot Vastleggen - + PNG Image (*.png) PNG afbeelding (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Snelheid: %1% / %2% - + Speed: %1% Snelheid: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Game: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL - + VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA - + SMAA - + + VOLUME: MUTE + + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + + + + Confirm Key Rederivation Bevestig Sleutel Herafleiding - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5461,37 +5503,37 @@ en optioneel maak backups. Dit zal je automatisch gegenereerde sleutel bestanden verwijderen en de sleutel verkrijger module opnieuw starten - + Missing fuses - + - Missing BOOT0 - + - Missing BCPKG2-1-Normal-Main - + - Missing PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5499,39 +5541,39 @@ on your system's performance. op je systeem's performatie. - + Deriving Keys Sleutels afleiden - + Select RomFS Dump Target Selecteer RomFS Dump Doel - + Please select which RomFS you would like to dump. Selecteer welke RomFS je zou willen dumpen. - + Are you sure you want to close yuzu? Weet je zeker dat je yuzu wilt sluiten? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Weet je zeker dat je de emulatie wilt stoppen? Alle onopgeslagen voortgang will verloren gaan. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5543,44 +5585,44 @@ Wilt u dit omzeilen en toch afsluiten? GRenderWindow - - + + OpenGL not available! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. - - + + Error while initializing OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. - + Error while initializing OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 @@ -5820,7 +5862,7 @@ Wilt u dit omzeilen en toch afsluiten? GameListPlaceholder - + Double-click to add a new folder to the game list Dubbel-klik om een ​​nieuwe map toe te voegen aan de lijst met games @@ -6164,51 +6206,56 @@ Debug Message: + Hide Empty Rooms + + + + Hide Full Rooms - + Refresh Lobby - + Password Required to Join - + Password: - + Players Spelers - + Room Name - + Preferred Game - + Host - + Refreshing - + Refresh List @@ -6811,7 +6858,7 @@ p, li { white-space: pre-wrap; } - + [not set] [niet aangegeven] @@ -6826,10 +6873,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Axis %1%2 @@ -6843,9 +6890,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [onbekend] @@ -7010,15 +7057,13 @@ p, li { white-space: pre-wrap; } - + [invalid] - - %1%2Hat %3 @@ -7026,35 +7071,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 - + %1%2Axis %3,%4,%5 - + %1%2Motion %3 - - %1%2Button %3 - + [unused] [ongebruikt] @@ -7141,8 +7184,20 @@ p, li { white-space: pre-wrap; } - - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 diff --git a/dist/languages/pl.ts b/dist/languages/pl.ts index b5046fbac..05d514658 100644 --- a/dist/languages/pl.ts +++ b/dist/languages/pl.ts @@ -1727,76 +1727,86 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Włącza asynchroniczną kompilację shaderów, co może zmniejszyć zacinanie się shaderów. Ta funkcja jest eksperymentalna. - + Use asynchronous shader building (Hack) Użyj asynchronicznego budowania shaderów (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Włącza Szybszy Czas GPU. Ta opcja zmusza większość gier do wyświetlania w swojej najwyższej natywnej rozdzielczości. - + Use Fast GPU Time (Hack) Użyj Szybszego Czasu GPU (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. Włącza pesymistyczne opróżnianie bufora. Ta opcja wymusi opróżnianie niezmodyfikowanych buforów, gdzie to wpłynie na wydajność. - + Use pessimistic buffer flushes (Hack) Użyj pesymistycznego opróżniania buforów (Hack) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. Włącza pamięć podręczną strumienia specyficzną dla dostawcy GPU. Ta opcja może znacznie skrócić czas ładowania modułu cieniującego w przypadkach, gdy sterownik Vulkan nie przechowuje wewnętrznie plików pamięci podręcznej strumienia. - + Use Vulkan pipeline cache Użyj pamięci podręcznej strumienia dla Vulkana - + Anisotropic Filtering: Filtrowanie anizotropowe: - + Automatic Automatyczne - + Default Domyślne - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2184,7 +2194,7 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + Configure Konfiguruj @@ -2211,6 +2221,7 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. + Requires restarting yuzu Należy zrestartować yuzu @@ -2235,22 +2246,27 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + Enable mouse panning Włącz panoramowanie myszą - + Mouse sensitivity Czułość myszy - + % % - + Motion / Touch Ruch / Dotyk @@ -2362,7 +2378,7 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + Left Stick Lewa gałka @@ -2456,14 +2472,14 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + L L - + ZL ZL @@ -2482,7 +2498,7 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + Plus Plus @@ -2495,15 +2511,15 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + R R - + ZR ZR @@ -2560,236 +2576,241 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + Right Stick Prawa gałka - - - - + + + + Clear Wyczyść - - - - - + + + + + [not set] [nie ustawione] - - + + Invert button Odwróć przycisk - - + + Toggle button Przycisk Toggle - - + + Turbo button + + + + + Invert axis Odwróć oś - - - + + + Set threshold Ustaw próg - - + + Choose a value between 0% and 100% Wybierz wartość od 0% do 100% - + Toggle axis Przełącz oś - + Set gyro threshold Ustaw próg gyro - + Map Analog Stick Przypisz Drążek Analogowy - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Po naciśnięciu OK, najpierw przesuń joystick w poziomie, a następnie w pionie. Aby odwrócić osie, najpierw przesuń joystick pionowo, a następnie poziomo. - + Center axis Środkowa oś - - + + Deadzone: %1% Martwa strefa: %1% - - + + Modifier Range: %1% Zasięg Modyfikatora: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Para Joyconów - + Left Joycon Lewy Joycon - + Right Joycon Prawy Joycon - + Handheld Handheld - + GameCube Controller Kontroler GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Kontroler NES/Pegasus - + SNES Controller Kontroler SNES - + N64 Controller Kontroler N64 - + Sega Genesis Sega Mega Drive - + Start / Pause Start / Pauza - + Z Z - + Control Stick Lewa gałka - + C-Stick C-gałka - + Shake! Potrząśnij! - + [waiting] [oczekiwanie] - + New Profile Nowy profil - + Enter a profile name: Wpisz nazwę profilu: - - + + Create Input Profile Utwórz profil wejściowy - + The given profile name is not valid! Podana nazwa profilu jest nieprawidłowa! - + Failed to create the input profile "%1" Nie udało się utworzyć profilu wejściowego "%1" - + Delete Input Profile Usuń profil wejściowy - + Failed to delete the input profile "%1" Nie udało się usunąć profilu wejściowego "%1" - + Load Input Profile Załaduj profil wejściowy - + Failed to load the input profile "%1" Nie udało się wczytać profilu wejściowego "%1" - + Save Input Profile Zapisz profil wejściowy - + Failed to save the input profile "%1" Nie udało się zapisać profilu wejściowego "%1" @@ -4566,526 +4587,536 @@ Przeciągnij punkty, aby zmienić pozycję, lub kliknij dwukrotnie komórki tabe Inicjalizacja Vulkana nie powiodła się podczas uruchamiania.<br><br>Kliknij<a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>tutaj aby uzyskać instrukcje dotyczące rozwiązania tego problemu</a>. - + Loading Web Applet... Ładowanie apletu internetowego... - - + + Disable Web Applet Wyłącz Aplet internetowy - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Wyłączanie web appletu może doprowadzić do nieokreślonych zachowań - wyłączyć applet należy jedynie grając w Super Mario 3D All-Stars. Na pewno chcesz wyłączyć web applet? (Można go ponownie włączyć w ustawieniach debug.) - + The amount of shaders currently being built Ilość budowanych shaderów - + The current selected resolution scaling multiplier. Obecnie wybrany mnożnik rozdzielczości. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Aktualna prędkość emulacji. Wartości większe lub niższe niż 100% wskazują, że emulacja działa szybciej lub wolniej niż Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Ile klatek na sekundę gra aktualnie wyświetla. To będzie się różnić w zależności od gry, od sceny do sceny. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Czas potrzebny do emulacji klatki na sekundę Switcha, nie licząc ograniczania klatek ani v-sync. Dla emulacji pełnej szybkości powinno to wynosić co najwyżej 16,67 ms. - + &Clear Recent Files &Usuń Ostatnie pliki - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue &Kontynuuj - + &Pause &Pauza - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu jest w trakcie gry - + Warning Outdated Game Format OSTRZEŻENIE! Nieaktualny format gry - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Używasz zdekonstruowanego formatu katalogu ROM dla tej gry, który jest przestarzałym formatem, który został zastąpiony przez inne, takie jak NCA, NAX, XCI lub NSP. W zdekonstruowanych katalogach ROM brakuje ikon, metadanych i obsługi aktualizacji.<br><br> Aby znaleźć wyjaśnienie różnych formatów Switch obsługiwanych przez yuzu,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'> sprawdź nasze wiki</a>. Ta wiadomość nie pojawi się ponownie. - - + + Error while loading ROM! Błąd podczas wczytywania ROMu! - + The ROM format is not supported. Ten format ROMu nie jest wspierany. - + An error occurred initializing the video core. Wystąpił błąd podczas inicjowania rdzenia wideo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu napotkał błąd podczas uruchamiania rdzenia wideo. Jest to zwykle spowodowane przestarzałymi sterownikami GPU, w tym zintegrowanymi. Więcej szczegółów znajdziesz w pliku log. Więcej informacji na temat dostępu do log-u można znaleźć na następującej stronie: <a href='https://yuzu-emu.org/help/reference/log-files/'>Jak przesłać plik log</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Błąd podczas wczytywania ROMu! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Postępuj zgodnie z<a href='https://yuzu-emu.org/help/quickstart/'>yuzu quickstart guide</a> aby zrzucić ponownie swoje pliki.<br>Możesz odwołać się do wiki yuzu</a>lub discord yuzu </a> po pomoc. - + An unknown error occurred. Please see the log for more details. Wystąpił nieznany błąd. Więcej informacji można znaleźć w pliku log. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Zamykanie aplikacji... - + Save Data Zapis danych - + Mod Data Dane modów - + Error Opening %1 Folder Błąd podczas otwarcia folderu %1 - - + + Folder does not exist! Folder nie istnieje! - + Error Opening Transferable Shader Cache Błąd podczas otwierania przenośnej pamięci podręcznej Shaderów. - + Failed to create the shader cache directory for this title. Nie udało się stworzyć ścieżki shaderów dla tego tytułu. - + Error Removing Contents Błąd podczas usuwania zawartości - + Error Removing Update Błąd podczas usuwania aktualizacji - + Error Removing DLC Błąd podczas usuwania dodatków - + Remove Installed Game Contents? Czy usunąć zainstalowaną zawartość gry? - + Remove Installed Game Update? Czy usunąć zainstalowaną aktualizację gry? - + Remove Installed Game DLC? Czy usunąć zainstalowane dodatki gry? - + Remove Entry Usuń wpis - - - - - - + + + + + + Successfully Removed Pomyślnie usunięto - + Successfully removed the installed base game. Pomyślnie usunięto zainstalowaną grę. - + The base game is not installed in the NAND and cannot be removed. Gra nie jest zainstalowana w NAND i nie może zostać usunięta. - + Successfully removed the installed update. Pomyślnie usunięto zainstalowaną łatkę. - + There is no update installed for this title. Brak zainstalowanych łatek dla tego tytułu. - + There are no DLC installed for this title. Brak zainstalowanych DLC dla tego tytułu. - + Successfully removed %1 installed DLC. Pomyślnie usunięto %1 zainstalowane DLC. - + Delete OpenGL Transferable Shader Cache? Usunąć Transferowalne Shadery OpenGL? - + Delete Vulkan Transferable Shader Cache? Usunąć Transferowalne Shadery Vulkan? - + Delete All Transferable Shader Caches? Usunąć Wszystkie Transferowalne Shadery? - + Remove Custom Game Configuration? Usunąć niestandardową konfigurację gry? - + Remove File Usuń plik - - + + Error Removing Transferable Shader Cache Błąd podczas usuwania przenośnej pamięci podręcznej Shaderów. - - + + A shader cache for this title does not exist. Pamięć podręczna Shaderów dla tego tytułu nie istnieje. - + Successfully removed the transferable shader cache. Pomyślnie usunięto przenośną pamięć podręczną Shaderów. - + Failed to remove the transferable shader cache. Nie udało się usunąć przenośnej pamięci Shaderów. - + Error Removing Vulkan Driver Pipeline Cache Błąd podczas usuwania pamięci podręcznej strumienia sterownika Vulkana - + Failed to remove the driver pipeline cache. Błąd podczas usuwania pamięci podręcznej strumienia sterownika. - - + + Error Removing Transferable Shader Caches Błąd podczas usuwania Transferowalnych Shaderów - + Successfully removed the transferable shader caches. Pomyślnie usunięto transferowalne shadery. - + Failed to remove the transferable shader cache directory. Nie udało się usunąć ścieżki transferowalnych shaderów. - - + + Error Removing Custom Configuration Błąd podczas usuwania niestandardowej konfiguracji - + A custom configuration for this title does not exist. Niestandardowa konfiguracja nie istnieje dla tego tytułu. - + Successfully removed the custom game configuration. Pomyślnie usunięto niestandardową konfiguracje gry. - + Failed to remove the custom game configuration. Nie udało się usunąć niestandardowej konfiguracji gry. - - + + RomFS Extraction Failed! Wypakowanie RomFS nieudane! - + There was an error copying the RomFS files or the user cancelled the operation. Wystąpił błąd podczas kopiowania plików RomFS lub użytkownik anulował operację. - + Full Pełny - + Skeleton Szkielet - + Select RomFS Dump Mode Wybierz tryb zrzutu RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Proszę wybrać w jaki sposób chcesz, aby zrzut pliku RomFS został wykonany. <br>Pełna kopia ze wszystkimi plikami do nowego folderu, gdy <br>skielet utworzy tylko strukturę folderu. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Nie ma wystarczająco miejsca w %1 aby wyodrębnić RomFS. Zwolnij trochę miejsca, albo zmień ścieżkę zrzutu RomFs w Emulacja> Konfiguruj> System> System Plików> Źródło Zrzutu - + Extracting RomFS... Wypakowywanie RomFS... - - + + Cancel Anuluj - + RomFS Extraction Succeeded! Wypakowanie RomFS zakończone pomyślnie! - + The operation completed successfully. Operacja zakończona sukcesem. - - - - - + + + + + Create Shortcut Utwórz skrót - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Utworzy to skrót do obecnego AppImage. Może nie działać dobrze po aktualizacji. Kontynuować? - + Cannot create shortcut on desktop. Path "%1" does not exist. Nie można utworzyć skrótu na pulpicie. Ścieżka "%1" nie istnieje. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Nie można utworzyć skrótu w menu aplikacji. Ścieżka "%1" nie istnieje oraz nie może być utworzona. - + Create Icon Utwórz ikonę - + Cannot create icon file. Path "%1" does not exist and cannot be created. Nie można utworzyć pliku ikony. Ścieżka "%1" nie istnieje oraz nie może być utworzona. - + Start %1 with the yuzu Emulator Włącz %1 z emulatorem yuzu - + Failed to create a shortcut at %1 Nie udało się utworzyć skrótu pod %1 - + Successfully created a shortcut to %1 Pomyślnie utworzono skrót do %1 - + Error Opening %1 Błąd podczas otwierania %1 - + Select Directory Wybierz folder... - + Properties Właściwości - + The game properties could not be loaded. Właściwości tej gry nie mogły zostać załadowane. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Plik wykonywalny Switcha (%1);;Wszystkie pliki (*.*) - + Load File Załaduj plik... - + Open Extracted ROM Directory Otwórz folder wypakowanego ROMu - + Invalid Directory Selected Wybrano niewłaściwy folder - + The directory you have selected does not contain a 'main' file. Folder wybrany przez ciebie nie zawiera 'głownego' pliku. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Instalacyjne pliki Switch'a (*.nca *.nsp *.xci);;Archiwum zawartości Nintendo (*.nca);;Pakiet poddany Nintendo (*.nsp);;Obraz z kartridża NX (*.xci) - + Install Files Zainstaluj pliki - + %n file(s) remaining 1 plik został%n plików zostało%n plików zostało%n plików zostało - + Installing file "%1"... Instalowanie pliku "%1"... - - + + Install Results Wynik instalacji - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Aby uniknąć ewentualnych konfliktów, odradzamy użytkownikom instalowanie gier na NAND. Proszę, używaj tej funkcji tylko do instalowania łatek i DLC. - + %n file(s) were newly installed 1 nowy plik został zainstalowany @@ -5095,389 +5126,400 @@ Proszę, używaj tej funkcji tylko do instalowania łatek i DLC. - + %n file(s) were overwritten 1 plik został nadpisany%n plików zostało nadpisane%n plików zostało nadpisane%n plików zostało nadpisane - + %n file(s) failed to install 1 pliku nie udało się zainstalować%n plików nie udało się zainstalować%n plików nie udało się zainstalować%n plików nie udało się zainstalować - + System Application Aplikacja systemowa - + System Archive Archiwum systemu - + System Application Update Aktualizacja aplikacji systemowej - + Firmware Package (Type A) Paczka systemowa (Typ A) - + Firmware Package (Type B) Paczka systemowa (Typ B) - + Game Gra - + Game Update Aktualizacja gry - + Game DLC Dodatek do gry - + Delta Title Tytuł Delta - + Select NCA Install Type... Wybierz typ instalacji NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Wybierz typ tytułu, do którego chcesz zainstalować ten NCA, jako: (W większości przypadków domyślna "gra" jest w porządku.) - + Failed to Install Instalacja nieudana - + The title type you selected for the NCA is invalid. Typ tytułu wybrany dla NCA jest nieprawidłowy. - + File not found Nie znaleziono pliku - + File "%1" not found Nie znaleziono pliku "%1" - + OK OK - - + + Hardware requirements not met Wymagania sprzętowe nie są spełnione - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Twój system nie spełnia rekomendowanych wymagań sprzętowych. Raportowanie kompatybilności zostało wyłączone. - + Missing yuzu Account Brakuje konta Yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Aby przesłać test zgodności gry, musisz połączyć swoje konto yuzu.<br><br/> Aby połączyć swoje konto yuzu, przejdź do opcji Emulacja &gt; Konfiguracja &gt; Sieć. - + Error opening URL Błąd otwierania adresu URL - + Unable to open the URL "%1". Nie można otworzyć adresu URL "%1". - + TAS Recording Nagrywanie TAS - + Overwrite file of player 1? Nadpisać plik gracza 1? - + Invalid config detected Wykryto nieprawidłową konfigurację - + Handheld controller can't be used on docked mode. Pro controller will be selected. Nie można używać kontrolera handheld w trybie zadokowanym. Zostanie wybrany kontroler Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Amiibo zostało "zdjęte" - + Error Błąd - - + + The current game is not looking for amiibos Ta gra nie szuka amiibo - + Amiibo File (%1);; All Files (*.*) Plik Amiibo (%1);;Wszyskie pliki (*.*) - + Load Amiibo Załaduj Amiibo - + Error loading Amiibo data Błąd podczas ładowania pliku danych Amiibo - + The selected file is not a valid amiibo Wybrany plik nie jest poprawnym amiibo - + The selected file is already on use Wybrany plik jest już w użyciu - + An unknown error occurred Wystąpił nieznany błąd - + Capture Screenshot Zrób zrzut ekranu - + PNG Image (*.png) Obrazek PNG (*.png) - + TAS state: Running %1/%2 Status TAS: Działa %1%2 - + TAS state: Recording %1 Status TAS: Nagrywa %1 - + TAS state: Idle %1/%2 Status TAS: Bezczynny %1%2 - + TAS State: Invalid Status TAS: Niepoprawny - + &Stop Running &Wyłącz - + &Start &Start - + Stop R&ecording Przestań N&agrywać - + R&ecord N&agraj - + Building: %n shader(s) Budowanie shaderaBudowanie: %n shaderówBudowanie: %n shaderówBudowanie: %n shaderów - + Scale: %1x %1 is the resolution scaling factor Skala: %1x - + Speed: %1% / %2% Prędkość: %1% / %2% - + Speed: %1% Prędkość: %1% - + Game: %1 FPS (Unlocked) Gra: %1 FPS (Odblokowane) - + Game: %1 FPS Gra: %1 FPS - + Frame: %1 ms Klatka: %1 ms - + GPU NORMAL GPU NORMALNE - + GPU HIGH GPU WYSOKIE - + GPU EXTREME GPU EKSTREMALNE - + GPU ERROR BŁĄD GPU - + DOCKED TRYB ZADOKOWANY - + HANDHELD TRYB PRZENOŚNY - + OPENGL OPENGL - + VULKAN VULKAN - + NULL Zero - + NEAREST NAJBLIŻSZY - - + + BILINEAR BILINEARNY - + BICUBIC BIKUBICZNY - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA BEZ AA - + FXAA FXAA - + SMAA SMAA - + + VOLUME: MUTE + + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + + + + Confirm Key Rederivation Potwierdź ponowną aktywacje klucza - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5494,37 +5536,37 @@ i opcjonalnie tworzyć kopie zapasowe. Spowoduje to usunięcie wygenerowanych automatycznie plików kluczy i ponowne uruchomienie modułu pochodnego klucza. - + Missing fuses Brakujące bezpieczniki - + - Missing BOOT0 - Brak BOOT0 - + - Missing BCPKG2-1-Normal-Main - Brak BCPKG2-1-Normal-Main - + - Missing PRODINFO - Brak PRODINFO - + Derivation Components Missing Brak komponentów wyprowadzania - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Brakuje elementów, które mogą uniemożliwić zakończenie wyprowadzania kluczy. <br>Postępuj zgodnie z <a href='https://yuzu-emu.org/help/quickstart/'>yuzu quickstart guide</a> aby zdobyć wszystkie swoje klucze i gry.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5533,39 +5575,39 @@ Zależnie od tego może potrwać do minuty na wydajność twojego systemu. - + Deriving Keys Wyprowadzanie kluczy... - + Select RomFS Dump Target Wybierz cel zrzutu RomFS - + Please select which RomFS you would like to dump. Proszę wybrać RomFS, jakie chcesz zrzucić. - + Are you sure you want to close yuzu? Czy na pewno chcesz zamknąć yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Czy na pewno chcesz zatrzymać emulację? Wszystkie niezapisane postępy zostaną utracone. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5577,44 +5619,44 @@ Czy chcesz to ominąć i mimo to wyjść? GRenderWindow - - + + OpenGL not available! OpenGL niedostępny! - + OpenGL shared contexts are not supported. Współdzielone konteksty OpenGL nie są obsługiwane. - + yuzu has not been compiled with OpenGL support. yuzu nie zostało skompilowane z obsługą OpenGL. - - + + Error while initializing OpenGL! Błąd podczas inicjowania OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Twoja karta graficzna może nie obsługiwać OpenGL lub nie masz najnowszych sterowników karty graficznej. - + Error while initializing OpenGL 4.6! Błąd podczas inicjowania OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Twoja karta graficzna może nie obsługiwać OpenGL 4.6 lub nie masz najnowszych sterowników karty graficznej.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Twoja karta graficzna może nie obsługiwać co najmniej jednego wymaganego rozszerzenia OpenGL. Upewnij się, że masz najnowsze sterowniki karty graficznej<br><br>GL Renderer:<br>%1<br><br>Nieobsługiwane rozszerzenia:<br>%2 @@ -5854,7 +5896,7 @@ Czy chcesz to ominąć i mimo to wyjść? GameListPlaceholder - + Double-click to add a new folder to the game list Kliknij podwójnie aby dodać folder do listy gier @@ -6200,51 +6242,56 @@ Komunikat debugowania: + Hide Empty Rooms + + + + Hide Full Rooms Ukryj Pełne Pokoje - + Refresh Lobby Odśwież Lobby - + Password Required to Join Aby dołączyć, potrzebne jest hasło - + Password: Hasło: - + Players Gracze - + Room Name Nazwa Pokoju - + Preferred Game Preferowana Gra - + Host Host - + Refreshing Odświeżam - + Refresh List Odśwież listę @@ -6855,7 +6902,7 @@ p, li { white-space: pre-wrap; } - + [not set] [nie ustawione] @@ -6870,10 +6917,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Oś %1%2 @@ -6887,9 +6934,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [nieznane] @@ -7054,15 +7101,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [niepoprawne] - - %1%2Hat %3 %1%2Drążek %3 @@ -7070,35 +7115,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2Oś %3 - + %1%2Axis %3,%4,%5 %1%2Oś %3,%4,%5 - + %1%2Motion %3 %1%2Ruch %3 - - %1%2Button %3 %1%2Przycisk %3 - + [unused] [nieużywane] @@ -7185,9 +7228,21 @@ p, li { white-space: pre-wrap; } Dodatkowe - - %1%2%3 - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 + diff --git a/dist/languages/pt_BR.ts b/dist/languages/pt_BR.ts index 18e133b2b..4f6b8bc54 100644 --- a/dist/languages/pt_BR.ts +++ b/dist/languages/pt_BR.ts @@ -213,7 +213,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. %1 - %2 (%3/%4 members) - connected - + %1 - %2 (%3/%4 membros) - conectado @@ -242,7 +242,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. <html><head/><body><p>Does the game boot?</p></body></html> - + <html><head/><body><p>O jogo inicializa?</p></body></html> @@ -267,77 +267,77 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. <html><head/><body><p>Does the game reach gameplay?</p></body></html> - + <html><head/><body><p>O jogo chega a gameplay?</p></body></html> Yes The game works without crashes - + Sim O jogo funciona sem crashes No The game crashes or freezes during gameplay - + Não O jogo crasha ou congela durante a gameplay <html><head/><body><p>Does the game work without crashing, freezing or locking up during gameplay?</p></body></html> - + <html><head/><body><p>O jogo funciona sem crashar, congelar ou travar durante a gameplay?</p></body></html> Yes The game can be finished without any workarounds - + Sim O jogo pode ser concluído sem o uso de soluções alternativas No The game can't progress past a certain area - + Não Não é possível progredir no jogo a partir de uma certa área <html><head/><body><p>Is the game completely playable from start to finish?</p></body></html> - + <html><head/><body><p>O jogo é completamente jogável do início ao fim?</p></body></html> Major The game has major graphical errors - + Graves O jogo tem graves erros gráficos Minor The game has minor graphical errors - + Pequenos O jogo tem pequenos erros gráficos None Everything is rendered as it looks on the Nintendo Switch - + Nenhum Tudo é renderizado como no Nintendo Switch <html><head/><body><p>Does the game have any graphical glitches?</p></body></html> - + <html><head/><body><p>O jogo tem alguma falha gráfica?</p></body></html> Major The game has major audio errors - + Graves O jogo tem graves erros de áudio Minor The game has minor audio errors - + Pequenas O jogo tem pequenos erros de áudio None Audio is played perfectly - + Nenhuma O áudio é reproduzido perfeitamente <html><head/><body><p>Does the game have any audio glitches / missing effects?</p></body></html> - + <html><head/><body><p>O jogo tem alguma falha no áudio / efeitos ausentes?</p></body></html> @@ -808,12 +808,15 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + + <div style="white-space: nowrap">Esta otimização acelera os acessos à memória ao permitir que acessos inválidos à memória sejam bem-sucedidos.</div> + <div style="white-space: nowrap">Ativá-la reduz a sobrecarga de todos os acessos à memória e não tem impacto em programas que não tem acessos inválidos à memória.</div> + Enable fallbacks for invalid memory accesses - + Permitir fallbacks para acessos inválidos à memória @@ -936,12 +939,12 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. When checked, it disables the macro HLE functions. Enabling this makes games run slower - + Quando marcado, desabilita as funções do macro HLE. Habilitar esta opção faz com que os jogos rodem mais lentamente Disable Macro HLE - + Desabilitar o Macro HLE @@ -981,17 +984,17 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Habilite essa opção para gravar a última saída da lista de comandos de áudio para o console. Somente afetará jogos que utilizam o renderizador de áudio. Dump Audio Commands To Console** - + Despejar comandos de áudio no console** Create Minidump After Crash - + Criar um despejo resumido após uma falha @@ -1031,12 +1034,12 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Permite que o yuzu procure por um ambiente Vulkan funcional quando o programa iniciar. Desabilite essa opção se estiver causando conflitos com programas externos visualizando o yuzu. Perform Startup Vulkan Check - + Executar checagem do Vulkan na inicialização @@ -1046,22 +1049,22 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Restart Required - + É necessário reiniciar yuzu is required to restart in order to apply this setting. - + Será necessário reiniciar o yuzu para aplicar as configurações. Web applet not compiled - + Applet Web não compilado MiniDump creation not compiled - + Criação do mini despejo não compilada @@ -1515,7 +1518,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Force 16:10 - + Forçar 16:10 @@ -1545,7 +1548,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. 1.5X (1080p/1620p) [EXPERIMENTAL] - + 1.5X (1080p/1620p) [EXPERIMENTAL] @@ -1575,12 +1578,12 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. 7X (5040p/7560p) - + 7X (5040p/7560p) 8X (5760p/8640p) - + 8X (5760p/8640p) @@ -1615,7 +1618,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. AMD FidelityFX™️ Super Resolution - + AMD FidelityFX™️ Super Resolution @@ -1630,27 +1633,27 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. SMAA - + SMAA Use global FSR Sharpness - + Usar FSR Sharpness global Set FSR Sharpness - + Definir FSR Sharpness FSR Sharpness: - + FSR Sharpness: 100% - + 100% @@ -1676,7 +1679,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. SPIR-V (Experimental, Mesa Only) - + SPIR-V (Experimental, Somente Mesa) @@ -1710,12 +1713,12 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - + Executa trabalho em segundo plano aguardando pelos comandos gráficos para evitar a GPU de reduzir seu clock. Force maximum clocks (Vulkan only) - + Forçar clock máximo (somente Vulkan) @@ -1725,80 +1728,90 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Use VSync - + Usar VSync + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Realiza a compilação de shaders de forma assíncrona, o que pode reduzir engasgos de shaders. Esta opção é experimental. - + Use asynchronous shader building (Hack) Usar compilação assíncrona de shaders (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Ativa um tempo de resposta rápido da GPU. Esta opção forçará a maioria dos jogos a rodar em sua resolução nativa mais alta. - + Use Fast GPU Time (Hack) Usar tempo de resposta rápido da GPU (Hack) - - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - - - - - Use pessimistic buffer flushes (Hack) - - - Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + Habilita limpeza de buffer pessimista. Essa opção irá forçar que buffer não modificados sejam eliminados, que pode causar impacto na performance. - Use Vulkan pipeline cache - + Use pessimistic buffer flushes (Hack) + Usar limpeza de buffer pessimista (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + Habilita cache de pipeline específico do fabricante. Essa opção pode melhorar o tempo de carga dos shaders significativamente nos casos onde o driver do Vulkan não armazena os arquivos cache de pipeline internamente. + + + + Use Vulkan pipeline cache + Utilizar cache de pipeline do Vulkan + + + Anisotropic Filtering: Filtragem anisotrópica: - + Automatic Automático - + Default Padrão - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2186,7 +2199,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Configure Configurar @@ -2198,7 +2211,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Infrared Camera - + Câmera infravermelha @@ -2213,6 +2226,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. + Requires restarting yuzu Requer reiniciar o yuzu @@ -2234,25 +2248,30 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Enable direct JoyCon driver - + Habilitar driver direto do JoyCon - + + Enable direct Pro Controller driver [EXPERIMENTAL] + Habilitar driver direto do Pro Controller [EXPERIMENTAL] + + + Enable mouse panning Ativar o giro do mouse - + Mouse sensitivity Sensibilidade do mouse - + % % - + Motion / Touch Movimento/toque @@ -2272,57 +2291,57 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Input Profiles - + Perfis de controle Player 1 Profile - + Perfil do Jogador 1 Player 2 Profile - + Perfil do Jogador 2 Player 3 Profile - + Perfil do Jogador 3 Player 4 Profile - + Perfil do Jogador 4 Player 5 Profile - + Perfil do Jogador 5 Player 6 Profile - + Perfil do Jogador 6 Player 7 Profile - + Perfil do Jogador 7 Player 8 Profile - + Perfil do Jogador 8 Use global input configuration - + Usar configuração global de controles Player %1 profile - + Perfil do Jogador %1 @@ -2364,7 +2383,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Left Stick Analógico esquerdo @@ -2458,14 +2477,14 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + L L - + ZL ZL @@ -2484,7 +2503,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Plus Mais @@ -2497,15 +2516,15 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + R R - + ZR ZR @@ -2562,236 +2581,241 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Right Stick Analógico direito - - - - + + + + Clear Limpar - - - - - + + + + + [not set] [não definido] - - + + Invert button Inverter botão - - + + Toggle button Alternar pressionamento do botão - - + + Turbo button + Botão Turbo + + + + Invert axis Inverter eixo - - - + + + Set threshold Definir limite - - + + Choose a value between 0% and 100% Escolha um valor entre 0% e 100% - + Toggle axis - + Alternar eixos - + Set gyro threshold Definir limite do giroscópio - + Map Analog Stick Mapear analógico - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Após pressionar OK, mova o seu direcional analógico primeiro horizontalmente e depois verticalmente. Para inverter os eixos, mova seu analógico primeiro verticalmente e depois horizontalmente. - + Center axis Eixo central - - + + Deadzone: %1% Zona morta: %1% - - + + Modifier Range: %1% Alcance de modificador: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Par de Joycons - + Left Joycon Joycon Esquerdo - + Right Joycon Joycon Direito - + Handheld Portátil - + GameCube Controller Controle de GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Controle NES - + SNES Controller Controle SNES - + N64 Controller Controle N64 - + Sega Genesis Mega Drive - + Start / Pause Iniciar / Pausar - + Z Z - + Control Stick Direcional de controle - + C-Stick C-Stick - + Shake! Balance! - + [waiting] [esperando] - + New Profile Novo perfil - + Enter a profile name: Insira um nome para o perfil: - - + + Create Input Profile Criar perfil de controle - + The given profile name is not valid! O nome de perfil inserido não é válido! - + Failed to create the input profile "%1" Falha ao criar o perfil de controle "%1" - + Delete Input Profile Excluir perfil de controle - + Failed to delete the input profile "%1" Falha ao excluir o perfil de controle "%1" - + Load Input Profile Carregar perfil de controle - + Failed to load the input profile "%1" Falha ao carregar o perfil de controle "%1" - + Save Input Profile Salvar perfil de controle - + Failed to save the input profile "%1" Falha ao salvar o perfil de controle "%1" @@ -3083,7 +3107,7 @@ Para inverter os eixos, mova seu analógico primeiro verticalmente e depois hori Input Profiles - + Perfis de controle @@ -3265,7 +3289,7 @@ Para inverter os eixos, mova seu analógico primeiro verticalmente e depois hori Delete this user? All of the user's save data will be deleted. - + Excluir esse usuário? Todos os dados salvos desse usuário serão removidos. @@ -3276,7 +3300,8 @@ Para inverter os eixos, mova seu analógico primeiro verticalmente e depois hori Name: %1 UUID: %2 - + Nome: %1 +UUID: %2 @@ -3294,7 +3319,7 @@ UUID: %2 Virtual Ring Sensor Parameters - + Parâmetros do Sensor de Anel @@ -3316,29 +3341,29 @@ UUID: %2 Direct Joycon Driver - + Driver Direto do Joycon Enable Ring Input - + Habilitar Controle de Anel Enable - + Habilitar Ring Sensor Value - + Valor do Sensor de Anel Not connected - + Não conectado @@ -3369,12 +3394,12 @@ UUID: %2 Error enabling ring input - + Erro habilitando controle de anel Direct Joycon driver is not enabled - + Driver direto do Joycon não está habilitado @@ -3384,17 +3409,17 @@ UUID: %2 The current mapped device doesn't support the ring controller - + O dispositivo atualmente mapeado não suporta o controle de anel The current mapped device doesn't have a ring attached - + O dispositivo mapeado não tem um anel conectado Unexpected driver result %1 - + Resultado inesperado do driver %1 @@ -3703,7 +3728,7 @@ UUID: %2 American English - + Inglês Americano @@ -3803,7 +3828,7 @@ UUID: %2 Device Name - + Nome do Dispositivo @@ -3843,7 +3868,7 @@ UUID: %2 Warning: "%1" is not a valid language for region "%2" - + Aviso: "%1" não é um idioma válido para a região "%2" @@ -4167,7 +4192,7 @@ Mova os pontos para mudar a posição, ou clique duas vezes nas células da tabe Show Compatibility List - + Exibir Lista de Compatibilidade @@ -4177,12 +4202,12 @@ Mova os pontos para mudar a posição, ou clique duas vezes nas células da tabe Show Size Column - + Exibir Coluna Tamanho Show File Types Column - + Exibir Coluna Tipos de Arquivos @@ -4366,7 +4391,7 @@ Mova os pontos para mudar a posição, ou clique duas vezes nas células da tabe Web Service configuration can only be changed when a public room isn't being hosted. - + Configuração de Serviço Web só podem ser alteradas quando uma sala pública não está sendo hospedada. @@ -4444,7 +4469,7 @@ Mova os pontos para mudar a posição, ou clique duas vezes nas células da tabe Unverified, please click Verify before saving configuration Tooltip - + Não verificado, por favor clique sobre Verificar antes de salvar as configurações @@ -4456,7 +4481,7 @@ Mova os pontos para mudar a posição, ou clique duas vezes nas células da tabe Verified Tooltip - + Verificado @@ -4493,42 +4518,42 @@ Mova os pontos para mudar a posição, ou clique duas vezes nas células da tabe Direct Connect - + Conexão Direta Server Address - + Endereço do Servidor <html><head/><body><p>Server address of the host</p></body></html> - + <html><head/><body><p>Endereço do servidor que fará a hospedagem</p></body></html> Port - + Porta <html><head/><body><p>Port number the host is listening on</p></body></html> - + <html><head/><body><p>Número da porta que o servidor de hospedagem está escutando</p></body></html> Nickname - + Apelido Password - + Senha Connect - + Conectar @@ -4536,12 +4561,12 @@ Mova os pontos para mudar a posição, ou clique duas vezes nas células da tabe Connecting - + Conectando Connect - + Conectar @@ -4559,533 +4584,543 @@ Mova os pontos para mudar a posição, ou clique duas vezes nas células da tabe Broken Vulkan Installation Detected - + Detectada Instalação Defeituosa do Vulkan Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + A inicialização do Vulkan falhou durante a carga do programa. <br><br>Clique <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>aqui para instruções de como resolver o problema</a>. - + Loading Web Applet... Carregando applet web... - - + + Disable Web Applet Desativar o applet da web - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) A desativação do applet da web pode causar comportamento inesperado e deve apenas ser usada com Super Mario 3D All-Stars. Você deseja mesmo desativar o applet da web? (Ele pode ser reativado nas configurações de depuração.) - + The amount of shaders currently being built A quantidade de shaders sendo construídos - + The current selected resolution scaling multiplier. O atualmente multiplicador de escala de resolução selecionado. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Velocidade atual de emulação. Valores maiores ou menores que 100% indicam que a emulação está rodando mais rápida ou lentamente que em um Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Quantos quadros por segundo o jogo está exibindo atualmente. Isto irá variar de jogo para jogo e cena para cena. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tempo que leva para emular um quadro do Switch, sem considerar o limitador de taxa de quadros ou a sincronização vertical. Um valor menor ou igual a 16.67 ms indica que a emulação está em velocidade plena. - + &Clear Recent Files &Limpar arquivos recentes - + + Emulated mouse is enabled + Mouse emulado está habilitado + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + Controle de mouse real e controle panorâmico do mouse são incompatíveis. Por favor desabilite a emulação do mouse em configurações avançadas de controles para permitir o controle panorâmico do mouse. + + + &Continue &Continuar - + &Pause &Pausar - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu está rodando um jogo - + Warning Outdated Game Format Aviso - formato de jogo desatualizado - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Você está usando neste jogo o formato de ROM desconstruída e extraída em uma pasta, que é um formato desatualizado que foi substituído por outros, como NCA, NAX, XCI ou NSP. Pastas desconstruídas de ROMs não possuem ícones, metadados e suporte a atualizações.<br><br>Para saber mais sobre os vários formatos de ROMs de Switch compatíveis com o yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>confira a nossa wiki</a>. Esta mensagem não será exibida novamente. - - + + Error while loading ROM! Erro ao carregar a ROM! - + The ROM format is not supported. O formato da ROM não é suportado. - + An error occurred initializing the video core. Ocorreu um erro ao inicializar o núcleo de vídeo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu encontrou um erro enquanto rodando o núcleo de vídeo. Normalmente isto é causado por drivers de GPU desatualizados, incluindo integrados. Por favor veja o registro para mais detalhes. Para mais informações em acesso ao registro por favor veja a seguinte página: <a href='https://yuzu-emu.org/help/reference/log-files/'>Como fazer envio de arquivo de registro</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Erro ao carregar a ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>o guia de início rápido</a> para reextrair os seus arquivos.<br>Você pode consultar a wiki do yuzu</a> ou o Discord do yuzu</a> para obter ajuda. - + An unknown error occurred. Please see the log for more details. Ocorreu um erro desconhecido. Consulte o registro para mais detalhes. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Encerrando software... - + Save Data Dados de jogos salvos - + Mod Data Dados de mods - + Error Opening %1 Folder Erro ao abrir a pasta %1 - - + + Folder does not exist! A pasta não existe! - + Error Opening Transferable Shader Cache Erro ao abrir o cache de shaders transferível - + Failed to create the shader cache directory for this title. Falha ao criar o diretório de cache de shaders para este título. - + Error Removing Contents - + Erro ao Remover Conteúdos - + Error Removing Update - + Erro ao Remover Atualização - + Error Removing DLC - + Erro ao Remover DLC - + Remove Installed Game Contents? - + Remover Conteúdo Instalado do Jogo? - + Remove Installed Game Update? - + Remover Atualização Instalada do Jogo? - + Remove Installed Game DLC? - + Remover DLC Instalada do Jogo? - + Remove Entry Remover item - - - - - - + + + + + + Successfully Removed Removido com sucesso - + Successfully removed the installed base game. O jogo base foi removido com sucesso. - + The base game is not installed in the NAND and cannot be removed. O jogo base não está instalado na NAND e não pode ser removido. - + Successfully removed the installed update. A atualização instalada foi removida com sucesso. - + There is no update installed for this title. Não há nenhuma atualização instalada para este título. - + There are no DLC installed for this title. Não há nenhum DLC instalado para este título. - + Successfully removed %1 installed DLC. %1 DLC(s) instalados foram removidos com sucesso. - + Delete OpenGL Transferable Shader Cache? Apagar o cache de shaders transferível do OpenGL? - + Delete Vulkan Transferable Shader Cache? Apagar o cache de shaders transferível do Vulkan? - + Delete All Transferable Shader Caches? Apagar todos os caches de shaders transferíveis? - + Remove Custom Game Configuration? Remover configurações customizadas do jogo? - + Remove File Remover arquivo - - + + Error Removing Transferable Shader Cache Erro ao remover cache de shaders transferível - - + + A shader cache for this title does not exist. Não existe um cache de shaders para este título. - + Successfully removed the transferable shader cache. O cache de shaders transferível foi removido com sucesso. - + Failed to remove the transferable shader cache. Falha ao remover o cache de shaders transferível. - + Error Removing Vulkan Driver Pipeline Cache - + Erro ao Remover Cache de Pipeline do Driver Vulkan - + Failed to remove the driver pipeline cache. - + Falha ao remover o pipeline de cache do driver. - - + + Error Removing Transferable Shader Caches Erro ao remover os caches de shaders transferíveis - + Successfully removed the transferable shader caches. Os caches de shaders transferíveis foram removidos com sucesso. - + Failed to remove the transferable shader cache directory. Falha ao remover o diretório do cache de shaders transferível. - - + + Error Removing Custom Configuration Erro ao remover as configurações customizadas do jogo. - + A custom configuration for this title does not exist. Não há uma configuração customizada para este título. - + Successfully removed the custom game configuration. As configurações customizadas do jogo foram removidas com sucesso. - + Failed to remove the custom game configuration. Falha ao remover as configurações customizadas do jogo. - - + + RomFS Extraction Failed! Falha ao extrair RomFS! - + There was an error copying the RomFS files or the user cancelled the operation. Houve um erro ao copiar os arquivos RomFS ou o usuário cancelou a operação. - + Full Extração completa - + Skeleton Apenas estrutura - + Select RomFS Dump Mode Selecione o modo de extração do RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Selecione a forma como você gostaria que o RomFS seja extraído.<br>"Extração completa" copiará todos os arquivos para a nova pasta, enquanto que <br>"Apenas estrutura" criará apenas a estrutura de pastas. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Não há espaço suficiente em %1 para extrair o RomFS. Por favor abra espaço ou selecione um diretório diferente em Emulação > Configurar > Sistema > Sistema de arquivos > Extrair raiz - + Extracting RomFS... Extraindo RomFS... - - + + Cancel Cancelar - + RomFS Extraction Succeeded! Extração do RomFS concluida! - + The operation completed successfully. A operação foi concluída com sucesso. - - - - - + + + + + Create Shortcut - + Criar Atalho - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - - - - - Cannot create shortcut on desktop. Path "%1" does not exist. - - - - - Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Isso irá criar um atalho para o AppImage atual. Isso pode não funcionar corretamente se você fizer uma atualização. Continuar? + Cannot create shortcut on desktop. Path "%1" does not exist. + Não foi possível criar um atalho na área de trabalho. O caminho "%1" não existe. + + + + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. + Não foi possível criar um atalho no menu de aplicativos. O caminho "%1" não existe e não pode ser criado. + + + Create Icon - + Criar Ícone - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Não foi possível criar o arquivo de ícone. O caminho "%1" não existe e não pode ser criado. - + Start %1 with the yuzu Emulator - + Iniciar %1 com o Emulador yuzu - + Failed to create a shortcut at %1 - + Falha ao criar um atalho em %1 - + Successfully created a shortcut to %1 - + Atalho criado com sucesso em %1 - + Error Opening %1 Erro ao abrir %1 - + Select Directory Selecionar pasta - + Properties Propriedades - + The game properties could not be loaded. As propriedades do jogo não puderam ser carregadas. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Executável do Switch (%1);;Todos os arquivos (*.*) - + Load File Carregar arquivo - + Open Extracted ROM Directory Abrir pasta da ROM extraída - + Invalid Directory Selected Pasta inválida selecionada - + The directory you have selected does not contain a 'main' file. A pasta que você selecionou não contém um arquivo 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Arquivo de Switch instalável (*.nca *.nsp *.xci);; Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Instalar arquivos - + %n file(s) remaining %n arquivo restante%n arquivo(s) restante(s)%n arquivo(s) restante(s) - + Installing file "%1"... Instalando arquivo "%1"... - - + + Install Results Resultados da instalação - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Para evitar possíveis conflitos, desencorajamos que os usuários instalem os jogos base na NAND. Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + %n file(s) were newly installed %n arquivo(s) instalado(s) @@ -5094,7 +5129,7 @@ Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + %n file(s) were overwritten %n arquivo(s) sobrescrito(s) @@ -5103,7 +5138,7 @@ Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + %n file(s) failed to install %n arquivo(s) não instalado(s) @@ -5112,377 +5147,388 @@ Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + System Application Aplicativo do sistema - + System Archive Arquivo do sistema - + System Application Update Atualização de aplicativo do sistema - + Firmware Package (Type A) Pacote de firmware (tipo A) - + Firmware Package (Type B) Pacote de firmware (tipo B) - + Game Jogo - + Game Update Atualização de jogo - + Game DLC DLC de jogo - + Delta Title Título delta - + Select NCA Install Type... Selecione o tipo de instalação do NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Selecione o tipo de título como o qual você gostaria de instalar este NCA: (Na maioria dos casos, o padrão 'Jogo' serve bem.) - + Failed to Install Falha ao instalar - + The title type you selected for the NCA is invalid. O tipo de título que você selecionou para o NCA é inválido. - + File not found Arquivo não encontrado - + File "%1" not found Arquivo "%1" não encontrado - + OK OK - - + + Hardware requirements not met - + Requisitos de hardware não atendidos - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Seu sistema não atende os requisitos de harwdare. O relatório de compatibilidade foi desabilitado. - + Missing yuzu Account Conta do yuzu faltando - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Para enviar um caso de teste de compatibilidade de jogo, você precisa entrar com a sua conta do yuzu.<br><br/>Para isso, vá para Emulação &gt; Configurar... &gt; Rede. - + Error opening URL Erro ao abrir URL - + Unable to open the URL "%1". Não foi possível abrir o URL "%1". - + TAS Recording Gravando TAS - + Overwrite file of player 1? Sobrescrever arquivo do jogador 1? - + Invalid config detected Configuração inválida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. O controle portátil não pode ser usado no modo encaixado na base. O Pro Controller será selecionado. - - + + Amiibo Amiibo - - + + The current amiibo has been removed O amiibo atual foi removido - + Error Erro - - + + The current game is not looking for amiibos O jogo atual não está procurando amiibos - + Amiibo File (%1);; All Files (*.*) Arquivo Amiibo (%1);; Todos os arquivos (*.*) - + Load Amiibo Carregar Amiibo - + Error loading Amiibo data Erro ao carregar dados do Amiibo - + The selected file is not a valid amiibo - + O arquivo selecionado não é um amiibo válido - + The selected file is already on use - + O arquivo selecionado já está em uso - + An unknown error occurred - + Ocorreu um erro desconhecido - + Capture Screenshot Capturar tela - + PNG Image (*.png) Imagem PNG (*.png) - + TAS state: Running %1/%2 Situação TAS: Rodando %1%2 - + TAS state: Recording %1 Situação TAS: Gravando %1 - + TAS state: Idle %1/%2 Situação TAS: Repouso %1%2 - + TAS State: Invalid Situação TAS: Inválido - + &Stop Running &Parar de rodar - + &Start &Iniciar - + Stop R&ecording Parar G&ravação - + R&ecord G&ravação - + Building: %n shader(s) Compilando: %n shader(s)Compilando: %n shader(s)Compilando: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escala: %1x - + Speed: %1% / %2% Velocidade: %1% / %2% - + Speed: %1% Velocidade: %1% - + Game: %1 FPS (Unlocked) Jogo: %1 FPS (Desbloqueado) - + Game: %1 FPS Jogo: %1 FPS - + Frame: %1 ms Quadro: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR ERRO DE GPU - + DOCKED - + ANCORADO - + HANDHELD - + PORTÁTIL - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NULO - + NEAREST VIZINHO - - + + BILINEAR BILINEAR - + BICUBIC BICÚBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA Sem AA - + FXAA FXAA - + SMAA - + SMAA - + + VOLUME: MUTE + VOLUME: MUDO + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + VOLUME: %1% + + + Confirm Key Rederivation Confirmar rederivação de chave - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5499,37 +5545,37 @@ e opcionalmente faça cópias de segurança. Isto excluirá o seus arquivos de chaves geradas automaticamente, e reexecutar o módulo de derivação de chaves. - + Missing fuses Faltando fusíveis - + - Missing BOOT0 - Faltando BOOT0 - + - Missing BCPKG2-1-Normal-Main - Faltando BCPKG2-1-Normal-Main - + - Missing PRODINFO - Faltando PRODINFO - + Derivation Components Missing Faltando componentes de derivação - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Chaves de encriptação faltando. <br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>o guia de início rápido</a> para extrair suas chaves, firmware e jogos. <br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5538,39 +5584,39 @@ Isto pode demorar até um minuto, dependendo do desempenho do seu sistema. - + Deriving Keys Derivando chaves - + Select RomFS Dump Target Selecionar alvo de extração do RomFS - + Please select which RomFS you would like to dump. Selecione qual RomFS você quer extrair. - + Are you sure you want to close yuzu? Você deseja mesmo fechar o yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Deseja mesmo parar a emulação? Qualquer progresso não salvo será perdido. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5582,44 +5628,44 @@ Deseja ignorar isso e sair mesmo assim? GRenderWindow - - + + OpenGL not available! OpenGL não disponível! - + OpenGL shared contexts are not supported. - + Shared contexts do OpenGL não são suportados. - + yuzu has not been compiled with OpenGL support. O yuzu não foi compilado com suporte para OpenGL. - - + + Error while initializing OpenGL! Erro ao inicializar o OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Sua GPU pode não suportar OpenGL, ou você não possui o driver gráfico mais recente. - + Error while initializing OpenGL 4.6! Erro ao inicializar o OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Sua GPU pode não suportar o OpenGL 4.6, ou você não possui os drivers gráficos mais recentes.<br><br>Renderizador GL:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Sua GPU pode não suportar uma ou mais extensões necessárias do OpenGL. Verifique se você possui a última versão dos drivers gráficos.<br><br>Renderizador GL:<br>%1<br><br>Extensões não suportadas:<br>%2 @@ -5720,7 +5766,7 @@ Deseja ignorar isso e sair mesmo assim? Create Shortcut - + Criar Atalho @@ -5859,7 +5905,7 @@ Deseja ignorar isso e sair mesmo assim? GameListPlaceholder - + Double-click to add a new folder to the game list Clique duas vezes para adicionar uma pasta à lista de jogos @@ -5892,17 +5938,17 @@ Deseja ignorar isso e sair mesmo assim? Room Name - + Nome da Sala Preferred Game - + Jogo Preferencial Max Players - + Máximo de Jogadores @@ -5912,17 +5958,17 @@ Deseja ignorar isso e sair mesmo assim? (Leave blank for open game) - + (Deixe em branco para um jogo aberto) Password - + Senha Port - + Porta @@ -5932,22 +5978,22 @@ Deseja ignorar isso e sair mesmo assim? Load Previous Ban List - + Carregar Lista de Banimento Anterior Public - + Público Unlisted - + Não listado Host Room - + Hospedar Sala @@ -5961,7 +6007,8 @@ Deseja ignorar isso e sair mesmo assim? Failed to announce the room to the public lobby. In order to host a room publicly, you must have a valid yuzu account configured in Emulation -> Configure -> Web. If you do not want to publish a room in the public lobby, then select Unlisted instead. Debug Message: - + Falha ao anunciar a sala ao lobby público. Para hospedar uma sala pública você deve ter configurado uma conta válida do yuzu em Emulação -> Configurações -> Web. Se você não quer publicar uma sala no lobby público seleciona a opção Não listado. +Mensagem de depuração: @@ -5969,7 +6016,7 @@ Debug Message: Audio Mute/Unmute - + Mutar/Desmutar Áudio @@ -5995,17 +6042,17 @@ Debug Message: Main Window - + Janela Principal Audio Volume Down - + Volume Menos Audio Volume Up - + Volume Mais @@ -6015,32 +6062,32 @@ Debug Message: Change Adapting Filter - + Alterar Filtro de Adaptação Change Docked Mode - + Alterar Modo de Ancoragem Change GPU Accuracy - + Alterar Precisão da GPU Continue/Pause Emulation - + Continuar/Pausar Emulação Exit Fullscreen - + Sair da Tela Cheia Exit yuzu - + Sair do yuzu @@ -6055,52 +6102,52 @@ Debug Message: Load/Remove Amiibo - + Carregar/Remover Amiibo Restart Emulation - + Reiniciar Emulação Stop Emulation - + Parar Emulação TAS Record - + Gravar TAS TAS Reset - + Reiniciar TAS TAS Start/Stop - + Iniciar/Parar TAS Toggle Filter Bar - + Alternar Barra de Filtro Toggle Framerate Limit - + Alternar Limite de Quadros por Segundo Toggle Mouse Panning - + Alternar o Giro do Mouse Toggle Status Bar - + Alternar Barra de Status @@ -6179,78 +6226,83 @@ Debug Message: Public Room Browser - + Navegador de Salas Públicas Nickname - + Apelido Filters - + Filtros Search - + Pesquisar Games I Own - + Meus Jogos + Hide Empty Rooms + Esconder Salas Vazias + + + Hide Full Rooms - + Esconder Salas Cheias - + Refresh Lobby - + Atualizar Lobby - + Password Required to Join - + Senha Necessária para Entrar - + Password: - + Senha: - + Players Jogadores - - - Room Name - - - Preferred Game - + Room Name + Nome da Sala + Preferred Game + Jogo Preferencial + + + Host - + Anfitrião - + Refreshing - + Atualizando - + Refresh List - + Atualizar Lista @@ -6323,7 +6375,7 @@ Debug Message: &Multiplayer - + &Multijogador @@ -6413,27 +6465,27 @@ Debug Message: &Browse Public Game Lobby - + &Navegar no Lobby de Salas Públicas &Create Room - + &Criar Sala &Leave Room - + Sai&r da Sala &Direct Connect to Room - + Conectar &Diretamente Numa Sala &Show Current Room - + Exibir &Sala Atual @@ -6519,48 +6571,48 @@ Debug Message: Moderation - + Moderação Ban List - + Lista de Banimentos Refreshing - + Atualizando Unban - + Desbanir Subject - + Assunto Type - + Tipo Forum Username - + Nome de Usuário do Fórum IP Address - + Endereço IP Refresh - + Atualizar @@ -6568,17 +6620,17 @@ Debug Message: Current connection status - + Status da conexão atual Not Connected. Click here to find a room! - + Não conectado. Clique aqui para procurar uma sala! Not Connected - + Não Conectado @@ -6588,7 +6640,7 @@ Debug Message: New Messages Received - + Novas Mensagens Recebidas @@ -6599,7 +6651,8 @@ Debug Message: Failed to update the room information. Please check your Internet connection and try hosting the room again. Debug Message: - + Falha ao atualizar as informações da sala. Por favor verifique sua conexão com a internet e tente hospedar a sala novamente. +Mensagem de Depuração: @@ -6607,37 +6660,37 @@ Debug Message: Username is not valid. Must be 4 to 20 alphanumeric characters. - + Nome de usuário inválido. Deve conter de 4 a 20 caracteres alfanuméricos. Room name is not valid. Must be 4 to 20 alphanumeric characters. - + Nome da sala inválido. Deve conter de 4 a 20 caracteres alfanuméricos. Username is already in use or not valid. Please choose another. - + Nome de usuário já está em uso ou não é válido. Por favor escolha outro nome de usuário. IP is not a valid IPv4 address. - + O endereço IP não é um endereço IPv4 válido. Port must be a number between 0 to 65535. - + Porta deve ser um número entre 0 e 65535. You must choose a Preferred Game to host a room. If you do not have any games in your game list yet, add a game folder by clicking on the plus icon in the game list. - + Você deve escolher um Jogo Preferível para hospedar uma sala. Se você não possui nenhum jogo na sua lista ainda, adicione um diretório de jogos clicando no ícone de mais na lista de jogos. Unable to find an internet connection. Check your internet settings. - + Não foi possível encontrar uma conexão com a internet. Verifique suas configurações de internet. @@ -6855,7 +6908,7 @@ p, li { white-space: pre-wrap; } - + [not set] [não definido] @@ -6870,10 +6923,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Eixo %1%2 @@ -6887,9 +6940,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [desconhecido] @@ -7054,15 +7107,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [inválido] - - %1%2Hat %3 %1%2Direcional %3 @@ -7070,35 +7121,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2Eixo %3 - + %1%2Axis %3,%4,%5 %1%2Eixo %3,%4,%5 - + %1%2Motion %3 %1%2Movimentação %3 - - %1%2Button %3 %1%2Botão %3 - + [unused] [não utilizado] @@ -7185,9 +7234,21 @@ p, li { white-space: pre-wrap; } Extra - - %1%2%3 - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 + @@ -7210,7 +7271,7 @@ p, li { white-space: pre-wrap; } Type - + Tipo diff --git a/dist/languages/pt_PT.ts b/dist/languages/pt_PT.ts index df5855573..97ac0c661 100644 --- a/dist/languages/pt_PT.ts +++ b/dist/languages/pt_PT.ts @@ -213,7 +213,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. %1 - %2 (%3/%4 members) - connected - + %1 - %2 (%3/%4 membros) - conectado @@ -242,7 +242,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. <html><head/><body><p>Does the game boot?</p></body></html> - + <html><head/><body><p>O jogo inicializa?</p></body></html> @@ -267,77 +267,77 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. <html><head/><body><p>Does the game reach gameplay?</p></body></html> - + <html><head/><body><p>O jogo chega a gameplay?</p></body></html> Yes The game works without crashes - + Sim O jogo funciona sem crashes No The game crashes or freezes during gameplay - + Não O jogo crasha ou congela durante a gameplay <html><head/><body><p>Does the game work without crashing, freezing or locking up during gameplay?</p></body></html> - + <html><head/><body><p>O jogo funciona sem crashar, congelar ou travar durante a gameplay?</p></body></html> Yes The game can be finished without any workarounds - + Sim O jogo pode ser concluido sem o uso de soluções alternativas No The game can't progress past a certain area - + Não Não é possível progredir no jogo a partir de uma certa área <html><head/><body><p>Is the game completely playable from start to finish?</p></body></html> - + <html><head/><body><p>O jogo é completamente jogável do início ao fim?</p></body></html> Major The game has major graphical errors - + Grave O jogo tem grandes erros gráficos Minor The game has minor graphical errors - + Pequenos O jogo tem pequenos erros gráficos None Everything is rendered as it looks on the Nintendo Switch - + Nenhum Tudo é renderizado como no Nintendo Switch <html><head/><body><p>Does the game have any graphical glitches?</p></body></html> - + <html><head/><body><p>O jogo tem alguma falha gráfica?</p></body></html> Major The game has major audio errors - + Graves O jogo tem graves erros de áudio Minor The game has minor audio errors - + Pequenos O jogo tem pequenos erros de audio None Audio is played perfectly - + Nenhum O áudio é reproduzido perfeitamente <html><head/><body><p>Does the game have any audio glitches / missing effects?</p></body></html> - + <html><head/><body><p>O jogo tem alguma falha no áudio / efeitos ausentes?</p></body></html> @@ -798,12 +798,15 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + + <div style="white-space: nowrap">Esta otimização acelera os acessos à memória ao permitir que acessos inválidos à memória sejam bem-sucedidos.</div> + <div style="white-space: nowrap">Ativá-la reduz a sobrecarga de todos os acessos à memória e não tem impacto em programas que não tem acessos inválidos à memória</div> + Enable fallbacks for invalid memory accesses - + Permitir fallbacks para acessos inválidos à memória @@ -926,12 +929,12 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. When checked, it disables the macro HLE functions. Enabling this makes games run slower - + Quando marcado, desabilita as funções do macro HLE. Habilitar esta opção faz com que os jogos rodem mais lentamente Disable Macro HLE - + Desabilitar o Macro HLE @@ -971,17 +974,17 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Habilite essa opção para gravar a última saída da lista de comandos de áudio para o console. Somente afetará jogos que utilizam o renderizador de áudio. Dump Audio Commands To Console** - + Despejar comandos de áudio no console** Create Minidump After Crash - + Criar um despejo resumido após uma falha @@ -1021,12 +1024,12 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Permite que o yuzu procure por um ambiente Vulkan funcional quando o programa iniciar. Desabilite essa opção se estiver causando conflitos com programas externos visualizando o yuzu. Perform Startup Vulkan Check - + Executar checagem do Vulkan na inicialização @@ -1036,22 +1039,22 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Restart Required - + É necessário reiniciar yuzu is required to restart in order to apply this setting. - + Será necessário reiniciar o yuzu para aplicar as configurações. Web applet not compiled - + Applet Web não compilado MiniDump creation not compiled - + Criação do mini despejo não compilada @@ -1505,7 +1508,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Force 16:10 - + Forçar 16:10 @@ -1535,7 +1538,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. 1.5X (1080p/1620p) [EXPERIMENTAL] - + 1.5X (1080p/1620p) [EXPERIMENTAL] @@ -1565,12 +1568,12 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. 7X (5040p/7560p) - + 7X (5040p/7560p) 8X (5760p/8640p) - + 8X (5760p/8640p) @@ -1605,7 +1608,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. AMD FidelityFX™️ Super Resolution - + AMD FidelityFX™️ Super Resolution @@ -1620,27 +1623,27 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. SMAA - + SMAA Use global FSR Sharpness - + Usar FSR Sharpness global Set FSR Sharpness - + Definir FSR Sharpness FSR Sharpness: - + FSR Sharpness: 100% - + 100% @@ -1666,7 +1669,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. SPIR-V (Experimental, Mesa Only) - + SPIR-V (Experimental, Somente Mesa) @@ -1700,12 +1703,12 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - + Executa trabalho em segundo plano aguardando pelos comandos gráficos para evitar a GPU de reduzir seu clock. Force maximum clocks (Vulkan only) - + Forçar clock máximo (somente Vulkan) @@ -1715,80 +1718,90 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Use VSync - + Usar VSync + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Activa a compilação de shader assíncrona, podendo reduzir o engasgue do shader. Esta função é experimental. - + Use asynchronous shader building (Hack) Usar compilação assíncrona de shaders (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Ativa um tempo de resposta rápido da GPU. Esta opção forçará a maioria dos jogos a rodar em sua resolução nativa mais alta. - + Use Fast GPU Time (Hack) Usar tempo de resposta rápido da GPU (Hack) - - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - - - - - Use pessimistic buffer flushes (Hack) - - - Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + Habilita limpeza de buffer pessimista. Essa opção irá forçar que buffer não modificados sejam eliminados, que pode causar impacto na performance. - Use Vulkan pipeline cache - + Use pessimistic buffer flushes (Hack) + Usar limpeza de buffer pessimista (Hack) - + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + Habilita cache de pipeline específico do fabricante. Essa opção pode melhorar o tempo de carga dos shaders significativamente nos casos onde o driver do Vulkan não armazena os arquivos cache de pipeline internamente. + + + + Use Vulkan pipeline cache + Utilizar cache de pipeline do Vulkan + + + Anisotropic Filtering: Filtro Anisotrópico: - + Automatic Automático - + Default Padrão - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2176,7 +2189,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Configure Configurar @@ -2188,7 +2201,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Infrared Camera - + Câmera infravermelha @@ -2203,6 +2216,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. + Requires restarting yuzu Requer reiniciar o yuzu @@ -2224,25 +2238,30 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Enable direct JoyCon driver - + Habilitar driver direto do JoyCon - + + Enable direct Pro Controller driver [EXPERIMENTAL] + Habilitar driver direto do Pro Controller [EXPERIMENTAL] + + + Enable mouse panning Ativar o giro do mouse - + Mouse sensitivity Sensibilidade do rato - + % % - + Motion / Touch Movimento / Toque @@ -2262,57 +2281,57 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Input Profiles - + Perfis de controle Player 1 Profile - + Perfil do Jogador 1 Player 2 Profile - + Perfil do Jogador 2 Player 3 Profile - + Perfil do Jogador 3 Player 4 Profile - + Perfil do Jogador 4 Player 5 Profile - + Perfil do Jogador 5 Player 6 Profile - + Perfil do Jogador 6 Player 7 Profile - + Perfil do Jogador 7 Player 8 Profile - + Perfil do Jogador 8 Use global input configuration - + Usar configuração global de controles Player %1 profile - + Perfil do Jogador %1 @@ -2354,7 +2373,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Left Stick Analógico Esquerdo @@ -2448,14 +2467,14 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + L L - + ZL ZL @@ -2474,7 +2493,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Plus Mais @@ -2487,15 +2506,15 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + R R - + ZR ZR @@ -2552,236 +2571,241 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Right Stick Analógico Direito - - - - + + + + Clear Limpar - - - - - + + + + + [not set] [não definido] - - + + Invert button Inverter botão - - + + Toggle button Alternar pressionamento do botão - - + + Turbo button + Botão Turbo + + + + Invert axis Inverter eixo - - - + + + Set threshold Definir limite - - + + Choose a value between 0% and 100% Escolha um valor entre 0% e 100% - + Toggle axis - + Alternar eixos - + Set gyro threshold Definir limite do giroscópio - + Map Analog Stick Mapear analógicos - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Após pressionar OK, mova o seu analógico primeiro horizontalmente e depois verticalmente. Para inverter os eixos, mova o seu analógico primeiro verticalmente e depois horizontalmente. - + Center axis Eixo central - - + + Deadzone: %1% Ponto Morto: %1% - - + + Modifier Range: %1% Modificador de Alcance: %1% - - + + Pro Controller Comando Pro - + Dual Joycons Joycons Duplos - + Left Joycon Joycon Esquerdo - + Right Joycon Joycon Direito - + Handheld Portátil - + GameCube Controller Controlador de depuração - + Poke Ball Plus Poke Ball Plus - + NES Controller Controle NES - + SNES Controller Controle SNES - + N64 Controller Controle N64 - + Sega Genesis Mega Drive - + Start / Pause Iniciar / Pausar - + Z Z - + Control Stick Direcional de controle - + C-Stick C-Stick - + Shake! Abane! - + [waiting] [em espera] - + New Profile Novo Perfil - + Enter a profile name: Introduza um novo nome de perfil: - - + + Create Input Profile Criar perfil de controlo - + The given profile name is not valid! O nome de perfil dado não é válido! - + Failed to create the input profile "%1" Falha ao criar o perfil de controlo "%1" - + Delete Input Profile Apagar Perfil de Controlo - + Failed to delete the input profile "%1" Falha ao apagar o perfil de controlo "%1" - + Load Input Profile Carregar perfil de controlo - + Failed to load the input profile "%1" Falha ao carregar o perfil de controlo "%1" - + Save Input Profile Guardar perfil de controlo - + Failed to save the input profile "%1" Falha ao guardar o perfil de controlo "%1" @@ -3073,7 +3097,7 @@ Para inverter os eixos, mova o seu analógico primeiro verticalmente e depois ho Input Profiles - + Perfis de controle @@ -3255,7 +3279,7 @@ Para inverter os eixos, mova o seu analógico primeiro verticalmente e depois ho Delete this user? All of the user's save data will be deleted. - + Excluir esse usuário? Todos os dados salvos desse usuário serão removidos. @@ -3266,7 +3290,8 @@ Para inverter os eixos, mova o seu analógico primeiro verticalmente e depois ho Name: %1 UUID: %2 - + Nome: %1 +UUID: %2 @@ -3284,7 +3309,7 @@ UUID: %2 Virtual Ring Sensor Parameters - + Parâmetros do Sensor de Anel @@ -3306,29 +3331,29 @@ UUID: %2 Direct Joycon Driver - + Driver Direto do Joycon Enable Ring Input - + Habilitar Controle de Anel Enable - + Habilitar Ring Sensor Value - + Valor do Sensor de Anel Not connected - + Não conectado @@ -3359,12 +3384,12 @@ UUID: %2 Error enabling ring input - + Erro habilitando controle de anel Direct Joycon driver is not enabled - + Driver direto do Joycon não está habilitado @@ -3374,17 +3399,17 @@ UUID: %2 The current mapped device doesn't support the ring controller - + O dispositivo atualmente mapeado não suporta o controle de anel The current mapped device doesn't have a ring attached - + O dispositivo mapeado não tem um anel conectado Unexpected driver result %1 - + Resultado inesperado do driver %1 @@ -3693,7 +3718,7 @@ UUID: %2 American English - + Inglês Americano @@ -3793,7 +3818,7 @@ UUID: %2 Device Name - + Nome do Dispositivo @@ -3833,7 +3858,7 @@ UUID: %2 Warning: "%1" is not a valid language for region "%2" - + Aviso: "%1" não é um idioma válido para a região "%2" @@ -4157,7 +4182,7 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta Show Compatibility List - + Exibir Lista de Compatibilidade @@ -4167,12 +4192,12 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta Show Size Column - + Exibir Coluna Tamanho Show File Types Column - + Exibir Coluna Tipos de Arquivos @@ -4356,7 +4381,7 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta Web Service configuration can only be changed when a public room isn't being hosted. - + Configuração de Serviço Web só podem ser alteradas quando uma sala pública não está sendo hospedada. @@ -4434,7 +4459,7 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta Unverified, please click Verify before saving configuration Tooltip - + Não verificado, por favor clique sobre Verificar antes de salvar as configurações @@ -4446,7 +4471,7 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta Verified Tooltip - + Verificado @@ -4483,42 +4508,42 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta Direct Connect - + Conexão Direta Server Address - + Endereço do Servidor <html><head/><body><p>Server address of the host</p></body></html> - + <html><head/><body><p>Endereço do host</p></body></html> Port - + Porta <html><head/><body><p>Port number the host is listening on</p></body></html> - + <html><head/><body><p>Número da porta que o servidor de hospedagem está escutando</p></body></html> Nickname - + Apelido Password - + Senha Connect - + Conectar @@ -4526,12 +4551,12 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta Connecting - + Conectando Connect - + Conectar @@ -4549,921 +4574,942 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta Broken Vulkan Installation Detected - + Detectada Instalação Defeituosa do Vulkan Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + A inicialização do Vulkan falhou durante a carga do programa. <br><br>Clique <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>aqui para instruções de como resolver o problema</a>. - + Loading Web Applet... A Carregar o Web Applet ... - - + + Disable Web Applet Desativar Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) A desativação do applet da web pode causar comportamento inesperado e deve apenas ser usada com Super Mario 3D All-Stars. Você deseja mesmo desativar o applet da web? (Ele pode ser reativado nas configurações de depuração.) - + The amount of shaders currently being built Quantidade de shaders a serem construídos - + The current selected resolution scaling multiplier. O atualmente multiplicador de escala de resolução selecionado. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Velocidade da emulação actual. Valores acima ou abaixo de 100% indicam que a emulação está sendo executada mais depressa ou mais devagar do que a Switch - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Quantos quadros por segundo o jogo está exibindo de momento. Isto irá variar de jogo para jogo e de cena para cena. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tempo gasto para emular um frame da Switch, sem contar o a limitação de quadros ou o v-sync. Para emulação de velocidade máxima, esta deve ser no máximo 16.67 ms. - + &Clear Recent Files &Limpar arquivos recentes - + + Emulated mouse is enabled + Mouse emulado está habilitado + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + Controle de mouse real e controle panorâmico do mouse são incompatíveis. Por favor desabilite a emulação do mouse em configurações avançadas de controles para permitir o controle panorâmico do mouse. + + + &Continue &Continuar - + &Pause &Pausa - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu está rodando um jogo - + Warning Outdated Game Format Aviso de Formato de Jogo Desactualizado - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Você está usando o formato de directório ROM desconstruído para este jogo, que é um formato desactualizado que foi substituído por outros, como NCA, NAX, XCI ou NSP. Os directórios de ROM não construídos não possuem ícones, metadados e suporte de actualização.<br><br>Para uma explicação dos vários formatos de Switch que o yuzu suporta,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Verifique a nossa Wiki</a>. Esta mensagem não será mostrada novamente. - - + + Error while loading ROM! Erro ao carregar o ROM! - + The ROM format is not supported. O formato do ROM não é suportado. - + An error occurred initializing the video core. Ocorreu um erro ao inicializar o núcleo do vídeo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu encontrou um erro enquanto rodando o núcleo de vídeo. Normalmente isto é causado por drivers de GPU desatualizados, incluindo integrados. Por favor veja o registro para mais detalhes. Para mais informações em acesso ao registro por favor veja a seguinte página: <a href='https://yuzu-emu.org/help/reference/log-files/'>Como fazer envio de arquivo de registro</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Erro ao carregar a ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>a guia de início rápido do yuzu</a> para fazer o redespejo dos seus arquivos.<br>Você pode consultar a wiki do yuzu</a> ou o Discord do yuzu</a> para obter ajuda. - + An unknown error occurred. Please see the log for more details. Ocorreu um erro desconhecido. Por favor, veja o log para mais detalhes. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Encerrando software... - + Save Data Save Data - + Mod Data Mod Data - + Error Opening %1 Folder Erro ao abrir a pasta %1 - - + + Folder does not exist! A Pasta não existe! - + Error Opening Transferable Shader Cache Erro ao abrir os Shader Cache transferíveis - + Failed to create the shader cache directory for this title. Falha ao criar o diretório de cache de shaders para este título. - + Error Removing Contents - + Erro Removendo Conteúdos - + Error Removing Update - + Erro ao Remover Atualização - + Error Removing DLC - + Erro Removendo DLC - + Remove Installed Game Contents? - + Remover Conteúdo Instalado do Jogo? - + Remove Installed Game Update? - + Remover Atualização Instalada do Jogo? - + Remove Installed Game DLC? - + Remover DLC Instalada do Jogo? - + Remove Entry Remover Entrada - - - - - - + + + + + + Successfully Removed Removido com Sucesso - + Successfully removed the installed base game. Removida a instalação do jogo base com sucesso. - + The base game is not installed in the NAND and cannot be removed. O jogo base não está instalado no NAND e não pode ser removido. - + Successfully removed the installed update. Removida a actualização instalada com sucesso. - + There is no update installed for this title. Não há actualização instalada neste título. - + There are no DLC installed for this title. Não há DLC instalado neste título. - + Successfully removed %1 installed DLC. Removido DLC instalado %1 com sucesso. - + Delete OpenGL Transferable Shader Cache? Apagar o cache de shaders transferível do OpenGL? - + Delete Vulkan Transferable Shader Cache? Apagar o cache de shaders transferível do Vulkan? - + Delete All Transferable Shader Caches? Apagar todos os caches de shaders transferíveis? - + Remove Custom Game Configuration? Remover Configuração Personalizada do Jogo? - + Remove File Remover Ficheiro - - + + Error Removing Transferable Shader Cache Error ao Remover Cache de Shader Transferível - - + + A shader cache for this title does not exist. O Shader Cache para este titulo não existe. - + Successfully removed the transferable shader cache. Removido a Cache de Shader Transferível com Sucesso. - + Failed to remove the transferable shader cache. Falha ao remover a cache de shader transferível. - + Error Removing Vulkan Driver Pipeline Cache - + Erro ao Remover Cache de Pipeline do Driver Vulkan - + Failed to remove the driver pipeline cache. - + Falha ao remover o pipeline de cache do driver. - - + + Error Removing Transferable Shader Caches Erro ao remover os caches de shaders transferíveis - + Successfully removed the transferable shader caches. Os caches de shaders transferíveis foram removidos com sucesso. - + Failed to remove the transferable shader cache directory. Falha ao remover o diretório do cache de shaders transferível. - - + + Error Removing Custom Configuration Erro ao Remover Configuração Personalizada - + A custom configuration for this title does not exist. Não existe uma configuração personalizada para este titúlo. - + Successfully removed the custom game configuration. Removida a configuração personalizada do jogo com sucesso. - + Failed to remove the custom game configuration. Falha ao remover a configuração personalizada do jogo. - - + + RomFS Extraction Failed! A Extração de RomFS falhou! - + There was an error copying the RomFS files or the user cancelled the operation. Houve um erro ao copiar os arquivos RomFS ou o usuário cancelou a operação. - + Full Cheio - + Skeleton Esqueleto - + Select RomFS Dump Mode Selecione o modo de despejo do RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Por favor, selecione a forma como você gostaria que o RomFS fosse despejado<br>Full irá copiar todos os arquivos para o novo diretório enquanto<br>skeleton criará apenas a estrutura de diretórios. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Não há espaço suficiente em %1 para extrair o RomFS. Por favor abra espaço ou selecione um diretório diferente em Emulação > Configurar > Sistema > Sistema de arquivos > Extrair raiz - + Extracting RomFS... Extraindo o RomFS ... - - + + Cancel Cancelar - + RomFS Extraction Succeeded! Extração de RomFS Bem-Sucedida! - + The operation completed successfully. A operação foi completa com sucesso. - - - - - + + + + + Create Shortcut - + Criar Atalho - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - - - - - Cannot create shortcut on desktop. Path "%1" does not exist. - - - - - Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Isso irá criar um atalho para o AppImage atual. Isso pode não funcionar corretamente se você fizer uma atualização. Continuar? + Cannot create shortcut on desktop. Path "%1" does not exist. + Não foi possível criar um atalho na área de trabalho. O caminho "%1" não existe. + + + + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. + Não foi possível criar um atalho no menu de aplicativos. O caminho "%1" não existe e não pode ser criado. + + + Create Icon - + Criar Ícone - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Não foi possível criar o arquivo de ícone. O caminho "%1" não existe e não pode ser criado. - + Start %1 with the yuzu Emulator - + Iniciar %1 com o Emulador Yuzu - + Failed to create a shortcut at %1 - + Falha ao criar um atalho em %1 - + Successfully created a shortcut to %1 - + Atalho criado com sucesso em %1 - + Error Opening %1 Erro ao abrir %1 - + Select Directory Selecione o Diretório - + Properties Propriedades - + The game properties could not be loaded. As propriedades do jogo não puderam ser carregadas. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Executáveis Switch (%1);;Todos os Ficheiros (*.*) - + Load File Carregar Ficheiro - + Open Extracted ROM Directory Abrir o directório ROM extraído - + Invalid Directory Selected Diretório inválido selecionado - + The directory you have selected does not contain a 'main' file. O diretório que você selecionou não contém um arquivo 'Main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Ficheiro Switch Instalável (*.nca *.nsp *.xci);;Arquivo de Conteúdo Nintendo (*.nca);;Pacote de Envio Nintendo (*.nsp);;Imagem de Cartucho NX (*.xci) - + Install Files Instalar Ficheiros - + %n file(s) remaining - + Installing file "%1"... Instalando arquivo "%1"... - - + + Install Results Instalar Resultados - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Para evitar possíveis conflitos, desencorajamos que os utilizadores instalem os jogos base na NAND. Por favor, use esse recurso apenas para instalar atualizações e DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Aplicação do sistema - + System Archive Arquivo do sistema - + System Application Update Atualização do aplicativo do sistema - + Firmware Package (Type A) Pacote de Firmware (Tipo A) - + Firmware Package (Type B) Pacote de Firmware (Tipo B) - + Game Jogo - + Game Update Actualização do Jogo - + Game DLC DLC do Jogo - + Delta Title Título Delta - + Select NCA Install Type... Selecione o tipo de instalação do NCA ... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Por favor, selecione o tipo de título que você gostaria de instalar este NCA como: (Na maioria dos casos, o padrão 'Jogo' é suficiente). - + Failed to Install Falha na instalação - + The title type you selected for the NCA is invalid. O tipo de título que você selecionou para o NCA é inválido. - + File not found Arquivo não encontrado - + File "%1" not found Arquivo "%1" não encontrado - + OK OK - - + + Hardware requirements not met - + Requisitos de hardware não atendidos - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Seu sistema não atende os requisitos de harwdare. O relatório de compatibilidade foi desabilitado. - + Missing yuzu Account Conta Yuzu Ausente - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Para enviar um caso de teste de compatibilidade de jogos, você deve vincular sua conta yuzu.<br><br/>Para vincular sua conta yuzu, vá para Emulação &gt; Configuração &gt; Rede. - + Error opening URL Erro ao abrir URL - + Unable to open the URL "%1". Não foi possível abrir o URL "%1". - + TAS Recording Gravando TAS - + Overwrite file of player 1? Sobrescrever arquivo do jogador 1? - + Invalid config detected Configação inválida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. O comando portátil não pode ser usado no modo encaixado na base. O Pro controller será selecionado. - - + + Amiibo Amiibo - - + + The current amiibo has been removed O amiibo atual foi removido - + Error Erro - - + + The current game is not looking for amiibos O jogo atual não está procurando amiibos - + Amiibo File (%1);; All Files (*.*) Arquivo Amiibo (%1);; Todos os Arquivos (*.*) - + Load Amiibo Carregar Amiibo - + Error loading Amiibo data Erro ao carregar dados do Amiibo - + The selected file is not a valid amiibo - + O arquivo selecionado não é um amiibo válido - + The selected file is already on use - + O arquivo selecionado já está em uso - + An unknown error occurred - + Ocorreu um erro desconhecido - + Capture Screenshot Captura de Tela - + PNG Image (*.png) Imagem PNG (*.png) - + TAS state: Running %1/%2 Situação TAS: Rodando %1%2 - + TAS state: Recording %1 Situação TAS: Gravando %1 - + TAS state: Idle %1/%2 Situação TAS: Repouso %1%2 - + TAS State: Invalid Situação TAS: Inválido - + &Stop Running &Parar de rodar - + &Start &Começar - + Stop R&ecording Parar G&ravação - + R&ecord G&ravação - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escala: %1x - + Speed: %1% / %2% Velocidade: %1% / %2% - + Speed: %1% Velocidade: %1% - + Game: %1 FPS (Unlocked) Jogo: %1 FPS (Desbloqueado) - + Game: %1 FPS Jogo: %1 FPS - + Frame: %1 ms Quadro: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR ERRO DE GPU - + DOCKED - + ANCORADO - + HANDHELD - + PORTÁTIL - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NULO - + NEAREST VIZINHO - - + + BILINEAR BILINEAR - + BICUBIC BICÚBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA Sem AA - + FXAA FXAA - + SMAA - + SMAA - + + VOLUME: MUTE + VOLUME: MUDO + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + VOLUME: %1% + + + Confirm Key Rederivation Confirme a rederivação da chave - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5480,37 +5526,37 @@ e opcionalmente faça backups. Isso irá excluir os seus arquivos de chave gerados automaticamente e executará novamente o módulo de derivação de chave. - + Missing fuses Fusíveis em Falta - + - Missing BOOT0 - BOOT0 em Falta - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main em Falta - + - Missing PRODINFO - PRODINFO em Falta - + Derivation Components Missing Componentes de Derivação em Falta - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Chaves de encriptação faltando. <br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>o guia de início rápido</a> para extrair suas chaves, firmware e jogos. <br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5519,39 +5565,39 @@ Isto pode demorar até um minuto, dependendo do desempenho do seu sistema. - + Deriving Keys Derivando Chaves - + Select RomFS Dump Target Selecione o destino de despejo do RomFS - + Please select which RomFS you would like to dump. Por favor, selecione qual o RomFS que você gostaria de despejar. - + Are you sure you want to close yuzu? Tem a certeza que quer fechar o yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Tem a certeza de que quer parar a emulação? Qualquer progresso não salvo será perdido. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5563,44 +5609,44 @@ Deseja ignorar isso e sair mesmo assim? GRenderWindow - - + + OpenGL not available! OpenGL não está disponível! - + OpenGL shared contexts are not supported. - + Shared contexts do OpenGL não são suportados. - + yuzu has not been compiled with OpenGL support. yuzu não foi compilado com suporte OpenGL. - - + + Error while initializing OpenGL! Erro ao inicializar OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. O seu GPU pode não suportar OpenGL, ou não tem os drivers gráficos mais recentes. - + Error while initializing OpenGL 4.6! Erro ao inicializar o OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 O teu GPU pode não suportar OpenGL 4.6, ou não tem os drivers gráficos mais recentes. - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Sua GPU pode não suportar uma ou mais extensões necessárias do OpenGL. Verifique se você possui a última versão dos drivers gráficos.<br><br>Renderizador GL:<br>%1<br><br>Extensões não suportadas:<br>%2 @@ -5701,7 +5747,7 @@ Deseja ignorar isso e sair mesmo assim? Create Shortcut - + Criar Atalho @@ -5840,7 +5886,7 @@ Deseja ignorar isso e sair mesmo assim? GameListPlaceholder - + Double-click to add a new folder to the game list Clique duas vezes para adicionar uma nova pasta à lista de jogos @@ -5873,17 +5919,17 @@ Deseja ignorar isso e sair mesmo assim? Room Name - + Nome da Sala Preferred Game - + Jogo Preferencial Max Players - + Máximo de Jogadores @@ -5893,17 +5939,17 @@ Deseja ignorar isso e sair mesmo assim? (Leave blank for open game) - + (Deixe em branco para um jogo aberto) Password - + Senha Port - + Porta @@ -5913,22 +5959,22 @@ Deseja ignorar isso e sair mesmo assim? Load Previous Ban List - + Carregar Lista de Banimento Anterior Public - + Público Unlisted - + Não listado Host Room - + Hospedar Sala @@ -5942,7 +5988,8 @@ Deseja ignorar isso e sair mesmo assim? Failed to announce the room to the public lobby. In order to host a room publicly, you must have a valid yuzu account configured in Emulation -> Configure -> Web. If you do not want to publish a room in the public lobby, then select Unlisted instead. Debug Message: - + Falha ao anunciar a sala ao lobby público. Para hospedar uma sala pública você deve ter configurado uma conta válida do yuzu em Emulação -> Configurações -> Web. Se você não quer publicar uma sala no lobby público seleciona a opção Não listado. +Mensagem de depuração: @@ -5950,7 +5997,7 @@ Debug Message: Audio Mute/Unmute - + Mutar/Desmutar Áudio @@ -5976,17 +6023,17 @@ Debug Message: Main Window - + Janela Principal Audio Volume Down - + Volume Menos Audio Volume Up - + Volume Mais @@ -5996,32 +6043,32 @@ Debug Message: Change Adapting Filter - + Alterar Filtro de Adaptação Change Docked Mode - + Alterar Modo de Ancoragem Change GPU Accuracy - + Alterar Precisão da GPU Continue/Pause Emulation - + Continuar/Pausar Emulação Exit Fullscreen - + Sair da Tela Cheia Exit yuzu - + Sair do yuzu @@ -6036,52 +6083,52 @@ Debug Message: Load/Remove Amiibo - + Carregar/Remover Amiibo Restart Emulation - + Reiniciar Emulação Stop Emulation - + Parar Emulação TAS Record - + Gravar TAS TAS Reset - + Reiniciar TAS TAS Start/Stop - + Iniciar/Parar TAS Toggle Filter Bar - + Alternar Barra de Filtro Toggle Framerate Limit - + Alternar Limite de Quadros por Segundo Toggle Mouse Panning - + Alternar o Giro do Mouse Toggle Status Bar - + Alternar Barra de Status @@ -6160,78 +6207,83 @@ Debug Message: Public Room Browser - + Navegador de Salas Públicas Nickname - + Apelido Filters - + Filtros Search - + Pesquisar Games I Own - + Meus Jogos + Hide Empty Rooms + Esconder Salas Vazias + + + Hide Full Rooms - + Esconder Salas Cheias - + Refresh Lobby - + Atualizar Lobby - + Password Required to Join - + Senha Necessária para Entrar - + Password: - + Senha: - + Players Jogadores - - - Room Name - - - Preferred Game - + Room Name + Nome da Sala + Preferred Game + Jogo Preferencial + + + Host - + Anfitrião - + Refreshing - + Atualizando - + Refresh List - + Atualizar Lista @@ -6304,7 +6356,7 @@ Debug Message: &Multiplayer - + &Multijogador @@ -6394,27 +6446,27 @@ Debug Message: &Browse Public Game Lobby - + &Navegar no Lobby de Salas Públicas &Create Room - + &Criar Sala &Leave Room - + &Sair da Sala &Direct Connect to Room - + Conectar &Diretamente Numa Sala &Show Current Room - + Exibir &Sala Atual @@ -6500,48 +6552,48 @@ Debug Message: Moderation - + Moderação Ban List - + Lista de Banimentos Refreshing - + Atualizando Unban - + Desbanir Subject - + Assunto Type - + Tipo Forum Username - + Nome de Usuário do Fórum IP Address - + Endereço IP Refresh - + Atualizar @@ -6549,17 +6601,17 @@ Debug Message: Current connection status - + Status da conexão atual Not Connected. Click here to find a room! - + Não conectado. Clique aqui para procurar uma sala! Not Connected - + Não Conectado @@ -6569,7 +6621,7 @@ Debug Message: New Messages Received - + Novas Mensagens Recebidas @@ -6580,7 +6632,8 @@ Debug Message: Failed to update the room information. Please check your Internet connection and try hosting the room again. Debug Message: - + Falha ao atualizar as informações da sala. Por favor verifique sua conexão com a internet e tente hospedar a sala novamente. +Mensagem de Depuração: @@ -6588,37 +6641,37 @@ Debug Message: Username is not valid. Must be 4 to 20 alphanumeric characters. - + Nome de usuário inválido. Deve conter de 4 a 20 caracteres alfanuméricos. Room name is not valid. Must be 4 to 20 alphanumeric characters. - + Nome da sala inválido. Deve conter de 4 a 20 caracteres alfanuméricos. Username is already in use or not valid. Please choose another. - + Nome de usuário já está em uso ou não é válido. Por favor escolha outro nome de usuário. IP is not a valid IPv4 address. - + O endereço IP não é um endereço IPv4 válido. Port must be a number between 0 to 65535. - + Porta deve ser um número entre 0 e 65535. You must choose a Preferred Game to host a room. If you do not have any games in your game list yet, add a game folder by clicking on the plus icon in the game list. - + Você deve escolher um Jogo Preferível para hospedar uma sala. Se você não possui nenhum jogo na sua lista ainda, adicione um diretório de jogos clicando no ícone de mais na lista de jogos. Unable to find an internet connection. Check your internet settings. - + Não foi possível encontrar uma conexão com a internet. Verifique suas configurações de internet. @@ -6836,7 +6889,7 @@ p, li { white-space: pre-wrap; } - + [not set] [não configurado] @@ -6851,10 +6904,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Eixo %1%2 @@ -6868,9 +6921,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [Desconhecido] @@ -7035,15 +7088,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [inválido] - - %1%2Hat %3 %1%2Direcional %3 @@ -7051,35 +7102,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2Eixo %3 - + %1%2Axis %3,%4,%5 %1%2Eixo %3,%4,%5 - + %1%2Motion %3 %1%2Movimentação %3 - - %1%2Button %3 %1%2Botão %3 - + [unused] [sem uso] @@ -7166,9 +7215,21 @@ p, li { white-space: pre-wrap; } Extra - - %1%2%3 - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 + @@ -7191,7 +7252,7 @@ p, li { white-space: pre-wrap; } Type - + Tipo diff --git a/dist/languages/ru_RU.ts b/dist/languages/ru_RU.ts index 1f38b5a3d..83a99fab9 100644 --- a/dist/languages/ru_RU.ts +++ b/dist/languages/ru_RU.ts @@ -539,7 +539,9 @@ This would ban both their forum username and their IP address. <div>This option improves the speed of some approximate floating-point functions by using less accurate native approximations.</div> - + + <div>Эта опция повышает скорость некоторых аппроксимирующих функций с плавающей точкой за счет использования менее точных нативных приближений.</div> + @@ -551,7 +553,9 @@ This would ban both their forum username and their IP address. <div>This option improves the speed of 32 bits ASIMD floating-point functions by running with incorrect rounding modes.</div> - + + <div>Эта опция улучшает скорость 32-битных ASIMD-функций с плавающей запятой путём работы с некорректными режимами округления.</div> + @@ -563,7 +567,9 @@ This would ban both their forum username and their IP address. <div>This option improves speed by removing NaN checking. Please note this also reduces accuracy of certain floating-point instructions.</div> - + + <div>Эта опция повышает скорость, убирая проверку на NaN. Обратите внимание, что это также снижает точность некоторых инструкций с плавающей точкой.</div> + @@ -580,7 +586,7 @@ This would ban both their forum username and their IP address. Disable address space checks - + Отключить проверку адресного пространства @@ -634,7 +640,7 @@ This would ban both their forum username and their IP address. Enable inline page tables - + Включить встроенные таблицы страниц @@ -646,7 +652,7 @@ This would ban both their forum username and their IP address. Enable block linking - + Разрешить связывание блоков @@ -658,7 +664,7 @@ This would ban both their forum username and their IP address. Enable return stack buffer - + Включить буфер стека возврата @@ -670,7 +676,7 @@ This would ban both their forum username and their IP address. Enable fast dispatcher - + Включить быстрый диспетчер @@ -682,7 +688,7 @@ This would ban both their forum username and their IP address. Enable context elimination - + Включить исключение контекста @@ -694,7 +700,7 @@ This would ban both their forum username and their IP address. Enable constant propagation - + Включить постоянное распространение @@ -773,7 +779,7 @@ This would ban both their forum username and their IP address. Enable fallbacks for invalid memory accesses - + Включить запасные варианты для недопустимых обращений к памяти @@ -856,7 +862,7 @@ This would ban both their forum username and their IP address. When checked, it enables Nsight Aftermath crash dumps - + Если включено, включает дампы крашей Nsight Aftermath @@ -876,7 +882,7 @@ This would ban both their forum username and their IP address. When checked, it will dump all the macro programs of the GPU - + Если включено, будет дампить все макропрограммы ГП @@ -886,7 +892,7 @@ This would ban both their forum username and their IP address. When checked, it disables the macro Just In Time compiler. Enabling this makes games run slower - + Если включено, отключает компилятор макроса Just In Time. Включение опции делает игры медленнее @@ -901,7 +907,7 @@ This would ban both their forum username and their IP address. Disable Macro HLE - + Выключить макрос HLE @@ -931,7 +937,7 @@ This would ban both their forum username and their IP address. Enable Verbose Reporting Services** - + Включить службу отчётов в развернутом виде** @@ -946,7 +952,7 @@ This would ban both their forum username and their IP address. Dump Audio Commands To Console** - + Дамп аудиокоманд в консоль** @@ -971,7 +977,7 @@ This would ban both their forum username and their IP address. Enable Debug Asserts - Включить отладочные утверждения + Включить отладочные сигналы @@ -1575,7 +1581,7 @@ This would ban both their forum username and their IP address. AMD FidelityFX™️ Super Resolution - + AMD FidelityFX™️ Super Resolution @@ -1689,76 +1695,86 @@ This would ban both their forum username and their IP address. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Включает асинхронную компиляцию шейдеров, что уменьшит зависания из-за шейдеров. Функция является экспериментальной. - + Use asynchronous shader building (Hack) Использовать асинхронное построение шейдеров (Хак) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Включает функцию Fast GPU Time. Этот параметр заставит большинство игр работать в максимальном родном разрешении. - + Use Fast GPU Time (Hack) Включить Fast GPU Time (Хак) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. Включает пессимистическую очистку буферов. Эта опция заставляет промывать немодифицированные буферы, что может снизить производительность. - + Use pessimistic buffer flushes (Hack) Использовать пессимистическую очистку буферов (Хак) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. Включает кэш конвейера, специфичный для производителя ГП. Эта опция может значительно улучшить время загрузки шейдеров в тех случаях, когда драйвер Vulkan не хранит внутренние файлы кэша конвейера. - + Use Vulkan pipeline cache Использовать конвейерный кэш Vulkan - + Anisotropic Filtering: Анизотропная фильтрация: - + Automatic Автоматически - + Default Стандартная - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2146,7 +2162,7 @@ This would ban both their forum username and their IP address. - + Configure Настроить @@ -2173,6 +2189,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu Требует перезапуск yuzu @@ -2194,25 +2211,30 @@ This would ban both their forum username and their IP address. Enable direct JoyCon driver + Включить прямой драйвер JoyCon + + + + Enable direct Pro Controller driver [EXPERIMENTAL] - + Enable mouse panning Включить панорамирование мыши - + Mouse sensitivity Чувствительность мыши - + % % - + Motion / Touch Движение и сенсор @@ -2324,7 +2346,7 @@ This would ban both their forum username and their IP address. - + Left Stick Левый мини-джойстик @@ -2418,14 +2440,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2444,7 +2466,7 @@ This would ban both their forum username and their IP address. - + Plus Плюс @@ -2457,15 +2479,15 @@ This would ban both their forum username and their IP address. - + R R - + ZR ZR @@ -2522,236 +2544,241 @@ This would ban both their forum username and their IP address. - + Right Stick Правый мини-джойстик - - - - + + + + Clear Очистить - - - - - + + + + + [not set] [не задано] - - + + Invert button Инвертировать кнопку - - + + Toggle button Переключить кнопку - - + + Turbo button + Турбо кнопка + + + + Invert axis Инвертировать оси - - - + + + Set threshold Установить порог - - + + Choose a value between 0% and 100% Выберите значение между 0% и 100% - + Toggle axis Переключить оси - + Set gyro threshold Установить порог гироскопа - + Map Analog Stick Задать аналоговый мини-джойстик - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. После нажатия на ОК, двигайте ваш мини-джойстик горизонтально, а затем вертикально. Чтобы инвертировать оси, сначала двигайте ваш мини-джойстик вертикально, а затем горизонтально. - + Center axis Центрировать оси - - + + Deadzone: %1% Мёртвая зона: %1% - - + + Modifier Range: %1% Диапазон модификатора: %1% - - + + Pro Controller Контроллер Pro - + Dual Joycons Двойные Joy-Con'ы - + Left Joycon Левый Joy-Сon - + Right Joycon Правый Joy-Сon - + Handheld Портативный - + GameCube Controller Контроллер GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Контроллер NES - + SNES Controller Контроллер SNES - + N64 Controller Контроллер N64 - + Sega Genesis Sega Genesis - + Start / Pause Старт / Пауза - + Z Z - + Control Stick Мини-джойстик управления - + C-Stick C-Джойстик - + Shake! Встряхните! - + [waiting] [ожидание] - + New Profile Новый профиль - + Enter a profile name: Введите имя профиля: - - + + Create Input Profile Создать профиль управления - + The given profile name is not valid! Заданное имя профиля недействительно! - + Failed to create the input profile "%1" Не удалось создать профиль управления "%1" - + Delete Input Profile Удалить профиль управления - + Failed to delete the input profile "%1" Не удалось удалить профиль управления "%1" - + Load Input Profile Загрузить профиль управления - + Failed to load the input profile "%1" Не удалось загрузить профиль управления "%1" - + Save Input Profile Сохранить профиль управления - + Failed to save the input profile "%1" Не удалось сохранить профиль управления "%1" @@ -3255,7 +3282,7 @@ UUID: %2 Virtual Ring Sensor Parameters - + Параметры датчика виртуального Ring @@ -3277,29 +3304,29 @@ UUID: %2 Direct Joycon Driver - + Прямой драйвер Joycon Enable Ring Input - + Включить ввод Ring Enable - + Включить Ring Sensor Value - + Значение датчика Ring Not connected - + Не подключено @@ -3330,12 +3357,12 @@ UUID: %2 Error enabling ring input - + Ошибка при включении ввода кольца Direct Joycon driver is not enabled - + Прямой драйвер Joycon не активен @@ -3345,17 +3372,17 @@ UUID: %2 The current mapped device doesn't support the ring controller - + Текущее выбранное устройство не поддерживает контроллер Ring The current mapped device doesn't have a ring attached - + К текущему устройству не прикреплено кольцо Unexpected driver result %1 - + Неожиданный результат драйвера %1 @@ -4459,12 +4486,12 @@ Drag points to change position, or double-click table cells to edit values. Server Address - + Адрес сервера <html><head/><body><p>Server address of the host</p></body></html> - + <html><head/><body><p>Адрес сервера хоста</p></body></html> @@ -4528,525 +4555,535 @@ Drag points to change position, or double-click table cells to edit values.Не удалось выполнить инициализацию Vulkan во время загрузки.<br><br>Нажмите <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>здесь для получения инструкций по устранению проблемы</a>. - + Loading Web Applet... Загрузка веб-апплета... - - + + Disable Web Applet Отключить веб-апплет - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Отключение веб-апплета может привести к неожиданному поведению и должно использоваться только с Super Mario 3D All-Stars. Вы уверены, что хотите отключить веб-апплет? (Его можно снова включить в настройках отладки.) - + The amount of shaders currently being built Количество создаваемых шейдеров на данный момент - + The current selected resolution scaling multiplier. Текущий выбранный множитель масштабирования разрешения. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Текущая скорость эмуляции. Значения выше или ниже 100% указывают на то, что эмуляция идет быстрее или медленнее, чем на Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Количество кадров в секунду в данный момент. Значение будет меняться между играми и сценами. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Время, которое нужно для эмуляции 1 кадра Switch, не принимая во внимание ограничение FPS или вертикальную синхронизацию. Для эмуляции в полной скорости значение должно быть не больше 16,67 мс. - + &Clear Recent Files [&C] Очистить недавние файлы - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue [&C] Продолжить - + &Pause [&P] Пауза - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping В yuzu запущена игра - + Warning Outdated Game Format Предупреждение устаревший формат игры - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Для этой игры вы используете разархивированный формат ROM'а, который является устаревшим и был заменен другими, такими как NCA, NAX, XCI или NSP. В разархивированных каталогах ROM'а отсутствуют иконки, метаданные и поддержка обновлений. <br><br>Для получения информации о различных форматах Switch, поддерживаемых yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>просмотрите нашу вики</a>. Это сообщение больше не будет отображаться. - - + + Error while loading ROM! Ошибка при загрузке ROM'а! - + The ROM format is not supported. Формат ROM'а не поддерживается. - + An error occurred initializing the video core. Произошла ошибка при инициализации видеоядра. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu столкнулся с ошибкой при запуске видеоядра. Обычно это вызвано устаревшими драйверами ГП, включая интегрированные. Проверьте журнал для получения более подробной информации. Дополнительную информацию о доступе к журналу смотрите на следующей странице: <a href='https://yuzu-emu.org/help/reference/log-files/'>Как загрузить файл журнала</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Ошибка при загрузке ROM'а! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Пожалуйста, следуйте <a href='https://yuzu-emu.org/help/quickstart/'>краткому руководству пользователя yuzu</a> чтобы пере-дампить ваши файлы<br>Вы можете обратиться к вики yuzu</a> или Discord yuzu</a> для помощи. - + An unknown error occurred. Please see the log for more details. Произошла неизвестная ошибка. Пожалуйста, проверьте журнал для подробностей. - + (64-bit) (64-х битный) - + (32-bit) (32-х битный) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Закрываем программу... - + Save Data Сохранения - + Mod Data Данные модов - + Error Opening %1 Folder Ошибка при открытии папки %1 - - + + Folder does not exist! Папка не существует! - + Error Opening Transferable Shader Cache Ошибка при открытии переносного кэша шейдеров - + Failed to create the shader cache directory for this title. Не удалось создать папку кэша шейдеров для этой игры. - + Error Removing Contents Ошибка при удалении содержимого - + Error Removing Update Ошибка при удалении обновлений - + Error Removing DLC Ошибка при удалении DLC - + Remove Installed Game Contents? Удалить установленное содержимое игр? - + Remove Installed Game Update? Удалить установленные обновления игры? - + Remove Installed Game DLC? Удалить установленные DLC игры? - + Remove Entry Удалить запись - - - - - - + + + + + + Successfully Removed Успешно удалено - + Successfully removed the installed base game. Установленная игра успешно удалена. - + The base game is not installed in the NAND and cannot be removed. Игра не установлена в NAND и не может быть удалена. - + Successfully removed the installed update. Установленное обновление успешно удалено. - + There is no update installed for this title. Для этой игры не было установлено обновление. - + There are no DLC installed for this title. Для этой игры не были установлены DLC. - + Successfully removed %1 installed DLC. Установленное DLC %1 было успешно удалено - + Delete OpenGL Transferable Shader Cache? Удалить переносной кэш шейдеров OpenGL? - + Delete Vulkan Transferable Shader Cache? Удалить переносной кэш шейдеров Vulkan? - + Delete All Transferable Shader Caches? Удалить весь переносной кэш шейдеров? - + Remove Custom Game Configuration? Удалить пользовательскую настройку игры? - + Remove File Удалить файл - - + + Error Removing Transferable Shader Cache Ошибка при удалении переносного кэша шейдеров - - + + A shader cache for this title does not exist. Кэш шейдеров для этой игры не существует. - + Successfully removed the transferable shader cache. Переносной кэш шейдеров успешно удалён. - + Failed to remove the transferable shader cache. Не удалось удалить переносной кэш шейдеров. - + Error Removing Vulkan Driver Pipeline Cache Ошибка при удалении конвейерного кэша Vulkan - + Failed to remove the driver pipeline cache. Не удалось удалить конвейерный кэш шейдеров. - - + + Error Removing Transferable Shader Caches Ошибка при удалении переносного кэша шейдеров - + Successfully removed the transferable shader caches. Переносной кэш шейдеров успешно удален. - + Failed to remove the transferable shader cache directory. Ошибка при удалении папки переносного кэша шейдеров. - - + + Error Removing Custom Configuration Ошибка при удалении пользовательской настройки - + A custom configuration for this title does not exist. Пользовательская настройка для этой игры не существует. - + Successfully removed the custom game configuration. Пользовательская настройка игры успешно удалена. - + Failed to remove the custom game configuration. Не удалось удалить пользовательскую настройку игры. - - + + RomFS Extraction Failed! Не удалось извлечь RomFS! - + There was an error copying the RomFS files or the user cancelled the operation. Произошла ошибка при копировании файлов RomFS или пользователь отменил операцию. - + Full Полный - + Skeleton Скелет - + Select RomFS Dump Mode Выберите режим дампа RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Пожалуйста, выберите, как вы хотите выполнить дамп RomFS. <br>Полный скопирует все файлы в новую папку, в то время как <br>скелет создаст только структуру папок. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root В %1 недостаточно свободного места для извлечения RomFS. Пожалуйста, освободите место или выберите другую папку для дампа в Эмуляция > Настройка > Система > Файловая система > Корень дампа - + Extracting RomFS... Извлечение RomFS... - - + + Cancel Отмена - + RomFS Extraction Succeeded! Извлечение RomFS прошло успешно! - + The operation completed successfully. Операция выполнена. - - - - - + + + + + Create Shortcut Создать ярлык - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Это создаст ярлык для текущего AppImage. Он может не работать после обновлений. Продолжить? - + Cannot create shortcut on desktop. Path "%1" does not exist. Не удается создать ярлык на рабочем столе. Путь "%1" не существует. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Невозможно создать ярлык в меню приложений. Путь "%1" не существует и не может быть создан. - + Create Icon Создать иконку - + Cannot create icon file. Path "%1" does not exist and cannot be created. Невозможно создать файл иконки. Путь "%1" не существует и не может быть создан. - + Start %1 with the yuzu Emulator Запустить %1 с помощью эмулятора yuzu - + Failed to create a shortcut at %1 Не удалось создать ярлык в %1 - + Successfully created a shortcut to %1 Успешно создан ярлык в %1 - + Error Opening %1 Ошибка открытия %1 - + Select Directory Выбрать папку - + Properties Свойства - + The game properties could not be loaded. Не удалось загрузить свойства игры. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Исполняемый файл Switch (%1);;Все файлы (*.*) - + Load File Загрузить файл - + Open Extracted ROM Directory Открыть папку извлечённого ROM'а - + Invalid Directory Selected Выбрана недопустимая папка - + The directory you have selected does not contain a 'main' file. Папка, которую вы выбрали, не содержит файла 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Устанавливаемый файл Switch (*.nca, *.nsp, *.xci);;Архив контента Nintendo (*.nca);;Пакет подачи Nintendo (*.nsp);;Образ картриджа NX (*.xci) - + Install Files Установить файлы - + %n file(s) remaining Остался %n файлОсталось %n файл(ов)Осталось %n файл(ов)Осталось %n файл(ов) - + Installing file "%1"... Установка файла "%1"... - - + + Install Results Результаты установки - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Чтобы избежать возможных конфликтов, мы не рекомендуем пользователям устанавливать игры в NAND. Пожалуйста, используйте эту функцию только для установки обновлений и DLC. - + %n file(s) were newly installed %n файл был недавно установлен @@ -5056,7 +5093,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) were overwritten %n файл был перезаписан @@ -5066,7 +5103,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) failed to install %n файл не удалось установить @@ -5076,377 +5113,388 @@ Please, only use this feature to install updates and DLC. - + System Application Системное приложение - + System Archive Системный архив - + System Application Update Обновление системного приложения - + Firmware Package (Type A) Пакет прошивки (Тип А) - + Firmware Package (Type B) Пакет прошивки (Тип Б) - + Game Игра - + Game Update Обновление игры - + Game DLC DLC игры - + Delta Title Дельта-титул - + Select NCA Install Type... Выберите тип установки NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Пожалуйста, выберите тип приложения, который вы хотите установить для этого NCA: (В большинстве случаев, подходит стандартный выбор «Игра».) - + Failed to Install Ошибка установки - + The title type you selected for the NCA is invalid. Тип приложения, который вы выбрали для NCA, недействителен. - + File not found Файл не найден - + File "%1" not found Файл "%1" не найден - + OK ОК - - + + Hardware requirements not met Не удовлетворены системные требования - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Ваша система не соответствует рекомендуемым системным требованиям. Отчеты о совместимости были отключены. - + Missing yuzu Account Отсутствует аккаунт yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Чтобы отправить отчет о совместимости игры, необходимо привязать свою учетную запись yuzu.<br><br/>Чтобы привязать свою учетную запись yuzu, перейдите в раздел Эмуляция &gt; Параметры &gt; Сеть. - + Error opening URL Ошибка при открытии URL - + Unable to open the URL "%1". Не удалось открыть URL: "%1". - + TAS Recording Запись TAS - + Overwrite file of player 1? Перезаписать файл игрока 1? - + Invalid config detected Обнаружена недопустимая конфигурация - + Handheld controller can't be used on docked mode. Pro controller will be selected. Портативный контроллер не может быть использован в режиме док-станции. Будет выбран контроллер Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Текущий amiibo был убран - + Error Ошибка - - + + The current game is not looking for amiibos Текущая игра не ищет amiibo - + Amiibo File (%1);; All Files (*.*) Файл Amiibo (%1);; Все Файлы (*.*) - + Load Amiibo Загрузить Amiibo - + Error loading Amiibo data Ошибка загрузки данных Amiibo - + The selected file is not a valid amiibo Выбранный файл не является допустимым amiibo - + The selected file is already on use Выбранный файл уже используется - + An unknown error occurred Произошла неизвестная ошибка - + Capture Screenshot Сделать скриншот - + PNG Image (*.png) Изображение PNG (*.png) - + TAS state: Running %1/%2 Состояние TAS: Выполняется %1/%2 - + TAS state: Recording %1 Состояние TAS: Записывается %1 - + TAS state: Idle %1/%2 Состояние TAS: Простой %1/%2 - + TAS State: Invalid Состояние TAS: Неверное - + &Stop Running [&S] Остановка - + &Start [&S] Начать - + Stop R&ecording [&E] Закончить запись - + R&ecord [&E] Запись - + Building: %n shader(s) Постройка: %n шейдерПостройка: %n шейдер(ов)Постройка: %n шейдер(ов)Постройка: %n шейдер(ов) - + Scale: %1x %1 is the resolution scaling factor Масштаб: %1x - + Speed: %1% / %2% Скорость: %1% / %2% - + Speed: %1% Скорость: %1% - + Game: %1 FPS (Unlocked) Игра: %1 FPS (Неограниченно) - + Game: %1 FPS Игра: %1 FPS - + Frame: %1 ms Кадр: %1 мс - + GPU NORMAL ГП НОРМАЛЬНО - + GPU HIGH ГП ВЫСОКО - + GPU EXTREME ГП ЭКСТРИМ - + GPU ERROR ГП ОШИБКА - + DOCKED В ДОК-СТАНЦИИ - + HANDHELD ПОРТАТИВНЫЙ - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST БЛИЖАЙШИЙ - - + + BILINEAR БИЛИНЕЙНЫЙ - + BICUBIC БИКУБИЧЕСКИЙ - + GAUSSIAN ГАУСС - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA БЕЗ СГЛАЖИВАНИЯ - + FXAA FXAA - + SMAA SMAA - + + VOLUME: MUTE + ГРОМКОСТЬ: ЗАГЛУШЕНА + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + ГРОМКОСТЬ: %1% + + + Confirm Key Rederivation Подтвердите перерасчет ключа - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5463,37 +5511,37 @@ This will delete your autogenerated key files and re-run the key derivation modu Это удалит ваши автоматически сгенерированные файлы ключей и повторно запустит модуль расчета ключей. - + Missing fuses Отсутствуют предохранители - + - Missing BOOT0 - Отсутствует BOOT0 - + - Missing BCPKG2-1-Normal-Main - Отсутствует BCPKG2-1-Normal-Main - + - Missing PRODINFO - Отсутствует PRODINFO - + Derivation Components Missing Компоненты расчета отсутствуют - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Ключи шифрования отсутствуют. <br>Пожалуйста, следуйте <a href='https://yuzu-emu.org/help/quickstart/'>краткому руководству пользователя yuzu</a>, чтобы получить все ваши ключи, прошивку и игры.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5502,39 +5550,39 @@ on your system's performance. от производительности вашей системы. - + Deriving Keys Получение ключей - + Select RomFS Dump Target Выберите цель для дампа RomFS - + Please select which RomFS you would like to dump. Пожалуйста, выберите, какой RomFS вы хотите сдампить. - + Are you sure you want to close yuzu? Вы уверены, что хотите закрыть yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Вы уверены, что хотите остановить эмуляцию? Любой несохраненный прогресс будет потерян. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5546,44 +5594,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGL не доступен! - + OpenGL shared contexts are not supported. Общие контексты OpenGL не поддерживаются. - + yuzu has not been compiled with OpenGL support. yuzu не был скомпилирован с поддержкой OpenGL. - - + + Error while initializing OpenGL! Ошибка при инициализации OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Ваш ГП может не поддерживать OpenGL, или у вас установлен устаревший графический драйвер. - + Error while initializing OpenGL 4.6! Ошибка при инициализации OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Ваш ГП может не поддерживать OpenGL 4.6, или у вас установлен устаревший графический драйвер.<br><br>Рендерер GL:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Ваш ГП может не поддерживать одно или несколько требуемых расширений OpenGL. Пожалуйста, убедитесь в том, что у вас установлен последний графический драйвер.<br><br>Рендерер GL:<br>%1<br><br>Неподдерживаемые расширения:<br>%2 @@ -5823,7 +5871,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list Нажмите дважды, чтобы добавить новую папку в список игр @@ -6169,51 +6217,56 @@ Debug Message: + Hide Empty Rooms + Скрыть пустые комнаты + + + Hide Full Rooms Скрыть полные комнаты - + Refresh Lobby Обновить лобби - + Password Required to Join Для входа необходим пароль - + Password: Пароль: - + Players Игроки - + Room Name Название комнаты - + Preferred Game Предпочтительная игра - + Host Хост - + Refreshing Обновление - + Refresh List Обновить список @@ -6824,7 +6877,7 @@ p, li { white-space: pre-wrap; } - + [not set] [не задано] @@ -6839,10 +6892,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Ось %1%2 @@ -6856,9 +6909,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [неизвестно] @@ -7023,15 +7076,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [недопустимо] - - %1%2Hat %3 %1%2Крест. %3 @@ -7039,35 +7090,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2Ось %3 - + %1%2Axis %3,%4,%5 %1%2Ось %3,%4,%5 - + %1%2Motion %3 %1%2Движение %3 - - %1%2Button %3 %1%2Кнопка %3 - + [unused] [не используется] @@ -7094,12 +7143,12 @@ p, li { white-space: pre-wrap; } Stick L - + Левый стик Stick R - + Правый стик @@ -7154,9 +7203,21 @@ p, li { white-space: pre-wrap; } Дополнительная - - %1%2%3 - %1%2%3 + + %1%2%3%4 + %1%2%3%4 + + + + + %1%2%3Hat %4 + %1%2%3Крест. %4 + + + + + %1%2%3Button %4 + %1%2%3Кнопка %4 @@ -7648,7 +7709,7 @@ p, li { white-space: pre-wrap; } has waiters: %1 - + ожидающих: %1 @@ -7661,12 +7722,12 @@ p, li { white-space: pre-wrap; } waiting for all objects - + в ожидании всех объектов waiting for one of the following objects - + в ожидании одного из следующих объектов @@ -7679,7 +7740,7 @@ p, li { white-space: pre-wrap; } waited by no thread - + не ожидается ни одним потоком @@ -7702,12 +7763,12 @@ p, li { white-space: pre-wrap; } waiting for IPC reply - + ожидание ответа IPC waiting for objects - + ожидание объектов @@ -7742,7 +7803,7 @@ p, li { white-space: pre-wrap; } unknown - + неизвестно @@ -7757,12 +7818,12 @@ p, li { white-space: pre-wrap; } core %1 - + ядро %1 processor = %1 - + процессор = %1 @@ -7772,17 +7833,17 @@ p, li { white-space: pre-wrap; } affinity mask = %1 - + маска сходства = %1 thread id = %1 - + идентификатор потока = %1 priority = %1(current) / %2(normal) - + приоритет = %1(текущий) / %2(обычный) @@ -7800,7 +7861,7 @@ p, li { white-space: pre-wrap; } waited by thread - + ожидается потоком diff --git a/dist/languages/sv.ts b/dist/languages/sv.ts index efb6ebfe3..498dee04a 100644 --- a/dist/languages/sv.ts +++ b/dist/languages/sv.ts @@ -1709,76 +1709,86 @@ avgjord kod.</div> - Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. - Sätt på asynchronous shader-kompilering, vilket kan minska shader stutter. Denna funktion är experimentiell. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + - Use asynchronous shader building (Hack) + Decode ASTC textures asynchronously (Hack) - Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. + Sätt på asynchronous shader-kompilering, vilket kan minska shader stutter. Denna funktion är experimentiell. - Use Fast GPU Time (Hack) + Use asynchronous shader building (Hack) - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - Use pessimistic buffer flushes (Hack) + Use Fast GPU Time (Hack) - Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + Use pessimistic buffer flushes (Hack) + + + + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + Use Vulkan pipeline cache - + Anisotropic Filtering: Anisotropisk filtrering: - + Automatic - + Default Standard - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2166,7 +2176,7 @@ avgjord kod.</div> - + Configure Konfigurera @@ -2193,6 +2203,7 @@ avgjord kod.</div> + Requires restarting yuzu @@ -2217,22 +2228,27 @@ avgjord kod.</div> - + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + Enable mouse panning - + Mouse sensitivity - + % % - + Motion / Touch Rörelse / Touch @@ -2344,7 +2360,7 @@ avgjord kod.</div> - + Left Stick Vänster Spak @@ -2438,14 +2454,14 @@ avgjord kod.</div> - + L L - + ZL ZL @@ -2464,7 +2480,7 @@ avgjord kod.</div> - + Plus Pluss @@ -2477,15 +2493,15 @@ avgjord kod.</div> - + R R - + ZR ZR @@ -2542,235 +2558,240 @@ avgjord kod.</div> - + Right Stick Höger Spak - - - - + + + + Clear Rensa - - - - - + + + + + [not set] [ej angett] - - + + Invert button - - + + Toggle button - - + + Turbo button + + + + + Invert axis - - - + + + Set threshold - - + + Choose a value between 0% and 100% - + Toggle axis - + Set gyro threshold - + Map Analog Stick - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. - + Center axis - - + + Deadzone: %1% Dödzon: %1% - - + + Modifier Range: %1% Modifieringsräckvidd: %1% - - + + Pro Controller Prokontroller - + Dual Joycons Dubbla Joycons - + Left Joycon Vänster Joycon - + Right Joycon Höger Joycon - + Handheld Handhållen - + GameCube Controller GameCube-kontroll - + Poke Ball Plus Poke Ball Plus - + NES Controller NES-kontroll - + SNES Controller SNES-kontroll - + N64 Controller N64-kontroll - + Sega Genesis Sega Genesis - + Start / Pause - + Z Z - + Control Stick - + C-Stick - + Shake! - + [waiting] [väntar] - + New Profile Ny profil - + Enter a profile name: - - + + Create Input Profile - + The given profile name is not valid! - + Failed to create the input profile "%1" - + Delete Input Profile - + Failed to delete the input profile "%1" - + Load Input Profile - + Failed to load the input profile "%1" - + Save Input Profile - + Failed to save the input profile "%1" @@ -4546,911 +4567,932 @@ Dra punkter för att ändra position, eller dubbelklicka tabellceller för att r - + Loading Web Applet... Laddar WebApplet... - - + + Disable Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Mängden shaders som just nu byggs - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Nuvarande emuleringshastighet. Värden över eller under 100% indikerar på att emulationen körs snabbare eller långsammare än en Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Hur många bilder per sekund som spelet just nu visar. Detta varierar från spel till spel och scen till scen. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tid det tar att emulera en Switch bild, utan att räkna med framelimiting eller v-sync. För emulering på full hastighet så ska det vara som mest 16.67 ms. - + &Clear Recent Files - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue - + &Pause &Paus - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Varning Föråldrat Spelformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Du använder det dekonstruerade ROM-formatet för det här spelet. Det är ett föråldrat format som har överträffats av andra som NCA, NAX, XCI eller NSP. Dekonstruerade ROM-kataloger saknar ikoner, metadata och uppdatering.<br><br>För en förklaring av de olika format som yuzu stöder, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>kolla in vår wiki</a>. Det här meddelandet visas inte igen. - - + + Error while loading ROM! Fel vid laddning av ROM! - + The ROM format is not supported. ROM-formatet stöds inte. - + An error occurred initializing the video core. Ett fel inträffade vid initiering av videokärnan. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Ett okänt fel har uppstått. Se loggen för mer information. - + (64-bit) - + (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit - + Closing software... - + Save Data Spardata - + Mod Data Mod-data - + Error Opening %1 Folder Fel Öppnar %1 Mappen - - + + Folder does not exist! Mappen finns inte! - + Error Opening Transferable Shader Cache Fel Under Öppning Av Överförbar Shadercache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Ta bort katalog - - - - - - + + + + + + Successfully Removed Framgångsrikt borttagen - + Successfully removed the installed base game. Tog bort det installerade basspelet framgångsrikt. - + The base game is not installed in the NAND and cannot be removed. Basspelet är inte installerat i NAND och kan inte tas bort. - + Successfully removed the installed update. Tog bort den installerade uppdateringen framgångsrikt. - + There is no update installed for this title. Det finns ingen uppdatering installerad för denna titel. - + There are no DLC installed for this title. Det finns inga DLC installerade för denna titel. - + Successfully removed %1 installed DLC. Tog framgångsrikt bort den %1 installerade DLCn. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? Ta Bort Anpassad Spelkonfiguration? - + Remove File Radera fil - - + + Error Removing Transferable Shader Cache Fel När Överförbar Shader Cache Raderades - - + + A shader cache for this title does not exist. En shader cache för denna titel existerar inte. - + Successfully removed the transferable shader cache. Raderade den överförbara shadercachen framgångsrikt. - + Failed to remove the transferable shader cache. Misslyckades att ta bort den överförbara shadercache - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Fel När Anpassad Konfiguration Raderades - + A custom configuration for this title does not exist. En anpassad konfiguration för denna titel existerar inte. - + Successfully removed the custom game configuration. Tog bort den anpassade spelkonfigurationen framgångsrikt. - + Failed to remove the custom game configuration. Misslyckades att ta bort den anpassade spelkonfigurationen. - - + + RomFS Extraction Failed! RomFS Extraktion Misslyckades! - + There was an error copying the RomFS files or the user cancelled the operation. Det uppstod ett fel vid kopiering av RomFS filer eller användaren avbröt operationen. - + Full Full - + Skeleton Skelett - + Select RomFS Dump Mode Välj RomFS Dump-Läge - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Välj hur du vill att RomFS ska dumpas. <br>Full kommer att kopiera alla filer i den nya katalogen medan <br>skelett bara skapar katalogstrukturen. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Extraherar RomFS... - - + + Cancel Avbryt - + RomFS Extraction Succeeded! RomFS Extraktion Lyckades! - + The operation completed successfully. Operationen var lyckad. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Fel under öppning av %1 - + Select Directory Välj Katalog - + Properties Egenskaper - + The game properties could not be loaded. Spelegenskaperna kunde inte laddas. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Körbar (%1);;Alla Filer (*.*) - + Load File Ladda Fil - + Open Extracted ROM Directory Öppna Extraherad ROM-Katalog - + Invalid Directory Selected Ogiltig Katalog Vald - + The directory you have selected does not contain a 'main' file. Katalogen du har valt innehåller inte en 'main'-fil. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Installerbar Switch-fil (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Installera filer - + %n file(s) remaining - + Installing file "%1"... Installerar Fil "%1"... - - + + Install Results Installera resultat - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systemapplikation - + System Archive Systemarkiv - + System Application Update Systemapplikationsuppdatering - + Firmware Package (Type A) Firmwarepaket (Typ A) - + Firmware Package (Type B) Firmwarepaket (Typ B) - + Game Spel - + Game Update Speluppdatering - + Game DLC Spel DLC - + Delta Title Delta Titel - + Select NCA Install Type... Välj NCA-Installationsläge... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Välj vilken typ av titel du vill installera som: (I de flesta fallen, standard 'Spel' är bra.) - + Failed to Install Misslyckades med Installationen - + The title type you selected for the NCA is invalid. Den titeltyp du valt för NCA är ogiltig. - + File not found Filen hittades inte - + File "%1" not found Filen "%1" hittades inte - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account yuzu Konto hittades inte - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. För att skicka ett spelkompatibilitetstest, du måste länka ditt yuzu-konto.<br><br/>För att länka ditt yuzu-konto, gå till Emulering &gt, Konfigurering &gt, Web. - + Error opening URL Fel när URL öppnades - + Unable to open the URL "%1". Oförmögen att öppna URL:en "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo - - + + The current amiibo has been removed - + Error Fel - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo Fil (%1);; Alla Filer (*.*) - + Load Amiibo Ladda Amiibo - + Error loading Amiibo data Fel vid laddning av Amiibodata - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Skärmdump - + PNG Image (*.png) PNG Bild (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Hastighet: %1% / %2% - + Speed: %1% Hastighet: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Spel: %1 FPS - + Frame: %1 ms Ruta: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA - + SMAA - + + VOLUME: MUTE + + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + + + + Confirm Key Rederivation Bekräfta Nyckel Rederivering - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5467,37 +5509,37 @@ och eventuellt göra säkerhetskopior. Detta raderar dina autogenererade nyckelfiler och kör nyckelderivationsmodulen. - + Missing fuses Saknade säkringar - + - Missing BOOT0 - Saknar BOOT0 - + - Missing BCPKG2-1-Normal-Main - Saknar BCPKG2-1-Normal-Main - + - Missing PRODINFO - Saknar PRODINFO - + Derivation Components Missing Deriveringsdelar saknas - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5506,39 +5548,39 @@ Detta kan ta upp till en minut beroende på systemets prestanda. - + Deriving Keys Härleda Nycklar - + Select RomFS Dump Target Välj RomFS Dumpa Mål - + Please select which RomFS you would like to dump. Välj vilken RomFS du vill dumpa. - + Are you sure you want to close yuzu? Är du säker på att du vill stänga yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Är du säker på att du vill stoppa emuleringen? Du kommer att förlora osparade framsteg. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5550,44 +5592,44 @@ Vill du strunta i detta och avsluta ändå? GRenderWindow - - + + OpenGL not available! OpenGL inte tillgängligt! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu har inte komilerats med OpenGL support. - - + + Error while initializing OpenGL! Fel under initialisering av OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. - + Error while initializing OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 @@ -5827,7 +5869,7 @@ Vill du strunta i detta och avsluta ändå? GameListPlaceholder - + Double-click to add a new folder to the game list Dubbelklicka för att lägga till en ny mapp i spellistan. @@ -6171,51 +6213,56 @@ Debug Message: + Hide Empty Rooms + + + + Hide Full Rooms - + Refresh Lobby - + Password Required to Join - + Password: - + Players Spelare - + Room Name - + Preferred Game - + Host - + Refreshing - + Refresh List @@ -6818,7 +6865,7 @@ p, li { white-space: pre-wrap; } - + [not set] [inte inställd] @@ -6833,10 +6880,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Axel %1%2 @@ -6850,9 +6897,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [okänd] @@ -7017,15 +7064,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [felaktig] - - %1%2Hat %3 %1%2Hatt %3 @@ -7033,35 +7078,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2Axel %3 - + %1%2Axis %3,%4,%5 %1%2Axel %3,%4%5 - + %1%2Motion %3 %1%2Rörelse %3 - - %1%2Button %3 %1%2Knapp %3 - + [unused] [oanvänd] @@ -7148,9 +7191,21 @@ p, li { white-space: pre-wrap; } Extra - - %1%2%3 - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 + diff --git a/dist/languages/tr_TR.ts b/dist/languages/tr_TR.ts index bff93ae69..d5e5691b2 100644 --- a/dist/languages/tr_TR.ts +++ b/dist/languages/tr_TR.ts @@ -1717,76 +1717,86 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Asenkronize shader derlemesini aktive eder. Bunu etkinleştirmek takılmaları azaltabilir. Bu özellik deneyseldir. - + Use asynchronous shader building (Hack) Asenkronize shader derlemesini kullan (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Hızlı GPU Saati'ni etkinleştir. Bu seçenek çoğu oyunu en yüksek gerçek çözünürlükte çalıştırır. - + Use Fast GPU Time (Hack) Hızlı GPU Saati Kullan (Hack) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Use pessimistic buffer flushes (Hack) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache - + Anisotropic Filtering: Anisotropic Filtering: - + Automatic Otomatik - + Default Varsayılan - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2174,7 +2184,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + Configure Yapılandır @@ -2201,6 +2211,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra + Requires restarting yuzu Yuzu'yu yeniden başlatmayı gerektirir @@ -2225,22 +2236,27 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + Enable mouse panning Mouse ile kaydırmayı etkinleştir - + Mouse sensitivity Fare hassasiyeti - + % % - + Motion / Touch Hareket / Dokunmatik @@ -2352,7 +2368,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + Left Stick Sol Analog @@ -2446,14 +2462,14 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + L L - + ZL ZL @@ -2472,7 +2488,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + Plus Artı @@ -2485,15 +2501,15 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + R R - + ZR ZR @@ -2550,236 +2566,241 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + Right Stick Sağ Analog - - - - + + + + Clear Temizle - - - - - + + + + + [not set] [belirlenmedi] - - + + Invert button Tuşları ters çevir - - + + Toggle button Tuşu Aç/Kapa - - + + Turbo button + + + + + Invert axis Ekseni ters çevir - - - + + + Set threshold Alt sınır ayarla - - + + Choose a value between 0% and 100% %0 ve %100 arasında bir değer seçin - + Toggle axis - + Set gyro threshold - + Map Analog Stick Analog Çubuğu Ayarla - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Tamama bastıktan sonra, joystikinizi önce yatay sonra dikey olarak hareket ettirin. Eksenleri ters çevirmek için, önce joystickinizi dikey sonra yatay olarak hareket ettirin. - + Center axis - - + + Deadzone: %1% Ölü Bölge: %1% - - + + Modifier Range: %1% Düzenleyici Aralığı: %1% - - + + Pro Controller Pro Controller - + Dual Joycons İkili Joyconlar - + Left Joycon Sol Joycon - + Right Joycon Sağ Joycon - + Handheld Handheld - + GameCube Controller GameCube Kontrolcüsü - + Poke Ball Plus Poke Ball Plus - + NES Controller NES Kontrolcüsü - + SNES Controller SNES Kontrolcüsü - + N64 Controller N64 Kontrolcüsü - + Sega Genesis Sega Genesis - + Start / Pause Başlat / Duraklat - + Z Z - + Control Stick Kontrol Çubuğu - + C-Stick C-Çubuğu - + Shake! Salla! - + [waiting] [bekleniyor] - + New Profile Yeni Profil - + Enter a profile name: Bir profil ismi girin: - - + + Create Input Profile Kontrol Profili Oluştur - + The given profile name is not valid! Girilen profil ismi geçerli değil! - + Failed to create the input profile "%1" "%1" kontrol profili oluşturulamadı - + Delete Input Profile Kontrol Profilini Kaldır - + Failed to delete the input profile "%1" "%1" kontrol profili kaldırılamadı - + Load Input Profile Kontrol Profilini Yükle - + Failed to load the input profile "%1" "%1" kontrol profili yüklenemedi - + Save Input Profile Kontrol Profilini Kaydet - + Failed to save the input profile "%1" "%1" kontrol profili kaydedilemedi @@ -4555,524 +4576,534 @@ Noktanın konumunu değiştirmek için sürükleyin ya da sayıların üstüne - + Loading Web Applet... Web Uygulaması Yükleniyor... - - + + Disable Web Applet Web Uygulamasını Devre Dışı Bırak - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Şu anda derlenen shader miktarı - + The current selected resolution scaling multiplier. Geçerli seçili çözünürlük ölçekleme çarpanı. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Geçerli emülasyon hızı. %100'den yüksek veya düşük değerler emülasyonun bir Switch'den daha hızlı veya daha yavaş çalıştığını gösterir. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Oyunun şuanda saniye başına kaç kare gösterdiği. Bu oyundan oyuna ve sahneden sahneye değişiklik gösterir. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Bir Switch karesini emüle etmekte geçen zaman, karelimitleme ve v-sync hariç. Tam hız emülasyon için bu en çok 16,67 ms olmalı. - + &Clear Recent Files &Son Dosyaları Temizle - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue &Devam Et - + &Pause &Duraklat - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu şu anda bir oyun çalıştırıyor - + Warning Outdated Game Format Uyarı, Eski Oyun Formatı - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Bu oyun için dekonstrükte ROM formatı kullanıyorsunuz, bu fromatın yerine NCA, NAX, XCI ve NSP formatları kullanılmaktadır. Dekonstrükte ROM formatları ikon, üst veri ve güncelleme desteği içermemektedir.<br><br>Yuzu'nun desteklediği çeşitli Switch formatları için<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Wiki'yi ziyaret edin</a>. Bu mesaj yeniden gösterilmeyecektir. - - + + Error while loading ROM! ROM yüklenirken hata oluştu! - + The ROM format is not supported. Bu ROM biçimi desteklenmiyor. - + An error occurred initializing the video core. Video çekirdeğini başlatılırken bir hata oluştu. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu video çekirdeğini çalıştırırken bir hatayla karşılaştı. Bu sorun genellikle eski GPU sürücüleri sebebiyle ortaya çıkar. Daha fazla detay için lütfen log dosyasına bakın. Log dosyasını incelemeye dair daha fazla bilgi için lütfen bu sayfaya ulaşın: <a href='https://yuzu-emu.org/help/reference/log-files/'>Log dosyası nasıl yüklenir</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. ROM yüklenirken hata oluştu! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Lütfen dosyalarınızı yeniden dump etmek için<a href='https://yuzu-emu.org/help/quickstart/'>yuzu hızlı başlangıç kılavuzu'nu</a> takip edin.<br> Yardım için yuzu wiki</a>veya yuzu Discord'una</a> bakabilirsiniz. - + An unknown error occurred. Please see the log for more details. Bilinmeyen bir hata oluştu. Lütfen daha fazla detay için kütüğe göz atınız. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Kayıt Verisi - + Mod Data Mod Verisi - + Error Opening %1 Folder %1 klasörü açılırken hata - - + + Folder does not exist! Klasör mevcut değil! - + Error Opening Transferable Shader Cache Transfer Edilebilir Shader Cache'ini Açarken Bir Hata Oluştu - + Failed to create the shader cache directory for this title. Bu oyun için shader cache konumu oluşturulamadı. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Girdiyi Kaldır - - - - - - + + + + + + Successfully Removed Başarıyla Kaldırıldı - + Successfully removed the installed base game. Yüklenmiş oyun başarıyla kaldırıldı. - + The base game is not installed in the NAND and cannot be removed. Asıl oyun NAND'de kurulu değil ve kaldırılamaz. - + Successfully removed the installed update. Yüklenmiş güncelleme başarıyla kaldırıldı. - + There is no update installed for this title. Bu oyun için yüklenmiş bir güncelleme yok. - + There are no DLC installed for this title. Bu oyun için yüklenmiş bir DLC yok. - + Successfully removed %1 installed DLC. %1 yüklenmiş DLC başarıyla kaldırıldı. - + Delete OpenGL Transferable Shader Cache? OpenGL Transfer Edilebilir Shader Cache'ini Kaldırmak İstediğinize Emin Misiniz? - + Delete Vulkan Transferable Shader Cache? Vulkan Transfer Edilebilir Shader Cache'ini Kaldırmak İstediğinize Emin Misiniz? - + Delete All Transferable Shader Caches? Tüm Transfer Edilebilir Shader Cache'leri Kaldırmak İstediğinize Emin Misiniz? - + Remove Custom Game Configuration? Oyuna Özel Yapılandırmayı Kaldırmak İstediğinize Emin Misiniz? - + Remove File Dosyayı Sil - - + + Error Removing Transferable Shader Cache Transfer Edilebilir Shader Cache Kaldırılırken Bir Hata Oluştu - - + + A shader cache for this title does not exist. Bu oyun için oluşturulmuş bir shader cache yok. - + Successfully removed the transferable shader cache. Transfer edilebilir shader cache başarıyla kaldırıldı. - + Failed to remove the transferable shader cache. Transfer edilebilir shader cache kaldırılamadı. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches Transfer Edilebilir Shader Cache'ler Kaldırılırken Bir Hata Oluştu - + Successfully removed the transferable shader caches. Transfer edilebilir shader cacheler başarıyla kaldırıldı. - + Failed to remove the transferable shader cache directory. Transfer edilebilir shader cache konumu kaldırılamadı. - - + + Error Removing Custom Configuration Oyuna Özel Yapılandırma Kaldırılırken Bir Hata Oluştu. - + A custom configuration for this title does not exist. Bu oyun için bir özel yapılandırma yok. - + Successfully removed the custom game configuration. Oyuna özel yapılandırma başarıyla kaldırıldı. - + Failed to remove the custom game configuration. Oyuna özel yapılandırma kaldırılamadı. - - + + RomFS Extraction Failed! RomFS Çıkartımı Başarısız! - + There was an error copying the RomFS files or the user cancelled the operation. RomFS dosyaları kopyalanırken bir hata oluştu veya kullanıcı işlemi iptal etti. - + Full Full - + Skeleton Çerçeve - + Select RomFS Dump Mode RomFS Dump Modunu Seçiniz - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Lütfen RomFS'in nasıl dump edilmesini istediğinizi seçin.<br>"Full" tüm dosyaları yeni bir klasöre kopyalarken <br>"skeleton" sadece klasör yapısını oluşturur. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 konumunda RomFS çıkarmaya yetecek alan yok. Lütfen yer açın ya da Emülasyon > Yapılandırma > Sistem > Dosya Sistemi > Dump konumu kısmından farklı bir çıktı konumu belirleyin. - + Extracting RomFS... RomFS çıkartılıyor... - - + + Cancel İptal - + RomFS Extraction Succeeded! RomFS Çıkartımı Başarılı! - + The operation completed successfully. İşlem başarıyla tamamlandı. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 %1 Açılırken Bir Hata Oluştu - + Select Directory Klasör Seç - + Properties Özellikler - + The game properties could not be loaded. Oyun özellikleri yüklenemedi. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Çalıştırılabilir Dosyası (%1);;Tüm Dosyalar (*.*) - + Load File Dosya Aç - + Open Extracted ROM Directory Çıkartılmış ROM klasörünü aç - + Invalid Directory Selected Geçersiz Klasör Seçildi - + The directory you have selected does not contain a 'main' file. Seçtiğiniz klasör bir "main" dosyası içermiyor. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Yüklenilebilir Switch Dosyası (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submissions Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Dosya Kur - + %n file(s) remaining %n dosya kaldı%n dosya kaldı - + Installing file "%1"... "%1" dosyası kuruluyor... - - + + Install Results Kurulum Sonuçları - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Olası çakışmaları önlemek için oyunları NAND'e yüklememenizi tavsiye ediyoruz. Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + %n file(s) were newly installed %n dosya güncel olarak yüklendi @@ -5080,7 +5111,7 @@ Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + %n file(s) were overwritten %n dosyanın üstüne yazıldı @@ -5088,7 +5119,7 @@ Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + %n file(s) failed to install %n dosya yüklenemedi @@ -5096,377 +5127,388 @@ Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + System Application Sistem Uygulaması - + System Archive Sistem Arşivi - + System Application Update Sistem Uygulama Güncellemesi - + Firmware Package (Type A) Yazılım Paketi (Tür A) - + Firmware Package (Type B) Yazılım Paketi (Tür B) - + Game Oyun - + Game Update Oyun Güncellemesi - + Game DLC Oyun DLC'si - + Delta Title Delta Başlık - + Select NCA Install Type... NCA Kurulum Tipi Seçin... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Lütfen bu NCA dosyası için belirlemek istediğiniz başlık türünü seçiniz: (Çoğu durumda, varsayılan olan 'Oyun' kullanılabilir.) - + Failed to Install Kurulum Başarısız Oldu - + The title type you selected for the NCA is invalid. NCA için seçtiğiniz başlık türü geçersiz - + File not found Dosya Bulunamadı - + File "%1" not found Dosya "%1" Bulunamadı - + OK Tamam - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Kayıp yuzu Hesabı - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Oyun uyumluluk test çalışması göndermek için öncelikle yuzu hesabınla giriş yapmanız gerekiyor.<br><br/>Yuzu hesabınızla giriş yapmak için, Emülasyon &gt; Yapılandırma &gt; Web'e gidiniz. - + Error opening URL URL açılırken bir hata oluştu - + Unable to open the URL "%1". URL "%1" açılamıyor. - + TAS Recording TAS kayıtta - + Overwrite file of player 1? Oyuncu 1'in dosyasının üstüne yazılsın mı? - + Invalid config detected Geçersiz yapılandırma tespit edildi - + Handheld controller can't be used on docked mode. Pro controller will be selected. Handheld kontrolcü dock modunda kullanılamaz. Pro kontrolcü seçilecek. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Amiibo kaldırıldı - + Error Hata - - + + The current game is not looking for amiibos Aktif oyun amiibo beklemiyor - + Amiibo File (%1);; All Files (*.*) Amiibo Dosyası (%1);; Tüm Dosyalar (*.*) - + Load Amiibo Amiibo Yükle - + Error loading Amiibo data Amiibo verisi yüklenirken hata - + The selected file is not a valid amiibo Seçtiğiniz dosya geçerli bir amiibo değil - + The selected file is already on use Seçtiğiniz dosya hali hazırda kullanılıyor - + An unknown error occurred - + Capture Screenshot Ekran Görüntüsü Al - + PNG Image (*.png) PNG görüntüsü (*.png) - + TAS state: Running %1/%2 TAS durumu: %1%2 çalışıyor - + TAS state: Recording %1 TAS durumu: %1 kaydediliyor - + TAS state: Idle %1/%2 TAS durumu: %1%2 boşta - + TAS State: Invalid TAS durumu: Geçersiz - + &Stop Running &Çalıştırmayı durdur - + &Start &Başlat - + Stop R&ecording K&aydetmeyi Durdur - + R&ecord K&aydet - + Building: %n shader(s) Oluşturuluyor: %n shaderOluşturuluyor: %n shader - + Scale: %1x %1 is the resolution scaling factor Ölçek: %1x - + Speed: %1% / %2% Hız %1% / %2% - + Speed: %1% Hız: %1% - + Game: %1 FPS (Unlocked) Oyun: %1 FPS (Sınırsız) - + Game: %1 FPS Oyun: %1 FPS - + Frame: %1 ms Kare: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU YÜKSEK - + GPU EXTREME GPU EKSTREM - + GPU ERROR GPU HATASI - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST EN YAKIN - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSYEN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA AA YOK - + FXAA FXAA - + SMAA - + + VOLUME: MUTE + + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + + + + Confirm Key Rederivation Anahtar Yeniden Türetimini Onayla - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5483,37 +5525,37 @@ ve opsiyonel olarak yedekler alın. Bu sizin otomatik oluşturulmuş anahtar dosyalarınızı silecek ve anahtar türetme modülünü tekrar çalıştıracak. - + Missing fuses Anahtarlar Kayıp - + - Missing BOOT0 - BOOT0 Kayıp - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main Kayıp - + - Missing PRODINFO - PRODINFO Kayıp - + Derivation Components Missing Türeten Bileşenleri Kayıp - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Şifreleme anahtarları eksik. <br>Lütfen takip edin<a href='https://yuzu-emu.org/help/quickstart/'>yuzu hızlı başlangıç kılavuzunu</a>tüm anahtarlarınızı, aygıt yazılımınızı ve oyunlarınızı almada.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5522,39 +5564,39 @@ Bu sistem performansınıza bağlı olarak bir dakika kadar zaman alabilir. - + Deriving Keys Anahtarlar Türetiliyor - + Select RomFS Dump Target RomFS Dump Hedefini Seçiniz - + Please select which RomFS you would like to dump. Lütfen dump etmek istediğiniz RomFS'i seçiniz. - + Are you sure you want to close yuzu? yuzu'yu kapatmak istediğinizden emin misiniz? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Emülasyonu durdurmak istediğinizden emin misiniz? Kaydedilmemiş veriler kaybolur. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5566,44 +5608,44 @@ Görmezden gelip kapatmak ister misiniz? GRenderWindow - - + + OpenGL not available! OpenGL kullanıma uygun değil! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. Yuzu OpenGL desteklememektedir. - - + + Error while initializing OpenGL! OpenGl başlatılırken bir hata oluştu! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. GPU'nuz OpenGL desteklemiyor veya güncel bir grafik sürücüsüne sahip değilsiniz. - + Error while initializing OpenGL 4.6! OpenGl 4.6 başlatılırken bir hata oluştu! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 GPU'nuz OpenGL 4.6'yı desteklemiyor veya güncel bir grafik sürücüsüne sahip değilsiniz.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 GPU'nuz gereken bir yada daha fazla OpenGL eklentisini desteklemiyor Lütfen güncel bir grafik sürücüsüne sahip olduğunuzdan emin olun.<br><br>GL Renderer:<br>%1<br><br> Desteklenmeyen Eklentiler:<br>%2 @@ -5843,7 +5885,7 @@ Görmezden gelip kapatmak ister misiniz? GameListPlaceholder - + Double-click to add a new folder to the game list Oyun listesine yeni bir klasör eklemek için çift tıklayın. @@ -6188,51 +6230,56 @@ Debug Message: + Hide Empty Rooms + + + + Hide Full Rooms Dolu Odaları Gizle - + Refresh Lobby Lobiyi Yenile - + Password Required to Join Katılmak için Gereken Şifre - + Password: Şifre: - + Players Oyuncular - + Room Name Oda Adı - + Preferred Game Tercih Edilen Oyun - + Host Ana bilgisayar - + Refreshing Yenileniyor - + Refresh List Listeyi Yenile @@ -6843,7 +6890,7 @@ p, li { white-space: pre-wrap; } - + [not set] [belirlenmedi] @@ -6858,10 +6905,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Eksen %1%2 @@ -6875,9 +6922,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [bilinmeyen] @@ -7042,15 +7089,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [geçersiz] - - %1%2Hat %3 %1%2Hat %3 @@ -7058,35 +7103,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2Eksen %3 - + %1%2Axis %3,%4,%5 %1%2Eksen %3,%4,%5 - + %1%2Motion %3 %1%2Hareket %3 - - %1%2Button %3 %1%2Tuş %3 - + [unused] [kullanılmayan] @@ -7173,9 +7216,21 @@ p, li { white-space: pre-wrap; } Ekstra - - %1%2%3 - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Button %4 + diff --git a/dist/languages/uk.ts b/dist/languages/uk.ts index 9c4d48029..91e927cf5 100644 --- a/dist/languages/uk.ts +++ b/dist/languages/uk.ts @@ -539,7 +539,9 @@ This would ban both their forum username and their IP address. <div>This option improves the speed of some approximate floating-point functions by using less accurate native approximations.</div> - + + <div>Ця опція підвищує швидкість роботи деяких функцій із плаваючою комою за рахунок використання менш точних рідних наближень.</div> + @@ -551,7 +553,9 @@ This would ban both their forum username and their IP address. <div>This option improves the speed of 32 bits ASIMD floating-point functions by running with incorrect rounding modes.</div> - + + <div>Ця опція підвищує швидкість роботи 32-бітних ASIMD-функцій із плаваючою комою, працюючи з неправильними режимами округлення.</div> + @@ -563,7 +567,9 @@ This would ban both their forum username and their IP address. <div>This option improves speed by removing NaN checking. Please note this also reduces accuracy of certain floating-point instructions.</div> - + + <div>Ця опція підвищує швидкість, прибираючи перевірку NaN. Зверніть увагу, що це також знижує точність деяких інструкцій із плаваючою крапкою. </div> + @@ -580,7 +586,7 @@ This would ban both their forum username and their IP address. Disable address space checks - + Вимкнути перевірку адресного простору @@ -856,7 +862,7 @@ This would ban both their forum username and their IP address. When checked, it enables Nsight Aftermath crash dumps - + Якщо ввімкнено, вмикає дампи крашів Nsight Aftermath @@ -876,7 +882,7 @@ This would ban both their forum username and their IP address. When checked, it will dump all the macro programs of the GPU - + Якщо ввімкнено, буде дампити всі макропрограми ГП @@ -901,7 +907,7 @@ This would ban both their forum username and their IP address. Disable Macro HLE - + Вимкнути макрос HLE @@ -951,7 +957,7 @@ This would ban both their forum username and their IP address. Create Minidump After Crash - + Створювати міні-дамп після крашу @@ -971,7 +977,7 @@ This would ban both their forum username and their IP address. Enable Debug Asserts - + Увімкнути налагоджувальні сигнали @@ -1021,7 +1027,7 @@ This would ban both their forum username and their IP address. MiniDump creation not compiled - + Створення міні-дампа не скомпільовано @@ -1505,7 +1511,7 @@ This would ban both their forum username and their IP address. 1.5X (1080p/1620p) [EXPERIMENTAL] - + 1.5X (1080p/1620p) [ЕКСПЕРИМЕНТАЛЬНО] @@ -1535,12 +1541,12 @@ This would ban both their forum username and their IP address. 7X (5040p/7560p) - + 7X (5040p/7560p) 8X (5760p/8640p) - + 8X (5760p/8640p) @@ -1575,7 +1581,7 @@ This would ban both their forum username and their IP address. AMD FidelityFX™️ Super Resolution - + AMD FidelityFX™️ Super Resolution @@ -1689,76 +1695,86 @@ This would ban both their forum username and their IP address. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Вмикає асинхронну компіляцію шейдерів, що зменшить зависання через шейдери. Функція є експериментальною. - + Use asynchronous shader building (Hack) Використовувати асинхронну побудову шейдерів (хак) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Вмикає функцію Fast GPU Time. Цей параметр змусить більшість ігор працювати в максимальній рідній роздільній здатності. - + Use Fast GPU Time (Hack) Увімкнути Fast GPU Time (Хак) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. Вмикає песимістичне очищення буферів. Ця опція змушує промивати немодифіковані буфери, що може знизити продуктивність. - + Use pessimistic buffer flushes (Hack) Використовувати песимістичне очищення буферів (Хак) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. Вмикає кеш конвеєра, специфічний для виробника GPU. Ця опція може значно поліпшити час завантаження шейдерів у тих випадках, коли драйвер Vulkan не зберігає внутрішні файли кешу конвеєра. - + Use Vulkan pipeline cache Використовувати конвеєрний кеш Vulkan - + Anisotropic Filtering: Анізотропна фільтрація: - + Automatic Автоматично - + Default За замовчуванням - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2146,7 +2162,7 @@ This would ban both their forum username and their IP address. - + Configure Налаштувати @@ -2173,6 +2189,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu Потребує перезапуску yuzu @@ -2194,25 +2211,30 @@ This would ban both their forum username and their IP address. Enable direct JoyCon driver + Увімкнути прямий драйвер JoyCon + + + + Enable direct Pro Controller driver [EXPERIMENTAL] - + Enable mouse panning Увімкнути панорамування миші - + Mouse sensitivity Чутливість миші - + % % - + Motion / Touch Рух і сенсор @@ -2324,7 +2346,7 @@ This would ban both their forum username and their IP address. - + Left Stick Лівий міні-джойстик @@ -2418,14 +2440,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2444,7 +2466,7 @@ This would ban both their forum username and their IP address. - + Plus Плюс @@ -2457,15 +2479,15 @@ This would ban both their forum username and their IP address. - + R R - + ZR ZR @@ -2522,236 +2544,241 @@ This would ban both their forum username and their IP address. - + Right Stick Правий міні-джойстик - - - - + + + + Clear Очистити - - - - - + + + + + [not set] [не задано] - - + + Invert button Інвертувати кнопку - - + + Toggle button Переключити кнопку - - + + Turbo button + Турбо кнопка + + + + Invert axis Інвертувати осі - - - + + + Set threshold Встановити поріг - - + + Choose a value between 0% and 100% Оберіть значення між 0% і 100% - + Toggle axis Переключити осі - + Set gyro threshold Встановити поріг гіроскопа - + Map Analog Stick Задати аналоговий міні-джойстик - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Після натискання на ОК, рухайте ваш міні-джойстик горизонтально, а потім вертикально. Щоб інвертувати осі, спочатку рухайте ваш міні-джойстик вертикально, а потім горизонтально. - + Center axis Центрувати осі - - + + Deadzone: %1% Мертва зона: %1% - - + + Modifier Range: %1% Діапазон модифікатора: %1% - - + + Pro Controller Контролер Pro - + Dual Joycons Подвійні Joy-Con'и - + Left Joycon Лівий Joy-Con - + Right Joycon Правий Joy-Con - + Handheld Портативний - + GameCube Controller Контролер GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Контролер NES - + SNES Controller Контролер SNES - + N64 Controller Контролер N64 - + Sega Genesis Sega Genesis - + Start / Pause Старт / Пауза - + Z Z - + Control Stick Міні-джойстик керування - + C-Stick C-Джойстик - + Shake! Потрусіть! - + [waiting] [очікування] - + New Profile Новий профіль - + Enter a profile name: Введіть ім'я профілю: - - + + Create Input Profile Створити профіль контролю - + The given profile name is not valid! Задане ім'я профілю недійсне! - + Failed to create the input profile "%1" Не вдалося створити профіль контролю "%1" - + Delete Input Profile Видалити профіль контролю - + Failed to delete the input profile "%1" Не вдалося видалити профіль контролю "%1" - + Load Input Profile Завантажити профіль контролю - + Failed to load the input profile "%1" Не вдалося завантажити профіль контролю "%1" - + Save Input Profile Зберегти профіль контролю - + Failed to save the input profile "%1" Не вдалося зберегти профіль контролю "%1" @@ -3255,7 +3282,7 @@ UUID: %2 Virtual Ring Sensor Parameters - + Параметри датчика віртуального Ring @@ -3277,29 +3304,29 @@ UUID: %2 Direct Joycon Driver - + Прямий драйвер Joycon Enable Ring Input - + Увімкнути введення Ring Enable - + Увімкнути Ring Sensor Value - + Значення датчика Ring Not connected - + Не під'єднано @@ -3330,12 +3357,12 @@ UUID: %2 Error enabling ring input - + Помилка під час увімкнення введення кільця Direct Joycon driver is not enabled - + Прямий драйвер Joycon не активний @@ -3345,17 +3372,17 @@ UUID: %2 The current mapped device doesn't support the ring controller - + Поточний вибраний пристрій не підтримує контролер Ring The current mapped device doesn't have a ring attached - + До поточного пристрою не прикріплено кільце Unexpected driver result %1 - + Несподіваний результат драйвера %1 @@ -4459,12 +4486,12 @@ Drag points to change position, or double-click table cells to edit values. Server Address - + Адреса сервера <html><head/><body><p>Server address of the host</p></body></html> - + <html><head/><body><p>Адреса сервера хоста</p></body></html> @@ -4528,525 +4555,535 @@ Drag points to change position, or double-click table cells to edit values.Не вдалося виконати ініціалізацію Vulkan під час завантаження.<br><br>Натисніть <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>тут для отримання інструкцій щодо усунення проблеми</a>. - + Loading Web Applet... Завантаження веб-аплета... - - + + Disable Web Applet Вимкнути веб-аплет - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Вимкнення веб-апплета може призвести до несподіваної поведінки, і його слід вимикати лише заради Super Mario 3D All-Stars. Ви впевнені, що хочете вимкнути веб-апплет? (Його можна знову ввімкнути в налаштуваннях налагодження.) - + The amount of shaders currently being built Кількість створюваних шейдерів на цей момент - + The current selected resolution scaling multiplier. Поточний обраний множник масштабування роздільної здатності. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Поточна швидкість емуляції. Значення вище або нижче 100% вказують на те, що емуляція йде швидше або повільніше, ніж на Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Кількість кадрів на секунду в цей момент. Значення буде змінюватися між іграми та сценами. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Час, який потрібен для емуляції 1 кадру Switch, не беручи до уваги обмеження FPS або вертикальну синхронізацію. Для емуляції в повній швидкості значення має бути не більше 16,67 мс. - + &Clear Recent Files [&C] Очистити нещодавні файли - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue [&C] Продовжити - + &Pause [&P] Пауза - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping В yuzu запущено гру - + Warning Outdated Game Format Попередження застарілий формат гри - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Для цієї гри ви використовуєте розархівований формат ROM'а, який є застарілим і був замінений іншими, такими як NCA, NAX, XCI або NSP. У розархівованих каталогах ROM'а відсутні іконки, метадані та підтримка оновлень. <br><br>Для отримання інформації про різні формати Switch, підтримувані yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>перегляньте нашу вікі</a>. Це повідомлення більше не буде відображатися. - - + + Error while loading ROM! Помилка під час завантаження ROM! - + The ROM format is not supported. Формат ROM'а не підтримується. - + An error occurred initializing the video core. Сталася помилка під час ініціалізації відеоядра. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu зіткнувся з помилкою під час запуску відеоядра. Зазвичай це спричинено застарілими драйверами ГП, включно з інтегрованими. Перевірте журнал для отримання більш детальної інформації. Додаткову інформацію про доступ до журналу дивіться на наступній сторінці: <a href='https://yuzu-emu.org/help/reference/log-files/'>Як завантажити файл журналу</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Помилка під час завантаження ROM'а! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Будь ласка, дотримуйтесь <a href='https://yuzu-emu.org/help/quickstart/'>короткого керівництва користувача yuzu</a> щоб пере-дампити ваші файли<br>Ви можете звернутися до вікі yuzu</a> або Discord yuzu</a> для допомоги - + An unknown error occurred. Please see the log for more details. Сталася невідома помилка. Будь ласка, перевірте журнал для подробиць. - + (64-bit) (64-бітний) - + (32-bit) (32-бітний) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Закриваємо програму... - + Save Data Збереження - + Mod Data Дані модів - + Error Opening %1 Folder Помилка під час відкриття папки %1 - - + + Folder does not exist! Папка не існує! - + Error Opening Transferable Shader Cache Помилка під час відкриття переносного кешу шейдерів - + Failed to create the shader cache directory for this title. Не вдалося створити папку кешу шейдерів для цієї гри. - + Error Removing Contents Помилка під час видалення вмісту - + Error Removing Update Помилка під час видалення оновлень - + Error Removing DLC Помилка під час видалення DLC - + Remove Installed Game Contents? Видалити встановлений вміст ігор? - + Remove Installed Game Update? Видалити встановлені оновлення гри? - + Remove Installed Game DLC? Видалити встановлені DLC гри? - + Remove Entry Видалити запис - - - - - - + + + + + + Successfully Removed Успішно видалено - + Successfully removed the installed base game. Встановлену гру успішно видалено. - + The base game is not installed in the NAND and cannot be removed. Гру не встановлено в NAND і не може буде видалено. - + Successfully removed the installed update. Встановлене оновлення успішно видалено. - + There is no update installed for this title. Для цієї гри не було встановлено оновлення. - + There are no DLC installed for this title. Для цієї гри не було встановлено DLC. - + Successfully removed %1 installed DLC. Встановлений DLC %1 було успішно видалено - + Delete OpenGL Transferable Shader Cache? Видалити переносний кеш шейдерів OpenGL? - + Delete Vulkan Transferable Shader Cache? Видалити переносний кеш шейдерів Vulkan? - + Delete All Transferable Shader Caches? Видалити весь переносний кеш шейдерів? - + Remove Custom Game Configuration? Видалити користувацьке налаштування гри? - + Remove File Видалити файл - - + + Error Removing Transferable Shader Cache Помилка під час видалення переносного кешу шейдерів - - + + A shader cache for this title does not exist. Кеш шейдерів для цієї гри не існує. - + Successfully removed the transferable shader cache. Переносний кеш шейдерів успішно видалено. - + Failed to remove the transferable shader cache. Не вдалося видалити переносний кеш шейдерів. - + Error Removing Vulkan Driver Pipeline Cache Помилка під час видалення конвеєрного кешу Vulkan - + Failed to remove the driver pipeline cache. Не вдалося видалити конвеєрний кеш шейдерів. - - + + Error Removing Transferable Shader Caches Помилка під час видалення переносного кешу шейдерів - + Successfully removed the transferable shader caches. Переносний кеш шейдерів успішно видалено. - + Failed to remove the transferable shader cache directory. Помилка під час видалення папки переносного кешу шейдерів. - - + + Error Removing Custom Configuration Помилка під час видалення користувацького налаштування - + A custom configuration for this title does not exist. Користувацьких налаштувань для цієї гри не існує. - + Successfully removed the custom game configuration. Користувацьке налаштування гри успішно видалено. - + Failed to remove the custom game configuration. Не вдалося видалити користувацьке налаштування гри. - - + + RomFS Extraction Failed! Не вдалося вилучити RomFS! - + There was an error copying the RomFS files or the user cancelled the operation. Сталася помилка під час копіювання файлів RomFS або користувач скасував операцію. - + Full Повний - + Skeleton Скелет - + Select RomFS Dump Mode Виберіть режим дампа RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Будь ласка, виберіть, як ви хочете виконати дамп RomFS <br>Повний скопіює всі файли в нову папку, тоді як <br>скелет створить лише структуру папок. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root В %1 недостатньо вільного місця для вилучення RomFS. Будь ласка, звільніть місце або виберіть іншу папку для дампа в Емуляція > Налаштування > Система > Файлова система > Корінь дампа - + Extracting RomFS... Вилучення RomFS... - - + + Cancel Скасувати - + RomFS Extraction Succeeded! Вилучення RomFS пройшло успішно! - + The operation completed successfully. Операція завершилася успішно. - - - - - + + + + + Create Shortcut Створити ярлик - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Це створить ярлик для поточного AppImage. Він може не працювати після оновлень. Продовжити? - + Cannot create shortcut on desktop. Path "%1" does not exist. Не вдається створити ярлик на робочому столі. Шлях "%1" не існує. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Неможливо створити ярлик у меню додатків. Шлях "%1" не існує і не може бути створений. - + Create Icon Створити іконку - + Cannot create icon file. Path "%1" does not exist and cannot be created. Неможливо створити файл іконки. Шлях "%1" не існує і не може бути створений. - + Start %1 with the yuzu Emulator Запустити %1 за допомогою емулятора yuzu - + Failed to create a shortcut at %1 Не вдалося створити ярлик у %1 - + Successfully created a shortcut to %1 Успішно створено ярлик у %1 - + Error Opening %1 Помилка відкриття %1 - + Select Directory Обрати папку - + Properties Властивості - + The game properties could not be loaded. Не вдалося завантажити властивості гри. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Виконуваний файл Switch (%1);;Усі файли (*.*) - + Load File Завантажити файл - + Open Extracted ROM Directory Відкрити папку вилученого ROM'а - + Invalid Directory Selected Вибрано неприпустиму папку - + The directory you have selected does not contain a 'main' file. Папка, яку ви вибрали, не містить файлу 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Встановлюваний файл Switch (*.nca, *.nsp, *.xci);;Архів контенту Nintendo (*.nca);;Пакет подачі Nintendo (*.nsp);;Образ картриджа NX (*.xci) - + Install Files Встановити файли - + %n file(s) remaining Залишився %n файлЗалишилося %n файл(ів)Залишилося %n файл(ів)Залишилося %n файл(ів) - + Installing file "%1"... Встановлення файлу "%1"... - - + + Install Results Результати встановлення - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Щоб уникнути можливих конфліктів, ми не рекомендуємо користувачам встановлювати ігри в NAND. Будь ласка, використовуйте цю функцію тільки для встановлення оновлень і завантажуваного контенту. - + %n file(s) were newly installed %n файл було нещодавно встановлено @@ -5056,7 +5093,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) were overwritten %n файл було перезаписано @@ -5066,7 +5103,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) failed to install %n файл не вдалося встановити @@ -5076,377 +5113,388 @@ Please, only use this feature to install updates and DLC. - + System Application Системний додаток - + System Archive Системний архів - + System Application Update Оновлення системного додатку - + Firmware Package (Type A) Пакет прошивки (Тип А) - + Firmware Package (Type B) Пакет прошивки (Тип Б) - + Game Гра - + Game Update Оновлення гри - + Game DLC DLC до гри - + Delta Title Дельта-титул - + Select NCA Install Type... Виберіть тип установки NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Будь ласка, виберіть тип додатку, який ви хочете встановити для цього NCA: (У більшості випадків, підходить стандартний вибір "Гра".) - + Failed to Install Помилка встановлення - + The title type you selected for the NCA is invalid. Тип додатку, який ви вибрали для NCA, недійсний. - + File not found Файл не знайдено - + File "%1" not found Файл "%1" не знайдено - + OK ОК - - + + Hardware requirements not met Не задоволені системні вимоги - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Ваша система не відповідає рекомендованим системним вимогам. Звіти про сумісність було вимкнено. - + Missing yuzu Account Відсутній обліковий запис yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Щоб надіслати звіт про сумісність гри, необхідно прив'язати свій обліковий запис yuzu. <br><br/>Щоб прив'язати свій обліковий запис yuzu, перейдіть у розділ Емуляція &gt; Параметри &gt; Мережа. - + Error opening URL Помилка під час відкриття URL - + Unable to open the URL "%1". Не вдалося відкрити URL: "%1". - + TAS Recording Запис TAS - + Overwrite file of player 1? Перезаписати файл гравця 1? - + Invalid config detected Виявлено неприпустиму конфігурацію - + Handheld controller can't be used on docked mode. Pro controller will be selected. Портативний контролер не може бути використаний у режимі док-станції. Буде обрано контролер Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Поточний amiibo було прибрано - + Error Помилка - - + + The current game is not looking for amiibos Поточна гра не шукає amiibo - + Amiibo File (%1);; All Files (*.*) Файл Amiibo (%1);; Всі Файли (*.*) - + Load Amiibo Завантажити Amiibo - + Error loading Amiibo data Помилка під час завантаження даних Amiibo - + The selected file is not a valid amiibo Обраний файл не є допустимим amiibo - + The selected file is already on use Обраний файл уже використовується - + An unknown error occurred Виникла невідома помилка - + Capture Screenshot Зробити знімок екрану - + PNG Image (*.png) Зображення PNG (*.png) - + TAS state: Running %1/%2 Стан TAS: Виконується %1/%2 - + TAS state: Recording %1 Стан TAS: Записується %1 - + TAS state: Idle %1/%2 Стан TAS: Простий %1/%2 - + TAS State: Invalid Стан TAS: Неприпустимий - + &Stop Running [&S] Зупинка - + &Start [&S] Почати - + Stop R&ecording [&E] Закінчити запис - + R&ecord [&E] Запис - + Building: %n shader(s) Побудова: %n шейдерПобудова: %n шейдер(ів)Побудова: %n шейдер(ів)Побудова: %n шейдер(ів) - + Scale: %1x %1 is the resolution scaling factor Масштаб: %1x - + Speed: %1% / %2% Швидкість: %1% / %2% - + Speed: %1% Швидкість: %1% - + Game: %1 FPS (Unlocked) Гра: %1 FPS (Необмежено) - + Game: %1 FPS Гра: %1 FPS - + Frame: %1 ms Кадр: %1 мс - + GPU NORMAL ГП НОРМАЛЬНО - + GPU HIGH ГП ВИСОКО - + GPU EXTREME ГП ЕКСТРИМ - + GPU ERROR ГП ПОМИЛКА - + DOCKED В ДОК-СТАНЦІЇ - + HANDHELD ПОРТАТИВНИЙ - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST НАЙБЛИЖЧІЙ - - + + BILINEAR БІЛІНІЙНИЙ - + BICUBIC БІКУБІЧНИЙ - + GAUSSIAN ГАУС - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA БЕЗ ЗГЛАДЖУВАННЯ - + FXAA FXAA - + SMAA SMAA - + + VOLUME: MUTE + ГУЧНІСТЬ: ЗАГЛУШЕНА + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + ГУЧНІСТЬ: %1% + + + Confirm Key Rederivation Підтвердіть перерахунок ключа - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5463,37 +5511,37 @@ This will delete your autogenerated key files and re-run the key derivation modu Це видалить ваші автоматично згенеровані файли ключів і повторно запустить модуль розрахунку ключів. - + Missing fuses Відсутні запобіжники - + - Missing BOOT0 - Відсутній BOOT0 - + - Missing BCPKG2-1-Normal-Main - Відсутній BCPKG2-1-Normal-Main - + - Missing PRODINFO - Відсутній PRODINFO - + Derivation Components Missing Компоненти розрахунку відсутні - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Ключі шифрування відсутні.<br>Будь ласка, дотримуйтесь <a href='https://yuzu-emu.org/help/quickstart/'>короткого керівництва користувача yuzu</a>, щоб отримати всі ваші ключі, прошивку та ігри<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5502,39 +5550,39 @@ on your system's performance. від продуктивності вашої системи. - + Deriving Keys Отримання ключів - + Select RomFS Dump Target Оберіть ціль для дампа RomFS - + Please select which RomFS you would like to dump. Будь ласка, виберіть, який RomFS ви хочете здампити. - + Are you sure you want to close yuzu? Ви впевнені, що хочете закрити yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Ви впевнені, що хочете зупинити емуляцію? Будь-який незбережений прогрес буде втрачено. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5546,44 +5594,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGL недоступний! - + OpenGL shared contexts are not supported. Загальні контексти OpenGL не підтримуються. - + yuzu has not been compiled with OpenGL support. yuzu не було зібрано з підтримкою OpenGL. - - + + Error while initializing OpenGL! Помилка під час ініціалізації OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Ваш ГП може не підтримувати OpenGL, або у вас встановлено застарілий графічний драйвер. - + Error while initializing OpenGL 4.6! Помилка під час ініціалізації OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Ваш ГП може не підтримувати OpenGL 4.6, або у вас встановлено застарілий графічний драйвер.<br><br>Рендерер GL:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Ваш ГП може не підтримувати одне або кілька необхідних розширень OpenGL. Будь ласка, переконайтеся в тому, що у вас встановлено останній графічний драйвер.<br><br>Рендерер GL:<br>%1<br><br>Розширення, що не підтримуються:<br>%2 @@ -5823,7 +5871,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list Натисніть двічі, щоб додати нову папку до списку ігор @@ -6169,51 +6217,56 @@ Debug Message: + Hide Empty Rooms + Приховати порожні кімнати + + + Hide Full Rooms Приховати повні кімнати - + Refresh Lobby Оновити фойє - + Password Required to Join Для входу необхідний пароль - + Password: Пароль: - + Players Гравці - + Room Name Назва кімнати - + Preferred Game Переважна гра - + Host Хост - + Refreshing Оновлення - + Refresh List Оновити список @@ -6824,7 +6877,7 @@ p, li { white-space: pre-wrap; } - + [not set] [не задано] @@ -6839,10 +6892,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Ось %1%2 @@ -6856,9 +6909,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [невідомо] @@ -7023,15 +7076,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [неприпустимо] - - %1%2Hat %3 %1%2Напр. %3 @@ -7039,35 +7090,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2Ось %3 - + %1%2Axis %3,%4,%5 %1%2Ось %3,%4,%5 - + %1%2Motion %3 %1%2Рух %3 - - %1%2Button %3 %1%2Кнопка %3 - + [unused] [не використаний] @@ -7094,12 +7143,12 @@ p, li { white-space: pre-wrap; } Stick L - + Лівий стік Stick R - + Правий стік @@ -7154,9 +7203,21 @@ p, li { white-space: pre-wrap; } Додаткова - - %1%2%3 - %1%2%3 + + %1%2%3%4 + %1%2%3%4 + + + + + %1%2%3Hat %4 + %1%2%3Напр. %4 + + + + + %1%2%3Button %4 + %1%2%3Кнопка %4 diff --git a/dist/languages/zh_CN.ts b/dist/languages/zh_CN.ts index 6fc0ade17..4a9fe2013 100644 --- a/dist/languages/zh_CN.ts +++ b/dist/languages/zh_CN.ts @@ -1635,12 +1635,12 @@ This would ban both their forum username and their IP address. Use global FSR Sharpness - 启用全局 FSR 锐化 + 使用全局 FSR 锐化度 Set FSR Sharpness - 设置 FSR 锐化 + 设置 FSR 锐化度 @@ -1729,76 +1729,86 @@ This would ban both their forum username and their IP address. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + 启用异步 ASTC 纹理解码，可能减少加载时的卡顿。实验性功能。 + + + + Decode ASTC textures asynchronously (Hack) + 异步 ASTC 纹理解码 (不稳定) + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. 启用异步着色器编译，这可能会减少着色器卡顿。实验性功能。 - + Use asynchronous shader building (Hack) 启用异步着色器构建 (不稳定) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. 启用快速 GPU 时钟。此选项将强制大多数游戏以其最高分辨率运行。 - + Use Fast GPU Time (Hack) 启用快速 GPU 时钟 (不稳定) - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. 启用悲观缓冲区刷新。此选项将强制刷新未修改的缓冲区，可能会降低性能。 - + Use pessimistic buffer flushes (Hack) 启用悲观缓冲区刷新 (不稳定) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. 启用 GPU 供应商专用的管线缓存。在 Vulkan 驱动程序内部不存储管线缓存的情况下，此选项可显著提高着色器加载速度。 - + Use Vulkan pipeline cache 启用 Vulkan 管线缓存 - + Anisotropic Filtering: 各向异性过滤： - + Automatic 自动 - + Default 系统默认 - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2186,7 +2196,7 @@ This would ban both their forum username and their IP address. - + Configure 设置 @@ -2213,6 +2223,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu 需要重启 yuzu @@ -2237,22 +2248,27 @@ This would ban both their forum username and their IP address. 启用 JoyCon 直接驱动 - + + Enable direct Pro Controller driver [EXPERIMENTAL] + 启用 Pro Controller 直接驱动 [实验性] + + + Enable mouse panning 启用鼠标平移 - + Mouse sensitivity 鼠标灵敏度 - + % % - + Motion / Touch 体感/触摸 @@ -2364,7 +2380,7 @@ This would ban both their forum username and their IP address. - + Left Stick 左摇杆 @@ -2458,14 +2474,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2484,7 +2500,7 @@ This would ban both their forum username and their IP address. - + Plus ＋ @@ -2497,15 +2513,15 @@ This would ban both their forum username and their IP address. - + R R - + ZR ZR @@ -2562,236 +2578,241 @@ This would ban both their forum username and their IP address. - + Right Stick 右摇杆 - - - - + + + + Clear 清除 - - - - - + + + + + [not set] [未设置] - - + + Invert button - 反转按钮 + 反转按键 - - + + Toggle button - 切换按键 + 切换键 - - + + Turbo button + 连发键 + + + + Invert axis 体感方向倒置 - - - + + + Set threshold 阈值设定 - - + + Choose a value between 0% and 100% 选择一个介于 0% 和 100% 之间的值 - + Toggle axis 切换轴 - + Set gyro threshold 陀螺仪阈值设定 - + Map Analog Stick 映射摇杆 - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. 在按下确定后，首先水平移动你的手柄，然后垂直移动它。 如果要使体感方向倒置，首先垂直移动你的手柄，然后水平移动它。 - + Center axis 中心轴 - - + + Deadzone: %1% 摇杆死区：%1% - - + + Modifier Range: %1% 摇杆灵敏度：%1% - - + + Pro Controller Pro Controller - + Dual Joycons 双 Joycons 手柄 - + Left Joycon 左 Joycon 手柄 - + Right Joycon 右 Joycon 手柄 - + Handheld 掌机模式 - + GameCube Controller GameCube 控制器 - + Poke Ball Plus 精灵球 PLUS - + NES Controller NES 控制器 - + SNES Controller SNES 控制器 - + N64 Controller N64 控制器 - + Sega Genesis 世嘉创世纪 - + Start / Pause 开始 / 暂停 - + Z Z - + Control Stick 控制摇杆 - + C-Stick C 摇杆 - + Shake! 摇动！ - + [waiting] [等待中] - + New Profile 新建自定义设置 - + Enter a profile name: 输入配置文件名称： - - + + Create Input Profile 新建输入配置文件 - + The given profile name is not valid! 输入的配置文件名称无效！ - + Failed to create the input profile "%1" 新建输入配置文件 "%1" 失败 - + Delete Input Profile 删除输入配置文件 - + Failed to delete the input profile "%1" 删除输入配置文件 "%1" 失败 - + Load Input Profile 加载输入配置文件 - + Failed to load the input profile "%1" 加载输入配置文件 "%1" 失败 - + Save Input Profile 保存输入配置文件 - + Failed to save the input profile "%1" 保存输入配置文件 "%1" 失败 @@ -4568,916 +4589,937 @@ Drag points to change position, or double-click table cells to edit values.Vulkan 初始化失败。<br><br>点击<a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>这里</a>获取此问题的相关信息。 - + Loading Web Applet... 正在加载 Web 应用程序... - - + + Disable Web Applet 禁用 Web 应用程序 - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) 禁用 Web 应用程序可能会发生未知的行为，且只能在《超级马里奥 3D 全明星》中使用。您确定要禁用 Web 应用程序吗？ (您可以在调试选项中重新启用它。) - + The amount of shaders currently being built 当前正在构建的着色器数量 - + The current selected resolution scaling multiplier. 当前选定的分辨率缩放比例。 - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. 当前的模拟速度。高于或低于 100% 的值表示运行速度比实际的 Switch 更快或更慢。 - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. 游戏当前运行的帧率。这将因游戏和场景的不同而有所变化。 - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. 在不计算速度限制和垂直同步的情况下，模拟一个 Switch 帧的实际时间。若要进行全速模拟，这个数值不应超过 16.67 毫秒。 - + &Clear Recent Files 清除最近文件 (&C) - + + Emulated mouse is enabled + 已启用模拟鼠标 + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + 实体鼠标输入与鼠标平移不兼容。请在高级输入设置中禁用模拟鼠标以使用鼠标平移。 + + + &Continue 继续 (&C) - + &Pause 暂停 (&P) - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu 正在运行中 - + Warning Outdated Game Format 过时游戏格式警告 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. 目前使用的游戏为解体的 ROM 目录格式，这是一种过时的格式，已被其他格式替代，如 NCA，NAX，XCI 或 NSP。解体的 ROM 目录缺少图标、元数据和更新支持。<br><br>有关 yuzu 支持的各种 Switch 格式的说明，<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>请查看我们的 wiki</a>。此消息将不会再次出现。 - - + + Error while loading ROM! 加载 ROM 时出错！ - + The ROM format is not supported. 该 ROM 格式不受支持。 - + An error occurred initializing the video core. 初始化视频核心时发生错误 - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu 在运行视频核心时发生错误。这可能是由 GPU 驱动程序过旧造成的。有关详细信息，请参阅日志文件。关于日志文件的更多信息，请参考以下页面：<a href='https://yuzu-emu.org/help/reference/log-files/'>如何上传日志文件</a>。 - + Error while loading ROM! %1 %1 signifies a numeric error code. 加载 ROM 时出错！ %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>请参考<a href='https://yuzu-emu.org/help/quickstart/'>yuzu 快速导航</a>以获取相关文件。<br>您可以参考 yuzu 的 wiki 页面</a>或 Discord 社区</a>以获得帮助。 - + An unknown error occurred. Please see the log for more details. 发生了未知错误。请查看日志了解详情。 - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... 正在关闭… - + Save Data 保存数据 - + Mod Data Mod 数据 - + Error Opening %1 Folder 打开 %1 文件夹时出错 - - + + Folder does not exist! 文件夹不存在！ - + Error Opening Transferable Shader Cache 打开可转移着色器缓存时出错 - + Failed to create the shader cache directory for this title. 为该游戏创建着色器缓存目录时失败。 - + Error Removing Contents 删除内容时出错 - + Error Removing Update 删除更新时出错 - + Error Removing DLC 删除 DLC 时出错 - + Remove Installed Game Contents? 删除已安装的游戏内容？ - + Remove Installed Game Update? 删除已安装的游戏更新？ - + Remove Installed Game DLC? 删除已安装的游戏 DLC 内容？ - + Remove Entry 删除项目 - - - - - - + + + + + + Successfully Removed 删除成功 - + Successfully removed the installed base game. 成功删除已安装的游戏。 - + The base game is not installed in the NAND and cannot be removed. 该游戏未安装于 NAND 中，无法删除。 - + Successfully removed the installed update. 成功删除已安装的游戏更新。 - + There is no update installed for this title. 这个游戏没有任何已安装的更新。 - + There are no DLC installed for this title. 这个游戏没有任何已安装的 DLC 。 - + Successfully removed %1 installed DLC. 成功删除游戏 %1 安装的 DLC 。 - + Delete OpenGL Transferable Shader Cache? 删除 OpenGL 模式的着色器缓存？ - + Delete Vulkan Transferable Shader Cache? 删除 Vulkan 模式的着色器缓存？ - + Delete All Transferable Shader Caches? 删除所有的着色器缓存？ - + Remove Custom Game Configuration? 移除自定义游戏设置？ - + Remove File 删除文件 - - + + Error Removing Transferable Shader Cache 删除着色器缓存时出错 - - + + A shader cache for this title does not exist. 这个游戏的着色器缓存不存在。 - + Successfully removed the transferable shader cache. 成功删除着色器缓存。 - + Failed to remove the transferable shader cache. 删除着色器缓存失败。 - + Error Removing Vulkan Driver Pipeline Cache 删除 Vulkan 驱动程序管线缓存时出错 - + Failed to remove the driver pipeline cache. 删除驱动程序管线缓存失败。 - - + + Error Removing Transferable Shader Caches 删除着色器缓存时出错 - + Successfully removed the transferable shader caches. 着色器缓存删除成功。 - + Failed to remove the transferable shader cache directory. 删除着色器缓存目录失败。 - - + + Error Removing Custom Configuration 移除自定义游戏设置时出错 - + A custom configuration for this title does not exist. 这个游戏的自定义设置不存在。 - + Successfully removed the custom game configuration. 成功移除自定义游戏设置。 - + Failed to remove the custom game configuration. 移除自定义游戏设置失败。 - - + + RomFS Extraction Failed! RomFS 提取失败！ - + There was an error copying the RomFS files or the user cancelled the operation. 复制 RomFS 文件时出错，或用户取消了操作。 - + Full 完整 - + Skeleton 框架 - + Select RomFS Dump Mode 选择 RomFS 转储模式 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. 请选择 RomFS 转储的方式。<br>“完整” 会将所有文件复制到新目录中，而<br>“框架” 只会创建目录结构。 - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 没有足够的空间用于提取 RomFS。请保持足够的空间或于模拟—>设置—>系统—>文件系统—>转储根目录中选择一个其他目录。 - + Extracting RomFS... 正在提取 RomFS... - - + + Cancel 取消 - + RomFS Extraction Succeeded! RomFS 提取成功！ - + The operation completed successfully. 操作成功完成。 - - - - - + + + + + Create Shortcut 创建快捷方式 - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? 这将为当前的游戏创建快捷方式。但在其更新后，快捷方式可能无法正常工作。是否继续？ - + Cannot create shortcut on desktop. Path "%1" does not exist. 无法在桌面创建快捷方式。路径“ %1 ”不存在。 - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. 无法在应用程序菜单中创建快捷方式。路径“ %1 ”不存在且无法被创建。 - + Create Icon 创建图标 - + Cannot create icon file. Path "%1" does not exist and cannot be created. 无法创建图标文件。路径“ %1 ”不存在且无法被创建。 - + Start %1 with the yuzu Emulator 使用 yuzu 启动 %1 - + Failed to create a shortcut at %1 在 %1 处创建快捷方式时失败 - + Successfully created a shortcut to %1 成功地在 %1 处创建快捷方式 - + Error Opening %1 打开 %1 时出错 - + Select Directory 选择目录 - + Properties 属性 - + The game properties could not be loaded. 无法加载该游戏的属性信息。 - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch 可执行文件 (%1);;所有文件 (*.*) - + Load File 加载文件 - + Open Extracted ROM Directory 打开提取的 ROM 目录 - + Invalid Directory Selected 选择的目录无效 - + The directory you have selected does not contain a 'main' file. 选择的目录不包含 “main” 文件。 - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) 可安装 Switch 文件 (*.nca *.nsp *.xci);;任天堂内容档案 (*.nca);;任天堂应用包 (*.nsp);;NX 卡带镜像 (*.xci) - + Install Files 安装文件 - + %n file(s) remaining 剩余 %n 个文件 - + Installing file "%1"... 正在安装文件 "%1"... - - + + Install Results 安装结果 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 为了避免可能存在的冲突，我们不建议将游戏本体安装到 NAND 中。 此功能仅用于安装游戏更新和 DLC 。 - + %n file(s) were newly installed 最近安装了 %n 个文件 - + %n file(s) were overwritten %n 个文件被覆盖 - + %n file(s) failed to install %n 个文件安装失败 - + System Application 系统应用 - + System Archive 系统档案 - + System Application Update 系统应用更新 - + Firmware Package (Type A) 固件包 (A型) - + Firmware Package (Type B) 固件包 (B型) - + Game 游戏 - + Game Update 游戏更新 - + Game DLC 游戏 DLC - + Delta Title 差量程序 - + Select NCA Install Type... 选择 NCA 安装类型... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) 请选择此 NCA 的程序类型： （在大多数情况下，选择默认的“游戏”即可。） - + Failed to Install 安装失败 - + The title type you selected for the NCA is invalid. 选择的 NCA 程序类型无效。 - + File not found 找不到文件 - + File "%1" not found 文件 "%1" 未找到 - + OK 确定 - - + + Hardware requirements not met 硬件不满足要求 - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. 您的系统不满足运行 yuzu 的推荐配置。兼容性报告已被禁用。 - + Missing yuzu Account 未设置 yuzu 账户 - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. 要提交游戏兼容性测试用例，您必须设置您的 yuzu 帐户。<br><br/>要设置您的 yuzu 帐户，请转到模拟 &gt; 设置 &gt; 网络。 - + Error opening URL 打开 URL 时出错 - + Unable to open the URL "%1". 无法打开 URL : "%1" 。 - + TAS Recording TAS 录制中 - + Overwrite file of player 1? 覆盖玩家 1 的文件？ - + Invalid config detected 检测到无效配置 - + Handheld controller can't be used on docked mode. Pro controller will be selected. 掌机手柄无法在主机模式中使用。将会选择 Pro controller。 - - + + Amiibo Amiibo - - + + The current amiibo has been removed 当前的 Amiibo 已被移除。 - + Error 错误 - - + + The current game is not looking for amiibos 当前游戏并没有在寻找 Amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo 文件 (%1);; 全部文件 (*.*) - + Load Amiibo 加载 Amiibo - + Error loading Amiibo data 加载 Amiibo 数据时出错 - + The selected file is not a valid amiibo 选择的文件并不是有效的 amiibo - + The selected file is already on use 选择的文件已在使用中 - + An unknown error occurred 发生了未知错误 - + Capture Screenshot 捕获截图 - + PNG Image (*.png) PNG 图像 (*.png) - + TAS state: Running %1/%2 TAS 状态：正在运行 %1/%2 - + TAS state: Recording %1 TAS 状态：正在录制 %1 - + TAS state: Idle %1/%2 TAS 状态：空闲 %1/%2 - + TAS State: Invalid TAS 状态：无效 - + &Stop Running 停止运行 (&S) - + &Start 开始 (&S) - + Stop R&ecording 停止录制 (&E) - + R&ecord 录制 (&E) - + Building: %n shader(s) 正在编译 %n 个着色器文件 - + Scale: %1x %1 is the resolution scaling factor 缩放比例: %1x - + Speed: %1% / %2% 速度: %1% / %2% - + Speed: %1% 速度: %1% - + Game: %1 FPS (Unlocked) FPS: %1 (未锁定) - + Game: %1 FPS FPS: %1 - + Frame: %1 ms 帧延迟: %1 毫秒 - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HIGH - + GPU EXTREME GPU EXTREME - + GPU ERROR GPU ERROR - + DOCKED 主机模式 - + HANDHELD 掌机模式 - + OPENGL OPENGL - + VULKAN VULKAN - + NULL 无 - + NEAREST 邻近取样 - - + + BILINEAR 双线性过滤 - + BICUBIC 双三线过滤 - + GAUSSIAN 高斯模糊 - + SCALEFORCE 强制缩放 - + FSR FSR - - + + NO AA 抗锯齿关 - + FXAA FXAA - + SMAA SMAA - + + VOLUME: MUTE + 音量: 静音 + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + 音量: %1% + + + Confirm Key Rederivation 确认重新生成密钥 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5493,37 +5535,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 这将删除您自动生成的密钥文件并重新运行密钥生成模块。 - + Missing fuses 项目丢失 - + - Missing BOOT0 - 丢失 BOOT0 - + - Missing BCPKG2-1-Normal-Main - 丢失 BCPKG2-1-Normal-Main - + - Missing PRODINFO - 丢失 PRODINFO - + Derivation Components Missing 组件丢失 - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 密钥缺失。<br>请查看<a href='https://yuzu-emu.org/help/quickstart/'>yuzu 快速导航</a>以获得你的密钥、固件和游戏。<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5532,39 +5574,39 @@ on your system's performance. 您的系统性能。 - + Deriving Keys 生成密钥 - + Select RomFS Dump Target 选择 RomFS 转储目标 - + Please select which RomFS you would like to dump. 请选择希望转储的 RomFS。 - + Are you sure you want to close yuzu? 您确定要关闭 yuzu 吗？ - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. 您确定要停止模拟吗？未保存的进度将会丢失。 - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5576,44 +5618,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGL 模式不可用！ - + OpenGL shared contexts are not supported. 不支持 OpenGL 共享上下文。 - + yuzu has not been compiled with OpenGL support. yuzu 没有使用 OpenGL 进行编译。 - - + + Error while initializing OpenGL! 初始化 OpenGL 时出错！ - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. 您的 GPU 可能不支持 OpenGL ，或者您没有安装最新的显卡驱动。 - + Error while initializing OpenGL 4.6! 初始化 OpenGL 4.6 时出错！ - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 您的 GPU 可能不支持 OpenGL 4.6 ，或者您没有安装最新的显卡驱动。<br><br>GL 渲染器：<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 您的 GPU 可能不支持某些必需的 OpenGL 扩展。请确保您已经安装最新的显卡驱动。<br><br>GL 渲染器：<br>%1<br><br>不支持的扩展：<br>%2 @@ -5853,7 +5895,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list 双击添加新的游戏文件夹 @@ -6199,51 +6241,56 @@ Debug Message: + Hide Empty Rooms + 隐藏空房间 + + + Hide Full Rooms 隐藏满员的房间 - + Refresh Lobby 刷新游戏大厅 - + Password Required to Join 需要密码 - + Password: 密码: - + Players 玩家数 - + Room Name 房间名称 - + Preferred Game 首选游戏 - + Host 房主 - + Refreshing 刷新中 - + Refresh List 刷新列表 @@ -6854,7 +6901,7 @@ p, li { white-space: pre-wrap; } - + [not set] [未设置] @@ -6869,10 +6916,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 轴 %1%2 @@ -6886,9 +6933,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [未知] @@ -7053,15 +7100,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [无效] - - %1%2Hat %3 %1%2Hat 控制器 %3 @@ -7069,35 +7114,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2轴 %3 - + %1%2Axis %3,%4,%5 %1%2轴 %3,%4,%5 - + %1%2Motion %3 %1%2体感 %3 - - %1%2Button %3 %1%2按键 %3 - + [unused] [未使用] @@ -7184,9 +7227,21 @@ p, li { white-space: pre-wrap; } 额外按键 - - %1%2%3 - %1%2%3 + + %1%2%3%4 + %1%2%3%4 + + + + + %1%2%3Hat %4 + %1%2%3 控制器 %4 + + + + + %1%2%3Button %4 + %1%2%3 按键 %4 diff --git a/dist/languages/zh_TW.ts b/dist/languages/zh_TW.ts index 364cb8556..46974e448 100644 --- a/dist/languages/zh_TW.ts +++ b/dist/languages/zh_TW.ts @@ -1731,76 +1731,86 @@ This would ban both their forum username and their IP address. + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + 启用异步 ASTC 纹理解码，可能减少加载时的卡顿。实验性功能。 + + + + Decode ASTC textures asynchronously (Hack) + 异步 ASTC 纹理解码 (不稳定) + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. 啟用非同步著色器編譯，可能會減少著色器不流暢的問題。實驗性功能。 - + Use asynchronous shader building (Hack) 使用非同步著色器編譯（不穩定） - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. 啟用快速 GPU 時間。此選項將強制大多數遊戲以其最高解析度執行。 - + Use Fast GPU Time (Hack) 使用快速 GPU 時間（不穩定） - + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. 启用悲观缓冲区刷新。此选项将强制刷新未修改的缓冲区，可能会降低性能。 - + Use pessimistic buffer flushes (Hack) 启用悲观缓冲区刷新 (不稳定) - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. 启用 GPU 专用的管线缓存。在 Vulkan 驱动程序内部不存储管线缓存的情况下，此选项可显著提高着色器加载速度。 - + Use Vulkan pipeline cache 启用 Vulkan 管线缓存 - + Anisotropic Filtering: 各向異性過濾： - + Automatic 自動 - + Default 預設 - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -2188,7 +2198,7 @@ This would ban both their forum username and their IP address. - + Configure 設定 @@ -2215,6 +2225,7 @@ This would ban both their forum username and their IP address. + Requires restarting yuzu 需要重新啟動 yuzu @@ -2239,22 +2250,27 @@ This would ban both their forum username and their IP address. 启用 JoyCon 直接驱动 - + + Enable direct Pro Controller driver [EXPERIMENTAL] + 启用 Pro Controller 直接驱动 [实验性] + + + Enable mouse panning 啟用滑鼠平移 - + Mouse sensitivity 滑鼠靈敏度 - + % % - + Motion / Touch 體感/觸控 @@ -2366,7 +2382,7 @@ This would ban both their forum username and their IP address. - + Left Stick 左搖桿 @@ -2460,14 +2476,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2486,7 +2502,7 @@ This would ban both their forum username and their IP address. - + Plus ＋ @@ -2499,15 +2515,15 @@ This would ban both their forum username and their IP address. - + R R - + ZR ZR @@ -2564,236 +2580,241 @@ This would ban both their forum username and their IP address. - + Right Stick 右搖桿 - - - - + + + + Clear 清除 - - - - - + + + + + [not set] [未設定] - - + + Invert button 無效按鈕 - - + + Toggle button 切換按鍵 - - + + Turbo button + 连发键 + + + + Invert axis 方向反轉 - - - + + + Set threshold 設定閾值 - - + + Choose a value between 0% and 100% 選擇介於 0% 和 100% 之間的值 - + Toggle axis 切换轴 - + Set gyro threshold 陀螺仪阈值设定 - + Map Analog Stick 搖桿映射 - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. 按下確定後，先水平再上下移動您的搖桿。 要反轉方向，則先上下再水平移動您的搖桿。 - + Center axis 中心轴 - - + + Deadzone: %1% 無感帶：%1% - - + + Modifier Range: %1% 輕推靈敏度：%1% - - + + Pro Controller Pro 手把 - + Dual Joycons 雙 Joycon 手把 - + Left Joycon 左 Joycon 手把 - + Right Joycon 右 Joycon 手把 - + Handheld 掌機模式 - + GameCube Controller GameCube 手把 - + Poke Ball Plus 精靈球 PLUS - + NES Controller NES 控制器 - + SNES Controller SNES 控制器 - + N64 Controller N64 控制器 - + Sega Genesis Mega Drive - + Start / Pause 開始 / 暫停 - + Z Z - + Control Stick 控制搖桿 - + C-Stick C 搖桿 - + Shake! 搖動！ - + [waiting] [等待中] - + New Profile 新增設定檔 - + Enter a profile name: 輸入設定檔名稱： - - + + Create Input Profile 建立輸入設定檔 - + The given profile name is not valid! 輸入的設定檔名稱無效！ - + Failed to create the input profile "%1" 建立輸入設定檔「%1」失敗 - + Delete Input Profile 刪除輸入設定檔 - + Failed to delete the input profile "%1" 刪除輸入設定檔「%1」失敗 - + Load Input Profile 載入輸入設定檔 - + Failed to load the input profile "%1" 載入輸入設定檔「%1」失敗 - + Save Input Profile 儲存輸入設定檔 - + Failed to save the input profile "%1" 儲存輸入設定檔「%1」失敗 @@ -4570,915 +4591,936 @@ Drag points to change position, or double-click table cells to edit values.Vulkan 初始化失败。<br><br>点击<a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>这里</a>获取此问题的相关信息。 - + Loading Web Applet... 載入 Web Applet... - - + + Disable Web Applet 停用 Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) 禁用 Web 应用程序可能会导致未知的行为，且只能在《超级马里奥 3D 全明星》中使用。您确定要禁用 Web 应用程序吗？ (您可以在调试选项中重新启用它。) - + The amount of shaders currently being built 目前正在建構的著色器數量 - + The current selected resolution scaling multiplier. 目前選擇的解析度縮放比例。 - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. 目前的模擬速度。高於或低於 100% 表示比實際 Switch 執行速度更快或更慢。 - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. 遊戲即時 FPS。會因遊戲和場景的不同而改變。 - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. 在不考慮幀數限制和垂直同步的情況下模擬一個 Switch 畫格的實際時間，若要全速模擬，此數值不得超過 16.67 毫秒。 - + &Clear Recent Files 清除最近的檔案(&C) - + + Emulated mouse is enabled + 已启用模拟鼠标 + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + 实体鼠标输入与鼠标平移不兼容。请在高级输入设置中禁用模拟鼠标以使用鼠标平移。 + + + &Continue 繼續(&C) - + &Pause &暫停 - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu 正在執行中 - + Warning Outdated Game Format 過時遊戲格式警告 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. 此遊戲為解構的 ROM 資料夾格式，這是一種過時的格式，已被其他格式取代，如 NCA、NAX、XCI、NSP。解構的 ROM 目錄缺少圖示、中繼資料和更新支援。<br><br>有關 yuzu 支援的各種 Switch 格式說明，<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>請參閱我們的 wiki </a>。此訊息將不再顯示。 - - + + Error while loading ROM! 載入 ROM 時發生錯誤！ - + The ROM format is not supported. 此 ROM 格式不支援 - + An error occurred initializing the video core. 初始化視訊核心時發生錯誤 - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu 在執行視訊核心時發生錯誤。 這可能是 GPU 驅動程序過舊造成的。 詳細資訊請查閱日誌檔案。 關於日誌檔案的更多資訊，請參考以下頁面：<a href='https://yuzu-emu.org/help/reference/log-files/'>如何上傳日誌檔案</a>。 - + Error while loading ROM! %1 %1 signifies a numeric error code. 載入 ROM 時發生錯誤！%1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>請參閱 <a href='https://yuzu-emu.org/help/quickstart/'>yuzu 快速指引</a>以重新傾印檔案。<br>您可以前往 yuzu 的 wiki</a> 或 Discord 社群</a>以獲得幫助。 - + An unknown error occurred. Please see the log for more details. 發生未知錯誤，請檢視紀錄了解細節。 - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... 正在关闭… - + Save Data 儲存資料 - + Mod Data 模組資料 - + Error Opening %1 Folder 開啟資料夾 %1 時發生錯誤 - - + + Folder does not exist! 資料夾不存在 - + Error Opening Transferable Shader Cache 開啟通用著色器快取位置時發生錯誤 - + Failed to create the shader cache directory for this title. 無法新增此遊戲的著色器快取資料夾。 - + Error Removing Contents 删除内容时出错 - + Error Removing Update 删除更新时出错 - + Error Removing DLC 删除 DLC 时出错 - + Remove Installed Game Contents? 删除已安装的游戏内容？ - + Remove Installed Game Update? 删除已安装的游戏更新？ - + Remove Installed Game DLC? 删除已安装的游戏 DLC 内容？ - + Remove Entry 移除項目 - - - - - - + + + + + + Successfully Removed 移除成功 - + Successfully removed the installed base game. 成功移除已安裝的遊戲。 - + The base game is not installed in the NAND and cannot be removed. 此遊戲並非安裝在內部儲存空間，因此無法移除。 - + Successfully removed the installed update. 成功移除已安裝的遊戲更新。 - + There is no update installed for this title. 此遊戲沒有已安裝的更新。 - + There are no DLC installed for this title. 此遊戲沒有已安裝的 DLC。 - + Successfully removed %1 installed DLC. 成功移除遊戲 %1 已安裝的 DLC。 - + Delete OpenGL Transferable Shader Cache? 刪除 OpenGL 模式的著色器快取？ - + Delete Vulkan Transferable Shader Cache? 刪除 Vulkan 模式的著色器快取？ - + Delete All Transferable Shader Caches? 刪除所有的著色器快取？ - + Remove Custom Game Configuration? 移除額外遊戲設定？ - + Remove File 刪除檔案 - - + + Error Removing Transferable Shader Cache 刪除通用著色器快取時發生錯誤 - - + + A shader cache for this title does not exist. 此遊戲沒有著色器快取 - + Successfully removed the transferable shader cache. 成功刪除著色器快取。 - + Failed to remove the transferable shader cache. 刪除通用著色器快取失敗。 - + Error Removing Vulkan Driver Pipeline Cache 移除 Vulkan 驱动程序管线缓存时出错 - + Failed to remove the driver pipeline cache. 删除驱动程序管线缓存失败。 - - + + Error Removing Transferable Shader Caches 刪除通用著色器快取時發生錯誤 - + Successfully removed the transferable shader caches. 成功刪除通用著色器快取。 - + Failed to remove the transferable shader cache directory. 無法刪除著色器快取資料夾。 - - + + Error Removing Custom Configuration 移除額外遊戲設定時發生錯誤 - + A custom configuration for this title does not exist. 此遊戲沒有額外設定。 - + Successfully removed the custom game configuration. 成功移除額外遊戲設定。 - + Failed to remove the custom game configuration. 移除額外遊戲設定失敗。 - - + + RomFS Extraction Failed! RomFS 抽取失敗！ - + There was an error copying the RomFS files or the user cancelled the operation. 複製 RomFS 檔案時發生錯誤或使用者取消動作。 - + Full 全部 - + Skeleton 部分 - + Select RomFS Dump Mode 選擇RomFS傾印模式 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. 請選擇如何傾印 RomFS。<br>「全部」會複製所有檔案到新資料夾中，而<br>「部分」只會建立資料夾結構。 - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 沒有足夠的空間用於抽取 RomFS。請確保有足夠的空間或於模擬 > 設定 >系統 >檔案系統 > 傾印根目錄中選擇其他資料夾。 - + Extracting RomFS... 抽取 RomFS 中... - - + + Cancel 取消 - + RomFS Extraction Succeeded! RomFS 抽取完成！ - + The operation completed successfully. 動作已成功完成 - - - - - + + + + + Create Shortcut 创建快捷方式 - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? 这将为当前的软件镜像创建快捷方式。但在其更新后，快捷方式可能无法正常使用。是否继续？ - + Cannot create shortcut on desktop. Path "%1" does not exist. 无法在桌面创建快捷方式。路径“ %1 ”不存在。 - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. 无法在应用程序菜单中创建快捷方式。路径“ %1 ”不存在且无法被创建。 - + Create Icon 创建图标 - + Cannot create icon file. Path "%1" does not exist and cannot be created. 无法创建图标文件。路径“ %1 ”不存在且无法被创建。 - + Start %1 with the yuzu Emulator 使用 yuzu 启动 %1 - + Failed to create a shortcut at %1 在 %1 处创建快捷方式时失败 - + Successfully created a shortcut to %1 成功地在 %1 处创建快捷方式 - + Error Opening %1 開啟 %1 時發生錯誤 - + Select Directory 選擇資料夾 - + Properties 屬性 - + The game properties could not be loaded. 無法載入遊戲屬性 - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch 執行檔 (%1);;所有檔案 (*.*) - + Load File 開啟檔案 - + Open Extracted ROM Directory 開啟已抽取的 ROM 資料夾 - + Invalid Directory Selected 選擇的資料夾無效 - + The directory you have selected does not contain a 'main' file. 選擇的資料夾未包含「main」檔案。 - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) 可安装的 Switch 檔案 (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX 卡帶映像 (*.xci) - + Install Files 安裝檔案 - + %n file(s) remaining 剩餘 %n 個檔案 - + Installing file "%1"... 正在安裝檔案「%1」... - - + + Install Results 安裝結果 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 為了避免潛在的衝突，不建議將遊戲本體安裝至內部儲存空間。 此功能僅用於安裝遊戲更新和 DLC。 - + %n file(s) were newly installed 最近安裝了 %n 個檔案 - + %n file(s) were overwritten %n 個檔案被取代 - + %n file(s) failed to install %n 個檔案安裝失敗 - + System Application 系統應用程式 - + System Archive 系統檔案 - + System Application Update 系統應用程式更新 - + Firmware Package (Type A) 韌體包(A型) - + Firmware Package (Type B) 韌體包(B型) - + Game 遊戲 - + Game Update 遊戲更新 - + Game DLC 遊戲 DLC - + Delta Title Delta Title - + Select NCA Install Type... 選擇 NCA 安裝類型... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) 請選擇此 NCA 的安裝類型： （在多數情況下，選擇預設的「遊戲」即可。） - + Failed to Install 安裝失敗 - + The title type you selected for the NCA is invalid. 選擇的 NCA 安裝類型無效。 - + File not found 找不到檔案 - + File "%1" not found 找不到「%1」檔案 - + OK 確定 - - + + Hardware requirements not met 硬件不满足要求 - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. 您的系统不满足运行 yuzu 推荐的推荐配置。兼容性报告已被禁用。 - + Missing yuzu Account 未設定 yuzu 帳號 - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. 為了上傳相容性測試結果，您必須登入 yuzu 帳號。<br><br/>欲登入 yuzu 帳號請至模擬 &gt; 設定 &gt; 網路。 - + Error opening URL 開啟 URL 時發生錯誤 - + Unable to open the URL "%1". 無法開啟 URL：「%1」。 - + TAS Recording TAS 錄製 - + Overwrite file of player 1? 覆寫玩家 1 的檔案？ - + Invalid config detected 偵測到無效設定 - + Handheld controller can't be used on docked mode. Pro controller will be selected. 掌機手把無法在主機模式中使用。將會選擇 Pro 手把。 - - + + Amiibo Amiibo - - + + The current amiibo has been removed 当前的 Amiibo 已被移除。 - + Error 错误 - - + + The current game is not looking for amiibos 当前游戏并没有在寻找 Amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo 檔案 (%1);; 所有檔案 (*.*) - + Load Amiibo 開啟 Amiibo - + Error loading Amiibo data 載入 Amiibo 資料時發生錯誤 - + The selected file is not a valid amiibo 选择的文件并不是有效的 amiibo - + The selected file is already on use 选择的文件已在使用中 - + An unknown error occurred 发生了未知错误 - + Capture Screenshot 截圖 - + PNG Image (*.png) PNG 圖片 (*.png) - + TAS state: Running %1/%2 TAS 狀態：正在執行 %1/%2 - + TAS state: Recording %1 TAS 狀態：正在錄製 %1 - + TAS state: Idle %1/%2 TAS 狀態：閒置 %1/%2 - + TAS State: Invalid TAS 狀態：無效 - + &Stop Running &停止執行 - + &Start 開始(&S) - + Stop R&ecording 停止錄製 - + R&ecord 錄製 (&E) - + Building: %n shader(s) 正在編譯 %n 個著色器檔案 - + Scale: %1x %1 is the resolution scaling factor 縮放比例：%1x - + Speed: %1% / %2% 速度：%1% / %2% - + Speed: %1% 速度：%1% - + Game: %1 FPS (Unlocked) 遊戲: %1 FPS（未限制） - + Game: %1 FPS 遊戲：%1 FPS - + Frame: %1 ms 畫格延遲：%1 ms - + GPU NORMAL GPU 一般效能 - + GPU HIGH GPU 高效能 - + GPU EXTREME GPU 最高效能 - + GPU ERROR GPU 錯誤 - + DOCKED 主机模式 - + HANDHELD 掌机模式 - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST 最近鄰域 - - + + BILINEAR 雙線性 - + BICUBIC 雙三次 - + GAUSSIAN 高斯 - + SCALEFORCE 強制縮放 - + FSR FSR - - + + NO AA 抗鋸齒關 - + FXAA FXAA - + SMAA SMAA - + + VOLUME: MUTE + 音量: 静音 + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + 音量: %1% + + + Confirm Key Rederivation 確認重新產生金鑰 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5494,37 +5536,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 這將刪除您自動產生的金鑰檔案並重新執行產生金鑰模組。 - + Missing fuses 遺失項目 - + - Missing BOOT0 - 遺失 BOOT0 - + - Missing BCPKG2-1-Normal-Main - 遺失 BCPKG2-1-Normal-Main - + - Missing PRODINFO - 遺失 PRODINFO - + Derivation Components Missing 遺失產生元件 - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 缺少加密金鑰。 <br>請按照<a href='https://yuzu-emu.org/help/quickstart/'>《Yuzu快速入門指南》來取得所有金鑰、韌體、遊戲<br><br><small>(%1)。 - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5533,39 +5575,39 @@ on your system's performance. 您的系統效能。 - + Deriving Keys 產生金鑰 - + Select RomFS Dump Target 選擇 RomFS 傾印目標 - + Please select which RomFS you would like to dump. 請選擇希望傾印的 RomFS。 - + Are you sure you want to close yuzu? 您確定要關閉 yuzu 嗎? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. 您確定要停止模擬嗎？未儲存的進度將會遺失。 - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5577,44 +5619,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! 無法使用 OpenGL 模式！ - + OpenGL shared contexts are not supported. 不支持 OpenGL 共享上下文。 - + yuzu has not been compiled with OpenGL support. yuzu 未以支援 OpenGL 的方式編譯。 - - + + Error while initializing OpenGL! 初始化 OpenGL 時發生錯誤！ - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. 您的 GPU 可能不支援 OpenGL，或是未安裝最新的圖形驅動程式 - + Error while initializing OpenGL 4.6! 初始化 OpenGL 4.6 時發生錯誤！ - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 您的 GPU 可能不支援 OpenGL 4.6，或是未安裝最新的圖形驅動程式<br><br>GL 渲染器：<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 您的 GPU 可能不支援某些必需的 OpenGL 功能。請確保您已安裝最新的圖形驅動程式。<br><br>GL 渲染器：<br>%1<br><br>不支援的功能：<br>%2 @@ -5854,7 +5896,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list 連點兩下以新增資料夾至遊戲清單 @@ -6199,51 +6241,56 @@ Debug Message: + Hide Empty Rooms + 隐藏空房间 + + + Hide Full Rooms 隐藏满员的房间 - + Refresh Lobby 刷新游戏大厅 - + Password Required to Join 加入此房间需要密码 - + Password: 密码: - + Players 玩家 - + Room Name 房间名称 - + Preferred Game 首选游戏 - + Host 管理 - + Refreshing 刷新中 - + Refresh List 刷新列表 @@ -6854,7 +6901,7 @@ p, li { white-space: pre-wrap; } - + [not set] [未設定] @@ -6869,10 +6916,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Axis %1%2 @@ -6886,9 +6933,9 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [未知] @@ -7053,15 +7100,13 @@ p, li { white-space: pre-wrap; } - + [invalid] [無效] - - %1%2Hat %3 %1%2Hat 控制器 %3 @@ -7069,35 +7114,33 @@ p, li { white-space: pre-wrap; } - - - + + + %1%2Axis %3 %1%2軸 %3 - + %1%2Axis %3,%4,%5 %1%2軸 %3,%4,%5 - + %1%2Motion %3 %1%2體感 %3 - - %1%2Button %3 %1%2按鈕 %3 - + [unused] [未使用] @@ -7184,9 +7227,21 @@ p, li { white-space: pre-wrap; } 額外按鍵 - - %1%2%3 - %1%2%3 + + %1%2%3%4 + %1%2%3%4 + + + + + %1%2%3Hat %4 + %1%2%3 控制器 %4 + + + + + %1%2%3Button %4 + %1%2%3 按键 %4 From 4a1aa9859844c25598c1635d760a53ca2fd5afc3 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 21 Feb 2023 12:19:12 -0500 Subject: [PATCH 0103/1181] sm:: remove unused member --- src/core/hle/service/sm/sm.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/hle/service/sm/sm.h b/src/core/hle/service/sm/sm.h index b7eeafdd6..8dbf2c767 100644 --- a/src/core/hle/service/sm/sm.h +++ b/src/core/hle/service/sm/sm.h @@ -45,7 +45,6 @@ private: ResultVal GetServiceImpl(Kernel::HLERequestContext& ctx); ServiceManager& service_manager; - bool is_initialized{}; Kernel::KernelCore& kernel; }; From 65be230fdda302b25447f2f09b06e3238bd09e79 Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 19 Feb 2023 14:42:12 -0500 Subject: [PATCH 0104/1181] service: move hle_ipc from kernel --- src/core/CMakeLists.txt | 6 +- src/core/hle/kernel/k_client_port.cpp | 1 - src/core/hle/kernel/k_client_port.h | 1 - src/core/hle/kernel/k_client_session.cpp | 1 - src/core/hle/kernel/k_port.cpp | 1 - src/core/hle/kernel/k_server_session.cpp | 11 +- src/core/hle/kernel/k_server_session.h | 12 +- src/core/hle/service/acc/acc.cpp | 68 +++--- src/core/hle/service/acc/acc.h | 38 +-- src/core/hle/service/acc/async_context.cpp | 10 +- src/core/hle/service/acc/async_context.h | 8 +- src/core/hle/service/am/am.cpp | 215 ++++++++--------- src/core/hle/service/am/am.h | 185 +++++++------- src/core/hle/service/am/applet_ae.cpp | 46 ++-- src/core/hle/service/am/applet_ae.h | 6 +- src/core/hle/service/am/applet_oe.cpp | 20 +- src/core/hle/service/am/applet_oe.h | 2 +- src/core/hle/service/aoc/aoc_u.cpp | 30 +-- src/core/hle/service/aoc/aoc_u.h | 22 +- src/core/hle/service/apm/apm_interface.cpp | 20 +- src/core/hle/service/apm/apm_interface.h | 12 +- src/core/hle/service/audio/audctl.cpp | 6 +- src/core/hle/service/audio/audctl.h | 4 +- src/core/hle/service/audio/audin_u.cpp | 32 +-- src/core/hle/service/audio/audin_u.h | 14 +- src/core/hle/service/audio/audout_u.cpp | 30 +-- src/core/hle/service/audio/audout_u.h | 8 +- src/core/hle/service/audio/audren_u.cpp | 56 ++--- src/core/hle/service/audio/audren_u.h | 14 +- src/core/hle/service/audio/hwopus.cpp | 22 +- src/core/hle/service/audio/hwopus.h | 10 +- src/core/hle/service/bcat/bcat_module.cpp | 48 ++-- src/core/hle/service/bcat/bcat_module.h | 6 +- src/core/hle/service/btdrv/btdrv.cpp | 4 +- src/core/hle/service/btm/btm.cpp | 14 +- src/core/hle/service/caps/caps_a.h | 4 - src/core/hle/service/caps/caps_c.cpp | 4 +- src/core/hle/service/caps/caps_c.h | 6 +- src/core/hle/service/caps/caps_su.cpp | 4 +- src/core/hle/service/caps/caps_su.h | 6 +- src/core/hle/service/caps/caps_u.cpp | 8 +- src/core/hle/service/caps/caps_u.h | 10 +- src/core/hle/service/es/es.cpp | 24 +- src/core/hle/service/fatal/fatal.cpp | 8 +- src/core/hle/service/fatal/fatal.h | 6 +- src/core/hle/service/fgm/fgm.cpp | 4 +- src/core/hle/service/filesystem/fsp_srv.cpp | 95 ++++---- src/core/hle/service/filesystem/fsp_srv.h | 40 +-- src/core/hle/service/friend/friend.cpp | 26 +- src/core/hle/service/friend/friend.h | 4 +- src/core/hle/service/glue/arp.cpp | 20 +- src/core/hle/service/glue/arp.h | 12 +- src/core/hle/service/glue/bgtc.cpp | 4 +- src/core/hle/service/glue/bgtc.h | 2 +- src/core/hle/service/glue/notif.cpp | 14 +- src/core/hle/service/glue/notif.h | 12 +- src/core/hle/service/hid/hid.cpp | 228 +++++++++--------- src/core/hle/service/hid/hid.h | 220 ++++++++--------- src/core/hle/service/hid/hidbus.cpp | 28 +-- src/core/hle/service/hid/hidbus.h | 26 +- src/core/hle/service/hid/irs.cpp | 38 +-- src/core/hle/service/hid/irs.h | 36 +-- src/core/hle/{kernel => service}/hle_ipc.cpp | 33 +-- src/core/hle/{kernel => service}/hle_ipc.h | 77 +++--- src/core/hle/{ => service}/ipc_helpers.h | 12 +- src/core/hle/service/jit/jit.cpp | 12 +- src/core/hle/service/lbl/lbl.cpp | 52 ++-- src/core/hle/service/ldn/ldn.cpp | 74 +++--- src/core/hle/service/ldn/ldn.h | 2 +- src/core/hle/service/ldr/ldr.cpp | 12 +- src/core/hle/service/lm/lm.cpp | 8 +- src/core/hle/service/mii/mii.cpp | 26 +- src/core/hle/service/mm/mm_u.cpp | 18 +- src/core/hle/service/mnpp/mnpp_app.cpp | 6 +- src/core/hle/service/ncm/ncm.cpp | 2 +- src/core/hle/service/nfc/mifare_user.cpp | 30 +-- src/core/hle/service/nfc/mifare_user.h | 28 +-- src/core/hle/service/nfc/nfc.cpp | 10 +- src/core/hle/service/nfc/nfc_device.cpp | 2 +- src/core/hle/service/nfc/nfc_user.cpp | 30 +-- src/core/hle/service/nfc/nfc_user.h | 28 +-- src/core/hle/service/nfp/nfp.cpp | 4 +- src/core/hle/service/nfp/nfp_device.cpp | 2 +- src/core/hle/service/nfp/nfp_user.cpp | 52 ++-- src/core/hle/service/nfp/nfp_user.h | 50 ++-- src/core/hle/service/ngct/ngct.cpp | 6 +- src/core/hle/service/nifm/nifm.cpp | 44 ++-- src/core/hle/service/nifm/nifm.h | 24 +- src/core/hle/service/nim/nim.cpp | 28 +-- .../service/ns/iplatform_service_manager.cpp | 14 +- .../service/ns/iplatform_service_manager.h | 12 +- src/core/hle/service/ns/ns.cpp | 15 +- src/core/hle/service/ns/ns.h | 14 +- src/core/hle/service/ns/pdm_qry.cpp | 4 +- src/core/hle/service/ns/pdm_qry.h | 2 +- src/core/hle/service/nvdrv/nvdrv.cpp | 2 +- .../hle/service/nvdrv/nvdrv_interface.cpp | 26 +- src/core/hle/service/nvdrv/nvdrv_interface.h | 24 +- src/core/hle/service/nvdrv/nvmemp.cpp | 4 +- src/core/hle/service/nvdrv/nvmemp.h | 4 +- src/core/hle/service/nvflinger/binder.h | 8 +- .../nvflinger/buffer_queue_producer.cpp | 4 +- .../service/nvflinger/buffer_queue_producer.h | 2 +- src/core/hle/service/olsc/olsc.cpp | 8 +- src/core/hle/service/pctl/pctl_module.cpp | 28 +-- src/core/hle/service/pctl/pctl_module.h | 4 +- src/core/hle/service/pcv/pcv.cpp | 8 +- src/core/hle/service/pm/pm.cpp | 20 +- src/core/hle/service/prepo/prepo.cpp | 16 +- src/core/hle/service/psc/psc.cpp | 4 +- src/core/hle/service/ptm/psm.cpp | 18 +- src/core/hle/service/ptm/psm.h | 6 +- src/core/hle/service/ptm/ts.cpp | 6 +- src/core/hle/service/ptm/ts.h | 4 +- src/core/hle/service/server_manager.cpp | 22 +- src/core/hle/service/server_manager.h | 27 +-- src/core/hle/service/service.cpp | 10 +- src/core/hle/service/service.h | 20 +- src/core/hle/service/set/set.cpp | 30 +-- src/core/hle/service/set/set.h | 22 +- src/core/hle/service/set/set_sys.cpp | 18 +- src/core/hle/service/set/set_sys.h | 14 +- src/core/hle/service/sm/sm.cpp | 18 +- src/core/hle/service/sm/sm.h | 21 +- src/core/hle/service/sm/sm_controller.cpp | 10 +- src/core/hle/service/sm/sm_controller.h | 8 +- src/core/hle/service/sockets/bsd.cpp | 66 ++--- src/core/hle/service/sockets/bsd.h | 64 ++--- src/core/hle/service/sockets/sfdnsres.cpp | 8 +- src/core/hle/service/sockets/sfdnsres.h | 4 +- src/core/hle/service/spl/spl_module.cpp | 16 +- src/core/hle/service/spl/spl_module.h | 14 +- src/core/hle/service/ssl/ssl.cpp | 14 +- src/core/hle/service/time/time.cpp | 34 ++- src/core/hle/service/time/time.h | 24 +- .../hle/service/time/time_zone_service.cpp | 14 +- src/core/hle/service/time/time_zone_service.h | 12 +- src/core/hle/service/usb/usb.cpp | 6 +- src/core/hle/service/vi/vi.cpp | 64 ++--- src/core/hle/service/vi/vi.h | 4 +- src/core/hle/service/vi/vi_m.cpp | 2 +- src/core/hle/service/vi/vi_m.h | 6 +- src/core/hle/service/vi/vi_s.cpp | 2 +- src/core/hle/service/vi/vi_s.h | 6 +- src/core/hle/service/vi/vi_u.cpp | 2 +- src/core/hle/service/vi/vi_u.h | 6 +- src/core/reporter.cpp | 6 +- src/core/reporter.h | 6 +- 148 files changed, 1668 insertions(+), 1733 deletions(-) rename src/core/hle/{kernel => service}/hle_ipc.cpp (94%) rename src/core/hle/{kernel => service}/hle_ipc.h (83%) rename src/core/hle/{ => service}/ipc_helpers.h (97%) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index cdebb0bd8..194cdd025 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -158,7 +158,6 @@ add_library(core STATIC hid/motion_input.h hle/api_version.h hle/ipc.h - hle/ipc_helpers.h hle/kernel/board/nintendo/nx/k_memory_layout.h hle/kernel/board/nintendo/nx/k_system_control.cpp hle/kernel/board/nintendo/nx/k_system_control.h @@ -168,8 +167,6 @@ add_library(core STATIC hle/kernel/svc_results.h hle/kernel/global_scheduler_context.cpp hle/kernel/global_scheduler_context.h - hle/kernel/hle_ipc.cpp - hle/kernel/hle_ipc.h hle/kernel/init/init_slab_setup.cpp hle/kernel/init/init_slab_setup.h hle/kernel/initial_process.h @@ -680,6 +677,9 @@ add_library(core STATIC hle/service/ptm/ptm.h hle/service/ptm/ts.cpp hle/service/ptm/ts.h + hle/service/hle_ipc.cpp + hle/service/hle_ipc.h + hle/service/ipc_helpers.h hle/service/kernel_helpers.cpp hle/service/kernel_helpers.h hle/service/mutex.cpp diff --git a/src/core/hle/kernel/k_client_port.cpp b/src/core/hle/kernel/k_client_port.cpp index c72a91a76..700ae71e3 100644 --- a/src/core/hle/kernel/k_client_port.cpp +++ b/src/core/hle/kernel/k_client_port.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/scope_exit.h" -#include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/k_client_port.h" #include "core/hle/kernel/k_port.h" #include "core/hle/kernel/k_scheduler.h" diff --git a/src/core/hle/kernel/k_client_port.h b/src/core/hle/kernel/k_client_port.h index 81046fb86..a757cf9cd 100644 --- a/src/core/hle/kernel/k_client_port.h +++ b/src/core/hle/kernel/k_client_port.h @@ -15,7 +15,6 @@ namespace Kernel { class KClientSession; class KernelCore; class KPort; -class SessionRequestManager; class KClientPort final : public KSynchronizationObject { KERNEL_AUTOOBJECT_TRAITS(KClientPort, KSynchronizationObject); diff --git a/src/core/hle/kernel/k_client_session.cpp b/src/core/hle/kernel/k_client_session.cpp index b4197a8d5..da0c9ac8c 100644 --- a/src/core/hle/kernel/k_client_session.cpp +++ b/src/core/hle/kernel/k_client_session.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/scope_exit.h" -#include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/k_client_session.h" #include "core/hle/kernel/k_server_session.h" #include "core/hle/kernel/k_session.h" diff --git a/src/core/hle/kernel/k_port.cpp b/src/core/hle/kernel/k_port.cpp index 77d00ae2c..0a45ffd57 100644 --- a/src/core/hle/kernel/k_port.cpp +++ b/src/core/hle/kernel/k_port.cpp @@ -1,7 +1,6 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/k_port.h" #include "core/hle/kernel/k_scheduler.h" #include "core/hle/kernel/svc_results.h" diff --git a/src/core/hle/kernel/k_server_session.cpp b/src/core/hle/kernel/k_server_session.cpp index aa1941f01..01591af5b 100644 --- a/src/core/hle/kernel/k_server_session.cpp +++ b/src/core/hle/kernel/k_server_session.cpp @@ -10,8 +10,6 @@ #include "common/scope_exit.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/ipc_helpers.h" -#include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/k_client_port.h" #include "core/hle/kernel/k_handle_table.h" #include "core/hle/kernel/k_process.h" @@ -22,6 +20,8 @@ #include "core/hle/kernel/k_thread.h" #include "core/hle/kernel/k_thread_queue.h" #include "core/hle/kernel/kernel.h" +#include "core/hle/service/hle_ipc.h" +#include "core/hle/service/ipc_helpers.h" #include "core/memory.h" namespace Kernel { @@ -281,8 +281,8 @@ Result KServerSession::SendReply(bool is_hle) { return result; } -Result KServerSession::ReceiveRequest(std::shared_ptr* out_context, - std::weak_ptr manager) { +Result KServerSession::ReceiveRequest(std::shared_ptr* out_context, + std::weak_ptr manager) { // Lock the session. KScopedLightLock lk{m_lock}; @@ -329,7 +329,8 @@ Result KServerSession::ReceiveRequest(std::shared_ptr* out_co if (out_context != nullptr) { // HLE request. u32* cmd_buf{reinterpret_cast(memory.GetPointer(client_message))}; - *out_context = std::make_shared(kernel, memory, this, client_thread); + *out_context = + std::make_shared(kernel, memory, this, client_thread); (*out_context)->SetSessionRequestManager(manager); (*out_context) ->PopulateFromIncomingCommandBuffer(client_thread->GetOwnerProcess()->GetHandleTable(), diff --git a/src/core/hle/kernel/k_server_session.h b/src/core/hle/kernel/k_server_session.h index 6e189af8b..33f380352 100644 --- a/src/core/hle/kernel/k_server_session.h +++ b/src/core/hle/kernel/k_server_session.h @@ -10,18 +10,20 @@ #include -#include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/k_light_lock.h" #include "core/hle/kernel/k_session_request.h" #include "core/hle/kernel/k_synchronization_object.h" #include "core/hle/result.h" +namespace Service { +class HLERequestContext; +class SessionRequestManager; +} // namespace Service + namespace Kernel { -class HLERequestContext; class KernelCore; class KSession; -class SessionRequestManager; class KThread; class KServerSession final : public KSynchronizationObject, @@ -52,8 +54,8 @@ public: /// TODO: flesh these out to match the real kernel Result OnRequest(KSessionRequest* request); Result SendReply(bool is_hle = false); - Result ReceiveRequest(std::shared_ptr* out_context = nullptr, - std::weak_ptr manager = {}); + Result ReceiveRequest(std::shared_ptr* out_context = nullptr, + std::weak_ptr manager = {}); Result SendReplyHLE() { return SendReply(true); diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index c3e5c4462..ddc3a6dbe 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -15,7 +15,6 @@ #include "core/core_timing.h" #include "core/file_sys/control_metadata.h" #include "core/file_sys/patch_manager.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/acc/acc.h" #include "core/hle/service/acc/acc_aa.h" #include "core/hle/service/acc/acc_su.h" @@ -25,6 +24,7 @@ #include "core/hle/service/acc/errors.h" #include "core/hle/service/acc/profile_manager.h" #include "core/hle/service/glue/glue_manager.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" #include "core/loader/loader.h" @@ -295,7 +295,7 @@ public: } protected: - void Get(Kernel::HLERequestContext& ctx) { + void Get(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called user_id=0x{}", user_id.RawString()); ProfileBase profile_base{}; UserData data{}; @@ -312,7 +312,7 @@ protected: } } - void GetBase(Kernel::HLERequestContext& ctx) { + void GetBase(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called user_id=0x{}", user_id.RawString()); ProfileBase profile_base{}; if (profile_manager.GetProfileBase(user_id, profile_base)) { @@ -326,7 +326,7 @@ protected: } } - void LoadImage(Kernel::HLERequestContext& ctx) { + void LoadImage(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -353,7 +353,7 @@ protected: rb.Push(size); } - void GetImageSize(Kernel::HLERequestContext& ctx) { + void GetImageSize(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); @@ -370,7 +370,7 @@ protected: } } - void Store(Kernel::HLERequestContext& ctx) { + void Store(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto base = rp.PopRaw(); @@ -402,7 +402,7 @@ protected: rb.Push(ResultSuccess); } - void StoreWithImage(Kernel::HLERequestContext& ctx) { + void StoreWithImage(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto base = rp.PopRaw(); @@ -499,7 +499,7 @@ public: } ~EnsureTokenIdCacheAsyncInterface() = default; - void LoadIdTokenCache(Kernel::HLERequestContext& ctx) { + void LoadIdTokenCache(HLERequestContext& ctx) { LOG_WARNING(Service_ACC, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; @@ -542,14 +542,14 @@ public: } private: - void CheckAvailability(Kernel::HLERequestContext& ctx) { + void CheckAvailability(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); rb.Push(false); // TODO: Check when this is supposed to return true and when not } - void GetAccountId(Kernel::HLERequestContext& ctx) { + void GetAccountId(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); IPC::ResponseBuilder rb{ctx, 4}; @@ -557,7 +557,7 @@ private: rb.PushRaw(profile_manager->GetLastOpenedUser().Hash()); } - void EnsureIdTokenCacheAsync(Kernel::HLERequestContext& ctx) { + void EnsureIdTokenCacheAsync(HLERequestContext& ctx) { LOG_WARNING(Service_ACC, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -565,13 +565,13 @@ private: rb.PushIpcInterface(ensure_token_id); } - void LoadIdTokenCache(Kernel::HLERequestContext& ctx) { + void LoadIdTokenCache(HLERequestContext& ctx) { LOG_WARNING(Service_ACC, "(STUBBED) called"); ensure_token_id->LoadIdTokenCache(ctx); } - void GetNintendoAccountUserResourceCacheForApplication(Kernel::HLERequestContext& ctx) { + void GetNintendoAccountUserResourceCacheForApplication(HLERequestContext& ctx) { LOG_WARNING(Service_ACC, "(STUBBED) called"); std::vector nas_user_base_for_application(0x68); @@ -587,7 +587,7 @@ private: rb.PushRaw(profile_manager->GetLastOpenedUser().Hash()); } - void StoreOpenContext(Kernel::HLERequestContext& ctx) { + void StoreOpenContext(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); profile_manager->StoreOpenedUsers(); @@ -689,14 +689,14 @@ public: } }; -void Module::Interface::GetUserCount(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetUserCount(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); rb.Push(static_cast(profile_manager->GetUserCount())); } -void Module::Interface::GetUserExistence(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetUserExistence(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; Common::UUID user_id = rp.PopRaw(); LOG_DEBUG(Service_ACC, "called user_id=0x{}", user_id.RawString()); @@ -706,28 +706,28 @@ void Module::Interface::GetUserExistence(Kernel::HLERequestContext& ctx) { rb.Push(profile_manager->UserExists(user_id)); } -void Module::Interface::ListAllUsers(Kernel::HLERequestContext& ctx) { +void Module::Interface::ListAllUsers(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); ctx.WriteBuffer(profile_manager->GetAllUsers()); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void Module::Interface::ListOpenUsers(Kernel::HLERequestContext& ctx) { +void Module::Interface::ListOpenUsers(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); ctx.WriteBuffer(profile_manager->GetOpenUsers()); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void Module::Interface::GetLastOpenedUser(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetLastOpenedUser(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); IPC::ResponseBuilder rb{ctx, 6}; rb.Push(ResultSuccess); rb.PushRaw(profile_manager->GetLastOpenedUser()); } -void Module::Interface::GetProfile(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetProfile(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; Common::UUID user_id = rp.PopRaw(); LOG_DEBUG(Service_ACC, "called user_id=0x{}", user_id.RawString()); @@ -737,20 +737,20 @@ void Module::Interface::GetProfile(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(system, user_id, *profile_manager); } -void Module::Interface::IsUserRegistrationRequestPermitted(Kernel::HLERequestContext& ctx) { +void Module::Interface::IsUserRegistrationRequestPermitted(HLERequestContext& ctx) { LOG_WARNING(Service_ACC, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); rb.Push(profile_manager->CanSystemRegisterUser()); } -void Module::Interface::InitializeApplicationInfo(Kernel::HLERequestContext& ctx) { +void Module::Interface::InitializeApplicationInfo(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(InitializeApplicationInfoBase()); } -void Module::Interface::InitializeApplicationInfoRestricted(Kernel::HLERequestContext& ctx) { +void Module::Interface::InitializeApplicationInfoRestricted(HLERequestContext& ctx) { LOG_WARNING(Service_ACC, "(Partial implementation) called"); // TODO(ogniK): We require checking if the user actually owns the title and what not. As of @@ -800,14 +800,14 @@ Result Module::Interface::InitializeApplicationInfoBase() { return ResultSuccess; } -void Module::Interface::GetBaasAccountManagerForApplication(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetBaasAccountManagerForApplication(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); rb.PushIpcInterface(system, profile_manager); } -void Module::Interface::IsUserAccountSwitchLocked(Kernel::HLERequestContext& ctx) { +void Module::Interface::IsUserAccountSwitchLocked(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); FileSys::NACP nacp; const auto res = system.GetAppLoader().ReadControlData(nacp); @@ -834,14 +834,14 @@ void Module::Interface::IsUserAccountSwitchLocked(Kernel::HLERequestContext& ctx rb.Push(is_locked); } -void Module::Interface::InitializeApplicationInfoV2(Kernel::HLERequestContext& ctx) { +void Module::Interface::InitializeApplicationInfoV2(HLERequestContext& ctx) { LOG_WARNING(Service_ACC, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void Module::Interface::GetProfileEditor(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetProfileEditor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; Common::UUID user_id = rp.PopRaw(); @@ -852,7 +852,7 @@ void Module::Interface::GetProfileEditor(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(system, user_id, *profile_manager); } -void Module::Interface::ListQualifiedUsers(Kernel::HLERequestContext& ctx) { +void Module::Interface::ListQualifiedUsers(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); // All users should be qualified. We don't actually have parental control or anything to do with @@ -863,7 +863,7 @@ void Module::Interface::ListQualifiedUsers(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Module::Interface::ListOpenContextStoredUsers(Kernel::HLERequestContext& ctx) { +void Module::Interface::ListOpenContextStoredUsers(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); ctx.WriteBuffer(profile_manager->GetStoredOpenedUsers()); @@ -871,7 +871,7 @@ void Module::Interface::ListOpenContextStoredUsers(Kernel::HLERequestContext& ct rb.Push(ResultSuccess); } -void Module::Interface::StoreSaveDataThumbnailApplication(Kernel::HLERequestContext& ctx) { +void Module::Interface::StoreSaveDataThumbnailApplication(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto uuid = rp.PopRaw(); @@ -884,7 +884,7 @@ void Module::Interface::StoreSaveDataThumbnailApplication(Kernel::HLERequestCont StoreSaveDataThumbnail(ctx, uuid, tid); } -void Module::Interface::StoreSaveDataThumbnailSystem(Kernel::HLERequestContext& ctx) { +void Module::Interface::StoreSaveDataThumbnailSystem(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto uuid = rp.PopRaw(); const auto tid = rp.Pop(); @@ -893,8 +893,8 @@ void Module::Interface::StoreSaveDataThumbnailSystem(Kernel::HLERequestContext& StoreSaveDataThumbnail(ctx, uuid, tid); } -void Module::Interface::StoreSaveDataThumbnail(Kernel::HLERequestContext& ctx, - const Common::UUID& uuid, const u64 tid) { +void Module::Interface::StoreSaveDataThumbnail(HLERequestContext& ctx, const Common::UUID& uuid, + const u64 tid) { IPC::ResponseBuilder rb{ctx, 2}; if (tid == 0) { @@ -920,7 +920,7 @@ void Module::Interface::StoreSaveDataThumbnail(Kernel::HLERequestContext& ctx, rb.Push(ResultSuccess); } -void Module::Interface::TrySelectUserWithoutInteraction(Kernel::HLERequestContext& ctx) { +void Module::Interface::TrySelectUserWithoutInteraction(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); // A u8 is passed into this function which we can safely ignore. It's to determine if we have // access to use the network or not by the looks of it diff --git a/src/core/hle/service/acc/acc.h b/src/core/hle/service/acc/acc.h index a2fdafd82..6b4735c2f 100644 --- a/src/core/hle/service/acc/acc.h +++ b/src/core/hle/service/acc/acc.h @@ -20,28 +20,28 @@ public: const char* name); ~Interface() override; - void GetUserCount(Kernel::HLERequestContext& ctx); - void GetUserExistence(Kernel::HLERequestContext& ctx); - void ListAllUsers(Kernel::HLERequestContext& ctx); - void ListOpenUsers(Kernel::HLERequestContext& ctx); - void GetLastOpenedUser(Kernel::HLERequestContext& ctx); - void GetProfile(Kernel::HLERequestContext& ctx); - void InitializeApplicationInfo(Kernel::HLERequestContext& ctx); - void InitializeApplicationInfoRestricted(Kernel::HLERequestContext& ctx); - void GetBaasAccountManagerForApplication(Kernel::HLERequestContext& ctx); - void IsUserRegistrationRequestPermitted(Kernel::HLERequestContext& ctx); - void TrySelectUserWithoutInteraction(Kernel::HLERequestContext& ctx); - void IsUserAccountSwitchLocked(Kernel::HLERequestContext& ctx); - void InitializeApplicationInfoV2(Kernel::HLERequestContext& ctx); - void GetProfileEditor(Kernel::HLERequestContext& ctx); - void ListQualifiedUsers(Kernel::HLERequestContext& ctx); - void ListOpenContextStoredUsers(Kernel::HLERequestContext& ctx); - void StoreSaveDataThumbnailApplication(Kernel::HLERequestContext& ctx); - void StoreSaveDataThumbnailSystem(Kernel::HLERequestContext& ctx); + void GetUserCount(HLERequestContext& ctx); + void GetUserExistence(HLERequestContext& ctx); + void ListAllUsers(HLERequestContext& ctx); + void ListOpenUsers(HLERequestContext& ctx); + void GetLastOpenedUser(HLERequestContext& ctx); + void GetProfile(HLERequestContext& ctx); + void InitializeApplicationInfo(HLERequestContext& ctx); + void InitializeApplicationInfoRestricted(HLERequestContext& ctx); + void GetBaasAccountManagerForApplication(HLERequestContext& ctx); + void IsUserRegistrationRequestPermitted(HLERequestContext& ctx); + void TrySelectUserWithoutInteraction(HLERequestContext& ctx); + void IsUserAccountSwitchLocked(HLERequestContext& ctx); + void InitializeApplicationInfoV2(HLERequestContext& ctx); + void GetProfileEditor(HLERequestContext& ctx); + void ListQualifiedUsers(HLERequestContext& ctx); + void ListOpenContextStoredUsers(HLERequestContext& ctx); + void StoreSaveDataThumbnailApplication(HLERequestContext& ctx); + void StoreSaveDataThumbnailSystem(HLERequestContext& ctx); private: Result InitializeApplicationInfoBase(); - void StoreSaveDataThumbnail(Kernel::HLERequestContext& ctx, const Common::UUID& uuid, + void StoreSaveDataThumbnail(HLERequestContext& ctx, const Common::UUID& uuid, const u64 tid); enum class ApplicationType : u32_le { diff --git a/src/core/hle/service/acc/async_context.cpp b/src/core/hle/service/acc/async_context.cpp index 713689d8f..c9e0af90c 100644 --- a/src/core/hle/service/acc/async_context.cpp +++ b/src/core/hle/service/acc/async_context.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/acc/async_context.h" +#include "core/hle/service/ipc_helpers.h" namespace Service::Account { IAsyncContext::IAsyncContext(Core::System& system_) @@ -27,7 +27,7 @@ IAsyncContext::~IAsyncContext() { service_context.CloseEvent(completion_event); } -void IAsyncContext::GetSystemEvent(Kernel::HLERequestContext& ctx) { +void IAsyncContext::GetSystemEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -35,7 +35,7 @@ void IAsyncContext::GetSystemEvent(Kernel::HLERequestContext& ctx) { rb.PushCopyObjects(completion_event->GetReadableEvent()); } -void IAsyncContext::Cancel(Kernel::HLERequestContext& ctx) { +void IAsyncContext::Cancel(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); Cancel(); @@ -45,7 +45,7 @@ void IAsyncContext::Cancel(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IAsyncContext::HasDone(Kernel::HLERequestContext& ctx) { +void IAsyncContext::HasDone(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); is_complete.store(IsComplete()); @@ -55,7 +55,7 @@ void IAsyncContext::HasDone(Kernel::HLERequestContext& ctx) { rb.Push(is_complete.load()); } -void IAsyncContext::GetResult(Kernel::HLERequestContext& ctx) { +void IAsyncContext::GetResult(HLERequestContext& ctx) { LOG_DEBUG(Service_ACC, "called"); IPC::ResponseBuilder rb{ctx, 3}; diff --git a/src/core/hle/service/acc/async_context.h b/src/core/hle/service/acc/async_context.h index 26332d241..d7bffc055 100644 --- a/src/core/hle/service/acc/async_context.h +++ b/src/core/hle/service/acc/async_context.h @@ -18,10 +18,10 @@ public: explicit IAsyncContext(Core::System& system_); ~IAsyncContext() override; - void GetSystemEvent(Kernel::HLERequestContext& ctx); - void Cancel(Kernel::HLERequestContext& ctx); - void HasDone(Kernel::HLERequestContext& ctx); - void GetResult(Kernel::HLERequestContext& ctx); + void GetSystemEvent(HLERequestContext& ctx); + void Cancel(HLERequestContext& ctx); + void HasDone(HLERequestContext& ctx); + void GetResult(HLERequestContext& ctx); protected: virtual bool IsComplete() const = 0; diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 3cd772b83..00b096f9e 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -11,7 +11,6 @@ #include "core/file_sys/patch_manager.h" #include "core/file_sys/registered_cache.h" #include "core/file_sys/savedata_factory.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_transfer_memory.h" #include "core/hle/service/acc/profile_manager.h" @@ -29,6 +28,7 @@ #include "core/hle/service/bcat/backend/backend.h" #include "core/hle/service/caps/caps.h" #include "core/hle/service/filesystem/filesystem.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/ns/ns.h" #include "core/hle/service/nvflinger/nvflinger.h" #include "core/hle/service/pm/pm.h" @@ -78,7 +78,7 @@ IWindowController::IWindowController(Core::System& system_) IWindowController::~IWindowController() = default; -void IWindowController::GetAppletResourceUserId(Kernel::HLERequestContext& ctx) { +void IWindowController::GetAppletResourceUserId(HLERequestContext& ctx) { const u64 process_id = system.ApplicationProcess()->GetProcessID(); LOG_DEBUG(Service_AM, "called. Process ID=0x{:016X}", process_id); @@ -88,7 +88,7 @@ void IWindowController::GetAppletResourceUserId(Kernel::HLERequestContext& ctx) rb.Push(process_id); } -void IWindowController::AcquireForegroundRights(Kernel::HLERequestContext& ctx) { +void IWindowController::AcquireForegroundRights(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); @@ -111,7 +111,7 @@ IAudioController::IAudioController(Core::System& system_) IAudioController::~IAudioController() = default; -void IAudioController::SetExpectedMasterVolume(Kernel::HLERequestContext& ctx) { +void IAudioController::SetExpectedMasterVolume(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const float main_applet_volume_tmp = rp.Pop(); const float library_applet_volume_tmp = rp.Pop(); @@ -128,21 +128,21 @@ void IAudioController::SetExpectedMasterVolume(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IAudioController::GetMainAppletExpectedMasterVolume(Kernel::HLERequestContext& ctx) { +void IAudioController::GetMainAppletExpectedMasterVolume(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called. main_applet_volume={}", main_applet_volume); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); rb.Push(main_applet_volume); } -void IAudioController::GetLibraryAppletExpectedMasterVolume(Kernel::HLERequestContext& ctx) { +void IAudioController::GetLibraryAppletExpectedMasterVolume(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called. library_applet_volume={}", library_applet_volume); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); rb.Push(library_applet_volume); } -void IAudioController::ChangeMainAppletMasterVolume(Kernel::HLERequestContext& ctx) { +void IAudioController::ChangeMainAppletMasterVolume(HLERequestContext& ctx) { struct Parameters { float volume; s64 fade_time_ns; @@ -162,7 +162,7 @@ void IAudioController::ChangeMainAppletMasterVolume(Kernel::HLERequestContext& c rb.Push(ResultSuccess); } -void IAudioController::SetTransparentAudioRate(Kernel::HLERequestContext& ctx) { +void IAudioController::SetTransparentAudioRate(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const float transparent_volume_rate_tmp = rp.Pop(); @@ -328,7 +328,7 @@ ISelfController::~ISelfController() { service_context.CloseEvent(accumulated_suspended_tick_changed_event); } -void ISelfController::Exit(Kernel::HLERequestContext& ctx) { +void ISelfController::Exit(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2}; @@ -337,7 +337,7 @@ void ISelfController::Exit(Kernel::HLERequestContext& ctx) { system.Exit(); } -void ISelfController::LockExit(Kernel::HLERequestContext& ctx) { +void ISelfController::LockExit(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); system.SetExitLock(true); @@ -346,7 +346,7 @@ void ISelfController::LockExit(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void ISelfController::UnlockExit(Kernel::HLERequestContext& ctx) { +void ISelfController::UnlockExit(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); system.SetExitLock(false); @@ -355,7 +355,7 @@ void ISelfController::UnlockExit(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void ISelfController::EnterFatalSection(Kernel::HLERequestContext& ctx) { +void ISelfController::EnterFatalSection(HLERequestContext& ctx) { ++num_fatal_sections_entered; LOG_DEBUG(Service_AM, "called. Num fatal sections entered: {}", num_fatal_sections_entered); @@ -363,7 +363,7 @@ void ISelfController::EnterFatalSection(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void ISelfController::LeaveFatalSection(Kernel::HLERequestContext& ctx) { +void ISelfController::LeaveFatalSection(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called."); // Entry and exit of fatal sections must be balanced. @@ -379,7 +379,7 @@ void ISelfController::LeaveFatalSection(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void ISelfController::GetLibraryAppletLaunchableEvent(Kernel::HLERequestContext& ctx) { +void ISelfController::GetLibraryAppletLaunchableEvent(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); launchable_event->Signal(); @@ -389,7 +389,7 @@ void ISelfController::GetLibraryAppletLaunchableEvent(Kernel::HLERequestContext& rb.PushCopyObjects(launchable_event->GetReadableEvent()); } -void ISelfController::SetScreenShotPermission(Kernel::HLERequestContext& ctx) { +void ISelfController::SetScreenShotPermission(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto permission = rp.PopEnum(); LOG_DEBUG(Service_AM, "called, permission={}", permission); @@ -400,7 +400,7 @@ void ISelfController::SetScreenShotPermission(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void ISelfController::SetOperationModeChangedNotification(Kernel::HLERequestContext& ctx) { +void ISelfController::SetOperationModeChangedNotification(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; bool flag = rp.Pop(); @@ -410,7 +410,7 @@ void ISelfController::SetOperationModeChangedNotification(Kernel::HLERequestCont rb.Push(ResultSuccess); } -void ISelfController::SetPerformanceModeChangedNotification(Kernel::HLERequestContext& ctx) { +void ISelfController::SetPerformanceModeChangedNotification(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; bool flag = rp.Pop(); @@ -420,7 +420,7 @@ void ISelfController::SetPerformanceModeChangedNotification(Kernel::HLERequestCo rb.Push(ResultSuccess); } -void ISelfController::SetFocusHandlingMode(Kernel::HLERequestContext& ctx) { +void ISelfController::SetFocusHandlingMode(HLERequestContext& ctx) { // Takes 3 input u8s with each field located immediately after the previous // u8, these are bool flags. No output. IPC::RequestParser rp{ctx}; @@ -439,14 +439,14 @@ void ISelfController::SetFocusHandlingMode(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void ISelfController::SetRestartMessageEnabled(Kernel::HLERequestContext& ctx) { +void ISelfController::SetRestartMessageEnabled(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void ISelfController::SetOutOfFocusSuspendingEnabled(Kernel::HLERequestContext& ctx) { +void ISelfController::SetOutOfFocusSuspendingEnabled(HLERequestContext& ctx) { // Takes 3 input u8s with each field located immediately after the previous // u8, these are bool flags. No output. IPC::RequestParser rp{ctx}; @@ -458,14 +458,14 @@ void ISelfController::SetOutOfFocusSuspendingEnabled(Kernel::HLERequestContext& rb.Push(ResultSuccess); } -void ISelfController::SetAlbumImageOrientation(Kernel::HLERequestContext& ctx) { +void ISelfController::SetAlbumImageOrientation(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void ISelfController::CreateManagedDisplayLayer(Kernel::HLERequestContext& ctx) { +void ISelfController::CreateManagedDisplayLayer(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); // TODO(Subv): Find out how AM determines the display to use, for now just @@ -478,7 +478,7 @@ void ISelfController::CreateManagedDisplayLayer(Kernel::HLERequestContext& ctx) rb.Push(*layer_id); } -void ISelfController::CreateManagedDisplaySeparableLayer(Kernel::HLERequestContext& ctx) { +void ISelfController::CreateManagedDisplaySeparableLayer(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); // TODO(Subv): Find out how AM determines the display to use, for now just @@ -496,14 +496,14 @@ void ISelfController::CreateManagedDisplaySeparableLayer(Kernel::HLERequestConte rb.Push(*layer_id); } -void ISelfController::SetHandlesRequestToDisplay(Kernel::HLERequestContext& ctx) { +void ISelfController::SetHandlesRequestToDisplay(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void ISelfController::SetIdleTimeDetectionExtension(Kernel::HLERequestContext& ctx) { +void ISelfController::SetIdleTimeDetectionExtension(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; idle_time_detection_extension = rp.Pop(); LOG_WARNING(Service_AM, "(STUBBED) called idle_time_detection_extension={}", @@ -513,7 +513,7 @@ void ISelfController::SetIdleTimeDetectionExtension(Kernel::HLERequestContext& c rb.Push(ResultSuccess); } -void ISelfController::GetIdleTimeDetectionExtension(Kernel::HLERequestContext& ctx) { +void ISelfController::GetIdleTimeDetectionExtension(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -521,14 +521,14 @@ void ISelfController::GetIdleTimeDetectionExtension(Kernel::HLERequestContext& c rb.Push(idle_time_detection_extension); } -void ISelfController::ReportUserIsActive(Kernel::HLERequestContext& ctx) { +void ISelfController::ReportUserIsActive(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void ISelfController::SetAutoSleepDisabled(Kernel::HLERequestContext& ctx) { +void ISelfController::SetAutoSleepDisabled(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; is_auto_sleep_disabled = rp.Pop(); @@ -548,7 +548,7 @@ void ISelfController::SetAutoSleepDisabled(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void ISelfController::IsAutoSleepDisabled(Kernel::HLERequestContext& ctx) { +void ISelfController::IsAutoSleepDisabled(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called."); IPC::ResponseBuilder rb{ctx, 3}; @@ -556,7 +556,7 @@ void ISelfController::IsAutoSleepDisabled(Kernel::HLERequestContext& ctx) { rb.Push(is_auto_sleep_disabled); } -void ISelfController::GetAccumulatedSuspendedTickValue(Kernel::HLERequestContext& ctx) { +void ISelfController::GetAccumulatedSuspendedTickValue(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called."); // This command returns the total number of system ticks since ISelfController creation @@ -567,7 +567,7 @@ void ISelfController::GetAccumulatedSuspendedTickValue(Kernel::HLERequestContext rb.Push(0); } -void ISelfController::GetAccumulatedSuspendedTickChangedEvent(Kernel::HLERequestContext& ctx) { +void ISelfController::GetAccumulatedSuspendedTickChangedEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called."); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -575,7 +575,7 @@ void ISelfController::GetAccumulatedSuspendedTickChangedEvent(Kernel::HLERequest rb.PushCopyObjects(accumulated_suspended_tick_changed_event->GetReadableEvent()); } -void ISelfController::SetAlbumImageTakenNotificationEnabled(Kernel::HLERequestContext& ctx) { +void ISelfController::SetAlbumImageTakenNotificationEnabled(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; // This service call sets an internal flag whether a notification is shown when an image is @@ -590,7 +590,7 @@ void ISelfController::SetAlbumImageTakenNotificationEnabled(Kernel::HLERequestCo rb.Push(ResultSuccess); } -void ISelfController::SaveCurrentScreenshot(Kernel::HLERequestContext& ctx) { +void ISelfController::SaveCurrentScreenshot(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto album_report_option = rp.PopEnum(); @@ -601,7 +601,7 @@ void ISelfController::SaveCurrentScreenshot(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void ISelfController::SetRecordVolumeMuted(Kernel::HLERequestContext& ctx) { +void ISelfController::SetRecordVolumeMuted(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto is_record_volume_muted = rp.Pop(); @@ -735,7 +735,7 @@ ICommonStateGetter::ICommonStateGetter(Core::System& system_, ICommonStateGetter::~ICommonStateGetter() = default; -void ICommonStateGetter::GetBootMode(Kernel::HLERequestContext& ctx) { +void ICommonStateGetter::GetBootMode(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -743,7 +743,7 @@ void ICommonStateGetter::GetBootMode(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(Service::PM::SystemBootMode::Normal)); // Normal boot mode } -void ICommonStateGetter::GetEventHandle(Kernel::HLERequestContext& ctx) { +void ICommonStateGetter::GetEventHandle(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -751,7 +751,7 @@ void ICommonStateGetter::GetEventHandle(Kernel::HLERequestContext& ctx) { rb.PushCopyObjects(msg_queue->GetMessageReceiveEvent()); } -void ICommonStateGetter::ReceiveMessage(Kernel::HLERequestContext& ctx) { +void ICommonStateGetter::ReceiveMessage(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); const auto message = msg_queue->PopMessage(); @@ -768,7 +768,7 @@ void ICommonStateGetter::ReceiveMessage(Kernel::HLERequestContext& ctx) { rb.PushEnum(message); } -void ICommonStateGetter::GetCurrentFocusState(Kernel::HLERequestContext& ctx) { +void ICommonStateGetter::GetCurrentFocusState(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -776,7 +776,7 @@ void ICommonStateGetter::GetCurrentFocusState(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(FocusState::InFocus)); } -void ICommonStateGetter::IsVrModeEnabled(Kernel::HLERequestContext& ctx) { +void ICommonStateGetter::IsVrModeEnabled(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -784,7 +784,7 @@ void ICommonStateGetter::IsVrModeEnabled(Kernel::HLERequestContext& ctx) { rb.Push(vr_mode_state); } -void ICommonStateGetter::SetVrModeEnabled(Kernel::HLERequestContext& ctx) { +void ICommonStateGetter::SetVrModeEnabled(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; vr_mode_state = rp.Pop(); @@ -794,7 +794,7 @@ void ICommonStateGetter::SetVrModeEnabled(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void ICommonStateGetter::SetLcdBacklighOffEnabled(Kernel::HLERequestContext& ctx) { +void ICommonStateGetter::SetLcdBacklighOffEnabled(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto is_lcd_backlight_off_enabled = rp.Pop(); @@ -805,21 +805,21 @@ void ICommonStateGetter::SetLcdBacklighOffEnabled(Kernel::HLERequestContext& ctx rb.Push(ResultSuccess); } -void ICommonStateGetter::BeginVrModeEx(Kernel::HLERequestContext& ctx) { +void ICommonStateGetter::BeginVrModeEx(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void ICommonStateGetter::EndVrModeEx(Kernel::HLERequestContext& ctx) { +void ICommonStateGetter::EndVrModeEx(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void ICommonStateGetter::GetDefaultDisplayResolutionChangeEvent(Kernel::HLERequestContext& ctx) { +void ICommonStateGetter::GetDefaultDisplayResolutionChangeEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -827,7 +827,7 @@ void ICommonStateGetter::GetDefaultDisplayResolutionChangeEvent(Kernel::HLEReque rb.PushCopyObjects(msg_queue->GetOperationModeChangedEvent()); } -void ICommonStateGetter::GetDefaultDisplayResolution(Kernel::HLERequestContext& ctx) { +void ICommonStateGetter::GetDefaultDisplayResolution(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 4}; @@ -842,7 +842,7 @@ void ICommonStateGetter::GetDefaultDisplayResolution(Kernel::HLERequestContext& } } -void ICommonStateGetter::SetCpuBoostMode(Kernel::HLERequestContext& ctx) { +void ICommonStateGetter::SetCpuBoostMode(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called, forwarding to APM:SYS"); const auto& sm = system.ServiceManager(); @@ -852,7 +852,7 @@ void ICommonStateGetter::SetCpuBoostMode(Kernel::HLERequestContext& ctx) { apm_sys->SetCpuBoostMode(ctx); } -void ICommonStateGetter::PerformSystemButtonPressingIfInFocus(Kernel::HLERequestContext& ctx) { +void ICommonStateGetter::PerformSystemButtonPressingIfInFocus(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto system_button{rp.PopEnum()}; @@ -863,7 +863,7 @@ void ICommonStateGetter::PerformSystemButtonPressingIfInFocus(Kernel::HLERequest } void ICommonStateGetter::SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled( - Kernel::HLERequestContext& ctx) { + HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; @@ -911,7 +911,7 @@ void IStorage::Register() { IStorage::~IStorage() = default; -void IStorage::Open(Kernel::HLERequestContext& ctx) { +void IStorage::Open(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -920,7 +920,7 @@ void IStorage::Open(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(system, *this); } -void ICommonStateGetter::GetOperationMode(Kernel::HLERequestContext& ctx) { +void ICommonStateGetter::GetOperationMode(HLERequestContext& ctx) { const bool use_docked_mode{Settings::values.use_docked_mode.GetValue()}; LOG_DEBUG(Service_AM, "called, use_docked_mode={}", use_docked_mode); @@ -929,7 +929,7 @@ void ICommonStateGetter::GetOperationMode(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(use_docked_mode ? OperationMode::Docked : OperationMode::Handheld)); } -void ICommonStateGetter::GetPerformanceMode(Kernel::HLERequestContext& ctx) { +void ICommonStateGetter::GetPerformanceMode(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -969,7 +969,7 @@ public: } private: - void GetAppletStateChangedEvent(Kernel::HLERequestContext& ctx) { + void GetAppletStateChangedEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -977,7 +977,7 @@ private: rb.PushCopyObjects(applet->GetBroker().GetStateChangedEvent()); } - void IsCompleted(Kernel::HLERequestContext& ctx) { + void IsCompleted(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -985,21 +985,21 @@ private: rb.Push(applet->TransactionComplete()); } - void GetResult(Kernel::HLERequestContext& ctx) { + void GetResult(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(applet->GetStatus()); } - void PresetLibraryAppletGpuTimeSliceZero(Kernel::HLERequestContext& ctx) { + void PresetLibraryAppletGpuTimeSliceZero(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void Start(Kernel::HLERequestContext& ctx) { + void Start(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); ASSERT(applet != nullptr); @@ -1011,7 +1011,7 @@ private: rb.Push(ResultSuccess); } - void PushInData(Kernel::HLERequestContext& ctx) { + void PushInData(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::RequestParser rp{ctx}; @@ -1021,7 +1021,7 @@ private: rb.Push(ResultSuccess); } - void PopOutData(Kernel::HLERequestContext& ctx) { + void PopOutData(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); auto storage = applet->GetBroker().PopNormalDataToGame(); @@ -1038,7 +1038,7 @@ private: rb.PushIpcInterface(std::move(storage)); } - void PushInteractiveInData(Kernel::HLERequestContext& ctx) { + void PushInteractiveInData(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::RequestParser rp{ctx}; @@ -1052,7 +1052,7 @@ private: rb.Push(ResultSuccess); } - void PopInteractiveOutData(Kernel::HLERequestContext& ctx) { + void PopInteractiveOutData(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); auto storage = applet->GetBroker().PopInteractiveDataToGame(); @@ -1069,7 +1069,7 @@ private: rb.PushIpcInterface(std::move(storage)); } - void GetPopOutDataEvent(Kernel::HLERequestContext& ctx) { + void GetPopOutDataEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -1077,7 +1077,7 @@ private: rb.PushCopyObjects(applet->GetBroker().GetNormalDataEvent()); } - void GetPopInteractiveOutDataEvent(Kernel::HLERequestContext& ctx) { + void GetPopInteractiveOutDataEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -1085,7 +1085,7 @@ private: rb.PushCopyObjects(applet->GetBroker().GetInteractiveDataEvent()); } - void GetIndirectLayerConsumerHandle(Kernel::HLERequestContext& ctx) { + void GetIndirectLayerConsumerHandle(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); // We require a non-zero handle to be valid. Using 0xdeadbeef allows us to trace if this is @@ -1115,7 +1115,7 @@ IStorageAccessor::IStorageAccessor(Core::System& system_, IStorage& backing_) IStorageAccessor::~IStorageAccessor() = default; -void IStorageAccessor::GetSize(Kernel::HLERequestContext& ctx) { +void IStorageAccessor::GetSize(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 4}; @@ -1124,7 +1124,7 @@ void IStorageAccessor::GetSize(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(backing.GetSize())); } -void IStorageAccessor::Write(Kernel::HLERequestContext& ctx) { +void IStorageAccessor::Write(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 offset{rp.Pop()}; @@ -1149,7 +1149,7 @@ void IStorageAccessor::Write(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IStorageAccessor::Read(Kernel::HLERequestContext& ctx) { +void IStorageAccessor::Read(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 offset{rp.Pop()}; @@ -1187,7 +1187,7 @@ ILibraryAppletCreator::ILibraryAppletCreator(Core::System& system_) ILibraryAppletCreator::~ILibraryAppletCreator() = default; -void ILibraryAppletCreator::CreateLibraryApplet(Kernel::HLERequestContext& ctx) { +void ILibraryAppletCreator::CreateLibraryApplet(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_id = rp.PopRaw(); @@ -1213,7 +1213,7 @@ void ILibraryAppletCreator::CreateLibraryApplet(Kernel::HLERequestContext& ctx) rb.PushIpcInterface(system, applet); } -void ILibraryAppletCreator::CreateStorage(Kernel::HLERequestContext& ctx) { +void ILibraryAppletCreator::CreateStorage(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s64 size{rp.Pop()}; @@ -1234,7 +1234,7 @@ void ILibraryAppletCreator::CreateStorage(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(system, std::move(buffer)); } -void ILibraryAppletCreator::CreateTransferMemoryStorage(Kernel::HLERequestContext& ctx) { +void ILibraryAppletCreator::CreateTransferMemoryStorage(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { @@ -1273,7 +1273,7 @@ void ILibraryAppletCreator::CreateTransferMemoryStorage(Kernel::HLERequestContex rb.PushIpcInterface(system, std::move(memory)); } -void ILibraryAppletCreator::CreateHandleStorage(Kernel::HLERequestContext& ctx) { +void ILibraryAppletCreator::CreateHandleStorage(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s64 size{rp.Pop()}; @@ -1395,29 +1395,28 @@ IApplicationFunctions::~IApplicationFunctions() { service_context.CloseEvent(health_warning_disappeared_system_event); } -void IApplicationFunctions::EnableApplicationCrashReport(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::EnableApplicationCrashReport(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void IApplicationFunctions::InitializeApplicationCopyrightFrameBuffer( - Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::InitializeApplicationCopyrightFrameBuffer(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void IApplicationFunctions::SetApplicationCopyrightImage(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::SetApplicationCopyrightImage(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void IApplicationFunctions::SetApplicationCopyrightVisibility(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::SetApplicationCopyrightVisibility(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto is_visible = rp.Pop(); @@ -1427,37 +1426,35 @@ void IApplicationFunctions::SetApplicationCopyrightVisibility(Kernel::HLERequest rb.Push(ResultSuccess); } -void IApplicationFunctions::BeginBlockingHomeButtonShortAndLongPressed( - Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::BeginBlockingHomeButtonShortAndLongPressed(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void IApplicationFunctions::EndBlockingHomeButtonShortAndLongPressed( - Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::EndBlockingHomeButtonShortAndLongPressed(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void IApplicationFunctions::BeginBlockingHomeButton(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::BeginBlockingHomeButton(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void IApplicationFunctions::EndBlockingHomeButton(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::EndBlockingHomeButton(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::PopLaunchParameter(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto kind = rp.PopEnum(); @@ -1509,15 +1506,14 @@ void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) { rb.Push(ERR_NO_DATA_IN_CHANNEL); } -void IApplicationFunctions::CreateApplicationAndRequestToStartForQuest( - Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::CreateApplicationAndRequestToStartForQuest(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void IApplicationFunctions::EnsureSaveData(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::EnsureSaveData(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; u128 user_id = rp.PopRaw(); @@ -1535,7 +1531,7 @@ void IApplicationFunctions::EnsureSaveData(Kernel::HLERequestContext& ctx) { rb.Push(0); } -void IApplicationFunctions::SetTerminateResult(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::SetTerminateResult(HLERequestContext& ctx) { // Takes an input u32 Result, no output. // For example, in some cases official apps use this with error 0x2A2 then // uses svcBreak. @@ -1548,7 +1544,7 @@ void IApplicationFunctions::SetTerminateResult(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IApplicationFunctions::GetDisplayVersion(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::GetDisplayVersion(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); std::array version_string{}; @@ -1582,7 +1578,7 @@ void IApplicationFunctions::GetDisplayVersion(Kernel::HLERequestContext& ctx) { rb.PushRaw(version_string); } -void IApplicationFunctions::GetDesiredLanguage(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::GetDesiredLanguage(HLERequestContext& ctx) { // TODO(bunnei): This should be configurable LOG_DEBUG(Service_AM, "called"); @@ -1638,7 +1634,7 @@ void IApplicationFunctions::GetDesiredLanguage(Kernel::HLERequestContext& ctx) { rb.Push(*res_code); } -void IApplicationFunctions::IsGamePlayRecordingSupported(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::IsGamePlayRecordingSupported(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); constexpr bool gameplay_recording_supported = false; @@ -1648,21 +1644,21 @@ void IApplicationFunctions::IsGamePlayRecordingSupported(Kernel::HLERequestConte rb.Push(gameplay_recording_supported); } -void IApplicationFunctions::InitializeGamePlayRecording(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::InitializeGamePlayRecording(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void IApplicationFunctions::SetGamePlayRecordingState(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::SetGamePlayRecordingState(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void IApplicationFunctions::NotifyRunning(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::NotifyRunning(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -1670,7 +1666,7 @@ void IApplicationFunctions::NotifyRunning(Kernel::HLERequestContext& ctx) { rb.Push(0); // Unknown, seems to be ignored by official processes } -void IApplicationFunctions::GetPseudoDeviceId(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::GetPseudoDeviceId(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 6}; @@ -1681,7 +1677,7 @@ void IApplicationFunctions::GetPseudoDeviceId(Kernel::HLERequestContext& ctx) { rb.Push(0); } -void IApplicationFunctions::ExtendSaveData(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::ExtendSaveData(HLERequestContext& ctx) { struct Parameters { FileSys::SaveDataType type; u128 user_id; @@ -1710,7 +1706,7 @@ void IApplicationFunctions::ExtendSaveData(Kernel::HLERequestContext& ctx) { rb.Push(0); } -void IApplicationFunctions::GetSaveDataSize(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::GetSaveDataSize(HLERequestContext& ctx) { struct Parameters { FileSys::SaveDataType type; u128 user_id; @@ -1732,7 +1728,7 @@ void IApplicationFunctions::GetSaveDataSize(Kernel::HLERequestContext& ctx) { rb.Push(size.journal); } -void IApplicationFunctions::QueryApplicationPlayStatistics(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::QueryApplicationPlayStatistics(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -1740,7 +1736,7 @@ void IApplicationFunctions::QueryApplicationPlayStatistics(Kernel::HLERequestCon rb.Push(0); } -void IApplicationFunctions::QueryApplicationPlayStatisticsByUid(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::QueryApplicationPlayStatisticsByUid(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -1748,7 +1744,7 @@ void IApplicationFunctions::QueryApplicationPlayStatisticsByUid(Kernel::HLEReque rb.Push(0); } -void IApplicationFunctions::ExecuteProgram(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::ExecuteProgram(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::RequestParser rp{ctx}; @@ -1762,21 +1758,21 @@ void IApplicationFunctions::ExecuteProgram(Kernel::HLERequestContext& ctx) { system.ExecuteProgram(program_index); } -void IApplicationFunctions::ClearUserChannel(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::ClearUserChannel(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void IApplicationFunctions::UnpopToUserChannel(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::UnpopToUserChannel(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void IApplicationFunctions::GetPreviousProgramIndex(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::GetPreviousProgramIndex(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -1784,7 +1780,7 @@ void IApplicationFunctions::GetPreviousProgramIndex(Kernel::HLERequestContext& c rb.Push(previous_program_index); } -void IApplicationFunctions::GetGpuErrorDetectedSystemEvent(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::GetGpuErrorDetectedSystemEvent(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -1792,7 +1788,7 @@ void IApplicationFunctions::GetGpuErrorDetectedSystemEvent(Kernel::HLERequestCon rb.PushCopyObjects(gpu_error_detected_event->GetReadableEvent()); } -void IApplicationFunctions::GetFriendInvitationStorageChannelEvent(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::GetFriendInvitationStorageChannelEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -1800,15 +1796,14 @@ void IApplicationFunctions::GetFriendInvitationStorageChannelEvent(Kernel::HLERe rb.PushCopyObjects(friend_invitation_storage_channel_event->GetReadableEvent()); } -void IApplicationFunctions::TryPopFromFriendInvitationStorageChannel( - Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::TryPopFromFriendInvitationStorageChannel(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ERR_NO_DATA_IN_CHANNEL); } -void IApplicationFunctions::GetNotificationStorageChannelEvent(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::GetNotificationStorageChannelEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -1816,7 +1811,7 @@ void IApplicationFunctions::GetNotificationStorageChannelEvent(Kernel::HLEReques rb.PushCopyObjects(notification_storage_channel_event->GetReadableEvent()); } -void IApplicationFunctions::GetHealthWarningDisappearedSystemEvent(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::GetHealthWarningDisappearedSystemEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -1824,7 +1819,7 @@ void IApplicationFunctions::GetHealthWarningDisappearedSystemEvent(Kernel::HLERe rb.PushCopyObjects(health_warning_disappeared_system_event->GetReadableEvent()); } -void IApplicationFunctions::PrepareForJit(Kernel::HLERequestContext& ctx) { +void IApplicationFunctions::PrepareForJit(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; @@ -1881,14 +1876,14 @@ IHomeMenuFunctions::~IHomeMenuFunctions() { service_context.CloseEvent(pop_from_general_channel_event); } -void IHomeMenuFunctions::RequestToGetForeground(Kernel::HLERequestContext& ctx) { +void IHomeMenuFunctions::RequestToGetForeground(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void IHomeMenuFunctions::GetPopFromGeneralChannelEvent(Kernel::HLERequestContext& ctx) { +void IHomeMenuFunctions::GetPopFromGeneralChannelEvent(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 1}; diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h index 79e2263d7..fd3d4ddef 100644 --- a/src/core/hle/service/am/am.h +++ b/src/core/hle/service/am/am.h @@ -12,6 +12,7 @@ namespace Kernel { class KernelCore; +class KReadableEvent; class KTransferMemory; } // namespace Kernel @@ -109,8 +110,8 @@ public: ~IWindowController() override; private: - void GetAppletResourceUserId(Kernel::HLERequestContext& ctx); - void AcquireForegroundRights(Kernel::HLERequestContext& ctx); + void GetAppletResourceUserId(HLERequestContext& ctx); + void AcquireForegroundRights(HLERequestContext& ctx); }; class IAudioController final : public ServiceFramework { @@ -119,11 +120,11 @@ public: ~IAudioController() override; private: - void SetExpectedMasterVolume(Kernel::HLERequestContext& ctx); - void GetMainAppletExpectedMasterVolume(Kernel::HLERequestContext& ctx); - void GetLibraryAppletExpectedMasterVolume(Kernel::HLERequestContext& ctx); - void ChangeMainAppletMasterVolume(Kernel::HLERequestContext& ctx); - void SetTransparentAudioRate(Kernel::HLERequestContext& ctx); + void SetExpectedMasterVolume(HLERequestContext& ctx); + void GetMainAppletExpectedMasterVolume(HLERequestContext& ctx); + void GetLibraryAppletExpectedMasterVolume(HLERequestContext& ctx); + void ChangeMainAppletMasterVolume(HLERequestContext& ctx); + void SetTransparentAudioRate(HLERequestContext& ctx); static constexpr float min_allowed_volume = 0.0f; static constexpr float max_allowed_volume = 1.0f; @@ -157,32 +158,32 @@ public: ~ISelfController() override; private: - void Exit(Kernel::HLERequestContext& ctx); - void LockExit(Kernel::HLERequestContext& ctx); - void UnlockExit(Kernel::HLERequestContext& ctx); - void EnterFatalSection(Kernel::HLERequestContext& ctx); - void LeaveFatalSection(Kernel::HLERequestContext& ctx); - void GetLibraryAppletLaunchableEvent(Kernel::HLERequestContext& ctx); - void SetScreenShotPermission(Kernel::HLERequestContext& ctx); - void SetOperationModeChangedNotification(Kernel::HLERequestContext& ctx); - void SetPerformanceModeChangedNotification(Kernel::HLERequestContext& ctx); - void SetFocusHandlingMode(Kernel::HLERequestContext& ctx); - void SetRestartMessageEnabled(Kernel::HLERequestContext& ctx); - void SetOutOfFocusSuspendingEnabled(Kernel::HLERequestContext& ctx); - void SetAlbumImageOrientation(Kernel::HLERequestContext& ctx); - void CreateManagedDisplayLayer(Kernel::HLERequestContext& ctx); - void CreateManagedDisplaySeparableLayer(Kernel::HLERequestContext& ctx); - void SetHandlesRequestToDisplay(Kernel::HLERequestContext& ctx); - void SetIdleTimeDetectionExtension(Kernel::HLERequestContext& ctx); - void GetIdleTimeDetectionExtension(Kernel::HLERequestContext& ctx); - void ReportUserIsActive(Kernel::HLERequestContext& ctx); - void SetAutoSleepDisabled(Kernel::HLERequestContext& ctx); - void IsAutoSleepDisabled(Kernel::HLERequestContext& ctx); - void GetAccumulatedSuspendedTickValue(Kernel::HLERequestContext& ctx); - void GetAccumulatedSuspendedTickChangedEvent(Kernel::HLERequestContext& ctx); - void SetAlbumImageTakenNotificationEnabled(Kernel::HLERequestContext& ctx); - void SaveCurrentScreenshot(Kernel::HLERequestContext& ctx); - void SetRecordVolumeMuted(Kernel::HLERequestContext& ctx); + void Exit(HLERequestContext& ctx); + void LockExit(HLERequestContext& ctx); + void UnlockExit(HLERequestContext& ctx); + void EnterFatalSection(HLERequestContext& ctx); + void LeaveFatalSection(HLERequestContext& ctx); + void GetLibraryAppletLaunchableEvent(HLERequestContext& ctx); + void SetScreenShotPermission(HLERequestContext& ctx); + void SetOperationModeChangedNotification(HLERequestContext& ctx); + void SetPerformanceModeChangedNotification(HLERequestContext& ctx); + void SetFocusHandlingMode(HLERequestContext& ctx); + void SetRestartMessageEnabled(HLERequestContext& ctx); + void SetOutOfFocusSuspendingEnabled(HLERequestContext& ctx); + void SetAlbumImageOrientation(HLERequestContext& ctx); + void CreateManagedDisplayLayer(HLERequestContext& ctx); + void CreateManagedDisplaySeparableLayer(HLERequestContext& ctx); + void SetHandlesRequestToDisplay(HLERequestContext& ctx); + void SetIdleTimeDetectionExtension(HLERequestContext& ctx); + void GetIdleTimeDetectionExtension(HLERequestContext& ctx); + void ReportUserIsActive(HLERequestContext& ctx); + void SetAutoSleepDisabled(HLERequestContext& ctx); + void IsAutoSleepDisabled(HLERequestContext& ctx); + void GetAccumulatedSuspendedTickValue(HLERequestContext& ctx); + void GetAccumulatedSuspendedTickChangedEvent(HLERequestContext& ctx); + void SetAlbumImageTakenNotificationEnabled(HLERequestContext& ctx); + void SaveCurrentScreenshot(HLERequestContext& ctx); + void SetRecordVolumeMuted(HLERequestContext& ctx); enum class ScreenshotPermission : u32 { Inherit = 0, @@ -235,22 +236,22 @@ private: CaptureButtonLongPressing, }; - void GetEventHandle(Kernel::HLERequestContext& ctx); - void ReceiveMessage(Kernel::HLERequestContext& ctx); - void GetCurrentFocusState(Kernel::HLERequestContext& ctx); - void GetDefaultDisplayResolutionChangeEvent(Kernel::HLERequestContext& ctx); - void GetOperationMode(Kernel::HLERequestContext& ctx); - void GetPerformanceMode(Kernel::HLERequestContext& ctx); - void GetBootMode(Kernel::HLERequestContext& ctx); - void IsVrModeEnabled(Kernel::HLERequestContext& ctx); - void SetVrModeEnabled(Kernel::HLERequestContext& ctx); - void SetLcdBacklighOffEnabled(Kernel::HLERequestContext& ctx); - void BeginVrModeEx(Kernel::HLERequestContext& ctx); - void EndVrModeEx(Kernel::HLERequestContext& ctx); - void GetDefaultDisplayResolution(Kernel::HLERequestContext& ctx); - void SetCpuBoostMode(Kernel::HLERequestContext& ctx); - void PerformSystemButtonPressingIfInFocus(Kernel::HLERequestContext& ctx); - void SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled(Kernel::HLERequestContext& ctx); + void GetEventHandle(HLERequestContext& ctx); + void ReceiveMessage(HLERequestContext& ctx); + void GetCurrentFocusState(HLERequestContext& ctx); + void GetDefaultDisplayResolutionChangeEvent(HLERequestContext& ctx); + void GetOperationMode(HLERequestContext& ctx); + void GetPerformanceMode(HLERequestContext& ctx); + void GetBootMode(HLERequestContext& ctx); + void IsVrModeEnabled(HLERequestContext& ctx); + void SetVrModeEnabled(HLERequestContext& ctx); + void SetLcdBacklighOffEnabled(HLERequestContext& ctx); + void BeginVrModeEx(HLERequestContext& ctx); + void EndVrModeEx(HLERequestContext& ctx); + void GetDefaultDisplayResolution(HLERequestContext& ctx); + void SetCpuBoostMode(HLERequestContext& ctx); + void PerformSystemButtonPressingIfInFocus(HLERequestContext& ctx); + void SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled(HLERequestContext& ctx); std::shared_ptr msg_queue; bool vr_mode_state{}; @@ -283,7 +284,7 @@ public: private: void Register(); - void Open(Kernel::HLERequestContext& ctx); + void Open(HLERequestContext& ctx); std::shared_ptr impl; }; @@ -294,9 +295,9 @@ public: ~IStorageAccessor() override; private: - void GetSize(Kernel::HLERequestContext& ctx); - void Write(Kernel::HLERequestContext& ctx); - void Read(Kernel::HLERequestContext& ctx); + void GetSize(HLERequestContext& ctx); + void Write(HLERequestContext& ctx); + void Read(HLERequestContext& ctx); IStorage& backing; }; @@ -307,10 +308,10 @@ public: ~ILibraryAppletCreator() override; private: - void CreateLibraryApplet(Kernel::HLERequestContext& ctx); - void CreateStorage(Kernel::HLERequestContext& ctx); - void CreateTransferMemoryStorage(Kernel::HLERequestContext& ctx); - void CreateHandleStorage(Kernel::HLERequestContext& ctx); + void CreateLibraryApplet(HLERequestContext& ctx); + void CreateStorage(HLERequestContext& ctx); + void CreateTransferMemoryStorage(HLERequestContext& ctx); + void CreateHandleStorage(HLERequestContext& ctx); }; class IApplicationFunctions final : public ServiceFramework { @@ -319,39 +320,39 @@ public: ~IApplicationFunctions() override; private: - void PopLaunchParameter(Kernel::HLERequestContext& ctx); - void CreateApplicationAndRequestToStartForQuest(Kernel::HLERequestContext& ctx); - void EnsureSaveData(Kernel::HLERequestContext& ctx); - void SetTerminateResult(Kernel::HLERequestContext& ctx); - void GetDisplayVersion(Kernel::HLERequestContext& ctx); - void GetDesiredLanguage(Kernel::HLERequestContext& ctx); - void IsGamePlayRecordingSupported(Kernel::HLERequestContext& ctx); - void InitializeGamePlayRecording(Kernel::HLERequestContext& ctx); - void SetGamePlayRecordingState(Kernel::HLERequestContext& ctx); - void NotifyRunning(Kernel::HLERequestContext& ctx); - void GetPseudoDeviceId(Kernel::HLERequestContext& ctx); - void ExtendSaveData(Kernel::HLERequestContext& ctx); - void GetSaveDataSize(Kernel::HLERequestContext& ctx); - void BeginBlockingHomeButtonShortAndLongPressed(Kernel::HLERequestContext& ctx); - void EndBlockingHomeButtonShortAndLongPressed(Kernel::HLERequestContext& ctx); - void BeginBlockingHomeButton(Kernel::HLERequestContext& ctx); - void EndBlockingHomeButton(Kernel::HLERequestContext& ctx); - void EnableApplicationCrashReport(Kernel::HLERequestContext& ctx); - void InitializeApplicationCopyrightFrameBuffer(Kernel::HLERequestContext& ctx); - void SetApplicationCopyrightImage(Kernel::HLERequestContext& ctx); - void SetApplicationCopyrightVisibility(Kernel::HLERequestContext& ctx); - void QueryApplicationPlayStatistics(Kernel::HLERequestContext& ctx); - void QueryApplicationPlayStatisticsByUid(Kernel::HLERequestContext& ctx); - void ExecuteProgram(Kernel::HLERequestContext& ctx); - void ClearUserChannel(Kernel::HLERequestContext& ctx); - void UnpopToUserChannel(Kernel::HLERequestContext& ctx); - void GetPreviousProgramIndex(Kernel::HLERequestContext& ctx); - void GetGpuErrorDetectedSystemEvent(Kernel::HLERequestContext& ctx); - void GetFriendInvitationStorageChannelEvent(Kernel::HLERequestContext& ctx); - void TryPopFromFriendInvitationStorageChannel(Kernel::HLERequestContext& ctx); - void GetNotificationStorageChannelEvent(Kernel::HLERequestContext& ctx); - void GetHealthWarningDisappearedSystemEvent(Kernel::HLERequestContext& ctx); - void PrepareForJit(Kernel::HLERequestContext& ctx); + void PopLaunchParameter(HLERequestContext& ctx); + void CreateApplicationAndRequestToStartForQuest(HLERequestContext& ctx); + void EnsureSaveData(HLERequestContext& ctx); + void SetTerminateResult(HLERequestContext& ctx); + void GetDisplayVersion(HLERequestContext& ctx); + void GetDesiredLanguage(HLERequestContext& ctx); + void IsGamePlayRecordingSupported(HLERequestContext& ctx); + void InitializeGamePlayRecording(HLERequestContext& ctx); + void SetGamePlayRecordingState(HLERequestContext& ctx); + void NotifyRunning(HLERequestContext& ctx); + void GetPseudoDeviceId(HLERequestContext& ctx); + void ExtendSaveData(HLERequestContext& ctx); + void GetSaveDataSize(HLERequestContext& ctx); + void BeginBlockingHomeButtonShortAndLongPressed(HLERequestContext& ctx); + void EndBlockingHomeButtonShortAndLongPressed(HLERequestContext& ctx); + void BeginBlockingHomeButton(HLERequestContext& ctx); + void EndBlockingHomeButton(HLERequestContext& ctx); + void EnableApplicationCrashReport(HLERequestContext& ctx); + void InitializeApplicationCopyrightFrameBuffer(HLERequestContext& ctx); + void SetApplicationCopyrightImage(HLERequestContext& ctx); + void SetApplicationCopyrightVisibility(HLERequestContext& ctx); + void QueryApplicationPlayStatistics(HLERequestContext& ctx); + void QueryApplicationPlayStatisticsByUid(HLERequestContext& ctx); + void ExecuteProgram(HLERequestContext& ctx); + void ClearUserChannel(HLERequestContext& ctx); + void UnpopToUserChannel(HLERequestContext& ctx); + void GetPreviousProgramIndex(HLERequestContext& ctx); + void GetGpuErrorDetectedSystemEvent(HLERequestContext& ctx); + void GetFriendInvitationStorageChannelEvent(HLERequestContext& ctx); + void TryPopFromFriendInvitationStorageChannel(HLERequestContext& ctx); + void GetNotificationStorageChannelEvent(HLERequestContext& ctx); + void GetHealthWarningDisappearedSystemEvent(HLERequestContext& ctx); + void PrepareForJit(HLERequestContext& ctx); KernelHelpers::ServiceContext service_context; @@ -370,8 +371,8 @@ public: ~IHomeMenuFunctions() override; private: - void RequestToGetForeground(Kernel::HLERequestContext& ctx); - void GetPopFromGeneralChannelEvent(Kernel::HLERequestContext& ctx); + void RequestToGetForeground(HLERequestContext& ctx); + void GetPopFromGeneralChannelEvent(HLERequestContext& ctx); KernelHelpers::ServiceContext service_context; diff --git a/src/core/hle/service/am/applet_ae.cpp b/src/core/hle/service/am/applet_ae.cpp index d7719da35..e15b5ccfa 100644 --- a/src/core/hle/service/am/applet_ae.cpp +++ b/src/core/hle/service/am/applet_ae.cpp @@ -3,9 +3,9 @@ #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/am/am.h" #include "core/hle/service/am/applet_ae.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nvflinger/nvflinger.h" namespace Service::AM { @@ -36,7 +36,7 @@ public: } private: - void GetCommonStateGetter(Kernel::HLERequestContext& ctx) { + void GetCommonStateGetter(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -44,7 +44,7 @@ private: rb.PushIpcInterface(system, msg_queue); } - void GetSelfController(Kernel::HLERequestContext& ctx) { + void GetSelfController(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -52,7 +52,7 @@ private: rb.PushIpcInterface(system, nvflinger); } - void GetWindowController(Kernel::HLERequestContext& ctx) { + void GetWindowController(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -60,7 +60,7 @@ private: rb.PushIpcInterface(system); } - void GetAudioController(Kernel::HLERequestContext& ctx) { + void GetAudioController(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -68,7 +68,7 @@ private: rb.PushIpcInterface(system); } - void GetDisplayController(Kernel::HLERequestContext& ctx) { + void GetDisplayController(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -76,7 +76,7 @@ private: rb.PushIpcInterface(system); } - void GetProcessWindingController(Kernel::HLERequestContext& ctx) { + void GetProcessWindingController(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -84,7 +84,7 @@ private: rb.PushIpcInterface(system); } - void GetDebugFunctions(Kernel::HLERequestContext& ctx) { + void GetDebugFunctions(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -92,7 +92,7 @@ private: rb.PushIpcInterface(system); } - void GetLibraryAppletCreator(Kernel::HLERequestContext& ctx) { + void GetLibraryAppletCreator(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -100,7 +100,7 @@ private: rb.PushIpcInterface(system); } - void GetApplicationFunctions(Kernel::HLERequestContext& ctx) { + void GetApplicationFunctions(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -140,7 +140,7 @@ public: } private: - void GetCommonStateGetter(Kernel::HLERequestContext& ctx) { + void GetCommonStateGetter(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -148,7 +148,7 @@ private: rb.PushIpcInterface(system, msg_queue); } - void GetSelfController(Kernel::HLERequestContext& ctx) { + void GetSelfController(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -156,7 +156,7 @@ private: rb.PushIpcInterface(system, nvflinger); } - void GetWindowController(Kernel::HLERequestContext& ctx) { + void GetWindowController(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -164,7 +164,7 @@ private: rb.PushIpcInterface(system); } - void GetAudioController(Kernel::HLERequestContext& ctx) { + void GetAudioController(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -172,7 +172,7 @@ private: rb.PushIpcInterface(system); } - void GetDisplayController(Kernel::HLERequestContext& ctx) { + void GetDisplayController(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -180,7 +180,7 @@ private: rb.PushIpcInterface(system); } - void GetDebugFunctions(Kernel::HLERequestContext& ctx) { + void GetDebugFunctions(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -188,7 +188,7 @@ private: rb.PushIpcInterface(system); } - void GetLibraryAppletCreator(Kernel::HLERequestContext& ctx) { + void GetLibraryAppletCreator(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -196,7 +196,7 @@ private: rb.PushIpcInterface(system); } - void GetHomeMenuFunctions(Kernel::HLERequestContext& ctx) { + void GetHomeMenuFunctions(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -204,7 +204,7 @@ private: rb.PushIpcInterface(system); } - void GetGlobalStateController(Kernel::HLERequestContext& ctx) { + void GetGlobalStateController(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -212,7 +212,7 @@ private: rb.PushIpcInterface(system); } - void GetApplicationCreator(Kernel::HLERequestContext& ctx) { + void GetApplicationCreator(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -224,7 +224,7 @@ private: std::shared_ptr msg_queue; }; -void AppletAE::OpenSystemAppletProxy(Kernel::HLERequestContext& ctx) { +void AppletAE::OpenSystemAppletProxy(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -232,7 +232,7 @@ void AppletAE::OpenSystemAppletProxy(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(nvflinger, msg_queue, system); } -void AppletAE::OpenLibraryAppletProxy(Kernel::HLERequestContext& ctx) { +void AppletAE::OpenLibraryAppletProxy(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -240,7 +240,7 @@ void AppletAE::OpenLibraryAppletProxy(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(nvflinger, msg_queue, system); } -void AppletAE::OpenLibraryAppletProxyOld(Kernel::HLERequestContext& ctx) { +void AppletAE::OpenLibraryAppletProxyOld(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; diff --git a/src/core/hle/service/am/applet_ae.h b/src/core/hle/service/am/applet_ae.h index 2147976a6..df8dccdc0 100644 --- a/src/core/hle/service/am/applet_ae.h +++ b/src/core/hle/service/am/applet_ae.h @@ -29,9 +29,9 @@ public: const std::shared_ptr& GetMessageQueue() const; private: - void OpenSystemAppletProxy(Kernel::HLERequestContext& ctx); - void OpenLibraryAppletProxy(Kernel::HLERequestContext& ctx); - void OpenLibraryAppletProxyOld(Kernel::HLERequestContext& ctx); + void OpenSystemAppletProxy(HLERequestContext& ctx); + void OpenLibraryAppletProxy(HLERequestContext& ctx); + void OpenLibraryAppletProxyOld(HLERequestContext& ctx); NVFlinger::NVFlinger& nvflinger; std::shared_ptr msg_queue; diff --git a/src/core/hle/service/am/applet_oe.cpp b/src/core/hle/service/am/applet_oe.cpp index 00fc4202c..75c330f0a 100644 --- a/src/core/hle/service/am/applet_oe.cpp +++ b/src/core/hle/service/am/applet_oe.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/am/am.h" #include "core/hle/service/am/applet_oe.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nvflinger/nvflinger.h" namespace Service::AM { @@ -34,7 +34,7 @@ public: } private: - void GetAudioController(Kernel::HLERequestContext& ctx) { + void GetAudioController(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -42,7 +42,7 @@ private: rb.PushIpcInterface(system); } - void GetDisplayController(Kernel::HLERequestContext& ctx) { + void GetDisplayController(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -50,7 +50,7 @@ private: rb.PushIpcInterface(system); } - void GetDebugFunctions(Kernel::HLERequestContext& ctx) { + void GetDebugFunctions(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -58,7 +58,7 @@ private: rb.PushIpcInterface(system); } - void GetWindowController(Kernel::HLERequestContext& ctx) { + void GetWindowController(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -66,7 +66,7 @@ private: rb.PushIpcInterface(system); } - void GetSelfController(Kernel::HLERequestContext& ctx) { + void GetSelfController(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -74,7 +74,7 @@ private: rb.PushIpcInterface(system, nvflinger); } - void GetCommonStateGetter(Kernel::HLERequestContext& ctx) { + void GetCommonStateGetter(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -82,7 +82,7 @@ private: rb.PushIpcInterface(system, msg_queue); } - void GetLibraryAppletCreator(Kernel::HLERequestContext& ctx) { + void GetLibraryAppletCreator(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -90,7 +90,7 @@ private: rb.PushIpcInterface(system); } - void GetApplicationFunctions(Kernel::HLERequestContext& ctx) { + void GetApplicationFunctions(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -102,7 +102,7 @@ private: std::shared_ptr msg_queue; }; -void AppletOE::OpenApplicationProxy(Kernel::HLERequestContext& ctx) { +void AppletOE::OpenApplicationProxy(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; diff --git a/src/core/hle/service/am/applet_oe.h b/src/core/hle/service/am/applet_oe.h index 8fea249f1..f34e4224e 100644 --- a/src/core/hle/service/am/applet_oe.h +++ b/src/core/hle/service/am/applet_oe.h @@ -29,7 +29,7 @@ public: const std::shared_ptr& GetMessageQueue() const; private: - void OpenApplicationProxy(Kernel::HLERequestContext& ctx); + void OpenApplicationProxy(HLERequestContext& ctx); NVFlinger::NVFlinger& nvflinger; std::shared_ptr msg_queue; diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp index fed51cfd6..38c2138e8 100644 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ b/src/core/hle/service/aoc/aoc_u.cpp @@ -14,9 +14,9 @@ #include "core/file_sys/nca_metadata.h" #include "core/file_sys/patch_manager.h" #include "core/file_sys/registered_cache.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/aoc/aoc_u.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" #include "core/loader/loader.h" @@ -69,7 +69,7 @@ public: } private: - void SetDefaultDeliveryTarget(Kernel::HLERequestContext& ctx) { + void SetDefaultDeliveryTarget(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto unknown_1 = rp.Pop(); @@ -81,7 +81,7 @@ private: rb.Push(ResultSuccess); } - void SetDeliveryTarget(Kernel::HLERequestContext& ctx) { + void SetDeliveryTarget(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto unknown_1 = rp.Pop(); @@ -93,7 +93,7 @@ private: rb.Push(ResultSuccess); } - void GetPurchasedEventReadableHandle(Kernel::HLERequestContext& ctx) { + void GetPurchasedEventReadableHandle(HLERequestContext& ctx) { LOG_WARNING(Service_AOC, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -145,7 +145,7 @@ AOC_U::~AOC_U() { service_context.CloseEvent(aoc_change_event); } -void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) { +void AOC_U::CountAddOnContent(HLERequestContext& ctx) { struct Parameters { u64 process_id; }; @@ -172,7 +172,7 @@ void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) { [current](u64 tid) { return CheckAOCTitleIDMatchesBase(tid, current); }))); } -void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { +void AOC_U::ListAddOnContent(HLERequestContext& ctx) { struct Parameters { u32 offset; u32 count; @@ -218,7 +218,7 @@ void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { rb.Push(out_count); } -void AOC_U::GetAddOnContentBaseId(Kernel::HLERequestContext& ctx) { +void AOC_U::GetAddOnContentBaseId(HLERequestContext& ctx) { struct Parameters { u64 process_id; }; @@ -245,7 +245,7 @@ void AOC_U::GetAddOnContentBaseId(Kernel::HLERequestContext& ctx) { rb.Push(res.first->GetDLCBaseTitleId()); } -void AOC_U::PrepareAddOnContent(Kernel::HLERequestContext& ctx) { +void AOC_U::PrepareAddOnContent(HLERequestContext& ctx) { struct Parameters { s32 addon_index; u64 process_id; @@ -262,7 +262,7 @@ void AOC_U::PrepareAddOnContent(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void AOC_U::GetAddOnContentListChangedEvent(Kernel::HLERequestContext& ctx) { +void AOC_U::GetAddOnContentListChangedEvent(HLERequestContext& ctx) { LOG_WARNING(Service_AOC, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -270,7 +270,7 @@ void AOC_U::GetAddOnContentListChangedEvent(Kernel::HLERequestContext& ctx) { rb.PushCopyObjects(aoc_change_event->GetReadableEvent()); } -void AOC_U::GetAddOnContentListChangedEventWithProcessId(Kernel::HLERequestContext& ctx) { +void AOC_U::GetAddOnContentListChangedEventWithProcessId(HLERequestContext& ctx) { LOG_WARNING(Service_AOC, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -278,28 +278,28 @@ void AOC_U::GetAddOnContentListChangedEventWithProcessId(Kernel::HLERequestConte rb.PushCopyObjects(aoc_change_event->GetReadableEvent()); } -void AOC_U::NotifyMountAddOnContent(Kernel::HLERequestContext& ctx) { +void AOC_U::NotifyMountAddOnContent(HLERequestContext& ctx) { LOG_WARNING(Service_AOC, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void AOC_U::NotifyUnmountAddOnContent(Kernel::HLERequestContext& ctx) { +void AOC_U::NotifyUnmountAddOnContent(HLERequestContext& ctx) { LOG_WARNING(Service_AOC, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void AOC_U::CheckAddOnContentMountStatus(Kernel::HLERequestContext& ctx) { +void AOC_U::CheckAddOnContentMountStatus(HLERequestContext& ctx) { LOG_WARNING(Service_AOC, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void AOC_U::CreateEcPurchasedEventManager(Kernel::HLERequestContext& ctx) { +void AOC_U::CreateEcPurchasedEventManager(HLERequestContext& ctx) { LOG_WARNING(Service_AOC, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -307,7 +307,7 @@ void AOC_U::CreateEcPurchasedEventManager(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(system); } -void AOC_U::CreatePermanentEcPurchasedEventManager(Kernel::HLERequestContext& ctx) { +void AOC_U::CreatePermanentEcPurchasedEventManager(HLERequestContext& ctx) { LOG_WARNING(Service_AOC, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; diff --git a/src/core/hle/service/aoc/aoc_u.h b/src/core/hle/service/aoc/aoc_u.h index 5e7087e50..12ccfeb6a 100644 --- a/src/core/hle/service/aoc/aoc_u.h +++ b/src/core/hle/service/aoc/aoc_u.h @@ -22,17 +22,17 @@ public: ~AOC_U() override; private: - void CountAddOnContent(Kernel::HLERequestContext& ctx); - void ListAddOnContent(Kernel::HLERequestContext& ctx); - void GetAddOnContentBaseId(Kernel::HLERequestContext& ctx); - void PrepareAddOnContent(Kernel::HLERequestContext& ctx); - void GetAddOnContentListChangedEvent(Kernel::HLERequestContext& ctx); - void GetAddOnContentListChangedEventWithProcessId(Kernel::HLERequestContext& ctx); - void NotifyMountAddOnContent(Kernel::HLERequestContext& ctx); - void NotifyUnmountAddOnContent(Kernel::HLERequestContext& ctx); - void CheckAddOnContentMountStatus(Kernel::HLERequestContext& ctx); - void CreateEcPurchasedEventManager(Kernel::HLERequestContext& ctx); - void CreatePermanentEcPurchasedEventManager(Kernel::HLERequestContext& ctx); + void CountAddOnContent(HLERequestContext& ctx); + void ListAddOnContent(HLERequestContext& ctx); + void GetAddOnContentBaseId(HLERequestContext& ctx); + void PrepareAddOnContent(HLERequestContext& ctx); + void GetAddOnContentListChangedEvent(HLERequestContext& ctx); + void GetAddOnContentListChangedEventWithProcessId(HLERequestContext& ctx); + void NotifyMountAddOnContent(HLERequestContext& ctx); + void NotifyUnmountAddOnContent(HLERequestContext& ctx); + void CheckAddOnContentMountStatus(HLERequestContext& ctx); + void CreateEcPurchasedEventManager(HLERequestContext& ctx); + void CreatePermanentEcPurchasedEventManager(HLERequestContext& ctx); std::vector add_on_content; KernelHelpers::ServiceContext service_context; diff --git a/src/core/hle/service/apm/apm_interface.cpp b/src/core/hle/service/apm/apm_interface.cpp index 041fc16bd..d29051ee7 100644 --- a/src/core/hle/service/apm/apm_interface.cpp +++ b/src/core/hle/service/apm/apm_interface.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/apm/apm.h" #include "core/hle/service/apm/apm_controller.h" #include "core/hle/service/apm/apm_interface.h" +#include "core/hle/service/ipc_helpers.h" namespace Service::APM { @@ -22,7 +22,7 @@ public: } private: - void SetPerformanceConfiguration(Kernel::HLERequestContext& ctx) { + void SetPerformanceConfiguration(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto mode = rp.PopEnum(); @@ -35,7 +35,7 @@ private: rb.Push(ResultSuccess); } - void GetPerformanceConfiguration(Kernel::HLERequestContext& ctx) { + void GetPerformanceConfiguration(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto mode = rp.PopEnum(); @@ -46,7 +46,7 @@ private: rb.PushEnum(controller.GetCurrentPerformanceConfiguration(mode)); } - void SetCpuOverclockEnabled(Kernel::HLERequestContext& ctx) { + void SetCpuOverclockEnabled(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto cpu_overclock_enabled = rp.Pop(); @@ -74,7 +74,7 @@ APM::APM(Core::System& system_, std::shared_ptr apm_, Controller& contro APM::~APM() = default; -void APM::OpenSession(Kernel::HLERequestContext& ctx) { +void APM::OpenSession(HLERequestContext& ctx) { LOG_DEBUG(Service_APM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -82,14 +82,14 @@ void APM::OpenSession(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(system, controller); } -void APM::GetPerformanceMode(Kernel::HLERequestContext& ctx) { +void APM::GetPerformanceMode(HLERequestContext& ctx) { LOG_DEBUG(Service_APM, "called"); IPC::ResponseBuilder rb{ctx, 2}; rb.PushEnum(controller.GetCurrentPerformanceMode()); } -void APM::IsCpuOverclockEnabled(Kernel::HLERequestContext& ctx) { +void APM::IsCpuOverclockEnabled(HLERequestContext& ctx) { LOG_WARNING(Service_APM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -117,7 +117,7 @@ APM_Sys::APM_Sys(Core::System& system_, Controller& controller_) APM_Sys::~APM_Sys() = default; -void APM_Sys::GetPerformanceEvent(Kernel::HLERequestContext& ctx) { +void APM_Sys::GetPerformanceEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_APM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -125,7 +125,7 @@ void APM_Sys::GetPerformanceEvent(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(system, controller); } -void APM_Sys::SetCpuBoostMode(Kernel::HLERequestContext& ctx) { +void APM_Sys::SetCpuBoostMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto mode = rp.PopEnum(); @@ -137,7 +137,7 @@ void APM_Sys::SetCpuBoostMode(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void APM_Sys::GetCurrentPerformanceConfiguration(Kernel::HLERequestContext& ctx) { +void APM_Sys::GetCurrentPerformanceConfiguration(HLERequestContext& ctx) { LOG_DEBUG(Service_APM, "called"); IPC::ResponseBuilder rb{ctx, 3}; diff --git a/src/core/hle/service/apm/apm_interface.h b/src/core/hle/service/apm/apm_interface.h index 0740fd4ba..58718453b 100644 --- a/src/core/hle/service/apm/apm_interface.h +++ b/src/core/hle/service/apm/apm_interface.h @@ -17,9 +17,9 @@ public: ~APM() override; private: - void OpenSession(Kernel::HLERequestContext& ctx); - void GetPerformanceMode(Kernel::HLERequestContext& ctx); - void IsCpuOverclockEnabled(Kernel::HLERequestContext& ctx); + void OpenSession(HLERequestContext& ctx); + void GetPerformanceMode(HLERequestContext& ctx); + void IsCpuOverclockEnabled(HLERequestContext& ctx); std::shared_ptr apm; Controller& controller; @@ -30,11 +30,11 @@ public: explicit APM_Sys(Core::System& system_, Controller& controller); ~APM_Sys() override; - void SetCpuBoostMode(Kernel::HLERequestContext& ctx); + void SetCpuBoostMode(HLERequestContext& ctx); private: - void GetPerformanceEvent(Kernel::HLERequestContext& ctx); - void GetCurrentPerformanceConfiguration(Kernel::HLERequestContext& ctx); + void GetPerformanceEvent(HLERequestContext& ctx); + void GetCurrentPerformanceConfiguration(HLERequestContext& ctx); Controller& controller; }; diff --git a/src/core/hle/service/audio/audctl.cpp b/src/core/hle/service/audio/audctl.cpp index 5abf22ba4..7ad93be6b 100644 --- a/src/core/hle/service/audio/audctl.cpp +++ b/src/core/hle/service/audio/audctl.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/audio/audctl.h" +#include "core/hle/service/ipc_helpers.h" namespace Service::Audio { @@ -72,7 +72,7 @@ AudCtl::AudCtl(Core::System& system_) : ServiceFramework{system_, "audctl"} { AudCtl::~AudCtl() = default; -void AudCtl::GetTargetVolumeMin(Kernel::HLERequestContext& ctx) { +void AudCtl::GetTargetVolumeMin(HLERequestContext& ctx) { LOG_DEBUG(Audio, "called."); // This service function is currently hardcoded on the @@ -84,7 +84,7 @@ void AudCtl::GetTargetVolumeMin(Kernel::HLERequestContext& ctx) { rb.Push(target_min_volume); } -void AudCtl::GetTargetVolumeMax(Kernel::HLERequestContext& ctx) { +void AudCtl::GetTargetVolumeMax(HLERequestContext& ctx) { LOG_DEBUG(Audio, "called."); // This service function is currently hardcoded on the diff --git a/src/core/hle/service/audio/audctl.h b/src/core/hle/service/audio/audctl.h index a27ff6cfe..8e31ac237 100644 --- a/src/core/hle/service/audio/audctl.h +++ b/src/core/hle/service/audio/audctl.h @@ -17,8 +17,8 @@ public: ~AudCtl() override; private: - void GetTargetVolumeMin(Kernel::HLERequestContext& ctx); - void GetTargetVolumeMax(Kernel::HLERequestContext& ctx); + void GetTargetVolumeMin(HLERequestContext& ctx); + void GetTargetVolumeMax(HLERequestContext& ctx); }; } // namespace Service::Audio diff --git a/src/core/hle/service/audio/audin_u.cpp b/src/core/hle/service/audio/audin_u.cpp index 26dec7147..f0640c64f 100644 --- a/src/core/hle/service/audio/audin_u.cpp +++ b/src/core/hle/service/audio/audin_u.cpp @@ -7,9 +7,9 @@ #include "common/logging/log.h" #include "common/string_util.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/audio/audin_u.h" +#include "core/hle/service/ipc_helpers.h" namespace Service::Audio { using namespace AudioCore::AudioIn; @@ -61,7 +61,7 @@ public: } private: - void GetAudioInState(Kernel::HLERequestContext& ctx) { + void GetAudioInState(HLERequestContext& ctx) { const auto state = static_cast(impl->GetState()); LOG_DEBUG(Service_Audio, "called. State={}", state); @@ -71,7 +71,7 @@ private: rb.Push(state); } - void Start(Kernel::HLERequestContext& ctx) { + void Start(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); auto result = impl->StartSystem(); @@ -80,7 +80,7 @@ private: rb.Push(result); } - void Stop(Kernel::HLERequestContext& ctx) { + void Stop(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); auto result = impl->StopSystem(); @@ -89,7 +89,7 @@ private: rb.Push(result); } - void AppendAudioInBuffer(Kernel::HLERequestContext& ctx) { + void AppendAudioInBuffer(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; u64 tag = rp.PopRaw(); @@ -111,7 +111,7 @@ private: rb.Push(result); } - void RegisterBufferEvent(Kernel::HLERequestContext& ctx) { + void RegisterBufferEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); auto& buffer_event = impl->GetBufferEvent(); @@ -121,7 +121,7 @@ private: rb.PushCopyObjects(buffer_event); } - void GetReleasedAudioInBuffer(Kernel::HLERequestContext& ctx) { + void GetReleasedAudioInBuffer(HLERequestContext& ctx) { const auto write_buffer_size = ctx.GetWriteBufferNumElements(); std::vector released_buffers(write_buffer_size); @@ -141,7 +141,7 @@ private: rb.Push(count); } - void ContainsAudioInBuffer(Kernel::HLERequestContext& ctx) { + void ContainsAudioInBuffer(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 tag{rp.Pop()}; @@ -154,7 +154,7 @@ private: rb.Push(buffer_queued); } - void GetAudioInBufferCount(Kernel::HLERequestContext& ctx) { + void GetAudioInBufferCount(HLERequestContext& ctx) { const auto buffer_count = impl->GetBufferCount(); LOG_DEBUG(Service_Audio, "called. Buffer count={}", buffer_count); @@ -165,7 +165,7 @@ private: rb.Push(buffer_count); } - void SetDeviceGain(Kernel::HLERequestContext& ctx) { + void SetDeviceGain(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto volume{rp.Pop()}; @@ -177,7 +177,7 @@ private: rb.Push(ResultSuccess); } - void GetDeviceGain(Kernel::HLERequestContext& ctx) { + void GetDeviceGain(HLERequestContext& ctx) { auto volume{impl->GetVolume()}; LOG_DEBUG(Service_Audio, "called. Gain {}", volume); @@ -187,7 +187,7 @@ private: rb.Push(volume); } - void FlushAudioInBuffers(Kernel::HLERequestContext& ctx) { + void FlushAudioInBuffers(HLERequestContext& ctx) { bool flushed{impl->FlushAudioInBuffers()}; LOG_DEBUG(Service_Audio, "called. Were any buffers flushed? {}", flushed); @@ -221,7 +221,7 @@ AudInU::AudInU(Core::System& system_) AudInU::~AudInU() = default; -void AudInU::ListAudioIns(Kernel::HLERequestContext& ctx) { +void AudInU::ListAudioIns(HLERequestContext& ctx) { using namespace AudioCore::AudioRenderer; LOG_DEBUG(Service_Audio, "called"); @@ -241,7 +241,7 @@ void AudInU::ListAudioIns(Kernel::HLERequestContext& ctx) { rb.Push(out_count); } -void AudInU::ListAudioInsAutoFiltered(Kernel::HLERequestContext& ctx) { +void AudInU::ListAudioInsAutoFiltered(HLERequestContext& ctx) { using namespace AudioCore::AudioRenderer; LOG_DEBUG(Service_Audio, "called"); @@ -261,7 +261,7 @@ void AudInU::ListAudioInsAutoFiltered(Kernel::HLERequestContext& ctx) { rb.Push(out_count); } -void AudInU::OpenAudioIn(Kernel::HLERequestContext& ctx) { +void AudInU::OpenAudioIn(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; auto in_params{rp.PopRaw()}; auto applet_resource_user_id{rp.PopRaw()}; @@ -311,7 +311,7 @@ void AudInU::OpenAudioIn(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(audio_in); } -void AudInU::OpenAudioInProtocolSpecified(Kernel::HLERequestContext& ctx) { +void AudInU::OpenAudioInProtocolSpecified(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; auto protocol_specified{rp.PopRaw()}; auto in_params{rp.PopRaw()}; diff --git a/src/core/hle/service/audio/audin_u.h b/src/core/hle/service/audio/audin_u.h index b45fda78a..51e770ff9 100644 --- a/src/core/hle/service/audio/audin_u.h +++ b/src/core/hle/service/audio/audin_u.h @@ -12,10 +12,6 @@ namespace Core { class System; } -namespace Kernel { -class HLERequestContext; -} - namespace AudioCore::AudioOut { class Manager; class In; @@ -29,11 +25,11 @@ public: ~AudInU() override; private: - void ListAudioIns(Kernel::HLERequestContext& ctx); - void ListAudioInsAutoFiltered(Kernel::HLERequestContext& ctx); - void OpenInOutImpl(Kernel::HLERequestContext& ctx); - void OpenAudioIn(Kernel::HLERequestContext& ctx); - void OpenAudioInProtocolSpecified(Kernel::HLERequestContext& ctx); + void ListAudioIns(HLERequestContext& ctx); + void ListAudioInsAutoFiltered(HLERequestContext& ctx); + void OpenInOutImpl(HLERequestContext& ctx); + void OpenAudioIn(HLERequestContext& ctx); + void OpenAudioInProtocolSpecified(HLERequestContext& ctx); KernelHelpers::ServiceContext service_context; std::unique_ptr impl; diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp index 991e30ba1..23b8be993 100644 --- a/src/core/hle/service/audio/audout_u.cpp +++ b/src/core/hle/service/audio/audout_u.cpp @@ -12,10 +12,10 @@ #include "common/string_util.h" #include "common/swap.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/audio/audout_u.h" #include "core/hle/service/audio/errors.h" +#include "core/hle/service/ipc_helpers.h" #include "core/memory.h" namespace Service::Audio { @@ -67,7 +67,7 @@ public: } private: - void GetAudioOutState(Kernel::HLERequestContext& ctx) { + void GetAudioOutState(HLERequestContext& ctx) { const auto state = static_cast(impl->GetState()); LOG_DEBUG(Service_Audio, "called. State={}", state); @@ -77,7 +77,7 @@ private: rb.Push(state); } - void Start(Kernel::HLERequestContext& ctx) { + void Start(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); auto result = impl->StartSystem(); @@ -86,7 +86,7 @@ private: rb.Push(result); } - void Stop(Kernel::HLERequestContext& ctx) { + void Stop(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); auto result = impl->StopSystem(); @@ -95,7 +95,7 @@ private: rb.Push(result); } - void AppendAudioOutBuffer(Kernel::HLERequestContext& ctx) { + void AppendAudioOutBuffer(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; u64 tag = rp.PopRaw(); @@ -117,7 +117,7 @@ private: rb.Push(result); } - void RegisterBufferEvent(Kernel::HLERequestContext& ctx) { + void RegisterBufferEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); auto& buffer_event = impl->GetBufferEvent(); @@ -127,7 +127,7 @@ private: rb.PushCopyObjects(buffer_event); } - void GetReleasedAudioOutBuffers(Kernel::HLERequestContext& ctx) { + void GetReleasedAudioOutBuffers(HLERequestContext& ctx) { const auto write_buffer_size = ctx.GetWriteBufferNumElements(); std::vector released_buffers(write_buffer_size); @@ -147,7 +147,7 @@ private: rb.Push(count); } - void ContainsAudioOutBuffer(Kernel::HLERequestContext& ctx) { + void ContainsAudioOutBuffer(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 tag{rp.Pop()}; @@ -160,7 +160,7 @@ private: rb.Push(buffer_queued); } - void GetAudioOutBufferCount(Kernel::HLERequestContext& ctx) { + void GetAudioOutBufferCount(HLERequestContext& ctx) { const auto buffer_count = impl->GetBufferCount(); LOG_DEBUG(Service_Audio, "called. Buffer count={}", buffer_count); @@ -171,7 +171,7 @@ private: rb.Push(buffer_count); } - void GetAudioOutPlayedSampleCount(Kernel::HLERequestContext& ctx) { + void GetAudioOutPlayedSampleCount(HLERequestContext& ctx) { const auto samples_played = impl->GetPlayedSampleCount(); LOG_DEBUG(Service_Audio, "called. Played samples={}", samples_played); @@ -182,7 +182,7 @@ private: rb.Push(samples_played); } - void FlushAudioOutBuffers(Kernel::HLERequestContext& ctx) { + void FlushAudioOutBuffers(HLERequestContext& ctx) { bool flushed{impl->FlushAudioOutBuffers()}; LOG_DEBUG(Service_Audio, "called. Were any buffers flushed? {}", flushed); @@ -192,7 +192,7 @@ private: rb.Push(flushed); } - void SetAudioOutVolume(Kernel::HLERequestContext& ctx) { + void SetAudioOutVolume(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto volume = rp.Pop(); @@ -204,7 +204,7 @@ private: rb.Push(ResultSuccess); } - void GetAudioOutVolume(Kernel::HLERequestContext& ctx) { + void GetAudioOutVolume(HLERequestContext& ctx) { const auto volume = impl->GetVolume(); LOG_DEBUG(Service_Audio, "called. Volume={}", volume); @@ -236,7 +236,7 @@ AudOutU::AudOutU(Core::System& system_) AudOutU::~AudOutU() = default; -void AudOutU::ListAudioOuts(Kernel::HLERequestContext& ctx) { +void AudOutU::ListAudioOuts(HLERequestContext& ctx) { using namespace AudioCore::AudioRenderer; std::scoped_lock l{impl->mutex}; @@ -258,7 +258,7 @@ void AudOutU::ListAudioOuts(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(device_names.size())); } -void AudOutU::OpenAudioOut(Kernel::HLERequestContext& ctx) { +void AudOutU::OpenAudioOut(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; auto in_params{rp.PopRaw()}; auto applet_resource_user_id{rp.PopRaw()}; diff --git a/src/core/hle/service/audio/audout_u.h b/src/core/hle/service/audio/audout_u.h index fdc0ee754..8f288c6e0 100644 --- a/src/core/hle/service/audio/audout_u.h +++ b/src/core/hle/service/audio/audout_u.h @@ -12,10 +12,6 @@ namespace Core { class System; } -namespace Kernel { -class HLERequestContext; -} - namespace AudioCore::AudioOut { class Manager; class Out; @@ -31,8 +27,8 @@ public: ~AudOutU() override; private: - void ListAudioOuts(Kernel::HLERequestContext& ctx); - void OpenAudioOut(Kernel::HLERequestContext& ctx); + void ListAudioOuts(HLERequestContext& ctx); + void OpenAudioOut(HLERequestContext& ctx); KernelHelpers::ServiceContext service_context; std::unique_ptr impl; diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index 6c12f00a1..0a6830ffa 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp @@ -17,12 +17,12 @@ #include "common/polyfill_ranges.h" #include "common/string_util.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_process.h" #include "core/hle/kernel/k_transfer_memory.h" #include "core/hle/service/audio/audren_u.h" #include "core/hle/service/audio/errors.h" +#include "core/hle/service/ipc_helpers.h" #include "core/memory.h" using namespace AudioCore::AudioRenderer; @@ -68,7 +68,7 @@ public: } private: - void GetSampleRate(Kernel::HLERequestContext& ctx) { + void GetSampleRate(HLERequestContext& ctx) { const auto sample_rate{impl->GetSystem().GetSampleRate()}; LOG_DEBUG(Service_Audio, "called. Sample rate {}", sample_rate); @@ -78,7 +78,7 @@ private: rb.Push(sample_rate); } - void GetSampleCount(Kernel::HLERequestContext& ctx) { + void GetSampleCount(HLERequestContext& ctx) { const auto sample_count{impl->GetSystem().GetSampleCount()}; LOG_DEBUG(Service_Audio, "called. Sample count {}", sample_count); @@ -88,7 +88,7 @@ private: rb.Push(sample_count); } - void GetState(Kernel::HLERequestContext& ctx) { + void GetState(HLERequestContext& ctx) { const u32 state{!impl->GetSystem().IsActive()}; LOG_DEBUG(Service_Audio, "called, state {}", state); @@ -98,7 +98,7 @@ private: rb.Push(state); } - void GetMixBufferCount(Kernel::HLERequestContext& ctx) { + void GetMixBufferCount(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); const auto buffer_count{impl->GetSystem().GetMixBufferCount()}; @@ -108,7 +108,7 @@ private: rb.Push(buffer_count); } - void RequestUpdate(Kernel::HLERequestContext& ctx) { + void RequestUpdate(HLERequestContext& ctx) { LOG_TRACE(Service_Audio, "called"); const auto input{ctx.ReadBuffer(0)}; @@ -147,7 +147,7 @@ private: rb.Push(result); } - void Start(Kernel::HLERequestContext& ctx) { + void Start(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); impl->Start(); @@ -156,7 +156,7 @@ private: rb.Push(ResultSuccess); } - void Stop(Kernel::HLERequestContext& ctx) { + void Stop(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); impl->Stop(); @@ -165,7 +165,7 @@ private: rb.Push(ResultSuccess); } - void QuerySystemEvent(Kernel::HLERequestContext& ctx) { + void QuerySystemEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); if (impl->GetSystem().GetExecutionMode() == AudioCore::ExecutionMode::Manual) { @@ -179,7 +179,7 @@ private: rb.PushCopyObjects(rendered_event->GetReadableEvent()); } - void SetRenderingTimeLimit(Kernel::HLERequestContext& ctx) { + void SetRenderingTimeLimit(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); IPC::RequestParser rp{ctx}; @@ -192,7 +192,7 @@ private: rb.Push(ResultSuccess); } - void GetRenderingTimeLimit(Kernel::HLERequestContext& ctx) { + void GetRenderingTimeLimit(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); auto& system_ = impl->GetSystem(); @@ -203,11 +203,11 @@ private: rb.Push(time); } - void ExecuteAudioRendererRendering(Kernel::HLERequestContext& ctx) { + void ExecuteAudioRendererRendering(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); } - void SetVoiceDropParameter(Kernel::HLERequestContext& ctx) { + void SetVoiceDropParameter(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); IPC::RequestParser rp{ctx}; @@ -220,7 +220,7 @@ private: rb.Push(ResultSuccess); } - void GetVoiceDropParameter(Kernel::HLERequestContext& ctx) { + void GetVoiceDropParameter(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); auto& system_ = impl->GetSystem(); @@ -271,7 +271,7 @@ public: } private: - void ListAudioDeviceName(Kernel::HLERequestContext& ctx) { + void ListAudioDeviceName(HLERequestContext& ctx) { const size_t in_count = ctx.GetWriteBufferNumElements(); std::vector out_names{}; @@ -299,7 +299,7 @@ private: rb.Push(out_count); } - void SetAudioDeviceOutputVolume(Kernel::HLERequestContext& ctx) { + void SetAudioDeviceOutputVolume(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const f32 volume = rp.Pop(); @@ -316,7 +316,7 @@ private: rb.Push(ResultSuccess); } - void GetAudioDeviceOutputVolume(Kernel::HLERequestContext& ctx) { + void GetAudioDeviceOutputVolume(HLERequestContext& ctx) { const auto device_name_buffer = ctx.ReadBuffer(); const std::string name = Common::StringFromBuffer(device_name_buffer); @@ -332,7 +332,7 @@ private: rb.Push(volume); } - void GetActiveAudioDeviceName(Kernel::HLERequestContext& ctx) { + void GetActiveAudioDeviceName(HLERequestContext& ctx) { const auto write_size = ctx.GetWriteBufferSize(); std::string out_name{"AudioTvOutput"}; @@ -346,7 +346,7 @@ private: rb.Push(ResultSuccess); } - void QueryAudioDeviceSystemEvent(Kernel::HLERequestContext& ctx) { + void QueryAudioDeviceSystemEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "(STUBBED) called"); event->Signal(); @@ -356,7 +356,7 @@ private: rb.PushCopyObjects(event->GetReadableEvent()); } - void GetActiveChannelCount(Kernel::HLERequestContext& ctx) { + void GetActiveChannelCount(HLERequestContext& ctx) { const auto& sink{system.AudioCore().GetOutputSink()}; u32 channel_count{sink.GetDeviceChannels()}; @@ -368,7 +368,7 @@ private: rb.Push(channel_count); } - void QueryAudioDeviceInputEvent(Kernel::HLERequestContext& ctx) { + void QueryAudioDeviceInputEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -376,7 +376,7 @@ private: rb.PushCopyObjects(event->GetReadableEvent()); } - void QueryAudioDeviceOutputEvent(Kernel::HLERequestContext& ctx) { + void QueryAudioDeviceOutputEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -384,7 +384,7 @@ private: rb.PushCopyObjects(event->GetReadableEvent()); } - void ListAudioOutputDeviceName(Kernel::HLERequestContext& ctx) { + void ListAudioOutputDeviceName(HLERequestContext& ctx) { const size_t in_count = ctx.GetWriteBufferNumElements(); std::vector out_names{}; @@ -435,7 +435,7 @@ AudRenU::AudRenU(Core::System& system_) AudRenU::~AudRenU() = default; -void AudRenU::OpenAudioRenderer(Kernel::HLERequestContext& ctx) { +void AudRenU::OpenAudioRenderer(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; AudioCore::AudioRendererParameterInternal params; @@ -475,7 +475,7 @@ void AudRenU::OpenAudioRenderer(Kernel::HLERequestContext& ctx) { applet_resource_user_id, session_id); } -void AudRenU::GetWorkBufferSize(Kernel::HLERequestContext& ctx) { +void AudRenU::GetWorkBufferSize(HLERequestContext& ctx) { AudioCore::AudioRendererParameterInternal params; IPC::RequestParser rp{ctx}; @@ -506,7 +506,7 @@ void AudRenU::GetWorkBufferSize(Kernel::HLERequestContext& ctx) { rb.Push(size); } -void AudRenU::GetAudioDeviceService(Kernel::HLERequestContext& ctx) { +void AudRenU::GetAudioDeviceService(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id = rp.Pop(); @@ -520,11 +520,11 @@ void AudRenU::GetAudioDeviceService(Kernel::HLERequestContext& ctx) { ::Common::MakeMagic('R', 'E', 'V', '1'), num_audio_devices++); } -void AudRenU::OpenAudioRendererForManualExecution(Kernel::HLERequestContext& ctx) { +void AudRenU::OpenAudioRendererForManualExecution(HLERequestContext& ctx) { LOG_DEBUG(Service_Audio, "called"); } -void AudRenU::GetAudioDeviceServiceWithRevisionInfo(Kernel::HLERequestContext& ctx) { +void AudRenU::GetAudioDeviceServiceWithRevisionInfo(HLERequestContext& ctx) { struct Parameters { u32 revision; u64 applet_resource_user_id; diff --git a/src/core/hle/service/audio/audren_u.h b/src/core/hle/service/audio/audren_u.h index 4384a9b3c..24ce37e87 100644 --- a/src/core/hle/service/audio/audren_u.h +++ b/src/core/hle/service/audio/audren_u.h @@ -11,10 +11,6 @@ namespace Core { class System; } -namespace Kernel { -class HLERequestContext; -} - namespace Service::Audio { class IAudioRenderer; @@ -24,11 +20,11 @@ public: ~AudRenU() override; private: - void OpenAudioRenderer(Kernel::HLERequestContext& ctx); - void GetWorkBufferSize(Kernel::HLERequestContext& ctx); - void GetAudioDeviceService(Kernel::HLERequestContext& ctx); - void OpenAudioRendererForManualExecution(Kernel::HLERequestContext& ctx); - void GetAudioDeviceServiceWithRevisionInfo(Kernel::HLERequestContext& ctx); + void OpenAudioRenderer(HLERequestContext& ctx); + void GetWorkBufferSize(HLERequestContext& ctx); + void GetAudioDeviceService(HLERequestContext& ctx); + void OpenAudioRendererForManualExecution(HLERequestContext& ctx); + void GetAudioDeviceServiceWithRevisionInfo(HLERequestContext& ctx); KernelHelpers::ServiceContext service_context; std::unique_ptr impl; diff --git a/src/core/hle/service/audio/hwopus.cpp b/src/core/hle/service/audio/hwopus.cpp index 3db3fe188..451ac224a 100644 --- a/src/core/hle/service/audio/hwopus.cpp +++ b/src/core/hle/service/audio/hwopus.cpp @@ -11,8 +11,8 @@ #include "common/assert.h" #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/audio/hwopus.h" +#include "core/hle/service/ipc_helpers.h" namespace Service::Audio { namespace { @@ -53,7 +53,7 @@ public: // Decodes interleaved Opus packets. Optionally allows reporting time taken to // perform the decoding, as well as any relevant extra behavior. - void DecodeInterleaved(Kernel::HLERequestContext& ctx, PerfTime perf_time, + void DecodeInterleaved(HLERequestContext& ctx, PerfTime perf_time, ExtraBehavior extra_behavior) { if (perf_time == PerfTime::Disabled) { DecodeInterleavedHelper(ctx, nullptr, extra_behavior); @@ -64,7 +64,7 @@ public: } private: - void DecodeInterleavedHelper(Kernel::HLERequestContext& ctx, u64* performance, + void DecodeInterleavedHelper(HLERequestContext& ctx, u64* performance, ExtraBehavior extra_behavior) { u32 consumed = 0; u32 sample_count = 0; @@ -180,21 +180,21 @@ public: } private: - void DecodeInterleavedOld(Kernel::HLERequestContext& ctx) { + void DecodeInterleavedOld(HLERequestContext& ctx) { LOG_DEBUG(Audio, "called"); decoder_state.DecodeInterleaved(ctx, OpusDecoderState::PerfTime::Disabled, OpusDecoderState::ExtraBehavior::None); } - void DecodeInterleavedWithPerfOld(Kernel::HLERequestContext& ctx) { + void DecodeInterleavedWithPerfOld(HLERequestContext& ctx) { LOG_DEBUG(Audio, "called"); decoder_state.DecodeInterleaved(ctx, OpusDecoderState::PerfTime::Enabled, OpusDecoderState::ExtraBehavior::None); } - void DecodeInterleaved(Kernel::HLERequestContext& ctx) { + void DecodeInterleaved(HLERequestContext& ctx) { LOG_DEBUG(Audio, "called"); IPC::RequestParser rp{ctx}; @@ -231,7 +231,7 @@ std::array CreateMappingTable(u32 channel_count) { } } // Anonymous namespace -void HwOpus::GetWorkBufferSize(Kernel::HLERequestContext& ctx) { +void HwOpus::GetWorkBufferSize(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto sample_rate = rp.Pop(); const auto channel_count = rp.Pop(); @@ -251,11 +251,11 @@ void HwOpus::GetWorkBufferSize(Kernel::HLERequestContext& ctx) { rb.Push(worker_buffer_sz); } -void HwOpus::GetWorkBufferSizeEx(Kernel::HLERequestContext& ctx) { +void HwOpus::GetWorkBufferSizeEx(HLERequestContext& ctx) { GetWorkBufferSize(ctx); } -void HwOpus::GetWorkBufferSizeForMultiStreamEx(Kernel::HLERequestContext& ctx) { +void HwOpus::GetWorkBufferSizeForMultiStreamEx(HLERequestContext& ctx) { OpusMultiStreamParametersEx param; std::memcpy(¶m, ctx.ReadBuffer().data(), ctx.GetReadBufferSize()); @@ -281,7 +281,7 @@ void HwOpus::GetWorkBufferSizeForMultiStreamEx(Kernel::HLERequestContext& ctx) { rb.Push(worker_buffer_sz); } -void HwOpus::OpenHardwareOpusDecoder(Kernel::HLERequestContext& ctx) { +void HwOpus::OpenHardwareOpusDecoder(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto sample_rate = rp.Pop(); const auto channel_count = rp.Pop(); @@ -319,7 +319,7 @@ void HwOpus::OpenHardwareOpusDecoder(Kernel::HLERequestContext& ctx) { system, OpusDecoderState{std::move(decoder), sample_rate, channel_count}); } -void HwOpus::OpenHardwareOpusDecoderEx(Kernel::HLERequestContext& ctx) { +void HwOpus::OpenHardwareOpusDecoderEx(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto sample_rate = rp.Pop(); const auto channel_count = rp.Pop(); diff --git a/src/core/hle/service/audio/hwopus.h b/src/core/hle/service/audio/hwopus.h index e6092e290..ece65c02c 100644 --- a/src/core/hle/service/audio/hwopus.h +++ b/src/core/hle/service/audio/hwopus.h @@ -27,11 +27,11 @@ public: ~HwOpus() override; private: - void OpenHardwareOpusDecoder(Kernel::HLERequestContext& ctx); - void OpenHardwareOpusDecoderEx(Kernel::HLERequestContext& ctx); - void GetWorkBufferSize(Kernel::HLERequestContext& ctx); - void GetWorkBufferSizeEx(Kernel::HLERequestContext& ctx); - void GetWorkBufferSizeForMultiStreamEx(Kernel::HLERequestContext& ctx); + void OpenHardwareOpusDecoder(HLERequestContext& ctx); + void OpenHardwareOpusDecoderEx(HLERequestContext& ctx); + void GetWorkBufferSize(HLERequestContext& ctx); + void GetWorkBufferSizeEx(HLERequestContext& ctx); + void GetWorkBufferSizeForMultiStreamEx(HLERequestContext& ctx); }; } // namespace Service::Audio diff --git a/src/core/hle/service/bcat/bcat_module.cpp b/src/core/hle/service/bcat/bcat_module.cpp index 1db3f026b..a6281913a 100644 --- a/src/core/hle/service/bcat/bcat_module.cpp +++ b/src/core/hle/service/bcat/bcat_module.cpp @@ -9,12 +9,12 @@ #include "common/string_util.h" #include "core/core.h" #include "core/file_sys/vfs.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_readable_event.h" #include "core/hle/service/bcat/backend/backend.h" #include "core/hle/service/bcat/bcat.h" #include "core/hle/service/bcat/bcat_module.h" #include "core/hle/service/filesystem/filesystem.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" namespace Service::BCAT { @@ -51,8 +51,7 @@ BCATDigest DigestFile(const FileSys::VirtualFile& file) { // For a name to be valid it must be non-empty, must have a null terminating character as the final // char, can only contain numbers, letters, underscores and a hyphen if directory and a period if // file. -bool VerifyNameValidInternal(Kernel::HLERequestContext& ctx, std::array name, - char match_char) { +bool VerifyNameValidInternal(HLERequestContext& ctx, std::array name, char match_char) { const auto null_chars = std::count(name.begin(), name.end(), 0); const auto bad_chars = std::count_if(name.begin(), name.end(), [match_char](char c) { return !std::isalnum(static_cast(c)) && c != '_' && c != match_char && c != '\0'; @@ -67,11 +66,11 @@ bool VerifyNameValidInternal(Kernel::HLERequestContext& ctx, std::array(); const auto name = @@ -203,7 +202,7 @@ private: rb.PushIpcInterface(CreateProgressService(SyncType::Directory)); } - void SetPassphrase(Kernel::HLERequestContext& ctx) { + void SetPassphrase(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto title_id = rp.PopRaw(); @@ -235,7 +234,7 @@ private: rb.Push(ResultSuccess); } - void ClearDeliveryCacheStorage(Kernel::HLERequestContext& ctx) { + void ClearDeliveryCacheStorage(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto title_id = rp.PopRaw(); @@ -271,7 +270,7 @@ private: std::array(SyncType::Count)> progress; }; -void Module::Interface::CreateBcatService(Kernel::HLERequestContext& ctx) { +void Module::Interface::CreateBcatService(HLERequestContext& ctx) { LOG_DEBUG(Service_BCAT, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -296,7 +295,7 @@ public: } private: - void Open(Kernel::HLERequestContext& ctx) { + void Open(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto dir_name_raw = rp.PopRaw(); const auto file_name_raw = rp.PopRaw(); @@ -340,7 +339,7 @@ private: rb.Push(ResultSuccess); } - void Read(Kernel::HLERequestContext& ctx) { + void Read(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto offset{rp.PopRaw()}; @@ -363,7 +362,7 @@ private: rb.Push(buffer.size()); } - void GetSize(Kernel::HLERequestContext& ctx) { + void GetSize(HLERequestContext& ctx) { LOG_DEBUG(Service_BCAT, "called"); if (current_file == nullptr) { @@ -377,7 +376,7 @@ private: rb.Push(current_file->GetSize()); } - void GetDigest(Kernel::HLERequestContext& ctx) { + void GetDigest(HLERequestContext& ctx) { LOG_DEBUG(Service_BCAT, "called"); if (current_file == nullptr) { @@ -412,7 +411,7 @@ public: } private: - void Open(Kernel::HLERequestContext& ctx) { + void Open(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto name_raw = rp.PopRaw(); const auto name = @@ -443,7 +442,7 @@ private: rb.Push(ResultSuccess); } - void Read(Kernel::HLERequestContext& ctx) { + void Read(HLERequestContext& ctx) { auto write_size = ctx.GetWriteBufferNumElements(); LOG_DEBUG(Service_BCAT, "called, write_size={:016X}", write_size); @@ -473,7 +472,7 @@ private: rb.Push(static_cast(write_size * sizeof(DeliveryCacheDirectoryEntry))); } - void GetCount(Kernel::HLERequestContext& ctx) { + void GetCount(HLERequestContext& ctx) { LOG_DEBUG(Service_BCAT, "called"); if (current_dir == nullptr) { @@ -517,7 +516,7 @@ public: } private: - void CreateFileService(Kernel::HLERequestContext& ctx) { + void CreateFileService(HLERequestContext& ctx) { LOG_DEBUG(Service_BCAT, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -525,7 +524,7 @@ private: rb.PushIpcInterface(system, root); } - void CreateDirectoryService(Kernel::HLERequestContext& ctx) { + void CreateDirectoryService(HLERequestContext& ctx) { LOG_DEBUG(Service_BCAT, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -533,7 +532,7 @@ private: rb.PushIpcInterface(system, root); } - void EnumerateDeliveryCacheDirectory(Kernel::HLERequestContext& ctx) { + void EnumerateDeliveryCacheDirectory(HLERequestContext& ctx) { auto size = ctx.GetWriteBufferNumElements(); LOG_DEBUG(Service_BCAT, "called, size={:016X}", size); @@ -552,7 +551,7 @@ private: u64 next_read_index = 0; }; -void Module::Interface::CreateDeliveryCacheStorageService(Kernel::HLERequestContext& ctx) { +void Module::Interface::CreateDeliveryCacheStorageService(HLERequestContext& ctx) { LOG_DEBUG(Service_BCAT, "called"); const auto title_id = system.GetApplicationProcessProgramID(); @@ -561,8 +560,7 @@ void Module::Interface::CreateDeliveryCacheStorageService(Kernel::HLERequestCont rb.PushIpcInterface(system, fsc.GetBCATDirectory(title_id)); } -void Module::Interface::CreateDeliveryCacheStorageServiceWithApplicationId( - Kernel::HLERequestContext& ctx) { +void Module::Interface::CreateDeliveryCacheStorageServiceWithApplicationId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto title_id = rp.PopRaw(); diff --git a/src/core/hle/service/bcat/bcat_module.h b/src/core/hle/service/bcat/bcat_module.h index 0c134d1ff..87576288b 100644 --- a/src/core/hle/service/bcat/bcat_module.h +++ b/src/core/hle/service/bcat/bcat_module.h @@ -27,9 +27,9 @@ public: FileSystem::FileSystemController& fsc_, const char* name); ~Interface() override; - void CreateBcatService(Kernel::HLERequestContext& ctx); - void CreateDeliveryCacheStorageService(Kernel::HLERequestContext& ctx); - void CreateDeliveryCacheStorageServiceWithApplicationId(Kernel::HLERequestContext& ctx); + void CreateBcatService(HLERequestContext& ctx); + void CreateDeliveryCacheStorageService(HLERequestContext& ctx); + void CreateDeliveryCacheStorageServiceWithApplicationId(HLERequestContext& ctx); protected: FileSystem::FileSystemController& fsc; diff --git a/src/core/hle/service/btdrv/btdrv.cpp b/src/core/hle/service/btdrv/btdrv.cpp index ed020d03f..38cdd57ad 100644 --- a/src/core/hle/service/btdrv/btdrv.cpp +++ b/src/core/hle/service/btdrv/btdrv.cpp @@ -3,9 +3,9 @@ #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/btdrv/btdrv.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/kernel_helpers.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" @@ -41,7 +41,7 @@ public: } private: - void RegisterBleEvent(Kernel::HLERequestContext& ctx) { + void RegisterBleEvent(HLERequestContext& ctx) { LOG_WARNING(Service_BTM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 1}; diff --git a/src/core/hle/service/btm/btm.cpp b/src/core/hle/service/btm/btm.cpp index dbd9d6a88..8069f75b7 100644 --- a/src/core/hle/service/btm/btm.cpp +++ b/src/core/hle/service/btm/btm.cpp @@ -5,9 +5,9 @@ #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/btm/btm.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/kernel_helpers.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" @@ -70,7 +70,7 @@ public: } private: - void AcquireBleScanEvent(Kernel::HLERequestContext& ctx) { + void AcquireBleScanEvent(HLERequestContext& ctx) { LOG_WARNING(Service_BTM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3, 1}; @@ -79,7 +79,7 @@ private: rb.PushCopyObjects(scan_event->GetReadableEvent()); } - void AcquireBleConnectionEvent(Kernel::HLERequestContext& ctx) { + void AcquireBleConnectionEvent(HLERequestContext& ctx) { LOG_WARNING(Service_BTM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3, 1}; @@ -88,7 +88,7 @@ private: rb.PushCopyObjects(connection_event->GetReadableEvent()); } - void AcquireBleServiceDiscoveryEvent(Kernel::HLERequestContext& ctx) { + void AcquireBleServiceDiscoveryEvent(HLERequestContext& ctx) { LOG_WARNING(Service_BTM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3, 1}; @@ -97,7 +97,7 @@ private: rb.PushCopyObjects(service_discovery_event->GetReadableEvent()); } - void AcquireBleMtuConfigEvent(Kernel::HLERequestContext& ctx) { + void AcquireBleMtuConfigEvent(HLERequestContext& ctx) { LOG_WARNING(Service_BTM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3, 1}; @@ -126,7 +126,7 @@ public: } private: - void GetCore(Kernel::HLERequestContext& ctx) { + void GetCore(HLERequestContext& ctx) { LOG_DEBUG(Service_BTM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -307,7 +307,7 @@ public: } private: - void GetCore(Kernel::HLERequestContext& ctx) { + void GetCore(HLERequestContext& ctx) { LOG_DEBUG(Service_BTM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; diff --git a/src/core/hle/service/caps/caps_a.h b/src/core/hle/service/caps/caps_a.h index 319c173d8..98a21a5ad 100644 --- a/src/core/hle/service/caps/caps_a.h +++ b/src/core/hle/service/caps/caps_a.h @@ -9,10 +9,6 @@ namespace Core { class System; } -namespace Kernel { -class HLERequestContext; -} - namespace Service::Capture { class CAPS_A final : public ServiceFramework { diff --git a/src/core/hle/service/caps/caps_c.cpp b/src/core/hle/service/caps/caps_c.cpp index 725a2e3a7..fc77e35cd 100644 --- a/src/core/hle/service/caps/caps_c.cpp +++ b/src/core/hle/service/caps/caps_c.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/caps/caps_c.h" +#include "core/hle/service/ipc_helpers.h" namespace Service::Capture { @@ -74,7 +74,7 @@ CAPS_C::CAPS_C(Core::System& system_) : ServiceFramework{system_, "caps:c"} { CAPS_C::~CAPS_C() = default; -void CAPS_C::SetShimLibraryVersion(Kernel::HLERequestContext& ctx) { +void CAPS_C::SetShimLibraryVersion(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto library_version{rp.Pop()}; const auto applet_resource_user_id{rp.Pop()}; diff --git a/src/core/hle/service/caps/caps_c.h b/src/core/hle/service/caps/caps_c.h index 983a4212d..537b3a2e3 100644 --- a/src/core/hle/service/caps/caps_c.h +++ b/src/core/hle/service/caps/caps_c.h @@ -9,10 +9,6 @@ namespace Core { class System; } -namespace Kernel { -class HLERequestContext; -} - namespace Service::Capture { class CAPS_C final : public ServiceFramework { @@ -21,7 +17,7 @@ public: ~CAPS_C() override; private: - void SetShimLibraryVersion(Kernel::HLERequestContext& ctx); + void SetShimLibraryVersion(HLERequestContext& ctx); }; } // namespace Service::Capture diff --git a/src/core/hle/service/caps/caps_su.cpp b/src/core/hle/service/caps/caps_su.cpp index fcb496756..3b11cc95c 100644 --- a/src/core/hle/service/caps/caps_su.cpp +++ b/src/core/hle/service/caps/caps_su.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/caps/caps_su.h" +#include "core/hle/service/ipc_helpers.h" namespace Service::Capture { @@ -23,7 +23,7 @@ CAPS_SU::CAPS_SU(Core::System& system_) : ServiceFramework{system_, "caps:su"} { CAPS_SU::~CAPS_SU() = default; -void CAPS_SU::SetShimLibraryVersion(Kernel::HLERequestContext& ctx) { +void CAPS_SU::SetShimLibraryVersion(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto library_version{rp.Pop()}; const auto applet_resource_user_id{rp.Pop()}; diff --git a/src/core/hle/service/caps/caps_su.h b/src/core/hle/service/caps/caps_su.h index c9a1d507b..c6398858d 100644 --- a/src/core/hle/service/caps/caps_su.h +++ b/src/core/hle/service/caps/caps_su.h @@ -9,10 +9,6 @@ namespace Core { class System; } -namespace Kernel { -class HLERequestContext; -} - namespace Service::Capture { class CAPS_SU final : public ServiceFramework { @@ -21,7 +17,7 @@ public: ~CAPS_SU() override; private: - void SetShimLibraryVersion(Kernel::HLERequestContext& ctx); + void SetShimLibraryVersion(HLERequestContext& ctx); }; } // namespace Service::Capture diff --git a/src/core/hle/service/caps/caps_u.cpp b/src/core/hle/service/caps/caps_u.cpp index 5fbba8673..bffe0f8d0 100644 --- a/src/core/hle/service/caps/caps_u.cpp +++ b/src/core/hle/service/caps/caps_u.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/caps/caps.h" #include "core/hle/service/caps/caps_u.h" +#include "core/hle/service/ipc_helpers.h" namespace Service::Capture { @@ -52,7 +52,7 @@ CAPS_U::CAPS_U(Core::System& system_) : ServiceFramework{system_, "caps:u"} { CAPS_U::~CAPS_U() = default; -void CAPS_U::SetShimLibraryVersion(Kernel::HLERequestContext& ctx) { +void CAPS_U::SetShimLibraryVersion(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto library_version{rp.Pop()}; const auto applet_resource_user_id{rp.Pop()}; @@ -64,7 +64,7 @@ void CAPS_U::SetShimLibraryVersion(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void CAPS_U::GetAlbumContentsFileListForApplication(Kernel::HLERequestContext& ctx) { +void CAPS_U::GetAlbumContentsFileListForApplication(HLERequestContext& ctx) { // Takes a type-0x6 output buffer containing an array of ApplicationAlbumFileEntry, a PID, an // u8 ContentType, two s64s, and an u64 AppletResourceUserId. Returns an output u64 for total // output entries (which is copied to a s32 by official SW). @@ -93,7 +93,7 @@ void CAPS_U::GetAlbumContentsFileListForApplication(Kernel::HLERequestContext& c rb.Push(total_entries_2); } -void CAPS_U::GetAlbumFileList3AaeAruid(Kernel::HLERequestContext& ctx) { +void CAPS_U::GetAlbumFileList3AaeAruid(HLERequestContext& ctx) { GetAlbumContentsFileListForApplication(ctx); } diff --git a/src/core/hle/service/caps/caps_u.h b/src/core/hle/service/caps/caps_u.h index c3d4b9cea..e8dd037d7 100644 --- a/src/core/hle/service/caps/caps_u.h +++ b/src/core/hle/service/caps/caps_u.h @@ -9,10 +9,6 @@ namespace Core { class System; } -namespace Kernel { -class HLERequestContext; -} - namespace Service::Capture { class CAPS_U final : public ServiceFramework { @@ -21,9 +17,9 @@ public: ~CAPS_U() override; private: - void SetShimLibraryVersion(Kernel::HLERequestContext& ctx); - void GetAlbumContentsFileListForApplication(Kernel::HLERequestContext& ctx); - void GetAlbumFileList3AaeAruid(Kernel::HLERequestContext& ctx); + void SetShimLibraryVersion(HLERequestContext& ctx); + void GetAlbumContentsFileListForApplication(HLERequestContext& ctx); + void GetAlbumFileList3AaeAruid(HLERequestContext& ctx); }; } // namespace Service::Capture diff --git a/src/core/hle/service/es/es.cpp b/src/core/hle/service/es/es.cpp index d9736af4e..446f46b3c 100644 --- a/src/core/hle/service/es/es.cpp +++ b/src/core/hle/service/es/es.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/crypto/key_manager.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/es/es.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" @@ -110,7 +110,7 @@ public: } private: - bool CheckRightsId(Kernel::HLERequestContext& ctx, const u128& rights_id) { + bool CheckRightsId(HLERequestContext& ctx, const u128& rights_id) { if (rights_id == u128{}) { LOG_ERROR(Service_ETicket, "The rights ID was invalid!"); IPC::ResponseBuilder rb{ctx, 2}; @@ -121,7 +121,7 @@ private: return true; } - void ImportTicket(Kernel::HLERequestContext& ctx) { + void ImportTicket(HLERequestContext& ctx) { const auto ticket = ctx.ReadBuffer(); [[maybe_unused]] const auto cert = ctx.ReadBuffer(1); @@ -146,7 +146,7 @@ private: rb.Push(ResultSuccess); } - void GetTitleKey(Kernel::HLERequestContext& ctx) { + void GetTitleKey(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto rights_id = rp.PopRaw(); @@ -172,7 +172,7 @@ private: rb.Push(ResultSuccess); } - void CountCommonTicket(Kernel::HLERequestContext& ctx) { + void CountCommonTicket(HLERequestContext& ctx) { LOG_DEBUG(Service_ETicket, "called"); const u32 count = static_cast(keys.GetCommonTickets().size()); @@ -182,7 +182,7 @@ private: rb.Push(count); } - void CountPersonalizedTicket(Kernel::HLERequestContext& ctx) { + void CountPersonalizedTicket(HLERequestContext& ctx) { LOG_DEBUG(Service_ETicket, "called"); const u32 count = static_cast(keys.GetPersonalizedTickets().size()); @@ -192,7 +192,7 @@ private: rb.Push(count); } - void ListCommonTicketRightsIds(Kernel::HLERequestContext& ctx) { + void ListCommonTicketRightsIds(HLERequestContext& ctx) { size_t out_entries = 0; if (!keys.GetCommonTickets().empty()) { out_entries = ctx.GetWriteBufferNumElements(); @@ -213,7 +213,7 @@ private: rb.Push(static_cast(out_entries)); } - void ListPersonalizedTicketRightsIds(Kernel::HLERequestContext& ctx) { + void ListPersonalizedTicketRightsIds(HLERequestContext& ctx) { size_t out_entries = 0; if (!keys.GetPersonalizedTickets().empty()) { out_entries = ctx.GetWriteBufferNumElements(); @@ -235,7 +235,7 @@ private: rb.Push(static_cast(out_entries)); } - void GetCommonTicketSize(Kernel::HLERequestContext& ctx) { + void GetCommonTicketSize(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto rights_id = rp.PopRaw(); @@ -251,7 +251,7 @@ private: rb.Push(ticket.GetSize()); } - void GetPersonalizedTicketSize(Kernel::HLERequestContext& ctx) { + void GetPersonalizedTicketSize(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto rights_id = rp.PopRaw(); @@ -267,7 +267,7 @@ private: rb.Push(ticket.GetSize()); } - void GetCommonTicketData(Kernel::HLERequestContext& ctx) { + void GetCommonTicketData(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto rights_id = rp.PopRaw(); @@ -286,7 +286,7 @@ private: rb.Push(write_size); } - void GetPersonalizedTicketData(Kernel::HLERequestContext& ctx) { + void GetPersonalizedTicketData(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto rights_id = rp.PopRaw(); diff --git a/src/core/hle/service/fatal/fatal.cpp b/src/core/hle/service/fatal/fatal.cpp index 3b7b636f3..fe2ed8df8 100644 --- a/src/core/hle/service/fatal/fatal.cpp +++ b/src/core/hle/service/fatal/fatal.cpp @@ -9,10 +9,10 @@ #include "common/scm_rev.h" #include "common/swap.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/fatal/fatal.h" #include "core/hle/service/fatal/fatal_p.h" #include "core/hle/service/fatal/fatal_u.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" #include "core/reporter.h" @@ -126,7 +126,7 @@ static void ThrowFatalError(Core::System& system, Result error_code, FatalType f } } -void Module::Interface::ThrowFatal(Kernel::HLERequestContext& ctx) { +void Module::Interface::ThrowFatal(HLERequestContext& ctx) { LOG_ERROR(Service_Fatal, "called"); IPC::RequestParser rp{ctx}; const auto error_code = rp.Pop(); @@ -136,7 +136,7 @@ void Module::Interface::ThrowFatal(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Module::Interface::ThrowFatalWithPolicy(Kernel::HLERequestContext& ctx) { +void Module::Interface::ThrowFatalWithPolicy(HLERequestContext& ctx) { LOG_ERROR(Service_Fatal, "called"); IPC::RequestParser rp(ctx); const auto error_code = rp.Pop(); @@ -148,7 +148,7 @@ void Module::Interface::ThrowFatalWithPolicy(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Module::Interface::ThrowFatalWithCpuContext(Kernel::HLERequestContext& ctx) { +void Module::Interface::ThrowFatalWithCpuContext(HLERequestContext& ctx) { LOG_ERROR(Service_Fatal, "called"); IPC::RequestParser rp(ctx); const auto error_code = rp.Pop(); diff --git a/src/core/hle/service/fatal/fatal.h b/src/core/hle/service/fatal/fatal.h index 2e4e4c2f6..f1c110406 100644 --- a/src/core/hle/service/fatal/fatal.h +++ b/src/core/hle/service/fatal/fatal.h @@ -19,9 +19,9 @@ public: const char* name); ~Interface() override; - void ThrowFatal(Kernel::HLERequestContext& ctx); - void ThrowFatalWithPolicy(Kernel::HLERequestContext& ctx); - void ThrowFatalWithCpuContext(Kernel::HLERequestContext& ctx); + void ThrowFatal(HLERequestContext& ctx); + void ThrowFatalWithPolicy(HLERequestContext& ctx); + void ThrowFatalWithCpuContext(HLERequestContext& ctx); protected: std::shared_ptr module; diff --git a/src/core/hle/service/fgm/fgm.cpp b/src/core/hle/service/fgm/fgm.cpp index 612491270..6b3f77be2 100644 --- a/src/core/hle/service/fgm/fgm.cpp +++ b/src/core/hle/service/fgm/fgm.cpp @@ -3,8 +3,8 @@ #include -#include "core/hle/ipc_helpers.h" #include "core/hle/service/fgm/fgm.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" #include "core/hle/service/sm/sm.h" @@ -40,7 +40,7 @@ public: } private: - void Initialize(Kernel::HLERequestContext& ctx) { + void Initialize(HLERequestContext& ctx) { LOG_DEBUG(Service_FGM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index 89eddb510..9e559d97e 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp_srv.cpp @@ -24,9 +24,9 @@ #include "core/file_sys/savedata_factory.h" #include "core/file_sys/system_archive/system_archive.h" #include "core/file_sys/vfs.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/filesystem/filesystem.h" #include "core/hle/service/filesystem/fsp_srv.h" +#include "core/hle/service/ipc_helpers.h" #include "core/reporter.h" namespace Service::FileSystem { @@ -72,7 +72,7 @@ public: private: FileSys::VirtualFile backend; - void Read(Kernel::HLERequestContext& ctx) { + void Read(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s64 offset = rp.Pop(); const s64 length = rp.Pop(); @@ -102,7 +102,7 @@ private: rb.Push(ResultSuccess); } - void GetSize(Kernel::HLERequestContext& ctx) { + void GetSize(HLERequestContext& ctx) { const u64 size = backend->GetSize(); LOG_DEBUG(Service_FS, "called, size={}", size); @@ -131,7 +131,7 @@ public: private: FileSys::VirtualFile backend; - void Read(Kernel::HLERequestContext& ctx) { + void Read(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 option = rp.Pop(); const s64 offset = rp.Pop(); @@ -165,7 +165,7 @@ private: rb.Push(static_cast(output.size())); } - void Write(Kernel::HLERequestContext& ctx) { + void Write(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 option = rp.Pop(); const s64 offset = rp.Pop(); @@ -208,7 +208,7 @@ private: rb.Push(ResultSuccess); } - void Flush(Kernel::HLERequestContext& ctx) { + void Flush(HLERequestContext& ctx) { LOG_DEBUG(Service_FS, "called"); // Exists for SDK compatibiltity -- No need to flush file. @@ -217,7 +217,7 @@ private: rb.Push(ResultSuccess); } - void SetSize(Kernel::HLERequestContext& ctx) { + void SetSize(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 size = rp.Pop(); LOG_DEBUG(Service_FS, "called, size={}", size); @@ -228,7 +228,7 @@ private: rb.Push(ResultSuccess); } - void GetSize(Kernel::HLERequestContext& ctx) { + void GetSize(HLERequestContext& ctx) { const u64 size = backend->GetSize(); LOG_DEBUG(Service_FS, "called, size={}", size); @@ -270,7 +270,7 @@ private: std::vector entries; u64 next_entry_index = 0; - void Read(Kernel::HLERequestContext& ctx) { + void Read(HLERequestContext& ctx) { LOG_DEBUG(Service_FS, "called."); // Calculate how many entries we can fit in the output buffer @@ -294,7 +294,7 @@ private: rb.Push(actual_entries); } - void GetEntryCount(Kernel::HLERequestContext& ctx) { + void GetEntryCount(HLERequestContext& ctx) { LOG_DEBUG(Service_FS, "called"); u64 count = entries.size() - next_entry_index; @@ -331,7 +331,7 @@ public: RegisterHandlers(functions); } - void CreateFile(Kernel::HLERequestContext& ctx) { + void CreateFile(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto file_buffer = ctx.ReadBuffer(); @@ -347,7 +347,7 @@ public: rb.Push(backend.CreateFile(name, file_size)); } - void DeleteFile(Kernel::HLERequestContext& ctx) { + void DeleteFile(HLERequestContext& ctx) { const auto file_buffer = ctx.ReadBuffer(); const std::string name = Common::StringFromBuffer(file_buffer); @@ -357,7 +357,7 @@ public: rb.Push(backend.DeleteFile(name)); } - void CreateDirectory(Kernel::HLERequestContext& ctx) { + void CreateDirectory(HLERequestContext& ctx) { const auto file_buffer = ctx.ReadBuffer(); const std::string name = Common::StringFromBuffer(file_buffer); @@ -367,7 +367,7 @@ public: rb.Push(backend.CreateDirectory(name)); } - void DeleteDirectory(Kernel::HLERequestContext& ctx) { + void DeleteDirectory(HLERequestContext& ctx) { const auto file_buffer = ctx.ReadBuffer(); const std::string name = Common::StringFromBuffer(file_buffer); @@ -377,7 +377,7 @@ public: rb.Push(backend.DeleteDirectory(name)); } - void DeleteDirectoryRecursively(Kernel::HLERequestContext& ctx) { + void DeleteDirectoryRecursively(HLERequestContext& ctx) { const auto file_buffer = ctx.ReadBuffer(); const std::string name = Common::StringFromBuffer(file_buffer); @@ -387,7 +387,7 @@ public: rb.Push(backend.DeleteDirectoryRecursively(name)); } - void CleanDirectoryRecursively(Kernel::HLERequestContext& ctx) { + void CleanDirectoryRecursively(HLERequestContext& ctx) { const auto file_buffer = ctx.ReadBuffer(); const std::string name = Common::StringFromBuffer(file_buffer); @@ -397,7 +397,7 @@ public: rb.Push(backend.CleanDirectoryRecursively(name)); } - void RenameFile(Kernel::HLERequestContext& ctx) { + void RenameFile(HLERequestContext& ctx) { const std::string src_name = Common::StringFromBuffer(ctx.ReadBuffer(0)); const std::string dst_name = Common::StringFromBuffer(ctx.ReadBuffer(1)); @@ -407,7 +407,7 @@ public: rb.Push(backend.RenameFile(src_name, dst_name)); } - void OpenFile(Kernel::HLERequestContext& ctx) { + void OpenFile(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto file_buffer = ctx.ReadBuffer(); @@ -431,7 +431,7 @@ public: rb.PushIpcInterface(std::move(file)); } - void OpenDirectory(Kernel::HLERequestContext& ctx) { + void OpenDirectory(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto file_buffer = ctx.ReadBuffer(); @@ -456,7 +456,7 @@ public: rb.PushIpcInterface(std::move(directory)); } - void GetEntryType(Kernel::HLERequestContext& ctx) { + void GetEntryType(HLERequestContext& ctx) { const auto file_buffer = ctx.ReadBuffer(); const std::string name = Common::StringFromBuffer(file_buffer); @@ -474,14 +474,14 @@ public: rb.Push(static_cast(*result)); } - void Commit(Kernel::HLERequestContext& ctx) { + void Commit(HLERequestContext& ctx) { LOG_WARNING(Service_FS, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void GetFreeSpaceSize(Kernel::HLERequestContext& ctx) { + void GetFreeSpaceSize(HLERequestContext& ctx) { LOG_DEBUG(Service_FS, "called"); IPC::ResponseBuilder rb{ctx, 4}; @@ -489,7 +489,7 @@ public: rb.Push(size.get_free_size()); } - void GetTotalSpaceSize(Kernel::HLERequestContext& ctx) { + void GetTotalSpaceSize(HLERequestContext& ctx) { LOG_DEBUG(Service_FS, "called"); IPC::ResponseBuilder rb{ctx, 4}; @@ -497,7 +497,7 @@ public: rb.Push(size.get_total_size()); } - void GetFileTimeStampRaw(Kernel::HLERequestContext& ctx) { + void GetFileTimeStampRaw(HLERequestContext& ctx) { const auto file_buffer = ctx.ReadBuffer(); const std::string name = Common::StringFromBuffer(file_buffer); @@ -533,7 +533,7 @@ public: FindAllSaves(space); } - void ReadSaveDataInfo(Kernel::HLERequestContext& ctx) { + void ReadSaveDataInfo(HLERequestContext& ctx) { LOG_DEBUG(Service_FS, "called"); // Calculate how many entries we can fit in the output buffer @@ -811,7 +811,7 @@ FSP_SRV::FSP_SRV(Core::System& system_) FSP_SRV::~FSP_SRV() = default; -void FSP_SRV::SetCurrentProcess(Kernel::HLERequestContext& ctx) { +void FSP_SRV::SetCurrentProcess(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; current_process_id = rp.Pop(); @@ -821,7 +821,7 @@ void FSP_SRV::SetCurrentProcess(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void FSP_SRV::OpenFileSystemWithPatch(Kernel::HLERequestContext& ctx) { +void FSP_SRV::OpenFileSystemWithPatch(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto type = rp.PopRaw(); @@ -832,7 +832,7 @@ void FSP_SRV::OpenFileSystemWithPatch(Kernel::HLERequestContext& ctx) { rb.Push(ResultUnknown); } -void FSP_SRV::OpenSdCardFileSystem(Kernel::HLERequestContext& ctx) { +void FSP_SRV::OpenSdCardFileSystem(HLERequestContext& ctx) { LOG_DEBUG(Service_FS, "called"); auto filesystem = @@ -844,7 +844,7 @@ void FSP_SRV::OpenSdCardFileSystem(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(std::move(filesystem)); } -void FSP_SRV::CreateSaveDataFileSystem(Kernel::HLERequestContext& ctx) { +void FSP_SRV::CreateSaveDataFileSystem(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; auto save_struct = rp.PopRaw(); @@ -860,7 +860,7 @@ void FSP_SRV::CreateSaveDataFileSystem(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void FSP_SRV::OpenSaveDataFileSystem(Kernel::HLERequestContext& ctx) { +void FSP_SRV::OpenSaveDataFileSystem(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { @@ -905,12 +905,12 @@ void FSP_SRV::OpenSaveDataFileSystem(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(std::move(filesystem)); } -void FSP_SRV::OpenReadOnlySaveDataFileSystem(Kernel::HLERequestContext& ctx) { +void FSP_SRV::OpenReadOnlySaveDataFileSystem(HLERequestContext& ctx) { LOG_WARNING(Service_FS, "(STUBBED) called, delegating to 51 OpenSaveDataFilesystem"); OpenSaveDataFileSystem(ctx); } -void FSP_SRV::OpenSaveDataInfoReaderBySaveDataSpaceId(Kernel::HLERequestContext& ctx) { +void FSP_SRV::OpenSaveDataInfoReaderBySaveDataSpaceId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto space = rp.PopRaw(); LOG_INFO(Service_FS, "called, space={}", space); @@ -921,15 +921,14 @@ void FSP_SRV::OpenSaveDataInfoReaderBySaveDataSpaceId(Kernel::HLERequestContext& std::make_shared(system, space, fsc)); } -void FSP_SRV::WriteSaveDataFileSystemExtraDataBySaveDataAttribute(Kernel::HLERequestContext& ctx) { +void FSP_SRV::WriteSaveDataFileSystemExtraDataBySaveDataAttribute(HLERequestContext& ctx) { LOG_WARNING(Service_FS, "(STUBBED) called."); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void FSP_SRV::ReadSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute( - Kernel::HLERequestContext& ctx) { +void FSP_SRV::ReadSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { @@ -955,7 +954,7 @@ void FSP_SRV::ReadSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute( rb.Push(flags); } -void FSP_SRV::OpenDataStorageByCurrentProcess(Kernel::HLERequestContext& ctx) { +void FSP_SRV::OpenDataStorageByCurrentProcess(HLERequestContext& ctx) { LOG_DEBUG(Service_FS, "called"); auto current_romfs = fsc.OpenRomFSCurrentProcess(); @@ -974,7 +973,7 @@ void FSP_SRV::OpenDataStorageByCurrentProcess(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(std::move(storage)); } -void FSP_SRV::OpenDataStorageByDataId(Kernel::HLERequestContext& ctx) { +void FSP_SRV::OpenDataStorageByDataId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto storage_id = rp.PopRaw(); const auto unknown = rp.PopRaw(); @@ -1014,7 +1013,7 @@ void FSP_SRV::OpenDataStorageByDataId(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(std::move(storage)); } -void FSP_SRV::OpenPatchDataStorageByCurrentProcess(Kernel::HLERequestContext& ctx) { +void FSP_SRV::OpenPatchDataStorageByCurrentProcess(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto storage_id = rp.PopRaw(); @@ -1026,7 +1025,7 @@ void FSP_SRV::OpenPatchDataStorageByCurrentProcess(Kernel::HLERequestContext& ct rb.Push(FileSys::ERROR_ENTITY_NOT_FOUND); } -void FSP_SRV::OpenDataStorageWithProgramIndex(Kernel::HLERequestContext& ctx) { +void FSP_SRV::OpenDataStorageWithProgramIndex(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto program_index = rp.PopRaw(); @@ -1053,7 +1052,7 @@ void FSP_SRV::OpenDataStorageWithProgramIndex(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(std::move(storage)); } -void FSP_SRV::DisableAutoSaveDataCreation(Kernel::HLERequestContext& ctx) { +void FSP_SRV::DisableAutoSaveDataCreation(HLERequestContext& ctx) { LOG_DEBUG(Service_FS, "called"); fsc.SetAutoSaveDataCreation(false); @@ -1062,7 +1061,7 @@ void FSP_SRV::DisableAutoSaveDataCreation(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void FSP_SRV::SetGlobalAccessLogMode(Kernel::HLERequestContext& ctx) { +void FSP_SRV::SetGlobalAccessLogMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; access_log_mode = rp.PopEnum(); @@ -1072,7 +1071,7 @@ void FSP_SRV::SetGlobalAccessLogMode(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void FSP_SRV::GetGlobalAccessLogMode(Kernel::HLERequestContext& ctx) { +void FSP_SRV::GetGlobalAccessLogMode(HLERequestContext& ctx) { LOG_DEBUG(Service_FS, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -1080,7 +1079,7 @@ void FSP_SRV::GetGlobalAccessLogMode(Kernel::HLERequestContext& ctx) { rb.PushEnum(access_log_mode); } -void FSP_SRV::OutputAccessLogToSdCard(Kernel::HLERequestContext& ctx) { +void FSP_SRV::OutputAccessLogToSdCard(HLERequestContext& ctx) { const auto raw = ctx.ReadBufferCopy(); auto log = Common::StringFromFixedZeroTerminatedBuffer( reinterpret_cast(raw.data()), raw.size()); @@ -1093,7 +1092,7 @@ void FSP_SRV::OutputAccessLogToSdCard(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void FSP_SRV::GetProgramIndexForAccessLog(Kernel::HLERequestContext& ctx) { +void FSP_SRV::GetProgramIndexForAccessLog(HLERequestContext& ctx) { LOG_DEBUG(Service_FS, "called"); IPC::ResponseBuilder rb{ctx, 4}; @@ -1102,7 +1101,7 @@ void FSP_SRV::GetProgramIndexForAccessLog(Kernel::HLERequestContext& ctx) { rb.Push(access_log_program_index); } -void FSP_SRV::GetCacheStorageSize(Kernel::HLERequestContext& ctx) { +void FSP_SRV::GetCacheStorageSize(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto index{rp.Pop()}; @@ -1128,14 +1127,14 @@ public: private: FileSys::VirtualFile backend; - void Add(Kernel::HLERequestContext& ctx) { + void Add(HLERequestContext& ctx) { LOG_WARNING(Service_FS, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void Commit(Kernel::HLERequestContext& ctx) { + void Commit(HLERequestContext& ctx) { LOG_WARNING(Service_FS, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; @@ -1143,7 +1142,7 @@ private: } }; -void FSP_SRV::OpenMultiCommitManager(Kernel::HLERequestContext& ctx) { +void FSP_SRV::OpenMultiCommitManager(HLERequestContext& ctx) { LOG_DEBUG(Service_FS, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; diff --git a/src/core/hle/service/filesystem/fsp_srv.h b/src/core/hle/service/filesystem/fsp_srv.h index 3d88b97f9..49f17c7c3 100644 --- a/src/core/hle/service/filesystem/fsp_srv.h +++ b/src/core/hle/service/filesystem/fsp_srv.h @@ -35,26 +35,26 @@ public: ~FSP_SRV() override; private: - void SetCurrentProcess(Kernel::HLERequestContext& ctx); - void OpenFileSystemWithPatch(Kernel::HLERequestContext& ctx); - void OpenSdCardFileSystem(Kernel::HLERequestContext& ctx); - void CreateSaveDataFileSystem(Kernel::HLERequestContext& ctx); - void OpenSaveDataFileSystem(Kernel::HLERequestContext& ctx); - void OpenReadOnlySaveDataFileSystem(Kernel::HLERequestContext& ctx); - void OpenSaveDataInfoReaderBySaveDataSpaceId(Kernel::HLERequestContext& ctx); - void WriteSaveDataFileSystemExtraDataBySaveDataAttribute(Kernel::HLERequestContext& ctx); - void ReadSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute(Kernel::HLERequestContext& ctx); - void OpenDataStorageByCurrentProcess(Kernel::HLERequestContext& ctx); - void OpenDataStorageByDataId(Kernel::HLERequestContext& ctx); - void OpenPatchDataStorageByCurrentProcess(Kernel::HLERequestContext& ctx); - void OpenDataStorageWithProgramIndex(Kernel::HLERequestContext& ctx); - void DisableAutoSaveDataCreation(Kernel::HLERequestContext& ctx); - void SetGlobalAccessLogMode(Kernel::HLERequestContext& ctx); - void GetGlobalAccessLogMode(Kernel::HLERequestContext& ctx); - void OutputAccessLogToSdCard(Kernel::HLERequestContext& ctx); - void GetProgramIndexForAccessLog(Kernel::HLERequestContext& ctx); - void OpenMultiCommitManager(Kernel::HLERequestContext& ctx); - void GetCacheStorageSize(Kernel::HLERequestContext& ctx); + void SetCurrentProcess(HLERequestContext& ctx); + void OpenFileSystemWithPatch(HLERequestContext& ctx); + void OpenSdCardFileSystem(HLERequestContext& ctx); + void CreateSaveDataFileSystem(HLERequestContext& ctx); + void OpenSaveDataFileSystem(HLERequestContext& ctx); + void OpenReadOnlySaveDataFileSystem(HLERequestContext& ctx); + void OpenSaveDataInfoReaderBySaveDataSpaceId(HLERequestContext& ctx); + void WriteSaveDataFileSystemExtraDataBySaveDataAttribute(HLERequestContext& ctx); + void ReadSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute(HLERequestContext& ctx); + void OpenDataStorageByCurrentProcess(HLERequestContext& ctx); + void OpenDataStorageByDataId(HLERequestContext& ctx); + void OpenPatchDataStorageByCurrentProcess(HLERequestContext& ctx); + void OpenDataStorageWithProgramIndex(HLERequestContext& ctx); + void DisableAutoSaveDataCreation(HLERequestContext& ctx); + void SetGlobalAccessLogMode(HLERequestContext& ctx); + void GetGlobalAccessLogMode(HLERequestContext& ctx); + void OutputAccessLogToSdCard(HLERequestContext& ctx); + void GetProgramIndexForAccessLog(HLERequestContext& ctx); + void OpenMultiCommitManager(HLERequestContext& ctx); + void GetCacheStorageSize(HLERequestContext& ctx); FileSystemController& fsc; const FileSys::ContentProvider& content_provider; diff --git a/src/core/hle/service/friend/friend.cpp b/src/core/hle/service/friend/friend.cpp index fcf10bfeb..447deab8b 100644 --- a/src/core/hle/service/friend/friend.cpp +++ b/src/core/hle/service/friend/friend.cpp @@ -5,11 +5,11 @@ #include "common/logging/log.h" #include "common/uuid.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/friend/errors.h" #include "core/hle/service/friend/friend.h" #include "core/hle/service/friend/friend_interface.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/kernel_helpers.h" #include "core/hle/service/server_manager.h" @@ -136,7 +136,7 @@ private: }; static_assert(sizeof(SizedFriendFilter) == 0x10, "SizedFriendFilter is an invalid size"); - void GetCompletionEvent(Kernel::HLERequestContext& ctx) { + void GetCompletionEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_Friend, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -144,7 +144,7 @@ private: rb.PushCopyObjects(completion_event->GetReadableEvent()); } - void GetBlockedUserListIds(Kernel::HLERequestContext& ctx) { + void GetBlockedUserListIds(HLERequestContext& ctx) { // This is safe to stub, as there should be no adverse consequences from reporting no // blocked users. LOG_WARNING(Service_Friend, "(STUBBED) called"); @@ -153,21 +153,21 @@ private: rb.Push(0); // Indicates there are no blocked users } - void DeclareCloseOnlinePlaySession(Kernel::HLERequestContext& ctx) { + void DeclareCloseOnlinePlaySession(HLERequestContext& ctx) { // Stub used by Splatoon 2 LOG_WARNING(Service_Friend, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void UpdateUserPresence(Kernel::HLERequestContext& ctx) { + void UpdateUserPresence(HLERequestContext& ctx) { // Stub used by Retro City Rampage LOG_WARNING(Service_Friend, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void GetPlayHistoryRegistrationKey(Kernel::HLERequestContext& ctx) { + void GetPlayHistoryRegistrationKey(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto local_play = rp.Pop(); const auto uuid = rp.PopRaw(); @@ -179,7 +179,7 @@ private: rb.Push(ResultSuccess); } - void GetFriendList(Kernel::HLERequestContext& ctx) { + void GetFriendList(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto friend_offset = rp.Pop(); const auto uuid = rp.PopRaw(); @@ -195,7 +195,7 @@ private: // TODO(ogniK): Return a buffer of u64s which are the "NetworkServiceAccountId" } - void CheckFriendListAvailability(Kernel::HLERequestContext& ctx) { + void CheckFriendListAvailability(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto uuid{rp.PopRaw()}; @@ -234,7 +234,7 @@ public: } private: - void GetEvent(Kernel::HLERequestContext& ctx) { + void GetEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_Friend, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -242,7 +242,7 @@ private: rb.PushCopyObjects(notification_event->GetReadableEvent()); } - void Clear(Kernel::HLERequestContext& ctx) { + void Clear(HLERequestContext& ctx) { LOG_DEBUG(Service_Friend, "called"); while (!notifications.empty()) { notifications.pop(); @@ -253,7 +253,7 @@ private: rb.Push(ResultSuccess); } - void Pop(Kernel::HLERequestContext& ctx) { + void Pop(HLERequestContext& ctx) { LOG_DEBUG(Service_Friend, "called"); if (notifications.empty()) { @@ -312,14 +312,14 @@ private: States states{}; }; -void Module::Interface::CreateFriendService(Kernel::HLERequestContext& ctx) { +void Module::Interface::CreateFriendService(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); rb.PushIpcInterface(system); LOG_DEBUG(Service_Friend, "called"); } -void Module::Interface::CreateNotificationService(Kernel::HLERequestContext& ctx) { +void Module::Interface::CreateNotificationService(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; auto uuid = rp.PopRaw(); diff --git a/src/core/hle/service/friend/friend.h b/src/core/hle/service/friend/friend.h index 41be06a4f..2824dc786 100644 --- a/src/core/hle/service/friend/friend.h +++ b/src/core/hle/service/friend/friend.h @@ -19,8 +19,8 @@ public: const char* name); ~Interface() override; - void CreateFriendService(Kernel::HLERequestContext& ctx); - void CreateNotificationService(Kernel::HLERequestContext& ctx); + void CreateFriendService(HLERequestContext& ctx); + void CreateNotificationService(HLERequestContext& ctx); protected: std::shared_ptr module; diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp index ce21b69e3..9db136bac 100644 --- a/src/core/hle/service/glue/arp.cpp +++ b/src/core/hle/service/glue/arp.cpp @@ -5,12 +5,12 @@ #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_process.h" #include "core/hle/kernel/kernel.h" #include "core/hle/service/glue/arp.h" #include "core/hle/service/glue/errors.h" #include "core/hle/service/glue/glue_manager.h" +#include "core/hle/service/ipc_helpers.h" namespace Service::Glue { @@ -51,7 +51,7 @@ ARP_R::ARP_R(Core::System& system_, const ARPManager& manager_) ARP_R::~ARP_R() = default; -void ARP_R::GetApplicationLaunchProperty(Kernel::HLERequestContext& ctx) { +void ARP_R::GetApplicationLaunchProperty(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto process_id = rp.PopRaw(); @@ -79,7 +79,7 @@ void ARP_R::GetApplicationLaunchProperty(Kernel::HLERequestContext& ctx) { rb.PushRaw(*res); } -void ARP_R::GetApplicationLaunchPropertyWithApplicationId(Kernel::HLERequestContext& ctx) { +void ARP_R::GetApplicationLaunchPropertyWithApplicationId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto title_id = rp.PopRaw(); @@ -99,7 +99,7 @@ void ARP_R::GetApplicationLaunchPropertyWithApplicationId(Kernel::HLERequestCont rb.PushRaw(*res); } -void ARP_R::GetApplicationControlProperty(Kernel::HLERequestContext& ctx) { +void ARP_R::GetApplicationControlProperty(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto process_id = rp.PopRaw(); @@ -128,7 +128,7 @@ void ARP_R::GetApplicationControlProperty(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void ARP_R::GetApplicationControlPropertyWithApplicationId(Kernel::HLERequestContext& ctx) { +void ARP_R::GetApplicationControlPropertyWithApplicationId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto title_id = rp.PopRaw(); @@ -169,7 +169,7 @@ public: } private: - void Issue(Kernel::HLERequestContext& ctx) { + void Issue(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto process_id = rp.PopRaw(); @@ -197,7 +197,7 @@ private: rb.Push(ResultSuccess); } - void SetApplicationLaunchProperty(Kernel::HLERequestContext& ctx) { + void SetApplicationLaunchProperty(HLERequestContext& ctx) { LOG_DEBUG(Service_ARP, "called"); if (issued) { @@ -216,7 +216,7 @@ private: rb.Push(ResultSuccess); } - void SetApplicationControlProperty(Kernel::HLERequestContext& ctx) { + void SetApplicationControlProperty(HLERequestContext& ctx) { LOG_DEBUG(Service_ARP, "called"); if (issued) { @@ -256,7 +256,7 @@ ARP_W::ARP_W(Core::System& system_, ARPManager& manager_) ARP_W::~ARP_W() = default; -void ARP_W::AcquireRegistrar(Kernel::HLERequestContext& ctx) { +void ARP_W::AcquireRegistrar(HLERequestContext& ctx) { LOG_DEBUG(Service_ARP, "called"); registrar = std::make_shared( @@ -274,7 +274,7 @@ void ARP_W::AcquireRegistrar(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(registrar); } -void ARP_W::UnregisterApplicationInstance(Kernel::HLERequestContext& ctx) { +void ARP_W::UnregisterApplicationInstance(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto process_id = rp.PopRaw(); diff --git a/src/core/hle/service/glue/arp.h b/src/core/hle/service/glue/arp.h index 06c992e88..5bce80175 100644 --- a/src/core/hle/service/glue/arp.h +++ b/src/core/hle/service/glue/arp.h @@ -16,10 +16,10 @@ public: ~ARP_R() override; private: - void GetApplicationLaunchProperty(Kernel::HLERequestContext& ctx); - void GetApplicationLaunchPropertyWithApplicationId(Kernel::HLERequestContext& ctx); - void GetApplicationControlProperty(Kernel::HLERequestContext& ctx); - void GetApplicationControlPropertyWithApplicationId(Kernel::HLERequestContext& ctx); + void GetApplicationLaunchProperty(HLERequestContext& ctx); + void GetApplicationLaunchPropertyWithApplicationId(HLERequestContext& ctx); + void GetApplicationControlProperty(HLERequestContext& ctx); + void GetApplicationControlPropertyWithApplicationId(HLERequestContext& ctx); const ARPManager& manager; }; @@ -30,8 +30,8 @@ public: ~ARP_W() override; private: - void AcquireRegistrar(Kernel::HLERequestContext& ctx); - void UnregisterApplicationInstance(Kernel::HLERequestContext& ctx); + void AcquireRegistrar(HLERequestContext& ctx); + void UnregisterApplicationInstance(HLERequestContext& ctx); ARPManager& manager; std::shared_ptr registrar; diff --git a/src/core/hle/service/glue/bgtc.cpp b/src/core/hle/service/glue/bgtc.cpp index 3248091c3..ae22ac4f7 100644 --- a/src/core/hle/service/glue/bgtc.cpp +++ b/src/core/hle/service/glue/bgtc.cpp @@ -3,8 +3,8 @@ #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/glue/bgtc.h" +#include "core/hle/service/ipc_helpers.h" namespace Service::Glue { @@ -20,7 +20,7 @@ BGTC_T::BGTC_T(Core::System& system_) : ServiceFramework{system_, "bgtc:t"} { BGTC_T::~BGTC_T() = default; -void BGTC_T::OpenTaskService(Kernel::HLERequestContext& ctx) { +void BGTC_T::OpenTaskService(HLERequestContext& ctx) { LOG_DEBUG(Service_BGTC, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; diff --git a/src/core/hle/service/glue/bgtc.h b/src/core/hle/service/glue/bgtc.h index d6e2baec1..5a5d9c9a7 100644 --- a/src/core/hle/service/glue/bgtc.h +++ b/src/core/hle/service/glue/bgtc.h @@ -16,7 +16,7 @@ public: explicit BGTC_T(Core::System& system_); ~BGTC_T() override; - void OpenTaskService(Kernel::HLERequestContext& ctx); + void OpenTaskService(HLERequestContext& ctx); }; class ITaskService final : public ServiceFramework { diff --git a/src/core/hle/service/glue/notif.cpp b/src/core/hle/service/glue/notif.cpp index 3ace2dabd..fec4ad86c 100644 --- a/src/core/hle/service/glue/notif.cpp +++ b/src/core/hle/service/glue/notif.cpp @@ -6,8 +6,8 @@ #include "common/assert.h" #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/glue/notif.h" +#include "core/hle/service/ipc_helpers.h" namespace Service::Glue { @@ -28,7 +28,7 @@ NOTIF_A::NOTIF_A(Core::System& system_) : ServiceFramework{system_, "notif:a"} { NOTIF_A::~NOTIF_A() = default; -void NOTIF_A::RegisterAlarmSetting(Kernel::HLERequestContext& ctx) { +void NOTIF_A::RegisterAlarmSetting(HLERequestContext& ctx) { const auto alarm_setting_buffer_size = ctx.GetReadBufferSize(0); const auto application_parameter_size = ctx.GetReadBufferSize(1); @@ -63,7 +63,7 @@ void NOTIF_A::RegisterAlarmSetting(Kernel::HLERequestContext& ctx) { rb.Push(new_alarm.alarm_setting_id); } -void NOTIF_A::UpdateAlarmSetting(Kernel::HLERequestContext& ctx) { +void NOTIF_A::UpdateAlarmSetting(HLERequestContext& ctx) { const auto alarm_setting_buffer_size = ctx.GetReadBufferSize(0); const auto application_parameter_size = ctx.GetReadBufferSize(1); @@ -91,7 +91,7 @@ void NOTIF_A::UpdateAlarmSetting(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void NOTIF_A::ListAlarmSettings(Kernel::HLERequestContext& ctx) { +void NOTIF_A::ListAlarmSettings(HLERequestContext& ctx) { LOG_INFO(Service_NOTIF, "called, alarm_count={}", alarms.size()); // TODO: Only return alarms of this game id @@ -102,7 +102,7 @@ void NOTIF_A::ListAlarmSettings(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(alarms.size())); } -void NOTIF_A::LoadApplicationParameter(Kernel::HLERequestContext& ctx) { +void NOTIF_A::LoadApplicationParameter(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto alarm_setting_id{rp.Pop()}; @@ -126,7 +126,7 @@ void NOTIF_A::LoadApplicationParameter(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(application_parameter.size())); } -void NOTIF_A::DeleteAlarmSetting(Kernel::HLERequestContext& ctx) { +void NOTIF_A::DeleteAlarmSetting(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto alarm_setting_id{rp.Pop()}; @@ -140,7 +140,7 @@ void NOTIF_A::DeleteAlarmSetting(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void NOTIF_A::Initialize(Kernel::HLERequestContext& ctx) { +void NOTIF_A::Initialize(HLERequestContext& ctx) { // TODO: Load previous alarms from config LOG_WARNING(Service_NOTIF, "(STUBBED) called"); diff --git a/src/core/hle/service/glue/notif.h b/src/core/hle/service/glue/notif.h index 4467e1f35..b1187f3a3 100644 --- a/src/core/hle/service/glue/notif.h +++ b/src/core/hle/service/glue/notif.h @@ -56,12 +56,12 @@ private: }; static_assert(sizeof(AlarmSetting) == 0x40, "AlarmSetting is an invalid size"); - void RegisterAlarmSetting(Kernel::HLERequestContext& ctx); - void UpdateAlarmSetting(Kernel::HLERequestContext& ctx); - void ListAlarmSettings(Kernel::HLERequestContext& ctx); - void LoadApplicationParameter(Kernel::HLERequestContext& ctx); - void DeleteAlarmSetting(Kernel::HLERequestContext& ctx); - void Initialize(Kernel::HLERequestContext& ctx); + void RegisterAlarmSetting(HLERequestContext& ctx); + void UpdateAlarmSetting(HLERequestContext& ctx); + void ListAlarmSettings(HLERequestContext& ctx); + void LoadApplicationParameter(HLERequestContext& ctx); + void DeleteAlarmSetting(HLERequestContext& ctx); + void Initialize(HLERequestContext& ctx); std::vector::iterator GetAlarmFromId(AlarmSettingId alarm_setting_id); diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 4b5130469..56c7275df 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -8,7 +8,6 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/hid/hid_core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_readable_event.h" #include "core/hle/kernel/k_shared_memory.h" #include "core/hle/kernel/k_transfer_memory.h" @@ -18,6 +17,7 @@ #include "core/hle/service/hid/hidbus.h" #include "core/hle/service/hid/irs.h" #include "core/hle/service/hid/xcd.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" #include "core/memory.h" @@ -138,7 +138,7 @@ IAppletResource::~IAppletResource() { system.CoreTiming().UnscheduleEvent(motion_update_event, 0); } -void IAppletResource::GetSharedMemoryHandle(Kernel::HLERequestContext& ctx) { +void IAppletResource::GetSharedMemoryHandle(HLERequestContext& ctx) { LOG_DEBUG(Service_HID, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -203,7 +203,7 @@ public: } private: - void InitializeVibrationDevice(Kernel::HLERequestContext& ctx) { + void InitializeVibrationDevice(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto vibration_device_handle{rp.PopRaw()}; @@ -382,7 +382,7 @@ Hid::Hid(Core::System& system_) Hid::~Hid() = default; -void Hid::CreateAppletResource(Kernel::HLERequestContext& ctx) { +void Hid::CreateAppletResource(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -397,7 +397,7 @@ void Hid::CreateAppletResource(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(applet_resource); } -void Hid::ActivateDebugPad(Kernel::HLERequestContext& ctx) { +void Hid::ActivateDebugPad(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -409,7 +409,7 @@ void Hid::ActivateDebugPad(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::ActivateTouchScreen(Kernel::HLERequestContext& ctx) { +void Hid::ActivateTouchScreen(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -421,7 +421,7 @@ void Hid::ActivateTouchScreen(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::ActivateMouse(Kernel::HLERequestContext& ctx) { +void Hid::ActivateMouse(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -433,7 +433,7 @@ void Hid::ActivateMouse(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::ActivateKeyboard(Kernel::HLERequestContext& ctx) { +void Hid::ActivateKeyboard(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -445,7 +445,7 @@ void Hid::ActivateKeyboard(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::SendKeyboardLockKeyEvent(Kernel::HLERequestContext& ctx) { +void Hid::SendKeyboardLockKeyEvent(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto flags{rp.Pop()}; @@ -455,7 +455,7 @@ void Hid::SendKeyboardLockKeyEvent(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::ActivateXpad(Kernel::HLERequestContext& ctx) { +void Hid::ActivateXpad(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { u32 basic_xpad_id; @@ -475,7 +475,7 @@ void Hid::ActivateXpad(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::GetXpadIDs(Kernel::HLERequestContext& ctx) { +void Hid::GetXpadIDs(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -486,7 +486,7 @@ void Hid::GetXpadIDs(Kernel::HLERequestContext& ctx) { rb.Push(0); } -void Hid::ActivateSixAxisSensor(Kernel::HLERequestContext& ctx) { +void Hid::ActivateSixAxisSensor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { u32 basic_xpad_id; @@ -506,7 +506,7 @@ void Hid::ActivateSixAxisSensor(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::DeactivateSixAxisSensor(Kernel::HLERequestContext& ctx) { +void Hid::DeactivateSixAxisSensor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { u32 basic_xpad_id; @@ -526,7 +526,7 @@ void Hid::DeactivateSixAxisSensor(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::StartSixAxisSensor(Kernel::HLERequestContext& ctx) { +void Hid::StartSixAxisSensor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::SixAxisSensorHandle sixaxis_handle; @@ -549,7 +549,7 @@ void Hid::StartSixAxisSensor(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::StopSixAxisSensor(Kernel::HLERequestContext& ctx) { +void Hid::StopSixAxisSensor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::SixAxisSensorHandle sixaxis_handle; @@ -572,7 +572,7 @@ void Hid::StopSixAxisSensor(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::IsSixAxisSensorFusionEnabled(Kernel::HLERequestContext& ctx) { +void Hid::IsSixAxisSensorFusionEnabled(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::SixAxisSensorHandle sixaxis_handle; @@ -598,7 +598,7 @@ void Hid::IsSixAxisSensorFusionEnabled(Kernel::HLERequestContext& ctx) { rb.Push(is_enabled); } -void Hid::EnableSixAxisSensorFusion(Kernel::HLERequestContext& ctx) { +void Hid::EnableSixAxisSensorFusion(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { bool enable_sixaxis_sensor_fusion; @@ -625,7 +625,7 @@ void Hid::EnableSixAxisSensorFusion(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::SetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { +void Hid::SetSixAxisSensorFusionParameters(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::SixAxisSensorHandle sixaxis_handle; @@ -652,7 +652,7 @@ void Hid::SetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::GetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { +void Hid::GetSixAxisSensorFusionParameters(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::SixAxisSensorHandle sixaxis_handle; @@ -679,7 +679,7 @@ void Hid::GetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { rb.PushRaw(fusion_parameters); } -void Hid::ResetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { +void Hid::ResetSixAxisSensorFusionParameters(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::SixAxisSensorHandle sixaxis_handle; @@ -713,7 +713,7 @@ void Hid::ResetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx) { rb.Push(result2); } -void Hid::SetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { +void Hid::SetGyroscopeZeroDriftMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto sixaxis_handle{rp.PopRaw()}; const auto drift_mode{rp.PopEnum()}; @@ -732,7 +732,7 @@ void Hid::SetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::GetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { +void Hid::GetGyroscopeZeroDriftMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::SixAxisSensorHandle sixaxis_handle; @@ -757,7 +757,7 @@ void Hid::GetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { rb.PushEnum(drift_mode); } -void Hid::ResetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { +void Hid::ResetGyroscopeZeroDriftMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::SixAxisSensorHandle sixaxis_handle; @@ -781,7 +781,7 @@ void Hid::ResetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::IsSixAxisSensorAtRest(Kernel::HLERequestContext& ctx) { +void Hid::IsSixAxisSensorAtRest(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::SixAxisSensorHandle sixaxis_handle; @@ -806,7 +806,7 @@ void Hid::IsSixAxisSensorAtRest(Kernel::HLERequestContext& ctx) { rb.Push(is_at_rest); } -void Hid::IsFirmwareUpdateAvailableForSixAxisSensor(Kernel::HLERequestContext& ctx) { +void Hid::IsFirmwareUpdateAvailableForSixAxisSensor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::SixAxisSensorHandle sixaxis_handle; @@ -833,7 +833,7 @@ void Hid::IsFirmwareUpdateAvailableForSixAxisSensor(Kernel::HLERequestContext& c rb.Push(is_firmware_available); } -void Hid::EnableSixAxisSensorUnalteredPassthrough(Kernel::HLERequestContext& ctx) { +void Hid::EnableSixAxisSensorUnalteredPassthrough(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { bool enabled; @@ -859,7 +859,7 @@ void Hid::EnableSixAxisSensorUnalteredPassthrough(Kernel::HLERequestContext& ctx rb.Push(result); } -void Hid::IsSixAxisSensorUnalteredPassthroughEnabled(Kernel::HLERequestContext& ctx) { +void Hid::IsSixAxisSensorUnalteredPassthroughEnabled(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::SixAxisSensorHandle sixaxis_handle; @@ -886,7 +886,7 @@ void Hid::IsSixAxisSensorUnalteredPassthroughEnabled(Kernel::HLERequestContext& rb.Push(is_unaltered_sisxaxis_enabled); } -void Hid::LoadSixAxisSensorCalibrationParameter(Kernel::HLERequestContext& ctx) { +void Hid::LoadSixAxisSensorCalibrationParameter(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::SixAxisSensorHandle sixaxis_handle; @@ -916,7 +916,7 @@ void Hid::LoadSixAxisSensorCalibrationParameter(Kernel::HLERequestContext& ctx) rb.Push(result); } -void Hid::GetSixAxisSensorIcInformation(Kernel::HLERequestContext& ctx) { +void Hid::GetSixAxisSensorIcInformation(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::SixAxisSensorHandle sixaxis_handle; @@ -946,7 +946,7 @@ void Hid::GetSixAxisSensorIcInformation(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::ResetIsSixAxisSensorDeviceNewlyAssigned(Kernel::HLERequestContext& ctx) { +void Hid::ResetIsSixAxisSensorDeviceNewlyAssigned(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::SixAxisSensorHandle sixaxis_handle; @@ -971,7 +971,7 @@ void Hid::ResetIsSixAxisSensorDeviceNewlyAssigned(Kernel::HLERequestContext& ctx rb.Push(result); } -void Hid::ActivateGesture(Kernel::HLERequestContext& ctx) { +void Hid::ActivateGesture(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { u32 unknown; @@ -991,7 +991,7 @@ void Hid::ActivateGesture(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::SetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx) { +void Hid::SetSupportedNpadStyleSet(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::NpadStyleSet supported_styleset; @@ -1012,7 +1012,7 @@ void Hid::SetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::GetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx) { +void Hid::GetSupportedNpadStyleSet(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1025,7 +1025,7 @@ void Hid::GetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx) { .raw); } -void Hid::SetSupportedNpadIdType(Kernel::HLERequestContext& ctx) { +void Hid::SetSupportedNpadIdType(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1038,7 +1038,7 @@ void Hid::SetSupportedNpadIdType(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::ActivateNpad(Kernel::HLERequestContext& ctx) { +void Hid::ActivateNpad(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1050,7 +1050,7 @@ void Hid::ActivateNpad(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::DeactivateNpad(Kernel::HLERequestContext& ctx) { +void Hid::DeactivateNpad(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1062,7 +1062,7 @@ void Hid::DeactivateNpad(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::AcquireNpadStyleSetUpdateEventHandle(Kernel::HLERequestContext& ctx) { +void Hid::AcquireNpadStyleSetUpdateEventHandle(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::NpadIdType npad_id; @@ -1087,7 +1087,7 @@ void Hid::AcquireNpadStyleSetUpdateEventHandle(Kernel::HLERequestContext& ctx) { .GetStyleSetChangedEvent(parameters.npad_id)); } -void Hid::DisconnectNpad(Kernel::HLERequestContext& ctx) { +void Hid::DisconnectNpad(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::NpadIdType npad_id; @@ -1108,7 +1108,7 @@ void Hid::DisconnectNpad(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::GetPlayerLedPattern(Kernel::HLERequestContext& ctx) { +void Hid::GetPlayerLedPattern(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto npad_id{rp.PopEnum()}; @@ -1123,7 +1123,7 @@ void Hid::GetPlayerLedPattern(Kernel::HLERequestContext& ctx) { rb.Push(pattern.raw); } -void Hid::ActivateNpadWithRevision(Kernel::HLERequestContext& ctx) { +void Hid::ActivateNpadWithRevision(HLERequestContext& ctx) { // Should have no effect with how our npad sets up the data IPC::RequestParser rp{ctx}; struct Parameters { @@ -1144,7 +1144,7 @@ void Hid::ActivateNpadWithRevision(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::SetNpadJoyHoldType(Kernel::HLERequestContext& ctx) { +void Hid::SetNpadJoyHoldType(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; const auto hold_type{rp.PopEnum()}; @@ -1158,7 +1158,7 @@ void Hid::SetNpadJoyHoldType(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::GetNpadJoyHoldType(Kernel::HLERequestContext& ctx) { +void Hid::GetNpadJoyHoldType(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1169,7 +1169,7 @@ void Hid::GetNpadJoyHoldType(Kernel::HLERequestContext& ctx) { rb.PushEnum(applet_resource->GetController(HidController::NPad).GetHoldType()); } -void Hid::SetNpadJoyAssignmentModeSingleByDefault(Kernel::HLERequestContext& ctx) { +void Hid::SetNpadJoyAssignmentModeSingleByDefault(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::NpadIdType npad_id; @@ -1191,7 +1191,7 @@ void Hid::SetNpadJoyAssignmentModeSingleByDefault(Kernel::HLERequestContext& ctx rb.Push(ResultSuccess); } -void Hid::SetNpadJoyAssignmentModeSingle(Kernel::HLERequestContext& ctx) { +void Hid::SetNpadJoyAssignmentModeSingle(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::NpadIdType npad_id; @@ -1215,7 +1215,7 @@ void Hid::SetNpadJoyAssignmentModeSingle(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::SetNpadJoyAssignmentModeDual(Kernel::HLERequestContext& ctx) { +void Hid::SetNpadJoyAssignmentModeDual(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::NpadIdType npad_id; @@ -1236,7 +1236,7 @@ void Hid::SetNpadJoyAssignmentModeDual(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::MergeSingleJoyAsDualJoy(Kernel::HLERequestContext& ctx) { +void Hid::MergeSingleJoyAsDualJoy(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto npad_id_1{rp.PopEnum()}; const auto npad_id_2{rp.PopEnum()}; @@ -1252,7 +1252,7 @@ void Hid::MergeSingleJoyAsDualJoy(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::StartLrAssignmentMode(Kernel::HLERequestContext& ctx) { +void Hid::StartLrAssignmentMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1264,7 +1264,7 @@ void Hid::StartLrAssignmentMode(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::StopLrAssignmentMode(Kernel::HLERequestContext& ctx) { +void Hid::StopLrAssignmentMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1276,7 +1276,7 @@ void Hid::StopLrAssignmentMode(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::SetNpadHandheldActivationMode(Kernel::HLERequestContext& ctx) { +void Hid::SetNpadHandheldActivationMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; const auto activation_mode{rp.PopEnum()}; @@ -1291,7 +1291,7 @@ void Hid::SetNpadHandheldActivationMode(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::GetNpadHandheldActivationMode(Kernel::HLERequestContext& ctx) { +void Hid::GetNpadHandheldActivationMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1303,7 +1303,7 @@ void Hid::GetNpadHandheldActivationMode(Kernel::HLERequestContext& ctx) { .GetNpadHandheldActivationMode()); } -void Hid::SwapNpadAssignment(Kernel::HLERequestContext& ctx) { +void Hid::SwapNpadAssignment(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto npad_id_1{rp.PopEnum()}; const auto npad_id_2{rp.PopEnum()}; @@ -1319,7 +1319,7 @@ void Hid::SwapNpadAssignment(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::IsUnintendedHomeButtonInputProtectionEnabled(Kernel::HLERequestContext& ctx) { +void Hid::IsUnintendedHomeButtonInputProtectionEnabled(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::NpadIdType npad_id; @@ -1343,7 +1343,7 @@ void Hid::IsUnintendedHomeButtonInputProtectionEnabled(Kernel::HLERequestContext rb.Push(is_enabled); } -void Hid::EnableUnintendedHomeButtonInputProtection(Kernel::HLERequestContext& ctx) { +void Hid::EnableUnintendedHomeButtonInputProtection(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { bool unintended_home_button_input_protection; @@ -1369,7 +1369,7 @@ void Hid::EnableUnintendedHomeButtonInputProtection(Kernel::HLERequestContext& c rb.Push(result); } -void Hid::SetNpadAnalogStickUseCenterClamp(Kernel::HLERequestContext& ctx) { +void Hid::SetNpadAnalogStickUseCenterClamp(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { bool analog_stick_use_center_clamp; @@ -1392,7 +1392,7 @@ void Hid::SetNpadAnalogStickUseCenterClamp(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::SetNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx) { +void Hid::SetNpadCaptureButtonAssignment(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::NpadStyleSet npad_styleset; @@ -1412,7 +1412,7 @@ void Hid::SetNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::ClearNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx) { +void Hid::ClearNpadCaptureButtonAssignment(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1423,7 +1423,7 @@ void Hid::ClearNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::GetVibrationDeviceInfo(Kernel::HLERequestContext& ctx) { +void Hid::GetVibrationDeviceInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto vibration_device_handle{rp.PopRaw()}; const auto& controller = @@ -1483,7 +1483,7 @@ void Hid::GetVibrationDeviceInfo(Kernel::HLERequestContext& ctx) { rb.PushRaw(vibration_device_info); } -void Hid::SendVibrationValue(Kernel::HLERequestContext& ctx) { +void Hid::SendVibrationValue(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::VibrationDeviceHandle vibration_device_handle; @@ -1508,7 +1508,7 @@ void Hid::SendVibrationValue(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::GetActualVibrationValue(Kernel::HLERequestContext& ctx) { +void Hid::GetActualVibrationValue(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::VibrationDeviceHandle vibration_device_handle; @@ -1531,7 +1531,7 @@ void Hid::GetActualVibrationValue(Kernel::HLERequestContext& ctx) { .GetLastVibration(parameters.vibration_device_handle)); } -void Hid::CreateActiveVibrationDeviceList(Kernel::HLERequestContext& ctx) { +void Hid::CreateActiveVibrationDeviceList(HLERequestContext& ctx) { LOG_DEBUG(Service_HID, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -1539,7 +1539,7 @@ void Hid::CreateActiveVibrationDeviceList(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(system, applet_resource); } -void Hid::PermitVibration(Kernel::HLERequestContext& ctx) { +void Hid::PermitVibration(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto can_vibrate{rp.Pop()}; @@ -1553,7 +1553,7 @@ void Hid::PermitVibration(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::IsVibrationPermitted(Kernel::HLERequestContext& ctx) { +void Hid::IsVibrationPermitted(HLERequestContext& ctx) { LOG_DEBUG(Service_HID, "called"); // nnSDK checks if a float is greater than zero. We return the bool we stored earlier @@ -1564,7 +1564,7 @@ void Hid::IsVibrationPermitted(Kernel::HLERequestContext& ctx) { rb.Push(is_enabled); } -void Hid::SendVibrationValues(Kernel::HLERequestContext& ctx) { +void Hid::SendVibrationValues(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1588,7 +1588,7 @@ void Hid::SendVibrationValues(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::SendVibrationGcErmCommand(Kernel::HLERequestContext& ctx) { +void Hid::SendVibrationGcErmCommand(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::VibrationDeviceHandle vibration_device_handle; @@ -1649,7 +1649,7 @@ void Hid::SendVibrationGcErmCommand(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::GetActualVibrationGcErmCommand(Kernel::HLERequestContext& ctx) { +void Hid::GetActualVibrationGcErmCommand(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::VibrationDeviceHandle vibration_device_handle; @@ -1691,7 +1691,7 @@ void Hid::GetActualVibrationGcErmCommand(Kernel::HLERequestContext& ctx) { rb.PushEnum(gc_erm_command); } -void Hid::BeginPermitVibrationSession(Kernel::HLERequestContext& ctx) { +void Hid::BeginPermitVibrationSession(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1704,7 +1704,7 @@ void Hid::BeginPermitVibrationSession(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::EndPermitVibrationSession(Kernel::HLERequestContext& ctx) { +void Hid::EndPermitVibrationSession(HLERequestContext& ctx) { applet_resource->GetController(HidController::NPad) .SetPermitVibrationSession(false); @@ -1714,7 +1714,7 @@ void Hid::EndPermitVibrationSession(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::IsVibrationDeviceMounted(Kernel::HLERequestContext& ctx) { +void Hid::IsVibrationDeviceMounted(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::VibrationDeviceHandle vibration_device_handle; @@ -1737,7 +1737,7 @@ void Hid::IsVibrationDeviceMounted(Kernel::HLERequestContext& ctx) { .IsVibrationDeviceMounted(parameters.vibration_device_handle)); } -void Hid::ActivateConsoleSixAxisSensor(Kernel::HLERequestContext& ctx) { +void Hid::ActivateConsoleSixAxisSensor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1749,7 +1749,7 @@ void Hid::ActivateConsoleSixAxisSensor(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::StartConsoleSixAxisSensor(Kernel::HLERequestContext& ctx) { +void Hid::StartConsoleSixAxisSensor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::ConsoleSixAxisSensorHandle console_sixaxis_handle; @@ -1769,7 +1769,7 @@ void Hid::StartConsoleSixAxisSensor(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::StopConsoleSixAxisSensor(Kernel::HLERequestContext& ctx) { +void Hid::StopConsoleSixAxisSensor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::ConsoleSixAxisSensorHandle console_sixaxis_handle; @@ -1789,7 +1789,7 @@ void Hid::StopConsoleSixAxisSensor(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::ActivateSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { +void Hid::ActivateSevenSixAxisSensor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1801,7 +1801,7 @@ void Hid::ActivateSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::StartSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { +void Hid::StartSevenSixAxisSensor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1812,7 +1812,7 @@ void Hid::StartSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::StopSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { +void Hid::StopSevenSixAxisSensor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1823,7 +1823,7 @@ void Hid::StopSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::InitializeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { +void Hid::InitializeSevenSixAxisSensor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; const auto t_mem_1_size{rp.Pop()}; @@ -1873,7 +1873,7 @@ void Hid::InitializeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::FinalizeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { +void Hid::FinalizeSevenSixAxisSensor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1884,7 +1884,7 @@ void Hid::FinalizeSevenSixAxisSensor(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::ResetSevenSixAxisSensorTimestamp(Kernel::HLERequestContext& ctx) { +void Hid::ResetSevenSixAxisSensorTimestamp(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -1897,7 +1897,7 @@ void Hid::ResetSevenSixAxisSensorTimestamp(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::IsUsbFullKeyControllerEnabled(Kernel::HLERequestContext& ctx) { +void Hid::IsUsbFullKeyControllerEnabled(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; LOG_WARNING(Service_HID, "(STUBBED) called"); @@ -1907,7 +1907,7 @@ void Hid::IsUsbFullKeyControllerEnabled(Kernel::HLERequestContext& ctx) { rb.Push(false); } -void Hid::GetPalmaConnectionHandle(Kernel::HLERequestContext& ctx) { +void Hid::GetPalmaConnectionHandle(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::NpadIdType npad_id; @@ -1930,7 +1930,7 @@ void Hid::GetPalmaConnectionHandle(Kernel::HLERequestContext& ctx) { rb.PushRaw(handle); } -void Hid::InitializePalma(Kernel::HLERequestContext& ctx) { +void Hid::InitializePalma(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto connection_handle{rp.PopRaw()}; @@ -1943,7 +1943,7 @@ void Hid::InitializePalma(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::AcquirePalmaOperationCompleteEvent(Kernel::HLERequestContext& ctx) { +void Hid::AcquirePalmaOperationCompleteEvent(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto connection_handle{rp.PopRaw()}; @@ -1956,7 +1956,7 @@ void Hid::AcquirePalmaOperationCompleteEvent(Kernel::HLERequestContext& ctx) { rb.PushCopyObjects(controller.AcquirePalmaOperationCompleteEvent(connection_handle)); } -void Hid::GetPalmaOperationInfo(Kernel::HLERequestContext& ctx) { +void Hid::GetPalmaOperationInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto connection_handle{rp.PopRaw()}; @@ -1978,7 +1978,7 @@ void Hid::GetPalmaOperationInfo(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(operation_type)); } -void Hid::PlayPalmaActivity(Kernel::HLERequestContext& ctx) { +void Hid::PlayPalmaActivity(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto connection_handle{rp.PopRaw()}; const auto palma_activity{rp.Pop()}; @@ -1993,7 +1993,7 @@ void Hid::PlayPalmaActivity(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::SetPalmaFrModeType(Kernel::HLERequestContext& ctx) { +void Hid::SetPalmaFrModeType(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto connection_handle{rp.PopRaw()}; const auto fr_mode{rp.PopEnum()}; @@ -2008,7 +2008,7 @@ void Hid::SetPalmaFrModeType(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::ReadPalmaStep(Kernel::HLERequestContext& ctx) { +void Hid::ReadPalmaStep(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto connection_handle{rp.PopRaw()}; @@ -2021,7 +2021,7 @@ void Hid::ReadPalmaStep(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::EnablePalmaStep(Kernel::HLERequestContext& ctx) { +void Hid::EnablePalmaStep(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { bool is_enabled; @@ -2043,7 +2043,7 @@ void Hid::EnablePalmaStep(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::ResetPalmaStep(Kernel::HLERequestContext& ctx) { +void Hid::ResetPalmaStep(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto connection_handle{rp.PopRaw()}; @@ -2056,21 +2056,21 @@ void Hid::ResetPalmaStep(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::ReadPalmaApplicationSection(Kernel::HLERequestContext& ctx) { +void Hid::ReadPalmaApplicationSection(HLERequestContext& ctx) { LOG_WARNING(Service_HID, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void Hid::WritePalmaApplicationSection(Kernel::HLERequestContext& ctx) { +void Hid::WritePalmaApplicationSection(HLERequestContext& ctx) { LOG_WARNING(Service_HID, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void Hid::ReadPalmaUniqueCode(Kernel::HLERequestContext& ctx) { +void Hid::ReadPalmaUniqueCode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto connection_handle{rp.PopRaw()}; @@ -2083,7 +2083,7 @@ void Hid::ReadPalmaUniqueCode(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::SetPalmaUniqueCodeInvalid(Kernel::HLERequestContext& ctx) { +void Hid::SetPalmaUniqueCodeInvalid(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto connection_handle{rp.PopRaw()}; @@ -2096,14 +2096,14 @@ void Hid::SetPalmaUniqueCodeInvalid(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::WritePalmaActivityEntry(Kernel::HLERequestContext& ctx) { +void Hid::WritePalmaActivityEntry(HLERequestContext& ctx) { LOG_CRITICAL(Service_HID, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void Hid::WritePalmaRgbLedPatternEntry(Kernel::HLERequestContext& ctx) { +void Hid::WritePalmaRgbLedPatternEntry(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto connection_handle{rp.PopRaw()}; const auto unknown{rp.Pop()}; @@ -2120,7 +2120,7 @@ void Hid::WritePalmaRgbLedPatternEntry(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::WritePalmaWaveEntry(Kernel::HLERequestContext& ctx) { +void Hid::WritePalmaWaveEntry(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto connection_handle{rp.PopRaw()}; const auto wave_set{rp.PopEnum()}; @@ -2155,7 +2155,7 @@ void Hid::WritePalmaWaveEntry(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::SetPalmaDataBaseIdentificationVersion(Kernel::HLERequestContext& ctx) { +void Hid::SetPalmaDataBaseIdentificationVersion(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { s32 database_id_version; @@ -2177,7 +2177,7 @@ void Hid::SetPalmaDataBaseIdentificationVersion(Kernel::HLERequestContext& ctx) rb.Push(ResultSuccess); } -void Hid::GetPalmaDataBaseIdentificationVersion(Kernel::HLERequestContext& ctx) { +void Hid::GetPalmaDataBaseIdentificationVersion(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto connection_handle{rp.PopRaw()}; @@ -2190,14 +2190,14 @@ void Hid::GetPalmaDataBaseIdentificationVersion(Kernel::HLERequestContext& ctx) rb.Push(ResultSuccess); } -void Hid::SuspendPalmaFeature(Kernel::HLERequestContext& ctx) { +void Hid::SuspendPalmaFeature(HLERequestContext& ctx) { LOG_WARNING(Service_HID, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void Hid::GetPalmaOperationResult(Kernel::HLERequestContext& ctx) { +void Hid::GetPalmaOperationResult(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto connection_handle{rp.PopRaw()}; @@ -2210,21 +2210,21 @@ void Hid::GetPalmaOperationResult(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void Hid::ReadPalmaPlayLog(Kernel::HLERequestContext& ctx) { +void Hid::ReadPalmaPlayLog(HLERequestContext& ctx) { LOG_WARNING(Service_HID, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void Hid::ResetPalmaPlayLog(Kernel::HLERequestContext& ctx) { +void Hid::ResetPalmaPlayLog(HLERequestContext& ctx) { LOG_WARNING(Service_HID, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void Hid::SetIsPalmaAllConnectable(Kernel::HLERequestContext& ctx) { +void Hid::SetIsPalmaAllConnectable(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { bool is_palma_all_connectable; @@ -2246,14 +2246,14 @@ void Hid::SetIsPalmaAllConnectable(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::SetIsPalmaPairedConnectable(Kernel::HLERequestContext& ctx) { +void Hid::SetIsPalmaPairedConnectable(HLERequestContext& ctx) { LOG_WARNING(Service_HID, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void Hid::PairPalma(Kernel::HLERequestContext& ctx) { +void Hid::PairPalma(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto connection_handle{rp.PopRaw()}; @@ -2266,7 +2266,7 @@ void Hid::PairPalma(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::SetPalmaBoostMode(Kernel::HLERequestContext& ctx) { +void Hid::SetPalmaBoostMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto palma_boost_mode{rp.Pop()}; @@ -2279,35 +2279,35 @@ void Hid::SetPalmaBoostMode(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::CancelWritePalmaWaveEntry(Kernel::HLERequestContext& ctx) { +void Hid::CancelWritePalmaWaveEntry(HLERequestContext& ctx) { LOG_WARNING(Service_HID, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void Hid::EnablePalmaBoostMode(Kernel::HLERequestContext& ctx) { +void Hid::EnablePalmaBoostMode(HLERequestContext& ctx) { LOG_WARNING(Service_HID, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void Hid::GetPalmaBluetoothAddress(Kernel::HLERequestContext& ctx) { +void Hid::GetPalmaBluetoothAddress(HLERequestContext& ctx) { LOG_WARNING(Service_HID, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void Hid::SetDisallowedPalmaConnection(Kernel::HLERequestContext& ctx) { +void Hid::SetDisallowedPalmaConnection(HLERequestContext& ctx) { LOG_WARNING(Service_HID, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void Hid::SetNpadCommunicationMode(Kernel::HLERequestContext& ctx) { +void Hid::SetNpadCommunicationMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; const auto communication_mode{rp.PopEnum()}; @@ -2322,7 +2322,7 @@ void Hid::SetNpadCommunicationMode(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::GetNpadCommunicationMode(Kernel::HLERequestContext& ctx) { +void Hid::GetNpadCommunicationMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; LOG_WARNING(Service_HID, "(STUBBED) called"); @@ -2333,7 +2333,7 @@ void Hid::GetNpadCommunicationMode(Kernel::HLERequestContext& ctx) { .GetNpadCommunicationMode()); } -void Hid::SetTouchScreenConfiguration(Kernel::HLERequestContext& ctx) { +void Hid::SetTouchScreenConfiguration(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto touchscreen_mode{rp.PopRaw()}; const auto applet_resource_user_id{rp.Pop()}; @@ -2345,7 +2345,7 @@ void Hid::SetTouchScreenConfiguration(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Hid::IsFirmwareUpdateNeededForNotification(Kernel::HLERequestContext& ctx) { +void Hid::IsFirmwareUpdateNeededForNotification(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { s32 unknown; @@ -2719,7 +2719,7 @@ public: } private: - void ApplyNpadSystemCommonPolicy(Kernel::HLERequestContext& ctx) { + void ApplyNpadSystemCommonPolicy(HLERequestContext& ctx) { // We already do this for homebrew so we can just stub it out LOG_WARNING(Service_HID, "called"); @@ -2727,7 +2727,7 @@ private: rb.Push(ResultSuccess); } - void GetUniquePadsFromNpad(Kernel::HLERequestContext& ctx) { + void GetUniquePadsFromNpad(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto npad_id_type{rp.PopEnum()}; diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index 9563654b6..c69e5f3fb 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -76,7 +76,7 @@ private: std::make_unique(system.HIDCore(), shared_memory, service_context); } - void GetSharedMemoryHandle(Kernel::HLERequestContext& ctx); + void GetSharedMemoryHandle(HLERequestContext& ctx); void UpdateControllers(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); void UpdateNpad(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); void UpdateMouseKeyboard(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); @@ -101,115 +101,115 @@ public: std::shared_ptr GetAppletResource(); private: - void CreateAppletResource(Kernel::HLERequestContext& ctx); - void ActivateDebugPad(Kernel::HLERequestContext& ctx); - void ActivateTouchScreen(Kernel::HLERequestContext& ctx); - void ActivateMouse(Kernel::HLERequestContext& ctx); - void ActivateKeyboard(Kernel::HLERequestContext& ctx); - void SendKeyboardLockKeyEvent(Kernel::HLERequestContext& ctx); - void ActivateXpad(Kernel::HLERequestContext& ctx); - void GetXpadIDs(Kernel::HLERequestContext& ctx); - void ActivateSixAxisSensor(Kernel::HLERequestContext& ctx); - void DeactivateSixAxisSensor(Kernel::HLERequestContext& ctx); - void StartSixAxisSensor(Kernel::HLERequestContext& ctx); - void StopSixAxisSensor(Kernel::HLERequestContext& ctx); - void IsSixAxisSensorFusionEnabled(Kernel::HLERequestContext& ctx); - void EnableSixAxisSensorFusion(Kernel::HLERequestContext& ctx); - void SetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx); - void GetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx); - void ResetSixAxisSensorFusionParameters(Kernel::HLERequestContext& ctx); - void SetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx); - void GetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx); - void ResetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx); - void IsSixAxisSensorAtRest(Kernel::HLERequestContext& ctx); - void IsFirmwareUpdateAvailableForSixAxisSensor(Kernel::HLERequestContext& ctx); - void EnableSixAxisSensorUnalteredPassthrough(Kernel::HLERequestContext& ctx); - void IsSixAxisSensorUnalteredPassthroughEnabled(Kernel::HLERequestContext& ctx); - void LoadSixAxisSensorCalibrationParameter(Kernel::HLERequestContext& ctx); - void GetSixAxisSensorIcInformation(Kernel::HLERequestContext& ctx); - void ResetIsSixAxisSensorDeviceNewlyAssigned(Kernel::HLERequestContext& ctx); - void ActivateGesture(Kernel::HLERequestContext& ctx); - void SetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx); - void GetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx); - void SetSupportedNpadIdType(Kernel::HLERequestContext& ctx); - void ActivateNpad(Kernel::HLERequestContext& ctx); - void DeactivateNpad(Kernel::HLERequestContext& ctx); - void AcquireNpadStyleSetUpdateEventHandle(Kernel::HLERequestContext& ctx); - void DisconnectNpad(Kernel::HLERequestContext& ctx); - void GetPlayerLedPattern(Kernel::HLERequestContext& ctx); - void ActivateNpadWithRevision(Kernel::HLERequestContext& ctx); - void SetNpadJoyHoldType(Kernel::HLERequestContext& ctx); - void GetNpadJoyHoldType(Kernel::HLERequestContext& ctx); - void SetNpadJoyAssignmentModeSingleByDefault(Kernel::HLERequestContext& ctx); - void SetNpadJoyAssignmentModeSingle(Kernel::HLERequestContext& ctx); - void SetNpadJoyAssignmentModeDual(Kernel::HLERequestContext& ctx); - void MergeSingleJoyAsDualJoy(Kernel::HLERequestContext& ctx); - void StartLrAssignmentMode(Kernel::HLERequestContext& ctx); - void StopLrAssignmentMode(Kernel::HLERequestContext& ctx); - void SetNpadHandheldActivationMode(Kernel::HLERequestContext& ctx); - void GetNpadHandheldActivationMode(Kernel::HLERequestContext& ctx); - void SwapNpadAssignment(Kernel::HLERequestContext& ctx); - void IsUnintendedHomeButtonInputProtectionEnabled(Kernel::HLERequestContext& ctx); - void EnableUnintendedHomeButtonInputProtection(Kernel::HLERequestContext& ctx); - void SetNpadAnalogStickUseCenterClamp(Kernel::HLERequestContext& ctx); - void SetNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx); - void ClearNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx); - void GetVibrationDeviceInfo(Kernel::HLERequestContext& ctx); - void SendVibrationValue(Kernel::HLERequestContext& ctx); - void GetActualVibrationValue(Kernel::HLERequestContext& ctx); - void CreateActiveVibrationDeviceList(Kernel::HLERequestContext& ctx); - void PermitVibration(Kernel::HLERequestContext& ctx); - void IsVibrationPermitted(Kernel::HLERequestContext& ctx); - void SendVibrationValues(Kernel::HLERequestContext& ctx); - void SendVibrationGcErmCommand(Kernel::HLERequestContext& ctx); - void GetActualVibrationGcErmCommand(Kernel::HLERequestContext& ctx); - void BeginPermitVibrationSession(Kernel::HLERequestContext& ctx); - void EndPermitVibrationSession(Kernel::HLERequestContext& ctx); - void IsVibrationDeviceMounted(Kernel::HLERequestContext& ctx); - void ActivateConsoleSixAxisSensor(Kernel::HLERequestContext& ctx); - void StartConsoleSixAxisSensor(Kernel::HLERequestContext& ctx); - void StopConsoleSixAxisSensor(Kernel::HLERequestContext& ctx); - void ActivateSevenSixAxisSensor(Kernel::HLERequestContext& ctx); - void StartSevenSixAxisSensor(Kernel::HLERequestContext& ctx); - void StopSevenSixAxisSensor(Kernel::HLERequestContext& ctx); - void InitializeSevenSixAxisSensor(Kernel::HLERequestContext& ctx); - void FinalizeSevenSixAxisSensor(Kernel::HLERequestContext& ctx); - void ResetSevenSixAxisSensorTimestamp(Kernel::HLERequestContext& ctx); - void IsUsbFullKeyControllerEnabled(Kernel::HLERequestContext& ctx); - void GetPalmaConnectionHandle(Kernel::HLERequestContext& ctx); - void InitializePalma(Kernel::HLERequestContext& ctx); - void AcquirePalmaOperationCompleteEvent(Kernel::HLERequestContext& ctx); - void GetPalmaOperationInfo(Kernel::HLERequestContext& ctx); - void PlayPalmaActivity(Kernel::HLERequestContext& ctx); - void SetPalmaFrModeType(Kernel::HLERequestContext& ctx); - void ReadPalmaStep(Kernel::HLERequestContext& ctx); - void EnablePalmaStep(Kernel::HLERequestContext& ctx); - void ResetPalmaStep(Kernel::HLERequestContext& ctx); - void ReadPalmaApplicationSection(Kernel::HLERequestContext& ctx); - void WritePalmaApplicationSection(Kernel::HLERequestContext& ctx); - void ReadPalmaUniqueCode(Kernel::HLERequestContext& ctx); - void SetPalmaUniqueCodeInvalid(Kernel::HLERequestContext& ctx); - void WritePalmaActivityEntry(Kernel::HLERequestContext& ctx); - void WritePalmaRgbLedPatternEntry(Kernel::HLERequestContext& ctx); - void WritePalmaWaveEntry(Kernel::HLERequestContext& ctx); - void SetPalmaDataBaseIdentificationVersion(Kernel::HLERequestContext& ctx); - void GetPalmaDataBaseIdentificationVersion(Kernel::HLERequestContext& ctx); - void SuspendPalmaFeature(Kernel::HLERequestContext& ctx); - void GetPalmaOperationResult(Kernel::HLERequestContext& ctx); - void ReadPalmaPlayLog(Kernel::HLERequestContext& ctx); - void ResetPalmaPlayLog(Kernel::HLERequestContext& ctx); - void SetIsPalmaAllConnectable(Kernel::HLERequestContext& ctx); - void SetIsPalmaPairedConnectable(Kernel::HLERequestContext& ctx); - void PairPalma(Kernel::HLERequestContext& ctx); - void SetPalmaBoostMode(Kernel::HLERequestContext& ctx); - void CancelWritePalmaWaveEntry(Kernel::HLERequestContext& ctx); - void EnablePalmaBoostMode(Kernel::HLERequestContext& ctx); - void GetPalmaBluetoothAddress(Kernel::HLERequestContext& ctx); - void SetDisallowedPalmaConnection(Kernel::HLERequestContext& ctx); - void SetNpadCommunicationMode(Kernel::HLERequestContext& ctx); - void GetNpadCommunicationMode(Kernel::HLERequestContext& ctx); - void SetTouchScreenConfiguration(Kernel::HLERequestContext& ctx); - void IsFirmwareUpdateNeededForNotification(Kernel::HLERequestContext& ctx); + void CreateAppletResource(HLERequestContext& ctx); + void ActivateDebugPad(HLERequestContext& ctx); + void ActivateTouchScreen(HLERequestContext& ctx); + void ActivateMouse(HLERequestContext& ctx); + void ActivateKeyboard(HLERequestContext& ctx); + void SendKeyboardLockKeyEvent(HLERequestContext& ctx); + void ActivateXpad(HLERequestContext& ctx); + void GetXpadIDs(HLERequestContext& ctx); + void ActivateSixAxisSensor(HLERequestContext& ctx); + void DeactivateSixAxisSensor(HLERequestContext& ctx); + void StartSixAxisSensor(HLERequestContext& ctx); + void StopSixAxisSensor(HLERequestContext& ctx); + void IsSixAxisSensorFusionEnabled(HLERequestContext& ctx); + void EnableSixAxisSensorFusion(HLERequestContext& ctx); + void SetSixAxisSensorFusionParameters(HLERequestContext& ctx); + void GetSixAxisSensorFusionParameters(HLERequestContext& ctx); + void ResetSixAxisSensorFusionParameters(HLERequestContext& ctx); + void SetGyroscopeZeroDriftMode(HLERequestContext& ctx); + void GetGyroscopeZeroDriftMode(HLERequestContext& ctx); + void ResetGyroscopeZeroDriftMode(HLERequestContext& ctx); + void IsSixAxisSensorAtRest(HLERequestContext& ctx); + void IsFirmwareUpdateAvailableForSixAxisSensor(HLERequestContext& ctx); + void EnableSixAxisSensorUnalteredPassthrough(HLERequestContext& ctx); + void IsSixAxisSensorUnalteredPassthroughEnabled(HLERequestContext& ctx); + void LoadSixAxisSensorCalibrationParameter(HLERequestContext& ctx); + void GetSixAxisSensorIcInformation(HLERequestContext& ctx); + void ResetIsSixAxisSensorDeviceNewlyAssigned(HLERequestContext& ctx); + void ActivateGesture(HLERequestContext& ctx); + void SetSupportedNpadStyleSet(HLERequestContext& ctx); + void GetSupportedNpadStyleSet(HLERequestContext& ctx); + void SetSupportedNpadIdType(HLERequestContext& ctx); + void ActivateNpad(HLERequestContext& ctx); + void DeactivateNpad(HLERequestContext& ctx); + void AcquireNpadStyleSetUpdateEventHandle(HLERequestContext& ctx); + void DisconnectNpad(HLERequestContext& ctx); + void GetPlayerLedPattern(HLERequestContext& ctx); + void ActivateNpadWithRevision(HLERequestContext& ctx); + void SetNpadJoyHoldType(HLERequestContext& ctx); + void GetNpadJoyHoldType(HLERequestContext& ctx); + void SetNpadJoyAssignmentModeSingleByDefault(HLERequestContext& ctx); + void SetNpadJoyAssignmentModeSingle(HLERequestContext& ctx); + void SetNpadJoyAssignmentModeDual(HLERequestContext& ctx); + void MergeSingleJoyAsDualJoy(HLERequestContext& ctx); + void StartLrAssignmentMode(HLERequestContext& ctx); + void StopLrAssignmentMode(HLERequestContext& ctx); + void SetNpadHandheldActivationMode(HLERequestContext& ctx); + void GetNpadHandheldActivationMode(HLERequestContext& ctx); + void SwapNpadAssignment(HLERequestContext& ctx); + void IsUnintendedHomeButtonInputProtectionEnabled(HLERequestContext& ctx); + void EnableUnintendedHomeButtonInputProtection(HLERequestContext& ctx); + void SetNpadAnalogStickUseCenterClamp(HLERequestContext& ctx); + void SetNpadCaptureButtonAssignment(HLERequestContext& ctx); + void ClearNpadCaptureButtonAssignment(HLERequestContext& ctx); + void GetVibrationDeviceInfo(HLERequestContext& ctx); + void SendVibrationValue(HLERequestContext& ctx); + void GetActualVibrationValue(HLERequestContext& ctx); + void CreateActiveVibrationDeviceList(HLERequestContext& ctx); + void PermitVibration(HLERequestContext& ctx); + void IsVibrationPermitted(HLERequestContext& ctx); + void SendVibrationValues(HLERequestContext& ctx); + void SendVibrationGcErmCommand(HLERequestContext& ctx); + void GetActualVibrationGcErmCommand(HLERequestContext& ctx); + void BeginPermitVibrationSession(HLERequestContext& ctx); + void EndPermitVibrationSession(HLERequestContext& ctx); + void IsVibrationDeviceMounted(HLERequestContext& ctx); + void ActivateConsoleSixAxisSensor(HLERequestContext& ctx); + void StartConsoleSixAxisSensor(HLERequestContext& ctx); + void StopConsoleSixAxisSensor(HLERequestContext& ctx); + void ActivateSevenSixAxisSensor(HLERequestContext& ctx); + void StartSevenSixAxisSensor(HLERequestContext& ctx); + void StopSevenSixAxisSensor(HLERequestContext& ctx); + void InitializeSevenSixAxisSensor(HLERequestContext& ctx); + void FinalizeSevenSixAxisSensor(HLERequestContext& ctx); + void ResetSevenSixAxisSensorTimestamp(HLERequestContext& ctx); + void IsUsbFullKeyControllerEnabled(HLERequestContext& ctx); + void GetPalmaConnectionHandle(HLERequestContext& ctx); + void InitializePalma(HLERequestContext& ctx); + void AcquirePalmaOperationCompleteEvent(HLERequestContext& ctx); + void GetPalmaOperationInfo(HLERequestContext& ctx); + void PlayPalmaActivity(HLERequestContext& ctx); + void SetPalmaFrModeType(HLERequestContext& ctx); + void ReadPalmaStep(HLERequestContext& ctx); + void EnablePalmaStep(HLERequestContext& ctx); + void ResetPalmaStep(HLERequestContext& ctx); + void ReadPalmaApplicationSection(HLERequestContext& ctx); + void WritePalmaApplicationSection(HLERequestContext& ctx); + void ReadPalmaUniqueCode(HLERequestContext& ctx); + void SetPalmaUniqueCodeInvalid(HLERequestContext& ctx); + void WritePalmaActivityEntry(HLERequestContext& ctx); + void WritePalmaRgbLedPatternEntry(HLERequestContext& ctx); + void WritePalmaWaveEntry(HLERequestContext& ctx); + void SetPalmaDataBaseIdentificationVersion(HLERequestContext& ctx); + void GetPalmaDataBaseIdentificationVersion(HLERequestContext& ctx); + void SuspendPalmaFeature(HLERequestContext& ctx); + void GetPalmaOperationResult(HLERequestContext& ctx); + void ReadPalmaPlayLog(HLERequestContext& ctx); + void ResetPalmaPlayLog(HLERequestContext& ctx); + void SetIsPalmaAllConnectable(HLERequestContext& ctx); + void SetIsPalmaPairedConnectable(HLERequestContext& ctx); + void PairPalma(HLERequestContext& ctx); + void SetPalmaBoostMode(HLERequestContext& ctx); + void CancelWritePalmaWaveEntry(HLERequestContext& ctx); + void EnablePalmaBoostMode(HLERequestContext& ctx); + void GetPalmaBluetoothAddress(HLERequestContext& ctx); + void SetDisallowedPalmaConnection(HLERequestContext& ctx); + void SetNpadCommunicationMode(HLERequestContext& ctx); + void GetNpadCommunicationMode(HLERequestContext& ctx); + void SetTouchScreenConfiguration(HLERequestContext& ctx); + void IsFirmwareUpdateNeededForNotification(HLERequestContext& ctx); std::shared_ptr applet_resource; diff --git a/src/core/hle/service/hid/hidbus.cpp b/src/core/hle/service/hid/hidbus.cpp index 07199d5d5..5604a6fda 100644 --- a/src/core/hle/service/hid/hidbus.cpp +++ b/src/core/hle/service/hid/hidbus.cpp @@ -7,7 +7,6 @@ #include "core/core_timing.h" #include "core/core_timing_util.h" #include "core/hid/hid_types.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_readable_event.h" #include "core/hle/kernel/k_shared_memory.h" @@ -16,6 +15,7 @@ #include "core/hle/service/hid/hidbus/ringcon.h" #include "core/hle/service/hid/hidbus/starlink.h" #include "core/hle/service/hid/hidbus/stubbed.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/service.h" #include "core/memory.h" @@ -99,7 +99,7 @@ std::optional HidBus::GetDeviceIndexFromHandle(BusHandle handle) co return std::nullopt; } -void HidBus::GetBusHandle(Kernel::HLERequestContext& ctx) { +void HidBus::GetBusHandle(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::HID::NpadIdType npad_id; @@ -165,7 +165,7 @@ void HidBus::GetBusHandle(Kernel::HLERequestContext& ctx) { rb.PushRaw(out_data); } -void HidBus::IsExternalDeviceConnected(Kernel::HLERequestContext& ctx) { +void HidBus::IsExternalDeviceConnected(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto bus_handle_{rp.PopRaw()}; @@ -193,7 +193,7 @@ void HidBus::IsExternalDeviceConnected(Kernel::HLERequestContext& ctx) { return; } -void HidBus::Initialize(Kernel::HLERequestContext& ctx) { +void HidBus::Initialize(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto bus_handle_{rp.PopRaw()}; const auto applet_resource_user_id{rp.Pop()}; @@ -245,7 +245,7 @@ void HidBus::Initialize(Kernel::HLERequestContext& ctx) { return; } -void HidBus::Finalize(Kernel::HLERequestContext& ctx) { +void HidBus::Finalize(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto bus_handle_{rp.PopRaw()}; const auto applet_resource_user_id{rp.Pop()}; @@ -284,7 +284,7 @@ void HidBus::Finalize(Kernel::HLERequestContext& ctx) { return; } -void HidBus::EnableExternalDevice(Kernel::HLERequestContext& ctx) { +void HidBus::EnableExternalDevice(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { bool enable; @@ -322,7 +322,7 @@ void HidBus::EnableExternalDevice(Kernel::HLERequestContext& ctx) { return; } -void HidBus::GetExternalDeviceId(Kernel::HLERequestContext& ctx) { +void HidBus::GetExternalDeviceId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto bus_handle_{rp.PopRaw()}; @@ -349,7 +349,7 @@ void HidBus::GetExternalDeviceId(Kernel::HLERequestContext& ctx) { return; } -void HidBus::SendCommandAsync(Kernel::HLERequestContext& ctx) { +void HidBus::SendCommandAsync(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto data = ctx.ReadBuffer(); const auto bus_handle_{rp.PopRaw()}; @@ -377,7 +377,7 @@ void HidBus::SendCommandAsync(Kernel::HLERequestContext& ctx) { return; }; -void HidBus::GetSendCommandAsynceResult(Kernel::HLERequestContext& ctx) { +void HidBus::GetSendCommandAsynceResult(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto bus_handle_{rp.PopRaw()}; @@ -406,7 +406,7 @@ void HidBus::GetSendCommandAsynceResult(Kernel::HLERequestContext& ctx) { return; }; -void HidBus::SetEventForSendCommandAsycResult(Kernel::HLERequestContext& ctx) { +void HidBus::SetEventForSendCommandAsycResult(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto bus_handle_{rp.PopRaw()}; @@ -432,7 +432,7 @@ void HidBus::SetEventForSendCommandAsycResult(Kernel::HLERequestContext& ctx) { return; }; -void HidBus::GetSharedMemoryHandle(Kernel::HLERequestContext& ctx) { +void HidBus::GetSharedMemoryHandle(HLERequestContext& ctx) { LOG_DEBUG(Service_HID, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -440,7 +440,7 @@ void HidBus::GetSharedMemoryHandle(Kernel::HLERequestContext& ctx) { rb.PushCopyObjects(&system.Kernel().GetHidBusSharedMem()); } -void HidBus::EnableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx) { +void HidBus::EnableJoyPollingReceiveMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto t_mem_size{rp.Pop()}; const auto t_mem_handle{ctx.GetCopyHandle(0)}; @@ -485,7 +485,7 @@ void HidBus::EnableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx) { return; } -void HidBus::DisableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx) { +void HidBus::DisableJoyPollingReceiveMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto bus_handle_{rp.PopRaw()}; @@ -512,7 +512,7 @@ void HidBus::DisableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx) { return; } -void HidBus::SetStatusManagerType(Kernel::HLERequestContext& ctx) { +void HidBus::SetStatusManagerType(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto manager_type{rp.PopEnum()}; diff --git a/src/core/hle/service/hid/hidbus.h b/src/core/hle/service/hid/hidbus.h index 85ed96e2e..c29b5e882 100644 --- a/src/core/hle/service/hid/hidbus.h +++ b/src/core/hle/service/hid/hidbus.h @@ -94,19 +94,19 @@ private: std::unique_ptr device{nullptr}; }; - void GetBusHandle(Kernel::HLERequestContext& ctx); - void IsExternalDeviceConnected(Kernel::HLERequestContext& ctx); - void Initialize(Kernel::HLERequestContext& ctx); - void Finalize(Kernel::HLERequestContext& ctx); - void EnableExternalDevice(Kernel::HLERequestContext& ctx); - void GetExternalDeviceId(Kernel::HLERequestContext& ctx); - void SendCommandAsync(Kernel::HLERequestContext& ctx); - void GetSendCommandAsynceResult(Kernel::HLERequestContext& ctx); - void SetEventForSendCommandAsycResult(Kernel::HLERequestContext& ctx); - void GetSharedMemoryHandle(Kernel::HLERequestContext& ctx); - void EnableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx); - void DisableJoyPollingReceiveMode(Kernel::HLERequestContext& ctx); - void SetStatusManagerType(Kernel::HLERequestContext& ctx); + void GetBusHandle(HLERequestContext& ctx); + void IsExternalDeviceConnected(HLERequestContext& ctx); + void Initialize(HLERequestContext& ctx); + void Finalize(HLERequestContext& ctx); + void EnableExternalDevice(HLERequestContext& ctx); + void GetExternalDeviceId(HLERequestContext& ctx); + void SendCommandAsync(HLERequestContext& ctx); + void GetSendCommandAsynceResult(HLERequestContext& ctx); + void SetEventForSendCommandAsycResult(HLERequestContext& ctx); + void GetSharedMemoryHandle(HLERequestContext& ctx); + void EnableJoyPollingReceiveMode(HLERequestContext& ctx); + void DisableJoyPollingReceiveMode(HLERequestContext& ctx); + void SetStatusManagerType(HLERequestContext& ctx); void UpdateHidbus(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); std::optional GetDeviceIndexFromHandle(BusHandle handle) const; diff --git a/src/core/hle/service/hid/irs.cpp b/src/core/hle/service/hid/irs.cpp index a40f61fde..221c33b86 100644 --- a/src/core/hle/service/hid/irs.cpp +++ b/src/core/hle/service/hid/irs.cpp @@ -8,7 +8,6 @@ #include "core/core_timing.h" #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_shared_memory.h" #include "core/hle/kernel/k_transfer_memory.h" #include "core/hle/kernel/kernel.h" @@ -20,6 +19,7 @@ #include "core/hle/service/hid/irsensor/moment_processor.h" #include "core/hle/service/hid/irsensor/pointing_processor.h" #include "core/hle/service/hid/irsensor/tera_plugin_processor.h" +#include "core/hle/service/ipc_helpers.h" #include "core/memory.h" namespace Service::IRS { @@ -56,7 +56,7 @@ IRS::IRS(Core::System& system_) : ServiceFramework{system_, "irs"} { } IRS::~IRS() = default; -void IRS::ActivateIrsensor(Kernel::HLERequestContext& ctx) { +void IRS::ActivateIrsensor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -67,7 +67,7 @@ void IRS::ActivateIrsensor(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IRS::DeactivateIrsensor(Kernel::HLERequestContext& ctx) { +void IRS::DeactivateIrsensor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -78,7 +78,7 @@ void IRS::DeactivateIrsensor(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IRS::GetIrsensorSharedMemoryHandle(Kernel::HLERequestContext& ctx) { +void IRS::GetIrsensorSharedMemoryHandle(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; @@ -89,7 +89,7 @@ void IRS::GetIrsensorSharedMemoryHandle(Kernel::HLERequestContext& ctx) { rb.PushCopyObjects(&system.Kernel().GetIrsSharedMem()); } -void IRS::StopImageProcessor(Kernel::HLERequestContext& ctx) { +void IRS::StopImageProcessor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::IrSensor::IrCameraHandle camera_handle; @@ -117,7 +117,7 @@ void IRS::StopImageProcessor(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IRS::RunMomentProcessor(Kernel::HLERequestContext& ctx) { +void IRS::RunMomentProcessor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::IrSensor::IrCameraHandle camera_handle; @@ -149,7 +149,7 @@ void IRS::RunMomentProcessor(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IRS::RunClusteringProcessor(Kernel::HLERequestContext& ctx) { +void IRS::RunClusteringProcessor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::IrSensor::IrCameraHandle camera_handle; @@ -182,7 +182,7 @@ void IRS::RunClusteringProcessor(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IRS::RunImageTransferProcessor(Kernel::HLERequestContext& ctx) { +void IRS::RunImageTransferProcessor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::IrSensor::IrCameraHandle camera_handle; @@ -231,7 +231,7 @@ void IRS::RunImageTransferProcessor(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IRS::GetImageTransferProcessorState(Kernel::HLERequestContext& ctx) { +void IRS::GetImageTransferProcessorState(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::IrSensor::IrCameraHandle camera_handle; @@ -272,7 +272,7 @@ void IRS::GetImageTransferProcessorState(Kernel::HLERequestContext& ctx) { rb.PushRaw(state); } -void IRS::RunTeraPluginProcessor(Kernel::HLERequestContext& ctx) { +void IRS::RunTeraPluginProcessor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::IrSensor::IrCameraHandle camera_handle; @@ -308,7 +308,7 @@ void IRS::RunTeraPluginProcessor(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IRS::GetNpadIrCameraHandle(Kernel::HLERequestContext& ctx) { +void IRS::GetNpadIrCameraHandle(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto npad_id{rp.PopEnum()}; @@ -332,7 +332,7 @@ void IRS::GetNpadIrCameraHandle(Kernel::HLERequestContext& ctx) { rb.PushRaw(camera_handle); } -void IRS::RunPointingProcessor(Kernel::HLERequestContext& ctx) { +void IRS::RunPointingProcessor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto camera_handle{rp.PopRaw()}; const auto processor_config{rp.PopRaw()}; @@ -359,7 +359,7 @@ void IRS::RunPointingProcessor(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IRS::SuspendImageProcessor(Kernel::HLERequestContext& ctx) { +void IRS::SuspendImageProcessor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::IrSensor::IrCameraHandle camera_handle; @@ -385,7 +385,7 @@ void IRS::SuspendImageProcessor(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IRS::CheckFirmwareVersion(Kernel::HLERequestContext& ctx) { +void IRS::CheckFirmwareVersion(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto camera_handle{rp.PopRaw()}; const auto mcu_version{rp.PopRaw()}; @@ -407,7 +407,7 @@ void IRS::CheckFirmwareVersion(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IRS::SetFunctionLevel(Kernel::HLERequestContext& ctx) { +void IRS::SetFunctionLevel(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto camera_handle{rp.PopRaw()}; const auto function_level{rp.PopRaw()}; @@ -429,7 +429,7 @@ void IRS::SetFunctionLevel(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IRS::RunImageTransferExProcessor(Kernel::HLERequestContext& ctx) { +void IRS::RunImageTransferExProcessor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::IrSensor::IrCameraHandle camera_handle; @@ -469,7 +469,7 @@ void IRS::RunImageTransferExProcessor(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IRS::RunIrLedProcessor(Kernel::HLERequestContext& ctx) { +void IRS::RunIrLedProcessor(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto camera_handle{rp.PopRaw()}; const auto processor_config{rp.PopRaw()}; @@ -497,7 +497,7 @@ void IRS::RunIrLedProcessor(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IRS::StopImageProcessorAsync(Kernel::HLERequestContext& ctx) { +void IRS::StopImageProcessorAsync(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::IrSensor::IrCameraHandle camera_handle; @@ -525,7 +525,7 @@ void IRS::StopImageProcessorAsync(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IRS::ActivateIrsensorWithFunctionLevel(Kernel::HLERequestContext& ctx) { +void IRS::ActivateIrsensorWithFunctionLevel(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { Core::IrSensor::PackedFunctionLevel function_level; diff --git a/src/core/hle/service/hid/irs.h b/src/core/hle/service/hid/irs.h index b76ad7854..a8fa19025 100644 --- a/src/core/hle/service/hid/irs.h +++ b/src/core/hle/service/hid/irs.h @@ -38,24 +38,24 @@ private: }; static_assert(sizeof(StatusManager) == 0x8000, "StatusManager is an invalid size"); - void ActivateIrsensor(Kernel::HLERequestContext& ctx); - void DeactivateIrsensor(Kernel::HLERequestContext& ctx); - void GetIrsensorSharedMemoryHandle(Kernel::HLERequestContext& ctx); - void StopImageProcessor(Kernel::HLERequestContext& ctx); - void RunMomentProcessor(Kernel::HLERequestContext& ctx); - void RunClusteringProcessor(Kernel::HLERequestContext& ctx); - void RunImageTransferProcessor(Kernel::HLERequestContext& ctx); - void GetImageTransferProcessorState(Kernel::HLERequestContext& ctx); - void RunTeraPluginProcessor(Kernel::HLERequestContext& ctx); - void GetNpadIrCameraHandle(Kernel::HLERequestContext& ctx); - void RunPointingProcessor(Kernel::HLERequestContext& ctx); - void SuspendImageProcessor(Kernel::HLERequestContext& ctx); - void CheckFirmwareVersion(Kernel::HLERequestContext& ctx); - void SetFunctionLevel(Kernel::HLERequestContext& ctx); - void RunImageTransferExProcessor(Kernel::HLERequestContext& ctx); - void RunIrLedProcessor(Kernel::HLERequestContext& ctx); - void StopImageProcessorAsync(Kernel::HLERequestContext& ctx); - void ActivateIrsensorWithFunctionLevel(Kernel::HLERequestContext& ctx); + void ActivateIrsensor(HLERequestContext& ctx); + void DeactivateIrsensor(HLERequestContext& ctx); + void GetIrsensorSharedMemoryHandle(HLERequestContext& ctx); + void StopImageProcessor(HLERequestContext& ctx); + void RunMomentProcessor(HLERequestContext& ctx); + void RunClusteringProcessor(HLERequestContext& ctx); + void RunImageTransferProcessor(HLERequestContext& ctx); + void GetImageTransferProcessorState(HLERequestContext& ctx); + void RunTeraPluginProcessor(HLERequestContext& ctx); + void GetNpadIrCameraHandle(HLERequestContext& ctx); + void RunPointingProcessor(HLERequestContext& ctx); + void SuspendImageProcessor(HLERequestContext& ctx); + void CheckFirmwareVersion(HLERequestContext& ctx); + void SetFunctionLevel(HLERequestContext& ctx); + void RunImageTransferExProcessor(HLERequestContext& ctx); + void RunIrLedProcessor(HLERequestContext& ctx); + void StopImageProcessorAsync(HLERequestContext& ctx); + void ActivateIrsensorWithFunctionLevel(HLERequestContext& ctx); Result IsIrCameraHandleValid(const Core::IrSensor::IrCameraHandle& camera_handle) const; Core::IrSensor::DeviceFormat& GetIrCameraSharedMemoryDeviceEntry( diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/service/hle_ipc.cpp similarity index 94% rename from src/core/hle/kernel/hle_ipc.cpp rename to src/core/hle/service/hle_ipc.cpp index 876fbbe53..c221ffe11 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/service/hle_ipc.cpp @@ -12,8 +12,6 @@ #include "common/common_types.h" #include "common/logging/log.h" #include "common/scratch_buffer.h" -#include "core/hle/ipc_helpers.h" -#include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/k_auto_object.h" #include "core/hle/kernel/k_handle_table.h" #include "core/hle/kernel/k_process.h" @@ -21,17 +19,19 @@ #include "core/hle/kernel/k_server_session.h" #include "core/hle/kernel/k_thread.h" #include "core/hle/kernel/kernel.h" +#include "core/hle/service/hle_ipc.h" +#include "core/hle/service/ipc_helpers.h" #include "core/memory.h" -namespace Kernel { +namespace Service { -SessionRequestHandler::SessionRequestHandler(KernelCore& kernel_, const char* service_name_) +SessionRequestHandler::SessionRequestHandler(Kernel::KernelCore& kernel_, const char* service_name_) : kernel{kernel_} {} SessionRequestHandler::~SessionRequestHandler() = default; -SessionRequestManager::SessionRequestManager(KernelCore& kernel_, - Service::ServerManager& server_manager_) +SessionRequestManager::SessionRequestManager(Kernel::KernelCore& kernel_, + ServerManager& server_manager_) : kernel{kernel_}, server_manager{server_manager_} {} SessionRequestManager::~SessionRequestManager() = default; @@ -51,7 +51,7 @@ bool SessionRequestManager::HasSessionRequestHandler(const HLERequestContext& co } } -Result SessionRequestManager::CompleteSyncRequest(KServerSession* server_session, +Result SessionRequestManager::CompleteSyncRequest(Kernel::KServerSession* server_session, HLERequestContext& context) { Result result = ResultSuccess; @@ -79,7 +79,7 @@ Result SessionRequestManager::CompleteSyncRequest(KServerSession* server_session return result; } -Result SessionRequestManager::HandleDomainSyncRequest(KServerSession* server_session, +Result SessionRequestManager::HandleDomainSyncRequest(Kernel::KServerSession* server_session, HLERequestContext& context) { if (!context.HasDomainMessageHeader()) { return ResultSuccess; @@ -124,16 +124,17 @@ Result SessionRequestManager::HandleDomainSyncRequest(KServerSession* server_ses return ResultSuccess; } -HLERequestContext::HLERequestContext(KernelCore& kernel_, Core::Memory::Memory& memory_, - KServerSession* server_session_, KThread* thread_) +HLERequestContext::HLERequestContext(Kernel::KernelCore& kernel_, Core::Memory::Memory& memory_, + Kernel::KServerSession* server_session_, + Kernel::KThread* thread_) : server_session(server_session_), thread(thread_), kernel{kernel_}, memory{memory_} { cmd_buf[0] = 0; } HLERequestContext::~HLERequestContext() = default; -void HLERequestContext::ParseCommandBuffer(const KHandleTable& handle_table, u32_le* src_cmdbuf, - bool incoming) { +void HLERequestContext::ParseCommandBuffer(const Kernel::KHandleTable& handle_table, + u32_le* src_cmdbuf, bool incoming) { IPC::RequestParser rp(src_cmdbuf); command_header = rp.PopRaw(); @@ -253,8 +254,8 @@ void HLERequestContext::ParseCommandBuffer(const KHandleTable& handle_table, u32 rp.Skip(1, false); // The command is actually an u64, but we don't use the high part. } -Result HLERequestContext::PopulateFromIncomingCommandBuffer(const KHandleTable& handle_table, - u32_le* src_cmdbuf) { +Result HLERequestContext::PopulateFromIncomingCommandBuffer( + const Kernel::KHandleTable& handle_table, u32_le* src_cmdbuf) { ParseCommandBuffer(handle_table, src_cmdbuf, true); if (command_header->IsCloseCommand()) { @@ -267,7 +268,7 @@ Result HLERequestContext::PopulateFromIncomingCommandBuffer(const KHandleTable& return ResultSuccess; } -Result HLERequestContext::WriteToOutgoingCommandBuffer(KThread& requesting_thread) { +Result HLERequestContext::WriteToOutgoingCommandBuffer(Kernel::KThread& requesting_thread) { auto current_offset = handles_offset; auto& owner_process = *requesting_thread.GetOwnerProcess(); auto& handle_table = owner_process.GetHandleTable(); @@ -528,4 +529,4 @@ std::string HLERequestContext::Description() const { return s.str(); } -} // namespace Kernel +} // namespace Service diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/service/hle_ipc.h similarity index 83% rename from src/core/hle/kernel/hle_ipc.h rename to src/core/hle/service/hle_ipc.h index b4364f984..4bd24c899 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/service/hle_ipc.h @@ -35,20 +35,18 @@ class ServerManager; } // namespace Service namespace Kernel { - -class Domain; -class HLERequestContext; class KAutoObject; class KernelCore; -class KEvent; class KHandleTable; -class KServerPort; -class KProcess; class KServerSession; class KThread; -class KReadableEvent; -class KSession; -class SessionRequestManager; +} // namespace Kernel + +namespace Service { + +using Handle = Kernel::Handle; + +class HLERequestContext; /** * Interface implemented by HLE Session handlers. @@ -57,7 +55,7 @@ class SessionRequestManager; */ class SessionRequestHandler : public std::enable_shared_from_this { public: - SessionRequestHandler(KernelCore& kernel_, const char* service_name_); + SessionRequestHandler(Kernel::KernelCore& kernel_, const char* service_name_); virtual ~SessionRequestHandler(); /** @@ -69,10 +67,10 @@ public: * @returns Result the result code of the translate operation. */ virtual Result HandleSyncRequest(Kernel::KServerSession& session, - Kernel::HLERequestContext& context) = 0; + HLERequestContext& context) = 0; protected: - KernelCore& kernel; + Kernel::KernelCore& kernel; }; using SessionRequestHandlerWeakPtr = std::weak_ptr; @@ -85,7 +83,8 @@ using SessionRequestHandlerPtr = std::shared_ptr; */ class SessionRequestManager final { public: - explicit SessionRequestManager(KernelCore& kernel, Service::ServerManager& server_manager); + explicit SessionRequestManager(Kernel::KernelCore& kernel, + Service::ServerManager& server_manager); ~SessionRequestManager(); bool IsDomain() const { @@ -140,8 +139,9 @@ public: bool HasSessionRequestHandler(const HLERequestContext& context) const; - Result HandleDomainSyncRequest(KServerSession* server_session, HLERequestContext& context); - Result CompleteSyncRequest(KServerSession* server_session, HLERequestContext& context); + Result HandleDomainSyncRequest(Kernel::KServerSession* server_session, + HLERequestContext& context); + Result CompleteSyncRequest(Kernel::KServerSession* server_session, HLERequestContext& context); Service::ServerManager& GetServerManager() { return server_manager; @@ -166,33 +166,18 @@ private: std::vector domain_handlers; private: - KernelCore& kernel; + Kernel::KernelCore& kernel; Service::ServerManager& server_manager; }; /** * Class containing information about an in-flight IPC request being handled by an HLE service - * implementation. Services should avoid using old global APIs (e.g. Kernel::GetCommandBuffer()) and - * when possible use the APIs in this class to service the request. - * - * HLE handle protocol - * =================== - * - * To avoid needing HLE services to keep a separate handle table, or having to directly modify the - * requester's table, a tweaked protocol is used to receive and send handles in requests. The kernel - * will decode the incoming handles into object pointers and insert a id in the buffer where the - * handle would normally be. The service then calls GetIncomingHandle() with that id to get the - * pointer to the object. Similarly, instead of inserting a handle into the command buffer, the - * service calls AddOutgoingHandle() and stores the returned id where the handle would normally go. - * - * The end result is similar to just giving services their own real handle tables, but since these - * ids are local to a specific context, it avoids requiring services to manage handles for objects - * across multiple calls and ensuring that unneeded handles are cleaned up. + * implementation. */ class HLERequestContext { public: - explicit HLERequestContext(KernelCore& kernel, Core::Memory::Memory& memory, - KServerSession* session, KThread* thread); + explicit HLERequestContext(Kernel::KernelCore& kernel, Core::Memory::Memory& memory, + Kernel::KServerSession* session, Kernel::KThread* thread); ~HLERequestContext(); /// Returns a pointer to the IPC command buffer for this request. @@ -209,10 +194,11 @@ public: } /// Populates this context with data from the requesting process/thread. - Result PopulateFromIncomingCommandBuffer(const KHandleTable& handle_table, u32_le* src_cmdbuf); + Result PopulateFromIncomingCommandBuffer(const Kernel::KHandleTable& handle_table, + u32_le* src_cmdbuf); /// Writes data from this context back to the requesting process/thread. - Result WriteToOutgoingCommandBuffer(KThread& requesting_thread); + Result WriteToOutgoingCommandBuffer(Kernel::KThread& requesting_thread); [[nodiscard]] u32_le GetHipcCommand() const { return command; @@ -339,11 +325,11 @@ public: return incoming_move_handles.at(index); } - void AddMoveObject(KAutoObject* object) { + void AddMoveObject(Kernel::KAutoObject* object) { outgoing_move_objects.emplace_back(object); } - void AddCopyObject(KAutoObject* object) { + void AddCopyObject(Kernel::KAutoObject* object) { outgoing_copy_objects.emplace_back(object); } @@ -362,7 +348,7 @@ public: [[nodiscard]] std::string Description() const; - [[nodiscard]] KThread& GetThread() { + [[nodiscard]] Kernel::KThread& GetThread() { return *thread; } @@ -381,17 +367,18 @@ public: private: friend class IPC::ResponseBuilder; - void ParseCommandBuffer(const KHandleTable& handle_table, u32_le* src_cmdbuf, bool incoming); + void ParseCommandBuffer(const Kernel::KHandleTable& handle_table, u32_le* src_cmdbuf, + bool incoming); std::array cmd_buf; Kernel::KServerSession* server_session{}; - KThread* thread; + Kernel::KThread* thread; std::vector incoming_move_handles; std::vector incoming_copy_handles; - std::vector outgoing_move_objects; - std::vector outgoing_copy_objects; + std::vector outgoing_move_objects; + std::vector outgoing_copy_objects; std::vector outgoing_domain_objects; std::optional command_header; @@ -414,8 +401,8 @@ private: std::weak_ptr manager{}; bool is_deferred{false}; - KernelCore& kernel; + Kernel::KernelCore& kernel; Core::Memory::Memory& memory; }; -} // namespace Kernel +} // namespace Service diff --git a/src/core/hle/ipc_helpers.h b/src/core/hle/service/ipc_helpers.h similarity index 97% rename from src/core/hle/ipc_helpers.h rename to src/core/hle/service/ipc_helpers.h index f8ab55d83..3e67123c7 100644 --- a/src/core/hle/ipc_helpers.h +++ b/src/core/hle/service/ipc_helpers.h @@ -10,11 +10,11 @@ #include "common/assert.h" #include "common/common_types.h" #include "core/hle/ipc.h" -#include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/k_process.h" #include "core/hle/kernel/k_resource_limit.h" #include "core/hle/kernel/k_session.h" #include "core/hle/result.h" +#include "core/hle/service/hle_ipc.h" #include "core/hle/service/server_manager.h" namespace IPC { @@ -23,14 +23,14 @@ constexpr Result ERR_REMOTE_PROCESS_DEAD{ErrorModule::HIPC, 301}; class RequestHelperBase { protected: - Kernel::HLERequestContext* context = nullptr; + Service::HLERequestContext* context = nullptr; u32* cmdbuf; u32 index = 0; public: explicit RequestHelperBase(u32* command_buffer) : cmdbuf(command_buffer) {} - explicit RequestHelperBase(Kernel::HLERequestContext& ctx) + explicit RequestHelperBase(Service::HLERequestContext& ctx) : context(&ctx), cmdbuf(ctx.CommandBuffer()) {} void Skip(u32 size_in_words, bool set_to_null) { @@ -68,7 +68,7 @@ public: AlwaysMoveHandles = 1, }; - explicit ResponseBuilder(Kernel::HLERequestContext& ctx, u32 normal_params_size_, + explicit ResponseBuilder(Service::HLERequestContext& ctx, u32 normal_params_size_, u32 num_handles_to_copy_ = 0, u32 num_objects_to_move_ = 0, Flags flags = Flags::None) : RequestHelperBase(ctx), normal_params_size(normal_params_size_), @@ -157,7 +157,7 @@ public: auto* session = Kernel::KSession::Create(kernel); session->Initialize(nullptr, iface->GetServiceName()); - auto next_manager = std::make_shared( + auto next_manager = std::make_shared( kernel, manager->GetServerManager()); next_manager->SetSessionHandler(iface); manager->GetServerManager().RegisterSession(&session->GetServerSession(), next_manager); @@ -347,7 +347,7 @@ class RequestParser : public RequestHelperBase { public: explicit RequestParser(u32* command_buffer) : RequestHelperBase(command_buffer) {} - explicit RequestParser(Kernel::HLERequestContext& ctx) : RequestHelperBase(ctx) { + explicit RequestParser(Service::HLERequestContext& ctx) : RequestHelperBase(ctx) { // TIPC does not have data payload offset if (!ctx.IsTipc()) { ASSERT_MSG(ctx.GetDataPayloadOffset(), "context is incomplete"); diff --git a/src/core/hle/service/jit/jit.cpp b/src/core/hle/service/jit/jit.cpp index 005c212dc..46bcfd695 100644 --- a/src/core/hle/service/jit/jit.cpp +++ b/src/core/hle/service/jit/jit.cpp @@ -3,10 +3,10 @@ #include "core/arm/symbols.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_code_memory.h" #include "core/hle/kernel/k_transfer_memory.h" #include "core/hle/result.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/jit/jit.h" #include "core/hle/service/jit/jit_context.h" #include "core/hle/service/server_manager.h" @@ -44,7 +44,7 @@ public: configuration.sys_rx_memory = user_rx; } - void GenerateCode(Kernel::HLERequestContext& ctx) { + void GenerateCode(HLERequestContext& ctx) { LOG_DEBUG(Service_JIT, "called"); struct InputParameters { @@ -126,7 +126,7 @@ public: } }; - void Control(Kernel::HLERequestContext& ctx) { + void Control(HLERequestContext& ctx) { LOG_DEBUG(Service_JIT, "called"); IPC::RequestParser rp{ctx}; @@ -171,7 +171,7 @@ public: } } - void LoadPlugin(Kernel::HLERequestContext& ctx) { + void LoadPlugin(HLERequestContext& ctx) { LOG_DEBUG(Service_JIT, "called"); IPC::RequestParser rp{ctx}; @@ -277,7 +277,7 @@ public: rb.Push(ResultSuccess); } - void GetCodeAddress(Kernel::HLERequestContext& ctx) { + void GetCodeAddress(HLERequestContext& ctx) { LOG_DEBUG(Service_JIT, "called"); IPC::ResponseBuilder rb{ctx, 6}; @@ -333,7 +333,7 @@ public: RegisterHandlers(functions); } - void CreateJitEnvironment(Kernel::HLERequestContext& ctx) { + void CreateJitEnvironment(HLERequestContext& ctx) { LOG_DEBUG(Service_JIT, "called"); struct Parameters { diff --git a/src/core/hle/service/lbl/lbl.cpp b/src/core/hle/service/lbl/lbl.cpp index 3f3c68d80..98a79365d 100644 --- a/src/core/hle/service/lbl/lbl.cpp +++ b/src/core/hle/service/lbl/lbl.cpp @@ -5,7 +5,7 @@ #include #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/lbl/lbl.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" @@ -60,7 +60,7 @@ private: On = 1, }; - void SetCurrentBrightnessSetting(Kernel::HLERequestContext& ctx) { + void SetCurrentBrightnessSetting(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; auto brightness = rp.Pop(); @@ -78,7 +78,7 @@ private: rb.Push(ResultSuccess); } - void GetCurrentBrightnessSetting(Kernel::HLERequestContext& ctx) { + void GetCurrentBrightnessSetting(HLERequestContext& ctx) { auto brightness = current_brightness; if (!std::isfinite(brightness)) { LOG_ERROR(Service_LBL, "Brightness is infinite!"); @@ -92,7 +92,7 @@ private: rb.Push(brightness); } - void SwitchBacklightOn(Kernel::HLERequestContext& ctx) { + void SwitchBacklightOn(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto fade_time = rp.Pop(); LOG_WARNING(Service_LBL, "(STUBBED) called, fade_time={}", fade_time); @@ -103,7 +103,7 @@ private: rb.Push(ResultSuccess); } - void SwitchBacklightOff(Kernel::HLERequestContext& ctx) { + void SwitchBacklightOff(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto fade_time = rp.Pop(); LOG_WARNING(Service_LBL, "(STUBBED) called, fade_time={}", fade_time); @@ -114,7 +114,7 @@ private: rb.Push(ResultSuccess); } - void GetBacklightSwitchStatus(Kernel::HLERequestContext& ctx) { + void GetBacklightSwitchStatus(HLERequestContext& ctx) { LOG_DEBUG(Service_LBL, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -123,7 +123,7 @@ private: : BacklightSwitchStatus::Off); } - void EnableDimming(Kernel::HLERequestContext& ctx) { + void EnableDimming(HLERequestContext& ctx) { LOG_DEBUG(Service_LBL, "called"); dimming = true; @@ -132,7 +132,7 @@ private: rb.Push(ResultSuccess); } - void DisableDimming(Kernel::HLERequestContext& ctx) { + void DisableDimming(HLERequestContext& ctx) { LOG_DEBUG(Service_LBL, "called"); dimming = false; @@ -141,7 +141,7 @@ private: rb.Push(ResultSuccess); } - void IsDimmingEnabled(Kernel::HLERequestContext& ctx) { + void IsDimmingEnabled(HLERequestContext& ctx) { LOG_DEBUG(Service_LBL, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -149,7 +149,7 @@ private: rb.Push(dimming); } - void EnableAutoBrightnessControl(Kernel::HLERequestContext& ctx) { + void EnableAutoBrightnessControl(HLERequestContext& ctx) { LOG_DEBUG(Service_LBL, "called"); auto_brightness = true; update_instantly = true; @@ -158,7 +158,7 @@ private: rb.Push(ResultSuccess); } - void DisableAutoBrightnessControl(Kernel::HLERequestContext& ctx) { + void DisableAutoBrightnessControl(HLERequestContext& ctx) { LOG_DEBUG(Service_LBL, "called"); auto_brightness = false; @@ -166,7 +166,7 @@ private: rb.Push(ResultSuccess); } - void IsAutoBrightnessControlEnabled(Kernel::HLERequestContext& ctx) { + void IsAutoBrightnessControlEnabled(HLERequestContext& ctx) { LOG_DEBUG(Service_LBL, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -174,7 +174,7 @@ private: rb.Push(auto_brightness); } - void SetAmbientLightSensorValue(Kernel::HLERequestContext& ctx) { + void SetAmbientLightSensorValue(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto light_value = rp.Pop(); @@ -186,7 +186,7 @@ private: rb.Push(ResultSuccess); } - void GetAmbientLightSensorValue(Kernel::HLERequestContext& ctx) { + void GetAmbientLightSensorValue(HLERequestContext& ctx) { LOG_DEBUG(Service_LBL, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -194,7 +194,7 @@ private: rb.Push(ambient_light_value); } - void SetBrightnessReflectionDelayLevel(Kernel::HLERequestContext& ctx) { + void SetBrightnessReflectionDelayLevel(HLERequestContext& ctx) { // This is Intentional, this function does absolutely nothing LOG_DEBUG(Service_LBL, "called"); @@ -202,7 +202,7 @@ private: rb.Push(ResultSuccess); } - void GetBrightnessReflectionDelayLevel(Kernel::HLERequestContext& ctx) { + void GetBrightnessReflectionDelayLevel(HLERequestContext& ctx) { // This is intentional, the function is hard coded to return 0.0f on hardware LOG_DEBUG(Service_LBL, "called"); @@ -211,7 +211,7 @@ private: rb.Push(0.0f); } - void SetCurrentBrightnessMapping(Kernel::HLERequestContext& ctx) { + void SetCurrentBrightnessMapping(HLERequestContext& ctx) { // This is Intentional, this function does absolutely nothing LOG_DEBUG(Service_LBL, "called"); @@ -219,7 +219,7 @@ private: rb.Push(ResultSuccess); } - void GetCurrentBrightnessMapping(Kernel::HLERequestContext& ctx) { + void GetCurrentBrightnessMapping(HLERequestContext& ctx) { // This is Intentional, this function does absolutely nothing LOG_DEBUG(Service_LBL, "called"); @@ -228,7 +228,7 @@ private: // This function is suppose to return something but it seems like it doesn't } - void SetCurrentAmbientLightSensorMapping(Kernel::HLERequestContext& ctx) { + void SetCurrentAmbientLightSensorMapping(HLERequestContext& ctx) { // This is Intentional, this function does absolutely nothing LOG_DEBUG(Service_LBL, "called"); @@ -236,7 +236,7 @@ private: rb.Push(ResultSuccess); } - void GetCurrentAmbientLightSensorMapping(Kernel::HLERequestContext& ctx) { + void GetCurrentAmbientLightSensorMapping(HLERequestContext& ctx) { // This is Intentional, this function does absolutely nothing LOG_DEBUG(Service_LBL, "called"); @@ -245,7 +245,7 @@ private: // This function is suppose to return something but it seems like it doesn't } - void IsAmbientLightSensorAvailable(Kernel::HLERequestContext& ctx) { + void IsAmbientLightSensorAvailable(HLERequestContext& ctx) { LOG_WARNING(Service_LBL, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); @@ -253,7 +253,7 @@ private: rb.Push(true); } - void SetCurrentBrightnessSettingForVrMode(Kernel::HLERequestContext& ctx) { + void SetCurrentBrightnessSettingForVrMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; auto brightness = rp.Pop(); @@ -270,7 +270,7 @@ private: rb.Push(ResultSuccess); } - void GetCurrentBrightnessSettingForVrMode(Kernel::HLERequestContext& ctx) { + void GetCurrentBrightnessSettingForVrMode(HLERequestContext& ctx) { auto brightness = current_vr_brightness; if (!std::isfinite(brightness)) { LOG_ERROR(Service_LBL, "Brightness is infinite!"); @@ -284,7 +284,7 @@ private: rb.Push(brightness); } - void EnableVrMode(Kernel::HLERequestContext& ctx) { + void EnableVrMode(HLERequestContext& ctx) { LOG_DEBUG(Service_LBL, "called"); IPC::ResponseBuilder rb{ctx, 2}; @@ -293,7 +293,7 @@ private: vr_mode_enabled = true; } - void DisableVrMode(Kernel::HLERequestContext& ctx) { + void DisableVrMode(HLERequestContext& ctx) { LOG_DEBUG(Service_LBL, "called"); IPC::ResponseBuilder rb{ctx, 2}; @@ -302,7 +302,7 @@ private: vr_mode_enabled = false; } - void IsVrModeEnabled(Kernel::HLERequestContext& ctx) { + void IsVrModeEnabled(HLERequestContext& ctx) { LOG_DEBUG(Service_LBL, "called"); IPC::ResponseBuilder rb{ctx, 3}; diff --git a/src/core/hle/service/ldn/ldn.cpp b/src/core/hle/service/ldn/ldn.cpp index 4c2abe7d3..9d149a7cd 100644 --- a/src/core/hle/service/ldn/ldn.cpp +++ b/src/core/hle/service/ldn/ldn.cpp @@ -50,7 +50,7 @@ public: RegisterHandlers(functions); } - void CreateMonitorService(Kernel::HLERequestContext& ctx) { + void CreateMonitorService(HLERequestContext& ctx) { LOG_DEBUG(Service_LDN, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -169,7 +169,7 @@ public: state_change_event->Signal(); } - void GetState(Kernel::HLERequestContext& ctx) { + void GetState(HLERequestContext& ctx) { State state = State::Error; if (is_initialized) { @@ -181,7 +181,7 @@ public: rb.PushEnum(state); } - void GetNetworkInfo(Kernel::HLERequestContext& ctx) { + void GetNetworkInfo(HLERequestContext& ctx) { const auto write_buffer_size = ctx.GetWriteBufferSize(); if (write_buffer_size != sizeof(NetworkInfo)) { @@ -205,7 +205,7 @@ public: rb.Push(ResultSuccess); } - void GetIpv4Address(Kernel::HLERequestContext& ctx) { + void GetIpv4Address(HLERequestContext& ctx) { const auto network_interface = Network::GetSelectedNetworkInterface(); if (!network_interface) { @@ -234,13 +234,13 @@ public: rb.PushRaw(subnet_mask); } - void GetDisconnectReason(Kernel::HLERequestContext& ctx) { + void GetDisconnectReason(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); rb.PushEnum(lan_discovery.GetDisconnectReason()); } - void GetSecurityParameter(Kernel::HLERequestContext& ctx) { + void GetSecurityParameter(HLERequestContext& ctx) { SecurityParameter security_parameter{}; NetworkInfo info{}; const Result rc = lan_discovery.GetNetworkInfo(info); @@ -261,7 +261,7 @@ public: rb.PushRaw(security_parameter); } - void GetNetworkConfig(Kernel::HLERequestContext& ctx) { + void GetNetworkConfig(HLERequestContext& ctx) { NetworkConfig config{}; NetworkInfo info{}; const Result rc = lan_discovery.GetNetworkInfo(info); @@ -283,7 +283,7 @@ public: rb.PushRaw(config); } - void AttachStateChangeEvent(Kernel::HLERequestContext& ctx) { + void AttachStateChangeEvent(HLERequestContext& ctx) { LOG_INFO(Service_LDN, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -291,7 +291,7 @@ public: rb.PushCopyObjects(state_change_event->GetReadableEvent()); } - void GetNetworkInfoLatestUpdate(Kernel::HLERequestContext& ctx) { + void GetNetworkInfoLatestUpdate(HLERequestContext& ctx) { const std::size_t network_buffer_size = ctx.GetWriteBufferSize(0); const std::size_t node_buffer_count = ctx.GetWriteBufferNumElements(1); @@ -321,15 +321,15 @@ public: rb.Push(ResultSuccess); } - void Scan(Kernel::HLERequestContext& ctx) { + void Scan(HLERequestContext& ctx) { ScanImpl(ctx); } - void ScanPrivate(Kernel::HLERequestContext& ctx) { + void ScanPrivate(HLERequestContext& ctx) { ScanImpl(ctx, true); } - void ScanImpl(Kernel::HLERequestContext& ctx, bool is_private = false) { + void ScanImpl(HLERequestContext& ctx, bool is_private = false) { IPC::RequestParser rp{ctx}; const auto channel{rp.PopEnum()}; const auto scan_filter{rp.PopRaw()}; @@ -358,40 +358,40 @@ public: rb.Push(count); } - void SetWirelessControllerRestriction(Kernel::HLERequestContext& ctx) { + void SetWirelessControllerRestriction(HLERequestContext& ctx) { LOG_WARNING(Service_LDN, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void OpenAccessPoint(Kernel::HLERequestContext& ctx) { + void OpenAccessPoint(HLERequestContext& ctx) { LOG_INFO(Service_LDN, "called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(lan_discovery.OpenAccessPoint()); } - void CloseAccessPoint(Kernel::HLERequestContext& ctx) { + void CloseAccessPoint(HLERequestContext& ctx) { LOG_INFO(Service_LDN, "called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(lan_discovery.CloseAccessPoint()); } - void CreateNetwork(Kernel::HLERequestContext& ctx) { + void CreateNetwork(HLERequestContext& ctx) { LOG_INFO(Service_LDN, "called"); CreateNetworkImpl(ctx); } - void CreateNetworkPrivate(Kernel::HLERequestContext& ctx) { + void CreateNetworkPrivate(HLERequestContext& ctx) { LOG_INFO(Service_LDN, "called"); CreateNetworkImpl(ctx, true); } - void CreateNetworkImpl(Kernel::HLERequestContext& ctx, bool is_private = false) { + void CreateNetworkImpl(HLERequestContext& ctx, bool is_private = false) { IPC::RequestParser rp{ctx}; const auto security_config{rp.PopRaw()}; @@ -405,49 +405,49 @@ public: rb.Push(lan_discovery.CreateNetwork(security_config, user_config, network_Config)); } - void DestroyNetwork(Kernel::HLERequestContext& ctx) { + void DestroyNetwork(HLERequestContext& ctx) { LOG_INFO(Service_LDN, "called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(lan_discovery.DestroyNetwork()); } - void SetAdvertiseData(Kernel::HLERequestContext& ctx) { + void SetAdvertiseData(HLERequestContext& ctx) { const auto read_buffer = ctx.ReadBuffer(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(lan_discovery.SetAdvertiseData(read_buffer)); } - void SetStationAcceptPolicy(Kernel::HLERequestContext& ctx) { + void SetStationAcceptPolicy(HLERequestContext& ctx) { LOG_WARNING(Service_LDN, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void AddAcceptFilterEntry(Kernel::HLERequestContext& ctx) { + void AddAcceptFilterEntry(HLERequestContext& ctx) { LOG_WARNING(Service_LDN, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void OpenStation(Kernel::HLERequestContext& ctx) { + void OpenStation(HLERequestContext& ctx) { LOG_INFO(Service_LDN, "called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(lan_discovery.OpenStation()); } - void CloseStation(Kernel::HLERequestContext& ctx) { + void CloseStation(HLERequestContext& ctx) { LOG_INFO(Service_LDN, "called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(lan_discovery.CloseStation()); } - void Connect(Kernel::HLERequestContext& ctx) { + void Connect(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { SecurityConfig security_config; @@ -481,14 +481,14 @@ public: static_cast(parameters.local_communication_version))); } - void Disconnect(Kernel::HLERequestContext& ctx) { + void Disconnect(HLERequestContext& ctx) { LOG_INFO(Service_LDN, "called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(lan_discovery.Disconnect()); } - void Initialize(Kernel::HLERequestContext& ctx) { + void Initialize(HLERequestContext& ctx) { const auto rc = InitializeImpl(ctx); if (rc.IsError()) { LOG_ERROR(Service_LDN, "Network isn't initialized, rc={}", rc.raw); @@ -498,7 +498,7 @@ public: rb.Push(rc); } - void Finalize(Kernel::HLERequestContext& ctx) { + void Finalize(HLERequestContext& ctx) { if (auto room_member = room_network.GetRoomMember().lock()) { room_member->Unbind(ldn_packet_received); } @@ -509,7 +509,7 @@ public: rb.Push(lan_discovery.Finalize()); } - void Initialize2(Kernel::HLERequestContext& ctx) { + void Initialize2(HLERequestContext& ctx) { const auto rc = InitializeImpl(ctx); if (rc.IsError()) { LOG_ERROR(Service_LDN, "Network isn't initialized, rc={}", rc.raw); @@ -519,7 +519,7 @@ public: rb.Push(rc); } - Result InitializeImpl(Kernel::HLERequestContext& ctx) { + Result InitializeImpl(HLERequestContext& ctx) { const auto network_interface = Network::GetSelectedNetworkInterface(); if (!network_interface) { LOG_ERROR(Service_LDN, "No network interface is set"); @@ -562,7 +562,7 @@ public: RegisterHandlers(functions); } - void CreateSystemLocalCommunicationService(Kernel::HLERequestContext& ctx) { + void CreateSystemLocalCommunicationService(HLERequestContext& ctx) { LOG_DEBUG(Service_LDN, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -583,7 +583,7 @@ public: RegisterHandlers(functions); } - void CreateUserLocalCommunicationService(Kernel::HLERequestContext& ctx) { + void CreateUserLocalCommunicationService(HLERequestContext& ctx) { LOG_DEBUG(Service_LDN, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -647,7 +647,7 @@ public: RegisterHandlers(functions); } - void Initialize(Kernel::HLERequestContext& ctx) { + void Initialize(HLERequestContext& ctx) { LOG_WARNING(Service_LDN, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; @@ -668,7 +668,7 @@ public: RegisterHandlers(functions); } - void CreateNetworkervice(Kernel::HLERequestContext& ctx) { + void CreateNetworkervice(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 reserved_input = rp.Pop(); const u32 input = rp.Pop(); @@ -681,7 +681,7 @@ public: rb.PushIpcInterface(system); } - void CreateMonitorService(Kernel::HLERequestContext& ctx) { + void CreateMonitorService(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 reserved_input = rp.Pop(); @@ -706,7 +706,7 @@ public: RegisterHandlers(functions); } - void CreateNetworkervice(Kernel::HLERequestContext& ctx) { + void CreateNetworkervice(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 reserved_input = rp.Pop(); const u32 input = rp.Pop(); @@ -719,7 +719,7 @@ public: rb.PushIpcInterface(system); } - void CreateMonitorService(Kernel::HLERequestContext& ctx) { + void CreateMonitorService(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 reserved_input = rp.Pop(); diff --git a/src/core/hle/service/ldn/ldn.h b/src/core/hle/service/ldn/ldn.h index fa869fa89..f4a319168 100644 --- a/src/core/hle/service/ldn/ldn.h +++ b/src/core/hle/service/ldn/ldn.h @@ -3,9 +3,9 @@ #pragma once -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" #include "core/hle/result.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/kernel_helpers.h" #include "core/hle/service/sm/sm.h" diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index c82e189f4..6de96ed5b 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp @@ -9,10 +9,10 @@ #include "common/hex_util.h" #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_page_table.h" #include "core/hle/kernel/svc_results.h" #include "core/hle/kernel/svc_types.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/ldr/ldr.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" @@ -175,7 +175,7 @@ public: RegisterHandlers(functions); } - void RegisterModuleInfo(Kernel::HLERequestContext& ctx) { + void RegisterModuleInfo(HLERequestContext& ctx) { struct Parameters { u64_le process_id; u64_le nrr_address; @@ -272,7 +272,7 @@ public: rb.Push(ResultSuccess); } - void UnregisterModuleInfo(Kernel::HLERequestContext& ctx) { + void UnregisterModuleInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto pid = rp.Pop(); const auto nrr_address = rp.Pop(); @@ -446,7 +446,7 @@ public: data_start, bss_end_addr - data_start, Kernel::Svc::MemoryPermission::ReadWrite); } - void LoadModule(Kernel::HLERequestContext& ctx) { + void LoadModule(HLERequestContext& ctx) { struct Parameters { u64_le process_id; u64_le image_address; @@ -592,7 +592,7 @@ public: return ResultSuccess; } - void UnloadModule(Kernel::HLERequestContext& ctx) { + void UnloadModule(HLERequestContext& ctx) { if (!initialized) { LOG_ERROR(Service_LDR, "LDR:RO not initialized before use!"); IPC::ResponseBuilder rb{ctx, 2}; @@ -638,7 +638,7 @@ public: rb.Push(result); } - void Initialize(Kernel::HLERequestContext& ctx) { + void Initialize(HLERequestContext& ctx) { LOG_WARNING(Service_LDR, "(STUBBED) called"); initialized = true; diff --git a/src/core/hle/service/lm/lm.cpp b/src/core/hle/service/lm/lm.cpp index 7efd8e0ab..20df00233 100644 --- a/src/core/hle/service/lm/lm.cpp +++ b/src/core/hle/service/lm/lm.cpp @@ -8,7 +8,7 @@ #include #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/lm/lm.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" @@ -93,7 +93,7 @@ public: } private: - void Log(Kernel::HLERequestContext& ctx) { + void Log(HLERequestContext& ctx) { std::size_t offset{}; const auto data = ctx.ReadBuffer(); @@ -148,7 +148,7 @@ private: } } - void SetDestination(Kernel::HLERequestContext& ctx) { + void SetDestination(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto log_destination = rp.PopEnum(); @@ -343,7 +343,7 @@ public: } private: - void OpenLogger(Kernel::HLERequestContext& ctx) { + void OpenLogger(HLERequestContext& ctx) { LOG_DEBUG(Service_LM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; diff --git a/src/core/hle/service/mii/mii.cpp b/src/core/hle/service/mii/mii.cpp index 50dc0ac64..5c7adf97d 100644 --- a/src/core/hle/service/mii/mii.cpp +++ b/src/core/hle/service/mii/mii.cpp @@ -4,7 +4,7 @@ #include #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/mii/mii.h" #include "core/hle/service/mii/mii_manager.h" #include "core/hle/service/server_manager.h" @@ -65,7 +65,7 @@ private: return out; } - void IsUpdated(Kernel::HLERequestContext& ctx) { + void IsUpdated(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto source_flag{rp.PopRaw()}; @@ -76,7 +76,7 @@ private: rb.Push(manager.CheckAndResetUpdateCounter(source_flag, current_update_counter)); } - void IsFullDatabase(Kernel::HLERequestContext& ctx) { + void IsFullDatabase(HLERequestContext& ctx) { LOG_DEBUG(Service_Mii, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -84,7 +84,7 @@ private: rb.Push(manager.IsFullDatabase()); } - void GetCount(Kernel::HLERequestContext& ctx) { + void GetCount(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto source_flag{rp.PopRaw()}; @@ -95,7 +95,7 @@ private: rb.Push(manager.GetCount(source_flag)); } - void Get(Kernel::HLERequestContext& ctx) { + void Get(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto source_flag{rp.PopRaw()}; @@ -117,7 +117,7 @@ private: rb.Push(static_cast(result->size())); } - void Get1(Kernel::HLERequestContext& ctx) { + void Get1(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto source_flag{rp.PopRaw()}; @@ -142,7 +142,7 @@ private: rb.Push(static_cast(result->size())); } - void UpdateLatest(Kernel::HLERequestContext& ctx) { + void UpdateLatest(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto info{rp.PopRaw()}; const auto source_flag{rp.PopRaw()}; @@ -161,7 +161,7 @@ private: rb.PushRaw(*result); } - void BuildRandom(Kernel::HLERequestContext& ctx) { + void BuildRandom(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto age{rp.PopRaw()}; @@ -196,7 +196,7 @@ private: rb.PushRaw(manager.BuildRandom(age, gender, race)); } - void BuildDefault(Kernel::HLERequestContext& ctx) { + void BuildDefault(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto index{rp.Pop()}; @@ -215,7 +215,7 @@ private: rb.PushRaw(manager.BuildDefault(index)); } - void GetIndex(Kernel::HLERequestContext& ctx) { + void GetIndex(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto info{rp.PopRaw()}; @@ -227,7 +227,7 @@ private: rb.Push(index); } - void SetInterfaceVersion(Kernel::HLERequestContext& ctx) { + void SetInterfaceVersion(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; current_interface_version = rp.PopRaw(); @@ -239,7 +239,7 @@ private: rb.Push(ResultSuccess); } - void Convert(Kernel::HLERequestContext& ctx) { + void Convert(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto mii_v3{rp.PopRaw()}; @@ -275,7 +275,7 @@ public: } private: - void GetDatabaseService(Kernel::HLERequestContext& ctx) { + void GetDatabaseService(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); rb.PushIpcInterface(system); diff --git a/src/core/hle/service/mm/mm_u.cpp b/src/core/hle/service/mm/mm_u.cpp index bee72fa1b..6f43b1968 100644 --- a/src/core/hle/service/mm/mm_u.cpp +++ b/src/core/hle/service/mm/mm_u.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/mm/mm_u.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/sm/sm.h" @@ -29,21 +29,21 @@ public: } private: - void InitializeOld(Kernel::HLERequestContext& ctx) { + void InitializeOld(HLERequestContext& ctx) { LOG_WARNING(Service_MM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void FinalizeOld(Kernel::HLERequestContext& ctx) { + void FinalizeOld(HLERequestContext& ctx) { LOG_WARNING(Service_MM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void SetAndWaitOld(Kernel::HLERequestContext& ctx) { + void SetAndWaitOld(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; min = rp.Pop(); max = rp.Pop(); @@ -54,7 +54,7 @@ private: rb.Push(ResultSuccess); } - void GetOld(Kernel::HLERequestContext& ctx) { + void GetOld(HLERequestContext& ctx) { LOG_DEBUG(Service_MM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -62,7 +62,7 @@ private: rb.Push(current); } - void Initialize(Kernel::HLERequestContext& ctx) { + void Initialize(HLERequestContext& ctx) { LOG_WARNING(Service_MM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -70,14 +70,14 @@ private: rb.Push(id); // Any non zero value } - void Finalize(Kernel::HLERequestContext& ctx) { + void Finalize(HLERequestContext& ctx) { LOG_WARNING(Service_MM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void SetAndWait(Kernel::HLERequestContext& ctx) { + void SetAndWait(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; u32 input_id = rp.Pop(); min = rp.Pop(); @@ -90,7 +90,7 @@ private: rb.Push(ResultSuccess); } - void Get(Kernel::HLERequestContext& ctx) { + void Get(HLERequestContext& ctx) { LOG_DEBUG(Service_MM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; diff --git a/src/core/hle/service/mnpp/mnpp_app.cpp b/src/core/hle/service/mnpp/mnpp_app.cpp index 4ce4672b7..b11a92056 100644 --- a/src/core/hle/service/mnpp/mnpp_app.cpp +++ b/src/core/hle/service/mnpp/mnpp_app.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/mnpp/mnpp_app.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" @@ -23,14 +23,14 @@ public: } private: - void Unknown0(Kernel::HLERequestContext& ctx) { + void Unknown0(HLERequestContext& ctx) { LOG_WARNING(Service_MNPP, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void Unknown1(Kernel::HLERequestContext& ctx) { + void Unknown1(HLERequestContext& ctx) { LOG_WARNING(Service_MNPP, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; diff --git a/src/core/hle/service/ncm/ncm.cpp b/src/core/hle/service/ncm/ncm.cpp index 5ab24dc34..650666d6b 100644 --- a/src/core/hle/service/ncm/ncm.cpp +++ b/src/core/hle/service/ncm/ncm.cpp @@ -4,7 +4,7 @@ #include #include "core/file_sys/romfs_factory.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/ncm/ncm.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" diff --git a/src/core/hle/service/nfc/mifare_user.cpp b/src/core/hle/service/nfc/mifare_user.cpp index 51523a3ae..e0bbd46e1 100644 --- a/src/core/hle/service/nfc/mifare_user.cpp +++ b/src/core/hle/service/nfc/mifare_user.cpp @@ -4,8 +4,8 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/hid/hid_types.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nfc/mifare_user.h" #include "core/hle/service/nfc/nfc_device.h" #include "core/hle/service/nfc/nfc_result.h" @@ -45,7 +45,7 @@ MFIUser ::~MFIUser() { availability_change_event->Close(); } -void MFIUser::Initialize(Kernel::HLERequestContext& ctx) { +void MFIUser::Initialize(HLERequestContext& ctx) { LOG_INFO(Service_NFC, "called"); state = State::Initialized; @@ -58,7 +58,7 @@ void MFIUser::Initialize(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void MFIUser::Finalize(Kernel::HLERequestContext& ctx) { +void MFIUser::Finalize(HLERequestContext& ctx) { LOG_INFO(Service_NFC, "called"); state = State::NonInitialized; @@ -71,7 +71,7 @@ void MFIUser::Finalize(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void MFIUser::ListDevices(Kernel::HLERequestContext& ctx) { +void MFIUser::ListDevices(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); if (state == State::NonInitialized) { @@ -117,7 +117,7 @@ void MFIUser::ListDevices(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(nfp_devices.size())); } -void MFIUser::StartDetection(Kernel::HLERequestContext& ctx) { +void MFIUser::StartDetection(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); @@ -141,7 +141,7 @@ void MFIUser::StartDetection(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void MFIUser::StopDetection(Kernel::HLERequestContext& ctx) { +void MFIUser::StopDetection(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); @@ -165,7 +165,7 @@ void MFIUser::StopDetection(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void MFIUser::Read(Kernel::HLERequestContext& ctx) { +void MFIUser::Read(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto buffer{ctx.ReadBuffer()}; @@ -206,7 +206,7 @@ void MFIUser::Read(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void MFIUser::Write(Kernel::HLERequestContext& ctx) { +void MFIUser::Write(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto buffer{ctx.ReadBuffer()}; @@ -250,7 +250,7 @@ void MFIUser::Write(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void MFIUser::GetTagInfo(Kernel::HLERequestContext& ctx) { +void MFIUser::GetTagInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); @@ -276,7 +276,7 @@ void MFIUser::GetTagInfo(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void MFIUser::GetActivateEventHandle(Kernel::HLERequestContext& ctx) { +void MFIUser::GetActivateEventHandle(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -300,7 +300,7 @@ void MFIUser::GetActivateEventHandle(Kernel::HLERequestContext& ctx) { rb.PushCopyObjects(device.value()->GetActivateEvent()); } -void MFIUser::GetDeactivateEventHandle(Kernel::HLERequestContext& ctx) { +void MFIUser::GetDeactivateEventHandle(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -324,7 +324,7 @@ void MFIUser::GetDeactivateEventHandle(Kernel::HLERequestContext& ctx) { rb.PushCopyObjects(device.value()->GetDeactivateEvent()); } -void MFIUser::GetState(Kernel::HLERequestContext& ctx) { +void MFIUser::GetState(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -332,7 +332,7 @@ void MFIUser::GetState(Kernel::HLERequestContext& ctx) { rb.PushEnum(state); } -void MFIUser::GetDeviceState(Kernel::HLERequestContext& ctx) { +void MFIUser::GetDeviceState(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -350,7 +350,7 @@ void MFIUser::GetDeviceState(Kernel::HLERequestContext& ctx) { rb.PushEnum(device.value()->GetCurrentState()); } -void MFIUser::GetNpadId(Kernel::HLERequestContext& ctx) { +void MFIUser::GetNpadId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -374,7 +374,7 @@ void MFIUser::GetNpadId(Kernel::HLERequestContext& ctx) { rb.PushEnum(device.value()->GetNpadId()); } -void MFIUser::GetAvailabilityChangeEventHandle(Kernel::HLERequestContext& ctx) { +void MFIUser::GetAvailabilityChangeEventHandle(HLERequestContext& ctx) { LOG_INFO(Service_NFC, "called"); if (state == State::NonInitialized) { diff --git a/src/core/hle/service/nfc/mifare_user.h b/src/core/hle/service/nfc/mifare_user.h index 0e0638cb6..9701f1d7f 100644 --- a/src/core/hle/service/nfc/mifare_user.h +++ b/src/core/hle/service/nfc/mifare_user.h @@ -24,20 +24,20 @@ private: Initialized, }; - void Initialize(Kernel::HLERequestContext& ctx); - void Finalize(Kernel::HLERequestContext& ctx); - void ListDevices(Kernel::HLERequestContext& ctx); - void StartDetection(Kernel::HLERequestContext& ctx); - void StopDetection(Kernel::HLERequestContext& ctx); - void Read(Kernel::HLERequestContext& ctx); - void Write(Kernel::HLERequestContext& ctx); - void GetTagInfo(Kernel::HLERequestContext& ctx); - void GetActivateEventHandle(Kernel::HLERequestContext& ctx); - void GetDeactivateEventHandle(Kernel::HLERequestContext& ctx); - void GetState(Kernel::HLERequestContext& ctx); - void GetDeviceState(Kernel::HLERequestContext& ctx); - void GetNpadId(Kernel::HLERequestContext& ctx); - void GetAvailabilityChangeEventHandle(Kernel::HLERequestContext& ctx); + void Initialize(HLERequestContext& ctx); + void Finalize(HLERequestContext& ctx); + void ListDevices(HLERequestContext& ctx); + void StartDetection(HLERequestContext& ctx); + void StopDetection(HLERequestContext& ctx); + void Read(HLERequestContext& ctx); + void Write(HLERequestContext& ctx); + void GetTagInfo(HLERequestContext& ctx); + void GetActivateEventHandle(HLERequestContext& ctx); + void GetDeactivateEventHandle(HLERequestContext& ctx); + void GetState(HLERequestContext& ctx); + void GetDeviceState(HLERequestContext& ctx); + void GetNpadId(HLERequestContext& ctx); + void GetAvailabilityChangeEventHandle(HLERequestContext& ctx); std::optional> GetNfcDevice(u64 handle); diff --git a/src/core/hle/service/nfc/nfc.cpp b/src/core/hle/service/nfc/nfc.cpp index 34612b9df..6595e34ed 100644 --- a/src/core/hle/service/nfc/nfc.cpp +++ b/src/core/hle/service/nfc/nfc.cpp @@ -5,7 +5,7 @@ #include "common/logging/log.h" #include "common/settings.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nfc/mifare_user.h" #include "core/hle/service/nfc/nfc.h" #include "core/hle/service/nfc/nfc_user.h" @@ -42,7 +42,7 @@ public: } private: - void CreateAmInterface(Kernel::HLERequestContext& ctx) { + void CreateAmInterface(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -64,7 +64,7 @@ public: } private: - void CreateUserInterface(Kernel::HLERequestContext& ctx) { + void CreateUserInterface(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -86,7 +86,7 @@ public: } private: - void CreateUserInterface(Kernel::HLERequestContext& ctx) { + void CreateUserInterface(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -145,7 +145,7 @@ public: } private: - void CreateSystemInterface(Kernel::HLERequestContext& ctx) { + void CreateSystemInterface(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; diff --git a/src/core/hle/service/nfc/nfc_device.cpp b/src/core/hle/service/nfc/nfc_device.cpp index 9a3234e8c..3f17d0c7a 100644 --- a/src/core/hle/service/nfc/nfc_device.cpp +++ b/src/core/hle/service/nfc/nfc_device.cpp @@ -7,8 +7,8 @@ #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" #include "core/hid/hid_types.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nfc/nfc_device.h" #include "core/hle/service/nfc/nfc_result.h" #include "core/hle/service/nfc/nfc_user.h" diff --git a/src/core/hle/service/nfc/nfc_user.cpp b/src/core/hle/service/nfc/nfc_user.cpp index 89aa6b3f5..7c162a4f3 100644 --- a/src/core/hle/service/nfc/nfc_user.cpp +++ b/src/core/hle/service/nfc/nfc_user.cpp @@ -4,8 +4,8 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/hid/hid_types.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nfc/nfc_device.h" #include "core/hle/service/nfc/nfc_result.h" #include "core/hle/service/nfc/nfc_user.h" @@ -54,7 +54,7 @@ IUser ::~IUser() { availability_change_event->Close(); } -void IUser::Initialize(Kernel::HLERequestContext& ctx) { +void IUser::Initialize(HLERequestContext& ctx) { LOG_INFO(Service_NFC, "called"); state = State::Initialized; @@ -67,7 +67,7 @@ void IUser::Initialize(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IUser::Finalize(Kernel::HLERequestContext& ctx) { +void IUser::Finalize(HLERequestContext& ctx) { LOG_INFO(Service_NFC, "called"); state = State::NonInitialized; @@ -80,7 +80,7 @@ void IUser::Finalize(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IUser::GetState(Kernel::HLERequestContext& ctx) { +void IUser::GetState(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -88,7 +88,7 @@ void IUser::GetState(Kernel::HLERequestContext& ctx) { rb.PushEnum(state); } -void IUser::IsNfcEnabled(Kernel::HLERequestContext& ctx) { +void IUser::IsNfcEnabled(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -96,7 +96,7 @@ void IUser::IsNfcEnabled(Kernel::HLERequestContext& ctx) { rb.Push(state != State::NonInitialized); } -void IUser::ListDevices(Kernel::HLERequestContext& ctx) { +void IUser::ListDevices(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); if (state == State::NonInitialized) { @@ -142,7 +142,7 @@ void IUser::ListDevices(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(nfp_devices.size())); } -void IUser::GetDeviceState(Kernel::HLERequestContext& ctx) { +void IUser::GetDeviceState(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -160,7 +160,7 @@ void IUser::GetDeviceState(Kernel::HLERequestContext& ctx) { rb.PushEnum(device.value()->GetCurrentState()); } -void IUser::GetNpadId(Kernel::HLERequestContext& ctx) { +void IUser::GetNpadId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -184,7 +184,7 @@ void IUser::GetNpadId(Kernel::HLERequestContext& ctx) { rb.PushEnum(device.value()->GetNpadId()); } -void IUser::AttachAvailabilityChangeEvent(Kernel::HLERequestContext& ctx) { +void IUser::AttachAvailabilityChangeEvent(HLERequestContext& ctx) { LOG_INFO(Service_NFC, "called"); if (state == State::NonInitialized) { @@ -198,7 +198,7 @@ void IUser::AttachAvailabilityChangeEvent(Kernel::HLERequestContext& ctx) { rb.PushCopyObjects(availability_change_event->GetReadableEvent()); } -void IUser::StartDetection(Kernel::HLERequestContext& ctx) { +void IUser::StartDetection(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto nfp_protocol{rp.PopEnum()}; @@ -223,7 +223,7 @@ void IUser::StartDetection(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::StopDetection(Kernel::HLERequestContext& ctx) { +void IUser::StopDetection(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); @@ -247,7 +247,7 @@ void IUser::StopDetection(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::GetTagInfo(Kernel::HLERequestContext& ctx) { +void IUser::GetTagInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); @@ -273,7 +273,7 @@ void IUser::GetTagInfo(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::AttachActivateEvent(Kernel::HLERequestContext& ctx) { +void IUser::AttachActivateEvent(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -297,7 +297,7 @@ void IUser::AttachActivateEvent(Kernel::HLERequestContext& ctx) { rb.PushCopyObjects(device.value()->GetActivateEvent()); } -void IUser::AttachDeactivateEvent(Kernel::HLERequestContext& ctx) { +void IUser::AttachDeactivateEvent(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -321,7 +321,7 @@ void IUser::AttachDeactivateEvent(Kernel::HLERequestContext& ctx) { rb.PushCopyObjects(device.value()->GetDeactivateEvent()); } -void IUser::SendCommandByPassThrough(Kernel::HLERequestContext& ctx) { +void IUser::SendCommandByPassThrough(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto timeout{rp.PopRaw()}; diff --git a/src/core/hle/service/nfc/nfc_user.h b/src/core/hle/service/nfc/nfc_user.h index a5a4f12f9..aee046ae8 100644 --- a/src/core/hle/service/nfc/nfc_user.h +++ b/src/core/hle/service/nfc/nfc_user.h @@ -24,20 +24,20 @@ private: Initialized, }; - void Initialize(Kernel::HLERequestContext& ctx); - void Finalize(Kernel::HLERequestContext& ctx); - void GetState(Kernel::HLERequestContext& ctx); - void IsNfcEnabled(Kernel::HLERequestContext& ctx); - void ListDevices(Kernel::HLERequestContext& ctx); - void GetDeviceState(Kernel::HLERequestContext& ctx); - void GetNpadId(Kernel::HLERequestContext& ctx); - void AttachAvailabilityChangeEvent(Kernel::HLERequestContext& ctx); - void StartDetection(Kernel::HLERequestContext& ctx); - void StopDetection(Kernel::HLERequestContext& ctx); - void GetTagInfo(Kernel::HLERequestContext& ctx); - void AttachActivateEvent(Kernel::HLERequestContext& ctx); - void AttachDeactivateEvent(Kernel::HLERequestContext& ctx); - void SendCommandByPassThrough(Kernel::HLERequestContext& ctx); + void Initialize(HLERequestContext& ctx); + void Finalize(HLERequestContext& ctx); + void GetState(HLERequestContext& ctx); + void IsNfcEnabled(HLERequestContext& ctx); + void ListDevices(HLERequestContext& ctx); + void GetDeviceState(HLERequestContext& ctx); + void GetNpadId(HLERequestContext& ctx); + void AttachAvailabilityChangeEvent(HLERequestContext& ctx); + void StartDetection(HLERequestContext& ctx); + void StopDetection(HLERequestContext& ctx); + void GetTagInfo(HLERequestContext& ctx); + void AttachActivateEvent(HLERequestContext& ctx); + void AttachDeactivateEvent(HLERequestContext& ctx); + void SendCommandByPassThrough(HLERequestContext& ctx); std::optional> GetNfcDevice(u64 handle); diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp index 1b59aba8e..e262dc2f2 100644 --- a/src/core/hle/service/nfp/nfp.cpp +++ b/src/core/hle/service/nfp/nfp.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nfp/nfp.h" #include "core/hle/service/nfp/nfp_user.h" #include "core/hle/service/server_manager.h" @@ -22,7 +22,7 @@ public: } private: - void CreateUserInterface(Kernel::HLERequestContext& ctx) { + void CreateUserInterface(HLERequestContext& ctx) { LOG_DEBUG(Service_NFP, "called"); if (user_interface == nullptr) { diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfp/nfp_device.cpp index 7a6bbbba7..1bdc42741 100644 --- a/src/core/hle/service/nfp/nfp_device.cpp +++ b/src/core/hle/service/nfp/nfp_device.cpp @@ -11,8 +11,8 @@ #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" #include "core/hid/hid_types.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/mii/mii_manager.h" #include "core/hle/service/mii/types.h" #include "core/hle/service/nfp/amiibo_crypto.h" diff --git a/src/core/hle/service/nfp/nfp_user.cpp b/src/core/hle/service/nfp/nfp_user.cpp index a4d3d1bc7..4e8534113 100644 --- a/src/core/hle/service/nfp/nfp_user.cpp +++ b/src/core/hle/service/nfp/nfp_user.cpp @@ -4,8 +4,8 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/hid/hid_types.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nfp/nfp_device.h" #include "core/hle/service/nfp/nfp_result.h" #include "core/hle/service/nfp/nfp_user.h" @@ -56,7 +56,7 @@ IUser ::~IUser() { availability_change_event->Close(); } -void IUser::Initialize(Kernel::HLERequestContext& ctx) { +void IUser::Initialize(HLERequestContext& ctx) { LOG_INFO(Service_NFP, "called"); state = State::Initialized; @@ -69,7 +69,7 @@ void IUser::Initialize(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IUser::Finalize(Kernel::HLERequestContext& ctx) { +void IUser::Finalize(HLERequestContext& ctx) { LOG_INFO(Service_NFP, "called"); state = State::NonInitialized; @@ -82,7 +82,7 @@ void IUser::Finalize(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IUser::ListDevices(Kernel::HLERequestContext& ctx) { +void IUser::ListDevices(HLERequestContext& ctx) { LOG_DEBUG(Service_NFP, "called"); if (state == State::NonInitialized) { @@ -128,7 +128,7 @@ void IUser::ListDevices(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(nfp_devices.size())); } -void IUser::StartDetection(Kernel::HLERequestContext& ctx) { +void IUser::StartDetection(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto nfp_protocol{rp.PopEnum()}; @@ -153,7 +153,7 @@ void IUser::StartDetection(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::StopDetection(Kernel::HLERequestContext& ctx) { +void IUser::StopDetection(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); @@ -177,7 +177,7 @@ void IUser::StopDetection(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::Mount(Kernel::HLERequestContext& ctx) { +void IUser::Mount(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto model_type{rp.PopEnum()}; @@ -204,7 +204,7 @@ void IUser::Mount(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::Unmount(Kernel::HLERequestContext& ctx) { +void IUser::Unmount(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); @@ -228,7 +228,7 @@ void IUser::Unmount(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::OpenApplicationArea(Kernel::HLERequestContext& ctx) { +void IUser::OpenApplicationArea(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto access_id{rp.Pop()}; @@ -253,7 +253,7 @@ void IUser::OpenApplicationArea(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::GetApplicationArea(Kernel::HLERequestContext& ctx) { +void IUser::GetApplicationArea(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto data_size = ctx.GetWriteBufferSize(); @@ -287,7 +287,7 @@ void IUser::GetApplicationArea(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(data_size)); } -void IUser::SetApplicationArea(Kernel::HLERequestContext& ctx) { +void IUser::SetApplicationArea(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto data{ctx.ReadBuffer()}; @@ -318,7 +318,7 @@ void IUser::SetApplicationArea(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::Flush(Kernel::HLERequestContext& ctx) { +void IUser::Flush(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); @@ -342,7 +342,7 @@ void IUser::Flush(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::Restore(Kernel::HLERequestContext& ctx) { +void IUser::Restore(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_WARNING(Service_NFP, "(STUBBED) called, device_handle={}", device_handle); @@ -366,7 +366,7 @@ void IUser::Restore(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::CreateApplicationArea(Kernel::HLERequestContext& ctx) { +void IUser::CreateApplicationArea(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto access_id{rp.Pop()}; @@ -399,7 +399,7 @@ void IUser::CreateApplicationArea(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::GetTagInfo(Kernel::HLERequestContext& ctx) { +void IUser::GetTagInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); @@ -425,7 +425,7 @@ void IUser::GetTagInfo(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::GetRegisterInfo(Kernel::HLERequestContext& ctx) { +void IUser::GetRegisterInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); @@ -451,7 +451,7 @@ void IUser::GetRegisterInfo(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::GetCommonInfo(Kernel::HLERequestContext& ctx) { +void IUser::GetCommonInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); @@ -477,7 +477,7 @@ void IUser::GetCommonInfo(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::GetModelInfo(Kernel::HLERequestContext& ctx) { +void IUser::GetModelInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); @@ -503,7 +503,7 @@ void IUser::GetModelInfo(Kernel::HLERequestContext& ctx) { rb.Push(result); } -void IUser::AttachActivateEvent(Kernel::HLERequestContext& ctx) { +void IUser::AttachActivateEvent(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); @@ -527,7 +527,7 @@ void IUser::AttachActivateEvent(Kernel::HLERequestContext& ctx) { rb.PushCopyObjects(device.value()->GetActivateEvent()); } -void IUser::AttachDeactivateEvent(Kernel::HLERequestContext& ctx) { +void IUser::AttachDeactivateEvent(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); @@ -551,7 +551,7 @@ void IUser::AttachDeactivateEvent(Kernel::HLERequestContext& ctx) { rb.PushCopyObjects(device.value()->GetDeactivateEvent()); } -void IUser::GetState(Kernel::HLERequestContext& ctx) { +void IUser::GetState(HLERequestContext& ctx) { LOG_DEBUG(Service_NFP, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -559,7 +559,7 @@ void IUser::GetState(Kernel::HLERequestContext& ctx) { rb.PushEnum(state); } -void IUser::GetDeviceState(Kernel::HLERequestContext& ctx) { +void IUser::GetDeviceState(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); @@ -577,7 +577,7 @@ void IUser::GetDeviceState(Kernel::HLERequestContext& ctx) { rb.PushEnum(device.value()->GetCurrentState()); } -void IUser::GetNpadId(Kernel::HLERequestContext& ctx) { +void IUser::GetNpadId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); @@ -601,7 +601,7 @@ void IUser::GetNpadId(Kernel::HLERequestContext& ctx) { rb.PushEnum(device.value()->GetNpadId()); } -void IUser::GetApplicationAreaSize(Kernel::HLERequestContext& ctx) { +void IUser::GetApplicationAreaSize(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); @@ -619,7 +619,7 @@ void IUser::GetApplicationAreaSize(Kernel::HLERequestContext& ctx) { rb.Push(device.value()->GetApplicationAreaSize()); } -void IUser::AttachAvailabilityChangeEvent(Kernel::HLERequestContext& ctx) { +void IUser::AttachAvailabilityChangeEvent(HLERequestContext& ctx) { LOG_INFO(Service_NFP, "called"); if (state == State::NonInitialized) { @@ -633,7 +633,7 @@ void IUser::AttachAvailabilityChangeEvent(Kernel::HLERequestContext& ctx) { rb.PushCopyObjects(availability_change_event->GetReadableEvent()); } -void IUser::RecreateApplicationArea(Kernel::HLERequestContext& ctx) { +void IUser::RecreateApplicationArea(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto access_id{rp.Pop()}; diff --git a/src/core/hle/service/nfp/nfp_user.h b/src/core/hle/service/nfp/nfp_user.h index 7e9a90af8..1f3ff2ea8 100644 --- a/src/core/hle/service/nfp/nfp_user.h +++ b/src/core/hle/service/nfp/nfp_user.h @@ -24,31 +24,31 @@ private: Initialized, }; - void Initialize(Kernel::HLERequestContext& ctx); - void Finalize(Kernel::HLERequestContext& ctx); - void ListDevices(Kernel::HLERequestContext& ctx); - void StartDetection(Kernel::HLERequestContext& ctx); - void StopDetection(Kernel::HLERequestContext& ctx); - void Mount(Kernel::HLERequestContext& ctx); - void Unmount(Kernel::HLERequestContext& ctx); - void OpenApplicationArea(Kernel::HLERequestContext& ctx); - void GetApplicationArea(Kernel::HLERequestContext& ctx); - void SetApplicationArea(Kernel::HLERequestContext& ctx); - void Flush(Kernel::HLERequestContext& ctx); - void Restore(Kernel::HLERequestContext& ctx); - void CreateApplicationArea(Kernel::HLERequestContext& ctx); - void GetTagInfo(Kernel::HLERequestContext& ctx); - void GetRegisterInfo(Kernel::HLERequestContext& ctx); - void GetCommonInfo(Kernel::HLERequestContext& ctx); - void GetModelInfo(Kernel::HLERequestContext& ctx); - void AttachActivateEvent(Kernel::HLERequestContext& ctx); - void AttachDeactivateEvent(Kernel::HLERequestContext& ctx); - void GetState(Kernel::HLERequestContext& ctx); - void GetDeviceState(Kernel::HLERequestContext& ctx); - void GetNpadId(Kernel::HLERequestContext& ctx); - void GetApplicationAreaSize(Kernel::HLERequestContext& ctx); - void AttachAvailabilityChangeEvent(Kernel::HLERequestContext& ctx); - void RecreateApplicationArea(Kernel::HLERequestContext& ctx); + void Initialize(HLERequestContext& ctx); + void Finalize(HLERequestContext& ctx); + void ListDevices(HLERequestContext& ctx); + void StartDetection(HLERequestContext& ctx); + void StopDetection(HLERequestContext& ctx); + void Mount(HLERequestContext& ctx); + void Unmount(HLERequestContext& ctx); + void OpenApplicationArea(HLERequestContext& ctx); + void GetApplicationArea(HLERequestContext& ctx); + void SetApplicationArea(HLERequestContext& ctx); + void Flush(HLERequestContext& ctx); + void Restore(HLERequestContext& ctx); + void CreateApplicationArea(HLERequestContext& ctx); + void GetTagInfo(HLERequestContext& ctx); + void GetRegisterInfo(HLERequestContext& ctx); + void GetCommonInfo(HLERequestContext& ctx); + void GetModelInfo(HLERequestContext& ctx); + void AttachActivateEvent(HLERequestContext& ctx); + void AttachDeactivateEvent(HLERequestContext& ctx); + void GetState(HLERequestContext& ctx); + void GetDeviceState(HLERequestContext& ctx); + void GetNpadId(HLERequestContext& ctx); + void GetApplicationAreaSize(HLERequestContext& ctx); + void AttachAvailabilityChangeEvent(HLERequestContext& ctx); + void RecreateApplicationArea(HLERequestContext& ctx); std::optional> GetNfpDevice(u64 handle); diff --git a/src/core/hle/service/ngct/ngct.cpp b/src/core/hle/service/ngct/ngct.cpp index 76897d05c..493c80ed2 100644 --- a/src/core/hle/service/ngct/ngct.cpp +++ b/src/core/hle/service/ngct/ngct.cpp @@ -3,7 +3,7 @@ #include "common/string_util.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/ngct/ngct.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" @@ -24,7 +24,7 @@ public: } private: - void Match(Kernel::HLERequestContext& ctx) { + void Match(HLERequestContext& ctx) { const auto buffer = ctx.ReadBuffer(); const auto text = Common::StringFromFixedZeroTerminatedBuffer( reinterpret_cast(buffer.data()), buffer.size()); @@ -37,7 +37,7 @@ private: rb.Push(false); } - void Filter(Kernel::HLERequestContext& ctx) { + void Filter(HLERequestContext& ctx) { const auto buffer = ctx.ReadBuffer(); const auto text = Common::StringFromFixedZeroTerminatedBuffer( reinterpret_cast(buffer.data()), buffer.size()); diff --git a/src/core/hle/service/nifm/nifm.cpp b/src/core/hle/service/nifm/nifm.cpp index 3d176b3c2..0c042f412 100644 --- a/src/core/hle/service/nifm/nifm.cpp +++ b/src/core/hle/service/nifm/nifm.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/kernel_helpers.h" #include "core/hle/service/nifm/nifm.h" #include "core/hle/service/server_manager.h" @@ -217,7 +217,7 @@ public: } private: - void Submit(Kernel::HLERequestContext& ctx) { + void Submit(HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); if (state == RequestState::NotSubmitted) { @@ -228,7 +228,7 @@ private: rb.Push(ResultSuccess); } - void GetRequestState(Kernel::HLERequestContext& ctx) { + void GetRequestState(HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -236,7 +236,7 @@ private: rb.PushEnum(state); } - void GetResult(Kernel::HLERequestContext& ctx) { + void GetResult(HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); const auto result = [this] { @@ -261,7 +261,7 @@ private: rb.Push(result); } - void GetSystemEventReadableHandles(Kernel::HLERequestContext& ctx) { + void GetSystemEventReadableHandles(HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 2}; @@ -269,21 +269,21 @@ private: rb.PushCopyObjects(event1->GetReadableEvent(), event2->GetReadableEvent()); } - void Cancel(Kernel::HLERequestContext& ctx) { + void Cancel(HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void SetConnectionConfirmationOption(Kernel::HLERequestContext& ctx) { + void SetConnectionConfirmationOption(HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void GetAppletInfo(Kernel::HLERequestContext& ctx) { + void GetAppletInfo(HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); std::vector out_buffer(ctx.GetWriteBufferSize()); @@ -322,7 +322,7 @@ public: } }; -void IGeneralService::GetClientId(Kernel::HLERequestContext& ctx) { +void IGeneralService::GetClientId(HLERequestContext& ctx) { static constexpr u32 client_id = 1; LOG_WARNING(Service_NIFM, "(STUBBED) called"); @@ -331,7 +331,7 @@ void IGeneralService::GetClientId(Kernel::HLERequestContext& ctx) { rb.Push(client_id); // Client ID needs to be non zero otherwise it's considered invalid } -void IGeneralService::CreateScanRequest(Kernel::HLERequestContext& ctx) { +void IGeneralService::CreateScanRequest(HLERequestContext& ctx) { LOG_DEBUG(Service_NIFM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -340,7 +340,7 @@ void IGeneralService::CreateScanRequest(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(system); } -void IGeneralService::CreateRequest(Kernel::HLERequestContext& ctx) { +void IGeneralService::CreateRequest(HLERequestContext& ctx) { LOG_DEBUG(Service_NIFM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -349,7 +349,7 @@ void IGeneralService::CreateRequest(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(system); } -void IGeneralService::GetCurrentNetworkProfile(Kernel::HLERequestContext& ctx) { +void IGeneralService::GetCurrentNetworkProfile(HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); const auto net_iface = Network::GetSelectedNetworkInterface(); @@ -408,14 +408,14 @@ void IGeneralService::GetCurrentNetworkProfile(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IGeneralService::RemoveNetworkProfile(Kernel::HLERequestContext& ctx) { +void IGeneralService::RemoveNetworkProfile(HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void IGeneralService::GetCurrentIpAddress(Kernel::HLERequestContext& ctx) { +void IGeneralService::GetCurrentIpAddress(HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); auto ipv4 = Network::GetHostIPv4Address(); @@ -436,7 +436,7 @@ void IGeneralService::GetCurrentIpAddress(Kernel::HLERequestContext& ctx) { rb.PushRaw(*ipv4); } -void IGeneralService::CreateTemporaryNetworkProfile(Kernel::HLERequestContext& ctx) { +void IGeneralService::CreateTemporaryNetworkProfile(HLERequestContext& ctx) { LOG_DEBUG(Service_NIFM, "called"); ASSERT_MSG(ctx.GetReadBufferSize() == 0x17c, "SfNetworkProfileData is not the correct size"); @@ -451,7 +451,7 @@ void IGeneralService::CreateTemporaryNetworkProfile(Kernel::HLERequestContext& c rb.PushRaw(uuid); } -void IGeneralService::GetCurrentIpConfigInfo(Kernel::HLERequestContext& ctx) { +void IGeneralService::GetCurrentIpConfigInfo(HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); struct IpConfigInfo { @@ -495,7 +495,7 @@ void IGeneralService::GetCurrentIpConfigInfo(Kernel::HLERequestContext& ctx) { rb.PushRaw(ip_config_info); } -void IGeneralService::IsWirelessCommunicationEnabled(Kernel::HLERequestContext& ctx) { +void IGeneralService::IsWirelessCommunicationEnabled(HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -503,7 +503,7 @@ void IGeneralService::IsWirelessCommunicationEnabled(Kernel::HLERequestContext& rb.Push(1); } -void IGeneralService::GetInternetConnectionStatus(Kernel::HLERequestContext& ctx) { +void IGeneralService::GetInternetConnectionStatus(HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); struct Output { @@ -520,7 +520,7 @@ void IGeneralService::GetInternetConnectionStatus(Kernel::HLERequestContext& ctx rb.PushRaw(out); } -void IGeneralService::IsEthernetCommunicationEnabled(Kernel::HLERequestContext& ctx) { +void IGeneralService::IsEthernetCommunicationEnabled(HLERequestContext& ctx) { LOG_WARNING(Service_NIFM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -532,7 +532,7 @@ void IGeneralService::IsEthernetCommunicationEnabled(Kernel::HLERequestContext& } } -void IGeneralService::IsAnyInternetRequestAccepted(Kernel::HLERequestContext& ctx) { +void IGeneralService::IsAnyInternetRequestAccepted(HLERequestContext& ctx) { LOG_ERROR(Service_NIFM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -610,7 +610,7 @@ public: } private: - void CreateGeneralServiceOld(Kernel::HLERequestContext& ctx) { + void CreateGeneralServiceOld(HLERequestContext& ctx) { LOG_DEBUG(Service_NIFM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -618,7 +618,7 @@ private: rb.PushIpcInterface(system); } - void CreateGeneralService(Kernel::HLERequestContext& ctx) { + void CreateGeneralService(HLERequestContext& ctx) { LOG_DEBUG(Service_NIFM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; diff --git a/src/core/hle/service/nifm/nifm.h b/src/core/hle/service/nifm/nifm.h index b5da7ae12..9b20e6823 100644 --- a/src/core/hle/service/nifm/nifm.h +++ b/src/core/hle/service/nifm/nifm.h @@ -22,18 +22,18 @@ public: ~IGeneralService() override; private: - void GetClientId(Kernel::HLERequestContext& ctx); - void CreateScanRequest(Kernel::HLERequestContext& ctx); - void CreateRequest(Kernel::HLERequestContext& ctx); - void GetCurrentNetworkProfile(Kernel::HLERequestContext& ctx); - void RemoveNetworkProfile(Kernel::HLERequestContext& ctx); - void GetCurrentIpAddress(Kernel::HLERequestContext& ctx); - void CreateTemporaryNetworkProfile(Kernel::HLERequestContext& ctx); - void GetCurrentIpConfigInfo(Kernel::HLERequestContext& ctx); - void IsWirelessCommunicationEnabled(Kernel::HLERequestContext& ctx); - void GetInternetConnectionStatus(Kernel::HLERequestContext& ctx); - void IsEthernetCommunicationEnabled(Kernel::HLERequestContext& ctx); - void IsAnyInternetRequestAccepted(Kernel::HLERequestContext& ctx); + void GetClientId(HLERequestContext& ctx); + void CreateScanRequest(HLERequestContext& ctx); + void CreateRequest(HLERequestContext& ctx); + void GetCurrentNetworkProfile(HLERequestContext& ctx); + void RemoveNetworkProfile(HLERequestContext& ctx); + void GetCurrentIpAddress(HLERequestContext& ctx); + void CreateTemporaryNetworkProfile(HLERequestContext& ctx); + void GetCurrentIpConfigInfo(HLERequestContext& ctx); + void IsWirelessCommunicationEnabled(HLERequestContext& ctx); + void GetInternetConnectionStatus(HLERequestContext& ctx); + void IsEthernetCommunicationEnabled(HLERequestContext& ctx); + void IsAnyInternetRequestAccepted(HLERequestContext& ctx); Network::RoomNetwork& network; }; diff --git a/src/core/hle/service/nim/nim.cpp b/src/core/hle/service/nim/nim.cpp index aff7cc5bd..42de87f9a 100644 --- a/src/core/hle/service/nim/nim.cpp +++ b/src/core/hle/service/nim/nim.cpp @@ -4,8 +4,8 @@ #include #include #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/kernel_helpers.h" #include "core/hle/service/nim/nim.h" #include "core/hle/service/server_manager.h" @@ -46,7 +46,7 @@ public: } private: - void CreateAsyncInterface(Kernel::HLERequestContext& ctx) { + void CreateAsyncInterface(HLERequestContext& ctx) { LOG_WARNING(Service_NIM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); @@ -68,7 +68,7 @@ public: } private: - void CreateAccessorInterface(Kernel::HLERequestContext& ctx) { + void CreateAccessorInterface(HLERequestContext& ctx) { LOG_WARNING(Service_NIM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); @@ -239,14 +239,14 @@ public: } private: - void CreateServerInterface(Kernel::HLERequestContext& ctx) { + void CreateServerInterface(HLERequestContext& ctx) { LOG_WARNING(Service_NIM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); rb.PushIpcInterface(system); } - void IsLargeResourceAvailable(Kernel::HLERequestContext& ctx) { + void IsLargeResourceAvailable(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto unknown{rp.Pop()}; @@ -325,7 +325,7 @@ public: } private: - void StartTask(Kernel::HLERequestContext& ctx) { + void StartTask(HLERequestContext& ctx) { // No need to connect to the internet, just finish the task straight away. LOG_DEBUG(Service_NIM, "called"); finished_event->Signal(); @@ -333,7 +333,7 @@ private: rb.Push(ResultSuccess); } - void GetFinishNotificationEvent(Kernel::HLERequestContext& ctx) { + void GetFinishNotificationEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_NIM, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; @@ -341,21 +341,21 @@ private: rb.PushCopyObjects(finished_event->GetReadableEvent()); } - void GetResult(Kernel::HLERequestContext& ctx) { + void GetResult(HLERequestContext& ctx) { LOG_DEBUG(Service_NIM, "called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void Cancel(Kernel::HLERequestContext& ctx) { + void Cancel(HLERequestContext& ctx) { LOG_DEBUG(Service_NIM, "called"); finished_event->Clear(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void IsProcessing(Kernel::HLERequestContext& ctx) { + void IsProcessing(HLERequestContext& ctx) { LOG_DEBUG(Service_NIM, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -363,7 +363,7 @@ private: rb.PushRaw(0); // We instantly process the request } - void GetServerTime(Kernel::HLERequestContext& ctx) { + void GetServerTime(HLERequestContext& ctx) { LOG_DEBUG(Service_NIM, "called"); const s64 server_time{std::chrono::duration_cast( @@ -394,7 +394,7 @@ public: } private: - void OpenEnsureNetworkClockAvailabilityService(Kernel::HLERequestContext& ctx) { + void OpenEnsureNetworkClockAvailabilityService(HLERequestContext& ctx) { LOG_DEBUG(Service_NIM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -403,14 +403,14 @@ private: } // TODO(ogniK): Do we need these? - void SuspendAutonomicTimeCorrection(Kernel::HLERequestContext& ctx) { + void SuspendAutonomicTimeCorrection(HLERequestContext& ctx) { LOG_WARNING(Service_NIM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void ResumeAutonomicTimeCorrection(Kernel::HLERequestContext& ctx) { + void ResumeAutonomicTimeCorrection(HLERequestContext& ctx) { LOG_WARNING(Service_NIM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; diff --git a/src/core/hle/service/ns/iplatform_service_manager.cpp b/src/core/hle/service/ns/iplatform_service_manager.cpp index 1fab2f0dd..cd2705881 100644 --- a/src/core/hle/service/ns/iplatform_service_manager.cpp +++ b/src/core/hle/service/ns/iplatform_service_manager.cpp @@ -15,11 +15,11 @@ #include "core/file_sys/registered_cache.h" #include "core/file_sys/romfs.h" #include "core/file_sys/system_archive/system_archive.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_shared_memory.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/physical_memory.h" #include "core/hle/service/filesystem/filesystem.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/ns/iplatform_service_manager.h" namespace Service::NS { @@ -208,7 +208,7 @@ IPlatformServiceManager::IPlatformServiceManager(Core::System& system_, const ch IPlatformServiceManager::~IPlatformServiceManager() = default; -void IPlatformServiceManager::RequestLoad(Kernel::HLERequestContext& ctx) { +void IPlatformServiceManager::RequestLoad(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u32 shared_font_type{rp.Pop()}; // Games don't call this so all fonts should be loaded @@ -218,7 +218,7 @@ void IPlatformServiceManager::RequestLoad(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IPlatformServiceManager::GetLoadState(Kernel::HLERequestContext& ctx) { +void IPlatformServiceManager::GetLoadState(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u32 font_id{rp.Pop()}; LOG_DEBUG(Service_NS, "called, font_id={}", font_id); @@ -228,7 +228,7 @@ void IPlatformServiceManager::GetLoadState(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(LoadState::Done)); } -void IPlatformServiceManager::GetSize(Kernel::HLERequestContext& ctx) { +void IPlatformServiceManager::GetSize(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u32 font_id{rp.Pop()}; LOG_DEBUG(Service_NS, "called, font_id={}", font_id); @@ -238,7 +238,7 @@ void IPlatformServiceManager::GetSize(Kernel::HLERequestContext& ctx) { rb.Push(impl->GetSharedFontRegion(font_id).size); } -void IPlatformServiceManager::GetSharedMemoryAddressOffset(Kernel::HLERequestContext& ctx) { +void IPlatformServiceManager::GetSharedMemoryAddressOffset(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u32 font_id{rp.Pop()}; LOG_DEBUG(Service_NS, "called, font_id={}", font_id); @@ -248,7 +248,7 @@ void IPlatformServiceManager::GetSharedMemoryAddressOffset(Kernel::HLERequestCon rb.Push(impl->GetSharedFontRegion(font_id).offset); } -void IPlatformServiceManager::GetSharedMemoryNativeHandle(Kernel::HLERequestContext& ctx) { +void IPlatformServiceManager::GetSharedMemoryNativeHandle(HLERequestContext& ctx) { // Map backing memory for the font data LOG_DEBUG(Service_NS, "called"); @@ -261,7 +261,7 @@ void IPlatformServiceManager::GetSharedMemoryNativeHandle(Kernel::HLERequestCont rb.PushCopyObjects(&kernel.GetFontSharedMem()); } -void IPlatformServiceManager::GetSharedFontInOrderOfPriority(Kernel::HLERequestContext& ctx) { +void IPlatformServiceManager::GetSharedFontInOrderOfPriority(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 language_code{rp.Pop()}; // TODO(ogniK): Find out what this is used for LOG_DEBUG(Service_NS, "called, language_code={:X}", language_code); diff --git a/src/core/hle/service/ns/iplatform_service_manager.h b/src/core/hle/service/ns/iplatform_service_manager.h index ed6eda89f..03071e02b 100644 --- a/src/core/hle/service/ns/iplatform_service_manager.h +++ b/src/core/hle/service/ns/iplatform_service_manager.h @@ -42,12 +42,12 @@ public: ~IPlatformServiceManager() override; private: - void RequestLoad(Kernel::HLERequestContext& ctx); - void GetLoadState(Kernel::HLERequestContext& ctx); - void GetSize(Kernel::HLERequestContext& ctx); - void GetSharedMemoryAddressOffset(Kernel::HLERequestContext& ctx); - void GetSharedMemoryNativeHandle(Kernel::HLERequestContext& ctx); - void GetSharedFontInOrderOfPriority(Kernel::HLERequestContext& ctx); + void RequestLoad(HLERequestContext& ctx); + void GetLoadState(HLERequestContext& ctx); + void GetSize(HLERequestContext& ctx); + void GetSharedMemoryAddressOffset(HLERequestContext& ctx); + void GetSharedMemoryNativeHandle(HLERequestContext& ctx); + void GetSharedFontInOrderOfPriority(HLERequestContext& ctx); struct Impl; std::unique_ptr impl; diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cpp index 062e96ef9..d6f0faea2 100644 --- a/src/core/hle/service/ns/ns.cpp +++ b/src/core/hle/service/ns/ns.cpp @@ -7,8 +7,8 @@ #include "core/file_sys/control_metadata.h" #include "core/file_sys/patch_manager.h" #include "core/file_sys/vfs.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/glue/glue_manager.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/ns/errors.h" #include "core/hle/service/ns/iplatform_service_manager.h" #include "core/hle/service/ns/language.h" @@ -329,7 +329,7 @@ IApplicationManagerInterface::IApplicationManagerInterface(Core::System& system_ IApplicationManagerInterface::~IApplicationManagerInterface() = default; -void IApplicationManagerInterface::GetApplicationControlData(Kernel::HLERequestContext& ctx) { +void IApplicationManagerInterface::GetApplicationControlData(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto flag = rp.PopRaw(); LOG_DEBUG(Service_NS, "called with flag={:016X}", flag); @@ -388,7 +388,7 @@ void IApplicationManagerInterface::GetApplicationControlData(Kernel::HLERequestC rb.Push(static_cast(out.size())); } -void IApplicationManagerInterface::GetApplicationDesiredLanguage(Kernel::HLERequestContext& ctx) { +void IApplicationManagerInterface::GetApplicationDesiredLanguage(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto supported_languages = rp.Pop(); @@ -440,7 +440,7 @@ ResultVal IApplicationManagerInterface::GetApplicationDesiredLanguage( } void IApplicationManagerInterface::ConvertApplicationLanguageToLanguageCode( - Kernel::HLERequestContext& ctx) { + HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto application_language = rp.Pop(); @@ -604,8 +604,7 @@ IReadOnlyApplicationControlDataInterface::IReadOnlyApplicationControlDataInterfa IReadOnlyApplicationControlDataInterface::~IReadOnlyApplicationControlDataInterface() = default; -void IReadOnlyApplicationControlDataInterface::GetApplicationControlData( - Kernel::HLERequestContext& ctx) { +void IReadOnlyApplicationControlDataInterface::GetApplicationControlData(HLERequestContext& ctx) { enum class ApplicationControlSource : u8 { CacheOnly, Storage, @@ -753,7 +752,7 @@ public: } private: - void OpenSystemUpdateControl(Kernel::HLERequestContext& ctx) { + void OpenSystemUpdateControl(HLERequestContext& ctx) { LOG_DEBUG(Service_NS, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -777,7 +776,7 @@ public: } private: - void NeedsUpdateVulnerability(Kernel::HLERequestContext& ctx) { + void NeedsUpdateVulnerability(HLERequestContext& ctx) { LOG_WARNING(Service_NS, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; diff --git a/src/core/hle/service/ns/ns.h b/src/core/hle/service/ns/ns.h index 797e69a13..203388e1f 100644 --- a/src/core/hle/service/ns/ns.h +++ b/src/core/hle/service/ns/ns.h @@ -32,9 +32,9 @@ public: ResultVal ConvertApplicationLanguageToLanguageCode(u8 application_language); private: - void GetApplicationControlData(Kernel::HLERequestContext& ctx); - void GetApplicationDesiredLanguage(Kernel::HLERequestContext& ctx); - void ConvertApplicationLanguageToLanguageCode(Kernel::HLERequestContext& ctx); + void GetApplicationControlData(HLERequestContext& ctx); + void GetApplicationDesiredLanguage(HLERequestContext& ctx); + void ConvertApplicationLanguageToLanguageCode(HLERequestContext& ctx); }; class IApplicationVersionInterface final : public ServiceFramework { @@ -80,7 +80,7 @@ public: ~IReadOnlyApplicationControlDataInterface() override; private: - void GetApplicationControlData(Kernel::HLERequestContext& ctx); + void GetApplicationControlData(HLERequestContext& ctx); }; class NS final : public ServiceFramework { @@ -92,7 +92,7 @@ public: private: template - void PushInterface(Kernel::HLERequestContext& ctx) { + void PushInterface(HLERequestContext& ctx) { LOG_DEBUG(Service_NS, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -100,7 +100,7 @@ private: rb.PushIpcInterface(system); } - void PushIApplicationManagerInterface(Kernel::HLERequestContext& ctx) { + void PushIApplicationManagerInterface(HLERequestContext& ctx) { LOG_DEBUG(Service_NS, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -110,7 +110,7 @@ private: template std::shared_ptr GetInterface(Args&&... args) const { - static_assert(std::is_base_of_v, + static_assert(std::is_base_of_v, "Not a base of ServiceFrameworkBase"); return std::make_shared(std::forward(args)...); diff --git a/src/core/hle/service/ns/pdm_qry.cpp b/src/core/hle/service/ns/pdm_qry.cpp index aac8f573f..ce0ee30e0 100644 --- a/src/core/hle/service/ns/pdm_qry.cpp +++ b/src/core/hle/service/ns/pdm_qry.cpp @@ -5,7 +5,7 @@ #include "common/logging/log.h" #include "common/uuid.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/ns/pdm_qry.h" #include "core/hle/service/service.h" @@ -42,7 +42,7 @@ PDM_QRY::PDM_QRY(Core::System& system_) : ServiceFramework{system_, "pdm:qry"} { PDM_QRY::~PDM_QRY() = default; -void PDM_QRY::QueryPlayStatisticsByApplicationIdAndUserAccountId(Kernel::HLERequestContext& ctx) { +void PDM_QRY::QueryPlayStatisticsByApplicationIdAndUserAccountId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto unknown = rp.Pop(); rp.Pop(); // Padding diff --git a/src/core/hle/service/ns/pdm_qry.h b/src/core/hle/service/ns/pdm_qry.h index abcc3bef3..c98e01660 100644 --- a/src/core/hle/service/ns/pdm_qry.h +++ b/src/core/hle/service/ns/pdm_qry.h @@ -26,7 +26,7 @@ public: ~PDM_QRY() override; private: - void QueryPlayStatisticsByApplicationIdAndUserAccountId(Kernel::HLERequestContext& ctx); + void QueryPlayStatisticsByApplicationIdAndUserAccountId(HLERequestContext& ctx); }; } // namespace Service::NS diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index a70ea9385..5e71ec99f 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -6,8 +6,8 @@ #include #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nvdrv/core/container.h" #include "core/hle/service/nvdrv/devices/nvdevice.h" #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h" diff --git a/src/core/hle/service/nvdrv/nvdrv_interface.cpp b/src/core/hle/service/nvdrv/nvdrv_interface.cpp index 396fa7ed5..d010a1e03 100644 --- a/src/core/hle/service/nvdrv/nvdrv_interface.cpp +++ b/src/core/hle/service/nvdrv/nvdrv_interface.cpp @@ -5,16 +5,16 @@ #include #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_readable_event.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nvdrv/nvdata.h" #include "core/hle/service/nvdrv/nvdrv.h" #include "core/hle/service/nvdrv/nvdrv_interface.h" namespace Service::Nvidia { -void NVDRV::Open(Kernel::HLERequestContext& ctx) { +void NVDRV::Open(HLERequestContext& ctx) { LOG_DEBUG(Service_NVDRV, "called"); IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); @@ -44,13 +44,13 @@ void NVDRV::Open(Kernel::HLERequestContext& ctx) { rb.PushEnum(fd != INVALID_NVDRV_FD ? NvResult::Success : NvResult::FileOperationFailed); } -void NVDRV::ServiceError(Kernel::HLERequestContext& ctx, NvResult result) { +void NVDRV::ServiceError(HLERequestContext& ctx, NvResult result) { IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); rb.PushEnum(result); } -void NVDRV::Ioctl1(Kernel::HLERequestContext& ctx) { +void NVDRV::Ioctl1(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto fd = rp.Pop(); const auto command = rp.PopRaw(); @@ -76,7 +76,7 @@ void NVDRV::Ioctl1(Kernel::HLERequestContext& ctx) { rb.PushEnum(nv_result); } -void NVDRV::Ioctl2(Kernel::HLERequestContext& ctx) { +void NVDRV::Ioctl2(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto fd = rp.Pop(); const auto command = rp.PopRaw(); @@ -103,7 +103,7 @@ void NVDRV::Ioctl2(Kernel::HLERequestContext& ctx) { rb.PushEnum(nv_result); } -void NVDRV::Ioctl3(Kernel::HLERequestContext& ctx) { +void NVDRV::Ioctl3(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto fd = rp.Pop(); const auto command = rp.PopRaw(); @@ -131,7 +131,7 @@ void NVDRV::Ioctl3(Kernel::HLERequestContext& ctx) { rb.PushEnum(nv_result); } -void NVDRV::Close(Kernel::HLERequestContext& ctx) { +void NVDRV::Close(HLERequestContext& ctx) { LOG_DEBUG(Service_NVDRV, "called"); if (!is_initialized) { @@ -149,7 +149,7 @@ void NVDRV::Close(Kernel::HLERequestContext& ctx) { rb.PushEnum(result); } -void NVDRV::Initialize(Kernel::HLERequestContext& ctx) { +void NVDRV::Initialize(HLERequestContext& ctx) { LOG_WARNING(Service_NVDRV, "(STUBBED) called"); is_initialized = true; @@ -159,7 +159,7 @@ void NVDRV::Initialize(Kernel::HLERequestContext& ctx) { rb.PushEnum(NvResult::Success); } -void NVDRV::QueryEvent(Kernel::HLERequestContext& ctx) { +void NVDRV::QueryEvent(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto fd = rp.Pop(); const auto event_id = rp.Pop(); @@ -187,7 +187,7 @@ void NVDRV::QueryEvent(Kernel::HLERequestContext& ctx) { } } -void NVDRV::SetAruid(Kernel::HLERequestContext& ctx) { +void NVDRV::SetAruid(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; pid = rp.Pop(); LOG_WARNING(Service_NVDRV, "(STUBBED) called, pid=0x{:X}", pid); @@ -197,14 +197,14 @@ void NVDRV::SetAruid(Kernel::HLERequestContext& ctx) { rb.PushEnum(NvResult::Success); } -void NVDRV::SetGraphicsFirmwareMemoryMarginEnabled(Kernel::HLERequestContext& ctx) { +void NVDRV::SetGraphicsFirmwareMemoryMarginEnabled(HLERequestContext& ctx) { LOG_WARNING(Service_NVDRV, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void NVDRV::GetStatus(Kernel::HLERequestContext& ctx) { +void NVDRV::GetStatus(HLERequestContext& ctx) { LOG_WARNING(Service_NVDRV, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -212,7 +212,7 @@ void NVDRV::GetStatus(Kernel::HLERequestContext& ctx) { rb.PushEnum(NvResult::Success); } -void NVDRV::DumpGraphicsMemoryInfo(Kernel::HLERequestContext& ctx) { +void NVDRV::DumpGraphicsMemoryInfo(HLERequestContext& ctx) { // According to SwitchBrew, this has no inputs and no outputs, so effectively does nothing on // retail hardware. LOG_DEBUG(Service_NVDRV, "called"); diff --git a/src/core/hle/service/nvdrv/nvdrv_interface.h b/src/core/hle/service/nvdrv/nvdrv_interface.h index 5ac06ee30..881ea1a6b 100644 --- a/src/core/hle/service/nvdrv/nvdrv_interface.h +++ b/src/core/hle/service/nvdrv/nvdrv_interface.h @@ -15,19 +15,19 @@ public: ~NVDRV() override; private: - void Open(Kernel::HLERequestContext& ctx); - void Ioctl1(Kernel::HLERequestContext& ctx); - void Ioctl2(Kernel::HLERequestContext& ctx); - void Ioctl3(Kernel::HLERequestContext& ctx); - void Close(Kernel::HLERequestContext& ctx); - void Initialize(Kernel::HLERequestContext& ctx); - void QueryEvent(Kernel::HLERequestContext& ctx); - void SetAruid(Kernel::HLERequestContext& ctx); - void SetGraphicsFirmwareMemoryMarginEnabled(Kernel::HLERequestContext& ctx); - void GetStatus(Kernel::HLERequestContext& ctx); - void DumpGraphicsMemoryInfo(Kernel::HLERequestContext& ctx); + void Open(HLERequestContext& ctx); + void Ioctl1(HLERequestContext& ctx); + void Ioctl2(HLERequestContext& ctx); + void Ioctl3(HLERequestContext& ctx); + void Close(HLERequestContext& ctx); + void Initialize(HLERequestContext& ctx); + void QueryEvent(HLERequestContext& ctx); + void SetAruid(HLERequestContext& ctx); + void SetGraphicsFirmwareMemoryMarginEnabled(HLERequestContext& ctx); + void GetStatus(HLERequestContext& ctx); + void DumpGraphicsMemoryInfo(HLERequestContext& ctx); - void ServiceError(Kernel::HLERequestContext& ctx, NvResult result); + void ServiceError(HLERequestContext& ctx, NvResult result); std::shared_ptr nvdrv; diff --git a/src/core/hle/service/nvdrv/nvmemp.cpp b/src/core/hle/service/nvdrv/nvmemp.cpp index e433580b1..fc10f6406 100644 --- a/src/core/hle/service/nvdrv/nvmemp.cpp +++ b/src/core/hle/service/nvdrv/nvmemp.cpp @@ -17,11 +17,11 @@ NVMEMP::NVMEMP(Core::System& system_) : ServiceFramework{system_, "nvmemp"} { NVMEMP::~NVMEMP() = default; -void NVMEMP::Open(Kernel::HLERequestContext& ctx) { +void NVMEMP::Open(HLERequestContext& ctx) { UNIMPLEMENTED(); } -void NVMEMP::GetAruid(Kernel::HLERequestContext& ctx) { +void NVMEMP::GetAruid(HLERequestContext& ctx) { UNIMPLEMENTED(); } diff --git a/src/core/hle/service/nvdrv/nvmemp.h b/src/core/hle/service/nvdrv/nvmemp.h index 3d4276327..85e3053a8 100644 --- a/src/core/hle/service/nvdrv/nvmemp.h +++ b/src/core/hle/service/nvdrv/nvmemp.h @@ -17,8 +17,8 @@ public: ~NVMEMP() override; private: - void Open(Kernel::HLERequestContext& ctx); - void GetAruid(Kernel::HLERequestContext& ctx); + void Open(HLERequestContext& ctx); + void GetAruid(HLERequestContext& ctx); }; } // namespace Service::Nvidia diff --git a/src/core/hle/service/nvflinger/binder.h b/src/core/hle/service/nvflinger/binder.h index 157333ff8..aef1477e3 100644 --- a/src/core/hle/service/nvflinger/binder.h +++ b/src/core/hle/service/nvflinger/binder.h @@ -9,10 +9,13 @@ #include "common/common_types.h" namespace Kernel { -class HLERequestContext; class KReadableEvent; } // namespace Kernel +namespace Service { +class HLERequestContext; +} + namespace Service::android { enum class TransactionId { @@ -35,8 +38,7 @@ enum class TransactionId { class IBinder { public: virtual ~IBinder() = default; - virtual void Transact(Kernel::HLERequestContext& ctx, android::TransactionId code, - u32 flags) = 0; + virtual void Transact(HLERequestContext& ctx, android::TransactionId code, u32 flags) = 0; virtual Kernel::KReadableEvent& GetNativeHandle() = 0; }; diff --git a/src/core/hle/service/nvflinger/buffer_queue_producer.cpp b/src/core/hle/service/nvflinger/buffer_queue_producer.cpp index bcbe05b0d..ad73edd66 100644 --- a/src/core/hle/service/nvflinger/buffer_queue_producer.cpp +++ b/src/core/hle/service/nvflinger/buffer_queue_producer.cpp @@ -8,10 +8,10 @@ #include "common/logging/log.h" #include "common/settings.h" #include "core/core.h" -#include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_readable_event.h" #include "core/hle/kernel/kernel.h" +#include "core/hle/service/hle_ipc.h" #include "core/hle/service/kernel_helpers.h" #include "core/hle/service/nvdrv/core/nvmap.h" #include "core/hle/service/nvflinger/buffer_queue_core.h" @@ -813,7 +813,7 @@ Status BufferQueueProducer::SetPreallocatedBuffer(s32 slot, return Status::NoError; } -void BufferQueueProducer::Transact(Kernel::HLERequestContext& ctx, TransactionId code, u32 flags) { +void BufferQueueProducer::Transact(HLERequestContext& ctx, TransactionId code, u32 flags) { Status status{Status::NoError}; InputParcel parcel_in{ctx.ReadBuffer()}; OutputParcel parcel_out{}; diff --git a/src/core/hle/service/nvflinger/buffer_queue_producer.h b/src/core/hle/service/nvflinger/buffer_queue_producer.h index 1d380480f..16189fa6f 100644 --- a/src/core/hle/service/nvflinger/buffer_queue_producer.h +++ b/src/core/hle/service/nvflinger/buffer_queue_producer.h @@ -46,7 +46,7 @@ public: Service::Nvidia::NvCore::NvMap& nvmap_); ~BufferQueueProducer(); - void Transact(Kernel::HLERequestContext& ctx, android::TransactionId code, u32 flags) override; + void Transact(HLERequestContext& ctx, android::TransactionId code, u32 flags) override; Kernel::KReadableEvent& GetNativeHandle() override; diff --git a/src/core/hle/service/olsc/olsc.cpp b/src/core/hle/service/olsc/olsc.cpp index 3493f8272..14ba67b4c 100644 --- a/src/core/hle/service/olsc/olsc.cpp +++ b/src/core/hle/service/olsc/olsc.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/olsc/olsc.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" @@ -42,7 +42,7 @@ public: } private: - void Initialize(Kernel::HLERequestContext& ctx) { + void Initialize(HLERequestContext& ctx) { LOG_WARNING(Service_OLSC, "(STUBBED) called"); initialized = true; @@ -51,7 +51,7 @@ private: rb.Push(ResultSuccess); } - void GetSaveDataBackupSetting(Kernel::HLERequestContext& ctx) { + void GetSaveDataBackupSetting(HLERequestContext& ctx) { LOG_WARNING(Service_OLSC, "(STUBBED) called"); // backup_setting is set to 0 since real value is unknown @@ -62,7 +62,7 @@ private: rb.Push(backup_setting); } - void SetSaveDataBackupSettingEnabled(Kernel::HLERequestContext& ctx) { + void SetSaveDataBackupSettingEnabled(HLERequestContext& ctx) { LOG_WARNING(Service_OLSC, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; diff --git a/src/core/hle/service/pctl/pctl_module.cpp b/src/core/hle/service/pctl/pctl_module.cpp index a4a12a78c..f966c5c8b 100644 --- a/src/core/hle/service/pctl/pctl_module.cpp +++ b/src/core/hle/service/pctl/pctl_module.cpp @@ -5,7 +5,7 @@ #include "core/core.h" #include "core/file_sys/control_metadata.h" #include "core/file_sys/patch_manager.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/pctl/pctl.h" #include "core/hle/service/pctl/pctl_module.h" #include "core/hle/service/server_manager.h" @@ -177,7 +177,7 @@ private: settings.is_stero_vision_restricted = is_restricted; } - void Initialize(Kernel::HLERequestContext& ctx) { + void Initialize(HLERequestContext& ctx) { LOG_DEBUG(Service_PCTL, "called"); IPC::ResponseBuilder rb{ctx, 2}; @@ -215,7 +215,7 @@ private: rb.Push(ResultSuccess); } - void CheckFreeCommunicationPermission(Kernel::HLERequestContext& ctx) { + void CheckFreeCommunicationPermission(HLERequestContext& ctx) { LOG_DEBUG(Service_PCTL, "called"); IPC::ResponseBuilder rb{ctx, 2}; @@ -228,7 +228,7 @@ private: states.free_communication = true; } - void ConfirmStereoVisionPermission(Kernel::HLERequestContext& ctx) { + void ConfirmStereoVisionPermission(HLERequestContext& ctx) { LOG_DEBUG(Service_PCTL, "called"); states.stereo_vision = true; @@ -236,14 +236,14 @@ private: rb.Push(ResultSuccess); } - void EndFreeCommunication(Kernel::HLERequestContext& ctx) { + void EndFreeCommunication(HLERequestContext& ctx) { LOG_WARNING(Service_PCTL, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void IsFreeCommunicationAvailable(Kernel::HLERequestContext& ctx) { + void IsFreeCommunicationAvailable(HLERequestContext& ctx) { LOG_WARNING(Service_PCTL, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; @@ -254,7 +254,7 @@ private: } } - void IsRestrictionEnabled(Kernel::HLERequestContext& ctx) { + void IsRestrictionEnabled(HLERequestContext& ctx) { LOG_DEBUG(Service_PCTL, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -268,7 +268,7 @@ private: rb.Push(pin_code[0] != '\0'); } - void ConfirmStereoVisionRestrictionConfigurable(Kernel::HLERequestContext& ctx) { + void ConfirmStereoVisionRestrictionConfigurable(HLERequestContext& ctx) { LOG_DEBUG(Service_PCTL, "called"); IPC::ResponseBuilder rb{ctx, 2}; @@ -287,7 +287,7 @@ private: rb.Push(ResultSuccess); } - void IsStereoVisionPermitted(Kernel::HLERequestContext& ctx) { + void IsStereoVisionPermitted(HLERequestContext& ctx) { LOG_DEBUG(Service_PCTL, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -300,7 +300,7 @@ private: } } - void SetStereoVisionRestriction(Kernel::HLERequestContext& ctx) { + void SetStereoVisionRestriction(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto can_use = rp.Pop(); LOG_DEBUG(Service_PCTL, "called, can_use={}", can_use); @@ -316,7 +316,7 @@ private: rb.Push(ResultSuccess); } - void GetStereoVisionRestriction(Kernel::HLERequestContext& ctx) { + void GetStereoVisionRestriction(HLERequestContext& ctx) { LOG_DEBUG(Service_PCTL, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -331,7 +331,7 @@ private: rb.Push(settings.is_stero_vision_restricted); } - void ResetConfirmedStereoVisionPermission(Kernel::HLERequestContext& ctx) { + void ResetConfirmedStereoVisionPermission(HLERequestContext& ctx) { LOG_DEBUG(Service_PCTL, "called"); states.stereo_vision = false; @@ -370,7 +370,7 @@ private: Capability capability{}; }; -void Module::Interface::CreateService(Kernel::HLERequestContext& ctx) { +void Module::Interface::CreateService(HLERequestContext& ctx) { LOG_DEBUG(Service_PCTL, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -380,7 +380,7 @@ void Module::Interface::CreateService(Kernel::HLERequestContext& ctx) { rb.PushIpcInterface(system, capability); } -void Module::Interface::CreateServiceWithoutInitialize(Kernel::HLERequestContext& ctx) { +void Module::Interface::CreateServiceWithoutInitialize(HLERequestContext& ctx) { LOG_DEBUG(Service_PCTL, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; diff --git a/src/core/hle/service/pctl/pctl_module.h b/src/core/hle/service/pctl/pctl_module.h index 4ea77ab21..dff0d3f08 100644 --- a/src/core/hle/service/pctl/pctl_module.h +++ b/src/core/hle/service/pctl/pctl_module.h @@ -31,8 +31,8 @@ public: const char* name_, Capability capability_); ~Interface() override; - void CreateService(Kernel::HLERequestContext& ctx); - void CreateServiceWithoutInitialize(Kernel::HLERequestContext& ctx); + void CreateService(HLERequestContext& ctx); + void CreateServiceWithoutInitialize(HLERequestContext& ctx); protected: std::shared_ptr module; diff --git a/src/core/hle/service/pcv/pcv.cpp b/src/core/hle/service/pcv/pcv.cpp index be64b94ea..c13ffa6f6 100644 --- a/src/core/hle/service/pcv/pcv.cpp +++ b/src/core/hle/service/pcv/pcv.cpp @@ -3,7 +3,7 @@ #include -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/pcv/pcv.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" @@ -76,7 +76,7 @@ public: } private: - void SetClockRate(Kernel::HLERequestContext& ctx) { + void SetClockRate(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; clock_rate = rp.Pop(); LOG_DEBUG(Service_PCV, "(STUBBED) called, clock_rate={}", clock_rate); @@ -85,7 +85,7 @@ private: rb.Push(ResultSuccess); } - void GetClockRate(Kernel::HLERequestContext& ctx) { + void GetClockRate(HLERequestContext& ctx) { LOG_DEBUG(Service_PCV, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -115,7 +115,7 @@ public: } private: - void OpenSession(Kernel::HLERequestContext& ctx) { + void OpenSession(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_code = static_cast(rp.Pop()); const auto unkonwn_input = rp.Pop(); diff --git a/src/core/hle/service/pm/pm.cpp b/src/core/hle/service/pm/pm.cpp index 02a4ca13b..ea249c26f 100644 --- a/src/core/hle/service/pm/pm.cpp +++ b/src/core/hle/service/pm/pm.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_process.h" #include "core/hle/kernel/kernel.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/pm/pm.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" @@ -34,7 +34,7 @@ std::optional SearchProcessList( return *iter; } -void GetApplicationPidGeneric(Kernel::HLERequestContext& ctx, +void GetApplicationPidGeneric(HLERequestContext& ctx, const std::vector& process_list) { const auto process = SearchProcessList(process_list, [](const auto& proc) { return proc->GetProcessID() == Kernel::KProcess::ProcessIDMin; @@ -58,7 +58,7 @@ public: } private: - void GetBootMode(Kernel::HLERequestContext& ctx) { + void GetBootMode(HLERequestContext& ctx) { LOG_DEBUG(Service_PM, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -66,7 +66,7 @@ private: rb.PushEnum(boot_mode); } - void SetMaintenanceBoot(Kernel::HLERequestContext& ctx) { + void SetMaintenanceBoot(HLERequestContext& ctx) { LOG_DEBUG(Service_PM, "called"); boot_mode = SystemBootMode::Maintenance; @@ -100,7 +100,7 @@ public: } private: - void GetProcessId(Kernel::HLERequestContext& ctx) { + void GetProcessId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto program_id = rp.PopRaw(); @@ -122,12 +122,12 @@ private: rb.Push((*process)->GetProcessID()); } - void GetApplicationProcessId(Kernel::HLERequestContext& ctx) { + void GetApplicationProcessId(HLERequestContext& ctx) { LOG_DEBUG(Service_PM, "called"); GetApplicationPidGeneric(ctx, kernel.GetProcessList()); } - void AtmosphereGetProcessInfo(Kernel::HLERequestContext& ctx) { + void AtmosphereGetProcessInfo(HLERequestContext& ctx) { // https://github.com/Atmosphere-NX/Atmosphere/blob/master/stratosphere/pm/source/impl/pm_process_manager.cpp#L614 // This implementation is incomplete; only a handle to the process is returned. IPC::RequestParser rp{ctx}; @@ -187,7 +187,7 @@ public: } private: - void GetProgramId(Kernel::HLERequestContext& ctx) { + void GetProgramId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto process_id = rp.PopRaw(); @@ -208,7 +208,7 @@ private: rb.Push((*process)->GetProgramID()); } - void AtmosphereGetProcessId(Kernel::HLERequestContext& ctx) { + void AtmosphereGetProcessId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto program_id = rp.PopRaw(); @@ -255,7 +255,7 @@ public: } private: - void GetApplicationProcessIdForShell(Kernel::HLERequestContext& ctx) { + void GetApplicationProcessIdForShell(HLERequestContext& ctx) { LOG_DEBUG(Service_PM, "called"); GetApplicationPidGeneric(ctx, kernel.GetProcessList()); } diff --git a/src/core/hle/service/prepo/prepo.cpp b/src/core/hle/service/prepo/prepo.cpp index 02af311e8..ec4a84989 100644 --- a/src/core/hle/service/prepo/prepo.cpp +++ b/src/core/hle/service/prepo/prepo.cpp @@ -4,8 +4,8 @@ #include "common/hex_util.h" #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/acc/profile_manager.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/prepo/prepo.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" @@ -54,7 +54,7 @@ public: private: template - void SaveReport(Kernel::HLERequestContext& ctx) { + void SaveReport(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto process_id = rp.PopRaw(); @@ -80,7 +80,7 @@ private: } template - void SaveReportWithUser(Kernel::HLERequestContext& ctx) { + void SaveReportWithUser(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto user_id = rp.PopRaw(); const auto process_id = rp.PopRaw(); @@ -107,14 +107,14 @@ private: rb.Push(ResultSuccess); } - void RequestImmediateTransmission(Kernel::HLERequestContext& ctx) { + void RequestImmediateTransmission(HLERequestContext& ctx) { LOG_WARNING(Service_PREPO, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void GetTransmissionStatus(Kernel::HLERequestContext& ctx) { + void GetTransmissionStatus(HLERequestContext& ctx) { LOG_WARNING(Service_PREPO, "(STUBBED) called"); constexpr s32 status = 0; @@ -124,7 +124,7 @@ private: rb.Push(status); } - void GetSystemSessionId(Kernel::HLERequestContext& ctx) { + void GetSystemSessionId(HLERequestContext& ctx) { LOG_WARNING(Service_PREPO, "(STUBBED) called"); constexpr u64 system_session_id = 0; @@ -133,7 +133,7 @@ private: rb.Push(system_session_id); } - void SaveSystemReport(Kernel::HLERequestContext& ctx) { + void SaveSystemReport(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto title_id = rp.PopRaw(); @@ -156,7 +156,7 @@ private: rb.Push(ResultSuccess); } - void SaveSystemReportWithUser(Kernel::HLERequestContext& ctx) { + void SaveSystemReportWithUser(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto user_id = rp.PopRaw(); const auto title_id = rp.PopRaw(); diff --git a/src/core/hle/service/psc/psc.cpp b/src/core/hle/service/psc/psc.cpp index 1650d2f39..25702703e 100644 --- a/src/core/hle/service/psc/psc.cpp +++ b/src/core/hle/service/psc/psc.cpp @@ -4,7 +4,7 @@ #include #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/psc/psc.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" @@ -62,7 +62,7 @@ public: } private: - void GetPmModule(Kernel::HLERequestContext& ctx) { + void GetPmModule(HLERequestContext& ctx) { LOG_DEBUG(Service_PSC, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; diff --git a/src/core/hle/service/ptm/psm.cpp b/src/core/hle/service/ptm/psm.cpp index 1ac97fe31..136313d7b 100644 --- a/src/core/hle/service/ptm/psm.cpp +++ b/src/core/hle/service/ptm/psm.cpp @@ -5,8 +5,8 @@ #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/kernel_helpers.h" #include "core/hle/service/ptm/psm.h" @@ -54,7 +54,7 @@ public: } private: - void BindStateChangeEvent(Kernel::HLERequestContext& ctx) { + void BindStateChangeEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_PTM, "called"); should_signal = true; @@ -64,7 +64,7 @@ private: rb.PushCopyObjects(state_change_event->GetReadableEvent()); } - void UnbindStateChangeEvent(Kernel::HLERequestContext& ctx) { + void UnbindStateChangeEvent(HLERequestContext& ctx) { LOG_DEBUG(Service_PTM, "called"); should_signal = false; @@ -73,7 +73,7 @@ private: rb.Push(ResultSuccess); } - void SetChargerTypeChangeEventEnabled(Kernel::HLERequestContext& ctx) { + void SetChargerTypeChangeEventEnabled(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto state = rp.Pop(); LOG_DEBUG(Service_PTM, "called, state={}", state); @@ -84,7 +84,7 @@ private: rb.Push(ResultSuccess); } - void SetPowerSupplyChangeEventEnabled(Kernel::HLERequestContext& ctx) { + void SetPowerSupplyChangeEventEnabled(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto state = rp.Pop(); LOG_DEBUG(Service_PTM, "called, state={}", state); @@ -95,7 +95,7 @@ private: rb.Push(ResultSuccess); } - void SetBatteryVoltageStateChangeEventEnabled(Kernel::HLERequestContext& ctx) { + void SetBatteryVoltageStateChangeEventEnabled(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto state = rp.Pop(); LOG_DEBUG(Service_PTM, "called, state={}", state); @@ -145,7 +145,7 @@ PSM::PSM(Core::System& system_) : ServiceFramework{system_, "psm"} { PSM::~PSM() = default; -void PSM::GetBatteryChargePercentage(Kernel::HLERequestContext& ctx) { +void PSM::GetBatteryChargePercentage(HLERequestContext& ctx) { LOG_DEBUG(Service_PTM, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -153,7 +153,7 @@ void PSM::GetBatteryChargePercentage(Kernel::HLERequestContext& ctx) { rb.Push(battery_charge_percentage); } -void PSM::GetChargerType(Kernel::HLERequestContext& ctx) { +void PSM::GetChargerType(HLERequestContext& ctx) { LOG_DEBUG(Service_PTM, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -161,7 +161,7 @@ void PSM::GetChargerType(Kernel::HLERequestContext& ctx) { rb.PushEnum(charger_type); } -void PSM::OpenSession(Kernel::HLERequestContext& ctx) { +void PSM::OpenSession(HLERequestContext& ctx) { LOG_DEBUG(Service_PTM, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; diff --git a/src/core/hle/service/ptm/psm.h b/src/core/hle/service/ptm/psm.h index f674ba8bc..fa47919e5 100644 --- a/src/core/hle/service/ptm/psm.h +++ b/src/core/hle/service/ptm/psm.h @@ -20,9 +20,9 @@ private: Unknown = 3, }; - void GetBatteryChargePercentage(Kernel::HLERequestContext& ctx); - void GetChargerType(Kernel::HLERequestContext& ctx); - void OpenSession(Kernel::HLERequestContext& ctx); + void GetBatteryChargePercentage(HLERequestContext& ctx); + void GetChargerType(HLERequestContext& ctx); + void OpenSession(HLERequestContext& ctx); u32 battery_charge_percentage{100}; ChargerType charger_type{ChargerType::RegularCharger}; diff --git a/src/core/hle/service/ptm/ts.cpp b/src/core/hle/service/ptm/ts.cpp index b1a0a5544..ca064dd90 100644 --- a/src/core/hle/service/ptm/ts.cpp +++ b/src/core/hle/service/ptm/ts.cpp @@ -4,7 +4,7 @@ #include #include "core/core.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/ptm/ts.h" namespace Service::PTM { @@ -25,7 +25,7 @@ TS::TS(Core::System& system_) : ServiceFramework{system_, "ts"} { TS::~TS() = default; -void TS::GetTemperature(Kernel::HLERequestContext& ctx) { +void TS::GetTemperature(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto location{rp.PopEnum()}; @@ -36,7 +36,7 @@ void TS::GetTemperature(Kernel::HLERequestContext& ctx) { rb.Push(temperature); } -void TS::GetTemperatureMilliC(Kernel::HLERequestContext& ctx) { +void TS::GetTemperatureMilliC(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto location{rp.PopEnum()}; diff --git a/src/core/hle/service/ptm/ts.h b/src/core/hle/service/ptm/ts.h index 39d51847e..c3f43d5a3 100644 --- a/src/core/hle/service/ptm/ts.h +++ b/src/core/hle/service/ptm/ts.h @@ -19,8 +19,8 @@ private: External, }; - void GetTemperature(Kernel::HLERequestContext& ctx); - void GetTemperatureMilliC(Kernel::HLERequestContext& ctx); + void GetTemperature(HLERequestContext& ctx); + void GetTemperatureMilliC(HLERequestContext& ctx); }; } // namespace Service::PTM diff --git a/src/core/hle/service/server_manager.cpp b/src/core/hle/service/server_manager.cpp index 1b3db3caf..c91f6d880 100644 --- a/src/core/hle/service/server_manager.cpp +++ b/src/core/hle/service/server_manager.cpp @@ -4,8 +4,6 @@ #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" -#include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/k_client_port.h" #include "core/hle/kernel/k_client_session.h" #include "core/hle/kernel/k_event.h" @@ -15,6 +13,8 @@ #include "core/hle/kernel/k_server_session.h" #include "core/hle/kernel/k_synchronization_object.h" #include "core/hle/kernel/svc_results.h" +#include "core/hle/service/hle_ipc.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/sm/sm.h" @@ -73,7 +73,7 @@ void ServerManager::RunServer(std::unique_ptr&& server_manager) { } Result ServerManager::RegisterSession(Kernel::KServerSession* session, - std::shared_ptr manager) { + std::shared_ptr manager) { ASSERT(m_sessions.size() + m_ports.size() < MaximumWaitObjects); // We are taking ownership of the server session, so don't open it. @@ -90,7 +90,7 @@ Result ServerManager::RegisterSession(Kernel::KServerSession* session, } Result ServerManager::RegisterNamedService(const std::string& service_name, - std::shared_ptr&& handler, + std::shared_ptr&& handler, u32 max_sessions) { ASSERT(m_sessions.size() + m_ports.size() < MaximumWaitObjects); @@ -118,7 +118,7 @@ Result ServerManager::RegisterNamedService(const std::string& service_name, } Result ServerManager::ManageNamedPort(const std::string& service_name, - std::shared_ptr&& handler, + std::shared_ptr&& handler, u32 max_sessions) { ASSERT(m_sessions.size() + m_ports.size() < MaximumWaitObjects); @@ -265,7 +265,7 @@ Result ServerManager::WaitAndProcessImpl() { case HandleType::Port: { // Port signaled. auto* port = wait_obj->DynamicCast(); - std::shared_ptr handler; + std::shared_ptr handler; // Remove from tracking. { @@ -284,7 +284,7 @@ Result ServerManager::WaitAndProcessImpl() { case HandleType::Session: { // Session signaled. auto* session = wait_obj->DynamicCast(); - std::shared_ptr manager; + std::shared_ptr manager; // Remove from tracking. { @@ -329,13 +329,13 @@ Result ServerManager::WaitAndProcessImpl() { } Result ServerManager::OnPortEvent(Kernel::KServerPort* port, - std::shared_ptr&& handler) { + std::shared_ptr&& handler) { // Accept a new server session. Kernel::KServerSession* session = port->AcceptSession(); ASSERT(session != nullptr); // Create the session manager and install the handler. - auto manager = std::make_shared(m_system.Kernel(), *this); + auto manager = std::make_shared(m_system.Kernel(), *this); manager->SetSessionHandler(std::shared_ptr(handler)); // Track the server session. @@ -353,11 +353,11 @@ Result ServerManager::OnPortEvent(Kernel::KServerPort* port, } Result ServerManager::OnSessionEvent(Kernel::KServerSession* session, - std::shared_ptr&& manager) { + std::shared_ptr&& manager) { Result rc{ResultSuccess}; // Try to receive a message. - std::shared_ptr context; + std::shared_ptr context; rc = session->ReceiveRequest(&context, manager); // If the session has been closed, we're done. diff --git a/src/core/hle/service/server_manager.h b/src/core/hle/service/server_manager.h index 57b954ae8..fdb8af2ff 100644 --- a/src/core/hle/service/server_manager.h +++ b/src/core/hle/service/server_manager.h @@ -20,30 +20,30 @@ class System; } namespace Kernel { -class HLERequestContext; class KEvent; class KServerPort; class KServerSession; class KSynchronizationObject; -class SessionRequestHandler; -class SessionRequestManager; } // namespace Kernel namespace Service { +class HLERequestContext; +class SessionRequestHandler; +class SessionRequestManager; + class ServerManager { public: explicit ServerManager(Core::System& system); ~ServerManager(); Result RegisterSession(Kernel::KServerSession* session, - std::shared_ptr manager); + std::shared_ptr manager); Result RegisterNamedService(const std::string& service_name, - std::shared_ptr&& handler, + std::shared_ptr&& handler, u32 max_sessions = 64); Result ManageNamedPort(const std::string& service_name, - std::shared_ptr&& handler, - u32 max_sessions = 64); + std::shared_ptr&& handler, u32 max_sessions = 64); Result ManageDeferral(Kernel::KEvent** out_event); Result LoopProcess(); @@ -56,10 +56,9 @@ private: Result LoopProcessImpl(); Result WaitAndProcessImpl(); - Result OnPortEvent(Kernel::KServerPort* port, - std::shared_ptr&& handler); + Result OnPortEvent(Kernel::KServerPort* port, std::shared_ptr&& handler); Result OnSessionEvent(Kernel::KServerSession* session, - std::shared_ptr&& manager); + std::shared_ptr&& manager); Result OnDeferralEvent(std::list&& deferrals); Result CompleteSyncRequest(RequestState&& state); @@ -69,16 +68,16 @@ private: std::mutex m_list_mutex; // Guest state tracking - std::map> m_ports{}; - std::map> m_sessions{}; + std::map> m_ports{}; + std::map> m_sessions{}; Kernel::KEvent* m_event{}; Kernel::KEvent* m_deferral_event{}; // Deferral tracking struct RequestState { Kernel::KServerSession* session; - std::shared_ptr context; - std::shared_ptr manager; + std::shared_ptr context; + std::shared_ptr manager; }; std::list m_deferrals{}; diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 31021ea03..6415fc310 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -7,7 +7,6 @@ #include "common/settings.h" #include "core/core.h" #include "core/hle/ipc.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_process.h" #include "core/hle/kernel/k_server_port.h" #include "core/hle/kernel/kernel.h" @@ -31,6 +30,7 @@ #include "core/hle/service/glue/glue.h" #include "core/hle/service/grc/grc.h" #include "core/hle/service/hid/hid.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/jit/jit.h" #include "core/hle/service/lbl/lbl.h" #include "core/hle/service/ldn/ldn.h" @@ -117,7 +117,7 @@ void ServiceFrameworkBase::RegisterHandlersBaseTipc(const FunctionInfoBase* func } } -void ServiceFrameworkBase::ReportUnimplementedFunction(Kernel::HLERequestContext& ctx, +void ServiceFrameworkBase::ReportUnimplementedFunction(HLERequestContext& ctx, const FunctionInfoBase* info) { auto cmd_buf = ctx.CommandBuffer(); std::string function_name = info == nullptr ? fmt::format("{}", ctx.GetCommand()) : info->name; @@ -140,7 +140,7 @@ void ServiceFrameworkBase::ReportUnimplementedFunction(Kernel::HLERequestContext } } -void ServiceFrameworkBase::InvokeRequest(Kernel::HLERequestContext& ctx) { +void ServiceFrameworkBase::InvokeRequest(HLERequestContext& ctx) { auto itr = handlers.find(ctx.GetCommand()); const FunctionInfoBase* info = itr == handlers.end() ? nullptr : &itr->second; if (info == nullptr || info->handler_callback == nullptr) { @@ -151,7 +151,7 @@ void ServiceFrameworkBase::InvokeRequest(Kernel::HLERequestContext& ctx) { handler_invoker(this, info->handler_callback, ctx); } -void ServiceFrameworkBase::InvokeRequestTipc(Kernel::HLERequestContext& ctx) { +void ServiceFrameworkBase::InvokeRequestTipc(HLERequestContext& ctx) { boost::container::flat_map::iterator itr; itr = handlers_tipc.find(ctx.GetCommand()); @@ -166,7 +166,7 @@ void ServiceFrameworkBase::InvokeRequestTipc(Kernel::HLERequestContext& ctx) { } Result ServiceFrameworkBase::HandleSyncRequest(Kernel::KServerSession& session, - Kernel::HLERequestContext& ctx) { + HLERequestContext& ctx) { const auto guard = LockService(); Result result = ResultSuccess; diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index db3b31378..06226409a 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h @@ -8,7 +8,7 @@ #include #include #include "common/common_types.h" -#include "core/hle/kernel/hle_ipc.h" +#include "core/hle/service/hle_ipc.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // Namespace Service @@ -18,7 +18,6 @@ class System; } namespace Kernel { -class HLERequestContext; class KServerSession; class ServiceThread; } // namespace Kernel @@ -50,7 +49,7 @@ static_assert(ServerSessionCountMax == 0x40, * * @see ServiceFramework */ -class ServiceFrameworkBase : public Kernel::SessionRequestHandler { +class ServiceFrameworkBase : public SessionRequestHandler { public: /// Returns the string identifier used to connect to the service. std::string GetServiceName() const { @@ -66,19 +65,18 @@ public: } /// Invokes a service request routine using the HIPC protocol. - void InvokeRequest(Kernel::HLERequestContext& ctx); + void InvokeRequest(HLERequestContext& ctx); /// Invokes a service request routine using the HIPC protocol. - void InvokeRequestTipc(Kernel::HLERequestContext& ctx); + void InvokeRequestTipc(HLERequestContext& ctx); /// Handles a synchronization request for the service. - Result HandleSyncRequest(Kernel::KServerSession& session, - Kernel::HLERequestContext& context) override; + Result HandleSyncRequest(Kernel::KServerSession& session, HLERequestContext& context) override; protected: /// Member-function pointer type of SyncRequest handlers. template - using HandlerFnP = void (Self::*)(Kernel::HLERequestContext&); + using HandlerFnP = void (Self::*)(HLERequestContext&); /// Used to gain exclusive access to the service members, e.g. from CoreTiming thread. [[nodiscard]] std::scoped_lock LockService() { @@ -102,7 +100,7 @@ private: }; using InvokerFn = void(ServiceFrameworkBase* object, HandlerFnP member, - Kernel::HLERequestContext& ctx); + HLERequestContext& ctx); explicit ServiceFrameworkBase(Core::System& system_, const char* service_name_, u32 max_sessions_, InvokerFn* handler_invoker_); @@ -110,7 +108,7 @@ private: void RegisterHandlersBase(const FunctionInfoBase* functions, std::size_t n); void RegisterHandlersBaseTipc(const FunctionInfoBase* functions, std::size_t n); - void ReportUnimplementedFunction(Kernel::HLERequestContext& ctx, const FunctionInfoBase* info); + void ReportUnimplementedFunction(HLERequestContext& ctx, const FunctionInfoBase* info); /// Maximum number of concurrent sessions that this service can handle. u32 max_sessions; @@ -212,7 +210,7 @@ private: * of the derived class in order to invoke one of it's functions through a pointer. */ static void Invoker(ServiceFrameworkBase* object, HandlerFnP member, - Kernel::HLERequestContext& ctx) { + HLERequestContext& ctx) { // Cast back up to our original types and call the member function (static_cast(object)->*static_cast>(member))(ctx); } diff --git a/src/core/hle/service/set/set.cpp b/src/core/hle/service/set/set.cpp index 16c5eaf75..88df52331 100644 --- a/src/core/hle/service/set/set.cpp +++ b/src/core/hle/service/set/set.cpp @@ -6,7 +6,7 @@ #include #include "common/logging/log.h" #include "common/settings.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/set/set.h" namespace Service::Set { @@ -76,13 +76,13 @@ constexpr std::size_t POST_4_0_0_MAX_ENTRIES = 0x40; constexpr Result ERR_INVALID_LANGUAGE{ErrorModule::Settings, 625}; -void PushResponseLanguageCode(Kernel::HLERequestContext& ctx, std::size_t num_language_codes) { +void PushResponseLanguageCode(HLERequestContext& ctx, std::size_t num_language_codes) { IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); rb.Push(static_cast(num_language_codes)); } -void GetAvailableLanguageCodesImpl(Kernel::HLERequestContext& ctx, std::size_t max_entries) { +void GetAvailableLanguageCodesImpl(HLERequestContext& ctx, std::size_t max_entries) { const std::size_t requested_amount = ctx.GetWriteBufferNumElements(); const std::size_t max_amount = std::min(requested_amount, max_entries); const std::size_t copy_amount = std::min(available_language_codes.size(), max_amount); @@ -92,7 +92,7 @@ void GetAvailableLanguageCodesImpl(Kernel::HLERequestContext& ctx, std::size_t m PushResponseLanguageCode(ctx, copy_amount); } -void GetKeyCodeMapImpl(Kernel::HLERequestContext& ctx) { +void GetKeyCodeMapImpl(HLERequestContext& ctx) { const auto language_code = available_language_codes[Settings::values.language_index.GetValue()]; const auto key_code = std::find_if(language_to_layout.cbegin(), language_to_layout.cend(), @@ -117,13 +117,13 @@ LanguageCode GetLanguageCodeFromIndex(std::size_t index) { return available_language_codes.at(index); } -void SET::GetAvailableLanguageCodes(Kernel::HLERequestContext& ctx) { +void SET::GetAvailableLanguageCodes(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "called"); GetAvailableLanguageCodesImpl(ctx, PRE_4_0_0_MAX_ENTRIES); } -void SET::MakeLanguageCode(Kernel::HLERequestContext& ctx) { +void SET::MakeLanguageCode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto index = rp.Pop(); @@ -139,25 +139,25 @@ void SET::MakeLanguageCode(Kernel::HLERequestContext& ctx) { rb.PushEnum(available_language_codes[index]); } -void SET::GetAvailableLanguageCodes2(Kernel::HLERequestContext& ctx) { +void SET::GetAvailableLanguageCodes2(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "called"); GetAvailableLanguageCodesImpl(ctx, POST_4_0_0_MAX_ENTRIES); } -void SET::GetAvailableLanguageCodeCount(Kernel::HLERequestContext& ctx) { +void SET::GetAvailableLanguageCodeCount(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "called"); PushResponseLanguageCode(ctx, PRE_4_0_0_MAX_ENTRIES); } -void SET::GetAvailableLanguageCodeCount2(Kernel::HLERequestContext& ctx) { +void SET::GetAvailableLanguageCodeCount2(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "called"); PushResponseLanguageCode(ctx, POST_4_0_0_MAX_ENTRIES); } -void SET::GetQuestFlag(Kernel::HLERequestContext& ctx) { +void SET::GetQuestFlag(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -165,7 +165,7 @@ void SET::GetQuestFlag(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(Settings::values.quest_flag.GetValue())); } -void SET::GetLanguageCode(Kernel::HLERequestContext& ctx) { +void SET::GetLanguageCode(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "called {}", Settings::values.language_index.GetValue()); IPC::ResponseBuilder rb{ctx, 4}; @@ -173,7 +173,7 @@ void SET::GetLanguageCode(Kernel::HLERequestContext& ctx) { rb.PushEnum(available_language_codes[Settings::values.language_index.GetValue()]); } -void SET::GetRegionCode(Kernel::HLERequestContext& ctx) { +void SET::GetRegionCode(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -181,17 +181,17 @@ void SET::GetRegionCode(Kernel::HLERequestContext& ctx) { rb.Push(Settings::values.region_index.GetValue()); } -void SET::GetKeyCodeMap(Kernel::HLERequestContext& ctx) { +void SET::GetKeyCodeMap(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "Called {}", ctx.Description()); GetKeyCodeMapImpl(ctx); } -void SET::GetKeyCodeMap2(Kernel::HLERequestContext& ctx) { +void SET::GetKeyCodeMap2(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "Called {}", ctx.Description()); GetKeyCodeMapImpl(ctx); } -void SET::GetDeviceNickName(Kernel::HLERequestContext& ctx) { +void SET::GetDeviceNickName(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/set/set.h b/src/core/hle/service/set/set.h index 375975711..7fd3a7654 100644 --- a/src/core/hle/service/set/set.h +++ b/src/core/hle/service/set/set.h @@ -40,17 +40,17 @@ public: ~SET() override; private: - void GetLanguageCode(Kernel::HLERequestContext& ctx); - void GetAvailableLanguageCodes(Kernel::HLERequestContext& ctx); - void MakeLanguageCode(Kernel::HLERequestContext& ctx); - void GetAvailableLanguageCodes2(Kernel::HLERequestContext& ctx); - void GetAvailableLanguageCodeCount(Kernel::HLERequestContext& ctx); - void GetAvailableLanguageCodeCount2(Kernel::HLERequestContext& ctx); - void GetQuestFlag(Kernel::HLERequestContext& ctx); - void GetRegionCode(Kernel::HLERequestContext& ctx); - void GetKeyCodeMap(Kernel::HLERequestContext& ctx); - void GetKeyCodeMap2(Kernel::HLERequestContext& ctx); - void GetDeviceNickName(Kernel::HLERequestContext& ctx); + void GetLanguageCode(HLERequestContext& ctx); + void GetAvailableLanguageCodes(HLERequestContext& ctx); + void MakeLanguageCode(HLERequestContext& ctx); + void GetAvailableLanguageCodes2(HLERequestContext& ctx); + void GetAvailableLanguageCodeCount(HLERequestContext& ctx); + void GetAvailableLanguageCodeCount2(HLERequestContext& ctx); + void GetQuestFlag(HLERequestContext& ctx); + void GetRegionCode(HLERequestContext& ctx); + void GetKeyCodeMap(HLERequestContext& ctx); + void GetKeyCodeMap2(HLERequestContext& ctx); + void GetDeviceNickName(HLERequestContext& ctx); }; } // namespace Service::Set diff --git a/src/core/hle/service/set/set_sys.cpp b/src/core/hle/service/set/set_sys.cpp index 94c20edda..2e38d1cfc 100644 --- a/src/core/hle/service/set/set_sys.cpp +++ b/src/core/hle/service/set/set_sys.cpp @@ -6,8 +6,8 @@ #include "common/settings.h" #include "core/file_sys/errors.h" #include "core/file_sys/system_archive/system_version.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/service/filesystem/filesystem.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/set/set_sys.h" namespace Service::Set { @@ -20,7 +20,7 @@ enum class GetFirmwareVersionType { Version2, }; -void GetFirmwareVersionImpl(Kernel::HLERequestContext& ctx, GetFirmwareVersionType type) { +void GetFirmwareVersionImpl(HLERequestContext& ctx, GetFirmwareVersionType type) { LOG_WARNING(Service_SET, "called - Using hardcoded firmware version '{}'", FileSys::SystemArchive::GetLongDisplayVersion()); @@ -73,17 +73,17 @@ void GetFirmwareVersionImpl(Kernel::HLERequestContext& ctx, GetFirmwareVersionTy } } // Anonymous namespace -void SET_SYS::GetFirmwareVersion(Kernel::HLERequestContext& ctx) { +void SET_SYS::GetFirmwareVersion(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "called"); GetFirmwareVersionImpl(ctx, GetFirmwareVersionType::Version1); } -void SET_SYS::GetFirmwareVersion2(Kernel::HLERequestContext& ctx) { +void SET_SYS::GetFirmwareVersion2(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "called"); GetFirmwareVersionImpl(ctx, GetFirmwareVersionType::Version2); } -void SET_SYS::GetColorSetId(Kernel::HLERequestContext& ctx) { +void SET_SYS::GetColorSetId(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -92,7 +92,7 @@ void SET_SYS::GetColorSetId(Kernel::HLERequestContext& ctx) { rb.PushEnum(color_set); } -void SET_SYS::SetColorSetId(Kernel::HLERequestContext& ctx) { +void SET_SYS::SetColorSetId(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "called"); IPC::RequestParser rp{ctx}; @@ -126,7 +126,7 @@ static Settings GetSettings() { return ret; } -void SET_SYS::GetSettingsItemValueSize(Kernel::HLERequestContext& ctx) { +void SET_SYS::GetSettingsItemValueSize(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "called"); // The category of the setting. This corresponds to the top-level keys of @@ -151,7 +151,7 @@ void SET_SYS::GetSettingsItemValueSize(Kernel::HLERequestContext& ctx) { rb.Push(response_size); } -void SET_SYS::GetSettingsItemValue(Kernel::HLERequestContext& ctx) { +void SET_SYS::GetSettingsItemValue(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "called"); // The category of the setting. This corresponds to the top-level keys of @@ -177,7 +177,7 @@ void SET_SYS::GetSettingsItemValue(Kernel::HLERequestContext& ctx) { rb.Push(response); } -void SET_SYS::GetDeviceNickName(Kernel::HLERequestContext& ctx) { +void SET_SYS::GetDeviceNickName(HLERequestContext& ctx) { LOG_DEBUG(Service_SET, "called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/set/set_sys.h b/src/core/hle/service/set/set_sys.h index 464ac3da1..1efbcc97a 100644 --- a/src/core/hle/service/set/set_sys.h +++ b/src/core/hle/service/set/set_sys.h @@ -23,13 +23,13 @@ private: BasicBlack = 1, }; - void GetSettingsItemValueSize(Kernel::HLERequestContext& ctx); - void GetSettingsItemValue(Kernel::HLERequestContext& ctx); - void GetFirmwareVersion(Kernel::HLERequestContext& ctx); - void GetFirmwareVersion2(Kernel::HLERequestContext& ctx); - void GetColorSetId(Kernel::HLERequestContext& ctx); - void SetColorSetId(Kernel::HLERequestContext& ctx); - void GetDeviceNickName(Kernel::HLERequestContext& ctx); + void GetSettingsItemValueSize(HLERequestContext& ctx); + void GetSettingsItemValue(HLERequestContext& ctx); + void GetFirmwareVersion(HLERequestContext& ctx); + void GetFirmwareVersion2(HLERequestContext& ctx); + void GetColorSetId(HLERequestContext& ctx); + void SetColorSetId(HLERequestContext& ctx); + void GetDeviceNickName(HLERequestContext& ctx); ColorSet color_set = ColorSet::BasicWhite; }; diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index 53c877836..a46f47d3e 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -5,13 +5,13 @@ #include "common/assert.h" #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_client_port.h" #include "core/hle/kernel/k_client_session.h" #include "core/hle/kernel/k_port.h" #include "core/hle/kernel/k_scoped_resource_reservation.h" #include "core/hle/kernel/k_server_port.h" #include "core/hle/result.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/sm/sm.h" #include "core/hle/service/sm/sm_controller.h" @@ -38,7 +38,7 @@ ServiceManager::~ServiceManager() { } } -void ServiceManager::InvokeControlRequest(Kernel::HLERequestContext& context) { +void ServiceManager::InvokeControlRequest(HLERequestContext& context) { controller_interface->InvokeRequest(context); } @@ -51,7 +51,7 @@ static Result ValidateServiceName(const std::string& name) { } Result ServiceManager::RegisterService(std::string name, u32 max_sessions, - Kernel::SessionRequestHandlerPtr handler) { + SessionRequestHandlerPtr handler) { CASCADE_CODE(ValidateServiceName(name)); @@ -109,7 +109,7 @@ ResultVal ServiceManager::GetServicePort(const std::string& name * Outputs: * 0: Result */ -void SM::Initialize(Kernel::HLERequestContext& ctx) { +void SM::Initialize(HLERequestContext& ctx) { LOG_DEBUG(Service_SM, "called"); ctx.GetManager()->SetIsInitializedForSm(); @@ -118,7 +118,7 @@ void SM::Initialize(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void SM::GetService(Kernel::HLERequestContext& ctx) { +void SM::GetService(HLERequestContext& ctx) { auto result = GetServiceImpl(ctx); if (ctx.GetIsDeferred()) { // Don't overwrite the command buffer. @@ -135,7 +135,7 @@ void SM::GetService(Kernel::HLERequestContext& ctx) { } } -void SM::GetServiceTipc(Kernel::HLERequestContext& ctx) { +void SM::GetServiceTipc(HLERequestContext& ctx) { auto result = GetServiceImpl(ctx); if (ctx.GetIsDeferred()) { // Don't overwrite the command buffer. @@ -158,7 +158,7 @@ static std::string PopServiceName(IPC::RequestParser& rp) { return result; } -ResultVal SM::GetServiceImpl(Kernel::HLERequestContext& ctx) { +ResultVal SM::GetServiceImpl(HLERequestContext& ctx) { if (!ctx.GetManager()->GetIsInitializedForSm()) { return ERR_NOT_INITIALIZED; } @@ -192,7 +192,7 @@ ResultVal SM::GetServiceImpl(Kernel::HLERequestContext& return session; } -void SM::RegisterService(Kernel::HLERequestContext& ctx) { +void SM::RegisterService(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; std::string name(PopServiceName(rp)); @@ -219,7 +219,7 @@ void SM::RegisterService(Kernel::HLERequestContext& ctx) { rb.PushMoveObjects(port->GetServerPort()); } -void SM::UnregisterService(Kernel::HLERequestContext& ctx) { +void SM::UnregisterService(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; std::string name(PopServiceName(rp)); diff --git a/src/core/hle/service/sm/sm.h b/src/core/hle/service/sm/sm.h index 8dbf2c767..6697f4007 100644 --- a/src/core/hle/service/sm/sm.h +++ b/src/core/hle/service/sm/sm.h @@ -36,13 +36,13 @@ public: ~SM() override; private: - void Initialize(Kernel::HLERequestContext& ctx); - void GetService(Kernel::HLERequestContext& ctx); - void GetServiceTipc(Kernel::HLERequestContext& ctx); - void RegisterService(Kernel::HLERequestContext& ctx); - void UnregisterService(Kernel::HLERequestContext& ctx); + void Initialize(HLERequestContext& ctx); + void GetService(HLERequestContext& ctx); + void GetServiceTipc(HLERequestContext& ctx); + void RegisterService(HLERequestContext& ctx); + void UnregisterService(HLERequestContext& ctx); - ResultVal GetServiceImpl(Kernel::HLERequestContext& ctx); + ResultVal GetServiceImpl(HLERequestContext& ctx); ServiceManager& service_manager; Kernel::KernelCore& kernel; @@ -53,12 +53,11 @@ public: explicit ServiceManager(Kernel::KernelCore& kernel_); ~ServiceManager(); - Result RegisterService(std::string name, u32 max_sessions, - Kernel::SessionRequestHandlerPtr handler); + Result RegisterService(std::string name, u32 max_sessions, SessionRequestHandlerPtr handler); Result UnregisterService(const std::string& name); ResultVal GetServicePort(const std::string& name); - template T> + template T> std::shared_ptr GetService(const std::string& service_name) const { auto service = registered_services.find(service_name); if (service == registered_services.end()) { @@ -68,7 +67,7 @@ public: return std::static_pointer_cast(service->second); } - void InvokeControlRequest(Kernel::HLERequestContext& context); + void InvokeControlRequest(HLERequestContext& context); void SetDeferralEvent(Kernel::KEvent* deferral_event_) { deferral_event = deferral_event_; @@ -80,7 +79,7 @@ private: /// Map of registered services, retrieved using GetServicePort. std::mutex lock; - std::unordered_map registered_services; + std::unordered_map registered_services; std::unordered_map service_ports; /// Kernel context diff --git a/src/core/hle/service/sm/sm_controller.cpp b/src/core/hle/service/sm/sm_controller.cpp index f52522d1d..0111c8d7f 100644 --- a/src/core/hle/service/sm/sm_controller.cpp +++ b/src/core/hle/service/sm/sm_controller.cpp @@ -4,18 +4,18 @@ #include "common/assert.h" #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_client_port.h" #include "core/hle/kernel/k_port.h" #include "core/hle/kernel/k_scoped_resource_reservation.h" #include "core/hle/kernel/k_server_session.h" #include "core/hle/kernel/k_session.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/sm/sm_controller.h" namespace Service::SM { -void Controller::ConvertCurrentObjectToDomain(Kernel::HLERequestContext& ctx) { +void Controller::ConvertCurrentObjectToDomain(HLERequestContext& ctx) { ASSERT_MSG(!ctx.GetManager()->IsDomain(), "Session is already a domain"); LOG_DEBUG(Service, "called, server_session={}", ctx.Session()->GetId()); ctx.GetManager()->ConvertToDomainOnRequestEnd(); @@ -25,7 +25,7 @@ void Controller::ConvertCurrentObjectToDomain(Kernel::HLERequestContext& ctx) { rb.Push(1); // Converted sessions start with 1 request handler } -void Controller::CloneCurrentObject(Kernel::HLERequestContext& ctx) { +void Controller::CloneCurrentObject(HLERequestContext& ctx) { LOG_DEBUG(Service, "called"); auto& process = *ctx.GetThread().GetOwnerProcess(); @@ -59,13 +59,13 @@ void Controller::CloneCurrentObject(Kernel::HLERequestContext& ctx) { rb.PushMoveObjects(session->GetClientSession()); } -void Controller::CloneCurrentObjectEx(Kernel::HLERequestContext& ctx) { +void Controller::CloneCurrentObjectEx(HLERequestContext& ctx) { LOG_DEBUG(Service, "called"); CloneCurrentObject(ctx); } -void Controller::QueryPointerBufferSize(Kernel::HLERequestContext& ctx) { +void Controller::QueryPointerBufferSize(HLERequestContext& ctx) { LOG_WARNING(Service, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; diff --git a/src/core/hle/service/sm/sm_controller.h b/src/core/hle/service/sm/sm_controller.h index ed386f660..4e748b36d 100644 --- a/src/core/hle/service/sm/sm_controller.h +++ b/src/core/hle/service/sm/sm_controller.h @@ -17,10 +17,10 @@ public: ~Controller() override; private: - void ConvertCurrentObjectToDomain(Kernel::HLERequestContext& ctx); - void CloneCurrentObject(Kernel::HLERequestContext& ctx); - void CloneCurrentObjectEx(Kernel::HLERequestContext& ctx); - void QueryPointerBufferSize(Kernel::HLERequestContext& ctx); + void ConvertCurrentObjectToDomain(HLERequestContext& ctx); + void CloneCurrentObject(HLERequestContext& ctx); + void CloneCurrentObjectEx(HLERequestContext& ctx); + void QueryPointerBufferSize(HLERequestContext& ctx); }; } // namespace Service::SM diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp index 2789fa1ed..bce45d321 100644 --- a/src/core/hle/service/sockets/bsd.cpp +++ b/src/core/hle/service/sockets/bsd.cpp @@ -11,8 +11,8 @@ #include "common/microprofile.h" #include "common/socket_types.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_thread.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/sockets/bsd.h" #include "core/hle/service/sockets/sockets_translate.h" #include "core/internal_network/network.h" @@ -42,7 +42,7 @@ void BSD::PollWork::Execute(BSD* bsd) { std::tie(ret, bsd_errno) = bsd->PollImpl(write_buffer, read_buffer, nfds, timeout); } -void BSD::PollWork::Response(Kernel::HLERequestContext& ctx) { +void BSD::PollWork::Response(HLERequestContext& ctx) { if (write_buffer.size() > 0) { ctx.WriteBuffer(write_buffer); } @@ -57,7 +57,7 @@ void BSD::AcceptWork::Execute(BSD* bsd) { std::tie(ret, bsd_errno) = bsd->AcceptImpl(fd, write_buffer); } -void BSD::AcceptWork::Response(Kernel::HLERequestContext& ctx) { +void BSD::AcceptWork::Response(HLERequestContext& ctx) { if (write_buffer.size() > 0) { ctx.WriteBuffer(write_buffer); } @@ -73,7 +73,7 @@ void BSD::ConnectWork::Execute(BSD* bsd) { bsd_errno = bsd->ConnectImpl(fd, addr); } -void BSD::ConnectWork::Response(Kernel::HLERequestContext& ctx) { +void BSD::ConnectWork::Response(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); rb.Push(bsd_errno == Errno::SUCCESS ? 0 : -1); @@ -84,7 +84,7 @@ void BSD::RecvWork::Execute(BSD* bsd) { std::tie(ret, bsd_errno) = bsd->RecvImpl(fd, flags, message); } -void BSD::RecvWork::Response(Kernel::HLERequestContext& ctx) { +void BSD::RecvWork::Response(HLERequestContext& ctx) { ctx.WriteBuffer(message); IPC::ResponseBuilder rb{ctx, 4}; @@ -97,7 +97,7 @@ void BSD::RecvFromWork::Execute(BSD* bsd) { std::tie(ret, bsd_errno) = bsd->RecvFromImpl(fd, flags, message, addr); } -void BSD::RecvFromWork::Response(Kernel::HLERequestContext& ctx) { +void BSD::RecvFromWork::Response(HLERequestContext& ctx) { ctx.WriteBuffer(message, 0); if (!addr.empty()) { ctx.WriteBuffer(addr, 1); @@ -114,7 +114,7 @@ void BSD::SendWork::Execute(BSD* bsd) { std::tie(ret, bsd_errno) = bsd->SendImpl(fd, flags, message); } -void BSD::SendWork::Response(Kernel::HLERequestContext& ctx) { +void BSD::SendWork::Response(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); rb.Push(ret); @@ -125,14 +125,14 @@ void BSD::SendToWork::Execute(BSD* bsd) { std::tie(ret, bsd_errno) = bsd->SendToImpl(fd, flags, message, addr); } -void BSD::SendToWork::Response(Kernel::HLERequestContext& ctx) { +void BSD::SendToWork::Response(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); rb.Push(ret); rb.PushEnum(bsd_errno); } -void BSD::RegisterClient(Kernel::HLERequestContext& ctx) { +void BSD::RegisterClient(HLERequestContext& ctx) { LOG_WARNING(Service, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -141,7 +141,7 @@ void BSD::RegisterClient(Kernel::HLERequestContext& ctx) { rb.Push(0); // bsd errno } -void BSD::StartMonitoring(Kernel::HLERequestContext& ctx) { +void BSD::StartMonitoring(HLERequestContext& ctx) { LOG_WARNING(Service, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; @@ -149,7 +149,7 @@ void BSD::StartMonitoring(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void BSD::Socket(Kernel::HLERequestContext& ctx) { +void BSD::Socket(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u32 domain = rp.Pop(); const u32 type = rp.Pop(); @@ -166,7 +166,7 @@ void BSD::Socket(Kernel::HLERequestContext& ctx) { rb.PushEnum(bsd_errno); } -void BSD::Select(Kernel::HLERequestContext& ctx) { +void BSD::Select(HLERequestContext& ctx) { LOG_WARNING(Service, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 4}; @@ -176,7 +176,7 @@ void BSD::Select(Kernel::HLERequestContext& ctx) { rb.Push(0); // bsd errno } -void BSD::Poll(Kernel::HLERequestContext& ctx) { +void BSD::Poll(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 nfds = rp.Pop(); const s32 timeout = rp.Pop(); @@ -191,7 +191,7 @@ void BSD::Poll(Kernel::HLERequestContext& ctx) { }); } -void BSD::Accept(Kernel::HLERequestContext& ctx) { +void BSD::Accept(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); @@ -203,7 +203,7 @@ void BSD::Accept(Kernel::HLERequestContext& ctx) { }); } -void BSD::Bind(Kernel::HLERequestContext& ctx) { +void BSD::Bind(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); @@ -211,7 +211,7 @@ void BSD::Bind(Kernel::HLERequestContext& ctx) { BuildErrnoResponse(ctx, BindImpl(fd, ctx.ReadBuffer())); } -void BSD::Connect(Kernel::HLERequestContext& ctx) { +void BSD::Connect(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); @@ -223,7 +223,7 @@ void BSD::Connect(Kernel::HLERequestContext& ctx) { }); } -void BSD::GetPeerName(Kernel::HLERequestContext& ctx) { +void BSD::GetPeerName(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); @@ -241,7 +241,7 @@ void BSD::GetPeerName(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(write_buffer.size())); } -void BSD::GetSockName(Kernel::HLERequestContext& ctx) { +void BSD::GetSockName(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); @@ -259,7 +259,7 @@ void BSD::GetSockName(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(write_buffer.size())); } -void BSD::GetSockOpt(Kernel::HLERequestContext& ctx) { +void BSD::GetSockOpt(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); const u32 level = rp.Pop(); @@ -278,7 +278,7 @@ void BSD::GetSockOpt(Kernel::HLERequestContext& ctx) { rb.Push(static_cast(optval.size())); } -void BSD::Listen(Kernel::HLERequestContext& ctx) { +void BSD::Listen(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); const s32 backlog = rp.Pop(); @@ -288,7 +288,7 @@ void BSD::Listen(Kernel::HLERequestContext& ctx) { BuildErrnoResponse(ctx, ListenImpl(fd, backlog)); } -void BSD::Fcntl(Kernel::HLERequestContext& ctx) { +void BSD::Fcntl(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); const s32 cmd = rp.Pop(); @@ -304,7 +304,7 @@ void BSD::Fcntl(Kernel::HLERequestContext& ctx) { rb.PushEnum(bsd_errno); } -void BSD::SetSockOpt(Kernel::HLERequestContext& ctx) { +void BSD::SetSockOpt(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); @@ -328,7 +328,7 @@ void BSD::SetSockOpt(Kernel::HLERequestContext& ctx) { BuildErrnoResponse(ctx, SetSockOptImpl(fd, level, optname, optlen, optval)); } -void BSD::Shutdown(Kernel::HLERequestContext& ctx) { +void BSD::Shutdown(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); @@ -339,7 +339,7 @@ void BSD::Shutdown(Kernel::HLERequestContext& ctx) { BuildErrnoResponse(ctx, ShutdownImpl(fd, how)); } -void BSD::Recv(Kernel::HLERequestContext& ctx) { +void BSD::Recv(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); @@ -354,7 +354,7 @@ void BSD::Recv(Kernel::HLERequestContext& ctx) { }); } -void BSD::RecvFrom(Kernel::HLERequestContext& ctx) { +void BSD::RecvFrom(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); @@ -371,7 +371,7 @@ void BSD::RecvFrom(Kernel::HLERequestContext& ctx) { }); } -void BSD::Send(Kernel::HLERequestContext& ctx) { +void BSD::Send(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); @@ -386,7 +386,7 @@ void BSD::Send(Kernel::HLERequestContext& ctx) { }); } -void BSD::SendTo(Kernel::HLERequestContext& ctx) { +void BSD::SendTo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); const u32 flags = rp.Pop(); @@ -402,7 +402,7 @@ void BSD::SendTo(Kernel::HLERequestContext& ctx) { }); } -void BSD::Write(Kernel::HLERequestContext& ctx) { +void BSD::Write(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); @@ -415,7 +415,7 @@ void BSD::Write(Kernel::HLERequestContext& ctx) { }); } -void BSD::Read(Kernel::HLERequestContext& ctx) { +void BSD::Read(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); @@ -427,7 +427,7 @@ void BSD::Read(Kernel::HLERequestContext& ctx) { rb.Push(0); // bsd errno } -void BSD::Close(Kernel::HLERequestContext& ctx) { +void BSD::Close(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const s32 fd = rp.Pop(); @@ -436,7 +436,7 @@ void BSD::Close(Kernel::HLERequestContext& ctx) { BuildErrnoResponse(ctx, CloseImpl(fd)); } -void BSD::EventFd(Kernel::HLERequestContext& ctx) { +void BSD::EventFd(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 initval = rp.Pop(); const u32 flags = rp.Pop(); @@ -447,7 +447,7 @@ void BSD::EventFd(Kernel::HLERequestContext& ctx) { } template -void BSD::ExecuteWork(Kernel::HLERequestContext& ctx, Work work) { +void BSD::ExecuteWork(HLERequestContext& ctx, Work work) { work.Execute(this); work.Response(ctx); } @@ -862,7 +862,7 @@ bool BSD::IsFileDescriptorValid(s32 fd) const noexcept { return true; } -void BSD::BuildErrnoResponse(Kernel::HLERequestContext& ctx, Errno bsd_errno) const noexcept { +void BSD::BuildErrnoResponse(HLERequestContext& ctx, Errno bsd_errno) const noexcept { IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/sockets/bsd.h b/src/core/hle/service/sockets/bsd.h index 56bb3f8b1..30ae9c140 100644 --- a/src/core/hle/service/sockets/bsd.h +++ b/src/core/hle/service/sockets/bsd.h @@ -41,7 +41,7 @@ private: struct PollWork { void Execute(BSD* bsd); - void Response(Kernel::HLERequestContext& ctx); + void Response(HLERequestContext& ctx); s32 nfds; s32 timeout; @@ -53,7 +53,7 @@ private: struct AcceptWork { void Execute(BSD* bsd); - void Response(Kernel::HLERequestContext& ctx); + void Response(HLERequestContext& ctx); s32 fd; std::vector write_buffer; @@ -63,7 +63,7 @@ private: struct ConnectWork { void Execute(BSD* bsd); - void Response(Kernel::HLERequestContext& ctx); + void Response(HLERequestContext& ctx); s32 fd; std::span addr; @@ -72,7 +72,7 @@ private: struct RecvWork { void Execute(BSD* bsd); - void Response(Kernel::HLERequestContext& ctx); + void Response(HLERequestContext& ctx); s32 fd; u32 flags; @@ -83,7 +83,7 @@ private: struct RecvFromWork { void Execute(BSD* bsd); - void Response(Kernel::HLERequestContext& ctx); + void Response(HLERequestContext& ctx); s32 fd; u32 flags; @@ -95,7 +95,7 @@ private: struct SendWork { void Execute(BSD* bsd); - void Response(Kernel::HLERequestContext& ctx); + void Response(HLERequestContext& ctx); s32 fd; u32 flags; @@ -106,7 +106,7 @@ private: struct SendToWork { void Execute(BSD* bsd); - void Response(Kernel::HLERequestContext& ctx); + void Response(HLERequestContext& ctx); s32 fd; u32 flags; @@ -116,32 +116,32 @@ private: Errno bsd_errno{}; }; - void RegisterClient(Kernel::HLERequestContext& ctx); - void StartMonitoring(Kernel::HLERequestContext& ctx); - void Socket(Kernel::HLERequestContext& ctx); - void Select(Kernel::HLERequestContext& ctx); - void Poll(Kernel::HLERequestContext& ctx); - void Accept(Kernel::HLERequestContext& ctx); - void Bind(Kernel::HLERequestContext& ctx); - void Connect(Kernel::HLERequestContext& ctx); - void GetPeerName(Kernel::HLERequestContext& ctx); - void GetSockName(Kernel::HLERequestContext& ctx); - void GetSockOpt(Kernel::HLERequestContext& ctx); - void Listen(Kernel::HLERequestContext& ctx); - void Fcntl(Kernel::HLERequestContext& ctx); - void SetSockOpt(Kernel::HLERequestContext& ctx); - void Shutdown(Kernel::HLERequestContext& ctx); - void Recv(Kernel::HLERequestContext& ctx); - void RecvFrom(Kernel::HLERequestContext& ctx); - void Send(Kernel::HLERequestContext& ctx); - void SendTo(Kernel::HLERequestContext& ctx); - void Write(Kernel::HLERequestContext& ctx); - void Read(Kernel::HLERequestContext& ctx); - void Close(Kernel::HLERequestContext& ctx); - void EventFd(Kernel::HLERequestContext& ctx); + void RegisterClient(HLERequestContext& ctx); + void StartMonitoring(HLERequestContext& ctx); + void Socket(HLERequestContext& ctx); + void Select(HLERequestContext& ctx); + void Poll(HLERequestContext& ctx); + void Accept(HLERequestContext& ctx); + void Bind(HLERequestContext& ctx); + void Connect(HLERequestContext& ctx); + void GetPeerName(HLERequestContext& ctx); + void GetSockName(HLERequestContext& ctx); + void GetSockOpt(HLERequestContext& ctx); + void Listen(HLERequestContext& ctx); + void Fcntl(HLERequestContext& ctx); + void SetSockOpt(HLERequestContext& ctx); + void Shutdown(HLERequestContext& ctx); + void Recv(HLERequestContext& ctx); + void RecvFrom(HLERequestContext& ctx); + void Send(HLERequestContext& ctx); + void SendTo(HLERequestContext& ctx); + void Write(HLERequestContext& ctx); + void Read(HLERequestContext& ctx); + void Close(HLERequestContext& ctx); + void EventFd(HLERequestContext& ctx); template - void ExecuteWork(Kernel::HLERequestContext& ctx, Work work); + void ExecuteWork(HLERequestContext& ctx, Work work); std::pair SocketImpl(Domain domain, Type type, Protocol protocol); std::pair PollImpl(std::vector& write_buffer, std::span read_buffer, @@ -166,7 +166,7 @@ private: s32 FindFreeFileDescriptorHandle() noexcept; bool IsFileDescriptorValid(s32 fd) const noexcept; - void BuildErrnoResponse(Kernel::HLERequestContext& ctx, Errno bsd_errno) const noexcept; + void BuildErrnoResponse(HLERequestContext& ctx, Errno bsd_errno) const noexcept; std::array, MAX_FD> file_descriptors; diff --git a/src/core/hle/service/sockets/sfdnsres.cpp b/src/core/hle/service/sockets/sfdnsres.cpp index e96eda7f3..132dd5797 100644 --- a/src/core/hle/service/sockets/sfdnsres.cpp +++ b/src/core/hle/service/sockets/sfdnsres.cpp @@ -8,7 +8,7 @@ #include "common/string_util.h" #include "common/swap.h" #include "core/core.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/sockets/sfdnsres.h" #include "core/memory.h" @@ -185,7 +185,7 @@ static std::vector SerializeAddrInfo(const addrinfo* addrinfo, s32 result_co return data; } -static std::pair GetAddrInfoRequestImpl(Kernel::HLERequestContext& ctx) { +static std::pair GetAddrInfoRequestImpl(HLERequestContext& ctx) { struct Parameters { u8 use_nsd_resolve; u32 unknown; @@ -221,7 +221,7 @@ static std::pair GetAddrInfoRequestImpl(Kernel::HLERequestContext& ctx return std::make_pair(data_size, result_code); } -void SFDNSRES::GetAddrInfoRequest(Kernel::HLERequestContext& ctx) { +void SFDNSRES::GetAddrInfoRequest(HLERequestContext& ctx) { auto [data_size, result_code] = GetAddrInfoRequestImpl(ctx); IPC::ResponseBuilder rb{ctx, 4}; @@ -231,7 +231,7 @@ void SFDNSRES::GetAddrInfoRequest(Kernel::HLERequestContext& ctx) { rb.Push(data_size); // serialized size } -void SFDNSRES::GetAddrInfoRequestWithOptions(Kernel::HLERequestContext& ctx) { +void SFDNSRES::GetAddrInfoRequestWithOptions(HLERequestContext& ctx) { // Additional options are ignored auto [data_size, result_code] = GetAddrInfoRequestImpl(ctx); diff --git a/src/core/hle/service/sockets/sfdnsres.h b/src/core/hle/service/sockets/sfdnsres.h index 96018ea77..18e3cd60c 100644 --- a/src/core/hle/service/sockets/sfdnsres.h +++ b/src/core/hle/service/sockets/sfdnsres.h @@ -17,8 +17,8 @@ public: ~SFDNSRES() override; private: - void GetAddrInfoRequest(Kernel::HLERequestContext& ctx); - void GetAddrInfoRequestWithOptions(Kernel::HLERequestContext& ctx); + void GetAddrInfoRequest(HLERequestContext& ctx); + void GetAddrInfoRequestWithOptions(HLERequestContext& ctx); }; } // namespace Service::Sockets diff --git a/src/core/hle/service/spl/spl_module.cpp b/src/core/hle/service/spl/spl_module.cpp index 31679e1bb..0227d4393 100644 --- a/src/core/hle/service/spl/spl_module.cpp +++ b/src/core/hle/service/spl/spl_module.cpp @@ -8,7 +8,7 @@ #include "common/logging/log.h" #include "common/settings.h" #include "core/hle/api_version.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/spl/csrng.h" #include "core/hle/service/spl/spl.h" @@ -23,7 +23,7 @@ Module::Interface::Interface(Core::System& system_, std::shared_ptr modu Module::Interface::~Interface() = default; -void Module::Interface::GetConfig(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetConfig(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto config_item = rp.PopEnum(); @@ -48,21 +48,21 @@ void Module::Interface::GetConfig(Kernel::HLERequestContext& ctx) { rb.Push(*smc_result); } -void Module::Interface::ModularExponentiate(Kernel::HLERequestContext& ctx) { +void Module::Interface::ModularExponentiate(HLERequestContext& ctx) { UNIMPLEMENTED_MSG("ModularExponentiate is not implemented!"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSecureMonitorNotImplemented); } -void Module::Interface::SetConfig(Kernel::HLERequestContext& ctx) { +void Module::Interface::SetConfig(HLERequestContext& ctx) { UNIMPLEMENTED_MSG("SetConfig is not implemented!"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSecureMonitorNotImplemented); } -void Module::Interface::GenerateRandomBytes(Kernel::HLERequestContext& ctx) { +void Module::Interface::GenerateRandomBytes(HLERequestContext& ctx) { LOG_DEBUG(Service_SPL, "called"); const std::size_t size = ctx.GetWriteBufferSize(); @@ -77,21 +77,21 @@ void Module::Interface::GenerateRandomBytes(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Module::Interface::IsDevelopment(Kernel::HLERequestContext& ctx) { +void Module::Interface::IsDevelopment(HLERequestContext& ctx) { UNIMPLEMENTED_MSG("IsDevelopment is not implemented!"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSecureMonitorNotImplemented); } -void Module::Interface::SetBootReason(Kernel::HLERequestContext& ctx) { +void Module::Interface::SetBootReason(HLERequestContext& ctx) { UNIMPLEMENTED_MSG("SetBootReason is not implemented!"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSecureMonitorNotImplemented); } -void Module::Interface::GetBootReason(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetBootReason(HLERequestContext& ctx) { UNIMPLEMENTED_MSG("GetBootReason is not implemented!"); IPC::ResponseBuilder rb{ctx, 2}; diff --git a/src/core/hle/service/spl/spl_module.h b/src/core/hle/service/spl/spl_module.h index baed9efd7..e074e115d 100644 --- a/src/core/hle/service/spl/spl_module.h +++ b/src/core/hle/service/spl/spl_module.h @@ -23,13 +23,13 @@ public: ~Interface() override; // General - void GetConfig(Kernel::HLERequestContext& ctx); - void ModularExponentiate(Kernel::HLERequestContext& ctx); - void SetConfig(Kernel::HLERequestContext& ctx); - void GenerateRandomBytes(Kernel::HLERequestContext& ctx); - void IsDevelopment(Kernel::HLERequestContext& ctx); - void SetBootReason(Kernel::HLERequestContext& ctx); - void GetBootReason(Kernel::HLERequestContext& ctx); + void GetConfig(HLERequestContext& ctx); + void ModularExponentiate(HLERequestContext& ctx); + void SetConfig(HLERequestContext& ctx); + void GenerateRandomBytes(HLERequestContext& ctx); + void IsDevelopment(HLERequestContext& ctx); + void SetBootReason(HLERequestContext& ctx); + void GetBootReason(HLERequestContext& ctx); protected: std::shared_ptr module; diff --git a/src/core/hle/service/ssl/ssl.cpp b/src/core/hle/service/ssl/ssl.cpp index c1fd1a59b..b19bc1b3e 100644 --- a/src/core/hle/service/ssl/ssl.cpp +++ b/src/core/hle/service/ssl/ssl.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" #include "core/hle/service/ssl/ssl.h" @@ -84,7 +84,7 @@ public: } private: - void SetOption(Kernel::HLERequestContext& ctx) { + void SetOption(HLERequestContext& ctx) { struct Parameters { u8 enable; u32 option; @@ -100,7 +100,7 @@ private: rb.Push(ResultSuccess); } - void CreateConnection(Kernel::HLERequestContext& ctx) { + void CreateConnection(HLERequestContext& ctx) { LOG_WARNING(Service_SSL, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -108,7 +108,7 @@ private: rb.PushIpcInterface(system); } - void ImportServerPki(Kernel::HLERequestContext& ctx) { + void ImportServerPki(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto certificate_format = rp.PopEnum(); [[maybe_unused]] const auto pkcs_12_certificates = ctx.ReadBuffer(0); @@ -122,7 +122,7 @@ private: rb.Push(server_id); } - void ImportClientPki(Kernel::HLERequestContext& ctx) { + void ImportClientPki(HLERequestContext& ctx) { [[maybe_unused]] const auto pkcs_12_certificate = ctx.ReadBuffer(0); [[maybe_unused]] const auto ascii_password = [&ctx] { if (ctx.CanReadBuffer(1)) { @@ -164,7 +164,7 @@ public: private: u32 ssl_version{}; - void CreateContext(Kernel::HLERequestContext& ctx) { + void CreateContext(HLERequestContext& ctx) { LOG_WARNING(Service_SSL, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -172,7 +172,7 @@ private: rb.PushIpcInterface(system); } - void SetInterfaceVersion(Kernel::HLERequestContext& ctx) { + void SetInterfaceVersion(HLERequestContext& ctx) { LOG_DEBUG(Service_SSL, "called"); IPC::RequestParser rp{ctx}; diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp index 8020e407c..868be60c5 100644 --- a/src/core/hle/service/time/time.cpp +++ b/src/core/hle/service/time/time.cpp @@ -5,8 +5,8 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/hardware_properties.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/kernel.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/time/time.h" #include "core/hle/service/time/time_interface.h" @@ -34,7 +34,7 @@ public: } private: - void GetCurrentTime(Kernel::HLERequestContext& ctx) { + void GetCurrentTime(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); if (!clock_core.IsInitialized()) { @@ -55,7 +55,7 @@ private: rb.Push(posix_time); } - void GetSystemClockContext(Kernel::HLERequestContext& ctx) { + void GetSystemClockContext(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); if (!clock_core.IsInitialized()) { @@ -98,7 +98,7 @@ public: } private: - void GetCurrentTimePoint(Kernel::HLERequestContext& ctx) { + void GetCurrentTimePoint(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); if (!clock_core.IsInitialized()) { @@ -178,7 +178,7 @@ Result Module::Interface::GetClockSnapshotFromSystemClockContextInternal( return ResultSuccess; } -void Module::Interface::GetStandardUserSystemClock(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetStandardUserSystemClock(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); @@ -186,7 +186,7 @@ void Module::Interface::GetStandardUserSystemClock(Kernel::HLERequestContext& ct system); } -void Module::Interface::GetStandardNetworkSystemClock(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetStandardNetworkSystemClock(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); @@ -194,14 +194,14 @@ void Module::Interface::GetStandardNetworkSystemClock(Kernel::HLERequestContext& system); } -void Module::Interface::GetStandardSteadyClock(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetStandardSteadyClock(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); rb.PushIpcInterface(system.GetTimeManager().GetStandardSteadyClockCore(), system); } -void Module::Interface::GetTimeZoneService(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetTimeZoneService(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); @@ -209,7 +209,7 @@ void Module::Interface::GetTimeZoneService(Kernel::HLERequestContext& ctx) { system.GetTimeManager().GetTimeZoneContentManager()); } -void Module::Interface::GetStandardLocalSystemClock(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetStandardLocalSystemClock(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); @@ -217,8 +217,7 @@ void Module::Interface::GetStandardLocalSystemClock(Kernel::HLERequestContext& c system); } -void Module::Interface::IsStandardNetworkSystemClockAccuracySufficient( - Kernel::HLERequestContext& ctx) { +void Module::Interface::IsStandardNetworkSystemClockAccuracySufficient(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); auto& clock_core{system.GetTimeManager().GetStandardNetworkSystemClockCore()}; IPC::ResponseBuilder rb{ctx, 3}; @@ -226,7 +225,7 @@ void Module::Interface::IsStandardNetworkSystemClockAccuracySufficient( rb.Push(clock_core.IsStandardNetworkSystemClockAccuracySufficient(system)); } -void Module::Interface::CalculateMonotonicSystemClockBaseTimePoint(Kernel::HLERequestContext& ctx) { +void Module::Interface::CalculateMonotonicSystemClockBaseTimePoint(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); auto& steady_clock_core{system.GetTimeManager().GetStandardSteadyClockCore()}; @@ -255,7 +254,7 @@ void Module::Interface::CalculateMonotonicSystemClockBaseTimePoint(Kernel::HLERe rb.Push(ERROR_TIME_MISMATCH); } -void Module::Interface::GetClockSnapshot(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetClockSnapshot(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto type{rp.PopEnum()}; @@ -296,7 +295,7 @@ void Module::Interface::GetClockSnapshot(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void Module::Interface::GetClockSnapshotFromSystemClockContext(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetClockSnapshotFromSystemClockContext(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto type{rp.PopEnum()}; @@ -322,8 +321,7 @@ void Module::Interface::GetClockSnapshotFromSystemClockContext(Kernel::HLEReques rb.Push(ResultSuccess); } -void Module::Interface::CalculateStandardUserSystemClockDifferenceByUser( - Kernel::HLERequestContext& ctx) { +void Module::Interface::CalculateStandardUserSystemClockDifferenceByUser(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); Clock::ClockSnapshot snapshot_a; @@ -350,7 +348,7 @@ void Module::Interface::CalculateStandardUserSystemClockDifferenceByUser( rb.PushRaw(time_span_type.nanoseconds); } -void Module::Interface::CalculateSpanBetween(Kernel::HLERequestContext& ctx) { +void Module::Interface::CalculateSpanBetween(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); Clock::ClockSnapshot snapshot_a; @@ -385,7 +383,7 @@ void Module::Interface::CalculateSpanBetween(Kernel::HLERequestContext& ctx) { rb.PushRaw(time_span_type.nanoseconds); } -void Module::Interface::GetSharedMemoryNativeHandle(Kernel::HLERequestContext& ctx) { +void Module::Interface::GetSharedMemoryNativeHandle(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); IPC::ResponseBuilder rb{ctx, 2, 1}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/time/time.h b/src/core/hle/service/time/time.h index c9936c645..b2d754ef3 100644 --- a/src/core/hle/service/time/time.h +++ b/src/core/hle/service/time/time.h @@ -22,18 +22,18 @@ public: const char* name); ~Interface() override; - void GetStandardUserSystemClock(Kernel::HLERequestContext& ctx); - void GetStandardNetworkSystemClock(Kernel::HLERequestContext& ctx); - void GetStandardSteadyClock(Kernel::HLERequestContext& ctx); - void GetTimeZoneService(Kernel::HLERequestContext& ctx); - void GetStandardLocalSystemClock(Kernel::HLERequestContext& ctx); - void IsStandardNetworkSystemClockAccuracySufficient(Kernel::HLERequestContext& ctx); - void CalculateMonotonicSystemClockBaseTimePoint(Kernel::HLERequestContext& ctx); - void GetClockSnapshot(Kernel::HLERequestContext& ctx); - void GetClockSnapshotFromSystemClockContext(Kernel::HLERequestContext& ctx); - void CalculateStandardUserSystemClockDifferenceByUser(Kernel::HLERequestContext& ctx); - void CalculateSpanBetween(Kernel::HLERequestContext& ctx); - void GetSharedMemoryNativeHandle(Kernel::HLERequestContext& ctx); + void GetStandardUserSystemClock(HLERequestContext& ctx); + void GetStandardNetworkSystemClock(HLERequestContext& ctx); + void GetStandardSteadyClock(HLERequestContext& ctx); + void GetTimeZoneService(HLERequestContext& ctx); + void GetStandardLocalSystemClock(HLERequestContext& ctx); + void IsStandardNetworkSystemClockAccuracySufficient(HLERequestContext& ctx); + void CalculateMonotonicSystemClockBaseTimePoint(HLERequestContext& ctx); + void GetClockSnapshot(HLERequestContext& ctx); + void GetClockSnapshotFromSystemClockContext(HLERequestContext& ctx); + void CalculateStandardUserSystemClockDifferenceByUser(HLERequestContext& ctx); + void CalculateSpanBetween(HLERequestContext& ctx); + void GetSharedMemoryNativeHandle(HLERequestContext& ctx); private: Result GetClockSnapshotFromSystemClockContextInternal( diff --git a/src/core/hle/service/time/time_zone_service.cpp b/src/core/hle/service/time/time_zone_service.cpp index 961040bfc..cda8d8343 100644 --- a/src/core/hle/service/time/time_zone_service.cpp +++ b/src/core/hle/service/time/time_zone_service.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/time/time_zone_content_manager.h" #include "core/hle/service/time/time_zone_service.h" #include "core/hle/service/time/time_zone_types.h" @@ -28,7 +28,7 @@ ITimeZoneService::ITimeZoneService(Core::System& system_, RegisterHandlers(functions); } -void ITimeZoneService::GetDeviceLocationName(Kernel::HLERequestContext& ctx) { +void ITimeZoneService::GetDeviceLocationName(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); TimeZone::LocationName location_name{}; @@ -45,7 +45,7 @@ void ITimeZoneService::GetDeviceLocationName(Kernel::HLERequestContext& ctx) { rb.PushRaw(location_name); } -void ITimeZoneService::LoadTimeZoneRule(Kernel::HLERequestContext& ctx) { +void ITimeZoneService::LoadTimeZoneRule(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto raw_location_name{rp.PopRaw>()}; @@ -77,7 +77,7 @@ void ITimeZoneService::LoadTimeZoneRule(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void ITimeZoneService::ToCalendarTime(Kernel::HLERequestContext& ctx) { +void ITimeZoneService::ToCalendarTime(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto posix_time{rp.Pop()}; @@ -101,7 +101,7 @@ void ITimeZoneService::ToCalendarTime(Kernel::HLERequestContext& ctx) { rb.PushRaw(calendar_info); } -void ITimeZoneService::ToCalendarTimeWithMyRule(Kernel::HLERequestContext& ctx) { +void ITimeZoneService::ToCalendarTimeWithMyRule(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto posix_time{rp.Pop()}; @@ -122,7 +122,7 @@ void ITimeZoneService::ToCalendarTimeWithMyRule(Kernel::HLERequestContext& ctx) rb.PushRaw(calendar_info); } -void ITimeZoneService::ToPosixTime(Kernel::HLERequestContext& ctx) { +void ITimeZoneService::ToPosixTime(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); IPC::RequestParser rp{ctx}; @@ -147,7 +147,7 @@ void ITimeZoneService::ToPosixTime(Kernel::HLERequestContext& ctx) { rb.PushRaw(1); // Number of times we're returning } -void ITimeZoneService::ToPosixTimeWithMyRule(Kernel::HLERequestContext& ctx) { +void ITimeZoneService::ToPosixTimeWithMyRule(HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); IPC::RequestParser rp{ctx}; diff --git a/src/core/hle/service/time/time_zone_service.h b/src/core/hle/service/time/time_zone_service.h index f151f4b56..ea83b5714 100644 --- a/src/core/hle/service/time/time_zone_service.h +++ b/src/core/hle/service/time/time_zone_service.h @@ -21,12 +21,12 @@ public: TimeZone::TimeZoneContentManager& time_zone_manager_); private: - void GetDeviceLocationName(Kernel::HLERequestContext& ctx); - void LoadTimeZoneRule(Kernel::HLERequestContext& ctx); - void ToCalendarTime(Kernel::HLERequestContext& ctx); - void ToCalendarTimeWithMyRule(Kernel::HLERequestContext& ctx); - void ToPosixTime(Kernel::HLERequestContext& ctx); - void ToPosixTimeWithMyRule(Kernel::HLERequestContext& ctx); + void GetDeviceLocationName(HLERequestContext& ctx); + void LoadTimeZoneRule(HLERequestContext& ctx); + void ToCalendarTime(HLERequestContext& ctx); + void ToCalendarTimeWithMyRule(HLERequestContext& ctx); + void ToPosixTime(HLERequestContext& ctx); + void ToPosixTimeWithMyRule(HLERequestContext& ctx); private: TimeZone::TimeZoneContentManager& time_zone_content_manager; diff --git a/src/core/hle/service/usb/usb.cpp b/src/core/hle/service/usb/usb.cpp index ddb73f394..a2855e783 100644 --- a/src/core/hle/service/usb/usb.cpp +++ b/src/core/hle/service/usb/usb.cpp @@ -4,7 +4,7 @@ #include #include "common/logging/log.h" -#include "core/hle/ipc_helpers.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" #include "core/hle/service/usb/usb.h" @@ -147,7 +147,7 @@ public: } private: - void GetPdSession(Kernel::HLERequestContext& ctx) { + void GetPdSession(HLERequestContext& ctx) { LOG_DEBUG(Service_USB, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -191,7 +191,7 @@ public: } private: - void GetPdCradleSession(Kernel::HLERequestContext& ctx) { + void GetPdCradleSession(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); rb.PushIpcInterface(system); diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index d9cfebd70..fca076d7a 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -17,9 +17,9 @@ #include "common/settings.h" #include "common/swap.h" #include "core/core_timing.h" -#include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_readable_event.h" #include "core/hle/kernel/k_thread.h" +#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nvdrv/nvdata.h" #include "core/hle/service/nvflinger/binder.h" #include "core/hle/service/nvflinger/buffer_queue_producer.h" @@ -85,7 +85,7 @@ public: } private: - void TransactParcel(Kernel::HLERequestContext& ctx) { + void TransactParcel(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u32 id = rp.Pop(); const auto transaction = static_cast(rp.Pop()); @@ -100,7 +100,7 @@ private: rb.Push(ResultSuccess); } - void AdjustRefcount(Kernel::HLERequestContext& ctx) { + void AdjustRefcount(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u32 id = rp.Pop(); const s32 addval = rp.PopRaw(); @@ -113,7 +113,7 @@ private: rb.Push(ResultSuccess); } - void GetNativeHandle(Kernel::HLERequestContext& ctx) { + void GetNativeHandle(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u32 id = rp.Pop(); const u32 unknown = rp.Pop(); @@ -186,7 +186,7 @@ public: } private: - void SetLayerZ(Kernel::HLERequestContext& ctx) { + void SetLayerZ(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 layer_id = rp.Pop(); const u64 z_value = rp.Pop(); @@ -200,7 +200,7 @@ private: // This function currently does nothing but return a success error code in // the vi library itself, so do the same thing, but log out the passed in values. - void SetLayerVisibility(Kernel::HLERequestContext& ctx) { + void SetLayerVisibility(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 layer_id = rp.Pop(); const bool visibility = rp.Pop(); @@ -211,7 +211,7 @@ private: rb.Push(ResultSuccess); } - void GetDisplayMode(Kernel::HLERequestContext& ctx) { + void GetDisplayMode(HLERequestContext& ctx) { LOG_WARNING(Service_VI, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 6}; @@ -325,7 +325,7 @@ public: } private: - void CloseDisplay(Kernel::HLERequestContext& ctx) { + void CloseDisplay(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 display = rp.Pop(); @@ -335,7 +335,7 @@ private: rb.Push(rc); } - void CreateManagedLayer(Kernel::HLERequestContext& ctx) { + void CreateManagedLayer(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u32 unknown = rp.Pop(); rp.Skip(1, false); @@ -359,7 +359,7 @@ private: rb.Push(*layer_id); } - void AddToLayerStack(Kernel::HLERequestContext& ctx) { + void AddToLayerStack(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u32 stack = rp.Pop(); const u64 layer_id = rp.Pop(); @@ -371,7 +371,7 @@ private: rb.Push(ResultSuccess); } - void SetLayerVisibility(Kernel::HLERequestContext& ctx) { + void SetLayerVisibility(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 layer_id = rp.Pop(); const bool visibility = rp.Pop(); @@ -440,7 +440,7 @@ private: PreserveAspectRatio = 4, }; - void GetRelayService(Kernel::HLERequestContext& ctx) { + void GetRelayService(HLERequestContext& ctx) { LOG_WARNING(Service_VI, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -448,7 +448,7 @@ private: rb.PushIpcInterface(system, hos_binder_driver_server); } - void GetSystemDisplayService(Kernel::HLERequestContext& ctx) { + void GetSystemDisplayService(HLERequestContext& ctx) { LOG_WARNING(Service_VI, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -456,7 +456,7 @@ private: rb.PushIpcInterface(system); } - void GetManagerDisplayService(Kernel::HLERequestContext& ctx) { + void GetManagerDisplayService(HLERequestContext& ctx) { LOG_WARNING(Service_VI, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -464,7 +464,7 @@ private: rb.PushIpcInterface(system, nv_flinger); } - void GetIndirectDisplayTransactionService(Kernel::HLERequestContext& ctx) { + void GetIndirectDisplayTransactionService(HLERequestContext& ctx) { LOG_WARNING(Service_VI, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -472,7 +472,7 @@ private: rb.PushIpcInterface(system, hos_binder_driver_server); } - void OpenDisplay(Kernel::HLERequestContext& ctx) { + void OpenDisplay(HLERequestContext& ctx) { LOG_WARNING(Service_VI, "(STUBBED) called"); IPC::RequestParser rp{ctx}; @@ -481,13 +481,13 @@ private: OpenDisplayImpl(ctx, std::string_view{name_buf.data(), name_buf.size()}); } - void OpenDefaultDisplay(Kernel::HLERequestContext& ctx) { + void OpenDefaultDisplay(HLERequestContext& ctx) { LOG_DEBUG(Service_VI, "called"); OpenDisplayImpl(ctx, "Default"); } - void OpenDisplayImpl(Kernel::HLERequestContext& ctx, std::string_view name) { + void OpenDisplayImpl(HLERequestContext& ctx, std::string_view name) { const auto trim_pos = name.find('\0'); if (trim_pos != std::string_view::npos) { @@ -509,7 +509,7 @@ private: rb.Push(*display_id); } - void CloseDisplay(Kernel::HLERequestContext& ctx) { + void CloseDisplay(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 display_id = rp.Pop(); @@ -521,14 +521,14 @@ private: // This literally does nothing internally in the actual service itself, // and just returns a successful result code regardless of the input. - void SetDisplayEnabled(Kernel::HLERequestContext& ctx) { + void SetDisplayEnabled(HLERequestContext& ctx) { LOG_DEBUG(Service_VI, "called."); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } - void GetDisplayResolution(Kernel::HLERequestContext& ctx) { + void GetDisplayResolution(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 display_id = rp.Pop(); @@ -544,7 +544,7 @@ private: rb.Push(static_cast(DisplayResolution::UndockedHeight)); } - void SetLayerScalingMode(Kernel::HLERequestContext& ctx) { + void SetLayerScalingMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto scaling_mode = rp.PopEnum(); const u64 unknown = rp.Pop(); @@ -570,7 +570,7 @@ private: rb.Push(ResultSuccess); } - void ListDisplays(Kernel::HLERequestContext& ctx) { + void ListDisplays(HLERequestContext& ctx) { LOG_WARNING(Service_VI, "(STUBBED) called"); const DisplayInfo display_info; @@ -580,7 +580,7 @@ private: rb.Push(1); } - void OpenLayer(Kernel::HLERequestContext& ctx) { + void OpenLayer(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto name_buf = rp.PopRaw>(); const auto end = std::find(name_buf.begin(), name_buf.end(), '\0'); @@ -616,7 +616,7 @@ private: rb.Push(buffer_size); } - void CloseLayer(Kernel::HLERequestContext& ctx) { + void CloseLayer(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto layer_id{rp.Pop()}; @@ -628,7 +628,7 @@ private: rb.Push(ResultSuccess); } - void CreateStrayLayer(Kernel::HLERequestContext& ctx) { + void CreateStrayLayer(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u32 flags = rp.Pop(); rp.Pop(); // padding @@ -663,7 +663,7 @@ private: rb.Push(buffer_size); } - void DestroyStrayLayer(Kernel::HLERequestContext& ctx) { + void DestroyStrayLayer(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 layer_id = rp.Pop(); @@ -673,7 +673,7 @@ private: rb.Push(ResultSuccess); } - void GetDisplayVsyncEvent(Kernel::HLERequestContext& ctx) { + void GetDisplayVsyncEvent(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const u64 display_id = rp.Pop(); @@ -696,7 +696,7 @@ private: rb.PushCopyObjects(*vsync_event); } - void ConvertScalingMode(Kernel::HLERequestContext& ctx) { + void ConvertScalingMode(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto mode = rp.PopEnum(); LOG_DEBUG(Service_VI, "called mode={}", mode); @@ -713,7 +713,7 @@ private: } } - void GetIndirectLayerImageMap(Kernel::HLERequestContext& ctx) { + void GetIndirectLayerImageMap(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto width = rp.Pop(); const auto height = rp.Pop(); @@ -739,7 +739,7 @@ private: rb.Push(ResultSuccess); } - void GetIndirectLayerImageRequiredMemoryInfo(Kernel::HLERequestContext& ctx) { + void GetIndirectLayerImageRequiredMemoryInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto width = rp.Pop(); const auto height = rp.Pop(); @@ -790,7 +790,7 @@ static bool IsValidServiceAccess(Permission permission, Policy policy) { return false; } -void detail::GetDisplayServiceImpl(Kernel::HLERequestContext& ctx, Core::System& system, +void detail::GetDisplayServiceImpl(HLERequestContext& ctx, Core::System& system, NVFlinger::NVFlinger& nv_flinger, NVFlinger::HosBinderDriverServer& hos_binder_driver_server, Permission permission) { diff --git a/src/core/hle/service/vi/vi.h b/src/core/hle/service/vi/vi.h index 4ed7aaf2b..48b2f30aa 100644 --- a/src/core/hle/service/vi/vi.h +++ b/src/core/hle/service/vi/vi.h @@ -9,7 +9,7 @@ namespace Core { class System; } -namespace Kernel { +namespace Service { class HLERequestContext; } @@ -42,7 +42,7 @@ enum class Policy { }; namespace detail { -void GetDisplayServiceImpl(Kernel::HLERequestContext& ctx, Core::System& system, +void GetDisplayServiceImpl(HLERequestContext& ctx, Core::System& system, NVFlinger::NVFlinger& nv_flinger, NVFlinger::HosBinderDriverServer& hos_binder_driver_server, Permission permission); diff --git a/src/core/hle/service/vi/vi_m.cpp b/src/core/hle/service/vi/vi_m.cpp index 7ca44354b..019e55811 100644 --- a/src/core/hle/service/vi/vi_m.cpp +++ b/src/core/hle/service/vi/vi_m.cpp @@ -24,7 +24,7 @@ VI_M::VI_M(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, VI_M::~VI_M() = default; -void VI_M::GetDisplayService(Kernel::HLERequestContext& ctx) { +void VI_M::GetDisplayService(HLERequestContext& ctx) { LOG_DEBUG(Service_VI, "called"); detail::GetDisplayServiceImpl(ctx, system, nv_flinger, hos_binder_driver_server, diff --git a/src/core/hle/service/vi/vi_m.h b/src/core/hle/service/vi/vi_m.h index 3bf76d439..392da04a3 100644 --- a/src/core/hle/service/vi/vi_m.h +++ b/src/core/hle/service/vi/vi_m.h @@ -9,10 +9,6 @@ namespace Core { class System; } -namespace Kernel { -class HLERequestContext; -} - namespace Service::NVFlinger { class HosBinderDriverServer; class NVFlinger; @@ -27,7 +23,7 @@ public: ~VI_M() override; private: - void GetDisplayService(Kernel::HLERequestContext& ctx); + void GetDisplayService(HLERequestContext& ctx); NVFlinger::NVFlinger& nv_flinger; NVFlinger::HosBinderDriverServer& hos_binder_driver_server; diff --git a/src/core/hle/service/vi/vi_s.cpp b/src/core/hle/service/vi/vi_s.cpp index fd799dac1..901c5988e 100644 --- a/src/core/hle/service/vi/vi_s.cpp +++ b/src/core/hle/service/vi/vi_s.cpp @@ -20,7 +20,7 @@ VI_S::VI_S(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, VI_S::~VI_S() = default; -void VI_S::GetDisplayService(Kernel::HLERequestContext& ctx) { +void VI_S::GetDisplayService(HLERequestContext& ctx) { LOG_DEBUG(Service_VI, "called"); detail::GetDisplayServiceImpl(ctx, system, nv_flinger, hos_binder_driver_server, diff --git a/src/core/hle/service/vi/vi_s.h b/src/core/hle/service/vi/vi_s.h index 97503ac7f..34282fcfd 100644 --- a/src/core/hle/service/vi/vi_s.h +++ b/src/core/hle/service/vi/vi_s.h @@ -9,10 +9,6 @@ namespace Core { class System; } -namespace Kernel { -class HLERequestContext; -} - namespace Service::NVFlinger { class HosBinderDriverServer; class NVFlinger; @@ -27,7 +23,7 @@ public: ~VI_S() override; private: - void GetDisplayService(Kernel::HLERequestContext& ctx); + void GetDisplayService(HLERequestContext& ctx); NVFlinger::NVFlinger& nv_flinger; NVFlinger::HosBinderDriverServer& hos_binder_driver_server; diff --git a/src/core/hle/service/vi/vi_u.cpp b/src/core/hle/service/vi/vi_u.cpp index 6cc54bd13..08c5cf486 100644 --- a/src/core/hle/service/vi/vi_u.cpp +++ b/src/core/hle/service/vi/vi_u.cpp @@ -20,7 +20,7 @@ VI_U::VI_U(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, VI_U::~VI_U() = default; -void VI_U::GetDisplayService(Kernel::HLERequestContext& ctx) { +void VI_U::GetDisplayService(HLERequestContext& ctx) { LOG_DEBUG(Service_VI, "called"); detail::GetDisplayServiceImpl(ctx, system, nv_flinger, hos_binder_driver_server, diff --git a/src/core/hle/service/vi/vi_u.h b/src/core/hle/service/vi/vi_u.h index 797941bd7..8b0a8dd02 100644 --- a/src/core/hle/service/vi/vi_u.h +++ b/src/core/hle/service/vi/vi_u.h @@ -9,10 +9,6 @@ namespace Core { class System; } -namespace Kernel { -class HLERequestContext; -} - namespace Service::NVFlinger { class HosBinderDriverServer; class NVFlinger; @@ -27,7 +23,7 @@ public: ~VI_U() override; private: - void GetDisplayService(Kernel::HLERequestContext& ctx); + void GetDisplayService(HLERequestContext& ctx); NVFlinger::NVFlinger& nv_flinger; NVFlinger::HosBinderDriverServer& hos_binder_driver_server; diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp index 708ae17aa..004f2e57a 100644 --- a/src/core/reporter.cpp +++ b/src/core/reporter.cpp @@ -17,10 +17,10 @@ #include "common/settings.h" #include "core/arm/arm_interface.h" #include "core/core.h" -#include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/k_page_table.h" #include "core/hle/kernel/k_process.h" #include "core/hle/result.h" +#include "core/hle/service/hle_ipc.h" #include "core/memory.h" #include "core/reporter.h" @@ -170,7 +170,7 @@ json GetHLEBufferDescriptorData(const std::vector& buffer, return buffer_out; } -json GetHLERequestContextData(Kernel::HLERequestContext& ctx, Core::Memory::Memory& memory) { +json GetHLERequestContextData(Service::HLERequestContext& ctx, Core::Memory::Memory& memory) { json out; auto cmd_buf = json::array(); @@ -253,7 +253,7 @@ void Reporter::SaveSvcBreakReport(u32 type, bool signal_debugger, u64 info1, u64 SaveToFile(out, GetPath("svc_break_report", title_id, timestamp)); } -void Reporter::SaveUnimplementedFunctionReport(Kernel::HLERequestContext& ctx, u32 command_id, +void Reporter::SaveUnimplementedFunctionReport(Service::HLERequestContext& ctx, u32 command_id, const std::string& name, const std::string& service_name) const { if (!IsReportingEnabled()) { diff --git a/src/core/reporter.h b/src/core/reporter.h index bb11f8e7c..db1ca3ba0 100644 --- a/src/core/reporter.h +++ b/src/core/reporter.h @@ -12,9 +12,9 @@ union Result; -namespace Kernel { +namespace Service { class HLERequestContext; -} // namespace Kernel +} // namespace Service namespace Service::LM { struct LogMessage; @@ -40,7 +40,7 @@ public: const std::optional>& resolved_buffer = {}) const; // Used by HLE service handler - void SaveUnimplementedFunctionReport(Kernel::HLERequestContext& ctx, u32 command_id, + void SaveUnimplementedFunctionReport(Service::HLERequestContext& ctx, u32 command_id, const std::string& name, const std::string& service_name) const; From 809148e1a58296ab88c9d3c6719d345f35ce0279 Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 19 Feb 2023 15:05:34 -0500 Subject: [PATCH 0105/1181] nvnflinger: fix name --- src/common/logging/filter.cpp | 2 +- src/common/logging/types.h | 202 +++++++++--------- src/core/CMakeLists.txt | 58 ++--- src/core/hle/service/am/am.cpp | 23 +- src/core/hle/service/am/am.h | 10 +- src/core/hle/service/am/applet_ae.cpp | 36 ++-- src/core/hle/service/am/applet_ae.h | 8 +- src/core/hle/service/am/applet_oe.cpp | 22 +- src/core/hle/service/am/applet_oe.h | 8 +- .../hle/service/nvdrv/devices/nvdisp_disp0.h | 4 +- src/core/hle/service/nvdrv/nvdrv.cpp | 6 +- src/core/hle/service/nvdrv/nvdrv.h | 10 +- .../{nvflinger => nvnflinger}/binder.h | 0 .../{nvflinger => nvnflinger}/buffer_item.h | 4 +- .../buffer_item_consumer.cpp | 12 +- .../buffer_item_consumer.h | 4 +- .../buffer_queue_consumer.cpp | 40 ++-- .../buffer_queue_consumer.h | 4 +- .../buffer_queue_core.cpp | 4 +- .../buffer_queue_core.h | 10 +- .../buffer_queue_defs.h | 2 +- .../buffer_queue_producer.cpp | 136 ++++++------ .../buffer_queue_producer.h | 14 +- .../{nvflinger => nvnflinger}/buffer_slot.h | 2 +- .../buffer_transform_flags.h | 0 .../consumer_base.cpp | 24 +-- .../{nvflinger => nvnflinger}/consumer_base.h | 6 +- .../consumer_listener.h | 0 .../graphic_buffer_producer.cpp | 4 +- .../graphic_buffer_producer.h | 4 +- .../hos_binder_driver_server.cpp | 6 +- .../hos_binder_driver_server.h | 6 +- .../nvnflinger.cpp} | 58 ++--- .../nvflinger.h => nvnflinger/nvnflinger.h} | 10 +- .../{nvflinger => nvnflinger}/parcel.h | 0 .../{nvflinger => nvnflinger}/pixel_format.h | 0 .../producer_listener.h | 0 .../{nvflinger => nvnflinger}/status.h | 0 .../{nvflinger => nvnflinger}/ui/fence.h | 0 .../ui/graphic_buffer.h | 2 +- .../{nvflinger => nvnflinger}/window.h | 0 src/core/hle/service/service.cpp | 10 +- src/core/hle/service/service.h | 10 +- .../hle/service/vi/display/vi_display.cpp | 12 +- src/core/hle/service/vi/display/vi_display.h | 8 +- src/core/hle/service/vi/vi.cpp | 34 +-- src/core/hle/service/vi/vi.h | 14 +- src/core/hle/service/vi/vi_m.cpp | 4 +- src/core/hle/service/vi/vi_m.h | 14 +- src/core/hle/service/vi/vi_s.cpp | 4 +- src/core/hle/service/vi/vi_s.h | 14 +- src/core/hle/service/vi/vi_u.cpp | 4 +- src/core/hle/service/vi/vi_u.h | 14 +- src/video_core/framebuffer_config.h | 4 +- 54 files changed, 443 insertions(+), 444 deletions(-) rename src/core/hle/service/{nvflinger => nvnflinger}/binder.h (100%) rename src/core/hle/service/{nvflinger => nvnflinger}/buffer_item.h (92%) rename src/core/hle/service/{nvflinger => nvnflinger}/buffer_item_consumer.cpp (79%) rename src/core/hle/service/{nvflinger => nvnflinger}/buffer_item_consumer.h (89%) rename src/core/hle/service/{nvflinger => nvnflinger}/buffer_queue_consumer.cpp (81%) rename src/core/hle/service/{nvflinger => nvnflinger}/buffer_queue_consumer.h (92%) rename src/core/hle/service/{nvflinger => nvnflinger}/buffer_queue_core.cpp (96%) rename src/core/hle/service/{nvflinger => nvnflinger}/buffer_queue_core.h (90%) rename src/core/hle/service/{nvflinger => nvnflinger}/buffer_queue_defs.h (92%) rename src/core/hle/service/{nvflinger => nvnflinger}/buffer_queue_producer.cpp (85%) rename src/core/hle/service/{nvflinger => nvnflinger}/buffer_queue_producer.h (89%) rename src/core/hle/service/{nvflinger => nvnflinger}/buffer_slot.h (94%) rename src/core/hle/service/{nvflinger => nvnflinger}/buffer_transform_flags.h (100%) rename src/core/hle/service/{nvflinger => nvnflinger}/consumer_base.cpp (84%) rename src/core/hle/service/{nvflinger => nvnflinger}/consumer_base.h (91%) rename src/core/hle/service/{nvflinger => nvnflinger}/consumer_listener.h (100%) rename src/core/hle/service/{nvflinger => nvnflinger}/graphic_buffer_producer.cpp (83%) rename src/core/hle/service/{nvflinger => nvnflinger}/graphic_buffer_producer.h (96%) rename src/core/hle/service/{nvflinger => nvnflinger}/hos_binder_driver_server.cpp (85%) rename src/core/hle/service/{nvflinger => nvnflinger}/hos_binder_driver_server.h (86%) rename src/core/hle/service/{nvflinger/nvflinger.cpp => nvnflinger/nvnflinger.cpp} (83%) rename src/core/hle/service/{nvflinger/nvflinger.h => nvnflinger/nvnflinger.h} (95%) rename src/core/hle/service/{nvflinger => nvnflinger}/parcel.h (100%) rename src/core/hle/service/{nvflinger => nvnflinger}/pixel_format.h (100%) rename src/core/hle/service/{nvflinger => nvnflinger}/producer_listener.h (100%) rename src/core/hle/service/{nvflinger => nvnflinger}/status.h (100%) rename src/core/hle/service/{nvflinger => nvnflinger}/ui/fence.h (100%) rename src/core/hle/service/{nvflinger => nvnflinger}/ui/graphic_buffer.h (97%) rename src/core/hle/service/{nvflinger => nvnflinger}/window.h (100%) diff --git a/src/common/logging/filter.cpp b/src/common/logging/filter.cpp index a959acb74..c95909561 100644 --- a/src/common/logging/filter.cpp +++ b/src/common/logging/filter.cpp @@ -119,7 +119,7 @@ bool ParseFilterRule(Filter& instance, Iterator begin, Iterator end) { SUB(Service, NPNS) \ SUB(Service, NS) \ SUB(Service, NVDRV) \ - SUB(Service, NVFlinger) \ + SUB(Service, Nvnflinger) \ SUB(Service, OLSC) \ SUB(Service, PCIE) \ SUB(Service, PCTL) \ diff --git a/src/common/logging/types.h b/src/common/logging/types.h index 595c15ada..8356e3183 100644 --- a/src/common/logging/types.h +++ b/src/common/logging/types.h @@ -29,107 +29,107 @@ enum class Level : u8 { * filter.cpp. */ enum class Class : u8 { - Log, ///< Messages about the log system itself - Common, ///< Library routines - Common_Filesystem, ///< Filesystem interface library - Common_Memory, ///< Memory mapping and management functions - Core, ///< LLE emulation core - Core_ARM, ///< ARM CPU core - Core_Timing, ///< CoreTiming functions - Config, ///< Emulator configuration (including commandline) - Debug, ///< Debugging tools - Debug_Emulated, ///< Debug messages from the emulated programs - Debug_GPU, ///< GPU debugging tools - Debug_Breakpoint, ///< Logging breakpoints and watchpoints - Debug_GDBStub, ///< GDB Stub - Kernel, ///< The HLE implementation of the CTR kernel - Kernel_SVC, ///< Kernel system calls - Service, ///< HLE implementation of system services. Each major service - ///< should have its own subclass. - Service_ACC, ///< The ACC (Accounts) service - Service_AM, ///< The AM (Applet manager) service - Service_AOC, ///< The AOC (AddOn Content) service - Service_APM, ///< The APM (Performance) service - Service_ARP, ///< The ARP service - Service_Audio, ///< The Audio (Audio control) service - Service_BCAT, ///< The BCAT service - Service_BGTC, ///< The BGTC (Background Task Controller) service - Service_BPC, ///< The BPC service - Service_BTDRV, ///< The Bluetooth driver service - Service_BTM, ///< The BTM service - Service_Capture, ///< The capture service - Service_ERPT, ///< The error reporting service - Service_ETicket, ///< The ETicket service - Service_EUPLD, ///< The error upload service - Service_Fatal, ///< The Fatal service - Service_FGM, ///< The FGM service - Service_Friend, ///< The friend service - Service_FS, ///< The FS (Filesystem) service - Service_GRC, ///< The game recording service - Service_HID, ///< The HID (Human interface device) service - Service_IRS, ///< The IRS service - Service_JIT, ///< The JIT service - Service_LBL, ///< The LBL (LCD backlight) service - Service_LDN, ///< The LDN (Local domain network) service - Service_LDR, ///< The loader service - Service_LM, ///< The LM (Logger) service - Service_Migration, ///< The migration service - Service_Mii, ///< The Mii service - Service_MM, ///< The MM (Multimedia) service - Service_MNPP, ///< The MNPP service - Service_NCM, ///< The NCM service - Service_NFC, ///< The NFC (Near-field communication) service - Service_NFP, ///< The NFP service - Service_NGCT, ///< The NGCT (No Good Content for Terra) service - Service_NIFM, ///< The NIFM (Network interface) service - Service_NIM, ///< The NIM service - Service_NOTIF, ///< The NOTIF (Notification) service - Service_NPNS, ///< The NPNS service - Service_NS, ///< The NS services - Service_NVDRV, ///< The NVDRV (Nvidia driver) service - Service_NVFlinger, ///< The NVFlinger service - Service_OLSC, ///< The OLSC service - Service_PCIE, ///< The PCIe service - Service_PCTL, ///< The PCTL (Parental control) service - Service_PCV, ///< The PCV service - Service_PM, ///< The PM service - Service_PREPO, ///< The PREPO (Play report) service - Service_PSC, ///< The PSC service - Service_PTM, ///< The PTM service - Service_SET, ///< The SET (Settings) service - Service_SM, ///< The SM (Service manager) service - Service_SPL, ///< The SPL service - Service_SSL, ///< The SSL service - Service_TCAP, ///< The TCAP service. - Service_Time, ///< The time service - Service_USB, ///< The USB (Universal Serial Bus) service - Service_VI, ///< The VI (Video interface) service - Service_WLAN, ///< The WLAN (Wireless local area network) service - HW, ///< Low-level hardware emulation - HW_Memory, ///< Memory-map and address translation - HW_LCD, ///< LCD register emulation - HW_GPU, ///< GPU control emulation - HW_AES, ///< AES engine emulation - IPC, ///< IPC interface - Frontend, ///< Emulator UI - Render, ///< Emulator video output and hardware acceleration - Render_Software, ///< Software renderer backend - Render_OpenGL, ///< OpenGL backend - Render_Vulkan, ///< Vulkan backend - Shader, ///< Shader recompiler - Shader_SPIRV, ///< Shader SPIR-V code generation - Shader_GLASM, ///< Shader GLASM code generation - Shader_GLSL, ///< Shader GLSL code generation - Audio, ///< Audio emulation - Audio_DSP, ///< The HLE implementation of the DSP - Audio_Sink, ///< Emulator audio output backend - Loader, ///< ROM loader - CheatEngine, ///< Memory manipulation and engine VM functions - Crypto, ///< Cryptographic engine/functions - Input, ///< Input emulation - Network, ///< Network emulation - WebService, ///< Interface to yuzu Web Services - Count ///< Total number of logging classes + Log, ///< Messages about the log system itself + Common, ///< Library routines + Common_Filesystem, ///< Filesystem interface library + Common_Memory, ///< Memory mapping and management functions + Core, ///< LLE emulation core + Core_ARM, ///< ARM CPU core + Core_Timing, ///< CoreTiming functions + Config, ///< Emulator configuration (including commandline) + Debug, ///< Debugging tools + Debug_Emulated, ///< Debug messages from the emulated programs + Debug_GPU, ///< GPU debugging tools + Debug_Breakpoint, ///< Logging breakpoints and watchpoints + Debug_GDBStub, ///< GDB Stub + Kernel, ///< The HLE implementation of the CTR kernel + Kernel_SVC, ///< Kernel system calls + Service, ///< HLE implementation of system services. Each major service + ///< should have its own subclass. + Service_ACC, ///< The ACC (Accounts) service + Service_AM, ///< The AM (Applet manager) service + Service_AOC, ///< The AOC (AddOn Content) service + Service_APM, ///< The APM (Performance) service + Service_ARP, ///< The ARP service + Service_Audio, ///< The Audio (Audio control) service + Service_BCAT, ///< The BCAT service + Service_BGTC, ///< The BGTC (Background Task Controller) service + Service_BPC, ///< The BPC service + Service_BTDRV, ///< The Bluetooth driver service + Service_BTM, ///< The BTM service + Service_Capture, ///< The capture service + Service_ERPT, ///< The error reporting service + Service_ETicket, ///< The ETicket service + Service_EUPLD, ///< The error upload service + Service_Fatal, ///< The Fatal service + Service_FGM, ///< The FGM service + Service_Friend, ///< The friend service + Service_FS, ///< The FS (Filesystem) service + Service_GRC, ///< The game recording service + Service_HID, ///< The HID (Human interface device) service + Service_IRS, ///< The IRS service + Service_JIT, ///< The JIT service + Service_LBL, ///< The LBL (LCD backlight) service + Service_LDN, ///< The LDN (Local domain network) service + Service_LDR, ///< The loader service + Service_LM, ///< The LM (Logger) service + Service_Migration, ///< The migration service + Service_Mii, ///< The Mii service + Service_MM, ///< The MM (Multimedia) service + Service_MNPP, ///< The MNPP service + Service_NCM, ///< The NCM service + Service_NFC, ///< The NFC (Near-field communication) service + Service_NFP, ///< The NFP service + Service_NGCT, ///< The NGCT (No Good Content for Terra) service + Service_NIFM, ///< The NIFM (Network interface) service + Service_NIM, ///< The NIM service + Service_NOTIF, ///< The NOTIF (Notification) service + Service_NPNS, ///< The NPNS service + Service_NS, ///< The NS services + Service_NVDRV, ///< The NVDRV (Nvidia driver) service + Service_Nvnflinger, ///< The Nvnflinger service + Service_OLSC, ///< The OLSC service + Service_PCIE, ///< The PCIe service + Service_PCTL, ///< The PCTL (Parental control) service + Service_PCV, ///< The PCV service + Service_PM, ///< The PM service + Service_PREPO, ///< The PREPO (Play report) service + Service_PSC, ///< The PSC service + Service_PTM, ///< The PTM service + Service_SET, ///< The SET (Settings) service + Service_SM, ///< The SM (Service manager) service + Service_SPL, ///< The SPL service + Service_SSL, ///< The SSL service + Service_TCAP, ///< The TCAP service. + Service_Time, ///< The time service + Service_USB, ///< The USB (Universal Serial Bus) service + Service_VI, ///< The VI (Video interface) service + Service_WLAN, ///< The WLAN (Wireless local area network) service + HW, ///< Low-level hardware emulation + HW_Memory, ///< Memory-map and address translation + HW_LCD, ///< LCD register emulation + HW_GPU, ///< GPU control emulation + HW_AES, ///< AES engine emulation + IPC, ///< IPC interface + Frontend, ///< Emulator UI + Render, ///< Emulator video output and hardware acceleration + Render_Software, ///< Software renderer backend + Render_OpenGL, ///< OpenGL backend + Render_Vulkan, ///< Vulkan backend + Shader, ///< Shader recompiler + Shader_SPIRV, ///< Shader SPIR-V code generation + Shader_GLASM, ///< Shader GLASM code generation + Shader_GLSL, ///< Shader GLSL code generation + Audio, ///< Audio emulation + Audio_DSP, ///< The HLE implementation of the DSP + Audio_Sink, ///< Emulator audio output backend + Loader, ///< ROM loader + CheatEngine, ///< Memory manipulation and engine VM functions + Crypto, ///< Cryptographic engine/functions + Input, ///< Input emulation + Network, ///< Network emulation + WebService, ///< Interface to yuzu Web Services + Count ///< Total number of logging classes }; } // namespace Common::Log diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 194cdd025..4a1a8bb43 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -626,35 +626,35 @@ add_library(core STATIC hle/service/nvdrv/nvdrv_interface.h hle/service/nvdrv/nvmemp.cpp hle/service/nvdrv/nvmemp.h - hle/service/nvflinger/binder.h - hle/service/nvflinger/buffer_item.h - hle/service/nvflinger/buffer_item_consumer.cpp - hle/service/nvflinger/buffer_item_consumer.h - hle/service/nvflinger/buffer_queue_consumer.cpp - hle/service/nvflinger/buffer_queue_consumer.h - hle/service/nvflinger/buffer_queue_core.cpp - hle/service/nvflinger/buffer_queue_core.h - hle/service/nvflinger/buffer_queue_defs.h - hle/service/nvflinger/buffer_queue_producer.cpp - hle/service/nvflinger/buffer_queue_producer.h - hle/service/nvflinger/buffer_slot.h - hle/service/nvflinger/buffer_transform_flags.h - hle/service/nvflinger/consumer_base.cpp - hle/service/nvflinger/consumer_base.h - hle/service/nvflinger/consumer_listener.h - hle/service/nvflinger/graphic_buffer_producer.cpp - hle/service/nvflinger/graphic_buffer_producer.h - hle/service/nvflinger/hos_binder_driver_server.cpp - hle/service/nvflinger/hos_binder_driver_server.h - hle/service/nvflinger/nvflinger.cpp - hle/service/nvflinger/nvflinger.h - hle/service/nvflinger/parcel.h - hle/service/nvflinger/pixel_format.h - hle/service/nvflinger/producer_listener.h - hle/service/nvflinger/status.h - hle/service/nvflinger/ui/fence.h - hle/service/nvflinger/ui/graphic_buffer.h - hle/service/nvflinger/window.h + hle/service/nvnflinger/binder.h + hle/service/nvnflinger/buffer_item.h + hle/service/nvnflinger/buffer_item_consumer.cpp + hle/service/nvnflinger/buffer_item_consumer.h + hle/service/nvnflinger/buffer_queue_consumer.cpp + hle/service/nvnflinger/buffer_queue_consumer.h + hle/service/nvnflinger/buffer_queue_core.cpp + hle/service/nvnflinger/buffer_queue_core.h + hle/service/nvnflinger/buffer_queue_defs.h + hle/service/nvnflinger/buffer_queue_producer.cpp + hle/service/nvnflinger/buffer_queue_producer.h + hle/service/nvnflinger/buffer_slot.h + hle/service/nvnflinger/buffer_transform_flags.h + hle/service/nvnflinger/consumer_base.cpp + hle/service/nvnflinger/consumer_base.h + hle/service/nvnflinger/consumer_listener.h + hle/service/nvnflinger/graphic_buffer_producer.cpp + hle/service/nvnflinger/graphic_buffer_producer.h + hle/service/nvnflinger/hos_binder_driver_server.cpp + hle/service/nvnflinger/hos_binder_driver_server.h + hle/service/nvnflinger/nvnflinger.cpp + hle/service/nvnflinger/nvnflinger.h + hle/service/nvnflinger/parcel.h + hle/service/nvnflinger/pixel_format.h + hle/service/nvnflinger/producer_listener.h + hle/service/nvnflinger/status.h + hle/service/nvnflinger/ui/fence.h + hle/service/nvnflinger/ui/graphic_buffer.h + hle/service/nvnflinger/window.h hle/service/olsc/olsc.cpp hle/service/olsc/olsc.h hle/service/pcie/pcie.cpp diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 00b096f9e..f74c7b550 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -30,7 +30,7 @@ #include "core/hle/service/filesystem/filesystem.h" #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/ns/ns.h" -#include "core/hle/service/nvflinger/nvflinger.h" +#include "core/hle/service/nvnflinger/nvnflinger.h" #include "core/hle/service/pm/pm.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/sm/sm.h" @@ -251,10 +251,9 @@ IDebugFunctions::IDebugFunctions(Core::System& system_) IDebugFunctions::~IDebugFunctions() = default; -ISelfController::ISelfController(Core::System& system_, NVFlinger::NVFlinger& nvflinger_) - : ServiceFramework{system_, "ISelfController"}, nvflinger{nvflinger_}, service_context{ - system, - "ISelfController"} { +ISelfController::ISelfController(Core::System& system_, Nvnflinger::Nvnflinger& nvnflinger_) + : ServiceFramework{system_, "ISelfController"}, nvnflinger{nvnflinger_}, + service_context{system, "ISelfController"} { // clang-format off static const FunctionInfo functions[] = { {0, &ISelfController::Exit, "Exit"}, @@ -470,8 +469,8 @@ void ISelfController::CreateManagedDisplayLayer(HLERequestContext& ctx) { // TODO(Subv): Find out how AM determines the display to use, for now just // create the layer in the Default display. - const auto display_id = nvflinger.OpenDisplay("Default"); - const auto layer_id = nvflinger.CreateLayer(*display_id); + const auto display_id = nvnflinger.OpenDisplay("Default"); + const auto layer_id = nvnflinger.CreateLayer(*display_id); IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); @@ -488,8 +487,8 @@ void ISelfController::CreateManagedDisplaySeparableLayer(HLERequestContext& ctx) // Outputting 1 layer id instead of the expected 2 has not been observed to cause any adverse // side effects. // TODO: Support multiple layers - const auto display_id = nvflinger.OpenDisplay("Default"); - const auto layer_id = nvflinger.CreateLayer(*display_id); + const auto display_id = nvnflinger.OpenDisplay("Default"); + const auto layer_id = nvnflinger.CreateLayer(*display_id); IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); @@ -1826,7 +1825,7 @@ void IApplicationFunctions::PrepareForJit(HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system) { +void LoopProcess(Nvnflinger::Nvnflinger& nvnflinger, Core::System& system) { auto message_queue = std::make_shared(system); // Needed on game boot message_queue->PushMessage(AppletMessageQueue::AppletMessage::FocusStateChanged); @@ -1834,9 +1833,9 @@ void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system) { auto server_manager = std::make_unique(system); server_manager->RegisterNamedService( - "appletAE", std::make_shared(nvflinger, message_queue, system)); + "appletAE", std::make_shared(nvnflinger, message_queue, system)); server_manager->RegisterNamedService( - "appletOE", std::make_shared(nvflinger, message_queue, system)); + "appletOE", std::make_shared(nvnflinger, message_queue, system)); server_manager->RegisterNamedService("idle:sys", std::make_shared(system)); server_manager->RegisterNamedService("omm", std::make_shared(system)); server_manager->RegisterNamedService("spsm", std::make_shared(system)); diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h index fd3d4ddef..0dbc6485e 100644 --- a/src/core/hle/service/am/am.h +++ b/src/core/hle/service/am/am.h @@ -16,8 +16,8 @@ class KReadableEvent; class KTransferMemory; } // namespace Kernel -namespace Service::NVFlinger { -class NVFlinger; +namespace Service::Nvnflinger { +class Nvnflinger; } namespace Service::AM { @@ -154,7 +154,7 @@ public: class ISelfController final : public ServiceFramework { public: - explicit ISelfController(Core::System& system_, NVFlinger::NVFlinger& nvflinger_); + explicit ISelfController(Core::System& system_, Nvnflinger::Nvnflinger& nvnflinger_); ~ISelfController() override; private: @@ -191,7 +191,7 @@ private: Disable = 2, }; - NVFlinger::NVFlinger& nvflinger; + Nvnflinger::Nvnflinger& nvnflinger; KernelHelpers::ServiceContext service_context; @@ -397,6 +397,6 @@ public: ~IProcessWindingController() override; }; -void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system); +void LoopProcess(Nvnflinger::Nvnflinger& nvnflinger, Core::System& system); } // namespace Service::AM diff --git a/src/core/hle/service/am/applet_ae.cpp b/src/core/hle/service/am/applet_ae.cpp index e15b5ccfa..2764f7ceb 100644 --- a/src/core/hle/service/am/applet_ae.cpp +++ b/src/core/hle/service/am/applet_ae.cpp @@ -6,17 +6,17 @@ #include "core/hle/service/am/am.h" #include "core/hle/service/am/applet_ae.h" #include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nvflinger/nvflinger.h" +#include "core/hle/service/nvnflinger/nvnflinger.h" namespace Service::AM { class ILibraryAppletProxy final : public ServiceFramework { public: - explicit ILibraryAppletProxy(NVFlinger::NVFlinger& nvflinger_, + explicit ILibraryAppletProxy(Nvnflinger::Nvnflinger& nvnflinger_, std::shared_ptr msg_queue_, Core::System& system_) - : ServiceFramework{system_, "ILibraryAppletProxy"}, nvflinger{nvflinger_}, - msg_queue{std::move(msg_queue_)} { + : ServiceFramework{system_, "ILibraryAppletProxy"}, + nvnflinger{nvnflinger_}, msg_queue{std::move(msg_queue_)} { // clang-format off static const FunctionInfo functions[] = { {0, &ILibraryAppletProxy::GetCommonStateGetter, "GetCommonStateGetter"}, @@ -49,7 +49,7 @@ private: IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface(system, nvflinger); + rb.PushIpcInterface(system, nvnflinger); } void GetWindowController(HLERequestContext& ctx) { @@ -108,17 +108,17 @@ private: rb.PushIpcInterface(system); } - NVFlinger::NVFlinger& nvflinger; + Nvnflinger::Nvnflinger& nvnflinger; std::shared_ptr msg_queue; }; class ISystemAppletProxy final : public ServiceFramework { public: - explicit ISystemAppletProxy(NVFlinger::NVFlinger& nvflinger_, + explicit ISystemAppletProxy(Nvnflinger::Nvnflinger& nvnflinger_, std::shared_ptr msg_queue_, Core::System& system_) - : ServiceFramework{system_, "ISystemAppletProxy"}, nvflinger{nvflinger_}, - msg_queue{std::move(msg_queue_)} { + : ServiceFramework{system_, "ISystemAppletProxy"}, + nvnflinger{nvnflinger_}, msg_queue{std::move(msg_queue_)} { // clang-format off static const FunctionInfo functions[] = { {0, &ISystemAppletProxy::GetCommonStateGetter, "GetCommonStateGetter"}, @@ -153,7 +153,7 @@ private: IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface(system, nvflinger); + rb.PushIpcInterface(system, nvnflinger); } void GetWindowController(HLERequestContext& ctx) { @@ -220,7 +220,7 @@ private: rb.PushIpcInterface(system); } - NVFlinger::NVFlinger& nvflinger; + Nvnflinger::Nvnflinger& nvnflinger; std::shared_ptr msg_queue; }; @@ -229,7 +229,7 @@ void AppletAE::OpenSystemAppletProxy(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface(nvflinger, msg_queue, system); + rb.PushIpcInterface(nvnflinger, msg_queue, system); } void AppletAE::OpenLibraryAppletProxy(HLERequestContext& ctx) { @@ -237,7 +237,7 @@ void AppletAE::OpenLibraryAppletProxy(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface(nvflinger, msg_queue, system); + rb.PushIpcInterface(nvnflinger, msg_queue, system); } void AppletAE::OpenLibraryAppletProxyOld(HLERequestContext& ctx) { @@ -245,13 +245,13 @@ void AppletAE::OpenLibraryAppletProxyOld(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface(nvflinger, msg_queue, system); + rb.PushIpcInterface(nvnflinger, msg_queue, system); } -AppletAE::AppletAE(NVFlinger::NVFlinger& nvflinger_, std::shared_ptr msg_queue_, - Core::System& system_) - : ServiceFramework{system_, "appletAE"}, nvflinger{nvflinger_}, msg_queue{ - std::move(msg_queue_)} { +AppletAE::AppletAE(Nvnflinger::Nvnflinger& nvnflinger_, + std::shared_ptr msg_queue_, Core::System& system_) + : ServiceFramework{system_, "appletAE"}, nvnflinger{nvnflinger_}, msg_queue{ + std::move(msg_queue_)} { // clang-format off static const FunctionInfo functions[] = { {100, &AppletAE::OpenSystemAppletProxy, "OpenSystemAppletProxy"}, diff --git a/src/core/hle/service/am/applet_ae.h b/src/core/hle/service/am/applet_ae.h index df8dccdc0..538ce2903 100644 --- a/src/core/hle/service/am/applet_ae.h +++ b/src/core/hle/service/am/applet_ae.h @@ -12,8 +12,8 @@ namespace FileSystem { class FileSystemController; } -namespace NVFlinger { -class NVFlinger; +namespace Nvnflinger { +class Nvnflinger; } namespace AM { @@ -22,7 +22,7 @@ class AppletMessageQueue; class AppletAE final : public ServiceFramework { public: - explicit AppletAE(NVFlinger::NVFlinger& nvflinger_, + explicit AppletAE(Nvnflinger::Nvnflinger& nvnflinger_, std::shared_ptr msg_queue_, Core::System& system_); ~AppletAE() override; @@ -33,7 +33,7 @@ private: void OpenLibraryAppletProxy(HLERequestContext& ctx); void OpenLibraryAppletProxyOld(HLERequestContext& ctx); - NVFlinger::NVFlinger& nvflinger; + Nvnflinger::Nvnflinger& nvnflinger; std::shared_ptr msg_queue; }; diff --git a/src/core/hle/service/am/applet_oe.cpp b/src/core/hle/service/am/applet_oe.cpp index 75c330f0a..d6c565d85 100644 --- a/src/core/hle/service/am/applet_oe.cpp +++ b/src/core/hle/service/am/applet_oe.cpp @@ -5,17 +5,17 @@ #include "core/hle/service/am/am.h" #include "core/hle/service/am/applet_oe.h" #include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nvflinger/nvflinger.h" +#include "core/hle/service/nvnflinger/nvnflinger.h" namespace Service::AM { class IApplicationProxy final : public ServiceFramework { public: - explicit IApplicationProxy(NVFlinger::NVFlinger& nvflinger_, + explicit IApplicationProxy(Nvnflinger::Nvnflinger& nvnflinger_, std::shared_ptr msg_queue_, Core::System& system_) - : ServiceFramework{system_, "IApplicationProxy"}, nvflinger{nvflinger_}, - msg_queue{std::move(msg_queue_)} { + : ServiceFramework{system_, "IApplicationProxy"}, + nvnflinger{nvnflinger_}, msg_queue{std::move(msg_queue_)} { // clang-format off static const FunctionInfo functions[] = { {0, &IApplicationProxy::GetCommonStateGetter, "GetCommonStateGetter"}, @@ -71,7 +71,7 @@ private: IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface(system, nvflinger); + rb.PushIpcInterface(system, nvnflinger); } void GetCommonStateGetter(HLERequestContext& ctx) { @@ -98,7 +98,7 @@ private: rb.PushIpcInterface(system); } - NVFlinger::NVFlinger& nvflinger; + Nvnflinger::Nvnflinger& nvnflinger; std::shared_ptr msg_queue; }; @@ -107,13 +107,13 @@ void AppletOE::OpenApplicationProxy(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface(nvflinger, msg_queue, system); + rb.PushIpcInterface(nvnflinger, msg_queue, system); } -AppletOE::AppletOE(NVFlinger::NVFlinger& nvflinger_, std::shared_ptr msg_queue_, - Core::System& system_) - : ServiceFramework{system_, "appletOE"}, nvflinger{nvflinger_}, msg_queue{ - std::move(msg_queue_)} { +AppletOE::AppletOE(Nvnflinger::Nvnflinger& nvnflinger_, + std::shared_ptr msg_queue_, Core::System& system_) + : ServiceFramework{system_, "appletOE"}, nvnflinger{nvnflinger_}, msg_queue{ + std::move(msg_queue_)} { static const FunctionInfo functions[] = { {0, &AppletOE::OpenApplicationProxy, "OpenApplicationProxy"}, }; diff --git a/src/core/hle/service/am/applet_oe.h b/src/core/hle/service/am/applet_oe.h index f34e4224e..39eccc4ab 100644 --- a/src/core/hle/service/am/applet_oe.h +++ b/src/core/hle/service/am/applet_oe.h @@ -12,8 +12,8 @@ namespace FileSystem { class FileSystemController; } -namespace NVFlinger { -class NVFlinger; +namespace Nvnflinger { +class Nvnflinger; } namespace AM { @@ -22,7 +22,7 @@ class AppletMessageQueue; class AppletOE final : public ServiceFramework { public: - explicit AppletOE(NVFlinger::NVFlinger& nvflinger_, + explicit AppletOE(Nvnflinger::Nvnflinger& nvnflinger_, std::shared_ptr msg_queue_, Core::System& system_); ~AppletOE() override; @@ -31,7 +31,7 @@ public: private: void OpenApplicationProxy(HLERequestContext& ctx); - NVFlinger::NVFlinger& nvflinger; + Nvnflinger::Nvnflinger& nvnflinger; std::shared_ptr msg_queue; }; diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h index 81bd7960a..bcd0e3ed5 100644 --- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h +++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h @@ -8,8 +8,8 @@ #include "common/common_types.h" #include "common/math_util.h" #include "core/hle/service/nvdrv/devices/nvdevice.h" -#include "core/hle/service/nvflinger/buffer_transform_flags.h" -#include "core/hle/service/nvflinger/pixel_format.h" +#include "core/hle/service/nvnflinger/buffer_transform_flags.h" +#include "core/hle/service/nvnflinger/pixel_format.h" namespace Service::Nvidia::NvCore { class Container; diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index 5e71ec99f..3d774eec4 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -23,7 +23,7 @@ #include "core/hle/service/nvdrv/nvdrv.h" #include "core/hle/service/nvdrv/nvdrv_interface.h" #include "core/hle/service/nvdrv/nvmemp.h" -#include "core/hle/service/nvflinger/nvflinger.h" +#include "core/hle/service/nvnflinger/nvnflinger.h" #include "core/hle/service/server_manager.h" #include "video_core/gpu.h" @@ -42,7 +42,7 @@ void EventInterface::FreeEvent(Kernel::KEvent* event) { module.service_context.CloseEvent(event); } -void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system) { +void LoopProcess(Nvnflinger::Nvnflinger& nvnflinger, Core::System& system) { auto server_manager = std::make_unique(system); auto module = std::make_shared(system); server_manager->RegisterNamedService("nvdrv", std::make_shared(system, module, "nvdrv")); @@ -53,7 +53,7 @@ void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system) { server_manager->RegisterNamedService("nvdrv:t", std::make_shared(system, module, "nvdrv:t")); server_manager->RegisterNamedService("nvmemp", std::make_shared(system)); - nvflinger.SetNVDrvInstance(module); + nvnflinger.SetNVDrvInstance(module); ServerManager::RunServer(std::move(server_manager)); } diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.h index b2270cf76..668be742b 100644 --- a/src/core/hle/service/nvdrv/nvdrv.h +++ b/src/core/hle/service/nvdrv/nvdrv.h @@ -16,7 +16,7 @@ #include "core/hle/service/kernel_helpers.h" #include "core/hle/service/nvdrv/core/container.h" #include "core/hle/service/nvdrv/nvdata.h" -#include "core/hle/service/nvflinger/ui/fence.h" +#include "core/hle/service/nvnflinger/ui/fence.h" #include "core/hle/service/service.h" namespace Core { @@ -27,8 +27,8 @@ namespace Kernel { class KEvent; } -namespace Service::NVFlinger { -class NVFlinger; +namespace Service::Nvnflinger { +class Nvnflinger; } namespace Service::Nvidia { @@ -95,7 +95,7 @@ public: private: friend class EventInterface; - friend class Service::NVFlinger::NVFlinger; + friend class Service::Nvnflinger::Nvnflinger; /// Manages syncpoints on the host NvCore::Container container; @@ -114,6 +114,6 @@ private: std::unordered_map> builders; }; -void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system); +void LoopProcess(Nvnflinger::Nvnflinger& nvnflinger, Core::System& system); } // namespace Service::Nvidia diff --git a/src/core/hle/service/nvflinger/binder.h b/src/core/hle/service/nvnflinger/binder.h similarity index 100% rename from src/core/hle/service/nvflinger/binder.h rename to src/core/hle/service/nvnflinger/binder.h diff --git a/src/core/hle/service/nvflinger/buffer_item.h b/src/core/hle/service/nvnflinger/buffer_item.h similarity index 92% rename from src/core/hle/service/nvflinger/buffer_item.h rename to src/core/hle/service/nvnflinger/buffer_item.h index f73dec4f1..7fd808f54 100644 --- a/src/core/hle/service/nvflinger/buffer_item.h +++ b/src/core/hle/service/nvnflinger/buffer_item.h @@ -10,8 +10,8 @@ #include "common/common_types.h" #include "common/math_util.h" -#include "core/hle/service/nvflinger/ui/fence.h" -#include "core/hle/service/nvflinger/window.h" +#include "core/hle/service/nvnflinger/ui/fence.h" +#include "core/hle/service/nvnflinger/window.h" namespace Service::android { diff --git a/src/core/hle/service/nvflinger/buffer_item_consumer.cpp b/src/core/hle/service/nvnflinger/buffer_item_consumer.cpp similarity index 79% rename from src/core/hle/service/nvflinger/buffer_item_consumer.cpp rename to src/core/hle/service/nvnflinger/buffer_item_consumer.cpp index 152bb5bdf..cf151ea3a 100644 --- a/src/core/hle/service/nvflinger/buffer_item_consumer.cpp +++ b/src/core/hle/service/nvnflinger/buffer_item_consumer.cpp @@ -6,9 +6,9 @@ #include "common/assert.h" #include "common/logging/log.h" -#include "core/hle/service/nvflinger/buffer_item.h" -#include "core/hle/service/nvflinger/buffer_item_consumer.h" -#include "core/hle/service/nvflinger/buffer_queue_consumer.h" +#include "core/hle/service/nvnflinger/buffer_item.h" +#include "core/hle/service/nvnflinger/buffer_item_consumer.h" +#include "core/hle/service/nvnflinger/buffer_queue_consumer.h" namespace Service::android { @@ -25,7 +25,7 @@ Status BufferItemConsumer::AcquireBuffer(BufferItem* item, std::chrono::nanoseco if (const auto status = AcquireBufferLocked(item, present_when); status != Status::NoError) { if (status != Status::NoBufferAvailable) { - LOG_ERROR(Service_NVFlinger, "Failed to acquire buffer: {}", status); + LOG_ERROR(Service_Nvnflinger, "Failed to acquire buffer: {}", status); } return status; } @@ -44,12 +44,12 @@ Status BufferItemConsumer::ReleaseBuffer(const BufferItem& item, const Fence& re if (const auto status = AddReleaseFenceLocked(item.buf, item.graphic_buffer, release_fence); status != Status::NoError) { - LOG_ERROR(Service_NVFlinger, "Failed to add fence: {}", status); + LOG_ERROR(Service_Nvnflinger, "Failed to add fence: {}", status); } if (const auto status = ReleaseBufferLocked(item.buf, item.graphic_buffer); status != Status::NoError) { - LOG_WARNING(Service_NVFlinger, "Failed to release buffer: {}", status); + LOG_WARNING(Service_Nvnflinger, "Failed to release buffer: {}", status); return status; } diff --git a/src/core/hle/service/nvflinger/buffer_item_consumer.h b/src/core/hle/service/nvnflinger/buffer_item_consumer.h similarity index 89% rename from src/core/hle/service/nvflinger/buffer_item_consumer.h rename to src/core/hle/service/nvnflinger/buffer_item_consumer.h index a5c655d9e..e0c6b3604 100644 --- a/src/core/hle/service/nvflinger/buffer_item_consumer.h +++ b/src/core/hle/service/nvnflinger/buffer_item_consumer.h @@ -10,8 +10,8 @@ #include #include "common/common_types.h" -#include "core/hle/service/nvflinger/consumer_base.h" -#include "core/hle/service/nvflinger/status.h" +#include "core/hle/service/nvnflinger/consumer_base.h" +#include "core/hle/service/nvnflinger/status.h" namespace Service::android { diff --git a/src/core/hle/service/nvflinger/buffer_queue_consumer.cpp b/src/core/hle/service/nvnflinger/buffer_queue_consumer.cpp similarity index 81% rename from src/core/hle/service/nvflinger/buffer_queue_consumer.cpp rename to src/core/hle/service/nvnflinger/buffer_queue_consumer.cpp index 0767e548d..51291539d 100644 --- a/src/core/hle/service/nvflinger/buffer_queue_consumer.cpp +++ b/src/core/hle/service/nvnflinger/buffer_queue_consumer.cpp @@ -6,11 +6,11 @@ #include "common/logging/log.h" #include "core/hle/service/nvdrv/core/nvmap.h" -#include "core/hle/service/nvflinger/buffer_item.h" -#include "core/hle/service/nvflinger/buffer_queue_consumer.h" -#include "core/hle/service/nvflinger/buffer_queue_core.h" -#include "core/hle/service/nvflinger/producer_listener.h" -#include "core/hle/service/nvflinger/ui/graphic_buffer.h" +#include "core/hle/service/nvnflinger/buffer_item.h" +#include "core/hle/service/nvnflinger/buffer_queue_consumer.h" +#include "core/hle/service/nvnflinger/buffer_queue_core.h" +#include "core/hle/service/nvnflinger/producer_listener.h" +#include "core/hle/service/nvnflinger/ui/graphic_buffer.h" namespace Service::android { @@ -31,7 +31,7 @@ Status BufferQueueConsumer::AcquireBuffer(BufferItem* out_buffer, }))}; if (num_acquired_buffers >= core->max_acquired_buffer_count + 1) { - LOG_ERROR(Service_NVFlinger, "max acquired buffer count reached: {} (max {})", + LOG_ERROR(Service_Nvnflinger, "max acquired buffer count reached: {} (max {})", num_acquired_buffers, core->max_acquired_buffer_count); return Status::InvalidOperation; } @@ -57,12 +57,12 @@ Status BufferQueueConsumer::AcquireBuffer(BufferItem* out_buffer, if (desired_present < expected_present.count() - MAX_REASONABLE_NSEC || desired_present > expected_present.count()) { // This buffer is set to display in the near future, or desired_present is garbage. - LOG_DEBUG(Service_NVFlinger, "nodrop desire={} expect={}", desired_present, + LOG_DEBUG(Service_Nvnflinger, "nodrop desire={} expect={}", desired_present, expected_present.count()); break; } - LOG_DEBUG(Service_NVFlinger, "drop desire={} expect={} size={}", desired_present, + LOG_DEBUG(Service_Nvnflinger, "drop desire={} expect={} size={}", desired_present, expected_present.count(), core->queue.size()); if (core->StillTracking(*front)) { @@ -78,19 +78,19 @@ Status BufferQueueConsumer::AcquireBuffer(BufferItem* out_buffer, const auto desired_present = front->timestamp; if (desired_present > expected_present.count() && desired_present < expected_present.count() + MAX_REASONABLE_NSEC) { - LOG_DEBUG(Service_NVFlinger, "defer desire={} expect={}", desired_present, + LOG_DEBUG(Service_Nvnflinger, "defer desire={} expect={}", desired_present, expected_present.count()); return Status::PresentLater; } - LOG_DEBUG(Service_NVFlinger, "accept desire={} expect={}", desired_present, + LOG_DEBUG(Service_Nvnflinger, "accept desire={} expect={}", desired_present, expected_present.count()); } const auto slot = front->slot; *out_buffer = *front; - LOG_DEBUG(Service_NVFlinger, "acquiring slot={}", slot); + LOG_DEBUG(Service_Nvnflinger, "acquiring slot={}", slot); // If the buffer has previously been acquired by the consumer, set graphic_buffer to nullptr to // avoid unnecessarily remapping this buffer on the consumer side. @@ -109,7 +109,7 @@ Status BufferQueueConsumer::AcquireBuffer(BufferItem* out_buffer, Status BufferQueueConsumer::ReleaseBuffer(s32 slot, u64 frame_number, const Fence& release_fence) { if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) { - LOG_ERROR(Service_NVFlinger, "slot {} out of range", slot); + LOG_ERROR(Service_Nvnflinger, "slot {} out of range", slot); return Status::BadValue; } @@ -127,7 +127,7 @@ Status BufferQueueConsumer::ReleaseBuffer(s32 slot, u64 frame_number, const Fenc auto current(core->queue.begin()); while (current != core->queue.end()) { if (current->slot == slot) { - LOG_ERROR(Service_NVFlinger, "buffer slot {} pending release is currently queued", + LOG_ERROR(Service_Nvnflinger, "buffer slot {} pending release is currently queued", slot); return Status::BadValue; } @@ -140,7 +140,7 @@ Status BufferQueueConsumer::ReleaseBuffer(s32 slot, u64 frame_number, const Fenc listener = core->connected_producer_listener; - LOG_DEBUG(Service_NVFlinger, "releasing slot {}", slot); + LOG_DEBUG(Service_Nvnflinger, "releasing slot {}", slot); core->SignalDequeueCondition(); } @@ -156,16 +156,16 @@ Status BufferQueueConsumer::ReleaseBuffer(s32 slot, u64 frame_number, const Fenc Status BufferQueueConsumer::Connect(std::shared_ptr consumer_listener, bool controlled_by_app) { if (consumer_listener == nullptr) { - LOG_ERROR(Service_NVFlinger, "consumer_listener may not be nullptr"); + LOG_ERROR(Service_Nvnflinger, "consumer_listener may not be nullptr"); return Status::BadValue; } - LOG_DEBUG(Service_NVFlinger, "controlled_by_app={}", controlled_by_app); + LOG_DEBUG(Service_Nvnflinger, "controlled_by_app={}", controlled_by_app); std::scoped_lock lock{core->mutex}; if (core->is_abandoned) { - LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); + LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned"); return Status::NoInit; } @@ -177,14 +177,14 @@ Status BufferQueueConsumer::Connect(std::shared_ptr consumer_ Status BufferQueueConsumer::GetReleasedBuffers(u64* out_slot_mask) { if (out_slot_mask == nullptr) { - LOG_ERROR(Service_NVFlinger, "out_slot_mask may not be nullptr"); + LOG_ERROR(Service_Nvnflinger, "out_slot_mask may not be nullptr"); return Status::BadValue; } std::scoped_lock lock{core->mutex}; if (core->is_abandoned) { - LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); + LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned"); return Status::NoInit; } @@ -205,7 +205,7 @@ Status BufferQueueConsumer::GetReleasedBuffers(u64* out_slot_mask) { ++current; } - LOG_DEBUG(Service_NVFlinger, "returning mask {}", mask); + LOG_DEBUG(Service_Nvnflinger, "returning mask {}", mask); *out_slot_mask = mask; return Status::NoError; } diff --git a/src/core/hle/service/nvflinger/buffer_queue_consumer.h b/src/core/hle/service/nvnflinger/buffer_queue_consumer.h similarity index 92% rename from src/core/hle/service/nvflinger/buffer_queue_consumer.h rename to src/core/hle/service/nvnflinger/buffer_queue_consumer.h index 4ec06ca13..50ed0bb5f 100644 --- a/src/core/hle/service/nvflinger/buffer_queue_consumer.h +++ b/src/core/hle/service/nvnflinger/buffer_queue_consumer.h @@ -10,8 +10,8 @@ #include #include "common/common_types.h" -#include "core/hle/service/nvflinger/buffer_queue_defs.h" -#include "core/hle/service/nvflinger/status.h" +#include "core/hle/service/nvnflinger/buffer_queue_defs.h" +#include "core/hle/service/nvnflinger/status.h" namespace Service::Nvidia::NvCore { class NvMap; diff --git a/src/core/hle/service/nvflinger/buffer_queue_core.cpp b/src/core/hle/service/nvnflinger/buffer_queue_core.cpp similarity index 96% rename from src/core/hle/service/nvflinger/buffer_queue_core.cpp rename to src/core/hle/service/nvnflinger/buffer_queue_core.cpp index 3d1338e66..2dbe29616 100644 --- a/src/core/hle/service/nvflinger/buffer_queue_core.cpp +++ b/src/core/hle/service/nvnflinger/buffer_queue_core.cpp @@ -6,7 +6,7 @@ #include "common/assert.h" -#include "core/hle/service/nvflinger/buffer_queue_core.h" +#include "core/hle/service/nvnflinger/buffer_queue_core.h" namespace Service::android { @@ -82,7 +82,7 @@ s32 BufferQueueCore::GetPreallocatedBufferCountLocked() const { } void BufferQueueCore::FreeBufferLocked(s32 slot) { - LOG_DEBUG(Service_NVFlinger, "slot {}", slot); + LOG_DEBUG(Service_Nvnflinger, "slot {}", slot); slots[slot].graphic_buffer.reset(); diff --git a/src/core/hle/service/nvflinger/buffer_queue_core.h b/src/core/hle/service/nvnflinger/buffer_queue_core.h similarity index 90% rename from src/core/hle/service/nvflinger/buffer_queue_core.h rename to src/core/hle/service/nvnflinger/buffer_queue_core.h index 85b3bc4c1..9164f08a0 100644 --- a/src/core/hle/service/nvflinger/buffer_queue_core.h +++ b/src/core/hle/service/nvnflinger/buffer_queue_core.h @@ -13,11 +13,11 @@ #include #include -#include "core/hle/service/nvflinger/buffer_item.h" -#include "core/hle/service/nvflinger/buffer_queue_defs.h" -#include "core/hle/service/nvflinger/pixel_format.h" -#include "core/hle/service/nvflinger/status.h" -#include "core/hle/service/nvflinger/window.h" +#include "core/hle/service/nvnflinger/buffer_item.h" +#include "core/hle/service/nvnflinger/buffer_queue_defs.h" +#include "core/hle/service/nvnflinger/pixel_format.h" +#include "core/hle/service/nvnflinger/status.h" +#include "core/hle/service/nvnflinger/window.h" namespace Service::android { diff --git a/src/core/hle/service/nvflinger/buffer_queue_defs.h b/src/core/hle/service/nvnflinger/buffer_queue_defs.h similarity index 92% rename from src/core/hle/service/nvflinger/buffer_queue_defs.h rename to src/core/hle/service/nvnflinger/buffer_queue_defs.h index 334445213..6fd3156f4 100644 --- a/src/core/hle/service/nvflinger/buffer_queue_defs.h +++ b/src/core/hle/service/nvnflinger/buffer_queue_defs.h @@ -9,7 +9,7 @@ #include #include "common/common_types.h" -#include "core/hle/service/nvflinger/buffer_slot.h" +#include "core/hle/service/nvnflinger/buffer_slot.h" namespace Service::android::BufferQueueDefs { diff --git a/src/core/hle/service/nvflinger/buffer_queue_producer.cpp b/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp similarity index 85% rename from src/core/hle/service/nvflinger/buffer_queue_producer.cpp rename to src/core/hle/service/nvnflinger/buffer_queue_producer.cpp index ad73edd66..cd0a13094 100644 --- a/src/core/hle/service/nvflinger/buffer_queue_producer.cpp +++ b/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp @@ -14,12 +14,12 @@ #include "core/hle/service/hle_ipc.h" #include "core/hle/service/kernel_helpers.h" #include "core/hle/service/nvdrv/core/nvmap.h" -#include "core/hle/service/nvflinger/buffer_queue_core.h" -#include "core/hle/service/nvflinger/buffer_queue_producer.h" -#include "core/hle/service/nvflinger/consumer_listener.h" -#include "core/hle/service/nvflinger/parcel.h" -#include "core/hle/service/nvflinger/ui/graphic_buffer.h" -#include "core/hle/service/nvflinger/window.h" +#include "core/hle/service/nvnflinger/buffer_queue_core.h" +#include "core/hle/service/nvnflinger/buffer_queue_producer.h" +#include "core/hle/service/nvnflinger/consumer_listener.h" +#include "core/hle/service/nvnflinger/parcel.h" +#include "core/hle/service/nvnflinger/ui/graphic_buffer.h" +#include "core/hle/service/nvnflinger/window.h" #include "core/hle/service/vi/vi.h" namespace Service::android { @@ -37,20 +37,20 @@ BufferQueueProducer::~BufferQueueProducer() { } Status BufferQueueProducer::RequestBuffer(s32 slot, std::shared_ptr* buf) { - LOG_DEBUG(Service_NVFlinger, "slot {}", slot); + LOG_DEBUG(Service_Nvnflinger, "slot {}", slot); std::scoped_lock lock{core->mutex}; if (core->is_abandoned) { - LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); + LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned"); return Status::NoInit; } if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) { - LOG_ERROR(Service_NVFlinger, "slot index {} out of range [0, {})", slot, + LOG_ERROR(Service_Nvnflinger, "slot index {} out of range [0, {})", slot, BufferQueueDefs::NUM_BUFFER_SLOTS); return Status::BadValue; } else if (slots[slot].buffer_state != BufferState::Dequeued) { - LOG_ERROR(Service_NVFlinger, "slot {} is not owned by the producer (state = {})", slot, + LOG_ERROR(Service_Nvnflinger, "slot {} is not owned by the producer (state = {})", slot, slots[slot].buffer_state); return Status::BadValue; } @@ -62,7 +62,7 @@ Status BufferQueueProducer::RequestBuffer(s32 slot, std::shared_ptr listener; { @@ -70,12 +70,12 @@ Status BufferQueueProducer::SetBufferCount(s32 buffer_count) { core->WaitWhileAllocatingLocked(); if (core->is_abandoned) { - LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); + LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned"); return Status::NoInit; } if (buffer_count > BufferQueueDefs::NUM_BUFFER_SLOTS) { - LOG_ERROR(Service_NVFlinger, "buffer_count {} too large (max {})", buffer_count, + LOG_ERROR(Service_Nvnflinger, "buffer_count {} too large (max {})", buffer_count, BufferQueueDefs::NUM_BUFFER_SLOTS); return Status::BadValue; } @@ -83,7 +83,7 @@ Status BufferQueueProducer::SetBufferCount(s32 buffer_count) { // There must be no dequeued buffers when changing the buffer count. for (s32 s{}; s < BufferQueueDefs::NUM_BUFFER_SLOTS; ++s) { if (slots[s].buffer_state == BufferState::Dequeued) { - LOG_ERROR(Service_NVFlinger, "buffer owned by producer"); + LOG_ERROR(Service_Nvnflinger, "buffer owned by producer"); return Status::BadValue; } } @@ -96,7 +96,7 @@ Status BufferQueueProducer::SetBufferCount(s32 buffer_count) { const s32 min_buffer_slots = core->GetMinMaxBufferCountLocked(false); if (buffer_count < min_buffer_slots) { - LOG_ERROR(Service_NVFlinger, "requested buffer count {} is less than minimum {}", + LOG_ERROR(Service_Nvnflinger, "requested buffer count {} is less than minimum {}", buffer_count, min_buffer_slots); return Status::BadValue; } @@ -127,14 +127,14 @@ Status BufferQueueProducer::WaitForFreeSlotThenRelock(bool async, s32* found, St while (try_again) { if (core->is_abandoned) { - LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); + LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned"); return Status::NoInit; } const s32 max_buffer_count = core->GetMaxBufferCountLocked(async); if (async && core->override_max_buffer_count) { if (core->override_max_buffer_count < max_buffer_count) { - LOG_ERROR(Service_NVFlinger, "async mode is invalid with buffer count override"); + LOG_ERROR(Service_Nvnflinger, "async mode is invalid with buffer count override"); return Status::BadValue; } } @@ -176,7 +176,7 @@ Status BufferQueueProducer::WaitForFreeSlotThenRelock(bool async, s32* found, St // Producers are not allowed to dequeue more than one buffer if they did not set a buffer // count if (!core->override_max_buffer_count && dequeued_count) { - LOG_ERROR(Service_NVFlinger, + LOG_ERROR(Service_Nvnflinger, "can't dequeue multiple buffers without setting the buffer count"); return Status::InvalidOperation; } @@ -188,7 +188,7 @@ Status BufferQueueProducer::WaitForFreeSlotThenRelock(bool async, s32* found, St const s32 new_undequeued_count = max_buffer_count - (dequeued_count + 1); const s32 min_undequeued_count = core->GetMinUndequeuedBufferCountLocked(async); if (new_undequeued_count < min_undequeued_count) { - LOG_ERROR(Service_NVFlinger, + LOG_ERROR(Service_Nvnflinger, "min undequeued buffer count({}) exceeded (dequeued={} undequeued={})", min_undequeued_count, dequeued_count, new_undequeued_count); return Status::InvalidOperation; @@ -200,7 +200,7 @@ Status BufferQueueProducer::WaitForFreeSlotThenRelock(bool async, s32* found, St // outrun the consumer. Wait here if it looks like we have too many buffers queued up. const bool too_many_buffers = core->queue.size() > static_cast(max_buffer_count); if (too_many_buffers) { - LOG_ERROR(Service_NVFlinger, "queue size is {}, waiting", core->queue.size()); + LOG_ERROR(Service_Nvnflinger, "queue size is {}, waiting", core->queue.size()); } // If no buffer is found, or if the queue has too many buffers outstanding, wait for a @@ -226,11 +226,11 @@ Status BufferQueueProducer::WaitForFreeSlotThenRelock(bool async, s32* found, St Status BufferQueueProducer::DequeueBuffer(s32* out_slot, Fence* out_fence, bool async, u32 width, u32 height, PixelFormat format, u32 usage) { - LOG_DEBUG(Service_NVFlinger, "async={} w={} h={} format={}, usage={}", async ? "true" : "false", - width, height, format, usage); + LOG_DEBUG(Service_Nvnflinger, "async={} w={} h={} format={}, usage={}", + async ? "true" : "false", width, height, format, usage); if ((width != 0 && height == 0) || (width == 0 && height != 0)) { - LOG_ERROR(Service_NVFlinger, "invalid size: w={} h={}", width, height); + LOG_ERROR(Service_Nvnflinger, "invalid size: w={} h={}", width, height); return Status::BadValue; } @@ -255,7 +255,7 @@ Status BufferQueueProducer::DequeueBuffer(s32* out_slot, Fence* out_fence, bool // This should not happen if (found == BufferQueueCore::INVALID_BUFFER_SLOT) { - LOG_ERROR(Service_NVFlinger, "no available buffer slots"); + LOG_ERROR(Service_Nvnflinger, "no available buffer slots"); return Status::Busy; } @@ -287,11 +287,11 @@ Status BufferQueueProducer::DequeueBuffer(s32* out_slot, Fence* out_fence, bool } if ((return_flags & Status::BufferNeedsReallocation) != Status::None) { - LOG_DEBUG(Service_NVFlinger, "allocating a new buffer for slot {}", *out_slot); + LOG_DEBUG(Service_Nvnflinger, "allocating a new buffer for slot {}", *out_slot); auto graphic_buffer = std::make_shared(width, height, format, usage); if (graphic_buffer == nullptr) { - LOG_ERROR(Service_NVFlinger, "creating GraphicBuffer failed"); + LOG_ERROR(Service_Nvnflinger, "creating GraphicBuffer failed"); return Status::NoMemory; } @@ -299,7 +299,7 @@ Status BufferQueueProducer::DequeueBuffer(s32* out_slot, Fence* out_fence, bool std::scoped_lock lock{core->mutex}; if (core->is_abandoned) { - LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); + LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned"); return Status::NoInit; } @@ -312,32 +312,32 @@ Status BufferQueueProducer::DequeueBuffer(s32* out_slot, Fence* out_fence, bool return_flags |= Status::BufferNeedsReallocation; } - LOG_DEBUG(Service_NVFlinger, "returning slot={} frame={}, flags={}", *out_slot, + LOG_DEBUG(Service_Nvnflinger, "returning slot={} frame={}, flags={}", *out_slot, slots[*out_slot].frame_number, return_flags); return return_flags; } Status BufferQueueProducer::DetachBuffer(s32 slot) { - LOG_DEBUG(Service_NVFlinger, "slot {}", slot); + LOG_DEBUG(Service_Nvnflinger, "slot {}", slot); std::scoped_lock lock{core->mutex}; if (core->is_abandoned) { - LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); + LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned"); return Status::NoInit; } if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) { - LOG_ERROR(Service_NVFlinger, "slot {} out of range [0, {})", slot, + LOG_ERROR(Service_Nvnflinger, "slot {} out of range [0, {})", slot, BufferQueueDefs::NUM_BUFFER_SLOTS); return Status::BadValue; } else if (slots[slot].buffer_state != BufferState::Dequeued) { - LOG_ERROR(Service_NVFlinger, "slot {} is not owned by the producer (state = {})", slot, + LOG_ERROR(Service_Nvnflinger, "slot {} is not owned by the producer (state = {})", slot, slots[slot].buffer_state); return Status::BadValue; } else if (!slots[slot].request_buffer_called) { - LOG_ERROR(Service_NVFlinger, "buffer in slot {} has not been requested", slot); + LOG_ERROR(Service_Nvnflinger, "buffer in slot {} has not been requested", slot); return Status::BadValue; } @@ -350,10 +350,10 @@ Status BufferQueueProducer::DetachBuffer(s32 slot) { Status BufferQueueProducer::DetachNextBuffer(std::shared_ptr* out_buffer, Fence* out_fence) { if (out_buffer == nullptr) { - LOG_ERROR(Service_NVFlinger, "out_buffer must not be nullptr"); + LOG_ERROR(Service_Nvnflinger, "out_buffer must not be nullptr"); return Status::BadValue; } else if (out_fence == nullptr) { - LOG_ERROR(Service_NVFlinger, "out_fence must not be nullptr"); + LOG_ERROR(Service_Nvnflinger, "out_fence must not be nullptr"); return Status::BadValue; } @@ -361,7 +361,7 @@ Status BufferQueueProducer::DetachNextBuffer(std::shared_ptr* out core->WaitWhileAllocatingLocked(); if (core->is_abandoned) { - LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); + LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned"); return Status::NoInit; } @@ -380,7 +380,7 @@ Status BufferQueueProducer::DetachNextBuffer(std::shared_ptr* out return Status::NoMemory; } - LOG_DEBUG(Service_NVFlinger, "Detached slot {}", found); + LOG_DEBUG(Service_Nvnflinger, "Detached slot {}", found); *out_buffer = slots[found].graphic_buffer; *out_fence = slots[found].fence; @@ -393,10 +393,10 @@ Status BufferQueueProducer::DetachNextBuffer(std::shared_ptr* out Status BufferQueueProducer::AttachBuffer(s32* out_slot, const std::shared_ptr& buffer) { if (out_slot == nullptr) { - LOG_ERROR(Service_NVFlinger, "out_slot must not be nullptr"); + LOG_ERROR(Service_Nvnflinger, "out_slot must not be nullptr"); return Status::BadValue; } else if (buffer == nullptr) { - LOG_ERROR(Service_NVFlinger, "Cannot attach nullptr buffer"); + LOG_ERROR(Service_Nvnflinger, "Cannot attach nullptr buffer"); return Status::BadValue; } @@ -413,13 +413,13 @@ Status BufferQueueProducer::AttachBuffer(s32* out_slot, // This should not happen if (found == BufferQueueCore::INVALID_BUFFER_SLOT) { - LOG_ERROR(Service_NVFlinger, "No available buffer slots"); + LOG_ERROR(Service_Nvnflinger, "No available buffer slots"); return Status::Busy; } *out_slot = found; - LOG_DEBUG(Service_NVFlinger, "Returning slot {} flags={}", *out_slot, return_flags); + LOG_DEBUG(Service_Nvnflinger, "Returning slot {} flags={}", *out_slot, return_flags); slots[*out_slot].graphic_buffer = buffer; slots[*out_slot].buffer_state = BufferState::Dequeued; @@ -451,7 +451,7 @@ Status BufferQueueProducer::QueueBuffer(s32 slot, const QueueBufferInput& input, case NativeWindowScalingMode::NoScaleCrop: break; default: - LOG_ERROR(Service_NVFlinger, "unknown scaling mode {}", scaling_mode); + LOG_ERROR(Service_Nvnflinger, "unknown scaling mode {}", scaling_mode); return Status::BadValue; } @@ -464,38 +464,38 @@ Status BufferQueueProducer::QueueBuffer(s32 slot, const QueueBufferInput& input, std::scoped_lock lock{core->mutex}; if (core->is_abandoned) { - LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); + LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned"); return Status::NoInit; } const s32 max_buffer_count = core->GetMaxBufferCountLocked(async); if (async && core->override_max_buffer_count) { if (core->override_max_buffer_count < max_buffer_count) { - LOG_ERROR(Service_NVFlinger, "async mode is invalid with " - "buffer count override"); + LOG_ERROR(Service_Nvnflinger, "async mode is invalid with " + "buffer count override"); return Status::BadValue; } } if (slot < 0 || slot >= max_buffer_count) { - LOG_ERROR(Service_NVFlinger, "slot index {} out of range [0, {})", slot, + LOG_ERROR(Service_Nvnflinger, "slot index {} out of range [0, {})", slot, max_buffer_count); return Status::BadValue; } else if (slots[slot].buffer_state != BufferState::Dequeued) { - LOG_ERROR(Service_NVFlinger, + LOG_ERROR(Service_Nvnflinger, "slot {} is not owned by the producer " "(state = {})", slot, slots[slot].buffer_state); return Status::BadValue; } else if (!slots[slot].request_buffer_called) { - LOG_ERROR(Service_NVFlinger, + LOG_ERROR(Service_Nvnflinger, "slot {} was queued without requesting " "a buffer", slot); return Status::BadValue; } - LOG_DEBUG(Service_NVFlinger, + LOG_DEBUG(Service_Nvnflinger, "slot={} frame={} time={} crop=[{},{},{},{}] transform={} scale={}", slot, core->frame_counter + 1, timestamp, crop.Left(), crop.Top(), crop.Right(), crop.Bottom(), transform, scaling_mode); @@ -506,7 +506,7 @@ Status BufferQueueProducer::QueueBuffer(s32 slot, const QueueBufferInput& input, [[maybe_unused]] const bool unused = crop.Intersect(buffer_rect, &cropped_rect); if (cropped_rect != crop) { - LOG_ERROR(Service_NVFlinger, "crop rect is not contained within the buffer in slot {}", + LOG_ERROR(Service_Nvnflinger, "crop rect is not contained within the buffer in slot {}", slot); return Status::BadValue; } @@ -598,21 +598,21 @@ Status BufferQueueProducer::QueueBuffer(s32 slot, const QueueBufferInput& input, } void BufferQueueProducer::CancelBuffer(s32 slot, const Fence& fence) { - LOG_DEBUG(Service_NVFlinger, "slot {}", slot); + LOG_DEBUG(Service_Nvnflinger, "slot {}", slot); std::scoped_lock lock{core->mutex}; if (core->is_abandoned) { - LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); + LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned"); return; } if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) { - LOG_ERROR(Service_NVFlinger, "slot index {} out of range [0, {})", slot, + LOG_ERROR(Service_Nvnflinger, "slot index {} out of range [0, {})", slot, BufferQueueDefs::NUM_BUFFER_SLOTS); return; } else if (slots[slot].buffer_state != BufferState::Dequeued) { - LOG_ERROR(Service_NVFlinger, "slot {} is not owned by the producer (state = {})", slot, + LOG_ERROR(Service_Nvnflinger, "slot {} is not owned by the producer (state = {})", slot, slots[slot].buffer_state); return; } @@ -629,12 +629,12 @@ Status BufferQueueProducer::Query(NativeWindow what, s32* out_value) { std::scoped_lock lock{core->mutex}; if (out_value == nullptr) { - LOG_ERROR(Service_NVFlinger, "outValue was nullptr"); + LOG_ERROR(Service_Nvnflinger, "outValue was nullptr"); return Status::BadValue; } if (core->is_abandoned) { - LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); + LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned"); return Status::NoInit; } @@ -666,7 +666,7 @@ Status BufferQueueProducer::Query(NativeWindow what, s32* out_value) { return Status::BadValue; } - LOG_DEBUG(Service_NVFlinger, "what = {}, value = {}", what, value); + LOG_DEBUG(Service_Nvnflinger, "what = {}, value = {}", what, value); *out_value = static_cast(value); @@ -678,26 +678,26 @@ Status BufferQueueProducer::Connect(const std::shared_ptr& li QueueBufferOutput* output) { std::scoped_lock lock{core->mutex}; - LOG_DEBUG(Service_NVFlinger, "api = {} producer_controlled_by_app = {}", api, + LOG_DEBUG(Service_Nvnflinger, "api = {} producer_controlled_by_app = {}", api, producer_controlled_by_app); if (core->is_abandoned) { - LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); + LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned"); return Status::NoInit; } if (core->consumer_listener == nullptr) { - LOG_ERROR(Service_NVFlinger, "BufferQueue has no consumer"); + LOG_ERROR(Service_Nvnflinger, "BufferQueue has no consumer"); return Status::NoInit; } if (output == nullptr) { - LOG_ERROR(Service_NVFlinger, "output was nullptr"); + LOG_ERROR(Service_Nvnflinger, "output was nullptr"); return Status::BadValue; } if (core->connected_api != NativeWindowApi::NoConnectedApi) { - LOG_ERROR(Service_NVFlinger, "already connected (cur = {} req = {})", core->connected_api, + LOG_ERROR(Service_Nvnflinger, "already connected (cur = {} req = {})", core->connected_api, api); return Status::BadValue; } @@ -714,7 +714,7 @@ Status BufferQueueProducer::Connect(const std::shared_ptr& li core->connected_producer_listener = listener; break; default: - LOG_ERROR(Service_NVFlinger, "unknown api = {}", api); + LOG_ERROR(Service_Nvnflinger, "unknown api = {}", api); status = Status::BadValue; break; } @@ -727,7 +727,7 @@ Status BufferQueueProducer::Connect(const std::shared_ptr& li } Status BufferQueueProducer::Disconnect(NativeWindowApi api) { - LOG_DEBUG(Service_NVFlinger, "api = {}", api); + LOG_DEBUG(Service_Nvnflinger, "api = {}", api); Status status = Status::NoError; std::shared_ptr listener; @@ -762,13 +762,13 @@ Status BufferQueueProducer::Disconnect(NativeWindowApi api) { buffer_wait_event->Signal(); listener = core->consumer_listener; } else { - LOG_ERROR(Service_NVFlinger, "still connected to another api (cur = {} req = {})", + LOG_ERROR(Service_Nvnflinger, "still connected to another api (cur = {} req = {})", core->connected_api, api); status = Status::BadValue; } break; default: - LOG_ERROR(Service_NVFlinger, "unknown api = {}", api); + LOG_ERROR(Service_Nvnflinger, "unknown api = {}", api); status = Status::BadValue; break; } @@ -784,7 +784,7 @@ Status BufferQueueProducer::Disconnect(NativeWindowApi api) { Status BufferQueueProducer::SetPreallocatedBuffer(s32 slot, const std::shared_ptr& buffer) { - LOG_DEBUG(Service_NVFlinger, "slot {}", slot); + LOG_DEBUG(Service_Nvnflinger, "slot {}", slot); if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) { return Status::BadValue; @@ -914,7 +914,7 @@ void BufferQueueProducer::Transact(HLERequestContext& ctx, TransactionId code, u break; } case TransactionId::GetBufferHistory: - LOG_WARNING(Service_NVFlinger, "(STUBBED) called, transaction=GetBufferHistory"); + LOG_WARNING(Service_Nvnflinger, "(STUBBED) called, transaction=GetBufferHistory"); break; default: ASSERT_MSG(false, "Unimplemented TransactionId {}", code); diff --git a/src/core/hle/service/nvflinger/buffer_queue_producer.h b/src/core/hle/service/nvnflinger/buffer_queue_producer.h similarity index 89% rename from src/core/hle/service/nvflinger/buffer_queue_producer.h rename to src/core/hle/service/nvnflinger/buffer_queue_producer.h index 16189fa6f..d4201c104 100644 --- a/src/core/hle/service/nvflinger/buffer_queue_producer.h +++ b/src/core/hle/service/nvnflinger/buffer_queue_producer.h @@ -12,13 +12,13 @@ #include "common/common_funcs.h" #include "core/hle/service/nvdrv/nvdata.h" -#include "core/hle/service/nvflinger/binder.h" -#include "core/hle/service/nvflinger/buffer_queue_defs.h" -#include "core/hle/service/nvflinger/buffer_slot.h" -#include "core/hle/service/nvflinger/graphic_buffer_producer.h" -#include "core/hle/service/nvflinger/pixel_format.h" -#include "core/hle/service/nvflinger/status.h" -#include "core/hle/service/nvflinger/window.h" +#include "core/hle/service/nvnflinger/binder.h" +#include "core/hle/service/nvnflinger/buffer_queue_defs.h" +#include "core/hle/service/nvnflinger/buffer_slot.h" +#include "core/hle/service/nvnflinger/graphic_buffer_producer.h" +#include "core/hle/service/nvnflinger/pixel_format.h" +#include "core/hle/service/nvnflinger/status.h" +#include "core/hle/service/nvnflinger/window.h" namespace Kernel { class KernelCore; diff --git a/src/core/hle/service/nvflinger/buffer_slot.h b/src/core/hle/service/nvnflinger/buffer_slot.h similarity index 94% rename from src/core/hle/service/nvflinger/buffer_slot.h rename to src/core/hle/service/nvnflinger/buffer_slot.h index 0cd0e9964..d25bca049 100644 --- a/src/core/hle/service/nvflinger/buffer_slot.h +++ b/src/core/hle/service/nvnflinger/buffer_slot.h @@ -9,7 +9,7 @@ #include #include "common/common_types.h" -#include "core/hle/service/nvflinger/ui/fence.h" +#include "core/hle/service/nvnflinger/ui/fence.h" namespace Service::android { diff --git a/src/core/hle/service/nvflinger/buffer_transform_flags.h b/src/core/hle/service/nvnflinger/buffer_transform_flags.h similarity index 100% rename from src/core/hle/service/nvflinger/buffer_transform_flags.h rename to src/core/hle/service/nvnflinger/buffer_transform_flags.h diff --git a/src/core/hle/service/nvflinger/consumer_base.cpp b/src/core/hle/service/nvnflinger/consumer_base.cpp similarity index 84% rename from src/core/hle/service/nvflinger/consumer_base.cpp rename to src/core/hle/service/nvnflinger/consumer_base.cpp index 982531e2d..4dcda8dac 100644 --- a/src/core/hle/service/nvflinger/consumer_base.cpp +++ b/src/core/hle/service/nvnflinger/consumer_base.cpp @@ -6,11 +6,11 @@ #include "common/assert.h" #include "common/logging/log.h" -#include "core/hle/service/nvflinger/buffer_item.h" -#include "core/hle/service/nvflinger/buffer_queue_consumer.h" -#include "core/hle/service/nvflinger/buffer_queue_core.h" -#include "core/hle/service/nvflinger/consumer_base.h" -#include "core/hle/service/nvflinger/ui/graphic_buffer.h" +#include "core/hle/service/nvnflinger/buffer_item.h" +#include "core/hle/service/nvnflinger/buffer_queue_consumer.h" +#include "core/hle/service/nvnflinger/buffer_queue_core.h" +#include "core/hle/service/nvnflinger/consumer_base.h" +#include "core/hle/service/nvnflinger/ui/graphic_buffer.h" namespace Service::android { @@ -28,7 +28,7 @@ void ConsumerBase::Connect(bool controlled_by_app) { } void ConsumerBase::FreeBufferLocked(s32 slot_index) { - LOG_DEBUG(Service_NVFlinger, "slot_index={}", slot_index); + LOG_DEBUG(Service_Nvnflinger, "slot_index={}", slot_index); slots[slot_index].graphic_buffer = nullptr; slots[slot_index].fence = Fence::NoFence(); @@ -36,17 +36,17 @@ void ConsumerBase::FreeBufferLocked(s32 slot_index) { } void ConsumerBase::OnFrameAvailable(const BufferItem& item) { - LOG_DEBUG(Service_NVFlinger, "called"); + LOG_DEBUG(Service_Nvnflinger, "called"); } void ConsumerBase::OnFrameReplaced(const BufferItem& item) { - LOG_DEBUG(Service_NVFlinger, "called"); + LOG_DEBUG(Service_Nvnflinger, "called"); } void ConsumerBase::OnBuffersReleased() { std::scoped_lock lock{mutex}; - LOG_DEBUG(Service_NVFlinger, "called"); + LOG_DEBUG(Service_Nvnflinger, "called"); if (is_abandoned) { // Nothing to do if we're already abandoned. @@ -77,7 +77,7 @@ Status ConsumerBase::AcquireBufferLocked(BufferItem* item, std::chrono::nanoseco slots[item->slot].frame_number = item->frame_number; slots[item->slot].fence = item->fence; - LOG_DEBUG(Service_NVFlinger, "slot={}", item->slot); + LOG_DEBUG(Service_Nvnflinger, "slot={}", item->slot); return Status::NoError; } @@ -85,7 +85,7 @@ Status ConsumerBase::AcquireBufferLocked(BufferItem* item, std::chrono::nanoseco Status ConsumerBase::AddReleaseFenceLocked(s32 slot, const std::shared_ptr& graphic_buffer, const Fence& fence) { - LOG_DEBUG(Service_NVFlinger, "slot={}", slot); + LOG_DEBUG(Service_Nvnflinger, "slot={}", slot); // If consumer no longer tracks this graphic_buffer, we can safely // drop this fence, as it will never be received by the producer. @@ -109,7 +109,7 @@ Status ConsumerBase::ReleaseBufferLocked(s32 slot, return Status::NoError; } - LOG_DEBUG(Service_NVFlinger, "slot={}", slot); + LOG_DEBUG(Service_Nvnflinger, "slot={}", slot); Status err = consumer->ReleaseBuffer(slot, slots[slot].frame_number, slots[slot].fence); if (err == Status::StaleBufferSlot) { FreeBufferLocked(slot); diff --git a/src/core/hle/service/nvflinger/consumer_base.h b/src/core/hle/service/nvnflinger/consumer_base.h similarity index 91% rename from src/core/hle/service/nvflinger/consumer_base.h rename to src/core/hle/service/nvnflinger/consumer_base.h index 9a8a5f6bb..264829414 100644 --- a/src/core/hle/service/nvflinger/consumer_base.h +++ b/src/core/hle/service/nvnflinger/consumer_base.h @@ -12,9 +12,9 @@ #include #include "common/common_types.h" -#include "core/hle/service/nvflinger/buffer_queue_defs.h" -#include "core/hle/service/nvflinger/consumer_listener.h" -#include "core/hle/service/nvflinger/status.h" +#include "core/hle/service/nvnflinger/buffer_queue_defs.h" +#include "core/hle/service/nvnflinger/consumer_listener.h" +#include "core/hle/service/nvnflinger/status.h" namespace Service::android { diff --git a/src/core/hle/service/nvflinger/consumer_listener.h b/src/core/hle/service/nvnflinger/consumer_listener.h similarity index 100% rename from src/core/hle/service/nvflinger/consumer_listener.h rename to src/core/hle/service/nvnflinger/consumer_listener.h diff --git a/src/core/hle/service/nvflinger/graphic_buffer_producer.cpp b/src/core/hle/service/nvnflinger/graphic_buffer_producer.cpp similarity index 83% rename from src/core/hle/service/nvflinger/graphic_buffer_producer.cpp rename to src/core/hle/service/nvnflinger/graphic_buffer_producer.cpp index 769e8c0a3..d72b49a8e 100644 --- a/src/core/hle/service/nvflinger/graphic_buffer_producer.cpp +++ b/src/core/hle/service/nvnflinger/graphic_buffer_producer.cpp @@ -4,8 +4,8 @@ // Parts of this implementation were based on: // https://cs.android.com/android/platform/superproject/+/android-5.1.1_r38:frameworks/native/libs/gui/IGraphicBufferProducer.cpp -#include "core/hle/service/nvflinger/graphic_buffer_producer.h" -#include "core/hle/service/nvflinger/parcel.h" +#include "core/hle/service/nvnflinger/graphic_buffer_producer.h" +#include "core/hle/service/nvnflinger/parcel.h" namespace Service::android { diff --git a/src/core/hle/service/nvflinger/graphic_buffer_producer.h b/src/core/hle/service/nvnflinger/graphic_buffer_producer.h similarity index 96% rename from src/core/hle/service/nvflinger/graphic_buffer_producer.h rename to src/core/hle/service/nvnflinger/graphic_buffer_producer.h index 2969f0fd5..21d7b31f3 100644 --- a/src/core/hle/service/nvflinger/graphic_buffer_producer.h +++ b/src/core/hle/service/nvnflinger/graphic_buffer_producer.h @@ -9,8 +9,8 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/math_util.h" -#include "core/hle/service/nvflinger/ui/fence.h" -#include "core/hle/service/nvflinger/window.h" +#include "core/hle/service/nvnflinger/ui/fence.h" +#include "core/hle/service/nvnflinger/window.h" namespace Service::android { diff --git a/src/core/hle/service/nvflinger/hos_binder_driver_server.cpp b/src/core/hle/service/nvnflinger/hos_binder_driver_server.cpp similarity index 85% rename from src/core/hle/service/nvflinger/hos_binder_driver_server.cpp rename to src/core/hle/service/nvnflinger/hos_binder_driver_server.cpp index dc9b2a9ec..b86a79ec9 100644 --- a/src/core/hle/service/nvflinger/hos_binder_driver_server.cpp +++ b/src/core/hle/service/nvnflinger/hos_binder_driver_server.cpp @@ -4,9 +4,9 @@ #include #include "common/common_types.h" -#include "core/hle/service/nvflinger/hos_binder_driver_server.h" +#include "core/hle/service/nvnflinger/hos_binder_driver_server.h" -namespace Service::NVFlinger { +namespace Service::Nvnflinger { HosBinderDriverServer::HosBinderDriverServer(Core::System& system_) : service_context(system_, "HosBinderDriverServer") {} @@ -33,4 +33,4 @@ android::IBinder* HosBinderDriverServer::TryGetProducer(u64 id) { return {}; } -} // namespace Service::NVFlinger +} // namespace Service::Nvnflinger diff --git a/src/core/hle/service/nvflinger/hos_binder_driver_server.h b/src/core/hle/service/nvnflinger/hos_binder_driver_server.h similarity index 86% rename from src/core/hle/service/nvflinger/hos_binder_driver_server.h rename to src/core/hle/service/nvnflinger/hos_binder_driver_server.h index 8fddc1206..58bb9469a 100644 --- a/src/core/hle/service/nvflinger/hos_binder_driver_server.h +++ b/src/core/hle/service/nvnflinger/hos_binder_driver_server.h @@ -9,13 +9,13 @@ #include "common/common_types.h" #include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/nvflinger/binder.h" +#include "core/hle/service/nvnflinger/binder.h" namespace Core { class System; } -namespace Service::NVFlinger { +namespace Service::Nvnflinger { class HosBinderDriverServer final { public: @@ -34,4 +34,4 @@ private: u64 last_id{}; }; -} // namespace Service::NVFlinger +} // namespace Service::Nvnflinger diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvnflinger/nvnflinger.cpp similarity index 83% rename from src/core/hle/service/nvflinger/nvflinger.cpp rename to src/core/hle/service/nvnflinger/nvnflinger.cpp index f4416f5b2..4988e6e17 100644 --- a/src/core/hle/service/nvflinger/nvflinger.cpp +++ b/src/core/hle/service/nvnflinger/nvnflinger.cpp @@ -15,11 +15,11 @@ #include "core/hle/kernel/k_readable_event.h" #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h" #include "core/hle/service/nvdrv/nvdrv.h" -#include "core/hle/service/nvflinger/buffer_item_consumer.h" -#include "core/hle/service/nvflinger/buffer_queue_core.h" -#include "core/hle/service/nvflinger/hos_binder_driver_server.h" -#include "core/hle/service/nvflinger/nvflinger.h" -#include "core/hle/service/nvflinger/ui/graphic_buffer.h" +#include "core/hle/service/nvnflinger/buffer_item_consumer.h" +#include "core/hle/service/nvnflinger/buffer_queue_core.h" +#include "core/hle/service/nvnflinger/hos_binder_driver_server.h" +#include "core/hle/service/nvnflinger/nvnflinger.h" +#include "core/hle/service/nvnflinger/ui/graphic_buffer.h" #include "core/hle/service/vi/display/vi_display.h" #include "core/hle/service/vi/layer/vi_layer.h" #include "core/hle/service/vi/vi_results.h" @@ -27,11 +27,11 @@ #include "video_core/host1x/host1x.h" #include "video_core/host1x/syncpoint_manager.h" -namespace Service::NVFlinger { +namespace Service::Nvnflinger { constexpr auto frame_ns = std::chrono::nanoseconds{1000000000 / 60}; -void NVFlinger::SplitVSync(std::stop_token stop_token) { +void Nvnflinger::SplitVSync(std::stop_token stop_token) { system.RegisterHostThread(); std::string name = "VSyncThread"; MicroProfileOnThreadCreate(name.c_str()); @@ -54,8 +54,8 @@ void NVFlinger::SplitVSync(std::stop_token stop_token) { } } -NVFlinger::NVFlinger(Core::System& system_, HosBinderDriverServer& hos_binder_driver_server_) - : system(system_), service_context(system_, "nvflinger"), +Nvnflinger::Nvnflinger(Core::System& system_, HosBinderDriverServer& hos_binder_driver_server_) + : system(system_), service_context(system_, "nvnflinger"), hos_binder_driver_server(hos_binder_driver_server_) { displays.emplace_back(0, "Default", hos_binder_driver_server, service_context, system); displays.emplace_back(1, "External", hos_binder_driver_server, service_context, system); @@ -92,7 +92,7 @@ NVFlinger::NVFlinger(Core::System& system_, HosBinderDriverServer& hos_binder_dr } } -NVFlinger::~NVFlinger() { +Nvnflinger::~Nvnflinger() { if (system.IsMulticore()) { system.CoreTiming().UnscheduleEvent(multi_composition_event, {}); vsync_thread.request_stop(); @@ -109,7 +109,7 @@ NVFlinger::~NVFlinger() { } } -void NVFlinger::ShutdownLayers() { +void Nvnflinger::ShutdownLayers() { for (auto& display : displays) { for (size_t layer = 0; layer < display.GetNumLayers(); ++layer) { display.GetLayer(layer).Core().NotifyShutdown(); @@ -117,15 +117,15 @@ void NVFlinger::ShutdownLayers() { } } -void NVFlinger::SetNVDrvInstance(std::shared_ptr instance) { +void Nvnflinger::SetNVDrvInstance(std::shared_ptr instance) { nvdrv = std::move(instance); disp_fd = nvdrv->Open("/dev/nvdisp_disp0"); } -std::optional NVFlinger::OpenDisplay(std::string_view name) { +std::optional Nvnflinger::OpenDisplay(std::string_view name) { const auto lock_guard = Lock(); - LOG_DEBUG(Service_NVFlinger, "Opening \"{}\" display", name); + LOG_DEBUG(Service_Nvnflinger, "Opening \"{}\" display", name); const auto itr = std::find_if(displays.begin(), displays.end(), @@ -138,7 +138,7 @@ std::optional NVFlinger::OpenDisplay(std::string_view name) { return itr->GetID(); } -bool NVFlinger::CloseDisplay(u64 display_id) { +bool Nvnflinger::CloseDisplay(u64 display_id) { const auto lock_guard = Lock(); auto* const display = FindDisplay(display_id); @@ -151,7 +151,7 @@ bool NVFlinger::CloseDisplay(u64 display_id) { return true; } -std::optional NVFlinger::CreateLayer(u64 display_id) { +std::optional Nvnflinger::CreateLayer(u64 display_id) { const auto lock_guard = Lock(); auto* const display = FindDisplay(display_id); @@ -164,12 +164,12 @@ std::optional NVFlinger::CreateLayer(u64 display_id) { return layer_id; } -void NVFlinger::CreateLayerAtId(VI::Display& display, u64 layer_id) { +void Nvnflinger::CreateLayerAtId(VI::Display& display, u64 layer_id) { const auto buffer_id = next_buffer_queue_id++; display.CreateLayer(layer_id, buffer_id, nvdrv->container); } -void NVFlinger::CloseLayer(u64 layer_id) { +void Nvnflinger::CloseLayer(u64 layer_id) { const auto lock_guard = Lock(); for (auto& display : displays) { @@ -177,7 +177,7 @@ void NVFlinger::CloseLayer(u64 layer_id) { } } -std::optional NVFlinger::FindBufferQueueId(u64 display_id, u64 layer_id) { +std::optional Nvnflinger::FindBufferQueueId(u64 display_id, u64 layer_id) { const auto lock_guard = Lock(); const auto* const layer = FindOrCreateLayer(display_id, layer_id); @@ -188,7 +188,7 @@ std::optional NVFlinger::FindBufferQueueId(u64 display_id, u64 layer_id) { return layer->GetBinderId(); } -ResultVal NVFlinger::FindVsyncEvent(u64 display_id) { +ResultVal Nvnflinger::FindVsyncEvent(u64 display_id) { const auto lock_guard = Lock(); auto* const display = FindDisplay(display_id); @@ -199,7 +199,7 @@ ResultVal NVFlinger::FindVsyncEvent(u64 display_id) { return display->GetVSyncEvent(); } -VI::Display* NVFlinger::FindDisplay(u64 display_id) { +VI::Display* Nvnflinger::FindDisplay(u64 display_id) { const auto itr = std::find_if(displays.begin(), displays.end(), [&](const VI::Display& display) { return display.GetID() == display_id; }); @@ -211,7 +211,7 @@ VI::Display* NVFlinger::FindDisplay(u64 display_id) { return &*itr; } -const VI::Display* NVFlinger::FindDisplay(u64 display_id) const { +const VI::Display* Nvnflinger::FindDisplay(u64 display_id) const { const auto itr = std::find_if(displays.begin(), displays.end(), [&](const VI::Display& display) { return display.GetID() == display_id; }); @@ -223,7 +223,7 @@ const VI::Display* NVFlinger::FindDisplay(u64 display_id) const { return &*itr; } -VI::Layer* NVFlinger::FindLayer(u64 display_id, u64 layer_id) { +VI::Layer* Nvnflinger::FindLayer(u64 display_id, u64 layer_id) { auto* const display = FindDisplay(display_id); if (display == nullptr) { @@ -233,7 +233,7 @@ VI::Layer* NVFlinger::FindLayer(u64 display_id, u64 layer_id) { return display->FindLayer(layer_id); } -const VI::Layer* NVFlinger::FindLayer(u64 display_id, u64 layer_id) const { +const VI::Layer* Nvnflinger::FindLayer(u64 display_id, u64 layer_id) const { const auto* const display = FindDisplay(display_id); if (display == nullptr) { @@ -243,7 +243,7 @@ const VI::Layer* NVFlinger::FindLayer(u64 display_id, u64 layer_id) const { return display->FindLayer(layer_id); } -VI::Layer* NVFlinger::FindOrCreateLayer(u64 display_id, u64 layer_id) { +VI::Layer* Nvnflinger::FindOrCreateLayer(u64 display_id, u64 layer_id) { auto* const display = FindDisplay(display_id); if (display == nullptr) { @@ -253,7 +253,7 @@ VI::Layer* NVFlinger::FindOrCreateLayer(u64 display_id, u64 layer_id) { auto* layer = display->FindLayer(layer_id); if (layer == nullptr) { - LOG_DEBUG(Service_NVFlinger, "Layer at id {} not found. Trying to create it.", layer_id); + LOG_DEBUG(Service_Nvnflinger, "Layer at id {} not found. Trying to create it.", layer_id); CreateLayerAtId(*display, layer_id); return display->FindLayer(layer_id); } @@ -261,7 +261,7 @@ VI::Layer* NVFlinger::FindOrCreateLayer(u64 display_id, u64 layer_id) { return layer; } -void NVFlinger::Compose() { +void Nvnflinger::Compose() { for (auto& display : displays) { // Trigger vsync for this display at the end of drawing SCOPE_EXIT({ display.SignalVSyncEvent(); }); @@ -311,7 +311,7 @@ void NVFlinger::Compose() { } } -s64 NVFlinger::GetNextTicks() const { +s64 Nvnflinger::GetNextTicks() const { const auto& settings = Settings::values; auto speed_scale = 1.f; if (settings.use_multi_core.GetValue()) { @@ -332,4 +332,4 @@ s64 NVFlinger::GetNextTicks() const { return static_cast(speed_scale * (1000000000.f / effective_fps)); } -} // namespace Service::NVFlinger +} // namespace Service::Nvnflinger diff --git a/src/core/hle/service/nvflinger/nvflinger.h b/src/core/hle/service/nvnflinger/nvnflinger.h similarity index 95% rename from src/core/hle/service/nvflinger/nvflinger.h rename to src/core/hle/service/nvnflinger/nvnflinger.h index 3828cf272..a043cceb2 100644 --- a/src/core/hle/service/nvflinger/nvflinger.h +++ b/src/core/hle/service/nvnflinger/nvnflinger.h @@ -42,12 +42,12 @@ class BufferQueueCore; class BufferQueueProducer; } // namespace Service::android -namespace Service::NVFlinger { +namespace Service::Nvnflinger { -class NVFlinger final { +class Nvnflinger final { public: - explicit NVFlinger(Core::System& system_, HosBinderDriverServer& hos_binder_driver_server_); - ~NVFlinger(); + explicit Nvnflinger(Core::System& system_, HosBinderDriverServer& hos_binder_driver_server_); + ~Nvnflinger(); void ShutdownLayers(); @@ -152,4 +152,4 @@ private: HosBinderDriverServer& hos_binder_driver_server; }; -} // namespace Service::NVFlinger +} // namespace Service::Nvnflinger diff --git a/src/core/hle/service/nvflinger/parcel.h b/src/core/hle/service/nvnflinger/parcel.h similarity index 100% rename from src/core/hle/service/nvflinger/parcel.h rename to src/core/hle/service/nvnflinger/parcel.h diff --git a/src/core/hle/service/nvflinger/pixel_format.h b/src/core/hle/service/nvnflinger/pixel_format.h similarity index 100% rename from src/core/hle/service/nvflinger/pixel_format.h rename to src/core/hle/service/nvnflinger/pixel_format.h diff --git a/src/core/hle/service/nvflinger/producer_listener.h b/src/core/hle/service/nvnflinger/producer_listener.h similarity index 100% rename from src/core/hle/service/nvflinger/producer_listener.h rename to src/core/hle/service/nvnflinger/producer_listener.h diff --git a/src/core/hle/service/nvflinger/status.h b/src/core/hle/service/nvnflinger/status.h similarity index 100% rename from src/core/hle/service/nvflinger/status.h rename to src/core/hle/service/nvnflinger/status.h diff --git a/src/core/hle/service/nvflinger/ui/fence.h b/src/core/hle/service/nvnflinger/ui/fence.h similarity index 100% rename from src/core/hle/service/nvflinger/ui/fence.h rename to src/core/hle/service/nvnflinger/ui/fence.h diff --git a/src/core/hle/service/nvflinger/ui/graphic_buffer.h b/src/core/hle/service/nvnflinger/ui/graphic_buffer.h similarity index 97% rename from src/core/hle/service/nvflinger/ui/graphic_buffer.h rename to src/core/hle/service/nvnflinger/ui/graphic_buffer.h index 9a27f8f02..75d1705a8 100644 --- a/src/core/hle/service/nvflinger/ui/graphic_buffer.h +++ b/src/core/hle/service/nvnflinger/ui/graphic_buffer.h @@ -8,7 +8,7 @@ #include "common/common_funcs.h" #include "common/common_types.h" -#include "core/hle/service/nvflinger/pixel_format.h" +#include "core/hle/service/nvnflinger/pixel_format.h" namespace Service::android { diff --git a/src/core/hle/service/nvflinger/window.h b/src/core/hle/service/nvnflinger/window.h similarity index 100% rename from src/core/hle/service/nvflinger/window.h rename to src/core/hle/service/nvnflinger/window.h diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 6415fc310..eed615377 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -49,8 +49,8 @@ #include "core/hle/service/npns/npns.h" #include "core/hle/service/ns/ns.h" #include "core/hle/service/nvdrv/nvdrv.h" -#include "core/hle/service/nvflinger/hos_binder_driver_server.h" -#include "core/hle/service/nvflinger/nvflinger.h" +#include "core/hle/service/nvnflinger/hos_binder_driver_server.h" +#include "core/hle/service/nvnflinger/nvnflinger.h" #include "core/hle/service/olsc/olsc.h" #include "core/hle/service/pcie/pcie.h" #include "core/hle/service/pctl/pctl_module.h" @@ -210,12 +210,12 @@ Result ServiceFrameworkBase::HandleSyncRequest(Kernel::KServerSession& session, /// Initialize Services Services::Services(std::shared_ptr& sm, Core::System& system) - : hos_binder_driver_server{std::make_unique(system)}, - nv_flinger{std::make_unique(system, *hos_binder_driver_server)} { + : hos_binder_driver_server{std::make_unique(system)}, + nv_flinger{std::make_unique(system, *hos_binder_driver_server)} { auto& kernel = system.Kernel(); - // NVFlinger needs to be accessed by several services like Vi and AppletOE so we instantiate it + // Nvnflinger needs to be accessed by several services like Vi and AppletOE so we instantiate it // here and pass it into the respective InstallInterfaces functions. system.GetFileSystemController().CreateFactories(*system.GetFilesystem(), false); diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index 06226409a..0f79a1b7e 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h @@ -28,10 +28,10 @@ namespace FileSystem { class FileSystemController; } -namespace NVFlinger { +namespace Nvnflinger { class HosBinderDriverServer; -class NVFlinger; -} // namespace NVFlinger +class Nvnflinger; +} // namespace Nvnflinger namespace SM { class ServiceManager; @@ -228,8 +228,8 @@ public: void KillNVNFlinger(); private: - std::unique_ptr hos_binder_driver_server; - std::unique_ptr nv_flinger; + std::unique_ptr hos_binder_driver_server; + std::unique_ptr nv_flinger; }; } // namespace Service diff --git a/src/core/hle/service/vi/display/vi_display.cpp b/src/core/hle/service/vi/display/vi_display.cpp index 8ef74f1f0..69af2868a 100644 --- a/src/core/hle/service/vi/display/vi_display.cpp +++ b/src/core/hle/service/vi/display/vi_display.cpp @@ -12,11 +12,11 @@ #include "core/hle/kernel/k_readable_event.h" #include "core/hle/service/kernel_helpers.h" #include "core/hle/service/nvdrv/core/container.h" -#include "core/hle/service/nvflinger/buffer_item_consumer.h" -#include "core/hle/service/nvflinger/buffer_queue_consumer.h" -#include "core/hle/service/nvflinger/buffer_queue_core.h" -#include "core/hle/service/nvflinger/buffer_queue_producer.h" -#include "core/hle/service/nvflinger/hos_binder_driver_server.h" +#include "core/hle/service/nvnflinger/buffer_item_consumer.h" +#include "core/hle/service/nvnflinger/buffer_queue_consumer.h" +#include "core/hle/service/nvnflinger/buffer_queue_core.h" +#include "core/hle/service/nvnflinger/buffer_queue_producer.h" +#include "core/hle/service/nvnflinger/hos_binder_driver_server.h" #include "core/hle/service/vi/display/vi_display.h" #include "core/hle/service/vi/layer/vi_layer.h" #include "core/hle/service/vi/vi_results.h" @@ -39,7 +39,7 @@ static BufferQueue CreateBufferQueue(KernelHelpers::ServiceContext& service_cont } Display::Display(u64 id, std::string name_, - NVFlinger::HosBinderDriverServer& hos_binder_driver_server_, + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_, KernelHelpers::ServiceContext& service_context_, Core::System& system_) : display_id{id}, name{std::move(name_)}, hos_binder_driver_server{hos_binder_driver_server_}, service_context{service_context_} { diff --git a/src/core/hle/service/vi/display/vi_display.h b/src/core/hle/service/vi/display/vi_display.h index 0b65a65da..3f31d1f32 100644 --- a/src/core/hle/service/vi/display/vi_display.h +++ b/src/core/hle/service/vi/display/vi_display.h @@ -23,7 +23,7 @@ namespace Service::KernelHelpers { class ServiceContext; } -namespace Service::NVFlinger { +namespace Service::Nvnflinger { class HosBinderDriverServer; } @@ -45,12 +45,12 @@ public: /// Constructs a display with a given unique ID and name. /// /// @param id The unique ID for this display. - /// @param hos_binder_driver_server_ NVFlinger HOSBinderDriver server instance. + /// @param hos_binder_driver_server_ Nvnflinger HOSBinderDriver server instance. /// @param service_context_ The ServiceContext for the owning service. /// @param name_ The name for this display. /// @param system_ The global system instance. /// - Display(u64 id, std::string name_, NVFlinger::HosBinderDriverServer& hos_binder_driver_server_, + Display(u64 id, std::string name_, Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_, KernelHelpers::ServiceContext& service_context_, Core::System& system_); ~Display(); @@ -133,7 +133,7 @@ public: private: u64 display_id; std::string name; - NVFlinger::HosBinderDriverServer& hos_binder_driver_server; + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server; KernelHelpers::ServiceContext& service_context; std::vector> layers; diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index fca076d7a..68eab5133 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -21,11 +21,11 @@ #include "core/hle/kernel/k_thread.h" #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nvdrv/nvdata.h" -#include "core/hle/service/nvflinger/binder.h" -#include "core/hle/service/nvflinger/buffer_queue_producer.h" -#include "core/hle/service/nvflinger/hos_binder_driver_server.h" -#include "core/hle/service/nvflinger/nvflinger.h" -#include "core/hle/service/nvflinger/parcel.h" +#include "core/hle/service/nvnflinger/binder.h" +#include "core/hle/service/nvnflinger/buffer_queue_producer.h" +#include "core/hle/service/nvnflinger/hos_binder_driver_server.h" +#include "core/hle/service/nvnflinger/nvnflinger.h" +#include "core/hle/service/nvnflinger/parcel.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" #include "core/hle/service/vi/vi.h" @@ -73,7 +73,7 @@ static_assert(sizeof(NativeWindow) == 0x28, "NativeWindow has wrong size"); class IHOSBinderDriver final : public ServiceFramework { public: - explicit IHOSBinderDriver(Core::System& system_, NVFlinger::HosBinderDriverServer& server_) + explicit IHOSBinderDriver(Core::System& system_, Nvnflinger::HosBinderDriverServer& server_) : ServiceFramework{system_, "IHOSBinderDriver"}, server(server_) { static const FunctionInfo functions[] = { {0, &IHOSBinderDriver::TransactParcel, "TransactParcel"}, @@ -126,7 +126,7 @@ private: } private: - NVFlinger::HosBinderDriverServer& server; + Nvnflinger::HosBinderDriverServer& server; }; class ISystemDisplayService final : public ServiceFramework { @@ -232,7 +232,7 @@ private: class IManagerDisplayService final : public ServiceFramework { public: - explicit IManagerDisplayService(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_) + explicit IManagerDisplayService(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_) : ServiceFramework{system_, "IManagerDisplayService"}, nv_flinger{nv_flinger_} { // clang-format off static const FunctionInfo functions[] = { @@ -383,13 +383,13 @@ private: rb.Push(ResultSuccess); } - NVFlinger::NVFlinger& nv_flinger; + Nvnflinger::Nvnflinger& nv_flinger; }; class IApplicationDisplayService final : public ServiceFramework { public: - IApplicationDisplayService(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, - NVFlinger::HosBinderDriverServer& hos_binder_driver_server_) + IApplicationDisplayService(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_, + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_) : ServiceFramework{system_, "IApplicationDisplayService"}, nv_flinger{nv_flinger_}, hos_binder_driver_server{hos_binder_driver_server_} { @@ -774,8 +774,8 @@ private: } } - NVFlinger::NVFlinger& nv_flinger; - NVFlinger::HosBinderDriverServer& hos_binder_driver_server; + Nvnflinger::Nvnflinger& nv_flinger; + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server; }; static bool IsValidServiceAccess(Permission permission, Policy policy) { @@ -791,8 +791,8 @@ static bool IsValidServiceAccess(Permission permission, Policy policy) { } void detail::GetDisplayServiceImpl(HLERequestContext& ctx, Core::System& system, - NVFlinger::NVFlinger& nv_flinger, - NVFlinger::HosBinderDriverServer& hos_binder_driver_server, + Nvnflinger::Nvnflinger& nv_flinger, + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server, Permission permission) { IPC::RequestParser rp{ctx}; const auto policy = rp.PopEnum(); @@ -809,8 +809,8 @@ void detail::GetDisplayServiceImpl(HLERequestContext& ctx, Core::System& system, rb.PushIpcInterface(system, nv_flinger, hos_binder_driver_server); } -void LoopProcess(Core::System& system, NVFlinger::NVFlinger& nv_flinger, - NVFlinger::HosBinderDriverServer& hos_binder_driver_server) { +void LoopProcess(Core::System& system, Nvnflinger::Nvnflinger& nv_flinger, + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server) { auto server_manager = std::make_unique(system); server_manager->RegisterNamedService( diff --git a/src/core/hle/service/vi/vi.h b/src/core/hle/service/vi/vi.h index 48b2f30aa..a35b62f97 100644 --- a/src/core/hle/service/vi/vi.h +++ b/src/core/hle/service/vi/vi.h @@ -13,10 +13,10 @@ namespace Service { class HLERequestContext; } -namespace Service::NVFlinger { +namespace Service::Nvnflinger { class HosBinderDriverServer; -class NVFlinger; -} // namespace Service::NVFlinger +class Nvnflinger; +} // namespace Service::Nvnflinger namespace Service::VI { @@ -43,12 +43,12 @@ enum class Policy { namespace detail { void GetDisplayServiceImpl(HLERequestContext& ctx, Core::System& system, - NVFlinger::NVFlinger& nv_flinger, - NVFlinger::HosBinderDriverServer& hos_binder_driver_server, + Nvnflinger::Nvnflinger& nv_flinger, + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server, Permission permission); } // namespace detail -void LoopProcess(Core::System& system, NVFlinger::NVFlinger& nv_flinger, - NVFlinger::HosBinderDriverServer& hos_binder_driver_server); +void LoopProcess(Core::System& system, Nvnflinger::Nvnflinger& nv_flinger, + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server); } // namespace Service::VI diff --git a/src/core/hle/service/vi/vi_m.cpp b/src/core/hle/service/vi/vi_m.cpp index 019e55811..0f06dc2f3 100644 --- a/src/core/hle/service/vi/vi_m.cpp +++ b/src/core/hle/service/vi/vi_m.cpp @@ -7,8 +7,8 @@ namespace Service::VI { -VI_M::VI_M(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, - NVFlinger::HosBinderDriverServer& hos_binder_driver_server_) +VI_M::VI_M(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_, + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_) : ServiceFramework{system_, "vi:m"}, nv_flinger{nv_flinger_}, hos_binder_driver_server{ hos_binder_driver_server_} { static const FunctionInfo functions[] = { diff --git a/src/core/hle/service/vi/vi_m.h b/src/core/hle/service/vi/vi_m.h index 392da04a3..9ca6f3905 100644 --- a/src/core/hle/service/vi/vi_m.h +++ b/src/core/hle/service/vi/vi_m.h @@ -9,24 +9,24 @@ namespace Core { class System; } -namespace Service::NVFlinger { +namespace Service::Nvnflinger { class HosBinderDriverServer; -class NVFlinger; -} // namespace Service::NVFlinger +class Nvnflinger; +} // namespace Service::Nvnflinger namespace Service::VI { class VI_M final : public ServiceFramework { public: - explicit VI_M(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, - NVFlinger::HosBinderDriverServer& hos_binder_driver_server_); + explicit VI_M(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_, + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_); ~VI_M() override; private: void GetDisplayService(HLERequestContext& ctx); - NVFlinger::NVFlinger& nv_flinger; - NVFlinger::HosBinderDriverServer& hos_binder_driver_server; + Nvnflinger::Nvnflinger& nv_flinger; + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server; }; } // namespace Service::VI diff --git a/src/core/hle/service/vi/vi_s.cpp b/src/core/hle/service/vi/vi_s.cpp index 901c5988e..77f7a88ff 100644 --- a/src/core/hle/service/vi/vi_s.cpp +++ b/src/core/hle/service/vi/vi_s.cpp @@ -7,8 +7,8 @@ namespace Service::VI { -VI_S::VI_S(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, - NVFlinger::HosBinderDriverServer& hos_binder_driver_server_) +VI_S::VI_S(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_, + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_) : ServiceFramework{system_, "vi:s"}, nv_flinger{nv_flinger_}, hos_binder_driver_server{ hos_binder_driver_server_} { static const FunctionInfo functions[] = { diff --git a/src/core/hle/service/vi/vi_s.h b/src/core/hle/service/vi/vi_s.h index 34282fcfd..157839c91 100644 --- a/src/core/hle/service/vi/vi_s.h +++ b/src/core/hle/service/vi/vi_s.h @@ -9,24 +9,24 @@ namespace Core { class System; } -namespace Service::NVFlinger { +namespace Service::Nvnflinger { class HosBinderDriverServer; -class NVFlinger; -} // namespace Service::NVFlinger +class Nvnflinger; +} // namespace Service::Nvnflinger namespace Service::VI { class VI_S final : public ServiceFramework { public: - explicit VI_S(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, - NVFlinger::HosBinderDriverServer& hos_binder_driver_server_); + explicit VI_S(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_, + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_); ~VI_S() override; private: void GetDisplayService(HLERequestContext& ctx); - NVFlinger::NVFlinger& nv_flinger; - NVFlinger::HosBinderDriverServer& hos_binder_driver_server; + Nvnflinger::Nvnflinger& nv_flinger; + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server; }; } // namespace Service::VI diff --git a/src/core/hle/service/vi/vi_u.cpp b/src/core/hle/service/vi/vi_u.cpp index 08c5cf486..59e13c86b 100644 --- a/src/core/hle/service/vi/vi_u.cpp +++ b/src/core/hle/service/vi/vi_u.cpp @@ -7,8 +7,8 @@ namespace Service::VI { -VI_U::VI_U(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, - NVFlinger::HosBinderDriverServer& hos_binder_driver_server_) +VI_U::VI_U(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_, + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_) : ServiceFramework{system_, "vi:u"}, nv_flinger{nv_flinger_}, hos_binder_driver_server{ hos_binder_driver_server_} { static const FunctionInfo functions[] = { diff --git a/src/core/hle/service/vi/vi_u.h b/src/core/hle/service/vi/vi_u.h index 8b0a8dd02..5d9ca54c6 100644 --- a/src/core/hle/service/vi/vi_u.h +++ b/src/core/hle/service/vi/vi_u.h @@ -9,24 +9,24 @@ namespace Core { class System; } -namespace Service::NVFlinger { +namespace Service::Nvnflinger { class HosBinderDriverServer; -class NVFlinger; -} // namespace Service::NVFlinger +class Nvnflinger; +} // namespace Service::Nvnflinger namespace Service::VI { class VI_U final : public ServiceFramework { public: - explicit VI_U(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, - NVFlinger::HosBinderDriverServer& hos_binder_driver_server_); + explicit VI_U(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_, + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_); ~VI_U() override; private: void GetDisplayService(HLERequestContext& ctx); - NVFlinger::NVFlinger& nv_flinger; - NVFlinger::HosBinderDriverServer& hos_binder_driver_server; + Nvnflinger::Nvnflinger& nv_flinger; + Nvnflinger::HosBinderDriverServer& hos_binder_driver_server; }; } // namespace Service::VI diff --git a/src/video_core/framebuffer_config.h b/src/video_core/framebuffer_config.h index d93f5a37f..5f3bffcab 100644 --- a/src/video_core/framebuffer_config.h +++ b/src/video_core/framebuffer_config.h @@ -5,8 +5,8 @@ #include "common/common_types.h" #include "common/math_util.h" -#include "core/hle/service/nvflinger/buffer_transform_flags.h" -#include "core/hle/service/nvflinger/pixel_format.h" +#include "core/hle/service/nvnflinger/buffer_transform_flags.h" +#include "core/hle/service/nvnflinger/pixel_format.h" namespace Tegra { From 0746a2084ed78777b3d8ecf7c426a792fba06509 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 22 Feb 2023 21:28:06 -0500 Subject: [PATCH 0106/1181] kernel: add InfoType::IoRegionHint --- src/core/hle/kernel/svc_types.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/hle/kernel/svc_types.h b/src/core/hle/kernel/svc_types.h index 542c13461..39355d9c4 100644 --- a/src/core/hle/kernel/svc_types.h +++ b/src/core/hle/kernel/svc_types.h @@ -151,6 +151,7 @@ enum class InfoType : u32 { FreeThreadCount = 24, ThreadTickCount = 25, IsSvcPermitted = 26, + IoRegionHint = 27, MesosphereMeta = 65000, MesosphereCurrentProcess = 65001, From 62711fec0275877f56d0448d78096e1403108109 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 22 Feb 2023 21:30:47 -0500 Subject: [PATCH 0107/1181] kernel: simplify KAbstractSchedulerLock::Lock --- src/core/hle/kernel/k_scheduler_lock.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/core/hle/kernel/k_scheduler_lock.h b/src/core/hle/kernel/k_scheduler_lock.h index 129d60472..13463717f 100644 --- a/src/core/hle/kernel/k_scheduler_lock.h +++ b/src/core/hle/kernel/k_scheduler_lock.h @@ -31,22 +31,23 @@ public: } if (IsLockedByCurrentThread()) { - // If we already own the lock, we can just increment the count. + // If we already own the lock, the lock count should be > 0. + // For debug, ensure this is true. ASSERT(lock_count > 0); - lock_count++; } else { // Otherwise, we want to disable scheduling and acquire the spinlock. SchedulerType::DisableScheduling(kernel); spin_lock.Lock(); - // For debug, ensure that our state is valid. ASSERT(lock_count == 0); ASSERT(owner_thread == nullptr); - // Increment count, take ownership. - lock_count = 1; + // Take ownership of the lock. owner_thread = GetCurrentThreadPointer(kernel); } + + // Increment the lock count. + lock_count++; } void Unlock() { From 4165ac06806017cfcb8da547ae84dee554e465c3 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 22 Feb 2023 21:33:43 -0500 Subject: [PATCH 0108/1181] kernel: adjust pool allocations --- .../board/nintendo/nx/k_system_control.cpp | 21 +++++++++++++------ src/core/hle/kernel/init/init_slab_setup.cpp | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp index c10b7bf30..5b8a248c8 100644 --- a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp +++ b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp @@ -14,9 +14,12 @@ namespace Kernel::Board::Nintendo::Nx { namespace impl { -constexpr const std::size_t RequiredNonSecureSystemMemorySizeVi = 0x2238 * 4 * 1024; -constexpr const std::size_t RequiredNonSecureSystemMemorySizeNvservices = 0x710 * 4 * 1024; -constexpr const std::size_t RequiredNonSecureSystemMemorySizeMisc = 0x80 * 4 * 1024; +using namespace Common::Literals; + +constexpr const std::size_t RequiredNonSecureSystemMemorySizeVi = 0x2280 * 4_KiB; +constexpr const std::size_t RequiredNonSecureSystemMemorySizeViFatal = 0x200 * 4_KiB; +constexpr const std::size_t RequiredNonSecureSystemMemorySizeNvservices = 0x704 * 4_KiB; +constexpr const std::size_t RequiredNonSecureSystemMemorySizeMisc = 0x80 * 4_KiB; } // namespace impl @@ -24,6 +27,9 @@ constexpr const std::size_t RequiredNonSecureSystemMemorySize = impl::RequiredNonSecureSystemMemorySizeVi + impl::RequiredNonSecureSystemMemorySizeNvservices + impl::RequiredNonSecureSystemMemorySizeMisc; +constexpr const std::size_t RequiredNonSecureSystemMemorySizeWithFatal = + RequiredNonSecureSystemMemorySize + impl::RequiredNonSecureSystemMemorySizeViFatal; + namespace { using namespace Common::Literals; @@ -120,10 +126,13 @@ size_t KSystemControl::Init::GetAppletPoolSize() { size_t KSystemControl::Init::GetMinimumNonSecureSystemPoolSize() { // Verify that our minimum is at least as large as Nintendo's. - constexpr size_t MinimumSize = RequiredNonSecureSystemMemorySize; - static_assert(MinimumSize >= 0x29C8000); + constexpr size_t MinimumSizeWithFatal = RequiredNonSecureSystemMemorySizeWithFatal; + static_assert(MinimumSizeWithFatal >= 0x2C04000); - return MinimumSize; + constexpr size_t MinimumSizeWithoutFatal = RequiredNonSecureSystemMemorySize; + static_assert(MinimumSizeWithoutFatal >= 0x2A00000); + + return MinimumSizeWithFatal; } namespace { diff --git a/src/core/hle/kernel/init/init_slab_setup.cpp b/src/core/hle/kernel/init/init_slab_setup.cpp index abdb5639f..be52405c6 100644 --- a/src/core/hle/kernel/init/init_slab_setup.cpp +++ b/src/core/hle/kernel/init/init_slab_setup.cpp @@ -131,7 +131,7 @@ VAddr InitializeSlabHeap(Core::System& system, KMemoryLayout& memory_layout, VAd } size_t CalculateSlabHeapGapSize() { - constexpr size_t KernelSlabHeapGapSize = 2_MiB - 320_KiB; + constexpr size_t KernelSlabHeapGapSize = 2_MiB - 356_KiB; static_assert(KernelSlabHeapGapSize <= KernelSlabHeapGapsSizeMax); return KernelSlabHeapGapSize; } From 9f9b64cda2079a1aebf2c4a12fc20c24891c23c9 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 22 Feb 2023 21:40:53 -0500 Subject: [PATCH 0109/1181] kernel: document previous location of interrupt disables in arbiter/condvar --- src/core/hle/kernel/k_address_arbiter.cpp | 8 ++++++-- src/core/hle/kernel/k_condition_variable.cpp | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/core/hle/kernel/k_address_arbiter.cpp b/src/core/hle/kernel/k_address_arbiter.cpp index a442a3b98..fb86451ea 100644 --- a/src/core/hle/kernel/k_address_arbiter.cpp +++ b/src/core/hle/kernel/k_address_arbiter.cpp @@ -29,7 +29,9 @@ bool DecrementIfLessThan(Core::System& system, s32* out, VAddr address, s32 valu auto& monitor = system.Monitor(); const auto current_core = system.Kernel().CurrentPhysicalCoreIndex(); - // TODO(bunnei): We should disable interrupts here via KScopedInterruptDisable. + // NOTE: If scheduler lock is not held here, interrupt disable is required. + // KScopedInterruptDisable di; + // TODO(bunnei): We should call CanAccessAtomic(..) here. // Load the value from the address. @@ -59,7 +61,9 @@ bool UpdateIfEqual(Core::System& system, s32* out, VAddr address, s32 value, s32 auto& monitor = system.Monitor(); const auto current_core = system.Kernel().CurrentPhysicalCoreIndex(); - // TODO(bunnei): We should disable interrupts here via KScopedInterruptDisable. + // NOTE: If scheduler lock is not held here, interrupt disable is required. + // KScopedInterruptDisable di; + // TODO(bunnei): We should call CanAccessAtomic(..) here. // Load the value from the address. diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cpp index 3f0be1c3f..50a805296 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/core/hle/kernel/k_condition_variable.cpp @@ -198,7 +198,9 @@ void KConditionVariable::SignalImpl(KThread* thread) { u32 prev_tag{}; bool can_access{}; { - // TODO(bunnei): We should disable interrupts here via KScopedInterruptDisable. + // NOTE: If scheduler lock is not held here, interrupt disable is required. + // KScopedInterruptDisable di; + // TODO(bunnei): We should call CanAccessAtomic(..) here. can_access = true; if (can_access) [[likely]] { From 367e89f984e635ae6680e6c640fe3d1259fb692e Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 22 Feb 2023 21:46:06 -0500 Subject: [PATCH 0110/1181] kernel: barrier memory before condition variable write --- src/core/hle/kernel/k_condition_variable.cpp | 38 ++++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cpp index 50a805296..c6a088942 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/core/hle/kernel/k_condition_variable.cpp @@ -112,7 +112,7 @@ Result KConditionVariable::SignalToAddress(VAddr addr) { // Remove waiter thread. s32 num_waiters{}; - KThread* next_owner_thread = + KThread* const next_owner_thread = owner_thread->RemoveWaiterByKey(std::addressof(num_waiters), addr); // Determine the next tag. @@ -122,25 +122,25 @@ Result KConditionVariable::SignalToAddress(VAddr addr) { if (num_waiters > 1) { next_value |= Svc::HandleWaitMask; } - - // Write the value to userspace. - Result result{ResultSuccess}; - if (WriteToUser(system, addr, std::addressof(next_value))) [[likely]] { - result = ResultSuccess; - } else { - result = ResultInvalidCurrentMemory; - } - - // Signal the next owner thread. - next_owner_thread->EndWait(result); - return result; - } else { - // Just write the value to userspace. - R_UNLESS(WriteToUser(system, addr, std::addressof(next_value)), - ResultInvalidCurrentMemory); - - return ResultSuccess; } + + // Synchronize memory before proceeding. + std::atomic_thread_fence(std::memory_order_seq_cst); + + // Write the value to userspace. + Result result{ResultSuccess}; + if (WriteToUser(system, addr, std::addressof(next_value))) [[likely]] { + result = ResultSuccess; + } else { + result = ResultInvalidCurrentMemory; + } + + // If necessary, signal the next owner thread. + if (next_owner_thread != nullptr) { + next_owner_thread->EndWait(result); + } + + R_RETURN(result); } } From 96bd7ea42d1bb1188fd099c52569fe7ee0d92a92 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 22 Feb 2023 22:03:15 -0500 Subject: [PATCH 0111/1181] kernel: simplify AddressSpaceInfo, update values --- src/core/hle/kernel/k_address_space_info.cpp | 79 ++++---------------- 1 file changed, 13 insertions(+), 66 deletions(-) diff --git a/src/core/hle/kernel/k_address_space_info.cpp b/src/core/hle/kernel/k_address_space_info.cpp index 3e612a207..97972ebae 100644 --- a/src/core/hle/kernel/k_address_space_info.cpp +++ b/src/core/hle/kernel/k_address_space_info.cpp @@ -23,86 +23,33 @@ constexpr std::array AddressSpaceInfos{{ { .bit_width = 32, .address = Size_Invalid, .size = 1_GiB , .type = KAddressSpaceInfo::Type::Heap, }, { .bit_width = 36, .address = 128_MiB , .size = 2_GiB - 128_MiB, .type = KAddressSpaceInfo::Type::MapSmall, }, { .bit_width = 36, .address = 2_GiB , .size = 64_GiB - 2_GiB , .type = KAddressSpaceInfo::Type::MapLarge, }, - { .bit_width = 36, .address = Size_Invalid, .size = 6_GiB , .type = KAddressSpaceInfo::Type::Heap, }, + { .bit_width = 36, .address = Size_Invalid, .size = 8_GiB , .type = KAddressSpaceInfo::Type::Heap, }, { .bit_width = 36, .address = Size_Invalid, .size = 6_GiB , .type = KAddressSpaceInfo::Type::Alias, }, { .bit_width = 39, .address = 128_MiB , .size = 512_GiB - 128_MiB, .type = KAddressSpaceInfo::Type::Map39Bit, }, { .bit_width = 39, .address = Size_Invalid, .size = 64_GiB , .type = KAddressSpaceInfo::Type::MapSmall }, - { .bit_width = 39, .address = Size_Invalid, .size = 6_GiB , .type = KAddressSpaceInfo::Type::Heap, }, + { .bit_width = 39, .address = Size_Invalid, .size = 8_GiB , .type = KAddressSpaceInfo::Type::Heap, }, { .bit_width = 39, .address = Size_Invalid, .size = 64_GiB , .type = KAddressSpaceInfo::Type::Alias, }, { .bit_width = 39, .address = Size_Invalid, .size = 2_GiB , .type = KAddressSpaceInfo::Type::Stack, }, }}; // clang-format on -constexpr bool IsAllowedIndexForAddress(std::size_t index) { - return index < AddressSpaceInfos.size() && AddressSpaceInfos[index].address != Size_Invalid; -} - -using IndexArray = - std::array(KAddressSpaceInfo::Type::Count)>; - -constexpr IndexArray AddressSpaceIndices32Bit{ - 0, 1, 0, 2, 0, 3, -}; - -constexpr IndexArray AddressSpaceIndices36Bit{ - 4, 5, 4, 6, 4, 7, -}; - -constexpr IndexArray AddressSpaceIndices39Bit{ - 9, 8, 8, 10, 12, 11, -}; - -constexpr bool IsAllowed32BitType(KAddressSpaceInfo::Type type) { - return type < KAddressSpaceInfo::Type::Count && type != KAddressSpaceInfo::Type::Map39Bit && - type != KAddressSpaceInfo::Type::Stack; -} - -constexpr bool IsAllowed36BitType(KAddressSpaceInfo::Type type) { - return type < KAddressSpaceInfo::Type::Count && type != KAddressSpaceInfo::Type::Map39Bit && - type != KAddressSpaceInfo::Type::Stack; -} - -constexpr bool IsAllowed39BitType(KAddressSpaceInfo::Type type) { - return type < KAddressSpaceInfo::Type::Count && type != KAddressSpaceInfo::Type::MapLarge; +const KAddressSpaceInfo& GetAddressSpaceInfo(size_t width, KAddressSpaceInfo::Type type) { + for (auto& info : AddressSpaceInfos) { + if (info.bit_width == width && info.type == type) { + return info; + } + } + UNREACHABLE_MSG("Could not find AddressSpaceInfo"); } } // namespace -u64 KAddressSpaceInfo::GetAddressSpaceStart(std::size_t width, Type type) { - const std::size_t index{static_cast(type)}; - switch (width) { - case 32: - ASSERT(IsAllowed32BitType(type)); - ASSERT(IsAllowedIndexForAddress(AddressSpaceIndices32Bit[index])); - return AddressSpaceInfos[AddressSpaceIndices32Bit[index]].address; - case 36: - ASSERT(IsAllowed36BitType(type)); - ASSERT(IsAllowedIndexForAddress(AddressSpaceIndices36Bit[index])); - return AddressSpaceInfos[AddressSpaceIndices36Bit[index]].address; - case 39: - ASSERT(IsAllowed39BitType(type)); - ASSERT(IsAllowedIndexForAddress(AddressSpaceIndices39Bit[index])); - return AddressSpaceInfos[AddressSpaceIndices39Bit[index]].address; - } - ASSERT(false); - return 0; +uintptr_t KAddressSpaceInfo::GetAddressSpaceStart(size_t width, KAddressSpaceInfo::Type type) { + return GetAddressSpaceInfo(width, type).address; } -std::size_t KAddressSpaceInfo::GetAddressSpaceSize(std::size_t width, Type type) { - const std::size_t index{static_cast(type)}; - switch (width) { - case 32: - ASSERT(IsAllowed32BitType(type)); - return AddressSpaceInfos[AddressSpaceIndices32Bit[index]].size; - case 36: - ASSERT(IsAllowed36BitType(type)); - return AddressSpaceInfos[AddressSpaceIndices36Bit[index]].size; - case 39: - ASSERT(IsAllowed39BitType(type)); - return AddressSpaceInfos[AddressSpaceIndices39Bit[index]].size; - } - ASSERT(false); - return 0; +size_t KAddressSpaceInfo::GetAddressSpaceSize(size_t width, KAddressSpaceInfo::Type type) { + return GetAddressSpaceInfo(width, type).size; } } // namespace Kernel From c4ba088a5df13ff4b4d8853216231d690f2c79c0 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 23 Feb 2023 15:49:42 -0500 Subject: [PATCH 0112/1181] kernel: refactor priority inheritance to represent locks as C++ objects --- src/core/hle/kernel/init/init_slab_setup.cpp | 6 +- src/core/hle/kernel/k_condition_variable.cpp | 16 +- src/core/hle/kernel/k_light_lock.cpp | 6 +- src/core/hle/kernel/k_process.cpp | 4 +- src/core/hle/kernel/k_thread.cpp | 267 +++++++++++++------ src/core/hle/kernel/k_thread.h | 165 ++++++++++-- src/core/hle/kernel/kernel.cpp | 93 +++++++ src/core/hle/kernel/kernel.h | 67 +---- 8 files changed, 435 insertions(+), 189 deletions(-) diff --git a/src/core/hle/kernel/init/init_slab_setup.cpp b/src/core/hle/kernel/init/init_slab_setup.cpp index be52405c6..5e4090e2b 100644 --- a/src/core/hle/kernel/init/init_slab_setup.cpp +++ b/src/core/hle/kernel/init/init_slab_setup.cpp @@ -33,6 +33,9 @@ namespace Kernel::Init { +// For macro convenience. +using KThreadLockInfo = KThread::LockWithPriorityInheritanceInfo; + #define SLAB_COUNT(CLASS) kernel.SlabResourceCounts().num_##CLASS #define FOREACH_SLAB_TYPE(HANDLER, ...) \ @@ -54,7 +57,8 @@ namespace Kernel::Init { HANDLER(KResourceLimit, (SLAB_COUNT(KResourceLimit)), ##__VA_ARGS__) \ HANDLER(KEventInfo, (SLAB_COUNT(KThread) + SLAB_COUNT(KDebug)), ##__VA_ARGS__) \ HANDLER(KDebug, (SLAB_COUNT(KDebug)), ##__VA_ARGS__) \ - HANDLER(KSecureSystemResource, (SLAB_COUNT(KProcess)), ##__VA_ARGS__) + HANDLER(KSecureSystemResource, (SLAB_COUNT(KProcess)), ##__VA_ARGS__) \ + HANDLER(KThreadLockInfo, (SLAB_COUNT(KThread)), ##__VA_ARGS__) namespace { diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cpp index c6a088942..8dae78397 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/core/hle/kernel/k_condition_variable.cpp @@ -111,15 +111,15 @@ Result KConditionVariable::SignalToAddress(VAddr addr) { KScopedSchedulerLock sl(kernel); // Remove waiter thread. - s32 num_waiters{}; + bool has_waiters{}; KThread* const next_owner_thread = - owner_thread->RemoveWaiterByKey(std::addressof(num_waiters), addr); + owner_thread->RemoveWaiterByKey(std::addressof(has_waiters), addr); // Determine the next tag. u32 next_value{}; if (next_owner_thread != nullptr) { next_value = next_owner_thread->GetAddressKeyValue(); - if (num_waiters > 1) { + if (has_waiters) { next_value |= Svc::HandleWaitMask; } } @@ -247,9 +247,11 @@ void KConditionVariable::Signal(u64 cv_key, s32 count) { (it->GetConditionVariableKey() == cv_key)) { KThread* target_thread = std::addressof(*it); - this->SignalImpl(target_thread); it = thread_tree.erase(it); target_thread->ClearConditionVariable(); + + this->SignalImpl(target_thread); + ++num_waiters; } @@ -279,16 +281,16 @@ Result KConditionVariable::Wait(VAddr addr, u64 key, u32 value, s64 timeout) { // Update the value and process for the next owner. { // Remove waiter thread. - s32 num_waiters{}; + bool has_waiters{}; KThread* next_owner_thread = - cur_thread->RemoveWaiterByKey(std::addressof(num_waiters), addr); + cur_thread->RemoveWaiterByKey(std::addressof(has_waiters), addr); // Update for the next owner thread. u32 next_value{}; if (next_owner_thread != nullptr) { // Get the next tag value. next_value = next_owner_thread->GetAddressKeyValue(); - if (num_waiters > 1) { + if (has_waiters) { next_value |= Svc::HandleWaitMask; } diff --git a/src/core/hle/kernel/k_light_lock.cpp b/src/core/hle/kernel/k_light_lock.cpp index d791acbe3..b922a67a5 100644 --- a/src/core/hle/kernel/k_light_lock.cpp +++ b/src/core/hle/kernel/k_light_lock.cpp @@ -90,15 +90,15 @@ void KLightLock::UnlockSlowPath(uintptr_t _cur_thread) { KScopedSchedulerLock sl(kernel); // Get the next owner. - s32 num_waiters; + bool has_waiters; KThread* next_owner = owner_thread->RemoveWaiterByKey( - std::addressof(num_waiters), reinterpret_cast(std::addressof(tag))); + std::addressof(has_waiters), reinterpret_cast(std::addressof(tag))); // Pass the lock to the next owner. uintptr_t next_tag = 0; if (next_owner != nullptr) { next_tag = - reinterpret_cast(next_owner) | static_cast(num_waiters > 1); + reinterpret_cast(next_owner) | static_cast(has_waiters); next_owner->EndWait(ResultSuccess); diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp index d9c1a0eb3..514f20ef4 100644 --- a/src/core/hle/kernel/k_process.cpp +++ b/src/core/hle/kernel/k_process.cpp @@ -156,9 +156,9 @@ bool KProcess::ReleaseUserException(KThread* thread) { exception_thread = nullptr; // Remove waiter thread. - s32 num_waiters{}; + bool has_waiters{}; if (KThread* next = thread->RemoveWaiterByKey( - std::addressof(num_waiters), + std::addressof(has_waiters), reinterpret_cast(std::addressof(exception_thread))); next != nullptr) { next->EndWait(ResultSuccess); diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index 599d05947..2831df733 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -191,7 +191,7 @@ Result KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack light_ipc_data = nullptr; // We're not waiting for a lock, and we haven't disabled migration. - lock_owner = nullptr; + waiting_lock_info = nullptr; num_core_migration_disables = 0; // We have no waiters, but we do have an entrypoint. @@ -341,25 +341,39 @@ void KThread::Finalize() { // Release any waiters. { - ASSERT(lock_owner == nullptr); + ASSERT(waiting_lock_info == nullptr); KScopedSchedulerLock sl{kernel}; - auto it = waiter_list.begin(); - while (it != waiter_list.end()) { - // Get the thread. - KThread* const waiter = std::addressof(*it); + // Check that we have no kernel waiters. + ASSERT(num_kernel_waiters == 0); - // The thread shouldn't be a kernel waiter. - ASSERT(!waiter->GetAddressKeyIsKernel()); + auto it = held_lock_info_list.begin(); + while (it != held_lock_info_list.end()) { + // Get the lock info. + auto* const lock_info = std::addressof(*it); - // Clear the lock owner. - waiter->SetLockOwner(nullptr); + // The lock shouldn't have a kernel waiter. + ASSERT(!lock_info->GetIsKernelAddressKey()); - // Erase the waiter from our list. - it = waiter_list.erase(it); + // Remove all waiters. + while (lock_info->GetWaiterCount() != 0) { + // Get the front waiter. + KThread* const waiter = lock_info->GetHighestPriorityWaiter(); - // Cancel the thread's wait. - waiter->CancelWait(ResultInvalidState, true); + // Remove it from the lock. + if (lock_info->RemoveWaiter(waiter)) { + ASSERT(lock_info->GetWaiterCount() == 0); + } + + // Cancel the thread's wait. + waiter->CancelWait(ResultInvalidState, true); + } + + // Remove the held lock from our list. + it = held_lock_info_list.erase(it); + + // Free the lock info. + LockWithPriorityInheritanceInfo::Free(kernel, lock_info); } } @@ -708,6 +722,24 @@ void KThread::SetBasePriority(s32 value) { RestorePriority(kernel, this); } +KThread* KThread::GetLockOwner() const { + return waiting_lock_info != nullptr ? waiting_lock_info->GetOwner() : nullptr; +} + +void KThread::IncreaseBasePriority(s32 priority_) { + ASSERT(Svc::HighestThreadPriority <= priority_ && priority_ <= Svc::LowestThreadPriority); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); + ASSERT(!this->GetStackParameters().is_pinned); + + // Set our base priority. + if (base_priority > priority_) { + base_priority = priority_; + + // Perform a priority restoration. + RestorePriority(kernel, this); + } +} + void KThread::RequestSuspend(SuspendType type) { KScopedSchedulerLock sl{kernel}; @@ -891,51 +923,87 @@ Result KThread::GetThreadContext3(std::vector& out) { R_SUCCEED(); } -void KThread::AddWaiterImpl(KThread* thread) { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); +void KThread::AddHeldLock(LockWithPriorityInheritanceInfo* lock_info) { + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); - // Find the right spot to insert the waiter. - auto it = waiter_list.begin(); - while (it != waiter_list.end()) { - if (it->GetPriority() > thread->GetPriority()) { - break; + // Set ourselves as the lock's owner. + lock_info->SetOwner(this); + + // Add the lock to our held list. + held_lock_info_list.push_front(*lock_info); +} + +KThread::LockWithPriorityInheritanceInfo* KThread::FindHeldLock(VAddr address_key_) { + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); + + // Try to find an existing held lock. + for (auto& held_lock : held_lock_info_list) { + if (held_lock.GetAddressKey() == address_key_) { + return std::addressof(held_lock); } - it++; } + return nullptr; +} + +void KThread::AddWaiterImpl(KThread* thread) { + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); + ASSERT(thread->GetConditionVariableTree() == nullptr); + + // Get the thread's address key. + const auto address_key_ = thread->GetAddressKey(); + const auto is_kernel_address_key_ = thread->GetIsKernelAddressKey(); + // Keep track of how many kernel waiters we have. - if (thread->GetAddressKeyIsKernel()) { + if (is_kernel_address_key_) { ASSERT((num_kernel_waiters++) >= 0); KScheduler::SetSchedulerUpdateNeeded(kernel); } - // Insert the waiter. - waiter_list.insert(it, *thread); - thread->SetLockOwner(this); + // Get the relevant lock info. + auto* lock_info = this->FindHeldLock(address_key_); + if (lock_info == nullptr) { + // Create a new lock for the address key. + lock_info = + LockWithPriorityInheritanceInfo::Create(kernel, address_key_, is_kernel_address_key_); + + // Add the new lock to our list. + this->AddHeldLock(lock_info); + } + + // Add the thread as waiter to the lock info. + lock_info->AddWaiter(thread); } void KThread::RemoveWaiterImpl(KThread* thread) { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); // Keep track of how many kernel waiters we have. - if (thread->GetAddressKeyIsKernel()) { + if (thread->GetIsKernelAddressKey()) { ASSERT((num_kernel_waiters--) > 0); KScheduler::SetSchedulerUpdateNeeded(kernel); } + // Get the info for the lock the thread is waiting on. + auto* lock_info = thread->GetWaitingLockInfo(); + ASSERT(lock_info->GetOwner() == this); + // Remove the waiter. - waiter_list.erase(waiter_list.iterator_to(*thread)); - thread->SetLockOwner(nullptr); + if (lock_info->RemoveWaiter(thread)) { + held_lock_info_list.erase(held_lock_info_list.iterator_to(*lock_info)); + LockWithPriorityInheritanceInfo::Free(kernel, lock_info); + } } -void KThread::RestorePriority(KernelCore& kernel_ctx, KThread* thread) { - ASSERT(kernel_ctx.GlobalSchedulerContext().IsLocked()); +void KThread::RestorePriority(KernelCore& kernel, KThread* thread) { + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); - while (true) { + while (thread != nullptr) { // We want to inherit priority where possible. s32 new_priority = thread->GetBasePriority(); - if (thread->HasWaiters()) { - new_priority = std::min(new_priority, thread->waiter_list.front().GetPriority()); + for (const auto& held_lock : thread->held_lock_info_list) { + new_priority = + std::min(new_priority, held_lock.GetHighestPriorityWaiter()->GetPriority()); } // If the priority we would inherit is not different from ours, don't do anything. @@ -943,9 +1011,18 @@ void KThread::RestorePriority(KernelCore& kernel_ctx, KThread* thread) { return; } + // Get the owner of whatever lock this thread is waiting on. + KThread* const lock_owner = thread->GetLockOwner(); + + // If the thread is waiting on some lock, remove it as a waiter to prevent violating red + // black tree invariants. + if (lock_owner != nullptr) { + lock_owner->RemoveWaiterImpl(thread); + } + // Ensure we don't violate condition variable red black tree invariants. if (auto* cv_tree = thread->GetConditionVariableTree(); cv_tree != nullptr) { - BeforeUpdatePriority(kernel_ctx, cv_tree, thread); + BeforeUpdatePriority(kernel, cv_tree, thread); } // Change the priority. @@ -954,73 +1031,99 @@ void KThread::RestorePriority(KernelCore& kernel_ctx, KThread* thread) { // Restore the condition variable, if relevant. if (auto* cv_tree = thread->GetConditionVariableTree(); cv_tree != nullptr) { - AfterUpdatePriority(kernel_ctx, cv_tree, thread); + AfterUpdatePriority(kernel, cv_tree, thread); + } + + // If we removed the thread from some lock's waiting list, add it back. + if (lock_owner != nullptr) { + lock_owner->AddWaiterImpl(thread); } // Update the scheduler. - KScheduler::OnThreadPriorityChanged(kernel_ctx, thread, old_priority); + KScheduler::OnThreadPriorityChanged(kernel, thread, old_priority); - // Keep the lock owner up to date. - KThread* lock_owner = thread->GetLockOwner(); - if (lock_owner == nullptr) { - return; - } - - // Update the thread in the lock owner's sorted list, and continue inheriting. - lock_owner->RemoveWaiterImpl(thread); - lock_owner->AddWaiterImpl(thread); + // Continue inheriting priority. thread = lock_owner; } } void KThread::AddWaiter(KThread* thread) { - AddWaiterImpl(thread); - RestorePriority(kernel, this); + this->AddWaiterImpl(thread); + + // If the thread has a higher priority than us, we should inherit. + if (thread->GetPriority() < this->GetPriority()) { + RestorePriority(kernel, this); + } } void KThread::RemoveWaiter(KThread* thread) { - RemoveWaiterImpl(thread); - RestorePriority(kernel, this); + this->RemoveWaiterImpl(thread); + + // If our priority is the same as the thread's (and we've inherited), we may need to restore to + // lower priority. + if (this->GetPriority() == thread->GetPriority() && + this->GetPriority() < this->GetBasePriority()) { + RestorePriority(kernel, this); + } } -KThread* KThread::RemoveWaiterByKey(s32* out_num_waiters, VAddr key) { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); +KThread* KThread::RemoveWaiterByKey(bool* out_has_waiters, VAddr key) { + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); - s32 num_waiters{}; - KThread* next_lock_owner{}; - auto it = waiter_list.begin(); - while (it != waiter_list.end()) { - if (it->GetAddressKey() == key) { - KThread* thread = std::addressof(*it); + // Get the relevant lock info. + auto* lock_info = this->FindHeldLock(key); + if (lock_info == nullptr) { + *out_has_waiters = false; + return nullptr; + } - // Keep track of how many kernel waiters we have. - if (thread->GetAddressKeyIsKernel()) { - ASSERT((num_kernel_waiters--) > 0); - KScheduler::SetSchedulerUpdateNeeded(kernel); - } - it = waiter_list.erase(it); + // Remove the lock info from our held list. + held_lock_info_list.erase(held_lock_info_list.iterator_to(*lock_info)); - // Update the next lock owner. - if (next_lock_owner == nullptr) { - next_lock_owner = thread; - next_lock_owner->SetLockOwner(nullptr); - } else { - next_lock_owner->AddWaiterImpl(thread); - } - num_waiters++; - } else { - it++; + // Keep track of how many kernel waiters we have. + if (lock_info->GetIsKernelAddressKey()) { + num_kernel_waiters -= lock_info->GetWaiterCount(); + ASSERT(num_kernel_waiters >= 0); + KScheduler::SetSchedulerUpdateNeeded(kernel); + } + + ASSERT(lock_info->GetWaiterCount() > 0); + + // Remove the highest priority waiter from the lock to be the next owner. + KThread* next_lock_owner = lock_info->GetHighestPriorityWaiter(); + if (lock_info->RemoveWaiter(next_lock_owner)) { + // The new owner was the only waiter. + *out_has_waiters = false; + + // Free the lock info, since it has no waiters. + LockWithPriorityInheritanceInfo::Free(kernel, lock_info); + } else { + // There are additional waiters on the lock. + *out_has_waiters = true; + + // Add the lock to the new owner's held list. + next_lock_owner->AddHeldLock(lock_info); + + // Keep track of any kernel waiters for the new owner. + if (lock_info->GetIsKernelAddressKey()) { + next_lock_owner->num_kernel_waiters += lock_info->GetWaiterCount(); + ASSERT(next_lock_owner->num_kernel_waiters > 0); + + // NOTE: No need to set scheduler update needed, because we will have already done so + // when removing earlier. } } - // Do priority updates, if we have a next owner. - if (next_lock_owner) { + // If our priority is the same as the next owner's (and we've inherited), we may need to restore + // to lower priority. + if (this->GetPriority() == next_lock_owner->GetPriority() && + this->GetPriority() < this->GetBasePriority()) { RestorePriority(kernel, this); - RestorePriority(kernel, next_lock_owner); + // NOTE: No need to restore priority on the next lock owner, because it was already the + // highest priority waiter on the lock. } - // Return output. - *out_num_waiters = num_waiters; + // Return the next lock owner. return next_lock_owner; } @@ -1137,9 +1240,7 @@ ThreadState KThread::RequestTerminate() { } // Change the thread's priority to be higher than any system thread's. - if (this->GetBasePriority() >= Svc::SystemThreadPriorityHighest) { - this->SetBasePriority(TerminatingThreadPriority); - } + this->IncreaseBasePriority(TerminatingThreadPriority); // If the thread is runnable, send a termination interrupt to other cores. if (this->GetState() == ThreadState::Runnable) { diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h index a04de21bc..e09dcbea0 100644 --- a/src/core/hle/kernel/k_thread.h +++ b/src/core/hle/kernel/k_thread.h @@ -339,13 +339,7 @@ public: void SetInterruptFlag(); void ClearInterruptFlag(); - [[nodiscard]] KThread* GetLockOwner() const { - return lock_owner; - } - - void SetLockOwner(KThread* owner) { - lock_owner = owner; - } + KThread* GetLockOwner() const; [[nodiscard]] const KAffinityMask& GetAffinityMask() const { return physical_affinity_mask; @@ -601,7 +595,7 @@ public: [[nodiscard]] Result GetThreadContext3(std::vector& out); - [[nodiscard]] KThread* RemoveWaiterByKey(s32* out_num_waiters, VAddr key); + [[nodiscard]] KThread* RemoveWaiterByKey(bool* out_has_waiters, VAddr key); [[nodiscard]] VAddr GetAddressKey() const { return address_key; @@ -611,8 +605,8 @@ public: return address_key_value; } - [[nodiscard]] bool GetAddressKeyIsKernel() const { - return address_key_is_kernel; + [[nodiscard]] bool GetIsKernelAddressKey() const { + return is_kernel_address_key; } //! NB: intentional deviation from official kernel. @@ -621,20 +615,17 @@ public: // to cope with arbitrary host pointers making their way // into things. - void SetUserAddressKey(VAddr key) { - address_key = key; - address_key_is_kernel = false; - } - void SetUserAddressKey(VAddr key, u32 val) { + ASSERT(waiting_lock_info == nullptr); address_key = key; address_key_value = val; - address_key_is_kernel = false; + is_kernel_address_key = false; } void SetKernelAddressKey(VAddr key) { + ASSERT(waiting_lock_info == nullptr); address_key = key; - address_key_is_kernel = true; + is_kernel_address_key = true; } void ClearWaitQueue() { @@ -646,10 +637,6 @@ public: void EndWait(Result wait_result_); void CancelWait(Result wait_result_, bool cancel_timer_task); - [[nodiscard]] bool HasWaiters() const { - return !waiter_list.empty(); - } - [[nodiscard]] s32 GetNumKernelWaiters() const { return num_kernel_waiters; } @@ -722,13 +709,14 @@ private: }; void AddWaiterImpl(KThread* thread); - void RemoveWaiterImpl(KThread* thread); + static void RestorePriority(KernelCore& kernel, KThread* thread); void StartTermination(); - void FinishTermination(); + void IncreaseBasePriority(s32 priority); + [[nodiscard]] Result Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack_top, s32 prio, s32 virt_core, KProcess* owner, ThreadType type); @@ -737,8 +725,6 @@ private: s32 core, KProcess* owner, ThreadType type, std::function&& init_func); - static void RestorePriority(KernelCore& kernel_ctx, KThread* thread); - // For core KThread implementation ThreadContext32 thread_context_32{}; ThreadContext64 thread_context_64{}; @@ -749,6 +735,127 @@ private: &KThread::condvar_arbiter_tree_node>; using ConditionVariableThreadTree = ConditionVariableThreadTreeTraits::TreeType; + +private: + struct LockWithPriorityInheritanceComparator { + struct RedBlackKeyType { + s32 m_priority; + + constexpr s32 GetPriority() const { + return m_priority; + } + }; + + template + requires(std::same_as || std::same_as) + static constexpr int Compare(const T& lhs, const KThread& rhs) { + if (lhs.GetPriority() < rhs.GetPriority()) { + // Sort by priority. + return -1; + } else { + return 1; + } + } + }; + static_assert(std::same_as, + LockWithPriorityInheritanceComparator::RedBlackKeyType>); + + using LockWithPriorityInheritanceThreadTreeTraits = + Common::IntrusiveRedBlackTreeMemberTraitsDeferredAssert< + &KThread::condvar_arbiter_tree_node>; + using LockWithPriorityInheritanceThreadTree = + ConditionVariableThreadTreeTraits::TreeType; + +public: + class LockWithPriorityInheritanceInfo : public KSlabAllocated, + public boost::intrusive::list_base_hook<> { + public: + explicit LockWithPriorityInheritanceInfo(KernelCore&) {} + + static LockWithPriorityInheritanceInfo* Create(KernelCore& kernel, VAddr address_key, + bool is_kernel_address_key) { + // Create a new lock info. + auto* new_lock = LockWithPriorityInheritanceInfo::Allocate(kernel); + ASSERT(new_lock != nullptr); + + // Set the new lock's address key. + new_lock->m_address_key = address_key; + new_lock->m_is_kernel_address_key = is_kernel_address_key; + + return new_lock; + } + + void SetOwner(KThread* new_owner) { + // Set new owner. + m_owner = new_owner; + } + + void AddWaiter(KThread* waiter) { + // Insert the waiter. + m_tree.insert(*waiter); + m_waiter_count++; + + waiter->SetWaitingLockInfo(this); + } + + [[nodiscard]] bool RemoveWaiter(KThread* waiter) { + m_tree.erase(m_tree.iterator_to(*waiter)); + + waiter->SetWaitingLockInfo(nullptr); + + return (--m_waiter_count) == 0; + } + + KThread* GetHighestPriorityWaiter() { + return std::addressof(m_tree.front()); + } + const KThread* GetHighestPriorityWaiter() const { + return std::addressof(m_tree.front()); + } + + LockWithPriorityInheritanceThreadTree& GetThreadTree() { + return m_tree; + } + const LockWithPriorityInheritanceThreadTree& GetThreadTree() const { + return m_tree; + } + + VAddr GetAddressKey() const { + return m_address_key; + } + bool GetIsKernelAddressKey() const { + return m_is_kernel_address_key; + } + KThread* GetOwner() const { + return m_owner; + } + u32 GetWaiterCount() const { + return m_waiter_count; + } + + private: + LockWithPriorityInheritanceThreadTree m_tree{}; + VAddr m_address_key{}; + KThread* m_owner{}; + u32 m_waiter_count{}; + bool m_is_kernel_address_key{}; + }; + + void SetWaitingLockInfo(LockWithPriorityInheritanceInfo* lock) { + waiting_lock_info = lock; + } + + LockWithPriorityInheritanceInfo* GetWaitingLockInfo() { + return waiting_lock_info; + } + + void AddHeldLock(LockWithPriorityInheritanceInfo* lock_info); + LockWithPriorityInheritanceInfo* FindHeldLock(VAddr address_key); + +private: + using LockWithPriorityInheritanceInfoList = + boost::intrusive::list; + ConditionVariableThreadTree* condvar_tree{}; u64 condvar_key{}; u64 virtual_affinity_mask{}; @@ -765,9 +872,9 @@ private: s64 last_scheduled_tick{}; std::array per_core_priority_queue_entry{}; KThreadQueue* wait_queue{}; - WaiterList waiter_list{}; + LockWithPriorityInheritanceInfoList held_lock_info_list{}; + LockWithPriorityInheritanceInfo* waiting_lock_info{}; WaiterList pinned_waiter_list{}; - KThread* lock_owner{}; u32 address_key_value{}; u32 suspend_request_flags{}; u32 suspend_allowed_flags{}; @@ -791,7 +898,7 @@ private: bool debug_attached{}; s8 priority_inheritance_count{}; bool resource_limit_release_hint{}; - bool address_key_is_kernel{}; + bool is_kernel_address_key{}; StackParameters stack_parameters{}; Common::SpinLock context_guard{}; @@ -814,6 +921,7 @@ public: void SetConditionVariable(ConditionVariableThreadTree* tree, VAddr address, u64 cv_key, u32 value) { + ASSERT(waiting_lock_info == nullptr); condvar_tree = tree; condvar_key = cv_key; address_key = address; @@ -829,6 +937,7 @@ public: } void SetAddressArbiter(ConditionVariableThreadTree* tree, u64 address) { + ASSERT(waiting_lock_info == nullptr); condvar_tree = tree; condvar_key = address; } diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index ce94d3605..ef7057ff7 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -1318,4 +1318,97 @@ const Core::System& KernelCore::System() const { return impl->system; } +struct KernelCore::SlabHeapContainer { + KSlabHeap client_session; + KSlabHeap event; + KSlabHeap linked_list_node; + KSlabHeap port; + KSlabHeap process; + KSlabHeap resource_limit; + KSlabHeap session; + KSlabHeap shared_memory; + KSlabHeap shared_memory_info; + KSlabHeap thread; + KSlabHeap transfer_memory; + KSlabHeap code_memory; + KSlabHeap device_address_space; + KSlabHeap page_buffer; + KSlabHeap thread_local_page; + KSlabHeap object_name; + KSlabHeap session_request; + KSlabHeap secure_system_resource; + KSlabHeap lock_info; + KSlabHeap event_info; + KSlabHeap debug; +}; + +template +KSlabHeap& KernelCore::SlabHeap() { + if constexpr (std::is_same_v) { + return slab_heap_container->client_session; + } else if constexpr (std::is_same_v) { + return slab_heap_container->event; + } else if constexpr (std::is_same_v) { + return slab_heap_container->linked_list_node; + } else if constexpr (std::is_same_v) { + return slab_heap_container->port; + } else if constexpr (std::is_same_v) { + return slab_heap_container->process; + } else if constexpr (std::is_same_v) { + return slab_heap_container->resource_limit; + } else if constexpr (std::is_same_v) { + return slab_heap_container->session; + } else if constexpr (std::is_same_v) { + return slab_heap_container->shared_memory; + } else if constexpr (std::is_same_v) { + return slab_heap_container->shared_memory_info; + } else if constexpr (std::is_same_v) { + return slab_heap_container->thread; + } else if constexpr (std::is_same_v) { + return slab_heap_container->transfer_memory; + } else if constexpr (std::is_same_v) { + return slab_heap_container->code_memory; + } else if constexpr (std::is_same_v) { + return slab_heap_container->device_address_space; + } else if constexpr (std::is_same_v) { + return slab_heap_container->page_buffer; + } else if constexpr (std::is_same_v) { + return slab_heap_container->thread_local_page; + } else if constexpr (std::is_same_v) { + return slab_heap_container->object_name; + } else if constexpr (std::is_same_v) { + return slab_heap_container->session_request; + } else if constexpr (std::is_same_v) { + return slab_heap_container->secure_system_resource; + } else if constexpr (std::is_same_v) { + return slab_heap_container->lock_info; + } else if constexpr (std::is_same_v) { + return slab_heap_container->event_info; + } else if constexpr (std::is_same_v) { + return slab_heap_container->debug; + } +} + +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); +template KSlabHeap& KernelCore::SlabHeap(); + } // namespace Kernel diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 4449f6949..1b380a07b 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -305,49 +305,7 @@ public: /// Gets the slab heap for the specified kernel object type. template - KSlabHeap& SlabHeap() { - if constexpr (std::is_same_v) { - return slab_heap_container->client_session; - } else if constexpr (std::is_same_v) { - return slab_heap_container->event; - } else if constexpr (std::is_same_v) { - return slab_heap_container->linked_list_node; - } else if constexpr (std::is_same_v) { - return slab_heap_container->port; - } else if constexpr (std::is_same_v) { - return slab_heap_container->process; - } else if constexpr (std::is_same_v) { - return slab_heap_container->resource_limit; - } else if constexpr (std::is_same_v) { - return slab_heap_container->session; - } else if constexpr (std::is_same_v) { - return slab_heap_container->shared_memory; - } else if constexpr (std::is_same_v) { - return slab_heap_container->shared_memory_info; - } else if constexpr (std::is_same_v) { - return slab_heap_container->thread; - } else if constexpr (std::is_same_v) { - return slab_heap_container->transfer_memory; - } else if constexpr (std::is_same_v) { - return slab_heap_container->code_memory; - } else if constexpr (std::is_same_v) { - return slab_heap_container->device_address_space; - } else if constexpr (std::is_same_v) { - return slab_heap_container->page_buffer; - } else if constexpr (std::is_same_v) { - return slab_heap_container->thread_local_page; - } else if constexpr (std::is_same_v) { - return slab_heap_container->object_name; - } else if constexpr (std::is_same_v) { - return slab_heap_container->session_request; - } else if constexpr (std::is_same_v) { - return slab_heap_container->secure_system_resource; - } else if constexpr (std::is_same_v) { - return slab_heap_container->event_info; - } else if constexpr (std::is_same_v) { - return slab_heap_container->debug; - } - } + KSlabHeap& SlabHeap(); /// Gets the current slab resource counts. Init::KSlabResourceCounts& SlabResourceCounts(); @@ -393,28 +351,7 @@ private: private: /// Helper to encapsulate all slab heaps in a single heap allocated container - struct SlabHeapContainer { - KSlabHeap client_session; - KSlabHeap event; - KSlabHeap linked_list_node; - KSlabHeap port; - KSlabHeap process; - KSlabHeap resource_limit; - KSlabHeap session; - KSlabHeap shared_memory; - KSlabHeap shared_memory_info; - KSlabHeap thread; - KSlabHeap transfer_memory; - KSlabHeap code_memory; - KSlabHeap device_address_space; - KSlabHeap page_buffer; - KSlabHeap thread_local_page; - KSlabHeap object_name; - KSlabHeap session_request; - KSlabHeap secure_system_resource; - KSlabHeap event_info; - KSlabHeap debug; - }; + struct SlabHeapContainer; std::unique_ptr slab_heap_container; }; From 97f7f7bad59cdd42bf5f504089e5cecd441da3ce Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 23 Feb 2023 20:32:03 -0500 Subject: [PATCH 0113/1181] kernel: be more careful about kernel address keys --- src/core/hle/kernel/k_condition_variable.cpp | 4 ++-- src/core/hle/kernel/k_light_lock.cpp | 2 +- src/core/hle/kernel/k_process.cpp | 2 +- src/core/hle/kernel/k_thread.cpp | 12 +++++++----- src/core/hle/kernel/k_thread.h | 14 ++++++++++++-- 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cpp index 8dae78397..f40cf92b1 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/core/hle/kernel/k_condition_variable.cpp @@ -113,7 +113,7 @@ Result KConditionVariable::SignalToAddress(VAddr addr) { // Remove waiter thread. bool has_waiters{}; KThread* const next_owner_thread = - owner_thread->RemoveWaiterByKey(std::addressof(has_waiters), addr); + owner_thread->RemoveUserWaiterByKey(std::addressof(has_waiters), addr); // Determine the next tag. u32 next_value{}; @@ -283,7 +283,7 @@ Result KConditionVariable::Wait(VAddr addr, u64 key, u32 value, s64 timeout) { // Remove waiter thread. bool has_waiters{}; KThread* next_owner_thread = - cur_thread->RemoveWaiterByKey(std::addressof(has_waiters), addr); + cur_thread->RemoveUserWaiterByKey(std::addressof(has_waiters), addr); // Update for the next owner thread. u32 next_value{}; diff --git a/src/core/hle/kernel/k_light_lock.cpp b/src/core/hle/kernel/k_light_lock.cpp index b922a67a5..14cb615da 100644 --- a/src/core/hle/kernel/k_light_lock.cpp +++ b/src/core/hle/kernel/k_light_lock.cpp @@ -91,7 +91,7 @@ void KLightLock::UnlockSlowPath(uintptr_t _cur_thread) { // Get the next owner. bool has_waiters; - KThread* next_owner = owner_thread->RemoveWaiterByKey( + KThread* next_owner = owner_thread->RemoveKernelWaiterByKey( std::addressof(has_waiters), reinterpret_cast(std::addressof(tag))); // Pass the lock to the next owner. diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp index 514f20ef4..d44f6e921 100644 --- a/src/core/hle/kernel/k_process.cpp +++ b/src/core/hle/kernel/k_process.cpp @@ -157,7 +157,7 @@ bool KProcess::ReleaseUserException(KThread* thread) { // Remove waiter thread. bool has_waiters{}; - if (KThread* next = thread->RemoveWaiterByKey( + if (KThread* next = thread->RemoveKernelWaiterByKey( std::addressof(has_waiters), reinterpret_cast(std::addressof(exception_thread))); next != nullptr) { diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index 2831df733..8c403f5fd 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -933,12 +933,14 @@ void KThread::AddHeldLock(LockWithPriorityInheritanceInfo* lock_info) { held_lock_info_list.push_front(*lock_info); } -KThread::LockWithPriorityInheritanceInfo* KThread::FindHeldLock(VAddr address_key_) { +KThread::LockWithPriorityInheritanceInfo* KThread::FindHeldLock(VAddr address_key_, + bool is_kernel_address_key_) { ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); // Try to find an existing held lock. for (auto& held_lock : held_lock_info_list) { - if (held_lock.GetAddressKey() == address_key_) { + if (held_lock.GetAddressKey() == address_key_ && + held_lock.GetIsKernelAddressKey() == is_kernel_address_key_) { return std::addressof(held_lock); } } @@ -961,7 +963,7 @@ void KThread::AddWaiterImpl(KThread* thread) { } // Get the relevant lock info. - auto* lock_info = this->FindHeldLock(address_key_); + auto* lock_info = this->FindHeldLock(address_key_, is_kernel_address_key_); if (lock_info == nullptr) { // Create a new lock for the address key. lock_info = @@ -1067,11 +1069,11 @@ void KThread::RemoveWaiter(KThread* thread) { } } -KThread* KThread::RemoveWaiterByKey(bool* out_has_waiters, VAddr key) { +KThread* KThread::RemoveWaiterByKey(bool* out_has_waiters, VAddr key, bool is_kernel_address_key_) { ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); // Get the relevant lock info. - auto* lock_info = this->FindHeldLock(key); + auto* lock_info = this->FindHeldLock(key, is_kernel_address_key_); if (lock_info == nullptr) { *out_has_waiters = false; return nullptr; diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h index e09dcbea0..bd125f5f1 100644 --- a/src/core/hle/kernel/k_thread.h +++ b/src/core/hle/kernel/k_thread.h @@ -595,7 +595,13 @@ public: [[nodiscard]] Result GetThreadContext3(std::vector& out); - [[nodiscard]] KThread* RemoveWaiterByKey(bool* out_has_waiters, VAddr key); + [[nodiscard]] KThread* RemoveUserWaiterByKey(bool* out_has_waiters, VAddr key) { + return this->RemoveWaiterByKey(out_has_waiters, key, false); + } + + [[nodiscard]] KThread* RemoveKernelWaiterByKey(bool* out_has_waiters, VAddr key) { + return this->RemoveWaiterByKey(out_has_waiters, key, true); + } [[nodiscard]] VAddr GetAddressKey() const { return address_key; @@ -666,6 +672,9 @@ public: } private: + [[nodiscard]] KThread* RemoveWaiterByKey(bool* out_has_waiters, VAddr key, + bool is_kernel_address_key); + static constexpr size_t PriorityInheritanceCountMax = 10; union SyncObjectBuffer { std::array sync_objects{}; @@ -850,7 +859,7 @@ public: } void AddHeldLock(LockWithPriorityInheritanceInfo* lock_info); - LockWithPriorityInheritanceInfo* FindHeldLock(VAddr address_key); + LockWithPriorityInheritanceInfo* FindHeldLock(VAddr address_key, bool is_kernel_address_key); private: using LockWithPriorityInheritanceInfoList = @@ -926,6 +935,7 @@ public: condvar_key = cv_key; address_key = address; address_key_value = value; + is_kernel_address_key = false; } void ClearConditionVariable() { From ec6ee04c64a093fec161b66cabf9da3c576f97f0 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 1 Mar 2023 22:47:39 -0500 Subject: [PATCH 0114/1181] vulkan_common: disable vertexInputDynamicState on unsupported driver --- src/video_core/vulkan_common/vulkan_device.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 23d922e5d..48f1a3d14 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -409,6 +409,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR if (is_rdna2) { LOG_WARNING(Render_Vulkan, "RADV has broken VK_EXT_vertex_input_dynamic_state on RDNA2 hardware"); + features.vertex_input_dynamic_state.vertexInputDynamicState = false; extensions.vertex_input_dynamic_state = false; loaded_extensions.erase(VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME); } From 104cb6aa0a814cc9fb01647f1f1b6dfa3a3fc6f5 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Thu, 2 Mar 2023 05:48:53 +0000 Subject: [PATCH 0115/1181] Fix a bug with the Reverb command in reading from the pre_delay line. --- src/audio_core/renderer/command/effect/reverb.cpp | 3 ++- src/audio_core/renderer/effect/i3dl2.h | 3 ++- src/audio_core/renderer/effect/reverb.h | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/audio_core/renderer/command/effect/reverb.cpp b/src/audio_core/renderer/command/effect/reverb.cpp index 6fe844ff0..8b9b65214 100644 --- a/src/audio_core/renderer/command/effect/reverb.cpp +++ b/src/audio_core/renderer/command/effect/reverb.cpp @@ -308,7 +308,8 @@ static void ApplyReverbEffect(const ReverbInfo::ParameterVersion2& params, Rever } Common::FixedPoint<50, 14> pre_delay_sample{ - state.pre_delay_line.Read() * Common::FixedPoint<50, 14>::from_base(params.late_gain)}; + state.pre_delay_line.TapOut(state.pre_delay_time) * + Common::FixedPoint<50, 14>::from_base(params.late_gain)}; std::array, ReverbInfo::MaxDelayLines> mix_matrix{ state.prev_feedback_output[2] + state.prev_feedback_output[1] + pre_delay_sample, diff --git a/src/audio_core/renderer/effect/i3dl2.h b/src/audio_core/renderer/effect/i3dl2.h index 1ebbc5c4c..6e3ffd1d4 100644 --- a/src/audio_core/renderer/effect/i3dl2.h +++ b/src/audio_core/renderer/effect/i3dl2.h @@ -104,7 +104,8 @@ public: } void Write(const Common::FixedPoint<50, 14> sample) { - *(input++) = sample; + *input = sample; + input++; if (input >= buffer_end) { input = buffer.data(); } diff --git a/src/audio_core/renderer/effect/reverb.h b/src/audio_core/renderer/effect/reverb.h index a72475c3c..6cc345ef6 100644 --- a/src/audio_core/renderer/effect/reverb.h +++ b/src/audio_core/renderer/effect/reverb.h @@ -79,12 +79,10 @@ public: return; } sample_count = delay_time; - input = &buffer[(output - buffer.data() + sample_count) % (sample_count_max + 1)]; + input = &buffer[0]; } Common::FixedPoint<50, 14> Tick(const Common::FixedPoint<50, 14> sample) { - Write(sample); - auto out_sample{Read()}; output++; @@ -92,6 +90,7 @@ public: output = buffer.data(); } + Write(sample); return out_sample; } @@ -100,7 +99,8 @@ public: } void Write(const Common::FixedPoint<50, 14> sample) { - *(input++) = sample; + *input = sample; + input++; if (input >= buffer_end) { input = buffer.data(); } From b4b3454d9bc4c1e0a41708e82d70b8379fef62cc Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Thu, 2 Mar 2023 08:47:20 -0500 Subject: [PATCH 0116/1181] ci: Actually enable LTO on MSVC (#9887) --- .ci/templates/build-msvc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/templates/build-msvc.yml b/.ci/templates/build-msvc.yml index 427028e08..ceb7e0c32 100644 --- a/.ci/templates/build-msvc.yml +++ b/.ci/templates/build-msvc.yml @@ -9,7 +9,7 @@ parameters: steps: - script: choco install vulkan-sdk displayName: 'Install vulkan-sdk' -- script: refreshenv && mkdir build && cd build && cmake -E env CXXFLAGS="/Gw /GA /Gr /Ob2" cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_POLICY_DEFAULT_CMP0069=NEW -DENABLE_LTO=ON -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DYUZU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release -DYUZU_CRASH_DUMPS=ON .. && cd .. +- script: refreshenv && mkdir build && cd build && cmake -E env CXXFLAGS="/Gw /GA /Gr /Ob2" cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_POLICY_DEFAULT_CMP0069=NEW -DYUZU_ENABLE_LTO=ON -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DYUZU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release -DYUZU_CRASH_DUMPS=ON .. && cd .. displayName: 'Configure CMake' - task: MSBuild@1 displayName: 'Build' From 44518b225cfeeeaab182592e7751874c46d18b82 Mon Sep 17 00:00:00 2001 From: Behunin Date: Sat, 11 Feb 2023 09:28:07 -0700 Subject: [PATCH 0117/1181] gpu_thread: Use bounded queue --- src/video_core/gpu_thread.cpp | 3 ++- src/video_core/gpu_thread.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/video_core/gpu_thread.cpp b/src/video_core/gpu_thread.cpp index 9c103c0d4..7cc5647e9 100644 --- a/src/video_core/gpu_thread.cpp +++ b/src/video_core/gpu_thread.cpp @@ -32,7 +32,8 @@ static void RunThread(std::stop_token stop_token, Core::System& system, VideoCore::RasterizerInterface* const rasterizer = renderer.ReadRasterizer(); while (!stop_token.stop_requested()) { - CommandDataContainer next = state.queue.PopWait(stop_token); + CommandDataContainer next; + state.queue.Pop(next, stop_token); if (stop_token.stop_requested()) { break; } diff --git a/src/video_core/gpu_thread.h b/src/video_core/gpu_thread.h index 90bcb5958..43940bd6d 100644 --- a/src/video_core/gpu_thread.h +++ b/src/video_core/gpu_thread.h @@ -10,8 +10,8 @@ #include #include +#include "common/bounded_threadsafe_queue.h" #include "common/polyfill_thread.h" -#include "common/threadsafe_queue.h" #include "video_core/framebuffer_config.h" namespace Tegra { @@ -97,7 +97,7 @@ struct CommandDataContainer { /// Struct used to synchronize the GPU thread struct SynchState final { - using CommandQueue = Common::MPSCQueue; + using CommandQueue = Common::MPSCQueue; std::mutex write_lock; CommandQueue queue; u64 last_fence{}; From a7fb80e6127645dd42fcd41ab57666c68da8a442 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Thu, 2 Mar 2023 23:03:07 +0000 Subject: [PATCH 0118/1181] Check all swizzle components for red, not just [0], pass float border color rather than int --- src/video_core/renderer_opengl/gl_texture_cache.cpp | 13 ++++++++----- src/video_core/renderer_vulkan/vk_rasterizer.cpp | 2 +- src/video_core/renderer_vulkan/vk_texture_cache.cpp | 11 +++++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index b047e7b3d..d3eabd686 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -112,13 +112,17 @@ GLenum ImageTarget(Shader::TextureType type, int num_samples = 1) { return GL_NONE; } -GLenum TextureMode(PixelFormat format, bool is_first) { +GLenum TextureMode(PixelFormat format, std::array swizzle) { + bool any_r = + std::ranges::any_of(swizzle, [](SwizzleSource s) { return s == SwizzleSource::R; }); switch (format) { case PixelFormat::D24_UNORM_S8_UINT: case PixelFormat::D32_FLOAT_S8_UINT: - return is_first ? GL_DEPTH_COMPONENT : GL_STENCIL_INDEX; + // R = depth, G = stencil + return any_r ? GL_DEPTH_COMPONENT : GL_STENCIL_INDEX; case PixelFormat::S8_UINT_D24_UNORM: - return is_first ? GL_STENCIL_INDEX : GL_DEPTH_COMPONENT; + // R = stencil, G = depth + return any_r ? GL_STENCIL_INDEX : GL_DEPTH_COMPONENT; default: ASSERT(false); return GL_DEPTH_COMPONENT; @@ -208,8 +212,7 @@ void ApplySwizzle(GLuint handle, PixelFormat format, std::array& color) { if (info.IsRenderTarget()) { return ImageAspectMask(info.format); } - const bool is_first = info.Swizzle()[0] == SwizzleSource::R; + bool any_r = + std::ranges::any_of(info.Swizzle(), [](SwizzleSource s) { return s == SwizzleSource::R; }); switch (info.format) { case PixelFormat::D24_UNORM_S8_UINT: case PixelFormat::D32_FLOAT_S8_UINT: - return is_first ? VK_IMAGE_ASPECT_DEPTH_BIT : VK_IMAGE_ASPECT_STENCIL_BIT; + // R = depth, G = stencil + return any_r ? VK_IMAGE_ASPECT_DEPTH_BIT : VK_IMAGE_ASPECT_STENCIL_BIT; case PixelFormat::S8_UINT_D24_UNORM: - return is_first ? VK_IMAGE_ASPECT_STENCIL_BIT : VK_IMAGE_ASPECT_DEPTH_BIT; + // R = stencil, G = depth + return any_r ? VK_IMAGE_ASPECT_STENCIL_BIT : VK_IMAGE_ASPECT_DEPTH_BIT; case PixelFormat::D16_UNORM: case PixelFormat::D32_FLOAT: return VK_IMAGE_ASPECT_DEPTH_BIT; @@ -1763,7 +1766,7 @@ Sampler::Sampler(TextureCacheRuntime& runtime, const Tegra::Texture::TSCEntry& t .minLod = tsc.mipmap_filter == TextureMipmapFilter::None ? 0.0f : tsc.MinLod(), .maxLod = tsc.mipmap_filter == TextureMipmapFilter::None ? 0.25f : tsc.MaxLod(), .borderColor = - arbitrary_borders ? VK_BORDER_COLOR_INT_CUSTOM_EXT : ConvertBorderColor(color), + arbitrary_borders ? VK_BORDER_COLOR_FLOAT_CUSTOM_EXT : ConvertBorderColor(color), .unnormalizedCoordinates = VK_FALSE, }); } From bd09c825218aac9255643b9aa7c75f5ba156038c Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 1 Mar 2023 19:17:50 -0500 Subject: [PATCH 0119/1181] common: Implement a high resolution steady clock This implementation provides a consistent, high performance, and high resolution clock where/when std::chrono::steady_clock does not provide sufficient precision. --- src/common/CMakeLists.txt | 2 ++ src/common/steady_clock.cpp | 56 +++++++++++++++++++++++++++++++++++++ src/common/steady_clock.h | 23 +++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 src/common/steady_clock.cpp create mode 100644 src/common/steady_clock.h diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 56b247ac4..9f5d4c265 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -113,6 +113,8 @@ add_library(common STATIC socket_types.h spin_lock.cpp spin_lock.h + steady_clock.cpp + steady_clock.h stream.cpp stream.h string_util.cpp diff --git a/src/common/steady_clock.cpp b/src/common/steady_clock.cpp new file mode 100644 index 000000000..0d5908aa7 --- /dev/null +++ b/src/common/steady_clock.cpp @@ -0,0 +1,56 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#if defined(_WIN32) +#include +#else +#include +#endif + +#include "common/steady_clock.h" + +namespace Common { + +#ifdef _WIN32 +static s64 WindowsQueryPerformanceFrequency() { + LARGE_INTEGER frequency; + QueryPerformanceFrequency(&frequency); + return frequency.QuadPart; +} + +static s64 WindowsQueryPerformanceCounter() { + LARGE_INTEGER counter; + QueryPerformanceCounter(&counter); + return counter.QuadPart; +} +#endif + +SteadyClock::time_point SteadyClock::Now() noexcept { +#if defined(_WIN32) + static const auto freq = WindowsQueryPerformanceFrequency(); + const auto counter = WindowsQueryPerformanceCounter(); + + // 10 MHz is a very common QPC frequency on modern PCs. + // Optimizing for this specific frequency can double the performance of + // this function by avoiding the expensive frequency conversion path. + static constexpr s64 TenMHz = 10'000'000; + + if (freq == TenMHz) [[likely]] { + static_assert(period::den % TenMHz == 0); + static constexpr s64 Multiplier = period::den / TenMHz; + return time_point{duration{counter * Multiplier}}; + } + + const auto whole = (counter / freq) * period::den; + const auto part = (counter % freq) * period::den / freq; + return time_point{duration{whole + part}}; +#elif defined(__APPLE__) + return time_point{duration{clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW)}}; +#else + timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + return time_point{std::chrono::seconds{ts.tv_sec} + std::chrono::nanoseconds{ts.tv_nsec}}; +#endif +} + +}; // namespace Common diff --git a/src/common/steady_clock.h b/src/common/steady_clock.h new file mode 100644 index 000000000..9497cf865 --- /dev/null +++ b/src/common/steady_clock.h @@ -0,0 +1,23 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include + +#include "common/common_types.h" + +namespace Common { + +struct SteadyClock { + using rep = s64; + using period = std::nano; + using duration = std::chrono::nanoseconds; + using time_point = std::chrono::time_point; + + static constexpr bool is_steady = true; + + [[nodiscard]] static time_point Now() noexcept; +}; + +} // namespace Common From 1ed49f92dd56289e6e31a967e602c65ccedd4ff1 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 1 Mar 2023 19:27:10 -0500 Subject: [PATCH 0120/1181] common: Implement a method to change the Windows timer resolution This utilizes undocumented NtDll functions to change the current timer resolution from the default of 1ms. --- src/common/CMakeLists.txt | 8 +++ src/common/windows/timer_resolution.cpp | 87 +++++++++++++++++++++++++ src/common/windows/timer_resolution.h | 38 +++++++++++ 3 files changed, 133 insertions(+) create mode 100644 src/common/windows/timer_resolution.cpp create mode 100644 src/common/windows/timer_resolution.h diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 9f5d4c265..58ff5f2f3 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -144,6 +144,14 @@ add_library(common STATIC zstd_compression.h ) +if (WIN32) + target_sources(common PRIVATE + windows/timer_resolution.cpp + windows/timer_resolution.h + ) + target_link_libraries(common PRIVATE ntdll) +endif() + if(ARCHITECTURE_x86_64) target_sources(common PRIVATE diff --git a/src/common/windows/timer_resolution.cpp b/src/common/windows/timer_resolution.cpp new file mode 100644 index 000000000..6c2063a4c --- /dev/null +++ b/src/common/windows/timer_resolution.cpp @@ -0,0 +1,87 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include + +#include "common/windows/timer_resolution.h" + +extern "C" { +// http://undocumented.ntinternals.net/index.html?page=UserMode%2FUndocumented%20Functions%2FTime%2FNtQueryTimerResolution.html +NTSYSAPI LONG NTAPI NtQueryTimerResolution(PULONG MinimumResolution, PULONG MaximumResolution, + PULONG CurrentResolution); + +// http://undocumented.ntinternals.net/index.html?page=UserMode%2FUndocumented%20Functions%2FTime%2FNtSetTimerResolution.html +NTSYSAPI LONG NTAPI NtSetTimerResolution(ULONG DesiredResolution, BOOLEAN SetResolution, + PULONG CurrentResolution); + +// http://undocumented.ntinternals.net/index.html?page=UserMode%2FUndocumented%20Functions%2FNT%20Objects%2FThread%2FNtDelayExecution.html +NTSYSAPI LONG NTAPI NtDelayExecution(BOOLEAN Alertable, PLARGE_INTEGER DelayInterval); +} + +namespace Common::Windows { + +namespace { + +using namespace std::chrono; + +constexpr nanoseconds ToNS(ULONG hundred_ns) { + return nanoseconds{hundred_ns * 100}; +} + +constexpr ULONG ToHundredNS(nanoseconds ns) { + return static_cast(ns.count()) / 100; +} + +struct TimerResolution { + std::chrono::nanoseconds minimum; + std::chrono::nanoseconds maximum; + std::chrono::nanoseconds current; +}; + +TimerResolution GetTimerResolution() { + ULONG MinimumTimerResolution; + ULONG MaximumTimerResolution; + ULONG CurrentTimerResolution; + NtQueryTimerResolution(&MinimumTimerResolution, &MaximumTimerResolution, + &CurrentTimerResolution); + return { + .minimum{ToNS(MinimumTimerResolution)}, + .maximum{ToNS(MaximumTimerResolution)}, + .current{ToNS(CurrentTimerResolution)}, + }; +} + +} // Anonymous namespace + +nanoseconds GetMinimumTimerResolution() { + return GetTimerResolution().minimum; +} + +nanoseconds GetMaximumTimerResolution() { + return GetTimerResolution().maximum; +} + +nanoseconds GetCurrentTimerResolution() { + return GetTimerResolution().current; +} + +nanoseconds SetCurrentTimerResolution(nanoseconds timer_resolution) { + // Set the timer resolution, and return the current timer resolution. + const auto DesiredTimerResolution = ToHundredNS(timer_resolution); + ULONG CurrentTimerResolution; + NtSetTimerResolution(DesiredTimerResolution, TRUE, &CurrentTimerResolution); + return ToNS(CurrentTimerResolution); +} + +nanoseconds SetCurrentTimerResolutionToMaximum() { + return SetCurrentTimerResolution(GetMaximumTimerResolution()); +} + +void SleepForOneTick() { + LARGE_INTEGER DelayInterval{ + .QuadPart{-1}, + }; + NtDelayExecution(FALSE, &DelayInterval); +} + +} // namespace Common::Windows diff --git a/src/common/windows/timer_resolution.h b/src/common/windows/timer_resolution.h new file mode 100644 index 000000000..e1e50a62d --- /dev/null +++ b/src/common/windows/timer_resolution.h @@ -0,0 +1,38 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include + +namespace Common::Windows { + +/// Returns the minimum (least precise) supported timer resolution in nanoseconds. +std::chrono::nanoseconds GetMinimumTimerResolution(); + +/// Returns the maximum (most precise) supported timer resolution in nanoseconds. +std::chrono::nanoseconds GetMaximumTimerResolution(); + +/// Returns the current timer resolution in nanoseconds. +std::chrono::nanoseconds GetCurrentTimerResolution(); + +/** + * Sets the current timer resolution. + * + * @param timer_resolution Timer resolution in nanoseconds. + * + * @returns The current timer resolution. + */ +std::chrono::nanoseconds SetCurrentTimerResolution(std::chrono::nanoseconds timer_resolution); + +/** + * Sets the current timer resolution to the maximum supported timer resolution. + * + * @returns The current timer resolution. + */ +std::chrono::nanoseconds SetCurrentTimerResolutionToMaximum(); + +/// Sleep for one tick of the current timer resolution. +void SleepForOneTick(); + +} // namespace Common::Windows From 7fffdf83b70ec5f0ead804cb2c16b9029f7e0cfa Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 1 Mar 2023 19:43:00 -0500 Subject: [PATCH 0121/1181] wall_clock: Make use of SteadyClock --- src/common/wall_clock.cpp | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/src/common/wall_clock.cpp b/src/common/wall_clock.cpp index ae07f2811..6d972d136 100644 --- a/src/common/wall_clock.cpp +++ b/src/common/wall_clock.cpp @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "common/steady_clock.h" #include "common/uint128.h" #include "common/wall_clock.h" @@ -11,45 +12,32 @@ namespace Common { -using base_timer = std::chrono::steady_clock; -using base_time_point = std::chrono::time_point; - class StandardWallClock final : public WallClock { public: explicit StandardWallClock(u64 emulated_cpu_frequency_, u64 emulated_clock_frequency_) - : WallClock(emulated_cpu_frequency_, emulated_clock_frequency_, false) { - start_time = base_timer::now(); - } + : WallClock{emulated_cpu_frequency_, emulated_clock_frequency_, false}, + start_time{SteadyClock::Now()} {} std::chrono::nanoseconds GetTimeNS() override { - base_time_point current = base_timer::now(); - auto elapsed = current - start_time; - return std::chrono::duration_cast(elapsed); + return SteadyClock::Now() - start_time; } std::chrono::microseconds GetTimeUS() override { - base_time_point current = base_timer::now(); - auto elapsed = current - start_time; - return std::chrono::duration_cast(elapsed); + return std::chrono::duration_cast(GetTimeNS()); } std::chrono::milliseconds GetTimeMS() override { - base_time_point current = base_timer::now(); - auto elapsed = current - start_time; - return std::chrono::duration_cast(elapsed); + return std::chrono::duration_cast(GetTimeNS()); } u64 GetClockCycles() override { - std::chrono::nanoseconds time_now = GetTimeNS(); - const u128 temporary = - Common::Multiply64Into128(time_now.count(), emulated_clock_frequency); - return Common::Divide128On32(temporary, 1000000000).first; + const u128 temp = Common::Multiply64Into128(GetTimeNS().count(), emulated_clock_frequency); + return Common::Divide128On32(temp, NS_RATIO).first; } u64 GetCPUCycles() override { - std::chrono::nanoseconds time_now = GetTimeNS(); - const u128 temporary = Common::Multiply64Into128(time_now.count(), emulated_cpu_frequency); - return Common::Divide128On32(temporary, 1000000000).first; + const u128 temp = Common::Multiply64Into128(GetTimeNS().count(), emulated_cpu_frequency); + return Common::Divide128On32(temp, NS_RATIO).first; } void Pause([[maybe_unused]] bool is_paused) override { @@ -57,7 +45,7 @@ public: } private: - base_time_point start_time; + SteadyClock::time_point start_time; }; #ifdef ARCHITECTURE_x86_64 From 7e353082ac79bef59d48602f9196cf804d3dfc4f Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 1 Mar 2023 20:07:59 -0500 Subject: [PATCH 0122/1181] main: (Windows) Set the current timer resolution to the maximum Increases the precision of thread sleeps on Windows. --- src/yuzu/main.cpp | 9 +++++++++ src/yuzu_cmd/yuzu.cpp | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index f233b065e..c092507f4 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -91,6 +91,9 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual #include "common/microprofile.h" #include "common/scm_rev.h" #include "common/scope_exit.h" +#ifdef _WIN32 +#include "common/windows/timer_resolution.h" +#endif #ifdef ARCHITECTURE_x86_64 #include "common/x64/cpu_detect.h" #endif @@ -377,6 +380,12 @@ GMainWindow::GMainWindow(std::unique_ptr config_, bool has_broken_vulkan LOG_INFO(Frontend, "Host RAM: {:.2f} GiB", Common::GetMemInfo().TotalPhysicalMemory / f64{1_GiB}); LOG_INFO(Frontend, "Host Swap: {:.2f} GiB", Common::GetMemInfo().TotalSwapMemory / f64{1_GiB}); +#ifdef _WIN32 + LOG_INFO(Frontend, "Host Timer Resolution: {:.4f} ms", + std::chrono::duration_cast>( + Common::Windows::SetCurrentTimerResolutionToMaximum()) + .count()); +#endif UpdateWindowTitle(); show(); diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 77edd58ca..5f39ece32 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -42,6 +42,8 @@ #include #include + +#include "common/windows/timer_resolution.h" #endif #undef _UNICODE @@ -314,6 +316,8 @@ int main(int argc, char** argv) { #ifdef _WIN32 LocalFree(argv_w); + + Common::Windows::SetCurrentTimerResolutionToMaximum(); #endif MicroProfileOnThreadCreate("EmuThread"); From bff14532825e7517882ca913738347059f73cf7f Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 1 Mar 2023 21:06:19 -0500 Subject: [PATCH 0123/1181] core_timing: Use higher precision sleeps on Windows The precision of sleep_for and wait_for is limited to 1-1.5ms on Windows. Using SleepForOneTick() allows us to sleep for exactly one interval of the current timer resolution. This allows us to take advantage of systems that have a timer resolution of 0.5ms to reduce CPU overhead in the event loop. --- src/common/wall_clock.cpp | 5 ++++ src/common/wall_clock.h | 3 +++ src/core/core_timing.cpp | 55 +++++++++++++++++++++++---------------- src/core/core_timing.h | 6 ++++- src/video_core/gpu.cpp | 2 +- 5 files changed, 47 insertions(+), 24 deletions(-) diff --git a/src/common/wall_clock.cpp b/src/common/wall_clock.cpp index 6d972d136..817e71d52 100644 --- a/src/common/wall_clock.cpp +++ b/src/common/wall_clock.cpp @@ -81,4 +81,9 @@ std::unique_ptr CreateBestMatchingClock(u64 emulated_cpu_frequency, #endif +std::unique_ptr CreateStandardWallClock(u64 emulated_cpu_frequency, + u64 emulated_clock_frequency) { + return std::make_unique(emulated_cpu_frequency, emulated_clock_frequency); +} + } // namespace Common diff --git a/src/common/wall_clock.h b/src/common/wall_clock.h index 828a523a8..157ec5eae 100644 --- a/src/common/wall_clock.h +++ b/src/common/wall_clock.h @@ -55,4 +55,7 @@ private: [[nodiscard]] std::unique_ptr CreateBestMatchingClock(u64 emulated_cpu_frequency, u64 emulated_clock_frequency); +[[nodiscard]] std::unique_ptr CreateStandardWallClock(u64 emulated_cpu_frequency, + u64 emulated_clock_frequency); + } // namespace Common diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 3a63b52e3..742cfb996 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -6,6 +6,10 @@ #include #include +#ifdef _WIN32 +#include "common/windows/timer_resolution.h" +#endif + #include "common/microprofile.h" #include "core/core_timing.h" #include "core/core_timing_util.h" @@ -38,7 +42,8 @@ struct CoreTiming::Event { }; CoreTiming::CoreTiming() - : clock{Common::CreateBestMatchingClock(Hardware::BASE_CLOCK_RATE, Hardware::CNTFREQ)} {} + : cpu_clock{Common::CreateBestMatchingClock(Hardware::BASE_CLOCK_RATE, Hardware::CNTFREQ)}, + event_clock{Common::CreateStandardWallClock(Hardware::BASE_CLOCK_RATE, Hardware::CNTFREQ)} {} CoreTiming::~CoreTiming() { Reset(); @@ -185,15 +190,15 @@ void CoreTiming::ResetTicks() { } u64 CoreTiming::GetCPUTicks() const { - if (is_multicore) { - return clock->GetCPUCycles(); + if (is_multicore) [[likely]] { + return cpu_clock->GetCPUCycles(); } return ticks; } u64 CoreTiming::GetClockTicks() const { - if (is_multicore) { - return clock->GetClockCycles(); + if (is_multicore) [[likely]] { + return cpu_clock->GetClockCycles(); } return CpuCyclesToClockCycles(ticks); } @@ -252,21 +257,20 @@ void CoreTiming::ThreadLoop() { const auto next_time = Advance(); if (next_time) { // There are more events left in the queue, wait until the next event. - const auto wait_time = *next_time - GetGlobalTimeNs().count(); + auto wait_time = *next_time - GetGlobalTimeNs().count(); if (wait_time > 0) { #ifdef _WIN32 - // Assume a timer resolution of 1ms. - static constexpr s64 TimerResolutionNS = 1000000; + const auto timer_resolution_ns = + Common::Windows::GetCurrentTimerResolution().count(); - // Sleep in discrete intervals of the timer resolution, and spin the rest. - const auto sleep_time = wait_time - (wait_time % TimerResolutionNS); - if (sleep_time > 0) { - event.WaitFor(std::chrono::nanoseconds(sleep_time)); - } + while (!paused && !event.IsSet() && wait_time > 0) { + wait_time = *next_time - GetGlobalTimeNs().count(); - while (!paused && !event.IsSet() && GetGlobalTimeNs().count() < *next_time) { - // Yield to reduce thread starvation. - std::this_thread::yield(); + if (wait_time >= timer_resolution_ns) { + Common::Windows::SleepForOneTick(); + } else { + std::this_thread::yield(); + } } if (event.IsSet()) { @@ -285,9 +289,9 @@ void CoreTiming::ThreadLoop() { } paused_set = true; - clock->Pause(true); + event_clock->Pause(true); pause_event.Wait(); - clock->Pause(false); + event_clock->Pause(false); } } @@ -303,16 +307,23 @@ void CoreTiming::Reset() { has_started = false; } +std::chrono::nanoseconds CoreTiming::GetCPUTimeNs() const { + if (is_multicore) [[likely]] { + return cpu_clock->GetTimeNS(); + } + return CyclesToNs(ticks); +} + std::chrono::nanoseconds CoreTiming::GetGlobalTimeNs() const { - if (is_multicore) { - return clock->GetTimeNS(); + if (is_multicore) [[likely]] { + return event_clock->GetTimeNS(); } return CyclesToNs(ticks); } std::chrono::microseconds CoreTiming::GetGlobalTimeUs() const { - if (is_multicore) { - return clock->GetTimeUS(); + if (is_multicore) [[likely]] { + return event_clock->GetTimeUS(); } return CyclesToUs(ticks); } diff --git a/src/core/core_timing.h b/src/core/core_timing.h index da366637b..4b89c0c39 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -122,6 +122,9 @@ public: /// Returns current time in emulated in Clock cycles u64 GetClockTicks() const; + /// Returns current time in nanoseconds. + std::chrono::nanoseconds GetCPUTimeNs() const; + /// Returns current time in microseconds. std::chrono::microseconds GetGlobalTimeUs() const; @@ -139,7 +142,8 @@ private: void Reset(); - std::unique_ptr clock; + std::unique_ptr cpu_clock; + std::unique_ptr event_clock; s64 global_timer = 0; diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index 7024a19cf..2e7f9c5ed 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp @@ -197,7 +197,7 @@ struct GPU::Impl { constexpr u64 gpu_ticks_num = 384; constexpr u64 gpu_ticks_den = 625; - u64 nanoseconds = system.CoreTiming().GetGlobalTimeNs().count(); + u64 nanoseconds = system.CoreTiming().GetCPUTimeNs().count(); if (Settings::values.use_fast_gpu_time.GetValue()) { nanoseconds /= 256; } From 194cf0b4974f088dbcf0df879e44e767b3ab4450 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Fri, 3 Mar 2023 20:43:51 -0500 Subject: [PATCH 0124/1181] hardware_properties: Update BASE_CLOCK_RATE to exactly 1020 MHz --- src/core/hardware_properties.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/core/hardware_properties.h b/src/core/hardware_properties.h index 45567b840..191c28bb4 100644 --- a/src/core/hardware_properties.h +++ b/src/core/hardware_properties.h @@ -13,11 +13,9 @@ namespace Core { namespace Hardware { -// The below clock rate is based on Switch's clockspeed being widely known as 1.020GHz -// The exact value used is of course unverified. -constexpr u64 BASE_CLOCK_RATE = 1019215872; // Switch cpu frequency is 1020MHz un/docked -constexpr u64 CNTFREQ = 19200000; // Switch's hardware clock speed -constexpr u32 NUM_CPU_CORES = 4; // Number of CPU Cores +constexpr u64 BASE_CLOCK_RATE = 1'020'000'000; // Default CPU Frequency = 1020 MHz +constexpr u64 CNTFREQ = 19'200'000; // CNTPCT_EL0 Frequency = 19.2 MHz +constexpr u32 NUM_CPU_CORES = 4; // Number of CPU Cores // Virtual to Physical core map. constexpr std::array()> VirtualToPhysicalCoreMap{ From 3453beb1e0fa7af3db4e07418f3ea8d997d005be Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Fri, 3 Mar 2023 20:48:15 -0500 Subject: [PATCH 0125/1181] general: Target Windows 10 SDK We no longer support operating systems below Windows 10. --- CMakeLists.txt | 4 ++-- dist/yuzu.manifest | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f26a0c6b8..91ec50bef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -477,8 +477,8 @@ if (APPLE) find_library(COCOA_LIBRARY Cocoa) set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY}) elseif (WIN32) - # WSAPoll and SHGetKnownFolderPath (AppData/Roaming) didn't exist before WinNT 6.x (Vista) - add_definitions(-D_WIN32_WINNT=0x0600 -DWINVER=0x0600) + # Target Windows 10 + add_definitions(-D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00) set(PLATFORM_LIBRARIES winmm ws2_32 iphlpapi) if (MINGW) # PSAPI is the Process Status API diff --git a/dist/yuzu.manifest b/dist/yuzu.manifest index 10a8df9b5..f2c8639a2 100644 --- a/dist/yuzu.manifest +++ b/dist/yuzu.manifest @@ -36,12 +36,6 @@ SPDX-License-Identifier: GPL-2.0-or-later - - - - - - Date: Fri, 3 Mar 2023 20:54:15 -0500 Subject: [PATCH 0126/1181] timer_resolution: Set current process to High QoS Ensures that this process is treated as a high performance process by the Windows scheduler. --- src/common/windows/timer_resolution.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/common/windows/timer_resolution.cpp b/src/common/windows/timer_resolution.cpp index 6c2063a4c..29c6e5c7e 100644 --- a/src/common/windows/timer_resolution.cpp +++ b/src/common/windows/timer_resolution.cpp @@ -18,6 +18,15 @@ NTSYSAPI LONG NTAPI NtSetTimerResolution(ULONG DesiredResolution, BOOLEAN SetRes NTSYSAPI LONG NTAPI NtDelayExecution(BOOLEAN Alertable, PLARGE_INTEGER DelayInterval); } +// Defines for compatibility with older Windows 10 SDKs. + +#ifndef PROCESS_POWER_THROTTLING_EXECUTION_SPEED +#define PROCESS_POWER_THROTTLING_EXECUTION_SPEED 0x1 +#endif +#ifndef PROCESS_POWER_THROTTLING_IGNORE_TIMER_RESOLUTION +#define PROCESS_POWER_THROTTLING_IGNORE_TIMER_RESOLUTION 0x4 +#endif + namespace Common::Windows { namespace { @@ -51,6 +60,18 @@ TimerResolution GetTimerResolution() { }; } +void SetHighQoS() { + // https://learn.microsoft.com/en-us/windows/win32/procthread/quality-of-service + PROCESS_POWER_THROTTLING_STATE PowerThrottling{ + .Version{PROCESS_POWER_THROTTLING_CURRENT_VERSION}, + .ControlMask{PROCESS_POWER_THROTTLING_EXECUTION_SPEED | + PROCESS_POWER_THROTTLING_IGNORE_TIMER_RESOLUTION}, + .StateMask{}, + }; + SetProcessInformation(GetCurrentProcess(), ProcessPowerThrottling, &PowerThrottling, + sizeof(PROCESS_POWER_THROTTLING_STATE)); +} + } // Anonymous namespace nanoseconds GetMinimumTimerResolution() { @@ -74,6 +95,7 @@ nanoseconds SetCurrentTimerResolution(nanoseconds timer_resolution) { } nanoseconds SetCurrentTimerResolutionToMaximum() { + SetHighQoS(); return SetCurrentTimerResolution(GetMaximumTimerResolution()); } From 376a414f5bc6d27e5e0fbda323caf5520436bf39 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Fri, 3 Mar 2023 21:02:24 -0500 Subject: [PATCH 0127/1181] native_clock: Round RDTSC frequency to the nearest 1000 --- src/common/x64/native_clock.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/common/x64/native_clock.cpp b/src/common/x64/native_clock.cpp index 8b08332ab..bc1a973b0 100644 --- a/src/common/x64/native_clock.cpp +++ b/src/common/x64/native_clock.cpp @@ -6,6 +6,7 @@ #include #include "common/atomic_ops.h" +#include "common/steady_clock.h" #include "common/uint128.h" #include "common/x64/native_clock.h" @@ -39,6 +40,12 @@ static u64 FencedRDTSC() { } #endif +template +static u64 RoundToNearest(u64 value) { + const auto mod = value % Nearest; + return mod >= (Nearest / 2) ? (value - mod + Nearest) : (value - mod); +} + u64 EstimateRDTSCFrequency() { // Discard the first result measuring the rdtsc. FencedRDTSC(); @@ -46,18 +53,18 @@ u64 EstimateRDTSCFrequency() { FencedRDTSC(); // Get the current time. - const auto start_time = std::chrono::steady_clock::now(); + const auto start_time = Common::SteadyClock::Now(); const u64 tsc_start = FencedRDTSC(); - // Wait for 200 milliseconds. - std::this_thread::sleep_for(std::chrono::milliseconds{200}); - const auto end_time = std::chrono::steady_clock::now(); + // Wait for 250 milliseconds. + std::this_thread::sleep_for(std::chrono::milliseconds{250}); + const auto end_time = Common::SteadyClock::Now(); const u64 tsc_end = FencedRDTSC(); // Calculate differences. const u64 timer_diff = static_cast( std::chrono::duration_cast(end_time - start_time).count()); const u64 tsc_diff = tsc_end - tsc_start; const u64 tsc_freq = MultiplyAndDivide64(tsc_diff, 1000000000ULL, timer_diff); - return tsc_freq; + return RoundToNearest<1000>(tsc_freq); } namespace X64 { From 8a3411b417f76db786b1d3cfffbd90926abb20ca Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 27 Mar 2022 05:05:57 +0200 Subject: [PATCH 0128/1181] Engines: Implement Accelerate DMA Texture. --- src/video_core/buffer_cache/buffer_cache.h | 53 ++++ src/video_core/engines/maxwell_dma.cpp | 103 ++++---- src/video_core/engines/maxwell_dma.h | 88 ++++--- .../renderer_null/null_rasterizer.h | 8 + .../renderer_opengl/gl_rasterizer.h | 10 + .../renderer_vulkan/vk_rasterizer.cpp | 234 +++++++++++++++++- .../renderer_vulkan/vk_rasterizer.h | 11 +- .../renderer_vulkan/vk_texture_cache.cpp | 14 +- src/video_core/texture_cache/image_info.cpp | 45 +++- src/video_core/texture_cache/image_info.h | 2 + src/video_core/texture_cache/texture_cache.h | 69 ++++++ .../texture_cache/texture_cache_base.h | 5 + src/video_core/texture_cache/types.h | 1 + src/video_core/texture_cache/util.cpp | 98 +++++++- src/video_core/texture_cache/util.h | 10 + 15 files changed, 656 insertions(+), 95 deletions(-) diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 06fd40851..2a150ccdc 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -55,6 +55,19 @@ constexpr u32 NUM_STORAGE_BUFFERS = 16; constexpr u32 NUM_TEXTURE_BUFFERS = 16; constexpr u32 NUM_STAGES = 5; +enum class ObtainBufferSynchronize : u32 { + NoSynchronize = 0, + FullSynchronize = 1, + SynchronizeNoDirty = 2, +}; + +enum class ObtainBufferOperation : u32 { + DoNothing = 0, + MarkAsWritten = 1, + DiscardWrite = 2, + MarkQuery = 3, +}; + using UniformBufferSizes = std::array, NUM_STAGES>; using ComputeUniformBufferSizes = std::array; @@ -191,6 +204,10 @@ public: bool DMAClear(GPUVAddr src_address, u64 amount, u32 value); + [[nodiscard]] std::pair ObtainBuffer(GPUVAddr gpu_addr, u32 size, + ObtainBufferSynchronize sync_info, + ObtainBufferOperation post_op); + /// Return true when a CPU region is modified from the GPU [[nodiscard]] bool IsRegionGpuModified(VAddr addr, size_t size); @@ -641,6 +658,42 @@ bool BufferCache

::DMAClear(GPUVAddr dst_address, u64 amount, u32 value) { return true; } +template +std::pair BufferCache

::ObtainBuffer(GPUVAddr gpu_addr, u32 size, + ObtainBufferSynchronize sync_info, + ObtainBufferOperation post_op) { + const std::optional cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr); + if (!cpu_addr) { + return {&slot_buffers[NULL_BUFFER_ID], 0}; + } + const BufferId buffer_id = FindBuffer(*cpu_addr, size); + Buffer& buffer = slot_buffers[buffer_id]; + + // synchronize op + switch (sync_info) { + case ObtainBufferSynchronize::FullSynchronize: + SynchronizeBuffer(buffer, *cpu_addr, size); + break; + default: + break; + } + + switch (post_op) { + case ObtainBufferOperation::MarkAsWritten: + MarkWrittenBuffer(buffer_id, *cpu_addr, size); + break; + case ObtainBufferOperation::DiscardWrite: { + IntervalType interval{*cpu_addr, size}; + ClearDownload(interval); + break; + } + default: + break; + } + + return {&buffer, buffer.Offset(*cpu_addr)}; +} + template void BufferCache

::BindGraphicsUniformBuffer(size_t stage, u32 index, GPUVAddr gpu_addr, u32 size) { diff --git a/src/video_core/engines/maxwell_dma.cpp b/src/video_core/engines/maxwell_dma.cpp index 7762c7d96..e68850dc5 100644 --- a/src/video_core/engines/maxwell_dma.cpp +++ b/src/video_core/engines/maxwell_dma.cpp @@ -14,7 +14,13 @@ #include "video_core/textures/decoders.h" MICROPROFILE_DECLARE(GPU_DMAEngine); +MICROPROFILE_DECLARE(GPU_DMAEngineBL); +MICROPROFILE_DECLARE(GPU_DMAEngineLB); +MICROPROFILE_DECLARE(GPU_DMAEngineBB); MICROPROFILE_DEFINE(GPU_DMAEngine, "GPU", "DMA Engine", MP_RGB(224, 224, 128)); +MICROPROFILE_DEFINE(GPU_DMAEngineBL, "GPU", "DMA Engine Block - Linear", MP_RGB(224, 224, 128)); +MICROPROFILE_DEFINE(GPU_DMAEngineLB, "GPU", "DMA Engine Linear - Block", MP_RGB(224, 224, 128)); +MICROPROFILE_DEFINE(GPU_DMAEngineBB, "GPU", "DMA Engine Block - Block", MP_RGB(224, 224, 128)); namespace Tegra::Engines { @@ -72,6 +78,7 @@ void MaxwellDMA::Launch() { memory_manager.FlushCaching(); if (!is_src_pitch && !is_dst_pitch) { // If both the source and the destination are in block layout, assert. + MICROPROFILE_SCOPE(GPU_DMAEngineBB); CopyBlockLinearToBlockLinear(); ReleaseSemaphore(); return; @@ -87,8 +94,10 @@ void MaxwellDMA::Launch() { } } else { if (!is_src_pitch && is_dst_pitch) { + MICROPROFILE_SCOPE(GPU_DMAEngineBL); CopyBlockLinearToPitch(); } else { + MICROPROFILE_SCOPE(GPU_DMAEngineLB); CopyPitchToBlockLinear(); } } @@ -153,21 +162,35 @@ void MaxwellDMA::Launch() { } void MaxwellDMA::CopyBlockLinearToPitch() { - UNIMPLEMENTED_IF(regs.src_params.block_size.width != 0); - UNIMPLEMENTED_IF(regs.src_params.layer != 0); + UNIMPLEMENTED_IF(regs.launch_dma.remap_enable != 0); - const bool is_remapping = regs.launch_dma.remap_enable != 0; + u32 bytes_per_pixel = 1; + DMA::ImageOperand src_operand; + src_operand.bytes_per_pixel = bytes_per_pixel; + src_operand.params = regs.src_params; + src_operand.address = regs.offset_in; - // Optimized path for micro copies. - const size_t dst_size = static_cast(regs.pitch_out) * regs.line_count; - if (!is_remapping && dst_size < GOB_SIZE && regs.pitch_out <= GOB_SIZE_X && - regs.src_params.height > GOB_SIZE_Y) { - FastCopyBlockLinearToPitch(); + DMA::BufferOperand dst_operand; + dst_operand.pitch = regs.pitch_out; + dst_operand.width = regs.line_length_in; + dst_operand.height = regs.line_count; + dst_operand.address = regs.offset_out; + DMA::ImageCopy copy_info{}; + copy_info.length_x = regs.line_length_in; + copy_info.length_y = regs.line_count; + auto& accelerate = rasterizer->AccessAccelerateDMA(); + if (accelerate.ImageToBuffer(copy_info, src_operand, dst_operand)) { return; } + UNIMPLEMENTED_IF(regs.src_params.block_size.width != 0); + UNIMPLEMENTED_IF(regs.src_params.block_size.depth != 0); + UNIMPLEMENTED_IF(regs.src_params.block_size.depth == 0 && regs.src_params.depth != 1); + // Deswizzle the input and copy it over. - const Parameters& src_params = regs.src_params; + const DMA::Parameters& src_params = regs.src_params; + + const bool is_remapping = regs.launch_dma.remap_enable != 0; const u32 num_remap_components = regs.remap_const.num_dst_components_minus_one + 1; const u32 remap_components_size = regs.remap_const.component_size_minus_one + 1; @@ -187,7 +210,7 @@ void MaxwellDMA::CopyBlockLinearToPitch() { x_offset >>= bpp_shift; } - const u32 bytes_per_pixel = base_bpp << bpp_shift; + bytes_per_pixel = base_bpp << bpp_shift; const u32 height = src_params.height; const u32 depth = src_params.depth; const u32 block_height = src_params.block_size.height; @@ -195,11 +218,12 @@ void MaxwellDMA::CopyBlockLinearToPitch() { const size_t src_size = CalculateSize(true, bytes_per_pixel, width, height, depth, block_height, block_depth); + const size_t dst_size = static_cast(regs.pitch_out) * regs.line_count; read_buffer.resize_destructive(src_size); write_buffer.resize_destructive(dst_size); - memory_manager.ReadBlock(regs.offset_in, read_buffer.data(), src_size); - memory_manager.ReadBlock(regs.offset_out, write_buffer.data(), dst_size); + memory_manager.ReadBlock(src_operand.address, read_buffer.data(), src_size); + memory_manager.ReadBlockUnsafe(dst_operand.address, write_buffer.data(), dst_size); UnswizzleSubrect(write_buffer, read_buffer, bytes_per_pixel, width, height, depth, x_offset, src_params.origin.y, x_elements, regs.line_count, block_height, block_depth, @@ -216,6 +240,24 @@ void MaxwellDMA::CopyPitchToBlockLinear() { const u32 num_remap_components = regs.remap_const.num_dst_components_minus_one + 1; const u32 remap_components_size = regs.remap_const.component_size_minus_one + 1; + u32 bytes_per_pixel = 1; + DMA::ImageOperand dst_operand; + dst_operand.bytes_per_pixel = bytes_per_pixel; + dst_operand.params = regs.dst_params; + dst_operand.address = regs.offset_out; + DMA::BufferOperand src_operand; + src_operand.pitch = regs.pitch_in; + src_operand.width = regs.line_length_in; + src_operand.height = regs.line_count; + src_operand.address = regs.offset_in; + DMA::ImageCopy copy_info{}; + copy_info.length_x = regs.line_length_in; + copy_info.length_y = regs.line_count; + auto& accelerate = rasterizer->AccessAccelerateDMA(); + if (accelerate.BufferToImage(copy_info, src_operand, dst_operand)) { + return; + } + const auto& dst_params = regs.dst_params; const u32 base_bpp = !is_remapping ? 1U : num_remap_components * remap_components_size; @@ -233,7 +275,7 @@ void MaxwellDMA::CopyPitchToBlockLinear() { x_offset >>= bpp_shift; } - const u32 bytes_per_pixel = base_bpp << bpp_shift; + bytes_per_pixel = base_bpp << bpp_shift; const u32 height = dst_params.height; const u32 depth = dst_params.depth; const u32 block_height = dst_params.block_size.height; @@ -260,45 +302,14 @@ void MaxwellDMA::CopyPitchToBlockLinear() { memory_manager.WriteBlockCached(regs.offset_out, write_buffer.data(), dst_size); } -void MaxwellDMA::FastCopyBlockLinearToPitch() { - const u32 bytes_per_pixel = 1U; - const size_t src_size = GOB_SIZE; - const size_t dst_size = static_cast(regs.pitch_out) * regs.line_count; - u32 pos_x = regs.src_params.origin.x; - u32 pos_y = regs.src_params.origin.y; - const u64 offset = GetGOBOffset(regs.src_params.width, regs.src_params.height, pos_x, pos_y, - regs.src_params.block_size.height, bytes_per_pixel); - const u32 x_in_gob = 64 / bytes_per_pixel; - pos_x = pos_x % x_in_gob; - pos_y = pos_y % 8; - - read_buffer.resize_destructive(src_size); - write_buffer.resize_destructive(dst_size); - - if (Settings::IsGPULevelExtreme()) { - memory_manager.ReadBlock(regs.offset_in + offset, read_buffer.data(), src_size); - memory_manager.ReadBlock(regs.offset_out, write_buffer.data(), dst_size); - } else { - memory_manager.ReadBlockUnsafe(regs.offset_in + offset, read_buffer.data(), src_size); - memory_manager.ReadBlockUnsafe(regs.offset_out, write_buffer.data(), dst_size); - } - - UnswizzleSubrect(write_buffer, read_buffer, bytes_per_pixel, regs.src_params.width, - regs.src_params.height, 1, pos_x, pos_y, regs.line_length_in, regs.line_count, - regs.src_params.block_size.height, regs.src_params.block_size.depth, - regs.pitch_out); - - memory_manager.WriteBlockCached(regs.offset_out, write_buffer.data(), dst_size); -} - void MaxwellDMA::CopyBlockLinearToBlockLinear() { UNIMPLEMENTED_IF(regs.src_params.block_size.width != 0); const bool is_remapping = regs.launch_dma.remap_enable != 0; // Deswizzle the input and copy it over. - const Parameters& src = regs.src_params; - const Parameters& dst = regs.dst_params; + const DMA::Parameters& src = regs.src_params; + const DMA::Parameters& dst = regs.dst_params; const u32 num_remap_components = regs.remap_const.num_dst_components_minus_one + 1; const u32 remap_components_size = regs.remap_const.component_size_minus_one + 1; diff --git a/src/video_core/engines/maxwell_dma.h b/src/video_core/engines/maxwell_dma.h index 0e594fa74..69e26cb32 100644 --- a/src/video_core/engines/maxwell_dma.h +++ b/src/video_core/engines/maxwell_dma.h @@ -24,6 +24,54 @@ namespace VideoCore { class RasterizerInterface; } +namespace Tegra { +namespace DMA { + +union Origin { + BitField<0, 16, u32> x; + BitField<16, 16, u32> y; +}; +static_assert(sizeof(Origin) == 4); + +struct ImageCopy { + u32 length_x{}; + u32 length_y{}; +}; + +union BlockSize { + BitField<0, 4, u32> width; + BitField<4, 4, u32> height; + BitField<8, 4, u32> depth; + BitField<12, 4, u32> gob_height; +}; +static_assert(sizeof(BlockSize) == 4); + +struct Parameters { + BlockSize block_size; + u32 width; + u32 height; + u32 depth; + u32 layer; + Origin origin; +}; +static_assert(sizeof(Parameters) == 24); + +struct ImageOperand { + u32 bytes_per_pixel; + Parameters params; + GPUVAddr address; +}; + +struct BufferOperand { + u32 pitch; + u32 width; + u32 height; + GPUVAddr address; +}; + +} // namespace DMA +} // namespace Tegra + namespace Tegra::Engines { class AccelerateDMAInterface { @@ -32,6 +80,12 @@ public: virtual bool BufferCopy(GPUVAddr src_address, GPUVAddr dest_address, u64 amount) = 0; virtual bool BufferClear(GPUVAddr src_address, u64 amount, u32 value) = 0; + + virtual bool ImageToBuffer(const DMA::ImageCopy& copy_info, const DMA::ImageOperand& src, + const DMA::BufferOperand& dst) = 0; + + virtual bool BufferToImage(const DMA::ImageCopy& copy_info, const DMA::BufferOperand& src, + const DMA::ImageOperand& dst) = 0; }; /** @@ -51,30 +105,6 @@ public: } }; - union BlockSize { - BitField<0, 4, u32> width; - BitField<4, 4, u32> height; - BitField<8, 4, u32> depth; - BitField<12, 4, u32> gob_height; - }; - static_assert(sizeof(BlockSize) == 4); - - union Origin { - BitField<0, 16, u32> x; - BitField<16, 16, u32> y; - }; - static_assert(sizeof(Origin) == 4); - - struct Parameters { - BlockSize block_size; - u32 width; - u32 height; - u32 depth; - u32 layer; - Origin origin; - }; - static_assert(sizeof(Parameters) == 24); - struct Semaphore { PackedGPUVAddr address; u32 payload; @@ -227,8 +257,6 @@ private: void CopyBlockLinearToBlockLinear(); - void FastCopyBlockLinearToPitch(); - void ReleaseSemaphore(); void ConsumeSinkImpl() override; @@ -261,17 +289,17 @@ private: u32 reserved05[0x3f]; PackedGPUVAddr offset_in; PackedGPUVAddr offset_out; - u32 pitch_in; - u32 pitch_out; + s32 pitch_in; + s32 pitch_out; u32 line_length_in; u32 line_count; u32 reserved06[0xb6]; u32 remap_consta_value; u32 remap_constb_value; RemapConst remap_const; - Parameters dst_params; + DMA::Parameters dst_params; u32 reserved07[0x1]; - Parameters src_params; + DMA::Parameters src_params; u32 reserved08[0x275]; u32 pm_trigger_end; u32 reserved09[0x3ba]; diff --git a/src/video_core/renderer_null/null_rasterizer.h b/src/video_core/renderer_null/null_rasterizer.h index 51f896e43..0c59e6a1f 100644 --- a/src/video_core/renderer_null/null_rasterizer.h +++ b/src/video_core/renderer_null/null_rasterizer.h @@ -22,6 +22,14 @@ public: explicit AccelerateDMA(); bool BufferCopy(GPUVAddr start_address, GPUVAddr end_address, u64 amount) override; bool BufferClear(GPUVAddr src_address, u64 amount, u32 value) override; + bool ImageToBuffer(const Tegra::DMA::ImageCopy& copy_info, const Tegra::DMA::ImageOperand& src, + const Tegra::DMA::BufferOperand& dst) override { + return false; + } + bool BufferToImage(const Tegra::DMA::ImageCopy& copy_info, const Tegra::DMA::BufferOperand& src, + const Tegra::DMA::ImageOperand& dst) override { + return false; + } }; class RasterizerNull final : public VideoCore::RasterizerAccelerated, diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 0c45832ae..7e21fc43d 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -56,6 +56,16 @@ public: bool BufferClear(GPUVAddr src_address, u64 amount, u32 value) override; + bool ImageToBuffer(const Tegra::DMA::ImageCopy& copy_info, const Tegra::DMA::ImageOperand& src, + const Tegra::DMA::BufferOperand& dst) override { + return false; + } + + bool BufferToImage(const Tegra::DMA::ImageCopy& copy_info, const Tegra::DMA::BufferOperand& src, + const Tegra::DMA::ImageOperand& dst) override { + return false; + } + private: BufferCache& buffer_cache; }; diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 719edbcfb..f085d53a1 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -172,7 +172,7 @@ RasterizerVulkan::RasterizerVulkan(Core::Frontend::EmuWindow& emu_window_, Tegra buffer_cache(*this, cpu_memory_, buffer_cache_runtime), pipeline_cache(*this, device, scheduler, descriptor_pool, update_descriptor_queue, render_pass_cache, buffer_cache, texture_cache, gpu.ShaderNotify()), - query_cache{*this, device, scheduler}, accelerate_dma{buffer_cache}, + query_cache{*this, device, scheduler}, accelerate_dma(buffer_cache, texture_cache, scheduler), fence_manager(*this, gpu, texture_cache, buffer_cache, query_cache, device, scheduler), wfi_event(device.GetLogical().CreateEvent()) { scheduler.SetQueryCache(query_cache); @@ -756,7 +756,9 @@ void RasterizerVulkan::FlushWork() { draw_counter = 0; } -AccelerateDMA::AccelerateDMA(BufferCache& buffer_cache_) : buffer_cache{buffer_cache_} {} +AccelerateDMA::AccelerateDMA(BufferCache& buffer_cache_, TextureCache& texture_cache_, + Scheduler& scheduler_) + : buffer_cache{buffer_cache_}, texture_cache{texture_cache_}, scheduler{scheduler_} {} bool AccelerateDMA::BufferClear(GPUVAddr src_address, u64 amount, u32 value) { std::scoped_lock lock{buffer_cache.mutex}; @@ -768,6 +770,234 @@ bool AccelerateDMA::BufferCopy(GPUVAddr src_address, GPUVAddr dest_address, u64 return buffer_cache.DMACopy(src_address, dest_address, amount); } +bool AccelerateDMA::ImageToBuffer(const Tegra::DMA::ImageCopy& copy_info, + const Tegra::DMA::ImageOperand& src, + const Tegra::DMA::BufferOperand& dst) { + std::scoped_lock lock{buffer_cache.mutex, texture_cache.mutex}; + auto query_image = texture_cache.ObtainImage(src, false); + if (!query_image) { + return false; + } + auto* image = query_image->first; + auto [level, base] = query_image->second; + const u32 buffer_size = static_cast(dst.pitch * dst.height); + const auto [buffer, offset] = buffer_cache.ObtainBuffer( + dst.address, buffer_size, VideoCommon::ObtainBufferSynchronize::FullSynchronize, + VideoCommon::ObtainBufferOperation::MarkAsWritten); + + const bool is_rescaled = image->IsRescaled(); + if (is_rescaled) { + image->ScaleDown(); + } + VkImageSubresourceLayers subresources{ + .aspectMask = image->AspectMask(), + .mipLevel = level, + .baseArrayLayer = base, + .layerCount = 1, + }; + const u32 bpp = VideoCore::Surface::BytesPerBlock(image->info.format); + const auto convert = [old_bpp = src.bytes_per_pixel, bpp](u32 value) { + return (old_bpp * value) / bpp; + }; + const u32 base_x = convert(src.params.origin.x.Value()); + const u32 base_y = src.params.origin.y.Value(); + const u32 length_x = convert(copy_info.length_x); + const u32 length_y = copy_info.length_y; + VkOffset3D image_offset{ + .x = static_cast(base_x), + .y = static_cast(base_y), + .z = 0, + }; + VkExtent3D image_extent{ + .width = length_x, + .height = length_y, + .depth = 1, + }; + auto buff_info(dst); + buff_info.pitch = convert(dst.pitch); + scheduler.RequestOutsideRenderPassOperationContext(); + scheduler.Record([src_image = image->Handle(), dst_buffer = buffer->Handle(), + buffer_offset = offset, subresources, image_offset, image_extent, + buff_info](vk::CommandBuffer cmdbuf) { + const std::array buffer_copy_info{ + VkBufferImageCopy{ + .bufferOffset = buffer_offset, + .bufferRowLength = buff_info.pitch, + .bufferImageHeight = buff_info.height, + .imageSubresource = subresources, + .imageOffset = image_offset, + .imageExtent = image_extent, + }, + }; + const VkImageSubresourceRange range{ + .aspectMask = subresources.aspectMask, + .baseMipLevel = subresources.mipLevel, + .levelCount = 1, + .baseArrayLayer = subresources.baseArrayLayer, + .layerCount = 1, + }; + static constexpr VkMemoryBarrier WRITE_BARRIER{ + .sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER, + .pNext = nullptr, + .srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT, + .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT, + }; + const std::array pre_barriers{ + VkImageMemoryBarrier{ + .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, + .pNext = nullptr, + .srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | + VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | + VK_ACCESS_TRANSFER_WRITE_BIT, + .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT, + .oldLayout = VK_IMAGE_LAYOUT_GENERAL, + .newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .image = src_image, + .subresourceRange = range, + }, + }; + const std::array post_barriers{ + VkImageMemoryBarrier{ + .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, + .pNext = nullptr, + .srcAccessMask = 0, + .dstAccessMask = 0, + .oldLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + .newLayout = VK_IMAGE_LAYOUT_GENERAL, + .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .image = src_image, + .subresourceRange = range, + }, + }; + cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + 0, {}, {}, pre_barriers); + cmdbuf.CopyImageToBuffer(src_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_buffer, + buffer_copy_info); + cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + 0, WRITE_BARRIER, nullptr, post_barriers); + }); + if (is_rescaled) { + image->ScaleUp(true); + } + return true; +} + +bool AccelerateDMA::BufferToImage(const Tegra::DMA::ImageCopy& copy_info, + const Tegra::DMA::BufferOperand& src, + const Tegra::DMA::ImageOperand& dst) { + std::scoped_lock lock{buffer_cache.mutex, texture_cache.mutex}; + auto query_image = texture_cache.ObtainImage(dst, true); + if (!query_image) { + return false; + } + auto* image = query_image->first; + auto [level, base] = query_image->second; + const u32 buffer_size = static_cast(src.pitch * src.height); + const auto [buffer, offset] = buffer_cache.ObtainBuffer( + src.address, buffer_size, VideoCommon::ObtainBufferSynchronize::FullSynchronize, + VideoCommon::ObtainBufferOperation::DoNothing); + const bool is_rescaled = image->IsRescaled(); + if (is_rescaled) { + image->ScaleDown(true); + } + VkImageSubresourceLayers subresources{ + .aspectMask = image->AspectMask(), + .mipLevel = level, + .baseArrayLayer = base, + .layerCount = 1, + }; + const u32 bpp = VideoCore::Surface::BytesPerBlock(image->info.format); + const auto convert = [old_bpp = dst.bytes_per_pixel, bpp](u32 value) { + return (old_bpp * value) / bpp; + }; + const u32 base_x = convert(dst.params.origin.x.Value()); + const u32 base_y = dst.params.origin.y.Value(); + const u32 length_x = convert(copy_info.length_x); + const u32 length_y = copy_info.length_y; + VkOffset3D image_offset{ + .x = static_cast(base_x), + .y = static_cast(base_y), + .z = 0, + }; + VkExtent3D image_extent{ + .width = length_x, + .height = length_y, + .depth = 1, + }; + auto buff_info(src); + buff_info.pitch = convert(src.pitch); + scheduler.RequestOutsideRenderPassOperationContext(); + scheduler.Record([dst_image = image->Handle(), src_buffer = buffer->Handle(), + buffer_offset = offset, subresources, image_offset, image_extent, + buff_info](vk::CommandBuffer cmdbuf) { + const std::array buffer_copy_info{ + VkBufferImageCopy{ + .bufferOffset = buffer_offset, + .bufferRowLength = buff_info.pitch, + .bufferImageHeight = buff_info.height, + .imageSubresource = subresources, + .imageOffset = image_offset, + .imageExtent = image_extent, + }, + }; + const VkImageSubresourceRange range{ + .aspectMask = subresources.aspectMask, + .baseMipLevel = subresources.mipLevel, + .levelCount = 1, + .baseArrayLayer = subresources.baseArrayLayer, + .layerCount = 1, + }; + static constexpr VkMemoryBarrier READ_BARRIER{ + .sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER, + .pNext = nullptr, + .srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT, + .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_TRANSFER_WRITE_BIT, + }; + const std::array pre_barriers{ + VkImageMemoryBarrier{ + .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, + .pNext = nullptr, + .srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | + VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | + VK_ACCESS_TRANSFER_WRITE_BIT, + .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT, + .oldLayout = VK_IMAGE_LAYOUT_GENERAL, + .newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .image = dst_image, + .subresourceRange = range, + }, + }; + const std::array post_barriers{ + VkImageMemoryBarrier{ + .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, + .pNext = nullptr, + .srcAccessMask = 0, + .dstAccessMask = 0, + .oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + .newLayout = VK_IMAGE_LAYOUT_GENERAL, + .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .image = dst_image, + .subresourceRange = range, + }, + }; + cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + 0, READ_BARRIER, {}, pre_barriers); + cmdbuf.CopyBufferToImage(src_buffer, dst_image, VK_IMAGE_LAYOUT_GENERAL, buffer_copy_info); + cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + 0, nullptr, nullptr, post_barriers); + }); + if (is_rescaled) { + image->ScaleUp(); + } + return true; +} + void RasterizerVulkan::UpdateDynamicStates() { auto& regs = maxwell3d->regs; UpdateViewportsState(regs); diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.h b/src/video_core/renderer_vulkan/vk_rasterizer.h index a0508b57c..7746c5434 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.h +++ b/src/video_core/renderer_vulkan/vk_rasterizer.h @@ -45,14 +45,23 @@ class StateTracker; class AccelerateDMA : public Tegra::Engines::AccelerateDMAInterface { public: - explicit AccelerateDMA(BufferCache& buffer_cache); + explicit AccelerateDMA(BufferCache& buffer_cache, TextureCache& texture_cache, + Scheduler& scheduler); bool BufferCopy(GPUVAddr start_address, GPUVAddr end_address, u64 amount) override; bool BufferClear(GPUVAddr src_address, u64 amount, u32 value) override; + bool ImageToBuffer(const Tegra::DMA::ImageCopy& copy_info, const Tegra::DMA::ImageOperand& src, + const Tegra::DMA::BufferOperand& dst) override; + + bool BufferToImage(const Tegra::DMA::ImageCopy& copy_info, const Tegra::DMA::BufferOperand& src, + const Tegra::DMA::ImageOperand& dst) override; + private: BufferCache& buffer_cache; + TextureCache& texture_cache; + Scheduler& scheduler; }; class RasterizerVulkan final : public VideoCore::RasterizerAccelerated, diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index 80adb70eb..8a204f93f 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -864,13 +864,19 @@ void TextureCacheRuntime::ReinterpretImage(Image& dst, Image& src, const VkImageAspectFlags src_aspect_mask = src.AspectMask(); const VkImageAspectFlags dst_aspect_mask = dst.AspectMask(); - std::ranges::transform(copies, vk_in_copies.begin(), [src_aspect_mask](const auto& copy) { - return MakeBufferImageCopy(copy, true, src_aspect_mask); - }); + const auto bpp_in = BytesPerBlock(src.info.format) / DefaultBlockWidth(src.info.format); + const auto bpp_out = BytesPerBlock(dst.info.format) / DefaultBlockWidth(dst.info.format); + std::ranges::transform(copies, vk_in_copies.begin(), + [src_aspect_mask, bpp_in, bpp_out](const auto& copy) { + auto copy2 = copy; + copy2.src_offset.x = (bpp_out * copy.src_offset.x) / bpp_in; + copy2.extent.width = (bpp_out * copy.extent.width) / bpp_in; + return MakeBufferImageCopy(copy2, true, src_aspect_mask); + }); std::ranges::transform(copies, vk_out_copies.begin(), [dst_aspect_mask](const auto& copy) { return MakeBufferImageCopy(copy, false, dst_aspect_mask); }); - const u32 img_bpp = BytesPerBlock(src.info.format); + const u32 img_bpp = BytesPerBlock(dst.info.format); size_t total_size = 0; for (const auto& copy : copies) { total_size += copy.extent.width * copy.extent.height * copy.extent.depth * img_bpp; diff --git a/src/video_core/texture_cache/image_info.cpp b/src/video_core/texture_cache/image_info.cpp index e9100091e..a1296b574 100644 --- a/src/video_core/texture_cache/image_info.cpp +++ b/src/video_core/texture_cache/image_info.cpp @@ -216,10 +216,51 @@ ImageInfo::ImageInfo(const Tegra::Engines::Fermi2D::Surface& config) noexcept { .height = config.height, .depth = 1, }; - rescaleable = block.depth == 0; - rescaleable &= size.height > 256; + rescaleable = block.depth == 0 && size.height > 256; downscaleable = size.height > 512; } } +static PixelFormat ByteSizeToFormat(u32 bytes_per_pixel) { + switch (bytes_per_pixel) { + case 1: + return PixelFormat::R8_UINT; + case 2: + return PixelFormat::R8G8_UINT; + case 4: + return PixelFormat::A8B8G8R8_UINT; + case 8: + return PixelFormat::R16G16B16A16_UINT; + case 16: + return PixelFormat::R32G32B32A32_UINT; + default: + UNIMPLEMENTED(); + return PixelFormat::Invalid; + } +} + +ImageInfo::ImageInfo(const Tegra::DMA::ImageOperand& config) noexcept { + const u32 bytes_per_pixel = config.bytes_per_pixel; + format = ByteSizeToFormat(bytes_per_pixel); + type = config.params.block_size.depth > 0 ? ImageType::e3D : ImageType::e2D; + num_samples = 1; + block = Extent3D{ + .width = config.params.block_size.width, + .height = config.params.block_size.height, + .depth = config.params.block_size.depth, + }; + size = Extent3D{ + .width = config.params.width, + .height = config.params.height, + .depth = config.params.depth, + }; + tile_width_spacing = 0; + resources.levels = 1; + resources.layers = 1; + layer_stride = CalculateLayerStride(*this); + maybe_unaligned_layer_stride = CalculateLayerSize(*this); + rescaleable = block.depth == 0 && size.height > 256; + downscaleable = size.height > 512; +} + } // namespace VideoCommon diff --git a/src/video_core/texture_cache/image_info.h b/src/video_core/texture_cache/image_info.h index 93755e15e..a12f5b44f 100644 --- a/src/video_core/texture_cache/image_info.h +++ b/src/video_core/texture_cache/image_info.h @@ -5,6 +5,7 @@ #include "video_core/engines/fermi_2d.h" #include "video_core/engines/maxwell_3d.h" +#include "video_core/engines/maxwell_dma.h" #include "video_core/surface.h" #include "video_core/texture_cache/types.h" @@ -19,6 +20,7 @@ struct ImageInfo { explicit ImageInfo(const Tegra::Engines::Maxwell3D::Regs& regs, size_t index) noexcept; explicit ImageInfo(const Tegra::Engines::Maxwell3D::Regs& regs) noexcept; explicit ImageInfo(const Tegra::Engines::Fermi2D::Surface& config) noexcept; + explicit ImageInfo(const Tegra::DMA::ImageOperand& config) noexcept; PixelFormat format = PixelFormat::Invalid; ImageType type = ImageType::e1D; diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 9dd152fbe..335338434 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1358,6 +1358,75 @@ std::optional::BlitImages> TextureCache

::GetBlitImag }}; } +template +ImageId TextureCache

::FindDMAImage(const ImageInfo& info, GPUVAddr gpu_addr) { + std::optional cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr); + if (!cpu_addr) { + cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr, CalculateGuestSizeInBytes(info)); + if (!cpu_addr) { + return ImageId{}; + } + } + ImageId image_id{}; + boost::container::small_vector image_ids; + const auto lambda = [&](ImageId existing_image_id, ImageBase& existing_image) { + if (True(existing_image.flags & ImageFlagBits::Remapped)) { + return false; + } + if (info.type == ImageType::Linear || existing_image.info.type == ImageType::Linear) + [[unlikely]] { + const bool strict_size = True(existing_image.flags & ImageFlagBits::Strong); + const ImageInfo& existing = existing_image.info; + if (existing_image.gpu_addr == gpu_addr && existing.type == info.type && + existing.pitch == info.pitch && + IsPitchLinearSameSize(existing, info, strict_size) && + IsViewCompatible(existing.format, info.format, false, true)) { + image_id = existing_image_id; + image_ids.push_back(existing_image_id); + return true; + } + } else if (IsSubCopy(info, existing_image, gpu_addr)) { + image_id = existing_image_id; + image_ids.push_back(existing_image_id); + return true; + } + return false; + }; + ForEachImageInRegion(*cpu_addr, CalculateGuestSizeInBytes(info), lambda); + if (image_ids.size() <= 1) [[likely]] { + return image_id; + } + auto image_ids_compare = [this](ImageId a, ImageId b) { + auto& image_a = slot_images[a]; + auto& image_b = slot_images[b]; + return image_a.modification_tick < image_b.modification_tick; + }; + return *std::ranges::max_element(image_ids, image_ids_compare); +} + +template +std::optional::Image*, std::pair>> +TextureCache

::ObtainImage(const Tegra::DMA::ImageOperand& operand, bool mark_as_modified) { + ImageInfo dst_info(operand); + ImageId dst_id = FindDMAImage(dst_info, operand.address); + if (!dst_id) { + return std::nullopt; + } + auto& image = slot_images[dst_id]; + auto base = image.TryFindBase(operand.address); + if (!base) { + return std::nullopt; + } + if (False(image.flags & ImageFlagBits::GpuModified)) { + // No need to waste time on an image that's synced with guest + return std::nullopt; + } + PrepareImage(dst_id, mark_as_modified, false); + auto& new_image = slot_images[dst_id]; + lru_cache.Touch(new_image.lru_index, frame_tick); + return std::make_pair(&new_image, std::make_pair(base->level, base->layer)); +} + template SamplerId TextureCache

::FindSampler(const TSCEntry& config) { if (std::ranges::all_of(config.raw, [](u64 value) { return value == 0; })) { diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index 013836933..848a5d9ea 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h @@ -209,6 +209,9 @@ public: /// Pop asynchronous downloads void PopAsyncFlushes(); + [[nodiscard]] std::optional>> ObtainImage( + const Tegra::DMA::ImageOperand& operand, bool mark_as_modified); + /// Return true when a CPU region is modified from the GPU [[nodiscard]] bool IsRegionGpuModified(VAddr addr, size_t size); @@ -300,6 +303,8 @@ private: /// Remove joined images from the cache [[nodiscard]] ImageId JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VAddr cpu_addr); + [[nodiscard]] ImageId FindDMAImage(const ImageInfo& info, GPUVAddr gpu_addr); + /// Return a blit image pair from the given guest blit parameters [[nodiscard]] std::optional GetBlitImages( const Tegra::Engines::Fermi2D::Surface& dst, const Tegra::Engines::Fermi2D::Surface& src, diff --git a/src/video_core/texture_cache/types.h b/src/video_core/texture_cache/types.h index 0453456b4..a0e10643f 100644 --- a/src/video_core/texture_cache/types.h +++ b/src/video_core/texture_cache/types.h @@ -54,6 +54,7 @@ enum class RelaxedOptions : u32 { Format = 1 << 1, Samples = 1 << 2, ForceBrokenViews = 1 << 3, + FormatBpp = 1 << 4, }; DECLARE_ENUM_FLAG_OPERATORS(RelaxedOptions) diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cpp index 697f86641..de37db684 100644 --- a/src/video_core/texture_cache/util.cpp +++ b/src/video_core/texture_cache/util.cpp @@ -743,6 +743,44 @@ std::vector MakeShrinkImageCopies(const ImageInfo& dst, const ImageIn return copies; } +std::vector MakeReinterpretImageCopies(const ImageInfo& src, u32 up_scale, + u32 down_shift) { + std::vector copies; + copies.reserve(src.resources.levels); + const bool is_3d = src.type == ImageType::e3D; + for (s32 level = 0; level < src.resources.levels; ++level) { + ImageCopy& copy = copies.emplace_back(); + copy.src_subresource = SubresourceLayers{ + .base_level = level, + .base_layer = 0, + .num_layers = src.resources.layers, + }; + copy.dst_subresource = SubresourceLayers{ + .base_level = level, + .base_layer = 0, + .num_layers = src.resources.layers, + }; + copy.src_offset = Offset3D{ + .x = 0, + .y = 0, + .z = 0, + }; + copy.dst_offset = Offset3D{ + .x = 0, + .y = 0, + .z = 0, + }; + const Extent3D mip_size = AdjustMipSize(src.size, level); + copy.extent = AdjustSamplesSize(mip_size, src.num_samples); + if (is_3d) { + copy.extent.depth = src.size.depth; + } + copy.extent.width = std::max((copy.extent.width * up_scale) >> down_shift, 1); + copy.extent.height = std::max((copy.extent.height * up_scale) >> down_shift, 1); + } + return copies; +} + bool IsValidEntry(const Tegra::MemoryManager& gpu_memory, const TICEntry& config) { const GPUVAddr address = config.Address(); if (address == 0) { @@ -999,6 +1037,20 @@ bool IsBlockLinearSizeCompatible(const ImageInfo& lhs, const ImageInfo& rhs, u32 } } +bool IsBlockLinearSizeCompatibleBPPRelaxed(const ImageInfo& lhs, const ImageInfo& rhs, + u32 lhs_level, u32 rhs_level) noexcept { + ASSERT(lhs.type != ImageType::Linear); + ASSERT(rhs.type != ImageType::Linear); + const auto lhs_bpp = BytesPerBlock(lhs.format); + const auto rhs_bpp = BytesPerBlock(rhs.format); + const Extent3D lhs_size = AdjustMipSize(lhs.size, lhs_level); + const Extent3D rhs_size = AdjustMipSize(rhs.size, rhs_level); + return Common::AlignUpLog2(lhs_size.width * lhs_bpp, GOB_SIZE_X_SHIFT) == + Common::AlignUpLog2(rhs_size.width * rhs_bpp, GOB_SIZE_X_SHIFT) && + Common::AlignUpLog2(lhs_size.height, GOB_SIZE_Y_SHIFT) == + Common::AlignUpLog2(rhs_size.height, GOB_SIZE_Y_SHIFT); +} + bool IsPitchLinearSameSize(const ImageInfo& lhs, const ImageInfo& rhs, bool strict_size) noexcept { ASSERT(lhs.type == ImageType::Linear); ASSERT(rhs.type == ImageType::Linear); @@ -1073,7 +1125,8 @@ std::optional FindSubresource(const ImageInfo& candidate, const // Format checking is relaxed, but we still have to check for matching bytes per block. // This avoids creating a view for blits on UE4 titles where formats with different bytes // per block are aliased. - if (BytesPerBlock(existing.format) != BytesPerBlock(candidate.format)) { + if (BytesPerBlock(existing.format) != BytesPerBlock(candidate.format) && + False(options & RelaxedOptions::FormatBpp)) { return std::nullopt; } } else { @@ -1088,10 +1141,8 @@ std::optional FindSubresource(const ImageInfo& candidate, const if (existing.type != candidate.type) { return std::nullopt; } - if (False(options & RelaxedOptions::Samples)) { - if (existing.num_samples != candidate.num_samples) { - return std::nullopt; - } + if (False(options & RelaxedOptions::Samples) && existing.num_samples != candidate.num_samples) { + return std::nullopt; } if (existing.resources.levels < candidate.resources.levels + base->level) { return std::nullopt; @@ -1101,14 +1152,16 @@ std::optional FindSubresource(const ImageInfo& candidate, const if (mip_depth < candidate.size.depth + base->layer) { return std::nullopt; } - } else { - if (existing.resources.layers < candidate.resources.layers + base->layer) { - return std::nullopt; - } + } else if (existing.resources.layers < candidate.resources.layers + base->layer) { + return std::nullopt; } const bool strict_size = False(options & RelaxedOptions::Size); if (!IsBlockLinearSizeCompatible(existing, candidate, base->level, 0, strict_size)) { - return std::nullopt; + if (False(options & RelaxedOptions::FormatBpp)) { + return std::nullopt; + } else if (!IsBlockLinearSizeCompatibleBPPRelaxed(existing, candidate, base->level, 0)) { + return std::nullopt; + } } // TODO: compare block sizes return base; @@ -1120,6 +1173,31 @@ bool IsSubresource(const ImageInfo& candidate, const ImageBase& image, GPUVAddr .has_value(); } +bool IsSubCopy(const ImageInfo& candidate, const ImageBase& image, GPUVAddr candidate_addr) { + const std::optional base = image.TryFindBase(candidate_addr); + if (!base) { + return false; + } + const ImageInfo& existing = image.info; + if (existing.resources.levels < candidate.resources.levels + base->level) { + return false; + } + if (existing.type == ImageType::e3D) { + const u32 mip_depth = std::max(1U, existing.size.depth << base->level); + if (mip_depth < candidate.size.depth + base->layer) { + return false; + } + } else { + if (existing.resources.layers < candidate.resources.layers + base->layer) { + return false; + } + } + if (!IsBlockLinearSizeCompatibleBPPRelaxed(existing, candidate, base->level, 0)) { + return false; + } + return true; +} + void DeduceBlitImages(ImageInfo& dst_info, ImageInfo& src_info, const ImageBase* dst, const ImageBase* src) { const auto original_dst_format = dst_info.format; diff --git a/src/video_core/texture_cache/util.h b/src/video_core/texture_cache/util.h index d103db8ae..84aa6880d 100644 --- a/src/video_core/texture_cache/util.h +++ b/src/video_core/texture_cache/util.h @@ -56,6 +56,10 @@ struct OverlapResult { SubresourceBase base, u32 up_scale = 1, u32 down_shift = 0); +[[nodiscard]] std::vector MakeReinterpretImageCopies(const ImageInfo& src, + u32 up_scale = 1, + u32 down_shift = 0); + [[nodiscard]] bool IsValidEntry(const Tegra::MemoryManager& gpu_memory, const TICEntry& config); [[nodiscard]] std::vector UnswizzleImage(Tegra::MemoryManager& gpu_memory, @@ -88,6 +92,9 @@ void SwizzleImage(Tegra::MemoryManager& gpu_memory, GPUVAddr gpu_addr, const Ima [[nodiscard]] bool IsPitchLinearSameSize(const ImageInfo& lhs, const ImageInfo& rhs, bool strict_size) noexcept; +[[nodiscard]] bool IsBlockLinearSizeCompatibleBPPRelaxed(const ImageInfo& lhs, const ImageInfo& rhs, + u32 lhs_level, u32 rhs_level) noexcept; + [[nodiscard]] std::optional ResolveOverlap(const ImageInfo& new_info, GPUVAddr gpu_addr, VAddr cpu_addr, const ImageBase& overlap, @@ -106,6 +113,9 @@ void SwizzleImage(Tegra::MemoryManager& gpu_memory, GPUVAddr gpu_addr, const Ima GPUVAddr candidate_addr, RelaxedOptions options, bool broken_views, bool native_bgr); +[[nodiscard]] bool IsSubCopy(const ImageInfo& candidate, const ImageBase& image, + GPUVAddr candidate_addr); + void DeduceBlitImages(ImageInfo& dst_info, ImageInfo& src_info, const ImageBase* dst, const ImageBase* src); From 644ee0043e0611c2795a6c6c7cd5d215aeb4a02d Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 5 Mar 2023 10:29:10 -0500 Subject: [PATCH 0129/1181] kernel: fix WaitSynchronization --- .../hle/kernel/svc/svc_synchronization.cpp | 45 ++++++++++++------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/src/core/hle/kernel/svc/svc_synchronization.cpp b/src/core/hle/kernel/svc/svc_synchronization.cpp index 1a8f7e191..9e7bf9530 100644 --- a/src/core/hle/kernel/svc/svc_synchronization.cpp +++ b/src/core/hle/kernel/svc/svc_synchronization.cpp @@ -48,19 +48,15 @@ Result ResetSignal(Core::System& system, Handle handle) { return ResultInvalidHandle; } -/// Wait for the given handles to synchronize, timeout after the specified nanoseconds -Result WaitSynchronization(Core::System& system, s32* index, VAddr handles_address, s32 num_handles, - s64 nano_seconds) { - LOG_TRACE(Kernel_SVC, "called handles_address=0x{:X}, num_handles={}, nano_seconds={}", - handles_address, num_handles, nano_seconds); - +static Result WaitSynchronization(Core::System& system, int32_t* out_index, const Handle* handles, + int32_t num_handles, int64_t timeout_ns) { // Ensure number of handles is valid. - R_UNLESS(0 <= num_handles && num_handles <= ArgumentHandleCountMax, ResultOutOfRange); + R_UNLESS(0 <= num_handles && num_handles <= Svc::ArgumentHandleCountMax, ResultOutOfRange); + // Get the synchronization context. auto& kernel = system.Kernel(); + auto& handle_table = GetCurrentProcess(kernel).GetHandleTable(); std::vector objs(num_handles); - const auto& handle_table = GetCurrentProcess(kernel).GetHandleTable(); - Handle* handles = system.Memory().GetPointer(handles_address); // Copy user handles. if (num_handles > 0) { @@ -68,21 +64,38 @@ Result WaitSynchronization(Core::System& system, s32* index, VAddr handles_addre R_UNLESS(handle_table.GetMultipleObjects(objs.data(), handles, num_handles), ResultInvalidHandle); - for (const auto& obj : objs) { - kernel.RegisterInUseObject(obj); - } } // Ensure handles are closed when we're done. SCOPE_EXIT({ - for (s32 i = 0; i < num_handles; ++i) { - kernel.UnregisterInUseObject(objs[i]); + for (auto i = 0; i < num_handles; ++i) { objs[i]->Close(); } }); - return KSynchronizationObject::Wait(kernel, index, objs.data(), static_cast(objs.size()), - nano_seconds); + // Wait on the objects. + Result res = KSynchronizationObject::Wait(kernel, out_index, objs.data(), + static_cast(objs.size()), timeout_ns); + + R_SUCCEED_IF(res == ResultSessionClosed); + R_RETURN(res); +} + +/// Wait for the given handles to synchronize, timeout after the specified nanoseconds +Result WaitSynchronization(Core::System& system, int32_t* out_index, VAddr user_handles, + int32_t num_handles, int64_t timeout_ns) { + LOG_TRACE(Kernel_SVC, "called user_handles={:#x}, num_handles={}, timeout_ns={}", user_handles, + num_handles, timeout_ns); + + // Ensure number of handles is valid. + R_UNLESS(0 <= num_handles && num_handles <= Svc::ArgumentHandleCountMax, ResultOutOfRange); + + std::vector handles(num_handles); + if (num_handles > 0) { + system.Memory().ReadBlock(user_handles, handles.data(), num_handles * sizeof(Handle)); + } + + R_RETURN(WaitSynchronization(system, out_index, handles.data(), num_handles, timeout_ns)); } /// Resumes a thread waiting on WaitSynchronization From 54711df7395e1d491f4175c09dc50dee2d606ecb Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Mon, 27 Feb 2023 16:56:51 -0600 Subject: [PATCH 0130/1181] service: usb: Update names --- src/core/hle/service/usb/usb.cpp | 70 ++++++++++++++++---------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/core/hle/service/usb/usb.cpp b/src/core/hle/service/usb/usb.cpp index a2855e783..f29fff1dd 100644 --- a/src/core/hle/service/usb/usb.cpp +++ b/src/core/hle/service/usb/usb.cpp @@ -16,19 +16,19 @@ public: explicit IDsInterface(Core::System& system_) : ServiceFramework{system_, "IDsInterface"} { // clang-format off static const FunctionInfo functions[] = { - {0, nullptr, "BindDevice"}, - {1, nullptr, "BindClientProcess"}, - {2, nullptr, "AddInterface"}, - {3, nullptr, "GetStateChangeEvent"}, - {4, nullptr, "GetState"}, - {5, nullptr, "ClearDeviceData"}, - {6, nullptr, "AddUsbStringDescriptor"}, - {7, nullptr, "DeleteUsbStringDescriptor"}, - {8, nullptr, "SetUsbDeviceDescriptor"}, - {9, nullptr, "SetBinaryObjectStore"}, - {10, nullptr, "Enable"}, - {11, nullptr, "Disable"}, - {12, nullptr, "Unknown12"}, + {0, nullptr, "AddEndpoint"}, + {1, nullptr, "GetSetupEvent"}, + {2, nullptr, "GetSetupPacket"}, + {3, nullptr, "Enable"}, + {4, nullptr, "Disable"}, + {5, nullptr, "CtrlIn"}, + {6, nullptr, "CtrlOut"}, + {7, nullptr, "GetCtrlInCompletionEvent"}, + {8, nullptr, "GetCtrlInUrbReport"}, + {9, nullptr, "GetCtrlOutCompletionEvent"}, + {10, nullptr, "GetCtrlOutUrbReport"}, + {11, nullptr, "CtrlStall"}, + {12, nullptr, "AppendConfigurationData"}, }; // clang-format on @@ -36,9 +36,9 @@ public: } }; -class USB_DS final : public ServiceFramework { +class IDsRootSession final : public ServiceFramework { public: - explicit USB_DS(Core::System& system_) : ServiceFramework{system_, "usb:ds"} { + explicit IDsRootSession(Core::System& system_) : ServiceFramework{system_, "usb:ds"} { // clang-format off static const FunctionInfo functions[] = { {0, nullptr, "OpenDsService"}, @@ -94,9 +94,9 @@ public: } }; -class USB_HS final : public ServiceFramework { +class IClientRootSession final : public ServiceFramework { public: - explicit USB_HS(Core::System& system_) : ServiceFramework{system_, "usb:hs"} { + explicit IClientRootSession(Core::System& system_) : ServiceFramework{system_, "usb:hs"} { // clang-format off static const FunctionInfo functions[] = { {0, nullptr, "BindClientProcess"}, @@ -107,7 +107,7 @@ public: {5, nullptr, "DestroyInterfaceAvailableEvent"}, {6, nullptr, "GetInterfaceStateChangeEvent"}, {7, nullptr, "AcquireUsbIf"}, - {8, nullptr, "ResetDevice"}, + {8, nullptr, "SetTestMode"}, }; // clang-format on @@ -134,12 +134,12 @@ public: } }; -class USB_PD final : public ServiceFramework { +class IPdManager final : public ServiceFramework { public: - explicit USB_PD(Core::System& system_) : ServiceFramework{system_, "usb:pd"} { + explicit IPdManager(Core::System& system_) : ServiceFramework{system_, "usb:pd"} { // clang-format off static const FunctionInfo functions[] = { - {0, &USB_PD::GetPdSession, "GetPdSession"}, + {0, &IPdManager::OpenSession, "OpenSession"}, }; // clang-format on @@ -147,7 +147,7 @@ public: } private: - void GetPdSession(HLERequestContext& ctx) { + void OpenSession(HLERequestContext& ctx) { LOG_DEBUG(Service_USB, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -178,12 +178,12 @@ public: } }; -class USB_PD_C final : public ServiceFramework { +class IPdCradleManager final : public ServiceFramework { public: - explicit USB_PD_C(Core::System& system_) : ServiceFramework{system_, "usb:pd:c"} { + explicit IPdCradleManager(Core::System& system_) : ServiceFramework{system_, "usb:pd:c"} { // clang-format off static const FunctionInfo functions[] = { - {0, &USB_PD_C::GetPdCradleSession, "GetPdCradleSession"}, + {0, &IPdCradleManager::OpenCradleSession, "OpenCradleSession"}, }; // clang-format on @@ -191,18 +191,18 @@ public: } private: - void GetPdCradleSession(HLERequestContext& ctx) { + void OpenCradleSession(HLERequestContext& ctx) { + LOG_DEBUG(Service_USB, "called"); + IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); rb.PushIpcInterface(system); - - LOG_DEBUG(Service_USB, "called"); } }; -class USB_PM final : public ServiceFramework { +class IPmMainService final : public ServiceFramework { public: - explicit USB_PM(Core::System& system_) : ServiceFramework{system_, "usb:pm"} { + explicit IPmMainService(Core::System& system_) : ServiceFramework{system_, "usb:pm"} { // clang-format off static const FunctionInfo functions[] = { {0, nullptr, "GetPowerEvent"}, @@ -221,11 +221,11 @@ public: void LoopProcess(Core::System& system) { auto server_manager = std::make_unique(system); - server_manager->RegisterNamedService("usb:ds", std::make_shared(system)); - server_manager->RegisterNamedService("usb:hs", std::make_shared(system)); - server_manager->RegisterNamedService("usb:pd", std::make_shared(system)); - server_manager->RegisterNamedService("usb:pd:c", std::make_shared(system)); - server_manager->RegisterNamedService("usb:pm", std::make_shared(system)); + server_manager->RegisterNamedService("usb:ds", std::make_shared(system)); + server_manager->RegisterNamedService("usb:hs", std::make_shared(system)); + server_manager->RegisterNamedService("usb:pd", std::make_shared(system)); + server_manager->RegisterNamedService("usb:pd:c", std::make_shared(system)); + server_manager->RegisterNamedService("usb:pm", std::make_shared(system)); ServerManager::RunServer(std::move(server_manager)); } From f01540da6c385c7239aa31a748ced6d671349d6a Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Mon, 27 Feb 2023 19:05:08 -0600 Subject: [PATCH 0131/1181] service: ssl: Add missing properties and update names --- src/core/hle/service/ssl/ssl.cpp | 76 ++++++++++++++++++++++++-------- 1 file changed, 58 insertions(+), 18 deletions(-) diff --git a/src/core/hle/service/ssl/ssl.cpp b/src/core/hle/service/ssl/ssl.cpp index b19bc1b3e..2b99dd7ac 100644 --- a/src/core/hle/service/ssl/ssl.cpp +++ b/src/core/hle/service/ssl/ssl.cpp @@ -8,14 +8,36 @@ namespace Service::SSL { +// This is nn::ssl::sf::CertificateFormat enum class CertificateFormat : u32 { Pem = 1, Der = 2, }; +// This is nn::ssl::sf::ContextOption +enum class ContextOption : u32 { + None = 0, + CrlImportDateCheckEnable = 1, +}; + +// This is nn::ssl::sf::SslVersion +struct SslVersion { + union { + u32 raw{}; + + BitField<0, 1, u32> tls_auto; + BitField<3, 1, u32> tls_v10; + BitField<4, 1, u32> tls_v11; + BitField<5, 1, u32> tls_v12; + BitField<6, 1, u32> tls_v13; + BitField<24, 7, u32> api_version; + }; +}; + class ISslConnection final : public ServiceFramework { public: - explicit ISslConnection(Core::System& system_) : ServiceFramework{system_, "ISslConnection"} { + explicit ISslConnection(Core::System& system_, SslVersion version) + : ServiceFramework{system_, "ISslConnection"}, ssl_version{version} { // clang-format off static const FunctionInfo functions[] = { {0, nullptr, "SetSocketDescriptor"}, @@ -59,11 +81,15 @@ public: RegisterHandlers(functions); } + +private: + SslVersion ssl_version; }; class ISslContext final : public ServiceFramework { public: - explicit ISslContext(Core::System& system_) : ServiceFramework{system_, "ISslContext"} { + explicit ISslContext(Core::System& system_, SslVersion version) + : ServiceFramework{system_, "ISslContext"}, ssl_version{version} { static const FunctionInfo functions[] = { {0, &ISslContext::SetOption, "SetOption"}, {1, nullptr, "GetOption"}, @@ -84,17 +110,20 @@ public: } private: + SslVersion ssl_version; + void SetOption(HLERequestContext& ctx) { struct Parameters { - u8 enable; - u32 option; + ContextOption option; + s32 value; }; + static_assert(sizeof(Parameters) == 0x8, "Parameters is an invalid size"); IPC::RequestParser rp{ctx}; const auto parameters = rp.PopRaw(); - LOG_WARNING(Service_SSL, "(STUBBED) called. enable={}, option={}", parameters.enable, - parameters.option); + LOG_WARNING(Service_SSL, "(STUBBED) called. option={}, value={}", parameters.option, + parameters.value); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); @@ -105,7 +134,7 @@ private: IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface(system); + rb.PushIpcInterface(system, ssl_version); } void ImportServerPki(HLERequestContext& ctx) { @@ -142,20 +171,21 @@ private: } }; -class SSL final : public ServiceFramework { +class ISslService final : public ServiceFramework { public: - explicit SSL(Core::System& system_) : ServiceFramework{system_, "ssl"} { + explicit ISslService(Core::System& system_) : ServiceFramework{system_, "ssl"} { // clang-format off static const FunctionInfo functions[] = { - {0, &SSL::CreateContext, "CreateContext"}, + {0, &ISslService::CreateContext, "CreateContext"}, {1, nullptr, "GetContextCount"}, {2, nullptr, "GetCertificates"}, {3, nullptr, "GetCertificateBufSize"}, {4, nullptr, "DebugIoctl"}, - {5, &SSL::SetInterfaceVersion, "SetInterfaceVersion"}, + {5, &ISslService::SetInterfaceVersion, "SetInterfaceVersion"}, {6, nullptr, "FlushSessionCache"}, {7, nullptr, "SetDebugOption"}, {8, nullptr, "GetDebugOption"}, + {8, nullptr, "ClearTls12FallbackFlag"}, }; // clang-format on @@ -163,20 +193,30 @@ public: } private: - u32 ssl_version{}; void CreateContext(HLERequestContext& ctx) { - LOG_WARNING(Service_SSL, "(STUBBED) called"); + struct Parameters { + SslVersion ssl_version; + INSERT_PADDING_BYTES(0x4); + u64 pid_placeholder; + }; + static_assert(sizeof(Parameters) == 0x10, "Parameters is an invalid size"); + + IPC::RequestParser rp{ctx}; + const auto parameters = rp.PopRaw(); + + LOG_WARNING(Service_SSL, "(STUBBED) called, api_version={}, pid_placeholder={}", + parameters.ssl_version.api_version, parameters.pid_placeholder); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface(system); + rb.PushIpcInterface(system, parameters.ssl_version); } void SetInterfaceVersion(HLERequestContext& ctx) { - LOG_DEBUG(Service_SSL, "called"); - IPC::RequestParser rp{ctx}; - ssl_version = rp.Pop(); + u32 ssl_version = rp.Pop(); + + LOG_DEBUG(Service_SSL, "called, ssl_version={}", ssl_version); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); @@ -186,7 +226,7 @@ private: void LoopProcess(Core::System& system) { auto server_manager = std::make_unique(system); - server_manager->RegisterNamedService("ssl", std::make_shared(system)); + server_manager->RegisterNamedService("ssl", std::make_shared(system)); ServerManager::RunServer(std::move(server_manager)); } From 1f57ae69490d78531c006abf55171379064bb7b1 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Mon, 27 Feb 2023 19:56:12 -0600 Subject: [PATCH 0132/1181] service: psc: Update names --- src/core/hle/service/psc/psc.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/core/hle/service/psc/psc.cpp b/src/core/hle/service/psc/psc.cpp index 25702703e..cd0cc9287 100644 --- a/src/core/hle/service/psc/psc.cpp +++ b/src/core/hle/service/psc/psc.cpp @@ -11,9 +11,9 @@ namespace Service::PSC { -class PSC_C final : public ServiceFramework { +class IPmControl final : public ServiceFramework { public: - explicit PSC_C(Core::System& system_) : ServiceFramework{system_, "psc:c"} { + explicit IPmControl(Core::System& system_) : ServiceFramework{system_, "psc:c"} { // clang-format off static const FunctionInfo functions[] = { {0, nullptr, "Initialize"}, @@ -23,8 +23,8 @@ public: {4, nullptr, "Cancel"}, {5, nullptr, "PrintModuleInformation"}, {6, nullptr, "GetModuleInformation"}, - {10, nullptr, "Unknown10"}, - {11, nullptr, "Unknown11"}, + {10, nullptr, "AcquireStateLock"}, + {11, nullptr, "HasStateLock"}, }; // clang-format on @@ -49,12 +49,12 @@ public: } }; -class PSC_M final : public ServiceFramework { +class IPmService final : public ServiceFramework { public: - explicit PSC_M(Core::System& system_) : ServiceFramework{system_, "psc:m"} { + explicit IPmService(Core::System& system_) : ServiceFramework{system_, "psc:m"} { // clang-format off static const FunctionInfo functions[] = { - {0, &PSC_M::GetPmModule, "GetPmModule"}, + {0, &IPmService::GetPmModule, "GetPmModule"}, }; // clang-format on @@ -74,8 +74,8 @@ private: void LoopProcess(Core::System& system) { auto server_manager = std::make_unique(system); - server_manager->RegisterNamedService("psc:c", std::make_shared(system)); - server_manager->RegisterNamedService("psc:m", std::make_shared(system)); + server_manager->RegisterNamedService("psc:c", std::make_shared(system)); + server_manager->RegisterNamedService("psc:m", std::make_shared(system)); ServerManager::RunServer(std::move(server_manager)); } From 97704b8da9866a4e529515f5793309ce5f199840 Mon Sep 17 00:00:00 2001 From: german77 Date: Sun, 5 Mar 2023 12:44:39 -0600 Subject: [PATCH 0133/1181] input_common: joycon: Add stick input from passive reports --- .../helpers/joycon_protocol/joycon_types.h | 12 +++ .../helpers/joycon_protocol/poller.cpp | 95 +++++++++++++------ .../helpers/joycon_protocol/poller.h | 9 +- 3 files changed, 84 insertions(+), 32 deletions(-) diff --git a/src/input_common/helpers/joycon_protocol/joycon_types.h b/src/input_common/helpers/joycon_protocol/joycon_types.h index b91934990..2e50a99a8 100644 --- a/src/input_common/helpers/joycon_protocol/joycon_types.h +++ b/src/input_common/helpers/joycon_protocol/joycon_types.h @@ -95,6 +95,18 @@ enum class PasivePadButton : u32 { ZL_ZR = 0x8000, }; +enum class PasivePadStick : u8 { + Right = 0x00, + RightDown = 0x01, + Down = 0x02, + DownLeft = 0x03, + Left = 0x04, + LeftUp = 0x05, + Up = 0x06, + UpRight = 0x07, + Neutral = 0x08, +}; + enum class OutputReport : u8 { RUMBLE_AND_SUBCMD = 0x01, FW_UPDATE_PKT = 0x03, diff --git a/src/input_common/helpers/joycon_protocol/poller.cpp b/src/input_common/helpers/joycon_protocol/poller.cpp index 9bb15e935..ab48352b8 100644 --- a/src/input_common/helpers/joycon_protocol/poller.cpp +++ b/src/input_common/helpers/joycon_protocol/poller.cpp @@ -12,7 +12,7 @@ JoyconPoller::JoyconPoller(ControllerType device_type_, JoyStickCalibration left : device_type{device_type_}, left_stick_calibration{left_stick_calibration_}, right_stick_calibration{right_stick_calibration_}, motion_calibration{motion_calibration_} {} -void JoyconPoller::SetCallbacks(const Joycon::JoyconCallbacks& callbacks_) { +void JoyconPoller::SetCallbacks(const JoyconCallbacks& callbacks_) { callbacks = std::move(callbacks_); } @@ -22,13 +22,13 @@ void JoyconPoller::ReadActiveMode(std::span buffer, const MotionStatus& moti memcpy(&data, buffer.data(), sizeof(InputReportActive)); switch (device_type) { - case Joycon::ControllerType::Left: + case ControllerType::Left: UpdateActiveLeftPadInput(data, motion_status); break; - case Joycon::ControllerType::Right: + case ControllerType::Right: UpdateActiveRightPadInput(data, motion_status); break; - case Joycon::ControllerType::Pro: + case ControllerType::Pro: UpdateActiveProPadInput(data, motion_status); break; default: @@ -47,13 +47,13 @@ void JoyconPoller::ReadPassiveMode(std::span buffer) { memcpy(&data, buffer.data(), sizeof(InputReportPassive)); switch (device_type) { - case Joycon::ControllerType::Left: + case ControllerType::Left: UpdatePasiveLeftPadInput(data); break; - case Joycon::ControllerType::Right: + case ControllerType::Right: UpdatePasiveRightPadInput(data); break; - case Joycon::ControllerType::Pro: + case ControllerType::Pro: UpdatePasiveProPadInput(data); break; default: @@ -211,13 +211,11 @@ void JoyconPoller::UpdateActiveProPadInput(const InputReportActive& input, } void JoyconPoller::UpdatePasiveLeftPadInput(const InputReportPassive& input) { - static constexpr std::array left_buttons{ - Joycon::PasivePadButton::Down_A, Joycon::PasivePadButton::Right_X, - Joycon::PasivePadButton::Left_B, Joycon::PasivePadButton::Up_Y, - Joycon::PasivePadButton::SL, Joycon::PasivePadButton::SR, - Joycon::PasivePadButton::L_R, Joycon::PasivePadButton::ZL_ZR, - Joycon::PasivePadButton::Minus, Joycon::PasivePadButton::Capture, - Joycon::PasivePadButton::StickL, + static constexpr std::array left_buttons{ + PasivePadButton::Down_A, PasivePadButton::Right_X, PasivePadButton::Left_B, + PasivePadButton::Up_Y, PasivePadButton::SL, PasivePadButton::SR, + PasivePadButton::L_R, PasivePadButton::ZL_ZR, PasivePadButton::Minus, + PasivePadButton::Capture, PasivePadButton::StickL, }; for (auto left_button : left_buttons) { @@ -225,16 +223,19 @@ void JoyconPoller::UpdatePasiveLeftPadInput(const InputReportPassive& input) { const int button = static_cast(left_button); callbacks.on_button_data(button, button_status); } + + const auto [left_axis_x, left_axis_y] = + GetPassiveAxisValue(static_cast(input.stick_state)); + callbacks.on_stick_data(static_cast(PadAxes::LeftStickX), left_axis_x); + callbacks.on_stick_data(static_cast(PadAxes::LeftStickY), left_axis_y); } void JoyconPoller::UpdatePasiveRightPadInput(const InputReportPassive& input) { - static constexpr std::array right_buttons{ - Joycon::PasivePadButton::Down_A, Joycon::PasivePadButton::Right_X, - Joycon::PasivePadButton::Left_B, Joycon::PasivePadButton::Up_Y, - Joycon::PasivePadButton::SL, Joycon::PasivePadButton::SR, - Joycon::PasivePadButton::L_R, Joycon::PasivePadButton::ZL_ZR, - Joycon::PasivePadButton::Plus, Joycon::PasivePadButton::Home, - Joycon::PasivePadButton::StickR, + static constexpr std::array right_buttons{ + PasivePadButton::Down_A, PasivePadButton::Right_X, PasivePadButton::Left_B, + PasivePadButton::Up_Y, PasivePadButton::SL, PasivePadButton::SR, + PasivePadButton::L_R, PasivePadButton::ZL_ZR, PasivePadButton::Plus, + PasivePadButton::Home, PasivePadButton::StickR, }; for (auto right_button : right_buttons) { @@ -242,17 +243,20 @@ void JoyconPoller::UpdatePasiveRightPadInput(const InputReportPassive& input) { const int button = static_cast(right_button); callbacks.on_button_data(button, button_status); } + + const auto [right_axis_x, right_axis_y] = + GetPassiveAxisValue(static_cast(input.stick_state)); + callbacks.on_stick_data(static_cast(PadAxes::RightStickX), right_axis_x); + callbacks.on_stick_data(static_cast(PadAxes::RightStickY), right_axis_y); } void JoyconPoller::UpdatePasiveProPadInput(const InputReportPassive& input) { - static constexpr std::array pro_buttons{ - Joycon::PasivePadButton::Down_A, Joycon::PasivePadButton::Right_X, - Joycon::PasivePadButton::Left_B, Joycon::PasivePadButton::Up_Y, - Joycon::PasivePadButton::SL, Joycon::PasivePadButton::SR, - Joycon::PasivePadButton::L_R, Joycon::PasivePadButton::ZL_ZR, - Joycon::PasivePadButton::Minus, Joycon::PasivePadButton::Plus, - Joycon::PasivePadButton::Capture, Joycon::PasivePadButton::Home, - Joycon::PasivePadButton::StickL, Joycon::PasivePadButton::StickR, + static constexpr std::array pro_buttons{ + PasivePadButton::Down_A, PasivePadButton::Right_X, PasivePadButton::Left_B, + PasivePadButton::Up_Y, PasivePadButton::SL, PasivePadButton::SR, + PasivePadButton::L_R, PasivePadButton::ZL_ZR, PasivePadButton::Minus, + PasivePadButton::Plus, PasivePadButton::Capture, PasivePadButton::Home, + PasivePadButton::StickL, PasivePadButton::StickR, }; for (auto pro_button : pro_buttons) { @@ -260,6 +264,15 @@ void JoyconPoller::UpdatePasiveProPadInput(const InputReportPassive& input) { const int button = static_cast(pro_button); callbacks.on_button_data(button, button_status); } + + const auto [left_axis_x, left_axis_y] = + GetPassiveAxisValue(static_cast(input.stick_state && 0xf)); + const auto [right_axis_x, right_axis_y] = + GetPassiveAxisValue(static_cast(input.stick_state >> 4)); + callbacks.on_stick_data(static_cast(PadAxes::LeftStickX), left_axis_x); + callbacks.on_stick_data(static_cast(PadAxes::LeftStickY), left_axis_y); + callbacks.on_stick_data(static_cast(PadAxes::RightStickX), right_axis_x); + callbacks.on_stick_data(static_cast(PadAxes::RightStickY), right_axis_y); } f32 JoyconPoller::GetAxisValue(u16 raw_value, Joycon::JoyStickAxisCalibration calibration) const { @@ -270,6 +283,30 @@ f32 JoyconPoller::GetAxisValue(u16 raw_value, Joycon::JoyStickAxisCalibration ca return value / calibration.min; } +std::pair JoyconPoller::GetPassiveAxisValue(PasivePadStick raw_value) const { + switch (raw_value) { + case PasivePadStick::Right: + return {1.0f, 0.0f}; + case PasivePadStick::RightDown: + return {1.0f, -1.0f}; + case PasivePadStick::Down: + return {0.0f, -1.0f}; + case PasivePadStick::DownLeft: + return {-1.0f, -1.0f}; + case PasivePadStick::Left: + return {-1.0f, 0.0f}; + case PasivePadStick::LeftUp: + return {-1.0f, 1.0f}; + case PasivePadStick::Up: + return {0.0f, 1.0f}; + case PasivePadStick::UpRight: + return {1.0f, 1.0f}; + case PasivePadStick::Neutral: + default: + return {0.0f, 0.0f}; + } +} + f32 JoyconPoller::GetAccelerometerValue(s16 raw, const MotionSensorCalibration& cal, AccelerometerSensitivity sensitivity) const { const f32 value = raw * (1.0f / (cal.scale - cal.offset)) * 4; diff --git a/src/input_common/helpers/joycon_protocol/poller.h b/src/input_common/helpers/joycon_protocol/poller.h index 354d41dad..5c897f070 100644 --- a/src/input_common/helpers/joycon_protocol/poller.h +++ b/src/input_common/helpers/joycon_protocol/poller.h @@ -22,7 +22,7 @@ public: JoyStickCalibration right_stick_calibration_, MotionCalibration motion_calibration_); - void SetCallbacks(const Joycon::JoyconCallbacks& callbacks_); + void SetCallbacks(const JoyconCallbacks& callbacks_); /// Handles data from passive packages void ReadPassiveMode(std::span buffer); @@ -51,7 +51,10 @@ private: void UpdatePasiveProPadInput(const InputReportPassive& buffer); /// Returns a calibrated joystick axis from raw axis data - f32 GetAxisValue(u16 raw_value, Joycon::JoyStickAxisCalibration calibration) const; + f32 GetAxisValue(u16 raw_value, JoyStickAxisCalibration calibration) const; + + /// Returns a digital joystick axis from passive axis data + std::pair GetPassiveAxisValue(PasivePadStick raw_value) const; /// Returns a calibrated accelerometer axis from raw motion data f32 GetAccelerometerValue(s16 raw, const MotionSensorCalibration& cal, @@ -75,7 +78,7 @@ private: JoyStickCalibration right_stick_calibration{}; MotionCalibration motion_calibration{}; - Joycon::JoyconCallbacks callbacks{}; + JoyconCallbacks callbacks{}; }; } // namespace InputCommon::Joycon From 8a501ff30b6cba684cba469d07a5b553e96fb101 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Sun, 5 Mar 2023 16:33:25 -0600 Subject: [PATCH 0134/1181] service: acc: Replace default image with a 32x32 image --- src/core/constants.cpp | 27 +++++++++++++++++++-------- src/core/constants.h | 2 +- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/core/constants.cpp b/src/core/constants.cpp index 4430173ef..760dc5f23 100644 --- a/src/core/constants.cpp +++ b/src/core/constants.cpp @@ -4,13 +4,24 @@ #include "core/constants.h" namespace Core::Constants { -const std::array ACCOUNT_BACKUP_JPEG{{ - 0xff, 0xd8, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, - 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x06, 0x06, 0x05, - 0x06, 0x09, 0x08, 0x0a, 0x0a, 0x09, 0x08, 0x09, 0x09, 0x0a, 0x0c, 0x0f, 0x0c, 0x0a, 0x0b, 0x0e, - 0x0b, 0x09, 0x09, 0x0d, 0x11, 0x0d, 0x0e, 0x0f, 0x10, 0x10, 0x11, 0x10, 0x0a, 0x0c, 0x12, 0x13, - 0x12, 0x10, 0x13, 0x0f, 0x10, 0x10, 0x10, 0xff, 0xc9, 0x00, 0x0b, 0x08, 0x00, 0x01, 0x00, 0x01, - 0x01, 0x01, 0x11, 0x00, 0xff, 0xcc, 0x00, 0x06, 0x00, 0x10, 0x10, 0x05, 0xff, 0xda, 0x00, 0x08, - 0x01, 0x01, 0x00, 0x00, 0x3f, 0x00, 0xd2, 0xcf, 0x20, 0xff, 0xd9, +const std::array ACCOUNT_BACKUP_JPEG{{ + 0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 0x4a, 0x46, 0x49, 0x46, 0x00, 0x01, 0x01, 0x01, 0x00, 0x48, + 0x00, 0x48, 0x00, 0x00, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x06, 0x04, 0x04, 0x04, 0x05, 0x04, 0x06, + 0x05, 0x05, 0x06, 0x09, 0x06, 0x05, 0x06, 0x09, 0x0b, 0x08, 0x06, 0x06, 0x08, 0x0b, 0x0c, 0x0a, + 0x0a, 0x0b, 0x0a, 0x0a, 0x0c, 0x10, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x10, 0x0c, 0x0e, 0x0f, + 0x10, 0x0f, 0x0e, 0x0c, 0x13, 0x13, 0x14, 0x14, 0x13, 0x13, 0x1c, 0x1b, 0x1b, 0x1b, 0x1c, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0xff, 0xdb, 0x00, 0x43, 0x01, 0x07, 0x07, + 0x07, 0x0d, 0x0c, 0x0d, 0x18, 0x10, 0x10, 0x18, 0x1a, 0x15, 0x11, 0x15, 0x1a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0xff, 0xc0, + 0x00, 0x11, 0x08, 0x00, 0x20, 0x00, 0x20, 0x03, 0x01, 0x22, 0x00, 0x02, 0x11, 0x01, 0x03, 0x11, + 0x01, 0xff, 0xc4, 0x00, 0x14, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xc4, 0x00, 0x14, 0x10, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xc4, 0x00, + 0x14, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xff, 0xc4, 0x00, 0x14, 0x11, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xda, 0x00, 0x0c, 0x03, 0x01, 0x00, + 0x02, 0x11, 0x03, 0x11, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xd9, }}; } diff --git a/src/core/constants.h b/src/core/constants.h index f916ce0b6..f1f67d3b8 100644 --- a/src/core/constants.h +++ b/src/core/constants.h @@ -12,6 +12,6 @@ namespace Core::Constants { // ACC Service - Blank JPEG used as user icon in absentia of real one. -extern const std::array ACCOUNT_BACKUP_JPEG; +extern const std::array ACCOUNT_BACKUP_JPEG; } // namespace Core::Constants From c161e3f43371bcf295ace189b242e052f6bf3d20 Mon Sep 17 00:00:00 2001 From: Ikko Eltociear Ashimine Date: Mon, 6 Mar 2023 20:28:47 +0900 Subject: [PATCH 0135/1181] fix typo in settings.h Intial -> Initial --- src/common/settings.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/settings.h b/src/common/settings.h index 512ecff69..1ae28ce93 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -128,7 +128,7 @@ public: /** * Sets a default value, label, and setting value. * - * @param default_val Intial value of the setting, and default value of the setting + * @param default_val Initial value of the setting, and default value of the setting * @param name Label for the setting */ explicit Setting(const Type& default_val, const std::string& name) @@ -139,7 +139,7 @@ public: /** * Sets a default value, minimum value, maximum value, and label. * - * @param default_val Intial value of the setting, and default value of the setting + * @param default_val Initial value of the setting, and default value of the setting * @param min_val Sets the minimum allowed value of the setting * @param max_val Sets the maximum allowed value of the setting * @param name Label for the setting @@ -231,7 +231,7 @@ public: /** * Sets a default value, label, and setting value. * - * @param default_val Intial value of the setting, and default value of the setting + * @param default_val Initial value of the setting, and default value of the setting * @param name Label for the setting */ explicit SwitchableSetting(const Type& default_val, const std::string& name) @@ -242,7 +242,7 @@ public: /** * Sets a default value, minimum value, maximum value, and label. * - * @param default_val Intial value of the setting, and default value of the setting + * @param default_val Initial value of the setting, and default value of the setting * @param min_val Sets the minimum allowed value of the setting * @param max_val Sets the maximum allowed value of the setting * @param name Label for the setting From 859fb469b88c5470468484e10829111e8aee18c8 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 6 Mar 2023 11:21:54 +0000 Subject: [PATCH 0136/1181] kernel: add missing header for libc++ In file included from src/core/hle/kernel/k_light_lock.cpp:4: In file included from src/./core/hle/kernel/k_light_lock.h:8: src/./core/hle/kernel/k_scoped_lock.h:25:51: error: no member named 'addressof' in namespace 'std' explicit KScopedLock(T& l) : KScopedLock(std::addressof(l)) {} ~~~~~^ --- src/core/hle/kernel/k_scoped_lock.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/hle/kernel/k_scoped_lock.h b/src/core/hle/kernel/k_scoped_lock.h index 59b3e32ae..a15640fd2 100644 --- a/src/core/hle/kernel/k_scoped_lock.h +++ b/src/core/hle/kernel/k_scoped_lock.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include namespace Kernel { From 1d0fe75e7cca27d79006654dcc56c44cb4096d3a Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 6 Mar 2023 19:04:12 -0500 Subject: [PATCH 0137/1181] hle: rename legacy errors to Results --- src/audio_core/audio_in_manager.cpp | 2 +- src/audio_core/audio_manager.cpp | 4 +- src/audio_core/audio_out_manager.cpp | 2 +- src/audio_core/audio_render_manager.cpp | 2 +- src/audio_core/in/audio_in.cpp | 2 +- src/audio_core/in/audio_in_system.cpp | 6 +-- src/audio_core/out/audio_out.cpp | 2 +- src/audio_core/out/audio_out_system.cpp | 8 +-- src/audio_core/renderer/audio_renderer.cpp | 2 +- .../renderer/behavior/info_updater.cpp | 38 +++++++------- .../renderer/memory/pool_mapper.cpp | 2 +- src/audio_core/renderer/system.cpp | 50 +++++++++---------- src/audio_core/renderer/voice/voice_info.cpp | 8 +-- src/core/CMakeLists.txt | 1 - src/core/hle/kernel/k_process.h | 4 +- src/core/hle/service/acc/acc.cpp | 26 ++++------ src/core/hle/service/acc/errors.h | 10 +++- src/core/hle/service/am/am.cpp | 20 ++++---- .../service/am/applets/applet_controller.cpp | 7 ++- .../am/applets/applet_profile_select.cpp | 7 ++- src/core/hle/service/audio/audren_u.cpp | 6 +-- src/core/hle/service/audio/errors.h | 24 ++++----- src/core/hle/service/friend/errors.h | 11 ---- src/core/hle/service/friend/friend.cpp | 4 +- src/core/hle/service/glue/arp.cpp | 18 +++---- src/core/hle/service/glue/errors.h | 7 ++- src/core/hle/service/glue/glue_manager.cpp | 16 +++--- src/core/hle/service/glue/glue_manager.h | 16 +++--- src/core/hle/service/ipc_helpers.h | 2 +- src/core/hle/service/ns/errors.h | 5 +- src/core/hle/service/ns/ns.cpp | 8 +-- src/core/hle/service/server_manager.cpp | 2 +- src/core/hle/service/service.cpp | 2 +- src/core/hle/service/set/set.cpp | 4 +- src/core/hle/service/sm/sm.cpp | 24 ++++----- 35 files changed, 169 insertions(+), 183 deletions(-) delete mode 100644 src/core/hle/service/friend/errors.h diff --git a/src/audio_core/audio_in_manager.cpp b/src/audio_core/audio_in_manager.cpp index f39fb4002..3dfb613cb 100644 --- a/src/audio_core/audio_in_manager.cpp +++ b/src/audio_core/audio_in_manager.cpp @@ -20,7 +20,7 @@ Manager::Manager(Core::System& system_) : system{system_} { Result Manager::AcquireSessionId(size_t& session_id) { if (num_free_sessions == 0) { LOG_ERROR(Service_Audio, "All 4 AudioIn sessions are in use, cannot create any more"); - return Service::Audio::ERR_MAXIMUM_SESSIONS_REACHED; + return Service::Audio::ResultOutOfSessions; } session_id = session_ids[next_session_id]; next_session_id = (next_session_id + 1) % MaxInSessions; diff --git a/src/audio_core/audio_manager.cpp b/src/audio_core/audio_manager.cpp index 2acde668e..10b56f214 100644 --- a/src/audio_core/audio_manager.cpp +++ b/src/audio_core/audio_manager.cpp @@ -19,7 +19,7 @@ void AudioManager::Shutdown() { Result AudioManager::SetOutManager(BufferEventFunc buffer_func) { if (!running) { - return Service::Audio::ERR_OPERATION_FAILED; + return Service::Audio::ResultOperationFailed; } std::scoped_lock l{lock}; @@ -35,7 +35,7 @@ Result AudioManager::SetOutManager(BufferEventFunc buffer_func) { Result AudioManager::SetInManager(BufferEventFunc buffer_func) { if (!running) { - return Service::Audio::ERR_OPERATION_FAILED; + return Service::Audio::ResultOperationFailed; } std::scoped_lock l{lock}; diff --git a/src/audio_core/audio_out_manager.cpp b/src/audio_core/audio_out_manager.cpp index 1766efde1..f22821360 100644 --- a/src/audio_core/audio_out_manager.cpp +++ b/src/audio_core/audio_out_manager.cpp @@ -19,7 +19,7 @@ Manager::Manager(Core::System& system_) : system{system_} { Result Manager::AcquireSessionId(size_t& session_id) { if (num_free_sessions == 0) { LOG_ERROR(Service_Audio, "All 12 Audio Out sessions are in use, cannot create any more"); - return Service::Audio::ERR_MAXIMUM_SESSIONS_REACHED; + return Service::Audio::ResultOutOfSessions; } session_id = session_ids[next_session_id]; next_session_id = (next_session_id + 1) % MaxOutSessions; diff --git a/src/audio_core/audio_render_manager.cpp b/src/audio_core/audio_render_manager.cpp index 7aba2b423..320715727 100644 --- a/src/audio_core/audio_render_manager.cpp +++ b/src/audio_core/audio_render_manager.cpp @@ -28,7 +28,7 @@ SystemManager& Manager::GetSystemManager() { Result Manager::GetWorkBufferSize(const AudioRendererParameterInternal& params, u64& out_count) const { if (!CheckValidRevision(params.revision)) { - return Service::Audio::ERR_INVALID_REVISION; + return Service::Audio::ResultInvalidRevision; } out_count = System::GetWorkBufferSize(params); diff --git a/src/audio_core/in/audio_in.cpp b/src/audio_core/in/audio_in.cpp index 91ccd5ad7..df8c44d1f 100644 --- a/src/audio_core/in/audio_in.cpp +++ b/src/audio_core/in/audio_in.cpp @@ -46,7 +46,7 @@ Result In::AppendBuffer(const AudioInBuffer& buffer, u64 tag) { if (system.AppendBuffer(buffer, tag)) { return ResultSuccess; } - return Service::Audio::ERR_BUFFER_COUNT_EXCEEDED; + return Service::Audio::ResultBufferCountReached; } void In::ReleaseAndRegisterBuffers() { diff --git a/src/audio_core/in/audio_in_system.cpp b/src/audio_core/in/audio_in_system.cpp index 934ef8c1c..e23e51758 100644 --- a/src/audio_core/in/audio_in_system.cpp +++ b/src/audio_core/in/audio_in_system.cpp @@ -45,11 +45,11 @@ Result System::IsConfigValid(const std::string_view device_name, const AudioInParameter& in_params) const { if ((device_name.size() > 0) && (device_name != GetDefaultDeviceName() && device_name != GetDefaultUacDeviceName())) { - return Service::Audio::ERR_INVALID_DEVICE_NAME; + return Service::Audio::ResultNotFound; } if (in_params.sample_rate != TargetSampleRate && in_params.sample_rate > 0) { - return Service::Audio::ERR_INVALID_SAMPLE_RATE; + return Service::Audio::ResultInvalidSampleRate; } return ResultSuccess; @@ -80,7 +80,7 @@ Result System::Initialize(std::string device_name, const AudioInParameter& in_pa Result System::Start() { if (state != State::Stopped) { - return Service::Audio::ERR_OPERATION_FAILED; + return Service::Audio::ResultOperationFailed; } session->Initialize(name, sample_format, channel_count, session_id, handle, diff --git a/src/audio_core/out/audio_out.cpp b/src/audio_core/out/audio_out.cpp index d3ee4f0eb..b7ea13405 100644 --- a/src/audio_core/out/audio_out.cpp +++ b/src/audio_core/out/audio_out.cpp @@ -46,7 +46,7 @@ Result Out::AppendBuffer(const AudioOutBuffer& buffer, const u64 tag) { if (system.AppendBuffer(buffer, tag)) { return ResultSuccess; } - return Service::Audio::ERR_BUFFER_COUNT_EXCEEDED; + return Service::Audio::ResultBufferCountReached; } void Out::ReleaseAndRegisterBuffers() { diff --git a/src/audio_core/out/audio_out_system.cpp b/src/audio_core/out/audio_out_system.cpp index e096a1dac..bd13f7219 100644 --- a/src/audio_core/out/audio_out_system.cpp +++ b/src/audio_core/out/audio_out_system.cpp @@ -33,11 +33,11 @@ std::string_view System::GetDefaultOutputDeviceName() const { Result System::IsConfigValid(std::string_view device_name, const AudioOutParameter& in_params) const { if ((device_name.size() > 0) && (device_name != GetDefaultOutputDeviceName())) { - return Service::Audio::ERR_INVALID_DEVICE_NAME; + return Service::Audio::ResultNotFound; } if (in_params.sample_rate != TargetSampleRate && in_params.sample_rate > 0) { - return Service::Audio::ERR_INVALID_SAMPLE_RATE; + return Service::Audio::ResultInvalidSampleRate; } if (in_params.channel_count == 0 || in_params.channel_count == 2 || @@ -45,7 +45,7 @@ Result System::IsConfigValid(std::string_view device_name, return ResultSuccess; } - return Service::Audio::ERR_INVALID_CHANNEL_COUNT; + return Service::Audio::ResultInvalidChannelCount; } Result System::Initialize(std::string device_name, const AudioOutParameter& in_params, u32 handle_, @@ -80,7 +80,7 @@ size_t System::GetSessionId() const { Result System::Start() { if (state != State::Stopped) { - return Service::Audio::ERR_OPERATION_FAILED; + return Service::Audio::ResultOperationFailed; } session->Initialize(name, sample_format, channel_count, session_id, handle, diff --git a/src/audio_core/renderer/audio_renderer.cpp b/src/audio_core/renderer/audio_renderer.cpp index 51aa17599..a8257eb2e 100644 --- a/src/audio_core/renderer/audio_renderer.cpp +++ b/src/audio_core/renderer/audio_renderer.cpp @@ -22,7 +22,7 @@ Result Renderer::Initialize(const AudioRendererParameterInternal& params, if (!manager.AddSystem(system)) { LOG_ERROR(Service_Audio, "Both Audio Render sessions are in use, cannot create any more"); - return Service::Audio::ERR_MAXIMUM_SESSIONS_REACHED; + return Service::Audio::ResultOutOfSessions; } system_registered = true; } diff --git a/src/audio_core/renderer/behavior/info_updater.cpp b/src/audio_core/renderer/behavior/info_updater.cpp index 574cf0982..e312eb166 100644 --- a/src/audio_core/renderer/behavior/info_updater.cpp +++ b/src/audio_core/renderer/behavior/info_updater.cpp @@ -48,7 +48,7 @@ Result InfoUpdater::UpdateVoiceChannelResources(VoiceContext& voice_context) { LOG_ERROR(Service_Audio, "Consumed an incorrect voice resource size, header size={}, consumed={}", in_header->voice_resources_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } input += consumed_input_size; @@ -123,7 +123,7 @@ Result InfoUpdater::UpdateVoices(VoiceContext& voice_context, if (consumed_input_size != in_header->voices_size) { LOG_ERROR(Service_Audio, "Consumed an incorrect voices size, header size={}, consumed={}", in_header->voices_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } out_header->voices_size = consumed_output_size; @@ -184,7 +184,7 @@ Result InfoUpdater::UpdateEffectsVersion1(EffectContext& effect_context, const b if (consumed_input_size != in_header->effects_size) { LOG_ERROR(Service_Audio, "Consumed an incorrect effects size, header size={}, consumed={}", in_header->effects_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } out_header->effects_size = consumed_output_size; @@ -239,7 +239,7 @@ Result InfoUpdater::UpdateEffectsVersion2(EffectContext& effect_context, const b if (consumed_input_size != in_header->effects_size) { LOG_ERROR(Service_Audio, "Consumed an incorrect effects size, header size={}, consumed={}", in_header->effects_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } out_header->effects_size = consumed_output_size; @@ -267,7 +267,7 @@ Result InfoUpdater::UpdateMixes(MixContext& mix_context, const u32 mix_buffer_co } if (mix_buffer_count == 0) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } std::span in_params{ @@ -281,13 +281,13 @@ Result InfoUpdater::UpdateMixes(MixContext& mix_context, const u32 mix_buffer_co total_buffer_count += params.buffer_count; if (params.dest_mix_id > static_cast(mix_context.GetCount()) && params.dest_mix_id != UnusedMixId && params.mix_id != FinalMixId) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } } } if (total_buffer_count > mix_buffer_count) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } bool mix_dirty{false}; @@ -317,7 +317,7 @@ Result InfoUpdater::UpdateMixes(MixContext& mix_context, const u32 mix_buffer_co if (mix_dirty) { if (behaviour.IsSplitterSupported() && splitter_context.UsingSplitter()) { if (!mix_context.TSortInfo(splitter_context)) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } } else { mix_context.SortInfo(); @@ -327,7 +327,7 @@ Result InfoUpdater::UpdateMixes(MixContext& mix_context, const u32 mix_buffer_co if (consumed_input_size != in_header->mix_size) { LOG_ERROR(Service_Audio, "Consumed an incorrect mixes size, header size={}, consumed={}", in_header->mix_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } input += mix_count * sizeof(MixInfo::InParameter); @@ -384,7 +384,7 @@ Result InfoUpdater::UpdateSinks(SinkContext& sink_context, std::spansinks_size) { LOG_ERROR(Service_Audio, "Consumed an incorrect sinks size, header size={}, consumed={}", in_header->sinks_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } input += consumed_input_size; @@ -411,7 +411,7 @@ Result InfoUpdater::UpdateMemoryPools(std::span memory_pools, state != MemoryPoolInfo::ResultState::MapFailed && state != MemoryPoolInfo::ResultState::InUse) { LOG_WARNING(Service_Audio, "Invalid ResultState from updating memory pools"); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } } @@ -423,7 +423,7 @@ Result InfoUpdater::UpdateMemoryPools(std::span memory_pools, LOG_ERROR(Service_Audio, "Consumed an incorrect memory pool size, header size={}, consumed={}", in_header->memory_pool_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } input += consumed_input_size; @@ -453,7 +453,7 @@ Result InfoUpdater::UpdatePerformanceBuffer(std::span performance_output, LOG_ERROR(Service_Audio, "Consumed an incorrect performance size, header size={}, consumed={}", in_header->performance_buffer_size, consumed_input_size); - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } input += consumed_input_size; @@ -467,18 +467,18 @@ Result InfoUpdater::UpdateBehaviorInfo(BehaviorInfo& behaviour_) { const auto in_params{reinterpret_cast(input)}; if (!CheckValidRevision(in_params->revision)) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } if (in_params->revision != behaviour_.GetUserRevision()) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } behaviour_.ClearError(); behaviour_.UpdateFlags(in_params->flags); if (in_header->behaviour_size != sizeof(BehaviorInfo::InParameter)) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } input += sizeof(BehaviorInfo::InParameter); @@ -500,7 +500,7 @@ Result InfoUpdater::UpdateErrorInfo(const BehaviorInfo& behaviour_) { Result InfoUpdater::UpdateSplitterInfo(SplitterContext& splitter_context) { u32 consumed_size{0}; if (!splitter_context.Update(input, consumed_size)) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } input += consumed_size; @@ -529,9 +529,9 @@ Result InfoUpdater::UpdateRendererInfo(const u64 elapsed_frames) { Result InfoUpdater::CheckConsumedSize() { if (CpuAddr(input) - CpuAddr(input_origin.data()) != expected_input_size) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } else if (CpuAddr(output) - CpuAddr(output_origin.data()) != expected_output_size) { - return Service::Audio::ERR_INVALID_UPDATE_DATA; + return Service::Audio::ResultInvalidUpdateInfo; } return ResultSuccess; } diff --git a/src/audio_core/renderer/memory/pool_mapper.cpp b/src/audio_core/renderer/memory/pool_mapper.cpp index 2baf2ce08..7fd2b5f47 100644 --- a/src/audio_core/renderer/memory/pool_mapper.cpp +++ b/src/audio_core/renderer/memory/pool_mapper.cpp @@ -92,7 +92,7 @@ bool PoolMapper::TryAttachBuffer(BehaviorInfo::ErrorInfo& error_info, AddressInf address_info.Setup(address, size); if (!FillDspAddr(address_info)) { - error_info.error_code = Service::Audio::ERR_POOL_MAPPING_FAILED; + error_info.error_code = Service::Audio::ResultInvalidAddressInfo; error_info.address = address; return force_map; } diff --git a/src/audio_core/renderer/system.cpp b/src/audio_core/renderer/system.cpp index 31cbee282..28f063641 100644 --- a/src/audio_core/renderer/system.cpp +++ b/src/audio_core/renderer/system.cpp @@ -101,15 +101,15 @@ Result System::Initialize(const AudioRendererParameterInternal& params, Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size, u32 process_handle_, u64 applet_resource_user_id_, s32 session_id_) { if (!CheckValidRevision(params.revision)) { - return Service::Audio::ERR_INVALID_REVISION; + return Service::Audio::ResultInvalidRevision; } if (GetWorkBufferSize(params) > transfer_memory_size) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } if (process_handle_ == 0) { - return Service::Audio::ERR_INVALID_PROCESS_HANDLE; + return Service::Audio::ResultInvalidHandle; } behavior.SetUserLibRevision(params.revision); @@ -143,19 +143,19 @@ Result System::Initialize(const AudioRendererParameterInternal& params, samples_workbuffer = allocator.Allocate((voice_channels + mix_buffer_count) * sample_count, 0x10); if (samples_workbuffer.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } auto upsampler_workbuffer{allocator.Allocate( (voice_channels + mix_buffer_count) * TargetSampleCount * upsampler_count, 0x10)}; if (upsampler_workbuffer.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } depop_buffer = allocator.Allocate(Common::AlignUp(static_cast(mix_buffer_count), 0x40), 0x40); if (depop_buffer.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } // invalidate samples_workbuffer DSP cache @@ -166,12 +166,12 @@ Result System::Initialize(const AudioRendererParameterInternal& params, } if (voice_infos.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } auto sorted_voice_infos{allocator.Allocate(params.voices, 0x10)}; if (sorted_voice_infos.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } std::memset(sorted_voice_infos.data(), 0, sorted_voice_infos.size_bytes()); @@ -183,12 +183,12 @@ Result System::Initialize(const AudioRendererParameterInternal& params, } if (voice_channel_resources.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } auto voice_cpu_states{allocator.Allocate(params.voices, 0x10)}; if (voice_cpu_states.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } for (auto& voice_state : voice_cpu_states) { @@ -198,7 +198,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, auto mix_infos{allocator.Allocate(params.sub_mixes + 1, 0x10)}; if (mix_infos.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } u32 effect_process_order_count{0}; @@ -208,7 +208,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, effect_process_order_count = params.effects * (params.sub_mixes + 1); effect_process_order_buffer = allocator.Allocate(effect_process_order_count, 0x10); if (effect_process_order_buffer.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } } @@ -222,7 +222,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, auto sorted_mix_infos{allocator.Allocate(params.sub_mixes + 1, 0x10)}; if (sorted_mix_infos.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } std::memset(sorted_mix_infos.data(), 0, sorted_mix_infos.size_bytes()); @@ -235,7 +235,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, auto edge_matrix_workbuffer{allocator.Allocate(edge_matrix_size, 1)}; if (node_states_workbuffer.empty() || edge_matrix_workbuffer.size() == 0) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } mix_context.Initialize(sorted_mix_infos, mix_infos, params.sub_mixes + 1, @@ -250,7 +250,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, upsampler_manager = allocator.Allocate(1, 0x10).data(); if (upsampler_manager == nullptr) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } memory_pool_workbuffer = allocator.Allocate(memory_pool_count, 0x10); @@ -259,18 +259,18 @@ Result System::Initialize(const AudioRendererParameterInternal& params, } if (memory_pool_workbuffer.empty() && memory_pool_count > 0) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } if (!splitter_context.Initialize(behavior, params, allocator)) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } std::span effect_result_states_cpu{}; if (behavior.IsEffectInfoVersion2Supported() && params.effects > 0) { effect_result_states_cpu = allocator.Allocate(params.effects, 0x10); if (effect_result_states_cpu.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } std::memset(effect_result_states_cpu.data(), 0, effect_result_states_cpu.size_bytes()); } @@ -289,7 +289,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, upsampler_workbuffer); if (upsampler_infos.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } auto effect_infos{allocator.Allocate(params.effects, 0x40)}; @@ -298,14 +298,14 @@ Result System::Initialize(const AudioRendererParameterInternal& params, } if (effect_infos.empty() && params.effects > 0) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } std::span effect_result_states_dsp{}; if (behavior.IsEffectInfoVersion2Supported() && params.effects > 0) { effect_result_states_dsp = allocator.Allocate(params.effects, 0x40); if (effect_result_states_dsp.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } std::memset(effect_result_states_dsp.data(), 0, effect_result_states_dsp.size_bytes()); } @@ -319,14 +319,14 @@ Result System::Initialize(const AudioRendererParameterInternal& params, } if (sinks.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } sink_context.Initialize(sinks, params.sinks); auto voice_dsp_states{allocator.Allocate(params.voices, 0x40)}; if (voice_dsp_states.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } for (auto& voice_state : voice_dsp_states) { @@ -344,7 +344,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, 0xC}; performance_workbuffer = allocator.Allocate(perf_workbuffer_size, 0x40); if (performance_workbuffer.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } std::memset(performance_workbuffer.data(), 0, performance_workbuffer.size_bytes()); performance_manager.Initialize(performance_workbuffer, performance_workbuffer.size_bytes(), @@ -360,7 +360,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, command_workbuffer_size = allocator.GetRemainingSize(); command_workbuffer = allocator.Allocate(command_workbuffer_size, 0x40); if (command_workbuffer.empty()) { - return Service::Audio::ERR_INSUFFICIENT_BUFFER_SIZE; + return Service::Audio::ResultInsufficientBuffer; } command_buffer_size = 0; diff --git a/src/audio_core/renderer/voice/voice_info.cpp b/src/audio_core/renderer/voice/voice_info.cpp index 1849eeb57..c0bfb23fc 100644 --- a/src/audio_core/renderer/voice/voice_info.cpp +++ b/src/audio_core/renderer/voice/voice_info.cpp @@ -181,7 +181,7 @@ void VoiceInfo::UpdateWaveBuffer(std::span error_info, if (wave_buffer_internal.start_offset * byte_size > wave_buffer_internal.size || wave_buffer_internal.end_offset * byte_size > wave_buffer_internal.size) { LOG_ERROR(Service_Audio, "Invalid PCM16 start/end wavebuffer sizes!"); - error_info[0].error_code = Service::Audio::ERR_INVALID_UPDATE_DATA; + error_info[0].error_code = Service::Audio::ResultInvalidUpdateInfo; error_info[0].address = wave_buffer_internal.address; return; } @@ -192,7 +192,7 @@ void VoiceInfo::UpdateWaveBuffer(std::span error_info, if (wave_buffer_internal.start_offset * byte_size > wave_buffer_internal.size || wave_buffer_internal.end_offset * byte_size > wave_buffer_internal.size) { LOG_ERROR(Service_Audio, "Invalid PCMFloat start/end wavebuffer sizes!"); - error_info[0].error_code = Service::Audio::ERR_INVALID_UPDATE_DATA; + error_info[0].error_code = Service::Audio::ResultInvalidUpdateInfo; error_info[0].address = wave_buffer_internal.address; return; } @@ -216,7 +216,7 @@ void VoiceInfo::UpdateWaveBuffer(std::span error_info, if (start > static_cast(wave_buffer_internal.size) || end > static_cast(wave_buffer_internal.size)) { LOG_ERROR(Service_Audio, "Invalid ADPCM start/end wavebuffer sizes!"); - error_info[0].error_code = Service::Audio::ERR_INVALID_UPDATE_DATA; + error_info[0].error_code = Service::Audio::ResultInvalidUpdateInfo; error_info[0].address = wave_buffer_internal.address; return; } @@ -228,7 +228,7 @@ void VoiceInfo::UpdateWaveBuffer(std::span error_info, if (wave_buffer_internal.start_offset < 0 || wave_buffer_internal.end_offset < 0) { LOG_ERROR(Service_Audio, "Invalid input start/end wavebuffer sizes!"); - error_info[0].error_code = Service::Audio::ERR_INVALID_UPDATE_DATA; + error_info[0].error_code = Service::Audio::ResultInvalidUpdateInfo; error_info[0].address = wave_buffer_internal.address; return; } diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 4a1a8bb43..75e0c4f38 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -454,7 +454,6 @@ add_library(core STATIC hle/service/filesystem/fsp_srv.h hle/service/fgm/fgm.cpp hle/service/fgm/fgm.h - hle/service/friend/errors.h hle/service/friend/friend.cpp hle/service/friend/friend.h hle/service/friend/friend_interface.cpp diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.h index 09bf2f1d0..549809000 100644 --- a/src/core/hle/kernel/k_process.h +++ b/src/core/hle/kernel/k_process.h @@ -310,10 +310,10 @@ public: /// Clears the signaled state of the process if and only if it's signaled. /// /// @pre The process must not be already terminated. If this is called on a - /// terminated process, then ERR_INVALID_STATE will be returned. + /// terminated process, then ResultInvalidState will be returned. /// /// @pre The process must be in a signaled state. If this is called on a - /// process instance that is not signaled, ERR_INVALID_STATE will be + /// process instance that is not signaled, ResultInvalidState will be /// returned. Result Reset(); diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index ddc3a6dbe..120282aa4 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -30,12 +30,6 @@ namespace Service::Account { -constexpr Result ERR_INVALID_USER_ID{ErrorModule::Account, 20}; -constexpr Result ERR_INVALID_APPLICATION_ID{ErrorModule::Account, 22}; -constexpr Result ERR_INVALID_BUFFER{ErrorModule::Account, 30}; -constexpr Result ERR_INVALID_BUFFER_SIZE{ErrorModule::Account, 31}; -constexpr Result ERR_FAILED_SAVE_DATA{ErrorModule::Account, 100}; - // Thumbnails are hard coded to be at least this size constexpr std::size_t THUMBNAIL_SIZE = 0x24000; @@ -384,7 +378,7 @@ protected: if (user_data.size() < sizeof(UserData)) { LOG_ERROR(Service_ACC, "UserData buffer too small!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_INVALID_BUFFER); + rb.Push(Account::ResultInvalidArrayLength); return; } @@ -394,7 +388,7 @@ protected: if (!profile_manager.SetProfileBaseAndData(user_id, base, data)) { LOG_ERROR(Service_ACC, "Failed to update user data and base!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_FAILED_SAVE_DATA); + rb.Push(Account::ResultAccountUpdateFailed); return; } @@ -417,7 +411,7 @@ protected: if (user_data.size() < sizeof(UserData)) { LOG_ERROR(Service_ACC, "UserData buffer too small!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_INVALID_BUFFER); + rb.Push(Account::ResultInvalidArrayLength); return; } @@ -432,7 +426,7 @@ protected: !profile_manager.SetProfileBaseAndData(user_id, base, data)) { LOG_ERROR(Service_ACC, "Failed to update profile data, base, and image!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_FAILED_SAVE_DATA); + rb.Push(Account::ResultAccountUpdateFailed); return; } @@ -764,7 +758,7 @@ void Module::Interface::InitializeApplicationInfoRestricted(HLERequestContext& c Result Module::Interface::InitializeApplicationInfoBase() { if (application_info) { LOG_ERROR(Service_ACC, "Application already initialized"); - return ERR_ACCOUNTINFO_ALREADY_INITIALIZED; + return Account::ResultApplicationInfoAlreadyInitialized; } // TODO(ogniK): This should be changed to reflect the target process for when we have multiple @@ -775,7 +769,7 @@ Result Module::Interface::InitializeApplicationInfoBase() { if (launch_property.Failed()) { LOG_ERROR(Service_ACC, "Failed to get launch property"); - return ERR_ACCOUNTINFO_BAD_APPLICATION; + return Account::ResultInvalidApplication; } switch (launch_property->base_game_storage_id) { @@ -791,7 +785,7 @@ Result Module::Interface::InitializeApplicationInfoBase() { default: LOG_ERROR(Service_ACC, "Invalid game storage ID! storage_id={}", launch_property->base_game_storage_id); - return ERR_ACCOUNTINFO_BAD_APPLICATION; + return Account::ResultInvalidApplication; } LOG_WARNING(Service_ACC, "ApplicationInfo init required"); @@ -899,20 +893,20 @@ void Module::Interface::StoreSaveDataThumbnail(HLERequestContext& ctx, const Com if (tid == 0) { LOG_ERROR(Service_ACC, "TitleID is not valid!"); - rb.Push(ERR_INVALID_APPLICATION_ID); + rb.Push(Account::ResultInvalidApplication); return; } if (uuid.IsInvalid()) { LOG_ERROR(Service_ACC, "User ID is not valid!"); - rb.Push(ERR_INVALID_USER_ID); + rb.Push(Account::ResultInvalidUserId); return; } const auto thumbnail_size = ctx.GetReadBufferSize(); if (thumbnail_size != THUMBNAIL_SIZE) { LOG_ERROR(Service_ACC, "Buffer size is empty! size={:X} expecting {:X}", thumbnail_size, THUMBNAIL_SIZE); - rb.Push(ERR_INVALID_BUFFER_SIZE); + rb.Push(Account::ResultInvalidArrayLength); return; } diff --git a/src/core/hle/service/acc/errors.h b/src/core/hle/service/acc/errors.h index e9c16b951..433ebfe9d 100644 --- a/src/core/hle/service/acc/errors.h +++ b/src/core/hle/service/acc/errors.h @@ -7,7 +7,13 @@ namespace Service::Account { -constexpr Result ERR_ACCOUNTINFO_BAD_APPLICATION{ErrorModule::Account, 22}; -constexpr Result ERR_ACCOUNTINFO_ALREADY_INITIALIZED{ErrorModule::Account, 41}; +constexpr Result ResultCancelledByUser{ErrorModule::Account, 1}; +constexpr Result ResultNoNotifications{ErrorModule::Account, 15}; +constexpr Result ResultInvalidUserId{ErrorModule::Account, 20}; +constexpr Result ResultInvalidApplication{ErrorModule::Account, 22}; +constexpr Result ResultNullptr{ErrorModule::Account, 30}; +constexpr Result ResultInvalidArrayLength{ErrorModule::Account, 32}; +constexpr Result ResultApplicationInfoAlreadyInitialized{ErrorModule::Account, 41}; +constexpr Result ResultAccountUpdateFailed{ErrorModule::Account, 100}; } // namespace Service::Account diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index f74c7b550..f17df5124 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -39,9 +39,9 @@ namespace Service::AM { -constexpr Result ERR_NO_DATA_IN_CHANNEL{ErrorModule::AM, 2}; -constexpr Result ERR_NO_MESSAGES{ErrorModule::AM, 3}; -constexpr Result ERR_SIZE_OUT_OF_BOUNDS{ErrorModule::AM, 503}; +constexpr Result ResultNoDataInChannel{ErrorModule::AM, 2}; +constexpr Result ResultNoMessages{ErrorModule::AM, 3}; +constexpr Result ResultInvalidOffset{ErrorModule::AM, 503}; enum class LaunchParameterKind : u32 { ApplicationSpecific = 1, @@ -758,7 +758,7 @@ void ICommonStateGetter::ReceiveMessage(HLERequestContext& ctx) { if (message == AppletMessageQueue::AppletMessage::None) { LOG_ERROR(Service_AM, "Message queue is empty"); - rb.Push(ERR_NO_MESSAGES); + rb.Push(AM::ResultNoMessages); rb.PushEnum(message); return; } @@ -1028,7 +1028,7 @@ private: LOG_DEBUG(Service_AM, "storage is a nullptr. There is no data in the current normal channel"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_NO_DATA_IN_CHANNEL); + rb.Push(AM::ResultNoDataInChannel); return; } @@ -1059,7 +1059,7 @@ private: LOG_DEBUG(Service_AM, "storage is a nullptr. There is no data in the current interactive channel"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_NO_DATA_IN_CHANNEL); + rb.Push(AM::ResultNoDataInChannel); return; } @@ -1138,7 +1138,7 @@ void IStorageAccessor::Write(HLERequestContext& ctx) { backing.GetSize(), size, offset); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_SIZE_OUT_OF_BOUNDS); + rb.Push(AM::ResultInvalidOffset); return; } @@ -1161,7 +1161,7 @@ void IStorageAccessor::Read(HLERequestContext& ctx) { backing.GetSize(), size, offset); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_SIZE_OUT_OF_BOUNDS); + rb.Push(AM::ResultInvalidOffset); return; } @@ -1502,7 +1502,7 @@ void IApplicationFunctions::PopLaunchParameter(HLERequestContext& ctx) { LOG_ERROR(Service_AM, "Attempted to load launch parameter but none was found!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_NO_DATA_IN_CHANNEL); + rb.Push(AM::ResultNoDataInChannel); } void IApplicationFunctions::CreateApplicationAndRequestToStartForQuest(HLERequestContext& ctx) { @@ -1799,7 +1799,7 @@ void IApplicationFunctions::TryPopFromFriendInvitationStorageChannel(HLERequestC LOG_WARNING(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_NO_DATA_IN_CHANNEL); + rb.Push(AM::ResultNoDataInChannel); } void IApplicationFunctions::GetNotificationStorageChannelEvent(HLERequestContext& ctx) { diff --git a/src/core/hle/service/am/applets/applet_controller.cpp b/src/core/hle/service/am/applets/applet_controller.cpp index b418031de..58484519b 100644 --- a/src/core/hle/service/am/applets/applet_controller.cpp +++ b/src/core/hle/service/am/applets/applet_controller.cpp @@ -19,10 +19,9 @@ namespace Service::AM::Applets { -// This error code (0x183ACA) is thrown when the applet fails to initialize. -[[maybe_unused]] constexpr Result ERR_CONTROLLER_APPLET_3101{ErrorModule::HID, 3101}; -// This error code (0x183CCA) is thrown when the u32 result in ControllerSupportResultInfo is 2. -[[maybe_unused]] constexpr Result ERR_CONTROLLER_APPLET_3102{ErrorModule::HID, 3102}; +[[maybe_unused]] constexpr Result ResultControllerSupportCanceled{ErrorModule::HID, 3101}; +[[maybe_unused]] constexpr Result ResultControllerSupportNotSupportedNpadStyle{ErrorModule::HID, + 3102}; static Core::Frontend::ControllerParameters ConvertToFrontendParameters( ControllerSupportArgPrivate private_arg, ControllerSupportArgHeader header, bool enable_text, diff --git a/src/core/hle/service/am/applets/applet_profile_select.cpp b/src/core/hle/service/am/applets/applet_profile_select.cpp index c738db028..1d69f5447 100644 --- a/src/core/hle/service/am/applets/applet_profile_select.cpp +++ b/src/core/hle/service/am/applets/applet_profile_select.cpp @@ -7,13 +7,12 @@ #include "common/string_util.h" #include "core/core.h" #include "core/frontend/applets/profile_select.h" +#include "core/hle/service/acc/errors.h" #include "core/hle/service/am/am.h" #include "core/hle/service/am/applets/applet_profile_select.h" namespace Service::AM::Applets { -constexpr Result ERR_USER_CANCELLED_SELECTION{ErrorModule::Account, 1}; - ProfileSelect::ProfileSelect(Core::System& system_, LibraryAppletMode applet_mode_, const Core::Frontend::ProfileSelectApplet& frontend_) : Applet{system_, applet_mode_}, frontend{frontend_}, system{system_} {} @@ -63,8 +62,8 @@ void ProfileSelect::SelectionComplete(std::optional uuid) { output.result = 0; output.uuid_selected = *uuid; } else { - status = ERR_USER_CANCELLED_SELECTION; - output.result = ERR_USER_CANCELLED_SELECTION.raw; + status = Account::ResultCancelledByUser; + output.result = Account::ResultCancelledByUser.raw; output.uuid_selected = Common::InvalidUUID; } diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index 0a6830ffa..7086d4750 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp @@ -170,7 +170,7 @@ private: if (impl->GetSystem().GetExecutionMode() == AudioCore::ExecutionMode::Manual) { IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_NOT_SUPPORTED); + rb.Push(Audio::ResultNotSupported); return; } @@ -448,7 +448,7 @@ void AudRenU::OpenAudioRenderer(HLERequestContext& ctx) { if (impl->GetSessionCount() + 1 > AudioCore::MaxRendererSessions) { LOG_ERROR(Service_Audio, "Too many AudioRenderer sessions open!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_MAXIMUM_SESSIONS_REACHED); + rb.Push(Audio::ResultOutOfSessions); return; } @@ -461,7 +461,7 @@ void AudRenU::OpenAudioRenderer(HLERequestContext& ctx) { if (session_id == -1) { LOG_ERROR(Service_Audio, "Tried to open a session that's already in use!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_MAXIMUM_SESSIONS_REACHED); + rb.Push(Audio::ResultOutOfSessions); return; } diff --git a/src/core/hle/service/audio/errors.h b/src/core/hle/service/audio/errors.h index d706978cb..3d3d3d97a 100644 --- a/src/core/hle/service/audio/errors.h +++ b/src/core/hle/service/audio/errors.h @@ -7,17 +7,17 @@ namespace Service::Audio { -constexpr Result ERR_INVALID_DEVICE_NAME{ErrorModule::Audio, 1}; -constexpr Result ERR_OPERATION_FAILED{ErrorModule::Audio, 2}; -constexpr Result ERR_INVALID_SAMPLE_RATE{ErrorModule::Audio, 3}; -constexpr Result ERR_INSUFFICIENT_BUFFER_SIZE{ErrorModule::Audio, 4}; -constexpr Result ERR_MAXIMUM_SESSIONS_REACHED{ErrorModule::Audio, 5}; -constexpr Result ERR_BUFFER_COUNT_EXCEEDED{ErrorModule::Audio, 8}; -constexpr Result ERR_INVALID_CHANNEL_COUNT{ErrorModule::Audio, 10}; -constexpr Result ERR_INVALID_UPDATE_DATA{ErrorModule::Audio, 41}; -constexpr Result ERR_POOL_MAPPING_FAILED{ErrorModule::Audio, 42}; -constexpr Result ERR_NOT_SUPPORTED{ErrorModule::Audio, 513}; -constexpr Result ERR_INVALID_PROCESS_HANDLE{ErrorModule::Audio, 1536}; -constexpr Result ERR_INVALID_REVISION{ErrorModule::Audio, 1537}; +constexpr Result ResultNotFound{ErrorModule::Audio, 1}; +constexpr Result ResultOperationFailed{ErrorModule::Audio, 2}; +constexpr Result ResultInvalidSampleRate{ErrorModule::Audio, 3}; +constexpr Result ResultInsufficientBuffer{ErrorModule::Audio, 4}; +constexpr Result ResultOutOfSessions{ErrorModule::Audio, 5}; +constexpr Result ResultBufferCountReached{ErrorModule::Audio, 8}; +constexpr Result ResultInvalidChannelCount{ErrorModule::Audio, 10}; +constexpr Result ResultInvalidUpdateInfo{ErrorModule::Audio, 41}; +constexpr Result ResultInvalidAddressInfo{ErrorModule::Audio, 42}; +constexpr Result ResultNotSupported{ErrorModule::Audio, 513}; +constexpr Result ResultInvalidHandle{ErrorModule::Audio, 1536}; +constexpr Result ResultInvalidRevision{ErrorModule::Audio, 1537}; } // namespace Service::Audio diff --git a/src/core/hle/service/friend/errors.h b/src/core/hle/service/friend/errors.h deleted file mode 100644 index ff525d865..000000000 --- a/src/core/hle/service/friend/errors.h +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "core/hle/result.h" - -namespace Service::Friend { - -constexpr Result ERR_NO_NOTIFICATIONS{ErrorModule::Account, 15}; -} diff --git a/src/core/hle/service/friend/friend.cpp b/src/core/hle/service/friend/friend.cpp index 447deab8b..9d05f9801 100644 --- a/src/core/hle/service/friend/friend.cpp +++ b/src/core/hle/service/friend/friend.cpp @@ -6,7 +6,7 @@ #include "common/uuid.h" #include "core/core.h" #include "core/hle/kernel/k_event.h" -#include "core/hle/service/friend/errors.h" +#include "core/hle/service/acc/errors.h" #include "core/hle/service/friend/friend.h" #include "core/hle/service/friend/friend_interface.h" #include "core/hle/service/ipc_helpers.h" @@ -259,7 +259,7 @@ private: if (notifications.empty()) { LOG_ERROR(Service_Friend, "No notifications in queue!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_NO_NOTIFICATIONS); + rb.Push(Account::ResultNoNotifications); return; } diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp index 9db136bac..929dcca0d 100644 --- a/src/core/hle/service/glue/arp.cpp +++ b/src/core/hle/service/glue/arp.cpp @@ -61,7 +61,7 @@ void ARP_R::GetApplicationLaunchProperty(HLERequestContext& ctx) { if (!title_id.has_value()) { LOG_ERROR(Service_ARP, "Failed to get title ID for process ID!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_NOT_REGISTERED); + rb.Push(Glue::ResultProcessIdNotRegistered); return; } @@ -109,7 +109,7 @@ void ARP_R::GetApplicationControlProperty(HLERequestContext& ctx) { if (!title_id.has_value()) { LOG_ERROR(Service_ARP, "Failed to get title ID for process ID!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_NOT_REGISTERED); + rb.Push(Glue::ResultProcessIdNotRegistered); return; } @@ -178,7 +178,7 @@ private: if (process_id == 0) { LOG_ERROR(Service_ARP, "Must have non-zero process ID!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_INVALID_PROCESS_ID); + rb.Push(Glue::ResultInvalidProcessId); return; } @@ -186,7 +186,7 @@ private: LOG_ERROR(Service_ARP, "Attempted to issue registrar, but registrar is already issued!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_INVALID_ACCESS); + rb.Push(Glue::ResultAlreadyBound); return; } @@ -205,7 +205,7 @@ private: Service_ARP, "Attempted to set application launch property, but registrar is already issued!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_INVALID_ACCESS); + rb.Push(Glue::ResultAlreadyBound); return; } @@ -224,7 +224,7 @@ private: Service_ARP, "Attempted to set application control property, but registrar is already issued!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_INVALID_ACCESS); + rb.Push(Glue::ResultAlreadyBound); return; } @@ -263,7 +263,7 @@ void ARP_W::AcquireRegistrar(HLERequestContext& ctx) { system, [this](u64 process_id, ApplicationLaunchProperty launch, std::vector control) { const auto res = GetTitleIDForProcessID(system, process_id); if (!res.has_value()) { - return ERR_NOT_REGISTERED; + return Glue::ResultProcessIdNotRegistered; } return manager.Register(*res, launch, std::move(control)); @@ -283,7 +283,7 @@ void ARP_W::UnregisterApplicationInstance(HLERequestContext& ctx) { if (process_id == 0) { LOG_ERROR(Service_ARP, "Must have non-zero process ID!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_INVALID_PROCESS_ID); + rb.Push(Glue::ResultInvalidProcessId); return; } @@ -292,7 +292,7 @@ void ARP_W::UnregisterApplicationInstance(HLERequestContext& ctx) { if (!title_id.has_value()) { LOG_ERROR(Service_ARP, "No title ID for process ID!"); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_NOT_REGISTERED); + rb.Push(Glue::ResultProcessIdNotRegistered); return; } diff --git a/src/core/hle/service/glue/errors.h b/src/core/hle/service/glue/errors.h index d4ce7f44e..30feaa5c0 100644 --- a/src/core/hle/service/glue/errors.h +++ b/src/core/hle/service/glue/errors.h @@ -7,9 +7,8 @@ namespace Service::Glue { -constexpr Result ERR_INVALID_RESOURCE{ErrorModule::ARP, 30}; -constexpr Result ERR_INVALID_PROCESS_ID{ErrorModule::ARP, 31}; -constexpr Result ERR_INVALID_ACCESS{ErrorModule::ARP, 42}; -constexpr Result ERR_NOT_REGISTERED{ErrorModule::ARP, 102}; +constexpr Result ResultInvalidProcessId{ErrorModule::ARP, 31}; +constexpr Result ResultAlreadyBound{ErrorModule::ARP, 42}; +constexpr Result ResultProcessIdNotRegistered{ErrorModule::ARP, 102}; } // namespace Service::Glue diff --git a/src/core/hle/service/glue/glue_manager.cpp b/src/core/hle/service/glue/glue_manager.cpp index 8a654cdca..4bf67921b 100644 --- a/src/core/hle/service/glue/glue_manager.cpp +++ b/src/core/hle/service/glue/glue_manager.cpp @@ -17,12 +17,12 @@ ARPManager::~ARPManager() = default; ResultVal ARPManager::GetLaunchProperty(u64 title_id) const { if (title_id == 0) { - return ERR_INVALID_PROCESS_ID; + return Glue::ResultInvalidProcessId; } const auto iter = entries.find(title_id); if (iter == entries.end()) { - return ERR_NOT_REGISTERED; + return Glue::ResultProcessIdNotRegistered; } return iter->second.launch; @@ -30,12 +30,12 @@ ResultVal ARPManager::GetLaunchProperty(u64 title_id) ResultVal> ARPManager::GetControlProperty(u64 title_id) const { if (title_id == 0) { - return ERR_INVALID_PROCESS_ID; + return Glue::ResultInvalidProcessId; } const auto iter = entries.find(title_id); if (iter == entries.end()) { - return ERR_NOT_REGISTERED; + return Glue::ResultProcessIdNotRegistered; } return iter->second.control; @@ -44,12 +44,12 @@ ResultVal> ARPManager::GetControlProperty(u64 title_id) const { Result ARPManager::Register(u64 title_id, ApplicationLaunchProperty launch, std::vector control) { if (title_id == 0) { - return ERR_INVALID_PROCESS_ID; + return Glue::ResultInvalidProcessId; } const auto iter = entries.find(title_id); if (iter != entries.end()) { - return ERR_INVALID_ACCESS; + return Glue::ResultAlreadyBound; } entries.insert_or_assign(title_id, MapEntry{launch, std::move(control)}); @@ -58,12 +58,12 @@ Result ARPManager::Register(u64 title_id, ApplicationLaunchProperty launch, Result ARPManager::Unregister(u64 title_id) { if (title_id == 0) { - return ERR_INVALID_PROCESS_ID; + return Glue::ResultInvalidProcessId; } const auto iter = entries.find(title_id); if (iter == entries.end()) { - return ERR_NOT_REGISTERED; + return Glue::ResultProcessIdNotRegistered; } entries.erase(iter); diff --git a/src/core/hle/service/glue/glue_manager.h b/src/core/hle/service/glue/glue_manager.h index cd0b092ac..1cf53d9d9 100644 --- a/src/core/hle/service/glue/glue_manager.h +++ b/src/core/hle/service/glue/glue_manager.h @@ -30,23 +30,23 @@ public: ~ARPManager(); // Returns the ApplicationLaunchProperty corresponding to the provided title ID if it was - // previously registered, otherwise ERR_NOT_REGISTERED if it was never registered or - // ERR_INVALID_PROCESS_ID if the title ID is 0. + // previously registered, otherwise ResultProcessIdNotRegistered if it was never registered or + // ResultInvalidProcessId if the title ID is 0. ResultVal GetLaunchProperty(u64 title_id) const; // Returns a vector of the raw bytes of NACP data (necessarily 0x4000 in size) corresponding to - // the provided title ID if it was previously registered, otherwise ERR_NOT_REGISTERED if it was - // never registered or ERR_INVALID_PROCESS_ID if the title ID is 0. + // the provided title ID if it was previously registered, otherwise ResultProcessIdNotRegistered + // if it was never registered or ResultInvalidProcessId if the title ID is 0. ResultVal> GetControlProperty(u64 title_id) const; // Adds a new entry to the internal database with the provided parameters, returning - // ERR_INVALID_ACCESS if attempting to re-register a title ID without an intermediate Unregister - // step, and ERR_INVALID_PROCESS_ID if the title ID is 0. + // ResultProcessIdNotRegistered if attempting to re-register a title ID without an intermediate + // Unregister step, and ResultInvalidProcessId if the title ID is 0. Result Register(u64 title_id, ApplicationLaunchProperty launch, std::vector control); // Removes the registration for the provided title ID from the database, returning - // ERR_NOT_REGISTERED if it doesn't exist in the database and ERR_INVALID_PROCESS_ID if the - // title ID is 0. + // ResultProcessIdNotRegistered if it doesn't exist in the database and ResultInvalidProcessId + // if the title ID is 0. Result Unregister(u64 title_id); // Removes all entries from the database, always succeeds. Should only be used when resetting diff --git a/src/core/hle/service/ipc_helpers.h b/src/core/hle/service/ipc_helpers.h index 3e67123c7..8703b57ca 100644 --- a/src/core/hle/service/ipc_helpers.h +++ b/src/core/hle/service/ipc_helpers.h @@ -19,7 +19,7 @@ namespace IPC { -constexpr Result ERR_REMOTE_PROCESS_DEAD{ErrorModule::HIPC, 301}; +constexpr Result ResultSessionClosed{ErrorModule::HIPC, 301}; class RequestHelperBase { protected: diff --git a/src/core/hle/service/ns/errors.h b/src/core/hle/service/ns/errors.h index 8a7621798..16d2ea6f7 100644 --- a/src/core/hle/service/ns/errors.h +++ b/src/core/hle/service/ns/errors.h @@ -7,5 +7,6 @@ namespace Service::NS { -constexpr Result ERR_APPLICATION_LANGUAGE_NOT_FOUND{ErrorModule::NS, 300}; -} \ No newline at end of file +constexpr Result ResultApplicationLanguageNotFound{ErrorModule::NS, 300}; + +} diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cpp index d6f0faea2..376067a95 100644 --- a/src/core/hle/service/ns/ns.cpp +++ b/src/core/hle/service/ns/ns.cpp @@ -416,14 +416,14 @@ ResultVal IApplicationManagerInterface::GetApplicationDesiredLanguage( if (application_language == std::nullopt) { LOG_ERROR(Service_NS, "Could not convert application language! language_code={}", language_code); - return ERR_APPLICATION_LANGUAGE_NOT_FOUND; + return Service::NS::ResultApplicationLanguageNotFound; } const auto priority_list = GetApplicationLanguagePriorityList(*application_language); if (!priority_list) { LOG_ERROR(Service_NS, "Could not find application language priorities! application_language={}", *application_language); - return ERR_APPLICATION_LANGUAGE_NOT_FOUND; + return Service::NS::ResultApplicationLanguageNotFound; } // Try to find a valid language. @@ -436,7 +436,7 @@ ResultVal IApplicationManagerInterface::GetApplicationDesiredLanguage( LOG_ERROR(Service_NS, "Could not find a valid language! supported_languages={:08X}", supported_languages); - return ERR_APPLICATION_LANGUAGE_NOT_FOUND; + return Service::NS::ResultApplicationLanguageNotFound; } void IApplicationManagerInterface::ConvertApplicationLanguageToLanguageCode( @@ -461,7 +461,7 @@ ResultVal IApplicationManagerInterface::ConvertApplicationLanguageToLanguag ConvertToLanguageCode(static_cast(application_language)); if (language_code == std::nullopt) { LOG_ERROR(Service_NS, "Language not found! application_language={}", application_language); - return ERR_APPLICATION_LANGUAGE_NOT_FOUND; + return Service::NS::ResultApplicationLanguageNotFound; } return static_cast(*language_code); diff --git a/src/core/hle/service/server_manager.cpp b/src/core/hle/service/server_manager.cpp index c91f6d880..bd04cd023 100644 --- a/src/core/hle/service/server_manager.cpp +++ b/src/core/hle/service/server_manager.cpp @@ -404,7 +404,7 @@ Result ServerManager::CompleteSyncRequest(RequestState&& request) { rc = request.session->SendReplyHLE(); // If the session has been closed, we're done. - if (rc == Kernel::ResultSessionClosed || service_rc == IPC::ERR_REMOTE_PROCESS_DEAD) { + if (rc == Kernel::ResultSessionClosed || service_rc == IPC::ResultSessionClosed) { // Close the session. request.session->Close(); diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index eed615377..69cdb5918 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -176,7 +176,7 @@ Result ServiceFrameworkBase::HandleSyncRequest(Kernel::KServerSession& session, case IPC::CommandType::TIPC_Close: { IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); - result = IPC::ERR_REMOTE_PROCESS_DEAD; + result = IPC::ResultSessionClosed; break; } case IPC::CommandType::ControlWithContext: diff --git a/src/core/hle/service/set/set.cpp b/src/core/hle/service/set/set.cpp index 88df52331..f5788b481 100644 --- a/src/core/hle/service/set/set.cpp +++ b/src/core/hle/service/set/set.cpp @@ -74,7 +74,7 @@ constexpr std::array, 18> language_to_la constexpr std::size_t PRE_4_0_0_MAX_ENTRIES = 0xF; constexpr std::size_t POST_4_0_0_MAX_ENTRIES = 0x40; -constexpr Result ERR_INVALID_LANGUAGE{ErrorModule::Settings, 625}; +constexpr Result ResultInvalidLanguage{ErrorModule::Settings, 625}; void PushResponseLanguageCode(HLERequestContext& ctx, std::size_t num_language_codes) { IPC::ResponseBuilder rb{ctx, 3}; @@ -130,7 +130,7 @@ void SET::MakeLanguageCode(HLERequestContext& ctx) { if (index >= available_language_codes.size()) { LOG_ERROR(Service_SET, "Invalid language code index! index={}", index); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ERR_INVALID_LANGUAGE); + rb.Push(Set::ResultInvalidLanguage); return; } diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index a46f47d3e..b4046d3ce 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -18,10 +18,10 @@ namespace Service::SM { -constexpr Result ERR_NOT_INITIALIZED(ErrorModule::SM, 2); -constexpr Result ERR_ALREADY_REGISTERED(ErrorModule::SM, 4); -constexpr Result ERR_INVALID_NAME(ErrorModule::SM, 6); -constexpr Result ERR_SERVICE_NOT_REGISTERED(ErrorModule::SM, 7); +constexpr Result ResultInvalidClient(ErrorModule::SM, 2); +constexpr Result ResultAlreadyRegistered(ErrorModule::SM, 4); +constexpr Result ResultInvalidServiceName(ErrorModule::SM, 6); +constexpr Result ResultNotRegistered(ErrorModule::SM, 7); ServiceManager::ServiceManager(Kernel::KernelCore& kernel_) : kernel{kernel_} { controller_interface = std::make_unique(kernel.System()); @@ -45,7 +45,7 @@ void ServiceManager::InvokeControlRequest(HLERequestContext& context) { static Result ValidateServiceName(const std::string& name) { if (name.empty() || name.size() > 8) { LOG_ERROR(Service_SM, "Invalid service name! service={}", name); - return ERR_INVALID_NAME; + return Service::SM::ResultInvalidServiceName; } return ResultSuccess; } @@ -58,7 +58,7 @@ Result ServiceManager::RegisterService(std::string name, u32 max_sessions, std::scoped_lock lk{lock}; if (registered_services.find(name) != registered_services.end()) { LOG_ERROR(Service_SM, "Service is already registered! service={}", name); - return ERR_ALREADY_REGISTERED; + return Service::SM::ResultAlreadyRegistered; } auto* port = Kernel::KPort::Create(kernel); @@ -80,7 +80,7 @@ Result ServiceManager::UnregisterService(const std::string& name) { const auto iter = registered_services.find(name); if (iter == registered_services.end()) { LOG_ERROR(Service_SM, "Server is not registered! service={}", name); - return ERR_SERVICE_NOT_REGISTERED; + return Service::SM::ResultNotRegistered; } registered_services.erase(iter); @@ -96,7 +96,7 @@ ResultVal ServiceManager::GetServicePort(const std::string& name auto it = service_ports.find(name); if (it == service_ports.end()) { LOG_WARNING(Service_SM, "Server is not registered! service={}", name); - return ERR_SERVICE_NOT_REGISTERED; + return Service::SM::ResultNotRegistered; } return it->second; @@ -160,7 +160,7 @@ static std::string PopServiceName(IPC::RequestParser& rp) { ResultVal SM::GetServiceImpl(HLERequestContext& ctx) { if (!ctx.GetManager()->GetIsInitializedForSm()) { - return ERR_NOT_INITIALIZED; + return Service::SM::ResultInvalidClient; } IPC::RequestParser rp{ctx}; @@ -168,15 +168,15 @@ ResultVal SM::GetServiceImpl(HLERequestContext& ctx) { // Find the named port. auto port_result = service_manager.GetServicePort(name); - if (port_result.Code() == ERR_INVALID_NAME) { + if (port_result.Code() == Service::SM::ResultInvalidServiceName) { LOG_ERROR(Service_SM, "Invalid service name '{}'", name); - return ERR_INVALID_NAME; + return Service::SM::ResultInvalidServiceName; } if (port_result.Failed()) { LOG_INFO(Service_SM, "Waiting for service {} to become available", name); ctx.SetIsDeferred(); - return ERR_SERVICE_NOT_REGISTERED; + return Service::SM::ResultNotRegistered; } auto& port = port_result.Unwrap(); From 6b9cc0ed23b15a1b96b322b03feff2153e44a4a9 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Mon, 6 Mar 2023 21:16:17 -0500 Subject: [PATCH 0138/1181] Refactor AccelerateDMA code --- .../renderer_opengl/gl_texture_cache.cpp | 24 +- .../renderer_opengl/gl_texture_cache.h | 6 + .../renderer_vulkan/vk_rasterizer.cpp | 246 +++--------------- .../renderer_vulkan/vk_rasterizer.h | 5 + .../renderer_vulkan/vk_texture_cache.cpp | 22 +- .../renderer_vulkan/vk_texture_cache.h | 6 + src/video_core/texture_cache/texture_cache.h | 86 ++++-- .../texture_cache/texture_cache_base.h | 10 +- 8 files changed, 155 insertions(+), 250 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index b047e7b3d..4b13e807d 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -762,14 +762,14 @@ Image::Image(const VideoCommon::NullImageParams& params) : VideoCommon::ImageBas Image::~Image() = default; -void Image::UploadMemory(const ImageBufferMap& map, +void Image::UploadMemory(GLuint buffer_handle, size_t buffer_offset, std::span copies) { const bool is_rescaled = True(flags & ImageFlagBits::Rescaled); if (is_rescaled) { ScaleDown(true); } - glBindBuffer(GL_PIXEL_UNPACK_BUFFER, map.buffer); - glFlushMappedBufferRange(GL_PIXEL_UNPACK_BUFFER, map.offset, unswizzled_size_bytes); + glBindBuffer(GL_PIXEL_UNPACK_BUFFER, buffer_handle); + glFlushMappedBufferRange(GL_PIXEL_UNPACK_BUFFER, buffer_offset, unswizzled_size_bytes); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); @@ -788,21 +788,26 @@ void Image::UploadMemory(const ImageBufferMap& map, current_image_height = copy.buffer_image_height; glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, current_image_height); } - CopyBufferToImage(copy, map.offset); + CopyBufferToImage(copy, buffer_offset); } if (is_rescaled) { ScaleUp(); } } -void Image::DownloadMemory(ImageBufferMap& map, +void Image::UploadMemory(const ImageBufferMap& map, + std::span copies) { + UploadMemory(map.buffer, map.offset, copies); +} + +void Image::DownloadMemory(GLuint buffer_handle, size_t buffer_offset, std::span copies) { const bool is_rescaled = True(flags & ImageFlagBits::Rescaled); if (is_rescaled) { ScaleDown(); } glMemoryBarrier(GL_PIXEL_BUFFER_BARRIER_BIT); // TODO: Move this to its own API - glBindBuffer(GL_PIXEL_PACK_BUFFER, map.buffer); + glBindBuffer(GL_PIXEL_PACK_BUFFER, buffer_handle); glPixelStorei(GL_PACK_ALIGNMENT, 1); u32 current_row_length = std::numeric_limits::max(); @@ -820,13 +825,18 @@ void Image::DownloadMemory(ImageBufferMap& map, current_image_height = copy.buffer_image_height; glPixelStorei(GL_PACK_IMAGE_HEIGHT, current_image_height); } - CopyImageToBuffer(copy, map.offset); + CopyImageToBuffer(copy, buffer_offset); } if (is_rescaled) { ScaleUp(true); } } +void Image::DownloadMemory(ImageBufferMap& map, + std::span copies) { + DownloadMemory(map.buffer, map.offset, copies); +} + GLuint Image::StorageHandle() noexcept { switch (info.format) { case PixelFormat::A8B8G8R8_SRGB: diff --git a/src/video_core/renderer_opengl/gl_texture_cache.h b/src/video_core/renderer_opengl/gl_texture_cache.h index e30875496..911e4607a 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.h +++ b/src/video_core/renderer_opengl/gl_texture_cache.h @@ -206,9 +206,15 @@ public: Image(Image&&) = default; Image& operator=(Image&&) = default; + void UploadMemory(GLuint buffer_handle, size_t buffer_offset, + std::span copies); + void UploadMemory(const ImageBufferMap& map, std::span copies); + void DownloadMemory(GLuint buffer_handle, size_t buffer_offset, + std::span copies); + void DownloadMemory(ImageBufferMap& map, std::span copies); GLuint StorageHandle() noexcept; diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index f085d53a1..a00cf1569 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -770,232 +770,44 @@ bool AccelerateDMA::BufferCopy(GPUVAddr src_address, GPUVAddr dest_address, u64 return buffer_cache.DMACopy(src_address, dest_address, amount); } -bool AccelerateDMA::ImageToBuffer(const Tegra::DMA::ImageCopy& copy_info, - const Tegra::DMA::ImageOperand& src, - const Tegra::DMA::BufferOperand& dst) { +template +bool AccelerateDMA::DmaBufferImageCopy(const Tegra::DMA::ImageCopy& copy_info, + const Tegra::DMA::BufferOperand& buffer_operand, + const Tegra::DMA::ImageOperand& image_operand) { std::scoped_lock lock{buffer_cache.mutex, texture_cache.mutex}; - auto query_image = texture_cache.ObtainImage(src, false); - if (!query_image) { + const auto image_id = texture_cache.DmaImageId(image_operand); + if (image_id == VideoCommon::NULL_IMAGE_ID) { return false; } - auto* image = query_image->first; - auto [level, base] = query_image->second; - const u32 buffer_size = static_cast(dst.pitch * dst.height); - const auto [buffer, offset] = buffer_cache.ObtainBuffer( - dst.address, buffer_size, VideoCommon::ObtainBufferSynchronize::FullSynchronize, - VideoCommon::ObtainBufferOperation::MarkAsWritten); + const u32 buffer_size = static_cast(buffer_operand.pitch * buffer_operand.height); + static constexpr auto sync_info = VideoCommon::ObtainBufferSynchronize::FullSynchronize; + const auto post_op = IS_IMAGE_UPLOAD ? VideoCommon::ObtainBufferOperation::DoNothing + : VideoCommon::ObtainBufferOperation::MarkAsWritten; + const auto [buffer, offset] = + buffer_cache.ObtainBuffer(buffer_operand.address, buffer_size, sync_info, post_op); - const bool is_rescaled = image->IsRescaled(); - if (is_rescaled) { - image->ScaleDown(); - } - VkImageSubresourceLayers subresources{ - .aspectMask = image->AspectMask(), - .mipLevel = level, - .baseArrayLayer = base, - .layerCount = 1, - }; - const u32 bpp = VideoCore::Surface::BytesPerBlock(image->info.format); - const auto convert = [old_bpp = src.bytes_per_pixel, bpp](u32 value) { - return (old_bpp * value) / bpp; - }; - const u32 base_x = convert(src.params.origin.x.Value()); - const u32 base_y = src.params.origin.y.Value(); - const u32 length_x = convert(copy_info.length_x); - const u32 length_y = copy_info.length_y; - VkOffset3D image_offset{ - .x = static_cast(base_x), - .y = static_cast(base_y), - .z = 0, - }; - VkExtent3D image_extent{ - .width = length_x, - .height = length_y, - .depth = 1, - }; - auto buff_info(dst); - buff_info.pitch = convert(dst.pitch); - scheduler.RequestOutsideRenderPassOperationContext(); - scheduler.Record([src_image = image->Handle(), dst_buffer = buffer->Handle(), - buffer_offset = offset, subresources, image_offset, image_extent, - buff_info](vk::CommandBuffer cmdbuf) { - const std::array buffer_copy_info{ - VkBufferImageCopy{ - .bufferOffset = buffer_offset, - .bufferRowLength = buff_info.pitch, - .bufferImageHeight = buff_info.height, - .imageSubresource = subresources, - .imageOffset = image_offset, - .imageExtent = image_extent, - }, - }; - const VkImageSubresourceRange range{ - .aspectMask = subresources.aspectMask, - .baseMipLevel = subresources.mipLevel, - .levelCount = 1, - .baseArrayLayer = subresources.baseArrayLayer, - .layerCount = 1, - }; - static constexpr VkMemoryBarrier WRITE_BARRIER{ - .sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER, - .pNext = nullptr, - .srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT, - .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT, - }; - const std::array pre_barriers{ - VkImageMemoryBarrier{ - .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, - .pNext = nullptr, - .srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | - VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | - VK_ACCESS_TRANSFER_WRITE_BIT, - .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT, - .oldLayout = VK_IMAGE_LAYOUT_GENERAL, - .newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, - .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, - .image = src_image, - .subresourceRange = range, - }, - }; - const std::array post_barriers{ - VkImageMemoryBarrier{ - .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, - .pNext = nullptr, - .srcAccessMask = 0, - .dstAccessMask = 0, - .oldLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - .newLayout = VK_IMAGE_LAYOUT_GENERAL, - .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, - .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, - .image = src_image, - .subresourceRange = range, - }, - }; - cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, - 0, {}, {}, pre_barriers); - cmdbuf.CopyImageToBuffer(src_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_buffer, - buffer_copy_info); - cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, - 0, WRITE_BARRIER, nullptr, post_barriers); - }); - if (is_rescaled) { - image->ScaleUp(true); + const auto [image, copy] = texture_cache.DmaBufferImageCopy( + copy_info, buffer_operand, image_operand, image_id, IS_IMAGE_UPLOAD); + const std::span copy_span{©, 1}; + + if constexpr (IS_IMAGE_UPLOAD) { + image->UploadMemory(buffer->Handle(), offset, copy_span); + } else { + image->DownloadMemory(buffer->Handle(), offset, copy_span); } return true; } +bool AccelerateDMA::ImageToBuffer(const Tegra::DMA::ImageCopy& copy_info, + const Tegra::DMA::ImageOperand& image_operand, + const Tegra::DMA::BufferOperand& buffer_operand) { + return DmaBufferImageCopy(copy_info, buffer_operand, image_operand); +} + bool AccelerateDMA::BufferToImage(const Tegra::DMA::ImageCopy& copy_info, - const Tegra::DMA::BufferOperand& src, - const Tegra::DMA::ImageOperand& dst) { - std::scoped_lock lock{buffer_cache.mutex, texture_cache.mutex}; - auto query_image = texture_cache.ObtainImage(dst, true); - if (!query_image) { - return false; - } - auto* image = query_image->first; - auto [level, base] = query_image->second; - const u32 buffer_size = static_cast(src.pitch * src.height); - const auto [buffer, offset] = buffer_cache.ObtainBuffer( - src.address, buffer_size, VideoCommon::ObtainBufferSynchronize::FullSynchronize, - VideoCommon::ObtainBufferOperation::DoNothing); - const bool is_rescaled = image->IsRescaled(); - if (is_rescaled) { - image->ScaleDown(true); - } - VkImageSubresourceLayers subresources{ - .aspectMask = image->AspectMask(), - .mipLevel = level, - .baseArrayLayer = base, - .layerCount = 1, - }; - const u32 bpp = VideoCore::Surface::BytesPerBlock(image->info.format); - const auto convert = [old_bpp = dst.bytes_per_pixel, bpp](u32 value) { - return (old_bpp * value) / bpp; - }; - const u32 base_x = convert(dst.params.origin.x.Value()); - const u32 base_y = dst.params.origin.y.Value(); - const u32 length_x = convert(copy_info.length_x); - const u32 length_y = copy_info.length_y; - VkOffset3D image_offset{ - .x = static_cast(base_x), - .y = static_cast(base_y), - .z = 0, - }; - VkExtent3D image_extent{ - .width = length_x, - .height = length_y, - .depth = 1, - }; - auto buff_info(src); - buff_info.pitch = convert(src.pitch); - scheduler.RequestOutsideRenderPassOperationContext(); - scheduler.Record([dst_image = image->Handle(), src_buffer = buffer->Handle(), - buffer_offset = offset, subresources, image_offset, image_extent, - buff_info](vk::CommandBuffer cmdbuf) { - const std::array buffer_copy_info{ - VkBufferImageCopy{ - .bufferOffset = buffer_offset, - .bufferRowLength = buff_info.pitch, - .bufferImageHeight = buff_info.height, - .imageSubresource = subresources, - .imageOffset = image_offset, - .imageExtent = image_extent, - }, - }; - const VkImageSubresourceRange range{ - .aspectMask = subresources.aspectMask, - .baseMipLevel = subresources.mipLevel, - .levelCount = 1, - .baseArrayLayer = subresources.baseArrayLayer, - .layerCount = 1, - }; - static constexpr VkMemoryBarrier READ_BARRIER{ - .sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER, - .pNext = nullptr, - .srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT, - .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_TRANSFER_WRITE_BIT, - }; - const std::array pre_barriers{ - VkImageMemoryBarrier{ - .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, - .pNext = nullptr, - .srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | - VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | - VK_ACCESS_TRANSFER_WRITE_BIT, - .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT, - .oldLayout = VK_IMAGE_LAYOUT_GENERAL, - .newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, - .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, - .image = dst_image, - .subresourceRange = range, - }, - }; - const std::array post_barriers{ - VkImageMemoryBarrier{ - .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, - .pNext = nullptr, - .srcAccessMask = 0, - .dstAccessMask = 0, - .oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - .newLayout = VK_IMAGE_LAYOUT_GENERAL, - .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, - .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, - .image = dst_image, - .subresourceRange = range, - }, - }; - cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, - 0, READ_BARRIER, {}, pre_barriers); - cmdbuf.CopyBufferToImage(src_buffer, dst_image, VK_IMAGE_LAYOUT_GENERAL, buffer_copy_info); - cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, - 0, nullptr, nullptr, post_barriers); - }); - if (is_rescaled) { - image->ScaleUp(); - } - return true; + const Tegra::DMA::BufferOperand& buffer_operand, + const Tegra::DMA::ImageOperand& image_operand) { + return DmaBufferImageCopy(copy_info, buffer_operand, image_operand); } void RasterizerVulkan::UpdateDynamicStates() { diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.h b/src/video_core/renderer_vulkan/vk_rasterizer.h index 7746c5434..1659fbc13 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.h +++ b/src/video_core/renderer_vulkan/vk_rasterizer.h @@ -59,6 +59,11 @@ public: const Tegra::DMA::ImageOperand& dst) override; private: + template + bool DmaBufferImageCopy(const Tegra::DMA::ImageCopy& copy_info, + const Tegra::DMA::BufferOperand& src, + const Tegra::DMA::ImageOperand& dst); + BufferCache& buffer_cache; TextureCache& texture_cache; Scheduler& scheduler; diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index 8a204f93f..bf6389ff1 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -1312,15 +1312,16 @@ Image::Image(const VideoCommon::NullImageParams& params) : VideoCommon::ImageBas Image::~Image() = default; -void Image::UploadMemory(const StagingBufferRef& map, std::span copies) { +void Image::UploadMemory(VkBuffer buffer, VkDeviceSize offset, + std::span copies) { // TODO: Move this to another API const bool is_rescaled = True(flags & ImageFlagBits::Rescaled); if (is_rescaled) { ScaleDown(true); } scheduler->RequestOutsideRenderPassOperationContext(); - std::vector vk_copies = TransformBufferImageCopies(copies, map.offset, aspect_mask); - const VkBuffer src_buffer = map.buffer; + std::vector vk_copies = TransformBufferImageCopies(copies, offset, aspect_mask); + const VkBuffer src_buffer = buffer; const VkImage vk_image = *original_image; const VkImageAspectFlags vk_aspect_mask = aspect_mask; const bool is_initialized = std::exchange(initialized, true); @@ -1333,14 +1334,19 @@ void Image::UploadMemory(const StagingBufferRef& map, std::span copies) { +void Image::UploadMemory(const StagingBufferRef& map, std::span copies) { + UploadMemory(map.buffer, map.offset, copies); +} + +void Image::DownloadMemory(VkBuffer buffer, VkDeviceSize offset, + std::span copies) { const bool is_rescaled = True(flags & ImageFlagBits::Rescaled); if (is_rescaled) { ScaleDown(); } - std::vector vk_copies = TransformBufferImageCopies(copies, map.offset, aspect_mask); + std::vector vk_copies = TransformBufferImageCopies(copies, offset, aspect_mask); scheduler->RequestOutsideRenderPassOperationContext(); - scheduler->Record([buffer = map.buffer, image = *original_image, aspect_mask = aspect_mask, + scheduler->Record([buffer, image = *original_image, aspect_mask = aspect_mask, vk_copies](vk::CommandBuffer cmdbuf) { const VkImageMemoryBarrier read_barrier{ .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, @@ -1395,6 +1401,10 @@ void Image::DownloadMemory(const StagingBufferRef& map, std::span copies) { + DownloadMemory(map.buffer, map.offset, copies); +} + bool Image::IsRescaled() const noexcept { return True(flags & ImageFlagBits::Rescaled); } diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index 0ce39616f..d5ee23f8d 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h @@ -132,9 +132,15 @@ public: Image(Image&&) = default; Image& operator=(Image&&) = default; + void UploadMemory(VkBuffer buffer, VkDeviceSize offset, + std::span copies); + void UploadMemory(const StagingBufferRef& map, std::span copies); + void DownloadMemory(VkBuffer buffer, VkDeviceSize offset, + std::span copies); + void DownloadMemory(const StagingBufferRef& map, std::span copies); diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 335338434..8e8b9a5e6 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -744,6 +744,25 @@ void TextureCache

::PopAsyncFlushes() { } } +template +ImageId TextureCache

::DmaImageId(const Tegra::DMA::ImageOperand& operand) { + const ImageInfo dst_info(operand); + const ImageId dst_id = FindDMAImage(dst_info, operand.address); + if (!dst_id) { + return NULL_IMAGE_ID; + } + const auto& image = slot_images[dst_id]; + if (False(image.flags & ImageFlagBits::GpuModified)) { + // No need to waste time on an image that's synced with guest + return NULL_IMAGE_ID; + } + const auto base = image.TryFindBase(operand.address); + if (!base) { + return NULL_IMAGE_ID; + } + return dst_id; +} + template bool TextureCache

::IsRescaling() const noexcept { return is_rescaling; @@ -771,6 +790,49 @@ bool TextureCache

::IsRegionGpuModified(VAddr addr, size_t size) { return is_modified; } +template +std::pair::Image*, BufferImageCopy> TextureCache

::DmaBufferImageCopy( + const Tegra::DMA::ImageCopy& copy_info, const Tegra::DMA::BufferOperand& buffer_operand, + const Tegra::DMA::ImageOperand& image_operand, ImageId image_id, bool modifies_image) { + const auto [level, base] = PrepareDmaImage(image_id, image_operand.address, modifies_image); + auto* image = &slot_images[image_id]; + const u32 buffer_size = static_cast(buffer_operand.pitch * buffer_operand.height); + const u32 bpp = VideoCore::Surface::BytesPerBlock(image->info.format); + const auto convert = [old_bpp = image_operand.bytes_per_pixel, bpp](u32 value) { + return (old_bpp * value) / bpp; + }; + const u32 base_x = convert(image_operand.params.origin.x.Value()); + const u32 base_y = image_operand.params.origin.y.Value(); + const u32 length_x = convert(copy_info.length_x); + const u32 length_y = copy_info.length_y; + + const BufferImageCopy copy{ + .buffer_offset = 0, + .buffer_size = buffer_size, + .buffer_row_length = convert(buffer_operand.pitch), + .buffer_image_height = buffer_operand.height, + .image_subresource = + { + .base_level = static_cast(level), + .base_layer = static_cast(base), + .num_layers = 1, + }, + .image_offset = + { + .x = static_cast(base_x), + .y = static_cast(base_y), + .z = 0, + }, + .image_extent = + { + .width = length_x, + .height = length_y, + .depth = 1, + }, + }; + return {image, copy}; +} + template void TextureCache

::RefreshContents(Image& image, ImageId image_id) { if (False(image.flags & ImageFlagBits::CpuModified)) { @@ -1405,26 +1467,14 @@ ImageId TextureCache

::FindDMAImage(const ImageInfo& info, GPUVAddr gpu_addr) } template -std::optional::Image*, std::pair>> -TextureCache

::ObtainImage(const Tegra::DMA::ImageOperand& operand, bool mark_as_modified) { - ImageInfo dst_info(operand); - ImageId dst_id = FindDMAImage(dst_info, operand.address); - if (!dst_id) { - return std::nullopt; - } - auto& image = slot_images[dst_id]; - auto base = image.TryFindBase(operand.address); - if (!base) { - return std::nullopt; - } - if (False(image.flags & ImageFlagBits::GpuModified)) { - // No need to waste time on an image that's synced with guest - return std::nullopt; - } +std::pair TextureCache

::PrepareDmaImage(ImageId dst_id, GPUVAddr base_addr, + bool mark_as_modified) { + const auto& image = slot_images[dst_id]; + const auto base = image.TryFindBase(base_addr); PrepareImage(dst_id, mark_as_modified, false); - auto& new_image = slot_images[dst_id]; + const auto& new_image = slot_images[dst_id]; lru_cache.Touch(new_image.lru_index, frame_tick); - return std::make_pair(&new_image, std::make_pair(base->level, base->layer)); + return std::make_pair(base->level, base->layer); } template diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index 848a5d9ea..5a5b4179c 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h @@ -209,8 +209,11 @@ public: /// Pop asynchronous downloads void PopAsyncFlushes(); - [[nodiscard]] std::optional>> ObtainImage( - const Tegra::DMA::ImageOperand& operand, bool mark_as_modified); + [[nodiscard]] ImageId DmaImageId(const Tegra::DMA::ImageOperand& operand); + + [[nodiscard]] std::pair DmaBufferImageCopy( + const Tegra::DMA::ImageCopy& copy_info, const Tegra::DMA::BufferOperand& buffer_operand, + const Tegra::DMA::ImageOperand& image_operand, ImageId image_id, bool modifies_image); /// Return true when a CPU region is modified from the GPU [[nodiscard]] bool IsRegionGpuModified(VAddr addr, size_t size); @@ -386,6 +389,9 @@ private: /// Returns true if the current clear parameters clear the whole image of a given image view [[nodiscard]] bool IsFullClear(ImageViewId id); + [[nodiscard]] std::pair PrepareDmaImage(ImageId dst_id, GPUVAddr base_addr, + bool mark_as_modified); + bool ImageCanRescale(ImageBase& image); void InvalidateScale(Image& image); bool ScaleUp(Image& image); From 268942c8fe0c34f193ba3d195a974e91db8af26a Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Mon, 6 Mar 2023 21:53:51 -0500 Subject: [PATCH 0139/1181] gl_rasterizer: Implement AccelerateDMA DmaBufferImageCopy --- .../renderer_opengl/gl_rasterizer.cpp | 45 ++++++++++++++++++- .../renderer_opengl/gl_rasterizer.h | 16 ++++--- 2 files changed, 52 insertions(+), 9 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 7bced675c..33748762f 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -63,7 +63,7 @@ RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& emu_window_, Tegra buffer_cache(*this, cpu_memory_, buffer_cache_runtime), shader_cache(*this, emu_window_, device, texture_cache, buffer_cache, program_manager, state_tracker, gpu.ShaderNotify()), - query_cache(*this), accelerate_dma(buffer_cache), + query_cache(*this), accelerate_dma(buffer_cache, texture_cache), fence_manager(*this, gpu, texture_cache, buffer_cache, query_cache), blit_image(program_manager_) {} @@ -1262,7 +1262,8 @@ void RasterizerOpenGL::ReleaseChannel(s32 channel_id) { query_cache.EraseChannel(channel_id); } -AccelerateDMA::AccelerateDMA(BufferCache& buffer_cache_) : buffer_cache{buffer_cache_} {} +AccelerateDMA::AccelerateDMA(BufferCache& buffer_cache_, TextureCache& texture_cache_) + : buffer_cache{buffer_cache_}, texture_cache{texture_cache_} {} bool AccelerateDMA::BufferCopy(GPUVAddr src_address, GPUVAddr dest_address, u64 amount) { std::scoped_lock lock{buffer_cache.mutex}; @@ -1274,4 +1275,44 @@ bool AccelerateDMA::BufferClear(GPUVAddr src_address, u64 amount, u32 value) { return buffer_cache.DMAClear(src_address, amount, value); } +template +bool AccelerateDMA::DmaBufferImageCopy(const Tegra::DMA::ImageCopy& copy_info, + const Tegra::DMA::BufferOperand& buffer_operand, + const Tegra::DMA::ImageOperand& image_operand) { + std::scoped_lock lock{buffer_cache.mutex, texture_cache.mutex}; + const auto image_id = texture_cache.DmaImageId(image_operand); + if (image_id == VideoCommon::NULL_IMAGE_ID) { + return false; + } + const u32 buffer_size = static_cast(buffer_operand.pitch * buffer_operand.height); + static constexpr auto sync_info = VideoCommon::ObtainBufferSynchronize::FullSynchronize; + const auto post_op = IS_IMAGE_UPLOAD ? VideoCommon::ObtainBufferOperation::DoNothing + : VideoCommon::ObtainBufferOperation::MarkAsWritten; + const auto [buffer, offset] = + buffer_cache.ObtainBuffer(buffer_operand.address, buffer_size, sync_info, post_op); + + const auto [image, copy] = texture_cache.DmaBufferImageCopy( + copy_info, buffer_operand, image_operand, image_id, IS_IMAGE_UPLOAD); + const std::span copy_span{©, 1}; + + if constexpr (IS_IMAGE_UPLOAD) { + image->UploadMemory(buffer->Handle(), offset, copy_span); + } else { + image->DownloadMemory(buffer->Handle(), offset, copy_span); + } + return true; +} + +bool AccelerateDMA::ImageToBuffer(const Tegra::DMA::ImageCopy& copy_info, + const Tegra::DMA::ImageOperand& image_operand, + const Tegra::DMA::BufferOperand& buffer_operand) { + return DmaBufferImageCopy(copy_info, buffer_operand, image_operand); +} + +bool AccelerateDMA::BufferToImage(const Tegra::DMA::ImageCopy& copy_info, + const Tegra::DMA::BufferOperand& buffer_operand, + const Tegra::DMA::ImageOperand& image_operand) { + return DmaBufferImageCopy(copy_info, buffer_operand, image_operand); +} + } // namespace OpenGL diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 7e21fc43d..1f6562ef8 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -50,24 +50,26 @@ static_assert(sizeof(BindlessSSBO) * CHAR_BIT == 128); class AccelerateDMA : public Tegra::Engines::AccelerateDMAInterface { public: - explicit AccelerateDMA(BufferCache& buffer_cache); + explicit AccelerateDMA(BufferCache& buffer_cache, TextureCache& texture_cache); bool BufferCopy(GPUVAddr src_address, GPUVAddr dest_address, u64 amount) override; bool BufferClear(GPUVAddr src_address, u64 amount, u32 value) override; bool ImageToBuffer(const Tegra::DMA::ImageCopy& copy_info, const Tegra::DMA::ImageOperand& src, - const Tegra::DMA::BufferOperand& dst) override { - return false; - } + const Tegra::DMA::BufferOperand& dst) override; bool BufferToImage(const Tegra::DMA::ImageCopy& copy_info, const Tegra::DMA::BufferOperand& src, - const Tegra::DMA::ImageOperand& dst) override { - return false; - } + const Tegra::DMA::ImageOperand& dst) override; private: + template + bool DmaBufferImageCopy(const Tegra::DMA::ImageCopy& copy_info, + const Tegra::DMA::BufferOperand& src, + const Tegra::DMA::ImageOperand& dst); + BufferCache& buffer_cache; + TextureCache& texture_cache; }; class RasterizerOpenGL : public VideoCore::RasterizerAccelerated, From 484641003cf727def0101f35c83d1ef135b93f54 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 7 Mar 2023 19:18:06 -0500 Subject: [PATCH 0140/1181] kernel: clone fpu status on CreateThread --- src/core/hle/kernel/k_thread.cpp | 24 +++++++++++++++++++++++- src/core/hle/kernel/k_thread.h | 2 ++ src/core/hle/kernel/svc/svc_thread.cpp | 3 +++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index 8c403f5fd..15ae652f9 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -49,6 +49,7 @@ static void ResetThreadContext32(Core::ARM_Interface::ThreadContext32& context, context.cpu_registers[0] = arg; context.cpu_registers[15] = entry_point; context.cpu_registers[13] = stack_top; + context.fpscr = 0; } static void ResetThreadContext64(Core::ARM_Interface::ThreadContext64& context, VAddr stack_top, @@ -58,8 +59,8 @@ static void ResetThreadContext64(Core::ARM_Interface::ThreadContext64& context, context.cpu_registers[18] = Kernel::KSystemControl::GenerateRandomU64() | 1; context.pc = entry_point; context.sp = stack_top; - // TODO(merry): Perform a hardware test to determine the below value. context.fpcr = 0; + context.fpsr = 0; } } // namespace @@ -815,6 +816,27 @@ void KThread::Continue() { KScheduler::OnThreadStateChanged(kernel, this, old_state); } +void KThread::CloneFpuStatus() { + // We shouldn't reach here when starting kernel threads. + ASSERT(this->GetOwnerProcess() != nullptr); + ASSERT(this->GetOwnerProcess() == GetCurrentProcessPointer(kernel)); + + if (this->GetOwnerProcess()->Is64BitProcess()) { + // Clone FPSR and FPCR. + ThreadContext64 cur_ctx{}; + kernel.System().CurrentArmInterface().SaveContext(cur_ctx); + + this->GetContext64().fpcr = cur_ctx.fpcr; + this->GetContext64().fpsr = cur_ctx.fpsr; + } else { + // Clone FPSCR. + ThreadContext32 cur_ctx{}; + kernel.System().CurrentArmInterface().SaveContext(cur_ctx); + + this->GetContext32().fpscr = cur_ctx.fpscr; + } +} + Result KThread::SetActivity(Svc::ThreadActivity activity) { // Lock ourselves. KScopedLightLock lk(activity_pause_lock); diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h index bd125f5f1..9423f08ca 100644 --- a/src/core/hle/kernel/k_thread.h +++ b/src/core/hle/kernel/k_thread.h @@ -254,6 +254,8 @@ public: thread_context_32.tpidr = static_cast(value); } + void CloneFpuStatus(); + [[nodiscard]] ThreadContext32& GetContext32() { return thread_context_32; } diff --git a/src/core/hle/kernel/svc/svc_thread.cpp b/src/core/hle/kernel/svc/svc_thread.cpp index b39807841..9bc1ebe74 100644 --- a/src/core/hle/kernel/svc/svc_thread.cpp +++ b/src/core/hle/kernel/svc/svc_thread.cpp @@ -82,6 +82,9 @@ Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point, // Commit the thread reservation. thread_reservation.Commit(); + // Clone the current fpu status to the new thread. + thread->CloneFpuStatus(); + // Register the new thread. KThread::Register(kernel, thread); From d45ac00d48352d86a483e7642bfccadf1eb4f4ce Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 7 Mar 2023 19:46:48 -0500 Subject: [PATCH 0141/1181] kernel: avoid signed overflow UB on MSVC --- src/common/CMakeLists.txt | 1 + src/common/overflow.h | 22 ++++++++++++++++++++++ src/core/hle/kernel/k_resource_limit.cpp | 3 ++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 src/common/overflow.h diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 58ff5f2f3..61ab68864 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -91,6 +91,7 @@ add_library(common STATIC multi_level_page_table.h nvidia_flags.cpp nvidia_flags.h + overflow.h page_table.cpp page_table.h param_package.cpp diff --git a/src/common/overflow.h b/src/common/overflow.h new file mode 100644 index 000000000..44d8e7e73 --- /dev/null +++ b/src/common/overflow.h @@ -0,0 +1,22 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include +#include "bit_cast.h" + +namespace Common { + +template + requires(std::is_integral_v && std::is_signed_v) +inline T WrappingAdd(T lhs, T rhs) { + using U = std::make_unsigned_t; + + U lhs_u = BitCast(lhs); + U rhs_u = BitCast(rhs); + + return BitCast(lhs_u + rhs_u); +} + +} // namespace Common diff --git a/src/core/hle/kernel/k_resource_limit.cpp b/src/core/hle/kernel/k_resource_limit.cpp index b9d22b414..626517619 100644 --- a/src/core/hle/kernel/k_resource_limit.cpp +++ b/src/core/hle/kernel/k_resource_limit.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" +#include "common/overflow.h" #include "core/core.h" #include "core/core_timing.h" #include "core/hle/kernel/k_resource_limit.h" @@ -104,7 +105,7 @@ bool KResourceLimit::Reserve(LimitableResource which, s64 value, s64 timeout) { ASSERT(current_hints[index] <= current_values[index]); // If we would overflow, don't allow to succeed. - if (current_values[index] + value <= current_values[index]) { + if (Common::WrappingAdd(current_values[index], value) <= current_values[index]) { break; } From ba4213d956ff138ec6392dc4145970e8a3cd1ba6 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 7 Mar 2023 20:03:24 -0500 Subject: [PATCH 0142/1181] general: fix type inconsistencies --- src/core/hle/kernel/k_address_space_info.cpp | 4 ++-- src/core/hle/kernel/k_address_space_info.h | 2 +- src/core/hle/kernel/k_device_address_space.h | 4 ++-- src/video_core/renderer_vulkan/vk_buffer_cache.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/hle/kernel/k_address_space_info.cpp b/src/core/hle/kernel/k_address_space_info.cpp index 97972ebae..c36eb5dc4 100644 --- a/src/core/hle/kernel/k_address_space_info.cpp +++ b/src/core/hle/kernel/k_address_space_info.cpp @@ -44,11 +44,11 @@ const KAddressSpaceInfo& GetAddressSpaceInfo(size_t width, KAddressSpaceInfo::Ty } // namespace -uintptr_t KAddressSpaceInfo::GetAddressSpaceStart(size_t width, KAddressSpaceInfo::Type type) { +std::size_t KAddressSpaceInfo::GetAddressSpaceStart(size_t width, KAddressSpaceInfo::Type type) { return GetAddressSpaceInfo(width, type).address; } -size_t KAddressSpaceInfo::GetAddressSpaceSize(size_t width, KAddressSpaceInfo::Type type) { +std::size_t KAddressSpaceInfo::GetAddressSpaceSize(size_t width, KAddressSpaceInfo::Type type) { return GetAddressSpaceInfo(width, type).size; } diff --git a/src/core/hle/kernel/k_address_space_info.h b/src/core/hle/kernel/k_address_space_info.h index 69e9d77f2..9a26f6b90 100644 --- a/src/core/hle/kernel/k_address_space_info.h +++ b/src/core/hle/kernel/k_address_space_info.h @@ -18,7 +18,7 @@ struct KAddressSpaceInfo final { Count, }; - static u64 GetAddressSpaceStart(std::size_t width, Type type); + static std::size_t GetAddressSpaceStart(std::size_t width, Type type); static std::size_t GetAddressSpaceSize(std::size_t width, Type type); const std::size_t bit_width{}; diff --git a/src/core/hle/kernel/k_device_address_space.h b/src/core/hle/kernel/k_device_address_space.h index 4709df995..b4a014c38 100644 --- a/src/core/hle/kernel/k_device_address_space.h +++ b/src/core/hle/kernel/k_device_address_space.h @@ -21,9 +21,9 @@ public: ~KDeviceAddressSpace(); Result Initialize(u64 address, u64 size); - void Finalize(); + void Finalize() override; - bool IsInitialized() const { + bool IsInitialized() const override { return m_is_initialized; } static void PostDestroy(uintptr_t arg) {} diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp index b0153a502..9cbcb3c8f 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp @@ -238,7 +238,7 @@ private: return indices; } - void MakeAndUpdateIndices(u8* staging_data, size_t quad_size, u32 quad, u32 first) { + void MakeAndUpdateIndices(u8* staging_data, size_t quad_size, u32 quad, u32 first) override { switch (index_type) { case VK_INDEX_TYPE_UINT8_EXT: std::memcpy(staging_data, MakeIndices(quad, first).data(), quad_size); @@ -278,7 +278,7 @@ private: return indices; } - void MakeAndUpdateIndices(u8* staging_data, size_t quad_size, u32 quad, u32 first) { + void MakeAndUpdateIndices(u8* staging_data, size_t quad_size, u32 quad, u32 first) override { switch (index_type) { case VK_INDEX_TYPE_UINT8_EXT: std::memcpy(staging_data, MakeIndices(quad, first).data(), quad_size); From 64dcb40db139ce1aa79dff16ce863a8d5389199f Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 7 Mar 2023 19:53:32 -0500 Subject: [PATCH 0143/1181] common: make BitCast constexpr --- src/common/bit_cast.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/common/bit_cast.h b/src/common/bit_cast.h index 535148b4d..c6110c542 100644 --- a/src/common/bit_cast.h +++ b/src/common/bit_cast.h @@ -3,19 +3,21 @@ #pragma once -#include -#include +#include + +#ifdef __cpp_lib_bit_cast +#include +#endif namespace Common { template -[[nodiscard]] std::enable_if_t && - std::is_trivially_copyable_v, - To> -BitCast(const From& src) noexcept { - To dst; - std::memcpy(&dst, &src, sizeof(To)); - return dst; +constexpr inline To BitCast(const From& from) { +#ifdef __cpp_lib_bit_cast + return std::bit_cast(from); +#else + return __builtin_bit_cast(To, from); +#endif } } // namespace Common From 9a9e5844d3865c923afc1238ce7a79b3ec111410 Mon Sep 17 00:00:00 2001 From: german77 Date: Sun, 5 Mar 2023 11:00:00 -0600 Subject: [PATCH 0144/1181] input_common: Increase mouse sensitivity range --- src/common/settings.h | 2 +- src/input_common/drivers/mouse.cpp | 27 ++++++++++++++++++--------- src/input_common/input_mapping.cpp | 1 + 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/common/settings.h b/src/common/settings.h index 512ecff69..56ee4e28d 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -503,7 +503,7 @@ struct Values { Setting tas_loop{false, "tas_loop"}; Setting mouse_panning{false, "mouse_panning"}; - Setting mouse_panning_sensitivity{10, 1, 100, "mouse_panning_sensitivity"}; + Setting mouse_panning_sensitivity{50, 1, 100, "mouse_panning_sensitivity"}; Setting mouse_enabled{false, "mouse_enabled"}; Setting emulate_analog_keyboard{false, "emulate_analog_keyboard"}; diff --git a/src/input_common/drivers/mouse.cpp b/src/input_common/drivers/mouse.cpp index 8b7f9aee9..94e92c37d 100644 --- a/src/input_common/drivers/mouse.cpp +++ b/src/input_common/drivers/mouse.cpp @@ -3,6 +3,7 @@ #include #include +#include #include "common/param_package.h" #include "common/settings.h" @@ -11,8 +12,9 @@ namespace InputCommon { constexpr int update_time = 10; -constexpr float default_stick_sensitivity = 0.022f; -constexpr float default_motion_sensitivity = 0.008f; +constexpr float default_stick_sensitivity = 0.0044f; +constexpr float default_motion_sensitivity = 0.0003f; +constexpr float maximum_rotation_speed = 2.0f; constexpr int mouse_axis_x = 0; constexpr int mouse_axis_y = 1; constexpr int wheel_axis_x = 2; @@ -99,11 +101,13 @@ void Mouse::UpdateMotionInput() { const float sensitivity = Settings::values.mouse_panning_sensitivity.GetValue() * default_motion_sensitivity; - // Slow movement by 7% - if (Settings::values.mouse_panning) { - last_motion_change *= 0.93f; - } else { - last_motion_change.z *= 0.93f; + const float rotation_velocity = std::sqrt(last_motion_change.x * last_motion_change.x + + last_motion_change.y * last_motion_change.y); + + if (rotation_velocity > maximum_rotation_speed / sensitivity) { + const float multiplier = maximum_rotation_speed / rotation_velocity / sensitivity; + last_motion_change.x = last_motion_change.x * multiplier; + last_motion_change.y = last_motion_change.y * multiplier; } const BasicMotion motion_data{ @@ -116,6 +120,12 @@ void Mouse::UpdateMotionInput() { .delta_timestamp = update_time * 1000, }; + if (Settings::values.mouse_panning) { + last_motion_change.x = 0; + last_motion_change.y = 0; + } + last_motion_change.z = 0; + SetMotion(motion_identifier, 0, motion_data); } @@ -125,7 +135,7 @@ void Mouse::Move(int x, int y, int center_x, int center_y) { auto mouse_change = (Common::MakeVec(x, y) - Common::MakeVec(center_x, center_y)).Cast(); - Common::Vec3 motion_change{-mouse_change.y, -mouse_change.x, last_motion_change.z}; + last_motion_change += {-mouse_change.y, -mouse_change.x, last_motion_change.z}; const auto move_distance = mouse_change.Length(); if (move_distance == 0) { @@ -141,7 +151,6 @@ void Mouse::Move(int x, int y, int center_x, int center_y) { // Average mouse movements last_mouse_change = (last_mouse_change * 0.91f) + (mouse_change * 0.09f); - last_motion_change = (last_motion_change * 0.69f) + (motion_change * 0.31f); const auto last_move_distance = last_mouse_change.Length(); diff --git a/src/input_common/input_mapping.cpp b/src/input_common/input_mapping.cpp index 2ff480ff9..9361b00c5 100644 --- a/src/input_common/input_mapping.cpp +++ b/src/input_common/input_mapping.cpp @@ -146,6 +146,7 @@ void MappingFactory::RegisterMotion(const MappingData& data) { if (data.engine == "mouse") { new_input.Set("motion", 0); new_input.Set("pad", 1); + new_input.Set("threshold", 0.001f); input_queue.Push(new_input); return; } From 1776448df2a023f6735b69e27b72664e02f448ee Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 7 Mar 2023 20:48:46 -0500 Subject: [PATCH 0145/1181] kernel: add timer pointer to KThreadQueue --- src/core/hle/kernel/k_address_arbiter.cpp | 8 ++++++-- src/core/hle/kernel/k_condition_variable.cpp | 4 +++- .../hle/kernel/k_light_condition_variable.cpp | 4 +++- .../kernel/k_scoped_scheduler_lock_and_sleep.h | 15 +++++++++++---- src/core/hle/kernel/k_synchronization_object.cpp | 4 +++- src/core/hle/kernel/k_thread.cpp | 4 +++- src/core/hle/kernel/k_thread_queue.cpp | 8 +++++--- src/core/hle/kernel/k_thread_queue.h | 10 ++++++++-- 8 files changed, 42 insertions(+), 15 deletions(-) diff --git a/src/core/hle/kernel/k_address_arbiter.cpp b/src/core/hle/kernel/k_address_arbiter.cpp index fb86451ea..a4c16eca9 100644 --- a/src/core/hle/kernel/k_address_arbiter.cpp +++ b/src/core/hle/kernel/k_address_arbiter.cpp @@ -237,10 +237,11 @@ Result KAddressArbiter::SignalAndModifyByWaitingCountIfEqual(VAddr addr, s32 val Result KAddressArbiter::WaitIfLessThan(VAddr addr, s32 value, bool decrement, s64 timeout) { // Prepare to wait. KThread* cur_thread = GetCurrentThreadPointer(kernel); + KHardwareTimer* timer{}; ThreadQueueImplForKAddressArbiter wait_queue(kernel, std::addressof(thread_tree)); { - KScopedSchedulerLockAndSleep slp{kernel, cur_thread, timeout}; + KScopedSchedulerLockAndSleep slp{kernel, std::addressof(timer), cur_thread, timeout}; // Check that the thread isn't terminating. if (cur_thread->IsTerminationRequested()) { @@ -279,6 +280,7 @@ Result KAddressArbiter::WaitIfLessThan(VAddr addr, s32 value, bool decrement, s6 thread_tree.insert(*cur_thread); // Wait for the thread to finish. + wait_queue.SetHardwareTimer(timer); cur_thread->BeginWait(std::addressof(wait_queue)); cur_thread->SetWaitReasonForDebugging(ThreadWaitReasonForDebugging::Arbitration); } @@ -290,10 +292,11 @@ Result KAddressArbiter::WaitIfLessThan(VAddr addr, s32 value, bool decrement, s6 Result KAddressArbiter::WaitIfEqual(VAddr addr, s32 value, s64 timeout) { // Prepare to wait. KThread* cur_thread = GetCurrentThreadPointer(kernel); + KHardwareTimer* timer{}; ThreadQueueImplForKAddressArbiter wait_queue(kernel, std::addressof(thread_tree)); { - KScopedSchedulerLockAndSleep slp{kernel, cur_thread, timeout}; + KScopedSchedulerLockAndSleep slp{kernel, std::addressof(timer), cur_thread, timeout}; // Check that the thread isn't terminating. if (cur_thread->IsTerminationRequested()) { @@ -325,6 +328,7 @@ Result KAddressArbiter::WaitIfEqual(VAddr addr, s32 value, s64 timeout) { thread_tree.insert(*cur_thread); // Wait for the thread to finish. + wait_queue.SetHardwareTimer(timer); cur_thread->BeginWait(std::addressof(wait_queue)); cur_thread->SetWaitReasonForDebugging(ThreadWaitReasonForDebugging::Arbitration); } diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cpp index f40cf92b1..458f4c94e 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/core/hle/kernel/k_condition_variable.cpp @@ -266,11 +266,12 @@ void KConditionVariable::Signal(u64 cv_key, s32 count) { Result KConditionVariable::Wait(VAddr addr, u64 key, u32 value, s64 timeout) { // Prepare to wait. KThread* cur_thread = GetCurrentThreadPointer(kernel); + KHardwareTimer* timer{}; ThreadQueueImplForKConditionVariableWaitConditionVariable wait_queue( kernel, std::addressof(thread_tree)); { - KScopedSchedulerLockAndSleep slp(kernel, cur_thread, timeout); + KScopedSchedulerLockAndSleep slp(kernel, std::addressof(timer), cur_thread, timeout); // Check that the thread isn't terminating. if (cur_thread->IsTerminationRequested()) { @@ -320,6 +321,7 @@ Result KConditionVariable::Wait(VAddr addr, u64 key, u32 value, s64 timeout) { thread_tree.insert(*cur_thread); // Begin waiting. + wait_queue.SetHardwareTimer(timer); cur_thread->BeginWait(std::addressof(wait_queue)); cur_thread->SetWaitReasonForDebugging(ThreadWaitReasonForDebugging::ConditionVar); cur_thread->SetMutexWaitAddressForDebugging(addr); diff --git a/src/core/hle/kernel/k_light_condition_variable.cpp b/src/core/hle/kernel/k_light_condition_variable.cpp index cade99cfd..8fce2bc71 100644 --- a/src/core/hle/kernel/k_light_condition_variable.cpp +++ b/src/core/hle/kernel/k_light_condition_variable.cpp @@ -40,13 +40,14 @@ private: void KLightConditionVariable::Wait(KLightLock* lock, s64 timeout, bool allow_terminating_thread) { // Create thread queue. KThread* owner = GetCurrentThreadPointer(kernel); + KHardwareTimer* timer{}; ThreadQueueImplForKLightConditionVariable wait_queue(kernel, std::addressof(wait_list), allow_terminating_thread); // Sleep the thread. { - KScopedSchedulerLockAndSleep lk(kernel, owner, timeout); + KScopedSchedulerLockAndSleep lk(kernel, std::addressof(timer), owner, timeout); if (!allow_terminating_thread && owner->IsTerminationRequested()) { lk.CancelSleep(); @@ -59,6 +60,7 @@ void KLightConditionVariable::Wait(KLightLock* lock, s64 timeout, bool allow_ter wait_list.push_back(*owner); // Begin waiting. + wait_queue.SetHardwareTimer(timer); owner->BeginWait(std::addressof(wait_queue)); } diff --git a/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h b/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h index 76db65a4d..14b83a819 100644 --- a/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h +++ b/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h @@ -13,16 +13,22 @@ namespace Kernel { class [[nodiscard]] KScopedSchedulerLockAndSleep { public: - explicit KScopedSchedulerLockAndSleep(KernelCore& kernel_, KThread* t, s64 timeout) - : kernel(kernel_), thread(t), timeout_tick(timeout) { + explicit KScopedSchedulerLockAndSleep(KernelCore& kernel_, KHardwareTimer** out_timer, + KThread* t, s64 timeout) + : kernel(kernel_), timeout_tick(timeout), thread(t), timer() { // Lock the scheduler. kernel.GlobalSchedulerContext().scheduler_lock.Lock(); + + // Set our timer only if the time is positive. + timer = (timeout_tick > 0) ? std::addressof(kernel.HardwareTimer()) : nullptr; + + *out_timer = timer; } ~KScopedSchedulerLockAndSleep() { // Register the sleep. if (timeout_tick > 0) { - kernel.HardwareTimer().RegisterTask(thread, timeout_tick); + timer->RegisterTask(thread, timeout_tick); } // Unlock the scheduler. @@ -35,8 +41,9 @@ public: private: KernelCore& kernel; - KThread* thread{}; s64 timeout_tick{}; + KThread* thread{}; + KHardwareTimer* timer{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_synchronization_object.cpp b/src/core/hle/kernel/k_synchronization_object.cpp index 802dca046..40fd0c038 100644 --- a/src/core/hle/kernel/k_synchronization_object.cpp +++ b/src/core/hle/kernel/k_synchronization_object.cpp @@ -79,12 +79,13 @@ Result KSynchronizationObject::Wait(KernelCore& kernel_ctx, s32* out_index, // Prepare for wait. KThread* thread = GetCurrentThreadPointer(kernel_ctx); + KHardwareTimer* timer{}; ThreadQueueImplForKSynchronizationObjectWait wait_queue(kernel_ctx, objects, thread_nodes.data(), num_objects); { // Setup the scheduling lock and sleep. - KScopedSchedulerLockAndSleep slp(kernel_ctx, thread, timeout); + KScopedSchedulerLockAndSleep slp(kernel_ctx, std::addressof(timer), thread, timeout); // Check if the thread should terminate. if (thread->IsTerminationRequested()) { @@ -131,6 +132,7 @@ Result KSynchronizationObject::Wait(KernelCore& kernel_ctx, s32* out_index, thread->SetSyncedIndex(-1); // Wait for an object to be signaled. + wait_queue.SetHardwareTimer(timer); thread->BeginWait(std::addressof(wait_queue)); thread->SetWaitReasonForDebugging(ThreadWaitReasonForDebugging::Synchronization); } diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index 8c403f5fd..96b90ffef 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -1268,9 +1268,10 @@ Result KThread::Sleep(s64 timeout) { ASSERT(timeout > 0); ThreadQueueImplForKThreadSleep wait_queue_(kernel); + KHardwareTimer* timer{}; { // Setup the scheduling lock and sleep. - KScopedSchedulerLockAndSleep slp(kernel, this, timeout); + KScopedSchedulerLockAndSleep slp(kernel, std::addressof(timer), this, timeout); // Check if the thread should terminate. if (this->IsTerminationRequested()) { @@ -1279,6 +1280,7 @@ Result KThread::Sleep(s64 timeout) { } // Wait for the sleep to end. + wait_queue_.SetHardwareTimer(timer); this->BeginWait(std::addressof(wait_queue_)); SetWaitReasonForDebugging(ThreadWaitReasonForDebugging::Sleep); } diff --git a/src/core/hle/kernel/k_thread_queue.cpp b/src/core/hle/kernel/k_thread_queue.cpp index 5f1dc97eb..fe648447b 100644 --- a/src/core/hle/kernel/k_thread_queue.cpp +++ b/src/core/hle/kernel/k_thread_queue.cpp @@ -22,7 +22,9 @@ void KThreadQueue::EndWait(KThread* waiting_thread, Result wait_result) { waiting_thread->ClearWaitQueue(); // Cancel the thread task. - kernel.HardwareTimer().CancelTask(waiting_thread); + if (m_hardware_timer != nullptr) { + m_hardware_timer->CancelTask(waiting_thread); + } } void KThreadQueue::CancelWait(KThread* waiting_thread, Result wait_result, bool cancel_timer_task) { @@ -36,8 +38,8 @@ void KThreadQueue::CancelWait(KThread* waiting_thread, Result wait_result, bool waiting_thread->ClearWaitQueue(); // Cancel the thread task. - if (cancel_timer_task) { - kernel.HardwareTimer().CancelTask(waiting_thread); + if (cancel_timer_task && m_hardware_timer != nullptr) { + m_hardware_timer->CancelTask(waiting_thread); } } diff --git a/src/core/hle/kernel/k_thread_queue.h b/src/core/hle/kernel/k_thread_queue.h index 8d76ece81..01e330e2e 100644 --- a/src/core/hle/kernel/k_thread_queue.h +++ b/src/core/hle/kernel/k_thread_queue.h @@ -8,11 +8,17 @@ namespace Kernel { +class KHardwareTimer; + class KThreadQueue { public: - explicit KThreadQueue(KernelCore& kernel_) : kernel{kernel_} {} + explicit KThreadQueue(KernelCore& kernel_) : kernel{kernel_}, m_hardware_timer{} {} virtual ~KThreadQueue() = default; + void SetHardwareTimer(KHardwareTimer* timer) { + m_hardware_timer = timer; + } + virtual void NotifyAvailable(KThread* waiting_thread, KSynchronizationObject* signaled_object, Result wait_result); virtual void EndWait(KThread* waiting_thread, Result wait_result); @@ -20,7 +26,7 @@ public: private: KernelCore& kernel; - KThread::WaiterList wait_list{}; + KHardwareTimer* m_hardware_timer{}; }; class KThreadQueueWithoutEndWait : public KThreadQueue { From 757aafa582af0f1647770988063ba718565d4ef9 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Tue, 7 Mar 2023 20:15:46 -0600 Subject: [PATCH 0146/1181] input_common: Minor typo issues (#9922) --- src/common/input.h | 2 +- src/input_common/drivers/joycon.cpp | 4 +- src/input_common/drivers/virtual_amiibo.h | 2 +- src/input_common/helpers/joycon_driver.cpp | 2 +- src/input_common/helpers/joycon_driver.h | 2 +- .../helpers/joycon_protocol/joycon_types.h | 4 +- .../helpers/joycon_protocol/poller.cpp | 72 +++++++++---------- .../helpers/joycon_protocol/poller.h | 8 +-- 8 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/common/input.h b/src/common/input.h index b5748a6c8..98e934685 100644 --- a/src/common/input.h +++ b/src/common/input.h @@ -46,7 +46,7 @@ enum class PollingMode { // Constant polling of buttons, analogs and motion data Active, // Only update on button change, digital analogs - Pasive, + Passive, // Enable near field communication polling NFC, // Enable infrared camera polling diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp index b4cd39a20..8b57ebe07 100644 --- a/src/input_common/drivers/joycon.cpp +++ b/src/input_common/drivers/joycon.cpp @@ -307,8 +307,8 @@ Common::Input::DriverResult Joycons::SetPollingMode(const PadIdentifier& identif switch (polling_mode) { case Common::Input::PollingMode::Active: return static_cast(handle->SetActiveMode()); - case Common::Input::PollingMode::Pasive: - return static_cast(handle->SetPasiveMode()); + case Common::Input::PollingMode::Passive: + return static_cast(handle->SetPassiveMode()); case Common::Input::PollingMode::IR: return static_cast(handle->SetIrMode()); case Common::Input::PollingMode::NFC: diff --git a/src/input_common/drivers/virtual_amiibo.h b/src/input_common/drivers/virtual_amiibo.h index 13cacfc0a..488d00b31 100644 --- a/src/input_common/drivers/virtual_amiibo.h +++ b/src/input_common/drivers/virtual_amiibo.h @@ -60,6 +60,6 @@ private: std::string file_path{}; State state{State::Initialized}; std::vector nfc_data; - Common::Input::PollingMode polling_mode{Common::Input::PollingMode::Pasive}; + Common::Input::PollingMode polling_mode{Common::Input::PollingMode::Passive}; }; } // namespace InputCommon diff --git a/src/input_common/helpers/joycon_driver.cpp b/src/input_common/helpers/joycon_driver.cpp index e65b6b845..78cc5893c 100644 --- a/src/input_common/helpers/joycon_driver.cpp +++ b/src/input_common/helpers/joycon_driver.cpp @@ -410,7 +410,7 @@ DriverResult JoyconDriver::SetIrsConfig(IrsMode mode_, IrsResolution format_) { return result; } -DriverResult JoyconDriver::SetPasiveMode() { +DriverResult JoyconDriver::SetPassiveMode() { std::scoped_lock lock{mutex}; motion_enabled = false; hidbus_enabled = false; diff --git a/src/input_common/helpers/joycon_driver.h b/src/input_common/helpers/joycon_driver.h index c1e189fa5..b52a13ecf 100644 --- a/src/input_common/helpers/joycon_driver.h +++ b/src/input_common/helpers/joycon_driver.h @@ -44,7 +44,7 @@ public: DriverResult SetVibration(const VibrationValue& vibration); DriverResult SetLedConfig(u8 led_pattern); DriverResult SetIrsConfig(IrsMode mode_, IrsResolution format_); - DriverResult SetPasiveMode(); + DriverResult SetPassiveMode(); DriverResult SetActiveMode(); DriverResult SetIrMode(); DriverResult SetNfcMode(); diff --git a/src/input_common/helpers/joycon_protocol/joycon_types.h b/src/input_common/helpers/joycon_protocol/joycon_types.h index 2e50a99a8..dcac0e422 100644 --- a/src/input_common/helpers/joycon_protocol/joycon_types.h +++ b/src/input_common/helpers/joycon_protocol/joycon_types.h @@ -78,7 +78,7 @@ enum class PadButton : u32 { Capture = 0x200000, }; -enum class PasivePadButton : u32 { +enum class PassivePadButton : u32 { Down_A = 0x0001, Right_X = 0x0002, Left_B = 0x0004, @@ -95,7 +95,7 @@ enum class PasivePadButton : u32 { ZL_ZR = 0x8000, }; -enum class PasivePadStick : u8 { +enum class PassivePadStick : u8 { Right = 0x00, RightDown = 0x01, Down = 0x02, diff --git a/src/input_common/helpers/joycon_protocol/poller.cpp b/src/input_common/helpers/joycon_protocol/poller.cpp index ab48352b8..dca797f7a 100644 --- a/src/input_common/helpers/joycon_protocol/poller.cpp +++ b/src/input_common/helpers/joycon_protocol/poller.cpp @@ -48,13 +48,13 @@ void JoyconPoller::ReadPassiveMode(std::span buffer) { switch (device_type) { case ControllerType::Left: - UpdatePasiveLeftPadInput(data); + UpdatePassiveLeftPadInput(data); break; case ControllerType::Right: - UpdatePasiveRightPadInput(data); + UpdatePassiveRightPadInput(data); break; case ControllerType::Pro: - UpdatePasiveProPadInput(data); + UpdatePassiveProPadInput(data); break; default: break; @@ -210,12 +210,12 @@ void JoyconPoller::UpdateActiveProPadInput(const InputReportActive& input, } } -void JoyconPoller::UpdatePasiveLeftPadInput(const InputReportPassive& input) { - static constexpr std::array left_buttons{ - PasivePadButton::Down_A, PasivePadButton::Right_X, PasivePadButton::Left_B, - PasivePadButton::Up_Y, PasivePadButton::SL, PasivePadButton::SR, - PasivePadButton::L_R, PasivePadButton::ZL_ZR, PasivePadButton::Minus, - PasivePadButton::Capture, PasivePadButton::StickL, +void JoyconPoller::UpdatePassiveLeftPadInput(const InputReportPassive& input) { + static constexpr std::array left_buttons{ + PassivePadButton::Down_A, PassivePadButton::Right_X, PassivePadButton::Left_B, + PassivePadButton::Up_Y, PassivePadButton::SL, PassivePadButton::SR, + PassivePadButton::L_R, PassivePadButton::ZL_ZR, PassivePadButton::Minus, + PassivePadButton::Capture, PassivePadButton::StickL, }; for (auto left_button : left_buttons) { @@ -225,17 +225,17 @@ void JoyconPoller::UpdatePasiveLeftPadInput(const InputReportPassive& input) { } const auto [left_axis_x, left_axis_y] = - GetPassiveAxisValue(static_cast(input.stick_state)); + GetPassiveAxisValue(static_cast(input.stick_state)); callbacks.on_stick_data(static_cast(PadAxes::LeftStickX), left_axis_x); callbacks.on_stick_data(static_cast(PadAxes::LeftStickY), left_axis_y); } -void JoyconPoller::UpdatePasiveRightPadInput(const InputReportPassive& input) { - static constexpr std::array right_buttons{ - PasivePadButton::Down_A, PasivePadButton::Right_X, PasivePadButton::Left_B, - PasivePadButton::Up_Y, PasivePadButton::SL, PasivePadButton::SR, - PasivePadButton::L_R, PasivePadButton::ZL_ZR, PasivePadButton::Plus, - PasivePadButton::Home, PasivePadButton::StickR, +void JoyconPoller::UpdatePassiveRightPadInput(const InputReportPassive& input) { + static constexpr std::array right_buttons{ + PassivePadButton::Down_A, PassivePadButton::Right_X, PassivePadButton::Left_B, + PassivePadButton::Up_Y, PassivePadButton::SL, PassivePadButton::SR, + PassivePadButton::L_R, PassivePadButton::ZL_ZR, PassivePadButton::Plus, + PassivePadButton::Home, PassivePadButton::StickR, }; for (auto right_button : right_buttons) { @@ -245,18 +245,18 @@ void JoyconPoller::UpdatePasiveRightPadInput(const InputReportPassive& input) { } const auto [right_axis_x, right_axis_y] = - GetPassiveAxisValue(static_cast(input.stick_state)); + GetPassiveAxisValue(static_cast(input.stick_state)); callbacks.on_stick_data(static_cast(PadAxes::RightStickX), right_axis_x); callbacks.on_stick_data(static_cast(PadAxes::RightStickY), right_axis_y); } -void JoyconPoller::UpdatePasiveProPadInput(const InputReportPassive& input) { - static constexpr std::array pro_buttons{ - PasivePadButton::Down_A, PasivePadButton::Right_X, PasivePadButton::Left_B, - PasivePadButton::Up_Y, PasivePadButton::SL, PasivePadButton::SR, - PasivePadButton::L_R, PasivePadButton::ZL_ZR, PasivePadButton::Minus, - PasivePadButton::Plus, PasivePadButton::Capture, PasivePadButton::Home, - PasivePadButton::StickL, PasivePadButton::StickR, +void JoyconPoller::UpdatePassiveProPadInput(const InputReportPassive& input) { + static constexpr std::array pro_buttons{ + PassivePadButton::Down_A, PassivePadButton::Right_X, PassivePadButton::Left_B, + PassivePadButton::Up_Y, PassivePadButton::SL, PassivePadButton::SR, + PassivePadButton::L_R, PassivePadButton::ZL_ZR, PassivePadButton::Minus, + PassivePadButton::Plus, PassivePadButton::Capture, PassivePadButton::Home, + PassivePadButton::StickL, PassivePadButton::StickR, }; for (auto pro_button : pro_buttons) { @@ -266,9 +266,9 @@ void JoyconPoller::UpdatePasiveProPadInput(const InputReportPassive& input) { } const auto [left_axis_x, left_axis_y] = - GetPassiveAxisValue(static_cast(input.stick_state && 0xf)); + GetPassiveAxisValue(static_cast(input.stick_state & 0xf)); const auto [right_axis_x, right_axis_y] = - GetPassiveAxisValue(static_cast(input.stick_state >> 4)); + GetPassiveAxisValue(static_cast(input.stick_state >> 4)); callbacks.on_stick_data(static_cast(PadAxes::LeftStickX), left_axis_x); callbacks.on_stick_data(static_cast(PadAxes::LeftStickY), left_axis_y); callbacks.on_stick_data(static_cast(PadAxes::RightStickX), right_axis_x); @@ -283,25 +283,25 @@ f32 JoyconPoller::GetAxisValue(u16 raw_value, Joycon::JoyStickAxisCalibration ca return value / calibration.min; } -std::pair JoyconPoller::GetPassiveAxisValue(PasivePadStick raw_value) const { +std::pair JoyconPoller::GetPassiveAxisValue(PassivePadStick raw_value) const { switch (raw_value) { - case PasivePadStick::Right: + case PassivePadStick::Right: return {1.0f, 0.0f}; - case PasivePadStick::RightDown: + case PassivePadStick::RightDown: return {1.0f, -1.0f}; - case PasivePadStick::Down: + case PassivePadStick::Down: return {0.0f, -1.0f}; - case PasivePadStick::DownLeft: + case PassivePadStick::DownLeft: return {-1.0f, -1.0f}; - case PasivePadStick::Left: + case PassivePadStick::Left: return {-1.0f, 0.0f}; - case PasivePadStick::LeftUp: + case PassivePadStick::LeftUp: return {-1.0f, 1.0f}; - case PasivePadStick::Up: + case PassivePadStick::Up: return {0.0f, 1.0f}; - case PasivePadStick::UpRight: + case PassivePadStick::UpRight: return {1.0f, 1.0f}; - case PasivePadStick::Neutral: + case PassivePadStick::Neutral: default: return {0.0f, 0.0f}; } diff --git a/src/input_common/helpers/joycon_protocol/poller.h b/src/input_common/helpers/joycon_protocol/poller.h index 5c897f070..0fa72c6db 100644 --- a/src/input_common/helpers/joycon_protocol/poller.h +++ b/src/input_common/helpers/joycon_protocol/poller.h @@ -46,15 +46,15 @@ private: const MotionStatus& motion_status); void UpdateActiveProPadInput(const InputReportActive& input, const MotionStatus& motion_status); - void UpdatePasiveLeftPadInput(const InputReportPassive& buffer); - void UpdatePasiveRightPadInput(const InputReportPassive& buffer); - void UpdatePasiveProPadInput(const InputReportPassive& buffer); + void UpdatePassiveLeftPadInput(const InputReportPassive& buffer); + void UpdatePassiveRightPadInput(const InputReportPassive& buffer); + void UpdatePassiveProPadInput(const InputReportPassive& buffer); /// Returns a calibrated joystick axis from raw axis data f32 GetAxisValue(u16 raw_value, JoyStickAxisCalibration calibration) const; /// Returns a digital joystick axis from passive axis data - std::pair GetPassiveAxisValue(PasivePadStick raw_value) const; + std::pair GetPassiveAxisValue(PassivePadStick raw_value) const; /// Returns a calibrated accelerometer axis from raw motion data f32 GetAccelerometerValue(s16 raw, const MotionSensorCalibration& cal, From dcd13a7566340e80c042da7f626f9747ac71b8a7 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sat, 4 Mar 2023 21:44:31 -0500 Subject: [PATCH 0147/1181] native_clock: Re-adjust the RDTSC frequency The RDTSC frequency reported by CPUID is not accurate to its true frequency. We will spawn a separate thread to calculate the true RDTSC frequency after a measurement period of 30 seconds has elapsed. --- src/common/x64/native_clock.cpp | 34 ++++++++++++++++++++++++++++----- src/common/x64/native_clock.h | 5 +++++ 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/common/x64/native_clock.cpp b/src/common/x64/native_clock.cpp index bc1a973b0..c11590291 100644 --- a/src/common/x64/native_clock.cpp +++ b/src/common/x64/native_clock.cpp @@ -72,13 +72,29 @@ NativeClock::NativeClock(u64 emulated_cpu_frequency_, u64 emulated_clock_frequen u64 rtsc_frequency_) : WallClock(emulated_cpu_frequency_, emulated_clock_frequency_, true), rtsc_frequency{ rtsc_frequency_} { + // Thread to re-adjust the RDTSC frequency after 30 seconds has elapsed. + time_sync_thread = std::jthread{[this](std::stop_token token) { + // Get the current time. + const auto start_time = Common::SteadyClock::Now(); + const u64 tsc_start = FencedRDTSC(); + // Wait for 30 seconds. + if (!Common::StoppableTimedWait(token, std::chrono::seconds{30})) { + return; + } + const auto end_time = Common::SteadyClock::Now(); + const u64 tsc_end = FencedRDTSC(); + // Calculate differences. + const u64 timer_diff = static_cast( + std::chrono::duration_cast(end_time - start_time).count()); + const u64 tsc_diff = tsc_end - tsc_start; + const u64 tsc_freq = MultiplyAndDivide64(tsc_diff, 1000000000ULL, timer_diff); + rtsc_frequency = tsc_freq; + CalculateAndSetFactors(); + }}; + time_point.inner.last_measure = FencedRDTSC(); time_point.inner.accumulated_ticks = 0U; - ns_rtsc_factor = GetFixedPoint64Factor(NS_RATIO, rtsc_frequency); - us_rtsc_factor = GetFixedPoint64Factor(US_RATIO, rtsc_frequency); - ms_rtsc_factor = GetFixedPoint64Factor(MS_RATIO, rtsc_frequency); - clock_rtsc_factor = GetFixedPoint64Factor(emulated_clock_frequency, rtsc_frequency); - cpu_rtsc_factor = GetFixedPoint64Factor(emulated_cpu_frequency, rtsc_frequency); + CalculateAndSetFactors(); } u64 NativeClock::GetRTSC() { @@ -138,6 +154,14 @@ u64 NativeClock::GetCPUCycles() { return MultiplyHigh(rtsc_value, cpu_rtsc_factor); } +void NativeClock::CalculateAndSetFactors() { + ns_rtsc_factor = GetFixedPoint64Factor(NS_RATIO, rtsc_frequency); + us_rtsc_factor = GetFixedPoint64Factor(US_RATIO, rtsc_frequency); + ms_rtsc_factor = GetFixedPoint64Factor(MS_RATIO, rtsc_frequency); + clock_rtsc_factor = GetFixedPoint64Factor(emulated_clock_frequency, rtsc_frequency); + cpu_rtsc_factor = GetFixedPoint64Factor(emulated_cpu_frequency, rtsc_frequency); +} + } // namespace X64 } // namespace Common diff --git a/src/common/x64/native_clock.h b/src/common/x64/native_clock.h index 38ae7a462..03ca291d8 100644 --- a/src/common/x64/native_clock.h +++ b/src/common/x64/native_clock.h @@ -3,6 +3,7 @@ #pragma once +#include "common/polyfill_thread.h" #include "common/wall_clock.h" namespace Common { @@ -28,6 +29,8 @@ public: private: u64 GetRTSC(); + void CalculateAndSetFactors(); + union alignas(16) TimePoint { TimePoint() : pack{} {} u128 pack{}; @@ -47,6 +50,8 @@ private: u64 ms_rtsc_factor{}; u64 rtsc_frequency; + + std::jthread time_sync_thread; }; } // namespace X64 From 6f9918552c6a1d56a21fa544a7776cd1e5af7bc4 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sat, 4 Mar 2023 22:59:04 -0500 Subject: [PATCH 0148/1181] steady_clock: Introduce a real time clock --- src/common/steady_clock.cpp | 25 +++++++++++++++++++++++++ src/common/steady_clock.h | 11 +++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/common/steady_clock.cpp b/src/common/steady_clock.cpp index 0d5908aa7..782859196 100644 --- a/src/common/steady_clock.cpp +++ b/src/common/steady_clock.cpp @@ -23,6 +23,19 @@ static s64 WindowsQueryPerformanceCounter() { QueryPerformanceCounter(&counter); return counter.QuadPart; } + +static s64 GetSystemTimeNS() { + // GetSystemTimePreciseAsFileTime returns the file time in 100ns units. + static constexpr s64 Multiplier = 100; + // Convert Windows epoch to Unix epoch. + static constexpr s64 WindowsEpochToUnixEpochNS = 0x19DB1DED53E8000LL; + + FILETIME filetime; + GetSystemTimePreciseAsFileTime(&filetime); + return Multiplier * ((static_cast(filetime.dwHighDateTime) << 32) + + static_cast(filetime.dwLowDateTime)) - + WindowsEpochToUnixEpochNS; +} #endif SteadyClock::time_point SteadyClock::Now() noexcept { @@ -53,4 +66,16 @@ SteadyClock::time_point SteadyClock::Now() noexcept { #endif } +RealTimeClock::time_point RealTimeClock::Now() noexcept { +#if defined(_WIN32) + return time_point{duration{GetSystemTimeNS()}}; +#elif defined(__APPLE__) + return time_point{duration{clock_gettime_nsec_np(CLOCK_REALTIME)}}; +#else + timespec ts; + clock_gettime(CLOCK_REALTIME, &ts); + return time_point{std::chrono::seconds{ts.tv_sec} + std::chrono::nanoseconds{ts.tv_nsec}}; +#endif +} + }; // namespace Common diff --git a/src/common/steady_clock.h b/src/common/steady_clock.h index 9497cf865..dbd0e2513 100644 --- a/src/common/steady_clock.h +++ b/src/common/steady_clock.h @@ -20,4 +20,15 @@ struct SteadyClock { [[nodiscard]] static time_point Now() noexcept; }; +struct RealTimeClock { + using rep = s64; + using period = std::nano; + using duration = std::chrono::nanoseconds; + using time_point = std::chrono::time_point; + + static constexpr bool is_steady = false; + + [[nodiscard]] static time_point Now() noexcept; +}; + } // namespace Common From c27a626b5bc1aa2ae593f44b0a7c10ae3c979291 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sun, 5 Mar 2023 02:42:48 -0500 Subject: [PATCH 0149/1181] native_clock: Use RealTimeClock instead of SteadyClock We want to synchronize RDTSC to real time. --- src/common/x64/native_clock.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/x64/native_clock.cpp b/src/common/x64/native_clock.cpp index c11590291..3f90343a5 100644 --- a/src/common/x64/native_clock.cpp +++ b/src/common/x64/native_clock.cpp @@ -53,11 +53,11 @@ u64 EstimateRDTSCFrequency() { FencedRDTSC(); // Get the current time. - const auto start_time = Common::SteadyClock::Now(); + const auto start_time = Common::RealTimeClock::Now(); const u64 tsc_start = FencedRDTSC(); // Wait for 250 milliseconds. std::this_thread::sleep_for(std::chrono::milliseconds{250}); - const auto end_time = Common::SteadyClock::Now(); + const auto end_time = Common::RealTimeClock::Now(); const u64 tsc_end = FencedRDTSC(); // Calculate differences. const u64 timer_diff = static_cast( @@ -75,13 +75,13 @@ NativeClock::NativeClock(u64 emulated_cpu_frequency_, u64 emulated_clock_frequen // Thread to re-adjust the RDTSC frequency after 30 seconds has elapsed. time_sync_thread = std::jthread{[this](std::stop_token token) { // Get the current time. - const auto start_time = Common::SteadyClock::Now(); + const auto start_time = Common::RealTimeClock::Now(); const u64 tsc_start = FencedRDTSC(); // Wait for 30 seconds. if (!Common::StoppableTimedWait(token, std::chrono::seconds{30})) { return; } - const auto end_time = Common::SteadyClock::Now(); + const auto end_time = Common::RealTimeClock::Now(); const u64 tsc_end = FencedRDTSC(); // Calculate differences. const u64 timer_diff = static_cast( From d718eab351292e3c4d168738f9cd543044c335bc Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sun, 5 Mar 2023 20:54:13 -0500 Subject: [PATCH 0150/1181] native_clock: Wait for 10 seconds instead of 30 It was experimentally determined to be sufficient. --- src/common/x64/native_clock.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/x64/native_clock.cpp b/src/common/x64/native_clock.cpp index 3f90343a5..76c66e7ee 100644 --- a/src/common/x64/native_clock.cpp +++ b/src/common/x64/native_clock.cpp @@ -72,13 +72,13 @@ NativeClock::NativeClock(u64 emulated_cpu_frequency_, u64 emulated_clock_frequen u64 rtsc_frequency_) : WallClock(emulated_cpu_frequency_, emulated_clock_frequency_, true), rtsc_frequency{ rtsc_frequency_} { - // Thread to re-adjust the RDTSC frequency after 30 seconds has elapsed. + // Thread to re-adjust the RDTSC frequency after 10 seconds has elapsed. time_sync_thread = std::jthread{[this](std::stop_token token) { // Get the current time. const auto start_time = Common::RealTimeClock::Now(); const u64 tsc_start = FencedRDTSC(); - // Wait for 30 seconds. - if (!Common::StoppableTimedWait(token, std::chrono::seconds{30})) { + // Wait for 10 seconds. + if (!Common::StoppableTimedWait(token, std::chrono::seconds{10})) { return; } const auto end_time = Common::RealTimeClock::Now(); From 3053a6237525ae870791eff480812016a3d4ec1e Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sun, 5 Mar 2023 22:27:03 -0500 Subject: [PATCH 0151/1181] core: Promote CPU/GPU threads to time critical And also demote Audren and CoreTiming to High thread priority. --- src/audio_core/renderer/adsp/audio_renderer.cpp | 2 +- src/core/core_timing.cpp | 2 +- src/core/cpu_manager.cpp | 2 +- src/video_core/gpu_thread.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/audio_core/renderer/adsp/audio_renderer.cpp b/src/audio_core/renderer/adsp/audio_renderer.cpp index 78c15629b..0e437e779 100644 --- a/src/audio_core/renderer/adsp/audio_renderer.cpp +++ b/src/audio_core/renderer/adsp/audio_renderer.cpp @@ -135,7 +135,7 @@ void AudioRenderer::ThreadFunc() { static constexpr char name[]{"AudioRenderer"}; MicroProfileOnThreadCreate(name); Common::SetCurrentThreadName(name); - Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical); + Common::SetCurrentThreadPriority(Common::ThreadPriority::High); if (mailbox->ADSPWaitMessage() != RenderMessage::AudioRenderer_InitializeOK) { LOG_ERROR(Service_Audio, "ADSP Audio Renderer -- Failed to receive initialize message from host!"); diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 742cfb996..cd4df4522 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -53,7 +53,7 @@ void CoreTiming::ThreadEntry(CoreTiming& instance) { static constexpr char name[] = "HostTiming"; MicroProfileOnThreadCreate(name); Common::SetCurrentThreadName(name); - Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical); + Common::SetCurrentThreadPriority(Common::ThreadPriority::High); instance.on_thread_init(); instance.ThreadLoop(); MicroProfileOnThreadExit(); diff --git a/src/core/cpu_manager.cpp b/src/core/cpu_manager.cpp index 04a11f444..980bb97f9 100644 --- a/src/core/cpu_manager.cpp +++ b/src/core/cpu_manager.cpp @@ -192,7 +192,7 @@ void CpuManager::RunThread(std::stop_token token, std::size_t core) { } MicroProfileOnThreadCreate(name.c_str()); Common::SetCurrentThreadName(name.c_str()); - Common::SetCurrentThreadPriority(Common::ThreadPriority::High); + Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical); auto& data = core_data[core]; data.host_context = Common::Fiber::ThreadToFiber(); diff --git a/src/video_core/gpu_thread.cpp b/src/video_core/gpu_thread.cpp index 9c103c0d4..050b11874 100644 --- a/src/video_core/gpu_thread.cpp +++ b/src/video_core/gpu_thread.cpp @@ -25,7 +25,7 @@ static void RunThread(std::stop_token stop_token, Core::System& system, SCOPE_EXIT({ MicroProfileOnThreadExit(); }); Common::SetCurrentThreadName(name.c_str()); - Common::SetCurrentThreadPriority(Common::ThreadPriority::High); + Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical); system.RegisterHostThread(); auto current_context = context.Acquire(); From 1073346c7f5541056b7ea88a701ad2e8e91a89b2 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Tue, 7 Mar 2023 19:24:13 -0500 Subject: [PATCH 0152/1181] hid: Use nanosecond timestamps instead of ticks --- src/core/hle/service/hid/controllers/stubbed.cpp | 2 +- src/core/hle/service/hid/controllers/touchscreen.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/hle/service/hid/controllers/stubbed.cpp b/src/core/hle/service/hid/controllers/stubbed.cpp index df9ee0c3f..9e2f3ab21 100644 --- a/src/core/hle/service/hid/controllers/stubbed.cpp +++ b/src/core/hle/service/hid/controllers/stubbed.cpp @@ -26,7 +26,7 @@ void Controller_Stubbed::OnUpdate(const Core::Timing::CoreTiming& core_timing) { } CommonHeader header{}; - header.timestamp = core_timing.GetCPUTicks(); + header.timestamp = core_timing.GetGlobalTimeNs().count(); header.total_entry_count = 17; header.entry_count = 0; header.last_entry_index = 0; diff --git a/src/core/hle/service/hid/controllers/touchscreen.cpp b/src/core/hle/service/hid/controllers/touchscreen.cpp index d90a4e732..3ef91df4b 100644 --- a/src/core/hle/service/hid/controllers/touchscreen.cpp +++ b/src/core/hle/service/hid/controllers/touchscreen.cpp @@ -32,7 +32,7 @@ void Controller_Touchscreen::OnInit() {} void Controller_Touchscreen::OnRelease() {} void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timing) { - shared_memory->touch_screen_lifo.timestamp = core_timing.GetCPUTicks(); + shared_memory->touch_screen_lifo.timestamp = core_timing.GetGlobalTimeNs().count(); if (!IsControllerActivated()) { shared_memory->touch_screen_lifo.buffer_count = 0; @@ -85,7 +85,7 @@ void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timin const auto active_fingers_count = static_cast(std::distance(active_fingers.begin(), end_iter)); - const u64 tick = core_timing.GetCPUTicks(); + const u64 timestamp = static_cast(core_timing.GetGlobalTimeNs().count()); const auto& last_entry = shared_memory->touch_screen_lifo.ReadCurrentEntry().state; next_state.sampling_number = last_entry.sampling_number + 1; @@ -102,8 +102,8 @@ void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timin touch_entry.diameter_x = Settings::values.touchscreen.diameter_x; touch_entry.diameter_y = Settings::values.touchscreen.diameter_y; touch_entry.rotation_angle = Settings::values.touchscreen.rotation_angle; - touch_entry.delta_time = tick - active_fingers[id].last_touch; - fingers[active_fingers[id].id].last_touch = tick; + touch_entry.delta_time = timestamp - active_fingers[id].last_touch; + fingers[active_fingers[id].id].last_touch = timestamp; touch_entry.finger = active_fingers[id].id; touch_entry.attribute.raw = active_fingers[id].attribute.raw; } else { From 67560296c697914f6bf809dca2ab555038b19aa2 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Tue, 7 Mar 2023 23:11:01 -0500 Subject: [PATCH 0153/1181] perf_stats: Check multicore first SpeedLimiting is SC only. Since MC is performance oriented we should check for it first to skip checking use_speed_limit. --- src/core/perf_stats.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp index f09c176f8..1231c0dc8 100644 --- a/src/core/perf_stats.cpp +++ b/src/core/perf_stats.cpp @@ -126,8 +126,8 @@ double PerfStats::GetLastFrameTimeScale() const { } void SpeedLimiter::DoSpeedLimiting(microseconds current_system_time_us) { - if (!Settings::values.use_speed_limit.GetValue() || - Settings::values.use_multi_core.GetValue()) { + if (Settings::values.use_multi_core.GetValue() || + !Settings::values.use_speed_limit.GetValue()) { return; } From 03137086dbb341052121e798ef7895ace19dd685 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Tue, 7 Mar 2023 22:33:11 -0500 Subject: [PATCH 0154/1181] OpenGL: Prefer glClientWaitSync for OGLSync objects At least on Nvidia, glClientWaitSync with a timeout of 0 (non-blocking) is faster than glGetSynciv of GL_SYNC_STATUS. --- src/video_core/renderer_opengl/gl_fence_manager.cpp | 4 +--- .../renderer_opengl/gl_graphics_pipeline.cpp | 5 +---- src/video_core/renderer_opengl/gl_resource_manager.cpp | 10 ++++++++++ src/video_core/renderer_opengl/gl_resource_manager.h | 3 +++ src/video_core/renderer_opengl/gl_texture_cache.cpp | 4 +--- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_fence_manager.cpp b/src/video_core/renderer_opengl/gl_fence_manager.cpp index 91463f854..5326172af 100644 --- a/src/video_core/renderer_opengl/gl_fence_manager.cpp +++ b/src/video_core/renderer_opengl/gl_fence_manager.cpp @@ -27,9 +27,7 @@ bool GLInnerFence::IsSignaled() const { return true; } ASSERT(sync_object.handle != 0); - GLint sync_status; - glGetSynciv(sync_object.handle, GL_SYNC_STATUS, 1, nullptr, &sync_status); - return sync_status == GL_SIGNALED; + return sync_object.IsSignaled(); } void GLInnerFence::Wait() { diff --git a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp index 29491e762..89000d6e0 100644 --- a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp +++ b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp @@ -621,10 +621,7 @@ bool GraphicsPipeline::IsBuilt() noexcept { if (built_fence.handle == 0) { return false; } - // Timeout of zero means this is non-blocking - const auto sync_status = glClientWaitSync(built_fence.handle, 0, 0); - ASSERT(sync_status != GL_WAIT_FAILED); - is_built = sync_status != GL_TIMEOUT_EXPIRED; + is_built = built_fence.IsSignaled(); return is_built; } diff --git a/src/video_core/renderer_opengl/gl_resource_manager.cpp b/src/video_core/renderer_opengl/gl_resource_manager.cpp index 3a664fdec..eae8fd110 100644 --- a/src/video_core/renderer_opengl/gl_resource_manager.cpp +++ b/src/video_core/renderer_opengl/gl_resource_manager.cpp @@ -3,6 +3,7 @@ #include #include +#include "common/assert.h" #include "common/microprofile.h" #include "video_core/renderer_opengl/gl_resource_manager.h" #include "video_core/renderer_opengl/gl_shader_util.h" @@ -158,6 +159,15 @@ void OGLSync::Release() { handle = 0; } +bool OGLSync::IsSignaled() const noexcept { + // At least on Nvidia, glClientWaitSync with a timeout of 0 + // is faster than glGetSynciv of GL_SYNC_STATUS. + // Timeout of 0 means this check is non-blocking. + const auto sync_status = glClientWaitSync(handle, 0, 0); + ASSERT(sync_status != GL_WAIT_FAILED); + return sync_status != GL_TIMEOUT_EXPIRED; +} + void OGLFramebuffer::Create() { if (handle != 0) return; diff --git a/src/video_core/renderer_opengl/gl_resource_manager.h b/src/video_core/renderer_opengl/gl_resource_manager.h index bc05ba4bd..77362acd2 100644 --- a/src/video_core/renderer_opengl/gl_resource_manager.h +++ b/src/video_core/renderer_opengl/gl_resource_manager.h @@ -263,6 +263,9 @@ public: /// Deletes the internal OpenGL resource void Release(); + /// Checks if the sync has been signaled + bool IsSignaled() const noexcept; + GLsync handle = 0; }; diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index b047e7b3d..acff3b8ec 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -714,9 +714,7 @@ std::optional TextureCacheRuntime::StagingBuffers::FindBuffer(size_t req continue; } if (syncs[index].handle != 0) { - GLint status; - glGetSynciv(syncs[index].handle, GL_SYNC_STATUS, 1, nullptr, &status); - if (status != GL_SIGNALED) { + if (!syncs[index].IsSignaled()) { continue; } syncs[index].Release(); From 8d5cde6eff64b6380f41233b55c94bfe24687fb7 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Wed, 8 Mar 2023 22:15:36 -0600 Subject: [PATCH 0155/1181] service: nfp: Improve implementation --- .../hle/service/am/applets/applet_cabinet.cpp | 4 +- src/core/hle/service/nfp/amiibo_crypto.cpp | 14 +- src/core/hle/service/nfp/nfp_device.cpp | 210 +++++++++++++++--- src/core/hle/service/nfp/nfp_device.h | 9 +- src/core/hle/service/nfp/nfp_types.h | 49 +++- 5 files changed, 234 insertions(+), 52 deletions(-) diff --git a/src/core/hle/service/am/applets/applet_cabinet.cpp b/src/core/hle/service/am/applets/applet_cabinet.cpp index d0969b0f1..162687b29 100644 --- a/src/core/hle/service/am/applets/applet_cabinet.cpp +++ b/src/core/hle/service/am/applets/applet_cabinet.cpp @@ -119,7 +119,7 @@ void Cabinet::DisplayCompleted(bool apply_changes, std::string_view amiibo_name) case Service::NFP::CabinetMode::StartNicknameAndOwnerSettings: { Service::NFP::AmiiboName name{}; std::memcpy(name.data(), amiibo_name.data(), std::min(amiibo_name.size(), name.size() - 1)); - nfp_device->SetNicknameAndOwner(name); + nfp_device->SetRegisterInfoPrivate(name); break; } case Service::NFP::CabinetMode::StartGameDataEraser: @@ -129,7 +129,7 @@ void Cabinet::DisplayCompleted(bool apply_changes, std::string_view amiibo_name) nfp_device->RestoreAmiibo(); break; case Service::NFP::CabinetMode::StartFormatter: - nfp_device->DeleteAllData(); + nfp_device->Format(); break; default: UNIMPLEMENTED_MSG("Unknown CabinetMode={}", applet_input_common.applet_mode); diff --git a/src/core/hle/service/nfp/amiibo_crypto.cpp b/src/core/hle/service/nfp/amiibo_crypto.cpp index ffb2f959c..ddf04b1d7 100644 --- a/src/core/hle/service/nfp/amiibo_crypto.cpp +++ b/src/core/hle/service/nfp/amiibo_crypto.cpp @@ -80,13 +80,16 @@ NTAG215File NfcDataToEncodedData(const EncryptedNTAG215File& nfc_data) { encoded_data.hmac_data = nfc_data.user_memory.hmac_data; encoded_data.constant_value = nfc_data.user_memory.constant_value; encoded_data.write_counter = nfc_data.user_memory.write_counter; + encoded_data.amiibo_version = nfc_data.user_memory.amiibo_version; encoded_data.settings = nfc_data.user_memory.settings; encoded_data.owner_mii = nfc_data.user_memory.owner_mii; - encoded_data.title_id = nfc_data.user_memory.title_id; - encoded_data.applicaton_write_counter = nfc_data.user_memory.applicaton_write_counter; + encoded_data.application_id = nfc_data.user_memory.application_id; + encoded_data.application_write_counter = nfc_data.user_memory.application_write_counter; encoded_data.application_area_id = nfc_data.user_memory.application_area_id; + encoded_data.application_id_byte = nfc_data.user_memory.application_id_byte; encoded_data.unknown = nfc_data.user_memory.unknown; encoded_data.unknown2 = nfc_data.user_memory.unknown2; + encoded_data.application_area_crc = nfc_data.user_memory.application_area_crc; encoded_data.application_area = nfc_data.user_memory.application_area; encoded_data.hmac_tag = nfc_data.user_memory.hmac_tag; encoded_data.lock_bytes = nfc_data.uuid.lock_bytes; @@ -111,13 +114,16 @@ EncryptedNTAG215File EncodedDataToNfcData(const NTAG215File& encoded_data) { nfc_data.user_memory.hmac_data = encoded_data.hmac_data; nfc_data.user_memory.constant_value = encoded_data.constant_value; nfc_data.user_memory.write_counter = encoded_data.write_counter; + nfc_data.user_memory.amiibo_version = encoded_data.amiibo_version; nfc_data.user_memory.settings = encoded_data.settings; nfc_data.user_memory.owner_mii = encoded_data.owner_mii; - nfc_data.user_memory.title_id = encoded_data.title_id; - nfc_data.user_memory.applicaton_write_counter = encoded_data.applicaton_write_counter; + nfc_data.user_memory.application_id = encoded_data.application_id; + nfc_data.user_memory.application_write_counter = encoded_data.application_write_counter; nfc_data.user_memory.application_area_id = encoded_data.application_area_id; + nfc_data.user_memory.application_id_byte = encoded_data.application_id_byte; nfc_data.user_memory.unknown = encoded_data.unknown; nfc_data.user_memory.unknown2 = encoded_data.unknown2; + nfc_data.user_memory.application_area_crc = encoded_data.application_area_crc; nfc_data.user_memory.application_area = encoded_data.application_area; nfc_data.user_memory.hmac_tag = encoded_data.hmac_tag; nfc_data.user_memory.model_info = encoded_data.model_info; diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfp/nfp_device.cpp index 1bdc42741..ddff90d6a 100644 --- a/src/core/hle/service/nfp/nfp_device.cpp +++ b/src/core/hle/service/nfp/nfp_device.cpp @@ -174,8 +174,8 @@ Result NfpDevice::StopDetection() { if (device_state == DeviceState::TagFound || device_state == DeviceState::TagMounted) { CloseAmiibo(); - return ResultSuccess; } + if (device_state == DeviceState::SearchingForTag || device_state == DeviceState::TagRemoved) { device_state = DeviceState::Initialized; return ResultSuccess; @@ -204,9 +204,7 @@ Result NfpDevice::Flush() { const auto& current_date = GetAmiiboDate(current_posix_time); if (settings.write_date.raw_date != current_date.raw_date) { settings.write_date = current_date; - settings.crc_counter++; - // TODO: Find how to calculate the crc check - // settings.crc = CalculateCRC(settings); + UpdateSettingsCrc(); } tag_data.write_counter++; @@ -318,7 +316,7 @@ Result NfpDevice::GetCommonInfo(CommonInfo& common_info) const { common_info = { .last_write_date = settings.write_date.GetWriteDate(), .write_counter = tag_data.write_counter, - .version = 0, + .version = tag_data.amiibo_version, .application_area_size = sizeof(ApplicationArea), }; return ResultSuccess; @@ -370,13 +368,95 @@ Result NfpDevice::GetRegisterInfo(RegisterInfo& register_info) const { .mii_char_info = manager.ConvertV3ToCharInfo(tag_data.owner_mii), .creation_date = settings.init_date.GetWriteDate(), .amiibo_name = GetAmiiboName(settings), - .font_region = {}, + .font_region = settings.settings.font_region, }; return ResultSuccess; } -Result NfpDevice::SetNicknameAndOwner(const AmiiboName& amiibo_name) { +Result NfpDevice::GetAdminInfo(AdminInfo& admin_info) const { + if (device_state != DeviceState::TagMounted) { + LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); + if (device_state == DeviceState::TagRemoved) { + return TagRemoved; + } + return WrongDeviceState; + } + + if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); + return WrongDeviceState; + } + + u8 flags = static_cast(tag_data.settings.settings.raw >> 0x4); + if (tag_data.settings.settings.amiibo_initialized == 0) { + flags = flags & 0xfe; + } + + u64 application_id = 0; + u32 application_area_id = 0; + AppAreaVersion app_area_version = AppAreaVersion::NotSet; + if (tag_data.settings.settings.appdata_initialized != 0) { + application_id = tag_data.application_id; + app_area_version = + static_cast(application_id >> application_id_version_offset & 0xf); + + // Restore application id to original value + if (application_id >> 0x38 != 0) { + const u8 application_byte = tag_data.application_id_byte & 0xf; + application_id = RemoveVersionByte(application_id) | + (static_cast(application_byte) << application_id_version_offset); + } + + application_area_id = tag_data.application_area_id; + } + + // TODO: Validate this data + admin_info = { + .application_id = application_id, + .application_area_id = application_area_id, + .crc_change_counter = tag_data.settings.crc_counter, + .flags = flags, + .tag_type = PackedTagType::Type2, + .app_area_version = app_area_version, + }; + + return ResultSuccess; +} + +Result NfpDevice::DeleteRegisterInfo() { + if (device_state != DeviceState::TagMounted) { + LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); + if (device_state == DeviceState::TagRemoved) { + return TagRemoved; + } + return WrongDeviceState; + } + + if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); + return WrongDeviceState; + } + + if (tag_data.settings.settings.amiibo_initialized == 0) { + return RegistrationIsNotInitialized; + } + + Common::TinyMT rng{}; + rng.GenerateRandomBytes(&tag_data.owner_mii, sizeof(tag_data.owner_mii)); + rng.GenerateRandomBytes(&tag_data.settings.amiibo_name, sizeof(tag_data.settings.amiibo_name)); + rng.GenerateRandomBytes(&tag_data.unknown, sizeof(u8)); + rng.GenerateRandomBytes(&tag_data.unknown2[0], sizeof(u32)); + rng.GenerateRandomBytes(&tag_data.unknown2[1], sizeof(u32)); + rng.GenerateRandomBytes(&tag_data.application_area_crc, sizeof(u32)); + rng.GenerateRandomBytes(&tag_data.settings.init_date, sizeof(u32)); + tag_data.settings.settings.font_region.Assign(0); + tag_data.settings.settings.amiibo_initialized.Assign(0); + + return Flush(); +} + +Result NfpDevice::SetRegisterInfoPrivate(const AmiiboName& amiibo_name) { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { @@ -393,16 +473,23 @@ Result NfpDevice::SetNicknameAndOwner(const AmiiboName& amiibo_name) { Service::Mii::MiiManager manager; auto& settings = tag_data.settings; - settings.init_date = GetAmiiboDate(current_posix_time); - settings.write_date = GetAmiiboDate(current_posix_time); - settings.crc_counter++; - // TODO: Find how to calculate the crc check - // settings.crc = CalculateCRC(settings); + if (tag_data.settings.settings.amiibo_initialized == 0) { + settings.init_date = GetAmiiboDate(current_posix_time); + settings.write_date.raw_date = 0; + } SetAmiiboName(settings, amiibo_name); tag_data.owner_mii = manager.ConvertCharInfoToV3(manager.BuildDefault(0)); + tag_data.unknown = 0; + tag_data.unknown2[6] = 0; + settings.country_code_id = 0; + settings.settings.font_region.Assign(0); settings.settings.amiibo_initialized.Assign(1); + // TODO: this is a mix of tag.file input + std::array unknown_input{}; + tag_data.application_area_crc = CalculateCrc(unknown_input); + return Flush(); } @@ -425,24 +512,18 @@ Result NfpDevice::RestoreAmiibo() { return ResultSuccess; } -Result NfpDevice::DeleteAllData() { - const auto result = DeleteApplicationArea(); - if (result.IsError()) { - return result; +Result NfpDevice::Format() { + auto result1 = DeleteApplicationArea(); + auto result2 = DeleteRegisterInfo(); + + if (result1.IsError()) { + return result1; } - if (device_state != DeviceState::TagMounted) { - LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); - if (device_state == DeviceState::TagRemoved) { - return TagRemoved; - } - return WrongDeviceState; + if (result2.IsError()) { + return result2; } - Common::TinyMT rng{}; - rng.GenerateRandomBytes(&tag_data.owner_mii, sizeof(tag_data.owner_mii)); - tag_data.settings.settings.amiibo_initialized.Assign(0); - return Flush(); } @@ -569,7 +650,10 @@ Result NfpDevice::SetApplicationArea(std::span data) { rng.GenerateRandomBytes(tag_data.application_area.data() + data.size(), sizeof(ApplicationArea) - data.size()); - tag_data.applicaton_write_counter++; + if (tag_data.application_write_counter != counter_limit) { + tag_data.application_write_counter++; + } + is_data_moddified = true; return ResultSuccess; @@ -617,14 +701,25 @@ Result NfpDevice::RecreateApplicationArea(u32 access_id, std::span dat rng.GenerateRandomBytes(tag_data.application_area.data() + data.size(), sizeof(ApplicationArea) - data.size()); - // TODO: Investigate why the title id needs to be moddified - tag_data.title_id = system.GetApplicationProcessProgramID(); - tag_data.title_id = tag_data.title_id | 0x30000000ULL; + if (tag_data.application_write_counter != counter_limit) { + tag_data.application_write_counter++; + } + + const u64 application_id = system.GetApplicationProcessProgramID(); + + tag_data.application_id_byte = + static_cast(application_id >> application_id_version_offset & 0xf); + tag_data.application_id = + RemoveVersionByte(application_id) | + (static_cast(AppAreaVersion::NintendoSwitch) << application_id_version_offset); tag_data.settings.settings.appdata_initialized.Assign(1); tag_data.application_area_id = access_id; - tag_data.applicaton_write_counter++; tag_data.unknown = {}; + // TODO: this is a mix of tag_data input + std::array unknown_input{}; + tag_data.application_area_crc = CalculateCrc(unknown_input); + return Flush(); } @@ -642,12 +737,20 @@ Result NfpDevice::DeleteApplicationArea() { return WrongDeviceState; } + if (tag_data.settings.settings.appdata_initialized == 0) { + return ApplicationAreaIsNotInitialized; + } + + if (tag_data.application_write_counter != counter_limit) { + tag_data.application_write_counter++; + } + Common::TinyMT rng{}; rng.GenerateRandomBytes(tag_data.application_area.data(), sizeof(ApplicationArea)); - rng.GenerateRandomBytes(&tag_data.title_id, sizeof(u64)); + rng.GenerateRandomBytes(&tag_data.application_id, sizeof(u64)); rng.GenerateRandomBytes(&tag_data.application_area_id, sizeof(u32)); + rng.GenerateRandomBytes(&tag_data.application_id_byte, sizeof(u8)); tag_data.settings.settings.appdata_initialized.Assign(0); - tag_data.applicaton_write_counter++; tag_data.unknown = {}; return Flush(); @@ -719,4 +822,45 @@ AmiiboDate NfpDevice::GetAmiiboDate(s64 posix_time) const { return amiibo_date; } +u64 NfpDevice::RemoveVersionByte(u64 application_id) const { + return application_id & ~(0xfULL << application_id_version_offset); +} + +void NfpDevice::UpdateSettingsCrc() { + auto& settings = tag_data.settings; + + if (settings.crc_counter != counter_limit) { + settings.crc_counter++; + } + + // TODO: this reads data from a global, find what it is + std::array unknown_input{}; + settings.crc = CalculateCrc(unknown_input); +} + +u32 NfpDevice::CalculateCrc(std::span data) { + constexpr u32 magic = 0xedb88320; + u32 crc = 0xffffffff; + + if (data.size() == 0) { + return 0; + } + + for (u8 input : data) { + u32 temp = (crc ^ input) >> 1; + if (((crc ^ input) & 1) != 0) { + temp = temp ^ magic; + } + + for (std::size_t step = 0; step < 7; ++step) { + crc = temp >> 1; + if ((temp & 1) != 0) { + crc = temp >> 1 ^ magic; + } + } + } + + return ~crc; +} + } // namespace Service::NFP diff --git a/src/core/hle/service/nfp/nfp_device.h b/src/core/hle/service/nfp/nfp_device.h index b6a46f2ac..06386401d 100644 --- a/src/core/hle/service/nfp/nfp_device.h +++ b/src/core/hle/service/nfp/nfp_device.h @@ -47,10 +47,12 @@ public: Result GetCommonInfo(CommonInfo& common_info) const; Result GetModelInfo(ModelInfo& model_info) const; Result GetRegisterInfo(RegisterInfo& register_info) const; + Result GetAdminInfo(AdminInfo& admin_info) const; - Result SetNicknameAndOwner(const AmiiboName& amiibo_name); + Result DeleteRegisterInfo(); + Result SetRegisterInfoPrivate(const AmiiboName& amiibo_name); Result RestoreAmiibo(); - Result DeleteAllData(); + Result Format(); Result OpenApplicationArea(u32 access_id); Result GetApplicationAreaId(u32& application_area_id) const; @@ -76,6 +78,9 @@ private: AmiiboName GetAmiiboName(const AmiiboSettings& settings) const; void SetAmiiboName(AmiiboSettings& settings, const AmiiboName& amiibo_name); AmiiboDate GetAmiiboDate(s64 posix_time) const; + u64 RemoveVersionByte(u64 application_id) const; + void UpdateSettingsCrc(); + u32 CalculateCrc(std::span); bool is_controller_set{}; int callback_key; diff --git a/src/core/hle/service/nfp/nfp_types.h b/src/core/hle/service/nfp/nfp_types.h index fc228c2b2..142343d6e 100644 --- a/src/core/hle/service/nfp/nfp_types.h +++ b/src/core/hle/service/nfp/nfp_types.h @@ -10,6 +10,8 @@ namespace Service::NFP { static constexpr std::size_t amiibo_name_length = 0xA; +static constexpr std::size_t application_id_version_offset = 0x1c; +static constexpr std::size_t counter_limit = 0xffff; enum class ServiceType : u32 { User, @@ -99,6 +101,14 @@ enum class TagProtocol : u32 { All = 0xFFFFFFFFU, }; +enum class AppAreaVersion : u8 { + Nintendo3DS = 0, + NintendoWiiU = 1, + Nintendo3DSv2 = 2, + NintendoSwitch = 3, + NotSet = 0xFF, +}; + enum class CabinetMode : u8 { StartNicknameAndOwnerSettings, StartGameDataEraser, @@ -197,6 +207,7 @@ struct Settings { union { u8 raw{}; + BitField<0, 4, u8> font_region; BitField<4, 1, u8> amiibo_initialized; BitField<5, 1, u8> appdata_initialized; }; @@ -236,18 +247,20 @@ static_assert(sizeof(NTAG215Password) == 0x8, "NTAG215Password is an invalid siz struct EncryptedAmiiboFile { u8 constant_value; // Must be A5 u16_be write_counter; // Number of times the amiibo has been written? - INSERT_PADDING_BYTES(0x1); // Unknown 1 + u8 amiibo_version; // Amiibo file version AmiiboSettings settings; // Encrypted amiibo settings HashData hmac_tag; // Hash AmiiboModelInfo model_info; // Encrypted amiibo model info HashData keygen_salt; // Salt HashData hmac_data; // Hash Service::Mii::Ver3StoreData owner_mii; // Encrypted Mii data - u64_be title_id; // Encrypted Game id - u16_be applicaton_write_counter; // Encrypted Counter + u64_be application_id; // Encrypted Game id + u16_be application_write_counter; // Encrypted Counter u32_be application_area_id; // Encrypted Game id - std::array unknown; - std::array unknown2; + u8 application_id_byte; + u8 unknown; + std::array unknown2; + u32_be application_area_crc; ApplicationArea application_area; // Encrypted Game data }; static_assert(sizeof(EncryptedAmiiboFile) == 0x1F8, "AmiiboFile is an invalid size"); @@ -259,14 +272,16 @@ struct NTAG215File { HashData hmac_data; // Hash u8 constant_value; // Must be A5 u16_be write_counter; // Number of times the amiibo has been written? - INSERT_PADDING_BYTES(0x1); // Unknown 1 + u8 amiibo_version; // Amiibo file version AmiiboSettings settings; - Service::Mii::Ver3StoreData owner_mii; // Encrypted Mii data - u64_be title_id; - u16_be applicaton_write_counter; // Encrypted Counter + Service::Mii::Ver3StoreData owner_mii; // Mii data + u64_be application_id; // Game id + u16_be application_write_counter; // Counter u32_be application_area_id; - std::array unknown; - std::array unknown2; + u8 application_id_byte; + u8 unknown; + std::array unknown2; + u32_be application_area_crc; ApplicationArea application_area; // Encrypted Game data HashData hmac_tag; // Hash UniqueSerialNumber uid; // Unique serial number @@ -336,6 +351,18 @@ struct RegisterInfo { }; static_assert(sizeof(RegisterInfo) == 0x100, "RegisterInfo is an invalid size"); +struct AdminInfo { + u64 application_id; + u32 application_area_id; + u16 crc_change_counter; + u8 flags; + PackedTagType tag_type; + AppAreaVersion app_area_version; + INSERT_PADDING_BYTES(0x7); + INSERT_PADDING_BYTES(0x28); +}; +static_assert(sizeof(AdminInfo) == 0x40, "AdminInfo is an invalid size"); + struct SectorKey { MifareCmd command; u8 unknown; // Usually 1 From c8ad0396120e2a1af029a819927b0a3c82a0e64e Mon Sep 17 00:00:00 2001 From: Feng Chen Date: Fri, 10 Mar 2023 15:06:56 +0800 Subject: [PATCH 0156/1181] video_core: Update texture format --- .../renderer_vulkan/maxwell_to_vk.cpp | 7 +- .../texture_cache/format_lookup_table.cpp | 62 ++++++++-------- src/video_core/textures/texture.h | 70 +++++++++---------- 3 files changed, 67 insertions(+), 72 deletions(-) diff --git a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp index ca52e2389..5dce51be8 100644 --- a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp +++ b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp @@ -166,7 +166,7 @@ struct FormatTuple { {VK_FORMAT_R16G16_UINT, Attachable | Storage}, // R16G16_UINT {VK_FORMAT_R16G16_SINT, Attachable | Storage}, // R16G16_SINT {VK_FORMAT_R16G16_SNORM, Attachable | Storage}, // R16G16_SNORM - {VK_FORMAT_UNDEFINED}, // R32G32B32_FLOAT + {VK_FORMAT_R32G32B32_SFLOAT}, // R32G32B32_FLOAT {VK_FORMAT_A8B8G8R8_SRGB_PACK32, Attachable}, // A8B8G8R8_SRGB {VK_FORMAT_R8G8_UNORM, Attachable | Storage}, // R8G8_UNORM {VK_FORMAT_R8G8_SNORM, Attachable | Storage}, // R8G8_SNORM @@ -234,11 +234,6 @@ FormatInfo SurfaceFormat(const Device& device, FormatType format_type, bool with PixelFormat pixel_format) { ASSERT(static_cast(pixel_format) < std::size(tex_format_tuples)); FormatTuple tuple = tex_format_tuples[static_cast(pixel_format)]; - if (tuple.format == VK_FORMAT_UNDEFINED) { - UNIMPLEMENTED_MSG("Unimplemented texture format with pixel format={}", pixel_format); - return FormatInfo{VK_FORMAT_A8B8G8R8_UNORM_PACK32, true, true}; - } - // Use A8B8G8R8_UNORM on hardware that doesn't support ASTC natively if (!device.IsOptimalAstcSupported() && VideoCore::Surface::IsPixelFormatASTC(pixel_format)) { const bool is_srgb = with_srgb && VideoCore::Surface::IsPixelFormatSRGB(pixel_format); diff --git a/src/video_core/texture_cache/format_lookup_table.cpp b/src/video_core/texture_cache/format_lookup_table.cpp index 08aa8ca33..5fc2b2fec 100644 --- a/src/video_core/texture_cache/format_lookup_table.cpp +++ b/src/video_core/texture_cache/format_lookup_table.cpp @@ -42,15 +42,15 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red, ComponentType blue, ComponentType alpha, bool is_srgb) noexcept { switch (Hash(format, red, green, blue, alpha, is_srgb)) { - case Hash(TextureFormat::A8R8G8B8, UNORM): + case Hash(TextureFormat::A8B8G8R8, UNORM): return PixelFormat::A8B8G8R8_UNORM; - case Hash(TextureFormat::A8R8G8B8, SNORM): + case Hash(TextureFormat::A8B8G8R8, SNORM): return PixelFormat::A8B8G8R8_SNORM; - case Hash(TextureFormat::A8R8G8B8, UINT): + case Hash(TextureFormat::A8B8G8R8, UINT): return PixelFormat::A8B8G8R8_UINT; - case Hash(TextureFormat::A8R8G8B8, SINT): + case Hash(TextureFormat::A8B8G8R8, SINT): return PixelFormat::A8B8G8R8_SINT; - case Hash(TextureFormat::A8R8G8B8, UNORM, SRGB): + case Hash(TextureFormat::A8B8G8R8, UNORM, SRGB): return PixelFormat::A8B8G8R8_SRGB; case Hash(TextureFormat::B5G6R5, UNORM): return PixelFormat::B5G6R5_UNORM; @@ -74,13 +74,13 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red, return PixelFormat::R8_UINT; case Hash(TextureFormat::R8, SINT): return PixelFormat::R8_SINT; - case Hash(TextureFormat::R8G8, UNORM): + case Hash(TextureFormat::G8R8, UNORM): return PixelFormat::R8G8_UNORM; - case Hash(TextureFormat::R8G8, SNORM): + case Hash(TextureFormat::G8R8, SNORM): return PixelFormat::R8G8_SNORM; - case Hash(TextureFormat::R8G8, UINT): + case Hash(TextureFormat::G8R8, UINT): return PixelFormat::R8G8_UINT; - case Hash(TextureFormat::R8G8, SINT): + case Hash(TextureFormat::G8R8, SINT): return PixelFormat::R8G8_SINT; case Hash(TextureFormat::R16G16B16A16, FLOAT): return PixelFormat::R16G16B16A16_FLOAT; @@ -136,49 +136,49 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red, return PixelFormat::R32_SINT; case Hash(TextureFormat::E5B9G9R9, FLOAT): return PixelFormat::E5B9G9R9_FLOAT; - case Hash(TextureFormat::D32, FLOAT): + case Hash(TextureFormat::Z32, FLOAT): return PixelFormat::D32_FLOAT; - case Hash(TextureFormat::D16, UNORM): + case Hash(TextureFormat::Z16, UNORM): return PixelFormat::D16_UNORM; - case Hash(TextureFormat::S8D24, UINT, UNORM, UNORM, UNORM, LINEAR): + case Hash(TextureFormat::Z24S8, UINT, UNORM, UNORM, UNORM, LINEAR): return PixelFormat::S8_UINT_D24_UNORM; - case Hash(TextureFormat::S8D24, UINT, UNORM, UINT, UINT, LINEAR): + case Hash(TextureFormat::Z24S8, UINT, UNORM, UINT, UINT, LINEAR): return PixelFormat::S8_UINT_D24_UNORM; - case Hash(TextureFormat::R8G24, UINT, UNORM, UNORM, UNORM, LINEAR): + case Hash(TextureFormat::G24R8, UINT, UNORM, UNORM, UNORM, LINEAR): return PixelFormat::S8_UINT_D24_UNORM; - case Hash(TextureFormat::D24S8, UNORM, UINT, UINT, UINT, LINEAR): + case Hash(TextureFormat::S8Z24, UNORM, UINT, UINT, UINT, LINEAR): return PixelFormat::D24_UNORM_S8_UINT; - case Hash(TextureFormat::D32S8, FLOAT, UINT, UNORM, UNORM, LINEAR): + case Hash(TextureFormat::Z32_X24S8, FLOAT, UINT, UNORM, UNORM, LINEAR): return PixelFormat::D32_FLOAT_S8_UINT; - case Hash(TextureFormat::R32_B24G8, FLOAT, UINT, UNORM, UNORM, LINEAR): + case Hash(TextureFormat::R32B24G8, FLOAT, UINT, UNORM, UNORM, LINEAR): return PixelFormat::D32_FLOAT_S8_UINT; - case Hash(TextureFormat::BC1_RGBA, UNORM, LINEAR): + case Hash(TextureFormat::DXT1, UNORM, LINEAR): return PixelFormat::BC1_RGBA_UNORM; - case Hash(TextureFormat::BC1_RGBA, UNORM, SRGB): + case Hash(TextureFormat::DXT1, UNORM, SRGB): return PixelFormat::BC1_RGBA_SRGB; - case Hash(TextureFormat::BC2, UNORM, LINEAR): + case Hash(TextureFormat::DXT23, UNORM, LINEAR): return PixelFormat::BC2_UNORM; - case Hash(TextureFormat::BC2, UNORM, SRGB): + case Hash(TextureFormat::DXT23, UNORM, SRGB): return PixelFormat::BC2_SRGB; - case Hash(TextureFormat::BC3, UNORM, LINEAR): + case Hash(TextureFormat::DXT45, UNORM, LINEAR): return PixelFormat::BC3_UNORM; - case Hash(TextureFormat::BC3, UNORM, SRGB): + case Hash(TextureFormat::DXT45, UNORM, SRGB): return PixelFormat::BC3_SRGB; - case Hash(TextureFormat::BC4, UNORM): + case Hash(TextureFormat::DXN1, UNORM): return PixelFormat::BC4_UNORM; - case Hash(TextureFormat::BC4, SNORM): + case Hash(TextureFormat::DXN1, SNORM): return PixelFormat::BC4_SNORM; - case Hash(TextureFormat::BC5, UNORM): + case Hash(TextureFormat::DXN2, UNORM): return PixelFormat::BC5_UNORM; - case Hash(TextureFormat::BC5, SNORM): + case Hash(TextureFormat::DXN2, SNORM): return PixelFormat::BC5_SNORM; - case Hash(TextureFormat::BC7, UNORM, LINEAR): + case Hash(TextureFormat::BC7U, UNORM, LINEAR): return PixelFormat::BC7_UNORM; - case Hash(TextureFormat::BC7, UNORM, SRGB): + case Hash(TextureFormat::BC7U, UNORM, SRGB): return PixelFormat::BC7_SRGB; - case Hash(TextureFormat::BC6H_SFLOAT, FLOAT): + case Hash(TextureFormat::BC6H_S16, FLOAT): return PixelFormat::BC6H_SFLOAT; - case Hash(TextureFormat::BC6H_UFLOAT, FLOAT): + case Hash(TextureFormat::BC6H_U16, FLOAT): return PixelFormat::BC6H_UFLOAT; case Hash(TextureFormat::ASTC_2D_4X4, UNORM, LINEAR): return PixelFormat::ASTC_2D_4X4_UNORM; diff --git a/src/video_core/textures/texture.h b/src/video_core/textures/texture.h index 7c4553a53..7e5837b20 100644 --- a/src/video_core/textures/texture.h +++ b/src/video_core/textures/texture.h @@ -15,26 +15,26 @@ enum class TextureFormat : u32 { R32G32B32 = 0x02, R16G16B16A16 = 0x03, R32G32 = 0x04, - R32_B24G8 = 0x05, + R32B24G8 = 0x05, ETC2_RGB = 0x06, X8B8G8R8 = 0x07, - A8R8G8B8 = 0x08, + A8B8G8R8 = 0x08, A2B10G10R10 = 0x09, ETC2_RGB_PTA = 0x0a, ETC2_RGBA = 0x0b, R16G16 = 0x0c, - R24G8 = 0x0d, - R8G24 = 0x0e, + G8R24 = 0x0d, + G24R8 = 0x0e, R32 = 0x0f, - BC6H_SFLOAT = 0x10, - BC6H_UFLOAT = 0x11, + BC6H_S16 = 0x10, + BC6H_U16 = 0x11, A4B4G4R4 = 0x12, A5B5G5R1 = 0x13, A1B5G5R5 = 0x14, B5G6R5 = 0x15, B6G5R5 = 0x16, - BC7 = 0x17, - R8G8 = 0x18, + BC7U = 0x17, + G8R8 = 0x18, EAC = 0x19, EACX2 = 0x1a, R16 = 0x1b, @@ -46,33 +46,33 @@ enum class TextureFormat : u32 { B10G11R11 = 0x21, G8B8G8R8 = 0x22, B8G8R8G8 = 0x23, - BC1_RGBA = 0x24, - BC2 = 0x25, - BC3 = 0x26, - BC4 = 0x27, - BC5 = 0x28, - S8D24 = 0x29, - X8D24 = 0x2a, - D24S8 = 0x2b, - X4V4D24__COV4R4V = 0x2c, - X4V4D24__COV8R8V = 0x2d, - V8D24__COV4R12V = 0x2e, - D32 = 0x2f, - D32S8 = 0x30, - X8D24_X20V4S8__COV4R4V = 0x31, - X8D24_X20V4S8__COV8R8V = 0x32, - D32_X20V4X8__COV4R4V = 0x33, - D32_X20V4X8__COV8R8V = 0x34, - D32_X20V4S8__COV4R4V = 0x35, - D32_X20V4S8__COV8R8V = 0x36, - X8D24_X16V8S8__COV4R12V = 0x37, - D32_X16V8X8__COV4R12V = 0x38, - D32_X16V8S8__COV4R12V = 0x39, - D16 = 0x3a, - V8D24__COV8R24V = 0x3b, - X8D24_X16V8S8__COV8R24V = 0x3c, - D32_X16V8X8__COV8R24V = 0x3d, - D32_X16V8S8__COV8R24V = 0x3e, + DXT1 = 0x24, + DXT23 = 0x25, + DXT45 = 0x26, + DXN1 = 0x27, + DXN2 = 0x28, + Z24S8 = 0x29, + X8Z24 = 0x2a, + S8Z24 = 0x2b, + X4V4Z24__COV4R4V = 0x2c, + X4V4Z24__COV8R8V = 0x2d, + V8Z24__COV4R12V = 0x2e, + Z32 = 0x2f, + Z32_X24S8 = 0x30, + X8Z24_X20V4S8__COV4R4V = 0x31, + X8Z24_X20V4S8__COV8R8V = 0x32, + Z32_X20V4X8__COV4R4V = 0x33, + Z32_X20V4X8__COV8R8V = 0x34, + Z32_X20V4S8__COV4R4V = 0x35, + Z32_X20V4S8__COV8R8V = 0x36, + X8Z24_X16V8S8__COV4R12V = 0x37, + Z32_X16V8X8__COV4R12V = 0x38, + Z32_X16V8S8__COV4R12V = 0x39, + Z16 = 0x3a, + V8Z24__COV8R24V = 0x3b, + X8Z24_X16V8S8__COV8R24V = 0x3c, + Z32_X16V8X8__COV8R24V = 0x3d, + Z32_X16V8S8__COV8R24V = 0x3e, ASTC_2D_4X4 = 0x40, ASTC_2D_5X5 = 0x41, ASTC_2D_6X6 = 0x42, From e8af3f29d28943fd0c87ee8e7b1e80402a6a9d8f Mon Sep 17 00:00:00 2001 From: german77 Date: Sat, 11 Mar 2023 19:33:31 -0600 Subject: [PATCH 0157/1181] yuzu: Remove console id setting --- src/yuzu/configuration/configure_system.cpp | 22 ------------- src/yuzu/configuration/configure_system.h | 2 -- src/yuzu/configuration/configure_system.ui | 35 ++++----------------- 3 files changed, 6 insertions(+), 53 deletions(-) diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index 9ea4c02da..b01ffdbac 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -40,8 +40,6 @@ static bool IsValidLocale(u32 region_index, u32 language_index) { ConfigureSystem::ConfigureSystem(Core::System& system_, QWidget* parent) : QWidget(parent), ui{std::make_unique()}, system{system_} { ui->setupUi(this); - connect(ui->button_regenerate_console_id, &QPushButton::clicked, this, - &ConfigureSystem::RefreshConsoleID); connect(ui->rng_seed_checkbox, &QCheckBox::stateChanged, this, [this](int state) { ui->rng_seed_edit->setEnabled(state == Qt::Checked); @@ -76,9 +74,6 @@ ConfigureSystem::ConfigureSystem(Core::System& system_, QWidget* parent) locale_check); connect(ui->combo_region, qOverload(&QComboBox::currentIndexChanged), this, locale_check); - ui->label_console_id->setVisible(Settings::IsConfiguringGlobal()); - ui->button_regenerate_console_id->setVisible(Settings::IsConfiguringGlobal()); - SetupPerGameUI(); SetConfiguration(); @@ -202,23 +197,6 @@ void ConfigureSystem::ApplyConfiguration() { } } -void ConfigureSystem::RefreshConsoleID() { - QMessageBox::StandardButton reply; - QString warning_text = tr("This will replace your current virtual Switch with a new one. " - "Your current virtual Switch will not be recoverable. " - "This might have unexpected effects in games. This might fail, " - "if you use an outdated config savegame. Continue?"); - reply = QMessageBox::critical(this, tr("Warning"), warning_text, - QMessageBox::No | QMessageBox::Yes); - if (reply == QMessageBox::No) { - return; - } - - u64 console_id{}; - ui->label_console_id->setText( - tr("Console ID: 0x%1").arg(QString::number(console_id, 16).toUpper())); -} - void ConfigureSystem::SetupPerGameUI() { if (Settings::IsConfiguringGlobal()) { ui->combo_language->setEnabled(Settings::values.language_index.UsingGlobal()); diff --git a/src/yuzu/configuration/configure_system.h b/src/yuzu/configuration/configure_system.h index a7f086258..ec28724a1 100644 --- a/src/yuzu/configuration/configure_system.h +++ b/src/yuzu/configuration/configure_system.h @@ -35,8 +35,6 @@ private: void ReadSystemSettings(); - void RefreshConsoleID(); - void SetupPerGameUI(); std::unique_ptr ui; diff --git a/src/yuzu/configuration/configure_system.ui b/src/yuzu/configuration/configure_system.ui index 0459cd924..254a44147 100644 --- a/src/yuzu/configuration/configure_system.ui +++ b/src/yuzu/configuration/configure_system.ui @@ -411,7 +411,7 @@ - + Custom RTC @@ -425,14 +425,14 @@ - + RNG Seed - + Device Name @@ -458,13 +458,6 @@ - - - - Console ID: - - - @@ -472,7 +465,7 @@ - + @@ -483,14 +476,14 @@ - + 128 - + @@ -511,22 +504,6 @@ - - - - - 0 - 0 - - - - Qt::RightToLeft - - - Regenerate - - - From e090a1c6bdcfc7515c66fc49b0028b161dbe80eb Mon Sep 17 00:00:00 2001 From: german77 Date: Sat, 11 Mar 2023 20:04:36 -0600 Subject: [PATCH 0158/1181] yuzu: Move audio settings to audio section --- src/yuzu/configuration/configure_audio.cpp | 13 ++++++ src/yuzu/configuration/configure_audio.ui | 45 +++++++++++++++++++- src/yuzu/configuration/configure_general.cpp | 2 - src/yuzu/configuration/configure_general.ui | 7 --- src/yuzu/configuration/configure_system.cpp | 8 ---- src/yuzu/configuration/configure_system.ui | 26 ----------- 6 files changed, 56 insertions(+), 45 deletions(-) diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp index 70cc6f84b..4bec51260 100644 --- a/src/yuzu/configuration/configure_audio.cpp +++ b/src/yuzu/configuration/configure_audio.cpp @@ -10,6 +10,7 @@ #include "ui_configure_audio.h" #include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configure_audio.h" +#include "yuzu/uisettings.h" ConfigureAudio::ConfigureAudio(const Core::System& system_, QWidget* parent) : QWidget(parent), ui(std::make_unique()), system{system_} { @@ -47,17 +48,22 @@ void ConfigureAudio::SetConfiguration() { const auto volume_value = static_cast(Settings::values.volume.GetValue()); ui->volume_slider->setValue(volume_value); + ui->toggle_background_mute->setChecked(UISettings::values.mute_when_in_background.GetValue()); if (!Settings::IsConfiguringGlobal()) { if (Settings::values.volume.UsingGlobal()) { ui->volume_combo_box->setCurrentIndex(0); ui->volume_slider->setEnabled(false); + ui->combo_sound->setCurrentIndex(Settings::values.sound_index.GetValue()); } else { ui->volume_combo_box->setCurrentIndex(1); ui->volume_slider->setEnabled(true); + ConfigurationShared::SetPerGameSetting(ui->combo_sound, &Settings::values.sound_index); } ConfigurationShared::SetHighlight(ui->volume_layout, !Settings::values.volume.UsingGlobal()); + ConfigurationShared::SetHighlight(ui->mode_label, + !Settings::values.sound_index.UsingGlobal()); } SetVolumeIndicatorText(ui->volume_slider->sliderPosition()); } @@ -109,6 +115,8 @@ void ConfigureAudio::SetVolumeIndicatorText(int percentage) { } void ConfigureAudio::ApplyConfiguration() { + ConfigurationShared::ApplyPerGameSetting(&Settings::values.sound_index, ui->combo_sound); + if (Settings::IsConfiguringGlobal()) { Settings::values.sink_id = ui->sink_combo_box->itemText(ui->sink_combo_box->currentIndex()).toStdString(); @@ -116,6 +124,7 @@ void ConfigureAudio::ApplyConfiguration() { ui->output_combo_box->itemText(ui->output_combo_box->currentIndex()).toStdString()); Settings::values.audio_input_device_id.SetValue( ui->input_combo_box->itemText(ui->input_combo_box->currentIndex()).toStdString()); + UISettings::values.mute_when_in_background = ui->toggle_background_mute->isChecked(); // Guard if during game and set to game-specific value if (Settings::values.volume.UsingGlobal()) { @@ -174,10 +183,14 @@ void ConfigureAudio::RetranslateUI() { void ConfigureAudio::SetupPerGameUI() { if (Settings::IsConfiguringGlobal()) { ui->volume_slider->setEnabled(Settings::values.volume.UsingGlobal()); + // ui->combo_sound->setEnabled(Settings::values.sound_index.UsingGlobal()); return; } + // ConfigurationShared::SetColoredComboBox(ui->combo_sound, ui->label_sound, + // Settings::values.sound_index.GetValue(true)); + connect(ui->volume_combo_box, qOverload(&QComboBox::activated), this, [this](int index) { ui->volume_slider->setEnabled(index == 1); ConfigurationShared::SetHighlight(ui->volume_layout, index == 1); diff --git a/src/yuzu/configuration/configure_audio.ui b/src/yuzu/configuration/configure_audio.ui index 6034d8581..bcd5d8c2b 100644 --- a/src/yuzu/configuration/configure_audio.ui +++ b/src/yuzu/configuration/configure_audio.ui @@ -39,7 +39,7 @@ - Output Device + Output Device: @@ -53,7 +53,7 @@ - Input Device + Input Device: @@ -61,6 +61,36 @@ + + + + + + + Sound Ouput Mode: + + + + + + + + Mono + + + + + Stereo + + + + + Surround + + + + + @@ -149,6 +179,17 @@ + + + + + + Mute audio when in background + + + + + diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index 7ade01ba6..207bcdc4d 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp @@ -42,7 +42,6 @@ void ConfigureGeneral::SetConfiguration() { ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing.GetValue()); ui->toggle_user_on_boot->setChecked(UISettings::values.select_user_on_boot.GetValue()); ui->toggle_background_pause->setChecked(UISettings::values.pause_when_in_background.GetValue()); - ui->toggle_background_mute->setChecked(UISettings::values.mute_when_in_background.GetValue()); ui->toggle_hide_mouse->setChecked(UISettings::values.hide_mouse.GetValue()); ui->toggle_speed_limit->setChecked(Settings::values.use_speed_limit.GetValue()); @@ -88,7 +87,6 @@ void ConfigureGeneral::ApplyConfiguration() { UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked(); UISettings::values.select_user_on_boot = ui->toggle_user_on_boot->isChecked(); UISettings::values.pause_when_in_background = ui->toggle_background_pause->isChecked(); - UISettings::values.mute_when_in_background = ui->toggle_background_mute->isChecked(); UISettings::values.hide_mouse = ui->toggle_hide_mouse->isChecked(); // Guard if during game and set to game-specific value diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui index 5b90b1109..6cd79673c 100644 --- a/src/yuzu/configuration/configure_general.ui +++ b/src/yuzu/configuration/configure_general.ui @@ -89,13 +89,6 @@ - - - - Mute audio when in background - - - diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index b01ffdbac..6af34f793 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -116,14 +116,12 @@ void ConfigureSystem::SetConfiguration() { ui->combo_language->setCurrentIndex(Settings::values.language_index.GetValue()); ui->combo_region->setCurrentIndex(Settings::values.region_index.GetValue()); ui->combo_time_zone->setCurrentIndex(Settings::values.time_zone_index.GetValue()); - ui->combo_sound->setCurrentIndex(Settings::values.sound_index.GetValue()); } else { ConfigurationShared::SetPerGameSetting(ui->combo_language, &Settings::values.language_index); ConfigurationShared::SetPerGameSetting(ui->combo_region, &Settings::values.region_index); ConfigurationShared::SetPerGameSetting(ui->combo_time_zone, &Settings::values.time_zone_index); - ConfigurationShared::SetPerGameSetting(ui->combo_sound, &Settings::values.sound_index); ConfigurationShared::SetHighlight(ui->label_language, !Settings::values.language_index.UsingGlobal()); @@ -131,8 +129,6 @@ void ConfigureSystem::SetConfiguration() { !Settings::values.region_index.UsingGlobal()); ConfigurationShared::SetHighlight(ui->label_timezone, !Settings::values.time_zone_index.UsingGlobal()); - ConfigurationShared::SetHighlight(ui->label_sound, - !Settings::values.sound_index.UsingGlobal()); } } @@ -164,7 +160,6 @@ void ConfigureSystem::ApplyConfiguration() { ConfigurationShared::ApplyPerGameSetting(&Settings::values.region_index, ui->combo_region); ConfigurationShared::ApplyPerGameSetting(&Settings::values.time_zone_index, ui->combo_time_zone); - ConfigurationShared::ApplyPerGameSetting(&Settings::values.sound_index, ui->combo_sound); if (Settings::IsConfiguringGlobal()) { // Guard if during game and set to game-specific value @@ -202,7 +197,6 @@ void ConfigureSystem::SetupPerGameUI() { ui->combo_language->setEnabled(Settings::values.language_index.UsingGlobal()); ui->combo_region->setEnabled(Settings::values.region_index.UsingGlobal()); ui->combo_time_zone->setEnabled(Settings::values.time_zone_index.UsingGlobal()); - ui->combo_sound->setEnabled(Settings::values.sound_index.UsingGlobal()); ui->rng_seed_checkbox->setEnabled(Settings::values.rng_seed.UsingGlobal()); ui->rng_seed_edit->setEnabled(Settings::values.rng_seed.UsingGlobal()); @@ -215,8 +209,6 @@ void ConfigureSystem::SetupPerGameUI() { Settings::values.region_index.GetValue(true)); ConfigurationShared::SetColoredComboBox(ui->combo_time_zone, ui->label_timezone, Settings::values.time_zone_index.GetValue(true)); - ConfigurationShared::SetColoredComboBox(ui->combo_sound, ui->label_sound, - Settings::values.sound_index.GetValue(true)); ConfigurationShared::SetColoredTristate( ui->rng_seed_checkbox, Settings::values.rng_seed.UsingGlobal(), diff --git a/src/yuzu/configuration/configure_system.ui b/src/yuzu/configuration/configure_system.ui index 254a44147..9e7bc3b93 100644 --- a/src/yuzu/configuration/configure_system.ui +++ b/src/yuzu/configuration/configure_system.ui @@ -439,32 +439,6 @@ - - - - - Mono - - - - - Stereo - - - - - Surround - - - - - - - - Sound output mode - - - From d155167ea2598330d3f67189df8c7db92866fa05 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 11 Mar 2023 22:03:56 -0500 Subject: [PATCH 0159/1181] general: use codespell to identify spelling mistakes --- .codespellrc | 3 +++ .github/workflows/codespell.yml | 15 +++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 .codespellrc create mode 100644 .github/workflows/codespell.yml diff --git a/.codespellrc b/.codespellrc new file mode 100644 index 000000000..acef5478f --- /dev/null +++ b/.codespellrc @@ -0,0 +1,3 @@ +[codespell] +skip = ./.git,./build,./dist,./Doxyfile,./externals,./LICENSES +ignore-words-list = aci,allright,ba,deques,froms,hda,inout,lod,masia,nax,nd,pullrequests,pullrequest,te,transfered,unstall,uscaled,zink diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml new file mode 100644 index 000000000..4667b2424 --- /dev/null +++ b/.github/workflows/codespell.yml @@ -0,0 +1,15 @@ +# GitHub Action to automate the identification of common misspellings in text files. +# https://github.com/codespell-project/actions-codespell +# https://github.com/codespell-project/codespell +name: codespell +on: pull_request +permissions: {} +jobs: + codespell: + name: Check for spelling errors + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + persist-credentials: false + - uses: codespell-project/actions-codespell@master From 4e42ba54e53c0a2ddd118e2e737feec12614c7f3 Mon Sep 17 00:00:00 2001 From: FengChen Date: Sun, 12 Mar 2023 13:21:26 +0800 Subject: [PATCH 0160/1181] video_core: Invalid index_buffer flag when inline_index draw --- src/video_core/engines/draw_manager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/video_core/engines/draw_manager.cpp b/src/video_core/engines/draw_manager.cpp index 1d22d25f1..0e94c521a 100644 --- a/src/video_core/engines/draw_manager.cpp +++ b/src/video_core/engines/draw_manager.cpp @@ -164,6 +164,7 @@ void DrawManager::DrawEnd(u32 instance_count, bool force_draw) { draw_state.index_buffer.count = static_cast(draw_state.inline_index_draw_indexes.size() / 4); draw_state.index_buffer.format = Maxwell3D::Regs::IndexFormat::UnsignedInt; + maxwell3d->dirty.flags[VideoCommon::Dirty::IndexBuffer] = true; ProcessDraw(true, instance_count); draw_state.inline_index_draw_indexes.clear(); break; From 44f10c8dee03ca765fb1fb6557b97a3ba2e149c7 Mon Sep 17 00:00:00 2001 From: FengChen Date: Sun, 12 Mar 2023 13:33:31 +0800 Subject: [PATCH 0161/1181] video_core: Fix ogl status error when draw_texture --- src/video_core/renderer_opengl/blit_image.cpp | 3 +-- src/video_core/renderer_opengl/gl_rasterizer.cpp | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video_core/renderer_opengl/blit_image.cpp b/src/video_core/renderer_opengl/blit_image.cpp index 9a560a73b..3b03e8d5a 100644 --- a/src/video_core/renderer_opengl/blit_image.cpp +++ b/src/video_core/renderer_opengl/blit_image.cpp @@ -22,7 +22,7 @@ BlitImageHelper::~BlitImageHelper() = default; void BlitImageHelper::BlitColor(GLuint dst_framebuffer, GLuint src_image_view, GLuint src_sampler, const Region2D& dst_region, const Region2D& src_region, const Extent3D& src_size) { - glEnable(GL_CULL_FACE); + glDisable(GL_CULL_FACE); glDisable(GL_COLOR_LOGIC_OP); glDisable(GL_DEPTH_TEST); glDisable(GL_STENCIL_TEST); @@ -31,7 +31,6 @@ void BlitImageHelper::BlitColor(GLuint dst_framebuffer, GLuint src_image_view, G glDisable(GL_ALPHA_TEST); glDisablei(GL_BLEND, 0); glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); - glCullFace(GL_BACK); glFrontFace(GL_CW); glColorMaski(0, GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); glDepthRangeIndexed(0, 0.0, 0.0); diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 7bced675c..b71475a5d 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -357,6 +357,7 @@ void RasterizerOpenGL::DrawTexture() { .y = static_cast(draw_texture_state.src_y1)}}; blit_image.BlitColor(texture_cache.GetFramebuffer()->Handle(), texture.DefaultHandle(), sampler->Handle(), dst_region, src_region, texture.size); + state_tracker.InvalidateState(); } ++num_queued_commands; From 600f325d87e42f856da58c42a5280f098ebb6e8c Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 11 Mar 2023 22:10:38 -0500 Subject: [PATCH 0162/1181] general: fix spelling mistakes --- .ci/scripts/windows/scan_dll.py | 2 +- .codespellrc | 5 +- .github/workflows/codespell.yml | 2 + CMakeLists.txt | 4 +- CMakeModules/FindFFmpeg.cmake | 2 +- src/CMakeLists.txt | 2 +- src/audio_core/audio_out_manager.h | 2 +- src/audio_core/device/audio_buffer.h | 2 +- .../renderer/adsp/audio_renderer.cpp | 2 +- .../renderer/behavior/behavior_info.h | 2 +- .../renderer/effect/effect_info_base.h | 4 +- .../renderer/memory/memory_pool_info.h | 2 +- src/audio_core/renderer/mix/mix_context.h | 2 +- .../renderer/performance/performance_detail.h | 4 +- .../renderer/performance/performance_entry.h | 4 +- .../performance/performance_frame_header.h | 4 +- .../renderer/splitter/splitter_context.h | 2 +- .../splitter/splitter_destinations_data.h | 6 +- .../renderer/splitter/splitter_info.h | 4 +- src/audio_core/renderer/system.h | 4 +- src/audio_core/renderer/system_manager.h | 6 +- src/audio_core/renderer/voice/voice_info.h | 4 +- src/common/announce_multiplayer_room.h | 2 +- src/common/fiber.cpp | 2 +- src/common/fixed_point.h | 2 +- src/common/host_memory.cpp | 4 +- src/common/input.h | 8 +- src/common/swap.h | 12 +-- src/core/core.cpp | 2 +- src/core/core.h | 2 +- src/core/core_timing.h | 2 +- src/core/crypto/ctr_encryption_layer.h | 2 +- src/core/crypto/key_manager.h | 2 +- src/core/crypto/xts_encryption_layer.h | 2 +- src/core/file_sys/content_archive.h | 2 +- src/core/file_sys/registered_cache.h | 2 +- src/core/file_sys/vfs.h | 16 ++-- src/core/file_sys/vfs_real.h | 2 +- src/core/frontend/emu_window.h | 2 +- src/core/hid/emulated_controller.h | 6 +- src/core/hid/emulated_devices.h | 4 +- src/core/hid/input_converter.cpp | 4 +- src/core/hid/motion_input.h | 2 +- src/core/hle/kernel/k_process.cpp | 2 +- src/core/hle/kernel/k_process.h | 2 +- src/core/hle/kernel/svc/svc_event.cpp | 2 +- src/core/hle/kernel/svc/svc_session.cpp | 2 +- src/core/hle/service/acc/acc.cpp | 2 +- src/core/hle/service/acc/profile_manager.cpp | 6 +- .../hle/service/hid/controllers/gesture.cpp | 2 +- src/core/hle/service/hid/hid.cpp | 2 +- .../hid/irsensor/image_transfer_processor.cpp | 2 +- src/core/hle/service/nfp/amiibo_crypto.cpp | 2 +- src/core/hle/service/nfp/amiibo_crypto.h | 2 +- .../service/ns/iplatform_service_manager.cpp | 2 +- src/core/hle/service/nvdrv/devices/nvdevice.h | 2 +- src/core/hle/service/nvdrv/devices/nvmap.cpp | 2 +- src/core/internal_network/network.cpp | 4 +- src/input_common/drivers/gc_adapter.cpp | 2 +- src/input_common/drivers/joycon.h | 2 +- src/input_common/drivers/keyboard.cpp | 2 +- src/input_common/drivers/mouse.cpp | 4 +- src/input_common/drivers/sdl_driver.cpp | 4 +- src/input_common/drivers/virtual_amiibo.cpp | 2 +- src/input_common/helpers/joycon_driver.cpp | 4 +- src/input_common/helpers/joycon_driver.h | 4 +- .../helpers/joycon_protocol/common_protocol.h | 4 +- src/input_common/helpers/udp_protocol.cpp | 2 +- src/input_common/main.h | 2 +- src/network/packet.h | 2 +- src/network/room.cpp | 2 +- src/network/room_member.h | 16 ++-- .../backend/glsl/emit_glsl_atomic.cpp | 80 +++++++++---------- .../backend/glsl/glsl_emit_context.h | 2 +- src/tests/common/ring_buffer.cpp | 2 +- src/tests/common/scratch_buffer.cpp | 2 +- src/video_core/control/channel_state_cache.h | 2 +- src/video_core/engines/sw_blitter/blitter.cpp | 2 +- src/video_core/host_shaders/astc_decoder.comp | 2 +- src/video_core/host_shaders/opengl_smaa.glsl | 2 +- src/video_core/memory_manager.h | 4 +- src/video_core/query_cache.h | 2 +- .../renderer_opengl/gl_rasterizer.cpp | 2 +- .../renderer_opengl/gl_rasterizer.h | 4 +- .../renderer_vulkan/fixed_pipeline_state.cpp | 6 +- .../renderer_vulkan/vk_command_pool.cpp | 4 +- .../renderer_vulkan/vk_rasterizer.cpp | 2 +- .../renderer_vulkan/vk_resource_pool.cpp | 4 +- .../renderer_vulkan/vk_swapchain.cpp | 2 +- .../renderer_vulkan/vk_update_descriptor.cpp | 2 +- src/video_core/texture_cache/image_base.h | 2 +- src/video_core/textures/astc.cpp | 2 +- .../vulkan_common/vulkan_device.cpp | 2 +- src/video_core/vulkan_common/vulkan_device.h | 8 +- src/video_core/vulkan_common/vulkan_wrapper.h | 14 ++-- src/yuzu/applets/qt_web_browser.h | 2 +- src/yuzu/compatdb.cpp | 6 +- src/yuzu/configuration/configure_hotkeys.h | 2 +- .../configuration/configure_input_player.h | 2 +- .../configure_input_player_widget.h | 2 +- src/yuzu/loading_screen.cpp | 2 +- src/yuzu/main.cpp | 4 +- src/yuzu/multiplayer/lobby.cpp | 2 +- src/yuzu/multiplayer/state.cpp | 2 +- src/yuzu/multiplayer/state.h | 4 +- src/yuzu/startup_checks.cpp | 2 +- src/yuzu/util/overlay_dialog.h | 2 +- 107 files changed, 216 insertions(+), 211 deletions(-) diff --git a/.ci/scripts/windows/scan_dll.py b/.ci/scripts/windows/scan_dll.py index f374e0d78..a536f7375 100644 --- a/.ci/scripts/windows/scan_dll.py +++ b/.ci/scripts/windows/scan_dll.py @@ -40,7 +40,7 @@ def parse_imports(file_name): def parse_imports_recursive(file_name, path_list=[]): q = queue.Queue() # create a FIFO queue - # file_name can be a string or a list for the convience + # file_name can be a string or a list for the convenience if isinstance(file_name, str): q.put(file_name) elif isinstance(file_name, list): diff --git a/.codespellrc b/.codespellrc index acef5478f..786a991eb 100644 --- a/.codespellrc +++ b/.codespellrc @@ -1,3 +1,6 @@ +; SPDX-FileCopyrightText: 2023 yuzu Emulator Project +; SPDX-License-Identifier: GPL-2.0-or-later + [codespell] skip = ./.git,./build,./dist,./Doxyfile,./externals,./LICENSES -ignore-words-list = aci,allright,ba,deques,froms,hda,inout,lod,masia,nax,nd,pullrequests,pullrequest,te,transfered,unstall,uscaled,zink +ignore-words-list = aci,allright,ba,deques,froms,hda,inout,lod,masia,nam,nax,nd,pullrequests,pullrequest,te,transfered,unstall,uscaled,zink diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 4667b2424..d873fb725 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2023 yuzu Emulator Project +# SPDX-License-Identifier: GPL-2.0-or-later # GitHub Action to automate the identification of common misspellings in text files. # https://github.com/codespell-project/actions-codespell # https://github.com/codespell-project/codespell diff --git a/CMakeLists.txt b/CMakeLists.txt index 91ec50bef..6932b6fab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -344,12 +344,12 @@ if(ENABLE_QT) find_package(PkgConfig REQUIRED) pkg_check_modules(QT_DEP_GLU QUIET glu>=9.0.0) if (NOT QT_DEP_GLU_FOUND) - message(FATAL_ERROR "Qt bundled pacakge dependency `glu` not found. \ + message(FATAL_ERROR "Qt bundled package dependency `glu` not found. \ Perhaps `libglu1-mesa-dev` needs to be installed?") endif() pkg_check_modules(QT_DEP_MESA QUIET dri>=20.0.8) if (NOT QT_DEP_MESA_FOUND) - message(FATAL_ERROR "Qt bundled pacakge dependency `dri` not found. \ + message(FATAL_ERROR "Qt bundled package dependency `dri` not found. \ Perhaps `mesa-common-dev` needs to be installed?") endif() diff --git a/CMakeModules/FindFFmpeg.cmake b/CMakeModules/FindFFmpeg.cmake index eedf28aea..5cb1f3c8a 100644 --- a/CMakeModules/FindFFmpeg.cmake +++ b/CMakeModules/FindFFmpeg.cmake @@ -14,7 +14,7 @@ # FFmpeg_LIBRARIES: aggregate all the paths to the libraries # FFmpeg_FOUND: True if all components have been found # -# This module defines the following targets, which are prefered over variables: +# This module defines the following targets, which are preferred over variables: # # FFmpeg::: Target to use directly, with include path, # library and dependencies set up. If you are using a static build, you are diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c7283e82c..0eca8e90e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -83,7 +83,7 @@ if (MSVC) ) if (USE_CCACHE OR YUZU_USE_PRECOMPILED_HEADERS) - # when caching, we need to use /Z7 to downgrade debug info to use an older but more cachable format + # when caching, we need to use /Z7 to downgrade debug info to use an older but more cacheable format # Precompiled headers are deleted if not using /Z7. See https://github.com/nanoant/CMakePCHCompiler/issues/21 add_compile_options(/Z7) else() diff --git a/src/audio_core/audio_out_manager.h b/src/audio_core/audio_out_manager.h index 24981e08f..1e05ec5ed 100644 --- a/src/audio_core/audio_out_manager.h +++ b/src/audio_core/audio_out_manager.h @@ -58,7 +58,7 @@ public: /** * Get a list of audio out device names. * - * @oaram names - Output container to write names to. + * @param names - Output container to write names to. * @return Number of names written. */ u32 GetAudioOutDeviceNames( diff --git a/src/audio_core/device/audio_buffer.h b/src/audio_core/device/audio_buffer.h index 7128ef72a..4eb80c2ba 100644 --- a/src/audio_core/device/audio_buffer.h +++ b/src/audio_core/device/audio_buffer.h @@ -16,7 +16,7 @@ struct AudioBuffer { s64 played_timestamp; /// Game memory address for these samples. VAddr samples; - /// Unqiue identifier for this buffer. + /// Unique identifier for this buffer. u64 tag; /// Size of the samples buffer. u64 size; diff --git a/src/audio_core/renderer/adsp/audio_renderer.cpp b/src/audio_core/renderer/adsp/audio_renderer.cpp index 0e437e779..42b4b167a 100644 --- a/src/audio_core/renderer/adsp/audio_renderer.cpp +++ b/src/audio_core/renderer/adsp/audio_renderer.cpp @@ -165,7 +165,7 @@ void AudioRenderer::ThreadFunc() { // Check this buffer is valid, as it may not be used. if (command_buffer.buffer != 0) { // If there are no remaining commands (from the previous list), - // this is a new command list, initalize it. + // this is a new command list, initialize it. if (command_buffer.remaining_command_count == 0) { command_list_processor.Initialize(system, command_buffer.buffer, command_buffer.size, streams[index]); diff --git a/src/audio_core/renderer/behavior/behavior_info.h b/src/audio_core/renderer/behavior/behavior_info.h index 15c948344..b52340229 100644 --- a/src/audio_core/renderer/behavior/behavior_info.h +++ b/src/audio_core/renderer/behavior/behavior_info.h @@ -155,7 +155,7 @@ public: /** * Check if a variadic command buffer is supported. * As of Rev 5 with the added optional performance metric logging, the command - * buffer can be a variable size, so take that into account for calcualting its size. + * buffer can be a variable size, so take that into account for calculating its size. * * @return True if supported, otherwise false. */ diff --git a/src/audio_core/renderer/effect/effect_info_base.h b/src/audio_core/renderer/effect/effect_info_base.h index 8525fde05..dbdccf278 100644 --- a/src/audio_core/renderer/effect/effect_info_base.h +++ b/src/audio_core/renderer/effect/effect_info_base.h @@ -192,7 +192,7 @@ public: /** * Get this effect's parameter data. * - * @return Pointer to the parametter, must be cast to the correct type. + * @return Pointer to the parameter, must be cast to the correct type. */ u8* GetParameter() { return parameter.data(); @@ -201,7 +201,7 @@ public: /** * Get this effect's parameter data. * - * @return Pointer to the parametter, must be cast to the correct type. + * @return Pointer to the parameter, must be cast to the correct type. */ u8* GetStateBuffer() { return state.data(); diff --git a/src/audio_core/renderer/memory/memory_pool_info.h b/src/audio_core/renderer/memory/memory_pool_info.h index 537a466ec..80c571bc1 100644 --- a/src/audio_core/renderer/memory/memory_pool_info.h +++ b/src/audio_core/renderer/memory/memory_pool_info.h @@ -29,7 +29,7 @@ public: */ enum class State { Invalid, - Aquired, + Acquired, RequestDetach, Detached, RequestAttach, diff --git a/src/audio_core/renderer/mix/mix_context.h b/src/audio_core/renderer/mix/mix_context.h index da3aa2829..bcd9637da 100644 --- a/src/audio_core/renderer/mix/mix_context.h +++ b/src/audio_core/renderer/mix/mix_context.h @@ -93,7 +93,7 @@ public: * Splitter sort, traverse the splitter node graph and sort the sorted mixes from results. * * @param splitter_context - Splitter context for the sort. - * @return True if the sort was successful, othewise false. + * @return True if the sort was successful, otherwise false. */ bool TSortInfo(const SplitterContext& splitter_context); diff --git a/src/audio_core/renderer/performance/performance_detail.h b/src/audio_core/renderer/performance/performance_detail.h index 3a4897e60..f603b9026 100644 --- a/src/audio_core/renderer/performance/performance_detail.h +++ b/src/audio_core/renderer/performance/performance_detail.h @@ -33,7 +33,7 @@ struct PerformanceDetailVersion1 { /* 0x0D */ PerformanceEntryType entry_type; }; static_assert(sizeof(PerformanceDetailVersion1) == 0x10, - "PerformanceDetailVersion1 has the worng size!"); + "PerformanceDetailVersion1 has the wrong size!"); struct PerformanceDetailVersion2 { /* 0x00 */ u32 node_id; @@ -45,6 +45,6 @@ struct PerformanceDetailVersion2 { /* 0x14 */ char unk14[0x4]; }; static_assert(sizeof(PerformanceDetailVersion2) == 0x18, - "PerformanceDetailVersion2 has the worng size!"); + "PerformanceDetailVersion2 has the wrong size!"); } // namespace AudioCore::AudioRenderer diff --git a/src/audio_core/renderer/performance/performance_entry.h b/src/audio_core/renderer/performance/performance_entry.h index d1b21406b..d6b1158db 100644 --- a/src/audio_core/renderer/performance/performance_entry.h +++ b/src/audio_core/renderer/performance/performance_entry.h @@ -22,7 +22,7 @@ struct PerformanceEntryVersion1 { /* 0x0C */ PerformanceEntryType entry_type; }; static_assert(sizeof(PerformanceEntryVersion1) == 0x10, - "PerformanceEntryVersion1 has the worng size!"); + "PerformanceEntryVersion1 has the wrong size!"); struct PerformanceEntryVersion2 { /* 0x00 */ u32 node_id; @@ -32,6 +32,6 @@ struct PerformanceEntryVersion2 { /* 0x0D */ char unk0D[0xB]; }; static_assert(sizeof(PerformanceEntryVersion2) == 0x18, - "PerformanceEntryVersion2 has the worng size!"); + "PerformanceEntryVersion2 has the wrong size!"); } // namespace AudioCore::AudioRenderer diff --git a/src/audio_core/renderer/performance/performance_frame_header.h b/src/audio_core/renderer/performance/performance_frame_header.h index 707cc0afb..b1848284e 100644 --- a/src/audio_core/renderer/performance/performance_frame_header.h +++ b/src/audio_core/renderer/performance/performance_frame_header.h @@ -16,7 +16,7 @@ struct PerformanceFrameHeaderVersion1 { /* 0x14 */ u32 frame_index; }; static_assert(sizeof(PerformanceFrameHeaderVersion1) == 0x18, - "PerformanceFrameHeaderVersion1 has the worng size!"); + "PerformanceFrameHeaderVersion1 has the wrong size!"); struct PerformanceFrameHeaderVersion2 { /* 0x00 */ u32 magic; // "PERF" @@ -31,6 +31,6 @@ struct PerformanceFrameHeaderVersion2 { /* 0x25 */ char unk25[0xB]; }; static_assert(sizeof(PerformanceFrameHeaderVersion2) == 0x30, - "PerformanceFrameHeaderVersion2 has the worng size!"); + "PerformanceFrameHeaderVersion2 has the wrong size!"); } // namespace AudioCore::AudioRenderer diff --git a/src/audio_core/renderer/splitter/splitter_context.h b/src/audio_core/renderer/splitter/splitter_context.h index cfd092b4f..1a63db1d3 100644 --- a/src/audio_core/renderer/splitter/splitter_context.h +++ b/src/audio_core/renderer/splitter/splitter_context.h @@ -55,7 +55,7 @@ public: /** * Get the total number of splitter destinations. * - * @return Number of destiantions. + * @return Number of destinations. */ u32 GetDataCount() const; diff --git a/src/audio_core/renderer/splitter/splitter_destinations_data.h b/src/audio_core/renderer/splitter/splitter_destinations_data.h index bd3d55748..d55ce0ad3 100644 --- a/src/audio_core/renderer/splitter/splitter_destinations_data.h +++ b/src/audio_core/renderer/splitter/splitter_destinations_data.h @@ -87,7 +87,7 @@ public: /** * Update this destination. * - * @param params - Inpout parameters to update the destination. + * @param params - Input parameters to update the destination. */ void Update(const InParameter& params); @@ -126,9 +126,9 @@ private: std::array prev_mix_volumes{0.0f}; /// Next destination in the mix chain SplitterDestinationData* next{}; - /// Is this destiantion in use? + /// Is this destination in use? bool in_use{}; - /// Does this destiantion need its volumes updated? + /// Does this destination need its volumes updated? bool need_update{}; }; diff --git a/src/audio_core/renderer/splitter/splitter_info.h b/src/audio_core/renderer/splitter/splitter_info.h index d1d75064c..b0ad01fe0 100644 --- a/src/audio_core/renderer/splitter/splitter_info.h +++ b/src/audio_core/renderer/splitter/splitter_info.h @@ -49,14 +49,14 @@ public: /** * Get the number of destinations in this splitter. * - * @return The number of destiantions. + * @return The number of destinations. */ u32 GetDestinationCount() const; /** * Set the number of destinations in this splitter. * - * @param count - The new number of destiantions. + * @param count - The new number of destinations. */ void SetDestinationCount(u32 count); diff --git a/src/audio_core/renderer/system.h b/src/audio_core/renderer/system.h index 429196e41..e328783b6 100644 --- a/src/audio_core/renderer/system.h +++ b/src/audio_core/renderer/system.h @@ -154,7 +154,7 @@ public: ExecutionMode GetExecutionMode() const; /** - * Get the rendering deivce for this system. + * Get the rendering device for this system. * This is unused. * * @return Rendering device for this system. @@ -241,7 +241,7 @@ private: std::span command_workbuffer{}; /// Size of command workbuffer u64 command_workbuffer_size{}; - /// Numebr of commands in the workbuffer + /// Number of commands in the workbuffer u64 command_buffer_size{}; /// Manager for upsamplers UpsamplerManager* upsampler_manager{}; diff --git a/src/audio_core/renderer/system_manager.h b/src/audio_core/renderer/system_manager.h index 81457a3a1..415ddb74f 100644 --- a/src/audio_core/renderer/system_manager.h +++ b/src/audio_core/renderer/system_manager.h @@ -36,7 +36,7 @@ public: /** * Initialize the system manager, called when any system is registered. * - * @return True if sucessfully initialized, otherwise false. + * @return True if successfully initialized, otherwise false. */ bool InitializeUnsafe(); @@ -50,7 +50,7 @@ public: * The manager does not own the system, so do not free it without calling Remove. * * @param system - The system to add. - * @return True if succesfully added, otherwise false. + * @return True if successfully added, otherwise false. */ bool Add(System& system); @@ -58,7 +58,7 @@ public: * Remove an audio render system from the manager. * * @param system - The system to remove. - * @return True if succesfully removed, otherwise false. + * @return True if successfully removed, otherwise false. */ bool Remove(System& system); diff --git a/src/audio_core/renderer/voice/voice_info.h b/src/audio_core/renderer/voice/voice_info.h index 930180895..3c5d3e04f 100644 --- a/src/audio_core/renderer/voice/voice_info.h +++ b/src/audio_core/renderer/voice/voice_info.h @@ -183,7 +183,7 @@ public: void Initialize(); /** - * Does this voice ned an update? + * Does this voice need an update? * * @param params - Input parameters to check matching. * @@ -236,7 +236,7 @@ public: * * @param error_info - Output array of errors. * @param wave_buffer - The wavebuffer to be updated. - * @param wave_buffer_internal - Input parametters to be used for the update. + * @param wave_buffer_internal - Input parameters to be used for the update. * @param sample_format - Sample format of the wavebuffer. * @param valid - Is this wavebuffer valid? * @param pool_mapper - Used to map the wavebuffers. diff --git a/src/common/announce_multiplayer_room.h b/src/common/announce_multiplayer_room.h index 4a3100fa4..f32060196 100644 --- a/src/common/announce_multiplayer_room.h +++ b/src/common/announce_multiplayer_room.h @@ -66,7 +66,7 @@ public: * @param description The room description * @param port The port of the room * @param net_version The version of the libNetwork that gets used - * @param has_password True if the room is passowrd protected + * @param has_password True if the room is password protected * @param preferred_game The preferred game of the room * @param preferred_game_id The title id of the preferred game */ diff --git a/src/common/fiber.cpp b/src/common/fiber.cpp index bc92b360b..c991b7cf1 100644 --- a/src/common/fiber.cpp +++ b/src/common/fiber.cpp @@ -90,7 +90,7 @@ Fiber::~Fiber() { } void Fiber::Exit() { - ASSERT_MSG(impl->is_thread_fiber, "Exitting non main thread fiber"); + ASSERT_MSG(impl->is_thread_fiber, "Exiting non main thread fiber"); if (!impl->is_thread_fiber) { return; } diff --git a/src/common/fixed_point.h b/src/common/fixed_point.h index f899b0d54..b0f3ae2cc 100644 --- a/src/common/fixed_point.h +++ b/src/common/fixed_point.h @@ -22,7 +22,7 @@ class FixedPoint; namespace detail { // helper templates to make magic with types :) -// these allow us to determine resonable types from +// these allow us to determine reasonable types from // a desired size, they also let us infer the next largest type // from a type which is nice for the division op template diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp index 611c7d1a3..8e4f1f97a 100644 --- a/src/common/host_memory.cpp +++ b/src/common/host_memory.cpp @@ -322,7 +322,7 @@ private: } /// Return true when a given memory region is a "nieche" and the placeholders don't have to be - /// splitted. + /// split. bool IsNiechePlaceholder(size_t virtual_offset, size_t length) const { const auto it = placeholders.upper_bound({virtual_offset, virtual_offset + length}); if (it != placeholders.end() && it->lower() == virtual_offset + length) { @@ -484,7 +484,7 @@ class HostMemory::Impl { public: explicit Impl(size_t /*backing_size */, size_t /* virtual_size */) { // This is just a place holder. - // Please implement fastmem in a propper way on your platform. + // Please implement fastmem in a proper way on your platform. throw std::bad_alloc{}; } diff --git a/src/common/input.h b/src/common/input.h index 98e934685..51b277c1f 100644 --- a/src/common/input.h +++ b/src/common/input.h @@ -15,7 +15,7 @@ namespace Common::Input { -// Type of data that is expected to recieve or send +// Type of data that is expected to receive or send enum class InputType { None, Battery, @@ -103,7 +103,7 @@ enum class VibrationAmplificationType { struct AnalogProperties { // Anything below this value will be detected as zero float deadzone{}; - // Anyting above this values will be detected as one + // Anything above this values will be detected as one float range{1.0f}; // Minimum value to be detected as active float threshold{0.5f}; @@ -209,7 +209,7 @@ struct LedStatus { bool led_4{}; }; -// Raw data fom camera +// Raw data from camera struct CameraStatus { CameraFormat format{CameraFormat::None}; std::vector data{}; @@ -428,7 +428,7 @@ inline void UnregisterOutputFactory(const std::string& name) { } /** - * Create an input device from given paramters. + * Create an input device from given parameters. * @tparam InputDeviceType the type of input devices to create * @param params a serialized ParamPackage string that contains all parameters for creating the * device diff --git a/src/common/swap.h b/src/common/swap.h index 037b82781..085baaf9a 100644 --- a/src/common/swap.h +++ b/src/common/swap.h @@ -229,7 +229,7 @@ public: value = swap(swap() - 1); return old; } - // Comparaison + // Comparison // v == i bool operator==(const swapped_t& i) const { return swap() == i.swap(); @@ -368,7 +368,7 @@ public: // Member /** todo **/ - // Arithmetics + // Arithmetic template friend S operator+(const S& p, const swapped_t v); @@ -384,7 +384,7 @@ public: template friend S operator%(const S& p, const swapped_t v); - // Arithmetics + assignments + // Arithmetic + assignments template friend S operator+=(const S& p, const swapped_t v); @@ -415,7 +415,7 @@ public: friend bool operator==(const S& p, const swapped_t v); }; -// Arithmetics +// Arithmetic template S operator+(const S& i, const swap_struct_t v) { return i + v.swap(); @@ -441,7 +441,7 @@ S operator%(const S& i, const swap_struct_t v) { return i % v.swap(); } -// Arithmetics + assignments +// Arithmetic + assignments template S& operator+=(S& i, const swap_struct_t v) { i += v.swap(); @@ -465,7 +465,7 @@ S operator&(const swap_struct_t v, const S& i) { return static_cast(v.swap() & i); } -// Comparaison +// Comparison template bool operator<(const S& p, const swap_struct_t v) { return p < v.swap(); diff --git a/src/core/core.cpp b/src/core/core.cpp index 4a1372d15..bd2082fd6 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -358,7 +358,7 @@ struct System::Impl { void ShutdownMainProcess() { SetShuttingDown(true); - // Log last frame performance stats if game was loded + // Log last frame performance stats if game was loaded if (perf_stats) { const auto perf_results = GetAndResetPerfStats(); constexpr auto performance = Common::Telemetry::FieldType::Performance; diff --git a/src/core/core.h b/src/core/core.h index 91e78672e..5843696d4 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -146,7 +146,7 @@ public: /** * Initializes the system - * This function will initialize core functionaility used for system emulation + * This function will initialize core functionality used for system emulation */ void Initialize(); diff --git a/src/core/core_timing.h b/src/core/core_timing.h index 4b89c0c39..e7c4a949f 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -150,7 +150,7 @@ private: // The queue is a min-heap using std::make_heap/push_heap/pop_heap. // We don't use std::priority_queue because we need to be able to serialize, unserialize and // erase arbitrary events (RemoveEvent()) regardless of the queue order. These aren't - // accomodated by the standard adaptor class. + // accommodated by the standard adaptor class. std::vector event_queue; u64 event_fifo_id = 0; diff --git a/src/core/crypto/ctr_encryption_layer.h b/src/core/crypto/ctr_encryption_layer.h index 77f08d776..d85ad8f78 100644 --- a/src/core/crypto/ctr_encryption_layer.h +++ b/src/core/crypto/ctr_encryption_layer.h @@ -11,7 +11,7 @@ namespace Core::Crypto { -// Sits on top of a VirtualFile and provides CTR-mode AES decription. +// Sits on top of a VirtualFile and provides CTR-mode AES description. class CTREncryptionLayer : public EncryptionLayer { public: using IVData = std::array; diff --git a/src/core/crypto/key_manager.h b/src/core/crypto/key_manager.h index dbf9ebfe4..673cec463 100644 --- a/src/core/crypto/key_manager.h +++ b/src/core/crypto/key_manager.h @@ -249,7 +249,7 @@ public: static bool KeyFileExists(bool title); - // Call before using the sd seed to attempt to derive it if it dosen't exist. Needs system + // Call before using the sd seed to attempt to derive it if it doesn't exist. Needs system // save 8*43 and the private file to exist. void DeriveSDSeedLazy(); diff --git a/src/core/crypto/xts_encryption_layer.h b/src/core/crypto/xts_encryption_layer.h index 735e660cb..68b5643b1 100644 --- a/src/core/crypto/xts_encryption_layer.h +++ b/src/core/crypto/xts_encryption_layer.h @@ -9,7 +9,7 @@ namespace Core::Crypto { -// Sits on top of a VirtualFile and provides XTS-mode AES decription. +// Sits on top of a VirtualFile and provides XTS-mode AES description. class XTSEncryptionLayer : public EncryptionLayer { public: XTSEncryptionLayer(FileSys::VirtualFile base, Key256 key); diff --git a/src/core/file_sys/content_archive.h b/src/core/file_sys/content_archive.h index 7fdc45ea7..20f524f80 100644 --- a/src/core/file_sys/content_archive.h +++ b/src/core/file_sys/content_archive.h @@ -93,7 +93,7 @@ inline bool IsDirectoryLogoPartition(const VirtualDir& pfs) { pfs->GetFile("StartupMovie.gif") != nullptr; } -// An implementation of VfsDirectory that represents a Nintendo Content Archive (NCA) conatiner. +// An implementation of VfsDirectory that represents a Nintendo Content Archive (NCA) container. // After construction, use GetStatus to determine if the file is valid and ready to be used. class NCA : public ReadOnlyVfsDirectory { public: diff --git a/src/core/file_sys/registered_cache.h b/src/core/file_sys/registered_cache.h index 587f8cae8..bd7f53eaf 100644 --- a/src/core/file_sys/registered_cache.h +++ b/src/core/file_sys/registered_cache.h @@ -162,7 +162,7 @@ public: InstallResult InstallEntry(const NSP& nsp, bool overwrite_if_exists = false, const VfsCopyFunction& copy = &VfsRawCopy); - // Due to the fact that we must use Meta-type NCAs to determine the existance of files, this + // Due to the fact that we must use Meta-type NCAs to determine the existence of files, this // poses quite a challenge. Instead of creating a new meta NCA for this file, yuzu will create a // dir inside the NAND called 'yuzu_meta' and store the raw CNMT there. // TODO(DarkLordZach): Author real meta-type NCAs and install those. diff --git a/src/core/file_sys/vfs.h b/src/core/file_sys/vfs.h index 8fc1738a4..a93e21f67 100644 --- a/src/core/file_sys/vfs.h +++ b/src/core/file_sys/vfs.h @@ -45,7 +45,7 @@ public: // Return whether or not the user has write permission on this filesystem. virtual bool IsWritable() const; - // Determine if the entry at path is non-existant, a file, or a directory. + // Determine if the entry at path is non-existent, a file, or a directory. virtual VfsEntryType GetEntryType(std::string_view path) const; // Opens the file with path relative to root. If it doesn't exist, returns nullptr. @@ -58,7 +58,7 @@ public: // Moves the file from old_path to new_path, returning the moved file on success and nullptr on // failure. virtual VirtualFile MoveFile(std::string_view old_path, std::string_view new_path); - // Deletes the file with path relative to root, returing true on success. + // Deletes the file with path relative to root, returning true on success. virtual bool DeleteFile(std::string_view path); // Opens the directory with path relative to root. If it doesn't exist, returns nullptr. @@ -71,7 +71,7 @@ public: // Moves the directory from old_path to new_path, returning the moved directory on success and // nullptr on failure. virtual VirtualDir MoveDirectory(std::string_view old_path, std::string_view new_path); - // Deletes the directory with path relative to root, returing true on success. + // Deletes the directory with path relative to root, returning true on success. virtual bool DeleteDirectory(std::string_view path); protected: @@ -144,7 +144,7 @@ public: return Read(reinterpret_cast(data), sizeof(T), offset); } - // Writes exactly one byte to offset in file and retuns whether or not the byte was written + // Writes exactly one byte to offset in file and returns whether or not the byte was written // successfully. virtual bool WriteByte(u8 data, std::size_t offset = 0); // Writes a vector of bytes to offset in file and returns the number of bytes successfully @@ -191,13 +191,13 @@ public: VfsDirectory() = default; virtual ~VfsDirectory(); - // Retrives the file located at path as if the current directory was root. Returns nullptr if + // Retrieves the file located at path as if the current directory was root. Returns nullptr if // not found. virtual VirtualFile GetFileRelative(std::string_view path) const; // Calls GetFileRelative(path) on the root of the current directory. virtual VirtualFile GetFileAbsolute(std::string_view path) const; - // Retrives the directory located at path as if the current directory was root. Returns nullptr + // Retrieves the directory located at path as if the current directory was root. Returns nullptr // if not found. virtual VirtualDir GetDirectoryRelative(std::string_view path) const; // Calls GetDirectoryRelative(path) on the root of the current directory. @@ -205,7 +205,7 @@ public: // Returns a vector containing all of the files in this directory. virtual std::vector GetFiles() const = 0; - // Returns the file with filename matching name. Returns nullptr if directory dosen't have a + // Returns the file with filename matching name. Returns nullptr if directory doesn't have a // file with name. virtual VirtualFile GetFile(std::string_view name) const; @@ -214,7 +214,7 @@ public: // Returns a vector containing all of the subdirectories in this directory. virtual std::vector GetSubdirectories() const = 0; - // Returns the directory with name matching name. Returns nullptr if directory dosen't have a + // Returns the directory with name matching name. Returns nullptr if directory doesn't have a // directory with name. virtual VirtualDir GetSubdirectory(std::string_view name) const; diff --git a/src/core/file_sys/vfs_real.h b/src/core/file_sys/vfs_real.h index acde1ac89..b92c84316 100644 --- a/src/core/file_sys/vfs_real.h +++ b/src/core/file_sys/vfs_real.h @@ -38,7 +38,7 @@ private: boost::container::flat_map> cache; }; -// An implmentation of VfsFile that represents a file on the user's computer. +// An implementation of VfsFile that represents a file on the user's computer. class RealVfsFile : public VfsFile { friend class RealVfsDirectory; friend class RealVfsFilesystem; diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.h index cf85ba29e..1093800f6 100644 --- a/src/core/frontend/emu_window.h +++ b/src/core/frontend/emu_window.h @@ -205,7 +205,7 @@ protected: } /** - * Converts a screen postion into the equivalent touchscreen position. + * Converts a screen position into the equivalent touchscreen position. */ std::pair MapToTouchScreen(u32 framebuffer_x, u32 framebuffer_y) const; diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index a9da465a2..429655355 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h @@ -132,7 +132,7 @@ struct ControllerStatus { RingAnalogValue ring_analog_value{}; NfcValues nfc_values{}; - // Data for HID serices + // Data for HID services HomeButtonState home_button_state{}; CaptureButtonState capture_button_state{}; NpadButtonState npad_button_state{}; @@ -357,7 +357,7 @@ public: /** * Sends a small vibration to the output device - * @return true if SetVibration was successfull + * @return true if SetVibration was successful */ bool IsVibrationEnabled(std::size_t device_index); @@ -373,7 +373,7 @@ public: /** * Sets the desired camera format to be polled from a controller * @param camera_format size of each frame - * @return true if SetCameraFormat was successfull + * @return true if SetCameraFormat was successful */ bool SetCameraFormat(Core::IrSensor::ImageTransferProcessorFormat camera_format); diff --git a/src/core/hid/emulated_devices.h b/src/core/hid/emulated_devices.h index caf2ca659..5eab693e4 100644 --- a/src/core/hid/emulated_devices.h +++ b/src/core/hid/emulated_devices.h @@ -53,7 +53,7 @@ struct DeviceStatus { MouseWheelValues mouse_wheel_values{}; MouseStickValue mouse_stick_value{}; - // Data for HID serices + // Data for HID services KeyboardKey keyboard_state{}; KeyboardModifier keyboard_moddifier_state{}; MouseButton mouse_button_state{}; @@ -75,7 +75,7 @@ struct InterfaceUpdateCallback { class EmulatedDevices { public: /** - * Contains all input data related to external devices that aren't necesarily a controller + * Contains all input data related to external devices that aren't necessarily a controller * This includes devices such as the keyboard or mouse */ explicit EmulatedDevices(); diff --git a/src/core/hid/input_converter.cpp b/src/core/hid/input_converter.cpp index 3f7b8c090..7cee39a53 100644 --- a/src/core/hid/input_converter.cpp +++ b/src/core/hid/input_converter.cpp @@ -328,7 +328,7 @@ void SanitizeAnalog(Common::Input::AnalogStatus& analog, bool clamp_value) { // Apply center offset raw_value -= properties.offset; - // Set initial values to be formated + // Set initial values to be formatted value = raw_value; // Calculate vector size @@ -398,7 +398,7 @@ void SanitizeStick(Common::Input::AnalogStatus& analog_x, Common::Input::AnalogS raw_x = properties_x.inverted ? -raw_x : raw_x; raw_y = properties_y.inverted ? -raw_y : raw_y; - // Set initial values to be formated + // Set initial values to be formatted x = raw_x; y = raw_y; diff --git a/src/core/hid/motion_input.h b/src/core/hid/motion_input.h index e2c1bbf95..9f3fc1cf7 100644 --- a/src/core/hid/motion_input.h +++ b/src/core/hid/motion_input.h @@ -84,7 +84,7 @@ private: // Gyroscope vector measurement in radians/s. Common::Vec3f gyro; - // Vector to be substracted from gyro measurements + // Vector to be subtracted from gyro measurements Common::Vec3f gyro_bias; // Minimum gyro amplitude to detect if the device is moving diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp index d44f6e921..74a04aa66 100644 --- a/src/core/hle/kernel/k_process.cpp +++ b/src/core/hle/kernel/k_process.cpp @@ -363,7 +363,7 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std: code_size + system_resource_size); R_RETURN(ResultLimitReached); } - // Initialize proces address space + // Initialize process address space if (const Result result{page_table.InitializeForProcess( metadata.GetAddressSpaceType(), false, false, false, KMemoryManager::Pool::Application, 0x8000000, code_size, &kernel.GetAppSystemResource(), resource_limit)}; diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.h index 549809000..bd9b9f876 100644 --- a/src/core/hle/kernel/k_process.h +++ b/src/core/hle/kernel/k_process.h @@ -235,7 +235,7 @@ public: total_process_running_time_ticks += ticks; } - /// Gets the process schedule count, used for thread yelding + /// Gets the process schedule count, used for thread yielding s64 GetScheduledCount() const { return schedule_count; } diff --git a/src/core/hle/kernel/svc/svc_event.cpp b/src/core/hle/kernel/svc/svc_event.cpp index a948493e8..8692b00f2 100644 --- a/src/core/hle/kernel/svc/svc_event.cpp +++ b/src/core/hle/kernel/svc/svc_event.cpp @@ -85,7 +85,7 @@ Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_read) { // Add the event to the handle table. R_TRY(handle_table.Add(out_write, event)); - // Ensure that we maintaing a clean handle state on exit. + // Ensure that we maintain a clean handle state on exit. auto handle_guard = SCOPE_GUARD({ handle_table.Remove(*out_write); }); // Add the readable event to the handle table. diff --git a/src/core/hle/kernel/svc/svc_session.cpp b/src/core/hle/kernel/svc/svc_session.cpp index 00fd1605e..6dd242dcf 100644 --- a/src/core/hle/kernel/svc/svc_session.cpp +++ b/src/core/hle/kernel/svc/svc_session.cpp @@ -81,7 +81,7 @@ Result CreateSession(Core::System& system, Handle* out_server, Handle* out_clien const auto result = handle_table.Add(out_client, &session->GetClientSession()); if (!R_SUCCEEDED(result)) { - // Ensure that we maintaing a clean handle state on exit. + // Ensure that we maintain a clean handle state on exit. handle_table.Remove(*out_server); } diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index 120282aa4..6c29cb613 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -789,7 +789,7 @@ Result Module::Interface::InitializeApplicationInfoBase() { } LOG_WARNING(Service_ACC, "ApplicationInfo init required"); - // TODO(ogniK): Actual initalization here + // TODO(ogniK): Actual initialization here return ResultSuccess; } diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index 97f7c6688..63fd5bfd6 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -287,7 +287,7 @@ void ProfileManager::StoreOpenedUsers() { }); } -/// Return the users profile base and the unknown arbitary data. +/// Return the users profile base and the unknown arbitrary data. bool ProfileManager::GetProfileBaseAndData(std::optional index, ProfileBase& profile, UserData& data) const { if (GetProfileBase(index, profile)) { @@ -297,13 +297,13 @@ bool ProfileManager::GetProfileBaseAndData(std::optional index, Pro return false; } -/// Return the users profile base and the unknown arbitary data. +/// Return the users profile base and the unknown arbitrary data. bool ProfileManager::GetProfileBaseAndData(UUID uuid, ProfileBase& profile, UserData& data) const { const auto idx = GetUserIndex(uuid); return GetProfileBaseAndData(idx, profile, data); } -/// Return the users profile base and the unknown arbitary data. +/// Return the users profile base and the unknown arbitrary data. bool ProfileManager::GetProfileBaseAndData(const ProfileInfo& user, ProfileBase& profile, UserData& data) const { return GetProfileBaseAndData(user.user_uuid, profile, data); diff --git a/src/core/hle/service/hid/controllers/gesture.cpp b/src/core/hle/service/hid/controllers/gesture.cpp index de0090cc5..03432f7cb 100644 --- a/src/core/hle/service/hid/controllers/gesture.cpp +++ b/src/core/hle/service/hid/controllers/gesture.cpp @@ -55,7 +55,7 @@ void Controller_Gesture::OnUpdate(const Core::Timing::CoreTiming& core_timing) { static_cast(shared_memory->gesture_lifo.timestamp - last_update_timestamp) / (1000 * 1000 * 1000); - // Only update if necesary + // Only update if necessary if (!ShouldUpdateGesture(gesture, time_difference)) { return; } diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 56c7275df..4529ad643 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -690,7 +690,7 @@ void Hid::ResetSixAxisSensorFusionParameters(HLERequestContext& ctx) { const auto parameters{rp.PopRaw()}; - // Since these parameters are unknow just use what HW outputs + // Since these parameters are unknown just use what HW outputs const Core::HID::SixAxisSensorFusionParameters fusion_parameters{ .parameter1 = 0.03f, .parameter2 = 0.4f, diff --git a/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp b/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp index bc896a1e3..a268750cd 100644 --- a/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp +++ b/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp @@ -51,7 +51,7 @@ void ImageTransferProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType const auto camera_data = npad_device->GetCamera(); - // This indicates how much ambient light is precent + // This indicates how much ambient light is present processor_state.ambient_noise_level = Core::IrSensor::CameraAmbientNoiseLevel::Low; processor_state.sampling_number = camera_data.sample; diff --git a/src/core/hle/service/nfp/amiibo_crypto.cpp b/src/core/hle/service/nfp/amiibo_crypto.cpp index ddf04b1d7..ad73edbda 100644 --- a/src/core/hle/service/nfp/amiibo_crypto.cpp +++ b/src/core/hle/service/nfp/amiibo_crypto.cpp @@ -137,7 +137,7 @@ EncryptedNTAG215File EncodedDataToNfcData(const NTAG215File& encoded_data) { } u32 GetTagPassword(const TagUuid& uuid) { - // Verifiy that the generated password is correct + // Verify that the generated password is correct u32 password = 0xAA ^ (uuid.uid[1] ^ uuid.uid[3]); password &= (0x55 ^ (uuid.uid[2] ^ uuid.uid[4])) << 8; password &= (0xAA ^ (uuid.uid[3] ^ uuid.uid[5])) << 16; diff --git a/src/core/hle/service/nfp/amiibo_crypto.h b/src/core/hle/service/nfp/amiibo_crypto.h index 1fa61174e..c9fd67a39 100644 --- a/src/core/hle/service/nfp/amiibo_crypto.h +++ b/src/core/hle/service/nfp/amiibo_crypto.h @@ -94,7 +94,7 @@ bool LoadKeys(InternalKey& locked_secret, InternalKey& unfixed_info); /// Returns true if key_retail.bin exist bool IsKeyAvailable(); -/// Decodes encripted amiibo data returns true if output is valid +/// Decodes encrypted amiibo data returns true if output is valid bool DecodeAmiibo(const EncryptedNTAG215File& encrypted_tag_data, NTAG215File& tag_data); /// Encodes plain amiibo data returns true if output is valid diff --git a/src/core/hle/service/ns/iplatform_service_manager.cpp b/src/core/hle/service/ns/iplatform_service_manager.cpp index cd2705881..6c2f5e70b 100644 --- a/src/core/hle/service/ns/iplatform_service_manager.cpp +++ b/src/core/hle/service/ns/iplatform_service_manager.cpp @@ -119,7 +119,7 @@ struct IPlatformServiceManager::Impl { break; } - // Derive key withing inverse xor + // Derive key within inverse xor const u32 KEY = GetU32Swapped(input.data() + cur_offset) ^ EXPECTED_MAGIC; const u32 SIZE = GetU32Swapped(input.data() + cur_offset + 4) ^ KEY; shared_font_regions.push_back(FontRegion{cur_offset + 8, SIZE}); diff --git a/src/core/hle/service/nvdrv/devices/nvdevice.h b/src/core/hle/service/nvdrv/devices/nvdevice.h index c562e04d2..ab1f30f9e 100644 --- a/src/core/hle/service/nvdrv/devices/nvdevice.h +++ b/src/core/hle/service/nvdrv/devices/nvdevice.h @@ -59,7 +59,7 @@ public: std::vector& output, std::vector& inline_output) = 0; /** - * Called once a device is openned + * Called once a device is opened * @param fd The device fd */ virtual void OnOpen(DeviceFD fd) = 0; diff --git a/src/core/hle/service/nvdrv/devices/nvmap.cpp b/src/core/hle/service/nvdrv/devices/nvmap.cpp index 277afe0b4..07417f045 100644 --- a/src/core/hle/service/nvdrv/devices/nvmap.cpp +++ b/src/core/hle/service/nvdrv/devices/nvmap.cpp @@ -264,7 +264,7 @@ NvResult nvmap::IocFree(std::span input, std::vector& output) { params.flags.raw = 0; params.flags.map_uncached.Assign(freeInfo->was_uncached); } else { - // This is possible when there's internel dups or other duplicates. + // This is possible when there's internal dups or other duplicates. } std::memcpy(output.data(), ¶ms, sizeof(params)); diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index f85c73ca6..bf97b0ebc 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -572,7 +572,7 @@ std::pair Socket::SendTo(u32 flags, std::span message, ASSERT(flags == 0); const sockaddr* to = nullptr; - const int tolen = addr ? sizeof(sockaddr) : 0; + const int to_len = addr ? sizeof(sockaddr) : 0; sockaddr host_addr_in; if (addr) { @@ -581,7 +581,7 @@ std::pair Socket::SendTo(u32 flags, std::span message, } const auto result = sendto(fd, reinterpret_cast(message.data()), - static_cast(message.size()), 0, to, tolen); + static_cast(message.size()), 0, to, to_len); if (result != SOCKET_ERROR) { return {static_cast(result), Errno::SUCCESS}; } diff --git a/src/input_common/drivers/gc_adapter.cpp b/src/input_common/drivers/gc_adapter.cpp index d09ff178b..3ad34884d 100644 --- a/src/input_common/drivers/gc_adapter.cpp +++ b/src/input_common/drivers/gc_adapter.cpp @@ -344,7 +344,7 @@ bool GCAdapter::IsVibrationEnabled([[maybe_unused]] const PadIdentifier& identif void GCAdapter::UpdateVibrations() { // Use 8 states to keep the switching between on/off fast enough for - // a human to feel different vibration strenght + // a human to feel different vibration strength // More states == more rumble strengths == slower update time constexpr u8 vibration_states = 8; diff --git a/src/input_common/drivers/joycon.h b/src/input_common/drivers/joycon.h index 473ba1b9e..5b40817e2 100644 --- a/src/input_common/drivers/joycon.h +++ b/src/input_common/drivers/joycon.h @@ -62,7 +62,7 @@ private: /// Registers controllers, clears all data and starts the scan thread void Setup(); - /// Actively searchs for new devices + /// Actively searches for new devices void ScanThread(std::stop_token stop_token); /// Returns true if device is valid and not registered diff --git a/src/input_common/drivers/keyboard.cpp b/src/input_common/drivers/keyboard.cpp index 71e612fbf..2567df9af 100644 --- a/src/input_common/drivers/keyboard.cpp +++ b/src/input_common/drivers/keyboard.cpp @@ -24,7 +24,7 @@ constexpr PadIdentifier keyboard_modifier_identifier = { }; Keyboard::Keyboard(std::string input_engine_) : InputEngine(std::move(input_engine_)) { - // Keyboard is broken into 3 diferent sets: + // Keyboard is broken into 3 different sets: // key: Unfiltered intended for controllers. // keyboard_key: Allows only Settings::NativeKeyboard::Keys intended for keyboard emulation. // keyboard_modifier: Allows only Settings::NativeKeyboard::Modifiers intended for keyboard diff --git a/src/input_common/drivers/mouse.cpp b/src/input_common/drivers/mouse.cpp index 94e92c37d..4fb2a6cfa 100644 --- a/src/input_common/drivers/mouse.cpp +++ b/src/input_common/drivers/mouse.cpp @@ -142,7 +142,7 @@ void Mouse::Move(int x, int y, int center_x, int center_y) { return; } - // Make slow movements at least 3 units on lenght + // Make slow movements at least 3 units on length if (move_distance < 3.0f) { // Normalize value mouse_change /= move_distance; @@ -154,7 +154,7 @@ void Mouse::Move(int x, int y, int center_x, int center_y) { const auto last_move_distance = last_mouse_change.Length(); - // Make fast movements clamp to 8 units on lenght + // Make fast movements clamp to 8 units on length if (last_move_distance > 8.0f) { // Normalize value last_mouse_change /= last_move_distance; diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index 5c20b3426..f7f0c7eaa 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp @@ -748,7 +748,7 @@ ButtonMapping SDLDriver::GetButtonMappingForDevice(const Common::ParamPackage& p // This list is missing ZL/ZR since those are not considered buttons in SDL GameController. // We will add those afterwards - // This list also excludes Screenshot since theres not really a mapping for that + // This list also excludes Screenshot since there's not really a mapping for that ButtonBindings switch_to_sdl_button; if (SDL_GameControllerGetType(controller) == SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO) { @@ -1007,7 +1007,7 @@ MotionMapping SDLDriver::GetMotionMappingForDevice(const Common::ParamPackage& p Common::Input::ButtonNames SDLDriver::GetUIName(const Common::ParamPackage& params) const { if (params.Has("button")) { - // TODO(German77): Find how to substitue the values for real button names + // TODO(German77): Find how to substitute the values for real button names return Common::Input::ButtonNames::Value; } if (params.Has("hat")) { diff --git a/src/input_common/drivers/virtual_amiibo.cpp b/src/input_common/drivers/virtual_amiibo.cpp index 4a0268a4d..304f4c70b 100644 --- a/src/input_common/drivers/virtual_amiibo.cpp +++ b/src/input_common/drivers/virtual_amiibo.cpp @@ -57,7 +57,7 @@ Common::Input::NfcState VirtualAmiibo::WriteNfcData( } if (!nfc_file.Write(data)) { - LOG_ERROR(Service_NFP, "Error writting to file"); + LOG_ERROR(Service_NFP, "Error writing to file"); return Common::Input::NfcState::WriteFailed; } diff --git a/src/input_common/helpers/joycon_driver.cpp b/src/input_common/helpers/joycon_driver.cpp index 78cc5893c..83429a336 100644 --- a/src/input_common/helpers/joycon_driver.cpp +++ b/src/input_common/helpers/joycon_driver.cpp @@ -164,8 +164,8 @@ void JoyconDriver::InputThread(std::stop_token stop_token) { void JoyconDriver::OnNewData(std::span buffer) { const auto report_mode = static_cast(buffer[0]); - // Packages can be a litte bit inconsistent. Average the delta time to provide a smoother motion - // experience + // Packages can be a little bit inconsistent. Average the delta time to provide a smoother + // motion experience switch (report_mode) { case ReportMode::STANDARD_FULL_60HZ: case ReportMode::NFC_IR_MODE_60HZ: diff --git a/src/input_common/helpers/joycon_driver.h b/src/input_common/helpers/joycon_driver.h index b52a13ecf..72a9e71dc 100644 --- a/src/input_common/helpers/joycon_driver.h +++ b/src/input_common/helpers/joycon_driver.h @@ -73,7 +73,7 @@ private: /// Main thread, actively request new data from the handle void InputThread(std::stop_token stop_token); - /// Called everytime a valid package arrives + /// Called every time a valid package arrives void OnNewData(std::span buffer); /// Updates device configuration to enable or disable features @@ -110,7 +110,7 @@ private: bool amiibo_detected{}; bool is_ring_disabled_by_irs{}; - // Harware configuration + // Hardware configuration u8 leds{}; ReportMode mode{}; bool passive_enabled{}; // Low power mode, Ideal for multiple controllers at the same time diff --git a/src/input_common/helpers/joycon_protocol/common_protocol.h b/src/input_common/helpers/joycon_protocol/common_protocol.h index f44f73ba4..62cae739a 100644 --- a/src/input_common/helpers/joycon_protocol/common_protocol.h +++ b/src/input_common/helpers/joycon_protocol/common_protocol.h @@ -68,7 +68,7 @@ public: } /** - * Waits for incoming data of the joycon device that matchs the subcommand + * Waits for incoming data of the joycon device that matches the subcommand * @param sub_command type of data to be returned * @returns a buffer containing the response */ @@ -137,7 +137,7 @@ public: DriverResult EnableMCU(bool enable); /** - * Configures the MCU to the correspoinding mode + * Configures the MCU to the corresponding mode * @param MCUConfig configuration */ DriverResult ConfigureMCU(const MCUConfig& config); diff --git a/src/input_common/helpers/udp_protocol.cpp b/src/input_common/helpers/udp_protocol.cpp index 994380d21..e54a8fce1 100644 --- a/src/input_common/helpers/udp_protocol.cpp +++ b/src/input_common/helpers/udp_protocol.cpp @@ -25,7 +25,7 @@ namespace Response { /** * Returns Type if the packet is valid, else none * - * Note: Modifies the buffer to zero out the crc (since thats the easiest way to check without + * Note: Modifies the buffer to zero out the crc (since that's the easiest way to check without * copying the buffer) */ std::optional Validate(u8* data, std::size_t size) { diff --git a/src/input_common/main.h b/src/input_common/main.h index 1207d786c..d64a6cb4c 100644 --- a/src/input_common/main.h +++ b/src/input_common/main.h @@ -132,7 +132,7 @@ public: /// Retrieves the motion mappings for the given device. [[nodiscard]] MotionMapping GetMotionMappingForDevice(const Common::ParamPackage& device) const; - /// Returns an enum contaning the name to be displayed from the input engine. + /// Returns an enum containing the name to be displayed from the input engine. [[nodiscard]] Common::Input::ButtonNames GetButtonName( const Common::ParamPackage& params) const; diff --git a/src/network/packet.h b/src/network/packet.h index e69217488..9aa2a2c9c 100644 --- a/src/network/packet.h +++ b/src/network/packet.h @@ -9,7 +9,7 @@ namespace Network { -/// A class that serializes data for network transfer. It also handles endianess +/// A class that serializes data for network transfer. It also handles endianness class Packet { public: Packet() = default; diff --git a/src/network/room.cpp b/src/network/room.cpp index dc5dbce7f..e456ea09c 100644 --- a/src/network/room.cpp +++ b/src/network/room.cpp @@ -27,7 +27,7 @@ public: std::atomic state{State::Closed}; ///< Current state of the room. RoomInformation room_information; ///< Information about this room. - std::string verify_uid; ///< A GUID which may be used for verfication. + std::string verify_uid; ///< A GUID which may be used for verification. mutable std::mutex verify_uid_mutex; ///< Mutex for verify_uid std::string password; ///< The password required to connect to this room. diff --git a/src/network/room_member.h b/src/network/room_member.h index 0d6417294..33ac18e72 100644 --- a/src/network/room_member.h +++ b/src/network/room_member.h @@ -71,7 +71,7 @@ public: Idle, ///< Default state (i.e. not connected) Joining, ///< The client is attempting to join a room. Joined, ///< The client is connected to the room and is ready to send/receive packets. - Moderator, ///< The client is connnected to the room and is granted mod permissions. + Moderator, ///< The client is connected to the room and is granted mod permissions. }; enum class Error : u8 { @@ -201,7 +201,7 @@ public: /** * Binds a function to an event that will be triggered every time the State of the member - * changed. The function wil be called every time the event is triggered. The callback function + * changed. The function will be called every time the event is triggered. The callback function * must not bind or unbind a function. Doing so will cause a deadlock * @param callback The function to call * @return A handle used for removing the function from the registered list @@ -210,8 +210,8 @@ public: /** * Binds a function to an event that will be triggered every time an error happened. The - * function wil be called every time the event is triggered. The callback function must not bind - * or unbind a function. Doing so will cause a deadlock + * function will be called every time the event is triggered. The callback function must not + * bind or unbind a function. Doing so will cause a deadlock * @param callback The function to call * @return A handle used for removing the function from the registered list */ @@ -219,7 +219,7 @@ public: /** * Binds a function to an event that will be triggered every time a ProxyPacket is received. - * The function wil be called everytime the event is triggered. + * The function will be called every time the event is triggered. * The callback function must not bind or unbind a function. Doing so will cause a deadlock * @param callback The function to call * @return A handle used for removing the function from the registered list @@ -229,7 +229,7 @@ public: /** * Binds a function to an event that will be triggered every time an LDNPacket is received. - * The function wil be called everytime the event is triggered. + * The function will be called every time the event is triggered. * The callback function must not bind or unbind a function. Doing so will cause a deadlock * @param callback The function to call * @return A handle used for removing the function from the registered list @@ -239,7 +239,7 @@ public: /** * Binds a function to an event that will be triggered every time the RoomInformation changes. - * The function wil be called every time the event is triggered. + * The function will be called every time the event is triggered. * The callback function must not bind or unbind a function. Doing so will cause a deadlock * @param callback The function to call * @return A handle used for removing the function from the registered list @@ -249,7 +249,7 @@ public: /** * Binds a function to an event that will be triggered every time a ChatMessage is received. - * The function wil be called every time the event is triggered. + * The function will be called every time the event is triggered. * The callback function must not bind or unbind a function. Doing so will cause a deadlock * @param callback The function to call * @return A handle used for removing the function from the registered list diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_atomic.cpp b/src/shader_recompiler/backend/glsl/emit_glsl_atomic.cpp index 911181c43..376a05827 100644 --- a/src/shader_recompiler/backend/glsl/emit_glsl_atomic.cpp +++ b/src/shader_recompiler/backend/glsl/emit_glsl_atomic.cpp @@ -398,162 +398,162 @@ void EmitStorageAtomicMaxF32x2(EmitContext& ctx, IR::Inst& inst, const IR::Value } void EmitGlobalAtomicIAdd32(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicSMin32(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicUMin32(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicSMax32(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicUMax32(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicInc32(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicDec32(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicAnd32(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicOr32(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicXor32(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicExchange32(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicIAdd64(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicSMin64(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicUMin64(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicSMax64(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicUMax64(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicInc64(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicDec64(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicAnd64(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicOr64(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicXor64(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicExchange64(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicIAdd32x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicSMin32x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicUMin32x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicSMax32x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicUMax32x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicInc32x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicDec32x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicAnd32x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicOr32x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicXor32x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicExchange32x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicAddF32(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicAddF16x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicAddF32x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicMinF16x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicMinF32x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicMaxF16x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } void EmitGlobalAtomicMaxF32x2(EmitContext&) { - throw NotImplementedException("GLSL Instrucion"); + throw NotImplementedException("GLSL Instruction"); } } // namespace Shader::Backend::GLSL diff --git a/src/shader_recompiler/backend/glsl/glsl_emit_context.h b/src/shader_recompiler/backend/glsl/glsl_emit_context.h index dfd10ac28..7587f7bab 100644 --- a/src/shader_recompiler/backend/glsl/glsl_emit_context.h +++ b/src/shader_recompiler/backend/glsl/glsl_emit_context.h @@ -49,7 +49,7 @@ public: void Add(const char* format_str, IR::Inst& inst, Args&&... args) { const auto var_def{var_alloc.AddDefine(inst, type)}; if (var_def.empty()) { - // skip assigment. + // skip assignment. code += fmt::format(fmt::runtime(format_str + 3), std::forward(args)...); } else { code += fmt::format(fmt::runtime(format_str), var_def, std::forward(args)...); diff --git a/src/tests/common/ring_buffer.cpp b/src/tests/common/ring_buffer.cpp index 7dee988c8..e85f9977b 100644 --- a/src/tests/common/ring_buffer.cpp +++ b/src/tests/common/ring_buffer.cpp @@ -52,7 +52,7 @@ TEST_CASE("RingBuffer: Basic Tests", "[common]") { REQUIRE(buf.Size() == 1U); - // Pushing more values than space available should partially suceed. + // Pushing more values than space available should partially succeed. { std::vector to_push(6); std::iota(to_push.begin(), to_push.end(), 88); diff --git a/src/tests/common/scratch_buffer.cpp b/src/tests/common/scratch_buffer.cpp index 132f139fa..26e401760 100644 --- a/src/tests/common/scratch_buffer.cpp +++ b/src/tests/common/scratch_buffer.cpp @@ -191,7 +191,7 @@ TEST_CASE("ScratchBuffer: Span Writes", "[common]") { for (size_t i = 0; i < buf_span.size(); ++i) { const auto new_value = static_cast(i + 1U); - // Writes to a span of the scratch buffer will propogate to the buffer itself + // Writes to a span of the scratch buffer will propagate to the buffer itself buf_span[i] = new_value; REQUIRE(buf[i] == new_value); } diff --git a/src/video_core/control/channel_state_cache.h b/src/video_core/control/channel_state_cache.h index cdaf4f8d5..46bc9e322 100644 --- a/src/video_core/control/channel_state_cache.h +++ b/src/video_core/control/channel_state_cache.h @@ -44,7 +44,7 @@ public: template class ChannelSetupCaches { public: - /// Operations for seting the channel of execution. + /// Operations for setting the channel of execution. virtual ~ChannelSetupCaches(); /// Create channel state. diff --git a/src/video_core/engines/sw_blitter/blitter.cpp b/src/video_core/engines/sw_blitter/blitter.cpp index 2f1ea4626..3c9f38559 100644 --- a/src/video_core/engines/sw_blitter/blitter.cpp +++ b/src/video_core/engines/sw_blitter/blitter.cpp @@ -193,7 +193,7 @@ bool SoftwareBlitEngine::Blit(Fermi2D::Surface& src, Fermi2D::Surface& dst, output_converter->ConvertFrom(impl->intermediate_dst, impl->dst_buffer); }; - // Do actuall Blit + // Do actual Blit impl->dst_buffer.resize(dst_copy_size); if (src.linear == Fermi2D::MemoryLayout::BlockLinear) { diff --git a/src/video_core/host_shaders/astc_decoder.comp b/src/video_core/host_shaders/astc_decoder.comp index d608678a3..bf2693559 100644 --- a/src/video_core/host_shaders/astc_decoder.comp +++ b/src/video_core/host_shaders/astc_decoder.comp @@ -125,7 +125,7 @@ uvec4 local_buff; uvec4 color_endpoint_data; int color_bitsread = 0; -// Four values, two endpoints, four maximum paritions +// Four values, two endpoints, four maximum partitions uint color_values[32]; int colvals_index = 0; diff --git a/src/video_core/host_shaders/opengl_smaa.glsl b/src/video_core/host_shaders/opengl_smaa.glsl index 3cbe87bbf..419f89bca 100644 --- a/src/video_core/host_shaders/opengl_smaa.glsl +++ b/src/video_core/host_shaders/opengl_smaa.glsl @@ -97,7 +97,7 @@ * half-rate linear filtering on GCN. * * If SMAA is applied to 64-bit color buffers, switching to point filtering - * when accesing them will increase the performance. Search for + * when accessing them will increase the performance. Search for * 'SMAASamplePoint' to see which textures may benefit from point * filtering, and where (which is basically the color input in the edge * detection and resolve passes). diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h index cf56392ef..51ae2de68 100644 --- a/src/video_core/memory_manager.h +++ b/src/video_core/memory_manager.h @@ -103,8 +103,8 @@ public: /** * Returns a vector with all the subranges of cpu addresses mapped beneath. - * if the region is continous, a single pair will be returned. If it's unmapped, an empty vector - * will be returned; + * if the region is continuous, a single pair will be returned. If it's unmapped, an empty + * vector will be returned; */ std::vector> GetSubmappedRange(GPUVAddr gpu_addr, std::size_t size) const; diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.h index 00ce53e3e..8906ba6d8 100644 --- a/src/video_core/query_cache.h +++ b/src/video_core/query_cache.h @@ -341,7 +341,7 @@ public: /// Flushes the query to guest memory. virtual void Flush() { - // When counter is nullptr it means that it's just been reseted. We are supposed to write a + // When counter is nullptr it means that it's just been reset. We are supposed to write a // zero in these cases. const u64 value = counter ? counter->Query() : 0; std::memcpy(host_ptr, &value, sizeof(u64)); diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 33748762f..abe0f3582 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -576,7 +576,7 @@ bool RasterizerOpenGL::AccelerateConditionalRendering() { // Reimplement Host conditional rendering. return false; } - // Medium / Low Hack: stub any checks on queries writen into the buffer cache. + // Medium / Low Hack: stub any checks on queries written into the buffer cache. const GPUVAddr condition_address{maxwell3d->regs.render_enable.Address()}; Maxwell::ReportSemaphore::Compare cmp; if (gpu_memory->IsMemoryDirty(condition_address, sizeof(cmp), diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 1f6562ef8..ad6978bd0 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -162,7 +162,7 @@ private: /// Syncs the cull mode to match the guest state void SyncCullMode(); - /// Syncs the primitve restart to match the guest state + /// Syncs the primitive restart to match the guest state void SyncPrimitiveRestart(); /// Syncs the depth test state to match the guest state @@ -246,7 +246,7 @@ private: std::array texture_handles{}; std::array image_handles{}; - /// Number of commands queued to the OpenGL driver. Resetted on flush. + /// Number of commands queued to the OpenGL driver. Reset on flush. size_t num_queued_commands = 0; bool has_written_global_memory = false; diff --git a/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp b/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp index f8398b511..e7df32d84 100644 --- a/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp +++ b/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp @@ -271,7 +271,7 @@ bool FixedPipelineState::operator==(const FixedPipelineState& rhs) const noexcep u32 FixedPipelineState::PackComparisonOp(Maxwell::ComparisonOp op) noexcept { // OpenGL enums go from 0x200 to 0x207 and the others from 1 to 8 - // If we substract 0x200 to OpenGL enums and 1 to the others we get a 0-7 range. + // If we subtract 0x200 to OpenGL enums and 1 to the others we get a 0-7 range. // Perfect for a hash. const u32 value = static_cast(op); return value - (value >= 0x200 ? 0x200 : 1); @@ -322,8 +322,8 @@ Maxwell::StencilOp::Op FixedPipelineState::UnpackStencilOp(u32 packed) noexcept } u32 FixedPipelineState::PackCullFace(Maxwell::CullFace cull) noexcept { - // FrontAndBack is 0x408, by substracting 0x406 in it we get 2. - // Individual cull faces are in 0x404 and 0x405, substracting 0x404 we get 0 and 1. + // FrontAndBack is 0x408, by subtracting 0x406 in it we get 2. + // Individual cull faces are in 0x404 and 0x405, subtracting 0x404 we get 0 and 1. const u32 value = static_cast(cull); return value - (value == 0x408 ? 0x406 : 0x404); } diff --git a/src/video_core/renderer_vulkan/vk_command_pool.cpp b/src/video_core/renderer_vulkan/vk_command_pool.cpp index 2f09de1c1..d0dbf7ca5 100644 --- a/src/video_core/renderer_vulkan/vk_command_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_command_pool.cpp @@ -22,8 +22,8 @@ CommandPool::CommandPool(MasterSemaphore& master_semaphore_, const Device& devic CommandPool::~CommandPool() = default; void CommandPool::Allocate(size_t begin, size_t end) { - // Command buffers are going to be commited, recorded, executed every single usage cycle. - // They are also going to be reseted when commited. + // Command buffers are going to be committed, recorded, executed every single usage cycle. + // They are also going to be reset when committed. Pool& pool = pools.emplace_back(); pool.handle = device.GetLogical().CreateCommandPool({ .sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 855488ead..673ab478e 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -671,7 +671,7 @@ bool RasterizerVulkan::AccelerateConditionalRendering() { // TODO(Blinkhawk): Reimplement Host conditional rendering. return false; } - // Medium / Low Hack: stub any checks on queries writen into the buffer cache. + // Medium / Low Hack: stub any checks on queries written into the buffer cache. const GPUVAddr condition_address{maxwell3d->regs.render_enable.Address()}; Maxwell::ReportSemaphore::Compare cmp; if (gpu_memory->IsMemoryDirty(condition_address, sizeof(cmp), diff --git a/src/video_core/renderer_vulkan/vk_resource_pool.cpp b/src/video_core/renderer_vulkan/vk_resource_pool.cpp index 6c8ac22f4..6572f82ba 100644 --- a/src/video_core/renderer_vulkan/vk_resource_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_resource_pool.cpp @@ -37,7 +37,7 @@ size_t ResourcePool::CommitResource() { found = free_resource; } } - // Free iterator is hinted to the resource after the one that's been commited. + // Free iterator is hinted to the resource after the one that's been committed. hint_iterator = (*found + 1) % ticks.size(); return *found; } @@ -46,7 +46,7 @@ size_t ResourcePool::ManageOverflow() { const size_t old_capacity = ticks.size(); Grow(); - // The last entry is guaranted to be free, since it's the first element of the freshly + // The last entry is guaranteed to be free, since it's the first element of the freshly // allocated resources. return old_capacity; } diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp index b6810eef9..85fdce6e5 100644 --- a/src/video_core/renderer_vulkan/vk_swapchain.cpp +++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp @@ -159,7 +159,7 @@ void Swapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities, bo present_mode = ChooseSwapPresentMode(present_modes); u32 requested_image_count{capabilities.minImageCount + 1}; - // Ensure Tripple buffering if possible. + // Ensure Triple buffering if possible. if (capabilities.maxImageCount > 0) { if (requested_image_count > capabilities.maxImageCount) { requested_image_count = capabilities.maxImageCount; diff --git a/src/video_core/renderer_vulkan/vk_update_descriptor.cpp b/src/video_core/renderer_vulkan/vk_update_descriptor.cpp index 4d4a6753b..009dab0b6 100644 --- a/src/video_core/renderer_vulkan/vk_update_descriptor.cpp +++ b/src/video_core/renderer_vulkan/vk_update_descriptor.cpp @@ -25,7 +25,7 @@ void UpdateDescriptorQueue::TickFrame() { void UpdateDescriptorQueue::Acquire() { // Minimum number of entries required. - // This is the maximum number of entries a single draw call migth use. + // This is the maximum number of entries a single draw call might use. static constexpr size_t MIN_ENTRIES = 0x400; if (std::distance(payload.data(), payload_cursor) + MIN_ENTRIES >= payload.max_size()) { diff --git a/src/video_core/texture_cache/image_base.h b/src/video_core/texture_cache/image_base.h index e8fa592d2..329396bb6 100644 --- a/src/video_core/texture_cache/image_base.h +++ b/src/video_core/texture_cache/image_base.h @@ -25,7 +25,7 @@ enum class ImageFlagBits : u32 { Registered = 1 << 6, ///< True when the image is registered Picked = 1 << 7, ///< Temporary flag to mark the image as picked Remapped = 1 << 8, ///< Image has been remapped. - Sparse = 1 << 9, ///< Image has non continous submemory. + Sparse = 1 << 9, ///< Image has non continuous submemory. // Garbage Collection Flags BadOverlap = 1 << 10, ///< This image overlaps other but doesn't fit, has higher diff --git a/src/video_core/textures/astc.cpp b/src/video_core/textures/astc.cpp index 4381eed1d..a68bc0d77 100644 --- a/src/video_core/textures/astc.cpp +++ b/src/video_core/textures/astc.cpp @@ -1571,7 +1571,7 @@ static void DecompressBlock(std::span inBuf, const u32 blockWidth, assert(strm.GetBitsRead() + weightParams.GetPackedBitSize() == 128); // Decode both color data and texel weight data - u32 colorValues[32]; // Four values, two endpoints, four maximum paritions + u32 colorValues[32]; // Four values, two endpoints, four maximum partitions DecodeColorValues(colorValues, colorEndpointData, colorEndpointMode, nPartitions, colorDataBits); diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 48f1a3d14..df348af55 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -417,7 +417,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR sets_per_pool = 64; if (is_amd_driver) { - // AMD drivers need a higher amount of Sets per Pool in certain circunstances like in XC2. + // AMD drivers need a higher amount of Sets per Pool in certain circumstances like in XC2. sets_per_pool = 96; // Disable VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT on AMD GCN4 and lower as it is broken. if (!features.shader_float16_int8.shaderFloat16) { diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h index 0662a2d9f..41b5da18a 100644 --- a/src/video_core/vulkan_common/vulkan_device.h +++ b/src/video_core/vulkan_common/vulkan_device.h @@ -180,7 +180,7 @@ public: ~Device(); /** - * Returns a format supported by the device for the passed requeriments. + * Returns a format supported by the device for the passed requirements. * @param wanted_format The ideal format to be returned. It may not be the returned format. * @param wanted_usage The usage that must be fulfilled even if the format is not supported. * @param format_type Format type usage. @@ -259,12 +259,12 @@ public: bool ShouldBoostClocks() const; - /// Returns uniform buffer alignment requeriment. + /// Returns uniform buffer alignment requirement. VkDeviceSize GetUniformBufferAlignment() const { return properties.properties.limits.minUniformBufferOffsetAlignment; } - /// Returns storage alignment requeriment. + /// Returns storage alignment requirement. VkDeviceSize GetStorageBufferAlignment() const { return properties.properties.limits.minStorageBufferOffsetAlignment; } @@ -656,7 +656,7 @@ private: bool is_integrated{}; ///< Is GPU an iGPU. bool is_virtual{}; ///< Is GPU a virtual GPU. bool is_non_gpu{}; ///< Is SoftwareRasterizer, FPGA, non-GPU device. - bool has_broken_cube_compatibility{}; ///< Has broken cube compatiblity bit + bool has_broken_cube_compatibility{}; ///< Has broken cube compatibility bit bool has_renderdoc{}; ///< Has RenderDoc attached bool has_nsight_graphics{}; ///< Has Nsight Graphics attached bool supports_d24_depth{}; ///< Supports D24 depth buffers. diff --git a/src/video_core/vulkan_common/vulkan_wrapper.h b/src/video_core/vulkan_common/vulkan_wrapper.h index e86f661cb..4ff328a21 100644 --- a/src/video_core/vulkan_common/vulkan_wrapper.h +++ b/src/video_core/vulkan_common/vulkan_wrapper.h @@ -68,7 +68,7 @@ public: constexpr Span(const Range& range) : ptr{std::data(range)}, num{std::size(range)} {} /// Construct a span from a pointer and a size. - /// This is inteded for subranges. + /// This is intended for subranges. constexpr Span(const T* ptr_, std::size_t num_) noexcept : ptr{ptr_}, num{num_} {} /// Returns the data pointer by the span. @@ -390,11 +390,11 @@ public: Handle(const Handle&) = delete; Handle& operator=(const Handle&) = delete; - /// Construct a handle transfering the ownership from another handle. + /// Construct a handle transferring the ownership from another handle. Handle(Handle&& rhs) noexcept : handle{std::exchange(rhs.handle, nullptr)}, owner{rhs.owner}, dld{rhs.dld} {} - /// Assign the current handle transfering the ownership from another handle. + /// Assign the current handle transferring the ownership from another handle. /// Destroys any previously held object. Handle& operator=(Handle&& rhs) noexcept { Release(); @@ -463,10 +463,10 @@ public: Handle(const Handle&) = delete; Handle& operator=(const Handle&) = delete; - /// Construct a handle transfering ownership from another handle. + /// Construct a handle transferring ownership from another handle. Handle(Handle&& rhs) noexcept : handle{std::exchange(rhs.handle, nullptr)}, dld{rhs.dld} {} - /// Assign the current handle transfering the ownership from another handle. + /// Assign the current handle transferring the ownership from another handle. /// Destroys any previously held object. Handle& operator=(Handle&& rhs) noexcept { Release(); @@ -533,12 +533,12 @@ public: PoolAllocations(const PoolAllocations&) = delete; PoolAllocations& operator=(const PoolAllocations&) = delete; - /// Construct an allocation transfering ownership from another allocation. + /// Construct an allocation transferring ownership from another allocation. PoolAllocations(PoolAllocations&& rhs) noexcept : allocations{std::move(rhs.allocations)}, num{rhs.num}, device{rhs.device}, pool{rhs.pool}, dld{rhs.dld} {} - /// Assign an allocation transfering ownership from another allocation. + /// Assign an allocation transferring ownership from another allocation. PoolAllocations& operator=(PoolAllocations&& rhs) noexcept { allocations = std::move(rhs.allocations); num = rhs.num; diff --git a/src/yuzu/applets/qt_web_browser.h b/src/yuzu/applets/qt_web_browser.h index e8fe511ed..ceae7926e 100644 --- a/src/yuzu/applets/qt_web_browser.h +++ b/src/yuzu/applets/qt_web_browser.h @@ -110,7 +110,7 @@ private: /** * Handles button presses to execute functions assigned in yuzu_key_callbacks. * yuzu_key_callbacks contains specialized functions for the buttons in the window footer - * that can be overriden by games to achieve desired functionality. + * that can be overridden by games to achieve desired functionality. * * @tparam HIDButton The list of buttons contained in yuzu_key_callbacks */ diff --git a/src/yuzu/compatdb.cpp b/src/yuzu/compatdb.cpp index 05f49c0d2..a57a96a38 100644 --- a/src/yuzu/compatdb.cpp +++ b/src/yuzu/compatdb.cpp @@ -76,7 +76,7 @@ void CompatDB::Submit() { compatibility_Graphical->addButton(ui->radioButton_Audio_Minor, 1); compatibility_Audio->addButton(ui->radioButton_Audio_No, 2); - const int compatiblity = static_cast(CalculateCompatibility()); + const int compatibility = static_cast(CalculateCompatibility()); switch ((static_cast(currentId()))) { case CompatDBPage::Intro: @@ -113,9 +113,9 @@ void CompatDB::Submit() { break; case CompatDBPage::Final: back(); - LOG_INFO(Frontend, "Compatibility Rating: {}", compatiblity); + LOG_INFO(Frontend, "Compatibility Rating: {}", compatibility); telemetry_session.AddField(Common::Telemetry::FieldType::UserFeedback, "Compatibility", - compatiblity); + compatibility); button(NextButton)->setEnabled(false); button(NextButton)->setText(tr("Submitting")); diff --git a/src/yuzu/configuration/configure_hotkeys.h b/src/yuzu/configuration/configure_hotkeys.h index b45ecb185..e8e414320 100644 --- a/src/yuzu/configuration/configure_hotkeys.h +++ b/src/yuzu/configuration/configure_hotkeys.h @@ -34,7 +34,7 @@ public: /** * Populates the hotkey list widget using data from the provided registry. - * Called everytime the Configure dialog is opened. + * Called every time the Configure dialog is opened. * @param registry The HotkeyRegistry whose data is used to populate the list. */ void Populate(const HotkeyRegistry& registry); diff --git a/src/yuzu/configuration/configure_input_player.h b/src/yuzu/configuration/configure_input_player.h index 99a9c875d..d4df43d73 100644 --- a/src/yuzu/configuration/configure_input_player.h +++ b/src/yuzu/configuration/configure_input_player.h @@ -224,7 +224,7 @@ private: /// Bottom row is where console wide settings are held, and its "owned" by the parent /// ConfigureInput widget. On show, add this widget to the main layout. This will change the - /// parent of the widget to this widget (but thats fine). + /// parent of the widget to this widget (but that's fine). QWidget* bottom_row; Core::HID::HIDCore& hid_core; diff --git a/src/yuzu/configuration/configure_input_player_widget.h b/src/yuzu/configuration/configure_input_player_widget.h index 0e9e95e85..267d134de 100644 --- a/src/yuzu/configuration/configure_input_player_widget.h +++ b/src/yuzu/configuration/configure_input_player_widget.h @@ -43,7 +43,7 @@ public: // Handles emulated controller events void ControllerUpdate(Core::HID::ControllerTriggerType type); - // Updates input on sheduled interval + // Updates input on scheduled interval void UpdateInput(); protected: diff --git a/src/yuzu/loading_screen.cpp b/src/yuzu/loading_screen.cpp index e263a07a7..b081fff6b 100644 --- a/src/yuzu/loading_screen.cpp +++ b/src/yuzu/loading_screen.cpp @@ -153,7 +153,7 @@ void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size } QString estimate; - // If theres a drastic slowdown in the rate, then display an estimate + // If there's a drastic slowdown in the rate, then display an estimate if (now - previous_time > milliseconds{50} || slow_shader_compile_start) { if (!slow_shader_compile_start) { slow_shader_start = steady_clock::now(); diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index c092507f4..ae14884b5 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -274,7 +274,7 @@ static QString PrettyProductName() { #ifdef _WIN32 static void OverrideWindowsFont() { - // Qt5 chooses these fonts on Windows and they have fairly ugly alphanumeric/cyrllic characters + // Qt5 chooses these fonts on Windows and they have fairly ugly alphanumeric/cyrillic characters // Asking to use "MS Shell Dlg 2" gives better other chars while leaving the Chinese Characters. const QString startup_font = QApplication::font().family(); const QStringList ugly_fonts = {QStringLiteral("SimSun"), QStringLiteral("PMingLiU")}; @@ -3596,7 +3596,7 @@ bool GMainWindow::CreateShortcut(const std::string& shortcut_path, const std::st const std::string& command, const std::string& arguments, const std::string& categories, const std::string& keywords) { #if defined(__linux__) || defined(__FreeBSD__) - // This desktop file template was writting referencing + // This desktop file template was writing referencing // https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.0.html std::string shortcut_contents{}; shortcut_contents.append("[Desktop Entry]\n"); diff --git a/src/yuzu/multiplayer/lobby.cpp b/src/yuzu/multiplayer/lobby.cpp index 6c93e3511..387f6f7c9 100644 --- a/src/yuzu/multiplayer/lobby.cpp +++ b/src/yuzu/multiplayer/lobby.cpp @@ -278,7 +278,7 @@ void Lobby::OnRefreshLobby() { } } - // Reenable the refresh button and resize the columns + // Re-enable the refresh button and resize the columns ui->refresh_list->setEnabled(true); ui->refresh_list->setText(tr("Refresh List")); ui->room_list->header()->stretchLastSection(); diff --git a/src/yuzu/multiplayer/state.cpp b/src/yuzu/multiplayer/state.cpp index 285bb150d..d82ca9aee 100644 --- a/src/yuzu/multiplayer/state.cpp +++ b/src/yuzu/multiplayer/state.cpp @@ -112,7 +112,7 @@ void MultiplayerState::SetNotificationStatus(NotificationStatus status) { void MultiplayerState::UpdateNotificationStatus() { switch (notification_status) { - case NotificationStatus::Unitialized: + case NotificationStatus::Uninitialized: status_icon->setPixmap(QIcon::fromTheme(QStringLiteral("disconnected")).pixmap(16)); status_text->setText(tr("Not Connected. Click here to find a room!")); leave_room->setEnabled(false); diff --git a/src/yuzu/multiplayer/state.h b/src/yuzu/multiplayer/state.h index 5d681c5c6..d6149838f 100644 --- a/src/yuzu/multiplayer/state.h +++ b/src/yuzu/multiplayer/state.h @@ -23,7 +23,7 @@ class MultiplayerState : public QWidget { public: enum class NotificationStatus { - Unitialized, + Uninitialized, Disconnected, Connected, Notification, @@ -98,7 +98,7 @@ private: QAction* show_room; std::shared_ptr announce_multiplayer_session; Network::RoomMember::State current_state = Network::RoomMember::State::Uninitialized; - NotificationStatus notification_status = NotificationStatus::Unitialized; + NotificationStatus notification_status = NotificationStatus::Uninitialized; bool has_mod_perms = false; Network::RoomMember::CallbackHandle state_callback_handle; Network::RoomMember::CallbackHandle error_callback_handle; diff --git a/src/yuzu/startup_checks.cpp b/src/yuzu/startup_checks.cpp index 9f702fe95..5e1f76339 100644 --- a/src/yuzu/startup_checks.cpp +++ b/src/yuzu/startup_checks.cpp @@ -86,7 +86,7 @@ bool StartupChecks(const char* arg0, bool* has_broken_vulkan, bool perform_vulka return false; } - // Wait until the processs exits and get exit code from it + // Wait until the process exits and get exit code from it WaitForSingleObject(process_info.hProcess, INFINITE); DWORD exit_code = STILL_ACTIVE; const int err = GetExitCodeProcess(process_info.hProcess, &exit_code); diff --git a/src/yuzu/util/overlay_dialog.h b/src/yuzu/util/overlay_dialog.h index 872283d61..62f9da311 100644 --- a/src/yuzu/util/overlay_dialog.h +++ b/src/yuzu/util/overlay_dialog.h @@ -71,7 +71,7 @@ private: const QString& left_button_text, const QString& right_button_text, Qt::Alignment alignment); - /// Moves and resizes the dialog to be fully overlayed on top of the parent window. + /// Moves and resizes the dialog to be fully overlaid on top of the parent window. void MoveAndResizeWindow(); /** From 3f261f22c981cbdc31ce079f0fd06789e78053e3 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 9 Mar 2023 20:58:37 -0500 Subject: [PATCH 0163/1181] vk_scheduler: split work queue waits and execution waits --- .../renderer_vulkan/vk_scheduler.cpp | 92 +++++++++++++------ src/video_core/renderer_vulkan/vk_scheduler.h | 6 +- 2 files changed, 66 insertions(+), 32 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_scheduler.cpp b/src/video_core/renderer_vulkan/vk_scheduler.cpp index e03685af1..c636a1625 100644 --- a/src/video_core/renderer_vulkan/vk_scheduler.cpp +++ b/src/video_core/renderer_vulkan/vk_scheduler.cpp @@ -47,14 +47,15 @@ Scheduler::Scheduler(const Device& device_, StateTracker& state_tracker_) Scheduler::~Scheduler() = default; void Scheduler::Flush(VkSemaphore signal_semaphore, VkSemaphore wait_semaphore) { + // When flushing, we only send data to the worker thread; no waiting is necessary. SubmitExecution(signal_semaphore, wait_semaphore); AllocateNewContext(); } void Scheduler::Finish(VkSemaphore signal_semaphore, VkSemaphore wait_semaphore) { + // When finishing, we need to wait for the submission to have executed on the device. const u64 presubmit_tick = CurrentTick(); SubmitExecution(signal_semaphore, wait_semaphore); - WaitWorker(); Wait(presubmit_tick); AllocateNewContext(); } @@ -63,8 +64,13 @@ void Scheduler::WaitWorker() { MICROPROFILE_SCOPE(Vulkan_WaitForWorker); DispatchWork(); - std::unique_lock lock{work_mutex}; - wait_cv.wait(lock, [this] { return work_queue.empty(); }); + // Ensure the queue is drained. + std::unique_lock ql{queue_mutex}; + event_cv.wait(ql, [this] { return work_queue.empty(); }); + + // Now wait for execution to finish. + // This needs to be done in the same order as WorkerThread. + std::unique_lock el{execution_mutex}; } void Scheduler::DispatchWork() { @@ -72,10 +78,10 @@ void Scheduler::DispatchWork() { return; } { - std::scoped_lock lock{work_mutex}; + std::scoped_lock ql{queue_mutex}; work_queue.push(std::move(chunk)); } - work_cv.notify_one(); + event_cv.notify_all(); AcquireNewChunk(); } @@ -137,30 +143,55 @@ bool Scheduler::UpdateRescaling(bool is_rescaling) { void Scheduler::WorkerThread(std::stop_token stop_token) { Common::SetCurrentThreadName("VulkanWorker"); - do { - std::unique_ptr work; - bool has_submit{false}; - { - std::unique_lock lock{work_mutex}; - if (work_queue.empty()) { - wait_cv.notify_all(); - } - Common::CondvarWait(work_cv, lock, stop_token, [&] { return !work_queue.empty(); }); - if (stop_token.stop_requested()) { - continue; - } - work = std::move(work_queue.front()); - work_queue.pop(); - has_submit = work->HasSubmit(); + const auto TryPopQueue{[this](auto& work) -> bool { + if (work_queue.empty()) { + return false; + } + + work = std::move(work_queue.front()); + work_queue.pop(); + event_cv.notify_all(); + return true; + }}; + + while (!stop_token.stop_requested()) { + std::unique_ptr work; + + { + std::unique_lock lk{queue_mutex}; + + // Wait for work. + Common::CondvarWait(event_cv, lk, stop_token, [&] { return TryPopQueue(work); }); + + // If we've been asked to stop, we're done. + if (stop_token.stop_requested()) { + return; + } + + // Exchange lock ownership so that we take the execution lock before + // the queue lock goes out of scope. This allows us to force execution + // to complete in the next step. + std::exchange(lk, std::unique_lock{execution_mutex}); + + // Perform the work, tracking whether the chunk was a submission + // before executing. + const bool has_submit = work->HasSubmit(); work->ExecuteAll(current_cmdbuf); + + // If the chunk was a submission, reallocate the command buffer. + if (has_submit) { + AllocateWorkerCommandBuffer(); + } } - if (has_submit) { - AllocateWorkerCommandBuffer(); + + { + std::scoped_lock rl{reserve_mutex}; + + // Recycle the chunk back to the reserve. + chunk_reserve.emplace_back(std::move(work)); } - std::scoped_lock reserve_lock{reserve_mutex}; - chunk_reserve.push_back(std::move(work)); - } while (!stop_token.stop_requested()); + } } void Scheduler::AllocateWorkerCommandBuffer() { @@ -289,13 +320,16 @@ void Scheduler::EndRenderPass() { } void Scheduler::AcquireNewChunk() { - std::scoped_lock lock{reserve_mutex}; + std::scoped_lock rl{reserve_mutex}; + if (chunk_reserve.empty()) { + // If we don't have anything reserved, we need to make a new chunk. chunk = std::make_unique(); - return; + } else { + // Otherwise, we can just take from the reserve. + chunk = std::make_unique(); + chunk_reserve.pop_back(); } - chunk = std::move(chunk_reserve.back()); - chunk_reserve.pop_back(); } } // namespace Vulkan diff --git a/src/video_core/renderer_vulkan/vk_scheduler.h b/src/video_core/renderer_vulkan/vk_scheduler.h index bd4cb0f7e..8d75ce987 100644 --- a/src/video_core/renderer_vulkan/vk_scheduler.h +++ b/src/video_core/renderer_vulkan/vk_scheduler.h @@ -232,10 +232,10 @@ private: std::queue> work_queue; std::vector> chunk_reserve; + std::mutex execution_mutex; std::mutex reserve_mutex; - std::mutex work_mutex; - std::condition_variable_any work_cv; - std::condition_variable wait_cv; + std::mutex queue_mutex; + std::condition_variable_any event_cv; std::jthread worker_thread; }; From d24ab14126a761ae40ce5d4964083390f1d7b396 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 6 Mar 2023 19:45:40 -0500 Subject: [PATCH 0164/1181] kernel: convert GlobalSchedulerContext, KAddressArbiter, KScopedSchedulerLockAndSleep, KThreadQueue to new style --- .../hle/kernel/global_scheduler_context.cpp | 33 +++--- .../hle/kernel/global_scheduler_context.h | 25 ++-- src/core/hle/kernel/k_address_arbiter.cpp | 111 ++++++++---------- src/core/hle/kernel/k_address_arbiter.h | 45 ++++--- src/core/hle/kernel/k_scheduler.h | 12 +- .../k_scoped_scheduler_lock_and_sleep.h | 30 ++--- src/core/hle/kernel/k_thread_queue.cpp | 12 +- src/core/hle/kernel/k_thread_queue.h | 4 +- 8 files changed, 130 insertions(+), 142 deletions(-) diff --git a/src/core/hle/kernel/global_scheduler_context.cpp b/src/core/hle/kernel/global_scheduler_context.cpp index fd911a3a5..7b090ccb5 100644 --- a/src/core/hle/kernel/global_scheduler_context.cpp +++ b/src/core/hle/kernel/global_scheduler_context.cpp @@ -12,20 +12,19 @@ namespace Kernel { -GlobalSchedulerContext::GlobalSchedulerContext(KernelCore& kernel_) - : kernel{kernel_}, scheduler_lock{kernel_} {} +GlobalSchedulerContext::GlobalSchedulerContext(KernelCore& kernel) + : m_kernel{kernel}, m_scheduler_lock{kernel} {} GlobalSchedulerContext::~GlobalSchedulerContext() = default; void GlobalSchedulerContext::AddThread(KThread* thread) { - std::scoped_lock lock{global_list_guard}; - thread_list.push_back(thread); + std::scoped_lock lock{m_global_list_guard}; + m_thread_list.push_back(thread); } void GlobalSchedulerContext::RemoveThread(KThread* thread) { - std::scoped_lock lock{global_list_guard}; - thread_list.erase(std::remove(thread_list.begin(), thread_list.end(), thread), - thread_list.end()); + std::scoped_lock lock{m_global_list_guard}; + std::erase(m_thread_list, thread); } void GlobalSchedulerContext::PreemptThreads() { @@ -38,37 +37,37 @@ void GlobalSchedulerContext::PreemptThreads() { 63, }; - ASSERT(IsLocked()); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); for (u32 core_id = 0; core_id < Core::Hardware::NUM_CPU_CORES; core_id++) { const u32 priority = preemption_priorities[core_id]; - KScheduler::RotateScheduledQueue(kernel, core_id, priority); + KScheduler::RotateScheduledQueue(m_kernel, core_id, priority); } } bool GlobalSchedulerContext::IsLocked() const { - return scheduler_lock.IsLockedByCurrentThread(); + return m_scheduler_lock.IsLockedByCurrentThread(); } void GlobalSchedulerContext::RegisterDummyThreadForWakeup(KThread* thread) { - ASSERT(IsLocked()); + ASSERT(this->IsLocked()); - woken_dummy_threads.insert(thread); + m_woken_dummy_threads.insert(thread); } void GlobalSchedulerContext::UnregisterDummyThreadForWakeup(KThread* thread) { - ASSERT(IsLocked()); + ASSERT(this->IsLocked()); - woken_dummy_threads.erase(thread); + m_woken_dummy_threads.erase(thread); } void GlobalSchedulerContext::WakeupWaitingDummyThreads() { - ASSERT(IsLocked()); + ASSERT(this->IsLocked()); - for (auto* thread : woken_dummy_threads) { + for (auto* thread : m_woken_dummy_threads) { thread->DummyThreadEndWait(); } - woken_dummy_threads.clear(); + m_woken_dummy_threads.clear(); } } // namespace Kernel diff --git a/src/core/hle/kernel/global_scheduler_context.h b/src/core/hle/kernel/global_scheduler_context.h index 220ed6192..b7fb8caec 100644 --- a/src/core/hle/kernel/global_scheduler_context.h +++ b/src/core/hle/kernel/global_scheduler_context.h @@ -33,7 +33,7 @@ class GlobalSchedulerContext final { public: using LockType = KAbstractSchedulerLock; - explicit GlobalSchedulerContext(KernelCore& kernel_); + explicit GlobalSchedulerContext(KernelCore& kernel); ~GlobalSchedulerContext(); /// Adds a new thread to the scheduler @@ -43,8 +43,9 @@ public: void RemoveThread(KThread* thread); /// Returns a list of all threads managed by the scheduler + /// This is only safe to iterate while holding the scheduler lock [[nodiscard]] const std::vector& GetThreadList() const { - return thread_list; + return m_thread_list; } /** @@ -64,29 +65,25 @@ public: void WakeupWaitingDummyThreads(); [[nodiscard]] LockType& SchedulerLock() { - return scheduler_lock; - } - - [[nodiscard]] const LockType& SchedulerLock() const { - return scheduler_lock; + return m_scheduler_lock; } private: friend class KScopedSchedulerLock; friend class KScopedSchedulerLockAndSleep; - KernelCore& kernel; + KernelCore& m_kernel; - std::atomic_bool scheduler_update_needed{}; - KSchedulerPriorityQueue priority_queue; - LockType scheduler_lock; + std::atomic_bool m_scheduler_update_needed{}; + KSchedulerPriorityQueue m_priority_queue; + LockType m_scheduler_lock; /// Lists dummy threads pending wakeup on lock release - std::set woken_dummy_threads; + std::set m_woken_dummy_threads; /// Lists all thread ids that aren't deleted/etc. - std::vector thread_list; - std::mutex global_list_guard; + std::vector m_thread_list; + std::mutex m_global_list_guard; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_address_arbiter.cpp b/src/core/hle/kernel/k_address_arbiter.cpp index a4c16eca9..47637a729 100644 --- a/src/core/hle/kernel/k_address_arbiter.cpp +++ b/src/core/hle/kernel/k_address_arbiter.cpp @@ -14,8 +14,8 @@ namespace Kernel { -KAddressArbiter::KAddressArbiter(Core::System& system_) - : system{system_}, kernel{system.Kernel()} {} +KAddressArbiter::KAddressArbiter(Core::System& system) + : m_system{system}, m_kernel{system.Kernel()} {} KAddressArbiter::~KAddressArbiter() = default; namespace { @@ -90,8 +90,8 @@ bool UpdateIfEqual(Core::System& system, s32* out, VAddr address, s32 value, s32 class ThreadQueueImplForKAddressArbiter final : public KThreadQueue { public: - explicit ThreadQueueImplForKAddressArbiter(KernelCore& kernel_, KAddressArbiter::ThreadTree* t) - : KThreadQueue(kernel_), m_tree(t) {} + explicit ThreadQueueImplForKAddressArbiter(KernelCore& kernel, KAddressArbiter::ThreadTree* t) + : KThreadQueue(kernel), m_tree(t) {} void CancelWait(KThread* waiting_thread, Result wait_result, bool cancel_timer_task) override { // If the thread is waiting on an address arbiter, remove it from the tree. @@ -105,7 +105,7 @@ public: } private: - KAddressArbiter::ThreadTree* m_tree; + KAddressArbiter::ThreadTree* m_tree{}; }; } // namespace @@ -114,10 +114,10 @@ Result KAddressArbiter::Signal(VAddr addr, s32 count) { // Perform signaling. s32 num_waiters{}; { - KScopedSchedulerLock sl(kernel); + KScopedSchedulerLock sl(m_kernel); - auto it = thread_tree.nfind_key({addr, -1}); - while ((it != thread_tree.end()) && (count <= 0 || num_waiters < count) && + auto it = m_tree.nfind_key({addr, -1}); + while ((it != m_tree.end()) && (count <= 0 || num_waiters < count) && (it->GetAddressArbiterKey() == addr)) { // End the thread's wait. KThread* target_thread = std::addressof(*it); @@ -126,31 +126,27 @@ Result KAddressArbiter::Signal(VAddr addr, s32 count) { ASSERT(target_thread->IsWaitingForAddressArbiter()); target_thread->ClearAddressArbiter(); - it = thread_tree.erase(it); + it = m_tree.erase(it); ++num_waiters; } } - return ResultSuccess; + R_SUCCEED(); } Result KAddressArbiter::SignalAndIncrementIfEqual(VAddr addr, s32 value, s32 count) { // Perform signaling. s32 num_waiters{}; { - KScopedSchedulerLock sl(kernel); + KScopedSchedulerLock sl(m_kernel); // Check the userspace value. s32 user_value{}; - if (!UpdateIfEqual(system, &user_value, addr, value, value + 1)) { - LOG_ERROR(Kernel, "Invalid current memory!"); - return ResultInvalidCurrentMemory; - } - if (user_value != value) { - return ResultInvalidState; - } + R_UNLESS(UpdateIfEqual(m_system, &user_value, addr, value, value + 1), + ResultInvalidCurrentMemory); + R_UNLESS(user_value == value, ResultInvalidState); - auto it = thread_tree.nfind_key({addr, -1}); - while ((it != thread_tree.end()) && (count <= 0 || num_waiters < count) && + auto it = m_tree.nfind_key({addr, -1}); + while ((it != m_tree.end()) && (count <= 0 || num_waiters < count) && (it->GetAddressArbiterKey() == addr)) { // End the thread's wait. KThread* target_thread = std::addressof(*it); @@ -159,33 +155,33 @@ Result KAddressArbiter::SignalAndIncrementIfEqual(VAddr addr, s32 value, s32 cou ASSERT(target_thread->IsWaitingForAddressArbiter()); target_thread->ClearAddressArbiter(); - it = thread_tree.erase(it); + it = m_tree.erase(it); ++num_waiters; } } - return ResultSuccess; + R_SUCCEED(); } Result KAddressArbiter::SignalAndModifyByWaitingCountIfEqual(VAddr addr, s32 value, s32 count) { // Perform signaling. s32 num_waiters{}; { - [[maybe_unused]] const KScopedSchedulerLock sl(kernel); + KScopedSchedulerLock sl(m_kernel); - auto it = thread_tree.nfind_key({addr, -1}); + auto it = m_tree.nfind_key({addr, -1}); // Determine the updated value. s32 new_value{}; if (count <= 0) { - if (it != thread_tree.end() && it->GetAddressArbiterKey() == addr) { + if (it != m_tree.end() && it->GetAddressArbiterKey() == addr) { new_value = value - 2; } else { new_value = value + 1; } } else { - if (it != thread_tree.end() && it->GetAddressArbiterKey() == addr) { + if (it != m_tree.end() && it->GetAddressArbiterKey() == addr) { auto tmp_it = it; s32 tmp_num_waiters{}; - while (++tmp_it != thread_tree.end() && tmp_it->GetAddressArbiterKey() == addr) { + while (++tmp_it != m_tree.end() && tmp_it->GetAddressArbiterKey() == addr) { if (tmp_num_waiters++ >= count) { break; } @@ -205,20 +201,15 @@ Result KAddressArbiter::SignalAndModifyByWaitingCountIfEqual(VAddr addr, s32 val s32 user_value{}; bool succeeded{}; if (value != new_value) { - succeeded = UpdateIfEqual(system, &user_value, addr, value, new_value); + succeeded = UpdateIfEqual(m_system, &user_value, addr, value, new_value); } else { - succeeded = ReadFromUser(system, &user_value, addr); + succeeded = ReadFromUser(m_system, &user_value, addr); } - if (!succeeded) { - LOG_ERROR(Kernel, "Invalid current memory!"); - return ResultInvalidCurrentMemory; - } - if (user_value != value) { - return ResultInvalidState; - } + R_UNLESS(succeeded, ResultInvalidCurrentMemory); + R_UNLESS(user_value == value, ResultInvalidState); - while ((it != thread_tree.end()) && (count <= 0 || num_waiters < count) && + while ((it != m_tree.end()) && (count <= 0 || num_waiters < count) && (it->GetAddressArbiterKey() == addr)) { // End the thread's wait. KThread* target_thread = std::addressof(*it); @@ -227,57 +218,57 @@ Result KAddressArbiter::SignalAndModifyByWaitingCountIfEqual(VAddr addr, s32 val ASSERT(target_thread->IsWaitingForAddressArbiter()); target_thread->ClearAddressArbiter(); - it = thread_tree.erase(it); + it = m_tree.erase(it); ++num_waiters; } } - return ResultSuccess; + R_SUCCEED(); } Result KAddressArbiter::WaitIfLessThan(VAddr addr, s32 value, bool decrement, s64 timeout) { // Prepare to wait. - KThread* cur_thread = GetCurrentThreadPointer(kernel); + KThread* cur_thread = GetCurrentThreadPointer(m_kernel); KHardwareTimer* timer{}; - ThreadQueueImplForKAddressArbiter wait_queue(kernel, std::addressof(thread_tree)); + ThreadQueueImplForKAddressArbiter wait_queue(m_kernel, std::addressof(m_tree)); { - KScopedSchedulerLockAndSleep slp{kernel, std::addressof(timer), cur_thread, timeout}; + KScopedSchedulerLockAndSleep slp{m_kernel, std::addressof(timer), cur_thread, timeout}; // Check that the thread isn't terminating. if (cur_thread->IsTerminationRequested()) { slp.CancelSleep(); - return ResultTerminationRequested; + R_THROW(ResultTerminationRequested); } // Read the value from userspace. s32 user_value{}; bool succeeded{}; if (decrement) { - succeeded = DecrementIfLessThan(system, &user_value, addr, value); + succeeded = DecrementIfLessThan(m_system, &user_value, addr, value); } else { - succeeded = ReadFromUser(system, &user_value, addr); + succeeded = ReadFromUser(m_system, &user_value, addr); } if (!succeeded) { slp.CancelSleep(); - return ResultInvalidCurrentMemory; + R_THROW(ResultInvalidCurrentMemory); } // Check that the value is less than the specified one. if (user_value >= value) { slp.CancelSleep(); - return ResultInvalidState; + R_THROW(ResultInvalidState); } // Check that the timeout is non-zero. if (timeout == 0) { slp.CancelSleep(); - return ResultTimedOut; + R_THROW(ResultTimedOut); } // Set the arbiter. - cur_thread->SetAddressArbiter(&thread_tree, addr); - thread_tree.insert(*cur_thread); + cur_thread->SetAddressArbiter(std::addressof(m_tree), addr); + m_tree.insert(*cur_thread); // Wait for the thread to finish. wait_queue.SetHardwareTimer(timer); @@ -291,41 +282,41 @@ Result KAddressArbiter::WaitIfLessThan(VAddr addr, s32 value, bool decrement, s6 Result KAddressArbiter::WaitIfEqual(VAddr addr, s32 value, s64 timeout) { // Prepare to wait. - KThread* cur_thread = GetCurrentThreadPointer(kernel); + KThread* cur_thread = GetCurrentThreadPointer(m_kernel); KHardwareTimer* timer{}; - ThreadQueueImplForKAddressArbiter wait_queue(kernel, std::addressof(thread_tree)); + ThreadQueueImplForKAddressArbiter wait_queue(m_kernel, std::addressof(m_tree)); { - KScopedSchedulerLockAndSleep slp{kernel, std::addressof(timer), cur_thread, timeout}; + KScopedSchedulerLockAndSleep slp{m_kernel, std::addressof(timer), cur_thread, timeout}; // Check that the thread isn't terminating. if (cur_thread->IsTerminationRequested()) { slp.CancelSleep(); - return ResultTerminationRequested; + R_THROW(ResultTerminationRequested); } // Read the value from userspace. s32 user_value{}; - if (!ReadFromUser(system, &user_value, addr)) { + if (!ReadFromUser(m_system, &user_value, addr)) { slp.CancelSleep(); - return ResultInvalidCurrentMemory; + R_THROW(ResultInvalidCurrentMemory); } // Check that the value is equal. if (value != user_value) { slp.CancelSleep(); - return ResultInvalidState; + R_THROW(ResultInvalidState); } // Check that the timeout is non-zero. if (timeout == 0) { slp.CancelSleep(); - return ResultTimedOut; + R_THROW(ResultTimedOut); } // Set the arbiter. - cur_thread->SetAddressArbiter(&thread_tree, addr); - thread_tree.insert(*cur_thread); + cur_thread->SetAddressArbiter(std::addressof(m_tree), addr); + m_tree.insert(*cur_thread); // Wait for the thread to finish. wait_queue.SetHardwareTimer(timer); diff --git a/src/core/hle/kernel/k_address_arbiter.h b/src/core/hle/kernel/k_address_arbiter.h index e4085ae22..9a8c1ae94 100644 --- a/src/core/hle/kernel/k_address_arbiter.h +++ b/src/core/hle/kernel/k_address_arbiter.h @@ -22,47 +22,46 @@ class KAddressArbiter { public: using ThreadTree = KConditionVariable::ThreadTree; - explicit KAddressArbiter(Core::System& system_); + explicit KAddressArbiter(Core::System& system); ~KAddressArbiter(); - [[nodiscard]] Result SignalToAddress(VAddr addr, Svc::SignalType type, s32 value, s32 count) { + Result SignalToAddress(VAddr addr, Svc::SignalType type, s32 value, s32 count) { switch (type) { case Svc::SignalType::Signal: - return Signal(addr, count); + R_RETURN(this->Signal(addr, count)); case Svc::SignalType::SignalAndIncrementIfEqual: - return SignalAndIncrementIfEqual(addr, value, count); + R_RETURN(this->SignalAndIncrementIfEqual(addr, value, count)); case Svc::SignalType::SignalAndModifyByWaitingCountIfEqual: - return SignalAndModifyByWaitingCountIfEqual(addr, value, count); + R_RETURN(this->SignalAndModifyByWaitingCountIfEqual(addr, value, count)); + default: + UNREACHABLE(); } - ASSERT(false); - return ResultUnknown; } - [[nodiscard]] Result WaitForAddress(VAddr addr, Svc::ArbitrationType type, s32 value, - s64 timeout) { + Result WaitForAddress(VAddr addr, Svc::ArbitrationType type, s32 value, s64 timeout) { switch (type) { case Svc::ArbitrationType::WaitIfLessThan: - return WaitIfLessThan(addr, value, false, timeout); + R_RETURN(WaitIfLessThan(addr, value, false, timeout)); case Svc::ArbitrationType::DecrementAndWaitIfLessThan: - return WaitIfLessThan(addr, value, true, timeout); + R_RETURN(WaitIfLessThan(addr, value, true, timeout)); case Svc::ArbitrationType::WaitIfEqual: - return WaitIfEqual(addr, value, timeout); + R_RETURN(WaitIfEqual(addr, value, timeout)); + default: + UNREACHABLE(); } - ASSERT(false); - return ResultUnknown; } private: - [[nodiscard]] Result Signal(VAddr addr, s32 count); - [[nodiscard]] Result SignalAndIncrementIfEqual(VAddr addr, s32 value, s32 count); - [[nodiscard]] Result SignalAndModifyByWaitingCountIfEqual(VAddr addr, s32 value, s32 count); - [[nodiscard]] Result WaitIfLessThan(VAddr addr, s32 value, bool decrement, s64 timeout); - [[nodiscard]] Result WaitIfEqual(VAddr addr, s32 value, s64 timeout); + Result Signal(VAddr addr, s32 count); + Result SignalAndIncrementIfEqual(VAddr addr, s32 value, s32 count); + Result SignalAndModifyByWaitingCountIfEqual(VAddr addr, s32 value, s32 count); + Result WaitIfLessThan(VAddr addr, s32 value, bool decrement, s64 timeout); + Result WaitIfEqual(VAddr addr, s32 value, s64 timeout); - ThreadTree thread_tree; - - Core::System& system; - KernelCore& kernel; +private: + ThreadTree m_tree; + Core::System& m_system; + KernelCore& m_kernel; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_scheduler.h b/src/core/hle/kernel/k_scheduler.h index 534321d8d..3f13b8193 100644 --- a/src/core/hle/kernel/k_scheduler.h +++ b/src/core/hle/kernel/k_scheduler.h @@ -80,17 +80,17 @@ public: return GetCurrentThread(kernel).GetDisableDispatchCount() == 0; } static bool IsSchedulerLockedByCurrentThread(KernelCore& kernel) { - return kernel.GlobalSchedulerContext().scheduler_lock.IsLockedByCurrentThread(); + return kernel.GlobalSchedulerContext().m_scheduler_lock.IsLockedByCurrentThread(); } static bool IsSchedulerUpdateNeeded(KernelCore& kernel) { - return kernel.GlobalSchedulerContext().scheduler_update_needed; + return kernel.GlobalSchedulerContext().m_scheduler_update_needed; } static void SetSchedulerUpdateNeeded(KernelCore& kernel) { - kernel.GlobalSchedulerContext().scheduler_update_needed = true; + kernel.GlobalSchedulerContext().m_scheduler_update_needed = true; } static void ClearSchedulerUpdateNeeded(KernelCore& kernel) { - kernel.GlobalSchedulerContext().scheduler_update_needed = false; + kernel.GlobalSchedulerContext().m_scheduler_update_needed = false; } static void DisableScheduling(KernelCore& kernel); @@ -115,7 +115,7 @@ public: private: // Static private API. static KSchedulerPriorityQueue& GetPriorityQueue(KernelCore& kernel) { - return kernel.GlobalSchedulerContext().priority_queue; + return kernel.GlobalSchedulerContext().m_priority_queue; } static u64 UpdateHighestPriorityThreadsImpl(KernelCore& kernel); @@ -166,7 +166,7 @@ private: class KScopedSchedulerLock : public KScopedLock { public: explicit KScopedSchedulerLock(KernelCore& kernel) - : KScopedLock(kernel.GlobalSchedulerContext().scheduler_lock) {} + : KScopedLock(kernel.GlobalSchedulerContext().m_scheduler_lock) {} ~KScopedSchedulerLock() = default; }; diff --git a/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h b/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h index 14b83a819..c485022f5 100644 --- a/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h +++ b/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h @@ -11,39 +11,39 @@ namespace Kernel { -class [[nodiscard]] KScopedSchedulerLockAndSleep { +class KScopedSchedulerLockAndSleep { public: - explicit KScopedSchedulerLockAndSleep(KernelCore& kernel_, KHardwareTimer** out_timer, - KThread* t, s64 timeout) - : kernel(kernel_), timeout_tick(timeout), thread(t), timer() { + explicit KScopedSchedulerLockAndSleep(KernelCore& kernel, KHardwareTimer** out_timer, + KThread* thread, s64 timeout_tick) + : m_kernel(kernel), m_timeout_tick(timeout_tick), m_thread(thread), m_timer() { // Lock the scheduler. - kernel.GlobalSchedulerContext().scheduler_lock.Lock(); + kernel.GlobalSchedulerContext().m_scheduler_lock.Lock(); // Set our timer only if the time is positive. - timer = (timeout_tick > 0) ? std::addressof(kernel.HardwareTimer()) : nullptr; + m_timer = (timeout_tick > 0) ? std::addressof(kernel.HardwareTimer()) : nullptr; - *out_timer = timer; + *out_timer = m_timer; } ~KScopedSchedulerLockAndSleep() { // Register the sleep. - if (timeout_tick > 0) { - timer->RegisterTask(thread, timeout_tick); + if (m_timeout_tick > 0) { + m_timer->RegisterTask(m_thread, m_timeout_tick); } // Unlock the scheduler. - kernel.GlobalSchedulerContext().scheduler_lock.Unlock(); + m_kernel.GlobalSchedulerContext().m_scheduler_lock.Unlock(); } void CancelSleep() { - timeout_tick = 0; + m_timeout_tick = 0; } private: - KernelCore& kernel; - s64 timeout_tick{}; - KThread* thread{}; - KHardwareTimer* timer{}; + KernelCore& m_kernel; + s64 m_timeout_tick{}; + KThread* m_thread{}; + KHardwareTimer* m_timer{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_thread_queue.cpp b/src/core/hle/kernel/k_thread_queue.cpp index fe648447b..61488f4ce 100644 --- a/src/core/hle/kernel/k_thread_queue.cpp +++ b/src/core/hle/kernel/k_thread_queue.cpp @@ -7,9 +7,10 @@ namespace Kernel { -void KThreadQueue::NotifyAvailable([[maybe_unused]] KThread* waiting_thread, - [[maybe_unused]] KSynchronizationObject* signaled_object, - [[maybe_unused]] Result wait_result) {} +void KThreadQueue::NotifyAvailable(KThread* waiting_thread, KSynchronizationObject* signaled_object, + Result wait_result) { + UNREACHABLE(); +} void KThreadQueue::EndWait(KThread* waiting_thread, Result wait_result) { // Set the thread's wait result. @@ -43,7 +44,8 @@ void KThreadQueue::CancelWait(KThread* waiting_thread, Result wait_result, bool } } -void KThreadQueueWithoutEndWait::EndWait([[maybe_unused]] KThread* waiting_thread, - [[maybe_unused]] Result wait_result) {} +void KThreadQueueWithoutEndWait::EndWait(KThread* waiting_thread, Result wait_result) { + UNREACHABLE(); +} } // namespace Kernel diff --git a/src/core/hle/kernel/k_thread_queue.h b/src/core/hle/kernel/k_thread_queue.h index 01e330e2e..8ec2f900b 100644 --- a/src/core/hle/kernel/k_thread_queue.h +++ b/src/core/hle/kernel/k_thread_queue.h @@ -12,7 +12,7 @@ class KHardwareTimer; class KThreadQueue { public: - explicit KThreadQueue(KernelCore& kernel_) : kernel{kernel_}, m_hardware_timer{} {} + explicit KThreadQueue(KernelCore& kernel) : m_kernel{kernel}, m_hardware_timer{} {} virtual ~KThreadQueue() = default; void SetHardwareTimer(KHardwareTimer* timer) { @@ -25,7 +25,7 @@ public: virtual void CancelWait(KThread* waiting_thread, Result wait_result, bool cancel_timer_task); private: - KernelCore& kernel; + KernelCore& m_kernel; KHardwareTimer* m_hardware_timer{}; }; From 097c25b164ba830b8d4a89926a3e90d297d06d8f Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 6 Mar 2023 20:34:25 -0500 Subject: [PATCH 0165/1181] kernel: convert KPort, KSession --- src/core/hle/kernel/k_affinity_mask.h | 20 +++---- src/core/hle/kernel/k_auto_object.h | 9 --- src/core/hle/kernel/k_capabilities.cpp | 2 +- src/core/hle/kernel/k_capabilities.h | 2 +- src/core/hle/kernel/k_client_port.cpp | 73 +++++++++++------------ src/core/hle/kernel/k_client_port.h | 23 ++++--- src/core/hle/kernel/k_client_session.cpp | 6 +- src/core/hle/kernel/k_client_session.h | 11 ++-- src/core/hle/kernel/k_port.cpp | 37 ++++++------ src/core/hle/kernel/k_port.h | 26 ++++---- src/core/hle/kernel/k_process.h | 6 ++ src/core/hle/kernel/k_server_port.cpp | 27 ++++----- src/core/hle/kernel/k_server_port.h | 10 ++-- src/core/hle/kernel/k_server_session.cpp | 18 ++---- src/core/hle/kernel/k_server_session.h | 12 ++-- src/core/hle/kernel/k_session.cpp | 54 ++++++++--------- src/core/hle/kernel/k_session.h | 39 ++++++------ src/core/hle/kernel/k_shared_memory.cpp | 12 ++-- src/core/hle/kernel/k_shared_memory.h | 2 +- src/core/hle/kernel/k_thread.h | 1 + src/core/hle/kernel/kernel.cpp | 11 ++-- src/core/hle/kernel/svc/svc_port.cpp | 2 +- src/core/hle/kernel/svc/svc_session.cpp | 4 +- src/core/hle/service/ipc_helpers.h | 2 +- src/core/hle/service/server_manager.cpp | 2 +- src/core/hle/service/sm/sm.cpp | 4 +- src/core/hle/service/sm/sm_controller.cpp | 2 +- src/yuzu/debugger/wait_tree.cpp | 5 +- 28 files changed, 196 insertions(+), 226 deletions(-) diff --git a/src/core/hle/kernel/k_affinity_mask.h b/src/core/hle/kernel/k_affinity_mask.h index b58716e90..07a5a822c 100644 --- a/src/core/hle/kernel/k_affinity_mask.h +++ b/src/core/hle/kernel/k_affinity_mask.h @@ -13,40 +13,40 @@ class KAffinityMask { public: constexpr KAffinityMask() = default; - [[nodiscard]] constexpr u64 GetAffinityMask() const { - return this->mask; + constexpr u64 GetAffinityMask() const { + return m_mask; } constexpr void SetAffinityMask(u64 new_mask) { ASSERT((new_mask & ~AllowedAffinityMask) == 0); - this->mask = new_mask; + m_mask = new_mask; } - [[nodiscard]] constexpr bool GetAffinity(s32 core) const { - return (this->mask & GetCoreBit(core)) != 0; + constexpr bool GetAffinity(s32 core) const { + return (m_mask & GetCoreBit(core)) != 0; } constexpr void SetAffinity(s32 core, bool set) { if (set) { - this->mask |= GetCoreBit(core); + m_mask |= GetCoreBit(core); } else { - this->mask &= ~GetCoreBit(core); + m_mask &= ~GetCoreBit(core); } } constexpr void SetAll() { - this->mask = AllowedAffinityMask; + m_mask = AllowedAffinityMask; } private: - [[nodiscard]] static constexpr u64 GetCoreBit(s32 core) { + static constexpr u64 GetCoreBit(s32 core) { ASSERT(0 <= core && core < static_cast(Core::Hardware::NUM_CPU_CORES)); return (1ULL << core); } static constexpr u64 AllowedAffinityMask = (1ULL << Core::Hardware::NUM_CPU_CORES) - 1; - u64 mask{}; + u64 m_mask{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_auto_object.h b/src/core/hle/kernel/k_auto_object.h index e8118c2b8..2443ab2a5 100644 --- a/src/core/hle/kernel/k_auto_object.h +++ b/src/core/hle/kernel/k_auto_object.h @@ -164,17 +164,12 @@ public: } } - const std::string& GetName() const { - return name; - } - private: void RegisterWithKernel(); void UnregisterWithKernel(); protected: KernelCore& kernel; - std::string name; private: std::atomic m_ref_count{}; @@ -208,10 +203,6 @@ public: return reinterpret_cast(this); } - virtual const std::string& GetName() const { - return name; - } - private: friend class KAutoObjectWithListContainer; }; diff --git a/src/core/hle/kernel/k_capabilities.cpp b/src/core/hle/kernel/k_capabilities.cpp index 2907cc6e3..90e4e8fb0 100644 --- a/src/core/hle/kernel/k_capabilities.cpp +++ b/src/core/hle/kernel/k_capabilities.cpp @@ -11,7 +11,7 @@ namespace Kernel { -Result KCapabilities::InitializeForKIP(std::span kern_caps, KPageTable* page_table) { +Result KCapabilities::InitializeForKip(std::span kern_caps, KPageTable* page_table) { // We're initializing an initial process. m_svc_access_flags.reset(); m_irq_access_flags.reset(); diff --git a/src/core/hle/kernel/k_capabilities.h b/src/core/hle/kernel/k_capabilities.h index cd96f8d23..de766c811 100644 --- a/src/core/hle/kernel/k_capabilities.h +++ b/src/core/hle/kernel/k_capabilities.h @@ -22,7 +22,7 @@ class KCapabilities { public: constexpr explicit KCapabilities() = default; - Result InitializeForKIP(std::span kern_caps, KPageTable* page_table); + Result InitializeForKip(std::span kern_caps, KPageTable* page_table); Result InitializeForUser(std::span user_caps, KPageTable* page_table); static Result CheckCapabilities(KernelCore& kernel, std::span user_caps); diff --git a/src/core/hle/kernel/k_client_port.cpp b/src/core/hle/kernel/k_client_port.cpp index 700ae71e3..7a3d650fd 100644 --- a/src/core/hle/kernel/k_client_port.cpp +++ b/src/core/hle/kernel/k_client_port.cpp @@ -14,23 +14,18 @@ namespace Kernel { KClientPort::KClientPort(KernelCore& kernel_) : KSynchronizationObject{kernel_} {} KClientPort::~KClientPort() = default; -void KClientPort::Initialize(KPort* parent_port_, s32 max_sessions_, std::string&& name_) { +void KClientPort::Initialize(KPort* parent, s32 max_sessions) { // Set member variables. - num_sessions = 0; - peak_sessions = 0; - parent = parent_port_; - max_sessions = max_sessions_; - name = std::move(name_); + m_num_sessions = 0; + m_peak_sessions = 0; + m_parent = parent; + m_max_sessions = max_sessions; } void KClientPort::OnSessionFinalized() { KScopedSchedulerLock sl{kernel}; - // This might happen if a session was improperly used with this port. - ASSERT_MSG(num_sessions > 0, "num_sessions is invalid"); - - const auto prev = num_sessions--; - if (prev == max_sessions) { + if (const auto prev = m_num_sessions--; prev == m_max_sessions) { this->NotifyAvailable(); } } @@ -47,81 +42,81 @@ bool KClientPort::IsServerClosed() const { void KClientPort::Destroy() { // Note with our parent that we're closed. - parent->OnClientClosed(); + m_parent->OnClientClosed(); // Close our reference to our parent. - parent->Close(); + m_parent->Close(); } bool KClientPort::IsSignaled() const { - return num_sessions < max_sessions; + return m_num_sessions.load() < m_max_sessions; } Result KClientPort::CreateSession(KClientSession** out) { + // Declare the session we're going to allocate. + KSession* session{}; + // Reserve a new session from the resource limit. //! FIXME: we are reserving this from the wrong resource limit! KScopedResourceReservation session_reservation(kernel.ApplicationProcess()->GetResourceLimit(), LimitableResource::SessionCountMax); R_UNLESS(session_reservation.Succeeded(), ResultLimitReached); + // Allocate a session normally. + session = KSession::Create(kernel); + + // Check that we successfully created a session. + R_UNLESS(session != nullptr, ResultOutOfResource); + // Update the session counts. { + ON_RESULT_FAILURE { + session->Close(); + }; + // Atomically increment the number of sessions. s32 new_sessions{}; { - const auto max = max_sessions; - auto cur_sessions = num_sessions.load(std::memory_order_acquire); + const auto max = m_max_sessions; + auto cur_sessions = m_num_sessions.load(std::memory_order_acquire); do { R_UNLESS(cur_sessions < max, ResultOutOfSessions); new_sessions = cur_sessions + 1; - } while (!num_sessions.compare_exchange_weak(cur_sessions, new_sessions, - std::memory_order_relaxed)); + } while (!m_num_sessions.compare_exchange_weak(cur_sessions, new_sessions, + std::memory_order_relaxed)); } // Atomically update the peak session tracking. { - auto peak = peak_sessions.load(std::memory_order_acquire); + auto peak = m_peak_sessions.load(std::memory_order_acquire); do { if (peak >= new_sessions) { break; } - } while (!peak_sessions.compare_exchange_weak(peak, new_sessions, - std::memory_order_relaxed)); + } while (!m_peak_sessions.compare_exchange_weak(peak, new_sessions, + std::memory_order_relaxed)); } } - // Create a new session. - KSession* session = KSession::Create(kernel); - if (session == nullptr) { - // Decrement the session count. - const auto prev = num_sessions--; - if (prev == max_sessions) { - this->NotifyAvailable(); - } - - return ResultOutOfResource; - } - // Initialize the session. - session->Initialize(this, parent->GetName()); + session->Initialize(this, m_parent->GetName()); // Commit the session reservation. session_reservation.Commit(); // Register the session. KSession::Register(kernel, session); - auto session_guard = SCOPE_GUARD({ + ON_RESULT_FAILURE { session->GetClientSession().Close(); session->GetServerSession().Close(); - }); + }; // Enqueue the session with our parent. - R_TRY(parent->EnqueueSession(std::addressof(session->GetServerSession()))); + R_TRY(m_parent->EnqueueSession(std::addressof(session->GetServerSession()))); // We succeeded, so set the output. - session_guard.Cancel(); *out = std::addressof(session->GetClientSession()); - return ResultSuccess; + R_SUCCEED(); } } // namespace Kernel diff --git a/src/core/hle/kernel/k_client_port.h b/src/core/hle/kernel/k_client_port.h index a757cf9cd..23db06ddf 100644 --- a/src/core/hle/kernel/k_client_port.h +++ b/src/core/hle/kernel/k_client_port.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include "common/common_types.h" #include "core/hle/kernel/k_synchronization_object.h" @@ -20,28 +19,28 @@ class KClientPort final : public KSynchronizationObject { KERNEL_AUTOOBJECT_TRAITS(KClientPort, KSynchronizationObject); public: - explicit KClientPort(KernelCore& kernel_); + explicit KClientPort(KernelCore& kernel); ~KClientPort() override; - void Initialize(KPort* parent_, s32 max_sessions_, std::string&& name_); + void Initialize(KPort* parent, s32 max_sessions); void OnSessionFinalized(); void OnServerClosed(); const KPort* GetParent() const { - return parent; + return m_parent; } KPort* GetParent() { - return parent; + return m_parent; } s32 GetNumSessions() const { - return num_sessions; + return m_num_sessions; } s32 GetPeakSessions() const { - return peak_sessions; + return m_peak_sessions; } s32 GetMaxSessions() const { - return max_sessions; + return m_max_sessions; } bool IsLight() const; @@ -54,10 +53,10 @@ public: Result CreateSession(KClientSession** out); private: - std::atomic num_sessions{}; - std::atomic peak_sessions{}; - s32 max_sessions{}; - KPort* parent{}; + std::atomic m_num_sessions{}; + std::atomic m_peak_sessions{}; + s32 m_max_sessions{}; + KPort* m_parent{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_client_session.cpp b/src/core/hle/kernel/k_client_session.cpp index da0c9ac8c..c9196d04b 100644 --- a/src/core/hle/kernel/k_client_session.cpp +++ b/src/core/hle/kernel/k_client_session.cpp @@ -17,8 +17,8 @@ KClientSession::KClientSession(KernelCore& kernel_) KClientSession::~KClientSession() = default; void KClientSession::Destroy() { - parent->OnClientClosed(); - parent->Close(); + m_parent->OnClientClosed(); + m_parent->Close(); } void KClientSession::OnServerClosed() {} @@ -33,7 +33,7 @@ Result KClientSession::SendSyncRequest() { request->Initialize(nullptr, GetCurrentThread(kernel).GetTLSAddress(), MessageBufferSize); // Send the request. - return parent->GetServerSession().OnRequest(request); + R_RETURN(m_parent->GetServerSession().OnRequest(request)); } } // namespace Kernel diff --git a/src/core/hle/kernel/k_client_session.h b/src/core/hle/kernel/k_client_session.h index b4a19c546..ecde2549c 100644 --- a/src/core/hle/kernel/k_client_session.h +++ b/src/core/hle/kernel/k_client_session.h @@ -33,17 +33,16 @@ public: explicit KClientSession(KernelCore& kernel_); ~KClientSession() override; - void Initialize(KSession* parent_session_, std::string&& name_) { + void Initialize(KSession* parent) { // Set member variables. - parent = parent_session_; - name = std::move(name_); + m_parent = parent; } void Destroy() override; - static void PostDestroy([[maybe_unused]] uintptr_t arg) {} + static void PostDestroy(uintptr_t arg) {} KSession* GetParent() const { - return parent; + return m_parent; } Result SendSyncRequest(); @@ -51,7 +50,7 @@ public: void OnServerClosed(); private: - KSession* parent{}; + KSession* m_parent{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_port.cpp b/src/core/hle/kernel/k_port.cpp index 0a45ffd57..f73bc34d4 100644 --- a/src/core/hle/kernel/k_port.cpp +++ b/src/core/hle/kernel/k_port.cpp @@ -8,55 +8,54 @@ namespace Kernel { KPort::KPort(KernelCore& kernel_) - : KAutoObjectWithSlabHeapAndContainer{kernel_}, server{kernel_}, client{kernel_} {} + : KAutoObjectWithSlabHeapAndContainer{kernel_}, m_server{kernel_}, m_client{kernel_} {} KPort::~KPort() = default; -void KPort::Initialize(s32 max_sessions_, bool is_light_, const std::string& name_) { +void KPort::Initialize(s32 max_sessions, bool is_light, uintptr_t name) { // Open a new reference count to the initialized port. - Open(); + this->Open(); // Create and initialize our server/client pair. - KAutoObject::Create(std::addressof(server)); - KAutoObject::Create(std::addressof(client)); - server.Initialize(this, name_ + ":Server"); - client.Initialize(this, max_sessions_, name_ + ":Client"); + KAutoObject::Create(std::addressof(m_server)); + KAutoObject::Create(std::addressof(m_client)); + m_server.Initialize(this); + m_client.Initialize(this, max_sessions); // Set our member variables. - is_light = is_light_; - name = name_; - state = State::Normal; + m_is_light = is_light; + m_name = name; + m_state = State::Normal; } void KPort::OnClientClosed() { KScopedSchedulerLock sl{kernel}; - if (state == State::Normal) { - state = State::ClientClosed; + if (m_state == State::Normal) { + m_state = State::ClientClosed; } } void KPort::OnServerClosed() { KScopedSchedulerLock sl{kernel}; - if (state == State::Normal) { - state = State::ServerClosed; + if (m_state == State::Normal) { + m_state = State::ServerClosed; } } bool KPort::IsServerClosed() const { KScopedSchedulerLock sl{kernel}; - return state == State::ServerClosed; + return m_state == State::ServerClosed; } Result KPort::EnqueueSession(KServerSession* session) { KScopedSchedulerLock sl{kernel}; - R_UNLESS(state == State::Normal, ResultPortClosed); + R_UNLESS(m_state == State::Normal, ResultPortClosed); - server.EnqueueSession(session); - - return ResultSuccess; + m_server.EnqueueSession(session); + R_SUCCEED(); } } // namespace Kernel diff --git a/src/core/hle/kernel/k_port.h b/src/core/hle/kernel/k_port.h index 0cfc16dab..f2a08547c 100644 --- a/src/core/hle/kernel/k_port.h +++ b/src/core/hle/kernel/k_port.h @@ -22,14 +22,17 @@ public: explicit KPort(KernelCore& kernel_); ~KPort() override; - static void PostDestroy([[maybe_unused]] uintptr_t arg) {} + static void PostDestroy(uintptr_t arg) {} - void Initialize(s32 max_sessions_, bool is_light_, const std::string& name_); + void Initialize(s32 max_sessions, bool is_light, uintptr_t name); void OnClientClosed(); void OnServerClosed(); + uintptr_t GetName() const { + return m_name; + } bool IsLight() const { - return is_light; + return m_is_light; } bool IsServerClosed() const; @@ -37,16 +40,16 @@ public: Result EnqueueSession(KServerSession* session); KClientPort& GetClientPort() { - return client; + return m_client; } KServerPort& GetServerPort() { - return server; + return m_server; } const KClientPort& GetClientPort() const { - return client; + return m_client; } const KServerPort& GetServerPort() const { - return server; + return m_server; } private: @@ -57,10 +60,11 @@ private: ServerClosed = 3, }; - KServerPort server; - KClientPort client; - State state{State::Invalid}; - bool is_light{}; + KServerPort m_server; + KClientPort m_client; + uintptr_t m_name; + State m_state{State::Invalid}; + bool m_is_light{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.h index bd9b9f876..8d65be17a 100644 --- a/src/core/hle/kernel/k_process.h +++ b/src/core/hle/kernel/k_process.h @@ -395,6 +395,10 @@ public: return watchpoints; } + const std::string& GetName() { + return name; + } + private: void PinThread(s32 core_id, KThread* thread) { ASSERT(0 <= core_id && core_id < static_cast(Core::Hardware::NUM_CPU_CORES)); @@ -499,6 +503,8 @@ private: size_t memory_release_hint{}; + std::string name{}; + bool is_signaled{}; bool is_suspended{}; bool is_immortal{}; diff --git a/src/core/hle/kernel/k_server_port.cpp b/src/core/hle/kernel/k_server_port.cpp index 16968ba97..dc70ee848 100644 --- a/src/core/hle/kernel/k_server_port.cpp +++ b/src/core/hle/kernel/k_server_port.cpp @@ -15,10 +15,9 @@ namespace Kernel { KServerPort::KServerPort(KernelCore& kernel_) : KSynchronizationObject{kernel_} {} KServerPort::~KServerPort() = default; -void KServerPort::Initialize(KPort* parent_port_, std::string&& name_) { +void KServerPort::Initialize(KPort* parent) { // Set member variables. - parent = parent_port_; - name = std::move(name_); + m_parent = parent; } bool KServerPort::IsLight() const { @@ -37,9 +36,9 @@ void KServerPort::CleanupSessions() { KServerSession* session = nullptr; { KScopedSchedulerLock sl{kernel}; - if (!session_list.empty()) { - session = std::addressof(session_list.front()); - session_list.pop_front(); + if (!m_session_list.empty()) { + session = std::addressof(m_session_list.front()); + m_session_list.pop_front(); } } @@ -54,13 +53,13 @@ void KServerPort::CleanupSessions() { void KServerPort::Destroy() { // Note with our parent that we're closed. - parent->OnServerClosed(); + m_parent->OnServerClosed(); // Perform necessary cleanup of our session lists. this->CleanupSessions(); // Close our reference to our parent. - parent->Close(); + m_parent->Close(); } bool KServerPort::IsSignaled() const { @@ -68,7 +67,7 @@ bool KServerPort::IsSignaled() const { UNIMPLEMENTED(); return false; } else { - return !session_list.empty(); + return !m_session_list.empty(); } } @@ -78,8 +77,8 @@ void KServerPort::EnqueueSession(KServerSession* session) { KScopedSchedulerLock sl{kernel}; // Add the session to our queue. - session_list.push_back(*session); - if (session_list.size() == 1) { + m_session_list.push_back(*session); + if (m_session_list.size() == 1) { this->NotifyAvailable(); } } @@ -90,12 +89,12 @@ KServerSession* KServerPort::AcceptSession() { KScopedSchedulerLock sl{kernel}; // Return the first session in the list. - if (session_list.empty()) { + if (m_session_list.empty()) { return nullptr; } - KServerSession* session = std::addressof(session_list.front()); - session_list.pop_front(); + KServerSession* session = std::addressof(m_session_list.front()); + m_session_list.pop_front(); return session; } diff --git a/src/core/hle/kernel/k_server_port.h b/src/core/hle/kernel/k_server_port.h index 5fc7ee683..964767156 100644 --- a/src/core/hle/kernel/k_server_port.h +++ b/src/core/hle/kernel/k_server_port.h @@ -25,14 +25,14 @@ public: explicit KServerPort(KernelCore& kernel_); ~KServerPort() override; - void Initialize(KPort* parent_port_, std::string&& name_); + void Initialize(KPort* parent); - void EnqueueSession(KServerSession* pending_session); + void EnqueueSession(KServerSession* session); KServerSession* AcceptSession(); const KPort* GetParent() const { - return parent; + return m_parent; } bool IsLight() const; @@ -46,8 +46,8 @@ private: void CleanupSessions(); - SessionList session_list; - KPort* parent{}; + SessionList m_session_list{}; + KPort* m_parent{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_server_session.cpp b/src/core/hle/kernel/k_server_session.cpp index 01591af5b..6831243b5 100644 --- a/src/core/hle/kernel/k_server_session.cpp +++ b/src/core/hle/kernel/k_server_session.cpp @@ -33,18 +33,12 @@ KServerSession::KServerSession(KernelCore& kernel_) KServerSession::~KServerSession() = default; -void KServerSession::Initialize(KSession* parent_session_, std::string&& name_) { - // Set member variables. - parent = parent_session_; - name = std::move(name_); -} - void KServerSession::Destroy() { - parent->OnServerClosed(); + m_parent->OnServerClosed(); this->CleanupRequests(); - parent->Close(); + m_parent->Close(); } void KServerSession::OnClientClosed() { @@ -144,7 +138,7 @@ bool KServerSession::IsSignaled() const { ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); // If the client is closed, we're always signaled. - if (parent->IsClientClosed()) { + if (m_parent->IsClientClosed()) { return true; } @@ -161,7 +155,7 @@ Result KServerSession::OnRequest(KSessionRequest* request) { KScopedSchedulerLock sl{kernel}; // Ensure that we can handle new requests. - R_UNLESS(!parent->IsServerClosed(), ResultSessionClosed); + R_UNLESS(!m_parent->IsServerClosed(), ResultSessionClosed); // Check that we're not terminating. R_UNLESS(!GetCurrentThread(kernel).IsTerminationRequested(), ResultTerminationRequested); @@ -219,7 +213,7 @@ Result KServerSession::SendReply(bool is_hle) { KEvent* event = request->GetEvent(); // Check whether we're closed. - const bool closed = (client_thread == nullptr || parent->IsClientClosed()); + const bool closed = (client_thread == nullptr || m_parent->IsClientClosed()); Result result = ResultSuccess; if (!closed) { @@ -294,7 +288,7 @@ Result KServerSession::ReceiveRequest(std::shared_ptrIsClientClosed(), ResultSessionClosed); + R_UNLESS(!m_parent->IsClientClosed(), ResultSessionClosed); // Ensure we aren't already servicing a request. R_UNLESS(m_current_request == nullptr, ResultNotFound); diff --git a/src/core/hle/kernel/k_server_session.h b/src/core/hle/kernel/k_server_session.h index 33f380352..e340e4dd8 100644 --- a/src/core/hle/kernel/k_server_session.h +++ b/src/core/hle/kernel/k_server_session.h @@ -38,14 +38,12 @@ public: void Destroy() override; - void Initialize(KSession* parent_session_, std::string&& name_); - - KSession* GetParent() { - return parent; + void Initialize(KSession* p) { + m_parent = p; } const KSession* GetParent() const { - return parent; + return m_parent; } bool IsSignaled() const override; @@ -66,10 +64,10 @@ private: void CleanupRequests(); /// KSession that owns this KServerSession - KSession* parent{}; + KSession* m_parent{}; /// List of threads which are pending a reply. - boost::intrusive::list m_request_list; + boost::intrusive::list m_request_list{}; KSessionRequest* m_current_request{}; KLightLock m_lock; diff --git a/src/core/hle/kernel/k_session.cpp b/src/core/hle/kernel/k_session.cpp index 7e677c028..771ad68bf 100644 --- a/src/core/hle/kernel/k_session.cpp +++ b/src/core/hle/kernel/k_session.cpp @@ -10,68 +10,62 @@ namespace Kernel { KSession::KSession(KernelCore& kernel_) - : KAutoObjectWithSlabHeapAndContainer{kernel_}, server{kernel_}, client{kernel_} {} + : KAutoObjectWithSlabHeapAndContainer{kernel_}, m_server{kernel_}, m_client{kernel_} {} KSession::~KSession() = default; -void KSession::Initialize(KClientPort* port_, const std::string& name_) { +void KSession::Initialize(KClientPort* client_port, uintptr_t name) { // Increment reference count. // Because reference count is one on creation, this will result // in a reference count of two. Thus, when both server and client are closed // this object will be destroyed. - Open(); + this->Open(); // Create our sub sessions. - KAutoObject::Create(std::addressof(server)); - KAutoObject::Create(std::addressof(client)); + KAutoObject::Create(std::addressof(m_server)); + KAutoObject::Create(std::addressof(m_client)); // Initialize our sub sessions. - server.Initialize(this, name_ + ":Server"); - client.Initialize(this, name_ + ":Client"); + m_server.Initialize(this); + m_client.Initialize(this); // Set state and name. - SetState(State::Normal); - name = name_; + this->SetState(State::Normal); + m_name = name; // Set our owner process. //! FIXME: this is the wrong process! - process = kernel.ApplicationProcess(); - process->Open(); + m_process = kernel.ApplicationProcess(); + m_process->Open(); // Set our port. - port = port_; - if (port != nullptr) { - port->Open(); + m_port = client_port; + if (m_port != nullptr) { + m_port->Open(); } // Mark initialized. - initialized = true; + m_initialized = true; } void KSession::Finalize() { - if (port == nullptr) { - return; + if (m_port != nullptr) { + m_port->OnSessionFinalized(); + m_port->Close(); } - - port->OnSessionFinalized(); - port->Close(); } void KSession::OnServerClosed() { - if (GetState() != State::Normal) { - return; + if (this->GetState() == State::Normal) { + this->SetState(State::ServerClosed); + m_client.OnServerClosed(); } - - SetState(State::ServerClosed); - client.OnServerClosed(); } void KSession::OnClientClosed() { - if (GetState() != State::Normal) { - return; + if (this->GetState() == State::Normal) { + SetState(State::ClientClosed); + m_server.OnClientClosed(); } - - SetState(State::ClientClosed); - server.OnClientClosed(); } void KSession::PostDestroy(uintptr_t arg) { diff --git a/src/core/hle/kernel/k_session.h b/src/core/hle/kernel/k_session.h index 93e5e6f71..ab553a04c 100644 --- a/src/core/hle/kernel/k_session.h +++ b/src/core/hle/kernel/k_session.h @@ -21,16 +21,15 @@ public: explicit KSession(KernelCore& kernel_); ~KSession() override; - void Initialize(KClientPort* port_, const std::string& name_); - + void Initialize(KClientPort* port, uintptr_t name); void Finalize() override; bool IsInitialized() const override { - return initialized; + return m_initialized; } uintptr_t GetPostDestroyArgument() const override { - return reinterpret_cast(process); + return reinterpret_cast(m_process); } static void PostDestroy(uintptr_t arg); @@ -48,27 +47,23 @@ public: } KClientSession& GetClientSession() { - return client; + return m_client; } KServerSession& GetServerSession() { - return server; + return m_server; } const KClientSession& GetClientSession() const { - return client; + return m_client; } const KServerSession& GetServerSession() const { - return server; + return m_server; } const KClientPort* GetParent() const { - return port; - } - - KClientPort* GetParent() { - return port; + return m_port; } private: @@ -80,20 +75,20 @@ private: }; void SetState(State state) { - atomic_state = static_cast(state); + m_atomic_state = static_cast(state); } State GetState() const { - return static_cast(atomic_state.load(std::memory_order_relaxed)); + return static_cast(m_atomic_state.load()); } - KServerSession server; - KClientSession client; - std::atomic> atomic_state{ - static_cast>(State::Invalid)}; - KClientPort* port{}; - KProcess* process{}; - bool initialized{}; + KServerSession m_server; + KClientSession m_client; + KClientPort* m_port{}; + uintptr_t m_name{}; + KProcess* m_process{}; + std::atomic m_atomic_state{static_cast(State::Invalid)}; + bool m_initialized{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_shared_memory.cpp b/src/core/hle/kernel/k_shared_memory.cpp index df505edfe..42cb7ac77 100644 --- a/src/core/hle/kernel/k_shared_memory.cpp +++ b/src/core/hle/kernel/k_shared_memory.cpp @@ -17,15 +17,13 @@ KSharedMemory::~KSharedMemory() = default; Result KSharedMemory::Initialize(Core::DeviceMemory& device_memory_, KProcess* owner_process_, Svc::MemoryPermission owner_permission_, - Svc::MemoryPermission user_permission_, std::size_t size_, - std::string name_) { + Svc::MemoryPermission user_permission_, std::size_t size_) { // Set members. owner_process = owner_process_; device_memory = &device_memory_; owner_permission = owner_permission_; user_permission = user_permission_; size = Common::AlignUp(size_, PageSize); - name = std::move(name_); const size_t num_pages = Common::DivideUp(size, PageSize); @@ -64,7 +62,7 @@ Result KSharedMemory::Initialize(Core::DeviceMemory& device_memory_, KProcess* o std::memset(device_memory_.GetPointer(block.GetAddress()), 0, block.GetSize()); } - return ResultSuccess; + R_SUCCEED(); } void KSharedMemory::Finalize() { @@ -94,15 +92,15 @@ Result KSharedMemory::Map(KProcess& target_process, VAddr address, std::size_t m R_UNLESS(map_perm == test_perm, ResultInvalidNewMemoryPermission); } - return target_process.PageTable().MapPageGroup(address, *page_group, KMemoryState::Shared, - ConvertToKMemoryPermission(map_perm)); + R_RETURN(target_process.PageTable().MapPageGroup(address, *page_group, KMemoryState::Shared, + ConvertToKMemoryPermission(map_perm))); } Result KSharedMemory::Unmap(KProcess& target_process, VAddr address, std::size_t unmap_size) { // Validate the size. R_UNLESS(size == unmap_size, ResultInvalidSize); - return target_process.PageTable().UnmapPageGroup(address, *page_group, KMemoryState::Shared); + R_RETURN(target_process.PageTable().UnmapPageGroup(address, *page_group, KMemoryState::Shared)); } } // namespace Kernel diff --git a/src/core/hle/kernel/k_shared_memory.h b/src/core/hle/kernel/k_shared_memory.h index 8b29f0b4a..bfd01b619 100644 --- a/src/core/hle/kernel/k_shared_memory.h +++ b/src/core/hle/kernel/k_shared_memory.h @@ -28,7 +28,7 @@ public: Result Initialize(Core::DeviceMemory& device_memory_, KProcess* owner_process_, Svc::MemoryPermission owner_permission_, - Svc::MemoryPermission user_permission_, std::size_t size_, std::string name_); + Svc::MemoryPermission user_permission_, std::size_t size_); /** * Maps a shared memory block to an address in the target process' address space diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h index 9423f08ca..f4cb861a9 100644 --- a/src/core/hle/kernel/k_thread.h +++ b/src/core/hle/kernel/k_thread.h @@ -926,6 +926,7 @@ private: ThreadWaitReasonForDebugging wait_reason_for_debugging{}; uintptr_t argument{}; VAddr stack_top{}; + std::string name{}; public: using ConditionVariableThreadTreeType = ConditionVariableThreadTree; diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index ef7057ff7..59f832a3d 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -742,16 +742,15 @@ struct KernelCore::Impl { hidbus_shared_mem = KSharedMemory::Create(system.Kernel()); hid_shared_mem->Initialize(system.DeviceMemory(), nullptr, Svc::MemoryPermission::None, - Svc::MemoryPermission::Read, hid_size, "HID:SharedMemory"); + Svc::MemoryPermission::Read, hid_size); font_shared_mem->Initialize(system.DeviceMemory(), nullptr, Svc::MemoryPermission::None, - Svc::MemoryPermission::Read, font_size, "Font:SharedMemory"); + Svc::MemoryPermission::Read, font_size); irs_shared_mem->Initialize(system.DeviceMemory(), nullptr, Svc::MemoryPermission::None, - Svc::MemoryPermission::Read, irs_size, "IRS:SharedMemory"); + Svc::MemoryPermission::Read, irs_size); time_shared_mem->Initialize(system.DeviceMemory(), nullptr, Svc::MemoryPermission::None, - Svc::MemoryPermission::Read, time_size, "Time:SharedMemory"); + Svc::MemoryPermission::Read, time_size); hidbus_shared_mem->Initialize(system.DeviceMemory(), nullptr, Svc::MemoryPermission::None, - Svc::MemoryPermission::Read, hidbus_size, - "HidBus:SharedMemory"); + Svc::MemoryPermission::Read, hidbus_size); } std::mutex registered_objects_lock; diff --git a/src/core/hle/kernel/svc/svc_port.cpp b/src/core/hle/kernel/svc/svc_port.cpp index 78c2a8d17..0b5556bc4 100644 --- a/src/core/hle/kernel/svc/svc_port.cpp +++ b/src/core/hle/kernel/svc/svc_port.cpp @@ -81,7 +81,7 @@ Result ManageNamedPort(Core::System& system, Handle* out_server_handle, uint64_t R_UNLESS(port != nullptr, ResultOutOfResource); // Initialize the new port. - port->Initialize(max_sessions, false, ""); + port->Initialize(max_sessions, false, 0); // Register the port. KPort::Register(system.Kernel(), port); diff --git a/src/core/hle/kernel/svc/svc_session.cpp b/src/core/hle/kernel/svc/svc_session.cpp index 6dd242dcf..90d680540 100644 --- a/src/core/hle/kernel/svc/svc_session.cpp +++ b/src/core/hle/kernel/svc/svc_session.cpp @@ -12,7 +12,7 @@ namespace Kernel::Svc { namespace { template -Result CreateSession(Core::System& system, Handle* out_server, Handle* out_client, u64 name) { +Result CreateSession(Core::System& system, Handle* out_server, Handle* out_client, uint64_t name) { auto& process = GetCurrentProcess(system.Kernel()); auto& handle_table = process.GetHandleTable(); @@ -59,7 +59,7 @@ Result CreateSession(Core::System& system, Handle* out_server, Handle* out_clien R_UNLESS(session != nullptr, ResultOutOfResource); // Initialize the session. - session->Initialize(nullptr, fmt::format("{}", name)); + session->Initialize(nullptr, name); // Commit the session reservation. session_reservation.Commit(); diff --git a/src/core/hle/service/ipc_helpers.h b/src/core/hle/service/ipc_helpers.h index 8703b57ca..e4cb4e1f2 100644 --- a/src/core/hle/service/ipc_helpers.h +++ b/src/core/hle/service/ipc_helpers.h @@ -155,7 +155,7 @@ public: Kernel::LimitableResource::SessionCountMax, 1); auto* session = Kernel::KSession::Create(kernel); - session->Initialize(nullptr, iface->GetServiceName()); + session->Initialize(nullptr, 0); auto next_manager = std::make_shared( kernel, manager->GetServerManager()); diff --git a/src/core/hle/service/server_manager.cpp b/src/core/hle/service/server_manager.cpp index bd04cd023..6b4a1291e 100644 --- a/src/core/hle/service/server_manager.cpp +++ b/src/core/hle/service/server_manager.cpp @@ -124,7 +124,7 @@ Result ServerManager::ManageNamedPort(const std::string& service_name, // Create a new port. auto* port = Kernel::KPort::Create(m_system.Kernel()); - port->Initialize(max_sessions, false, service_name); + port->Initialize(max_sessions, false, 0); // Register the port. Kernel::KPort::Register(m_system.Kernel(), port); diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index b4046d3ce..c45be5726 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -62,7 +62,7 @@ Result ServiceManager::RegisterService(std::string name, u32 max_sessions, } auto* port = Kernel::KPort::Create(kernel); - port->Initialize(ServerSessionCountMax, false, name); + port->Initialize(ServerSessionCountMax, false, 0); service_ports.emplace(name, port); registered_services.emplace(name, handler); @@ -211,7 +211,7 @@ void SM::RegisterService(HLERequestContext& ctx) { } auto* port = Kernel::KPort::Create(kernel); - port->Initialize(ServerSessionCountMax, is_light, name); + port->Initialize(ServerSessionCountMax, is_light, 0); SCOPE_EXIT({ port->GetClientPort().Close(); }); IPC::ResponseBuilder rb{ctx, 2, 0, 1, IPC::ResponseBuilder::Flags::AlwaysMoveHandles}; diff --git a/src/core/hle/service/sm/sm_controller.cpp b/src/core/hle/service/sm/sm_controller.cpp index 0111c8d7f..419c1df2b 100644 --- a/src/core/hle/service/sm/sm_controller.cpp +++ b/src/core/hle/service/sm/sm_controller.cpp @@ -44,7 +44,7 @@ void Controller::CloneCurrentObject(HLERequestContext& ctx) { ASSERT(session != nullptr); // Initialize the session. - session->Initialize(nullptr, ""); + session->Initialize(nullptr, 0); // Commit the session reservation. session_reservation.Commit(); diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp index 7f7c5fc42..219912128 100644 --- a/src/yuzu/debugger/wait_tree.cpp +++ b/src/yuzu/debugger/wait_tree.cpp @@ -182,10 +182,9 @@ bool WaitTreeExpandableItem::IsExpandable() const { } QString WaitTreeSynchronizationObject::GetText() const { - return tr("[%1] %2 %3") + return tr("[%1] %2") .arg(object.GetId()) - .arg(QString::fromStdString(object.GetTypeObj().GetName()), - QString::fromStdString(object.GetName())); + .arg(QString::fromStdString(object.GetTypeObj().GetName())); } std::unique_ptr WaitTreeSynchronizationObject::make( From fdf90c6d75c68c4ff1bebbc0ece30d2a507d007d Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 6 Mar 2023 20:53:58 -0500 Subject: [PATCH 0166/1181] kernel: convert KConditionVariable, KLightConditionVariable, KLightLock --- src/core/hle/kernel/k_code_memory.cpp | 10 +-- src/core/hle/kernel/k_condition_variable.cpp | 65 ++++++++++--------- src/core/hle/kernel/k_condition_variable.h | 16 ++--- .../hle/kernel/k_light_condition_variable.cpp | 16 ++--- .../hle/kernel/k_light_condition_variable.h | 6 +- src/core/hle/kernel/k_light_lock.cpp | 31 ++++----- src/core/hle/kernel/k_light_lock.h | 8 +-- 7 files changed, 77 insertions(+), 75 deletions(-) diff --git a/src/core/hle/kernel/k_code_memory.cpp b/src/core/hle/kernel/k_code_memory.cpp index 6c44a9e99..4167ade2b 100644 --- a/src/core/hle/kernel/k_code_memory.cpp +++ b/src/core/hle/kernel/k_code_memory.cpp @@ -45,7 +45,7 @@ Result KCodeMemory::Initialize(Core::DeviceMemory& device_memory, VAddr addr, si m_is_mapped = false; // We succeeded. - return ResultSuccess; + R_SUCCEED(); } void KCodeMemory::Finalize() { @@ -80,7 +80,7 @@ Result KCodeMemory::Map(VAddr address, size_t size) { // Mark ourselves as mapped. m_is_mapped = true; - return ResultSuccess; + R_SUCCEED(); } Result KCodeMemory::Unmap(VAddr address, size_t size) { @@ -97,7 +97,7 @@ Result KCodeMemory::Unmap(VAddr address, size_t size) { // Mark ourselves as unmapped. m_is_mapped = false; - return ResultSuccess; + R_SUCCEED(); } Result KCodeMemory::MapToOwner(VAddr address, size_t size, Svc::MemoryPermission perm) { @@ -131,7 +131,7 @@ Result KCodeMemory::MapToOwner(VAddr address, size_t size, Svc::MemoryPermission // Mark ourselves as mapped. m_is_owner_mapped = true; - return ResultSuccess; + R_SUCCEED(); } Result KCodeMemory::UnmapFromOwner(VAddr address, size_t size) { @@ -147,7 +147,7 @@ Result KCodeMemory::UnmapFromOwner(VAddr address, size_t size) { // Mark ourselves as unmapped. m_is_owner_mapped = false; - return ResultSuccess; + R_SUCCEED(); } } // namespace Kernel diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cpp index 458f4c94e..b75957688 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/core/hle/kernel/k_condition_variable.cpp @@ -98,17 +98,17 @@ public: } // namespace -KConditionVariable::KConditionVariable(Core::System& system_) - : system{system_}, kernel{system.Kernel()} {} +KConditionVariable::KConditionVariable(Core::System& system) + : m_system{system}, m_kernel{system.Kernel()} {} KConditionVariable::~KConditionVariable() = default; Result KConditionVariable::SignalToAddress(VAddr addr) { - KThread* owner_thread = GetCurrentThreadPointer(kernel); + KThread* owner_thread = GetCurrentThreadPointer(m_kernel); // Signal the address. { - KScopedSchedulerLock sl(kernel); + KScopedSchedulerLock sl(m_kernel); // Remove waiter thread. bool has_waiters{}; @@ -129,7 +129,7 @@ Result KConditionVariable::SignalToAddress(VAddr addr) { // Write the value to userspace. Result result{ResultSuccess}; - if (WriteToUser(system, addr, std::addressof(next_value))) [[likely]] { + if (WriteToUser(m_system, addr, std::addressof(next_value))) [[likely]] { result = ResultSuccess; } else { result = ResultInvalidCurrentMemory; @@ -145,26 +145,27 @@ Result KConditionVariable::SignalToAddress(VAddr addr) { } Result KConditionVariable::WaitForAddress(Handle handle, VAddr addr, u32 value) { - KThread* cur_thread = GetCurrentThreadPointer(kernel); - ThreadQueueImplForKConditionVariableWaitForAddress wait_queue(kernel); + KThread* cur_thread = GetCurrentThreadPointer(m_kernel); + ThreadQueueImplForKConditionVariableWaitForAddress wait_queue(m_kernel); // Wait for the address. KThread* owner_thread{}; { - KScopedSchedulerLock sl(kernel); + KScopedSchedulerLock sl(m_kernel); // Check if the thread should terminate. R_UNLESS(!cur_thread->IsTerminationRequested(), ResultTerminationRequested); // Read the tag from userspace. u32 test_tag{}; - R_UNLESS(ReadFromUser(system, std::addressof(test_tag), addr), ResultInvalidCurrentMemory); + R_UNLESS(ReadFromUser(m_system, std::addressof(test_tag), addr), + ResultInvalidCurrentMemory); // If the tag isn't the handle (with wait mask), we're done. R_SUCCEED_IF(test_tag != (handle | Svc::HandleWaitMask)); // Get the lock owner thread. - owner_thread = GetCurrentProcess(kernel) + owner_thread = GetCurrentProcess(m_kernel) .GetHandleTable() .GetObjectWithoutPseudoHandle(handle) .ReleasePointerUnsafe(); @@ -184,12 +185,12 @@ Result KConditionVariable::WaitForAddress(Handle handle, VAddr addr, u32 value) owner_thread->Close(); // Get the wait result. - return cur_thread->GetWaitResult(); + R_RETURN(cur_thread->GetWaitResult()); } void KConditionVariable::SignalImpl(KThread* thread) { // Check pre-conditions. - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Update the tag. VAddr address = thread->GetAddressKey(); @@ -204,7 +205,7 @@ void KConditionVariable::SignalImpl(KThread* thread) { // TODO(bunnei): We should call CanAccessAtomic(..) here. can_access = true; if (can_access) [[likely]] { - UpdateLockAtomic(system, std::addressof(prev_tag), address, own_tag, + UpdateLockAtomic(m_system, std::addressof(prev_tag), address, own_tag, Svc::HandleWaitMask); } } @@ -215,7 +216,7 @@ void KConditionVariable::SignalImpl(KThread* thread) { thread->EndWait(ResultSuccess); } else { // Get the previous owner. - KThread* owner_thread = GetCurrentProcess(kernel) + KThread* owner_thread = GetCurrentProcess(m_kernel) .GetHandleTable() .GetObjectWithoutPseudoHandle( static_cast(prev_tag & ~Svc::HandleWaitMask)) @@ -240,14 +241,14 @@ void KConditionVariable::Signal(u64 cv_key, s32 count) { // Perform signaling. s32 num_waiters{}; { - KScopedSchedulerLock sl(kernel); + KScopedSchedulerLock sl(m_kernel); - auto it = thread_tree.nfind_key({cv_key, -1}); - while ((it != thread_tree.end()) && (count <= 0 || num_waiters < count) && + auto it = m_tree.nfind_key({cv_key, -1}); + while ((it != m_tree.end()) && (count <= 0 || num_waiters < count) && (it->GetConditionVariableKey() == cv_key)) { KThread* target_thread = std::addressof(*it); - it = thread_tree.erase(it); + it = m_tree.erase(it); target_thread->ClearConditionVariable(); this->SignalImpl(target_thread); @@ -256,27 +257,27 @@ void KConditionVariable::Signal(u64 cv_key, s32 count) { } // If we have no waiters, clear the has waiter flag. - if (it == thread_tree.end() || it->GetConditionVariableKey() != cv_key) { + if (it == m_tree.end() || it->GetConditionVariableKey() != cv_key) { const u32 has_waiter_flag{}; - WriteToUser(system, cv_key, std::addressof(has_waiter_flag)); + WriteToUser(m_system, cv_key, std::addressof(has_waiter_flag)); } } } Result KConditionVariable::Wait(VAddr addr, u64 key, u32 value, s64 timeout) { // Prepare to wait. - KThread* cur_thread = GetCurrentThreadPointer(kernel); + KThread* cur_thread = GetCurrentThreadPointer(m_kernel); KHardwareTimer* timer{}; - ThreadQueueImplForKConditionVariableWaitConditionVariable wait_queue( - kernel, std::addressof(thread_tree)); + ThreadQueueImplForKConditionVariableWaitConditionVariable wait_queue(m_kernel, + std::addressof(m_tree)); { - KScopedSchedulerLockAndSleep slp(kernel, std::addressof(timer), cur_thread, timeout); + KScopedSchedulerLockAndSleep slp(m_kernel, std::addressof(timer), cur_thread, timeout); // Check that the thread isn't terminating. if (cur_thread->IsTerminationRequested()) { slp.CancelSleep(); - return ResultTerminationRequested; + R_THROW(ResultTerminationRequested); } // Update the value and process for the next owner. @@ -302,14 +303,14 @@ Result KConditionVariable::Wait(VAddr addr, u64 key, u32 value, s64 timeout) { // Write to the cv key. { const u32 has_waiter_flag = 1; - WriteToUser(system, key, std::addressof(has_waiter_flag)); - // TODO(bunnei): We should call DataMemoryBarrier(..) here. + WriteToUser(m_system, key, std::addressof(has_waiter_flag)); + std::atomic_thread_fence(std::memory_order_seq_cst); } // Write the value to userspace. - if (!WriteToUser(system, addr, std::addressof(next_value))) { + if (!WriteToUser(m_system, addr, std::addressof(next_value))) { slp.CancelSleep(); - return ResultInvalidCurrentMemory; + R_THROW(ResultInvalidCurrentMemory); } } @@ -317,8 +318,8 @@ Result KConditionVariable::Wait(VAddr addr, u64 key, u32 value, s64 timeout) { R_UNLESS(timeout != 0, ResultTimedOut); // Update condition variable tracking. - cur_thread->SetConditionVariable(std::addressof(thread_tree), addr, key, value); - thread_tree.insert(*cur_thread); + cur_thread->SetConditionVariable(std::addressof(m_tree), addr, key, value); + m_tree.insert(*cur_thread); // Begin waiting. wait_queue.SetHardwareTimer(timer); @@ -328,7 +329,7 @@ Result KConditionVariable::Wait(VAddr addr, u64 key, u32 value, s64 timeout) { } // Get the wait result. - return cur_thread->GetWaitResult(); + R_RETURN(cur_thread->GetWaitResult()); } } // namespace Kernel diff --git a/src/core/hle/kernel/k_condition_variable.h b/src/core/hle/kernel/k_condition_variable.h index fad4ed011..41635a894 100644 --- a/src/core/hle/kernel/k_condition_variable.h +++ b/src/core/hle/kernel/k_condition_variable.h @@ -21,24 +21,24 @@ class KConditionVariable { public: using ThreadTree = typename KThread::ConditionVariableThreadTreeType; - explicit KConditionVariable(Core::System& system_); + explicit KConditionVariable(Core::System& system); ~KConditionVariable(); // Arbitration - [[nodiscard]] Result SignalToAddress(VAddr addr); - [[nodiscard]] Result WaitForAddress(Handle handle, VAddr addr, u32 value); + Result SignalToAddress(VAddr addr); + Result WaitForAddress(Handle handle, VAddr addr, u32 value); // Condition variable void Signal(u64 cv_key, s32 count); - [[nodiscard]] Result Wait(VAddr addr, u64 key, u32 value, s64 timeout); + Result Wait(VAddr addr, u64 key, u32 value, s64 timeout); private: void SignalImpl(KThread* thread); - ThreadTree thread_tree; - - Core::System& system; - KernelCore& kernel; +private: + Core::System& m_system; + KernelCore& m_kernel; + ThreadTree m_tree{}; }; inline void BeforeUpdatePriority(const KernelCore& kernel, KConditionVariable::ThreadTree* tree, diff --git a/src/core/hle/kernel/k_light_condition_variable.cpp b/src/core/hle/kernel/k_light_condition_variable.cpp index 8fce2bc71..6d5a815aa 100644 --- a/src/core/hle/kernel/k_light_condition_variable.cpp +++ b/src/core/hle/kernel/k_light_condition_variable.cpp @@ -13,9 +13,9 @@ namespace { class ThreadQueueImplForKLightConditionVariable final : public KThreadQueue { public: - ThreadQueueImplForKLightConditionVariable(KernelCore& kernel_, KThread::WaiterList* wl, + ThreadQueueImplForKLightConditionVariable(KernelCore& kernel, KThread::WaiterList* wl, bool term) - : KThreadQueue(kernel_), m_wait_list(wl), m_allow_terminating_thread(term) {} + : KThreadQueue(kernel), m_wait_list(wl), m_allow_terminating_thread(term) {} void CancelWait(KThread* waiting_thread, Result wait_result, bool cancel_timer_task) override { // Only process waits if we're allowed to. @@ -39,15 +39,15 @@ private: void KLightConditionVariable::Wait(KLightLock* lock, s64 timeout, bool allow_terminating_thread) { // Create thread queue. - KThread* owner = GetCurrentThreadPointer(kernel); + KThread* owner = GetCurrentThreadPointer(m_kernel); KHardwareTimer* timer{}; - ThreadQueueImplForKLightConditionVariable wait_queue(kernel, std::addressof(wait_list), + ThreadQueueImplForKLightConditionVariable wait_queue(m_kernel, std::addressof(m_wait_list), allow_terminating_thread); // Sleep the thread. { - KScopedSchedulerLockAndSleep lk(kernel, std::addressof(timer), owner, timeout); + KScopedSchedulerLockAndSleep lk(m_kernel, std::addressof(timer), owner, timeout); if (!allow_terminating_thread && owner->IsTerminationRequested()) { lk.CancelSleep(); @@ -57,7 +57,7 @@ void KLightConditionVariable::Wait(KLightLock* lock, s64 timeout, bool allow_ter lock->Unlock(); // Add the thread to the queue. - wait_list.push_back(*owner); + m_wait_list.push_back(*owner); // Begin waiting. wait_queue.SetHardwareTimer(timer); @@ -69,10 +69,10 @@ void KLightConditionVariable::Wait(KLightLock* lock, s64 timeout, bool allow_ter } void KLightConditionVariable::Broadcast() { - KScopedSchedulerLock lk(kernel); + KScopedSchedulerLock lk(m_kernel); // Signal all threads. - for (auto it = wait_list.begin(); it != wait_list.end(); it = wait_list.erase(it)) { + for (auto it = m_wait_list.begin(); it != m_wait_list.end(); it = m_wait_list.erase(it)) { it->EndWait(ResultSuccess); } } diff --git a/src/core/hle/kernel/k_light_condition_variable.h b/src/core/hle/kernel/k_light_condition_variable.h index 3cabd6b4f..ab612426d 100644 --- a/src/core/hle/kernel/k_light_condition_variable.h +++ b/src/core/hle/kernel/k_light_condition_variable.h @@ -13,13 +13,13 @@ class KLightLock; class KLightConditionVariable { public: - explicit KLightConditionVariable(KernelCore& kernel_) : kernel{kernel_} {} + explicit KLightConditionVariable(KernelCore& kernel) : m_kernel{kernel} {} void Wait(KLightLock* lock, s64 timeout = -1, bool allow_terminating_thread = true); void Broadcast(); private: - KernelCore& kernel; - KThread::WaiterList wait_list{}; + KernelCore& m_kernel; + KThread::WaiterList m_wait_list{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_light_lock.cpp b/src/core/hle/kernel/k_light_lock.cpp index 14cb615da..e87ee8b65 100644 --- a/src/core/hle/kernel/k_light_lock.cpp +++ b/src/core/hle/kernel/k_light_lock.cpp @@ -13,7 +13,7 @@ namespace { class ThreadQueueImplForKLightLock final : public KThreadQueue { public: - explicit ThreadQueueImplForKLightLock(KernelCore& kernel_) : KThreadQueue(kernel_) {} + explicit ThreadQueueImplForKLightLock(KernelCore& kernel) : KThreadQueue(kernel) {} void CancelWait(KThread* waiting_thread, Result wait_result, bool cancel_timer_task) override { // Remove the thread as a waiter from its owner. @@ -29,13 +29,13 @@ public: } // namespace void KLightLock::Lock() { - const uintptr_t cur_thread = reinterpret_cast(GetCurrentThreadPointer(kernel)); + const uintptr_t cur_thread = reinterpret_cast(GetCurrentThreadPointer(m_kernel)); while (true) { - uintptr_t old_tag = tag.load(std::memory_order_relaxed); + uintptr_t old_tag = m_tag.load(std::memory_order_relaxed); - while (!tag.compare_exchange_weak(old_tag, (old_tag == 0) ? cur_thread : (old_tag | 1), - std::memory_order_acquire)) { + while (!m_tag.compare_exchange_weak(old_tag, (old_tag == 0) ? cur_thread : (old_tag | 1), + std::memory_order_acquire)) { } if (old_tag == 0 || this->LockSlowPath(old_tag | 1, cur_thread)) { @@ -45,30 +45,30 @@ void KLightLock::Lock() { } void KLightLock::Unlock() { - const uintptr_t cur_thread = reinterpret_cast(GetCurrentThreadPointer(kernel)); + const uintptr_t cur_thread = reinterpret_cast(GetCurrentThreadPointer(m_kernel)); uintptr_t expected = cur_thread; - if (!tag.compare_exchange_strong(expected, 0, std::memory_order_release)) { + if (!m_tag.compare_exchange_strong(expected, 0, std::memory_order_release)) { this->UnlockSlowPath(cur_thread); } } bool KLightLock::LockSlowPath(uintptr_t _owner, uintptr_t _cur_thread) { KThread* cur_thread = reinterpret_cast(_cur_thread); - ThreadQueueImplForKLightLock wait_queue(kernel); + ThreadQueueImplForKLightLock wait_queue(m_kernel); // Pend the current thread waiting on the owner thread. { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Ensure we actually have locking to do. - if (tag.load(std::memory_order_relaxed) != _owner) { + if (m_tag.load(std::memory_order_relaxed) != _owner) { return false; } // Add the current thread as a waiter on the owner. KThread* owner_thread = reinterpret_cast(_owner & ~1ULL); - cur_thread->SetKernelAddressKey(reinterpret_cast(std::addressof(tag))); + cur_thread->SetKernelAddressKey(reinterpret_cast(std::addressof(m_tag))); owner_thread->AddWaiter(cur_thread); // Begin waiting to hold the lock. @@ -87,12 +87,12 @@ void KLightLock::UnlockSlowPath(uintptr_t _cur_thread) { // Unlock. { - KScopedSchedulerLock sl(kernel); + KScopedSchedulerLock sl(m_kernel); // Get the next owner. bool has_waiters; KThread* next_owner = owner_thread->RemoveKernelWaiterByKey( - std::addressof(has_waiters), reinterpret_cast(std::addressof(tag))); + std::addressof(has_waiters), reinterpret_cast(std::addressof(m_tag))); // Pass the lock to the next owner. uintptr_t next_tag = 0; @@ -114,12 +114,13 @@ void KLightLock::UnlockSlowPath(uintptr_t _cur_thread) { } // Write the new tag value. - tag.store(next_tag, std::memory_order_release); + m_tag.store(next_tag, std::memory_order_release); } } bool KLightLock::IsLockedByCurrentThread() const { - return (tag | 1ULL) == (reinterpret_cast(GetCurrentThreadPointer(kernel)) | 1ULL); + return (m_tag.load() | 1ULL) == + (reinterpret_cast(GetCurrentThreadPointer(m_kernel)) | 1ULL); } } // namespace Kernel diff --git a/src/core/hle/kernel/k_light_lock.h b/src/core/hle/kernel/k_light_lock.h index 7edd950c0..626f57596 100644 --- a/src/core/hle/kernel/k_light_lock.h +++ b/src/core/hle/kernel/k_light_lock.h @@ -13,7 +13,7 @@ class KernelCore; class KLightLock { public: - explicit KLightLock(KernelCore& kernel_) : kernel{kernel_} {} + explicit KLightLock(KernelCore& kernel) : m_kernel{kernel} {} void Lock(); @@ -24,14 +24,14 @@ public: void UnlockSlowPath(uintptr_t cur_thread); bool IsLocked() const { - return tag != 0; + return m_tag.load() != 0; } bool IsLockedByCurrentThread() const; private: - std::atomic tag{}; - KernelCore& kernel; + std::atomic m_tag{}; + KernelCore& m_kernel; }; using KScopedLightLock = KScopedLock; From 8d1f5bfbd2f25b6d0970161bc3061db42f83789e Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 6 Mar 2023 20:57:06 -0500 Subject: [PATCH 0167/1181] kernel: remove KLinkedList --- src/core/CMakeLists.txt | 1 - src/core/hle/kernel/k_condition_variable.cpp | 1 - src/core/hle/kernel/k_linked_list.h | 238 ------------------- src/core/hle/kernel/kernel.cpp | 4 - src/core/hle/kernel/kernel.h | 1 - 5 files changed, 245 deletions(-) delete mode 100644 src/core/hle/kernel/k_linked_list.h diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 75e0c4f38..c847fe824 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -211,7 +211,6 @@ add_library(core STATIC hle/kernel/k_light_condition_variable.h hle/kernel/k_light_lock.cpp hle/kernel/k_light_lock.h - hle/kernel/k_linked_list.h hle/kernel/k_memory_block.h hle/kernel/k_memory_block_manager.cpp hle/kernel/k_memory_block_manager.h diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cpp index b75957688..0dc01f6aa 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/core/hle/kernel/k_condition_variable.cpp @@ -4,7 +4,6 @@ #include "core/arm/exclusive_monitor.h" #include "core/core.h" #include "core/hle/kernel/k_condition_variable.h" -#include "core/hle/kernel/k_linked_list.h" #include "core/hle/kernel/k_process.h" #include "core/hle/kernel/k_scheduler.h" #include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" diff --git a/src/core/hle/kernel/k_linked_list.h b/src/core/hle/kernel/k_linked_list.h deleted file mode 100644 index 29ebd16b7..000000000 --- a/src/core/hle/kernel/k_linked_list.h +++ /dev/null @@ -1,238 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include - -#include "common/assert.h" -#include "core/hle/kernel/slab_helpers.h" - -namespace Kernel { - -class KernelCore; - -class KLinkedListNode : public boost::intrusive::list_base_hook<>, - public KSlabAllocated { - -public: - explicit KLinkedListNode(KernelCore&) {} - KLinkedListNode() = default; - - void Initialize(void* it) { - m_item = it; - } - - void* GetItem() const { - return m_item; - } - -private: - void* m_item = nullptr; -}; - -template -class KLinkedList : private boost::intrusive::list { -private: - using BaseList = boost::intrusive::list; - -public: - template - class Iterator; - - using value_type = T; - using size_type = size_t; - using difference_type = ptrdiff_t; - using pointer = value_type*; - using const_pointer = const value_type*; - using reference = value_type&; - using const_reference = const value_type&; - using iterator = Iterator; - using const_iterator = Iterator; - using reverse_iterator = std::reverse_iterator; - using const_reverse_iterator = std::reverse_iterator; - - template - class Iterator { - private: - using BaseIterator = BaseList::iterator; - friend class KLinkedList; - - public: - using iterator_category = std::bidirectional_iterator_tag; - using value_type = typename KLinkedList::value_type; - using difference_type = typename KLinkedList::difference_type; - using pointer = std::conditional_t; - using reference = - std::conditional_t; - - public: - explicit Iterator(BaseIterator it) : m_base_it(it) {} - - pointer GetItem() const { - return static_cast(m_base_it->GetItem()); - } - - bool operator==(const Iterator& rhs) const { - return m_base_it == rhs.m_base_it; - } - - bool operator!=(const Iterator& rhs) const { - return !(*this == rhs); - } - - pointer operator->() const { - return this->GetItem(); - } - - reference operator*() const { - return *this->GetItem(); - } - - Iterator& operator++() { - ++m_base_it; - return *this; - } - - Iterator& operator--() { - --m_base_it; - return *this; - } - - Iterator operator++(int) { - const Iterator it{*this}; - ++(*this); - return it; - } - - Iterator operator--(int) { - const Iterator it{*this}; - --(*this); - return it; - } - - operator Iterator() const { - return Iterator(m_base_it); - } - - private: - BaseIterator m_base_it; - }; - -public: - constexpr KLinkedList(KernelCore& kernel_) : BaseList(), kernel{kernel_} {} - - ~KLinkedList() { - // Erase all elements. - for (auto it = begin(); it != end(); it = erase(it)) { - } - - // Ensure we succeeded. - ASSERT(this->empty()); - } - - // Iterator accessors. - iterator begin() { - return iterator(BaseList::begin()); - } - - const_iterator begin() const { - return const_iterator(BaseList::begin()); - } - - iterator end() { - return iterator(BaseList::end()); - } - - const_iterator end() const { - return const_iterator(BaseList::end()); - } - - const_iterator cbegin() const { - return this->begin(); - } - - const_iterator cend() const { - return this->end(); - } - - reverse_iterator rbegin() { - return reverse_iterator(this->end()); - } - - const_reverse_iterator rbegin() const { - return const_reverse_iterator(this->end()); - } - - reverse_iterator rend() { - return reverse_iterator(this->begin()); - } - - const_reverse_iterator rend() const { - return const_reverse_iterator(this->begin()); - } - - const_reverse_iterator crbegin() const { - return this->rbegin(); - } - - const_reverse_iterator crend() const { - return this->rend(); - } - - // Content management. - using BaseList::empty; - using BaseList::size; - - reference back() { - return *(--this->end()); - } - - const_reference back() const { - return *(--this->end()); - } - - reference front() { - return *this->begin(); - } - - const_reference front() const { - return *this->begin(); - } - - iterator insert(const_iterator pos, reference ref) { - KLinkedListNode* new_node = KLinkedListNode::Allocate(kernel); - ASSERT(new_node != nullptr); - new_node->Initialize(std::addressof(ref)); - return iterator(BaseList::insert(pos.m_base_it, *new_node)); - } - - void push_back(reference ref) { - this->insert(this->end(), ref); - } - - void push_front(reference ref) { - this->insert(this->begin(), ref); - } - - void pop_back() { - this->erase(--this->end()); - } - - void pop_front() { - this->erase(this->begin()); - } - - iterator erase(const iterator pos) { - KLinkedListNode* freed_node = std::addressof(*pos.m_base_it); - iterator ret = iterator(BaseList::erase(pos.m_base_it)); - KLinkedListNode::Free(kernel, freed_node); - - return ret; - } - -private: - KernelCore& kernel; -}; - -} // namespace Kernel diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 59f832a3d..c236e9976 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -1320,7 +1320,6 @@ const Core::System& KernelCore::System() const { struct KernelCore::SlabHeapContainer { KSlabHeap client_session; KSlabHeap event; - KSlabHeap linked_list_node; KSlabHeap port; KSlabHeap process; KSlabHeap resource_limit; @@ -1347,8 +1346,6 @@ KSlabHeap& KernelCore::SlabHeap() { return slab_heap_container->client_session; } else if constexpr (std::is_same_v) { return slab_heap_container->event; - } else if constexpr (std::is_same_v) { - return slab_heap_container->linked_list_node; } else if constexpr (std::is_same_v) { return slab_heap_container->port; } else if constexpr (std::is_same_v) { @@ -1390,7 +1387,6 @@ KSlabHeap& KernelCore::SlabHeap() { template KSlabHeap& KernelCore::SlabHeap(); template KSlabHeap& KernelCore::SlabHeap(); -template KSlabHeap& KernelCore::SlabHeap(); template KSlabHeap& KernelCore::SlabHeap(); template KSlabHeap& KernelCore::SlabHeap(); template KSlabHeap& KernelCore::SlabHeap(); diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 1b380a07b..183a4d227 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -47,7 +47,6 @@ class KEvent; class KEventInfo; class KHandleTable; class KHardwareTimer; -class KLinkedListNode; class KMemoryLayout; class KMemoryManager; class KObjectName; From 0483dfae1a7db26dfe310b4119120a9b411d2244 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 6 Mar 2023 21:04:12 -0500 Subject: [PATCH 0168/1181] kernel: move KMemoryLayout for NX board --- src/core/CMakeLists.txt | 2 +- .../nintendo/nx/k_memory_layout.cpp} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/core/hle/kernel/{k_memory_layout.board.nintendo_nx.cpp => board/nintendo/nx/k_memory_layout.cpp} (100%) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index c847fe824..378e6c023 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -158,6 +158,7 @@ add_library(core STATIC hid/motion_input.h hle/api_version.h hle/ipc.h + hle/kernel/board/nintendo/nx/k_memory_layout.cpp hle/kernel/board/nintendo/nx/k_memory_layout.h hle/kernel/board/nintendo/nx/k_system_control.cpp hle/kernel/board/nintendo/nx/k_system_control.h @@ -215,7 +216,6 @@ add_library(core STATIC hle/kernel/k_memory_block_manager.cpp hle/kernel/k_memory_block_manager.h hle/kernel/k_memory_layout.cpp - hle/kernel/k_memory_layout.board.nintendo_nx.cpp hle/kernel/k_memory_layout.h hle/kernel/k_memory_manager.cpp hle/kernel/k_memory_manager.h diff --git a/src/core/hle/kernel/k_memory_layout.board.nintendo_nx.cpp b/src/core/hle/kernel/board/nintendo/nx/k_memory_layout.cpp similarity index 100% rename from src/core/hle/kernel/k_memory_layout.board.nintendo_nx.cpp rename to src/core/hle/kernel/board/nintendo/nx/k_memory_layout.cpp From 467adc1acde8316dce83d7f293217127412e18e9 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 6 Mar 2023 22:23:56 -0500 Subject: [PATCH 0169/1181] kernel: convert KMemoryLayout, KMemoryRegion*, KPageTableSlabHeap, KPriorityQueue --- src/core/hle/kernel/k_memory_layout.cpp | 19 ++-- src/core/hle/kernel/k_memory_layout.h | 34 +++--- src/core/hle/kernel/k_memory_region.h | 66 +++++------ src/core/hle/kernel/k_object_name.h | 2 +- src/core/hle/kernel/k_page_table_slab_heap.h | 3 +- src/core/hle/kernel/k_priority_queue.h | 114 +++++++++---------- 6 files changed, 119 insertions(+), 119 deletions(-) diff --git a/src/core/hle/kernel/k_memory_layout.cpp b/src/core/hle/kernel/k_memory_layout.cpp index 72c3ee4b7..9ff751119 100644 --- a/src/core/hle/kernel/k_memory_layout.cpp +++ b/src/core/hle/kernel/k_memory_layout.cpp @@ -18,11 +18,11 @@ KMemoryRegion* AllocateRegion(KMemoryRegionAllocator& memory_region_allocator, A } // namespace -KMemoryRegionTree::KMemoryRegionTree(KMemoryRegionAllocator& memory_region_allocator_) - : memory_region_allocator{memory_region_allocator_} {} +KMemoryRegionTree::KMemoryRegionTree(KMemoryRegionAllocator& memory_region_allocator) + : m_memory_region_allocator{memory_region_allocator} {} void KMemoryRegionTree::InsertDirectly(u64 address, u64 last_address, u32 attr, u32 type_id) { - this->insert(*AllocateRegion(memory_region_allocator, address, last_address, attr, type_id)); + this->insert(*AllocateRegion(m_memory_region_allocator, address, last_address, attr, type_id)); } bool KMemoryRegionTree::Insert(u64 address, size_t size, u32 type_id, u32 new_attr, u32 old_attr) { @@ -69,7 +69,7 @@ bool KMemoryRegionTree::Insert(u64 address, size_t size, u32 type_id, u32 new_at const u64 new_pair = (old_pair != std::numeric_limits::max()) ? old_pair + (address - old_address) : old_pair; - this->insert(*AllocateRegion(memory_region_allocator, address, inserted_region_last, + this->insert(*AllocateRegion(m_memory_region_allocator, address, inserted_region_last, new_pair, new_attr, type_id)); } @@ -78,7 +78,7 @@ bool KMemoryRegionTree::Insert(u64 address, size_t size, u32 type_id, u32 new_at const u64 after_pair = (old_pair != std::numeric_limits::max()) ? old_pair + (inserted_region_end - old_address) : old_pair; - this->insert(*AllocateRegion(memory_region_allocator, inserted_region_end, old_last, + this->insert(*AllocateRegion(m_memory_region_allocator, inserted_region_end, old_last, after_pair, old_attr, old_type)); } @@ -126,14 +126,15 @@ VAddr KMemoryRegionTree::GetRandomAlignedRegion(size_t size, size_t alignment, u } KMemoryLayout::KMemoryLayout() - : virtual_tree{memory_region_allocator}, physical_tree{memory_region_allocator}, - virtual_linear_tree{memory_region_allocator}, physical_linear_tree{memory_region_allocator} {} + : m_virtual_tree{m_memory_region_allocator}, m_physical_tree{m_memory_region_allocator}, + m_virtual_linear_tree{m_memory_region_allocator}, m_physical_linear_tree{ + m_memory_region_allocator} {} void KMemoryLayout::InitializeLinearMemoryRegionTrees(PAddr aligned_linear_phys_start, VAddr linear_virtual_start) { // Set static differences. - linear_phys_to_virt_diff = linear_virtual_start - aligned_linear_phys_start; - linear_virt_to_phys_diff = aligned_linear_phys_start - linear_virtual_start; + m_linear_phys_to_virt_diff = linear_virtual_start - aligned_linear_phys_start; + m_linear_virt_to_phys_diff = aligned_linear_phys_start - linear_virtual_start; // Initialize linear trees. for (auto& region : GetPhysicalMemoryRegionTree()) { diff --git a/src/core/hle/kernel/k_memory_layout.h b/src/core/hle/kernel/k_memory_layout.h index 17fa1a6ed..551b7a0e4 100644 --- a/src/core/hle/kernel/k_memory_layout.h +++ b/src/core/hle/kernel/k_memory_layout.h @@ -80,35 +80,35 @@ public: KMemoryLayout(); KMemoryRegionTree& GetVirtualMemoryRegionTree() { - return virtual_tree; + return m_virtual_tree; } const KMemoryRegionTree& GetVirtualMemoryRegionTree() const { - return virtual_tree; + return m_virtual_tree; } KMemoryRegionTree& GetPhysicalMemoryRegionTree() { - return physical_tree; + return m_physical_tree; } const KMemoryRegionTree& GetPhysicalMemoryRegionTree() const { - return physical_tree; + return m_physical_tree; } KMemoryRegionTree& GetVirtualLinearMemoryRegionTree() { - return virtual_linear_tree; + return m_virtual_linear_tree; } const KMemoryRegionTree& GetVirtualLinearMemoryRegionTree() const { - return virtual_linear_tree; + return m_virtual_linear_tree; } KMemoryRegionTree& GetPhysicalLinearMemoryRegionTree() { - return physical_linear_tree; + return m_physical_linear_tree; } const KMemoryRegionTree& GetPhysicalLinearMemoryRegionTree() const { - return physical_linear_tree; + return m_physical_linear_tree; } VAddr GetLinearVirtualAddress(PAddr address) const { - return address + linear_phys_to_virt_diff; + return address + m_linear_phys_to_virt_diff; } PAddr GetLinearPhysicalAddress(VAddr address) const { - return address + linear_virt_to_phys_diff; + return address + m_linear_virt_to_phys_diff; } const KMemoryRegion* FindVirtual(VAddr address) const { @@ -391,13 +391,13 @@ private: } private: - u64 linear_phys_to_virt_diff{}; - u64 linear_virt_to_phys_diff{}; - KMemoryRegionAllocator memory_region_allocator; - KMemoryRegionTree virtual_tree; - KMemoryRegionTree physical_tree; - KMemoryRegionTree virtual_linear_tree; - KMemoryRegionTree physical_linear_tree; + u64 m_linear_phys_to_virt_diff{}; + u64 m_linear_virt_to_phys_diff{}; + KMemoryRegionAllocator m_memory_region_allocator; + KMemoryRegionTree m_virtual_tree; + KMemoryRegionTree m_physical_tree; + KMemoryRegionTree m_virtual_linear_tree; + KMemoryRegionTree m_physical_linear_tree; }; namespace Init { diff --git a/src/core/hle/kernel/k_memory_region.h b/src/core/hle/kernel/k_memory_region.h index 5037e657f..cfe86fb82 100644 --- a/src/core/hle/kernel/k_memory_region.h +++ b/src/core/hle/kernel/k_memory_region.h @@ -21,15 +21,15 @@ public: YUZU_NON_MOVEABLE(KMemoryRegion); constexpr KMemoryRegion() = default; - constexpr KMemoryRegion(u64 address_, u64 last_address_) - : address{address_}, last_address{last_address_} {} - constexpr KMemoryRegion(u64 address_, u64 last_address_, u64 pair_address_, u32 attributes_, - u32 type_id_) - : address(address_), last_address(last_address_), pair_address(pair_address_), - attributes(attributes_), type_id(type_id_) {} - constexpr KMemoryRegion(u64 address_, u64 last_address_, u32 attributes_, u32 type_id_) - : KMemoryRegion(address_, last_address_, std::numeric_limits::max(), attributes_, - type_id_) {} + constexpr KMemoryRegion(u64 address, u64 last_address) + : m_address{address}, m_last_address{last_address} {} + constexpr KMemoryRegion(u64 address, u64 last_address, u64 pair_address, u32 attributes, + u32 type_id) + : m_address(address), m_last_address(last_address), m_pair_address(pair_address), + m_attributes(attributes), m_type_id(type_id) {} + constexpr KMemoryRegion(u64 address, u64 last_address, u32 attributes, u32 type_id) + : KMemoryRegion(address, last_address, std::numeric_limits::max(), attributes, + type_id) {} ~KMemoryRegion() = default; @@ -44,15 +44,15 @@ public: } constexpr u64 GetAddress() const { - return address; + return m_address; } constexpr u64 GetPairAddress() const { - return pair_address; + return m_pair_address; } constexpr u64 GetLastAddress() const { - return last_address; + return m_last_address; } constexpr u64 GetEndAddress() const { @@ -64,16 +64,16 @@ public: } constexpr u32 GetAttributes() const { - return attributes; + return m_attributes; } constexpr u32 GetType() const { - return type_id; + return m_type_id; } constexpr void SetType(u32 type) { ASSERT(this->CanDerive(type)); - type_id = type; + m_type_id = type; } constexpr bool Contains(u64 addr) const { @@ -94,27 +94,27 @@ public: } constexpr void SetPairAddress(u64 a) { - pair_address = a; + m_pair_address = a; } constexpr void SetTypeAttribute(u32 attr) { - type_id |= attr; + m_type_id |= attr; } private: constexpr void Reset(u64 a, u64 la, u64 p, u32 r, u32 t) { - address = a; - pair_address = p; - last_address = la; - attributes = r; - type_id = t; + m_address = a; + m_pair_address = p; + m_last_address = la; + m_attributes = r; + m_type_id = t; } - u64 address{}; - u64 last_address{}; - u64 pair_address{}; - u32 attributes{}; - u32 type_id{}; + u64 m_address{}; + u64 m_last_address{}; + u64 m_pair_address{}; + u32 m_attributes{}; + u32 m_type_id{}; }; class KMemoryRegionTree final { @@ -322,7 +322,7 @@ public: private: TreeType m_tree{}; - KMemoryRegionAllocator& memory_region_allocator; + KMemoryRegionAllocator& m_memory_region_allocator; }; class KMemoryRegionAllocator final { @@ -338,18 +338,18 @@ public: template KMemoryRegion* Allocate(Args&&... args) { // Ensure we stay within the bounds of our heap. - ASSERT(this->num_regions < MaxMemoryRegions); + ASSERT(m_num_regions < MaxMemoryRegions); // Create the new region. - KMemoryRegion* region = std::addressof(this->region_heap[this->num_regions++]); - new (region) KMemoryRegion(std::forward(args)...); + KMemoryRegion* region = std::addressof(m_region_heap[m_num_regions++]); + std::construct_at(region, std::forward(args)...); return region; } private: - std::array region_heap{}; - size_t num_regions{}; + std::array m_region_heap{}; + size_t m_num_regions{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_object_name.h b/src/core/hle/kernel/k_object_name.h index b7f943134..2d97fc777 100644 --- a/src/core/hle/kernel/k_object_name.h +++ b/src/core/hle/kernel/k_object_name.h @@ -41,7 +41,7 @@ public: // Check that the object is closed. R_UNLESS(derived->IsServerClosed(), ResultInvalidState); - return Delete(kernel, obj.GetPointerUnsafe(), name); + R_RETURN(Delete(kernel, obj.GetPointerUnsafe(), name)); } template diff --git a/src/core/hle/kernel/k_page_table_slab_heap.h b/src/core/hle/kernel/k_page_table_slab_heap.h index a9543cbd0..9a8d77316 100644 --- a/src/core/hle/kernel/k_page_table_slab_heap.h +++ b/src/core/hle/kernel/k_page_table_slab_heap.h @@ -20,7 +20,8 @@ public: PageTablePage() = default; private: - std::array m_buffer{}; + // Initializer intentionally skipped + std::array m_buffer; }; static_assert(sizeof(PageTablePage) == PageSize); diff --git a/src/core/hle/kernel/k_priority_queue.h b/src/core/hle/kernel/k_priority_queue.h index 645c5b531..26677ec65 100644 --- a/src/core/hle/kernel/k_priority_queue.h +++ b/src/core/hle/kernel/k_priority_queue.h @@ -77,11 +77,11 @@ private: public: class KPerCoreQueue { private: - std::array root{}; + std::array m_root{}; public: constexpr KPerCoreQueue() { - for (auto& per_core_root : root) { + for (auto& per_core_root : m_root) { per_core_root.Initialize(); } } @@ -91,15 +91,15 @@ public: Entry& member_entry = member->GetPriorityQueueEntry(core); // Get the entry associated with the end of the queue. - Member* tail = this->root[core].GetPrev(); + Member* tail = m_root[core].GetPrev(); Entry& tail_entry = - (tail != nullptr) ? tail->GetPriorityQueueEntry(core) : this->root[core]; + (tail != nullptr) ? tail->GetPriorityQueueEntry(core) : m_root[core]; // Link the entries. member_entry.SetPrev(tail); member_entry.SetNext(nullptr); tail_entry.SetNext(member); - this->root[core].SetPrev(member); + m_root[core].SetPrev(member); return tail == nullptr; } @@ -109,15 +109,15 @@ public: Entry& member_entry = member->GetPriorityQueueEntry(core); // Get the entry associated with the front of the queue. - Member* head = this->root[core].GetNext(); + Member* head = m_root[core].GetNext(); Entry& head_entry = - (head != nullptr) ? head->GetPriorityQueueEntry(core) : this->root[core]; + (head != nullptr) ? head->GetPriorityQueueEntry(core) : m_root[core]; // Link the entries. member_entry.SetPrev(nullptr); member_entry.SetNext(head); head_entry.SetPrev(member); - this->root[core].SetNext(member); + m_root[core].SetNext(member); return (head == nullptr); } @@ -130,9 +130,9 @@ public: Member* prev = member_entry.GetPrev(); Member* next = member_entry.GetNext(); Entry& prev_entry = - (prev != nullptr) ? prev->GetPriorityQueueEntry(core) : this->root[core]; + (prev != nullptr) ? prev->GetPriorityQueueEntry(core) : m_root[core]; Entry& next_entry = - (next != nullptr) ? next->GetPriorityQueueEntry(core) : this->root[core]; + (next != nullptr) ? next->GetPriorityQueueEntry(core) : m_root[core]; // Unlink. prev_entry.SetNext(next); @@ -142,7 +142,7 @@ public: } constexpr Member* GetFront(s32 core) const { - return this->root[core].GetNext(); + return m_root[core].GetNext(); } }; @@ -158,8 +158,8 @@ public: return; } - if (this->queues[priority].PushBack(core, member)) { - this->available_priorities[core].SetBit(priority); + if (m_queues[priority].PushBack(core, member)) { + m_available_priorities[core].SetBit(priority); } } @@ -171,8 +171,8 @@ public: return; } - if (this->queues[priority].PushFront(core, member)) { - this->available_priorities[core].SetBit(priority); + if (m_queues[priority].PushFront(core, member)) { + m_available_priorities[core].SetBit(priority); } } @@ -184,18 +184,17 @@ public: return; } - if (this->queues[priority].Remove(core, member)) { - this->available_priorities[core].ClearBit(priority); + if (m_queues[priority].Remove(core, member)) { + m_available_priorities[core].ClearBit(priority); } } constexpr Member* GetFront(s32 core) const { ASSERT(IsValidCore(core)); - const s32 priority = - static_cast(this->available_priorities[core].CountLeadingZero()); + const s32 priority = static_cast(m_available_priorities[core].CountLeadingZero()); if (priority <= LowestPriority) { - return this->queues[priority].GetFront(core); + return m_queues[priority].GetFront(core); } else { return nullptr; } @@ -206,7 +205,7 @@ public: ASSERT(IsValidPriority(priority)); if (priority <= LowestPriority) { - return this->queues[priority].GetFront(core); + return m_queues[priority].GetFront(core); } else { return nullptr; } @@ -218,9 +217,9 @@ public: Member* next = member->GetPriorityQueueEntry(core).GetNext(); if (next == nullptr) { const s32 priority = static_cast( - this->available_priorities[core].GetNextSet(member->GetPriority())); + m_available_priorities[core].GetNextSet(member->GetPriority())); if (priority <= LowestPriority) { - next = this->queues[priority].GetFront(core); + next = m_queues[priority].GetFront(core); } } return next; @@ -231,8 +230,8 @@ public: ASSERT(IsValidPriority(priority)); if (priority <= LowestPriority) { - this->queues[priority].Remove(core, member); - this->queues[priority].PushFront(core, member); + m_queues[priority].Remove(core, member); + m_queues[priority].PushFront(core, member); } } @@ -241,29 +240,29 @@ public: ASSERT(IsValidPriority(priority)); if (priority <= LowestPriority) { - this->queues[priority].Remove(core, member); - this->queues[priority].PushBack(core, member); - return this->queues[priority].GetFront(core); + m_queues[priority].Remove(core, member); + m_queues[priority].PushBack(core, member); + return m_queues[priority].GetFront(core); } else { return nullptr; } } private: - std::array queues{}; - std::array, NumCores> available_priorities{}; + std::array m_queues{}; + std::array, NumCores> m_available_priorities{}; }; private: - KPriorityQueueImpl scheduled_queue; - KPriorityQueueImpl suggested_queue; + KPriorityQueueImpl m_scheduled_queue; + KPriorityQueueImpl m_suggested_queue; private: - constexpr void ClearAffinityBit(u64& affinity, s32 core) { + static constexpr void ClearAffinityBit(u64& affinity, s32 core) { affinity &= ~(UINT64_C(1) << core); } - constexpr s32 GetNextCore(u64& affinity) { + static constexpr s32 GetNextCore(u64& affinity) { const s32 core = std::countr_zero(affinity); ClearAffinityBit(affinity, core); return core; @@ -275,13 +274,13 @@ private: // Push onto the scheduled queue for its core, if we can. u64 affinity = member->GetAffinityMask().GetAffinityMask(); if (const s32 core = member->GetActiveCore(); core >= 0) { - this->scheduled_queue.PushBack(priority, core, member); + m_scheduled_queue.PushBack(priority, core, member); ClearAffinityBit(affinity, core); } // And suggest the thread for all other cores. while (affinity) { - this->suggested_queue.PushBack(priority, GetNextCore(affinity), member); + m_suggested_queue.PushBack(priority, GetNextCore(affinity), member); } } @@ -291,14 +290,14 @@ private: // Push onto the scheduled queue for its core, if we can. u64 affinity = member->GetAffinityMask().GetAffinityMask(); if (const s32 core = member->GetActiveCore(); core >= 0) { - this->scheduled_queue.PushFront(priority, core, member); + m_scheduled_queue.PushFront(priority, core, member); ClearAffinityBit(affinity, core); } // And suggest the thread for all other cores. // Note: Nintendo pushes onto the back of the suggested queue, not the front. while (affinity) { - this->suggested_queue.PushBack(priority, GetNextCore(affinity), member); + m_suggested_queue.PushBack(priority, GetNextCore(affinity), member); } } @@ -308,13 +307,13 @@ private: // Remove from the scheduled queue for its core. u64 affinity = member->GetAffinityMask().GetAffinityMask(); if (const s32 core = member->GetActiveCore(); core >= 0) { - this->scheduled_queue.Remove(priority, core, member); + m_scheduled_queue.Remove(priority, core, member); ClearAffinityBit(affinity, core); } // Remove from the suggested queue for all other cores. while (affinity) { - this->suggested_queue.Remove(priority, GetNextCore(affinity), member); + m_suggested_queue.Remove(priority, GetNextCore(affinity), member); } } @@ -323,27 +322,27 @@ public: // Getters. constexpr Member* GetScheduledFront(s32 core) const { - return this->scheduled_queue.GetFront(core); + return m_scheduled_queue.GetFront(core); } constexpr Member* GetScheduledFront(s32 core, s32 priority) const { - return this->scheduled_queue.GetFront(priority, core); + return m_scheduled_queue.GetFront(priority, core); } constexpr Member* GetSuggestedFront(s32 core) const { - return this->suggested_queue.GetFront(core); + return m_suggested_queue.GetFront(core); } constexpr Member* GetSuggestedFront(s32 core, s32 priority) const { - return this->suggested_queue.GetFront(priority, core); + return m_suggested_queue.GetFront(priority, core); } constexpr Member* GetScheduledNext(s32 core, const Member* member) const { - return this->scheduled_queue.GetNext(core, member); + return m_scheduled_queue.GetNext(core, member); } constexpr Member* GetSuggestedNext(s32 core, const Member* member) const { - return this->suggested_queue.GetNext(core, member); + return m_suggested_queue.GetNext(core, member); } constexpr Member* GetSamePriorityNext(s32 core, const Member* member) const { @@ -375,7 +374,7 @@ public: return; } - this->scheduled_queue.MoveToFront(member->GetPriority(), member->GetActiveCore(), member); + m_scheduled_queue.MoveToFront(member->GetPriority(), member->GetActiveCore(), member); } constexpr KThread* MoveToScheduledBack(Member* member) { @@ -384,8 +383,7 @@ public: return {}; } - return this->scheduled_queue.MoveToBack(member->GetPriority(), member->GetActiveCore(), - member); + return m_scheduled_queue.MoveToBack(member->GetPriority(), member->GetActiveCore(), member); } // First class fancy operations. @@ -425,9 +423,9 @@ public: for (s32 core = 0; core < static_cast(NumCores); core++) { if (prev_affinity.GetAffinity(core)) { if (core == prev_core) { - this->scheduled_queue.Remove(priority, core, member); + m_scheduled_queue.Remove(priority, core, member); } else { - this->suggested_queue.Remove(priority, core, member); + m_suggested_queue.Remove(priority, core, member); } } } @@ -436,9 +434,9 @@ public: for (s32 core = 0; core < static_cast(NumCores); core++) { if (new_affinity.GetAffinity(core)) { if (core == new_core) { - this->scheduled_queue.PushBack(priority, core, member); + m_scheduled_queue.PushBack(priority, core, member); } else { - this->suggested_queue.PushBack(priority, core, member); + m_suggested_queue.PushBack(priority, core, member); } } } @@ -458,22 +456,22 @@ public: if (prev_core != new_core) { // Remove from the scheduled queue for the previous core. if (prev_core >= 0) { - this->scheduled_queue.Remove(priority, prev_core, member); + m_scheduled_queue.Remove(priority, prev_core, member); } // Remove from the suggested queue and add to the scheduled queue for the new core. if (new_core >= 0) { - this->suggested_queue.Remove(priority, new_core, member); + m_suggested_queue.Remove(priority, new_core, member); if (to_front) { - this->scheduled_queue.PushFront(priority, new_core, member); + m_scheduled_queue.PushFront(priority, new_core, member); } else { - this->scheduled_queue.PushBack(priority, new_core, member); + m_scheduled_queue.PushBack(priority, new_core, member); } } // Add to the suggested queue for the previous core. if (prev_core >= 0) { - this->suggested_queue.PushBack(priority, prev_core, member); + m_suggested_queue.PushBack(priority, prev_core, member); } } } From 7322c99e5fd335aa144620dff7f4d7a71932d35e Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 6 Mar 2023 22:31:50 -0500 Subject: [PATCH 0170/1181] kernel: convert KAbstractSchedulerLock --- src/core/hle/kernel/k_scheduler_lock.h | 55 +++++++++++--------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/src/core/hle/kernel/k_scheduler_lock.h b/src/core/hle/kernel/k_scheduler_lock.h index 13463717f..caa1404f1 100644 --- a/src/core/hle/kernel/k_scheduler_lock.h +++ b/src/core/hle/kernel/k_scheduler_lock.h @@ -14,74 +14,67 @@ namespace Kernel { class KernelCore; +class GlobalSchedulerContext; template class KAbstractSchedulerLock { public: - explicit KAbstractSchedulerLock(KernelCore& kernel_) : kernel{kernel_} {} + explicit KAbstractSchedulerLock(KernelCore& kernel) : m_kernel{kernel} {} bool IsLockedByCurrentThread() const { - return owner_thread == GetCurrentThreadPointer(kernel); + return m_owner_thread == GetCurrentThreadPointer(m_kernel); } void Lock() { - // If we are shutting down the kernel, none of this is relevant anymore. - if (kernel.IsShuttingDown()) { - return; - } - - if (IsLockedByCurrentThread()) { + if (this->IsLockedByCurrentThread()) { // If we already own the lock, the lock count should be > 0. // For debug, ensure this is true. - ASSERT(lock_count > 0); + ASSERT(m_lock_count > 0); } else { // Otherwise, we want to disable scheduling and acquire the spinlock. - SchedulerType::DisableScheduling(kernel); - spin_lock.Lock(); + SchedulerType::DisableScheduling(m_kernel); + m_spin_lock.Lock(); - ASSERT(lock_count == 0); - ASSERT(owner_thread == nullptr); + ASSERT(m_lock_count == 0); + ASSERT(m_owner_thread == nullptr); // Take ownership of the lock. - owner_thread = GetCurrentThreadPointer(kernel); + m_owner_thread = GetCurrentThreadPointer(m_kernel); } // Increment the lock count. - lock_count++; + m_lock_count++; } void Unlock() { - // If we are shutting down the kernel, none of this is relevant anymore. - if (kernel.IsShuttingDown()) { - return; - } - - ASSERT(IsLockedByCurrentThread()); - ASSERT(lock_count > 0); + ASSERT(this->IsLockedByCurrentThread()); + ASSERT(m_lock_count > 0); // Release an instance of the lock. - if ((--lock_count) == 0) { + if ((--m_lock_count) == 0) { // Perform a memory barrier here. std::atomic_thread_fence(std::memory_order_seq_cst); // We're no longer going to hold the lock. Take note of what cores need scheduling. const u64 cores_needing_scheduling = - SchedulerType::UpdateHighestPriorityThreads(kernel); + SchedulerType::UpdateHighestPriorityThreads(m_kernel); // Note that we no longer hold the lock, and unlock the spinlock. - owner_thread = nullptr; - spin_lock.Unlock(); + m_owner_thread = nullptr; + m_spin_lock.Unlock(); // Enable scheduling, and perform a rescheduling operation. - SchedulerType::EnableScheduling(kernel, cores_needing_scheduling); + SchedulerType::EnableScheduling(m_kernel, cores_needing_scheduling); } } private: - KernelCore& kernel; - KAlignedSpinLock spin_lock{}; - s32 lock_count{}; - std::atomic owner_thread{}; + friend class GlobalSchedulerContext; + + KernelCore& m_kernel; + KAlignedSpinLock m_spin_lock{}; + s32 m_lock_count{}; + std::atomic m_owner_thread{}; }; } // namespace Kernel From d1b53c8d82254a05c03bf2e57b9a5d5a6295abda Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 6 Mar 2023 22:47:06 -0500 Subject: [PATCH 0171/1181] kernel: conver KScopedLock, KScopedResourceReservation, KSessionRequest, KSharedMemory, KSpinLock --- src/core/hle/kernel/k_scoped_lock.h | 12 ++-- .../kernel/k_scoped_resource_reservation.h | 36 ++++++------ src/core/hle/kernel/k_session_request.cpp | 16 +++--- src/core/hle/kernel/k_session_request.h | 14 ++--- src/core/hle/kernel/k_shared_memory.cpp | 55 ++++++++++--------- src/core/hle/kernel/k_shared_memory.h | 26 ++++----- src/core/hle/kernel/k_shared_memory_info.h | 17 +++--- src/core/hle/kernel/k_spin_lock.cpp | 6 +- src/core/hle/kernel/k_spin_lock.h | 14 ++--- 9 files changed, 99 insertions(+), 97 deletions(-) diff --git a/src/core/hle/kernel/k_scoped_lock.h b/src/core/hle/kernel/k_scoped_lock.h index a15640fd2..629a7d20d 100644 --- a/src/core/hle/kernel/k_scoped_lock.h +++ b/src/core/hle/kernel/k_scoped_lock.h @@ -18,15 +18,15 @@ std::is_reference_v&& requires(T& t) { template requires KLockable -class [[nodiscard]] KScopedLock { +class KScopedLock { public: - explicit KScopedLock(T* l) : lock_ptr(l) { - this->lock_ptr->Lock(); + explicit KScopedLock(T* l) : m_lock(*l) {} + explicit KScopedLock(T& l) : m_lock(l) { + m_lock.Lock(); } - explicit KScopedLock(T& l) : KScopedLock(std::addressof(l)) {} ~KScopedLock() { - this->lock_ptr->Unlock(); + m_lock.Unlock(); } KScopedLock(const KScopedLock&) = delete; @@ -36,7 +36,7 @@ public: KScopedLock& operator=(KScopedLock&&) = delete; private: - T* lock_ptr; + T& m_lock; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_scoped_resource_reservation.h b/src/core/hle/kernel/k_scoped_resource_reservation.h index 436bcf9fe..2cc464612 100644 --- a/src/core/hle/kernel/k_scoped_resource_reservation.h +++ b/src/core/hle/kernel/k_scoped_resource_reservation.h @@ -12,20 +12,20 @@ namespace Kernel { class KScopedResourceReservation { public: explicit KScopedResourceReservation(KResourceLimit* l, LimitableResource r, s64 v, s64 timeout) - : resource_limit(std::move(l)), value(v), resource(r) { - if (resource_limit && value) { - success = resource_limit->Reserve(resource, value, timeout); + : m_limit(l), m_value(v), m_resource(r) { + if (m_limit && m_value) { + m_succeeded = m_limit->Reserve(m_resource, m_value, timeout); } else { - success = true; + m_succeeded = true; } } explicit KScopedResourceReservation(KResourceLimit* l, LimitableResource r, s64 v = 1) - : resource_limit(std::move(l)), value(v), resource(r) { - if (resource_limit && value) { - success = resource_limit->Reserve(resource, value); + : m_limit(l), m_value(v), m_resource(r) { + if (m_limit && m_value) { + m_succeeded = m_limit->Reserve(m_resource, m_value); } else { - success = true; + m_succeeded = true; } } @@ -36,26 +36,26 @@ public: : KScopedResourceReservation(p->GetResourceLimit(), r, v) {} ~KScopedResourceReservation() noexcept { - if (resource_limit && value && success) { - // resource was not committed, release the reservation. - resource_limit->Release(resource, value); + if (m_limit && m_value && m_succeeded) { + // Resource was not committed, release the reservation. + m_limit->Release(m_resource, m_value); } } /// Commit the resource reservation, destruction of this object does not release the resource void Commit() { - resource_limit = nullptr; + m_limit = nullptr; } - [[nodiscard]] bool Succeeded() const { - return success; + bool Succeeded() const { + return m_succeeded; } private: - KResourceLimit* resource_limit{}; - s64 value; - LimitableResource resource; - bool success; + KResourceLimit* m_limit{}; + s64 m_value{}; + LimitableResource m_resource{}; + bool m_succeeded{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_session_request.cpp b/src/core/hle/kernel/k_session_request.cpp index 520da6aa7..a329e5690 100644 --- a/src/core/hle/kernel/k_session_request.cpp +++ b/src/core/hle/kernel/k_session_request.cpp @@ -14,46 +14,46 @@ Result KSessionRequest::SessionMappings::PushMap(VAddr client, VAddr server, siz // Get the mapping. Mapping* mapping; if (index < NumStaticMappings) { - mapping = &m_static_mappings[index]; + mapping = std::addressof(m_static_mappings[index]); } else { // Allocate a page for the extra mappings. if (m_mappings == nullptr) { - KPageBuffer* page_buffer = KPageBuffer::Allocate(kernel); + KPageBuffer* page_buffer = KPageBuffer::Allocate(m_kernel); R_UNLESS(page_buffer != nullptr, ResultOutOfMemory); m_mappings = reinterpret_cast(page_buffer); } - mapping = &m_mappings[index - NumStaticMappings]; + mapping = std::addressof(m_mappings[index - NumStaticMappings]); } // Set the mapping. mapping->Set(client, server, size, state); - return ResultSuccess; + R_SUCCEED(); } Result KSessionRequest::SessionMappings::PushSend(VAddr client, VAddr server, size_t size, KMemoryState state) { ASSERT(m_num_recv == 0); ASSERT(m_num_exch == 0); - return this->PushMap(client, server, size, state, m_num_send++); + R_RETURN(this->PushMap(client, server, size, state, m_num_send++)); } Result KSessionRequest::SessionMappings::PushReceive(VAddr client, VAddr server, size_t size, KMemoryState state) { ASSERT(m_num_exch == 0); - return this->PushMap(client, server, size, state, m_num_send + m_num_recv++); + R_RETURN(this->PushMap(client, server, size, state, m_num_send + m_num_recv++)); } Result KSessionRequest::SessionMappings::PushExchange(VAddr client, VAddr server, size_t size, KMemoryState state) { - return this->PushMap(client, server, size, state, m_num_send + m_num_recv + m_num_exch++); + R_RETURN(this->PushMap(client, server, size, state, m_num_send + m_num_recv + m_num_exch++)); } void KSessionRequest::SessionMappings::Finalize() { if (m_mappings) { - KPageBuffer::Free(kernel, reinterpret_cast(m_mappings)); + KPageBuffer::Free(m_kernel, reinterpret_cast(m_mappings)); m_mappings = nullptr; } } diff --git a/src/core/hle/kernel/k_session_request.h b/src/core/hle/kernel/k_session_request.h index e5558bc2c..5003e5c1d 100644 --- a/src/core/hle/kernel/k_session_request.h +++ b/src/core/hle/kernel/k_session_request.h @@ -47,14 +47,14 @@ public: } private: - VAddr m_client_address; - VAddr m_server_address; - size_t m_size; - KMemoryState m_state; + VAddr m_client_address{}; + VAddr m_server_address{}; + size_t m_size{}; + KMemoryState m_state{}; }; public: - explicit SessionMappings(KernelCore& kernel_) : kernel(kernel_) {} + explicit SessionMappings(KernelCore& kernel) : m_kernel(kernel) {} void Initialize() {} void Finalize(); @@ -149,8 +149,8 @@ public: } private: - KernelCore& kernel; - std::array m_static_mappings; + KernelCore& m_kernel; + std::array m_static_mappings{}; Mapping* m_mappings{}; u8 m_num_send{}; u8 m_num_recv{}; diff --git a/src/core/hle/kernel/k_shared_memory.cpp b/src/core/hle/kernel/k_shared_memory.cpp index 42cb7ac77..bf134f7c8 100644 --- a/src/core/hle/kernel/k_shared_memory.cpp +++ b/src/core/hle/kernel/k_shared_memory.cpp @@ -15,15 +15,15 @@ namespace Kernel { KSharedMemory::KSharedMemory(KernelCore& kernel_) : KAutoObjectWithSlabHeapAndContainer{kernel_} {} KSharedMemory::~KSharedMemory() = default; -Result KSharedMemory::Initialize(Core::DeviceMemory& device_memory_, KProcess* owner_process_, - Svc::MemoryPermission owner_permission_, - Svc::MemoryPermission user_permission_, std::size_t size_) { +Result KSharedMemory::Initialize(Core::DeviceMemory& device_memory, KProcess* owner_process, + Svc::MemoryPermission owner_permission, + Svc::MemoryPermission user_permission, std::size_t size) { // Set members. - owner_process = owner_process_; - device_memory = &device_memory_; - owner_permission = owner_permission_; - user_permission = user_permission_; - size = Common::AlignUp(size_, PageSize); + m_owner_process = owner_process; + m_device_memory = std::addressof(device_memory); + m_owner_permission = owner_permission; + m_user_permission = user_permission; + m_size = Common::AlignUp(size, PageSize); const size_t num_pages = Common::DivideUp(size, PageSize); @@ -32,7 +32,7 @@ Result KSharedMemory::Initialize(Core::DeviceMemory& device_memory_, KProcess* o // Reserve memory for ourselves. KScopedResourceReservation memory_reservation(reslimit, LimitableResource::PhysicalMemoryMax, - size_); + size); R_UNLESS(memory_reservation.Succeeded(), ResultLimitReached); // Allocate the memory. @@ -40,26 +40,26 @@ Result KSharedMemory::Initialize(Core::DeviceMemory& device_memory_, KProcess* o //! HACK: Open continuous mapping from sysmodule pool. auto option = KMemoryManager::EncodeOption(KMemoryManager::Pool::Secure, KMemoryManager::Direction::FromBack); - physical_address = kernel.MemoryManager().AllocateAndOpenContinuous(num_pages, 1, option); - R_UNLESS(physical_address != 0, ResultOutOfMemory); + m_physical_address = kernel.MemoryManager().AllocateAndOpenContinuous(num_pages, 1, option); + R_UNLESS(m_physical_address != 0, ResultOutOfMemory); //! Insert the result into our page group. - page_group.emplace(kernel, &kernel.GetSystemSystemResource().GetBlockInfoManager()); - page_group->AddBlock(physical_address, num_pages); + m_page_group.emplace(kernel, &kernel.GetSystemSystemResource().GetBlockInfoManager()); + m_page_group->AddBlock(m_physical_address, num_pages); // Commit our reservation. memory_reservation.Commit(); // Set our resource limit. - resource_limit = reslimit; - resource_limit->Open(); + m_resource_limit = reslimit; + m_resource_limit->Open(); // Mark initialized. - is_initialized = true; + m_is_initialized = true; // Clear all pages in the memory. - for (const auto& block : *page_group) { - std::memset(device_memory_.GetPointer(block.GetAddress()), 0, block.GetSize()); + for (const auto& block : *m_page_group) { + std::memset(m_device_memory->GetPointer(block.GetAddress()), 0, block.GetSize()); } R_SUCCEED(); @@ -67,12 +67,12 @@ Result KSharedMemory::Initialize(Core::DeviceMemory& device_memory_, KProcess* o void KSharedMemory::Finalize() { // Close and finalize the page group. - page_group->Close(); - page_group->Finalize(); + m_page_group->Close(); + m_page_group->Finalize(); // Release the memory reservation. - resource_limit->Release(LimitableResource::PhysicalMemoryMax, size); - resource_limit->Close(); + m_resource_limit->Release(LimitableResource::PhysicalMemoryMax, m_size); + m_resource_limit->Close(); // Perform inherited finalization. KAutoObjectWithSlabHeapAndContainer::Finalize(); @@ -81,26 +81,27 @@ void KSharedMemory::Finalize() { Result KSharedMemory::Map(KProcess& target_process, VAddr address, std::size_t map_size, Svc::MemoryPermission map_perm) { // Validate the size. - R_UNLESS(size == map_size, ResultInvalidSize); + R_UNLESS(m_size == map_size, ResultInvalidSize); // Validate the permission. const Svc::MemoryPermission test_perm = - &target_process == owner_process ? owner_permission : user_permission; + std::addressof(target_process) == m_owner_process ? m_owner_permission : m_user_permission; if (test_perm == Svc::MemoryPermission::DontCare) { ASSERT(map_perm == Svc::MemoryPermission::Read || map_perm == Svc::MemoryPermission::Write); } else { R_UNLESS(map_perm == test_perm, ResultInvalidNewMemoryPermission); } - R_RETURN(target_process.PageTable().MapPageGroup(address, *page_group, KMemoryState::Shared, + R_RETURN(target_process.PageTable().MapPageGroup(address, *m_page_group, KMemoryState::Shared, ConvertToKMemoryPermission(map_perm))); } Result KSharedMemory::Unmap(KProcess& target_process, VAddr address, std::size_t unmap_size) { // Validate the size. - R_UNLESS(size == unmap_size, ResultInvalidSize); + R_UNLESS(m_size == unmap_size, ResultInvalidSize); - R_RETURN(target_process.PageTable().UnmapPageGroup(address, *page_group, KMemoryState::Shared)); + R_RETURN( + target_process.PageTable().UnmapPageGroup(address, *m_page_group, KMemoryState::Shared)); } } // namespace Kernel diff --git a/src/core/hle/kernel/k_shared_memory.h b/src/core/hle/kernel/k_shared_memory.h index bfd01b619..8c94ceb3a 100644 --- a/src/core/hle/kernel/k_shared_memory.h +++ b/src/core/hle/kernel/k_shared_memory.h @@ -54,7 +54,7 @@ public: * @return A pointer to the shared memory block from the specified offset */ u8* GetPointer(std::size_t offset = 0) { - return device_memory->GetPointer(physical_address + offset); + return m_device_memory->GetPointer(m_physical_address + offset); } /** @@ -63,26 +63,26 @@ public: * @return A pointer to the shared memory block from the specified offset */ const u8* GetPointer(std::size_t offset = 0) const { - return device_memory->GetPointer(physical_address + offset); + return m_device_memory->GetPointer(m_physical_address + offset); } void Finalize() override; bool IsInitialized() const override { - return is_initialized; + return m_is_initialized; } - static void PostDestroy([[maybe_unused]] uintptr_t arg) {} + static void PostDestroy(uintptr_t arg) {} private: - Core::DeviceMemory* device_memory{}; - KProcess* owner_process{}; - std::optional page_group{}; - Svc::MemoryPermission owner_permission{}; - Svc::MemoryPermission user_permission{}; - PAddr physical_address{}; - std::size_t size{}; - KResourceLimit* resource_limit{}; - bool is_initialized{}; + Core::DeviceMemory* m_device_memory{}; + KProcess* m_owner_process{}; + std::optional m_page_group{}; + Svc::MemoryPermission m_owner_permission{}; + Svc::MemoryPermission m_user_permission{}; + PAddr m_physical_address{}; + std::size_t m_size{}; + KResourceLimit* m_resource_limit{}; + bool m_is_initialized{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_shared_memory_info.h b/src/core/hle/kernel/k_shared_memory_info.h index 2bb6b6d08..75b73ba39 100644 --- a/src/core/hle/kernel/k_shared_memory_info.h +++ b/src/core/hle/kernel/k_shared_memory_info.h @@ -18,25 +18,28 @@ public: explicit KSharedMemoryInfo(KernelCore&) {} KSharedMemoryInfo() = default; - constexpr void Initialize(KSharedMemory* shmem) { - shared_memory = shmem; + constexpr void Initialize(KSharedMemory* m) { + m_shared_memory = m; + m_reference_count = 0; } constexpr KSharedMemory* GetSharedMemory() const { - return shared_memory; + return m_shared_memory; } constexpr void Open() { - ++reference_count; + ++m_reference_count; + ASSERT(m_reference_count > 0); } constexpr bool Close() { - return (--reference_count) == 0; + ASSERT(m_reference_count > 0); + return (--m_reference_count) == 0; } private: - KSharedMemory* shared_memory{}; - size_t reference_count{}; + KSharedMemory* m_shared_memory{}; + size_t m_reference_count{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_spin_lock.cpp b/src/core/hle/kernel/k_spin_lock.cpp index 6e16a1849..852532037 100644 --- a/src/core/hle/kernel/k_spin_lock.cpp +++ b/src/core/hle/kernel/k_spin_lock.cpp @@ -6,15 +6,15 @@ namespace Kernel { void KSpinLock::Lock() { - lck.lock(); + m_lock.lock(); } void KSpinLock::Unlock() { - lck.unlock(); + m_lock.unlock(); } bool KSpinLock::TryLock() { - return lck.try_lock(); + return m_lock.try_lock(); } } // namespace Kernel diff --git a/src/core/hle/kernel/k_spin_lock.h b/src/core/hle/kernel/k_spin_lock.h index 397a93d21..094a1e6be 100644 --- a/src/core/hle/kernel/k_spin_lock.h +++ b/src/core/hle/kernel/k_spin_lock.h @@ -5,26 +5,24 @@ #include +#include "common/common_funcs.h" #include "core/hle/kernel/k_scoped_lock.h" namespace Kernel { class KSpinLock { public: - KSpinLock() = default; + explicit KSpinLock() = default; - KSpinLock(const KSpinLock&) = delete; - KSpinLock& operator=(const KSpinLock&) = delete; - - KSpinLock(KSpinLock&&) = delete; - KSpinLock& operator=(KSpinLock&&) = delete; + YUZU_NON_COPYABLE(KSpinLock); + YUZU_NON_MOVEABLE(KSpinLock); void Lock(); void Unlock(); - [[nodiscard]] bool TryLock(); + bool TryLock(); private: - std::mutex lck; + std::mutex m_lock; }; // TODO(bunnei): Alias for now, in case we want to implement these accurately in the future. From 57f1d8ef8d8de7d93e46f6ec26811cfe4879249b Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 6 Mar 2023 23:08:53 -0500 Subject: [PATCH 0172/1181] kernel: convert miscellaneous --- .../hle/kernel/k_synchronization_object.cpp | 24 +++++------ .../hle/kernel/k_synchronization_object.h | 27 ++++++------ src/core/hle/kernel/k_transfer_memory.cpp | 14 +++---- src/core/hle/kernel/k_transfer_memory.h | 20 ++++----- src/core/hle/kernel/physical_core.cpp | 41 +++++++++---------- src/core/hle/kernel/physical_core.h | 34 ++++++--------- src/core/hle/kernel/slab_helpers.h | 13 +++--- 7 files changed, 80 insertions(+), 93 deletions(-) diff --git a/src/core/hle/kernel/k_synchronization_object.cpp b/src/core/hle/kernel/k_synchronization_object.cpp index 40fd0c038..dd912a82d 100644 --- a/src/core/hle/kernel/k_synchronization_object.cpp +++ b/src/core/hle/kernel/k_synchronization_object.cpp @@ -71,26 +71,26 @@ void KSynchronizationObject::Finalize() { KAutoObject::Finalize(); } -Result KSynchronizationObject::Wait(KernelCore& kernel_ctx, s32* out_index, +Result KSynchronizationObject::Wait(KernelCore& kernel, s32* out_index, KSynchronizationObject** objects, const s32 num_objects, s64 timeout) { // Allocate space on stack for thread nodes. std::vector thread_nodes(num_objects); // Prepare for wait. - KThread* thread = GetCurrentThreadPointer(kernel_ctx); + KThread* thread = GetCurrentThreadPointer(kernel); KHardwareTimer* timer{}; - ThreadQueueImplForKSynchronizationObjectWait wait_queue(kernel_ctx, objects, - thread_nodes.data(), num_objects); + ThreadQueueImplForKSynchronizationObjectWait wait_queue(kernel, objects, thread_nodes.data(), + num_objects); { // Setup the scheduling lock and sleep. - KScopedSchedulerLockAndSleep slp(kernel_ctx, std::addressof(timer), thread, timeout); + KScopedSchedulerLockAndSleep slp(kernel, std::addressof(timer), thread, timeout); // Check if the thread should terminate. if (thread->IsTerminationRequested()) { slp.CancelSleep(); - return ResultTerminationRequested; + R_THROW(ResultTerminationRequested); } // Check if any of the objects are already signaled. @@ -100,21 +100,21 @@ Result KSynchronizationObject::Wait(KernelCore& kernel_ctx, s32* out_index, if (objects[i]->IsSignaled()) { *out_index = i; slp.CancelSleep(); - return ResultSuccess; + R_THROW(ResultSuccess); } } // Check if the timeout is zero. if (timeout == 0) { slp.CancelSleep(); - return ResultTimedOut; + R_THROW(ResultTimedOut); } // Check if waiting was canceled. if (thread->IsWaitCancelled()) { slp.CancelSleep(); thread->ClearWaitCancelled(); - return ResultCancelled; + R_THROW(ResultCancelled); } // Add the waiters. @@ -141,7 +141,7 @@ Result KSynchronizationObject::Wait(KernelCore& kernel_ctx, s32* out_index, *out_index = thread->GetSyncedIndex(); // Get the wait result. - return thread->GetWaitResult(); + R_RETURN(thread->GetWaitResult()); } KSynchronizationObject::KSynchronizationObject(KernelCore& kernel_) @@ -158,7 +158,7 @@ void KSynchronizationObject::NotifyAvailable(Result result) { } // Iterate over each thread. - for (auto* cur_node = thread_list_head; cur_node != nullptr; cur_node = cur_node->next) { + for (auto* cur_node = m_thread_list_head; cur_node != nullptr; cur_node = cur_node->next) { cur_node->thread->NotifyAvailable(this, result); } } @@ -169,7 +169,7 @@ std::vector KSynchronizationObject::GetWaitingThreadsForDebugging() co // If debugging, dump the list of waiters. { KScopedSchedulerLock lock(kernel); - for (auto* cur_node = thread_list_head; cur_node != nullptr; cur_node = cur_node->next) { + for (auto* cur_node = m_thread_list_head; cur_node != nullptr; cur_node = cur_node->next) { threads.emplace_back(cur_node->thread); } } diff --git a/src/core/hle/kernel/k_synchronization_object.h b/src/core/hle/kernel/k_synchronization_object.h index 8d8122ab7..d55a2673d 100644 --- a/src/core/hle/kernel/k_synchronization_object.h +++ b/src/core/hle/kernel/k_synchronization_object.h @@ -24,31 +24,30 @@ public: KThread* thread{}; }; - [[nodiscard]] static Result Wait(KernelCore& kernel, s32* out_index, - KSynchronizationObject** objects, const s32 num_objects, - s64 timeout); + static Result Wait(KernelCore& kernel, s32* out_index, KSynchronizationObject** objects, + const s32 num_objects, s64 timeout); void Finalize() override; - [[nodiscard]] virtual bool IsSignaled() const = 0; + virtual bool IsSignaled() const = 0; - [[nodiscard]] std::vector GetWaitingThreadsForDebugging() const; + std::vector GetWaitingThreadsForDebugging() const; void LinkNode(ThreadListNode* node_) { // Link the node to the list. - if (thread_list_tail == nullptr) { - thread_list_head = node_; + if (m_thread_list_tail == nullptr) { + m_thread_list_head = node_; } else { - thread_list_tail->next = node_; + m_thread_list_tail->next = node_; } - thread_list_tail = node_; + m_thread_list_tail = node_; } void UnlinkNode(ThreadListNode* node_) { // Unlink the node from the list. ThreadListNode* prev_ptr = - reinterpret_cast(std::addressof(thread_list_head)); + reinterpret_cast(std::addressof(m_thread_list_head)); ThreadListNode* prev_val = nullptr; ThreadListNode *prev, *tail_prev; @@ -59,8 +58,8 @@ public: prev_val = prev_ptr; } while (prev_ptr != node_); - if (thread_list_tail == node_) { - thread_list_tail = tail_prev; + if (m_thread_list_tail == node_) { + m_thread_list_tail = tail_prev; } prev->next = node_->next; @@ -78,8 +77,8 @@ protected: } private: - ThreadListNode* thread_list_head{}; - ThreadListNode* thread_list_tail{}; + ThreadListNode* m_thread_list_head{}; + ThreadListNode* m_thread_list_tail{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_transfer_memory.cpp b/src/core/hle/kernel/k_transfer_memory.cpp index faa5c73b5..c25cc2e39 100644 --- a/src/core/hle/kernel/k_transfer_memory.cpp +++ b/src/core/hle/kernel/k_transfer_memory.cpp @@ -16,18 +16,18 @@ KTransferMemory::~KTransferMemory() = default; Result KTransferMemory::Initialize(VAddr address_, std::size_t size_, Svc::MemoryPermission owner_perm_) { // Set members. - owner = GetCurrentProcessPointer(kernel); + m_owner = GetCurrentProcessPointer(kernel); // TODO(bunnei): Lock for transfer memory // Set remaining tracking members. - owner->Open(); - owner_perm = owner_perm_; - address = address_; - size = size_; - is_initialized = true; + m_owner->Open(); + m_owner_perm = owner_perm_; + m_address = address_; + m_size = size_; + m_is_initialized = true; - return ResultSuccess; + R_SUCCEED(); } void KTransferMemory::Finalize() { diff --git a/src/core/hle/kernel/k_transfer_memory.h b/src/core/hle/kernel/k_transfer_memory.h index 85d508ee7..9a37bd903 100644 --- a/src/core/hle/kernel/k_transfer_memory.h +++ b/src/core/hle/kernel/k_transfer_memory.h @@ -31,33 +31,33 @@ public: void Finalize() override; bool IsInitialized() const override { - return is_initialized; + return m_is_initialized; } uintptr_t GetPostDestroyArgument() const override { - return reinterpret_cast(owner); + return reinterpret_cast(m_owner); } static void PostDestroy(uintptr_t arg); KProcess* GetOwner() const override { - return owner; + return m_owner; } VAddr GetSourceAddress() const { - return address; + return m_address; } size_t GetSize() const { - return is_initialized ? size : 0; + return m_is_initialized ? m_size : 0; } private: - KProcess* owner{}; - VAddr address{}; - Svc::MemoryPermission owner_perm{}; - size_t size{}; - bool is_initialized{}; + KProcess* m_owner{}; + VAddr m_address{}; + Svc::MemoryPermission m_owner_perm{}; + size_t m_size{}; + bool m_is_initialized{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/physical_core.cpp b/src/core/hle/kernel/physical_core.cpp index 3044922ac..2e0c36129 100644 --- a/src/core/hle/kernel/physical_core.cpp +++ b/src/core/hle/kernel/physical_core.cpp @@ -10,14 +10,14 @@ namespace Kernel { -PhysicalCore::PhysicalCore(std::size_t core_index_, Core::System& system_, KScheduler& scheduler_) - : core_index{core_index_}, system{system_}, scheduler{scheduler_} { +PhysicalCore::PhysicalCore(std::size_t core_index, Core::System& system, KScheduler& scheduler) + : m_core_index{core_index}, m_system{system}, m_scheduler{scheduler} { #if defined(ARCHITECTURE_x86_64) || defined(ARCHITECTURE_arm64) // TODO(bunnei): Initialization relies on a core being available. We may later replace this with // a 32-bit instance of Dynarmic. This should be abstracted out to a CPU manager. auto& kernel = system.Kernel(); - arm_interface = std::make_unique( - system, kernel.IsMulticore(), kernel.GetExclusiveMonitor(), core_index); + m_arm_interface = std::make_unique( + system, kernel.IsMulticore(), kernel.GetExclusiveMonitor(), m_core_index); #else #error Platform not supported yet. #endif @@ -25,13 +25,13 @@ PhysicalCore::PhysicalCore(std::size_t core_index_, Core::System& system_, KSche PhysicalCore::~PhysicalCore() = default; -void PhysicalCore::Initialize([[maybe_unused]] bool is_64_bit) { +void PhysicalCore::Initialize(bool is_64_bit) { #if defined(ARCHITECTURE_x86_64) || defined(ARCHITECTURE_arm64) - auto& kernel = system.Kernel(); + auto& kernel = m_system.Kernel(); if (!is_64_bit) { // We already initialized a 64-bit core, replace with a 32-bit one. - arm_interface = std::make_unique( - system, kernel.IsMulticore(), kernel.GetExclusiveMonitor(), core_index); + m_arm_interface = std::make_unique( + m_system, kernel.IsMulticore(), kernel.GetExclusiveMonitor(), m_core_index); } #else #error Platform not supported yet. @@ -39,31 +39,30 @@ void PhysicalCore::Initialize([[maybe_unused]] bool is_64_bit) { } void PhysicalCore::Run() { - arm_interface->Run(); - arm_interface->ClearExclusiveState(); + m_arm_interface->Run(); + m_arm_interface->ClearExclusiveState(); } void PhysicalCore::Idle() { - std::unique_lock lk{guard}; - on_interrupt.wait(lk, [this] { return is_interrupted; }); + std::unique_lock lk{m_guard}; + m_on_interrupt.wait(lk, [this] { return m_is_interrupted; }); } bool PhysicalCore::IsInterrupted() const { - return is_interrupted; + return m_is_interrupted; } void PhysicalCore::Interrupt() { - std::unique_lock lk{guard}; - is_interrupted = true; - arm_interface->SignalInterrupt(); - on_interrupt.notify_all(); + std::unique_lock lk{m_guard}; + m_is_interrupted = true; + m_arm_interface->SignalInterrupt(); + m_on_interrupt.notify_all(); } void PhysicalCore::ClearInterrupt() { - std::unique_lock lk{guard}; - is_interrupted = false; - arm_interface->ClearInterrupt(); - on_interrupt.notify_all(); + std::unique_lock lk{m_guard}; + m_is_interrupted = false; + m_arm_interface->ClearInterrupt(); } } // namespace Kernel diff --git a/src/core/hle/kernel/physical_core.h b/src/core/hle/kernel/physical_core.h index fb8e7933e..5cb398fdc 100644 --- a/src/core/hle/kernel/physical_core.h +++ b/src/core/hle/kernel/physical_core.h @@ -47,46 +47,38 @@ public: bool IsInterrupted() const; bool IsInitialized() const { - return arm_interface != nullptr; + return m_arm_interface != nullptr; } Core::ARM_Interface& ArmInterface() { - return *arm_interface; + return *m_arm_interface; } const Core::ARM_Interface& ArmInterface() const { - return *arm_interface; - } - - bool IsMainCore() const { - return core_index == 0; - } - - bool IsSystemCore() const { - return core_index == 3; + return *m_arm_interface; } std::size_t CoreIndex() const { - return core_index; + return m_core_index; } Kernel::KScheduler& Scheduler() { - return scheduler; + return m_scheduler; } const Kernel::KScheduler& Scheduler() const { - return scheduler; + return m_scheduler; } private: - const std::size_t core_index; - Core::System& system; - Kernel::KScheduler& scheduler; + const std::size_t m_core_index; + Core::System& m_system; + Kernel::KScheduler& m_scheduler; - std::mutex guard; - std::condition_variable on_interrupt; - std::unique_ptr arm_interface; - bool is_interrupted{}; + std::mutex m_guard; + std::condition_variable m_on_interrupt; + std::unique_ptr m_arm_interface; + bool m_is_interrupted{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/slab_helpers.h b/src/core/hle/kernel/slab_helpers.h index 0228ce188..b9f5066de 100644 --- a/src/core/hle/kernel/slab_helpers.h +++ b/src/core/hle/kernel/slab_helpers.h @@ -132,7 +132,7 @@ protected: template class KAutoObjectWithSlabHeapAndContainer : public Base { - static_assert(std::is_base_of::value); + static_assert(std::is_base_of_v); private: static Derived* Allocate(KernelCore& kernel) { @@ -144,18 +144,18 @@ private: } public: - KAutoObjectWithSlabHeapAndContainer(KernelCore& kernel_) : Base(kernel_), kernel(kernel_) {} + KAutoObjectWithSlabHeapAndContainer(KernelCore& kernel_) : Base(kernel_) {} virtual ~KAutoObjectWithSlabHeapAndContainer() {} virtual void Destroy() override { const bool is_initialized = this->IsInitialized(); uintptr_t arg = 0; if (is_initialized) { - kernel.ObjectListContainer().Unregister(this); + Base::kernel.ObjectListContainer().Unregister(this); arg = this->GetPostDestroyArgument(); this->Finalize(); } - Free(kernel, static_cast(this)); + Free(Base::kernel, static_cast(this)); if (is_initialized) { Derived::PostDestroy(arg); } @@ -169,7 +169,7 @@ public: } size_t GetSlabIndex() const { - return SlabHeap(kernel).GetObjectIndex(static_cast(this)); + return SlabHeap(Base::kernel).GetObjectIndex(static_cast(this)); } public: @@ -209,9 +209,6 @@ public: static size_t GetNumRemaining(KernelCore& kernel) { return kernel.SlabHeap().GetNumRemaining(); } - -protected: - KernelCore& kernel; }; } // namespace Kernel From 91fd4e30f2a12868201b08e73de299db1c3d116a Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 7 Mar 2023 00:13:05 -0500 Subject: [PATCH 0173/1181] kernel/svc: convert to new style --- src/core/hle/kernel/k_readable_event.cpp | 10 +- src/core/hle/kernel/k_resource_limit.cpp | 2 +- src/core/hle/kernel/k_server_session.cpp | 4 +- .../hle/kernel/svc/svc_address_arbiter.cpp | 45 +++----- src/core/hle/kernel/svc/svc_code_memory.cpp | 10 +- .../hle/kernel/svc/svc_condition_variable.cpp | 15 +-- src/core/hle/kernel/svc/svc_event.cpp | 20 ++-- src/core/hle/kernel/svc/svc_info.cpp | 101 +++++++----------- src/core/hle/kernel/svc/svc_ipc.cpp | 6 +- src/core/hle/kernel/svc/svc_lock.cpp | 27 ++--- src/core/hle/kernel/svc/svc_memory.cpp | 30 +++--- .../hle/kernel/svc/svc_physical_memory.cpp | 36 +++---- src/core/hle/kernel/svc/svc_process.cpp | 14 +-- .../hle/kernel/svc/svc_process_memory.cpp | 50 ++++----- src/core/hle/kernel/svc/svc_query_memory.cpp | 6 +- .../hle/kernel/svc/svc_resource_limit.cpp | 12 +-- src/core/hle/kernel/svc/svc_session.cpp | 18 ++-- src/core/hle/kernel/svc/svc_shared_memory.cpp | 13 +-- .../hle/kernel/svc/svc_synchronization.cpp | 12 +-- src/core/hle/kernel/svc/svc_thread.cpp | 61 ++++------- .../hle/kernel/svc/svc_transfer_memory.cpp | 4 +- 21 files changed, 192 insertions(+), 304 deletions(-) diff --git a/src/core/hle/kernel/k_readable_event.cpp b/src/core/hle/kernel/k_readable_event.cpp index 5c942d47c..eeac678e4 100644 --- a/src/core/hle/kernel/k_readable_event.cpp +++ b/src/core/hle/kernel/k_readable_event.cpp @@ -48,24 +48,22 @@ Result KReadableEvent::Signal() { this->NotifyAvailable(); } - return ResultSuccess; + R_SUCCEED(); } Result KReadableEvent::Clear() { this->Reset(); - return ResultSuccess; + R_SUCCEED(); } Result KReadableEvent::Reset() { KScopedSchedulerLock lk{kernel}; - if (!m_is_signaled) { - return ResultInvalidState; - } + R_UNLESS(m_is_signaled, ResultInvalidState); m_is_signaled = false; - return ResultSuccess; + R_SUCCEED(); } } // namespace Kernel diff --git a/src/core/hle/kernel/k_resource_limit.cpp b/src/core/hle/kernel/k_resource_limit.cpp index 626517619..2847da291 100644 --- a/src/core/hle/kernel/k_resource_limit.cpp +++ b/src/core/hle/kernel/k_resource_limit.cpp @@ -82,7 +82,7 @@ Result KResourceLimit::SetLimitValue(LimitableResource which, s64 value) { limit_values[index] = value; peak_values[index] = current_values[index]; - return ResultSuccess; + R_SUCCEED(); } bool KResourceLimit::Reserve(LimitableResource which, s64 value) { diff --git a/src/core/hle/kernel/k_server_session.cpp b/src/core/hle/kernel/k_server_session.cpp index 6831243b5..c68ec09ce 100644 --- a/src/core/hle/kernel/k_server_session.cpp +++ b/src/core/hle/kernel/k_server_session.cpp @@ -272,7 +272,7 @@ Result KServerSession::SendReply(bool is_hle) { } } - return result; + R_RETURN(result); } Result KServerSession::ReceiveRequest(std::shared_ptr* out_context, @@ -339,7 +339,7 @@ Result KServerSession::ReceiveRequest(std::shared_ptrClose(); }); // Verify that the region is in range. R_UNLESS(GetCurrentProcess(system.Kernel()).PageTable().Contains(address, size), @@ -58,9 +60,7 @@ Result CreateCodeMemory(Core::System& system, Handle* out, VAddr address, uint64 // Add the code memory to the handle table. R_TRY(GetCurrentProcess(system.Kernel()).GetHandleTable().Add(out, code_mem)); - code_mem->Close(); - - return ResultSuccess; + R_SUCCEED(); } Result ControlCodeMemory(Core::System& system, Handle code_memory_handle, @@ -140,10 +140,10 @@ Result ControlCodeMemory(Core::System& system, Handle code_memory_handle, R_TRY(code_mem->UnmapFromOwner(address, size)); } break; default: - return ResultInvalidEnumValue; + R_THROW(ResultInvalidEnumValue); } - return ResultSuccess; + R_SUCCEED(); } Result CreateCodeMemory64(Core::System& system, Handle* out_handle, uint64_t address, diff --git a/src/core/hle/kernel/svc/svc_condition_variable.cpp b/src/core/hle/kernel/svc/svc_condition_variable.cpp index 8ad1a0b8f..648ed23d0 100644 --- a/src/core/hle/kernel/svc/svc_condition_variable.cpp +++ b/src/core/hle/kernel/svc/svc_condition_variable.cpp @@ -17,14 +17,8 @@ Result WaitProcessWideKeyAtomic(Core::System& system, VAddr address, VAddr cv_ke cv_key, tag, timeout_ns); // Validate input. - if (IsKernelAddress(address)) { - LOG_ERROR(Kernel_SVC, "Attempted to wait on kernel address (address={:08X})", address); - return ResultInvalidCurrentMemory; - } - if (!Common::IsAligned(address, sizeof(s32))) { - LOG_ERROR(Kernel_SVC, "Address must be 4 byte aligned (address={:08X})", address); - return ResultInvalidAddress; - } + R_UNLESS(!IsKernelAddress(address), ResultInvalidCurrentMemory); + R_UNLESS(Common::IsAligned(address, sizeof(s32)), ResultInvalidAddress); // Convert timeout from nanoseconds to ticks. s64 timeout{}; @@ -43,8 +37,9 @@ Result WaitProcessWideKeyAtomic(Core::System& system, VAddr address, VAddr cv_ke } // Wait on the condition variable. - return GetCurrentProcess(system.Kernel()) - .WaitConditionVariable(address, Common::AlignDown(cv_key, sizeof(u32)), tag, timeout); + R_RETURN( + GetCurrentProcess(system.Kernel()) + .WaitConditionVariable(address, Common::AlignDown(cv_key, sizeof(u32)), tag, timeout)); } /// Signal process wide key diff --git a/src/core/hle/kernel/svc/svc_event.cpp b/src/core/hle/kernel/svc/svc_event.cpp index 8692b00f2..901202e6a 100644 --- a/src/core/hle/kernel/svc/svc_event.cpp +++ b/src/core/hle/kernel/svc/svc_event.cpp @@ -21,7 +21,7 @@ Result SignalEvent(Core::System& system, Handle event_handle) { KScopedAutoObject event = handle_table.GetObject(event_handle); R_UNLESS(event.IsNotNull(), ResultInvalidHandle); - return event->Signal(); + R_RETURN(event->Signal()); } Result ClearEvent(Core::System& system, Handle event_handle) { @@ -34,7 +34,7 @@ Result ClearEvent(Core::System& system, Handle event_handle) { { KScopedAutoObject event = handle_table.GetObject(event_handle); if (event.IsNotNull()) { - return event->Clear(); + R_RETURN(event->Clear()); } } @@ -42,13 +42,11 @@ Result ClearEvent(Core::System& system, Handle event_handle) { { KScopedAutoObject readable_event = handle_table.GetObject(event_handle); if (readable_event.IsNotNull()) { - return readable_event->Clear(); + R_RETURN(readable_event->Clear()); } } - LOG_ERROR(Kernel_SVC, "Event handle does not exist, event_handle=0x{:08X}", event_handle); - - return ResultInvalidHandle; + R_THROW(ResultInvalidHandle); } Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_read) { @@ -86,14 +84,12 @@ Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_read) { R_TRY(handle_table.Add(out_write, event)); // Ensure that we maintain a clean handle state on exit. - auto handle_guard = SCOPE_GUARD({ handle_table.Remove(*out_write); }); + ON_RESULT_FAILURE { + handle_table.Remove(*out_write); + }; // Add the readable event to the handle table. - R_TRY(handle_table.Add(out_read, std::addressof(event->GetReadableEvent()))); - - // We succeeded. - handle_guard.Cancel(); - return ResultSuccess; + R_RETURN(handle_table.Add(out_read, std::addressof(event->GetReadableEvent()))); } Result SignalEvent64(Core::System& system, Handle event_handle) { diff --git a/src/core/hle/kernel/svc/svc_info.cpp b/src/core/hle/kernel/svc/svc_info.cpp index cbed4dc8c..806acb539 100644 --- a/src/core/hle/kernel/svc/svc_info.cpp +++ b/src/core/hle/kernel/svc/svc_info.cpp @@ -38,126 +38,110 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle case InfoType::UsedNonSystemMemorySize: case InfoType::IsApplication: case InfoType::FreeThreadCount: { - if (info_sub_id != 0) { - LOG_ERROR(Kernel_SVC, "Info sub id is non zero! info_id={}, info_sub_id={}", info_id, - info_sub_id); - return ResultInvalidEnumValue; - } + R_UNLESS(info_sub_id == 0, ResultInvalidEnumValue); const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable(); KScopedAutoObject process = handle_table.GetObject(handle); - if (process.IsNull()) { - LOG_ERROR(Kernel_SVC, "Process is not valid! info_id={}, info_sub_id={}, handle={:08X}", - info_id, info_sub_id, handle); - return ResultInvalidHandle; - } + R_UNLESS(process.IsNotNull(), ResultInvalidHandle); switch (info_id_type) { case InfoType::CoreMask: *result = process->GetCoreMask(); - return ResultSuccess; + R_SUCCEED(); case InfoType::PriorityMask: *result = process->GetPriorityMask(); - return ResultSuccess; + R_SUCCEED(); case InfoType::AliasRegionAddress: *result = process->PageTable().GetAliasRegionStart(); - return ResultSuccess; + R_SUCCEED(); case InfoType::AliasRegionSize: *result = process->PageTable().GetAliasRegionSize(); - return ResultSuccess; + R_SUCCEED(); case InfoType::HeapRegionAddress: *result = process->PageTable().GetHeapRegionStart(); - return ResultSuccess; + R_SUCCEED(); case InfoType::HeapRegionSize: *result = process->PageTable().GetHeapRegionSize(); - return ResultSuccess; + R_SUCCEED(); case InfoType::AslrRegionAddress: *result = process->PageTable().GetAliasCodeRegionStart(); - return ResultSuccess; + R_SUCCEED(); case InfoType::AslrRegionSize: *result = process->PageTable().GetAliasCodeRegionSize(); - return ResultSuccess; + R_SUCCEED(); case InfoType::StackRegionAddress: *result = process->PageTable().GetStackRegionStart(); - return ResultSuccess; + R_SUCCEED(); case InfoType::StackRegionSize: *result = process->PageTable().GetStackRegionSize(); - return ResultSuccess; + R_SUCCEED(); case InfoType::TotalMemorySize: *result = process->GetTotalPhysicalMemoryAvailable(); - return ResultSuccess; + R_SUCCEED(); case InfoType::UsedMemorySize: *result = process->GetTotalPhysicalMemoryUsed(); - return ResultSuccess; + R_SUCCEED(); case InfoType::SystemResourceSizeTotal: *result = process->GetSystemResourceSize(); - return ResultSuccess; + R_SUCCEED(); case InfoType::SystemResourceSizeUsed: LOG_WARNING(Kernel_SVC, "(STUBBED) Attempted to query system resource usage"); *result = process->GetSystemResourceUsage(); - return ResultSuccess; + R_SUCCEED(); case InfoType::ProgramId: *result = process->GetProgramID(); - return ResultSuccess; + R_SUCCEED(); case InfoType::UserExceptionContextAddress: *result = process->GetProcessLocalRegionAddress(); - return ResultSuccess; + R_SUCCEED(); case InfoType::TotalNonSystemMemorySize: *result = process->GetTotalPhysicalMemoryAvailableWithoutSystemResource(); - return ResultSuccess; + R_SUCCEED(); case InfoType::UsedNonSystemMemorySize: *result = process->GetTotalPhysicalMemoryUsedWithoutSystemResource(); - return ResultSuccess; + R_SUCCEED(); case InfoType::IsApplication: LOG_WARNING(Kernel_SVC, "(STUBBED) Assuming process is application"); *result = true; - return ResultSuccess; + R_SUCCEED(); case InfoType::FreeThreadCount: *result = process->GetFreeThreadCount(); - return ResultSuccess; + R_SUCCEED(); default: break; } LOG_ERROR(Kernel_SVC, "Unimplemented svcGetInfo id=0x{:016X}", info_id); - return ResultInvalidEnumValue; + R_THROW(ResultInvalidEnumValue); } case InfoType::DebuggerAttached: *result = 0; - return ResultSuccess; + R_SUCCEED(); case InfoType::ResourceLimit: { - if (handle != 0) { - LOG_ERROR(Kernel, "Handle is non zero! handle={:08X}", handle); - return ResultInvalidHandle; - } - - if (info_sub_id != 0) { - LOG_ERROR(Kernel, "Info sub id is non zero! info_id={}, info_sub_id={}", info_id, - info_sub_id); - return ResultInvalidCombination; - } + R_UNLESS(handle == 0, ResultInvalidHandle); + R_UNLESS(info_sub_id == 0, ResultInvalidCombination); KProcess* const current_process = GetCurrentProcessPointer(system.Kernel()); KHandleTable& handle_table = current_process->GetHandleTable(); @@ -165,44 +149,35 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle if (!resource_limit) { *result = Svc::InvalidHandle; // Yes, the kernel considers this a successful operation. - return ResultSuccess; + R_SUCCEED(); } Handle resource_handle{}; R_TRY(handle_table.Add(&resource_handle, resource_limit)); *result = resource_handle; - return ResultSuccess; + R_SUCCEED(); } case InfoType::RandomEntropy: - if (handle != 0) { - LOG_ERROR(Kernel_SVC, "Process Handle is non zero, expected 0 result but got {:016X}", - handle); - return ResultInvalidHandle; - } - - if (info_sub_id >= KProcess::RANDOM_ENTROPY_SIZE) { - LOG_ERROR(Kernel_SVC, "Entropy size is out of range, expected {} but got {}", - KProcess::RANDOM_ENTROPY_SIZE, info_sub_id); - return ResultInvalidCombination; - } + R_UNLESS(handle == 0, ResultInvalidHandle); + R_UNLESS(info_sub_id < KProcess::RANDOM_ENTROPY_SIZE, ResultInvalidCombination); *result = GetCurrentProcess(system.Kernel()).GetRandomEntropy(info_sub_id); - return ResultSuccess; + R_SUCCEED(); case InfoType::InitialProcessIdRange: LOG_WARNING(Kernel_SVC, "(STUBBED) Attempted to query privileged process id bounds, returned 0"); *result = 0; - return ResultSuccess; + R_SUCCEED(); case InfoType::ThreadTickCount: { constexpr u64 num_cpus = 4; if (info_sub_id != 0xFFFFFFFFFFFFFFFF && info_sub_id >= num_cpus) { LOG_ERROR(Kernel_SVC, "Core count is out of range, expected {} but got {}", num_cpus, info_sub_id); - return ResultInvalidCombination; + R_THROW(ResultInvalidCombination); } KScopedAutoObject thread = GetCurrentProcess(system.Kernel()) @@ -211,7 +186,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle if (thread.IsNull()) { LOG_ERROR(Kernel_SVC, "Thread handle does not exist, handle=0x{:08X}", static_cast(handle)); - return ResultInvalidHandle; + R_THROW(ResultInvalidHandle); } const auto& core_timing = system.CoreTiming(); @@ -230,7 +205,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle } *result = out_ticks; - return ResultSuccess; + R_SUCCEED(); } case InfoType::IdleTickCount: { // Verify the input handle is invalid. @@ -244,7 +219,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle // Get the idle tick count. *result = system.Kernel().CurrentScheduler()->GetIdleThread()->GetCpuTime(); - return ResultSuccess; + R_SUCCEED(); } case InfoType::MesosphereCurrentProcess: { // Verify the input handle is invalid. @@ -265,11 +240,11 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle *result = tmp; // We succeeded. - return ResultSuccess; + R_SUCCEED(); } default: LOG_ERROR(Kernel_SVC, "Unimplemented svcGetInfo id=0x{:016X}", info_id); - return ResultInvalidEnumValue; + R_THROW(ResultInvalidEnumValue); } } diff --git a/src/core/hle/kernel/svc/svc_ipc.cpp b/src/core/hle/kernel/svc/svc_ipc.cpp index a7a2c3b92..bca303650 100644 --- a/src/core/hle/kernel/svc/svc_ipc.cpp +++ b/src/core/hle/kernel/svc/svc_ipc.cpp @@ -19,7 +19,7 @@ Result SendSyncRequest(Core::System& system, Handle handle) { LOG_TRACE(Kernel_SVC, "called handle=0x{:08X}({})", handle, session->GetName()); - return session->SendSyncRequest(); + R_RETURN(session->SendSyncRequest()); } Result SendSyncRequestWithUserBuffer(Core::System& system, uint64_t message_buffer, @@ -82,7 +82,7 @@ Result ReplyAndReceive(Core::System& system, s32* out_index, uint64_t handles_ad Result result = KSynchronizationObject::Wait(kernel, &index, objs.data(), static_cast(objs.size()), timeout_ns); if (result == ResultTimedOut) { - return result; + R_RETURN(result); } // Receive the request. @@ -97,7 +97,7 @@ Result ReplyAndReceive(Core::System& system, s32* out_index, uint64_t handles_ad } *out_index = index; - return result; + R_RETURN(result); } } diff --git a/src/core/hle/kernel/svc/svc_lock.cpp b/src/core/hle/kernel/svc/svc_lock.cpp index f3d3e140b..3681279d6 100644 --- a/src/core/hle/kernel/svc/svc_lock.cpp +++ b/src/core/hle/kernel/svc/svc_lock.cpp @@ -14,17 +14,10 @@ Result ArbitrateLock(Core::System& system, Handle thread_handle, VAddr address, thread_handle, address, tag); // Validate the input address. - if (IsKernelAddress(address)) { - LOG_ERROR(Kernel_SVC, "Attempting to arbitrate a lock on a kernel address (address={:08X})", - address); - return ResultInvalidCurrentMemory; - } - if (!Common::IsAligned(address, sizeof(u32))) { - LOG_ERROR(Kernel_SVC, "Input address must be 4 byte aligned (address: {:08X})", address); - return ResultInvalidAddress; - } + R_UNLESS(!IsKernelAddress(address), ResultInvalidCurrentMemory); + R_UNLESS(Common::IsAligned(address, sizeof(u32)), ResultInvalidAddress); - return GetCurrentProcess(system.Kernel()).WaitForAddress(thread_handle, address, tag); + R_RETURN(GetCurrentProcess(system.Kernel()).WaitForAddress(thread_handle, address, tag)); } /// Unlock a mutex @@ -32,18 +25,10 @@ Result ArbitrateUnlock(Core::System& system, VAddr address) { LOG_TRACE(Kernel_SVC, "called address=0x{:X}", address); // Validate the input address. - if (IsKernelAddress(address)) { - LOG_ERROR(Kernel_SVC, - "Attempting to arbitrate an unlock on a kernel address (address={:08X})", - address); - return ResultInvalidCurrentMemory; - } - if (!Common::IsAligned(address, sizeof(u32))) { - LOG_ERROR(Kernel_SVC, "Input address must be 4 byte aligned (address: {:08X})", address); - return ResultInvalidAddress; - } + R_UNLESS(!IsKernelAddress(address), ResultInvalidCurrentMemory); + R_UNLESS(Common::IsAligned(address, sizeof(u32)), ResultInvalidAddress); - return GetCurrentProcess(system.Kernel()).SignalToAddress(address); + R_RETURN(GetCurrentProcess(system.Kernel()).SignalToAddress(address)); } Result ArbitrateLock64(Core::System& system, Handle thread_handle, uint64_t address, uint32_t tag) { diff --git a/src/core/hle/kernel/svc/svc_memory.cpp b/src/core/hle/kernel/svc/svc_memory.cpp index 214bcd073..4db25a3b7 100644 --- a/src/core/hle/kernel/svc/svc_memory.cpp +++ b/src/core/hle/kernel/svc/svc_memory.cpp @@ -33,49 +33,49 @@ Result MapUnmapMemorySanityChecks(const KPageTable& manager, VAddr dst_addr, VAd u64 size) { if (!Common::Is4KBAligned(dst_addr)) { LOG_ERROR(Kernel_SVC, "Destination address is not aligned to 4KB, 0x{:016X}", dst_addr); - return ResultInvalidAddress; + R_THROW(ResultInvalidAddress); } if (!Common::Is4KBAligned(src_addr)) { LOG_ERROR(Kernel_SVC, "Source address is not aligned to 4KB, 0x{:016X}", src_addr); - return ResultInvalidSize; + R_THROW(ResultInvalidSize); } if (size == 0) { LOG_ERROR(Kernel_SVC, "Size is 0"); - return ResultInvalidSize; + R_THROW(ResultInvalidSize); } if (!Common::Is4KBAligned(size)) { LOG_ERROR(Kernel_SVC, "Size is not aligned to 4KB, 0x{:016X}", size); - return ResultInvalidSize; + R_THROW(ResultInvalidSize); } if (!IsValidAddressRange(dst_addr, size)) { LOG_ERROR(Kernel_SVC, "Destination is not a valid address range, addr=0x{:016X}, size=0x{:016X}", dst_addr, size); - return ResultInvalidCurrentMemory; + R_THROW(ResultInvalidCurrentMemory); } if (!IsValidAddressRange(src_addr, size)) { LOG_ERROR(Kernel_SVC, "Source is not a valid address range, addr=0x{:016X}, size=0x{:016X}", src_addr, size); - return ResultInvalidCurrentMemory; + R_THROW(ResultInvalidCurrentMemory); } if (!manager.IsInsideAddressSpace(src_addr, size)) { LOG_ERROR(Kernel_SVC, "Source is not within the address space, addr=0x{:016X}, size=0x{:016X}", src_addr, size); - return ResultInvalidCurrentMemory; + R_THROW(ResultInvalidCurrentMemory); } if (manager.IsOutsideStackRegion(dst_addr, size)) { LOG_ERROR(Kernel_SVC, "Destination is not within the stack region, addr=0x{:016X}, size=0x{:016X}", dst_addr, size); - return ResultInvalidMemoryRegion; + R_THROW(ResultInvalidMemoryRegion); } if (manager.IsInsideHeapRegion(dst_addr, size)) { @@ -83,7 +83,7 @@ Result MapUnmapMemorySanityChecks(const KPageTable& manager, VAddr dst_addr, VAd "Destination does not fit within the heap region, addr=0x{:016X}, " "size=0x{:016X}", dst_addr, size); - return ResultInvalidMemoryRegion; + R_THROW(ResultInvalidMemoryRegion); } if (manager.IsInsideAliasRegion(dst_addr, size)) { @@ -91,10 +91,10 @@ Result MapUnmapMemorySanityChecks(const KPageTable& manager, VAddr dst_addr, VAd "Destination does not fit within the map region, addr=0x{:016X}, " "size=0x{:016X}", dst_addr, size); - return ResultInvalidMemoryRegion; + R_THROW(ResultInvalidMemoryRegion); } - return ResultSuccess; + R_SUCCEED(); } } // namespace @@ -117,7 +117,7 @@ Result SetMemoryPermission(Core::System& system, VAddr address, u64 size, Memory R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory); // Set the memory attribute. - return page_table.SetMemoryPermission(address, size, perm); + R_RETURN(page_table.SetMemoryPermission(address, size, perm)); } Result SetMemoryAttribute(Core::System& system, VAddr address, u64 size, u32 mask, u32 attr) { @@ -141,7 +141,7 @@ Result SetMemoryAttribute(Core::System& system, VAddr address, u64 size, u32 mas R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory); // Set the memory attribute. - return page_table.SetMemoryAttribute(address, size, mask, attr); + R_RETURN(page_table.SetMemoryAttribute(address, size, mask, attr)); } /// Maps a memory range into a different range. @@ -156,7 +156,7 @@ Result MapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size) return result; } - return page_table.MapMemory(dst_addr, src_addr, size); + R_RETURN(page_table.MapMemory(dst_addr, src_addr, size)); } /// Unmaps a region that was previously mapped with svcMapMemory @@ -171,7 +171,7 @@ Result UnmapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 siz return result; } - return page_table.UnmapMemory(dst_addr, src_addr, size); + R_RETURN(page_table.UnmapMemory(dst_addr, src_addr, size)); } Result SetMemoryPermission64(Core::System& system, uint64_t address, uint64_t size, diff --git a/src/core/hle/kernel/svc/svc_physical_memory.cpp b/src/core/hle/kernel/svc/svc_physical_memory.cpp index ed6a624ac..63196e1ed 100644 --- a/src/core/hle/kernel/svc/svc_physical_memory.cpp +++ b/src/core/hle/kernel/svc/svc_physical_memory.cpp @@ -16,9 +16,7 @@ Result SetHeapSize(Core::System& system, VAddr* out_address, u64 size) { R_UNLESS(size < MainMemorySizeMax, ResultInvalidSize); // Set the heap size. - R_TRY(GetCurrentProcess(system.Kernel()).PageTable().SetHeapSize(out_address, size)); - - return ResultSuccess; + R_RETURN(GetCurrentProcess(system.Kernel()).PageTable().SetHeapSize(out_address, size)); } /// Maps memory at a desired address @@ -27,22 +25,22 @@ Result MapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { if (!Common::Is4KBAligned(addr)) { LOG_ERROR(Kernel_SVC, "Address is not aligned to 4KB, 0x{:016X}", addr); - return ResultInvalidAddress; + R_THROW(ResultInvalidAddress); } if (!Common::Is4KBAligned(size)) { LOG_ERROR(Kernel_SVC, "Size is not aligned to 4KB, 0x{:X}", size); - return ResultInvalidSize; + R_THROW(ResultInvalidSize); } if (size == 0) { LOG_ERROR(Kernel_SVC, "Size is zero"); - return ResultInvalidSize; + R_THROW(ResultInvalidSize); } if (!(addr < addr + size)) { LOG_ERROR(Kernel_SVC, "Size causes 64-bit overflow of address"); - return ResultInvalidMemoryRegion; + R_THROW(ResultInvalidMemoryRegion); } KProcess* const current_process{GetCurrentProcessPointer(system.Kernel())}; @@ -50,24 +48,24 @@ Result MapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { if (current_process->GetSystemResourceSize() == 0) { LOG_ERROR(Kernel_SVC, "System Resource Size is zero"); - return ResultInvalidState; + R_THROW(ResultInvalidState); } if (!page_table.IsInsideAddressSpace(addr, size)) { LOG_ERROR(Kernel_SVC, "Address is not within the address space, addr=0x{:016X}, size=0x{:016X}", addr, size); - return ResultInvalidMemoryRegion; + R_THROW(ResultInvalidMemoryRegion); } if (page_table.IsOutsideAliasRegion(addr, size)) { LOG_ERROR(Kernel_SVC, "Address is not within the alias region, addr=0x{:016X}, size=0x{:016X}", addr, size); - return ResultInvalidMemoryRegion; + R_THROW(ResultInvalidMemoryRegion); } - return page_table.MapPhysicalMemory(addr, size); + R_RETURN(page_table.MapPhysicalMemory(addr, size)); } /// Unmaps memory previously mapped via MapPhysicalMemory @@ -76,22 +74,22 @@ Result UnmapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { if (!Common::Is4KBAligned(addr)) { LOG_ERROR(Kernel_SVC, "Address is not aligned to 4KB, 0x{:016X}", addr); - return ResultInvalidAddress; + R_THROW(ResultInvalidAddress); } if (!Common::Is4KBAligned(size)) { LOG_ERROR(Kernel_SVC, "Size is not aligned to 4KB, 0x{:X}", size); - return ResultInvalidSize; + R_THROW(ResultInvalidSize); } if (size == 0) { LOG_ERROR(Kernel_SVC, "Size is zero"); - return ResultInvalidSize; + R_THROW(ResultInvalidSize); } if (!(addr < addr + size)) { LOG_ERROR(Kernel_SVC, "Size causes 64-bit overflow of address"); - return ResultInvalidMemoryRegion; + R_THROW(ResultInvalidMemoryRegion); } KProcess* const current_process{GetCurrentProcessPointer(system.Kernel())}; @@ -99,24 +97,24 @@ Result UnmapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { if (current_process->GetSystemResourceSize() == 0) { LOG_ERROR(Kernel_SVC, "System Resource Size is zero"); - return ResultInvalidState; + R_THROW(ResultInvalidState); } if (!page_table.IsInsideAddressSpace(addr, size)) { LOG_ERROR(Kernel_SVC, "Address is not within the address space, addr=0x{:016X}, size=0x{:016X}", addr, size); - return ResultInvalidMemoryRegion; + R_THROW(ResultInvalidMemoryRegion); } if (page_table.IsOutsideAliasRegion(addr, size)) { LOG_ERROR(Kernel_SVC, "Address is not within the alias region, addr=0x{:016X}, size=0x{:016X}", addr, size); - return ResultInvalidMemoryRegion; + R_THROW(ResultInvalidMemoryRegion); } - return page_table.UnmapPhysicalMemory(addr, size); + R_RETURN(page_table.UnmapPhysicalMemory(addr, size)); } Result MapPhysicalMemoryUnsafe(Core::System& system, uint64_t address, uint64_t size) { diff --git a/src/core/hle/kernel/svc/svc_process.cpp b/src/core/hle/kernel/svc/svc_process.cpp index c35d2be76..e4149fba9 100644 --- a/src/core/hle/kernel/svc/svc_process.cpp +++ b/src/core/hle/kernel/svc/svc_process.cpp @@ -47,7 +47,7 @@ Result GetProcessId(Core::System& system, u64* out_process_id, Handle handle) { // Get the process id. *out_process_id = process->GetId(); - return ResultSuccess; + R_SUCCEED(); } Result GetProcessList(Core::System& system, s32* out_num_processes, VAddr out_process_ids, @@ -60,7 +60,7 @@ Result GetProcessList(Core::System& system, s32* out_num_processes, VAddr out_pr LOG_ERROR(Kernel_SVC, "Supplied size outside [0, 0x0FFFFFFF] range. out_process_ids_size={}", out_process_ids_size); - return ResultOutOfRange; + R_THROW(ResultOutOfRange); } auto& kernel = system.Kernel(); @@ -70,7 +70,7 @@ Result GetProcessList(Core::System& system, s32* out_num_processes, VAddr out_pr out_process_ids, total_copy_size)) { LOG_ERROR(Kernel_SVC, "Address range outside address space. begin=0x{:016X}, end=0x{:016X}", out_process_ids, out_process_ids + total_copy_size); - return ResultInvalidCurrentMemory; + R_THROW(ResultInvalidCurrentMemory); } auto& memory = system.Memory(); @@ -85,7 +85,7 @@ Result GetProcessList(Core::System& system, s32* out_num_processes, VAddr out_pr } *out_num_processes = static_cast(num_processes); - return ResultSuccess; + R_SUCCEED(); } Result GetProcessInfo(Core::System& system, s64* out, Handle process_handle, @@ -97,17 +97,17 @@ Result GetProcessInfo(Core::System& system, s64* out, Handle process_handle, if (process.IsNull()) { LOG_ERROR(Kernel_SVC, "Process handle does not exist, process_handle=0x{:08X}", process_handle); - return ResultInvalidHandle; + R_THROW(ResultInvalidHandle); } if (info_type != ProcessInfoType::ProcessState) { LOG_ERROR(Kernel_SVC, "Expected info_type to be ProcessState but got {} instead", info_type); - return ResultInvalidEnumValue; + R_THROW(ResultInvalidEnumValue); } *out = static_cast(process->GetState()); - return ResultSuccess; + R_SUCCEED(); } Result CreateProcess(Core::System& system, Handle* out_handle, uint64_t parameters, uint64_t caps, diff --git a/src/core/hle/kernel/svc/svc_process_memory.cpp b/src/core/hle/kernel/svc/svc_process_memory.cpp index 8e2fb4092..f9210ca1e 100644 --- a/src/core/hle/kernel/svc/svc_process_memory.cpp +++ b/src/core/hle/kernel/svc/svc_process_memory.cpp @@ -53,7 +53,7 @@ Result SetProcessMemoryPermission(Core::System& system, Handle process_handle, V R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory); // Set the memory permission. - return page_table.SetProcessMemoryPermission(address, size, perm); + R_RETURN(page_table.SetProcessMemoryPermission(address, size, perm)); } Result MapProcessMemory(Core::System& system, VAddr dst_address, Handle process_handle, @@ -93,10 +93,8 @@ Result MapProcessMemory(Core::System& system, VAddr dst_address, Handle process_ KMemoryAttribute::All, KMemoryAttribute::None)); // Map the group. - R_TRY(dst_pt.MapPageGroup(dst_address, pg, KMemoryState::SharedCode, - KMemoryPermission::UserReadWrite)); - - return ResultSuccess; + R_RETURN(dst_pt.MapPageGroup(dst_address, pg, KMemoryState::SharedCode, + KMemoryPermission::UserReadWrite)); } Result UnmapProcessMemory(Core::System& system, VAddr dst_address, Handle process_handle, @@ -129,9 +127,7 @@ Result UnmapProcessMemory(Core::System& system, VAddr dst_address, Handle proces ResultInvalidMemoryRegion); // Unmap the memory. - R_TRY(dst_pt.UnmapProcessMemory(dst_address, size, src_pt, src_address)); - - return ResultSuccess; + R_RETURN(dst_pt.UnmapProcessMemory(dst_address, size, src_pt, src_address)); } Result MapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst_address, @@ -144,18 +140,18 @@ Result MapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst if (!Common::Is4KBAligned(src_address)) { LOG_ERROR(Kernel_SVC, "src_address is not page-aligned (src_address=0x{:016X}).", src_address); - return ResultInvalidAddress; + R_THROW(ResultInvalidAddress); } if (!Common::Is4KBAligned(dst_address)) { LOG_ERROR(Kernel_SVC, "dst_address is not page-aligned (dst_address=0x{:016X}).", dst_address); - return ResultInvalidAddress; + R_THROW(ResultInvalidAddress); } if (size == 0 || !Common::Is4KBAligned(size)) { LOG_ERROR(Kernel_SVC, "Size is zero or not page-aligned (size=0x{:016X})", size); - return ResultInvalidSize; + R_THROW(ResultInvalidSize); } if (!IsValidAddressRange(dst_address, size)) { @@ -163,7 +159,7 @@ Result MapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst "Destination address range overflows the address space (dst_address=0x{:016X}, " "size=0x{:016X}).", dst_address, size); - return ResultInvalidCurrentMemory; + R_THROW(ResultInvalidCurrentMemory); } if (!IsValidAddressRange(src_address, size)) { @@ -171,7 +167,7 @@ Result MapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst "Source address range overflows the address space (src_address=0x{:016X}, " "size=0x{:016X}).", src_address, size); - return ResultInvalidCurrentMemory; + R_THROW(ResultInvalidCurrentMemory); } const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable(); @@ -179,7 +175,7 @@ Result MapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst if (process.IsNull()) { LOG_ERROR(Kernel_SVC, "Invalid process handle specified (handle=0x{:08X}).", process_handle); - return ResultInvalidHandle; + R_THROW(ResultInvalidHandle); } auto& page_table = process->PageTable(); @@ -188,7 +184,7 @@ Result MapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst "Source address range is not within the address space (src_address=0x{:016X}, " "size=0x{:016X}).", src_address, size); - return ResultInvalidCurrentMemory; + R_THROW(ResultInvalidCurrentMemory); } if (!page_table.IsInsideASLRRegion(dst_address, size)) { @@ -196,10 +192,10 @@ Result MapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst "Destination address range is not within the ASLR region (dst_address=0x{:016X}, " "size=0x{:016X}).", dst_address, size); - return ResultInvalidMemoryRegion; + R_THROW(ResultInvalidMemoryRegion); } - return page_table.MapCodeMemory(dst_address, src_address, size); + R_RETURN(page_table.MapCodeMemory(dst_address, src_address, size)); } Result UnmapProcessCodeMemory(Core::System& system, Handle process_handle, u64 dst_address, @@ -212,18 +208,18 @@ Result UnmapProcessCodeMemory(Core::System& system, Handle process_handle, u64 d if (!Common::Is4KBAligned(dst_address)) { LOG_ERROR(Kernel_SVC, "dst_address is not page-aligned (dst_address=0x{:016X}).", dst_address); - return ResultInvalidAddress; + R_THROW(ResultInvalidAddress); } if (!Common::Is4KBAligned(src_address)) { LOG_ERROR(Kernel_SVC, "src_address is not page-aligned (src_address=0x{:016X}).", src_address); - return ResultInvalidAddress; + R_THROW(ResultInvalidAddress); } if (size == 0 || !Common::Is4KBAligned(size)) { LOG_ERROR(Kernel_SVC, "Size is zero or not page-aligned (size=0x{:016X}).", size); - return ResultInvalidSize; + R_THROW(ResultInvalidSize); } if (!IsValidAddressRange(dst_address, size)) { @@ -231,7 +227,7 @@ Result UnmapProcessCodeMemory(Core::System& system, Handle process_handle, u64 d "Destination address range overflows the address space (dst_address=0x{:016X}, " "size=0x{:016X}).", dst_address, size); - return ResultInvalidCurrentMemory; + R_THROW(ResultInvalidCurrentMemory); } if (!IsValidAddressRange(src_address, size)) { @@ -239,7 +235,7 @@ Result UnmapProcessCodeMemory(Core::System& system, Handle process_handle, u64 d "Source address range overflows the address space (src_address=0x{:016X}, " "size=0x{:016X}).", src_address, size); - return ResultInvalidCurrentMemory; + R_THROW(ResultInvalidCurrentMemory); } const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable(); @@ -247,7 +243,7 @@ Result UnmapProcessCodeMemory(Core::System& system, Handle process_handle, u64 d if (process.IsNull()) { LOG_ERROR(Kernel_SVC, "Invalid process handle specified (handle=0x{:08X}).", process_handle); - return ResultInvalidHandle; + R_THROW(ResultInvalidHandle); } auto& page_table = process->PageTable(); @@ -256,7 +252,7 @@ Result UnmapProcessCodeMemory(Core::System& system, Handle process_handle, u64 d "Source address range is not within the address space (src_address=0x{:016X}, " "size=0x{:016X}).", src_address, size); - return ResultInvalidCurrentMemory; + R_THROW(ResultInvalidCurrentMemory); } if (!page_table.IsInsideASLRRegion(dst_address, size)) { @@ -264,11 +260,11 @@ Result UnmapProcessCodeMemory(Core::System& system, Handle process_handle, u64 d "Destination address range is not within the ASLR region (dst_address=0x{:016X}, " "size=0x{:016X}).", dst_address, size); - return ResultInvalidMemoryRegion; + R_THROW(ResultInvalidMemoryRegion); } - return page_table.UnmapCodeMemory(dst_address, src_address, size, - KPageTable::ICacheInvalidationStrategy::InvalidateAll); + R_RETURN(page_table.UnmapCodeMemory(dst_address, src_address, size, + KPageTable::ICacheInvalidationStrategy::InvalidateAll)); } Result SetProcessMemoryPermission64(Core::System& system, Handle process_handle, uint64_t address, diff --git a/src/core/hle/kernel/svc/svc_query_memory.cpp b/src/core/hle/kernel/svc/svc_query_memory.cpp index ee75ad370..b2290164c 100644 --- a/src/core/hle/kernel/svc/svc_query_memory.cpp +++ b/src/core/hle/kernel/svc/svc_query_memory.cpp @@ -15,8 +15,8 @@ Result QueryMemory(Core::System& system, uint64_t out_memory_info, PageInfo* out out_memory_info, query_address); // Query memory is just QueryProcessMemory on the current process. - return QueryProcessMemory(system, out_memory_info, out_page_info, CurrentProcess, - query_address); + R_RETURN( + QueryProcessMemory(system, out_memory_info, out_page_info, CurrentProcess, query_address)); } Result QueryProcessMemory(Core::System& system, uint64_t out_memory_info, PageInfo* out_page_info, @@ -27,7 +27,7 @@ Result QueryProcessMemory(Core::System& system, uint64_t out_memory_info, PageIn if (process.IsNull()) { LOG_ERROR(Kernel_SVC, "Process handle does not exist, process_handle=0x{:08X}", process_handle); - return ResultInvalidHandle; + R_THROW(ResultInvalidHandle); } auto& memory{system.Memory()}; diff --git a/src/core/hle/kernel/svc/svc_resource_limit.cpp b/src/core/hle/kernel/svc/svc_resource_limit.cpp index 88166299e..d96a7e879 100644 --- a/src/core/hle/kernel/svc/svc_resource_limit.cpp +++ b/src/core/hle/kernel/svc/svc_resource_limit.cpp @@ -27,9 +27,7 @@ Result CreateResourceLimit(Core::System& system, Handle* out_handle) { KResourceLimit::Register(kernel, resource_limit); // Add the limit to the handle table. - R_TRY(GetCurrentProcess(kernel).GetHandleTable().Add(out_handle, resource_limit)); - - return ResultSuccess; + R_RETURN(GetCurrentProcess(kernel).GetHandleTable().Add(out_handle, resource_limit)); } Result GetResourceLimitLimitValue(Core::System& system, s64* out_limit_value, @@ -49,7 +47,7 @@ Result GetResourceLimitLimitValue(Core::System& system, s64* out_limit_value, // Get the limit value. *out_limit_value = resource_limit->GetLimitValue(which); - return ResultSuccess; + R_SUCCEED(); } Result GetResourceLimitCurrentValue(Core::System& system, s64* out_current_value, @@ -69,7 +67,7 @@ Result GetResourceLimitCurrentValue(Core::System& system, s64* out_current_value // Get the current value. *out_current_value = resource_limit->GetCurrentValue(which); - return ResultSuccess; + R_SUCCEED(); } Result SetResourceLimitLimitValue(Core::System& system, Handle resource_limit_handle, @@ -87,9 +85,7 @@ Result SetResourceLimitLimitValue(Core::System& system, Handle resource_limit_ha R_UNLESS(resource_limit.IsNotNull(), ResultInvalidHandle); // Set the limit value. - R_TRY(resource_limit->SetLimitValue(which, limit_value)); - - return ResultSuccess; + R_RETURN(resource_limit->SetLimitValue(which, limit_value)); } Result GetResourceLimitPeakValue(Core::System& system, int64_t* out_peak_value, diff --git a/src/core/hle/kernel/svc/svc_session.cpp b/src/core/hle/kernel/svc/svc_session.cpp index 90d680540..d5a3d0120 100644 --- a/src/core/hle/kernel/svc/svc_session.cpp +++ b/src/core/hle/kernel/svc/svc_session.cpp @@ -25,7 +25,7 @@ Result CreateSession(Core::System& system, Handle* out_server, Handle* out_clien if (session_reservation.Succeeded()) { session = T::Create(system.Kernel()); } else { - return ResultLimitReached; + R_THROW(ResultLimitReached); // // We couldn't reserve a session. Check that we support dynamically expanding the // // resource limit. @@ -77,15 +77,13 @@ Result CreateSession(Core::System& system, Handle* out_server, Handle* out_clien // Add the server session to the handle table. R_TRY(handle_table.Add(out_server, &session->GetServerSession())); - // Add the client session to the handle table. - const auto result = handle_table.Add(out_client, &session->GetClientSession()); - - if (!R_SUCCEEDED(result)) { - // Ensure that we maintain a clean handle state on exit. + // Ensure that we maintain a clean handle state on exit. + ON_RESULT_FAILURE { handle_table.Remove(*out_server); - } + }; - return result; + // Add the client session to the handle table. + R_RETURN(handle_table.Add(out_client, &session->GetClientSession())); } } // namespace @@ -94,9 +92,9 @@ Result CreateSession(Core::System& system, Handle* out_server, Handle* out_clien u64 name) { if (is_light) { // return CreateSession(system, out_server, out_client, name); - return ResultNotImplemented; + R_THROW(ResultNotImplemented); } else { - return CreateSession(system, out_server, out_client, name); + R_RETURN(CreateSession(system, out_server, out_client, name)); } } diff --git a/src/core/hle/kernel/svc/svc_shared_memory.cpp b/src/core/hle/kernel/svc/svc_shared_memory.cpp index 18e0dc904..40d878f17 100644 --- a/src/core/hle/kernel/svc/svc_shared_memory.cpp +++ b/src/core/hle/kernel/svc/svc_shared_memory.cpp @@ -56,15 +56,12 @@ Result MapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, R_TRY(process.AddSharedMemory(shmem.GetPointerUnsafe(), address, size)); // Ensure that we clean up the shared memory if we fail to map it. - auto guard = - SCOPE_GUARD({ process.RemoveSharedMemory(shmem.GetPointerUnsafe(), address, size); }); + ON_RESULT_FAILURE { + process.RemoveSharedMemory(shmem.GetPointerUnsafe(), address, size); + }; // Map the shared memory. - R_TRY(shmem->Map(process, address, size, map_perm)); - - // We succeeded. - guard.Cancel(); - return ResultSuccess; + R_RETURN(shmem->Map(process, address, size, map_perm)); } Result UnmapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, u64 size) { @@ -91,7 +88,7 @@ Result UnmapSharedMemory(Core::System& system, Handle shmem_handle, VAddr addres // Remove the shared memory from the process. process.RemoveSharedMemory(shmem.GetPointerUnsafe(), address, size); - return ResultSuccess; + R_SUCCEED(); } Result CreateSharedMemory(Core::System& system, Handle* out_handle, uint64_t size, diff --git a/src/core/hle/kernel/svc/svc_synchronization.cpp b/src/core/hle/kernel/svc/svc_synchronization.cpp index 9e7bf9530..660b45c23 100644 --- a/src/core/hle/kernel/svc/svc_synchronization.cpp +++ b/src/core/hle/kernel/svc/svc_synchronization.cpp @@ -17,7 +17,7 @@ Result CloseHandle(Core::System& system, Handle handle) { R_UNLESS(GetCurrentProcess(system.Kernel()).GetHandleTable().Remove(handle), ResultInvalidHandle); - return ResultSuccess; + R_SUCCEED(); } /// Clears the signaled state of an event or process. @@ -31,7 +31,7 @@ Result ResetSignal(Core::System& system, Handle handle) { { KScopedAutoObject readable_event = handle_table.GetObject(handle); if (readable_event.IsNotNull()) { - return readable_event->Reset(); + R_RETURN(readable_event->Reset()); } } @@ -39,13 +39,11 @@ Result ResetSignal(Core::System& system, Handle handle) { { KScopedAutoObject process = handle_table.GetObject(handle); if (process.IsNotNull()) { - return process->Reset(); + R_RETURN(process->Reset()); } } - LOG_ERROR(Kernel_SVC, "invalid handle (0x{:08X})", handle); - - return ResultInvalidHandle; + R_THROW(ResultInvalidHandle); } static Result WaitSynchronization(Core::System& system, int32_t* out_index, const Handle* handles, @@ -109,7 +107,7 @@ Result CancelSynchronization(Core::System& system, Handle handle) { // Cancel the thread's wait. thread->WaitCancel(); - return ResultSuccess; + R_SUCCEED(); } void SynchronizePreemptionState(Core::System& system) { diff --git a/src/core/hle/kernel/svc/svc_thread.cpp b/src/core/hle/kernel/svc/svc_thread.cpp index 9bc1ebe74..5e888153b 100644 --- a/src/core/hle/kernel/svc/svc_thread.cpp +++ b/src/core/hle/kernel/svc/svc_thread.cpp @@ -34,39 +34,22 @@ Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point, } // Validate arguments. - if (!IsValidVirtualCoreId(core_id)) { - LOG_ERROR(Kernel_SVC, "Invalid Core ID specified (id={})", core_id); - return ResultInvalidCoreId; - } - if (((1ULL << core_id) & process.GetCoreMask()) == 0) { - LOG_ERROR(Kernel_SVC, "Core ID doesn't fall within allowable cores (id={})", core_id); - return ResultInvalidCoreId; - } + R_UNLESS(IsValidVirtualCoreId(core_id), ResultInvalidCoreId); + R_UNLESS(((1ull << core_id) & process.GetCoreMask()) != 0, ResultInvalidCoreId); - if (HighestThreadPriority > priority || priority > LowestThreadPriority) { - LOG_ERROR(Kernel_SVC, "Invalid priority specified (priority={})", priority); - return ResultInvalidPriority; - } - if (!process.CheckThreadPriority(priority)) { - LOG_ERROR(Kernel_SVC, "Invalid allowable thread priority (priority={})", priority); - return ResultInvalidPriority; - } + R_UNLESS(HighestThreadPriority <= priority && priority <= LowestThreadPriority, + ResultInvalidPriority); + R_UNLESS(process.CheckThreadPriority(priority), ResultInvalidPriority); // Reserve a new thread from the process resource limit (waiting up to 100ms). KScopedResourceReservation thread_reservation(&process, LimitableResource::ThreadCountMax, 1, system.CoreTiming().GetGlobalTimeNs().count() + 100000000); - if (!thread_reservation.Succeeded()) { - LOG_ERROR(Kernel_SVC, "Could not reserve a new thread"); - return ResultLimitReached; - } + R_UNLESS(thread_reservation.Succeeded(), ResultLimitReached); // Create the thread. KThread* thread = KThread::Create(kernel); - if (!thread) { - LOG_ERROR(Kernel_SVC, "Unable to create new threads. Thread creation limit reached."); - return ResultOutOfResource; - } + R_UNLESS(thread != nullptr, ResultOutOfResource) SCOPE_EXIT({ thread->Close(); }); // Initialize the thread. @@ -89,9 +72,7 @@ Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point, KThread::Register(kernel, thread); // Add the thread to the handle table. - R_TRY(process.GetHandleTable().Add(out_handle, thread)); - - return ResultSuccess; + R_RETURN(process.GetHandleTable().Add(out_handle, thread)); } /// Starts the thread for the provided handle @@ -110,7 +91,7 @@ Result StartThread(Core::System& system, Handle thread_handle) { thread->Open(); system.Kernel().RegisterInUseObject(thread.GetPointerUnsafe()); - return ResultSuccess; + R_SUCCEED(); } /// Called when a thread exits @@ -202,10 +183,8 @@ Result GetThreadContext3(Core::System& system, VAddr out_context, Handle thread_ // Copy the thread context to user space. system.Memory().WriteBlock(out_context, context.data(), context.size()); - return ResultSuccess; + R_SUCCEED(); } - - return ResultSuccess; } /// Gets the priority for the specified thread @@ -219,7 +198,7 @@ Result GetThreadPriority(Core::System& system, s32* out_priority, Handle handle) // Get the thread's priority. *out_priority = thread->GetPriority(); - return ResultSuccess; + R_SUCCEED(); } /// Sets the priority for the specified thread @@ -238,7 +217,7 @@ Result SetThreadPriority(Core::System& system, Handle thread_handle, s32 priorit // Set the thread priority. thread->SetBasePriority(priority); - return ResultSuccess; + R_SUCCEED(); } Result GetThreadList(Core::System& system, s32* out_num_threads, VAddr out_thread_ids, @@ -253,7 +232,7 @@ Result GetThreadList(Core::System& system, s32* out_num_threads, VAddr out_threa if ((out_thread_ids_size & 0xF0000000) != 0) { LOG_ERROR(Kernel_SVC, "Supplied size outside [0, 0x0FFFFFFF] range. size={}", out_thread_ids_size); - return ResultOutOfRange; + R_THROW(ResultOutOfRange); } auto* const current_process = GetCurrentProcessPointer(system.Kernel()); @@ -263,7 +242,7 @@ Result GetThreadList(Core::System& system, s32* out_num_threads, VAddr out_threa !current_process->PageTable().IsInsideAddressSpace(out_thread_ids, total_copy_size)) { LOG_ERROR(Kernel_SVC, "Address range outside address space. begin=0x{:016X}, end=0x{:016X}", out_thread_ids, out_thread_ids + total_copy_size); - return ResultInvalidCurrentMemory; + R_THROW(ResultInvalidCurrentMemory); } auto& memory = system.Memory(); @@ -278,7 +257,7 @@ Result GetThreadList(Core::System& system, s32* out_num_threads, VAddr out_threa } *out_num_threads = static_cast(num_threads); - return ResultSuccess; + R_SUCCEED(); } Result GetThreadCoreMask(Core::System& system, s32* out_core_id, u64* out_affinity_mask, @@ -291,9 +270,7 @@ Result GetThreadCoreMask(Core::System& system, s32* out_core_id, u64* out_affini R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); // Get the core mask. - R_TRY(thread->GetCoreMask(out_core_id, out_affinity_mask)); - - return ResultSuccess; + R_RETURN(thread->GetCoreMask(out_core_id, out_affinity_mask)); } Result SetThreadCoreMask(Core::System& system, Handle thread_handle, s32 core_id, @@ -323,9 +300,7 @@ Result SetThreadCoreMask(Core::System& system, Handle thread_handle, s32 core_id R_UNLESS(thread.IsNotNull(), ResultInvalidHandle); // Set the core mask. - R_TRY(thread->SetCoreMask(core_id, affinity_mask)); - - return ResultSuccess; + R_RETURN(thread->SetCoreMask(core_id, affinity_mask)); } /// Get the ID for the specified thread. @@ -337,7 +312,7 @@ Result GetThreadId(Core::System& system, u64* out_thread_id, Handle thread_handl // Get the thread's id. *out_thread_id = thread->GetId(); - return ResultSuccess; + R_SUCCEED(); } Result CreateThread64(Core::System& system, Handle* out_handle, uint64_t func, uint64_t arg, diff --git a/src/core/hle/kernel/svc/svc_transfer_memory.cpp b/src/core/hle/kernel/svc/svc_transfer_memory.cpp index 7ffc24adf..ff4a87916 100644 --- a/src/core/hle/kernel/svc/svc_transfer_memory.cpp +++ b/src/core/hle/kernel/svc/svc_transfer_memory.cpp @@ -67,9 +67,7 @@ Result CreateTransferMemory(Core::System& system, Handle* out, VAddr address, u6 KTransferMemory::Register(kernel, trmem); // Add the transfer memory to the handle table. - R_TRY(handle_table.Add(out, trmem)); - - return ResultSuccess; + R_RETURN(handle_table.Add(out, trmem)); } Result MapTransferMemory(Core::System& system, Handle trmem_handle, uint64_t address, uint64_t size, From 9368e17a92815744ffed8db7a0fd638708426879 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 7 Mar 2023 09:25:12 -0500 Subject: [PATCH 0174/1181] kernel: remove gratitutous attribute usage --- .../hle/kernel/global_scheduler_context.h | 4 +-- src/core/hle/kernel/k_code_memory.h | 2 +- src/core/hle/kernel/k_debug.h | 2 +- src/core/hle/kernel/k_memory_block.h | 30 ++++++++----------- src/core/hle/kernel/k_page_buffer.h | 2 +- src/core/hle/kernel/k_resource_limit.h | 2 +- src/core/hle/kernel/k_system_resource.cpp | 9 +++--- src/core/hle/kernel/k_system_resource.h | 2 +- 8 files changed, 24 insertions(+), 29 deletions(-) diff --git a/src/core/hle/kernel/global_scheduler_context.h b/src/core/hle/kernel/global_scheduler_context.h index b7fb8caec..c48e8cd12 100644 --- a/src/core/hle/kernel/global_scheduler_context.h +++ b/src/core/hle/kernel/global_scheduler_context.h @@ -44,7 +44,7 @@ public: /// Returns a list of all threads managed by the scheduler /// This is only safe to iterate while holding the scheduler lock - [[nodiscard]] const std::vector& GetThreadList() const { + const std::vector& GetThreadList() const { return m_thread_list; } @@ -64,7 +64,7 @@ public: void RegisterDummyThreadForWakeup(KThread* thread); void WakeupWaitingDummyThreads(); - [[nodiscard]] LockType& SchedulerLock() { + LockType& SchedulerLock() { return m_scheduler_lock; } diff --git a/src/core/hle/kernel/k_code_memory.h b/src/core/hle/kernel/k_code_memory.h index 5b260b385..fa63c18df 100644 --- a/src/core/hle/kernel/k_code_memory.h +++ b/src/core/hle/kernel/k_code_memory.h @@ -42,7 +42,7 @@ public: bool IsInitialized() const override { return m_is_initialized; } - static void PostDestroy([[maybe_unused]] uintptr_t arg) {} + static void PostDestroy(uintptr_t arg) {} KProcess* GetOwner() const override { return m_owner; diff --git a/src/core/hle/kernel/k_debug.h b/src/core/hle/kernel/k_debug.h index e3a0689c8..9ffcf27d1 100644 --- a/src/core/hle/kernel/k_debug.h +++ b/src/core/hle/kernel/k_debug.h @@ -14,7 +14,7 @@ class KDebug final : public KAutoObjectWithSlabHeapAndContainer( @@ -482,8 +482,8 @@ public: } } - constexpr void UpdateDeviceDisableMergeStateForShareRight( - [[maybe_unused]] KMemoryPermission new_perm, [[maybe_unused]] bool left, bool right) { + constexpr void UpdateDeviceDisableMergeStateForShareRight(KMemoryPermission new_perm, bool left, + bool right) { // New permission/left aren't used. if (right) { m_disable_merge_attribute = static_cast( @@ -499,8 +499,7 @@ public: this->UpdateDeviceDisableMergeStateForShareRight(new_perm, left, right); } - constexpr void ShareToDevice([[maybe_unused]] KMemoryPermission new_perm, bool left, - bool right) { + constexpr void ShareToDevice(KMemoryPermission new_perm, bool left, bool right) { // New permission isn't used. // We must either be shared or have a zero lock count. @@ -516,8 +515,8 @@ public: this->UpdateDeviceDisableMergeStateForShare(new_perm, left, right); } - constexpr void UpdateDeviceDisableMergeStateForUnshareLeft( - [[maybe_unused]] KMemoryPermission new_perm, bool left, [[maybe_unused]] bool right) { + constexpr void UpdateDeviceDisableMergeStateForUnshareLeft(KMemoryPermission new_perm, + bool left, bool right) { // New permission/right aren't used. if (left) { @@ -536,8 +535,8 @@ public: } } - constexpr void UpdateDeviceDisableMergeStateForUnshareRight( - [[maybe_unused]] KMemoryPermission new_perm, [[maybe_unused]] bool left, bool right) { + constexpr void UpdateDeviceDisableMergeStateForUnshareRight(KMemoryPermission new_perm, + bool left, bool right) { // New permission/left aren't used. if (right) { @@ -556,8 +555,7 @@ public: this->UpdateDeviceDisableMergeStateForUnshareRight(new_perm, left, right); } - constexpr void UnshareToDevice([[maybe_unused]] KMemoryPermission new_perm, bool left, - bool right) { + constexpr void UnshareToDevice(KMemoryPermission new_perm, bool left, bool right) { // New permission isn't used. // We must be shared. @@ -575,8 +573,7 @@ public: this->UpdateDeviceDisableMergeStateForUnshare(new_perm, left, right); } - constexpr void UnshareToDeviceRight([[maybe_unused]] KMemoryPermission new_perm, bool left, - bool right) { + constexpr void UnshareToDeviceRight(KMemoryPermission new_perm, bool left, bool right) { // New permission isn't used. // We must be shared. @@ -594,7 +591,7 @@ public: this->UpdateDeviceDisableMergeStateForUnshareRight(new_perm, left, right); } - constexpr void LockForIpc(KMemoryPermission new_perm, bool left, [[maybe_unused]] bool right) { + constexpr void LockForIpc(KMemoryPermission new_perm, bool left, bool right) { // We must either be locked or have a zero lock count. ASSERT((m_attribute & KMemoryAttribute::IpcLocked) == KMemoryAttribute::IpcLocked || m_ipc_lock_count == 0); @@ -626,8 +623,7 @@ public: } } - constexpr void UnlockForIpc([[maybe_unused]] KMemoryPermission new_perm, bool left, - [[maybe_unused]] bool right) { + constexpr void UnlockForIpc(KMemoryPermission new_perm, bool left, bool right) { // New permission isn't used. // We must be locked. diff --git a/src/core/hle/kernel/k_page_buffer.h b/src/core/hle/kernel/k_page_buffer.h index cfedaae61..b7a3ccb4a 100644 --- a/src/core/hle/kernel/k_page_buffer.h +++ b/src/core/hle/kernel/k_page_buffer.h @@ -29,7 +29,7 @@ public: static KPageBuffer* FromPhysicalAddress(Core::System& system, PAddr phys_addr); private: - [[maybe_unused]] alignas(PageSize) std::array m_buffer{}; + alignas(PageSize) std::array m_buffer{}; }; static_assert(sizeof(KPageBuffer) == KPageBufferSlabHeap::BufferSize); diff --git a/src/core/hle/kernel/k_resource_limit.h b/src/core/hle/kernel/k_resource_limit.h index 2573d1b7c..bc4f48e15 100644 --- a/src/core/hle/kernel/k_resource_limit.h +++ b/src/core/hle/kernel/k_resource_limit.h @@ -46,7 +46,7 @@ public: void Release(LimitableResource which, s64 value); void Release(LimitableResource which, s64 value, s64 hint); - static void PostDestroy([[maybe_unused]] uintptr_t arg) {} + static void PostDestroy(uintptr_t arg) {} private: using ResourceArray = std::array(LimitableResource::Count)>; diff --git a/src/core/hle/kernel/k_system_resource.cpp b/src/core/hle/kernel/k_system_resource.cpp index 4cc377a6c..e6c8d589a 100644 --- a/src/core/hle/kernel/k_system_resource.cpp +++ b/src/core/hle/kernel/k_system_resource.cpp @@ -5,9 +5,8 @@ namespace Kernel { -Result KSecureSystemResource::Initialize([[maybe_unused]] size_t size, - [[maybe_unused]] KResourceLimit* resource_limit, - [[maybe_unused]] KMemoryManager::Pool pool) { +Result KSecureSystemResource::Initialize(size_t size, KResourceLimit* resource_limit, + KMemoryManager::Pool pool) { // Unimplemented UNREACHABLE(); } @@ -17,8 +16,8 @@ void KSecureSystemResource::Finalize() { UNREACHABLE(); } -size_t KSecureSystemResource::CalculateRequiredSecureMemorySize( - [[maybe_unused]] size_t size, [[maybe_unused]] KMemoryManager::Pool pool) { +size_t KSecureSystemResource::CalculateRequiredSecureMemorySize(size_t size, + KMemoryManager::Pool pool) { // Unimplemented UNREACHABLE(); } diff --git a/src/core/hle/kernel/k_system_resource.h b/src/core/hle/kernel/k_system_resource.h index 9a991f725..aec058a95 100644 --- a/src/core/hle/kernel/k_system_resource.h +++ b/src/core/hle/kernel/k_system_resource.h @@ -99,7 +99,7 @@ public: bool IsInitialized() const { return m_is_initialized; } - static void PostDestroy([[maybe_unused]] uintptr_t arg) {} + static void PostDestroy(uintptr_t arg) {} size_t CalculateRequiredSecureMemorySize() const { return CalculateRequiredSecureMemorySize(m_resource_size, m_resource_pool); From c0b9e93b77cca0e5fbd455efc5dec10199ef8184 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 7 Mar 2023 10:49:41 -0500 Subject: [PATCH 0175/1181] kernel: remove kernel_ --- src/core/hle/kernel/k_auto_object.cpp | 4 +- src/core/hle/kernel/k_auto_object.h | 6 +- src/core/hle/kernel/k_client_port.cpp | 12 +- src/core/hle/kernel/k_client_session.cpp | 7 +- src/core/hle/kernel/k_client_session.h | 2 +- src/core/hle/kernel/k_code_memory.cpp | 14 +- src/core/hle/kernel/k_code_memory.h | 2 +- src/core/hle/kernel/k_condition_variable.cpp | 8 +- src/core/hle/kernel/k_debug.h | 2 +- .../hle/kernel/k_device_address_space.cpp | 4 +- src/core/hle/kernel/k_event.cpp | 8 +- src/core/hle/kernel/k_event.h | 2 +- src/core/hle/kernel/k_port.cpp | 12 +- src/core/hle/kernel/k_port.h | 2 +- src/core/hle/kernel/k_process.cpp | 68 +++--- src/core/hle/kernel/k_process.h | 2 +- src/core/hle/kernel/k_readable_event.cpp | 10 +- src/core/hle/kernel/k_readable_event.h | 2 +- src/core/hle/kernel/k_resource_limit.cpp | 4 +- src/core/hle/kernel/k_scheduler.cpp | 62 +++--- src/core/hle/kernel/k_scheduler.h | 2 +- src/core/hle/kernel/k_server_port.cpp | 8 +- src/core/hle/kernel/k_server_port.h | 2 +- src/core/hle/kernel/k_server_session.cpp | 40 ++-- src/core/hle/kernel/k_server_session.h | 2 +- src/core/hle/kernel/k_session.cpp | 6 +- src/core/hle/kernel/k_session.h | 2 +- src/core/hle/kernel/k_session_request.h | 6 +- src/core/hle/kernel/k_shared_memory.cpp | 8 +- src/core/hle/kernel/k_shared_memory.h | 2 +- .../hle/kernel/k_synchronization_object.cpp | 11 +- src/core/hle/kernel/k_system_resource.h | 6 +- src/core/hle/kernel/k_thread.cpp | 200 +++++++++--------- src/core/hle/kernel/k_thread.h | 12 +- src/core/hle/kernel/k_thread_queue.h | 2 +- src/core/hle/kernel/k_transfer_memory.cpp | 16 +- src/core/hle/kernel/k_transfer_memory.h | 4 +- src/core/hle/kernel/k_worker_task.h | 2 +- src/core/hle/kernel/k_worker_task_manager.cpp | 2 +- src/core/hle/kernel/k_worker_task_manager.h | 2 +- src/core/hle/kernel/slab_helpers.h | 17 +- 41 files changed, 290 insertions(+), 295 deletions(-) diff --git a/src/core/hle/kernel/k_auto_object.cpp b/src/core/hle/kernel/k_auto_object.cpp index 691af8ccb..0ae42c95c 100644 --- a/src/core/hle/kernel/k_auto_object.cpp +++ b/src/core/hle/kernel/k_auto_object.cpp @@ -12,11 +12,11 @@ KAutoObject* KAutoObject::Create(KAutoObject* obj) { } void KAutoObject::RegisterWithKernel() { - kernel.RegisterKernelObject(this); + m_kernel.RegisterKernelObject(this); } void KAutoObject::UnregisterWithKernel() { - kernel.UnregisterKernelObject(this); + m_kernel.UnregisterKernelObject(this); } } // namespace Kernel diff --git a/src/core/hle/kernel/k_auto_object.h b/src/core/hle/kernel/k_auto_object.h index 2443ab2a5..edb9cf071 100644 --- a/src/core/hle/kernel/k_auto_object.h +++ b/src/core/hle/kernel/k_auto_object.h @@ -80,7 +80,7 @@ private: KERNEL_AUTOOBJECT_TRAITS_IMPL(KAutoObject, KAutoObject, const); public: - explicit KAutoObject(KernelCore& kernel_) : kernel(kernel_) { + explicit KAutoObject(KernelCore& kernel) : m_kernel(kernel) { RegisterWithKernel(); } virtual ~KAutoObject() = default; @@ -169,7 +169,7 @@ private: void UnregisterWithKernel(); protected: - KernelCore& kernel; + KernelCore& m_kernel; private: std::atomic m_ref_count{}; @@ -179,7 +179,7 @@ class KAutoObjectWithListContainer; class KAutoObjectWithList : public KAutoObject, public boost::intrusive::set_base_hook<> { public: - explicit KAutoObjectWithList(KernelCore& kernel_) : KAutoObject(kernel_) {} + explicit KAutoObjectWithList(KernelCore& kernel) : KAutoObject(kernel) {} static int Compare(const KAutoObjectWithList& lhs, const KAutoObjectWithList& rhs) { const u64 lid = lhs.GetId(); diff --git a/src/core/hle/kernel/k_client_port.cpp b/src/core/hle/kernel/k_client_port.cpp index 7a3d650fd..40e09e532 100644 --- a/src/core/hle/kernel/k_client_port.cpp +++ b/src/core/hle/kernel/k_client_port.cpp @@ -11,7 +11,7 @@ namespace Kernel { -KClientPort::KClientPort(KernelCore& kernel_) : KSynchronizationObject{kernel_} {} +KClientPort::KClientPort(KernelCore& kernel) : KSynchronizationObject{kernel} {} KClientPort::~KClientPort() = default; void KClientPort::Initialize(KPort* parent, s32 max_sessions) { @@ -23,7 +23,7 @@ void KClientPort::Initialize(KPort* parent, s32 max_sessions) { } void KClientPort::OnSessionFinalized() { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; if (const auto prev = m_num_sessions--; prev == m_max_sessions) { this->NotifyAvailable(); @@ -58,12 +58,12 @@ Result KClientPort::CreateSession(KClientSession** out) { // Reserve a new session from the resource limit. //! FIXME: we are reserving this from the wrong resource limit! - KScopedResourceReservation session_reservation(kernel.ApplicationProcess()->GetResourceLimit(), - LimitableResource::SessionCountMax); + KScopedResourceReservation session_reservation( + m_kernel.ApplicationProcess()->GetResourceLimit(), LimitableResource::SessionCountMax); R_UNLESS(session_reservation.Succeeded(), ResultLimitReached); // Allocate a session normally. - session = KSession::Create(kernel); + session = KSession::Create(m_kernel); // Check that we successfully created a session. R_UNLESS(session != nullptr, ResultOutOfResource); @@ -105,7 +105,7 @@ Result KClientPort::CreateSession(KClientSession** out) { session_reservation.Commit(); // Register the session. - KSession::Register(kernel, session); + KSession::Register(m_kernel, session); ON_RESULT_FAILURE { session->GetClientSession().Close(); session->GetServerSession().Close(); diff --git a/src/core/hle/kernel/k_client_session.cpp b/src/core/hle/kernel/k_client_session.cpp index c9196d04b..62a8fab45 100644 --- a/src/core/hle/kernel/k_client_session.cpp +++ b/src/core/hle/kernel/k_client_session.cpp @@ -12,8 +12,7 @@ namespace Kernel { static constexpr u32 MessageBufferSize = 0x100; -KClientSession::KClientSession(KernelCore& kernel_) - : KAutoObjectWithSlabHeapAndContainer{kernel_} {} +KClientSession::KClientSession(KernelCore& kernel) : KAutoObjectWithSlabHeapAndContainer{kernel} {} KClientSession::~KClientSession() = default; void KClientSession::Destroy() { @@ -25,12 +24,12 @@ void KClientSession::OnServerClosed() {} Result KClientSession::SendSyncRequest() { // Create a session request. - KSessionRequest* request = KSessionRequest::Create(kernel); + KSessionRequest* request = KSessionRequest::Create(m_kernel); R_UNLESS(request != nullptr, ResultOutOfResource); SCOPE_EXIT({ request->Close(); }); // Initialize the request. - request->Initialize(nullptr, GetCurrentThread(kernel).GetTLSAddress(), MessageBufferSize); + request->Initialize(nullptr, GetCurrentThread(m_kernel).GetTLSAddress(), MessageBufferSize); // Send the request. R_RETURN(m_parent->GetServerSession().OnRequest(request)); diff --git a/src/core/hle/kernel/k_client_session.h b/src/core/hle/kernel/k_client_session.h index ecde2549c..9b62e55e4 100644 --- a/src/core/hle/kernel/k_client_session.h +++ b/src/core/hle/kernel/k_client_session.h @@ -30,7 +30,7 @@ class KClientSession final KERNEL_AUTOOBJECT_TRAITS(KClientSession, KAutoObject); public: - explicit KClientSession(KernelCore& kernel_); + explicit KClientSession(KernelCore& kernel); ~KClientSession() override; void Initialize(KSession* parent) { diff --git a/src/core/hle/kernel/k_code_memory.cpp b/src/core/hle/kernel/k_code_memory.cpp index 4167ade2b..89df6b5d8 100644 --- a/src/core/hle/kernel/k_code_memory.cpp +++ b/src/core/hle/kernel/k_code_memory.cpp @@ -16,18 +16,18 @@ namespace Kernel { -KCodeMemory::KCodeMemory(KernelCore& kernel_) - : KAutoObjectWithSlabHeapAndContainer{kernel_}, m_lock(kernel_) {} +KCodeMemory::KCodeMemory(KernelCore& kernel) + : KAutoObjectWithSlabHeapAndContainer{kernel}, m_lock(kernel) {} Result KCodeMemory::Initialize(Core::DeviceMemory& device_memory, VAddr addr, size_t size) { // Set members. - m_owner = GetCurrentProcessPointer(kernel); + m_owner = GetCurrentProcessPointer(m_kernel); // Get the owner page table. auto& page_table = m_owner->PageTable(); // Construct the page group. - m_page_group.emplace(kernel, page_table.GetBlockInfoManager()); + m_page_group.emplace(m_kernel, page_table.GetBlockInfoManager()); // Lock the memory. R_TRY(page_table.LockForCodeMemory(std::addressof(*m_page_group), addr, size)) @@ -74,7 +74,7 @@ Result KCodeMemory::Map(VAddr address, size_t size) { R_UNLESS(!m_is_mapped, ResultInvalidState); // Map the memory. - R_TRY(GetCurrentProcess(kernel).PageTable().MapPageGroup( + R_TRY(GetCurrentProcess(m_kernel).PageTable().MapPageGroup( address, *m_page_group, KMemoryState::CodeOut, KMemoryPermission::UserReadWrite)); // Mark ourselves as mapped. @@ -91,8 +91,8 @@ Result KCodeMemory::Unmap(VAddr address, size_t size) { KScopedLightLock lk(m_lock); // Unmap the memory. - R_TRY(GetCurrentProcess(kernel).PageTable().UnmapPageGroup(address, *m_page_group, - KMemoryState::CodeOut)); + R_TRY(GetCurrentProcess(m_kernel).PageTable().UnmapPageGroup(address, *m_page_group, + KMemoryState::CodeOut)); // Mark ourselves as unmapped. m_is_mapped = false; diff --git a/src/core/hle/kernel/k_code_memory.h b/src/core/hle/kernel/k_code_memory.h index fa63c18df..23cbb283b 100644 --- a/src/core/hle/kernel/k_code_memory.h +++ b/src/core/hle/kernel/k_code_memory.h @@ -29,7 +29,7 @@ class KCodeMemory final KERNEL_AUTOOBJECT_TRAITS(KCodeMemory, KAutoObject); public: - explicit KCodeMemory(KernelCore& kernel_); + explicit KCodeMemory(KernelCore& kernel); Result Initialize(Core::DeviceMemory& device_memory, VAddr address, size_t size); void Finalize() override; diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cpp index 0dc01f6aa..067f26fba 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/core/hle/kernel/k_condition_variable.cpp @@ -57,8 +57,8 @@ bool UpdateLockAtomic(Core::System& system, u32* out, VAddr address, u32 if_zero class ThreadQueueImplForKConditionVariableWaitForAddress final : public KThreadQueue { public: - explicit ThreadQueueImplForKConditionVariableWaitForAddress(KernelCore& kernel_) - : KThreadQueue(kernel_) {} + explicit ThreadQueueImplForKConditionVariableWaitForAddress(KernelCore& kernel) + : KThreadQueue(kernel) {} void CancelWait(KThread* waiting_thread, Result wait_result, bool cancel_timer_task) override { // Remove the thread as a waiter from its owner. @@ -75,8 +75,8 @@ private: public: explicit ThreadQueueImplForKConditionVariableWaitConditionVariable( - KernelCore& kernel_, KConditionVariable::ThreadTree* t) - : KThreadQueue(kernel_), m_tree(t) {} + KernelCore& kernel, KConditionVariable::ThreadTree* t) + : KThreadQueue(kernel), m_tree(t) {} void CancelWait(KThread* waiting_thread, Result wait_result, bool cancel_timer_task) override { // Remove the thread as a waiter from its owner. diff --git a/src/core/hle/kernel/k_debug.h b/src/core/hle/kernel/k_debug.h index 9ffcf27d1..2290e3bca 100644 --- a/src/core/hle/kernel/k_debug.h +++ b/src/core/hle/kernel/k_debug.h @@ -12,7 +12,7 @@ class KDebug final : public KAutoObjectWithSlabHeapAndContainerGetFreeValue(LimitableResource::PhysicalMemoryMax) + page_table.GetNormalMemorySize() + GetSystemResourceSize() + image_size + main_thread_stack_size}; - if (const auto pool_size = kernel.MemoryManager().GetSize(KMemoryManager::Pool::Application); + if (const auto pool_size = m_kernel.MemoryManager().GetSize(KMemoryManager::Pool::Application); capacity != pool_size) { LOG_WARNING(Kernel, "capacity {} != application pool size {}", capacity, pool_size); } @@ -150,7 +150,7 @@ u64 KProcess::GetTotalPhysicalMemoryUsedWithoutSystemResource() { } bool KProcess::ReleaseUserException(KThread* thread) { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; if (exception_thread == thread) { exception_thread = nullptr; @@ -164,7 +164,7 @@ bool KProcess::ReleaseUserException(KThread* thread) { next->EndWait(ResultSuccess); } - KScheduler::SetSchedulerUpdateNeeded(kernel); + KScheduler::SetSchedulerUpdateNeeded(m_kernel); return true; } else { @@ -173,11 +173,11 @@ bool KProcess::ReleaseUserException(KThread* thread) { } void KProcess::PinCurrentThread(s32 core_id) { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); // Get the current thread. KThread* cur_thread = - kernel.Scheduler(static_cast(core_id)).GetSchedulerCurrentThread(); + m_kernel.Scheduler(static_cast(core_id)).GetSchedulerCurrentThread(); // If the thread isn't terminated, pin it. if (!cur_thread->IsTerminationRequested()) { @@ -186,27 +186,27 @@ void KProcess::PinCurrentThread(s32 core_id) { cur_thread->Pin(core_id); // An update is needed. - KScheduler::SetSchedulerUpdateNeeded(kernel); + KScheduler::SetSchedulerUpdateNeeded(m_kernel); } } void KProcess::UnpinCurrentThread(s32 core_id) { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); // Get the current thread. KThread* cur_thread = - kernel.Scheduler(static_cast(core_id)).GetSchedulerCurrentThread(); + m_kernel.Scheduler(static_cast(core_id)).GetSchedulerCurrentThread(); // Unpin it. cur_thread->Unpin(); UnpinThread(core_id, cur_thread); // An update is needed. - KScheduler::SetSchedulerUpdateNeeded(kernel); + KScheduler::SetSchedulerUpdateNeeded(m_kernel); } void KProcess::UnpinThread(KThread* thread) { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); // Get the thread's core id. const auto core_id = thread->GetActiveCore(); @@ -216,7 +216,7 @@ void KProcess::UnpinThread(KThread* thread) { thread->Unpin(); // An update is needed. - KScheduler::SetSchedulerUpdateNeeded(kernel); + KScheduler::SetSchedulerUpdateNeeded(m_kernel); } Result KProcess::AddSharedMemory(KSharedMemory* shmem, [[maybe_unused]] VAddr address, @@ -234,7 +234,7 @@ Result KProcess::AddSharedMemory(KSharedMemory* shmem, [[maybe_unused]] VAddr ad } if (shemen_info == nullptr) { - shemen_info = KSharedMemoryInfo::Allocate(kernel); + shemen_info = KSharedMemoryInfo::Allocate(m_kernel); R_UNLESS(shemen_info != nullptr, ResultOutOfMemory); shemen_info->Initialize(shmem); @@ -265,7 +265,7 @@ void KProcess::RemoveSharedMemory(KSharedMemory* shmem, [[maybe_unused]] VAddr a if (shemen_info->Close()) { shared_memory_list.erase(iter); - KSharedMemoryInfo::Free(kernel, shemen_info); + KSharedMemoryInfo::Free(m_kernel, shemen_info); } // Close a reference to the shared memory. @@ -298,7 +298,7 @@ u64 KProcess::GetFreeThreadCount() const { Result KProcess::Reset() { // Lock the process and the scheduler. KScopedLightLock lk(state_lock); - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Validate that we're in a state that we can reset. R_UNLESS(state != State::Terminated, ResultInvalidState); @@ -313,7 +313,7 @@ Result KProcess::SetActivity(ProcessActivity activity) { // Lock ourselves and the scheduler. KScopedLightLock lk{state_lock}; KScopedLightLock list_lk{list_lock}; - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Validate our state. R_UNLESS(state != State::Terminating, ResultInvalidState); @@ -366,7 +366,7 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std: // Initialize process address space if (const Result result{page_table.InitializeForProcess( metadata.GetAddressSpaceType(), false, false, false, KMemoryManager::Pool::Application, - 0x8000000, code_size, &kernel.GetAppSystemResource(), resource_limit)}; + 0x8000000, code_size, &m_kernel.GetAppSystemResource(), resource_limit)}; result.IsError()) { R_RETURN(result); } @@ -421,7 +421,7 @@ void KProcess::Run(s32 main_thread_priority, u64 stack_size) { ChangeState(State::Running); - SetupMainThread(kernel.System(), *this, main_thread_priority, main_thread_stack_top); + SetupMainThread(m_kernel.System(), *this, main_thread_priority, main_thread_stack_top); } void KProcess::PrepareForTermination() { @@ -432,7 +432,7 @@ void KProcess::PrepareForTermination() { if (thread->GetOwnerProcess() != this) continue; - if (thread == GetCurrentThreadPointer(kernel)) + if (thread == GetCurrentThreadPointer(m_kernel)) continue; // TODO(Subv): When are the other running/ready threads terminated? @@ -443,7 +443,7 @@ void KProcess::PrepareForTermination() { } }; - stop_threads(kernel.System().GlobalSchedulerContext().GetThreadList()); + stop_threads(m_kernel.System().GlobalSchedulerContext().GetThreadList()); this->DeleteThreadLocalRegion(plr_address); plr_address = 0; @@ -471,7 +471,7 @@ void KProcess::Finalize() { shmem->Close(); it = shared_memory_list.erase(it); - KSharedMemoryInfo::Free(kernel, info); + KSharedMemoryInfo::Free(m_kernel, info); } } @@ -494,7 +494,7 @@ Result KProcess::CreateThreadLocalRegion(VAddr* out) { // See if we can get a region from a partially used TLP. { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; if (auto it = partially_used_tlp_tree.begin(); it != partially_used_tlp_tree.end()) { tlr = it->Reserve(); @@ -512,12 +512,12 @@ Result KProcess::CreateThreadLocalRegion(VAddr* out) { } // Allocate a new page. - tlp = KThreadLocalPage::Allocate(kernel); + tlp = KThreadLocalPage::Allocate(m_kernel); R_UNLESS(tlp != nullptr, ResultOutOfMemory); - auto tlp_guard = SCOPE_GUARD({ KThreadLocalPage::Free(kernel, tlp); }); + auto tlp_guard = SCOPE_GUARD({ KThreadLocalPage::Free(m_kernel, tlp); }); // Initialize the new page. - R_TRY(tlp->Initialize(kernel, this)); + R_TRY(tlp->Initialize(m_kernel, this)); // Reserve a TLR. tlr = tlp->Reserve(); @@ -525,7 +525,7 @@ Result KProcess::CreateThreadLocalRegion(VAddr* out) { // Insert into our tree. { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; if (tlp->IsAllUsed()) { fully_used_tlp_tree.insert(*tlp); } else { @@ -544,7 +544,7 @@ Result KProcess::DeleteThreadLocalRegion(VAddr addr) { // Release the region. { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Try to find the page in the partially used list. auto it = partially_used_tlp_tree.find_key(Common::AlignDown(addr, PageSize)); @@ -581,7 +581,7 @@ Result KProcess::DeleteThreadLocalRegion(VAddr addr) { if (page_to_free != nullptr) { page_to_free->Finalize(); - KThreadLocalPage::Free(kernel, page_to_free); + KThreadLocalPage::Free(m_kernel, page_to_free); } R_SUCCEED(); @@ -639,8 +639,8 @@ void KProcess::LoadModule(CodeSet code_set, VAddr base_addr) { page_table.SetProcessMemoryPermission(segment.addr + base_addr, segment.size, permission); }; - kernel.System().Memory().WriteBlock(*this, base_addr, code_set.memory.data(), - code_set.memory.size()); + m_kernel.System().Memory().WriteBlock(*this, base_addr, code_set.memory.data(), + code_set.memory.size()); ReprotectSegment(code_set.CodeSegment(), Svc::MemoryPermission::ReadExecute); ReprotectSegment(code_set.RODataSegment(), Svc::MemoryPermission::Read); @@ -648,14 +648,14 @@ void KProcess::LoadModule(CodeSet code_set, VAddr base_addr) { } bool KProcess::IsSignaled() const { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); return is_signaled; } -KProcess::KProcess(KernelCore& kernel_) - : KAutoObjectWithSlabHeapAndContainer{kernel_}, page_table{kernel_.System()}, - handle_table{kernel_}, address_arbiter{kernel_.System()}, condition_var{kernel_.System()}, - state_lock{kernel_}, list_lock{kernel_} {} +KProcess::KProcess(KernelCore& kernel) + : KAutoObjectWithSlabHeapAndContainer{kernel}, page_table{m_kernel.System()}, + handle_table{m_kernel}, address_arbiter{m_kernel.System()}, condition_var{m_kernel.System()}, + state_lock{m_kernel}, list_lock{m_kernel} {} KProcess::~KProcess() = default; diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.h index 8d65be17a..a19d9b09d 100644 --- a/src/core/hle/kernel/k_process.h +++ b/src/core/hle/kernel/k_process.h @@ -68,7 +68,7 @@ class KProcess final : public KAutoObjectWithSlabHeapAndContainerOnReadableEventDestroyed(); } m_parent->Close(); @@ -41,7 +41,7 @@ void KReadableEvent::Destroy() { } Result KReadableEvent::Signal() { - KScopedSchedulerLock lk{kernel}; + KScopedSchedulerLock lk{m_kernel}; if (!m_is_signaled) { m_is_signaled = true; @@ -58,7 +58,7 @@ Result KReadableEvent::Clear() { } Result KReadableEvent::Reset() { - KScopedSchedulerLock lk{kernel}; + KScopedSchedulerLock lk{m_kernel}; R_UNLESS(m_is_signaled, ResultInvalidState); diff --git a/src/core/hle/kernel/k_readable_event.h b/src/core/hle/kernel/k_readable_event.h index 743f96bf5..d2ec36323 100644 --- a/src/core/hle/kernel/k_readable_event.h +++ b/src/core/hle/kernel/k_readable_event.h @@ -17,7 +17,7 @@ class KReadableEvent : public KSynchronizationObject { KERNEL_AUTOOBJECT_TRAITS(KReadableEvent, KSynchronizationObject); public: - explicit KReadableEvent(KernelCore& kernel_); + explicit KReadableEvent(KernelCore& kernel); ~KReadableEvent() override; void Initialize(KEvent* parent); diff --git a/src/core/hle/kernel/k_resource_limit.cpp b/src/core/hle/kernel/k_resource_limit.cpp index 2847da291..e224e1622 100644 --- a/src/core/hle/kernel/k_resource_limit.cpp +++ b/src/core/hle/kernel/k_resource_limit.cpp @@ -11,8 +11,8 @@ namespace Kernel { constexpr s64 DefaultTimeout = 10000000000; // 10 seconds -KResourceLimit::KResourceLimit(KernelCore& kernel_) - : KAutoObjectWithSlabHeapAndContainer{kernel_}, lock{kernel_}, cond_var{kernel_} {} +KResourceLimit::KResourceLimit(KernelCore& kernel) + : KAutoObjectWithSlabHeapAndContainer{kernel}, lock{kernel}, cond_var{kernel} {} KResourceLimit::~KResourceLimit() = default; void KResourceLimit::Initialize(const Core::Timing::CoreTiming* core_timing_) { diff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/core/hle/kernel/k_scheduler.cpp index d6c214237..b631ec406 100644 --- a/src/core/hle/kernel/k_scheduler.cpp +++ b/src/core/hle/kernel/k_scheduler.cpp @@ -27,7 +27,7 @@ static void IncrementScheduledCount(Kernel::KThread* thread) { } } -KScheduler::KScheduler(KernelCore& kernel_) : kernel{kernel_} { +KScheduler::KScheduler(KernelCore& kernel) : m_kernel{kernel} { m_switch_fiber = std::make_shared([this] { while (true) { ScheduleImplFiber(); @@ -47,7 +47,7 @@ void KScheduler::SetInterruptTaskRunnable() { void KScheduler::RequestScheduleOnInterrupt() { m_state.needs_scheduling = true; - if (CanSchedule(kernel)) { + if (CanSchedule(m_kernel)) { ScheduleOnInterrupt(); } } @@ -97,50 +97,50 @@ u64 KScheduler::UpdateHighestPriorityThreads(KernelCore& kernel) { } void KScheduler::Schedule() { - ASSERT(GetCurrentThread(kernel).GetDisableDispatchCount() == 1); - ASSERT(m_core_id == GetCurrentCoreId(kernel)); + ASSERT(GetCurrentThread(m_kernel).GetDisableDispatchCount() == 1); + ASSERT(m_core_id == GetCurrentCoreId(m_kernel)); ScheduleImpl(); } void KScheduler::ScheduleOnInterrupt() { - GetCurrentThread(kernel).DisableDispatch(); + GetCurrentThread(m_kernel).DisableDispatch(); Schedule(); - GetCurrentThread(kernel).EnableDispatch(); + GetCurrentThread(m_kernel).EnableDispatch(); } void KScheduler::PreemptSingleCore() { - GetCurrentThread(kernel).DisableDispatch(); + GetCurrentThread(m_kernel).DisableDispatch(); - auto* thread = GetCurrentThreadPointer(kernel); - auto& previous_scheduler = kernel.Scheduler(thread->GetCurrentCore()); + auto* thread = GetCurrentThreadPointer(m_kernel); + auto& previous_scheduler = m_kernel.Scheduler(thread->GetCurrentCore()); previous_scheduler.Unload(thread); Common::Fiber::YieldTo(thread->GetHostContext(), *m_switch_fiber); - GetCurrentThread(kernel).EnableDispatch(); + GetCurrentThread(m_kernel).EnableDispatch(); } void KScheduler::RescheduleCurrentCore() { - ASSERT(!kernel.IsPhantomModeForSingleCore()); - ASSERT(GetCurrentThread(kernel).GetDisableDispatchCount() == 1); + ASSERT(!m_kernel.IsPhantomModeForSingleCore()); + ASSERT(GetCurrentThread(m_kernel).GetDisableDispatchCount() == 1); - GetCurrentThread(kernel).EnableDispatch(); + GetCurrentThread(m_kernel).EnableDispatch(); if (m_state.needs_scheduling.load()) { // Disable interrupts, and then check again if rescheduling is needed. // KScopedInterruptDisable intr_disable; - kernel.CurrentScheduler()->RescheduleCurrentCoreImpl(); + m_kernel.CurrentScheduler()->RescheduleCurrentCoreImpl(); } } void KScheduler::RescheduleCurrentCoreImpl() { // Check that scheduling is needed. if (m_state.needs_scheduling.load()) [[likely]] { - GetCurrentThread(kernel).DisableDispatch(); + GetCurrentThread(m_kernel).DisableDispatch(); Schedule(); - GetCurrentThread(kernel).EnableDispatch(); + GetCurrentThread(m_kernel).EnableDispatch(); } } @@ -153,14 +153,14 @@ void KScheduler::Initialize(KThread* main_thread, KThread* idle_thread, s32 core // Insert the main thread into the priority queue. // { - // KScopedSchedulerLock lk{kernel}; - // GetPriorityQueue(kernel).PushBack(GetCurrentThreadPointer(kernel)); - // SetSchedulerUpdateNeeded(kernel); + // KScopedSchedulerLock lk{m_kernel}; + // GetPriorityQueue(m_kernel).PushBack(GetCurrentThreadPointer(m_kernel)); + // SetSchedulerUpdateNeeded(m_kernel); // } // Bind interrupt handler. // kernel.GetInterruptManager().BindHandler( - // GetSchedulerInterruptHandler(kernel), KInterruptName::Scheduler, m_core_id, + // GetSchedulerInterruptHandler(m_kernel), KInterruptName::Scheduler, m_core_id, // KInterruptController::PriorityLevel::Scheduler, false, false); // Set the current thread. @@ -168,7 +168,7 @@ void KScheduler::Initialize(KThread* main_thread, KThread* idle_thread, s32 core } void KScheduler::Activate() { - ASSERT(GetCurrentThread(kernel).GetDisableDispatchCount() == 1); + ASSERT(GetCurrentThread(m_kernel).GetDisableDispatchCount() == 1); // m_state.should_count_idle = KTargetSystem::IsDebugMode(); m_is_active = true; @@ -176,7 +176,7 @@ void KScheduler::Activate() { } void KScheduler::OnThreadStart() { - GetCurrentThread(kernel).EnableDispatch(); + GetCurrentThread(m_kernel).EnableDispatch(); } u64 KScheduler::UpdateHighestPriorityThread(KThread* highest_thread) { @@ -184,7 +184,7 @@ u64 KScheduler::UpdateHighestPriorityThread(KThread* highest_thread) { prev_highest_thread != highest_thread) [[likely]] { if (prev_highest_thread != nullptr) [[likely]] { IncrementScheduledCount(prev_highest_thread); - prev_highest_thread->SetLastScheduledTick(kernel.System().CoreTiming().GetCPUTicks()); + prev_highest_thread->SetLastScheduledTick(m_kernel.System().CoreTiming().GetCPUTicks()); } if (m_state.should_count_idle) { if (highest_thread != nullptr) [[likely]] { @@ -328,8 +328,8 @@ u64 KScheduler::UpdateHighestPriorityThreadsImpl(KernelCore& kernel) { } void KScheduler::SwitchThread(KThread* next_thread) { - KProcess* const cur_process = GetCurrentProcessPointer(kernel); - KThread* const cur_thread = GetCurrentThreadPointer(kernel); + KProcess* const cur_process = GetCurrentProcessPointer(m_kernel); + KThread* const cur_thread = GetCurrentThreadPointer(m_kernel); // We never want to schedule a null thread, so use the idle thread if we don't have a next. if (next_thread == nullptr) { @@ -351,7 +351,7 @@ void KScheduler::SwitchThread(KThread* next_thread) { // Update the CPU time tracking variables. const s64 prev_tick = m_last_context_switch_time; - const s64 cur_tick = kernel.System().CoreTiming().GetCPUTicks(); + const s64 cur_tick = m_kernel.System().CoreTiming().GetCPUTicks(); const s64 tick_diff = cur_tick - prev_tick; cur_thread->AddCpuTime(m_core_id, tick_diff); if (cur_process != nullptr) { @@ -375,7 +375,7 @@ void KScheduler::SwitchThread(KThread* next_thread) { // } // Set the new thread. - SetCurrentThread(kernel, next_thread); + SetCurrentThread(m_kernel, next_thread); m_current_thread = next_thread; // Set the new Thread Local region. @@ -388,7 +388,7 @@ void KScheduler::ScheduleImpl() { std::atomic_thread_fence(std::memory_order_seq_cst); // Load the appropriate thread pointers for scheduling. - KThread* const cur_thread{GetCurrentThreadPointer(kernel)}; + KThread* const cur_thread{GetCurrentThreadPointer(m_kernel)}; KThread* highest_priority_thread{m_state.highest_priority_thread}; // Check whether there are runnable interrupt tasks. @@ -493,7 +493,7 @@ void KScheduler::ScheduleImplFiber() { } void KScheduler::Unload(KThread* thread) { - auto& cpu_core = kernel.System().ArmInterface(m_core_id); + auto& cpu_core = m_kernel.System().ArmInterface(m_core_id); cpu_core.SaveContext(thread->GetContext32()); cpu_core.SaveContext(thread->GetContext64()); // Save the TPIDR_EL0 system register in case it was modified. @@ -508,7 +508,7 @@ void KScheduler::Unload(KThread* thread) { } void KScheduler::Reload(KThread* thread) { - auto& cpu_core = kernel.System().ArmInterface(m_core_id); + auto& cpu_core = m_kernel.System().ArmInterface(m_core_id); cpu_core.LoadContext(thread->GetContext32()); cpu_core.LoadContext(thread->GetContext64()); cpu_core.SetTlsAddress(thread->GetTLSAddress()); @@ -891,7 +891,7 @@ void KScheduler::YieldToAnyThread(KernelCore& kernel) { void KScheduler::RescheduleOtherCores(u64 cores_needing_scheduling) { if (const u64 core_mask = cores_needing_scheduling & ~(1ULL << m_core_id); core_mask != 0) { - RescheduleCores(kernel, core_mask); + RescheduleCores(m_kernel, core_mask); } } diff --git a/src/core/hle/kernel/k_scheduler.h b/src/core/hle/kernel/k_scheduler.h index 3f13b8193..d85a0c040 100644 --- a/src/core/hle/kernel/k_scheduler.h +++ b/src/core/hle/kernel/k_scheduler.h @@ -149,7 +149,7 @@ private: KInterruptTaskManager* interrupt_task_manager{nullptr}; }; - KernelCore& kernel; + KernelCore& m_kernel; SchedulingState m_state; bool m_is_active{false}; s32 m_core_id{0}; diff --git a/src/core/hle/kernel/k_server_port.cpp b/src/core/hle/kernel/k_server_port.cpp index dc70ee848..a29d34bc1 100644 --- a/src/core/hle/kernel/k_server_port.cpp +++ b/src/core/hle/kernel/k_server_port.cpp @@ -12,7 +12,7 @@ namespace Kernel { -KServerPort::KServerPort(KernelCore& kernel_) : KSynchronizationObject{kernel_} {} +KServerPort::KServerPort(KernelCore& kernel) : KSynchronizationObject{kernel} {} KServerPort::~KServerPort() = default; void KServerPort::Initialize(KPort* parent) { @@ -35,7 +35,7 @@ void KServerPort::CleanupSessions() { // Get the last session in the list KServerSession* session = nullptr; { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; if (!m_session_list.empty()) { session = std::addressof(m_session_list.front()); m_session_list.pop_front(); @@ -74,7 +74,7 @@ bool KServerPort::IsSignaled() const { void KServerPort::EnqueueSession(KServerSession* session) { ASSERT(!this->IsLight()); - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Add the session to our queue. m_session_list.push_back(*session); @@ -86,7 +86,7 @@ void KServerPort::EnqueueSession(KServerSession* session) { KServerSession* KServerPort::AcceptSession() { ASSERT(!this->IsLight()); - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Return the first session in the list. if (m_session_list.empty()) { diff --git a/src/core/hle/kernel/k_server_port.h b/src/core/hle/kernel/k_server_port.h index 964767156..21c040e62 100644 --- a/src/core/hle/kernel/k_server_port.h +++ b/src/core/hle/kernel/k_server_port.h @@ -22,7 +22,7 @@ class KServerPort final : public KSynchronizationObject { KERNEL_AUTOOBJECT_TRAITS(KServerPort, KSynchronizationObject); public: - explicit KServerPort(KernelCore& kernel_); + explicit KServerPort(KernelCore& kernel); ~KServerPort() override; void Initialize(KPort* parent); diff --git a/src/core/hle/kernel/k_server_session.cpp b/src/core/hle/kernel/k_server_session.cpp index c68ec09ce..e9b4ef528 100644 --- a/src/core/hle/kernel/k_server_session.cpp +++ b/src/core/hle/kernel/k_server_session.cpp @@ -28,8 +28,8 @@ namespace Kernel { using ThreadQueueImplForKServerSessionRequest = KThreadQueue; -KServerSession::KServerSession(KernelCore& kernel_) - : KSynchronizationObject{kernel_}, m_lock{kernel_} {} +KServerSession::KServerSession(KernelCore& kernel) + : KSynchronizationObject{kernel}, m_lock{m_kernel} {} KServerSession::~KServerSession() = default; @@ -56,7 +56,7 @@ void KServerSession::OnClientClosed() { // Get the next request. { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; if (m_current_request != nullptr && m_current_request != prev_request) { // Set the request, open a reference as we process it. @@ -135,7 +135,7 @@ void KServerSession::OnClientClosed() { } bool KServerSession::IsSignaled() const { - ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // If the client is closed, we're always signaled. if (m_parent->IsClientClosed()) { @@ -148,17 +148,17 @@ bool KServerSession::IsSignaled() const { Result KServerSession::OnRequest(KSessionRequest* request) { // Create the wait queue. - ThreadQueueImplForKServerSessionRequest wait_queue{kernel}; + ThreadQueueImplForKServerSessionRequest wait_queue{m_kernel}; { // Lock the scheduler. - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Ensure that we can handle new requests. R_UNLESS(!m_parent->IsServerClosed(), ResultSessionClosed); // Check that we're not terminating. - R_UNLESS(!GetCurrentThread(kernel).IsTerminationRequested(), ResultTerminationRequested); + R_UNLESS(!GetCurrentThread(m_kernel).IsTerminationRequested(), ResultTerminationRequested); // Get whether we're empty. const bool was_empty = m_request_list.empty(); @@ -176,11 +176,11 @@ Result KServerSession::OnRequest(KSessionRequest* request) { R_SUCCEED_IF(request->GetEvent() != nullptr); // This is a synchronous request, so we should wait for our request to complete. - GetCurrentThread(kernel).SetWaitReasonForDebugging(ThreadWaitReasonForDebugging::IPC); - GetCurrentThread(kernel).BeginWait(&wait_queue); + GetCurrentThread(m_kernel).SetWaitReasonForDebugging(ThreadWaitReasonForDebugging::IPC); + GetCurrentThread(m_kernel).BeginWait(&wait_queue); } - return GetCurrentThread(kernel).GetWaitResult(); + return GetCurrentThread(m_kernel).GetWaitResult(); } Result KServerSession::SendReply(bool is_hle) { @@ -190,7 +190,7 @@ Result KServerSession::SendReply(bool is_hle) { // Get the request. KSessionRequest* request; { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Get the current request. request = m_current_request; @@ -222,8 +222,8 @@ Result KServerSession::SendReply(bool is_hle) { // HLE servers write directly to a pointer to the thread command buffer. Therefore // the reply has already been written in this case. } else { - Core::Memory::Memory& memory{kernel.System().Memory()}; - KThread* server_thread{GetCurrentThreadPointer(kernel)}; + Core::Memory::Memory& memory{m_kernel.System().Memory()}; + KThread* server_thread{GetCurrentThreadPointer(m_kernel)}; UNIMPLEMENTED_IF(server_thread->GetOwnerProcess() != client_thread->GetOwnerProcess()); auto* src_msg_buffer = memory.GetPointer(server_thread->GetTLSAddress()); @@ -264,7 +264,7 @@ Result KServerSession::SendReply(bool is_hle) { event->Signal(); } else { // End the client thread's wait. - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; if (!client_thread->IsTerminationRequested()) { client_thread->EndWait(client_result); @@ -285,7 +285,7 @@ Result KServerSession::ReceiveRequest(std::shared_ptrIsClientClosed(), ResultSessionClosed); @@ -319,18 +319,18 @@ Result KServerSession::ReceiveRequest(std::shared_ptr(memory.GetPointer(client_message))}; *out_context = - std::make_shared(kernel, memory, this, client_thread); + std::make_shared(m_kernel, memory, this, client_thread); (*out_context)->SetSessionRequestManager(manager); (*out_context) ->PopulateFromIncomingCommandBuffer(client_thread->GetOwnerProcess()->GetHandleTable(), cmd_buf); } else { - KThread* server_thread{GetCurrentThreadPointer(kernel)}; + KThread* server_thread{GetCurrentThreadPointer(m_kernel)}; UNIMPLEMENTED_IF(server_thread->GetOwnerProcess() != client_thread->GetOwnerProcess()); auto* src_msg_buffer = memory.GetPointer(client_message); @@ -350,7 +350,7 @@ void KServerSession::CleanupRequests() { // Get the next request. KSessionRequest* request = nullptr; { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; if (m_current_request) { // Choose the current request if we have one. @@ -401,7 +401,7 @@ void KServerSession::CleanupRequests() { event->Signal(); } else { // End the client thread's wait. - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; if (!client_thread->IsTerminationRequested()) { client_thread->EndWait(ResultSessionClosed); diff --git a/src/core/hle/kernel/k_server_session.h b/src/core/hle/kernel/k_server_session.h index e340e4dd8..5ee02f556 100644 --- a/src/core/hle/kernel/k_server_session.h +++ b/src/core/hle/kernel/k_server_session.h @@ -33,7 +33,7 @@ class KServerSession final : public KSynchronizationObject, friend class ServiceThread; public: - explicit KServerSession(KernelCore& kernel_); + explicit KServerSession(KernelCore& kernel); ~KServerSession() override; void Destroy() override; diff --git a/src/core/hle/kernel/k_session.cpp b/src/core/hle/kernel/k_session.cpp index 771ad68bf..44d7a8f02 100644 --- a/src/core/hle/kernel/k_session.cpp +++ b/src/core/hle/kernel/k_session.cpp @@ -9,8 +9,8 @@ namespace Kernel { -KSession::KSession(KernelCore& kernel_) - : KAutoObjectWithSlabHeapAndContainer{kernel_}, m_server{kernel_}, m_client{kernel_} {} +KSession::KSession(KernelCore& kernel) + : KAutoObjectWithSlabHeapAndContainer{kernel}, m_server{kernel}, m_client{kernel} {} KSession::~KSession() = default; void KSession::Initialize(KClientPort* client_port, uintptr_t name) { @@ -34,7 +34,7 @@ void KSession::Initialize(KClientPort* client_port, uintptr_t name) { // Set our owner process. //! FIXME: this is the wrong process! - m_process = kernel.ApplicationProcess(); + m_process = m_kernel.ApplicationProcess(); m_process->Open(); // Set our port. diff --git a/src/core/hle/kernel/k_session.h b/src/core/hle/kernel/k_session.h index ab553a04c..f69bab088 100644 --- a/src/core/hle/kernel/k_session.h +++ b/src/core/hle/kernel/k_session.h @@ -18,7 +18,7 @@ class KSession final : public KAutoObjectWithSlabHeapAndContainerFinalize(); - KSessionRequest::Free(kernel, this); + KSessionRequest::Free(m_kernel, this); } void Initialize(KEvent* event, uintptr_t address, size_t size) { m_mappings.Initialize(); - m_thread = GetCurrentThreadPointer(kernel); + m_thread = GetCurrentThreadPointer(m_kernel); m_event = event; m_address = address; m_size = size; diff --git a/src/core/hle/kernel/k_shared_memory.cpp b/src/core/hle/kernel/k_shared_memory.cpp index bf134f7c8..b7b3b612b 100644 --- a/src/core/hle/kernel/k_shared_memory.cpp +++ b/src/core/hle/kernel/k_shared_memory.cpp @@ -12,7 +12,7 @@ namespace Kernel { -KSharedMemory::KSharedMemory(KernelCore& kernel_) : KAutoObjectWithSlabHeapAndContainer{kernel_} {} +KSharedMemory::KSharedMemory(KernelCore& kernel) : KAutoObjectWithSlabHeapAndContainer{kernel} {} KSharedMemory::~KSharedMemory() = default; Result KSharedMemory::Initialize(Core::DeviceMemory& device_memory, KProcess* owner_process, @@ -28,7 +28,7 @@ Result KSharedMemory::Initialize(Core::DeviceMemory& device_memory, KProcess* ow const size_t num_pages = Common::DivideUp(size, PageSize); // Get the resource limit. - KResourceLimit* reslimit = kernel.GetSystemResourceLimit(); + KResourceLimit* reslimit = m_kernel.GetSystemResourceLimit(); // Reserve memory for ourselves. KScopedResourceReservation memory_reservation(reslimit, LimitableResource::PhysicalMemoryMax, @@ -40,11 +40,11 @@ Result KSharedMemory::Initialize(Core::DeviceMemory& device_memory, KProcess* ow //! HACK: Open continuous mapping from sysmodule pool. auto option = KMemoryManager::EncodeOption(KMemoryManager::Pool::Secure, KMemoryManager::Direction::FromBack); - m_physical_address = kernel.MemoryManager().AllocateAndOpenContinuous(num_pages, 1, option); + m_physical_address = m_kernel.MemoryManager().AllocateAndOpenContinuous(num_pages, 1, option); R_UNLESS(m_physical_address != 0, ResultOutOfMemory); //! Insert the result into our page group. - m_page_group.emplace(kernel, &kernel.GetSystemSystemResource().GetBlockInfoManager()); + m_page_group.emplace(m_kernel, &m_kernel.GetSystemSystemResource().GetBlockInfoManager()); m_page_group->AddBlock(m_physical_address, num_pages); // Commit our reservation. diff --git a/src/core/hle/kernel/k_shared_memory.h b/src/core/hle/kernel/k_shared_memory.h index 8c94ceb3a..b4c4125bb 100644 --- a/src/core/hle/kernel/k_shared_memory.h +++ b/src/core/hle/kernel/k_shared_memory.h @@ -23,7 +23,7 @@ class KSharedMemory final KERNEL_AUTOOBJECT_TRAITS(KSharedMemory, KAutoObject); public: - explicit KSharedMemory(KernelCore& kernel_); + explicit KSharedMemory(KernelCore& kernel); ~KSharedMemory() override; Result Initialize(Core::DeviceMemory& device_memory_, KProcess* owner_process_, diff --git a/src/core/hle/kernel/k_synchronization_object.cpp b/src/core/hle/kernel/k_synchronization_object.cpp index dd912a82d..b7da3eee7 100644 --- a/src/core/hle/kernel/k_synchronization_object.cpp +++ b/src/core/hle/kernel/k_synchronization_object.cpp @@ -17,9 +17,9 @@ namespace { class ThreadQueueImplForKSynchronizationObjectWait final : public KThreadQueueWithoutEndWait { public: - ThreadQueueImplForKSynchronizationObjectWait(KernelCore& kernel_, KSynchronizationObject** o, + ThreadQueueImplForKSynchronizationObjectWait(KernelCore& kernel, KSynchronizationObject** o, KSynchronizationObject::ThreadListNode* n, s32 c) - : KThreadQueueWithoutEndWait(kernel_), m_objects(o), m_nodes(n), m_count(c) {} + : KThreadQueueWithoutEndWait(kernel), m_objects(o), m_nodes(n), m_count(c) {} void NotifyAvailable(KThread* waiting_thread, KSynchronizationObject* signaled_object, Result wait_result) override { @@ -144,13 +144,12 @@ Result KSynchronizationObject::Wait(KernelCore& kernel, s32* out_index, R_RETURN(thread->GetWaitResult()); } -KSynchronizationObject::KSynchronizationObject(KernelCore& kernel_) - : KAutoObjectWithList{kernel_} {} +KSynchronizationObject::KSynchronizationObject(KernelCore& kernel) : KAutoObjectWithList{kernel} {} KSynchronizationObject::~KSynchronizationObject() = default; void KSynchronizationObject::NotifyAvailable(Result result) { - KScopedSchedulerLock sl(kernel); + KScopedSchedulerLock sl(m_kernel); // If we're not signaled, we've nothing to notify. if (!this->IsSignaled()) { @@ -168,7 +167,7 @@ std::vector KSynchronizationObject::GetWaitingThreadsForDebugging() co // If debugging, dump the list of waiters. { - KScopedSchedulerLock lock(kernel); + KScopedSchedulerLock lock(m_kernel); for (auto* cur_node = m_thread_list_head; cur_node != nullptr; cur_node = cur_node->next) { threads.emplace_back(cur_node->thread); } diff --git a/src/core/hle/kernel/k_system_resource.h b/src/core/hle/kernel/k_system_resource.h index aec058a95..d36aaa9bd 100644 --- a/src/core/hle/kernel/k_system_resource.h +++ b/src/core/hle/kernel/k_system_resource.h @@ -21,7 +21,7 @@ class KSystemResource : public KAutoObject { KERNEL_AUTOOBJECT_TRAITS(KSystemResource, KAutoObject); public: - explicit KSystemResource(KernelCore& kernel_) : KAutoObject(kernel_) {} + explicit KSystemResource(KernelCore& kernel) : KAutoObject(kernel) {} protected: void SetSecureResource() { @@ -87,8 +87,8 @@ private: class KSecureSystemResource final : public KAutoObjectWithSlabHeap { public: - explicit KSecureSystemResource(KernelCore& kernel_) - : KAutoObjectWithSlabHeap(kernel_) { + explicit KSecureSystemResource(KernelCore& kernel) + : KAutoObjectWithSlabHeap(kernel) { // Mark ourselves as being a secure resource. this->SetSecureResource(); } diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index 26e3700e4..49a683e5f 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -77,14 +77,14 @@ struct ThreadLocalRegion { class ThreadQueueImplForKThreadSleep final : public KThreadQueueWithoutEndWait { public: - explicit ThreadQueueImplForKThreadSleep(KernelCore& kernel_) - : KThreadQueueWithoutEndWait(kernel_) {} + explicit ThreadQueueImplForKThreadSleep(KernelCore& kernel) + : KThreadQueueWithoutEndWait(kernel) {} }; class ThreadQueueImplForKThreadSetProperty final : public KThreadQueue { public: - explicit ThreadQueueImplForKThreadSetProperty(KernelCore& kernel_, KThread::WaiterList* wl) - : KThreadQueue(kernel_), m_wait_list(wl) {} + explicit ThreadQueueImplForKThreadSetProperty(KernelCore& kernel, KThread::WaiterList* wl) + : KThreadQueue(kernel), m_wait_list(wl) {} void CancelWait(KThread* waiting_thread, Result wait_result, bool cancel_timer_task) override { // Remove the thread from the wait list. @@ -100,8 +100,8 @@ private: } // namespace -KThread::KThread(KernelCore& kernel_) - : KAutoObjectWithSlabHeapAndContainer{kernel_}, activity_pause_lock{kernel_} {} +KThread::KThread(KernelCore& kernel) + : KAutoObjectWithSlabHeapAndContainer{kernel}, activity_pause_lock{kernel} {} KThread::~KThread() = default; Result KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack_top, s32 prio, @@ -236,7 +236,7 @@ Result KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack SetInExceptionHandler(); // Set thread ID. - thread_id = kernel.CreateNewThreadID(); + thread_id = m_kernel.CreateNewThreadID(); // We initialized! initialized = true; @@ -343,7 +343,7 @@ void KThread::Finalize() { // Release any waiters. { ASSERT(waiting_lock_info == nullptr); - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Check that we have no kernel waiters. ASSERT(num_kernel_waiters == 0); @@ -374,7 +374,7 @@ void KThread::Finalize() { it = held_lock_info_list.erase(it); // Free the lock info. - LockWithPriorityInheritanceInfo::Free(kernel, lock_info); + LockWithPriorityInheritanceInfo::Free(m_kernel, lock_info); } } @@ -390,7 +390,7 @@ bool KThread::IsSignaled() const { } void KThread::OnTimer() { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); // If we're waiting, cancel the wait. if (GetState() == ThreadState::Waiting) { @@ -399,12 +399,12 @@ void KThread::OnTimer() { } void KThread::StartTermination() { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); // Release user exception and unpin, if relevant. if (parent != nullptr) { parent->ReleaseUserException(this); - if (parent->GetPinnedThread(GetCurrentCoreId(kernel)) == this) { + if (parent->GetPinnedThread(GetCurrentCoreId(m_kernel)) == this) { parent->UnpinCurrentThread(core_id); } } @@ -422,7 +422,7 @@ void KThread::StartTermination() { KSynchronizationObject::NotifyAvailable(); // Clear previous thread in KScheduler. - KScheduler::ClearPreviousThread(kernel, this); + KScheduler::ClearPreviousThread(m_kernel, this); // Register terminated dpc flag. RegisterDpc(DpcFlag::Terminated); @@ -434,7 +434,7 @@ void KThread::FinishTermination() { for (std::size_t i = 0; i < static_cast(Core::Hardware::NUM_CPU_CORES); ++i) { KThread* core_thread{}; do { - core_thread = kernel.Scheduler(i).GetSchedulerCurrentThread(); + core_thread = m_kernel.Scheduler(i).GetSchedulerCurrentThread(); } while (core_thread == this); } } @@ -449,7 +449,7 @@ void KThread::DoWorkerTaskImpl() { } void KThread::Pin(s32 current_core) { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); // Set ourselves as pinned. GetStackParameters().is_pinned = true; @@ -472,7 +472,7 @@ void KThread::Pin(s32 current_core) { if (active_core != current_core || physical_affinity_mask.GetAffinityMask() != original_physical_affinity_mask.GetAffinityMask()) { - KScheduler::OnThreadAffinityMaskChanged(kernel, this, original_physical_affinity_mask, + KScheduler::OnThreadAffinityMaskChanged(m_kernel, this, original_physical_affinity_mask, active_core); } } @@ -492,7 +492,7 @@ void KThread::Pin(s32 current_core) { } void KThread::Unpin() { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); // Set ourselves as unpinned. GetStackParameters().is_pinned = false; @@ -520,7 +520,7 @@ void KThread::Unpin() { std::countl_zero(physical_affinity_mask.GetAffinityMask()))); } } - KScheduler::OnThreadAffinityMaskChanged(kernel, this, old_mask, active_core); + KScheduler::OnThreadAffinityMaskChanged(m_kernel, this, old_mask, active_core); } } @@ -549,7 +549,7 @@ u16 KThread::GetUserDisableCount() const { return {}; } - auto& memory = kernel.System().Memory(); + auto& memory = m_kernel.System().Memory(); return memory.Read16(tls_address + offsetof(ThreadLocalRegion, disable_count)); } @@ -559,7 +559,7 @@ void KThread::SetInterruptFlag() { return; } - auto& memory = kernel.System().Memory(); + auto& memory = m_kernel.System().Memory(); memory.Write16(tls_address + offsetof(ThreadLocalRegion, interrupt_flag), 1); } @@ -569,12 +569,12 @@ void KThread::ClearInterruptFlag() { return; } - auto& memory = kernel.System().Memory(); + auto& memory = m_kernel.System().Memory(); memory.Write16(tls_address + offsetof(ThreadLocalRegion, interrupt_flag), 0); } Result KThread::GetCoreMask(s32* out_ideal_core, u64* out_affinity_mask) { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Get the virtual mask. *out_ideal_core = virtual_ideal_core_id; @@ -584,7 +584,7 @@ Result KThread::GetCoreMask(s32* out_ideal_core, u64* out_affinity_mask) { } Result KThread::GetPhysicalCoreMask(s32* out_ideal_core, u64* out_affinity_mask) { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; ASSERT(num_core_migration_disables >= 0); // Select between core mask and original core mask. @@ -607,7 +607,7 @@ Result KThread::SetCoreMask(s32 core_id_, u64 v_affinity_mask) { // Set the core mask. u64 p_affinity_mask = 0; { - KScopedSchedulerLock sl(kernel); + KScopedSchedulerLock sl(m_kernel); ASSERT(num_core_migration_disables >= 0); // If we're updating, set our ideal virtual core. @@ -653,7 +653,7 @@ Result KThread::SetCoreMask(s32 core_id_, u64 v_affinity_mask) { std::countl_zero(physical_affinity_mask.GetAffinityMask())); SetActiveCore(new_core); } - KScheduler::OnThreadAffinityMaskChanged(kernel, this, old_mask, active_core); + KScheduler::OnThreadAffinityMaskChanged(m_kernel, this, old_mask, active_core); } } else { // Otherwise, we edit the original affinity for restoration later. @@ -663,12 +663,12 @@ Result KThread::SetCoreMask(s32 core_id_, u64 v_affinity_mask) { } // Update the pinned waiter list. - ThreadQueueImplForKThreadSetProperty wait_queue_(kernel, std::addressof(pinned_waiter_list)); + ThreadQueueImplForKThreadSetProperty wait_queue_(m_kernel, std::addressof(pinned_waiter_list)); { bool retry_update{}; do { // Lock the scheduler. - KScopedSchedulerLock sl(kernel); + KScopedSchedulerLock sl(m_kernel); // Don't do any further management if our termination has been requested. R_SUCCEED_IF(IsTerminationRequested()); @@ -681,7 +681,7 @@ Result KThread::SetCoreMask(s32 core_id_, u64 v_affinity_mask) { s32 thread_core; for (thread_core = 0; thread_core < static_cast(Core::Hardware::NUM_CPU_CORES); ++thread_core) { - if (kernel.Scheduler(thread_core).GetSchedulerCurrentThread() == this) { + if (m_kernel.Scheduler(thread_core).GetSchedulerCurrentThread() == this) { thread_is_current = true; break; } @@ -693,12 +693,12 @@ Result KThread::SetCoreMask(s32 core_id_, u64 v_affinity_mask) { // If the thread is pinned, we want to wait until it's not pinned. if (GetStackParameters().is_pinned) { // Verify that the current thread isn't terminating. - R_UNLESS(!GetCurrentThread(kernel).IsTerminationRequested(), + R_UNLESS(!GetCurrentThread(m_kernel).IsTerminationRequested(), ResultTerminationRequested); // Wait until the thread isn't pinned any more. - pinned_waiter_list.push_back(GetCurrentThread(kernel)); - GetCurrentThread(kernel).BeginWait(std::addressof(wait_queue_)); + pinned_waiter_list.push_back(GetCurrentThread(m_kernel)); + GetCurrentThread(m_kernel).BeginWait(std::addressof(wait_queue_)); } else { // If the thread isn't pinned, release the scheduler lock and retry until it's // not current. @@ -714,13 +714,13 @@ Result KThread::SetCoreMask(s32 core_id_, u64 v_affinity_mask) { void KThread::SetBasePriority(s32 value) { ASSERT(Svc::HighestThreadPriority <= value && value <= Svc::LowestThreadPriority); - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Change our base priority. base_priority = value; // Perform a priority restoration. - RestorePriority(kernel, this); + RestorePriority(m_kernel, this); } KThread* KThread::GetLockOwner() const { @@ -729,7 +729,7 @@ KThread* KThread::GetLockOwner() const { void KThread::IncreaseBasePriority(s32 priority_) { ASSERT(Svc::HighestThreadPriority <= priority_ && priority_ <= Svc::LowestThreadPriority); - ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); ASSERT(!this->GetStackParameters().is_pinned); // Set our base priority. @@ -737,12 +737,12 @@ void KThread::IncreaseBasePriority(s32 priority_) { base_priority = priority_; // Perform a priority restoration. - RestorePriority(kernel, this); + RestorePriority(m_kernel, this); } } void KThread::RequestSuspend(SuspendType type) { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Note the request in our flags. suspend_request_flags |= @@ -753,7 +753,7 @@ void KThread::RequestSuspend(SuspendType type) { } void KThread::Resume(SuspendType type) { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Clear the request in our flags. suspend_request_flags &= @@ -764,7 +764,7 @@ void KThread::Resume(SuspendType type) { } void KThread::WaitCancel() { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Check if we're waiting and cancellable. if (this->GetState() == ThreadState::Waiting && cancellable) { @@ -777,7 +777,7 @@ void KThread::WaitCancel() { } void KThread::TrySuspend() { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); ASSERT(IsSuspendRequested()); // Ensure that we have no waiters. @@ -791,7 +791,7 @@ void KThread::TrySuspend() { } void KThread::UpdateState() { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); // Set our suspend flags in state. const ThreadState old_state = thread_state.load(std::memory_order_relaxed); @@ -801,37 +801,37 @@ void KThread::UpdateState() { // Note the state change in scheduler. if (new_state != old_state) { - KScheduler::OnThreadStateChanged(kernel, this, old_state); + KScheduler::OnThreadStateChanged(m_kernel, this, old_state); } } void KThread::Continue() { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); // Clear our suspend flags in state. const ThreadState old_state = thread_state.load(std::memory_order_relaxed); thread_state.store(old_state & ThreadState::Mask, std::memory_order_relaxed); // Note the state change in scheduler. - KScheduler::OnThreadStateChanged(kernel, this, old_state); + KScheduler::OnThreadStateChanged(m_kernel, this, old_state); } void KThread::CloneFpuStatus() { // We shouldn't reach here when starting kernel threads. ASSERT(this->GetOwnerProcess() != nullptr); - ASSERT(this->GetOwnerProcess() == GetCurrentProcessPointer(kernel)); + ASSERT(this->GetOwnerProcess() == GetCurrentProcessPointer(m_kernel)); if (this->GetOwnerProcess()->Is64BitProcess()) { // Clone FPSR and FPCR. ThreadContext64 cur_ctx{}; - kernel.System().CurrentArmInterface().SaveContext(cur_ctx); + m_kernel.System().CurrentArmInterface().SaveContext(cur_ctx); this->GetContext64().fpcr = cur_ctx.fpcr; this->GetContext64().fpsr = cur_ctx.fpsr; } else { // Clone FPSCR. ThreadContext32 cur_ctx{}; - kernel.System().CurrentArmInterface().SaveContext(cur_ctx); + m_kernel.System().CurrentArmInterface().SaveContext(cur_ctx); this->GetContext32().fpscr = cur_ctx.fpscr; } @@ -844,7 +844,7 @@ Result KThread::SetActivity(Svc::ThreadActivity activity) { // Set the activity. { // Lock the scheduler. - KScopedSchedulerLock sl(kernel); + KScopedSchedulerLock sl(m_kernel); // Verify our state. const auto cur_state = this->GetState(); @@ -871,13 +871,13 @@ Result KThread::SetActivity(Svc::ThreadActivity activity) { // If the thread is now paused, update the pinned waiter list. if (activity == Svc::ThreadActivity::Paused) { - ThreadQueueImplForKThreadSetProperty wait_queue_(kernel, + ThreadQueueImplForKThreadSetProperty wait_queue_(m_kernel, std::addressof(pinned_waiter_list)); bool thread_is_current; do { // Lock the scheduler. - KScopedSchedulerLock sl(kernel); + KScopedSchedulerLock sl(m_kernel); // Don't do any further management if our termination has been requested. R_SUCCEED_IF(this->IsTerminationRequested()); @@ -888,17 +888,17 @@ Result KThread::SetActivity(Svc::ThreadActivity activity) { // Check whether the thread is pinned. if (this->GetStackParameters().is_pinned) { // Verify that the current thread isn't terminating. - R_UNLESS(!GetCurrentThread(kernel).IsTerminationRequested(), + R_UNLESS(!GetCurrentThread(m_kernel).IsTerminationRequested(), ResultTerminationRequested); // Wait until the thread isn't pinned any more. - pinned_waiter_list.push_back(GetCurrentThread(kernel)); - GetCurrentThread(kernel).BeginWait(std::addressof(wait_queue_)); + pinned_waiter_list.push_back(GetCurrentThread(m_kernel)); + GetCurrentThread(m_kernel).BeginWait(std::addressof(wait_queue_)); } else { // Check if the thread is currently running. // If it is, we'll need to retry. for (auto i = 0; i < static_cast(Core::Hardware::NUM_CPU_CORES); ++i) { - if (kernel.Scheduler(i).GetSchedulerCurrentThread() == this) { + if (m_kernel.Scheduler(i).GetSchedulerCurrentThread() == this) { thread_is_current = true; break; } @@ -917,7 +917,7 @@ Result KThread::GetThreadContext3(std::vector& out) { // Get the context. { // Lock the scheduler. - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Verify that we're suspended. R_UNLESS(IsSuspendRequested(SuspendType::Thread), ResultInvalidState); @@ -946,7 +946,7 @@ Result KThread::GetThreadContext3(std::vector& out) { } void KThread::AddHeldLock(LockWithPriorityInheritanceInfo* lock_info) { - ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Set ourselves as the lock's owner. lock_info->SetOwner(this); @@ -957,7 +957,7 @@ void KThread::AddHeldLock(LockWithPriorityInheritanceInfo* lock_info) { KThread::LockWithPriorityInheritanceInfo* KThread::FindHeldLock(VAddr address_key_, bool is_kernel_address_key_) { - ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Try to find an existing held lock. for (auto& held_lock : held_lock_info_list) { @@ -971,7 +971,7 @@ KThread::LockWithPriorityInheritanceInfo* KThread::FindHeldLock(VAddr address_ke } void KThread::AddWaiterImpl(KThread* thread) { - ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); ASSERT(thread->GetConditionVariableTree() == nullptr); // Get the thread's address key. @@ -981,7 +981,7 @@ void KThread::AddWaiterImpl(KThread* thread) { // Keep track of how many kernel waiters we have. if (is_kernel_address_key_) { ASSERT((num_kernel_waiters++) >= 0); - KScheduler::SetSchedulerUpdateNeeded(kernel); + KScheduler::SetSchedulerUpdateNeeded(m_kernel); } // Get the relevant lock info. @@ -989,7 +989,7 @@ void KThread::AddWaiterImpl(KThread* thread) { if (lock_info == nullptr) { // Create a new lock for the address key. lock_info = - LockWithPriorityInheritanceInfo::Create(kernel, address_key_, is_kernel_address_key_); + LockWithPriorityInheritanceInfo::Create(m_kernel, address_key_, is_kernel_address_key_); // Add the new lock to our list. this->AddHeldLock(lock_info); @@ -1000,12 +1000,12 @@ void KThread::AddWaiterImpl(KThread* thread) { } void KThread::RemoveWaiterImpl(KThread* thread) { - ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Keep track of how many kernel waiters we have. if (thread->GetIsKernelAddressKey()) { ASSERT((num_kernel_waiters--) > 0); - KScheduler::SetSchedulerUpdateNeeded(kernel); + KScheduler::SetSchedulerUpdateNeeded(m_kernel); } // Get the info for the lock the thread is waiting on. @@ -1015,7 +1015,7 @@ void KThread::RemoveWaiterImpl(KThread* thread) { // Remove the waiter. if (lock_info->RemoveWaiter(thread)) { held_lock_info_list.erase(held_lock_info_list.iterator_to(*lock_info)); - LockWithPriorityInheritanceInfo::Free(kernel, lock_info); + LockWithPriorityInheritanceInfo::Free(m_kernel, lock_info); } } @@ -1076,7 +1076,7 @@ void KThread::AddWaiter(KThread* thread) { // If the thread has a higher priority than us, we should inherit. if (thread->GetPriority() < this->GetPriority()) { - RestorePriority(kernel, this); + RestorePriority(m_kernel, this); } } @@ -1087,12 +1087,12 @@ void KThread::RemoveWaiter(KThread* thread) { // lower priority. if (this->GetPriority() == thread->GetPriority() && this->GetPriority() < this->GetBasePriority()) { - RestorePriority(kernel, this); + RestorePriority(m_kernel, this); } } KThread* KThread::RemoveWaiterByKey(bool* out_has_waiters, VAddr key, bool is_kernel_address_key_) { - ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Get the relevant lock info. auto* lock_info = this->FindHeldLock(key, is_kernel_address_key_); @@ -1108,7 +1108,7 @@ KThread* KThread::RemoveWaiterByKey(bool* out_has_waiters, VAddr key, bool is_ke if (lock_info->GetIsKernelAddressKey()) { num_kernel_waiters -= lock_info->GetWaiterCount(); ASSERT(num_kernel_waiters >= 0); - KScheduler::SetSchedulerUpdateNeeded(kernel); + KScheduler::SetSchedulerUpdateNeeded(m_kernel); } ASSERT(lock_info->GetWaiterCount() > 0); @@ -1120,7 +1120,7 @@ KThread* KThread::RemoveWaiterByKey(bool* out_has_waiters, VAddr key, bool is_ke *out_has_waiters = false; // Free the lock info, since it has no waiters. - LockWithPriorityInheritanceInfo::Free(kernel, lock_info); + LockWithPriorityInheritanceInfo::Free(m_kernel, lock_info); } else { // There are additional waiters on the lock. *out_has_waiters = true; @@ -1142,7 +1142,7 @@ KThread* KThread::RemoveWaiterByKey(bool* out_has_waiters, VAddr key, bool is_ke // to lower priority. if (this->GetPriority() == next_lock_owner->GetPriority() && this->GetPriority() < this->GetBasePriority()) { - RestorePriority(kernel, this); + RestorePriority(m_kernel, this); // NOTE: No need to restore priority on the next lock owner, because it was already the // highest priority waiter on the lock. } @@ -1153,18 +1153,18 @@ KThread* KThread::RemoveWaiterByKey(bool* out_has_waiters, VAddr key, bool is_ke Result KThread::Run() { while (true) { - KScopedSchedulerLock lk{kernel}; + KScopedSchedulerLock lk{m_kernel}; // If either this thread or the current thread are requesting termination, note it. R_UNLESS(!IsTerminationRequested(), ResultTerminationRequested); - R_UNLESS(!GetCurrentThread(kernel).IsTerminationRequested(), ResultTerminationRequested); + R_UNLESS(!GetCurrentThread(m_kernel).IsTerminationRequested(), ResultTerminationRequested); // Ensure our thread state is correct. R_UNLESS(GetState() == ThreadState::Initialized, ResultInvalidState); // If the current thread has been asked to suspend, suspend it and retry. - if (GetCurrentThread(kernel).IsSuspended()) { - GetCurrentThread(kernel).UpdateState(); + if (GetCurrentThread(m_kernel).IsSuspended()) { + GetCurrentThread(m_kernel).UpdateState(); continue; } @@ -1184,7 +1184,7 @@ Result KThread::Run() { } void KThread::Exit() { - ASSERT(this == GetCurrentThreadPointer(kernel)); + ASSERT(this == GetCurrentThreadPointer(m_kernel)); // Release the thread resource hint, running thread count from parent. if (parent != nullptr) { @@ -1195,7 +1195,7 @@ void KThread::Exit() { // Perform termination. { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Disallow all suspension. suspend_allowed_flags = 0; @@ -1208,21 +1208,21 @@ void KThread::Exit() { StartTermination(); // Register the thread as a work task. - KWorkerTaskManager::AddTask(kernel, KWorkerTaskManager::WorkerType::Exit, this); + KWorkerTaskManager::AddTask(m_kernel, KWorkerTaskManager::WorkerType::Exit, this); } UNREACHABLE_MSG("KThread::Exit() would return"); } Result KThread::Terminate() { - ASSERT(this != GetCurrentThreadPointer(kernel)); + ASSERT(this != GetCurrentThreadPointer(m_kernel)); // Request the thread terminate if it hasn't already. if (const auto new_state = this->RequestTerminate(); new_state != ThreadState::Terminated) { // If the thread isn't terminated, wait for it to terminate. s32 index; KSynchronizationObject* objects[] = {this}; - R_TRY(KSynchronizationObject::Wait(kernel, std::addressof(index), objects, 1, + R_TRY(KSynchronizationObject::Wait(m_kernel, std::addressof(index), objects, 1, Svc::WaitInfinite)); } @@ -1230,9 +1230,9 @@ Result KThread::Terminate() { } ThreadState KThread::RequestTerminate() { - ASSERT(this != GetCurrentThreadPointer(kernel)); + ASSERT(this != GetCurrentThreadPointer(m_kernel)); - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Determine if this is the first termination request. const bool first_request = [&]() -> bool { @@ -1268,10 +1268,10 @@ ThreadState KThread::RequestTerminate() { // If the thread is runnable, send a termination interrupt to other cores. if (this->GetState() == ThreadState::Runnable) { - if (const u64 core_mask = - physical_affinity_mask.GetAffinityMask() & ~(1ULL << GetCurrentCoreId(kernel)); + if (const u64 core_mask = physical_affinity_mask.GetAffinityMask() & + ~(1ULL << GetCurrentCoreId(m_kernel)); core_mask != 0) { - Kernel::KInterruptManager::SendInterProcessorInterrupt(kernel, core_mask); + Kernel::KInterruptManager::SendInterProcessorInterrupt(m_kernel, core_mask); } } @@ -1285,15 +1285,15 @@ ThreadState KThread::RequestTerminate() { } Result KThread::Sleep(s64 timeout) { - ASSERT(!kernel.GlobalSchedulerContext().IsLocked()); - ASSERT(this == GetCurrentThreadPointer(kernel)); + ASSERT(!m_kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(this == GetCurrentThreadPointer(m_kernel)); ASSERT(timeout > 0); - ThreadQueueImplForKThreadSleep wait_queue_(kernel); + ThreadQueueImplForKThreadSleep wait_queue_(m_kernel); KHardwareTimer* timer{}; { // Setup the scheduling lock and sleep. - KScopedSchedulerLockAndSleep slp(kernel, std::addressof(timer), this, timeout); + KScopedSchedulerLockAndSleep slp(m_kernel, std::addressof(timer), this, timeout); // Check if the thread should terminate. if (this->IsTerminationRequested()) { @@ -1311,7 +1311,7 @@ Result KThread::Sleep(s64 timeout) { } void KThread::RequestDummyThreadWait() { - ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); ASSERT(this->IsDummyThread()); // We will block when the scheduler lock is released. @@ -1319,7 +1319,7 @@ void KThread::RequestDummyThreadWait() { } void KThread::DummyThreadBeginWait() { - if (!this->IsDummyThread() || kernel.IsPhantomModeForSingleCore()) { + if (!this->IsDummyThread() || m_kernel.IsPhantomModeForSingleCore()) { // Occurs in single core mode. return; } @@ -1329,7 +1329,7 @@ void KThread::DummyThreadBeginWait() { } void KThread::DummyThreadEndWait() { - ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); ASSERT(this->IsDummyThread()); // Wake up the waiting thread. @@ -1347,7 +1347,7 @@ void KThread::BeginWait(KThreadQueue* queue) { void KThread::NotifyAvailable(KSynchronizationObject* signaled_object, Result wait_result_) { // Lock the scheduler. - KScopedSchedulerLock sl(kernel); + KScopedSchedulerLock sl(m_kernel); // If we're waiting, notify our queue that we're available. if (GetState() == ThreadState::Waiting) { @@ -1357,7 +1357,7 @@ void KThread::NotifyAvailable(KSynchronizationObject* signaled_object, Result wa void KThread::EndWait(Result wait_result_) { // Lock the scheduler. - KScopedSchedulerLock sl(kernel); + KScopedSchedulerLock sl(m_kernel); // If we're waiting, notify our queue that we're available. if (GetState() == ThreadState::Waiting) { @@ -1373,7 +1373,7 @@ void KThread::EndWait(Result wait_result_) { void KThread::CancelWait(Result wait_result_, bool cancel_timer_task) { // Lock the scheduler. - KScopedSchedulerLock sl(kernel); + KScopedSchedulerLock sl(m_kernel); // If we're waiting, notify our queue that we're available. if (GetState() == ThreadState::Waiting) { @@ -1382,7 +1382,7 @@ void KThread::CancelWait(Result wait_result_, bool cancel_timer_task) { } void KThread::SetState(ThreadState state) { - KScopedSchedulerLock sl{kernel}; + KScopedSchedulerLock sl{m_kernel}; // Clear debugging state SetMutexWaitAddressForDebugging({}); @@ -1393,7 +1393,7 @@ void KThread::SetState(ThreadState state) { static_cast((old_state & ~ThreadState::Mask) | (state & ThreadState::Mask)), std::memory_order_relaxed); if (thread_state.load(std::memory_order_relaxed) != old_state) { - KScheduler::OnThreadStateChanged(kernel, this, old_state); + KScheduler::OnThreadStateChanged(m_kernel, this, old_state); } } @@ -1427,20 +1427,20 @@ s32 GetCurrentCoreId(KernelCore& kernel) { KScopedDisableDispatch::~KScopedDisableDispatch() { // If we are shutting down the kernel, none of this is relevant anymore. - if (kernel.IsShuttingDown()) { + if (m_kernel.IsShuttingDown()) { return; } - if (GetCurrentThread(kernel).GetDisableDispatchCount() <= 1) { - auto* scheduler = kernel.CurrentScheduler(); + if (GetCurrentThread(m_kernel).GetDisableDispatchCount() <= 1) { + auto* scheduler = m_kernel.CurrentScheduler(); - if (scheduler && !kernel.IsPhantomModeForSingleCore()) { + if (scheduler && !m_kernel.IsPhantomModeForSingleCore()) { scheduler->RescheduleCurrentCore(); } else { - KScheduler::RescheduleCurrentHLEThread(kernel); + KScheduler::RescheduleCurrentHLEThread(m_kernel); } } else { - GetCurrentThread(kernel).EnableDispatch(); + GetCurrentThread(m_kernel).EnableDispatch(); } } diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h index f4cb861a9..e541ea079 100644 --- a/src/core/hle/kernel/k_thread.h +++ b/src/core/hle/kernel/k_thread.h @@ -128,7 +128,7 @@ public: static constexpr s32 IdleThreadPriority = Svc::LowestThreadPriority + 1; static constexpr s32 DummyThreadPriority = Svc::LowestThreadPriority + 2; - explicit KThread(KernelCore& kernel_); + explicit KThread(KernelCore& kernel); ~KThread() override; public: @@ -494,12 +494,12 @@ public: } void DisableDispatch() { - ASSERT(GetCurrentThread(kernel).GetDisableDispatchCount() >= 0); + ASSERT(GetCurrentThread(m_kernel).GetDisableDispatchCount() >= 0); this->GetStackParameters().disable_count++; } void EnableDispatch() { - ASSERT(GetCurrentThread(kernel).GetDisableDispatchCount() > 0); + ASSERT(GetCurrentThread(m_kernel).GetDisableDispatchCount() > 0); this->GetStackParameters().disable_count--; } @@ -970,9 +970,9 @@ public: class KScopedDisableDispatch { public: - [[nodiscard]] explicit KScopedDisableDispatch(KernelCore& kernel_) : kernel{kernel_} { + [[nodiscard]] explicit KScopedDisableDispatch(KernelCore& kernel) : m_kernel{kernel} { // If we are shutting down the kernel, none of this is relevant anymore. - if (kernel.IsShuttingDown()) { + if (m_kernel.IsShuttingDown()) { return; } GetCurrentThread(kernel).DisableDispatch(); @@ -981,7 +981,7 @@ public: ~KScopedDisableDispatch(); private: - KernelCore& kernel; + KernelCore& m_kernel; }; inline void KTimerTask::OnTimer() { diff --git a/src/core/hle/kernel/k_thread_queue.h b/src/core/hle/kernel/k_thread_queue.h index 8ec2f900b..117af0919 100644 --- a/src/core/hle/kernel/k_thread_queue.h +++ b/src/core/hle/kernel/k_thread_queue.h @@ -31,7 +31,7 @@ private: class KThreadQueueWithoutEndWait : public KThreadQueue { public: - explicit KThreadQueueWithoutEndWait(KernelCore& kernel_) : KThreadQueue(kernel_) {} + explicit KThreadQueueWithoutEndWait(KernelCore& kernel) : KThreadQueue(kernel) {} void EndWait(KThread* waiting_thread, Result wait_result) override final; }; diff --git a/src/core/hle/kernel/k_transfer_memory.cpp b/src/core/hle/kernel/k_transfer_memory.cpp index c25cc2e39..ceec364af 100644 --- a/src/core/hle/kernel/k_transfer_memory.cpp +++ b/src/core/hle/kernel/k_transfer_memory.cpp @@ -8,23 +8,23 @@ namespace Kernel { -KTransferMemory::KTransferMemory(KernelCore& kernel_) - : KAutoObjectWithSlabHeapAndContainer{kernel_} {} +KTransferMemory::KTransferMemory(KernelCore& kernel) + : KAutoObjectWithSlabHeapAndContainer{kernel} {} KTransferMemory::~KTransferMemory() = default; -Result KTransferMemory::Initialize(VAddr address_, std::size_t size_, - Svc::MemoryPermission owner_perm_) { +Result KTransferMemory::Initialize(VAddr address, std::size_t size, + Svc::MemoryPermission owner_perm) { // Set members. - m_owner = GetCurrentProcessPointer(kernel); + m_owner = GetCurrentProcessPointer(m_kernel); // TODO(bunnei): Lock for transfer memory // Set remaining tracking members. m_owner->Open(); - m_owner_perm = owner_perm_; - m_address = address_; - m_size = size_; + m_owner_perm = owner_perm; + m_address = address; + m_size = size; m_is_initialized = true; R_SUCCEED(); diff --git a/src/core/hle/kernel/k_transfer_memory.h b/src/core/hle/kernel/k_transfer_memory.h index 9a37bd903..3d4d795a5 100644 --- a/src/core/hle/kernel/k_transfer_memory.h +++ b/src/core/hle/kernel/k_transfer_memory.h @@ -23,10 +23,10 @@ class KTransferMemory final KERNEL_AUTOOBJECT_TRAITS(KTransferMemory, KAutoObject); public: - explicit KTransferMemory(KernelCore& kernel_); + explicit KTransferMemory(KernelCore& kernel); ~KTransferMemory() override; - Result Initialize(VAddr address_, std::size_t size_, Svc::MemoryPermission owner_perm_); + Result Initialize(VAddr address, std::size_t size, Svc::MemoryPermission owner_perm); void Finalize() override; diff --git a/src/core/hle/kernel/k_worker_task.h b/src/core/hle/kernel/k_worker_task.h index ef591d831..9a230c03c 100644 --- a/src/core/hle/kernel/k_worker_task.h +++ b/src/core/hle/kernel/k_worker_task.h @@ -9,7 +9,7 @@ namespace Kernel { class KWorkerTask : public KSynchronizationObject { public: - explicit KWorkerTask(KernelCore& kernel_); + explicit KWorkerTask(KernelCore& kernel); void DoWorkerTask(); }; diff --git a/src/core/hle/kernel/k_worker_task_manager.cpp b/src/core/hle/kernel/k_worker_task_manager.cpp index 04042bf8f..8ead39591 100644 --- a/src/core/hle/kernel/k_worker_task_manager.cpp +++ b/src/core/hle/kernel/k_worker_task_manager.cpp @@ -10,7 +10,7 @@ namespace Kernel { -KWorkerTask::KWorkerTask(KernelCore& kernel_) : KSynchronizationObject{kernel_} {} +KWorkerTask::KWorkerTask(KernelCore& kernel) : KSynchronizationObject{kernel} {} void KWorkerTask::DoWorkerTask() { if (auto* const thread = this->DynamicCast(); thread != nullptr) { diff --git a/src/core/hle/kernel/k_worker_task_manager.h b/src/core/hle/kernel/k_worker_task_manager.h index f6618883e..8745a4ce2 100644 --- a/src/core/hle/kernel/k_worker_task_manager.h +++ b/src/core/hle/kernel/k_worker_task_manager.h @@ -20,7 +20,7 @@ public: KWorkerTaskManager(); - static void AddTask(KernelCore& kernel_, WorkerType type, KWorkerTask* task); + static void AddTask(KernelCore& kernel, WorkerType type, KWorkerTask* task); private: void AddTask(KernelCore& kernel, KWorkerTask* task); diff --git a/src/core/hle/kernel/slab_helpers.h b/src/core/hle/kernel/slab_helpers.h index b9f5066de..d1bbc7670 100644 --- a/src/core/hle/kernel/slab_helpers.h +++ b/src/core/hle/kernel/slab_helpers.h @@ -66,7 +66,7 @@ private: } public: - explicit KAutoObjectWithSlabHeap(KernelCore& kernel_) : Base(kernel_), kernel(kernel_) {} + explicit KAutoObjectWithSlabHeap(KernelCore& kernel) : Base(kernel) {} virtual ~KAutoObjectWithSlabHeap() = default; virtual void Destroy() override { @@ -76,7 +76,7 @@ public: arg = this->GetPostDestroyArgument(); this->Finalize(); } - Free(kernel, static_cast(this)); + Free(Base::m_kernel, static_cast(this)); if (is_initialized) { Derived::PostDestroy(arg); } @@ -90,7 +90,7 @@ public: } size_t GetSlabIndex() const { - return SlabHeap(kernel).GetObjectIndex(static_cast(this)); + return SlabHeap(Base::m_kernel).GetObjectIndex(static_cast(this)); } public: @@ -125,9 +125,6 @@ public: static size_t GetNumRemaining(KernelCore& kernel) { return kernel.SlabHeap().GetNumRemaining(); } - -protected: - KernelCore& kernel; }; template @@ -144,18 +141,18 @@ private: } public: - KAutoObjectWithSlabHeapAndContainer(KernelCore& kernel_) : Base(kernel_) {} + KAutoObjectWithSlabHeapAndContainer(KernelCore& kernel) : Base(kernel) {} virtual ~KAutoObjectWithSlabHeapAndContainer() {} virtual void Destroy() override { const bool is_initialized = this->IsInitialized(); uintptr_t arg = 0; if (is_initialized) { - Base::kernel.ObjectListContainer().Unregister(this); + Base::m_kernel.ObjectListContainer().Unregister(this); arg = this->GetPostDestroyArgument(); this->Finalize(); } - Free(Base::kernel, static_cast(this)); + Free(Base::m_kernel, static_cast(this)); if (is_initialized) { Derived::PostDestroy(arg); } @@ -169,7 +166,7 @@ public: } size_t GetSlabIndex() const { - return SlabHeap(Base::kernel).GetObjectIndex(static_cast(this)); + return SlabHeap(Base::m_kernel).GetObjectIndex(static_cast(this)); } public: From 641783df8f225bb455383747ee2d241c6458214a Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 7 Mar 2023 10:58:51 -0500 Subject: [PATCH 0176/1181] kernel: convert KResourceLimit --- src/core/hle/kernel/k_resource_limit.cpp | 98 ++++++++++++------------ src/core/hle/kernel/k_resource_limit.h | 20 ++--- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/core/hle/kernel/k_resource_limit.cpp b/src/core/hle/kernel/k_resource_limit.cpp index e224e1622..b5c353938 100644 --- a/src/core/hle/kernel/k_resource_limit.cpp +++ b/src/core/hle/kernel/k_resource_limit.cpp @@ -12,11 +12,11 @@ namespace Kernel { constexpr s64 DefaultTimeout = 10000000000; // 10 seconds KResourceLimit::KResourceLimit(KernelCore& kernel) - : KAutoObjectWithSlabHeapAndContainer{kernel}, lock{kernel}, cond_var{kernel} {} + : KAutoObjectWithSlabHeapAndContainer{kernel}, m_lock{m_kernel}, m_cond_var{m_kernel} {} KResourceLimit::~KResourceLimit() = default; -void KResourceLimit::Initialize(const Core::Timing::CoreTiming* core_timing_) { - core_timing = core_timing_; +void KResourceLimit::Initialize(const Core::Timing::CoreTiming* core_timing) { + m_core_timing = core_timing; } void KResourceLimit::Finalize() {} @@ -25,11 +25,11 @@ s64 KResourceLimit::GetLimitValue(LimitableResource which) const { const auto index = static_cast(which); s64 value{}; { - KScopedLightLock lk{lock}; - value = limit_values[index]; + KScopedLightLock lk{m_lock}; + value = m_limit_values[index]; ASSERT(value >= 0); - ASSERT(current_values[index] <= limit_values[index]); - ASSERT(current_hints[index] <= current_values[index]); + ASSERT(m_current_values[index] <= m_limit_values[index]); + ASSERT(m_current_hints[index] <= m_current_values[index]); } return value; } @@ -38,11 +38,11 @@ s64 KResourceLimit::GetCurrentValue(LimitableResource which) const { const auto index = static_cast(which); s64 value{}; { - KScopedLightLock lk{lock}; - value = current_values[index]; + KScopedLightLock lk{m_lock}; + value = m_current_values[index]; ASSERT(value >= 0); - ASSERT(current_values[index] <= limit_values[index]); - ASSERT(current_hints[index] <= current_values[index]); + ASSERT(m_current_values[index] <= m_limit_values[index]); + ASSERT(m_current_hints[index] <= m_current_values[index]); } return value; } @@ -51,11 +51,11 @@ s64 KResourceLimit::GetPeakValue(LimitableResource which) const { const auto index = static_cast(which); s64 value{}; { - KScopedLightLock lk{lock}; - value = peak_values[index]; + KScopedLightLock lk{m_lock}; + value = m_peak_values[index]; ASSERT(value >= 0); - ASSERT(current_values[index] <= limit_values[index]); - ASSERT(current_hints[index] <= current_values[index]); + ASSERT(m_current_values[index] <= m_limit_values[index]); + ASSERT(m_current_hints[index] <= m_current_values[index]); } return value; } @@ -64,11 +64,11 @@ s64 KResourceLimit::GetFreeValue(LimitableResource which) const { const auto index = static_cast(which); s64 value{}; { - KScopedLightLock lk(lock); - ASSERT(current_values[index] >= 0); - ASSERT(current_values[index] <= limit_values[index]); - ASSERT(current_hints[index] <= current_values[index]); - value = limit_values[index] - current_values[index]; + KScopedLightLock lk(m_lock); + ASSERT(m_current_values[index] >= 0); + ASSERT(m_current_values[index] <= m_limit_values[index]); + ASSERT(m_current_hints[index] <= m_current_values[index]); + value = m_limit_values[index] - m_current_values[index]; } return value; @@ -76,51 +76,51 @@ s64 KResourceLimit::GetFreeValue(LimitableResource which) const { Result KResourceLimit::SetLimitValue(LimitableResource which, s64 value) { const auto index = static_cast(which); - KScopedLightLock lk(lock); - R_UNLESS(current_values[index] <= value, ResultInvalidState); + KScopedLightLock lk(m_lock); + R_UNLESS(m_current_values[index] <= value, ResultInvalidState); - limit_values[index] = value; - peak_values[index] = current_values[index]; + m_limit_values[index] = value; + m_peak_values[index] = m_current_values[index]; R_SUCCEED(); } bool KResourceLimit::Reserve(LimitableResource which, s64 value) { - return Reserve(which, value, core_timing->GetGlobalTimeNs().count() + DefaultTimeout); + return Reserve(which, value, m_core_timing->GetGlobalTimeNs().count() + DefaultTimeout); } bool KResourceLimit::Reserve(LimitableResource which, s64 value, s64 timeout) { ASSERT(value >= 0); const auto index = static_cast(which); - KScopedLightLock lk(lock); + KScopedLightLock lk(m_lock); - ASSERT(current_hints[index] <= current_values[index]); - if (current_hints[index] >= limit_values[index]) { + ASSERT(m_current_hints[index] <= m_current_values[index]); + if (m_current_hints[index] >= m_limit_values[index]) { return false; } // Loop until we reserve or run out of time. while (true) { - ASSERT(current_values[index] <= limit_values[index]); - ASSERT(current_hints[index] <= current_values[index]); + ASSERT(m_current_values[index] <= m_limit_values[index]); + ASSERT(m_current_hints[index] <= m_current_values[index]); // If we would overflow, don't allow to succeed. - if (Common::WrappingAdd(current_values[index], value) <= current_values[index]) { + if (Common::WrappingAdd(m_current_values[index], value) <= m_current_values[index]) { break; } - if (current_values[index] + value <= limit_values[index]) { - current_values[index] += value; - current_hints[index] += value; - peak_values[index] = std::max(peak_values[index], current_values[index]); + if (m_current_values[index] + value <= m_limit_values[index]) { + m_current_values[index] += value; + m_current_hints[index] += value; + m_peak_values[index] = std::max(m_peak_values[index], m_current_values[index]); return true; } - if (current_hints[index] + value <= limit_values[index] && - (timeout < 0 || core_timing->GetGlobalTimeNs().count() < timeout)) { - waiter_count++; - cond_var.Wait(&lock, timeout, false); - waiter_count--; + if (m_current_hints[index] + value <= m_limit_values[index] && + (timeout < 0 || m_core_timing->GetGlobalTimeNs().count() < timeout)) { + m_waiter_count++; + m_cond_var.Wait(&m_lock, timeout, false); + m_waiter_count--; } else { break; } @@ -138,17 +138,17 @@ void KResourceLimit::Release(LimitableResource which, s64 value, s64 hint) { ASSERT(hint >= 0); const auto index = static_cast(which); - KScopedLightLock lk(lock); - ASSERT(current_values[index] <= limit_values[index]); - ASSERT(current_hints[index] <= current_values[index]); - ASSERT(value <= current_values[index]); - ASSERT(hint <= current_hints[index]); + KScopedLightLock lk(m_lock); + ASSERT(m_current_values[index] <= m_limit_values[index]); + ASSERT(m_current_hints[index] <= m_current_values[index]); + ASSERT(value <= m_current_values[index]); + ASSERT(hint <= m_current_hints[index]); - current_values[index] -= value; - current_hints[index] -= hint; + m_current_values[index] -= value; + m_current_hints[index] -= hint; - if (waiter_count != 0) { - cond_var.Broadcast(); + if (m_waiter_count != 0) { + m_cond_var.Broadcast(); } } diff --git a/src/core/hle/kernel/k_resource_limit.h b/src/core/hle/kernel/k_resource_limit.h index bc4f48e15..15e69af56 100644 --- a/src/core/hle/kernel/k_resource_limit.h +++ b/src/core/hle/kernel/k_resource_limit.h @@ -28,10 +28,10 @@ class KResourceLimit final KERNEL_AUTOOBJECT_TRAITS(KResourceLimit, KAutoObject); public: - explicit KResourceLimit(KernelCore& kernel_); + explicit KResourceLimit(KernelCore& kernel); ~KResourceLimit() override; - void Initialize(const Core::Timing::CoreTiming* core_timing_); + void Initialize(const Core::Timing::CoreTiming* core_timing); void Finalize() override; s64 GetLimitValue(LimitableResource which) const; @@ -50,14 +50,14 @@ public: private: using ResourceArray = std::array(LimitableResource::Count)>; - ResourceArray limit_values{}; - ResourceArray current_values{}; - ResourceArray current_hints{}; - ResourceArray peak_values{}; - mutable KLightLock lock; - s32 waiter_count{}; - KLightConditionVariable cond_var; - const Core::Timing::CoreTiming* core_timing{}; + ResourceArray m_limit_values{}; + ResourceArray m_current_values{}; + ResourceArray m_current_hints{}; + ResourceArray m_peak_values{}; + mutable KLightLock m_lock; + s32 m_waiter_count{}; + KLightConditionVariable m_cond_var; + const Core::Timing::CoreTiming* m_core_timing{}; }; KResourceLimit* CreateResourceLimitForProcess(Core::System& system, s64 physical_memory_size); From ac6cbb7134d71134e4beae91361a78fa68202c22 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 7 Mar 2023 12:01:07 -0500 Subject: [PATCH 0177/1181] kernel: prefer std::addressof --- src/core/hle/kernel/k_address_arbiter.cpp | 12 +- src/core/hle/kernel/k_auto_object.h | 2 +- src/core/hle/kernel/k_page_table.h | 2 +- src/core/hle/kernel/k_process.cpp | 7 +- src/core/hle/kernel/k_resource_limit.cpp | 4 +- src/core/hle/kernel/k_scheduler.cpp | 2 +- src/core/hle/kernel/k_server_session.cpp | 13 +- src/core/hle/kernel/k_shared_memory.cpp | 3 +- src/core/hle/kernel/k_slab_heap.h | 3 +- src/core/hle/kernel/k_thread.cpp | 4 +- src/core/hle/kernel/k_thread_local_page.cpp | 2 +- src/core/hle/kernel/svc.cpp | 180 +++++++++--------- src/core/hle/kernel/svc/svc_info.cpp | 4 +- src/core/hle/kernel/svc/svc_ipc.cpp | 2 +- src/core/hle/kernel/svc/svc_query_memory.cpp | 2 +- .../hle/kernel/svc/svc_resource_limit.cpp | 2 +- .../kernel/svc/svc_secure_monitor_call.cpp | 4 +- src/core/hle/kernel/svc/svc_session.cpp | 9 +- src/core/hle/kernel/svc/svc_thread.cpp | 8 +- .../hle/kernel/svc/svc_transfer_memory.cpp | 2 +- src/core/hle/kernel/svc_generator.py | 6 +- 21 files changed, 139 insertions(+), 134 deletions(-) diff --git a/src/core/hle/kernel/k_address_arbiter.cpp b/src/core/hle/kernel/k_address_arbiter.cpp index 47637a729..30a4e6edb 100644 --- a/src/core/hle/kernel/k_address_arbiter.cpp +++ b/src/core/hle/kernel/k_address_arbiter.cpp @@ -141,7 +141,7 @@ Result KAddressArbiter::SignalAndIncrementIfEqual(VAddr addr, s32 value, s32 cou // Check the userspace value. s32 user_value{}; - R_UNLESS(UpdateIfEqual(m_system, &user_value, addr, value, value + 1), + R_UNLESS(UpdateIfEqual(m_system, std::addressof(user_value), addr, value, value + 1), ResultInvalidCurrentMemory); R_UNLESS(user_value == value, ResultInvalidState); @@ -201,9 +201,9 @@ Result KAddressArbiter::SignalAndModifyByWaitingCountIfEqual(VAddr addr, s32 val s32 user_value{}; bool succeeded{}; if (value != new_value) { - succeeded = UpdateIfEqual(m_system, &user_value, addr, value, new_value); + succeeded = UpdateIfEqual(m_system, std::addressof(user_value), addr, value, new_value); } else { - succeeded = ReadFromUser(m_system, &user_value, addr); + succeeded = ReadFromUser(m_system, std::addressof(user_value), addr); } R_UNLESS(succeeded, ResultInvalidCurrentMemory); @@ -244,9 +244,9 @@ Result KAddressArbiter::WaitIfLessThan(VAddr addr, s32 value, bool decrement, s6 s32 user_value{}; bool succeeded{}; if (decrement) { - succeeded = DecrementIfLessThan(m_system, &user_value, addr, value); + succeeded = DecrementIfLessThan(m_system, std::addressof(user_value), addr, value); } else { - succeeded = ReadFromUser(m_system, &user_value, addr); + succeeded = ReadFromUser(m_system, std::addressof(user_value), addr); } if (!succeeded) { @@ -297,7 +297,7 @@ Result KAddressArbiter::WaitIfEqual(VAddr addr, s32 value, s64 timeout) { // Read the value from userspace. s32 user_value{}; - if (!ReadFromUser(m_system, &user_value, addr)) { + if (!ReadFromUser(m_system, std::addressof(user_value), addr)) { slp.CancelSleep(); R_THROW(ResultInvalidCurrentMemory); } diff --git a/src/core/hle/kernel/k_auto_object.h b/src/core/hle/kernel/k_auto_object.h index edb9cf071..9b71fe371 100644 --- a/src/core/hle/kernel/k_auto_object.h +++ b/src/core/hle/kernel/k_auto_object.h @@ -195,7 +195,7 @@ public: } friend bool operator<(const KAutoObjectWithList& left, const KAutoObjectWithList& right) { - return &left < &right; + return KAutoObjectWithList::Compare(left, right) < 0; } public: diff --git a/src/core/hle/kernel/k_page_table.h b/src/core/hle/kernel/k_page_table.h index 367dab613..5c5356338 100644 --- a/src/core/hle/kernel/k_page_table.h +++ b/src/core/hle/kernel/k_page_table.h @@ -484,7 +484,7 @@ private: } PageLinkedList* GetPageList() { - return &m_ll; + return std::addressof(m_ll); } }; diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp index 4954a40db..b740fb1c3 100644 --- a/src/core/hle/kernel/k_process.cpp +++ b/src/core/hle/kernel/k_process.cpp @@ -44,12 +44,13 @@ void SetupMainThread(Core::System& system, KProcess& owner_process, u32 priority SCOPE_EXIT({ thread->Close(); }); ASSERT(KThread::InitializeUserThread(system, thread, entry_point, 0, stack_top, priority, - owner_process.GetIdealCoreId(), &owner_process) + owner_process.GetIdealCoreId(), + std::addressof(owner_process)) .IsSuccess()); // Register 1 must be a handle to the main thread Handle thread_handle{}; - owner_process.GetHandleTable().Add(&thread_handle, thread); + owner_process.GetHandleTable().Add(std::addressof(thread_handle), thread); thread->SetName("main"); thread->GetContext32().cpu_registers[0] = 0; @@ -366,7 +367,7 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std: // Initialize process address space if (const Result result{page_table.InitializeForProcess( metadata.GetAddressSpaceType(), false, false, false, KMemoryManager::Pool::Application, - 0x8000000, code_size, &m_kernel.GetAppSystemResource(), resource_limit)}; + 0x8000000, code_size, std::addressof(m_kernel.GetAppSystemResource()), resource_limit)}; result.IsError()) { R_RETURN(result); } diff --git a/src/core/hle/kernel/k_resource_limit.cpp b/src/core/hle/kernel/k_resource_limit.cpp index b5c353938..fcee26a29 100644 --- a/src/core/hle/kernel/k_resource_limit.cpp +++ b/src/core/hle/kernel/k_resource_limit.cpp @@ -119,7 +119,7 @@ bool KResourceLimit::Reserve(LimitableResource which, s64 value, s64 timeout) { if (m_current_hints[index] + value <= m_limit_values[index] && (timeout < 0 || m_core_timing->GetGlobalTimeNs().count() < timeout)) { m_waiter_count++; - m_cond_var.Wait(&m_lock, timeout, false); + m_cond_var.Wait(std::addressof(m_lock), timeout, false); m_waiter_count--; } else { break; @@ -154,7 +154,7 @@ void KResourceLimit::Release(LimitableResource which, s64 value, s64 hint) { KResourceLimit* CreateResourceLimitForProcess(Core::System& system, s64 physical_memory_size) { auto* resource_limit = KResourceLimit::Create(system.Kernel()); - resource_limit->Initialize(&system.CoreTiming()); + resource_limit->Initialize(std::addressof(system.CoreTiming())); // Initialize default resource limit values. // TODO(bunnei): These values are the system defaults, the limits for service processes are diff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/core/hle/kernel/k_scheduler.cpp index b631ec406..fe371726c 100644 --- a/src/core/hle/kernel/k_scheduler.cpp +++ b/src/core/hle/kernel/k_scheduler.cpp @@ -149,7 +149,7 @@ void KScheduler::Initialize(KThread* main_thread, KThread* idle_thread, s32 core m_core_id = core_id; m_idle_thread = idle_thread; // m_state.idle_thread_stack = m_idle_thread->GetStackTop(); - // m_state.interrupt_task_manager = &kernel.GetInterruptTaskManager(); + // m_state.interrupt_task_manager = std::addressof(kernel.GetInterruptTaskManager()); // Insert the main thread into the priority queue. // { diff --git a/src/core/hle/kernel/k_server_session.cpp b/src/core/hle/kernel/k_server_session.cpp index e9b4ef528..8376c5d76 100644 --- a/src/core/hle/kernel/k_server_session.cpp +++ b/src/core/hle/kernel/k_server_session.cpp @@ -115,7 +115,7 @@ void KServerSession::OnClientClosed() { // // Get the process and page table. // KProcess *client_process = thread->GetOwnerProcess(); - // auto &client_pt = client_process->GetPageTable(); + // auto& client_pt = client_process->GetPageTable(); // // Reply to the request. // ReplyAsyncError(client_process, request->GetAddress(), request->GetSize(), @@ -177,7 +177,7 @@ Result KServerSession::OnRequest(KSessionRequest* request) { // This is a synchronous request, so we should wait for our request to complete. GetCurrentThread(m_kernel).SetWaitReasonForDebugging(ThreadWaitReasonForDebugging::IPC); - GetCurrentThread(m_kernel).BeginWait(&wait_queue); + GetCurrentThread(m_kernel).BeginWait(std::addressof(wait_queue)); } return GetCurrentThread(m_kernel).GetWaitResult(); @@ -248,7 +248,7 @@ Result KServerSession::SendReply(bool is_hle) { if (event != nullptr) { // // Get the client process/page table. // KProcess *client_process = client_thread->GetOwnerProcess(); - // KPageTable *client_page_table = &client_process->PageTable(); + // KPageTable *client_page_table = std::addressof(client_process->PageTable()); // // If we need to, reply with an async error. // if (R_FAILED(client_result)) { @@ -297,7 +297,7 @@ Result KServerSession::ReceiveRequest(std::shared_ptrGetOwnerProcess() : nullptr; // KProcessPageTable *client_page_table = (client_process != nullptr) ? - // &client_process->GetPageTable() : nullptr; + // std::addressof(client_process->GetPageTable()) + // : nullptr; // Cleanup the mappings. // Result result = CleanupMap(request, server_process, client_page_table); diff --git a/src/core/hle/kernel/k_shared_memory.cpp b/src/core/hle/kernel/k_shared_memory.cpp index b7b3b612b..950365d14 100644 --- a/src/core/hle/kernel/k_shared_memory.cpp +++ b/src/core/hle/kernel/k_shared_memory.cpp @@ -44,7 +44,8 @@ Result KSharedMemory::Initialize(Core::DeviceMemory& device_memory, KProcess* ow R_UNLESS(m_physical_address != 0, ResultOutOfMemory); //! Insert the result into our page group. - m_page_group.emplace(m_kernel, &m_kernel.GetSystemSystemResource().GetBlockInfoManager()); + m_page_group.emplace(m_kernel, + std::addressof(m_kernel.GetSystemSystemResource().GetBlockInfoManager())); m_page_group->AddBlock(m_physical_address, num_pages); // Commit our reservation. diff --git a/src/core/hle/kernel/k_slab_heap.h b/src/core/hle/kernel/k_slab_heap.h index 68469b041..334afebb7 100644 --- a/src/core/hle/kernel/k_slab_heap.h +++ b/src/core/hle/kernel/k_slab_heap.h @@ -89,7 +89,8 @@ private: if (alloc_peak <= cur_peak) { break; } - } while (!Common::AtomicCompareAndSwap(&m_peak, alloc_peak, cur_peak, cur_peak)); + } while ( + !Common::AtomicCompareAndSwap(std::addressof(m_peak), alloc_peak, cur_peak, cur_peak)); } public: diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index 49a683e5f..27616440c 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -930,14 +930,14 @@ Result KThread::GetThreadContext3(std::vector& out) { context.pstate &= 0xFF0FFE20; out.resize(sizeof(context)); - std::memcpy(out.data(), &context, sizeof(context)); + std::memcpy(out.data(), std::addressof(context), sizeof(context)); } else { // Mask away mode bits, interrupt bits, IL bit, and other reserved bits. auto context = GetContext32(); context.cpsr &= 0xFF0FFE20; out.resize(sizeof(context)); - std::memcpy(out.data(), &context, sizeof(context)); + std::memcpy(out.data(), std::addressof(context), sizeof(context)); } } } diff --git a/src/core/hle/kernel/k_thread_local_page.cpp b/src/core/hle/kernel/k_thread_local_page.cpp index 563560114..c2af6898a 100644 --- a/src/core/hle/kernel/k_thread_local_page.cpp +++ b/src/core/hle/kernel/k_thread_local_page.cpp @@ -16,7 +16,7 @@ namespace Kernel { Result KThreadLocalPage::Initialize(KernelCore& kernel, KProcess* process) { // Set that this process owns us. m_owner = process; - m_kernel = &kernel; + m_kernel = std::addressof(kernel); // Allocate a new page. KPageBuffer* page_buf = KPageBuffer::Allocate(kernel); diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index a0bfd6bbc..871d541d4 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -36,9 +36,9 @@ static To Convert(const From& from) { To to{}; if constexpr (sizeof(To) >= sizeof(From)) { - std::memcpy(&to, &from, sizeof(From)); + std::memcpy(std::addressof(to), std::addressof(from), sizeof(From)); } else { - std::memcpy(&to, &from, sizeof(To)); + std::memcpy(std::addressof(to), std::addressof(from), sizeof(To)); } return to; @@ -87,7 +87,7 @@ static void SvcWrap_SetHeapSize64From32(Core::System& system) { size = Convert(GetReg32(system, 1)); - ret = SetHeapSize64From32(system, &out_address, size); + ret = SetHeapSize64From32(system, std::addressof(out_address), size); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_address)); @@ -169,7 +169,7 @@ static void SvcWrap_QueryMemory64From32(Core::System& system) { out_memory_info = Convert(GetReg32(system, 0)); address = Convert(GetReg32(system, 2)); - ret = QueryMemory64From32(system, out_memory_info, &out_page_info, address); + ret = QueryMemory64From32(system, out_memory_info, std::addressof(out_page_info), address); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_page_info)); @@ -195,7 +195,7 @@ static void SvcWrap_CreateThread64From32(Core::System& system) { priority = Convert(GetReg32(system, 0)); core_id = Convert(GetReg32(system, 4)); - ret = CreateThread64From32(system, &out_handle, func, arg, stack_bottom, priority, core_id); + ret = CreateThread64From32(system, std::addressof(out_handle), func, arg, stack_bottom, priority, core_id); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_handle)); @@ -236,7 +236,7 @@ static void SvcWrap_GetThreadPriority64From32(Core::System& system) { thread_handle = Convert(GetReg32(system, 1)); - ret = GetThreadPriority64From32(system, &out_priority, thread_handle); + ret = GetThreadPriority64From32(system, std::addressof(out_priority), thread_handle); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_priority)); @@ -265,7 +265,7 @@ static void SvcWrap_GetThreadCoreMask64From32(Core::System& system) { thread_handle = Convert(GetReg32(system, 2)); - ret = GetThreadCoreMask64From32(system, &out_core_id, &out_affinity_mask, thread_handle); + ret = GetThreadCoreMask64From32(system, std::addressof(out_core_id), std::addressof(out_affinity_mask), thread_handle); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_core_id)); @@ -371,7 +371,7 @@ static void SvcWrap_CreateTransferMemory64From32(Core::System& system) { size = Convert(GetReg32(system, 2)); map_perm = Convert(GetReg32(system, 3)); - ret = CreateTransferMemory64From32(system, &out_handle, address, size, map_perm); + ret = CreateTransferMemory64From32(system, std::addressof(out_handle), address, size, map_perm); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_handle)); @@ -416,7 +416,7 @@ static void SvcWrap_WaitSynchronization64From32(Core::System& system) { timeout_ns_gather[1] = GetReg32(system, 3); timeout_ns = Convert(timeout_ns_gather); - ret = WaitSynchronization64From32(system, &out_index, handles, num_handles, timeout_ns); + ret = WaitSynchronization64From32(system, std::addressof(out_index), handles, num_handles, timeout_ns); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_index)); @@ -511,7 +511,7 @@ static void SvcWrap_ConnectToNamedPort64From32(Core::System& system) { name = Convert(GetReg32(system, 1)); - ret = ConnectToNamedPort64From32(system, &out_handle, name); + ret = ConnectToNamedPort64From32(system, std::addressof(out_handle), name); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_handle)); @@ -557,7 +557,7 @@ static void SvcWrap_SendAsyncRequestWithUserBuffer64From32(Core::System& system) message_buffer_size = Convert(GetReg32(system, 2)); session_handle = Convert(GetReg32(system, 3)); - ret = SendAsyncRequestWithUserBuffer64From32(system, &out_event_handle, message_buffer, message_buffer_size, session_handle); + ret = SendAsyncRequestWithUserBuffer64From32(system, std::addressof(out_event_handle), message_buffer, message_buffer_size, session_handle); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_event_handle)); @@ -571,7 +571,7 @@ static void SvcWrap_GetProcessId64From32(Core::System& system) { process_handle = Convert(GetReg32(system, 1)); - ret = GetProcessId64From32(system, &out_process_id, process_handle); + ret = GetProcessId64From32(system, std::addressof(out_process_id), process_handle); SetReg32(system, 0, Convert(ret)); auto out_process_id_scatter = Convert>(out_process_id); @@ -587,7 +587,7 @@ static void SvcWrap_GetThreadId64From32(Core::System& system) { thread_handle = Convert(GetReg32(system, 1)); - ret = GetThreadId64From32(system, &out_thread_id, thread_handle); + ret = GetThreadId64From32(system, std::addressof(out_thread_id), thread_handle); SetReg32(system, 0, Convert(ret)); auto out_thread_id_scatter = Convert>(out_thread_id); @@ -644,7 +644,7 @@ static void SvcWrap_GetInfo64From32(Core::System& system) { info_subtype_gather[1] = GetReg32(system, 3); info_subtype = Convert(info_subtype_gather); - ret = GetInfo64From32(system, &out, info_type, handle, info_subtype); + ret = GetInfo64From32(system, std::addressof(out), info_type, handle, info_subtype); SetReg32(system, 0, Convert(ret)); auto out_scatter = Convert>(out); @@ -712,7 +712,7 @@ static void SvcWrap_GetDebugFutureThreadInfo64From32(Core::System& system) { ns_gather[1] = GetReg32(system, 1); ns = Convert(ns_gather); - ret = GetDebugFutureThreadInfo64From32(system, &out_context, &out_thread_id, debug_handle, ns); + ret = GetDebugFutureThreadInfo64From32(system, std::addressof(out_context), std::addressof(out_thread_id), debug_handle, ns); SetReg32(system, 0, Convert(ret)); auto out_context_scatter = Convert>(out_context); @@ -732,7 +732,7 @@ static void SvcWrap_GetLastThreadInfo64From32(Core::System& system) { uint64_t out_tls_address{}; uint32_t out_flags{}; - ret = GetLastThreadInfo64From32(system, &out_context, &out_tls_address, &out_flags); + ret = GetLastThreadInfo64From32(system, std::addressof(out_context), std::addressof(out_tls_address), std::addressof(out_flags)); SetReg32(system, 0, Convert(ret)); auto out_context_scatter = Convert>(out_context); @@ -754,7 +754,7 @@ static void SvcWrap_GetResourceLimitLimitValue64From32(Core::System& system) { resource_limit_handle = Convert(GetReg32(system, 1)); which = Convert(GetReg32(system, 2)); - ret = GetResourceLimitLimitValue64From32(system, &out_limit_value, resource_limit_handle, which); + ret = GetResourceLimitLimitValue64From32(system, std::addressof(out_limit_value), resource_limit_handle, which); SetReg32(system, 0, Convert(ret)); auto out_limit_value_scatter = Convert>(out_limit_value); @@ -772,7 +772,7 @@ static void SvcWrap_GetResourceLimitCurrentValue64From32(Core::System& system) { resource_limit_handle = Convert(GetReg32(system, 1)); which = Convert(GetReg32(system, 2)); - ret = GetResourceLimitCurrentValue64From32(system, &out_current_value, resource_limit_handle, which); + ret = GetResourceLimitCurrentValue64From32(system, std::addressof(out_current_value), resource_limit_handle, which); SetReg32(system, 0, Convert(ret)); auto out_current_value_scatter = Convert>(out_current_value); @@ -861,7 +861,7 @@ static void SvcWrap_GetResourceLimitPeakValue64From32(Core::System& system) { resource_limit_handle = Convert(GetReg32(system, 1)); which = Convert(GetReg32(system, 2)); - ret = GetResourceLimitPeakValue64From32(system, &out_peak_value, resource_limit_handle, which); + ret = GetResourceLimitPeakValue64From32(system, std::addressof(out_peak_value), resource_limit_handle, which); SetReg32(system, 0, Convert(ret)); auto out_peak_value_scatter = Convert>(out_peak_value); @@ -877,7 +877,7 @@ static void SvcWrap_CreateIoPool64From32(Core::System& system) { which = Convert(GetReg32(system, 1)); - ret = CreateIoPool64From32(system, &out_handle, which); + ret = CreateIoPool64From32(system, std::addressof(out_handle), which); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_handle)); @@ -902,7 +902,7 @@ static void SvcWrap_CreateIoRegion64From32(Core::System& system) { mapping = Convert(GetReg32(system, 4)); perm = Convert(GetReg32(system, 5)); - ret = CreateIoRegion64From32(system, &out_handle, io_pool, physical_address, size, mapping, perm); + ret = CreateIoRegion64From32(system, std::addressof(out_handle), io_pool, physical_address, size, mapping, perm); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_handle)); @@ -950,7 +950,7 @@ static void SvcWrap_CreateSession64From32(Core::System& system) { is_light = Convert(GetReg32(system, 2)); name = Convert(GetReg32(system, 3)); - ret = CreateSession64From32(system, &out_server_session_handle, &out_client_session_handle, is_light, name); + ret = CreateSession64From32(system, std::addressof(out_server_session_handle), std::addressof(out_client_session_handle), is_light, name); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_server_session_handle)); @@ -965,7 +965,7 @@ static void SvcWrap_AcceptSession64From32(Core::System& system) { port = Convert(GetReg32(system, 1)); - ret = AcceptSession64From32(system, &out_handle, port); + ret = AcceptSession64From32(system, std::addressof(out_handle), port); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_handle)); @@ -988,7 +988,7 @@ static void SvcWrap_ReplyAndReceive64From32(Core::System& system) { timeout_ns_gather[1] = GetReg32(system, 4); timeout_ns = Convert(timeout_ns_gather); - ret = ReplyAndReceive64From32(system, &out_index, handles, num_handles, reply_target, timeout_ns); + ret = ReplyAndReceive64From32(system, std::addressof(out_index), handles, num_handles, reply_target, timeout_ns); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_index)); @@ -1015,7 +1015,7 @@ static void SvcWrap_ReplyAndReceiveWithUserBuffer64From32(Core::System& system) timeout_ns_gather[1] = GetReg32(system, 6); timeout_ns = Convert(timeout_ns_gather); - ret = ReplyAndReceiveWithUserBuffer64From32(system, &out_index, message_buffer, message_buffer_size, handles, num_handles, reply_target, timeout_ns); + ret = ReplyAndReceiveWithUserBuffer64From32(system, std::addressof(out_index), message_buffer, message_buffer_size, handles, num_handles, reply_target, timeout_ns); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_index)); @@ -1027,7 +1027,7 @@ static void SvcWrap_CreateEvent64From32(Core::System& system) { Handle out_write_handle{}; Handle out_read_handle{}; - ret = CreateEvent64From32(system, &out_write_handle, &out_read_handle); + ret = CreateEvent64From32(system, std::addressof(out_write_handle), std::addressof(out_read_handle)); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_write_handle)); @@ -1118,7 +1118,7 @@ static void SvcWrap_CreateCodeMemory64From32(Core::System& system) { address = Convert(GetReg32(system, 1)); size = Convert(GetReg32(system, 2)); - ret = CreateCodeMemory64From32(system, &out_handle, address, size); + ret = CreateCodeMemory64From32(system, std::addressof(out_handle), address, size); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_handle)); @@ -1169,7 +1169,7 @@ static void SvcWrap_ReadWriteRegister64From32(Core::System& system) { mask = Convert(GetReg32(system, 0)); value = Convert(GetReg32(system, 1)); - ret = ReadWriteRegister64From32(system, &out_value, address, mask, value); + ret = ReadWriteRegister64From32(system, std::addressof(out_value), address, mask, value); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_value)); @@ -1201,7 +1201,7 @@ static void SvcWrap_CreateSharedMemory64From32(Core::System& system) { owner_perm = Convert(GetReg32(system, 2)); remote_perm = Convert(GetReg32(system, 3)); - ret = CreateSharedMemory64From32(system, &out_handle, size, owner_perm, remote_perm); + ret = CreateSharedMemory64From32(system, std::addressof(out_handle), size, owner_perm, remote_perm); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_handle)); @@ -1251,7 +1251,7 @@ static void SvcWrap_CreateInterruptEvent64From32(Core::System& system) { interrupt_id = Convert(GetReg32(system, 1)); interrupt_type = Convert(GetReg32(system, 2)); - ret = CreateInterruptEvent64From32(system, &out_read_handle, interrupt_id, interrupt_type); + ret = CreateInterruptEvent64From32(system, std::addressof(out_read_handle), interrupt_id, interrupt_type); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_read_handle)); @@ -1265,7 +1265,7 @@ static void SvcWrap_QueryPhysicalAddress64From32(Core::System& system) { address = Convert(GetReg32(system, 1)); - ret = QueryPhysicalAddress64From32(system, &out_info, address); + ret = QueryPhysicalAddress64From32(system, std::addressof(out_info), address); SetReg32(system, 0, Convert(ret)); auto out_info_scatter = Convert>(out_info); @@ -1289,7 +1289,7 @@ static void SvcWrap_QueryIoMapping64From32(Core::System& system) { physical_address = Convert(physical_address_gather); size = Convert(GetReg32(system, 0)); - ret = QueryIoMapping64From32(system, &out_address, &out_size, physical_address, size); + ret = QueryIoMapping64From32(system, std::addressof(out_address), std::addressof(out_size), physical_address, size); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_address)); @@ -1312,7 +1312,7 @@ static void SvcWrap_CreateDeviceAddressSpace64From32(Core::System& system) { das_size_gather[1] = GetReg32(system, 1); das_size = Convert(das_size_gather); - ret = CreateDeviceAddressSpace64From32(system, &out_handle, das_address, das_size); + ret = CreateDeviceAddressSpace64From32(system, std::addressof(out_handle), das_address, das_size); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_handle)); @@ -1505,7 +1505,7 @@ static void SvcWrap_DebugActiveProcess64From32(Core::System& system) { process_id_gather[1] = GetReg32(system, 3); process_id = Convert(process_id_gather); - ret = DebugActiveProcess64From32(system, &out_handle, process_id); + ret = DebugActiveProcess64From32(system, std::addressof(out_handle), process_id); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_handle)); @@ -1577,7 +1577,7 @@ static void SvcWrap_GetProcessList64From32(Core::System& system) { out_process_ids = Convert(GetReg32(system, 1)); max_out_count = Convert(GetReg32(system, 2)); - ret = GetProcessList64From32(system, &out_num_processes, out_process_ids, max_out_count); + ret = GetProcessList64From32(system, std::addressof(out_num_processes), out_process_ids, max_out_count); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_num_processes)); @@ -1595,7 +1595,7 @@ static void SvcWrap_GetThreadList64From32(Core::System& system) { max_out_count = Convert(GetReg32(system, 2)); debug_handle = Convert(GetReg32(system, 3)); - ret = GetThreadList64From32(system, &out_num_threads, out_thread_ids, max_out_count, debug_handle); + ret = GetThreadList64From32(system, std::addressof(out_num_threads), out_thread_ids, max_out_count, debug_handle); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_num_threads)); @@ -1655,7 +1655,7 @@ static void SvcWrap_QueryDebugProcessMemory64From32(Core::System& system) { process_handle = Convert(GetReg32(system, 2)); address = Convert(GetReg32(system, 3)); - ret = QueryDebugProcessMemory64From32(system, out_memory_info, &out_page_info, process_handle, address); + ret = QueryDebugProcessMemory64From32(system, out_memory_info, std::addressof(out_page_info), process_handle, address); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_page_info)); @@ -1735,7 +1735,7 @@ static void SvcWrap_GetDebugThreadParam64From32(Core::System& system) { thread_id = Convert(thread_id_gather); param = Convert(GetReg32(system, 3)); - ret = GetDebugThreadParam64From32(system, &out_64, &out_32, debug_handle, thread_id, param); + ret = GetDebugThreadParam64From32(system, std::addressof(out_64), std::addressof(out_32), debug_handle, thread_id, param); SetReg32(system, 0, Convert(ret)); auto out_64_scatter = Convert>(out_64); @@ -1759,7 +1759,7 @@ static void SvcWrap_GetSystemInfo64From32(Core::System& system) { info_subtype_gather[1] = GetReg32(system, 3); info_subtype = Convert(info_subtype_gather); - ret = GetSystemInfo64From32(system, &out, info_type, handle, info_subtype); + ret = GetSystemInfo64From32(system, std::addressof(out), info_type, handle, info_subtype); SetReg32(system, 0, Convert(ret)); auto out_scatter = Convert>(out); @@ -1780,7 +1780,7 @@ static void SvcWrap_CreatePort64From32(Core::System& system) { is_light = Convert(GetReg32(system, 3)); name = Convert(GetReg32(system, 0)); - ret = CreatePort64From32(system, &out_server_handle, &out_client_handle, max_sessions, is_light, name); + ret = CreatePort64From32(system, std::addressof(out_server_handle), std::addressof(out_client_handle), max_sessions, is_light, name); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_server_handle)); @@ -1797,7 +1797,7 @@ static void SvcWrap_ManageNamedPort64From32(Core::System& system) { name = Convert(GetReg32(system, 1)); max_sessions = Convert(GetReg32(system, 2)); - ret = ManageNamedPort64From32(system, &out_server_handle, name, max_sessions); + ret = ManageNamedPort64From32(system, std::addressof(out_server_handle), name, max_sessions); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_server_handle)); @@ -1811,7 +1811,7 @@ static void SvcWrap_ConnectToPort64From32(Core::System& system) { port = Convert(GetReg32(system, 1)); - ret = ConnectToPort64From32(system, &out_handle, port); + ret = ConnectToPort64From32(system, std::addressof(out_handle), port); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_handle)); @@ -1898,7 +1898,7 @@ static void SvcWrap_QueryProcessMemory64From32(Core::System& system) { address_gather[1] = GetReg32(system, 3); address = Convert(address_gather); - ret = QueryProcessMemory64From32(system, out_memory_info, &out_page_info, process_handle, address); + ret = QueryProcessMemory64From32(system, out_memory_info, std::addressof(out_page_info), process_handle, address); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_page_info)); @@ -1970,7 +1970,7 @@ static void SvcWrap_CreateProcess64From32(Core::System& system) { caps = Convert(GetReg32(system, 2)); num_caps = Convert(GetReg32(system, 3)); - ret = CreateProcess64From32(system, &out_handle, parameters, caps, num_caps); + ret = CreateProcess64From32(system, std::addressof(out_handle), parameters, caps, num_caps); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_handle)); @@ -2019,7 +2019,7 @@ static void SvcWrap_GetProcessInfo64From32(Core::System& system) { process_handle = Convert(GetReg32(system, 1)); info_type = Convert(GetReg32(system, 2)); - ret = GetProcessInfo64From32(system, &out_info, process_handle, info_type); + ret = GetProcessInfo64From32(system, std::addressof(out_info), process_handle, info_type); SetReg32(system, 0, Convert(ret)); auto out_info_scatter = Convert>(out_info); @@ -2032,7 +2032,7 @@ static void SvcWrap_CreateResourceLimit64From32(Core::System& system) { Handle out_handle{}; - ret = CreateResourceLimit64From32(system, &out_handle); + ret = CreateResourceLimit64From32(system, std::addressof(out_handle)); SetReg32(system, 0, Convert(ret)); SetReg32(system, 1, Convert(out_handle)); @@ -2093,7 +2093,7 @@ static void SvcWrap_SetHeapSize64(Core::System& system) { size = Convert(GetReg64(system, 1)); - ret = SetHeapSize64(system, &out_address, size); + ret = SetHeapSize64(system, std::addressof(out_address), size); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_address)); @@ -2175,7 +2175,7 @@ static void SvcWrap_QueryMemory64(Core::System& system) { out_memory_info = Convert(GetReg64(system, 0)); address = Convert(GetReg64(system, 2)); - ret = QueryMemory64(system, out_memory_info, &out_page_info, address); + ret = QueryMemory64(system, out_memory_info, std::addressof(out_page_info), address); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_page_info)); @@ -2201,7 +2201,7 @@ static void SvcWrap_CreateThread64(Core::System& system) { priority = Convert(GetReg64(system, 4)); core_id = Convert(GetReg64(system, 5)); - ret = CreateThread64(system, &out_handle, func, arg, stack_bottom, priority, core_id); + ret = CreateThread64(system, std::addressof(out_handle), func, arg, stack_bottom, priority, core_id); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_handle)); @@ -2239,7 +2239,7 @@ static void SvcWrap_GetThreadPriority64(Core::System& system) { thread_handle = Convert(GetReg64(system, 1)); - ret = GetThreadPriority64(system, &out_priority, thread_handle); + ret = GetThreadPriority64(system, std::addressof(out_priority), thread_handle); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_priority)); @@ -2268,7 +2268,7 @@ static void SvcWrap_GetThreadCoreMask64(Core::System& system) { thread_handle = Convert(GetReg64(system, 2)); - ret = GetThreadCoreMask64(system, &out_core_id, &out_affinity_mask, thread_handle); + ret = GetThreadCoreMask64(system, std::addressof(out_core_id), std::addressof(out_affinity_mask), thread_handle); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_core_id)); @@ -2369,7 +2369,7 @@ static void SvcWrap_CreateTransferMemory64(Core::System& system) { size = Convert(GetReg64(system, 2)); map_perm = Convert(GetReg64(system, 3)); - ret = CreateTransferMemory64(system, &out_handle, address, size, map_perm); + ret = CreateTransferMemory64(system, std::addressof(out_handle), address, size, map_perm); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_handle)); @@ -2411,7 +2411,7 @@ static void SvcWrap_WaitSynchronization64(Core::System& system) { num_handles = Convert(GetReg64(system, 2)); timeout_ns = Convert(GetReg64(system, 3)); - ret = WaitSynchronization64(system, &out_index, handles, num_handles, timeout_ns); + ret = WaitSynchronization64(system, std::addressof(out_index), handles, num_handles, timeout_ns); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_index)); @@ -2501,7 +2501,7 @@ static void SvcWrap_ConnectToNamedPort64(Core::System& system) { name = Convert(GetReg64(system, 1)); - ret = ConnectToNamedPort64(system, &out_handle, name); + ret = ConnectToNamedPort64(system, std::addressof(out_handle), name); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_handle)); @@ -2547,7 +2547,7 @@ static void SvcWrap_SendAsyncRequestWithUserBuffer64(Core::System& system) { message_buffer_size = Convert(GetReg64(system, 2)); session_handle = Convert(GetReg64(system, 3)); - ret = SendAsyncRequestWithUserBuffer64(system, &out_event_handle, message_buffer, message_buffer_size, session_handle); + ret = SendAsyncRequestWithUserBuffer64(system, std::addressof(out_event_handle), message_buffer, message_buffer_size, session_handle); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_event_handle)); @@ -2561,7 +2561,7 @@ static void SvcWrap_GetProcessId64(Core::System& system) { process_handle = Convert(GetReg64(system, 1)); - ret = GetProcessId64(system, &out_process_id, process_handle); + ret = GetProcessId64(system, std::addressof(out_process_id), process_handle); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_process_id)); @@ -2575,7 +2575,7 @@ static void SvcWrap_GetThreadId64(Core::System& system) { thread_handle = Convert(GetReg64(system, 1)); - ret = GetThreadId64(system, &out_thread_id, thread_handle); + ret = GetThreadId64(system, std::addressof(out_thread_id), thread_handle); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_thread_id)); @@ -2627,7 +2627,7 @@ static void SvcWrap_GetInfo64(Core::System& system) { handle = Convert(GetReg64(system, 2)); info_subtype = Convert(GetReg64(system, 3)); - ret = GetInfo64(system, &out, info_type, handle, info_subtype); + ret = GetInfo64(system, std::addressof(out), info_type, handle, info_subtype); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out)); @@ -2690,7 +2690,7 @@ static void SvcWrap_GetDebugFutureThreadInfo64(Core::System& system) { debug_handle = Convert(GetReg64(system, 2)); ns = Convert(GetReg64(system, 3)); - ret = GetDebugFutureThreadInfo64(system, &out_context, &out_thread_id, debug_handle, ns); + ret = GetDebugFutureThreadInfo64(system, std::addressof(out_context), std::addressof(out_thread_id), debug_handle, ns); SetReg64(system, 0, Convert(ret)); auto out_context_scatter = Convert>(out_context); @@ -2708,7 +2708,7 @@ static void SvcWrap_GetLastThreadInfo64(Core::System& system) { uint64_t out_tls_address{}; uint32_t out_flags{}; - ret = GetLastThreadInfo64(system, &out_context, &out_tls_address, &out_flags); + ret = GetLastThreadInfo64(system, std::addressof(out_context), std::addressof(out_tls_address), std::addressof(out_flags)); SetReg64(system, 0, Convert(ret)); auto out_context_scatter = Convert>(out_context); @@ -2730,7 +2730,7 @@ static void SvcWrap_GetResourceLimitLimitValue64(Core::System& system) { resource_limit_handle = Convert(GetReg64(system, 1)); which = Convert(GetReg64(system, 2)); - ret = GetResourceLimitLimitValue64(system, &out_limit_value, resource_limit_handle, which); + ret = GetResourceLimitLimitValue64(system, std::addressof(out_limit_value), resource_limit_handle, which); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_limit_value)); @@ -2746,7 +2746,7 @@ static void SvcWrap_GetResourceLimitCurrentValue64(Core::System& system) { resource_limit_handle = Convert(GetReg64(system, 1)); which = Convert(GetReg64(system, 2)); - ret = GetResourceLimitCurrentValue64(system, &out_current_value, resource_limit_handle, which); + ret = GetResourceLimitCurrentValue64(system, std::addressof(out_current_value), resource_limit_handle, which); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_current_value)); @@ -2830,7 +2830,7 @@ static void SvcWrap_GetResourceLimitPeakValue64(Core::System& system) { resource_limit_handle = Convert(GetReg64(system, 1)); which = Convert(GetReg64(system, 2)); - ret = GetResourceLimitPeakValue64(system, &out_peak_value, resource_limit_handle, which); + ret = GetResourceLimitPeakValue64(system, std::addressof(out_peak_value), resource_limit_handle, which); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_peak_value)); @@ -2844,7 +2844,7 @@ static void SvcWrap_CreateIoPool64(Core::System& system) { which = Convert(GetReg64(system, 1)); - ret = CreateIoPool64(system, &out_handle, which); + ret = CreateIoPool64(system, std::addressof(out_handle), which); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_handle)); @@ -2866,7 +2866,7 @@ static void SvcWrap_CreateIoRegion64(Core::System& system) { mapping = Convert(GetReg64(system, 4)); perm = Convert(GetReg64(system, 5)); - ret = CreateIoRegion64(system, &out_handle, io_pool, physical_address, size, mapping, perm); + ret = CreateIoRegion64(system, std::addressof(out_handle), io_pool, physical_address, size, mapping, perm); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_handle)); @@ -2905,7 +2905,7 @@ static void SvcWrap_CreateSession64(Core::System& system) { is_light = Convert(GetReg64(system, 2)); name = Convert(GetReg64(system, 3)); - ret = CreateSession64(system, &out_server_session_handle, &out_client_session_handle, is_light, name); + ret = CreateSession64(system, std::addressof(out_server_session_handle), std::addressof(out_client_session_handle), is_light, name); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_server_session_handle)); @@ -2920,7 +2920,7 @@ static void SvcWrap_AcceptSession64(Core::System& system) { port = Convert(GetReg64(system, 1)); - ret = AcceptSession64(system, &out_handle, port); + ret = AcceptSession64(system, std::addressof(out_handle), port); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_handle)); @@ -2940,7 +2940,7 @@ static void SvcWrap_ReplyAndReceive64(Core::System& system) { reply_target = Convert(GetReg64(system, 3)); timeout_ns = Convert(GetReg64(system, 4)); - ret = ReplyAndReceive64(system, &out_index, handles, num_handles, reply_target, timeout_ns); + ret = ReplyAndReceive64(system, std::addressof(out_index), handles, num_handles, reply_target, timeout_ns); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_index)); @@ -2964,7 +2964,7 @@ static void SvcWrap_ReplyAndReceiveWithUserBuffer64(Core::System& system) { reply_target = Convert(GetReg64(system, 5)); timeout_ns = Convert(GetReg64(system, 6)); - ret = ReplyAndReceiveWithUserBuffer64(system, &out_index, message_buffer, message_buffer_size, handles, num_handles, reply_target, timeout_ns); + ret = ReplyAndReceiveWithUserBuffer64(system, std::addressof(out_index), message_buffer, message_buffer_size, handles, num_handles, reply_target, timeout_ns); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_index)); @@ -2976,7 +2976,7 @@ static void SvcWrap_CreateEvent64(Core::System& system) { Handle out_write_handle{}; Handle out_read_handle{}; - ret = CreateEvent64(system, &out_write_handle, &out_read_handle); + ret = CreateEvent64(system, std::addressof(out_write_handle), std::addressof(out_read_handle)); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_write_handle)); @@ -3067,7 +3067,7 @@ static void SvcWrap_CreateCodeMemory64(Core::System& system) { address = Convert(GetReg64(system, 1)); size = Convert(GetReg64(system, 2)); - ret = CreateCodeMemory64(system, &out_handle, address, size); + ret = CreateCodeMemory64(system, std::addressof(out_handle), address, size); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_handle)); @@ -3109,7 +3109,7 @@ static void SvcWrap_ReadWriteRegister64(Core::System& system) { mask = Convert(GetReg64(system, 2)); value = Convert(GetReg64(system, 3)); - ret = ReadWriteRegister64(system, &out_value, address, mask, value); + ret = ReadWriteRegister64(system, std::addressof(out_value), address, mask, value); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_value)); @@ -3141,7 +3141,7 @@ static void SvcWrap_CreateSharedMemory64(Core::System& system) { owner_perm = Convert(GetReg64(system, 2)); remote_perm = Convert(GetReg64(system, 3)); - ret = CreateSharedMemory64(system, &out_handle, size, owner_perm, remote_perm); + ret = CreateSharedMemory64(system, std::addressof(out_handle), size, owner_perm, remote_perm); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_handle)); @@ -3191,7 +3191,7 @@ static void SvcWrap_CreateInterruptEvent64(Core::System& system) { interrupt_id = Convert(GetReg64(system, 1)); interrupt_type = Convert(GetReg64(system, 2)); - ret = CreateInterruptEvent64(system, &out_read_handle, interrupt_id, interrupt_type); + ret = CreateInterruptEvent64(system, std::addressof(out_read_handle), interrupt_id, interrupt_type); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_read_handle)); @@ -3205,7 +3205,7 @@ static void SvcWrap_QueryPhysicalAddress64(Core::System& system) { address = Convert(GetReg64(system, 1)); - ret = QueryPhysicalAddress64(system, &out_info, address); + ret = QueryPhysicalAddress64(system, std::addressof(out_info), address); SetReg64(system, 0, Convert(ret)); auto out_info_scatter = Convert>(out_info); @@ -3225,7 +3225,7 @@ static void SvcWrap_QueryIoMapping64(Core::System& system) { physical_address = Convert(GetReg64(system, 2)); size = Convert(GetReg64(system, 3)); - ret = QueryIoMapping64(system, &out_address, &out_size, physical_address, size); + ret = QueryIoMapping64(system, std::addressof(out_address), std::addressof(out_size), physical_address, size); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_address)); @@ -3242,7 +3242,7 @@ static void SvcWrap_CreateDeviceAddressSpace64(Core::System& system) { das_address = Convert(GetReg64(system, 1)); das_size = Convert(GetReg64(system, 2)); - ret = CreateDeviceAddressSpace64(system, &out_handle, das_address, das_size); + ret = CreateDeviceAddressSpace64(system, std::addressof(out_handle), das_address, das_size); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_handle)); @@ -3396,7 +3396,7 @@ static void SvcWrap_DebugActiveProcess64(Core::System& system) { process_id = Convert(GetReg64(system, 1)); - ret = DebugActiveProcess64(system, &out_handle, process_id); + ret = DebugActiveProcess64(system, std::addressof(out_handle), process_id); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_handle)); @@ -3468,7 +3468,7 @@ static void SvcWrap_GetProcessList64(Core::System& system) { out_process_ids = Convert(GetReg64(system, 1)); max_out_count = Convert(GetReg64(system, 2)); - ret = GetProcessList64(system, &out_num_processes, out_process_ids, max_out_count); + ret = GetProcessList64(system, std::addressof(out_num_processes), out_process_ids, max_out_count); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_num_processes)); @@ -3486,7 +3486,7 @@ static void SvcWrap_GetThreadList64(Core::System& system) { max_out_count = Convert(GetReg64(system, 2)); debug_handle = Convert(GetReg64(system, 3)); - ret = GetThreadList64(system, &out_num_threads, out_thread_ids, max_out_count, debug_handle); + ret = GetThreadList64(system, std::addressof(out_num_threads), out_thread_ids, max_out_count, debug_handle); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_num_threads)); @@ -3540,7 +3540,7 @@ static void SvcWrap_QueryDebugProcessMemory64(Core::System& system) { process_handle = Convert(GetReg64(system, 2)); address = Convert(GetReg64(system, 3)); - ret = QueryDebugProcessMemory64(system, out_memory_info, &out_page_info, process_handle, address); + ret = QueryDebugProcessMemory64(system, out_memory_info, std::addressof(out_page_info), process_handle, address); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_page_info)); @@ -3611,7 +3611,7 @@ static void SvcWrap_GetDebugThreadParam64(Core::System& system) { thread_id = Convert(GetReg64(system, 3)); param = Convert(GetReg64(system, 4)); - ret = GetDebugThreadParam64(system, &out_64, &out_32, debug_handle, thread_id, param); + ret = GetDebugThreadParam64(system, std::addressof(out_64), std::addressof(out_32), debug_handle, thread_id, param); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_64)); @@ -3630,7 +3630,7 @@ static void SvcWrap_GetSystemInfo64(Core::System& system) { handle = Convert(GetReg64(system, 2)); info_subtype = Convert(GetReg64(system, 3)); - ret = GetSystemInfo64(system, &out, info_type, handle, info_subtype); + ret = GetSystemInfo64(system, std::addressof(out), info_type, handle, info_subtype); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out)); @@ -3649,7 +3649,7 @@ static void SvcWrap_CreatePort64(Core::System& system) { is_light = Convert(GetReg64(system, 3)); name = Convert(GetReg64(system, 4)); - ret = CreatePort64(system, &out_server_handle, &out_client_handle, max_sessions, is_light, name); + ret = CreatePort64(system, std::addressof(out_server_handle), std::addressof(out_client_handle), max_sessions, is_light, name); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_server_handle)); @@ -3666,7 +3666,7 @@ static void SvcWrap_ManageNamedPort64(Core::System& system) { name = Convert(GetReg64(system, 1)); max_sessions = Convert(GetReg64(system, 2)); - ret = ManageNamedPort64(system, &out_server_handle, name, max_sessions); + ret = ManageNamedPort64(system, std::addressof(out_server_handle), name, max_sessions); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_server_handle)); @@ -3680,7 +3680,7 @@ static void SvcWrap_ConnectToPort64(Core::System& system) { port = Convert(GetReg64(system, 1)); - ret = ConnectToPort64(system, &out_handle, port); + ret = ConnectToPort64(system, std::addressof(out_handle), port); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_handle)); @@ -3752,7 +3752,7 @@ static void SvcWrap_QueryProcessMemory64(Core::System& system) { process_handle = Convert(GetReg64(system, 2)); address = Convert(GetReg64(system, 3)); - ret = QueryProcessMemory64(system, out_memory_info, &out_page_info, process_handle, address); + ret = QueryProcessMemory64(system, out_memory_info, std::addressof(out_page_info), process_handle, address); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_page_info)); @@ -3806,7 +3806,7 @@ static void SvcWrap_CreateProcess64(Core::System& system) { caps = Convert(GetReg64(system, 2)); num_caps = Convert(GetReg64(system, 3)); - ret = CreateProcess64(system, &out_handle, parameters, caps, num_caps); + ret = CreateProcess64(system, std::addressof(out_handle), parameters, caps, num_caps); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_handle)); @@ -3852,7 +3852,7 @@ static void SvcWrap_GetProcessInfo64(Core::System& system) { process_handle = Convert(GetReg64(system, 1)); info_type = Convert(GetReg64(system, 2)); - ret = GetProcessInfo64(system, &out_info, process_handle, info_type); + ret = GetProcessInfo64(system, std::addressof(out_info), process_handle, info_type); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_info)); @@ -3863,7 +3863,7 @@ static void SvcWrap_CreateResourceLimit64(Core::System& system) { Handle out_handle{}; - ret = CreateResourceLimit64(system, &out_handle); + ret = CreateResourceLimit64(system, std::addressof(out_handle)); SetReg64(system, 0, Convert(ret)); SetReg64(system, 1, Convert(out_handle)); diff --git a/src/core/hle/kernel/svc/svc_info.cpp b/src/core/hle/kernel/svc/svc_info.cpp index 806acb539..7d94347c5 100644 --- a/src/core/hle/kernel/svc/svc_info.cpp +++ b/src/core/hle/kernel/svc/svc_info.cpp @@ -153,7 +153,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle } Handle resource_handle{}; - R_TRY(handle_table.Add(&resource_handle, resource_limit)); + R_TRY(handle_table.Add(std::addressof(resource_handle), resource_limit)); *result = resource_handle; R_SUCCEED(); @@ -234,7 +234,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle // Get a new handle for the current process. Handle tmp; - R_TRY(handle_table.Add(&tmp, current_process)); + R_TRY(handle_table.Add(std::addressof(tmp), current_process)); // Set the output. *result = tmp; diff --git a/src/core/hle/kernel/svc/svc_ipc.cpp b/src/core/hle/kernel/svc/svc_ipc.cpp index bca303650..46fd0f2ea 100644 --- a/src/core/hle/kernel/svc/svc_ipc.cpp +++ b/src/core/hle/kernel/svc/svc_ipc.cpp @@ -79,7 +79,7 @@ Result ReplyAndReceive(Core::System& system, s32* out_index, uint64_t handles_ad while (true) { // Wait for an object. s32 index; - Result result = KSynchronizationObject::Wait(kernel, &index, objs.data(), + Result result = KSynchronizationObject::Wait(kernel, std::addressof(index), objs.data(), static_cast(objs.size()), timeout_ns); if (result == ResultTimedOut) { R_RETURN(result); diff --git a/src/core/hle/kernel/svc/svc_query_memory.cpp b/src/core/hle/kernel/svc/svc_query_memory.cpp index b2290164c..457ebf950 100644 --- a/src/core/hle/kernel/svc/svc_query_memory.cpp +++ b/src/core/hle/kernel/svc/svc_query_memory.cpp @@ -33,7 +33,7 @@ Result QueryProcessMemory(Core::System& system, uint64_t out_memory_info, PageIn auto& memory{system.Memory()}; const auto memory_info{process->PageTable().QueryInfo(address).GetSvcMemoryInfo()}; - memory.WriteBlock(out_memory_info, &memory_info, sizeof(memory_info)); + memory.WriteBlock(out_memory_info, std::addressof(memory_info), sizeof(memory_info)); //! This is supposed to be part of the QueryInfo call. *out_page_info = {}; diff --git a/src/core/hle/kernel/svc/svc_resource_limit.cpp b/src/core/hle/kernel/svc/svc_resource_limit.cpp index d96a7e879..732bc017e 100644 --- a/src/core/hle/kernel/svc/svc_resource_limit.cpp +++ b/src/core/hle/kernel/svc/svc_resource_limit.cpp @@ -21,7 +21,7 @@ Result CreateResourceLimit(Core::System& system, Handle* out_handle) { SCOPE_EXIT({ resource_limit->Close(); }); // Initialize the resource limit. - resource_limit->Initialize(&system.CoreTiming()); + resource_limit->Initialize(std::addressof(system.CoreTiming())); // Register the limit. KResourceLimit::Register(kernel, resource_limit); diff --git a/src/core/hle/kernel/svc/svc_secure_monitor_call.cpp b/src/core/hle/kernel/svc/svc_secure_monitor_call.cpp index 20f6ec643..62c781551 100644 --- a/src/core/hle/kernel/svc/svc_secure_monitor_call.cpp +++ b/src/core/hle/kernel/svc/svc_secure_monitor_call.cpp @@ -29,7 +29,7 @@ void SvcWrap_CallSecureMonitor64(Core::System& system) { args.r[i] = core.GetReg(i); } - CallSecureMonitor64(system, &args); + CallSecureMonitor64(system, std::addressof(args)); for (int i = 0; i < 8; i++) { core.SetReg(i, args.r[i]); @@ -43,7 +43,7 @@ void SvcWrap_CallSecureMonitor64From32(Core::System& system) { args.r[i] = static_cast(core.GetReg(i)); } - CallSecureMonitor64From32(system, &args); + CallSecureMonitor64From32(system, std::addressof(args)); for (int i = 0; i < 8; i++) { core.SetReg(i, args.r[i]); diff --git a/src/core/hle/kernel/svc/svc_session.cpp b/src/core/hle/kernel/svc/svc_session.cpp index d5a3d0120..01b8a52ad 100644 --- a/src/core/hle/kernel/svc/svc_session.cpp +++ b/src/core/hle/kernel/svc/svc_session.cpp @@ -21,7 +21,8 @@ Result CreateSession(Core::System& system, Handle* out_server, Handle* out_clien // Reserve a new session from the process resource limit. // FIXME: LimitableResource_SessionCountMax - KScopedResourceReservation session_reservation(&process, LimitableResource::SessionCountMax); + KScopedResourceReservation session_reservation(std::addressof(process), + LimitableResource::SessionCountMax); if (session_reservation.Succeeded()) { session = T::Create(system.Kernel()); } else { @@ -30,7 +31,7 @@ Result CreateSession(Core::System& system, Handle* out_server, Handle* out_clien // // We couldn't reserve a session. Check that we support dynamically expanding the // // resource limit. // R_UNLESS(process.GetResourceLimit() == - // &system.Kernel().GetSystemResourceLimit(), ResultLimitReached); + // std::addressof(system.Kernel().GetSystemResourceLimit()), ResultLimitReached); // R_UNLESS(KTargetSystem::IsDynamicResourceLimitsEnabled(), ResultLimitReached()); // // Try to allocate a session from unused slab memory. @@ -75,7 +76,7 @@ Result CreateSession(Core::System& system, Handle* out_server, Handle* out_clien T::Register(system.Kernel(), session); // Add the server session to the handle table. - R_TRY(handle_table.Add(out_server, &session->GetServerSession())); + R_TRY(handle_table.Add(out_server, std::addressof(session->GetServerSession()))); // Ensure that we maintain a clean handle state on exit. ON_RESULT_FAILURE { @@ -83,7 +84,7 @@ Result CreateSession(Core::System& system, Handle* out_server, Handle* out_clien }; // Add the client session to the handle table. - R_RETURN(handle_table.Add(out_client, &session->GetClientSession())); + R_RETURN(handle_table.Add(out_client, std::addressof(session->GetClientSession()))); } } // namespace diff --git a/src/core/hle/kernel/svc/svc_thread.cpp b/src/core/hle/kernel/svc/svc_thread.cpp index 5e888153b..a16fc7ae3 100644 --- a/src/core/hle/kernel/svc/svc_thread.cpp +++ b/src/core/hle/kernel/svc/svc_thread.cpp @@ -42,9 +42,9 @@ Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point, R_UNLESS(process.CheckThreadPriority(priority), ResultInvalidPriority); // Reserve a new thread from the process resource limit (waiting up to 100ms). - KScopedResourceReservation thread_reservation(&process, LimitableResource::ThreadCountMax, 1, - system.CoreTiming().GetGlobalTimeNs().count() + - 100000000); + KScopedResourceReservation thread_reservation( + std::addressof(process), LimitableResource::ThreadCountMax, 1, + system.CoreTiming().GetGlobalTimeNs().count() + 100000000); R_UNLESS(thread_reservation.Succeeded(), ResultLimitReached); // Create the thread. @@ -56,7 +56,7 @@ Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point, { KScopedLightLock lk{process.GetStateLock()}; R_TRY(KThread::InitializeUserThread(system, thread, entry_point, arg, stack_bottom, - priority, core_id, &process)); + priority, core_id, std::addressof(process))); } // Set the thread name for debugging purposes. diff --git a/src/core/hle/kernel/svc/svc_transfer_memory.cpp b/src/core/hle/kernel/svc/svc_transfer_memory.cpp index ff4a87916..394f06728 100644 --- a/src/core/hle/kernel/svc/svc_transfer_memory.cpp +++ b/src/core/hle/kernel/svc/svc_transfer_memory.cpp @@ -43,7 +43,7 @@ Result CreateTransferMemory(Core::System& system, Handle* out, VAddr address, u6 auto& handle_table = process.GetHandleTable(); // Reserve a new transfer memory from the process resource limit. - KScopedResourceReservation trmem_reservation(&process, + KScopedResourceReservation trmem_reservation(std::addressof(process), LimitableResource::TransferMemoryCountMax); R_UNLESS(trmem_reservation.Succeeded(), ResultLimitReached); diff --git a/src/core/hle/kernel/svc_generator.py b/src/core/hle/kernel/svc_generator.py index 0cce69e85..7fcbb1ba1 100644 --- a/src/core/hle/kernel/svc_generator.py +++ b/src/core/hle/kernel/svc_generator.py @@ -460,7 +460,7 @@ def emit_wrapper(wrapped_fn, suffix, register_info, arguments, byte_size): call_arguments = ["system"] for arg in arguments: if arg.is_output and not arg.is_outptr: - call_arguments.append(f"&{arg.var_name}") + call_arguments.append(f"std::addressof({arg.var_name})") else: call_arguments.append(arg.var_name) @@ -574,9 +574,9 @@ static To Convert(const From& from) { To to{}; if constexpr (sizeof(To) >= sizeof(From)) { - std::memcpy(&to, &from, sizeof(From)); + std::memcpy(std::addressof(to), std::addressof(from), sizeof(From)); } else { - std::memcpy(&to, &from, sizeof(To)); + std::memcpy(std::addressof(to), std::addressof(from), sizeof(To)); } return to; From 6bfb4c8f713323bb39b7e38a779c35583fc61bcc Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 7 Mar 2023 16:11:50 -0500 Subject: [PATCH 0178/1181] kernel: convert KThread to new style --- src/core/debugger/gdbstub.cpp | 12 +- src/core/debugger/gdbstub_arch.cpp | 4 +- src/core/hle/kernel/k_client_session.cpp | 2 +- src/core/hle/kernel/k_condition_variable.cpp | 2 - src/core/hle/kernel/k_condition_variable.h | 8 +- src/core/hle/kernel/k_process.cpp | 1 - src/core/hle/kernel/k_scheduler.cpp | 16 +- src/core/hle/kernel/k_server_session.cpp | 4 +- src/core/hle/kernel/k_thread.cpp | 483 ++++++++-------- src/core/hle/kernel/k_thread.h | 544 +++++++++---------- src/core/hle/kernel/kernel.cpp | 3 - src/core/hle/kernel/svc/svc_thread.cpp | 5 +- src/core/hle/service/hle_ipc.cpp | 2 +- src/yuzu/debugger/wait_tree.cpp | 67 +-- src/yuzu/debugger/wait_tree.h | 36 -- 15 files changed, 519 insertions(+), 670 deletions(-) diff --git a/src/core/debugger/gdbstub.cpp b/src/core/debugger/gdbstub.cpp index 18afe97e1..f39f2ca29 100644 --- a/src/core/debugger/gdbstub.cpp +++ b/src/core/debugger/gdbstub.cpp @@ -421,7 +421,7 @@ void GDBStub::HandleBreakpointRemove(std::string_view command) { static std::optional GetNameFromThreadType32(Core::Memory::Memory& memory, const Kernel::KThread* thread) { // Read thread type from TLS - const VAddr tls_thread_type{memory.Read32(thread->GetTLSAddress() + 0x1fc)}; + const VAddr tls_thread_type{memory.Read32(thread->GetTlsAddress() + 0x1fc)}; const VAddr argument_thread_type{thread->GetArgument()}; if (argument_thread_type && tls_thread_type != argument_thread_type) { @@ -452,7 +452,7 @@ static std::optional GetNameFromThreadType32(Core::Memory::Memory& static std::optional GetNameFromThreadType64(Core::Memory::Memory& memory, const Kernel::KThread* thread) { // Read thread type from TLS - const VAddr tls_thread_type{memory.Read64(thread->GetTLSAddress() + 0x1f8)}; + const VAddr tls_thread_type{memory.Read64(thread->GetTlsAddress() + 0x1f8)}; const VAddr argument_thread_type{thread->GetArgument()}; if (argument_thread_type && tls_thread_type != argument_thread_type) { @@ -576,7 +576,7 @@ void GDBStub::HandleQuery(std::string_view command) { const auto& threads = system.ApplicationProcess()->GetThreadList(); std::vector thread_ids; for (const auto& thread : threads) { - thread_ids.push_back(fmt::format("{:x}", thread->GetThreadID())); + thread_ids.push_back(fmt::format("{:x}", thread->GetThreadId())); } SendReply(fmt::format("m{}", fmt::join(thread_ids, ","))); } else if (command.starts_with("sThreadInfo")) { @@ -591,11 +591,11 @@ void GDBStub::HandleQuery(std::string_view command) { for (const auto* thread : threads) { auto thread_name{GetThreadName(system, thread)}; if (!thread_name) { - thread_name = fmt::format("Thread {:d}", thread->GetThreadID()); + thread_name = fmt::format("Thread {:d}", thread->GetThreadId()); } buffer += fmt::format(R"({})", - thread->GetThreadID(), thread->GetActiveCore(), + thread->GetThreadId(), thread->GetActiveCore(), EscapeXML(*thread_name), GetThreadState(thread)); } @@ -819,7 +819,7 @@ void GDBStub::HandleRcmd(const std::vector& command) { Kernel::KThread* GDBStub::GetThreadByID(u64 thread_id) { const auto& threads{system.ApplicationProcess()->GetThreadList()}; for (auto* thread : threads) { - if (thread->GetThreadID() == thread_id) { + if (thread->GetThreadId() == thread_id) { return thread; } } diff --git a/src/core/debugger/gdbstub_arch.cpp b/src/core/debugger/gdbstub_arch.cpp index 831c48513..75c94a91a 100644 --- a/src/core/debugger/gdbstub_arch.cpp +++ b/src/core/debugger/gdbstub_arch.cpp @@ -259,7 +259,7 @@ void GDBStubA64::WriteRegisters(Kernel::KThread* thread, std::string_view regist std::string GDBStubA64::ThreadStatus(const Kernel::KThread* thread, u8 signal) const { return fmt::format("T{:02x}{:02x}:{};{:02x}:{};{:02x}:{};thread:{:x};", signal, PC_REGISTER, RegRead(thread, PC_REGISTER), SP_REGISTER, RegRead(thread, SP_REGISTER), - LR_REGISTER, RegRead(thread, LR_REGISTER), thread->GetThreadID()); + LR_REGISTER, RegRead(thread, LR_REGISTER), thread->GetThreadId()); } u32 GDBStubA64::BreakpointInstruction() const { @@ -469,7 +469,7 @@ void GDBStubA32::WriteRegisters(Kernel::KThread* thread, std::string_view regist std::string GDBStubA32::ThreadStatus(const Kernel::KThread* thread, u8 signal) const { return fmt::format("T{:02x}{:02x}:{};{:02x}:{};{:02x}:{};thread:{:x};", signal, PC_REGISTER, RegRead(thread, PC_REGISTER), SP_REGISTER, RegRead(thread, SP_REGISTER), - LR_REGISTER, RegRead(thread, LR_REGISTER), thread->GetThreadID()); + LR_REGISTER, RegRead(thread, LR_REGISTER), thread->GetThreadId()); } u32 GDBStubA32::BreakpointInstruction() const { diff --git a/src/core/hle/kernel/k_client_session.cpp b/src/core/hle/kernel/k_client_session.cpp index 62a8fab45..d998b2be2 100644 --- a/src/core/hle/kernel/k_client_session.cpp +++ b/src/core/hle/kernel/k_client_session.cpp @@ -29,7 +29,7 @@ Result KClientSession::SendSyncRequest() { SCOPE_EXIT({ request->Close(); }); // Initialize the request. - request->Initialize(nullptr, GetCurrentThread(m_kernel).GetTLSAddress(), MessageBufferSize); + request->Initialize(nullptr, GetCurrentThread(m_kernel).GetTlsAddress(), MessageBufferSize); // Send the request. R_RETURN(m_parent->GetServerSession().OnRequest(request)); diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cpp index 067f26fba..58b8609d8 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/core/hle/kernel/k_condition_variable.cpp @@ -177,7 +177,6 @@ Result KConditionVariable::WaitForAddress(Handle handle, VAddr addr, u32 value) // Begin waiting. cur_thread->BeginWait(std::addressof(wait_queue)); cur_thread->SetWaitReasonForDebugging(ThreadWaitReasonForDebugging::ConditionVar); - cur_thread->SetMutexWaitAddressForDebugging(addr); } // Close our reference to the owner thread, now that the wait is over. @@ -324,7 +323,6 @@ Result KConditionVariable::Wait(VAddr addr, u64 key, u32 value, s64 timeout) { wait_queue.SetHardwareTimer(timer); cur_thread->BeginWait(std::addressof(wait_queue)); cur_thread->SetWaitReasonForDebugging(ThreadWaitReasonForDebugging::ConditionVar); - cur_thread->SetMutexWaitAddressForDebugging(addr); } // Get the wait result. diff --git a/src/core/hle/kernel/k_condition_variable.h b/src/core/hle/kernel/k_condition_variable.h index 41635a894..fbd2c1fc0 100644 --- a/src/core/hle/kernel/k_condition_variable.h +++ b/src/core/hle/kernel/k_condition_variable.h @@ -41,16 +41,16 @@ private: ThreadTree m_tree{}; }; -inline void BeforeUpdatePriority(const KernelCore& kernel, KConditionVariable::ThreadTree* tree, +inline void BeforeUpdatePriority(KernelCore& kernel, KConditionVariable::ThreadTree* tree, KThread* thread) { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); tree->erase(tree->iterator_to(*thread)); } -inline void AfterUpdatePriority(const KernelCore& kernel, KConditionVariable::ThreadTree* tree, +inline void AfterUpdatePriority(KernelCore& kernel, KConditionVariable::ThreadTree* tree, KThread* thread) { - ASSERT(kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(kernel)); tree->insert(*thread); } diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp index b740fb1c3..fa3fc8c1c 100644 --- a/src/core/hle/kernel/k_process.cpp +++ b/src/core/hle/kernel/k_process.cpp @@ -52,7 +52,6 @@ void SetupMainThread(Core::System& system, KProcess& owner_process, u32 priority Handle thread_handle{}; owner_process.GetHandleTable().Add(std::addressof(thread_handle), thread); - thread->SetName("main"); thread->GetContext32().cpu_registers[0] = 0; thread->GetContext64().cpu_registers[0] = 0; thread->GetContext32().cpu_registers[1] = thread_handle; diff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/core/hle/kernel/k_scheduler.cpp index fe371726c..ecadf2916 100644 --- a/src/core/hle/kernel/k_scheduler.cpp +++ b/src/core/hle/kernel/k_scheduler.cpp @@ -411,7 +411,7 @@ void KScheduler::ScheduleImpl() { m_switch_cur_thread = cur_thread; m_switch_highest_priority_thread = highest_priority_thread; m_switch_from_schedule = true; - Common::Fiber::YieldTo(cur_thread->host_context, *m_switch_fiber); + Common::Fiber::YieldTo(cur_thread->m_host_context, *m_switch_fiber); // Returning from ScheduleImpl occurs after this thread has been scheduled again. } @@ -450,7 +450,7 @@ void KScheduler::ScheduleImplFiber() { // We want to try to lock the highest priority thread's context. // Try to take it. - while (!highest_priority_thread->context_guard.try_lock()) { + while (!highest_priority_thread->m_context_guard.try_lock()) { // The highest priority thread's context is already locked. // Check if we need scheduling. If we don't, we can retry directly. if (m_state.needs_scheduling.load(std::memory_order_seq_cst)) { @@ -468,7 +468,7 @@ void KScheduler::ScheduleImplFiber() { if (m_state.needs_scheduling.load(std::memory_order_seq_cst)) { // Our switch failed. // We should unlock the thread context, and then retry. - highest_priority_thread->context_guard.unlock(); + highest_priority_thread->m_context_guard.unlock(); goto retry; } else { break; @@ -489,7 +489,7 @@ void KScheduler::ScheduleImplFiber() { Reload(highest_priority_thread); // Reload the host thread. - Common::Fiber::YieldTo(m_switch_fiber, *highest_priority_thread->host_context); + Common::Fiber::YieldTo(m_switch_fiber, *highest_priority_thread->m_host_context); } void KScheduler::Unload(KThread* thread) { @@ -497,13 +497,13 @@ void KScheduler::Unload(KThread* thread) { cpu_core.SaveContext(thread->GetContext32()); cpu_core.SaveContext(thread->GetContext64()); // Save the TPIDR_EL0 system register in case it was modified. - thread->SetTPIDR_EL0(cpu_core.GetTPIDR_EL0()); + thread->SetTpidrEl0(cpu_core.GetTPIDR_EL0()); cpu_core.ClearExclusiveState(); // Check if the thread is terminated by checking the DPC flags. if ((thread->GetStackParameters().dpc_flags & static_cast(DpcFlag::Terminated)) == 0) { // The thread isn't terminated, so we want to unlock it. - thread->context_guard.unlock(); + thread->m_context_guard.unlock(); } } @@ -511,8 +511,8 @@ void KScheduler::Reload(KThread* thread) { auto& cpu_core = m_kernel.System().ArmInterface(m_core_id); cpu_core.LoadContext(thread->GetContext32()); cpu_core.LoadContext(thread->GetContext64()); - cpu_core.SetTlsAddress(thread->GetTLSAddress()); - cpu_core.SetTPIDR_EL0(thread->GetTPIDR_EL0()); + cpu_core.SetTlsAddress(thread->GetTlsAddress()); + cpu_core.SetTPIDR_EL0(thread->GetTpidrEl0()); cpu_core.LoadWatchpointArray(thread->GetOwnerProcess()->GetWatchpoints()); cpu_core.ClearExclusiveState(); } diff --git a/src/core/hle/kernel/k_server_session.cpp b/src/core/hle/kernel/k_server_session.cpp index 8376c5d76..2288ee435 100644 --- a/src/core/hle/kernel/k_server_session.cpp +++ b/src/core/hle/kernel/k_server_session.cpp @@ -226,7 +226,7 @@ Result KServerSession::SendReply(bool is_hle) { KThread* server_thread{GetCurrentThreadPointer(m_kernel)}; UNIMPLEMENTED_IF(server_thread->GetOwnerProcess() != client_thread->GetOwnerProcess()); - auto* src_msg_buffer = memory.GetPointer(server_thread->GetTLSAddress()); + auto* src_msg_buffer = memory.GetPointer(server_thread->GetTlsAddress()); auto* dst_msg_buffer = memory.GetPointer(client_message); std::memcpy(dst_msg_buffer, src_msg_buffer, client_buffer_size); } @@ -334,7 +334,7 @@ Result KServerSession::ReceiveRequest(std::shared_ptrGetOwnerProcess() != client_thread->GetOwnerProcess()); auto* src_msg_buffer = memory.GetPointer(client_message); - auto* dst_msg_buffer = memory.GetPointer(server_thread->GetTLSAddress()); + auto* dst_msg_buffer = memory.GetPointer(server_thread->GetTlsAddress()); std::memcpy(dst_msg_buffer, src_msg_buffer, client_buffer_size); } diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index 27616440c..2eee85258 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -35,15 +35,11 @@ #include "core/hle/result.h" #include "core/memory.h" -#ifdef ARCHITECTURE_x86_64 -#include "core/arm/dynarmic/arm_dynarmic_32.h" -#endif - namespace { constexpr inline s32 TerminatingThreadPriority = Kernel::Svc::SystemThreadPriorityHighest - 1; -static void ResetThreadContext32(Core::ARM_Interface::ThreadContext32& context, u32 stack_top, +static void ResetThreadContext32(Kernel::KThread::ThreadContext32& context, u32 stack_top, u32 entry_point, u32 arg) { context = {}; context.cpu_registers[0] = arg; @@ -52,7 +48,7 @@ static void ResetThreadContext32(Core::ARM_Interface::ThreadContext32& context, context.fpscr = 0; } -static void ResetThreadContext64(Core::ARM_Interface::ThreadContext64& context, VAddr stack_top, +static void ResetThreadContext64(Kernel::KThread::ThreadContext64& context, VAddr stack_top, VAddr entry_point, u64 arg) { context = {}; context.cpu_registers[0] = arg; @@ -95,13 +91,13 @@ public: } private: - KThread::WaiterList* m_wait_list; + KThread::WaiterList* m_wait_list{}; }; } // namespace KThread::KThread(KernelCore& kernel) - : KAutoObjectWithSlabHeapAndContainer{kernel}, activity_pause_lock{kernel} {} + : KAutoObjectWithSlabHeapAndContainer{kernel}, m_activity_pause_lock{kernel} {} KThread::~KThread() = default; Result KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack_top, s32 prio, @@ -117,7 +113,7 @@ Result KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack ASSERT(0 <= phys_core && phys_core < static_cast(Core::Hardware::NUM_CPU_CORES)); // First, clear the TLS address. - tls_address = {}; + m_tls_address = {}; // Next, assert things based on the type. switch (type) { @@ -141,73 +137,73 @@ Result KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack ASSERT_MSG(false, "KThread::Initialize: Unknown ThreadType {}", static_cast(type)); break; } - thread_type = type; + m_thread_type = type; // Set the ideal core ID and affinity mask. - virtual_ideal_core_id = virt_core; - physical_ideal_core_id = phys_core; - virtual_affinity_mask = 1ULL << virt_core; - physical_affinity_mask.SetAffinity(phys_core, true); + m_virtual_ideal_core_id = virt_core; + m_physical_ideal_core_id = phys_core; + m_virtual_affinity_mask = 1ULL << virt_core; + m_physical_affinity_mask.SetAffinity(phys_core, true); // Set the thread state. - thread_state = (type == ThreadType::Main || type == ThreadType::Dummy) - ? ThreadState::Runnable - : ThreadState::Initialized; + m_thread_state = (type == ThreadType::Main || type == ThreadType::Dummy) + ? ThreadState::Runnable + : ThreadState::Initialized; // Set TLS address. - tls_address = 0; + m_tls_address = 0; // Set parent and condvar tree. - parent = nullptr; - condvar_tree = nullptr; + m_parent = nullptr; + m_condvar_tree = nullptr; // Set sync booleans. - signaled = false; - termination_requested = false; - wait_cancelled = false; - cancellable = false; + m_signaled = false; + m_termination_requested = false; + m_wait_cancelled = false; + m_cancellable = false; // Set core ID and wait result. - core_id = phys_core; - wait_result = ResultNoSynchronizationObject; + m_core_id = phys_core; + m_wait_result = ResultNoSynchronizationObject; // Set priorities. - priority = prio; - base_priority = prio; + m_priority = prio; + m_base_priority = prio; // Initialize sleeping queue. - wait_queue = nullptr; + m_wait_queue = nullptr; // Set suspend flags. - suspend_request_flags = 0; - suspend_allowed_flags = static_cast(ThreadState::SuspendFlagMask); + m_suspend_request_flags = 0; + m_suspend_allowed_flags = static_cast(ThreadState::SuspendFlagMask); // We're neither debug attached, nor are we nesting our priority inheritance. - debug_attached = false; - priority_inheritance_count = 0; + m_debug_attached = false; + m_priority_inheritance_count = 0; // We haven't been scheduled, and we have done no light IPC. - schedule_count = -1; - last_scheduled_tick = 0; - light_ipc_data = nullptr; + m_schedule_count = -1; + m_last_scheduled_tick = 0; + m_light_ipc_data = nullptr; // We're not waiting for a lock, and we haven't disabled migration. - waiting_lock_info = nullptr; - num_core_migration_disables = 0; + m_waiting_lock_info = nullptr; + m_num_core_migration_disables = 0; // We have no waiters, but we do have an entrypoint. - num_kernel_waiters = 0; + m_num_kernel_waiters = 0; // Set our current core id. - current_core_id = phys_core; + m_current_core_id = phys_core; // We haven't released our resource limit hint, and we've spent no time on the cpu. - resource_limit_release_hint = false; - cpu_time = 0; + m_resource_limit_release_hint = false; + m_cpu_time = 0; // Set debug context. - stack_top = user_stack_top; - argument = arg; + m_stack_top = user_stack_top; + m_argument = arg; // Clear our stack parameters. std::memset(static_cast(std::addressof(GetStackParameters())), 0, @@ -217,34 +213,34 @@ Result KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack if (owner != nullptr) { // Setup the TLS, if needed. if (type == ThreadType::User) { - R_TRY(owner->CreateThreadLocalRegion(std::addressof(tls_address))); + R_TRY(owner->CreateThreadLocalRegion(std::addressof(m_tls_address))); } - parent = owner; - parent->Open(); + m_parent = owner; + m_parent->Open(); } // Initialize thread context. - ResetThreadContext64(thread_context_64, user_stack_top, func, arg); - ResetThreadContext32(thread_context_32, static_cast(user_stack_top), + ResetThreadContext64(m_thread_context_64, user_stack_top, func, arg); + ResetThreadContext32(m_thread_context_32, static_cast(user_stack_top), static_cast(func), static_cast(arg)); // Setup the stack parameters. - StackParameters& sp = GetStackParameters(); + StackParameters& sp = this->GetStackParameters(); sp.cur_thread = this; sp.disable_count = 1; - SetInExceptionHandler(); + this->SetInExceptionHandler(); // Set thread ID. - thread_id = m_kernel.CreateNewThreadID(); + m_thread_id = m_kernel.CreateNewThreadID(); // We initialized! - initialized = true; + m_initialized = true; // Register ourselves with our parent process. - if (parent != nullptr) { - parent->RegisterThread(this); - if (parent->IsSuspended()) { + if (m_parent != nullptr) { + m_parent->RegisterThread(this); + if (m_parent->IsSuspended()) { RequestSuspend(SuspendType::Process); } } @@ -259,8 +255,7 @@ Result KThread::InitializeThread(KThread* thread, KThreadFunction func, uintptr_ R_TRY(thread->Initialize(func, arg, user_stack_top, prio, core, owner, type)); // Initialize emulation parameters. - thread->host_context = std::make_shared(std::move(init_func)); - thread->is_single_core = !Settings::values.use_multi_core.GetValue(); + thread->m_host_context = std::make_shared(std::move(init_func)); R_SUCCEED(); } @@ -270,7 +265,7 @@ Result KThread::InitializeDummyThread(KThread* thread, KProcess* owner) { R_TRY(thread->Initialize({}, {}, {}, DummyThreadPriority, 3, owner, ThreadType::Dummy)); // Initialize emulation parameters. - thread->stack_parameters.disable_count = 0; + thread->m_stack_parameters.disable_count = 0; R_SUCCEED(); } @@ -331,25 +326,25 @@ void KThread::PostDestroy(uintptr_t arg) { void KThread::Finalize() { // If the thread has an owner process, unregister it. - if (parent != nullptr) { - parent->UnregisterThread(this); + if (m_parent != nullptr) { + m_parent->UnregisterThread(this); } // If the thread has a local region, delete it. - if (tls_address != 0) { - ASSERT(parent->DeleteThreadLocalRegion(tls_address).IsSuccess()); + if (m_tls_address != 0) { + ASSERT(m_parent->DeleteThreadLocalRegion(m_tls_address).IsSuccess()); } // Release any waiters. { - ASSERT(waiting_lock_info == nullptr); + ASSERT(m_waiting_lock_info == nullptr); KScopedSchedulerLock sl{m_kernel}; // Check that we have no kernel waiters. - ASSERT(num_kernel_waiters == 0); + ASSERT(m_num_kernel_waiters == 0); - auto it = held_lock_info_list.begin(); - while (it != held_lock_info_list.end()) { + auto it = m_held_lock_info_list.begin(); + while (it != m_held_lock_info_list.end()) { // Get the lock info. auto* const lock_info = std::addressof(*it); @@ -371,7 +366,7 @@ void KThread::Finalize() { } // Remove the held lock from our list. - it = held_lock_info_list.erase(it); + it = m_held_lock_info_list.erase(it); // Free the lock info. LockWithPriorityInheritanceInfo::Free(m_kernel, lock_info); @@ -379,58 +374,58 @@ void KThread::Finalize() { } // Release host emulation members. - host_context.reset(); + m_host_context.reset(); // Perform inherited finalization. KSynchronizationObject::Finalize(); } bool KThread::IsSignaled() const { - return signaled; + return m_signaled; } void KThread::OnTimer() { - ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // If we're waiting, cancel the wait. - if (GetState() == ThreadState::Waiting) { - wait_queue->CancelWait(this, ResultTimedOut, false); + if (this->GetState() == ThreadState::Waiting) { + m_wait_queue->CancelWait(this, ResultTimedOut, false); } } void KThread::StartTermination() { - ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Release user exception and unpin, if relevant. - if (parent != nullptr) { - parent->ReleaseUserException(this); - if (parent->GetPinnedThread(GetCurrentCoreId(m_kernel)) == this) { - parent->UnpinCurrentThread(core_id); + if (m_parent != nullptr) { + m_parent->ReleaseUserException(this); + if (m_parent->GetPinnedThread(GetCurrentCoreId(m_kernel)) == this) { + m_parent->UnpinCurrentThread(m_core_id); } } // Set state to terminated. - SetState(ThreadState::Terminated); + this->SetState(ThreadState::Terminated); // Clear the thread's status as running in parent. - if (parent != nullptr) { - parent->ClearRunningThread(this); + if (m_parent != nullptr) { + m_parent->ClearRunningThread(this); } // Signal. - signaled = true; + m_signaled = true; KSynchronizationObject::NotifyAvailable(); // Clear previous thread in KScheduler. KScheduler::ClearPreviousThread(m_kernel, this); // Register terminated dpc flag. - RegisterDpc(DpcFlag::Terminated); + this->RegisterDpc(DpcFlag::Terminated); } void KThread::FinishTermination() { // Ensure that the thread is not executing on any core. - if (parent != nullptr) { + if (m_parent != nullptr) { for (std::size_t i = 0; i < static_cast(Core::Hardware::NUM_CPU_CORES); ++i) { KThread* core_thread{}; do { @@ -449,75 +444,76 @@ void KThread::DoWorkerTaskImpl() { } void KThread::Pin(s32 current_core) { - ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Set ourselves as pinned. GetStackParameters().is_pinned = true; // Disable core migration. - ASSERT(num_core_migration_disables == 0); + ASSERT(m_num_core_migration_disables == 0); { - ++num_core_migration_disables; + ++m_num_core_migration_disables; // Save our ideal state to restore when we're unpinned. - original_physical_ideal_core_id = physical_ideal_core_id; - original_physical_affinity_mask = physical_affinity_mask; + m_original_physical_ideal_core_id = m_physical_ideal_core_id; + m_original_physical_affinity_mask = m_physical_affinity_mask; // Bind ourselves to this core. - const s32 active_core = GetActiveCore(); + const s32 active_core = this->GetActiveCore(); - SetActiveCore(current_core); - physical_ideal_core_id = current_core; - physical_affinity_mask.SetAffinityMask(1ULL << current_core); + this->SetActiveCore(current_core); + m_physical_ideal_core_id = current_core; + m_physical_affinity_mask.SetAffinityMask(1ULL << current_core); - if (active_core != current_core || physical_affinity_mask.GetAffinityMask() != - original_physical_affinity_mask.GetAffinityMask()) { - KScheduler::OnThreadAffinityMaskChanged(m_kernel, this, original_physical_affinity_mask, - active_core); + if (active_core != current_core || + m_physical_affinity_mask.GetAffinityMask() != + m_original_physical_affinity_mask.GetAffinityMask()) { + KScheduler::OnThreadAffinityMaskChanged(m_kernel, this, + m_original_physical_affinity_mask, active_core); } } // Disallow performing thread suspension. { // Update our allow flags. - suspend_allowed_flags &= ~(1 << (static_cast(SuspendType::Thread) + - static_cast(ThreadState::SuspendShift))); + m_suspend_allowed_flags &= ~(1 << (static_cast(SuspendType::Thread) + + static_cast(ThreadState::SuspendShift))); // Update our state. - UpdateState(); + this->UpdateState(); } // TODO(bunnei): Update our SVC access permissions. - ASSERT(parent != nullptr); + ASSERT(m_parent != nullptr); } void KThread::Unpin() { - ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Set ourselves as unpinned. - GetStackParameters().is_pinned = false; + this->GetStackParameters().is_pinned = false; // Enable core migration. - ASSERT(num_core_migration_disables == 1); + ASSERT(m_num_core_migration_disables == 1); { - num_core_migration_disables--; + m_num_core_migration_disables--; // Restore our original state. - const KAffinityMask old_mask = physical_affinity_mask; + const KAffinityMask old_mask = m_physical_affinity_mask; - physical_ideal_core_id = original_physical_ideal_core_id; - physical_affinity_mask = original_physical_affinity_mask; + m_physical_ideal_core_id = m_original_physical_ideal_core_id; + m_physical_affinity_mask = m_original_physical_affinity_mask; - if (physical_affinity_mask.GetAffinityMask() != old_mask.GetAffinityMask()) { - const s32 active_core = GetActiveCore(); + if (m_physical_affinity_mask.GetAffinityMask() != old_mask.GetAffinityMask()) { + const s32 active_core = this->GetActiveCore(); - if (!physical_affinity_mask.GetAffinity(active_core)) { - if (physical_ideal_core_id >= 0) { - SetActiveCore(physical_ideal_core_id); + if (!m_physical_affinity_mask.GetAffinity(active_core)) { + if (m_physical_ideal_core_id >= 0) { + this->SetActiveCore(m_physical_ideal_core_id); } else { - SetActiveCore(static_cast( + this->SetActiveCore(static_cast( Common::BitSize() - 1 - - std::countl_zero(physical_affinity_mask.GetAffinityMask()))); + std::countl_zero(m_physical_affinity_mask.GetAffinityMask()))); } } KScheduler::OnThreadAffinityMaskChanged(m_kernel, this, old_mask, active_core); @@ -525,106 +521,106 @@ void KThread::Unpin() { } // Allow performing thread suspension (if termination hasn't been requested). - if (!IsTerminationRequested()) { + if (!this->IsTerminationRequested()) { // Update our allow flags. - suspend_allowed_flags |= (1 << (static_cast(SuspendType::Thread) + - static_cast(ThreadState::SuspendShift))); + m_suspend_allowed_flags |= (1 << (static_cast(SuspendType::Thread) + + static_cast(ThreadState::SuspendShift))); // Update our state. - UpdateState(); + this->UpdateState(); } // TODO(bunnei): Update our SVC access permissions. - ASSERT(parent != nullptr); + ASSERT(m_parent != nullptr); // Resume any threads that began waiting on us while we were pinned. - for (auto it = pinned_waiter_list.begin(); it != pinned_waiter_list.end(); ++it) { + for (auto it = m_pinned_waiter_list.begin(); it != m_pinned_waiter_list.end(); ++it) { it->EndWait(ResultSuccess); } } u16 KThread::GetUserDisableCount() const { - if (!IsUserThread()) { + if (!this->IsUserThread()) { // We only emulate TLS for user threads return {}; } auto& memory = m_kernel.System().Memory(); - return memory.Read16(tls_address + offsetof(ThreadLocalRegion, disable_count)); + return memory.Read16(m_tls_address + offsetof(ThreadLocalRegion, disable_count)); } void KThread::SetInterruptFlag() { - if (!IsUserThread()) { + if (!this->IsUserThread()) { // We only emulate TLS for user threads return; } auto& memory = m_kernel.System().Memory(); - memory.Write16(tls_address + offsetof(ThreadLocalRegion, interrupt_flag), 1); + memory.Write16(m_tls_address + offsetof(ThreadLocalRegion, interrupt_flag), 1); } void KThread::ClearInterruptFlag() { - if (!IsUserThread()) { + if (!this->IsUserThread()) { // We only emulate TLS for user threads return; } auto& memory = m_kernel.System().Memory(); - memory.Write16(tls_address + offsetof(ThreadLocalRegion, interrupt_flag), 0); + memory.Write16(m_tls_address + offsetof(ThreadLocalRegion, interrupt_flag), 0); } Result KThread::GetCoreMask(s32* out_ideal_core, u64* out_affinity_mask) { KScopedSchedulerLock sl{m_kernel}; // Get the virtual mask. - *out_ideal_core = virtual_ideal_core_id; - *out_affinity_mask = virtual_affinity_mask; + *out_ideal_core = m_virtual_ideal_core_id; + *out_affinity_mask = m_virtual_affinity_mask; R_SUCCEED(); } Result KThread::GetPhysicalCoreMask(s32* out_ideal_core, u64* out_affinity_mask) { KScopedSchedulerLock sl{m_kernel}; - ASSERT(num_core_migration_disables >= 0); + ASSERT(m_num_core_migration_disables >= 0); // Select between core mask and original core mask. - if (num_core_migration_disables == 0) { - *out_ideal_core = physical_ideal_core_id; - *out_affinity_mask = physical_affinity_mask.GetAffinityMask(); + if (m_num_core_migration_disables == 0) { + *out_ideal_core = m_physical_ideal_core_id; + *out_affinity_mask = m_physical_affinity_mask.GetAffinityMask(); } else { - *out_ideal_core = original_physical_ideal_core_id; - *out_affinity_mask = original_physical_affinity_mask.GetAffinityMask(); + *out_ideal_core = m_original_physical_ideal_core_id; + *out_affinity_mask = m_original_physical_affinity_mask.GetAffinityMask(); } R_SUCCEED(); } -Result KThread::SetCoreMask(s32 core_id_, u64 v_affinity_mask) { - ASSERT(parent != nullptr); +Result KThread::SetCoreMask(s32 core_id, u64 v_affinity_mask) { + ASSERT(m_parent != nullptr); ASSERT(v_affinity_mask != 0); - KScopedLightLock lk(activity_pause_lock); + KScopedLightLock lk(m_activity_pause_lock); // Set the core mask. u64 p_affinity_mask = 0; { KScopedSchedulerLock sl(m_kernel); - ASSERT(num_core_migration_disables >= 0); + ASSERT(m_num_core_migration_disables >= 0); // If we're updating, set our ideal virtual core. - if (core_id_ != Svc::IdealCoreNoUpdate) { - virtual_ideal_core_id = core_id_; + if (core_id != Svc::IdealCoreNoUpdate) { + m_virtual_ideal_core_id = core_id; } else { // Preserve our ideal core id. - core_id_ = virtual_ideal_core_id; - R_UNLESS(((1ULL << core_id_) & v_affinity_mask) != 0, ResultInvalidCombination); + core_id = m_virtual_ideal_core_id; + R_UNLESS(((1ULL << core_id) & v_affinity_mask) != 0, ResultInvalidCombination); } // Set our affinity mask. - virtual_affinity_mask = v_affinity_mask; + m_virtual_affinity_mask = v_affinity_mask; // Translate the virtual core to a physical core. - if (core_id_ >= 0) { - core_id_ = Core::Hardware::VirtualToPhysicalCoreMap[core_id_]; + if (core_id >= 0) { + core_id = Core::Hardware::VirtualToPhysicalCoreMap[core_id]; } // Translate the virtual affinity mask to a physical one. @@ -635,35 +631,35 @@ Result KThread::SetCoreMask(s32 core_id_, u64 v_affinity_mask) { } // If we haven't disabled migration, perform an affinity change. - if (num_core_migration_disables == 0) { - const KAffinityMask old_mask = physical_affinity_mask; + if (m_num_core_migration_disables == 0) { + const KAffinityMask old_mask = m_physical_affinity_mask; // Set our new ideals. - physical_ideal_core_id = core_id_; - physical_affinity_mask.SetAffinityMask(p_affinity_mask); + m_physical_ideal_core_id = core_id; + m_physical_affinity_mask.SetAffinityMask(p_affinity_mask); - if (physical_affinity_mask.GetAffinityMask() != old_mask.GetAffinityMask()) { + if (m_physical_affinity_mask.GetAffinityMask() != old_mask.GetAffinityMask()) { const s32 active_core = GetActiveCore(); - if (active_core >= 0 && !physical_affinity_mask.GetAffinity(active_core)) { + if (active_core >= 0 && !m_physical_affinity_mask.GetAffinity(active_core)) { const s32 new_core = static_cast( - physical_ideal_core_id >= 0 - ? physical_ideal_core_id + m_physical_ideal_core_id >= 0 + ? m_physical_ideal_core_id : Common::BitSize() - 1 - - std::countl_zero(physical_affinity_mask.GetAffinityMask())); + std::countl_zero(m_physical_affinity_mask.GetAffinityMask())); SetActiveCore(new_core); } KScheduler::OnThreadAffinityMaskChanged(m_kernel, this, old_mask, active_core); } } else { // Otherwise, we edit the original affinity for restoration later. - original_physical_ideal_core_id = core_id_; - original_physical_affinity_mask.SetAffinityMask(p_affinity_mask); + m_original_physical_ideal_core_id = core_id; + m_original_physical_affinity_mask.SetAffinityMask(p_affinity_mask); } } // Update the pinned waiter list. - ThreadQueueImplForKThreadSetProperty wait_queue_(m_kernel, std::addressof(pinned_waiter_list)); + ThreadQueueImplForKThreadSetProperty wait_queue(m_kernel, std::addressof(m_pinned_waiter_list)); { bool retry_update{}; do { @@ -671,7 +667,7 @@ Result KThread::SetCoreMask(s32 core_id_, u64 v_affinity_mask) { KScopedSchedulerLock sl(m_kernel); // Don't do any further management if our termination has been requested. - R_SUCCEED_IF(IsTerminationRequested()); + R_SUCCEED_IF(this->IsTerminationRequested()); // By default, we won't need to retry. retry_update = false; @@ -691,14 +687,14 @@ Result KThread::SetCoreMask(s32 core_id_, u64 v_affinity_mask) { // new mask. if (thread_is_current && ((1ULL << thread_core) & p_affinity_mask) == 0) { // If the thread is pinned, we want to wait until it's not pinned. - if (GetStackParameters().is_pinned) { + if (this->GetStackParameters().is_pinned) { // Verify that the current thread isn't terminating. R_UNLESS(!GetCurrentThread(m_kernel).IsTerminationRequested(), ResultTerminationRequested); // Wait until the thread isn't pinned any more. - pinned_waiter_list.push_back(GetCurrentThread(m_kernel)); - GetCurrentThread(m_kernel).BeginWait(std::addressof(wait_queue_)); + m_pinned_waiter_list.push_back(GetCurrentThread(m_kernel)); + GetCurrentThread(m_kernel).BeginWait(std::addressof(wait_queue)); } else { // If the thread isn't pinned, release the scheduler lock and retry until it's // not current. @@ -717,24 +713,24 @@ void KThread::SetBasePriority(s32 value) { KScopedSchedulerLock sl{m_kernel}; // Change our base priority. - base_priority = value; + m_base_priority = value; // Perform a priority restoration. RestorePriority(m_kernel, this); } KThread* KThread::GetLockOwner() const { - return waiting_lock_info != nullptr ? waiting_lock_info->GetOwner() : nullptr; + return m_waiting_lock_info != nullptr ? m_waiting_lock_info->GetOwner() : nullptr; } -void KThread::IncreaseBasePriority(s32 priority_) { - ASSERT(Svc::HighestThreadPriority <= priority_ && priority_ <= Svc::LowestThreadPriority); +void KThread::IncreaseBasePriority(s32 priority) { + ASSERT(Svc::HighestThreadPriority <= priority && priority <= Svc::LowestThreadPriority); ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); ASSERT(!this->GetStackParameters().is_pinned); // Set our base priority. - if (base_priority > priority_) { - base_priority = priority_; + if (m_base_priority > priority) { + m_base_priority = priority; // Perform a priority restoration. RestorePriority(m_kernel, this); @@ -745,19 +741,19 @@ void KThread::RequestSuspend(SuspendType type) { KScopedSchedulerLock sl{m_kernel}; // Note the request in our flags. - suspend_request_flags |= - (1u << (static_cast(ThreadState::SuspendShift) + static_cast(type))); + m_suspend_request_flags |= + (1U << (static_cast(ThreadState::SuspendShift) + static_cast(type))); // Try to perform the suspend. - TrySuspend(); + this->TrySuspend(); } void KThread::Resume(SuspendType type) { KScopedSchedulerLock sl{m_kernel}; // Clear the request in our flags. - suspend_request_flags &= - ~(1u << (static_cast(ThreadState::SuspendShift) + static_cast(type))); + m_suspend_request_flags &= + ~(1U << (static_cast(ThreadState::SuspendShift) + static_cast(type))); // Update our state. this->UpdateState(); @@ -767,17 +763,17 @@ void KThread::WaitCancel() { KScopedSchedulerLock sl{m_kernel}; // Check if we're waiting and cancellable. - if (this->GetState() == ThreadState::Waiting && cancellable) { - wait_cancelled = false; - wait_queue->CancelWait(this, ResultCancelled, true); + if (this->GetState() == ThreadState::Waiting && m_cancellable) { + m_wait_cancelled = false; + m_wait_queue->CancelWait(this, ResultCancelled, true); } else { // Otherwise, note that we cancelled a wait. - wait_cancelled = true; + m_wait_cancelled = true; } } void KThread::TrySuspend() { - ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); ASSERT(IsSuspendRequested()); // Ensure that we have no waiters. @@ -791,13 +787,13 @@ void KThread::TrySuspend() { } void KThread::UpdateState() { - ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Set our suspend flags in state. - const ThreadState old_state = thread_state.load(std::memory_order_relaxed); + const ThreadState old_state = m_thread_state.load(std::memory_order_relaxed); const auto new_state = static_cast(this->GetSuspendFlags()) | (old_state & ThreadState::Mask); - thread_state.store(new_state, std::memory_order_relaxed); + m_thread_state.store(new_state, std::memory_order_relaxed); // Note the state change in scheduler. if (new_state != old_state) { @@ -806,11 +802,11 @@ void KThread::UpdateState() { } void KThread::Continue() { - ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Clear our suspend flags in state. - const ThreadState old_state = thread_state.load(std::memory_order_relaxed); - thread_state.store(old_state & ThreadState::Mask, std::memory_order_relaxed); + const ThreadState old_state = m_thread_state.load(std::memory_order_relaxed); + m_thread_state.store(old_state & ThreadState::Mask, std::memory_order_relaxed); // Note the state change in scheduler. KScheduler::OnThreadStateChanged(m_kernel, this, old_state); @@ -839,7 +835,7 @@ void KThread::CloneFpuStatus() { Result KThread::SetActivity(Svc::ThreadActivity activity) { // Lock ourselves. - KScopedLightLock lk(activity_pause_lock); + KScopedLightLock lk(m_activity_pause_lock); // Set the activity. { @@ -871,10 +867,10 @@ Result KThread::SetActivity(Svc::ThreadActivity activity) { // If the thread is now paused, update the pinned waiter list. if (activity == Svc::ThreadActivity::Paused) { - ThreadQueueImplForKThreadSetProperty wait_queue_(m_kernel, - std::addressof(pinned_waiter_list)); + ThreadQueueImplForKThreadSetProperty wait_queue(m_kernel, + std::addressof(m_pinned_waiter_list)); - bool thread_is_current; + bool thread_is_current{}; do { // Lock the scheduler. KScopedSchedulerLock sl(m_kernel); @@ -892,8 +888,8 @@ Result KThread::SetActivity(Svc::ThreadActivity activity) { ResultTerminationRequested); // Wait until the thread isn't pinned any more. - pinned_waiter_list.push_back(GetCurrentThread(m_kernel)); - GetCurrentThread(m_kernel).BeginWait(std::addressof(wait_queue_)); + m_pinned_waiter_list.push_back(GetCurrentThread(m_kernel)); + GetCurrentThread(m_kernel).BeginWait(std::addressof(wait_queue)); } else { // Check if the thread is currently running. // If it is, we'll need to retry. @@ -912,7 +908,7 @@ Result KThread::SetActivity(Svc::ThreadActivity activity) { Result KThread::GetThreadContext3(std::vector& out) { // Lock ourselves. - KScopedLightLock lk{activity_pause_lock}; + KScopedLightLock lk{m_activity_pause_lock}; // Get the context. { @@ -923,8 +919,8 @@ Result KThread::GetThreadContext3(std::vector& out) { R_UNLESS(IsSuspendRequested(SuspendType::Thread), ResultInvalidState); // If we're not terminating, get the thread's user context. - if (!IsTerminationRequested()) { - if (parent->Is64BitProcess()) { + if (!this->IsTerminationRequested()) { + if (m_parent->Is64BitProcess()) { // Mask away mode bits, interrupt bits, IL bit, and other reserved bits. auto context = GetContext64(); context.pstate &= 0xFF0FFE20; @@ -952,7 +948,7 @@ void KThread::AddHeldLock(LockWithPriorityInheritanceInfo* lock_info) { lock_info->SetOwner(this); // Add the lock to our held list. - held_lock_info_list.push_front(*lock_info); + m_held_lock_info_list.push_front(*lock_info); } KThread::LockWithPriorityInheritanceInfo* KThread::FindHeldLock(VAddr address_key_, @@ -960,7 +956,7 @@ KThread::LockWithPriorityInheritanceInfo* KThread::FindHeldLock(VAddr address_ke ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Try to find an existing held lock. - for (auto& held_lock : held_lock_info_list) { + for (auto& held_lock : m_held_lock_info_list) { if (held_lock.GetAddressKey() == address_key_ && held_lock.GetIsKernelAddressKey() == is_kernel_address_key_) { return std::addressof(held_lock); @@ -975,21 +971,21 @@ void KThread::AddWaiterImpl(KThread* thread) { ASSERT(thread->GetConditionVariableTree() == nullptr); // Get the thread's address key. - const auto address_key_ = thread->GetAddressKey(); - const auto is_kernel_address_key_ = thread->GetIsKernelAddressKey(); + const auto address_key = thread->GetAddressKey(); + const auto is_kernel_address_key = thread->GetIsKernelAddressKey(); // Keep track of how many kernel waiters we have. - if (is_kernel_address_key_) { - ASSERT((num_kernel_waiters++) >= 0); + if (is_kernel_address_key) { + ASSERT((m_num_kernel_waiters++) >= 0); KScheduler::SetSchedulerUpdateNeeded(m_kernel); } // Get the relevant lock info. - auto* lock_info = this->FindHeldLock(address_key_, is_kernel_address_key_); + auto* lock_info = this->FindHeldLock(address_key, is_kernel_address_key); if (lock_info == nullptr) { // Create a new lock for the address key. lock_info = - LockWithPriorityInheritanceInfo::Create(m_kernel, address_key_, is_kernel_address_key_); + LockWithPriorityInheritanceInfo::Create(m_kernel, address_key, is_kernel_address_key); // Add the new lock to our list. this->AddHeldLock(lock_info); @@ -1004,7 +1000,7 @@ void KThread::RemoveWaiterImpl(KThread* thread) { // Keep track of how many kernel waiters we have. if (thread->GetIsKernelAddressKey()) { - ASSERT((num_kernel_waiters--) > 0); + ASSERT((m_num_kernel_waiters--) > 0); KScheduler::SetSchedulerUpdateNeeded(m_kernel); } @@ -1014,7 +1010,7 @@ void KThread::RemoveWaiterImpl(KThread* thread) { // Remove the waiter. if (lock_info->RemoveWaiter(thread)) { - held_lock_info_list.erase(held_lock_info_list.iterator_to(*lock_info)); + m_held_lock_info_list.erase(m_held_lock_info_list.iterator_to(*lock_info)); LockWithPriorityInheritanceInfo::Free(m_kernel, lock_info); } } @@ -1025,7 +1021,7 @@ void KThread::RestorePriority(KernelCore& kernel, KThread* thread) { while (thread != nullptr) { // We want to inherit priority where possible. s32 new_priority = thread->GetBasePriority(); - for (const auto& held_lock : thread->held_lock_info_list) { + for (const auto& held_lock : thread->m_held_lock_info_list) { new_priority = std::min(new_priority, held_lock.GetHighestPriorityWaiter()->GetPriority()); } @@ -1102,12 +1098,12 @@ KThread* KThread::RemoveWaiterByKey(bool* out_has_waiters, VAddr key, bool is_ke } // Remove the lock info from our held list. - held_lock_info_list.erase(held_lock_info_list.iterator_to(*lock_info)); + m_held_lock_info_list.erase(m_held_lock_info_list.iterator_to(*lock_info)); // Keep track of how many kernel waiters we have. if (lock_info->GetIsKernelAddressKey()) { - num_kernel_waiters -= lock_info->GetWaiterCount(); - ASSERT(num_kernel_waiters >= 0); + m_num_kernel_waiters -= lock_info->GetWaiterCount(); + ASSERT(m_num_kernel_waiters >= 0); KScheduler::SetSchedulerUpdateNeeded(m_kernel); } @@ -1130,8 +1126,8 @@ KThread* KThread::RemoveWaiterByKey(bool* out_has_waiters, VAddr key, bool is_ke // Keep track of any kernel waiters for the new owner. if (lock_info->GetIsKernelAddressKey()) { - next_lock_owner->num_kernel_waiters += lock_info->GetWaiterCount(); - ASSERT(next_lock_owner->num_kernel_waiters > 0); + next_lock_owner->m_num_kernel_waiters += lock_info->GetWaiterCount(); + ASSERT(next_lock_owner->m_num_kernel_waiters > 0); // NOTE: No need to set scheduler update needed, because we will have already done so // when removing earlier. @@ -1156,11 +1152,11 @@ Result KThread::Run() { KScopedSchedulerLock lk{m_kernel}; // If either this thread or the current thread are requesting termination, note it. - R_UNLESS(!IsTerminationRequested(), ResultTerminationRequested); + R_UNLESS(!this->IsTerminationRequested(), ResultTerminationRequested); R_UNLESS(!GetCurrentThread(m_kernel).IsTerminationRequested(), ResultTerminationRequested); // Ensure our thread state is correct. - R_UNLESS(GetState() == ThreadState::Initialized, ResultInvalidState); + R_UNLESS(this->GetState() == ThreadState::Initialized, ResultInvalidState); // If the current thread has been asked to suspend, suspend it and retry. if (GetCurrentThread(m_kernel).IsSuspended()) { @@ -1177,7 +1173,7 @@ Result KThread::Run() { } // Set our state and finish. - SetState(ThreadState::Runnable); + this->SetState(ThreadState::Runnable); R_SUCCEED(); } @@ -1187,10 +1183,10 @@ void KThread::Exit() { ASSERT(this == GetCurrentThreadPointer(m_kernel)); // Release the thread resource hint, running thread count from parent. - if (parent != nullptr) { - parent->GetResourceLimit()->Release(Kernel::LimitableResource::ThreadCountMax, 0, 1); - resource_limit_release_hint = true; - parent->DecrementRunningThreadCount(); + if (m_parent != nullptr) { + m_parent->GetResourceLimit()->Release(Kernel::LimitableResource::ThreadCountMax, 0, 1); + m_resource_limit_release_hint = true; + m_parent->DecrementRunningThreadCount(); } // Perform termination. @@ -1198,11 +1194,11 @@ void KThread::Exit() { KScopedSchedulerLock sl{m_kernel}; // Disallow all suspension. - suspend_allowed_flags = 0; + m_suspend_allowed_flags = 0; this->UpdateState(); // Disallow all suspension. - suspend_allowed_flags = 0; + m_suspend_allowed_flags = 0; // Start termination. StartTermination(); @@ -1238,14 +1234,14 @@ ThreadState KThread::RequestTerminate() { const bool first_request = [&]() -> bool { // Perform an atomic compare-and-swap from false to true. bool expected = false; - return termination_requested.compare_exchange_strong(expected, true); + return m_termination_requested.compare_exchange_strong(expected, true); }(); // If this is the first request, start termination procedure. if (first_request) { // If the thread is in initialized state, just change state to terminated. if (this->GetState() == ThreadState::Initialized) { - thread_state = ThreadState::Terminated; + m_thread_state = ThreadState::Terminated; return ThreadState::Terminated; } @@ -1259,7 +1255,7 @@ ThreadState KThread::RequestTerminate() { // If the thread is suspended, continue it. if (this->IsSuspended()) { - suspend_allowed_flags = 0; + m_suspend_allowed_flags = 0; this->UpdateState(); } @@ -1268,7 +1264,7 @@ ThreadState KThread::RequestTerminate() { // If the thread is runnable, send a termination interrupt to other cores. if (this->GetState() == ThreadState::Runnable) { - if (const u64 core_mask = physical_affinity_mask.GetAffinityMask() & + if (const u64 core_mask = m_physical_affinity_mask.GetAffinityMask() & ~(1ULL << GetCurrentCoreId(m_kernel)); core_mask != 0) { Kernel::KInterruptManager::SendInterProcessorInterrupt(m_kernel, core_mask); @@ -1277,7 +1273,7 @@ ThreadState KThread::RequestTerminate() { // Wake up the thread. if (this->GetState() == ThreadState::Waiting) { - wait_queue->CancelWait(this, ResultTerminationRequested, true); + m_wait_queue->CancelWait(this, ResultTerminationRequested, true); } } @@ -1285,7 +1281,7 @@ ThreadState KThread::RequestTerminate() { } Result KThread::Sleep(s64 timeout) { - ASSERT(!m_kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(!KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); ASSERT(this == GetCurrentThreadPointer(m_kernel)); ASSERT(timeout > 0); @@ -1315,7 +1311,7 @@ void KThread::RequestDummyThreadWait() { ASSERT(this->IsDummyThread()); // We will block when the scheduler lock is released. - dummy_thread_runnable.store(false); + m_dummy_thread_runnable.store(false); } void KThread::DummyThreadBeginWait() { @@ -1325,7 +1321,7 @@ void KThread::DummyThreadBeginWait() { } // Block until runnable is no longer false. - dummy_thread_runnable.wait(false); + m_dummy_thread_runnable.wait(false); } void KThread::DummyThreadEndWait() { @@ -1333,8 +1329,8 @@ void KThread::DummyThreadEndWait() { ASSERT(this->IsDummyThread()); // Wake up the waiting thread. - dummy_thread_runnable.store(true); - dummy_thread_runnable.notify_one(); + m_dummy_thread_runnable.store(true); + m_dummy_thread_runnable.notify_one(); } void KThread::BeginWait(KThreadQueue* queue) { @@ -1342,42 +1338,42 @@ void KThread::BeginWait(KThreadQueue* queue) { SetState(ThreadState::Waiting); // Set our wait queue. - wait_queue = queue; + m_wait_queue = queue; } -void KThread::NotifyAvailable(KSynchronizationObject* signaled_object, Result wait_result_) { +void KThread::NotifyAvailable(KSynchronizationObject* signaled_object, Result wait_result) { // Lock the scheduler. KScopedSchedulerLock sl(m_kernel); // If we're waiting, notify our queue that we're available. - if (GetState() == ThreadState::Waiting) { - wait_queue->NotifyAvailable(this, signaled_object, wait_result_); + if (this->GetState() == ThreadState::Waiting) { + m_wait_queue->NotifyAvailable(this, signaled_object, wait_result); } } -void KThread::EndWait(Result wait_result_) { +void KThread::EndWait(Result wait_result) { // Lock the scheduler. KScopedSchedulerLock sl(m_kernel); // If we're waiting, notify our queue that we're available. - if (GetState() == ThreadState::Waiting) { - if (wait_queue == nullptr) { + if (this->GetState() == ThreadState::Waiting) { + if (m_wait_queue == nullptr) { // This should never happen, but avoid a hard crash below to get this logged. ASSERT_MSG(false, "wait_queue is nullptr!"); return; } - wait_queue->EndWait(this, wait_result_); + m_wait_queue->EndWait(this, wait_result); } } -void KThread::CancelWait(Result wait_result_, bool cancel_timer_task) { +void KThread::CancelWait(Result wait_result, bool cancel_timer_task) { // Lock the scheduler. KScopedSchedulerLock sl(m_kernel); // If we're waiting, notify our queue that we're available. - if (GetState() == ThreadState::Waiting) { - wait_queue->CancelWait(this, wait_result_, cancel_timer_task); + if (this->GetState() == ThreadState::Waiting) { + m_wait_queue->CancelWait(this, wait_result, cancel_timer_task); } } @@ -1385,20 +1381,19 @@ void KThread::SetState(ThreadState state) { KScopedSchedulerLock sl{m_kernel}; // Clear debugging state - SetMutexWaitAddressForDebugging({}); SetWaitReasonForDebugging({}); - const ThreadState old_state = thread_state.load(std::memory_order_relaxed); - thread_state.store( + const ThreadState old_state = m_thread_state.load(std::memory_order_relaxed); + m_thread_state.store( static_cast((old_state & ~ThreadState::Mask) | (state & ThreadState::Mask)), std::memory_order_relaxed); - if (thread_state.load(std::memory_order_relaxed) != old_state) { + if (m_thread_state.load(std::memory_order_relaxed) != old_state) { KScheduler::OnThreadStateChanged(m_kernel, this, old_state); } } std::shared_ptr& KThread::GetHostContext() { - return host_context; + return m_host_context; } void SetCurrentThread(KernelCore& kernel, KThread* thread) { diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h index e541ea079..53fa64369 100644 --- a/src/core/hle/kernel/k_thread.h +++ b/src/core/hle/kernel/k_thread.h @@ -108,11 +108,11 @@ enum class StepState : u32 { }; void SetCurrentThread(KernelCore& kernel, KThread* thread); -[[nodiscard]] KThread* GetCurrentThreadPointer(KernelCore& kernel); -[[nodiscard]] KThread& GetCurrentThread(KernelCore& kernel); -[[nodiscard]] KProcess* GetCurrentProcessPointer(KernelCore& kernel); -[[nodiscard]] KProcess& GetCurrentProcess(KernelCore& kernel); -[[nodiscard]] s32 GetCurrentCoreId(KernelCore& kernel); +KThread* GetCurrentThreadPointer(KernelCore& kernel); +KThread& GetCurrentThread(KernelCore& kernel); +KProcess* GetCurrentProcessPointer(KernelCore& kernel); +KProcess& GetCurrentProcess(KernelCore& kernel); +s32 GetCurrentCoreId(KernelCore& kernel); class KThread final : public KAutoObjectWithSlabHeapAndContainer, public boost::intrusive::list_base_hook<>, @@ -136,16 +136,12 @@ public: using ThreadContext64 = Core::ARM_Interface::ThreadContext64; using WaiterList = boost::intrusive::list; - void SetName(std::string new_name) { - name = std::move(new_name); - } - /** * Gets the thread's current priority * @return The current thread's priority */ - [[nodiscard]] s32 GetPriority() const { - return priority; + s32 GetPriority() const { + return m_priority; } /** @@ -153,23 +149,23 @@ public: * @param priority The new priority. */ void SetPriority(s32 value) { - priority = value; + m_priority = value; } /** * Gets the thread's nominal priority. * @return The current thread's nominal priority. */ - [[nodiscard]] s32 GetBasePriority() const { - return base_priority; + s32 GetBasePriority() const { + return m_base_priority; } /** * Gets the thread's thread ID * @return The thread's ID */ - [[nodiscard]] u64 GetThreadID() const { - return thread_id; + u64 GetThreadId() const { + return m_thread_id; } void ContinueIfHasKernelWaiters() { @@ -180,7 +176,7 @@ public: void SetBasePriority(s32 value); - [[nodiscard]] Result Run(); + Result Run(); void Exit(); @@ -188,22 +184,22 @@ public: ThreadState RequestTerminate(); - [[nodiscard]] u32 GetSuspendFlags() const { - return suspend_allowed_flags & suspend_request_flags; + u32 GetSuspendFlags() const { + return m_suspend_allowed_flags & m_suspend_request_flags; } - [[nodiscard]] bool IsSuspended() const { + bool IsSuspended() const { return GetSuspendFlags() != 0; } - [[nodiscard]] bool IsSuspendRequested(SuspendType type) const { - return (suspend_request_flags & - (1u << (static_cast(ThreadState::SuspendShift) + static_cast(type)))) != + bool IsSuspendRequested(SuspendType type) const { + return (m_suspend_request_flags & + (1U << (static_cast(ThreadState::SuspendShift) + static_cast(type)))) != 0; } - [[nodiscard]] bool IsSuspendRequested() const { - return suspend_request_flags != 0; + bool IsSuspendRequested() const { + return m_suspend_request_flags != 0; } void RequestSuspend(SuspendType type); @@ -217,124 +213,124 @@ public: void Continue(); constexpr void SetSyncedIndex(s32 index) { - synced_index = index; + m_synced_index = index; } - [[nodiscard]] constexpr s32 GetSyncedIndex() const { - return synced_index; + constexpr s32 GetSyncedIndex() const { + return m_synced_index; } constexpr void SetWaitResult(Result wait_res) { - wait_result = wait_res; + m_wait_result = wait_res; } - [[nodiscard]] constexpr Result GetWaitResult() const { - return wait_result; + constexpr Result GetWaitResult() const { + return m_wait_result; } /* * Returns the Thread Local Storage address of the current thread * @returns VAddr of the thread's TLS */ - [[nodiscard]] VAddr GetTLSAddress() const { - return tls_address; + VAddr GetTlsAddress() const { + return m_tls_address; } /* * Returns the value of the TPIDR_EL0 Read/Write system register for this thread. * @returns The value of the TPIDR_EL0 register. */ - [[nodiscard]] u64 GetTPIDR_EL0() const { - return thread_context_64.tpidr; + u64 GetTpidrEl0() const { + return m_thread_context_64.tpidr; } /// Sets the value of the TPIDR_EL0 Read/Write system register for this thread. - void SetTPIDR_EL0(u64 value) { - thread_context_64.tpidr = value; - thread_context_32.tpidr = static_cast(value); + void SetTpidrEl0(u64 value) { + m_thread_context_64.tpidr = value; + m_thread_context_32.tpidr = static_cast(value); } void CloneFpuStatus(); - [[nodiscard]] ThreadContext32& GetContext32() { - return thread_context_32; + ThreadContext32& GetContext32() { + return m_thread_context_32; } - [[nodiscard]] const ThreadContext32& GetContext32() const { - return thread_context_32; + const ThreadContext32& GetContext32() const { + return m_thread_context_32; } - [[nodiscard]] ThreadContext64& GetContext64() { - return thread_context_64; + ThreadContext64& GetContext64() { + return m_thread_context_64; } - [[nodiscard]] const ThreadContext64& GetContext64() const { - return thread_context_64; + const ThreadContext64& GetContext64() const { + return m_thread_context_64; } - [[nodiscard]] std::shared_ptr& GetHostContext(); + std::shared_ptr& GetHostContext(); - [[nodiscard]] ThreadState GetState() const { - return thread_state.load(std::memory_order_relaxed) & ThreadState::Mask; + ThreadState GetState() const { + return m_thread_state.load(std::memory_order_relaxed) & ThreadState::Mask; } - [[nodiscard]] ThreadState GetRawState() const { - return thread_state.load(std::memory_order_relaxed); + ThreadState GetRawState() const { + return m_thread_state.load(std::memory_order_relaxed); } void SetState(ThreadState state); - [[nodiscard]] StepState GetStepState() const { - return step_state; + StepState GetStepState() const { + return m_step_state; } void SetStepState(StepState state) { - step_state = state; + m_step_state = state; } - [[nodiscard]] s64 GetLastScheduledTick() const { - return last_scheduled_tick; + s64 GetLastScheduledTick() const { + return m_last_scheduled_tick; } void SetLastScheduledTick(s64 tick) { - last_scheduled_tick = tick; + m_last_scheduled_tick = tick; } - void AddCpuTime([[maybe_unused]] s32 core_id_, s64 amount) { - cpu_time += amount; + void AddCpuTime(s32 core_id, s64 amount) { + m_cpu_time += amount; // TODO(bunnei): Debug kernels track per-core tick counts. Should we? } - [[nodiscard]] s64 GetCpuTime() const { - return cpu_time; + s64 GetCpuTime() const { + return m_cpu_time; } - [[nodiscard]] s32 GetActiveCore() const { - return core_id; + s32 GetActiveCore() const { + return m_core_id; } void SetActiveCore(s32 core) { - core_id = core; + m_core_id = core; } - [[nodiscard]] s32 GetCurrentCore() const { - return current_core_id; + s32 GetCurrentCore() const { + return m_current_core_id; } void SetCurrentCore(s32 core) { - current_core_id = core; + m_current_core_id = core; } - [[nodiscard]] KProcess* GetOwnerProcess() { - return parent; + KProcess* GetOwnerProcess() { + return m_parent; } - [[nodiscard]] const KProcess* GetOwnerProcess() const { - return parent; + const KProcess* GetOwnerProcess() const { + return m_parent; } - [[nodiscard]] bool IsUserThread() const { - return parent != nullptr; + bool IsUserThread() const { + return m_parent != nullptr; } u16 GetUserDisableCount() const; @@ -343,69 +339,69 @@ public: KThread* GetLockOwner() const; - [[nodiscard]] const KAffinityMask& GetAffinityMask() const { - return physical_affinity_mask; + const KAffinityMask& GetAffinityMask() const { + return m_physical_affinity_mask; } - [[nodiscard]] Result GetCoreMask(s32* out_ideal_core, u64* out_affinity_mask); + Result GetCoreMask(s32* out_ideal_core, u64* out_affinity_mask); - [[nodiscard]] Result GetPhysicalCoreMask(s32* out_ideal_core, u64* out_affinity_mask); + Result GetPhysicalCoreMask(s32* out_ideal_core, u64* out_affinity_mask); - [[nodiscard]] Result SetCoreMask(s32 cpu_core_id, u64 v_affinity_mask); + Result SetCoreMask(s32 cpu_core_id, u64 v_affinity_mask); - [[nodiscard]] Result SetActivity(Svc::ThreadActivity activity); + Result SetActivity(Svc::ThreadActivity activity); - [[nodiscard]] Result Sleep(s64 timeout); + Result Sleep(s64 timeout); - [[nodiscard]] s64 GetYieldScheduleCount() const { - return schedule_count; + s64 GetYieldScheduleCount() const { + return m_schedule_count; } void SetYieldScheduleCount(s64 count) { - schedule_count = count; + m_schedule_count = count; } void WaitCancel(); - [[nodiscard]] bool IsWaitCancelled() const { - return wait_cancelled; + bool IsWaitCancelled() const { + return m_wait_cancelled; } void ClearWaitCancelled() { - wait_cancelled = false; + m_wait_cancelled = false; } - [[nodiscard]] bool IsCancellable() const { - return cancellable; + bool IsCancellable() const { + return m_cancellable; } void SetCancellable() { - cancellable = true; + m_cancellable = true; } void ClearCancellable() { - cancellable = false; + m_cancellable = false; } - [[nodiscard]] bool IsTerminationRequested() const { - return termination_requested || GetRawState() == ThreadState::Terminated; + bool IsTerminationRequested() const { + return m_termination_requested || GetRawState() == ThreadState::Terminated; } - [[nodiscard]] u64 GetId() const override { - return this->GetThreadID(); + u64 GetId() const override { + return this->GetThreadId(); } - [[nodiscard]] bool IsInitialized() const override { - return initialized; + bool IsInitialized() const override { + return m_initialized; } - [[nodiscard]] uintptr_t GetPostDestroyArgument() const override { - return reinterpret_cast(parent) | (resource_limit_release_hint ? 1 : 0); + uintptr_t GetPostDestroyArgument() const override { + return reinterpret_cast(m_parent) | (m_resource_limit_release_hint ? 1 : 0); } void Finalize() override; - [[nodiscard]] bool IsSignaled() const override; + bool IsSignaled() const override; void OnTimer(); @@ -413,26 +409,22 @@ public: static void PostDestroy(uintptr_t arg); - [[nodiscard]] static Result InitializeDummyThread(KThread* thread, KProcess* owner); + static Result InitializeDummyThread(KThread* thread, KProcess* owner); - [[nodiscard]] static Result InitializeMainThread(Core::System& system, KThread* thread, - s32 virt_core); + static Result InitializeMainThread(Core::System& system, KThread* thread, s32 virt_core); - [[nodiscard]] static Result InitializeIdleThread(Core::System& system, KThread* thread, - s32 virt_core); + static Result InitializeIdleThread(Core::System& system, KThread* thread, s32 virt_core); - [[nodiscard]] static Result InitializeHighPriorityThread(Core::System& system, KThread* thread, - KThreadFunction func, uintptr_t arg, - s32 virt_core); + static Result InitializeHighPriorityThread(Core::System& system, KThread* thread, + KThreadFunction func, uintptr_t arg, s32 virt_core); - [[nodiscard]] static Result InitializeUserThread(Core::System& system, KThread* thread, - KThreadFunction func, uintptr_t arg, - VAddr user_stack_top, s32 prio, s32 virt_core, - KProcess* owner); + static Result InitializeUserThread(Core::System& system, KThread* thread, KThreadFunction func, + uintptr_t arg, VAddr user_stack_top, s32 prio, s32 virt_core, + KProcess* owner); - [[nodiscard]] static Result InitializeServiceThread(Core::System& system, KThread* thread, - std::function&& thread_func, - s32 prio, s32 virt_core, KProcess* owner); + static Result InitializeServiceThread(Core::System& system, KThread* thread, + std::function&& thread_func, s32 prio, + s32 virt_core, KProcess* owner); public: struct StackParameters { @@ -446,12 +438,12 @@ public: KThread* cur_thread; }; - [[nodiscard]] StackParameters& GetStackParameters() { - return stack_parameters; + StackParameters& GetStackParameters() { + return m_stack_parameters; } - [[nodiscard]] const StackParameters& GetStackParameters() const { - return stack_parameters; + const StackParameters& GetStackParameters() const { + return m_stack_parameters; } class QueueEntry { @@ -459,37 +451,37 @@ public: constexpr QueueEntry() = default; constexpr void Initialize() { - prev = nullptr; - next = nullptr; + m_prev = nullptr; + m_next = nullptr; } constexpr KThread* GetPrev() const { - return prev; + return m_prev; } constexpr KThread* GetNext() const { - return next; + return m_next; } constexpr void SetPrev(KThread* thread) { - prev = thread; + m_prev = thread; } constexpr void SetNext(KThread* thread) { - next = thread; + m_next = thread; } private: - KThread* prev{}; - KThread* next{}; + KThread* m_prev{}; + KThread* m_next{}; }; - [[nodiscard]] QueueEntry& GetPriorityQueueEntry(s32 core) { - return per_core_priority_queue_entry[core]; + QueueEntry& GetPriorityQueueEntry(s32 core) { + return m_per_core_priority_queue_entry[core]; } - [[nodiscard]] const QueueEntry& GetPriorityQueueEntry(s32 core) const { - return per_core_priority_queue_entry[core]; + const QueueEntry& GetPriorityQueueEntry(s32 core) const { + return m_per_core_priority_queue_entry[core]; } - [[nodiscard]] s32 GetDisableDispatchCount() const { + s32 GetDisableDispatchCount() const { return this->GetStackParameters().disable_count; } @@ -515,7 +507,7 @@ public: this->GetStackParameters().is_in_exception_handler = false; } - [[nodiscard]] bool IsInExceptionHandler() const { + bool IsInExceptionHandler() const { return this->GetStackParameters().is_in_exception_handler; } @@ -527,11 +519,11 @@ public: this->GetStackParameters().is_calling_svc = false; } - [[nodiscard]] bool IsCallingSvc() const { + bool IsCallingSvc() const { return this->GetStackParameters().is_calling_svc; } - [[nodiscard]] u8 GetSvcId() const { + u8 GetSvcId() const { return this->GetStackParameters().current_svc_id; } @@ -543,78 +535,54 @@ public: this->GetStackParameters().dpc_flags &= ~static_cast(flag); } - [[nodiscard]] u8 GetDpc() const { + u8 GetDpc() const { return this->GetStackParameters().dpc_flags; } - [[nodiscard]] bool HasDpc() const { + bool HasDpc() const { return this->GetDpc() != 0; } void SetWaitReasonForDebugging(ThreadWaitReasonForDebugging reason) { - wait_reason_for_debugging = reason; + m_wait_reason_for_debugging = reason; } - [[nodiscard]] ThreadWaitReasonForDebugging GetWaitReasonForDebugging() const { - return wait_reason_for_debugging; + ThreadWaitReasonForDebugging GetWaitReasonForDebugging() const { + return m_wait_reason_for_debugging; } - [[nodiscard]] ThreadType GetThreadType() const { - return thread_type; + ThreadType GetThreadType() const { + return m_thread_type; } - [[nodiscard]] bool IsDummyThread() const { - return GetThreadType() == ThreadType::Dummy; - } - - void SetWaitObjectsForDebugging(const std::span& objects) { - wait_objects_for_debugging.clear(); - wait_objects_for_debugging.reserve(objects.size()); - for (const auto& object : objects) { - wait_objects_for_debugging.emplace_back(object); - } - } - - [[nodiscard]] const std::vector& GetWaitObjectsForDebugging() const { - return wait_objects_for_debugging; - } - - void SetMutexWaitAddressForDebugging(VAddr address) { - mutex_wait_address_for_debugging = address; - } - - [[nodiscard]] VAddr GetMutexWaitAddressForDebugging() const { - return mutex_wait_address_for_debugging; - } - - [[nodiscard]] s32 GetIdealCoreForDebugging() const { - return virtual_ideal_core_id; + bool IsDummyThread() const { + return this->GetThreadType() == ThreadType::Dummy; } void AddWaiter(KThread* thread); void RemoveWaiter(KThread* thread); - [[nodiscard]] Result GetThreadContext3(std::vector& out); + Result GetThreadContext3(std::vector& out); - [[nodiscard]] KThread* RemoveUserWaiterByKey(bool* out_has_waiters, VAddr key) { + KThread* RemoveUserWaiterByKey(bool* out_has_waiters, VAddr key) { return this->RemoveWaiterByKey(out_has_waiters, key, false); } - [[nodiscard]] KThread* RemoveKernelWaiterByKey(bool* out_has_waiters, VAddr key) { + KThread* RemoveKernelWaiterByKey(bool* out_has_waiters, VAddr key) { return this->RemoveWaiterByKey(out_has_waiters, key, true); } - [[nodiscard]] VAddr GetAddressKey() const { - return address_key; + VAddr GetAddressKey() const { + return m_address_key; } - [[nodiscard]] u32 GetAddressKeyValue() const { - return address_key_value; + u32 GetAddressKeyValue() const { + return m_address_key_value; } - [[nodiscard]] bool GetIsKernelAddressKey() const { - return is_kernel_address_key; + bool GetIsKernelAddressKey() const { + return m_is_kernel_address_key; } //! NB: intentional deviation from official kernel. @@ -624,37 +592,37 @@ public: // into things. void SetUserAddressKey(VAddr key, u32 val) { - ASSERT(waiting_lock_info == nullptr); - address_key = key; - address_key_value = val; - is_kernel_address_key = false; + ASSERT(m_waiting_lock_info == nullptr); + m_address_key = key; + m_address_key_value = val; + m_is_kernel_address_key = false; } void SetKernelAddressKey(VAddr key) { - ASSERT(waiting_lock_info == nullptr); - address_key = key; - is_kernel_address_key = true; + ASSERT(m_waiting_lock_info == nullptr); + m_address_key = key; + m_is_kernel_address_key = true; } void ClearWaitQueue() { - wait_queue = nullptr; + m_wait_queue = nullptr; } void BeginWait(KThreadQueue* queue); - void NotifyAvailable(KSynchronizationObject* signaled_object, Result wait_result_); - void EndWait(Result wait_result_); - void CancelWait(Result wait_result_, bool cancel_timer_task); + void NotifyAvailable(KSynchronizationObject* signaled_object, Result wait_result); + void EndWait(Result wait_result); + void CancelWait(Result wait_result, bool cancel_timer_task); - [[nodiscard]] s32 GetNumKernelWaiters() const { - return num_kernel_waiters; + s32 GetNumKernelWaiters() const { + return m_num_kernel_waiters; } - [[nodiscard]] u64 GetConditionVariableKey() const { - return condvar_key; + u64 GetConditionVariableKey() const { + return m_condvar_key; } - [[nodiscard]] u64 GetAddressArbiterKey() const { - return condvar_key; + u64 GetAddressArbiterKey() const { + return m_condvar_key; } // Dummy threads (used for HLE host threads) cannot wait based on the guest scheduler, and @@ -665,17 +633,16 @@ public: void DummyThreadBeginWait(); void DummyThreadEndWait(); - [[nodiscard]] uintptr_t GetArgument() const { - return argument; + uintptr_t GetArgument() const { + return m_argument; } - [[nodiscard]] VAddr GetUserStackTop() const { - return stack_top; + VAddr GetUserStackTop() const { + return m_stack_top; } private: - [[nodiscard]] KThread* RemoveWaiterByKey(bool* out_has_waiters, VAddr key, - bool is_kernel_address_key); + KThread* RemoveWaiterByKey(bool* out_has_waiters, VAddr key, bool is_kernel_address_key); static constexpr size_t PriorityInheritanceCountMax = 10; union SyncObjectBuffer { @@ -692,11 +659,11 @@ private: u64 cv_key{}; s32 priority{}; - [[nodiscard]] constexpr u64 GetConditionVariableKey() const { + constexpr u64 GetConditionVariableKey() const { return cv_key; } - [[nodiscard]] constexpr s32 GetPriority() const { + constexpr s32 GetPriority() const { return priority; } }; @@ -728,22 +695,21 @@ private: void IncreaseBasePriority(s32 priority); - [[nodiscard]] Result Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack_top, - s32 prio, s32 virt_core, KProcess* owner, ThreadType type); + Result Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack_top, s32 prio, + s32 virt_core, KProcess* owner, ThreadType type); - [[nodiscard]] static Result InitializeThread(KThread* thread, KThreadFunction func, - uintptr_t arg, VAddr user_stack_top, s32 prio, - s32 core, KProcess* owner, ThreadType type, - std::function&& init_func); + static Result InitializeThread(KThread* thread, KThreadFunction func, uintptr_t arg, + VAddr user_stack_top, s32 prio, s32 core, KProcess* owner, + ThreadType type, std::function&& init_func); // For core KThread implementation - ThreadContext32 thread_context_32{}; - ThreadContext64 thread_context_64{}; - Common::IntrusiveRedBlackTreeNode condvar_arbiter_tree_node{}; - s32 priority{}; + ThreadContext32 m_thread_context_32{}; + ThreadContext64 m_thread_context_64{}; + Common::IntrusiveRedBlackTreeNode m_condvar_arbiter_tree_node{}; + s32 m_priority{}; using ConditionVariableThreadTreeTraits = Common::IntrusiveRedBlackTreeMemberTraitsDeferredAssert< - &KThread::condvar_arbiter_tree_node>; + &KThread::m_condvar_arbiter_tree_node>; using ConditionVariableThreadTree = ConditionVariableThreadTreeTraits::TreeType; @@ -773,7 +739,7 @@ private: using LockWithPriorityInheritanceThreadTreeTraits = Common::IntrusiveRedBlackTreeMemberTraitsDeferredAssert< - &KThread::condvar_arbiter_tree_node>; + &KThread::m_condvar_arbiter_tree_node>; using LockWithPriorityInheritanceThreadTree = ConditionVariableThreadTreeTraits::TreeType; @@ -809,7 +775,7 @@ public: waiter->SetWaitingLockInfo(this); } - [[nodiscard]] bool RemoveWaiter(KThread* waiter) { + bool RemoveWaiter(KThread* waiter) { m_tree.erase(m_tree.iterator_to(*waiter)); waiter->SetWaitingLockInfo(nullptr); @@ -853,11 +819,11 @@ public: }; void SetWaitingLockInfo(LockWithPriorityInheritanceInfo* lock) { - waiting_lock_info = lock; + m_waiting_lock_info = lock; } LockWithPriorityInheritanceInfo* GetWaitingLockInfo() { - return waiting_lock_info; + return m_waiting_lock_info; } void AddHeldLock(LockWithPriorityInheritanceInfo* lock_info); @@ -867,110 +833,108 @@ private: using LockWithPriorityInheritanceInfoList = boost::intrusive::list; - ConditionVariableThreadTree* condvar_tree{}; - u64 condvar_key{}; - u64 virtual_affinity_mask{}; - KAffinityMask physical_affinity_mask{}; - u64 thread_id{}; - std::atomic cpu_time{}; - VAddr address_key{}; - KProcess* parent{}; - VAddr kernel_stack_top{}; - u32* light_ipc_data{}; - VAddr tls_address{}; - KLightLock activity_pause_lock; - s64 schedule_count{}; - s64 last_scheduled_tick{}; - std::array per_core_priority_queue_entry{}; - KThreadQueue* wait_queue{}; - LockWithPriorityInheritanceInfoList held_lock_info_list{}; - LockWithPriorityInheritanceInfo* waiting_lock_info{}; - WaiterList pinned_waiter_list{}; - u32 address_key_value{}; - u32 suspend_request_flags{}; - u32 suspend_allowed_flags{}; - s32 synced_index{}; - Result wait_result{ResultSuccess}; - s32 base_priority{}; - s32 physical_ideal_core_id{}; - s32 virtual_ideal_core_id{}; - s32 num_kernel_waiters{}; - s32 current_core_id{}; - s32 core_id{}; - KAffinityMask original_physical_affinity_mask{}; - s32 original_physical_ideal_core_id{}; - s32 num_core_migration_disables{}; - std::atomic thread_state{}; - std::atomic termination_requested{}; - bool wait_cancelled{}; - bool cancellable{}; - bool signaled{}; - bool initialized{}; - bool debug_attached{}; - s8 priority_inheritance_count{}; - bool resource_limit_release_hint{}; - bool is_kernel_address_key{}; - StackParameters stack_parameters{}; - Common::SpinLock context_guard{}; + ConditionVariableThreadTree* m_condvar_tree{}; + u64 m_condvar_key{}; + u64 m_virtual_affinity_mask{}; + KAffinityMask m_physical_affinity_mask{}; + u64 m_thread_id{}; + std::atomic m_cpu_time{}; + VAddr m_address_key{}; + KProcess* m_parent{}; + VAddr m_kernel_stack_top{}; + u32* m_light_ipc_data{}; + VAddr m_tls_address{}; + KLightLock m_activity_pause_lock; + s64 m_schedule_count{}; + s64 m_last_scheduled_tick{}; + std::array m_per_core_priority_queue_entry{}; + KThreadQueue* m_wait_queue{}; + LockWithPriorityInheritanceInfoList m_held_lock_info_list{}; + LockWithPriorityInheritanceInfo* m_waiting_lock_info{}; + WaiterList m_pinned_waiter_list{}; + u32 m_address_key_value{}; + u32 m_suspend_request_flags{}; + u32 m_suspend_allowed_flags{}; + s32 m_synced_index{}; + Result m_wait_result{ResultSuccess}; + s32 m_base_priority{}; + s32 m_physical_ideal_core_id{}; + s32 m_virtual_ideal_core_id{}; + s32 m_num_kernel_waiters{}; + s32 m_current_core_id{}; + s32 m_core_id{}; + KAffinityMask m_original_physical_affinity_mask{}; + s32 m_original_physical_ideal_core_id{}; + s32 m_num_core_migration_disables{}; + std::atomic m_thread_state{}; + std::atomic m_termination_requested{}; + bool m_wait_cancelled{}; + bool m_cancellable{}; + bool m_signaled{}; + bool m_initialized{}; + bool m_debug_attached{}; + s8 m_priority_inheritance_count{}; + bool m_resource_limit_release_hint{}; + bool m_is_kernel_address_key{}; + StackParameters m_stack_parameters{}; + Common::SpinLock m_context_guard{}; // For emulation - std::shared_ptr host_context{}; - bool is_single_core{}; - ThreadType thread_type{}; - StepState step_state{}; - std::atomic dummy_thread_runnable{true}; + std::shared_ptr m_host_context{}; + ThreadType m_thread_type{}; + StepState m_step_state{}; + std::atomic m_dummy_thread_runnable{true}; // For debugging - std::vector wait_objects_for_debugging; - VAddr mutex_wait_address_for_debugging{}; - ThreadWaitReasonForDebugging wait_reason_for_debugging{}; - uintptr_t argument{}; - VAddr stack_top{}; - std::string name{}; + std::vector m_wait_objects_for_debugging{}; + VAddr m_mutex_wait_address_for_debugging{}; + ThreadWaitReasonForDebugging m_wait_reason_for_debugging{}; + uintptr_t m_argument{}; + VAddr m_stack_top{}; public: using ConditionVariableThreadTreeType = ConditionVariableThreadTree; void SetConditionVariable(ConditionVariableThreadTree* tree, VAddr address, u64 cv_key, u32 value) { - ASSERT(waiting_lock_info == nullptr); - condvar_tree = tree; - condvar_key = cv_key; - address_key = address; - address_key_value = value; - is_kernel_address_key = false; + ASSERT(m_waiting_lock_info == nullptr); + m_condvar_tree = tree; + m_condvar_key = cv_key; + m_address_key = address; + m_address_key_value = value; + m_is_kernel_address_key = false; } void ClearConditionVariable() { - condvar_tree = nullptr; + m_condvar_tree = nullptr; } - [[nodiscard]] bool IsWaitingForConditionVariable() const { - return condvar_tree != nullptr; + bool IsWaitingForConditionVariable() const { + return m_condvar_tree != nullptr; } void SetAddressArbiter(ConditionVariableThreadTree* tree, u64 address) { - ASSERT(waiting_lock_info == nullptr); - condvar_tree = tree; - condvar_key = address; + ASSERT(m_waiting_lock_info == nullptr); + m_condvar_tree = tree; + m_condvar_key = address; } void ClearAddressArbiter() { - condvar_tree = nullptr; + m_condvar_tree = nullptr; } - [[nodiscard]] bool IsWaitingForAddressArbiter() const { - return condvar_tree != nullptr; + bool IsWaitingForAddressArbiter() const { + return m_condvar_tree != nullptr; } - [[nodiscard]] ConditionVariableThreadTree* GetConditionVariableTree() const { - return condvar_tree; + ConditionVariableThreadTree* GetConditionVariableTree() const { + return m_condvar_tree; } }; class KScopedDisableDispatch { public: - [[nodiscard]] explicit KScopedDisableDispatch(KernelCore& kernel) : m_kernel{kernel} { + explicit KScopedDisableDispatch(KernelCore& kernel) : m_kernel{kernel} { // If we are shutting down the kernel, none of this is relevant anymore. if (m_kernel.IsShuttingDown()) { return; diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index c236e9976..f35fa95b5 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -214,7 +214,6 @@ struct KernelCore::Impl { cores[i] = std::make_unique(i, system, *schedulers[i]); auto* main_thread{Kernel::KThread::Create(system.Kernel())}; - main_thread->SetName(fmt::format("MainThread:{}", core)); main_thread->SetCurrentCore(core); ASSERT(Kernel::KThread::InitializeMainThread(system, main_thread, core).IsSuccess()); @@ -356,7 +355,6 @@ struct KernelCore::Impl { ASSERT(KThread::InitializeHighPriorityThread(system, shutdown_threads[core_id], {}, {}, core_id) .IsSuccess()); - shutdown_threads[core_id]->SetName(fmt::format("SuspendThread:{}", core_id)); } } @@ -390,7 +388,6 @@ struct KernelCore::Impl { KThread* GetHostDummyThread(KThread* existing_thread) { auto initialize = [this](KThread* thread) { ASSERT(KThread::InitializeDummyThread(thread, nullptr).IsSuccess()); - thread->SetName(fmt::format("DummyThread:{}", next_host_thread_id++)); return thread; }; diff --git a/src/core/hle/kernel/svc/svc_thread.cpp b/src/core/hle/kernel/svc/svc_thread.cpp index a16fc7ae3..50991fb62 100644 --- a/src/core/hle/kernel/svc/svc_thread.cpp +++ b/src/core/hle/kernel/svc/svc_thread.cpp @@ -59,9 +59,6 @@ Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point, priority, core_id, std::addressof(process))); } - // Set the thread name for debugging purposes. - thread->SetName(fmt::format("thread[entry_point={:X}, handle={:X}]", entry_point, *out_handle)); - // Commit the thread reservation. thread_reservation.Commit(); @@ -252,7 +249,7 @@ Result GetThreadList(Core::System& system, s32* out_num_threads, VAddr out_threa auto list_iter = thread_list.cbegin(); for (std::size_t i = 0; i < copy_amount; ++i, ++list_iter) { - memory.Write64(out_thread_ids, (*list_iter)->GetThreadID()); + memory.Write64(out_thread_ids, (*list_iter)->GetThreadId()); out_thread_ids += sizeof(u64); } diff --git a/src/core/hle/service/hle_ipc.cpp b/src/core/hle/service/hle_ipc.cpp index c221ffe11..cca697c64 100644 --- a/src/core/hle/service/hle_ipc.cpp +++ b/src/core/hle/service/hle_ipc.cpp @@ -303,7 +303,7 @@ Result HLERequestContext::WriteToOutgoingCommandBuffer(Kernel::KThread& requesti } // Copy the translated command buffer back into the thread's command buffer area. - memory.WriteBlock(owner_process, requesting_thread.GetTLSAddress(), cmd_buf.data(), + memory.WriteBlock(owner_process, requesting_thread.GetTlsAddress(), cmd_buf.data(), write_size * sizeof(u32)); return ResultSuccess; diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp index 219912128..0783a2430 100644 --- a/src/yuzu/debugger/wait_tree.cpp +++ b/src/yuzu/debugger/wait_tree.cpp @@ -112,33 +112,6 @@ QString WaitTreeText::GetText() const { return text; } -WaitTreeMutexInfo::WaitTreeMutexInfo(VAddr mutex_address_, const Kernel::KHandleTable& handle_table, - Core::System& system_) - : mutex_address{mutex_address_}, system{system_} { - mutex_value = system.Memory().Read32(mutex_address); - owner_handle = static_cast(mutex_value & Kernel::Svc::HandleWaitMask); - owner = handle_table.GetObject(owner_handle).GetPointerUnsafe(); -} - -WaitTreeMutexInfo::~WaitTreeMutexInfo() = default; - -QString WaitTreeMutexInfo::GetText() const { - return tr("waiting for mutex 0x%1").arg(mutex_address, 16, 16, QLatin1Char{'0'}); -} - -std::vector> WaitTreeMutexInfo::GetChildren() const { - const bool has_waiters = (mutex_value & Kernel::Svc::HandleWaitMask) != 0; - - std::vector> list; - list.push_back(std::make_unique(tr("has waiters: %1").arg(has_waiters))); - list.push_back(std::make_unique( - tr("owner handle: 0x%1").arg(owner_handle, 8, 16, QLatin1Char{'0'}))); - if (owner != nullptr) { - list.push_back(std::make_unique(*owner, system)); - } - return list; -} - WaitTreeCallstack::WaitTreeCallstack(const Kernel::KThread& thread_, Core::System& system_) : thread{thread_}, system{system_} {} WaitTreeCallstack::~WaitTreeCallstack() = default; @@ -216,26 +189,6 @@ std::vector> WaitTreeSynchronizationObject::GetChi return list; } -WaitTreeObjectList::WaitTreeObjectList(const std::vector& list, - bool w_all, Core::System& system_) - : object_list(list), wait_all(w_all), system{system_} {} - -WaitTreeObjectList::~WaitTreeObjectList() = default; - -QString WaitTreeObjectList::GetText() const { - if (wait_all) - return tr("waiting for all objects"); - return tr("waiting for one of the following objects"); -} - -std::vector> WaitTreeObjectList::GetChildren() const { - std::vector> list(object_list.size()); - std::transform(object_list.begin(), object_list.end(), list.begin(), [this](const auto& t) { - return WaitTreeSynchronizationObject::make(*t, system); - }); - return list; -} - WaitTreeThread::WaitTreeThread(const Kernel::KThread& thread, Core::System& system_) : WaitTreeSynchronizationObject(thread, system_), system{system_} {} WaitTreeThread::~WaitTreeThread() = default; @@ -346,33 +299,15 @@ std::vector> WaitTreeThread::GetChildren() const { } list.push_back(std::make_unique(tr("processor = %1").arg(processor))); - list.push_back(std::make_unique( - tr("ideal core = %1").arg(thread.GetIdealCoreForDebugging()))); list.push_back(std::make_unique( tr("affinity mask = %1").arg(thread.GetAffinityMask().GetAffinityMask()))); - list.push_back(std::make_unique(tr("thread id = %1").arg(thread.GetThreadID()))); + list.push_back(std::make_unique(tr("thread id = %1").arg(thread.GetThreadId()))); list.push_back(std::make_unique(tr("priority = %1(current) / %2(normal)") .arg(thread.GetPriority()) .arg(thread.GetBasePriority()))); list.push_back(std::make_unique( tr("last running ticks = %1").arg(thread.GetLastScheduledTick()))); - const VAddr mutex_wait_address = thread.GetMutexWaitAddressForDebugging(); - if (mutex_wait_address != 0) { - const auto& handle_table = thread.GetOwnerProcess()->GetHandleTable(); - list.push_back( - std::make_unique(mutex_wait_address, handle_table, system)); - } else { - list.push_back(std::make_unique(tr("not waiting for mutex"))); - } - - if (thread.GetState() == Kernel::ThreadState::Waiting && - thread.GetWaitReasonForDebugging() == - Kernel::ThreadWaitReasonForDebugging::Synchronization) { - list.push_back(std::make_unique(thread.GetWaitObjectsForDebugging(), - thread.IsCancellable(), system)); - } - list.push_back(std::make_unique(thread, system)); return list; diff --git a/src/yuzu/debugger/wait_tree.h b/src/yuzu/debugger/wait_tree.h index 7e528b592..23c329fbe 100644 --- a/src/yuzu/debugger/wait_tree.h +++ b/src/yuzu/debugger/wait_tree.h @@ -74,25 +74,6 @@ public: bool IsExpandable() const override; }; -class WaitTreeMutexInfo : public WaitTreeExpandableItem { - Q_OBJECT -public: - explicit WaitTreeMutexInfo(VAddr mutex_address_, const Kernel::KHandleTable& handle_table, - Core::System& system_); - ~WaitTreeMutexInfo() override; - - QString GetText() const override; - std::vector> GetChildren() const override; - -private: - VAddr mutex_address{}; - u32 mutex_value{}; - Kernel::Handle owner_handle{}; - Kernel::KThread* owner{}; - - Core::System& system; -}; - class WaitTreeCallstack : public WaitTreeExpandableItem { Q_OBJECT public: @@ -127,23 +108,6 @@ private: Core::System& system; }; -class WaitTreeObjectList : public WaitTreeExpandableItem { - Q_OBJECT -public: - WaitTreeObjectList(const std::vector& list, bool wait_all, - Core::System& system_); - ~WaitTreeObjectList() override; - - QString GetText() const override; - std::vector> GetChildren() const override; - -private: - const std::vector& object_list; - bool wait_all; - - Core::System& system; -}; - class WaitTreeThread : public WaitTreeSynchronizationObject { Q_OBJECT public: From 9863db9db45339d5cf8f685b316e93660da71b0b Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 7 Mar 2023 16:45:13 -0500 Subject: [PATCH 0179/1181] kernel: convert KProcess to new style --- src/core/core.cpp | 4 +- src/core/debugger/gdbstub.cpp | 2 +- src/core/hle/kernel/k_process.cpp | 268 ++++++++++++------------ src/core/hle/kernel/k_process.h | 186 ++++++++-------- src/core/hle/kernel/svc/svc_info.cpp | 2 +- src/core/hle/kernel/svc/svc_process.cpp | 4 +- src/core/hle/service/am/am.cpp | 2 +- src/core/hle/service/glue/arp.cpp | 4 +- src/core/hle/service/pm/pm.cpp | 20 +- src/core/memory/cheat_engine.cpp | 2 +- 10 files changed, 254 insertions(+), 240 deletions(-) diff --git a/src/core/core.cpp b/src/core/core.cpp index bd2082fd6..d2b597068 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -434,7 +434,7 @@ struct System::Impl { } Service::Glue::ApplicationLaunchProperty launch{}; - launch.title_id = process.GetProgramID(); + launch.title_id = process.GetProgramId(); FileSys::PatchManager pm{launch.title_id, fs_controller, *content_provider}; launch.version = pm.GetGameVersion().value_or(0); @@ -762,7 +762,7 @@ const Core::SpeedLimiter& System::SpeedLimiter() const { } u64 System::GetApplicationProcessProgramID() const { - return impl->kernel.ApplicationProcess()->GetProgramID(); + return impl->kernel.ApplicationProcess()->GetProgramId(); } Loader::ResultStatus System::GetGameName(std::string& out) const { diff --git a/src/core/debugger/gdbstub.cpp b/src/core/debugger/gdbstub.cpp index f39f2ca29..b2fe6bd7d 100644 --- a/src/core/debugger/gdbstub.cpp +++ b/src/core/debugger/gdbstub.cpp @@ -756,7 +756,7 @@ void GDBStub::HandleRcmd(const std::vector& command) { reply = fmt::format("Process: {:#x} ({})\n" "Program Id: {:#018x}\n", - process->GetProcessID(), process->GetName(), process->GetProgramID()); + process->GetProcessId(), process->GetName(), process->GetProgramId()); reply += fmt::format("Layout:\n" " Alias: {:#012x} - {:#012x}\n" diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp index fa3fc8c1c..46ac3833e 100644 --- a/src/core/hle/kernel/k_process.cpp +++ b/src/core/hle/kernel/k_process.cpp @@ -71,32 +71,32 @@ Result KProcess::Initialize(KProcess* process, Core::System& system, std::string auto& kernel = system.Kernel(); process->name = std::move(process_name); - process->resource_limit = res_limit; - process->system_resource_address = 0; - process->state = State::Created; - process->program_id = 0; - process->process_id = type == ProcessType::KernelInternal ? kernel.CreateNewKernelProcessID() - : kernel.CreateNewUserProcessID(); - process->capabilities.InitializeForMetadatalessProcess(); - process->is_initialized = true; + process->m_resource_limit = res_limit; + process->m_system_resource_address = 0; + process->m_state = State::Created; + process->m_program_id = 0; + process->m_process_id = type == ProcessType::KernelInternal ? kernel.CreateNewKernelProcessID() + : kernel.CreateNewUserProcessID(); + process->m_capabilities.InitializeForMetadatalessProcess(); + process->m_is_initialized = true; std::mt19937 rng(Settings::values.rng_seed.GetValue().value_or(std::time(nullptr))); std::uniform_int_distribution distribution; - std::generate(process->random_entropy.begin(), process->random_entropy.end(), + std::generate(process->m_random_entropy.begin(), process->m_random_entropy.end(), [&] { return distribution(rng); }); kernel.AppendNewProcess(process); // Clear remaining fields. - process->num_running_threads = 0; - process->is_signaled = false; - process->exception_thread = nullptr; - process->is_suspended = false; - process->schedule_count = 0; - process->is_handle_table_initialized = false; + process->m_num_running_threads = 0; + process->m_is_signaled = false; + process->m_exception_thread = nullptr; + process->m_is_suspended = false; + process->m_schedule_count = 0; + process->m_is_handle_table_initialized = false; // Open a reference to the resource limit. - process->resource_limit->Open(); + process->m_resource_limit->Open(); R_SUCCEED(); } @@ -106,34 +106,34 @@ void KProcess::DoWorkerTaskImpl() { } KResourceLimit* KProcess::GetResourceLimit() const { - return resource_limit; + return m_resource_limit; } void KProcess::IncrementRunningThreadCount() { - ASSERT(num_running_threads.load() >= 0); - ++num_running_threads; + ASSERT(m_num_running_threads.load() >= 0); + ++m_num_running_threads; } void KProcess::DecrementRunningThreadCount() { - ASSERT(num_running_threads.load() > 0); + ASSERT(m_num_running_threads.load() > 0); - if (const auto prev = num_running_threads--; prev == 1) { + if (const auto prev = m_num_running_threads--; prev == 1) { // TODO(bunnei): Process termination to be implemented when multiprocess is supported. } } u64 KProcess::GetTotalPhysicalMemoryAvailable() { - const u64 capacity{resource_limit->GetFreeValue(LimitableResource::PhysicalMemoryMax) + - page_table.GetNormalMemorySize() + GetSystemResourceSize() + image_size + - main_thread_stack_size}; + const u64 capacity{m_resource_limit->GetFreeValue(LimitableResource::PhysicalMemoryMax) + + m_page_table.GetNormalMemorySize() + GetSystemResourceSize() + m_image_size + + m_main_thread_stack_size}; if (const auto pool_size = m_kernel.MemoryManager().GetSize(KMemoryManager::Pool::Application); capacity != pool_size) { LOG_WARNING(Kernel, "capacity {} != application pool size {}", capacity, pool_size); } - if (capacity < memory_usage_capacity) { + if (capacity < m_memory_usage_capacity) { return capacity; } - return memory_usage_capacity; + return m_memory_usage_capacity; } u64 KProcess::GetTotalPhysicalMemoryAvailableWithoutSystemResource() { @@ -141,7 +141,7 @@ u64 KProcess::GetTotalPhysicalMemoryAvailableWithoutSystemResource() { } u64 KProcess::GetTotalPhysicalMemoryUsed() { - return image_size + main_thread_stack_size + page_table.GetNormalMemorySize() + + return m_image_size + m_main_thread_stack_size + m_page_table.GetNormalMemorySize() + GetSystemResourceSize(); } @@ -152,14 +152,14 @@ u64 KProcess::GetTotalPhysicalMemoryUsedWithoutSystemResource() { bool KProcess::ReleaseUserException(KThread* thread) { KScopedSchedulerLock sl{m_kernel}; - if (exception_thread == thread) { - exception_thread = nullptr; + if (m_exception_thread == thread) { + m_exception_thread = nullptr; // Remove waiter thread. bool has_waiters{}; if (KThread* next = thread->RemoveKernelWaiterByKey( std::addressof(has_waiters), - reinterpret_cast(std::addressof(exception_thread))); + reinterpret_cast(std::addressof(m_exception_thread))); next != nullptr) { next->EndWait(ResultSuccess); } @@ -173,7 +173,7 @@ bool KProcess::ReleaseUserException(KThread* thread) { } void KProcess::PinCurrentThread(s32 core_id) { - ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Get the current thread. KThread* cur_thread = @@ -191,7 +191,7 @@ void KProcess::PinCurrentThread(s32 core_id) { } void KProcess::UnpinCurrentThread(s32 core_id) { - ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Get the current thread. KThread* cur_thread = @@ -206,7 +206,7 @@ void KProcess::UnpinCurrentThread(s32 core_id) { } void KProcess::UnpinThread(KThread* thread) { - ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Get the thread's core id. const auto core_id = thread->GetActiveCore(); @@ -222,14 +222,14 @@ void KProcess::UnpinThread(KThread* thread) { Result KProcess::AddSharedMemory(KSharedMemory* shmem, [[maybe_unused]] VAddr address, [[maybe_unused]] size_t size) { // Lock ourselves, to prevent concurrent access. - KScopedLightLock lk(state_lock); + KScopedLightLock lk(m_state_lock); // Try to find an existing info for the memory. KSharedMemoryInfo* shemen_info = nullptr; const auto iter = std::find_if( - shared_memory_list.begin(), shared_memory_list.end(), + m_shared_memory_list.begin(), m_shared_memory_list.end(), [shmem](const KSharedMemoryInfo* info) { return info->GetSharedMemory() == shmem; }); - if (iter != shared_memory_list.end()) { + if (iter != m_shared_memory_list.end()) { shemen_info = *iter; } @@ -238,7 +238,7 @@ Result KProcess::AddSharedMemory(KSharedMemory* shmem, [[maybe_unused]] VAddr ad R_UNLESS(shemen_info != nullptr, ResultOutOfMemory); shemen_info->Initialize(shmem); - shared_memory_list.push_back(shemen_info); + m_shared_memory_list.push_back(shemen_info); } // Open a reference to the shared memory and its info. @@ -251,20 +251,20 @@ Result KProcess::AddSharedMemory(KSharedMemory* shmem, [[maybe_unused]] VAddr ad void KProcess::RemoveSharedMemory(KSharedMemory* shmem, [[maybe_unused]] VAddr address, [[maybe_unused]] size_t size) { // Lock ourselves, to prevent concurrent access. - KScopedLightLock lk(state_lock); + KScopedLightLock lk(m_state_lock); KSharedMemoryInfo* shemen_info = nullptr; const auto iter = std::find_if( - shared_memory_list.begin(), shared_memory_list.end(), + m_shared_memory_list.begin(), m_shared_memory_list.end(), [shmem](const KSharedMemoryInfo* info) { return info->GetSharedMemory() == shmem; }); - if (iter != shared_memory_list.end()) { + if (iter != m_shared_memory_list.end()) { shemen_info = *iter; } ASSERT(shemen_info != nullptr); if (shemen_info->Close()) { - shared_memory_list.erase(iter); + m_shared_memory_list.erase(iter); KSharedMemoryInfo::Free(m_kernel, shemen_info); } @@ -273,22 +273,22 @@ void KProcess::RemoveSharedMemory(KSharedMemory* shmem, [[maybe_unused]] VAddr a } void KProcess::RegisterThread(KThread* thread) { - KScopedLightLock lk{list_lock}; + KScopedLightLock lk{m_list_lock}; - thread_list.push_back(thread); + m_thread_list.push_back(thread); } void KProcess::UnregisterThread(KThread* thread) { - KScopedLightLock lk{list_lock}; + KScopedLightLock lk{m_list_lock}; - thread_list.remove(thread); + m_thread_list.remove(thread); } u64 KProcess::GetFreeThreadCount() const { - if (resource_limit != nullptr) { + if (m_resource_limit != nullptr) { const auto current_value = - resource_limit->GetCurrentValue(LimitableResource::ThreadCountMax); - const auto limit_value = resource_limit->GetLimitValue(LimitableResource::ThreadCountMax); + m_resource_limit->GetCurrentValue(LimitableResource::ThreadCountMax); + const auto limit_value = m_resource_limit->GetLimitValue(LimitableResource::ThreadCountMax); return limit_value - current_value; } else { return 0; @@ -297,35 +297,35 @@ u64 KProcess::GetFreeThreadCount() const { Result KProcess::Reset() { // Lock the process and the scheduler. - KScopedLightLock lk(state_lock); + KScopedLightLock lk(m_state_lock); KScopedSchedulerLock sl{m_kernel}; // Validate that we're in a state that we can reset. - R_UNLESS(state != State::Terminated, ResultInvalidState); - R_UNLESS(is_signaled, ResultInvalidState); + R_UNLESS(m_state != State::Terminated, ResultInvalidState); + R_UNLESS(m_is_signaled, ResultInvalidState); // Clear signaled. - is_signaled = false; + m_is_signaled = false; R_SUCCEED(); } Result KProcess::SetActivity(ProcessActivity activity) { // Lock ourselves and the scheduler. - KScopedLightLock lk{state_lock}; - KScopedLightLock list_lk{list_lock}; + KScopedLightLock lk{m_state_lock}; + KScopedLightLock list_lk{m_list_lock}; KScopedSchedulerLock sl{m_kernel}; // Validate our state. - R_UNLESS(state != State::Terminating, ResultInvalidState); - R_UNLESS(state != State::Terminated, ResultInvalidState); + R_UNLESS(m_state != State::Terminating, ResultInvalidState); + R_UNLESS(m_state != State::Terminated, ResultInvalidState); // Either pause or resume. if (activity == ProcessActivity::Paused) { // Verify that we're not suspended. - R_UNLESS(!is_suspended, ResultInvalidState); + R_UNLESS(!m_is_suspended, ResultInvalidState); // Suspend all threads. - for (auto* thread : GetThreadList()) { + for (auto* thread : this->GetThreadList()) { thread->RequestSuspend(SuspendType::Process); } @@ -335,10 +335,10 @@ Result KProcess::SetActivity(ProcessActivity activity) { ASSERT(activity == ProcessActivity::Runnable); // Verify that we're suspended. - R_UNLESS(is_suspended, ResultInvalidState); + R_UNLESS(m_is_suspended, ResultInvalidState); // Resume all threads. - for (auto* thread : GetThreadList()) { + for (auto* thread : this->GetThreadList()) { thread->Resume(SuspendType::Process); } @@ -350,31 +350,32 @@ Result KProcess::SetActivity(ProcessActivity activity) { } Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std::size_t code_size) { - program_id = metadata.GetTitleID(); - ideal_core = metadata.GetMainThreadCore(); - is_64bit_process = metadata.Is64BitProgram(); - system_resource_size = metadata.GetSystemResourceSize(); - image_size = code_size; + m_program_id = metadata.GetTitleID(); + m_ideal_core = metadata.GetMainThreadCore(); + m_is_64bit_process = metadata.Is64BitProgram(); + m_system_resource_size = metadata.GetSystemResourceSize(); + m_image_size = code_size; KScopedResourceReservation memory_reservation( - resource_limit, LimitableResource::PhysicalMemoryMax, code_size + system_resource_size); + m_resource_limit, LimitableResource::PhysicalMemoryMax, code_size + m_system_resource_size); if (!memory_reservation.Succeeded()) { LOG_ERROR(Kernel, "Could not reserve process memory requirements of size {:X} bytes", - code_size + system_resource_size); + code_size + m_system_resource_size); R_RETURN(ResultLimitReached); } // Initialize process address space - if (const Result result{page_table.InitializeForProcess( + if (const Result result{m_page_table.InitializeForProcess( metadata.GetAddressSpaceType(), false, false, false, KMemoryManager::Pool::Application, - 0x8000000, code_size, std::addressof(m_kernel.GetAppSystemResource()), resource_limit)}; + 0x8000000, code_size, std::addressof(m_kernel.GetAppSystemResource()), + m_resource_limit)}; result.IsError()) { R_RETURN(result); } // Map process code region - if (const Result result{page_table.MapProcessCode(page_table.GetCodeRegionStart(), - code_size / PageSize, KMemoryState::Code, - KMemoryPermission::None)}; + if (const Result result{m_page_table.MapProcessCode(m_page_table.GetCodeRegionStart(), + code_size / PageSize, KMemoryState::Code, + KMemoryPermission::None)}; result.IsError()) { R_RETURN(result); } @@ -382,7 +383,7 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std: // Initialize process capabilities const auto& caps{metadata.GetKernelCapabilities()}; if (const Result result{ - capabilities.InitializeForUserProcess(caps.data(), caps.size(), page_table)}; + m_capabilities.InitializeForUserProcess(caps.data(), caps.size(), m_page_table)}; result.IsError()) { R_RETURN(result); } @@ -392,12 +393,14 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std: case FileSys::ProgramAddressSpaceType::Is32Bit: case FileSys::ProgramAddressSpaceType::Is36Bit: case FileSys::ProgramAddressSpaceType::Is39Bit: - memory_usage_capacity = page_table.GetHeapRegionEnd() - page_table.GetHeapRegionStart(); + m_memory_usage_capacity = + m_page_table.GetHeapRegionEnd() - m_page_table.GetHeapRegionStart(); break; case FileSys::ProgramAddressSpaceType::Is32BitNoMap: - memory_usage_capacity = page_table.GetHeapRegionEnd() - page_table.GetHeapRegionStart() + - page_table.GetAliasRegionEnd() - page_table.GetAliasRegionStart(); + m_memory_usage_capacity = + m_page_table.GetHeapRegionEnd() - m_page_table.GetHeapRegionStart() + + m_page_table.GetAliasRegionEnd() - m_page_table.GetAliasRegionStart(); break; default: @@ -406,26 +409,27 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std: } // Create TLS region - R_TRY(this->CreateThreadLocalRegion(std::addressof(plr_address))); + R_TRY(this->CreateThreadLocalRegion(std::addressof(m_plr_address))); memory_reservation.Commit(); - R_RETURN(handle_table.Initialize(capabilities.GetHandleTableSize())); + R_RETURN(m_handle_table.Initialize(m_capabilities.GetHandleTableSize())); } void KProcess::Run(s32 main_thread_priority, u64 stack_size) { - ASSERT(AllocateMainThreadStack(stack_size) == ResultSuccess); - resource_limit->Reserve(LimitableResource::ThreadCountMax, 1); + ASSERT(this->AllocateMainThreadStack(stack_size) == ResultSuccess); + m_resource_limit->Reserve(LimitableResource::ThreadCountMax, 1); - const std::size_t heap_capacity{memory_usage_capacity - (main_thread_stack_size + image_size)}; - ASSERT(!page_table.SetMaxHeapSize(heap_capacity).IsError()); + const std::size_t heap_capacity{m_memory_usage_capacity - + (m_main_thread_stack_size + m_image_size)}; + ASSERT(!m_page_table.SetMaxHeapSize(heap_capacity).IsError()); - ChangeState(State::Running); + this->ChangeState(State::Running); - SetupMainThread(m_kernel.System(), *this, main_thread_priority, main_thread_stack_top); + SetupMainThread(m_kernel.System(), *this, main_thread_priority, m_main_thread_stack_top); } void KProcess::PrepareForTermination() { - ChangeState(State::Terminating); + this->ChangeState(State::Terminating); const auto stop_threads = [this](const std::vector& in_thread_list) { for (auto* thread : in_thread_list) { @@ -445,12 +449,12 @@ void KProcess::PrepareForTermination() { stop_threads(m_kernel.System().GlobalSchedulerContext().GetThreadList()); - this->DeleteThreadLocalRegion(plr_address); - plr_address = 0; + this->DeleteThreadLocalRegion(m_plr_address); + m_plr_address = 0; - if (resource_limit) { - resource_limit->Release(LimitableResource::PhysicalMemoryMax, - main_thread_stack_size + image_size); + if (m_resource_limit) { + m_resource_limit->Release(LimitableResource::PhysicalMemoryMax, + m_main_thread_stack_size + m_image_size); } ChangeState(State::Terminated); @@ -459,8 +463,8 @@ void KProcess::PrepareForTermination() { void KProcess::Finalize() { // Free all shared memory infos. { - auto it = shared_memory_list.begin(); - while (it != shared_memory_list.end()) { + auto it = m_shared_memory_list.begin(); + while (it != m_shared_memory_list.end()) { KSharedMemoryInfo* info = *it; KSharedMemory* shmem = info->GetSharedMemory(); @@ -470,19 +474,19 @@ void KProcess::Finalize() { shmem->Close(); - it = shared_memory_list.erase(it); + it = m_shared_memory_list.erase(it); KSharedMemoryInfo::Free(m_kernel, info); } } // Release memory to the resource limit. - if (resource_limit != nullptr) { - resource_limit->Close(); - resource_limit = nullptr; + if (m_resource_limit != nullptr) { + m_resource_limit->Close(); + m_resource_limit = nullptr; } // Finalize the page table. - page_table.Finalize(); + m_page_table.Finalize(); // Perform inherited finalization. KAutoObjectWithSlabHeapAndContainer::Finalize(); @@ -496,14 +500,14 @@ Result KProcess::CreateThreadLocalRegion(VAddr* out) { { KScopedSchedulerLock sl{m_kernel}; - if (auto it = partially_used_tlp_tree.begin(); it != partially_used_tlp_tree.end()) { + if (auto it = m_partially_used_tlp_tree.begin(); it != m_partially_used_tlp_tree.end()) { tlr = it->Reserve(); ASSERT(tlr != 0); if (it->IsAllUsed()) { tlp = std::addressof(*it); - partially_used_tlp_tree.erase(it); - fully_used_tlp_tree.insert(*tlp); + m_partially_used_tlp_tree.erase(it); + m_fully_used_tlp_tree.insert(*tlp); } *out = tlr; @@ -527,9 +531,9 @@ Result KProcess::CreateThreadLocalRegion(VAddr* out) { { KScopedSchedulerLock sl{m_kernel}; if (tlp->IsAllUsed()) { - fully_used_tlp_tree.insert(*tlp); + m_fully_used_tlp_tree.insert(*tlp); } else { - partially_used_tlp_tree.insert(*tlp); + m_partially_used_tlp_tree.insert(*tlp); } } @@ -547,22 +551,22 @@ Result KProcess::DeleteThreadLocalRegion(VAddr addr) { KScopedSchedulerLock sl{m_kernel}; // Try to find the page in the partially used list. - auto it = partially_used_tlp_tree.find_key(Common::AlignDown(addr, PageSize)); - if (it == partially_used_tlp_tree.end()) { + auto it = m_partially_used_tlp_tree.find_key(Common::AlignDown(addr, PageSize)); + if (it == m_partially_used_tlp_tree.end()) { // If we don't find it, it has to be in the fully used list. - it = fully_used_tlp_tree.find_key(Common::AlignDown(addr, PageSize)); - R_UNLESS(it != fully_used_tlp_tree.end(), ResultInvalidAddress); + it = m_fully_used_tlp_tree.find_key(Common::AlignDown(addr, PageSize)); + R_UNLESS(it != m_fully_used_tlp_tree.end(), ResultInvalidAddress); // Release the region. it->Release(addr); // Move the page out of the fully used list. KThreadLocalPage* tlp = std::addressof(*it); - fully_used_tlp_tree.erase(it); + m_fully_used_tlp_tree.erase(it); if (tlp->IsAllFree()) { page_to_free = tlp; } else { - partially_used_tlp_tree.insert(*tlp); + m_partially_used_tlp_tree.insert(*tlp); } } else { // Release the region. @@ -571,7 +575,7 @@ Result KProcess::DeleteThreadLocalRegion(VAddr addr) { // Handle the all-free case. KThreadLocalPage* tlp = std::addressof(*it); if (tlp->IsAllFree()) { - partially_used_tlp_tree.erase(it); + m_partially_used_tlp_tree.erase(it); page_to_free = tlp; } } @@ -589,11 +593,11 @@ Result KProcess::DeleteThreadLocalRegion(VAddr addr) { bool KProcess::InsertWatchpoint(Core::System& system, VAddr addr, u64 size, DebugWatchpointType type) { - const auto watch{std::find_if(watchpoints.begin(), watchpoints.end(), [&](const auto& wp) { + const auto watch{std::find_if(m_watchpoints.begin(), m_watchpoints.end(), [&](const auto& wp) { return wp.type == DebugWatchpointType::None; })}; - if (watch == watchpoints.end()) { + if (watch == m_watchpoints.end()) { return false; } @@ -602,7 +606,7 @@ bool KProcess::InsertWatchpoint(Core::System& system, VAddr addr, u64 size, watch->type = type; for (VAddr page = Common::AlignDown(addr, PageSize); page < addr + size; page += PageSize) { - debug_page_refcounts[page]++; + m_debug_page_refcounts[page]++; system.Memory().MarkRegionDebug(page, PageSize, true); } @@ -611,11 +615,11 @@ bool KProcess::InsertWatchpoint(Core::System& system, VAddr addr, u64 size, bool KProcess::RemoveWatchpoint(Core::System& system, VAddr addr, u64 size, DebugWatchpointType type) { - const auto watch{std::find_if(watchpoints.begin(), watchpoints.end(), [&](const auto& wp) { + const auto watch{std::find_if(m_watchpoints.begin(), m_watchpoints.end(), [&](const auto& wp) { return wp.start_address == addr && wp.end_address == addr + size && wp.type == type; })}; - if (watch == watchpoints.end()) { + if (watch == m_watchpoints.end()) { return false; } @@ -624,8 +628,8 @@ bool KProcess::RemoveWatchpoint(Core::System& system, VAddr addr, u64 size, watch->type = DebugWatchpointType::None; for (VAddr page = Common::AlignDown(addr, PageSize); page < addr + size; page += PageSize) { - debug_page_refcounts[page]--; - if (!debug_page_refcounts[page]) { + m_debug_page_refcounts[page]--; + if (!m_debug_page_refcounts[page]) { system.Memory().MarkRegionDebug(page, PageSize, false); } } @@ -636,7 +640,7 @@ bool KProcess::RemoveWatchpoint(Core::System& system, VAddr addr, u64 size, void KProcess::LoadModule(CodeSet code_set, VAddr base_addr) { const auto ReprotectSegment = [&](const CodeSet::Segment& segment, Svc::MemoryPermission permission) { - page_table.SetProcessMemoryPermission(segment.addr + base_addr, segment.size, permission); + m_page_table.SetProcessMemoryPermission(segment.addr + base_addr, segment.size, permission); }; m_kernel.System().Memory().WriteBlock(*this, base_addr, code_set.memory.data(), @@ -648,35 +652,35 @@ void KProcess::LoadModule(CodeSet code_set, VAddr base_addr) { } bool KProcess::IsSignaled() const { - ASSERT(m_kernel.GlobalSchedulerContext().IsLocked()); - return is_signaled; + ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); + return m_is_signaled; } KProcess::KProcess(KernelCore& kernel) - : KAutoObjectWithSlabHeapAndContainer{kernel}, page_table{m_kernel.System()}, - handle_table{m_kernel}, address_arbiter{m_kernel.System()}, condition_var{m_kernel.System()}, - state_lock{m_kernel}, list_lock{m_kernel} {} + : KAutoObjectWithSlabHeapAndContainer{kernel}, m_page_table{m_kernel.System()}, + m_handle_table{m_kernel}, m_address_arbiter{m_kernel.System()}, + m_condition_var{m_kernel.System()}, m_state_lock{m_kernel}, m_list_lock{m_kernel} {} KProcess::~KProcess() = default; void KProcess::ChangeState(State new_state) { - if (state == new_state) { + if (m_state == new_state) { return; } - state = new_state; - is_signaled = true; - NotifyAvailable(); + m_state = new_state; + m_is_signaled = true; + this->NotifyAvailable(); } Result KProcess::AllocateMainThreadStack(std::size_t stack_size) { // Ensure that we haven't already allocated stack. - ASSERT(main_thread_stack_size == 0); + ASSERT(m_main_thread_stack_size == 0); // Ensure that we're allocating a valid stack. stack_size = Common::AlignUp(stack_size, PageSize); // R_UNLESS(stack_size + image_size <= m_max_process_memory, ResultOutOfMemory); - R_UNLESS(stack_size + image_size >= image_size, ResultOutOfMemory); + R_UNLESS(stack_size + m_image_size >= m_image_size, ResultOutOfMemory); // Place a tentative reservation of memory for our new stack. KScopedResourceReservation mem_reservation(this, Svc::LimitableResource::PhysicalMemoryMax, @@ -686,11 +690,11 @@ Result KProcess::AllocateMainThreadStack(std::size_t stack_size) { // Allocate and map our stack. if (stack_size) { KProcessAddress stack_bottom; - R_TRY(page_table.MapPages(std::addressof(stack_bottom), stack_size / PageSize, - KMemoryState::Stack, KMemoryPermission::UserReadWrite)); + R_TRY(m_page_table.MapPages(std::addressof(stack_bottom), stack_size / PageSize, + KMemoryState::Stack, KMemoryPermission::UserReadWrite)); - main_thread_stack_top = stack_bottom + stack_size; - main_thread_stack_size = stack_size; + m_main_thread_stack_top = stack_bottom + stack_size; + m_main_thread_stack_size = stack_size; } // We succeeded! Commit our memory reservation. diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.h index a19d9b09d..7b7a971b8 100644 --- a/src/core/hle/kernel/k_process.h +++ b/src/core/hle/kernel/k_process.h @@ -107,66 +107,76 @@ public: /// Gets a reference to the process' page table. KPageTable& PageTable() { - return page_table; + return m_page_table; } /// Gets const a reference to the process' page table. const KPageTable& PageTable() const { - return page_table; + return m_page_table; + } + + /// Gets a reference to the process' page table. + KPageTable& GetPageTable() { + return m_page_table; + } + + /// Gets const a reference to the process' page table. + const KPageTable& GetPageTable() const { + return m_page_table; } /// Gets a reference to the process' handle table. KHandleTable& GetHandleTable() { - return handle_table; + return m_handle_table; } /// Gets a const reference to the process' handle table. const KHandleTable& GetHandleTable() const { - return handle_table; + return m_handle_table; } Result SignalToAddress(VAddr address) { - return condition_var.SignalToAddress(address); + return m_condition_var.SignalToAddress(address); } Result WaitForAddress(Handle handle, VAddr address, u32 tag) { - return condition_var.WaitForAddress(handle, address, tag); + return m_condition_var.WaitForAddress(handle, address, tag); } void SignalConditionVariable(u64 cv_key, int32_t count) { - return condition_var.Signal(cv_key, count); + return m_condition_var.Signal(cv_key, count); } Result WaitConditionVariable(VAddr address, u64 cv_key, u32 tag, s64 ns) { - R_RETURN(condition_var.Wait(address, cv_key, tag, ns)); + R_RETURN(m_condition_var.Wait(address, cv_key, tag, ns)); } Result SignalAddressArbiter(VAddr address, Svc::SignalType signal_type, s32 value, s32 count) { - R_RETURN(address_arbiter.SignalToAddress(address, signal_type, value, count)); + R_RETURN(m_address_arbiter.SignalToAddress(address, signal_type, value, count)); } Result WaitAddressArbiter(VAddr address, Svc::ArbitrationType arb_type, s32 value, s64 timeout) { - R_RETURN(address_arbiter.WaitForAddress(address, arb_type, value, timeout)); + R_RETURN(m_address_arbiter.WaitForAddress(address, arb_type, value, timeout)); } VAddr GetProcessLocalRegionAddress() const { - return plr_address; + return m_plr_address; } /// Gets the current status of the process State GetState() const { - return state; + return m_state; } /// Gets the unique ID that identifies this particular process. - u64 GetProcessID() const { - return process_id; + u64 GetProcessId() const { + return m_process_id; } /// Gets the program ID corresponding to this process. - u64 GetProgramID() const { - return program_id; + u64 GetProgramId() const { + return m_program_id; } /// Gets the resource limit descriptor for this process @@ -174,7 +184,7 @@ public: /// Gets the ideal CPU core ID for this process u8 GetIdealCoreId() const { - return ideal_core; + return m_ideal_core; } /// Checks if the specified thread priority is valid. @@ -184,17 +194,17 @@ public: /// Gets the bitmask of allowed cores that this process' threads can run on. u64 GetCoreMask() const { - return capabilities.GetCoreMask(); + return m_capabilities.GetCoreMask(); } /// Gets the bitmask of allowed thread priorities. u64 GetPriorityMask() const { - return capabilities.GetPriorityMask(); + return m_capabilities.GetPriorityMask(); } /// Gets the amount of secure memory to allocate for memory management. u32 GetSystemResourceSize() const { - return system_resource_size; + return m_system_resource_size; } /// Gets the amount of secure memory currently in use for memory management. @@ -214,67 +224,67 @@ public: /// Whether this process is an AArch64 or AArch32 process. bool Is64BitProcess() const { - return is_64bit_process; + return m_is_64bit_process; } - [[nodiscard]] bool IsSuspended() const { - return is_suspended; + bool IsSuspended() const { + return m_is_suspended; } void SetSuspended(bool suspended) { - is_suspended = suspended; + m_is_suspended = suspended; } /// Gets the total running time of the process instance in ticks. u64 GetCPUTimeTicks() const { - return total_process_running_time_ticks; + return m_total_process_running_time_ticks; } /// Updates the total running time, adding the given ticks to it. void UpdateCPUTimeTicks(u64 ticks) { - total_process_running_time_ticks += ticks; + m_total_process_running_time_ticks += ticks; } /// Gets the process schedule count, used for thread yielding s64 GetScheduledCount() const { - return schedule_count; + return m_schedule_count; } /// Increments the process schedule count, used for thread yielding. void IncrementScheduledCount() { - ++schedule_count; + ++m_schedule_count; } void IncrementRunningThreadCount(); void DecrementRunningThreadCount(); void SetRunningThread(s32 core, KThread* thread, u64 idle_count) { - running_threads[core] = thread; - running_thread_idle_counts[core] = idle_count; + m_running_threads[core] = thread; + m_running_thread_idle_counts[core] = idle_count; } void ClearRunningThread(KThread* thread) { - for (size_t i = 0; i < running_threads.size(); ++i) { - if (running_threads[i] == thread) { - running_threads[i] = nullptr; + for (size_t i = 0; i < m_running_threads.size(); ++i) { + if (m_running_threads[i] == thread) { + m_running_threads[i] = nullptr; } } } [[nodiscard]] KThread* GetRunningThread(s32 core) const { - return running_threads[core]; + return m_running_threads[core]; } bool ReleaseUserException(KThread* thread); [[nodiscard]] KThread* GetPinnedThread(s32 core_id) const { ASSERT(0 <= core_id && core_id < static_cast(Core::Hardware::NUM_CPU_CORES)); - return pinned_threads[core_id]; + return m_pinned_threads[core_id]; } /// Gets 8 bytes of random data for svcGetInfo RandomEntropy u64 GetRandomEntropy(std::size_t index) const { - return random_entropy.at(index); + return m_random_entropy.at(index); } /// Retrieves the total physical memory available to this process in bytes. @@ -293,7 +303,7 @@ public: /// Gets the list of all threads created with this process as their owner. std::list& GetThreadList() { - return thread_list; + return m_thread_list; } /// Registers a thread as being created under this process, @@ -345,15 +355,15 @@ public: void LoadModule(CodeSet code_set, VAddr base_addr); bool IsInitialized() const override { - return is_initialized; + return m_is_initialized; } - static void PostDestroy([[maybe_unused]] uintptr_t arg) {} + static void PostDestroy(uintptr_t arg) {} void Finalize() override; u64 GetId() const override { - return GetProcessID(); + return GetProcessId(); } bool IsSignaled() const override; @@ -367,7 +377,7 @@ public: void UnpinThread(KThread* thread); KLightLock& GetStateLock() { - return state_lock; + return m_state_lock; } Result AddSharedMemory(KSharedMemory* shmem, VAddr address, size_t size); @@ -392,7 +402,7 @@ public: bool RemoveWatchpoint(Core::System& system, VAddr addr, u64 size, DebugWatchpointType type); const std::array& GetWatchpoints() const { - return watchpoints; + return m_watchpoints; } const std::string& GetName() { @@ -403,23 +413,23 @@ private: void PinThread(s32 core_id, KThread* thread) { ASSERT(0 <= core_id && core_id < static_cast(Core::Hardware::NUM_CPU_CORES)); ASSERT(thread != nullptr); - ASSERT(pinned_threads[core_id] == nullptr); - pinned_threads[core_id] = thread; + ASSERT(m_pinned_threads[core_id] == nullptr); + m_pinned_threads[core_id] = thread; } void UnpinThread(s32 core_id, KThread* thread) { ASSERT(0 <= core_id && core_id < static_cast(Core::Hardware::NUM_CPU_CORES)); ASSERT(thread != nullptr); - ASSERT(pinned_threads[core_id] == thread); - pinned_threads[core_id] = nullptr; + ASSERT(m_pinned_threads[core_id] == thread); + m_pinned_threads[core_id] = nullptr; } void FinalizeHandleTable() { // Finalize the table. - handle_table.Finalize(); + m_handle_table.Finalize(); // Note that the table is finalized. - is_handle_table_initialized = false; + m_is_handle_table_initialized = false; } void ChangeState(State new_state); @@ -428,107 +438,107 @@ private: Result AllocateMainThreadStack(std::size_t stack_size); /// Memory manager for this process - KPageTable page_table; + KPageTable m_page_table; /// Current status of the process - State state{}; + State m_state{}; /// The ID of this process - u64 process_id = 0; + u64 m_process_id = 0; /// Title ID corresponding to the process - u64 program_id = 0; + u64 m_program_id = 0; /// Specifies additional memory to be reserved for the process's memory management by the /// system. When this is non-zero, secure memory is allocated and used for page table allocation /// instead of using the normal global page tables/memory block management. - u32 system_resource_size = 0; + u32 m_system_resource_size = 0; /// Resource limit descriptor for this process - KResourceLimit* resource_limit{}; + KResourceLimit* m_resource_limit{}; - VAddr system_resource_address{}; + VAddr m_system_resource_address{}; /// The ideal CPU core for this process, threads are scheduled on this core by default. - u8 ideal_core = 0; + u8 m_ideal_core = 0; /// Contains the parsed process capability descriptors. - ProcessCapabilities capabilities; + ProcessCapabilities m_capabilities; /// Whether or not this process is AArch64, or AArch32. /// By default, we currently assume this is true, unless otherwise /// specified by metadata provided to the process during loading. - bool is_64bit_process = true; + bool m_is_64bit_process = true; /// Total running time for the process in ticks. - std::atomic total_process_running_time_ticks = 0; + std::atomic m_total_process_running_time_ticks = 0; /// Per-process handle table for storing created object handles in. - KHandleTable handle_table; + KHandleTable m_handle_table; /// Per-process address arbiter. - KAddressArbiter address_arbiter; + KAddressArbiter m_address_arbiter; /// The per-process mutex lock instance used for handling various /// forms of services, such as lock arbitration, and condition /// variable related facilities. - KConditionVariable condition_var; + KConditionVariable m_condition_var; /// Address indicating the location of the process' dedicated TLS region. - VAddr plr_address = 0; + VAddr m_plr_address = 0; /// Random values for svcGetInfo RandomEntropy - std::array random_entropy{}; + std::array m_random_entropy{}; /// List of threads that are running with this process as their owner. - std::list thread_list; + std::list m_thread_list; /// List of shared memory that are running with this process as their owner. - std::list shared_memory_list; + std::list m_shared_memory_list; /// Address of the top of the main thread's stack - VAddr main_thread_stack_top{}; + VAddr m_main_thread_stack_top{}; /// Size of the main thread's stack - std::size_t main_thread_stack_size{}; + std::size_t m_main_thread_stack_size{}; /// Memory usage capacity for the process - std::size_t memory_usage_capacity{}; + std::size_t m_memory_usage_capacity{}; /// Process total image size - std::size_t image_size{}; + std::size_t m_image_size{}; /// Schedule count of this process - s64 schedule_count{}; + s64 m_schedule_count{}; - size_t memory_release_hint{}; + size_t m_memory_release_hint{}; std::string name{}; - bool is_signaled{}; - bool is_suspended{}; - bool is_immortal{}; - bool is_handle_table_initialized{}; - bool is_initialized{}; + bool m_is_signaled{}; + bool m_is_suspended{}; + bool m_is_immortal{}; + bool m_is_handle_table_initialized{}; + bool m_is_initialized{}; - std::atomic num_running_threads{}; + std::atomic m_num_running_threads{}; - std::array running_threads{}; - std::array running_thread_idle_counts{}; - std::array pinned_threads{}; - std::array watchpoints{}; - std::map debug_page_refcounts; + std::array m_running_threads{}; + std::array m_running_thread_idle_counts{}; + std::array m_pinned_threads{}; + std::array m_watchpoints{}; + std::map m_debug_page_refcounts; - KThread* exception_thread{}; + KThread* m_exception_thread{}; - KLightLock state_lock; - KLightLock list_lock; + KLightLock m_state_lock; + KLightLock m_list_lock; using TLPTree = Common::IntrusiveRedBlackTreeBaseTraits::TreeType; using TLPIterator = TLPTree::iterator; - TLPTree fully_used_tlp_tree; - TLPTree partially_used_tlp_tree; + TLPTree m_fully_used_tlp_tree; + TLPTree m_partially_used_tlp_tree; }; } // namespace Kernel diff --git a/src/core/hle/kernel/svc/svc_info.cpp b/src/core/hle/kernel/svc/svc_info.cpp index 7d94347c5..04b6d6964 100644 --- a/src/core/hle/kernel/svc/svc_info.cpp +++ b/src/core/hle/kernel/svc/svc_info.cpp @@ -103,7 +103,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle R_SUCCEED(); case InfoType::ProgramId: - *result = process->GetProgramID(); + *result = process->GetProgramId(); R_SUCCEED(); case InfoType::UserExceptionContextAddress: diff --git a/src/core/hle/kernel/svc/svc_process.cpp b/src/core/hle/kernel/svc/svc_process.cpp index e4149fba9..b538c37e7 100644 --- a/src/core/hle/kernel/svc/svc_process.cpp +++ b/src/core/hle/kernel/svc/svc_process.cpp @@ -11,7 +11,7 @@ namespace Kernel::Svc { void ExitProcess(Core::System& system) { auto* current_process = GetCurrentProcessPointer(system.Kernel()); - LOG_INFO(Kernel_SVC, "Process {} exiting", current_process->GetProcessID()); + LOG_INFO(Kernel_SVC, "Process {} exiting", current_process->GetProcessId()); ASSERT_MSG(current_process->GetState() == KProcess::State::Running, "Process has already exited"); @@ -80,7 +80,7 @@ Result GetProcessList(Core::System& system, s32* out_num_processes, VAddr out_pr std::min(static_cast(out_process_ids_size), num_processes); for (std::size_t i = 0; i < copy_amount; ++i) { - memory.Write64(out_process_ids, process_list[i]->GetProcessID()); + memory.Write64(out_process_ids, process_list[i]->GetProcessId()); out_process_ids += sizeof(u64); } diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index f17df5124..deeca925d 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -79,7 +79,7 @@ IWindowController::IWindowController(Core::System& system_) IWindowController::~IWindowController() = default; void IWindowController::GetAppletResourceUserId(HLERequestContext& ctx) { - const u64 process_id = system.ApplicationProcess()->GetProcessID(); + const u64 process_id = system.ApplicationProcess()->GetProcessId(); LOG_DEBUG(Service_AM, "called. Process ID=0x{:016X}", process_id); diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp index 929dcca0d..ed6fcb5f6 100644 --- a/src/core/hle/service/glue/arp.cpp +++ b/src/core/hle/service/glue/arp.cpp @@ -18,14 +18,14 @@ namespace { std::optional GetTitleIDForProcessID(const Core::System& system, u64 process_id) { const auto& list = system.Kernel().GetProcessList(); const auto iter = std::find_if(list.begin(), list.end(), [&process_id](const auto& process) { - return process->GetProcessID() == process_id; + return process->GetProcessId() == process_id; }); if (iter == list.end()) { return std::nullopt; } - return (*iter)->GetProgramID(); + return (*iter)->GetProgramId(); } } // Anonymous namespace diff --git a/src/core/hle/service/pm/pm.cpp b/src/core/hle/service/pm/pm.cpp index ea249c26f..f9cf2dda3 100644 --- a/src/core/hle/service/pm/pm.cpp +++ b/src/core/hle/service/pm/pm.cpp @@ -37,12 +37,12 @@ std::optional SearchProcessList( void GetApplicationPidGeneric(HLERequestContext& ctx, const std::vector& process_list) { const auto process = SearchProcessList(process_list, [](const auto& proc) { - return proc->GetProcessID() == Kernel::KProcess::ProcessIDMin; + return proc->GetProcessId() == Kernel::KProcess::ProcessIDMin; }); IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); - rb.Push(process.has_value() ? (*process)->GetProcessID() : NO_PROCESS_FOUND_PID); + rb.Push(process.has_value() ? (*process)->GetProcessId() : NO_PROCESS_FOUND_PID); } } // Anonymous namespace @@ -108,7 +108,7 @@ private: const auto process = SearchProcessList(kernel.GetProcessList(), [program_id](const auto& proc) { - return proc->GetProgramID() == program_id; + return proc->GetProgramId() == program_id; }); if (!process.has_value()) { @@ -119,7 +119,7 @@ private: IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); - rb.Push((*process)->GetProcessID()); + rb.Push((*process)->GetProcessId()); } void GetApplicationProcessId(HLERequestContext& ctx) { @@ -136,7 +136,7 @@ private: LOG_WARNING(Service_PM, "(Partial Implementation) called, pid={:016X}", pid); const auto process = SearchProcessList(kernel.GetProcessList(), [pid](const auto& proc) { - return proc->GetProcessID() == pid; + return proc->GetProcessId() == pid; }); if (!process.has_value()) { @@ -159,7 +159,7 @@ private: OverrideStatus override_status{}; ProgramLocation program_location{ - .program_id = (*process)->GetProgramID(), + .program_id = (*process)->GetProgramId(), .storage_id = 0, }; @@ -194,7 +194,7 @@ private: LOG_DEBUG(Service_PM, "called, process_id={:016X}", process_id); const auto process = SearchProcessList(process_list, [process_id](const auto& proc) { - return proc->GetProcessID() == process_id; + return proc->GetProcessId() == process_id; }); if (!process.has_value()) { @@ -205,7 +205,7 @@ private: IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); - rb.Push((*process)->GetProgramID()); + rb.Push((*process)->GetProgramId()); } void AtmosphereGetProcessId(HLERequestContext& ctx) { @@ -215,7 +215,7 @@ private: LOG_DEBUG(Service_PM, "called, program_id={:016X}", program_id); const auto process = SearchProcessList(process_list, [program_id](const auto& proc) { - return proc->GetProgramID() == program_id; + return proc->GetProgramId() == program_id; }); if (!process.has_value()) { @@ -226,7 +226,7 @@ private: IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); - rb.Push((*process)->GetProcessID()); + rb.Push((*process)->GetProcessId()); } const std::vector& process_list; diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp index c2d96bbec..de729955f 100644 --- a/src/core/memory/cheat_engine.cpp +++ b/src/core/memory/cheat_engine.cpp @@ -196,7 +196,7 @@ void CheatEngine::Initialize() { }); core_timing.ScheduleLoopingEvent(CHEAT_ENGINE_NS, CHEAT_ENGINE_NS, event); - metadata.process_id = system.ApplicationProcess()->GetProcessID(); + metadata.process_id = system.ApplicationProcess()->GetProcessId(); metadata.title_id = system.GetApplicationProcessProgramID(); const auto& page_table = system.ApplicationProcess()->PageTable(); From 088c434d6551dcb9d37a2511950226fa3a2c4b66 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 7 Mar 2023 16:49:26 -0500 Subject: [PATCH 0180/1181] kernel: remove unnecessary finalize calls --- src/core/hle/kernel/k_shared_memory.cpp | 3 --- src/core/hle/kernel/k_transfer_memory.cpp | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/core/hle/kernel/k_shared_memory.cpp b/src/core/hle/kernel/k_shared_memory.cpp index 950365d14..954e5befe 100644 --- a/src/core/hle/kernel/k_shared_memory.cpp +++ b/src/core/hle/kernel/k_shared_memory.cpp @@ -74,9 +74,6 @@ void KSharedMemory::Finalize() { // Release the memory reservation. m_resource_limit->Release(LimitableResource::PhysicalMemoryMax, m_size); m_resource_limit->Close(); - - // Perform inherited finalization. - KAutoObjectWithSlabHeapAndContainer::Finalize(); } Result KSharedMemory::Map(KProcess& target_process, VAddr address, std::size_t map_size, diff --git a/src/core/hle/kernel/k_transfer_memory.cpp b/src/core/hle/kernel/k_transfer_memory.cpp index ceec364af..471349282 100644 --- a/src/core/hle/kernel/k_transfer_memory.cpp +++ b/src/core/hle/kernel/k_transfer_memory.cpp @@ -30,10 +30,7 @@ Result KTransferMemory::Initialize(VAddr address, std::size_t size, R_SUCCEED(); } -void KTransferMemory::Finalize() { - // Perform inherited finalization. - KAutoObjectWithSlabHeapAndContainer::Finalize(); -} +void KTransferMemory::Finalize() {} void KTransferMemory::PostDestroy(uintptr_t arg) { KProcess* owner = reinterpret_cast(arg); From 9775a73d1a83237b584ac2bf49fb2eb9985dee5f Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 10 Mar 2023 17:04:50 -0500 Subject: [PATCH 0181/1181] kernel: fix clang build --- src/core/hle/kernel/kernel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index f35fa95b5..98ecaf12f 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -386,10 +386,10 @@ struct KernelCore::Impl { // Gets the dummy KThread for the caller, allocating a new one if this is the first time KThread* GetHostDummyThread(KThread* existing_thread) { - auto initialize = [this](KThread* thread) { + const auto initialize{[](KThread* thread) { ASSERT(KThread::InitializeDummyThread(thread, nullptr).IsSuccess()); return thread; - }; + }}; thread_local KThread raw_thread{system.Kernel()}; thread_local KThread* thread = existing_thread ? existing_thread : initialize(&raw_thread); From c352381ce9196765f7df2b3ff4f6ea1f349781fb Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 11 Mar 2023 10:38:33 -0500 Subject: [PATCH 0182/1181] kernel: additional style fixes to KThread, KProcess --- src/core/hle/kernel/k_process.cpp | 20 +++++++++--------- src/core/hle/kernel/k_thread.cpp | 34 +++++++++++++++---------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp index 46ac3833e..9d18f4049 100644 --- a/src/core/hle/kernel/k_process.cpp +++ b/src/core/hle/kernel/k_process.cpp @@ -137,16 +137,16 @@ u64 KProcess::GetTotalPhysicalMemoryAvailable() { } u64 KProcess::GetTotalPhysicalMemoryAvailableWithoutSystemResource() { - return GetTotalPhysicalMemoryAvailable() - GetSystemResourceSize(); + return this->GetTotalPhysicalMemoryAvailable() - this->GetSystemResourceSize(); } u64 KProcess::GetTotalPhysicalMemoryUsed() { return m_image_size + m_main_thread_stack_size + m_page_table.GetNormalMemorySize() + - GetSystemResourceSize(); + this->GetSystemResourceSize(); } u64 KProcess::GetTotalPhysicalMemoryUsedWithoutSystemResource() { - return GetTotalPhysicalMemoryUsed() - GetSystemResourceUsage(); + return this->GetTotalPhysicalMemoryUsed() - this->GetSystemResourceUsage(); } bool KProcess::ReleaseUserException(KThread* thread) { @@ -182,7 +182,7 @@ void KProcess::PinCurrentThread(s32 core_id) { // If the thread isn't terminated, pin it. if (!cur_thread->IsTerminationRequested()) { // Pin it. - PinThread(core_id, cur_thread); + this->PinThread(core_id, cur_thread); cur_thread->Pin(core_id); // An update is needed. @@ -199,7 +199,7 @@ void KProcess::UnpinCurrentThread(s32 core_id) { // Unpin it. cur_thread->Unpin(); - UnpinThread(core_id, cur_thread); + this->UnpinThread(core_id, cur_thread); // An update is needed. KScheduler::SetSchedulerUpdateNeeded(m_kernel); @@ -212,7 +212,7 @@ void KProcess::UnpinThread(KThread* thread) { const auto core_id = thread->GetActiveCore(); // Unpin it. - UnpinThread(core_id, thread); + this->UnpinThread(core_id, thread); thread->Unpin(); // An update is needed. @@ -330,7 +330,7 @@ Result KProcess::SetActivity(ProcessActivity activity) { } // Set ourselves as suspended. - SetSuspended(true); + this->SetSuspended(true); } else { ASSERT(activity == ProcessActivity::Runnable); @@ -343,7 +343,7 @@ Result KProcess::SetActivity(ProcessActivity activity) { } // Set ourselves as resumed. - SetSuspended(false); + this->SetSuspended(false); } R_SUCCEED(); @@ -457,7 +457,7 @@ void KProcess::PrepareForTermination() { m_main_thread_stack_size + m_image_size); } - ChangeState(State::Terminated); + this->ChangeState(State::Terminated); } void KProcess::Finalize() { @@ -489,7 +489,7 @@ void KProcess::Finalize() { m_page_table.Finalize(); // Perform inherited finalization. - KAutoObjectWithSlabHeapAndContainer::Finalize(); + KSynchronizationObject::Finalize(); } Result KProcess::CreateThreadLocalRegion(VAddr* out) { diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index 2eee85258..c0e3ecb45 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -206,7 +206,7 @@ Result KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack m_argument = arg; // Clear our stack parameters. - std::memset(static_cast(std::addressof(GetStackParameters())), 0, + std::memset(static_cast(std::addressof(this->GetStackParameters())), 0, sizeof(StackParameters)); // Set parent, if relevant. @@ -774,13 +774,13 @@ void KThread::WaitCancel() { void KThread::TrySuspend() { ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); - ASSERT(IsSuspendRequested()); + ASSERT(this->IsSuspendRequested()); // Ensure that we have no waiters. - if (GetNumKernelWaiters() > 0) { + if (this->GetNumKernelWaiters() > 0) { return; } - ASSERT(GetNumKernelWaiters() == 0); + ASSERT(this->GetNumKernelWaiters() == 0); // Perform the suspend. this->UpdateState(); @@ -916,7 +916,7 @@ Result KThread::GetThreadContext3(std::vector& out) { KScopedSchedulerLock sl{m_kernel}; // Verify that we're suspended. - R_UNLESS(IsSuspendRequested(SuspendType::Thread), ResultInvalidState); + R_UNLESS(this->IsSuspendRequested(SuspendType::Thread), ResultInvalidState); // If we're not terminating, get the thread's user context. if (!this->IsTerminationRequested()) { @@ -951,14 +951,14 @@ void KThread::AddHeldLock(LockWithPriorityInheritanceInfo* lock_info) { m_held_lock_info_list.push_front(*lock_info); } -KThread::LockWithPriorityInheritanceInfo* KThread::FindHeldLock(VAddr address_key_, - bool is_kernel_address_key_) { +KThread::LockWithPriorityInheritanceInfo* KThread::FindHeldLock(VAddr address_key, + bool is_kernel_address_key) { ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Try to find an existing held lock. for (auto& held_lock : m_held_lock_info_list) { - if (held_lock.GetAddressKey() == address_key_ && - held_lock.GetIsKernelAddressKey() == is_kernel_address_key_) { + if (held_lock.GetAddressKey() == address_key && + held_lock.GetIsKernelAddressKey() == is_kernel_address_key) { return std::addressof(held_lock); } } @@ -1166,7 +1166,7 @@ Result KThread::Run() { // If we're not a kernel thread and we've been asked to suspend, suspend ourselves. if (KProcess* owner = this->GetOwnerProcess(); owner != nullptr) { - if (IsUserThread() && IsSuspended()) { + if (this->IsUserThread() && this->IsSuspended()) { this->UpdateState(); } owner->IncrementRunningThreadCount(); @@ -1201,7 +1201,7 @@ void KThread::Exit() { m_suspend_allowed_flags = 0; // Start termination. - StartTermination(); + this->StartTermination(); // Register the thread as a work task. KWorkerTaskManager::AddTask(m_kernel, KWorkerTaskManager::WorkerType::Exit, this); @@ -1285,7 +1285,7 @@ Result KThread::Sleep(s64 timeout) { ASSERT(this == GetCurrentThreadPointer(m_kernel)); ASSERT(timeout > 0); - ThreadQueueImplForKThreadSleep wait_queue_(m_kernel); + ThreadQueueImplForKThreadSleep wait_queue(m_kernel); KHardwareTimer* timer{}; { // Setup the scheduling lock and sleep. @@ -1298,9 +1298,9 @@ Result KThread::Sleep(s64 timeout) { } // Wait for the sleep to end. - wait_queue_.SetHardwareTimer(timer); - this->BeginWait(std::addressof(wait_queue_)); - SetWaitReasonForDebugging(ThreadWaitReasonForDebugging::Sleep); + wait_queue.SetHardwareTimer(timer); + this->BeginWait(std::addressof(wait_queue)); + this->SetWaitReasonForDebugging(ThreadWaitReasonForDebugging::Sleep); } R_SUCCEED(); @@ -1335,7 +1335,7 @@ void KThread::DummyThreadEndWait() { void KThread::BeginWait(KThreadQueue* queue) { // Set our state as waiting. - SetState(ThreadState::Waiting); + this->SetState(ThreadState::Waiting); // Set our wait queue. m_wait_queue = queue; @@ -1381,7 +1381,7 @@ void KThread::SetState(ThreadState state) { KScopedSchedulerLock sl{m_kernel}; // Clear debugging state - SetWaitReasonForDebugging({}); + this->SetWaitReasonForDebugging({}); const ThreadState old_state = m_thread_state.load(std::memory_order_relaxed); m_thread_state.store( From 96b8a3ecac209b5b66e099c7f7301fc2fb956f20 Mon Sep 17 00:00:00 2001 From: german77 Date: Sat, 11 Mar 2023 12:20:55 -0600 Subject: [PATCH 0183/1181] input_common: sdl: Only send last vibration command --- src/input_common/drivers/sdl_driver.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index f7f0c7eaa..7f9e8dbb9 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp @@ -652,12 +652,27 @@ bool SDLDriver::IsVibrationEnabled(const PadIdentifier& identifier) { } void SDLDriver::SendVibrations() { + std::vector filtered_vibrations{}; while (!vibration_queue.Empty()) { VibrationRequest request; vibration_queue.Pop(request); const auto joystick = GetSDLJoystickByGUID(request.identifier.guid.RawString(), static_cast(request.identifier.port)); - joystick->RumblePlay(request.vibration); + const auto it = std::find_if(filtered_vibrations.begin(), filtered_vibrations.end(), + [request](VibrationRequest vibration) { + return vibration.identifier == request.identifier; + }); + if (it == filtered_vibrations.end()) { + filtered_vibrations.push_back(std::move(request)); + continue; + } + *it = request; + } + + for (const auto& vibration : filtered_vibrations) { + const auto joystick = GetSDLJoystickByGUID(vibration.identifier.guid.RawString(), + static_cast(vibration.identifier.port)); + joystick->RumblePlay(vibration.vibration); } } From 4c678cfbc8157e630e8ddf68f5c2687e7550a6db Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Mon, 13 Mar 2023 17:41:30 -0400 Subject: [PATCH 0184/1181] configure_audio: Fix output mode setting not saving --- src/yuzu/configuration/configure_audio.cpp | 16 ++++++++-------- src/yuzu/configuration/configure_audio.ui | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp index 4bec51260..fcd6d61a0 100644 --- a/src/yuzu/configuration/configure_audio.cpp +++ b/src/yuzu/configuration/configure_audio.cpp @@ -54,16 +54,17 @@ void ConfigureAudio::SetConfiguration() { if (Settings::values.volume.UsingGlobal()) { ui->volume_combo_box->setCurrentIndex(0); ui->volume_slider->setEnabled(false); - ui->combo_sound->setCurrentIndex(Settings::values.sound_index.GetValue()); } else { ui->volume_combo_box->setCurrentIndex(1); ui->volume_slider->setEnabled(true); - ConfigurationShared::SetPerGameSetting(ui->combo_sound, &Settings::values.sound_index); } - ConfigurationShared::SetHighlight(ui->volume_layout, - !Settings::values.volume.UsingGlobal()); + ConfigurationShared::SetPerGameSetting(ui->combo_sound, &Settings::values.sound_index); ConfigurationShared::SetHighlight(ui->mode_label, !Settings::values.sound_index.UsingGlobal()); + ConfigurationShared::SetHighlight(ui->volume_layout, + !Settings::values.volume.UsingGlobal()); + } else { + ui->combo_sound->setCurrentIndex(Settings::values.sound_index.GetValue()); } SetVolumeIndicatorText(ui->volume_slider->sliderPosition()); } @@ -182,14 +183,13 @@ void ConfigureAudio::RetranslateUI() { void ConfigureAudio::SetupPerGameUI() { if (Settings::IsConfiguringGlobal()) { + ui->combo_sound->setEnabled(Settings::values.sound_index.UsingGlobal()); ui->volume_slider->setEnabled(Settings::values.volume.UsingGlobal()); - // ui->combo_sound->setEnabled(Settings::values.sound_index.UsingGlobal()); - return; } - // ConfigurationShared::SetColoredComboBox(ui->combo_sound, ui->label_sound, - // Settings::values.sound_index.GetValue(true)); + ConfigurationShared::SetColoredComboBox(ui->combo_sound, ui->mode_label, + Settings::values.sound_index.GetValue(true)); connect(ui->volume_combo_box, qOverload(&QComboBox::activated), this, [this](int index) { ui->volume_slider->setEnabled(index == 1); diff --git a/src/yuzu/configuration/configure_audio.ui b/src/yuzu/configuration/configure_audio.ui index bcd5d8c2b..4128c83ad 100644 --- a/src/yuzu/configuration/configure_audio.ui +++ b/src/yuzu/configuration/configure_audio.ui @@ -67,7 +67,7 @@ - Sound Ouput Mode: + Sound Output Mode: From 11ffbee5ae4c2930936d5be9201e2a0c04706579 Mon Sep 17 00:00:00 2001 From: FengChen Date: Tue, 14 Mar 2023 22:36:34 +0800 Subject: [PATCH 0185/1181] video_core: Better defined ImageInfo parameters --- src/video_core/texture_cache/image_info.cpp | 71 ++++++++++---------- src/video_core/texture_cache/image_info.h | 7 +- src/video_core/texture_cache/texture_cache.h | 4 +- 3 files changed, 43 insertions(+), 39 deletions(-) diff --git a/src/video_core/texture_cache/image_info.cpp b/src/video_core/texture_cache/image_info.cpp index a1296b574..0b231887c 100644 --- a/src/video_core/texture_cache/image_info.cpp +++ b/src/video_core/texture_cache/image_info.cpp @@ -114,78 +114,79 @@ ImageInfo::ImageInfo(const TICEntry& config) noexcept { } } -ImageInfo::ImageInfo(const Maxwell3D::Regs& regs, size_t index) noexcept { - const auto& rt = regs.rt[index]; - format = VideoCore::Surface::PixelFormatFromRenderTargetFormat(rt.format); +ImageInfo::ImageInfo(const Tegra::Engines::Maxwell3D::Regs::RenderTargetConfig& ct, + Tegra::Texture::MsaaMode msaa_mode) noexcept { + format = VideoCore::Surface::PixelFormatFromRenderTargetFormat(ct.format); rescaleable = false; - if (rt.tile_mode.is_pitch_linear) { - ASSERT(rt.tile_mode.dim_control == + if (ct.tile_mode.is_pitch_linear) { + ASSERT(ct.tile_mode.dim_control == Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesArray); type = ImageType::Linear; - pitch = rt.width; + pitch = ct.width; size = Extent3D{ .width = pitch / BytesPerBlock(format), - .height = rt.height, + .height = ct.height, .depth = 1, }; return; } - size.width = rt.width; - size.height = rt.height; - layer_stride = rt.array_pitch * 4; + size.width = ct.width; + size.height = ct.height; + layer_stride = ct.array_pitch * 4; maybe_unaligned_layer_stride = layer_stride; - num_samples = NumSamples(regs.anti_alias_samples_mode); + num_samples = NumSamples(msaa_mode); block = Extent3D{ - .width = rt.tile_mode.block_width, - .height = rt.tile_mode.block_height, - .depth = rt.tile_mode.block_depth, + .width = ct.tile_mode.block_width, + .height = ct.tile_mode.block_height, + .depth = ct.tile_mode.block_depth, }; - if (rt.tile_mode.dim_control == + if (ct.tile_mode.dim_control == Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesDepth) { type = ImageType::e3D; - size.depth = rt.depth; + size.depth = ct.depth; } else { rescaleable = block.depth == 0; rescaleable &= size.height > 256; downscaleable = size.height > 512; type = ImageType::e2D; - resources.layers = rt.depth; + resources.layers = ct.depth; } } -ImageInfo::ImageInfo(const Tegra::Engines::Maxwell3D::Regs& regs) noexcept { - format = VideoCore::Surface::PixelFormatFromDepthFormat(regs.zeta.format); - size.width = regs.zeta_size.width; - size.height = regs.zeta_size.height; +ImageInfo::ImageInfo(const Tegra::Engines::Maxwell3D::Regs::Zeta& zt, + const Tegra::Engines::Maxwell3D::Regs::ZetaSize& zt_size, + Tegra::Texture::MsaaMode msaa_mode) noexcept { + format = VideoCore::Surface::PixelFormatFromDepthFormat(zt.format); + size.width = zt_size.width; + size.height = zt_size.height; rescaleable = false; resources.levels = 1; - layer_stride = regs.zeta.array_pitch * 4; + layer_stride = zt.array_pitch * 4; maybe_unaligned_layer_stride = layer_stride; - num_samples = NumSamples(regs.anti_alias_samples_mode); + num_samples = NumSamples(msaa_mode); block = Extent3D{ - .width = regs.zeta.tile_mode.block_width, - .height = regs.zeta.tile_mode.block_height, - .depth = regs.zeta.tile_mode.block_depth, + .width = zt.tile_mode.block_width, + .height = zt.tile_mode.block_height, + .depth = zt.tile_mode.block_depth, }; - if (regs.zeta.tile_mode.is_pitch_linear) { - ASSERT(regs.zeta.tile_mode.dim_control == + if (zt.tile_mode.is_pitch_linear) { + ASSERT(zt.tile_mode.dim_control == Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesArray); type = ImageType::Linear; pitch = size.width * BytesPerBlock(format); - } else if (regs.zeta.tile_mode.dim_control == + } else if (zt.tile_mode.dim_control == Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesDepth) { - ASSERT(regs.zeta.tile_mode.is_pitch_linear == 0); - ASSERT(regs.zeta_size.dim_control == - Maxwell3D::Regs::ZetaSize::DimensionControl::ArraySizeOne); + ASSERT(zt.tile_mode.is_pitch_linear == 0); + ASSERT(zt_size.dim_control == Maxwell3D::Regs::ZetaSize::DimensionControl::ArraySizeOne); type = ImageType::e3D; - size.depth = regs.zeta_size.depth; + size.depth = zt_size.depth; } else { - ASSERT(regs.zeta_size.dim_control == + ASSERT(zt_size.dim_control == Maxwell3D::Regs::ZetaSize::DimensionControl::DepthDefinesArray); rescaleable = block.depth == 0; downscaleable = size.height > 512; type = ImageType::e2D; - resources.layers = regs.zeta_size.depth; + resources.layers = zt_size.depth; } } diff --git a/src/video_core/texture_cache/image_info.h b/src/video_core/texture_cache/image_info.h index a12f5b44f..4b7dfa315 100644 --- a/src/video_core/texture_cache/image_info.h +++ b/src/video_core/texture_cache/image_info.h @@ -17,8 +17,11 @@ using VideoCore::Surface::PixelFormat; struct ImageInfo { ImageInfo() = default; explicit ImageInfo(const TICEntry& config) noexcept; - explicit ImageInfo(const Tegra::Engines::Maxwell3D::Regs& regs, size_t index) noexcept; - explicit ImageInfo(const Tegra::Engines::Maxwell3D::Regs& regs) noexcept; + explicit ImageInfo(const Tegra::Engines::Maxwell3D::Regs::RenderTargetConfig& ct, + Tegra::Texture::MsaaMode msaa_mode) noexcept; + explicit ImageInfo(const Tegra::Engines::Maxwell3D::Regs::Zeta& zt, + const Tegra::Engines::Maxwell3D::Regs::ZetaSize& zt_size, + Tegra::Texture::MsaaMode msaa_mode) noexcept; explicit ImageInfo(const Tegra::Engines::Fermi2D::Surface& config) noexcept; explicit ImageInfo(const Tegra::DMA::ImageOperand& config) noexcept; diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 8e8b9a5e6..c09eecd1a 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1503,7 +1503,7 @@ ImageViewId TextureCache

::FindColorBuffer(size_t index, bool is_clear) { if (rt.format == Tegra::RenderTargetFormat::NONE) { return ImageViewId{}; } - const ImageInfo info(regs, index); + const ImageInfo info(regs.rt[index], regs.anti_alias_samples_mode); return FindRenderTargetView(info, gpu_addr, is_clear); } @@ -1517,7 +1517,7 @@ ImageViewId TextureCache

::FindDepthBuffer(bool is_clear) { if (gpu_addr == 0) { return ImageViewId{}; } - const ImageInfo info(regs); + const ImageInfo info(regs.zeta, regs.zeta_size, regs.anti_alias_samples_mode); return FindRenderTargetView(info, gpu_addr, is_clear); } From 026fe2e4f4128f4c81a07e25cb646620f7643a75 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Tue, 14 Mar 2023 22:00:38 -0600 Subject: [PATCH 0186/1181] service: nfp: Actually write correct crc --- src/core/hle/service/mii/mii_manager.cpp | 2 + src/core/hle/service/mii/types.h | 3 +- src/core/hle/service/nfp/amiibo_crypto.cpp | 4 +- src/core/hle/service/nfp/nfp_device.cpp | 53 ++++++++++++++-------- src/core/hle/service/nfp/nfp_device.h | 1 + src/core/hle/service/nfp/nfp_types.h | 4 +- 6 files changed, 44 insertions(+), 23 deletions(-) diff --git a/src/core/hle/service/mii/mii_manager.cpp b/src/core/hle/service/mii/mii_manager.cpp index 3a2fe938f..9d31a080c 100644 --- a/src/core/hle/service/mii/mii_manager.cpp +++ b/src/core/hle/service/mii/mii_manager.cpp @@ -585,6 +585,8 @@ Ver3StoreData MiiManager::ConvertCharInfoToV3(const CharInfo& mii) const { mii_v3.appearance_bits11.mole_x_position.Assign(mii.mole_x); mii_v3.appearance_bits11.mole_y_position.Assign(mii.mole_y); + mii_v3.crc = GenerateCrc16(&mii_v3, sizeof(Ver3StoreData) - sizeof(u16)); + // TODO: Validate mii_v3 data return mii_v3; diff --git a/src/core/hle/service/mii/types.h b/src/core/hle/service/mii/types.h index 9e3247397..1f53e6af3 100644 --- a/src/core/hle/service/mii/types.h +++ b/src/core/hle/service/mii/types.h @@ -365,7 +365,8 @@ struct Ver3StoreData { } appearance_bits11; std::array author_name; - INSERT_PADDING_BYTES(0x4); + INSERT_PADDING_BYTES(0x2); + u16_be crc; }; static_assert(sizeof(Ver3StoreData) == 0x60, "Ver3StoreData is an invalid size"); diff --git a/src/core/hle/service/nfp/amiibo_crypto.cpp b/src/core/hle/service/nfp/amiibo_crypto.cpp index ad73edbda..66773d26c 100644 --- a/src/core/hle/service/nfp/amiibo_crypto.cpp +++ b/src/core/hle/service/nfp/amiibo_crypto.cpp @@ -89,7 +89,7 @@ NTAG215File NfcDataToEncodedData(const EncryptedNTAG215File& nfc_data) { encoded_data.application_id_byte = nfc_data.user_memory.application_id_byte; encoded_data.unknown = nfc_data.user_memory.unknown; encoded_data.unknown2 = nfc_data.user_memory.unknown2; - encoded_data.application_area_crc = nfc_data.user_memory.application_area_crc; + encoded_data.register_info_crc = nfc_data.user_memory.register_info_crc; encoded_data.application_area = nfc_data.user_memory.application_area; encoded_data.hmac_tag = nfc_data.user_memory.hmac_tag; encoded_data.lock_bytes = nfc_data.uuid.lock_bytes; @@ -123,7 +123,7 @@ EncryptedNTAG215File EncodedDataToNfcData(const NTAG215File& encoded_data) { nfc_data.user_memory.application_id_byte = encoded_data.application_id_byte; nfc_data.user_memory.unknown = encoded_data.unknown; nfc_data.user_memory.unknown2 = encoded_data.unknown2; - nfc_data.user_memory.application_area_crc = encoded_data.application_area_crc; + nfc_data.user_memory.register_info_crc = encoded_data.register_info_crc; nfc_data.user_memory.application_area = encoded_data.application_area; nfc_data.user_memory.hmac_tag = encoded_data.hmac_tag; nfc_data.user_memory.model_info = encoded_data.model_info; diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfp/nfp_device.cpp index ddff90d6a..53bc56814 100644 --- a/src/core/hle/service/nfp/nfp_device.cpp +++ b/src/core/hle/service/nfp/nfp_device.cpp @@ -448,7 +448,7 @@ Result NfpDevice::DeleteRegisterInfo() { rng.GenerateRandomBytes(&tag_data.unknown, sizeof(u8)); rng.GenerateRandomBytes(&tag_data.unknown2[0], sizeof(u32)); rng.GenerateRandomBytes(&tag_data.unknown2[1], sizeof(u32)); - rng.GenerateRandomBytes(&tag_data.application_area_crc, sizeof(u32)); + rng.GenerateRandomBytes(&tag_data.register_info_crc, sizeof(u32)); rng.GenerateRandomBytes(&tag_data.settings.init_date, sizeof(u32)); tag_data.settings.settings.font_region.Assign(0); tag_data.settings.settings.amiibo_initialized.Assign(0); @@ -486,9 +486,7 @@ Result NfpDevice::SetRegisterInfoPrivate(const AmiiboName& amiibo_name) { settings.settings.font_region.Assign(0); settings.settings.amiibo_initialized.Assign(1); - // TODO: this is a mix of tag.file input - std::array unknown_input{}; - tag_data.application_area_crc = CalculateCrc(unknown_input); + UpdateRegisterInfoCrc(); return Flush(); } @@ -716,9 +714,7 @@ Result NfpDevice::RecreateApplicationArea(u32 access_id, std::span dat tag_data.application_area_id = access_id; tag_data.unknown = {}; - // TODO: this is a mix of tag_data input - std::array unknown_input{}; - tag_data.application_area_crc = CalculateCrc(unknown_input); + UpdateRegisterInfoCrc(); return Flush(); } @@ -838,6 +834,29 @@ void NfpDevice::UpdateSettingsCrc() { settings.crc = CalculateCrc(unknown_input); } +void NfpDevice::UpdateRegisterInfoCrc() { +#pragma pack(push, 1) + struct CrcData { + Mii::Ver3StoreData mii; + u8 application_id_byte; + u8 unknown; + std::array unknown2; + }; + static_assert(sizeof(CrcData) == 0x7e, "CrcData is an invalid size"); +#pragma pack(pop) + + const CrcData crc_data{ + .mii = tag_data.owner_mii, + .application_id_byte = tag_data.application_id_byte, + .unknown = tag_data.unknown, + .unknown2 = tag_data.unknown2, + }; + + std::array data{}; + memcpy(data.data(), &crc_data, sizeof(CrcData)); + tag_data.register_info_crc = CalculateCrc(data); +} + u32 NfpDevice::CalculateCrc(std::span data) { constexpr u32 magic = 0xedb88320; u32 crc = 0xffffffff; @@ -847,17 +866,15 @@ u32 NfpDevice::CalculateCrc(std::span data) { } for (u8 input : data) { - u32 temp = (crc ^ input) >> 1; - if (((crc ^ input) & 1) != 0) { - temp = temp ^ magic; - } - - for (std::size_t step = 0; step < 7; ++step) { - crc = temp >> 1; - if ((temp & 1) != 0) { - crc = temp >> 1 ^ magic; - } - } + crc ^= input; + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); + crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); } return ~crc; diff --git a/src/core/hle/service/nfp/nfp_device.h b/src/core/hle/service/nfp/nfp_device.h index 06386401d..fc7fbd578 100644 --- a/src/core/hle/service/nfp/nfp_device.h +++ b/src/core/hle/service/nfp/nfp_device.h @@ -80,6 +80,7 @@ private: AmiiboDate GetAmiiboDate(s64 posix_time) const; u64 RemoveVersionByte(u64 application_id) const; void UpdateSettingsCrc(); + void UpdateRegisterInfoCrc(); u32 CalculateCrc(std::span); bool is_controller_set{}; diff --git a/src/core/hle/service/nfp/nfp_types.h b/src/core/hle/service/nfp/nfp_types.h index 142343d6e..5f4a5d7f9 100644 --- a/src/core/hle/service/nfp/nfp_types.h +++ b/src/core/hle/service/nfp/nfp_types.h @@ -260,7 +260,7 @@ struct EncryptedAmiiboFile { u8 application_id_byte; u8 unknown; std::array unknown2; - u32_be application_area_crc; + u32_be register_info_crc; ApplicationArea application_area; // Encrypted Game data }; static_assert(sizeof(EncryptedAmiiboFile) == 0x1F8, "AmiiboFile is an invalid size"); @@ -281,7 +281,7 @@ struct NTAG215File { u8 application_id_byte; u8 unknown; std::array unknown2; - u32_be application_area_crc; + u32_be register_info_crc; ApplicationArea application_area; // Encrypted Game data HashData hmac_tag; // Hash UniqueSerialNumber uid; // Unique serial number From da83afdeaf360e5a4ecdfafcab3f209ebf7038f1 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 15 Mar 2023 15:55:07 -0400 Subject: [PATCH 0187/1181] vulkan: disable extendedDynamicState3ColorBlendEquation on radv --- src/video_core/vulkan_common/vulkan_device.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index df348af55..6f288b3f8 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -401,6 +401,12 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR loaded_extensions.erase(VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME); } } + if (extensions.extended_dynamic_state3 && is_radv) { + LOG_WARNING(Render_Vulkan, "RADV has broken extendedDynamicState3ColorBlendEquation"); + features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = false; + features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation = false; + dynamic_state3_blending = false; + } if (extensions.vertex_input_dynamic_state && is_radv) { // TODO(ameerj): Blacklist only offending driver versions // TODO(ameerj): Confirm if RDNA1 is affected From 5031f5b8b07dcabf727cf5530f2e00c396de7ea0 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Wed, 15 Mar 2023 01:39:11 -0600 Subject: [PATCH 0188/1181] service: nfp: Convert mii colors to v3 --- src/core/hle/service/mii/mii_manager.cpp | 33 +++++++++---- src/core/hle/service/mii/mii_manager.h | 7 ++- src/core/hle/service/mii/types.h | 57 ++++++++++++++++++++++ src/core/hle/service/nfp/amiibo_crypto.cpp | 2 + src/core/hle/service/nfp/nfp_device.cpp | 10 ++-- src/core/hle/service/nfp/nfp_types.h | 6 ++- 6 files changed, 100 insertions(+), 15 deletions(-) diff --git a/src/core/hle/service/mii/mii_manager.cpp b/src/core/hle/service/mii/mii_manager.cpp index 9d31a080c..c920650f5 100644 --- a/src/core/hle/service/mii/mii_manager.cpp +++ b/src/core/hle/service/mii/mii_manager.cpp @@ -510,7 +510,7 @@ CharInfo MiiManager::ConvertV3ToCharInfo(const Ver3StoreData& mii_v3) const { return mii; } -Ver3StoreData MiiManager::ConvertCharInfoToV3(const CharInfo& mii) const { +Ver3StoreData MiiManager::BuildFromStoreData(const CharInfo& mii) const { Service::Mii::MiiManager manager; Ver3StoreData mii_v3{}; @@ -534,16 +534,13 @@ Ver3StoreData MiiManager::ConvertCharInfoToV3(const CharInfo& mii) const { mii_v3.region_information.character_set.Assign(mii.font_region); mii_v3.appearance_bits1.face_shape.Assign(mii.faceline_type); - mii_v3.appearance_bits1.skin_color.Assign(mii.faceline_color); mii_v3.appearance_bits2.wrinkles.Assign(mii.faceline_wrinkle); mii_v3.appearance_bits2.makeup.Assign(mii.faceline_make); mii_v3.hair_style = mii.hair_type; - mii_v3.appearance_bits3.hair_color.Assign(mii.hair_color); mii_v3.appearance_bits3.flip_hair.Assign(mii.hair_flip); mii_v3.appearance_bits4.eye_type.Assign(mii.eye_type); - mii_v3.appearance_bits4.eye_color.Assign(mii.eye_color); mii_v3.appearance_bits4.eye_scale.Assign(mii.eye_scale); mii_v3.appearance_bits4.eye_vertical_stretch.Assign(mii.eye_aspect); mii_v3.appearance_bits4.eye_rotation.Assign(mii.eye_rotate); @@ -551,7 +548,6 @@ Ver3StoreData MiiManager::ConvertCharInfoToV3(const CharInfo& mii) const { mii_v3.appearance_bits4.eye_y_position.Assign(mii.eye_y); mii_v3.appearance_bits5.eyebrow_style.Assign(mii.eyebrow_type); - mii_v3.appearance_bits5.eyebrow_color.Assign(mii.eyebrow_color); mii_v3.appearance_bits5.eyebrow_scale.Assign(mii.eyebrow_scale); mii_v3.appearance_bits5.eyebrow_yscale.Assign(mii.eyebrow_aspect); mii_v3.appearance_bits5.eyebrow_rotation.Assign(mii.eyebrow_rotate); @@ -563,7 +559,6 @@ Ver3StoreData MiiManager::ConvertCharInfoToV3(const CharInfo& mii) const { mii_v3.appearance_bits6.nose_y_position.Assign(mii.nose_y); mii_v3.appearance_bits7.mouth_type.Assign(mii.mouth_type); - mii_v3.appearance_bits7.mouth_color.Assign(mii.mouth_color); mii_v3.appearance_bits7.mouth_scale.Assign(mii.mouth_scale); mii_v3.appearance_bits7.mouth_horizontal_stretch.Assign(mii.mouth_aspect); mii_v3.appearance_bits8.mouth_y_position.Assign(mii.mouth_y); @@ -573,10 +568,7 @@ Ver3StoreData MiiManager::ConvertCharInfoToV3(const CharInfo& mii) const { mii_v3.appearance_bits9.mustache_y_position.Assign(mii.mustache_y); mii_v3.appearance_bits9.bear_type.Assign(mii.beard_type); - mii_v3.appearance_bits9.facial_hair_color.Assign(mii.beard_color); - mii_v3.appearance_bits10.glasses_type.Assign(mii.glasses_type); - mii_v3.appearance_bits10.glasses_color.Assign(mii.glasses_color); mii_v3.appearance_bits10.glasses_scale.Assign(mii.glasses_scale); mii_v3.appearance_bits10.glasses_y_position.Assign(mii.glasses_y); @@ -585,6 +577,16 @@ Ver3StoreData MiiManager::ConvertCharInfoToV3(const CharInfo& mii) const { mii_v3.appearance_bits11.mole_x_position.Assign(mii.mole_x); mii_v3.appearance_bits11.mole_y_position.Assign(mii.mole_y); + // These types are converted to V3 from a table + mii_v3.appearance_bits1.skin_color.Assign(Ver3FacelineColorTable[mii.faceline_color]); + mii_v3.appearance_bits3.hair_color.Assign(Ver3HairColorTable[mii.hair_color]); + mii_v3.appearance_bits4.eye_color.Assign(Ver3EyeColorTable[mii.eye_color]); + mii_v3.appearance_bits5.eyebrow_color.Assign(Ver3HairColorTable[mii.eyebrow_color]); + mii_v3.appearance_bits7.mouth_color.Assign(Ver3MouthlineColorTable[mii.mouth_color]); + mii_v3.appearance_bits9.facial_hair_color.Assign(Ver3HairColorTable[mii.beard_color]); + mii_v3.appearance_bits10.glasses_color.Assign(Ver3GlassColorTable[mii.glasses_color]); + mii_v3.appearance_bits10.glasses_type.Assign(Ver3GlassTypeTable[mii.glasses_type]); + mii_v3.crc = GenerateCrc16(&mii_v3, sizeof(Ver3StoreData) - sizeof(u16)); // TODO: Validate mii_v3 data @@ -592,6 +594,19 @@ Ver3StoreData MiiManager::ConvertCharInfoToV3(const CharInfo& mii) const { return mii_v3; } +NfpStoreDataExtension MiiManager::SetFromStoreData(const CharInfo& mii) const { + return { + .faceline_color = static_cast(mii.faceline_color & 0xf), + .hair_color = static_cast(mii.hair_color & 0x7f), + .eye_color = static_cast(mii.eyebrow_color & 0x7f), + .eyebrow_color = static_cast(mii.eyebrow_color & 0x7f), + .mouth_color = static_cast(mii.mouth_color & 0x7f), + .beard_color = static_cast(mii.beard_color & 0x7f), + .glass_color = static_cast(mii.glasses_color & 0x7f), + .glass_type = static_cast(mii.glasses_type & 0x1f), + }; +} + bool MiiManager::ValidateV3Info(const Ver3StoreData& mii_v3) const { bool is_valid = mii_v3.version == 0 || mii_v3.version == 3; diff --git a/src/core/hle/service/mii/mii_manager.h b/src/core/hle/service/mii/mii_manager.h index 83ad3d343..5525fcd1c 100644 --- a/src/core/hle/service/mii/mii_manager.h +++ b/src/core/hle/service/mii/mii_manager.h @@ -23,11 +23,16 @@ public: CharInfo BuildRandom(Age age, Gender gender, Race race); CharInfo BuildDefault(std::size_t index); CharInfo ConvertV3ToCharInfo(const Ver3StoreData& mii_v3) const; - Ver3StoreData ConvertCharInfoToV3(const CharInfo& mii) const; bool ValidateV3Info(const Ver3StoreData& mii_v3) const; ResultVal> GetDefault(SourceFlag source_flag); Result GetIndex(const CharInfo& info, u32& index); + // This is nn::mii::detail::Ver::StoreDataRaw::BuildFromStoreData + Ver3StoreData BuildFromStoreData(const CharInfo& mii) const; + + // This is nn::mii::detail::NfpStoreDataExtentionRaw::SetFromStoreData + NfpStoreDataExtension SetFromStoreData(const CharInfo& mii) const; + private: const Common::UUID user_id{}; u64 update_counter{}; diff --git a/src/core/hle/service/mii/types.h b/src/core/hle/service/mii/types.h index 1f53e6af3..c48d08d79 100644 --- a/src/core/hle/service/mii/types.h +++ b/src/core/hle/service/mii/types.h @@ -370,6 +370,63 @@ struct Ver3StoreData { }; static_assert(sizeof(Ver3StoreData) == 0x60, "Ver3StoreData is an invalid size"); +struct NfpStoreDataExtension { + u8 faceline_color; + u8 hair_color; + u8 eye_color; + u8 eyebrow_color; + u8 mouth_color; + u8 beard_color; + u8 glass_color; + u8 glass_type; +}; +static_assert(sizeof(NfpStoreDataExtension) == 0x8, "NfpStoreDataExtension is an invalid size"); + +constexpr std::array Ver3FacelineColorTable{ + 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x0, 0x1, 0x5, 0x5, +}; + +constexpr std::array Ver3HairColorTable{ + 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x0, 0x4, 0x3, 0x5, 0x4, 0x4, 0x6, 0x2, 0x0, + 0x6, 0x4, 0x3, 0x2, 0x2, 0x7, 0x3, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, + 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x0, 0x0, 0x4, + 0x4, 0x4, 0x4, 0x4, 0x4, 0x0, 0x0, 0x0, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x5, 0x5, 0x5, + 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x5, 0x7, 0x5, 0x7, 0x7, 0x7, 0x7, 0x7, 0x6, 0x7, + 0x7, 0x7, 0x7, 0x7, 0x3, 0x7, 0x7, 0x7, 0x7, 0x7, 0x0, 0x4, 0x4, 0x4, 0x4, +}; + +constexpr std::array Ver3EyeColorTable{ + 0x0, 0x2, 0x2, 0x2, 0x1, 0x3, 0x2, 0x3, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x2, 0x2, 0x4, + 0x2, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, + 0x2, 0x2, 0x2, 0x2, 0x0, 0x0, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x1, 0x0, 0x4, 0x4, + 0x4, 0x4, 0x4, 0x4, 0x4, 0x0, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, + 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x2, 0x2, + 0x3, 0x3, 0x3, 0x3, 0x2, 0x2, 0x2, 0x2, 0x2, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, +}; + +constexpr std::array Ver3MouthlineColorTable{ + 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x3, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x1, 0x4, + 0x4, 0x4, 0x0, 0x1, 0x2, 0x3, 0x4, 0x4, 0x2, 0x3, 0x3, 0x4, 0x4, 0x4, 0x4, 0x1, 0x4, + 0x4, 0x2, 0x3, 0x3, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x3, 0x3, 0x3, 0x4, 0x4, 0x4, + 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x4, 0x4, 0x4, 0x4, 0x3, 0x3, 0x3, 0x3, 0x4, 0x4, 0x4, + 0x4, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x4, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, + 0x3, 0x3, 0x3, 0x3, 0x4, 0x0, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, 0x3, 0x3, +}; + +constexpr std::array Ver3GlassColorTable{ + 0x0, 0x1, 0x1, 0x1, 0x5, 0x1, 0x1, 0x4, 0x0, 0x5, 0x1, 0x1, 0x3, 0x5, 0x1, 0x2, 0x3, + 0x4, 0x5, 0x4, 0x2, 0x2, 0x4, 0x4, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, + 0x2, 0x2, 0x2, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, + 0x3, 0x3, 0x3, 0x3, 0x3, 0x0, 0x0, 0x0, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x0, 0x5, 0x5, + 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x1, 0x4, + 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, +}; + +constexpr std::array Ver3GlassTypeTable{ + 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x1, + 0x2, 0x1, 0x3, 0x7, 0x7, 0x6, 0x7, 0x8, 0x7, 0x7, +}; + struct MiiStoreData { using Name = std::array; diff --git a/src/core/hle/service/nfp/amiibo_crypto.cpp b/src/core/hle/service/nfp/amiibo_crypto.cpp index 66773d26c..bba862fb2 100644 --- a/src/core/hle/service/nfp/amiibo_crypto.cpp +++ b/src/core/hle/service/nfp/amiibo_crypto.cpp @@ -88,6 +88,7 @@ NTAG215File NfcDataToEncodedData(const EncryptedNTAG215File& nfc_data) { encoded_data.application_area_id = nfc_data.user_memory.application_area_id; encoded_data.application_id_byte = nfc_data.user_memory.application_id_byte; encoded_data.unknown = nfc_data.user_memory.unknown; + encoded_data.mii_extension = nfc_data.user_memory.mii_extension; encoded_data.unknown2 = nfc_data.user_memory.unknown2; encoded_data.register_info_crc = nfc_data.user_memory.register_info_crc; encoded_data.application_area = nfc_data.user_memory.application_area; @@ -122,6 +123,7 @@ EncryptedNTAG215File EncodedDataToNfcData(const NTAG215File& encoded_data) { nfc_data.user_memory.application_area_id = encoded_data.application_area_id; nfc_data.user_memory.application_id_byte = encoded_data.application_id_byte; nfc_data.user_memory.unknown = encoded_data.unknown; + nfc_data.user_memory.mii_extension = encoded_data.mii_extension; nfc_data.user_memory.unknown2 = encoded_data.unknown2; nfc_data.user_memory.register_info_crc = encoded_data.register_info_crc; nfc_data.user_memory.application_area = encoded_data.application_area; diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfp/nfp_device.cpp index 53bc56814..c5d8ceeff 100644 --- a/src/core/hle/service/nfp/nfp_device.cpp +++ b/src/core/hle/service/nfp/nfp_device.cpp @@ -471,6 +471,7 @@ Result NfpDevice::SetRegisterInfoPrivate(const AmiiboName& amiibo_name) { } Service::Mii::MiiManager manager; + const auto mii = manager.BuildDefault(0); auto& settings = tag_data.settings; if (tag_data.settings.settings.amiibo_initialized == 0) { @@ -479,9 +480,10 @@ Result NfpDevice::SetRegisterInfoPrivate(const AmiiboName& amiibo_name) { } SetAmiiboName(settings, amiibo_name); - tag_data.owner_mii = manager.ConvertCharInfoToV3(manager.BuildDefault(0)); + tag_data.owner_mii = manager.BuildFromStoreData(mii); + tag_data.mii_extension = manager.SetFromStoreData(mii); tag_data.unknown = 0; - tag_data.unknown2[6] = 0; + tag_data.unknown2 = {}; settings.country_code_id = 0; settings.settings.font_region.Assign(0); settings.settings.amiibo_initialized.Assign(1); @@ -840,7 +842,8 @@ void NfpDevice::UpdateRegisterInfoCrc() { Mii::Ver3StoreData mii; u8 application_id_byte; u8 unknown; - std::array unknown2; + Mii::NfpStoreDataExtension mii_extension; + std::array unknown2; }; static_assert(sizeof(CrcData) == 0x7e, "CrcData is an invalid size"); #pragma pack(pop) @@ -849,6 +852,7 @@ void NfpDevice::UpdateRegisterInfoCrc() { .mii = tag_data.owner_mii, .application_id_byte = tag_data.application_id_byte, .unknown = tag_data.unknown, + .mii_extension = tag_data.mii_extension, .unknown2 = tag_data.unknown2, }; diff --git a/src/core/hle/service/nfp/nfp_types.h b/src/core/hle/service/nfp/nfp_types.h index 5f4a5d7f9..b3599a513 100644 --- a/src/core/hle/service/nfp/nfp_types.h +++ b/src/core/hle/service/nfp/nfp_types.h @@ -259,7 +259,8 @@ struct EncryptedAmiiboFile { u32_be application_area_id; // Encrypted Game id u8 application_id_byte; u8 unknown; - std::array unknown2; + Service::Mii::NfpStoreDataExtension mii_extension; + std::array unknown2; u32_be register_info_crc; ApplicationArea application_area; // Encrypted Game data }; @@ -280,7 +281,8 @@ struct NTAG215File { u32_be application_area_id; u8 application_id_byte; u8 unknown; - std::array unknown2; + Service::Mii::NfpStoreDataExtension mii_extension; + std::array unknown2; u32_be register_info_crc; ApplicationArea application_area; // Encrypted Game data HashData hmac_tag; // Hash From 7187732454e7382009e35b4b62d0da16861ec3f8 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Wed, 15 Mar 2023 10:45:55 -0600 Subject: [PATCH 0189/1181] service: nfp: Close app area and recreate crc --- src/core/hle/service/nfp/nfp_device.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfp/nfp_device.cpp index c5d8ceeff..61a7ea7ac 100644 --- a/src/core/hle/service/nfp/nfp_device.cpp +++ b/src/core/hle/service/nfp/nfp_device.cpp @@ -685,6 +685,11 @@ Result NfpDevice::RecreateApplicationArea(u32 access_id, std::span dat return WrongDeviceState; } + if (is_app_area_open) { + LOG_ERROR(Service_NFP, "Application area is open"); + return WrongDeviceState; + } + if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { LOG_ERROR(Service_NFP, "Amiibo is read only", device_state); return WrongDeviceState; @@ -715,6 +720,7 @@ Result NfpDevice::RecreateApplicationArea(u32 access_id, std::span dat tag_data.settings.settings.appdata_initialized.Assign(1); tag_data.application_area_id = access_id; tag_data.unknown = {}; + tag_data.unknown2 = {}; UpdateRegisterInfoCrc(); @@ -750,6 +756,10 @@ Result NfpDevice::DeleteApplicationArea() { rng.GenerateRandomBytes(&tag_data.application_id_byte, sizeof(u8)); tag_data.settings.settings.appdata_initialized.Assign(0); tag_data.unknown = {}; + tag_data.unknown2 = {}; + is_app_area_open = false; + + UpdateRegisterInfoCrc(); return Flush(); } From 075a3d11723d629148e016d089e2c533264ae831 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Thu, 16 Mar 2023 17:47:32 -0600 Subject: [PATCH 0190/1181] service: nfp: Replace crc function with boost equivalent --- src/core/hle/service/nfp/nfp_device.cpp | 44 ++++++++++--------------- src/core/hle/service/nfp/nfp_device.h | 1 - 2 files changed, 17 insertions(+), 28 deletions(-) diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfp/nfp_device.cpp index 61a7ea7ac..268337d2e 100644 --- a/src/core/hle/service/nfp/nfp_device.cpp +++ b/src/core/hle/service/nfp/nfp_device.cpp @@ -3,6 +3,17 @@ #include +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4701) // Potentially uninitialized local variable 'result' used +#endif + +#include + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #include "common/input.h" #include "common/logging/log.h" #include "common/string_util.h" @@ -843,7 +854,9 @@ void NfpDevice::UpdateSettingsCrc() { // TODO: this reads data from a global, find what it is std::array unknown_input{}; - settings.crc = CalculateCrc(unknown_input); + boost::crc_32_type crc; + crc.process_bytes(&unknown_input, sizeof(unknown_input)); + settings.crc = crc.checksum(); } void NfpDevice::UpdateRegisterInfoCrc() { @@ -866,32 +879,9 @@ void NfpDevice::UpdateRegisterInfoCrc() { .unknown2 = tag_data.unknown2, }; - std::array data{}; - memcpy(data.data(), &crc_data, sizeof(CrcData)); - tag_data.register_info_crc = CalculateCrc(data); -} - -u32 NfpDevice::CalculateCrc(std::span data) { - constexpr u32 magic = 0xedb88320; - u32 crc = 0xffffffff; - - if (data.size() == 0) { - return 0; - } - - for (u8 input : data) { - crc ^= input; - crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); - crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); - crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); - crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); - crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); - crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); - crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); - crc = crc >> 1 ^ ((crc & 1) ? magic : 0x0); - } - - return ~crc; + boost::crc_32_type crc; + crc.process_bytes(&crc_data, sizeof(CrcData)); + tag_data.register_info_crc = crc.checksum(); } } // namespace Service::NFP diff --git a/src/core/hle/service/nfp/nfp_device.h b/src/core/hle/service/nfp/nfp_device.h index fc7fbd578..8813df998 100644 --- a/src/core/hle/service/nfp/nfp_device.h +++ b/src/core/hle/service/nfp/nfp_device.h @@ -81,7 +81,6 @@ private: u64 RemoveVersionByte(u64 application_id) const; void UpdateSettingsCrc(); void UpdateRegisterInfoCrc(); - u32 CalculateCrc(std::span); bool is_controller_set{}; int callback_key; From a7651168ddd678e25ebc445d4c127b008de96b84 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Fri, 17 Mar 2023 03:00:40 +0000 Subject: [PATCH 0191/1181] Disable SRGB border color conversion for now, to fix shadows in Xenoblade. --- src/video_core/textures/texture.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/video_core/textures/texture.cpp b/src/video_core/textures/texture.cpp index 26649aebf..4a80a59f9 100644 --- a/src/video_core/textures/texture.cpp +++ b/src/video_core/textures/texture.cpp @@ -14,7 +14,7 @@ namespace Tegra::Texture { namespace { -constexpr std::array SRGB_CONVERSION_LUT = { +[[maybe_unused]] constexpr std::array SRGB_CONVERSION_LUT = { 0.000000f, 0.000000f, 0.000000f, 0.000012f, 0.000021f, 0.000033f, 0.000046f, 0.000062f, 0.000081f, 0.000102f, 0.000125f, 0.000151f, 0.000181f, 0.000214f, 0.000251f, 0.000293f, 0.000338f, 0.000388f, 0.000443f, 0.000503f, 0.000568f, 0.000639f, 0.000715f, 0.000798f, @@ -52,11 +52,13 @@ constexpr std::array SRGB_CONVERSION_LUT = { } // Anonymous namespace std::array TSCEntry::BorderColor() const noexcept { - if (!srgb_conversion) { - return border_color; - } - return {SRGB_CONVERSION_LUT[srgb_border_color_r], SRGB_CONVERSION_LUT[srgb_border_color_g], - SRGB_CONVERSION_LUT[srgb_border_color_b], border_color[3]}; + // TODO: Handle SRGB correctly. Using this breaks shadows in some games (Xenoblade). + // if (!srgb_conversion) { + // return border_color; + //} + // return {SRGB_CONVERSION_LUT[srgb_border_color_r], SRGB_CONVERSION_LUT[srgb_border_color_g], + // SRGB_CONVERSION_LUT[srgb_border_color_b], border_color[3]}; + return border_color; } float TSCEntry::MaxAnisotropy() const noexcept { From c95baf92cef2222ca6f8f2f0976afd24ee3d3670 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Fri, 17 Mar 2023 22:03:36 -0600 Subject: [PATCH 0192/1181] config: Fix controller config from resetting --- src/yuzu/configuration/configure_input.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp index 1db374d4a..7fce85bca 100644 --- a/src/yuzu/configuration/configure_input.cpp +++ b/src/yuzu/configuration/configure_input.cpp @@ -189,6 +189,8 @@ QList ConfigureInput::GetSubTabs() const { } void ConfigureInput::ApplyConfiguration() { + const bool was_global = Settings::values.players.UsingGlobal(); + Settings::values.players.SetGlobal(true); for (auto* controller : player_controllers) { controller->ApplyConfiguration(); } @@ -201,6 +203,7 @@ void ConfigureInput::ApplyConfiguration() { Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked()); Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked()); + Settings::values.players.SetGlobal(was_global); } void ConfigureInput::changeEvent(QEvent* event) { From 0eb3fa05e5af341ad2922b96de07f4cf32cba85a Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 17 Mar 2023 23:42:17 -0700 Subject: [PATCH 0193/1181] common: bounded_threadsafe_queue: Use polyfill_thread. --- src/common/bounded_threadsafe_queue.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/bounded_threadsafe_queue.h b/src/common/bounded_threadsafe_queue.h index 21217801e..14e887c70 100644 --- a/src/common/bounded_threadsafe_queue.h +++ b/src/common/bounded_threadsafe_queue.h @@ -9,10 +9,11 @@ #include #include #include -#include #include #include +#include "common/polyfill_thread.h" + namespace Common { #if defined(__cpp_lib_hardware_interference_size) @@ -78,7 +79,7 @@ public: auto& slot = slots[idx(tail)]; if (!slot.turn.test()) { std::unique_lock lock{cv_mutex}; - cv.wait(lock, stop, [&slot] { return slot.turn.test(); }); + Common::CondvarWait(cv, lock, stop, [&slot] { return slot.turn.test(); }); } v = slot.move(); slot.destroy(); From 00d401d6396b68b711b9e336aaa2fac5edb91a2d Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 18 Mar 2023 22:42:25 -0700 Subject: [PATCH 0194/1181] common: string_util: Use std::string_view for UTF16ToUTF8/UTF8ToUTF16W. --- src/common/string_util.cpp | 14 +++++++------- src/common/string_util.h | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index e0b6180c5..feab1653d 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -125,18 +125,18 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st return result; } -std::string UTF16ToUTF8(const std::u16string& input) { +std::string UTF16ToUTF8(std::u16string_view input) { std::wstring_convert, char16_t> convert; - return convert.to_bytes(input); + return convert.to_bytes(input.data(), input.data() + input.size()); } -std::u16string UTF8ToUTF16(const std::string& input) { +std::u16string UTF8ToUTF16(std::string_view input) { std::wstring_convert, char16_t> convert; - return convert.from_bytes(input); + return convert.from_bytes(input.data(), input.data() + input.size()); } #ifdef _WIN32 -static std::wstring CPToUTF16(u32 code_page, const std::string& input) { +static std::wstring CPToUTF16(u32 code_page, std::string_view input) { const auto size = MultiByteToWideChar(code_page, 0, input.data(), static_cast(input.size()), nullptr, 0); @@ -154,7 +154,7 @@ static std::wstring CPToUTF16(u32 code_page, const std::string& input) { return output; } -std::string UTF16ToUTF8(const std::wstring& input) { +std::string UTF16ToUTF8(std::wstring_view input) { const auto size = WideCharToMultiByte(CP_UTF8, 0, input.data(), static_cast(input.size()), nullptr, 0, nullptr, nullptr); if (size == 0) { @@ -172,7 +172,7 @@ std::string UTF16ToUTF8(const std::wstring& input) { return output; } -std::wstring UTF8ToUTF16W(const std::string& input) { +std::wstring UTF8ToUTF16W(std::string_view input) { return CPToUTF16(CP_UTF8, input); } diff --git a/src/common/string_util.h b/src/common/string_util.h index f8aecc875..c351f1a0c 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -36,12 +36,12 @@ bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _ [[nodiscard]] std::string ReplaceAll(std::string result, const std::string& src, const std::string& dest); -[[nodiscard]] std::string UTF16ToUTF8(const std::u16string& input); -[[nodiscard]] std::u16string UTF8ToUTF16(const std::string& input); +[[nodiscard]] std::string UTF16ToUTF8(std::u16string_view input); +[[nodiscard]] std::u16string UTF8ToUTF16(std::string_view input); #ifdef _WIN32 -[[nodiscard]] std::string UTF16ToUTF8(const std::wstring& input); -[[nodiscard]] std::wstring UTF8ToUTF16W(const std::string& str); +[[nodiscard]] std::string UTF16ToUTF8(std::wstring_view input); +[[nodiscard]] std::wstring UTF8ToUTF16W(std::string_view str); #endif From 43d909949e7ed25cc0b3a518cc3a31a4a3abbc11 Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 19 Mar 2023 10:02:20 -0400 Subject: [PATCH 0195/1181] kernel: fix LOG_TRACE in ipc --- src/core/hle/kernel/svc/svc_ipc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/hle/kernel/svc/svc_ipc.cpp b/src/core/hle/kernel/svc/svc_ipc.cpp index 46fd0f2ea..2a8c09a79 100644 --- a/src/core/hle/kernel/svc/svc_ipc.cpp +++ b/src/core/hle/kernel/svc/svc_ipc.cpp @@ -17,7 +17,7 @@ Result SendSyncRequest(Core::System& system, Handle handle) { GetCurrentProcess(system.Kernel()).GetHandleTable().GetObject(handle); R_UNLESS(session.IsNotNull(), ResultInvalidHandle); - LOG_TRACE(Kernel_SVC, "called handle=0x{:08X}({})", handle, session->GetName()); + LOG_TRACE(Kernel_SVC, "called handle=0x{:08X}", handle); R_RETURN(session->SendSyncRequest()); } From b9b1318bea1af744fb9183e808ba00352ffed4d1 Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 19 Mar 2023 13:40:33 -0400 Subject: [PATCH 0196/1181] vulkan: fix more excessive waiting in scheduler --- src/video_core/renderer_vulkan/vk_scheduler.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_scheduler.cpp b/src/video_core/renderer_vulkan/vk_scheduler.cpp index c636a1625..55e699552 100644 --- a/src/video_core/renderer_vulkan/vk_scheduler.cpp +++ b/src/video_core/renderer_vulkan/vk_scheduler.cpp @@ -65,12 +65,13 @@ void Scheduler::WaitWorker() { DispatchWork(); // Ensure the queue is drained. - std::unique_lock ql{queue_mutex}; - event_cv.wait(ql, [this] { return work_queue.empty(); }); + { + std::unique_lock ql{queue_mutex}; + event_cv.wait(ql, [this] { return work_queue.empty(); }); + } // Now wait for execution to finish. - // This needs to be done in the same order as WorkerThread. - std::unique_lock el{execution_mutex}; + std::scoped_lock el{execution_mutex}; } void Scheduler::DispatchWork() { From 306840a5808cae10bf5d91e4b6e8a91cd619386b Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sun, 19 Mar 2023 03:19:25 -0400 Subject: [PATCH 0197/1181] bounded_threadsafe_queue: Use simplified impl of bounded queue Provides a simplified SPSC, MPSC, and MPMC bounded queue implementation using mutexes. --- src/common/bounded_threadsafe_queue.h | 337 ++++++++++++++++---------- src/video_core/gpu_thread.cpp | 7 +- 2 files changed, 216 insertions(+), 128 deletions(-) diff --git a/src/common/bounded_threadsafe_queue.h b/src/common/bounded_threadsafe_queue.h index 14e887c70..e03427539 100644 --- a/src/common/bounded_threadsafe_queue.h +++ b/src/common/bounded_threadsafe_queue.h @@ -1,159 +1,246 @@ -// SPDX-FileCopyrightText: Copyright (c) 2020 Erik Rigtorp -// SPDX-License-Identifier: MIT +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once #include -#include #include -#include +#include #include #include -#include -#include #include "common/polyfill_thread.h" namespace Common { -#if defined(__cpp_lib_hardware_interference_size) -constexpr size_t hardware_interference_size = std::hardware_destructive_interference_size; -#else -constexpr size_t hardware_interference_size = 64; -#endif +namespace detail { +constexpr size_t DefaultCapacity = 0x1000; +} // namespace detail + +template +class SPSCQueue { + static_assert((Capacity & (Capacity - 1)) == 0, "Capacity must be a power of two."); -template -class MPSCQueue { public: - explicit MPSCQueue() : allocator{std::allocator>()} { - // Allocate one extra slot to prevent false sharing on the last slot - slots = allocator.allocate(capacity + 1); - // Allocators are not required to honor alignment for over-aligned types - // (see http://eel.is/c++draft/allocator.requirements#10) so we verify - // alignment here - if (reinterpret_cast(slots) % alignof(Slot) != 0) { - allocator.deallocate(slots, capacity + 1); - throw std::bad_alloc(); - } - for (size_t i = 0; i < capacity; ++i) { - std::construct_at(&slots[i]); - } - static_assert(std::has_single_bit(capacity), "capacity must be an integer power of 2"); - static_assert(alignof(Slot) == hardware_interference_size, - "Slot must be aligned to cache line boundary to prevent false sharing"); - static_assert(sizeof(Slot) % hardware_interference_size == 0, - "Slot size must be a multiple of cache line size to prevent " - "false sharing between adjacent slots"); - static_assert(sizeof(MPSCQueue) % hardware_interference_size == 0, - "Queue size must be a multiple of cache line size to " - "prevent false sharing between adjacent queues"); - } + void Push(T&& t) { + const size_t write_index = m_write_index.load(); - ~MPSCQueue() noexcept { - for (size_t i = 0; i < capacity; ++i) { - std::destroy_at(&slots[i]); - } - allocator.deallocate(slots, capacity + 1); - } - - // The queue must be both non-copyable and non-movable - MPSCQueue(const MPSCQueue&) = delete; - MPSCQueue& operator=(const MPSCQueue&) = delete; - - MPSCQueue(MPSCQueue&&) = delete; - MPSCQueue& operator=(MPSCQueue&&) = delete; - - void Push(const T& v) noexcept { - static_assert(std::is_nothrow_copy_constructible_v, - "T must be nothrow copy constructible"); - emplace(v); - } - - template >> - void Push(P&& v) noexcept { - emplace(std::forward

(v)); - } - - void Pop(T& v, std::stop_token stop) noexcept { - auto const tail = tail_.fetch_add(1); - auto& slot = slots[idx(tail)]; - if (!slot.turn.test()) { - std::unique_lock lock{cv_mutex}; - Common::CondvarWait(cv, lock, stop, [&slot] { return slot.turn.test(); }); - } - v = slot.move(); - slot.destroy(); - slot.turn.clear(); - slot.turn.notify_one(); - } - -private: - template - struct Slot { - ~Slot() noexcept { - if (turn.test()) { - destroy(); - } + // Wait until we have free slots to write to. + while ((write_index - m_read_index.load()) == Capacity) { + std::this_thread::yield(); } - template - void construct(Args&&... args) noexcept { - static_assert(std::is_nothrow_constructible_v, - "T must be nothrow constructible with Args&&..."); - std::construct_at(reinterpret_cast(&storage), std::forward(args)...); - } + // Determine the position to write to. + const size_t pos = write_index % Capacity; - void destroy() noexcept { - static_assert(std::is_nothrow_destructible_v, "T must be nothrow destructible"); - std::destroy_at(reinterpret_cast(&storage)); - } + // Push into the queue. + m_data[pos] = std::move(t); - U&& move() noexcept { - return reinterpret_cast(storage); - } + // Increment the write index. + ++m_write_index; - // Align to avoid false sharing between adjacent slots - alignas(hardware_interference_size) std::atomic_flag turn{}; - struct aligned_store { - struct type { - alignas(U) unsigned char data[sizeof(U)]; - }; - }; - typename aligned_store::type storage; - }; - - template - void emplace(Args&&... args) noexcept { - static_assert(std::is_nothrow_constructible_v, - "T must be nothrow constructible with Args&&..."); - auto const head = head_.fetch_add(1); - auto& slot = slots[idx(head)]; - slot.turn.wait(true); - slot.construct(std::forward(args)...); - slot.turn.test_and_set(); + // Notify the consumer that we have pushed into the queue. + std::scoped_lock lock{cv_mutex}; cv.notify_one(); } - constexpr size_t idx(size_t i) const noexcept { - return i & mask; + template + void Push(Args&&... args) { + const size_t write_index = m_write_index.load(); + + // Wait until we have free slots to write to. + while ((write_index - m_read_index.load()) == Capacity) { + std::this_thread::yield(); + } + + // Determine the position to write to. + const size_t pos = write_index % Capacity; + + // Emplace into the queue. + std::construct_at(std::addressof(m_data[pos]), std::forward(args)...); + + // Increment the write index. + ++m_write_index; + + // Notify the consumer that we have pushed into the queue. + std::scoped_lock lock{cv_mutex}; + cv.notify_one(); } - static constexpr size_t mask = capacity - 1; + bool TryPop(T& t) { + return Pop(t); + } - // Align to avoid false sharing between head_ and tail_ - alignas(hardware_interference_size) std::atomic head_{0}; - alignas(hardware_interference_size) std::atomic tail_{0}; + void PopWait(T& t, std::stop_token stop_token) { + Wait(stop_token); + Pop(t); + } + + T PopWait(std::stop_token stop_token) { + Wait(stop_token); + T t; + Pop(t); + return t; + } + + void Clear() { + while (!Empty()) { + Pop(); + } + } + + bool Empty() const { + return m_read_index.load() == m_write_index.load(); + } + + size_t Size() const { + return m_write_index.load() - m_read_index.load(); + } + +private: + void Pop() { + const size_t read_index = m_read_index.load(); + + // Check if the queue is empty. + if (read_index == m_write_index.load()) { + return; + } + + // Determine the position to read from. + const size_t pos = read_index % Capacity; + + // Pop the data off the queue, deleting it. + std::destroy_at(std::addressof(m_data[pos])); + + // Increment the read index. + ++m_read_index; + } + + bool Pop(T& t) { + const size_t read_index = m_read_index.load(); + + // Check if the queue is empty. + if (read_index == m_write_index.load()) { + return false; + } + + // Determine the position to read from. + const size_t pos = read_index % Capacity; + + // Pop the data off the queue, moving it. + t = std::move(m_data[pos]); + + // Increment the read index. + ++m_read_index; + + return true; + } + + void Wait(std::stop_token stop_token) { + std::unique_lock lock{cv_mutex}; + Common::CondvarWait(cv, lock, stop_token, [this] { return !Empty(); }); + } + + alignas(128) std::atomic_size_t m_read_index{0}; + alignas(128) std::atomic_size_t m_write_index{0}; + + std::array m_data; - std::mutex cv_mutex; std::condition_variable_any cv; + std::mutex cv_mutex; +}; - Slot* slots; - [[no_unique_address]] std::allocator> allocator; +template +class MPSCQueue { +public: + void Push(T&& t) { + std::scoped_lock lock{write_mutex}; + spsc_queue.Push(std::move(t)); + } - static_assert(std::is_nothrow_copy_assignable_v || std::is_nothrow_move_assignable_v, - "T must be nothrow copy or move assignable"); + template + void Push(Args&&... args) { + std::scoped_lock lock{write_mutex}; + spsc_queue.Push(std::forward(args)...); + } - static_assert(std::is_nothrow_destructible_v, "T must be nothrow destructible"); + bool TryPop(T& t) { + return spsc_queue.TryPop(t); + } + + void PopWait(T& t, std::stop_token stop_token) { + spsc_queue.PopWait(t, stop_token); + } + + T PopWait(std::stop_token stop_token) { + return spsc_queue.PopWait(stop_token); + } + + void Clear() { + spsc_queue.Clear(); + } + + bool Empty() { + return spsc_queue.Empty(); + } + + size_t Size() { + return spsc_queue.Size(); + } + +private: + SPSCQueue spsc_queue; + std::mutex write_mutex; +}; + +template +class MPMCQueue { +public: + void Push(T&& t) { + std::scoped_lock lock{write_mutex}; + spsc_queue.Push(std::move(t)); + } + + template + void Push(Args&&... args) { + std::scoped_lock lock{write_mutex}; + spsc_queue.Push(std::forward(args)...); + } + + bool TryPop(T& t) { + std::scoped_lock lock{read_mutex}; + return spsc_queue.TryPop(t); + } + + void PopWait(T& t, std::stop_token stop_token) { + std::scoped_lock lock{read_mutex}; + spsc_queue.PopWait(t, stop_token); + } + + T PopWait(std::stop_token stop_token) { + std::scoped_lock lock{read_mutex}; + return spsc_queue.PopWait(stop_token); + } + + void Clear() { + std::scoped_lock lock{read_mutex}; + spsc_queue.Clear(); + } + + bool Empty() { + std::scoped_lock lock{read_mutex}; + return spsc_queue.Empty(); + } + + size_t Size() { + std::scoped_lock lock{read_mutex}; + return spsc_queue.Size(); + } + +private: + SPSCQueue spsc_queue; + std::mutex write_mutex; + std::mutex read_mutex; }; } // namespace Common diff --git a/src/video_core/gpu_thread.cpp b/src/video_core/gpu_thread.cpp index f52f9e28f..469a59cf9 100644 --- a/src/video_core/gpu_thread.cpp +++ b/src/video_core/gpu_thread.cpp @@ -31,9 +31,10 @@ static void RunThread(std::stop_token stop_token, Core::System& system, auto current_context = context.Acquire(); VideoCore::RasterizerInterface* const rasterizer = renderer.ReadRasterizer(); + CommandDataContainer next; + while (!stop_token.stop_requested()) { - CommandDataContainer next; - state.queue.Pop(next, stop_token); + state.queue.PopWait(next, stop_token); if (stop_token.stop_requested()) { break; } @@ -117,7 +118,7 @@ u64 ThreadManager::PushCommand(CommandData&& command_data, bool block) { std::unique_lock lk(state.write_lock); const u64 fence{++state.last_fence}; - state.queue.Push(CommandDataContainer(std::move(command_data), fence, block)); + state.queue.Push(std::move(command_data), fence, block); if (block) { Common::CondvarWait(state.cv, lk, thread.get_stop_token(), [this, fence] { From f28ca5361f5242f5b65a5c54bdde55639fba71f5 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sun, 19 Mar 2023 03:20:05 -0400 Subject: [PATCH 0198/1181] logging: Make use of bounded queue --- src/common/logging/backend.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index 2a3bded40..e1ce9db99 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp @@ -28,7 +28,7 @@ #ifdef _WIN32 #include "common/string_util.h" #endif -#include "common/threadsafe_queue.h" +#include "common/bounded_threadsafe_queue.h" namespace Common::Log { @@ -204,11 +204,11 @@ public: void PushEntry(Class log_class, Level log_level, const char* filename, unsigned int line_num, const char* function, std::string&& message) { - if (!filter.CheckMessage(log_class, log_level)) + if (!filter.CheckMessage(log_class, log_level)) { return; - const Entry& entry = - CreateEntry(log_class, log_level, filename, line_num, function, std::move(message)); - message_queue.Push(entry); + } + message_queue.Push( + CreateEntry(log_class, log_level, filename, line_num, function, std::move(message))); } private: @@ -225,7 +225,7 @@ private: ForEachBackend([&entry](Backend& backend) { backend.Write(entry); }); }; while (!stop_token.stop_requested()) { - entry = message_queue.PopWait(stop_token); + message_queue.PopWait(entry, stop_token); if (entry.filename != nullptr) { write_logs(); } @@ -233,7 +233,7 @@ private: // Drain the logging queue. Only writes out up to MAX_LOGS_TO_WRITE to prevent a // case where a system is repeatedly spamming logs even on close. int max_logs_to_write = filter.IsDebug() ? INT_MAX : 100; - while (max_logs_to_write-- && message_queue.Pop(entry)) { + while (max_logs_to_write-- && message_queue.TryPop(entry)) { write_logs(); } }); @@ -273,7 +273,7 @@ private: ColorConsoleBackend color_console_backend{}; FileBackend file_backend; - MPSCQueue message_queue{}; + MPSCQueue message_queue{}; std::chrono::steady_clock::time_point time_origin{std::chrono::steady_clock::now()}; std::jthread backend_thread; }; From 15d573194c95b95ccf4a5480d8e40a7765a00929 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sun, 19 Mar 2023 04:01:47 -0400 Subject: [PATCH 0199/1181] bounded_threadsafe_queue: Add TryPush --- src/common/bounded_threadsafe_queue.h | 71 +++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/src/common/bounded_threadsafe_queue.h b/src/common/bounded_threadsafe_queue.h index e03427539..eb88cc1d1 100644 --- a/src/common/bounded_threadsafe_queue.h +++ b/src/common/bounded_threadsafe_queue.h @@ -22,6 +22,55 @@ class SPSCQueue { static_assert((Capacity & (Capacity - 1)) == 0, "Capacity must be a power of two."); public: + bool TryPush(T&& t) { + const size_t write_index = m_write_index.load(); + + // Check if we have free slots to write to. + if ((write_index - m_read_index.load()) == Capacity) { + return false; + } + + // Determine the position to write to. + const size_t pos = write_index % Capacity; + + // Push into the queue. + m_data[pos] = std::move(t); + + // Increment the write index. + ++m_write_index; + + // Notify the consumer that we have pushed into the queue. + std::scoped_lock lock{cv_mutex}; + cv.notify_one(); + + return true; + } + + template + bool TryPush(Args&&... args) { + const size_t write_index = m_write_index.load(); + + // Check if we have free slots to write to. + if ((write_index - m_read_index.load()) == Capacity) { + return false; + } + + // Determine the position to write to. + const size_t pos = write_index % Capacity; + + // Emplace into the queue. + std::construct_at(std::addressof(m_data[pos]), std::forward(args)...); + + // Increment the write index. + ++m_write_index; + + // Notify the consumer that we have pushed into the queue. + std::scoped_lock lock{cv_mutex}; + cv.notify_one(); + + return true; + } + void Push(T&& t) { const size_t write_index = m_write_index.load(); @@ -153,6 +202,17 @@ private: template class MPSCQueue { public: + bool TryPush(T&& t) { + std::scoped_lock lock{write_mutex}; + return spsc_queue.TryPush(std::move(t)); + } + + template + bool TryPush(Args&&... args) { + std::scoped_lock lock{write_mutex}; + return spsc_queue.TryPush(std::forward(args)...); + } + void Push(T&& t) { std::scoped_lock lock{write_mutex}; spsc_queue.Push(std::move(t)); @@ -196,6 +256,17 @@ private: template class MPMCQueue { public: + bool TryPush(T&& t) { + std::scoped_lock lock{write_mutex}; + return spsc_queue.TryPush(std::move(t)); + } + + template + bool TryPush(Args&&... args) { + std::scoped_lock lock{write_mutex}; + return spsc_queue.TryPush(std::forward(args)...); + } + void Push(T&& t) { std::scoped_lock lock{write_mutex}; spsc_queue.Push(std::move(t)); From 407dc917f170cc9d08f3f1f9bdeb9e44ddebc653 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sun, 19 Mar 2023 14:24:18 -0400 Subject: [PATCH 0200/1181] bounded_threadsafe_queue: Deduplicate and add PushModes Adds the PushModes Try and Wait to allow producers to specify how they want to push their data to the queue if the queue is full. If the queue is full: - Try will fail to push to the queue, returning false. Try only returns true if it successfully pushes to the queue. This may result in items not being pushed into the queue. - Wait will wait until a slot is available to push to the queue, resulting in potential for deadlock if a consumer is not running. --- src/common/bounded_threadsafe_queue.h | 188 +++++++++++++------------- src/common/logging/backend.cpp | 2 +- src/video_core/gpu_thread.cpp | 2 +- 3 files changed, 95 insertions(+), 97 deletions(-) diff --git a/src/common/bounded_threadsafe_queue.h b/src/common/bounded_threadsafe_queue.h index eb88cc1d1..975215863 100644 --- a/src/common/bounded_threadsafe_queue.h +++ b/src/common/bounded_threadsafe_queue.h @@ -23,97 +23,21 @@ class SPSCQueue { public: bool TryPush(T&& t) { - const size_t write_index = m_write_index.load(); - - // Check if we have free slots to write to. - if ((write_index - m_read_index.load()) == Capacity) { - return false; - } - - // Determine the position to write to. - const size_t pos = write_index % Capacity; - - // Push into the queue. - m_data[pos] = std::move(t); - - // Increment the write index. - ++m_write_index; - - // Notify the consumer that we have pushed into the queue. - std::scoped_lock lock{cv_mutex}; - cv.notify_one(); - - return true; + return Push(std::move(t)); } template - bool TryPush(Args&&... args) { - const size_t write_index = m_write_index.load(); - - // Check if we have free slots to write to. - if ((write_index - m_read_index.load()) == Capacity) { - return false; - } - - // Determine the position to write to. - const size_t pos = write_index % Capacity; - - // Emplace into the queue. - std::construct_at(std::addressof(m_data[pos]), std::forward(args)...); - - // Increment the write index. - ++m_write_index; - - // Notify the consumer that we have pushed into the queue. - std::scoped_lock lock{cv_mutex}; - cv.notify_one(); - - return true; + bool TryEmplace(Args&&... args) { + return Emplace(std::forward(args)...); } - void Push(T&& t) { - const size_t write_index = m_write_index.load(); - - // Wait until we have free slots to write to. - while ((write_index - m_read_index.load()) == Capacity) { - std::this_thread::yield(); - } - - // Determine the position to write to. - const size_t pos = write_index % Capacity; - - // Push into the queue. - m_data[pos] = std::move(t); - - // Increment the write index. - ++m_write_index; - - // Notify the consumer that we have pushed into the queue. - std::scoped_lock lock{cv_mutex}; - cv.notify_one(); + void PushWait(T&& t) { + Push(std::move(t)); } template - void Push(Args&&... args) { - const size_t write_index = m_write_index.load(); - - // Wait until we have free slots to write to. - while ((write_index - m_read_index.load()) == Capacity) { - std::this_thread::yield(); - } - - // Determine the position to write to. - const size_t pos = write_index % Capacity; - - // Emplace into the queue. - std::construct_at(std::addressof(m_data[pos]), std::forward(args)...); - - // Increment the write index. - ++m_write_index; - - // Notify the consumer that we have pushed into the queue. - std::scoped_lock lock{cv_mutex}; - cv.notify_one(); + void EmplaceWait(Args&&... args) { + Emplace(std::forward(args)...); } bool TryPop(T& t) { @@ -147,6 +71,80 @@ public: } private: + enum class PushMode { + Try, + Wait, + Count, + }; + + template + bool Push(T&& t) { + const size_t write_index = m_write_index.load(); + + if constexpr (Mode == PushMode::Try) { + // Check if we have free slots to write to. + if ((write_index - m_read_index.load()) == Capacity) { + return false; + } + } else if constexpr (Mode == PushMode::Wait) { + // Wait until we have free slots to write to. + while ((write_index - m_read_index.load()) == Capacity) { + std::this_thread::yield(); + } + } else { + static_assert(Mode < PushMode::Count, "Invalid PushMode."); + } + + // Determine the position to write to. + const size_t pos = write_index % Capacity; + + // Push into the queue. + m_data[pos] = std::move(t); + + // Increment the write index. + ++m_write_index; + + // Notify the consumer that we have pushed into the queue. + std::scoped_lock lock{cv_mutex}; + cv.notify_one(); + + return true; + } + + template + bool Emplace(Args&&... args) { + const size_t write_index = m_write_index.load(); + + if constexpr (Mode == PushMode::Try) { + // Check if we have free slots to write to. + if ((write_index - m_read_index.load()) == Capacity) { + return false; + } + } else if constexpr (Mode == PushMode::Wait) { + // Wait until we have free slots to write to. + while ((write_index - m_read_index.load()) == Capacity) { + std::this_thread::yield(); + } + } else { + static_assert(Mode < PushMode::Count, "Invalid PushMode."); + } + + // Determine the position to write to. + const size_t pos = write_index % Capacity; + + // Emplace into the queue. + std::construct_at(std::addressof(m_data[pos]), std::forward(args)...); + + // Increment the write index. + ++m_write_index; + + // Notify the consumer that we have pushed into the queue. + std::scoped_lock lock{cv_mutex}; + cv.notify_one(); + + return true; + } + void Pop() { const size_t read_index = m_read_index.load(); @@ -208,20 +206,20 @@ public: } template - bool TryPush(Args&&... args) { + bool TryEmplace(Args&&... args) { std::scoped_lock lock{write_mutex}; - return spsc_queue.TryPush(std::forward(args)...); + return spsc_queue.TryEmplace(std::forward(args)...); } - void Push(T&& t) { + void PushWait(T&& t) { std::scoped_lock lock{write_mutex}; - spsc_queue.Push(std::move(t)); + spsc_queue.PushWait(std::move(t)); } template - void Push(Args&&... args) { + void EmplaceWait(Args&&... args) { std::scoped_lock lock{write_mutex}; - spsc_queue.Push(std::forward(args)...); + spsc_queue.EmplaceWait(std::forward(args)...); } bool TryPop(T& t) { @@ -262,20 +260,20 @@ public: } template - bool TryPush(Args&&... args) { + bool TryEmplace(Args&&... args) { std::scoped_lock lock{write_mutex}; - return spsc_queue.TryPush(std::forward(args)...); + return spsc_queue.TryEmplace(std::forward(args)...); } - void Push(T&& t) { + void PushWait(T&& t) { std::scoped_lock lock{write_mutex}; - spsc_queue.Push(std::move(t)); + spsc_queue.PushWait(std::move(t)); } template - void Push(Args&&... args) { + void EmplaceWait(Args&&... args) { std::scoped_lock lock{write_mutex}; - spsc_queue.Push(std::forward(args)...); + spsc_queue.EmplaceWait(std::forward(args)...); } bool TryPop(T& t) { diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index e1ce9db99..f96c7c222 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp @@ -207,7 +207,7 @@ public: if (!filter.CheckMessage(log_class, log_level)) { return; } - message_queue.Push( + message_queue.EmplaceWait( CreateEntry(log_class, log_level, filename, line_num, function, std::move(message))); } diff --git a/src/video_core/gpu_thread.cpp b/src/video_core/gpu_thread.cpp index 469a59cf9..3c5317777 100644 --- a/src/video_core/gpu_thread.cpp +++ b/src/video_core/gpu_thread.cpp @@ -118,7 +118,7 @@ u64 ThreadManager::PushCommand(CommandData&& command_data, bool block) { std::unique_lock lk(state.write_lock); const u64 fence{++state.last_fence}; - state.queue.Push(std::move(command_data), fence, block); + state.queue.EmplaceWait(std::move(command_data), fence, block); if (block) { Common::CondvarWait(state.cv, lk, thread.get_stop_token(), [this, fence] { From 6ff4bf9b1c48f4cd148cbebc9f0f21bcc74cdac8 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Tue, 21 Mar 2023 20:04:01 -0600 Subject: [PATCH 0201/1181] nfc: Initialize device when controller is connected --- src/core/hle/service/nfc/nfc_device.cpp | 16 ++++++++++++++-- src/core/hle/service/nfc/nfc_device.h | 1 + src/core/hle/service/nfp/nfp_device.cpp | 16 ++++++++++++++-- src/core/hle/service/nfp/nfp_device.h | 1 + 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/core/hle/service/nfc/nfc_device.cpp b/src/core/hle/service/nfc/nfc_device.cpp index 3f17d0c7a..c7db74d14 100644 --- a/src/core/hle/service/nfc/nfc_device.cpp +++ b/src/core/hle/service/nfc/nfc_device.cpp @@ -42,8 +42,18 @@ NfcDevice::~NfcDevice() { }; void NfcDevice::NpadUpdate(Core::HID::ControllerTriggerType type) { - if (type == Core::HID::ControllerTriggerType::Connected || - type == Core::HID::ControllerTriggerType::Disconnected) { + if (!is_initalized) { + return; + } + + if (type == Core::HID::ControllerTriggerType::Connected) { + Initialize(); + availability_change_event->Signal(); + return; + } + + if (type == Core::HID::ControllerTriggerType::Disconnected) { + device_state = NFP::DeviceState::Unavailable; availability_change_event->Signal(); return; } @@ -113,6 +123,7 @@ void NfcDevice::Initialize() { device_state = npad_device->HasNfc() ? NFP::DeviceState::Initialized : NFP::DeviceState::Unavailable; encrypted_tag_data = {}; + is_initalized = true; } void NfcDevice::Finalize() { @@ -121,6 +132,7 @@ void NfcDevice::Finalize() { StopDetection(); } device_state = NFP::DeviceState::Unavailable; + is_initalized = false; } Result NfcDevice::StartDetection(NFP::TagProtocol allowed_protocol) { diff --git a/src/core/hle/service/nfc/nfc_device.h b/src/core/hle/service/nfc/nfc_device.h index a6e114d36..ea63f0537 100644 --- a/src/core/hle/service/nfc/nfc_device.h +++ b/src/core/hle/service/nfc/nfc_device.h @@ -67,6 +67,7 @@ private: Kernel::KEvent* deactivate_event = nullptr; Kernel::KEvent* availability_change_event = nullptr; + bool is_initalized{}; NFP::TagProtocol allowed_protocols{}; NFP::DeviceState device_state{NFP::DeviceState::Unavailable}; diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfp/nfp_device.cpp index 268337d2e..5990e1473 100644 --- a/src/core/hle/service/nfp/nfp_device.cpp +++ b/src/core/hle/service/nfp/nfp_device.cpp @@ -66,8 +66,18 @@ NfpDevice::~NfpDevice() { }; void NfpDevice::NpadUpdate(Core::HID::ControllerTriggerType type) { - if (type == Core::HID::ControllerTriggerType::Connected || - type == Core::HID::ControllerTriggerType::Disconnected) { + if (!is_initalized) { + return; + } + + if (type == Core::HID::ControllerTriggerType::Connected) { + Initialize(); + availability_change_event->Signal(); + return; + } + + if (type == Core::HID::ControllerTriggerType::Disconnected) { + device_state = DeviceState::Unavailable; availability_change_event->Signal(); return; } @@ -145,6 +155,7 @@ void NfpDevice::Initialize() { device_state = npad_device->HasNfc() ? DeviceState::Initialized : DeviceState::Unavailable; encrypted_tag_data = {}; tag_data = {}; + is_initalized = true; } void NfpDevice::Finalize() { @@ -155,6 +166,7 @@ void NfpDevice::Finalize() { StopDetection(); } device_state = DeviceState::Unavailable; + is_initalized = false; } Result NfpDevice::StartDetection(TagProtocol allowed_protocol) { diff --git a/src/core/hle/service/nfp/nfp_device.h b/src/core/hle/service/nfp/nfp_device.h index 8813df998..27122e86e 100644 --- a/src/core/hle/service/nfp/nfp_device.h +++ b/src/core/hle/service/nfp/nfp_device.h @@ -92,6 +92,7 @@ private: Kernel::KEvent* deactivate_event = nullptr; Kernel::KEvent* availability_change_event = nullptr; + bool is_initalized{}; bool is_data_moddified{}; bool is_app_area_open{}; TagProtocol allowed_protocols{}; From 8c56481249ed1bc0b46bca3aec0c7e86495c5d3a Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sun, 19 Mar 2023 14:48:01 -0400 Subject: [PATCH 0202/1181] bounded_threadsafe_queue: Add producer cv to avoid busy waiting --- src/common/bounded_threadsafe_queue.h | 46 +++++++++++++++++---------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/src/common/bounded_threadsafe_queue.h b/src/common/bounded_threadsafe_queue.h index 975215863..0fb2f42d1 100644 --- a/src/common/bounded_threadsafe_queue.h +++ b/src/common/bounded_threadsafe_queue.h @@ -45,12 +45,12 @@ public: } void PopWait(T& t, std::stop_token stop_token) { - Wait(stop_token); + ConsumerWait(stop_token); Pop(t); } T PopWait(std::stop_token stop_token) { - Wait(stop_token); + ConsumerWait(stop_token); T t; Pop(t); return t; @@ -88,9 +88,10 @@ private: } } else if constexpr (Mode == PushMode::Wait) { // Wait until we have free slots to write to. - while ((write_index - m_read_index.load()) == Capacity) { - std::this_thread::yield(); - } + std::unique_lock lock{producer_cv_mutex}; + producer_cv.wait(lock, [this, write_index] { + return (write_index - m_read_index.load()) < Capacity; + }); } else { static_assert(Mode < PushMode::Count, "Invalid PushMode."); } @@ -105,8 +106,8 @@ private: ++m_write_index; // Notify the consumer that we have pushed into the queue. - std::scoped_lock lock{cv_mutex}; - cv.notify_one(); + std::scoped_lock lock{consumer_cv_mutex}; + consumer_cv.notify_one(); return true; } @@ -122,9 +123,10 @@ private: } } else if constexpr (Mode == PushMode::Wait) { // Wait until we have free slots to write to. - while ((write_index - m_read_index.load()) == Capacity) { - std::this_thread::yield(); - } + std::unique_lock lock{producer_cv_mutex}; + producer_cv.wait(lock, [this, write_index] { + return (write_index - m_read_index.load()) < Capacity; + }); } else { static_assert(Mode < PushMode::Count, "Invalid PushMode."); } @@ -139,8 +141,8 @@ private: ++m_write_index; // Notify the consumer that we have pushed into the queue. - std::scoped_lock lock{cv_mutex}; - cv.notify_one(); + std::scoped_lock lock{consumer_cv_mutex}; + consumer_cv.notify_one(); return true; } @@ -161,6 +163,10 @@ private: // Increment the read index. ++m_read_index; + + // Notify the producer that we have popped off the queue. + std::unique_lock lock{producer_cv_mutex}; + producer_cv.notify_one(); } bool Pop(T& t) { @@ -180,12 +186,16 @@ private: // Increment the read index. ++m_read_index; + // Notify the producer that we have popped off the queue. + std::scoped_lock lock{producer_cv_mutex}; + producer_cv.notify_one(); + return true; } - void Wait(std::stop_token stop_token) { - std::unique_lock lock{cv_mutex}; - Common::CondvarWait(cv, lock, stop_token, [this] { return !Empty(); }); + void ConsumerWait(std::stop_token stop_token) { + std::unique_lock lock{consumer_cv_mutex}; + Common::CondvarWait(consumer_cv, lock, stop_token, [this] { return !Empty(); }); } alignas(128) std::atomic_size_t m_read_index{0}; @@ -193,8 +203,10 @@ private: std::array m_data; - std::condition_variable_any cv; - std::mutex cv_mutex; + std::condition_variable_any producer_cv; + std::mutex producer_cv_mutex; + std::condition_variable_any consumer_cv; + std::mutex consumer_cv_mutex; }; template From 197d7565603b2e8274f5c176f73b468ce6aa46a6 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sun, 19 Mar 2023 15:17:21 -0400 Subject: [PATCH 0203/1181] bounded_threadsafe_queue: Refactor Pop Introduces PopModes to bring waiting logic into Pop, similar to Push. --- src/common/bounded_threadsafe_queue.h | 206 ++++++++------------------ 1 file changed, 64 insertions(+), 142 deletions(-) diff --git a/src/common/bounded_threadsafe_queue.h b/src/common/bounded_threadsafe_queue.h index 0fb2f42d1..bd87aa09b 100644 --- a/src/common/bounded_threadsafe_queue.h +++ b/src/common/bounded_threadsafe_queue.h @@ -22,52 +22,38 @@ class SPSCQueue { static_assert((Capacity & (Capacity - 1)) == 0, "Capacity must be a power of two."); public: - bool TryPush(T&& t) { - return Push(std::move(t)); - } - template bool TryEmplace(Args&&... args) { return Emplace(std::forward(args)...); } - void PushWait(T&& t) { - Push(std::move(t)); - } - template void EmplaceWait(Args&&... args) { Emplace(std::forward(args)...); } bool TryPop(T& t) { - return Pop(t); + return Pop(t); + } + + void PopWait(T& t) { + Pop(t); } void PopWait(T& t, std::stop_token stop_token) { - ConsumerWait(stop_token); - Pop(t); + Pop(t, stop_token); } - T PopWait(std::stop_token stop_token) { - ConsumerWait(stop_token); + T PopWait() { T t; - Pop(t); + Pop(t); return t; } - void Clear() { - while (!Empty()) { - Pop(); - } - } - - bool Empty() const { - return m_read_index.load() == m_write_index.load(); - } - - size_t Size() const { - return m_write_index.load() - m_read_index.load(); + T PopWait(std::stop_token stop_token) { + T t; + Pop(t, stop_token); + return t; } private: @@ -77,55 +63,27 @@ private: Count, }; - template - bool Push(T&& t) { - const size_t write_index = m_write_index.load(); - - if constexpr (Mode == PushMode::Try) { - // Check if we have free slots to write to. - if ((write_index - m_read_index.load()) == Capacity) { - return false; - } - } else if constexpr (Mode == PushMode::Wait) { - // Wait until we have free slots to write to. - std::unique_lock lock{producer_cv_mutex}; - producer_cv.wait(lock, [this, write_index] { - return (write_index - m_read_index.load()) < Capacity; - }); - } else { - static_assert(Mode < PushMode::Count, "Invalid PushMode."); - } - - // Determine the position to write to. - const size_t pos = write_index % Capacity; - - // Push into the queue. - m_data[pos] = std::move(t); - - // Increment the write index. - ++m_write_index; - - // Notify the consumer that we have pushed into the queue. - std::scoped_lock lock{consumer_cv_mutex}; - consumer_cv.notify_one(); - - return true; - } + enum class PopMode { + Try, + Wait, + WaitWithStopToken, + Count, + }; template bool Emplace(Args&&... args) { - const size_t write_index = m_write_index.load(); + const size_t write_index = m_write_index.load(std::memory_order::relaxed); if constexpr (Mode == PushMode::Try) { // Check if we have free slots to write to. - if ((write_index - m_read_index.load()) == Capacity) { + if ((write_index - m_read_index.load(std::memory_order::acquire)) == Capacity) { return false; } } else if constexpr (Mode == PushMode::Wait) { // Wait until we have free slots to write to. std::unique_lock lock{producer_cv_mutex}; producer_cv.wait(lock, [this, write_index] { - return (write_index - m_read_index.load()) < Capacity; + return (write_index - m_read_index.load(std::memory_order::acquire)) < Capacity; }); } else { static_assert(Mode < PushMode::Count, "Invalid PushMode."); @@ -147,34 +105,32 @@ private: return true; } - void Pop() { - const size_t read_index = m_read_index.load(); + template + bool Pop(T& t, [[maybe_unused]] std::stop_token stop_token = {}) { + const size_t read_index = m_read_index.load(std::memory_order::relaxed); - // Check if the queue is empty. - if (read_index == m_write_index.load()) { - return; - } - - // Determine the position to read from. - const size_t pos = read_index % Capacity; - - // Pop the data off the queue, deleting it. - std::destroy_at(std::addressof(m_data[pos])); - - // Increment the read index. - ++m_read_index; - - // Notify the producer that we have popped off the queue. - std::unique_lock lock{producer_cv_mutex}; - producer_cv.notify_one(); - } - - bool Pop(T& t) { - const size_t read_index = m_read_index.load(); - - // Check if the queue is empty. - if (read_index == m_write_index.load()) { - return false; + if constexpr (Mode == PopMode::Try) { + // Check if the queue is empty. + if (read_index == m_write_index.load(std::memory_order::acquire)) { + return false; + } + } else if constexpr (Mode == PopMode::Wait) { + // Wait until the queue is not empty. + std::unique_lock lock{consumer_cv_mutex}; + consumer_cv.wait(lock, [this, read_index] { + return read_index != m_write_index.load(std::memory_order::acquire); + }); + } else if constexpr (Mode == PopMode::WaitWithStopToken) { + // Wait until the queue is not empty. + std::unique_lock lock{consumer_cv_mutex}; + Common::CondvarWait(consumer_cv, lock, stop_token, [this, read_index] { + return read_index != m_write_index.load(std::memory_order::acquire); + }); + if (stop_token.stop_requested()) { + return false; + } + } else { + static_assert(Mode < PopMode::Count, "Invalid PopMode."); } // Determine the position to read from. @@ -193,11 +149,6 @@ private: return true; } - void ConsumerWait(std::stop_token stop_token) { - std::unique_lock lock{consumer_cv_mutex}; - Common::CondvarWait(consumer_cv, lock, stop_token, [this] { return !Empty(); }); - } - alignas(128) std::atomic_size_t m_read_index{0}; alignas(128) std::atomic_size_t m_write_index{0}; @@ -212,22 +163,12 @@ private: template class MPSCQueue { public: - bool TryPush(T&& t) { - std::scoped_lock lock{write_mutex}; - return spsc_queue.TryPush(std::move(t)); - } - template bool TryEmplace(Args&&... args) { std::scoped_lock lock{write_mutex}; return spsc_queue.TryEmplace(std::forward(args)...); } - void PushWait(T&& t) { - std::scoped_lock lock{write_mutex}; - spsc_queue.PushWait(std::move(t)); - } - template void EmplaceWait(Args&&... args) { std::scoped_lock lock{write_mutex}; @@ -238,26 +179,22 @@ public: return spsc_queue.TryPop(t); } + void PopWait(T& t) { + spsc_queue.PopWait(t); + } + void PopWait(T& t, std::stop_token stop_token) { spsc_queue.PopWait(t, stop_token); } + T PopWait() { + return spsc_queue.PopWait(); + } + T PopWait(std::stop_token stop_token) { return spsc_queue.PopWait(stop_token); } - void Clear() { - spsc_queue.Clear(); - } - - bool Empty() { - return spsc_queue.Empty(); - } - - size_t Size() { - return spsc_queue.Size(); - } - private: SPSCQueue spsc_queue; std::mutex write_mutex; @@ -266,22 +203,12 @@ private: template class MPMCQueue { public: - bool TryPush(T&& t) { - std::scoped_lock lock{write_mutex}; - return spsc_queue.TryPush(std::move(t)); - } - template bool TryEmplace(Args&&... args) { std::scoped_lock lock{write_mutex}; return spsc_queue.TryEmplace(std::forward(args)...); } - void PushWait(T&& t) { - std::scoped_lock lock{write_mutex}; - spsc_queue.PushWait(std::move(t)); - } - template void EmplaceWait(Args&&... args) { std::scoped_lock lock{write_mutex}; @@ -293,31 +220,26 @@ public: return spsc_queue.TryPop(t); } + void PopWait(T& t) { + std::scoped_lock lock{read_mutex}; + spsc_queue.PopWait(t); + } + void PopWait(T& t, std::stop_token stop_token) { std::scoped_lock lock{read_mutex}; spsc_queue.PopWait(t, stop_token); } + T PopWait() { + std::scoped_lock lock{read_mutex}; + return spsc_queue.PopWait(); + } + T PopWait(std::stop_token stop_token) { std::scoped_lock lock{read_mutex}; return spsc_queue.PopWait(stop_token); } - void Clear() { - std::scoped_lock lock{read_mutex}; - spsc_queue.Clear(); - } - - bool Empty() { - std::scoped_lock lock{read_mutex}; - return spsc_queue.Empty(); - } - - size_t Size() { - std::scoped_lock lock{read_mutex}; - return spsc_queue.Size(); - } - private: SPSCQueue spsc_queue; std::mutex write_mutex; From fb49ec19c1fb6030fcc960077e82c998290d0ab8 Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 17 Mar 2023 21:26:04 -0400 Subject: [PATCH 0204/1181] kernel: use KTypedAddress for addresses --- src/common/CMakeLists.txt | 1 + src/common/typed_address.h | 320 ++++++++++++++ src/core/CMakeLists.txt | 1 + src/core/arm/arm_interface.cpp | 10 +- src/core/arm/arm_interface.h | 8 +- src/core/arm/dynarmic/arm_dynarmic_32.cpp | 6 +- src/core/arm/dynarmic/arm_dynarmic_32.h | 6 +- src/core/arm/dynarmic/arm_dynarmic_64.cpp | 8 +- src/core/arm/dynarmic/arm_dynarmic_64.h | 6 +- src/core/core.cpp | 4 +- src/core/core.h | 4 +- src/core/debugger/gdbstub.cpp | 36 +- src/core/device_memory.h | 14 +- .../board/nintendo/nx/k_memory_layout.cpp | 12 +- .../board/nintendo/nx/k_memory_layout.h | 4 +- .../board/nintendo/nx/k_system_control.cpp | 2 +- .../board/nintendo/nx/k_system_control.h | 4 +- src/core/hle/kernel/code_set.h | 6 +- src/core/hle/kernel/init/init_slab_setup.cpp | 21 +- src/core/hle/kernel/initial_process.h | 2 +- src/core/hle/kernel/k_address_arbiter.cpp | 32 +- src/core/hle/kernel/k_address_arbiter.h | 14 +- src/core/hle/kernel/k_client_session.cpp | 3 +- src/core/hle/kernel/k_code_memory.cpp | 11 +- src/core/hle/kernel/k_code_memory.h | 16 +- src/core/hle/kernel/k_condition_variable.cpp | 22 +- src/core/hle/kernel/k_condition_variable.h | 8 +- .../hle/kernel/k_device_address_space.cpp | 8 +- src/core/hle/kernel/k_device_address_space.h | 13 +- src/core/hle/kernel/k_dynamic_page_manager.h | 19 +- src/core/hle/kernel/k_dynamic_slab_heap.h | 6 +- src/core/hle/kernel/k_memory_block.h | 22 +- .../hle/kernel/k_memory_block_manager.cpp | 68 +-- src/core/hle/kernel/k_memory_block_manager.h | 32 +- src/core/hle/kernel/k_memory_layout.cpp | 13 +- src/core/hle/kernel/k_memory_layout.h | 78 ++-- src/core/hle/kernel/k_memory_manager.cpp | 51 +-- src/core/hle/kernel/k_memory_manager.h | 48 +-- src/core/hle/kernel/k_memory_region.h | 8 +- src/core/hle/kernel/k_page_buffer.cpp | 4 +- src/core/hle/kernel/k_page_buffer.h | 2 +- src/core/hle/kernel/k_page_group.h | 2 +- src/core/hle/kernel/k_page_heap.cpp | 40 +- src/core/hle/kernel/k_page_heap.h | 48 ++- src/core/hle/kernel/k_page_table.cpp | 392 ++++++++++-------- src/core/hle/kernel/k_page_table.h | 241 ++++++----- src/core/hle/kernel/k_page_table_manager.h | 14 +- src/core/hle/kernel/k_page_table_slab_heap.h | 12 +- src/core/hle/kernel/k_process.cpp | 35 +- src/core/hle/kernel/k_process.h | 43 +- src/core/hle/kernel/k_scheduler.cpp | 2 +- src/core/hle/kernel/k_session_request.cpp | 15 +- src/core/hle/kernel/k_session_request.h | 55 +-- src/core/hle/kernel/k_shared_memory.cpp | 5 +- src/core/hle/kernel/k_shared_memory.h | 8 +- src/core/hle/kernel/k_system_resource.h | 2 +- src/core/hle/kernel/k_thread.cpp | 28 +- src/core/hle/kernel/k_thread.h | 58 +-- src/core/hle/kernel/k_thread_local_page.cpp | 6 +- src/core/hle/kernel/k_thread_local_page.h | 25 +- src/core/hle/kernel/k_transfer_memory.cpp | 2 +- src/core/hle/kernel/k_transfer_memory.h | 6 +- src/core/hle/kernel/k_typed_address.h | 12 + src/core/hle/kernel/kernel.cpp | 108 ++--- src/core/hle/kernel/kernel.h | 3 +- src/core/hle/kernel/memory_types.h | 4 +- .../hle/kernel/svc/svc_address_arbiter.cpp | 8 +- src/core/hle/kernel/svc/svc_code_memory.cpp | 4 +- .../hle/kernel/svc/svc_condition_variable.cpp | 4 +- src/core/hle/kernel/svc/svc_debug_string.cpp | 2 +- src/core/hle/kernel/svc/svc_exception.cpp | 2 +- src/core/hle/kernel/svc/svc_info.cpp | 10 +- src/core/hle/kernel/svc/svc_lock.cpp | 4 +- src/core/hle/kernel/svc/svc_memory.cpp | 13 +- .../hle/kernel/svc/svc_physical_memory.cpp | 6 +- src/core/hle/kernel/svc/svc_port.cpp | 2 +- src/core/hle/kernel/svc/svc_process.cpp | 2 +- .../hle/kernel/svc/svc_process_memory.cpp | 12 +- src/core/hle/kernel/svc/svc_query_memory.cpp | 2 +- src/core/hle/kernel/svc/svc_shared_memory.cpp | 4 +- .../hle/kernel/svc/svc_synchronization.cpp | 2 +- src/core/hle/kernel/svc/svc_thread.cpp | 8 +- .../hle/kernel/svc/svc_transfer_memory.cpp | 2 +- src/core/hle/kernel/svc_types.h | 4 +- .../hid/controllers/console_sixaxis.cpp | 2 +- .../service/hid/controllers/console_sixaxis.h | 6 +- .../hle/service/hid/controllers/palma.cpp | 2 +- src/core/hle/service/hid/controllers/palma.h | 6 +- .../hle/service/hid/hidbus/hidbus_base.cpp | 2 +- src/core/hle/service/hid/hidbus/hidbus_base.h | 6 +- .../hid/irsensor/image_transfer_processor.cpp | 2 +- .../hid/irsensor/image_transfer_processor.h | 6 +- src/core/hle/service/jit/jit.cpp | 6 +- src/core/hle/service/ldr/ldr.cpp | 5 +- .../loader/deconstructed_rom_directory.cpp | 2 +- src/core/loader/kip.cpp | 2 +- src/core/loader/nso.cpp | 2 +- src/core/memory.cpp | 319 +++++++------- src/core/memory.h | 88 ++-- src/core/memory/cheat_engine.cpp | 6 +- src/core/reporter.cpp | 4 +- 101 files changed, 1574 insertions(+), 1102 deletions(-) create mode 100644 src/common/typed_address.h create mode 100644 src/core/hle/kernel/k_typed_address.h diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 61ab68864..90805babe 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -132,6 +132,7 @@ add_library(common STATIC time_zone.h tiny_mt.h tree.h + typed_address.h uint128.h unique_function.h uuid.cpp diff --git a/src/common/typed_address.h b/src/common/typed_address.h new file mode 100644 index 000000000..cf7bbeae1 --- /dev/null +++ b/src/common/typed_address.h @@ -0,0 +1,320 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include +#include +#include + +#include "common/common_types.h" + +namespace Common { + +template +class TypedAddress { +public: + // Constructors. + constexpr inline TypedAddress() : m_address(0) {} + constexpr inline TypedAddress(uint64_t a) : m_address(a) {} + + template + constexpr inline explicit TypedAddress(const U* ptr) + : m_address(reinterpret_cast(ptr)) {} + + // Copy constructor. + constexpr inline TypedAddress(const TypedAddress& rhs) = default; + + // Assignment operator. + constexpr inline TypedAddress& operator=(const TypedAddress& rhs) = default; + + // Arithmetic operators. + template + constexpr inline TypedAddress operator+(I rhs) const { + static_assert(std::is_integral_v); + return m_address + rhs; + } + + constexpr inline TypedAddress operator+(TypedAddress rhs) const { + return m_address + rhs.m_address; + } + + constexpr inline TypedAddress operator++() { + return ++m_address; + } + + constexpr inline TypedAddress operator++(int) { + return m_address++; + } + + template + constexpr inline TypedAddress operator-(I rhs) const { + static_assert(std::is_integral_v); + return m_address - rhs; + } + + constexpr inline ptrdiff_t operator-(TypedAddress rhs) const { + return m_address - rhs.m_address; + } + + constexpr inline TypedAddress operator--() { + return --m_address; + } + + constexpr inline TypedAddress operator--(int) { + return m_address--; + } + + template + constexpr inline TypedAddress operator+=(I rhs) { + static_assert(std::is_integral_v); + m_address += rhs; + return *this; + } + + template + constexpr inline TypedAddress operator-=(I rhs) { + static_assert(std::is_integral_v); + m_address -= rhs; + return *this; + } + + // Logical operators. + constexpr inline uint64_t operator&(uint64_t mask) const { + return m_address & mask; + } + + constexpr inline uint64_t operator|(uint64_t mask) const { + return m_address | mask; + } + + template + constexpr inline TypedAddress operator|=(I rhs) { + static_assert(std::is_integral_v); + m_address |= rhs; + return *this; + } + + constexpr inline uint64_t operator<<(int shift) const { + return m_address << shift; + } + + constexpr inline uint64_t operator>>(int shift) const { + return m_address >> shift; + } + + template + constexpr inline size_t operator/(U size) const { + return m_address / size; + } + + constexpr explicit operator bool() const { + return m_address != 0; + } + + // constexpr inline uint64_t operator%(U align) const { return m_address % align; } + + // Comparison operators. + constexpr bool operator==(const TypedAddress&) const = default; + constexpr bool operator!=(const TypedAddress&) const = default; + constexpr auto operator<=>(const TypedAddress&) const = default; + + // For convenience, also define comparison operators versus uint64_t. + constexpr inline bool operator==(uint64_t rhs) const { + return m_address == rhs; + } + + constexpr inline bool operator!=(uint64_t rhs) const { + return m_address != rhs; + } + + // Allow getting the address explicitly, for use in accessors. + constexpr inline uint64_t GetValue() const { + return m_address; + } + +private: + uint64_t m_address{}; +}; + +struct PhysicalAddressTag {}; +struct VirtualAddressTag {}; +struct ProcessAddressTag {}; + +using PhysicalAddress = TypedAddress; +using VirtualAddress = TypedAddress; +using ProcessAddress = TypedAddress; + +// Define accessors. +template +concept IsTypedAddress = std::same_as || std::same_as || + std::same_as; + +template +constexpr inline T Null = [] { + if constexpr (std::is_same::value) { + return 0; + } else { + static_assert(std::is_same::value || + std::is_same::value || + std::is_same::value); + return T(0); + } +}(); + +// Basic type validations. +static_assert(sizeof(PhysicalAddress) == sizeof(uint64_t)); +static_assert(sizeof(VirtualAddress) == sizeof(uint64_t)); +static_assert(sizeof(ProcessAddress) == sizeof(uint64_t)); + +static_assert(std::is_trivially_copyable_v); +static_assert(std::is_trivially_copyable_v); +static_assert(std::is_trivially_copyable_v); + +static_assert(std::is_trivially_copy_constructible_v); +static_assert(std::is_trivially_copy_constructible_v); +static_assert(std::is_trivially_copy_constructible_v); + +static_assert(std::is_trivially_move_constructible_v); +static_assert(std::is_trivially_move_constructible_v); +static_assert(std::is_trivially_move_constructible_v); + +static_assert(std::is_trivially_copy_assignable_v); +static_assert(std::is_trivially_copy_assignable_v); +static_assert(std::is_trivially_copy_assignable_v); + +static_assert(std::is_trivially_move_assignable_v); +static_assert(std::is_trivially_move_assignable_v); +static_assert(std::is_trivially_move_assignable_v); + +static_assert(std::is_trivially_destructible_v); +static_assert(std::is_trivially_destructible_v); +static_assert(std::is_trivially_destructible_v); + +static_assert(Null == 0); +static_assert(Null == Null); +static_assert(Null == Null); +static_assert(Null == Null); + +// Constructor/assignment validations. +static_assert([] { + const PhysicalAddress a(5); + PhysicalAddress b(a); + return b; +}() == PhysicalAddress(5)); +static_assert([] { + const PhysicalAddress a(5); + PhysicalAddress b(10); + b = a; + return b; +}() == PhysicalAddress(5)); + +// Arithmetic validations. +static_assert(PhysicalAddress(10) + 5 == PhysicalAddress(15)); +static_assert(PhysicalAddress(10) - 5 == PhysicalAddress(5)); +static_assert([] { + PhysicalAddress v(10); + v += 5; + return v; +}() == PhysicalAddress(15)); +static_assert([] { + PhysicalAddress v(10); + v -= 5; + return v; +}() == PhysicalAddress(5)); +static_assert(PhysicalAddress(10)++ == PhysicalAddress(10)); +static_assert(++PhysicalAddress(10) == PhysicalAddress(11)); +static_assert(PhysicalAddress(10)-- == PhysicalAddress(10)); +static_assert(--PhysicalAddress(10) == PhysicalAddress(9)); + +// Logical validations. +static_assert((PhysicalAddress(0b11111111) >> 1) == 0b01111111); +static_assert((PhysicalAddress(0b10101010) >> 1) == 0b01010101); +static_assert((PhysicalAddress(0b11111111) << 1) == 0b111111110); +static_assert((PhysicalAddress(0b01010101) << 1) == 0b10101010); +static_assert((PhysicalAddress(0b11111111) & 0b01010101) == 0b01010101); +static_assert((PhysicalAddress(0b11111111) & 0b10101010) == 0b10101010); +static_assert((PhysicalAddress(0b01010101) & 0b10101010) == 0b00000000); +static_assert((PhysicalAddress(0b00000000) | 0b01010101) == 0b01010101); +static_assert((PhysicalAddress(0b11111111) | 0b01010101) == 0b11111111); +static_assert((PhysicalAddress(0b10101010) | 0b01010101) == 0b11111111); + +// Comparisons. +static_assert(PhysicalAddress(0) == PhysicalAddress(0)); +static_assert(PhysicalAddress(0) != PhysicalAddress(1)); +static_assert(PhysicalAddress(0) < PhysicalAddress(1)); +static_assert(PhysicalAddress(0) <= PhysicalAddress(1)); +static_assert(PhysicalAddress(1) > PhysicalAddress(0)); +static_assert(PhysicalAddress(1) >= PhysicalAddress(0)); + +static_assert(!(PhysicalAddress(0) == PhysicalAddress(1))); +static_assert(!(PhysicalAddress(0) != PhysicalAddress(0))); +static_assert(!(PhysicalAddress(1) < PhysicalAddress(0))); +static_assert(!(PhysicalAddress(1) <= PhysicalAddress(0))); +static_assert(!(PhysicalAddress(0) > PhysicalAddress(1))); +static_assert(!(PhysicalAddress(0) >= PhysicalAddress(1))); + +} // namespace Common + +template +constexpr inline uint64_t GetInteger(Common::TypedAddress address) { + return address.GetValue(); +} + +template <> +struct fmt::formatter { + constexpr auto parse(fmt::format_parse_context& ctx) { + return ctx.begin(); + } + template + auto format(const Common::PhysicalAddress& addr, FormatContext& ctx) { + return fmt::format_to(ctx.out(), "{:#x}", static_cast(addr.GetValue())); + } +}; + +template <> +struct fmt::formatter { + constexpr auto parse(fmt::format_parse_context& ctx) { + return ctx.begin(); + } + template + auto format(const Common::ProcessAddress& addr, FormatContext& ctx) { + return fmt::format_to(ctx.out(), "{:#x}", static_cast(addr.GetValue())); + } +}; + +template <> +struct fmt::formatter { + constexpr auto parse(fmt::format_parse_context& ctx) { + return ctx.begin(); + } + template + auto format(const Common::VirtualAddress& addr, FormatContext& ctx) { + return fmt::format_to(ctx.out(), "{:#x}", static_cast(addr.GetValue())); + } +}; + +namespace std { + +template <> +struct hash { + size_t operator()(const Common::PhysicalAddress& k) const noexcept { + return k.GetValue(); + } +}; + +template <> +struct hash { + size_t operator()(const Common::ProcessAddress& k) const noexcept { + return k.GetValue(); + } +}; + +template <> +struct hash { + size_t operator()(const Common::VirtualAddress& k) const noexcept { + return k.GetValue(); + } +}; + +} // namespace std diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 378e6c023..4e677f287 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -278,6 +278,7 @@ add_library(core STATIC hle/kernel/k_trace.h hle/kernel/k_transfer_memory.cpp hle/kernel/k_transfer_memory.h + hle/kernel/k_typed_address.h hle/kernel/k_worker_task.h hle/kernel/k_worker_task_manager.cpp hle/kernel/k_worker_task_manager.h diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp index 4a331d4c1..be3f55cd2 100644 --- a/src/core/arm/arm_interface.cpp +++ b/src/core/arm/arm_interface.cpp @@ -168,21 +168,21 @@ void ARM_Interface::LoadWatchpointArray(const WatchpointArray& wp) { } const Kernel::DebugWatchpoint* ARM_Interface::MatchingWatchpoint( - VAddr addr, u64 size, Kernel::DebugWatchpointType access_type) const { + u64 addr, u64 size, Kernel::DebugWatchpointType access_type) const { if (!watchpoints) { return nullptr; } - const VAddr start_address{addr}; - const VAddr end_address{addr + size}; + const u64 start_address{addr}; + const u64 end_address{addr + size}; for (size_t i = 0; i < Core::Hardware::NUM_WATCHPOINTS; i++) { const auto& watch{(*watchpoints)[i]}; - if (end_address <= watch.start_address) { + if (end_address <= GetInteger(watch.start_address)) { continue; } - if (start_address >= watch.end_address) { + if (start_address >= GetInteger(watch.end_address)) { continue; } if ((access_type & watch.type) == Kernel::DebugWatchpointType::None) { diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index c40771c97..8e40702cc 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h @@ -78,7 +78,7 @@ public: * @param addr Start address of the cache range to clear * @param size Size of the cache range to clear, starting at addr */ - virtual void InvalidateCacheRange(VAddr addr, std::size_t size) = 0; + virtual void InvalidateCacheRange(u64 addr, std::size_t size) = 0; /** * Notifies CPU emulation that the current page table has changed. @@ -149,9 +149,9 @@ public: */ virtual void SetPSTATE(u32 pstate) = 0; - virtual VAddr GetTlsAddress() const = 0; + virtual u64 GetTlsAddress() const = 0; - virtual void SetTlsAddress(VAddr address) = 0; + virtual void SetTlsAddress(u64 address) = 0; /** * Gets the value within the TPIDR_EL0 (read/write software thread ID) register. @@ -214,7 +214,7 @@ protected: static void SymbolicateBacktrace(Core::System& system, std::vector& out); const Kernel::DebugWatchpoint* MatchingWatchpoint( - VAddr addr, u64 size, Kernel::DebugWatchpointType access_type) const; + u64 addr, u64 size, Kernel::DebugWatchpointType access_type) const; virtual Dynarmic::HaltReason RunJit() = 0; virtual Dynarmic::HaltReason StepJit() = 0; diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index 2a7570073..aa92d3fc3 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -155,7 +155,7 @@ public: return std::max(parent.system.CoreTiming().GetDowncount(), 0); } - bool CheckMemoryAccess(VAddr addr, u64 size, Kernel::DebugWatchpointType type) { + bool CheckMemoryAccess(u64 addr, u64 size, Kernel::DebugWatchpointType type) { if (!check_memory_access) { return true; } @@ -397,7 +397,7 @@ u64 ARM_Dynarmic_32::GetTlsAddress() const { return cp15->uro; } -void ARM_Dynarmic_32::SetTlsAddress(VAddr address) { +void ARM_Dynarmic_32::SetTlsAddress(u64 address) { cp15->uro = static_cast(address); } @@ -439,7 +439,7 @@ void ARM_Dynarmic_32::ClearInstructionCache() { jit.load()->ClearCache(); } -void ARM_Dynarmic_32::InvalidateCacheRange(VAddr addr, std::size_t size) { +void ARM_Dynarmic_32::InvalidateCacheRange(u64 addr, std::size_t size) { jit.load()->InvalidateCacheRange(static_cast(addr), size); } diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.h b/src/core/arm/dynarmic/arm_dynarmic_32.h index d24ba2289..bce695daf 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.h +++ b/src/core/arm/dynarmic/arm_dynarmic_32.h @@ -41,8 +41,8 @@ public: void SetVectorReg(int index, u128 value) override; u32 GetPSTATE() const override; void SetPSTATE(u32 pstate) override; - VAddr GetTlsAddress() const override; - void SetTlsAddress(VAddr address) override; + u64 GetTlsAddress() const override; + void SetTlsAddress(u64 address) override; void SetTPIDR_EL0(u64 value) override; u64 GetTPIDR_EL0() const override; @@ -60,7 +60,7 @@ public: void ClearExclusiveState() override; void ClearInstructionCache() override; - void InvalidateCacheRange(VAddr addr, std::size_t size) override; + void InvalidateCacheRange(u64 addr, std::size_t size) override; void PageTableChanged(Common::PageTable& new_page_table, std::size_t new_address_space_size_in_bits) override; diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp index 7229fdc2a..67073c84d 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp @@ -117,7 +117,7 @@ public: } void InstructionCacheOperationRaised(Dynarmic::A64::InstructionCacheOperation op, - VAddr value) override { + u64 value) override { switch (op) { case Dynarmic::A64::InstructionCacheOperation::InvalidateByVAToPoU: { static constexpr u64 ICACHE_LINE_SIZE = 64; @@ -199,7 +199,7 @@ public: return parent.system.CoreTiming().GetClockTicks(); } - bool CheckMemoryAccess(VAddr addr, u64 size, Kernel::DebugWatchpointType type) { + bool CheckMemoryAccess(u64 addr, u64 size, Kernel::DebugWatchpointType type) { if (!check_memory_access) { return true; } @@ -452,7 +452,7 @@ u64 ARM_Dynarmic_64::GetTlsAddress() const { return cb->tpidrro_el0; } -void ARM_Dynarmic_64::SetTlsAddress(VAddr address) { +void ARM_Dynarmic_64::SetTlsAddress(u64 address) { cb->tpidrro_el0 = address; } @@ -500,7 +500,7 @@ void ARM_Dynarmic_64::ClearInstructionCache() { jit.load()->ClearCache(); } -void ARM_Dynarmic_64::InvalidateCacheRange(VAddr addr, std::size_t size) { +void ARM_Dynarmic_64::InvalidateCacheRange(u64 addr, std::size_t size) { jit.load()->InvalidateCacheRange(addr, size); } diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.h b/src/core/arm/dynarmic/arm_dynarmic_64.h index ed1a5eb96..e83599e82 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.h +++ b/src/core/arm/dynarmic/arm_dynarmic_64.h @@ -38,8 +38,8 @@ public: void SetVectorReg(int index, u128 value) override; u32 GetPSTATE() const override; void SetPSTATE(u32 pstate) override; - VAddr GetTlsAddress() const override; - void SetTlsAddress(VAddr address) override; + u64 GetTlsAddress() const override; + void SetTlsAddress(u64 address) override; void SetTPIDR_EL0(u64 value) override; u64 GetTPIDR_EL0() const override; @@ -53,7 +53,7 @@ public: void ClearExclusiveState() override; void ClearInstructionCache() override; - void InvalidateCacheRange(VAddr addr, std::size_t size) override; + void InvalidateCacheRange(u64 addr, std::size_t size) override; void PageTableChanged(Common::PageTable& new_page_table, std::size_t new_address_space_size_in_bits) override; diff --git a/src/core/core.cpp b/src/core/core.cpp index d2b597068..f6273ac39 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -564,7 +564,7 @@ void System::InvalidateCpuInstructionCaches() { impl->kernel.InvalidateAllInstructionCaches(); } -void System::InvalidateCpuInstructionCacheRange(VAddr addr, std::size_t size) { +void System::InvalidateCpuInstructionCacheRange(u64 addr, std::size_t size) { impl->kernel.InvalidateCpuInstructionCacheRange(addr, size); } @@ -794,7 +794,7 @@ FileSys::VirtualFilesystem System::GetFilesystem() const { } void System::RegisterCheatList(const std::vector& list, - const std::array& build_id, VAddr main_region_begin, + const std::array& build_id, u64 main_region_begin, u64 main_region_size) { impl->cheat_engine = std::make_unique(*this, list, build_id); impl->cheat_engine->SetMainMemoryParameters(main_region_begin, main_region_size); diff --git a/src/core/core.h b/src/core/core.h index 5843696d4..7032240be 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -172,7 +172,7 @@ public: */ void InvalidateCpuInstructionCaches(); - void InvalidateCpuInstructionCacheRange(VAddr addr, std::size_t size); + void InvalidateCpuInstructionCacheRange(u64 addr, std::size_t size); /// Shutdown the main emulated process. void ShutdownMainProcess(); @@ -353,7 +353,7 @@ public: [[nodiscard]] FileSys::VirtualFilesystem GetFilesystem() const; void RegisterCheatList(const std::vector& list, - const std::array& build_id, VAddr main_region_begin, + const std::array& build_id, u64 main_region_begin, u64 main_region_size); void SetAppletFrontendSet(Service::AM::Applets::AppletFrontendSet&& set); diff --git a/src/core/debugger/gdbstub.cpp b/src/core/debugger/gdbstub.cpp index b2fe6bd7d..5cfb66b93 100644 --- a/src/core/debugger/gdbstub.cpp +++ b/src/core/debugger/gdbstub.cpp @@ -118,14 +118,14 @@ void GDBStub::Watchpoint(Kernel::KThread* thread, const Kernel::DebugWatchpoint& switch (watch.type) { case Kernel::DebugWatchpointType::Read: - SendReply(fmt::format("{}rwatch:{:x};", status, watch.start_address)); + SendReply(fmt::format("{}rwatch:{:x};", status, GetInteger(watch.start_address))); break; case Kernel::DebugWatchpointType::Write: - SendReply(fmt::format("{}watch:{:x};", status, watch.start_address)); + SendReply(fmt::format("{}watch:{:x};", status, GetInteger(watch.start_address))); break; case Kernel::DebugWatchpointType::ReadOrWrite: default: - SendReply(fmt::format("{}awatch:{:x};", status, watch.start_address)); + SendReply(fmt::format("{}awatch:{:x};", status, GetInteger(watch.start_address))); break; } } @@ -554,8 +554,9 @@ void GDBStub::HandleQuery(std::string_view command) { if (main != modules.end()) { SendReply(fmt::format("TextSeg={:x}", main->first)); } else { - SendReply(fmt::format("TextSeg={:x}", - system.ApplicationProcess()->PageTable().GetCodeRegionStart())); + SendReply(fmt::format( + "TextSeg={:x}", + GetInteger(system.ApplicationProcess()->PageTable().GetCodeRegionStart()))); } } else if (command.starts_with("Xfer:libraries:read::")) { Loader::AppLoader::Modules modules; @@ -757,17 +758,20 @@ void GDBStub::HandleRcmd(const std::vector& command) { reply = fmt::format("Process: {:#x} ({})\n" "Program Id: {:#018x}\n", process->GetProcessId(), process->GetName(), process->GetProgramId()); - reply += - fmt::format("Layout:\n" - " Alias: {:#012x} - {:#012x}\n" - " Heap: {:#012x} - {:#012x}\n" - " Aslr: {:#012x} - {:#012x}\n" - " Stack: {:#012x} - {:#012x}\n" - "Modules:\n", - page_table.GetAliasRegionStart(), page_table.GetAliasRegionEnd(), - page_table.GetHeapRegionStart(), page_table.GetHeapRegionEnd(), - page_table.GetAliasCodeRegionStart(), page_table.GetAliasCodeRegionEnd(), - page_table.GetStackRegionStart(), page_table.GetStackRegionEnd()); + reply += fmt::format("Layout:\n" + " Alias: {:#012x} - {:#012x}\n" + " Heap: {:#012x} - {:#012x}\n" + " Aslr: {:#012x} - {:#012x}\n" + " Stack: {:#012x} - {:#012x}\n" + "Modules:\n", + GetInteger(page_table.GetAliasRegionStart()), + GetInteger(page_table.GetAliasRegionEnd()), + GetInteger(page_table.GetHeapRegionStart()), + GetInteger(page_table.GetHeapRegionEnd()), + GetInteger(page_table.GetAliasCodeRegionStart()), + GetInteger(page_table.GetAliasCodeRegionEnd()), + GetInteger(page_table.GetStackRegionStart()), + GetInteger(page_table.GetStackRegionEnd())); for (const auto& [vaddr, name] : modules) { reply += fmt::format(" {:#012x} - {:#012x} {}\n", vaddr, diff --git a/src/core/device_memory.h b/src/core/device_memory.h index 90510733c..13388b73e 100644 --- a/src/core/device_memory.h +++ b/src/core/device_memory.h @@ -3,8 +3,8 @@ #pragma once -#include "common/common_types.h" #include "common/host_memory.h" +#include "common/typed_address.h" namespace Core { @@ -25,20 +25,22 @@ public: DeviceMemory(const DeviceMemory&) = delete; template - PAddr GetPhysicalAddr(const T* ptr) const { + Common::PhysicalAddress GetPhysicalAddr(const T* ptr) const { return (reinterpret_cast(ptr) - reinterpret_cast(buffer.BackingBasePointer())) + DramMemoryMap::Base; } template - T* GetPointer(PAddr addr) { - return reinterpret_cast(buffer.BackingBasePointer() + (addr - DramMemoryMap::Base)); + T* GetPointer(Common::PhysicalAddress addr) { + return reinterpret_cast(buffer.BackingBasePointer() + + (GetInteger(addr) - DramMemoryMap::Base)); } template - const T* GetPointer(PAddr addr) const { - return reinterpret_cast(buffer.BackingBasePointer() + (addr - DramMemoryMap::Base)); + const T* GetPointer(Common::PhysicalAddress addr) const { + return reinterpret_cast(buffer.BackingBasePointer() + + (GetInteger(addr) - DramMemoryMap::Base)); } Common::HostMemory buffer; diff --git a/src/core/hle/kernel/board/nintendo/nx/k_memory_layout.cpp b/src/core/hle/kernel/board/nintendo/nx/k_memory_layout.cpp index 098ba6eac..24eb3f886 100644 --- a/src/core/hle/kernel/board/nintendo/nx/k_memory_layout.cpp +++ b/src/core/hle/kernel/board/nintendo/nx/k_memory_layout.cpp @@ -76,22 +76,24 @@ void SetupDevicePhysicalMemoryRegions(KMemoryLayout& memory_layout) { void SetupDramPhysicalMemoryRegions(KMemoryLayout& memory_layout) { const size_t intended_memory_size = KSystemControl::Init::GetIntendedMemorySize(); - const PAddr physical_memory_base_address = + const KPhysicalAddress physical_memory_base_address = KSystemControl::Init::GetKernelPhysicalBaseAddress(DramPhysicalAddress); // Insert blocks into the tree. ASSERT(memory_layout.GetPhysicalMemoryRegionTree().Insert( - physical_memory_base_address, intended_memory_size, KMemoryRegionType_Dram)); + GetInteger(physical_memory_base_address), intended_memory_size, KMemoryRegionType_Dram)); ASSERT(memory_layout.GetPhysicalMemoryRegionTree().Insert( - physical_memory_base_address, ReservedEarlyDramSize, KMemoryRegionType_DramReservedEarly)); + GetInteger(physical_memory_base_address), ReservedEarlyDramSize, + KMemoryRegionType_DramReservedEarly)); // Insert the KTrace block at the end of Dram, if KTrace is enabled. static_assert(!IsKTraceEnabled || KTraceBufferSize > 0); if constexpr (IsKTraceEnabled) { - const PAddr ktrace_buffer_phys_addr = + const KPhysicalAddress ktrace_buffer_phys_addr = physical_memory_base_address + intended_memory_size - KTraceBufferSize; ASSERT(memory_layout.GetPhysicalMemoryRegionTree().Insert( - ktrace_buffer_phys_addr, KTraceBufferSize, KMemoryRegionType_KernelTraceBuffer)); + GetInteger(ktrace_buffer_phys_addr), KTraceBufferSize, + KMemoryRegionType_KernelTraceBuffer)); } } diff --git a/src/core/hle/kernel/board/nintendo/nx/k_memory_layout.h b/src/core/hle/kernel/board/nintendo/nx/k_memory_layout.h index d02ee61c3..f8fee4f5b 100644 --- a/src/core/hle/kernel/board/nintendo/nx/k_memory_layout.h +++ b/src/core/hle/kernel/board/nintendo/nx/k_memory_layout.h @@ -3,10 +3,10 @@ #pragma once -#include "common/common_types.h" +#include "core/hle/kernel/k_typed_address.h" namespace Kernel { -constexpr inline PAddr MainMemoryAddress = 0x80000000; +constexpr inline KPhysicalAddress MainMemoryAddress = 0x80000000; } // namespace Kernel diff --git a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp index 5b8a248c8..42d1fcc28 100644 --- a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp +++ b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp @@ -61,7 +61,7 @@ size_t KSystemControl::Init::GetIntendedMemorySize() { } } -PAddr KSystemControl::Init::GetKernelPhysicalBaseAddress(u64 base_address) { +KPhysicalAddress KSystemControl::Init::GetKernelPhysicalBaseAddress(KPhysicalAddress base_address) { const size_t real_dram_size = KSystemControl::Init::GetRealMemorySize(); const size_t intended_dram_size = KSystemControl::Init::GetIntendedMemorySize(); if (intended_dram_size * 2 < real_dram_size) { diff --git a/src/core/hle/kernel/board/nintendo/nx/k_system_control.h b/src/core/hle/kernel/board/nintendo/nx/k_system_control.h index 4b717d091..b477e8193 100644 --- a/src/core/hle/kernel/board/nintendo/nx/k_system_control.h +++ b/src/core/hle/kernel/board/nintendo/nx/k_system_control.h @@ -3,7 +3,7 @@ #pragma once -#include "common/common_types.h" +#include "core/hle/kernel/k_typed_address.h" namespace Kernel::Board::Nintendo::Nx { @@ -18,7 +18,7 @@ public: // Initialization. static std::size_t GetRealMemorySize(); static std::size_t GetIntendedMemorySize(); - static PAddr GetKernelPhysicalBaseAddress(u64 base_address); + static KPhysicalAddress GetKernelPhysicalBaseAddress(KPhysicalAddress base_address); static bool ShouldIncreaseThreadResourceLimit(); static std::size_t GetApplicationPoolSize(); static std::size_t GetAppletPoolSize(); diff --git a/src/core/hle/kernel/code_set.h b/src/core/hle/kernel/code_set.h index 5220dbcb6..af1af2b78 100644 --- a/src/core/hle/kernel/code_set.h +++ b/src/core/hle/kernel/code_set.h @@ -5,7 +5,7 @@ #include -#include "common/common_types.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/kernel/physical_memory.h" namespace Kernel { @@ -36,7 +36,7 @@ struct CodeSet final { std::size_t offset = 0; /// The address to map this segment to. - VAddr addr = 0; + KProcessAddress addr = 0; /// The size of this segment in bytes. u32 size = 0; @@ -82,7 +82,7 @@ struct CodeSet final { std::array segments; /// The entry point address for this code set. - VAddr entrypoint = 0; + KProcessAddress entrypoint = 0; }; } // namespace Kernel diff --git a/src/core/hle/kernel/init/init_slab_setup.cpp b/src/core/hle/kernel/init/init_slab_setup.cpp index 5e4090e2b..1f2db673c 100644 --- a/src/core/hle/kernel/init/init_slab_setup.cpp +++ b/src/core/hle/kernel/init/init_slab_setup.cpp @@ -4,7 +4,6 @@ #include "common/alignment.h" #include "common/assert.h" #include "common/common_funcs.h" -#include "common/common_types.h" #include "core/core.h" #include "core/device_memory.h" #include "core/hardware_properties.h" @@ -30,6 +29,7 @@ #include "core/hle/kernel/k_thread.h" #include "core/hle/kernel/k_thread_local_page.h" #include "core/hle/kernel/k_transfer_memory.h" +#include "core/hle/kernel/k_typed_address.h" namespace Kernel::Init { @@ -104,17 +104,18 @@ static_assert(KernelPageBufferAdditionalSize == /// Helper function to translate from the slab virtual address to the reserved location in physical /// memory. -static PAddr TranslateSlabAddrToPhysical(KMemoryLayout& memory_layout, VAddr slab_addr) { - slab_addr -= memory_layout.GetSlabRegionAddress(); - return slab_addr + Core::DramMemoryMap::SlabHeapBase; +static KPhysicalAddress TranslateSlabAddrToPhysical(KMemoryLayout& memory_layout, + KVirtualAddress slab_addr) { + slab_addr -= GetInteger(memory_layout.GetSlabRegionAddress()); + return GetInteger(slab_addr) + Core::DramMemoryMap::SlabHeapBase; } template -VAddr InitializeSlabHeap(Core::System& system, KMemoryLayout& memory_layout, VAddr address, - size_t num_objects) { +KVirtualAddress InitializeSlabHeap(Core::System& system, KMemoryLayout& memory_layout, + KVirtualAddress address, size_t num_objects) { const size_t size = Common::AlignUp(sizeof(T) * num_objects, alignof(void*)); - VAddr start = Common::AlignUp(address, alignof(T)); + KVirtualAddress start = Common::AlignUp(GetInteger(address), alignof(T)); // This should use the virtual memory address passed in, but currently, we do not setup the // kernel virtual memory layout. Instead, we simply map these at a region of physical memory @@ -195,7 +196,7 @@ void InitializeSlabHeaps(Core::System& system, KMemoryLayout& memory_layout) { auto& kernel = system.Kernel(); // Get the start of the slab region, since that's where we'll be working. - VAddr address = memory_layout.GetSlabRegionAddress(); + KVirtualAddress address = memory_layout.GetSlabRegionAddress(); // Initialize slab type array to be in sorted order. std::array slab_types; @@ -228,7 +229,7 @@ void InitializeSlabHeaps(Core::System& system, KMemoryLayout& memory_layout) { } // Track the gaps, so that we can free them to the unused slab tree. - VAddr gap_start = address; + KVirtualAddress gap_start = address; size_t gap_size = 0; for (size_t i = 0; i < slab_gaps.size(); i++) { @@ -280,7 +281,7 @@ void KPageBufferSlabHeap::Initialize(Core::System& system) { // Allocate memory for the slab. constexpr auto AllocateOption = KMemoryManager::EncodeOption( KMemoryManager::Pool::System, KMemoryManager::Direction::FromFront); - const PAddr slab_address = + const KPhysicalAddress slab_address = kernel.MemoryManager().AllocateAndOpenContinuous(num_pages, 1, AllocateOption); ASSERT(slab_address != 0); diff --git a/src/core/hle/kernel/initial_process.h b/src/core/hle/kernel/initial_process.h index af0fb23b6..82195f4f7 100644 --- a/src/core/hle/kernel/initial_process.h +++ b/src/core/hle/kernel/initial_process.h @@ -14,7 +14,7 @@ using namespace Common::Literals; constexpr std::size_t InitialProcessBinarySizeMax = 12_MiB; -static inline PAddr GetInitialProcessBinaryPhysicalAddress() { +static inline KPhysicalAddress GetInitialProcessBinaryPhysicalAddress() { return Kernel::Board::Nintendo::Nx::KSystemControl::Init::GetKernelPhysicalBaseAddress( MainMemoryAddress); } diff --git a/src/core/hle/kernel/k_address_arbiter.cpp b/src/core/hle/kernel/k_address_arbiter.cpp index 30a4e6edb..274928dcf 100644 --- a/src/core/hle/kernel/k_address_arbiter.cpp +++ b/src/core/hle/kernel/k_address_arbiter.cpp @@ -8,6 +8,7 @@ #include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" #include "core/hle/kernel/k_thread.h" #include "core/hle/kernel/k_thread_queue.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/svc_results.h" #include "core/memory.h" @@ -20,12 +21,12 @@ KAddressArbiter::~KAddressArbiter() = default; namespace { -bool ReadFromUser(Core::System& system, s32* out, VAddr address) { - *out = system.Memory().Read32(address); +bool ReadFromUser(Core::System& system, s32* out, KProcessAddress address) { + *out = system.Memory().Read32(GetInteger(address)); return true; } -bool DecrementIfLessThan(Core::System& system, s32* out, VAddr address, s32 value) { +bool DecrementIfLessThan(Core::System& system, s32* out, KProcessAddress address, s32 value) { auto& monitor = system.Monitor(); const auto current_core = system.Kernel().CurrentPhysicalCoreIndex(); @@ -35,7 +36,8 @@ bool DecrementIfLessThan(Core::System& system, s32* out, VAddr address, s32 valu // TODO(bunnei): We should call CanAccessAtomic(..) here. // Load the value from the address. - const s32 current_value = static_cast(monitor.ExclusiveRead32(current_core, address)); + const s32 current_value = + static_cast(monitor.ExclusiveRead32(current_core, GetInteger(address))); // Compare it to the desired one. if (current_value < value) { @@ -43,7 +45,8 @@ bool DecrementIfLessThan(Core::System& system, s32* out, VAddr address, s32 valu const s32 decrement_value = current_value - 1; // Decrement and try to store. - if (!monitor.ExclusiveWrite32(current_core, address, static_cast(decrement_value))) { + if (!monitor.ExclusiveWrite32(current_core, GetInteger(address), + static_cast(decrement_value))) { // If we failed to store, try again. DecrementIfLessThan(system, out, address, value); } @@ -57,7 +60,8 @@ bool DecrementIfLessThan(Core::System& system, s32* out, VAddr address, s32 valu return true; } -bool UpdateIfEqual(Core::System& system, s32* out, VAddr address, s32 value, s32 new_value) { +bool UpdateIfEqual(Core::System& system, s32* out, KProcessAddress address, s32 value, + s32 new_value) { auto& monitor = system.Monitor(); const auto current_core = system.Kernel().CurrentPhysicalCoreIndex(); @@ -67,14 +71,16 @@ bool UpdateIfEqual(Core::System& system, s32* out, VAddr address, s32 value, s32 // TODO(bunnei): We should call CanAccessAtomic(..) here. // Load the value from the address. - const s32 current_value = static_cast(monitor.ExclusiveRead32(current_core, address)); + const s32 current_value = + static_cast(monitor.ExclusiveRead32(current_core, GetInteger(address))); // Compare it to the desired one. if (current_value == value) { // If equal, we want to try to write the new value. // Try to store. - if (!monitor.ExclusiveWrite32(current_core, address, static_cast(new_value))) { + if (!monitor.ExclusiveWrite32(current_core, GetInteger(address), + static_cast(new_value))) { // If we failed to store, try again. UpdateIfEqual(system, out, address, value, new_value); } @@ -110,7 +116,7 @@ private: } // namespace -Result KAddressArbiter::Signal(VAddr addr, s32 count) { +Result KAddressArbiter::Signal(uint64_t addr, s32 count) { // Perform signaling. s32 num_waiters{}; { @@ -133,7 +139,7 @@ Result KAddressArbiter::Signal(VAddr addr, s32 count) { R_SUCCEED(); } -Result KAddressArbiter::SignalAndIncrementIfEqual(VAddr addr, s32 value, s32 count) { +Result KAddressArbiter::SignalAndIncrementIfEqual(uint64_t addr, s32 value, s32 count) { // Perform signaling. s32 num_waiters{}; { @@ -162,7 +168,7 @@ Result KAddressArbiter::SignalAndIncrementIfEqual(VAddr addr, s32 value, s32 cou R_SUCCEED(); } -Result KAddressArbiter::SignalAndModifyByWaitingCountIfEqual(VAddr addr, s32 value, s32 count) { +Result KAddressArbiter::SignalAndModifyByWaitingCountIfEqual(uint64_t addr, s32 value, s32 count) { // Perform signaling. s32 num_waiters{}; { @@ -225,7 +231,7 @@ Result KAddressArbiter::SignalAndModifyByWaitingCountIfEqual(VAddr addr, s32 val R_SUCCEED(); } -Result KAddressArbiter::WaitIfLessThan(VAddr addr, s32 value, bool decrement, s64 timeout) { +Result KAddressArbiter::WaitIfLessThan(uint64_t addr, s32 value, bool decrement, s64 timeout) { // Prepare to wait. KThread* cur_thread = GetCurrentThreadPointer(m_kernel); KHardwareTimer* timer{}; @@ -280,7 +286,7 @@ Result KAddressArbiter::WaitIfLessThan(VAddr addr, s32 value, bool decrement, s6 return cur_thread->GetWaitResult(); } -Result KAddressArbiter::WaitIfEqual(VAddr addr, s32 value, s64 timeout) { +Result KAddressArbiter::WaitIfEqual(uint64_t addr, s32 value, s64 timeout) { // Prepare to wait. KThread* cur_thread = GetCurrentThreadPointer(m_kernel); KHardwareTimer* timer{}; diff --git a/src/core/hle/kernel/k_address_arbiter.h b/src/core/hle/kernel/k_address_arbiter.h index 9a8c1ae94..3b70e1ab2 100644 --- a/src/core/hle/kernel/k_address_arbiter.h +++ b/src/core/hle/kernel/k_address_arbiter.h @@ -25,7 +25,7 @@ public: explicit KAddressArbiter(Core::System& system); ~KAddressArbiter(); - Result SignalToAddress(VAddr addr, Svc::SignalType type, s32 value, s32 count) { + Result SignalToAddress(uint64_t addr, Svc::SignalType type, s32 value, s32 count) { switch (type) { case Svc::SignalType::Signal: R_RETURN(this->Signal(addr, count)); @@ -38,7 +38,7 @@ public: } } - Result WaitForAddress(VAddr addr, Svc::ArbitrationType type, s32 value, s64 timeout) { + Result WaitForAddress(uint64_t addr, Svc::ArbitrationType type, s32 value, s64 timeout) { switch (type) { case Svc::ArbitrationType::WaitIfLessThan: R_RETURN(WaitIfLessThan(addr, value, false, timeout)); @@ -52,11 +52,11 @@ public: } private: - Result Signal(VAddr addr, s32 count); - Result SignalAndIncrementIfEqual(VAddr addr, s32 value, s32 count); - Result SignalAndModifyByWaitingCountIfEqual(VAddr addr, s32 value, s32 count); - Result WaitIfLessThan(VAddr addr, s32 value, bool decrement, s64 timeout); - Result WaitIfEqual(VAddr addr, s32 value, s64 timeout); + Result Signal(uint64_t addr, s32 count); + Result SignalAndIncrementIfEqual(uint64_t addr, s32 value, s32 count); + Result SignalAndModifyByWaitingCountIfEqual(uint64_t addr, s32 value, s32 count); + Result WaitIfLessThan(uint64_t addr, s32 value, bool decrement, s64 timeout); + Result WaitIfEqual(uint64_t addr, s32 value, s64 timeout); private: ThreadTree m_tree; diff --git a/src/core/hle/kernel/k_client_session.cpp b/src/core/hle/kernel/k_client_session.cpp index d998b2be2..72b66270d 100644 --- a/src/core/hle/kernel/k_client_session.cpp +++ b/src/core/hle/kernel/k_client_session.cpp @@ -29,7 +29,8 @@ Result KClientSession::SendSyncRequest() { SCOPE_EXIT({ request->Close(); }); // Initialize the request. - request->Initialize(nullptr, GetCurrentThread(m_kernel).GetTlsAddress(), MessageBufferSize); + request->Initialize(nullptr, GetInteger(GetCurrentThread(m_kernel).GetTlsAddress()), + MessageBufferSize); // Send the request. R_RETURN(m_parent->GetServerSession().OnRequest(request)); diff --git a/src/core/hle/kernel/k_code_memory.cpp b/src/core/hle/kernel/k_code_memory.cpp index 89df6b5d8..3583bee44 100644 --- a/src/core/hle/kernel/k_code_memory.cpp +++ b/src/core/hle/kernel/k_code_memory.cpp @@ -19,7 +19,8 @@ namespace Kernel { KCodeMemory::KCodeMemory(KernelCore& kernel) : KAutoObjectWithSlabHeapAndContainer{kernel}, m_lock(kernel) {} -Result KCodeMemory::Initialize(Core::DeviceMemory& device_memory, VAddr addr, size_t size) { +Result KCodeMemory::Initialize(Core::DeviceMemory& device_memory, KProcessAddress addr, + size_t size) { // Set members. m_owner = GetCurrentProcessPointer(m_kernel); @@ -63,7 +64,7 @@ void KCodeMemory::Finalize() { m_owner->Close(); } -Result KCodeMemory::Map(VAddr address, size_t size) { +Result KCodeMemory::Map(KProcessAddress address, size_t size) { // Validate the size. R_UNLESS(m_page_group->GetNumPages() == Common::DivideUp(size, PageSize), ResultInvalidSize); @@ -83,7 +84,7 @@ Result KCodeMemory::Map(VAddr address, size_t size) { R_SUCCEED(); } -Result KCodeMemory::Unmap(VAddr address, size_t size) { +Result KCodeMemory::Unmap(KProcessAddress address, size_t size) { // Validate the size. R_UNLESS(m_page_group->GetNumPages() == Common::DivideUp(size, PageSize), ResultInvalidSize); @@ -100,7 +101,7 @@ Result KCodeMemory::Unmap(VAddr address, size_t size) { R_SUCCEED(); } -Result KCodeMemory::MapToOwner(VAddr address, size_t size, Svc::MemoryPermission perm) { +Result KCodeMemory::MapToOwner(KProcessAddress address, size_t size, Svc::MemoryPermission perm) { // Validate the size. R_UNLESS(m_page_group->GetNumPages() == Common::DivideUp(size, PageSize), ResultInvalidSize); @@ -134,7 +135,7 @@ Result KCodeMemory::MapToOwner(VAddr address, size_t size, Svc::MemoryPermission R_SUCCEED(); } -Result KCodeMemory::UnmapFromOwner(VAddr address, size_t size) { +Result KCodeMemory::UnmapFromOwner(KProcessAddress address, size_t size) { // Validate the size. R_UNLESS(m_page_group->GetNumPages() == Common::DivideUp(size, PageSize), ResultInvalidSize); diff --git a/src/core/hle/kernel/k_code_memory.h b/src/core/hle/kernel/k_code_memory.h index 23cbb283b..26fe6b3dc 100644 --- a/src/core/hle/kernel/k_code_memory.h +++ b/src/core/hle/kernel/k_code_memory.h @@ -5,12 +5,12 @@ #include -#include "common/common_types.h" #include "core/device_memory.h" #include "core/hle/kernel/k_auto_object.h" #include "core/hle/kernel/k_light_lock.h" #include "core/hle/kernel/k_page_group.h" #include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/kernel/slab_helpers.h" #include "core/hle/kernel/svc_types.h" #include "core/hle/result.h" @@ -31,13 +31,13 @@ class KCodeMemory final public: explicit KCodeMemory(KernelCore& kernel); - Result Initialize(Core::DeviceMemory& device_memory, VAddr address, size_t size); + Result Initialize(Core::DeviceMemory& device_memory, KProcessAddress address, size_t size); void Finalize() override; - Result Map(VAddr address, size_t size); - Result Unmap(VAddr address, size_t size); - Result MapToOwner(VAddr address, size_t size, Svc::MemoryPermission perm); - Result UnmapFromOwner(VAddr address, size_t size); + Result Map(KProcessAddress address, size_t size); + Result Unmap(KProcessAddress address, size_t size); + Result MapToOwner(KProcessAddress address, size_t size, Svc::MemoryPermission perm); + Result UnmapFromOwner(KProcessAddress address, size_t size); bool IsInitialized() const override { return m_is_initialized; @@ -47,7 +47,7 @@ public: KProcess* GetOwner() const override { return m_owner; } - VAddr GetSourceAddress() const { + KProcessAddress GetSourceAddress() const { return m_address; } size_t GetSize() const { @@ -57,7 +57,7 @@ public: private: std::optional m_page_group{}; KProcess* m_owner{}; - VAddr m_address{}; + KProcessAddress m_address{}; KLightLock m_lock; bool m_is_initialized{}; bool m_is_owner_mapped{}; diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cpp index 58b8609d8..c6634313f 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/core/hle/kernel/k_condition_variable.cpp @@ -18,23 +18,23 @@ namespace Kernel { namespace { -bool ReadFromUser(Core::System& system, u32* out, VAddr address) { - *out = system.Memory().Read32(address); +bool ReadFromUser(Core::System& system, u32* out, KProcessAddress address) { + *out = system.Memory().Read32(GetInteger(address)); return true; } -bool WriteToUser(Core::System& system, VAddr address, const u32* p) { - system.Memory().Write32(address, *p); +bool WriteToUser(Core::System& system, KProcessAddress address, const u32* p) { + system.Memory().Write32(GetInteger(address), *p); return true; } -bool UpdateLockAtomic(Core::System& system, u32* out, VAddr address, u32 if_zero, +bool UpdateLockAtomic(Core::System& system, u32* out, KProcessAddress address, u32 if_zero, u32 new_orr_mask) { auto& monitor = system.Monitor(); const auto current_core = system.Kernel().CurrentPhysicalCoreIndex(); // Load the value from the address. - const auto expected = monitor.ExclusiveRead32(current_core, address); + const auto expected = monitor.ExclusiveRead32(current_core, GetInteger(address)); // Orr in the new mask. u32 value = expected | new_orr_mask; @@ -45,7 +45,7 @@ bool UpdateLockAtomic(Core::System& system, u32* out, VAddr address, u32 if_zero } // Try to store. - if (!monitor.ExclusiveWrite32(current_core, address, value)) { + if (!monitor.ExclusiveWrite32(current_core, GetInteger(address), value)) { // If we failed to store, try again. return UpdateLockAtomic(system, out, address, if_zero, new_orr_mask); } @@ -102,7 +102,7 @@ KConditionVariable::KConditionVariable(Core::System& system) KConditionVariable::~KConditionVariable() = default; -Result KConditionVariable::SignalToAddress(VAddr addr) { +Result KConditionVariable::SignalToAddress(KProcessAddress addr) { KThread* owner_thread = GetCurrentThreadPointer(m_kernel); // Signal the address. @@ -143,7 +143,7 @@ Result KConditionVariable::SignalToAddress(VAddr addr) { } } -Result KConditionVariable::WaitForAddress(Handle handle, VAddr addr, u32 value) { +Result KConditionVariable::WaitForAddress(Handle handle, KProcessAddress addr, u32 value) { KThread* cur_thread = GetCurrentThreadPointer(m_kernel); ThreadQueueImplForKConditionVariableWaitForAddress wait_queue(m_kernel); @@ -191,7 +191,7 @@ void KConditionVariable::SignalImpl(KThread* thread) { ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Update the tag. - VAddr address = thread->GetAddressKey(); + KProcessAddress address = thread->GetAddressKey(); u32 own_tag = thread->GetAddressKeyValue(); u32 prev_tag{}; @@ -262,7 +262,7 @@ void KConditionVariable::Signal(u64 cv_key, s32 count) { } } -Result KConditionVariable::Wait(VAddr addr, u64 key, u32 value, s64 timeout) { +Result KConditionVariable::Wait(KProcessAddress addr, u64 key, u32 value, s64 timeout) { // Prepare to wait. KThread* cur_thread = GetCurrentThreadPointer(m_kernel); KHardwareTimer* timer{}; diff --git a/src/core/hle/kernel/k_condition_variable.h b/src/core/hle/kernel/k_condition_variable.h index fbd2c1fc0..8c2f3ae51 100644 --- a/src/core/hle/kernel/k_condition_variable.h +++ b/src/core/hle/kernel/k_condition_variable.h @@ -4,10 +4,10 @@ #pragma once #include "common/assert.h" -#include "common/common_types.h" #include "core/hle/kernel/k_scheduler.h" #include "core/hle/kernel/k_thread.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/kernel/kernel.h" #include "core/hle/result.h" @@ -25,12 +25,12 @@ public: ~KConditionVariable(); // Arbitration - Result SignalToAddress(VAddr addr); - Result WaitForAddress(Handle handle, VAddr addr, u32 value); + Result SignalToAddress(KProcessAddress addr); + Result WaitForAddress(Handle handle, KProcessAddress addr, u32 value); // Condition variable void Signal(u64 cv_key, s32 count); - Result Wait(VAddr addr, u64 key, u32 value, s64 timeout); + Result Wait(KProcessAddress addr, u64 key, u32 value, s64 timeout); private: void SignalImpl(KThread* thread); diff --git a/src/core/hle/kernel/k_device_address_space.cpp b/src/core/hle/kernel/k_device_address_space.cpp index a2fc4fe1f..f48896715 100644 --- a/src/core/hle/kernel/k_device_address_space.cpp +++ b/src/core/hle/kernel/k_device_address_space.cpp @@ -54,8 +54,8 @@ Result KDeviceAddressSpace::Detach(Svc::DeviceName device_name) { R_SUCCEED(); } -Result KDeviceAddressSpace::Map(KPageTable* page_table, VAddr process_address, size_t size, - u64 device_address, u32 option, bool is_aligned) { +Result KDeviceAddressSpace::Map(KPageTable* page_table, KProcessAddress process_address, + size_t size, u64 device_address, u32 option, bool is_aligned) { // Check that the address falls within the space. R_UNLESS((m_space_address <= device_address && device_address + size - 1 <= m_space_address + m_space_size - 1), @@ -113,8 +113,8 @@ Result KDeviceAddressSpace::Map(KPageTable* page_table, VAddr process_address, s R_SUCCEED(); } -Result KDeviceAddressSpace::Unmap(KPageTable* page_table, VAddr process_address, size_t size, - u64 device_address) { +Result KDeviceAddressSpace::Unmap(KPageTable* page_table, KProcessAddress process_address, + size_t size, u64 device_address) { // Check that the address falls within the space. R_UNLESS((m_space_address <= device_address && device_address + size - 1 <= m_space_address + m_space_size - 1), diff --git a/src/core/hle/kernel/k_device_address_space.h b/src/core/hle/kernel/k_device_address_space.h index b4a014c38..18556e3cc 100644 --- a/src/core/hle/kernel/k_device_address_space.h +++ b/src/core/hle/kernel/k_device_address_space.h @@ -5,8 +5,8 @@ #include -#include "common/common_types.h" #include "core/hle/kernel/k_page_table.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/kernel/slab_helpers.h" #include "core/hle/result.h" @@ -31,23 +31,24 @@ public: Result Attach(Svc::DeviceName device_name); Result Detach(Svc::DeviceName device_name); - Result MapByForce(KPageTable* page_table, VAddr process_address, size_t size, + Result MapByForce(KPageTable* page_table, KProcessAddress process_address, size_t size, u64 device_address, u32 option) { R_RETURN(this->Map(page_table, process_address, size, device_address, option, false)); } - Result MapAligned(KPageTable* page_table, VAddr process_address, size_t size, + Result MapAligned(KPageTable* page_table, KProcessAddress process_address, size_t size, u64 device_address, u32 option) { R_RETURN(this->Map(page_table, process_address, size, device_address, option, true)); } - Result Unmap(KPageTable* page_table, VAddr process_address, size_t size, u64 device_address); + Result Unmap(KPageTable* page_table, KProcessAddress process_address, size_t size, + u64 device_address); static void Initialize(); private: - Result Map(KPageTable* page_table, VAddr process_address, size_t size, u64 device_address, - u32 option, bool is_aligned); + Result Map(KPageTable* page_table, KProcessAddress process_address, size_t size, + u64 device_address, u32 option, bool is_aligned); private: KLightLock m_lock; diff --git a/src/core/hle/kernel/k_dynamic_page_manager.h b/src/core/hle/kernel/k_dynamic_page_manager.h index ac80d60a1..ad11e84b7 100644 --- a/src/core/hle/kernel/k_dynamic_page_manager.h +++ b/src/core/hle/kernel/k_dynamic_page_manager.h @@ -6,9 +6,9 @@ #include #include "common/alignment.h" -#include "common/common_types.h" #include "core/hle/kernel/k_page_bitmap.h" #include "core/hle/kernel/k_spin_lock.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/kernel/memory_types.h" #include "core/hle/kernel/svc_results.h" @@ -26,23 +26,23 @@ public: KDynamicPageManager() = default; template - T* GetPointer(VAddr addr) { + T* GetPointer(KVirtualAddress addr) { return reinterpret_cast(m_backing_memory.data() + (addr - m_address)); } template - const T* GetPointer(VAddr addr) const { + const T* GetPointer(KVirtualAddress addr) const { return reinterpret_cast(m_backing_memory.data() + (addr - m_address)); } - Result Initialize(VAddr memory, size_t size, size_t align) { + Result Initialize(KVirtualAddress memory, size_t size, size_t align) { // We need to have positive size. R_UNLESS(size > 0, ResultOutOfMemory); m_backing_memory.resize(size); // Set addresses. m_address = memory; - m_aligned_address = Common::AlignDown(memory, align); + m_aligned_address = Common::AlignDown(GetInteger(memory), align); // Calculate extents. const size_t managed_size = m_address + size - m_aligned_address; @@ -79,7 +79,7 @@ public: R_SUCCEED(); } - VAddr GetAddress() const { + KVirtualAddress GetAddress() const { return m_address; } size_t GetSize() const { @@ -145,7 +145,8 @@ public: KScopedSpinLock lk(m_lock); // Set the bit for the free page. - size_t offset = (reinterpret_cast(pb) - m_aligned_address) / sizeof(PageBuffer); + size_t offset = + (reinterpret_cast(pb) - GetInteger(m_aligned_address)) / sizeof(PageBuffer); m_page_bitmap.SetBit(offset); // Decrement our used count. @@ -158,8 +159,8 @@ private: size_t m_used{}; size_t m_peak{}; size_t m_count{}; - VAddr m_address{}; - VAddr m_aligned_address{}; + KVirtualAddress m_address{}; + KVirtualAddress m_aligned_address{}; size_t m_size{}; // TODO(bunnei): Back by host memory until we emulate kernel virtual address space. diff --git a/src/core/hle/kernel/k_dynamic_slab_heap.h b/src/core/hle/kernel/k_dynamic_slab_heap.h index 3a0ddd050..76ed4cac1 100644 --- a/src/core/hle/kernel/k_dynamic_slab_heap.h +++ b/src/core/hle/kernel/k_dynamic_slab_heap.h @@ -19,7 +19,7 @@ class KDynamicSlabHeap : protected impl::KSlabHeapImpl { public: constexpr KDynamicSlabHeap() = default; - constexpr VAddr GetAddress() const { + constexpr KVirtualAddress GetAddress() const { return m_address; } constexpr size_t GetSize() const { @@ -35,7 +35,7 @@ public: return m_count.load(); } - constexpr bool IsInRange(VAddr addr) const { + constexpr bool IsInRange(KVirtualAddress addr) const { return this->GetAddress() <= addr && addr <= this->GetAddress() + this->GetSize() - 1; } @@ -115,7 +115,7 @@ private: std::atomic m_used{}; std::atomic m_peak{}; std::atomic m_count{}; - VAddr m_address{}; + KVirtualAddress m_address{}; size_t m_size{}; }; diff --git a/src/core/hle/kernel/k_memory_block.h b/src/core/hle/kernel/k_memory_block.h index e01929da6..41a29da24 100644 --- a/src/core/hle/kernel/k_memory_block.h +++ b/src/core/hle/kernel/k_memory_block.h @@ -5,8 +5,8 @@ #include "common/alignment.h" #include "common/assert.h" -#include "common/common_types.h" #include "common/intrusive_red_black_tree.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/kernel/memory_types.h" #include "core/hle/kernel/svc_types.h" @@ -282,7 +282,7 @@ class KMemoryBlock : public Common::IntrusiveRedBlackTreeBaseNode private: u16 m_device_disable_merge_left_count{}; u16 m_device_disable_merge_right_count{}; - VAddr m_address{}; + KProcessAddress m_address{}; size_t m_num_pages{}; KMemoryState m_memory_state{KMemoryState::None}; u16 m_ipc_lock_count{}; @@ -306,7 +306,7 @@ public: } public: - constexpr VAddr GetAddress() const { + constexpr KProcessAddress GetAddress() const { return m_address; } @@ -318,11 +318,11 @@ public: return this->GetNumPages() * PageSize; } - constexpr VAddr GetEndAddress() const { + constexpr KProcessAddress GetEndAddress() const { return this->GetAddress() + this->GetSize(); } - constexpr VAddr GetLastAddress() const { + constexpr KProcessAddress GetLastAddress() const { return this->GetEndAddress() - 1; } @@ -348,7 +348,7 @@ public: constexpr KMemoryInfo GetMemoryInfo() const { return { - .m_address = this->GetAddress(), + .m_address = GetInteger(this->GetAddress()), .m_size = this->GetSize(), .m_state = m_memory_state, .m_device_disable_merge_left_count = m_device_disable_merge_left_count, @@ -366,12 +366,12 @@ public: public: explicit KMemoryBlock() = default; - constexpr KMemoryBlock(VAddr addr, size_t np, KMemoryState ms, KMemoryPermission p, + constexpr KMemoryBlock(KProcessAddress addr, size_t np, KMemoryState ms, KMemoryPermission p, KMemoryAttribute attr) : Common::IntrusiveRedBlackTreeBaseNode(), m_address(addr), m_num_pages(np), m_memory_state(ms), m_permission(p), m_attribute(attr) {} - constexpr void Initialize(VAddr addr, size_t np, KMemoryState ms, KMemoryPermission p, + constexpr void Initialize(KProcessAddress addr, size_t np, KMemoryState ms, KMemoryPermission p, KMemoryAttribute attr) { m_device_disable_merge_left_count = 0; m_device_disable_merge_right_count = 0; @@ -408,7 +408,7 @@ public: KMemoryBlockDisableMergeAttribute::None; } - constexpr bool Contains(VAddr addr) const { + constexpr bool Contains(KProcessAddress addr) const { return this->GetAddress() <= addr && addr <= this->GetEndAddress(); } @@ -443,10 +443,10 @@ public: } } - constexpr void Split(KMemoryBlock* block, VAddr addr) { + constexpr void Split(KMemoryBlock* block, KProcessAddress addr) { ASSERT(this->GetAddress() < addr); ASSERT(this->Contains(addr)); - ASSERT(Common::IsAligned(addr, PageSize)); + ASSERT(Common::IsAligned(GetInteger(addr), PageSize)); block->m_address = m_address; block->m_num_pages = (addr - this->GetAddress()) / PageSize; diff --git a/src/core/hle/kernel/k_memory_block_manager.cpp b/src/core/hle/kernel/k_memory_block_manager.cpp index cf4c1e371..ab75f550e 100644 --- a/src/core/hle/kernel/k_memory_block_manager.cpp +++ b/src/core/hle/kernel/k_memory_block_manager.cpp @@ -7,7 +7,8 @@ namespace Kernel { KMemoryBlockManager::KMemoryBlockManager() = default; -Result KMemoryBlockManager::Initialize(VAddr st, VAddr nd, KMemoryBlockSlabManager* slab_manager) { +Result KMemoryBlockManager::Initialize(KProcessAddress st, KProcessAddress nd, + KMemoryBlockSlabManager* slab_manager) { // Allocate a block to encapsulate the address space, insert it into the tree. KMemoryBlock* start_block = slab_manager->Allocate(); R_UNLESS(start_block != nullptr, ResultOutOfResource); @@ -15,8 +16,8 @@ Result KMemoryBlockManager::Initialize(VAddr st, VAddr nd, KMemoryBlockSlabManag // Set our start and end. m_start_address = st; m_end_address = nd; - ASSERT(Common::IsAligned(m_start_address, PageSize)); - ASSERT(Common::IsAligned(m_end_address, PageSize)); + ASSERT(Common::IsAligned(GetInteger(m_start_address), PageSize)); + ASSERT(Common::IsAligned(GetInteger(m_end_address), PageSize)); // Initialize and insert the block. start_block->Initialize(m_start_address, (m_end_address - m_start_address) / PageSize, @@ -40,12 +41,13 @@ void KMemoryBlockManager::Finalize(KMemoryBlockSlabManager* slab_manager, ASSERT(m_memory_block_tree.empty()); } -VAddr KMemoryBlockManager::FindFreeArea(VAddr region_start, size_t region_num_pages, - size_t num_pages, size_t alignment, size_t offset, - size_t guard_pages) const { +KProcessAddress KMemoryBlockManager::FindFreeArea(KProcessAddress region_start, + size_t region_num_pages, size_t num_pages, + size_t alignment, size_t offset, + size_t guard_pages) const { if (num_pages > 0) { - const VAddr region_end = region_start + region_num_pages * PageSize; - const VAddr region_last = region_end - 1; + const KProcessAddress region_end = region_start + region_num_pages * PageSize; + const KProcessAddress region_last = region_end - 1; for (const_iterator it = this->FindIterator(region_start); it != m_memory_block_tree.cend(); it++) { const KMemoryInfo info = it->GetMemoryInfo(); @@ -56,17 +58,19 @@ VAddr KMemoryBlockManager::FindFreeArea(VAddr region_start, size_t region_num_pa continue; } - VAddr area = (info.GetAddress() <= region_start) ? region_start : info.GetAddress(); + KProcessAddress area = + (info.GetAddress() <= GetInteger(region_start)) ? region_start : info.GetAddress(); area += guard_pages * PageSize; - const VAddr offset_area = Common::AlignDown(area, alignment) + offset; + const KProcessAddress offset_area = + Common::AlignDown(GetInteger(area), alignment) + offset; area = (area <= offset_area) ? offset_area : offset_area + alignment; - const VAddr area_end = area + num_pages * PageSize + guard_pages * PageSize; - const VAddr area_last = area_end - 1; + const KProcessAddress area_end = area + num_pages * PageSize + guard_pages * PageSize; + const KProcessAddress area_last = area_end - 1; - if (info.GetAddress() <= area && area < area_last && area_last <= region_last && - area_last <= info.GetLastAddress()) { + if (info.GetAddress() <= GetInteger(area) && area < area_last && + area_last <= region_last && area_last <= info.GetLastAddress()) { return area; } } @@ -76,7 +80,7 @@ VAddr KMemoryBlockManager::FindFreeArea(VAddr region_start, size_t region_num_pa } void KMemoryBlockManager::CoalesceForUpdate(KMemoryBlockManagerUpdateAllocator* allocator, - VAddr address, size_t num_pages) { + KProcessAddress address, size_t num_pages) { // Find the iterator now that we've updated. iterator it = this->FindIterator(address); if (address != m_start_address) { @@ -104,18 +108,18 @@ void KMemoryBlockManager::CoalesceForUpdate(KMemoryBlockManagerUpdateAllocator* } } -void KMemoryBlockManager::Update(KMemoryBlockManagerUpdateAllocator* allocator, VAddr address, - size_t num_pages, KMemoryState state, KMemoryPermission perm, - KMemoryAttribute attr, +void KMemoryBlockManager::Update(KMemoryBlockManagerUpdateAllocator* allocator, + KProcessAddress address, size_t num_pages, KMemoryState state, + KMemoryPermission perm, KMemoryAttribute attr, KMemoryBlockDisableMergeAttribute set_disable_attr, KMemoryBlockDisableMergeAttribute clear_disable_attr) { // Ensure for auditing that we never end up with an invalid tree. KScopedMemoryBlockManagerAuditor auditor(this); - ASSERT(Common::IsAligned(address, PageSize)); + ASSERT(Common::IsAligned(GetInteger(address), PageSize)); ASSERT((attr & (KMemoryAttribute::IpcLocked | KMemoryAttribute::DeviceShared)) == KMemoryAttribute::None); - VAddr cur_address = address; + KProcessAddress cur_address = address; size_t remaining_pages = num_pages; iterator it = this->FindIterator(address); @@ -168,17 +172,17 @@ void KMemoryBlockManager::Update(KMemoryBlockManagerUpdateAllocator* allocator, } void KMemoryBlockManager::UpdateIfMatch(KMemoryBlockManagerUpdateAllocator* allocator, - VAddr address, size_t num_pages, KMemoryState test_state, - KMemoryPermission test_perm, KMemoryAttribute test_attr, - KMemoryState state, KMemoryPermission perm, - KMemoryAttribute attr) { + KProcessAddress address, size_t num_pages, + KMemoryState test_state, KMemoryPermission test_perm, + KMemoryAttribute test_attr, KMemoryState state, + KMemoryPermission perm, KMemoryAttribute attr) { // Ensure for auditing that we never end up with an invalid tree. KScopedMemoryBlockManagerAuditor auditor(this); - ASSERT(Common::IsAligned(address, PageSize)); + ASSERT(Common::IsAligned(GetInteger(address), PageSize)); ASSERT((attr & (KMemoryAttribute::IpcLocked | KMemoryAttribute::DeviceShared)) == KMemoryAttribute::None); - VAddr cur_address = address; + KProcessAddress cur_address = address; size_t remaining_pages = num_pages; iterator it = this->FindIterator(address); @@ -230,18 +234,18 @@ void KMemoryBlockManager::UpdateIfMatch(KMemoryBlockManagerUpdateAllocator* allo this->CoalesceForUpdate(allocator, address, num_pages); } -void KMemoryBlockManager::UpdateLock(KMemoryBlockManagerUpdateAllocator* allocator, VAddr address, - size_t num_pages, MemoryBlockLockFunction lock_func, - KMemoryPermission perm) { +void KMemoryBlockManager::UpdateLock(KMemoryBlockManagerUpdateAllocator* allocator, + KProcessAddress address, size_t num_pages, + MemoryBlockLockFunction lock_func, KMemoryPermission perm) { // Ensure for auditing that we never end up with an invalid tree. KScopedMemoryBlockManagerAuditor auditor(this); - ASSERT(Common::IsAligned(address, PageSize)); + ASSERT(Common::IsAligned(GetInteger(address), PageSize)); - VAddr cur_address = address; + KProcessAddress cur_address = address; size_t remaining_pages = num_pages; iterator it = this->FindIterator(address); - const VAddr end_address = address + (num_pages * PageSize); + const KProcessAddress end_address = address + (num_pages * PageSize); while (remaining_pages > 0) { const size_t remaining_size = remaining_pages * PageSize; diff --git a/src/core/hle/kernel/k_memory_block_manager.h b/src/core/hle/kernel/k_memory_block_manager.h index d382722a6..7c0bd16f0 100644 --- a/src/core/hle/kernel/k_memory_block_manager.h +++ b/src/core/hle/kernel/k_memory_block_manager.h @@ -7,9 +7,9 @@ #include #include "common/common_funcs.h" -#include "common/common_types.h" #include "core/hle/kernel/k_dynamic_resource_manager.h" #include "core/hle/kernel/k_memory_block.h" +#include "core/hle/kernel/k_typed_address.h" namespace Kernel { @@ -85,9 +85,10 @@ public: public: KMemoryBlockManager(); - using HostUnmapCallback = std::function; + using HostUnmapCallback = std::function; - Result Initialize(VAddr st, VAddr nd, KMemoryBlockSlabManager* slab_manager); + Result Initialize(KProcessAddress st, KProcessAddress nd, + KMemoryBlockSlabManager* slab_manager); void Finalize(KMemoryBlockSlabManager* slab_manager, HostUnmapCallback&& host_unmap_callback); iterator end() { @@ -100,27 +101,28 @@ public: return m_memory_block_tree.cend(); } - VAddr FindFreeArea(VAddr region_start, size_t region_num_pages, size_t num_pages, - size_t alignment, size_t offset, size_t guard_pages) const; + KProcessAddress FindFreeArea(KProcessAddress region_start, size_t region_num_pages, + size_t num_pages, size_t alignment, size_t offset, + size_t guard_pages) const; - void Update(KMemoryBlockManagerUpdateAllocator* allocator, VAddr address, size_t num_pages, - KMemoryState state, KMemoryPermission perm, KMemoryAttribute attr, + void Update(KMemoryBlockManagerUpdateAllocator* allocator, KProcessAddress address, + size_t num_pages, KMemoryState state, KMemoryPermission perm, KMemoryAttribute attr, KMemoryBlockDisableMergeAttribute set_disable_attr, KMemoryBlockDisableMergeAttribute clear_disable_attr); - void UpdateLock(KMemoryBlockManagerUpdateAllocator* allocator, VAddr address, size_t num_pages, - MemoryBlockLockFunction lock_func, KMemoryPermission perm); + void UpdateLock(KMemoryBlockManagerUpdateAllocator* allocator, KProcessAddress address, + size_t num_pages, MemoryBlockLockFunction lock_func, KMemoryPermission perm); - void UpdateIfMatch(KMemoryBlockManagerUpdateAllocator* allocator, VAddr address, + void UpdateIfMatch(KMemoryBlockManagerUpdateAllocator* allocator, KProcessAddress address, size_t num_pages, KMemoryState test_state, KMemoryPermission test_perm, KMemoryAttribute test_attr, KMemoryState state, KMemoryPermission perm, KMemoryAttribute attr); - iterator FindIterator(VAddr address) const { + iterator FindIterator(KProcessAddress address) const { return m_memory_block_tree.find(KMemoryBlock( address, 1, KMemoryState::Free, KMemoryPermission::None, KMemoryAttribute::None)); } - const KMemoryBlock* FindBlock(VAddr address) const { + const KMemoryBlock* FindBlock(KProcessAddress address) const { if (const_iterator it = this->FindIterator(address); it != m_memory_block_tree.end()) { return std::addressof(*it); } @@ -132,12 +134,12 @@ public: bool CheckState() const; private: - void CoalesceForUpdate(KMemoryBlockManagerUpdateAllocator* allocator, VAddr address, + void CoalesceForUpdate(KMemoryBlockManagerUpdateAllocator* allocator, KProcessAddress address, size_t num_pages); MemoryBlockTree m_memory_block_tree; - VAddr m_start_address{}; - VAddr m_end_address{}; + KProcessAddress m_start_address{}; + KProcessAddress m_end_address{}; }; class KScopedMemoryBlockManagerAuditor { diff --git a/src/core/hle/kernel/k_memory_layout.cpp b/src/core/hle/kernel/k_memory_layout.cpp index 9ff751119..af40092c0 100644 --- a/src/core/hle/kernel/k_memory_layout.cpp +++ b/src/core/hle/kernel/k_memory_layout.cpp @@ -85,7 +85,8 @@ bool KMemoryRegionTree::Insert(u64 address, size_t size, u32 type_id, u32 new_at return true; } -VAddr KMemoryRegionTree::GetRandomAlignedRegion(size_t size, size_t alignment, u32 type_id) { +KVirtualAddress KMemoryRegionTree::GetRandomAlignedRegion(size_t size, size_t alignment, + u32 type_id) { // We want to find the total extents of the type id. const auto extents = this->GetDerivedRegionExtents(static_cast(type_id)); @@ -130,11 +131,13 @@ KMemoryLayout::KMemoryLayout() m_virtual_linear_tree{m_memory_region_allocator}, m_physical_linear_tree{ m_memory_region_allocator} {} -void KMemoryLayout::InitializeLinearMemoryRegionTrees(PAddr aligned_linear_phys_start, - VAddr linear_virtual_start) { +void KMemoryLayout::InitializeLinearMemoryRegionTrees(KPhysicalAddress aligned_linear_phys_start, + KVirtualAddress linear_virtual_start) { // Set static differences. - m_linear_phys_to_virt_diff = linear_virtual_start - aligned_linear_phys_start; - m_linear_virt_to_phys_diff = aligned_linear_phys_start - linear_virtual_start; + m_linear_phys_to_virt_diff = + GetInteger(linear_virtual_start) - GetInteger(aligned_linear_phys_start); + m_linear_virt_to_phys_diff = + GetInteger(aligned_linear_phys_start) - GetInteger(linear_virtual_start); // Initialize linear trees. for (auto& region : GetPhysicalMemoryRegionTree()) { diff --git a/src/core/hle/kernel/k_memory_layout.h b/src/core/hle/kernel/k_memory_layout.h index 551b7a0e4..54a71df56 100644 --- a/src/core/hle/kernel/k_memory_layout.h +++ b/src/core/hle/kernel/k_memory_layout.h @@ -10,6 +10,7 @@ #include "core/device_memory.h" #include "core/hle/kernel/k_memory_region.h" #include "core/hle/kernel/k_memory_region_type.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/kernel/memory_types.h" namespace Kernel { @@ -69,10 +70,11 @@ constexpr std::size_t KernelResourceSize = KernelPageTableHeapSize + KernelIniti //! NB: Use KThread::GetAddressKeyIsKernel(). //! See explanation for deviation of GetAddressKey. -bool IsKernelAddressKey(VAddr key) = delete; +bool IsKernelAddressKey(KProcessAddress key) = delete; -constexpr bool IsKernelAddress(VAddr address) { - return KernelVirtualAddressSpaceBase <= address && address < KernelVirtualAddressSpaceEnd; +constexpr bool IsKernelAddress(KProcessAddress address) { + return KernelVirtualAddressSpaceBase <= GetInteger(address) && + address < KernelVirtualAddressSpaceEnd; } class KMemoryLayout final { @@ -104,38 +106,38 @@ public: return m_physical_linear_tree; } - VAddr GetLinearVirtualAddress(PAddr address) const { - return address + m_linear_phys_to_virt_diff; + KVirtualAddress GetLinearVirtualAddress(KPhysicalAddress address) const { + return GetInteger(address) + m_linear_phys_to_virt_diff; } - PAddr GetLinearPhysicalAddress(VAddr address) const { - return address + m_linear_virt_to_phys_diff; + KPhysicalAddress GetLinearPhysicalAddress(KVirtualAddress address) const { + return GetInteger(address) + m_linear_virt_to_phys_diff; } - const KMemoryRegion* FindVirtual(VAddr address) const { + const KMemoryRegion* FindVirtual(KVirtualAddress address) const { return Find(address, GetVirtualMemoryRegionTree()); } - const KMemoryRegion* FindPhysical(PAddr address) const { + const KMemoryRegion* FindPhysical(KPhysicalAddress address) const { return Find(address, GetPhysicalMemoryRegionTree()); } - const KMemoryRegion* FindVirtualLinear(VAddr address) const { + const KMemoryRegion* FindVirtualLinear(KVirtualAddress address) const { return Find(address, GetVirtualLinearMemoryRegionTree()); } - const KMemoryRegion* FindPhysicalLinear(PAddr address) const { + const KMemoryRegion* FindPhysicalLinear(KPhysicalAddress address) const { return Find(address, GetPhysicalLinearMemoryRegionTree()); } - VAddr GetMainStackTopAddress(s32 core_id) const { + KVirtualAddress GetMainStackTopAddress(s32 core_id) const { return GetStackTopAddress(core_id, KMemoryRegionType_KernelMiscMainStack); } - VAddr GetIdleStackTopAddress(s32 core_id) const { + KVirtualAddress GetIdleStackTopAddress(s32 core_id) const { return GetStackTopAddress(core_id, KMemoryRegionType_KernelMiscIdleStack); } - VAddr GetExceptionStackTopAddress(s32 core_id) const { + KVirtualAddress GetExceptionStackTopAddress(s32 core_id) const { return GetStackTopAddress(core_id, KMemoryRegionType_KernelMiscExceptionStack); } - VAddr GetSlabRegionAddress() const { + KVirtualAddress GetSlabRegionAddress() const { return Dereference(GetVirtualMemoryRegionTree().FindByType(KMemoryRegionType_KernelSlab)) .GetAddress(); } @@ -143,10 +145,10 @@ public: const KMemoryRegion& GetDeviceRegion(KMemoryRegionType type) const { return Dereference(GetPhysicalMemoryRegionTree().FindFirstDerived(type)); } - PAddr GetDevicePhysicalAddress(KMemoryRegionType type) const { + KPhysicalAddress GetDevicePhysicalAddress(KMemoryRegionType type) const { return GetDeviceRegion(type).GetAddress(); } - VAddr GetDeviceVirtualAddress(KMemoryRegionType type) const { + KVirtualAddress GetDeviceVirtualAddress(KMemoryRegionType type) const { return GetDeviceRegion(type).GetPairAddress(); } @@ -175,11 +177,11 @@ public: KMemoryRegionType_VirtualDramKernelSecureAppletMemory)); } - const KMemoryRegion& GetVirtualLinearRegion(VAddr address) const { + const KMemoryRegion& GetVirtualLinearRegion(KVirtualAddress address) const { return Dereference(FindVirtualLinear(address)); } - const KMemoryRegion& GetPhysicalLinearRegion(PAddr address) const { + const KMemoryRegion& GetPhysicalLinearRegion(KPhysicalAddress address) const { return Dereference(FindPhysicalLinear(address)); } @@ -193,29 +195,32 @@ public: return GetPhysicalMemoryRegionTree().FindFirstDerived(KMemoryRegionType_DTB); } - bool IsHeapPhysicalAddress(const KMemoryRegion*& region, PAddr address) const { + bool IsHeapPhysicalAddress(const KMemoryRegion*& region, KPhysicalAddress address) const { return IsTypedAddress(region, address, GetPhysicalLinearMemoryRegionTree(), KMemoryRegionType_DramUserPool); } - bool IsHeapVirtualAddress(const KMemoryRegion*& region, VAddr address) const { + bool IsHeapVirtualAddress(const KMemoryRegion*& region, KVirtualAddress address) const { return IsTypedAddress(region, address, GetVirtualLinearMemoryRegionTree(), KMemoryRegionType_VirtualDramUserPool); } - bool IsHeapPhysicalAddress(const KMemoryRegion*& region, PAddr address, size_t size) const { + bool IsHeapPhysicalAddress(const KMemoryRegion*& region, KPhysicalAddress address, + size_t size) const { return IsTypedAddress(region, address, size, GetPhysicalLinearMemoryRegionTree(), KMemoryRegionType_DramUserPool); } - bool IsHeapVirtualAddress(const KMemoryRegion*& region, VAddr address, size_t size) const { + bool IsHeapVirtualAddress(const KMemoryRegion*& region, KVirtualAddress address, + size_t size) const { return IsTypedAddress(region, address, size, GetVirtualLinearMemoryRegionTree(), KMemoryRegionType_VirtualDramUserPool); } - bool IsLinearMappedPhysicalAddress(const KMemoryRegion*& region, PAddr address) const { + bool IsLinearMappedPhysicalAddress(const KMemoryRegion*& region, + KPhysicalAddress address) const { return IsTypedAddress(region, address, GetPhysicalLinearMemoryRegionTree(), static_cast(KMemoryRegionAttr_LinearMapped)); } - bool IsLinearMappedPhysicalAddress(const KMemoryRegion*& region, PAddr address, + bool IsLinearMappedPhysicalAddress(const KMemoryRegion*& region, KPhysicalAddress address, size_t size) const { return IsTypedAddress(region, address, size, GetPhysicalLinearMemoryRegionTree(), static_cast(KMemoryRegionAttr_LinearMapped)); @@ -234,8 +239,8 @@ public: return std::make_pair(total_size, kernel_size); } - void InitializeLinearMemoryRegionTrees(PAddr aligned_linear_phys_start, - VAddr linear_virtual_start); + void InitializeLinearMemoryRegionTrees(KPhysicalAddress aligned_linear_phys_start, + KVirtualAddress linear_virtual_start); static size_t GetResourceRegionSizeForInit(bool use_extra_resource); auto GetKernelRegionExtents() const { @@ -261,8 +266,8 @@ public: auto GetLinearRegionVirtualExtents() const { const auto physical = GetLinearRegionPhysicalExtents(); - return KMemoryRegion(GetLinearVirtualAddress(physical.GetAddress()), - GetLinearVirtualAddress(physical.GetLastAddress()), 0, + return KMemoryRegion(GetInteger(GetLinearVirtualAddress(physical.GetAddress())), + GetInteger(GetLinearVirtualAddress(physical.GetLastAddress())), 0, KMemoryRegionType_None); } @@ -334,12 +339,12 @@ private: static bool IsTypedAddress(const KMemoryRegion*& region, AddressType address, const KMemoryRegionTree& tree, KMemoryRegionType type) { // Check if the cached region already contains the address. - if (region != nullptr && region->Contains(address)) { + if (region != nullptr && region->Contains(GetInteger(address))) { return true; } // Find the containing region, and update the cache. - if (const KMemoryRegion* found = tree.Find(address); + if (const KMemoryRegion* found = tree.Find(GetInteger(address)); found != nullptr && found->IsDerivedFrom(type)) { region = found; return true; @@ -352,11 +357,12 @@ private: static bool IsTypedAddress(const KMemoryRegion*& region, AddressType address, size_t size, const KMemoryRegionTree& tree, KMemoryRegionType type) { // Get the end of the checked region. - const u64 last_address = address + size - 1; + const u64 last_address = GetInteger(address) + size - 1; // Walk the tree to verify the region is correct. - const KMemoryRegion* cur = - (region != nullptr && region->Contains(address)) ? region : tree.Find(address); + const KMemoryRegion* cur = (region != nullptr && region->Contains(GetInteger(address))) + ? region + : tree.Find(GetInteger(address)); while (cur != nullptr && cur->IsDerivedFrom(type)) { if (last_address <= cur->GetLastAddress()) { region = cur; @@ -370,7 +376,7 @@ private: template static const KMemoryRegion* Find(AddressType address, const KMemoryRegionTree& tree) { - return tree.Find(address); + return tree.Find(GetInteger(address)); } static KMemoryRegion& Dereference(KMemoryRegion* region) { @@ -383,7 +389,7 @@ private: return *region; } - VAddr GetStackTopAddress(s32 core_id, KMemoryRegionType type) const { + KVirtualAddress GetStackTopAddress(s32 core_id, KMemoryRegionType type) const { const auto& region = Dereference( GetVirtualMemoryRegionTree().FindByTypeAndAttribute(type, static_cast(core_id))); ASSERT(region.GetEndAddress() != 0); diff --git a/src/core/hle/kernel/k_memory_manager.cpp b/src/core/hle/kernel/k_memory_manager.cpp index cd6ea388e..74d8169e0 100644 --- a/src/core/hle/kernel/k_memory_manager.cpp +++ b/src/core/hle/kernel/k_memory_manager.cpp @@ -5,7 +5,6 @@ #include "common/alignment.h" #include "common/assert.h" -#include "common/common_types.h" #include "common/scope_exit.h" #include "core/core.h" #include "core/device_memory.h" @@ -44,10 +43,10 @@ KMemoryManager::KMemoryManager(Core::System& system) KLightLock{system.Kernel()}, } {} -void KMemoryManager::Initialize(VAddr management_region, size_t management_region_size) { +void KMemoryManager::Initialize(KVirtualAddress management_region, size_t management_region_size) { // Clear the management region to zero. - const VAddr management_region_end = management_region + management_region_size; + const KVirtualAddress management_region_end = management_region + management_region_size; // std::memset(GetVoidPointer(management_region), 0, management_region_size); // Reset our manager count. @@ -56,7 +55,7 @@ void KMemoryManager::Initialize(VAddr management_region, size_t management_regio // Traverse the virtual memory layout tree, initializing each manager as appropriate. while (m_num_managers != MaxManagerCount) { // Locate the region that should initialize the current manager. - PAddr region_address = 0; + KPhysicalAddress region_address = 0; size_t region_size = 0; Pool region_pool = Pool::Count; for (const auto& it : m_system.Kernel().MemoryLayout().GetPhysicalMemoryRegionTree()) { @@ -70,8 +69,8 @@ void KMemoryManager::Initialize(VAddr management_region, size_t management_regio continue; } - const PAddr cur_start = it.GetAddress(); - const PAddr cur_end = it.GetEndAddress(); + const KPhysicalAddress cur_start = it.GetAddress(); + const KPhysicalAddress cur_end = it.GetEndAddress(); // Validate the region. ASSERT(cur_end != 0); @@ -119,17 +118,17 @@ void KMemoryManager::Initialize(VAddr management_region, size_t management_regio // Free each region to its corresponding heap. size_t reserved_sizes[MaxManagerCount] = {}; - const PAddr ini_start = GetInitialProcessBinaryPhysicalAddress(); - const PAddr ini_end = ini_start + InitialProcessBinarySizeMax; - const PAddr ini_last = ini_end - 1; + const KPhysicalAddress ini_start = GetInitialProcessBinaryPhysicalAddress(); + const KPhysicalAddress ini_end = ini_start + InitialProcessBinarySizeMax; + const KPhysicalAddress ini_last = ini_end - 1; for (const auto& it : m_system.Kernel().MemoryLayout().GetPhysicalMemoryRegionTree()) { if (it.IsDerivedFrom(KMemoryRegionType_DramUserPool)) { // Get the manager for the region. auto& manager = m_managers[it.GetAttributes()]; - const PAddr cur_start = it.GetAddress(); - const PAddr cur_last = it.GetLastAddress(); - const PAddr cur_end = it.GetEndAddress(); + const KPhysicalAddress cur_start = it.GetAddress(); + const KPhysicalAddress cur_last = it.GetLastAddress(); + const KPhysicalAddress cur_end = it.GetEndAddress(); if (cur_start <= ini_start && ini_last <= cur_last) { // Free memory before the ini to the heap. @@ -175,7 +174,8 @@ void KMemoryManager::FinalizeOptimizedMemory(u64 process_id, Pool pool) { UNREACHABLE(); } -PAddr KMemoryManager::AllocateAndOpenContinuous(size_t num_pages, size_t align_pages, u32 option) { +KPhysicalAddress KMemoryManager::AllocateAndOpenContinuous(size_t num_pages, size_t align_pages, + u32 option) { // Early return if we're allocating no pages. if (num_pages == 0) { return 0; @@ -190,7 +190,7 @@ PAddr KMemoryManager::AllocateAndOpenContinuous(size_t num_pages, size_t align_p // Loop, trying to iterate from each block. Impl* chosen_manager = nullptr; - PAddr allocated_block = 0; + KPhysicalAddress allocated_block = 0; for (chosen_manager = this->GetFirstManager(pool, dir); chosen_manager != nullptr; chosen_manager = this->GetNextManager(chosen_manager, dir)) { allocated_block = chosen_manager->AllocateAligned(heap_index, num_pages, align_pages); @@ -239,7 +239,7 @@ Result KMemoryManager::AllocatePageGroupImpl(KPageGroup* out, size_t num_pages, cur_manager = this->GetNextManager(cur_manager, dir)) { while (num_pages >= pages_per_alloc) { // Allocate a block. - PAddr allocated_block = cur_manager->AllocateBlock(index, random); + KPhysicalAddress allocated_block = cur_manager->AllocateBlock(index, random); if (allocated_block == 0) { break; } @@ -286,7 +286,7 @@ Result KMemoryManager::AllocateAndOpen(KPageGroup* out, size_t num_pages, u32 op // Open the first reference to the pages. for (const auto& block : *out) { - PAddr cur_address = block.GetAddress(); + KPhysicalAddress cur_address = block.GetAddress(); size_t remaining_pages = block.GetNumPages(); while (remaining_pages > 0) { // Get the manager for the current address. @@ -337,7 +337,7 @@ Result KMemoryManager::AllocateForProcess(KPageGroup* out, size_t num_pages, u32 // Iterate over the allocated blocks. for (const auto& block : *out) { // Get the block extents. - const PAddr block_address = block.GetAddress(); + const KPhysicalAddress block_address = block.GetAddress(); const size_t block_pages = block.GetNumPages(); // If it has no pages, we don't need to do anything. @@ -348,7 +348,7 @@ Result KMemoryManager::AllocateForProcess(KPageGroup* out, size_t num_pages, u32 // Fill all the pages that we need to fill. bool any_new = false; { - PAddr cur_address = block_address; + KPhysicalAddress cur_address = block_address; size_t remaining_pages = block_pages; while (remaining_pages > 0) { // Get the manager for the current address. @@ -369,7 +369,7 @@ Result KMemoryManager::AllocateForProcess(KPageGroup* out, size_t num_pages, u32 // If there are new pages, update tracking for the allocation. if (any_new) { // Update tracking for the allocation. - PAddr cur_address = block_address; + KPhysicalAddress cur_address = block_address; size_t remaining_pages = block_pages; while (remaining_pages > 0) { // Get the manager for the current address. @@ -400,8 +400,9 @@ Result KMemoryManager::AllocateForProcess(KPageGroup* out, size_t num_pages, u32 R_SUCCEED(); } -size_t KMemoryManager::Impl::Initialize(PAddr address, size_t size, VAddr management, - VAddr management_end, Pool p) { +size_t KMemoryManager::Impl::Initialize(KPhysicalAddress address, size_t size, + KVirtualAddress management, KVirtualAddress management_end, + Pool p) { // Calculate management sizes. const size_t ref_count_size = (size / PageSize) * sizeof(u16); const size_t optimize_map_size = CalculateOptimizedProcessOverheadSize(size); @@ -417,7 +418,7 @@ size_t KMemoryManager::Impl::Initialize(PAddr address, size_t size, VAddr manage m_management_region = management; m_page_reference_counts.resize( Kernel::Board::Nintendo::Nx::KSystemControl::Init::GetIntendedMemorySize() / PageSize); - ASSERT(Common::IsAligned(m_management_region, PageSize)); + ASSERT(Common::IsAligned(GetInteger(m_management_region), PageSize)); // Initialize the manager's KPageHeap. m_heap.Initialize(address, size, management + manager_size, page_heap_size); @@ -425,15 +426,15 @@ size_t KMemoryManager::Impl::Initialize(PAddr address, size_t size, VAddr manage return total_management_size; } -void KMemoryManager::Impl::TrackUnoptimizedAllocation(PAddr block, size_t num_pages) { +void KMemoryManager::Impl::TrackUnoptimizedAllocation(KPhysicalAddress block, size_t num_pages) { UNREACHABLE(); } -void KMemoryManager::Impl::TrackOptimizedAllocation(PAddr block, size_t num_pages) { +void KMemoryManager::Impl::TrackOptimizedAllocation(KPhysicalAddress block, size_t num_pages) { UNREACHABLE(); } -bool KMemoryManager::Impl::ProcessOptimizedAllocation(PAddr block, size_t num_pages, +bool KMemoryManager::Impl::ProcessOptimizedAllocation(KPhysicalAddress block, size_t num_pages, u8 fill_pattern) { UNREACHABLE(); } diff --git a/src/core/hle/kernel/k_memory_manager.h b/src/core/hle/kernel/k_memory_manager.h index 401d4e644..7e4b41319 100644 --- a/src/core/hle/kernel/k_memory_manager.h +++ b/src/core/hle/kernel/k_memory_manager.h @@ -7,10 +7,10 @@ #include #include "common/common_funcs.h" -#include "common/common_types.h" #include "core/hle/kernel/k_light_lock.h" #include "core/hle/kernel/k_memory_layout.h" #include "core/hle/kernel/k_page_heap.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/result.h" namespace Core { @@ -50,21 +50,21 @@ public: explicit KMemoryManager(Core::System& system); - void Initialize(VAddr management_region, size_t management_region_size); + void Initialize(KVirtualAddress management_region, size_t management_region_size); Result InitializeOptimizedMemory(u64 process_id, Pool pool); void FinalizeOptimizedMemory(u64 process_id, Pool pool); - PAddr AllocateAndOpenContinuous(size_t num_pages, size_t align_pages, u32 option); + KPhysicalAddress AllocateAndOpenContinuous(size_t num_pages, size_t align_pages, u32 option); Result AllocateAndOpen(KPageGroup* out, size_t num_pages, u32 option); Result AllocateForProcess(KPageGroup* out, size_t num_pages, u32 option, u64 process_id, u8 fill_pattern); - Pool GetPool(PAddr address) const { + Pool GetPool(KPhysicalAddress address) const { return this->GetManager(address).GetPool(); } - void Open(PAddr address, size_t num_pages) { + void Open(KPhysicalAddress address, size_t num_pages) { // Repeatedly open references until we've done so for all pages. while (num_pages) { auto& manager = this->GetManager(address); @@ -80,7 +80,7 @@ public: } } - void OpenFirst(PAddr address, size_t num_pages) { + void OpenFirst(KPhysicalAddress address, size_t num_pages) { // Repeatedly open references until we've done so for all pages. while (num_pages) { auto& manager = this->GetManager(address); @@ -96,7 +96,7 @@ public: } } - void Close(PAddr address, size_t num_pages) { + void Close(KPhysicalAddress address, size_t num_pages) { // Repeatedly close references until we've done so for all pages. while (num_pages) { auto& manager = this->GetManager(address); @@ -199,16 +199,16 @@ private: public: Impl() = default; - size_t Initialize(PAddr address, size_t size, VAddr management, VAddr management_end, - Pool p); + size_t Initialize(KPhysicalAddress address, size_t size, KVirtualAddress management, + KVirtualAddress management_end, Pool p); - PAddr AllocateBlock(s32 index, bool random) { + KPhysicalAddress AllocateBlock(s32 index, bool random) { return m_heap.AllocateBlock(index, random); } - PAddr AllocateAligned(s32 index, size_t num_pages, size_t align_pages) { + KPhysicalAddress AllocateAligned(s32 index, size_t num_pages, size_t align_pages) { return m_heap.AllocateAligned(index, num_pages, align_pages); } - void Free(PAddr addr, size_t num_pages) { + void Free(KPhysicalAddress addr, size_t num_pages) { m_heap.Free(addr, num_pages); } @@ -220,10 +220,10 @@ private: UNIMPLEMENTED(); } - void TrackUnoptimizedAllocation(PAddr block, size_t num_pages); - void TrackOptimizedAllocation(PAddr block, size_t num_pages); + void TrackUnoptimizedAllocation(KPhysicalAddress block, size_t num_pages); + void TrackOptimizedAllocation(KPhysicalAddress block, size_t num_pages); - bool ProcessOptimizedAllocation(PAddr block, size_t num_pages, u8 fill_pattern); + bool ProcessOptimizedAllocation(KPhysicalAddress block, size_t num_pages, u8 fill_pattern); constexpr Pool GetPool() const { return m_pool; @@ -231,7 +231,7 @@ private: constexpr size_t GetSize() const { return m_heap.GetSize(); } - constexpr PAddr GetEndAddress() const { + constexpr KPhysicalAddress GetEndAddress() const { return m_heap.GetEndAddress(); } @@ -243,10 +243,10 @@ private: UNIMPLEMENTED(); } - constexpr size_t GetPageOffset(PAddr address) const { + constexpr size_t GetPageOffset(KPhysicalAddress address) const { return m_heap.GetPageOffset(address); } - constexpr size_t GetPageOffsetToEnd(PAddr address) const { + constexpr size_t GetPageOffsetToEnd(KPhysicalAddress address) const { return m_heap.GetPageOffsetToEnd(address); } @@ -263,7 +263,7 @@ private: return m_prev; } - void OpenFirst(PAddr address, size_t num_pages) { + void OpenFirst(KPhysicalAddress address, size_t num_pages) { size_t index = this->GetPageOffset(address); const size_t end = index + num_pages; while (index < end) { @@ -274,7 +274,7 @@ private: } } - void Open(PAddr address, size_t num_pages) { + void Open(KPhysicalAddress address, size_t num_pages) { size_t index = this->GetPageOffset(address); const size_t end = index + num_pages; while (index < end) { @@ -285,7 +285,7 @@ private: } } - void Close(PAddr address, size_t num_pages) { + void Close(KPhysicalAddress address, size_t num_pages) { size_t index = this->GetPageOffset(address); const size_t end = index + num_pages; @@ -323,18 +323,18 @@ private: KPageHeap m_heap; std::vector m_page_reference_counts; - VAddr m_management_region{}; + KVirtualAddress m_management_region{}; Pool m_pool{}; Impl* m_next{}; Impl* m_prev{}; }; private: - Impl& GetManager(PAddr address) { + Impl& GetManager(KPhysicalAddress address) { return m_managers[m_memory_layout.GetPhysicalLinearRegion(address).GetAttributes()]; } - const Impl& GetManager(PAddr address) const { + const Impl& GetManager(KPhysicalAddress address) const { return m_managers[m_memory_layout.GetPhysicalLinearRegion(address).GetAttributes()]; } diff --git a/src/core/hle/kernel/k_memory_region.h b/src/core/hle/kernel/k_memory_region.h index cfe86fb82..e3044f022 100644 --- a/src/core/hle/kernel/k_memory_region.h +++ b/src/core/hle/kernel/k_memory_region.h @@ -5,9 +5,9 @@ #include "common/assert.h" #include "common/common_funcs.h" -#include "common/common_types.h" #include "common/intrusive_red_black_tree.h" #include "core/hle/kernel/k_memory_region_type.h" +#include "core/hle/kernel/k_typed_address.h" namespace Kernel { @@ -243,10 +243,10 @@ public: void InsertDirectly(u64 address, u64 last_address, u32 attr = 0, u32 type_id = 0); bool Insert(u64 address, size_t size, u32 type_id, u32 new_attr = 0, u32 old_attr = 0); - VAddr GetRandomAlignedRegion(size_t size, size_t alignment, u32 type_id); + KVirtualAddress GetRandomAlignedRegion(size_t size, size_t alignment, u32 type_id); - VAddr GetRandomAlignedRegionWithGuard(size_t size, size_t alignment, u32 type_id, - size_t guard_size) { + KVirtualAddress GetRandomAlignedRegionWithGuard(size_t size, size_t alignment, u32 type_id, + size_t guard_size) { return this->GetRandomAlignedRegion(size + 2 * guard_size, alignment, type_id) + guard_size; } diff --git a/src/core/hle/kernel/k_page_buffer.cpp b/src/core/hle/kernel/k_page_buffer.cpp index 0c16dded4..e9830e6d9 100644 --- a/src/core/hle/kernel/k_page_buffer.cpp +++ b/src/core/hle/kernel/k_page_buffer.cpp @@ -10,8 +10,8 @@ namespace Kernel { -KPageBuffer* KPageBuffer::FromPhysicalAddress(Core::System& system, PAddr phys_addr) { - ASSERT(Common::IsAligned(phys_addr, PageSize)); +KPageBuffer* KPageBuffer::FromPhysicalAddress(Core::System& system, KPhysicalAddress phys_addr) { + ASSERT(Common::IsAligned(GetInteger(phys_addr), PageSize)); return system.DeviceMemory().GetPointer(phys_addr); } diff --git a/src/core/hle/kernel/k_page_buffer.h b/src/core/hle/kernel/k_page_buffer.h index b7a3ccb4a..f6a7f1e39 100644 --- a/src/core/hle/kernel/k_page_buffer.h +++ b/src/core/hle/kernel/k_page_buffer.h @@ -26,7 +26,7 @@ public: explicit KPageBuffer(KernelCore&) {} KPageBuffer() = default; - static KPageBuffer* FromPhysicalAddress(Core::System& system, PAddr phys_addr); + static KPageBuffer* FromPhysicalAddress(Core::System& system, KPhysicalAddress phys_addr); private: alignas(PageSize) std::array m_buffer{}; diff --git a/src/core/hle/kernel/k_page_group.h b/src/core/hle/kernel/k_page_group.h index c07f17663..b32909f05 100644 --- a/src/core/hle/kernel/k_page_group.h +++ b/src/core/hle/kernel/k_page_group.h @@ -22,7 +22,7 @@ public: constexpr explicit KBlockInfo() : m_next(nullptr) {} constexpr void Initialize(KPhysicalAddress addr, size_t np) { - ASSERT(Common::IsAligned(addr, PageSize)); + ASSERT(Common::IsAligned(GetInteger(addr), PageSize)); ASSERT(static_cast(np) == np); m_page_index = static_cast(addr / PageSize); diff --git a/src/core/hle/kernel/k_page_heap.cpp b/src/core/hle/kernel/k_page_heap.cpp index 7b02c7d8b..95762b5a2 100644 --- a/src/core/hle/kernel/k_page_heap.cpp +++ b/src/core/hle/kernel/k_page_heap.cpp @@ -6,14 +6,14 @@ namespace Kernel { -void KPageHeap::Initialize(PAddr address, size_t size, VAddr management_address, - size_t management_size, const size_t* block_shifts, - size_t num_block_shifts) { +void KPageHeap::Initialize(KPhysicalAddress address, size_t size, + KVirtualAddress management_address, size_t management_size, + const size_t* block_shifts, size_t num_block_shifts) { // Check our assumptions. - ASSERT(Common::IsAligned(address, PageSize)); + ASSERT(Common::IsAligned(GetInteger(address), PageSize)); ASSERT(Common::IsAligned(size, PageSize)); ASSERT(0 < num_block_shifts && num_block_shifts <= NumMemoryBlockPageShifts); - const VAddr management_end = management_address + management_size; + const KVirtualAddress management_end = management_address + management_size; // Set our members. m_heap_address = address; @@ -31,7 +31,7 @@ void KPageHeap::Initialize(PAddr address, size_t size, VAddr management_address, } // Ensure we didn't overextend our bounds. - ASSERT(VAddr(cur_bitmap_storage) <= management_end); + ASSERT(KVirtualAddress(cur_bitmap_storage) <= management_end); } size_t KPageHeap::GetNumFreePages() const { @@ -44,11 +44,11 @@ size_t KPageHeap::GetNumFreePages() const { return num_free; } -PAddr KPageHeap::AllocateByLinearSearch(s32 index) { +KPhysicalAddress KPageHeap::AllocateByLinearSearch(s32 index) { const size_t needed_size = m_blocks[index].GetSize(); for (s32 i = index; i < static_cast(m_num_blocks); i++) { - if (const PAddr addr = m_blocks[i].PopBlock(false); addr != 0) { + if (const KPhysicalAddress addr = m_blocks[i].PopBlock(false); addr != 0) { if (const size_t allocated_size = m_blocks[i].GetSize(); allocated_size > needed_size) { this->Free(addr + needed_size, (allocated_size - needed_size) / PageSize); } @@ -59,7 +59,7 @@ PAddr KPageHeap::AllocateByLinearSearch(s32 index) { return 0; } -PAddr KPageHeap::AllocateByRandom(s32 index, size_t num_pages, size_t align_pages) { +KPhysicalAddress KPageHeap::AllocateByRandom(s32 index, size_t num_pages, size_t align_pages) { // Get the size and required alignment. const size_t needed_size = num_pages * PageSize; const size_t align_size = align_pages * PageSize; @@ -110,7 +110,7 @@ PAddr KPageHeap::AllocateByRandom(s32 index, size_t num_pages, size_t align_page } // Pop a block from the index we selected. - if (PAddr addr = m_blocks[index].PopBlock(true); addr != 0) { + if (KPhysicalAddress addr = m_blocks[index].PopBlock(true); addr != 0) { // Determine how much size we have left over. if (const size_t leftover_size = m_blocks[index].GetSize() - needed_size; leftover_size > 0) { @@ -141,13 +141,13 @@ PAddr KPageHeap::AllocateByRandom(s32 index, size_t num_pages, size_t align_page return 0; } -void KPageHeap::FreeBlock(PAddr block, s32 index) { +void KPageHeap::FreeBlock(KPhysicalAddress block, s32 index) { do { block = m_blocks[index++].PushBlock(block); } while (block != 0); } -void KPageHeap::Free(PAddr addr, size_t num_pages) { +void KPageHeap::Free(KPhysicalAddress addr, size_t num_pages) { // Freeing no pages is a no-op. if (num_pages == 0) { return; @@ -155,16 +155,16 @@ void KPageHeap::Free(PAddr addr, size_t num_pages) { // Find the largest block size that we can free, and free as many as possible. s32 big_index = static_cast(m_num_blocks) - 1; - const PAddr start = addr; - const PAddr end = addr + num_pages * PageSize; - PAddr before_start = start; - PAddr before_end = start; - PAddr after_start = end; - PAddr after_end = end; + const KPhysicalAddress start = addr; + const KPhysicalAddress end = addr + num_pages * PageSize; + KPhysicalAddress before_start = start; + KPhysicalAddress before_end = start; + KPhysicalAddress after_start = end; + KPhysicalAddress after_end = end; while (big_index >= 0) { const size_t block_size = m_blocks[big_index].GetSize(); - const PAddr big_start = Common::AlignUp(start, block_size); - const PAddr big_end = Common::AlignDown(end, block_size); + const KPhysicalAddress big_start = Common::AlignUp(GetInteger(start), block_size); + const KPhysicalAddress big_end = Common::AlignDown(GetInteger(end), block_size); if (big_start < big_end) { // Free as many big blocks as we can. for (auto block = big_start; block < big_end; block += block_size) { diff --git a/src/core/hle/kernel/k_page_heap.h b/src/core/hle/kernel/k_page_heap.h index 9021edcf7..c55225bac 100644 --- a/src/core/hle/kernel/k_page_heap.h +++ b/src/core/hle/kernel/k_page_heap.h @@ -8,8 +8,8 @@ #include "common/alignment.h" #include "common/common_funcs.h" -#include "common/common_types.h" #include "core/hle/kernel/k_page_bitmap.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/kernel/memory_types.h" namespace Kernel { @@ -18,24 +18,24 @@ class KPageHeap { public: KPageHeap() = default; - constexpr PAddr GetAddress() const { + constexpr KPhysicalAddress GetAddress() const { return m_heap_address; } constexpr size_t GetSize() const { return m_heap_size; } - constexpr PAddr GetEndAddress() const { + constexpr KPhysicalAddress GetEndAddress() const { return this->GetAddress() + this->GetSize(); } - constexpr size_t GetPageOffset(PAddr block) const { + constexpr size_t GetPageOffset(KPhysicalAddress block) const { return (block - this->GetAddress()) / PageSize; } - constexpr size_t GetPageOffsetToEnd(PAddr block) const { + constexpr size_t GetPageOffsetToEnd(KPhysicalAddress block) const { return (this->GetEndAddress() - block) / PageSize; } - void Initialize(PAddr heap_address, size_t heap_size, VAddr management_address, - size_t management_size) { + void Initialize(KPhysicalAddress heap_address, size_t heap_size, + KVirtualAddress management_address, size_t management_size) { return this->Initialize(heap_address, heap_size, management_address, management_size, MemoryBlockPageShifts.data(), NumMemoryBlockPageShifts); } @@ -53,7 +53,7 @@ public: m_initial_used_size = m_heap_size - free_size - reserved_size; } - PAddr AllocateBlock(s32 index, bool random) { + KPhysicalAddress AllocateBlock(s32 index, bool random) { if (random) { const size_t block_pages = m_blocks[index].GetNumPages(); return this->AllocateByRandom(index, block_pages, block_pages); @@ -62,12 +62,12 @@ public: } } - PAddr AllocateAligned(s32 index, size_t num_pages, size_t align_pages) { + KPhysicalAddress AllocateAligned(s32 index, size_t num_pages, size_t align_pages) { // TODO: linear search support? return this->AllocateByRandom(index, num_pages, align_pages); } - void Free(PAddr addr, size_t num_pages); + void Free(KPhysicalAddress addr, size_t num_pages); static size_t CalculateManagementOverheadSize(size_t region_size) { return CalculateManagementOverheadSize(region_size, MemoryBlockPageShifts.data(), @@ -125,24 +125,25 @@ private: return this->GetNumFreeBlocks() * this->GetNumPages(); } - u64* Initialize(PAddr addr, size_t size, size_t bs, size_t nbs, u64* bit_storage) { + u64* Initialize(KPhysicalAddress addr, size_t size, size_t bs, size_t nbs, + u64* bit_storage) { // Set shifts. m_block_shift = bs; m_next_block_shift = nbs; // Align up the address. - PAddr end = addr + size; + KPhysicalAddress end = addr + size; const size_t align = (m_next_block_shift != 0) ? (u64(1) << m_next_block_shift) : (u64(1) << m_block_shift); - addr = Common::AlignDown(addr, align); - end = Common::AlignUp(end, align); + addr = Common::AlignDown(GetInteger(addr), align); + end = Common::AlignUp(GetInteger(end), align); m_heap_address = addr; m_end_offset = (end - addr) / (u64(1) << m_block_shift); return m_bitmap.Initialize(bit_storage, m_end_offset); } - PAddr PushBlock(PAddr address) { + KPhysicalAddress PushBlock(KPhysicalAddress address) { // Set the bit for the free block. size_t offset = (address - m_heap_address) >> this->GetShift(); m_bitmap.SetBit(offset); @@ -161,7 +162,7 @@ private: return {}; } - PAddr PopBlock(bool random) { + KPhysicalAddress PopBlock(bool random) { // Find a free block. s64 soffset = m_bitmap.FindFreeBlock(random); if (soffset < 0) { @@ -187,18 +188,19 @@ private: private: KPageBitmap m_bitmap; - PAddr m_heap_address{}; + KPhysicalAddress m_heap_address{}; uintptr_t m_end_offset{}; size_t m_block_shift{}; size_t m_next_block_shift{}; }; private: - void Initialize(PAddr heap_address, size_t heap_size, VAddr management_address, - size_t management_size, const size_t* block_shifts, size_t num_block_shifts); + void Initialize(KPhysicalAddress heap_address, size_t heap_size, + KVirtualAddress management_address, size_t management_size, + const size_t* block_shifts, size_t num_block_shifts); size_t GetNumFreePages() const; - void FreeBlock(PAddr block, s32 index); + void FreeBlock(KPhysicalAddress block, s32 index); static constexpr size_t NumMemoryBlockPageShifts{7}; static constexpr std::array MemoryBlockPageShifts{ @@ -206,14 +208,14 @@ private: }; private: - PAddr AllocateByLinearSearch(s32 index); - PAddr AllocateByRandom(s32 index, size_t num_pages, size_t align_pages); + KPhysicalAddress AllocateByLinearSearch(s32 index); + KPhysicalAddress AllocateByRandom(s32 index, size_t num_pages, size_t align_pages); static size_t CalculateManagementOverheadSize(size_t region_size, const size_t* block_shifts, size_t num_block_shifts); private: - PAddr m_heap_address{}; + KPhysicalAddress m_heap_address{}; size_t m_heap_size{}; size_t m_initial_used_size{}; size_t m_num_blocks{}; diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp index 2e13d5d0d..cb39387ea 100644 --- a/src/core/hle/kernel/k_page_table.cpp +++ b/src/core/hle/kernel/k_page_table.cpp @@ -106,7 +106,7 @@ KPageTable::~KPageTable() = default; Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type, bool enable_aslr, bool enable_das_merge, bool from_back, - KMemoryManager::Pool pool, VAddr code_addr, + KMemoryManager::Pool pool, KProcessAddress code_addr, size_t code_size, KSystemResource* system_resource, KResourceLimit* resource_limit) { @@ -119,8 +119,8 @@ Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type // Set our width and heap/alias sizes m_address_space_width = GetAddressSpaceWidthFromType(as_type); - const VAddr start = 0; - const VAddr end{1ULL << m_address_space_width}; + const KProcessAddress start = 0; + const KProcessAddress end{1ULL << m_address_space_width}; size_t alias_region_size{GetSpaceSize(KAddressSpaceInfo::Type::Alias)}; size_t heap_region_size{GetSpaceSize(KAddressSpaceInfo::Type::Heap)}; @@ -135,8 +135,8 @@ Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type // Set code regions and determine remaining constexpr size_t RegionAlignment{2_MiB}; - VAddr process_code_start{}; - VAddr process_code_end{}; + KProcessAddress process_code_start{}; + KProcessAddress process_code_end{}; size_t stack_region_size{}; size_t kernel_map_region_size{}; @@ -149,8 +149,8 @@ Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type m_code_region_end = m_code_region_start + GetSpaceSize(KAddressSpaceInfo::Type::Map39Bit); m_alias_code_region_start = m_code_region_start; m_alias_code_region_end = m_code_region_end; - process_code_start = Common::AlignDown(code_addr, RegionAlignment); - process_code_end = Common::AlignUp(code_addr + code_size, RegionAlignment); + process_code_start = Common::AlignDown(GetInteger(code_addr), RegionAlignment); + process_code_end = Common::AlignUp(GetInteger(code_addr) + code_size, RegionAlignment); } else { stack_region_size = 0; kernel_map_region_size = 0; @@ -178,7 +178,7 @@ Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type m_resource_limit = resource_limit; // Determine the region we can place our undetermineds in - VAddr alloc_start{}; + KProcessAddress alloc_start{}; size_t alloc_size{}; if ((process_code_start - m_code_region_start) >= (end - process_code_end)) { alloc_start = m_code_region_start; @@ -292,7 +292,7 @@ Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type : KMemoryManager::Direction::FromFront); // Ensure that we regions inside our address space - auto IsInAddressSpace = [&](VAddr addr) { + auto IsInAddressSpace = [&](KProcessAddress addr) { return m_address_space_start <= addr && addr <= m_address_space_end; }; ASSERT(IsInAddressSpace(m_alias_region_start)); @@ -305,14 +305,14 @@ Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type ASSERT(IsInAddressSpace(m_kernel_map_region_end)); // Ensure that we selected regions that don't overlap - const VAddr alias_start{m_alias_region_start}; - const VAddr alias_last{m_alias_region_end - 1}; - const VAddr heap_start{m_heap_region_start}; - const VAddr heap_last{m_heap_region_end - 1}; - const VAddr stack_start{m_stack_region_start}; - const VAddr stack_last{m_stack_region_end - 1}; - const VAddr kmap_start{m_kernel_map_region_start}; - const VAddr kmap_last{m_kernel_map_region_end - 1}; + const KProcessAddress alias_start{m_alias_region_start}; + const KProcessAddress alias_last{m_alias_region_end - 1}; + const KProcessAddress heap_start{m_heap_region_start}; + const KProcessAddress heap_last{m_heap_region_end - 1}; + const KProcessAddress stack_start{m_stack_region_start}; + const KProcessAddress stack_last{m_stack_region_end - 1}; + const KProcessAddress kmap_start{m_kernel_map_region_start}; + const KProcessAddress kmap_last{m_kernel_map_region_end - 1}; ASSERT(alias_last < heap_start || heap_last < alias_start); ASSERT(alias_last < stack_start || stack_last < alias_start); ASSERT(alias_last < kmap_start || kmap_last < alias_start); @@ -334,9 +334,10 @@ Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type void KPageTable::Finalize() { // Finalize memory blocks. - m_memory_block_manager.Finalize(m_memory_block_slab_manager, [&](VAddr addr, u64 size) { - m_system.Memory().UnmapRegion(*m_page_table_impl, addr, size); - }); + m_memory_block_manager.Finalize( + m_memory_block_slab_manager, [&](KProcessAddress addr, u64 size) { + m_system.Memory().UnmapRegion(*m_page_table_impl, addr, size); + }); // Release any insecure mapped memory. if (m_mapped_insecure_memory) { @@ -352,7 +353,7 @@ void KPageTable::Finalize() { m_page_table_impl.reset(); } -Result KPageTable::MapProcessCode(VAddr addr, size_t num_pages, KMemoryState state, +Result KPageTable::MapProcessCode(KProcessAddress addr, size_t num_pages, KMemoryState state, KMemoryPermission perm) { const u64 size{num_pages * PageSize}; @@ -388,7 +389,8 @@ Result KPageTable::MapProcessCode(VAddr addr, size_t num_pages, KMemoryState sta R_SUCCEED(); } -Result KPageTable::MapCodeMemory(VAddr dst_address, VAddr src_address, size_t size) { +Result KPageTable::MapCodeMemory(KProcessAddress dst_address, KProcessAddress src_address, + size_t size) { // Validate the mapping request. R_UNLESS(this->CanContain(dst_address, size, KMemoryState::AliasCode), ResultInvalidMemoryRegion); @@ -473,7 +475,8 @@ Result KPageTable::MapCodeMemory(VAddr dst_address, VAddr src_address, size_t si R_SUCCEED(); } -Result KPageTable::UnmapCodeMemory(VAddr dst_address, VAddr src_address, size_t size, +Result KPageTable::UnmapCodeMemory(KProcessAddress dst_address, KProcessAddress src_address, + size_t size, ICacheInvalidationStrategy icache_invalidation_strategy) { // Validate the mapping request. R_UNLESS(this->CanContain(dst_address, size, KMemoryState::AliasCode), @@ -525,7 +528,7 @@ Result KPageTable::UnmapCodeMemory(VAddr dst_address, VAddr src_address, size_t SCOPE_EXIT({ if (reprotected_pages && any_code_pages) { if (icache_invalidation_strategy == ICacheInvalidationStrategy::InvalidateRange) { - m_system.InvalidateCpuInstructionCacheRange(dst_address, size); + m_system.InvalidateCpuInstructionCacheRange(GetInteger(dst_address), size); } else { m_system.InvalidateCpuInstructionCaches(); } @@ -575,9 +578,10 @@ Result KPageTable::UnmapCodeMemory(VAddr dst_address, VAddr src_address, size_t R_SUCCEED(); } -VAddr KPageTable::FindFreeArea(VAddr region_start, size_t region_num_pages, size_t num_pages, - size_t alignment, size_t offset, size_t guard_pages) { - VAddr address = 0; +KProcessAddress KPageTable::FindFreeArea(KProcessAddress region_start, size_t region_num_pages, + size_t num_pages, size_t alignment, size_t offset, + size_t guard_pages) { + KProcessAddress address = 0; if (num_pages <= region_num_pages) { if (this->IsAslrEnabled()) { @@ -593,7 +597,7 @@ VAddr KPageTable::FindFreeArea(VAddr region_start, size_t region_num_pages, size return address; } -Result KPageTable::MakePageGroup(KPageGroup& pg, VAddr addr, size_t num_pages) { +Result KPageTable::MakePageGroup(KPageGroup& pg, KProcessAddress addr, size_t num_pages) { ASSERT(this->IsLockedByCurrentThread()); const size_t size = num_pages * PageSize; @@ -604,11 +608,11 @@ Result KPageTable::MakePageGroup(KPageGroup& pg, VAddr addr, size_t num_pages) { // Begin traversal. Common::PageTable::TraversalContext context; Common::PageTable::TraversalEntry next_entry; - R_UNLESS(m_page_table_impl->BeginTraversal(next_entry, context, addr), + R_UNLESS(m_page_table_impl->BeginTraversal(next_entry, context, GetInteger(addr)), ResultInvalidCurrentMemory); // Prepare tracking variables. - PAddr cur_addr = next_entry.phys_addr; + KPhysicalAddress cur_addr = next_entry.phys_addr; size_t cur_size = next_entry.block_size - (cur_addr & (next_entry.block_size - 1)); size_t tot_size = cur_size; @@ -646,7 +650,7 @@ Result KPageTable::MakePageGroup(KPageGroup& pg, VAddr addr, size_t num_pages) { R_SUCCEED(); } -bool KPageTable::IsValidPageGroup(const KPageGroup& pg, VAddr addr, size_t num_pages) { +bool KPageTable::IsValidPageGroup(const KPageGroup& pg, KProcessAddress addr, size_t num_pages) { ASSERT(this->IsLockedByCurrentThread()); const size_t size = num_pages * PageSize; @@ -659,7 +663,7 @@ bool KPageTable::IsValidPageGroup(const KPageGroup& pg, VAddr addr, size_t num_p // We're going to validate that the group we'd expect is the group we see. auto cur_it = pg.begin(); - PAddr cur_block_address = cur_it->GetAddress(); + KPhysicalAddress cur_block_address = cur_it->GetAddress(); size_t cur_block_pages = cur_it->GetNumPages(); auto UpdateCurrentIterator = [&]() { @@ -677,12 +681,12 @@ bool KPageTable::IsValidPageGroup(const KPageGroup& pg, VAddr addr, size_t num_p // Begin traversal. Common::PageTable::TraversalContext context; Common::PageTable::TraversalEntry next_entry; - if (!m_page_table_impl->BeginTraversal(next_entry, context, addr)) { + if (!m_page_table_impl->BeginTraversal(next_entry, context, GetInteger(addr))) { return false; } // Prepare tracking variables. - PAddr cur_addr = next_entry.phys_addr; + KPhysicalAddress cur_addr = next_entry.phys_addr; size_t cur_size = next_entry.block_size - (cur_addr & (next_entry.block_size - 1)); size_t tot_size = cur_size; @@ -734,8 +738,8 @@ bool KPageTable::IsValidPageGroup(const KPageGroup& pg, VAddr addr, size_t num_p return cur_block_address == cur_addr && cur_block_pages == (cur_size / PageSize); } -Result KPageTable::UnmapProcessMemory(VAddr dst_addr, size_t size, KPageTable& src_page_table, - VAddr src_addr) { +Result KPageTable::UnmapProcessMemory(KProcessAddress dst_addr, size_t size, + KPageTable& src_page_table, KProcessAddress src_addr) { // Acquire the table locks. KScopedLightLockPair lk(src_page_table.m_general_lock, m_general_lock); @@ -774,8 +778,8 @@ Result KPageTable::UnmapProcessMemory(VAddr dst_addr, size_t size, KPageTable& s } Result KPageTable::SetupForIpcClient(PageLinkedList* page_list, size_t* out_blocks_needed, - VAddr address, size_t size, KMemoryPermission test_perm, - KMemoryState dst_state) { + KProcessAddress address, size_t size, + KMemoryPermission test_perm, KMemoryState dst_state) { // Validate pre-conditions. ASSERT(this->IsLockedByCurrentThread()); ASSERT(test_perm == KMemoryPermission::UserReadWrite || @@ -790,10 +794,10 @@ Result KPageTable::SetupForIpcClient(PageLinkedList* page_list, size_t* out_bloc : KMemoryPermission::UserRead; // Get aligned extents. - const VAddr aligned_src_start = Common::AlignDown((address), PageSize); - const VAddr aligned_src_end = Common::AlignUp((address) + size, PageSize); - const VAddr mapping_src_start = Common::AlignUp((address), PageSize); - const VAddr mapping_src_end = Common::AlignDown((address) + size, PageSize); + const KProcessAddress aligned_src_start = Common::AlignDown(GetInteger(address), PageSize); + const KProcessAddress aligned_src_end = Common::AlignUp(GetInteger(address) + size, PageSize); + const KProcessAddress mapping_src_start = Common::AlignUp(GetInteger(address), PageSize); + const KProcessAddress mapping_src_end = Common::AlignDown(GetInteger(address) + size, PageSize); const auto aligned_src_last = (aligned_src_end)-1; const auto mapping_src_last = (mapping_src_end)-1; @@ -840,14 +844,15 @@ Result KPageTable::SetupForIpcClient(PageLinkedList* page_list, size_t* out_bloc test_attr_mask, KMemoryAttribute::None)); if (mapping_src_start < mapping_src_end && (mapping_src_start) < info.GetEndAddress() && - info.GetAddress() < (mapping_src_end)) { - const auto cur_start = - info.GetAddress() >= (mapping_src_start) ? info.GetAddress() : (mapping_src_start); + info.GetAddress() < GetInteger(mapping_src_end)) { + const auto cur_start = info.GetAddress() >= GetInteger(mapping_src_start) + ? info.GetAddress() + : (mapping_src_start); const auto cur_end = mapping_src_last >= info.GetLastAddress() ? info.GetEndAddress() : (mapping_src_end); const size_t cur_size = cur_end - cur_start; - if (info.GetAddress() < (mapping_src_start)) { + if (info.GetAddress() < GetInteger(mapping_src_start)) { ++blocks_needed; } if (mapping_src_last < info.GetLastAddress()) { @@ -882,30 +887,32 @@ Result KPageTable::SetupForIpcClient(PageLinkedList* page_list, size_t* out_bloc R_SUCCEED(); } -Result KPageTable::SetupForIpcServer(VAddr* out_addr, size_t size, VAddr src_addr, - KMemoryPermission test_perm, KMemoryState dst_state, - KPageTable& src_page_table, bool send) { +Result KPageTable::SetupForIpcServer(KProcessAddress* out_addr, size_t size, + KProcessAddress src_addr, KMemoryPermission test_perm, + KMemoryState dst_state, KPageTable& src_page_table, + bool send) { ASSERT(this->IsLockedByCurrentThread()); ASSERT(src_page_table.IsLockedByCurrentThread()); // Check that we can theoretically map. - const VAddr region_start = m_alias_region_start; + const KProcessAddress region_start = m_alias_region_start; const size_t region_size = m_alias_region_end - m_alias_region_start; R_UNLESS(size < region_size, ResultOutOfAddressSpace); // Get aligned source extents. - const VAddr src_start = src_addr; - const VAddr src_end = src_addr + size; - const VAddr aligned_src_start = Common::AlignDown((src_start), PageSize); - const VAddr aligned_src_end = Common::AlignUp((src_start) + size, PageSize); - const VAddr mapping_src_start = Common::AlignUp((src_start), PageSize); - const VAddr mapping_src_end = Common::AlignDown((src_start) + size, PageSize); + const KProcessAddress src_start = src_addr; + const KProcessAddress src_end = src_addr + size; + const KProcessAddress aligned_src_start = Common::AlignDown(GetInteger(src_start), PageSize); + const KProcessAddress aligned_src_end = Common::AlignUp(GetInteger(src_start) + size, PageSize); + const KProcessAddress mapping_src_start = Common::AlignUp(GetInteger(src_start), PageSize); + const KProcessAddress mapping_src_end = + Common::AlignDown(GetInteger(src_start) + size, PageSize); const size_t aligned_src_size = aligned_src_end - aligned_src_start; const size_t mapping_src_size = (mapping_src_start < mapping_src_end) ? (mapping_src_end - mapping_src_start) : 0; // Select a random address to map at. - VAddr dst_addr = + KProcessAddress dst_addr = this->FindFreeArea(region_start, region_size / PageSize, aligned_src_size / PageSize, PageSize, 0, this->GetNumGuardPages()); @@ -930,9 +937,9 @@ Result KPageTable::SetupForIpcServer(VAddr* out_addr, size_t size, VAddr src_add R_UNLESS(memory_reservation.Succeeded(), ResultLimitReached); // Ensure that we manage page references correctly. - PAddr start_partial_page = 0; - PAddr end_partial_page = 0; - VAddr cur_mapped_addr = dst_addr; + KPhysicalAddress start_partial_page = 0; + KPhysicalAddress end_partial_page = 0; + KProcessAddress cur_mapped_addr = dst_addr; // If the partial pages are mapped, an extra reference will have been opened. Otherwise, they'll // free on scope exit. @@ -977,11 +984,12 @@ Result KPageTable::SetupForIpcServer(VAddr* out_addr, size_t size, VAddr src_add // Begin traversal. Common::PageTable::TraversalContext context; Common::PageTable::TraversalEntry next_entry; - bool traverse_valid = src_impl.BeginTraversal(next_entry, context, aligned_src_start); + bool traverse_valid = + src_impl.BeginTraversal(next_entry, context, GetInteger(aligned_src_start)); ASSERT(traverse_valid); // Prepare tracking variables. - PAddr cur_block_addr = next_entry.phys_addr; + KPhysicalAddress cur_block_addr = next_entry.phys_addr; size_t cur_block_size = next_entry.block_size - ((cur_block_addr) & (next_entry.block_size - 1)); size_t tot_block_size = cur_block_size; @@ -989,7 +997,7 @@ Result KPageTable::SetupForIpcServer(VAddr* out_addr, size_t size, VAddr src_add // Map the start page, if we have one. if (start_partial_page != 0) { // Ensure the page holds correct data. - const VAddr start_partial_virt = + const KVirtualAddress start_partial_virt = GetHeapVirtualAddress(m_system.Kernel().MemoryLayout(), start_partial_page); if (send) { const size_t partial_offset = src_start - aligned_src_start; @@ -1002,21 +1010,23 @@ Result KPageTable::SetupForIpcServer(VAddr* out_addr, size_t size, VAddr src_add clear_size = 0; } - std::memset(m_system.Memory().GetPointer(start_partial_virt), fill_val, - partial_offset); + std::memset(m_system.Memory().GetPointer(GetInteger(start_partial_virt)), + fill_val, partial_offset); std::memcpy( - m_system.Memory().GetPointer(start_partial_virt + partial_offset), + m_system.Memory().GetPointer(GetInteger(start_partial_virt) + partial_offset), m_system.Memory().GetPointer( - GetHeapVirtualAddress(m_system.Kernel().MemoryLayout(), cur_block_addr) + + GetInteger( + GetHeapVirtualAddress(m_system.Kernel().MemoryLayout(), cur_block_addr)) + partial_offset), copy_size); if (clear_size > 0) { - std::memset(m_system.Memory().GetPointer(start_partial_virt + partial_offset + - copy_size), + std::memset(m_system.Memory().GetPointer(GetInteger(start_partial_virt) + + partial_offset + copy_size), fill_val, clear_size); } } else { - std::memset(m_system.Memory().GetPointer(start_partial_virt), fill_val, PageSize); + std::memset(m_system.Memory().GetPointer(GetInteger(start_partial_virt)), + fill_val, PageSize); } // Map the page. @@ -1061,7 +1071,8 @@ Result KPageTable::SetupForIpcServer(VAddr* out_addr, size_t size, VAddr src_add } // Handle the last direct-mapped page. - if (const VAddr mapped_block_end = aligned_src_start + tot_block_size - cur_block_size; + if (const KProcessAddress mapped_block_end = + aligned_src_start + tot_block_size - cur_block_size; mapped_block_end < mapping_src_end) { const size_t last_block_size = mapping_src_end - mapped_block_end; @@ -1084,18 +1095,20 @@ Result KPageTable::SetupForIpcServer(VAddr* out_addr, size_t size, VAddr src_add // Map the end page, if we have one. if (end_partial_page != 0) { // Ensure the page holds correct data. - const VAddr end_partial_virt = + const KVirtualAddress end_partial_virt = GetHeapVirtualAddress(m_system.Kernel().MemoryLayout(), end_partial_page); if (send) { const size_t copy_size = src_end - mapping_src_end; - std::memcpy(m_system.Memory().GetPointer(end_partial_virt), - m_system.Memory().GetPointer(GetHeapVirtualAddress( - m_system.Kernel().MemoryLayout(), cur_block_addr)), + std::memcpy(m_system.Memory().GetPointer(GetInteger(end_partial_virt)), + m_system.Memory().GetPointer(GetInteger(GetHeapVirtualAddress( + m_system.Kernel().MemoryLayout(), cur_block_addr))), copy_size); - std::memset(m_system.Memory().GetPointer(end_partial_virt + copy_size), fill_val, - PageSize - copy_size); + std::memset( + m_system.Memory().GetPointer(GetInteger(end_partial_virt) + copy_size), + fill_val, PageSize - copy_size); } else { - std::memset(m_system.Memory().GetPointer(end_partial_virt), fill_val, PageSize); + std::memset(m_system.Memory().GetPointer(GetInteger(end_partial_virt)), fill_val, + PageSize); } // Map the page. @@ -1116,7 +1129,7 @@ Result KPageTable::SetupForIpcServer(VAddr* out_addr, size_t size, VAddr src_add R_SUCCEED(); } -Result KPageTable::SetupForIpc(VAddr* out_dst_addr, size_t size, VAddr src_addr, +Result KPageTable::SetupForIpc(KProcessAddress* out_dst_addr, size_t size, KProcessAddress src_addr, KPageTable& src_page_table, KMemoryPermission test_perm, KMemoryState dst_state, bool send) { // For convenience, alias this. @@ -1142,8 +1155,8 @@ Result KPageTable::SetupForIpc(VAddr* out_dst_addr, size_t size, VAddr src_addr, R_TRY(allocator_result); // Get the mapped extents. - const VAddr src_map_start = Common::AlignUp((src_addr), PageSize); - const VAddr src_map_end = Common::AlignDown((src_addr) + size, PageSize); + const KProcessAddress src_map_start = Common::AlignUp(GetInteger(src_addr), PageSize); + const KProcessAddress src_map_end = Common::AlignDown(GetInteger(src_addr) + size, PageSize); const size_t src_map_size = src_map_end - src_map_start; // Ensure that we clean up appropriately if we fail after this. @@ -1172,7 +1185,8 @@ Result KPageTable::SetupForIpc(VAddr* out_dst_addr, size_t size, VAddr src_addr, R_SUCCEED(); } -Result KPageTable::CleanupForIpcServer(VAddr address, size_t size, KMemoryState dst_state) { +Result KPageTable::CleanupForIpcServer(KProcessAddress address, size_t size, + KMemoryState dst_state) { // Validate the address. R_UNLESS(this->Contains(address, size), ResultInvalidCurrentMemory); @@ -1196,8 +1210,8 @@ Result KPageTable::CleanupForIpcServer(VAddr address, size_t size, KMemoryState KScopedPageTableUpdater updater(this); // Get aligned extents. - const VAddr aligned_start = Common::AlignDown((address), PageSize); - const VAddr aligned_end = Common::AlignUp((address) + size, PageSize); + const KProcessAddress aligned_start = Common::AlignDown(GetInteger(address), PageSize); + const KProcessAddress aligned_end = Common::AlignUp(GetInteger(address) + size, PageSize); const size_t aligned_size = aligned_end - aligned_start; const size_t aligned_num_pages = aligned_size / PageSize; @@ -1211,22 +1225,23 @@ Result KPageTable::CleanupForIpcServer(VAddr address, size_t size, KMemoryState KMemoryBlockDisableMergeAttribute::Normal); // Release from the resource limit as relevant. - const VAddr mapping_start = Common::AlignUp((address), PageSize); - const VAddr mapping_end = Common::AlignDown((address) + size, PageSize); + const KProcessAddress mapping_start = Common::AlignUp(GetInteger(address), PageSize); + const KProcessAddress mapping_end = Common::AlignDown(GetInteger(address) + size, PageSize); const size_t mapping_size = (mapping_start < mapping_end) ? mapping_end - mapping_start : 0; m_resource_limit->Release(LimitableResource::PhysicalMemoryMax, aligned_size - mapping_size); R_SUCCEED(); } -Result KPageTable::CleanupForIpcClient(VAddr address, size_t size, KMemoryState dst_state) { +Result KPageTable::CleanupForIpcClient(KProcessAddress address, size_t size, + KMemoryState dst_state) { // Validate the address. R_UNLESS(this->Contains(address, size), ResultInvalidCurrentMemory); // Get aligned source extents. - const VAddr mapping_start = Common::AlignUp((address), PageSize); - const VAddr mapping_end = Common::AlignDown((address) + size, PageSize); - const VAddr mapping_last = mapping_end - 1; + const KProcessAddress mapping_start = Common::AlignUp(GetInteger(address), PageSize); + const KProcessAddress mapping_end = Common::AlignDown(GetInteger(address) + size, PageSize); + const KProcessAddress mapping_last = mapping_end - 1; const size_t mapping_size = (mapping_start < mapping_end) ? (mapping_end - mapping_start) : 0; // If nothing was mapped, we're actually done immediately. @@ -1279,7 +1294,7 @@ Result KPageTable::CleanupForIpcClient(VAddr address, size_t size, KMemoryState KMemoryInfo cur_info = start_it->GetMemoryInfo(); // Create tracking variables. - VAddr cur_address = cur_info.GetAddress(); + KProcessAddress cur_address = cur_info.GetAddress(); size_t cur_size = cur_info.GetSize(); bool cur_perm_eq = cur_info.GetPermission() == cur_info.GetOriginalPermission(); bool cur_needs_set_perm = !cur_perm_eq && cur_info.GetIpcLockCount() == 1; @@ -1352,7 +1367,7 @@ Result KPageTable::CleanupForIpcClient(VAddr address, size_t size, KMemoryState .IsSuccess()); // Create tracking variables. - VAddr cur_address = cur_info.GetAddress(); + KProcessAddress cur_address = cur_info.GetAddress(); size_t cur_size = cur_info.GetSize(); bool cur_perm_eq = cur_info.GetPermission() == cur_info.GetOriginalPermission(); bool cur_needs_set_perm = !cur_perm_eq && cur_info.GetIpcLockCount() == 1; @@ -1439,16 +1454,16 @@ Result KPageTable::CleanupForIpcClient(VAddr address, size_t size, KMemoryState } void KPageTable::CleanupForIpcClientOnServerSetupFailure([[maybe_unused]] PageLinkedList* page_list, - VAddr address, size_t size, + KProcessAddress address, size_t size, KMemoryPermission prot_perm) { ASSERT(this->IsLockedByCurrentThread()); - ASSERT(Common::IsAligned(address, PageSize)); + ASSERT(Common::IsAligned(GetInteger(address), PageSize)); ASSERT(Common::IsAligned(size, PageSize)); // Get the mapped extents. - const VAddr src_map_start = address; - const VAddr src_map_end = address + size; - const VAddr src_map_last = src_map_end - 1; + const KProcessAddress src_map_start = address; + const KProcessAddress src_map_end = address + size; + const KProcessAddress src_map_last = src_map_end - 1; // This function is only invoked when there's something to do. ASSERT(src_map_end > src_map_start); @@ -1458,8 +1473,9 @@ void KPageTable::CleanupForIpcClientOnServerSetupFailure([[maybe_unused]] PageLi while (true) { const KMemoryInfo info = it->GetMemoryInfo(); - const auto cur_start = - info.GetAddress() >= src_map_start ? info.GetAddress() : src_map_start; + const auto cur_start = info.GetAddress() >= GetInteger(src_map_start) + ? info.GetAddress() + : GetInteger(src_map_start); const auto cur_end = src_map_last <= info.GetLastAddress() ? src_map_end : info.GetEndAddress(); @@ -1469,7 +1485,7 @@ void KPageTable::CleanupForIpcClientOnServerSetupFailure([[maybe_unused]] PageLi (info.GetIpcLockCount() != 0 && (info.GetOriginalPermission() & KMemoryPermission::IpcLockChangeMask) != prot_perm)) { // Check if we actually need to fix the protections on the block. - if (cur_end == src_map_end || info.GetAddress() <= src_map_start || + if (cur_end == src_map_end || info.GetAddress() <= GetInteger(src_map_start) || (info.GetPermission() & KMemoryPermission::IpcLockChangeMask) != prot_perm) { ASSERT(Operate(cur_start, (cur_end - cur_start) / PageSize, info.GetPermission(), OperationType::ChangePermissions) @@ -1488,15 +1504,15 @@ void KPageTable::CleanupForIpcClientOnServerSetupFailure([[maybe_unused]] PageLi } } -Result KPageTable::MapPhysicalMemory(VAddr address, size_t size) { +Result KPageTable::MapPhysicalMemory(KProcessAddress address, size_t size) { // Lock the physical memory lock. KScopedLightLock phys_lk(m_map_physical_memory_lock); // Calculate the last address for convenience. - const VAddr last_address = address + size - 1; + const KProcessAddress last_address = address + size - 1; // Define iteration variables. - VAddr cur_address; + KProcessAddress cur_address; size_t mapped_size; // The entire mapping process can be retried. @@ -1528,7 +1544,7 @@ Result KPageTable::MapPhysicalMemory(VAddr address, size_t size) { // Track the memory if it's mapped. if (info.GetState() != KMemoryState::Free) { - mapped_size += VAddr(info.GetEndAddress()) - cur_address; + mapped_size += KProcessAddress(info.GetEndAddress()) - cur_address; } // Advance. @@ -1581,7 +1597,7 @@ Result KPageTable::MapPhysicalMemory(VAddr address, size_t size) { const bool is_free = info.GetState() == KMemoryState::Free; if (is_free) { - if (info.GetAddress() < address) { + if (info.GetAddress() < GetInteger(address)) { ++num_allocator_blocks; } if (last_address < info.GetLastAddress()) { @@ -1599,7 +1615,8 @@ Result KPageTable::MapPhysicalMemory(VAddr address, size_t size) { // Track the memory if it's mapped. if (!is_free) { - checked_mapped_size += VAddr(info.GetEndAddress()) - cur_address; + checked_mapped_size += + KProcessAddress(info.GetEndAddress()) - cur_address; } // Advance. @@ -1627,7 +1644,7 @@ Result KPageTable::MapPhysicalMemory(VAddr address, size_t size) { // Prepare to iterate over the memory. auto pg_it = pg.begin(); - PAddr pg_phys_addr = pg_it->GetAddress(); + KPhysicalAddress pg_phys_addr = pg_it->GetAddress(); size_t pg_pages = pg_it->GetNumPages(); // Reset the current tracking address, and make sure we clean up on failure. @@ -1635,7 +1652,7 @@ Result KPageTable::MapPhysicalMemory(VAddr address, size_t size) { cur_address = address; ON_RESULT_FAILURE { if (cur_address > address) { - const VAddr last_unmap_address = cur_address - 1; + const KProcessAddress last_unmap_address = cur_address - 1; // Iterate, unmapping the pages. cur_address = address; @@ -1652,7 +1669,7 @@ Result KPageTable::MapPhysicalMemory(VAddr address, size_t size) { if (info.GetState() == KMemoryState::Free) { // Determine the range to unmap. const size_t cur_pages = - std::min(VAddr(info.GetEndAddress()) - cur_address, + std::min(KProcessAddress(info.GetEndAddress()) - cur_address, last_unmap_address + 1 - cur_address) / PageSize; @@ -1695,9 +1712,10 @@ Result KPageTable::MapPhysicalMemory(VAddr address, size_t size) { // If it's unmapped, we need to map it. if (info.GetState() == KMemoryState::Free) { // Determine the range to map. - size_t map_pages = std::min(VAddr(info.GetEndAddress()) - cur_address, - last_address + 1 - cur_address) / - PageSize; + size_t map_pages = + std::min(KProcessAddress(info.GetEndAddress()) - cur_address, + last_address + 1 - cur_address) / + PageSize; // While we have pages to map, map them. while (map_pages > 0) { @@ -1754,7 +1772,7 @@ Result KPageTable::MapPhysicalMemory(VAddr address, size_t size) { } } -Result KPageTable::UnmapPhysicalMemory(VAddr address, size_t size) { +Result KPageTable::UnmapPhysicalMemory(KProcessAddress address, size_t size) { // Lock the physical memory lock. KScopedLightLock phys_lk(m_map_physical_memory_lock); @@ -1762,13 +1780,13 @@ Result KPageTable::UnmapPhysicalMemory(VAddr address, size_t size) { KScopedLightLock lk(m_general_lock); // Calculate the last address for convenience. - const VAddr last_address = address + size - 1; + const KProcessAddress last_address = address + size - 1; // Define iteration variables. - VAddr map_start_address = 0; - VAddr map_last_address = 0; + KProcessAddress map_start_address = 0; + KProcessAddress map_last_address = 0; - VAddr cur_address; + KProcessAddress cur_address; size_t mapped_size; size_t num_allocator_blocks = 0; @@ -1801,7 +1819,7 @@ Result KPageTable::UnmapPhysicalMemory(VAddr address, size_t size) { map_last_address = (last_address >= info.GetLastAddress()) ? info.GetLastAddress() : last_address; - if (info.GetAddress() < address) { + if (info.GetAddress() < GetInteger(address)) { ++num_allocator_blocks; } if (last_address < info.GetLastAddress()) { @@ -1854,7 +1872,7 @@ Result KPageTable::UnmapPhysicalMemory(VAddr address, size_t size) { // If the memory state is normal, we need to unmap it. if (info.GetState() == KMemoryState::Normal) { // Determine the range to unmap. - const size_t cur_pages = std::min(VAddr(info.GetEndAddress()) - cur_address, + const size_t cur_pages = std::min(KProcessAddress(info.GetEndAddress()) - cur_address, last_address + 1 - cur_address) / PageSize; @@ -2144,13 +2162,14 @@ void KPageTable::RemapPageGroup(PageLinkedList* page_list, KProcessAddress addre const KMemoryInfo info = it->GetMemoryInfo(); // Determine the range to map. - KProcessAddress map_address = std::max(info.GetAddress(), start_address); - const KProcessAddress map_end_address = std::min(info.GetEndAddress(), end_address); + KProcessAddress map_address = std::max(info.GetAddress(), start_address); + const KProcessAddress map_end_address = + std::min(info.GetEndAddress(), end_address); ASSERT(map_end_address != map_address); // Determine if we should disable head merge. const bool disable_head_merge = - info.GetAddress() >= start_address && + info.GetAddress() >= GetInteger(start_address) && True(info.GetDisableMergeAttribute() & KMemoryBlockDisableMergeAttribute::Normal); const KPageProperties map_properties = { info.GetPermission(), false, false, @@ -2214,7 +2233,7 @@ Result KPageTable::MapPages(KProcessAddress* out_addr, size_t num_pages, size_t KProcessAddress addr = this->FindFreeArea(region_start, region_num_pages, num_pages, alignment, 0, this->GetNumGuardPages()); R_UNLESS(addr != 0, ResultOutOfMemory); - ASSERT(Common::IsAligned(addr, alignment)); + ASSERT(Common::IsAligned(GetInteger(addr), alignment)); ASSERT(this->CanContain(addr, num_pages * PageSize, state)); ASSERT(this->CheckMemoryState(addr, num_pages * PageSize, KMemoryState::All, KMemoryState::Free, KMemoryPermission::None, KMemoryPermission::None, @@ -2455,7 +2474,7 @@ Result KPageTable::UnmapPageGroup(KProcessAddress address, const KPageGroup& pg, R_SUCCEED(); } -Result KPageTable::MakeAndOpenPageGroup(KPageGroup* out, VAddr address, size_t num_pages, +Result KPageTable::MakeAndOpenPageGroup(KPageGroup* out, KProcessAddress address, size_t num_pages, KMemoryState state_mask, KMemoryState state, KMemoryPermission perm_mask, KMemoryPermission perm, KMemoryAttribute attr_mask, KMemoryAttribute attr) { @@ -2480,7 +2499,7 @@ Result KPageTable::MakeAndOpenPageGroup(KPageGroup* out, VAddr address, size_t n R_SUCCEED(); } -Result KPageTable::SetProcessMemoryPermission(VAddr addr, size_t size, +Result KPageTable::SetProcessMemoryPermission(KProcessAddress addr, size_t size, Svc::MemoryPermission svc_perm) { const size_t num_pages = size / PageSize; @@ -2541,23 +2560,23 @@ Result KPageTable::SetProcessMemoryPermission(VAddr addr, size_t size, // Ensure cache coherency, if we're setting pages as executable. if (is_x) { - m_system.InvalidateCpuInstructionCacheRange(addr, size); + m_system.InvalidateCpuInstructionCacheRange(GetInteger(addr), size); } R_SUCCEED(); } -KMemoryInfo KPageTable::QueryInfoImpl(VAddr addr) { +KMemoryInfo KPageTable::QueryInfoImpl(KProcessAddress addr) { KScopedLightLock lk(m_general_lock); return m_memory_block_manager.FindBlock(addr)->GetMemoryInfo(); } -KMemoryInfo KPageTable::QueryInfo(VAddr addr) { +KMemoryInfo KPageTable::QueryInfo(KProcessAddress addr) { if (!Contains(addr, 1)) { return { - .m_address = m_address_space_end, - .m_size = 0 - m_address_space_end, + .m_address = GetInteger(m_address_space_end), + .m_size = 0 - GetInteger(m_address_space_end), .m_state = static_cast(Svc::MemoryState::Inaccessible), .m_device_disable_merge_left_count = 0, .m_device_disable_merge_right_count = 0, @@ -2574,7 +2593,8 @@ KMemoryInfo KPageTable::QueryInfo(VAddr addr) { return QueryInfoImpl(addr); } -Result KPageTable::SetMemoryPermission(VAddr addr, size_t size, Svc::MemoryPermission svc_perm) { +Result KPageTable::SetMemoryPermission(KProcessAddress addr, size_t size, + Svc::MemoryPermission svc_perm) { const size_t num_pages = size / PageSize; // Lock the table. @@ -2611,7 +2631,7 @@ Result KPageTable::SetMemoryPermission(VAddr addr, size_t size, Svc::MemoryPermi R_SUCCEED(); } -Result KPageTable::SetMemoryAttribute(VAddr addr, size_t size, u32 mask, u32 attr) { +Result KPageTable::SetMemoryAttribute(KProcessAddress addr, size_t size, u32 mask, u32 attr) { const size_t num_pages = size / PageSize; ASSERT((static_cast(mask) | KMemoryAttribute::SetMask) == KMemoryAttribute::SetMask); @@ -2666,12 +2686,12 @@ Result KPageTable::SetMaxHeapSize(size_t size) { R_SUCCEED(); } -Result KPageTable::SetHeapSize(VAddr* out, size_t size) { +Result KPageTable::SetHeapSize(u64* out, size_t size) { // Lock the physical memory mutex. KScopedLightLock map_phys_mem_lk(m_map_physical_memory_lock); // Try to perform a reduction in heap, instead of an extension. - VAddr cur_address{}; + KProcessAddress cur_address{}; size_t allocation_size{}; { // Lock the table. @@ -2722,11 +2742,11 @@ Result KPageTable::SetHeapSize(VAddr* out, size_t size) { m_current_heap_end = m_heap_region_start + size; // Set the output. - *out = m_heap_region_start; + *out = GetInteger(m_heap_region_start); R_SUCCEED(); } else if (size == GetHeapSize()) { // The size requested is exactly the current size. - *out = m_heap_region_start; + *out = GetInteger(m_heap_region_start); R_SUCCEED(); } else { // We have to allocate memory. Determine how much to allocate and where while the table @@ -2799,14 +2819,14 @@ Result KPageTable::SetHeapSize(VAddr* out, size_t size) { m_current_heap_end = m_heap_region_start + size; // Set the output. - *out = m_heap_region_start; + *out = GetInteger(m_heap_region_start); R_SUCCEED(); } } -Result KPageTable::LockForMapDeviceAddressSpace(bool* out_is_io, VAddr address, size_t size, - KMemoryPermission perm, bool is_aligned, - bool check_heap) { +Result KPageTable::LockForMapDeviceAddressSpace(bool* out_is_io, KProcessAddress address, + size_t size, KMemoryPermission perm, + bool is_aligned, bool check_heap) { // Lightly validate the range before doing anything else. const size_t num_pages = size / PageSize; R_UNLESS(this->Contains(address, size), ResultInvalidCurrentMemory); @@ -2842,7 +2862,8 @@ Result KPageTable::LockForMapDeviceAddressSpace(bool* out_is_io, VAddr address, R_SUCCEED(); } -Result KPageTable::LockForUnmapDeviceAddressSpace(VAddr address, size_t size, bool check_heap) { +Result KPageTable::LockForUnmapDeviceAddressSpace(KProcessAddress address, size_t size, + bool check_heap) { // Lightly validate the range before doing anything else. const size_t num_pages = size / PageSize; R_UNLESS(this->Contains(address, size), ResultInvalidCurrentMemory); @@ -2876,7 +2897,7 @@ Result KPageTable::LockForUnmapDeviceAddressSpace(VAddr address, size_t size, bo R_SUCCEED(); } -Result KPageTable::UnlockForDeviceAddressSpace(VAddr address, size_t size) { +Result KPageTable::UnlockForDeviceAddressSpace(KProcessAddress address, size_t size) { // Lightly validate the range before doing anything else. const size_t num_pages = size / PageSize; R_UNLESS(this->Contains(address, size), ResultInvalidCurrentMemory); @@ -2904,7 +2925,8 @@ Result KPageTable::UnlockForDeviceAddressSpace(VAddr address, size_t size) { R_SUCCEED(); } -Result KPageTable::LockForIpcUserBuffer(PAddr* out, VAddr address, size_t size) { +Result KPageTable::LockForIpcUserBuffer(KPhysicalAddress* out, KProcessAddress address, + size_t size) { R_RETURN(this->LockMemoryAndOpen( nullptr, out, address, size, KMemoryState::FlagCanIpcUserBuffer, KMemoryState::FlagCanIpcUserBuffer, KMemoryPermission::All, @@ -2913,7 +2935,7 @@ Result KPageTable::LockForIpcUserBuffer(PAddr* out, VAddr address, size_t size) KMemoryAttribute::Locked)); } -Result KPageTable::UnlockForIpcUserBuffer(VAddr address, size_t size) { +Result KPageTable::UnlockForIpcUserBuffer(KProcessAddress address, size_t size) { R_RETURN(this->UnlockMemory(address, size, KMemoryState::FlagCanIpcUserBuffer, KMemoryState::FlagCanIpcUserBuffer, KMemoryPermission::None, KMemoryPermission::None, KMemoryAttribute::All, @@ -2921,7 +2943,7 @@ Result KPageTable::UnlockForIpcUserBuffer(VAddr address, size_t size) { KMemoryAttribute::Locked, nullptr)); } -Result KPageTable::LockForCodeMemory(KPageGroup* out, VAddr addr, size_t size) { +Result KPageTable::LockForCodeMemory(KPageGroup* out, KProcessAddress addr, size_t size) { R_RETURN(this->LockMemoryAndOpen( out, nullptr, addr, size, KMemoryState::FlagCanCodeMemory, KMemoryState::FlagCanCodeMemory, KMemoryPermission::All, KMemoryPermission::UserReadWrite, KMemoryAttribute::All, @@ -2929,17 +2951,17 @@ Result KPageTable::LockForCodeMemory(KPageGroup* out, VAddr addr, size_t size) { KMemoryAttribute::Locked)); } -Result KPageTable::UnlockForCodeMemory(VAddr addr, size_t size, const KPageGroup& pg) { +Result KPageTable::UnlockForCodeMemory(KProcessAddress addr, size_t size, const KPageGroup& pg) { R_RETURN(this->UnlockMemory( addr, size, KMemoryState::FlagCanCodeMemory, KMemoryState::FlagCanCodeMemory, KMemoryPermission::None, KMemoryPermission::None, KMemoryAttribute::All, KMemoryAttribute::Locked, KMemoryPermission::UserReadWrite, KMemoryAttribute::Locked, &pg)); } -bool KPageTable::IsRegionContiguous(VAddr addr, u64 size) const { - auto start_ptr = m_system.DeviceMemory().GetPointer(addr); +bool KPageTable::IsRegionContiguous(KProcessAddress addr, u64 size) const { + auto start_ptr = m_system.DeviceMemory().GetPointer(GetInteger(addr)); for (u64 offset{}; offset < size; offset += PageSize) { - if (start_ptr != m_system.DeviceMemory().GetPointer(addr + offset)) { + if (start_ptr != m_system.DeviceMemory().GetPointer(GetInteger(addr) + offset)) { return false; } start_ptr += PageSize; @@ -2947,18 +2969,19 @@ bool KPageTable::IsRegionContiguous(VAddr addr, u64 size) const { return true; } -void KPageTable::AddRegionToPages(VAddr start, size_t num_pages, KPageGroup& page_linked_list) { - VAddr addr{start}; +void KPageTable::AddRegionToPages(KProcessAddress start, size_t num_pages, + KPageGroup& page_linked_list) { + KProcessAddress addr{start}; while (addr < start + (num_pages * PageSize)) { - const PAddr paddr{GetPhysicalAddr(addr)}; + const KPhysicalAddress paddr{GetPhysicalAddr(addr)}; ASSERT(paddr != 0); page_linked_list.AddBlock(paddr, 1); addr += PageSize; } } -VAddr KPageTable::AllocateVirtualMemory(VAddr start, size_t region_num_pages, u64 needed_num_pages, - size_t align) { +KProcessAddress KPageTable::AllocateVirtualMemory(KProcessAddress start, size_t region_num_pages, + u64 needed_num_pages, size_t align) { if (m_enable_aslr) { UNIMPLEMENTED(); } @@ -2966,11 +2989,11 @@ VAddr KPageTable::AllocateVirtualMemory(VAddr start, size_t region_num_pages, u6 IsKernel() ? 1 : 4); } -Result KPageTable::Operate(VAddr addr, size_t num_pages, const KPageGroup& page_group, +Result KPageTable::Operate(KProcessAddress addr, size_t num_pages, const KPageGroup& page_group, OperationType operation) { ASSERT(this->IsLockedByCurrentThread()); - ASSERT(Common::IsAligned(addr, PageSize)); + ASSERT(Common::IsAligned(GetInteger(addr), PageSize)); ASSERT(num_pages > 0); ASSERT(num_pages == page_group.GetNumPages()); @@ -3001,12 +3024,12 @@ Result KPageTable::Operate(VAddr addr, size_t num_pages, const KPageGroup& page_ R_SUCCEED(); } -Result KPageTable::Operate(VAddr addr, size_t num_pages, KMemoryPermission perm, - OperationType operation, PAddr map_addr) { +Result KPageTable::Operate(KProcessAddress addr, size_t num_pages, KMemoryPermission perm, + OperationType operation, KPhysicalAddress map_addr) { ASSERT(this->IsLockedByCurrentThread()); ASSERT(num_pages > 0); - ASSERT(Common::IsAligned(addr, PageSize)); + ASSERT(Common::IsAligned(GetInteger(addr), PageSize)); ASSERT(ContainsPages(addr, num_pages)); switch (operation) { @@ -3022,7 +3045,7 @@ Result KPageTable::Operate(VAddr addr, size_t num_pages, KMemoryPermission perm, case OperationType::MapFirst: case OperationType::Map: { ASSERT(map_addr); - ASSERT(Common::IsAligned(map_addr, PageSize)); + ASSERT(Common::IsAligned(GetInteger(map_addr), PageSize)); m_system.Memory().MapMemoryRegion(*m_page_table_impl, addr, num_pages * PageSize, map_addr); // Open references to pages, if we should. @@ -3060,7 +3083,7 @@ void KPageTable::FinalizeUpdate(PageLinkedList* page_list) { } } -VAddr KPageTable::GetRegionAddress(KMemoryState state) const { +KProcessAddress KPageTable::GetRegionAddress(KMemoryState state) const { switch (state) { case KMemoryState::Free: case KMemoryState::Kernel: @@ -3132,11 +3155,11 @@ size_t KPageTable::GetRegionSize(KMemoryState state) const { } } -bool KPageTable::CanContain(VAddr addr, size_t size, KMemoryState state) const { - const VAddr end = addr + size; - const VAddr last = end - 1; +bool KPageTable::CanContain(KProcessAddress addr, size_t size, KMemoryState state) const { + const KProcessAddress end = addr + size; + const KProcessAddress last = end - 1; - const VAddr region_start = this->GetRegionAddress(state); + const KProcessAddress region_start = this->GetRegionAddress(state); const size_t region_size = this->GetRegionSize(state); const bool is_in_region = @@ -3191,21 +3214,21 @@ Result KPageTable::CheckMemoryState(const KMemoryInfo& info, KMemoryState state_ R_SUCCEED(); } -Result KPageTable::CheckMemoryStateContiguous(size_t* out_blocks_needed, VAddr addr, size_t size, - KMemoryState state_mask, KMemoryState state, - KMemoryPermission perm_mask, KMemoryPermission perm, - KMemoryAttribute attr_mask, +Result KPageTable::CheckMemoryStateContiguous(size_t* out_blocks_needed, KProcessAddress addr, + size_t size, KMemoryState state_mask, + KMemoryState state, KMemoryPermission perm_mask, + KMemoryPermission perm, KMemoryAttribute attr_mask, KMemoryAttribute attr) const { ASSERT(this->IsLockedByCurrentThread()); // Get information about the first block. - const VAddr last_addr = addr + size - 1; + const KProcessAddress last_addr = addr + size - 1; KMemoryBlockManager::const_iterator it = m_memory_block_manager.FindIterator(addr); KMemoryInfo info = it->GetMemoryInfo(); // If the start address isn't aligned, we need a block. const size_t blocks_for_start_align = - (Common::AlignDown(addr, PageSize) != info.GetAddress()) ? 1 : 0; + (Common::AlignDown(GetInteger(addr), PageSize) != info.GetAddress()) ? 1 : 0; while (true) { // Validate against the provided masks. @@ -3224,7 +3247,7 @@ Result KPageTable::CheckMemoryStateContiguous(size_t* out_blocks_needed, VAddr a // If the end address isn't aligned, we need a block. const size_t blocks_for_end_align = - (Common::AlignUp(addr + size, PageSize) != info.GetEndAddress()) ? 1 : 0; + (Common::AlignUp(GetInteger(addr) + size, PageSize) != info.GetEndAddress()) ? 1 : 0; if (out_blocks_needed != nullptr) { *out_blocks_needed = blocks_for_start_align + blocks_for_end_align; @@ -3235,20 +3258,20 @@ Result KPageTable::CheckMemoryStateContiguous(size_t* out_blocks_needed, VAddr a Result KPageTable::CheckMemoryState(KMemoryState* out_state, KMemoryPermission* out_perm, KMemoryAttribute* out_attr, size_t* out_blocks_needed, - VAddr addr, size_t size, KMemoryState state_mask, + KProcessAddress addr, size_t size, KMemoryState state_mask, KMemoryState state, KMemoryPermission perm_mask, KMemoryPermission perm, KMemoryAttribute attr_mask, KMemoryAttribute attr, KMemoryAttribute ignore_attr) const { ASSERT(this->IsLockedByCurrentThread()); // Get information about the first block. - const VAddr last_addr = addr + size - 1; + const KProcessAddress last_addr = addr + size - 1; KMemoryBlockManager::const_iterator it = m_memory_block_manager.FindIterator(addr); KMemoryInfo info = it->GetMemoryInfo(); // If the start address isn't aligned, we need a block. const size_t blocks_for_start_align = - (Common::AlignDown(addr, PageSize) != info.GetAddress()) ? 1 : 0; + (Common::AlignDown(GetInteger(addr), PageSize) != info.GetAddress()) ? 1 : 0; // Validate all blocks in the range have correct state. const KMemoryState first_state = info.m_state; @@ -3277,7 +3300,7 @@ Result KPageTable::CheckMemoryState(KMemoryState* out_state, KMemoryPermission* // If the end address isn't aligned, we need a block. const size_t blocks_for_end_align = - (Common::AlignUp(addr + size, PageSize) != info.GetEndAddress()) ? 1 : 0; + (Common::AlignUp(GetInteger(addr) + size, PageSize) != info.GetEndAddress()) ? 1 : 0; // Write output state. if (out_state != nullptr) { @@ -3295,11 +3318,12 @@ Result KPageTable::CheckMemoryState(KMemoryState* out_state, KMemoryPermission* R_SUCCEED(); } -Result KPageTable::LockMemoryAndOpen(KPageGroup* out_pg, PAddr* out_paddr, VAddr addr, size_t size, - KMemoryState state_mask, KMemoryState state, - KMemoryPermission perm_mask, KMemoryPermission perm, - KMemoryAttribute attr_mask, KMemoryAttribute attr, - KMemoryPermission new_perm, KMemoryAttribute lock_attr) { +Result KPageTable::LockMemoryAndOpen(KPageGroup* out_pg, KPhysicalAddress* out_KPhysicalAddress, + KProcessAddress addr, size_t size, KMemoryState state_mask, + KMemoryState state, KMemoryPermission perm_mask, + KMemoryPermission perm, KMemoryAttribute attr_mask, + KMemoryAttribute attr, KMemoryPermission new_perm, + KMemoryAttribute lock_attr) { // Validate basic preconditions. ASSERT((lock_attr & attr) == KMemoryAttribute::None); ASSERT((lock_attr & (KMemoryAttribute::IpcLocked | KMemoryAttribute::DeviceShared)) == @@ -3329,8 +3353,8 @@ Result KPageTable::LockMemoryAndOpen(KPageGroup* out_pg, PAddr* out_paddr, VAddr attr_mask, attr)); // Get the physical address, if we're supposed to. - if (out_paddr != nullptr) { - ASSERT(this->GetPhysicalAddressLocked(out_paddr, addr)); + if (out_KPhysicalAddress != nullptr) { + ASSERT(this->GetPhysicalAddressLocked(out_KPhysicalAddress, addr)); } // Make the page group, if we're supposed to. @@ -3361,7 +3385,7 @@ Result KPageTable::LockMemoryAndOpen(KPageGroup* out_pg, PAddr* out_paddr, VAddr R_SUCCEED(); } -Result KPageTable::UnlockMemory(VAddr addr, size_t size, KMemoryState state_mask, +Result KPageTable::UnlockMemory(KProcessAddress addr, size_t size, KMemoryState state_mask, KMemoryState state, KMemoryPermission perm_mask, KMemoryPermission perm, KMemoryAttribute attr_mask, KMemoryAttribute attr, KMemoryPermission new_perm, diff --git a/src/core/hle/kernel/k_page_table.h b/src/core/hle/kernel/k_page_table.h index 5c5356338..1917b2a98 100644 --- a/src/core/hle/kernel/k_page_table.h +++ b/src/core/hle/kernel/k_page_table.h @@ -6,7 +6,6 @@ #include #include "common/common_funcs.h" -#include "common/common_types.h" #include "common/page_table.h" #include "core/file_sys/program_metadata.h" #include "core/hle/kernel/k_dynamic_resource_manager.h" @@ -15,6 +14,7 @@ #include "core/hle/kernel/k_memory_block_manager.h" #include "core/hle/kernel/k_memory_layout.h" #include "core/hle/kernel/k_memory_manager.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/result.h" #include "core/memory.h" @@ -65,45 +65,47 @@ public: Result InitializeForProcess(FileSys::ProgramAddressSpaceType as_type, bool enable_aslr, bool enable_das_merge, bool from_back, KMemoryManager::Pool pool, - VAddr code_addr, size_t code_size, KSystemResource* system_resource, - KResourceLimit* resource_limit); + KProcessAddress code_addr, size_t code_size, + KSystemResource* system_resource, KResourceLimit* resource_limit); void Finalize(); - Result MapProcessCode(VAddr addr, size_t pages_count, KMemoryState state, + Result MapProcessCode(KProcessAddress addr, size_t pages_count, KMemoryState state, KMemoryPermission perm); - Result MapCodeMemory(VAddr dst_address, VAddr src_address, size_t size); - Result UnmapCodeMemory(VAddr dst_address, VAddr src_address, size_t size, + Result MapCodeMemory(KProcessAddress dst_address, KProcessAddress src_address, size_t size); + Result UnmapCodeMemory(KProcessAddress dst_address, KProcessAddress src_address, size_t size, ICacheInvalidationStrategy icache_invalidation_strategy); - Result UnmapProcessMemory(VAddr dst_addr, size_t size, KPageTable& src_page_table, - VAddr src_addr); - Result MapPhysicalMemory(VAddr addr, size_t size); - Result UnmapPhysicalMemory(VAddr addr, size_t size); - Result MapMemory(VAddr dst_addr, VAddr src_addr, size_t size); - Result UnmapMemory(VAddr dst_addr, VAddr src_addr, size_t size); - Result SetProcessMemoryPermission(VAddr addr, size_t size, Svc::MemoryPermission svc_perm); - KMemoryInfo QueryInfo(VAddr addr); - Result SetMemoryPermission(VAddr addr, size_t size, Svc::MemoryPermission perm); - Result SetMemoryAttribute(VAddr addr, size_t size, u32 mask, u32 attr); + Result UnmapProcessMemory(KProcessAddress dst_addr, size_t size, KPageTable& src_page_table, + KProcessAddress src_addr); + Result MapPhysicalMemory(KProcessAddress addr, size_t size); + Result UnmapPhysicalMemory(KProcessAddress addr, size_t size); + Result MapMemory(KProcessAddress dst_addr, KProcessAddress src_addr, size_t size); + Result UnmapMemory(KProcessAddress dst_addr, KProcessAddress src_addr, size_t size); + Result SetProcessMemoryPermission(KProcessAddress addr, size_t size, + Svc::MemoryPermission svc_perm); + KMemoryInfo QueryInfo(KProcessAddress addr); + Result SetMemoryPermission(KProcessAddress addr, size_t size, Svc::MemoryPermission perm); + Result SetMemoryAttribute(KProcessAddress addr, size_t size, u32 mask, u32 attr); Result SetMaxHeapSize(size_t size); - Result SetHeapSize(VAddr* out, size_t size); - Result LockForMapDeviceAddressSpace(bool* out_is_io, VAddr address, size_t size, + Result SetHeapSize(u64* out, size_t size); + Result LockForMapDeviceAddressSpace(bool* out_is_io, KProcessAddress address, size_t size, KMemoryPermission perm, bool is_aligned, bool check_heap); - Result LockForUnmapDeviceAddressSpace(VAddr address, size_t size, bool check_heap); + Result LockForUnmapDeviceAddressSpace(KProcessAddress address, size_t size, bool check_heap); - Result UnlockForDeviceAddressSpace(VAddr addr, size_t size); + Result UnlockForDeviceAddressSpace(KProcessAddress addr, size_t size); - Result LockForIpcUserBuffer(PAddr* out, VAddr address, size_t size); - Result UnlockForIpcUserBuffer(VAddr address, size_t size); + Result LockForIpcUserBuffer(KPhysicalAddress* out, KProcessAddress address, size_t size); + Result UnlockForIpcUserBuffer(KProcessAddress address, size_t size); - Result SetupForIpc(VAddr* out_dst_addr, size_t size, VAddr src_addr, KPageTable& src_page_table, - KMemoryPermission test_perm, KMemoryState dst_state, bool send); - Result CleanupForIpcServer(VAddr address, size_t size, KMemoryState dst_state); - Result CleanupForIpcClient(VAddr address, size_t size, KMemoryState dst_state); + Result SetupForIpc(KProcessAddress* out_dst_addr, size_t size, KProcessAddress src_addr, + KPageTable& src_page_table, KMemoryPermission test_perm, + KMemoryState dst_state, bool send); + Result CleanupForIpcServer(KProcessAddress address, size_t size, KMemoryState dst_state); + Result CleanupForIpcClient(KProcessAddress address, size_t size, KMemoryState dst_state); - Result LockForCodeMemory(KPageGroup* out, VAddr addr, size_t size); - Result UnlockForCodeMemory(VAddr addr, size_t size, const KPageGroup& pg); - Result MakeAndOpenPageGroup(KPageGroup* out, VAddr address, size_t num_pages, + Result LockForCodeMemory(KPageGroup* out, KProcessAddress addr, size_t size); + Result UnlockForCodeMemory(KProcessAddress addr, size_t size, const KPageGroup& pg); + Result MakeAndOpenPageGroup(KPageGroup* out, KProcessAddress address, size_t num_pages, KMemoryState state_mask, KMemoryState state, KMemoryPermission perm_mask, KMemoryPermission perm, KMemoryAttribute attr_mask, KMemoryAttribute attr); @@ -120,7 +122,7 @@ public: return m_block_info_manager; } - bool CanContain(VAddr addr, size_t size, KMemoryState state) const; + bool CanContain(KProcessAddress addr, size_t size, KMemoryState state) const; Result MapPages(KProcessAddress* out_addr, size_t num_pages, size_t alignment, KPhysicalAddress phys_addr, KProcessAddress region_start, @@ -173,8 +175,8 @@ protected: m_root = n; } - void Push(Core::Memory::Memory& memory, VAddr addr) { - this->Push(memory.GetPointer(addr)); + void Push(Core::Memory::Memory& memory, KVirtualAddress addr) { + this->Push(memory.GetPointer(GetInteger(addr))); } Node* Peek() const { @@ -212,27 +214,28 @@ private: Result MapPages(KProcessAddress* out_addr, size_t num_pages, size_t alignment, KPhysicalAddress phys_addr, bool is_pa_valid, KProcessAddress region_start, size_t region_num_pages, KMemoryState state, KMemoryPermission perm); - bool IsRegionContiguous(VAddr addr, u64 size) const; - void AddRegionToPages(VAddr start, size_t num_pages, KPageGroup& page_linked_list); - KMemoryInfo QueryInfoImpl(VAddr addr); - VAddr AllocateVirtualMemory(VAddr start, size_t region_num_pages, u64 needed_num_pages, - size_t align); - Result Operate(VAddr addr, size_t num_pages, const KPageGroup& page_group, + bool IsRegionContiguous(KProcessAddress addr, u64 size) const; + void AddRegionToPages(KProcessAddress start, size_t num_pages, KPageGroup& page_linked_list); + KMemoryInfo QueryInfoImpl(KProcessAddress addr); + KProcessAddress AllocateVirtualMemory(KProcessAddress start, size_t region_num_pages, + u64 needed_num_pages, size_t align); + Result Operate(KProcessAddress addr, size_t num_pages, const KPageGroup& page_group, OperationType operation); - Result Operate(VAddr addr, size_t num_pages, KMemoryPermission perm, OperationType operation, - PAddr map_addr = 0); + Result Operate(KProcessAddress addr, size_t num_pages, KMemoryPermission perm, + OperationType operation, KPhysicalAddress map_addr = 0); void FinalizeUpdate(PageLinkedList* page_list); - VAddr GetRegionAddress(KMemoryState state) const; + KProcessAddress GetRegionAddress(KMemoryState state) const; size_t GetRegionSize(KMemoryState state) const; - VAddr FindFreeArea(VAddr region_start, size_t region_num_pages, size_t num_pages, - size_t alignment, size_t offset, size_t guard_pages); + KProcessAddress FindFreeArea(KProcessAddress region_start, size_t region_num_pages, + size_t num_pages, size_t alignment, size_t offset, + size_t guard_pages); - Result CheckMemoryStateContiguous(size_t* out_blocks_needed, VAddr addr, size_t size, + Result CheckMemoryStateContiguous(size_t* out_blocks_needed, KProcessAddress addr, size_t size, KMemoryState state_mask, KMemoryState state, KMemoryPermission perm_mask, KMemoryPermission perm, KMemoryAttribute attr_mask, KMemoryAttribute attr) const; - Result CheckMemoryStateContiguous(VAddr addr, size_t size, KMemoryState state_mask, + Result CheckMemoryStateContiguous(KProcessAddress addr, size_t size, KMemoryState state_mask, KMemoryState state, KMemoryPermission perm_mask, KMemoryPermission perm, KMemoryAttribute attr_mask, KMemoryAttribute attr) const { @@ -244,12 +247,12 @@ private: KMemoryPermission perm_mask, KMemoryPermission perm, KMemoryAttribute attr_mask, KMemoryAttribute attr) const; Result CheckMemoryState(KMemoryState* out_state, KMemoryPermission* out_perm, - KMemoryAttribute* out_attr, size_t* out_blocks_needed, VAddr addr, - size_t size, KMemoryState state_mask, KMemoryState state, - KMemoryPermission perm_mask, KMemoryPermission perm, + KMemoryAttribute* out_attr, size_t* out_blocks_needed, + KProcessAddress addr, size_t size, KMemoryState state_mask, + KMemoryState state, KMemoryPermission perm_mask, KMemoryPermission perm, KMemoryAttribute attr_mask, KMemoryAttribute attr, KMemoryAttribute ignore_attr = DefaultMemoryIgnoreAttr) const; - Result CheckMemoryState(size_t* out_blocks_needed, VAddr addr, size_t size, + Result CheckMemoryState(size_t* out_blocks_needed, KProcessAddress addr, size_t size, KMemoryState state_mask, KMemoryState state, KMemoryPermission perm_mask, KMemoryPermission perm, KMemoryAttribute attr_mask, KMemoryAttribute attr, @@ -258,39 +261,40 @@ private: state_mask, state, perm_mask, perm, attr_mask, attr, ignore_attr)); } - Result CheckMemoryState(VAddr addr, size_t size, KMemoryState state_mask, KMemoryState state, - KMemoryPermission perm_mask, KMemoryPermission perm, + Result CheckMemoryState(KProcessAddress addr, size_t size, KMemoryState state_mask, + KMemoryState state, KMemoryPermission perm_mask, KMemoryPermission perm, KMemoryAttribute attr_mask, KMemoryAttribute attr, KMemoryAttribute ignore_attr = DefaultMemoryIgnoreAttr) const { R_RETURN(this->CheckMemoryState(nullptr, addr, size, state_mask, state, perm_mask, perm, attr_mask, attr, ignore_attr)); } - Result LockMemoryAndOpen(KPageGroup* out_pg, PAddr* out_paddr, VAddr addr, size_t size, - KMemoryState state_mask, KMemoryState state, - KMemoryPermission perm_mask, KMemoryPermission perm, - KMemoryAttribute attr_mask, KMemoryAttribute attr, - KMemoryPermission new_perm, KMemoryAttribute lock_attr); - Result UnlockMemory(VAddr addr, size_t size, KMemoryState state_mask, KMemoryState state, - KMemoryPermission perm_mask, KMemoryPermission perm, + Result LockMemoryAndOpen(KPageGroup* out_pg, KPhysicalAddress* out_KPhysicalAddress, + KProcessAddress addr, size_t size, KMemoryState state_mask, + KMemoryState state, KMemoryPermission perm_mask, + KMemoryPermission perm, KMemoryAttribute attr_mask, + KMemoryAttribute attr, KMemoryPermission new_perm, + KMemoryAttribute lock_attr); + Result UnlockMemory(KProcessAddress addr, size_t size, KMemoryState state_mask, + KMemoryState state, KMemoryPermission perm_mask, KMemoryPermission perm, KMemoryAttribute attr_mask, KMemoryAttribute attr, KMemoryPermission new_perm, KMemoryAttribute lock_attr, const KPageGroup* pg); - Result MakePageGroup(KPageGroup& pg, VAddr addr, size_t num_pages); - bool IsValidPageGroup(const KPageGroup& pg, VAddr addr, size_t num_pages); + Result MakePageGroup(KPageGroup& pg, KProcessAddress addr, size_t num_pages); + bool IsValidPageGroup(const KPageGroup& pg, KProcessAddress addr, size_t num_pages); bool IsLockedByCurrentThread() const { return m_general_lock.IsLockedByCurrentThread(); } - bool IsHeapPhysicalAddress(const KMemoryLayout& layout, PAddr phys_addr) { + bool IsHeapPhysicalAddress(const KMemoryLayout& layout, KPhysicalAddress phys_addr) { ASSERT(this->IsLockedByCurrentThread()); return layout.IsHeapPhysicalAddress(m_cached_physical_heap_region, phys_addr); } - bool GetPhysicalAddressLocked(PAddr* out, VAddr virt_addr) const { + bool GetPhysicalAddressLocked(KPhysicalAddress* out, KProcessAddress virt_addr) const { ASSERT(this->IsLockedByCurrentThread()); *out = GetPhysicalAddr(virt_addr); @@ -298,12 +302,13 @@ private: return *out != 0; } - Result SetupForIpcClient(PageLinkedList* page_list, size_t* out_blocks_needed, VAddr address, - size_t size, KMemoryPermission test_perm, KMemoryState dst_state); - Result SetupForIpcServer(VAddr* out_addr, size_t size, VAddr src_addr, + Result SetupForIpcClient(PageLinkedList* page_list, size_t* out_blocks_needed, + KProcessAddress address, size_t size, KMemoryPermission test_perm, + KMemoryState dst_state); + Result SetupForIpcServer(KProcessAddress* out_addr, size_t size, KProcessAddress src_addr, KMemoryPermission test_perm, KMemoryState dst_state, KPageTable& src_page_table, bool send); - void CleanupForIpcClientOnServerSetupFailure(PageLinkedList* page_list, VAddr address, + void CleanupForIpcClientOnServerSetupFailure(PageLinkedList* page_list, KProcessAddress address, size_t size, KMemoryPermission prot_perm); Result AllocateAndMapPagesImpl(PageLinkedList* page_list, KProcessAddress address, @@ -315,61 +320,61 @@ private: mutable KLightLock m_map_physical_memory_lock; public: - constexpr VAddr GetAddressSpaceStart() const { + constexpr KProcessAddress GetAddressSpaceStart() const { return m_address_space_start; } - constexpr VAddr GetAddressSpaceEnd() const { + constexpr KProcessAddress GetAddressSpaceEnd() const { return m_address_space_end; } constexpr size_t GetAddressSpaceSize() const { return m_address_space_end - m_address_space_start; } - constexpr VAddr GetHeapRegionStart() const { + constexpr KProcessAddress GetHeapRegionStart() const { return m_heap_region_start; } - constexpr VAddr GetHeapRegionEnd() const { + constexpr KProcessAddress GetHeapRegionEnd() const { return m_heap_region_end; } constexpr size_t GetHeapRegionSize() const { return m_heap_region_end - m_heap_region_start; } - constexpr VAddr GetAliasRegionStart() const { + constexpr KProcessAddress GetAliasRegionStart() const { return m_alias_region_start; } - constexpr VAddr GetAliasRegionEnd() const { + constexpr KProcessAddress GetAliasRegionEnd() const { return m_alias_region_end; } constexpr size_t GetAliasRegionSize() const { return m_alias_region_end - m_alias_region_start; } - constexpr VAddr GetStackRegionStart() const { + constexpr KProcessAddress GetStackRegionStart() const { return m_stack_region_start; } - constexpr VAddr GetStackRegionEnd() const { + constexpr KProcessAddress GetStackRegionEnd() const { return m_stack_region_end; } constexpr size_t GetStackRegionSize() const { return m_stack_region_end - m_stack_region_start; } - constexpr VAddr GetKernelMapRegionStart() const { + constexpr KProcessAddress GetKernelMapRegionStart() const { return m_kernel_map_region_start; } - constexpr VAddr GetKernelMapRegionEnd() const { + constexpr KProcessAddress GetKernelMapRegionEnd() const { return m_kernel_map_region_end; } - constexpr VAddr GetCodeRegionStart() const { + constexpr KProcessAddress GetCodeRegionStart() const { return m_code_region_start; } - constexpr VAddr GetCodeRegionEnd() const { + constexpr KProcessAddress GetCodeRegionEnd() const { return m_code_region_end; } - constexpr VAddr GetAliasCodeRegionStart() const { + constexpr KProcessAddress GetAliasCodeRegionStart() const { return m_alias_code_region_start; } - constexpr VAddr GetAliasCodeRegionEnd() const { + constexpr KProcessAddress GetAliasCodeRegionEnd() const { return m_alias_code_region_end; } - constexpr VAddr GetAliasCodeRegionSize() const { + constexpr size_t GetAliasCodeRegionSize() const { return m_alias_code_region_end - m_alias_code_region_start; } size_t GetNormalMemorySize() { @@ -382,25 +387,25 @@ public: constexpr size_t GetHeapSize() const { return m_current_heap_end - m_heap_region_start; } - constexpr bool IsInsideAddressSpace(VAddr address, size_t size) const { + constexpr bool IsInsideAddressSpace(KProcessAddress address, size_t size) const { return m_address_space_start <= address && address + size - 1 <= m_address_space_end - 1; } - constexpr bool IsOutsideAliasRegion(VAddr address, size_t size) const { + constexpr bool IsOutsideAliasRegion(KProcessAddress address, size_t size) const { return m_alias_region_start > address || address + size - 1 > m_alias_region_end - 1; } - constexpr bool IsOutsideStackRegion(VAddr address, size_t size) const { + constexpr bool IsOutsideStackRegion(KProcessAddress address, size_t size) const { return m_stack_region_start > address || address + size - 1 > m_stack_region_end - 1; } - constexpr bool IsInvalidRegion(VAddr address, size_t size) const { + constexpr bool IsInvalidRegion(KProcessAddress address, size_t size) const { return address + size - 1 > GetAliasCodeRegionStart() + GetAliasCodeRegionSize() - 1; } - constexpr bool IsInsideHeapRegion(VAddr address, size_t size) const { + constexpr bool IsInsideHeapRegion(KProcessAddress address, size_t size) const { return address + size > m_heap_region_start && m_heap_region_end > address; } - constexpr bool IsInsideAliasRegion(VAddr address, size_t size) const { + constexpr bool IsInsideAliasRegion(KProcessAddress address, size_t size) const { return address + size > m_alias_region_start && m_alias_region_end > address; } - constexpr bool IsOutsideASLRRegion(VAddr address, size_t size) const { + constexpr bool IsOutsideASLRRegion(KProcessAddress address, size_t size) const { if (IsInvalidRegion(address, size)) { return true; } @@ -412,47 +417,53 @@ public: } return {}; } - constexpr bool IsInsideASLRRegion(VAddr address, size_t size) const { + constexpr bool IsInsideASLRRegion(KProcessAddress address, size_t size) const { return !IsOutsideASLRRegion(address, size); } constexpr size_t GetNumGuardPages() const { return IsKernel() ? 1 : 4; } - PAddr GetPhysicalAddr(VAddr addr) const { + KPhysicalAddress GetPhysicalAddr(KProcessAddress addr) const { const auto backing_addr = m_page_table_impl->backing_addr[addr >> PageBits]; ASSERT(backing_addr); - return backing_addr + addr; + return backing_addr + GetInteger(addr); } - constexpr bool Contains(VAddr addr) const { + constexpr bool Contains(KProcessAddress addr) const { return m_address_space_start <= addr && addr <= m_address_space_end - 1; } - constexpr bool Contains(VAddr addr, size_t size) const { + constexpr bool Contains(KProcessAddress addr, size_t size) const { return m_address_space_start <= addr && addr < addr + size && addr + size - 1 <= m_address_space_end - 1; } public: - static VAddr GetLinearMappedVirtualAddress(const KMemoryLayout& layout, PAddr addr) { + static KVirtualAddress GetLinearMappedVirtualAddress(const KMemoryLayout& layout, + KPhysicalAddress addr) { return layout.GetLinearVirtualAddress(addr); } - static PAddr GetLinearMappedPhysicalAddress(const KMemoryLayout& layout, VAddr addr) { + static KPhysicalAddress GetLinearMappedPhysicalAddress(const KMemoryLayout& layout, + KVirtualAddress addr) { return layout.GetLinearPhysicalAddress(addr); } - static VAddr GetHeapVirtualAddress(const KMemoryLayout& layout, PAddr addr) { + static KVirtualAddress GetHeapVirtualAddress(const KMemoryLayout& layout, + KPhysicalAddress addr) { return GetLinearMappedVirtualAddress(layout, addr); } - static PAddr GetHeapPhysicalAddress(const KMemoryLayout& layout, VAddr addr) { + static KPhysicalAddress GetHeapPhysicalAddress(const KMemoryLayout& layout, + KVirtualAddress addr) { return GetLinearMappedPhysicalAddress(layout, addr); } - static VAddr GetPageTableVirtualAddress(const KMemoryLayout& layout, PAddr addr) { + static KVirtualAddress GetPageTableVirtualAddress(const KMemoryLayout& layout, + KPhysicalAddress addr) { return GetLinearMappedVirtualAddress(layout, addr); } - static PAddr GetPageTablePhysicalAddress(const KMemoryLayout& layout, VAddr addr) { + static KPhysicalAddress GetPageTablePhysicalAddress(const KMemoryLayout& layout, + KVirtualAddress addr) { return GetLinearMappedPhysicalAddress(layout, addr); } @@ -464,7 +475,7 @@ private: return m_enable_aslr; } - constexpr bool ContainsPages(VAddr addr, size_t num_pages) const { + constexpr bool ContainsPages(KProcessAddress addr, size_t num_pages) const { return (m_address_space_start <= addr) && (num_pages <= (m_address_space_end - m_address_space_start) / PageSize) && (addr + num_pages * PageSize - 1 <= m_address_space_end - 1); @@ -489,21 +500,21 @@ private: }; private: - VAddr m_address_space_start{}; - VAddr m_address_space_end{}; - VAddr m_heap_region_start{}; - VAddr m_heap_region_end{}; - VAddr m_current_heap_end{}; - VAddr m_alias_region_start{}; - VAddr m_alias_region_end{}; - VAddr m_stack_region_start{}; - VAddr m_stack_region_end{}; - VAddr m_kernel_map_region_start{}; - VAddr m_kernel_map_region_end{}; - VAddr m_code_region_start{}; - VAddr m_code_region_end{}; - VAddr m_alias_code_region_start{}; - VAddr m_alias_code_region_end{}; + KProcessAddress m_address_space_start{}; + KProcessAddress m_address_space_end{}; + KProcessAddress m_heap_region_start{}; + KProcessAddress m_heap_region_end{}; + KProcessAddress m_current_heap_end{}; + KProcessAddress m_alias_region_start{}; + KProcessAddress m_alias_region_end{}; + KProcessAddress m_stack_region_start{}; + KProcessAddress m_stack_region_end{}; + KProcessAddress m_kernel_map_region_start{}; + KProcessAddress m_kernel_map_region_end{}; + KProcessAddress m_code_region_start{}; + KProcessAddress m_code_region_end{}; + KProcessAddress m_alias_code_region_start{}; + KProcessAddress m_alias_code_region_end{}; size_t m_max_heap_size{}; size_t m_mapped_physical_memory_size{}; diff --git a/src/core/hle/kernel/k_page_table_manager.h b/src/core/hle/kernel/k_page_table_manager.h index 91a45cde3..4b0e034d0 100644 --- a/src/core/hle/kernel/k_page_table_manager.h +++ b/src/core/hle/kernel/k_page_table_manager.h @@ -5,9 +5,9 @@ #include -#include "common/common_types.h" #include "core/hle/kernel/k_dynamic_resource_manager.h" #include "core/hle/kernel/k_page_table_slab_heap.h" +#include "core/hle/kernel/k_typed_address.h" namespace Kernel { @@ -26,23 +26,23 @@ public: BaseHeap::Initialize(page_allocator, pt_heap); } - VAddr Allocate() { - return VAddr(BaseHeap::Allocate()); + KVirtualAddress Allocate() { + return KVirtualAddress(BaseHeap::Allocate()); } - RefCount GetRefCount(VAddr addr) const { + RefCount GetRefCount(KVirtualAddress addr) const { return m_pt_heap->GetRefCount(addr); } - void Open(VAddr addr, int count) { + void Open(KVirtualAddress addr, int count) { return m_pt_heap->Open(addr, count); } - bool Close(VAddr addr, int count) { + bool Close(KVirtualAddress addr, int count) { return m_pt_heap->Close(addr, count); } - bool IsInPageTableHeap(VAddr addr) const { + bool IsInPageTableHeap(KVirtualAddress addr) const { return m_pt_heap->IsInRange(addr); } diff --git a/src/core/hle/kernel/k_page_table_slab_heap.h b/src/core/hle/kernel/k_page_table_slab_heap.h index 9a8d77316..7da0ea669 100644 --- a/src/core/hle/kernel/k_page_table_slab_heap.h +++ b/src/core/hle/kernel/k_page_table_slab_heap.h @@ -6,8 +6,8 @@ #include #include -#include "common/common_types.h" #include "core/hle/kernel/k_dynamic_slab_heap.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/kernel/slab_helpers.h" namespace Kernel { @@ -45,12 +45,12 @@ public: this->Initialize(rc); } - RefCount GetRefCount(VAddr addr) { + RefCount GetRefCount(KVirtualAddress addr) { ASSERT(this->IsInRange(addr)); return *this->GetRefCountPointer(addr); } - void Open(VAddr addr, int count) { + void Open(KVirtualAddress addr, int count) { ASSERT(this->IsInRange(addr)); *this->GetRefCountPointer(addr) += static_cast(count); @@ -58,7 +58,7 @@ public: ASSERT(this->GetRefCount(addr) > 0); } - bool Close(VAddr addr, int count) { + bool Close(KVirtualAddress addr, int count) { ASSERT(this->IsInRange(addr)); ASSERT(this->GetRefCount(addr) >= count); @@ -66,7 +66,7 @@ public: return this->GetRefCount(addr) == 0; } - bool IsInPageTableHeap(VAddr addr) const { + bool IsInPageTableHeap(KVirtualAddress addr) const { return this->IsInRange(addr); } @@ -81,7 +81,7 @@ private: } } - RefCount* GetRefCountPointer(VAddr addr) { + RefCount* GetRefCountPointer(KVirtualAddress addr) { return m_ref_counts.data() + ((addr - this->GetAddress()) / PageSize); } diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp index 9d18f4049..53f8139f3 100644 --- a/src/core/hle/kernel/k_process.cpp +++ b/src/core/hle/kernel/k_process.cpp @@ -36,8 +36,9 @@ namespace { * @param owner_process The parent process for the main thread * @param priority The priority to give the main thread */ -void SetupMainThread(Core::System& system, KProcess& owner_process, u32 priority, VAddr stack_top) { - const VAddr entry_point = owner_process.PageTable().GetCodeRegionStart(); +void SetupMainThread(Core::System& system, KProcess& owner_process, u32 priority, + KProcessAddress stack_top) { + const KProcessAddress entry_point = owner_process.PageTable().GetCodeRegionStart(); ASSERT(owner_process.GetResourceLimit()->Reserve(LimitableResource::ThreadCountMax, 1)); KThread* thread = KThread::Create(system.Kernel()); @@ -219,7 +220,7 @@ void KProcess::UnpinThread(KThread* thread) { KScheduler::SetSchedulerUpdateNeeded(m_kernel); } -Result KProcess::AddSharedMemory(KSharedMemory* shmem, [[maybe_unused]] VAddr address, +Result KProcess::AddSharedMemory(KSharedMemory* shmem, [[maybe_unused]] KProcessAddress address, [[maybe_unused]] size_t size) { // Lock ourselves, to prevent concurrent access. KScopedLightLock lk(m_state_lock); @@ -248,7 +249,7 @@ Result KProcess::AddSharedMemory(KSharedMemory* shmem, [[maybe_unused]] VAddr ad R_SUCCEED(); } -void KProcess::RemoveSharedMemory(KSharedMemory* shmem, [[maybe_unused]] VAddr address, +void KProcess::RemoveSharedMemory(KSharedMemory* shmem, [[maybe_unused]] KProcessAddress address, [[maybe_unused]] size_t size) { // Lock ourselves, to prevent concurrent access. KScopedLightLock lk(m_state_lock); @@ -399,8 +400,8 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std: case FileSys::ProgramAddressSpaceType::Is32BitNoMap: m_memory_usage_capacity = - m_page_table.GetHeapRegionEnd() - m_page_table.GetHeapRegionStart() + - m_page_table.GetAliasRegionEnd() - m_page_table.GetAliasRegionStart(); + (m_page_table.GetHeapRegionEnd() - m_page_table.GetHeapRegionStart()) + + (m_page_table.GetAliasRegionEnd() - m_page_table.GetAliasRegionStart()); break; default: @@ -492,9 +493,9 @@ void KProcess::Finalize() { KSynchronizationObject::Finalize(); } -Result KProcess::CreateThreadLocalRegion(VAddr* out) { +Result KProcess::CreateThreadLocalRegion(KProcessAddress* out) { KThreadLocalPage* tlp = nullptr; - VAddr tlr = 0; + KProcessAddress tlr = 0; // See if we can get a region from a partially used TLP. { @@ -543,7 +544,7 @@ Result KProcess::CreateThreadLocalRegion(VAddr* out) { R_SUCCEED(); } -Result KProcess::DeleteThreadLocalRegion(VAddr addr) { +Result KProcess::DeleteThreadLocalRegion(KProcessAddress addr) { KThreadLocalPage* page_to_free = nullptr; // Release the region. @@ -551,10 +552,10 @@ Result KProcess::DeleteThreadLocalRegion(VAddr addr) { KScopedSchedulerLock sl{m_kernel}; // Try to find the page in the partially used list. - auto it = m_partially_used_tlp_tree.find_key(Common::AlignDown(addr, PageSize)); + auto it = m_partially_used_tlp_tree.find_key(Common::AlignDown(GetInteger(addr), PageSize)); if (it == m_partially_used_tlp_tree.end()) { // If we don't find it, it has to be in the fully used list. - it = m_fully_used_tlp_tree.find_key(Common::AlignDown(addr, PageSize)); + it = m_fully_used_tlp_tree.find_key(Common::AlignDown(GetInteger(addr), PageSize)); R_UNLESS(it != m_fully_used_tlp_tree.end(), ResultInvalidAddress); // Release the region. @@ -591,7 +592,7 @@ Result KProcess::DeleteThreadLocalRegion(VAddr addr) { R_SUCCEED(); } -bool KProcess::InsertWatchpoint(Core::System& system, VAddr addr, u64 size, +bool KProcess::InsertWatchpoint(Core::System& system, KProcessAddress addr, u64 size, DebugWatchpointType type) { const auto watch{std::find_if(m_watchpoints.begin(), m_watchpoints.end(), [&](const auto& wp) { return wp.type == DebugWatchpointType::None; @@ -605,7 +606,8 @@ bool KProcess::InsertWatchpoint(Core::System& system, VAddr addr, u64 size, watch->end_address = addr + size; watch->type = type; - for (VAddr page = Common::AlignDown(addr, PageSize); page < addr + size; page += PageSize) { + for (KProcessAddress page = Common::AlignDown(GetInteger(addr), PageSize); page < addr + size; + page += PageSize) { m_debug_page_refcounts[page]++; system.Memory().MarkRegionDebug(page, PageSize, true); } @@ -613,7 +615,7 @@ bool KProcess::InsertWatchpoint(Core::System& system, VAddr addr, u64 size, return true; } -bool KProcess::RemoveWatchpoint(Core::System& system, VAddr addr, u64 size, +bool KProcess::RemoveWatchpoint(Core::System& system, KProcessAddress addr, u64 size, DebugWatchpointType type) { const auto watch{std::find_if(m_watchpoints.begin(), m_watchpoints.end(), [&](const auto& wp) { return wp.start_address == addr && wp.end_address == addr + size && wp.type == type; @@ -627,7 +629,8 @@ bool KProcess::RemoveWatchpoint(Core::System& system, VAddr addr, u64 size, watch->end_address = 0; watch->type = DebugWatchpointType::None; - for (VAddr page = Common::AlignDown(addr, PageSize); page < addr + size; page += PageSize) { + for (KProcessAddress page = Common::AlignDown(GetInteger(addr), PageSize); page < addr + size; + page += PageSize) { m_debug_page_refcounts[page]--; if (!m_debug_page_refcounts[page]) { system.Memory().MarkRegionDebug(page, PageSize, false); @@ -637,7 +640,7 @@ bool KProcess::RemoveWatchpoint(Core::System& system, VAddr addr, u64 size, return true; } -void KProcess::LoadModule(CodeSet code_set, VAddr base_addr) { +void KProcess::LoadModule(CodeSet code_set, KProcessAddress base_addr) { const auto ReprotectSegment = [&](const CodeSet::Segment& segment, Svc::MemoryPermission permission) { m_page_table.SetProcessMemoryPermission(segment.addr + base_addr, segment.size, permission); diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.h index 7b7a971b8..04b6bbb86 100644 --- a/src/core/hle/kernel/k_process.h +++ b/src/core/hle/kernel/k_process.h @@ -8,7 +8,6 @@ #include #include #include -#include "common/common_types.h" #include "core/hle/kernel/k_address_arbiter.h" #include "core/hle/kernel/k_auto_object.h" #include "core/hle/kernel/k_condition_variable.h" @@ -16,6 +15,7 @@ #include "core/hle/kernel/k_page_table.h" #include "core/hle/kernel/k_synchronization_object.h" #include "core/hle/kernel/k_thread_local_page.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/kernel/k_worker_task.h" #include "core/hle/kernel/process_capability.h" #include "core/hle/kernel/slab_helpers.h" @@ -59,8 +59,8 @@ enum class DebugWatchpointType : u8 { DECLARE_ENUM_FLAG_OPERATORS(DebugWatchpointType); struct DebugWatchpoint { - VAddr start_address; - VAddr end_address; + KProcessAddress start_address; + KProcessAddress end_address; DebugWatchpointType type; }; @@ -135,11 +135,11 @@ public: return m_handle_table; } - Result SignalToAddress(VAddr address) { + Result SignalToAddress(KProcessAddress address) { return m_condition_var.SignalToAddress(address); } - Result WaitForAddress(Handle handle, VAddr address, u32 tag) { + Result WaitForAddress(Handle handle, KProcessAddress address, u32 tag) { return m_condition_var.WaitForAddress(handle, address, tag); } @@ -147,20 +147,21 @@ public: return m_condition_var.Signal(cv_key, count); } - Result WaitConditionVariable(VAddr address, u64 cv_key, u32 tag, s64 ns) { + Result WaitConditionVariable(KProcessAddress address, u64 cv_key, u32 tag, s64 ns) { R_RETURN(m_condition_var.Wait(address, cv_key, tag, ns)); } - Result SignalAddressArbiter(VAddr address, Svc::SignalType signal_type, s32 value, s32 count) { + Result SignalAddressArbiter(uint64_t address, Svc::SignalType signal_type, s32 value, + s32 count) { R_RETURN(m_address_arbiter.SignalToAddress(address, signal_type, value, count)); } - Result WaitAddressArbiter(VAddr address, Svc::ArbitrationType arb_type, s32 value, + Result WaitAddressArbiter(uint64_t address, Svc::ArbitrationType arb_type, s32 value, s64 timeout) { R_RETURN(m_address_arbiter.WaitForAddress(address, arb_type, value, timeout)); } - VAddr GetProcessLocalRegionAddress() const { + KProcessAddress GetProcessLocalRegionAddress() const { return m_plr_address; } @@ -352,7 +353,7 @@ public: */ void PrepareForTermination(); - void LoadModule(CodeSet code_set, VAddr base_addr); + void LoadModule(CodeSet code_set, KProcessAddress base_addr); bool IsInitialized() const override { return m_is_initialized; @@ -380,26 +381,28 @@ public: return m_state_lock; } - Result AddSharedMemory(KSharedMemory* shmem, VAddr address, size_t size); - void RemoveSharedMemory(KSharedMemory* shmem, VAddr address, size_t size); + Result AddSharedMemory(KSharedMemory* shmem, KProcessAddress address, size_t size); + void RemoveSharedMemory(KSharedMemory* shmem, KProcessAddress address, size_t size); /////////////////////////////////////////////////////////////////////////////////////////////// // Thread-local storage management // Marks the next available region as used and returns the address of the slot. - [[nodiscard]] Result CreateThreadLocalRegion(VAddr* out); + [[nodiscard]] Result CreateThreadLocalRegion(KProcessAddress* out); // Frees a used TLS slot identified by the given address - Result DeleteThreadLocalRegion(VAddr addr); + Result DeleteThreadLocalRegion(KProcessAddress addr); /////////////////////////////////////////////////////////////////////////////////////////////// // Debug watchpoint management // Attempts to insert a watchpoint into a free slot. Returns false if none are available. - bool InsertWatchpoint(Core::System& system, VAddr addr, u64 size, DebugWatchpointType type); + bool InsertWatchpoint(Core::System& system, KProcessAddress addr, u64 size, + DebugWatchpointType type); // Attempts to remove the watchpoint specified by the given parameters. - bool RemoveWatchpoint(Core::System& system, VAddr addr, u64 size, DebugWatchpointType type); + bool RemoveWatchpoint(Core::System& system, KProcessAddress addr, u64 size, + DebugWatchpointType type); const std::array& GetWatchpoints() const { return m_watchpoints; @@ -457,7 +460,7 @@ private: /// Resource limit descriptor for this process KResourceLimit* m_resource_limit{}; - VAddr m_system_resource_address{}; + KVirtualAddress m_system_resource_address{}; /// The ideal CPU core for this process, threads are scheduled on this core by default. u8 m_ideal_core = 0; @@ -485,7 +488,7 @@ private: KConditionVariable m_condition_var; /// Address indicating the location of the process' dedicated TLS region. - VAddr m_plr_address = 0; + KProcessAddress m_plr_address = 0; /// Random values for svcGetInfo RandomEntropy std::array m_random_entropy{}; @@ -497,7 +500,7 @@ private: std::list m_shared_memory_list; /// Address of the top of the main thread's stack - VAddr m_main_thread_stack_top{}; + KProcessAddress m_main_thread_stack_top{}; /// Size of the main thread's stack std::size_t m_main_thread_stack_size{}; @@ -527,7 +530,7 @@ private: std::array m_running_thread_idle_counts{}; std::array m_pinned_threads{}; std::array m_watchpoints{}; - std::map m_debug_page_refcounts; + std::map m_debug_page_refcounts; KThread* m_exception_thread{}; diff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/core/hle/kernel/k_scheduler.cpp index ecadf2916..faa12b4f0 100644 --- a/src/core/hle/kernel/k_scheduler.cpp +++ b/src/core/hle/kernel/k_scheduler.cpp @@ -511,7 +511,7 @@ void KScheduler::Reload(KThread* thread) { auto& cpu_core = m_kernel.System().ArmInterface(m_core_id); cpu_core.LoadContext(thread->GetContext32()); cpu_core.LoadContext(thread->GetContext64()); - cpu_core.SetTlsAddress(thread->GetTlsAddress()); + cpu_core.SetTlsAddress(GetInteger(thread->GetTlsAddress())); cpu_core.SetTPIDR_EL0(thread->GetTpidrEl0()); cpu_core.LoadWatchpointArray(thread->GetOwnerProcess()->GetWatchpoints()); cpu_core.ClearExclusiveState(); diff --git a/src/core/hle/kernel/k_session_request.cpp b/src/core/hle/kernel/k_session_request.cpp index a329e5690..9a69b4ffc 100644 --- a/src/core/hle/kernel/k_session_request.cpp +++ b/src/core/hle/kernel/k_session_request.cpp @@ -6,8 +6,8 @@ namespace Kernel { -Result KSessionRequest::SessionMappings::PushMap(VAddr client, VAddr server, size_t size, - KMemoryState state, size_t index) { +Result KSessionRequest::SessionMappings::PushMap(KProcessAddress client, KProcessAddress server, + size_t size, KMemoryState state, size_t index) { // At most 15 buffers of each type (4-bit descriptor counts). ASSERT(index < ((1ul << 4) - 1) * 3); @@ -33,20 +33,21 @@ Result KSessionRequest::SessionMappings::PushMap(VAddr client, VAddr server, siz R_SUCCEED(); } -Result KSessionRequest::SessionMappings::PushSend(VAddr client, VAddr server, size_t size, - KMemoryState state) { +Result KSessionRequest::SessionMappings::PushSend(KProcessAddress client, KProcessAddress server, + size_t size, KMemoryState state) { ASSERT(m_num_recv == 0); ASSERT(m_num_exch == 0); R_RETURN(this->PushMap(client, server, size, state, m_num_send++)); } -Result KSessionRequest::SessionMappings::PushReceive(VAddr client, VAddr server, size_t size, - KMemoryState state) { +Result KSessionRequest::SessionMappings::PushReceive(KProcessAddress client, KProcessAddress server, + size_t size, KMemoryState state) { ASSERT(m_num_exch == 0); R_RETURN(this->PushMap(client, server, size, state, m_num_send + m_num_recv++)); } -Result KSessionRequest::SessionMappings::PushExchange(VAddr client, VAddr server, size_t size, +Result KSessionRequest::SessionMappings::PushExchange(KProcessAddress client, + KProcessAddress server, size_t size, KMemoryState state) { R_RETURN(this->PushMap(client, server, size, state, m_num_send + m_num_recv + m_num_exch++)); } diff --git a/src/core/hle/kernel/k_session_request.h b/src/core/hle/kernel/k_session_request.h index 5685048ba..b5f04907b 100644 --- a/src/core/hle/kernel/k_session_request.h +++ b/src/core/hle/kernel/k_session_request.h @@ -26,17 +26,17 @@ public: class Mapping { public: - constexpr void Set(VAddr c, VAddr s, size_t sz, KMemoryState st) { + constexpr void Set(KProcessAddress c, KProcessAddress s, size_t sz, KMemoryState st) { m_client_address = c; m_server_address = s; m_size = sz; m_state = st; } - constexpr VAddr GetClientAddress() const { + constexpr KProcessAddress GetClientAddress() const { return m_client_address; } - constexpr VAddr GetServerAddress() const { + constexpr KProcessAddress GetServerAddress() const { return m_server_address; } constexpr size_t GetSize() const { @@ -47,8 +47,8 @@ public: } private: - VAddr m_client_address{}; - VAddr m_server_address{}; + KProcessAddress m_client_address{}; + KProcessAddress m_server_address{}; size_t m_size{}; KMemoryState m_state{}; }; @@ -69,14 +69,17 @@ public: return m_num_exch; } - Result PushSend(VAddr client, VAddr server, size_t size, KMemoryState state); - Result PushReceive(VAddr client, VAddr server, size_t size, KMemoryState state); - Result PushExchange(VAddr client, VAddr server, size_t size, KMemoryState state); + Result PushSend(KProcessAddress client, KProcessAddress server, size_t size, + KMemoryState state); + Result PushReceive(KProcessAddress client, KProcessAddress server, size_t size, + KMemoryState state); + Result PushExchange(KProcessAddress client, KProcessAddress server, size_t size, + KMemoryState state); - VAddr GetSendClientAddress(size_t i) const { + KProcessAddress GetSendClientAddress(size_t i) const { return GetSendMapping(i).GetClientAddress(); } - VAddr GetSendServerAddress(size_t i) const { + KProcessAddress GetSendServerAddress(size_t i) const { return GetSendMapping(i).GetServerAddress(); } size_t GetSendSize(size_t i) const { @@ -86,10 +89,10 @@ public: return GetSendMapping(i).GetMemoryState(); } - VAddr GetReceiveClientAddress(size_t i) const { + KProcessAddress GetReceiveClientAddress(size_t i) const { return GetReceiveMapping(i).GetClientAddress(); } - VAddr GetReceiveServerAddress(size_t i) const { + KProcessAddress GetReceiveServerAddress(size_t i) const { return GetReceiveMapping(i).GetServerAddress(); } size_t GetReceiveSize(size_t i) const { @@ -99,10 +102,10 @@ public: return GetReceiveMapping(i).GetMemoryState(); } - VAddr GetExchangeClientAddress(size_t i) const { + KProcessAddress GetExchangeClientAddress(size_t i) const { return GetExchangeMapping(i).GetClientAddress(); } - VAddr GetExchangeServerAddress(size_t i) const { + KProcessAddress GetExchangeServerAddress(size_t i) const { return GetExchangeMapping(i).GetServerAddress(); } size_t GetExchangeSize(size_t i) const { @@ -113,7 +116,8 @@ public: } private: - Result PushMap(VAddr client, VAddr server, size_t size, KMemoryState state, size_t index); + Result PushMap(KProcessAddress client, KProcessAddress server, size_t size, + KMemoryState state, size_t index); const Mapping& GetSendMapping(size_t i) const { ASSERT(i < m_num_send); @@ -227,22 +231,25 @@ public: return m_mappings.GetExchangeCount(); } - Result PushSend(VAddr client, VAddr server, size_t size, KMemoryState state) { + Result PushSend(KProcessAddress client, KProcessAddress server, size_t size, + KMemoryState state) { return m_mappings.PushSend(client, server, size, state); } - Result PushReceive(VAddr client, VAddr server, size_t size, KMemoryState state) { + Result PushReceive(KProcessAddress client, KProcessAddress server, size_t size, + KMemoryState state) { return m_mappings.PushReceive(client, server, size, state); } - Result PushExchange(VAddr client, VAddr server, size_t size, KMemoryState state) { + Result PushExchange(KProcessAddress client, KProcessAddress server, size_t size, + KMemoryState state) { return m_mappings.PushExchange(client, server, size, state); } - VAddr GetSendClientAddress(size_t i) const { + KProcessAddress GetSendClientAddress(size_t i) const { return m_mappings.GetSendClientAddress(i); } - VAddr GetSendServerAddress(size_t i) const { + KProcessAddress GetSendServerAddress(size_t i) const { return m_mappings.GetSendServerAddress(i); } size_t GetSendSize(size_t i) const { @@ -252,10 +259,10 @@ public: return m_mappings.GetSendMemoryState(i); } - VAddr GetReceiveClientAddress(size_t i) const { + KProcessAddress GetReceiveClientAddress(size_t i) const { return m_mappings.GetReceiveClientAddress(i); } - VAddr GetReceiveServerAddress(size_t i) const { + KProcessAddress GetReceiveServerAddress(size_t i) const { return m_mappings.GetReceiveServerAddress(i); } size_t GetReceiveSize(size_t i) const { @@ -265,10 +272,10 @@ public: return m_mappings.GetReceiveMemoryState(i); } - VAddr GetExchangeClientAddress(size_t i) const { + KProcessAddress GetExchangeClientAddress(size_t i) const { return m_mappings.GetExchangeClientAddress(i); } - VAddr GetExchangeServerAddress(size_t i) const { + KProcessAddress GetExchangeServerAddress(size_t i) const { return m_mappings.GetExchangeServerAddress(i); } size_t GetExchangeSize(size_t i) const { diff --git a/src/core/hle/kernel/k_shared_memory.cpp b/src/core/hle/kernel/k_shared_memory.cpp index 954e5befe..efb5699de 100644 --- a/src/core/hle/kernel/k_shared_memory.cpp +++ b/src/core/hle/kernel/k_shared_memory.cpp @@ -76,7 +76,7 @@ void KSharedMemory::Finalize() { m_resource_limit->Close(); } -Result KSharedMemory::Map(KProcess& target_process, VAddr address, std::size_t map_size, +Result KSharedMemory::Map(KProcess& target_process, KProcessAddress address, std::size_t map_size, Svc::MemoryPermission map_perm) { // Validate the size. R_UNLESS(m_size == map_size, ResultInvalidSize); @@ -94,7 +94,8 @@ Result KSharedMemory::Map(KProcess& target_process, VAddr address, std::size_t m ConvertToKMemoryPermission(map_perm))); } -Result KSharedMemory::Unmap(KProcess& target_process, VAddr address, std::size_t unmap_size) { +Result KSharedMemory::Unmap(KProcess& target_process, KProcessAddress address, + std::size_t unmap_size) { // Validate the size. R_UNLESS(m_size == unmap_size, ResultInvalidSize); diff --git a/src/core/hle/kernel/k_shared_memory.h b/src/core/hle/kernel/k_shared_memory.h index b4c4125bb..54b23d7ac 100644 --- a/src/core/hle/kernel/k_shared_memory.h +++ b/src/core/hle/kernel/k_shared_memory.h @@ -6,11 +6,11 @@ #include #include -#include "common/common_types.h" #include "core/device_memory.h" #include "core/hle/kernel/k_memory_block.h" #include "core/hle/kernel/k_page_group.h" #include "core/hle/kernel/k_process.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/kernel/slab_helpers.h" #include "core/hle/result.h" @@ -37,7 +37,7 @@ public: * @param map_size Size of the shared memory block to map * @param permissions Memory block map permissions (specified by SVC field) */ - Result Map(KProcess& target_process, VAddr address, std::size_t map_size, + Result Map(KProcess& target_process, KProcessAddress address, std::size_t map_size, Svc::MemoryPermission permissions); /** @@ -46,7 +46,7 @@ public: * @param address Address in system memory to unmap shared memory block * @param unmap_size Size of the shared memory block to unmap */ - Result Unmap(KProcess& target_process, VAddr address, std::size_t unmap_size); + Result Unmap(KProcess& target_process, KProcessAddress address, std::size_t unmap_size); /** * Gets a pointer to the shared memory block @@ -79,7 +79,7 @@ private: std::optional m_page_group{}; Svc::MemoryPermission m_owner_permission{}; Svc::MemoryPermission m_user_permission{}; - PAddr m_physical_address{}; + KPhysicalAddress m_physical_address{}; std::size_t m_size{}; KResourceLimit* m_resource_limit{}; bool m_is_initialized{}; diff --git a/src/core/hle/kernel/k_system_resource.h b/src/core/hle/kernel/k_system_resource.h index d36aaa9bd..6ea482185 100644 --- a/src/core/hle/kernel/k_system_resource.h +++ b/src/core/hle/kernel/k_system_resource.h @@ -130,7 +130,7 @@ private: KBlockInfoSlabHeap m_block_info_heap; KPageTableSlabHeap m_page_table_heap; KResourceLimit* m_resource_limit{}; - VAddr m_resource_address{}; + KVirtualAddress m_resource_address{}; size_t m_resource_size{}; }; diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index c0e3ecb45..9d101c640 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -48,8 +48,8 @@ static void ResetThreadContext32(Kernel::KThread::ThreadContext32& context, u32 context.fpscr = 0; } -static void ResetThreadContext64(Kernel::KThread::ThreadContext64& context, VAddr stack_top, - VAddr entry_point, u64 arg) { +static void ResetThreadContext64(Kernel::KThread::ThreadContext64& context, u64 stack_top, + u64 entry_point, u64 arg) { context = {}; context.cpu_registers[0] = arg; context.cpu_registers[18] = Kernel::KSystemControl::GenerateRandomU64() | 1; @@ -100,8 +100,8 @@ KThread::KThread(KernelCore& kernel) : KAutoObjectWithSlabHeapAndContainer{kernel}, m_activity_pause_lock{kernel} {} KThread::~KThread() = default; -Result KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack_top, s32 prio, - s32 virt_core, KProcess* owner, ThreadType type) { +Result KThread::Initialize(KThreadFunction func, uintptr_t arg, KProcessAddress user_stack_top, + s32 prio, s32 virt_core, KProcess* owner, ThreadType type) { // Assert parameters are valid. ASSERT((type == ThreadType::Main) || (type == ThreadType::Dummy) || (Svc::HighestThreadPriority <= prio && prio <= Svc::LowestThreadPriority)); @@ -221,9 +221,9 @@ Result KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack } // Initialize thread context. - ResetThreadContext64(m_thread_context_64, user_stack_top, func, arg); - ResetThreadContext32(m_thread_context_32, static_cast(user_stack_top), - static_cast(func), static_cast(arg)); + ResetThreadContext64(m_thread_context_64, GetInteger(user_stack_top), GetInteger(func), arg); + ResetThreadContext32(m_thread_context_32, static_cast(GetInteger(user_stack_top)), + static_cast(GetInteger(func)), static_cast(arg)); // Setup the stack parameters. StackParameters& sp = this->GetStackParameters(); @@ -249,8 +249,9 @@ Result KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack } Result KThread::InitializeThread(KThread* thread, KThreadFunction func, uintptr_t arg, - VAddr user_stack_top, s32 prio, s32 core, KProcess* owner, - ThreadType type, std::function&& init_func) { + KProcessAddress user_stack_top, s32 prio, s32 core, + KProcess* owner, ThreadType type, + std::function&& init_func) { // Initialize the thread. R_TRY(thread->Initialize(func, arg, user_stack_top, prio, core, owner, type)); @@ -288,8 +289,8 @@ Result KThread::InitializeHighPriorityThread(Core::System& system, KThread* thre } Result KThread::InitializeUserThread(Core::System& system, KThread* thread, KThreadFunction func, - uintptr_t arg, VAddr user_stack_top, s32 prio, s32 virt_core, - KProcess* owner) { + uintptr_t arg, KProcessAddress user_stack_top, s32 prio, + s32 virt_core, KProcess* owner) { system.Kernel().GlobalSchedulerContext().AddThread(thread); R_RETURN(InitializeThread(thread, func, arg, user_stack_top, prio, virt_core, owner, ThreadType::User, system.GetCpuManager().GetGuestThreadFunc())); @@ -951,7 +952,7 @@ void KThread::AddHeldLock(LockWithPriorityInheritanceInfo* lock_info) { m_held_lock_info_list.push_front(*lock_info); } -KThread::LockWithPriorityInheritanceInfo* KThread::FindHeldLock(VAddr address_key, +KThread::LockWithPriorityInheritanceInfo* KThread::FindHeldLock(KProcessAddress address_key, bool is_kernel_address_key) { ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); @@ -1087,7 +1088,8 @@ void KThread::RemoveWaiter(KThread* thread) { } } -KThread* KThread::RemoveWaiterByKey(bool* out_has_waiters, VAddr key, bool is_kernel_address_key_) { +KThread* KThread::RemoveWaiterByKey(bool* out_has_waiters, KProcessAddress key, + bool is_kernel_address_key_) { ASSERT(KScheduler::IsSchedulerLockedByCurrentThread(m_kernel)); // Get the relevant lock info. diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h index 53fa64369..0fa9672bf 100644 --- a/src/core/hle/kernel/k_thread.h +++ b/src/core/hle/kernel/k_thread.h @@ -14,7 +14,6 @@ #include -#include "common/common_types.h" #include "common/intrusive_red_black_tree.h" #include "common/spin_lock.h" #include "core/arm/arm_interface.h" @@ -23,6 +22,7 @@ #include "core/hle/kernel/k_spin_lock.h" #include "core/hle/kernel/k_synchronization_object.h" #include "core/hle/kernel/k_timer_task.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/kernel/k_worker_task.h" #include "core/hle/kernel/slab_helpers.h" #include "core/hle/kernel/svc_common.h" @@ -46,7 +46,7 @@ class KProcess; class KScheduler; class KThreadQueue; -using KThreadFunction = VAddr; +using KThreadFunction = KProcessAddress; enum class ThreadType : u32 { Main = 0, @@ -230,9 +230,9 @@ public: /* * Returns the Thread Local Storage address of the current thread - * @returns VAddr of the thread's TLS + * @returns Address of the thread's TLS */ - VAddr GetTlsAddress() const { + KProcessAddress GetTlsAddress() const { return m_tls_address; } @@ -419,8 +419,8 @@ public: KThreadFunction func, uintptr_t arg, s32 virt_core); static Result InitializeUserThread(Core::System& system, KThread* thread, KThreadFunction func, - uintptr_t arg, VAddr user_stack_top, s32 prio, s32 virt_core, - KProcess* owner); + uintptr_t arg, KProcessAddress user_stack_top, s32 prio, + s32 virt_core, KProcess* owner); static Result InitializeServiceThread(Core::System& system, KThread* thread, std::function&& thread_func, s32 prio, @@ -565,15 +565,15 @@ public: Result GetThreadContext3(std::vector& out); - KThread* RemoveUserWaiterByKey(bool* out_has_waiters, VAddr key) { + KThread* RemoveUserWaiterByKey(bool* out_has_waiters, KProcessAddress key) { return this->RemoveWaiterByKey(out_has_waiters, key, false); } - KThread* RemoveKernelWaiterByKey(bool* out_has_waiters, VAddr key) { + KThread* RemoveKernelWaiterByKey(bool* out_has_waiters, KProcessAddress key) { return this->RemoveWaiterByKey(out_has_waiters, key, true); } - VAddr GetAddressKey() const { + KProcessAddress GetAddressKey() const { return m_address_key; } @@ -591,14 +591,14 @@ public: // to cope with arbitrary host pointers making their way // into things. - void SetUserAddressKey(VAddr key, u32 val) { + void SetUserAddressKey(KProcessAddress key, u32 val) { ASSERT(m_waiting_lock_info == nullptr); m_address_key = key; m_address_key_value = val; m_is_kernel_address_key = false; } - void SetKernelAddressKey(VAddr key) { + void SetKernelAddressKey(KProcessAddress key) { ASSERT(m_waiting_lock_info == nullptr); m_address_key = key; m_is_kernel_address_key = true; @@ -637,12 +637,13 @@ public: return m_argument; } - VAddr GetUserStackTop() const { + KProcessAddress GetUserStackTop() const { return m_stack_top; } private: - KThread* RemoveWaiterByKey(bool* out_has_waiters, VAddr key, bool is_kernel_address_key); + KThread* RemoveWaiterByKey(bool* out_has_waiters, KProcessAddress key, + bool is_kernel_address_key); static constexpr size_t PriorityInheritanceCountMax = 10; union SyncObjectBuffer { @@ -695,12 +696,13 @@ private: void IncreaseBasePriority(s32 priority); - Result Initialize(KThreadFunction func, uintptr_t arg, VAddr user_stack_top, s32 prio, + Result Initialize(KThreadFunction func, uintptr_t arg, KProcessAddress user_stack_top, s32 prio, s32 virt_core, KProcess* owner, ThreadType type); static Result InitializeThread(KThread* thread, KThreadFunction func, uintptr_t arg, - VAddr user_stack_top, s32 prio, s32 core, KProcess* owner, - ThreadType type, std::function&& init_func); + KProcessAddress user_stack_top, s32 prio, s32 core, + KProcess* owner, ThreadType type, + std::function&& init_func); // For core KThread implementation ThreadContext32 m_thread_context_32{}; @@ -749,7 +751,8 @@ public: public: explicit LockWithPriorityInheritanceInfo(KernelCore&) {} - static LockWithPriorityInheritanceInfo* Create(KernelCore& kernel, VAddr address_key, + static LockWithPriorityInheritanceInfo* Create(KernelCore& kernel, + KProcessAddress address_key, bool is_kernel_address_key) { // Create a new lock info. auto* new_lock = LockWithPriorityInheritanceInfo::Allocate(kernel); @@ -797,7 +800,7 @@ public: return m_tree; } - VAddr GetAddressKey() const { + KProcessAddress GetAddressKey() const { return m_address_key; } bool GetIsKernelAddressKey() const { @@ -812,7 +815,7 @@ public: private: LockWithPriorityInheritanceThreadTree m_tree{}; - VAddr m_address_key{}; + KProcessAddress m_address_key{}; KThread* m_owner{}; u32 m_waiter_count{}; bool m_is_kernel_address_key{}; @@ -827,7 +830,8 @@ public: } void AddHeldLock(LockWithPriorityInheritanceInfo* lock_info); - LockWithPriorityInheritanceInfo* FindHeldLock(VAddr address_key, bool is_kernel_address_key); + LockWithPriorityInheritanceInfo* FindHeldLock(KProcessAddress address_key, + bool is_kernel_address_key); private: using LockWithPriorityInheritanceInfoList = @@ -839,11 +843,11 @@ private: KAffinityMask m_physical_affinity_mask{}; u64 m_thread_id{}; std::atomic m_cpu_time{}; - VAddr m_address_key{}; + KProcessAddress m_address_key{}; KProcess* m_parent{}; - VAddr m_kernel_stack_top{}; + KVirtualAddress m_kernel_stack_top{}; u32* m_light_ipc_data{}; - VAddr m_tls_address{}; + KProcessAddress m_tls_address{}; KLightLock m_activity_pause_lock; s64 m_schedule_count{}; s64 m_last_scheduled_tick{}; @@ -887,16 +891,16 @@ private: // For debugging std::vector m_wait_objects_for_debugging{}; - VAddr m_mutex_wait_address_for_debugging{}; + KProcessAddress m_mutex_wait_address_for_debugging{}; ThreadWaitReasonForDebugging m_wait_reason_for_debugging{}; uintptr_t m_argument{}; - VAddr m_stack_top{}; + KProcessAddress m_stack_top{}; public: using ConditionVariableThreadTreeType = ConditionVariableThreadTree; - void SetConditionVariable(ConditionVariableThreadTree* tree, VAddr address, u64 cv_key, - u32 value) { + void SetConditionVariable(ConditionVariableThreadTree* tree, KProcessAddress address, + u64 cv_key, u32 value) { ASSERT(m_waiting_lock_info == nullptr); m_condvar_tree = tree; m_condvar_key = cv_key; diff --git a/src/core/hle/kernel/k_thread_local_page.cpp b/src/core/hle/kernel/k_thread_local_page.cpp index c2af6898a..b4a1e3cdb 100644 --- a/src/core/hle/kernel/k_thread_local_page.cpp +++ b/src/core/hle/kernel/k_thread_local_page.cpp @@ -37,7 +37,7 @@ Result KThreadLocalPage::Initialize(KernelCore& kernel, KProcess* process) { Result KThreadLocalPage::Finalize() { // Get the physical address of the page. - const PAddr phys_addr = m_owner->PageTable().GetPhysicalAddr(m_virt_addr); + const KPhysicalAddress phys_addr = m_owner->PageTable().GetPhysicalAddr(m_virt_addr); ASSERT(phys_addr); // Unmap the page. @@ -49,7 +49,7 @@ Result KThreadLocalPage::Finalize() { return ResultSuccess; } -VAddr KThreadLocalPage::Reserve() { +KProcessAddress KThreadLocalPage::Reserve() { for (size_t i = 0; i < m_is_region_free.size(); i++) { if (m_is_region_free[i]) { m_is_region_free[i] = false; @@ -60,7 +60,7 @@ VAddr KThreadLocalPage::Reserve() { return 0; } -void KThreadLocalPage::Release(VAddr addr) { +void KThreadLocalPage::Release(KProcessAddress addr) { m_is_region_free[this->GetRegionIndex(addr)] = true; } diff --git a/src/core/hle/kernel/k_thread_local_page.h b/src/core/hle/kernel/k_thread_local_page.h index 71254eb55..813f32a7e 100644 --- a/src/core/hle/kernel/k_thread_local_page.h +++ b/src/core/hle/kernel/k_thread_local_page.h @@ -27,19 +27,20 @@ public: static_assert(RegionsPerPage > 0); public: - constexpr explicit KThreadLocalPage(KernelCore&, VAddr addr = {}) : m_virt_addr(addr) { + constexpr explicit KThreadLocalPage(KernelCore&, KProcessAddress addr = {}) + : m_virt_addr(addr) { m_is_region_free.fill(true); } - constexpr VAddr GetAddress() const { + constexpr KProcessAddress GetAddress() const { return m_virt_addr; } Result Initialize(KernelCore& kernel, KProcess* process); Result Finalize(); - VAddr Reserve(); - void Release(VAddr addr); + KProcessAddress Reserve(); + void Release(KProcessAddress addr); bool IsAllUsed() const { return std::ranges::all_of(m_is_region_free.begin(), m_is_region_free.end(), @@ -60,7 +61,7 @@ public: } public: - using RedBlackKeyType = VAddr; + using RedBlackKeyType = KProcessAddress; static constexpr RedBlackKeyType GetRedBlackKey(const RedBlackKeyType& v) { return v; @@ -72,8 +73,8 @@ public: template requires(std::same_as || std::same_as) static constexpr int Compare(const T& lhs, const KThreadLocalPage& rhs) { - const VAddr lval = GetRedBlackKey(lhs); - const VAddr rval = GetRedBlackKey(rhs); + const KProcessAddress lval = GetRedBlackKey(lhs); + const KProcessAddress rval = GetRedBlackKey(rhs); if (lval < rval) { return -1; @@ -85,22 +86,22 @@ public: } private: - constexpr VAddr GetRegionAddress(size_t i) const { + constexpr KProcessAddress GetRegionAddress(size_t i) const { return this->GetAddress() + i * Svc::ThreadLocalRegionSize; } - constexpr bool Contains(VAddr addr) const { + constexpr bool Contains(KProcessAddress addr) const { return this->GetAddress() <= addr && addr < this->GetAddress() + PageSize; } - constexpr size_t GetRegionIndex(VAddr addr) const { - ASSERT(Common::IsAligned(addr, Svc::ThreadLocalRegionSize)); + constexpr size_t GetRegionIndex(KProcessAddress addr) const { + ASSERT(Common::IsAligned(GetInteger(addr), Svc::ThreadLocalRegionSize)); ASSERT(this->Contains(addr)); return (addr - this->GetAddress()) / Svc::ThreadLocalRegionSize; } private: - VAddr m_virt_addr{}; + KProcessAddress m_virt_addr{}; KProcess* m_owner{}; KernelCore* m_kernel{}; std::array m_is_region_free{}; diff --git a/src/core/hle/kernel/k_transfer_memory.cpp b/src/core/hle/kernel/k_transfer_memory.cpp index 471349282..13d34125c 100644 --- a/src/core/hle/kernel/k_transfer_memory.cpp +++ b/src/core/hle/kernel/k_transfer_memory.cpp @@ -13,7 +13,7 @@ KTransferMemory::KTransferMemory(KernelCore& kernel) KTransferMemory::~KTransferMemory() = default; -Result KTransferMemory::Initialize(VAddr address, std::size_t size, +Result KTransferMemory::Initialize(KProcessAddress address, std::size_t size, Svc::MemoryPermission owner_perm) { // Set members. m_owner = GetCurrentProcessPointer(m_kernel); diff --git a/src/core/hle/kernel/k_transfer_memory.h b/src/core/hle/kernel/k_transfer_memory.h index 3d4d795a5..54f97ccb4 100644 --- a/src/core/hle/kernel/k_transfer_memory.h +++ b/src/core/hle/kernel/k_transfer_memory.h @@ -26,7 +26,7 @@ public: explicit KTransferMemory(KernelCore& kernel); ~KTransferMemory() override; - Result Initialize(VAddr address, std::size_t size, Svc::MemoryPermission owner_perm); + Result Initialize(KProcessAddress address, std::size_t size, Svc::MemoryPermission owner_perm); void Finalize() override; @@ -44,7 +44,7 @@ public: return m_owner; } - VAddr GetSourceAddress() const { + KProcessAddress GetSourceAddress() const { return m_address; } @@ -54,7 +54,7 @@ public: private: KProcess* m_owner{}; - VAddr m_address{}; + KProcessAddress m_address{}; Svc::MemoryPermission m_owner_perm{}; size_t m_size{}; bool m_is_initialized{}; diff --git a/src/core/hle/kernel/k_typed_address.h b/src/core/hle/kernel/k_typed_address.h new file mode 100644 index 000000000..d57535ba0 --- /dev/null +++ b/src/core/hle/kernel/k_typed_address.h @@ -0,0 +1,12 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "common/typed_address.h" + +namespace Kernel { + +using KPhysicalAddress = Common::PhysicalAddress; +using KVirtualAddress = Common::VirtualAddress; +using KProcessAddress = Common::ProcessAddress; + +} // namespace Kernel diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 98ecaf12f..29809b2c5 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -271,9 +271,9 @@ struct KernelCore::Impl { system.CoreTiming().ScheduleLoopingEvent(time_interval, time_interval, preemption_event); } - void InitializeResourceManagers(KernelCore& kernel, VAddr address, size_t size) { + void InitializeResourceManagers(KernelCore& kernel, KVirtualAddress address, size_t size) { // Ensure that the buffer is suitable for our use. - ASSERT(Common::IsAligned(address, PageSize)); + ASSERT(Common::IsAligned(GetInteger(address), PageSize)); ASSERT(Common::IsAligned(size, PageSize)); // Ensure that we have space for our reference counts. @@ -462,29 +462,30 @@ struct KernelCore::Impl { KernelPhysicalAddressSpaceBase + KernelPhysicalAddressSpaceSize - 1); // Save start and end for ease of use. - const VAddr code_start_virt_addr = KernelVirtualAddressCodeBase; - const VAddr code_end_virt_addr = KernelVirtualAddressCodeEnd; + constexpr KVirtualAddress code_start_virt_addr = KernelVirtualAddressCodeBase; + constexpr KVirtualAddress code_end_virt_addr = KernelVirtualAddressCodeEnd; // Setup the containing kernel region. constexpr size_t KernelRegionSize = 1_GiB; constexpr size_t KernelRegionAlign = 1_GiB; - constexpr VAddr kernel_region_start = - Common::AlignDown(code_start_virt_addr, KernelRegionAlign); + constexpr KVirtualAddress kernel_region_start = + Common::AlignDown(GetInteger(code_start_virt_addr), KernelRegionAlign); size_t kernel_region_size = KernelRegionSize; if (!(kernel_region_start + KernelRegionSize - 1 <= KernelVirtualAddressSpaceLast)) { - kernel_region_size = KernelVirtualAddressSpaceEnd - kernel_region_start; + kernel_region_size = KernelVirtualAddressSpaceEnd - GetInteger(kernel_region_start); } ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert( - kernel_region_start, kernel_region_size, KMemoryRegionType_Kernel)); + GetInteger(kernel_region_start), kernel_region_size, KMemoryRegionType_Kernel)); // Setup the code region. constexpr size_t CodeRegionAlign = PageSize; - constexpr VAddr code_region_start = - Common::AlignDown(code_start_virt_addr, CodeRegionAlign); - constexpr VAddr code_region_end = Common::AlignUp(code_end_virt_addr, CodeRegionAlign); + constexpr KVirtualAddress code_region_start = + Common::AlignDown(GetInteger(code_start_virt_addr), CodeRegionAlign); + constexpr KVirtualAddress code_region_end = + Common::AlignUp(GetInteger(code_end_virt_addr), CodeRegionAlign); constexpr size_t code_region_size = code_region_end - code_region_start; ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert( - code_region_start, code_region_size, KMemoryRegionType_KernelCode)); + GetInteger(code_region_start), code_region_size, KMemoryRegionType_KernelCode)); // Setup board-specific device physical regions. Init::SetupDevicePhysicalMemoryRegions(*memory_layout); @@ -520,11 +521,11 @@ struct KernelCore::Impl { ASSERT(misc_region_size > 0); // Setup the misc region. - const VAddr misc_region_start = + const KVirtualAddress misc_region_start = memory_layout->GetVirtualMemoryRegionTree().GetRandomAlignedRegion( misc_region_size, MiscRegionAlign, KMemoryRegionType_Kernel); ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert( - misc_region_start, misc_region_size, KMemoryRegionType_KernelMisc)); + GetInteger(misc_region_start), misc_region_size, KMemoryRegionType_KernelMisc)); // Determine if we'll use extra thread resources. const bool use_extra_resources = KSystemControl::Init::ShouldIncreaseThreadResourceLimit(); @@ -532,11 +533,11 @@ struct KernelCore::Impl { // Setup the stack region. constexpr size_t StackRegionSize = 14_MiB; constexpr size_t StackRegionAlign = KernelAslrAlignment; - const VAddr stack_region_start = + const KVirtualAddress stack_region_start = memory_layout->GetVirtualMemoryRegionTree().GetRandomAlignedRegion( StackRegionSize, StackRegionAlign, KMemoryRegionType_Kernel); ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert( - stack_region_start, StackRegionSize, KMemoryRegionType_KernelStack)); + GetInteger(stack_region_start), StackRegionSize, KMemoryRegionType_KernelStack)); // Determine the size of the resource region. const size_t resource_region_size = @@ -548,29 +549,29 @@ struct KernelCore::Impl { ASSERT(slab_region_size <= resource_region_size); // Setup the slab region. - const PAddr code_start_phys_addr = KernelPhysicalAddressCodeBase; - const PAddr code_end_phys_addr = code_start_phys_addr + code_region_size; - const PAddr slab_start_phys_addr = code_end_phys_addr; - const PAddr slab_end_phys_addr = slab_start_phys_addr + slab_region_size; + const KPhysicalAddress code_start_phys_addr = KernelPhysicalAddressCodeBase; + const KPhysicalAddress code_end_phys_addr = code_start_phys_addr + code_region_size; + const KPhysicalAddress slab_start_phys_addr = code_end_phys_addr; + const KPhysicalAddress slab_end_phys_addr = slab_start_phys_addr + slab_region_size; constexpr size_t SlabRegionAlign = KernelAslrAlignment; const size_t slab_region_needed_size = - Common::AlignUp(code_end_phys_addr + slab_region_size, SlabRegionAlign) - - Common::AlignDown(code_end_phys_addr, SlabRegionAlign); - const VAddr slab_region_start = + Common::AlignUp(GetInteger(code_end_phys_addr) + slab_region_size, SlabRegionAlign) - + Common::AlignDown(GetInteger(code_end_phys_addr), SlabRegionAlign); + const KVirtualAddress slab_region_start = memory_layout->GetVirtualMemoryRegionTree().GetRandomAlignedRegion( slab_region_needed_size, SlabRegionAlign, KMemoryRegionType_Kernel) + - (code_end_phys_addr % SlabRegionAlign); + (GetInteger(code_end_phys_addr) % SlabRegionAlign); ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert( - slab_region_start, slab_region_size, KMemoryRegionType_KernelSlab)); + GetInteger(slab_region_start), slab_region_size, KMemoryRegionType_KernelSlab)); // Setup the temp region. constexpr size_t TempRegionSize = 128_MiB; constexpr size_t TempRegionAlign = KernelAslrAlignment; - const VAddr temp_region_start = + const KVirtualAddress temp_region_start = memory_layout->GetVirtualMemoryRegionTree().GetRandomAlignedRegion( TempRegionSize, TempRegionAlign, KMemoryRegionType_Kernel); - ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert(temp_region_start, TempRegionSize, - KMemoryRegionType_KernelTemp)); + ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert( + GetInteger(temp_region_start), TempRegionSize, KMemoryRegionType_KernelTemp)); // Automatically map in devices that have auto-map attributes. for (auto& region : memory_layout->GetPhysicalMemoryRegionTree()) { @@ -596,35 +597,37 @@ struct KernelCore::Impl { region.SetTypeAttribute(KMemoryRegionAttr_DidKernelMap); // Create a virtual pair region and insert it into the tree. - const PAddr map_phys_addr = Common::AlignDown(region.GetAddress(), PageSize); + const KPhysicalAddress map_phys_addr = Common::AlignDown(region.GetAddress(), PageSize); const size_t map_size = - Common::AlignUp(region.GetEndAddress(), PageSize) - map_phys_addr; - const VAddr map_virt_addr = + Common::AlignUp(region.GetEndAddress(), PageSize) - GetInteger(map_phys_addr); + const KVirtualAddress map_virt_addr = memory_layout->GetVirtualMemoryRegionTree().GetRandomAlignedRegionWithGuard( map_size, PageSize, KMemoryRegionType_KernelMisc, PageSize); ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert( - map_virt_addr, map_size, KMemoryRegionType_KernelMiscMappedDevice)); - region.SetPairAddress(map_virt_addr + region.GetAddress() - map_phys_addr); + GetInteger(map_virt_addr), map_size, KMemoryRegionType_KernelMiscMappedDevice)); + region.SetPairAddress(GetInteger(map_virt_addr) + region.GetAddress() - + GetInteger(map_phys_addr)); } Init::SetupDramPhysicalMemoryRegions(*memory_layout); // Insert a physical region for the kernel code region. ASSERT(memory_layout->GetPhysicalMemoryRegionTree().Insert( - code_start_phys_addr, code_region_size, KMemoryRegionType_DramKernelCode)); + GetInteger(code_start_phys_addr), code_region_size, KMemoryRegionType_DramKernelCode)); // Insert a physical region for the kernel slab region. ASSERT(memory_layout->GetPhysicalMemoryRegionTree().Insert( - slab_start_phys_addr, slab_region_size, KMemoryRegionType_DramKernelSlab)); + GetInteger(slab_start_phys_addr), slab_region_size, KMemoryRegionType_DramKernelSlab)); // Determine size available for kernel page table heaps, requiring > 8 MB. - const PAddr resource_end_phys_addr = slab_start_phys_addr + resource_region_size; + const KPhysicalAddress resource_end_phys_addr = slab_start_phys_addr + resource_region_size; const size_t page_table_heap_size = resource_end_phys_addr - slab_end_phys_addr; ASSERT(page_table_heap_size / 4_MiB > 2); // Insert a physical region for the kernel page table heap region ASSERT(memory_layout->GetPhysicalMemoryRegionTree().Insert( - slab_end_phys_addr, page_table_heap_size, KMemoryRegionType_DramKernelPtHeap)); + GetInteger(slab_end_phys_addr), page_table_heap_size, + KMemoryRegionType_DramKernelPtHeap)); // All DRAM regions that we haven't tagged by this point will be mapped under the linear // mapping. Tag them. @@ -646,20 +649,21 @@ struct KernelCore::Impl { // Setup the linear mapping region. constexpr size_t LinearRegionAlign = 1_GiB; - const PAddr aligned_linear_phys_start = + const KPhysicalAddress aligned_linear_phys_start = Common::AlignDown(linear_extents.GetAddress(), LinearRegionAlign); const size_t linear_region_size = Common::AlignUp(linear_extents.GetEndAddress(), LinearRegionAlign) - - aligned_linear_phys_start; - const VAddr linear_region_start = + GetInteger(aligned_linear_phys_start); + const KVirtualAddress linear_region_start = memory_layout->GetVirtualMemoryRegionTree().GetRandomAlignedRegionWithGuard( linear_region_size, LinearRegionAlign, KMemoryRegionType_None, LinearRegionAlign); - const u64 linear_region_phys_to_virt_diff = linear_region_start - aligned_linear_phys_start; + const u64 linear_region_phys_to_virt_diff = + GetInteger(linear_region_start) - GetInteger(aligned_linear_phys_start); // Map and create regions for all the linearly-mapped data. { - PAddr cur_phys_addr = 0; + KPhysicalAddress cur_phys_addr = 0; u64 cur_size = 0; for (auto& region : memory_layout->GetPhysicalMemoryRegionTree()) { if (!region.HasTypeAttribute(KMemoryRegionAttr_LinearMapped)) { @@ -678,15 +682,16 @@ struct KernelCore::Impl { cur_size = region.GetSize(); } - const VAddr region_virt_addr = + const KVirtualAddress region_virt_addr = region.GetAddress() + linear_region_phys_to_virt_diff; ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert( - region_virt_addr, region.GetSize(), + GetInteger(region_virt_addr), region.GetSize(), GetTypeForVirtualLinearMapping(region.GetType()))); - region.SetPairAddress(region_virt_addr); + region.SetPairAddress(GetInteger(region_virt_addr)); KMemoryRegion* virt_region = - memory_layout->GetVirtualMemoryRegionTree().FindModifiable(region_virt_addr); + memory_layout->GetVirtualMemoryRegionTree().FindModifiable( + GetInteger(region_virt_addr)); ASSERT(virt_region != nullptr); virt_region->SetPairAddress(region.GetAddress()); } @@ -694,10 +699,11 @@ struct KernelCore::Impl { // Insert regions for the initial page table region. ASSERT(memory_layout->GetPhysicalMemoryRegionTree().Insert( - resource_end_phys_addr, KernelPageTableHeapSize, KMemoryRegionType_DramKernelInitPt)); + GetInteger(resource_end_phys_addr), KernelPageTableHeapSize, + KMemoryRegionType_DramKernelInitPt)); ASSERT(memory_layout->GetVirtualMemoryRegionTree().Insert( - resource_end_phys_addr + linear_region_phys_to_virt_diff, KernelPageTableHeapSize, - KMemoryRegionType_VirtualDramKernelInitPt)); + GetInteger(resource_end_phys_addr) + linear_region_phys_to_virt_diff, + KernelPageTableHeapSize, KMemoryRegionType_VirtualDramKernelInitPt)); // All linear-mapped DRAM regions that we haven't tagged by this point will be allocated to // some pool partition. Tag them. @@ -969,12 +975,12 @@ void KernelCore::InvalidateAllInstructionCaches() { } } -void KernelCore::InvalidateCpuInstructionCacheRange(VAddr addr, std::size_t size) { +void KernelCore::InvalidateCpuInstructionCacheRange(KProcessAddress addr, std::size_t size) { for (auto& physical_core : impl->cores) { if (!physical_core->IsInitialized()) { continue; } - physical_core->ArmInterface().InvalidateCacheRange(addr, size); + physical_core->ArmInterface().InvalidateCacheRange(GetInteger(addr), size); } } diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 183a4d227..d5b08eeb5 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -14,6 +14,7 @@ #include "core/hardware_properties.h" #include "core/hle/kernel/k_auto_object.h" #include "core/hle/kernel/k_slab_heap.h" +#include "core/hle/kernel/k_typed_address.h" #include "core/hle/kernel/svc_common.h" namespace Core { @@ -185,7 +186,7 @@ public: void InvalidateAllInstructionCaches(); - void InvalidateCpuInstructionCacheRange(VAddr addr, std::size_t size); + void InvalidateCpuInstructionCacheRange(KProcessAddress addr, std::size_t size); /// Registers all kernel objects with the global emulation state, this is purely for tracking /// leaks after emulation has been shutdown. diff --git a/src/core/hle/kernel/memory_types.h b/src/core/hle/kernel/memory_types.h index 92b8b37ac..18de675cc 100644 --- a/src/core/hle/kernel/memory_types.h +++ b/src/core/hle/kernel/memory_types.h @@ -6,6 +6,7 @@ #include #include "common/common_types.h" +#include "core/hle/kernel/k_typed_address.h" namespace Kernel { @@ -14,7 +15,4 @@ constexpr std::size_t PageSize{1 << PageBits}; using Page = std::array; -using KPhysicalAddress = PAddr; -using KProcessAddress = VAddr; - } // namespace Kernel diff --git a/src/core/hle/kernel/svc/svc_address_arbiter.cpp b/src/core/hle/kernel/svc/svc_address_arbiter.cpp index 22071731b..04cc5ea64 100644 --- a/src/core/hle/kernel/svc/svc_address_arbiter.cpp +++ b/src/core/hle/kernel/svc/svc_address_arbiter.cpp @@ -37,7 +37,7 @@ constexpr bool IsValidArbitrationType(Svc::ArbitrationType type) { } // namespace // Wait for an address (via Address Arbiter) -Result WaitForAddress(Core::System& system, VAddr address, ArbitrationType arb_type, s32 value, +Result WaitForAddress(Core::System& system, u64 address, ArbitrationType arb_type, s32 value, s64 timeout_ns) { LOG_TRACE(Kernel_SVC, "called, address=0x{:X}, arb_type=0x{:X}, value=0x{:X}, timeout_ns={}", address, arb_type, value, timeout_ns); @@ -68,7 +68,7 @@ Result WaitForAddress(Core::System& system, VAddr address, ArbitrationType arb_t } // Signals to an address (via Address Arbiter) -Result SignalToAddress(Core::System& system, VAddr address, SignalType signal_type, s32 value, +Result SignalToAddress(Core::System& system, u64 address, SignalType signal_type, s32 value, s32 count) { LOG_TRACE(Kernel_SVC, "called, address=0x{:X}, signal_type=0x{:X}, value=0x{:X}, count=0x{:X}", address, signal_type, value, count); @@ -82,12 +82,12 @@ Result SignalToAddress(Core::System& system, VAddr address, SignalType signal_ty .SignalAddressArbiter(address, signal_type, value, count)); } -Result WaitForAddress64(Core::System& system, VAddr address, ArbitrationType arb_type, s32 value, +Result WaitForAddress64(Core::System& system, u64 address, ArbitrationType arb_type, s32 value, s64 timeout_ns) { R_RETURN(WaitForAddress(system, address, arb_type, value, timeout_ns)); } -Result SignalToAddress64(Core::System& system, VAddr address, SignalType signal_type, s32 value, +Result SignalToAddress64(Core::System& system, u64 address, SignalType signal_type, s32 value, s32 count) { R_RETURN(SignalToAddress(system, address, signal_type, value, count)); } diff --git a/src/core/hle/kernel/svc/svc_code_memory.cpp b/src/core/hle/kernel/svc/svc_code_memory.cpp index 43feab986..687baff82 100644 --- a/src/core/hle/kernel/svc/svc_code_memory.cpp +++ b/src/core/hle/kernel/svc/svc_code_memory.cpp @@ -29,7 +29,7 @@ constexpr bool IsValidUnmapFromOwnerCodeMemoryPermission(MemoryPermission perm) } // namespace -Result CreateCodeMemory(Core::System& system, Handle* out, VAddr address, uint64_t size) { +Result CreateCodeMemory(Core::System& system, Handle* out, u64 address, uint64_t size) { LOG_TRACE(Kernel_SVC, "called, address=0x{:X}, size=0x{:X}", address, size); // Get kernel instance. @@ -64,7 +64,7 @@ Result CreateCodeMemory(Core::System& system, Handle* out, VAddr address, uint64 } Result ControlCodeMemory(Core::System& system, Handle code_memory_handle, - CodeMemoryOperation operation, VAddr address, uint64_t size, + CodeMemoryOperation operation, u64 address, uint64_t size, MemoryPermission perm) { LOG_TRACE(Kernel_SVC, diff --git a/src/core/hle/kernel/svc/svc_condition_variable.cpp b/src/core/hle/kernel/svc/svc_condition_variable.cpp index 648ed23d0..ca120d67e 100644 --- a/src/core/hle/kernel/svc/svc_condition_variable.cpp +++ b/src/core/hle/kernel/svc/svc_condition_variable.cpp @@ -11,7 +11,7 @@ namespace Kernel::Svc { /// Wait process wide key atomic -Result WaitProcessWideKeyAtomic(Core::System& system, VAddr address, VAddr cv_key, u32 tag, +Result WaitProcessWideKeyAtomic(Core::System& system, u64 address, u64 cv_key, u32 tag, s64 timeout_ns) { LOG_TRACE(Kernel_SVC, "called address={:X}, cv_key={:X}, tag=0x{:08X}, timeout_ns={}", address, cv_key, tag, timeout_ns); @@ -43,7 +43,7 @@ Result WaitProcessWideKeyAtomic(Core::System& system, VAddr address, VAddr cv_ke } /// Signal process wide key -void SignalProcessWideKey(Core::System& system, VAddr cv_key, s32 count) { +void SignalProcessWideKey(Core::System& system, u64 cv_key, s32 count) { LOG_TRACE(Kernel_SVC, "called, cv_key=0x{:X}, count=0x{:08X}", cv_key, count); // Signal the condition variable. diff --git a/src/core/hle/kernel/svc/svc_debug_string.cpp b/src/core/hle/kernel/svc/svc_debug_string.cpp index d4bf062d1..8771d2b01 100644 --- a/src/core/hle/kernel/svc/svc_debug_string.cpp +++ b/src/core/hle/kernel/svc/svc_debug_string.cpp @@ -8,7 +8,7 @@ namespace Kernel::Svc { /// Used to output a message on a debug hardware unit - does nothing on a retail unit -Result OutputDebugString(Core::System& system, VAddr address, u64 len) { +Result OutputDebugString(Core::System& system, u64 address, u64 len) { R_SUCCEED_IF(len == 0); std::string str(len, '\0'); diff --git a/src/core/hle/kernel/svc/svc_exception.cpp b/src/core/hle/kernel/svc/svc_exception.cpp index c2782908d..4ab5f471f 100644 --- a/src/core/hle/kernel/svc/svc_exception.cpp +++ b/src/core/hle/kernel/svc/svc_exception.cpp @@ -20,7 +20,7 @@ void Break(Core::System& system, BreakReason reason, u64 info1, u64 info2) { bool has_dumped_buffer{}; std::vector debug_buffer; - const auto handle_debug_buffer = [&](VAddr addr, u64 sz) { + const auto handle_debug_buffer = [&](u64 addr, u64 sz) { if (sz == 0 || addr == 0 || has_dumped_buffer) { return; } diff --git a/src/core/hle/kernel/svc/svc_info.cpp b/src/core/hle/kernel/svc/svc_info.cpp index 04b6d6964..2b2c878b5 100644 --- a/src/core/hle/kernel/svc/svc_info.cpp +++ b/src/core/hle/kernel/svc/svc_info.cpp @@ -54,7 +54,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle R_SUCCEED(); case InfoType::AliasRegionAddress: - *result = process->PageTable().GetAliasRegionStart(); + *result = GetInteger(process->PageTable().GetAliasRegionStart()); R_SUCCEED(); case InfoType::AliasRegionSize: @@ -62,7 +62,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle R_SUCCEED(); case InfoType::HeapRegionAddress: - *result = process->PageTable().GetHeapRegionStart(); + *result = GetInteger(process->PageTable().GetHeapRegionStart()); R_SUCCEED(); case InfoType::HeapRegionSize: @@ -70,7 +70,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle R_SUCCEED(); case InfoType::AslrRegionAddress: - *result = process->PageTable().GetAliasCodeRegionStart(); + *result = GetInteger(process->PageTable().GetAliasCodeRegionStart()); R_SUCCEED(); case InfoType::AslrRegionSize: @@ -78,7 +78,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle R_SUCCEED(); case InfoType::StackRegionAddress: - *result = process->PageTable().GetStackRegionStart(); + *result = GetInteger(process->PageTable().GetStackRegionStart()); R_SUCCEED(); case InfoType::StackRegionSize: @@ -107,7 +107,7 @@ Result GetInfo(Core::System& system, u64* result, InfoType info_id_type, Handle R_SUCCEED(); case InfoType::UserExceptionContextAddress: - *result = process->GetProcessLocalRegionAddress(); + *result = GetInteger(process->GetProcessLocalRegionAddress()); R_SUCCEED(); case InfoType::TotalNonSystemMemorySize: diff --git a/src/core/hle/kernel/svc/svc_lock.cpp b/src/core/hle/kernel/svc/svc_lock.cpp index 3681279d6..1d7bc4246 100644 --- a/src/core/hle/kernel/svc/svc_lock.cpp +++ b/src/core/hle/kernel/svc/svc_lock.cpp @@ -9,7 +9,7 @@ namespace Kernel::Svc { /// Attempts to locks a mutex -Result ArbitrateLock(Core::System& system, Handle thread_handle, VAddr address, u32 tag) { +Result ArbitrateLock(Core::System& system, Handle thread_handle, u64 address, u32 tag) { LOG_TRACE(Kernel_SVC, "called thread_handle=0x{:08X}, address=0x{:X}, tag=0x{:08X}", thread_handle, address, tag); @@ -21,7 +21,7 @@ Result ArbitrateLock(Core::System& system, Handle thread_handle, VAddr address, } /// Unlock a mutex -Result ArbitrateUnlock(Core::System& system, VAddr address) { +Result ArbitrateUnlock(Core::System& system, u64 address) { LOG_TRACE(Kernel_SVC, "called address=0x{:X}", address); // Validate the input address. diff --git a/src/core/hle/kernel/svc/svc_memory.cpp b/src/core/hle/kernel/svc/svc_memory.cpp index 4db25a3b7..5dcb7f045 100644 --- a/src/core/hle/kernel/svc/svc_memory.cpp +++ b/src/core/hle/kernel/svc/svc_memory.cpp @@ -22,15 +22,14 @@ constexpr bool IsValidSetMemoryPermission(MemoryPermission perm) { // Checks if address + size is greater than the given address // This can return false if the size causes an overflow of a 64-bit type // or if the given size is zero. -constexpr bool IsValidAddressRange(VAddr address, u64 size) { +constexpr bool IsValidAddressRange(u64 address, u64 size) { return address + size > address; } // Helper function that performs the common sanity checks for svcMapMemory // and svcUnmapMemory. This is doable, as both functions perform their sanitizing // in the same order. -Result MapUnmapMemorySanityChecks(const KPageTable& manager, VAddr dst_addr, VAddr src_addr, - u64 size) { +Result MapUnmapMemorySanityChecks(const KPageTable& manager, u64 dst_addr, u64 src_addr, u64 size) { if (!Common::Is4KBAligned(dst_addr)) { LOG_ERROR(Kernel_SVC, "Destination address is not aligned to 4KB, 0x{:016X}", dst_addr); R_THROW(ResultInvalidAddress); @@ -99,7 +98,7 @@ Result MapUnmapMemorySanityChecks(const KPageTable& manager, VAddr dst_addr, VAd } // namespace -Result SetMemoryPermission(Core::System& system, VAddr address, u64 size, MemoryPermission perm) { +Result SetMemoryPermission(Core::System& system, u64 address, u64 size, MemoryPermission perm) { LOG_DEBUG(Kernel_SVC, "called, address=0x{:016X}, size=0x{:X}, perm=0x{:08X", address, size, perm); @@ -120,7 +119,7 @@ Result SetMemoryPermission(Core::System& system, VAddr address, u64 size, Memory R_RETURN(page_table.SetMemoryPermission(address, size, perm)); } -Result SetMemoryAttribute(Core::System& system, VAddr address, u64 size, u32 mask, u32 attr) { +Result SetMemoryAttribute(Core::System& system, u64 address, u64 size, u32 mask, u32 attr) { LOG_DEBUG(Kernel_SVC, "called, address=0x{:016X}, size=0x{:X}, mask=0x{:08X}, attribute=0x{:08X}", address, size, mask, attr); @@ -145,7 +144,7 @@ Result SetMemoryAttribute(Core::System& system, VAddr address, u64 size, u32 mas } /// Maps a memory range into a different range. -Result MapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size) { +Result MapMemory(Core::System& system, u64 dst_addr, u64 src_addr, u64 size) { LOG_TRACE(Kernel_SVC, "called, dst_addr=0x{:X}, src_addr=0x{:X}, size=0x{:X}", dst_addr, src_addr, size); @@ -160,7 +159,7 @@ Result MapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size) } /// Unmaps a region that was previously mapped with svcMapMemory -Result UnmapMemory(Core::System& system, VAddr dst_addr, VAddr src_addr, u64 size) { +Result UnmapMemory(Core::System& system, u64 dst_addr, u64 src_addr, u64 size) { LOG_TRACE(Kernel_SVC, "called, dst_addr=0x{:X}, src_addr=0x{:X}, size=0x{:X}", dst_addr, src_addr, size); diff --git a/src/core/hle/kernel/svc/svc_physical_memory.cpp b/src/core/hle/kernel/svc/svc_physical_memory.cpp index 63196e1ed..c2fbfb59a 100644 --- a/src/core/hle/kernel/svc/svc_physical_memory.cpp +++ b/src/core/hle/kernel/svc/svc_physical_memory.cpp @@ -8,7 +8,7 @@ namespace Kernel::Svc { /// Set the process heap to a given Size. It can both extend and shrink the heap. -Result SetHeapSize(Core::System& system, VAddr* out_address, u64 size) { +Result SetHeapSize(Core::System& system, u64* out_address, u64 size) { LOG_TRACE(Kernel_SVC, "called, heap_size=0x{:X}", size); // Validate size. @@ -20,7 +20,7 @@ Result SetHeapSize(Core::System& system, VAddr* out_address, u64 size) { } /// Maps memory at a desired address -Result MapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { +Result MapPhysicalMemory(Core::System& system, u64 addr, u64 size) { LOG_DEBUG(Kernel_SVC, "called, addr=0x{:016X}, size=0x{:X}", addr, size); if (!Common::Is4KBAligned(addr)) { @@ -69,7 +69,7 @@ Result MapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { } /// Unmaps memory previously mapped via MapPhysicalMemory -Result UnmapPhysicalMemory(Core::System& system, VAddr addr, u64 size) { +Result UnmapPhysicalMemory(Core::System& system, u64 addr, u64 size) { LOG_DEBUG(Kernel_SVC, "called, addr=0x{:016X}, size=0x{:X}", addr, size); if (!Common::Is4KBAligned(addr)) { diff --git a/src/core/hle/kernel/svc/svc_port.cpp b/src/core/hle/kernel/svc/svc_port.cpp index 0b5556bc4..c6eb70422 100644 --- a/src/core/hle/kernel/svc/svc_port.cpp +++ b/src/core/hle/kernel/svc/svc_port.cpp @@ -12,7 +12,7 @@ namespace Kernel::Svc { -Result ConnectToNamedPort(Core::System& system, Handle* out, VAddr user_name) { +Result ConnectToNamedPort(Core::System& system, Handle* out, u64 user_name) { // Copy the provided name from user memory to kernel memory. auto string_name = system.Memory().ReadCString(user_name, KObjectName::NameLengthMax); diff --git a/src/core/hle/kernel/svc/svc_process.cpp b/src/core/hle/kernel/svc/svc_process.cpp index b538c37e7..3c3579947 100644 --- a/src/core/hle/kernel/svc/svc_process.cpp +++ b/src/core/hle/kernel/svc/svc_process.cpp @@ -50,7 +50,7 @@ Result GetProcessId(Core::System& system, u64* out_process_id, Handle handle) { R_SUCCEED(); } -Result GetProcessList(Core::System& system, s32* out_num_processes, VAddr out_process_ids, +Result GetProcessList(Core::System& system, s32* out_num_processes, u64 out_process_ids, int32_t out_process_ids_size) { LOG_DEBUG(Kernel_SVC, "called. out_process_ids=0x{:016X}, out_process_ids_size={}", out_process_ids, out_process_ids_size); diff --git a/src/core/hle/kernel/svc/svc_process_memory.cpp b/src/core/hle/kernel/svc/svc_process_memory.cpp index f9210ca1e..aee0f2f36 100644 --- a/src/core/hle/kernel/svc/svc_process_memory.cpp +++ b/src/core/hle/kernel/svc/svc_process_memory.cpp @@ -8,7 +8,7 @@ namespace Kernel::Svc { namespace { -constexpr bool IsValidAddressRange(VAddr address, u64 size) { +constexpr bool IsValidAddressRange(u64 address, u64 size) { return address + size > address; } @@ -26,7 +26,7 @@ constexpr bool IsValidProcessMemoryPermission(Svc::MemoryPermission perm) { } // namespace -Result SetProcessMemoryPermission(Core::System& system, Handle process_handle, VAddr address, +Result SetProcessMemoryPermission(Core::System& system, Handle process_handle, u64 address, u64 size, Svc::MemoryPermission perm) { LOG_TRACE(Kernel_SVC, "called, process_handle=0x{:X}, addr=0x{:X}, size=0x{:X}, permissions=0x{:08X}", @@ -56,8 +56,8 @@ Result SetProcessMemoryPermission(Core::System& system, Handle process_handle, V R_RETURN(page_table.SetProcessMemoryPermission(address, size, perm)); } -Result MapProcessMemory(Core::System& system, VAddr dst_address, Handle process_handle, - VAddr src_address, u64 size) { +Result MapProcessMemory(Core::System& system, u64 dst_address, Handle process_handle, + u64 src_address, u64 size) { LOG_TRACE(Kernel_SVC, "called, dst_address=0x{:X}, process_handle=0x{:X}, src_address=0x{:X}, size=0x{:X}", dst_address, process_handle, src_address, size); @@ -97,8 +97,8 @@ Result MapProcessMemory(Core::System& system, VAddr dst_address, Handle process_ KMemoryPermission::UserReadWrite)); } -Result UnmapProcessMemory(Core::System& system, VAddr dst_address, Handle process_handle, - VAddr src_address, u64 size) { +Result UnmapProcessMemory(Core::System& system, u64 dst_address, Handle process_handle, + u64 src_address, u64 size) { LOG_TRACE(Kernel_SVC, "called, dst_address=0x{:X}, process_handle=0x{:X}, src_address=0x{:X}, size=0x{:X}", dst_address, process_handle, src_address, size); diff --git a/src/core/hle/kernel/svc/svc_query_memory.cpp b/src/core/hle/kernel/svc/svc_query_memory.cpp index 457ebf950..5db5611f0 100644 --- a/src/core/hle/kernel/svc/svc_query_memory.cpp +++ b/src/core/hle/kernel/svc/svc_query_memory.cpp @@ -8,7 +8,7 @@ namespace Kernel::Svc { Result QueryMemory(Core::System& system, uint64_t out_memory_info, PageInfo* out_page_info, - VAddr query_address) { + u64 query_address) { LOG_TRACE(Kernel_SVC, "called, out_memory_info=0x{:016X}, " "query_address=0x{:016X}", diff --git a/src/core/hle/kernel/svc/svc_shared_memory.cpp b/src/core/hle/kernel/svc/svc_shared_memory.cpp index 40d878f17..a698596aa 100644 --- a/src/core/hle/kernel/svc/svc_shared_memory.cpp +++ b/src/core/hle/kernel/svc/svc_shared_memory.cpp @@ -26,7 +26,7 @@ constexpr bool IsValidSharedMemoryPermission(MemoryPermission perm) { } // namespace -Result MapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, u64 size, +Result MapSharedMemory(Core::System& system, Handle shmem_handle, u64 address, u64 size, Svc::MemoryPermission map_perm) { LOG_TRACE(Kernel_SVC, "called, shared_memory_handle=0x{:X}, addr=0x{:X}, size=0x{:X}, permissions=0x{:08X}", @@ -64,7 +64,7 @@ Result MapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, R_RETURN(shmem->Map(process, address, size, map_perm)); } -Result UnmapSharedMemory(Core::System& system, Handle shmem_handle, VAddr address, u64 size) { +Result UnmapSharedMemory(Core::System& system, Handle shmem_handle, u64 address, u64 size) { // Validate the address/size. R_UNLESS(Common::IsAligned(address, PageSize), ResultInvalidAddress); R_UNLESS(Common::IsAligned(size, PageSize), ResultInvalidSize); diff --git a/src/core/hle/kernel/svc/svc_synchronization.cpp b/src/core/hle/kernel/svc/svc_synchronization.cpp index 660b45c23..e490a13ae 100644 --- a/src/core/hle/kernel/svc/svc_synchronization.cpp +++ b/src/core/hle/kernel/svc/svc_synchronization.cpp @@ -80,7 +80,7 @@ static Result WaitSynchronization(Core::System& system, int32_t* out_index, cons } /// Wait for the given handles to synchronize, timeout after the specified nanoseconds -Result WaitSynchronization(Core::System& system, int32_t* out_index, VAddr user_handles, +Result WaitSynchronization(Core::System& system, int32_t* out_index, u64 user_handles, int32_t num_handles, int64_t timeout_ns) { LOG_TRACE(Kernel_SVC, "called user_handles={:#x}, num_handles={}, timeout_ns={}", user_handles, num_handles, timeout_ns); diff --git a/src/core/hle/kernel/svc/svc_thread.cpp b/src/core/hle/kernel/svc/svc_thread.cpp index 50991fb62..0be4858a2 100644 --- a/src/core/hle/kernel/svc/svc_thread.cpp +++ b/src/core/hle/kernel/svc/svc_thread.cpp @@ -19,8 +19,8 @@ constexpr bool IsValidVirtualCoreId(int32_t core_id) { } // Anonymous namespace /// Creates a new thread -Result CreateThread(Core::System& system, Handle* out_handle, VAddr entry_point, u64 arg, - VAddr stack_bottom, s32 priority, s32 core_id) { +Result CreateThread(Core::System& system, Handle* out_handle, u64 entry_point, u64 arg, + u64 stack_bottom, s32 priority, s32 core_id) { LOG_DEBUG(Kernel_SVC, "called entry_point=0x{:08X}, arg=0x{:08X}, stack_bottom=0x{:08X}, " "priority=0x{:08X}, core_id=0x{:08X}", @@ -129,7 +129,7 @@ void SleepThread(Core::System& system, s64 nanoseconds) { } /// Gets the thread context -Result GetThreadContext3(Core::System& system, VAddr out_context, Handle thread_handle) { +Result GetThreadContext3(Core::System& system, u64 out_context, Handle thread_handle) { LOG_DEBUG(Kernel_SVC, "called, out_context=0x{:08X}, thread_handle=0x{:X}", out_context, thread_handle); @@ -217,7 +217,7 @@ Result SetThreadPriority(Core::System& system, Handle thread_handle, s32 priorit R_SUCCEED(); } -Result GetThreadList(Core::System& system, s32* out_num_threads, VAddr out_thread_ids, +Result GetThreadList(Core::System& system, s32* out_num_threads, u64 out_thread_ids, s32 out_thread_ids_size, Handle debug_handle) { // TODO: Handle this case when debug events are supported. UNIMPLEMENTED_IF(debug_handle != InvalidHandle); diff --git a/src/core/hle/kernel/svc/svc_transfer_memory.cpp b/src/core/hle/kernel/svc/svc_transfer_memory.cpp index 394f06728..82d469a37 100644 --- a/src/core/hle/kernel/svc/svc_transfer_memory.cpp +++ b/src/core/hle/kernel/svc/svc_transfer_memory.cpp @@ -25,7 +25,7 @@ constexpr bool IsValidTransferMemoryPermission(MemoryPermission perm) { } // Anonymous namespace /// Creates a TransferMemory object -Result CreateTransferMemory(Core::System& system, Handle* out, VAddr address, u64 size, +Result CreateTransferMemory(Core::System& system, Handle* out, u64 address, u64 size, MemoryPermission map_perm) { auto& kernel = system.Kernel(); diff --git a/src/core/hle/kernel/svc_types.h b/src/core/hle/kernel/svc_types.h index 39355d9c4..7f380ca4f 100644 --- a/src/core/hle/kernel/svc_types.h +++ b/src/core/hle/kernel/svc_types.h @@ -253,7 +253,7 @@ struct LastThreadContext { }; struct PhysicalMemoryInfo { - PAddr physical_address; + u64 physical_address; u64 virtual_address; u64 size; }; @@ -359,7 +359,7 @@ struct LastThreadContext { }; struct PhysicalMemoryInfo { - PAddr physical_address; + u64 physical_address; u32 virtual_address; u32 size; }; diff --git a/src/core/hle/service/hid/controllers/console_sixaxis.cpp b/src/core/hle/service/hid/controllers/console_sixaxis.cpp index 478d38590..37f2e4405 100644 --- a/src/core/hle/service/hid/controllers/console_sixaxis.cpp +++ b/src/core/hle/service/hid/controllers/console_sixaxis.cpp @@ -63,7 +63,7 @@ void Controller_ConsoleSixAxis::OnUpdate(const Core::Timing::CoreTiming& core_ti system.Memory().WriteBlock(transfer_memory, &seven_sixaxis_lifo, sizeof(seven_sixaxis_lifo)); } -void Controller_ConsoleSixAxis::SetTransferMemoryAddress(VAddr t_mem) { +void Controller_ConsoleSixAxis::SetTransferMemoryAddress(Common::ProcessAddress t_mem) { transfer_memory = t_mem; } diff --git a/src/core/hle/service/hid/controllers/console_sixaxis.h b/src/core/hle/service/hid/controllers/console_sixaxis.h index 8d3e4081b..7015d924c 100644 --- a/src/core/hle/service/hid/controllers/console_sixaxis.h +++ b/src/core/hle/service/hid/controllers/console_sixaxis.h @@ -5,8 +5,8 @@ #include -#include "common/common_types.h" #include "common/quaternion.h" +#include "common/typed_address.h" #include "core/hle/service/hid/controllers/controller_base.h" #include "core/hle/service/hid/ring_lifo.h" @@ -34,7 +34,7 @@ public: void OnUpdate(const Core::Timing::CoreTiming& core_timing) override; // Called on InitializeSevenSixAxisSensor - void SetTransferMemoryAddress(VAddr t_mem); + void SetTransferMemoryAddress(Common::ProcessAddress t_mem); // Called on ResetSevenSixAxisSensorTimestamp void ResetTimestamp(); @@ -66,7 +66,7 @@ private: static_assert(sizeof(seven_sixaxis_lifo) == 0xA70, "SevenSixAxisState is an invalid size"); SevenSixAxisState next_seven_sixaxis_state{}; - VAddr transfer_memory{}; + Common::ProcessAddress transfer_memory{}; ConsoleSharedMemory* shared_memory = nullptr; Core::HID::EmulatedConsole* console = nullptr; diff --git a/src/core/hle/service/hid/controllers/palma.cpp b/src/core/hle/service/hid/controllers/palma.cpp index bce51285c..14c67e454 100644 --- a/src/core/hle/service/hid/controllers/palma.cpp +++ b/src/core/hle/service/hid/controllers/palma.cpp @@ -152,7 +152,7 @@ Result Controller_Palma::WritePalmaRgbLedPatternEntry(const PalmaConnectionHandl } Result Controller_Palma::WritePalmaWaveEntry(const PalmaConnectionHandle& handle, PalmaWaveSet wave, - VAddr t_mem, u64 size) { + Common::ProcessAddress t_mem, u64 size) { if (handle.npad_id != active_handle.npad_id) { return InvalidPalmaHandle; } diff --git a/src/core/hle/service/hid/controllers/palma.h b/src/core/hle/service/hid/controllers/palma.h index cf62f0dbc..a0491a819 100644 --- a/src/core/hle/service/hid/controllers/palma.h +++ b/src/core/hle/service/hid/controllers/palma.h @@ -5,7 +5,7 @@ #include #include "common/common_funcs.h" -#include "common/common_types.h" +#include "common/typed_address.h" #include "core/hle/service/hid/controllers/controller_base.h" #include "core/hle/service/hid/errors.h" @@ -125,8 +125,8 @@ public: Result ReadPalmaUniqueCode(const PalmaConnectionHandle& handle); Result SetPalmaUniqueCodeInvalid(const PalmaConnectionHandle& handle); Result WritePalmaRgbLedPatternEntry(const PalmaConnectionHandle& handle, u64 unknown); - Result WritePalmaWaveEntry(const PalmaConnectionHandle& handle, PalmaWaveSet wave, VAddr t_mem, - u64 size); + Result WritePalmaWaveEntry(const PalmaConnectionHandle& handle, PalmaWaveSet wave, + Common::ProcessAddress t_mem, u64 size); Result SetPalmaDataBaseIdentificationVersion(const PalmaConnectionHandle& handle, s32 database_id_version_); Result GetPalmaDataBaseIdentificationVersion(const PalmaConnectionHandle& handle); diff --git a/src/core/hle/service/hid/hidbus/hidbus_base.cpp b/src/core/hle/service/hid/hidbus/hidbus_base.cpp index dfd23ec04..ee522c36e 100644 --- a/src/core/hle/service/hid/hidbus/hidbus_base.cpp +++ b/src/core/hle/service/hid/hidbus/hidbus_base.cpp @@ -59,7 +59,7 @@ void HidbusBase::DisablePollingMode() { polling_mode_enabled = false; } -void HidbusBase::SetTransferMemoryAddress(VAddr t_mem) { +void HidbusBase::SetTransferMemoryAddress(Common::ProcessAddress t_mem) { transfer_memory = t_mem; } diff --git a/src/core/hle/service/hid/hidbus/hidbus_base.h b/src/core/hle/service/hid/hidbus/hidbus_base.h index 26313264d..ec41684e1 100644 --- a/src/core/hle/service/hid/hidbus/hidbus_base.h +++ b/src/core/hle/service/hid/hidbus/hidbus_base.h @@ -5,7 +5,7 @@ #include #include -#include "common/common_types.h" +#include "common/typed_address.h" #include "core/hle/result.h" namespace Core { @@ -138,7 +138,7 @@ public: void DisablePollingMode(); // Called on EnableJoyPollingReceiveMode - void SetTransferMemoryAddress(VAddr t_mem); + void SetTransferMemoryAddress(Common::ProcessAddress t_mem); Kernel::KReadableEvent& GetSendCommandAsycEvent() const; @@ -174,7 +174,7 @@ protected: JoyEnableSixAxisDataAccessor enable_sixaxis_data{}; ButtonOnlyPollingDataAccessor button_only_data{}; - VAddr transfer_memory{}; + Common::ProcessAddress transfer_memory{}; Core::System& system; Kernel::KEvent* send_command_async_event; diff --git a/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp b/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp index a268750cd..ca5d067e8 100644 --- a/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp +++ b/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp @@ -140,7 +140,7 @@ void ImageTransferProcessor::SetConfig( npad_device->SetCameraFormat(current_config.origin_format); } -void ImageTransferProcessor::SetTransferMemoryAddress(VAddr t_mem) { +void ImageTransferProcessor::SetTransferMemoryAddress(Common::ProcessAddress t_mem) { transfer_memory = t_mem; } diff --git a/src/core/hle/service/hid/irsensor/image_transfer_processor.h b/src/core/hle/service/hid/irsensor/image_transfer_processor.h index 7cfe04c8c..7f42d8453 100644 --- a/src/core/hle/service/hid/irsensor/image_transfer_processor.h +++ b/src/core/hle/service/hid/irsensor/image_transfer_processor.h @@ -3,7 +3,7 @@ #pragma once -#include "common/common_types.h" +#include "common/typed_address.h" #include "core/hid/irs_types.h" #include "core/hle/service/hid/irsensor/processor_base.h" @@ -37,7 +37,7 @@ public: void SetConfig(Core::IrSensor::PackedImageTransferProcessorExConfig config); // Transfer memory where the image data will be stored - void SetTransferMemoryAddress(VAddr t_mem); + void SetTransferMemoryAddress(Common::ProcessAddress t_mem); Core::IrSensor::ImageTransferProcessorState GetState(std::vector& data) const; @@ -72,6 +72,6 @@ private: int callback_key{}; Core::System& system; - VAddr transfer_memory{}; + Common::ProcessAddress transfer_memory{}; }; } // namespace Service::IRS diff --git a/src/core/hle/service/jit/jit.cpp b/src/core/hle/service/jit/jit.cpp index 46bcfd695..607f27b21 100644 --- a/src/core/hle/service/jit/jit.cpp +++ b/src/core/hle/service/jit/jit.cpp @@ -195,7 +195,7 @@ public: } // Set up the configuration with the required TransferMemory address - configuration.transfer_memory.offset = tmem->GetSourceAddress(); + configuration.transfer_memory.offset = GetInteger(tmem->GetSourceAddress()); configuration.transfer_memory.size = tmem_size; // Gather up all the callbacks from the loaded plugin @@ -383,12 +383,12 @@ public: } const CodeRange user_rx{ - .offset = rx_mem->GetSourceAddress(), + .offset = GetInteger(rx_mem->GetSourceAddress()), .size = parameters.rx_size, }; const CodeRange user_ro{ - .offset = ro_mem->GetSourceAddress(), + .offset = GetInteger(ro_mem->GetSourceAddress()), .size = parameters.ro_size, }; diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index 6de96ed5b..437dc2ea5 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp @@ -337,7 +337,7 @@ public: bool succeeded = false; const auto map_region_end = - page_table.GetAliasCodeRegionStart() + page_table.GetAliasCodeRegionSize(); + GetInteger(page_table.GetAliasCodeRegionStart()) + page_table.GetAliasCodeRegionSize(); while (current_map_addr < map_region_end) { if (is_region_available(current_map_addr)) { succeeded = true; @@ -642,7 +642,8 @@ public: LOG_WARNING(Service_LDR, "(STUBBED) called"); initialized = true; - current_map_addr = system.ApplicationProcess()->PageTable().GetAliasCodeRegionStart(); + current_map_addr = + GetInteger(system.ApplicationProcess()->PageTable().GetAliasCodeRegionStart()); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp index 192571d35..3be9b71cf 100644 --- a/src/core/loader/deconstructed_rom_directory.cpp +++ b/src/core/loader/deconstructed_rom_directory.cpp @@ -153,7 +153,7 @@ AppLoader_DeconstructedRomDirectory::LoadResult AppLoader_DeconstructedRomDirect // Load NSO modules modules.clear(); - const VAddr base_address{process.PageTable().GetCodeRegionStart()}; + const VAddr base_address{GetInteger(process.PageTable().GetCodeRegionStart())}; VAddr next_load_addr{base_address}; const FileSys::PatchManager pm{metadata.GetTitleID(), system.GetFileSystemController(), system.GetContentProvider()}; diff --git a/src/core/loader/kip.cpp b/src/core/loader/kip.cpp index d8a1bf82a..709e2564f 100644 --- a/src/core/loader/kip.cpp +++ b/src/core/loader/kip.cpp @@ -96,7 +96,7 @@ AppLoader::LoadResult AppLoader_KIP::Load(Kernel::KProcess& process, } codeset.memory = std::move(program_image); - const VAddr base_address = process.PageTable().GetCodeRegionStart(); + const VAddr base_address = GetInteger(process.PageTable().GetCodeRegionStart()); process.LoadModule(std::move(codeset), base_address); LOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", kip->GetName(), base_address); diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index a5c384fb5..79639f5e4 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp @@ -167,7 +167,7 @@ AppLoader_NSO::LoadResult AppLoader_NSO::Load(Kernel::KProcess& process, Core::S modules.clear(); // Load module - const VAddr base_address = process.PageTable().GetCodeRegionStart(); + const VAddr base_address = GetInteger(process.PageTable().GetCodeRegionStart()); if (!LoadModule(process, system, *file, base_address, true, true)) { return {ResultStatus::ErrorLoadingNSO, {}}; } diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 4397fcfb1..95e070825 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -35,31 +35,35 @@ struct Memory::Impl { system.ArmInterface(core_id).PageTableChanged(*current_page_table, address_space_width); } - void MapMemoryRegion(Common::PageTable& page_table, VAddr base, u64 size, PAddr target) { + void MapMemoryRegion(Common::PageTable& page_table, Common::ProcessAddress base, u64 size, + Common::PhysicalAddress target) { ASSERT_MSG((size & YUZU_PAGEMASK) == 0, "non-page aligned size: {:016X}", size); - ASSERT_MSG((base & YUZU_PAGEMASK) == 0, "non-page aligned base: {:016X}", base); - ASSERT_MSG(target >= DramMemoryMap::Base, "Out of bounds target: {:016X}", target); + ASSERT_MSG((base & YUZU_PAGEMASK) == 0, "non-page aligned base: {:016X}", GetInteger(base)); + ASSERT_MSG(target >= DramMemoryMap::Base, "Out of bounds target: {:016X}", + GetInteger(target)); MapPages(page_table, base / YUZU_PAGESIZE, size / YUZU_PAGESIZE, target, Common::PageType::Memory); if (Settings::IsFastmemEnabled()) { - system.DeviceMemory().buffer.Map(base, target - DramMemoryMap::Base, size); + system.DeviceMemory().buffer.Map(GetInteger(base), + GetInteger(target) - DramMemoryMap::Base, size); } } - void UnmapRegion(Common::PageTable& page_table, VAddr base, u64 size) { + void UnmapRegion(Common::PageTable& page_table, Common::ProcessAddress base, u64 size) { ASSERT_MSG((size & YUZU_PAGEMASK) == 0, "non-page aligned size: {:016X}", size); - ASSERT_MSG((base & YUZU_PAGEMASK) == 0, "non-page aligned base: {:016X}", base); + ASSERT_MSG((base & YUZU_PAGEMASK) == 0, "non-page aligned base: {:016X}", GetInteger(base)); MapPages(page_table, base / YUZU_PAGESIZE, size / YUZU_PAGESIZE, 0, Common::PageType::Unmapped); if (Settings::IsFastmemEnabled()) { - system.DeviceMemory().buffer.Unmap(base, size); + system.DeviceMemory().buffer.Unmap(GetInteger(base), size); } } - [[nodiscard]] u8* GetPointerFromRasterizerCachedMemory(VAddr vaddr) const { - const PAddr paddr{current_page_table->backing_addr[vaddr >> YUZU_PAGEBITS]}; + [[nodiscard]] u8* GetPointerFromRasterizerCachedMemory(u64 vaddr) const { + const Common::PhysicalAddress paddr{ + current_page_table->backing_addr[vaddr >> YUZU_PAGEBITS]}; if (!paddr) { return {}; @@ -68,8 +72,9 @@ struct Memory::Impl { return system.DeviceMemory().GetPointer(paddr) + vaddr; } - [[nodiscard]] u8* GetPointerFromDebugMemory(VAddr vaddr) const { - const PAddr paddr{current_page_table->backing_addr[vaddr >> YUZU_PAGEBITS]}; + [[nodiscard]] u8* GetPointerFromDebugMemory(u64 vaddr) const { + const Common::PhysicalAddress paddr{ + current_page_table->backing_addr[vaddr >> YUZU_PAGEBITS]}; if (paddr == 0) { return {}; @@ -78,11 +83,11 @@ struct Memory::Impl { return system.DeviceMemory().GetPointer(paddr) + vaddr; } - u8 Read8(const VAddr addr) { + u8 Read8(const Common::ProcessAddress addr) { return Read(addr); } - u16 Read16(const VAddr addr) { + u16 Read16(const Common::ProcessAddress addr) { if ((addr & 1) == 0) { return Read(addr); } else { @@ -92,7 +97,7 @@ struct Memory::Impl { } } - u32 Read32(const VAddr addr) { + u32 Read32(const Common::ProcessAddress addr) { if ((addr & 3) == 0) { return Read(addr); } else { @@ -102,7 +107,7 @@ struct Memory::Impl { } } - u64 Read64(const VAddr addr) { + u64 Read64(const Common::ProcessAddress addr) { if ((addr & 7) == 0) { return Read(addr); } else { @@ -112,11 +117,11 @@ struct Memory::Impl { } } - void Write8(const VAddr addr, const u8 data) { + void Write8(const Common::ProcessAddress addr, const u8 data) { Write(addr, data); } - void Write16(const VAddr addr, const u16 data) { + void Write16(const Common::ProcessAddress addr, const u16 data) { if ((addr & 1) == 0) { Write(addr, data); } else { @@ -125,7 +130,7 @@ struct Memory::Impl { } } - void Write32(const VAddr addr, const u32 data) { + void Write32(const Common::ProcessAddress addr, const u32 data) { if ((addr & 3) == 0) { Write(addr, data); } else { @@ -134,7 +139,7 @@ struct Memory::Impl { } } - void Write64(const VAddr addr, const u64 data) { + void Write64(const Common::ProcessAddress addr, const u64 data) { if ((addr & 7) == 0) { Write(addr, data); } else { @@ -143,23 +148,23 @@ struct Memory::Impl { } } - bool WriteExclusive8(const VAddr addr, const u8 data, const u8 expected) { + bool WriteExclusive8(const Common::ProcessAddress addr, const u8 data, const u8 expected) { return WriteExclusive(addr, data, expected); } - bool WriteExclusive16(const VAddr addr, const u16 data, const u16 expected) { + bool WriteExclusive16(const Common::ProcessAddress addr, const u16 data, const u16 expected) { return WriteExclusive(addr, data, expected); } - bool WriteExclusive32(const VAddr addr, const u32 data, const u32 expected) { + bool WriteExclusive32(const Common::ProcessAddress addr, const u32 data, const u32 expected) { return WriteExclusive(addr, data, expected); } - bool WriteExclusive64(const VAddr addr, const u64 data, const u64 expected) { + bool WriteExclusive64(const Common::ProcessAddress addr, const u64 data, const u64 expected) { return WriteExclusive(addr, data, expected); } - std::string ReadCString(VAddr vaddr, std::size_t max_length) { + std::string ReadCString(Common::ProcessAddress vaddr, std::size_t max_length) { std::string string; string.reserve(max_length); for (std::size_t i = 0; i < max_length; ++i) { @@ -174,8 +179,9 @@ struct Memory::Impl { return string; } - void WalkBlock(const Kernel::KProcess& process, const VAddr addr, const std::size_t size, - auto on_unmapped, auto on_memory, auto on_rasterizer, auto increment) { + void WalkBlock(const Kernel::KProcess& process, const Common::ProcessAddress addr, + const std::size_t size, auto on_unmapped, auto on_memory, auto on_rasterizer, + auto increment) { const auto& page_table = process.PageTable().PageTableImpl(); std::size_t remaining_size = size; std::size_t page_index = addr >> YUZU_PAGEBITS; @@ -185,7 +191,7 @@ struct Memory::Impl { const std::size_t copy_amount = std::min(static_cast(YUZU_PAGESIZE) - page_offset, remaining_size); const auto current_vaddr = - static_cast((page_index << YUZU_PAGEBITS) + page_offset); + static_cast((page_index << YUZU_PAGEBITS) + page_offset); const auto [pointer, type] = page_table.pointers[page_index].PointerType(); switch (type) { @@ -220,24 +226,24 @@ struct Memory::Impl { } template - void ReadBlockImpl(const Kernel::KProcess& process, const VAddr src_addr, void* dest_buffer, - const std::size_t size) { + void ReadBlockImpl(const Kernel::KProcess& process, const Common::ProcessAddress src_addr, + void* dest_buffer, const std::size_t size) { WalkBlock( process, src_addr, size, [src_addr, size, &dest_buffer](const std::size_t copy_amount, - const VAddr current_vaddr) { + const Common::ProcessAddress current_vaddr) { LOG_ERROR(HW_Memory, "Unmapped ReadBlock @ 0x{:016X} (start address = 0x{:016X}, size = {})", - current_vaddr, src_addr, size); + GetInteger(current_vaddr), GetInteger(src_addr), size); std::memset(dest_buffer, 0, copy_amount); }, [&](const std::size_t copy_amount, const u8* const src_ptr) { std::memcpy(dest_buffer, src_ptr, copy_amount); }, - [&](const VAddr current_vaddr, const std::size_t copy_amount, + [&](const Common::ProcessAddress current_vaddr, const std::size_t copy_amount, const u8* const host_ptr) { if constexpr (!UNSAFE) { - system.GPU().FlushRegion(current_vaddr, copy_amount); + system.GPU().FlushRegion(GetInteger(current_vaddr), copy_amount); } std::memcpy(dest_buffer, host_ptr, copy_amount); }, @@ -246,30 +252,34 @@ struct Memory::Impl { }); } - void ReadBlock(const VAddr src_addr, void* dest_buffer, const std::size_t size) { + void ReadBlock(const Common::ProcessAddress src_addr, void* dest_buffer, + const std::size_t size) { ReadBlockImpl(*system.ApplicationProcess(), src_addr, dest_buffer, size); } - void ReadBlockUnsafe(const VAddr src_addr, void* dest_buffer, const std::size_t size) { + void ReadBlockUnsafe(const Common::ProcessAddress src_addr, void* dest_buffer, + const std::size_t size) { ReadBlockImpl(*system.ApplicationProcess(), src_addr, dest_buffer, size); } template - void WriteBlockImpl(const Kernel::KProcess& process, const VAddr dest_addr, + void WriteBlockImpl(const Kernel::KProcess& process, const Common::ProcessAddress dest_addr, const void* src_buffer, const std::size_t size) { WalkBlock( process, dest_addr, size, - [dest_addr, size](const std::size_t copy_amount, const VAddr current_vaddr) { + [dest_addr, size](const std::size_t copy_amount, + const Common::ProcessAddress current_vaddr) { LOG_ERROR(HW_Memory, "Unmapped WriteBlock @ 0x{:016X} (start address = 0x{:016X}, size = {})", - current_vaddr, dest_addr, size); + GetInteger(current_vaddr), GetInteger(dest_addr), size); }, [&](const std::size_t copy_amount, u8* const dest_ptr) { std::memcpy(dest_ptr, src_buffer, copy_amount); }, - [&](const VAddr current_vaddr, const std::size_t copy_amount, u8* const host_ptr) { + [&](const Common::ProcessAddress current_vaddr, const std::size_t copy_amount, + u8* const host_ptr) { if constexpr (!UNSAFE) { - system.GPU().InvalidateRegion(current_vaddr, copy_amount); + system.GPU().InvalidateRegion(GetInteger(current_vaddr), copy_amount); } std::memcpy(host_ptr, src_buffer, copy_amount); }, @@ -278,71 +288,77 @@ struct Memory::Impl { }); } - void WriteBlock(const VAddr dest_addr, const void* src_buffer, const std::size_t size) { + void WriteBlock(const Common::ProcessAddress dest_addr, const void* src_buffer, + const std::size_t size) { WriteBlockImpl(*system.ApplicationProcess(), dest_addr, src_buffer, size); } - void WriteBlockUnsafe(const VAddr dest_addr, const void* src_buffer, const std::size_t size) { + void WriteBlockUnsafe(const Common::ProcessAddress dest_addr, const void* src_buffer, + const std::size_t size) { WriteBlockImpl(*system.ApplicationProcess(), dest_addr, src_buffer, size); } - void ZeroBlock(const Kernel::KProcess& process, const VAddr dest_addr, const std::size_t size) { + void ZeroBlock(const Kernel::KProcess& process, const Common::ProcessAddress dest_addr, + const std::size_t size) { WalkBlock( process, dest_addr, size, - [dest_addr, size](const std::size_t copy_amount, const VAddr current_vaddr) { + [dest_addr, size](const std::size_t copy_amount, + const Common::ProcessAddress current_vaddr) { LOG_ERROR(HW_Memory, "Unmapped ZeroBlock @ 0x{:016X} (start address = 0x{:016X}, size = {})", - current_vaddr, dest_addr, size); + GetInteger(current_vaddr), GetInteger(dest_addr), size); }, [](const std::size_t copy_amount, u8* const dest_ptr) { std::memset(dest_ptr, 0, copy_amount); }, - [&](const VAddr current_vaddr, const std::size_t copy_amount, u8* const host_ptr) { - system.GPU().InvalidateRegion(current_vaddr, copy_amount); + [&](const Common::ProcessAddress current_vaddr, const std::size_t copy_amount, + u8* const host_ptr) { + system.GPU().InvalidateRegion(GetInteger(current_vaddr), copy_amount); std::memset(host_ptr, 0, copy_amount); }, [](const std::size_t copy_amount) {}); } - void CopyBlock(const Kernel::KProcess& process, VAddr dest_addr, VAddr src_addr, - const std::size_t size) { + void CopyBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, + Common::ProcessAddress src_addr, const std::size_t size) { WalkBlock( process, dest_addr, size, - [&](const std::size_t copy_amount, const VAddr current_vaddr) { + [&](const std::size_t copy_amount, const Common::ProcessAddress current_vaddr) { LOG_ERROR(HW_Memory, "Unmapped CopyBlock @ 0x{:016X} (start address = 0x{:016X}, size = {})", - current_vaddr, src_addr, size); + GetInteger(current_vaddr), GetInteger(src_addr), size); ZeroBlock(process, dest_addr, copy_amount); }, [&](const std::size_t copy_amount, const u8* const src_ptr) { WriteBlockImpl(process, dest_addr, src_ptr, copy_amount); }, - [&](const VAddr current_vaddr, const std::size_t copy_amount, u8* const host_ptr) { - system.GPU().FlushRegion(current_vaddr, copy_amount); + [&](const Common::ProcessAddress current_vaddr, const std::size_t copy_amount, + u8* const host_ptr) { + system.GPU().FlushRegion(GetInteger(current_vaddr), copy_amount); WriteBlockImpl(process, dest_addr, host_ptr, copy_amount); }, [&](const std::size_t copy_amount) { - dest_addr += static_cast(copy_amount); - src_addr += static_cast(copy_amount); + dest_addr += copy_amount; + src_addr += copy_amount; }); } template - Result PerformCacheOperation(const Kernel::KProcess& process, VAddr dest_addr, std::size_t size, - Callback&& cb) { + Result PerformCacheOperation(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, + std::size_t size, Callback&& cb) { class InvalidMemoryException : public std::exception {}; try { WalkBlock( process, dest_addr, size, - [&](const std::size_t block_size, const VAddr current_vaddr) { - LOG_ERROR(HW_Memory, "Unmapped cache maintenance @ {:#018X}", current_vaddr); + [&](const std::size_t block_size, const Common::ProcessAddress current_vaddr) { + LOG_ERROR(HW_Memory, "Unmapped cache maintenance @ {:#018X}", + GetInteger(current_vaddr)); throw InvalidMemoryException(); }, [&](const std::size_t block_size, u8* const host_ptr) {}, - [&](const VAddr current_vaddr, const std::size_t block_size, u8* const host_ptr) { - cb(current_vaddr, block_size); - }, + [&](const Common::ProcessAddress current_vaddr, const std::size_t block_size, + u8* const host_ptr) { cb(current_vaddr, block_size); }, [](const std::size_t block_size) {}); } catch (InvalidMemoryException&) { return Kernel::ResultInvalidCurrentMemory; @@ -351,34 +367,40 @@ struct Memory::Impl { return ResultSuccess; } - Result InvalidateDataCache(const Kernel::KProcess& process, VAddr dest_addr, std::size_t size) { - auto on_rasterizer = [&](const VAddr current_vaddr, const std::size_t block_size) { + Result InvalidateDataCache(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, + std::size_t size) { + auto on_rasterizer = [&](const Common::ProcessAddress current_vaddr, + const std::size_t block_size) { // dc ivac: Invalidate to point of coherency // GPU flush -> CPU invalidate - system.GPU().FlushRegion(current_vaddr, block_size); + system.GPU().FlushRegion(GetInteger(current_vaddr), block_size); }; return PerformCacheOperation(process, dest_addr, size, on_rasterizer); } - Result StoreDataCache(const Kernel::KProcess& process, VAddr dest_addr, std::size_t size) { - auto on_rasterizer = [&](const VAddr current_vaddr, const std::size_t block_size) { + Result StoreDataCache(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, + std::size_t size) { + auto on_rasterizer = [&](const Common::ProcessAddress current_vaddr, + const std::size_t block_size) { // dc cvac: Store to point of coherency // CPU flush -> GPU invalidate - system.GPU().InvalidateRegion(current_vaddr, block_size); + system.GPU().InvalidateRegion(GetInteger(current_vaddr), block_size); }; return PerformCacheOperation(process, dest_addr, size, on_rasterizer); } - Result FlushDataCache(const Kernel::KProcess& process, VAddr dest_addr, std::size_t size) { - auto on_rasterizer = [&](const VAddr current_vaddr, const std::size_t block_size) { + Result FlushDataCache(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, + std::size_t size) { + auto on_rasterizer = [&](const Common::ProcessAddress current_vaddr, + const std::size_t block_size) { // dc civac: Store to point of coherency, and invalidate from cache // CPU flush -> GPU invalidate - system.GPU().InvalidateRegion(current_vaddr, block_size); + system.GPU().InvalidateRegion(GetInteger(current_vaddr), block_size); }; return PerformCacheOperation(process, dest_addr, size, on_rasterizer); } - void MarkRegionDebug(VAddr vaddr, u64 size, bool debug) { + void MarkRegionDebug(u64 vaddr, u64 size, bool debug) { if (vaddr == 0) { return; } @@ -434,7 +456,7 @@ struct Memory::Impl { } } - void RasterizerMarkRegionCached(VAddr vaddr, u64 size, bool cached) { + void RasterizerMarkRegionCached(u64 vaddr, u64 size, bool cached) { if (vaddr == 0) { return; } @@ -514,10 +536,12 @@ struct Memory::Impl { * @param target The target address to begin mapping from. * @param type The page type to map the memory as. */ - void MapPages(Common::PageTable& page_table, VAddr base, u64 size, PAddr target, - Common::PageType type) { - LOG_DEBUG(HW_Memory, "Mapping {:016X} onto {:016X}-{:016X}", target, base * YUZU_PAGESIZE, - (base + size) * YUZU_PAGESIZE); + void MapPages(Common::PageTable& page_table, Common::ProcessAddress base_address, u64 size, + Common::PhysicalAddress target, Common::PageType type) { + auto base = GetInteger(base_address); + + LOG_DEBUG(HW_Memory, "Mapping {:016X} onto {:016X}-{:016X}", GetInteger(target), + base * YUZU_PAGESIZE, (base + size) * YUZU_PAGESIZE); // During boot, current_page_table might not be set yet, in which case we need not flush if (system.IsPoweredOn()) { @@ -530,7 +554,7 @@ struct Memory::Impl { } } - const VAddr end = base + size; + const Common::ProcessAddress end = base + size; ASSERT_MSG(end <= page_table.pointers.size(), "out of range mapping at {:016X}", base + page_table.pointers.size()); @@ -548,7 +572,7 @@ struct Memory::Impl { while (base != end) { page_table.pointers[base].Store( system.DeviceMemory().GetPointer(target) - (base << YUZU_PAGEBITS), type); - page_table.backing_addr[base] = target - (base << YUZU_PAGEBITS); + page_table.backing_addr[base] = GetInteger(target) - (base << YUZU_PAGEBITS); ASSERT_MSG(page_table.pointers[base].Pointer(), "memory mapping base yield a nullptr within the table"); @@ -559,9 +583,9 @@ struct Memory::Impl { } } - [[nodiscard]] u8* GetPointerImpl(VAddr vaddr, auto on_unmapped, auto on_rasterizer) const { + [[nodiscard]] u8* GetPointerImpl(u64 vaddr, auto on_unmapped, auto on_rasterizer) const { // AARCH64 masks the upper 16 bit of all memory accesses - vaddr &= 0xffffffffffffULL; + vaddr = vaddr & 0xffffffffffffULL; if (vaddr >= 1uLL << current_page_table->GetAddressSpaceBits()) { on_unmapped(); @@ -593,15 +617,18 @@ struct Memory::Impl { return nullptr; } - [[nodiscard]] u8* GetPointer(const VAddr vaddr) const { + [[nodiscard]] u8* GetPointer(const Common::ProcessAddress vaddr) const { return GetPointerImpl( - vaddr, [vaddr]() { LOG_ERROR(HW_Memory, "Unmapped GetPointer @ 0x{:016X}", vaddr); }, + GetInteger(vaddr), + [vaddr]() { + LOG_ERROR(HW_Memory, "Unmapped GetPointer @ 0x{:016X}", GetInteger(vaddr)); + }, []() {}); } - [[nodiscard]] u8* GetPointerSilent(const VAddr vaddr) const { + [[nodiscard]] u8* GetPointerSilent(const Common::ProcessAddress vaddr) const { return GetPointerImpl( - vaddr, []() {}, []() {}); + GetInteger(vaddr), []() {}, []() {}); } /** @@ -616,14 +643,15 @@ struct Memory::Impl { * @returns The instance of T read from the specified virtual address. */ template - T Read(VAddr vaddr) { + T Read(Common::ProcessAddress vaddr) { T result = 0; const u8* const ptr = GetPointerImpl( - vaddr, + GetInteger(vaddr), [vaddr]() { - LOG_ERROR(HW_Memory, "Unmapped Read{} @ 0x{:016X}", sizeof(T) * 8, vaddr); + LOG_ERROR(HW_Memory, "Unmapped Read{} @ 0x{:016X}", sizeof(T) * 8, + GetInteger(vaddr)); }, - [&]() { system.GPU().FlushRegion(vaddr, sizeof(T)); }); + [&]() { system.GPU().FlushRegion(GetInteger(vaddr), sizeof(T)); }); if (ptr) { std::memcpy(&result, ptr, sizeof(T)); } @@ -640,28 +668,28 @@ struct Memory::Impl { * is undefined. */ template - void Write(VAddr vaddr, const T data) { + void Write(Common::ProcessAddress vaddr, const T data) { u8* const ptr = GetPointerImpl( - vaddr, + GetInteger(vaddr), [vaddr, data]() { LOG_ERROR(HW_Memory, "Unmapped Write{} @ 0x{:016X} = 0x{:016X}", sizeof(T) * 8, - vaddr, static_cast(data)); + GetInteger(vaddr), static_cast(data)); }, - [&]() { system.GPU().InvalidateRegion(vaddr, sizeof(T)); }); + [&]() { system.GPU().InvalidateRegion(GetInteger(vaddr), sizeof(T)); }); if (ptr) { std::memcpy(ptr, &data, sizeof(T)); } } template - bool WriteExclusive(VAddr vaddr, const T data, const T expected) { + bool WriteExclusive(Common::ProcessAddress vaddr, const T data, const T expected) { u8* const ptr = GetPointerImpl( - vaddr, + GetInteger(vaddr), [vaddr, data]() { LOG_ERROR(HW_Memory, "Unmapped WriteExclusive{} @ 0x{:016X} = 0x{:016X}", - sizeof(T) * 8, vaddr, static_cast(data)); + sizeof(T) * 8, GetInteger(vaddr), static_cast(data)); }, - [&]() { system.GPU().InvalidateRegion(vaddr, sizeof(T)); }); + [&]() { system.GPU().InvalidateRegion(GetInteger(vaddr), sizeof(T)); }); if (ptr) { const auto volatile_pointer = reinterpret_cast(ptr); return Common::AtomicCompareAndSwap(volatile_pointer, data, expected); @@ -669,14 +697,14 @@ struct Memory::Impl { return true; } - bool WriteExclusive128(VAddr vaddr, const u128 data, const u128 expected) { + bool WriteExclusive128(Common::ProcessAddress vaddr, const u128 data, const u128 expected) { u8* const ptr = GetPointerImpl( - vaddr, + GetInteger(vaddr), [vaddr, data]() { LOG_ERROR(HW_Memory, "Unmapped WriteExclusive128 @ 0x{:016X} = 0x{:016X}{:016X}", - vaddr, static_cast(data[1]), static_cast(data[0])); + GetInteger(vaddr), static_cast(data[1]), static_cast(data[0])); }, - [&]() { system.GPU().InvalidateRegion(vaddr, sizeof(u128)); }); + [&]() { system.GPU().InvalidateRegion(GetInteger(vaddr), sizeof(u128)); }); if (ptr) { const auto volatile_pointer = reinterpret_cast(ptr); return Common::AtomicCompareAndSwap(volatile_pointer, data, expected); @@ -702,15 +730,16 @@ void Memory::SetCurrentPageTable(Kernel::KProcess& process, u32 core_id) { impl->SetCurrentPageTable(process, core_id); } -void Memory::MapMemoryRegion(Common::PageTable& page_table, VAddr base, u64 size, PAddr target) { +void Memory::MapMemoryRegion(Common::PageTable& page_table, Common::ProcessAddress base, u64 size, + Common::PhysicalAddress target) { impl->MapMemoryRegion(page_table, base, size, target); } -void Memory::UnmapRegion(Common::PageTable& page_table, VAddr base, u64 size) { +void Memory::UnmapRegion(Common::PageTable& page_table, Common::ProcessAddress base, u64 size) { impl->UnmapRegion(page_table, base, size); } -bool Memory::IsValidVirtualAddress(const VAddr vaddr) const { +bool Memory::IsValidVirtualAddress(const Common::ProcessAddress vaddr) const { const Kernel::KProcess& process = *system.ApplicationProcess(); const auto& page_table = process.PageTable().PageTableImpl(); const size_t page = vaddr >> YUZU_PAGEBITS; @@ -722,9 +751,9 @@ bool Memory::IsValidVirtualAddress(const VAddr vaddr) const { type == Common::PageType::DebugMemory; } -bool Memory::IsValidVirtualAddressRange(VAddr base, u64 size) const { - VAddr end = base + size; - VAddr page = Common::AlignDown(base, YUZU_PAGESIZE); +bool Memory::IsValidVirtualAddressRange(Common::ProcessAddress base, u64 size) const { + Common::ProcessAddress end = base + size; + Common::ProcessAddress page = Common::AlignDown(GetInteger(base), YUZU_PAGESIZE); for (; page < end; page += YUZU_PAGESIZE) { if (!IsValidVirtualAddress(page)) { @@ -735,131 +764,135 @@ bool Memory::IsValidVirtualAddressRange(VAddr base, u64 size) const { return true; } -u8* Memory::GetPointer(VAddr vaddr) { +u8* Memory::GetPointer(Common::ProcessAddress vaddr) { return impl->GetPointer(vaddr); } -u8* Memory::GetPointerSilent(VAddr vaddr) { +u8* Memory::GetPointerSilent(Common::ProcessAddress vaddr) { return impl->GetPointerSilent(vaddr); } -const u8* Memory::GetPointer(VAddr vaddr) const { +const u8* Memory::GetPointer(Common::ProcessAddress vaddr) const { return impl->GetPointer(vaddr); } -u8 Memory::Read8(const VAddr addr) { +u8 Memory::Read8(const Common::ProcessAddress addr) { return impl->Read8(addr); } -u16 Memory::Read16(const VAddr addr) { +u16 Memory::Read16(const Common::ProcessAddress addr) { return impl->Read16(addr); } -u32 Memory::Read32(const VAddr addr) { +u32 Memory::Read32(const Common::ProcessAddress addr) { return impl->Read32(addr); } -u64 Memory::Read64(const VAddr addr) { +u64 Memory::Read64(const Common::ProcessAddress addr) { return impl->Read64(addr); } -void Memory::Write8(VAddr addr, u8 data) { +void Memory::Write8(Common::ProcessAddress addr, u8 data) { impl->Write8(addr, data); } -void Memory::Write16(VAddr addr, u16 data) { +void Memory::Write16(Common::ProcessAddress addr, u16 data) { impl->Write16(addr, data); } -void Memory::Write32(VAddr addr, u32 data) { +void Memory::Write32(Common::ProcessAddress addr, u32 data) { impl->Write32(addr, data); } -void Memory::Write64(VAddr addr, u64 data) { +void Memory::Write64(Common::ProcessAddress addr, u64 data) { impl->Write64(addr, data); } -bool Memory::WriteExclusive8(VAddr addr, u8 data, u8 expected) { +bool Memory::WriteExclusive8(Common::ProcessAddress addr, u8 data, u8 expected) { return impl->WriteExclusive8(addr, data, expected); } -bool Memory::WriteExclusive16(VAddr addr, u16 data, u16 expected) { +bool Memory::WriteExclusive16(Common::ProcessAddress addr, u16 data, u16 expected) { return impl->WriteExclusive16(addr, data, expected); } -bool Memory::WriteExclusive32(VAddr addr, u32 data, u32 expected) { +bool Memory::WriteExclusive32(Common::ProcessAddress addr, u32 data, u32 expected) { return impl->WriteExclusive32(addr, data, expected); } -bool Memory::WriteExclusive64(VAddr addr, u64 data, u64 expected) { +bool Memory::WriteExclusive64(Common::ProcessAddress addr, u64 data, u64 expected) { return impl->WriteExclusive64(addr, data, expected); } -bool Memory::WriteExclusive128(VAddr addr, u128 data, u128 expected) { +bool Memory::WriteExclusive128(Common::ProcessAddress addr, u128 data, u128 expected) { return impl->WriteExclusive128(addr, data, expected); } -std::string Memory::ReadCString(VAddr vaddr, std::size_t max_length) { +std::string Memory::ReadCString(Common::ProcessAddress vaddr, std::size_t max_length) { return impl->ReadCString(vaddr, max_length); } -void Memory::ReadBlock(const Kernel::KProcess& process, const VAddr src_addr, void* dest_buffer, - const std::size_t size) { +void Memory::ReadBlock(const Kernel::KProcess& process, const Common::ProcessAddress src_addr, + void* dest_buffer, const std::size_t size) { impl->ReadBlockImpl(process, src_addr, dest_buffer, size); } -void Memory::ReadBlock(const VAddr src_addr, void* dest_buffer, const std::size_t size) { +void Memory::ReadBlock(const Common::ProcessAddress src_addr, void* dest_buffer, + const std::size_t size) { impl->ReadBlock(src_addr, dest_buffer, size); } -void Memory::ReadBlockUnsafe(const VAddr src_addr, void* dest_buffer, const std::size_t size) { +void Memory::ReadBlockUnsafe(const Common::ProcessAddress src_addr, void* dest_buffer, + const std::size_t size) { impl->ReadBlockUnsafe(src_addr, dest_buffer, size); } -void Memory::WriteBlock(const Kernel::KProcess& process, VAddr dest_addr, const void* src_buffer, - std::size_t size) { +void Memory::WriteBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, + const void* src_buffer, std::size_t size) { impl->WriteBlockImpl(process, dest_addr, src_buffer, size); } -void Memory::WriteBlock(const VAddr dest_addr, const void* src_buffer, const std::size_t size) { +void Memory::WriteBlock(const Common::ProcessAddress dest_addr, const void* src_buffer, + const std::size_t size) { impl->WriteBlock(dest_addr, src_buffer, size); } -void Memory::WriteBlockUnsafe(const VAddr dest_addr, const void* src_buffer, +void Memory::WriteBlockUnsafe(const Common::ProcessAddress dest_addr, const void* src_buffer, const std::size_t size) { impl->WriteBlockUnsafe(dest_addr, src_buffer, size); } -void Memory::CopyBlock(const Kernel::KProcess& process, VAddr dest_addr, VAddr src_addr, - const std::size_t size) { +void Memory::CopyBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, + Common::ProcessAddress src_addr, const std::size_t size) { impl->CopyBlock(process, dest_addr, src_addr, size); } -void Memory::ZeroBlock(const Kernel::KProcess& process, VAddr dest_addr, const std::size_t size) { +void Memory::ZeroBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, + const std::size_t size) { impl->ZeroBlock(process, dest_addr, size); } -Result Memory::InvalidateDataCache(const Kernel::KProcess& process, VAddr dest_addr, - const std::size_t size) { +Result Memory::InvalidateDataCache(const Kernel::KProcess& process, + Common::ProcessAddress dest_addr, const std::size_t size) { return impl->InvalidateDataCache(process, dest_addr, size); } -Result Memory::StoreDataCache(const Kernel::KProcess& process, VAddr dest_addr, +Result Memory::StoreDataCache(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, const std::size_t size) { return impl->StoreDataCache(process, dest_addr, size); } -Result Memory::FlushDataCache(const Kernel::KProcess& process, VAddr dest_addr, +Result Memory::FlushDataCache(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, const std::size_t size) { return impl->FlushDataCache(process, dest_addr, size); } -void Memory::RasterizerMarkRegionCached(VAddr vaddr, u64 size, bool cached) { - impl->RasterizerMarkRegionCached(vaddr, size, cached); +void Memory::RasterizerMarkRegionCached(Common::ProcessAddress vaddr, u64 size, bool cached) { + impl->RasterizerMarkRegionCached(GetInteger(vaddr), size, cached); } -void Memory::MarkRegionDebug(VAddr vaddr, u64 size, bool debug) { - impl->MarkRegionDebug(vaddr, size, debug); +void Memory::MarkRegionDebug(Common::ProcessAddress vaddr, u64 size, bool debug) { + impl->MarkRegionDebug(GetInteger(vaddr), size, debug); } } // namespace Core::Memory diff --git a/src/core/memory.h b/src/core/memory.h index 31fe699d8..ed4e87739 100644 --- a/src/core/memory.h +++ b/src/core/memory.h @@ -6,7 +6,7 @@ #include #include #include -#include "common/common_types.h" +#include "common/typed_address.h" #include "core/hle/result.h" namespace Common { @@ -33,7 +33,7 @@ constexpr u64 YUZU_PAGESIZE = 1ULL << YUZU_PAGEBITS; constexpr u64 YUZU_PAGEMASK = YUZU_PAGESIZE - 1; /// Virtual user-space memory regions -enum : VAddr { +enum : u64 { /// TLS (Thread-Local Storage) related. TLS_ENTRY_SIZE = 0x200, @@ -74,7 +74,8 @@ public: * @param target Buffer with the memory backing the mapping. Must be of length at least * `size`. */ - void MapMemoryRegion(Common::PageTable& page_table, VAddr base, u64 size, PAddr target); + void MapMemoryRegion(Common::PageTable& page_table, Common::ProcessAddress base, u64 size, + Common::PhysicalAddress target); /** * Unmaps a region of the emulated process address space. @@ -83,7 +84,7 @@ public: * @param base The address to begin unmapping at. * @param size The amount of bytes to unmap. */ - void UnmapRegion(Common::PageTable& page_table, VAddr base, u64 size); + void UnmapRegion(Common::PageTable& page_table, Common::ProcessAddress base, u64 size); /** * Checks whether or not the supplied address is a valid virtual @@ -93,7 +94,7 @@ public: * * @returns True if the given virtual address is valid, false otherwise. */ - [[nodiscard]] bool IsValidVirtualAddress(VAddr vaddr) const; + [[nodiscard]] bool IsValidVirtualAddress(Common::ProcessAddress vaddr) const; /** * Checks whether or not the supplied range of addresses are all valid @@ -104,7 +105,7 @@ public: * * @returns True if all bytes in the given range are valid, false otherwise. */ - [[nodiscard]] bool IsValidVirtualAddressRange(VAddr base, u64 size) const; + [[nodiscard]] bool IsValidVirtualAddressRange(Common::ProcessAddress base, u64 size) const; /** * Gets a pointer to the given address. @@ -114,11 +115,11 @@ public: * @returns The pointer to the given address, if the address is valid. * If the address is not valid, nullptr will be returned. */ - u8* GetPointer(VAddr vaddr); - u8* GetPointerSilent(VAddr vaddr); + u8* GetPointer(Common::ProcessAddress vaddr); + u8* GetPointerSilent(Common::ProcessAddress vaddr); template - T* GetPointer(VAddr vaddr) { + T* GetPointer(Common::ProcessAddress vaddr) { return reinterpret_cast(GetPointer(vaddr)); } @@ -130,10 +131,10 @@ public: * @returns The pointer to the given address, if the address is valid. * If the address is not valid, nullptr will be returned. */ - [[nodiscard]] const u8* GetPointer(VAddr vaddr) const; + [[nodiscard]] const u8* GetPointer(Common::ProcessAddress vaddr) const; template - const T* GetPointer(VAddr vaddr) const { + const T* GetPointer(Common::ProcessAddress vaddr) const { return reinterpret_cast(GetPointer(vaddr)); } @@ -145,7 +146,7 @@ public: * * @returns the read 8-bit unsigned value. */ - u8 Read8(VAddr addr); + u8 Read8(Common::ProcessAddress addr); /** * Reads a 16-bit unsigned value from the current process' address space @@ -155,7 +156,7 @@ public: * * @returns the read 16-bit unsigned value. */ - u16 Read16(VAddr addr); + u16 Read16(Common::ProcessAddress addr); /** * Reads a 32-bit unsigned value from the current process' address space @@ -165,7 +166,7 @@ public: * * @returns the read 32-bit unsigned value. */ - u32 Read32(VAddr addr); + u32 Read32(Common::ProcessAddress addr); /** * Reads a 64-bit unsigned value from the current process' address space @@ -175,7 +176,7 @@ public: * * @returns the read 64-bit value. */ - u64 Read64(VAddr addr); + u64 Read64(Common::ProcessAddress addr); /** * Writes an 8-bit unsigned integer to the given virtual address in @@ -186,7 +187,7 @@ public: * * @post The memory at the given virtual address contains the specified data value. */ - void Write8(VAddr addr, u8 data); + void Write8(Common::ProcessAddress addr, u8 data); /** * Writes a 16-bit unsigned integer to the given virtual address in @@ -197,7 +198,7 @@ public: * * @post The memory range [addr, sizeof(data)) contains the given data value. */ - void Write16(VAddr addr, u16 data); + void Write16(Common::ProcessAddress addr, u16 data); /** * Writes a 32-bit unsigned integer to the given virtual address in @@ -208,7 +209,7 @@ public: * * @post The memory range [addr, sizeof(data)) contains the given data value. */ - void Write32(VAddr addr, u32 data); + void Write32(Common::ProcessAddress addr, u32 data); /** * Writes a 64-bit unsigned integer to the given virtual address in @@ -219,7 +220,7 @@ public: * * @post The memory range [addr, sizeof(data)) contains the given data value. */ - void Write64(VAddr addr, u64 data); + void Write64(Common::ProcessAddress addr, u64 data); /** * Writes a 8-bit unsigned integer to the given virtual address in @@ -232,7 +233,7 @@ public: * * @post The memory range [addr, sizeof(data)) contains the given data value. */ - bool WriteExclusive8(VAddr addr, u8 data, u8 expected); + bool WriteExclusive8(Common::ProcessAddress addr, u8 data, u8 expected); /** * Writes a 16-bit unsigned integer to the given virtual address in @@ -245,7 +246,7 @@ public: * * @post The memory range [addr, sizeof(data)) contains the given data value. */ - bool WriteExclusive16(VAddr addr, u16 data, u16 expected); + bool WriteExclusive16(Common::ProcessAddress addr, u16 data, u16 expected); /** * Writes a 32-bit unsigned integer to the given virtual address in @@ -258,7 +259,7 @@ public: * * @post The memory range [addr, sizeof(data)) contains the given data value. */ - bool WriteExclusive32(VAddr addr, u32 data, u32 expected); + bool WriteExclusive32(Common::ProcessAddress addr, u32 data, u32 expected); /** * Writes a 64-bit unsigned integer to the given virtual address in @@ -271,7 +272,7 @@ public: * * @post The memory range [addr, sizeof(data)) contains the given data value. */ - bool WriteExclusive64(VAddr addr, u64 data, u64 expected); + bool WriteExclusive64(Common::ProcessAddress addr, u64 data, u64 expected); /** * Writes a 128-bit unsigned integer to the given virtual address in @@ -284,7 +285,7 @@ public: * * @post The memory range [addr, sizeof(data)) contains the given data value. */ - bool WriteExclusive128(VAddr addr, u128 data, u128 expected); + bool WriteExclusive128(Common::ProcessAddress addr, u128 data, u128 expected); /** * Reads a null-terminated string from the given virtual address. @@ -301,7 +302,7 @@ public: * * @returns The read string. */ - std::string ReadCString(VAddr vaddr, std::size_t max_length); + std::string ReadCString(Common::ProcessAddress vaddr, std::size_t max_length); /** * Reads a contiguous block of bytes from a specified process' address space. @@ -320,8 +321,8 @@ public: * @post The range [dest_buffer, size) contains the read bytes from the * process' address space. */ - void ReadBlock(const Kernel::KProcess& process, VAddr src_addr, void* dest_buffer, - std::size_t size); + void ReadBlock(const Kernel::KProcess& process, Common::ProcessAddress src_addr, + void* dest_buffer, std::size_t size); /** * Reads a contiguous block of bytes from the current process' address space. @@ -339,7 +340,7 @@ public: * @post The range [dest_buffer, size) contains the read bytes from the * current process' address space. */ - void ReadBlock(VAddr src_addr, void* dest_buffer, std::size_t size); + void ReadBlock(Common::ProcessAddress src_addr, void* dest_buffer, std::size_t size); /** * Reads a contiguous block of bytes from the current process' address space. @@ -358,7 +359,7 @@ public: * @post The range [dest_buffer, size) contains the read bytes from the * current process' address space. */ - void ReadBlockUnsafe(VAddr src_addr, void* dest_buffer, std::size_t size); + void ReadBlockUnsafe(Common::ProcessAddress src_addr, void* dest_buffer, std::size_t size); /** * Writes a range of bytes into a given process' address space at the specified @@ -380,8 +381,8 @@ public: * and will mark that region as invalidated to caches that the active * graphics backend may be maintaining over the course of execution. */ - void WriteBlock(const Kernel::KProcess& process, VAddr dest_addr, const void* src_buffer, - std::size_t size); + void WriteBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, + const void* src_buffer, std::size_t size); /** * Writes a range of bytes into the current process' address space at the specified @@ -402,7 +403,7 @@ public: * and will mark that region as invalidated to caches that the active * graphics backend may be maintaining over the course of execution. */ - void WriteBlock(VAddr dest_addr, const void* src_buffer, std::size_t size); + void WriteBlock(Common::ProcessAddress dest_addr, const void* src_buffer, std::size_t size); /** * Writes a range of bytes into the current process' address space at the specified @@ -420,7 +421,8 @@ public: * will be ignored and an error will be logged. * */ - void WriteBlockUnsafe(VAddr dest_addr, const void* src_buffer, std::size_t size); + void WriteBlockUnsafe(Common::ProcessAddress dest_addr, const void* src_buffer, + std::size_t size); /** * Copies data within a process' address space to another location within the @@ -434,8 +436,8 @@ public: * @post The range [dest_addr, size) within the process' address space contains the * same data within the range [src_addr, size). */ - void CopyBlock(const Kernel::KProcess& process, VAddr dest_addr, VAddr src_addr, - std::size_t size); + void CopyBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, + Common::ProcessAddress src_addr, std::size_t size); /** * Zeros a range of bytes within the current process' address space at the specified @@ -448,7 +450,8 @@ public: * @post The range [dest_addr, size) within the process' address space contains the * value 0. */ - void ZeroBlock(const Kernel::KProcess& process, VAddr dest_addr, std::size_t size); + void ZeroBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, + std::size_t size); /** * Invalidates a range of bytes within the current process' address space at the specified @@ -459,7 +462,8 @@ public: * @param size The size of the range to invalidate, in bytes. * */ - Result InvalidateDataCache(const Kernel::KProcess& process, VAddr dest_addr, std::size_t size); + Result InvalidateDataCache(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, + std::size_t size); /** * Stores a range of bytes within the current process' address space at the specified @@ -470,7 +474,8 @@ public: * @param size The size of the range to store, in bytes. * */ - Result StoreDataCache(const Kernel::KProcess& process, VAddr dest_addr, std::size_t size); + Result StoreDataCache(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, + std::size_t size); /** * Flushes a range of bytes within the current process' address space at the specified @@ -481,7 +486,8 @@ public: * @param size The size of the range to flush, in bytes. * */ - Result FlushDataCache(const Kernel::KProcess& process, VAddr dest_addr, std::size_t size); + Result FlushDataCache(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, + std::size_t size); /** * Marks each page within the specified address range as cached or uncached. @@ -491,7 +497,7 @@ public: * @param cached Whether or not any pages within the address range should be * marked as cached or uncached. */ - void RasterizerMarkRegionCached(VAddr vaddr, u64 size, bool cached); + void RasterizerMarkRegionCached(Common::ProcessAddress vaddr, u64 size, bool cached); /** * Marks each page within the specified address range as debug or non-debug. @@ -502,7 +508,7 @@ public: * @param debug Whether or not any pages within the address range should be * marked as debug or non-debug. */ - void MarkRegionDebug(VAddr vaddr, u64 size, bool debug); + void MarkRegionDebug(Common::ProcessAddress vaddr, u64 size, bool debug); private: Core::System& system; diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp index de729955f..d1284a3a7 100644 --- a/src/core/memory/cheat_engine.cpp +++ b/src/core/memory/cheat_engine.cpp @@ -201,17 +201,17 @@ void CheatEngine::Initialize() { const auto& page_table = system.ApplicationProcess()->PageTable(); metadata.heap_extents = { - .base = page_table.GetHeapRegionStart(), + .base = GetInteger(page_table.GetHeapRegionStart()), .size = page_table.GetHeapRegionSize(), }; metadata.address_space_extents = { - .base = page_table.GetAddressSpaceStart(), + .base = GetInteger(page_table.GetAddressSpaceStart()), .size = page_table.GetAddressSpaceSize(), }; metadata.alias_extents = { - .base = page_table.GetAliasCodeRegionStart(), + .base = GetInteger(page_table.GetAliasCodeRegionStart()), .size = page_table.GetAliasCodeRegionSize(), }; diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp index 004f2e57a..146c3f21e 100644 --- a/src/core/reporter.cpp +++ b/src/core/reporter.cpp @@ -117,8 +117,8 @@ json GetProcessorStateDataAuto(Core::System& system) { arm.SaveContext(context); return GetProcessorStateData(process->Is64BitProcess() ? "AArch64" : "AArch32", - process->PageTable().GetCodeRegionStart(), context.sp, context.pc, - context.pstate, context.cpu_registers); + GetInteger(process->PageTable().GetCodeRegionStart()), context.sp, + context.pc, context.pstate, context.cpu_registers); } json GetBacktraceData(Core::System& system) { From 41d99aa89db7ee483112e49baa6c86e14adbd168 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 23 Mar 2023 19:58:48 -0400 Subject: [PATCH 0205/1181] memory: rename global memory references to application memory --- src/audio_core/device/device_session.cpp | 4 +- src/audio_core/renderer/adsp/adsp.cpp | 2 +- .../renderer/adsp/command_list_processor.cpp | 2 +- src/audio_core/renderer/system.cpp | 3 +- src/core/arm/arm_interface.cpp | 2 +- src/core/arm/dynarmic/arm_dynarmic_32.cpp | 6 +- src/core/arm/dynarmic/arm_dynarmic_64.cpp | 6 +- src/core/core.cpp | 6 +- src/core/core.h | 4 +- src/core/debugger/gdbstub.cpp | 34 +++++----- src/core/hle/kernel/k_address_arbiter.cpp | 10 +-- src/core/hle/kernel/k_condition_variable.cpp | 18 +++--- src/core/hle/kernel/k_page_table.cpp | 54 ++++++++-------- src/core/hle/kernel/k_page_table.h | 4 +- src/core/hle/kernel/k_process.cpp | 22 ++++--- src/core/hle/kernel/k_process.h | 15 +++-- src/core/hle/kernel/k_server_session.cpp | 4 +- src/core/hle/kernel/k_thread.cpp | 11 +++- src/core/hle/kernel/k_thread.h | 4 ++ src/core/hle/kernel/kernel.cpp | 4 +- src/core/hle/kernel/svc/svc_cache.cpp | 2 +- src/core/hle/kernel/svc/svc_debug_string.cpp | 3 +- src/core/hle/kernel/svc/svc_exception.cpp | 2 +- src/core/hle/kernel/svc/svc_ipc.cpp | 4 +- src/core/hle/kernel/svc/svc_port.cpp | 6 +- src/core/hle/kernel/svc/svc_process.cpp | 2 +- src/core/hle/kernel/svc/svc_query_memory.cpp | 4 +- .../hle/kernel/svc/svc_synchronization.cpp | 3 +- src/core/hle/kernel/svc/svc_thread.cpp | 4 +- src/core/hle/service/am/am.cpp | 6 +- .../hid/controllers/console_sixaxis.cpp | 3 +- src/core/hle/service/hid/hidbus/ringcon.cpp | 4 +- .../hid/irsensor/image_transfer_processor.cpp | 18 +++--- src/core/hle/service/hle_ipc.cpp | 3 +- src/core/hle/service/jit/jit.cpp | 4 +- src/core/hle/service/ldr/ldr.cpp | 10 +-- .../hle/service/nvdrv/devices/nvhost_gpu.cpp | 4 +- .../nvdrv/devices/nvhost_nvdec_common.cpp | 4 +- src/core/memory.cpp | 38 ++++------- src/core/memory.h | 64 ++----------------- src/core/memory/cheat_engine.cpp | 4 +- src/core/reporter.cpp | 2 +- src/video_core/memory_manager.cpp | 2 +- src/video_core/video_core.cpp | 2 +- 44 files changed, 186 insertions(+), 227 deletions(-) diff --git a/src/audio_core/device/device_session.cpp b/src/audio_core/device/device_session.cpp index 5a327a606..043ce8875 100644 --- a/src/audio_core/device/device_session.cpp +++ b/src/audio_core/device/device_session.cpp @@ -93,7 +93,7 @@ void DeviceSession::AppendBuffers(std::span buffers) const { stream->AppendBuffer(new_buffer, samples); } else { std::vector samples(buffer.size / sizeof(s16)); - system.Memory().ReadBlockUnsafe(buffer.samples, samples.data(), buffer.size); + system.ApplicationMemory().ReadBlockUnsafe(buffer.samples, samples.data(), buffer.size); stream->AppendBuffer(new_buffer, samples); } } @@ -102,7 +102,7 @@ void DeviceSession::AppendBuffers(std::span buffers) const { void DeviceSession::ReleaseBuffer(const AudioBuffer& buffer) const { if (type == Sink::StreamType::In) { auto samples{stream->ReleaseBuffer(buffer.size / sizeof(s16))}; - system.Memory().WriteBlockUnsafe(buffer.samples, samples.data(), buffer.size); + system.ApplicationMemory().WriteBlockUnsafe(buffer.samples, samples.data(), buffer.size); } } diff --git a/src/audio_core/renderer/adsp/adsp.cpp b/src/audio_core/renderer/adsp/adsp.cpp index a28395663..74772fc50 100644 --- a/src/audio_core/renderer/adsp/adsp.cpp +++ b/src/audio_core/renderer/adsp/adsp.cpp @@ -13,7 +13,7 @@ namespace AudioCore::AudioRenderer::ADSP { ADSP::ADSP(Core::System& system_, Sink::Sink& sink_) - : system{system_}, memory{system.Memory()}, sink{sink_} {} + : system{system_}, memory{system.ApplicationMemory()}, sink{sink_} {} ADSP::~ADSP() { ClearCommandBuffers(); diff --git a/src/audio_core/renderer/adsp/command_list_processor.cpp b/src/audio_core/renderer/adsp/command_list_processor.cpp index e3bf2d7ec..7a300d216 100644 --- a/src/audio_core/renderer/adsp/command_list_processor.cpp +++ b/src/audio_core/renderer/adsp/command_list_processor.cpp @@ -17,7 +17,7 @@ namespace AudioCore::AudioRenderer::ADSP { void CommandListProcessor::Initialize(Core::System& system_, CpuAddr buffer, u64 size, Sink::SinkStream* stream_) { system = &system_; - memory = &system->Memory(); + memory = &system->ApplicationMemory(); stream = stream_; header = reinterpret_cast(buffer); commands = reinterpret_cast(buffer + sizeof(CommandListHeader)); diff --git a/src/audio_core/renderer/system.cpp b/src/audio_core/renderer/system.cpp index 28f063641..ad869facb 100644 --- a/src/audio_core/renderer/system.cpp +++ b/src/audio_core/renderer/system.cpp @@ -127,8 +127,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, render_device = params.rendering_device; execution_mode = params.execution_mode; - core.Memory().ZeroBlock(*core.ApplicationProcess(), transfer_memory->GetSourceAddress(), - transfer_memory_size); + core.ApplicationMemory().ZeroBlock(transfer_memory->GetSourceAddress(), transfer_memory_size); // Note: We're not actually using the transfer memory because it's a pain to code for. // Allocate the memory normally instead and hope the game doesn't try to read anything back diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp index be3f55cd2..d30914b7a 100644 --- a/src/core/arm/arm_interface.cpp +++ b/src/core/arm/arm_interface.cpp @@ -44,7 +44,7 @@ void ARM_Interface::SymbolicateBacktrace(Core::System& system, std::vector symbols; for (const auto& module : modules) { symbols.insert_or_assign( - module.second, Symbols::GetSymbols(module.first, system.Memory(), + module.second, Symbols::GetSymbols(module.first, system.ApplicationMemory(), system.ApplicationProcess()->Is64BitProcess())); } diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index aa92d3fc3..cab21a88e 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -28,8 +28,8 @@ using namespace Common::Literals; class DynarmicCallbacks32 : public Dynarmic::A32::UserCallbacks { public: explicit DynarmicCallbacks32(ARM_Dynarmic_32& parent_) - : parent{parent_}, - memory(parent.system.Memory()), debugger_enabled{parent.system.DebuggerEnabled()}, + : parent{parent_}, memory(parent.system.ApplicationMemory()), + debugger_enabled{parent.system.DebuggerEnabled()}, check_memory_access{debugger_enabled || !Settings::values.cpuopt_ignore_memory_aborts.GetValue()} {} @@ -468,7 +468,7 @@ void ARM_Dynarmic_32::PageTableChanged(Common::PageTable& page_table, std::vector ARM_Dynarmic_32::GetBacktrace(Core::System& system, u64 fp, u64 lr, u64 pc) { std::vector out; - auto& memory = system.Memory(); + auto& memory = system.ApplicationMemory(); out.push_back({"", 0, pc, 0, ""}); diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp index 67073c84d..bbbcb4f9d 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp @@ -28,8 +28,8 @@ using namespace Common::Literals; class DynarmicCallbacks64 : public Dynarmic::A64::UserCallbacks { public: explicit DynarmicCallbacks64(ARM_Dynarmic_64& parent_) - : parent{parent_}, - memory(parent.system.Memory()), debugger_enabled{parent.system.DebuggerEnabled()}, + : parent{parent_}, memory(parent.system.ApplicationMemory()), + debugger_enabled{parent.system.DebuggerEnabled()}, check_memory_access{debugger_enabled || !Settings::values.cpuopt_ignore_memory_aborts.GetValue()} {} @@ -529,7 +529,7 @@ void ARM_Dynarmic_64::PageTableChanged(Common::PageTable& page_table, std::vector ARM_Dynarmic_64::GetBacktrace(Core::System& system, u64 fp, u64 lr, u64 pc) { std::vector out; - auto& memory = system.Memory(); + auto& memory = system.ApplicationMemory(); out.push_back({"", 0, pc, 0, ""}); diff --git a/src/core/core.cpp b/src/core/core.cpp index f6273ac39..caa6a77be 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -293,6 +293,7 @@ struct System::Impl { ASSERT(Kernel::KProcess::Initialize(main_process, system, "main", Kernel::KProcess::ProcessType::Userland, resource_limit) .IsSuccess()); + kernel.MakeApplicationProcess(main_process); const auto [load_result, load_parameters] = app_loader->Load(*main_process, system); if (load_result != Loader::ResultStatus::Success) { LOG_CRITICAL(Core, "Failed to load ROM (Error {})!", load_result); @@ -302,7 +303,6 @@ struct System::Impl { static_cast(SystemResultStatus::ErrorLoader) + static_cast(load_result)); } AddGlueRegistrationForProcess(*app_loader, *main_process); - kernel.MakeApplicationProcess(main_process); kernel.InitializeCores(); // Initialize cheat engine @@ -681,11 +681,11 @@ const ExclusiveMonitor& System::Monitor() const { return impl->kernel.GetExclusiveMonitor(); } -Memory::Memory& System::Memory() { +Memory::Memory& System::ApplicationMemory() { return impl->memory; } -const Core::Memory::Memory& System::Memory() const { +const Core::Memory::Memory& System::ApplicationMemory() const { return impl->memory; } diff --git a/src/core/core.h b/src/core/core.h index 7032240be..4a5aba032 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -256,10 +256,10 @@ public: [[nodiscard]] const ExclusiveMonitor& Monitor() const; /// Gets a mutable reference to the system memory instance. - [[nodiscard]] Core::Memory::Memory& Memory(); + [[nodiscard]] Core::Memory::Memory& ApplicationMemory(); /// Gets a constant reference to the system memory instance. - [[nodiscard]] const Core::Memory::Memory& Memory() const; + [[nodiscard]] const Core::Memory::Memory& ApplicationMemory() const; /// Gets a mutable reference to the GPU interface [[nodiscard]] Tegra::GPU& GPU(); diff --git a/src/core/debugger/gdbstub.cpp b/src/core/debugger/gdbstub.cpp index 5cfb66b93..e2a13bbd2 100644 --- a/src/core/debugger/gdbstub.cpp +++ b/src/core/debugger/gdbstub.cpp @@ -261,9 +261,9 @@ void GDBStub::ExecuteCommand(std::string_view packet, std::vector(strtoll(command.data(), nullptr, 16))}; const size_t size{static_cast(strtoll(command.data() + sep, nullptr, 16))}; - if (system.Memory().IsValidVirtualAddressRange(addr, size)) { + if (system.ApplicationMemory().IsValidVirtualAddressRange(addr, size)) { std::vector mem(size); - system.Memory().ReadBlock(addr, mem.data(), size); + system.ApplicationMemory().ReadBlock(addr, mem.data(), size); SendReply(Common::HexToString(mem)); } else { @@ -281,8 +281,8 @@ void GDBStub::ExecuteCommand(std::string_view packet, std::vector(strtoll(command.data() + addr_sep, nullptr, 16))}; const size_t size{static_cast(strtoll(command.data() + size_sep, nullptr, 16))}; - if (!system.Memory().IsValidVirtualAddressRange(addr, size)) { + if (!system.ApplicationMemory().IsValidVirtualAddressRange(addr, size)) { SendReply(GDB_STUB_REPLY_ERR); return; } @@ -334,22 +334,22 @@ void GDBStub::HandleBreakpointInsert(std::string_view command) { switch (type) { case BreakpointType::Software: - replaced_instructions[addr] = system.Memory().Read32(addr); - system.Memory().Write32(addr, arch->BreakpointInstruction()); + replaced_instructions[addr] = system.ApplicationMemory().Read32(addr); + system.ApplicationMemory().Write32(addr, arch->BreakpointInstruction()); system.InvalidateCpuInstructionCacheRange(addr, sizeof(u32)); success = true; break; case BreakpointType::WriteWatch: - success = system.ApplicationProcess()->InsertWatchpoint(system, addr, size, + success = system.ApplicationProcess()->InsertWatchpoint(addr, size, Kernel::DebugWatchpointType::Write); break; case BreakpointType::ReadWatch: - success = system.ApplicationProcess()->InsertWatchpoint(system, addr, size, + success = system.ApplicationProcess()->InsertWatchpoint(addr, size, Kernel::DebugWatchpointType::Read); break; case BreakpointType::AccessWatch: success = system.ApplicationProcess()->InsertWatchpoint( - system, addr, size, Kernel::DebugWatchpointType::ReadOrWrite); + addr, size, Kernel::DebugWatchpointType::ReadOrWrite); break; case BreakpointType::Hardware: default: @@ -372,7 +372,7 @@ void GDBStub::HandleBreakpointRemove(std::string_view command) { const size_t addr{static_cast(strtoll(command.data() + addr_sep, nullptr, 16))}; const size_t size{static_cast(strtoll(command.data() + size_sep, nullptr, 16))}; - if (!system.Memory().IsValidVirtualAddressRange(addr, size)) { + if (!system.ApplicationMemory().IsValidVirtualAddressRange(addr, size)) { SendReply(GDB_STUB_REPLY_ERR); return; } @@ -383,7 +383,7 @@ void GDBStub::HandleBreakpointRemove(std::string_view command) { case BreakpointType::Software: { const auto orig_insn{replaced_instructions.find(addr)}; if (orig_insn != replaced_instructions.end()) { - system.Memory().Write32(addr, orig_insn->second); + system.ApplicationMemory().Write32(addr, orig_insn->second); system.InvalidateCpuInstructionCacheRange(addr, sizeof(u32)); replaced_instructions.erase(addr); success = true; @@ -391,16 +391,16 @@ void GDBStub::HandleBreakpointRemove(std::string_view command) { break; } case BreakpointType::WriteWatch: - success = system.ApplicationProcess()->RemoveWatchpoint(system, addr, size, + success = system.ApplicationProcess()->RemoveWatchpoint(addr, size, Kernel::DebugWatchpointType::Write); break; case BreakpointType::ReadWatch: - success = system.ApplicationProcess()->RemoveWatchpoint(system, addr, size, + success = system.ApplicationProcess()->RemoveWatchpoint(addr, size, Kernel::DebugWatchpointType::Read); break; case BreakpointType::AccessWatch: success = system.ApplicationProcess()->RemoveWatchpoint( - system, addr, size, Kernel::DebugWatchpointType::ReadOrWrite); + addr, size, Kernel::DebugWatchpointType::ReadOrWrite); break; case BreakpointType::Hardware: default: @@ -483,9 +483,9 @@ static std::optional GetNameFromThreadType64(Core::Memory::Memory& static std::optional GetThreadName(Core::System& system, const Kernel::KThread* thread) { if (system.ApplicationProcess()->Is64BitProcess()) { - return GetNameFromThreadType64(system.Memory(), thread); + return GetNameFromThreadType64(system.ApplicationMemory(), thread); } else { - return GetNameFromThreadType32(system.Memory(), thread); + return GetNameFromThreadType32(system.ApplicationMemory(), thread); } } diff --git a/src/core/hle/kernel/k_address_arbiter.cpp b/src/core/hle/kernel/k_address_arbiter.cpp index 274928dcf..08c254028 100644 --- a/src/core/hle/kernel/k_address_arbiter.cpp +++ b/src/core/hle/kernel/k_address_arbiter.cpp @@ -21,8 +21,8 @@ KAddressArbiter::~KAddressArbiter() = default; namespace { -bool ReadFromUser(Core::System& system, s32* out, KProcessAddress address) { - *out = system.Memory().Read32(GetInteger(address)); +bool ReadFromUser(KernelCore& kernel, s32* out, KProcessAddress address) { + *out = GetCurrentMemory(kernel).Read32(GetInteger(address)); return true; } @@ -209,7 +209,7 @@ Result KAddressArbiter::SignalAndModifyByWaitingCountIfEqual(uint64_t addr, s32 if (value != new_value) { succeeded = UpdateIfEqual(m_system, std::addressof(user_value), addr, value, new_value); } else { - succeeded = ReadFromUser(m_system, std::addressof(user_value), addr); + succeeded = ReadFromUser(m_kernel, std::addressof(user_value), addr); } R_UNLESS(succeeded, ResultInvalidCurrentMemory); @@ -252,7 +252,7 @@ Result KAddressArbiter::WaitIfLessThan(uint64_t addr, s32 value, bool decrement, if (decrement) { succeeded = DecrementIfLessThan(m_system, std::addressof(user_value), addr, value); } else { - succeeded = ReadFromUser(m_system, std::addressof(user_value), addr); + succeeded = ReadFromUser(m_kernel, std::addressof(user_value), addr); } if (!succeeded) { @@ -303,7 +303,7 @@ Result KAddressArbiter::WaitIfEqual(uint64_t addr, s32 value, s64 timeout) { // Read the value from userspace. s32 user_value{}; - if (!ReadFromUser(m_system, std::addressof(user_value), addr)) { + if (!ReadFromUser(m_kernel, std::addressof(user_value), addr)) { slp.CancelSleep(); R_THROW(ResultInvalidCurrentMemory); } diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cpp index c6634313f..73017cf99 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/core/hle/kernel/k_condition_variable.cpp @@ -18,13 +18,13 @@ namespace Kernel { namespace { -bool ReadFromUser(Core::System& system, u32* out, KProcessAddress address) { - *out = system.Memory().Read32(GetInteger(address)); +bool ReadFromUser(KernelCore& kernel, u32* out, KProcessAddress address) { + *out = GetCurrentMemory(kernel).Read32(GetInteger(address)); return true; } -bool WriteToUser(Core::System& system, KProcessAddress address, const u32* p) { - system.Memory().Write32(GetInteger(address), *p); +bool WriteToUser(KernelCore& kernel, KProcessAddress address, const u32* p) { + GetCurrentMemory(kernel).Write32(GetInteger(address), *p); return true; } @@ -128,7 +128,7 @@ Result KConditionVariable::SignalToAddress(KProcessAddress addr) { // Write the value to userspace. Result result{ResultSuccess}; - if (WriteToUser(m_system, addr, std::addressof(next_value))) [[likely]] { + if (WriteToUser(m_kernel, addr, std::addressof(next_value))) [[likely]] { result = ResultSuccess; } else { result = ResultInvalidCurrentMemory; @@ -157,7 +157,7 @@ Result KConditionVariable::WaitForAddress(Handle handle, KProcessAddress addr, u // Read the tag from userspace. u32 test_tag{}; - R_UNLESS(ReadFromUser(m_system, std::addressof(test_tag), addr), + R_UNLESS(ReadFromUser(m_kernel, std::addressof(test_tag), addr), ResultInvalidCurrentMemory); // If the tag isn't the handle (with wait mask), we're done. @@ -257,7 +257,7 @@ void KConditionVariable::Signal(u64 cv_key, s32 count) { // If we have no waiters, clear the has waiter flag. if (it == m_tree.end() || it->GetConditionVariableKey() != cv_key) { const u32 has_waiter_flag{}; - WriteToUser(m_system, cv_key, std::addressof(has_waiter_flag)); + WriteToUser(m_kernel, cv_key, std::addressof(has_waiter_flag)); } } } @@ -301,12 +301,12 @@ Result KConditionVariable::Wait(KProcessAddress addr, u64 key, u32 value, s64 ti // Write to the cv key. { const u32 has_waiter_flag = 1; - WriteToUser(m_system, key, std::addressof(has_waiter_flag)); + WriteToUser(m_kernel, key, std::addressof(has_waiter_flag)); std::atomic_thread_fence(std::memory_order_seq_cst); } // Write the value to userspace. - if (!WriteToUser(m_system, addr, std::addressof(next_value))) { + if (!WriteToUser(m_kernel, addr, std::addressof(next_value))) { slp.CancelSleep(); R_THROW(ResultInvalidCurrentMemory); } diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp index cb39387ea..02b5cada4 100644 --- a/src/core/hle/kernel/k_page_table.cpp +++ b/src/core/hle/kernel/k_page_table.cpp @@ -108,7 +108,8 @@ Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type bool enable_das_merge, bool from_back, KMemoryManager::Pool pool, KProcessAddress code_addr, size_t code_size, KSystemResource* system_resource, - KResourceLimit* resource_limit) { + KResourceLimit* resource_limit, + Core::Memory::Memory& memory) { const auto GetSpaceStart = [this](KAddressSpaceInfo::Type type) { return KAddressSpaceInfo::GetAddressSpaceStart(m_address_space_width, type); @@ -117,6 +118,9 @@ Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type return KAddressSpaceInfo::GetAddressSpaceSize(m_address_space_width, type); }; + // Set the tracking memory + m_memory = std::addressof(memory); + // Set our width and heap/alias sizes m_address_space_width = GetAddressSpaceWidthFromType(as_type); const KProcessAddress start = 0; @@ -334,10 +338,10 @@ Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type void KPageTable::Finalize() { // Finalize memory blocks. - m_memory_block_manager.Finalize( - m_memory_block_slab_manager, [&](KProcessAddress addr, u64 size) { - m_system.Memory().UnmapRegion(*m_page_table_impl, addr, size); - }); + m_memory_block_manager.Finalize(m_memory_block_slab_manager, + [&](KProcessAddress addr, u64 size) { + m_memory->UnmapRegion(*m_page_table_impl, addr, size); + }); // Release any insecure mapped memory. if (m_mapped_insecure_memory) { @@ -1010,23 +1014,22 @@ Result KPageTable::SetupForIpcServer(KProcessAddress* out_addr, size_t size, clear_size = 0; } - std::memset(m_system.Memory().GetPointer(GetInteger(start_partial_virt)), - fill_val, partial_offset); + std::memset(m_memory->GetPointer(GetInteger(start_partial_virt)), fill_val, + partial_offset); std::memcpy( - m_system.Memory().GetPointer(GetInteger(start_partial_virt) + partial_offset), - m_system.Memory().GetPointer( - GetInteger( - GetHeapVirtualAddress(m_system.Kernel().MemoryLayout(), cur_block_addr)) + - partial_offset), + m_memory->GetPointer(GetInteger(start_partial_virt) + partial_offset), + m_memory->GetPointer(GetInteger(GetHeapVirtualAddress( + m_system.Kernel().MemoryLayout(), cur_block_addr)) + + partial_offset), copy_size); if (clear_size > 0) { - std::memset(m_system.Memory().GetPointer(GetInteger(start_partial_virt) + - partial_offset + copy_size), + std::memset(m_memory->GetPointer(GetInteger(start_partial_virt) + + partial_offset + copy_size), fill_val, clear_size); } } else { - std::memset(m_system.Memory().GetPointer(GetInteger(start_partial_virt)), - fill_val, PageSize); + std::memset(m_memory->GetPointer(GetInteger(start_partial_virt)), fill_val, + PageSize); } // Map the page. @@ -1099,15 +1102,14 @@ Result KPageTable::SetupForIpcServer(KProcessAddress* out_addr, size_t size, GetHeapVirtualAddress(m_system.Kernel().MemoryLayout(), end_partial_page); if (send) { const size_t copy_size = src_end - mapping_src_end; - std::memcpy(m_system.Memory().GetPointer(GetInteger(end_partial_virt)), - m_system.Memory().GetPointer(GetInteger(GetHeapVirtualAddress( + std::memcpy(m_memory->GetPointer(GetInteger(end_partial_virt)), + m_memory->GetPointer(GetInteger(GetHeapVirtualAddress( m_system.Kernel().MemoryLayout(), cur_block_addr))), copy_size); - std::memset( - m_system.Memory().GetPointer(GetInteger(end_partial_virt) + copy_size), - fill_val, PageSize - copy_size); + std::memset(m_memory->GetPointer(GetInteger(end_partial_virt) + copy_size), + fill_val, PageSize - copy_size); } else { - std::memset(m_system.Memory().GetPointer(GetInteger(end_partial_virt)), fill_val, + std::memset(m_memory->GetPointer(GetInteger(end_partial_virt)), fill_val, PageSize); } @@ -2800,7 +2802,7 @@ Result KPageTable::SetHeapSize(u64* out, size_t size) { // Clear all the newly allocated pages. for (size_t cur_page = 0; cur_page < num_pages; ++cur_page) { - std::memset(m_system.Memory().GetPointer(m_current_heap_end + (cur_page * PageSize)), 0, + std::memset(m_memory->GetPointer(m_current_heap_end + (cur_page * PageSize)), 0, PageSize); } @@ -3006,7 +3008,7 @@ Result KPageTable::Operate(KProcessAddress addr, size_t num_pages, const KPageGr const size_t size{node.GetNumPages() * PageSize}; // Map the pages. - m_system.Memory().MapMemoryRegion(*m_page_table_impl, addr, size, node.GetAddress()); + m_memory->MapMemoryRegion(*m_page_table_impl, addr, size, node.GetAddress()); addr += size; } @@ -3039,14 +3041,14 @@ Result KPageTable::Operate(KProcessAddress addr, size_t num_pages, KMemoryPermis SCOPE_EXIT({ pages_to_close.CloseAndReset(); }); this->AddRegionToPages(addr, num_pages, pages_to_close); - m_system.Memory().UnmapRegion(*m_page_table_impl, addr, num_pages * PageSize); + m_memory->UnmapRegion(*m_page_table_impl, addr, num_pages * PageSize); break; } case OperationType::MapFirst: case OperationType::Map: { ASSERT(map_addr); ASSERT(Common::IsAligned(GetInteger(map_addr), PageSize)); - m_system.Memory().MapMemoryRegion(*m_page_table_impl, addr, num_pages * PageSize, map_addr); + m_memory->MapMemoryRegion(*m_page_table_impl, addr, num_pages * PageSize, map_addr); // Open references to pages, if we should. if (IsHeapPhysicalAddress(m_kernel.MemoryLayout(), map_addr)) { diff --git a/src/core/hle/kernel/k_page_table.h b/src/core/hle/kernel/k_page_table.h index 1917b2a98..022d15f35 100644 --- a/src/core/hle/kernel/k_page_table.h +++ b/src/core/hle/kernel/k_page_table.h @@ -66,7 +66,8 @@ public: Result InitializeForProcess(FileSys::ProgramAddressSpaceType as_type, bool enable_aslr, bool enable_das_merge, bool from_back, KMemoryManager::Pool pool, KProcessAddress code_addr, size_t code_size, - KSystemResource* system_resource, KResourceLimit* resource_limit); + KSystemResource* system_resource, KResourceLimit* resource_limit, + Core::Memory::Memory& memory); void Finalize(); @@ -546,6 +547,7 @@ private: Core::System& m_system; KernelCore& m_kernel; + Core::Memory::Memory* m_memory{}; }; } // namespace Kernel diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp index 53f8139f3..efe86ad27 100644 --- a/src/core/hle/kernel/k_process.cpp +++ b/src/core/hle/kernel/k_process.cpp @@ -367,8 +367,8 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std: // Initialize process address space if (const Result result{m_page_table.InitializeForProcess( metadata.GetAddressSpaceType(), false, false, false, KMemoryManager::Pool::Application, - 0x8000000, code_size, std::addressof(m_kernel.GetAppSystemResource()), - m_resource_limit)}; + 0x8000000, code_size, std::addressof(m_kernel.GetAppSystemResource()), m_resource_limit, + m_kernel.System().ApplicationMemory())}; result.IsError()) { R_RETURN(result); } @@ -592,8 +592,7 @@ Result KProcess::DeleteThreadLocalRegion(KProcessAddress addr) { R_SUCCEED(); } -bool KProcess::InsertWatchpoint(Core::System& system, KProcessAddress addr, u64 size, - DebugWatchpointType type) { +bool KProcess::InsertWatchpoint(KProcessAddress addr, u64 size, DebugWatchpointType type) { const auto watch{std::find_if(m_watchpoints.begin(), m_watchpoints.end(), [&](const auto& wp) { return wp.type == DebugWatchpointType::None; })}; @@ -609,14 +608,13 @@ bool KProcess::InsertWatchpoint(Core::System& system, KProcessAddress addr, u64 for (KProcessAddress page = Common::AlignDown(GetInteger(addr), PageSize); page < addr + size; page += PageSize) { m_debug_page_refcounts[page]++; - system.Memory().MarkRegionDebug(page, PageSize, true); + this->GetMemory().MarkRegionDebug(page, PageSize, true); } return true; } -bool KProcess::RemoveWatchpoint(Core::System& system, KProcessAddress addr, u64 size, - DebugWatchpointType type) { +bool KProcess::RemoveWatchpoint(KProcessAddress addr, u64 size, DebugWatchpointType type) { const auto watch{std::find_if(m_watchpoints.begin(), m_watchpoints.end(), [&](const auto& wp) { return wp.start_address == addr && wp.end_address == addr + size && wp.type == type; })}; @@ -633,7 +631,7 @@ bool KProcess::RemoveWatchpoint(Core::System& system, KProcessAddress addr, u64 page += PageSize) { m_debug_page_refcounts[page]--; if (!m_debug_page_refcounts[page]) { - system.Memory().MarkRegionDebug(page, PageSize, false); + this->GetMemory().MarkRegionDebug(page, PageSize, false); } } @@ -646,8 +644,7 @@ void KProcess::LoadModule(CodeSet code_set, KProcessAddress base_addr) { m_page_table.SetProcessMemoryPermission(segment.addr + base_addr, segment.size, permission); }; - m_kernel.System().Memory().WriteBlock(*this, base_addr, code_set.memory.data(), - code_set.memory.size()); + this->GetMemory().WriteBlock(base_addr, code_set.memory.data(), code_set.memory.size()); ReprotectSegment(code_set.CodeSegment(), Svc::MemoryPermission::ReadExecute); ReprotectSegment(code_set.RODataSegment(), Svc::MemoryPermission::Read); @@ -706,4 +703,9 @@ Result KProcess::AllocateMainThreadStack(std::size_t stack_size) { R_SUCCEED(); } +Core::Memory::Memory& KProcess::GetMemory() const { + // TODO: per-process memory + return m_kernel.System().ApplicationMemory(); +} + } // namespace Kernel diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.h index 04b6bbb86..925981d06 100644 --- a/src/core/hle/kernel/k_process.h +++ b/src/core/hle/kernel/k_process.h @@ -22,8 +22,12 @@ #include "core/hle/result.h" namespace Core { +namespace Memory { +class Memory; +}; + class System; -} +} // namespace Core namespace FileSys { class ProgramMetadata; @@ -135,6 +139,9 @@ public: return m_handle_table; } + /// Gets a reference to process's memory. + Core::Memory::Memory& GetMemory() const; + Result SignalToAddress(KProcessAddress address) { return m_condition_var.SignalToAddress(address); } @@ -397,12 +404,10 @@ public: // Debug watchpoint management // Attempts to insert a watchpoint into a free slot. Returns false if none are available. - bool InsertWatchpoint(Core::System& system, KProcessAddress addr, u64 size, - DebugWatchpointType type); + bool InsertWatchpoint(KProcessAddress addr, u64 size, DebugWatchpointType type); // Attempts to remove the watchpoint specified by the given parameters. - bool RemoveWatchpoint(Core::System& system, KProcessAddress addr, u64 size, - DebugWatchpointType type); + bool RemoveWatchpoint(KProcessAddress addr, u64 size, DebugWatchpointType type); const std::array& GetWatchpoints() const { return m_watchpoints; diff --git a/src/core/hle/kernel/k_server_session.cpp b/src/core/hle/kernel/k_server_session.cpp index 2288ee435..c66aff501 100644 --- a/src/core/hle/kernel/k_server_session.cpp +++ b/src/core/hle/kernel/k_server_session.cpp @@ -222,7 +222,7 @@ Result KServerSession::SendReply(bool is_hle) { // HLE servers write directly to a pointer to the thread command buffer. Therefore // the reply has already been written in this case. } else { - Core::Memory::Memory& memory{m_kernel.System().Memory()}; + Core::Memory::Memory& memory{client_thread->GetOwnerProcess()->GetMemory()}; KThread* server_thread{GetCurrentThreadPointer(m_kernel)}; UNIMPLEMENTED_IF(server_thread->GetOwnerProcess() != client_thread->GetOwnerProcess()); @@ -319,7 +319,7 @@ Result KServerSession::ReceiveRequest(std::shared_ptrGetOwnerProcess()->GetMemory()}; if (out_context != nullptr) { // HLE request. u32* cmd_buf{reinterpret_cast(memory.GetPointer(client_message))}; diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index 9d101c640..70480b725 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -546,7 +546,7 @@ u16 KThread::GetUserDisableCount() const { return {}; } - auto& memory = m_kernel.System().Memory(); + auto& memory = this->GetOwnerProcess()->GetMemory(); return memory.Read16(m_tls_address + offsetof(ThreadLocalRegion, disable_count)); } @@ -556,7 +556,7 @@ void KThread::SetInterruptFlag() { return; } - auto& memory = m_kernel.System().Memory(); + auto& memory = this->GetOwnerProcess()->GetMemory(); memory.Write16(m_tls_address + offsetof(ThreadLocalRegion, interrupt_flag), 1); } @@ -566,7 +566,7 @@ void KThread::ClearInterruptFlag() { return; } - auto& memory = m_kernel.System().Memory(); + auto& memory = this->GetOwnerProcess()->GetMemory(); memory.Write16(m_tls_address + offsetof(ThreadLocalRegion, interrupt_flag), 0); } @@ -1422,6 +1422,11 @@ s32 GetCurrentCoreId(KernelCore& kernel) { return GetCurrentThread(kernel).GetCurrentCore(); } +Core::Memory::Memory& GetCurrentMemory(KernelCore& kernel) { + // TODO: per-process memory + return kernel.System().ApplicationMemory(); +} + KScopedDisableDispatch::~KScopedDisableDispatch() { // If we are shutting down the kernel, none of this is relevant anymore. if (m_kernel.IsShuttingDown()) { diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h index 0fa9672bf..9c1a41128 100644 --- a/src/core/hle/kernel/k_thread.h +++ b/src/core/hle/kernel/k_thread.h @@ -34,6 +34,9 @@ class Fiber; } namespace Core { +namespace Memory { +class Memory; +} class ARM_Interface; class System; } // namespace Core @@ -113,6 +116,7 @@ KThread& GetCurrentThread(KernelCore& kernel); KProcess* GetCurrentProcessPointer(KernelCore& kernel); KProcess& GetCurrentProcess(KernelCore& kernel); s32 GetCurrentCoreId(KernelCore& kernel); +Core::Memory::Memory& GetCurrentMemory(KernelCore& kernel); class KThread final : public KAutoObjectWithSlabHeapAndContainer, public boost::intrusive::list_base_hook<>, diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 29809b2c5..4f3366c9d 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -102,7 +102,7 @@ struct KernelCore::Impl { void InitializeCores() { for (u32 core_id = 0; core_id < Core::Hardware::NUM_CPU_CORES; core_id++) { cores[core_id]->Initialize((*application_process).Is64BitProcess()); - system.Memory().SetCurrentPageTable(*application_process, core_id); + system.ApplicationMemory().SetCurrentPageTable(*application_process, core_id); } } @@ -206,7 +206,7 @@ struct KernelCore::Impl { void InitializePhysicalCores() { exclusive_monitor = - Core::MakeExclusiveMonitor(system.Memory(), Core::Hardware::NUM_CPU_CORES); + Core::MakeExclusiveMonitor(system.ApplicationMemory(), Core::Hardware::NUM_CPU_CORES); for (u32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { const s32 core{static_cast(i)}; diff --git a/src/core/hle/kernel/svc/svc_cache.cpp b/src/core/hle/kernel/svc/svc_cache.cpp index 1779832d3..082942dab 100644 --- a/src/core/hle/kernel/svc/svc_cache.cpp +++ b/src/core/hle/kernel/svc/svc_cache.cpp @@ -46,7 +46,7 @@ Result FlushProcessDataCache(Core::System& system, Handle process_handle, u64 ad R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory); // Perform the operation. - R_RETURN(system.Memory().FlushDataCache(*process, address, size)); + R_RETURN(GetCurrentMemory(system.Kernel()).FlushDataCache(address, size)); } void FlushEntireDataCache64(Core::System& system) { diff --git a/src/core/hle/kernel/svc/svc_debug_string.cpp b/src/core/hle/kernel/svc/svc_debug_string.cpp index 8771d2b01..4c14ce668 100644 --- a/src/core/hle/kernel/svc/svc_debug_string.cpp +++ b/src/core/hle/kernel/svc/svc_debug_string.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" +#include "core/hle/kernel/k_thread.h" #include "core/hle/kernel/svc.h" #include "core/memory.h" @@ -12,7 +13,7 @@ Result OutputDebugString(Core::System& system, u64 address, u64 len) { R_SUCCEED_IF(len == 0); std::string str(len, '\0'); - system.Memory().ReadBlock(address, str.data(), str.size()); + GetCurrentMemory(system.Kernel()).ReadBlock(address, str.data(), str.size()); LOG_DEBUG(Debug_Emulated, "{}", str); R_SUCCEED(); diff --git a/src/core/hle/kernel/svc/svc_exception.cpp b/src/core/hle/kernel/svc/svc_exception.cpp index 4ab5f471f..580cf2f75 100644 --- a/src/core/hle/kernel/svc/svc_exception.cpp +++ b/src/core/hle/kernel/svc/svc_exception.cpp @@ -25,7 +25,7 @@ void Break(Core::System& system, BreakReason reason, u64 info1, u64 info2) { return; } - auto& memory = system.Memory(); + auto& memory = GetCurrentMemory(system.Kernel()); // This typically is an error code so we're going to assume this is the case if (sz == sizeof(u32)) { diff --git a/src/core/hle/kernel/svc/svc_ipc.cpp b/src/core/hle/kernel/svc/svc_ipc.cpp index 2a8c09a79..ea03068aa 100644 --- a/src/core/hle/kernel/svc/svc_ipc.cpp +++ b/src/core/hle/kernel/svc/svc_ipc.cpp @@ -41,12 +41,12 @@ Result ReplyAndReceive(Core::System& system, s32* out_index, uint64_t handles_ad auto& handle_table = GetCurrentProcess(kernel).GetHandleTable(); R_UNLESS(0 <= num_handles && num_handles <= ArgumentHandleCountMax, ResultOutOfRange); - R_UNLESS(system.Memory().IsValidVirtualAddressRange( + R_UNLESS(GetCurrentMemory(kernel).IsValidVirtualAddressRange( handles_addr, static_cast(sizeof(Handle) * num_handles)), ResultInvalidPointer); std::vector handles(num_handles); - system.Memory().ReadBlock(handles_addr, handles.data(), sizeof(Handle) * num_handles); + GetCurrentMemory(kernel).ReadBlock(handles_addr, handles.data(), sizeof(Handle) * num_handles); // Convert handle list to object table. std::vector objs(num_handles); diff --git a/src/core/hle/kernel/svc/svc_port.cpp b/src/core/hle/kernel/svc/svc_port.cpp index c6eb70422..abba757c7 100644 --- a/src/core/hle/kernel/svc/svc_port.cpp +++ b/src/core/hle/kernel/svc/svc_port.cpp @@ -14,7 +14,8 @@ namespace Kernel::Svc { Result ConnectToNamedPort(Core::System& system, Handle* out, u64 user_name) { // Copy the provided name from user memory to kernel memory. - auto string_name = system.Memory().ReadCString(user_name, KObjectName::NameLengthMax); + auto string_name = + GetCurrentMemory(system.Kernel()).ReadCString(user_name, KObjectName::NameLengthMax); std::array name{}; std::strncpy(name.data(), string_name.c_str(), KObjectName::NameLengthMax - 1); @@ -62,7 +63,8 @@ Result ConnectToPort(Core::System& system, Handle* out_handle, Handle port) { Result ManageNamedPort(Core::System& system, Handle* out_server_handle, uint64_t user_name, int32_t max_sessions) { // Copy the provided name from user memory to kernel memory. - auto string_name = system.Memory().ReadCString(user_name, KObjectName::NameLengthMax); + auto string_name = + GetCurrentMemory(system.Kernel()).ReadCString(user_name, KObjectName::NameLengthMax); // Copy the provided name from user memory to kernel memory. std::array name{}; diff --git a/src/core/hle/kernel/svc/svc_process.cpp b/src/core/hle/kernel/svc/svc_process.cpp index 3c3579947..619ed16a3 100644 --- a/src/core/hle/kernel/svc/svc_process.cpp +++ b/src/core/hle/kernel/svc/svc_process.cpp @@ -73,7 +73,7 @@ Result GetProcessList(Core::System& system, s32* out_num_processes, u64 out_proc R_THROW(ResultInvalidCurrentMemory); } - auto& memory = system.Memory(); + auto& memory = GetCurrentMemory(kernel); const auto& process_list = kernel.GetProcessList(); const auto num_processes = process_list.size(); const auto copy_amount = diff --git a/src/core/hle/kernel/svc/svc_query_memory.cpp b/src/core/hle/kernel/svc/svc_query_memory.cpp index 5db5611f0..4d9fcd25f 100644 --- a/src/core/hle/kernel/svc/svc_query_memory.cpp +++ b/src/core/hle/kernel/svc/svc_query_memory.cpp @@ -30,10 +30,10 @@ Result QueryProcessMemory(Core::System& system, uint64_t out_memory_info, PageIn R_THROW(ResultInvalidHandle); } - auto& memory{system.Memory()}; + auto& current_memory{GetCurrentMemory(system.Kernel())}; const auto memory_info{process->PageTable().QueryInfo(address).GetSvcMemoryInfo()}; - memory.WriteBlock(out_memory_info, std::addressof(memory_info), sizeof(memory_info)); + current_memory.WriteBlock(out_memory_info, std::addressof(memory_info), sizeof(memory_info)); //! This is supposed to be part of the QueryInfo call. *out_page_info = {}; diff --git a/src/core/hle/kernel/svc/svc_synchronization.cpp b/src/core/hle/kernel/svc/svc_synchronization.cpp index e490a13ae..04d65f0bd 100644 --- a/src/core/hle/kernel/svc/svc_synchronization.cpp +++ b/src/core/hle/kernel/svc/svc_synchronization.cpp @@ -90,7 +90,8 @@ Result WaitSynchronization(Core::System& system, int32_t* out_index, u64 user_ha std::vector handles(num_handles); if (num_handles > 0) { - system.Memory().ReadBlock(user_handles, handles.data(), num_handles * sizeof(Handle)); + GetCurrentMemory(system.Kernel()) + .ReadBlock(user_handles, handles.data(), num_handles * sizeof(Handle)); } R_RETURN(WaitSynchronization(system, out_index, handles.data(), num_handles, timeout_ns)); diff --git a/src/core/hle/kernel/svc/svc_thread.cpp b/src/core/hle/kernel/svc/svc_thread.cpp index 0be4858a2..37b54079c 100644 --- a/src/core/hle/kernel/svc/svc_thread.cpp +++ b/src/core/hle/kernel/svc/svc_thread.cpp @@ -178,7 +178,7 @@ Result GetThreadContext3(Core::System& system, u64 out_context, Handle thread_ha R_TRY(thread->GetThreadContext3(context)); // Copy the thread context to user space. - system.Memory().WriteBlock(out_context, context.data(), context.size()); + GetCurrentMemory(kernel).WriteBlock(out_context, context.data(), context.size()); R_SUCCEED(); } @@ -242,7 +242,7 @@ Result GetThreadList(Core::System& system, s32* out_num_threads, u64 out_thread_ R_THROW(ResultInvalidCurrentMemory); } - auto& memory = system.Memory(); + auto& memory = GetCurrentMemory(system.Kernel()); const auto& thread_list = current_process->GetThreadList(); const auto num_threads = thread_list.size(); const auto copy_amount = std::min(static_cast(out_thread_ids_size), num_threads); diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index deeca925d..8ab179cc8 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -1265,7 +1265,8 @@ void ILibraryAppletCreator::CreateTransferMemoryStorage(HLERequestContext& ctx) } std::vector memory(transfer_mem->GetSize()); - system.Memory().ReadBlock(transfer_mem->GetSourceAddress(), memory.data(), memory.size()); + system.ApplicationMemory().ReadBlock(transfer_mem->GetSourceAddress(), memory.data(), + memory.size()); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); @@ -1298,7 +1299,8 @@ void ILibraryAppletCreator::CreateHandleStorage(HLERequestContext& ctx) { } std::vector memory(transfer_mem->GetSize()); - system.Memory().ReadBlock(transfer_mem->GetSourceAddress(), memory.data(), memory.size()); + system.ApplicationMemory().ReadBlock(transfer_mem->GetSourceAddress(), memory.data(), + memory.size()); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); diff --git a/src/core/hle/service/hid/controllers/console_sixaxis.cpp b/src/core/hle/service/hid/controllers/console_sixaxis.cpp index 37f2e4405..bcb272eaf 100644 --- a/src/core/hle/service/hid/controllers/console_sixaxis.cpp +++ b/src/core/hle/service/hid/controllers/console_sixaxis.cpp @@ -60,7 +60,8 @@ void Controller_ConsoleSixAxis::OnUpdate(const Core::Timing::CoreTiming& core_ti // Update seven six axis transfer memory seven_sixaxis_lifo.WriteNextEntry(next_seven_sixaxis_state); - system.Memory().WriteBlock(transfer_memory, &seven_sixaxis_lifo, sizeof(seven_sixaxis_lifo)); + system.ApplicationMemory().WriteBlock(transfer_memory, &seven_sixaxis_lifo, + sizeof(seven_sixaxis_lifo)); } void Controller_ConsoleSixAxis::SetTransferMemoryAddress(Common::ProcessAddress t_mem) { diff --git a/src/core/hle/service/hid/hidbus/ringcon.cpp b/src/core/hle/service/hid/hidbus/ringcon.cpp index 65a2dd521..378108012 100644 --- a/src/core/hle/service/hid/hidbus/ringcon.cpp +++ b/src/core/hle/service/hid/hidbus/ringcon.cpp @@ -64,8 +64,8 @@ void RingController::OnUpdate() { curr_entry.polling_data.out_size = sizeof(ringcon_value); std::memcpy(curr_entry.polling_data.data.data(), &ringcon_value, sizeof(ringcon_value)); - system.Memory().WriteBlock(transfer_memory, &enable_sixaxis_data, - sizeof(enable_sixaxis_data)); + system.ApplicationMemory().WriteBlock(transfer_memory, &enable_sixaxis_data, + sizeof(enable_sixaxis_data)); break; } default: diff --git a/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp b/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp index ca5d067e8..803a6277c 100644 --- a/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp +++ b/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp @@ -58,16 +58,16 @@ void ImageTransferProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType if (camera_data.format != current_config.origin_format) { LOG_WARNING(Service_IRS, "Wrong Input format {} expected {}", camera_data.format, current_config.origin_format); - system.Memory().ZeroBlock(*system.ApplicationProcess(), transfer_memory, - GetDataSize(current_config.trimming_format)); + system.ApplicationMemory().ZeroBlock(transfer_memory, + GetDataSize(current_config.trimming_format)); return; } if (current_config.origin_format > current_config.trimming_format) { LOG_WARNING(Service_IRS, "Origin format {} is smaller than trimming format {}", current_config.origin_format, current_config.trimming_format); - system.Memory().ZeroBlock(*system.ApplicationProcess(), transfer_memory, - GetDataSize(current_config.trimming_format)); + system.ApplicationMemory().ZeroBlock(transfer_memory, + GetDataSize(current_config.trimming_format)); return; } @@ -84,8 +84,8 @@ void ImageTransferProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType "Trimming area ({}, {}, {}, {}) is outside of origin area ({}, {})", current_config.trimming_start_x, current_config.trimming_start_y, trimming_width, trimming_height, origin_width, origin_height); - system.Memory().ZeroBlock(*system.ApplicationProcess(), transfer_memory, - GetDataSize(current_config.trimming_format)); + system.ApplicationMemory().ZeroBlock(transfer_memory, + GetDataSize(current_config.trimming_format)); return; } @@ -99,8 +99,8 @@ void ImageTransferProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType } } - system.Memory().WriteBlock(transfer_memory, window_data.data(), - GetDataSize(current_config.trimming_format)); + system.ApplicationMemory().WriteBlock(transfer_memory, window_data.data(), + GetDataSize(current_config.trimming_format)); if (!IsProcessorActive()) { StartProcessor(); @@ -148,7 +148,7 @@ Core::IrSensor::ImageTransferProcessorState ImageTransferProcessor::GetState( std::vector& data) const { const auto size = GetDataSize(current_config.trimming_format); data.resize(size); - system.Memory().ReadBlock(transfer_memory, data.data(), size); + system.ApplicationMemory().ReadBlock(transfer_memory, data.data(), size); return processor_state; } diff --git a/src/core/hle/service/hle_ipc.cpp b/src/core/hle/service/hle_ipc.cpp index cca697c64..2290df705 100644 --- a/src/core/hle/service/hle_ipc.cpp +++ b/src/core/hle/service/hle_ipc.cpp @@ -303,8 +303,7 @@ Result HLERequestContext::WriteToOutgoingCommandBuffer(Kernel::KThread& requesti } // Copy the translated command buffer back into the thread's command buffer area. - memory.WriteBlock(owner_process, requesting_thread.GetTlsAddress(), cmd_buf.data(), - write_size * sizeof(u32)); + memory.WriteBlock(requesting_thread.GetTlsAddress(), cmd_buf.data(), write_size * sizeof(u32)); return ResultSuccess; } diff --git a/src/core/hle/service/jit/jit.cpp b/src/core/hle/service/jit/jit.cpp index 607f27b21..be996870f 100644 --- a/src/core/hle/service/jit/jit.cpp +++ b/src/core/hle/service/jit/jit.cpp @@ -24,8 +24,8 @@ class IJitEnvironment final : public ServiceFramework { public: explicit IJitEnvironment(Core::System& system_, Kernel::KProcess& process_, CodeRange user_rx, CodeRange user_ro) - : ServiceFramework{system_, "IJitEnvironment"}, process{&process_}, context{ - system_.Memory()} { + : ServiceFramework{system_, "IJitEnvironment"}, process{&process_}, + context{system_.ApplicationMemory()} { // clang-format off static const FunctionInfo functions[] = { {0, &IJitEnvironment::GenerateCode, "GenerateCode"}, diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index 437dc2ea5..c42489ff9 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp @@ -225,7 +225,7 @@ public: // Read NRR data from memory std::vector nrr_data(nrr_size); - system.Memory().ReadBlock(nrr_address, nrr_data.data(), nrr_size); + system.ApplicationMemory().ReadBlock(nrr_address, nrr_data.data(), nrr_size); NRRHeader header; std::memcpy(&header, nrr_data.data(), sizeof(NRRHeader)); @@ -314,7 +314,7 @@ public: const auto is_region_available = [&](VAddr addr) { const auto end_addr = addr + size; while (addr < end_addr) { - if (system.Memory().IsValidVirtualAddress(addr)) { + if (system.ApplicationMemory().IsValidVirtualAddress(addr)) { return false; } @@ -427,8 +427,8 @@ public: const VAddr bss_end_addr{ Common::AlignUp(bss_start + nro_header.bss_size, Kernel::PageSize)}; - const auto CopyCode = [this, process](VAddr src_addr, VAddr dst_addr, u64 size) { - system.Memory().CopyBlock(*process, dst_addr, src_addr, size); + const auto CopyCode = [this](VAddr src_addr, VAddr dst_addr, u64 size) { + system.ApplicationMemory().CopyBlock(dst_addr, src_addr, size); }; CopyCode(nro_addr + nro_header.segment_headers[TEXT_INDEX].memory_offset, text_start, nro_header.segment_headers[TEXT_INDEX].memory_size); @@ -506,7 +506,7 @@ public: // Read NRO data from memory std::vector nro_data(nro_size); - system.Memory().ReadBlock(nro_address, nro_data.data(), nro_size); + system.ApplicationMemory().ReadBlock(nro_address, nro_data.data(), nro_size); SHA256Hash hash{}; mbedtls_sha256_ret(nro_data.data(), nro_data.size(), hash.data(), 0); diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp index d2308fffc..453a965dc 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp @@ -304,8 +304,8 @@ NvResult nvhost_gpu::SubmitGPFIFOBase(std::span input, std::vector Tegra::CommandList entries(params.num_entries); if (kickoff) { - system.Memory().ReadBlock(params.address, entries.command_lists.data(), - params.num_entries * sizeof(Tegra::CommandListHeader)); + system.ApplicationMemory().ReadBlock(params.address, entries.command_lists.data(), + params.num_entries * sizeof(Tegra::CommandListHeader)); } else { std::memcpy(entries.command_lists.data(), &input[sizeof(IoctlSubmitGpfifo)], params.num_entries * sizeof(Tegra::CommandListHeader)); diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp index 7bcef105b..1ab51f10b 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp @@ -105,8 +105,8 @@ NvResult nvhost_nvdec_common::Submit(DeviceFD fd, std::span input, const auto object = nvmap.GetHandle(cmd_buffer.memory_id); ASSERT_OR_EXECUTE(object, return NvResult::InvalidState;); Tegra::ChCommandHeaderList cmdlist(cmd_buffer.word_count); - system.Memory().ReadBlock(object->address + cmd_buffer.offset, cmdlist.data(), - cmdlist.size() * sizeof(u32)); + system.ApplicationMemory().ReadBlock(object->address + cmd_buffer.offset, cmdlist.data(), + cmdlist.size() * sizeof(u32)); gpu.PushCommandBuffer(core.Host1xDeviceFile().fd_to_id[fd], cmdlist); } std::memcpy(output.data(), ¶ms, sizeof(IoctlSubmit)); diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 95e070825..432310632 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -832,11 +832,6 @@ std::string Memory::ReadCString(Common::ProcessAddress vaddr, std::size_t max_le return impl->ReadCString(vaddr, max_length); } -void Memory::ReadBlock(const Kernel::KProcess& process, const Common::ProcessAddress src_addr, - void* dest_buffer, const std::size_t size) { - impl->ReadBlockImpl(process, src_addr, dest_buffer, size); -} - void Memory::ReadBlock(const Common::ProcessAddress src_addr, void* dest_buffer, const std::size_t size) { impl->ReadBlock(src_addr, dest_buffer, size); @@ -847,11 +842,6 @@ void Memory::ReadBlockUnsafe(const Common::ProcessAddress src_addr, void* dest_b impl->ReadBlockUnsafe(src_addr, dest_buffer, size); } -void Memory::WriteBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, - const void* src_buffer, std::size_t size) { - impl->WriteBlockImpl(process, dest_addr, src_buffer, size); -} - void Memory::WriteBlock(const Common::ProcessAddress dest_addr, const void* src_buffer, const std::size_t size) { impl->WriteBlock(dest_addr, src_buffer, size); @@ -862,29 +852,25 @@ void Memory::WriteBlockUnsafe(const Common::ProcessAddress dest_addr, const void impl->WriteBlockUnsafe(dest_addr, src_buffer, size); } -void Memory::CopyBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, - Common::ProcessAddress src_addr, const std::size_t size) { - impl->CopyBlock(process, dest_addr, src_addr, size); -} - -void Memory::ZeroBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, +void Memory::CopyBlock(Common::ProcessAddress dest_addr, Common::ProcessAddress src_addr, const std::size_t size) { - impl->ZeroBlock(process, dest_addr, size); + impl->CopyBlock(*system.ApplicationProcess(), dest_addr, src_addr, size); } -Result Memory::InvalidateDataCache(const Kernel::KProcess& process, - Common::ProcessAddress dest_addr, const std::size_t size) { - return impl->InvalidateDataCache(process, dest_addr, size); +void Memory::ZeroBlock(Common::ProcessAddress dest_addr, const std::size_t size) { + impl->ZeroBlock(*system.ApplicationProcess(), dest_addr, size); } -Result Memory::StoreDataCache(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, - const std::size_t size) { - return impl->StoreDataCache(process, dest_addr, size); +Result Memory::InvalidateDataCache(Common::ProcessAddress dest_addr, const std::size_t size) { + return impl->InvalidateDataCache(*system.ApplicationProcess(), dest_addr, size); } -Result Memory::FlushDataCache(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, - const std::size_t size) { - return impl->FlushDataCache(process, dest_addr, size); +Result Memory::StoreDataCache(Common::ProcessAddress dest_addr, const std::size_t size) { + return impl->StoreDataCache(*system.ApplicationProcess(), dest_addr, size); +} + +Result Memory::FlushDataCache(Common::ProcessAddress dest_addr, const std::size_t size) { + return impl->FlushDataCache(*system.ApplicationProcess(), dest_addr, size); } void Memory::RasterizerMarkRegionCached(Common::ProcessAddress vaddr, u64 size, bool cached) { diff --git a/src/core/memory.h b/src/core/memory.h index ed4e87739..72a0be813 100644 --- a/src/core/memory.h +++ b/src/core/memory.h @@ -304,26 +304,6 @@ public: */ std::string ReadCString(Common::ProcessAddress vaddr, std::size_t max_length); - /** - * Reads a contiguous block of bytes from a specified process' address space. - * - * @param process The process to read the data from. - * @param src_addr The virtual address to begin reading from. - * @param dest_buffer The buffer to place the read bytes into. - * @param size The amount of data to read, in bytes. - * - * @note If a size of 0 is specified, then this function reads nothing and - * no attempts to access memory are made at all. - * - * @pre dest_buffer must be at least size bytes in length, otherwise a - * buffer overrun will occur. - * - * @post The range [dest_buffer, size) contains the read bytes from the - * process' address space. - */ - void ReadBlock(const Kernel::KProcess& process, Common::ProcessAddress src_addr, - void* dest_buffer, std::size_t size); - /** * Reads a contiguous block of bytes from the current process' address space. * @@ -361,29 +341,6 @@ public: */ void ReadBlockUnsafe(Common::ProcessAddress src_addr, void* dest_buffer, std::size_t size); - /** - * Writes a range of bytes into a given process' address space at the specified - * virtual address. - * - * @param process The process to write data into the address space of. - * @param dest_addr The destination virtual address to begin writing the data at. - * @param src_buffer The data to write into the process' address space. - * @param size The size of the data to write, in bytes. - * - * @post The address range [dest_addr, size) in the process' address space - * contains the data that was within src_buffer. - * - * @post If an attempt is made to write into an unmapped region of memory, the writes - * will be ignored and an error will be logged. - * - * @post If a write is performed into a region of memory that is considered cached - * rasterizer memory, will cause the currently active rasterizer to be notified - * and will mark that region as invalidated to caches that the active - * graphics backend may be maintaining over the course of execution. - */ - void WriteBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, - const void* src_buffer, std::size_t size); - /** * Writes a range of bytes into the current process' address space at the specified * virtual address. @@ -428,7 +385,6 @@ public: * Copies data within a process' address space to another location within the * same address space. * - * @param process The process that will have data copied within its address space. * @param dest_addr The destination virtual address to begin copying the data into. * @param src_addr The source virtual address to begin copying the data from. * @param size The size of the data to copy, in bytes. @@ -436,58 +392,50 @@ public: * @post The range [dest_addr, size) within the process' address space contains the * same data within the range [src_addr, size). */ - void CopyBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, - Common::ProcessAddress src_addr, std::size_t size); + void CopyBlock(Common::ProcessAddress dest_addr, Common::ProcessAddress src_addr, + std::size_t size); /** * Zeros a range of bytes within the current process' address space at the specified * virtual address. * - * @param process The process that will have data zeroed within its address space. * @param dest_addr The destination virtual address to zero the data from. * @param size The size of the range to zero out, in bytes. * * @post The range [dest_addr, size) within the process' address space contains the * value 0. */ - void ZeroBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, - std::size_t size); + void ZeroBlock(Common::ProcessAddress dest_addr, std::size_t size); /** * Invalidates a range of bytes within the current process' address space at the specified * virtual address. * - * @param process The process that will have data invalidated within its address space. * @param dest_addr The destination virtual address to invalidate the data from. * @param size The size of the range to invalidate, in bytes. * */ - Result InvalidateDataCache(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, - std::size_t size); + Result InvalidateDataCache(Common::ProcessAddress dest_addr, std::size_t size); /** * Stores a range of bytes within the current process' address space at the specified * virtual address. * - * @param process The process that will have data stored within its address space. * @param dest_addr The destination virtual address to store the data from. * @param size The size of the range to store, in bytes. * */ - Result StoreDataCache(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, - std::size_t size); + Result StoreDataCache(Common::ProcessAddress dest_addr, std::size_t size); /** * Flushes a range of bytes within the current process' address space at the specified * virtual address. * - * @param process The process that will have data flushed within its address space. * @param dest_addr The destination virtual address to flush the data from. * @param size The size of the range to flush, in bytes. * */ - Result FlushDataCache(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, - std::size_t size); + Result FlushDataCache(Common::ProcessAddress dest_addr, std::size_t size); /** * Marks each page within the specified address range as cached or uncached. diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp index d1284a3a7..8742dd164 100644 --- a/src/core/memory/cheat_engine.cpp +++ b/src/core/memory/cheat_engine.cpp @@ -39,11 +39,11 @@ StandardVmCallbacks::StandardVmCallbacks(System& system_, const CheatProcessMeta StandardVmCallbacks::~StandardVmCallbacks() = default; void StandardVmCallbacks::MemoryRead(VAddr address, void* data, u64 size) { - system.Memory().ReadBlock(SanitizeAddress(address), data, size); + system.ApplicationMemory().ReadBlock(SanitizeAddress(address), data, size); } void StandardVmCallbacks::MemoryWrite(VAddr address, const void* data, u64 size) { - system.Memory().WriteBlock(SanitizeAddress(address), data, size); + system.ApplicationMemory().WriteBlock(SanitizeAddress(address), data, size); } u64 StandardVmCallbacks::HidKeysDown() { diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp index 146c3f21e..6c3dc7369 100644 --- a/src/core/reporter.cpp +++ b/src/core/reporter.cpp @@ -264,7 +264,7 @@ void Reporter::SaveUnimplementedFunctionReport(Service::HLERequestContext& ctx, const auto title_id = system.GetApplicationProcessProgramID(); auto out = GetFullDataAuto(timestamp, title_id, system); - auto function_out = GetHLERequestContextData(ctx, system.Memory()); + auto function_out = GetHLERequestContextData(ctx, system.ApplicationMemory()); function_out["command_id"] = command_id; function_out["function_name"] = name; function_out["service_name"] = service_name; diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index 83924475b..015a7d3c1 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -22,7 +22,7 @@ std::atomic MemoryManager::unique_identifier_generator{}; MemoryManager::MemoryManager(Core::System& system_, u64 address_space_bits_, u64 big_page_bits_, u64 page_bits_) - : system{system_}, memory{system.Memory()}, device_memory{system.DeviceMemory()}, + : system{system_}, memory{system.ApplicationMemory()}, device_memory{system.DeviceMemory()}, address_space_bits{address_space_bits_}, page_bits{page_bits_}, big_page_bits{big_page_bits_}, entries{}, big_entries{}, page_table{address_space_bits, address_space_bits + page_bits - 38, page_bits != big_page_bits ? page_bits : 0}, diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index fedb4a7bb..b42d48416 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -18,7 +18,7 @@ std::unique_ptr CreateRenderer( Core::System& system, Core::Frontend::EmuWindow& emu_window, Tegra::GPU& gpu, std::unique_ptr context) { auto& telemetry_session = system.TelemetrySession(); - auto& cpu_memory = system.Memory(); + auto& cpu_memory = system.ApplicationMemory(); switch (Settings::values.renderer_backend.GetValue()) { case Settings::RendererBackend::OpenGL: From 032e5b983c7d3065d2baa338c8e489a88463e95b Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Thu, 23 Mar 2023 20:35:32 -0400 Subject: [PATCH 0206/1181] vcpkg: Update vcpkg to 2023.02.24 --- externals/vcpkg | 2 +- vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/externals/vcpkg b/externals/vcpkg index 9b22b40c6..a7b6122f6 160000 --- a/externals/vcpkg +++ b/externals/vcpkg @@ -1 +1 @@ -Subproject commit 9b22b40c6c61bf0da2d46346dd44a11e90972cc9 +Subproject commit a7b6122f6b6504d16d96117336a0562693579933 diff --git a/vcpkg.json b/vcpkg.json index fbadca0e6..9aadd367c 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "yuzu", - "builtin-baseline": "9b22b40c6c61bf0da2d46346dd44a11e90972cc9", + "builtin-baseline": "a7b6122f6b6504d16d96117336a0562693579933", "version": "1.0", "dependencies": [ "boost-algorithm", From 877e8991c783c7f439091141ca45e5c7786cab16 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Thu, 23 Mar 2023 20:35:56 -0400 Subject: [PATCH 0207/1181] CMakeLists: Update boost to 1.81.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6932b6fab..61c95444f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -210,7 +210,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) # ======================================================================= # Enforce the search mode of non-required packages for better and shorter failure messages -find_package(Boost 1.73.0 REQUIRED context) +find_package(Boost 1.81.0 REQUIRED context) find_package(enet 1.3 MODULE) find_package(fmt 9 REQUIRED) find_package(inih 52 MODULE COMPONENTS INIReader) From abe2ad7aacd50b82dfdd1c1fdbe8258e1872d1aa Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Thu, 23 Mar 2023 22:16:05 -0400 Subject: [PATCH 0208/1181] zstd: Use ZSTD_getFrameContentSize instead of ZSTD_getDecompressedSize --- src/common/zstd_compression.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/zstd_compression.cpp b/src/common/zstd_compression.cpp index b71a41b78..cb6ec171b 100644 --- a/src/common/zstd_compression.cpp +++ b/src/common/zstd_compression.cpp @@ -33,7 +33,7 @@ std::vector CompressDataZSTDDefault(const u8* source, std::size_t source_siz std::vector DecompressDataZSTD(std::span compressed) { const std::size_t decompressed_size = - ZSTD_getDecompressedSize(compressed.data(), compressed.size()); + ZSTD_getFrameContentSize(compressed.data(), compressed.size()); std::vector decompressed(decompressed_size); const std::size_t uncompressed_result_size = ZSTD_decompress( From 5a2dff87bfd111391b1b00dc799f5483edec96ba Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 24 Mar 2023 09:09:01 -0400 Subject: [PATCH 0209/1181] vulkan: fix scheduler chunk reserve --- src/video_core/renderer_vulkan/vk_scheduler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video_core/renderer_vulkan/vk_scheduler.cpp b/src/video_core/renderer_vulkan/vk_scheduler.cpp index 55e699552..b264e6ada 100644 --- a/src/video_core/renderer_vulkan/vk_scheduler.cpp +++ b/src/video_core/renderer_vulkan/vk_scheduler.cpp @@ -328,7 +328,7 @@ void Scheduler::AcquireNewChunk() { chunk = std::make_unique(); } else { // Otherwise, we can just take from the reserve. - chunk = std::make_unique(); + chunk = std::move(chunk_reserve.back()); chunk_reserve.pop_back(); } } From f38ae8e9537f8093019b6cba8547e4160660e92e Mon Sep 17 00:00:00 2001 From: Ross Schlaikjer Date: Sat, 25 Mar 2023 00:25:02 -0400 Subject: [PATCH 0210/1181] Pass GPU page table by reference --- src/video_core/texture_cache/texture_cache.h | 63 ++++++++++---------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 8e8b9a5e6..858449af8 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1616,37 +1616,38 @@ void TextureCache

::ForEachImageInRegionGPU(size_t as_id, GPUVAddr gpu_addr, s return; } auto& gpu_page_table = gpu_page_table_storage[*storage_id]; - ForEachGPUPage(gpu_addr, size, [this, gpu_page_table, &images, gpu_addr, size, func](u64 page) { - const auto it = gpu_page_table.find(page); - if (it == gpu_page_table.end()) { - if constexpr (BOOL_BREAK) { - return false; - } else { - return; - } - } - for (const ImageId image_id : it->second) { - Image& image = slot_images[image_id]; - if (True(image.flags & ImageFlagBits::Picked)) { - continue; - } - if (!image.OverlapsGPU(gpu_addr, size)) { - continue; - } - image.flags |= ImageFlagBits::Picked; - images.push_back(image_id); - if constexpr (BOOL_BREAK) { - if (func(image_id, image)) { - return true; - } - } else { - func(image_id, image); - } - } - if constexpr (BOOL_BREAK) { - return false; - } - }); + ForEachGPUPage(gpu_addr, size, + [this, &gpu_page_table, &images, gpu_addr, size, func](u64 page) { + const auto it = gpu_page_table.find(page); + if (it == gpu_page_table.end()) { + if constexpr (BOOL_BREAK) { + return false; + } else { + return; + } + } + for (const ImageId image_id : it->second) { + Image& image = slot_images[image_id]; + if (True(image.flags & ImageFlagBits::Picked)) { + continue; + } + if (!image.OverlapsGPU(gpu_addr, size)) { + continue; + } + image.flags |= ImageFlagBits::Picked; + images.push_back(image_id); + if constexpr (BOOL_BREAK) { + if (func(image_id, image)) { + return true; + } + } else { + func(image_id, image); + } + } + if constexpr (BOOL_BREAK) { + return false; + } + }); for (const ImageId image_id : images) { slot_images[image_id].flags &= ~ImageFlagBits::Picked; } From 950db851eae1b3428af7bde93605cd045fea058a Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 25 Dec 2022 13:41:23 -0500 Subject: [PATCH 0211/1181] applets: implement RequestExit --- src/core/hle/service/am/am.cpp | 11 ++++++++++- .../hle/service/am/applets/applet_cabinet.cpp | 5 +++++ src/core/hle/service/am/applets/applet_cabinet.h | 1 + .../hle/service/am/applets/applet_controller.cpp | 5 +++++ .../hle/service/am/applets/applet_controller.h | 1 + src/core/hle/service/am/applets/applet_error.cpp | 5 +++++ src/core/hle/service/am/applets/applet_error.h | 1 + .../service/am/applets/applet_general_backend.cpp | 15 +++++++++++++++ .../service/am/applets/applet_general_backend.h | 3 +++ .../hle/service/am/applets/applet_mii_edit.cpp | 5 +++++ src/core/hle/service/am/applets/applet_mii_edit.h | 1 + .../service/am/applets/applet_profile_select.cpp | 5 +++++ .../service/am/applets/applet_profile_select.h | 1 + .../am/applets/applet_software_keyboard.cpp | 5 +++++ .../service/am/applets/applet_software_keyboard.h | 1 + .../hle/service/am/applets/applet_web_browser.cpp | 5 +++++ .../hle/service/am/applets/applet_web_browser.h | 1 + src/core/hle/service/am/applets/applets.h | 1 + 18 files changed, 71 insertions(+), 1 deletion(-) diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index deeca925d..8943e4a81 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -945,7 +945,7 @@ public: {0, &ILibraryAppletAccessor::GetAppletStateChangedEvent, "GetAppletStateChangedEvent"}, {1, &ILibraryAppletAccessor::IsCompleted, "IsCompleted"}, {10, &ILibraryAppletAccessor::Start, "Start"}, - {20, nullptr, "RequestExit"}, + {20, &ILibraryAppletAccessor::RequestExit, "RequestExit"}, {25, nullptr, "Terminate"}, {30, &ILibraryAppletAccessor::GetResult, "GetResult"}, {50, nullptr, "SetOutOfFocusApplicationSuspendingEnabled"}, @@ -1010,6 +1010,15 @@ private: rb.Push(ResultSuccess); } + void RequestExit(HLERequestContext& ctx) { + LOG_DEBUG(Service_AM, "called"); + + ASSERT(applet != nullptr); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(applet->RequestExit()); + } + void PushInData(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); diff --git a/src/core/hle/service/am/applets/applet_cabinet.cpp b/src/core/hle/service/am/applets/applet_cabinet.cpp index 162687b29..d76a9ef5a 100644 --- a/src/core/hle/service/am/applets/applet_cabinet.cpp +++ b/src/core/hle/service/am/applets/applet_cabinet.cpp @@ -174,4 +174,9 @@ void Cabinet::Cancel() { broker.SignalStateChanged(); } +Result Cabinet::RequestExit() { + this->Cancel(); + R_SUCCEED(); +} + } // namespace Service::AM::Applets diff --git a/src/core/hle/service/am/applets/applet_cabinet.h b/src/core/hle/service/am/applets/applet_cabinet.h index 84197a807..edd295a27 100644 --- a/src/core/hle/service/am/applets/applet_cabinet.h +++ b/src/core/hle/service/am/applets/applet_cabinet.h @@ -89,6 +89,7 @@ public: void Execute() override; void DisplayCompleted(bool apply_changes, std::string_view amiibo_name); void Cancel(); + Result RequestExit() override; private: const Core::Frontend::CabinetApplet& frontend; diff --git a/src/core/hle/service/am/applets/applet_controller.cpp b/src/core/hle/service/am/applets/applet_controller.cpp index 58484519b..11b64dbbd 100644 --- a/src/core/hle/service/am/applets/applet_controller.cpp +++ b/src/core/hle/service/am/applets/applet_controller.cpp @@ -262,4 +262,9 @@ void Controller::ConfigurationComplete() { broker.SignalStateChanged(); } +Result Controller::RequestExit() { + this->ConfigurationComplete(); + R_SUCCEED(); +} + } // namespace Service::AM::Applets diff --git a/src/core/hle/service/am/applets/applet_controller.h b/src/core/hle/service/am/applets/applet_controller.h index 1f9adec65..1fbabee11 100644 --- a/src/core/hle/service/am/applets/applet_controller.h +++ b/src/core/hle/service/am/applets/applet_controller.h @@ -129,6 +129,7 @@ public: Result GetStatus() const override; void ExecuteInteractive() override; void Execute() override; + Result RequestExit() override; void ConfigurationComplete(); diff --git a/src/core/hle/service/am/applets/applet_error.cpp b/src/core/hle/service/am/applets/applet_error.cpp index b013896b4..d6935c09d 100644 --- a/src/core/hle/service/am/applets/applet_error.cpp +++ b/src/core/hle/service/am/applets/applet_error.cpp @@ -209,4 +209,9 @@ void Error::DisplayCompleted() { broker.SignalStateChanged(); } +Result Error::RequestExit() { + this->DisplayCompleted(); + R_SUCCEED(); +} + } // namespace Service::AM::Applets diff --git a/src/core/hle/service/am/applets/applet_error.h b/src/core/hle/service/am/applets/applet_error.h index d78d6f1d1..d822a32bb 100644 --- a/src/core/hle/service/am/applets/applet_error.h +++ b/src/core/hle/service/am/applets/applet_error.h @@ -34,6 +34,7 @@ public: Result GetStatus() const override; void ExecuteInteractive() override; void Execute() override; + Result RequestExit() override; void DisplayCompleted(); diff --git a/src/core/hle/service/am/applets/applet_general_backend.cpp b/src/core/hle/service/am/applets/applet_general_backend.cpp index 1eefa85e3..baf680040 100644 --- a/src/core/hle/service/am/applets/applet_general_backend.cpp +++ b/src/core/hle/service/am/applets/applet_general_backend.cpp @@ -150,6 +150,11 @@ void Auth::AuthFinished(bool is_successful) { broker.SignalStateChanged(); } +Result Auth::RequestExit() { + this->AuthFinished(false); + R_SUCCEED(); +} + PhotoViewer::PhotoViewer(Core::System& system_, LibraryAppletMode applet_mode_, const Core::Frontend::PhotoViewerApplet& frontend_) : Applet{system_, applet_mode_}, frontend{frontend_}, system{system_} {} @@ -202,6 +207,11 @@ void PhotoViewer::ViewFinished() { broker.SignalStateChanged(); } +Result PhotoViewer::RequestExit() { + this->ViewFinished(); + R_SUCCEED(); +} + StubApplet::StubApplet(Core::System& system_, AppletId id_, LibraryAppletMode applet_mode_) : Applet{system_, applet_mode_}, id{id_}, system{system_} {} @@ -250,4 +260,9 @@ void StubApplet::Execute() { broker.SignalStateChanged(); } +Result StubApplet::RequestExit() { + // Nothing to do. + R_SUCCEED(); +} + } // namespace Service::AM::Applets diff --git a/src/core/hle/service/am/applets/applet_general_backend.h b/src/core/hle/service/am/applets/applet_general_backend.h index a9f2535a2..34ecaebb9 100644 --- a/src/core/hle/service/am/applets/applet_general_backend.h +++ b/src/core/hle/service/am/applets/applet_general_backend.h @@ -28,6 +28,7 @@ public: Result GetStatus() const override; void ExecuteInteractive() override; void Execute() override; + Result RequestExit() override; void AuthFinished(bool is_successful = true); @@ -59,6 +60,7 @@ public: Result GetStatus() const override; void ExecuteInteractive() override; void Execute() override; + Result RequestExit() override; void ViewFinished(); @@ -80,6 +82,7 @@ public: Result GetStatus() const override; void ExecuteInteractive() override; void Execute() override; + Result RequestExit() override; private: AppletId id; diff --git a/src/core/hle/service/am/applets/applet_mii_edit.cpp b/src/core/hle/service/am/applets/applet_mii_edit.cpp index ae80ef506..a4a3f3cfa 100644 --- a/src/core/hle/service/am/applets/applet_mii_edit.cpp +++ b/src/core/hle/service/am/applets/applet_mii_edit.cpp @@ -135,4 +135,9 @@ void MiiEdit::MiiEditOutputForCharInfoEditing(MiiEditResult result, broker.SignalStateChanged(); } +Result MiiEdit::RequestExit() { + this->MiiEditOutput(MiiEditResult::Cancel, -1); + R_SUCCEED(); +} + } // namespace Service::AM::Applets diff --git a/src/core/hle/service/am/applets/applet_mii_edit.h b/src/core/hle/service/am/applets/applet_mii_edit.h index d18dd3cf5..3f46fae1b 100644 --- a/src/core/hle/service/am/applets/applet_mii_edit.h +++ b/src/core/hle/service/am/applets/applet_mii_edit.h @@ -25,6 +25,7 @@ public: Result GetStatus() const override; void ExecuteInteractive() override; void Execute() override; + Result RequestExit() override; void MiiEditOutput(MiiEditResult result, s32 index); diff --git a/src/core/hle/service/am/applets/applet_profile_select.cpp b/src/core/hle/service/am/applets/applet_profile_select.cpp index 1d69f5447..5486d80dc 100644 --- a/src/core/hle/service/am/applets/applet_profile_select.cpp +++ b/src/core/hle/service/am/applets/applet_profile_select.cpp @@ -73,4 +73,9 @@ void ProfileSelect::SelectionComplete(std::optional uuid) { broker.SignalStateChanged(); } +Result ProfileSelect::RequestExit() { + this->SelectionComplete(std::nullopt); + R_SUCCEED(); +} + } // namespace Service::AM::Applets diff --git a/src/core/hle/service/am/applets/applet_profile_select.h b/src/core/hle/service/am/applets/applet_profile_select.h index b77f1d205..85705c216 100644 --- a/src/core/hle/service/am/applets/applet_profile_select.h +++ b/src/core/hle/service/am/applets/applet_profile_select.h @@ -42,6 +42,7 @@ public: Result GetStatus() const override; void ExecuteInteractive() override; void Execute() override; + Result RequestExit() override; void SelectionComplete(std::optional uuid); diff --git a/src/core/hle/service/am/applets/applet_software_keyboard.cpp b/src/core/hle/service/am/applets/applet_software_keyboard.cpp index c18236045..6f7499731 100644 --- a/src/core/hle/service/am/applets/applet_software_keyboard.cpp +++ b/src/core/hle/service/am/applets/applet_software_keyboard.cpp @@ -770,6 +770,11 @@ void SoftwareKeyboard::ExitKeyboard() { broker.SignalStateChanged(); } +Result SoftwareKeyboard::RequestExit() { + this->ExitKeyboard(); + R_SUCCEED(); +} + // Inline Software Keyboard Requests void SoftwareKeyboard::RequestFinalize(const std::vector& request_data) { diff --git a/src/core/hle/service/am/applets/applet_software_keyboard.h b/src/core/hle/service/am/applets/applet_software_keyboard.h index b01b31c98..2e919811b 100644 --- a/src/core/hle/service/am/applets/applet_software_keyboard.h +++ b/src/core/hle/service/am/applets/applet_software_keyboard.h @@ -31,6 +31,7 @@ public: Result GetStatus() const override; void ExecuteInteractive() override; void Execute() override; + Result RequestExit() override; /** * Submits the input text to the application. diff --git a/src/core/hle/service/am/applets/applet_web_browser.cpp b/src/core/hle/service/am/applets/applet_web_browser.cpp index f061bae80..59359e4d3 100644 --- a/src/core/hle/service/am/applets/applet_web_browser.cpp +++ b/src/core/hle/service/am/applets/applet_web_browser.cpp @@ -363,6 +363,11 @@ void WebBrowser::WebBrowserExit(WebExitReason exit_reason, std::string last_url) broker.SignalStateChanged(); } +Result WebBrowser::RequestExit() { + this->WebBrowserExit(WebExitReason::ExitRequested); + R_SUCCEED(); +} + bool WebBrowser::InputTLVExistsInMap(WebArgInputTLVType input_tlv_type) const { return web_arg_input_tlv_map.find(input_tlv_type) != web_arg_input_tlv_map.end(); } diff --git a/src/core/hle/service/am/applets/applet_web_browser.h b/src/core/hle/service/am/applets/applet_web_browser.h index fd727fac8..99fe18659 100644 --- a/src/core/hle/service/am/applets/applet_web_browser.h +++ b/src/core/hle/service/am/applets/applet_web_browser.h @@ -35,6 +35,7 @@ public: Result GetStatus() const override; void ExecuteInteractive() override; void Execute() override; + Result RequestExit() override; void ExtractOfflineRomFS(); diff --git a/src/core/hle/service/am/applets/applets.h b/src/core/hle/service/am/applets/applets.h index a22eb62a8..12f374199 100644 --- a/src/core/hle/service/am/applets/applets.h +++ b/src/core/hle/service/am/applets/applets.h @@ -142,6 +142,7 @@ public: virtual Result GetStatus() const = 0; virtual void ExecuteInteractive() = 0; virtual void Execute() = 0; + virtual Result RequestExit() = 0; AppletDataBroker& GetBroker() { return broker; From 50a59487eb49baa229d553dd9a3c00aef20f799f Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 25 Mar 2023 13:29:08 -0400 Subject: [PATCH 0212/1181] qt: implement RequestExit for applets --- src/core/frontend/applets/applet.h | 14 ++ src/core/frontend/applets/cabinet.cpp | 2 + src/core/frontend/applets/cabinet.h | 4 +- src/core/frontend/applets/controller.cpp | 2 + src/core/frontend/applets/controller.h | 4 +- src/core/frontend/applets/error.cpp | 2 + src/core/frontend/applets/error.h | 4 +- .../frontend/applets/general_frontend.cpp | 4 + src/core/frontend/applets/general_frontend.h | 8 +- src/core/frontend/applets/mii_edit.cpp | 2 + src/core/frontend/applets/mii_edit.h | 5 +- src/core/frontend/applets/profile_select.cpp | 2 + src/core/frontend/applets/profile_select.h | 5 +- .../frontend/applets/software_keyboard.cpp | 2 + src/core/frontend/applets/software_keyboard.h | 5 +- src/core/frontend/applets/web_browser.cpp | 2 + src/core/frontend/applets/web_browser.h | 5 +- .../hle/service/am/applets/applet_cabinet.cpp | 2 +- .../service/am/applets/applet_controller.cpp | 2 +- .../hle/service/am/applets/applet_error.cpp | 2 +- .../am/applets/applet_general_backend.cpp | 4 +- .../service/am/applets/applet_mii_edit.cpp | 2 +- .../am/applets/applet_profile_select.cpp | 2 +- .../am/applets/applet_software_keyboard.cpp | 2 +- .../service/am/applets/applet_web_browser.cpp | 2 +- src/yuzu/applets/qt_amiibo_settings.cpp | 11 +- src/yuzu/applets/qt_amiibo_settings.h | 2 + src/yuzu/applets/qt_controller.cpp | 11 +- src/yuzu/applets/qt_controller.h | 2 + src/yuzu/applets/qt_error.cpp | 11 +- src/yuzu/applets/qt_error.h | 2 + src/yuzu/applets/qt_profile_select.cpp | 11 +- src/yuzu/applets/qt_profile_select.h | 2 + src/yuzu/applets/qt_software_keyboard.h | 4 + src/yuzu/applets/qt_web_browser.cpp | 11 +- src/yuzu/applets/qt_web_browser.h | 2 + src/yuzu/main.cpp | 146 ++++++++++++------ src/yuzu/main.h | 14 ++ 38 files changed, 250 insertions(+), 69 deletions(-) create mode 100644 src/core/frontend/applets/applet.h diff --git a/src/core/frontend/applets/applet.h b/src/core/frontend/applets/applet.h new file mode 100644 index 000000000..77fffe306 --- /dev/null +++ b/src/core/frontend/applets/applet.h @@ -0,0 +1,14 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +namespace Core::Frontend { + +class Applet { +public: + virtual ~Applet() = default; + virtual void Close() const = 0; +}; + +} // namespace Core::Frontend diff --git a/src/core/frontend/applets/cabinet.cpp b/src/core/frontend/applets/cabinet.cpp index 26c7fefe3..2d501eeae 100644 --- a/src/core/frontend/applets/cabinet.cpp +++ b/src/core/frontend/applets/cabinet.cpp @@ -10,6 +10,8 @@ namespace Core::Frontend { CabinetApplet::~CabinetApplet() = default; +void DefaultCabinetApplet::Close() const {} + void DefaultCabinetApplet::ShowCabinetApplet( const CabinetCallback& callback, const CabinetParameters& parameters, std::shared_ptr nfp_device) const { diff --git a/src/core/frontend/applets/cabinet.h b/src/core/frontend/applets/cabinet.h index c28a235c1..74dc5a4f6 100644 --- a/src/core/frontend/applets/cabinet.h +++ b/src/core/frontend/applets/cabinet.h @@ -4,6 +4,7 @@ #pragma once #include +#include "core/frontend/applets/applet.h" #include "core/hle/service/nfp/nfp_types.h" namespace Service::NFP { @@ -20,7 +21,7 @@ struct CabinetParameters { using CabinetCallback = std::function; -class CabinetApplet { +class CabinetApplet : public Applet { public: virtual ~CabinetApplet(); virtual void ShowCabinetApplet(const CabinetCallback& callback, @@ -30,6 +31,7 @@ public: class DefaultCabinetApplet final : public CabinetApplet { public: + void Close() const override; void ShowCabinetApplet(const CabinetCallback& callback, const CabinetParameters& parameters, std::shared_ptr nfp_device) const override; }; diff --git a/src/core/frontend/applets/controller.cpp b/src/core/frontend/applets/controller.cpp index 52919484e..8e586e938 100644 --- a/src/core/frontend/applets/controller.cpp +++ b/src/core/frontend/applets/controller.cpp @@ -16,6 +16,8 @@ DefaultControllerApplet::DefaultControllerApplet(HID::HIDCore& hid_core_) : hid_ DefaultControllerApplet::~DefaultControllerApplet() = default; +void DefaultControllerApplet::Close() const {} + void DefaultControllerApplet::ReconfigureControllers(ReconfigureCallback callback, const ControllerParameters& parameters) const { LOG_INFO(Service_HID, "called, deducing the best configuration based on the given parameters!"); diff --git a/src/core/frontend/applets/controller.h b/src/core/frontend/applets/controller.h index adb2feefd..5c488387d 100644 --- a/src/core/frontend/applets/controller.h +++ b/src/core/frontend/applets/controller.h @@ -7,6 +7,7 @@ #include #include "common/common_types.h" +#include "core/frontend/applets/applet.h" namespace Core::HID { class HIDCore; @@ -34,7 +35,7 @@ struct ControllerParameters { bool allow_gamecube_controller{}; }; -class ControllerApplet { +class ControllerApplet : public Applet { public: using ReconfigureCallback = std::function; @@ -49,6 +50,7 @@ public: explicit DefaultControllerApplet(HID::HIDCore& hid_core_); ~DefaultControllerApplet() override; + void Close() const override; void ReconfigureControllers(ReconfigureCallback callback, const ControllerParameters& parameters) const override; diff --git a/src/core/frontend/applets/error.cpp b/src/core/frontend/applets/error.cpp index 69c2b2b4d..2e6f7a3d9 100644 --- a/src/core/frontend/applets/error.cpp +++ b/src/core/frontend/applets/error.cpp @@ -8,6 +8,8 @@ namespace Core::Frontend { ErrorApplet::~ErrorApplet() = default; +void DefaultErrorApplet::Close() const {} + void DefaultErrorApplet::ShowError(Result error, FinishedCallback finished) const { LOG_CRITICAL(Service_Fatal, "Application requested error display: {:04}-{:04} (raw={:08X})", error.module.Value(), error.description.Value(), error.raw); diff --git a/src/core/frontend/applets/error.h b/src/core/frontend/applets/error.h index 884f2f653..3a12196ce 100644 --- a/src/core/frontend/applets/error.h +++ b/src/core/frontend/applets/error.h @@ -6,11 +6,12 @@ #include #include +#include "core/frontend/applets/applet.h" #include "core/hle/result.h" namespace Core::Frontend { -class ErrorApplet { +class ErrorApplet : public Applet { public: using FinishedCallback = std::function; @@ -28,6 +29,7 @@ public: class DefaultErrorApplet final : public ErrorApplet { public: + void Close() const override; void ShowError(Result error, FinishedCallback finished) const override; void ShowErrorWithTimestamp(Result error, std::chrono::seconds time, FinishedCallback finished) const override; diff --git a/src/core/frontend/applets/general_frontend.cpp b/src/core/frontend/applets/general_frontend.cpp index 29a00fb6f..b4b213a31 100644 --- a/src/core/frontend/applets/general_frontend.cpp +++ b/src/core/frontend/applets/general_frontend.cpp @@ -10,6 +10,8 @@ ParentalControlsApplet::~ParentalControlsApplet() = default; DefaultParentalControlsApplet::~DefaultParentalControlsApplet() = default; +void DefaultParentalControlsApplet::Close() const {} + void DefaultParentalControlsApplet::VerifyPIN(std::function finished, bool suspend_future_verification_temporarily) { LOG_INFO(Service_AM, @@ -39,6 +41,8 @@ PhotoViewerApplet::~PhotoViewerApplet() = default; DefaultPhotoViewerApplet::~DefaultPhotoViewerApplet() = default; +void DefaultPhotoViewerApplet::Close() const {} + void DefaultPhotoViewerApplet::ShowPhotosForApplication(u64 title_id, std::function finished) const { LOG_INFO(Service_AM, diff --git a/src/core/frontend/applets/general_frontend.h b/src/core/frontend/applets/general_frontend.h index cbec8b4ad..319838ac7 100644 --- a/src/core/frontend/applets/general_frontend.h +++ b/src/core/frontend/applets/general_frontend.h @@ -6,9 +6,11 @@ #include #include "common/common_types.h" +#include "core/frontend/applets/applet.h" + namespace Core::Frontend { -class ParentalControlsApplet { +class ParentalControlsApplet : public Applet { public: virtual ~ParentalControlsApplet(); @@ -33,6 +35,7 @@ class DefaultParentalControlsApplet final : public ParentalControlsApplet { public: ~DefaultParentalControlsApplet() override; + void Close() const override; void VerifyPIN(std::function finished, bool suspend_future_verification_temporarily) override; void VerifyPINForSettings(std::function finished) override; @@ -40,7 +43,7 @@ public: void ChangePIN(std::function finished) override; }; -class PhotoViewerApplet { +class PhotoViewerApplet : public Applet { public: virtual ~PhotoViewerApplet(); @@ -52,6 +55,7 @@ class DefaultPhotoViewerApplet final : public PhotoViewerApplet { public: ~DefaultPhotoViewerApplet() override; + void Close() const override; void ShowPhotosForApplication(u64 title_id, std::function finished) const override; void ShowAllPhotos(std::function finished) const override; }; diff --git a/src/core/frontend/applets/mii_edit.cpp b/src/core/frontend/applets/mii_edit.cpp index bc8c57067..2988c3e72 100644 --- a/src/core/frontend/applets/mii_edit.cpp +++ b/src/core/frontend/applets/mii_edit.cpp @@ -8,6 +8,8 @@ namespace Core::Frontend { MiiEditApplet::~MiiEditApplet() = default; +void DefaultMiiEditApplet::Close() const {} + void DefaultMiiEditApplet::ShowMiiEdit(const MiiEditCallback& callback) const { LOG_WARNING(Service_AM, "(STUBBED) called"); diff --git a/src/core/frontend/applets/mii_edit.h b/src/core/frontend/applets/mii_edit.h index d828f06ec..9d86ee658 100644 --- a/src/core/frontend/applets/mii_edit.h +++ b/src/core/frontend/applets/mii_edit.h @@ -5,9 +5,11 @@ #include +#include "core/frontend/applets/applet.h" + namespace Core::Frontend { -class MiiEditApplet { +class MiiEditApplet : public Applet { public: using MiiEditCallback = std::function; @@ -18,6 +20,7 @@ public: class DefaultMiiEditApplet final : public MiiEditApplet { public: + void Close() const override; void ShowMiiEdit(const MiiEditCallback& callback) const override; }; diff --git a/src/core/frontend/applets/profile_select.cpp b/src/core/frontend/applets/profile_select.cpp index da4cfbf87..910d20c0d 100644 --- a/src/core/frontend/applets/profile_select.cpp +++ b/src/core/frontend/applets/profile_select.cpp @@ -9,6 +9,8 @@ namespace Core::Frontend { ProfileSelectApplet::~ProfileSelectApplet() = default; +void DefaultProfileSelectApplet::Close() const {} + void DefaultProfileSelectApplet::SelectProfile(SelectProfileCallback callback) const { Service::Account::ProfileManager manager; callback(manager.GetUser(Settings::values.current_user.GetValue()).value_or(Common::UUID{})); diff --git a/src/core/frontend/applets/profile_select.h b/src/core/frontend/applets/profile_select.h index 138429533..76e963535 100644 --- a/src/core/frontend/applets/profile_select.h +++ b/src/core/frontend/applets/profile_select.h @@ -7,9 +7,11 @@ #include #include "common/uuid.h" +#include "core/frontend/applets/applet.h" + namespace Core::Frontend { -class ProfileSelectApplet { +class ProfileSelectApplet : public Applet { public: using SelectProfileCallback = std::function)>; @@ -20,6 +22,7 @@ public: class DefaultProfileSelectApplet final : public ProfileSelectApplet { public: + void Close() const override; void SelectProfile(SelectProfileCallback callback) const override; }; diff --git a/src/core/frontend/applets/software_keyboard.cpp b/src/core/frontend/applets/software_keyboard.cpp index a3720f4d7..7655d215b 100644 --- a/src/core/frontend/applets/software_keyboard.cpp +++ b/src/core/frontend/applets/software_keyboard.cpp @@ -13,6 +13,8 @@ SoftwareKeyboardApplet::~SoftwareKeyboardApplet() = default; DefaultSoftwareKeyboardApplet::~DefaultSoftwareKeyboardApplet() = default; +void DefaultSoftwareKeyboardApplet::Close() const {} + void DefaultSoftwareKeyboardApplet::InitializeKeyboard( bool is_inline, KeyboardInitializeParameters initialize_parameters, SubmitNormalCallback submit_normal_callback_, SubmitInlineCallback submit_inline_callback_) { diff --git a/src/core/frontend/applets/software_keyboard.h b/src/core/frontend/applets/software_keyboard.h index 8aef103d3..8ed96da24 100644 --- a/src/core/frontend/applets/software_keyboard.h +++ b/src/core/frontend/applets/software_keyboard.h @@ -7,6 +7,7 @@ #include "common/common_types.h" +#include "core/frontend/applets/applet.h" #include "core/hle/service/am/applets/applet_software_keyboard_types.h" namespace Core::Frontend { @@ -52,7 +53,7 @@ struct InlineTextParameters { s32 cursor_position; }; -class SoftwareKeyboardApplet { +class SoftwareKeyboardApplet : public Applet { public: using SubmitInlineCallback = std::function; @@ -84,6 +85,8 @@ class DefaultSoftwareKeyboardApplet final : public SoftwareKeyboardApplet { public: ~DefaultSoftwareKeyboardApplet() override; + void Close() const override; + void InitializeKeyboard(bool is_inline, KeyboardInitializeParameters initialize_parameters, SubmitNormalCallback submit_normal_callback_, SubmitInlineCallback submit_inline_callback_) override; diff --git a/src/core/frontend/applets/web_browser.cpp b/src/core/frontend/applets/web_browser.cpp index b09cb7102..6e703ef06 100644 --- a/src/core/frontend/applets/web_browser.cpp +++ b/src/core/frontend/applets/web_browser.cpp @@ -10,6 +10,8 @@ WebBrowserApplet::~WebBrowserApplet() = default; DefaultWebBrowserApplet::~DefaultWebBrowserApplet() = default; +void DefaultWebBrowserApplet::Close() const {} + void DefaultWebBrowserApplet::OpenLocalWebPage(const std::string& local_url, ExtractROMFSCallback extract_romfs_callback, OpenWebPageCallback callback) const { diff --git a/src/core/frontend/applets/web_browser.h b/src/core/frontend/applets/web_browser.h index 4f72284ad..178bbdd3f 100644 --- a/src/core/frontend/applets/web_browser.h +++ b/src/core/frontend/applets/web_browser.h @@ -5,11 +5,12 @@ #include +#include "core/frontend/applets/applet.h" #include "core/hle/service/am/applets/applet_web_browser_types.h" namespace Core::Frontend { -class WebBrowserApplet { +class WebBrowserApplet : public Applet { public: using ExtractROMFSCallback = std::function; using OpenWebPageCallback = @@ -29,6 +30,8 @@ class DefaultWebBrowserApplet final : public WebBrowserApplet { public: ~DefaultWebBrowserApplet() override; + void Close() const override; + void OpenLocalWebPage(const std::string& local_url, ExtractROMFSCallback extract_romfs_callback, OpenWebPageCallback callback) const override; diff --git a/src/core/hle/service/am/applets/applet_cabinet.cpp b/src/core/hle/service/am/applets/applet_cabinet.cpp index d76a9ef5a..93c9f2a55 100644 --- a/src/core/hle/service/am/applets/applet_cabinet.cpp +++ b/src/core/hle/service/am/applets/applet_cabinet.cpp @@ -175,7 +175,7 @@ void Cabinet::Cancel() { } Result Cabinet::RequestExit() { - this->Cancel(); + frontend.Close(); R_SUCCEED(); } diff --git a/src/core/hle/service/am/applets/applet_controller.cpp b/src/core/hle/service/am/applets/applet_controller.cpp index 11b64dbbd..2d1d115d7 100644 --- a/src/core/hle/service/am/applets/applet_controller.cpp +++ b/src/core/hle/service/am/applets/applet_controller.cpp @@ -263,7 +263,7 @@ void Controller::ConfigurationComplete() { } Result Controller::RequestExit() { - this->ConfigurationComplete(); + frontend.Close(); R_SUCCEED(); } diff --git a/src/core/hle/service/am/applets/applet_error.cpp b/src/core/hle/service/am/applets/applet_error.cpp index d6935c09d..b46ea840c 100644 --- a/src/core/hle/service/am/applets/applet_error.cpp +++ b/src/core/hle/service/am/applets/applet_error.cpp @@ -210,7 +210,7 @@ void Error::DisplayCompleted() { } Result Error::RequestExit() { - this->DisplayCompleted(); + frontend.Close(); R_SUCCEED(); } diff --git a/src/core/hle/service/am/applets/applet_general_backend.cpp b/src/core/hle/service/am/applets/applet_general_backend.cpp index baf680040..8b352020e 100644 --- a/src/core/hle/service/am/applets/applet_general_backend.cpp +++ b/src/core/hle/service/am/applets/applet_general_backend.cpp @@ -151,7 +151,7 @@ void Auth::AuthFinished(bool is_successful) { } Result Auth::RequestExit() { - this->AuthFinished(false); + frontend.Close(); R_SUCCEED(); } @@ -208,7 +208,7 @@ void PhotoViewer::ViewFinished() { } Result PhotoViewer::RequestExit() { - this->ViewFinished(); + frontend.Close(); R_SUCCEED(); } diff --git a/src/core/hle/service/am/applets/applet_mii_edit.cpp b/src/core/hle/service/am/applets/applet_mii_edit.cpp index a4a3f3cfa..d1f652c09 100644 --- a/src/core/hle/service/am/applets/applet_mii_edit.cpp +++ b/src/core/hle/service/am/applets/applet_mii_edit.cpp @@ -136,7 +136,7 @@ void MiiEdit::MiiEditOutputForCharInfoEditing(MiiEditResult result, } Result MiiEdit::RequestExit() { - this->MiiEditOutput(MiiEditResult::Cancel, -1); + frontend.Close(); R_SUCCEED(); } diff --git a/src/core/hle/service/am/applets/applet_profile_select.cpp b/src/core/hle/service/am/applets/applet_profile_select.cpp index 5486d80dc..07abc2563 100644 --- a/src/core/hle/service/am/applets/applet_profile_select.cpp +++ b/src/core/hle/service/am/applets/applet_profile_select.cpp @@ -74,7 +74,7 @@ void ProfileSelect::SelectionComplete(std::optional uuid) { } Result ProfileSelect::RequestExit() { - this->SelectionComplete(std::nullopt); + frontend.Close(); R_SUCCEED(); } diff --git a/src/core/hle/service/am/applets/applet_software_keyboard.cpp b/src/core/hle/service/am/applets/applet_software_keyboard.cpp index 6f7499731..4145bb84f 100644 --- a/src/core/hle/service/am/applets/applet_software_keyboard.cpp +++ b/src/core/hle/service/am/applets/applet_software_keyboard.cpp @@ -771,7 +771,7 @@ void SoftwareKeyboard::ExitKeyboard() { } Result SoftwareKeyboard::RequestExit() { - this->ExitKeyboard(); + frontend.Close(); R_SUCCEED(); } diff --git a/src/core/hle/service/am/applets/applet_web_browser.cpp b/src/core/hle/service/am/applets/applet_web_browser.cpp index 59359e4d3..2accf7898 100644 --- a/src/core/hle/service/am/applets/applet_web_browser.cpp +++ b/src/core/hle/service/am/applets/applet_web_browser.cpp @@ -364,7 +364,7 @@ void WebBrowser::WebBrowserExit(WebExitReason exit_reason, std::string last_url) } Result WebBrowser::RequestExit() { - this->WebBrowserExit(WebExitReason::ExitRequested); + frontend.Close(); R_SUCCEED(); } diff --git a/src/yuzu/applets/qt_amiibo_settings.cpp b/src/yuzu/applets/qt_amiibo_settings.cpp index 93ad4b4f9..4559df5b1 100644 --- a/src/yuzu/applets/qt_amiibo_settings.cpp +++ b/src/yuzu/applets/qt_amiibo_settings.cpp @@ -245,12 +245,19 @@ void QtAmiiboSettingsDialog::SetSettingsDescription() { QtAmiiboSettings::QtAmiiboSettings(GMainWindow& parent) { connect(this, &QtAmiiboSettings::MainWindowShowAmiiboSettings, &parent, &GMainWindow::AmiiboSettingsShowDialog, Qt::QueuedConnection); + connect(this, &QtAmiiboSettings::MainWindowRequestExit, &parent, + &GMainWindow::AmiiboSettingsRequestExit, Qt::QueuedConnection); connect(&parent, &GMainWindow::AmiiboSettingsFinished, this, &QtAmiiboSettings::MainWindowFinished, Qt::QueuedConnection); } QtAmiiboSettings::~QtAmiiboSettings() = default; +void QtAmiiboSettings::Close() const { + callback = {}; + emit MainWindowRequestExit(); +} + void QtAmiiboSettings::ShowCabinetApplet( const Core::Frontend::CabinetCallback& callback_, const Core::Frontend::CabinetParameters& parameters, @@ -260,5 +267,7 @@ void QtAmiiboSettings::ShowCabinetApplet( } void QtAmiiboSettings::MainWindowFinished(bool is_success, const std::string& name) { - callback(is_success, name); + if (callback) { + callback(is_success, name); + } } diff --git a/src/yuzu/applets/qt_amiibo_settings.h b/src/yuzu/applets/qt_amiibo_settings.h index 930c96739..bc389a33f 100644 --- a/src/yuzu/applets/qt_amiibo_settings.h +++ b/src/yuzu/applets/qt_amiibo_settings.h @@ -68,6 +68,7 @@ public: explicit QtAmiiboSettings(GMainWindow& parent); ~QtAmiiboSettings() override; + void Close() const override; void ShowCabinetApplet(const Core::Frontend::CabinetCallback& callback_, const Core::Frontend::CabinetParameters& parameters, std::shared_ptr nfp_device) const override; @@ -75,6 +76,7 @@ public: signals: void MainWindowShowAmiiboSettings(const Core::Frontend::CabinetParameters& parameters, std::shared_ptr nfp_device) const; + void MainWindowRequestExit() const; private: void MainWindowFinished(bool is_success, const std::string& name); diff --git a/src/yuzu/applets/qt_controller.cpp b/src/yuzu/applets/qt_controller.cpp index c30b54499..79018a7f6 100644 --- a/src/yuzu/applets/qt_controller.cpp +++ b/src/yuzu/applets/qt_controller.cpp @@ -678,12 +678,19 @@ void QtControllerSelectorDialog::DisableUnsupportedPlayers() { QtControllerSelector::QtControllerSelector(GMainWindow& parent) { connect(this, &QtControllerSelector::MainWindowReconfigureControllers, &parent, &GMainWindow::ControllerSelectorReconfigureControllers, Qt::QueuedConnection); + connect(this, &QtControllerSelector::MainWindowRequestExit, &parent, + &GMainWindow::ControllerSelectorRequestExit, Qt::QueuedConnection); connect(&parent, &GMainWindow::ControllerSelectorReconfigureFinished, this, &QtControllerSelector::MainWindowReconfigureFinished, Qt::QueuedConnection); } QtControllerSelector::~QtControllerSelector() = default; +void QtControllerSelector::Close() const { + callback = {}; + emit MainWindowRequestExit(); +} + void QtControllerSelector::ReconfigureControllers( ReconfigureCallback callback_, const Core::Frontend::ControllerParameters& parameters) const { callback = std::move(callback_); @@ -691,5 +698,7 @@ void QtControllerSelector::ReconfigureControllers( } void QtControllerSelector::MainWindowReconfigureFinished() { - callback(); + if (callback) { + callback(); + } } diff --git a/src/yuzu/applets/qt_controller.h b/src/yuzu/applets/qt_controller.h index 16e99f507..2ef7e488f 100644 --- a/src/yuzu/applets/qt_controller.h +++ b/src/yuzu/applets/qt_controller.h @@ -156,6 +156,7 @@ public: explicit QtControllerSelector(GMainWindow& parent); ~QtControllerSelector() override; + void Close() const override; void ReconfigureControllers( ReconfigureCallback callback_, const Core::Frontend::ControllerParameters& parameters) const override; @@ -163,6 +164,7 @@ public: signals: void MainWindowReconfigureControllers( const Core::Frontend::ControllerParameters& parameters) const; + void MainWindowRequestExit() const; private: void MainWindowReconfigureFinished(); diff --git a/src/yuzu/applets/qt_error.cpp b/src/yuzu/applets/qt_error.cpp index e0190a979..1dc4f0383 100644 --- a/src/yuzu/applets/qt_error.cpp +++ b/src/yuzu/applets/qt_error.cpp @@ -8,12 +8,19 @@ QtErrorDisplay::QtErrorDisplay(GMainWindow& parent) { connect(this, &QtErrorDisplay::MainWindowDisplayError, &parent, &GMainWindow::ErrorDisplayDisplayError, Qt::QueuedConnection); + connect(this, &QtErrorDisplay::MainWindowRequestExit, &parent, + &GMainWindow::ErrorDisplayRequestExit, Qt::QueuedConnection); connect(&parent, &GMainWindow::ErrorDisplayFinished, this, &QtErrorDisplay::MainWindowFinishedError, Qt::DirectConnection); } QtErrorDisplay::~QtErrorDisplay() = default; +void QtErrorDisplay::Close() const { + callback = {}; + emit MainWindowRequestExit(); +} + void QtErrorDisplay::ShowError(Result error, FinishedCallback finished) const { callback = std::move(finished); emit MainWindowDisplayError( @@ -55,5 +62,7 @@ void QtErrorDisplay::ShowCustomErrorText(Result error, std::string dialog_text, } void QtErrorDisplay::MainWindowFinishedError() { - callback(); + if (callback) { + callback(); + } } diff --git a/src/yuzu/applets/qt_error.h b/src/yuzu/applets/qt_error.h index e4e174721..957f170ad 100644 --- a/src/yuzu/applets/qt_error.h +++ b/src/yuzu/applets/qt_error.h @@ -16,6 +16,7 @@ public: explicit QtErrorDisplay(GMainWindow& parent); ~QtErrorDisplay() override; + void Close() const override; void ShowError(Result error, FinishedCallback finished) const override; void ShowErrorWithTimestamp(Result error, std::chrono::seconds time, FinishedCallback finished) const override; @@ -24,6 +25,7 @@ public: signals: void MainWindowDisplayError(QString error_code, QString error_text) const; + void MainWindowRequestExit() const; private: void MainWindowFinishedError(); diff --git a/src/yuzu/applets/qt_profile_select.cpp b/src/yuzu/applets/qt_profile_select.cpp index 4145c5299..c0a1d5ab7 100644 --- a/src/yuzu/applets/qt_profile_select.cpp +++ b/src/yuzu/applets/qt_profile_select.cpp @@ -157,17 +157,26 @@ void QtProfileSelectionDialog::SelectUser(const QModelIndex& index) { QtProfileSelector::QtProfileSelector(GMainWindow& parent) { connect(this, &QtProfileSelector::MainWindowSelectProfile, &parent, &GMainWindow::ProfileSelectorSelectProfile, Qt::QueuedConnection); + connect(this, &QtProfileSelector::MainWindowRequestExit, &parent, + &GMainWindow::ProfileSelectorRequestExit, Qt::QueuedConnection); connect(&parent, &GMainWindow::ProfileSelectorFinishedSelection, this, &QtProfileSelector::MainWindowFinishedSelection, Qt::DirectConnection); } QtProfileSelector::~QtProfileSelector() = default; +void QtProfileSelector::Close() const { + callback = {}; + emit MainWindowRequestExit(); +} + void QtProfileSelector::SelectProfile(SelectProfileCallback callback_) const { callback = std::move(callback_); emit MainWindowSelectProfile(); } void QtProfileSelector::MainWindowFinishedSelection(std::optional uuid) { - callback(uuid); + if (callback) { + callback(uuid); + } } diff --git a/src/yuzu/applets/qt_profile_select.h b/src/yuzu/applets/qt_profile_select.h index 637a3bda2..9f214d071 100644 --- a/src/yuzu/applets/qt_profile_select.h +++ b/src/yuzu/applets/qt_profile_select.h @@ -65,10 +65,12 @@ public: explicit QtProfileSelector(GMainWindow& parent); ~QtProfileSelector() override; + void Close() const override; void SelectProfile(SelectProfileCallback callback_) const override; signals: void MainWindowSelectProfile() const; + void MainWindowRequestExit() const; private: void MainWindowFinishedSelection(std::optional uuid); diff --git a/src/yuzu/applets/qt_software_keyboard.h b/src/yuzu/applets/qt_software_keyboard.h index 30ac8ecf6..ac23ce047 100644 --- a/src/yuzu/applets/qt_software_keyboard.h +++ b/src/yuzu/applets/qt_software_keyboard.h @@ -233,6 +233,10 @@ public: explicit QtSoftwareKeyboard(GMainWindow& parent); ~QtSoftwareKeyboard() override; + void Close() const override { + ExitKeyboard(); + } + void InitializeKeyboard(bool is_inline, Core::Frontend::KeyboardInitializeParameters initialize_parameters, SubmitNormalCallback submit_normal_callback_, diff --git a/src/yuzu/applets/qt_web_browser.cpp b/src/yuzu/applets/qt_web_browser.cpp index 0a5912326..28acc0ff8 100644 --- a/src/yuzu/applets/qt_web_browser.cpp +++ b/src/yuzu/applets/qt_web_browser.cpp @@ -393,6 +393,8 @@ void QtNXWebEngineView::FocusFirstLinkElement() { QtWebBrowser::QtWebBrowser(GMainWindow& main_window) { connect(this, &QtWebBrowser::MainWindowOpenWebPage, &main_window, &GMainWindow::WebBrowserOpenWebPage, Qt::QueuedConnection); + connect(this, &QtWebBrowser::MainWindowRequestExit, &main_window, + &GMainWindow::WebBrowserRequestExit, Qt::QueuedConnection); connect(&main_window, &GMainWindow::WebBrowserExtractOfflineRomFS, this, &QtWebBrowser::MainWindowExtractOfflineRomFS, Qt::QueuedConnection); connect(&main_window, &GMainWindow::WebBrowserClosed, this, @@ -401,6 +403,11 @@ QtWebBrowser::QtWebBrowser(GMainWindow& main_window) { QtWebBrowser::~QtWebBrowser() = default; +void QtWebBrowser::Close() const { + callback = {}; + emit MainWindowRequestExit(); +} + void QtWebBrowser::OpenLocalWebPage(const std::string& local_url, ExtractROMFSCallback extract_romfs_callback_, OpenWebPageCallback callback_) const { @@ -436,5 +443,7 @@ void QtWebBrowser::MainWindowExtractOfflineRomFS() { void QtWebBrowser::MainWindowWebBrowserClosed(Service::AM::Applets::WebExitReason exit_reason, std::string last_url) { - callback(exit_reason, last_url); + if (callback) { + callback(exit_reason, last_url); + } } diff --git a/src/yuzu/applets/qt_web_browser.h b/src/yuzu/applets/qt_web_browser.h index ceae7926e..1234108ae 100644 --- a/src/yuzu/applets/qt_web_browser.h +++ b/src/yuzu/applets/qt_web_browser.h @@ -196,6 +196,7 @@ public: explicit QtWebBrowser(GMainWindow& parent); ~QtWebBrowser() override; + void Close() const override; void OpenLocalWebPage(const std::string& local_url, ExtractROMFSCallback extract_romfs_callback_, OpenWebPageCallback callback_) const override; @@ -206,6 +207,7 @@ public: signals: void MainWindowOpenWebPage(const std::string& main_url, const std::string& additional_args, bool is_local) const; + void MainWindowRequestExit() const; private: void MainWindowExtractOfflineRomFS(); diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index ae14884b5..19968bc21 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -596,27 +596,45 @@ void GMainWindow::RegisterMetaTypes() { void GMainWindow::AmiiboSettingsShowDialog(const Core::Frontend::CabinetParameters& parameters, std::shared_ptr nfp_device) { - QtAmiiboSettingsDialog dialog(this, parameters, input_subsystem.get(), nfp_device); + cabinet_applet = + new QtAmiiboSettingsDialog(this, parameters, input_subsystem.get(), nfp_device); + SCOPE_EXIT({ + cabinet_applet->deleteLater(); + cabinet_applet = nullptr; + }); - dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint | - Qt::WindowTitleHint | Qt::WindowSystemMenuHint); - dialog.setWindowModality(Qt::WindowModal); - if (dialog.exec() == QDialog::Rejected) { + cabinet_applet->setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint | + Qt::WindowTitleHint | Qt::WindowSystemMenuHint); + cabinet_applet->setWindowModality(Qt::WindowModal); + + if (cabinet_applet->exec() == QDialog::Rejected) { emit AmiiboSettingsFinished(false, {}); return; } - emit AmiiboSettingsFinished(true, dialog.GetName()); + emit AmiiboSettingsFinished(true, cabinet_applet->GetName()); +} + +void GMainWindow::AmiiboSettingsRequestExit() { + if (cabinet_applet) { + cabinet_applet->reject(); + } } void GMainWindow::ControllerSelectorReconfigureControllers( const Core::Frontend::ControllerParameters& parameters) { - QtControllerSelectorDialog dialog(this, parameters, input_subsystem.get(), *system); + controller_applet = + new QtControllerSelectorDialog(this, parameters, input_subsystem.get(), *system); + SCOPE_EXIT({ + controller_applet->deleteLater(); + controller_applet = nullptr; + }); - dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint | - Qt::WindowTitleHint | Qt::WindowSystemMenuHint); - dialog.setWindowModality(Qt::WindowModal); - dialog.exec(); + controller_applet->setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | + Qt::WindowStaysOnTopHint | Qt::WindowTitleHint | + Qt::WindowSystemMenuHint); + controller_applet->setWindowModality(Qt::WindowModal); + controller_applet->exec(); emit ControllerSelectorReconfigureFinished(); @@ -627,19 +645,30 @@ void GMainWindow::ControllerSelectorReconfigureControllers( UpdateStatusButtons(); } +void GMainWindow::ControllerSelectorRequestExit() { + if (controller_applet) { + controller_applet->reject(); + } +} + void GMainWindow::ProfileSelectorSelectProfile() { - QtProfileSelectionDialog dialog(system->HIDCore(), this); - dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint | - Qt::WindowTitleHint | Qt::WindowSystemMenuHint | - Qt::WindowCloseButtonHint); - dialog.setWindowModality(Qt::WindowModal); - if (dialog.exec() == QDialog::Rejected) { + profile_select_applet = new QtProfileSelectionDialog(system->HIDCore(), this); + SCOPE_EXIT({ + profile_select_applet->deleteLater(); + profile_select_applet = nullptr; + }); + + profile_select_applet->setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | + Qt::WindowStaysOnTopHint | Qt::WindowTitleHint | + Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint); + profile_select_applet->setWindowModality(Qt::WindowModal); + if (profile_select_applet->exec() == QDialog::Rejected) { emit ProfileSelectorFinishedSelection(std::nullopt); return; } const Service::Account::ProfileManager manager; - const auto uuid = manager.GetUser(static_cast(dialog.GetIndex())); + const auto uuid = manager.GetUser(static_cast(profile_select_applet->GetIndex())); if (!uuid.has_value()) { emit ProfileSelectorFinishedSelection(std::nullopt); return; @@ -648,6 +677,12 @@ void GMainWindow::ProfileSelectorSelectProfile() { emit ProfileSelectorFinishedSelection(uuid); } +void GMainWindow::ProfileSelectorRequestExit() { + if (profile_select_applet) { + profile_select_applet->reject(); + } +} + void GMainWindow::SoftwareKeyboardInitialize( bool is_inline, Core::Frontend::KeyboardInitializeParameters initialize_parameters) { if (software_keyboard) { @@ -772,7 +807,7 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url, return; } - QtNXWebEngineView web_browser_view(this, *system, input_subsystem.get()); + web_applet = new QtNXWebEngineView(this, *system, input_subsystem.get()); ui->action_Pause->setEnabled(false); ui->action_Restart->setEnabled(false); @@ -799,9 +834,9 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url, loading_progress.setValue(1); if (is_local) { - web_browser_view.LoadLocalWebPage(main_url, additional_args); + web_applet->LoadLocalWebPage(main_url, additional_args); } else { - web_browser_view.LoadExternalWebPage(main_url, additional_args); + web_applet->LoadExternalWebPage(main_url, additional_args); } if (render_window->IsLoadingComplete()) { @@ -810,15 +845,15 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url, const auto& layout = render_window->GetFramebufferLayout(); const auto scale_ratio = devicePixelRatioF(); - web_browser_view.resize(layout.screen.GetWidth() / scale_ratio, - layout.screen.GetHeight() / scale_ratio); - web_browser_view.move(layout.screen.left / scale_ratio, - (layout.screen.top / scale_ratio) + menuBar()->height()); - web_browser_view.setZoomFactor(static_cast(layout.screen.GetWidth() / scale_ratio) / - static_cast(Layout::ScreenUndocked::Width)); + web_applet->resize(layout.screen.GetWidth() / scale_ratio, + layout.screen.GetHeight() / scale_ratio); + web_applet->move(layout.screen.left / scale_ratio, + (layout.screen.top / scale_ratio) + menuBar()->height()); + web_applet->setZoomFactor(static_cast(layout.screen.GetWidth() / scale_ratio) / + static_cast(Layout::ScreenUndocked::Width)); - web_browser_view.setFocus(); - web_browser_view.show(); + web_applet->setFocus(); + web_applet->show(); loading_progress.setValue(2); @@ -831,7 +866,7 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url, // TODO (Morph): Remove this QAction* exit_action = new QAction(tr("Disable Web Applet"), this); - connect(exit_action, &QAction::triggered, this, [this, &web_browser_view] { + connect(exit_action, &QAction::triggered, this, [this] { const auto result = QMessageBox::warning( this, tr("Disable Web Applet"), tr("Disabling the web applet can lead to undefined behavior and should only be used " @@ -840,21 +875,21 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url, QMessageBox::Yes | QMessageBox::No); if (result == QMessageBox::Yes) { UISettings::values.disable_web_applet = true; - web_browser_view.SetFinished(true); + web_applet->SetFinished(true); } }); ui->menubar->addAction(exit_action); - while (!web_browser_view.IsFinished()) { + while (!web_applet->IsFinished()) { QCoreApplication::processEvents(); if (!exit_check) { - web_browser_view.page()->runJavaScript( + web_applet->page()->runJavaScript( QStringLiteral("end_applet;"), [&](const QVariant& variant) { exit_check = false; if (variant.toBool()) { - web_browser_view.SetFinished(true); - web_browser_view.SetExitReason( + web_applet->SetFinished(true); + web_applet->SetExitReason( Service::AM::Applets::WebExitReason::EndButtonPressed); } }); @@ -862,22 +897,22 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url, exit_check = true; } - if (web_browser_view.GetCurrentURL().contains(QStringLiteral("localhost"))) { - if (!web_browser_view.IsFinished()) { - web_browser_view.SetFinished(true); - web_browser_view.SetExitReason(Service::AM::Applets::WebExitReason::CallbackURL); + if (web_applet->GetCurrentURL().contains(QStringLiteral("localhost"))) { + if (!web_applet->IsFinished()) { + web_applet->SetFinished(true); + web_applet->SetExitReason(Service::AM::Applets::WebExitReason::CallbackURL); } - web_browser_view.SetLastURL(web_browser_view.GetCurrentURL().toStdString()); + web_applet->SetLastURL(web_applet->GetCurrentURL().toStdString()); } std::this_thread::sleep_for(std::chrono::milliseconds(1)); } - const auto exit_reason = web_browser_view.GetExitReason(); - const auto last_url = web_browser_view.GetLastURL(); + const auto exit_reason = web_applet->GetExitReason(); + const auto last_url = web_applet->GetLastURL(); - web_browser_view.hide(); + web_applet->hide(); render_window->setFocus(); @@ -903,6 +938,15 @@ void GMainWindow::WebBrowserOpenWebPage(const std::string& main_url, #endif } +void GMainWindow::WebBrowserRequestExit() { +#ifdef YUZU_USE_QT_WEB_ENGINE + if (web_applet) { + web_applet->SetExitReason(Service::AM::Applets::WebExitReason::ExitRequested); + web_applet->SetFinished(true); + } +#endif +} + void GMainWindow::InitializeWidgets() { #ifdef YUZU_ENABLE_COMPATIBILITY_REPORTING ui->action_Report_Compatibility->setVisible(true); @@ -3089,13 +3133,23 @@ void GMainWindow::OnSaveConfig() { } void GMainWindow::ErrorDisplayDisplayError(QString error_code, QString error_text) { - OverlayDialog dialog(render_window, *system, error_code, error_text, QString{}, tr("OK"), - Qt::AlignLeft | Qt::AlignVCenter); - dialog.exec(); + error_applet = new OverlayDialog(render_window, *system, error_code, error_text, QString{}, + tr("OK"), Qt::AlignLeft | Qt::AlignVCenter); + SCOPE_EXIT({ + error_applet->deleteLater(); + error_applet = nullptr; + }); + error_applet->exec(); emit ErrorDisplayFinished(); } +void GMainWindow::ErrorDisplayRequestExit() { + if (error_applet) { + error_applet->reject(); + } +} + void GMainWindow::OnMenuReportCompatibility() { #if defined(ARCHITECTURE_x86_64) && !defined(__APPLE__) const auto& caps = Common::GetCPUCaps(); diff --git a/src/yuzu/main.h b/src/yuzu/main.h index a23b373a5..a99938eaa 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -47,7 +47,11 @@ enum class DumpRomFSTarget; enum class InstalledEntryType; class GameListPlaceholder; +class QtAmiiboSettingsDialog; +class QtControllerSelectorDialog; +class QtProfileSelectionDialog; class QtSoftwareKeyboardDialog; +class QtNXWebEngineView; enum class StartGameType { Normal, // Can use custom configuration @@ -184,8 +188,10 @@ public slots: void OnSaveConfig(); void AmiiboSettingsShowDialog(const Core::Frontend::CabinetParameters& parameters, std::shared_ptr nfp_device); + void AmiiboSettingsRequestExit(); void ControllerSelectorReconfigureControllers( const Core::Frontend::ControllerParameters& parameters); + void ControllerSelectorRequestExit(); void SoftwareKeyboardInitialize( bool is_inline, Core::Frontend::KeyboardInitializeParameters initialize_parameters); void SoftwareKeyboardShowNormal(); @@ -196,9 +202,12 @@ public slots: void SoftwareKeyboardInlineTextChanged(Core::Frontend::InlineTextParameters text_parameters); void SoftwareKeyboardExit(); void ErrorDisplayDisplayError(QString error_code, QString error_text); + void ErrorDisplayRequestExit(); void ProfileSelectorSelectProfile(); + void ProfileSelectorRequestExit(); void WebBrowserOpenWebPage(const std::string& main_url, const std::string& additional_args, bool is_local); + void WebBrowserRequestExit(); void OnAppFocusStateChanged(Qt::ApplicationState state); void OnTasStateChanged(); @@ -466,7 +475,12 @@ private: QString last_filename_booted; // Applets + QtAmiiboSettingsDialog* cabinet_applet = nullptr; + QtControllerSelectorDialog* controller_applet = nullptr; + QtProfileSelectionDialog* profile_select_applet = nullptr; + QDialog* error_applet = nullptr; QtSoftwareKeyboardDialog* software_keyboard = nullptr; + QtNXWebEngineView* web_applet = nullptr; // True if amiibo file select is visible bool is_amiibo_file_select_active{}; From c4f5615c6b908b66eded0317d401ef327abe1dbb Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sat, 25 Mar 2023 15:56:57 -0400 Subject: [PATCH 0213/1181] CMakeLists: Require a minimum of boost 1.79.0 --- CMakeLists.txt | 2 +- vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 61c95444f..a6c43f401 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -210,7 +210,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) # ======================================================================= # Enforce the search mode of non-required packages for better and shorter failure messages -find_package(Boost 1.81.0 REQUIRED context) +find_package(Boost 1.79.0 REQUIRED context) find_package(enet 1.3 MODULE) find_package(fmt 9 REQUIRED) find_package(inih 52 MODULE COMPONENTS INIReader) diff --git a/vcpkg.json b/vcpkg.json index 9aadd367c..0352dab77 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "yuzu", - "builtin-baseline": "a7b6122f6b6504d16d96117336a0562693579933", + "builtin-baseline": "acc3bcf76b84ae5041c86ab55fe138ae7b8255c7", "version": "1.0", "dependencies": [ "boost-algorithm", From 9971cd1d55b0481a2af74a7694b6dcf686176c7c Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sat, 25 Mar 2023 22:43:55 -0400 Subject: [PATCH 0214/1181] common: Port boost's hash_value implementation Ports a small subset of boost's hash_value implementation (<= 1.80.0). --- src/common/CMakeLists.txt | 1 + src/common/container_hash.h | 91 +++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 src/common/container_hash.h diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 90805babe..c1d2b24a1 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -38,6 +38,7 @@ add_library(common STATIC common_precompiled_headers.h common_types.h concepts.h + container_hash.h demangle.cpp demangle.h div_ceil.h diff --git a/src/common/container_hash.h b/src/common/container_hash.h new file mode 100644 index 000000000..cfc5dfea8 --- /dev/null +++ b/src/common/container_hash.h @@ -0,0 +1,91 @@ +// SPDX-FileCopyrightText: 2005-2014 Daniel James +// SPDX-FileCopyrightText: 2016 Austin Appleby +// SPDX-License-Identifier: BSL-1.0 + +#include +#include +#include +#include +#include + +namespace Common { + +namespace detail { + +template + requires std::is_unsigned_v +inline std::size_t HashValue(T val) { + const unsigned int size_t_bits = std::numeric_limits::digits; + const unsigned int length = + (std::numeric_limits::digits - 1) / static_cast(size_t_bits); + + std::size_t seed = 0; + + for (unsigned int i = length * size_t_bits; i > 0; i -= size_t_bits) { + seed ^= static_cast(val >> i) + (seed << 6) + (seed >> 2); + } + + seed ^= static_cast(val) + (seed << 6) + (seed >> 2); + + return seed; +} + +template +struct HashCombineImpl { + template + static inline T fn(T seed, T value) { + seed ^= value + 0x9e3779b9 + (seed << 6) + (seed >> 2); + return seed; + } +}; + +template <> +struct HashCombineImpl<64> { + static inline std::uint64_t fn(std::uint64_t h, std::uint64_t k) { + const std::uint64_t m = (std::uint64_t(0xc6a4a793) << 32) + 0x5bd1e995; + const int r = 47; + + k *= m; + k ^= k >> r; + k *= m; + + h ^= k; + h *= m; + + // Completely arbitrary number, to prevent 0's + // from hashing to 0. + h += 0xe6546b64; + + return h; + } +}; + +} // namespace detail + +template +inline void HashCombine(std::size_t& seed, const T& v) { + seed = detail::HashCombineImpl::fn(seed, detail::HashValue(v)); +} + +template +inline std::size_t HashRange(It first, It last) { + std::size_t seed = 0; + + for (; first != last; ++first) { + HashCombine::value_type>(seed, *first); + } + + return seed; +} + +template +std::size_t HashValue(const std::array& v) { + return HashRange(v.cbegin(), v.cend()); +} + +template +std::size_t HashValue(const std::vector& v) { + return HashRange(v.cbegin(), v.cend()); +} + +} // namespace Common From f09d192aac68f382b841dd47a3e43a2d8ff87e4d Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sat, 25 Mar 2023 22:45:05 -0400 Subject: [PATCH 0215/1181] tests: Implement tests for verifying HashValue Values were randomly generated and the verification was done against boost 1.79. --- src/tests/CMakeLists.txt | 1 + src/tests/common/container_hash.cpp | 41 +++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 src/tests/common/container_hash.cpp diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index ae84408bc..39b774c98 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -4,6 +4,7 @@ add_executable(tests common/bit_field.cpp common/cityhash.cpp + common/container_hash.cpp common/fibers.cpp common/host_memory.cpp common/param_package.cpp diff --git a/src/tests/common/container_hash.cpp b/src/tests/common/container_hash.cpp new file mode 100644 index 000000000..923ac62db --- /dev/null +++ b/src/tests/common/container_hash.cpp @@ -0,0 +1,41 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include + +#include "common/common_types.h" +#include "common/container_hash.h" + +TEST_CASE("ContainerHash", "[common]") { + constexpr std::array U8Values{ + 114, 10, 238, 189, 199, 242, 86, 96, 53, 193, 195, 247, 249, 56, 253, 61, + 205, 3, 172, 4, 210, 197, 43, 72, 103, 8, 99, 89, 5, 97, 68, 196, + }; + constexpr std::array U16Values{ + 61586, 49151, 3313, 11641, 31695, 54795, 46764, 20965, 23287, 14039, 19265, + 49093, 58932, 22518, 27139, 42825, 57417, 54237, 48057, 14586, 42813, 32994, + 33970, 45501, 5619, 15895, 33227, 27509, 25391, 37275, 60218, 17599, + }; + constexpr std::array U32Values{ + 3838402410, 2029146863, 1730869921, 985528872, 186773874, 2094639868, 3324775932, + 1795512424, 2571165571, 3256934519, 2358691590, 2752682538, 1484336451, 378124520, + 3463015699, 3395942161, 1263211979, 3473632889, 3039822212, 2068707357, 2223837919, + 1823232191, 1583884041, 1264393380, 4087566993, 3188607101, 3933680362, 1464520765, + 1786838406, 1311734848, 2773642241, 3993641692, + }; + constexpr std::array U64Values{ + 5908025796157537817, 10947547850358315100, 844798943576724669, 7999662937458523703, + 4006550374705895164, 1832550525423503632, 9323088254855830976, 12028890075598379412, + 6021511300787826236, 7864675007938747948, 18099387408859708806, 6438638299316820708, + 9029399285648501543, 18195459433089960253, 17214335092761966083, 5549347964591337833, + 14899526073304962015, 5058883181561464475, 7436311795731206973, 7535129567768649864, + 1287169596809258072, 8237671246353565927, 1715230541978016153, 8443157615068813300, + 6098675262328527839, 704652094100376853, 1303411723202926503, 7808312933946424854, + 6863726670433556594, 9870361541383217495, 9273671094091079488, 17541434976160119010, + }; + + REQUIRE(Common::HashValue(U8Values) == 5867183267093890552); + REQUIRE(Common::HashValue(U16Values) == 9594135570564347135); + REQUIRE(Common::HashValue(U32Values) == 13123757214696618460); + REQUIRE(Common::HashValue(U64Values) == 7296500016546938380); +} From 49f6deecb8a29fb1f57bdc56dda5fcfbb3d311e3 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sat, 25 Mar 2023 23:02:37 -0400 Subject: [PATCH 0216/1181] video_core/macro: Make use of Common::HashValue --- src/video_core/macro/macro.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video_core/macro/macro.cpp b/src/video_core/macro/macro.cpp index 82ad0477d..905505ca1 100644 --- a/src/video_core/macro/macro.cpp +++ b/src/video_core/macro/macro.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include "common/container_hash.h" #include #include "common/assert.h" @@ -89,7 +89,7 @@ void MacroEngine::Execute(u32 method, const std::vector& parameters) { if (!mid_method.has_value()) { cache_info.lle_program = Compile(macro_code->second); - cache_info.hash = boost::hash_value(macro_code->second); + cache_info.hash = Common::HashValue(macro_code->second); if (Settings::values.dump_macros) { Dump(cache_info.hash, macro_code->second); } @@ -100,7 +100,7 @@ void MacroEngine::Execute(u32 method, const std::vector& parameters) { code.resize(macro_cached.size() - rebased_method); std::memcpy(code.data(), macro_cached.data() + rebased_method, code.size() * sizeof(u32)); - cache_info.hash = boost::hash_value(code); + cache_info.hash = Common::HashValue(code); cache_info.lle_program = Compile(code); if (Settings::values.dump_macros) { Dump(cache_info.hash, code); From 7017f04ee8b92e34b4d4ba6d72d3fa5b20a5312e Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 26 Mar 2023 10:24:33 -0400 Subject: [PATCH 0217/1181] container_hash: use climits --- src/common/container_hash.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/container_hash.h b/src/common/container_hash.h index cfc5dfea8..a5e357745 100644 --- a/src/common/container_hash.h +++ b/src/common/container_hash.h @@ -3,6 +3,7 @@ // SPDX-License-Identifier: BSL-1.0 #include +#include #include #include #include From 1476ffd865788d5822ac195448df0aade63edb73 Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 26 Mar 2023 15:39:07 -0400 Subject: [PATCH 0218/1181] tests: mark integer literals as unsigned --- src/tests/common/container_hash.cpp | 37 ++++++++++++++++------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/src/tests/common/container_hash.cpp b/src/tests/common/container_hash.cpp index 923ac62db..dc45565ef 100644 --- a/src/tests/common/container_hash.cpp +++ b/src/tests/common/container_hash.cpp @@ -17,25 +17,28 @@ TEST_CASE("ContainerHash", "[common]") { 33970, 45501, 5619, 15895, 33227, 27509, 25391, 37275, 60218, 17599, }; constexpr std::array U32Values{ - 3838402410, 2029146863, 1730869921, 985528872, 186773874, 2094639868, 3324775932, - 1795512424, 2571165571, 3256934519, 2358691590, 2752682538, 1484336451, 378124520, - 3463015699, 3395942161, 1263211979, 3473632889, 3039822212, 2068707357, 2223837919, - 1823232191, 1583884041, 1264393380, 4087566993, 3188607101, 3933680362, 1464520765, - 1786838406, 1311734848, 2773642241, 3993641692, + 3838402410U, 2029146863U, 1730869921U, 985528872U, 186773874U, 2094639868U, 3324775932U, + 1795512424U, 2571165571U, 3256934519U, 2358691590U, 2752682538U, 1484336451U, 378124520U, + 3463015699U, 3395942161U, 1263211979U, 3473632889U, 3039822212U, 2068707357U, 2223837919U, + 1823232191U, 1583884041U, 1264393380U, 4087566993U, 3188607101U, 3933680362U, 1464520765U, + 1786838406U, 1311734848U, 2773642241U, 3993641692U, }; constexpr std::array U64Values{ - 5908025796157537817, 10947547850358315100, 844798943576724669, 7999662937458523703, - 4006550374705895164, 1832550525423503632, 9323088254855830976, 12028890075598379412, - 6021511300787826236, 7864675007938747948, 18099387408859708806, 6438638299316820708, - 9029399285648501543, 18195459433089960253, 17214335092761966083, 5549347964591337833, - 14899526073304962015, 5058883181561464475, 7436311795731206973, 7535129567768649864, - 1287169596809258072, 8237671246353565927, 1715230541978016153, 8443157615068813300, - 6098675262328527839, 704652094100376853, 1303411723202926503, 7808312933946424854, - 6863726670433556594, 9870361541383217495, 9273671094091079488, 17541434976160119010, + 5908025796157537817ULL, 10947547850358315100ULL, 844798943576724669ULL, + 7999662937458523703ULL, 4006550374705895164ULL, 1832550525423503632ULL, + 9323088254855830976ULL, 12028890075598379412ULL, 6021511300787826236ULL, + 7864675007938747948ULL, 18099387408859708806ULL, 6438638299316820708ULL, + 9029399285648501543ULL, 18195459433089960253ULL, 17214335092761966083ULL, + 5549347964591337833ULL, 14899526073304962015ULL, 5058883181561464475ULL, + 7436311795731206973ULL, 7535129567768649864ULL, 1287169596809258072ULL, + 8237671246353565927ULL, 1715230541978016153ULL, 8443157615068813300ULL, + 6098675262328527839ULL, 704652094100376853ULL, 1303411723202926503ULL, + 7808312933946424854ULL, 6863726670433556594ULL, 9870361541383217495ULL, + 9273671094091079488ULL, 17541434976160119010ULL, }; - REQUIRE(Common::HashValue(U8Values) == 5867183267093890552); - REQUIRE(Common::HashValue(U16Values) == 9594135570564347135); - REQUIRE(Common::HashValue(U32Values) == 13123757214696618460); - REQUIRE(Common::HashValue(U64Values) == 7296500016546938380); + REQUIRE(Common::HashValue(U8Values) == 5867183267093890552ULL); + REQUIRE(Common::HashValue(U16Values) == 9594135570564347135ULL); + REQUIRE(Common::HashValue(U32Values) == 13123757214696618460ULL); + REQUIRE(Common::HashValue(U64Values) == 7296500016546938380ULL); } From 880264673068c61ef680deffc1a26b4089713282 Mon Sep 17 00:00:00 2001 From: german77 Date: Sun, 26 Mar 2023 14:26:21 -0600 Subject: [PATCH 0219/1181] service: nfp: Add plain amiibo support --- src/core/hle/service/nfp/amiibo_crypto.cpp | 4 +++ src/core/hle/service/nfp/amiibo_crypto.h | 3 ++ src/core/hle/service/nfp/nfp_device.cpp | 34 +++++++++++++++++----- src/core/hle/service/nfp/nfp_device.h | 1 + src/core/hle/service/nfp/nfp_types.h | 3 +- 5 files changed, 37 insertions(+), 8 deletions(-) diff --git a/src/core/hle/service/nfp/amiibo_crypto.cpp b/src/core/hle/service/nfp/amiibo_crypto.cpp index bba862fb2..a3622e792 100644 --- a/src/core/hle/service/nfp/amiibo_crypto.cpp +++ b/src/core/hle/service/nfp/amiibo_crypto.cpp @@ -70,6 +70,10 @@ bool IsAmiiboValid(const EncryptedNTAG215File& ntag_file) { return true; } +bool IsAmiiboValid(const NTAG215File& ntag_file) { + return IsAmiiboValid(EncodedDataToNfcData(ntag_file)); +} + NTAG215File NfcDataToEncodedData(const EncryptedNTAG215File& nfc_data) { NTAG215File encoded_data{}; diff --git a/src/core/hle/service/nfp/amiibo_crypto.h b/src/core/hle/service/nfp/amiibo_crypto.h index c9fd67a39..f6208ee6b 100644 --- a/src/core/hle/service/nfp/amiibo_crypto.h +++ b/src/core/hle/service/nfp/amiibo_crypto.h @@ -60,6 +60,9 @@ static_assert(sizeof(DerivedKeys) == 0x30, "DerivedKeys is an invalid size"); /// Validates that the amiibo file is not corrupted bool IsAmiiboValid(const EncryptedNTAG215File& ntag_file); +/// Validates that the amiibo file is not corrupted +bool IsAmiiboValid(const NTAG215File& ntag_file); + /// Converts from encrypted file format to encoded file format NTAG215File NfcDataToEncodedData(const EncryptedNTAG215File& nfc_data); diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfp/nfp_device.cpp index 5990e1473..607e70968 100644 --- a/src/core/hle/service/nfp/nfp_device.cpp +++ b/src/core/hle/service/nfp/nfp_device.cpp @@ -121,7 +121,16 @@ bool NfpDevice::LoadAmiibo(std::span data) { // TODO: Filter by allowed_protocols here - memcpy(&encrypted_tag_data, data.data(), sizeof(EncryptedNTAG215File)); + memcpy(&tag_data, data.data(), sizeof(EncryptedNTAG215File)); + is_plain_amiibo = AmiiboCrypto::IsAmiiboValid(tag_data); + + if (is_plain_amiibo) { + encrypted_tag_data = AmiiboCrypto::EncodedDataToNfcData(tag_data); + LOG_INFO(Service_NFP, "Using plain amiibo"); + } else { + tag_data = {}; + memcpy(&encrypted_tag_data, data.data(), sizeof(EncryptedNTAG215File)); + } device_state = DeviceState::TagFound; deactivate_event->GetReadableEvent().Clear(); @@ -232,13 +241,17 @@ Result NfpDevice::Flush() { tag_data.write_counter++; - if (!AmiiboCrypto::EncodeAmiibo(tag_data, encrypted_tag_data)) { - LOG_ERROR(Service_NFP, "Failed to encode data"); - return WriteAmiiboFailed; - } + std::vector data(sizeof(EncryptedNTAG215File)); + if (is_plain_amiibo) { + memcpy(data.data(), &tag_data, sizeof(tag_data)); + } else { + if (!AmiiboCrypto::EncodeAmiibo(tag_data, encrypted_tag_data)) { + LOG_ERROR(Service_NFP, "Failed to encode data"); + return WriteAmiiboFailed; + } - std::vector data(sizeof(encrypted_tag_data)); - memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data)); + memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data)); + } if (!npad_device->WriteNfc(data)) { LOG_ERROR(Service_NFP, "Error writing to file"); @@ -256,6 +269,13 @@ Result NfpDevice::Mount(MountTarget mount_target_) { return WrongDeviceState; } + // The loaded amiibo is not encrypted + if (is_plain_amiibo) { + device_state = DeviceState::TagMounted; + mount_target = mount_target_; + return ResultSuccess; + } + if (!AmiiboCrypto::IsAmiiboValid(encrypted_tag_data)) { LOG_ERROR(Service_NFP, "Not an amiibo"); return NotAnAmiibo; diff --git a/src/core/hle/service/nfp/nfp_device.h b/src/core/hle/service/nfp/nfp_device.h index 27122e86e..7f963730d 100644 --- a/src/core/hle/service/nfp/nfp_device.h +++ b/src/core/hle/service/nfp/nfp_device.h @@ -95,6 +95,7 @@ private: bool is_initalized{}; bool is_data_moddified{}; bool is_app_area_open{}; + bool is_plain_amiibo{}; TagProtocol allowed_protocols{}; s64 current_posix_time{}; MountTarget mount_target{MountTarget::None}; diff --git a/src/core/hle/service/nfp/nfp_types.h b/src/core/hle/service/nfp/nfp_types.h index b3599a513..70c878552 100644 --- a/src/core/hle/service/nfp/nfp_types.h +++ b/src/core/hle/service/nfp/nfp_types.h @@ -309,7 +309,8 @@ struct EncryptedNTAG215File { u32 CFG1; // Defines number of verification attempts NTAG215Password password; // Password data }; -static_assert(sizeof(EncryptedNTAG215File) == 0x21C, "EncryptedNTAG215File is an invalid size"); +static_assert(sizeof(EncryptedNTAG215File) == sizeof(NTAG215File), + "EncryptedNTAG215File is an invalid size"); static_assert(std::is_trivially_copyable_v, "EncryptedNTAG215File must be trivially copyable."); From d8fc3f403b62e2b3d67ec08791fdc66847ddb4ac Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Sat, 18 Mar 2023 20:52:02 +0000 Subject: [PATCH 0220/1181] audio: Interpolate system manager sample count using host sink sample info This avoids the need to stall if the host sink sporadically misses the deadline, in such a case the previous implementation would report them samples as being played on-time, causing the guest to send more samples and leading to a gradual buildup. --- src/audio_core/device/device_session.cpp | 3 +-- src/audio_core/renderer/system_manager.cpp | 1 - src/audio_core/sink/sink_stream.cpp | 21 +++++++++++++++++++++ src/audio_core/sink/sink_stream.h | 17 +++++++++++++++++ 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/src/audio_core/device/device_session.cpp b/src/audio_core/device/device_session.cpp index 5a327a606..ad0f40e28 100644 --- a/src/audio_core/device/device_session.cpp +++ b/src/audio_core/device/device_session.cpp @@ -121,8 +121,7 @@ u64 DeviceSession::GetPlayedSampleCount() const { } std::optional DeviceSession::ThreadFunc() { - // Add 5ms of samples at a 48K sample rate. - played_sample_count += 48'000 * INCREMENT_TIME / 1s; + played_sample_count = stream->GetExpectedPlayedSampleCount(); if (type == Sink::StreamType::Out) { system.AudioCore().GetAudioManager().SetEvent(Event::Type::AudioOutManager, true); } else { diff --git a/src/audio_core/renderer/system_manager.cpp b/src/audio_core/renderer/system_manager.cpp index ce631f810..9ddfa4a91 100644 --- a/src/audio_core/renderer/system_manager.cpp +++ b/src/audio_core/renderer/system_manager.cpp @@ -15,7 +15,6 @@ MICROPROFILE_DEFINE(Audio_RenderSystemManager, "Audio", "Render System Manager", MP_RGB(60, 19, 97)); namespace AudioCore::AudioRenderer { -constexpr std::chrono::nanoseconds RENDER_TIME{5'000'000UL}; SystemManager::SystemManager(Core::System& core_) : core{core_}, adsp{core.AudioCore().GetADSP()}, mailbox{adsp.GetRenderMailbox()}, diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index 39a21b0f0..1af96f793 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -14,6 +14,8 @@ #include "common/fixed_point.h" #include "common/settings.h" #include "core/core.h" +#include "core/core_timing.h" +#include "core/core_timing_util.h" namespace AudioCore::Sink { @@ -198,6 +200,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz const std::size_t frame_size = num_channels; const std::size_t frame_size_bytes = frame_size * sizeof(s16); size_t frames_written{0}; + size_t actual_frames_written{0}; // If we're paused or going to shut down, we don't want to consume buffers as coretiming is // paused and we'll desync, so just play silence. @@ -248,6 +251,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz frames_available * frame_size); frames_written += frames_available; + actual_frames_written += frames_available; playing_buffer.frames_played += frames_available; // If that's all the frames in the current buffer, add its samples and mark it as @@ -260,6 +264,13 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz std::memcpy(&last_frame[0], &output_buffer[(frames_written - 1) * frame_size], frame_size_bytes); + { + std::scoped_lock lk{sample_count_lock}; + last_sample_count_update_time = Core::Timing::CyclesToUs(system.CoreTiming().GetClockTicks()); + min_played_sample_count = max_played_sample_count; + max_played_sample_count += actual_frames_written; + } + if (system.IsMulticore() && queued_buffers <= max_queue_size) { Unstall(); } @@ -282,4 +293,14 @@ void SinkStream::Unstall() { stalled_lock.unlock(); } +u64 SinkStream::GetExpectedPlayedSampleCount() { + std::scoped_lock lk{sample_count_lock}; + auto cur_time{Core::Timing::CyclesToUs(system.CoreTiming().GetClockTicks())}; + auto time_delta{cur_time - last_sample_count_update_time}; + auto exp_played_sample_count{min_played_sample_count + + (TargetSampleRate * time_delta) / std::chrono::seconds{1}}; + + return std::min(exp_played_sample_count, max_played_sample_count); +} + } // namespace AudioCore::Sink diff --git a/src/audio_core/sink/sink_stream.h b/src/audio_core/sink/sink_stream.h index 5fea72ab7..2340c936c 100644 --- a/src/audio_core/sink/sink_stream.h +++ b/src/audio_core/sink/sink_stream.h @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -14,6 +15,7 @@ #include "common/common_types.h" #include "common/reader_writer_queue.h" #include "common/ring_buffer.h" +#include "common/thread.h" namespace Core { class System; @@ -210,6 +212,13 @@ public: */ void Unstall(); + /** + * Get the total number of samples expected to have been played by this stream. + * + * @return The number of samples. + */ + u64 GetExpectedPlayedSampleCount(); + protected: /// Core system Core::System& system; @@ -237,6 +246,14 @@ private: std::atomic queued_buffers{}; /// The ring size for audio out buffers (usually 4, rarely 2 or 8) u32 max_queue_size{}; + /// Locks access to sample count tracking info + std::mutex sample_count_lock; + /// Minimum number of total samples that have been played since the last callback + u64 min_played_sample_count{}; + /// Maximum number of total samples that can be played since the last callback + u64 max_played_sample_count{}; + /// The time the two above tracking variables were last written to + std::chrono::microseconds last_sample_count_update_time{}; /// Set by the audio render/in/out system which uses this stream f32 system_volume{1.0f}; /// Set via IAudioDevice service calls From 2fbadc7e1f5db0773e73f6c192472cf6c2e8ab0c Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Mon, 27 Mar 2023 12:18:26 -0600 Subject: [PATCH 0221/1181] qt: Fix log softlock --- src/yuzu/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index ae14884b5..e65a36e2e 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -307,6 +307,8 @@ GMainWindow::GMainWindow(std::unique_ptr config_, bool has_broken_vulkan system->Initialize(); Common::Log::Initialize(); + Common::Log::Start(); + LoadTranslation(); setAcceptDrops(true); @@ -449,8 +451,6 @@ GMainWindow::GMainWindow(std::unique_ptr config_, bool has_broken_vulkan SetupPrepareForSleep(); - Common::Log::Start(); - QStringList args = QApplication::arguments(); if (args.size() < 2) { From c2c7386dfd2041f9e8c5653cf6016d6b77afe124 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Mon, 27 Mar 2023 13:24:56 -0600 Subject: [PATCH 0222/1181] service: hid: Silence warning on MergeSingleJoyAsDualJoy --- src/core/hle/service/hid/controllers/npad.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index ba6f04d8d..21bd7b0c5 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -1388,7 +1388,8 @@ Result Controller_NPad::MergeSingleJoyAsDualJoy(Core::HID::NpadIdType npad_id_1, return NpadIsDualJoycon; } - // Disconnect the joycon at the second id and connect the dual joycon at the first index. + // Disconnect the joycons and connect them as dual joycon at the first index. + DisconnectNpad(npad_id_1); DisconnectNpad(npad_id_2); controller_1.is_dual_left_connected = true; controller_1.is_dual_right_connected = true; From ea5dd02db9bdb9759a400907672ec6606bebb96b Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Sat, 18 Mar 2023 20:57:00 +0000 Subject: [PATCH 0223/1181] audio: Wait for samples on the emulated DSP side to avoid desyncs Waiting on the host side is inaccurate and leads to desyncs in the event of the sink missing a deadline that require stalls to fix. By waiting for the sink to have space before even starting rendering such desyncs can be avoided. --- .../renderer/adsp/audio_renderer.cpp | 2 ++ src/audio_core/renderer/adsp/audio_renderer.h | 1 + src/audio_core/renderer/system_manager.cpp | 18 +----------------- src/audio_core/renderer/system_manager.h | 7 ------- src/audio_core/sink/sink_stream.cpp | 15 +++++++++++++++ src/audio_core/sink/sink_stream.h | 9 +++++++++ 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/audio_core/renderer/adsp/audio_renderer.cpp b/src/audio_core/renderer/adsp/audio_renderer.cpp index 42b4b167a..503f40349 100644 --- a/src/audio_core/renderer/adsp/audio_renderer.cpp +++ b/src/audio_core/renderer/adsp/audio_renderer.cpp @@ -189,6 +189,8 @@ void AudioRenderer::ThreadFunc() { max_time = std::min(command_buffer.time_limit, max_time); command_list_processor.SetProcessTimeMax(max_time); + streams[index]->WaitFreeSpace(); + // Process the command list { MICROPROFILE_SCOPE(Audio_Renderer); diff --git a/src/audio_core/renderer/adsp/audio_renderer.h b/src/audio_core/renderer/adsp/audio_renderer.h index 151f38c1b..f97f9401e 100644 --- a/src/audio_core/renderer/adsp/audio_renderer.h +++ b/src/audio_core/renderer/adsp/audio_renderer.h @@ -12,6 +12,7 @@ #include "common/common_types.h" #include "common/reader_writer_queue.h" #include "common/thread.h" +#include "common/polyfill_thread.h" namespace Core { namespace Timing { diff --git a/src/audio_core/renderer/system_manager.cpp b/src/audio_core/renderer/system_manager.cpp index 9ddfa4a91..07d8ed093 100644 --- a/src/audio_core/renderer/system_manager.cpp +++ b/src/audio_core/renderer/system_manager.cpp @@ -17,11 +17,7 @@ MICROPROFILE_DEFINE(Audio_RenderSystemManager, "Audio", "Render System Manager", namespace AudioCore::AudioRenderer { SystemManager::SystemManager(Core::System& core_) - : core{core_}, adsp{core.AudioCore().GetADSP()}, mailbox{adsp.GetRenderMailbox()}, - thread_event{Core::Timing::CreateEvent( - "AudioRendererSystemManager", [this](std::uintptr_t, s64 time, std::chrono::nanoseconds) { - return ThreadFunc2(time); - })} {} + : core{core_}, adsp{core.AudioCore().GetADSP()}, mailbox{adsp.GetRenderMailbox()} {} SystemManager::~SystemManager() { Stop(); @@ -32,8 +28,6 @@ bool SystemManager::InitializeUnsafe() { if (adsp.Start()) { active = true; thread = std::jthread([this](std::stop_token stop_token) { ThreadFunc(); }); - core.CoreTiming().ScheduleLoopingEvent(std::chrono::nanoseconds(0), RENDER_TIME, - thread_event); } } @@ -44,7 +38,6 @@ void SystemManager::Stop() { if (!active) { return; } - core.CoreTiming().UnscheduleEvent(thread_event, {}); active = false; update.store(true); update.notify_all(); @@ -110,16 +103,7 @@ void SystemManager::ThreadFunc() { adsp.Signal(); adsp.Wait(); - - update.wait(false); - update.store(false); } } -std::optional SystemManager::ThreadFunc2(s64 time) { - update.store(true); - update.notify_all(); - return std::nullopt; -} - } // namespace AudioCore::AudioRenderer diff --git a/src/audio_core/renderer/system_manager.h b/src/audio_core/renderer/system_manager.h index 415ddb74f..1f0bbd8b4 100644 --- a/src/audio_core/renderer/system_manager.h +++ b/src/audio_core/renderer/system_manager.h @@ -68,11 +68,6 @@ private: */ void ThreadFunc(); - /** - * Signalling core timing thread to run ThreadFunc. - */ - std::optional ThreadFunc2(s64 time); - enum class StreamState { Filling, Steady, @@ -95,8 +90,6 @@ private: ADSP::ADSP& adsp; /// AudioRenderer mailbox for communication ADSP::AudioRenderer_Mailbox* mailbox{}; - /// Core timing event to signal main thread - std::shared_ptr thread_event; /// Atomic for main thread to wait on std::atomic update{}; }; diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index 1af96f793..a54c61845 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -205,6 +205,10 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz // If we're paused or going to shut down, we don't want to consume buffers as coretiming is // paused and we'll desync, so just play silence. if (system.IsPaused() || system.IsShuttingDown()) { + if (system.IsShuttingDown()) { + release_cv.notify_one(); + } + static constexpr std::array silence{}; for (size_t i = frames_written; i < num_frames; i++) { std::memcpy(&output_buffer[i * frame_size], &silence[0], frame_size_bytes); @@ -240,6 +244,12 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz } // Successfully dequeued a new buffer. queued_buffers--; + + { + std::unique_lock lk{release_mutex}; + } + + release_cv.notify_one(); } // Get the minimum frames available between the currently playing buffer, and the @@ -303,4 +313,9 @@ u64 SinkStream::GetExpectedPlayedSampleCount() { return std::min(exp_played_sample_count, max_played_sample_count); } +void SinkStream::WaitFreeSpace() { + std::unique_lock lk{release_mutex}; + release_cv.wait(lk, [this]() { return queued_buffers < max_queue_size || system.IsShuttingDown(); }); +} + } // namespace AudioCore::Sink diff --git a/src/audio_core/sink/sink_stream.h b/src/audio_core/sink/sink_stream.h index 2340c936c..709f3b0ec 100644 --- a/src/audio_core/sink/sink_stream.h +++ b/src/audio_core/sink/sink_stream.h @@ -16,6 +16,7 @@ #include "common/reader_writer_queue.h" #include "common/ring_buffer.h" #include "common/thread.h" +#include "common/polyfill_thread.h" namespace Core { class System; @@ -219,6 +220,11 @@ public: */ u64 GetExpectedPlayedSampleCount(); + /** + * Waits for free space in the sample ring buffer + */ + void WaitFreeSpace(); + protected: /// Core system Core::System& system; @@ -258,6 +264,9 @@ private: f32 system_volume{1.0f}; /// Set via IAudioDevice service calls f32 device_volume{1.0f}; + /// Signalled when ring buffer entries are consumed + std::condition_variable release_cv; + std::mutex release_mutex; std::mutex stall_guard; std::unique_lock stalled_lock; }; From 237934b73690a56ff756d6e682fa336dee8c95a4 Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Sun, 26 Mar 2023 20:07:03 +0100 Subject: [PATCH 0224/1181] Run clang-format --- src/audio_core/renderer/adsp/audio_renderer.h | 2 +- src/audio_core/sink/sink_stream.cpp | 10 +++++----- src/audio_core/sink/sink_stream.h | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/audio_core/renderer/adsp/audio_renderer.h b/src/audio_core/renderer/adsp/audio_renderer.h index f97f9401e..85ce6a269 100644 --- a/src/audio_core/renderer/adsp/audio_renderer.h +++ b/src/audio_core/renderer/adsp/audio_renderer.h @@ -10,9 +10,9 @@ #include "audio_core/renderer/adsp/command_buffer.h" #include "audio_core/renderer/adsp/command_list_processor.h" #include "common/common_types.h" +#include "common/polyfill_thread.h" #include "common/reader_writer_queue.h" #include "common/thread.h" -#include "common/polyfill_thread.h" namespace Core { namespace Timing { diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index a54c61845..084ac5edf 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -245,9 +245,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz // Successfully dequeued a new buffer. queued_buffers--; - { - std::unique_lock lk{release_mutex}; - } + { std::unique_lock lk{release_mutex}; } release_cv.notify_one(); } @@ -276,7 +274,8 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz { std::scoped_lock lk{sample_count_lock}; - last_sample_count_update_time = Core::Timing::CyclesToUs(system.CoreTiming().GetClockTicks()); + last_sample_count_update_time = + Core::Timing::CyclesToUs(system.CoreTiming().GetClockTicks()); min_played_sample_count = max_played_sample_count; max_played_sample_count += actual_frames_written; } @@ -315,7 +314,8 @@ u64 SinkStream::GetExpectedPlayedSampleCount() { void SinkStream::WaitFreeSpace() { std::unique_lock lk{release_mutex}; - release_cv.wait(lk, [this]() { return queued_buffers < max_queue_size || system.IsShuttingDown(); }); + release_cv.wait( + lk, [this]() { return queued_buffers < max_queue_size || system.IsShuttingDown(); }); } } // namespace AudioCore::Sink diff --git a/src/audio_core/sink/sink_stream.h b/src/audio_core/sink/sink_stream.h index 709f3b0ec..9806e6d98 100644 --- a/src/audio_core/sink/sink_stream.h +++ b/src/audio_core/sink/sink_stream.h @@ -16,7 +16,6 @@ #include "common/reader_writer_queue.h" #include "common/ring_buffer.h" #include "common/thread.h" -#include "common/polyfill_thread.h" namespace Core { class System; From 530fe24768357d4151ac6c6aca4a0e122ef8260a Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Sun, 26 Mar 2023 20:21:04 +0100 Subject: [PATCH 0225/1181] audio_core: No longer stall when sink queue is full Now the audout and audren update rates are tied to the sink status stalling is no longer necessary. --- src/audio_core/sink/cubeb_sink.cpp | 4 --- src/audio_core/sink/sdl2_sink.cpp | 2 -- src/audio_core/sink/sink_stream.cpp | 43 ----------------------------- src/audio_core/sink/sink_stream.h | 16 +---------- 4 files changed, 1 insertion(+), 64 deletions(-) diff --git a/src/audio_core/sink/cubeb_sink.cpp b/src/audio_core/sink/cubeb_sink.cpp index 9133f5388..9a0801888 100644 --- a/src/audio_core/sink/cubeb_sink.cpp +++ b/src/audio_core/sink/cubeb_sink.cpp @@ -101,8 +101,6 @@ public: ~CubebSinkStream() override { LOG_DEBUG(Service_Audio, "Destructing cubeb stream {}", name); - Unstall(); - if (!ctx) { return; } @@ -143,8 +141,6 @@ public: * Stop the sink stream. */ void Stop() override { - Unstall(); - if (!ctx || paused) { return; } diff --git a/src/audio_core/sink/sdl2_sink.cpp b/src/audio_core/sink/sdl2_sink.cpp index c138dc628..ee1a0652f 100644 --- a/src/audio_core/sink/sdl2_sink.cpp +++ b/src/audio_core/sink/sdl2_sink.cpp @@ -88,7 +88,6 @@ public: * Finalize the sink stream. */ void Finalize() override { - Unstall(); if (device == 0) { return; } @@ -116,7 +115,6 @@ public: * Stop the sink stream. */ void Stop() override { - Unstall(); if (device == 0 || paused) { return; } diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index 084ac5edf..f99dbd8ec 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -151,10 +151,6 @@ void SinkStream::ProcessAudioIn(std::span input_buffer, std::size_t n return; } - if (queued_buffers > max_queue_size) { - Stall(); - } - while (frames_written < num_frames) { // If the playing buffer has been consumed or has no frames, we need a new one if (playing_buffer.consumed || playing_buffer.frames == 0) { @@ -189,10 +185,6 @@ void SinkStream::ProcessAudioIn(std::span input_buffer, std::size_t n } std::memcpy(&last_frame[0], &input_buffer[(frames_written - 1) * frame_size], frame_size_bytes); - - if (queued_buffers <= max_queue_size) { - Unstall(); - } } void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::size_t num_frames) { @@ -216,20 +208,6 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz return; } - // Due to many frames being queued up with nvdec (5 frames or so?), a lot of buffers also get - // queued up (30+) but not all at once, which causes constant stalling here, so just let the - // video play out without attempting to stall. - // Can hopefully remove this later with a more complete NVDEC implementation. - const auto nvdec_active{system.AudioCore().IsNVDECActive()}; - - // Core timing cannot be paused in single-core mode, so Stall ends up being called over and over - // and never recovers to a normal state, so just skip attempting to sync things on single-core. - if (system.IsMulticore() && !nvdec_active && queued_buffers > max_queue_size) { - Stall(); - } else if (system.IsMulticore() && queued_buffers <= max_queue_size) { - Unstall(); - } - while (frames_written < num_frames) { // If the playing buffer has been consumed or has no frames, we need a new one if (playing_buffer.consumed || playing_buffer.frames == 0) { @@ -279,27 +257,6 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz min_played_sample_count = max_played_sample_count; max_played_sample_count += actual_frames_written; } - - if (system.IsMulticore() && queued_buffers <= max_queue_size) { - Unstall(); - } -} - -void SinkStream::Stall() { - std::scoped_lock lk{stall_guard}; - if (stalled_lock) { - return; - } - stalled_lock = system.StallApplication(); -} - -void SinkStream::Unstall() { - std::scoped_lock lk{stall_guard}; - if (!stalled_lock) { - return; - } - system.UnstallApplication(); - stalled_lock.unlock(); } u64 SinkStream::GetExpectedPlayedSampleCount() { diff --git a/src/audio_core/sink/sink_stream.h b/src/audio_core/sink/sink_stream.h index 9806e6d98..23e289c7b 100644 --- a/src/audio_core/sink/sink_stream.h +++ b/src/audio_core/sink/sink_stream.h @@ -55,9 +55,7 @@ struct SinkBuffer { class SinkStream { public: explicit SinkStream(Core::System& system_, StreamType type_) : system{system_}, type{type_} {} - virtual ~SinkStream() { - Unstall(); - } + virtual ~SinkStream() {} /** * Finalize the sink stream. @@ -202,16 +200,6 @@ public: */ void ProcessAudioOutAndRender(std::span output_buffer, std::size_t num_frames); - /** - * Stall core processes if the audio thread falls too far behind. - */ - void Stall(); - - /** - * Unstall core processes. - */ - void Unstall(); - /** * Get the total number of samples expected to have been played by this stream. * @@ -266,8 +254,6 @@ private: /// Signalled when ring buffer entries are consumed std::condition_variable release_cv; std::mutex release_mutex; - std::mutex stall_guard; - std::unique_lock stalled_lock; }; using SinkStreamPtr = std::unique_ptr; From d2cfe25b07906f36c688ccacde30e3dc50123e8f Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Tue, 21 Mar 2023 21:13:03 -0400 Subject: [PATCH 0226/1181] x64: cpu_detect: Add detection of waitpkg instructions waitpkg introduces 3 instructions, UMONITOR, UMWAIT and TPAUSE. --- src/common/x64/cpu_detect.cpp | 1 + src/common/x64/cpu_detect.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/common/x64/cpu_detect.cpp b/src/common/x64/cpu_detect.cpp index e54383a4a..72ed6e96c 100644 --- a/src/common/x64/cpu_detect.cpp +++ b/src/common/x64/cpu_detect.cpp @@ -144,6 +144,7 @@ static CPUCaps Detect() { caps.bmi2 = Common::Bit<8>(cpu_id[1]); caps.sha = Common::Bit<29>(cpu_id[1]); + caps.waitpkg = Common::Bit<5>(cpu_id[2]); caps.gfni = Common::Bit<8>(cpu_id[2]); __cpuidex(cpu_id, 0x00000007, 0x00000001); diff --git a/src/common/x64/cpu_detect.h b/src/common/x64/cpu_detect.h index ca8db19d6..8253944d6 100644 --- a/src/common/x64/cpu_detect.h +++ b/src/common/x64/cpu_detect.h @@ -67,6 +67,7 @@ struct CPUCaps { bool pclmulqdq : 1; bool popcnt : 1; bool sha : 1; + bool waitpkg : 1; }; /** From 27c33ab73fd03d659654c49967a081214daf6ac2 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Tue, 21 Mar 2023 21:28:38 -0400 Subject: [PATCH 0227/1181] x64: Add MicroSleep MicroSleep allows the processor to pause for a "short" amount of time (in the microsecond range). This is useful for spin-waiting that does not require nanosecond precision. This uses the new TPAUSE instruction introduced on Intel's newest processors as part of the waitpkg instructions. For CPUs that do not support waitpkg instructions, this is equivalent to yield(). Co-Authored-By: liamwhite --- src/common/CMakeLists.txt | 2 ++ src/common/x64/cpu_wait.cpp | 72 +++++++++++++++++++++++++++++++++++++ src/common/x64/cpu_wait.h | 10 ++++++ 3 files changed, 84 insertions(+) create mode 100644 src/common/x64/cpu_wait.cpp create mode 100644 src/common/x64/cpu_wait.h diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index c1d2b24a1..13ed68b3f 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -160,6 +160,8 @@ if(ARCHITECTURE_x86_64) PRIVATE x64/cpu_detect.cpp x64/cpu_detect.h + x64/cpu_wait.cpp + x64/cpu_wait.h x64/native_clock.cpp x64/native_clock.h x64/xbyak_abi.h diff --git a/src/common/x64/cpu_wait.cpp b/src/common/x64/cpu_wait.cpp new file mode 100644 index 000000000..1fab0bfe8 --- /dev/null +++ b/src/common/x64/cpu_wait.cpp @@ -0,0 +1,72 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include + +#ifdef _MSC_VER +#include +#endif + +#include "common/x64/cpu_detect.h" +#include "common/x64/cpu_wait.h" + +namespace Common::X64 { + +#ifdef _MSC_VER +__forceinline static u64 FencedRDTSC() { + _mm_lfence(); + _ReadWriteBarrier(); + const u64 result = __rdtsc(); + _mm_lfence(); + _ReadWriteBarrier(); + return result; +} + +__forceinline static void TPAUSE() { + // 100,000 cycles is a reasonable amount of time to wait to save on CPU resources. + // For reference: + // At 1 GHz, 100K cycles is 100us + // At 2 GHz, 100K cycles is 50us + // At 4 GHz, 100K cycles is 25us + static constexpr auto PauseCycles = 100'000; + _tpause(0, FencedRDTSC() + PauseCycles); +} +#else +static u64 FencedRDTSC() { + u64 result; + asm volatile("lfence\n\t" + "rdtsc\n\t" + "shl $32, %%rdx\n\t" + "or %%rdx, %0\n\t" + "lfence" + : "=a"(result) + : + : "rdx", "memory", "cc"); + return result; +} + +static void TPAUSE() { + // 100,000 cycles is a reasonable amount of time to wait to save on CPU resources. + // For reference: + // At 1 GHz, 100K cycles is 100us + // At 2 GHz, 100K cycles is 50us + // At 4 GHz, 100K cycles is 25us + static constexpr auto PauseCycles = 100'000; + const auto tsc = FencedRDTSC() + PauseCycles; + const auto eax = static_cast(tsc & 0xFFFFFFFF); + const auto edx = static_cast(tsc >> 32); + asm volatile("tpause %0" : : "r"(0), "d"(edx), "a"(eax)); +} +#endif + +void MicroSleep() { + static const bool has_waitpkg = GetCPUCaps().waitpkg; + + if (has_waitpkg) { + TPAUSE(); + } else { + std::this_thread::yield(); + } +} + +} // namespace Common::X64 diff --git a/src/common/x64/cpu_wait.h b/src/common/x64/cpu_wait.h new file mode 100644 index 000000000..99d3757a7 --- /dev/null +++ b/src/common/x64/cpu_wait.h @@ -0,0 +1,10 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +namespace Common::X64 { + +void MicroSleep(); + +} // namespace Common::X64 From e1bce50d8ba139cf71b4225b4a416d84c65f3e0e Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Tue, 21 Mar 2023 21:30:02 -0400 Subject: [PATCH 0228/1181] core_timing: Make use of MicroSleep for x64 CPUs For CPUs that support tpause, this should result in significant CPU power savings over thread yield in this spin wait. --- src/core/core_timing.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index cd4df4522..4f2692b05 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -10,6 +10,10 @@ #include "common/windows/timer_resolution.h" #endif +#ifdef ARCHITECTURE_x86_64 +#include "common/x64/cpu_wait.h" +#endif + #include "common/microprofile.h" #include "core/core_timing.h" #include "core/core_timing_util.h" @@ -269,7 +273,11 @@ void CoreTiming::ThreadLoop() { if (wait_time >= timer_resolution_ns) { Common::Windows::SleepForOneTick(); } else { +#ifdef ARCHITECTURE_x86_64 + Common::X64::MicroSleep(); +#else std::this_thread::yield(); +#endif } } From 981bc8aa1c924eabc55f63f9671324c548c72d59 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 22 Mar 2023 16:40:41 -0400 Subject: [PATCH 0229/1181] x64: Simplify RDTSC on non-MSVC compilers Co-Authored-By: liamwhite --- src/common/x64/cpu_wait.cpp | 13 +++++-------- src/common/x64/native_clock.cpp | 13 +++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/common/x64/cpu_wait.cpp b/src/common/x64/cpu_wait.cpp index 1fab0bfe8..cfeef6a3d 100644 --- a/src/common/x64/cpu_wait.cpp +++ b/src/common/x64/cpu_wait.cpp @@ -33,16 +33,13 @@ __forceinline static void TPAUSE() { } #else static u64 FencedRDTSC() { - u64 result; + u64 eax; + u64 edx; asm volatile("lfence\n\t" "rdtsc\n\t" - "shl $32, %%rdx\n\t" - "or %%rdx, %0\n\t" - "lfence" - : "=a"(result) - : - : "rdx", "memory", "cc"); - return result; + "lfence\n\t" + : "=a"(eax), "=d"(edx)); + return (edx << 32) | eax; } static void TPAUSE() { diff --git a/src/common/x64/native_clock.cpp b/src/common/x64/native_clock.cpp index 76c66e7ee..277b00662 100644 --- a/src/common/x64/native_clock.cpp +++ b/src/common/x64/native_clock.cpp @@ -27,16 +27,13 @@ __forceinline static u64 FencedRDTSC() { } #else static u64 FencedRDTSC() { - u64 result; + u64 eax; + u64 edx; asm volatile("lfence\n\t" "rdtsc\n\t" - "shl $32, %%rdx\n\t" - "or %%rdx, %0\n\t" - "lfence" - : "=a"(result) - : - : "rdx", "memory", "cc"); - return result; + "lfence\n\t" + : "=a"(eax), "=d"(edx)); + return (edx << 32) | eax; } #endif From cdc846677cfc7f7389d9b89e6bb924a02f6f1c3b Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Thu, 23 Mar 2023 20:37:51 -0400 Subject: [PATCH 0230/1181] telemetry: Add waitpkg instruction --- src/common/telemetry.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/telemetry.cpp b/src/common/telemetry.cpp index d26394359..91352912d 100644 --- a/src/common/telemetry.cpp +++ b/src/common/telemetry.cpp @@ -97,6 +97,7 @@ void AppendCPUInfo(FieldCollection& fc) { add_field("CPU_Extension_x64_PCLMULQDQ", caps.pclmulqdq); add_field("CPU_Extension_x64_POPCNT", caps.popcnt); add_field("CPU_Extension_x64_SHA", caps.sha); + add_field("CPU_Extension_x64_WAITPKG", caps.waitpkg); #else fc.AddField(FieldType::UserSystem, "CPU_Model", "Other"); #endif From c68b4bee2cbcfa334d4855ef2b2edd68aca0e633 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Tue, 28 Mar 2023 10:29:20 +0100 Subject: [PATCH 0231/1181] Only upload GPU-modified overlaps --- src/video_core/texture_cache/texture_cache.h | 30 ++++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 858449af8..39f42ab90 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1176,13 +1176,13 @@ ImageId TextureCache

::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA const size_t size_bytes = CalculateGuestSizeInBytes(new_info); const bool broken_views = runtime.HasBrokenTextureViewFormats(); const bool native_bgr = runtime.HasNativeBgr(); - std::vector overlap_ids; + boost::container::small_vector overlap_ids; std::unordered_set overlaps_found; - std::vector left_aliased_ids; - std::vector right_aliased_ids; + boost::container::small_vector left_aliased_ids; + boost::container::small_vector right_aliased_ids; std::unordered_set ignore_textures; - std::vector bad_overlap_ids; - std::vector all_siblings; + boost::container::small_vector bad_overlap_ids; + boost::container::small_vector all_siblings; const bool this_is_linear = info.type == ImageType::Linear; const auto region_check = [&](ImageId overlap_id, ImageBase& overlap) { if (True(overlap.flags & ImageFlagBits::Remapped)) { @@ -1298,16 +1298,16 @@ ImageId TextureCache

::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA Image& overlap = slot_images[overlap_id]; if (True(overlap.flags & ImageFlagBits::GpuModified)) { new_image.flags |= ImageFlagBits::GpuModified; - } - const auto& resolution = Settings::values.resolution_info; - const SubresourceBase base = new_image.TryFindBase(overlap.gpu_addr).value(); - const u32 up_scale = can_rescale ? resolution.up_scale : 1; - const u32 down_shift = can_rescale ? resolution.down_shift : 0; - auto copies = MakeShrinkImageCopies(new_info, overlap.info, base, up_scale, down_shift); - if (overlap.info.num_samples != new_image.info.num_samples) { - runtime.CopyImageMSAA(new_image, overlap, std::move(copies)); - } else { - runtime.CopyImage(new_image, overlap, std::move(copies)); + const auto& resolution = Settings::values.resolution_info; + const SubresourceBase base = new_image.TryFindBase(overlap.gpu_addr).value(); + const u32 up_scale = can_rescale ? resolution.up_scale : 1; + const u32 down_shift = can_rescale ? resolution.down_shift : 0; + auto copies = MakeShrinkImageCopies(new_info, overlap.info, base, up_scale, down_shift); + if (overlap.info.num_samples != new_image.info.num_samples) { + runtime.CopyImageMSAA(new_image, overlap, std::move(copies)); + } else { + runtime.CopyImage(new_image, overlap, std::move(copies)); + } } if (True(overlap.flags & ImageFlagBits::Tracked)) { UntrackImage(overlap, overlap_id); From 9efd95cda50605c52a9652b5ad01e09e6fd86106 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 28 Mar 2023 22:28:27 -0400 Subject: [PATCH 0232/1181] kernel: fix unbounded stack usage in atomics --- src/core/hle/kernel/k_address_arbiter.cpp | 64 ++++++++++++-------- src/core/hle/kernel/k_condition_variable.cpp | 27 +++++---- 2 files changed, 54 insertions(+), 37 deletions(-) diff --git a/src/core/hle/kernel/k_address_arbiter.cpp b/src/core/hle/kernel/k_address_arbiter.cpp index 08c254028..78d43d729 100644 --- a/src/core/hle/kernel/k_address_arbiter.cpp +++ b/src/core/hle/kernel/k_address_arbiter.cpp @@ -35,24 +35,30 @@ bool DecrementIfLessThan(Core::System& system, s32* out, KProcessAddress address // TODO(bunnei): We should call CanAccessAtomic(..) here. - // Load the value from the address. - const s32 current_value = - static_cast(monitor.ExclusiveRead32(current_core, GetInteger(address))); + s32 current_value{}; - // Compare it to the desired one. - if (current_value < value) { - // If less than, we want to try to decrement. - const s32 decrement_value = current_value - 1; + while (true) { + // Load the value from the address. + current_value = + static_cast(monitor.ExclusiveRead32(current_core, GetInteger(address))); + + // Compare it to the desired one. + if (current_value < value) { + // If less than, we want to try to decrement. + const s32 decrement_value = current_value - 1; + + // Decrement and try to store. + if (monitor.ExclusiveWrite32(current_core, GetInteger(address), + static_cast(decrement_value))) { + break; + } - // Decrement and try to store. - if (!monitor.ExclusiveWrite32(current_core, GetInteger(address), - static_cast(decrement_value))) { // If we failed to store, try again. - DecrementIfLessThan(system, out, address, value); + } else { + // Otherwise, clear our exclusive hold and finish + monitor.ClearExclusive(current_core); + break; } - } else { - // Otherwise, clear our exclusive hold and finish - monitor.ClearExclusive(current_core); } // We're done. @@ -70,23 +76,29 @@ bool UpdateIfEqual(Core::System& system, s32* out, KProcessAddress address, s32 // TODO(bunnei): We should call CanAccessAtomic(..) here. + s32 current_value{}; + // Load the value from the address. - const s32 current_value = - static_cast(monitor.ExclusiveRead32(current_core, GetInteger(address))); + while (true) { + current_value = + static_cast(monitor.ExclusiveRead32(current_core, GetInteger(address))); - // Compare it to the desired one. - if (current_value == value) { - // If equal, we want to try to write the new value. + // Compare it to the desired one. + if (current_value == value) { + // If equal, we want to try to write the new value. + + // Try to store. + if (monitor.ExclusiveWrite32(current_core, GetInteger(address), + static_cast(new_value))) { + break; + } - // Try to store. - if (!monitor.ExclusiveWrite32(current_core, GetInteger(address), - static_cast(new_value))) { // If we failed to store, try again. - UpdateIfEqual(system, out, address, value, new_value); + } else { + // Otherwise, clear our exclusive hold and finish. + monitor.ClearExclusive(current_core); + break; } - } else { - // Otherwise, clear our exclusive hold and finish. - monitor.ClearExclusive(current_core); } // We're done. diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/core/hle/kernel/k_condition_variable.cpp index 73017cf99..efbac0e6a 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/core/hle/kernel/k_condition_variable.cpp @@ -33,21 +33,26 @@ bool UpdateLockAtomic(Core::System& system, u32* out, KProcessAddress address, u auto& monitor = system.Monitor(); const auto current_core = system.Kernel().CurrentPhysicalCoreIndex(); - // Load the value from the address. - const auto expected = monitor.ExclusiveRead32(current_core, GetInteger(address)); + u32 expected{}; - // Orr in the new mask. - u32 value = expected | new_orr_mask; + while (true) { + // Load the value from the address. + expected = monitor.ExclusiveRead32(current_core, GetInteger(address)); - // If the value is zero, use the if_zero value, otherwise use the newly orr'd value. - if (!expected) { - value = if_zero; - } + // Orr in the new mask. + u32 value = expected | new_orr_mask; + + // If the value is zero, use the if_zero value, otherwise use the newly orr'd value. + if (!expected) { + value = if_zero; + } + + // Try to store. + if (monitor.ExclusiveWrite32(current_core, GetInteger(address), value)) { + break; + } - // Try to store. - if (!monitor.ExclusiveWrite32(current_core, GetInteger(address), value)) { // If we failed to store, try again. - return UpdateLockAtomic(system, out, address, if_zero, new_orr_mask); } // We're done. From 668eb5b8dad656c281c218ea8b4c34965b163b93 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Tue, 28 Mar 2023 20:55:06 -0600 Subject: [PATCH 0233/1181] service: am: Improve profile select applet --- src/core/frontend/applets/profile_select.cpp | 3 +- src/core/frontend/applets/profile_select.h | 16 ++- .../am/applets/applet_profile_select.cpp | 52 ++++++++- .../am/applets/applet_profile_select.h | 102 ++++++++++++++++-- src/yuzu/applets/qt_profile_select.cpp | 85 ++++++++++++++- src/yuzu/applets/qt_profile_select.h | 11 +- src/yuzu/main.cpp | 30 ++++-- src/yuzu/main.h | 5 +- 8 files changed, 270 insertions(+), 34 deletions(-) diff --git a/src/core/frontend/applets/profile_select.cpp b/src/core/frontend/applets/profile_select.cpp index 910d20c0d..c18f17a36 100644 --- a/src/core/frontend/applets/profile_select.cpp +++ b/src/core/frontend/applets/profile_select.cpp @@ -11,7 +11,8 @@ ProfileSelectApplet::~ProfileSelectApplet() = default; void DefaultProfileSelectApplet::Close() const {} -void DefaultProfileSelectApplet::SelectProfile(SelectProfileCallback callback) const { +void DefaultProfileSelectApplet::SelectProfile(SelectProfileCallback callback, + const ProfileSelectParameters& parameters) const { Service::Account::ProfileManager manager; callback(manager.GetUser(Settings::values.current_user.GetValue()).value_or(Common::UUID{})); LOG_INFO(Service_ACC, "called, selecting current user instead of prompting..."); diff --git a/src/core/frontend/applets/profile_select.h b/src/core/frontend/applets/profile_select.h index 76e963535..92e2737ea 100644 --- a/src/core/frontend/applets/profile_select.h +++ b/src/core/frontend/applets/profile_select.h @@ -5,25 +5,35 @@ #include #include -#include "common/uuid.h" +#include "common/uuid.h" #include "core/frontend/applets/applet.h" +#include "core/hle/service/am/applets/applet_profile_select.h" namespace Core::Frontend { +struct ProfileSelectParameters { + Service::AM::Applets::UiMode mode; + std::array invalid_uid_list; + Service::AM::Applets::UiSettingsDisplayOptions display_options; + Service::AM::Applets::UserSelectionPurpose purpose; +}; + class ProfileSelectApplet : public Applet { public: using SelectProfileCallback = std::function)>; virtual ~ProfileSelectApplet(); - virtual void SelectProfile(SelectProfileCallback callback) const = 0; + virtual void SelectProfile(SelectProfileCallback callback, + const ProfileSelectParameters& parameters) const = 0; }; class DefaultProfileSelectApplet final : public ProfileSelectApplet { public: void Close() const override; - void SelectProfile(SelectProfileCallback callback) const override; + void SelectProfile(SelectProfileCallback callback, + const ProfileSelectParameters& parameters) const override; }; } // namespace Core::Frontend diff --git a/src/core/hle/service/am/applets/applet_profile_select.cpp b/src/core/hle/service/am/applets/applet_profile_select.cpp index 07abc2563..89cb323e9 100644 --- a/src/core/hle/service/am/applets/applet_profile_select.cpp +++ b/src/core/hle/service/am/applets/applet_profile_select.cpp @@ -25,13 +25,29 @@ void ProfileSelect::Initialize() { final_data.clear(); Applet::Initialize(); + profile_select_version = ProfileSelectAppletVersion{common_args.library_version}; const auto user_config_storage = broker.PopNormalDataToApplet(); ASSERT(user_config_storage != nullptr); const auto& user_config = user_config_storage->GetData(); - ASSERT(user_config.size() >= sizeof(UserSelectionConfig)); - std::memcpy(&config, user_config.data(), sizeof(UserSelectionConfig)); + LOG_INFO(Service_AM, "Initializing Profile Select Applet with version={}", + profile_select_version); + + switch (profile_select_version) { + case ProfileSelectAppletVersion::Version1: + ASSERT(user_config.size() == sizeof(UiSettingsV1)); + std::memcpy(&config_old, user_config.data(), sizeof(UiSettingsV1)); + break; + case ProfileSelectAppletVersion::Version2: + case ProfileSelectAppletVersion::Version3: + ASSERT(user_config.size() == sizeof(UiSettings)); + std::memcpy(&config, user_config.data(), sizeof(UiSettings)); + break; + default: + UNIMPLEMENTED_MSG("Unknown profile_select_version = {}", profile_select_version); + break; + } } bool ProfileSelect::TransactionComplete() const { @@ -52,11 +68,37 @@ void ProfileSelect::Execute() { return; } - frontend.SelectProfile([this](std::optional uuid) { SelectionComplete(uuid); }); + Core::Frontend::ProfileSelectParameters parameters{}; + + switch (profile_select_version) { + case ProfileSelectAppletVersion::Version1: + parameters = { + .mode = config_old.mode, + .invalid_uid_list = config_old.invalid_uid_list, + .display_options = config_old.display_options, + .purpose = UserSelectionPurpose::General, + }; + break; + case ProfileSelectAppletVersion::Version2: + case ProfileSelectAppletVersion::Version3: + parameters = { + .mode = config.mode, + .invalid_uid_list = config.invalid_uid_list, + .display_options = config.display_options, + .purpose = config.purpose, + }; + break; + default: + UNIMPLEMENTED_MSG("Unknown profile_select_version = {}", profile_select_version); + break; + } + + frontend.SelectProfile([this](std::optional uuid) { SelectionComplete(uuid); }, + parameters); } void ProfileSelect::SelectionComplete(std::optional uuid) { - UserSelectionOutput output{}; + UiReturnArg output{}; if (uuid.has_value() && uuid->IsValid()) { output.result = 0; @@ -67,7 +109,7 @@ void ProfileSelect::SelectionComplete(std::optional uuid) { output.uuid_selected = Common::InvalidUUID; } - final_data = std::vector(sizeof(UserSelectionOutput)); + final_data = std::vector(sizeof(UiReturnArg)); std::memcpy(final_data.data(), &output, final_data.size()); broker.PushNormalDataFromApplet(std::make_shared(system, std::move(final_data))); broker.SignalStateChanged(); diff --git a/src/core/hle/service/am/applets/applet_profile_select.h b/src/core/hle/service/am/applets/applet_profile_select.h index 85705c216..369f9250f 100644 --- a/src/core/hle/service/am/applets/applet_profile_select.h +++ b/src/core/hle/service/am/applets/applet_profile_select.h @@ -16,19 +16,100 @@ class System; namespace Service::AM::Applets { -struct UserSelectionConfig { - // TODO(DarkLordZach): RE this structure - // It seems to be flags and the like that determine the UI of the applet on the switch... from - // my research this is safe to ignore for now. - INSERT_PADDING_BYTES(0xA0); +enum class ProfileSelectAppletVersion : u32 { + Version1 = 0x1, // 1.0.0+ + Version2 = 0x10000, // 2.0.0+ + Version3 = 0x20000, // 6.0.0+ }; -static_assert(sizeof(UserSelectionConfig) == 0xA0, "UserSelectionConfig has incorrect size."); -struct UserSelectionOutput { +// This is nn::account::UiMode +enum class UiMode { + UserSelector, + UserCreator, + EnsureNetworkServiceAccountAvailable, + UserIconEditor, + UserNicknameEditor, + UserCreatorForStarter, + NintendoAccountAuthorizationRequestContext, + IntroduceExternalNetworkServiceAccount, + IntroduceExternalNetworkServiceAccountForRegistration, + NintendoAccountNnidLinker, + LicenseRequirementsForNetworkService, + LicenseRequirementsForNetworkServiceWithUserContextImpl, + UserCreatorForImmediateNaLoginTest, + UserQualificationPromoter, +}; + +// This is nn::account::UserSelectionPurpose +enum class UserSelectionPurpose { + General, + GameCardRegistration, + EShopLaunch, + EShopItemShow, + PicturePost, + NintendoAccountLinkage, + SettingsUpdate, + SaveDataDeletion, + UserMigration, + SaveDataTransfer, +}; + +// This is nn::account::NintendoAccountStartupDialogType +enum class NintendoAccountStartupDialogType { + LoginAndCreate, + Login, + Create, +}; + +// This is nn::account::UserSelectionSettingsForSystemService +struct UserSelectionSettingsForSystemService { + UserSelectionPurpose purpose; + bool enable_user_creation; + INSERT_PADDING_BYTES(0x3); +}; +static_assert(sizeof(UserSelectionSettingsForSystemService) == 0x8, + "UserSelectionSettingsForSystemService has incorrect size."); + +struct UiSettingsDisplayOptions { + bool is_network_service_account_required; + bool is_skip_enabled; + bool is_system_or_launcher; + bool is_registration_permitted; + bool show_skip_button; + bool aditional_select; + bool show_user_selector; + bool is_unqualified_user_selectable; +}; +static_assert(sizeof(UiSettingsDisplayOptions) == 0x8, + "UiSettingsDisplayOptions has incorrect size."); + +struct UiSettingsV1 { + UiMode mode; + INSERT_PADDING_BYTES(0x4); + std::array invalid_uid_list; + u64 application_id; + UiSettingsDisplayOptions display_options; +}; +static_assert(sizeof(UiSettingsV1) == 0x98, "UiSettings has incorrect size."); + +// This is nn::account::UiSettings +struct UiSettings { + UiMode mode; + INSERT_PADDING_BYTES(0x4); + std::array invalid_uid_list; + u64 application_id; + UiSettingsDisplayOptions display_options; + UserSelectionPurpose purpose; + INSERT_PADDING_BYTES(0x4); +}; +static_assert(sizeof(UiSettings) == 0xA0, "UiSettings has incorrect size."); + +// This is nn::account::UiReturnArg +struct UiReturnArg { u64 result; Common::UUID uuid_selected; }; -static_assert(sizeof(UserSelectionOutput) == 0x18, "UserSelectionOutput has incorrect size."); +static_assert(sizeof(UiReturnArg) == 0x18, "UiReturnArg has incorrect size."); class ProfileSelect final : public Applet { public: @@ -49,7 +130,10 @@ public: private: const Core::Frontend::ProfileSelectApplet& frontend; - UserSelectionConfig config; + UiSettings config; + UiSettingsV1 config_old; + ProfileSelectAppletVersion profile_select_version; + bool complete = false; Result status = ResultSuccess; std::vector final_data; diff --git a/src/yuzu/applets/qt_profile_select.cpp b/src/yuzu/applets/qt_profile_select.cpp index c0a1d5ab7..2448e46b6 100644 --- a/src/yuzu/applets/qt_profile_select.cpp +++ b/src/yuzu/applets/qt_profile_select.cpp @@ -46,11 +46,13 @@ QPixmap GetIcon(Common::UUID uuid) { } } // Anonymous namespace -QtProfileSelectionDialog::QtProfileSelectionDialog(Core::HID::HIDCore& hid_core, QWidget* parent) +QtProfileSelectionDialog::QtProfileSelectionDialog( + Core::HID::HIDCore& hid_core, QWidget* parent, + const Core::Frontend::ProfileSelectParameters& parameters) : QDialog(parent), profile_manager(std::make_unique()) { outer_layout = new QVBoxLayout; - instruction_label = new QLabel(tr("Select a user:")); + instruction_label = new QLabel(); scroll_area = new QScrollArea; @@ -120,7 +122,8 @@ QtProfileSelectionDialog::QtProfileSelectionDialog(Core::HID::HIDCore& hid_core, item_model->appendRow(item); setLayout(outer_layout); - setWindowTitle(tr("Profile Selector")); + SetWindowTitle(parameters); + SetDialogPurpose(parameters); resize(550, 400); } @@ -154,6 +157,76 @@ void QtProfileSelectionDialog::SelectUser(const QModelIndex& index) { user_index = index.row(); } +void QtProfileSelectionDialog::SetWindowTitle( + const Core::Frontend::ProfileSelectParameters& parameters) { + using Service::AM::Applets::UiMode; + switch (parameters.mode) { + case UiMode::UserCreator: + case UiMode::UserCreatorForStarter: + setWindowTitle(tr("Profile Creator")); + return; + case UiMode::EnsureNetworkServiceAccountAvailable: + setWindowTitle(tr("Profile Selector")); + return; + case UiMode::UserIconEditor: + setWindowTitle(tr("Profile Icon Editor")); + return; + case UiMode::UserNicknameEditor: + setWindowTitle(tr("Profile Nickname Editor")); + return; + case UiMode::NintendoAccountAuthorizationRequestContext: + case UiMode::IntroduceExternalNetworkServiceAccount: + case UiMode::IntroduceExternalNetworkServiceAccountForRegistration: + case UiMode::NintendoAccountNnidLinker: + case UiMode::LicenseRequirementsForNetworkService: + case UiMode::LicenseRequirementsForNetworkServiceWithUserContextImpl: + case UiMode::UserCreatorForImmediateNaLoginTest: + case UiMode::UserQualificationPromoter: + case UiMode::UserSelector: + default: + setWindowTitle(tr("Profile Selector")); + } +} + +void QtProfileSelectionDialog::SetDialogPurpose( + const Core::Frontend::ProfileSelectParameters& parameters) { + using Service::AM::Applets::UserSelectionPurpose; + + switch (parameters.purpose) { + case UserSelectionPurpose::GameCardRegistration: + instruction_label->setText(tr("Who will receive the points?")); + return; + case UserSelectionPurpose::EShopLaunch: + instruction_label->setText(tr("Who is using Nintendo eShop?")); + return; + case UserSelectionPurpose::EShopItemShow: + instruction_label->setText(tr("Who is making this purchase?")); + return; + case UserSelectionPurpose::PicturePost: + instruction_label->setText(tr("Who is posting?")); + return; + case UserSelectionPurpose::NintendoAccountLinkage: + instruction_label->setText(tr("Select a user to link to a Nintendo Account.")); + return; + case UserSelectionPurpose::SettingsUpdate: + instruction_label->setText(tr("Change settings for which user?")); + return; + case UserSelectionPurpose::SaveDataDeletion: + instruction_label->setText(tr("Format data for which user?")); + return; + case UserSelectionPurpose::UserMigration: + instruction_label->setText(tr("Which user will be transferred to another console?")); + return; + case UserSelectionPurpose::SaveDataTransfer: + instruction_label->setText(tr("Send save data for which user?")); + return; + case UserSelectionPurpose::General: + default: + instruction_label->setText(tr("Select a user:")); + return; + } +} + QtProfileSelector::QtProfileSelector(GMainWindow& parent) { connect(this, &QtProfileSelector::MainWindowSelectProfile, &parent, &GMainWindow::ProfileSelectorSelectProfile, Qt::QueuedConnection); @@ -170,9 +243,11 @@ void QtProfileSelector::Close() const { emit MainWindowRequestExit(); } -void QtProfileSelector::SelectProfile(SelectProfileCallback callback_) const { +void QtProfileSelector::SelectProfile( + SelectProfileCallback callback_, + const Core::Frontend::ProfileSelectParameters& parameters) const { callback = std::move(callback_); - emit MainWindowSelectProfile(); + emit MainWindowSelectProfile(parameters); } void QtProfileSelector::MainWindowFinishedSelection(std::optional uuid) { diff --git a/src/yuzu/applets/qt_profile_select.h b/src/yuzu/applets/qt_profile_select.h index 9f214d071..99056e274 100644 --- a/src/yuzu/applets/qt_profile_select.h +++ b/src/yuzu/applets/qt_profile_select.h @@ -28,7 +28,8 @@ class QtProfileSelectionDialog final : public QDialog { Q_OBJECT public: - explicit QtProfileSelectionDialog(Core::HID::HIDCore& hid_core, QWidget* parent); + explicit QtProfileSelectionDialog(Core::HID::HIDCore& hid_core, QWidget* parent, + const Core::Frontend::ProfileSelectParameters& parameters); ~QtProfileSelectionDialog() override; int exec() override; @@ -40,6 +41,9 @@ public: private: void SelectUser(const QModelIndex& index); + void SetWindowTitle(const Core::Frontend::ProfileSelectParameters& parameters); + void SetDialogPurpose(const Core::Frontend::ProfileSelectParameters& parameters); + int user_index = 0; QVBoxLayout* layout; @@ -66,10 +70,11 @@ public: ~QtProfileSelector() override; void Close() const override; - void SelectProfile(SelectProfileCallback callback_) const override; + void SelectProfile(SelectProfileCallback callback_, + const Core::Frontend::ProfileSelectParameters& parameters) const override; signals: - void MainWindowSelectProfile() const; + void MainWindowSelectProfile(const Core::Frontend::ProfileSelectParameters& parameters) const; void MainWindowRequestExit() const; private: diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 0c60a90cb..136935259 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -576,6 +576,10 @@ void GMainWindow::RegisterMetaTypes() { // Controller Applet qRegisterMetaType("Core::Frontend::ControllerParameters"); + // Profile Select Applet + qRegisterMetaType( + "Core::Frontend::ProfileSelectParameters"); + // Software Keyboard Applet qRegisterMetaType( "Core::Frontend::KeyboardInitializeParameters"); @@ -651,8 +655,9 @@ void GMainWindow::ControllerSelectorRequestExit() { } } -void GMainWindow::ProfileSelectorSelectProfile() { - profile_select_applet = new QtProfileSelectionDialog(system->HIDCore(), this); +void GMainWindow::ProfileSelectorSelectProfile( + const Core::Frontend::ProfileSelectParameters& parameters) { + profile_select_applet = new QtProfileSelectionDialog(system->HIDCore(), this, parameters); SCOPE_EXIT({ profile_select_applet->deleteLater(); profile_select_applet = nullptr; @@ -1719,8 +1724,9 @@ bool GMainWindow::LoadROM(const QString& filename, u64 program_id, std::size_t p return true; } -bool GMainWindow::SelectAndSetCurrentUser() { - QtProfileSelectionDialog dialog(system->HIDCore(), this); +bool GMainWindow::SelectAndSetCurrentUser( + const Core::Frontend::ProfileSelectParameters& parameters) { + QtProfileSelectionDialog dialog(system->HIDCore(), this, parameters); dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint); dialog.setWindowModality(Qt::WindowModal); @@ -1766,7 +1772,13 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t Settings::LogSettings(); if (UISettings::values.select_user_on_boot) { - if (SelectAndSetCurrentUser() == false) { + const Core::Frontend::ProfileSelectParameters parameters{ + .mode = Service::AM::Applets::UiMode::UserSelector, + .invalid_uid_list = {}, + .display_options = {}, + .purpose = Service::AM::Applets::UserSelectionPurpose::General, + }; + if (SelectAndSetCurrentUser(parameters) == false) { return; } } @@ -2058,7 +2070,13 @@ void GMainWindow::OnGameListOpenFolder(u64 program_id, GameListOpenTarget target if (has_user_save) { // User save data const auto select_profile = [this] { - QtProfileSelectionDialog dialog(system->HIDCore(), this); + const Core::Frontend::ProfileSelectParameters parameters{ + .mode = Service::AM::Applets::UiMode::UserSelector, + .invalid_uid_list = {}, + .display_options = {}, + .purpose = Service::AM::Applets::UserSelectionPurpose::General, + }; + QtProfileSelectionDialog dialog(system->HIDCore(), this, parameters); dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint); dialog.setWindowModality(Qt::WindowModal); diff --git a/src/yuzu/main.h b/src/yuzu/main.h index a99938eaa..2f16e0b1c 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -69,6 +69,7 @@ struct ControllerParameters; struct InlineAppearParameters; struct InlineTextParameters; struct KeyboardInitializeParameters; +struct ProfileSelectParameters; } // namespace Core::Frontend namespace DiscordRPC { @@ -203,7 +204,7 @@ public slots: void SoftwareKeyboardExit(); void ErrorDisplayDisplayError(QString error_code, QString error_text); void ErrorDisplayRequestExit(); - void ProfileSelectorSelectProfile(); + void ProfileSelectorSelectProfile(const Core::Frontend::ProfileSelectParameters& parameters); void ProfileSelectorRequestExit(); void WebBrowserOpenWebPage(const std::string& main_url, const std::string& additional_args, bool is_local); @@ -242,7 +243,7 @@ private: void SetDiscordEnabled(bool state); void LoadAmiibo(const QString& filename); - bool SelectAndSetCurrentUser(); + bool SelectAndSetCurrentUser(const Core::Frontend::ProfileSelectParameters& parameters); /** * Stores the filename in the recently loaded files list. From e446f368d74b772ac5e0afab1f693544a212861d Mon Sep 17 00:00:00 2001 From: Max Dunbar Date: Wed, 29 Mar 2023 19:26:12 -0700 Subject: [PATCH 0234/1181] Fixes 'Continous' typo --- src/common/range_map.h | 6 ++-- src/tests/common/range_map.cpp | 20 ++++++------ src/video_core/buffer_cache/buffer_cache.h | 2 +- src/video_core/memory_manager.cpp | 34 ++++++++++---------- src/video_core/memory_manager.h | 12 +++---- src/video_core/texture_cache/texture_cache.h | 2 +- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/common/range_map.h b/src/common/range_map.h index 79c7ef547..ab73993e3 100644 --- a/src/common/range_map.h +++ b/src/common/range_map.h @@ -38,12 +38,12 @@ public: Map(address, address_end, null_value); } - [[nodiscard]] size_t GetContinousSizeFrom(KeyTBase address) const { + [[nodiscard]] size_t GetContinuousSizeFrom(KeyTBase address) const { const KeyT new_address = static_cast(address); if (new_address < 0) { return 0; } - return ContinousSizeInternal(new_address); + return ContinuousSizeInternal(new_address); } [[nodiscard]] ValueT GetValueAt(KeyT address) const { @@ -59,7 +59,7 @@ private: using IteratorType = typename MapType::iterator; using ConstIteratorType = typename MapType::const_iterator; - size_t ContinousSizeInternal(KeyT address) const { + size_t ContinuousSizeInternal(KeyT address) const { const auto it = GetFirstElementBeforeOrOn(address); if (it == container.end() || it->second == null_value) { return 0; diff --git a/src/tests/common/range_map.cpp b/src/tests/common/range_map.cpp index d301ac5f6..faaefd49f 100644 --- a/src/tests/common/range_map.cpp +++ b/src/tests/common/range_map.cpp @@ -21,9 +21,9 @@ TEST_CASE("Range Map: Setup", "[video_core]") { my_map.Map(4000, 4500, MappedEnum::Valid_2); my_map.Map(4200, 4400, MappedEnum::Valid_2); my_map.Map(4200, 4400, MappedEnum::Valid_1); - REQUIRE(my_map.GetContinousSizeFrom(4200) == 200); - REQUIRE(my_map.GetContinousSizeFrom(3000) == 200); - REQUIRE(my_map.GetContinousSizeFrom(2900) == 0); + REQUIRE(my_map.GetContinuousSizeFrom(4200) == 200); + REQUIRE(my_map.GetContinuousSizeFrom(3000) == 200); + REQUIRE(my_map.GetContinuousSizeFrom(2900) == 0); REQUIRE(my_map.GetValueAt(2900) == MappedEnum::Invalid); REQUIRE(my_map.GetValueAt(3100) == MappedEnum::Valid_1); @@ -38,20 +38,20 @@ TEST_CASE("Range Map: Setup", "[video_core]") { my_map.Unmap(0, 6000); for (u64 address = 0; address < 10000; address += 1000) { - REQUIRE(my_map.GetContinousSizeFrom(address) == 0); + REQUIRE(my_map.GetContinuousSizeFrom(address) == 0); } my_map.Map(1000, 3000, MappedEnum::Valid_1); my_map.Map(4000, 5000, MappedEnum::Valid_1); my_map.Map(2500, 4100, MappedEnum::Valid_1); - REQUIRE(my_map.GetContinousSizeFrom(1000) == 4000); + REQUIRE(my_map.GetContinuousSizeFrom(1000) == 4000); my_map.Map(1000, 3000, MappedEnum::Valid_1); my_map.Map(4000, 5000, MappedEnum::Valid_2); my_map.Map(2500, 4100, MappedEnum::Valid_3); - REQUIRE(my_map.GetContinousSizeFrom(1000) == 1500); - REQUIRE(my_map.GetContinousSizeFrom(2500) == 1600); - REQUIRE(my_map.GetContinousSizeFrom(4100) == 900); + REQUIRE(my_map.GetContinuousSizeFrom(1000) == 1500); + REQUIRE(my_map.GetContinuousSizeFrom(2500) == 1600); + REQUIRE(my_map.GetContinuousSizeFrom(4100) == 900); REQUIRE(my_map.GetValueAt(900) == MappedEnum::Invalid); REQUIRE(my_map.GetValueAt(1000) == MappedEnum::Valid_1); REQUIRE(my_map.GetValueAt(2500) == MappedEnum::Valid_3); @@ -59,8 +59,8 @@ TEST_CASE("Range Map: Setup", "[video_core]") { REQUIRE(my_map.GetValueAt(5000) == MappedEnum::Invalid); my_map.Map(2000, 6000, MappedEnum::Valid_3); - REQUIRE(my_map.GetContinousSizeFrom(1000) == 1000); - REQUIRE(my_map.GetContinousSizeFrom(3000) == 3000); + REQUIRE(my_map.GetContinuousSizeFrom(1000) == 1000); + REQUIRE(my_map.GetContinuousSizeFrom(3000) == 3000); REQUIRE(my_map.GetValueAt(1000) == MappedEnum::Valid_1); REQUIRE(my_map.GetValueAt(1999) == MappedEnum::Valid_1); REQUIRE(my_map.GetValueAt(1500) == MappedEnum::Valid_1); diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 1f656ffa8..abdc593df 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -1442,7 +1442,7 @@ void BufferCache

::UpdateVertexBuffer(u32 index) { } if (!gpu_memory->IsWithinGPUAddressRange(gpu_addr_end)) { address_size = - static_cast(gpu_memory->MaxContinousRange(gpu_addr_begin, address_size)); + static_cast(gpu_memory->MaxContinuousRange(gpu_addr_begin, address_size)); } const u32 size = address_size; // TODO: Analyze stride and number of vertices vertex_buffers[index] = Binding{ diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index 015a7d3c1..01fb5b546 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -43,7 +43,7 @@ MemoryManager::MemoryManager(Core::System& system_, u64 address_space_bits_, u64 big_entries.resize(big_page_table_size / 32, 0); big_page_table_cpu.resize(big_page_table_size); - big_page_continous.resize(big_page_table_size / continous_bits, 0); + big_page_continuous.resize(big_page_table_size / continuous_bits, 0); entries.resize(page_table_size / 32, 0); } @@ -85,17 +85,17 @@ PTEKind MemoryManager::GetPageKind(GPUVAddr gpu_addr) const { return kind_map.GetValueAt(gpu_addr); } -inline bool MemoryManager::IsBigPageContinous(size_t big_page_index) const { - const u64 entry_mask = big_page_continous[big_page_index / continous_bits]; - const size_t sub_index = big_page_index % continous_bits; +inline bool MemoryManager::IsBigPageContinuous(size_t big_page_index) const { + const u64 entry_mask = big_page_continuous[big_page_index / continuous_bits]; + const size_t sub_index = big_page_index % continuous_bits; return ((entry_mask >> sub_index) & 0x1ULL) != 0; } -inline void MemoryManager::SetBigPageContinous(size_t big_page_index, bool value) { - const u64 continous_mask = big_page_continous[big_page_index / continous_bits]; - const size_t sub_index = big_page_index % continous_bits; - big_page_continous[big_page_index / continous_bits] = - (~(1ULL << sub_index) & continous_mask) | (value ? 1ULL << sub_index : 0); +inline void MemoryManager::SetBigPageContinuous(size_t big_page_index, bool value) { + const u64 continuous_mask = big_page_continuous[big_page_index / continuous_bits]; + const size_t sub_index = big_page_index % continuous_bits; + big_page_continuous[big_page_index / continuous_bits] = + (~(1ULL << sub_index) & continuous_mask) | (value ? 1ULL << sub_index : 0); } template @@ -140,7 +140,7 @@ GPUVAddr MemoryManager::BigPageTableOp(GPUVAddr gpu_addr, [[maybe_unused]] VAddr const auto index = PageEntryIndex(current_gpu_addr); const u32 sub_value = static_cast(current_cpu_addr >> cpu_page_bits); big_page_table_cpu[index] = sub_value; - const bool is_continous = ([&] { + const bool is_continuous = ([&] { uintptr_t base_ptr{ reinterpret_cast(memory.GetPointerSilent(current_cpu_addr))}; if (base_ptr == 0) { @@ -156,7 +156,7 @@ GPUVAddr MemoryManager::BigPageTableOp(GPUVAddr gpu_addr, [[maybe_unused]] VAddr } return true; })(); - SetBigPageContinous(index, is_continous); + SetBigPageContinuous(index, is_continuous); } remaining_size -= big_page_size; } @@ -378,7 +378,7 @@ void MemoryManager::ReadBlockImpl(GPUVAddr gpu_src_addr, void* dest_buffer, std: if constexpr (is_safe) { rasterizer->FlushRegion(cpu_addr_base, copy_amount, which); } - if (!IsBigPageContinous(page_index)) [[unlikely]] { + if (!IsBigPageContinuous(page_index)) [[unlikely]] { memory.ReadBlockUnsafe(cpu_addr_base, dest_buffer, copy_amount); } else { u8* physical = memory.GetPointer(cpu_addr_base); @@ -427,7 +427,7 @@ void MemoryManager::WriteBlockImpl(GPUVAddr gpu_dest_addr, const void* src_buffe if constexpr (is_safe) { rasterizer->InvalidateRegion(cpu_addr_base, copy_amount, which); } - if (!IsBigPageContinous(page_index)) [[unlikely]] { + if (!IsBigPageContinuous(page_index)) [[unlikely]] { memory.WriteBlockUnsafe(cpu_addr_base, src_buffer, copy_amount); } else { u8* physical = memory.GetPointer(cpu_addr_base); @@ -512,7 +512,7 @@ bool MemoryManager::IsMemoryDirty(GPUVAddr gpu_addr, size_t size, return result; } -size_t MemoryManager::MaxContinousRange(GPUVAddr gpu_addr, size_t size) const { +size_t MemoryManager::MaxContinuousRange(GPUVAddr gpu_addr, size_t size) const { std::optional old_page_addr{}; size_t range_so_far = 0; bool result{false}; @@ -553,7 +553,7 @@ size_t MemoryManager::MaxContinousRange(GPUVAddr gpu_addr, size_t size) const { } size_t MemoryManager::GetMemoryLayoutSize(GPUVAddr gpu_addr, size_t max_size) const { - return kind_map.GetContinousSizeFrom(gpu_addr); + return kind_map.GetContinuousSizeFrom(gpu_addr); } void MemoryManager::InvalidateRegion(GPUVAddr gpu_addr, size_t size, @@ -594,7 +594,7 @@ void MemoryManager::CopyBlock(GPUVAddr gpu_dest_addr, GPUVAddr gpu_src_addr, std bool MemoryManager::IsGranularRange(GPUVAddr gpu_addr, std::size_t size) const { if (GetEntry(gpu_addr) == EntryType::Mapped) [[likely]] { size_t page_index = gpu_addr >> big_page_bits; - if (IsBigPageContinous(page_index)) [[likely]] { + if (IsBigPageContinuous(page_index)) [[likely]] { const std::size_t page{(page_index & big_page_mask) + size}; return page <= big_page_size; } @@ -608,7 +608,7 @@ bool MemoryManager::IsGranularRange(GPUVAddr gpu_addr, std::size_t size) const { return page <= Core::Memory::YUZU_PAGESIZE; } -bool MemoryManager::IsContinousRange(GPUVAddr gpu_addr, std::size_t size) const { +bool MemoryManager::IsContinuousRange(GPUVAddr gpu_addr, std::size_t size) const { std::optional old_page_addr{}; bool result{true}; auto fail = [&]([[maybe_unused]] std::size_t page_index, [[maybe_unused]] std::size_t offset, diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h index 51ae2de68..fbbe856c4 100644 --- a/src/video_core/memory_manager.h +++ b/src/video_core/memory_manager.h @@ -94,7 +94,7 @@ public: /** * Checks if a gpu region is mapped by a single range of cpu addresses. */ - [[nodiscard]] bool IsContinousRange(GPUVAddr gpu_addr, std::size_t size) const; + [[nodiscard]] bool IsContinuousRange(GPUVAddr gpu_addr, std::size_t size) const; /** * Checks if a gpu region is mapped entirely. @@ -123,7 +123,7 @@ public: bool IsMemoryDirty(GPUVAddr gpu_addr, size_t size, VideoCommon::CacheType which = VideoCommon::CacheType::All) const; - size_t MaxContinousRange(GPUVAddr gpu_addr, size_t size) const; + size_t MaxContinuousRange(GPUVAddr gpu_addr, size_t size) const; bool IsWithinGPUAddressRange(GPUVAddr gpu_addr) const { return gpu_addr < address_space_size; @@ -158,8 +158,8 @@ private: } } - inline bool IsBigPageContinous(size_t big_page_index) const; - inline void SetBigPageContinous(size_t big_page_index, bool value); + inline bool IsBigPageContinuous(size_t big_page_index) const; + inline void SetBigPageContinuous(size_t big_page_index, bool value); template void GetSubmappedRangeImpl( @@ -213,10 +213,10 @@ private: Common::RangeMap kind_map; Common::VirtualBuffer big_page_table_cpu; - std::vector big_page_continous; + std::vector big_page_continuous; std::vector> page_stash{}; - static constexpr size_t continous_bits = 64; + static constexpr size_t continuous_bits = 64; const size_t unique_identifier; std::unique_ptr accumulator; diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 858449af8..63821d496 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1269,7 +1269,7 @@ ImageId TextureCache

::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA const ImageId new_image_id = slot_images.insert(runtime, new_info, gpu_addr, cpu_addr); Image& new_image = slot_images[new_image_id]; - if (!gpu_memory->IsContinousRange(new_image.gpu_addr, new_image.guest_size_bytes)) { + if (!gpu_memory->IsContinuousRange(new_image.gpu_addr, new_image.guest_size_bytes)) { new_image.flags |= ImageFlagBits::Sparse; } From 8e8438103805774b06ca70fcdc38693232bfc441 Mon Sep 17 00:00:00 2001 From: german77 Date: Sun, 26 Mar 2023 23:56:00 -0600 Subject: [PATCH 0235/1181] service: hid: Implement SetNpadJoyAssignmentModeSingleWithDestination Used by Let's Get Fit --- src/core/hle/service/hid/controllers/npad.cpp | 32 +++++++-------- src/core/hle/service/hid/controllers/npad.h | 4 +- src/core/hle/service/hid/hid.cpp | 41 +++++++++++++++++-- src/core/hle/service/hid/hid.h | 1 + 4 files changed, 56 insertions(+), 22 deletions(-) diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index ba6f04d8d..714e67c00 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -819,12 +819,12 @@ Controller_NPad::NpadCommunicationMode Controller_NPad::GetNpadCommunicationMode return communication_mode; } -Result Controller_NPad::SetNpadMode(Core::HID::NpadIdType npad_id, - NpadJoyDeviceType npad_device_type, - NpadJoyAssignmentMode assignment_mode) { +bool Controller_NPad::SetNpadMode(Core::HID::NpadIdType& new_npad_id, Core::HID::NpadIdType npad_id, + NpadJoyDeviceType npad_device_type, + NpadJoyAssignmentMode assignment_mode) { if (!IsNpadIdValid(npad_id)) { LOG_ERROR(Service_HID, "Invalid NpadIdType npad_id:{}", npad_id); - return InvalidNpadId; + return false; } auto& controller = GetControllerFromNpadIdType(npad_id); @@ -833,7 +833,7 @@ Result Controller_NPad::SetNpadMode(Core::HID::NpadIdType npad_id, } if (!controller.device->IsConnected()) { - return ResultSuccess; + return false; } if (assignment_mode == NpadJoyAssignmentMode::Dual) { @@ -842,52 +842,52 @@ Result Controller_NPad::SetNpadMode(Core::HID::NpadIdType npad_id, controller.is_dual_left_connected = true; controller.is_dual_right_connected = false; UpdateControllerAt(Core::HID::NpadStyleIndex::JoyconDual, npad_id, true); - return ResultSuccess; + return false; } if (controller.device->GetNpadStyleIndex() == Core::HID::NpadStyleIndex::JoyconRight) { DisconnectNpad(npad_id); controller.is_dual_left_connected = false; controller.is_dual_right_connected = true; UpdateControllerAt(Core::HID::NpadStyleIndex::JoyconDual, npad_id, true); - return ResultSuccess; + return false; } - return ResultSuccess; + return false; } // This is for NpadJoyAssignmentMode::Single // Only JoyconDual get affected by this function if (controller.device->GetNpadStyleIndex() != Core::HID::NpadStyleIndex::JoyconDual) { - return ResultSuccess; + return false; } if (controller.is_dual_left_connected && !controller.is_dual_right_connected) { DisconnectNpad(npad_id); UpdateControllerAt(Core::HID::NpadStyleIndex::JoyconLeft, npad_id, true); - return ResultSuccess; + return false; } if (!controller.is_dual_left_connected && controller.is_dual_right_connected) { DisconnectNpad(npad_id); UpdateControllerAt(Core::HID::NpadStyleIndex::JoyconRight, npad_id, true); - return ResultSuccess; + return false; } // We have two controllers connected to the same npad_id we need to split them - const auto npad_id_2 = hid_core.GetFirstDisconnectedNpadId(); - auto& controller_2 = GetControllerFromNpadIdType(npad_id_2); + new_npad_id = hid_core.GetFirstDisconnectedNpadId(); + auto& controller_2 = GetControllerFromNpadIdType(new_npad_id); DisconnectNpad(npad_id); if (npad_device_type == NpadJoyDeviceType::Left) { UpdateControllerAt(Core::HID::NpadStyleIndex::JoyconLeft, npad_id, true); controller_2.is_dual_left_connected = false; controller_2.is_dual_right_connected = true; - UpdateControllerAt(Core::HID::NpadStyleIndex::JoyconDual, npad_id_2, true); + UpdateControllerAt(Core::HID::NpadStyleIndex::JoyconDual, new_npad_id, true); } else { UpdateControllerAt(Core::HID::NpadStyleIndex::JoyconRight, npad_id, true); controller_2.is_dual_left_connected = true; controller_2.is_dual_right_connected = false; - UpdateControllerAt(Core::HID::NpadStyleIndex::JoyconDual, npad_id_2, true); + UpdateControllerAt(Core::HID::NpadStyleIndex::JoyconDual, new_npad_id, true); } - return ResultSuccess; + return true; } bool Controller_NPad::VibrateControllerAtIndex(Core::HID::NpadIdType npad_id, diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index a5998c453..9cfe298f1 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -102,8 +102,8 @@ public: void SetNpadCommunicationMode(NpadCommunicationMode communication_mode_); NpadCommunicationMode GetNpadCommunicationMode() const; - Result SetNpadMode(Core::HID::NpadIdType npad_id, NpadJoyDeviceType npad_device_type, - NpadJoyAssignmentMode assignment_mode); + bool SetNpadMode(Core::HID::NpadIdType& new_npad_id, Core::HID::NpadIdType npad_id, + NpadJoyDeviceType npad_device_type, NpadJoyAssignmentMode assignment_mode); bool VibrateControllerAtIndex(Core::HID::NpadIdType npad_id, std::size_t device_index, const Core::HID::VibrationValue& vibration_value); diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 4529ad643..87e7b864a 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -302,7 +302,7 @@ Hid::Hid(Core::System& system_) {130, &Hid::SwapNpadAssignment, "SwapNpadAssignment"}, {131, &Hid::IsUnintendedHomeButtonInputProtectionEnabled, "IsUnintendedHomeButtonInputProtectionEnabled"}, {132, &Hid::EnableUnintendedHomeButtonInputProtection, "EnableUnintendedHomeButtonInputProtection"}, - {133, nullptr, "SetNpadJoyAssignmentModeSingleWithDestination"}, + {133, &Hid::SetNpadJoyAssignmentModeSingleWithDestination, "SetNpadJoyAssignmentModeSingleWithDestination"}, {134, &Hid::SetNpadAnalogStickUseCenterClamp, "SetNpadAnalogStickUseCenterClamp"}, {135, &Hid::SetNpadCaptureButtonAssignment, "SetNpadCaptureButtonAssignment"}, {136, &Hid::ClearNpadCaptureButtonAssignment, "ClearNpadCaptureButtonAssignment"}, @@ -1180,8 +1180,10 @@ void Hid::SetNpadJoyAssignmentModeSingleByDefault(HLERequestContext& ctx) { const auto parameters{rp.PopRaw()}; + Core::HID::NpadIdType new_npad_id{}; auto& controller = GetAppletResource()->GetController(HidController::NPad); - controller.SetNpadMode(parameters.npad_id, Controller_NPad::NpadJoyDeviceType::Left, + controller.SetNpadMode(new_npad_id, parameters.npad_id, + Controller_NPad::NpadJoyDeviceType::Left, Controller_NPad::NpadJoyAssignmentMode::Single); LOG_INFO(Service_HID, "called, npad_id={}, applet_resource_user_id={}", parameters.npad_id, @@ -1203,8 +1205,9 @@ void Hid::SetNpadJoyAssignmentModeSingle(HLERequestContext& ctx) { const auto parameters{rp.PopRaw()}; + Core::HID::NpadIdType new_npad_id{}; auto& controller = GetAppletResource()->GetController(HidController::NPad); - controller.SetNpadMode(parameters.npad_id, parameters.npad_joy_device_type, + controller.SetNpadMode(new_npad_id, parameters.npad_id, parameters.npad_joy_device_type, Controller_NPad::NpadJoyAssignmentMode::Single); LOG_INFO(Service_HID, "called, npad_id={}, applet_resource_user_id={}, npad_joy_device_type={}", @@ -1226,8 +1229,10 @@ void Hid::SetNpadJoyAssignmentModeDual(HLERequestContext& ctx) { const auto parameters{rp.PopRaw()}; + Core::HID::NpadIdType new_npad_id{}; auto& controller = GetAppletResource()->GetController(HidController::NPad); - controller.SetNpadMode(parameters.npad_id, {}, Controller_NPad::NpadJoyAssignmentMode::Dual); + controller.SetNpadMode(new_npad_id, parameters.npad_id, {}, + Controller_NPad::NpadJoyAssignmentMode::Dual); LOG_INFO(Service_HID, "called, npad_id={}, applet_resource_user_id={}", parameters.npad_id, parameters.applet_resource_user_id); @@ -1369,6 +1374,34 @@ void Hid::EnableUnintendedHomeButtonInputProtection(HLERequestContext& ctx) { rb.Push(result); } +void Hid::SetNpadJoyAssignmentModeSingleWithDestination(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + struct Parameters { + Core::HID::NpadIdType npad_id; + INSERT_PADDING_WORDS_NOINIT(1); + u64 applet_resource_user_id; + Controller_NPad::NpadJoyDeviceType npad_joy_device_type; + }; + static_assert(sizeof(Parameters) == 0x18, "Parameters has incorrect size."); + + const auto parameters{rp.PopRaw()}; + + Core::HID::NpadIdType new_npad_id{}; + auto& controller = GetAppletResource()->GetController(HidController::NPad); + const auto is_reassigned = + controller.SetNpadMode(new_npad_id, parameters.npad_id, parameters.npad_joy_device_type, + Controller_NPad::NpadJoyAssignmentMode::Single); + + LOG_INFO(Service_HID, "called, npad_id={}, applet_resource_user_id={}, npad_joy_device_type={}", + parameters.npad_id, parameters.applet_resource_user_id, + parameters.npad_joy_device_type); + + IPC::ResponseBuilder rb{ctx, 4}; + rb.Push(ResultSuccess); + rb.Push(is_reassigned); + rb.PushEnum(new_npad_id); +} + void Hid::SetNpadAnalogStickUseCenterClamp(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index c69e5f3fb..f247b83c2 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -151,6 +151,7 @@ private: void SwapNpadAssignment(HLERequestContext& ctx); void IsUnintendedHomeButtonInputProtectionEnabled(HLERequestContext& ctx); void EnableUnintendedHomeButtonInputProtection(HLERequestContext& ctx); + void SetNpadJoyAssignmentModeSingleWithDestination(HLERequestContext& ctx); void SetNpadAnalogStickUseCenterClamp(HLERequestContext& ctx); void SetNpadCaptureButtonAssignment(HLERequestContext& ctx); void ClearNpadCaptureButtonAssignment(HLERequestContext& ctx); From 11edba4974ab702deb54371bf1bf7644f1dd8e38 Mon Sep 17 00:00:00 2001 From: german77 Date: Sun, 26 Mar 2023 21:26:28 -0600 Subject: [PATCH 0236/1181] applet: controller: Implement cancel button --- src/core/frontend/applets/controller.cpp | 2 +- src/core/frontend/applets/controller.h | 2 +- .../hle/service/am/applets/applet_controller.cpp | 12 +++++++----- src/core/hle/service/am/applets/applet_controller.h | 9 +++++++-- src/yuzu/applets/qt_controller.cpp | 8 ++++---- src/yuzu/applets/qt_controller.h | 2 +- src/yuzu/applets/qt_controller.ui | 8 +++++++- src/yuzu/main.cpp | 7 ++++--- src/yuzu/main.h | 2 +- 9 files changed, 33 insertions(+), 19 deletions(-) diff --git a/src/core/frontend/applets/controller.cpp b/src/core/frontend/applets/controller.cpp index 8e586e938..3300d4f79 100644 --- a/src/core/frontend/applets/controller.cpp +++ b/src/core/frontend/applets/controller.cpp @@ -71,7 +71,7 @@ void DefaultControllerApplet::ReconfigureControllers(ReconfigureCallback callbac } } - callback(); + callback(true); } } // namespace Core::Frontend diff --git a/src/core/frontend/applets/controller.h b/src/core/frontend/applets/controller.h index 5c488387d..19a2db6bf 100644 --- a/src/core/frontend/applets/controller.h +++ b/src/core/frontend/applets/controller.h @@ -37,7 +37,7 @@ struct ControllerParameters { class ControllerApplet : public Applet { public: - using ReconfigureCallback = std::function; + using ReconfigureCallback = std::function; virtual ~ControllerApplet(); diff --git a/src/core/hle/service/am/applets/applet_controller.cpp b/src/core/hle/service/am/applets/applet_controller.cpp index 2d1d115d7..9840d2547 100644 --- a/src/core/hle/service/am/applets/applet_controller.cpp +++ b/src/core/hle/service/am/applets/applet_controller.cpp @@ -224,7 +224,8 @@ void Controller::Execute() { parameters.allow_dual_joycons, parameters.allow_left_joycon, parameters.allow_right_joycon); - frontend.ReconfigureControllers([this] { ConfigurationComplete(); }, parameters); + frontend.ReconfigureControllers( + [this](bool is_success) { ConfigurationComplete(is_success); }, parameters); break; } case ControllerSupportMode::ShowControllerStrapGuide: @@ -232,16 +233,16 @@ void Controller::Execute() { case ControllerSupportMode::ShowControllerKeyRemappingForSystem: UNIMPLEMENTED_MSG("ControllerSupportMode={} is not implemented", controller_private_arg.mode); - ConfigurationComplete(); + ConfigurationComplete(true); break; default: { - ConfigurationComplete(); + ConfigurationComplete(true); break; } } } -void Controller::ConfigurationComplete() { +void Controller::ConfigurationComplete(bool is_success) { ControllerSupportResultInfo result_info{}; // If enable_single_mode is enabled, player_count is 1 regardless of any other parameters. @@ -250,7 +251,8 @@ void Controller::ConfigurationComplete() { result_info.selected_id = static_cast(system.HIDCore().GetFirstNpadId()); - result_info.result = 0; + result_info.result = + is_success ? ControllerSupportResult::Success : ControllerSupportResult::Cancel; LOG_DEBUG(Service_HID, "Result Info: player_count={}, selected_id={}, result={}", result_info.player_count, result_info.selected_id, result_info.result); diff --git a/src/core/hle/service/am/applets/applet_controller.h b/src/core/hle/service/am/applets/applet_controller.h index 1fbabee11..f6c64f633 100644 --- a/src/core/hle/service/am/applets/applet_controller.h +++ b/src/core/hle/service/am/applets/applet_controller.h @@ -48,6 +48,11 @@ enum class ControllerSupportCaller : u8 { MaxControllerSupportCaller, }; +enum class ControllerSupportResult : u32 { + Success = 0, + Cancel = 2, +}; + struct ControllerSupportArgPrivate { u32 arg_private_size{}; u32 arg_size{}; @@ -112,7 +117,7 @@ struct ControllerSupportResultInfo { s8 player_count{}; INSERT_PADDING_BYTES(3); u32 selected_id{}; - u32 result{}; + ControllerSupportResult result{}; }; static_assert(sizeof(ControllerSupportResultInfo) == 0xC, "ControllerSupportResultInfo has incorrect size."); @@ -131,7 +136,7 @@ public: void Execute() override; Result RequestExit() override; - void ConfigurationComplete(); + void ConfigurationComplete(bool is_success); private: const Core::Frontend::ControllerApplet& frontend; diff --git a/src/yuzu/applets/qt_controller.cpp b/src/yuzu/applets/qt_controller.cpp index 79018a7f6..00aafb8f8 100644 --- a/src/yuzu/applets/qt_controller.cpp +++ b/src/yuzu/applets/qt_controller.cpp @@ -300,7 +300,7 @@ bool QtControllerSelectorDialog::CheckIfParametersMet() { if (num_connected_players < min_supported_players || num_connected_players > max_supported_players) { parameters_met = false; - ui->buttonBox->setEnabled(parameters_met); + ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(parameters_met); return parameters_met; } @@ -327,7 +327,7 @@ bool QtControllerSelectorDialog::CheckIfParametersMet() { }(); parameters_met = all_controllers_compatible; - ui->buttonBox->setEnabled(parameters_met); + ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(parameters_met); return parameters_met; } @@ -697,8 +697,8 @@ void QtControllerSelector::ReconfigureControllers( emit MainWindowReconfigureControllers(parameters); } -void QtControllerSelector::MainWindowReconfigureFinished() { +void QtControllerSelector::MainWindowReconfigureFinished(bool is_success) { if (callback) { - callback(); + callback(is_success); } } diff --git a/src/yuzu/applets/qt_controller.h b/src/yuzu/applets/qt_controller.h index 2ef7e488f..2fdc35857 100644 --- a/src/yuzu/applets/qt_controller.h +++ b/src/yuzu/applets/qt_controller.h @@ -167,7 +167,7 @@ signals: void MainWindowRequestExit() const; private: - void MainWindowReconfigureFinished(); + void MainWindowReconfigureFinished(bool is_success); mutable ReconfigureCallback callback; }; diff --git a/src/yuzu/applets/qt_controller.ui b/src/yuzu/applets/qt_controller.ui index f5eccba70..729e921ee 100644 --- a/src/yuzu/applets/qt_controller.ui +++ b/src/yuzu/applets/qt_controller.ui @@ -2629,7 +2629,7 @@ true - QDialogButtonBox::Ok + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -2649,5 +2649,11 @@ QtControllerSelectorDialog accept() + + buttonBox + rejected() + QtControllerSelectorDialog + reject() + diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 0c60a90cb..2ebfef551 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -634,15 +634,16 @@ void GMainWindow::ControllerSelectorReconfigureControllers( Qt::WindowStaysOnTopHint | Qt::WindowTitleHint | Qt::WindowSystemMenuHint); controller_applet->setWindowModality(Qt::WindowModal); - controller_applet->exec(); - - emit ControllerSelectorReconfigureFinished(); + bool is_success = controller_applet->exec() != QDialog::Rejected; // Don't forget to apply settings. + system->HIDCore().DisableAllControllerConfiguration(); system->ApplySettings(); config->Save(); UpdateStatusButtons(); + + emit ControllerSelectorReconfigureFinished(is_success); } void GMainWindow::ControllerSelectorRequestExit() { diff --git a/src/yuzu/main.h b/src/yuzu/main.h index a99938eaa..58a65bd33 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -165,7 +165,7 @@ signals: void AmiiboSettingsFinished(bool is_success, const std::string& name); - void ControllerSelectorReconfigureFinished(); + void ControllerSelectorReconfigureFinished(bool is_success); void ErrorDisplayFinished(); From b000af00541dc879b4f7527d807131fd182be3b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Locatti?= Date: Thu, 30 Mar 2023 17:28:08 -0300 Subject: [PATCH 0237/1181] Re-enable LTO for Linux Using the tested method of only enabling it for core and video_core. Clang is skipped, because Clang. --- .ci/scripts/linux/docker.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index c8bc56c9a..7f6d2ad1b 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh @@ -22,6 +22,7 @@ cmake .. \ -DUSE_DISCORD_PRESENCE=ON \ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \ -DYUZU_USE_BUNDLED_FFMPEG=ON \ + -DYUZU_ENABLE_LTO=ON \ -GNinja ninja From ff2089fdf5c25e439099fed2a8bc5029aa7985eb Mon Sep 17 00:00:00 2001 From: Feng Chen Date: Wed, 15 Mar 2023 21:17:44 +0800 Subject: [PATCH 0238/1181] video_core: Keep the definition of DimensionControl consistent with nvidia open doc --- src/video_core/engines/maxwell_3d.h | 8 ++--- src/video_core/texture_cache/image_info.cpp | 33 +++++++++++---------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h index c89969bb4..6c19354e1 100644 --- a/src/video_core/engines/maxwell_3d.h +++ b/src/video_core/engines/maxwell_3d.h @@ -856,8 +856,8 @@ public: struct ZetaSize { enum class DimensionControl : u32 { - DepthDefinesArray = 0, - ArraySizeOne = 1, + DefineArraySize = 0, + ArraySizeIsOne = 1, }; u32 width; @@ -1104,8 +1104,8 @@ public: struct TileMode { enum class DimensionControl : u32 { - DepthDefinesArray = 0, - DepthDefinesDepth = 1, + DefineArraySize = 0, + DefineDepthSize = 1, }; union { BitField<0, 4, u32> block_width; diff --git a/src/video_core/texture_cache/image_info.cpp b/src/video_core/texture_cache/image_info.cpp index 0b231887c..11f3f78a1 100644 --- a/src/video_core/texture_cache/image_info.cpp +++ b/src/video_core/texture_cache/image_info.cpp @@ -14,6 +14,7 @@ namespace VideoCommon { +using Tegra::Engines::Fermi2D; using Tegra::Engines::Maxwell3D; using Tegra::Texture::TextureType; using Tegra::Texture::TICEntry; @@ -114,13 +115,13 @@ ImageInfo::ImageInfo(const TICEntry& config) noexcept { } } -ImageInfo::ImageInfo(const Tegra::Engines::Maxwell3D::Regs::RenderTargetConfig& ct, +ImageInfo::ImageInfo(const Maxwell3D::Regs::RenderTargetConfig& ct, Tegra::Texture::MsaaMode msaa_mode) noexcept { format = VideoCore::Surface::PixelFormatFromRenderTargetFormat(ct.format); rescaleable = false; if (ct.tile_mode.is_pitch_linear) { ASSERT(ct.tile_mode.dim_control == - Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesArray); + Maxwell3D::Regs::TileMode::DimensionControl::DefineArraySize); type = ImageType::Linear; pitch = ct.width; size = Extent3D{ @@ -140,8 +141,7 @@ ImageInfo::ImageInfo(const Tegra::Engines::Maxwell3D::Regs::RenderTargetConfig& .height = ct.tile_mode.block_height, .depth = ct.tile_mode.block_depth, }; - if (ct.tile_mode.dim_control == - Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesDepth) { + if (ct.tile_mode.dim_control == Maxwell3D::Regs::TileMode::DimensionControl::DefineDepthSize) { type = ImageType::e3D; size.depth = ct.depth; } else { @@ -153,8 +153,7 @@ ImageInfo::ImageInfo(const Tegra::Engines::Maxwell3D::Regs::RenderTargetConfig& } } -ImageInfo::ImageInfo(const Tegra::Engines::Maxwell3D::Regs::Zeta& zt, - const Tegra::Engines::Maxwell3D::Regs::ZetaSize& zt_size, +ImageInfo::ImageInfo(const Maxwell3D::Regs::Zeta& zt, const Maxwell3D::Regs::ZetaSize& zt_size, Tegra::Texture::MsaaMode msaa_mode) noexcept { format = VideoCore::Surface::PixelFormatFromDepthFormat(zt.format); size.width = zt_size.width; @@ -171,30 +170,34 @@ ImageInfo::ImageInfo(const Tegra::Engines::Maxwell3D::Regs::Zeta& zt, }; if (zt.tile_mode.is_pitch_linear) { ASSERT(zt.tile_mode.dim_control == - Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesArray); + Maxwell3D::Regs::TileMode::DimensionControl::DefineArraySize); type = ImageType::Linear; pitch = size.width * BytesPerBlock(format); } else if (zt.tile_mode.dim_control == - Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesDepth) { - ASSERT(zt.tile_mode.is_pitch_linear == 0); - ASSERT(zt_size.dim_control == Maxwell3D::Regs::ZetaSize::DimensionControl::ArraySizeOne); + Maxwell3D::Regs::TileMode::DimensionControl::DefineDepthSize) { + ASSERT(zt_size.dim_control == Maxwell3D::Regs::ZetaSize::DimensionControl::ArraySizeIsOne); type = ImageType::e3D; size.depth = zt_size.depth; } else { - ASSERT(zt_size.dim_control == - Maxwell3D::Regs::ZetaSize::DimensionControl::DepthDefinesArray); rescaleable = block.depth == 0; downscaleable = size.height > 512; type = ImageType::e2D; - resources.layers = zt_size.depth; + switch (zt_size.dim_control) { + case Maxwell3D::Regs::ZetaSize::DimensionControl::DefineArraySize: + resources.layers = zt_size.depth; + break; + case Maxwell3D::Regs::ZetaSize::DimensionControl::ArraySizeIsOne: + resources.layers = 1; + break; + } } } -ImageInfo::ImageInfo(const Tegra::Engines::Fermi2D::Surface& config) noexcept { +ImageInfo::ImageInfo(const Fermi2D::Surface& config) noexcept { UNIMPLEMENTED_IF_MSG(config.layer != 0, "Surface layer is not zero"); format = VideoCore::Surface::PixelFormatFromRenderTargetFormat(config.format); rescaleable = false; - if (config.linear == Tegra::Engines::Fermi2D::MemoryLayout::Pitch) { + if (config.linear == Fermi2D::MemoryLayout::Pitch) { type = ImageType::Linear; size = Extent3D{ .width = config.pitch / VideoCore::Surface::BytesPerBlock(format), From 083d913eab0985093efa498fe035d11a0b726555 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sat, 1 Apr 2023 05:38:54 +0000 Subject: [PATCH 0239/1181] externals: update Vulkan-Headers to v1.3.246 --- CMakeLists.txt | 2 +- externals/Vulkan-Headers | 2 +- src/video_core/vulkan_common/vulkan_wrapper.cpp | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a6c43f401..561eaafb2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,7 +222,7 @@ find_package(ZLIB 1.2 REQUIRED) find_package(zstd 1.5 REQUIRED) if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) - find_package(Vulkan 1.3.238 REQUIRED) + find_package(Vulkan 1.3.246 REQUIRED) endif() if (ENABLE_LIBUSB) diff --git a/externals/Vulkan-Headers b/externals/Vulkan-Headers index 00671c64b..63af1cf1e 160000 --- a/externals/Vulkan-Headers +++ b/externals/Vulkan-Headers @@ -1 +1 @@ -Subproject commit 00671c64ba5c488ade22ad572a0ef81d5e64c803 +Subproject commit 63af1cf1ee906ba4dcd5a324bdd0201d4f4bfd12 diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cpp index 486d4dfaf..336f53700 100644 --- a/src/video_core/vulkan_common/vulkan_wrapper.cpp +++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp @@ -375,6 +375,8 @@ const char* ToString(VkResult result) noexcept { return "VK_RESULT_MAX_ENUM"; case VkResult::VK_ERROR_COMPRESSION_EXHAUSTED_EXT: return "VK_ERROR_COMPRESSION_EXHAUSTED_EXT"; + case VkResult::VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT: + return "VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT"; } return "Unknown"; } From 2ddecb9631cba32cdc1738d8fb84fdf65be970ec Mon Sep 17 00:00:00 2001 From: Merry Date: Sat, 1 Apr 2023 12:40:20 +0100 Subject: [PATCH 0240/1181] externals: Update dynarmic to 6.4.6 --- externals/dynarmic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/dynarmic b/externals/dynarmic index 165621a87..c08c5a936 160000 --- a/externals/dynarmic +++ b/externals/dynarmic @@ -1 +1 @@ -Subproject commit 165621a872ffb802c7a26ef5900e1e62681f1a88 +Subproject commit c08c5a9362bb224dc343c2f616c24df027dfdf13 From 9c94faaa2b2532a4d383afc1b9825bd5005e5a8e Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 1 Apr 2023 17:03:08 -0700 Subject: [PATCH 0241/1181] core: arm_dynarmic_32: Update SaveContext/LoadContext. --- src/core/arm/dynarmic/arm_dynarmic_32.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index cab21a88e..dfdcbe35a 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include "common/assert.h" #include "common/literals.h" #include "common/logging/log.h" @@ -410,21 +409,19 @@ void ARM_Dynarmic_32::SetTPIDR_EL0(u64 value) { } void ARM_Dynarmic_32::SaveContext(ThreadContext32& ctx) { - Dynarmic::A32::Context context; - jit.load()->SaveContext(context); - ctx.cpu_registers = context.Regs(); - ctx.extension_registers = context.ExtRegs(); - ctx.cpsr = context.Cpsr(); - ctx.fpscr = context.Fpscr(); + Dynarmic::A32::Jit* j = jit.load(); + ctx.cpu_registers = j->Regs(); + ctx.extension_registers = j->ExtRegs(); + ctx.cpsr = j->Cpsr(); + ctx.fpscr = j->Fpscr(); } void ARM_Dynarmic_32::LoadContext(const ThreadContext32& ctx) { - Dynarmic::A32::Context context; - context.Regs() = ctx.cpu_registers; - context.ExtRegs() = ctx.extension_registers; - context.SetCpsr(ctx.cpsr); - context.SetFpscr(ctx.fpscr); - jit.load()->LoadContext(context); + Dynarmic::A32::Jit* j = jit.load(); + j->Regs() = ctx.cpu_registers; + j->ExtRegs() = ctx.extension_registers; + j->SetCpsr(ctx.cpsr); + j->SetFpscr(ctx.fpscr); } void ARM_Dynarmic_32::SignalInterrupt() { From d2ae39bf4ba59730c9c6e28f821b35297ec26566 Mon Sep 17 00:00:00 2001 From: german77 Date: Sun, 2 Apr 2023 02:21:54 -0600 Subject: [PATCH 0242/1181] service: hid: Fix handle validation --- src/core/hle/service/hid/controllers/npad.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index b070327ec..8abf71608 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -70,7 +70,6 @@ Result Controller_NPad::VerifyValidSixAxisSensorHandle( const Core::HID::SixAxisSensorHandle& device_handle) { const auto npad_id = IsNpadIdValid(static_cast(device_handle.npad_id)); const bool device_index = device_handle.device_index < Core::HID::DeviceIndex::MaxDeviceIndex; - const bool npad_type = device_handle.npad_type < Core::HID::NpadStyleIndex::MaxNpadType; if (!npad_id) { return InvalidNpadId; @@ -78,10 +77,6 @@ Result Controller_NPad::VerifyValidSixAxisSensorHandle( if (!device_index) { return NpadDeviceIndexOutOfRange; } - // This doesn't get validated on nnsdk - if (!npad_type) { - return NpadInvalidHandle; - } return ResultSuccess; } @@ -1131,6 +1126,7 @@ Result Controller_NPad::DisconnectNpad(Core::HID::NpadIdType npad_id) { WriteEmptyEntry(shared_memory); return ResultSuccess; } + Result Controller_NPad::SetGyroscopeZeroDriftMode( const Core::HID::SixAxisSensorHandle& sixaxis_handle, Core::HID::GyroscopeZeroDriftMode drift_mode) { From a9623d5f550c8fc63f436a40f43bfbf539ac0853 Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 2 Apr 2023 19:02:04 -0400 Subject: [PATCH 0243/1181] general: fixes for gcc 13 --- src/CMakeLists.txt | 11 +++++++++++ src/common/intrusive_red_black_tree.h | 8 -------- src/common/typed_address.h | 5 ----- src/core/internal_network/socket_proxy.h | 3 --- src/core/internal_network/sockets.h | 13 ++----------- src/web_service/verify_login.cpp | 2 +- 6 files changed, 14 insertions(+), 28 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0eca8e90e..312a49f42 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -126,6 +126,17 @@ else() add_compile_options("-stdlib=libc++") endif() + # GCC bugs + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + # These diagnostics would be great if they worked, but are just completely broken + # and produce bogus errors on external libraries like fmt. + add_compile_options( + -Wno-array-bounds + -Wno-stringop-overread + -Wno-stringop-overflow + ) + endif() + # Set file offset size to 64 bits. # # On modern Unixes, this is typically already the case. The lone exception is diff --git a/src/common/intrusive_red_black_tree.h b/src/common/intrusive_red_black_tree.h index 5f6b34e82..bc2940fa0 100644 --- a/src/common/intrusive_red_black_tree.h +++ b/src/common/intrusive_red_black_tree.h @@ -96,10 +96,6 @@ public: return m_node == rhs.m_node; } - constexpr bool operator!=(const Iterator& rhs) const { - return !(*this == rhs); - } - constexpr pointer operator->() const { return m_node; } @@ -324,10 +320,6 @@ public: return m_impl == rhs.m_impl; } - constexpr bool operator!=(const Iterator& rhs) const { - return !(*this == rhs); - } - constexpr pointer operator->() const { return Traits::GetParent(std::addressof(*m_impl)); } diff --git a/src/common/typed_address.h b/src/common/typed_address.h index cf7bbeae1..64f4a07c2 100644 --- a/src/common/typed_address.h +++ b/src/common/typed_address.h @@ -116,7 +116,6 @@ public: // Comparison operators. constexpr bool operator==(const TypedAddress&) const = default; - constexpr bool operator!=(const TypedAddress&) const = default; constexpr auto operator<=>(const TypedAddress&) const = default; // For convenience, also define comparison operators versus uint64_t. @@ -124,10 +123,6 @@ public: return m_address == rhs; } - constexpr inline bool operator!=(uint64_t rhs) const { - return m_address != rhs; - } - // Allow getting the address explicitly, for use in accessors. constexpr inline uint64_t GetValue() const { return m_address; diff --git a/src/core/internal_network/socket_proxy.h b/src/core/internal_network/socket_proxy.h index 9421492bc..6e991fa38 100644 --- a/src/core/internal_network/socket_proxy.h +++ b/src/core/internal_network/socket_proxy.h @@ -16,9 +16,6 @@ namespace Network { class ProxySocket : public SocketBase { public: - YUZU_NON_COPYABLE(ProxySocket); - YUZU_NON_MOVEABLE(ProxySocket); - explicit ProxySocket(RoomNetwork& room_network_) noexcept; ~ProxySocket() override; diff --git a/src/core/internal_network/sockets.h b/src/core/internal_network/sockets.h index 4c7489258..11e479e50 100644 --- a/src/core/internal_network/sockets.h +++ b/src/core/internal_network/sockets.h @@ -36,13 +36,10 @@ public: SocketBase() = default; explicit SocketBase(SOCKET fd_) : fd{fd_} {} - virtual ~SocketBase() = default; - virtual SocketBase& operator=(const SocketBase&) = delete; - - // Avoid closing sockets implicitly - virtual SocketBase& operator=(SocketBase&&) noexcept = delete; + YUZU_NON_COPYABLE(SocketBase); + YUZU_NON_MOVEABLE(SocketBase); virtual Errno Initialize(Domain domain, Type type, Protocol protocol) = 0; @@ -109,14 +106,8 @@ public: ~Socket() override; - Socket(const Socket&) = delete; - Socket& operator=(const Socket&) = delete; - Socket(Socket&& rhs) noexcept; - // Avoid closing sockets implicitly - Socket& operator=(Socket&&) noexcept = delete; - Errno Initialize(Domain domain, Type type, Protocol protocol) override; Errno Close() override; diff --git a/src/web_service/verify_login.cpp b/src/web_service/verify_login.cpp index 050080278..d5b7161cb 100644 --- a/src/web_service/verify_login.cpp +++ b/src/web_service/verify_login.cpp @@ -21,7 +21,7 @@ bool VerifyLogin(const std::string& host, const std::string& username, const std return username.empty(); } - return username == *iter; + return *iter == username; } } // namespace WebService From 0afb9631b53de1a747fc9ba46ed37781b04ef492 Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Sun, 2 Apr 2023 17:29:07 +0100 Subject: [PATCH 0244/1181] Add some explicit latency to sample count reporting Some games have very tight scheduling requirements for their audio which can't really be matched on the host, adding a constant to the reported value helps to provide some leeway. --- src/audio_core/sink/sink_stream.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index f99dbd8ec..13c73b5d7 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -266,7 +266,8 @@ u64 SinkStream::GetExpectedPlayedSampleCount() { auto exp_played_sample_count{min_played_sample_count + (TargetSampleRate * time_delta) / std::chrono::seconds{1}}; - return std::min(exp_played_sample_count, max_played_sample_count); + // Add 15ms of latency in sample reporting to allow for some leeway in scheduler timings + return std::min(exp_played_sample_count, max_played_sample_count) + TargetSampleCount * 3; } void SinkStream::WaitFreeSpace() { From 455a7362502fa81b7517b53b1ed805b41f613292 Mon Sep 17 00:00:00 2001 From: The yuzu Community Date: Tue, 4 Apr 2023 05:18:06 +0000 Subject: [PATCH 0245/1181] Update translations (2023-04-04) --- dist/languages/ca.ts | 731 +++++++++++++++++++------------------- dist/languages/cs.ts | 731 +++++++++++++++++++------------------- dist/languages/da.ts | 731 +++++++++++++++++++------------------- dist/languages/de.ts | 737 +++++++++++++++++++------------------- dist/languages/el.ts | 731 +++++++++++++++++++------------------- dist/languages/es.ts | 733 +++++++++++++++++++------------------- dist/languages/fr.ts | 741 +++++++++++++++++++-------------------- dist/languages/id.ts | 729 +++++++++++++++++++------------------- dist/languages/it.ts | 741 +++++++++++++++++++-------------------- dist/languages/ja_JP.ts | 760 ++++++++++++++++++++-------------------- dist/languages/ko_KR.ts | 733 +++++++++++++++++++------------------- dist/languages/nb.ts | 731 +++++++++++++++++++------------------- dist/languages/nl.ts | 729 +++++++++++++++++++------------------- dist/languages/pl.ts | 733 +++++++++++++++++++------------------- dist/languages/pt_BR.ts | 751 ++++++++++++++++++++------------------- dist/languages/pt_PT.ts | 753 ++++++++++++++++++++------------------- dist/languages/ru_RU.ts | 733 +++++++++++++++++++------------------- dist/languages/sv.ts | 729 +++++++++++++++++++------------------- dist/languages/tr_TR.ts | 733 +++++++++++++++++++------------------- dist/languages/uk.ts | 733 +++++++++++++++++++------------------- dist/languages/zh_CN.ts | 733 +++++++++++++++++++------------------- dist/languages/zh_TW.ts | 733 +++++++++++++++++++------------------- 22 files changed, 8041 insertions(+), 8148 deletions(-) diff --git a/dist/languages/ca.ts b/dist/languages/ca.ts index 7ab6c106c..b4e77d029 100644 --- a/dist/languages/ca.ts +++ b/dist/languages/ca.ts @@ -372,36 +372,61 @@ This would ban both their forum username and their IP address. - Output Device + Output Device: - Input Device - Dispositiu d'entrada + Input Device: + - + + Sound Output Mode: + + + + + Mono + Mono + + + + Stereo + Estèreo + + + + Surround + Envoltant + + + Use global volume Utilitza el volum global - + Set volume: Configurar volum: - + Volume: Volum: - + 0 % 0 % - + + Mute audio when in background + Silenciar l'àudio quan estigui en segon plà + + + %1% Volume percentage (e.g. 50%) %1% @@ -1367,26 +1392,21 @@ This would ban both their forum username and their IP address. - Mute audio when in background - Silenciar l'àudio quan estigui en segon plà - - - Hide mouse on inactivity Ocultar el cursor del ratolí en cas d'inactivitat - + Reset All Settings Reiniciar tots els paràmetres - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Això restablirà tota la configuració i eliminarà totes les configuracions dels jocs. No eliminarà ni els directoris de jocs, ni els perfils, ni els perfils dels controladors. Procedir? @@ -3819,60 +3839,15 @@ UUID: %2 - - Mono - Mono - - - - Stereo - Estèreo - - - - Surround - Envoltant - - - - Console ID: - ID de la consola: - - - - Sound output mode - Mode de sortida del so - - - - Regenerate - Regenerar - - - + System settings are available only when game is not running. Els paràmetres del sistema només estan disponibles quan el joc no s'està executant. - + Warning: "%1" is not a valid language for region "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Això reemplaçarà la seva Switch virtual actual amb una nova. La seva Switch virtual actual no serà recuperable. Això podria tenir efectes inesperats en els jocs. Això pot fallar si fa servir una partida guardada amb una configuració desactualitzada. Continuar? - - - - Warning - Avís - - - - Console ID: 0x%1 - ID de la consola: 0x%1 - ConfigureTas @@ -4560,555 +4535,555 @@ Arrossegui els punts per a canviar la posició, o faci doble clic a les cel·les GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Es recullen dades anònimes</a> per ajudar a millorar yuzu. <br/><br/>Desitja compartir les seves dades d'ús amb nosaltres? - + Telemetry Telemetria - + Broken Vulkan Installation Detected - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... Carregant Web applet... - - + + Disable Web Applet Desactivar el Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Desactivar l'Applet Web pot provocar comportaments indefinits i només hauria d'utilitzar-se amb Super Mario 3D All-Stars. Estàs segur de que vols desactivar l'Applet Web? (Això pot ser reactivat als paràmetres Debug.) - + The amount of shaders currently being built La quantitat de shaders que s'estan compilant actualment - + The current selected resolution scaling multiplier. El multiplicador d'escala de resolució seleccionat actualment. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Velocitat d'emulació actual. Valors superiors o inferiors a 100% indiquen que l'emulació s'està executant més ràpidament o més lentament que a la Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Quants fotogrames per segon està mostrant el joc actualment. Això variarà d'un joc a un altre i d'una escena a una altra. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Temps que costa emular un fotograma de la Switch, sense tenir en compte la limitació de fotogrames o la sincronització vertical. Per a una emulació òptima, aquest valor hauria de ser com a màxim de 16.67 ms. - + &Clear Recent Files &Esborrar arxius recents - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Continuar - + &Pause &Pausar - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu està executant un joc - + Warning Outdated Game Format Advertència format del joc desfasat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Està utilitzant el format de directori de ROM deconstruït per a aquest joc, que és un format desactualitzat que ha sigut reemplaçat per altres, com NCA, NAX, XCI o NSP. Els directoris de ROM deconstruïts careixen d'icones, metadades i suport d'actualitzacions.<br><br>Per a obtenir una explicació dels diversos formats de Switch que suporta yuzu,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>faci una ullada a la nostra wiki</a>. Aquest missatge no es tornarà a mostrar. - - + + Error while loading ROM! Error carregant la ROM! - + The ROM format is not supported. El format de la ROM no està suportat. - + An error occurred initializing the video core. S'ha produït un error inicialitzant el nucli de vídeo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu ha trobat un error mentre executava el nucli de vídeo. Això sol ser causat per controladors de la GPU obsolets, inclosos els integrats. Si us plau, consulti el registre per a més detalls. Per obtenir més informació sobre com accedir al registre, consulti la següent pàgina: <a href='https://yuzu-emu.org/help/reference/log-files/'>Com carregar el fitxer de registre</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Error al carregar la ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Si us plau, segueixi <a href='https://yuzu-emu.org/help/quickstart/'>la guia d'inici de yuzu</a> per a bolcar de nou els seus fitxers.<br>Pot consultar la wiki de yuzu wiki</a> o el Discord de yuzu</a> per obtenir ajuda. - + An unknown error occurred. Please see the log for more details. S'ha produït un error desconegut. Si us plau, consulti el registre per a més detalls. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Dades de partides guardades - + Mod Data Dades de mods - + Error Opening %1 Folder Error obrint la carpeta %1 - - + + Folder does not exist! La carpeta no existeix! - + Error Opening Transferable Shader Cache Error obrint la cache transferible de shaders - + Failed to create the shader cache directory for this title. No s'ha pogut crear el directori de la cache dels shaders per aquest títol. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Eliminar entrada - - - - - - + + + + + + Successfully Removed S'ha eliminat correctament - + Successfully removed the installed base game. S'ha eliminat correctament el joc base instal·lat. - + The base game is not installed in the NAND and cannot be removed. El joc base no està instal·lat a la NAND i no pot ser eliminat. - + Successfully removed the installed update. S'ha eliminat correctament l'actualització instal·lada. - + There is no update installed for this title. No hi ha cap actualització instal·lada per aquest títol. - + There are no DLC installed for this title. No hi ha cap DLC instal·lat per aquest títol. - + Successfully removed %1 installed DLC. S'ha eliminat correctament %1 DLC instal·lat/s. - + Delete OpenGL Transferable Shader Cache? Desitja eliminar la cache transferible de shaders d'OpenGL? - + Delete Vulkan Transferable Shader Cache? Desitja eliminar la cache transferible de shaders de Vulkan? - + Delete All Transferable Shader Caches? Desitja eliminar totes les caches transferibles de shaders? - + Remove Custom Game Configuration? Desitja eliminar la configuració personalitzada del joc? - + Remove File Eliminar arxiu - - + + Error Removing Transferable Shader Cache Error eliminant la cache transferible de shaders - - + + A shader cache for this title does not exist. No existeix una cache de shaders per aquest títol. - + Successfully removed the transferable shader cache. S'ha eliminat correctament la cache transferible de shaders. - + Failed to remove the transferable shader cache. No s'ha pogut eliminar la cache transferible de shaders. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches Error al eliminar les caches de shaders transferibles - + Successfully removed the transferable shader caches. Caches de shaders transferibles eliminades correctament. - + Failed to remove the transferable shader cache directory. No s'ha pogut eliminar el directori de caches de shaders transferibles. - - + + Error Removing Custom Configuration Error eliminant la configuració personalitzada - + A custom configuration for this title does not exist. No existeix una configuració personalitzada per aquest joc. - + Successfully removed the custom game configuration. S'ha eliminat correctament la configuració personalitzada del joc. - + Failed to remove the custom game configuration. No s'ha pogut eliminar la configuració personalitzada del joc. - - + + RomFS Extraction Failed! La extracció de RomFS ha fallat! - + There was an error copying the RomFS files or the user cancelled the operation. S'ha produït un error copiant els arxius RomFS o l'usuari ha cancel·lat la operació. - + Full Completa - + Skeleton Esquelet - + Select RomFS Dump Mode Seleccioni el mode de bolcat de RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Si us plau, seleccioni la forma en que desitja bolcar la RomFS.<br>Completa copiarà tots els arxius al nou directori mentre que<br>esquelet només crearà l'estructura de directoris. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root No hi ha suficient espai lliure a %1 per extreure el RomFS. Si us plau, alliberi espai o esculli un altre directori de bolcat a Emulació > Configuració > Sistema > Sistema d'arxius > Carpeta arrel de bolcat - + Extracting RomFS... Extraient RomFS... - - + + Cancel Cancel·la - + RomFS Extraction Succeeded! Extracció de RomFS completada correctament! - + The operation completed successfully. L'operació s'ha completat correctament. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Error obrint %1 - + Select Directory Seleccionar directori - + Properties Propietats - + The game properties could not be loaded. Les propietats del joc no s'han pogut carregar. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Executable de Switch (%1);;Tots els Arxius (*.*) - + Load File Carregar arxiu - + Open Extracted ROM Directory Obrir el directori de la ROM extreta - + Invalid Directory Selected Directori seleccionat invàlid - + The directory you have selected does not contain a 'main' file. El directori que ha seleccionat no conté un arxiu 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Arxiu de Switch Instal·lable (*.nca *.nsp *.xci);;Arxiu de Continguts Nintendo (*.nca);;Paquet d'enviament Nintendo (*.nsp);;Imatge de Cartutx NX (*.xci) - + Install Files Instal·lar arxius - + %n file(s) remaining %n arxiu(s) restants%n arxiu(s) restants - + Installing file "%1"... Instal·lant arxiu "%1"... - - + + Install Results Resultats instal·lació - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Per evitar possibles conflictes, no recomanem als usuaris que instal·lin jocs base a la NAND. Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i DLCs. - + %n file(s) were newly installed %n nou(s) arxiu(s) s'ha(n) instal·lat @@ -5116,7 +5091,7 @@ Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i - + %n file(s) were overwritten %n arxiu(s) s'han sobreescrit @@ -5124,7 +5099,7 @@ Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i - + %n file(s) failed to install %n arxiu(s) no s'han instal·lat @@ -5132,388 +5107,388 @@ Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i - + System Application Aplicació del sistema - + System Archive Arxiu del sistema - + System Application Update Actualització de l'aplicació del sistema - + Firmware Package (Type A) Paquet de firmware (Tipus A) - + Firmware Package (Type B) Paquet de firmware (Tipus B) - + Game Joc - + Game Update Actualització de joc - + Game DLC DLC del joc - + Delta Title Títol delta - + Select NCA Install Type... Seleccioni el tipus d'instal·lació NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Seleccioni el tipus de títol que desitja instal·lar aquest NCA com a: (En la majoria dels casos, el valor predeterminat 'Joc' està bé.) - + Failed to Install Ha fallat la instal·lació - + The title type you selected for the NCA is invalid. El tipus de títol seleccionat per el NCA és invàlid. - + File not found Arxiu no trobat - + File "%1" not found Arxiu "%1" no trobat - + OK D'acord - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Falta el compte de yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Per tal d'enviar un cas de prova de compatibilitat de joc, ha de vincular el seu compte de yuzu.<br><br/>Per a vincular el seu compte de yuzu, vagi a Emulació & gt; Configuració & gt; Web. - + Error opening URL Error obrint URL - + Unable to open the URL "%1". No es pot obrir la URL "%1". - + TAS Recording Gravació TAS - + Overwrite file of player 1? Sobreescriure l'arxiu del jugador 1? - + Invalid config detected Configuració invàlida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. El controlador del mode portàtil no es pot fer servir en el mode acoblat. Es seleccionarà el controlador Pro en el seu lloc. - - + + Amiibo Amiibo - - + + The current amiibo has been removed L'amiibo actual ha sigut eliminat - + Error Error - - + + The current game is not looking for amiibos El joc actual no està buscant amiibos - + Amiibo File (%1);; All Files (*.*) Arxiu Amiibo (%1);; Tots els Arxius (*.*) - + Load Amiibo Carregar Amiibo - + Error loading Amiibo data Error al carregar les dades d'Amiibo - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Captura de pantalla - + PNG Image (*.png) Imatge PNG (*.png) - + TAS state: Running %1/%2 Estat TAS: executant %1/%2 - + TAS state: Recording %1 Estat TAS: gravant %1 - + TAS state: Idle %1/%2 Estat TAS: inactiu %1/%2 - + TAS State: Invalid Estat TAS: invàlid - + &Stop Running &Parar l'execució - + &Start &Iniciar - + Stop R&ecording Parar g&ravació - + R&ecord G&ravar - + Building: %n shader(s) Construint: %n shader(s)Construint: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escala: %1x - + Speed: %1% / %2% Velocitat: %1% / %2% - + Speed: %1% Velocitat: %1% - + Game: %1 FPS (Unlocked) Joc: %1 FPS (desbloquejat) - + Game: %1 FPS Joc: %1 FPS - + Frame: %1 ms Fotograma: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR ERROR GPU - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST MÉS PROPER - - + + BILINEAR BILINEAL - + BICUBIC BICÚBIC - + GAUSSIAN GAUSSIÀ - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA SENSE AA - + FXAA FXAA - + SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation Confirmi la clau de rederivació - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5530,37 +5505,37 @@ i opcionalment faci còpies de seguretat. Això eliminarà els arxius de les claus generats automàticament i tornarà a executar el mòdul de derivació de claus. - + Missing fuses Falten fusibles - + - Missing BOOT0 - Falta BOOT0 - + - Missing BCPKG2-1-Normal-Main - Falta BCPKG2-1-Normal-Main - + - Missing PRODINFO - Falta PRODINFO - + Derivation Components Missing Falten components de derivació - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Falten les claus d'encriptació. <br>Si us plau, segueixi <a href='https://yuzu-emu.org/help/quickstart/'>la guia ràpida de yuzu</a> per a obtenir totes les seves claus, firmware i jocs.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5569,39 +5544,39 @@ Això pot prendre fins a un minut depenent del rendiment del seu sistema. - + Deriving Keys Derivant claus - + Select RomFS Dump Target Seleccioni el destinatari per a bolcar el RomFS - + Please select which RomFS you would like to dump. Si us plau, seleccioni quin RomFS desitja bolcar. - + Are you sure you want to close yuzu? Està segur de que vol tancar yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Està segur de que vol aturar l'emulació? Qualsevol progrés no guardat es perdrà. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7600,28 +7575,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) Codi d'error: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. S'ha produït un error. Si us plau, intenti-ho de nou o contacti el desenvolupador del programari. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. S'ha produït un error a %1 a les %2. Si us plau, intenti-ho de nou o contacti el desenvolupador del programari. - + An error has occurred. %1 @@ -7645,20 +7620,81 @@ Si us plau, intenti-ho de nou o contacti el desenvolupador del programari. - - Select a user: - Seleccioni un usuari: - - - + Users Usuaris - + + Profile Creator + + + + + Profile Selector Selector de perfil + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Seleccioni un usuari: + QtSoftwareKeyboardDialog @@ -7708,51 +7744,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Pila de trucades - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - esperant el mutex 0x%1 - - - - has waiters: %1 - té receptors: %1 - - - - owner handle: 0x%1 - mànec del propietari: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - esperant tots els objectes - - - - waiting for one of the following objects - esperant un dels següents objectes - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + - + waited by no thread esperat per cap fil @@ -7760,120 +7765,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable executable - + paused pausat - + sleeping dormint - + waiting for IPC reply esperant per resposta IPC - + waiting for objects esperant objectes - + waiting for condition variable esperant variable condicional - + waiting for address arbiter esperant al àrbitre d'adreça - + waiting for suspend resume esperant reanudar la suspensió - + waiting esperant - + initialized inicialitzat - + terminated acabat - + unknown desconegut - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal ideal - + core %1 nucli %1 - + processor = %1 processador = %1 - - ideal core = %1 - nucli ideal = %1 - - - + affinity mask = %1 màscara d'afinitat = %1 - + thread id = %1 id fil = %1 - + priority = %1(current) / %2(normal) prioritat = %1(actual) / %2(normal) - + last running ticks = %1 últims ticks consecutius = %1 - - - not waiting for mutex - no esperant per mutex - WaitTreeThreadList - + waited by thread esperat per fil @@ -7881,7 +7876,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree Arbre d'&espera diff --git a/dist/languages/cs.ts b/dist/languages/cs.ts index eb54bd162..b1b12c019 100644 --- a/dist/languages/cs.ts +++ b/dist/languages/cs.ts @@ -372,36 +372,61 @@ This would ban both their forum username and their IP address. - Output Device + Output Device: - Input Device - Vstupní zařízení + Input Device: + - + + Sound Output Mode: + + + + + Mono + Mono + + + + Stereo + Stereo + + + + Surround + Surround + + + Use global volume Použít globální hlasitost - + Set volume: Nastavit hlasitost: - + Volume: Hlasitost: - + 0 % 0 % - + + Mute audio when in background + + + + %1% Volume percentage (e.g. 50%) %1% @@ -1359,26 +1384,21 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - Mute audio when in background - - - - Hide mouse on inactivity Skrýt myš při neaktivitě - + Reset All Settings Resetovat všechna nastavení - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Toto vyresetuje všechna nastavení a odstraní konfigurace pro jednotlivé hry. Složky s hrami a profily zůstanou zachovány. Přejete si pokračovat? @@ -3811,60 +3831,15 @@ UUID: %2 - - Mono - Mono - - - - Stereo - Stereo - - - - Surround - Surround - - - - Console ID: - ID Konzole: - - - - Sound output mode - Mód výstupu zvuku - - - - Regenerate - Přegenerovat - - - + System settings are available only when game is not running. Systémová nastavení jsou dostupná pouze, pokud hra neběží. - + Warning: "%1" is not a valid language for region "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Toto vymění váš virtuální Switch za nový. Váš aktuální virtuální Switch nebude možno navrátit. Tohle může mít nečekané následky ve hrách. Tohle může selhat pokud použijete starý konfig savu. Pokračovat? - - - - Warning - Varování - - - - Console ID: 0x%1 - ID Konzole: 0x%1 - ConfigureTas @@ -4552,953 +4527,953 @@ Táhněte body pro změnu pozice nebo dvojitě klikněte na buňky tabulky pro z GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymní data jsou sbírána</a> pro vylepšení yuzu. <br/><br/>Chcete s námi sdílet anonymní data? - + Telemetry Telemetry - + Broken Vulkan Installation Detected - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... Načítání Web Appletu... - - + + Disable Web Applet Zakázat Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Počet aktuálně sestavovaných shaderů - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Aktuální emulační rychlost. Hodnoty vyšší než 100% indikují, že emulace běží rychleji nebo pomaleji než na Switchi. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Kolik snímků za sekundu aktuálně hra zobrazuje. Tohle závisí na hře od hry a scény od scény. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Čas potřebný na emulaci framu scény, nepočítá se limit nebo v-sync. Pro plnou rychlost by se tohle mělo pohybovat okolo 16.67 ms. - + &Clear Recent Files &Vymazat poslední soubory - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Pokračovat - + &Pause &Pauza - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Varování Zastaralý Formát Hry - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Používáte rozbalený formát hry, který je zastaralý a byl nahrazen jinými jako NCA, NAX, XCI, nebo NSP. Rozbalená ROM nemá ikony, metadata, a podporu updatů.<br><br>Pro vysvětlení všech možných podporovaných typů, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>zkoukni naší wiki</a>. Tato zpráva se nebude znova zobrazovat. - - + + Error while loading ROM! Chyba při načítání ROM! - + The ROM format is not supported. Tento formát ROM není podporován. - + An error occurred initializing the video core. Nastala chyba při inicializaci jádra videa. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Chyba při načítání ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Pro extrakci souborů postupujte podle <a href='https://yuzu-emu.org/help/quickstart/'>rychlého průvodce yuzu</a>. Nápovědu naleznete na <br>wiki</a> nebo na Discordu</a>. - + An unknown error occurred. Please see the log for more details. Nastala chyba. Koukni do logu. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Uložit data - + Mod Data Módovat Data - + Error Opening %1 Folder Chyba otevírání složky %1 - - + + Folder does not exist! Složka neexistuje! - + Error Opening Transferable Shader Cache Chyba při otevírání přenositelné mezipaměti shaderů - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Odebrat položku - - - - - - + + + + + + Successfully Removed Úspěšně odebráno - + Successfully removed the installed base game. Úspěšně odebrán nainstalovaný základ hry. - + The base game is not installed in the NAND and cannot be removed. Základ hry není nainstalovaný na NAND a nemůže být odstraněn. - + Successfully removed the installed update. Úspěšně odebrána nainstalovaná aktualizace. - + There is no update installed for this title. Není nainstalovaná žádná aktualizace pro tento titul. - + There are no DLC installed for this title. Není nainstalované žádné DLC pro tento titul. - + Successfully removed %1 installed DLC. Úspěšně odstraněno %1 nainstalovaných DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? Odstranit vlastní konfiguraci hry? - + Remove File Odstranit soubor - - + + Error Removing Transferable Shader Cache Chyba při odstraňování přenositelné mezipaměti shaderů - - + + A shader cache for this title does not exist. Mezipaměť shaderů pro tento titul neexistuje. - + Successfully removed the transferable shader cache. Přenositelná mezipaměť shaderů úspěšně odstraněna - + Failed to remove the transferable shader cache. Nepodařilo se odstranit přenositelnou mezipaměť shaderů - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Chyba při odstraňování vlastní konfigurace hry - + A custom configuration for this title does not exist. Vlastní konfigurace hry pro tento titul neexistuje. - + Successfully removed the custom game configuration. Úspěšně odstraněna vlastní konfigurace hry. - + Failed to remove the custom game configuration. Nepodařilo se odstranit vlastní konfiguraci hry. - - + + RomFS Extraction Failed! Extrakce RomFS se nepovedla! - + There was an error copying the RomFS files or the user cancelled the operation. Nastala chyba při kopírování RomFS souborů, nebo uživatel operaci zrušil. - + Full Plný - + Skeleton Kostra - + Select RomFS Dump Mode Vyber RomFS Dump Mode - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Vyber jak by si chtěl RomFS vypsat.<br>Plné zkopíruje úplně všechno, ale<br>kostra zkopíruje jen strukturu složky. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Extrahuji RomFS... - - + + Cancel Zrušit - + RomFS Extraction Succeeded! Extrakce RomFS se povedla! - + The operation completed successfully. Operace byla dokončena úspěšně. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Chyba při otevírání %1 - + Select Directory Vybraná Složka - + Properties Vlastnosti - + The game properties could not be loaded. Herní vlastnosti nemohly být načteny. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Executable (%1);;Všechny soubory (*.*) - + Load File Načíst soubor - + Open Extracted ROM Directory Otevřít složku s extrahovanou ROM - + Invalid Directory Selected Vybraná složka je neplatná - + The directory you have selected does not contain a 'main' file. Složka kterou jste vybrali neobsahuje soubor "main" - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Instalovatelný soubor pro Switch (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Instalovat Soubory - + %n file(s) remaining - + Installing file "%1"... Instalování souboru "%1"... - - + + Install Results Výsledek instalace - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Abychom předešli možným konfliktům, nedoporučujeme uživatelům instalovat základní hry na paměť NAND. Tuto funkci prosím používejte pouze k instalaci aktualizací a DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systémová Aplikace - + System Archive Systémový archív - + System Application Update Systémový Update Aplikace - + Firmware Package (Type A) Firmware-ový baliček (Typu A) - + Firmware Package (Type B) Firmware-ový baliček (Typu B) - + Game Hra - + Game Update Update Hry - + Game DLC Herní DLC - + Delta Title Delta Title - + Select NCA Install Type... Vyberte typ instalace NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Vyberte typ title-u, který chcete nainstalovat tenhle NCA jako: (Většinou základní "game" stačí.) - + Failed to Install Chyba v instalaci - + The title type you selected for the NCA is invalid. Tento typ pro tento NCA není platný. - + File not found Soubor nenalezen - + File "%1" not found Soubor "%1" nenalezen - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Chybí účet yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Pro přidání recenze kompatibility je třeba mít účet yuzu<br><br/>Pro nalinkování yuzu účtu jdi do Emulace &gt; Konfigurace &gt; Web. - + Error opening URL Chyba při otevírání URL - + Unable to open the URL "%1". Nelze otevřít URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected Zjištěno neplatné nastavení - + Handheld controller can't be used on docked mode. Pro controller will be selected. Ruční ovladač nelze používat v dokovacím režimu. Bude vybrán ovladač Pro Controller. - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Soubor Amiibo (%1);; Všechny Soubory (*.*) - + Load Amiibo Načíst Amiibo - + Error loading Amiibo data Chyba načítání Amiiba - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Pořídit Snímek Obrazovky - + PNG Image (*.png) PNG Image (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Rychlost: %1% / %2% - + Speed: %1% Rychlost: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Hra: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMÁLNÍ - + GPU HIGH GPU VYSOKÝ - + GPU EXTREME GPU EXTRÉMNÍ - + GPU ERROR GPU ERROR - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA - + SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation Potvďte Rederivaci Klíčů - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5515,37 +5490,37 @@ a udělejte si zálohu. Toto vymaže věechny vaše automaticky generované klíče a znova spustí modul derivace klíčů. - + Missing fuses Chybí Fuses - + - Missing BOOT0 - Chybí BOOT0 - + - Missing BCPKG2-1-Normal-Main - Chybí BCPKG2-1-Normal-Main - + - Missing PRODINFO - Chybí PRODINFO - + Derivation Components Missing Chybé odvozené komponenty - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5554,39 +5529,39 @@ Tohle může zabrat až minutu podle výkonu systému. - + Deriving Keys Derivuji Klíče - + Select RomFS Dump Target Vyberte Cíl vypsaní RomFS - + Please select which RomFS you would like to dump. Vyberte, kterou RomFS chcete vypsat. - + Are you sure you want to close yuzu? Jste si jist, že chcete zavřít yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Jste si jist, že chcete ukončit emulaci? Jakýkolic neuložený postup bude ztracen. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7584,28 +7559,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) Kód chyby: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. Došlo k chybě. Zkuste to prosím znovu nebo kontaktujte vývojáře softwaru. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. V %1 na %2 došlo k chybě. Zkuste to prosím znovu nebo kontaktujte vývojáře softwaru. - + An error has occurred. %1 @@ -7629,20 +7604,81 @@ Zkuste to prosím znovu nebo kontaktujte vývojáře softwaru. %2 - - Select a user: - Vyber Uživatele: - - - + Users Uživatelé - + + Profile Creator + + + + + Profile Selector Profilový Manažer + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Vyber Uživatele: + QtSoftwareKeyboardDialog @@ -7692,51 +7728,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Call stack - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - waiting for mutex 0x%1 - - - - has waiters: %1 - has waiters: %1 - - - - owner handle: 0x%1 - owner handle: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - waiting for all objects - - - - waiting for one of the following objects - waiting for one of the following objects - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + - + waited by no thread čekání bez přiřazeného vlákna @@ -7744,120 +7749,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable spustitelné - + paused pauznuto - + sleeping spící - + waiting for IPC reply čekání na odpověd IPC - + waiting for objects waiting for objects - + waiting for condition variable čekání na proměnnou podmínky - + waiting for address arbiter waiting for address arbiter - + waiting for suspend resume čekání na obnovení pozastavení - + waiting čekání - + initialized inicializováno - + terminated ukončeno - + unknown neznámý - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal ideální - + core %1 jádro %1 - + processor = %1 procesor = %1 - - ideal core = %1 - ideální jádro = %1 - - - + affinity mask = %1 affinity mask = %1 - + thread id = %1 id vlákna = %1 - + priority = %1(current) / %2(normal) priorita = %1(aktuální) / %2(normální) - + last running ticks = %1 last running ticks = %1 - - - not waiting for mutex - not waiting for mutex - WaitTreeThreadList - + waited by thread waited by thread @@ -7865,7 +7860,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree Ř&etězec čekání diff --git a/dist/languages/da.ts b/dist/languages/da.ts index 537a3afe8..7c43ff7df 100644 --- a/dist/languages/da.ts +++ b/dist/languages/da.ts @@ -380,36 +380,61 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - Output Device - Udgangsenhed + Output Device: + - Input Device - Indgangsenhed + Input Device: + - + + Sound Output Mode: + + + + + Mono + Mono + + + + Stereo + Stereo + + + + Surround + Surround + + + Use global volume Benyt global lydstyrke - + Set volume: Angiv lydstyrke: - + Volume: Lydstyrke: - + 0 % 0 % - + + Mute audio when in background + Gør lydløs, når i baggrunden + + + %1% Volume percentage (e.g. 50%) %1% @@ -1375,26 +1400,21 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - Mute audio when in background - Gør lydløs, når i baggrunden - - - Hide mouse on inactivity Skjul mus ved inaktivitet - + Reset All Settings Nulstil Alle Indstillinger - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? dette nulstiller alle indstillinger og fjerner alle pr-spil-konfigurationer. Dette vil ikke slette spilmapper, -profiler, eller input-profiler. Fortsæt? @@ -3827,60 +3847,15 @@ UUID: %2 - - Mono - Mono - - - - Stereo - Stereo - - - - Surround - Surround - - - - Console ID: - Konsol-ID: - - - - Sound output mode - Lydoutput-tilstand - - - - Regenerate - Regenerér - - - + System settings are available only when game is not running. Systemindstillinger er kun tilgængelige, når spil ikke kører. - + Warning: "%1" is not a valid language for region "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Dette vil erstatte din nuværende virtuelle Switch med en ny. Din nuværende virtuelle Switch vil ikke kunne gendannes. Dette kan have uforudsete konsekvenser i spil. Dette kan fejle, hvis du bruger en forældet konfiguration fra gemte data. Fortsæt? - - - - Warning - Advarsel - - - - Console ID: 0x%1 - Konsol-ID: 0x%1 - ConfigureTas @@ -4568,951 +4543,951 @@ Træk punkter, for at skifte position, eller dobbeltklik i tabelceller, for at r GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonym data indsamles</a>, for at hjælp med, at forbedre yuzu. <br/><br/>Kunne du tænke dig, at dele dine brugsdata med os? - + Telemetry Telemetri - + Broken Vulkan Installation Detected - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... Indlæser Net-Applet... - - + + Disable Web Applet Deaktivér Net-Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Aktuel emuleringshastighed. Værdier højere eller lavere end 100% indikerer, at emulering kører hurtigere eller langsommere end en Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. - + &Clear Recent Files - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue - + &Pause - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Advarsel, Forældet Spilformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. - - + + Error while loading ROM! Fejl under indlæsning af ROM! - + The ROM format is not supported. ROM-formatet understøttes ikke. - + An error occurred initializing the video core. Der skete en fejl under initialisering af video-kerne. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. - + (64-bit) - + (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit - + Closing software... - + Save Data - + Mod Data - + Error Opening %1 Folder Fejl ved Åbning af %1 Mappe - - + + Folder does not exist! Mappe eksisterer ikke! - + Error Opening Transferable Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + Remove File - - + + Error Removing Transferable Shader Cache - - + + A shader cache for this title does not exist. - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! RomFS-Udpakning Mislykkedes! - + There was an error copying the RomFS files or the user cancelled the operation. Der skete en fejl ved kopiering af RomFS-filerne, eller brugeren afbrød opgaven. - + Full Fuld - + Skeleton Skelet - + Select RomFS Dump Mode Vælg RomFS-Nedfældelsestilstand - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Udpakker RomFS... - - + + Cancel Afbryd - + RomFS Extraction Succeeded! RomFS-Udpakning Lykkedes! - + The operation completed successfully. Fuldførelse af opgaven lykkedes. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Fejl ved Åbning af %1 - + Select Directory Vælg Mappe - + Properties Egenskaber - + The game properties could not be loaded. Spil-egenskaberne kunne ikke indlæses. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch-Eksekverbar (%1);;Alle filer (*.*) - + Load File Indlæs Fil - + Open Extracted ROM Directory Åbn Udpakket ROM-Mappe - + Invalid Directory Selected Ugyldig Mappe Valgt - + The directory you have selected does not contain a 'main' file. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files - + %n file(s) remaining - + Installing file "%1"... Installér fil "%1"... - - + + Install Results - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systemapplikation - + System Archive Systemarkiv - + System Application Update Systemapplikationsopdatering - + Firmware Package (Type A) Firmwarepakke (Type A) - + Firmware Package (Type B) Firmwarepakke (Type B) - + Game Spil - + Game Update Spilopdatering - + Game DLC Spiludvidelse - + Delta Title Delta-Titel - + Select NCA Install Type... Vælg NCA-Installationstype... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) - + Failed to Install Installation mislykkedes - + The title type you selected for the NCA is invalid. - + File not found Fil ikke fundet - + File "%1" not found Fil "%1" ikke fundet - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Manglende yuzu-Konto - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. - + Error opening URL - + Unable to open the URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo-Fil (%1);; Alle Filer (*.*) - + Load Amiibo Indlæs Amiibo - + Error loading Amiibo data Fejl ved indlæsning af Amiibo-data - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Optag Skærmbillede - + PNG Image (*.png) PNG-Billede (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Hastighed: %1% / %2% - + Speed: %1% Hastighed: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Spil: %1 FPS - + Frame: %1 ms Billede: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL - + VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA FXAA - + SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5523,76 +5498,76 @@ This will delete your autogenerated key files and re-run the key derivation modu - + Missing fuses - + - Missing BOOT0 - + - Missing BCPKG2-1-Normal-Main - + - Missing PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. - + Deriving Keys - + Select RomFS Dump Target - + Please select which RomFS you would like to dump. - + Are you sure you want to close yuzu? Er du sikker på, at du vil lukke yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Er du sikker på, at du vil stoppe emulereingen? Enhver ulagret data, vil gå tabt. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7584,26 +7559,26 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. - + An error has occurred. %1 @@ -7623,20 +7598,81 @@ Please try again or contact the developer of the software. %2 - - Select a user: - Vælg en bruger: - - - + Users Brugere - + + Profile Creator + + + + + Profile Selector Profilvælger + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Vælg en bruger: + QtSoftwareKeyboardDialog @@ -7682,51 +7718,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - - - - - has waiters: %1 - - - - - owner handle: 0x%1 - - - - - WaitTreeObjectList - - - waiting for all objects - - - - - waiting for one of the following objects - - - WaitTreeSynchronizationObject - - [%1] %2 %3 + + [%1] %2 - + waited by no thread ventet af ingen tråde @@ -7734,120 +7739,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable - + paused sat på pause - + sleeping slumrer - + waiting for IPC reply venter på IPC-svar - + waiting for objects venter på objekter - + waiting for condition variable - + waiting for address arbiter - + waiting for suspend resume - + waiting - + initialized - + terminated - + unknown - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal idéel - + core %1 kerne %1 - + processor = %1 processor = %1 - - ideal core = %1 - idéel kerne = %1 - - - + affinity mask = %1 - + thread id = %1 tråd-id = %1 - + priority = %1(current) / %2(normal) prioritet = %1(aktuel) / %2(normal) - + last running ticks = %1 - - - not waiting for mutex - - WaitTreeThreadList - + waited by thread ventet af tråd @@ -7855,7 +7850,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree diff --git a/dist/languages/de.ts b/dist/languages/de.ts index f66024779..a455a3e78 100644 --- a/dist/languages/de.ts +++ b/dist/languages/de.ts @@ -378,36 +378,61 @@ This would ban both their forum username and their IP address. - Output Device - Ausgabegerät + Output Device: + Ausgabegerät: - Input Device - Eingabegerät + Input Device: + Eingabegerät: - + + Sound Output Mode: + + + + + Mono + Mono + + + + Stereo + Stereo + + + + Surround + Surround + + + Use global volume Globale Lautstärke verwenden - + Set volume: Lautstärke: - + Volume: Lautstärke: - + 0 % 0 % - + + Mute audio when in background + Audio im Hintergrund stummschalten + + + %1% Volume percentage (e.g. 50%) %1% @@ -1355,26 +1380,21 @@ This would ban both their forum username and their IP address. - Mute audio when in background - Audio im Hintergrund stummschalten - - - Hide mouse on inactivity Mauszeiger verstecken - + Reset All Settings Setze alle Einstellungen zurück - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Hierdurch werden alle Einstellungen zurückgesetzt und alle spielspezifischen Konfigurationen gelöscht. Spiel-Ordner, Profile oder Eingabeprofile werden nicht gelöscht. Fortfahren? @@ -3339,7 +3359,7 @@ UUID: %2 Not connected - + Nicht verbunden @@ -3807,60 +3827,15 @@ UUID: %2 Gerätename - - Mono - Mono - - - - Stereo - Stereo - - - - Surround - Surround - - - - Console ID: - Konsolen ID: - - - - Sound output mode - Soundausgabe - - - - Regenerate - Neu generieren - - - + System settings are available only when game is not running. Die Systemeinstellungen sind nur verfügbar, wenn kein Spiel aktiv ist. - + Warning: "%1" is not a valid language for region "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Dieser Vorgang wird deine momentane "virtuelle Switch" mit einer Neuen ersetzen. Deine momentane "virtuelle Switch" wird nicht wiederherstellbar sein. Dies könnte einige unerwartete Effekte in manchen Spielen mit sich bringen. Zudem könnte der Prozess fehlschlagen, wenn zu alte Daten verwendet werden. Möchtest du den Vorgang fortsetzen? - - - - Warning - Warnung - - - - Console ID: 0x%1 - Konsolen ID: 0x%1 - ConfigureTas @@ -4548,554 +4523,554 @@ Ziehe die Punkte mit deiner Maus, um ihre Position zu ändern. Doppelklicke auf GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonyme Daten werden gesammelt,</a> um yuzu zu verbessern.<br/><br/>Möchstest du deine Nutzungsdaten mit uns teilen? - + Telemetry Telemetrie - + Broken Vulkan Installation Detected Defekte Vulkan-Installation erkannt - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... Lade Web-Applet... - - + + Disable Web Applet Deaktiviere die Web Applikation - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Wie viele Shader im Moment kompiliert werden - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Derzeitige Emulations-Geschwindigkeit. Werte höher oder niedriger als 100% zeigen, dass die Emulation scheller oder langsamer läuft als auf einer Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Wie viele Bilder pro Sekunde angezeigt werden variiert von Spiel zu Spiel und von Szene zu Szene. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Zeit, die gebraucht wurde, um einen Switch-Frame zu emulieren, ohne Framelimit oder V-Sync. Für eine Emulation bei voller Geschwindigkeit sollte dieser Wert bei höchstens 16.67ms liegen. - + &Clear Recent Files &Zuletzt geladene Dateien leeren - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Fortsetzen - + &Pause &Pause - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu betreibt ein Speil - + Warning Outdated Game Format Warnung veraltetes Spielformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Du nutzt eine entpackte ROM-Ordnerstruktur für dieses Spiel, welches ein veraltetes Format ist und von anderen Formaten wie NCA, NAX, XCI oder NSP überholt wurde. Entpackte ROM-Ordner unterstützen keine Icons, Metadaten oder Updates.<br><br><a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Unser Wiki</a> enthält eine Erklärung der verschiedenen Formate, die yuzu unterstützt. Diese Nachricht wird nicht noch einmal angezeigt. - - + + Error while loading ROM! ROM konnte nicht geladen werden! - + The ROM format is not supported. ROM-Format wird nicht unterstützt. - + An error occurred initializing the video core. Beim Initialisieren des Video-Kerns ist ein Fehler aufgetreten. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. ROM konnte nicht geladen werden! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Bitte folge der <a href='https://yuzu-emu.org/help/quickstart/'>yuzu-Schnellstart-Anleitung</a> um deine Dateien zu extrahieren.<br>Hilfe findest du im yuzu-Wiki</a> oder dem yuzu-Discord</a>. - + An unknown error occurred. Please see the log for more details. Ein unbekannter Fehler ist aufgetreten. Bitte prüfe die Log-Dateien auf mögliche Fehlermeldungen. - + (64-bit) (64-Bit) - + (32-bit) (32-Bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Schließe Software... - + Save Data Speicherdaten - + Mod Data Mod-Daten - + Error Opening %1 Folder Konnte Verzeichnis %1 nicht öffnen - - + + Folder does not exist! Verzeichnis existiert nicht! - + Error Opening Transferable Shader Cache Fehler beim Öffnen des transferierbaren Shader-Caches - + Failed to create the shader cache directory for this title. Fehler beim erstellen des Shader-Cache-Ordner für den ausgewählten Titel. - + Error Removing Contents - + Error Removing Update Fehler beim Entfernen des Updates - + Error Removing DLC Fehler beim Entfernen des DLCs - + Remove Installed Game Contents? Installierten Spiele-Content entfernen? - + Remove Installed Game Update? Installierte Spiele-Updates entfernen? - + Remove Installed Game DLC? Installierte Spiele-DLCs entfernen? - + Remove Entry Eintrag entfernen - - - - - - + + + + + + Successfully Removed Erfolgreich entfernt - + Successfully removed the installed base game. Das Spiel wurde entfernt. - + The base game is not installed in the NAND and cannot be removed. Das Spiel ist nicht im NAND installiert und kann somit nicht entfernt werden. - + Successfully removed the installed update. Das Update wurde entfernt. - + There is no update installed for this title. Es ist kein Update für diesen Titel installiert. - + There are no DLC installed for this title. Es sind keine DLC für diesen Titel installiert. - + Successfully removed %1 installed DLC. %1 DLC entfernt. - + Delete OpenGL Transferable Shader Cache? Transferierbaren OpenGL Shader Cache löschen? - + Delete Vulkan Transferable Shader Cache? Transferierbaren Vulkan Shader Cache löschen? - + Delete All Transferable Shader Caches? Alle transferierbaren Shader Caches löschen? - + Remove Custom Game Configuration? Spiel-Einstellungen entfernen? - + Remove File Datei entfernen - - + + Error Removing Transferable Shader Cache Fehler beim Entfernen - - + + A shader cache for this title does not exist. Es existiert kein Shader-Cache für diesen Titel. - + Successfully removed the transferable shader cache. Der transferierbare Shader-Cache wurde entfernt. - + Failed to remove the transferable shader cache. Konnte den transferierbaren Shader-Cache nicht entfernen. - + Error Removing Vulkan Driver Pipeline Cache Fehler beim Entfernen des Vulkan-Pipeline-Cache - + Failed to remove the driver pipeline cache. Fehler beim Entfernen des Driver-Pipeline-Cache - - + + Error Removing Transferable Shader Caches Fehler beim Entfernen der transferierbaren Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Fehler beim Entfernen - + A custom configuration for this title does not exist. Es existieren keine Spiel-Einstellungen für dieses Spiel. - + Successfully removed the custom game configuration. Die Spiel-Einstellungen wurden entfernt. - + Failed to remove the custom game configuration. Die Spiel-Einstellungen konnten nicht entfernt werden. - - + + RomFS Extraction Failed! RomFS-Extraktion fehlgeschlagen! - + There was an error copying the RomFS files or the user cancelled the operation. Das RomFS konnte wegen eines Fehlers oder Abbruchs nicht kopiert werden. - + Full Komplett - + Skeleton Nur Ordnerstruktur - + Select RomFS Dump Mode RomFS Extraktions-Modus auswählen - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Bitte wähle, wie das RomFS gespeichert werden soll.<br>"Full" wird alle Dateien des Spiels extrahieren, während <br>"Skeleton" nur die Ordnerstruktur erstellt. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Es ist nicht genügend Speicher (%1) vorhanden um das RomFS zu entpacken. Bitte sorge für genügend Speicherplatze oder wähle ein anderes Verzeichnis aus. (Emulation > Konfiguration > System > Dateisystem > Dump Root) - + Extracting RomFS... RomFS wird extrahiert... - - + + Cancel Abbrechen - + RomFS Extraction Succeeded! RomFS wurde extrahiert! - + The operation completed successfully. Der Vorgang wurde erfolgreich abgeschlossen. - - - - - + + + + + Create Shortcut Verknüpfung erstellen - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon Icon erstellen - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Fehler beim Öffnen von %1 - + Select Directory Verzeichnis auswählen - + Properties Einstellungen - + The game properties could not be loaded. Spiel-Einstellungen konnten nicht geladen werden. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch-Programme (%1);;Alle Dateien (*.*) - + Load File Datei laden - + Open Extracted ROM Directory Öffne das extrahierte ROM-Verzeichnis - + Invalid Directory Selected Ungültiges Verzeichnis ausgewählt - + The directory you have selected does not contain a 'main' file. Das Verzeichnis, das du ausgewählt hast, enthält keine 'main'-Datei. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Installierbares Switch-Programm (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submissions Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Dateien installieren - + %n file(s) remaining %n Datei verbleibend%n Dateien verbleibend - + Installing file "%1"... Datei "%1" wird installiert... - - + + Install Results NAND-Installation - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Um Konflikte zu vermeiden, raten wir Nutzern davon ab, Spiele im NAND zu installieren. Bitte nutze diese Funktion nur zum Installieren von Updates und DLC. - + %n file(s) were newly installed %n file was newly installed @@ -5103,400 +5078,400 @@ Bitte nutze diese Funktion nur zum Installieren von Updates und DLC. - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systemanwendung - + System Archive Systemarchiv - + System Application Update Systemanwendungsupdate - + Firmware Package (Type A) Firmware-Paket (Typ A) - + Firmware Package (Type B) Firmware-Paket (Typ B) - + Game Spiel - + Game Update Spiel-Update - + Game DLC Spiel-DLC - + Delta Title Delta-Titel - + Select NCA Install Type... Wähle den NCA-Installationstyp aus... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Bitte wähle, als was diese NCA installiert werden soll: (In den meisten Fällen sollte die Standardeinstellung 'Spiel' ausreichen.) - + Failed to Install Installation fehlgeschlagen - + The title type you selected for the NCA is invalid. Der Titel-Typ, den du für diese NCA ausgewählt hast, ist ungültig. - + File not found Datei nicht gefunden - + File "%1" not found Datei "%1" nicht gefunden - + OK OK - - + + Hardware requirements not met Hardwareanforderungen nicht erfüllt - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Fehlender yuzu-Account - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Um einen Kompatibilitätsbericht abzuschicken, musst du einen yuzu-Account mit yuzu verbinden.<br><br/>Um einen yuzu-Account zu verbinden, prüfe die Einstellungen unter Emulation &gt; Konfiguration &gt; Web. - + Error opening URL Fehler beim Öffnen der URL - + Unable to open the URL "%1". URL "%1" kann nicht geöffnet werden. - + TAS Recording TAS Aufnahme - + Overwrite file of player 1? Datei von Spieler 1 überschreiben? - + Invalid config detected Ungültige Konfiguration erkannt - + Handheld controller can't be used on docked mode. Pro controller will be selected. Handheld-Controller können nicht im Dock verwendet werden. Der Pro-Controller wird verwendet. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Das aktuelle Amiibo wurde entfernt - + Error Fehler - - + + The current game is not looking for amiibos Das aktuelle Spiel sucht nicht nach Amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo-Datei (%1);; Alle Dateien (*.*) - + Load Amiibo Amiibo laden - + Error loading Amiibo data Fehler beim Laden der Amiibo-Daten - + The selected file is not a valid amiibo Die ausgewählte Datei ist keine gültige Amiibo - + The selected file is already on use Die ausgewählte Datei wird bereits verwendet - + An unknown error occurred Ein unbekannter Fehler ist aufgetreten - + Capture Screenshot Screenshot aufnehmen - + PNG Image (*.png) PNG Bild (*.png) - + TAS state: Running %1/%2 TAS Zustand: Läuft %1/%2 - + TAS state: Recording %1 TAS Zustand: Aufnahme %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid TAS Zustand: Ungültig - + &Stop Running - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Skalierung: %1x - + Speed: %1% / %2% Geschwindigkeit: %1% / %2% - + Speed: %1% Geschwindigkeit: %1% - + Game: %1 FPS (Unlocked) Spiel: %1 FPS (Unbegrenzt) - + Game: %1 FPS Spiel: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HOCH - + GPU EXTREME GPU EXTREM - + GPU ERROR GPU FEHLER - + DOCKED DOCKED - + HANDHELD HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST NÄCHSTER - - + + BILINEAR BILINEAR - + BICUBIC BIKUBISCH - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA KEIN AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE LAUTSTÄRKE: STUMM - + VOLUME: %1% Volume percentage (e.g. 50%) LAUTSTÄRKE: %1% - + Confirm Key Rederivation Schlüsselableitung bestätigen - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5509,37 +5484,37 @@ This will delete your autogenerated key files and re-run the key derivation modu Dieser Prozess wird die generierten Schlüsseldateien löschen und die Schlüsselableitung neu starten. - + Missing fuses Fuses fehlen - + - Missing BOOT0 - BOOT0 fehlt - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main fehlt - + - Missing PRODINFO - PRODINFO fehlt - + Derivation Components Missing Derivationskomponenten fehlen - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5547,39 +5522,39 @@ on your system's performance. Dies könnte, je nach Leistung deines Systems, bis zu einer Minute dauern. - + Deriving Keys Schlüsselableitung - + Select RomFS Dump Target RomFS wählen - + Please select which RomFS you would like to dump. Wähle, welches RomFS du speichern möchtest. - + Are you sure you want to close yuzu? Bist du sicher, dass du yuzu beenden willst? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Bist du sicher, dass du die Emulation stoppen willst? Jeder nicht gespeicherte Fortschritt geht verloren. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -6213,7 +6188,7 @@ Debug Message: Hide Empty Rooms - + Leere Räume verbergen @@ -7578,28 +7553,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) Fehlercode: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. Ein Fehler ist aufgetreten. Bitte versuche es noch einmal oder kontaktiere den Entwickler der Software. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. Ein Fehler ist in %1 bei %2 aufgetreten. Bitte versuche es noch einmal oder kontaktiere den Entwickler der Software. - + An error has occurred. %1 @@ -7623,20 +7598,81 @@ Bitte versuche es noch einmal oder kontaktiere den Entwickler der Software. - - Select a user: - Wähle einen Benutzer aus: - - - + Users Nutzer - + + Profile Creator + + + + + Profile Selector Profilauswahl + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Wähle einen Benutzer aus: + QtSoftwareKeyboardDialog @@ -7686,51 +7722,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Stack aufrufen - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - Warten auf Mutex 0x%1 - - - - has waiters: %1 - has waiters: %1 - - - - owner handle: 0x%1 - owner handle: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - Warten auf alle Objekte - - - - waiting for one of the following objects - Warten auf eines der folgenden Objekte - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + - + waited by no thread von keinem Thread pausiert @@ -7738,120 +7743,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable lauffähig - + paused pausiert - + sleeping schläft - + waiting for IPC reply Warten auf IPC-Antwort - + waiting for objects Warten auf Objekte - + waiting for condition variable wartet auf condition variable - + waiting for address arbiter Warten auf den Adressarbiter - + waiting for suspend resume warten auf Fortsetzen nach Unterbrechung - + waiting warten - + initialized initialisiert - + terminated beendet - + unknown unbekannt - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal ideal - + core %1 Kern %1 - + processor = %1 Prozessor = %1 - - ideal core = %1 - ideal core = %1 - - - + affinity mask = %1 Affinitätsmaske = %1 - + thread id = %1 Thread-ID = %1 - + priority = %1(current) / %2(normal) Priorität = %1(aktuell) / %2(normal) - + last running ticks = %1 Letzte laufende Ticks = %1 - - - not waiting for mutex - nicht auf Mutex warten - WaitTreeThreadList - + waited by thread gewartet von Thread @@ -7859,7 +7854,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree &Wait Tree diff --git a/dist/languages/el.ts b/dist/languages/el.ts index ccd52f76c..023cf4825 100644 --- a/dist/languages/el.ts +++ b/dist/languages/el.ts @@ -372,36 +372,61 @@ This would ban both their forum username and their IP address. - Output Device + Output Device: - Input Device - Συσκευή Εισόδου + Input Device: + - + + Sound Output Mode: + + + + + Mono + Μονοφωνικό + + + + Stereo + Στέρεοφωνικό + + + + Surround + + + + Use global volume Χρήση καθολικής έντασης ήχου - + Set volume: Ένταση ήχου: - + Volume: Ένταση: - + 0 % 0 % - + + Mute audio when in background + Σίγαση ήχου όταν βρίσκεται στο παρασκήνιο + + + %1% Volume percentage (e.g. 50%) %1% @@ -1359,26 +1384,21 @@ This would ban both their forum username and their IP address. - Mute audio when in background - Σίγαση ήχου όταν βρίσκεται στο παρασκήνιο - - - Hide mouse on inactivity Απόκρυψη δρομέα ποντικιού στην αδράνεια - + Reset All Settings Επαναφορά Όλων των Ρυθμίσεων - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Επαναφέρει όλες τις ρυθμίσεις και καταργεί όλες τις επιλογές ανά παιχνίδι. Δεν θα διαγράψει καταλόγους παιχνιδιών, προφίλ ή προφίλ εισόδου. Συνέχιση; @@ -3811,60 +3831,15 @@ UUID: %2 - - Mono - Μονοφωνικό - - - - Stereo - Στέρεοφωνικό - - - - Surround - - - - - Console ID: - - - - - Sound output mode - Λειτουργία εξόδου ήχου - - - - Regenerate - Εκ Νέου Αντικατάσταση - - - + System settings are available only when game is not running. Οι ρυθμίσεις συστήματος είναι διαθέσιμες μόνο όταν το παιχνίδι δεν εκτελείται. - + Warning: "%1" is not a valid language for region "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Αυτό θα αντικαταστήσει το τρέχων εικονικό σας Switch με ένα νέο, και το παλιό δεν θα είναι πια ανακτήσιμο. Αυτό μπορεί να έχει απροσδόκητα αποτελέσματα στα παιχνίδια. Επίσης, μπορεί να αποτύχει εάν χρησιμοποιείτε ένα ξεπερασμένο μέσο αποθήκευσης παιχνιδιού. Συνέχιση; - - - - Warning - Προσοχή - - - - Console ID: 0x%1 - Console ID: 0x%1 - ConfigureTas @@ -4551,105 +4526,105 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? - + Telemetry Τηλεμετρία - + Broken Vulkan Installation Detected - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... - - + + Disable Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Πόσα καρέ ανά δευτερόλεπτο εμφανίζει το παιχνίδι αυτή τη στιγμή. Αυτό διαφέρει από παιχνίδι σε παιχνίδι και από σκηνή σε σκηνή. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. - + &Clear Recent Files - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Συνέχεια - + &Pause &Παύση - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Μη μεταφρασμένη συμβολοσειρά @@ -4657,850 +4632,850 @@ Drag points to change position, or double-click table cells to edit values. - - + + Error while loading ROM! Σφάλμα κατά τη φόρτωση της ROM! - + The ROM format is not supported. - + An error occurred initializing the video core. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Εμφανίστηκε ένα απροσδιόριστο σφάλμα. Ανατρέξτε στο αρχείο καταγραφής για περισσότερες λεπτομέρειες. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Αποθήκευση δεδομένων - + Mod Data - + Error Opening %1 Folder - - + + Folder does not exist! Ο φάκελος δεν υπάρχει! - + Error Opening Transferable Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + Remove File Αφαίρεση Αρχείου - - + + Error Removing Transferable Shader Cache - - + + A shader cache for this title does not exist. - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! - + There was an error copying the RomFS files or the user cancelled the operation. - + Full - + Skeleton - + Select RomFS Dump Mode Επιλογή λειτουργίας απόρριψης RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Μη αποθηκευμένη μετάφραση. Παρακαλούμε επιλέξτε τον τρόπο με τον οποίο θα θέλατε να γίνει η απόρριψη της RomFS.<br> Η επιλογή Πλήρης θα αντιγράψει όλα τα αρχεία στο νέο κατάλογο, ενώ η επιλογή <br> Σκελετός θα δημιουργήσει μόνο τη δομή του καταλόγου. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... - - + + Cancel Ακύρωση - + RomFS Extraction Succeeded! - + The operation completed successfully. Η επέμβαση ολοκληρώθηκε με επιτυχία. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 - + Select Directory Επιλογή καταλόγου - + Properties Ιδιότητες - + The game properties could not be loaded. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. - + Load File Φόρτωση αρχείου - + Open Extracted ROM Directory - + Invalid Directory Selected - + The directory you have selected does not contain a 'main' file. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files - + %n file(s) remaining - + Installing file "%1"... - - + + Install Results Αποτελέσματα εγκατάστασης - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Εφαρμογή συστήματος - + System Archive - + System Application Update - + Firmware Package (Type A) - + Firmware Package (Type B) - + Game Παιχνίδι - + Game Update Ενημέρωση παιχνιδιού - + Game DLC DLC παιχνιδιού - + Delta Title - + Select NCA Install Type... Επιλέξτε τον τύπο εγκατάστασης NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) - + Failed to Install - + The title type you selected for the NCA is invalid. - + File not found Το αρχείο δεν βρέθηκε - + File "%1" not found Το αρχείο "%1" δεν βρέθηκε - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. - + Error opening URL Σφάλμα κατα το άνοιγμα του URL - + Unable to open the URL "%1". Αδυναμία ανοίγματος του URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo Amiibo - - + + The current amiibo has been removed - + Error Σφάλμα - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) - + Load Amiibo Φόρτωση Amiibo - + Error loading Amiibo data Σφάλμα φόρτωσης δεδομένων Amiibo - + The selected file is not a valid amiibo Το επιλεγμένο αρχείο δεν αποτελεί έγκυρο amiibo - + The selected file is already on use Το επιλεγμένο αρχείο χρησιμοποιείται ήδη - + An unknown error occurred - + Capture Screenshot Λήψη στιγμιότυπου οθόνης - + PNG Image (*.png) Εικόνα PBG (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Έναρξη - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Κλίμακα: %1x - + Speed: %1% / %2% Ταχύτητα: %1% / %2% - + Speed: %1% Ταχύτητα: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS - + Frame: %1 ms Καρέ: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR FSR - - + + NO AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5511,76 +5486,76 @@ This will delete your autogenerated key files and re-run the key derivation modu - + Missing fuses - + - Missing BOOT0 - Λείπει το BOOT0 - + - Missing BCPKG2-1-Normal-Main - Λείπει το BCPKG2-1-Normal-Main - + - Missing PRODINFO - Λείπει το PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. - + Deriving Keys - + Select RomFS Dump Target - + Please select which RomFS you would like to dump. - + Are you sure you want to close yuzu? Είστε σίγουροι ότι θέλετε να κλείσετε το yuzu; - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7575,26 +7550,26 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. - + An error has occurred. %1 @@ -7614,20 +7589,81 @@ Please try again or contact the developer of the software. %2 - - Select a user: - Επιλογή Χρήστη - - - + Users Χρήστες - + + Profile Creator + + + + + Profile Selector + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Επιλογή Χρήστη + QtSoftwareKeyboardDialog @@ -7677,51 +7713,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Κλήση stack - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - - - - - has waiters: %1 - - - - - owner handle: 0x%1 - - - - - WaitTreeObjectList - - - waiting for all objects - αναμονή για όλα τα αντικείμενα - - - - waiting for one of the following objects - - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + - + waited by no thread @@ -7729,120 +7734,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable - + paused - + sleeping - + waiting for IPC reply - + waiting for objects αναμονή αντικειμένων - + waiting for condition variable - + waiting for address arbiter - + waiting for suspend resume - + waiting - + initialized - + terminated - + unknown - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal - + core %1 πυρήνας %1 - + processor = %1 επεξεργαστής = %1 - - ideal core = %1 - - - - + affinity mask = %1 - + thread id = %1 - + priority = %1(current) / %2(normal) προτεραιότητα = %1(τρέχον) / %2(κανονικό) - + last running ticks = %1 - - - not waiting for mutex - - WaitTreeThreadList - + waited by thread @@ -7850,7 +7845,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree diff --git a/dist/languages/es.ts b/dist/languages/es.ts index d94e2e729..fb5ade667 100644 --- a/dist/languages/es.ts +++ b/dist/languages/es.ts @@ -380,36 +380,61 @@ Esto banearía su nombre del foro y su dirección IP. - Output Device - Dispositivo de salida + Output Device: + - Input Device - Dispositivo de entrada + Input Device: + - + + Sound Output Mode: + + + + + Mono + Mono + + + + Stereo + Estéreo + + + + Surround + Envolvente + + + Use global volume Usar volumen global - + Set volume: Ajustar volumen: - + Volume: Volumen: - + 0 % 0 % - + + Mute audio when in background + Silenciar audio en segundo plano + + + %1% Volume percentage (e.g. 50%) %1% @@ -1378,26 +1403,21 @@ Esto banearía su nombre del foro y su dirección IP. - Mute audio when in background - Silenciar audio en segundo plano - - - Hide mouse on inactivity Ocultar el cursor en caso de inactividad. - + Reset All Settings Reiniciar todos los ajustes - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Esto reiniciará y eliminará todas las configuraciones de los juegos. No eliminará ni los directorios de juego, ni los perfiles, ni los perfiles de los mandos. ¿Continuar? @@ -3831,60 +3851,15 @@ UUID: %2 Nombre del dispositivo - - Mono - Mono - - - - Stereo - Estéreo - - - - Surround - Envolvente - - - - Console ID: - ID de la consola: - - - - Sound output mode - Método de salida de sonido: - - - - Regenerate - Regenerar - - - + System settings are available only when game is not running. Los ajustes del sistema sólo se encuentran disponibles cuando no se esté ejecutando ningún juego. - + Warning: "%1" is not a valid language for region "%2" Aviso: "%1" no es un idioma válido para la región "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Esto reemplazará tu Switch virtual con una nueva. Tu Switch virtual actual no será recuperable. Esto podría causar efectos inesperados en determinados juegos. Si usas un archivo de guardado de configuración obsoleto, esto podría fallar. ¿Continuar? - - - - Warning - Advertencia - - - - Console ID: 0x%1 - ID de consola: 0x%1 - ConfigureTas @@ -4572,555 +4547,555 @@ Arrastra los puntos para cambiar de posición, o haz doble clic en las celdas de GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Los datos de uso anónimos se recogen</a> para ayudar a mejorar yuzu. <br/><br/>¿Deseas compartir tus datos de uso con nosotros? - + Telemetry Telemetría - + Broken Vulkan Installation Detected Se ha detectado una instalación corrupta de Vulkan - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. La inicialización de Vulkan ha fallado durante la ejecución. Haz clic <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>aquí para más información sobre como arreglar el problema</a>. - + Loading Web Applet... Cargando Web applet... - - + + Disable Web Applet Desactivar Web applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Deshabilitar el Applet Web puede causar comportamientos imprevistos y debería solo ser usado con Super Mario 3D All-Stars. ¿Estas seguro que quieres deshabilitar el Applet Web? (Puede ser reactivado en las configuraciones de Depuración.) - + The amount of shaders currently being built La cantidad de shaders que se están construyendo actualmente - + The current selected resolution scaling multiplier. El multiplicador de escala de resolución seleccionado actualmente. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. La velocidad de emulación actual. Los valores superiores o inferiores al 100% indican que la emulación se está ejecutando más rápido o más lento que en una Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. La cantidad de fotogramas por segundo que se está mostrando el juego actualmente. Esto variará de un juego a otro y de una escena a otra. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tiempo que lleva emular un fotograma de la Switch, sin tener en cuenta la limitación de fotogramas o sincronización vertical. Para una emulación óptima, este valor debería ser como máximo de 16.67 ms. - + &Clear Recent Files &Eliminar archivos recientes - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Continuar - + &Pause &Pausar - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu está ejecutando un juego - + Warning Outdated Game Format Advertencia: formato del juego obsoleto - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Está utilizando el formato de directorio de ROM deconstruido para este juego, que es un formato desactualizado que ha sido reemplazado por otros, como los NCA, NAX, XCI o NSP. Los directorios de ROM deconstruidos carecen de íconos, metadatos y soporte de actualizaciones.<br><br>Para ver una explicación de los diversos formatos de Switch que soporta yuzu,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>echa un vistazo a nuestra wiki</a>. Este mensaje no se volverá a mostrar. - - + + Error while loading ROM! ¡Error al cargar la ROM! - + The ROM format is not supported. El formato de la ROM no es compatible. - + An error occurred initializing the video core. Se ha producido un error al inicializar el núcleo de video. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu ha encontrado un error al ejecutar el núcleo de video. Esto suele ocurrir al no tener los controladores de la GPU actualizados, incluyendo los integrados. Por favor, revisa el registro para más detalles. Para más información sobre cómo acceder al registro, por favor, consulta la siguiente página: <a href='https://yuzu-emu.org/help/reference/log-files/'>Como cargar el archivo de registro</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. ¡Error al cargar la ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Por favor, sigue <a href='https://yuzu-emu.org/help/quickstart/'>la guía de inicio rápido de yuzu</a> para revolcar los archivos.<br>Puedes consultar la wiki de yuzu</a> o el Discord de yuzu</a> para obtener ayuda. - + An unknown error occurred. Please see the log for more details. Error desconocido. Por favor, consulte el archivo de registro para ver más detalles. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Cerrando software... - + Save Data Datos de guardado - + Mod Data Datos de mods - + Error Opening %1 Folder Error al abrir la carpeta %1 - - + + Folder does not exist! ¡La carpeta no existe! - + Error Opening Transferable Shader Cache Error al abrir el caché transferible de shaders - + Failed to create the shader cache directory for this title. No se pudo crear el directorio de la caché de los shaders para este título. - + Error Removing Contents Error al eliminar el contenido - + Error Removing Update Error al eliminar la actualización - + Error Removing DLC Error al eliminar el DLC - + Remove Installed Game Contents? ¿Eliminar el contenido del juego instalado? - + Remove Installed Game Update? ¿Eliminar la actualización del juego instalado? - + Remove Installed Game DLC? ¿Eliminar el DLC del juego instalado? - + Remove Entry Eliminar entrada - - - - - - + + + + + + Successfully Removed Se ha eliminado con éxito - + Successfully removed the installed base game. Se ha eliminado con éxito el juego base instalado. - + The base game is not installed in the NAND and cannot be removed. El juego base no está instalado en el NAND y no se puede eliminar. - + Successfully removed the installed update. Se ha eliminado con éxito la actualización instalada. - + There is no update installed for this title. No hay ninguna actualización instalada para este título. - + There are no DLC installed for this title. No hay ningún DLC instalado para este título. - + Successfully removed %1 installed DLC. Se ha eliminado con éxito %1 DLC instalado(s). - + Delete OpenGL Transferable Shader Cache? ¿Deseas eliminar el caché transferible de shaders de OpenGL? - + Delete Vulkan Transferable Shader Cache? ¿Deseas eliminar el caché transferible de shaders de Vulkan? - + Delete All Transferable Shader Caches? ¿Deseas eliminar todo el caché transferible de shaders? - + Remove Custom Game Configuration? ¿Deseas eliminar la configuración personalizada del juego? - + Remove File Eliminar archivo - - + + Error Removing Transferable Shader Cache Error al eliminar la caché de shaders transferibles - - + + A shader cache for this title does not exist. No existe caché de shaders para este título. - + Successfully removed the transferable shader cache. El caché de shaders transferibles se ha eliminado con éxito. - + Failed to remove the transferable shader cache. No se ha podido eliminar la caché de shaders transferibles. - + Error Removing Vulkan Driver Pipeline Cache Error al eliminar la caché de canalización del controlador Vulkan - + Failed to remove the driver pipeline cache. No se ha podido eliminar la caché de canalización del controlador. - - + + Error Removing Transferable Shader Caches Error al eliminar las cachés de shaders transferibles - + Successfully removed the transferable shader caches. Cachés de shaders transferibles eliminadas con éxito. - + Failed to remove the transferable shader cache directory. No se ha podido eliminar el directorio de cachés de shaders transferibles. - - + + Error Removing Custom Configuration Error al eliminar la configuración personalizada del juego - + A custom configuration for this title does not exist. No existe una configuración personalizada para este título. - + Successfully removed the custom game configuration. Se eliminó con éxito la configuración personalizada del juego. - + Failed to remove the custom game configuration. No se ha podido eliminar la configuración personalizada del juego. - - + + RomFS Extraction Failed! ¡La extracción de RomFS ha fallado! - + There was an error copying the RomFS files or the user cancelled the operation. Se ha producido un error al copiar los archivos RomFS o el usuario ha cancelado la operación. - + Full Completo - + Skeleton En secciones - + Select RomFS Dump Mode Elegir método de volcado de RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Por favor, selecciona el método en que quieres volcar el RomFS.<br>Completo copiará todos los archivos al nuevo directorio <br> mientras que en secciones solo creará la estructura del directorio. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root No hay suficiente espacio en %1 para extraer el RomFS. Por favor, libera espacio o elige otro directorio de volcado en Emulación > Configuración > Sistema > Sistema de archivos > Raíz de volcado - + Extracting RomFS... Extrayendo RomFS... - - + + Cancel Cancelar - + RomFS Extraction Succeeded! ¡La extracción RomFS ha tenido éxito! - + The operation completed successfully. La operación se completó con éxito. - - - - - + + + + + Create Shortcut Crear acceso directo - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Esto creará un acceso directo a la AppImage actual. Esto puede no funcionar bien si se actualiza. ¿Continuar? - + Cannot create shortcut on desktop. Path "%1" does not exist. No se puede crear un acceso directo en el escritorio. La ruta "%1" no existe. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. No se puede crear un acceso directo en el menú de aplicaciones. La ruta "%1" no existe y no se puede crear. - + Create Icon Crear icono - + Cannot create icon file. Path "%1" does not exist and cannot be created. No se puede crear el archivo de icono. La ruta "%1" no existe y no se puede crear. - + Start %1 with the yuzu Emulator Iniciar %1 con el Emulador yuzu - + Failed to create a shortcut at %1 Error al crear un acceso directo en %1 - + Successfully created a shortcut to %1 Se ha creado un acceso directo a %1 - + Error Opening %1 Error al intentar abrir %1 - + Select Directory Seleccionar directorio - + Properties Propiedades - + The game properties could not be loaded. No se pueden cargar las propiedades del juego. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Ejecutable de Switch (%1);;Todos los archivos (*.*) - + Load File Cargar archivo - + Open Extracted ROM Directory Abrir el directorio de la ROM extraída - + Invalid Directory Selected Directorio seleccionado no válido - + The directory you have selected does not contain a 'main' file. El directorio que ha seleccionado no contiene ningún archivo 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Archivo de Switch Instalable (*.nca *.nsp *.xci);;Archivo de contenidos de Nintendo (*.nca);;Paquete de envío de Nintendo (*.nsp);;Imagen de cartucho NX (*.xci) - + Install Files Instalar archivos - + %n file(s) remaining %n archivo(s) restantes%n archivo(s) restantes%n archivo(s) restantes - + Installing file "%1"... Instalando el archivo "%1"... - - + + Install Results Instalar resultados - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Para evitar posibles conflictos, no se recomienda a los usuarios que instalen juegos base en el NAND. Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + %n file(s) were newly installed %n archivo(s) recién instalado/s @@ -5129,7 +5104,7 @@ Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + %n file(s) were overwritten %n archivo(s) recién sobreescrito/s @@ -5138,7 +5113,7 @@ Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + %n file(s) failed to install %n archivo(s) no se instaló/instalaron @@ -5147,388 +5122,388 @@ Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + System Application Aplicación del sistema - + System Archive Archivo del sistema - + System Application Update Actualización de la aplicación del sistema - + Firmware Package (Type A) Paquete de firmware (Tipo A) - + Firmware Package (Type B) Paquete de firmware (Tipo B) - + Game Juego - + Game Update Actualización de juego - + Game DLC DLC del juego - + Delta Title Titulo delta - + Select NCA Install Type... Seleccione el tipo de instalación NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Seleccione el tipo de título en el que deseas instalar este NCA como: (En la mayoría de los casos, el 'Juego' predeterminado está bien). - + Failed to Install Fallo en la instalación - + The title type you selected for the NCA is invalid. El tipo de título que seleccionó para el NCA no es válido. - + File not found Archivo no encontrado - + File "%1" not found Archivo "%1" no encontrado - + OK Aceptar - - + + Hardware requirements not met No se cumplen los requisitos de hardware - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. El sistema no cumple los requisitos de hardware recomendados. Los informes de compatibilidad se han desactivado. - + Missing yuzu Account Falta la cuenta de Yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Para enviar un caso de prueba de compatibilidad de juegos, debes vincular tu cuenta de yuzu.<br><br/> Para vincular tu cuenta de yuzu, ve a Emulación &gt; Configuración &gt; Web. - + Error opening URL Error al abrir la URL - + Unable to open the URL "%1". No se puede abrir la URL "%1". - + TAS Recording Grabación TAS - + Overwrite file of player 1? ¿Sobrescribir archivo del jugador 1? - + Invalid config detected Configuración no válida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. El controlador del modo portátil no puede ser usado en el modo sobremesa. Se seleccionará el controlador Pro en su lugar. - - + + Amiibo Amiibo - - + + The current amiibo has been removed El amiibo actual ha sido eliminado - + Error Error - - + + The current game is not looking for amiibos El juego actual no está buscando amiibos - + Amiibo File (%1);; All Files (*.*) Archivo amiibo (%1);; Todos los archivos (*.*) - + Load Amiibo Cargar amiibo - + Error loading Amiibo data Error al cargar los datos Amiibo - + The selected file is not a valid amiibo El archivo seleccionado no es un amiibo válido - + The selected file is already on use El archivo seleccionado ya se encuentra en uso - + An unknown error occurred Ha ocurrido un error inesperado - + Capture Screenshot Captura de pantalla - + PNG Image (*.png) Imagen PNG (*.png) - + TAS state: Running %1/%2 Estado TAS: ejecutando %1/%2 - + TAS state: Recording %1 Estado TAS: grabando %1 - + TAS state: Idle %1/%2 Estado TAS: inactivo %1/%2 - + TAS State: Invalid Estado TAS: nulo - + &Stop Running &Parar de ejecutar - + &Start &Iniciar - + Stop R&ecording Pausar g&rabación - + R&ecord G&rabar - + Building: %n shader(s) Creando: %n shader(s)Construyendo: %n shader(s)Construyendo: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escalado: %1x - + Speed: %1% / %2% Velocidad: %1% / %2% - + Speed: %1% Velocidad: %1% - + Game: %1 FPS (Unlocked) Juego: %1 FPS (desbloqueado) - + Game: %1 FPS Juego: %1 FPS - + Frame: %1 ms Fotogramas: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR GPU ERROR - + DOCKED SOBREMESA - + HANDHELD PORTÁTIL - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST PRÓXIMO - - + + BILINEAR BILINEAL - + BICUBIC BICÚBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA NO AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation Confirmar la clave de rederivación - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5545,37 +5520,37 @@ es lo que quieres hacer si es necesario. Esto eliminará los archivos de las claves generadas automáticamente y volverá a ejecutar el módulo de derivación de claves. - + Missing fuses Faltan fuses - + - Missing BOOT0 - Falta BOOT0 - + - Missing BCPKG2-1-Normal-Main - Falta BCPKG2-1-Normal-Main - + - Missing PRODINFO - Falta PRODINFO - + Derivation Components Missing Faltan componentes de derivación - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Faltan las claves de encriptación. <br>Por favor, sigue <a href='https://yuzu-emu.org/help/quickstart/'>la guía rápida de yuzu</a> para obtener todas tus claves, firmware y juegos.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5584,39 +5559,39 @@ Esto puede llevar unos minutos dependiendo del rendimiento de su sistema. - + Deriving Keys Obtención de claves - + Select RomFS Dump Target Selecciona el destinatario para volcar el RomFS - + Please select which RomFS you would like to dump. Por favor, seleccione los RomFS que deseas volcar. - + Are you sure you want to close yuzu? ¿Estás seguro de que quieres cerrar yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. ¿Estás seguro de que quieres detener la emulación? Cualquier progreso no guardado se perderá. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7620,28 +7595,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) Código de error: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. Ha ocurrido un error. Por favor, inténtalo de nuevo o contacta con el desarrollador del software. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. Ha ocurrido un error en %1 a las %2 Por favor, inténtalo de nuevo o contacta con el desarrollador del software. - + An error has occurred. %1 @@ -7665,20 +7640,81 @@ Por favor, inténtalo de nuevo o contacta con el desarrollador del software. - - Select a user: - Seleccione un usuario: - - - + Users Usuarios - + + Profile Creator + + + + + Profile Selector Selector de perfil + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Seleccione un usuario: + QtSoftwareKeyboardDialog @@ -7728,51 +7764,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Llamadas acumuladas - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - esperando al mutex 0x%1 - - - - has waiters: %1 - tiene receptores: %1 - - - - owner handle: 0x%1 - manejo del propietario: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - esperando a todos los objetos - - - - waiting for one of the following objects - esperando a uno de los siguientes objetos - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + - + waited by no thread esperado por ningún hilo @@ -7780,120 +7785,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable ejecutable - + paused en pausa - + sleeping reposando - + waiting for IPC reply esperando respuesta IPC - + waiting for objects esperando objetos - + waiting for condition variable esperando variable condicional - + waiting for address arbiter esperando al árbitro de dirección - + waiting for suspend resume esperando a reanudar - + waiting esperando - + initialized inicializado - + terminated terminado - + unknown desconocido - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal ideal - + core %1 núcleo %1 - + processor = %1 procesador = %1 - - ideal core = %1 - núcleo ideal = %1 - - - + affinity mask = %1 máscara de afinidad = %1 - + thread id = %1 id de hilo = %1 - + priority = %1(current) / %2(normal) prioridad = %1(presente) / %2(normal) - + last running ticks = %1 últimos ticks consecutivos = %1 - - - not waiting for mutex - no esperando al mutex - WaitTreeThreadList - + waited by thread esperado por el hilo @@ -7901,7 +7896,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree &Árbol de espera diff --git a/dist/languages/fr.ts b/dist/languages/fr.ts index c607faf8f..7730208b7 100644 --- a/dist/languages/fr.ts +++ b/dist/languages/fr.ts @@ -381,36 +381,61 @@ Cela bannirait à la fois son nom d'utilisateur du forum et son adresse IP. - Output Device - Périphérique de sortie + Output Device: + Périphérique de sortie : - Input Device - Périphérique d'entrée + Input Device: + Périphérique d'entrée : - + + Sound Output Mode: + Mode de sortie sonore : + + + + Mono + Mono + + + + Stereo + Stéréo + + + + Surround + Surround + + + Use global volume Utiliser le volume global - + Set volume: Régler le volume : - + Volume: Volume : - + 0 % 0 % - + + Mute audio when in background + Couper le son en arrière-plan + + + %1% Volume percentage (e.g. 50%) %1% @@ -1377,26 +1402,21 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - Mute audio when in background - Couper le son en arrière-plan - - - Hide mouse on inactivity Cacher la souris en cas d'inactivité - + Reset All Settings Réinitialiser tous les paramètres - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Ceci réinitialise tout les paramètres et supprime toutes les configurations par jeu. Cela ne va pas supprimer les répertoires de jeu, les profils, ou les profils d'entrée. Continuer ? @@ -1517,7 +1537,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f Force 16:10 - Forcer 16:10 + Forcer le 16:10 @@ -1717,7 +1737,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f Force maximum clocks (Vulkan only) - Forcer la fréquence d'horloge maximales (Vulkan uniquement) + Forcer la fréquence d'horloge maximale (Vulkan uniquement) @@ -1732,12 +1752,12 @@ Cette option améliore la vitesse en réduisant la précision des instructions f Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. - + Active le décodage asynchrone de textures ASTC, qui peut réduire les saccades de chargement. Cette fonctionnalité est expérimentale. Decode ASTC textures asynchronously (Hack) - + Décoder les textures ASTC de manière asynchrone (Hack) @@ -3830,60 +3850,15 @@ UUID : %2 Nom de l'appareil - - Mono - Mono - - - - Stereo - Stéréo - - - - Surround - Surround - - - - Console ID: - ID de la Console : - - - - Sound output mode - Mode de sortie Audio - - - - Regenerate - Regénérer - - - + System settings are available only when game is not running. Les paramètres systèmes ne sont accessibles que lorsque le jeu n'est pas en cours. - + Warning: "%1" is not a valid language for region "%2" Attention: "%1" n'est pas une langue valide pour la région "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Ceci remplacera la Switch virtuelle actuelle par une nouvelle. La Switch actuelle ne sera plus récupérable. cela peut entrainer des effets non désirés pendant le jeu. Ceci peut échouer si une configuration de sauvegarde périmée est utilisée. Continuer ? - - - - Warning - Avertissement - - - - Console ID: 0x%1 - ID de la Console : 0x%1 - ConfigureTas @@ -4571,954 +4546,954 @@ Faites glisser les points pour modifier la position ou double-cliquez sur les ce GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Des données anonymes sont collectées</a> pour aider à améliorer yuzu. <br/><br/>Voulez-vous partager vos données d'utilisations avec nous ? - + Telemetry Télémétrie - + Broken Vulkan Installation Detected Installation Vulkan Cassée Détectée - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. L'initialisation de Vulkan a échoué lors du démarrage.<br><br>Cliquez <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>ici pour obtenir des instructions pour résoudre le problème</a>. - + Loading Web Applet... Chargement du Web Applet... - - + + Disable Web Applet Désactiver l'applet web - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) La désactivation de l'applet Web peut entraîner un comportement indéfini et ne doit être utilisée qu'avec Super Mario 3D All-Stars. Voulez-vous vraiment désactiver l'applet Web ? (Cela peut être réactivé dans les paramètres de débogage.) - + The amount of shaders currently being built La quantité de shaders en cours de construction - + The current selected resolution scaling multiplier. Le multiplicateur de mise à l'échelle de résolution actuellement sélectionné. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Valeur actuelle de la vitesse de l'émulation. Des valeurs plus hautes ou plus basses que 100% indique que l'émulation fonctionne plus vite ou plus lentement qu'une véritable Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Combien d'image par seconde le jeu est en train d'afficher. Ceci vas varier de jeu en jeu et de scènes en scènes. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Temps pris pour émuler une image par seconde de la switch, sans compter le limiteur d'image par seconde ou la synchronisation verticale. Pour une émulation à pleine vitesse, ceci devrait être au maximum à 16.67 ms. - + &Clear Recent Files &Effacer les fichiers récents - + Emulated mouse is enabled La souris émulée est activée - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. La saisie réelle de la souris et le panoramique de la souris sont incompatibles. Veuillez désactiver la souris émulée dans les paramètres avancés d'entrée pour permettre le panoramique de la souris. - + &Continue &Continuer - + &Pause &Pause - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu exécute un jeu - + Warning Outdated Game Format Avertissement : Le Format de jeu est dépassé - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Vous utilisez un format de ROM déconstruite pour ce jeu, qui est donc un format dépassé qui à été remplacer par d'autre. Par exemple les formats NCA, NAX, XCI, ou NSP. Les destinations de ROM déconstruites manque des icônes, des métadonnée et du support de mise à jour.<br><br>Pour une explication des divers formats Switch que yuzu supporte, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Regardez dans le wiki</a>. Ce message ne sera pas montré une autre fois. - - + + Error while loading ROM! Erreur lors du chargement de la ROM ! - + The ROM format is not supported. Le format de la ROM n'est pas supporté. - + An error occurred initializing the video core. Une erreur s'est produite lors de l'initialisation du noyau dédié à la vidéo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu a rencontré une erreur en exécutant le cœur vidéo. Cela est généralement causé par des pilotes graphiques trop anciens. Veuillez consulter les logs pour plus d'informations. Pour savoir comment accéder aux logs, veuillez vous référer à la page suivante : <a href='https://yuzu-emu.org/help/reference/log-files/'>Comment partager un fichier de log </a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Erreur lors du chargement de la ROM ! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Veuillez suivre <a href='https://yuzu-emu.org/help/quickstart/'>le guide de démarrage rapide yuzu</a> pour retransférer vos fichiers.<br>Vous pouvez vous référer au wiki yuzu</a> ou le Discord yuzu</a> pour de l'assistance. - + An unknown error occurred. Please see the log for more details. Une erreur inconnue est survenue. Veuillez consulter le journal des logs pour plus de détails. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Fermeture du logiciel... - + Save Data Enregistrer les données - + Mod Data Donnés du Mod - + Error Opening %1 Folder Erreur dans l'ouverture du dossier %1. - - + + Folder does not exist! Le dossier n'existe pas ! - + Error Opening Transferable Shader Cache Erreur lors de l'ouverture des Shader Cache Transferable - + Failed to create the shader cache directory for this title. Impossible de créer le dossier de cache du shader pour ce jeu. - + Error Removing Contents Erreur en enlevant le contenu - + Error Removing Update Erreur en enlevant la Mise à Jour - + Error Removing DLC Erreur en enlevant le DLC - + Remove Installed Game Contents? Enlever les données du jeu installé ? - + Remove Installed Game Update? Enlever la mise à jour du jeu installé ? - + Remove Installed Game DLC? Enlever le DLC du jeu installé ? - + Remove Entry Supprimer l'entrée - - - - - - + + + + + + Successfully Removed Supprimé avec succès - + Successfully removed the installed base game. Suppression du jeu de base installé avec succès. - + The base game is not installed in the NAND and cannot be removed. Le jeu de base n'est pas installé dans la NAND et ne peut pas être supprimé. - + Successfully removed the installed update. Suppression de la mise à jour installée avec succès. - + There is no update installed for this title. Il n'y a pas de mise à jour installée pour ce titre. - + There are no DLC installed for this title. Il n'y a pas de DLC installé pour ce titre. - + Successfully removed %1 installed DLC. Suppression de %1 DLC installé(s) avec succès. - + Delete OpenGL Transferable Shader Cache? Supprimer la Cache OpenGL de Shader Transférable? - + Delete Vulkan Transferable Shader Cache? Supprimer la Cache Vulkan de Shader Transférable? - + Delete All Transferable Shader Caches? Supprimer Toutes les Caches de Shader Transférable? - + Remove Custom Game Configuration? Supprimer la configuration personnalisée du jeu? - + Remove File Supprimer fichier - - + + Error Removing Transferable Shader Cache Erreur lors de la suppression du cache de shader transférable - - + + A shader cache for this title does not exist. Un shader cache pour ce titre n'existe pas. - + Successfully removed the transferable shader cache. Suppression du cache de shader transférable avec succès. - + Failed to remove the transferable shader cache. Échec de la suppression du cache de shader transférable. - + Error Removing Vulkan Driver Pipeline Cache Erreur lors de la suppression du cache de pipeline de pilotes Vulkan - + Failed to remove the driver pipeline cache. Échec de la suppression du cache de pipeline de pilotes. - - + + Error Removing Transferable Shader Caches Erreur durant la Suppression des Caches de Shader Transférable - + Successfully removed the transferable shader caches. Suppression des caches de shader transférable effectuée avec succès. - + Failed to remove the transferable shader cache directory. Impossible de supprimer le dossier de la cache de shader transférable. - - + + Error Removing Custom Configuration Erreur lors de la suppression de la configuration personnalisée - + A custom configuration for this title does not exist. Il n'existe pas de configuration personnalisée pour ce titre. - + Successfully removed the custom game configuration. Suppression de la configuration de jeu personnalisée avec succès. - + Failed to remove the custom game configuration. Échec de la suppression de la configuration personnalisée du jeu. - - + + RomFS Extraction Failed! L'extraction de la RomFS a échoué ! - + There was an error copying the RomFS files or the user cancelled the operation. Une erreur s'est produite lors de la copie des fichiers RomFS ou l'utilisateur a annulé l'opération. - + Full Plein - + Skeleton Squelette - + Select RomFS Dump Mode Sélectionnez le mode d'extraction de la RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Veuillez sélectionner la manière dont vous souhaitez que le fichier RomFS soit extrait.<br>Full copiera tous les fichiers dans le nouveau répertoire, tandis que<br>skeleton créera uniquement la structure de répertoires. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Il n'y a pas assez d'espace libre dans %1 pour extraire la RomFS. Veuillez libérer de l'espace ou sélectionner un autre dossier d'extraction dans Émulation > Configurer > Système > Système de fichiers > Extraire la racine - + Extracting RomFS... Extraction de la RomFS ... - - + + Cancel Annuler - + RomFS Extraction Succeeded! Extraction de la RomFS réussi ! - + The operation completed successfully. L'opération s'est déroulée avec succès. - - - - - + + + + + Create Shortcut Créer un raccourci - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Cela créera un raccourci vers l'AppImage actuelle. Cela peut ne pas fonctionner correctement si vous mettez à jour. Continuer ? - + Cannot create shortcut on desktop. Path "%1" does not exist. Impossible de créer un raccourci sur le bureau. Le chemin "%1" n'existe pas. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Impossible de créer un raccourci dans le menu des applications. Le chemin "%1" n'existe pas et ne peut pas être créé. - + Create Icon Créer une icône - + Cannot create icon file. Path "%1" does not exist and cannot be created. Impossible de créer le fichier d'icône. Le chemin "%1" n'existe pas et ne peut pas être créé. - + Start %1 with the yuzu Emulator Démarrer %1 avec l'émulateur Yuzu - + Failed to create a shortcut at %1 Impossible de créer un raccourci vers %1 - + Successfully created a shortcut to %1 Création réussie d'un raccourci vers %1 - + Error Opening %1 Erreur lors de l'ouverture %1 - + Select Directory Sélectionner un répertoire - + Properties Propriétés - + The game properties could not be loaded. Les propriétés du jeu n'ont pas pu être chargées. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Exécutable Switch (%1);;Tous les fichiers (*.*) - + Load File Charger un fichier - + Open Extracted ROM Directory Ouvrir le dossier des ROM extraites - + Invalid Directory Selected Destination sélectionnée invalide - + The directory you have selected does not contain a 'main' file. Le répertoire que vous avez sélectionné ne contient pas de fichier "main". - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Fichier Switch installable (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Installer les fichiers - + %n file(s) remaining %n fichier restant%n fichiers restants%n fichiers restants - + Installing file "%1"... Installation du fichier "%1" ... - - + + Install Results Résultats d'installation - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Pour éviter d'éventuels conflits, nous déconseillons aux utilisateurs d'installer des jeux de base sur la NAND. Veuillez n'utiliser cette fonctionnalité que pour installer des mises à jour et des DLC. - + %n file(s) were newly installed %n fichier a été nouvellement installé%n fichiers ont été nouvellement installés%n fichiers ont été nouvellement installés - + %n file(s) were overwritten %n fichier a été écrasé%n fichiers ont été écrasés%n fichiers ont été écrasés - + %n file(s) failed to install %n fichier n'a pas pu être installé%n fichiers n'ont pas pu être installés%n fichiers n'ont pas pu être installés - + System Application Application Système - + System Archive Archive Système - + System Application Update Mise à jour de l'application système - + Firmware Package (Type A) Paquet micrologiciel (Type A) - + Firmware Package (Type B) Paquet micrologiciel (Type B) - + Game Jeu - + Game Update Mise à jour de jeu - + Game DLC DLC de jeu - + Delta Title Titre Delta - + Select NCA Install Type... Sélectionner le type d'installation du NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Veuillez sélectionner le type de titre auquel vous voulez installer ce NCA : (Dans la plupart des cas, le titre par défaut : 'Jeu' est correct.) - + Failed to Install Échec de l'installation - + The title type you selected for the NCA is invalid. Le type de titre que vous avez sélectionné pour le NCA n'est pas valide. - + File not found Fichier non trouvé - + File "%1" not found Fichier "%1" non trouvé - + OK OK - - + + Hardware requirements not met Éxigences matérielles non respectées - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Votre système ne correspond pas aux éxigences matérielles. Les rapports de comptabilité ont été désactivés. - + Missing yuzu Account Compte yuzu manquant - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Pour soumettre un test de compatibilité pour un jeu, vous devez lier votre compte yuzu.<br><br/>Pour lier votre compte yuzu, aller à Emulation &gt; Configuration&gt; Web. - + Error opening URL Erreur lors de l'ouverture de l'URL - + Unable to open the URL "%1". Impossible d'ouvrir l'URL "%1". - + TAS Recording Enregistrement TAS - + Overwrite file of player 1? Écraser le fichier du joueur 1 ? - + Invalid config detected Configuration invalide détectée - + Handheld controller can't be used on docked mode. Pro controller will be selected. Contrôleur portable ne peut pas être utilisé en mode téléviseur. La manette Pro sera sélectionnée. - - + + Amiibo Amiibo - - + + The current amiibo has been removed L'amiibo actuel a été retiré - + Error Erreur - - + + The current game is not looking for amiibos Le jeu actuel ne cherche pas d'amiibos. - + Amiibo File (%1);; All Files (*.*) Fichier Amiibo (%1);; Tous les fichiers (*.*) - + Load Amiibo Charger un Amiibo - + Error loading Amiibo data Erreur lors du chargement des données Amiibo - + The selected file is not a valid amiibo Le fichier choisi n'est pas un amiibo valide - + The selected file is already on use Le fichier sélectionné est déjà utilisé - + An unknown error occurred Une erreur inconnue s'est produite - + Capture Screenshot Capture d'écran - + PNG Image (*.png) Image PNG (*.png) - + TAS state: Running %1/%2 État du TAS : En cours d'exécution %1/%2 - + TAS state: Recording %1 État du TAS : Enregistrement %1 - + TAS state: Idle %1/%2 État du TAS : Inactif %1:%2 - + TAS State: Invalid État du TAS : Invalide - + &Stop Running &Stopper l'exécution - + &Start &Start - + Stop R&ecording Stopper l'en&registrement - + R&ecord En&registrer - + Building: %n shader(s) Compilation: %n shaderCompilation : %n shadersCompilation : %n shaders - + Scale: %1x %1 is the resolution scaling factor Échelle : %1x - + Speed: %1% / %2% Vitesse : %1% / %2% - + Speed: %1% Vitesse : %1% - + Game: %1 FPS (Unlocked) Jeu : %1 IPS (Débloqué) - + Game: %1 FPS Jeu : %1 FPS - + Frame: %1 ms Frame : %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HAUT - + GPU EXTREME GPU EXTRÊME - + GPU ERROR GPU ERREUR - + DOCKED MODE TV - + HANDHELD PORTABLE - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST PLUS PROCHE - - + + BILINEAR BILINÉAIRE - + BICUBIC BICUBIQUE - + GAUSSIAN GAUSSIEN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA AUCUN AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE VOLUME: MUET - + VOLUME: %1% Volume percentage (e.g. 50%) VOLUME: %1% - + Confirm Key Rederivation Confirmer la réinstallation de la clé - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5535,37 +5510,37 @@ et éventuellement faites des sauvegardes. Cela supprimera vos fichiers de clé générés automatiquement et ré exécutera le module d'installation de clé. - + Missing fuses Fusibles manquants - + - Missing BOOT0 - BOOT0 manquant - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main manquant - + - Missing PRODINFO - PRODINFO manquant - + Derivation Components Missing Composants de dérivation manquants - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Les clés de chiffrement sont manquantes. <br>Veuillez suivre <a href='https://yuzu-emu.org/help/quickstart/'>le guide de démarrage rapide yuzu</a> pour obtenir tous vos clés, firmware et jeux.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5574,39 +5549,39 @@ Cela peut prendre jusqu'à une minute en fonction des performances de votre système. - + Deriving Keys Installation des clés - + Select RomFS Dump Target Sélectionner la cible d'extraction du RomFS - + Please select which RomFS you would like to dump. Veuillez sélectionner quel RomFS vous voulez extraire. - + Are you sure you want to close yuzu? Êtes vous sûr de vouloir fermer yuzu ? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Êtes-vous sûr d'arrêter l'émulation ? Tout progrès non enregistré sera perdu. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7610,28 +7585,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) Code d'erreur : %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. Une erreur s'est produite. Veuillez essayer à nouveau ou contactez le développeur du logiciel. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. Une erreur s'est produite le %1 à %2. Veuillez essayer à nouveau ou contactez le développeur du logiciel. - + An error has occurred. %1 @@ -7655,20 +7630,81 @@ Veuillez essayer à nouveau ou contactez le développeur du logiciel. - - Select a user: - Choisir un utilisateur : - - - + Users Utilisateurs - + + Profile Creator + + + + + Profile Selector Sélecteur de profil + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Choisir un utilisateur : + QtSoftwareKeyboardDialog @@ -7718,51 +7754,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Pile d'exécution - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - en attente du "mutex" 0x%1 - - - - has waiters: %1 - En attente : %1 - - - - owner handle: 0x%1 - propriétaire de la manche : 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - en attente de tous les objets - - - - waiting for one of the following objects - en attente d'un des objets suivants - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + [%1] %2 - + waited by no thread attendu par aucun thread @@ -7770,120 +7775,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable runnable - + paused en pause - + sleeping en veille - + waiting for IPC reply en attente de réponse IPC - + waiting for objects En attente d'objets - + waiting for condition variable en attente de la variable conditionnelle - + waiting for address arbiter En attente de l'adresse arbitre - + waiting for suspend resume waiting for suspend resume - + waiting en attente - + initialized initialisé - + terminated terminated - + unknown inconnu - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal idéal - + core %1 cœur %1 - + processor = %1 Processeur = %1 - - ideal core = %1 - Cœur idéal = %1 - - - + affinity mask = %1 masque d'affinité = %1 - + thread id = %1 id du fil = %1 - + priority = %1(current) / %2(normal) priorité = %1(courant) / %2(normal) - + last running ticks = %1 dernier tick en cours = %1 - - - not waiting for mutex - en attente du "mutex" - WaitTreeThreadList - + waited by thread attendu par un fil @@ -7891,7 +7886,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree &Wait Tree diff --git a/dist/languages/id.ts b/dist/languages/id.ts index 3ed7f77ec..15054a333 100644 --- a/dist/languages/id.ts +++ b/dist/languages/id.ts @@ -372,36 +372,61 @@ This would ban both their forum username and their IP address. - Output Device + Output Device: - Input Device - Perangkat Masukan + Input Device: + - + + Sound Output Mode: + + + + + Mono + Mono + + + + Stereo + Stereo + + + + Surround + Surround + + + Use global volume Pakai volume global - + Set volume: Atur volume: - + Volume: Volume: - + 0 % 0 % - + + Mute audio when in background + Bisukan audio saat berada di background + + + %1% Volume percentage (e.g. 50%) %1% @@ -1334,26 +1359,21 @@ Memungkinkan berbagai macam optimasi IR. - Mute audio when in background - Bisukan audio saat berada di background - - - Hide mouse on inactivity Sembunyikan mouse saat tidak aktif - + Reset All Settings Atur Ulang Semua Pengaturan - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? @@ -3786,60 +3806,15 @@ UUID: %2 - - Mono - Mono - - - - Stereo - Stereo - - - - Surround - Surround - - - - Console ID: - ID Konsol: - - - - Sound output mode - Mode keluaran suara - - - - Regenerate - Hasilkan Ulang - - - + System settings are available only when game is not running. Pengaturan sistem hanya tersedia saat permainan tidak dijalankan. - + Warning: "%1" is not a valid language for region "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Ini akan mengganti Switch virtual Anda dengan yang baru. Switch virtual Anda saat ini tidak akan bisa dipulihkan. Ini mungkin akan menyebabkan kesan tak terkira di dalam permainan. Ini juga mungkin akan gagal jika Anda menggunakan simpanan konfigurasi yang lawas. Lanjutkan? - - - - Warning - Peringatan - - - - Console ID: 0x%1 - ID Konsol: 0x%1 - ConfigureTas @@ -4526,955 +4501,955 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Data anonim dikumpulkan</a> untuk membantu yuzu. <br/><br/>Apa Anda ingin membagi data penggunaan dengan kami? - + Telemetry Telemetri - + Broken Vulkan Installation Detected - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... Memuat Applet Web... - - + + Disable Web Applet Matikan Applet Web - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Jumlah shader yang sedang dibuat - + The current selected resolution scaling multiplier. Pengali skala resolusi yang terpilih. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Kecepatan emulasi saat ini. Nilai yang lebih tinggi atau rendah dari 100% menandakan pengemulasian berjalan lebih cepat atau lambat dibanding Switch aslinya. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Berapa banyak frame per second (bingkai per detik) permainan akan ditampilkan. Ini akan berubah dari berbagai permainan dan pemandangan. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Waktu yang diperlukan untuk mengemulasikan bingkai Switch, tak menghitung pembatas bingkai atau v-sync. Agar emulasi berkecepatan penuh, ini harus 16.67 mdtk. - + &Clear Recent Files &Bersihkan Berkas Baru-baru Ini - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Lanjutkan - + &Pause &Jeda - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu sedang menjalankan game - + Warning Outdated Game Format Peringatan Format Permainan yang Usang - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Anda menggunakan format direktori ROM yang sudah didekonstruksi untuk permainan ini, yang mana itu merupakan format lawas yang sudah tergantikan oleh yang lain seperti NCA, NAX, XCI, atau NSP. Direktori ROM yang sudah didekonstruksi kekurangan ikon, metadata, dan dukungan pembaruan.<br><br>Untuk penjelasan berbagai format Switch yang didukung yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>periksa wiki kami</a>. Pesan ini tidak akan ditampilkan lagi. - - + + Error while loading ROM! Kesalahan ketika memuat ROM! - + The ROM format is not supported. Format ROM tak didukung. - + An error occurred initializing the video core. Terjadi kesalahan ketika menginisialisasi inti video. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu telah mengalami error saat menjalankan inti video. Ini biasanya disebabkan oleh pemicu piranti (driver) GPU yang usang, termasuk yang terintegrasi. Mohon lihat catatan untuk informasi lebih rinci. Untuk informasi cara mengakses catatan, mohon lihat halaman berikut: <a href='https://yuzu-emu.org/help/reference/log-files/'>Cara Mengupload Berkas Catatan</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Terjadi kesalahan yang tak diketahui. Mohon lihat catatan untuk informasi lebih rinci. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Simpan Data - + Mod Data Mod Data - + Error Opening %1 Folder Gagal Membuka Folder %1 - - + + Folder does not exist! Folder tak ada! - + Error Opening Transferable Shader Cache Gagal Ketika Membuka Tembolok Shader yang Dapat Ditransfer - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Hapus Masukan - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. Tidak ada DLC yang terinstall untuk judul ini. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + Remove File Hapus File - - + + Error Removing Transferable Shader Cache Kesalahan Menghapus Transferable Shader Cache - - + + A shader cache for this title does not exist. Cache shader bagi judul ini tidak ada - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Kesalahan Menghapus Konfigurasi Buatan - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! Pengekstrakan RomFS Gagal! - + There was an error copying the RomFS files or the user cancelled the operation. Terjadi kesalahan ketika menyalin berkas RomFS atau dibatalkan oleh pengguna. - + Full Penuh - + Skeleton Skeleton - + Select RomFS Dump Mode Pilih Mode Dump RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Mohon pilih cara RomFS akan di-dump.<br>FPenuh akan menyalin seluruh berkas ke dalam direktori baru sementara <br>jerangkong hanya akan menciptakan struktur direktorinya saja. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Mengekstrak RomFS... - - + + Cancel Batal - + RomFS Extraction Succeeded! Pengekstrakan RomFS Berhasil! - + The operation completed successfully. Operasi selesai dengan sukses, - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Gagal membuka %1 - + Select Directory Pilih Direktori - + Properties Properti - + The game properties could not be loaded. Properti permainan tak dapat dimuat. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Eksekutabel Switch (%1);;Semua Berkas (*.*) - + Load File Muat Berkas - + Open Extracted ROM Directory Buka Direktori ROM Terekstrak - + Invalid Directory Selected Direktori Terpilih Tidak Sah - + The directory you have selected does not contain a 'main' file. Direktori yang Anda pilih tak memiliki berkas 'utama.' - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Install File - + %n file(s) remaining - + Installing file "%1"... Memasang berkas "%1"... - - + + Install Results Hasil Install - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed %n file(s) baru diinstall - + %n file(s) were overwritten %n file(s) telah ditimpa - + %n file(s) failed to install %n file(s) gagal di install - + System Application Aplikasi Sistem - + System Archive Arsip Sistem - + System Application Update Pembaruan Aplikasi Sistem - + Firmware Package (Type A) Paket Perangkat Tegar (Tipe A) - + Firmware Package (Type B) Paket Perangkat Tegar (Tipe B) - + Game Permainan - + Game Update Pembaruan Permainan - + Game DLC DLC Permainan - + Delta Title Judul Delta - + Select NCA Install Type... Pilih Tipe Pemasangan NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Mohon pilih jenis judul yang Anda ingin pasang sebagai NCA ini: (Dalam kebanyakan kasus, pilihan bawaan 'Permainan' tidak apa-apa`.) - + Failed to Install Gagal Memasang - + The title type you selected for the NCA is invalid. Jenis judul yang Anda pilih untuk NCA tidak sah. - + File not found Berkas tak ditemukan - + File "%1" not found Berkas "%1" tak ditemukan - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Akun yuzu Hilang - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Agar dapat mengirimkan berkas uju kompatibilitas permainan, Anda harus menautkan akun yuzu Anda.<br><br/>TUntuk mennautkan akun yuzu Anda, pergi ke Emulasi &gt; Konfigurasi &gt; Web. - + Error opening URL Kesalahan saat membuka URL - + Unable to open the URL "%1". Tidak dapat membuka URL "%1". - + TAS Recording Rekaman TAS - + Overwrite file of player 1? Timpa file pemain 1? - + Invalid config detected Konfigurasi tidak sah terdeteksi - + Handheld controller can't be used on docked mode. Pro controller will be selected. Kontroller jinjing tidak bisa digunakan dalam mode dock. Kontroller Pro akan dipilih - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Berkas Amiibo (%1);; Semua Berkas (*.*) - + Load Amiibo Muat Amiibo - + Error loading Amiibo data Gagal memuat data Amiibo - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Tangkapan Layar - + PNG Image (*.png) Berkas PNG (*.png) - + TAS state: Running %1/%2 Status TAS: Berjalan %1/%2 - + TAS state: Recording %1 Status TAS: Merekam %1 - + TAS state: Idle %1/%2 Status TAS: Diam %1/%2 - + TAS State: Invalid Status TAS: Tidak Valid - + &Stop Running &Matikan - + &Start &Mulai - + Stop R&ecording Berhenti Mer&ekam - + R&ecord R&ekam - + Building: %n shader(s) Membangun: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Skala: %1x - + Speed: %1% / %2% Kecepatan: %1% / %2% - + Speed: %1% Kecepatan: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Permainan: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU TINGGI - + GPU EXTREME GPU EKSTRIM - + GPU ERROR KESALAHAN GPU - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST NEAREST - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA TANPA AA - + FXAA FXAA - + SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5485,76 +5460,76 @@ This will delete your autogenerated key files and re-run the key derivation modu - + Missing fuses - + - Missing BOOT0 - Kehilangan BOOT0 - + - Missing BCPKG2-1-Normal-Main - Kehilangan BCPKG2-1-Normal-Main - + - Missing PRODINFO - Kehilangan PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. - + Deriving Keys - + Select RomFS Dump Target - + Please select which RomFS you would like to dump. - + Are you sure you want to close yuzu? Apakah anda yakin ingin menutup yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7546,26 +7521,26 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. - + An error has occurred. %1 @@ -7585,20 +7560,81 @@ Please try again or contact the developer of the software. %2 - - Select a user: - - - - + Users Pengguna - + + Profile Creator + + + + + Profile Selector + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + + QtSoftwareKeyboardDialog @@ -7644,51 +7680,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - - - - - has waiters: %1 - - - - - owner handle: 0x%1 - - - - - WaitTreeObjectList - - - waiting for all objects - - - - - waiting for one of the following objects - - - WaitTreeSynchronizationObject - - [%1] %2 %3 + + [%1] %2 - + waited by no thread @@ -7696,120 +7701,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable - + paused - + sleeping - + waiting for IPC reply - + waiting for objects - + waiting for condition variable - + waiting for address arbiter - + waiting for suspend resume - + waiting - + initialized - + terminated - + unknown - + PC = 0x%1 LR = 0x%2 - + ideal - + core %1 - + processor = %1 - - ideal core = %1 - - - - + affinity mask = %1 - + thread id = %1 - + priority = %1(current) / %2(normal) - + last running ticks = %1 - - - not waiting for mutex - - WaitTreeThreadList - + waited by thread @@ -7817,7 +7812,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree diff --git a/dist/languages/it.ts b/dist/languages/it.ts index c535d53ee..688a071e7 100644 --- a/dist/languages/it.ts +++ b/dist/languages/it.ts @@ -380,36 +380,61 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - Output Device - Dispositivo di output + Output Device: + Dispositivo di output: - Input Device - Dispositivo di input + Input Device: + Dispositivo di input: - + + Sound Output Mode: + Modalità di output del suono: + + + + Mono + Mono + + + + Stereo + Stereo + + + + Surround + Surround + + + Use global volume Usa il volume globale - + Set volume: Imposta il volume: - + Volume: Volume: - + 0 % 0 % - + + Mute audio when in background + Silenzia l'audio quando la finestra è in background + + + %1% Volume percentage (e.g. 50%) %1% @@ -1363,26 +1388,21 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - Mute audio when in background - Silenzia l'audio quando la finestra è in background - - - Hide mouse on inactivity Nascondi il puntatore del mouse se inattivo - + Reset All Settings Ripristina tutte le impostazioni - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Tutte le impostazioni verranno ripristinate e tutte le configurazioni dei giochi verranno rimosse. Le cartelle di gioco, i profili e i profili di input non saranno cancellati. Vuoi procedere? @@ -1718,12 +1738,12 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. - + Abilita la decodifica asincrona delle texture ASTC, che può ridurre gli scatti durante il caricamento. Questa funzione è sperimentale. Decode ASTC textures asynchronously (Hack) - + Decodifica le texture ASTC in maniera asincrona (espediente) @@ -3816,60 +3836,15 @@ UUID: %2 Nome del dispositivo - - Mono - Mono - - - - Stereo - Stereo - - - - Surround - Surround - - - - Console ID: - ID Console: - - - - Sound output mode - Modalità di output del sonoro - - - - Regenerate - Rigenera - - - + System settings are available only when game is not running. Le impostazioni di sistema sono disponibili solamente quando il gioco non è in esecuzione. - + Warning: "%1" is not a valid language for region "%2" Attenzione: "%1" non è una lingua valida per la regione "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Questo rimpiazzerà la tua Switch virtuale con una nuova. La tua Switch virtuale non sarà recuperabile. Questo potrebbe avere effetti indesiderati nei giochi. Questo potrebbe fallire, se usi un salvataggio non aggiornato. Desideri continuare? - - - - Warning - Attenzione - - - - Console ID: 0x%1 - ID Console: 0x%1 - ConfigureTas @@ -4557,554 +4532,554 @@ Trascina i punti per cambiare posizione, oppure clicca due volte la cella in tab GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Vengono raccolti dati anonimi</a> per aiutarci a migliorare yuzu. <br/><br/>Desideri condividere i tuoi dati di utilizzo con noi? - + Telemetry Telemetria - + Broken Vulkan Installation Detected Rilevata installazione di Vulkan non funzionante - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. L'inizializzazione di Vulkan è fallita durante l'avvio.<br><br>Clicca <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>qui per istruzioni su come risolvere il problema</a>. - + Loading Web Applet... Caricamento dell'applet web... - - + + Disable Web Applet Disabilita l'applet web - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Il numero di shaders al momento in costruzione - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Velocità corrente dell'emulazione. Valori più alti o più bassi di 100% indicano che l'emulazione sta funzionando più velocemente o lentamente rispetto a una Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Il numero di fotogrammi al secondo che il gioco visualizza attualmente. Può variare in base al gioco e alla situazione. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tempo necessario per emulare un fotogramma della Switch, senza tenere conto del limite al framerate o del V-Sync. Per un'emulazione alla massima velocità, il valore non dovrebbe essere superiore a 16.67 ms. - + &Clear Recent Files &Cancella i file recenti - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Continua - + &Pause &Pausa - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Formato del gioco obsoleto - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Stai usando una cartella con dentro una ROM decostruita come formato per avviare questo gioco, è un formato obsoleto ed è stato sostituito da altri come NCA, NAX, XCI o NSP. Le ROM decostruite non hanno icone, metadata e non supportano gli aggiornamenti. <br><br>Per una spiegazione sui vari formati di Switch che yuzu supporta, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>controlla la nostra wiki</a>. Questo messaggio non verrà più mostrato. - - + + Error while loading ROM! Errore nel caricamento della ROM! - + The ROM format is not supported. Il formato della ROM non è supportato. - + An error occurred initializing the video core. È stato riscontrato un errore nell'inizializzazione del core video. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Errore nel caricamento della ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Segui <a href='https://yuzu-emu.org/help/quickstart/'>la guida introduttiva di yuzu</a> per rifare il dump dei file.<br>Puoi fare riferimento alla wiki di yuzu</a> o al server Discord di yuzu</a> per assistenza. - + An unknown error occurred. Please see the log for more details. Si è verificato un errore sconosciuto. Visualizza il log per maggiori dettagli. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Chiusura del software in corso... - + Save Data Dati di salvataggio - + Mod Data Dati delle mod - + Error Opening %1 Folder Impossibile aprire la cartella %1 - - + + Folder does not exist! La cartella non esiste! - + Error Opening Transferable Shader Cache Impossibile aprire la cache trasferibile degli shader - + Failed to create the shader cache directory for this title. Impossibile creare la cartella della cache degli shader per questo titolo. - + Error Removing Contents Impossibile rimuovere il contentuto - + Error Removing Update Impossibile rimuovere l'aggiornamento - + Error Removing DLC Impossibile rimuovere il DLC - + Remove Installed Game Contents? Rimuovere il contenuto del gioco installato? - + Remove Installed Game Update? Rimuovere l'aggiornamento installato? - + Remove Installed Game DLC? Rimuovere il DLC installato? - + Remove Entry Rimuovi voce - - - - - - + + + + + + Successfully Removed Rimozione completata - + Successfully removed the installed base game. Il gioco base installato è stato rimosso con successo. - + The base game is not installed in the NAND and cannot be removed. Il gioco base non è installato su NAND e non può essere rimosso. - + Successfully removed the installed update. Aggiornamento rimosso con successo. - + There is no update installed for this title. Non c'è alcun aggiornamento installato per questo gioco. - + There are no DLC installed for this title. Non c'è alcun DLC installato per questo gioco. - + Successfully removed %1 installed DLC. %1 DLC rimossi con successo. - + Delete OpenGL Transferable Shader Cache? Vuoi rimuovere la cache trasferibile degli shader OpenGL? - + Delete Vulkan Transferable Shader Cache? Vuoi rimuovere la cache trasferibile degli shader Vulkan? - + Delete All Transferable Shader Caches? Vuoi rimuovere tutte le cache trasferibili degli shader? - + Remove Custom Game Configuration? Rimuovere la configurazione personalizzata del gioco? - + Remove File Rimuovi file - - + + Error Removing Transferable Shader Cache Impossibile rimuovere la cache trasferibile degli shader - - + + A shader cache for this title does not exist. Per questo titolo non esiste una cache degli shader. - + Successfully removed the transferable shader cache. La cache trasferibile degli shader è stata rimossa con successo. - + Failed to remove the transferable shader cache. Impossibile rimuovere la cache trasferibile degli shader. - + Error Removing Vulkan Driver Pipeline Cache Impossibile rimuovere la cache delle pipeline del driver Vulkan - + Failed to remove the driver pipeline cache. Impossibile rimuovere la cache delle pipeline del driver. - - + + Error Removing Transferable Shader Caches Impossibile rimuovere le cache trasferibili degli shader - + Successfully removed the transferable shader caches. Le cache trasferibili degli shader sono state rimosse con successo. - + Failed to remove the transferable shader cache directory. Impossibile rimuovere la cartella della cache trasferibile degli shader. - - + + Error Removing Custom Configuration Impossibile rimuovere la configurazione personalizzata - + A custom configuration for this title does not exist. Non esiste una configurazione personalizzata per questo gioco. - + Successfully removed the custom game configuration. La configurazione personalizzata del gioco è stata rimossa con successo. - + Failed to remove the custom game configuration. Impossibile rimuovere la configurazione personalizzata del gioco. - - + + RomFS Extraction Failed! Estrazione RomFS fallita! - + There was an error copying the RomFS files or the user cancelled the operation. C'è stato un errore nella copia dei file del RomFS o l'operazione è stata annullata dall'utente. - + Full Completa - + Skeleton Cartelle - + Select RomFS Dump Mode Seleziona la modalità di estrazione della RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Seleziona come vorresti estrarre la RomFS. <br>La modalità Completa copierà tutti i file in una nuova cartella mentre<br>la modalità Cartelle creerà solamente le cartelle e le sottocartelle. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Estrazione RomFS in corso... - - + + Cancel Annulla - + RomFS Extraction Succeeded! Estrazione RomFS riuscita! - + The operation completed successfully. L'operazione è stata completata con successo. - - - - - + + + + + Create Shortcut Crea scorciatoia - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Verrà creata una scorciatoia all'AppImage attuale. Potrebbe non funzionare correttamente se effettui un aggiornamento. Vuoi continuare? - + Cannot create shortcut on desktop. Path "%1" does not exist. Impossibile creare la scorciatoia sul desktop. Il percorso "%1" non esiste. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Impossibile creare la scorciatoia nel menù delle applicazioni. Il percorso "%1" non esiste e non può essere creato. - + Create Icon Crea icona - + Cannot create icon file. Path "%1" does not exist and cannot be created. Impossibile creare il file dell'icona. Il percorso "%1" non esiste e non può essere creato. - + Start %1 with the yuzu Emulator Avvia %1 con l'emulatore yuzu - + Failed to create a shortcut at %1 Impossibile creare la scorciatoia in %1 - + Successfully created a shortcut to %1 Scorciatoia creata con successo in %1 - + Error Opening %1 Impossibile aprire %1 - + Select Directory Seleziona cartella - + Properties Proprietà - + The game properties could not be loaded. Non è stato possibile caricare le proprietà del gioco. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Eseguibile Switch (%1);;Tutti i file (*.*) - + Load File Carica file - + Open Extracted ROM Directory Apri cartella ROM estratta - + Invalid Directory Selected Cartella selezionata non valida - + The directory you have selected does not contain a 'main' file. La cartella che hai selezionato non contiene un file "main". - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) File installabili Switch (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Installa file - + %n file(s) remaining %n file rimanente%n file rimanenti%n file rimanenti - + Installing file "%1"... Installazione del file "%1"... - - + + Install Results Risultati dell'installazione - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Per evitare possibli conflitti, sconsigliamo di installare i giochi base su NAND. Usa questa funzione solo per installare aggiornamenti e DLC. - + %n file(s) were newly installed %n nuovo file è stato installato @@ -5113,7 +5088,7 @@ Usa questa funzione solo per installare aggiornamenti e DLC. - + %n file(s) were overwritten %n file è stato sovrascritto @@ -5122,7 +5097,7 @@ Usa questa funzione solo per installare aggiornamenti e DLC. - + %n file(s) failed to install %n file non è stato installato a causa di errori @@ -5131,389 +5106,389 @@ Usa questa funzione solo per installare aggiornamenti e DLC. - + System Application Applicazione di sistema - + System Archive Archivio di sistema - + System Application Update Aggiornamento di un'applicazione di sistema - + Firmware Package (Type A) Pacchetto firmware (tipo A) - + Firmware Package (Type B) Pacchetto firmware (tipo B) - + Game Gioco - + Game Update Aggiornamento di gioco - + Game DLC DLC - + Delta Title Titolo delta - + Select NCA Install Type... Seleziona il tipo di installazione NCA - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Seleziona il tipo del file NCA da installare: (Nella maggior parte dei casi, il valore predefinito 'Gioco' va bene.) - + Failed to Install Installazione fallita - + The title type you selected for the NCA is invalid. Il tipo che hai selezionato per l'NCA non è valido. - + File not found File non trovato - + File "%1" not found File "%1" non trovato - + OK OK - - + + Hardware requirements not met Requisiti hardware non soddisfatti - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Il tuo sistema non soddisfa i requisiti hardware consigliati. La funzionalità di segnalazione della compatibilità è stata disattivata. - + Missing yuzu Account Account di yuzu non trovato - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Per segnalare la compatibilità di un gioco, devi collegare il tuo account yuzu. <br><br/>Per collegare il tuo account yuzu, vai su Emulazione &gt; Configurazione &gt; Web. - + Error opening URL Impossibile aprire l'URL - + Unable to open the URL "%1". Non è stato possibile aprire l'URL "%1". - + TAS Recording - + Overwrite file of player 1? Vuoi sovrascrivere il file del giocatore 1? - + Invalid config detected Trovata configurazione invalida - + Handheld controller can't be used on docked mode. Pro controller will be selected. Il controller portatile non può essere utilizzato in modalità dock. Verrà selezionato il controller Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed L'Amiibo corrente è stato rimosso - + Error Errore - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) File Amiibo (%1);; Tutti i file (*.*) - + Load Amiibo Carica Amiibo - + Error loading Amiibo data Impossibile caricare i dati dell'Amiibo - + The selected file is not a valid amiibo Il file selezionato non è un Amiibo valido - + The selected file is already on use Il file selezionato è già in uso - + An unknown error occurred Si è verificato un errore sconosciuto - + Capture Screenshot Cattura screenshot - + PNG Image (*.png) Immagine PNG (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running &Interrompi - + &Start &Avvia - + Stop R&ecording Interrompi r&egistrazione - + R&ecord R&egistra - + Building: %n shader(s) Compilazione di %n shaderCompilazione di %n shaderCompilazione di %n shader - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Velocità: %1% / %2% - + Speed: %1% Velocità: %1% - + Game: %1 FPS (Unlocked) Gioco: %1 FPS (Sbloccati) - + Game: %1 FPS Gioco: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMALE - + GPU HIGH GPU ALTA - + GPU EXTREME GPU ESTREMA - + GPU ERROR ERRORE GPU - + DOCKED DOCK - + HANDHELD PORTATILE - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST NEAREST - - + + BILINEAR BILINEARE - + BICUBIC BICUBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA NO AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE VOLUME: MUTO - + VOLUME: %1% Volume percentage (e.g. 50%) VOLUME: %1% - + Confirm Key Rederivation Conferma ri-derivazione chiavi - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5530,37 +5505,37 @@ e facoltativamente fai dei backup. Questo eliminerà i tuoi file di chiavi autogenerati e ri-avvierà il processo di derivazione delle chiavi. - + Missing fuses Fusi mancanti - + - Missing BOOT0 - BOOT0 mancante - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main mancante - + - Missing PRODINFO - PRODINFO mancante - + Derivation Components Missing Componenti di derivazione mancanti - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Chiavi di crittografia mancanti. <br>Segui <a href='https://yuzu-emu.org/help/quickstart/'>la guida introduttiva di yuzu</a> per ottenere tutte le tue chiavi, il tuo firmware e i tuoi giochi.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5569,39 +5544,39 @@ Questa operazione potrebbe durare fino a un minuto in base alle prestazioni del tuo sistema. - + Deriving Keys Derivazione chiavi - + Select RomFS Dump Target Seleziona Target dell'Estrazione del RomFS - + Please select which RomFS you would like to dump. Seleziona quale RomFS vorresti estrarre. - + Are you sure you want to close yuzu? Sei sicuro di voler chiudere yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Sei sicuro di voler arrestare l'emulazione? Tutti i progressi non salvati verranno perduti. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7218,7 +7193,7 @@ p, li { white-space: pre-wrap; } Extra - + Extra @@ -7235,7 +7210,7 @@ p, li { white-space: pre-wrap; } %1%2%3Button %4 - + %1%2%3Pulsante %4 @@ -7604,28 +7579,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) Codice di errore: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. Si è verificato un errore. Riprova o contatta gli sviluppatori del programma. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. Si è verificato un errore su %1 a %2. Riprova o contatta gli sviluppatori del programma. - + An error has occurred. %1 @@ -7649,20 +7624,81 @@ Riprova o contatta gli sviluppatori del programma. %2 - - Select a user: - Seleziona un utente: - - - + Users Utenti - + + Profile Creator + + + + + Profile Selector Selettore profili + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Seleziona un utente: + QtSoftwareKeyboardDialog @@ -7712,51 +7748,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Stack chiamata - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - attende il mutex 0x%1 - - - - has waiters: %1 - ha dei waiter: %1 - - - - owner handle: 0x%1 - proprietario handle: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - attende tutti gli oggetti - - - - waiting for one of the following objects - attende uno dei seguenti oggetti - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + [%1] %2 - + waited by no thread atteso da nessun thread @@ -7764,120 +7769,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable eseguibile - + paused in pausa - + sleeping dormendo - + waiting for IPC reply attende una risposta dell'IPC - + waiting for objects attende degli oggetti - + waiting for condition variable aspettando la condition variable - + waiting for address arbiter attende un indirizzo arbitro - + waiting for suspend resume in attesa di riprendere la sospensione - + waiting attendere - + initialized inizializzato - + terminated terminato - + unknown sconosciuto - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal ideale - + core %1 core %1 - + processor = %1 processore = %1 - - ideal core = %1 - core ideale = %1 - - - + affinity mask = %1 affinity mask = %1 - + thread id = %1 id thread = %1 - + priority = %1(current) / %2(normal) priorità = %1(corrente) / %2(normale) - + last running ticks = %1 Ultimi ticks in esecuzione = %1. - - - not waiting for mutex - Non in attesa per la sincronizzazione dei processi concorrenti aka Mutex. - WaitTreeThreadList - + waited by thread atteso dal thread @@ -7885,7 +7880,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree &Wait Tree diff --git a/dist/languages/ja_JP.ts b/dist/languages/ja_JP.ts index 36735d864..66c09d493 100644 --- a/dist/languages/ja_JP.ts +++ b/dist/languages/ja_JP.ts @@ -380,36 +380,61 @@ This would ban both their forum username and their IP address. - Output Device - 出力デバイス + Output Device: + - Input Device - 入力デバイス + Input Device: + - + + Sound Output Mode: + + + + + Mono + モノラル + + + + Stereo + ステレオ + + + + Surround + サラウンド + + + Use global volume 共通設定を使用 - + Set volume: カスタム設定 - + Volume: 音量： - + 0 % 0 % - + + Mute audio when in background + 非アクティブ時にサウンドをミュート + + + %1% Volume percentage (e.g. 50%) %1% @@ -808,12 +833,15 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">This optimization speeds up memory accesses by allowing invalid memory accesses to succeed.</div> <div style="white-space: nowrap">Enabling it reduces the overhead of all memory accesses and has no impact on programs that don't access invalid memory.</div> - + + <div style="white-space: nowrap">この最適化により、無効なメモリアクセスを成功させることで、メモリアクセスを高速化することができます。</div> + <div style="white-space: nowrap">有効にすると、すべてのメモリアクセスのオーバーヘッドが減少するうえ、無効なメモリにアクセスしないプログラムには影響はありません。</div> + Enable fallbacks for invalid memory accesses - + 無効なメモリアクセスに対するフォールバックを有効にする @@ -936,7 +964,7 @@ This would ban both their forum username and their IP address. When checked, it disables the macro HLE functions. Enabling this makes games run slower - + 有効化すると、マクロHLE機能を無効にします。これを有効にすると、ゲームの動作が遅くなります @@ -1031,12 +1059,12 @@ This would ban both their forum username and their IP address. Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + プログラム起動時にyuzuがVulkan環境が動作しているかどうかを確認するようにします。外部プログラムがyuzuを参照する際に問題がある場合は、これを無効にしてください。 Perform Startup Vulkan Check - + スタートアップ時にVulkanのチェックを実行する @@ -1056,7 +1084,7 @@ This would ban both their forum username and their IP address. Web applet not compiled - + ウェブアプレットがコンパイルされていない @@ -1375,26 +1403,21 @@ This would ban both their forum username and their IP address. - Mute audio when in background - 非アクティブ時にサウンドをミュート - - - Hide mouse on inactivity 非アクティブ時にマウスカーソルを隠す - + Reset All Settings すべての設定をリセット - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? すべての設定がリセットされ、ゲームごとの設定もすべて削除されます。ゲームディレクトリ、プロファイル、入力プロファイルは削除されません。続行しますか? @@ -1640,12 +1663,12 @@ This would ban both their forum username and their IP address. Set FSR Sharpness - + FSR シャープネスを設定 FSR Sharpness: - + FSR シャープネス: @@ -1710,7 +1733,7 @@ This would ban both their forum username and their IP address. Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - + GPUのクロックスピードを下げないように、グラフィックコマンドを待っている間、バックグラウンドで作業を実行させます。 @@ -1730,12 +1753,12 @@ This would ban both their forum username and their IP address. Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. - + 非同期ASTCテクスチャーデコードを有効にし、ロード時間のスタッターを減らすことができます。この機能は実験的なものです。 Decode ASTC textures asynchronously (Hack) - + ASTCテクスチャを非同期でデコードする（ハック） @@ -1770,7 +1793,7 @@ This would ban both their forum username and their IP address. Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + GPU ベンダー固有のパイプラインキャッシュを有効にします。このオプションは、Vulkanドライバがパイプラインキャッシュファイルを内部に保存していない場合に、シェーダのロード時間を大幅に改善することができます。 @@ -3828,60 +3851,15 @@ UUID: %2 デバイス名 - - Mono - モノラル - - - - Stereo - ステレオ - - - - Surround - サラウンド - - - - Console ID: - コンソールID: - - - - Sound output mode - サウンド出力モード - - - - Regenerate - 再作成 - - - + System settings are available only when game is not running. システム設定はゲーム未実行時にのみ変更できます。 - + Warning: "%1" is not a valid language for region "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - 仮想Switchコンソールを再作成しようとしています。現在使用中の仮想Switchコンソールを後から復旧させることはできません。ゲームに予期せぬ影響を与える可能性があり、古い設定などを使うと失敗するかもしれませんが、それでも続行しますか？ - - - - Warning - 警告 - - - - Console ID: 0x%1 - コンソールID： 0x%1 - ConfigureTas @@ -4569,957 +4547,957 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? yuzuを改善するための<a href='https://yuzu-emu.org/help/feature/telemetry/'>匿名データが収集されました</a>。<br/><br/>統計情報データを共有しますか？ - + Telemetry テレメトリ - + Broken Vulkan Installation Detected 壊れたVulkanのインストールが検出されました。 - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. ブート時にVulkanの初期化に失敗しました。<br><br>この問題を解決するための手順は<a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>こちら</a>。 - + Loading Web Applet... Webアプレットをロード中... - - + + Disable Web Applet Webアプレットの無効化 - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Webアプレットを無効にすると、未定義の動作になる可能性があるため、スーパーマリオ3Dオールスターズでのみ使用するようにしてください。本当にWebアプレットを無効化しますか？ (デバッグ設定で再度有効にすることができます）。 - + The amount of shaders currently being built ビルド中のシェーダー数 - + The current selected resolution scaling multiplier. 現在選択されている解像度の倍率。 - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. 現在のエミュレーション速度。値が100%より高いか低い場合、エミュレーション速度がSwitchより速いか遅いことを示します。 - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. ゲームが現在表示している1秒あたりのフレーム数。これはゲームごと、シーンごとに異なります。 - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Switchフレームをエミュレートするのにかかる時間で、フレームリミットやV-Syncは含まれません。フルスピードエミュレーションの場合、最大で16.67ミリ秒になります。 - + &Clear Recent Files 最近のファイルをクリア(&C) - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue 再開(&C) - + &Pause 中断(&P) - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzuはゲームを起動しています - + Warning Outdated Game Format 古いゲームフォーマットの警告 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. このゲームでは、分解されたROMディレクトリフォーマットを使用しています。これは、NCA、NAX、XCI、またはNSPなどに取って代わられた古いフォーマットです。分解されたROMディレクトリには、アイコン、メタデータ、およびアップデートサポートがありません。<br><br>yuzuがサポートするSwitchフォーマットの説明については、<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>wikiをチェックしてください</a>。このメッセージは二度と表示されません。 - - + + Error while loading ROM! ROMロード中にエラーが発生しました！ - + The ROM format is not supported. このROMフォーマットはサポートされていません。 - + An error occurred initializing the video core. ビデオコア初期化中にエラーが発生しました。 - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzuは、ビデオコアの実行中にエラーが発生しました。これは通常、内蔵GPUも含め、古いGPUドライバが原因です。詳しくはログをご覧ください。ログへのアクセス方法については、以下のページをご覧ください:<a href='https://yuzu-emu.org/help/reference/log-files/'>ログファイルのアップロード方法について</a>。 - + Error while loading ROM! %1 %1 signifies a numeric error code. ROMのロード中にエラー! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br><a href='https://yuzu-emu.org/help/quickstart/'>yuzuクイックスタートガイド</a>を参照してファイルを再ダンプしてください。<br>またはyuzu wiki及び</a>yuzu Discord</a>を参照するとよいでしょう。 - + An unknown error occurred. Please see the log for more details. 不明なエラーが発生しました。詳細はログを確認して下さい。 - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data データのセーブ - + Mod Data Modデータ - + Error Opening %1 Folder ”%1”フォルダを開けませんでした - - + + Folder does not exist! フォルダが存在しません！ - + Error Opening Transferable Shader Cache シェーダキャッシュを開けませんでした - + Failed to create the shader cache directory for this title. このタイトル用のシェーダキャッシュディレクトリの作成に失敗しました - + Error Removing Contents コンテンツの削除エラー - + Error Removing Update アップデートの削除エラー - + Error Removing DLC DLC の削除エラー - + Remove Installed Game Contents? インストールされたゲームのコンテンツを削除しますか? - + Remove Installed Game Update? インストールされたゲームのアップデートを削除しますか? - + Remove Installed Game DLC? インストールされたゲームの DLC を削除しますか? - + Remove Entry エントリ削除 - - - - - - + + + + + + Successfully Removed 削除しました - + Successfully removed the installed base game. インストールされたゲームを正常に削除しました。 - + The base game is not installed in the NAND and cannot be removed. ゲームはNANDにインストールされていないため、削除できません。 - + Successfully removed the installed update. インストールされたアップデートを正常に削除しました。 - + There is no update installed for this title. このタイトルのアップデートはインストールされていません。 - + There are no DLC installed for this title. このタイトルにはDLCがインストールされていません。 - + Successfully removed %1 installed DLC. ％1にインストールされたDLCを正常に削除しました。 - + Delete OpenGL Transferable Shader Cache? 転送可能なOpenGLシェーダキャッシュを削除しますか? - + Delete Vulkan Transferable Shader Cache? 転送可能なVulkanシェーダキャッシュを削除しますか? - + Delete All Transferable Shader Caches? 転送可能なすべてのシェーダキャッシュを削除しますか? - + Remove Custom Game Configuration? このタイトルのカスタム設定を削除しますか？ - + Remove File ファイル削除 - - + + Error Removing Transferable Shader Cache 転送可能なシェーダーキャッシュの削除エラー - - + + A shader cache for this title does not exist. このタイトル用のシェーダキャッシュは存在しません。 - + Successfully removed the transferable shader cache. 転送可能なシェーダーキャッシュが正常に削除されました。 - + Failed to remove the transferable shader cache. 転送可能なシェーダーキャッシュを削除できませんでした。 - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches 転送可能なシェーダキャッシュの削除エラー - + Successfully removed the transferable shader caches. 転送可能なシェーダキャッシュを正常に削除しました。 - + Failed to remove the transferable shader cache directory. 転送可能なシェーダキャッシュディレクトリの削除に失敗しました。 - - + + Error Removing Custom Configuration カスタム設定の削除エラー - + A custom configuration for this title does not exist. このタイトルのカスタム設定は存在しません。 - + Successfully removed the custom game configuration. カスタム設定を正常に削除しました。 - + Failed to remove the custom game configuration. カスタム設定の削除に失敗しました。 - - + + RomFS Extraction Failed! RomFSの解析に失敗しました！ - + There was an error copying the RomFS files or the user cancelled the operation. RomFSファイルをコピー中にエラーが発生したか、ユーザー操作によりキャンセルされました。 - + Full フル - + Skeleton スケルトン - + Select RomFS Dump Mode RomFSダンプモードの選択 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. RomFSのダンプ方法を選択してください。<br>”完全”はすべてのファイルが新しいディレクトリにコピーされます。<br>”スケルトン”はディレクトリ構造を作成するだけです。 - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 に RomFS を展開するための十分な空き領域がありません。Emulation > Configure > System > Filesystem > Dump Root で、空き容量を確保するか、別のダンプディレクトリを選択してください。 - + Extracting RomFS... RomFSを解析中... - - + + Cancel キャンセル - + RomFS Extraction Succeeded! RomFS解析成功！ - + The operation completed successfully. 操作は成功しました。 - - - - - + + + + + Create Shortcut ショートカットを作成 - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon アイコンを作成 - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 ”%1”を開けませんでした - + Select Directory ディレクトリの選択 - + Properties プロパティ - + The game properties could not be loaded. ゲームプロパティをロード出来ませんでした。 - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch実行ファイル (%1);;すべてのファイル (*.*) - + Load File ファイルのロード - + Open Extracted ROM Directory 展開されているROMディレクトリを開く - + Invalid Directory Selected 無効なディレクトリが選択されました - + The directory you have selected does not contain a 'main' file. 選択されたディレクトリに”main”ファイルが見つかりませんでした。 - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) インストール可能なスイッチファイル (*.nca *.nsp *.xci);;任天堂コンテンツアーカイブ (*.nca);;任天堂サブミッションパッケージ (*.nsp);;NXカートリッジイメージ (*.xci) - + Install Files ファイルのインストール - + %n file(s) remaining 残り %n ファイル - + Installing file "%1"... "%1"ファイルをインストールしています・・・ - - + + Install Results インストール結果 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 競合を避けるため、NANDにゲーム本体をインストールすることはお勧めしません。 この機能は、アップデートやDLCのインストールにのみ使用してください。 - + %n file(s) were newly installed %n ファイルが新たにインストールされました - + %n file(s) were overwritten %n ファイルが上書きされました - + %n file(s) failed to install %n ファイルのインストールに失敗しました - + System Application システムアプリケーション - + System Archive システムアーカイブ - + System Application Update システムアプリケーションアップデート - + Firmware Package (Type A) ファームウェアパッケージ（Type A） - + Firmware Package (Type B) ファームウェアパッケージ（Type B） - + Game ゲーム - + Game Update ゲームアップデート - + Game DLC ゲームDLC - + Delta Title 差分タイトル - + Select NCA Install Type... NCAインストール種別を選択・・・ - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) インストールするNCAタイトル種別を選択して下さい： （ほとんどの場合、デフォルトの”ゲーム”で問題ありません。） - + Failed to Install インストール失敗 - + The title type you selected for the NCA is invalid. 選択されたNCAのタイトル種別が無効です。 - + File not found ファイルが存在しません - + File "%1" not found ファイル”%1”が存在しません - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account yuzuアカウントが存在しません - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. ゲームの互換性テストケースを送信するには、yuzuアカウントをリンクする必要があります。<br><br/>yuzuアカウントをリンクするには、エミュレーション ＞ 設定 ＞ Web から行います。 - + Error opening URL URLオープンエラー - + Unable to open the URL "%1". URL"%1"を開けません。 - + TAS Recording TAS 記録中 - + Overwrite file of player 1? プレイヤー1のファイルを上書きしますか? - + Invalid config detected 無効な設定を検出しました - + Handheld controller can't be used on docked mode. Pro controller will be selected. 携帯コントローラはドックモードで使用できないため、Proコントローラが選択されます。 - - + + Amiibo Amiibo - - + + The current amiibo has been removed 現在の amiibo は削除されました - + Error エラー - - + + The current game is not looking for amiibos 現在のゲームはamiiboを要求しません - + Amiibo File (%1);; All Files (*.*) amiiboファイル (%1);;すべてのファイル (*.*) - + Load Amiibo amiiboのロード - + Error loading Amiibo data amiiboデータ読み込み中にエラーが発生しました - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot スクリーンショットのキャプチャ - + PNG Image (*.png) PNG画像 (*.png) - + TAS state: Running %1/%2 TAS 状態: 実行中 %1/%2 - + TAS state: Recording %1 TAS 状態: 記録中 %1 - + TAS state: Idle %1/%2 TAS 状態: アイドル %1/%2 - + TAS State: Invalid TAS 状態: 無効 - + &Stop Running 実行停止(&S) - + &Start 実行(&S) - + Stop R&ecording 記録停止(&R) - + R&ecord 記録(&R) - + Building: %n shader(s) 構築中: %n シェーダー - + Scale: %1x %1 is the resolution scaling factor 拡大率: %1x - + Speed: %1% / %2% 速度：%1% / %2% - + Speed: %1% 速度：%1% - + Game: %1 FPS (Unlocked) Game: %1 FPS（制限解除） - + Game: %1 FPS ゲーム：%1 FPS - + Frame: %1 ms フレーム：%1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HIGH - + GPU EXTREME GPU EXTREME - + GPU ERROR GPU ERROR - + DOCKED DOCKED - + HANDHELD HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST NEAREST - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA NO AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE 音量: ミュート - + VOLUME: %1% Volume percentage (e.g. 50%) 音量: %1% - + Confirm Key Rederivation キーの再取得確認 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5536,37 +5514,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 実行すると、自動生成された鍵ファイルが削除され、鍵生成モジュールが再実行されます。 - + Missing fuses ヒューズがありません - + - Missing BOOT0 - BOOT0がありません - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Mainがありません - + - Missing PRODINFO - PRODINFOがありません - + Derivation Components Missing 派生コンポーネントがありません - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 暗号化キーがありません。<br>キー、ファームウェア、ゲームを取得するには<a href='https://yuzu-emu.org/help/quickstart/'>yuzu クイックスタートガイド</a>を参照ください。<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5575,39 +5553,39 @@ on your system's performance. 1分以上かかります。 - + Deriving Keys 派生キー - + Select RomFS Dump Target RomFSダンプターゲットの選択 - + Please select which RomFS you would like to dump. ダンプしたいRomFSを選択して下さい。 - + Are you sure you want to close yuzu? yuzuを終了しますか？ - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. エミュレーションを停止しますか？セーブされていない進行状況は失われます。 - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7610,28 +7588,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) エラーコード: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. エラーが発生しました。 もう一度試すか、開発者に報告してください。 - + An error occurred on %1 at %2. Please try again or contact the developer of the software. %1の%2でエラーが発生しました。 再試行するか、ソフトウェアの開発者に連絡してください。 - + An error has occurred. %1 @@ -7655,20 +7633,81 @@ Please try again or contact the developer of the software. %2 - - Select a user: - ユーザー選択： - - - + Users ユーザー - + + Profile Creator + + + + + Profile Selector プロファイル選択 + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + ユーザー選択： + QtSoftwareKeyboardDialog @@ -7718,51 +7757,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Call stack - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - waiting for mutex 0x%1 - - - - has waiters: %1 - has waiters: %1 - - - - owner handle: 0x%1 - owner handle: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - waiting for all objects - - - - waiting for one of the following objects - waiting for one of the following objects - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + - + waited by no thread waited by no thread @@ -7770,120 +7778,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable runnable - + paused paused - + sleeping sleeping - + waiting for IPC reply waiting for IPC reply - + waiting for objects waiting for objects - + waiting for condition variable waiting for condition variable - + waiting for address arbiter waiting for address arbiter - + waiting for suspend resume waiting for suspend resume - + waiting waiting - + initialized initialized - + terminated terminated - + unknown unknown - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal ideal - + core %1 core %1 - + processor = %1 processor = %1 - - ideal core = %1 - ideal core = %1 - - - + affinity mask = %1 affinity mask = %1 - + thread id = %1 thread id = %1 - + priority = %1(current) / %2(normal) priority = %1(current) / %2(normal) - + last running ticks = %1 last running ticks = %1 - - - not waiting for mutex - not waiting for mutex - WaitTreeThreadList - + waited by thread waited by thread @@ -7891,7 +7889,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree &Wait Tree diff --git a/dist/languages/ko_KR.ts b/dist/languages/ko_KR.ts index cebba03aa..bd5e8fa18 100644 --- a/dist/languages/ko_KR.ts +++ b/dist/languages/ko_KR.ts @@ -380,36 +380,61 @@ This would ban both their forum username and their IP address. - Output Device - 출력 장치 + Output Device: + - Input Device - 입력 장치 + Input Device: + - + + Sound Output Mode: + + + + + Mono + 모노 + + + + Stereo + 스테레오 + + + + Surround + 서라운드 + + + Use global volume 전역 볼륨 설정 사용 - + Set volume: 볼륨 설정: - + Volume: 볼륨: - + 0 % 0 % - + + Mute audio when in background + 백그라운드에서 오디오 음소거 + + + %1% Volume percentage (e.g. 50%) %1% @@ -1379,26 +1404,21 @@ This would ban both their forum username and their IP address. - Mute audio when in background - 백그라운드에서 오디오 음소거 - - - Hide mouse on inactivity 비활성 상태일 때 마우스 숨기기 - + Reset All Settings 모든 설정 초기화 - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? 모든 환경 설정과 게임별 맞춤 설정이 초기화됩니다. 게임 디렉토리나 프로필, 또는 입력 프로필은 삭제되지 않습니다. 진행하시겠습니까? @@ -3832,60 +3852,15 @@ UUID: %2 장치 이름 - - Mono - 모노 - - - - Stereo - 스테레오 - - - - Surround - 서라운드 - - - - Console ID: - 콘솔 ID: - - - - Sound output mode - 소리 출력 모드: - - - - Regenerate - 재생성 - - - + System settings are available only when game is not running. 시스템 설정은 게임이 꺼져 있을 때만 수정 가능합니다. - + Warning: "%1" is not a valid language for region "%2" 경고: "%1"은(는) 지역 "%2"에 유효한 언어가 아님 - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - 현재 사용하는 가상 Switch를 새로운 가상 Switch로 교체 합니다. 기존의 가상 Switch는 복구가 불가능해집니다. 게임에 예상치 못한 영향을 끼칠 수도 있습니다. 오래된 게임 설정을 사용할 경우 실패할 수도 있습니다. 계속하시겠습니까? - - - - Warning - 경고 - - - - Console ID: 0x%1 - 콘솔 ID: 0x%1 - ConfigureTas @@ -4573,957 +4548,957 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? yuzu를 개선하기 위해 <a href='https://yuzu-emu.org/help/feature/telemetry/'>익명 데이터가 수집됩니다.</a> <br/><br/>사용 데이터를 공유하시겠습니까? - + Telemetry 원격 측정 - + Broken Vulkan Installation Detected 망가진 Vulkan 설치 감지됨 - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. 부팅하는 동안 Vulkan 초기화에 실패했습니다.<br><br>문제 해결 지침을 보려면 <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>여기</a>를 클릭하세요. - + Loading Web Applet... 웹 애플릿을 로드하는 중... - - + + Disable Web Applet 웹 애플릿 비활성화 - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) 웹 애플릿을 비활성화하면 정의되지 않은 동작이 발생할 수 있으며 Super Mario 3D All-Stars에서만 사용해야 합니다. 웹 애플릿을 비활성화하시겠습니까? (디버그 설정에서 다시 활성화할 수 있습니다.) - + The amount of shaders currently being built 현재 생성중인 셰이더의 양 - + The current selected resolution scaling multiplier. 현재 선택된 해상도 배율입니다. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. 현재 에뮬레이션 속도. 100%보다 높거나 낮은 값은 에뮬레이션이 Switch보다 빠르거나 느린 것을 나타냅니다. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. 게임이 현재 표시하고 있는 초당 프레임 수입니다. 이것은 게임마다 다르고 장면마다 다릅니다. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. 프레임 제한이나 수직 동기화를 계산하지 않고 Switch 프레임을 에뮬레이션 하는 데 걸린 시간. 최대 속도로 에뮬레이트 중일 때에는 대부분 16.67 ms 근처입니다. - + &Clear Recent Files Clear Recent Files(&C) - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue 재개(&C) - + &Pause 일시중지(&P) - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu가 게임을 실행중입니다 - + Warning Outdated Game Format 오래된 게임 포맷 경고 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. 이 게임 파일은 '분해된 ROM 디렉토리'라는 오래된 포맷을 사용하고 있습니다. 해당 포맷은 NCA, NAX, XCI 또는 NSP와 같은 다른 포맷으로 대체되었으며 분해된 ROM 디렉토리에는 아이콘, 메타 데이터 및 업데이트가 지원되지 않습니다.<br><br>yuzu가 지원하는 다양한 Switch 포맷에 대한 설명은 <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>위키를 확인하세요.</a> 이 메시지는 다시 표시되지 않습니다. - - + + Error while loading ROM! ROM 로드 중 오류 발생! - + The ROM format is not supported. 지원되지 않는 롬 포맷입니다. - + An error occurred initializing the video core. 비디오 코어를 초기화하는 동안 오류가 발생했습니다. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. 비디오 코어를 실행하는 동안 yuzu에 오류가 발생했습니다. 이것은 일반적으로 통합 드라이버를 포함하여 오래된 GPU 드라이버로 인해 발생합니다. 자세한 내용은 로그를 참조하십시오. 로그 액세스에 대한 자세한 내용은 <a href='https://yuzu-emu.org/help/reference/log-files/'>로그 파일 업로드 방법</a> 페이지를 참조하세요. - + Error while loading ROM! %1 %1 signifies a numeric error code. ROM 불러오는 중 오류 발생! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>파일들을 다시 덤프하기 위해<a href='https://yuzu-emu.org/help/quickstart/'>yuzu 빠른 시작 가이드</a> 를 따라주세요.<br>도움이 필요할 시 yuzu 위키</a> 를 참고하거나 yuzu 디스코드</a> 를 이용해보세요. - + An unknown error occurred. Please see the log for more details. 알 수 없는 오류가 발생했습니다. 자세한 내용은 로그를 참고하십시오. - + (64-bit) (64비트) - + (32-bit) (32비트) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... 소프트웨어를 닫는 중... - + Save Data 세이브 데이터 - + Mod Data 모드 데이터 - + Error Opening %1 Folder %1 폴더 열기 오류 - - + + Folder does not exist! 폴더가 존재하지 않습니다! - + Error Opening Transferable Shader Cache 전송 가능한 셰이더 캐시 열기 오류 - + Failed to create the shader cache directory for this title. 이 타이틀에 대한 셰이더 캐시 디렉토리를 생성하지 못했습니다. - + Error Removing Contents 콘텐츠 제거 중 오류 발생 - + Error Removing Update 업데이트 제거 오류 - + Error Removing DLC DLC 제거 오류 - + Remove Installed Game Contents? 설치된 게임 콘텐츠를 제거하겠습니까? - + Remove Installed Game Update? 설치된 게임 업데이트를 제거하겠습니까? - + Remove Installed Game DLC? 설치된 게임 DLC를 제거하겠습니까? - + Remove Entry 항목 제거 - - - - - - + + + + + + Successfully Removed 삭제 완료 - + Successfully removed the installed base game. 설치된 기본 게임을 성공적으로 제거했습니다. - + The base game is not installed in the NAND and cannot be removed. 기본 게임은 NAND에 설치되어 있지 않으며 제거 할 수 없습니다. - + Successfully removed the installed update. 설치된 업데이트를 성공적으로 제거했습니다. - + There is no update installed for this title. 이 타이틀에 대해 설치된 업데이트가 없습니다. - + There are no DLC installed for this title. 이 타이틀에 설치된 DLC가 없습니다. - + Successfully removed %1 installed DLC. 설치된 %1 DLC를 성공적으로 제거했습니다. - + Delete OpenGL Transferable Shader Cache? OpenGL 전송 가능한 셰이더 캐시를 삭제하시겠습니까? - + Delete Vulkan Transferable Shader Cache? Vulkan 전송 가능한 셰이더 캐시를 삭제하시겠습니까? - + Delete All Transferable Shader Caches? 모든 전송 가능한 셰이더 캐시를 삭제하시겠습니까? - + Remove Custom Game Configuration? 사용자 지정 게임 구성을 제거 하시겠습니까? - + Remove File 파일 제거 - - + + Error Removing Transferable Shader Cache 전송 가능한 셰이더 캐시 제거 오류 - - + + A shader cache for this title does not exist. 이 타이틀에 대한 셰이더 캐시가 존재하지 않습니다. - + Successfully removed the transferable shader cache. 전송 가능한 셰이더 캐시를 성공적으로 제거했습니다. - + Failed to remove the transferable shader cache. 전송 가능한 셰이더 캐시를 제거하지 못했습니다. - + Error Removing Vulkan Driver Pipeline Cache Vulkan 드라이버 파이프라인 캐시 제거 오류 - + Failed to remove the driver pipeline cache. 드라이버 파이프라인 캐시를 제거하지 못했습니다. - - + + Error Removing Transferable Shader Caches 전송 가능한 셰이더 캐시 제거 오류 - + Successfully removed the transferable shader caches. 전송 가능한 셰이더 캐시를 성공적으로 제거했습니다. - + Failed to remove the transferable shader cache directory. 전송 가능한 셰이더 캐시 디렉토리를 제거하지 못했습니다. - - + + Error Removing Custom Configuration 사용자 지정 구성 제거 오류 - + A custom configuration for this title does not exist. 이 타이틀에 대한 사용자 지정 구성이 존재하지 않습니다. - + Successfully removed the custom game configuration. 사용자 지정 게임 구성을 성공적으로 제거했습니다. - + Failed to remove the custom game configuration. 사용자 지정 게임 구성을 제거하지 못했습니다. - - + + RomFS Extraction Failed! RomFS 추출 실패! - + There was an error copying the RomFS files or the user cancelled the operation. RomFS 파일을 복사하는 중에 오류가 발생했거나 사용자가 작업을 취소했습니다. - + Full 전체 - + Skeleton 뼈대 - + Select RomFS Dump Mode RomFS 덤프 모드 선택 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. RomFS 덤프 방법을 선택하십시오.<br>전체는 모든 파일을 새 디렉토리에 복사하고<br>뼈대는 디렉토리 구조 만 생성합니다. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1에 RomFS를 추출하기에 충분한 여유 공간이 없습니다. 공간을 확보하거나 에뮬레이견 > 설정 > 시스템 > 파일시스템 > 덤프 경로에서 다른 덤프 디렉토리를 선택하십시오. - + Extracting RomFS... RomFS 추출 중... - - + + Cancel 취소 - + RomFS Extraction Succeeded! RomFS 추출이 성공했습니다! - + The operation completed successfully. 작업이 성공적으로 완료되었습니다. - - - - - + + + + + Create Shortcut 바로가기 만들기 - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? 현재 AppImage에 대한 바로 가기가 생성됩니다. 업데이트하면 제대로 작동하지 않을 수 있습니다. 계속합니까? - + Cannot create shortcut on desktop. Path "%1" does not exist. 바탕 화면에 바로가기를 만들 수 없습니다. 경로 "%1"이(가) 존재하지 않습니다. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. 애플리케이션 메뉴에서 바로가기를 만들 수 없습니다. 경로 "%1"이(가) 존재하지 않으며 생성할 수 없습니다. - + Create Icon 아이콘 만들기 - + Cannot create icon file. Path "%1" does not exist and cannot be created. 아이콘 파일을 만들 수 없습니다. 경로 "%1"이(가) 존재하지 않으며 생성할 수 없습니다. - + Start %1 with the yuzu Emulator yuzu 에뮬레이터로 %1 시작 - + Failed to create a shortcut at %1 %1에서 바로가기를 만들기 실패 - + Successfully created a shortcut to %1 %1 바로가기를 성공적으로 만듬 - + Error Opening %1 %1 열기 오류 - + Select Directory 경로 선택 - + Properties 속성 - + The game properties could not be loaded. 게임 속성을 로드 할 수 없습니다. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch 실행파일 (%1);;모든 파일 (*.*) - + Load File 파일 로드 - + Open Extracted ROM Directory 추출된 ROM 디렉토리 열기 - + Invalid Directory Selected 잘못된 디렉토리 선택 - + The directory you have selected does not contain a 'main' file. 선택한 디렉토리에 'main'파일이 없습니다. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) 설치 가능한 Switch 파일 (*.nca *.nsp *.xci);;Nintendo 컨텐츠 아카이브 (*.nca);;Nintendo 서브미션 패키지 (*.nsp);;NX 카트리지 이미지 (*.xci) - + Install Files 파일 설치 - + %n file(s) remaining %n개의 파일이 남음 - + Installing file "%1"... 파일 "%1" 설치 중... - - + + Install Results 설치 결과 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 충돌을 피하기 위해, 낸드에 베이스 게임을 설치하는 것을 권장하지 않습니다. 이 기능은 업데이트나 DLC를 설치할 때에만 사용해주세요. - + %n file(s) were newly installed %n개의 파일이 새로 설치되었습니다. - + %n file(s) were overwritten %n개의 파일을 덮어썼습니다. - + %n file(s) failed to install %n개의 파일을 설치하지 못했습니다. - + System Application 시스템 애플리케이션 - + System Archive 시스템 아카이브 - + System Application Update 시스템 애플리케이션 업데이트 - + Firmware Package (Type A) 펌웨어 패키지 (A타입) - + Firmware Package (Type B) 펌웨어 패키지 (B타입) - + Game 게임 - + Game Update 게임 업데이트 - + Game DLC 게임 DLC - + Delta Title 델타 타이틀 - + Select NCA Install Type... NCA 설치 유형 선택... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) 이 NCA를 설치할 타이틀 유형을 선택하세요: (대부분의 경우 기본값인 '게임'이 괜찮습니다.) - + Failed to Install 설치 실패 - + The title type you selected for the NCA is invalid. NCA 타이틀 유형이 유효하지 않습니다. - + File not found 파일을 찾을 수 없음 - + File "%1" not found 파일 "%1"을 찾을 수 없습니다 - + OK OK - - + + Hardware requirements not met 하드웨어 요구 사항이 충족되지 않음 - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. 시스템이 권장 하드웨어 요구 사항을 충족하지 않습니다. 호환성 보고가 비활성화되었습니다. - + Missing yuzu Account yuzu 계정 누락 - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. 게임 호환성 테스트 결과를 제출하려면 yuzu 계정을 연결해야합니다.<br><br/>yuzu 계정을 연결하려면 에뮬레이션 &gt; 설정 &gt; 웹으로 가세요. - + Error opening URL URL 열기 오류 - + Unable to open the URL "%1". URL "%1"을 열 수 없습니다. - + TAS Recording TAS 레코딩 - + Overwrite file of player 1? 플레이어 1의 파일을 덮어쓰시겠습니까? - + Invalid config detected 유효하지 않은 설정 감지 - + Handheld controller can't be used on docked mode. Pro controller will be selected. 휴대 모드용 컨트롤러는 거치 모드에서 사용할 수 없습니다. 프로 컨트롤러로 대신 선택됩니다. - - + + Amiibo Amiibo - - + + The current amiibo has been removed 현재 amiibo가 제거되었습니다. - + Error 오류 - - + + The current game is not looking for amiibos 현재 게임은 amiibo를 찾고 있지 않습니다 - + Amiibo File (%1);; All Files (*.*) Amiibo 파일 (%1);; 모든 파일 (*.*) - + Load Amiibo Amiibo 로드 - + Error loading Amiibo data Amiibo 데이터 로드 오류 - + The selected file is not a valid amiibo 선택한 파일은 유효한 amiibo가 아닙니다 - + The selected file is already on use 선택한 파일은 이미 사용 중입니다 - + An unknown error occurred 알수없는 오류가 발생했습니다 - + Capture Screenshot 스크린샷 캡처 - + PNG Image (*.png) PNG 이미지 (*.png) - + TAS state: Running %1/%2 TAS 상태: %1/%2 실행 중 - + TAS state: Recording %1 TAS 상태: 레코딩 %1 - + TAS state: Idle %1/%2 TAS 상태: 유휴 %1/%2 - + TAS State: Invalid TAS 상태: 유효하지 않음 - + &Stop Running 실행 중지(&S) - + &Start 시작(&S) - + Stop R&ecording 레코딩 중지(&e) - + R&ecord 레코드(&R) - + Building: %n shader(s) 빌드중: %n개 셰이더 - + Scale: %1x %1 is the resolution scaling factor 스케일: %1x - + Speed: %1% / %2% 속도: %1% / %2% - + Speed: %1% 속도: %1% - + Game: %1 FPS (Unlocked) 게임: %1 FPS (제한없음) - + Game: %1 FPS 게임: %1 FPS - + Frame: %1 ms 프레임: %1 ms - + GPU NORMAL GPU 보통 - + GPU HIGH GPU 높음 - + GPU EXTREME GPU 굉장함 - + GPU ERROR GPU 오류 - + DOCKED 거치 모드 - + HANDHELD 휴대 모드 - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST NEAREST - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA AA 없음 - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation 키 재생성 확인 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5540,37 +5515,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 자동 생성되었던 키 파일들이 삭제되고 키 생성 모듈이 다시 실행됩니다. - + Missing fuses fuses 누락 - + - Missing BOOT0 - BOOT0 누락 - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main 누락 - + - Missing PRODINFO - PRODINFO 누락 - + Derivation Components Missing 파생 구성 요소 누락 - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 암호화 키가 없습니다. <br>모든 키, 펌웨어 및 게임을 얻으려면 <a href='https://yuzu-emu.org/help/quickstart/'>yuzu 빠른 시작 가이드</a>를 따르세요.<br><br> <small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5579,39 +5554,39 @@ on your system's performance. 소요될 수 있습니다. - + Deriving Keys 파생 키 - + Select RomFS Dump Target RomFS 덤프 대상 선택 - + Please select which RomFS you would like to dump. 덤프할 RomFS를 선택하십시오. - + Are you sure you want to close yuzu? yuzu를 닫으시겠습니까? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. 에뮬레이션을 중지하시겠습니까? 모든 저장되지 않은 진행 상황은 사라집니다. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7615,28 +7590,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) 에러 코드: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. 오류가 발생했습니다. 다시 시도해 보시거나 해당 소프트웨어 개발자에게 연락하십시오. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. %2에서 %1에 대한 오류가 발생했습니다. 다시 시도해 보시거나 해당 소프트웨어 개발자에게 문의 하십시오. - + An error has occurred. %1 @@ -7660,20 +7635,81 @@ Please try again or contact the developer of the software. %2 - - Select a user: - 사용자를 선택하세요: - - - + Users 사용자 - + + Profile Creator + + + + + Profile Selector 프로필 선택 + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + 사용자를 선택하세요: + QtSoftwareKeyboardDialog @@ -7723,51 +7759,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack 콜 스택 - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - 뮤텍스 0x%1을 기다립니다 - - - - has waiters: %1 - 대기: %1 - - - - owner handle: 0x%1 - 소유자 핸들: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - 모든 개체를 기다립니다 - - - - waiting for one of the following objects - 다음 개체 중 하나를 기다리는 중입니다 - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + - + waited by no thread 스레드를 기다리고 있지 않습니다 @@ -7775,120 +7780,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable 실행 가능 - + paused 일시중지 - + sleeping 수면중 - + waiting for IPC reply IPC 회신을 기다립니다 - + waiting for objects 개체를 기다립니다 - + waiting for condition variable 조건 변수를 기다립니다 - + waiting for address arbiter 주소 결정인을 기다립니다 - + waiting for suspend resume 보류 재개를 기다리는 중 - + waiting 기다리는 중 - + initialized 초기화됨 - + terminated 종료됨 - + unknown 알 수 없음 - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal 이상적 - + core %1 코어 %1 - + processor = %1 프로세서 = %1 - - ideal core = %1 - 이상적인 코어 = %1 - - - + affinity mask = %1 선호도 마스크 = %1 - + thread id = %1 스레드 아이디 = %1 - + priority = %1(current) / %2(normal) 우선순위 = %1(현재) / %2(일반) - + last running ticks = %1 마지막 실행 틱 = %1 - - - not waiting for mutex - 뮤텍스를 기다리지 않음 - WaitTreeThreadList - + waited by thread 스레드에서 기다림 @@ -7896,7 +7891,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree 대기 트리(&W) diff --git a/dist/languages/nb.ts b/dist/languages/nb.ts index 36d8cc356..5aec4a1cc 100644 --- a/dist/languages/nb.ts +++ b/dist/languages/nb.ts @@ -372,36 +372,61 @@ This would ban both their forum username and their IP address. - Output Device + Output Device: - Input Device - Inndataenhet + Input Device: + - + + Sound Output Mode: + + + + + Mono + Mono + + + + Stereo + Stereo + + + + Surround + Surround + + + Use global volume Bruk globalt volum - + Set volume: Sett volum: - + Volume: Volum: - + 0 % 0 % - + + Mute audio when in background + Demp lyden når yuzu kjører i bakgrunnen + + + %1% Volume percentage (e.g. 50%) %1% @@ -1350,26 +1375,21 @@ This would ban both their forum username and their IP address. - Mute audio when in background - Demp lyden når yuzu kjører i bakgrunnen - - - Hide mouse on inactivity Gjem mus under inaktivitet - + Reset All Settings Tilbakestill alle innstillinger - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Dette tilbakestiller alle innstillinger og fjerner alle spillinnstillinger. Spillmapper, profiler og inndataprofiler blir ikke slettet. Fortsett? @@ -3802,60 +3822,15 @@ UUID: %2 - - Mono - Mono - - - - Stereo - Stereo - - - - Surround - Surround - - - - Console ID: - Konsoll-ID: - - - - Sound output mode - Lydutgangsmodus - - - - Regenerate - Regenerer - - - + System settings are available only when game is not running. Systeminnstillinger er bare tilgjengelige når ingen spill kjører. - + Warning: "%1" is not a valid language for region "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Dette vil erstatte din nåværende virtuelle Switch med en ny en. Din nåværende virtuelle Switch vil ikke kunne bli gjenopprettet. Dette kan ha uventede effekter i spill. Dette kan feile om du bruker en utdatert lagret-spill konfigurasjon. Fortsette? - - - - Warning - Advarsel - - - - Console ID: 0x%1 - Konsoll-ID: 0x%1 - ConfigureTas @@ -4543,553 +4518,553 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonym data blir samlet inn</a>for å hjelpe til med å forbedre yuzu.<br/><br/>Vil du dele din bruksdata med oss? - + Telemetry Telemetri - + Broken Vulkan Installation Detected - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... Laster web-applet... - - + + Disable Web Applet Slå av web-applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Antall shader-e som bygges for øyeblikket - + The current selected resolution scaling multiplier. Den valgte oppløsningsskaleringsfaktoren. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Nåværende emuleringshastighet. Verdier høyere eller lavere en 100% indikerer at emuleringen kjører raskere eller tregere enn en Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Hvor mange bilder per sekund spiller viser. Dette vil variere fra spill til spill og scene til scene. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tid det tar for å emulere et Switch bilde. Teller ikke med bildebegrensing eller v-sync. For full-hastighet emulering burde dette være 16.67 ms. på det høyeste. - + &Clear Recent Files - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue - + &Pause &Paus - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping Et spill kjører i yuzu - + Warning Outdated Game Format Advarsel: Utdatert Spillformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Du bruker en dekonstruert ROM-mappe for dette spillet, som er et utdatert format som har blitt erstattet av andre formater som NCA, NAX, XCI, eller NSP. Dekonstruerte ROM-mapper mangler ikoner, metadata, og oppdateringsstøtte.<br><br>For en forklaring på diverse Switch-formater som yuzu støtter,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>sjekk vår wiki</a>. Denne meldingen vil ikke bli vist igjen. - - + + Error while loading ROM! Feil under innlasting av ROM! - + The ROM format is not supported. Dette ROM-formatet er ikke støttet. - + An error occurred initializing the video core. En feil oppstod under initialisering av videokjernen. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu har oppdaget en feil under kjøring av videokjernen. Dette er vanligvis forårsaket av utdaterte GPU-drivere, inkludert for integrert grafikk. Vennligst sjekk loggen for flere detaljer. For mer informasjon om å finne loggen, besøk følgende side: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Uploadd the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Feil under lasting av ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. En ukjent feil oppstod. Se loggen for flere detaljer. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Lagre Data - + Mod Data Mod Data - + Error Opening %1 Folder Feil Under Åpning av %1 Mappen - - + + Folder does not exist! Mappen eksisterer ikke! - + Error Opening Transferable Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Fjern oppføring - - - - - - + + + + + + Successfully Removed Fjerning lykkes - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. Grunnspillet er ikke installert i NAND og kan ikke bli fjernet. - + Successfully removed the installed update. Fjernet vellykket den installerte oppdateringen. - + There is no update installed for this title. Det er ingen oppdatering installert for denne tittelen. - + There are no DLC installed for this title. Det er ingen DLC installert for denne tittelen. - + Successfully removed %1 installed DLC. Fjernet vellykket %1 installerte DLC-er. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? Fjern Tilpasset Spillkonfigurasjon? - + Remove File Fjern Fil - - + + Error Removing Transferable Shader Cache Feil under fjerning av overførbar shader cache - - + + A shader cache for this title does not exist. - + Successfully removed the transferable shader cache. Lykkes i å fjerne den overførbare shader cachen. - + Failed to remove the transferable shader cache. Feil under fjerning av den overførbare shader cachen. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Feil Under Fjerning Av Tilpasset Konfigurasjon - + A custom configuration for this title does not exist. En tilpasset konfigurasjon for denne tittelen finnes ikke. - + Successfully removed the custom game configuration. Fjernet vellykket den tilpassede spillkonfigurasjonen. - + Failed to remove the custom game configuration. Feil under fjerning av den tilpassede spillkonfigurasjonen. - - + + RomFS Extraction Failed! Utvinning av RomFS Feilet! - + There was an error copying the RomFS files or the user cancelled the operation. Det oppstod en feil under kopiering av RomFS filene eller så kansellerte brukeren operasjonen. - + Full Fullstendig - + Skeleton Skjelett - + Select RomFS Dump Mode Velg RomFS Dump Modus - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Velg hvordan du vil dumpe RomFS.<br>Fullstendig vil kopiere alle filene til en ny mappe mens <br>skjelett vil bare skape mappestrukturen. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Utvinner RomFS... - - + + Cancel Avbryt - + RomFS Extraction Succeeded! RomFS Utpakking lyktes! - + The operation completed successfully. Operasjonen fullført vellykket. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Feil ved åpning av %1 - + Select Directory Velg Mappe - + Properties Egenskaper - + The game properties could not be loaded. Spillets egenskaper kunne ikke bli lastet inn. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Kjørbar Fil (%1);;Alle Filer (*.*) - + Load File Last inn Fil - + Open Extracted ROM Directory Åpne Utpakket ROM Mappe - + Invalid Directory Selected Ugyldig Mappe Valgt - + The directory you have selected does not contain a 'main' file. Mappen du valgte inneholder ikke en 'main' fil. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Installerbar Switch-Fil (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xcI) - + Install Files Installer Filer - + %n file(s) remaining %n fil gjenstår%n filer gjenstår - + Installing file "%1"... Installerer fil "%1"... - - + + Install Results Insallasjonsresultater - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed %n fil ble nylig installert @@ -5097,7 +5072,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) were overwritten %n fil ble overskrevet @@ -5105,7 +5080,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) failed to install %n fil ble ikke installert @@ -5113,388 +5088,388 @@ Please, only use this feature to install updates and DLC. - + System Application Systemapplikasjon - + System Archive Systemarkiv - + System Application Update Systemapplikasjonsoppdatering - + Firmware Package (Type A) Firmware Pakke (Type A) - + Firmware Package (Type B) Firmware-Pakke (Type B) - + Game Spill - + Game Update Spilloppdatering - + Game DLC Spill tilleggspakke - + Delta Title Delta Tittel - + Select NCA Install Type... Velg NCA Installasjonstype... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Vennligst velg typen tittel du vil installere denne NCA-en som: (I de fleste tilfellene, standarden 'Spill' fungerer.) - + Failed to Install Feil under Installasjon - + The title type you selected for the NCA is invalid. Titteltypen du valgte for NCA-en er ugyldig. - + File not found Fil ikke funnet - + File "%1" not found Filen "%1" ikke funnet - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Mangler yuzu Bruker - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. For å sende inn et testtilfelle for spillkompatibilitet, må du linke yuzu-brukeren din.<br><br/>For å linke yuzu-brukeren din, gå til Emulasjon &gt; Konfigurasjon &gt; Nett. - + Error opening URL Feil under åpning av URL - + Unable to open the URL "%1". Kunne ikke åpne URL "%1". - + TAS Recording TAS-innspilling - + Overwrite file of player 1? Overskriv filen til spiller 1? - + Invalid config detected Ugyldig konfigurasjon oppdaget - + Handheld controller can't be used on docked mode. Pro controller will be selected. Håndholdt kontroller kan ikke brukes i dokket modus. Pro-kontroller vil bli valgt. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Den valgte amiibo-en har blitt fjernet - + Error Feil - - + + The current game is not looking for amiibos Det kjørende spillet sjekker ikke for amiibo-er - + Amiibo File (%1);; All Files (*.*) Amiibo-Fil (%1);; Alle Filer (*.*) - + Load Amiibo Last inn Amiibo - + Error loading Amiibo data Feil ved lasting av Amiibo data - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Ta Skjermbilde - + PNG Image (*.png) PNG Bilde (*.png) - + TAS state: Running %1/%2 TAS-tilstand: Kjører %1/%2 - + TAS state: Recording %1 TAS-tilstand: Spiller inn %1 - + TAS state: Idle %1/%2 TAS-tilstand: Venter %1%2 - + TAS State: Invalid TAS-tilstand: Ugyldig - + &Stop Running &Stopp kjøring - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) Bygger: %n shaderBygger: %n shader-e - + Scale: %1x %1 is the resolution scaling factor Skala: %1x - + Speed: %1% / %2% Hastighet: %1% / %2% - + Speed: %1% Hastighet: %1% - + Game: %1 FPS (Unlocked) Spill: %1 FPS (ubegrenset) - + Game: %1 FPS Spill: %1 FPS - + Frame: %1 ms Ramme: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HØY - + GPU EXTREME GPU EKSTREM - + GPU ERROR GPU FEIL - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST NÆRMESTE - - + + BILINEAR BILINEÆR - + BICUBIC BIKUBISK - + GAUSSIAN GAUSSISK - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA INGEN AA - + FXAA FXAA - + SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation Bekreft Nøkkel-Redirevasjon - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5511,37 +5486,37 @@ og eventuelt lag backups. Dette vil slette dine autogenererte nøkkel-filer og kjøre nøkkel-derivasjonsmodulen på nytt. - + Missing fuses Mangler fuses - + - Missing BOOT0 - Mangler BOOT0 - + - Missing BCPKG2-1-Normal-Main - Mangler BCPKG2-1-Normal-Main - + - Missing PRODINFO - Mangler PRODINFO - + Derivation Components Missing Derivasjonskomponenter Mangler - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Krypteringsnøkler mangler. <br>Vennligst følg <a href='https://yuzu-emu.org/help/quickstart/'>yuzus oppstartsguide</a> for å få alle nøklene, fastvaren og spillene dine.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5550,39 +5525,39 @@ Dette kan ta opp til et minutt avhengig av systemytelsen din. - + Deriving Keys Deriverer Nøkler - + Select RomFS Dump Target Velg RomFS Dump-Mål - + Please select which RomFS you would like to dump. Vennligst velg hvilken RomFS du vil dumpe. - + Are you sure you want to close yuzu? Er du sikker på at du vil lukke yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Er du sikker på at du vil stoppe emulasjonen? All ulagret fremgang vil bli tapt. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7581,27 +7556,27 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) Feilkode: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. En feil har oppstått. Vennligst prøv igjen eller kontakt programmets utvikler. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. - + An error has occurred. %1 @@ -7625,20 +7600,81 @@ Please try again or contact the developer of the software. %2 - - Select a user: - Velg en bruker: - - - + Users Brukere - + + Profile Creator + + + + + Profile Selector Profilvelger + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Velg en bruker: + QtSoftwareKeyboardDialog @@ -7688,51 +7724,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - - - - - has waiters: %1 - - - - - owner handle: 0x%1 - - - - - WaitTreeObjectList - - - waiting for all objects - venter på alle objekter - - - - waiting for one of the following objects - venter på ett av de følgende objektene - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + - + waited by no thread @@ -7740,120 +7745,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable - + paused pauset - + sleeping sover - + waiting for IPC reply venter på IPC-svar - + waiting for objects venter på objekter - + waiting for condition variable - + waiting for address arbiter - + waiting for suspend resume - + waiting venter - + initialized - + terminated - + unknown ukjent - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal ideell - + core %1 kjerne %1 - + processor = %1 prosessor = %1 - - ideal core = %1 - ideell Kjerne = %1 - - - + affinity mask = %1 - + thread id = %1 tråd id = %1 - + priority = %1(current) / %2(normal) prioritet = %1(nåværende) / %2(normal) - + last running ticks = %1 - - - not waiting for mutex - - WaitTreeThreadList - + waited by thread @@ -7861,7 +7856,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree diff --git a/dist/languages/nl.ts b/dist/languages/nl.ts index ae8f14661..074742e39 100644 --- a/dist/languages/nl.ts +++ b/dist/languages/nl.ts @@ -372,36 +372,61 @@ This would ban both their forum username and their IP address. - Output Device + Output Device: - Input Device - Invoer Apparaat + Input Device: + - + + Sound Output Mode: + + + + + Mono + Mono + + + + Stereo + Stereo + + + + Surround + Surround + + + Use global volume Gebruik globaal volume - + Set volume: stel volume in: - + Volume: Volume: - + 0 % 0 % - + + Mute audio when in background + + + + %1% Volume percentage (e.g. 50%) %1% @@ -1348,26 +1373,21 @@ This would ban both their forum username and their IP address. - Mute audio when in background - - - - Hide mouse on inactivity Verstop muis wanneer inactief - + Reset All Settings Reset alle instellingen - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Hiermee worden alle instellingen gereset en alle configuraties per game verwijderd. Hiermee worden gamedirectory's, profielen of invoerprofielen niet verwijderd. Doorgaan? @@ -3800,60 +3820,15 @@ UUID: %2 - - Mono - Mono - - - - Stereo - Stereo - - - - Surround - Surround - - - - Console ID: - Console ID: - - - - Sound output mode - Geluid uitvoer mode - - - - Regenerate - Herstel - - - + System settings are available only when game is not running. Systeeminstellingen zijn enkel toegankelijk wanneer er geen game draait. - + Warning: "%1" is not a valid language for region "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Dit vervangt je huidige virtuele Switch met een nieuwe. Je huidige virtuele Switch kan dan niet meer worden hersteld. Dit kan onverwachte effecten hebben in spellen. Dit werkt niet als je een oude config savegame gebruikt. Doorgaan? - - - - Warning - Waarschuwing - - - - Console ID: 0x%1 - Console ID: 0x%1 - ConfigureTas @@ -4541,952 +4516,952 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Annonieme gegevens worden verzameld</a> om yuzu te helpen verbeteren. <br/><br/> Zou je jouw gebruiksgegevens met ons willen delen? - + Telemetry Telemetrie - + Broken Vulkan Installation Detected - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... Web Applet Laden... - - + + Disable Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Huidige emulatie snelheid. Waardes hoger of lager dan 100% betekent dat de emulatie sneller of langzamer loopt dan de Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Hoeveel frames per seconde de game op dit moment weergeeft. Dit zal veranderen van game naar game en van scène naar scène. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tijd gebruikt om een frame van de Switch te emuleren, waarbij framelimiteren of v-sync niet wordt meegerekend. Voor emulatie op volledige snelheid zou dit maximaal 16.67 ms zijn. - + &Clear Recent Files - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue - + &Pause &Pauzeren - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Waarschuwing Verouderd Spel Formaat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Je gebruikt gedeconstrueerd ROM map formaat voor dit Spel, dit is een verouderd formaat en is vervangen door formaten zoals NCA, NAX, XCI of NSP. Gedeconstrueerd ROM map heeft geen iconen, metadata en update understeuning.<br><br>Voor een uitleg over welke Switch formaten yuzu ondersteund, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>kijk op onze wiki</a>. Dit bericht word niet nog een keer weergegeven. - - + + Error while loading ROM! Fout tijdens het laden van een ROM! - + The ROM format is not supported. Het formaat van de ROM is niet ondersteunt. - + An error occurred initializing the video core. Er is een fout opgetreden tijdens het initialiseren van de videokern. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Een onbekende fout heeft plaatsgevonden. Kijk in de log voor meer details. - + (64-bit) - + (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit - + Closing software... - + Save Data Save Data - + Mod Data Mod Data - + Error Opening %1 Folder Fout tijdens het openen van %1 folder - - + + Folder does not exist! Folder bestaat niet! - + Error Opening Transferable Shader Cache Fout Bij Het Openen Van Overdraagbare Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + Remove File - - + + Error Removing Transferable Shader Cache - - + + A shader cache for this title does not exist. Er bestaat geen shader cache voor deze game - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! RomFS Extractie Mislukt! - + There was an error copying the RomFS files or the user cancelled the operation. Er was een fout tijdens het kopiëren van de RomFS bestanden of de gebruiker heeft de operatie geannuleerd. - + Full Vol - + Skeleton Skelet - + Select RomFS Dump Mode Selecteer RomFS Dump Mode - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Selecteer alstublieft hoe je de RomFS wilt dumpen.<br>Volledig kopieërd alle bestanden in een map terwijl <br> skelet maakt alleen het map structuur. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... RomFS uitpakken... - - + + Cancel Annuleren - + RomFS Extraction Succeeded! RomFS Extractie Geslaagd! - + The operation completed successfully. De operatie is succesvol voltooid. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Fout bij openen %1 - + Select Directory Selecteer Map - + Properties Eigenschappen - + The game properties could not be loaded. De eigenschappen van de game kunnen niet geladen worden. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Executable (%1);;Alle bestanden (*.*) - + Load File Laad Bestand - + Open Extracted ROM Directory Open Gedecomprimeerd ROM Map - + Invalid Directory Selected Ongeldige Map Geselecteerd - + The directory you have selected does not contain a 'main' file. De map die je hebt geselecteerd bevat geen 'main' bestand. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files - + %n file(s) remaining - + Installing file "%1"... Bestand "%1" Installeren... - - + + Install Results - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systeem Applicatie - + System Archive Systeem Archief - + System Application Update Systeem Applicatie Update - + Firmware Package (Type A) Filmware Pakket (Type A) - + Firmware Package (Type B) Filmware Pakket (Type B) - + Game Game - + Game Update Game Update - + Game DLC Game DLC - + Delta Title Delta Titel - + Select NCA Install Type... Selecteer NCA Installatie Type... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Selecteer het type titel hoe je wilt dat deze NCA installeerd: (In de meeste gevallen is de standaard 'Game' juist.) - + Failed to Install Installatie Mislukt - + The title type you selected for the NCA is invalid. Het type title dat je hebt geselecteerd voor de NCA is ongeldig. - + File not found Bestand niet gevonden - + File "%1" not found Bestand "%1" niet gevonden - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Je yuzu account mist - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Om game campatibiliteit te raporteren, moet je je yuzu account koppelen.<br><br/> Om je yuzu account te koppelen, ga naar Emulatie &gt; Configuratie &gt; Web. - + Error opening URL - + Unable to open the URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo Bestand (%1);; Alle Bestanden (*.*) - + Load Amiibo Laad Amiibo - + Error loading Amiibo data Fout tijdens het laden van de Amiibo data - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Screenshot Vastleggen - + PNG Image (*.png) PNG afbeelding (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Snelheid: %1% / %2% - + Speed: %1% Snelheid: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Game: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL - + VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA - + SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation Bevestig Sleutel Herafleiding - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5503,37 +5478,37 @@ en optioneel maak backups. Dit zal je automatisch gegenereerde sleutel bestanden verwijderen en de sleutel verkrijger module opnieuw starten - + Missing fuses - + - Missing BOOT0 - + - Missing BCPKG2-1-Normal-Main - + - Missing PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5541,39 +5516,39 @@ on your system's performance. op je systeem's performatie. - + Deriving Keys Sleutels afleiden - + Select RomFS Dump Target Selecteer RomFS Dump Doel - + Please select which RomFS you would like to dump. Selecteer welke RomFS je zou willen dumpen. - + Are you sure you want to close yuzu? Weet je zeker dat je yuzu wilt sluiten? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Weet je zeker dat je de emulatie wilt stoppen? Alle onopgeslagen voortgang will verloren gaan. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7567,26 +7542,26 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. - + An error has occurred. %1 @@ -7606,20 +7581,81 @@ Please try again or contact the developer of the software. %2 - - Select a user: - Selecteer een gebruiker: - - - + Users Gebruikers - + + Profile Creator + + + + + Profile Selector Profiel keuzeschakelaar + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Selecteer een gebruiker: + QtSoftwareKeyboardDialog @@ -7665,51 +7701,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Call stack - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - wachten op mutex 0x%1 - - - - has waiters: %1 - heeft wachtende: %1 - - - - owner handle: 0x%1 - eigenaar handvat: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - wachten op alle objecten - - - - waiting for one of the following objects - wachten op een van de volgende objecten - - WaitTreeSynchronizationObject - - [%1] %2 %3 + + [%1] %2 - + waited by no thread wachtend door geen draad @@ -7717,120 +7722,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable uitvoerbaar - + paused gepauzeerd - + sleeping slapen - + waiting for IPC reply wachten op IPC antwoord - + waiting for objects wachten op objecten - + waiting for condition variable wachten op conditie variabele - + waiting for address arbiter wachten op adres arbiter - + waiting for suspend resume - + waiting aan het wachten - + initialized geinitialiseerd - + terminated beëindigd - + unknown onbekend - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal ideaal - + core %1 kern %1 - + processor = %1 processor = %1 - - ideal core = %1 - ideale kern = %1 - - - + affinity mask = %1 affiniteit masker = %1 - + thread id = %1 draad id = %1 - + priority = %1(current) / %2(normal) prioriteit = %1(huidige) / %2(normaal) - + last running ticks = %1 laatste lopende ticks = %1 - - - not waiting for mutex - Niet wachtend op mutex - WaitTreeThreadList - + waited by thread Wachtend door draad @@ -7838,7 +7833,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree diff --git a/dist/languages/pl.ts b/dist/languages/pl.ts index 05d514658..36daf71d2 100644 --- a/dist/languages/pl.ts +++ b/dist/languages/pl.ts @@ -380,36 +380,61 @@ To zbanuje jego/jej nick na forum, oraz jego/jej adres IP. - Output Device - Urządzenie Wyjściowe + Output Device: + - Input Device - Urządzenie Wejściowe + Input Device: + - + + Sound Output Mode: + + + + + Mono + Mono + + + + Stereo + Stereo + + + + Surround + Surround + + + Use global volume Użyj globalnej głośności - + Set volume: Ustaw głośność: - + Volume: Głośność: - + 0 % 0 % - + + Mute audio when in background + Wyciszaj audio gdy yuzu działa w tle + + + %1% Volume percentage (e.g. 50%) %1% @@ -1372,26 +1397,21 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d - Mute audio when in background - Wyciszaj audio gdy yuzu działa w tle - - - Hide mouse on inactivity Ukryj mysz przy braku aktywności - + Reset All Settings Resetuj wszystkie ustawienia - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Spowoduje to zresetowanie wszystkich ustawień i usunięcie wszystkich konfiguracji gier. Nie spowoduje to usunięcia katalogów gier, profili ani profili wejściowych. Kontynuować? @@ -3826,60 +3846,15 @@ UUID: %2 Nazwa urządzenia - - Mono - Mono - - - - Stereo - Stereo - - - - Surround - Surround - - - - Console ID: - Indentyfikator konsoli: - - - - Sound output mode - Tryb wyjścia dźwięku - - - - Regenerate - Wygeneruj ponownie - - - + System settings are available only when game is not running. Ustawienia systemu są dostępne tylko wtedy, gdy gra nie jest uruchomiona. - + Warning: "%1" is not a valid language for region "%2" Uwaga: "%1" nie jest poprawnym językiem dla regionu "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - To zamieni twojego obecnego Switch'a z nowym. Twojego obecnego Switch'a nie będzie można przywrócić. To może wywołać nieoczekiwane problemy w grach. To może nie zadziałać, jeśli używasz nieaktualnej konfiguracji zapisu gry. Kontynuować? - - - - Warning - Ostrzeżenie - - - - Console ID: 0x%1 - Identyfikator konsoli: 0x%1 - ConfigureTas @@ -4567,556 +4542,556 @@ Przeciągnij punkty, aby zmienić pozycję, lub kliknij dwukrotnie komórki tabe GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Dane anonimowe są gromadzone</a> aby ulepszyć yuzu. <br/><br/>Czy chcesz udostępnić nam swoje dane o użytkowaniu? - + Telemetry Telemetria - + Broken Vulkan Installation Detected Wykryto uszkodzoną instalację Vulkana - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. Inicjalizacja Vulkana nie powiodła się podczas uruchamiania.<br><br>Kliknij<a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>tutaj aby uzyskać instrukcje dotyczące rozwiązania tego problemu</a>. - + Loading Web Applet... Ładowanie apletu internetowego... - - + + Disable Web Applet Wyłącz Aplet internetowy - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Wyłączanie web appletu może doprowadzić do nieokreślonych zachowań - wyłączyć applet należy jedynie grając w Super Mario 3D All-Stars. Na pewno chcesz wyłączyć web applet? (Można go ponownie włączyć w ustawieniach debug.) - + The amount of shaders currently being built Ilość budowanych shaderów - + The current selected resolution scaling multiplier. Obecnie wybrany mnożnik rozdzielczości. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Aktualna prędkość emulacji. Wartości większe lub niższe niż 100% wskazują, że emulacja działa szybciej lub wolniej niż Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Ile klatek na sekundę gra aktualnie wyświetla. To będzie się różnić w zależności od gry, od sceny do sceny. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Czas potrzebny do emulacji klatki na sekundę Switcha, nie licząc ograniczania klatek ani v-sync. Dla emulacji pełnej szybkości powinno to wynosić co najwyżej 16,67 ms. - + &Clear Recent Files &Usuń Ostatnie pliki - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Kontynuuj - + &Pause &Pauza - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu jest w trakcie gry - + Warning Outdated Game Format OSTRZEŻENIE! Nieaktualny format gry - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Używasz zdekonstruowanego formatu katalogu ROM dla tej gry, który jest przestarzałym formatem, który został zastąpiony przez inne, takie jak NCA, NAX, XCI lub NSP. W zdekonstruowanych katalogach ROM brakuje ikon, metadanych i obsługi aktualizacji.<br><br> Aby znaleźć wyjaśnienie różnych formatów Switch obsługiwanych przez yuzu,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'> sprawdź nasze wiki</a>. Ta wiadomość nie pojawi się ponownie. - - + + Error while loading ROM! Błąd podczas wczytywania ROMu! - + The ROM format is not supported. Ten format ROMu nie jest wspierany. - + An error occurred initializing the video core. Wystąpił błąd podczas inicjowania rdzenia wideo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu napotkał błąd podczas uruchamiania rdzenia wideo. Jest to zwykle spowodowane przestarzałymi sterownikami GPU, w tym zintegrowanymi. Więcej szczegółów znajdziesz w pliku log. Więcej informacji na temat dostępu do log-u można znaleźć na następującej stronie: <a href='https://yuzu-emu.org/help/reference/log-files/'>Jak przesłać plik log</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Błąd podczas wczytywania ROMu! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Postępuj zgodnie z<a href='https://yuzu-emu.org/help/quickstart/'>yuzu quickstart guide</a> aby zrzucić ponownie swoje pliki.<br>Możesz odwołać się do wiki yuzu</a>lub discord yuzu </a> po pomoc. - + An unknown error occurred. Please see the log for more details. Wystąpił nieznany błąd. Więcej informacji można znaleźć w pliku log. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Zamykanie aplikacji... - + Save Data Zapis danych - + Mod Data Dane modów - + Error Opening %1 Folder Błąd podczas otwarcia folderu %1 - - + + Folder does not exist! Folder nie istnieje! - + Error Opening Transferable Shader Cache Błąd podczas otwierania przenośnej pamięci podręcznej Shaderów. - + Failed to create the shader cache directory for this title. Nie udało się stworzyć ścieżki shaderów dla tego tytułu. - + Error Removing Contents Błąd podczas usuwania zawartości - + Error Removing Update Błąd podczas usuwania aktualizacji - + Error Removing DLC Błąd podczas usuwania dodatków - + Remove Installed Game Contents? Czy usunąć zainstalowaną zawartość gry? - + Remove Installed Game Update? Czy usunąć zainstalowaną aktualizację gry? - + Remove Installed Game DLC? Czy usunąć zainstalowane dodatki gry? - + Remove Entry Usuń wpis - - - - - - + + + + + + Successfully Removed Pomyślnie usunięto - + Successfully removed the installed base game. Pomyślnie usunięto zainstalowaną grę. - + The base game is not installed in the NAND and cannot be removed. Gra nie jest zainstalowana w NAND i nie może zostać usunięta. - + Successfully removed the installed update. Pomyślnie usunięto zainstalowaną łatkę. - + There is no update installed for this title. Brak zainstalowanych łatek dla tego tytułu. - + There are no DLC installed for this title. Brak zainstalowanych DLC dla tego tytułu. - + Successfully removed %1 installed DLC. Pomyślnie usunięto %1 zainstalowane DLC. - + Delete OpenGL Transferable Shader Cache? Usunąć Transferowalne Shadery OpenGL? - + Delete Vulkan Transferable Shader Cache? Usunąć Transferowalne Shadery Vulkan? - + Delete All Transferable Shader Caches? Usunąć Wszystkie Transferowalne Shadery? - + Remove Custom Game Configuration? Usunąć niestandardową konfigurację gry? - + Remove File Usuń plik - - + + Error Removing Transferable Shader Cache Błąd podczas usuwania przenośnej pamięci podręcznej Shaderów. - - + + A shader cache for this title does not exist. Pamięć podręczna Shaderów dla tego tytułu nie istnieje. - + Successfully removed the transferable shader cache. Pomyślnie usunięto przenośną pamięć podręczną Shaderów. - + Failed to remove the transferable shader cache. Nie udało się usunąć przenośnej pamięci Shaderów. - + Error Removing Vulkan Driver Pipeline Cache Błąd podczas usuwania pamięci podręcznej strumienia sterownika Vulkana - + Failed to remove the driver pipeline cache. Błąd podczas usuwania pamięci podręcznej strumienia sterownika. - - + + Error Removing Transferable Shader Caches Błąd podczas usuwania Transferowalnych Shaderów - + Successfully removed the transferable shader caches. Pomyślnie usunięto transferowalne shadery. - + Failed to remove the transferable shader cache directory. Nie udało się usunąć ścieżki transferowalnych shaderów. - - + + Error Removing Custom Configuration Błąd podczas usuwania niestandardowej konfiguracji - + A custom configuration for this title does not exist. Niestandardowa konfiguracja nie istnieje dla tego tytułu. - + Successfully removed the custom game configuration. Pomyślnie usunięto niestandardową konfiguracje gry. - + Failed to remove the custom game configuration. Nie udało się usunąć niestandardowej konfiguracji gry. - - + + RomFS Extraction Failed! Wypakowanie RomFS nieudane! - + There was an error copying the RomFS files or the user cancelled the operation. Wystąpił błąd podczas kopiowania plików RomFS lub użytkownik anulował operację. - + Full Pełny - + Skeleton Szkielet - + Select RomFS Dump Mode Wybierz tryb zrzutu RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Proszę wybrać w jaki sposób chcesz, aby zrzut pliku RomFS został wykonany. <br>Pełna kopia ze wszystkimi plikami do nowego folderu, gdy <br>skielet utworzy tylko strukturę folderu. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Nie ma wystarczająco miejsca w %1 aby wyodrębnić RomFS. Zwolnij trochę miejsca, albo zmień ścieżkę zrzutu RomFs w Emulacja> Konfiguruj> System> System Plików> Źródło Zrzutu - + Extracting RomFS... Wypakowywanie RomFS... - - + + Cancel Anuluj - + RomFS Extraction Succeeded! Wypakowanie RomFS zakończone pomyślnie! - + The operation completed successfully. Operacja zakończona sukcesem. - - - - - + + + + + Create Shortcut Utwórz skrót - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Utworzy to skrót do obecnego AppImage. Może nie działać dobrze po aktualizacji. Kontynuować? - + Cannot create shortcut on desktop. Path "%1" does not exist. Nie można utworzyć skrótu na pulpicie. Ścieżka "%1" nie istnieje. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Nie można utworzyć skrótu w menu aplikacji. Ścieżka "%1" nie istnieje oraz nie może być utworzona. - + Create Icon Utwórz ikonę - + Cannot create icon file. Path "%1" does not exist and cannot be created. Nie można utworzyć pliku ikony. Ścieżka "%1" nie istnieje oraz nie może być utworzona. - + Start %1 with the yuzu Emulator Włącz %1 z emulatorem yuzu - + Failed to create a shortcut at %1 Nie udało się utworzyć skrótu pod %1 - + Successfully created a shortcut to %1 Pomyślnie utworzono skrót do %1 - + Error Opening %1 Błąd podczas otwierania %1 - + Select Directory Wybierz folder... - + Properties Właściwości - + The game properties could not be loaded. Właściwości tej gry nie mogły zostać załadowane. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Plik wykonywalny Switcha (%1);;Wszystkie pliki (*.*) - + Load File Załaduj plik... - + Open Extracted ROM Directory Otwórz folder wypakowanego ROMu - + Invalid Directory Selected Wybrano niewłaściwy folder - + The directory you have selected does not contain a 'main' file. Folder wybrany przez ciebie nie zawiera 'głownego' pliku. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Instalacyjne pliki Switch'a (*.nca *.nsp *.xci);;Archiwum zawartości Nintendo (*.nca);;Pakiet poddany Nintendo (*.nsp);;Obraz z kartridża NX (*.xci) - + Install Files Zainstaluj pliki - + %n file(s) remaining 1 plik został%n plików zostało%n plików zostało%n plików zostało - + Installing file "%1"... Instalowanie pliku "%1"... - - + + Install Results Wynik instalacji - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Aby uniknąć ewentualnych konfliktów, odradzamy użytkownikom instalowanie gier na NAND. Proszę, używaj tej funkcji tylko do instalowania łatek i DLC. - + %n file(s) were newly installed 1 nowy plik został zainstalowany @@ -5126,400 +5101,400 @@ Proszę, używaj tej funkcji tylko do instalowania łatek i DLC. - + %n file(s) were overwritten 1 plik został nadpisany%n plików zostało nadpisane%n plików zostało nadpisane%n plików zostało nadpisane - + %n file(s) failed to install 1 pliku nie udało się zainstalować%n plików nie udało się zainstalować%n plików nie udało się zainstalować%n plików nie udało się zainstalować - + System Application Aplikacja systemowa - + System Archive Archiwum systemu - + System Application Update Aktualizacja aplikacji systemowej - + Firmware Package (Type A) Paczka systemowa (Typ A) - + Firmware Package (Type B) Paczka systemowa (Typ B) - + Game Gra - + Game Update Aktualizacja gry - + Game DLC Dodatek do gry - + Delta Title Tytuł Delta - + Select NCA Install Type... Wybierz typ instalacji NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Wybierz typ tytułu, do którego chcesz zainstalować ten NCA, jako: (W większości przypadków domyślna "gra" jest w porządku.) - + Failed to Install Instalacja nieudana - + The title type you selected for the NCA is invalid. Typ tytułu wybrany dla NCA jest nieprawidłowy. - + File not found Nie znaleziono pliku - + File "%1" not found Nie znaleziono pliku "%1" - + OK OK - - + + Hardware requirements not met Wymagania sprzętowe nie są spełnione - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Twój system nie spełnia rekomendowanych wymagań sprzętowych. Raportowanie kompatybilności zostało wyłączone. - + Missing yuzu Account Brakuje konta Yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Aby przesłać test zgodności gry, musisz połączyć swoje konto yuzu.<br><br/> Aby połączyć swoje konto yuzu, przejdź do opcji Emulacja &gt; Konfiguracja &gt; Sieć. - + Error opening URL Błąd otwierania adresu URL - + Unable to open the URL "%1". Nie można otworzyć adresu URL "%1". - + TAS Recording Nagrywanie TAS - + Overwrite file of player 1? Nadpisać plik gracza 1? - + Invalid config detected Wykryto nieprawidłową konfigurację - + Handheld controller can't be used on docked mode. Pro controller will be selected. Nie można używać kontrolera handheld w trybie zadokowanym. Zostanie wybrany kontroler Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Amiibo zostało "zdjęte" - + Error Błąd - - + + The current game is not looking for amiibos Ta gra nie szuka amiibo - + Amiibo File (%1);; All Files (*.*) Plik Amiibo (%1);;Wszyskie pliki (*.*) - + Load Amiibo Załaduj Amiibo - + Error loading Amiibo data Błąd podczas ładowania pliku danych Amiibo - + The selected file is not a valid amiibo Wybrany plik nie jest poprawnym amiibo - + The selected file is already on use Wybrany plik jest już w użyciu - + An unknown error occurred Wystąpił nieznany błąd - + Capture Screenshot Zrób zrzut ekranu - + PNG Image (*.png) Obrazek PNG (*.png) - + TAS state: Running %1/%2 Status TAS: Działa %1%2 - + TAS state: Recording %1 Status TAS: Nagrywa %1 - + TAS state: Idle %1/%2 Status TAS: Bezczynny %1%2 - + TAS State: Invalid Status TAS: Niepoprawny - + &Stop Running &Wyłącz - + &Start &Start - + Stop R&ecording Przestań N&agrywać - + R&ecord N&agraj - + Building: %n shader(s) Budowanie shaderaBudowanie: %n shaderówBudowanie: %n shaderówBudowanie: %n shaderów - + Scale: %1x %1 is the resolution scaling factor Skala: %1x - + Speed: %1% / %2% Prędkość: %1% / %2% - + Speed: %1% Prędkość: %1% - + Game: %1 FPS (Unlocked) Gra: %1 FPS (Odblokowane) - + Game: %1 FPS Gra: %1 FPS - + Frame: %1 ms Klatka: %1 ms - + GPU NORMAL GPU NORMALNE - + GPU HIGH GPU WYSOKIE - + GPU EXTREME GPU EKSTREMALNE - + GPU ERROR BŁĄD GPU - + DOCKED TRYB ZADOKOWANY - + HANDHELD TRYB PRZENOŚNY - + OPENGL OPENGL - + VULKAN VULKAN - + NULL Zero - + NEAREST NAJBLIŻSZY - - + + BILINEAR BILINEARNY - + BICUBIC BIKUBICZNY - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA BEZ AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation Potwierdź ponowną aktywacje klucza - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5536,37 +5511,37 @@ i opcjonalnie tworzyć kopie zapasowe. Spowoduje to usunięcie wygenerowanych automatycznie plików kluczy i ponowne uruchomienie modułu pochodnego klucza. - + Missing fuses Brakujące bezpieczniki - + - Missing BOOT0 - Brak BOOT0 - + - Missing BCPKG2-1-Normal-Main - Brak BCPKG2-1-Normal-Main - + - Missing PRODINFO - Brak PRODINFO - + Derivation Components Missing Brak komponentów wyprowadzania - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Brakuje elementów, które mogą uniemożliwić zakończenie wyprowadzania kluczy. <br>Postępuj zgodnie z <a href='https://yuzu-emu.org/help/quickstart/'>yuzu quickstart guide</a> aby zdobyć wszystkie swoje klucze i gry.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5575,39 +5550,39 @@ Zależnie od tego może potrwać do minuty na wydajność twojego systemu. - + Deriving Keys Wyprowadzanie kluczy... - + Select RomFS Dump Target Wybierz cel zrzutu RomFS - + Please select which RomFS you would like to dump. Proszę wybrać RomFS, jakie chcesz zrzucić. - + Are you sure you want to close yuzu? Czy na pewno chcesz zamknąć yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Czy na pewno chcesz zatrzymać emulację? Wszystkie niezapisane postępy zostaną utracone. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7611,28 +7586,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) Kod błędu: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. Wystąpił błąd. Spróbuj ponownie lub skontaktuj się z twórcą oprogramowania. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. Wystąpił błąd w %1 o %2. Spróbuj ponownie lub skontaktuj się z twórcą oprogramowania. - + An error has occurred. %1 @@ -7656,20 +7631,81 @@ Spróbuj ponownie lub skontaktuj się z twórcą oprogramowania. %2 - - Select a user: - Wybierz użytkownika: - - - + Users Użytkownicy - + + Profile Creator + + + + + Profile Selector Wybór profilu + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Wybierz użytkownika: + QtSoftwareKeyboardDialog @@ -7719,51 +7755,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Stos wywołań - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - czekam na mutex 0x%1 - - - - has waiters: %1 - ma oczekujących: %1 - - - - owner handle: 0x%1 - uchwyt właściciela: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - czekam na wszystkie objekty - - - - waiting for one of the following objects - oczekiwanie na jeden z następujących obiektów - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + - + waited by no thread czekam bez żadnego wątku @@ -7771,120 +7776,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable Jakoś działa - + paused Spauzowana - + sleeping spanie - + waiting for IPC reply czekam na odpowiedź IPC - + waiting for objects oczekiwanie na obiekty - + waiting for condition variable oczekiwanie na zmienną warunkową - + waiting for address arbiter czekam na arbitra adresu - + waiting for suspend resume czekam na zawieszenie wznowienia - + waiting oczekiwanie - + initialized zainicjowano - + terminated zakończony - + unknown nieznany - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal Idealnie - + core %1 rdzeń %1 - + processor = %1 procesor = %1 - - ideal core = %1 - idealny rdzeń = %1 - - - + affinity mask = %1 maska powinowactwa = %1 - + thread id = %1 identyfikator wątku = %1 - + priority = %1(current) / %2(normal) piorytet = %1(obecny) / %2(normalny) - + last running ticks = %1 ostatnie działające kleszcze = %1 - - - not waiting for mutex - nie czekam na mutex - WaitTreeThreadList - + waited by thread czekanie na wątek @@ -7892,7 +7887,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree &Drzewo Czekania diff --git a/dist/languages/pt_BR.ts b/dist/languages/pt_BR.ts index 4f6b8bc54..98f1345a2 100644 --- a/dist/languages/pt_BR.ts +++ b/dist/languages/pt_BR.ts @@ -380,36 +380,61 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - Output Device - Dispositivo de Saída + Output Device: + - Input Device - Dispositivo de Entrada + Input Device: + - + + Sound Output Mode: + + + + + Mono + Mono + + + + Stereo + Estéreo + + + + Surround + Surround + + + Use global volume Usar volume global - + Set volume: Definir volume: - + Volume: Volume: - + 0 % 0 % - + + Mute audio when in background + Silenciar audio quando a janela ficar em segundo plano + + + %1% Volume percentage (e.g. 50%) %1% @@ -1378,26 +1403,21 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - Mute audio when in background - Silenciar audio quando a janela ficar em segundo plano - - - Hide mouse on inactivity Esconder cursor do mouse quando em inatividade - + Reset All Settings Redefinir todas as configurações - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Isto restaura todas as configurações e exclui as configurações individuais de todos os jogos. As pastas de jogos, perfis de jogos e perfis de controles não serão excluídos. Deseja prosseguir? @@ -1733,12 +1753,12 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. - + Habilitar decodificação assíncrona de texturas ASTC, isso pode reduzir interrupções no tempo de carga. Essa funcionalidade é experimental. Decode ASTC textures asynchronously (Hack) - + Decodificação assíncrona de texturas ASTC (Hack) @@ -3831,60 +3851,15 @@ UUID: %2 Nome do Dispositivo - - Mono - Mono - - - - Stereo - Estéreo - - - - Surround - Surround - - - - Console ID: - ID do console: - - - - Sound output mode - Modo de saída de som - - - - Regenerate - Regerar - - - + System settings are available only when game is not running. As configurações de sistema são acessíveis apenas quando não houver nenhum jogo em execução. - + Warning: "%1" is not a valid language for region "%2" Aviso: "%1" não é um idioma válido para a região "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Isto substituirá o seu Switch virtual atual por um novo. O seu Switch virtual atual não poderá ser recuperado. Isto pode causar efeitos inesperados em jogos. Isto pode falhar caso você use um jogo salvo com configurações desatualizadas registradas nele. Continuar? - - - - Warning - Aviso - - - - Console ID: 0x%1 - ID do console: 0x%1 - ConfigureTas @@ -4572,555 +4547,555 @@ Mova os pontos para mudar a posição, ou clique duas vezes nas células da tabe GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Dados anônimos são recolhidos</a> para ajudar a melhorar o yuzu. <br/><br/>Gostaria de compartilhar os seus dados de uso conosco? - + Telemetry Telemetria - + Broken Vulkan Installation Detected Detectada Instalação Defeituosa do Vulkan - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. A inicialização do Vulkan falhou durante a carga do programa. <br><br>Clique <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>aqui para instruções de como resolver o problema</a>. - + Loading Web Applet... Carregando applet web... - - + + Disable Web Applet Desativar o applet da web - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) A desativação do applet da web pode causar comportamento inesperado e deve apenas ser usada com Super Mario 3D All-Stars. Você deseja mesmo desativar o applet da web? (Ele pode ser reativado nas configurações de depuração.) - + The amount of shaders currently being built A quantidade de shaders sendo construídos - + The current selected resolution scaling multiplier. O atualmente multiplicador de escala de resolução selecionado. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Velocidade atual de emulação. Valores maiores ou menores que 100% indicam que a emulação está rodando mais rápida ou lentamente que em um Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Quantos quadros por segundo o jogo está exibindo atualmente. Isto irá variar de jogo para jogo e cena para cena. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tempo que leva para emular um quadro do Switch, sem considerar o limitador de taxa de quadros ou a sincronização vertical. Um valor menor ou igual a 16.67 ms indica que a emulação está em velocidade plena. - + &Clear Recent Files &Limpar arquivos recentes - + Emulated mouse is enabled Mouse emulado está habilitado - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. Controle de mouse real e controle panorâmico do mouse são incompatíveis. Por favor desabilite a emulação do mouse em configurações avançadas de controles para permitir o controle panorâmico do mouse. - + &Continue &Continuar - + &Pause &Pausar - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu está rodando um jogo - + Warning Outdated Game Format Aviso - formato de jogo desatualizado - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Você está usando neste jogo o formato de ROM desconstruída e extraída em uma pasta, que é um formato desatualizado que foi substituído por outros, como NCA, NAX, XCI ou NSP. Pastas desconstruídas de ROMs não possuem ícones, metadados e suporte a atualizações.<br><br>Para saber mais sobre os vários formatos de ROMs de Switch compatíveis com o yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>confira a nossa wiki</a>. Esta mensagem não será exibida novamente. - - + + Error while loading ROM! Erro ao carregar a ROM! - + The ROM format is not supported. O formato da ROM não é suportado. - + An error occurred initializing the video core. Ocorreu um erro ao inicializar o núcleo de vídeo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu encontrou um erro enquanto rodando o núcleo de vídeo. Normalmente isto é causado por drivers de GPU desatualizados, incluindo integrados. Por favor veja o registro para mais detalhes. Para mais informações em acesso ao registro por favor veja a seguinte página: <a href='https://yuzu-emu.org/help/reference/log-files/'>Como fazer envio de arquivo de registro</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Erro ao carregar a ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>o guia de início rápido</a> para reextrair os seus arquivos.<br>Você pode consultar a wiki do yuzu</a> ou o Discord do yuzu</a> para obter ajuda. - + An unknown error occurred. Please see the log for more details. Ocorreu um erro desconhecido. Consulte o registro para mais detalhes. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Encerrando software... - + Save Data Dados de jogos salvos - + Mod Data Dados de mods - + Error Opening %1 Folder Erro ao abrir a pasta %1 - - + + Folder does not exist! A pasta não existe! - + Error Opening Transferable Shader Cache Erro ao abrir o cache de shaders transferível - + Failed to create the shader cache directory for this title. Falha ao criar o diretório de cache de shaders para este título. - + Error Removing Contents Erro ao Remover Conteúdos - + Error Removing Update Erro ao Remover Atualização - + Error Removing DLC Erro ao Remover DLC - + Remove Installed Game Contents? Remover Conteúdo Instalado do Jogo? - + Remove Installed Game Update? Remover Atualização Instalada do Jogo? - + Remove Installed Game DLC? Remover DLC Instalada do Jogo? - + Remove Entry Remover item - - - - - - + + + + + + Successfully Removed Removido com sucesso - + Successfully removed the installed base game. O jogo base foi removido com sucesso. - + The base game is not installed in the NAND and cannot be removed. O jogo base não está instalado na NAND e não pode ser removido. - + Successfully removed the installed update. A atualização instalada foi removida com sucesso. - + There is no update installed for this title. Não há nenhuma atualização instalada para este título. - + There are no DLC installed for this title. Não há nenhum DLC instalado para este título. - + Successfully removed %1 installed DLC. %1 DLC(s) instalados foram removidos com sucesso. - + Delete OpenGL Transferable Shader Cache? Apagar o cache de shaders transferível do OpenGL? - + Delete Vulkan Transferable Shader Cache? Apagar o cache de shaders transferível do Vulkan? - + Delete All Transferable Shader Caches? Apagar todos os caches de shaders transferíveis? - + Remove Custom Game Configuration? Remover configurações customizadas do jogo? - + Remove File Remover arquivo - - + + Error Removing Transferable Shader Cache Erro ao remover cache de shaders transferível - - + + A shader cache for this title does not exist. Não existe um cache de shaders para este título. - + Successfully removed the transferable shader cache. O cache de shaders transferível foi removido com sucesso. - + Failed to remove the transferable shader cache. Falha ao remover o cache de shaders transferível. - + Error Removing Vulkan Driver Pipeline Cache Erro ao Remover Cache de Pipeline do Driver Vulkan - + Failed to remove the driver pipeline cache. Falha ao remover o pipeline de cache do driver. - - + + Error Removing Transferable Shader Caches Erro ao remover os caches de shaders transferíveis - + Successfully removed the transferable shader caches. Os caches de shaders transferíveis foram removidos com sucesso. - + Failed to remove the transferable shader cache directory. Falha ao remover o diretório do cache de shaders transferível. - - + + Error Removing Custom Configuration Erro ao remover as configurações customizadas do jogo. - + A custom configuration for this title does not exist. Não há uma configuração customizada para este título. - + Successfully removed the custom game configuration. As configurações customizadas do jogo foram removidas com sucesso. - + Failed to remove the custom game configuration. Falha ao remover as configurações customizadas do jogo. - - + + RomFS Extraction Failed! Falha ao extrair RomFS! - + There was an error copying the RomFS files or the user cancelled the operation. Houve um erro ao copiar os arquivos RomFS ou o usuário cancelou a operação. - + Full Extração completa - + Skeleton Apenas estrutura - + Select RomFS Dump Mode Selecione o modo de extração do RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Selecione a forma como você gostaria que o RomFS seja extraído.<br>"Extração completa" copiará todos os arquivos para a nova pasta, enquanto que <br>"Apenas estrutura" criará apenas a estrutura de pastas. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Não há espaço suficiente em %1 para extrair o RomFS. Por favor abra espaço ou selecione um diretório diferente em Emulação > Configurar > Sistema > Sistema de arquivos > Extrair raiz - + Extracting RomFS... Extraindo RomFS... - - + + Cancel Cancelar - + RomFS Extraction Succeeded! Extração do RomFS concluida! - + The operation completed successfully. A operação foi concluída com sucesso. - - - - - + + + + + Create Shortcut Criar Atalho - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Isso irá criar um atalho para o AppImage atual. Isso pode não funcionar corretamente se você fizer uma atualização. Continuar? - + Cannot create shortcut on desktop. Path "%1" does not exist. Não foi possível criar um atalho na área de trabalho. O caminho "%1" não existe. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Não foi possível criar um atalho no menu de aplicativos. O caminho "%1" não existe e não pode ser criado. - + Create Icon Criar Ícone - + Cannot create icon file. Path "%1" does not exist and cannot be created. Não foi possível criar o arquivo de ícone. O caminho "%1" não existe e não pode ser criado. - + Start %1 with the yuzu Emulator Iniciar %1 com o Emulador yuzu - + Failed to create a shortcut at %1 Falha ao criar um atalho em %1 - + Successfully created a shortcut to %1 Atalho criado com sucesso em %1 - + Error Opening %1 Erro ao abrir %1 - + Select Directory Selecionar pasta - + Properties Propriedades - + The game properties could not be loaded. As propriedades do jogo não puderam ser carregadas. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Executável do Switch (%1);;Todos os arquivos (*.*) - + Load File Carregar arquivo - + Open Extracted ROM Directory Abrir pasta da ROM extraída - + Invalid Directory Selected Pasta inválida selecionada - + The directory you have selected does not contain a 'main' file. A pasta que você selecionou não contém um arquivo 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Arquivo de Switch instalável (*.nca *.nsp *.xci);; Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Instalar arquivos - + %n file(s) remaining %n arquivo restante%n arquivo(s) restante(s)%n arquivo(s) restante(s) - + Installing file "%1"... Instalando arquivo "%1"... - - + + Install Results Resultados da instalação - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Para evitar possíveis conflitos, desencorajamos que os usuários instalem os jogos base na NAND. Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + %n file(s) were newly installed %n arquivo(s) instalado(s) @@ -5129,7 +5104,7 @@ Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + %n file(s) were overwritten %n arquivo(s) sobrescrito(s) @@ -5138,7 +5113,7 @@ Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + %n file(s) failed to install %n arquivo(s) não instalado(s) @@ -5147,388 +5122,388 @@ Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + System Application Aplicativo do sistema - + System Archive Arquivo do sistema - + System Application Update Atualização de aplicativo do sistema - + Firmware Package (Type A) Pacote de firmware (tipo A) - + Firmware Package (Type B) Pacote de firmware (tipo B) - + Game Jogo - + Game Update Atualização de jogo - + Game DLC DLC de jogo - + Delta Title Título delta - + Select NCA Install Type... Selecione o tipo de instalação do NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Selecione o tipo de título como o qual você gostaria de instalar este NCA: (Na maioria dos casos, o padrão 'Jogo' serve bem.) - + Failed to Install Falha ao instalar - + The title type you selected for the NCA is invalid. O tipo de título que você selecionou para o NCA é inválido. - + File not found Arquivo não encontrado - + File "%1" not found Arquivo "%1" não encontrado - + OK OK - - + + Hardware requirements not met Requisitos de hardware não atendidos - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Seu sistema não atende os requisitos de harwdare. O relatório de compatibilidade foi desabilitado. - + Missing yuzu Account Conta do yuzu faltando - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Para enviar um caso de teste de compatibilidade de jogo, você precisa entrar com a sua conta do yuzu.<br><br/>Para isso, vá para Emulação &gt; Configurar... &gt; Rede. - + Error opening URL Erro ao abrir URL - + Unable to open the URL "%1". Não foi possível abrir o URL "%1". - + TAS Recording Gravando TAS - + Overwrite file of player 1? Sobrescrever arquivo do jogador 1? - + Invalid config detected Configuração inválida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. O controle portátil não pode ser usado no modo encaixado na base. O Pro Controller será selecionado. - - + + Amiibo Amiibo - - + + The current amiibo has been removed O amiibo atual foi removido - + Error Erro - - + + The current game is not looking for amiibos O jogo atual não está procurando amiibos - + Amiibo File (%1);; All Files (*.*) Arquivo Amiibo (%1);; Todos os arquivos (*.*) - + Load Amiibo Carregar Amiibo - + Error loading Amiibo data Erro ao carregar dados do Amiibo - + The selected file is not a valid amiibo O arquivo selecionado não é um amiibo válido - + The selected file is already on use O arquivo selecionado já está em uso - + An unknown error occurred Ocorreu um erro desconhecido - + Capture Screenshot Capturar tela - + PNG Image (*.png) Imagem PNG (*.png) - + TAS state: Running %1/%2 Situação TAS: Rodando %1%2 - + TAS state: Recording %1 Situação TAS: Gravando %1 - + TAS state: Idle %1/%2 Situação TAS: Repouso %1%2 - + TAS State: Invalid Situação TAS: Inválido - + &Stop Running &Parar de rodar - + &Start &Iniciar - + Stop R&ecording Parar G&ravação - + R&ecord G&ravação - + Building: %n shader(s) Compilando: %n shader(s)Compilando: %n shader(s)Compilando: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escala: %1x - + Speed: %1% / %2% Velocidade: %1% / %2% - + Speed: %1% Velocidade: %1% - + Game: %1 FPS (Unlocked) Jogo: %1 FPS (Desbloqueado) - + Game: %1 FPS Jogo: %1 FPS - + Frame: %1 ms Quadro: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR ERRO DE GPU - + DOCKED ANCORADO - + HANDHELD PORTÁTIL - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULO - + NEAREST VIZINHO - - + + BILINEAR BILINEAR - + BICUBIC BICÚBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA Sem AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE VOLUME: MUDO - + VOLUME: %1% Volume percentage (e.g. 50%) VOLUME: %1% - + Confirm Key Rederivation Confirmar rederivação de chave - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5545,37 +5520,37 @@ e opcionalmente faça cópias de segurança. Isto excluirá o seus arquivos de chaves geradas automaticamente, e reexecutar o módulo de derivação de chaves. - + Missing fuses Faltando fusíveis - + - Missing BOOT0 - Faltando BOOT0 - + - Missing BCPKG2-1-Normal-Main - Faltando BCPKG2-1-Normal-Main - + - Missing PRODINFO - Faltando PRODINFO - + Derivation Components Missing Faltando componentes de derivação - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Chaves de encriptação faltando. <br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>o guia de início rápido</a> para extrair suas chaves, firmware e jogos. <br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5584,39 +5559,39 @@ Isto pode demorar até um minuto, dependendo do desempenho do seu sistema. - + Deriving Keys Derivando chaves - + Select RomFS Dump Target Selecionar alvo de extração do RomFS - + Please select which RomFS you would like to dump. Selecione qual RomFS você quer extrair. - + Are you sure you want to close yuzu? Você deseja mesmo fechar o yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Deseja mesmo parar a emulação? Qualquer progresso não salvo será perdido. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -6695,32 +6670,32 @@ Mensagem de Depuração: Unable to connect to the host. Verify that the connection settings are correct. If you still cannot connect, contact the room host and verify that the host is properly configured with the external port forwarded. - + Não foi possível conectar no host. Verifique que as configurações de conexão estão corretas. Se você ainda não conseguir conectar, entre em contato com o anfitrião da sala e verifique que o host está configurado corretamente com a porta externa redirecionada. Unable to connect to the room because it is already full. - + Não foi possível conectar na sala porque a mesma está cheia. Creating a room failed. Please retry. Restarting yuzu might be necessary. - + Erro ao criar a sala. Por favor tente novamente. Reiniciar o yuzu pode ser necessário. The host of the room has banned you. Speak with the host to unban you or try a different room. - + O anfitrião da sala baniu você. Fale com o anfitrião para que ele remova seu banimento ou tente uma sala diferente. Version mismatch! Please update to the latest version of yuzu. If the problem persists, contact the room host and ask them to update the server. - + Versão não compatível! Por favor atualize o yuzu para a última versão. Se o problema persistir entre em contato com o anfitrião da sala e peça que atualize o servidor. Incorrect password. - + Senha inválda. @@ -6730,7 +6705,7 @@ Mensagem de Depuração: Connection to room lost. Try to reconnect. - + Conexão com a sala encerrada. Tente reconectar. @@ -7617,28 +7592,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) Código de erro: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. Ocorreu um erro. Tente novamente ou entre em contato com o desenvolvedor do software. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. Ocorreu um erro em %1 até %2. Tente novamente ou entre em contato com o desenvolvedor do software. - + An error has occurred. %1 @@ -7662,20 +7637,81 @@ Tente novamente ou entre em contato com o desenvolvedor do software. - - Select a user: - Selecione um usuário: - - - + Users Usuários - + + Profile Creator + + + + + Profile Selector Seletor de perfil + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Selecione um usuário: + QtSoftwareKeyboardDialog @@ -7725,51 +7761,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Pilha de chamadas - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - esperando pelo mutex 0x%1 - - - - has waiters: %1 - possui os waiters %1 - - - - owner handle: 0x%1 - manejo de proprietário: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - esperando por todos os objetos - - - - waiting for one of the following objects - esperando por um dos seguintes objetos - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + - + waited by no thread não aguardando pelo thread @@ -7777,120 +7782,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable rodável - + paused pausado - + sleeping dormindo - + waiting for IPC reply esperando para resposta do IPC - + waiting for objects esperando por objetos - + waiting for condition variable aguardando por variável da condição - + waiting for address arbiter esperando para endereção o árbitro - + waiting for suspend resume esperando pra suspender o resumo - + waiting aguardando - + initialized inicializado - + terminated terminado - + unknown desconhecido - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal ideal - + core %1 núcleo %1 - + processor = %1 processador = %1 - - ideal core = %1 - núcleo ideal = %1 - - - + affinity mask = %1 máscara de afinidade = %1 - + thread id = %1 thread id = %1 - + priority = %1(current) / %2(normal) prioridade = %1(atual) / %2(normal) - + last running ticks = %1 últimos ticks executados = %1 - - - not waiting for mutex - não aguardando para mutex - WaitTreeThreadList - + waited by thread aguardado pelo thread @@ -7898,7 +7893,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree &Árvore de espera diff --git a/dist/languages/pt_PT.ts b/dist/languages/pt_PT.ts index 97ac0c661..293283ac9 100644 --- a/dist/languages/pt_PT.ts +++ b/dist/languages/pt_PT.ts @@ -4,7 +4,7 @@ About yuzu - Sobre Yuzu + Sobre o yuzu @@ -380,36 +380,61 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - Output Device - Dispositivo de saída + Output Device: + - Input Device - Dispositivo de Entrada + Input Device: + - + + Sound Output Mode: + + + + + Mono + Mono + + + + Stereo + Estéreo + + + + Surround + Surround + + + Use global volume Usar volume global - + Set volume: Definir volume: - + Volume: Volume: - + 0 % 0 % - + + Mute audio when in background + Silenciar audio quando a janela ficar em segundo plano + + + %1% Volume percentage (e.g. 50%) %1% @@ -1368,26 +1393,21 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - Mute audio when in background - Silenciar audio quando a janela ficar em segundo plano - - - Hide mouse on inactivity Esconder rato quando inactivo. - + Reset All Settings Restaurar todas as configurações - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Isto restaura todas as configurações e remove as configurações específicas de cada jogo. As pastas de jogos, perfis de jogos e perfis de controlo não serão removidos. Continuar? @@ -1723,12 +1743,12 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. - + Habilitar decodificação assíncrona de texturas ASTC, isso pode reduzir interrupções no tempo de carga. Essa funcionalidade é experimental. Decode ASTC textures asynchronously (Hack) - + Decodificação assíncrona de texturas ASTC (Hack) @@ -3821,60 +3841,15 @@ UUID: %2 Nome do Dispositivo - - Mono - Mono - - - - Stereo - Estéreo - - - - Surround - Surround - - - - Console ID: - ID da consola: - - - - Sound output mode - Modo de saída de som - - - - Regenerate - Regenerar - - - + System settings are available only when game is not running. As configurações do sistema estão disponíveis apenas quando o jogo não está em execução. - + Warning: "%1" is not a valid language for region "%2" Aviso: "%1" não é um idioma válido para a região "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Isto substituirá o seu Switch virtual actual por um novo. Seu Switch virtual actual não será recuperável. Isso pode ter efeitos inesperados nos jogos. Isto pode falhar, se você usar uma gravação de jogo de configuração desatualizado. Continuar? - - - - Warning - Aviso - - - - Console ID: 0x%1 - ID da Consola: 0x%1 - ConfigureTas @@ -4562,954 +4537,954 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Dados anônimos são coletados</a>para ajudar a melhorar o yuzu.<br/><br/>Gostaria de compartilhar seus dados de uso conosco? - + Telemetry Telemetria - + Broken Vulkan Installation Detected Detectada Instalação Defeituosa do Vulkan - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. A inicialização do Vulkan falhou durante a carga do programa. <br><br>Clique <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>aqui para instruções de como resolver o problema</a>. - + Loading Web Applet... A Carregar o Web Applet ... - - + + Disable Web Applet Desativar Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) A desativação do applet da web pode causar comportamento inesperado e deve apenas ser usada com Super Mario 3D All-Stars. Você deseja mesmo desativar o applet da web? (Ele pode ser reativado nas configurações de depuração.) - + The amount of shaders currently being built Quantidade de shaders a serem construídos - + The current selected resolution scaling multiplier. O atualmente multiplicador de escala de resolução selecionado. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Velocidade da emulação actual. Valores acima ou abaixo de 100% indicam que a emulação está sendo executada mais depressa ou mais devagar do que a Switch - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Quantos quadros por segundo o jogo está exibindo de momento. Isto irá variar de jogo para jogo e de cena para cena. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tempo gasto para emular um frame da Switch, sem contar o a limitação de quadros ou o v-sync. Para emulação de velocidade máxima, esta deve ser no máximo 16.67 ms. - + &Clear Recent Files &Limpar arquivos recentes - + Emulated mouse is enabled Mouse emulado está habilitado - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. Controle de mouse real e controle panorâmico do mouse são incompatíveis. Por favor desabilite a emulação do mouse em configurações avançadas de controles para permitir o controle panorâmico do mouse. - + &Continue &Continuar - + &Pause &Pausa - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu está rodando um jogo - + Warning Outdated Game Format Aviso de Formato de Jogo Desactualizado - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Você está usando o formato de directório ROM desconstruído para este jogo, que é um formato desactualizado que foi substituído por outros, como NCA, NAX, XCI ou NSP. Os directórios de ROM não construídos não possuem ícones, metadados e suporte de actualização.<br><br>Para uma explicação dos vários formatos de Switch que o yuzu suporta,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Verifique a nossa Wiki</a>. Esta mensagem não será mostrada novamente. - - + + Error while loading ROM! Erro ao carregar o ROM! - + The ROM format is not supported. O formato do ROM não é suportado. - + An error occurred initializing the video core. Ocorreu um erro ao inicializar o núcleo do vídeo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu encontrou um erro enquanto rodando o núcleo de vídeo. Normalmente isto é causado por drivers de GPU desatualizados, incluindo integrados. Por favor veja o registro para mais detalhes. Para mais informações em acesso ao registro por favor veja a seguinte página: <a href='https://yuzu-emu.org/help/reference/log-files/'>Como fazer envio de arquivo de registro</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Erro ao carregar a ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>a guia de início rápido do yuzu</a> para fazer o redespejo dos seus arquivos.<br>Você pode consultar a wiki do yuzu</a> ou o Discord do yuzu</a> para obter ajuda. - + An unknown error occurred. Please see the log for more details. Ocorreu um erro desconhecido. Por favor, veja o log para mais detalhes. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Encerrando software... - + Save Data Save Data - + Mod Data Mod Data - + Error Opening %1 Folder Erro ao abrir a pasta %1 - - + + Folder does not exist! A Pasta não existe! - + Error Opening Transferable Shader Cache Erro ao abrir os Shader Cache transferíveis - + Failed to create the shader cache directory for this title. Falha ao criar o diretório de cache de shaders para este título. - + Error Removing Contents Erro Removendo Conteúdos - + Error Removing Update Erro ao Remover Atualização - + Error Removing DLC Erro Removendo DLC - + Remove Installed Game Contents? Remover Conteúdo Instalado do Jogo? - + Remove Installed Game Update? Remover Atualização Instalada do Jogo? - + Remove Installed Game DLC? Remover DLC Instalada do Jogo? - + Remove Entry Remover Entrada - - - - - - + + + + + + Successfully Removed Removido com Sucesso - + Successfully removed the installed base game. Removida a instalação do jogo base com sucesso. - + The base game is not installed in the NAND and cannot be removed. O jogo base não está instalado no NAND e não pode ser removido. - + Successfully removed the installed update. Removida a actualização instalada com sucesso. - + There is no update installed for this title. Não há actualização instalada neste título. - + There are no DLC installed for this title. Não há DLC instalado neste título. - + Successfully removed %1 installed DLC. Removido DLC instalado %1 com sucesso. - + Delete OpenGL Transferable Shader Cache? Apagar o cache de shaders transferível do OpenGL? - + Delete Vulkan Transferable Shader Cache? Apagar o cache de shaders transferível do Vulkan? - + Delete All Transferable Shader Caches? Apagar todos os caches de shaders transferíveis? - + Remove Custom Game Configuration? Remover Configuração Personalizada do Jogo? - + Remove File Remover Ficheiro - - + + Error Removing Transferable Shader Cache Error ao Remover Cache de Shader Transferível - - + + A shader cache for this title does not exist. O Shader Cache para este titulo não existe. - + Successfully removed the transferable shader cache. Removido a Cache de Shader Transferível com Sucesso. - + Failed to remove the transferable shader cache. Falha ao remover a cache de shader transferível. - + Error Removing Vulkan Driver Pipeline Cache Erro ao Remover Cache de Pipeline do Driver Vulkan - + Failed to remove the driver pipeline cache. Falha ao remover o pipeline de cache do driver. - - + + Error Removing Transferable Shader Caches Erro ao remover os caches de shaders transferíveis - + Successfully removed the transferable shader caches. Os caches de shaders transferíveis foram removidos com sucesso. - + Failed to remove the transferable shader cache directory. Falha ao remover o diretório do cache de shaders transferível. - - + + Error Removing Custom Configuration Erro ao Remover Configuração Personalizada - + A custom configuration for this title does not exist. Não existe uma configuração personalizada para este titúlo. - + Successfully removed the custom game configuration. Removida a configuração personalizada do jogo com sucesso. - + Failed to remove the custom game configuration. Falha ao remover a configuração personalizada do jogo. - - + + RomFS Extraction Failed! A Extração de RomFS falhou! - + There was an error copying the RomFS files or the user cancelled the operation. Houve um erro ao copiar os arquivos RomFS ou o usuário cancelou a operação. - + Full Cheio - + Skeleton Esqueleto - + Select RomFS Dump Mode Selecione o modo de despejo do RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Por favor, selecione a forma como você gostaria que o RomFS fosse despejado<br>Full irá copiar todos os arquivos para o novo diretório enquanto<br>skeleton criará apenas a estrutura de diretórios. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Não há espaço suficiente em %1 para extrair o RomFS. Por favor abra espaço ou selecione um diretório diferente em Emulação > Configurar > Sistema > Sistema de arquivos > Extrair raiz - + Extracting RomFS... Extraindo o RomFS ... - - + + Cancel Cancelar - + RomFS Extraction Succeeded! Extração de RomFS Bem-Sucedida! - + The operation completed successfully. A operação foi completa com sucesso. - - - - - + + + + + Create Shortcut Criar Atalho - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Isso irá criar um atalho para o AppImage atual. Isso pode não funcionar corretamente se você fizer uma atualização. Continuar? - + Cannot create shortcut on desktop. Path "%1" does not exist. Não foi possível criar um atalho na área de trabalho. O caminho "%1" não existe. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Não foi possível criar um atalho no menu de aplicativos. O caminho "%1" não existe e não pode ser criado. - + Create Icon Criar Ícone - + Cannot create icon file. Path "%1" does not exist and cannot be created. Não foi possível criar o arquivo de ícone. O caminho "%1" não existe e não pode ser criado. - + Start %1 with the yuzu Emulator Iniciar %1 com o Emulador Yuzu - + Failed to create a shortcut at %1 Falha ao criar um atalho em %1 - + Successfully created a shortcut to %1 Atalho criado com sucesso em %1 - + Error Opening %1 Erro ao abrir %1 - + Select Directory Selecione o Diretório - + Properties Propriedades - + The game properties could not be loaded. As propriedades do jogo não puderam ser carregadas. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Executáveis Switch (%1);;Todos os Ficheiros (*.*) - + Load File Carregar Ficheiro - + Open Extracted ROM Directory Abrir o directório ROM extraído - + Invalid Directory Selected Diretório inválido selecionado - + The directory you have selected does not contain a 'main' file. O diretório que você selecionou não contém um arquivo 'Main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Ficheiro Switch Instalável (*.nca *.nsp *.xci);;Arquivo de Conteúdo Nintendo (*.nca);;Pacote de Envio Nintendo (*.nsp);;Imagem de Cartucho NX (*.xci) - + Install Files Instalar Ficheiros - + %n file(s) remaining - + Installing file "%1"... Instalando arquivo "%1"... - - + + Install Results Instalar Resultados - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Para evitar possíveis conflitos, desencorajamos que os utilizadores instalem os jogos base na NAND. Por favor, use esse recurso apenas para instalar atualizações e DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Aplicação do sistema - + System Archive Arquivo do sistema - + System Application Update Atualização do aplicativo do sistema - + Firmware Package (Type A) Pacote de Firmware (Tipo A) - + Firmware Package (Type B) Pacote de Firmware (Tipo B) - + Game Jogo - + Game Update Actualização do Jogo - + Game DLC DLC do Jogo - + Delta Title Título Delta - + Select NCA Install Type... Selecione o tipo de instalação do NCA ... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Por favor, selecione o tipo de título que você gostaria de instalar este NCA como: (Na maioria dos casos, o padrão 'Jogo' é suficiente). - + Failed to Install Falha na instalação - + The title type you selected for the NCA is invalid. O tipo de título que você selecionou para o NCA é inválido. - + File not found Arquivo não encontrado - + File "%1" not found Arquivo "%1" não encontrado - + OK OK - - + + Hardware requirements not met Requisitos de hardware não atendidos - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Seu sistema não atende os requisitos de harwdare. O relatório de compatibilidade foi desabilitado. - + Missing yuzu Account Conta Yuzu Ausente - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Para enviar um caso de teste de compatibilidade de jogos, você deve vincular sua conta yuzu.<br><br/>Para vincular sua conta yuzu, vá para Emulação &gt; Configuração &gt; Rede. - + Error opening URL Erro ao abrir URL - + Unable to open the URL "%1". Não foi possível abrir o URL "%1". - + TAS Recording Gravando TAS - + Overwrite file of player 1? Sobrescrever arquivo do jogador 1? - + Invalid config detected Configação inválida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. O comando portátil não pode ser usado no modo encaixado na base. O Pro controller será selecionado. - - + + Amiibo Amiibo - - + + The current amiibo has been removed O amiibo atual foi removido - + Error Erro - - + + The current game is not looking for amiibos O jogo atual não está procurando amiibos - + Amiibo File (%1);; All Files (*.*) Arquivo Amiibo (%1);; Todos os Arquivos (*.*) - + Load Amiibo Carregar Amiibo - + Error loading Amiibo data Erro ao carregar dados do Amiibo - + The selected file is not a valid amiibo O arquivo selecionado não é um amiibo válido - + The selected file is already on use O arquivo selecionado já está em uso - + An unknown error occurred Ocorreu um erro desconhecido - + Capture Screenshot Captura de Tela - + PNG Image (*.png) Imagem PNG (*.png) - + TAS state: Running %1/%2 Situação TAS: Rodando %1%2 - + TAS state: Recording %1 Situação TAS: Gravando %1 - + TAS state: Idle %1/%2 Situação TAS: Repouso %1%2 - + TAS State: Invalid Situação TAS: Inválido - + &Stop Running &Parar de rodar - + &Start &Começar - + Stop R&ecording Parar G&ravação - + R&ecord G&ravação - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escala: %1x - + Speed: %1% / %2% Velocidade: %1% / %2% - + Speed: %1% Velocidade: %1% - + Game: %1 FPS (Unlocked) Jogo: %1 FPS (Desbloqueado) - + Game: %1 FPS Jogo: %1 FPS - + Frame: %1 ms Quadro: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR ERRO DE GPU - + DOCKED ANCORADO - + HANDHELD PORTÁTIL - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULO - + NEAREST VIZINHO - - + + BILINEAR BILINEAR - + BICUBIC BICÚBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA Sem AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE VOLUME: MUDO - + VOLUME: %1% Volume percentage (e.g. 50%) VOLUME: %1% - + Confirm Key Rederivation Confirme a rederivação da chave - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5526,37 +5501,37 @@ e opcionalmente faça backups. Isso irá excluir os seus arquivos de chave gerados automaticamente e executará novamente o módulo de derivação de chave. - + Missing fuses Fusíveis em Falta - + - Missing BOOT0 - BOOT0 em Falta - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main em Falta - + - Missing PRODINFO - PRODINFO em Falta - + Derivation Components Missing Componentes de Derivação em Falta - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Chaves de encriptação faltando. <br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>o guia de início rápido</a> para extrair suas chaves, firmware e jogos. <br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5565,39 +5540,39 @@ Isto pode demorar até um minuto, dependendo do desempenho do seu sistema. - + Deriving Keys Derivando Chaves - + Select RomFS Dump Target Selecione o destino de despejo do RomFS - + Please select which RomFS you would like to dump. Por favor, selecione qual o RomFS que você gostaria de despejar. - + Are you sure you want to close yuzu? Tem a certeza que quer fechar o yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Tem a certeza de que quer parar a emulação? Qualquer progresso não salvo será perdido. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -6676,32 +6651,32 @@ Mensagem de Depuração: Unable to connect to the host. Verify that the connection settings are correct. If you still cannot connect, contact the room host and verify that the host is properly configured with the external port forwarded. - + Não foi possível conectar no host. Verifique que as configurações de conexão estão corretas. Se você ainda não conseguir conectar, entre em contato com o anfitrião da sala e verifique que o host está configurado corretamente com a porta externa redirecionada. Unable to connect to the room because it is already full. - + Não foi possível conectar na sala porque a mesma está cheia. Creating a room failed. Please retry. Restarting yuzu might be necessary. - + Erro ao criar a sala. Por favor tente novamente. Reiniciar o yuzu pode ser necessário. The host of the room has banned you. Speak with the host to unban you or try a different room. - + O anfitrião da sala baniu você. Fale com o anfitrião para que ele remova seu banimento ou tente uma sala diferente. Version mismatch! Please update to the latest version of yuzu. If the problem persists, contact the room host and ask them to update the server. - + Versão não compatível! Por favor atualize o yuzu para a última versão. Se o problema persistir entre em contato com o anfitrião da sala e peça que atualize o servidor. Incorrect password. - + Senha inválda. @@ -6711,7 +6686,7 @@ Mensagem de Depuração: Connection to room lost. Try to reconnect. - + Conexão com a sala encerrada. Tente reconectar. @@ -7598,28 +7573,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) Código de erro: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. Ocorreu um erro. Tente novamente ou entre em contato com o desenvolvedor do software. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. Ocorreu um erro em %1 até %2. Tente novamente ou entre em contato com o desenvolvedor do software. - + An error has occurred. %1 @@ -7643,20 +7618,81 @@ Tente novamente ou entre em contato com o desenvolvedor do software. - - Select a user: - Selecione um usuário: - - - + Users Utilizadores - + + Profile Creator + + + + + Profile Selector Seleccionador de Perfil + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Selecione um usuário: + QtSoftwareKeyboardDialog @@ -7706,51 +7742,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Pilha de Chamadas - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - esperando por mutex 0x% 1 - - - - has waiters: %1 - has waiters: %1 - - - - owner handle: 0x%1 - owner handle: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - esperando por todos os objetos - - - - waiting for one of the following objects - esperando por todos os objectos - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + - + waited by no thread esperado por nenhuma thread @@ -7758,120 +7763,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable executável - + paused pausado - + sleeping dormindo - + waiting for IPC reply aguardando resposta do IPC - + waiting for objects esperando por objectos - + waiting for condition variable A espera da variável de condição - + waiting for address arbiter esperando pelo árbitro de endereço - + waiting for suspend resume esperando pra suspender o resumo - + waiting aguardando - + initialized inicializado - + terminated terminado - + unknown desconhecido - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal ideal - + core %1 núcleo %1 - + processor = %1 processador = %1 - - ideal core = %1 - núcleo ideal =% 1 - - - + affinity mask = %1 máscara de afinidade =% 1 - + thread id = %1 id do segmento =% 1 - + priority = %1(current) / %2(normal) prioridade =%1(atual) / %2(normal) - + last running ticks = %1 últimos tiques em execução =%1 - - - not waiting for mutex - não esperar por mutex - WaitTreeThreadList - + waited by thread esperado por thread @@ -7879,7 +7874,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree &Árvore de espera diff --git a/dist/languages/ru_RU.ts b/dist/languages/ru_RU.ts index 83a99fab9..eee646732 100644 --- a/dist/languages/ru_RU.ts +++ b/dist/languages/ru_RU.ts @@ -380,36 +380,61 @@ This would ban both their forum username and their IP address. - Output Device - Устройство вывода + Output Device: + - Input Device - Устройство ввода + Input Device: + - + + Sound Output Mode: + + + + + Mono + Моно + + + + Stereo + Стерео + + + + Surround + Объёмный звук + + + Use global volume Использовать общую громкость - + Set volume: Установить громкость: - + Volume: Громкость: - + 0 % 0 % - + + Mute audio when in background + Заглушить звук в фоновом режиме + + + %1% Volume percentage (e.g. 50%) %1% @@ -1341,26 +1366,21 @@ This would ban both their forum username and their IP address. - Mute audio when in background - Заглушить звук в фоновом режиме - - - Hide mouse on inactivity Спрятать мышь при неактивности - + Reset All Settings Сбросить все настройки - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Это сбросит все настройки и удалит все конфигурации под отдельные игры. При этом не будут удалены пути для игр, профили или профили ввода. Продолжить? @@ -3794,60 +3814,15 @@ UUID: %2 Название устройства - - Mono - Моно - - - - Stereo - Стерео - - - - Surround - Объёмный звук - - - - Console ID: - ID консоли: - - - - Sound output mode - Режим вывода звука - - - - Regenerate - Перегенерировать - - - + System settings are available only when game is not running. Настройки системы доступны только тогда, когда игра не запущена. - + Warning: "%1" is not a valid language for region "%2" Внимание: язык "%1" не подходит для региона "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Это заменит ваш текущий виртуальный Switch новым. Ваш текущий виртуальный Switch будет безвозвратно потерян. Это может иметь неожиданные последствия в играх. Может не сработать, если вы используете устаревшую конфигурацию сохраненных игр. Продолжить? - - - - Warning - Внимание - - - - Console ID: 0x%1 - ID консоли: 0x%1 - ConfigureTas @@ -4535,555 +4510,555 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Анонимные данные собираются для того,</a> чтобы помочь улучшить работу yuzu. <br/><br/>Хотели бы вы делиться данными об использовании с нами? - + Telemetry Телеметрия - + Broken Vulkan Installation Detected Обнаружена поврежденная установка Vulkan - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. Не удалось выполнить инициализацию Vulkan во время загрузки.<br><br>Нажмите <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>здесь для получения инструкций по устранению проблемы</a>. - + Loading Web Applet... Загрузка веб-апплета... - - + + Disable Web Applet Отключить веб-апплет - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Отключение веб-апплета может привести к неожиданному поведению и должно использоваться только с Super Mario 3D All-Stars. Вы уверены, что хотите отключить веб-апплет? (Его можно снова включить в настройках отладки.) - + The amount of shaders currently being built Количество создаваемых шейдеров на данный момент - + The current selected resolution scaling multiplier. Текущий выбранный множитель масштабирования разрешения. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Текущая скорость эмуляции. Значения выше или ниже 100% указывают на то, что эмуляция идет быстрее или медленнее, чем на Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Количество кадров в секунду в данный момент. Значение будет меняться между играми и сценами. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Время, которое нужно для эмуляции 1 кадра Switch, не принимая во внимание ограничение FPS или вертикальную синхронизацию. Для эмуляции в полной скорости значение должно быть не больше 16,67 мс. - + &Clear Recent Files [&C] Очистить недавние файлы - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue [&C] Продолжить - + &Pause [&P] Пауза - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping В yuzu запущена игра - + Warning Outdated Game Format Предупреждение устаревший формат игры - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Для этой игры вы используете разархивированный формат ROM'а, который является устаревшим и был заменен другими, такими как NCA, NAX, XCI или NSP. В разархивированных каталогах ROM'а отсутствуют иконки, метаданные и поддержка обновлений. <br><br>Для получения информации о различных форматах Switch, поддерживаемых yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>просмотрите нашу вики</a>. Это сообщение больше не будет отображаться. - - + + Error while loading ROM! Ошибка при загрузке ROM'а! - + The ROM format is not supported. Формат ROM'а не поддерживается. - + An error occurred initializing the video core. Произошла ошибка при инициализации видеоядра. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu столкнулся с ошибкой при запуске видеоядра. Обычно это вызвано устаревшими драйверами ГП, включая интегрированные. Проверьте журнал для получения более подробной информации. Дополнительную информацию о доступе к журналу смотрите на следующей странице: <a href='https://yuzu-emu.org/help/reference/log-files/'>Как загрузить файл журнала</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Ошибка при загрузке ROM'а! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Пожалуйста, следуйте <a href='https://yuzu-emu.org/help/quickstart/'>краткому руководству пользователя yuzu</a> чтобы пере-дампить ваши файлы<br>Вы можете обратиться к вики yuzu</a> или Discord yuzu</a> для помощи. - + An unknown error occurred. Please see the log for more details. Произошла неизвестная ошибка. Пожалуйста, проверьте журнал для подробностей. - + (64-bit) (64-х битный) - + (32-bit) (32-х битный) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Закрываем программу... - + Save Data Сохранения - + Mod Data Данные модов - + Error Opening %1 Folder Ошибка при открытии папки %1 - - + + Folder does not exist! Папка не существует! - + Error Opening Transferable Shader Cache Ошибка при открытии переносного кэша шейдеров - + Failed to create the shader cache directory for this title. Не удалось создать папку кэша шейдеров для этой игры. - + Error Removing Contents Ошибка при удалении содержимого - + Error Removing Update Ошибка при удалении обновлений - + Error Removing DLC Ошибка при удалении DLC - + Remove Installed Game Contents? Удалить установленное содержимое игр? - + Remove Installed Game Update? Удалить установленные обновления игры? - + Remove Installed Game DLC? Удалить установленные DLC игры? - + Remove Entry Удалить запись - - - - - - + + + + + + Successfully Removed Успешно удалено - + Successfully removed the installed base game. Установленная игра успешно удалена. - + The base game is not installed in the NAND and cannot be removed. Игра не установлена в NAND и не может быть удалена. - + Successfully removed the installed update. Установленное обновление успешно удалено. - + There is no update installed for this title. Для этой игры не было установлено обновление. - + There are no DLC installed for this title. Для этой игры не были установлены DLC. - + Successfully removed %1 installed DLC. Установленное DLC %1 было успешно удалено - + Delete OpenGL Transferable Shader Cache? Удалить переносной кэш шейдеров OpenGL? - + Delete Vulkan Transferable Shader Cache? Удалить переносной кэш шейдеров Vulkan? - + Delete All Transferable Shader Caches? Удалить весь переносной кэш шейдеров? - + Remove Custom Game Configuration? Удалить пользовательскую настройку игры? - + Remove File Удалить файл - - + + Error Removing Transferable Shader Cache Ошибка при удалении переносного кэша шейдеров - - + + A shader cache for this title does not exist. Кэш шейдеров для этой игры не существует. - + Successfully removed the transferable shader cache. Переносной кэш шейдеров успешно удалён. - + Failed to remove the transferable shader cache. Не удалось удалить переносной кэш шейдеров. - + Error Removing Vulkan Driver Pipeline Cache Ошибка при удалении конвейерного кэша Vulkan - + Failed to remove the driver pipeline cache. Не удалось удалить конвейерный кэш шейдеров. - - + + Error Removing Transferable Shader Caches Ошибка при удалении переносного кэша шейдеров - + Successfully removed the transferable shader caches. Переносной кэш шейдеров успешно удален. - + Failed to remove the transferable shader cache directory. Ошибка при удалении папки переносного кэша шейдеров. - - + + Error Removing Custom Configuration Ошибка при удалении пользовательской настройки - + A custom configuration for this title does not exist. Пользовательская настройка для этой игры не существует. - + Successfully removed the custom game configuration. Пользовательская настройка игры успешно удалена. - + Failed to remove the custom game configuration. Не удалось удалить пользовательскую настройку игры. - - + + RomFS Extraction Failed! Не удалось извлечь RomFS! - + There was an error copying the RomFS files or the user cancelled the operation. Произошла ошибка при копировании файлов RomFS или пользователь отменил операцию. - + Full Полный - + Skeleton Скелет - + Select RomFS Dump Mode Выберите режим дампа RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Пожалуйста, выберите, как вы хотите выполнить дамп RomFS. <br>Полный скопирует все файлы в новую папку, в то время как <br>скелет создаст только структуру папок. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root В %1 недостаточно свободного места для извлечения RomFS. Пожалуйста, освободите место или выберите другую папку для дампа в Эмуляция > Настройка > Система > Файловая система > Корень дампа - + Extracting RomFS... Извлечение RomFS... - - + + Cancel Отмена - + RomFS Extraction Succeeded! Извлечение RomFS прошло успешно! - + The operation completed successfully. Операция выполнена. - - - - - + + + + + Create Shortcut Создать ярлык - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Это создаст ярлык для текущего AppImage. Он может не работать после обновлений. Продолжить? - + Cannot create shortcut on desktop. Path "%1" does not exist. Не удается создать ярлык на рабочем столе. Путь "%1" не существует. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Невозможно создать ярлык в меню приложений. Путь "%1" не существует и не может быть создан. - + Create Icon Создать иконку - + Cannot create icon file. Path "%1" does not exist and cannot be created. Невозможно создать файл иконки. Путь "%1" не существует и не может быть создан. - + Start %1 with the yuzu Emulator Запустить %1 с помощью эмулятора yuzu - + Failed to create a shortcut at %1 Не удалось создать ярлык в %1 - + Successfully created a shortcut to %1 Успешно создан ярлык в %1 - + Error Opening %1 Ошибка открытия %1 - + Select Directory Выбрать папку - + Properties Свойства - + The game properties could not be loaded. Не удалось загрузить свойства игры. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Исполняемый файл Switch (%1);;Все файлы (*.*) - + Load File Загрузить файл - + Open Extracted ROM Directory Открыть папку извлечённого ROM'а - + Invalid Directory Selected Выбрана недопустимая папка - + The directory you have selected does not contain a 'main' file. Папка, которую вы выбрали, не содержит файла 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Устанавливаемый файл Switch (*.nca, *.nsp, *.xci);;Архив контента Nintendo (*.nca);;Пакет подачи Nintendo (*.nsp);;Образ картриджа NX (*.xci) - + Install Files Установить файлы - + %n file(s) remaining Остался %n файлОсталось %n файл(ов)Осталось %n файл(ов)Осталось %n файл(ов) - + Installing file "%1"... Установка файла "%1"... - - + + Install Results Результаты установки - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Чтобы избежать возможных конфликтов, мы не рекомендуем пользователям устанавливать игры в NAND. Пожалуйста, используйте эту функцию только для установки обновлений и DLC. - + %n file(s) were newly installed %n файл был недавно установлен @@ -5093,7 +5068,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) were overwritten %n файл был перезаписан @@ -5103,7 +5078,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) failed to install %n файл не удалось установить @@ -5113,388 +5088,388 @@ Please, only use this feature to install updates and DLC. - + System Application Системное приложение - + System Archive Системный архив - + System Application Update Обновление системного приложения - + Firmware Package (Type A) Пакет прошивки (Тип А) - + Firmware Package (Type B) Пакет прошивки (Тип Б) - + Game Игра - + Game Update Обновление игры - + Game DLC DLC игры - + Delta Title Дельта-титул - + Select NCA Install Type... Выберите тип установки NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Пожалуйста, выберите тип приложения, который вы хотите установить для этого NCA: (В большинстве случаев, подходит стандартный выбор «Игра».) - + Failed to Install Ошибка установки - + The title type you selected for the NCA is invalid. Тип приложения, который вы выбрали для NCA, недействителен. - + File not found Файл не найден - + File "%1" not found Файл "%1" не найден - + OK ОК - - + + Hardware requirements not met Не удовлетворены системные требования - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Ваша система не соответствует рекомендуемым системным требованиям. Отчеты о совместимости были отключены. - + Missing yuzu Account Отсутствует аккаунт yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Чтобы отправить отчет о совместимости игры, необходимо привязать свою учетную запись yuzu.<br><br/>Чтобы привязать свою учетную запись yuzu, перейдите в раздел Эмуляция &gt; Параметры &gt; Сеть. - + Error opening URL Ошибка при открытии URL - + Unable to open the URL "%1". Не удалось открыть URL: "%1". - + TAS Recording Запись TAS - + Overwrite file of player 1? Перезаписать файл игрока 1? - + Invalid config detected Обнаружена недопустимая конфигурация - + Handheld controller can't be used on docked mode. Pro controller will be selected. Портативный контроллер не может быть использован в режиме док-станции. Будет выбран контроллер Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Текущий amiibo был убран - + Error Ошибка - - + + The current game is not looking for amiibos Текущая игра не ищет amiibo - + Amiibo File (%1);; All Files (*.*) Файл Amiibo (%1);; Все Файлы (*.*) - + Load Amiibo Загрузить Amiibo - + Error loading Amiibo data Ошибка загрузки данных Amiibo - + The selected file is not a valid amiibo Выбранный файл не является допустимым amiibo - + The selected file is already on use Выбранный файл уже используется - + An unknown error occurred Произошла неизвестная ошибка - + Capture Screenshot Сделать скриншот - + PNG Image (*.png) Изображение PNG (*.png) - + TAS state: Running %1/%2 Состояние TAS: Выполняется %1/%2 - + TAS state: Recording %1 Состояние TAS: Записывается %1 - + TAS state: Idle %1/%2 Состояние TAS: Простой %1/%2 - + TAS State: Invalid Состояние TAS: Неверное - + &Stop Running [&S] Остановка - + &Start [&S] Начать - + Stop R&ecording [&E] Закончить запись - + R&ecord [&E] Запись - + Building: %n shader(s) Постройка: %n шейдерПостройка: %n шейдер(ов)Постройка: %n шейдер(ов)Постройка: %n шейдер(ов) - + Scale: %1x %1 is the resolution scaling factor Масштаб: %1x - + Speed: %1% / %2% Скорость: %1% / %2% - + Speed: %1% Скорость: %1% - + Game: %1 FPS (Unlocked) Игра: %1 FPS (Неограниченно) - + Game: %1 FPS Игра: %1 FPS - + Frame: %1 ms Кадр: %1 мс - + GPU NORMAL ГП НОРМАЛЬНО - + GPU HIGH ГП ВЫСОКО - + GPU EXTREME ГП ЭКСТРИМ - + GPU ERROR ГП ОШИБКА - + DOCKED В ДОК-СТАНЦИИ - + HANDHELD ПОРТАТИВНЫЙ - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST БЛИЖАЙШИЙ - - + + BILINEAR БИЛИНЕЙНЫЙ - + BICUBIC БИКУБИЧЕСКИЙ - + GAUSSIAN ГАУСС - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA БЕЗ СГЛАЖИВАНИЯ - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE ГРОМКОСТЬ: ЗАГЛУШЕНА - + VOLUME: %1% Volume percentage (e.g. 50%) ГРОМКОСТЬ: %1% - + Confirm Key Rederivation Подтвердите перерасчет ключа - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5511,37 +5486,37 @@ This will delete your autogenerated key files and re-run the key derivation modu Это удалит ваши автоматически сгенерированные файлы ключей и повторно запустит модуль расчета ключей. - + Missing fuses Отсутствуют предохранители - + - Missing BOOT0 - Отсутствует BOOT0 - + - Missing BCPKG2-1-Normal-Main - Отсутствует BCPKG2-1-Normal-Main - + - Missing PRODINFO - Отсутствует PRODINFO - + Derivation Components Missing Компоненты расчета отсутствуют - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Ключи шифрования отсутствуют. <br>Пожалуйста, следуйте <a href='https://yuzu-emu.org/help/quickstart/'>краткому руководству пользователя yuzu</a>, чтобы получить все ваши ключи, прошивку и игры.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5550,39 +5525,39 @@ on your system's performance. от производительности вашей системы. - + Deriving Keys Получение ключей - + Select RomFS Dump Target Выберите цель для дампа RomFS - + Please select which RomFS you would like to dump. Пожалуйста, выберите, какой RomFS вы хотите сдампить. - + Are you sure you want to close yuzu? Вы уверены, что хотите закрыть yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Вы уверены, что хотите остановить эмуляцию? Любой несохраненный прогресс будет потерян. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7586,28 +7561,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) Код ошибки: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. Произошла ошибка. Пожалуйста, попробуйте еще раз или свяжитесь с разработчиком ПО. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. Произошла ошибка на %1 в %2. Пожалуйста, попробуйте еще раз или свяжитесь с разработчиком ПО. - + An error has occurred. %1 @@ -7631,20 +7606,81 @@ Please try again or contact the developer of the software. %2 - - Select a user: - Выберите пользователя: - - - + Users Пользователи - + + Profile Creator + + + + + Profile Selector Выбор профиля + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Выберите пользователя: + QtSoftwareKeyboardDialog @@ -7694,51 +7730,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Стэк вызовов - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - - - - - has waiters: %1 - ожидающих: %1 - - - - owner handle: 0x%1 - - - - - WaitTreeObjectList - - - waiting for all objects - в ожидании всех объектов - - - - waiting for one of the following objects - в ожидании одного из следующих объектов - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + - + waited by no thread не ожидается ни одним потоком @@ -7746,120 +7751,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable - + paused - + sleeping - + waiting for IPC reply ожидание ответа IPC - + waiting for objects ожидание объектов - + waiting for condition variable - + waiting for address arbiter - + waiting for suspend resume - + waiting - + initialized - + terminated - + unknown неизвестно - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal - + core %1 ядро %1 - + processor = %1 процессор = %1 - - ideal core = %1 - - - - + affinity mask = %1 маска сходства = %1 - + thread id = %1 идентификатор потока = %1 - + priority = %1(current) / %2(normal) приоритет = %1(текущий) / %2(обычный) - + last running ticks = %1 - - - not waiting for mutex - - WaitTreeThreadList - + waited by thread ожидается потоком @@ -7867,7 +7862,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree [&W] Дерево ожидания diff --git a/dist/languages/sv.ts b/dist/languages/sv.ts index 498dee04a..b81ed7fd6 100644 --- a/dist/languages/sv.ts +++ b/dist/languages/sv.ts @@ -380,36 +380,61 @@ Detta kommer bannlysa både dennes användarnamn på forum samt IP-adress. - Output Device + Output Device: - Input Device - Inmatningsenhet + Input Device: + - + + Sound Output Mode: + + + + + Mono + Mono + + + + Stereo + Stereo + + + + Surround + Surround + + + Use global volume Använd global volym - + Set volume: Ställ in volym: - + Volume: Volym: - + 0 % 0 % - + + Mute audio when in background + + + + %1% Volume percentage (e.g. 50%) %1% @@ -1355,26 +1380,21 @@ avgjord kod.</div> - Mute audio when in background - - - - Hide mouse on inactivity Göm mus när inaktiv - + Reset All Settings Återställ Alla Inställningar - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? @@ -3806,60 +3826,15 @@ UUID: %2 - - Mono - Mono - - - - Stereo - Stereo - - - - Surround - Surround - - - - Console ID: - Konsol-ID: - - - - Sound output mode - Ljudutgångsläge - - - - Regenerate - Regenerera - - - + System settings are available only when game is not running. Systeminställningar är endast tillgängliga när spel inte körs. - + Warning: "%1" is not a valid language for region "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Detta kommer att ersätta nuvarande virtuell Switch med en ny. Nuvarande virtuell Switch kommer att permanent tas bort. Detta kan ha oväntade konsekvenser i spel. Detta kan misslyckas om en utdaterad konfig sparning används. Vill du fortsätta? - - - - Warning - Varning - - - - Console ID: 0x%1 - Konsol ID: 0x%1 - ConfigureTas @@ -4547,952 +4522,952 @@ Dra punkter för att ändra position, eller dubbelklicka tabellceller för att r GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonym data skickas </a>För att förbättra yuzu. <br/><br/>Vill du dela med dig av din användarstatistik med oss? - + Telemetry Telemetri - + Broken Vulkan Installation Detected - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... Laddar WebApplet... - - + + Disable Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Mängden shaders som just nu byggs - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Nuvarande emuleringshastighet. Värden över eller under 100% indikerar på att emulationen körs snabbare eller långsammare än en Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Hur många bilder per sekund som spelet just nu visar. Detta varierar från spel till spel och scen till scen. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tid det tar att emulera en Switch bild, utan att räkna med framelimiting eller v-sync. För emulering på full hastighet så ska det vara som mest 16.67 ms. - + &Clear Recent Files - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue - + &Pause &Paus - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Varning Föråldrat Spelformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Du använder det dekonstruerade ROM-formatet för det här spelet. Det är ett föråldrat format som har överträffats av andra som NCA, NAX, XCI eller NSP. Dekonstruerade ROM-kataloger saknar ikoner, metadata och uppdatering.<br><br>För en förklaring av de olika format som yuzu stöder, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>kolla in vår wiki</a>. Det här meddelandet visas inte igen. - - + + Error while loading ROM! Fel vid laddning av ROM! - + The ROM format is not supported. ROM-formatet stöds inte. - + An error occurred initializing the video core. Ett fel inträffade vid initiering av videokärnan. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Ett okänt fel har uppstått. Se loggen för mer information. - + (64-bit) - + (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit - + Closing software... - + Save Data Spardata - + Mod Data Mod-data - + Error Opening %1 Folder Fel Öppnar %1 Mappen - - + + Folder does not exist! Mappen finns inte! - + Error Opening Transferable Shader Cache Fel Under Öppning Av Överförbar Shadercache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Ta bort katalog - - - - - - + + + + + + Successfully Removed Framgångsrikt borttagen - + Successfully removed the installed base game. Tog bort det installerade basspelet framgångsrikt. - + The base game is not installed in the NAND and cannot be removed. Basspelet är inte installerat i NAND och kan inte tas bort. - + Successfully removed the installed update. Tog bort den installerade uppdateringen framgångsrikt. - + There is no update installed for this title. Det finns ingen uppdatering installerad för denna titel. - + There are no DLC installed for this title. Det finns inga DLC installerade för denna titel. - + Successfully removed %1 installed DLC. Tog framgångsrikt bort den %1 installerade DLCn. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? Ta Bort Anpassad Spelkonfiguration? - + Remove File Radera fil - - + + Error Removing Transferable Shader Cache Fel När Överförbar Shader Cache Raderades - - + + A shader cache for this title does not exist. En shader cache för denna titel existerar inte. - + Successfully removed the transferable shader cache. Raderade den överförbara shadercachen framgångsrikt. - + Failed to remove the transferable shader cache. Misslyckades att ta bort den överförbara shadercache - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Fel När Anpassad Konfiguration Raderades - + A custom configuration for this title does not exist. En anpassad konfiguration för denna titel existerar inte. - + Successfully removed the custom game configuration. Tog bort den anpassade spelkonfigurationen framgångsrikt. - + Failed to remove the custom game configuration. Misslyckades att ta bort den anpassade spelkonfigurationen. - - + + RomFS Extraction Failed! RomFS Extraktion Misslyckades! - + There was an error copying the RomFS files or the user cancelled the operation. Det uppstod ett fel vid kopiering av RomFS filer eller användaren avbröt operationen. - + Full Full - + Skeleton Skelett - + Select RomFS Dump Mode Välj RomFS Dump-Läge - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Välj hur du vill att RomFS ska dumpas. <br>Full kommer att kopiera alla filer i den nya katalogen medan <br>skelett bara skapar katalogstrukturen. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Extraherar RomFS... - - + + Cancel Avbryt - + RomFS Extraction Succeeded! RomFS Extraktion Lyckades! - + The operation completed successfully. Operationen var lyckad. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Fel under öppning av %1 - + Select Directory Välj Katalog - + Properties Egenskaper - + The game properties could not be loaded. Spelegenskaperna kunde inte laddas. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Körbar (%1);;Alla Filer (*.*) - + Load File Ladda Fil - + Open Extracted ROM Directory Öppna Extraherad ROM-Katalog - + Invalid Directory Selected Ogiltig Katalog Vald - + The directory you have selected does not contain a 'main' file. Katalogen du har valt innehåller inte en 'main'-fil. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Installerbar Switch-fil (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Installera filer - + %n file(s) remaining - + Installing file "%1"... Installerar Fil "%1"... - - + + Install Results Installera resultat - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systemapplikation - + System Archive Systemarkiv - + System Application Update Systemapplikationsuppdatering - + Firmware Package (Type A) Firmwarepaket (Typ A) - + Firmware Package (Type B) Firmwarepaket (Typ B) - + Game Spel - + Game Update Speluppdatering - + Game DLC Spel DLC - + Delta Title Delta Titel - + Select NCA Install Type... Välj NCA-Installationsläge... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Välj vilken typ av titel du vill installera som: (I de flesta fallen, standard 'Spel' är bra.) - + Failed to Install Misslyckades med Installationen - + The title type you selected for the NCA is invalid. Den titeltyp du valt för NCA är ogiltig. - + File not found Filen hittades inte - + File "%1" not found Filen "%1" hittades inte - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account yuzu Konto hittades inte - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. För att skicka ett spelkompatibilitetstest, du måste länka ditt yuzu-konto.<br><br/>För att länka ditt yuzu-konto, gå till Emulering &gt, Konfigurering &gt, Web. - + Error opening URL Fel när URL öppnades - + Unable to open the URL "%1". Oförmögen att öppna URL:en "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo - - + + The current amiibo has been removed - + Error Fel - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo Fil (%1);; Alla Filer (*.*) - + Load Amiibo Ladda Amiibo - + Error loading Amiibo data Fel vid laddning av Amiibodata - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Skärmdump - + PNG Image (*.png) PNG Bild (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Hastighet: %1% / %2% - + Speed: %1% Hastighet: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Spel: %1 FPS - + Frame: %1 ms Ruta: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA - + SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation Bekräfta Nyckel Rederivering - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5509,37 +5484,37 @@ och eventuellt göra säkerhetskopior. Detta raderar dina autogenererade nyckelfiler och kör nyckelderivationsmodulen. - + Missing fuses Saknade säkringar - + - Missing BOOT0 - Saknar BOOT0 - + - Missing BCPKG2-1-Normal-Main - Saknar BCPKG2-1-Normal-Main - + - Missing PRODINFO - Saknar PRODINFO - + Derivation Components Missing Deriveringsdelar saknas - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5548,39 +5523,39 @@ Detta kan ta upp till en minut beroende på systemets prestanda. - + Deriving Keys Härleda Nycklar - + Select RomFS Dump Target Välj RomFS Dumpa Mål - + Please select which RomFS you would like to dump. Välj vilken RomFS du vill dumpa. - + Are you sure you want to close yuzu? Är du säker på att du vill stänga yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Är du säker på att du vill stoppa emuleringen? Du kommer att förlora osparade framsteg. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7574,28 +7549,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) Felkod: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. Ett fel har inträffat. Vänligen försök igen eller kontakta utvecklaren av programvaran. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. Ett fel har inträffat på %1 vid %2. Vänligen försök igen eller kontakta utvecklaren av programvaran. - + An error has occurred. %1 @@ -7619,20 +7594,81 @@ Vänligen försök igen eller kontakta utvecklaren av programvaran. - - Select a user: - Välj en användare: - - - + Users Användare - + + Profile Creator + + + + + Profile Selector Profilväljare + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Välj en användare: + QtSoftwareKeyboardDialog @@ -7678,51 +7714,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Samtal stack - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - väntar på mutex 0x%1 - - - - has waiters: %1 - har waiters: %1 - - - - owner handle: 0x%1 - ägarhandtag: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - väntar på alla föremål - - - - waiting for one of the following objects - väntar på ett av följande föremål - - WaitTreeSynchronizationObject - - [%1] %2 %3 + + [%1] %2 - + waited by no thread Ej väntad av någon tråd @@ -7730,120 +7735,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable - + paused pausad - + sleeping sovande - + waiting for IPC reply väntar på IPC svar - + waiting for objects väntar på föremål - + waiting for condition variable väntar för skickvariabel - + waiting for address arbiter väntar på adressbryter - + waiting for suspend resume - + waiting väntar - + initialized initialiserad - + terminated avslutad - + unknown okänd - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal ideal - + core %1 kärna %1 - + processor = %1 processor = %1 - - ideal core = %1 - idealisk kärna = %1 - - - + affinity mask = %1 affinitetsmask = %1 - + thread id = %1 tråd-id = %1 - + priority = %1(current) / %2(normal) prioritet = %1(nuvarande) / %2(normal) - + last running ticks = %1 sista springande fästingar = %1 - - - not waiting for mutex - väntar inte på mutex - WaitTreeThreadList - + waited by thread väntade med tråd @@ -7851,7 +7846,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree diff --git a/dist/languages/tr_TR.ts b/dist/languages/tr_TR.ts index d5e5691b2..98a7f479f 100644 --- a/dist/languages/tr_TR.ts +++ b/dist/languages/tr_TR.ts @@ -380,36 +380,61 @@ Bu işlem onların hem forum kullanıcı adını hem de IP adresini banlar. - Output Device - Çıkış Cihazı + Output Device: + - Input Device - Giriş Cihazı + Input Device: + - + + Sound Output Mode: + + + + + Mono + Mono + + + + Stereo + Stereo + + + + Surround + Surround + + + Use global volume Global sesi kullan - + Set volume: Sesi ayarla: - + Volume: Ses: - + 0 % 0 % - + + Mute audio when in background + Arka plandayken sesi kapat + + + %1% Volume percentage (e.g. 50%) %1% @@ -1363,26 +1388,21 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - Mute audio when in background - Arka plandayken sesi kapat - - - Hide mouse on inactivity Hareketsizlik durumunda imleci gizle - + Reset All Settings Tüm Ayarları Sıfırla - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Bu seçenek tüm genel ve oyuna özgü ayarları silecektir. Oyun dizinleri, profiller ve giriş profilleri silinmeyecektir. Devam etmek istiyor musunuz? @@ -3815,60 +3835,15 @@ UUID: %2 - - Mono - Mono - - - - Stereo - Stereo - - - - Surround - Surround - - - - Console ID: - Konsol ID: - - - - Sound output mode - Ses çıkış modu - - - - Regenerate - Yeniden oluştur - - - + System settings are available only when game is not running. Sistem ayarlarına sadece oyun çalışmıyorken erişilebilir. - + Warning: "%1" is not a valid language for region "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Bu sanal Switchinizi yeni biriyle değiştirir. Geçerli sanal switchiniz geri getirilemez. Bu oyunlarda beklenmeyen etkilere neden olabilir. Eski bir oyun yapılandırma kayıt dosyası kullanıyorsanız bu başarısız olabilir. Devam? - - - - Warning - Uyarı - - - - Console ID: 0x%1 - Konsol ID: 0x%1 - ConfigureTas @@ -4556,554 +4531,554 @@ Noktanın konumunu değiştirmek için sürükleyin ya da sayıların üstüne GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Yuzuyu geliştirmeye yardımcı olmak için </a> anonim veri toplandı. <br/><br/>Kullanım verinizi bizimle paylaşmak ister misiniz? - + Telemetry Telemetri - + Broken Vulkan Installation Detected Bozuk Vulkan Kurulumu Algılandı - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... Web Uygulaması Yükleniyor... - - + + Disable Web Applet Web Uygulamasını Devre Dışı Bırak - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Şu anda derlenen shader miktarı - + The current selected resolution scaling multiplier. Geçerli seçili çözünürlük ölçekleme çarpanı. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Geçerli emülasyon hızı. %100'den yüksek veya düşük değerler emülasyonun bir Switch'den daha hızlı veya daha yavaş çalıştığını gösterir. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Oyunun şuanda saniye başına kaç kare gösterdiği. Bu oyundan oyuna ve sahneden sahneye değişiklik gösterir. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Bir Switch karesini emüle etmekte geçen zaman, karelimitleme ve v-sync hariç. Tam hız emülasyon için bu en çok 16,67 ms olmalı. - + &Clear Recent Files &Son Dosyaları Temizle - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Devam Et - + &Pause &Duraklat - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu şu anda bir oyun çalıştırıyor - + Warning Outdated Game Format Uyarı, Eski Oyun Formatı - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Bu oyun için dekonstrükte ROM formatı kullanıyorsunuz, bu fromatın yerine NCA, NAX, XCI ve NSP formatları kullanılmaktadır. Dekonstrükte ROM formatları ikon, üst veri ve güncelleme desteği içermemektedir.<br><br>Yuzu'nun desteklediği çeşitli Switch formatları için<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Wiki'yi ziyaret edin</a>. Bu mesaj yeniden gösterilmeyecektir. - - + + Error while loading ROM! ROM yüklenirken hata oluştu! - + The ROM format is not supported. Bu ROM biçimi desteklenmiyor. - + An error occurred initializing the video core. Video çekirdeğini başlatılırken bir hata oluştu. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu video çekirdeğini çalıştırırken bir hatayla karşılaştı. Bu sorun genellikle eski GPU sürücüleri sebebiyle ortaya çıkar. Daha fazla detay için lütfen log dosyasına bakın. Log dosyasını incelemeye dair daha fazla bilgi için lütfen bu sayfaya ulaşın: <a href='https://yuzu-emu.org/help/reference/log-files/'>Log dosyası nasıl yüklenir</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. ROM yüklenirken hata oluştu! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Lütfen dosyalarınızı yeniden dump etmek için<a href='https://yuzu-emu.org/help/quickstart/'>yuzu hızlı başlangıç kılavuzu'nu</a> takip edin.<br> Yardım için yuzu wiki</a>veya yuzu Discord'una</a> bakabilirsiniz. - + An unknown error occurred. Please see the log for more details. Bilinmeyen bir hata oluştu. Lütfen daha fazla detay için kütüğe göz atınız. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Kayıt Verisi - + Mod Data Mod Verisi - + Error Opening %1 Folder %1 klasörü açılırken hata - - + + Folder does not exist! Klasör mevcut değil! - + Error Opening Transferable Shader Cache Transfer Edilebilir Shader Cache'ini Açarken Bir Hata Oluştu - + Failed to create the shader cache directory for this title. Bu oyun için shader cache konumu oluşturulamadı. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Girdiyi Kaldır - - - - - - + + + + + + Successfully Removed Başarıyla Kaldırıldı - + Successfully removed the installed base game. Yüklenmiş oyun başarıyla kaldırıldı. - + The base game is not installed in the NAND and cannot be removed. Asıl oyun NAND'de kurulu değil ve kaldırılamaz. - + Successfully removed the installed update. Yüklenmiş güncelleme başarıyla kaldırıldı. - + There is no update installed for this title. Bu oyun için yüklenmiş bir güncelleme yok. - + There are no DLC installed for this title. Bu oyun için yüklenmiş bir DLC yok. - + Successfully removed %1 installed DLC. %1 yüklenmiş DLC başarıyla kaldırıldı. - + Delete OpenGL Transferable Shader Cache? OpenGL Transfer Edilebilir Shader Cache'ini Kaldırmak İstediğinize Emin Misiniz? - + Delete Vulkan Transferable Shader Cache? Vulkan Transfer Edilebilir Shader Cache'ini Kaldırmak İstediğinize Emin Misiniz? - + Delete All Transferable Shader Caches? Tüm Transfer Edilebilir Shader Cache'leri Kaldırmak İstediğinize Emin Misiniz? - + Remove Custom Game Configuration? Oyuna Özel Yapılandırmayı Kaldırmak İstediğinize Emin Misiniz? - + Remove File Dosyayı Sil - - + + Error Removing Transferable Shader Cache Transfer Edilebilir Shader Cache Kaldırılırken Bir Hata Oluştu - - + + A shader cache for this title does not exist. Bu oyun için oluşturulmuş bir shader cache yok. - + Successfully removed the transferable shader cache. Transfer edilebilir shader cache başarıyla kaldırıldı. - + Failed to remove the transferable shader cache. Transfer edilebilir shader cache kaldırılamadı. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches Transfer Edilebilir Shader Cache'ler Kaldırılırken Bir Hata Oluştu - + Successfully removed the transferable shader caches. Transfer edilebilir shader cacheler başarıyla kaldırıldı. - + Failed to remove the transferable shader cache directory. Transfer edilebilir shader cache konumu kaldırılamadı. - - + + Error Removing Custom Configuration Oyuna Özel Yapılandırma Kaldırılırken Bir Hata Oluştu. - + A custom configuration for this title does not exist. Bu oyun için bir özel yapılandırma yok. - + Successfully removed the custom game configuration. Oyuna özel yapılandırma başarıyla kaldırıldı. - + Failed to remove the custom game configuration. Oyuna özel yapılandırma kaldırılamadı. - - + + RomFS Extraction Failed! RomFS Çıkartımı Başarısız! - + There was an error copying the RomFS files or the user cancelled the operation. RomFS dosyaları kopyalanırken bir hata oluştu veya kullanıcı işlemi iptal etti. - + Full Full - + Skeleton Çerçeve - + Select RomFS Dump Mode RomFS Dump Modunu Seçiniz - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Lütfen RomFS'in nasıl dump edilmesini istediğinizi seçin.<br>"Full" tüm dosyaları yeni bir klasöre kopyalarken <br>"skeleton" sadece klasör yapısını oluşturur. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 konumunda RomFS çıkarmaya yetecek alan yok. Lütfen yer açın ya da Emülasyon > Yapılandırma > Sistem > Dosya Sistemi > Dump konumu kısmından farklı bir çıktı konumu belirleyin. - + Extracting RomFS... RomFS çıkartılıyor... - - + + Cancel İptal - + RomFS Extraction Succeeded! RomFS Çıkartımı Başarılı! - + The operation completed successfully. İşlem başarıyla tamamlandı. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 %1 Açılırken Bir Hata Oluştu - + Select Directory Klasör Seç - + Properties Özellikler - + The game properties could not be loaded. Oyun özellikleri yüklenemedi. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Çalıştırılabilir Dosyası (%1);;Tüm Dosyalar (*.*) - + Load File Dosya Aç - + Open Extracted ROM Directory Çıkartılmış ROM klasörünü aç - + Invalid Directory Selected Geçersiz Klasör Seçildi - + The directory you have selected does not contain a 'main' file. Seçtiğiniz klasör bir "main" dosyası içermiyor. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Yüklenilebilir Switch Dosyası (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submissions Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Dosya Kur - + %n file(s) remaining %n dosya kaldı%n dosya kaldı - + Installing file "%1"... "%1" dosyası kuruluyor... - - + + Install Results Kurulum Sonuçları - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Olası çakışmaları önlemek için oyunları NAND'e yüklememenizi tavsiye ediyoruz. Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + %n file(s) were newly installed %n dosya güncel olarak yüklendi @@ -5111,7 +5086,7 @@ Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + %n file(s) were overwritten %n dosyanın üstüne yazıldı @@ -5119,7 +5094,7 @@ Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + %n file(s) failed to install %n dosya yüklenemedi @@ -5127,388 +5102,388 @@ Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + System Application Sistem Uygulaması - + System Archive Sistem Arşivi - + System Application Update Sistem Uygulama Güncellemesi - + Firmware Package (Type A) Yazılım Paketi (Tür A) - + Firmware Package (Type B) Yazılım Paketi (Tür B) - + Game Oyun - + Game Update Oyun Güncellemesi - + Game DLC Oyun DLC'si - + Delta Title Delta Başlık - + Select NCA Install Type... NCA Kurulum Tipi Seçin... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Lütfen bu NCA dosyası için belirlemek istediğiniz başlık türünü seçiniz: (Çoğu durumda, varsayılan olan 'Oyun' kullanılabilir.) - + Failed to Install Kurulum Başarısız Oldu - + The title type you selected for the NCA is invalid. NCA için seçtiğiniz başlık türü geçersiz - + File not found Dosya Bulunamadı - + File "%1" not found Dosya "%1" Bulunamadı - + OK Tamam - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Kayıp yuzu Hesabı - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Oyun uyumluluk test çalışması göndermek için öncelikle yuzu hesabınla giriş yapmanız gerekiyor.<br><br/>Yuzu hesabınızla giriş yapmak için, Emülasyon &gt; Yapılandırma &gt; Web'e gidiniz. - + Error opening URL URL açılırken bir hata oluştu - + Unable to open the URL "%1". URL "%1" açılamıyor. - + TAS Recording TAS kayıtta - + Overwrite file of player 1? Oyuncu 1'in dosyasının üstüne yazılsın mı? - + Invalid config detected Geçersiz yapılandırma tespit edildi - + Handheld controller can't be used on docked mode. Pro controller will be selected. Handheld kontrolcü dock modunda kullanılamaz. Pro kontrolcü seçilecek. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Amiibo kaldırıldı - + Error Hata - - + + The current game is not looking for amiibos Aktif oyun amiibo beklemiyor - + Amiibo File (%1);; All Files (*.*) Amiibo Dosyası (%1);; Tüm Dosyalar (*.*) - + Load Amiibo Amiibo Yükle - + Error loading Amiibo data Amiibo verisi yüklenirken hata - + The selected file is not a valid amiibo Seçtiğiniz dosya geçerli bir amiibo değil - + The selected file is already on use Seçtiğiniz dosya hali hazırda kullanılıyor - + An unknown error occurred - + Capture Screenshot Ekran Görüntüsü Al - + PNG Image (*.png) PNG görüntüsü (*.png) - + TAS state: Running %1/%2 TAS durumu: %1%2 çalışıyor - + TAS state: Recording %1 TAS durumu: %1 kaydediliyor - + TAS state: Idle %1/%2 TAS durumu: %1%2 boşta - + TAS State: Invalid TAS durumu: Geçersiz - + &Stop Running &Çalıştırmayı durdur - + &Start &Başlat - + Stop R&ecording K&aydetmeyi Durdur - + R&ecord K&aydet - + Building: %n shader(s) Oluşturuluyor: %n shaderOluşturuluyor: %n shader - + Scale: %1x %1 is the resolution scaling factor Ölçek: %1x - + Speed: %1% / %2% Hız %1% / %2% - + Speed: %1% Hız: %1% - + Game: %1 FPS (Unlocked) Oyun: %1 FPS (Sınırsız) - + Game: %1 FPS Oyun: %1 FPS - + Frame: %1 ms Kare: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU YÜKSEK - + GPU EXTREME GPU EKSTREM - + GPU ERROR GPU HATASI - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST EN YAKIN - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSYEN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA AA YOK - + FXAA FXAA - + SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation Anahtar Yeniden Türetimini Onayla - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5525,37 +5500,37 @@ ve opsiyonel olarak yedekler alın. Bu sizin otomatik oluşturulmuş anahtar dosyalarınızı silecek ve anahtar türetme modülünü tekrar çalıştıracak. - + Missing fuses Anahtarlar Kayıp - + - Missing BOOT0 - BOOT0 Kayıp - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main Kayıp - + - Missing PRODINFO - PRODINFO Kayıp - + Derivation Components Missing Türeten Bileşenleri Kayıp - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Şifreleme anahtarları eksik. <br>Lütfen takip edin<a href='https://yuzu-emu.org/help/quickstart/'>yuzu hızlı başlangıç kılavuzunu</a>tüm anahtarlarınızı, aygıt yazılımınızı ve oyunlarınızı almada.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5564,39 +5539,39 @@ Bu sistem performansınıza bağlı olarak bir dakika kadar zaman alabilir. - + Deriving Keys Anahtarlar Türetiliyor - + Select RomFS Dump Target RomFS Dump Hedefini Seçiniz - + Please select which RomFS you would like to dump. Lütfen dump etmek istediğiniz RomFS'i seçiniz. - + Are you sure you want to close yuzu? yuzu'yu kapatmak istediğinizden emin misiniz? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Emülasyonu durdurmak istediğinizden emin misiniz? Kaydedilmemiş veriler kaybolur. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7599,28 +7574,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) Hata Kodu: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. Bir hata oluştu. Lütfen tekrar deneyin ya da yazılımın geliştiricisiyle iletişime geçin. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. %1 %2'de bir hata oluştu. Lütfen tekrar deneyin ya da yazılımın geliştiricisiyle iletişime geçin. - + An error has occurred. %1 @@ -7644,20 +7619,81 @@ Lütfen tekrar deneyin ya da yazılımın geliştiricisiyle iletişime geçin. - - Select a user: - Kullanıcı Seç: - - - + Users Kullanıcılar - + + Profile Creator + + + + + Profile Selector Profil Seçici + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Kullanıcı Seç: + QtSoftwareKeyboardDialog @@ -7707,51 +7743,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Çağrı yığını - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - mutex bekleniyor 0x%1 - - - - has waiters: %1 - bekleyenler: %1 - - - - owner handle: 0x%1 - owner handle: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - tüm objeler için bekleniyor - - - - waiting for one of the following objects - bu objeler için bekleniyor - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + - + waited by no thread hiçbir thread beklemedi @@ -7759,120 +7764,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable çalışabilir - + paused duraklatıldı - + sleeping uyuyor - + waiting for IPC reply IPC cevabı bekleniyor - + waiting for objects objeler bekleniyor - + waiting for condition variable koşul değişkeni bekleniyor - + waiting for address arbiter adres belirleyici bekleniyor - + waiting for suspend resume askıdaki işlemin sürdürülmesi bekleniyor - + waiting bekleniyor - + initialized başlatıldı - + terminated sonlandırıldı - + unknown bilinmeyen - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal ideal - + core %1 çekirdek %1 - + processor = %1 işlemci = %1 - - ideal core = %1 - ideal çekirdek = %1 - - - + affinity mask = %1 affinity mask = %1 - + thread id = %1 izlek id: %1 - + priority = %1(current) / %2(normal) öncelik = %1(geçerli) / %2(normal) - + last running ticks = %1 son çalışan tickler = %1 - - - not waiting for mutex - mutex için beklenmiyor - WaitTreeThreadList - + waited by thread izlek bekledi @@ -7880,7 +7875,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree &Wait Tree diff --git a/dist/languages/uk.ts b/dist/languages/uk.ts index 91e927cf5..02bdf2233 100644 --- a/dist/languages/uk.ts +++ b/dist/languages/uk.ts @@ -380,36 +380,61 @@ This would ban both their forum username and their IP address. - Output Device - Пристрій виводу + Output Device: + - Input Device - Пристрій вводу + Input Device: + - + + Sound Output Mode: + + + + + Mono + Моно + + + + Stereo + Стерео + + + + Surround + Об'ємний звук + + + Use global volume Використовувати загальну гучність - + Set volume: Встановити гучність: - + Volume: Гучність - + 0 % 0 % - + + Mute audio when in background + Приглушити звук у фоновому режимі + + + %1% Volume percentage (e.g. 50%) %1% @@ -1341,26 +1366,21 @@ This would ban both their forum username and their IP address. - Mute audio when in background - Приглушити звук у фоновому режимі - - - Hide mouse on inactivity Приховування миші при бездіяльності - + Reset All Settings Скинути всі налаштування - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Це скине всі налаштування і видалить усі конфігурації під окремі ігри. При цьому не будуть видалені шляхи до ігор, профілів або профілів вводу. Продовжити? @@ -3794,60 +3814,15 @@ UUID: %2 Назва пристрою - - Mono - Моно - - - - Stereo - Стерео - - - - Surround - Об'ємний звук - - - - Console ID: - Ідентифікатор консолі: - - - - Sound output mode - Режим виводу звуку - - - - Regenerate - Перегенерувати - - - + System settings are available only when game is not running. Налаштування системи доступні тільки тоді, коли гру не запущено. - + Warning: "%1" is not a valid language for region "%2" Увага: мова "%1" не підходить для регіону "%2" - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Це замінить ваш поточний віртуальний Switch новим. Ваш поточний віртуальний Switch буде безповоротно втрачено. Це може мати несподівані наслідки в іграх. Може не спрацювати, якщо ви використовуєте застарілу конфігурацію збережених ігор. Продовжити? - - - - Warning - Увага - - - - Console ID: 0x%1 - Ідентифікатор консолі: 0x%1 - ConfigureTas @@ -4535,555 +4510,555 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Анонімні дані збираються для того,</a> щоб допомогти поліпшити роботу yuzu. <br/><br/>Хотіли б ви ділитися даними про використання з нами? - + Telemetry Телеметрія - + Broken Vulkan Installation Detected Виявлено пошкоджену інсталяцію Vulkan - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. Не вдалося виконати ініціалізацію Vulkan під час завантаження.<br><br>Натисніть <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>тут для отримання інструкцій щодо усунення проблеми</a>. - + Loading Web Applet... Завантаження веб-аплета... - - + + Disable Web Applet Вимкнути веб-аплет - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Вимкнення веб-апплета може призвести до несподіваної поведінки, і його слід вимикати лише заради Super Mario 3D All-Stars. Ви впевнені, що хочете вимкнути веб-апплет? (Його можна знову ввімкнути в налаштуваннях налагодження.) - + The amount of shaders currently being built Кількість створюваних шейдерів на цей момент - + The current selected resolution scaling multiplier. Поточний обраний множник масштабування роздільної здатності. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Поточна швидкість емуляції. Значення вище або нижче 100% вказують на те, що емуляція йде швидше або повільніше, ніж на Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Кількість кадрів на секунду в цей момент. Значення буде змінюватися між іграми та сценами. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Час, який потрібен для емуляції 1 кадру Switch, не беручи до уваги обмеження FPS або вертикальну синхронізацію. Для емуляції в повній швидкості значення має бути не більше 16,67 мс. - + &Clear Recent Files [&C] Очистити нещодавні файли - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue [&C] Продовжити - + &Pause [&P] Пауза - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping В yuzu запущено гру - + Warning Outdated Game Format Попередження застарілий формат гри - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Для цієї гри ви використовуєте розархівований формат ROM'а, який є застарілим і був замінений іншими, такими як NCA, NAX, XCI або NSP. У розархівованих каталогах ROM'а відсутні іконки, метадані та підтримка оновлень. <br><br>Для отримання інформації про різні формати Switch, підтримувані yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>перегляньте нашу вікі</a>. Це повідомлення більше не буде відображатися. - - + + Error while loading ROM! Помилка під час завантаження ROM! - + The ROM format is not supported. Формат ROM'а не підтримується. - + An error occurred initializing the video core. Сталася помилка під час ініціалізації відеоядра. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu зіткнувся з помилкою під час запуску відеоядра. Зазвичай це спричинено застарілими драйверами ГП, включно з інтегрованими. Перевірте журнал для отримання більш детальної інформації. Додаткову інформацію про доступ до журналу дивіться на наступній сторінці: <a href='https://yuzu-emu.org/help/reference/log-files/'>Як завантажити файл журналу</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Помилка під час завантаження ROM'а! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Будь ласка, дотримуйтесь <a href='https://yuzu-emu.org/help/quickstart/'>короткого керівництва користувача yuzu</a> щоб пере-дампити ваші файли<br>Ви можете звернутися до вікі yuzu</a> або Discord yuzu</a> для допомоги - + An unknown error occurred. Please see the log for more details. Сталася невідома помилка. Будь ласка, перевірте журнал для подробиць. - + (64-bit) (64-бітний) - + (32-bit) (32-бітний) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Закриваємо програму... - + Save Data Збереження - + Mod Data Дані модів - + Error Opening %1 Folder Помилка під час відкриття папки %1 - - + + Folder does not exist! Папка не існує! - + Error Opening Transferable Shader Cache Помилка під час відкриття переносного кешу шейдерів - + Failed to create the shader cache directory for this title. Не вдалося створити папку кешу шейдерів для цієї гри. - + Error Removing Contents Помилка під час видалення вмісту - + Error Removing Update Помилка під час видалення оновлень - + Error Removing DLC Помилка під час видалення DLC - + Remove Installed Game Contents? Видалити встановлений вміст ігор? - + Remove Installed Game Update? Видалити встановлені оновлення гри? - + Remove Installed Game DLC? Видалити встановлені DLC гри? - + Remove Entry Видалити запис - - - - - - + + + + + + Successfully Removed Успішно видалено - + Successfully removed the installed base game. Встановлену гру успішно видалено. - + The base game is not installed in the NAND and cannot be removed. Гру не встановлено в NAND і не може буде видалено. - + Successfully removed the installed update. Встановлене оновлення успішно видалено. - + There is no update installed for this title. Для цієї гри не було встановлено оновлення. - + There are no DLC installed for this title. Для цієї гри не було встановлено DLC. - + Successfully removed %1 installed DLC. Встановлений DLC %1 було успішно видалено - + Delete OpenGL Transferable Shader Cache? Видалити переносний кеш шейдерів OpenGL? - + Delete Vulkan Transferable Shader Cache? Видалити переносний кеш шейдерів Vulkan? - + Delete All Transferable Shader Caches? Видалити весь переносний кеш шейдерів? - + Remove Custom Game Configuration? Видалити користувацьке налаштування гри? - + Remove File Видалити файл - - + + Error Removing Transferable Shader Cache Помилка під час видалення переносного кешу шейдерів - - + + A shader cache for this title does not exist. Кеш шейдерів для цієї гри не існує. - + Successfully removed the transferable shader cache. Переносний кеш шейдерів успішно видалено. - + Failed to remove the transferable shader cache. Не вдалося видалити переносний кеш шейдерів. - + Error Removing Vulkan Driver Pipeline Cache Помилка під час видалення конвеєрного кешу Vulkan - + Failed to remove the driver pipeline cache. Не вдалося видалити конвеєрний кеш шейдерів. - - + + Error Removing Transferable Shader Caches Помилка під час видалення переносного кешу шейдерів - + Successfully removed the transferable shader caches. Переносний кеш шейдерів успішно видалено. - + Failed to remove the transferable shader cache directory. Помилка під час видалення папки переносного кешу шейдерів. - - + + Error Removing Custom Configuration Помилка під час видалення користувацького налаштування - + A custom configuration for this title does not exist. Користувацьких налаштувань для цієї гри не існує. - + Successfully removed the custom game configuration. Користувацьке налаштування гри успішно видалено. - + Failed to remove the custom game configuration. Не вдалося видалити користувацьке налаштування гри. - - + + RomFS Extraction Failed! Не вдалося вилучити RomFS! - + There was an error copying the RomFS files or the user cancelled the operation. Сталася помилка під час копіювання файлів RomFS або користувач скасував операцію. - + Full Повний - + Skeleton Скелет - + Select RomFS Dump Mode Виберіть режим дампа RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Будь ласка, виберіть, як ви хочете виконати дамп RomFS <br>Повний скопіює всі файли в нову папку, тоді як <br>скелет створить лише структуру папок. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root В %1 недостатньо вільного місця для вилучення RomFS. Будь ласка, звільніть місце або виберіть іншу папку для дампа в Емуляція > Налаштування > Система > Файлова система > Корінь дампа - + Extracting RomFS... Вилучення RomFS... - - + + Cancel Скасувати - + RomFS Extraction Succeeded! Вилучення RomFS пройшло успішно! - + The operation completed successfully. Операція завершилася успішно. - - - - - + + + + + Create Shortcut Створити ярлик - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Це створить ярлик для поточного AppImage. Він може не працювати після оновлень. Продовжити? - + Cannot create shortcut on desktop. Path "%1" does not exist. Не вдається створити ярлик на робочому столі. Шлях "%1" не існує. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Неможливо створити ярлик у меню додатків. Шлях "%1" не існує і не може бути створений. - + Create Icon Створити іконку - + Cannot create icon file. Path "%1" does not exist and cannot be created. Неможливо створити файл іконки. Шлях "%1" не існує і не може бути створений. - + Start %1 with the yuzu Emulator Запустити %1 за допомогою емулятора yuzu - + Failed to create a shortcut at %1 Не вдалося створити ярлик у %1 - + Successfully created a shortcut to %1 Успішно створено ярлик у %1 - + Error Opening %1 Помилка відкриття %1 - + Select Directory Обрати папку - + Properties Властивості - + The game properties could not be loaded. Не вдалося завантажити властивості гри. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Виконуваний файл Switch (%1);;Усі файли (*.*) - + Load File Завантажити файл - + Open Extracted ROM Directory Відкрити папку вилученого ROM'а - + Invalid Directory Selected Вибрано неприпустиму папку - + The directory you have selected does not contain a 'main' file. Папка, яку ви вибрали, не містить файлу 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Встановлюваний файл Switch (*.nca, *.nsp, *.xci);;Архів контенту Nintendo (*.nca);;Пакет подачі Nintendo (*.nsp);;Образ картриджа NX (*.xci) - + Install Files Встановити файли - + %n file(s) remaining Залишився %n файлЗалишилося %n файл(ів)Залишилося %n файл(ів)Залишилося %n файл(ів) - + Installing file "%1"... Встановлення файлу "%1"... - - + + Install Results Результати встановлення - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Щоб уникнути можливих конфліктів, ми не рекомендуємо користувачам встановлювати ігри в NAND. Будь ласка, використовуйте цю функцію тільки для встановлення оновлень і завантажуваного контенту. - + %n file(s) were newly installed %n файл було нещодавно встановлено @@ -5093,7 +5068,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) were overwritten %n файл було перезаписано @@ -5103,7 +5078,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) failed to install %n файл не вдалося встановити @@ -5113,388 +5088,388 @@ Please, only use this feature to install updates and DLC. - + System Application Системний додаток - + System Archive Системний архів - + System Application Update Оновлення системного додатку - + Firmware Package (Type A) Пакет прошивки (Тип А) - + Firmware Package (Type B) Пакет прошивки (Тип Б) - + Game Гра - + Game Update Оновлення гри - + Game DLC DLC до гри - + Delta Title Дельта-титул - + Select NCA Install Type... Виберіть тип установки NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Будь ласка, виберіть тип додатку, який ви хочете встановити для цього NCA: (У більшості випадків, підходить стандартний вибір "Гра".) - + Failed to Install Помилка встановлення - + The title type you selected for the NCA is invalid. Тип додатку, який ви вибрали для NCA, недійсний. - + File not found Файл не знайдено - + File "%1" not found Файл "%1" не знайдено - + OK ОК - - + + Hardware requirements not met Не задоволені системні вимоги - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Ваша система не відповідає рекомендованим системним вимогам. Звіти про сумісність було вимкнено. - + Missing yuzu Account Відсутній обліковий запис yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Щоб надіслати звіт про сумісність гри, необхідно прив'язати свій обліковий запис yuzu. <br><br/>Щоб прив'язати свій обліковий запис yuzu, перейдіть у розділ Емуляція &gt; Параметри &gt; Мережа. - + Error opening URL Помилка під час відкриття URL - + Unable to open the URL "%1". Не вдалося відкрити URL: "%1". - + TAS Recording Запис TAS - + Overwrite file of player 1? Перезаписати файл гравця 1? - + Invalid config detected Виявлено неприпустиму конфігурацію - + Handheld controller can't be used on docked mode. Pro controller will be selected. Портативний контролер не може бути використаний у режимі док-станції. Буде обрано контролер Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Поточний amiibo було прибрано - + Error Помилка - - + + The current game is not looking for amiibos Поточна гра не шукає amiibo - + Amiibo File (%1);; All Files (*.*) Файл Amiibo (%1);; Всі Файли (*.*) - + Load Amiibo Завантажити Amiibo - + Error loading Amiibo data Помилка під час завантаження даних Amiibo - + The selected file is not a valid amiibo Обраний файл не є допустимим amiibo - + The selected file is already on use Обраний файл уже використовується - + An unknown error occurred Виникла невідома помилка - + Capture Screenshot Зробити знімок екрану - + PNG Image (*.png) Зображення PNG (*.png) - + TAS state: Running %1/%2 Стан TAS: Виконується %1/%2 - + TAS state: Recording %1 Стан TAS: Записується %1 - + TAS state: Idle %1/%2 Стан TAS: Простий %1/%2 - + TAS State: Invalid Стан TAS: Неприпустимий - + &Stop Running [&S] Зупинка - + &Start [&S] Почати - + Stop R&ecording [&E] Закінчити запис - + R&ecord [&E] Запис - + Building: %n shader(s) Побудова: %n шейдерПобудова: %n шейдер(ів)Побудова: %n шейдер(ів)Побудова: %n шейдер(ів) - + Scale: %1x %1 is the resolution scaling factor Масштаб: %1x - + Speed: %1% / %2% Швидкість: %1% / %2% - + Speed: %1% Швидкість: %1% - + Game: %1 FPS (Unlocked) Гра: %1 FPS (Необмежено) - + Game: %1 FPS Гра: %1 FPS - + Frame: %1 ms Кадр: %1 мс - + GPU NORMAL ГП НОРМАЛЬНО - + GPU HIGH ГП ВИСОКО - + GPU EXTREME ГП ЕКСТРИМ - + GPU ERROR ГП ПОМИЛКА - + DOCKED В ДОК-СТАНЦІЇ - + HANDHELD ПОРТАТИВНИЙ - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST НАЙБЛИЖЧІЙ - - + + BILINEAR БІЛІНІЙНИЙ - + BICUBIC БІКУБІЧНИЙ - + GAUSSIAN ГАУС - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA БЕЗ ЗГЛАДЖУВАННЯ - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE ГУЧНІСТЬ: ЗАГЛУШЕНА - + VOLUME: %1% Volume percentage (e.g. 50%) ГУЧНІСТЬ: %1% - + Confirm Key Rederivation Підтвердіть перерахунок ключа - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5511,37 +5486,37 @@ This will delete your autogenerated key files and re-run the key derivation modu Це видалить ваші автоматично згенеровані файли ключів і повторно запустить модуль розрахунку ключів. - + Missing fuses Відсутні запобіжники - + - Missing BOOT0 - Відсутній BOOT0 - + - Missing BCPKG2-1-Normal-Main - Відсутній BCPKG2-1-Normal-Main - + - Missing PRODINFO - Відсутній PRODINFO - + Derivation Components Missing Компоненти розрахунку відсутні - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Ключі шифрування відсутні.<br>Будь ласка, дотримуйтесь <a href='https://yuzu-emu.org/help/quickstart/'>короткого керівництва користувача yuzu</a>, щоб отримати всі ваші ключі, прошивку та ігри<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5550,39 +5525,39 @@ on your system's performance. від продуктивності вашої системи. - + Deriving Keys Отримання ключів - + Select RomFS Dump Target Оберіть ціль для дампа RomFS - + Please select which RomFS you would like to dump. Будь ласка, виберіть, який RomFS ви хочете здампити. - + Are you sure you want to close yuzu? Ви впевнені, що хочете закрити yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Ви впевнені, що хочете зупинити емуляцію? Будь-який незбережений прогрес буде втрачено. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7586,28 +7561,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) Код помилки: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. Сталася помилка. Будь ласка, спробуйте ще раз або зв'яжіться з розробником ПЗ. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. Сталася помилка на %1 у %2. Будь ласка, спробуйте ще раз або зв'яжіться з розробником ПЗ. - + An error has occurred. %1 @@ -7631,20 +7606,81 @@ Please try again or contact the developer of the software. %2 - - Select a user: - Оберить користувача - - - + Users Користувачі - + + Profile Creator + + + + + Profile Selector Вибір профілю + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Оберить користувача + QtSoftwareKeyboardDialog @@ -7694,51 +7730,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Стек викликів - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - - - - - has waiters: %1 - - - - - owner handle: 0x%1 - - - - - WaitTreeObjectList - - - waiting for all objects - - - - - waiting for one of the following objects - - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + - + waited by no thread @@ -7746,120 +7751,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable - + paused - + sleeping - + waiting for IPC reply - + waiting for objects - + waiting for condition variable - + waiting for address arbiter - + waiting for suspend resume - + waiting - + initialized - + terminated - + unknown - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal - + core %1 - + processor = %1 - - ideal core = %1 - - - - + affinity mask = %1 - + thread id = %1 - + priority = %1(current) / %2(normal) - + last running ticks = %1 - - - not waiting for mutex - - WaitTreeThreadList - + waited by thread @@ -7867,7 +7862,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree [&W] Дерево очікування diff --git a/dist/languages/zh_CN.ts b/dist/languages/zh_CN.ts index 4a9fe2013..9da8b0b32 100644 --- a/dist/languages/zh_CN.ts +++ b/dist/languages/zh_CN.ts @@ -380,36 +380,61 @@ This would ban both their forum username and their IP address. - Output Device - 输出设备 + Output Device: + 输出设备： - Input Device - 输入设备 + Input Device: + 输入设备： - + + Sound Output Mode: + 声音输出模式： + + + + Mono + 单声道 + + + + Stereo + 立体声 + + + + Surround + 环绕声 + + + Use global volume 使用全局音量 - + Set volume: 音量： - + Volume: 音量： - + 0 % 0 % - + + Mute audio when in background + 模拟器位于后台时静音 + + + %1% Volume percentage (e.g. 50%) %1% @@ -1375,26 +1400,21 @@ This would ban both their forum username and their IP address. - Mute audio when in background - 模拟器位于后台时静音 - - - Hide mouse on inactivity 自动隐藏鼠标光标 - + Reset All Settings 重置所有设置项 - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? 将重置模拟器所有设置并删除所有游戏的单独设置。这不会删除游戏目录、个人文件及输入配置文件。是否继续？ @@ -3828,60 +3848,15 @@ UUID: %2 设备名称 - - Mono - 单声道 - - - - Stereo - 立体声 - - - - Surround - 环绕声 - - - - Console ID: - 设备 ID: - - - - Sound output mode - 声音输出模式 - - - - Regenerate - 重置 ID - - - + System settings are available only when game is not running. 只有当游戏不在运行时，系统设置才可用。 - + Warning: "%1" is not a valid language for region "%2" 警告：“ %1 ”并不是“ %2 ”地区的有效语言 - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - 这将使用一个新的虚拟 Switch 取代你当前的虚拟 Switch。您当前的虚拟 Switch 将无法恢复。在部分游戏中可能会出现意外效果。如果你使用一个过时的配置存档这可能会失败。确定要继续吗？ - - - - Warning - 警告 - - - - Console ID: 0x%1 - 设备 ID: 0x%1 - ConfigureTas @@ -4569,957 +4544,957 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>我们收集匿名数据</a>来帮助改进 yuzu 。<br/><br/>您愿意和我们分享您的使用数据吗？ - + Telemetry 使用数据共享 - + Broken Vulkan Installation Detected 检测到 Vulkan 的安装已损坏 - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. Vulkan 初始化失败。<br><br>点击<a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>这里</a>获取此问题的相关信息。 - + Loading Web Applet... 正在加载 Web 应用程序... - - + + Disable Web Applet 禁用 Web 应用程序 - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) 禁用 Web 应用程序可能会发生未知的行为，且只能在《超级马里奥 3D 全明星》中使用。您确定要禁用 Web 应用程序吗？ (您可以在调试选项中重新启用它。) - + The amount of shaders currently being built 当前正在构建的着色器数量 - + The current selected resolution scaling multiplier. 当前选定的分辨率缩放比例。 - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. 当前的模拟速度。高于或低于 100% 的值表示运行速度比实际的 Switch 更快或更慢。 - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. 游戏当前运行的帧率。这将因游戏和场景的不同而有所变化。 - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. 在不计算速度限制和垂直同步的情况下，模拟一个 Switch 帧的实际时间。若要进行全速模拟，这个数值不应超过 16.67 毫秒。 - + &Clear Recent Files 清除最近文件 (&C) - + Emulated mouse is enabled 已启用模拟鼠标 - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. 实体鼠标输入与鼠标平移不兼容。请在高级输入设置中禁用模拟鼠标以使用鼠标平移。 - + &Continue 继续 (&C) - + &Pause 暂停 (&P) - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu 正在运行中 - + Warning Outdated Game Format 过时游戏格式警告 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. 目前使用的游戏为解体的 ROM 目录格式，这是一种过时的格式，已被其他格式替代，如 NCA，NAX，XCI 或 NSP。解体的 ROM 目录缺少图标、元数据和更新支持。<br><br>有关 yuzu 支持的各种 Switch 格式的说明，<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>请查看我们的 wiki</a>。此消息将不会再次出现。 - - + + Error while loading ROM! 加载 ROM 时出错！ - + The ROM format is not supported. 该 ROM 格式不受支持。 - + An error occurred initializing the video core. 初始化视频核心时发生错误 - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu 在运行视频核心时发生错误。这可能是由 GPU 驱动程序过旧造成的。有关详细信息，请参阅日志文件。关于日志文件的更多信息，请参考以下页面：<a href='https://yuzu-emu.org/help/reference/log-files/'>如何上传日志文件</a>。 - + Error while loading ROM! %1 %1 signifies a numeric error code. 加载 ROM 时出错！ %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>请参考<a href='https://yuzu-emu.org/help/quickstart/'>yuzu 快速导航</a>以获取相关文件。<br>您可以参考 yuzu 的 wiki 页面</a>或 Discord 社区</a>以获得帮助。 - + An unknown error occurred. Please see the log for more details. 发生了未知错误。请查看日志了解详情。 - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... 正在关闭… - + Save Data 保存数据 - + Mod Data Mod 数据 - + Error Opening %1 Folder 打开 %1 文件夹时出错 - - + + Folder does not exist! 文件夹不存在！ - + Error Opening Transferable Shader Cache 打开可转移着色器缓存时出错 - + Failed to create the shader cache directory for this title. 为该游戏创建着色器缓存目录时失败。 - + Error Removing Contents 删除内容时出错 - + Error Removing Update 删除更新时出错 - + Error Removing DLC 删除 DLC 时出错 - + Remove Installed Game Contents? 删除已安装的游戏内容？ - + Remove Installed Game Update? 删除已安装的游戏更新？ - + Remove Installed Game DLC? 删除已安装的游戏 DLC 内容？ - + Remove Entry 删除项目 - - - - - - + + + + + + Successfully Removed 删除成功 - + Successfully removed the installed base game. 成功删除已安装的游戏。 - + The base game is not installed in the NAND and cannot be removed. 该游戏未安装于 NAND 中，无法删除。 - + Successfully removed the installed update. 成功删除已安装的游戏更新。 - + There is no update installed for this title. 这个游戏没有任何已安装的更新。 - + There are no DLC installed for this title. 这个游戏没有任何已安装的 DLC 。 - + Successfully removed %1 installed DLC. 成功删除游戏 %1 安装的 DLC 。 - + Delete OpenGL Transferable Shader Cache? 删除 OpenGL 模式的着色器缓存？ - + Delete Vulkan Transferable Shader Cache? 删除 Vulkan 模式的着色器缓存？ - + Delete All Transferable Shader Caches? 删除所有的着色器缓存？ - + Remove Custom Game Configuration? 移除自定义游戏设置？ - + Remove File 删除文件 - - + + Error Removing Transferable Shader Cache 删除着色器缓存时出错 - - + + A shader cache for this title does not exist. 这个游戏的着色器缓存不存在。 - + Successfully removed the transferable shader cache. 成功删除着色器缓存。 - + Failed to remove the transferable shader cache. 删除着色器缓存失败。 - + Error Removing Vulkan Driver Pipeline Cache 删除 Vulkan 驱动程序管线缓存时出错 - + Failed to remove the driver pipeline cache. 删除驱动程序管线缓存失败。 - - + + Error Removing Transferable Shader Caches 删除着色器缓存时出错 - + Successfully removed the transferable shader caches. 着色器缓存删除成功。 - + Failed to remove the transferable shader cache directory. 删除着色器缓存目录失败。 - - + + Error Removing Custom Configuration 移除自定义游戏设置时出错 - + A custom configuration for this title does not exist. 这个游戏的自定义设置不存在。 - + Successfully removed the custom game configuration. 成功移除自定义游戏设置。 - + Failed to remove the custom game configuration. 移除自定义游戏设置失败。 - - + + RomFS Extraction Failed! RomFS 提取失败！ - + There was an error copying the RomFS files or the user cancelled the operation. 复制 RomFS 文件时出错，或用户取消了操作。 - + Full 完整 - + Skeleton 框架 - + Select RomFS Dump Mode 选择 RomFS 转储模式 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. 请选择 RomFS 转储的方式。<br>“完整” 会将所有文件复制到新目录中，而<br>“框架” 只会创建目录结构。 - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 没有足够的空间用于提取 RomFS。请保持足够的空间或于模拟—>设置—>系统—>文件系统—>转储根目录中选择一个其他目录。 - + Extracting RomFS... 正在提取 RomFS... - - + + Cancel 取消 - + RomFS Extraction Succeeded! RomFS 提取成功！ - + The operation completed successfully. 操作成功完成。 - - - - - + + + + + Create Shortcut 创建快捷方式 - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? 这将为当前的游戏创建快捷方式。但在其更新后，快捷方式可能无法正常工作。是否继续？ - + Cannot create shortcut on desktop. Path "%1" does not exist. 无法在桌面创建快捷方式。路径“ %1 ”不存在。 - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. 无法在应用程序菜单中创建快捷方式。路径“ %1 ”不存在且无法被创建。 - + Create Icon 创建图标 - + Cannot create icon file. Path "%1" does not exist and cannot be created. 无法创建图标文件。路径“ %1 ”不存在且无法被创建。 - + Start %1 with the yuzu Emulator 使用 yuzu 启动 %1 - + Failed to create a shortcut at %1 在 %1 处创建快捷方式时失败 - + Successfully created a shortcut to %1 成功地在 %1 处创建快捷方式 - + Error Opening %1 打开 %1 时出错 - + Select Directory 选择目录 - + Properties 属性 - + The game properties could not be loaded. 无法加载该游戏的属性信息。 - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch 可执行文件 (%1);;所有文件 (*.*) - + Load File 加载文件 - + Open Extracted ROM Directory 打开提取的 ROM 目录 - + Invalid Directory Selected 选择的目录无效 - + The directory you have selected does not contain a 'main' file. 选择的目录不包含 “main” 文件。 - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) 可安装 Switch 文件 (*.nca *.nsp *.xci);;任天堂内容档案 (*.nca);;任天堂应用包 (*.nsp);;NX 卡带镜像 (*.xci) - + Install Files 安装文件 - + %n file(s) remaining 剩余 %n 个文件 - + Installing file "%1"... 正在安装文件 "%1"... - - + + Install Results 安装结果 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 为了避免可能存在的冲突，我们不建议将游戏本体安装到 NAND 中。 此功能仅用于安装游戏更新和 DLC 。 - + %n file(s) were newly installed 最近安装了 %n 个文件 - + %n file(s) were overwritten %n 个文件被覆盖 - + %n file(s) failed to install %n 个文件安装失败 - + System Application 系统应用 - + System Archive 系统档案 - + System Application Update 系统应用更新 - + Firmware Package (Type A) 固件包 (A型) - + Firmware Package (Type B) 固件包 (B型) - + Game 游戏 - + Game Update 游戏更新 - + Game DLC 游戏 DLC - + Delta Title 差量程序 - + Select NCA Install Type... 选择 NCA 安装类型... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) 请选择此 NCA 的程序类型： （在大多数情况下，选择默认的“游戏”即可。） - + Failed to Install 安装失败 - + The title type you selected for the NCA is invalid. 选择的 NCA 程序类型无效。 - + File not found 找不到文件 - + File "%1" not found 文件 "%1" 未找到 - + OK 确定 - - + + Hardware requirements not met 硬件不满足要求 - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. 您的系统不满足运行 yuzu 的推荐配置。兼容性报告已被禁用。 - + Missing yuzu Account 未设置 yuzu 账户 - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. 要提交游戏兼容性测试用例，您必须设置您的 yuzu 帐户。<br><br/>要设置您的 yuzu 帐户，请转到模拟 &gt; 设置 &gt; 网络。 - + Error opening URL 打开 URL 时出错 - + Unable to open the URL "%1". 无法打开 URL : "%1" 。 - + TAS Recording TAS 录制中 - + Overwrite file of player 1? 覆盖玩家 1 的文件？ - + Invalid config detected 检测到无效配置 - + Handheld controller can't be used on docked mode. Pro controller will be selected. 掌机手柄无法在主机模式中使用。将会选择 Pro controller。 - - + + Amiibo Amiibo - - + + The current amiibo has been removed 当前的 Amiibo 已被移除。 - + Error 错误 - - + + The current game is not looking for amiibos 当前游戏并没有在寻找 Amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo 文件 (%1);; 全部文件 (*.*) - + Load Amiibo 加载 Amiibo - + Error loading Amiibo data 加载 Amiibo 数据时出错 - + The selected file is not a valid amiibo 选择的文件并不是有效的 amiibo - + The selected file is already on use 选择的文件已在使用中 - + An unknown error occurred 发生了未知错误 - + Capture Screenshot 捕获截图 - + PNG Image (*.png) PNG 图像 (*.png) - + TAS state: Running %1/%2 TAS 状态：正在运行 %1/%2 - + TAS state: Recording %1 TAS 状态：正在录制 %1 - + TAS state: Idle %1/%2 TAS 状态：空闲 %1/%2 - + TAS State: Invalid TAS 状态：无效 - + &Stop Running 停止运行 (&S) - + &Start 开始 (&S) - + Stop R&ecording 停止录制 (&E) - + R&ecord 录制 (&E) - + Building: %n shader(s) 正在编译 %n 个着色器文件 - + Scale: %1x %1 is the resolution scaling factor 缩放比例: %1x - + Speed: %1% / %2% 速度: %1% / %2% - + Speed: %1% 速度: %1% - + Game: %1 FPS (Unlocked) FPS: %1 (未锁定) - + Game: %1 FPS FPS: %1 - + Frame: %1 ms 帧延迟: %1 毫秒 - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HIGH - + GPU EXTREME GPU EXTREME - + GPU ERROR GPU ERROR - + DOCKED 主机模式 - + HANDHELD 掌机模式 - + OPENGL OPENGL - + VULKAN VULKAN - + NULL 无 - + NEAREST 邻近取样 - - + + BILINEAR 双线性过滤 - + BICUBIC 双三线过滤 - + GAUSSIAN 高斯模糊 - + SCALEFORCE 强制缩放 - + FSR FSR - - + + NO AA 抗锯齿关 - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE 音量: 静音 - + VOLUME: %1% Volume percentage (e.g. 50%) 音量: %1% - + Confirm Key Rederivation 确认重新生成密钥 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5535,37 +5510,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 这将删除您自动生成的密钥文件并重新运行密钥生成模块。 - + Missing fuses 项目丢失 - + - Missing BOOT0 - 丢失 BOOT0 - + - Missing BCPKG2-1-Normal-Main - 丢失 BCPKG2-1-Normal-Main - + - Missing PRODINFO - 丢失 PRODINFO - + Derivation Components Missing 组件丢失 - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 密钥缺失。<br>请查看<a href='https://yuzu-emu.org/help/quickstart/'>yuzu 快速导航</a>以获得你的密钥、固件和游戏。<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5574,39 +5549,39 @@ on your system's performance. 您的系统性能。 - + Deriving Keys 生成密钥 - + Select RomFS Dump Target 选择 RomFS 转储目标 - + Please select which RomFS you would like to dump. 请选择希望转储的 RomFS。 - + Are you sure you want to close yuzu? 您确定要关闭 yuzu 吗？ - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. 您确定要停止模拟吗？未保存的进度将会丢失。 - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7610,28 +7585,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) 错误代码: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. 发生了一个错误。 请再试一次或联系开发者。 - + An error occurred on %1 at %2. Please try again or contact the developer of the software. 在 %2 处的 %1 上发生了一个错误。 请再试一次或联系开发者。 - + An error has occurred. %1 @@ -7655,20 +7630,81 @@ Please try again or contact the developer of the software. %2 - - Select a user: - 选择一个用户: - - - + Users 用户 - + + Profile Creator + 创建用户 + + + + Profile Selector 选择用户 + + + Profile Icon Editor + 修改用户图像 + + + + Profile Nickname Editor + 修改用户昵称 + + + + Who will receive the points? + 谁将获得黄金点数？ + + + + Who is using Nintendo eShop? + 谁正在使用任天堂 eShop？ + + + + Who is making this purchase? + 是谁购买了这个？ + + + + Who is posting? + 谁在发帖？ + + + + Select a user to link to a Nintendo Account. + 选择要链接到任天堂账户的用户。 + + + + Change settings for which user? + 要更改哪个用户的设置？ + + + + Format data for which user? + 要为哪个用户格式化数据？ + + + + Which user will be transferred to another console? + 哪个用户将被转移到另一个控制台？ + + + + Send save data for which user? + 要为哪个用户发送保存数据？ + + + + Select a user: + 选择一个用户: + QtSoftwareKeyboardDialog @@ -7718,51 +7754,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack 调用栈 - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - 正在等待互斥锁 0x%1 - - - - has waiters: %1 - 等待中: %1 - - - - owner handle: 0x%1 - 所有者句柄: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - 正在等待所有对象 - - - - waiting for one of the following objects - 正在等待下列对象中的一个 - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + [%1] %2 - + waited by no thread 没有等待的线程 @@ -7770,120 +7775,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable 可运行 - + paused 已暂停 - + sleeping 睡眠中 - + waiting for IPC reply 等待 IPC 响应 - + waiting for objects 等待对象 - + waiting for condition variable 等待条件变量 - + waiting for address arbiter 等待 address arbiter - + waiting for suspend resume 等待挂起的线程 - + waiting 等待中 - + initialized 初始化完毕 - + terminated 线程终止 - + unknown 未知 - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal ideal - + core %1 核心 %1 - + processor = %1 处理器 = %1 - - ideal core = %1 - 理想核心 = %1 - - - + affinity mask = %1 关联掩码 = %1 - + thread id = %1 线程 ID = %1 - + priority = %1(current) / %2(normal) 优先级 = %1 (实时) / %2 (正常) - + last running ticks = %1 最后运行频率 = %1 - - - not waiting for mutex - 未等待互斥锁 - WaitTreeThreadList - + waited by thread 等待中的线程 @@ -7891,7 +7886,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree 等待树 (&W) diff --git a/dist/languages/zh_TW.ts b/dist/languages/zh_TW.ts index 46974e448..472b00114 100644 --- a/dist/languages/zh_TW.ts +++ b/dist/languages/zh_TW.ts @@ -380,36 +380,61 @@ This would ban both their forum username and their IP address. - Output Device - 输出设备 + Output Device: + 输出设备： - Input Device - 輸入裝置： + Input Device: + 输入设备： - + + Sound Output Mode: + 声音输出模式： + + + + Mono + 單聲道 + + + + Stereo + 立體聲 + + + + Surround + 環繞音效 + + + Use global volume 使用全域音量 - + Set volume: 音量： - + Volume: 音量： - + 0 % 0 % - + + Mute audio when in background + 模拟器位于后台时静音 + + + %1% Volume percentage (e.g. 50%) %1% @@ -1377,26 +1402,21 @@ This would ban both their forum username and their IP address. - Mute audio when in background - 模拟器位于后台时静音 - - - Hide mouse on inactivity 滑鼠閒置時自動隱藏 - + Reset All Settings 重設所有設定 - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? 這將重設所有遊戲的額外設定，但不會刪除遊戲資料夾、使用者設定檔、輸入設定檔，是否繼續？ @@ -3830,60 +3850,15 @@ UUID: %2 设备名称 - - Mono - 單聲道 - - - - Stereo - 立體聲 - - - - Surround - 環繞音效 - - - - Console ID: - 主機 ID： - - - - Sound output mode - 聲道 - - - - Regenerate - 重新產生 - - - + System settings are available only when game is not running. 僅在遊戲未執行時才能修改使用者設定檔 - + Warning: "%1" is not a valid language for region "%2" 警告：“ %1 ”并不是“ %2 ”地区的有效语言。 - - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - 這會使用新的虛擬 Switch 取代你目前的虛擬 Switch，且將無法還原目前的虛擬 Switch。在部分遊戲中可能會出現意外後果。此動作可能因您使用過時的設定存檔而失敗。確定要繼續嗎？ - - - - Warning - 警告 - - - - Console ID: 0x%1 - 主機 ID：0x%1 - ConfigureTas @@ -4571,956 +4546,956 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? 我們<a href='https://yuzu-emu.org/help/feature/telemetry/'>蒐集匿名的資料</a>以幫助改善 yuzu。<br/><br/>您願意和我們分享您的使用資料嗎？ - + Telemetry 遙測 - + Broken Vulkan Installation Detected 检测到 Vulkan 的安装已损坏 - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. Vulkan 初始化失败。<br><br>点击<a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>这里</a>获取此问题的相关信息。 - + Loading Web Applet... 載入 Web Applet... - - + + Disable Web Applet 停用 Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) 禁用 Web 应用程序可能会导致未知的行为，且只能在《超级马里奥 3D 全明星》中使用。您确定要禁用 Web 应用程序吗？ (您可以在调试选项中重新启用它。) - + The amount of shaders currently being built 目前正在建構的著色器數量 - + The current selected resolution scaling multiplier. 目前選擇的解析度縮放比例。 - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. 目前的模擬速度。高於或低於 100% 表示比實際 Switch 執行速度更快或更慢。 - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. 遊戲即時 FPS。會因遊戲和場景的不同而改變。 - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. 在不考慮幀數限制和垂直同步的情況下模擬一個 Switch 畫格的實際時間，若要全速模擬，此數值不得超過 16.67 毫秒。 - + &Clear Recent Files 清除最近的檔案(&C) - + Emulated mouse is enabled 已启用模拟鼠标 - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. 实体鼠标输入与鼠标平移不兼容。请在高级输入设置中禁用模拟鼠标以使用鼠标平移。 - + &Continue 繼續(&C) - + &Pause &暫停 - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu 正在執行中 - + Warning Outdated Game Format 過時遊戲格式警告 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. 此遊戲為解構的 ROM 資料夾格式，這是一種過時的格式，已被其他格式取代，如 NCA、NAX、XCI、NSP。解構的 ROM 目錄缺少圖示、中繼資料和更新支援。<br><br>有關 yuzu 支援的各種 Switch 格式說明，<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>請參閱我們的 wiki </a>。此訊息將不再顯示。 - - + + Error while loading ROM! 載入 ROM 時發生錯誤！ - + The ROM format is not supported. 此 ROM 格式不支援 - + An error occurred initializing the video core. 初始化視訊核心時發生錯誤 - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu 在執行視訊核心時發生錯誤。 這可能是 GPU 驅動程序過舊造成的。 詳細資訊請查閱日誌檔案。 關於日誌檔案的更多資訊，請參考以下頁面：<a href='https://yuzu-emu.org/help/reference/log-files/'>如何上傳日誌檔案</a>。 - + Error while loading ROM! %1 %1 signifies a numeric error code. 載入 ROM 時發生錯誤！%1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>請參閱 <a href='https://yuzu-emu.org/help/quickstart/'>yuzu 快速指引</a>以重新傾印檔案。<br>您可以前往 yuzu 的 wiki</a> 或 Discord 社群</a>以獲得幫助。 - + An unknown error occurred. Please see the log for more details. 發生未知錯誤，請檢視紀錄了解細節。 - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... 正在关闭… - + Save Data 儲存資料 - + Mod Data 模組資料 - + Error Opening %1 Folder 開啟資料夾 %1 時發生錯誤 - - + + Folder does not exist! 資料夾不存在 - + Error Opening Transferable Shader Cache 開啟通用著色器快取位置時發生錯誤 - + Failed to create the shader cache directory for this title. 無法新增此遊戲的著色器快取資料夾。 - + Error Removing Contents 删除内容时出错 - + Error Removing Update 删除更新时出错 - + Error Removing DLC 删除 DLC 时出错 - + Remove Installed Game Contents? 删除已安装的游戏内容？ - + Remove Installed Game Update? 删除已安装的游戏更新？ - + Remove Installed Game DLC? 删除已安装的游戏 DLC 内容？ - + Remove Entry 移除項目 - - - - - - + + + + + + Successfully Removed 移除成功 - + Successfully removed the installed base game. 成功移除已安裝的遊戲。 - + The base game is not installed in the NAND and cannot be removed. 此遊戲並非安裝在內部儲存空間，因此無法移除。 - + Successfully removed the installed update. 成功移除已安裝的遊戲更新。 - + There is no update installed for this title. 此遊戲沒有已安裝的更新。 - + There are no DLC installed for this title. 此遊戲沒有已安裝的 DLC。 - + Successfully removed %1 installed DLC. 成功移除遊戲 %1 已安裝的 DLC。 - + Delete OpenGL Transferable Shader Cache? 刪除 OpenGL 模式的著色器快取？ - + Delete Vulkan Transferable Shader Cache? 刪除 Vulkan 模式的著色器快取？ - + Delete All Transferable Shader Caches? 刪除所有的著色器快取？ - + Remove Custom Game Configuration? 移除額外遊戲設定？ - + Remove File 刪除檔案 - - + + Error Removing Transferable Shader Cache 刪除通用著色器快取時發生錯誤 - - + + A shader cache for this title does not exist. 此遊戲沒有著色器快取 - + Successfully removed the transferable shader cache. 成功刪除著色器快取。 - + Failed to remove the transferable shader cache. 刪除通用著色器快取失敗。 - + Error Removing Vulkan Driver Pipeline Cache 移除 Vulkan 驱动程序管线缓存时出错 - + Failed to remove the driver pipeline cache. 删除驱动程序管线缓存失败。 - - + + Error Removing Transferable Shader Caches 刪除通用著色器快取時發生錯誤 - + Successfully removed the transferable shader caches. 成功刪除通用著色器快取。 - + Failed to remove the transferable shader cache directory. 無法刪除著色器快取資料夾。 - - + + Error Removing Custom Configuration 移除額外遊戲設定時發生錯誤 - + A custom configuration for this title does not exist. 此遊戲沒有額外設定。 - + Successfully removed the custom game configuration. 成功移除額外遊戲設定。 - + Failed to remove the custom game configuration. 移除額外遊戲設定失敗。 - - + + RomFS Extraction Failed! RomFS 抽取失敗！ - + There was an error copying the RomFS files or the user cancelled the operation. 複製 RomFS 檔案時發生錯誤或使用者取消動作。 - + Full 全部 - + Skeleton 部分 - + Select RomFS Dump Mode 選擇RomFS傾印模式 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. 請選擇如何傾印 RomFS。<br>「全部」會複製所有檔案到新資料夾中，而<br>「部分」只會建立資料夾結構。 - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 沒有足夠的空間用於抽取 RomFS。請確保有足夠的空間或於模擬 > 設定 >系統 >檔案系統 > 傾印根目錄中選擇其他資料夾。 - + Extracting RomFS... 抽取 RomFS 中... - - + + Cancel 取消 - + RomFS Extraction Succeeded! RomFS 抽取完成！ - + The operation completed successfully. 動作已成功完成 - - - - - + + + + + Create Shortcut 创建快捷方式 - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? 这将为当前的软件镜像创建快捷方式。但在其更新后，快捷方式可能无法正常使用。是否继续？ - + Cannot create shortcut on desktop. Path "%1" does not exist. 无法在桌面创建快捷方式。路径“ %1 ”不存在。 - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. 无法在应用程序菜单中创建快捷方式。路径“ %1 ”不存在且无法被创建。 - + Create Icon 创建图标 - + Cannot create icon file. Path "%1" does not exist and cannot be created. 无法创建图标文件。路径“ %1 ”不存在且无法被创建。 - + Start %1 with the yuzu Emulator 使用 yuzu 启动 %1 - + Failed to create a shortcut at %1 在 %1 处创建快捷方式时失败 - + Successfully created a shortcut to %1 成功地在 %1 处创建快捷方式 - + Error Opening %1 開啟 %1 時發生錯誤 - + Select Directory 選擇資料夾 - + Properties 屬性 - + The game properties could not be loaded. 無法載入遊戲屬性 - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch 執行檔 (%1);;所有檔案 (*.*) - + Load File 開啟檔案 - + Open Extracted ROM Directory 開啟已抽取的 ROM 資料夾 - + Invalid Directory Selected 選擇的資料夾無效 - + The directory you have selected does not contain a 'main' file. 選擇的資料夾未包含「main」檔案。 - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) 可安装的 Switch 檔案 (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX 卡帶映像 (*.xci) - + Install Files 安裝檔案 - + %n file(s) remaining 剩餘 %n 個檔案 - + Installing file "%1"... 正在安裝檔案「%1」... - - + + Install Results 安裝結果 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 為了避免潛在的衝突，不建議將遊戲本體安裝至內部儲存空間。 此功能僅用於安裝遊戲更新和 DLC。 - + %n file(s) were newly installed 最近安裝了 %n 個檔案 - + %n file(s) were overwritten %n 個檔案被取代 - + %n file(s) failed to install %n 個檔案安裝失敗 - + System Application 系統應用程式 - + System Archive 系統檔案 - + System Application Update 系統應用程式更新 - + Firmware Package (Type A) 韌體包(A型) - + Firmware Package (Type B) 韌體包(B型) - + Game 遊戲 - + Game Update 遊戲更新 - + Game DLC 遊戲 DLC - + Delta Title Delta Title - + Select NCA Install Type... 選擇 NCA 安裝類型... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) 請選擇此 NCA 的安裝類型： （在多數情況下，選擇預設的「遊戲」即可。） - + Failed to Install 安裝失敗 - + The title type you selected for the NCA is invalid. 選擇的 NCA 安裝類型無效。 - + File not found 找不到檔案 - + File "%1" not found 找不到「%1」檔案 - + OK 確定 - - + + Hardware requirements not met 硬件不满足要求 - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. 您的系统不满足运行 yuzu 推荐的推荐配置。兼容性报告已被禁用。 - + Missing yuzu Account 未設定 yuzu 帳號 - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. 為了上傳相容性測試結果，您必須登入 yuzu 帳號。<br><br/>欲登入 yuzu 帳號請至模擬 &gt; 設定 &gt; 網路。 - + Error opening URL 開啟 URL 時發生錯誤 - + Unable to open the URL "%1". 無法開啟 URL：「%1」。 - + TAS Recording TAS 錄製 - + Overwrite file of player 1? 覆寫玩家 1 的檔案？ - + Invalid config detected 偵測到無效設定 - + Handheld controller can't be used on docked mode. Pro controller will be selected. 掌機手把無法在主機模式中使用。將會選擇 Pro 手把。 - - + + Amiibo Amiibo - - + + The current amiibo has been removed 当前的 Amiibo 已被移除。 - + Error 错误 - - + + The current game is not looking for amiibos 当前游戏并没有在寻找 Amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo 檔案 (%1);; 所有檔案 (*.*) - + Load Amiibo 開啟 Amiibo - + Error loading Amiibo data 載入 Amiibo 資料時發生錯誤 - + The selected file is not a valid amiibo 选择的文件并不是有效的 amiibo - + The selected file is already on use 选择的文件已在使用中 - + An unknown error occurred 发生了未知错误 - + Capture Screenshot 截圖 - + PNG Image (*.png) PNG 圖片 (*.png) - + TAS state: Running %1/%2 TAS 狀態：正在執行 %1/%2 - + TAS state: Recording %1 TAS 狀態：正在錄製 %1 - + TAS state: Idle %1/%2 TAS 狀態：閒置 %1/%2 - + TAS State: Invalid TAS 狀態：無效 - + &Stop Running &停止執行 - + &Start 開始(&S) - + Stop R&ecording 停止錄製 - + R&ecord 錄製 (&E) - + Building: %n shader(s) 正在編譯 %n 個著色器檔案 - + Scale: %1x %1 is the resolution scaling factor 縮放比例：%1x - + Speed: %1% / %2% 速度：%1% / %2% - + Speed: %1% 速度：%1% - + Game: %1 FPS (Unlocked) 遊戲: %1 FPS（未限制） - + Game: %1 FPS 遊戲：%1 FPS - + Frame: %1 ms 畫格延遲：%1 ms - + GPU NORMAL GPU 一般效能 - + GPU HIGH GPU 高效能 - + GPU EXTREME GPU 最高效能 - + GPU ERROR GPU 錯誤 - + DOCKED 主机模式 - + HANDHELD 掌机模式 - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST 最近鄰域 - - + + BILINEAR 雙線性 - + BICUBIC 雙三次 - + GAUSSIAN 高斯 - + SCALEFORCE 強制縮放 - + FSR FSR - - + + NO AA 抗鋸齒關 - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE 音量: 静音 - + VOLUME: %1% Volume percentage (e.g. 50%) 音量: %1% - + Confirm Key Rederivation 確認重新產生金鑰 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5536,37 +5511,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 這將刪除您自動產生的金鑰檔案並重新執行產生金鑰模組。 - + Missing fuses 遺失項目 - + - Missing BOOT0 - 遺失 BOOT0 - + - Missing BCPKG2-1-Normal-Main - 遺失 BCPKG2-1-Normal-Main - + - Missing PRODINFO - 遺失 PRODINFO - + Derivation Components Missing 遺失產生元件 - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 缺少加密金鑰。 <br>請按照<a href='https://yuzu-emu.org/help/quickstart/'>《Yuzu快速入門指南》來取得所有金鑰、韌體、遊戲<br><br><small>(%1)。 - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5575,39 +5550,39 @@ on your system's performance. 您的系統效能。 - + Deriving Keys 產生金鑰 - + Select RomFS Dump Target 選擇 RomFS 傾印目標 - + Please select which RomFS you would like to dump. 請選擇希望傾印的 RomFS。 - + Are you sure you want to close yuzu? 您確定要關閉 yuzu 嗎? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. 您確定要停止模擬嗎？未儲存的進度將會遺失。 - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -7610,28 +7585,28 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) 錯誤碼: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. 發生錯誤。 請再試一次或聯絡開發者。 - + An error occurred on %1 at %2. Please try again or contact the developer of the software. 在 %2 處的 %1 上發生錯誤。 請再試一次或聯絡開發者。 - + An error has occurred. %1 @@ -7655,20 +7630,81 @@ Please try again or contact the developer of the software. %2 - - Select a user: - 選擇一位使用者： - - - + Users 使用者 - + + Profile Creator + 创建用户 + + + + Profile Selector 設定檔選擇 + + + Profile Icon Editor + 修改用户图像 + + + + Profile Nickname Editor + 修改用户昵称 + + + + Who will receive the points? + 谁将获得黄金点数？ + + + + Who is using Nintendo eShop? + 谁正在使用任天堂 eShop？ + + + + Who is making this purchase? + 是谁购买了这个？ + + + + Who is posting? + 谁在发帖？ + + + + Select a user to link to a Nintendo Account. + 选择要链接到任天堂账户的用户。 + + + + Change settings for which user? + 要更改哪个用户的设置？ + + + + Format data for which user? + 要为哪个用户格式化数据？ + + + + Which user will be transferred to another console? + 哪个用户将被转移到另一个控制台？ + + + + Send save data for which user? + 要为哪个用户发送保存数据？ + + + + Select a user: + 選擇一位使用者： + QtSoftwareKeyboardDialog @@ -7718,51 +7754,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Call stack - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - waiting for mutex 0x%1 - - - - has waiters: %1 - has waiters: %1 - - - - owner handle: 0x%1 - owner handle: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - waiting for all objects - - - - waiting for one of the following objects - waiting for one of the following objects - - WaitTreeSynchronizationObject - - [%1] %2 %3 - [%1] %2 %3 + + [%1] %2 + [%1] %2 - + waited by no thread waited by no thread @@ -7770,120 +7775,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable runnable - + paused paused - + sleeping sleeping - + waiting for IPC reply waiting for IPC reply - + waiting for objects waiting for objects - + waiting for condition variable waiting for condition variable - + waiting for address arbiter waiting for address arbiter - + waiting for suspend resume waiting for suspend resume - + waiting waiting - + initialized initialized - + terminated terminated - + unknown unknown - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal ideal - + core %1 core %1 - + processor = %1 processor = %1 - - ideal core = %1 - ideal core = %1 - - - + affinity mask = %1 affinity mask = %1 - + thread id = %1 thread id = %1 - + priority = %1(current) / %2(normal) priority = %1(current) / %2(normal) - + last running ticks = %1 last running ticks = %1 - - - not waiting for mutex - 未等待 mutex - WaitTreeThreadList - + waited by thread waited by thread @@ -7891,7 +7886,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree &Wait Tree From 780240e6979b198e7bd10feaad5399b8b4b63762 Mon Sep 17 00:00:00 2001 From: Wollnashorn Date: Wed, 5 Apr 2023 01:29:46 +0200 Subject: [PATCH 0246/1181] shader_recompiler: Add subpixel offset for correct rounding at `ImageGather` On AMD a subpixel offset of 1/512 of the texel size is applied to the texture coordinates at a ImageGather call to ensure the rounding at the texel centers is done the same way as in Maxwell or other Nvidia architectures. See https://www.reedbeta.com/blog/texture-gathers-and-coordinate-precision/ for more details why this might be necessary. This should fix shadow artifacts at object edges in Zelda: Breath of the Wild (#9957, #6956). --- .../backend/glsl/emit_glsl_image.cpp | 29 ++++++++++++++ .../backend/spirv/emit_spirv_image.cpp | 39 +++++++++++++++++++ src/shader_recompiler/profile.h | 4 ++ src/video_core/renderer_opengl/gl_device.cpp | 1 + src/video_core/renderer_opengl/gl_device.h | 5 +++ .../renderer_opengl/gl_shader_cache.cpp | 1 + .../renderer_vulkan/vk_pipeline_cache.cpp | 1 + .../vulkan_common/vulkan_device.cpp | 1 + src/video_core/vulkan_common/vulkan_device.h | 5 +++ 9 files changed, 86 insertions(+) diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_image.cpp b/src/shader_recompiler/backend/glsl/emit_glsl_image.cpp index f335c8af0..418505475 100644 --- a/src/shader_recompiler/backend/glsl/emit_glsl_image.cpp +++ b/src/shader_recompiler/backend/glsl/emit_glsl_image.cpp @@ -143,6 +143,21 @@ IR::Inst* PrepareSparse(IR::Inst& inst) { } return sparse_inst; } + +std::string ImageGatherSubpixelOffset(const IR::TextureInstInfo& info, std::string_view texture, + std::string_view coords) { + switch (info.type) { + case TextureType::Color2D: + case TextureType::Color2DRect: + return fmt::format("{}+vec2(0.001953125)/vec2(textureSize({}, 0))", coords, texture); + case TextureType::ColorArray2D: + case TextureType::ColorCube: + return fmt::format("vec3({0}.xy+vec2(0.001953125)/vec2(textureSize({1}, 0)),{0}.z)", coords, + texture); + default: + return std::string{coords}; + } +} } // Anonymous namespace void EmitImageSampleImplicitLod(EmitContext& ctx, IR::Inst& inst, const IR::Value& index, @@ -340,6 +355,13 @@ void EmitImageGather(EmitContext& ctx, IR::Inst& inst, const IR::Value& index, LOG_WARNING(Shader_GLSL, "Device does not support sparse texture queries. STUBBING"); ctx.AddU1("{}=true;", *sparse_inst); } + std::string coords_with_subpixel_offset; + if (ctx.profile.need_gather_subpixel_offset) { + // Apply a subpixel offset of 1/512 the texel size of the texture to ensure same rounding on + // AMD hardware as on Maxwell or other Nvidia architectures. + coords_with_subpixel_offset = ImageGatherSubpixelOffset(info, texture, coords); + coords = coords_with_subpixel_offset; + } if (!sparse_inst || !supports_sparse) { if (offset.IsEmpty()) { ctx.Add("{}=textureGather({},{},int({}));", texel, texture, coords, @@ -387,6 +409,13 @@ void EmitImageGatherDref(EmitContext& ctx, IR::Inst& inst, const IR::Value& inde LOG_WARNING(Shader_GLSL, "Device does not support sparse texture queries. STUBBING"); ctx.AddU1("{}=true;", *sparse_inst); } + std::string coords_with_subpixel_offset; + if (ctx.profile.need_gather_subpixel_offset) { + // Apply a subpixel offset of 1/512 the texel size of the texture to ensure same rounding on + // AMD hardware as on Maxwell or other Nvidia architectures. + coords_with_subpixel_offset = ImageGatherSubpixelOffset(info, texture, coords); + coords = coords_with_subpixel_offset; + } if (!sparse_inst || !supports_sparse) { if (offset.IsEmpty()) { ctx.Add("{}=textureGather({},{},{});", texel, texture, coords, dref); diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp index 02073c420..968901d42 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp @@ -261,6 +261,39 @@ Id BitTest(EmitContext& ctx, Id mask, Id bit) { const Id bit_value{ctx.OpBitwiseAnd(ctx.U32[1], shifted, ctx.Const(1u))}; return ctx.OpINotEqual(ctx.U1, bit_value, ctx.u32_zero_value); } + +Id ImageGatherSubpixelOffset(EmitContext& ctx, const IR::TextureInstInfo& info, Id texture, + Id coords) { + // Apply a subpixel offset of 1/512 the texel size of the texture to ensure same rounding on + // AMD hardware as on Maxwell or other Nvidia architectures. + const auto calculate_offset{[&](size_t dim) -> std::array { + const Id nudge{ctx.Const(0x1p-9f)}; + const Id image_size{ctx.OpImageQuerySizeLod(ctx.U32[dim], texture, ctx.u32_zero_value)}; + const Id offset_x{ctx.OpFDiv( + ctx.F32[1], nudge, + ctx.OpConvertUToF(ctx.F32[1], ctx.OpCompositeExtract(ctx.U32[1], image_size, 0)))}; + const Id offset_y{ctx.OpFDiv( + ctx.F32[1], nudge, + ctx.OpConvertUToF(ctx.F32[1], ctx.OpCompositeExtract(ctx.U32[1], image_size, 1)))}; + return {ctx.OpFAdd(ctx.F32[1], ctx.OpCompositeExtract(ctx.F32[1], coords, 0), offset_x), + ctx.OpFAdd(ctx.F32[1], ctx.OpCompositeExtract(ctx.F32[1], coords, 1), offset_y)}; + }}; + switch (info.type) { + case TextureType::Color2D: + case TextureType::Color2DRect: { + const auto offset{calculate_offset(2)}; + return ctx.OpCompositeConstruct(ctx.F32[2], offset[0], offset[1]); + } + case TextureType::ColorArray2D: + case TextureType::ColorCube: { + const auto offset{calculate_offset(3)}; + return ctx.OpCompositeConstruct(ctx.F32[3], offset[0], offset[1], + ctx.OpCompositeExtract(ctx.F32[1], coords, 2)); + } + default: + return coords; + } +} } // Anonymous namespace Id EmitBindlessImageSampleImplicitLod(EmitContext&) { @@ -423,6 +456,9 @@ Id EmitImageGather(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id const IR::Value& offset, const IR::Value& offset2) { const auto info{inst->Flags()}; const ImageOperands operands(ctx, offset, offset2); + if (ctx.profile.need_gather_subpixel_offset) { + coords = ImageGatherSubpixelOffset(ctx, info, TextureImage(ctx, info, index), coords); + } return Emit(&EmitContext::OpImageSparseGather, &EmitContext::OpImageGather, ctx, inst, ctx.F32[4], Texture(ctx, info, index), coords, ctx.Const(info.gather_component), operands.MaskOptional(), operands.Span()); @@ -432,6 +468,9 @@ Id EmitImageGatherDref(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, const IR::Value& offset, const IR::Value& offset2, Id dref) { const auto info{inst->Flags()}; const ImageOperands operands(ctx, offset, offset2); + if (ctx.profile.need_gather_subpixel_offset) { + coords = ImageGatherSubpixelOffset(ctx, info, TextureImage(ctx, info, index), coords); + } return Emit(&EmitContext::OpImageSparseDrefGather, &EmitContext::OpImageDrefGather, ctx, inst, ctx.F32[4], Texture(ctx, info, index), coords, dref, operands.MaskOptional(), operands.Span()); diff --git a/src/shader_recompiler/profile.h b/src/shader_recompiler/profile.h index 253e0d0bd..31390e869 100644 --- a/src/shader_recompiler/profile.h +++ b/src/shader_recompiler/profile.h @@ -52,6 +52,10 @@ struct Profile { bool need_declared_frag_colors{}; /// Prevents fast math optimizations that may cause inaccuracies bool need_fastmath_off{}; + /// Some GPU vendors use a lower fixed point format of 16.8 when calculating pixel coordinates + /// in the ImageGather instruction than the Maxwell architecture does. Applying an offset does + /// fix this mismatching rounding behaviour. + bool need_gather_subpixel_offset{}; /// OpFClamp is broken and OpFMax + OpFMin should be used instead bool has_broken_spirv_clamp{}; diff --git a/src/video_core/renderer_opengl/gl_device.cpp b/src/video_core/renderer_opengl/gl_device.cpp index 22ed16ebf..d36a0a7a1 100644 --- a/src/video_core/renderer_opengl/gl_device.cpp +++ b/src/video_core/renderer_opengl/gl_device.cpp @@ -169,6 +169,7 @@ Device::Device(Core::Frontend::EmuWindow& emu_window) { has_draw_texture = GLAD_GL_NV_draw_texture; warp_size_potentially_larger_than_guest = !is_nvidia && !is_intel; need_fastmath_off = is_nvidia; + need_gather_subpixel_offset = is_amd; can_report_memory = GLAD_GL_NVX_gpu_memory_info; // At the moment of writing this, only Nvidia's driver optimizes BufferSubData on exclusive diff --git a/src/video_core/renderer_opengl/gl_device.h b/src/video_core/renderer_opengl/gl_device.h index 3ff8cad83..e8104c4de 100644 --- a/src/video_core/renderer_opengl/gl_device.h +++ b/src/video_core/renderer_opengl/gl_device.h @@ -160,6 +160,10 @@ public: return need_fastmath_off; } + bool NeedsGatherSubpixelOffset() const { + return need_gather_subpixel_offset; + } + bool HasCbufFtouBug() const { return has_cbuf_ftou_bug; } @@ -225,6 +229,7 @@ private: bool has_draw_texture{}; bool warp_size_potentially_larger_than_guest{}; bool need_fastmath_off{}; + bool need_gather_subpixel_offset{}; bool has_cbuf_ftou_bug{}; bool has_bool_ref_bug{}; bool can_report_memory{}; diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index 479bb8ba3..b40aa6f5e 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -218,6 +218,7 @@ ShaderCache::ShaderCache(RasterizerOpenGL& rasterizer_, Core::Frontend::EmuWindo .lower_left_origin_mode = true, .need_declared_frag_colors = true, .need_fastmath_off = device.NeedsFastmathOff(), + .need_gather_subpixel_offset = device.NeedsGatherSubpixelOffset(), .has_broken_spirv_clamp = true, .has_broken_unsigned_image_offsets = true, diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index 0684cceed..f51257267 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -329,6 +329,7 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, const Device& device .lower_left_origin_mode = false, .need_declared_frag_colors = false, + .need_gather_subpixel_offset = device.NeedsGatherSubpixelOffset(), .has_broken_spirv_clamp = driver_id == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS, .has_broken_spirv_position_input = driver_id == VK_DRIVER_ID_QUALCOMM_PROPRIETARY, diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 6f288b3f8..0939b62c9 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -431,6 +431,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR "AMD GCN4 and earlier have broken VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT"); has_broken_cube_compatibility = true; } + need_gather_subpixel_offset = true; } if (extensions.sampler_filter_minmax && is_amd) { // Disable ext_sampler_filter_minmax on AMD GCN4 and lower as it is broken. diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h index 41b5da18a..50e95bcca 100644 --- a/src/video_core/vulkan_common/vulkan_device.h +++ b/src/video_core/vulkan_common/vulkan_device.h @@ -554,6 +554,10 @@ public: return features.robustness2.nullDescriptor; } + bool NeedsGatherSubpixelOffset() const { + return need_gather_subpixel_offset; + } + u32 GetMaxVertexInputAttributes() const { return properties.properties.limits.maxVertexInputAttributes; } @@ -664,6 +668,7 @@ private: bool must_emulate_bgr565{}; ///< Emulates BGR565 by swizzling RGB565 format. bool dynamic_state3_blending{}; ///< Has all blending features of dynamic_state3. bool dynamic_state3_enables{}; ///< Has all enables features of dynamic_state3. + bool need_gather_subpixel_offset{}; ///< Needs offset at ImageGather for correct rounding. u64 device_access_memory{}; ///< Total size of device local memory in bytes. u32 sets_per_pool{}; ///< Sets per Description Pool From fe91066f4673f7a3ee87235f08b72db4910eb01c Mon Sep 17 00:00:00 2001 From: Wollnashorn Date: Wed, 5 Apr 2023 03:02:24 +0200 Subject: [PATCH 0247/1181] video_core: Enable ImageGather with subpixel offset on Intel --- src/shader_recompiler/profile.h | 6 +++--- src/video_core/renderer_opengl/gl_device.cpp | 1 - src/video_core/renderer_opengl/gl_device.h | 9 ++++----- src/video_core/renderer_opengl/gl_shader_cache.cpp | 2 +- src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 4 +++- src/video_core/vulkan_common/vulkan_device.cpp | 1 - src/video_core/vulkan_common/vulkan_device.h | 5 ----- 7 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/shader_recompiler/profile.h b/src/shader_recompiler/profile.h index 31390e869..9f88fb440 100644 --- a/src/shader_recompiler/profile.h +++ b/src/shader_recompiler/profile.h @@ -52,9 +52,9 @@ struct Profile { bool need_declared_frag_colors{}; /// Prevents fast math optimizations that may cause inaccuracies bool need_fastmath_off{}; - /// Some GPU vendors use a lower fixed point format of 16.8 when calculating pixel coordinates - /// in the ImageGather instruction than the Maxwell architecture does. Applying an offset does - /// fix this mismatching rounding behaviour. + /// Some GPU vendors use a different rounding precision when calculating texture pixel + /// coordinates with the 16.8 format in the ImageGather instruction than the Maxwell + /// architecture. Applying an offset does fix this mismatching rounding behaviour. bool need_gather_subpixel_offset{}; /// OpFClamp is broken and OpFMax + OpFMin should be used instead diff --git a/src/video_core/renderer_opengl/gl_device.cpp b/src/video_core/renderer_opengl/gl_device.cpp index d36a0a7a1..22ed16ebf 100644 --- a/src/video_core/renderer_opengl/gl_device.cpp +++ b/src/video_core/renderer_opengl/gl_device.cpp @@ -169,7 +169,6 @@ Device::Device(Core::Frontend::EmuWindow& emu_window) { has_draw_texture = GLAD_GL_NV_draw_texture; warp_size_potentially_larger_than_guest = !is_nvidia && !is_intel; need_fastmath_off = is_nvidia; - need_gather_subpixel_offset = is_amd; can_report_memory = GLAD_GL_NVX_gpu_memory_info; // At the moment of writing this, only Nvidia's driver optimizes BufferSubData on exclusive diff --git a/src/video_core/renderer_opengl/gl_device.h b/src/video_core/renderer_opengl/gl_device.h index e8104c4de..cc0b95f1a 100644 --- a/src/video_core/renderer_opengl/gl_device.h +++ b/src/video_core/renderer_opengl/gl_device.h @@ -160,10 +160,6 @@ public: return need_fastmath_off; } - bool NeedsGatherSubpixelOffset() const { - return need_gather_subpixel_offset; - } - bool HasCbufFtouBug() const { return has_cbuf_ftou_bug; } @@ -180,6 +176,10 @@ public: return vendor_name == "ATI Technologies Inc."; } + bool IsIntel() const { + return vendor_name == "Intel"; + } + bool CanReportMemoryUsage() const { return can_report_memory; } @@ -229,7 +229,6 @@ private: bool has_draw_texture{}; bool warp_size_potentially_larger_than_guest{}; bool need_fastmath_off{}; - bool need_gather_subpixel_offset{}; bool has_cbuf_ftou_bug{}; bool has_bool_ref_bug{}; bool can_report_memory{}; diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index b40aa6f5e..6ecda2984 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -218,7 +218,7 @@ ShaderCache::ShaderCache(RasterizerOpenGL& rasterizer_, Core::Frontend::EmuWindo .lower_left_origin_mode = true, .need_declared_frag_colors = true, .need_fastmath_off = device.NeedsFastmathOff(), - .need_gather_subpixel_offset = device.NeedsGatherSubpixelOffset(), + .need_gather_subpixel_offset = device.IsAmd() || device.IsIntel(), .has_broken_spirv_clamp = true, .has_broken_unsigned_image_offsets = true, diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index f51257267..8963b6a66 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -329,7 +329,9 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, const Device& device .lower_left_origin_mode = false, .need_declared_frag_colors = false, - .need_gather_subpixel_offset = device.NeedsGatherSubpixelOffset(), + .need_gather_subpixel_offset = driver_id == VK_DRIVER_ID_AMD_PROPRIETARY || + driver_id == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS || + driver_id == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA, .has_broken_spirv_clamp = driver_id == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS, .has_broken_spirv_position_input = driver_id == VK_DRIVER_ID_QUALCOMM_PROPRIETARY, diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 0939b62c9..6f288b3f8 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -431,7 +431,6 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR "AMD GCN4 and earlier have broken VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT"); has_broken_cube_compatibility = true; } - need_gather_subpixel_offset = true; } if (extensions.sampler_filter_minmax && is_amd) { // Disable ext_sampler_filter_minmax on AMD GCN4 and lower as it is broken. diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h index 50e95bcca..41b5da18a 100644 --- a/src/video_core/vulkan_common/vulkan_device.h +++ b/src/video_core/vulkan_common/vulkan_device.h @@ -554,10 +554,6 @@ public: return features.robustness2.nullDescriptor; } - bool NeedsGatherSubpixelOffset() const { - return need_gather_subpixel_offset; - } - u32 GetMaxVertexInputAttributes() const { return properties.properties.limits.maxVertexInputAttributes; } @@ -668,7 +664,6 @@ private: bool must_emulate_bgr565{}; ///< Emulates BGR565 by swizzling RGB565 format. bool dynamic_state3_blending{}; ///< Has all blending features of dynamic_state3. bool dynamic_state3_enables{}; ///< Has all enables features of dynamic_state3. - bool need_gather_subpixel_offset{}; ///< Needs offset at ImageGather for correct rounding. u64 device_access_memory{}; ///< Total size of device local memory in bytes. u32 sets_per_pool{}; ///< Sets per Description Pool From 82b78cde7374c04e5c3a4d6255ddb6c26ecae946 Mon Sep 17 00:00:00 2001 From: Wollnashorn Date: Wed, 5 Apr 2023 18:00:35 +0200 Subject: [PATCH 0248/1181] shader_recompiler: Use vector arithmetic rather than component-wise in ImageGatherSubpixelOffset Should be more efficient and better readable --- .../backend/spirv/emit_spirv_image.cpp | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp index 968901d42..7d901c04b 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp @@ -266,30 +266,21 @@ Id ImageGatherSubpixelOffset(EmitContext& ctx, const IR::TextureInstInfo& info, Id coords) { // Apply a subpixel offset of 1/512 the texel size of the texture to ensure same rounding on // AMD hardware as on Maxwell or other Nvidia architectures. - const auto calculate_offset{[&](size_t dim) -> std::array { + const auto calculate_coords{[&](size_t dim) { const Id nudge{ctx.Const(0x1p-9f)}; const Id image_size{ctx.OpImageQuerySizeLod(ctx.U32[dim], texture, ctx.u32_zero_value)}; - const Id offset_x{ctx.OpFDiv( - ctx.F32[1], nudge, - ctx.OpConvertUToF(ctx.F32[1], ctx.OpCompositeExtract(ctx.U32[1], image_size, 0)))}; - const Id offset_y{ctx.OpFDiv( - ctx.F32[1], nudge, - ctx.OpConvertUToF(ctx.F32[1], ctx.OpCompositeExtract(ctx.U32[1], image_size, 1)))}; - return {ctx.OpFAdd(ctx.F32[1], ctx.OpCompositeExtract(ctx.F32[1], coords, 0), offset_x), - ctx.OpFAdd(ctx.F32[1], ctx.OpCompositeExtract(ctx.F32[1], coords, 1), offset_y)}; + Id offset{dim == 2 ? ctx.ConstantComposite(ctx.F32[dim], nudge, nudge) + : ctx.ConstantComposite(ctx.F32[dim], nudge, nudge, ctx.f32_zero_value)}; + offset = ctx.OpFDiv(ctx.F32[dim], offset, ctx.OpConvertUToF(ctx.F32[dim], image_size)); + return ctx.OpFAdd(ctx.F32[dim], coords, offset); }}; switch (info.type) { case TextureType::Color2D: - case TextureType::Color2DRect: { - const auto offset{calculate_offset(2)}; - return ctx.OpCompositeConstruct(ctx.F32[2], offset[0], offset[1]); - } + case TextureType::Color2DRect: + return calculate_coords(2); case TextureType::ColorArray2D: - case TextureType::ColorCube: { - const auto offset{calculate_offset(3)}; - return ctx.OpCompositeConstruct(ctx.F32[3], offset[0], offset[1], - ctx.OpCompositeExtract(ctx.F32[1], coords, 2)); - } + case TextureType::ColorCube: + return calculate_coords(3); default: return coords; } From 8908663f1279c690bc19710da7e33d44314641b4 Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Sat, 8 Apr 2023 21:54:19 +0100 Subject: [PATCH 0249/1181] Use GetGlobalTimeNs as opposed to clock ticks --- src/audio_core/sink/sink_stream.cpp | 5 ++--- src/audio_core/sink/sink_stream.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index 13c73b5d7..13ba26e74 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -252,8 +252,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz { std::scoped_lock lk{sample_count_lock}; - last_sample_count_update_time = - Core::Timing::CyclesToUs(system.CoreTiming().GetClockTicks()); + last_sample_count_update_time = system.CoreTiming().GetGlobalTimeNs(); min_played_sample_count = max_played_sample_count; max_played_sample_count += actual_frames_written; } @@ -261,7 +260,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span output_buffer, std::siz u64 SinkStream::GetExpectedPlayedSampleCount() { std::scoped_lock lk{sample_count_lock}; - auto cur_time{Core::Timing::CyclesToUs(system.CoreTiming().GetClockTicks())}; + auto cur_time{system.CoreTiming().GetGlobalTimeNs()}; auto time_delta{cur_time - last_sample_count_update_time}; auto exp_played_sample_count{min_played_sample_count + (TargetSampleRate * time_delta) / std::chrono::seconds{1}}; diff --git a/src/audio_core/sink/sink_stream.h b/src/audio_core/sink/sink_stream.h index 23e289c7b..21b5b40a1 100644 --- a/src/audio_core/sink/sink_stream.h +++ b/src/audio_core/sink/sink_stream.h @@ -246,7 +246,7 @@ private: /// Maximum number of total samples that can be played since the last callback u64 max_played_sample_count{}; /// The time the two above tracking variables were last written to - std::chrono::microseconds last_sample_count_update_time{}; + std::chrono::nanoseconds last_sample_count_update_time{}; /// Set by the audio render/in/out system which uses this stream f32 system_volume{1.0f}; /// Set via IAudioDevice service calls From abb785f26958e069200ab47c05f4a3e59bbae2bc Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 8 Apr 2023 17:47:26 -0400 Subject: [PATCH 0250/1181] kernel: switch extended memory setting to 8GB arrangement --- src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp | 4 ++-- src/yuzu/configuration/configure_general.ui | 2 +- src/yuzu_cmd/default_ini.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp index 42d1fcc28..2fc12de2a 100644 --- a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp +++ b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp @@ -35,11 +35,11 @@ namespace { using namespace Common::Literals; u32 GetMemorySizeForInit() { - return Settings::values.use_extended_memory_layout ? Smc::MemorySize_6GB : Smc::MemorySize_4GB; + return Settings::values.use_extended_memory_layout ? Smc::MemorySize_8GB : Smc::MemorySize_4GB; } Smc::MemoryArrangement GetMemoryArrangeForInit() { - return Settings::values.use_extended_memory_layout ? Smc::MemoryArrangement_6GB + return Settings::values.use_extended_memory_layout ? Smc::MemoryArrangement_8GB : Smc::MemoryArrangement_4GB; } } // namespace diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui index 6cd79673c..add110bb0 100644 --- a/src/yuzu/configuration/configure_general.ui +++ b/src/yuzu/configuration/configure_general.ui @@ -64,7 +64,7 @@ - Extended memory layout (6GB DRAM) + Extended memory layout (8GB DRAM) diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 20e403400..209cfc28a 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -163,7 +163,7 @@ keyboard_enabled = # 0: Disabled, 1 (default): Enabled use_multi_core = -# Enable extended guest system memory layout (6GB DRAM) +# Enable extended guest system memory layout (8GB DRAM) # 0 (default): Disabled, 1: Enabled use_extended_memory_layout = From baf4d1c22e46fa46549b9cfa9f5fedda84cce1d4 Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 9 Apr 2023 19:50:27 -0400 Subject: [PATCH 0251/1181] kernel: move more memory to application in 8GB arrangement --- src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp index 2fc12de2a..36d0d20d2 100644 --- a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp +++ b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp @@ -91,7 +91,8 @@ std::size_t KSystemControl::Init::GetApplicationPoolSize() { case Smc::MemoryArrangement_6GBForAppletDev: return 3285_MiB; case Smc::MemoryArrangement_8GB: - return 4916_MiB; + // Real kernel sets this to 4916_MiB. We are not debugging applets. + return 6547_MiB; } }(); @@ -115,7 +116,8 @@ size_t KSystemControl::Init::GetAppletPoolSize() { case Smc::MemoryArrangement_6GBForAppletDev: return 2193_MiB; case Smc::MemoryArrangement_8GB: - return 2193_MiB; + //! Real kernel sets this to 2193_MiB. We are not debugging applets. + return 562_MiB; } }(); From c0e5ecc399cc08e4cd54b04c8d63b99e1fcbddc7 Mon Sep 17 00:00:00 2001 From: Wollnashorn Date: Wed, 12 Apr 2023 17:11:02 +0200 Subject: [PATCH 0252/1181] video_core: Enable ImageGather rounding fix on AMD open source drivers --- src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index 8963b6a66..985cc3203 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -330,6 +330,8 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, const Device& device .lower_left_origin_mode = false, .need_declared_frag_colors = false, .need_gather_subpixel_offset = driver_id == VK_DRIVER_ID_AMD_PROPRIETARY || + driver_id == VK_DRIVER_ID_AMD_OPEN_SOURCE || + driver_id == VK_DRIVER_ID_MESA_RADV || driver_id == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS || driver_id == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA, From e37e1d24f90acf8371de7af65ae4ed13b288cef4 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 13 Apr 2023 16:38:20 -0400 Subject: [PATCH 0253/1181] vulkan: pick alpha composite flags based on available values --- src/video_core/renderer_vulkan/vk_swapchain.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp index 85fdce6e5..b1465e35c 100644 --- a/src/video_core/renderer_vulkan/vk_swapchain.cpp +++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp @@ -65,6 +65,18 @@ VkExtent2D ChooseSwapExtent(const VkSurfaceCapabilitiesKHR& capabilities, u32 wi return extent; } +VkCompositeAlphaFlagBitsKHR ChooseAlphaFlags(const VkSurfaceCapabilitiesKHR& capabilities) { + if (capabilities.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR) { + return VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR; + } else if (capabilities.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR) { + return VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR; + } else { + LOG_ERROR(Render_Vulkan, "Unknown composite alpha flags value {:#x}", + capabilities.supportedCompositeAlpha); + return VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR; + } +} + } // Anonymous namespace Swapchain::Swapchain(VkSurfaceKHR surface_, const Device& device_, Scheduler& scheduler_, @@ -155,6 +167,7 @@ void Swapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities, bo const auto formats{physical_device.GetSurfaceFormatsKHR(surface)}; const auto present_modes{physical_device.GetSurfacePresentModesKHR(surface)}; + const VkCompositeAlphaFlagBitsKHR alpha_flags{ChooseAlphaFlags(capabilities)}; const VkSurfaceFormatKHR surface_format{ChooseSwapSurfaceFormat(formats)}; present_mode = ChooseSwapPresentMode(present_modes); @@ -185,7 +198,7 @@ void Swapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities, bo .queueFamilyIndexCount = 0, .pQueueFamilyIndices = nullptr, .preTransform = capabilities.currentTransform, - .compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR, + .compositeAlpha = alpha_flags, .presentMode = present_mode, .clipped = VK_FALSE, .oldSwapchain = nullptr, From 101c0df79ca31aa950c340812f09cdeadbb89732 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Thu, 13 Apr 2023 20:24:35 -0600 Subject: [PATCH 0254/1181] service: nfp: Use an unique interface --- src/core/CMakeLists.txt | 4 +- src/core/hle/service/nfp/nfp.cpp | 187 +++++++++++++++++- .../nfp/{nfp_user.cpp => nfp_interface.cpp} | 89 +++------ .../nfp/{nfp_user.h => nfp_interface.h} | 18 +- 4 files changed, 227 insertions(+), 71 deletions(-) rename src/core/hle/service/nfp/{nfp_user.cpp => nfp_interface.cpp} (83%) rename src/core/hle/service/nfp/{nfp_user.h => nfp_interface.h} (92%) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 4e677f287..8817a99c9 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -570,10 +570,10 @@ add_library(core STATIC hle/service/nfp/nfp.h hle/service/nfp/nfp_device.cpp hle/service/nfp/nfp_device.h + hle/service/nfp/nfp_interface.cpp + hle/service/nfp/nfp_interface.h hle/service/nfp/nfp_result.h hle/service/nfp/nfp_types.h - hle/service/nfp/nfp_user.cpp - hle/service/nfp/nfp_user.h hle/service/ngct/ngct.cpp hle/service/ngct/ngct.h hle/service/nifm/nifm.cpp diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp index e262dc2f2..e57e932c8 100644 --- a/src/core/hle/service/nfp/nfp.cpp +++ b/src/core/hle/service/nfp/nfp.cpp @@ -4,11 +4,138 @@ #include "common/logging/log.h" #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nfp/nfp.h" -#include "core/hle/service/nfp/nfp_user.h" +#include "core/hle/service/nfp/nfp_interface.h" #include "core/hle/service/server_manager.h" namespace Service::NFP { +class IUser final : public Interface { +public: + explicit IUser(Core::System& system_) : Interface(system_, "NFP:IUser") { + // clang-format off + static const FunctionInfo functions[] = { + {0, &IUser::Initialize, "Initialize"}, + {1, &IUser::Finalize, "Finalize"}, + {2, &IUser::ListDevices, "ListDevices"}, + {3, &IUser::StartDetection, "StartDetection"}, + {4, &IUser::StopDetection, "StopDetection"}, + {5, &IUser::Mount, "Mount"}, + {6, &IUser::Unmount, "Unmount"}, + {7, &IUser::OpenApplicationArea, "OpenApplicationArea"}, + {8, &IUser::GetApplicationArea, "GetApplicationArea"}, + {9, &IUser::SetApplicationArea, "SetApplicationArea"}, + {10, &IUser::Flush, "Flush"}, + {11, &IUser::Restore, "Restore"}, + {12, &IUser::CreateApplicationArea, "CreateApplicationArea"}, + {13, &IUser::GetTagInfo, "GetTagInfo"}, + {14, &IUser::GetRegisterInfo, "GetRegisterInfo"}, + {15, &IUser::GetCommonInfo, "GetCommonInfo"}, + {16, &IUser::GetModelInfo, "GetModelInfo"}, + {17, &IUser::AttachActivateEvent, "AttachActivateEvent"}, + {18, &IUser::AttachDeactivateEvent, "AttachDeactivateEvent"}, + {19, &IUser::GetState, "GetState"}, + {20, &IUser::GetDeviceState, "GetDeviceState"}, + {21, &IUser::GetNpadId, "GetNpadId"}, + {22, &IUser::GetApplicationAreaSize, "GetApplicationAreaSize"}, + {23, &IUser::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"}, + {24, &IUser::RecreateApplicationArea, "RecreateApplicationArea"}, + }; + // clang-format on + + RegisterHandlers(functions); + } +}; + +class ISystem final : public Interface { +public: + explicit ISystem(Core::System& system_) : Interface(system_, "NFP:ISystem") { + // clang-format off + static const FunctionInfo functions[] = { + {0, nullptr, "InitializeSystem"}, + {1, nullptr, "FinalizeSystem"}, + {2, &ISystem::ListDevices, "ListDevices"}, + {3, &ISystem::StartDetection, "StartDetection"}, + {4, &ISystem::StopDetection, "StopDetection"}, + {5, &ISystem::Mount, "Mount"}, + {6, &ISystem::Unmount, "Unmount"}, + {10, &ISystem::Flush, "Flush"}, + {11, &ISystem::Restore, "Restore"}, + {12, &ISystem::CreateApplicationArea, "CreateApplicationArea"}, + {13, &ISystem::GetTagInfo, "GetTagInfo"}, + {14, &ISystem::GetRegisterInfo, "GetRegisterInfo"}, + {15, &ISystem::GetCommonInfo, "GetCommonInfo"}, + {16, &ISystem::GetModelInfo, "GetModelInfo"}, + {17, &ISystem::AttachActivateEvent, "AttachActivateEvent"}, + {18, &ISystem::AttachDeactivateEvent, "AttachDeactivateEvent"}, + {19, &ISystem::GetState, "GetState"}, + {20, &ISystem::GetDeviceState, "GetDeviceState"}, + {21, &ISystem::GetNpadId, "GetNpadId"}, + {23, &ISystem::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"}, + {100, nullptr, "Format"}, + {101, nullptr, "GetAdminInfo"}, + {102, nullptr, "GetRegisterInfoPrivate"}, + {103, nullptr, "SetRegisterInfoPrivate"}, + {104, nullptr, "DeleteRegisterInfo"}, + {105, nullptr, "DeleteApplicationArea"}, + {106, nullptr, "ExistsApplicationArea"}, + }; + // clang-format on + + RegisterHandlers(functions); + } +}; + +class IDebug final : public Interface { +public: + explicit IDebug(Core::System& system_) : Interface(system_, "NFP:IDebug") { + // clang-format off + static const FunctionInfo functions[] = { + {0, nullptr, "InitializeDebug"}, + {1, nullptr, "FinalizeDebug"}, + {2, &IDebug::ListDevices, "ListDevices"}, + {3, &IDebug::StartDetection, "StartDetection"}, + {4, &IDebug::StopDetection, "StopDetection"}, + {5, &IDebug::Mount, "Mount"}, + {6, &IDebug::Unmount, "Unmount"}, + {7, &IDebug::OpenApplicationArea, "OpenApplicationArea"}, + {8, &IDebug::GetApplicationArea, "GetApplicationArea"}, + {9, &IDebug::SetApplicationArea, "SetApplicationArea"}, + {10, &IDebug::Flush, "Flush"}, + {11, &IDebug::Restore, "Restore"}, + {12, &IDebug::CreateApplicationArea, "CreateApplicationArea"}, + {13, &IDebug::GetTagInfo, "GetTagInfo"}, + {14, &IDebug::GetRegisterInfo, "GetRegisterInfo"}, + {15, &IDebug::GetCommonInfo, "GetCommonInfo"}, + {16, &IDebug::GetModelInfo, "GetModelInfo"}, + {17, &IDebug::AttachActivateEvent, "AttachActivateEvent"}, + {18, &IDebug::AttachDeactivateEvent, "AttachDeactivateEvent"}, + {19, &IDebug::GetState, "GetState"}, + {20, &IDebug::GetDeviceState, "GetDeviceState"}, + {21, &IDebug::GetNpadId, "GetNpadId"}, + {22, &IDebug::GetApplicationAreaSize, "GetApplicationAreaSize"}, + {23, &IDebug::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"}, + {24, &IDebug::RecreateApplicationArea, "RecreateApplicationArea"}, + {100, nullptr, "Format"}, + {101, nullptr, "GetAdminInfo"}, + {102, nullptr, "GetRegisterInfoPrivate"}, + {103, nullptr, "SetRegisterInfoPrivate"}, + {104, nullptr, "DeleteRegisterInfo"}, + {105, nullptr, "DeleteApplicationArea"}, + {106, nullptr, "ExistsApplicationArea"}, + {200, nullptr, "GetAll"}, + {201, nullptr, "SetAll"}, + {202, nullptr, "FlushDebug"}, + {203, nullptr, "BreakTag"}, + {204, nullptr, "ReadBackupData"}, + {205, nullptr, "WriteBackupData"}, + {206, nullptr, "WriteNtf"}, + }; + // clang-format on + + RegisterHandlers(functions); + } +}; + class IUserManager final : public ServiceFramework { public: explicit IUserManager(Core::System& system_) : ServiceFramework{system_, "nfp:user"} { @@ -37,10 +164,68 @@ private: std::shared_ptr user_interface; }; +class ISystemManager final : public ServiceFramework { +public: + explicit ISystemManager(Core::System& system_) : ServiceFramework{system_, "nfp:sys"} { + // clang-format off + static const FunctionInfo functions[] = { + {0, &ISystemManager::CreateSystemInterface, "CreateSystemInterface"}, + }; + // clang-format on + + RegisterHandlers(functions); + } + +private: + void CreateSystemInterface(HLERequestContext& ctx) { + LOG_DEBUG(Service_NFP, "called"); + + if (system_interface == nullptr) { + system_interface = std::make_shared(system); + } + + IPC::ResponseBuilder rb{ctx, 2, 0, 1}; + rb.Push(ResultSuccess); + rb.PushIpcInterface(system_interface); + } + + std::shared_ptr system_interface; +}; + +class IDebugManager final : public ServiceFramework { +public: + explicit IDebugManager(Core::System& system_) : ServiceFramework{system_, "nfp:dbg"} { + // clang-format off + static const FunctionInfo functions[] = { + {0, &IDebugManager::CreateDebugInterface, "CreateDebugInterface"}, + }; + // clang-format on + + RegisterHandlers(functions); + } + +private: + void CreateDebugInterface(HLERequestContext& ctx) { + LOG_DEBUG(Service_NFP, "called"); + + if (system_interface == nullptr) { + system_interface = std::make_shared(system); + } + + IPC::ResponseBuilder rb{ctx, 2, 0, 1}; + rb.Push(ResultSuccess); + rb.PushIpcInterface(system_interface); + } + + std::shared_ptr system_interface; +}; + void LoopProcess(Core::System& system) { auto server_manager = std::make_unique(system); server_manager->RegisterNamedService("nfp:user", std::make_shared(system)); + server_manager->RegisterNamedService("nfp:sys", std::make_shared(system)); + server_manager->RegisterNamedService("nfp:dbg", std::make_shared(system)); ServerManager::RunServer(std::move(server_manager)); } diff --git a/src/core/hle/service/nfp/nfp_user.cpp b/src/core/hle/service/nfp/nfp_interface.cpp similarity index 83% rename from src/core/hle/service/nfp/nfp_user.cpp rename to src/core/hle/service/nfp/nfp_interface.cpp index 4e8534113..e131703cb 100644 --- a/src/core/hle/service/nfp/nfp_user.cpp +++ b/src/core/hle/service/nfp/nfp_interface.cpp @@ -7,42 +7,13 @@ #include "core/hle/kernel/k_event.h" #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nfp/nfp_device.h" +#include "core/hle/service/nfp/nfp_interface.h" #include "core/hle/service/nfp/nfp_result.h" -#include "core/hle/service/nfp/nfp_user.h" namespace Service::NFP { -IUser::IUser(Core::System& system_) - : ServiceFramework{system_, "NFP::IUser"}, service_context{system_, service_name} { - static const FunctionInfo functions[] = { - {0, &IUser::Initialize, "Initialize"}, - {1, &IUser::Finalize, "Finalize"}, - {2, &IUser::ListDevices, "ListDevices"}, - {3, &IUser::StartDetection, "StartDetection"}, - {4, &IUser::StopDetection, "StopDetection"}, - {5, &IUser::Mount, "Mount"}, - {6, &IUser::Unmount, "Unmount"}, - {7, &IUser::OpenApplicationArea, "OpenApplicationArea"}, - {8, &IUser::GetApplicationArea, "GetApplicationArea"}, - {9, &IUser::SetApplicationArea, "SetApplicationArea"}, - {10, &IUser::Flush, "Flush"}, - {11, &IUser::Restore, "Restore"}, - {12, &IUser::CreateApplicationArea, "CreateApplicationArea"}, - {13, &IUser::GetTagInfo, "GetTagInfo"}, - {14, &IUser::GetRegisterInfo, "GetRegisterInfo"}, - {15, &IUser::GetCommonInfo, "GetCommonInfo"}, - {16, &IUser::GetModelInfo, "GetModelInfo"}, - {17, &IUser::AttachActivateEvent, "AttachActivateEvent"}, - {18, &IUser::AttachDeactivateEvent, "AttachDeactivateEvent"}, - {19, &IUser::GetState, "GetState"}, - {20, &IUser::GetDeviceState, "GetDeviceState"}, - {21, &IUser::GetNpadId, "GetNpadId"}, - {22, &IUser::GetApplicationAreaSize, "GetApplicationAreaSize"}, - {23, &IUser::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"}, - {24, &IUser::RecreateApplicationArea, "RecreateApplicationArea"}, - }; - RegisterHandlers(functions); - +Interface::Interface(Core::System& system_, const char* name) + : ServiceFramework{system_, name}, service_context{system_, service_name} { availability_change_event = service_context.CreateEvent("IUser:AvailabilityChangeEvent"); for (u32 device_index = 0; device_index < 10; device_index++) { @@ -52,11 +23,11 @@ IUser::IUser(Core::System& system_) } } -IUser ::~IUser() { +Interface::~Interface() { availability_change_event->Close(); } -void IUser::Initialize(HLERequestContext& ctx) { +void Interface::Initialize(HLERequestContext& ctx) { LOG_INFO(Service_NFP, "called"); state = State::Initialized; @@ -69,7 +40,7 @@ void IUser::Initialize(HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IUser::Finalize(HLERequestContext& ctx) { +void Interface::Finalize(HLERequestContext& ctx) { LOG_INFO(Service_NFP, "called"); state = State::NonInitialized; @@ -82,7 +53,7 @@ void IUser::Finalize(HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IUser::ListDevices(HLERequestContext& ctx) { +void Interface::ListDevices(HLERequestContext& ctx) { LOG_DEBUG(Service_NFP, "called"); if (state == State::NonInitialized) { @@ -128,7 +99,7 @@ void IUser::ListDevices(HLERequestContext& ctx) { rb.Push(static_cast(nfp_devices.size())); } -void IUser::StartDetection(HLERequestContext& ctx) { +void Interface::StartDetection(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto nfp_protocol{rp.PopEnum()}; @@ -153,7 +124,7 @@ void IUser::StartDetection(HLERequestContext& ctx) { rb.Push(result); } -void IUser::StopDetection(HLERequestContext& ctx) { +void Interface::StopDetection(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); @@ -177,7 +148,7 @@ void IUser::StopDetection(HLERequestContext& ctx) { rb.Push(result); } -void IUser::Mount(HLERequestContext& ctx) { +void Interface::Mount(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto model_type{rp.PopEnum()}; @@ -204,7 +175,7 @@ void IUser::Mount(HLERequestContext& ctx) { rb.Push(result); } -void IUser::Unmount(HLERequestContext& ctx) { +void Interface::Unmount(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); @@ -228,7 +199,7 @@ void IUser::Unmount(HLERequestContext& ctx) { rb.Push(result); } -void IUser::OpenApplicationArea(HLERequestContext& ctx) { +void Interface::OpenApplicationArea(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto access_id{rp.Pop()}; @@ -253,7 +224,7 @@ void IUser::OpenApplicationArea(HLERequestContext& ctx) { rb.Push(result); } -void IUser::GetApplicationArea(HLERequestContext& ctx) { +void Interface::GetApplicationArea(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto data_size = ctx.GetWriteBufferSize(); @@ -287,7 +258,7 @@ void IUser::GetApplicationArea(HLERequestContext& ctx) { rb.Push(static_cast(data_size)); } -void IUser::SetApplicationArea(HLERequestContext& ctx) { +void Interface::SetApplicationArea(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto data{ctx.ReadBuffer()}; @@ -318,7 +289,7 @@ void IUser::SetApplicationArea(HLERequestContext& ctx) { rb.Push(result); } -void IUser::Flush(HLERequestContext& ctx) { +void Interface::Flush(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); @@ -342,7 +313,7 @@ void IUser::Flush(HLERequestContext& ctx) { rb.Push(result); } -void IUser::Restore(HLERequestContext& ctx) { +void Interface::Restore(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_WARNING(Service_NFP, "(STUBBED) called, device_handle={}", device_handle); @@ -366,7 +337,7 @@ void IUser::Restore(HLERequestContext& ctx) { rb.Push(result); } -void IUser::CreateApplicationArea(HLERequestContext& ctx) { +void Interface::CreateApplicationArea(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto access_id{rp.Pop()}; @@ -399,7 +370,7 @@ void IUser::CreateApplicationArea(HLERequestContext& ctx) { rb.Push(result); } -void IUser::GetTagInfo(HLERequestContext& ctx) { +void Interface::GetTagInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); @@ -425,7 +396,7 @@ void IUser::GetTagInfo(HLERequestContext& ctx) { rb.Push(result); } -void IUser::GetRegisterInfo(HLERequestContext& ctx) { +void Interface::GetRegisterInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); @@ -451,7 +422,7 @@ void IUser::GetRegisterInfo(HLERequestContext& ctx) { rb.Push(result); } -void IUser::GetCommonInfo(HLERequestContext& ctx) { +void Interface::GetCommonInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); @@ -477,7 +448,7 @@ void IUser::GetCommonInfo(HLERequestContext& ctx) { rb.Push(result); } -void IUser::GetModelInfo(HLERequestContext& ctx) { +void Interface::GetModelInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); @@ -503,7 +474,7 @@ void IUser::GetModelInfo(HLERequestContext& ctx) { rb.Push(result); } -void IUser::AttachActivateEvent(HLERequestContext& ctx) { +void Interface::AttachActivateEvent(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); @@ -527,7 +498,7 @@ void IUser::AttachActivateEvent(HLERequestContext& ctx) { rb.PushCopyObjects(device.value()->GetActivateEvent()); } -void IUser::AttachDeactivateEvent(HLERequestContext& ctx) { +void Interface::AttachDeactivateEvent(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); @@ -551,7 +522,7 @@ void IUser::AttachDeactivateEvent(HLERequestContext& ctx) { rb.PushCopyObjects(device.value()->GetDeactivateEvent()); } -void IUser::GetState(HLERequestContext& ctx) { +void Interface::GetState(HLERequestContext& ctx) { LOG_DEBUG(Service_NFP, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -559,7 +530,7 @@ void IUser::GetState(HLERequestContext& ctx) { rb.PushEnum(state); } -void IUser::GetDeviceState(HLERequestContext& ctx) { +void Interface::GetDeviceState(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); @@ -577,7 +548,7 @@ void IUser::GetDeviceState(HLERequestContext& ctx) { rb.PushEnum(device.value()->GetCurrentState()); } -void IUser::GetNpadId(HLERequestContext& ctx) { +void Interface::GetNpadId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); @@ -601,7 +572,7 @@ void IUser::GetNpadId(HLERequestContext& ctx) { rb.PushEnum(device.value()->GetNpadId()); } -void IUser::GetApplicationAreaSize(HLERequestContext& ctx) { +void Interface::GetApplicationAreaSize(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); @@ -619,7 +590,7 @@ void IUser::GetApplicationAreaSize(HLERequestContext& ctx) { rb.Push(device.value()->GetApplicationAreaSize()); } -void IUser::AttachAvailabilityChangeEvent(HLERequestContext& ctx) { +void Interface::AttachAvailabilityChangeEvent(HLERequestContext& ctx) { LOG_INFO(Service_NFP, "called"); if (state == State::NonInitialized) { @@ -633,7 +604,7 @@ void IUser::AttachAvailabilityChangeEvent(HLERequestContext& ctx) { rb.PushCopyObjects(availability_change_event->GetReadableEvent()); } -void IUser::RecreateApplicationArea(HLERequestContext& ctx) { +void Interface::RecreateApplicationArea(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto access_id{rp.Pop()}; @@ -660,7 +631,7 @@ void IUser::RecreateApplicationArea(HLERequestContext& ctx) { rb.Push(result); } -std::optional> IUser::GetNfpDevice(u64 handle) { +std::optional> Interface::GetNfpDevice(u64 handle) { for (auto& device : devices) { if (device->GetHandle() == handle) { return device; diff --git a/src/core/hle/service/nfp/nfp_user.h b/src/core/hle/service/nfp/nfp_interface.h similarity index 92% rename from src/core/hle/service/nfp/nfp_user.h rename to src/core/hle/service/nfp/nfp_interface.h index 1f3ff2ea8..11f29c2ba 100644 --- a/src/core/hle/service/nfp/nfp_user.h +++ b/src/core/hle/service/nfp/nfp_interface.h @@ -13,16 +13,10 @@ namespace Service::NFP { class NfpDevice; -class IUser final : public ServiceFramework { +class Interface : public ServiceFramework { public: - explicit IUser(Core::System& system_); - ~IUser(); - -private: - enum class State : u32 { - NonInitialized, - Initialized, - }; + explicit Interface(Core::System& system_, const char* name); + ~Interface() override; void Initialize(HLERequestContext& ctx); void Finalize(HLERequestContext& ctx); @@ -50,6 +44,12 @@ private: void AttachAvailabilityChangeEvent(HLERequestContext& ctx); void RecreateApplicationArea(HLERequestContext& ctx); +private: + enum class State : u32 { + NonInitialized, + Initialized, + }; + std::optional> GetNfpDevice(u64 handle); KernelHelpers::ServiceContext service_context; From 60c4032b68d08c8434a0730015f193f5efc3cf41 Mon Sep 17 00:00:00 2001 From: Valeri Date: Fri, 14 Apr 2023 21:27:35 +0300 Subject: [PATCH 0255/1181] input_common: minor fix to mouse movement --- src/input_common/drivers/mouse.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/input_common/drivers/mouse.cpp b/src/input_common/drivers/mouse.cpp index 4fb2a6cfa..0c9f642bb 100644 --- a/src/input_common/drivers/mouse.cpp +++ b/src/input_common/drivers/mouse.cpp @@ -135,7 +135,7 @@ void Mouse::Move(int x, int y, int center_x, int center_y) { auto mouse_change = (Common::MakeVec(x, y) - Common::MakeVec(center_x, center_y)).Cast(); - last_motion_change += {-mouse_change.y, -mouse_change.x, last_motion_change.z}; + last_motion_change += {-mouse_change.y, -mouse_change.x, 0}; const auto move_distance = mouse_change.Length(); if (move_distance == 0) { From 00800d5289f580ffebd38f18d1c3d7e024fc3b16 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Thu, 13 Apr 2023 20:55:47 -0600 Subject: [PATCH 0256/1181] service: nfp: Implement system interface --- src/core/hle/service/nfp/nfp.cpp | 32 ++-- src/core/hle/service/nfp/nfp_device.cpp | 52 +++++- src/core/hle/service/nfp/nfp_device.h | 2 + src/core/hle/service/nfp/nfp_interface.cpp | 202 +++++++++++++++++++++ src/core/hle/service/nfp/nfp_interface.h | 9 + src/core/hle/service/nfp/nfp_types.h | 9 + 6 files changed, 289 insertions(+), 17 deletions(-) diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp index e57e932c8..8a7365f17 100644 --- a/src/core/hle/service/nfp/nfp.cpp +++ b/src/core/hle/service/nfp/nfp.cpp @@ -51,8 +51,8 @@ public: explicit ISystem(Core::System& system_) : Interface(system_, "NFP:ISystem") { // clang-format off static const FunctionInfo functions[] = { - {0, nullptr, "InitializeSystem"}, - {1, nullptr, "FinalizeSystem"}, + {0, &ISystem::InitializeSystem, "InitializeSystem"}, + {1, &ISystem::FinalizeSystem, "FinalizeSystem"}, {2, &ISystem::ListDevices, "ListDevices"}, {3, &ISystem::StartDetection, "StartDetection"}, {4, &ISystem::StopDetection, "StopDetection"}, @@ -71,13 +71,13 @@ public: {20, &ISystem::GetDeviceState, "GetDeviceState"}, {21, &ISystem::GetNpadId, "GetNpadId"}, {23, &ISystem::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"}, - {100, nullptr, "Format"}, - {101, nullptr, "GetAdminInfo"}, - {102, nullptr, "GetRegisterInfoPrivate"}, - {103, nullptr, "SetRegisterInfoPrivate"}, - {104, nullptr, "DeleteRegisterInfo"}, - {105, nullptr, "DeleteApplicationArea"}, - {106, nullptr, "ExistsApplicationArea"}, + {100, &ISystem::Format, "Format"}, + {101, &ISystem::GetAdminInfo, "GetAdminInfo"}, + {102, &ISystem::GetRegisterInfoPrivate, "GetRegisterInfoPrivate"}, + {103, &ISystem::SetRegisterInfoPrivate, "SetRegisterInfoPrivate"}, + {104, &ISystem::DeleteRegisterInfo, "DeleteRegisterInfo"}, + {105, &ISystem::DeleteApplicationArea, "DeleteApplicationArea"}, + {106, &ISystem::ExistsApplicationArea, "ExistsApplicationArea"}, }; // clang-format on @@ -115,13 +115,13 @@ public: {22, &IDebug::GetApplicationAreaSize, "GetApplicationAreaSize"}, {23, &IDebug::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"}, {24, &IDebug::RecreateApplicationArea, "RecreateApplicationArea"}, - {100, nullptr, "Format"}, - {101, nullptr, "GetAdminInfo"}, - {102, nullptr, "GetRegisterInfoPrivate"}, - {103, nullptr, "SetRegisterInfoPrivate"}, - {104, nullptr, "DeleteRegisterInfo"}, - {105, nullptr, "DeleteApplicationArea"}, - {106, nullptr, "ExistsApplicationArea"}, + {100, &IDebug::Format, "Format"}, + {101, &IDebug::GetAdminInfo, "GetAdminInfo"}, + {102, &IDebug::GetRegisterInfoPrivate, "GetRegisterInfoPrivate"}, + {103, &IDebug::SetRegisterInfoPrivate, "SetRegisterInfoPrivate"}, + {104, &IDebug::DeleteRegisterInfo, "DeleteRegisterInfo"}, + {105, &IDebug::DeleteApplicationArea, "DeleteApplicationArea"}, + {106, &IDebug::ExistsApplicationArea, "ExistsApplicationArea"}, {200, nullptr, "GetAll"}, {201, nullptr, "SetAll"}, {202, nullptr, "FlushDebug"}, diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfp/nfp_device.cpp index 607e70968..5ed6d4181 100644 --- a/src/core/hle/service/nfp/nfp_device.cpp +++ b/src/core/hle/service/nfp/nfp_device.cpp @@ -29,7 +29,6 @@ #include "core/hle/service/nfp/amiibo_crypto.h" #include "core/hle/service/nfp/nfp_device.h" #include "core/hle/service/nfp/nfp_result.h" -#include "core/hle/service/nfp/nfp_user.h" #include "core/hle/service/time/time_manager.h" #include "core/hle/service/time/time_zone_content_manager.h" #include "core/hle/service/time/time_zone_types.h" @@ -417,6 +416,38 @@ Result NfpDevice::GetRegisterInfo(RegisterInfo& register_info) const { return ResultSuccess; } +Result NfpDevice::GetRegisterInfoPrivate(RegisterInfoPrivate& register_info) const { + if (device_state != DeviceState::TagMounted) { + LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); + if (device_state == DeviceState::TagRemoved) { + return TagRemoved; + } + return WrongDeviceState; + } + + if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + LOG_ERROR(Service_NFP, "Amiibo is read only", device_state); + return WrongDeviceState; + } + + if (tag_data.settings.settings.amiibo_initialized == 0) { + return RegistrationIsNotInitialized; + } + + Service::Mii::MiiManager manager; + const auto& settings = tag_data.settings; + + // TODO: Validate and complete this data + register_info = { + .mii_store_data = {}, + .creation_date = settings.init_date.GetWriteDate(), + .amiibo_name = GetAmiiboName(settings), + .font_region = settings.settings.font_region, + }; + + return ResultSuccess; +} + Result NfpDevice::GetAdminInfo(AdminInfo& admin_info) const { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); @@ -807,6 +838,25 @@ Result NfpDevice::DeleteApplicationArea() { return Flush(); } +Result NfpDevice::ExistApplicationArea(bool& has_application_area) { + if (device_state != DeviceState::TagMounted) { + LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); + if (device_state == DeviceState::TagRemoved) { + return TagRemoved; + } + return WrongDeviceState; + } + + if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); + return WrongDeviceState; + } + + has_application_area = tag_data.settings.settings.appdata_initialized.Value() != 0; + + return ResultSuccess; +} + u64 NfpDevice::GetHandle() const { // Generate a handle based of the npad id return static_cast(npad_id); diff --git a/src/core/hle/service/nfp/nfp_device.h b/src/core/hle/service/nfp/nfp_device.h index 7f963730d..0d778c1d7 100644 --- a/src/core/hle/service/nfp/nfp_device.h +++ b/src/core/hle/service/nfp/nfp_device.h @@ -47,6 +47,7 @@ public: Result GetCommonInfo(CommonInfo& common_info) const; Result GetModelInfo(ModelInfo& model_info) const; Result GetRegisterInfo(RegisterInfo& register_info) const; + Result GetRegisterInfoPrivate(RegisterInfoPrivate& register_info) const; Result GetAdminInfo(AdminInfo& admin_info) const; Result DeleteRegisterInfo(); @@ -61,6 +62,7 @@ public: Result CreateApplicationArea(u32 access_id, std::span data); Result RecreateApplicationArea(u32 access_id, std::span data); Result DeleteApplicationArea(); + Result ExistApplicationArea(bool& has_application_area); u64 GetHandle() const; u32 GetApplicationAreaSize() const; diff --git a/src/core/hle/service/nfp/nfp_interface.cpp b/src/core/hle/service/nfp/nfp_interface.cpp index e131703cb..d60f3cb97 100644 --- a/src/core/hle/service/nfp/nfp_interface.cpp +++ b/src/core/hle/service/nfp/nfp_interface.cpp @@ -40,6 +40,19 @@ void Interface::Initialize(HLERequestContext& ctx) { rb.Push(ResultSuccess); } +void Interface::InitializeSystem(HLERequestContext& ctx) { + LOG_INFO(Service_NFP, "called"); + + state = State::Initialized; + + for (auto& device : devices) { + device->Initialize(); + } + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultSuccess); +} + void Interface::Finalize(HLERequestContext& ctx) { LOG_INFO(Service_NFP, "called"); @@ -53,6 +66,19 @@ void Interface::Finalize(HLERequestContext& ctx) { rb.Push(ResultSuccess); } +void Interface::FinalizeSystem(HLERequestContext& ctx) { + LOG_INFO(Service_NFP, "called"); + + state = State::NonInitialized; + + for (auto& device : devices) { + device->Finalize(); + } + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultSuccess); +} + void Interface::ListDevices(HLERequestContext& ctx) { LOG_DEBUG(Service_NFP, "called"); @@ -631,6 +657,182 @@ void Interface::RecreateApplicationArea(HLERequestContext& ctx) { rb.Push(result); } +void Interface::Format(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + + if (state == State::NonInitialized) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(NfcDisabled); + return; + } + + auto device = GetNfpDevice(device_handle); + + if (!device.has_value()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(DeviceNotFound); + return; + } + + const auto result = device.value()->Format(); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void Interface::GetAdminInfo(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); + + if (state == State::NonInitialized) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(NfcDisabled); + return; + } + + auto device = GetNfpDevice(device_handle); + + if (!device.has_value()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(DeviceNotFound); + return; + } + + AdminInfo admin_info{}; + const auto result = device.value()->GetAdminInfo(admin_info); + ctx.WriteBuffer(admin_info); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void Interface::GetRegisterInfoPrivate(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); + + if (state == State::NonInitialized) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(NfcDisabled); + return; + } + + auto device = GetNfpDevice(device_handle); + + if (!device.has_value()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(DeviceNotFound); + return; + } + + RegisterInfoPrivate register_info{}; + const auto result = device.value()->GetRegisterInfoPrivate(register_info); + ctx.WriteBuffer(register_info); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void Interface::SetRegisterInfoPrivate(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + const auto buffer{ctx.ReadBuffer()}; + LOG_DEBUG(Service_NFP, "called, device_handle={}, buffer_size={}", device_handle, + buffer.size()); + + if (state == State::NonInitialized) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(NfcDisabled); + return; + } + + auto device = GetNfpDevice(device_handle); + + if (!device.has_value()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(DeviceNotFound); + return; + } + + const auto result = device.value()->SetRegisterInfoPrivate({}); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void Interface::DeleteRegisterInfo(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + + if (state == State::NonInitialized) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(NfcDisabled); + return; + } + + auto device = GetNfpDevice(device_handle); + + if (!device.has_value()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(DeviceNotFound); + return; + } + + const auto result = device.value()->DeleteRegisterInfo(); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void Interface::DeleteApplicationArea(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + + if (state == State::NonInitialized) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(NfcDisabled); + return; + } + + auto device = GetNfpDevice(device_handle); + + if (!device.has_value()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(DeviceNotFound); + return; + } + + const auto result = device.value()->DeleteApplicationArea(); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void Interface::ExistsApplicationArea(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + + if (state == State::NonInitialized) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(NfcDisabled); + return; + } + + auto device = GetNfpDevice(device_handle); + + if (!device.has_value()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(DeviceNotFound); + return; + } + + bool has_application_area = false; + const auto result = device.value()->ExistApplicationArea(has_application_area); + IPC::ResponseBuilder rb{ctx, 3}; + rb.Push(result); + rb.Push(has_application_area); +} + std::optional> Interface::GetNfpDevice(u64 handle) { for (auto& device : devices) { if (device->GetHandle() == handle) { diff --git a/src/core/hle/service/nfp/nfp_interface.h b/src/core/hle/service/nfp/nfp_interface.h index 11f29c2ba..4affdbc0c 100644 --- a/src/core/hle/service/nfp/nfp_interface.h +++ b/src/core/hle/service/nfp/nfp_interface.h @@ -19,7 +19,9 @@ public: ~Interface() override; void Initialize(HLERequestContext& ctx); + void InitializeSystem(HLERequestContext& ctx); void Finalize(HLERequestContext& ctx); + void FinalizeSystem(HLERequestContext& ctx); void ListDevices(HLERequestContext& ctx); void StartDetection(HLERequestContext& ctx); void StopDetection(HLERequestContext& ctx); @@ -43,6 +45,13 @@ public: void GetApplicationAreaSize(HLERequestContext& ctx); void AttachAvailabilityChangeEvent(HLERequestContext& ctx); void RecreateApplicationArea(HLERequestContext& ctx); + void Format(HLERequestContext& ctx); + void GetAdminInfo(HLERequestContext& ctx); + void GetRegisterInfoPrivate(HLERequestContext& ctx); + void SetRegisterInfoPrivate(HLERequestContext& ctx); + void DeleteRegisterInfo(HLERequestContext& ctx); + void DeleteApplicationArea(HLERequestContext& ctx); + void ExistsApplicationArea(HLERequestContext& ctx); private: enum class State : u32 { diff --git a/src/core/hle/service/nfp/nfp_types.h b/src/core/hle/service/nfp/nfp_types.h index 70c878552..90429baa2 100644 --- a/src/core/hle/service/nfp/nfp_types.h +++ b/src/core/hle/service/nfp/nfp_types.h @@ -354,6 +354,15 @@ struct RegisterInfo { }; static_assert(sizeof(RegisterInfo) == 0x100, "RegisterInfo is an invalid size"); +struct RegisterInfoPrivate { + Service::Mii::MiiStoreData mii_store_data; + WriteDate creation_date; + AmiiboName amiibo_name; + u8 font_region; + INSERT_PADDING_BYTES(0x8E); +}; +static_assert(sizeof(RegisterInfoPrivate) == 0x100, "RegisterInfoPrivate is an invalid size"); + struct AdminInfo { u64 application_id; u32 application_area_id; From 307371e01d403c376a030d3a708d808659394bf5 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Thu, 13 Apr 2023 22:23:49 -0600 Subject: [PATCH 0257/1181] service: nfp: Implement debug Interface --- src/core/hle/service/nfp/nfp.cpp | 12 +- src/core/hle/service/nfp/nfp_device.cpp | 172 ++++++++++++++++- src/core/hle/service/nfp/nfp_device.h | 10 + src/core/hle/service/nfp/nfp_interface.cpp | 204 +++++++++++++++++++++ src/core/hle/service/nfp/nfp_interface.h | 9 + src/core/hle/service/nfp/nfp_types.h | 45 +++++ 6 files changed, 444 insertions(+), 8 deletions(-) diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp index 8a7365f17..2714f4bea 100644 --- a/src/core/hle/service/nfp/nfp.cpp +++ b/src/core/hle/service/nfp/nfp.cpp @@ -90,8 +90,8 @@ public: explicit IDebug(Core::System& system_) : Interface(system_, "NFP:IDebug") { // clang-format off static const FunctionInfo functions[] = { - {0, nullptr, "InitializeDebug"}, - {1, nullptr, "FinalizeDebug"}, + {0, &IDebug::InitializeDebug, "InitializeDebug"}, + {1, &IDebug::FinalizeDebug, "FinalizeDebug"}, {2, &IDebug::ListDevices, "ListDevices"}, {3, &IDebug::StartDetection, "StartDetection"}, {4, &IDebug::StopDetection, "StopDetection"}, @@ -122,10 +122,10 @@ public: {104, &IDebug::DeleteRegisterInfo, "DeleteRegisterInfo"}, {105, &IDebug::DeleteApplicationArea, "DeleteApplicationArea"}, {106, &IDebug::ExistsApplicationArea, "ExistsApplicationArea"}, - {200, nullptr, "GetAll"}, - {201, nullptr, "SetAll"}, - {202, nullptr, "FlushDebug"}, - {203, nullptr, "BreakTag"}, + {200, &IDebug::GetAll, "GetAll"}, + {201, &IDebug::SetAll, "SetAll"}, + {202, &IDebug::FlushDebug, "FlushDebug"}, + {203, &IDebug::BreakTag, "BreakTag"}, {204, nullptr, "ReadBackupData"}, {205, nullptr, "WriteBackupData"}, {206, nullptr, "WriteNtf"}, diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfp/nfp_device.cpp index 5ed6d4181..3f9af53c8 100644 --- a/src/core/hle/service/nfp/nfp_device.cpp +++ b/src/core/hle/service/nfp/nfp_device.cpp @@ -240,6 +240,42 @@ Result NfpDevice::Flush() { tag_data.write_counter++; + FlushWithBreak(BreakType::Normal); + + is_data_moddified = false; + + return ResultSuccess; +} + +Result NfpDevice::FlushDebug() { + if (device_state != DeviceState::TagMounted) { + LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); + if (device_state == DeviceState::TagRemoved) { + return TagRemoved; + } + return WrongDeviceState; + } + + if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); + return WrongDeviceState; + } + + tag_data.write_counter++; + + FlushWithBreak(BreakType::Normal); + + is_data_moddified = false; + + return ResultSuccess; +} + +Result NfpDevice::FlushWithBreak(BreakType break_type) { + if (break_type != BreakType::Normal) { + LOG_ERROR(Service_NFC, "Break type not implemented {}", break_type); + return WrongDeviceState; + } + std::vector data(sizeof(EncryptedNTAG215File)); if (is_plain_amiibo) { memcpy(data.data(), &tag_data, sizeof(tag_data)); @@ -257,8 +293,6 @@ Result NfpDevice::Flush() { return WriteAmiiboFailed; } - is_data_moddified = false; - return ResultSuccess; } @@ -857,6 +891,140 @@ Result NfpDevice::ExistApplicationArea(bool& has_application_area) { return ResultSuccess; } +Result NfpDevice::GetAll(NfpData& data) const { + if (device_state != DeviceState::TagMounted) { + LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); + if (device_state == DeviceState::TagRemoved) { + return TagRemoved; + } + return WrongDeviceState; + } + + if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); + return WrongDeviceState; + } + + CommonInfo common_info{}; + Service::Mii::MiiManager manager; + const u64 application_id = tag_data.application_id; + + GetCommonInfo(common_info); + + data = { + .magic = tag_data.constant_value, + .write_counter = tag_data.write_counter, + .settings_crc = tag_data.settings.crc, + .common_info = common_info, + .mii_char_info = tag_data.owner_mii, + .mii_store_data_extension = tag_data.mii_extension, + .creation_date = tag_data.settings.init_date.GetWriteDate(), + .amiibo_name = tag_data.settings.amiibo_name, + .amiibo_name_null_terminated = 0, + .settings = tag_data.settings.settings, + .unknown1 = tag_data.unknown, + .register_info_crc = tag_data.register_info_crc, + .unknown2 = tag_data.unknown2, + .application_id = application_id, + .access_id = tag_data.application_area_id, + .settings_crc_counter = tag_data.settings.crc_counter, + .font_region = tag_data.settings.settings.font_region, + .tag_type = PackedTagType::Type2, + .console_type = + static_cast(application_id >> application_id_version_offset & 0xf), + .application_id_byte = tag_data.application_id_byte, + .application_area = tag_data.application_area, + }; + + return ResultSuccess; +} + +Result NfpDevice::SetAll(const NfpData& data) { + if (device_state != DeviceState::TagMounted) { + LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); + if (device_state == DeviceState::TagRemoved) { + return TagRemoved; + } + return WrongDeviceState; + } + + if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); + return WrongDeviceState; + } + + tag_data.constant_value = data.magic; + tag_data.write_counter = data.write_counter; + tag_data.settings.crc = data.settings_crc; + tag_data.settings.write_date.SetWriteDate(data.common_info.last_write_date); + tag_data.write_counter = data.common_info.write_counter; + tag_data.amiibo_version = data.common_info.version; + tag_data.owner_mii = data.mii_char_info; + tag_data.mii_extension = data.mii_store_data_extension; + tag_data.settings.init_date.SetWriteDate(data.creation_date); + tag_data.settings.amiibo_name = data.amiibo_name; + tag_data.settings.settings = data.settings; + tag_data.unknown = data.unknown1; + tag_data.register_info_crc = data.register_info_crc; + tag_data.unknown2 = data.unknown2; + tag_data.application_id = data.application_id; + tag_data.application_area_id = data.access_id; + tag_data.settings.crc_counter = data.settings_crc_counter; + tag_data.settings.settings.font_region.Assign(data.font_region); + tag_data.application_id_byte = data.application_id_byte; + tag_data.application_area = data.application_area; + + return ResultSuccess; +} + +Result NfpDevice::BreakTag(BreakType break_type) { + if (device_state != DeviceState::TagMounted) { + LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); + if (device_state == DeviceState::TagRemoved) { + return TagRemoved; + } + return WrongDeviceState; + } + + if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); + return WrongDeviceState; + } + + // TODO: Complete this implementation + + return FlushWithBreak(break_type); +} + +Result NfpDevice::ReadBackupData() { + // Not implemented + return ResultSuccess; +} + +Result NfpDevice::WriteBackupData() { + // Not implemented + return ResultSuccess; +} + +Result NfpDevice::WriteNtf() { + if (device_state != DeviceState::TagMounted) { + LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); + if (device_state == DeviceState::TagRemoved) { + return TagRemoved; + } + return WrongDeviceState; + } + + if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); + return WrongDeviceState; + } + + // Not implemented + + return ResultSuccess; +} + u64 NfpDevice::GetHandle() const { // Generate a handle based of the npad id return static_cast(npad_id); diff --git a/src/core/hle/service/nfp/nfp_device.h b/src/core/hle/service/nfp/nfp_device.h index 0d778c1d7..bab05538a 100644 --- a/src/core/hle/service/nfp/nfp_device.h +++ b/src/core/hle/service/nfp/nfp_device.h @@ -41,7 +41,10 @@ public: Result StopDetection(); Result Mount(MountTarget mount_target); Result Unmount(); + Result Flush(); + Result FlushDebug(); + Result FlushWithBreak(BreakType break_type); Result GetTagInfo(TagInfo& tag_info) const; Result GetCommonInfo(CommonInfo& common_info) const; @@ -64,6 +67,13 @@ public: Result DeleteApplicationArea(); Result ExistApplicationArea(bool& has_application_area); + Result GetAll(NfpData& data) const; + Result SetAll(const NfpData& data); + Result BreakTag(BreakType break_type); + Result ReadBackupData(); + Result WriteBackupData(); + Result WriteNtf(); + u64 GetHandle() const; u32 GetApplicationAreaSize() const; DeviceState GetCurrentState() const; diff --git a/src/core/hle/service/nfp/nfp_interface.cpp b/src/core/hle/service/nfp/nfp_interface.cpp index d60f3cb97..2ed8bb1ba 100644 --- a/src/core/hle/service/nfp/nfp_interface.cpp +++ b/src/core/hle/service/nfp/nfp_interface.cpp @@ -53,6 +53,19 @@ void Interface::InitializeSystem(HLERequestContext& ctx) { rb.Push(ResultSuccess); } +void Interface::InitializeDebug(HLERequestContext& ctx) { + LOG_INFO(Service_NFP, "called"); + + state = State::Initialized; + + for (auto& device : devices) { + device->Initialize(); + } + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultSuccess); +} + void Interface::Finalize(HLERequestContext& ctx) { LOG_INFO(Service_NFP, "called"); @@ -79,6 +92,19 @@ void Interface::FinalizeSystem(HLERequestContext& ctx) { rb.Push(ResultSuccess); } +void Interface::FinalizeDebug(HLERequestContext& ctx) { + LOG_INFO(Service_NFP, "called"); + + state = State::NonInitialized; + + for (auto& device : devices) { + device->Finalize(); + } + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultSuccess); +} + void Interface::ListDevices(HLERequestContext& ctx) { LOG_DEBUG(Service_NFP, "called"); @@ -833,6 +859,184 @@ void Interface::ExistsApplicationArea(HLERequestContext& ctx) { rb.Push(has_application_area); } +void Interface::GetAll(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + + if (state == State::NonInitialized) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(NfcDisabled); + return; + } + + auto device = GetNfpDevice(device_handle); + + if (!device.has_value()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(DeviceNotFound); + return; + } + + NfpData data{}; + const auto result = device.value()->GetAll(data); + + ctx.WriteBuffer(data); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void Interface::SetAll(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + const auto nfp_data{ctx.ReadBuffer()}; + + LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + + if (state == State::NonInitialized) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(NfcDisabled); + return; + } + + auto device = GetNfpDevice(device_handle); + + if (!device.has_value()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(DeviceNotFound); + return; + } + + NfpData data{}; + memcpy(&data, nfp_data.data(), sizeof(NfpData)); + + const auto result = device.value()->SetAll(data); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void Interface::FlushDebug(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + + if (state == State::NonInitialized) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(NfcDisabled); + return; + } + + auto device = GetNfpDevice(device_handle); + + if (!device.has_value()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(DeviceNotFound); + return; + } + + const auto result = device.value()->FlushDebug(); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void Interface::BreakTag(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + const auto break_type{rp.PopEnum()}; + LOG_DEBUG(Service_NFP, "called, device_handle={}, break_type={}", device_handle, break_type); + + if (state == State::NonInitialized) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(NfcDisabled); + return; + } + + auto device = GetNfpDevice(device_handle); + + if (!device.has_value()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(DeviceNotFound); + return; + } + + const auto result = device.value()->BreakTag(break_type); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void Interface::ReadBackupData(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + + if (state == State::NonInitialized) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(NfcDisabled); + return; + } + + auto device = GetNfpDevice(device_handle); + + if (!device.has_value()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(DeviceNotFound); + return; + } + + const auto result = device.value()->ReadBackupData(); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void Interface::WriteBackupData(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + + if (state == State::NonInitialized) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(NfcDisabled); + return; + } + + auto device = GetNfpDevice(device_handle); + + if (!device.has_value()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(DeviceNotFound); + return; + } + + const auto result = device.value()->WriteBackupData(); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void Interface::WriteNtf(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + + if (state == State::NonInitialized) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(NfcDisabled); + return; + } + + auto device = GetNfpDevice(device_handle); + + if (!device.has_value()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(DeviceNotFound); + return; + } + + const auto result = device.value()->WriteNtf(); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + std::optional> Interface::GetNfpDevice(u64 handle) { for (auto& device : devices) { if (device->GetHandle() == handle) { diff --git a/src/core/hle/service/nfp/nfp_interface.h b/src/core/hle/service/nfp/nfp_interface.h index 4affdbc0c..616c94b06 100644 --- a/src/core/hle/service/nfp/nfp_interface.h +++ b/src/core/hle/service/nfp/nfp_interface.h @@ -20,8 +20,10 @@ public: void Initialize(HLERequestContext& ctx); void InitializeSystem(HLERequestContext& ctx); + void InitializeDebug(HLERequestContext& ctx); void Finalize(HLERequestContext& ctx); void FinalizeSystem(HLERequestContext& ctx); + void FinalizeDebug(HLERequestContext& ctx); void ListDevices(HLERequestContext& ctx); void StartDetection(HLERequestContext& ctx); void StopDetection(HLERequestContext& ctx); @@ -52,6 +54,13 @@ public: void DeleteRegisterInfo(HLERequestContext& ctx); void DeleteApplicationArea(HLERequestContext& ctx); void ExistsApplicationArea(HLERequestContext& ctx); + void GetAll(HLERequestContext& ctx); + void SetAll(HLERequestContext& ctx); + void FlushDebug(HLERequestContext& ctx); + void BreakTag(HLERequestContext& ctx); + void ReadBackupData(HLERequestContext& ctx); + void WriteBackupData(HLERequestContext& ctx); + void WriteNtf(HLERequestContext& ctx); private: enum class State : u32 { diff --git a/src/core/hle/service/nfp/nfp_types.h b/src/core/hle/service/nfp/nfp_types.h index 90429baa2..1ef047cee 100644 --- a/src/core/hle/service/nfp/nfp_types.h +++ b/src/core/hle/service/nfp/nfp_types.h @@ -109,6 +109,12 @@ enum class AppAreaVersion : u8 { NotSet = 0xFF, }; +enum class BreakType : u32 { + Normal, + Unknown1, + Unknown2, +}; + enum class CabinetMode : u8 { StartNicknameAndOwnerSettings, StartGameDataEraser, @@ -181,6 +187,12 @@ struct AmiiboDate { }; } + void SetWriteDate(const WriteDate& write_date) { + SetYear(write_date.year); + SetMonth(write_date.month); + SetDay(write_date.day); + } + void SetYear(u16 year) { const u16 year_converted = static_cast((year - 2000) << 9); raw_date = Common::swap16((GetValue() & ~0xFE00) | year_converted); @@ -375,6 +387,39 @@ struct AdminInfo { }; static_assert(sizeof(AdminInfo) == 0x40, "AdminInfo is an invalid size"); +#pragma pack(1) +// This is nn::nfp::NfpData +struct NfpData { + u8 magic; + INSERT_PADDING_BYTES(0x1); + u8 write_counter; + INSERT_PADDING_BYTES(0x1); + u32 settings_crc; + INSERT_PADDING_BYTES(0x38); + CommonInfo common_info; + Service::Mii::Ver3StoreData mii_char_info; + Service::Mii::NfpStoreDataExtension mii_store_data_extension; + WriteDate creation_date; + std::array amiibo_name; + u16 amiibo_name_null_terminated; + Settings settings; + u8 unknown1; + u32 register_info_crc; + std::array unknown2; + INSERT_PADDING_BYTES(0x64); + u64 application_id; + u32 access_id; + u16 settings_crc_counter; + u8 font_region; + PackedTagType tag_type; + AppAreaVersion console_type; + u8 application_id_byte; + INSERT_PADDING_BYTES(0x2E); + ApplicationArea application_area; +}; +static_assert(sizeof(NfpData) == 0x298, "NfpData is an invalid size"); +#pragma pack() + struct SectorKey { MifareCmd command; u8 unknown; // Usually 1 From e3fb9b5e0049b87a25c551219d4b009550af5f6d Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 14 Apr 2023 22:53:37 -0400 Subject: [PATCH 0258/1181] vulkan: use plain fences when timeline semaphores are not available --- .../renderer_vulkan/vk_master_semaphore.cpp | 139 +++++++++++++++++- .../renderer_vulkan/vk_master_semaphore.h | 48 ++---- .../renderer_vulkan/vk_scheduler.cpp | 36 +---- src/video_core/vulkan_common/vulkan_device.h | 6 +- 4 files changed, 161 insertions(+), 68 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_master_semaphore.cpp b/src/video_core/renderer_vulkan/vk_master_semaphore.cpp index 8aa07ef9d..47c74e4d8 100644 --- a/src/video_core/renderer_vulkan/vk_master_semaphore.cpp +++ b/src/video_core/renderer_vulkan/vk_master_semaphore.cpp @@ -10,7 +10,14 @@ namespace Vulkan { -MasterSemaphore::MasterSemaphore(const Device& device) { +MasterSemaphore::MasterSemaphore(const Device& device_) : device(device_) { + if (!device.HasTimelineSemaphore()) { + static constexpr VkFenceCreateInfo fence_ci{ + .sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, .pNext = nullptr, .flags = 0}; + fence = device.GetLogical().CreateFence(fence_ci); + return; + } + static constexpr VkSemaphoreTypeCreateInfo semaphore_type_ci{ .sType = VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO, .pNext = nullptr, @@ -42,4 +49,134 @@ MasterSemaphore::MasterSemaphore(const Device& device) { MasterSemaphore::~MasterSemaphore() = default; +void MasterSemaphore::Refresh() { + if (!semaphore) { + // If we don't support timeline semaphores, there's nothing to refresh + return; + } + + u64 this_tick{}; + u64 counter{}; + do { + this_tick = gpu_tick.load(std::memory_order_acquire); + counter = semaphore.GetCounter(); + if (counter < this_tick) { + return; + } + } while (!gpu_tick.compare_exchange_weak(this_tick, counter, std::memory_order_release, + std::memory_order_relaxed)); +} + +void MasterSemaphore::Wait(u64 tick) { + if (!semaphore) { + // If we don't support timeline semaphores, use an atomic wait + while (true) { + u64 current_value = gpu_tick.load(std::memory_order_relaxed); + if (current_value >= tick) { + return; + } + gpu_tick.wait(current_value); + } + + return; + } + + // No need to wait if the GPU is ahead of the tick + if (IsFree(tick)) { + return; + } + + // Update the GPU tick and try again + Refresh(); + + if (IsFree(tick)) { + return; + } + + // If none of the above is hit, fallback to a regular wait + while (!semaphore.Wait(tick)) { + } + + Refresh(); +} + +VkResult MasterSemaphore::SubmitQueue(vk::CommandBuffer& cmdbuf, VkSemaphore signal_semaphore, + VkSemaphore wait_semaphore, u64 host_tick) { + if (semaphore) { + return SubmitQueueTimeline(cmdbuf, signal_semaphore, wait_semaphore, host_tick); + } else { + return SubmitQueueFence(cmdbuf, signal_semaphore, wait_semaphore, host_tick); + } +} + +static constexpr std::array wait_stage_masks{ + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, +}; + +VkResult MasterSemaphore::SubmitQueueTimeline(vk::CommandBuffer& cmdbuf, + VkSemaphore signal_semaphore, + VkSemaphore wait_semaphore, u64 host_tick) { + const VkSemaphore timeline_semaphore = *semaphore; + + const u32 num_signal_semaphores = signal_semaphore ? 2 : 1; + const std::array signal_values{host_tick, u64(0)}; + const std::array signal_semaphores{timeline_semaphore, signal_semaphore}; + + const u32 num_wait_semaphores = wait_semaphore ? 2 : 1; + const std::array wait_values{host_tick - 1, u64(1)}; + const std::array wait_semaphores{timeline_semaphore, wait_semaphore}; + + const VkTimelineSemaphoreSubmitInfo timeline_si{ + .sType = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO, + .pNext = nullptr, + .waitSemaphoreValueCount = num_wait_semaphores, + .pWaitSemaphoreValues = wait_values.data(), + .signalSemaphoreValueCount = num_signal_semaphores, + .pSignalSemaphoreValues = signal_values.data(), + }; + const VkSubmitInfo submit_info{ + .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, + .pNext = &timeline_si, + .waitSemaphoreCount = num_wait_semaphores, + .pWaitSemaphores = wait_semaphores.data(), + .pWaitDstStageMask = wait_stage_masks.data(), + .commandBufferCount = 1, + .pCommandBuffers = cmdbuf.address(), + .signalSemaphoreCount = num_signal_semaphores, + .pSignalSemaphores = signal_semaphores.data(), + }; + + return device.GetGraphicsQueue().Submit(submit_info); +} + +VkResult MasterSemaphore::SubmitQueueFence(vk::CommandBuffer& cmdbuf, VkSemaphore signal_semaphore, + VkSemaphore wait_semaphore, u64 host_tick) { + const u32 num_signal_semaphores = signal_semaphore ? 1 : 0; + const u32 num_wait_semaphores = wait_semaphore ? 1 : 0; + + const VkSubmitInfo submit_info{ + .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, + .pNext = nullptr, + .waitSemaphoreCount = num_wait_semaphores, + .pWaitSemaphores = &wait_semaphore, + .pWaitDstStageMask = wait_stage_masks.data(), + .commandBufferCount = 1, + .pCommandBuffers = cmdbuf.address(), + .signalSemaphoreCount = num_signal_semaphores, + .pSignalSemaphores = &signal_semaphore, + }; + + auto result = device.GetGraphicsQueue().Submit(submit_info, *fence); + + if (result == VK_SUCCESS) { + fence.Wait(); + fence.Reset(); + gpu_tick.store(host_tick); + gpu_tick.notify_all(); + } + + return result; +} + } // namespace Vulkan diff --git a/src/video_core/renderer_vulkan/vk_master_semaphore.h b/src/video_core/renderer_vulkan/vk_master_semaphore.h index 689f02ea5..f2f61f781 100644 --- a/src/video_core/renderer_vulkan/vk_master_semaphore.h +++ b/src/video_core/renderer_vulkan/vk_master_semaphore.h @@ -4,6 +4,8 @@ #pragma once #include +#include +#include #include #include "common/common_types.h" @@ -29,11 +31,6 @@ public: return gpu_tick.load(std::memory_order_acquire); } - /// Returns the timeline semaphore handle. - [[nodiscard]] VkSemaphore Handle() const noexcept { - return *semaphore; - } - /// Returns true when a tick has been hit by the GPU. [[nodiscard]] bool IsFree(u64 tick) const noexcept { return KnownGpuTick() >= tick; @@ -45,37 +42,24 @@ public: } /// Refresh the known GPU tick - void Refresh() { - u64 this_tick{}; - u64 counter{}; - do { - this_tick = gpu_tick.load(std::memory_order_acquire); - counter = semaphore.GetCounter(); - if (counter < this_tick) { - return; - } - } while (!gpu_tick.compare_exchange_weak(this_tick, counter, std::memory_order_release, - std::memory_order_relaxed)); - } + void Refresh(); /// Waits for a tick to be hit on the GPU - void Wait(u64 tick) { - // No need to wait if the GPU is ahead of the tick - if (IsFree(tick)) { - return; - } - // Update the GPU tick and try again - Refresh(); - if (IsFree(tick)) { - return; - } - // If none of the above is hit, fallback to a regular wait - while (!semaphore.Wait(tick)) { - } - Refresh(); - } + void Wait(u64 tick); + + /// Submits the device graphics queue, updating the tick as necessary + VkResult SubmitQueue(vk::CommandBuffer& cmdbuf, VkSemaphore signal_semaphore, + VkSemaphore wait_semaphore, u64 host_tick); private: + VkResult SubmitQueueTimeline(vk::CommandBuffer& cmdbuf, VkSemaphore signal_semaphore, + VkSemaphore wait_semaphore, u64 host_tick); + VkResult SubmitQueueFence(vk::CommandBuffer& cmdbuf, VkSemaphore signal_semaphore, + VkSemaphore wait_semaphore, u64 host_tick); + +private: + const Device& device; ///< Device. + vk::Fence fence; ///< Fence. vk::Semaphore semaphore; ///< Timeline semaphore. std::atomic gpu_tick{0}; ///< Current known GPU tick. std::atomic current_tick{1}; ///< Current logical tick. diff --git a/src/video_core/renderer_vulkan/vk_scheduler.cpp b/src/video_core/renderer_vulkan/vk_scheduler.cpp index b264e6ada..057e16967 100644 --- a/src/video_core/renderer_vulkan/vk_scheduler.cpp +++ b/src/video_core/renderer_vulkan/vk_scheduler.cpp @@ -212,45 +212,13 @@ void Scheduler::SubmitExecution(VkSemaphore signal_semaphore, VkSemaphore wait_s const u64 signal_value = master_semaphore->NextTick(); Record([signal_semaphore, wait_semaphore, signal_value, this](vk::CommandBuffer cmdbuf) { cmdbuf.End(); - const VkSemaphore timeline_semaphore = master_semaphore->Handle(); - - const u32 num_signal_semaphores = signal_semaphore ? 2U : 1U; - const std::array signal_values{signal_value, u64(0)}; - const std::array signal_semaphores{timeline_semaphore, signal_semaphore}; - - const u32 num_wait_semaphores = wait_semaphore ? 2U : 1U; - const std::array wait_values{signal_value - 1, u64(1)}; - const std::array wait_semaphores{timeline_semaphore, wait_semaphore}; - static constexpr std::array wait_stage_masks{ - VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, - VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, - }; - - const VkTimelineSemaphoreSubmitInfo timeline_si{ - .sType = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO, - .pNext = nullptr, - .waitSemaphoreValueCount = num_wait_semaphores, - .pWaitSemaphoreValues = wait_values.data(), - .signalSemaphoreValueCount = num_signal_semaphores, - .pSignalSemaphoreValues = signal_values.data(), - }; - const VkSubmitInfo submit_info{ - .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, - .pNext = &timeline_si, - .waitSemaphoreCount = num_wait_semaphores, - .pWaitSemaphores = wait_semaphores.data(), - .pWaitDstStageMask = wait_stage_masks.data(), - .commandBufferCount = 1, - .pCommandBuffers = cmdbuf.address(), - .signalSemaphoreCount = num_signal_semaphores, - .pSignalSemaphores = signal_semaphores.data(), - }; if (on_submit) { on_submit(); } - switch (const VkResult result = device.GetGraphicsQueue().Submit(submit_info)) { + switch (const VkResult result = master_semaphore->SubmitQueue( + cmdbuf, signal_semaphore, wait_semaphore, signal_value)) { case VK_SUCCESS: break; case VK_ERROR_DEVICE_LOST: diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h index 41b5da18a..7d5018151 100644 --- a/src/video_core/vulkan_common/vulkan_device.h +++ b/src/video_core/vulkan_common/vulkan_device.h @@ -145,7 +145,6 @@ FEATURE_NAME(robustness2, robustImageAccess2) \ FEATURE_NAME(shader_demote_to_helper_invocation, shaderDemoteToHelperInvocation) \ FEATURE_NAME(shader_draw_parameters, shaderDrawParameters) \ - FEATURE_NAME(timeline_semaphore, timelineSemaphore) \ FEATURE_NAME(variable_pointer, variablePointers) \ FEATURE_NAME(variable_pointer, variablePointersStorageBuffer) @@ -158,6 +157,7 @@ FEATURE_NAME(provoking_vertex, provokingVertexLast) \ FEATURE_NAME(shader_float16_int8, shaderFloat16) \ FEATURE_NAME(shader_float16_int8, shaderInt8) \ + FEATURE_NAME(timeline_semaphore, timelineSemaphore) \ FEATURE_NAME(transform_feedback, transformFeedback) \ FEATURE_NAME(uniform_buffer_standard_layout, uniformBufferStandardLayout) \ FEATURE_NAME(vertex_input_dynamic_state, vertexInputDynamicState) @@ -493,6 +493,10 @@ public: return extensions.shader_atomic_int64; } + bool HasTimelineSemaphore() const { + return features.timeline_semaphore.timelineSemaphore; + } + /// Returns the minimum supported version of SPIR-V. u32 SupportedSpirvVersion() const { if (instance_version >= VK_API_VERSION_1_3) { From 70a97fb5c7a72c3b55abb24dbc749976bb01937a Mon Sep 17 00:00:00 2001 From: german77 Date: Sat, 15 Apr 2023 18:41:09 -0600 Subject: [PATCH 0259/1181] core: hid: Remove deadzone of virtual controller --- src/core/hid/emulated_controller.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index a29c9a6f8..a70f8807c 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp @@ -280,6 +280,10 @@ void EmulatedController::LoadVirtualGamepadParams() { virtual_stick_params[Settings::NativeAnalog::LStick].Set("axis_y", 1); virtual_stick_params[Settings::NativeAnalog::RStick].Set("axis_x", 2); virtual_stick_params[Settings::NativeAnalog::RStick].Set("axis_y", 3); + virtual_stick_params[Settings::NativeAnalog::LStick].Set("deadzone", 0.0f); + virtual_stick_params[Settings::NativeAnalog::LStick].Set("range", 1.0f); + virtual_stick_params[Settings::NativeAnalog::RStick].Set("deadzone", 0.0f); + virtual_stick_params[Settings::NativeAnalog::RStick].Set("range", 1.0f); } void EmulatedController::ReloadInput() { From 55a33342cc65b9045463019bf5c93c3c0a1b9eaa Mon Sep 17 00:00:00 2001 From: FengChen Date: Sat, 15 Apr 2023 10:00:20 +0800 Subject: [PATCH 0260/1181] core: audio: return result when audio_out initialize failed --- src/core/hle/service/audio/audout_u.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp index 23b8be993..3e62fa4fc 100644 --- a/src/core/hle/service/audio/audout_u.cpp +++ b/src/core/hle/service/audio/audout_u.cpp @@ -49,12 +49,6 @@ public: }; // clang-format on RegisterHandlers(functions); - - if (impl->GetSystem() - .Initialize(device_name, in_params, handle, applet_resource_user_id) - .IsError()) { - LOG_ERROR(Service_Audio, "Failed to initialize the AudioOut System!"); - } } ~IAudioOut() override { @@ -287,6 +281,14 @@ void AudOutU::OpenAudioOut(HLERequestContext& ctx) { auto audio_out = std::make_shared(system, *impl, new_session_id, device_name, in_params, handle, applet_resource_user_id); + result = audio_out->GetImpl()->GetSystem().Initialize(device_name, in_params, handle, + applet_resource_user_id); + if (result.IsError()) { + LOG_ERROR(Service_Audio, "Failed to initialize the AudioOut System!"); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); + return; + } impl->sessions[new_session_id] = audio_out->GetImpl(); impl->applet_resource_user_ids[new_session_id] = applet_resource_user_id; From 34d0d94df0749850f7e3e77620a73c5692ad3b24 Mon Sep 17 00:00:00 2001 From: Aaron Roney Date: Wed, 19 Apr 2023 05:37:30 +0000 Subject: [PATCH 0261/1181] Allow passing `bind_address` to dedicated room. --- src/dedicated_room/yuzu_room.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/dedicated_room/yuzu_room.cpp b/src/dedicated_room/yuzu_room.cpp index 359891883..e1cf8a76d 100644 --- a/src/dedicated_room/yuzu_room.cpp +++ b/src/dedicated_room/yuzu_room.cpp @@ -49,6 +49,7 @@ static void PrintHelp(const char* argv0) { " [options] \n" "--room-name The name of the room\n" "--room-description The room description\n" + "--bind-address The bind address for the room\n" "--port The port used for the room\n" "--max_members The maximum number of players for this room\n" "--password The password for the room\n" @@ -195,6 +196,7 @@ int main(int argc, char** argv) { std::string web_api_url; std::string ban_list_file; std::string log_file = "yuzu-room.log"; + std::string bind_address; u64 preferred_game_id = 0; u32 port = Network::DefaultRoomPort; u32 max_members = 16; @@ -203,6 +205,7 @@ int main(int argc, char** argv) { static struct option long_options[] = { {"room-name", required_argument, 0, 'n'}, {"room-description", required_argument, 0, 'd'}, + {"bind-address", required_argument, 0, 's'}, {"port", required_argument, 0, 'p'}, {"max_members", required_argument, 0, 'm'}, {"password", required_argument, 0, 'w'}, @@ -222,7 +225,7 @@ int main(int argc, char** argv) { InitializeLogging(log_file); while (optind < argc) { - int arg = getopt_long(argc, argv, "n:d:p:m:w:g:u:t:a:i:l:hv", long_options, &option_index); + int arg = getopt_long(argc, argv, "n:d:s:p:m:w:g:u:t:a:i:l:hv", long_options, &option_index); if (arg != -1) { switch (static_cast(arg)) { case 'n': @@ -231,6 +234,9 @@ int main(int argc, char** argv) { case 'd': room_description.assign(optarg); break; + case 's': + bind_address.assign(optarg); + break; case 'p': port = strtoul(optarg, &endarg, 0); break; @@ -295,6 +301,9 @@ int main(int argc, char** argv) { PrintHelp(argv[0]); return -1; } + if (bind_address.empty()) { + LOG_INFO(Network, "Bind address is empty: defaulting to 0.0.0.0"); + } if (port > UINT16_MAX) { LOG_ERROR(Network, "Port needs to be in the range 0 - 65535!"); PrintHelp(argv[0]); @@ -358,7 +367,7 @@ int main(int argc, char** argv) { if (auto room = network.GetRoom().lock()) { AnnounceMultiplayerRoom::GameInfo preferred_game_info{.name = preferred_game, .id = preferred_game_id}; - if (!room->Create(room_name, room_description, "", port, password, max_members, username, + if (!room->Create(room_name, room_description, bind_address, port, password, max_members, username, preferred_game_info, std::move(verify_backend), ban_list, enable_yuzu_mods)) { LOG_INFO(Network, "Failed to create room: "); From 3e7af5fbd7ae5546b234e39d2ebed7ab47959e2c Mon Sep 17 00:00:00 2001 From: Aaron Roney Date: Wed, 19 Apr 2023 16:26:49 +0000 Subject: [PATCH 0262/1181] Fix formatting. --- src/dedicated_room/yuzu_room.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dedicated_room/yuzu_room.cpp b/src/dedicated_room/yuzu_room.cpp index e1cf8a76d..c1e5c8caf 100644 --- a/src/dedicated_room/yuzu_room.cpp +++ b/src/dedicated_room/yuzu_room.cpp @@ -367,8 +367,8 @@ int main(int argc, char** argv) { if (auto room = network.GetRoom().lock()) { AnnounceMultiplayerRoom::GameInfo preferred_game_info{.name = preferred_game, .id = preferred_game_id}; - if (!room->Create(room_name, room_description, bind_address, port, password, max_members, username, - preferred_game_info, std::move(verify_backend), ban_list, + if (!room->Create(room_name, room_description, bind_address, port, password, max_members, + username, preferred_game_info, std::move(verify_backend), ban_list, enable_yuzu_mods)) { LOG_INFO(Network, "Failed to create room: "); return -1; From 79e32127b3897424015b3f6842c87ea81e37efb1 Mon Sep 17 00:00:00 2001 From: Aaron Roney Date: Wed, 19 Apr 2023 17:52:09 +0000 Subject: [PATCH 0263/1181] Run clang-format to fix all. --- src/dedicated_room/yuzu_room.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dedicated_room/yuzu_room.cpp b/src/dedicated_room/yuzu_room.cpp index c1e5c8caf..d707dabe2 100644 --- a/src/dedicated_room/yuzu_room.cpp +++ b/src/dedicated_room/yuzu_room.cpp @@ -225,7 +225,8 @@ int main(int argc, char** argv) { InitializeLogging(log_file); while (optind < argc) { - int arg = getopt_long(argc, argv, "n:d:s:p:m:w:g:u:t:a:i:l:hv", long_options, &option_index); + int arg = + getopt_long(argc, argv, "n:d:s:p:m:w:g:u:t:a:i:l:hv", long_options, &option_index); if (arg != -1) { switch (static_cast(arg)) { case 'n': From 4e14b64bfc8aa526b3a9de2908c516190d5020be Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Fri, 21 Apr 2023 19:08:21 +0100 Subject: [PATCH 0264/1181] Account for a pre-added offset when using Corner sample mode for 2D blits --- src/video_core/engines/fermi_2d.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/video_core/engines/fermi_2d.cpp b/src/video_core/engines/fermi_2d.cpp index a126c359c..02e161270 100644 --- a/src/video_core/engines/fermi_2d.cpp +++ b/src/video_core/engines/fermi_2d.cpp @@ -77,6 +77,14 @@ void Fermi2D::Blit() { const auto bytes_per_pixel = BytesPerBlock(PixelFormatFromRenderTargetFormat(src.format)); const bool delegate_to_gpu = src.width > 512 && src.height > 512 && bytes_per_pixel <= 8 && src.format != regs.dst.format; + + auto srcX = args.src_x0; + auto srcY = args.src_y0; + if (args.sample_mode.origin == Origin::Corner) { + srcX -= (args.du_dx >> 33) << 32; + srcY -= (args.dv_dy >> 33) << 32; + } + Config config{ .operation = regs.operation, .filter = args.sample_mode.filter, @@ -86,10 +94,10 @@ void Fermi2D::Blit() { .dst_y0 = args.dst_y0, .dst_x1 = args.dst_x0 + args.dst_width, .dst_y1 = args.dst_y0 + args.dst_height, - .src_x0 = static_cast(args.src_x0 >> 32), - .src_y0 = static_cast(args.src_y0 >> 32), - .src_x1 = static_cast((args.du_dx * args.dst_width + args.src_x0) >> 32), - .src_y1 = static_cast((args.dv_dy * args.dst_height + args.src_y0) >> 32), + .src_x0 = static_cast(srcX >> 32), + .src_y0 = static_cast(srcY >> 32), + .src_x1 = static_cast((srcX + args.du_dx * args.dst_width) >> 32), + .src_y1 = static_cast((srcY + args.dv_dy * args.dst_height) >> 32), }; const auto need_align_to_pitch = From 7ffc42c39786fc6386a58db0dec2f630f3766aae Mon Sep 17 00:00:00 2001 From: german77 Date: Fri, 21 Apr 2023 22:34:38 -0600 Subject: [PATCH 0265/1181] core: am: Demote TryPopFromFriendInvitationStorageChannel Log level --- src/core/hle/service/am/am.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index a17c46121..e59de844c 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -1807,7 +1807,7 @@ void IApplicationFunctions::GetFriendInvitationStorageChannelEvent(HLERequestCon } void IApplicationFunctions::TryPopFromFriendInvitationStorageChannel(HLERequestContext& ctx) { - LOG_WARNING(Service_AM, "(STUBBED) called"); + LOG_DEBUG(Service_AM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(AM::ResultNoDataInChannel); From 3346de365ae69c9a8ce4544a0926762738b00d34 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Sat, 22 Apr 2023 14:02:10 +0100 Subject: [PATCH 0266/1181] Sort overlap_ids by modification tick before copy --- src/video_core/texture_cache/texture_cache.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index ed5c768d8..a1c2cc1d8 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1294,6 +1294,12 @@ ImageId TextureCache

::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA ScaleDown(new_image); } + std::ranges::sort(overlap_ids, [this](const ImageId lhs, const ImageId rhs) { + const ImageBase& lhs_image = slot_images[lhs]; + const ImageBase& rhs_image = slot_images[rhs]; + return lhs_image.modification_tick < rhs_image.modification_tick; + }); + for (const ImageId overlap_id : overlap_ids) { Image& overlap = slot_images[overlap_id]; if (True(overlap.flags & ImageFlagBits::GpuModified)) { From 4da4ecb1ff79798fe245a0c6c483405f998cd093 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Fri, 21 Apr 2023 21:59:23 +0100 Subject: [PATCH 0267/1181] Silence nifm spam --- src/core/hle/service/nifm/nifm.cpp | 6 +++--- src/core/internal_network/network.cpp | 2 +- src/core/internal_network/network_interface.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/hle/service/nifm/nifm.cpp b/src/core/hle/service/nifm/nifm.cpp index 0c042f412..91d42853e 100644 --- a/src/core/hle/service/nifm/nifm.cpp +++ b/src/core/hle/service/nifm/nifm.cpp @@ -218,7 +218,7 @@ public: private: void Submit(HLERequestContext& ctx) { - LOG_WARNING(Service_NIFM, "(STUBBED) called"); + LOG_DEBUG(Service_NIFM, "(STUBBED) called"); if (state == RequestState::NotSubmitted) { UpdateState(RequestState::OnHold); @@ -229,7 +229,7 @@ private: } void GetRequestState(HLERequestContext& ctx) { - LOG_WARNING(Service_NIFM, "(STUBBED) called"); + LOG_DEBUG(Service_NIFM, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); @@ -237,7 +237,7 @@ private: } void GetResult(HLERequestContext& ctx) { - LOG_WARNING(Service_NIFM, "(STUBBED) called"); + LOG_DEBUG(Service_NIFM, "(STUBBED) called"); const auto result = [this] { const auto has_connection = Network::GetHostIPv4Address().has_value(); diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index bf97b0ebc..75ac10a9c 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -356,7 +356,7 @@ NetworkInstance::~NetworkInstance() { std::optional GetHostIPv4Address() { const auto network_interface = Network::GetSelectedNetworkInterface(); if (!network_interface.has_value()) { - LOG_ERROR(Network, "GetSelectedNetworkInterface returned no interface"); + LOG_DEBUG(Network, "GetSelectedNetworkInterface returned no interface"); return {}; } diff --git a/src/core/internal_network/network_interface.cpp b/src/core/internal_network/network_interface.cpp index 7b8e510a2..4c909a6d3 100644 --- a/src/core/internal_network/network_interface.cpp +++ b/src/core/internal_network/network_interface.cpp @@ -200,7 +200,7 @@ std::optional GetSelectedNetworkInterface() { }); if (res == network_interfaces.end()) { - LOG_ERROR(Network, "Couldn't find selected interface \"{}\"", selected_network_interface); + LOG_DEBUG(Network, "Couldn't find selected interface \"{}\"", selected_network_interface); return std::nullopt; } From eb7c2314f69b50a171944cbd4ef49f3b765e5b2d Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 19 Apr 2023 23:25:00 -0400 Subject: [PATCH 0268/1181] maxwell_3d: fix out of bounds array access in size estimation --- src/video_core/engines/maxwell_3d.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index 614d61db4..0932fadc2 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp @@ -4,6 +4,7 @@ #include #include #include "common/assert.h" +#include "common/bit_util.h" #include "common/scope_exit.h" #include "common/settings.h" #include "core/core.h" @@ -259,12 +260,13 @@ u32 Maxwell3D::GetMaxCurrentVertices() { size_t Maxwell3D::EstimateIndexBufferSize() { GPUVAddr start_address = regs.index_buffer.StartAddress(); GPUVAddr end_address = regs.index_buffer.EndAddress(); - static constexpr std::array max_sizes = { - std::numeric_limits::max(), std::numeric_limits::max(), - std::numeric_limits::max(), std::numeric_limits::max()}; + static constexpr std::array max_sizes = {std::numeric_limits::max(), + std::numeric_limits::max(), + std::numeric_limits::max()}; const size_t byte_size = regs.index_buffer.FormatSizeInBytes(); + const size_t log2_byte_size = Common::Log2Ceil64(byte_size); return std::min( - memory_manager.GetMemoryLayoutSize(start_address, byte_size * max_sizes[byte_size]) / + memory_manager.GetMemoryLayoutSize(start_address, byte_size * max_sizes[log2_byte_size]) / byte_size, static_cast(end_address - start_address)); } From fca72beb2db658e84ceac6e1f46f682bcacf8f25 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sat, 15 Apr 2023 00:03:48 +0200 Subject: [PATCH 0269/1181] Fence Manager: implement async fence management in a sepparate thread. --- src/video_core/fence_manager.h | 137 ++++++++++++++---- src/video_core/query_cache.h | 6 +- .../renderer_opengl/gl_fence_manager.h | 12 +- .../renderer_vulkan/vk_fence_manager.cpp | 2 + .../renderer_vulkan/vk_fence_manager.h | 11 +- 5 files changed, 133 insertions(+), 35 deletions(-) diff --git a/src/video_core/fence_manager.h b/src/video_core/fence_manager.h index c390ac91b..027e663bf 100644 --- a/src/video_core/fence_manager.h +++ b/src/video_core/fence_manager.h @@ -4,13 +4,20 @@ #pragma once #include +#include #include #include #include #include +#include +#include #include #include "common/common_types.h" +#include "common/microprofile.h" +#include "common/scope_exit.h" +#include "common/settings.h" +#include "common/thread.h" #include "video_core/delayed_destruction_ring.h" #include "video_core/gpu.h" #include "video_core/host1x/host1x.h" @@ -23,15 +30,26 @@ class FenceBase { public: explicit FenceBase(bool is_stubbed_) : is_stubbed{is_stubbed_} {} + bool IsStubbed() const { + return is_stubbed; + } + protected: bool is_stubbed; }; -template +template class FenceManager { + using TFence = typename Traits::FenceType; + using TTextureCache = typename Traits::TextureCacheType; + using TBufferCache = typename Traits::BufferCacheType; + using TQueryCache = typename Traits::QueryCacheType; + static constexpr bool can_async_check = Traits::HAS_ASYNC_CHECK; + public: /// Notify the fence manager about a new frame void TickFrame() { + std::unique_lock lock(ring_guard); delayed_destruction_ring.Tick(); } @@ -46,17 +64,27 @@ public: } void SignalFence(std::function&& func) { - TryReleasePendingFences(); + if constexpr (!can_async_check) { + TryReleasePendingFences(); + } + std::function callback = std::move(func); const bool should_flush = ShouldFlush(); CommitAsyncFlushes(); - uncommitted_operations.emplace_back(std::move(func)); - CommitOperations(); TFence new_fence = CreateFence(!should_flush); - fences.push(new_fence); + if constexpr (can_async_check) { + guard.lock(); + } + pending_operations.emplace_back(std::move(uncommitted_operations)); QueueFence(new_fence); + callback(); + fences.push(std::move(new_fence)); if (should_flush) { rasterizer.FlushCommands(); } + if constexpr (can_async_check) { + guard.unlock(); + cv.notify_all(); + } } void SignalSyncPoint(u32 value) { @@ -66,29 +94,30 @@ public: } void WaitPendingFences() { - while (!fences.empty()) { - TFence& current_fence = fences.front(); - if (ShouldWait()) { - WaitFence(current_fence); - } - PopAsyncFlushes(); - auto operations = std::move(pending_operations.front()); - pending_operations.pop_front(); - for (auto& operation : operations) { - operation(); - } - PopFence(); + if constexpr (!can_async_check) { + TryReleasePendingFences(); } } protected: explicit FenceManager(VideoCore::RasterizerInterface& rasterizer_, Tegra::GPU& gpu_, - TTextureCache& texture_cache_, TTBufferCache& buffer_cache_, + TTextureCache& texture_cache_, TBufferCache& buffer_cache_, TQueryCache& query_cache_) : rasterizer{rasterizer_}, gpu{gpu_}, syncpoint_manager{gpu.Host1x().GetSyncpointManager()}, - texture_cache{texture_cache_}, buffer_cache{buffer_cache_}, query_cache{query_cache_} {} + texture_cache{texture_cache_}, buffer_cache{buffer_cache_}, query_cache{query_cache_} { + if constexpr (can_async_check) { + fence_thread = + std::jthread([this](std::stop_token token) { ReleaseThreadFunc(token); }); + } + } - virtual ~FenceManager() = default; + virtual ~FenceManager() { + if constexpr (can_async_check) { + fence_thread.request_stop(); + cv.notify_all(); + fence_thread.join(); + } + } /// Creates a Fence Interface, does not create a backend fence if 'is_stubbed' is /// true @@ -104,15 +133,20 @@ protected: Tegra::GPU& gpu; Tegra::Host1x::SyncpointManager& syncpoint_manager; TTextureCache& texture_cache; - TTBufferCache& buffer_cache; + TBufferCache& buffer_cache; TQueryCache& query_cache; private: + template void TryReleasePendingFences() { while (!fences.empty()) { TFence& current_fence = fences.front(); if (ShouldWait() && !IsFenceSignaled(current_fence)) { - return; + if constexpr (force_wait) { + WaitFence(current_fence); + } else { + return; + } } PopAsyncFlushes(); auto operations = std::move(pending_operations.front()); @@ -120,7 +154,49 @@ private: for (auto& operation : operations) { operation(); } - PopFence(); + { + std::unique_lock lock(ring_guard); + delayed_destruction_ring.Push(std::move(current_fence)); + } + fences.pop(); + } + } + + void ReleaseThreadFunc(std::stop_token stop_token) { + std::string name = "GPUFencingThread"; + MicroProfileOnThreadCreate(name.c_str()); + + // Cleanup + SCOPE_EXIT({ MicroProfileOnThreadExit(); }); + + Common::SetCurrentThreadName(name.c_str()); + Common::SetCurrentThreadPriority(Common::ThreadPriority::High); + + TFence current_fence; + std::deque> current_operations; + while (!stop_token.stop_requested()) { + { + std::unique_lock lock(guard); + cv.wait(lock, [&] { return stop_token.stop_requested() || !fences.empty(); }); + if (stop_token.stop_requested()) [[unlikely]] { + return; + } + current_fence = std::move(fences.front()); + current_operations = std::move(pending_operations.front()); + fences.pop(); + pending_operations.pop_front(); + } + if (!current_fence->IsStubbed()) { + WaitFence(current_fence); + } + PopAsyncFlushes(); + for (auto& operation : current_operations) { + operation(); + } + { + std::unique_lock lock(ring_guard); + delayed_destruction_ring.Push(std::move(current_fence)); + } } } @@ -154,19 +230,16 @@ private: query_cache.CommitAsyncFlushes(); } - void PopFence() { - delayed_destruction_ring.Push(std::move(fences.front())); - fences.pop(); - } - - void CommitOperations() { - pending_operations.emplace_back(std::move(uncommitted_operations)); - } - std::queue fences; std::deque> uncommitted_operations; std::deque>> pending_operations; + std::mutex guard; + std::mutex ring_guard; + std::condition_variable cv; + + std::jthread fence_thread; + DelayedDestructionRing delayed_destruction_ring; }; diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.h index 8906ba6d8..cd339b99d 100644 --- a/src/video_core/query_cache.h +++ b/src/video_core/query_cache.h @@ -173,15 +173,18 @@ public: } void CommitAsyncFlushes() { + std::unique_lock lock{mutex}; committed_flushes.push_back(uncommitted_flushes); uncommitted_flushes.reset(); } bool HasUncommittedFlushes() const { + std::unique_lock lock{mutex}; return uncommitted_flushes != nullptr; } bool ShouldWaitAsyncFlushes() const { + std::unique_lock lock{mutex}; if (committed_flushes.empty()) { return false; } @@ -189,6 +192,7 @@ public: } void PopAsyncFlushes() { + std::unique_lock lock{mutex}; if (committed_flushes.empty()) { return; } @@ -265,7 +269,7 @@ private: VideoCore::RasterizerInterface& rasterizer; - std::recursive_mutex mutex; + mutable std::recursive_mutex mutex; std::unordered_map> cached_queries; diff --git a/src/video_core/renderer_opengl/gl_fence_manager.h b/src/video_core/renderer_opengl/gl_fence_manager.h index f1446e732..e21b19dcc 100644 --- a/src/video_core/renderer_opengl/gl_fence_manager.h +++ b/src/video_core/renderer_opengl/gl_fence_manager.h @@ -30,7 +30,17 @@ private: }; using Fence = std::shared_ptr; -using GenericFenceManager = VideoCommon::FenceManager; + +struct FenceManagerParams { + using FenceType = Fence; + using BufferCacheType = BufferCache; + using TextureCacheType = TextureCache; + using QueryCacheType = QueryCache; + + static constexpr bool HAS_ASYNC_CHECK = false; +}; + +using GenericFenceManager = VideoCommon::FenceManager; class FenceManagerOpenGL final : public GenericFenceManager { public: diff --git a/src/video_core/renderer_vulkan/vk_fence_manager.cpp b/src/video_core/renderer_vulkan/vk_fence_manager.cpp index 0214b103a..3bba8aeb0 100644 --- a/src/video_core/renderer_vulkan/vk_fence_manager.cpp +++ b/src/video_core/renderer_vulkan/vk_fence_manager.cpp @@ -5,10 +5,12 @@ #include "video_core/renderer_vulkan/vk_buffer_cache.h" #include "video_core/renderer_vulkan/vk_fence_manager.h" +#include "video_core/renderer_vulkan/vk_query_cache.h" #include "video_core/renderer_vulkan/vk_scheduler.h" #include "video_core/renderer_vulkan/vk_texture_cache.h" #include "video_core/vulkan_common/vulkan_device.h" + namespace Vulkan { InnerFence::InnerFence(Scheduler& scheduler_, bool is_stubbed_) diff --git a/src/video_core/renderer_vulkan/vk_fence_manager.h b/src/video_core/renderer_vulkan/vk_fence_manager.h index 7fe2afcd9..145359d4e 100644 --- a/src/video_core/renderer_vulkan/vk_fence_manager.h +++ b/src/video_core/renderer_vulkan/vk_fence_manager.h @@ -40,7 +40,16 @@ private: }; using Fence = std::shared_ptr; -using GenericFenceManager = VideoCommon::FenceManager; +struct FenceManagerParams { + using FenceType = Fence; + using BufferCacheType = BufferCache; + using TextureCacheType = TextureCache; + using QueryCacheType = QueryCache; + + static constexpr bool HAS_ASYNC_CHECK = true; +}; + +using GenericFenceManager = VideoCommon::FenceManager; class FenceManager final : public GenericFenceManager { public: From 7e76c1642cb4dfde5bfc97600ca3df7dcbea01de Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sat, 22 Apr 2023 11:59:57 +0200 Subject: [PATCH 0270/1181] Accuracy Normal: reduce accuracy further for perf improvements in Project Lime --- src/core/memory.cpp | 2 +- src/video_core/fence_manager.h | 9 +++++++-- src/video_core/renderer_vulkan/vk_query_cache.cpp | 3 ++- src/video_core/renderer_vulkan/vk_rasterizer.cpp | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 432310632..a9667463f 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -462,7 +462,7 @@ struct Memory::Impl { } if (Settings::IsFastmemEnabled()) { - const bool is_read_enable = Settings::IsGPULevelHigh() || !cached; + const bool is_read_enable = !Settings::IsGPULevelExtreme() || !cached; system.DeviceMemory().buffer.Protect(vaddr, size, is_read_enable, !cached); } diff --git a/src/video_core/fence_manager.h b/src/video_core/fence_manager.h index 027e663bf..19bbdd547 100644 --- a/src/video_core/fence_manager.h +++ b/src/video_core/fence_manager.h @@ -64,19 +64,24 @@ public: } void SignalFence(std::function&& func) { + bool delay_fence = Settings::IsGPULevelHigh(); if constexpr (!can_async_check) { TryReleasePendingFences(); } - std::function callback = std::move(func); const bool should_flush = ShouldFlush(); CommitAsyncFlushes(); TFence new_fence = CreateFence(!should_flush); if constexpr (can_async_check) { guard.lock(); } + if (delay_fence) { + uncommitted_operations.emplace_back(std::move(func)); + } pending_operations.emplace_back(std::move(uncommitted_operations)); QueueFence(new_fence); - callback(); + if (!delay_fence) { + func(); + } fences.push(std::move(new_fence)); if (should_flush) { rasterizer.FlushCommands(); diff --git a/src/video_core/renderer_vulkan/vk_query_cache.cpp b/src/video_core/renderer_vulkan/vk_query_cache.cpp index 929c8ece6..0701e572b 100644 --- a/src/video_core/renderer_vulkan/vk_query_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_query_cache.cpp @@ -98,8 +98,9 @@ HostCounter::HostCounter(QueryCache& cache_, std::shared_ptr depend query{cache_.AllocateQuery(type_)}, tick{cache_.GetScheduler().CurrentTick()} { const vk::Device* logical = &cache.GetDevice().GetLogical(); cache.GetScheduler().Record([logical, query = query](vk::CommandBuffer cmdbuf) { + const bool use_precise = Settings::IsGPULevelHigh(); logical->ResetQueryPool(query.first, query.second, 1); - cmdbuf.BeginQuery(query.first, query.second, VK_QUERY_CONTROL_PRECISE_BIT); + cmdbuf.BeginQuery(query.first, query.second, use_precise ? VK_QUERY_CONTROL_PRECISE_BIT : 0); }); } diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 673ab478e..f366fdd2a 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -675,7 +675,7 @@ bool RasterizerVulkan::AccelerateConditionalRendering() { const GPUVAddr condition_address{maxwell3d->regs.render_enable.Address()}; Maxwell::ReportSemaphore::Compare cmp; if (gpu_memory->IsMemoryDirty(condition_address, sizeof(cmp), - VideoCommon::CacheType::BufferCache)) { + VideoCommon::CacheType::BufferCache | VideoCommon::CacheType::QueryCache)) { return true; } return false; From e29ced29fa54bf36a06545c53d1d523f3a31f883 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 23 Apr 2023 21:55:16 +0200 Subject: [PATCH 0271/1181] QueryCache: rework async downloads. --- src/video_core/query_cache.h | 122 ++++++++++++++---- .../renderer_opengl/gl_query_cache.cpp | 12 +- .../renderer_opengl/gl_query_cache.h | 6 +- .../renderer_opengl/gl_rasterizer.cpp | 2 +- .../renderer_vulkan/vk_query_cache.cpp | 14 +- .../renderer_vulkan/vk_query_cache.h | 5 +- .../renderer_vulkan/vk_rasterizer.cpp | 2 +- 7 files changed, 118 insertions(+), 45 deletions(-) diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.h index cd339b99d..2a14cc36a 100644 --- a/src/video_core/query_cache.h +++ b/src/video_core/query_cache.h @@ -17,13 +17,19 @@ #include "common/assert.h" #include "common/settings.h" +#include "core/memory.h" #include "video_core/control/channel_state_cache.h" #include "video_core/engines/maxwell_3d.h" #include "video_core/memory_manager.h" #include "video_core/rasterizer_interface.h" +#include "video_core/texture_cache/slot_vector.h" namespace VideoCommon { +using AsyncJobId = SlotId; + +static constexpr AsyncJobId NULL_ASYNC_JOB_ID{0}; + template class CounterStreamBase { public: @@ -93,9 +99,13 @@ private: template class QueryCacheBase : public VideoCommon::ChannelSetupCaches { public: - explicit QueryCacheBase(VideoCore::RasterizerInterface& rasterizer_) - : rasterizer{rasterizer_}, streams{{CounterStream{static_cast(*this), - VideoCore::QueryType::SamplesPassed}}} {} + explicit QueryCacheBase(VideoCore::RasterizerInterface& rasterizer_, + Core::Memory::Memory& cpu_memory_) + : rasterizer{rasterizer_}, cpu_memory{cpu_memory_}, streams{ + {CounterStream{static_cast(*this), + VideoCore::QueryType::SamplesPassed}}} { + (void) slot_async_jobs.insert(); // Null value + } void InvalidateRegion(VAddr addr, std::size_t size) { std::unique_lock lock{mutex}; @@ -126,10 +136,15 @@ public: query = Register(type, *cpu_addr, host_ptr, timestamp.has_value()); } - query->BindCounter(Stream(type).Current(), timestamp); - if (Settings::values.use_asynchronous_gpu_emulation.GetValue()) { - AsyncFlushQuery(*cpu_addr); + auto result = query->BindCounter(Stream(type).Current()); + if (result) { + auto async_job_id = query->GetAsyncJob(); + auto& async_job = slot_async_jobs[async_job_id]; + async_job.collected = true; + async_job.value = *result; + query->SetAsyncJob(NULL_ASYNC_JOB_ID); } + AsyncFlushQuery(query, timestamp, lock); } /// Updates counters from GPU state. Expected to be called once per draw, clear or dispatch. @@ -201,15 +216,25 @@ public: committed_flushes.pop_front(); return; } - for (VAddr query_address : *flush_list) { - FlushAndRemoveRegion(query_address, 4); + for (AsyncJobId async_job_id : *flush_list) { + AsyncJob& async_job = slot_async_jobs[async_job_id]; + if (!async_job.collected) { + FlushAndRemoveRegion(async_job.query_location, 2, true); + } } committed_flushes.pop_front(); } private: + struct AsyncJob { + bool collected = false; + u64 value = 0; + VAddr query_location = 0; + std::optional timestamp{}; + }; + /// Flushes a memory range to guest memory and removes it from the cache. - void FlushAndRemoveRegion(VAddr addr, std::size_t size) { + void FlushAndRemoveRegion(VAddr addr, std::size_t size, bool async = false) { const u64 addr_begin = addr; const u64 addr_end = addr_begin + size; const auto in_range = [addr_begin, addr_end](const CachedQuery& query) { @@ -230,7 +255,16 @@ private: continue; } rasterizer.UpdatePagesCachedCount(query.GetCpuAddr(), query.SizeInBytes(), -1); - query.Flush(); + AsyncJobId async_job_id = query.GetAsyncJob(); + auto flush_result = query.Flush(async); + if (async_job_id == NULL_ASYNC_JOB_ID) { + ASSERT_MSG(false, "This should not be reachable at all"); + continue; + } + AsyncJob& async_job = slot_async_jobs[async_job_id]; + async_job.collected = true; + async_job.value = flush_result; + query.SetAsyncJob(NULL_ASYNC_JOB_ID); } std::erase_if(contents, in_range); } @@ -257,17 +291,43 @@ private: return found != std::end(contents) ? &*found : nullptr; } - void AsyncFlushQuery(VAddr addr) { + void AsyncFlushQuery(CachedQuery* query, std::optional timestamp, + std::unique_lock& lock) { + const AsyncJobId new_async_job_id = slot_async_jobs.insert(); + AsyncJob& async_job = slot_async_jobs[new_async_job_id]; + query->SetAsyncJob(new_async_job_id); + async_job.query_location = query->GetCpuAddr(); + async_job.collected = false; + if (!uncommitted_flushes) { - uncommitted_flushes = std::make_shared>(); + uncommitted_flushes = std::make_shared>(); } - uncommitted_flushes->push_back(addr); + uncommitted_flushes->push_back(new_async_job_id); + lock.unlock(); + std::function operation([this, new_async_job_id, timestamp] { + std::unique_lock local_lock{mutex}; + AsyncJob& async_job = slot_async_jobs[new_async_job_id]; + if (timestamp) { + u64 timestamp_value = *timestamp; + cpu_memory.WriteBlockUnsafe(async_job.query_location + sizeof(u64), + ×tamp_value, sizeof(8)); + cpu_memory.WriteBlockUnsafe(async_job.query_location, &async_job.value, sizeof(8)); + } else { + u32 small_value = static_cast(async_job.value); + cpu_memory.WriteBlockUnsafe(async_job.query_location, &small_value, sizeof(u32)); + } + slot_async_jobs.erase(new_async_job_id); + }); + rasterizer.SyncOperation(std::move(operation)); } static constexpr std::uintptr_t YUZU_PAGESIZE = 4096; static constexpr unsigned YUZU_PAGEBITS = 12; + SlotVector slot_async_jobs; + VideoCore::RasterizerInterface& rasterizer; + Core::Memory::Memory& cpu_memory; mutable std::recursive_mutex mutex; @@ -275,8 +335,8 @@ private: std::array streams; - std::shared_ptr> uncommitted_flushes{}; - std::list>> committed_flushes; + std::shared_ptr> uncommitted_flushes{}; + std::list>> committed_flushes; }; template @@ -295,12 +355,12 @@ public: virtual ~HostCounterBase() = default; /// Returns the current value of the query. - u64 Query() { + u64 Query(bool async = false) { if (result) { return *result; } - u64 value = BlockingQuery() + base_result; + u64 value = BlockingQuery(async) + base_result; if (dependency) { value += dependency->Query(); dependency = nullptr; @@ -321,7 +381,7 @@ public: protected: /// Returns the value of query from the backend API blocking as needed. - virtual u64 BlockingQuery() const = 0; + virtual u64 BlockingQuery(bool async = false) const = 0; private: std::shared_ptr dependency; ///< Counter to add to this value. @@ -344,26 +404,23 @@ public: CachedQueryBase& operator=(const CachedQueryBase&) = delete; /// Flushes the query to guest memory. - virtual void Flush() { + virtual u64 Flush(bool async = false) { // When counter is nullptr it means that it's just been reset. We are supposed to write a // zero in these cases. - const u64 value = counter ? counter->Query() : 0; - std::memcpy(host_ptr, &value, sizeof(u64)); - - if (timestamp) { - std::memcpy(host_ptr + TIMESTAMP_OFFSET, &*timestamp, sizeof(u64)); - } + const u64 value = counter ? counter->Query(async) : 0; + return value; } /// Binds a counter to this query. - void BindCounter(std::shared_ptr counter_, std::optional timestamp_) { + std::optional BindCounter(std::shared_ptr counter_) { + std::optional result{}; if (counter) { // If there's an old counter set it means the query is being rewritten by the game. // To avoid losing the data forever, flush here. - Flush(); + result = std::make_optional(Flush()); } counter = std::move(counter_); - timestamp = timestamp_; + return result; } VAddr GetCpuAddr() const noexcept { @@ -378,6 +435,14 @@ public: return with_timestamp ? LARGE_QUERY_SIZE : SMALL_QUERY_SIZE; } + void SetAsyncJob(AsyncJobId assigned_async_job_) { + assigned_async_job = assigned_async_job_; + } + + AsyncJobId GetAsyncJob() const { + return assigned_async_job; + } + protected: /// Returns true when querying the counter may potentially block. bool WaitPending() const noexcept { @@ -393,6 +458,7 @@ private: u8* host_ptr; ///< Writable host pointer. std::shared_ptr counter; ///< Host counter to query, owns the dependency tree. std::optional timestamp; ///< Timestamp to flush to guest memory. + AsyncJobId assigned_async_job; }; } // namespace VideoCommon diff --git a/src/video_core/renderer_opengl/gl_query_cache.cpp b/src/video_core/renderer_opengl/gl_query_cache.cpp index 5070db441..99d7347f5 100644 --- a/src/video_core/renderer_opengl/gl_query_cache.cpp +++ b/src/video_core/renderer_opengl/gl_query_cache.cpp @@ -26,8 +26,8 @@ constexpr GLenum GetTarget(VideoCore::QueryType type) { } // Anonymous namespace -QueryCache::QueryCache(RasterizerOpenGL& rasterizer_) - : QueryCacheBase(rasterizer_), gl_rasterizer{rasterizer_} {} +QueryCache::QueryCache(RasterizerOpenGL& rasterizer_, Core::Memory::Memory& cpu_memory_) + : QueryCacheBase(rasterizer_, cpu_memory_), gl_rasterizer{rasterizer_} {} QueryCache::~QueryCache() = default; @@ -74,7 +74,7 @@ void HostCounter::EndQuery() { glEndQuery(GetTarget(type)); } -u64 HostCounter::BlockingQuery() const { +u64 HostCounter::BlockingQuery([[maybe_unused]] bool async) const { GLint64 value; glGetQueryObjecti64v(query.handle, GL_QUERY_RESULT, &value); return static_cast(value); @@ -96,7 +96,7 @@ CachedQuery& CachedQuery::operator=(CachedQuery&& rhs) noexcept { return *this; } -void CachedQuery::Flush() { +u64 CachedQuery::Flush([[maybe_unused]] bool async) { // Waiting for a query while another query of the same target is enabled locks Nvidia's driver. // To avoid this disable and re-enable keeping the dependency stream. // But we only have to do this if we have pending waits to be done. @@ -106,11 +106,13 @@ void CachedQuery::Flush() { stream.Update(false); } - VideoCommon::CachedQueryBase::Flush(); + auto result = VideoCommon::CachedQueryBase::Flush(); if (slice_counter) { stream.Update(true); } + + return result; } } // namespace OpenGL diff --git a/src/video_core/renderer_opengl/gl_query_cache.h b/src/video_core/renderer_opengl/gl_query_cache.h index 14ce59990..872513f22 100644 --- a/src/video_core/renderer_opengl/gl_query_cache.h +++ b/src/video_core/renderer_opengl/gl_query_cache.h @@ -28,7 +28,7 @@ using CounterStream = VideoCommon::CounterStreamBase; class QueryCache final : public VideoCommon::QueryCacheBase { public: - explicit QueryCache(RasterizerOpenGL& rasterizer_); + explicit QueryCache(RasterizerOpenGL& rasterizer_, Core::Memory::Memory& cpu_memory_); ~QueryCache(); OGLQuery AllocateQuery(VideoCore::QueryType type); @@ -51,7 +51,7 @@ public: void EndQuery(); private: - u64 BlockingQuery() const override; + u64 BlockingQuery(bool async = false) const override; QueryCache& cache; const VideoCore::QueryType type; @@ -70,7 +70,7 @@ public: CachedQuery(const CachedQuery&) = delete; CachedQuery& operator=(const CachedQuery&) = delete; - void Flush() override; + u64 Flush(bool async = false) override; private: QueryCache* cache; diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 90e35e307..967aa4306 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -63,7 +63,7 @@ RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& emu_window_, Tegra buffer_cache(*this, cpu_memory_, buffer_cache_runtime), shader_cache(*this, emu_window_, device, texture_cache, buffer_cache, program_manager, state_tracker, gpu.ShaderNotify()), - query_cache(*this), accelerate_dma(buffer_cache, texture_cache), + query_cache(*this, cpu_memory_), accelerate_dma(buffer_cache, texture_cache), fence_manager(*this, gpu, texture_cache, buffer_cache, query_cache), blit_image(program_manager_) {} diff --git a/src/video_core/renderer_vulkan/vk_query_cache.cpp b/src/video_core/renderer_vulkan/vk_query_cache.cpp index 0701e572b..d67490449 100644 --- a/src/video_core/renderer_vulkan/vk_query_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_query_cache.cpp @@ -66,9 +66,10 @@ void QueryPool::Reserve(std::pair query) { } } -QueryCache::QueryCache(VideoCore::RasterizerInterface& rasterizer_, const Device& device_, +QueryCache::QueryCache(VideoCore::RasterizerInterface& rasterizer_, + Core::Memory::Memory& cpu_memory_, const Device& device_, Scheduler& scheduler_) - : QueryCacheBase{rasterizer_}, device{device_}, scheduler{scheduler_}, + : QueryCacheBase{rasterizer_, cpu_memory_}, device{device_}, scheduler{scheduler_}, query_pools{ QueryPool{device_, scheduler_, QueryType::SamplesPassed}, } {} @@ -100,7 +101,8 @@ HostCounter::HostCounter(QueryCache& cache_, std::shared_ptr depend cache.GetScheduler().Record([logical, query = query](vk::CommandBuffer cmdbuf) { const bool use_precise = Settings::IsGPULevelHigh(); logical->ResetQueryPool(query.first, query.second, 1); - cmdbuf.BeginQuery(query.first, query.second, use_precise ? VK_QUERY_CONTROL_PRECISE_BIT : 0); + cmdbuf.BeginQuery(query.first, query.second, + use_precise ? VK_QUERY_CONTROL_PRECISE_BIT : 0); }); } @@ -113,8 +115,10 @@ void HostCounter::EndQuery() { [query = query](vk::CommandBuffer cmdbuf) { cmdbuf.EndQuery(query.first, query.second); }); } -u64 HostCounter::BlockingQuery() const { - cache.GetScheduler().Wait(tick); +u64 HostCounter::BlockingQuery(bool async) const { + if (!async) { + cache.GetScheduler().Wait(tick); + } u64 data; const VkResult query_result = cache.GetDevice().GetLogical().GetQueryResults( query.first, query.second, 1, sizeof(data), &data, sizeof(data), diff --git a/src/video_core/renderer_vulkan/vk_query_cache.h b/src/video_core/renderer_vulkan/vk_query_cache.h index 26762ee09..c1b9552eb 100644 --- a/src/video_core/renderer_vulkan/vk_query_cache.h +++ b/src/video_core/renderer_vulkan/vk_query_cache.h @@ -52,7 +52,8 @@ private: class QueryCache final : public VideoCommon::QueryCacheBase { public: - explicit QueryCache(VideoCore::RasterizerInterface& rasterizer_, const Device& device_, + explicit QueryCache(VideoCore::RasterizerInterface& rasterizer_, + Core::Memory::Memory& cpu_memory_, const Device& device_, Scheduler& scheduler_); ~QueryCache(); @@ -83,7 +84,7 @@ public: void EndQuery(); private: - u64 BlockingQuery() const override; + u64 BlockingQuery(bool async = false) const override; QueryCache& cache; const VideoCore::QueryType type; diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index f366fdd2a..2d865729a 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -172,7 +172,7 @@ RasterizerVulkan::RasterizerVulkan(Core::Frontend::EmuWindow& emu_window_, Tegra buffer_cache(*this, cpu_memory_, buffer_cache_runtime), pipeline_cache(*this, device, scheduler, descriptor_pool, update_descriptor_queue, render_pass_cache, buffer_cache, texture_cache, gpu.ShaderNotify()), - query_cache{*this, device, scheduler}, accelerate_dma(buffer_cache, texture_cache, scheduler), + query_cache{*this, cpu_memory_, device, scheduler}, accelerate_dma(buffer_cache, texture_cache, scheduler), fence_manager(*this, gpu, texture_cache, buffer_cache, query_cache, device, scheduler), wfi_event(device.GetLogical().CreateEvent()) { scheduler.SetQueryCache(query_cache); From a3fa64fcc489d2cc1776807a37db3464dcc32686 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Fri, 14 Apr 2023 17:46:20 -0600 Subject: [PATCH 0272/1181] service: nfc: Create interface --- src/core/hle/service/nfc/nfc.cpp | 110 ++++++++++++------ src/core/hle/service/nfc/nfc_device.cpp | 1 - .../nfc/{nfc_user.cpp => nfc_interface.cpp} | 66 ++++------- .../nfc/{nfc_user.h => nfc_interface.h} | 18 +-- src/core/hle/service/nfp/nfp.cpp | 24 +--- 5 files changed, 104 insertions(+), 115 deletions(-) rename src/core/hle/service/nfc/{nfc_user.cpp => nfc_interface.cpp} (77%) rename src/core/hle/service/nfc/{nfc_user.h => nfc_interface.h} (91%) diff --git a/src/core/hle/service/nfc/nfc.cpp b/src/core/hle/service/nfc/nfc.cpp index 6595e34ed..7a8f59725 100644 --- a/src/core/hle/service/nfc/nfc.cpp +++ b/src/core/hle/service/nfc/nfc.cpp @@ -8,12 +8,83 @@ #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nfc/mifare_user.h" #include "core/hle/service/nfc/nfc.h" -#include "core/hle/service/nfc/nfc_user.h" +#include "core/hle/service/nfc/nfc_interface.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" namespace Service::NFC { +class IUser final : public Interface { +public: + explicit IUser(Core::System& system_) : Interface(system_, "IUser") { + // clang-format off + static const FunctionInfo functions[] = { + {0, &Interface::Initialize, "InitializeOld"}, + {1, &Interface::Finalize, "FinalizeOld"}, + {2, &Interface::GetState, "GetStateOld"}, + {3, &Interface::IsNfcEnabled, "IsNfcEnabledOld"}, + {400, &Interface::Initialize, "Initialize"}, + {401, &Interface::Finalize, "Finalize"}, + {402, &Interface::GetState, "GetState"}, + {403, &Interface::IsNfcEnabled, "IsNfcEnabled"}, + {404, &Interface::ListDevices, "ListDevices"}, + {405, &Interface::GetDeviceState, "GetDeviceState"}, + {406, &Interface::GetNpadId, "GetNpadId"}, + {407, &Interface::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"}, + {408, &Interface::StartDetection, "StartDetection"}, + {409, &Interface::StopDetection, "StopDetection"}, + {410, &Interface::GetTagInfo, "GetTagInfo"}, + {411, &Interface::AttachActivateEvent, "AttachActivateEvent"}, + {412, &Interface::AttachDeactivateEvent, "AttachDeactivateEvent"}, + {1000, nullptr, "ReadMifare"}, + {1001, nullptr, "WriteMifare"}, + {1300, &Interface::SendCommandByPassThrough, "SendCommandByPassThrough"}, + {1301, nullptr, "KeepPassThroughSession"}, + {1302, nullptr, "ReleasePassThroughSession"}, + }; + // clang-format on + + RegisterHandlers(functions); + } +}; + +class ISystem final : public Interface { +public: + explicit ISystem(Core::System& system_) : Interface{system_, "ISystem"} { + // clang-format off + static const FunctionInfo functions[] = { + {0, &Interface::Initialize, "InitializeOld"}, + {1, &Interface::Finalize, "FinalizeOld"}, + {2, &Interface::GetState, "GetStateOld"}, + {3, &Interface::IsNfcEnabled, "IsNfcEnabledOld"}, + {100, nullptr, "SetNfcEnabledOld"}, + {400, &Interface::Initialize, "Initialize"}, + {401, &Interface::Finalize, "Finalize"}, + {402, &Interface::GetState, "GetState"}, + {403, &Interface::IsNfcEnabled, "IsNfcEnabled"}, + {404, &Interface::ListDevices, "ListDevices"}, + {405, &Interface::GetDeviceState, "GetDeviceState"}, + {406, &Interface::GetNpadId, "GetNpadId"}, + {407, &Interface::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"}, + {408, &Interface::StartDetection, "StartDetection"}, + {409, &Interface::StopDetection, "StopDetection"}, + {410, &Interface::GetTagInfo, "GetTagInfo"}, + {411, &Interface::AttachActivateEvent, "AttachActivateEvent"}, + {412, &Interface::AttachDeactivateEvent, "AttachDeactivateEvent"}, + {500, nullptr, "SetNfcEnabled"}, + {510, nullptr, "OutputTestWave"}, + {1000, nullptr, "ReadMifare"}, + {1001, nullptr, "WriteMifare"}, + {1300, &Interface::SendCommandByPassThrough, "SendCommandByPassThrough"}, + {1301, nullptr, "KeepPassThroughSession"}, + {1302, nullptr, "ReleasePassThroughSession"}, + }; + // clang-format on + + RegisterHandlers(functions); + } +}; + class IAm final : public ServiceFramework { public: explicit IAm(Core::System& system_) : ServiceFramework{system_, "NFC::IAm"} { @@ -95,43 +166,6 @@ private: } }; -class ISystem final : public ServiceFramework { -public: - explicit ISystem(Core::System& system_) : ServiceFramework{system_, "ISystem"} { - // clang-format off - static const FunctionInfo functions[] = { - {0, nullptr, "Initialize"}, - {1, nullptr, "Finalize"}, - {2, nullptr, "GetStateOld"}, - {3, nullptr, "IsNfcEnabledOld"}, - {100, nullptr, "SetNfcEnabledOld"}, - {400, nullptr, "InitializeSystem"}, - {401, nullptr, "FinalizeSystem"}, - {402, nullptr, "GetState"}, - {403, nullptr, "IsNfcEnabled"}, - {404, nullptr, "ListDevices"}, - {405, nullptr, "GetDeviceState"}, - {406, nullptr, "GetNpadId"}, - {407, nullptr, "AttachAvailabilityChangeEvent"}, - {408, nullptr, "StartDetection"}, - {409, nullptr, "StopDetection"}, - {410, nullptr, "GetTagInfo"}, - {411, nullptr, "AttachActivateEvent"}, - {412, nullptr, "AttachDeactivateEvent"}, - {500, nullptr, "SetNfcEnabled"}, - {510, nullptr, "OutputTestWave"}, - {1000, nullptr, "ReadMifare"}, - {1001, nullptr, "WriteMifare"}, - {1300, nullptr, "SendCommandByPassThrough"}, - {1301, nullptr, "KeepPassThroughSession"}, - {1302, nullptr, "ReleasePassThroughSession"}, - }; - // clang-format on - - RegisterHandlers(functions); - } -}; - class NFC_SYS final : public ServiceFramework { public: explicit NFC_SYS(Core::System& system_) : ServiceFramework{system_, "nfc:sys"} { diff --git a/src/core/hle/service/nfc/nfc_device.cpp b/src/core/hle/service/nfc/nfc_device.cpp index c7db74d14..47bc1a05d 100644 --- a/src/core/hle/service/nfc/nfc_device.cpp +++ b/src/core/hle/service/nfc/nfc_device.cpp @@ -11,7 +11,6 @@ #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nfc/nfc_device.h" #include "core/hle/service/nfc/nfc_result.h" -#include "core/hle/service/nfc/nfc_user.h" namespace Service::NFC { NfcDevice::NfcDevice(Core::HID::NpadIdType npad_id_, Core::System& system_, diff --git a/src/core/hle/service/nfc/nfc_user.cpp b/src/core/hle/service/nfc/nfc_interface.cpp similarity index 77% rename from src/core/hle/service/nfc/nfc_user.cpp rename to src/core/hle/service/nfc/nfc_interface.cpp index 7c162a4f3..be96d0cbc 100644 --- a/src/core/hle/service/nfc/nfc_user.cpp +++ b/src/core/hle/service/nfc/nfc_interface.cpp @@ -7,41 +7,15 @@ #include "core/hle/kernel/k_event.h" #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nfc/nfc_device.h" +#include "core/hle/service/nfc/nfc_interface.h" #include "core/hle/service/nfc/nfc_result.h" -#include "core/hle/service/nfc/nfc_user.h" #include "core/hle/service/time/clock_types.h" namespace Service::NFC { -IUser::IUser(Core::System& system_) - : ServiceFramework{system_, "NFC::IUser"}, service_context{system_, service_name} { - static const FunctionInfo functions[] = { - {0, &IUser::Initialize, "InitializeOld"}, - {1, &IUser::Finalize, "FinalizeOld"}, - {2, &IUser::GetState, "GetStateOld"}, - {3, &IUser::IsNfcEnabled, "IsNfcEnabledOld"}, - {400, &IUser::Initialize, "Initialize"}, - {401, &IUser::Finalize, "Finalize"}, - {402, &IUser::GetState, "GetState"}, - {403, &IUser::IsNfcEnabled, "IsNfcEnabled"}, - {404, &IUser::ListDevices, "ListDevices"}, - {405, &IUser::GetDeviceState, "GetDeviceState"}, - {406, &IUser::GetNpadId, "GetNpadId"}, - {407, &IUser::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"}, - {408, &IUser::StartDetection, "StartDetection"}, - {409, &IUser::StopDetection, "StopDetection"}, - {410, &IUser::GetTagInfo, "GetTagInfo"}, - {411, &IUser::AttachActivateEvent, "AttachActivateEvent"}, - {412, &IUser::AttachDeactivateEvent, "AttachDeactivateEvent"}, - {1000, nullptr, "ReadMifare"}, - {1001, nullptr, "WriteMifare"}, - {1300, &IUser::SendCommandByPassThrough, "SendCommandByPassThrough"}, - {1301, nullptr, "KeepPassThroughSession"}, - {1302, nullptr, "ReleasePassThroughSession"}, - }; - RegisterHandlers(functions); - - availability_change_event = service_context.CreateEvent("IUser:AvailabilityChangeEvent"); +Interface::Interface(Core::System& system_, const char* name) + : ServiceFramework{system_, name}, service_context{system_, service_name} { + availability_change_event = service_context.CreateEvent("Interface:AvailabilityChangeEvent"); for (u32 device_index = 0; device_index < 10; device_index++) { devices[device_index] = @@ -50,11 +24,11 @@ IUser::IUser(Core::System& system_) } } -IUser ::~IUser() { +Interface ::~Interface() { availability_change_event->Close(); } -void IUser::Initialize(HLERequestContext& ctx) { +void Interface::Initialize(HLERequestContext& ctx) { LOG_INFO(Service_NFC, "called"); state = State::Initialized; @@ -67,7 +41,7 @@ void IUser::Initialize(HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IUser::Finalize(HLERequestContext& ctx) { +void Interface::Finalize(HLERequestContext& ctx) { LOG_INFO(Service_NFC, "called"); state = State::NonInitialized; @@ -80,7 +54,7 @@ void IUser::Finalize(HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void IUser::GetState(HLERequestContext& ctx) { +void Interface::GetState(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -88,7 +62,7 @@ void IUser::GetState(HLERequestContext& ctx) { rb.PushEnum(state); } -void IUser::IsNfcEnabled(HLERequestContext& ctx) { +void Interface::IsNfcEnabled(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -96,7 +70,7 @@ void IUser::IsNfcEnabled(HLERequestContext& ctx) { rb.Push(state != State::NonInitialized); } -void IUser::ListDevices(HLERequestContext& ctx) { +void Interface::ListDevices(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); if (state == State::NonInitialized) { @@ -142,7 +116,7 @@ void IUser::ListDevices(HLERequestContext& ctx) { rb.Push(static_cast(nfp_devices.size())); } -void IUser::GetDeviceState(HLERequestContext& ctx) { +void Interface::GetDeviceState(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -160,7 +134,7 @@ void IUser::GetDeviceState(HLERequestContext& ctx) { rb.PushEnum(device.value()->GetCurrentState()); } -void IUser::GetNpadId(HLERequestContext& ctx) { +void Interface::GetNpadId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -184,7 +158,7 @@ void IUser::GetNpadId(HLERequestContext& ctx) { rb.PushEnum(device.value()->GetNpadId()); } -void IUser::AttachAvailabilityChangeEvent(HLERequestContext& ctx) { +void Interface::AttachAvailabilityChangeEvent(HLERequestContext& ctx) { LOG_INFO(Service_NFC, "called"); if (state == State::NonInitialized) { @@ -198,7 +172,7 @@ void IUser::AttachAvailabilityChangeEvent(HLERequestContext& ctx) { rb.PushCopyObjects(availability_change_event->GetReadableEvent()); } -void IUser::StartDetection(HLERequestContext& ctx) { +void Interface::StartDetection(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto nfp_protocol{rp.PopEnum()}; @@ -223,7 +197,7 @@ void IUser::StartDetection(HLERequestContext& ctx) { rb.Push(result); } -void IUser::StopDetection(HLERequestContext& ctx) { +void Interface::StopDetection(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); @@ -247,7 +221,7 @@ void IUser::StopDetection(HLERequestContext& ctx) { rb.Push(result); } -void IUser::GetTagInfo(HLERequestContext& ctx) { +void Interface::GetTagInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); @@ -273,7 +247,7 @@ void IUser::GetTagInfo(HLERequestContext& ctx) { rb.Push(result); } -void IUser::AttachActivateEvent(HLERequestContext& ctx) { +void Interface::AttachActivateEvent(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -297,7 +271,7 @@ void IUser::AttachActivateEvent(HLERequestContext& ctx) { rb.PushCopyObjects(device.value()->GetActivateEvent()); } -void IUser::AttachDeactivateEvent(HLERequestContext& ctx) { +void Interface::AttachDeactivateEvent(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -321,7 +295,7 @@ void IUser::AttachDeactivateEvent(HLERequestContext& ctx) { rb.PushCopyObjects(device.value()->GetDeactivateEvent()); } -void IUser::SendCommandByPassThrough(HLERequestContext& ctx) { +void Interface::SendCommandByPassThrough(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto timeout{rp.PopRaw()}; @@ -353,7 +327,7 @@ void IUser::SendCommandByPassThrough(HLERequestContext& ctx) { rb.Push(static_cast(out_data.size())); } -std::optional> IUser::GetNfcDevice(u64 handle) { +std::optional> Interface::GetNfcDevice(u64 handle) { for (auto& device : devices) { if (device->GetHandle() == handle) { return device; diff --git a/src/core/hle/service/nfc/nfc_user.h b/src/core/hle/service/nfc/nfc_interface.h similarity index 91% rename from src/core/hle/service/nfc/nfc_user.h rename to src/core/hle/service/nfc/nfc_interface.h index aee046ae8..8c1bf5a59 100644 --- a/src/core/hle/service/nfc/nfc_user.h +++ b/src/core/hle/service/nfc/nfc_interface.h @@ -13,16 +13,10 @@ namespace Service::NFC { class NfcDevice; -class IUser final : public ServiceFramework { +class Interface : public ServiceFramework { public: - explicit IUser(Core::System& system_); - ~IUser(); - -private: - enum class State : u32 { - NonInitialized, - Initialized, - }; + explicit Interface(Core::System& system_, const char* name); + ~Interface(); void Initialize(HLERequestContext& ctx); void Finalize(HLERequestContext& ctx); @@ -39,6 +33,12 @@ private: void AttachDeactivateEvent(HLERequestContext& ctx); void SendCommandByPassThrough(HLERequestContext& ctx); +private: + enum class State : u32 { + NonInitialized, + Initialized, + }; + std::optional> GetNfcDevice(u64 handle); KernelHelpers::ServiceContext service_context; diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp index 2714f4bea..2559fe598 100644 --- a/src/core/hle/service/nfp/nfp.cpp +++ b/src/core/hle/service/nfp/nfp.cpp @@ -152,16 +152,10 @@ private: void CreateUserInterface(HLERequestContext& ctx) { LOG_DEBUG(Service_NFP, "called"); - if (user_interface == nullptr) { - user_interface = std::make_shared(system); - } - IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface(user_interface); + rb.PushIpcInterface(system); } - - std::shared_ptr user_interface; }; class ISystemManager final : public ServiceFramework { @@ -180,16 +174,10 @@ private: void CreateSystemInterface(HLERequestContext& ctx) { LOG_DEBUG(Service_NFP, "called"); - if (system_interface == nullptr) { - system_interface = std::make_shared(system); - } - IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface(system_interface); + rb.PushIpcInterface(system); } - - std::shared_ptr system_interface; }; class IDebugManager final : public ServiceFramework { @@ -208,16 +196,10 @@ private: void CreateDebugInterface(HLERequestContext& ctx) { LOG_DEBUG(Service_NFP, "called"); - if (system_interface == nullptr) { - system_interface = std::make_shared(system); - } - IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface(system_interface); + rb.PushIpcInterface(system); } - - std::shared_ptr system_interface; }; void LoopProcess(Core::System& system) { From 00d76fc5f5276b74f4c14edda579981831808d35 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Fri, 14 Apr 2023 17:55:13 -0600 Subject: [PATCH 0273/1181] service: nfc: Create mifare interface --- .../{mifare_user.cpp => mifare_interface.cpp} | 58 +++++++------------ .../nfc/{mifare_user.h => mifare_interface.h} | 18 +++--- src/core/hle/service/nfc/nfc.cpp | 32 +++++++++- 3 files changed, 58 insertions(+), 50 deletions(-) rename src/core/hle/service/nfc/{mifare_user.cpp => mifare_interface.cpp} (83%) rename src/core/hle/service/nfc/{mifare_user.h => mifare_interface.h} (90%) diff --git a/src/core/hle/service/nfc/mifare_user.cpp b/src/core/hle/service/nfc/mifare_interface.cpp similarity index 83% rename from src/core/hle/service/nfc/mifare_user.cpp rename to src/core/hle/service/nfc/mifare_interface.cpp index e0bbd46e1..7e6635ba2 100644 --- a/src/core/hle/service/nfc/mifare_user.cpp +++ b/src/core/hle/service/nfc/mifare_interface.cpp @@ -6,33 +6,15 @@ #include "core/hid/hid_types.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nfc/mifare_user.h" +#include "core/hle/service/nfc/mifare_interface.h" #include "core/hle/service/nfc/nfc_device.h" #include "core/hle/service/nfc/nfc_result.h" namespace Service::NFC { -MFIUser::MFIUser(Core::System& system_) - : ServiceFramework{system_, "NFC::MFIUser"}, service_context{system_, service_name} { - static const FunctionInfo functions[] = { - {0, &MFIUser::Initialize, "Initialize"}, - {1, &MFIUser::Finalize, "Finalize"}, - {2, &MFIUser::ListDevices, "ListDevices"}, - {3, &MFIUser::StartDetection, "StartDetection"}, - {4, &MFIUser::StopDetection, "StopDetection"}, - {5, &MFIUser::Read, "Read"}, - {6, &MFIUser::Write, "Write"}, - {7, &MFIUser::GetTagInfo, "GetTagInfo"}, - {8, &MFIUser::GetActivateEventHandle, "GetActivateEventHandle"}, - {9, &MFIUser::GetDeactivateEventHandle, "GetDeactivateEventHandle"}, - {10, &MFIUser::GetState, "GetState"}, - {11, &MFIUser::GetDeviceState, "GetDeviceState"}, - {12, &MFIUser::GetNpadId, "GetNpadId"}, - {13, &MFIUser::GetAvailabilityChangeEventHandle, "GetAvailabilityChangeEventHandle"}, - }; - RegisterHandlers(functions); - - availability_change_event = service_context.CreateEvent("MFIUser:AvailabilityChangeEvent"); +MFInterface::MFInterface(Core::System& system_, const char* name) + : ServiceFramework{system_, name}, service_context{system_, service_name} { + availability_change_event = service_context.CreateEvent("MFInterface:AvailabilityChangeEvent"); for (u32 device_index = 0; device_index < 10; device_index++) { devices[device_index] = @@ -41,11 +23,11 @@ MFIUser::MFIUser(Core::System& system_) } } -MFIUser ::~MFIUser() { +MFInterface ::~MFInterface() { availability_change_event->Close(); } -void MFIUser::Initialize(HLERequestContext& ctx) { +void MFInterface::Initialize(HLERequestContext& ctx) { LOG_INFO(Service_NFC, "called"); state = State::Initialized; @@ -58,7 +40,7 @@ void MFIUser::Initialize(HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void MFIUser::Finalize(HLERequestContext& ctx) { +void MFInterface::Finalize(HLERequestContext& ctx) { LOG_INFO(Service_NFC, "called"); state = State::NonInitialized; @@ -71,7 +53,7 @@ void MFIUser::Finalize(HLERequestContext& ctx) { rb.Push(ResultSuccess); } -void MFIUser::ListDevices(HLERequestContext& ctx) { +void MFInterface::ListDevices(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); if (state == State::NonInitialized) { @@ -117,7 +99,7 @@ void MFIUser::ListDevices(HLERequestContext& ctx) { rb.Push(static_cast(nfp_devices.size())); } -void MFIUser::StartDetection(HLERequestContext& ctx) { +void MFInterface::StartDetection(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); @@ -141,7 +123,7 @@ void MFIUser::StartDetection(HLERequestContext& ctx) { rb.Push(result); } -void MFIUser::StopDetection(HLERequestContext& ctx) { +void MFInterface::StopDetection(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); @@ -165,7 +147,7 @@ void MFIUser::StopDetection(HLERequestContext& ctx) { rb.Push(result); } -void MFIUser::Read(HLERequestContext& ctx) { +void MFInterface::Read(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto buffer{ctx.ReadBuffer()}; @@ -206,7 +188,7 @@ void MFIUser::Read(HLERequestContext& ctx) { rb.Push(result); } -void MFIUser::Write(HLERequestContext& ctx) { +void MFInterface::Write(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto buffer{ctx.ReadBuffer()}; @@ -250,7 +232,7 @@ void MFIUser::Write(HLERequestContext& ctx) { rb.Push(result); } -void MFIUser::GetTagInfo(HLERequestContext& ctx) { +void MFInterface::GetTagInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); @@ -276,7 +258,7 @@ void MFIUser::GetTagInfo(HLERequestContext& ctx) { rb.Push(result); } -void MFIUser::GetActivateEventHandle(HLERequestContext& ctx) { +void MFInterface::GetActivateEventHandle(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -300,7 +282,7 @@ void MFIUser::GetActivateEventHandle(HLERequestContext& ctx) { rb.PushCopyObjects(device.value()->GetActivateEvent()); } -void MFIUser::GetDeactivateEventHandle(HLERequestContext& ctx) { +void MFInterface::GetDeactivateEventHandle(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -324,7 +306,7 @@ void MFIUser::GetDeactivateEventHandle(HLERequestContext& ctx) { rb.PushCopyObjects(device.value()->GetDeactivateEvent()); } -void MFIUser::GetState(HLERequestContext& ctx) { +void MFInterface::GetState(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -332,7 +314,7 @@ void MFIUser::GetState(HLERequestContext& ctx) { rb.PushEnum(state); } -void MFIUser::GetDeviceState(HLERequestContext& ctx) { +void MFInterface::GetDeviceState(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -350,7 +332,7 @@ void MFIUser::GetDeviceState(HLERequestContext& ctx) { rb.PushEnum(device.value()->GetCurrentState()); } -void MFIUser::GetNpadId(HLERequestContext& ctx) { +void MFInterface::GetNpadId(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); @@ -374,7 +356,7 @@ void MFIUser::GetNpadId(HLERequestContext& ctx) { rb.PushEnum(device.value()->GetNpadId()); } -void MFIUser::GetAvailabilityChangeEventHandle(HLERequestContext& ctx) { +void MFInterface::GetAvailabilityChangeEventHandle(HLERequestContext& ctx) { LOG_INFO(Service_NFC, "called"); if (state == State::NonInitialized) { @@ -388,7 +370,7 @@ void MFIUser::GetAvailabilityChangeEventHandle(HLERequestContext& ctx) { rb.PushCopyObjects(availability_change_event->GetReadableEvent()); } -std::optional> MFIUser::GetNfcDevice(u64 handle) { +std::optional> MFInterface::GetNfcDevice(u64 handle) { for (auto& device : devices) { if (device->GetHandle() == handle) { return device; diff --git a/src/core/hle/service/nfc/mifare_user.h b/src/core/hle/service/nfc/mifare_interface.h similarity index 90% rename from src/core/hle/service/nfc/mifare_user.h rename to src/core/hle/service/nfc/mifare_interface.h index 9701f1d7f..698c8a6b6 100644 --- a/src/core/hle/service/nfc/mifare_user.h +++ b/src/core/hle/service/nfc/mifare_interface.h @@ -13,16 +13,10 @@ namespace Service::NFC { class NfcDevice; -class MFIUser final : public ServiceFramework { +class MFInterface : public ServiceFramework { public: - explicit MFIUser(Core::System& system_); - ~MFIUser(); - -private: - enum class State : u32 { - NonInitialized, - Initialized, - }; + explicit MFInterface(Core::System& system_, const char* name); + ~MFInterface(); void Initialize(HLERequestContext& ctx); void Finalize(HLERequestContext& ctx); @@ -39,6 +33,12 @@ private: void GetNpadId(HLERequestContext& ctx); void GetAvailabilityChangeEventHandle(HLERequestContext& ctx); +private: + enum class State : u32 { + NonInitialized, + Initialized, + }; + std::optional> GetNfcDevice(u64 handle); KernelHelpers::ServiceContext service_context; diff --git a/src/core/hle/service/nfc/nfc.cpp b/src/core/hle/service/nfc/nfc.cpp index 7a8f59725..444d65f07 100644 --- a/src/core/hle/service/nfc/nfc.cpp +++ b/src/core/hle/service/nfc/nfc.cpp @@ -6,7 +6,7 @@ #include "common/logging/log.h" #include "common/settings.h" #include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nfc/mifare_user.h" +#include "core/hle/service/nfc/mifare_interface.h" #include "core/hle/service/nfc/nfc.h" #include "core/hle/service/nfc/nfc_interface.h" #include "core/hle/service/server_manager.h" @@ -16,7 +16,7 @@ namespace Service::NFC { class IUser final : public Interface { public: - explicit IUser(Core::System& system_) : Interface(system_, "IUser") { + explicit IUser(Core::System& system_) : Interface(system_, "NFC::IUser") { // clang-format off static const FunctionInfo functions[] = { {0, &Interface::Initialize, "InitializeOld"}, @@ -50,7 +50,7 @@ public: class ISystem final : public Interface { public: - explicit ISystem(Core::System& system_) : Interface{system_, "ISystem"} { + explicit ISystem(Core::System& system_) : Interface{system_, "NFC::ISystem"} { // clang-format off static const FunctionInfo functions[] = { {0, &Interface::Initialize, "InitializeOld"}, @@ -85,6 +85,32 @@ public: } }; +class MFIUser final : public MFInterface { +public: + explicit MFIUser(Core::System& system_) : MFInterface{system_, "NFC::MFInterface"} { + // clang-format off + static const FunctionInfo functions[] = { + {0, &MFIUser::Initialize, "Initialize"}, + {1, &MFIUser::Finalize, "Finalize"}, + {2, &MFIUser::ListDevices, "ListDevices"}, + {3, &MFIUser::StartDetection, "StartDetection"}, + {4, &MFIUser::StopDetection, "StopDetection"}, + {5, &MFIUser::Read, "Read"}, + {6, &MFIUser::Write, "Write"}, + {7, &MFIUser::GetTagInfo, "GetTagInfo"}, + {8, &MFIUser::GetActivateEventHandle, "GetActivateEventHandle"}, + {9, &MFIUser::GetDeactivateEventHandle, "GetDeactivateEventHandle"}, + {10, &MFIUser::GetState, "GetState"}, + {11, &MFIUser::GetDeviceState, "GetDeviceState"}, + {12, &MFIUser::GetNpadId, "GetNpadId"}, + {13, &MFIUser::GetAvailabilityChangeEventHandle, "GetAvailabilityChangeEventHandle"}, + }; + // clang-format on + + RegisterHandlers(functions); + } +}; + class IAm final : public ServiceFramework { public: explicit IAm(Core::System& system_) : ServiceFramework{system_, "NFC::IAm"} { From e4dc73f61e2546c07280abbd9bc098358a204c49 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 23 Apr 2023 23:47:05 +0200 Subject: [PATCH 0274/1181] Clang format and ddress feedback --- src/video_core/query_cache.h | 39 ++++++++++++------- .../renderer_vulkan/vk_fence_manager.cpp | 1 - .../renderer_vulkan/vk_rasterizer.cpp | 6 ++- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.h index 2a14cc36a..9c6f57817 100644 --- a/src/video_core/query_cache.h +++ b/src/video_core/query_cache.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -101,10 +102,10 @@ class QueryCacheBase : public VideoCommon::ChannelSetupCaches(*this), - VideoCore::QueryType::SamplesPassed}}} { - (void) slot_async_jobs.insert(); // Null value + : rasterizer{rasterizer_}, + cpu_memory{cpu_memory_}, streams{{CounterStream{static_cast(*this), + VideoCore::QueryType::SamplesPassed}}} { + (void)slot_async_jobs.insert(); // Null value } void InvalidateRegion(VAddr addr, std::size_t size) { @@ -136,7 +137,7 @@ public: query = Register(type, *cpu_addr, host_ptr, timestamp.has_value()); } - auto result = query->BindCounter(Stream(type).Current()); + auto result = query->BindCounter(Stream(type).Current(), timestamp); if (result) { auto async_job_id = query->GetAsyncJob(); auto& async_job = slot_async_jobs[async_job_id]; @@ -294,15 +295,17 @@ private: void AsyncFlushQuery(CachedQuery* query, std::optional timestamp, std::unique_lock& lock) { const AsyncJobId new_async_job_id = slot_async_jobs.insert(); - AsyncJob& async_job = slot_async_jobs[new_async_job_id]; - query->SetAsyncJob(new_async_job_id); - async_job.query_location = query->GetCpuAddr(); - async_job.collected = false; + { + AsyncJob& async_job = slot_async_jobs[new_async_job_id]; + query->SetAsyncJob(new_async_job_id); + async_job.query_location = query->GetCpuAddr(); + async_job.collected = false; - if (!uncommitted_flushes) { - uncommitted_flushes = std::make_shared>(); + if (!uncommitted_flushes) { + uncommitted_flushes = std::make_shared>(); + } + uncommitted_flushes->push_back(new_async_job_id); } - uncommitted_flushes->push_back(new_async_job_id); lock.unlock(); std::function operation([this, new_async_job_id, timestamp] { std::unique_lock local_lock{mutex}; @@ -408,11 +411,20 @@ public: // When counter is nullptr it means that it's just been reset. We are supposed to write a // zero in these cases. const u64 value = counter ? counter->Query(async) : 0; + if (async) { + return value; + } + std::memcpy(host_ptr, &value, sizeof(u64)); + + if (timestamp) { + std::memcpy(host_ptr + TIMESTAMP_OFFSET, &*timestamp, sizeof(u64)); + } return value; } /// Binds a counter to this query. - std::optional BindCounter(std::shared_ptr counter_) { + std::optional BindCounter(std::shared_ptr counter_, + std::optional timestamp_) { std::optional result{}; if (counter) { // If there's an old counter set it means the query is being rewritten by the game. @@ -420,6 +432,7 @@ public: result = std::make_optional(Flush()); } counter = std::move(counter_); + timestamp = timestamp_; return result; } diff --git a/src/video_core/renderer_vulkan/vk_fence_manager.cpp b/src/video_core/renderer_vulkan/vk_fence_manager.cpp index 3bba8aeb0..fad9e3832 100644 --- a/src/video_core/renderer_vulkan/vk_fence_manager.cpp +++ b/src/video_core/renderer_vulkan/vk_fence_manager.cpp @@ -10,7 +10,6 @@ #include "video_core/renderer_vulkan/vk_texture_cache.h" #include "video_core/vulkan_common/vulkan_device.h" - namespace Vulkan { InnerFence::InnerFence(Scheduler& scheduler_, bool is_stubbed_) diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 2d865729a..2d5ef89f0 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -172,7 +172,8 @@ RasterizerVulkan::RasterizerVulkan(Core::Frontend::EmuWindow& emu_window_, Tegra buffer_cache(*this, cpu_memory_, buffer_cache_runtime), pipeline_cache(*this, device, scheduler, descriptor_pool, update_descriptor_queue, render_pass_cache, buffer_cache, texture_cache, gpu.ShaderNotify()), - query_cache{*this, cpu_memory_, device, scheduler}, accelerate_dma(buffer_cache, texture_cache, scheduler), + query_cache{*this, cpu_memory_, device, scheduler}, + accelerate_dma(buffer_cache, texture_cache, scheduler), fence_manager(*this, gpu, texture_cache, buffer_cache, query_cache, device, scheduler), wfi_event(device.GetLogical().CreateEvent()) { scheduler.SetQueryCache(query_cache); @@ -675,7 +676,8 @@ bool RasterizerVulkan::AccelerateConditionalRendering() { const GPUVAddr condition_address{maxwell3d->regs.render_enable.Address()}; Maxwell::ReportSemaphore::Compare cmp; if (gpu_memory->IsMemoryDirty(condition_address, sizeof(cmp), - VideoCommon::CacheType::BufferCache | VideoCommon::CacheType::QueryCache)) { + VideoCommon::CacheType::BufferCache | + VideoCommon::CacheType::QueryCache)) { return true; } return false; From 5e16fe4579e10cf21af9fada603d8d585f683caf Mon Sep 17 00:00:00 2001 From: german77 Date: Tue, 25 Apr 2023 23:33:05 -0600 Subject: [PATCH 0275/1181] core: service: Add FunctionInfoTyped to allow expanding existing interfaces --- src/core/hle/service/service.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index 0f79a1b7e..45b2c43b7 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h @@ -142,7 +142,8 @@ template class ServiceFramework : public ServiceFrameworkBase { protected: /// Contains information about a request type which is handled by the service. - struct FunctionInfo : FunctionInfoBase { + template + struct FunctionInfoTyped : FunctionInfoBase { // TODO(yuriks): This function could be constexpr, but clang is the only compiler that // doesn't emit an ICE or a wrong diagnostic because of the static_cast. @@ -155,12 +156,13 @@ protected: * the request * @param name_ human-friendly name for the request. Used mostly for logging purposes. */ - FunctionInfo(u32 expected_header_, HandlerFnP handler_callback_, const char* name_) + FunctionInfoTyped(u32 expected_header_, HandlerFnP handler_callback_, const char* name_) : FunctionInfoBase{ expected_header_, // Type-erase member function pointer by casting it down to the base class. static_cast>(handler_callback_), name_} {} }; + using FunctionInfo = FunctionInfoTyped; /** * Initializes the handler with no functions installed. @@ -175,8 +177,8 @@ protected: : ServiceFrameworkBase(system_, service_name_, max_sessions_, Invoker) {} /// Registers handlers in the service. - template - void RegisterHandlers(const FunctionInfo (&functions)[N]) { + template + void RegisterHandlers(const FunctionInfoTyped (&functions)[N]) { RegisterHandlers(functions, N); } @@ -184,13 +186,14 @@ protected: * Registers handlers in the service. Usually prefer using the other RegisterHandlers * overload in order to avoid needing to specify the array size. */ - void RegisterHandlers(const FunctionInfo* functions, std::size_t n) { + template + void RegisterHandlers(const FunctionInfoTyped* functions, std::size_t n) { RegisterHandlersBase(functions, n); } /// Registers handlers in the service. - template - void RegisterHandlersTipc(const FunctionInfo (&functions)[N]) { + template + void RegisterHandlersTipc(const FunctionInfoTyped (&functions)[N]) { RegisterHandlersTipc(functions, N); } @@ -198,7 +201,8 @@ protected: * Registers handlers in the service. Usually prefer using the other RegisterHandlers * overload in order to avoid needing to specify the array size. */ - void RegisterHandlersTipc(const FunctionInfo* functions, std::size_t n) { + template + void RegisterHandlersTipc(const FunctionInfoTyped* functions, std::size_t n) { RegisterHandlersBaseTipc(functions, n); } From 9a7c172f76007324d72d107acc01c64e41d53820 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Fri, 28 Apr 2023 23:53:02 +0200 Subject: [PATCH 0276/1181] MemoryManager: Fix race conditions. --- src/video_core/memory_manager.cpp | 10 +++++++--- src/video_core/memory_manager.h | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index 01fb5b546..e06ce5d14 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -170,6 +170,7 @@ void MemoryManager::BindRasterizer(VideoCore::RasterizerInterface* rasterizer_) GPUVAddr MemoryManager::Map(GPUVAddr gpu_addr, VAddr cpu_addr, std::size_t size, PTEKind kind, bool is_big_pages) { + std::unique_lock lock(guard); if (is_big_pages) [[likely]] { return BigPageTableOp(gpu_addr, cpu_addr, size, kind); } @@ -177,6 +178,7 @@ GPUVAddr MemoryManager::Map(GPUVAddr gpu_addr, VAddr cpu_addr, std::size_t size, } GPUVAddr MemoryManager::MapSparse(GPUVAddr gpu_addr, std::size_t size, bool is_big_pages) { + std::unique_lock lock(guard); if (is_big_pages) [[likely]] { return BigPageTableOp(gpu_addr, 0, size, PTEKind::INVALID); } @@ -187,6 +189,7 @@ void MemoryManager::Unmap(GPUVAddr gpu_addr, std::size_t size) { if (size == 0) { return; } + std::unique_lock lock(guard); GetSubmappedRangeImpl(gpu_addr, size, page_stash); for (const auto& [map_addr, map_size] : page_stash) { @@ -553,6 +556,7 @@ size_t MemoryManager::MaxContinuousRange(GPUVAddr gpu_addr, size_t size) const { } size_t MemoryManager::GetMemoryLayoutSize(GPUVAddr gpu_addr, size_t max_size) const { + std::unique_lock lock(guard); return kind_map.GetContinuousSizeFrom(gpu_addr); } @@ -745,10 +749,10 @@ void MemoryManager::FlushCaching() { return; } accumulator->Callback([this](GPUVAddr addr, size_t size) { - GetSubmappedRangeImpl(addr, size, page_stash); + GetSubmappedRangeImpl(addr, size, page_stash2); }); - rasterizer->InnerInvalidation(page_stash); - page_stash.clear(); + rasterizer->InnerInvalidation(page_stash2); + page_stash2.clear(); accumulator->Clear(); } diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h index fbbe856c4..794535122 100644 --- a/src/video_core/memory_manager.h +++ b/src/video_core/memory_manager.h @@ -5,6 +5,7 @@ #include #include +#include #include #include @@ -215,6 +216,9 @@ private: std::vector big_page_continuous; std::vector> page_stash{}; + std::vector> page_stash2{}; + + mutable std::mutex guard; static constexpr size_t continuous_bits = 64; From 2f158765240623d5aea916cafca71b86be2d6fd4 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Fri, 28 Apr 2023 23:53:46 +0200 Subject: [PATCH 0277/1181] QueryCache: Fix write invalidation. --- src/video_core/fence_manager.h | 1 + src/video_core/query_cache.h | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/video_core/fence_manager.h b/src/video_core/fence_manager.h index 19bbdd547..3b2f6aab6 100644 --- a/src/video_core/fence_manager.h +++ b/src/video_core/fence_manager.h @@ -64,6 +64,7 @@ public: } void SignalFence(std::function&& func) { + rasterizer.InvalidateGPUCache(); bool delay_fence = Settings::IsGPULevelHigh(); if constexpr (!can_async_check) { TryReleasePendingFences(); diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.h index 9c6f57817..941de95c1 100644 --- a/src/video_core/query_cache.h +++ b/src/video_core/query_cache.h @@ -310,16 +310,22 @@ private: std::function operation([this, new_async_job_id, timestamp] { std::unique_lock local_lock{mutex}; AsyncJob& async_job = slot_async_jobs[new_async_job_id]; + u64 value = async_job.value; + VAddr address = async_job.query_location; + slot_async_jobs.erase(new_async_job_id); + local_lock.unlock(); if (timestamp) { u64 timestamp_value = *timestamp; - cpu_memory.WriteBlockUnsafe(async_job.query_location + sizeof(u64), - ×tamp_value, sizeof(8)); - cpu_memory.WriteBlockUnsafe(async_job.query_location, &async_job.value, sizeof(8)); + cpu_memory.WriteBlockUnsafe(address + sizeof(u64), ×tamp_value, sizeof(u64)); + cpu_memory.WriteBlockUnsafe(address, &value, sizeof(u64)); + rasterizer.InvalidateRegion(address, sizeof(u64) * 2, + VideoCommon::CacheType::NoQueryCache); } else { - u32 small_value = static_cast(async_job.value); - cpu_memory.WriteBlockUnsafe(async_job.query_location, &small_value, sizeof(u32)); + u32 small_value = static_cast(value); + cpu_memory.WriteBlockUnsafe(address, &small_value, sizeof(u32)); + rasterizer.InvalidateRegion(address, sizeof(u32), + VideoCommon::CacheType::NoQueryCache); } - slot_async_jobs.erase(new_async_job_id); }); rasterizer.SyncOperation(std::move(operation)); } From cb092af3f0e3009ce9e0d7ce016e145917cbc7e1 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Fri, 28 Apr 2023 17:52:11 -0400 Subject: [PATCH 0278/1181] vk_pipeline_cache: Skip compute pipelines on Intel proprietary drivers Intel's SPIR-V shader compiler is broken. For now, skip compiling any compute pipelines until they fix this issue. This is not a perfect workaround, as there are a small subset of non-compute pipelines that still cause it to crash, but this should cover the majority of crashes. It is unfortunate that even with a test case reported 6 months ago the issue has not been fixed in favor of fixing "the most popular games and apps". Intel, you can do better than this. --- src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index 985cc3203..a318d643e 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -696,6 +696,13 @@ std::unique_ptr PipelineCache::CreateComputePipeline( std::unique_ptr PipelineCache::CreateComputePipeline( ShaderPools& pools, const ComputePipelineCacheKey& key, Shader::Environment& env, PipelineStatistics* statistics, bool build_in_parallel) try { + // TODO: Remove this when Intel fixes their shader compiler. + // https://github.com/IGCIT/Intel-GPU-Community-Issue-Tracker-IGCIT/issues/159 + if (device.GetDriverID() == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS) { + LOG_ERROR(Render_Vulkan, "Skipping 0x{:016x}", key.Hash()); + return nullptr; + } + LOG_INFO(Render_Vulkan, "0x{:016x}", key.Hash()); Shader::Maxwell::Flow::CFG cfg{env, pools.flow_block, env.StartAddress()}; From 3fbee093b2bf3b4c15dbc5bb48a3bc768ecedbc9 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 12 Mar 2023 21:43:31 +0100 Subject: [PATCH 0279/1181] TextureCache: refactor DMA downloads to allow multiple buffers. --- .../renderer_opengl/gl_rasterizer.cpp | 2 +- .../renderer_opengl/gl_texture_cache.cpp | 41 ++++++++++-------- .../renderer_opengl/gl_texture_cache.h | 3 +- .../renderer_vulkan/vk_rasterizer.cpp | 2 +- .../renderer_vulkan/vk_texture_cache.cpp | 43 ++++++++++++------- .../renderer_vulkan/vk_texture_cache.h | 7 +-- src/video_core/texture_cache/texture_cache.h | 12 +++++- .../texture_cache/texture_cache_base.h | 6 ++- 8 files changed, 75 insertions(+), 41 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 90e35e307..2de533584 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -1299,7 +1299,7 @@ bool AccelerateDMA::DmaBufferImageCopy(const Tegra::DMA::ImageCopy& copy_info, if constexpr (IS_IMAGE_UPLOAD) { image->UploadMemory(buffer->Handle(), offset, copy_span); } else { - image->DownloadMemory(buffer->Handle(), offset, copy_span); + texture_cache.DownloadImageIntoBuffer(image, buffer->Handle(), offset, copy_span); } return true; } diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index 0b9c4a904..670d8cafd 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -801,32 +801,34 @@ void Image::UploadMemory(const ImageBufferMap& map, UploadMemory(map.buffer, map.offset, copies); } -void Image::DownloadMemory(GLuint buffer_handle, size_t buffer_offset, +void Image::DownloadMemory(std::span buffer_handles, size_t buffer_offset, std::span copies) { const bool is_rescaled = True(flags & ImageFlagBits::Rescaled); if (is_rescaled) { ScaleDown(); } glMemoryBarrier(GL_PIXEL_BUFFER_BARRIER_BIT); // TODO: Move this to its own API - glBindBuffer(GL_PIXEL_PACK_BUFFER, buffer_handle); - glPixelStorei(GL_PACK_ALIGNMENT, 1); + for (auto buffer_handle : buffer_handles) { + glBindBuffer(GL_PIXEL_PACK_BUFFER, buffer_handle); + glPixelStorei(GL_PACK_ALIGNMENT, 1); - u32 current_row_length = std::numeric_limits::max(); - u32 current_image_height = std::numeric_limits::max(); + u32 current_row_length = std::numeric_limits::max(); + u32 current_image_height = std::numeric_limits::max(); - for (const VideoCommon::BufferImageCopy& copy : copies) { - if (copy.image_subresource.base_level >= gl_num_levels) { - continue; + for (const VideoCommon::BufferImageCopy& copy : copies) { + if (copy.image_subresource.base_level >= gl_num_levels) { + continue; + } + if (current_row_length != copy.buffer_row_length) { + current_row_length = copy.buffer_row_length; + glPixelStorei(GL_PACK_ROW_LENGTH, current_row_length); + } + if (current_image_height != copy.buffer_image_height) { + current_image_height = copy.buffer_image_height; + glPixelStorei(GL_PACK_IMAGE_HEIGHT, current_image_height); + } + CopyImageToBuffer(copy, buffer_offset); } - if (current_row_length != copy.buffer_row_length) { - current_row_length = copy.buffer_row_length; - glPixelStorei(GL_PACK_ROW_LENGTH, current_row_length); - } - if (current_image_height != copy.buffer_image_height) { - current_image_height = copy.buffer_image_height; - glPixelStorei(GL_PACK_IMAGE_HEIGHT, current_image_height); - } - CopyImageToBuffer(copy, buffer_offset); } if (is_rescaled) { ScaleUp(true); @@ -835,7 +837,10 @@ void Image::DownloadMemory(GLuint buffer_handle, size_t buffer_offset, void Image::DownloadMemory(ImageBufferMap& map, std::span copies) { - DownloadMemory(map.buffer, map.offset, copies); + std::array buffers{ + map.buffer, + }; + DownloadMemory(buffers, map.offset, copies); } GLuint Image::StorageHandle() noexcept { diff --git a/src/video_core/renderer_opengl/gl_texture_cache.h b/src/video_core/renderer_opengl/gl_texture_cache.h index 911e4607a..67d6910b4 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.h +++ b/src/video_core/renderer_opengl/gl_texture_cache.h @@ -212,7 +212,7 @@ public: void UploadMemory(const ImageBufferMap& map, std::span copies); - void DownloadMemory(GLuint buffer_handle, size_t buffer_offset, + void DownloadMemory(std::span buffer_handle, size_t buffer_offset, std::span copies); void DownloadMemory(ImageBufferMap& map, std::span copies); @@ -376,6 +376,7 @@ struct TextureCacheParams { using Sampler = OpenGL::Sampler; using Framebuffer = OpenGL::Framebuffer; using AsyncBuffer = u32; + using BufferType = GLuint; }; using TextureCache = VideoCommon::TextureCache; diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 673ab478e..8fc783cc0 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -793,7 +793,7 @@ bool AccelerateDMA::DmaBufferImageCopy(const Tegra::DMA::ImageCopy& copy_info, if constexpr (IS_IMAGE_UPLOAD) { image->UploadMemory(buffer->Handle(), offset, copy_span); } else { - image->DownloadMemory(buffer->Handle(), offset, copy_span); + texture_cache.DownloadImageIntoBuffer(image, buffer->Handle(), offset, copy_span); } return true; } diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index ae15f6976..e4d077e63 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -1,10 +1,11 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later #include #include #include #include +#include #include "common/bit_cast.h" #include "common/bit_util.h" @@ -1341,16 +1342,20 @@ void Image::UploadMemory(const StagingBufferRef& map, std::span buffers_span, VkDeviceSize offset, std::span copies) { const bool is_rescaled = True(flags & ImageFlagBits::Rescaled); if (is_rescaled) { ScaleDown(); } + boost::container::small_vector buffers_vector{}; + for (auto& buffer : buffers_span) { + buffers_vector.push_back(buffer); + } std::vector vk_copies = TransformBufferImageCopies(copies, offset, aspect_mask); scheduler->RequestOutsideRenderPassOperationContext(); - scheduler->Record([buffer, image = *original_image, aspect_mask = aspect_mask, - vk_copies](vk::CommandBuffer cmdbuf) { + scheduler->Record([buffers = std::move(buffers_vector), image = *original_image, + aspect_mask = aspect_mask, vk_copies](vk::CommandBuffer cmdbuf) { const VkImageMemoryBarrier read_barrier{ .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, .pNext = nullptr, @@ -1369,6 +1374,20 @@ void Image::DownloadMemory(VkBuffer buffer, VkDeviceSize offset, .layerCount = VK_REMAINING_ARRAY_LAYERS, }, }; + cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + 0, read_barrier); + + for (auto buffer : buffers) { + cmdbuf.CopyImageToBuffer(image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, buffer, + vk_copies); + } + + const VkMemoryBarrier memory_write_barrier{ + .sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER, + .pNext = nullptr, + .srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT, + .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT, + }; const VkImageMemoryBarrier image_write_barrier{ .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, .pNext = nullptr, @@ -1387,15 +1406,6 @@ void Image::DownloadMemory(VkBuffer buffer, VkDeviceSize offset, .layerCount = VK_REMAINING_ARRAY_LAYERS, }, }; - const VkMemoryBarrier memory_write_barrier{ - .sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER, - .pNext = nullptr, - .srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT, - .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT, - }; - cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, - 0, read_barrier); - cmdbuf.CopyImageToBuffer(image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, buffer, vk_copies); cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, memory_write_barrier, nullptr, image_write_barrier); }); @@ -1405,7 +1415,10 @@ void Image::DownloadMemory(VkBuffer buffer, VkDeviceSize offset, } void Image::DownloadMemory(const StagingBufferRef& map, std::span copies) { - DownloadMemory(map.buffer, map.offset, copies); + std::array buffers{ + map.buffer, + }; + DownloadMemory(buffers, map.offset, copies); } bool Image::IsRescaled() const noexcept { diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index d5ee23f8d..422476188 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once @@ -138,7 +138,7 @@ public: void UploadMemory(const StagingBufferRef& map, std::span copies); - void DownloadMemory(VkBuffer buffer, VkDeviceSize offset, + void DownloadMemory(std::span buffers, VkDeviceSize offset, std::span copies); void DownloadMemory(const StagingBufferRef& map, @@ -371,6 +371,7 @@ struct TextureCacheParams { using Sampler = Vulkan::Sampler; using Framebuffer = Vulkan::Framebuffer; using AsyncBuffer = Vulkan::StagingBufferRef; + using BufferType = VkBuffer; }; using TextureCache = VideoCommon::TextureCache; diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index ed5c768d8..2cd5aa31e 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later #pragma once @@ -833,6 +833,16 @@ std::pair::Image*, BufferImageCopy> TextureCache

::Dm return {image, copy}; } +template +void TextureCache

::DownloadImageIntoBuffer( + typename TextureCache

::Image* image, typename TextureCache

::BufferType buffer, + size_t buffer_offset, std::span copies) { + std::array buffers{ + buffer, + }; + image->DownloadMemory(buffers, buffer_offset, copies); +} + template void TextureCache

::RefreshContents(Image& image, ImageId image_id) { if (False(image.flags & ImageFlagBits::CpuModified)) { diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index 5a5b4179c..51f44aed5 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later #pragma once @@ -119,6 +119,7 @@ class TextureCache : public VideoCommon::ChannelSetupCaches copies); + /// Return true when a CPU region is modified from the GPU [[nodiscard]] bool IsRegionGpuModified(VAddr addr, size_t size); From e3a2ca96bd2350471ebb6c2907c67b10254a4f7e Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Fri, 14 Apr 2023 18:07:38 +0200 Subject: [PATCH 0280/1181] Accelerate DMA: Use texture cache async downloads to perform the copies to host. WIP --- .../renderer_opengl/gl_rasterizer.cpp | 6 +- .../renderer_vulkan/vk_rasterizer.cpp | 6 +- .../renderer_vulkan/vk_texture_cache.cpp | 21 ++-- .../renderer_vulkan/vk_texture_cache.h | 2 +- src/video_core/texture_cache/texture_cache.h | 118 +++++++++++++----- .../texture_cache/texture_cache_base.h | 23 +++- 6 files changed, 123 insertions(+), 53 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 2de533584..4993d4709 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -1287,8 +1287,7 @@ bool AccelerateDMA::DmaBufferImageCopy(const Tegra::DMA::ImageCopy& copy_info, } const u32 buffer_size = static_cast(buffer_operand.pitch * buffer_operand.height); static constexpr auto sync_info = VideoCommon::ObtainBufferSynchronize::FullSynchronize; - const auto post_op = IS_IMAGE_UPLOAD ? VideoCommon::ObtainBufferOperation::DoNothing - : VideoCommon::ObtainBufferOperation::MarkAsWritten; + const auto post_op = VideoCommon::ObtainBufferOperation::DoNothing; const auto [buffer, offset] = buffer_cache.ObtainBuffer(buffer_operand.address, buffer_size, sync_info, post_op); @@ -1299,7 +1298,8 @@ bool AccelerateDMA::DmaBufferImageCopy(const Tegra::DMA::ImageCopy& copy_info, if constexpr (IS_IMAGE_UPLOAD) { image->UploadMemory(buffer->Handle(), offset, copy_span); } else { - texture_cache.DownloadImageIntoBuffer(image, buffer->Handle(), offset, copy_span); + texture_cache.DownloadImageIntoBuffer(image, buffer->Handle(), offset, copy_span, + buffer_operand.address, buffer_size); } return true; } diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 8fc783cc0..2559a3aa7 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -781,8 +781,7 @@ bool AccelerateDMA::DmaBufferImageCopy(const Tegra::DMA::ImageCopy& copy_info, } const u32 buffer_size = static_cast(buffer_operand.pitch * buffer_operand.height); static constexpr auto sync_info = VideoCommon::ObtainBufferSynchronize::FullSynchronize; - const auto post_op = IS_IMAGE_UPLOAD ? VideoCommon::ObtainBufferOperation::DoNothing - : VideoCommon::ObtainBufferOperation::MarkAsWritten; + const auto post_op = VideoCommon::ObtainBufferOperation::DoNothing; const auto [buffer, offset] = buffer_cache.ObtainBuffer(buffer_operand.address, buffer_size, sync_info, post_op); @@ -793,7 +792,8 @@ bool AccelerateDMA::DmaBufferImageCopy(const Tegra::DMA::ImageCopy& copy_info, if constexpr (IS_IMAGE_UPLOAD) { image->UploadMemory(buffer->Handle(), offset, copy_span); } else { - texture_cache.DownloadImageIntoBuffer(image, buffer->Handle(), offset, copy_span); + texture_cache.DownloadImageIntoBuffer(image, buffer->Handle(), offset, copy_span, + buffer_operand.address, buffer_size); } return true; } diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index e4d077e63..da3841bb3 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -1342,17 +1342,19 @@ void Image::UploadMemory(const StagingBufferRef& map, std::span buffers_span, VkDeviceSize offset, +void Image::DownloadMemory(std::span buffers_span, std::span offsets_span, std::span copies) { const bool is_rescaled = True(flags & ImageFlagBits::Rescaled); if (is_rescaled) { ScaleDown(); } boost::container::small_vector buffers_vector{}; - for (auto& buffer : buffers_span) { - buffers_vector.push_back(buffer); + boost::container::small_vector, 1> vk_copies; + for (size_t index = 0; index < buffers_span.size(); index++) { + buffers_vector.emplace_back(buffers_span[index]); + vk_copies.emplace_back( + TransformBufferImageCopies(copies, offsets_span[index], aspect_mask)); } - std::vector vk_copies = TransformBufferImageCopies(copies, offset, aspect_mask); scheduler->RequestOutsideRenderPassOperationContext(); scheduler->Record([buffers = std::move(buffers_vector), image = *original_image, aspect_mask = aspect_mask, vk_copies](vk::CommandBuffer cmdbuf) { @@ -1377,9 +1379,9 @@ void Image::DownloadMemory(std::span buffers_span, VkDeviceSize offset cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, read_barrier); - for (auto buffer : buffers) { - cmdbuf.CopyImageToBuffer(image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, buffer, - vk_copies); + for (size_t index = 0; index < buffers.size(); index++) { + cmdbuf.CopyImageToBuffer(image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, buffers[index], + vk_copies[index]); } const VkMemoryBarrier memory_write_barrier{ @@ -1418,7 +1420,10 @@ void Image::DownloadMemory(const StagingBufferRef& map, std::span copies); - void DownloadMemory(std::span buffers, VkDeviceSize offset, + void DownloadMemory(std::span buffers, std::span offsets, std::span copies); void DownloadMemory(const StagingBufferRef& map, diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 2cd5aa31e..63b8b5af5 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -661,27 +661,40 @@ template void TextureCache

::CommitAsyncFlushes() { // This is intentionally passing the value by copy if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { - const std::span download_ids = uncommitted_downloads; + auto& download_ids = uncommitted_downloads; if (download_ids.empty()) { committed_downloads.emplace_back(std::move(uncommitted_downloads)); uncommitted_downloads.clear(); - async_buffers.emplace_back(std::optional{}); + async_buffers.emplace_back(std::move(uncommitted_async_buffers)); + uncommitted_async_buffers.clear(); return; } size_t total_size_bytes = 0; - for (const ImageId image_id : download_ids) { - total_size_bytes += slot_images[image_id].unswizzled_size_bytes; + size_t last_async_buffer_id = uncommitted_async_buffers.size(); + bool any_none_dma = false; + for (PendingDownload& download_info : download_ids) { + if (download_info.is_swizzle) { + total_size_bytes += slot_images[download_info.object_id].unswizzled_size_bytes; + any_none_dma = true; + download_info.async_buffer_id = last_async_buffer_id; + } } - auto download_map = runtime.DownloadStagingBuffer(total_size_bytes, true); - for (const ImageId image_id : download_ids) { - Image& image = slot_images[image_id]; - const auto copies = FullDownloadCopies(image.info); - image.DownloadMemory(download_map, copies); - download_map.offset += Common::AlignUp(image.unswizzled_size_bytes, 64); + if (any_none_dma) { + auto download_map = runtime.DownloadStagingBuffer(total_size_bytes, true); + for (const PendingDownload& download_info : download_ids) { + if (download_info.is_swizzle) { + Image& image = slot_images[download_info.object_id]; + const auto copies = FullDownloadCopies(image.info); + image.DownloadMemory(download_map, copies); + download_map.offset += Common::AlignUp(image.unswizzled_size_bytes, 64); + } + } + uncommitted_async_buffers.emplace_back(download_map); } - async_buffers.emplace_back(download_map); } committed_downloads.emplace_back(std::move(uncommitted_downloads)); + async_buffers.emplace_back(std::move(uncommitted_async_buffers)); + uncommitted_async_buffers.clear(); uncommitted_downloads.clear(); } @@ -691,39 +704,57 @@ void TextureCache

::PopAsyncFlushes() { return; } if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { - const std::span download_ids = committed_downloads.front(); + const auto& download_ids = committed_downloads.front(); if (download_ids.empty()) { committed_downloads.pop_front(); async_buffers.pop_front(); return; } - auto download_map = *async_buffers.front(); - std::span download_span = download_map.mapped_span; + auto download_map = std::move(async_buffers.front()); for (size_t i = download_ids.size(); i > 0; i--) { - const ImageBase& image = slot_images[download_ids[i - 1]]; - const auto copies = FullDownloadCopies(image.info); - download_map.offset -= Common::AlignUp(image.unswizzled_size_bytes, 64); - std::span download_span_alt = download_span.subspan(download_map.offset); - SwizzleImage(*gpu_memory, image.gpu_addr, image.info, copies, download_span_alt, - swizzle_data_buffer); + auto& download_info = download_ids[i - 1]; + auto& download_buffer = download_map[download_info.async_buffer_id]; + if (download_info.is_swizzle) { + const ImageBase& image = slot_images[download_info.object_id]; + const auto copies = FullDownloadCopies(image.info); + download_buffer.offset -= Common::AlignUp(image.unswizzled_size_bytes, 64); + std::span download_span = + download_buffer.mapped_span.subspan(download_buffer.offset); + SwizzleImage(*gpu_memory, image.gpu_addr, image.info, copies, download_span, + swizzle_data_buffer); + } else { + const BufferDownload& buffer_info = slot_buffer_downloads[download_info.object_id]; + std::span download_span = + download_buffer.mapped_span.subspan(download_buffer.offset); + gpu_memory->WriteBlockUnsafe(buffer_info.address, download_span.data(), + buffer_info.size); + slot_buffer_downloads.erase(download_info.object_id); + } + } + for (auto& download_buffer : download_map) { + runtime.FreeDeferredStagingBuffer(download_buffer); } - runtime.FreeDeferredStagingBuffer(download_map); committed_downloads.pop_front(); async_buffers.pop_front(); } else { - const std::span download_ids = committed_downloads.front(); + const auto& download_ids = committed_downloads.front(); if (download_ids.empty()) { committed_downloads.pop_front(); return; } size_t total_size_bytes = 0; - for (const ImageId image_id : download_ids) { - total_size_bytes += slot_images[image_id].unswizzled_size_bytes; + for (const PendingDownload& download_info : download_ids) { + if (download_info.is_swizzle) { + total_size_bytes += slot_images[download_info.object_id].unswizzled_size_bytes; + } } auto download_map = runtime.DownloadStagingBuffer(total_size_bytes); const size_t original_offset = download_map.offset; - for (const ImageId image_id : download_ids) { - Image& image = slot_images[image_id]; + for (const PendingDownload& download_info : download_ids) { + if (download_info.is_swizzle) { + continue; + } + Image& image = slot_images[download_info.object_id]; const auto copies = FullDownloadCopies(image.info); image.DownloadMemory(download_map, copies); download_map.offset += image.unswizzled_size_bytes; @@ -732,8 +763,11 @@ void TextureCache

::PopAsyncFlushes() { runtime.Finish(); download_map.offset = original_offset; std::span download_span = download_map.mapped_span; - for (const ImageId image_id : download_ids) { - const ImageBase& image = slot_images[image_id]; + for (const PendingDownload& download_info : download_ids) { + if (download_info.is_swizzle) { + continue; + } + const ImageBase& image = slot_images[download_info.object_id]; const auto copies = FullDownloadCopies(image.info); SwizzleImage(*gpu_memory, image.gpu_addr, image.info, copies, download_span, swizzle_data_buffer); @@ -836,11 +870,27 @@ std::pair::Image*, BufferImageCopy> TextureCache

::Dm template void TextureCache

::DownloadImageIntoBuffer( typename TextureCache

::Image* image, typename TextureCache

::BufferType buffer, - size_t buffer_offset, std::span copies) { - std::array buffers{ - buffer, - }; - image->DownloadMemory(buffers, buffer_offset, copies); + size_t buffer_offset, std::span copies, GPUVAddr address, size_t size) { + if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + auto slot = slot_buffer_downloads.insert(address, size); + uncommitted_downloads.emplace_back(false, uncommitted_async_buffers.size(), slot); + auto download_map = runtime.DownloadStagingBuffer(size, true); + uncommitted_async_buffers.emplace_back(download_map); + std::array buffers{ + buffer, + download_map.buffer, + }; + std::array buffer_offsets{ + buffer_offset, + download_map.offset, + }; + image->DownloadMemory(buffers, buffer_offsets, copies); + } else { + std::array buffers{ + buffer, + }; + image->DownloadMemory(buffers, buffer_offset, copies); + } } template @@ -2219,7 +2269,7 @@ void TextureCache

::BindRenderTarget(ImageViewId* old_id, ImageViewId new_id) if (new_id) { const ImageViewBase& old_view = slot_image_views[new_id]; if (True(old_view.flags & ImageViewFlagBits::PreemtiveDownload)) { - uncommitted_downloads.push_back(old_view.image_id); + uncommitted_downloads.emplace_back(true, 0, old_view.image_id); } } *old_id = new_id; diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index 51f44aed5..d5bba3379 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h @@ -217,7 +217,8 @@ public: const Tegra::DMA::ImageOperand& image_operand, ImageId image_id, bool modifies_image); void DownloadImageIntoBuffer(Image* image, BufferType buffer, size_t buffer_offset, - std::span copies); + std::span copies, + GPUVAddr address = 0, size_t size = 0); /// Return true when a CPU region is modified from the GPU [[nodiscard]] bool IsRegionGpuModified(VAddr addr, size_t size); @@ -428,17 +429,31 @@ private: u64 critical_memory; size_t critical_gc; + struct BufferDownload { + GPUVAddr address; + size_t size; + }; + + struct PendingDownload { + bool is_swizzle; + size_t async_buffer_id; + SlotId object_id; + }; + SlotVector slot_images; SlotVector slot_map_views; SlotVector slot_image_views; SlotVector slot_image_allocs; SlotVector slot_samplers; SlotVector slot_framebuffers; + SlotVector slot_buffer_downloads; // TODO: This data structure is not optimal and it should be reworked - std::vector uncommitted_downloads; - std::deque> committed_downloads; - std::deque> async_buffers; + + std::vector uncommitted_downloads; + std::deque> committed_downloads; + std::vector uncommitted_async_buffers; + std::deque> async_buffers; struct LRUItemParams { using ObjectType = ImageId; From 56c9730a160b4123c327b26c940f53a2b6e6e8d3 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sat, 22 Apr 2023 14:04:59 +0200 Subject: [PATCH 0281/1181] Maxwell3D: only update parameters on High --- src/video_core/engines/maxwell_3d.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index 0932fadc2..2f986097f 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp @@ -223,6 +223,9 @@ void Maxwell3D::ProcessMacro(u32 method, const u32* base_start, u32 amount, bool } void Maxwell3D::RefreshParametersImpl() { + if (!Settings::IsGPULevelHigh()) { + return; + } size_t current_index = 0; for (auto& segment : macro_segments) { if (segment.first == 0) { From 58d1c7c77af1a68efa363c322fc5b26bff37ef00 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sat, 22 Apr 2023 15:27:58 +0200 Subject: [PATCH 0282/1181] Address Feedback & Clang Format --- src/video_core/texture_cache/texture_cache.h | 26 ++++++++++--------- .../texture_cache/texture_cache_base.h | 5 ---- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 63b8b5af5..543ceb5aa 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include "common/alignment.h" #include "common/settings.h" @@ -17,15 +18,10 @@ namespace VideoCommon { -using Tegra::Texture::SwizzleSource; -using Tegra::Texture::TextureType; using Tegra::Texture::TICEntry; using Tegra::Texture::TSCEntry; using VideoCore::Surface::GetFormatType; -using VideoCore::Surface::IsCopyCompatible; using VideoCore::Surface::PixelFormat; -using VideoCore::Surface::PixelFormatFromDepthFormat; -using VideoCore::Surface::PixelFormatFromRenderTargetFormat; using VideoCore::Surface::SurfaceType; using namespace Common::Literals; @@ -674,7 +670,8 @@ void TextureCache

::CommitAsyncFlushes() { bool any_none_dma = false; for (PendingDownload& download_info : download_ids) { if (download_info.is_swizzle) { - total_size_bytes += slot_images[download_info.object_id].unswizzled_size_bytes; + total_size_bytes += + Common::AlignUp(slot_images[download_info.object_id].unswizzled_size_bytes, 64); any_none_dma = true; download_info.async_buffer_id = last_async_buffer_id; } @@ -868,12 +865,16 @@ std::pair::Image*, BufferImageCopy> TextureCache

::Dm } template -void TextureCache

::DownloadImageIntoBuffer( - typename TextureCache

::Image* image, typename TextureCache

::BufferType buffer, - size_t buffer_offset, std::span copies, GPUVAddr address, size_t size) { +void TextureCache

::DownloadImageIntoBuffer(typename TextureCache

::Image* image, + typename TextureCache

::BufferType buffer, + size_t buffer_offset, + std::span copies, + GPUVAddr address, size_t size) { if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { - auto slot = slot_buffer_downloads.insert(address, size); - uncommitted_downloads.emplace_back(false, uncommitted_async_buffers.size(), slot); + const BufferDownload new_buffer_download{address, size}; + auto slot = slot_buffer_downloads.insert(new_buffer_download); + const PendingDownload new_download{false, uncommitted_async_buffers.size(), slot}; + uncommitted_downloads.emplace_back(new_download); auto download_map = runtime.DownloadStagingBuffer(size, true); uncommitted_async_buffers.emplace_back(download_map); std::array buffers{ @@ -2269,7 +2270,8 @@ void TextureCache

::BindRenderTarget(ImageViewId* old_id, ImageViewId new_id) if (new_id) { const ImageViewBase& old_view = slot_image_views[new_id]; if (True(old_view.flags & ImageViewFlagBits::PreemtiveDownload)) { - uncommitted_downloads.emplace_back(true, 0, old_view.image_id); + const PendingDownload new_download{true, 0, old_view.image_id}; + uncommitted_downloads.emplace_back(new_download); } } *old_id = new_id; diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index d5bba3379..bb9ddb70e 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h @@ -40,14 +40,9 @@ struct ChannelState; namespace VideoCommon { -using Tegra::Texture::SwizzleSource; using Tegra::Texture::TICEntry; using Tegra::Texture::TSCEntry; -using VideoCore::Surface::GetFormatType; -using VideoCore::Surface::IsCopyCompatible; using VideoCore::Surface::PixelFormat; -using VideoCore::Surface::PixelFormatFromDepthFormat; -using VideoCore::Surface::PixelFormatFromRenderTargetFormat; using namespace Common::Literals; struct ImageViewInOut { From a16c2611316e534bda310f99319f4e8c74c49c92 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 20 Nov 2022 00:09:56 +0100 Subject: [PATCH 0283/1181] Buffer Cache: Fully rework the buffer cache. --- src/video_core/CMakeLists.txt | 5 + src/video_core/buffer_cache/buffer_base.h | 459 +------- src/video_core/buffer_cache/buffer_cache.cpp | 4 +- src/video_core/buffer_cache/buffer_cache.h | 990 ++++++------------ .../buffer_cache/buffer_cache_base.h | 507 +++++++++ .../buffer_cache/memory_tracker_base.h | 258 +++++ src/video_core/buffer_cache/word_manager.h | 474 +++++++++ .../renderer_opengl/gl_buffer_cache.h | 4 + .../renderer_opengl/gl_buffer_cache_base.cpp | 9 + .../renderer_vulkan/vk_buffer_cache.cpp | 8 +- .../renderer_vulkan/vk_buffer_cache.h | 8 +- .../renderer_vulkan/vk_buffer_cache_base.cpp | 9 + 12 files changed, 1644 insertions(+), 1091 deletions(-) create mode 100644 src/video_core/buffer_cache/buffer_cache_base.h create mode 100644 src/video_core/buffer_cache/memory_tracker_base.h create mode 100644 src/video_core/buffer_cache/word_manager.h create mode 100644 src/video_core/renderer_opengl/gl_buffer_cache_base.cpp create mode 100644 src/video_core/renderer_vulkan/vk_buffer_cache_base.cpp diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index e904573d7..92cab93f3 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -11,8 +11,11 @@ endif() add_library(video_core STATIC buffer_cache/buffer_base.h + buffer_cache/buffer_cache_base.h buffer_cache/buffer_cache.cpp buffer_cache/buffer_cache.h + buffer_cache/memory_tracker_base.h + buffer_cache/word_manager.h cache_types.h cdma_pusher.cpp cdma_pusher.h @@ -104,6 +107,7 @@ add_library(video_core STATIC renderer_null/renderer_null.h renderer_opengl/blit_image.cpp renderer_opengl/blit_image.h + renderer_opengl/gl_buffer_cache_base.cpp renderer_opengl/gl_buffer_cache.cpp renderer_opengl/gl_buffer_cache.h renderer_opengl/gl_compute_pipeline.cpp @@ -154,6 +158,7 @@ add_library(video_core STATIC renderer_vulkan/renderer_vulkan.cpp renderer_vulkan/vk_blit_screen.cpp renderer_vulkan/vk_blit_screen.h + renderer_vulkan/vk_buffer_cache_base.cpp renderer_vulkan/vk_buffer_cache.cpp renderer_vulkan/vk_buffer_cache.h renderer_vulkan/vk_command_pool.cpp diff --git a/src/video_core/buffer_cache/buffer_base.h b/src/video_core/buffer_cache/buffer_base.h index 1b4d63616..66d8bb43c 100644 --- a/src/video_core/buffer_cache/buffer_base.h +++ b/src/video_core/buffer_cache/buffer_base.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once @@ -11,9 +11,7 @@ #include "common/alignment.h" #include "common/common_funcs.h" #include "common/common_types.h" -#include "common/div_ceil.h" -#include "common/settings.h" -#include "core/memory.h" +#include "video_core/buffer_cache/word_manager.h" namespace VideoCommon { @@ -36,116 +34,14 @@ struct NullBufferParams {}; */ template class BufferBase { - static constexpr u64 PAGES_PER_WORD = 64; - static constexpr u64 BYTES_PER_PAGE = Core::Memory::YUZU_PAGESIZE; - static constexpr u64 BYTES_PER_WORD = PAGES_PER_WORD * BYTES_PER_PAGE; - - /// Vector tracking modified pages tightly packed with small vector optimization - union WordsArray { - /// Returns the pointer to the words state - [[nodiscard]] const u64* Pointer(bool is_short) const noexcept { - return is_short ? &stack : heap; - } - - /// Returns the pointer to the words state - [[nodiscard]] u64* Pointer(bool is_short) noexcept { - return is_short ? &stack : heap; - } - - u64 stack = 0; ///< Small buffers storage - u64* heap; ///< Not-small buffers pointer to the storage - }; - - struct Words { - explicit Words() = default; - explicit Words(u64 size_bytes_) : size_bytes{size_bytes_} { - if (IsShort()) { - cpu.stack = ~u64{0}; - gpu.stack = 0; - cached_cpu.stack = 0; - untracked.stack = ~u64{0}; - } else { - // Share allocation between CPU and GPU pages and set their default values - const size_t num_words = NumWords(); - u64* const alloc = new u64[num_words * 4]; - cpu.heap = alloc; - gpu.heap = alloc + num_words; - cached_cpu.heap = alloc + num_words * 2; - untracked.heap = alloc + num_words * 3; - std::fill_n(cpu.heap, num_words, ~u64{0}); - std::fill_n(gpu.heap, num_words, 0); - std::fill_n(cached_cpu.heap, num_words, 0); - std::fill_n(untracked.heap, num_words, ~u64{0}); - } - // Clean up tailing bits - const u64 last_word_size = size_bytes % BYTES_PER_WORD; - const u64 last_local_page = Common::DivCeil(last_word_size, BYTES_PER_PAGE); - const u64 shift = (PAGES_PER_WORD - last_local_page) % PAGES_PER_WORD; - const u64 last_word = (~u64{0} << shift) >> shift; - cpu.Pointer(IsShort())[NumWords() - 1] = last_word; - untracked.Pointer(IsShort())[NumWords() - 1] = last_word; - } - - ~Words() { - Release(); - } - - Words& operator=(Words&& rhs) noexcept { - Release(); - size_bytes = rhs.size_bytes; - cpu = rhs.cpu; - gpu = rhs.gpu; - cached_cpu = rhs.cached_cpu; - untracked = rhs.untracked; - rhs.cpu.heap = nullptr; - return *this; - } - - Words(Words&& rhs) noexcept - : size_bytes{rhs.size_bytes}, cpu{rhs.cpu}, gpu{rhs.gpu}, - cached_cpu{rhs.cached_cpu}, untracked{rhs.untracked} { - rhs.cpu.heap = nullptr; - } - - Words& operator=(const Words&) = delete; - Words(const Words&) = delete; - - /// Returns true when the buffer fits in the small vector optimization - [[nodiscard]] bool IsShort() const noexcept { - return size_bytes <= BYTES_PER_WORD; - } - - /// Returns the number of words of the buffer - [[nodiscard]] size_t NumWords() const noexcept { - return Common::DivCeil(size_bytes, BYTES_PER_WORD); - } - - /// Release buffer resources - void Release() { - if (!IsShort()) { - // CPU written words is the base for the heap allocation - delete[] cpu.heap; - } - } - - u64 size_bytes = 0; - WordsArray cpu; - WordsArray gpu; - WordsArray cached_cpu; - WordsArray untracked; - }; - - enum class Type { - CPU, - GPU, - CachedCPU, - Untracked, - }; - public: + static constexpr u64 BASE_PAGE_BITS = 16; + static constexpr u64 BASE_PAGE_SIZE = 1ULL << BASE_PAGE_BITS; + explicit BufferBase(RasterizerInterface& rasterizer_, VAddr cpu_addr_, u64 size_bytes) - : rasterizer{&rasterizer_}, cpu_addr{Common::AlignDown(cpu_addr_, BYTES_PER_PAGE)}, - words(Common::AlignUp(size_bytes + (cpu_addr_ - cpu_addr), BYTES_PER_PAGE)) {} + : cpu_addr{Common::AlignDown(cpu_addr_, BASE_PAGE_SIZE)}, + word_manager(cpu_addr, rasterizer_, + Common::AlignUp(size_bytes + (cpu_addr_ - cpu_addr), BASE_PAGE_SIZE)) {} explicit BufferBase(NullBufferParams) {} @@ -159,94 +55,82 @@ public: [[nodiscard]] std::pair ModifiedCpuRegion(VAddr query_cpu_addr, u64 query_size) const noexcept { const u64 offset = query_cpu_addr - cpu_addr; - return ModifiedRegion(offset, query_size); + return word_manager.ModifiedRegion(offset, query_size); } /// Returns the inclusive GPU modified range in a begin end pair [[nodiscard]] std::pair ModifiedGpuRegion(VAddr query_cpu_addr, u64 query_size) const noexcept { const u64 offset = query_cpu_addr - cpu_addr; - return ModifiedRegion(offset, query_size); + return word_manager.ModifiedRegion(offset, query_size); } /// Returns true if a region has been modified from the CPU [[nodiscard]] bool IsRegionCpuModified(VAddr query_cpu_addr, u64 query_size) const noexcept { const u64 offset = query_cpu_addr - cpu_addr; - return IsRegionModified(offset, query_size); + return word_manager.IsRegionModified(offset, query_size); } /// Returns true if a region has been modified from the GPU [[nodiscard]] bool IsRegionGpuModified(VAddr query_cpu_addr, u64 query_size) const noexcept { const u64 offset = query_cpu_addr - cpu_addr; - return IsRegionModified(offset, query_size); + return word_manager.IsRegionModified(offset, query_size); } /// Mark region as CPU modified, notifying the rasterizer about this change void MarkRegionAsCpuModified(VAddr dirty_cpu_addr, u64 size) { - ChangeRegionState(dirty_cpu_addr, size); + word_manager.ChangeRegionState(dirty_cpu_addr, size); } /// Unmark region as CPU modified, notifying the rasterizer about this change void UnmarkRegionAsCpuModified(VAddr dirty_cpu_addr, u64 size) { - ChangeRegionState(dirty_cpu_addr, size); + word_manager.ChangeRegionState(dirty_cpu_addr, size); } /// Mark region as modified from the host GPU void MarkRegionAsGpuModified(VAddr dirty_cpu_addr, u64 size) noexcept { - ChangeRegionState(dirty_cpu_addr, size); + word_manager.ChangeRegionState(dirty_cpu_addr, size); } /// Unmark region as modified from the host GPU void UnmarkRegionAsGpuModified(VAddr dirty_cpu_addr, u64 size) noexcept { - ChangeRegionState(dirty_cpu_addr, size); + word_manager.ChangeRegionState(dirty_cpu_addr, size); } /// Mark region as modified from the CPU /// but don't mark it as modified until FlusHCachedWrites is called. void CachedCpuWrite(VAddr dirty_cpu_addr, u64 size) { flags |= BufferFlagBits::CachedWrites; - ChangeRegionState(dirty_cpu_addr, size); + word_manager.ChangeRegionState(dirty_cpu_addr, size); } /// Flushes cached CPU writes, and notify the rasterizer about the deltas void FlushCachedWrites() noexcept { flags &= ~BufferFlagBits::CachedWrites; - const u64 num_words = NumWords(); - u64* const cached_words = Array(); - u64* const untracked_words = Array(); - u64* const cpu_words = Array(); - for (u64 word_index = 0; word_index < num_words; ++word_index) { - const u64 cached_bits = cached_words[word_index]; - NotifyRasterizer(word_index, untracked_words[word_index], cached_bits); - untracked_words[word_index] |= cached_bits; - cpu_words[word_index] |= cached_bits; - if (!Settings::values.use_pessimistic_flushes) { - cached_words[word_index] = 0; - } - } + word_manager.FlushCachedWrites(); } /// Call 'func' for each CPU modified range and unmark those pages as CPU modified template void ForEachUploadRange(VAddr query_cpu_range, u64 size, Func&& func) { - ForEachModifiedRange(query_cpu_range, size, true, func); + word_manager.ForEachModifiedRange(query_cpu_range, size, true, func); } /// Call 'func' for each GPU modified range and unmark those pages as GPU modified template void ForEachDownloadRange(VAddr query_cpu_range, u64 size, bool clear, Func&& func) { - ForEachModifiedRange(query_cpu_range, size, clear, func); + word_manager.ForEachModifiedRange(query_cpu_range, size, clear, func); } template void ForEachDownloadRangeAndClear(VAddr query_cpu_range, u64 size, Func&& func) { - ForEachModifiedRange(query_cpu_range, size, true, func); + word_manager.ForEachModifiedRange(query_cpu_range, size, true, func); } /// Call 'func' for each GPU modified range and unmark those pages as GPU modified template void ForEachDownloadRange(Func&& func) { - ForEachModifiedRange(cpu_addr, SizeBytes(), true, func); + word_manager.ForEachModifiedRange(cpu_addr, SizeBytes(), true, func); } /// Mark buffer as picked @@ -297,7 +181,7 @@ public: /// Returns the size in bytes of the buffer [[nodiscard]] u64 SizeBytes() const noexcept { - return words.size_bytes; + return word_manager.SizeBytes(); } size_t getLRUID() const noexcept { @@ -309,301 +193,8 @@ public: } private: - template - u64* Array() noexcept { - if constexpr (type == Type::CPU) { - return words.cpu.Pointer(IsShort()); - } else if constexpr (type == Type::GPU) { - return words.gpu.Pointer(IsShort()); - } else if constexpr (type == Type::CachedCPU) { - return words.cached_cpu.Pointer(IsShort()); - } else if constexpr (type == Type::Untracked) { - return words.untracked.Pointer(IsShort()); - } - } - - template - const u64* Array() const noexcept { - if constexpr (type == Type::CPU) { - return words.cpu.Pointer(IsShort()); - } else if constexpr (type == Type::GPU) { - return words.gpu.Pointer(IsShort()); - } else if constexpr (type == Type::CachedCPU) { - return words.cached_cpu.Pointer(IsShort()); - } else if constexpr (type == Type::Untracked) { - return words.untracked.Pointer(IsShort()); - } - } - - /** - * Change the state of a range of pages - * - * @param dirty_addr Base address to mark or unmark as modified - * @param size Size in bytes to mark or unmark as modified - */ - template - void ChangeRegionState(u64 dirty_addr, s64 size) noexcept(type == Type::GPU) { - const s64 difference = dirty_addr - cpu_addr; - const u64 offset = std::max(difference, 0); - size += std::min(difference, 0); - if (offset >= SizeBytes() || size < 0) { - return; - } - u64* const untracked_words = Array(); - u64* const state_words = Array(); - const u64 offset_end = std::min(offset + size, SizeBytes()); - const u64 begin_page_index = offset / BYTES_PER_PAGE; - const u64 begin_word_index = begin_page_index / PAGES_PER_WORD; - const u64 end_page_index = Common::DivCeil(offset_end, BYTES_PER_PAGE); - const u64 end_word_index = Common::DivCeil(end_page_index, PAGES_PER_WORD); - u64 page_index = begin_page_index % PAGES_PER_WORD; - u64 word_index = begin_word_index; - while (word_index < end_word_index) { - const u64 next_word_first_page = (word_index + 1) * PAGES_PER_WORD; - const u64 left_offset = - std::min(next_word_first_page - end_page_index, PAGES_PER_WORD) % PAGES_PER_WORD; - const u64 right_offset = page_index; - u64 bits = ~u64{0}; - bits = (bits >> right_offset) << right_offset; - bits = (bits << left_offset) >> left_offset; - if constexpr (type == Type::CPU || type == Type::CachedCPU) { - NotifyRasterizer(word_index, untracked_words[word_index], bits); - } - if constexpr (enable) { - state_words[word_index] |= bits; - if constexpr (type == Type::CPU || type == Type::CachedCPU) { - untracked_words[word_index] |= bits; - } - } else { - state_words[word_index] &= ~bits; - if constexpr (type == Type::CPU || type == Type::CachedCPU) { - untracked_words[word_index] &= ~bits; - } - } - page_index = 0; - ++word_index; - } - } - - /** - * Notify rasterizer about changes in the CPU tracking state of a word in the buffer - * - * @param word_index Index to the word to notify to the rasterizer - * @param current_bits Current state of the word - * @param new_bits New state of the word - * - * @tparam add_to_rasterizer True when the rasterizer should start tracking the new pages - */ - template - void NotifyRasterizer(u64 word_index, u64 current_bits, u64 new_bits) const { - u64 changed_bits = (add_to_rasterizer ? current_bits : ~current_bits) & new_bits; - VAddr addr = cpu_addr + word_index * BYTES_PER_WORD; - while (changed_bits != 0) { - const int empty_bits = std::countr_zero(changed_bits); - addr += empty_bits * BYTES_PER_PAGE; - changed_bits >>= empty_bits; - - const u32 continuous_bits = std::countr_one(changed_bits); - const u64 size = continuous_bits * BYTES_PER_PAGE; - const VAddr begin_addr = addr; - addr += size; - changed_bits = continuous_bits < PAGES_PER_WORD ? (changed_bits >> continuous_bits) : 0; - rasterizer->UpdatePagesCachedCount(begin_addr, size, add_to_rasterizer ? 1 : -1); - } - } - - /** - * Loop over each page in the given range, turn off those bits and notify the rasterizer if - * needed. Call the given function on each turned off range. - * - * @param query_cpu_range Base CPU address to loop over - * @param size Size in bytes of the CPU range to loop over - * @param func Function to call for each turned off region - */ - template - void ForEachModifiedRange(VAddr query_cpu_range, s64 size, bool clear, Func&& func) { - static_assert(type != Type::Untracked); - - const s64 difference = query_cpu_range - cpu_addr; - const u64 query_begin = std::max(difference, 0); - size += std::min(difference, 0); - if (query_begin >= SizeBytes() || size < 0) { - return; - } - u64* const untracked_words = Array(); - u64* const state_words = Array(); - const u64 query_end = query_begin + std::min(static_cast(size), SizeBytes()); - u64* const words_begin = state_words + query_begin / BYTES_PER_WORD; - u64* const words_end = state_words + Common::DivCeil(query_end, BYTES_PER_WORD); - - const auto modified = [](u64 word) { return word != 0; }; - const auto first_modified_word = std::find_if(words_begin, words_end, modified); - if (first_modified_word == words_end) { - // Exit early when the buffer is not modified - return; - } - const auto last_modified_word = std::find_if_not(first_modified_word, words_end, modified); - - const u64 word_index_begin = std::distance(state_words, first_modified_word); - const u64 word_index_end = std::distance(state_words, last_modified_word); - - const unsigned local_page_begin = std::countr_zero(*first_modified_word); - const unsigned local_page_end = - static_cast(PAGES_PER_WORD) - std::countl_zero(last_modified_word[-1]); - const u64 word_page_begin = word_index_begin * PAGES_PER_WORD; - const u64 word_page_end = (word_index_end - 1) * PAGES_PER_WORD; - const u64 query_page_begin = query_begin / BYTES_PER_PAGE; - const u64 query_page_end = Common::DivCeil(query_end, BYTES_PER_PAGE); - const u64 page_index_begin = std::max(word_page_begin + local_page_begin, query_page_begin); - const u64 page_index_end = std::min(word_page_end + local_page_end, query_page_end); - const u64 first_word_page_begin = page_index_begin % PAGES_PER_WORD; - const u64 last_word_page_end = (page_index_end - 1) % PAGES_PER_WORD + 1; - - u64 page_begin = first_word_page_begin; - u64 current_base = 0; - u64 current_size = 0; - bool on_going = false; - for (u64 word_index = word_index_begin; word_index < word_index_end; ++word_index) { - const bool is_last_word = word_index + 1 == word_index_end; - const u64 page_end = is_last_word ? last_word_page_end : PAGES_PER_WORD; - const u64 right_offset = page_begin; - const u64 left_offset = PAGES_PER_WORD - page_end; - u64 bits = ~u64{0}; - bits = (bits >> right_offset) << right_offset; - bits = (bits << left_offset) >> left_offset; - - const u64 current_word = state_words[word_index] & bits; - if (clear) { - state_words[word_index] &= ~bits; - } - - if constexpr (type == Type::CPU) { - const u64 current_bits = untracked_words[word_index] & bits; - untracked_words[word_index] &= ~bits; - NotifyRasterizer(word_index, current_bits, ~u64{0}); - } - // Exclude CPU modified pages when visiting GPU pages - const u64 word = current_word & ~(type == Type::GPU ? untracked_words[word_index] : 0); - u64 page = page_begin; - page_begin = 0; - - while (page < page_end) { - const int empty_bits = std::countr_zero(word >> page); - if (on_going && empty_bits != 0) { - InvokeModifiedRange(func, current_size, current_base); - current_size = 0; - on_going = false; - } - if (empty_bits == PAGES_PER_WORD) { - break; - } - page += empty_bits; - - const int continuous_bits = std::countr_one(word >> page); - if (!on_going && continuous_bits != 0) { - current_base = word_index * PAGES_PER_WORD + page; - on_going = true; - } - current_size += continuous_bits; - page += continuous_bits; - } - } - if (on_going && current_size > 0) { - InvokeModifiedRange(func, current_size, current_base); - } - } - - template - void InvokeModifiedRange(Func&& func, u64 current_size, u64 current_base) { - const u64 current_size_bytes = current_size * BYTES_PER_PAGE; - const u64 offset_begin = current_base * BYTES_PER_PAGE; - const u64 offset_end = std::min(offset_begin + current_size_bytes, SizeBytes()); - func(offset_begin, offset_end - offset_begin); - } - - /** - * Returns true when a region has been modified - * - * @param offset Offset in bytes from the start of the buffer - * @param size Size in bytes of the region to query for modifications - */ - template - [[nodiscard]] bool IsRegionModified(u64 offset, u64 size) const noexcept { - static_assert(type != Type::Untracked); - - const u64* const untracked_words = Array(); - const u64* const state_words = Array(); - const u64 num_query_words = size / BYTES_PER_WORD + 1; - const u64 word_begin = offset / BYTES_PER_WORD; - const u64 word_end = std::min(word_begin + num_query_words, NumWords()); - const u64 page_limit = Common::DivCeil(offset + size, BYTES_PER_PAGE); - u64 page_index = (offset / BYTES_PER_PAGE) % PAGES_PER_WORD; - for (u64 word_index = word_begin; word_index < word_end; ++word_index, page_index = 0) { - const u64 off_word = type == Type::GPU ? untracked_words[word_index] : 0; - const u64 word = state_words[word_index] & ~off_word; - if (word == 0) { - continue; - } - const u64 page_end = std::min((word_index + 1) * PAGES_PER_WORD, page_limit); - const u64 local_page_end = page_end % PAGES_PER_WORD; - const u64 page_end_shift = (PAGES_PER_WORD - local_page_end) % PAGES_PER_WORD; - if (((word >> page_index) << page_index) << page_end_shift != 0) { - return true; - } - } - return false; - } - - /** - * Returns a begin end pair with the inclusive modified region - * - * @param offset Offset in bytes from the start of the buffer - * @param size Size in bytes of the region to query for modifications - */ - template - [[nodiscard]] std::pair ModifiedRegion(u64 offset, u64 size) const noexcept { - static_assert(type != Type::Untracked); - - const u64* const untracked_words = Array(); - const u64* const state_words = Array(); - const u64 num_query_words = size / BYTES_PER_WORD + 1; - const u64 word_begin = offset / BYTES_PER_WORD; - const u64 word_end = std::min(word_begin + num_query_words, NumWords()); - const u64 page_base = offset / BYTES_PER_PAGE; - const u64 page_limit = Common::DivCeil(offset + size, BYTES_PER_PAGE); - u64 begin = std::numeric_limits::max(); - u64 end = 0; - for (u64 word_index = word_begin; word_index < word_end; ++word_index) { - const u64 off_word = type == Type::GPU ? untracked_words[word_index] : 0; - const u64 word = state_words[word_index] & ~off_word; - if (word == 0) { - continue; - } - const u64 local_page_begin = std::countr_zero(word); - const u64 local_page_end = PAGES_PER_WORD - std::countl_zero(word); - const u64 page_index = word_index * PAGES_PER_WORD; - const u64 page_begin = std::max(page_index + local_page_begin, page_base); - const u64 page_end = std::min(page_index + local_page_end, page_limit); - begin = std::min(begin, page_begin); - end = std::max(end, page_end); - } - static constexpr std::pair EMPTY{0, 0}; - return begin < end ? std::make_pair(begin * BYTES_PER_PAGE, end * BYTES_PER_PAGE) : EMPTY; - } - - /// Returns the number of words of the buffer - [[nodiscard]] size_t NumWords() const noexcept { - return words.NumWords(); - } - - /// Returns true when the buffer fits in the small vector optimization - [[nodiscard]] bool IsShort() const noexcept { - return words.IsShort(); - } - - RasterizerInterface* rasterizer = nullptr; VAddr cpu_addr = 0; - Words words; + WordManager word_manager; BufferFlagBits flags{}; int stream_score = 0; size_t lru_id = SIZE_MAX; diff --git a/src/video_core/buffer_cache/buffer_cache.cpp b/src/video_core/buffer_cache/buffer_cache.cpp index a16308b60..40db243d2 100644 --- a/src/video_core/buffer_cache/buffer_cache.cpp +++ b/src/video_core/buffer_cache/buffer_cache.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later #include "common/microprofile.h" diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index abdc593df..a0701ce4e 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -1,482 +1,21 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once #include -#include #include -#include #include -#include -#include -#include -#include - -#include "common/common_types.h" -#include "common/div_ceil.h" -#include "common/literals.h" -#include "common/lru_cache.h" -#include "common/microprofile.h" -#include "common/polyfill_ranges.h" -#include "common/scratch_buffer.h" -#include "common/settings.h" -#include "core/memory.h" -#include "video_core/buffer_cache/buffer_base.h" -#include "video_core/control/channel_state_cache.h" -#include "video_core/delayed_destruction_ring.h" -#include "video_core/dirty_flags.h" -#include "video_core/engines/draw_manager.h" -#include "video_core/engines/kepler_compute.h" -#include "video_core/engines/maxwell_3d.h" -#include "video_core/memory_manager.h" -#include "video_core/rasterizer_interface.h" -#include "video_core/surface.h" -#include "video_core/texture_cache/slot_vector.h" -#include "video_core/texture_cache/types.h" +#include "video_core/buffer_cache/buffer_cache_base.h" namespace VideoCommon { -MICROPROFILE_DECLARE(GPU_PrepareBuffers); -MICROPROFILE_DECLARE(GPU_BindUploadBuffers); -MICROPROFILE_DECLARE(GPU_DownloadMemory); - -using BufferId = SlotId; - -using VideoCore::Surface::PixelFormat; -using namespace Common::Literals; - -constexpr u32 NUM_VERTEX_BUFFERS = 32; -constexpr u32 NUM_TRANSFORM_FEEDBACK_BUFFERS = 4; -constexpr u32 NUM_GRAPHICS_UNIFORM_BUFFERS = 18; -constexpr u32 NUM_COMPUTE_UNIFORM_BUFFERS = 8; -constexpr u32 NUM_STORAGE_BUFFERS = 16; -constexpr u32 NUM_TEXTURE_BUFFERS = 16; -constexpr u32 NUM_STAGES = 5; - -enum class ObtainBufferSynchronize : u32 { - NoSynchronize = 0, - FullSynchronize = 1, - SynchronizeNoDirty = 2, -}; - -enum class ObtainBufferOperation : u32 { - DoNothing = 0, - MarkAsWritten = 1, - DiscardWrite = 2, - MarkQuery = 3, -}; - -using UniformBufferSizes = std::array, NUM_STAGES>; -using ComputeUniformBufferSizes = std::array; - -template -class BufferCache : public VideoCommon::ChannelSetupCaches { - - // Page size for caching purposes. - // This is unrelated to the CPU page size and it can be changed as it seems optimal. - static constexpr u32 YUZU_PAGEBITS = 16; - static constexpr u64 YUZU_PAGESIZE = u64{1} << YUZU_PAGEBITS; - - static constexpr bool IS_OPENGL = P::IS_OPENGL; - static constexpr bool HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS = - P::HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS; - static constexpr bool HAS_FULL_INDEX_AND_PRIMITIVE_SUPPORT = - P::HAS_FULL_INDEX_AND_PRIMITIVE_SUPPORT; - static constexpr bool NEEDS_BIND_UNIFORM_INDEX = P::NEEDS_BIND_UNIFORM_INDEX; - static constexpr bool NEEDS_BIND_STORAGE_INDEX = P::NEEDS_BIND_STORAGE_INDEX; - static constexpr bool USE_MEMORY_MAPS = P::USE_MEMORY_MAPS; - static constexpr bool SEPARATE_IMAGE_BUFFERS_BINDINGS = P::SEPARATE_IMAGE_BUFFER_BINDINGS; - - static constexpr BufferId NULL_BUFFER_ID{0}; - - static constexpr s64 DEFAULT_EXPECTED_MEMORY = 512_MiB; - static constexpr s64 DEFAULT_CRITICAL_MEMORY = 1_GiB; - static constexpr s64 TARGET_THRESHOLD = 4_GiB; - - using Maxwell = Tegra::Engines::Maxwell3D::Regs; - - using Runtime = typename P::Runtime; - using Buffer = typename P::Buffer; - - using IntervalSet = boost::icl::interval_set; - using IntervalType = typename IntervalSet::interval_type; - - struct Empty {}; - - struct OverlapResult { - std::vector ids; - VAddr begin; - VAddr end; - bool has_stream_leap = false; - }; - - struct Binding { - VAddr cpu_addr{}; - u32 size{}; - BufferId buffer_id; - }; - - struct TextureBufferBinding : Binding { - PixelFormat format; - }; - - static constexpr Binding NULL_BINDING{ - .cpu_addr = 0, - .size = 0, - .buffer_id = NULL_BUFFER_ID, - }; - -public: - static constexpr u32 DEFAULT_SKIP_CACHE_SIZE = static_cast(4_KiB); - - explicit BufferCache(VideoCore::RasterizerInterface& rasterizer_, - Core::Memory::Memory& cpu_memory_, Runtime& runtime_); - - void TickFrame(); - - void WriteMemory(VAddr cpu_addr, u64 size); - - void CachedWriteMemory(VAddr cpu_addr, u64 size); - - void DownloadMemory(VAddr cpu_addr, u64 size); - - bool InlineMemory(VAddr dest_address, size_t copy_size, std::span inlined_buffer); - - void BindGraphicsUniformBuffer(size_t stage, u32 index, GPUVAddr gpu_addr, u32 size); - - void DisableGraphicsUniformBuffer(size_t stage, u32 index); - - void UpdateGraphicsBuffers(bool is_indexed); - - void UpdateComputeBuffers(); - - void BindHostGeometryBuffers(bool is_indexed); - - void BindHostStageBuffers(size_t stage); - - void BindHostComputeBuffers(); - - void SetUniformBuffersState(const std::array& mask, - const UniformBufferSizes* sizes); - - void SetComputeUniformBufferState(u32 mask, const ComputeUniformBufferSizes* sizes); - - void UnbindGraphicsStorageBuffers(size_t stage); - - void BindGraphicsStorageBuffer(size_t stage, size_t ssbo_index, u32 cbuf_index, u32 cbuf_offset, - bool is_written); - - void UnbindGraphicsTextureBuffers(size_t stage); - - void BindGraphicsTextureBuffer(size_t stage, size_t tbo_index, GPUVAddr gpu_addr, u32 size, - PixelFormat format, bool is_written, bool is_image); - - void UnbindComputeStorageBuffers(); - - void BindComputeStorageBuffer(size_t ssbo_index, u32 cbuf_index, u32 cbuf_offset, - bool is_written); - - void UnbindComputeTextureBuffers(); - - void BindComputeTextureBuffer(size_t tbo_index, GPUVAddr gpu_addr, u32 size, PixelFormat format, - bool is_written, bool is_image); - - void FlushCachedWrites(); - - /// Return true when there are uncommitted buffers to be downloaded - [[nodiscard]] bool HasUncommittedFlushes() const noexcept; - - void AccumulateFlushes(); - - /// Return true when the caller should wait for async downloads - [[nodiscard]] bool ShouldWaitAsyncFlushes() const noexcept; - - /// Commit asynchronous downloads - void CommitAsyncFlushes(); - void CommitAsyncFlushesHigh(); - - /// Pop asynchronous downloads - void PopAsyncFlushes(); - - bool DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 amount); - - bool DMAClear(GPUVAddr src_address, u64 amount, u32 value); - - [[nodiscard]] std::pair ObtainBuffer(GPUVAddr gpu_addr, u32 size, - ObtainBufferSynchronize sync_info, - ObtainBufferOperation post_op); - - /// Return true when a CPU region is modified from the GPU - [[nodiscard]] bool IsRegionGpuModified(VAddr addr, size_t size); - - /// Return true when a region is registered on the cache - [[nodiscard]] bool IsRegionRegistered(VAddr addr, size_t size); - - /// Return true when a CPU region is modified from the CPU - [[nodiscard]] bool IsRegionCpuModified(VAddr addr, size_t size); - - void SetDrawIndirect( - const Tegra::Engines::DrawManager::IndirectParams* current_draw_indirect_) { - current_draw_indirect = current_draw_indirect_; - } - - [[nodiscard]] std::pair GetDrawIndirectCount(); - - [[nodiscard]] std::pair GetDrawIndirectBuffer(); - - std::recursive_mutex mutex; - Runtime& runtime; - -private: - template - static void ForEachEnabledBit(u32 enabled_mask, Func&& func) { - for (u32 index = 0; enabled_mask != 0; ++index, enabled_mask >>= 1) { - const int disabled_bits = std::countr_zero(enabled_mask); - index += disabled_bits; - enabled_mask >>= disabled_bits; - func(index); - } - } - - template - void ForEachBufferInRange(VAddr cpu_addr, u64 size, Func&& func) { - const u64 page_end = Common::DivCeil(cpu_addr + size, YUZU_PAGESIZE); - for (u64 page = cpu_addr >> YUZU_PAGEBITS; page < page_end;) { - const BufferId buffer_id = page_table[page]; - if (!buffer_id) { - ++page; - continue; - } - Buffer& buffer = slot_buffers[buffer_id]; - func(buffer_id, buffer); - - const VAddr end_addr = buffer.CpuAddr() + buffer.SizeBytes(); - page = Common::DivCeil(end_addr, YUZU_PAGESIZE); - } - } - - template - void ForEachWrittenRange(VAddr cpu_addr, u64 size, Func&& func) { - const VAddr start_address = cpu_addr; - const VAddr end_address = start_address + size; - const VAddr search_base = - static_cast(std::min(0LL, static_cast(start_address - size))); - const IntervalType search_interval{search_base, search_base + 1}; - auto it = common_ranges.lower_bound(search_interval); - if (it == common_ranges.end()) { - it = common_ranges.begin(); - } - for (; it != common_ranges.end(); it++) { - VAddr inter_addr_end = it->upper(); - VAddr inter_addr = it->lower(); - if (inter_addr >= end_address) { - break; - } - if (inter_addr_end <= start_address) { - continue; - } - if (inter_addr_end > end_address) { - inter_addr_end = end_address; - } - if (inter_addr < start_address) { - inter_addr = start_address; - } - func(inter_addr, inter_addr_end); - } - } - - static bool IsRangeGranular(VAddr cpu_addr, size_t size) { - return (cpu_addr & ~Core::Memory::YUZU_PAGEMASK) == - ((cpu_addr + size) & ~Core::Memory::YUZU_PAGEMASK); - } - - void RunGarbageCollector(); - - void BindHostIndexBuffer(); - - void BindHostVertexBuffers(); - - void BindHostDrawIndirectBuffers(); - - void BindHostGraphicsUniformBuffers(size_t stage); - - void BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32 binding_index, bool needs_bind); - - void BindHostGraphicsStorageBuffers(size_t stage); - - void BindHostGraphicsTextureBuffers(size_t stage); - - void BindHostTransformFeedbackBuffers(); - - void BindHostComputeUniformBuffers(); - - void BindHostComputeStorageBuffers(); - - void BindHostComputeTextureBuffers(); - - void DoUpdateGraphicsBuffers(bool is_indexed); - - void DoUpdateComputeBuffers(); - - void UpdateIndexBuffer(); - - void UpdateVertexBuffers(); - - void UpdateVertexBuffer(u32 index); - - void UpdateDrawIndirect(); - - void UpdateUniformBuffers(size_t stage); - - void UpdateStorageBuffers(size_t stage); - - void UpdateTextureBuffers(size_t stage); - - void UpdateTransformFeedbackBuffers(); - - void UpdateTransformFeedbackBuffer(u32 index); - - void UpdateComputeUniformBuffers(); - - void UpdateComputeStorageBuffers(); - - void UpdateComputeTextureBuffers(); - - void MarkWrittenBuffer(BufferId buffer_id, VAddr cpu_addr, u32 size); - - [[nodiscard]] BufferId FindBuffer(VAddr cpu_addr, u32 size); - - [[nodiscard]] OverlapResult ResolveOverlaps(VAddr cpu_addr, u32 wanted_size); - - void JoinOverlap(BufferId new_buffer_id, BufferId overlap_id, bool accumulate_stream_score); - - [[nodiscard]] BufferId CreateBuffer(VAddr cpu_addr, u32 wanted_size); - - void Register(BufferId buffer_id); - - void Unregister(BufferId buffer_id); - - template - void ChangeRegister(BufferId buffer_id); - - void TouchBuffer(Buffer& buffer, BufferId buffer_id) noexcept; - - bool SynchronizeBuffer(Buffer& buffer, VAddr cpu_addr, u32 size); - - bool SynchronizeBufferImpl(Buffer& buffer, VAddr cpu_addr, u32 size); - - void UploadMemory(Buffer& buffer, u64 total_size_bytes, u64 largest_copy, - std::span copies); - - void ImmediateUploadMemory(Buffer& buffer, u64 largest_copy, - std::span copies); - - void MappedUploadMemory(Buffer& buffer, u64 total_size_bytes, std::span copies); - - void DownloadBufferMemory(Buffer& buffer_id); - - void DownloadBufferMemory(Buffer& buffer_id, VAddr cpu_addr, u64 size); - - void DeleteBuffer(BufferId buffer_id); - - void NotifyBufferDeletion(); - - [[nodiscard]] Binding StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index, - bool is_written = false) const; - - [[nodiscard]] TextureBufferBinding GetTextureBufferBinding(GPUVAddr gpu_addr, u32 size, - PixelFormat format); - - [[nodiscard]] std::span ImmediateBufferWithData(VAddr cpu_addr, size_t size); - - [[nodiscard]] std::span ImmediateBuffer(size_t wanted_capacity); - - [[nodiscard]] bool HasFastUniformBufferBound(size_t stage, u32 binding_index) const noexcept; - - void ClearDownload(IntervalType subtract_interval); - - VideoCore::RasterizerInterface& rasterizer; - Core::Memory::Memory& cpu_memory; - - SlotVector slot_buffers; - DelayedDestructionRing delayed_destruction_ring; - - const Tegra::Engines::DrawManager::IndirectParams* current_draw_indirect{}; - - u32 last_index_count = 0; - - Binding index_buffer; - std::array vertex_buffers; - std::array, NUM_STAGES> uniform_buffers; - std::array, NUM_STAGES> storage_buffers; - std::array, NUM_STAGES> texture_buffers; - std::array transform_feedback_buffers; - Binding count_buffer_binding; - Binding indirect_buffer_binding; - - std::array compute_uniform_buffers; - std::array compute_storage_buffers; - std::array compute_texture_buffers; - - std::array enabled_uniform_buffer_masks{}; - u32 enabled_compute_uniform_buffer_mask = 0; - - const UniformBufferSizes* uniform_buffer_sizes{}; - const ComputeUniformBufferSizes* compute_uniform_buffer_sizes{}; - - std::array enabled_storage_buffers{}; - std::array written_storage_buffers{}; - u32 enabled_compute_storage_buffers = 0; - u32 written_compute_storage_buffers = 0; - - std::array enabled_texture_buffers{}; - std::array written_texture_buffers{}; - std::array image_texture_buffers{}; - u32 enabled_compute_texture_buffers = 0; - u32 written_compute_texture_buffers = 0; - u32 image_compute_texture_buffers = 0; - - std::array uniform_cache_hits{}; - std::array uniform_cache_shots{}; - - u32 uniform_buffer_skip_cache_size = DEFAULT_SKIP_CACHE_SIZE; - - bool has_deleted_buffers = false; - - std::conditional_t, Empty> - dirty_uniform_buffers{}; - std::conditional_t, Empty> fast_bound_uniform_buffers{}; - std::conditional_t, NUM_STAGES>, Empty> - uniform_buffer_binding_sizes{}; - - std::vector cached_write_buffer_ids; - - IntervalSet uncommitted_ranges; - IntervalSet common_ranges; - std::deque committed_ranges; - - Common::ScratchBuffer immediate_buffer_alloc; - - struct LRUItemParams { - using ObjectType = BufferId; - using TickType = u64; - }; - Common::LeastRecentlyUsedCache lru_cache; - u64 frame_tick = 0; - u64 total_used_memory = 0; - u64 minimum_memory = 0; - u64 critical_memory = 0; - - std::array> YUZU_PAGEBITS)> page_table; -}; - template BufferCache

::BufferCache(VideoCore::RasterizerInterface& rasterizer_, Core::Memory::Memory& cpu_memory_, Runtime& runtime_) - : runtime{runtime_}, rasterizer{rasterizer_}, cpu_memory{cpu_memory_} { + : runtime{runtime_}, rasterizer{rasterizer_}, cpu_memory{cpu_memory_}, memory_tracker{ + rasterizer} { // Ensure the first slot is used for the null buffer void(slot_buffers.insert(runtime, NullBufferParams{})); common_ranges.clear(); @@ -547,19 +86,18 @@ void BufferCache

::TickFrame() { template void BufferCache

::WriteMemory(VAddr cpu_addr, u64 size) { - ForEachBufferInRange(cpu_addr, size, [&](BufferId, Buffer& buffer) { - buffer.MarkRegionAsCpuModified(cpu_addr, size); - }); + memory_tracker.MarkRegionAsCpuModified(cpu_addr, size); + const IntervalType subtract_interval{cpu_addr, cpu_addr + size}; + ClearDownload(subtract_interval); + common_ranges.subtract(subtract_interval); } template void BufferCache

::CachedWriteMemory(VAddr cpu_addr, u64 size) { - ForEachBufferInRange(cpu_addr, size, [&](BufferId buffer_id, Buffer& buffer) { - if (!buffer.HasCachedWrites()) { - cached_write_buffer_ids.push_back(buffer_id); - } - buffer.CachedCpuWrite(cpu_addr, size); - }); + memory_tracker.CachedCpuWrite(cpu_addr, size); + const IntervalType add_interval{Common::AlignDown(cpu_addr, YUZU_PAGESIZE), + Common::AlignUp(cpu_addr + size, YUZU_PAGESIZE)}; + cached_ranges.add(add_interval); } template @@ -572,6 +110,9 @@ void BufferCache

::DownloadMemory(VAddr cpu_addr, u64 size) { template void BufferCache

::ClearDownload(IntervalType subtract_interval) { uncommitted_ranges.subtract(subtract_interval); + for (auto& interval_set : async_downloads) { + interval_set.subtract(subtract_interval); + } for (auto& interval_set : committed_ranges) { interval_set.subtract(subtract_interval); } @@ -611,15 +152,19 @@ bool BufferCache

::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am }}; boost::container::small_vector tmp_intervals; + const bool is_high_accuracy = + Settings::values.gpu_accuracy.GetValue() == Settings::GPUAccuracy::High; auto mirror = [&](VAddr base_address, VAddr base_address_end) { const u64 size = base_address_end - base_address; const VAddr diff = base_address - *cpu_src_address; const VAddr new_base_address = *cpu_dest_address + diff; const IntervalType add_interval{new_base_address, new_base_address + size}; - uncommitted_ranges.add(add_interval); tmp_intervals.push_back(add_interval); + if (is_high_accuracy) { + uncommitted_ranges.add(add_interval); + } }; - ForEachWrittenRange(*cpu_src_address, amount, mirror); + ForEachInRangeSet(common_ranges, *cpu_src_address, amount, mirror); // This subtraction in this order is important for overlapping copies. common_ranges.subtract(subtract_interval); const bool has_new_downloads = tmp_intervals.size() != 0; @@ -628,7 +173,7 @@ bool BufferCache

::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am } runtime.CopyBuffer(dest_buffer, src_buffer, copies); if (has_new_downloads) { - dest_buffer.MarkRegionAsGpuModified(*cpu_dest_address, amount); + memory_tracker.MarkRegionAsGpuModified(*cpu_dest_address, amount); } std::vector tmp_buffer(amount); cpu_memory.ReadBlockUnsafe(*cpu_src_address, tmp_buffer.data(), amount); @@ -866,23 +411,24 @@ void BufferCache

::BindComputeTextureBuffer(size_t tbo_index, GPUVAddr gpu_add template void BufferCache

::FlushCachedWrites() { - for (const BufferId buffer_id : cached_write_buffer_ids) { - slot_buffers[buffer_id].FlushCachedWrites(); - } cached_write_buffer_ids.clear(); + memory_tracker.FlushCachedWrites(); + /*for (auto& interval : cached_ranges) { + VAddr cpu_addr = interval.lower(); + const std::size_t size = interval.upper() - interval.lower(); + memory_tracker.FlushCachedWrites(cpu_addr, size); + // common_ranges.subtract(interval); + }*/ + cached_ranges.clear(); } template bool BufferCache

::HasUncommittedFlushes() const noexcept { - return !uncommitted_ranges.empty() || !committed_ranges.empty(); + return !uncommitted_ranges.empty() || !committed_ranges.empty() || !pending_queries.empty(); } template void BufferCache

::AccumulateFlushes() { - if (Settings::values.gpu_accuracy.GetValue() != Settings::GPUAccuracy::High) { - uncommitted_ranges.clear(); - return; - } if (uncommitted_ranges.empty()) { return; } @@ -891,7 +437,8 @@ void BufferCache

::AccumulateFlushes() { template bool BufferCache

::ShouldWaitAsyncFlushes() const noexcept { - return false; + return (!async_buffers.empty() && async_buffers.front().has_value()) || + (!query_async_buffers.empty() && query_async_buffers.front().has_value()); } template @@ -899,11 +446,10 @@ void BufferCache

::CommitAsyncFlushesHigh() { AccumulateFlushes(); if (committed_ranges.empty()) { + async_buffers.emplace_back(std::optional{}); return; } MICROPROFILE_SCOPE(GPU_DownloadMemory); - const bool is_accuracy_normal = - Settings::values.gpu_accuracy.GetValue() == Settings::GPUAccuracy::Normal; auto it = committed_ranges.begin(); while (it != committed_ranges.end()) { @@ -926,11 +472,12 @@ void BufferCache

::CommitAsyncFlushesHigh() { const std::size_t size = interval.upper() - interval.lower(); const VAddr cpu_addr = interval.lower(); ForEachBufferInRange(cpu_addr, size, [&](BufferId buffer_id, Buffer& buffer) { - buffer.ForEachDownloadRangeAndClear( - cpu_addr, size, [&](u64 range_offset, u64 range_size) { - if (is_accuracy_normal) { - return; - } + const VAddr buffer_start = buffer.CpuAddr(); + const VAddr buffer_end = buffer_start + buffer.SizeBytes(); + const VAddr new_start = std::max(buffer_start, cpu_addr); + const VAddr new_end = std::min(buffer_end, cpu_addr + size); + memory_tracker.ForEachDownloadRange( + new_start, new_end - new_start, false, [&](u64 cpu_addr_out, u64 range_size) { const VAddr buffer_addr = buffer.CpuAddr(); const auto add_download = [&](VAddr start, VAddr end) { const u64 new_offset = start - buffer_addr; @@ -950,38 +497,36 @@ void BufferCache

::CommitAsyncFlushesHigh() { largest_copy = std::max(largest_copy, new_size); }; - const VAddr start_address = buffer_addr + range_offset; - const VAddr end_address = start_address + range_size; - ForEachWrittenRange(start_address, range_size, add_download); - const IntervalType subtract_interval{start_address, end_address}; - common_ranges.subtract(subtract_interval); + ForEachInRangeSet(common_ranges, cpu_addr_out, range_size, add_download); }); }); } } committed_ranges.clear(); if (downloads.empty()) { + async_buffers.emplace_back(std::optional{}); return; } - if constexpr (USE_MEMORY_MAPS) { - auto download_staging = runtime.DownloadStagingBuffer(total_size_bytes); + if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + auto download_staging = runtime.DownloadStagingBuffer(total_size_bytes, true); + boost::container::small_vector normalized_copies; + IntervalSet new_async_range{}; runtime.PreCopyBarrier(); for (auto& [copy, buffer_id] : downloads) { - // Have in mind the staging buffer offset for the copy copy.dst_offset += download_staging.offset; const std::array copies{copy}; - runtime.CopyBuffer(download_staging.buffer, slot_buffers[buffer_id], copies, false); - } - runtime.PostCopyBarrier(); - runtime.Finish(); - for (const auto& [copy, buffer_id] : downloads) { - const Buffer& buffer = slot_buffers[buffer_id]; - const VAddr cpu_addr = buffer.CpuAddr() + copy.src_offset; - // Undo the modified offset - const u64 dst_offset = copy.dst_offset - download_staging.offset; - const u8* read_mapped_memory = download_staging.mapped_span.data() + dst_offset; - cpu_memory.WriteBlockUnsafe(cpu_addr, read_mapped_memory, copy.size); + BufferCopy second_copy{copy}; + Buffer& buffer = slot_buffers[buffer_id]; + second_copy.src_offset = static_cast(buffer.CpuAddr()) + copy.src_offset; + VAddr orig_cpu_addr = static_cast(second_copy.src_offset); + const IntervalType base_interval{orig_cpu_addr, orig_cpu_addr + copy.size}; + new_async_range.add(base_interval); + runtime.CopyBuffer(download_staging.buffer, buffer, copies, false); + normalized_copies.push_back(second_copy); } + async_downloads.emplace_back(std::move(new_async_range)); + pending_downloads.emplace_back(std::move(normalized_copies)); + async_buffers.emplace_back(download_staging); } else { const std::span immediate_buffer = ImmediateBuffer(largest_copy); for (const auto& [copy, buffer_id] : downloads) { @@ -994,42 +539,154 @@ void BufferCache

::CommitAsyncFlushesHigh() { } template -void BufferCache

::CommitAsyncFlushes() { - if (Settings::values.gpu_accuracy.GetValue() == Settings::GPUAccuracy::High) { - CommitAsyncFlushesHigh(); +void BufferCache

::CommitAsyncQueries() { + if (pending_queries.empty()) { + query_async_buffers.emplace_back(std::optional{}); + return; + } + + MICROPROFILE_SCOPE(GPU_DownloadMemory); + boost::container::small_vector, 8> downloads; + u64 total_size_bytes = 0; + u64 largest_copy = 0; + do { + has_deleted_buffers = false; + downloads.clear(); + total_size_bytes = 0; + largest_copy = 0; + for (const auto& query_info : pending_queries) { + const std::size_t size = query_info.second; + const VAddr cpu_addr = query_info.first; + const BufferId buffer_id = FindBuffer(cpu_addr, static_cast(size)); + Buffer& buffer = slot_buffers[buffer_id]; + if (has_deleted_buffers) { + break; + } + downloads.push_back({ + BufferCopy{ + .src_offset = buffer.Offset(cpu_addr), + .dst_offset = total_size_bytes, + .size = size, + }, + buffer_id, + }); + constexpr u64 align = 8ULL; + constexpr u64 mask = ~(align - 1ULL); + total_size_bytes += (size + align - 1) & mask; + largest_copy = std::max(largest_copy, size); + } + } while (has_deleted_buffers); + pending_queries.clear(); + if (downloads.empty()) { + query_async_buffers.push_back(std::optional{}); + return; + } + if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + auto download_staging = runtime.DownloadStagingBuffer(total_size_bytes, true); + boost::container::small_vector normalized_copies; + runtime.PreCopyBarrier(); + for (auto& [copy, buffer_id] : downloads) { + // Have in mind the staging buffer offset for the copy + copy.dst_offset += download_staging.offset; + const std::array copies{copy}; + const Buffer& buffer = slot_buffers[buffer_id]; + BufferCopy second_copy{copy}; + second_copy.src_offset = static_cast(buffer.CpuAddr()) + second_copy.src_offset; + runtime.CopyBuffer(download_staging.buffer, buffer, copies, false); + normalized_copies.push_back(second_copy); + } + committed_queries.emplace_back(std::move(normalized_copies)); + query_async_buffers.emplace_back(download_staging); } else { - uncommitted_ranges.clear(); - committed_ranges.clear(); + query_async_buffers.push_back(std::optional{}); } } template -void BufferCache

::PopAsyncFlushes() {} +void BufferCache

::CommitAsyncFlushes() { + CommitAsyncFlushesHigh(); + CommitAsyncQueries(); +} + +template +void BufferCache

::PopAsyncFlushes() { + MICROPROFILE_SCOPE(GPU_DownloadMemory); + PopAsyncBuffers(); + PopAsyncQueries(); +} + +template +void BufferCache

::PopAsyncBuffers() { + if (async_buffers.empty()) { + return; + } + if (!async_buffers.front().has_value()) { + async_buffers.pop_front(); + return; + } + if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + auto& downloads = pending_downloads.front(); + auto& async_buffer = async_buffers.front(); + auto& async_range = async_downloads.front(); + u8* base = async_buffer->mapped_span.data(); + const size_t base_offset = async_buffer->offset; + for (const auto& copy : downloads) { + const VAddr cpu_addr = static_cast(copy.src_offset); + const u64 dst_offset = copy.dst_offset - base_offset; + const u8* read_mapped_memory = base + dst_offset; + ForEachInRangeSet(async_range, cpu_addr, copy.size, [&](VAddr start, VAddr end) { + const size_t diff = start - cpu_addr; + const size_t new_size = end - start; + cpu_memory.WriteBlockUnsafe(start, &read_mapped_memory[diff], new_size); + const IntervalType base_interval{start, end}; + common_ranges.subtract(base_interval); + }); + } + runtime.FreeDeferredStagingBuffer(*async_buffer); + async_buffers.pop_front(); + pending_downloads.pop_front(); + async_downloads.pop_front(); + } +} + +template +void BufferCache

::PopAsyncQueries() { + if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + if (query_async_buffers.empty()) { + return; + } + if (!query_async_buffers.front().has_value()) { + query_async_buffers.pop_front(); + return; + } + auto& downloads = committed_queries.front(); + auto& async_buffer = query_async_buffers.front(); + flushed_queries.clear(); + u8* base = async_buffer->mapped_span.data(); + const size_t base_offset = async_buffer->offset; + for (const auto& copy : downloads) { + const size_t dst_offset = copy.dst_offset - base_offset; + const u8* read_mapped_memory = base + dst_offset; + u64 new_value{}; + std::memcpy(&new_value, read_mapped_memory, copy.size); + flushed_queries.push_back(new_value); + } + runtime.FreeDeferredStagingBuffer(*async_buffer); + committed_queries.pop_front(); + query_async_buffers.pop_front(); + } +} template bool BufferCache

::IsRegionGpuModified(VAddr addr, size_t size) { - const u64 page_end = Common::DivCeil(addr + size, YUZU_PAGESIZE); - for (u64 page = addr >> YUZU_PAGEBITS; page < page_end;) { - const BufferId image_id = page_table[page]; - if (!image_id) { - ++page; - continue; - } - Buffer& buffer = slot_buffers[image_id]; - if (buffer.IsRegionGpuModified(addr, size)) { - return true; - } - const VAddr end_addr = buffer.CpuAddr() + buffer.SizeBytes(); - page = Common::DivCeil(end_addr, YUZU_PAGESIZE); - } - return false; + return memory_tracker.IsRegionGpuModified(addr, size); } template bool BufferCache

::IsRegionRegistered(VAddr addr, size_t size) { const VAddr end_addr = addr + size; - const u64 page_end = Common::DivCeil(end_addr, YUZU_PAGESIZE); - for (u64 page = addr >> YUZU_PAGEBITS; page < page_end;) { + const u64 page_end = Common::DivCeil(end_addr, PAGE_SIZE); + for (u64 page = addr >> PAGE_BITS; page < page_end;) { const BufferId buffer_id = page_table[page]; if (!buffer_id) { ++page; @@ -1041,28 +698,14 @@ bool BufferCache

::IsRegionRegistered(VAddr addr, size_t size) { if (buf_start_addr < end_addr && addr < buf_end_addr) { return true; } - page = Common::DivCeil(end_addr, YUZU_PAGESIZE); + page = Common::DivCeil(end_addr, PAGE_SIZE); } return false; } template bool BufferCache

::IsRegionCpuModified(VAddr addr, size_t size) { - const u64 page_end = Common::DivCeil(addr + size, YUZU_PAGESIZE); - for (u64 page = addr >> YUZU_PAGEBITS; page < page_end;) { - const BufferId image_id = page_table[page]; - if (!image_id) { - ++page; - continue; - } - Buffer& buffer = slot_buffers[image_id]; - if (buffer.IsRegionCpuModified(addr, size)) { - return true; - } - const VAddr end_addr = buffer.CpuAddr() + buffer.SizeBytes(); - page = Common::DivCeil(end_addr, YUZU_PAGESIZE); - } - return false; + return memory_tracker.IsRegionCpuModified(addr, size); } template @@ -1155,7 +798,7 @@ void BufferCache

::BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32 TouchBuffer(buffer, binding.buffer_id); const bool use_fast_buffer = binding.buffer_id != NULL_BUFFER_ID && size <= uniform_buffer_skip_cache_size && - !buffer.IsRegionGpuModified(cpu_addr, size); + !memory_tracker.IsRegionGpuModified(cpu_addr, size); if (use_fast_buffer) { if constexpr (IS_OPENGL) { if (runtime.HasFastBufferSubData()) { @@ -1378,27 +1021,28 @@ void BufferCache

::UpdateIndexBuffer() { // We have to check for the dirty flags and index count // The index count is currently changed without updating the dirty flags const auto& draw_state = maxwell3d->draw_manager->GetDrawState(); - const auto& index_array = draw_state.index_buffer; + const auto& index_buffer_ref = draw_state.index_buffer; auto& flags = maxwell3d->dirty.flags; if (!flags[Dirty::IndexBuffer]) { return; } flags[Dirty::IndexBuffer] = false; - last_index_count = index_array.count; if (!draw_state.inline_index_draw_indexes.empty()) { auto inline_index_size = static_cast(draw_state.inline_index_draw_indexes.size()); index_buffer = Binding{ .cpu_addr = 0, .size = inline_index_size, - .buffer_id = CreateBuffer(0, inline_index_size), + .buffer_id = FindBuffer(0, inline_index_size), }; return; } - const GPUVAddr gpu_addr_begin = index_array.StartAddress(); - const GPUVAddr gpu_addr_end = index_array.EndAddress(); + + const GPUVAddr gpu_addr_begin = index_buffer_ref.StartAddress(); + const GPUVAddr gpu_addr_end = index_buffer_ref.EndAddress(); const std::optional cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr_begin); const u32 address_size = static_cast(gpu_addr_end - gpu_addr_begin); - const u32 draw_size = (index_array.count + index_array.first) * index_array.FormatSizeInBytes(); + const u32 draw_size = + (index_buffer_ref.count + index_buffer_ref.first) * index_buffer_ref.FormatSizeInBytes(); const u32 size = std::min(address_size, draw_size); if (size == 0 || !cpu_addr) { index_buffer = NULL_BINDING; @@ -1434,17 +1078,15 @@ void BufferCache

::UpdateVertexBuffer(u32 index) { const GPUVAddr gpu_addr_begin = array.Address(); const GPUVAddr gpu_addr_end = limit.Address() + 1; const std::optional cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr_begin); - u32 address_size = static_cast( - std::min(gpu_addr_end - gpu_addr_begin, static_cast(std::numeric_limits::max()))); - if (array.enable == 0 || address_size == 0 || !cpu_addr) { + const u32 address_size = static_cast(gpu_addr_end - gpu_addr_begin); + u32 size = address_size; // TODO: Analyze stride and number of vertices + if (array.enable == 0 || size == 0 || !cpu_addr) { vertex_buffers[index] = NULL_BINDING; return; } if (!gpu_memory->IsWithinGPUAddressRange(gpu_addr_end)) { - address_size = - static_cast(gpu_memory->MaxContinuousRange(gpu_addr_begin, address_size)); + size = static_cast(gpu_memory->MaxContinuousRange(gpu_addr_begin, size)); } - const u32 size = address_size; // TODO: Analyze stride and number of vertices vertex_buffers[index] = Binding{ .cpu_addr = *cpu_addr, .size = size, @@ -1590,18 +1232,17 @@ void BufferCache

::UpdateComputeTextureBuffers() { } template -void BufferCache

::MarkWrittenBuffer(BufferId buffer_id, VAddr cpu_addr, u32 size) { - Buffer& buffer = slot_buffers[buffer_id]; - buffer.MarkRegionAsGpuModified(cpu_addr, size); +void BufferCache

::MarkWrittenBuffer(BufferId, VAddr cpu_addr, u32 size) { + memory_tracker.MarkRegionAsGpuModified(cpu_addr, size); const IntervalType base_interval{cpu_addr, cpu_addr + size}; common_ranges.add(base_interval); - - const bool is_async = Settings::values.use_asynchronous_gpu_emulation.GetValue(); - if (!is_async) { - return; + for (auto& interval_set : async_downloads) { + interval_set.subtract(base_interval); + } + if (Settings::values.gpu_accuracy.GetValue() == Settings::GPUAccuracy::High) { + uncommitted_ranges.add(base_interval); } - uncommitted_ranges.add(base_interval); } template @@ -1609,7 +1250,7 @@ BufferId BufferCache

::FindBuffer(VAddr cpu_addr, u32 size) { if (cpu_addr == 0) { return NULL_BUFFER_ID; } - const u64 page = cpu_addr >> YUZU_PAGEBITS; + const u64 page = cpu_addr >> PAGE_BITS; const BufferId buffer_id = page_table[page]; if (!buffer_id) { return CreateBuffer(cpu_addr, size); @@ -1638,9 +1279,8 @@ typename BufferCache

::OverlapResult BufferCache

::ResolveOverlaps(VAddr cpu .has_stream_leap = has_stream_leap, }; } - for (; cpu_addr >> YUZU_PAGEBITS < Common::DivCeil(end, YUZU_PAGESIZE); - cpu_addr += YUZU_PAGESIZE) { - const BufferId overlap_id = page_table[cpu_addr >> YUZU_PAGEBITS]; + for (; cpu_addr >> PAGE_BITS < Common::DivCeil(end, PAGE_SIZE); cpu_addr += PAGE_SIZE) { + const BufferId overlap_id = page_table[cpu_addr >> PAGE_BITS]; if (!overlap_id) { continue; } @@ -1666,11 +1306,11 @@ typename BufferCache

::OverlapResult BufferCache

::ResolveOverlaps(VAddr cpu // as a stream buffer. Increase the size to skip constantly recreating buffers. has_stream_leap = true; if (expands_right) { - begin -= YUZU_PAGESIZE * 256; + begin -= PAGE_SIZE * 256; cpu_addr = begin; } if (expands_left) { - end += YUZU_PAGESIZE * 256; + end += PAGE_SIZE * 256; } } } @@ -1690,21 +1330,15 @@ void BufferCache

::JoinOverlap(BufferId new_buffer_id, BufferId overlap_id, if (accumulate_stream_score) { new_buffer.IncreaseStreamScore(overlap.StreamScore() + 1); } - std::vector copies; + boost::container::small_vector copies; const size_t dst_base_offset = overlap.CpuAddr() - new_buffer.CpuAddr(); - overlap.ForEachDownloadRange([&](u64 begin, u64 range_size) { - copies.push_back(BufferCopy{ - .src_offset = begin, - .dst_offset = dst_base_offset + begin, - .size = range_size, - }); - new_buffer.UnmarkRegionAsCpuModified(begin, range_size); - new_buffer.MarkRegionAsGpuModified(begin, range_size); + copies.push_back(BufferCopy{ + .src_offset = 0, + .dst_offset = dst_base_offset, + .size = overlap.SizeBytes(), }); - if (!copies.empty()) { - runtime.CopyBuffer(slot_buffers[new_buffer_id], overlap, copies); - } - DeleteBuffer(overlap_id); + runtime.CopyBuffer(new_buffer, overlap, copies); + DeleteBuffer(overlap_id, true); } template @@ -1718,7 +1352,7 @@ BufferId BufferCache

::CreateBuffer(VAddr cpu_addr, u32 wanted_size) { JoinOverlap(new_buffer_id, overlap_id, !overlap.has_stream_leap); } Register(new_buffer_id); - TouchBuffer(slot_buffers[new_buffer_id], new_buffer_id); + TouchBuffer(new_buffer, new_buffer_id); return new_buffer_id; } @@ -1746,8 +1380,8 @@ void BufferCache

::ChangeRegister(BufferId buffer_id) { } const VAddr cpu_addr_begin = buffer.CpuAddr(); const VAddr cpu_addr_end = cpu_addr_begin + size; - const u64 page_begin = cpu_addr_begin / YUZU_PAGESIZE; - const u64 page_end = Common::DivCeil(cpu_addr_end, YUZU_PAGESIZE); + const u64 page_begin = cpu_addr_begin / PAGE_SIZE; + const u64 page_end = Common::DivCeil(cpu_addr_end, PAGE_SIZE); for (u64 page = page_begin; page != page_end; ++page) { if constexpr (insert) { page_table[page] = buffer_id; @@ -1766,9 +1400,6 @@ void BufferCache

::TouchBuffer(Buffer& buffer, BufferId buffer_id) noexcept { template bool BufferCache

::SynchronizeBuffer(Buffer& buffer, VAddr cpu_addr, u32 size) { - if (buffer.CpuAddr() == 0) { - return true; - } return SynchronizeBufferImpl(buffer, cpu_addr, size); } @@ -1777,10 +1408,11 @@ bool BufferCache

::SynchronizeBufferImpl(Buffer& buffer, VAddr cpu_addr, u32 s boost::container::small_vector copies; u64 total_size_bytes = 0; u64 largest_copy = 0; - buffer.ForEachUploadRange(cpu_addr, size, [&](u64 range_offset, u64 range_size) { + VAddr buffer_start = buffer.CpuAddr(); + memory_tracker.ForEachUploadRange(cpu_addr, size, [&](u64 cpu_addr_out, u64 range_size) { copies.push_back(BufferCopy{ .src_offset = total_size_bytes, - .dst_offset = range_offset, + .dst_offset = cpu_addr_out - buffer_start, .size = range_size, }); total_size_bytes += range_size; @@ -1794,6 +1426,51 @@ bool BufferCache

::SynchronizeBufferImpl(Buffer& buffer, VAddr cpu_addr, u32 s return false; } +template +bool BufferCache

::SynchronizeBufferNoModified(Buffer& buffer, VAddr cpu_addr, u32 size) { + boost::container::small_vector copies; + u64 total_size_bytes = 0; + u64 largest_copy = 0; + IntervalSet found_sets{}; + auto make_copies = [&] { + for (auto& interval : found_sets) { + const std::size_t sub_size = interval.upper() - interval.lower(); + const VAddr cpu_addr = interval.lower(); + copies.push_back(BufferCopy{ + .src_offset = total_size_bytes, + .dst_offset = cpu_addr - buffer.CpuAddr(), + .size = sub_size, + }); + total_size_bytes += sub_size; + largest_copy = std::max(largest_copy, sub_size); + } + const std::span copies_span(copies.data(), copies.size()); + UploadMemory(buffer, total_size_bytes, largest_copy, copies_span); + }; + memory_tracker.ForEachUploadRange(cpu_addr, size, [&](u64 cpu_addr_out, u64 range_size) { + const VAddr base_adr = cpu_addr_out; + const VAddr end_adr = base_adr + range_size; + const IntervalType add_interval{base_adr, end_adr}; + found_sets.add(add_interval); + }); + if (found_sets.empty()) { + return true; + } + const IntervalType search_interval{cpu_addr, cpu_addr + size}; + auto it = common_ranges.lower_bound(search_interval); + auto it_end = common_ranges.upper_bound(search_interval); + if (it == common_ranges.end()) { + make_copies(); + return false; + } + while (it != it_end) { + found_sets.subtract(*it); + it++; + } + make_copies(); + return false; +} + template void BufferCache

::UploadMemory(Buffer& buffer, u64 total_size_bytes, u64 largest_copy, std::span copies) { @@ -1805,39 +1482,45 @@ void BufferCache

::UploadMemory(Buffer& buffer, u64 total_size_bytes, u64 larg } template -void BufferCache

::ImmediateUploadMemory(Buffer& buffer, u64 largest_copy, - std::span copies) { - std::span immediate_buffer; - for (const BufferCopy& copy : copies) { - std::span upload_span; - const VAddr cpu_addr = buffer.CpuAddr() + copy.dst_offset; - if (IsRangeGranular(cpu_addr, copy.size)) { - upload_span = std::span(cpu_memory.GetPointer(cpu_addr), copy.size); - } else { - if (immediate_buffer.empty()) { - immediate_buffer = ImmediateBuffer(largest_copy); +void BufferCache

::ImmediateUploadMemory([[maybe_unused]] Buffer& buffer, + [[maybe_unused]] u64 largest_copy, + [[maybe_unused]] std::span copies) { + if constexpr (!USE_MEMORY_MAPS) { + std::span immediate_buffer; + for (const BufferCopy& copy : copies) { + std::span upload_span; + const VAddr cpu_addr = buffer.CpuAddr() + copy.dst_offset; + if (IsRangeGranular(cpu_addr, copy.size)) { + upload_span = std::span(cpu_memory.GetPointer(cpu_addr), copy.size); + } else { + if (immediate_buffer.empty()) { + immediate_buffer = ImmediateBuffer(largest_copy); + } + cpu_memory.ReadBlockUnsafe(cpu_addr, immediate_buffer.data(), copy.size); + upload_span = immediate_buffer.subspan(0, copy.size); } - cpu_memory.ReadBlockUnsafe(cpu_addr, immediate_buffer.data(), copy.size); - upload_span = immediate_buffer.subspan(0, copy.size); + buffer.ImmediateUpload(copy.dst_offset, upload_span); } - buffer.ImmediateUpload(copy.dst_offset, upload_span); } } template -void BufferCache

::MappedUploadMemory(Buffer& buffer, u64 total_size_bytes, - std::span copies) { - auto upload_staging = runtime.UploadStagingBuffer(total_size_bytes); - const std::span staging_pointer = upload_staging.mapped_span; - for (BufferCopy& copy : copies) { - u8* const src_pointer = staging_pointer.data() + copy.src_offset; - const VAddr cpu_addr = buffer.CpuAddr() + copy.dst_offset; - cpu_memory.ReadBlockUnsafe(cpu_addr, src_pointer, copy.size); +void BufferCache

::MappedUploadMemory([[maybe_unused]] Buffer& buffer, + [[maybe_unused]] u64 total_size_bytes, + [[maybe_unused]] std::span copies) { + if constexpr (USE_MEMORY_MAPS) { + auto upload_staging = runtime.UploadStagingBuffer(total_size_bytes); + const std::span staging_pointer = upload_staging.mapped_span; + for (BufferCopy& copy : copies) { + u8* const src_pointer = staging_pointer.data() + copy.src_offset; + const VAddr cpu_addr = buffer.CpuAddr() + copy.dst_offset; + cpu_memory.ReadBlockUnsafe(cpu_addr, src_pointer, copy.size); - // Apply the staging offset - copy.src_offset += upload_staging.offset; + // Apply the staging offset + copy.src_offset += upload_staging.offset; + } + runtime.CopyBuffer(buffer, upload_staging.buffer, copies); } - runtime.CopyBuffer(buffer, upload_staging.buffer, copies); } template @@ -1886,30 +1569,31 @@ void BufferCache

::DownloadBufferMemory(Buffer& buffer, VAddr cpu_addr, u64 si boost::container::small_vector copies; u64 total_size_bytes = 0; u64 largest_copy = 0; - buffer.ForEachDownloadRangeAndClear(cpu_addr, size, [&](u64 range_offset, u64 range_size) { - const VAddr buffer_addr = buffer.CpuAddr(); - const auto add_download = [&](VAddr start, VAddr end) { - const u64 new_offset = start - buffer_addr; - const u64 new_size = end - start; - copies.push_back(BufferCopy{ - .src_offset = new_offset, - .dst_offset = total_size_bytes, - .size = new_size, - }); - // Align up to avoid cache conflicts - constexpr u64 align = 256ULL; - constexpr u64 mask = ~(align - 1ULL); - total_size_bytes += (new_size + align - 1) & mask; - largest_copy = std::max(largest_copy, new_size); - }; + memory_tracker.ForEachDownloadRangeAndClear( + cpu_addr, size, [&](u64 cpu_addr_out, u64 range_size) { + const VAddr buffer_addr = buffer.CpuAddr(); + const auto add_download = [&](VAddr start, VAddr end) { + const u64 new_offset = start - buffer_addr; + const u64 new_size = end - start; + copies.push_back(BufferCopy{ + .src_offset = new_offset, + .dst_offset = total_size_bytes, + .size = new_size, + }); + // Align up to avoid cache conflicts + constexpr u64 align = 8ULL; + constexpr u64 mask = ~(align - 1ULL); + total_size_bytes += (new_size + align - 1) & mask; + largest_copy = std::max(largest_copy, new_size); + }; - const VAddr start_address = buffer_addr + range_offset; - const VAddr end_address = start_address + range_size; - ForEachWrittenRange(start_address, range_size, add_download); - const IntervalType subtract_interval{start_address, end_address}; - ClearDownload(subtract_interval); - common_ranges.subtract(subtract_interval); - }); + const VAddr start_address = cpu_addr_out; + const VAddr end_address = start_address + range_size; + ForEachInRangeSet(common_ranges, start_address, range_size, add_download); + const IntervalType subtract_interval{start_address, end_address}; + ClearDownload(subtract_interval); + common_ranges.subtract(subtract_interval); + }); if (total_size_bytes == 0) { return; } @@ -1943,7 +1627,7 @@ void BufferCache

::DownloadBufferMemory(Buffer& buffer, VAddr cpu_addr, u64 si } template -void BufferCache

::DeleteBuffer(BufferId buffer_id) { +void BufferCache

::DeleteBuffer(BufferId buffer_id, bool do_not_mark) { const auto scalar_replace = [buffer_id](Binding& binding) { if (binding.buffer_id == buffer_id) { binding.buffer_id = BufferId{}; @@ -1962,8 +1646,10 @@ void BufferCache

::DeleteBuffer(BufferId buffer_id) { std::erase(cached_write_buffer_ids, buffer_id); // Mark the whole buffer as CPU written to stop tracking CPU writes - Buffer& buffer = slot_buffers[buffer_id]; - buffer.MarkRegionAsCpuModified(buffer.CpuAddr(), buffer.SizeBytes()); + if (!do_not_mark) { + Buffer& buffer = slot_buffers[buffer_id]; + memory_tracker.MarkRegionAsCpuModified(buffer.CpuAddr(), buffer.SizeBytes()); + } Unregister(buffer_id); delayed_destruction_ring.Push(std::move(slot_buffers[buffer_id])); @@ -2011,7 +1697,7 @@ typename BufferCache

::Binding BufferCache

::StorageBufferBinding(GPUVAddr s LOG_WARNING(HW_GPU, "Failed to find storage buffer for cbuf index {}", cbuf_index); return NULL_BINDING; } - const VAddr cpu_end = Common::AlignUp(*cpu_addr + size, Core::Memory::YUZU_PAGESIZE); + const VAddr cpu_end = Common::AlignUp(*cpu_addr + size, YUZU_PAGESIZE); const Binding binding{ .cpu_addr = *cpu_addr, .size = is_written ? size : static_cast(cpu_end - *cpu_addr), diff --git a/src/video_core/buffer_cache/buffer_cache_base.h b/src/video_core/buffer_cache/buffer_cache_base.h new file mode 100644 index 000000000..4b3677da3 --- /dev/null +++ b/src/video_core/buffer_cache/buffer_cache_base.h @@ -0,0 +1,507 @@ +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#define BOOST_NO_MT +#include +#undef BOOST_NO_MT +#include +#include +#include + +#include "common/common_types.h" +#include "common/div_ceil.h" +#include "common/literals.h" +#include "common/lru_cache.h" +#include "common/microprofile.h" +#include "common/scope_exit.h" +#include "common/settings.h" +#include "core/memory.h" +#include "video_core/buffer_cache/buffer_base.h" +#include "video_core/control/channel_state_cache.h" +#include "video_core/delayed_destruction_ring.h" +#include "video_core/dirty_flags.h" +#include "video_core/engines/draw_manager.h" +#include "video_core/engines/kepler_compute.h" +#include "video_core/engines/maxwell_3d.h" +#include "video_core/memory_manager.h" +#include "video_core/rasterizer_interface.h" +#include "video_core/surface.h" +#include "video_core/texture_cache/slot_vector.h" +#include "video_core/texture_cache/types.h" + + +namespace boost { +template +class fast_pool_allocator; +} + +namespace VideoCommon { + +MICROPROFILE_DECLARE(GPU_PrepareBuffers); +MICROPROFILE_DECLARE(GPU_BindUploadBuffers); +MICROPROFILE_DECLARE(GPU_DownloadMemory); + +using BufferId = SlotId; + +using VideoCore::Surface::PixelFormat; +using namespace Common::Literals; + +constexpr u32 NUM_VERTEX_BUFFERS = 32; +constexpr u32 NUM_TRANSFORM_FEEDBACK_BUFFERS = 4; +constexpr u32 NUM_GRAPHICS_UNIFORM_BUFFERS = 18; +constexpr u32 NUM_COMPUTE_UNIFORM_BUFFERS = 8; +constexpr u32 NUM_STORAGE_BUFFERS = 16; +constexpr u32 NUM_TEXTURE_BUFFERS = 16; +constexpr u32 NUM_STAGES = 5; + +using UniformBufferSizes = std::array, NUM_STAGES>; +using ComputeUniformBufferSizes = std::array; + +enum class ObtainBufferSynchronize : u32 { + NoSynchronize = 0, + FullSynchronize = 1, + SynchronizeNoDirty = 2, +}; + +enum class ObtainBufferOperation : u32 { + DoNothing = 0, + MarkAsWritten = 1, + DiscardWrite = 2, + MarkQuery = 3, +}; + +template +class BufferCache : public VideoCommon::ChannelSetupCaches { + // Page size for caching purposes. + // This is unrelated to the CPU page size and it can be changed as it seems optimal. + static constexpr u32 PAGE_BITS = 16; + static constexpr u64 PAGE_SIZE = u64{1} << PAGE_BITS; + static constexpr u32 CPU_PAGE_BITS = 12; + static constexpr u64 CPU_PAGE_SIZE = u64{1} << CPU_PAGE_BITS; + + static constexpr bool IS_OPENGL = P::IS_OPENGL; + static constexpr bool HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS = + P::HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS; + static constexpr bool HAS_FULL_INDEX_AND_PRIMITIVE_SUPPORT = + P::HAS_FULL_INDEX_AND_PRIMITIVE_SUPPORT; + static constexpr bool NEEDS_BIND_UNIFORM_INDEX = P::NEEDS_BIND_UNIFORM_INDEX; + static constexpr bool NEEDS_BIND_STORAGE_INDEX = P::NEEDS_BIND_STORAGE_INDEX; + static constexpr bool USE_MEMORY_MAPS = P::USE_MEMORY_MAPS; + static constexpr bool SEPARATE_IMAGE_BUFFERS_BINDINGS = P::SEPARATE_IMAGE_BUFFER_BINDINGS; + static constexpr bool IMPLEMENTS_ASYNC_DOWNLOADS = P::IMPLEMENTS_ASYNC_DOWNLOADS; + + static constexpr BufferId NULL_BUFFER_ID{0}; + + static constexpr s64 DEFAULT_EXPECTED_MEMORY = 512_MiB; + static constexpr s64 DEFAULT_CRITICAL_MEMORY = 1_GiB; + static constexpr s64 TARGET_THRESHOLD = 4_GiB; + + using Maxwell = Tegra::Engines::Maxwell3D::Regs; + + using Runtime = typename P::Runtime; + using Buffer = typename P::Buffer; + using Async_Buffer = typename P::Async_Buffer; + using MemoryTracker = typename P::MemoryTracker; + + using IntervalCompare = ICL_COMPARE_INSTANCE(ICL_COMPARE_DEFAULT, VAddr); + using IntervalInstance = ICL_INTERVAL_INSTANCE(ICL_INTERVAL_DEFAULT, VAddr, IntervalCompare); + using IntervalAllocator = boost::fast_pool_allocator; + using IntervalSet = + boost::icl::interval_set; + using IntervalType = typename IntervalSet::interval_type; + + struct Empty {}; + + struct OverlapResult { + std::vector ids; + VAddr begin; + VAddr end; + bool has_stream_leap = false; + }; + + struct Binding { + VAddr cpu_addr{}; + u32 size{}; + BufferId buffer_id; + }; + + struct TextureBufferBinding : Binding { + PixelFormat format; + }; + + static constexpr Binding NULL_BINDING{ + .cpu_addr = 0, + .size = 0, + .buffer_id = NULL_BUFFER_ID, + }; + +public: + static constexpr u32 DEFAULT_SKIP_CACHE_SIZE = static_cast(4_KiB); + + explicit BufferCache(VideoCore::RasterizerInterface& rasterizer_, + Core::Memory::Memory& cpu_memory_, Runtime& runtime_); + + void TickFrame(); + + void WriteMemory(VAddr cpu_addr, u64 size); + + void CachedWriteMemory(VAddr cpu_addr, u64 size); + + void DownloadMemory(VAddr cpu_addr, u64 size); + + bool InlineMemory(VAddr dest_address, size_t copy_size, std::span inlined_buffer); + + void BindGraphicsUniformBuffer(size_t stage, u32 index, GPUVAddr gpu_addr, u32 size); + + void DisableGraphicsUniformBuffer(size_t stage, u32 index); + + void UpdateGraphicsBuffers(bool is_indexed); + + void UpdateComputeBuffers(); + + void BindHostGeometryBuffers(bool is_indexed); + + void BindHostStageBuffers(size_t stage); + + void BindHostComputeBuffers(); + + void SetUniformBuffersState(const std::array& mask, + const UniformBufferSizes* sizes); + + void SetComputeUniformBufferState(u32 mask, const ComputeUniformBufferSizes* sizes); + + void UnbindGraphicsStorageBuffers(size_t stage); + + void BindGraphicsStorageBuffer(size_t stage, size_t ssbo_index, u32 cbuf_index, u32 cbuf_offset, + bool is_written); + + void UnbindGraphicsTextureBuffers(size_t stage); + + void BindGraphicsTextureBuffer(size_t stage, size_t tbo_index, GPUVAddr gpu_addr, u32 size, + PixelFormat format, bool is_written, bool is_image); + + void UnbindComputeStorageBuffers(); + + void BindComputeStorageBuffer(size_t ssbo_index, u32 cbuf_index, u32 cbuf_offset, + bool is_written); + + void UnbindComputeTextureBuffers(); + + void BindComputeTextureBuffer(size_t tbo_index, GPUVAddr gpu_addr, u32 size, PixelFormat format, + bool is_written, bool is_image); + + [[nodiscard]] std::pair ObtainBuffer(GPUVAddr gpu_addr, u32 size, + ObtainBufferSynchronize sync_info, + ObtainBufferOperation post_op); + void FlushCachedWrites(); + + /// Return true when there are uncommitted buffers to be downloaded + [[nodiscard]] bool HasUncommittedFlushes() const noexcept; + + void AccumulateFlushes(); + + /// Return true when the caller should wait for async downloads + [[nodiscard]] bool ShouldWaitAsyncFlushes() const noexcept; + + /// Commit asynchronous downloads + void CommitAsyncFlushes(); + void CommitAsyncFlushesHigh(); + void CommitAsyncQueries(); + + /// Pop asynchronous downloads + void PopAsyncFlushes(); + + void PopAsyncQueries(); + void PopAsyncBuffers(); + + bool DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 amount); + + bool DMAClear(GPUVAddr src_address, u64 amount, u32 value); + + /// Return true when a CPU region is modified from the GPU + [[nodiscard]] bool IsRegionGpuModified(VAddr addr, size_t size); + + /// Return true when a region is registered on the cache + [[nodiscard]] bool IsRegionRegistered(VAddr addr, size_t size); + + /// Return true when a CPU region is modified from the CPU + [[nodiscard]] bool IsRegionCpuModified(VAddr addr, size_t size); + + void SetDrawIndirect(const Tegra::Engines::DrawManager::IndirectParams* current_draw_indirect_) { + current_draw_indirect = current_draw_indirect_; + } + + [[nodiscard]] std::pair GetDrawIndirectCount(); + + [[nodiscard]] std::pair GetDrawIndirectBuffer(); + + std::recursive_mutex mutex; + Runtime& runtime; + +private: + template + static void ForEachEnabledBit(u32 enabled_mask, Func&& func) { + for (u32 index = 0; enabled_mask != 0; ++index, enabled_mask >>= 1) { + const int disabled_bits = std::countr_zero(enabled_mask); + index += disabled_bits; + enabled_mask >>= disabled_bits; + func(index); + } + } + + template + void ForEachBufferInRange(VAddr cpu_addr, u64 size, Func&& func) { + const u64 page_end = Common::DivCeil(cpu_addr + size, PAGE_SIZE); + for (u64 page = cpu_addr >> PAGE_BITS; page < page_end;) { + const BufferId buffer_id = page_table[page]; + if (!buffer_id) { + ++page; + continue; + } + Buffer& buffer = slot_buffers[buffer_id]; + func(buffer_id, buffer); + + const VAddr end_addr = buffer.CpuAddr() + buffer.SizeBytes(); + page = Common::DivCeil(end_addr, PAGE_SIZE); + } + } + + template + void ForEachInRangeSet(IntervalSet& current_range, VAddr cpu_addr, u64 size, Func&& func) { + const VAddr start_address = cpu_addr; + const VAddr end_address = start_address + size; + const IntervalType search_interval{start_address, end_address}; + auto it = current_range.lower_bound(search_interval); + if (it == current_range.end()) { + return; + } + auto end_it = current_range.upper_bound(search_interval); + for (; it != end_it; it++) { + VAddr inter_addr_end = it->upper(); + VAddr inter_addr = it->lower(); + if (inter_addr_end > end_address) { + inter_addr_end = end_address; + } + if (inter_addr < start_address) { + inter_addr = start_address; + } + func(inter_addr, inter_addr_end); + } + } + + static bool IsRangeGranular(VAddr cpu_addr, size_t size) { + return (cpu_addr & ~Core::Memory::YUZU_PAGEMASK) == + ((cpu_addr + size) & ~Core::Memory::YUZU_PAGEMASK); + } + + void RunGarbageCollector(); + + void BindHostIndexBuffer(); + + void BindHostVertexBuffers(); + + void BindHostDrawIndirectBuffers(); + + void BindHostGraphicsUniformBuffers(size_t stage); + + void BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32 binding_index, bool needs_bind); + + void BindHostGraphicsStorageBuffers(size_t stage); + + void BindHostGraphicsTextureBuffers(size_t stage); + + void BindHostTransformFeedbackBuffers(); + + void BindHostComputeUniformBuffers(); + + void BindHostComputeStorageBuffers(); + + void BindHostComputeTextureBuffers(); + + void DoUpdateGraphicsBuffers(bool is_indexed); + + void DoUpdateComputeBuffers(); + + void UpdateIndexBuffer(); + + void UpdateVertexBuffers(); + + void UpdateVertexBuffer(u32 index); + + void UpdateDrawIndirect(); + + void UpdateUniformBuffers(size_t stage); + + void UpdateStorageBuffers(size_t stage); + + void UpdateTextureBuffers(size_t stage); + + void UpdateTransformFeedbackBuffers(); + + void UpdateTransformFeedbackBuffer(u32 index); + + void UpdateComputeUniformBuffers(); + + void UpdateComputeStorageBuffers(); + + void UpdateComputeTextureBuffers(); + + void MarkWrittenBuffer(BufferId buffer_id, VAddr cpu_addr, u32 size); + + [[nodiscard]] BufferId FindBuffer(VAddr cpu_addr, u32 size); + + [[nodiscard]] OverlapResult ResolveOverlaps(VAddr cpu_addr, u32 wanted_size); + + void JoinOverlap(BufferId new_buffer_id, BufferId overlap_id, bool accumulate_stream_score); + + [[nodiscard]] BufferId CreateBuffer(VAddr cpu_addr, u32 wanted_size); + + void Register(BufferId buffer_id); + + void Unregister(BufferId buffer_id); + + template + void ChangeRegister(BufferId buffer_id); + + void TouchBuffer(Buffer& buffer, BufferId buffer_id) noexcept; + + bool SynchronizeBuffer(Buffer& buffer, VAddr cpu_addr, u32 size); + + bool SynchronizeBufferImpl(Buffer& buffer, VAddr cpu_addr, u32 size); + + bool SynchronizeBufferNoModified(Buffer& buffer, VAddr cpu_addr, u32 size); + + void UploadMemory(Buffer& buffer, u64 total_size_bytes, u64 largest_copy, + std::span copies); + + void ImmediateUploadMemory(Buffer& buffer, u64 largest_copy, + std::span copies); + + void MappedUploadMemory(Buffer& buffer, u64 total_size_bytes, std::span copies); + + void DownloadBufferMemory(Buffer& buffer_id); + + void DownloadBufferMemory(Buffer& buffer_id, VAddr cpu_addr, u64 size); + + void DeleteBuffer(BufferId buffer_id, bool do_not_mark = false); + + void NotifyBufferDeletion(); + + [[nodiscard]] Binding StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index, bool is_written) const; + + [[nodiscard]] TextureBufferBinding GetTextureBufferBinding(GPUVAddr gpu_addr, u32 size, + PixelFormat format); + + [[nodiscard]] std::span ImmediateBufferWithData(VAddr cpu_addr, size_t size); + + [[nodiscard]] std::span ImmediateBuffer(size_t wanted_capacity); + + [[nodiscard]] bool HasFastUniformBufferBound(size_t stage, u32 binding_index) const noexcept; + + void ClearDownload(IntervalType subtract_interval); + + VideoCore::RasterizerInterface& rasterizer; + Core::Memory::Memory& cpu_memory; + + SlotVector slot_buffers; + DelayedDestructionRing delayed_destruction_ring; + + const Tegra::Engines::DrawManager::IndirectParams* current_draw_indirect{}; + + u32 last_index_count = 0; + + Binding index_buffer; + std::array vertex_buffers; + std::array, NUM_STAGES> uniform_buffers; + std::array, NUM_STAGES> storage_buffers; + std::array, NUM_STAGES> texture_buffers; + std::array transform_feedback_buffers; + Binding count_buffer_binding; + Binding indirect_buffer_binding; + + std::array compute_uniform_buffers; + std::array compute_storage_buffers; + std::array compute_texture_buffers; + + std::array enabled_uniform_buffer_masks{}; + u32 enabled_compute_uniform_buffer_mask = 0; + + const UniformBufferSizes* uniform_buffer_sizes{}; + const ComputeUniformBufferSizes* compute_uniform_buffer_sizes{}; + + std::array enabled_storage_buffers{}; + std::array written_storage_buffers{}; + u32 enabled_compute_storage_buffers = 0; + u32 written_compute_storage_buffers = 0; + + std::array enabled_texture_buffers{}; + std::array written_texture_buffers{}; + std::array image_texture_buffers{}; + u32 enabled_compute_texture_buffers = 0; + u32 written_compute_texture_buffers = 0; + u32 image_compute_texture_buffers = 0; + + std::array uniform_cache_hits{}; + std::array uniform_cache_shots{}; + + u32 uniform_buffer_skip_cache_size = DEFAULT_SKIP_CACHE_SIZE; + + bool has_deleted_buffers = false; + + std::conditional_t, Empty> + dirty_uniform_buffers{}; + std::conditional_t, Empty> fast_bound_uniform_buffers{}; + std::conditional_t, NUM_STAGES>, Empty> + uniform_buffer_binding_sizes{}; + + std::vector cached_write_buffer_ids; + + MemoryTracker memory_tracker; + IntervalSet uncommitted_ranges; + IntervalSet common_ranges; + IntervalSet cached_ranges; + std::deque committed_ranges; + + // Async Buffers + std::deque async_downloads; + std::deque> async_buffers; + std::deque> pending_downloads; + std::optional current_buffer; + + // queries + boost::container::small_vector, 8> pending_queries; + std::deque> committed_queries; + boost::container::small_vector flushed_queries; + std::deque> query_async_buffers; + + size_t immediate_buffer_capacity = 0; + Common::ScratchBuffer immediate_buffer_alloc; + + struct LRUItemParams { + using ObjectType = BufferId; + using TickType = u64; + }; + Common::LeastRecentlyUsedCache lru_cache; + u64 frame_tick = 0; + u64 total_used_memory = 0; + u64 minimum_memory = 0; + u64 critical_memory = 0; + + std::array> PAGE_BITS)> page_table; +}; + +} // namespace VideoCommon diff --git a/src/video_core/buffer_cache/memory_tracker_base.h b/src/video_core/buffer_cache/memory_tracker_base.h new file mode 100644 index 000000000..93bd779c9 --- /dev/null +++ b/src/video_core/buffer_cache/memory_tracker_base.h @@ -0,0 +1,258 @@ +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include +#include +#include +#include +#include +#include +#include + +#include "common/alignment.h" +#include "common/common_types.h" +#include "video_core/buffer_cache/word_manager.h" + +namespace VideoCommon { + +template +class MemoryTrackerBase { + static constexpr size_t MAX_CPU_PAGE_BITS = 39; + static constexpr size_t HIGHER_PAGE_BITS = 22; + static constexpr size_t HIGHER_PAGE_SIZE = 1ULL << HIGHER_PAGE_BITS; + static constexpr size_t HIGHER_PAGE_MASK = HIGHER_PAGE_SIZE - 1ULL; + static constexpr size_t NUM_HIGH_PAGES = 1ULL << (MAX_CPU_PAGE_BITS - HIGHER_PAGE_BITS); + static constexpr size_t MANAGER_POOL_SIZE = 32; + static constexpr size_t WORDS_STACK_NEEDED = HIGHER_PAGE_SIZE / BYTES_PER_WORD; + using Manager = WordManager; + +public: + MemoryTrackerBase(RasterizerInterface& rasterizer_) : rasterizer{&rasterizer_} {} + ~MemoryTrackerBase() = default; + + /// Returns the inclusive CPU modified range in a begin end pair + [[nodiscard]] std::pair ModifiedCpuRegion(VAddr query_cpu_addr, + u64 query_size) noexcept { + return IteratePairs(query_cpu_addr, query_size, + [](Manager* manager, u64 offset, size_t size) { + return manager->ModifiedRegion(offset, size); + }); + } + + /// Returns the inclusive GPU modified range in a begin end pair + [[nodiscard]] std::pair ModifiedGpuRegion(VAddr query_cpu_addr, + u64 query_size) noexcept { + return IteratePairs(query_cpu_addr, query_size, + [](Manager* manager, u64 offset, size_t size) { + return manager->ModifiedRegion(offset, size); + }); + } + + /// Returns true if a region has been modified from the CPU + [[nodiscard]] bool IsRegionCpuModified(VAddr query_cpu_addr, u64 query_size) noexcept { + return IteratePages(query_cpu_addr, query_size, + [](Manager* manager, u64 offset, size_t size) { + return manager->IsRegionModified(offset, size); + }); + } + + /// Returns true if a region has been modified from the GPU + [[nodiscard]] bool IsRegionGpuModified(VAddr query_cpu_addr, u64 query_size) noexcept { + return IteratePages(query_cpu_addr, query_size, + [](Manager* manager, u64 offset, size_t size) { + return manager->IsRegionModified(offset, size); + }); + } + + /// Mark region as CPU modified, notifying the rasterizer about this change + void MarkRegionAsCpuModified(VAddr dirty_cpu_addr, u64 query_size) { + IteratePages( + dirty_cpu_addr, query_size, [](Manager* manager, u64 offset, size_t size) { + manager->ChangeRegionState(manager->GetCpuAddr() + offset, size); + }); + } + + /// Unmark region as CPU modified, notifying the rasterizer about this change + void UnmarkRegionAsCpuModified(VAddr dirty_cpu_addr, u64 query_size) { + IteratePages( + dirty_cpu_addr, query_size, [](Manager* manager, u64 offset, size_t size) { + manager->ChangeRegionState(manager->GetCpuAddr() + offset, size); + }); + } + + /// Mark region as modified from the host GPU + void MarkRegionAsGpuModified(VAddr dirty_cpu_addr, u64 query_size) noexcept { + IteratePages( + dirty_cpu_addr, query_size, [](Manager* manager, u64 offset, size_t size) { + manager->ChangeRegionState(manager->GetCpuAddr() + offset, size); + }); + } + + /// Unmark region as modified from the host GPU + void UnmarkRegionAsGpuModified(VAddr dirty_cpu_addr, u64 query_size) noexcept { + IteratePages( + dirty_cpu_addr, query_size, [](Manager* manager, u64 offset, size_t size) { + manager->ChangeRegionState(manager->GetCpuAddr() + offset, size); + }); + } + + /// Mark region as modified from the CPU + /// but don't mark it as modified until FlusHCachedWrites is called. + void CachedCpuWrite(VAddr dirty_cpu_addr, u64 query_size) { + IteratePages( + dirty_cpu_addr, query_size, [this](Manager* manager, u64 offset, size_t size) { + const VAddr cpu_address = manager->GetCpuAddr() + offset; + manager->ChangeRegionState(cpu_address, size); + cached_pages.insert(static_cast(cpu_address >> HIGHER_PAGE_BITS)); + }); + } + + /// Flushes cached CPU writes, and notify the rasterizer about the deltas + void FlushCachedWrites(VAddr query_cpu_addr, u64 query_size) noexcept { + IteratePages(query_cpu_addr, query_size, + [](Manager* manager, [[maybe_unused]] u64 offset, + [[maybe_unused]] size_t size) { manager->FlushCachedWrites(); }); + } + + void FlushCachedWrites() noexcept { + for (auto id : cached_pages) { + top_tier[id]->FlushCachedWrites(); + } + cached_pages.clear(); + } + + /// Call 'func' for each CPU modified range and unmark those pages as CPU modified + template + void ForEachUploadRange(VAddr query_cpu_range, u64 query_size, Func&& func) { + IteratePages(query_cpu_range, query_size, + [&func](Manager* manager, u64 offset, size_t size) { + manager->ForEachModifiedRange( + manager->GetCpuAddr() + offset, size, true, func); + }); + } + + /// Call 'func' for each GPU modified range and unmark those pages as GPU modified + template + void ForEachDownloadRange(VAddr query_cpu_range, u64 query_size, bool clear, Func&& func) { + IteratePages(query_cpu_range, query_size, + [&func, clear](Manager* manager, u64 offset, size_t size) { + manager->ForEachModifiedRange( + manager->GetCpuAddr() + offset, size, clear, func); + }); + } + + template + void ForEachDownloadRangeAndClear(VAddr query_cpu_range, u64 query_size, Func&& func) { + IteratePages(query_cpu_range, query_size, + [&func](Manager* manager, u64 offset, size_t size) { + manager->ForEachModifiedRange( + manager->GetCpuAddr() + offset, size, true, func); + }); + } + +private: + template + bool IteratePages(VAddr cpu_address, size_t size, Func&& func) { + using FuncReturn = typename std::invoke_result::type; + static constexpr bool BOOL_BREAK = std::is_same_v; + std::size_t remaining_size{size}; + std::size_t page_index{cpu_address >> HIGHER_PAGE_BITS}; + u64 page_offset{cpu_address & HIGHER_PAGE_MASK}; + while (remaining_size > 0) { + const std::size_t copy_amount{std::min(HIGHER_PAGE_SIZE - page_offset, remaining_size)}; + auto* manager{top_tier[page_index]}; + if (manager) { + if constexpr (BOOL_BREAK) { + if (func(manager, page_offset, copy_amount)) { + return true; + } + } else { + func(manager, page_offset, copy_amount); + } + } else if constexpr (create_region_on_fail) { + CreateRegion(page_index); + manager = top_tier[page_index]; + if constexpr (BOOL_BREAK) { + if (func(manager, page_offset, copy_amount)) { + return true; + } + } else { + func(manager, page_offset, copy_amount); + } + } + page_index++; + page_offset = 0; + remaining_size -= copy_amount; + } + return false; + } + + template + std::pair IteratePairs(VAddr cpu_address, size_t size, Func&& func) { + std::size_t remaining_size{size}; + std::size_t page_index{cpu_address >> HIGHER_PAGE_BITS}; + u64 page_offset{cpu_address & HIGHER_PAGE_MASK}; + u64 begin = std::numeric_limits::max(); + u64 end = 0; + while (remaining_size > 0) { + const std::size_t copy_amount{std::min(HIGHER_PAGE_SIZE - page_offset, remaining_size)}; + auto* manager{top_tier[page_index]}; + const auto execute = [&] { + auto [new_begin, new_end] = func(manager, page_offset, copy_amount); + if (new_begin != 0 || new_end != 0) { + const u64 base_address = page_index << HIGHER_PAGE_BITS; + begin = std::min(new_begin + base_address, begin); + end = std::max(new_end + base_address, end); + } + }; + if (manager) { + execute(); + } else if constexpr (create_region_on_fail) { + CreateRegion(page_index); + manager = top_tier[page_index]; + execute(); + } + page_index++; + page_offset = 0; + remaining_size -= copy_amount; + } + return begin < end ? std::make_pair(begin, end) : std::make_pair(0ULL, 0ULL); + } + + void CreateRegion(std::size_t page_index) { + const VAddr base_cpu_addr = page_index << HIGHER_PAGE_BITS; + top_tier[page_index] = GetNewManager(base_cpu_addr); + } + + Manager* GetNewManager(VAddr base_cpu_addess) { + const auto on_return = [&] { + auto* new_manager = free_managers.front(); + new_manager->SetCpuAddress(base_cpu_addess); + free_managers.pop_front(); + return new_manager; + }; + if (!free_managers.empty()) { + return on_return(); + } + manager_pool.emplace_back(); + auto& last_pool = manager_pool.back(); + for (size_t i = 0; i < MANAGER_POOL_SIZE; i++) { + new (&last_pool[i]) Manager(0, *rasterizer, HIGHER_PAGE_SIZE); + free_managers.push_back(&last_pool[i]); + } + return on_return(); + } + + std::deque> manager_pool; + std::deque free_managers; + + std::array top_tier{}; + + std::unordered_set cached_pages; + + RasterizerInterface* rasterizer = nullptr; +}; + +} // namespace VideoCommon diff --git a/src/video_core/buffer_cache/word_manager.h b/src/video_core/buffer_cache/word_manager.h new file mode 100644 index 000000000..782951fe7 --- /dev/null +++ b/src/video_core/buffer_cache/word_manager.h @@ -0,0 +1,474 @@ +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include +#include +#include +#include + +#include "common/alignment.h" +#include "common/common_funcs.h" +#include "common/common_types.h" +#include "common/div_ceil.h" +#include "core/memory.h" + +namespace VideoCommon { + +constexpr u64 PAGES_PER_WORD = 64; +constexpr u64 BYTES_PER_PAGE = Core::Memory::YUZU_PAGESIZE; +constexpr u64 BYTES_PER_WORD = PAGES_PER_WORD * BYTES_PER_PAGE; + +/// Vector tracking modified pages tightly packed with small vector optimization +template +union WordsArray { + /// Returns the pointer to the words state + [[nodiscard]] const u64* Pointer(bool is_short) const noexcept { + return is_short ? stack.data() : heap; + } + + /// Returns the pointer to the words state + [[nodiscard]] u64* Pointer(bool is_short) noexcept { + return is_short ? stack.data() : heap; + } + + std::array stack{}; ///< Small buffers storage + u64* heap; ///< Not-small buffers pointer to the storage +}; + +template +struct Words { + explicit Words() = default; + explicit Words(u64 size_bytes_) : size_bytes{size_bytes_} { + if (IsShort()) { + cpu.stack.fill(~u64{0}); + gpu.stack.fill(0); + cached_cpu.stack.fill(0); + untracked.stack.fill(~u64{0}); + } else { + const size_t num_words = NumWords(); + // Share allocation between CPU and GPU pages and set their default values + u64* const alloc = new u64[num_words * 4]; + cpu.heap = alloc; + gpu.heap = alloc + num_words; + cached_cpu.heap = alloc + num_words * 2; + untracked.heap = alloc + num_words * 3; + std::fill_n(cpu.heap, num_words, ~u64{0}); + std::fill_n(gpu.heap, num_words, 0); + std::fill_n(cached_cpu.heap, num_words, 0); + std::fill_n(untracked.heap, num_words, ~u64{0}); + } + // Clean up tailing bits + const u64 last_word_size = size_bytes % BYTES_PER_WORD; + const u64 last_local_page = Common::DivCeil(last_word_size, BYTES_PER_PAGE); + const u64 shift = (PAGES_PER_WORD - last_local_page) % PAGES_PER_WORD; + const u64 last_word = (~u64{0} << shift) >> shift; + cpu.Pointer(IsShort())[NumWords() - 1] = last_word; + untracked.Pointer(IsShort())[NumWords() - 1] = last_word; + } + + ~Words() { + Release(); + } + + Words& operator=(Words&& rhs) noexcept { + Release(); + size_bytes = rhs.size_bytes; + cpu = rhs.cpu; + gpu = rhs.gpu; + cached_cpu = rhs.cached_cpu; + untracked = rhs.untracked; + rhs.cpu.heap = nullptr; + return *this; + } + + Words(Words&& rhs) noexcept + : size_bytes{rhs.size_bytes}, cpu{rhs.cpu}, gpu{rhs.gpu}, + cached_cpu{rhs.cached_cpu}, untracked{rhs.untracked} { + rhs.cpu.heap = nullptr; + } + + Words& operator=(const Words&) = delete; + Words(const Words&) = delete; + + /// Returns true when the buffer fits in the small vector optimization + [[nodiscard]] bool IsShort() const noexcept { + return size_bytes <= stack_words * BYTES_PER_WORD; + } + + /// Returns the number of words of the buffer + [[nodiscard]] size_t NumWords() const noexcept { + return Common::DivCeil(size_bytes, BYTES_PER_WORD); + } + + /// Release buffer resources + void Release() { + if (!IsShort()) { + // CPU written words is the base for the heap allocation + delete[] cpu.heap; + } + } + + u64 size_bytes = 0; + WordsArray cpu; + WordsArray gpu; + WordsArray cached_cpu; + WordsArray untracked; +}; + +enum class Type { + CPU, + GPU, + CachedCPU, + Untracked, +}; + +template +class WordManager { +public: + explicit WordManager(VAddr cpu_addr_, RasterizerInterface& rasterizer_, u64 size_bytes) + : cpu_addr{cpu_addr_}, rasterizer{&rasterizer_}, words{size_bytes} {} + + explicit WordManager() = default; + + void SetCpuAddress(VAddr new_cpu_addr) { + cpu_addr = new_cpu_addr; + } + + VAddr GetCpuAddr() const { + return cpu_addr; + } + + /** + * Change the state of a range of pages + * + * @param dirty_addr Base address to mark or unmark as modified + * @param size Size in bytes to mark or unmark as modified + */ + template + void ChangeRegionState(u64 dirty_addr, s64 size) noexcept(type == Type::GPU) { + const s64 difference = dirty_addr - cpu_addr; + const u64 offset = std::max(difference, 0); + size += std::min(difference, 0); + if (offset >= SizeBytes() || size < 0) { + return; + } + u64* const untracked_words = Array(); + u64* const state_words = Array(); + const u64 offset_end = std::min(offset + size, SizeBytes()); + const u64 begin_page_index = offset / BYTES_PER_PAGE; + const u64 begin_word_index = begin_page_index / PAGES_PER_WORD; + const u64 end_page_index = Common::DivCeil(offset_end, BYTES_PER_PAGE); + const u64 end_word_index = Common::DivCeil(end_page_index, PAGES_PER_WORD); + u64 page_index = begin_page_index % PAGES_PER_WORD; + u64 word_index = begin_word_index; + while (word_index < end_word_index) { + const u64 next_word_first_page = (word_index + 1) * PAGES_PER_WORD; + const u64 left_offset = + std::min(next_word_first_page - end_page_index, PAGES_PER_WORD) % PAGES_PER_WORD; + const u64 right_offset = page_index; + u64 bits = ~u64{0}; + bits = (bits >> right_offset) << right_offset; + bits = (bits << left_offset) >> left_offset; + if constexpr (type == Type::CPU || type == Type::CachedCPU) { + NotifyRasterizer(word_index, untracked_words[word_index], bits); + } + if constexpr (enable) { + state_words[word_index] |= bits; + if constexpr (type == Type::CPU || type == Type::CachedCPU) { + untracked_words[word_index] |= bits; + } + } else { + state_words[word_index] &= ~bits; + if constexpr (type == Type::CPU || type == Type::CachedCPU) { + untracked_words[word_index] &= ~bits; + } + } + page_index = 0; + ++word_index; + } + } + + /** + * Loop over each page in the given range, turn off those bits and notify the rasterizer if + * needed. Call the given function on each turned off range. + * + * @param query_cpu_range Base CPU address to loop over + * @param size Size in bytes of the CPU range to loop over + * @param func Function to call for each turned off region + */ + template + void ForEachModifiedRange(VAddr query_cpu_range, s64 size, bool clear, Func&& func) { + static_assert(type != Type::Untracked); + + const s64 difference = query_cpu_range - cpu_addr; + const u64 query_begin = std::max(difference, 0); + size += std::min(difference, 0); + if (query_begin >= SizeBytes() || size < 0) { + return; + } + [[maybe_unused]] u64* const untracked_words = Array(); + [[maybe_unused]] u64* const cpu_words = Array(); + u64* const state_words = Array(); + const u64 query_end = query_begin + std::min(static_cast(size), SizeBytes()); + u64* const words_begin = state_words + query_begin / BYTES_PER_WORD; + u64* const words_end = state_words + Common::DivCeil(query_end, BYTES_PER_WORD); + u64 first_page = (query_begin / BYTES_PER_PAGE) % PAGES_PER_WORD; + + const auto modified = [](u64 word) { return word != 0; }; + const auto first_modified_word = std::find_if(words_begin, words_end, modified); + if (first_modified_word == words_end) { + // Exit early when the buffer is not modified + return; + } + if (first_modified_word != words_begin) { + first_page = 0; + } + std::reverse_iterator first_word_reverse(first_modified_word); + std::reverse_iterator last_word_iterator(words_end); + auto last_word_result = std::find_if(last_word_iterator, first_word_reverse, modified); + u64* const last_modified_word = &(*last_word_result) + 1; + + const u64 word_index_begin = std::distance(state_words, first_modified_word); + const u64 word_index_end = std::distance(state_words, last_modified_word); + const unsigned local_page_begin = std::countr_zero(*first_modified_word); + const unsigned local_page_end = + static_cast(PAGES_PER_WORD) - std::countl_zero(last_modified_word[-1]); + const u64 word_page_begin = word_index_begin * PAGES_PER_WORD; + const u64 word_page_end = (word_index_end - 1) * PAGES_PER_WORD; + const u64 query_page_begin = query_begin / BYTES_PER_PAGE; + const u64 query_page_end = Common::DivCeil(query_end, BYTES_PER_PAGE); + const u64 page_index_begin = std::max(word_page_begin + local_page_begin, query_page_begin); + const u64 page_index_end = std::min(word_page_end + local_page_end, query_page_end); + const u64 first_word_page_begin = page_index_begin % PAGES_PER_WORD; + const u64 last_word_page_end = (page_index_end - 1) % PAGES_PER_WORD + 1; + + u64 page_begin = std::max(first_word_page_begin, first_page); + u64 current_base = 0; + u64 current_size = 0; + bool on_going = false; + for (u64 word_index = word_index_begin; word_index < word_index_end; ++word_index) { + const bool is_last_word = word_index + 1 == word_index_end; + const u64 page_end = is_last_word ? last_word_page_end : PAGES_PER_WORD; + const u64 right_offset = page_begin; + const u64 left_offset = PAGES_PER_WORD - page_end; + u64 bits = ~u64{0}; + bits = (bits >> right_offset) << right_offset; + bits = (bits << left_offset) >> left_offset; + + const u64 current_word = state_words[word_index] & bits; + if (clear) { + state_words[word_index] &= ~bits; + } + + if constexpr (type == Type::CachedCPU) { + NotifyRasterizer(word_index, untracked_words[word_index], current_word); + untracked_words[word_index] |= current_word; + cpu_words[word_index] |= current_word; + } + + if constexpr (type == Type::CPU) { + const u64 current_bits = untracked_words[word_index] & bits; + untracked_words[word_index] &= ~bits; + NotifyRasterizer(word_index, current_bits, ~u64{0}); + } + const u64 word = current_word; + u64 page = page_begin; + page_begin = 0; + + while (page < page_end) { + const int empty_bits = std::countr_zero(word >> page); + if (on_going && empty_bits != 0) { + InvokeModifiedRange(func, current_size, current_base); + current_size = 0; + on_going = false; + } + if (empty_bits == PAGES_PER_WORD) { + break; + } + page += empty_bits; + + const int continuous_bits = std::countr_one(word >> page); + if (!on_going && continuous_bits != 0) { + current_base = word_index * PAGES_PER_WORD + page; + on_going = true; + } + current_size += continuous_bits; + page += continuous_bits; + } + } + if (on_going && current_size > 0) { + InvokeModifiedRange(func, current_size, current_base); + } + } + + template + void InvokeModifiedRange(Func&& func, u64 current_size, u64 current_base) { + const u64 current_size_bytes = current_size * BYTES_PER_PAGE; + const u64 offset_begin = current_base * BYTES_PER_PAGE; + const u64 offset_end = std::min(offset_begin + current_size_bytes, SizeBytes()); + func(cpu_addr + offset_begin, offset_end - offset_begin); + } + + /** + * Returns true when a region has been modified + * + * @param offset Offset in bytes from the start of the buffer + * @param size Size in bytes of the region to query for modifications + */ + template + [[nodiscard]] bool IsRegionModified(u64 offset, u64 size) const noexcept { + static_assert(type != Type::Untracked); + + const u64* const state_words = Array(); + const u64 num_query_words = size / BYTES_PER_WORD + 1; + const u64 word_begin = offset / BYTES_PER_WORD; + const u64 word_end = std::min(word_begin + num_query_words, NumWords()); + const u64 page_limit = Common::DivCeil(offset + size, BYTES_PER_PAGE); + u64 page_index = (offset / BYTES_PER_PAGE) % PAGES_PER_WORD; + for (u64 word_index = word_begin; word_index < word_end; ++word_index, page_index = 0) { + const u64 word = state_words[word_index]; + if (word == 0) { + continue; + } + const u64 page_end = std::min((word_index + 1) * PAGES_PER_WORD, page_limit); + const u64 local_page_end = page_end % PAGES_PER_WORD; + const u64 page_end_shift = (PAGES_PER_WORD - local_page_end) % PAGES_PER_WORD; + if (((word >> page_index) << page_index) << page_end_shift != 0) { + return true; + } + } + return false; + } + + /** + * Returns a begin end pair with the inclusive modified region + * + * @param offset Offset in bytes from the start of the buffer + * @param size Size in bytes of the region to query for modifications + */ + template + [[nodiscard]] std::pair ModifiedRegion(u64 offset, u64 size) const noexcept { + static_assert(type != Type::Untracked); + const u64* const state_words = Array(); + const u64 num_query_words = size / BYTES_PER_WORD + 1; + const u64 word_begin = offset / BYTES_PER_WORD; + const u64 word_end = std::min(word_begin + num_query_words, NumWords()); + const u64 page_base = offset / BYTES_PER_PAGE; + u64 page_begin = page_base & (PAGES_PER_WORD - 1); + u64 page_end = + Common::DivCeil(offset + size, BYTES_PER_PAGE) - (page_base & ~(PAGES_PER_WORD - 1)); + u64 begin = std::numeric_limits::max(); + u64 end = 0; + for (u64 word_index = word_begin; word_index < word_end; ++word_index) { + const u64 base_mask = (1ULL << page_begin) - 1ULL; + const u64 end_mask = page_end >= PAGES_PER_WORD ? 0ULL : ~((1ULL << page_end) - 1ULL); + const u64 off_word = end_mask | base_mask; + const u64 word = state_words[word_index] & ~off_word; + if (word == 0) { + page_begin = 0; + page_end -= PAGES_PER_WORD; + continue; + } + const u64 local_page_begin = std::countr_zero(word); + const u64 local_page_end = PAGES_PER_WORD - std::countl_zero(word); + const u64 page_index = word_index * PAGES_PER_WORD; + begin = std::min(begin, page_index + local_page_begin); + end = page_index + local_page_end; + page_begin = 0; + page_end -= PAGES_PER_WORD; + } + static constexpr std::pair EMPTY{0, 0}; + return begin < end ? std::make_pair(begin * BYTES_PER_PAGE, end * BYTES_PER_PAGE) : EMPTY; + } + + /// Returns the number of words of the manager + [[nodiscard]] size_t NumWords() const noexcept { + return words.NumWords(); + } + + /// Returns the size in bytes of the manager + [[nodiscard]] u64 SizeBytes() const noexcept { + return words.size_bytes; + } + + /// Returns true when the buffer fits in the small vector optimization + [[nodiscard]] bool IsShort() const noexcept { + return words.IsShort(); + } + + void FlushCachedWrites() noexcept { + const u64 num_words = NumWords(); + u64* const cached_words = Array(); + u64* const untracked_words = Array(); + u64* const cpu_words = Array(); + for (u64 word_index = 0; word_index < num_words; ++word_index) { + const u64 cached_bits = cached_words[word_index]; + NotifyRasterizer(word_index, untracked_words[word_index], cached_bits); + untracked_words[word_index] |= cached_bits; + cpu_words[word_index] |= cached_bits; + cached_words[word_index] = 0; + } + } + +private: + template + u64* Array() noexcept { + if constexpr (type == Type::CPU) { + return words.cpu.Pointer(IsShort()); + } else if constexpr (type == Type::GPU) { + return words.gpu.Pointer(IsShort()); + } else if constexpr (type == Type::CachedCPU) { + return words.cached_cpu.Pointer(IsShort()); + } else if constexpr (type == Type::Untracked) { + return words.untracked.Pointer(IsShort()); + } + } + + template + const u64* Array() const noexcept { + if constexpr (type == Type::CPU) { + return words.cpu.Pointer(IsShort()); + } else if constexpr (type == Type::GPU) { + return words.gpu.Pointer(IsShort()); + } else if constexpr (type == Type::CachedCPU) { + return words.cached_cpu.Pointer(IsShort()); + } else if constexpr (type == Type::Untracked) { + return words.untracked.Pointer(IsShort()); + } + } + + /** + * Notify rasterizer about changes in the CPU tracking state of a word in the buffer + * + * @param word_index Index to the word to notify to the rasterizer + * @param current_bits Current state of the word + * @param new_bits New state of the word + * + * @tparam add_to_rasterizer True when the rasterizer should start tracking the new pages + */ + template + void NotifyRasterizer(u64 word_index, u64 current_bits, u64 new_bits) const { + u64 changed_bits = (add_to_rasterizer ? current_bits : ~current_bits) & new_bits; + VAddr addr = cpu_addr + word_index * BYTES_PER_WORD; + while (changed_bits != 0) { + const int empty_bits = std::countr_zero(changed_bits); + addr += empty_bits * BYTES_PER_PAGE; + changed_bits >>= empty_bits; + + const u32 continuous_bits = std::countr_one(changed_bits); + const u64 size = continuous_bits * BYTES_PER_PAGE; + const VAddr begin_addr = addr; + addr += size; + changed_bits = continuous_bits < PAGES_PER_WORD ? (changed_bits >> continuous_bits) : 0; + rasterizer->UpdatePagesCachedCount(begin_addr, size, add_to_rasterizer ? 1 : -1); + } + } + + VAddr cpu_addr = 0; + RasterizerInterface* rasterizer = nullptr; + Words words; +}; + +} // namespace VideoCommon diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.h b/src/video_core/renderer_opengl/gl_buffer_cache.h index a8c3f8b67..18d3c3ac0 100644 --- a/src/video_core/renderer_opengl/gl_buffer_cache.h +++ b/src/video_core/renderer_opengl/gl_buffer_cache.h @@ -8,6 +8,7 @@ #include "common/common_types.h" #include "video_core/buffer_cache/buffer_cache.h" +#include "video_core/buffer_cache/memory_tracker_base.h" #include "video_core/rasterizer_interface.h" #include "video_core/renderer_opengl/gl_device.h" #include "video_core/renderer_opengl/gl_resource_manager.h" @@ -200,6 +201,8 @@ private: struct BufferCacheParams { using Runtime = OpenGL::BufferCacheRuntime; using Buffer = OpenGL::Buffer; + using Async_Buffer = u32; + using MemoryTracker = VideoCommon::MemoryTrackerBase; static constexpr bool IS_OPENGL = true; static constexpr bool HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS = true; @@ -208,6 +211,7 @@ struct BufferCacheParams { static constexpr bool NEEDS_BIND_STORAGE_INDEX = true; static constexpr bool USE_MEMORY_MAPS = false; static constexpr bool SEPARATE_IMAGE_BUFFER_BINDINGS = true; + static constexpr bool IMPLEMENTS_ASYNC_DOWNLOADS = false; }; using BufferCache = VideoCommon::BufferCache; diff --git a/src/video_core/renderer_opengl/gl_buffer_cache_base.cpp b/src/video_core/renderer_opengl/gl_buffer_cache_base.cpp new file mode 100644 index 000000000..f15ae8e25 --- /dev/null +++ b/src/video_core/renderer_opengl/gl_buffer_cache_base.cpp @@ -0,0 +1,9 @@ +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#include "video_core/buffer_cache/buffer_cache.h" +#include "video_core/renderer_opengl/gl_buffer_cache.h" + +namespace VideoCommon { +template class VideoCommon::BufferCache; +} diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp index 9cbcb3c8f..510602e8e 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp @@ -314,8 +314,12 @@ StagingBufferRef BufferCacheRuntime::UploadStagingBuffer(size_t size) { return staging_pool.Request(size, MemoryUsage::Upload); } -StagingBufferRef BufferCacheRuntime::DownloadStagingBuffer(size_t size) { - return staging_pool.Request(size, MemoryUsage::Download); +StagingBufferRef BufferCacheRuntime::DownloadStagingBuffer(size_t size, bool deferred) { + return staging_pool.Request(size, MemoryUsage::Download, deferred); +} + +void BufferCacheRuntime::FreeDeferredStagingBuffer(StagingBufferRef& ref) { + staging_pool.FreeDeferred(ref); } u64 BufferCacheRuntime::GetDeviceLocalMemory() const { diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.h b/src/video_core/renderer_vulkan/vk_buffer_cache.h index 183b33632..05968e6a6 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.h +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h @@ -4,6 +4,7 @@ #pragma once #include "video_core/buffer_cache/buffer_cache.h" +#include "video_core/buffer_cache/memory_tracker_base.h" #include "video_core/engines/maxwell_3d.h" #include "video_core/renderer_vulkan/vk_compute_pass.h" #include "video_core/renderer_vulkan/vk_staging_buffer_pool.h" @@ -75,7 +76,9 @@ public: [[nodiscard]] StagingBufferRef UploadStagingBuffer(size_t size); - [[nodiscard]] StagingBufferRef DownloadStagingBuffer(size_t size); + [[nodiscard]] StagingBufferRef DownloadStagingBuffer(size_t size, bool deferred = false); + + void FreeDeferredStagingBuffer(StagingBufferRef& ref); void PreCopyBarrier(); @@ -142,6 +145,8 @@ private: struct BufferCacheParams { using Runtime = Vulkan::BufferCacheRuntime; using Buffer = Vulkan::Buffer; + using Async_Buffer = Vulkan::StagingBufferRef; + using MemoryTracker = VideoCommon::MemoryTrackerBase; static constexpr bool IS_OPENGL = false; static constexpr bool HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS = false; @@ -150,6 +155,7 @@ struct BufferCacheParams { static constexpr bool NEEDS_BIND_STORAGE_INDEX = false; static constexpr bool USE_MEMORY_MAPS = true; static constexpr bool SEPARATE_IMAGE_BUFFER_BINDINGS = false; + static constexpr bool IMPLEMENTS_ASYNC_DOWNLOADS = true; }; using BufferCache = VideoCommon::BufferCache; diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache_base.cpp b/src/video_core/renderer_vulkan/vk_buffer_cache_base.cpp new file mode 100644 index 000000000..f9e271507 --- /dev/null +++ b/src/video_core/renderer_vulkan/vk_buffer_cache_base.cpp @@ -0,0 +1,9 @@ +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "video_core/buffer_cache/buffer_cache.h" +#include "video_core/renderer_vulkan/vk_buffer_cache.h" + +namespace VideoCommon { +template class VideoCommon::BufferCache; +} From f2d3212de97ebed710bc03792343fae45b3203f3 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sat, 22 Apr 2023 13:36:18 +0200 Subject: [PATCH 0284/1181] Buffer Cache rework: Setup async downloads. --- src/video_core/buffer_cache/buffer_cache.h | 231 ++++++++---------- .../buffer_cache/buffer_cache_base.h | 65 ++++- 2 files changed, 155 insertions(+), 141 deletions(-) diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index a0701ce4e..43fe5b080 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -11,6 +11,8 @@ namespace VideoCommon { +using Core::Memory::YUZU_PAGESIZE; + template BufferCache

::BufferCache(VideoCore::RasterizerInterface& rasterizer_, Core::Memory::Memory& cpu_memory_, Runtime& runtime_) @@ -87,9 +89,11 @@ void BufferCache

::TickFrame() { template void BufferCache

::WriteMemory(VAddr cpu_addr, u64 size) { memory_tracker.MarkRegionAsCpuModified(cpu_addr, size); - const IntervalType subtract_interval{cpu_addr, cpu_addr + size}; - ClearDownload(subtract_interval); - common_ranges.subtract(subtract_interval); + if (memory_tracker.IsRegionGpuModified(cpu_addr, size)) { + const IntervalType subtract_interval{cpu_addr, cpu_addr + size}; + ClearDownload(subtract_interval); + common_ranges.subtract(subtract_interval); + } } template @@ -102,17 +106,33 @@ void BufferCache

::CachedWriteMemory(VAddr cpu_addr, u64 size) { template void BufferCache

::DownloadMemory(VAddr cpu_addr, u64 size) { + WaitOnAsyncFlushes(cpu_addr, size); ForEachBufferInRange(cpu_addr, size, [&](BufferId, Buffer& buffer) { DownloadBufferMemory(buffer, cpu_addr, size); }); } template -void BufferCache

::ClearDownload(IntervalType subtract_interval) { - uncommitted_ranges.subtract(subtract_interval); - for (auto& interval_set : async_downloads) { - interval_set.subtract(subtract_interval); +void BufferCache

::WaitOnAsyncFlushes(VAddr cpu_addr, u64 size) { + bool must_wait = false; + ForEachInOverlapCounter(async_downloads, cpu_addr, size, + [&](VAddr, VAddr, int) { must_wait = true; }); + bool must_release = false; + ForEachInRangeSet(pending_ranges, cpu_addr, size, [&](VAddr, VAddr) { must_release = true; }); + if (must_release) { + std::function tmp([]() {}); + rasterizer.SignalFence(std::move(tmp)); } + if (must_wait || must_release) { + rasterizer.ReleaseFences(); + } +} + +template +void BufferCache

::ClearDownload(IntervalType subtract_interval) { + async_downloads -= std::make_pair(subtract_interval, std::numeric_limits::max()); + uncommitted_ranges.subtract(subtract_interval); + pending_ranges.subtract(subtract_interval); for (auto& interval_set : committed_ranges) { interval_set.subtract(subtract_interval); } @@ -132,6 +152,7 @@ bool BufferCache

::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am } const IntervalType subtract_interval{*cpu_dest_address, *cpu_dest_address + amount}; + WaitOnAsyncFlushes(*cpu_src_address, static_cast(amount)); ClearDownload(subtract_interval); BufferId buffer_a; @@ -162,6 +183,7 @@ bool BufferCache

::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am tmp_intervals.push_back(add_interval); if (is_high_accuracy) { uncommitted_ranges.add(add_interval); + pending_ranges.add(add_interval); } }; ForEachInRangeSet(common_ranges, *cpu_src_address, amount, mirror); @@ -413,18 +435,15 @@ template void BufferCache

::FlushCachedWrites() { cached_write_buffer_ids.clear(); memory_tracker.FlushCachedWrites(); - /*for (auto& interval : cached_ranges) { - VAddr cpu_addr = interval.lower(); - const std::size_t size = interval.upper() - interval.lower(); - memory_tracker.FlushCachedWrites(cpu_addr, size); - // common_ranges.subtract(interval); - }*/ + for (auto& interval : cached_ranges) { + ClearDownload(interval); + } cached_ranges.clear(); } template bool BufferCache

::HasUncommittedFlushes() const noexcept { - return !uncommitted_ranges.empty() || !committed_ranges.empty() || !pending_queries.empty(); + return !uncommitted_ranges.empty() || !committed_ranges.empty(); } template @@ -437,8 +456,11 @@ void BufferCache

::AccumulateFlushes() { template bool BufferCache

::ShouldWaitAsyncFlushes() const noexcept { - return (!async_buffers.empty() && async_buffers.front().has_value()) || - (!query_async_buffers.empty() && query_async_buffers.front().has_value()); + if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + return (!async_buffers.empty() && async_buffers.front().has_value()); + } else { + return false; + } } template @@ -446,11 +468,14 @@ void BufferCache

::CommitAsyncFlushesHigh() { AccumulateFlushes(); if (committed_ranges.empty()) { - async_buffers.emplace_back(std::optional{}); + if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + async_buffers.emplace_back(std::optional{}); + } return; } MICROPROFILE_SCOPE(GPU_DownloadMemory); + pending_ranges.clear(); auto it = committed_ranges.begin(); while (it != committed_ranges.end()) { auto& current_intervals = *it; @@ -491,7 +516,7 @@ void BufferCache

::CommitAsyncFlushesHigh() { buffer_id, }); // Align up to avoid cache conflicts - constexpr u64 align = 8ULL; + constexpr u64 align = 64ULL; constexpr u64 mask = ~(align - 1ULL); total_size_bytes += (new_size + align - 1) & mask; largest_copy = std::max(largest_copy, new_size); @@ -504,7 +529,9 @@ void BufferCache

::CommitAsyncFlushesHigh() { } committed_ranges.clear(); if (downloads.empty()) { - async_buffers.emplace_back(std::optional{}); + if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + async_buffers.emplace_back(std::optional{}); + } return; } if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { @@ -520,99 +547,54 @@ void BufferCache

::CommitAsyncFlushesHigh() { second_copy.src_offset = static_cast(buffer.CpuAddr()) + copy.src_offset; VAddr orig_cpu_addr = static_cast(second_copy.src_offset); const IntervalType base_interval{orig_cpu_addr, orig_cpu_addr + copy.size}; - new_async_range.add(base_interval); + async_downloads += std::make_pair(base_interval, 1); runtime.CopyBuffer(download_staging.buffer, buffer, copies, false); normalized_copies.push_back(second_copy); } - async_downloads.emplace_back(std::move(new_async_range)); + runtime.PostCopyBarrier(); pending_downloads.emplace_back(std::move(normalized_copies)); async_buffers.emplace_back(download_staging); } else { - const std::span immediate_buffer = ImmediateBuffer(largest_copy); - for (const auto& [copy, buffer_id] : downloads) { - Buffer& buffer = slot_buffers[buffer_id]; - buffer.ImmediateDownload(copy.src_offset, immediate_buffer.subspan(0, copy.size)); - const VAddr cpu_addr = buffer.CpuAddr() + copy.src_offset; - cpu_memory.WriteBlockUnsafe(cpu_addr, immediate_buffer.data(), copy.size); - } - } -} - -template -void BufferCache

::CommitAsyncQueries() { - if (pending_queries.empty()) { - query_async_buffers.emplace_back(std::optional{}); - return; - } - - MICROPROFILE_SCOPE(GPU_DownloadMemory); - boost::container::small_vector, 8> downloads; - u64 total_size_bytes = 0; - u64 largest_copy = 0; - do { - has_deleted_buffers = false; - downloads.clear(); - total_size_bytes = 0; - largest_copy = 0; - for (const auto& query_info : pending_queries) { - const std::size_t size = query_info.second; - const VAddr cpu_addr = query_info.first; - const BufferId buffer_id = FindBuffer(cpu_addr, static_cast(size)); - Buffer& buffer = slot_buffers[buffer_id]; - if (has_deleted_buffers) { - break; + if constexpr (USE_MEMORY_MAPS) { + auto download_staging = runtime.DownloadStagingBuffer(total_size_bytes); + runtime.PreCopyBarrier(); + for (auto& [copy, buffer_id] : downloads) { + // Have in mind the staging buffer offset for the copy + copy.dst_offset += download_staging.offset; + const std::array copies{copy}; + runtime.CopyBuffer(download_staging.buffer, slot_buffers[buffer_id], copies, false); + } + runtime.PostCopyBarrier(); + runtime.Finish(); + for (const auto& [copy, buffer_id] : downloads) { + const Buffer& buffer = slot_buffers[buffer_id]; + const VAddr cpu_addr = buffer.CpuAddr() + copy.src_offset; + // Undo the modified offset + const u64 dst_offset = copy.dst_offset - download_staging.offset; + const u8* read_mapped_memory = download_staging.mapped_span.data() + dst_offset; + cpu_memory.WriteBlockUnsafe(cpu_addr, read_mapped_memory, copy.size); + } + } else { + const std::span immediate_buffer = ImmediateBuffer(largest_copy); + for (const auto& [copy, buffer_id] : downloads) { + Buffer& buffer = slot_buffers[buffer_id]; + buffer.ImmediateDownload(copy.src_offset, immediate_buffer.subspan(0, copy.size)); + const VAddr cpu_addr = buffer.CpuAddr() + copy.src_offset; + cpu_memory.WriteBlockUnsafe(cpu_addr, immediate_buffer.data(), copy.size); } - downloads.push_back({ - BufferCopy{ - .src_offset = buffer.Offset(cpu_addr), - .dst_offset = total_size_bytes, - .size = size, - }, - buffer_id, - }); - constexpr u64 align = 8ULL; - constexpr u64 mask = ~(align - 1ULL); - total_size_bytes += (size + align - 1) & mask; - largest_copy = std::max(largest_copy, size); } - } while (has_deleted_buffers); - pending_queries.clear(); - if (downloads.empty()) { - query_async_buffers.push_back(std::optional{}); - return; - } - if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { - auto download_staging = runtime.DownloadStagingBuffer(total_size_bytes, true); - boost::container::small_vector normalized_copies; - runtime.PreCopyBarrier(); - for (auto& [copy, buffer_id] : downloads) { - // Have in mind the staging buffer offset for the copy - copy.dst_offset += download_staging.offset; - const std::array copies{copy}; - const Buffer& buffer = slot_buffers[buffer_id]; - BufferCopy second_copy{copy}; - second_copy.src_offset = static_cast(buffer.CpuAddr()) + second_copy.src_offset; - runtime.CopyBuffer(download_staging.buffer, buffer, copies, false); - normalized_copies.push_back(second_copy); - } - committed_queries.emplace_back(std::move(normalized_copies)); - query_async_buffers.emplace_back(download_staging); - } else { - query_async_buffers.push_back(std::optional{}); } } template void BufferCache

::CommitAsyncFlushes() { CommitAsyncFlushesHigh(); - CommitAsyncQueries(); } template void BufferCache

::PopAsyncFlushes() { MICROPROFILE_SCOPE(GPU_DownloadMemory); PopAsyncBuffers(); - PopAsyncQueries(); } template @@ -627,59 +609,34 @@ void BufferCache

::PopAsyncBuffers() { if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { auto& downloads = pending_downloads.front(); auto& async_buffer = async_buffers.front(); - auto& async_range = async_downloads.front(); u8* base = async_buffer->mapped_span.data(); const size_t base_offset = async_buffer->offset; for (const auto& copy : downloads) { const VAddr cpu_addr = static_cast(copy.src_offset); const u64 dst_offset = copy.dst_offset - base_offset; const u8* read_mapped_memory = base + dst_offset; - ForEachInRangeSet(async_range, cpu_addr, copy.size, [&](VAddr start, VAddr end) { - const size_t diff = start - cpu_addr; - const size_t new_size = end - start; - cpu_memory.WriteBlockUnsafe(start, &read_mapped_memory[diff], new_size); - const IntervalType base_interval{start, end}; - common_ranges.subtract(base_interval); - }); + ForEachInOverlapCounter( + async_downloads, cpu_addr, copy.size, [&](VAddr start, VAddr end, int count) { + cpu_memory.WriteBlockUnsafe(start, &read_mapped_memory[start - cpu_addr], + end - start); + if (count == 1) { + const IntervalType base_interval{start, end}; + common_ranges.subtract(base_interval); + } + }); + async_downloads -= std::make_pair(IntervalType(cpu_addr, cpu_addr + copy.size), 1); } runtime.FreeDeferredStagingBuffer(*async_buffer); async_buffers.pop_front(); pending_downloads.pop_front(); - async_downloads.pop_front(); - } -} - -template -void BufferCache

::PopAsyncQueries() { - if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { - if (query_async_buffers.empty()) { - return; - } - if (!query_async_buffers.front().has_value()) { - query_async_buffers.pop_front(); - return; - } - auto& downloads = committed_queries.front(); - auto& async_buffer = query_async_buffers.front(); - flushed_queries.clear(); - u8* base = async_buffer->mapped_span.data(); - const size_t base_offset = async_buffer->offset; - for (const auto& copy : downloads) { - const size_t dst_offset = copy.dst_offset - base_offset; - const u8* read_mapped_memory = base + dst_offset; - u64 new_value{}; - std::memcpy(&new_value, read_mapped_memory, copy.size); - flushed_queries.push_back(new_value); - } - runtime.FreeDeferredStagingBuffer(*async_buffer); - committed_queries.pop_front(); - query_async_buffers.pop_front(); } } template bool BufferCache

::IsRegionGpuModified(VAddr addr, size_t size) { - return memory_tracker.IsRegionGpuModified(addr, size); + bool is_dirty = false; + ForEachInRangeSet(common_ranges, addr, size, [&](VAddr, VAddr) { is_dirty = true; }); + return is_dirty; } template @@ -1232,16 +1189,18 @@ void BufferCache

::UpdateComputeTextureBuffers() { } template -void BufferCache

::MarkWrittenBuffer(BufferId, VAddr cpu_addr, u32 size) { +void BufferCache

::MarkWrittenBuffer(BufferId buffer_id, VAddr cpu_addr, u32 size) { memory_tracker.MarkRegionAsGpuModified(cpu_addr, size); + if (memory_tracker.IsRegionCpuModified(cpu_addr, size)) { + SynchronizeBuffer(slot_buffers[buffer_id], cpu_addr, size); + } + const IntervalType base_interval{cpu_addr, cpu_addr + size}; common_ranges.add(base_interval); - for (auto& interval_set : async_downloads) { - interval_set.subtract(base_interval); - } if (Settings::values.gpu_accuracy.GetValue() == Settings::GPUAccuracy::High) { uncommitted_ranges.add(base_interval); + pending_ranges.add(base_interval); } } @@ -1530,7 +1489,9 @@ bool BufferCache

::InlineMemory(VAddr dest_address, size_t copy_size, if (!is_dirty) { return false; } - if (!IsRegionGpuModified(dest_address, copy_size)) { + VAddr aligned_start = Common::AlignDown(dest_address, YUZU_PAGESIZE); + VAddr aligned_end = Common::AlignUp(dest_address + copy_size, YUZU_PAGESIZE); + if (!IsRegionGpuModified(aligned_start, aligned_end - aligned_start)) { return false; } diff --git a/src/video_core/buffer_cache/buffer_cache_base.h b/src/video_core/buffer_cache/buffer_cache_base.h index 4b3677da3..6f29cba25 100644 --- a/src/video_core/buffer_cache/buffer_cache_base.h +++ b/src/video_core/buffer_cache/buffer_cache_base.h @@ -17,6 +17,7 @@ #include #undef BOOST_NO_MT #include +#include #include #include @@ -44,8 +45,7 @@ namespace boost { template -class fast_pool_allocator; +class fast_pool_allocator; } namespace VideoCommon { @@ -123,6 +123,31 @@ class BufferCache : public VideoCommon::ChannelSetupCaches; using IntervalType = typename IntervalSet::interval_type; + template + struct counter_add_functor : public boost::icl::identity_based_inplace_combine { + // types + typedef counter_add_functor type; + typedef boost::icl::identity_based_inplace_combine base_type; + + // public member functions + void operator()(Type& current, const Type& added) const { + current += added; + if (current < base_type::identity_element()) { + current = base_type::identity_element(); + } + } + + // public static functions + static void version(Type&){}; + }; + + using OverlapCombine = ICL_COMBINE_INSTANCE(counter_add_functor, int); + using OverlapSection = ICL_SECTION_INSTANCE(boost::icl::inter_section, int); + using OverlapCounter = + boost::icl::split_interval_map; + struct Empty {}; struct OverlapResult { @@ -219,12 +244,9 @@ public: /// Commit asynchronous downloads void CommitAsyncFlushes(); void CommitAsyncFlushesHigh(); - void CommitAsyncQueries(); /// Pop asynchronous downloads void PopAsyncFlushes(); - - void PopAsyncQueries(); void PopAsyncBuffers(); bool DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 amount); @@ -302,6 +324,34 @@ private: } } + template + void ForEachInOverlapCounter(OverlapCounter& current_range, VAddr cpu_addr, u64 size, + Func&& func) { + const VAddr start_address = cpu_addr; + const VAddr end_address = start_address + size; + const IntervalType search_interval{start_address, end_address}; + auto it = current_range.lower_bound(search_interval); + if (it == current_range.end()) { + return; + } + auto end_it = current_range.upper_bound(search_interval); + for (; it != end_it; it++) { + auto& inter = it->first; + VAddr inter_addr_end = inter.upper(); + VAddr inter_addr = inter.lower(); + if (inter_addr_end > end_address) { + inter_addr_end = end_address; + } + if (inter_addr < start_address) { + inter_addr = start_address; + } + if (it->second <= 0) { + __debugbreak(); + } + func(inter_addr, inter_addr_end, it->second); + } + } + static bool IsRangeGranular(VAddr cpu_addr, size_t size) { return (cpu_addr & ~Core::Memory::YUZU_PAGEMASK) == ((cpu_addr + size) & ~Core::Memory::YUZU_PAGEMASK); @@ -309,6 +359,8 @@ private: void RunGarbageCollector(); + void WaitOnAsyncFlushes(VAddr cpu_addr, u64 size); + void BindHostIndexBuffer(); void BindHostVertexBuffers(); @@ -474,10 +526,11 @@ private: IntervalSet uncommitted_ranges; IntervalSet common_ranges; IntervalSet cached_ranges; + IntervalSet pending_ranges; std::deque committed_ranges; // Async Buffers - std::deque async_downloads; + OverlapCounter async_downloads; std::deque> async_buffers; std::deque> pending_downloads; std::optional current_buffer; From ed4553806a08e4130fcea36230985cb74d1b326a Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sat, 22 Apr 2023 20:10:40 +0200 Subject: [PATCH 0285/1181] Implement Async downloads in normal and fix a few issues. --- src/video_core/buffer_cache/buffer_cache.h | 69 ++++++++++--------- .../buffer_cache/buffer_cache_base.h | 25 ++++++- src/video_core/buffer_cache/word_manager.h | 6 +- 3 files changed, 61 insertions(+), 39 deletions(-) diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 43fe5b080..faa48a678 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -22,6 +22,8 @@ BufferCache

::BufferCache(VideoCore::RasterizerInterface& rasterizer_, void(slot_buffers.insert(runtime, NullBufferParams{})); common_ranges.clear(); + active_async_buffers = IMPLEMENTS_ASYNC_DOWNLOADS && !Settings::IsGPULevelHigh(); + if (!runtime.CanReportMemoryUsage()) { minimum_memory = DEFAULT_EXPECTED_MEMORY; critical_memory = DEFAULT_CRITICAL_MEMORY; @@ -72,6 +74,8 @@ void BufferCache

::TickFrame() { uniform_cache_hits[0] = 0; uniform_cache_shots[0] = 0; + active_async_buffers = IMPLEMENTS_ASYNC_DOWNLOADS && !Settings::IsGPULevelHigh(); + const bool skip_preferred = hits * 256 < shots * 251; uniform_buffer_skip_cache_size = skip_preferred ? DEFAULT_SKIP_CACHE_SIZE : 0; @@ -130,7 +134,7 @@ void BufferCache

::WaitOnAsyncFlushes(VAddr cpu_addr, u64 size) { template void BufferCache

::ClearDownload(IntervalType subtract_interval) { - async_downloads -= std::make_pair(subtract_interval, std::numeric_limits::max()); + RemoveEachInOverlapCounter(async_downloads, subtract_interval, -1024); uncommitted_ranges.subtract(subtract_interval); pending_ranges.subtract(subtract_interval); for (auto& interval_set : committed_ranges) { @@ -173,18 +177,14 @@ bool BufferCache

::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am }}; boost::container::small_vector tmp_intervals; - const bool is_high_accuracy = - Settings::values.gpu_accuracy.GetValue() == Settings::GPUAccuracy::High; auto mirror = [&](VAddr base_address, VAddr base_address_end) { const u64 size = base_address_end - base_address; const VAddr diff = base_address - *cpu_src_address; const VAddr new_base_address = *cpu_dest_address + diff; const IntervalType add_interval{new_base_address, new_base_address + size}; tmp_intervals.push_back(add_interval); - if (is_high_accuracy) { - uncommitted_ranges.add(add_interval); - pending_ranges.add(add_interval); - } + uncommitted_ranges.add(add_interval); + pending_ranges.add(add_interval); }; ForEachInRangeSet(common_ranges, *cpu_src_address, amount, mirror); // This subtraction in this order is important for overlapping copies. @@ -468,7 +468,7 @@ void BufferCache

::CommitAsyncFlushesHigh() { AccumulateFlushes(); if (committed_ranges.empty()) { - if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + if (active_async_buffers) { async_buffers.emplace_back(std::optional{}); } return; @@ -529,31 +529,33 @@ void BufferCache

::CommitAsyncFlushesHigh() { } committed_ranges.clear(); if (downloads.empty()) { - if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + if (active_async_buffers) { async_buffers.emplace_back(std::optional{}); } return; } - if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { - auto download_staging = runtime.DownloadStagingBuffer(total_size_bytes, true); - boost::container::small_vector normalized_copies; - IntervalSet new_async_range{}; - runtime.PreCopyBarrier(); - for (auto& [copy, buffer_id] : downloads) { - copy.dst_offset += download_staging.offset; - const std::array copies{copy}; - BufferCopy second_copy{copy}; - Buffer& buffer = slot_buffers[buffer_id]; - second_copy.src_offset = static_cast(buffer.CpuAddr()) + copy.src_offset; - VAddr orig_cpu_addr = static_cast(second_copy.src_offset); - const IntervalType base_interval{orig_cpu_addr, orig_cpu_addr + copy.size}; - async_downloads += std::make_pair(base_interval, 1); - runtime.CopyBuffer(download_staging.buffer, buffer, copies, false); - normalized_copies.push_back(second_copy); + if (active_async_buffers) { + if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + auto download_staging = runtime.DownloadStagingBuffer(total_size_bytes, true); + boost::container::small_vector normalized_copies; + IntervalSet new_async_range{}; + runtime.PreCopyBarrier(); + for (auto& [copy, buffer_id] : downloads) { + copy.dst_offset += download_staging.offset; + const std::array copies{copy}; + BufferCopy second_copy{copy}; + Buffer& buffer = slot_buffers[buffer_id]; + second_copy.src_offset = static_cast(buffer.CpuAddr()) + copy.src_offset; + VAddr orig_cpu_addr = static_cast(second_copy.src_offset); + const IntervalType base_interval{orig_cpu_addr, orig_cpu_addr + copy.size}; + async_downloads += std::make_pair(base_interval, 1); + runtime.CopyBuffer(download_staging.buffer, buffer, copies, false); + normalized_copies.push_back(second_copy); + } + runtime.PostCopyBarrier(); + pending_downloads.emplace_back(std::move(normalized_copies)); + async_buffers.emplace_back(download_staging); } - runtime.PostCopyBarrier(); - pending_downloads.emplace_back(std::move(normalized_copies)); - async_buffers.emplace_back(download_staging); } else { if constexpr (USE_MEMORY_MAPS) { auto download_staging = runtime.DownloadStagingBuffer(total_size_bytes); @@ -624,7 +626,8 @@ void BufferCache

::PopAsyncBuffers() { common_ranges.subtract(base_interval); } }); - async_downloads -= std::make_pair(IntervalType(cpu_addr, cpu_addr + copy.size), 1); + const IntervalType subtract_interval{cpu_addr, cpu_addr + copy.size}; + RemoveEachInOverlapCounter(async_downloads, subtract_interval, -1); } runtime.FreeDeferredStagingBuffer(*async_buffer); async_buffers.pop_front(); @@ -1198,10 +1201,8 @@ void BufferCache

::MarkWrittenBuffer(BufferId buffer_id, VAddr cpu_addr, u32 s const IntervalType base_interval{cpu_addr, cpu_addr + size}; common_ranges.add(base_interval); - if (Settings::values.gpu_accuracy.GetValue() == Settings::GPUAccuracy::High) { - uncommitted_ranges.add(base_interval); - pending_ranges.add(base_interval); - } + uncommitted_ranges.add(base_interval); + pending_ranges.add(base_interval); } template @@ -1542,7 +1543,7 @@ void BufferCache

::DownloadBufferMemory(Buffer& buffer, VAddr cpu_addr, u64 si .size = new_size, }); // Align up to avoid cache conflicts - constexpr u64 align = 8ULL; + constexpr u64 align = 64ULL; constexpr u64 mask = ~(align - 1ULL); total_size_bytes += (new_size + align - 1) & mask; largest_copy = std::max(largest_copy, new_size); diff --git a/src/video_core/buffer_cache/buffer_cache_base.h b/src/video_core/buffer_cache/buffer_cache_base.h index 6f29cba25..d4914a8f5 100644 --- a/src/video_core/buffer_cache/buffer_cache_base.h +++ b/src/video_core/buffer_cache/buffer_cache_base.h @@ -345,13 +345,30 @@ private: if (inter_addr < start_address) { inter_addr = start_address; } - if (it->second <= 0) { - __debugbreak(); - } func(inter_addr, inter_addr_end, it->second); } } + void RemoveEachInOverlapCounter(OverlapCounter& current_range, const IntervalType search_interval, int subtract_value) { + bool any_removals = false; + current_range.add(std::make_pair(search_interval, subtract_value)); + do { + any_removals = false; + auto it = current_range.lower_bound(search_interval); + if (it == current_range.end()) { + return; + } + auto end_it = current_range.upper_bound(search_interval); + for (; it != end_it; it++) { + if (it->second <= 0) { + any_removals = true; + current_range.erase(it); + break; + } + } + } while (any_removals); + } + static bool IsRangeGranular(VAddr cpu_addr, size_t size) { return (cpu_addr & ~Core::Memory::YUZU_PAGEMASK) == ((cpu_addr + size) & ~Core::Memory::YUZU_PAGEMASK); @@ -554,6 +571,8 @@ private: u64 minimum_memory = 0; u64 critical_memory = 0; + bool active_async_buffers = false; + std::array> PAGE_BITS)> page_table; }; diff --git a/src/video_core/buffer_cache/word_manager.h b/src/video_core/buffer_cache/word_manager.h index 782951fe7..21729752b 100644 --- a/src/video_core/buffer_cache/word_manager.h +++ b/src/video_core/buffer_cache/word_manager.h @@ -273,7 +273,7 @@ public: untracked_words[word_index] &= ~bits; NotifyRasterizer(word_index, current_bits, ~u64{0}); } - const u64 word = current_word; + const u64 word = current_word & ~(type == Type::GPU ? untracked_words[word_index] : 0); u64 page = page_begin; page_begin = 0; @@ -321,6 +321,7 @@ public: [[nodiscard]] bool IsRegionModified(u64 offset, u64 size) const noexcept { static_assert(type != Type::Untracked); + const u64* const untracked_words = Array(); const u64* const state_words = Array(); const u64 num_query_words = size / BYTES_PER_WORD + 1; const u64 word_begin = offset / BYTES_PER_WORD; @@ -328,7 +329,8 @@ public: const u64 page_limit = Common::DivCeil(offset + size, BYTES_PER_PAGE); u64 page_index = (offset / BYTES_PER_PAGE) % PAGES_PER_WORD; for (u64 word_index = word_begin; word_index < word_end; ++word_index, page_index = 0) { - const u64 word = state_words[word_index]; + const u64 off_word = type == Type::GPU ? untracked_words[word_index] : 0; + const u64 word = state_words[word_index] & ~off_word; if (word == 0) { continue; } From 80480fe3f70997d0520ef8bf38f5fe530c54f8e5 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 23 Apr 2023 03:58:16 +0200 Subject: [PATCH 0286/1181] Clang: format and ficx compile errors. --- src/video_core/buffer_cache/buffer_base.h | 26 +++--- src/video_core/buffer_cache/buffer_cache.h | 4 +- .../buffer_cache/buffer_cache_base.h | 32 ++++---- .../buffer_cache/memory_tracker_base.h | 82 ++++++++++--------- .../renderer_vulkan/vk_buffer_cache.h | 2 +- 5 files changed, 78 insertions(+), 68 deletions(-) diff --git a/src/video_core/buffer_cache/buffer_base.h b/src/video_core/buffer_cache/buffer_base.h index 66d8bb43c..095f79387 100644 --- a/src/video_core/buffer_cache/buffer_base.h +++ b/src/video_core/buffer_cache/buffer_base.h @@ -55,53 +55,53 @@ public: [[nodiscard]] std::pair ModifiedCpuRegion(VAddr query_cpu_addr, u64 query_size) const noexcept { const u64 offset = query_cpu_addr - cpu_addr; - return word_manager.ModifiedRegion(offset, query_size); + return word_manager.template ModifiedRegion(offset, query_size); } /// Returns the inclusive GPU modified range in a begin end pair [[nodiscard]] std::pair ModifiedGpuRegion(VAddr query_cpu_addr, u64 query_size) const noexcept { const u64 offset = query_cpu_addr - cpu_addr; - return word_manager.ModifiedRegion(offset, query_size); + return word_manager.template ModifiedRegion(offset, query_size); } /// Returns true if a region has been modified from the CPU [[nodiscard]] bool IsRegionCpuModified(VAddr query_cpu_addr, u64 query_size) const noexcept { const u64 offset = query_cpu_addr - cpu_addr; - return word_manager.IsRegionModified(offset, query_size); + return word_manager.template IsRegionModified(offset, query_size); } /// Returns true if a region has been modified from the GPU [[nodiscard]] bool IsRegionGpuModified(VAddr query_cpu_addr, u64 query_size) const noexcept { const u64 offset = query_cpu_addr - cpu_addr; - return word_manager.IsRegionModified(offset, query_size); + return word_manager.template IsRegionModified(offset, query_size); } /// Mark region as CPU modified, notifying the rasterizer about this change void MarkRegionAsCpuModified(VAddr dirty_cpu_addr, u64 size) { - word_manager.ChangeRegionState(dirty_cpu_addr, size); + word_manager.template ChangeRegionState(dirty_cpu_addr, size); } /// Unmark region as CPU modified, notifying the rasterizer about this change void UnmarkRegionAsCpuModified(VAddr dirty_cpu_addr, u64 size) { - word_manager.ChangeRegionState(dirty_cpu_addr, size); + word_manager.template ChangeRegionState(dirty_cpu_addr, size); } /// Mark region as modified from the host GPU void MarkRegionAsGpuModified(VAddr dirty_cpu_addr, u64 size) noexcept { - word_manager.ChangeRegionState(dirty_cpu_addr, size); + word_manager.template ChangeRegionState(dirty_cpu_addr, size); } /// Unmark region as modified from the host GPU void UnmarkRegionAsGpuModified(VAddr dirty_cpu_addr, u64 size) noexcept { - word_manager.ChangeRegionState(dirty_cpu_addr, size); + word_manager.template ChangeRegionState(dirty_cpu_addr, size); } /// Mark region as modified from the CPU /// but don't mark it as modified until FlusHCachedWrites is called. void CachedCpuWrite(VAddr dirty_cpu_addr, u64 size) { flags |= BufferFlagBits::CachedWrites; - word_manager.ChangeRegionState(dirty_cpu_addr, size); + word_manager.template ChangeRegionState(dirty_cpu_addr, size); } /// Flushes cached CPU writes, and notify the rasterizer about the deltas @@ -113,24 +113,24 @@ public: /// Call 'func' for each CPU modified range and unmark those pages as CPU modified template void ForEachUploadRange(VAddr query_cpu_range, u64 size, Func&& func) { - word_manager.ForEachModifiedRange(query_cpu_range, size, true, func); + word_manager.template ForEachModifiedRange(query_cpu_range, size, true, func); } /// Call 'func' for each GPU modified range and unmark those pages as GPU modified template void ForEachDownloadRange(VAddr query_cpu_range, u64 size, bool clear, Func&& func) { - word_manager.ForEachModifiedRange(query_cpu_range, size, clear, func); + word_manager.template ForEachModifiedRange(query_cpu_range, size, clear, func); } template void ForEachDownloadRangeAndClear(VAddr query_cpu_range, u64 size, Func&& func) { - word_manager.ForEachModifiedRange(query_cpu_range, size, true, func); + word_manager.template ForEachModifiedRange(query_cpu_range, size, true, func); } /// Call 'func' for each GPU modified range and unmark those pages as GPU modified template void ForEachDownloadRange(Func&& func) { - word_manager.ForEachModifiedRange(cpu_addr, SizeBytes(), true, func); + word_manager.template ForEachModifiedRange(cpu_addr, SizeBytes(), true, func); } /// Mark buffer as picked diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index faa48a678..8fed08dab 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -1395,10 +1395,10 @@ bool BufferCache

::SynchronizeBufferNoModified(Buffer& buffer, VAddr cpu_addr, auto make_copies = [&] { for (auto& interval : found_sets) { const std::size_t sub_size = interval.upper() - interval.lower(); - const VAddr cpu_addr = interval.lower(); + const VAddr cpu_addr_ = interval.lower(); copies.push_back(BufferCopy{ .src_offset = total_size_bytes, - .dst_offset = cpu_addr - buffer.CpuAddr(), + .dst_offset = cpu_addr_ - buffer.CpuAddr(), .size = sub_size, }); total_size_bytes += sub_size; diff --git a/src/video_core/buffer_cache/buffer_cache_base.h b/src/video_core/buffer_cache/buffer_cache_base.h index d4914a8f5..acff22d4f 100644 --- a/src/video_core/buffer_cache/buffer_cache_base.h +++ b/src/video_core/buffer_cache/buffer_cache_base.h @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -16,10 +17,13 @@ #define BOOST_NO_MT #include #undef BOOST_NO_MT +#include +#include #include #include #include #include +#include #include "common/common_types.h" #include "common/div_ceil.h" @@ -42,7 +46,6 @@ #include "video_core/texture_cache/slot_vector.h" #include "video_core/texture_cache/types.h" - namespace boost { template class fast_pool_allocator; @@ -116,11 +119,10 @@ class BufferCache : public VideoCommon::ChannelSetupCaches; + using IntervalCompare = std::less; + using IntervalInstance = boost::icl::interval_type_default; + using IntervalAllocator = boost::fast_pool_allocator; + using IntervalSet = boost::icl::interval_set; using IntervalType = typename IntervalSet::interval_type; template @@ -141,12 +143,9 @@ class BufferCache : public VideoCommon::ChannelSetupCaches; + using OverlapCombine = counter_add_functor; + using OverlapSection = boost::icl::inter_section; + using OverlapCounter = boost::icl::split_interval_map; struct Empty {}; @@ -262,7 +261,8 @@ public: /// Return true when a CPU region is modified from the CPU [[nodiscard]] bool IsRegionCpuModified(VAddr addr, size_t size); - void SetDrawIndirect(const Tegra::Engines::DrawManager::IndirectParams* current_draw_indirect_) { + void SetDrawIndirect( + const Tegra::Engines::DrawManager::IndirectParams* current_draw_indirect_) { current_draw_indirect = current_draw_indirect_; } @@ -349,7 +349,8 @@ private: } } - void RemoveEachInOverlapCounter(OverlapCounter& current_range, const IntervalType search_interval, int subtract_value) { + void RemoveEachInOverlapCounter(OverlapCounter& current_range, + const IntervalType search_interval, int subtract_value) { bool any_removals = false; current_range.add(std::make_pair(search_interval, subtract_value)); do { @@ -469,7 +470,8 @@ private: void NotifyBufferDeletion(); - [[nodiscard]] Binding StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index, bool is_written) const; + [[nodiscard]] Binding StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index, + bool is_written) const; [[nodiscard]] TextureBufferBinding GetTextureBufferBinding(GPUVAddr gpu_addr, u32 size, PixelFormat format); diff --git a/src/video_core/buffer_cache/memory_tracker_base.h b/src/video_core/buffer_cache/memory_tracker_base.h index 93bd779c9..016d8430f 100644 --- a/src/video_core/buffer_cache/memory_tracker_base.h +++ b/src/video_core/buffer_cache/memory_tracker_base.h @@ -35,67 +35,71 @@ public: /// Returns the inclusive CPU modified range in a begin end pair [[nodiscard]] std::pair ModifiedCpuRegion(VAddr query_cpu_addr, u64 query_size) noexcept { - return IteratePairs(query_cpu_addr, query_size, - [](Manager* manager, u64 offset, size_t size) { - return manager->ModifiedRegion(offset, size); - }); + return IteratePairs( + query_cpu_addr, query_size, [](Manager* manager, u64 offset, size_t size) { + return manager->template ModifiedRegion(offset, size); + }); } /// Returns the inclusive GPU modified range in a begin end pair [[nodiscard]] std::pair ModifiedGpuRegion(VAddr query_cpu_addr, u64 query_size) noexcept { - return IteratePairs(query_cpu_addr, query_size, - [](Manager* manager, u64 offset, size_t size) { - return manager->ModifiedRegion(offset, size); - }); + return IteratePairs( + query_cpu_addr, query_size, [](Manager* manager, u64 offset, size_t size) { + return manager->template ModifiedRegion(offset, size); + }); } /// Returns true if a region has been modified from the CPU [[nodiscard]] bool IsRegionCpuModified(VAddr query_cpu_addr, u64 query_size) noexcept { - return IteratePages(query_cpu_addr, query_size, - [](Manager* manager, u64 offset, size_t size) { - return manager->IsRegionModified(offset, size); - }); + return IteratePages( + query_cpu_addr, query_size, [](Manager* manager, u64 offset, size_t size) { + return manager->template IsRegionModified(offset, size); + }); } /// Returns true if a region has been modified from the GPU [[nodiscard]] bool IsRegionGpuModified(VAddr query_cpu_addr, u64 query_size) noexcept { - return IteratePages(query_cpu_addr, query_size, - [](Manager* manager, u64 offset, size_t size) { - return manager->IsRegionModified(offset, size); - }); + return IteratePages( + query_cpu_addr, query_size, [](Manager* manager, u64 offset, size_t size) { + return manager->template IsRegionModified(offset, size); + }); } /// Mark region as CPU modified, notifying the rasterizer about this change void MarkRegionAsCpuModified(VAddr dirty_cpu_addr, u64 query_size) { - IteratePages( - dirty_cpu_addr, query_size, [](Manager* manager, u64 offset, size_t size) { - manager->ChangeRegionState(manager->GetCpuAddr() + offset, size); - }); + IteratePages(dirty_cpu_addr, query_size, + [](Manager* manager, u64 offset, size_t size) { + manager->template ChangeRegionState( + manager->GetCpuAddr() + offset, size); + }); } /// Unmark region as CPU modified, notifying the rasterizer about this change void UnmarkRegionAsCpuModified(VAddr dirty_cpu_addr, u64 query_size) { - IteratePages( - dirty_cpu_addr, query_size, [](Manager* manager, u64 offset, size_t size) { - manager->ChangeRegionState(manager->GetCpuAddr() + offset, size); - }); + IteratePages(dirty_cpu_addr, query_size, + [](Manager* manager, u64 offset, size_t size) { + manager->template ChangeRegionState( + manager->GetCpuAddr() + offset, size); + }); } /// Mark region as modified from the host GPU void MarkRegionAsGpuModified(VAddr dirty_cpu_addr, u64 query_size) noexcept { - IteratePages( - dirty_cpu_addr, query_size, [](Manager* manager, u64 offset, size_t size) { - manager->ChangeRegionState(manager->GetCpuAddr() + offset, size); - }); + IteratePages(dirty_cpu_addr, query_size, + [](Manager* manager, u64 offset, size_t size) { + manager->template ChangeRegionState( + manager->GetCpuAddr() + offset, size); + }); } /// Unmark region as modified from the host GPU void UnmarkRegionAsGpuModified(VAddr dirty_cpu_addr, u64 query_size) noexcept { - IteratePages( - dirty_cpu_addr, query_size, [](Manager* manager, u64 offset, size_t size) { - manager->ChangeRegionState(manager->GetCpuAddr() + offset, size); - }); + IteratePages(dirty_cpu_addr, query_size, + [](Manager* manager, u64 offset, size_t size) { + manager->template ChangeRegionState( + manager->GetCpuAddr() + offset, size); + }); } /// Mark region as modified from the CPU @@ -104,7 +108,7 @@ public: IteratePages( dirty_cpu_addr, query_size, [this](Manager* manager, u64 offset, size_t size) { const VAddr cpu_address = manager->GetCpuAddr() + offset; - manager->ChangeRegionState(cpu_address, size); + manager->template ChangeRegionState(cpu_address, size); cached_pages.insert(static_cast(cpu_address >> HIGHER_PAGE_BITS)); }); } @@ -128,7 +132,7 @@ public: void ForEachUploadRange(VAddr query_cpu_range, u64 query_size, Func&& func) { IteratePages(query_cpu_range, query_size, [&func](Manager* manager, u64 offset, size_t size) { - manager->ForEachModifiedRange( + manager->template ForEachModifiedRange( manager->GetCpuAddr() + offset, size, true, func); }); } @@ -138,7 +142,7 @@ public: void ForEachDownloadRange(VAddr query_cpu_range, u64 query_size, bool clear, Func&& func) { IteratePages(query_cpu_range, query_size, [&func, clear](Manager* manager, u64 offset, size_t size) { - manager->ForEachModifiedRange( + manager->template ForEachModifiedRange( manager->GetCpuAddr() + offset, size, clear, func); }); } @@ -147,7 +151,7 @@ public: void ForEachDownloadRangeAndClear(VAddr query_cpu_range, u64 query_size, Func&& func) { IteratePages(query_cpu_range, query_size, [&func](Manager* manager, u64 offset, size_t size) { - manager->ForEachModifiedRange( + manager->template ForEachModifiedRange( manager->GetCpuAddr() + offset, size, true, func); }); } @@ -218,7 +222,11 @@ private: page_offset = 0; remaining_size -= copy_amount; } - return begin < end ? std::make_pair(begin, end) : std::make_pair(0ULL, 0ULL); + if (begin < end) { + return std::make_pair(begin, end); + } else { + return std::make_pair(0ULL, 0ULL); + } } void CreateRegion(std::size_t page_index) { diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.h b/src/video_core/renderer_vulkan/vk_buffer_cache.h index 05968e6a6..879f1ed94 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.h +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h @@ -3,7 +3,7 @@ #pragma once -#include "video_core/buffer_cache/buffer_cache.h" +#include "video_core/buffer_cache/buffer_cache_base.h" #include "video_core/buffer_cache/memory_tracker_base.h" #include "video_core/engines/maxwell_3d.h" #include "video_core/renderer_vulkan/vk_compute_pass.h" From fff6155bc3a24016496d1290944b8f111a367c9a Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 23 Apr 2023 11:58:43 +0200 Subject: [PATCH 0287/1181] Tests: Add memory tracker tests. --- src/tests/CMakeLists.txt | 2 +- src/tests/video_core/buffer_base.cpp | 549 ------------------------ src/tests/video_core/memory_tracker.cpp | 547 +++++++++++++++++++++++ 3 files changed, 548 insertions(+), 550 deletions(-) delete mode 100644 src/tests/video_core/buffer_base.cpp create mode 100644 src/tests/video_core/memory_tracker.cpp diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 39b774c98..1e158f375 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -15,7 +15,7 @@ add_executable(tests core/core_timing.cpp core/internal_network/network.cpp precompiled_headers.h - video_core/buffer_base.cpp + video_core/memory_tracker.cpp input_common/calibration_configuration_job.cpp ) diff --git a/src/tests/video_core/buffer_base.cpp b/src/tests/video_core/buffer_base.cpp deleted file mode 100644 index 734dbf4b6..000000000 --- a/src/tests/video_core/buffer_base.cpp +++ /dev/null @@ -1,549 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include -#include - -#include - -#include "common/alignment.h" -#include "common/common_types.h" -#include "video_core/buffer_cache/buffer_base.h" - -namespace { -using VideoCommon::BufferBase; -using Range = std::pair; - -constexpr u64 PAGE = 4096; -constexpr u64 WORD = 4096 * 64; - -constexpr VAddr c = 0x1328914000; - -class RasterizerInterface { -public: - void UpdatePagesCachedCount(VAddr addr, u64 size, int delta) { - const u64 page_start{addr >> Core::Memory::YUZU_PAGEBITS}; - const u64 page_end{(addr + size + Core::Memory::YUZU_PAGESIZE - 1) >> - Core::Memory::YUZU_PAGEBITS}; - for (u64 page = page_start; page < page_end; ++page) { - int& value = page_table[page]; - value += delta; - if (value < 0) { - throw std::logic_error{"negative page"}; - } - if (value == 0) { - page_table.erase(page); - } - } - } - - [[nodiscard]] int Count(VAddr addr) const noexcept { - const auto it = page_table.find(addr >> Core::Memory::YUZU_PAGEBITS); - return it == page_table.end() ? 0 : it->second; - } - - [[nodiscard]] unsigned Count() const noexcept { - unsigned count = 0; - for (const auto& [index, value] : page_table) { - count += value; - } - return count; - } - -private: - std::unordered_map page_table; -}; -} // Anonymous namespace - -TEST_CASE("BufferBase: Small buffer", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD); - REQUIRE(rasterizer.Count() == 0); - buffer.UnmarkRegionAsCpuModified(c, WORD); - REQUIRE(rasterizer.Count() == WORD / PAGE); - REQUIRE(buffer.ModifiedCpuRegion(c, WORD) == Range{0, 0}); - - buffer.MarkRegionAsCpuModified(c + PAGE, 1); - REQUIRE(buffer.ModifiedCpuRegion(c, WORD) == Range{PAGE * 1, PAGE * 2}); -} - -TEST_CASE("BufferBase: Large buffer", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD * 32); - buffer.UnmarkRegionAsCpuModified(c, WORD * 32); - buffer.MarkRegionAsCpuModified(c + 4096, WORD * 4); - REQUIRE(buffer.ModifiedCpuRegion(c, WORD + PAGE * 2) == Range{PAGE, WORD + PAGE * 2}); - REQUIRE(buffer.ModifiedCpuRegion(c + PAGE * 2, PAGE * 6) == Range{PAGE * 2, PAGE * 8}); - REQUIRE(buffer.ModifiedCpuRegion(c, WORD * 32) == Range{PAGE, WORD * 4 + PAGE}); - REQUIRE(buffer.ModifiedCpuRegion(c + WORD * 4, PAGE) == Range{WORD * 4, WORD * 4 + PAGE}); - REQUIRE(buffer.ModifiedCpuRegion(c + WORD * 3 + PAGE * 63, PAGE) == - Range{WORD * 3 + PAGE * 63, WORD * 4}); - - buffer.MarkRegionAsCpuModified(c + WORD * 5 + PAGE * 6, PAGE); - buffer.MarkRegionAsCpuModified(c + WORD * 5 + PAGE * 8, PAGE); - REQUIRE(buffer.ModifiedCpuRegion(c + WORD * 5, WORD) == - Range{WORD * 5 + PAGE * 6, WORD * 5 + PAGE * 9}); - - buffer.UnmarkRegionAsCpuModified(c + WORD * 5 + PAGE * 8, PAGE); - REQUIRE(buffer.ModifiedCpuRegion(c + WORD * 5, WORD) == - Range{WORD * 5 + PAGE * 6, WORD * 5 + PAGE * 7}); - - buffer.MarkRegionAsCpuModified(c + PAGE, WORD * 31 + PAGE * 63); - REQUIRE(buffer.ModifiedCpuRegion(c, WORD * 32) == Range{PAGE, WORD * 32}); - - buffer.UnmarkRegionAsCpuModified(c + PAGE * 4, PAGE); - buffer.UnmarkRegionAsCpuModified(c + PAGE * 6, PAGE); - - buffer.UnmarkRegionAsCpuModified(c, WORD * 32); - REQUIRE(buffer.ModifiedCpuRegion(c, WORD * 32) == Range{0, 0}); -} - -TEST_CASE("BufferBase: Rasterizer counting", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, PAGE * 2); - REQUIRE(rasterizer.Count() == 0); - buffer.UnmarkRegionAsCpuModified(c, PAGE); - REQUIRE(rasterizer.Count() == 1); - buffer.MarkRegionAsCpuModified(c, PAGE * 2); - REQUIRE(rasterizer.Count() == 0); - buffer.UnmarkRegionAsCpuModified(c, PAGE); - buffer.UnmarkRegionAsCpuModified(c + PAGE, PAGE); - REQUIRE(rasterizer.Count() == 2); - buffer.MarkRegionAsCpuModified(c, PAGE * 2); - REQUIRE(rasterizer.Count() == 0); -} - -TEST_CASE("BufferBase: Basic range", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD); - buffer.UnmarkRegionAsCpuModified(c, WORD); - buffer.MarkRegionAsCpuModified(c, PAGE); - int num = 0; - buffer.ForEachUploadRange(c, WORD, [&](u64 offset, u64 size) { - REQUIRE(offset == 0U); - REQUIRE(size == PAGE); - ++num; - }); - REQUIRE(num == 1U); -} - -TEST_CASE("BufferBase: Border upload", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD * 2); - buffer.UnmarkRegionAsCpuModified(c, WORD * 2); - buffer.MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); - buffer.ForEachUploadRange(c, WORD * 2, [](u64 offset, u64 size) { - REQUIRE(offset == WORD - PAGE); - REQUIRE(size == PAGE * 2); - }); -} - -TEST_CASE("BufferBase: Border upload range", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD * 2); - buffer.UnmarkRegionAsCpuModified(c, WORD * 2); - buffer.MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); - buffer.ForEachUploadRange(c + WORD - PAGE, PAGE * 2, [](u64 offset, u64 size) { - REQUIRE(offset == WORD - PAGE); - REQUIRE(size == PAGE * 2); - }); - buffer.MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); - buffer.ForEachUploadRange(c + WORD - PAGE, PAGE, [](u64 offset, u64 size) { - REQUIRE(offset == WORD - PAGE); - REQUIRE(size == PAGE); - }); - buffer.ForEachUploadRange(c + WORD, PAGE, [](u64 offset, u64 size) { - REQUIRE(offset == WORD); - REQUIRE(size == PAGE); - }); -} - -TEST_CASE("BufferBase: Border upload partial range", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD * 2); - buffer.UnmarkRegionAsCpuModified(c, WORD * 2); - buffer.MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); - buffer.ForEachUploadRange(c + WORD - 1, 2, [](u64 offset, u64 size) { - REQUIRE(offset == WORD - PAGE); - REQUIRE(size == PAGE * 2); - }); - buffer.MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); - buffer.ForEachUploadRange(c + WORD - 1, 1, [](u64 offset, u64 size) { - REQUIRE(offset == WORD - PAGE); - REQUIRE(size == PAGE); - }); - buffer.ForEachUploadRange(c + WORD + 50, 1, [](u64 offset, u64 size) { - REQUIRE(offset == WORD); - REQUIRE(size == PAGE); - }); -} - -TEST_CASE("BufferBase: Partial word uploads", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, 0x9d000); - int num = 0; - buffer.ForEachUploadRange(c, WORD, [&](u64 offset, u64 size) { - REQUIRE(offset == 0U); - REQUIRE(size == WORD); - ++num; - }); - REQUIRE(num == 1); - buffer.ForEachUploadRange(c + WORD, WORD, [&](u64 offset, u64 size) { - REQUIRE(offset == WORD); - REQUIRE(size == WORD); - ++num; - }); - REQUIRE(num == 2); - buffer.ForEachUploadRange(c + 0x79000, 0x24000, [&](u64 offset, u64 size) { - REQUIRE(offset == WORD * 2); - REQUIRE(size == PAGE * 0x1d); - ++num; - }); - REQUIRE(num == 3); -} - -TEST_CASE("BufferBase: Partial page upload", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD); - buffer.UnmarkRegionAsCpuModified(c, WORD); - int num = 0; - buffer.MarkRegionAsCpuModified(c + PAGE * 2, PAGE); - buffer.MarkRegionAsCpuModified(c + PAGE * 9, PAGE); - buffer.ForEachUploadRange(c, PAGE * 3, [&](u64 offset, u64 size) { - REQUIRE(offset == PAGE * 2); - REQUIRE(size == PAGE); - ++num; - }); - REQUIRE(num == 1); - buffer.ForEachUploadRange(c + PAGE * 7, PAGE * 3, [&](u64 offset, u64 size) { - REQUIRE(offset == PAGE * 9); - REQUIRE(size == PAGE); - ++num; - }); - REQUIRE(num == 2); -} - -TEST_CASE("BufferBase: Partial page upload with multiple words on the right") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD * 8); - buffer.UnmarkRegionAsCpuModified(c, WORD * 8); - buffer.MarkRegionAsCpuModified(c + PAGE * 13, WORD * 7); - int num = 0; - buffer.ForEachUploadRange(c + PAGE * 10, WORD * 7, [&](u64 offset, u64 size) { - REQUIRE(offset == PAGE * 13); - REQUIRE(size == WORD * 7 - PAGE * 3); - ++num; - }); - REQUIRE(num == 1); - buffer.ForEachUploadRange(c + PAGE, WORD * 8, [&](u64 offset, u64 size) { - REQUIRE(offset == WORD * 7 + PAGE * 10); - REQUIRE(size == PAGE * 3); - ++num; - }); - REQUIRE(num == 2); -} - -TEST_CASE("BufferBase: Partial page upload with multiple words on the left", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD * 8); - buffer.UnmarkRegionAsCpuModified(c, WORD * 8); - buffer.MarkRegionAsCpuModified(c + PAGE * 13, WORD * 7); - int num = 0; - buffer.ForEachUploadRange(c + PAGE * 16, WORD * 7, [&](u64 offset, u64 size) { - REQUIRE(offset == PAGE * 16); - REQUIRE(size == WORD * 7 - PAGE * 3); - ++num; - }); - REQUIRE(num == 1); - buffer.ForEachUploadRange(c + PAGE, WORD, [&](u64 offset, u64 size) { - REQUIRE(offset == PAGE * 13); - REQUIRE(size == PAGE * 3); - ++num; - }); - REQUIRE(num == 2); -} - -TEST_CASE("BufferBase: Partial page upload with multiple words in the middle", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD * 8); - buffer.UnmarkRegionAsCpuModified(c, WORD * 8); - buffer.MarkRegionAsCpuModified(c + PAGE * 13, PAGE * 140); - int num = 0; - buffer.ForEachUploadRange(c + PAGE * 16, WORD, [&](u64 offset, u64 size) { - REQUIRE(offset == PAGE * 16); - REQUIRE(size == WORD); - ++num; - }); - REQUIRE(num == 1); - buffer.ForEachUploadRange(c, WORD, [&](u64 offset, u64 size) { - REQUIRE(offset == PAGE * 13); - REQUIRE(size == PAGE * 3); - ++num; - }); - REQUIRE(num == 2); - buffer.ForEachUploadRange(c, WORD * 8, [&](u64 offset, u64 size) { - REQUIRE(offset == WORD + PAGE * 16); - REQUIRE(size == PAGE * 73); - ++num; - }); - REQUIRE(num == 3); -} - -TEST_CASE("BufferBase: Empty right bits", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD * 2048); - buffer.UnmarkRegionAsCpuModified(c, WORD * 2048); - buffer.MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); - buffer.ForEachUploadRange(c, WORD * 2048, [](u64 offset, u64 size) { - REQUIRE(offset == WORD - PAGE); - REQUIRE(size == PAGE * 2); - }); -} - -TEST_CASE("BufferBase: Out of bound ranges 1", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD); - buffer.UnmarkRegionAsCpuModified(c, WORD); - buffer.MarkRegionAsCpuModified(c, PAGE); - int num = 0; - buffer.ForEachUploadRange(c - WORD, WORD, [&](u64 offset, u64 size) { ++num; }); - buffer.ForEachUploadRange(c + WORD, WORD, [&](u64 offset, u64 size) { ++num; }); - buffer.ForEachUploadRange(c - PAGE, PAGE, [&](u64 offset, u64 size) { ++num; }); - REQUIRE(num == 0); - buffer.ForEachUploadRange(c - PAGE, PAGE * 2, [&](u64 offset, u64 size) { ++num; }); - REQUIRE(num == 1); - buffer.MarkRegionAsCpuModified(c, WORD); - REQUIRE(rasterizer.Count() == 0); -} - -TEST_CASE("BufferBase: Out of bound ranges 2", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, 0x22000); - REQUIRE_NOTHROW(buffer.UnmarkRegionAsCpuModified(c + 0x22000, PAGE)); - REQUIRE_NOTHROW(buffer.UnmarkRegionAsCpuModified(c + 0x28000, PAGE)); - REQUIRE(rasterizer.Count() == 0); - REQUIRE_NOTHROW(buffer.UnmarkRegionAsCpuModified(c + 0x21100, PAGE - 0x100)); - REQUIRE(rasterizer.Count() == 1); - REQUIRE_NOTHROW(buffer.UnmarkRegionAsCpuModified(c - 0x1000, PAGE * 2)); - buffer.UnmarkRegionAsCpuModified(c - 0x3000, PAGE * 2); - buffer.UnmarkRegionAsCpuModified(c - 0x2000, PAGE * 2); - REQUIRE(rasterizer.Count() == 2); -} - -TEST_CASE("BufferBase: Out of bound ranges 3", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, 0x310720); - buffer.UnmarkRegionAsCpuModified(c, 0x310720); - REQUIRE(rasterizer.Count(c) == 1); - REQUIRE(rasterizer.Count(c + PAGE) == 1); - REQUIRE(rasterizer.Count(c + WORD) == 1); - REQUIRE(rasterizer.Count(c + WORD + PAGE) == 1); -} - -TEST_CASE("BufferBase: Sparse regions 1", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD); - buffer.UnmarkRegionAsCpuModified(c, WORD); - buffer.MarkRegionAsCpuModified(c + PAGE * 1, PAGE); - buffer.MarkRegionAsCpuModified(c + PAGE * 3, PAGE * 4); - buffer.ForEachUploadRange(c, WORD, [i = 0](u64 offset, u64 size) mutable { - static constexpr std::array offsets{PAGE, PAGE * 3}; - static constexpr std::array sizes{PAGE, PAGE * 4}; - REQUIRE(offset == offsets.at(i)); - REQUIRE(size == sizes.at(i)); - ++i; - }); -} - -TEST_CASE("BufferBase: Sparse regions 2", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, 0x22000); - buffer.UnmarkRegionAsCpuModified(c, 0x22000); - REQUIRE(rasterizer.Count() == 0x22); - buffer.MarkRegionAsCpuModified(c + PAGE * 0x1B, PAGE); - buffer.MarkRegionAsCpuModified(c + PAGE * 0x21, PAGE); - buffer.ForEachUploadRange(c, WORD, [i = 0](u64 offset, u64 size) mutable { - static constexpr std::array offsets{PAGE * 0x1B, PAGE * 0x21}; - static constexpr std::array sizes{PAGE, PAGE}; - REQUIRE(offset == offsets.at(i)); - REQUIRE(size == sizes.at(i)); - ++i; - }); -} - -TEST_CASE("BufferBase: Single page modified range", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, PAGE); - REQUIRE(buffer.IsRegionCpuModified(c, PAGE)); - buffer.UnmarkRegionAsCpuModified(c, PAGE); - REQUIRE(!buffer.IsRegionCpuModified(c, PAGE)); -} - -TEST_CASE("BufferBase: Two page modified range", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, PAGE * 2); - REQUIRE(buffer.IsRegionCpuModified(c, PAGE)); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE, PAGE)); - REQUIRE(buffer.IsRegionCpuModified(c, PAGE * 2)); - buffer.UnmarkRegionAsCpuModified(c, PAGE); - REQUIRE(!buffer.IsRegionCpuModified(c, PAGE)); -} - -TEST_CASE("BufferBase: Multi word modified ranges", "[video_core]") { - for (int offset = 0; offset < 4; ++offset) { - const VAddr address = c + WORD * offset; - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, address, WORD * 4); - REQUIRE(buffer.IsRegionCpuModified(address, PAGE)); - REQUIRE(buffer.IsRegionCpuModified(address + PAGE * 48, PAGE)); - REQUIRE(buffer.IsRegionCpuModified(address + PAGE * 56, PAGE)); - - buffer.UnmarkRegionAsCpuModified(address + PAGE * 32, PAGE); - REQUIRE(buffer.IsRegionCpuModified(address + PAGE, WORD)); - REQUIRE(buffer.IsRegionCpuModified(address + PAGE * 31, PAGE)); - REQUIRE(!buffer.IsRegionCpuModified(address + PAGE * 32, PAGE)); - REQUIRE(buffer.IsRegionCpuModified(address + PAGE * 33, PAGE)); - REQUIRE(buffer.IsRegionCpuModified(address + PAGE * 31, PAGE * 2)); - REQUIRE(buffer.IsRegionCpuModified(address + PAGE * 32, PAGE * 2)); - - buffer.UnmarkRegionAsCpuModified(address + PAGE * 33, PAGE); - REQUIRE(!buffer.IsRegionCpuModified(address + PAGE * 32, PAGE * 2)); - } -} - -TEST_CASE("BufferBase: Single page in large buffer", "[video_core]") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD * 16); - buffer.UnmarkRegionAsCpuModified(c, WORD * 16); - REQUIRE(!buffer.IsRegionCpuModified(c, WORD * 16)); - - buffer.MarkRegionAsCpuModified(c + WORD * 12 + PAGE * 8, PAGE); - REQUIRE(buffer.IsRegionCpuModified(c, WORD * 16)); - REQUIRE(buffer.IsRegionCpuModified(c + WORD * 10, WORD * 2)); - REQUIRE(buffer.IsRegionCpuModified(c + WORD * 11, WORD * 2)); - REQUIRE(buffer.IsRegionCpuModified(c + WORD * 12, WORD * 2)); - REQUIRE(buffer.IsRegionCpuModified(c + WORD * 12 + PAGE * 4, PAGE * 8)); - REQUIRE(buffer.IsRegionCpuModified(c + WORD * 12 + PAGE * 6, PAGE * 8)); - REQUIRE(!buffer.IsRegionCpuModified(c + WORD * 12 + PAGE * 6, PAGE)); - REQUIRE(buffer.IsRegionCpuModified(c + WORD * 12 + PAGE * 7, PAGE * 2)); - REQUIRE(buffer.IsRegionCpuModified(c + WORD * 12 + PAGE * 8, PAGE * 2)); -} - -TEST_CASE("BufferBase: Out of bounds region query") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD * 16); - REQUIRE(!buffer.IsRegionCpuModified(c - PAGE, PAGE)); - REQUIRE(!buffer.IsRegionCpuModified(c - PAGE * 2, PAGE)); - REQUIRE(!buffer.IsRegionCpuModified(c + WORD * 16, PAGE)); - REQUIRE(buffer.IsRegionCpuModified(c + WORD * 16 - PAGE, WORD * 64)); - REQUIRE(!buffer.IsRegionCpuModified(c + WORD * 16, WORD * 64)); -} - -TEST_CASE("BufferBase: Wrap word regions") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD * 2); - buffer.UnmarkRegionAsCpuModified(c, WORD * 2); - buffer.MarkRegionAsCpuModified(c + PAGE * 63, PAGE * 2); - REQUIRE(buffer.IsRegionCpuModified(c, WORD * 2)); - REQUIRE(!buffer.IsRegionCpuModified(c + PAGE * 62, PAGE)); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE * 63, PAGE)); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE * 64, PAGE)); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE * 63, PAGE * 2)); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE * 63, PAGE * 8)); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE * 60, PAGE * 8)); - - REQUIRE(!buffer.IsRegionCpuModified(c + PAGE * 127, WORD * 16)); - buffer.MarkRegionAsCpuModified(c + PAGE * 127, PAGE); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE * 127, WORD * 16)); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE * 127, PAGE)); - REQUIRE(!buffer.IsRegionCpuModified(c + PAGE * 126, PAGE)); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE * 126, PAGE * 2)); - REQUIRE(!buffer.IsRegionCpuModified(c + PAGE * 128, WORD * 16)); -} - -TEST_CASE("BufferBase: Unaligned page region query") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD); - buffer.UnmarkRegionAsCpuModified(c, WORD); - buffer.MarkRegionAsCpuModified(c + 4000, 1000); - REQUIRE(buffer.IsRegionCpuModified(c, PAGE)); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE, PAGE)); - REQUIRE(buffer.IsRegionCpuModified(c + 4000, 1000)); - REQUIRE(buffer.IsRegionCpuModified(c + 4000, 1)); -} - -TEST_CASE("BufferBase: Cached write") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD); - buffer.UnmarkRegionAsCpuModified(c, WORD); - buffer.CachedCpuWrite(c + PAGE, PAGE); - REQUIRE(!buffer.IsRegionCpuModified(c + PAGE, PAGE)); - buffer.FlushCachedWrites(); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE, PAGE)); - buffer.MarkRegionAsCpuModified(c, WORD); - REQUIRE(rasterizer.Count() == 0); -} - -TEST_CASE("BufferBase: Multiple cached write") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD); - buffer.UnmarkRegionAsCpuModified(c, WORD); - buffer.CachedCpuWrite(c + PAGE, PAGE); - buffer.CachedCpuWrite(c + PAGE * 3, PAGE); - REQUIRE(!buffer.IsRegionCpuModified(c + PAGE, PAGE)); - REQUIRE(!buffer.IsRegionCpuModified(c + PAGE * 3, PAGE)); - buffer.FlushCachedWrites(); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE, PAGE)); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE * 3, PAGE)); - buffer.MarkRegionAsCpuModified(c, WORD); - REQUIRE(rasterizer.Count() == 0); -} - -TEST_CASE("BufferBase: Cached write unmarked") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD); - buffer.UnmarkRegionAsCpuModified(c, WORD); - buffer.CachedCpuWrite(c + PAGE, PAGE); - buffer.UnmarkRegionAsCpuModified(c + PAGE, PAGE); - REQUIRE(!buffer.IsRegionCpuModified(c + PAGE, PAGE)); - buffer.FlushCachedWrites(); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE, PAGE)); - buffer.MarkRegionAsCpuModified(c, WORD); - REQUIRE(rasterizer.Count() == 0); -} - -TEST_CASE("BufferBase: Cached write iterated") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD); - buffer.UnmarkRegionAsCpuModified(c, WORD); - buffer.CachedCpuWrite(c + PAGE, PAGE); - int num = 0; - buffer.ForEachUploadRange(c, WORD, [&](u64 offset, u64 size) { ++num; }); - REQUIRE(num == 0); - REQUIRE(!buffer.IsRegionCpuModified(c + PAGE, PAGE)); - buffer.FlushCachedWrites(); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE, PAGE)); - buffer.MarkRegionAsCpuModified(c, WORD); - REQUIRE(rasterizer.Count() == 0); -} - -TEST_CASE("BufferBase: Cached write downloads") { - RasterizerInterface rasterizer; - BufferBase buffer(rasterizer, c, WORD); - buffer.UnmarkRegionAsCpuModified(c, WORD); - REQUIRE(rasterizer.Count() == 64); - buffer.CachedCpuWrite(c + PAGE, PAGE); - REQUIRE(rasterizer.Count() == 63); - buffer.MarkRegionAsGpuModified(c + PAGE, PAGE); - int num = 0; - buffer.ForEachDownloadRangeAndClear(c, WORD, [&](u64 offset, u64 size) { ++num; }); - buffer.ForEachUploadRange(c, WORD, [&](u64 offset, u64 size) { ++num; }); - REQUIRE(num == 0); - REQUIRE(!buffer.IsRegionCpuModified(c + PAGE, PAGE)); - REQUIRE(!buffer.IsRegionGpuModified(c + PAGE, PAGE)); - buffer.FlushCachedWrites(); - REQUIRE(buffer.IsRegionCpuModified(c + PAGE, PAGE)); - REQUIRE(!buffer.IsRegionGpuModified(c + PAGE, PAGE)); - buffer.MarkRegionAsCpuModified(c, WORD); - REQUIRE(rasterizer.Count() == 0); -} diff --git a/src/tests/video_core/memory_tracker.cpp b/src/tests/video_core/memory_tracker.cpp new file mode 100644 index 000000000..77d391f15 --- /dev/null +++ b/src/tests/video_core/memory_tracker.cpp @@ -0,0 +1,547 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#include +#include +#include + +#include + +#include "common/alignment.h" +#include "common/common_types.h" +#include "video_core/buffer_cache/memory_tracker_base.h" + +namespace { +using Range = std::pair; + +constexpr u64 PAGE = 4096; +constexpr u64 WORD = 4096 * 64; +constexpr u64 HIGH_PAGE_BITS = 22; +constexpr u64 HIGH_PAGE_SIZE = 1ULL << HIGH_PAGE_BITS; + +constexpr VAddr c = 16 * HIGH_PAGE_SIZE; + +class RasterizerInterface { +public: + void UpdatePagesCachedCount(VAddr addr, u64 size, int delta) { + const u64 page_start{addr >> Core::Memory::YUZU_PAGEBITS}; + const u64 page_end{(addr + size + Core::Memory::YUZU_PAGESIZE - 1) >> + Core::Memory::YUZU_PAGEBITS}; + for (u64 page = page_start; page < page_end; ++page) { + int& value = page_table[page]; + value += delta; + if (value < 0) { + throw std::logic_error{"negative page"}; + } + if (value == 0) { + page_table.erase(page); + } + } + } + + [[nodiscard]] int Count(VAddr addr) const noexcept { + const auto it = page_table.find(addr >> Core::Memory::YUZU_PAGEBITS); + return it == page_table.end() ? 0 : it->second; + } + + [[nodiscard]] unsigned Count() const noexcept { + unsigned count = 0; + for (const auto& [index, value] : page_table) { + count += value; + } + return count; + } + +private: + std::unordered_map page_table; +}; +} // Anonymous namespace + +using MemoryTracker = VideoCommon::MemoryTrackerBase; + +TEST_CASE("MemoryTracker: Small region", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + REQUIRE(rasterizer.Count() == 0); + memory_track->UnmarkRegionAsCpuModified(c, WORD); + REQUIRE(rasterizer.Count() == WORD / PAGE); + REQUIRE(memory_track->ModifiedCpuRegion(c, WORD) == Range{0, 0}); + + memory_track->MarkRegionAsCpuModified(c + PAGE, 1); + REQUIRE(memory_track->ModifiedCpuRegion(c, WORD) == Range{c + PAGE * 1, c + PAGE * 2}); +} + +TEST_CASE("MemoryTracker: Large region", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD * 32); + memory_track->MarkRegionAsCpuModified(c + 4096, WORD * 4); + REQUIRE(memory_track->ModifiedCpuRegion(c, WORD + PAGE * 2) == + Range{c + PAGE, c + WORD + PAGE * 2}); + REQUIRE(memory_track->ModifiedCpuRegion(c + PAGE * 2, PAGE * 6) == + Range{c + PAGE * 2, c + PAGE * 8}); + REQUIRE(memory_track->ModifiedCpuRegion(c, WORD * 32) == Range{c + PAGE, c + WORD * 4 + PAGE}); + REQUIRE(memory_track->ModifiedCpuRegion(c + WORD * 4, PAGE) == + Range{c + WORD * 4, c + WORD * 4 + PAGE}); + REQUIRE(memory_track->ModifiedCpuRegion(c + WORD * 3 + PAGE * 63, PAGE) == + Range{c + WORD * 3 + PAGE * 63, c + WORD * 4}); + + memory_track->MarkRegionAsCpuModified(c + WORD * 5 + PAGE * 6, PAGE); + memory_track->MarkRegionAsCpuModified(c + WORD * 5 + PAGE * 8, PAGE); + REQUIRE(memory_track->ModifiedCpuRegion(c + WORD * 5, WORD) == + Range{c + WORD * 5 + PAGE * 6, c + WORD * 5 + PAGE * 9}); + + memory_track->UnmarkRegionAsCpuModified(c + WORD * 5 + PAGE * 8, PAGE); + REQUIRE(memory_track->ModifiedCpuRegion(c + WORD * 5, WORD) == + Range{c + WORD * 5 + PAGE * 6, c + WORD * 5 + PAGE * 7}); + + memory_track->MarkRegionAsCpuModified(c + PAGE, WORD * 31 + PAGE * 63); + REQUIRE(memory_track->ModifiedCpuRegion(c, WORD * 32) == Range{c + PAGE, c + WORD * 32}); + + memory_track->UnmarkRegionAsCpuModified(c + PAGE * 4, PAGE); + memory_track->UnmarkRegionAsCpuModified(c + PAGE * 6, PAGE); + + memory_track->UnmarkRegionAsCpuModified(c, WORD * 32); + REQUIRE(memory_track->ModifiedCpuRegion(c, WORD * 32) == Range{0, 0}); +} + +TEST_CASE("MemoryTracker: Rasterizer counting", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + REQUIRE(rasterizer.Count() == 0); + memory_track->UnmarkRegionAsCpuModified(c, PAGE); + REQUIRE(rasterizer.Count() == 1); + memory_track->MarkRegionAsCpuModified(c, PAGE * 2); + REQUIRE(rasterizer.Count() == 0); + memory_track->UnmarkRegionAsCpuModified(c, PAGE); + memory_track->UnmarkRegionAsCpuModified(c + PAGE, PAGE); + REQUIRE(rasterizer.Count() == 2); + memory_track->MarkRegionAsCpuModified(c, PAGE * 2); + REQUIRE(rasterizer.Count() == 0); +} + +TEST_CASE("MemoryTracker: Basic range", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD); + memory_track->MarkRegionAsCpuModified(c, PAGE); + int num = 0; + memory_track->ForEachUploadRange(c, WORD, [&](u64 offset, u64 size) { + REQUIRE(offset == c); + REQUIRE(size == PAGE); + ++num; + }); + REQUIRE(num == 1U); +} + +TEST_CASE("MemoryTracker: Border upload", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD * 2); + memory_track->MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); + memory_track->ForEachUploadRange(c, WORD * 2, [](u64 offset, u64 size) { + REQUIRE(offset == c + WORD - PAGE); + REQUIRE(size == PAGE * 2); + }); +} + +TEST_CASE("MemoryTracker: Border upload range", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD * 2); + memory_track->MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); + memory_track->ForEachUploadRange(c + WORD - PAGE, PAGE * 2, [](u64 offset, u64 size) { + REQUIRE(offset == c + WORD - PAGE); + REQUIRE(size == PAGE * 2); + }); + memory_track->MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); + memory_track->ForEachUploadRange(c + WORD - PAGE, PAGE, [](u64 offset, u64 size) { + REQUIRE(offset == c + WORD - PAGE); + REQUIRE(size == PAGE); + }); + memory_track->ForEachUploadRange(c + WORD, PAGE, [](u64 offset, u64 size) { + REQUIRE(offset == c + WORD); + REQUIRE(size == PAGE); + }); +} + +TEST_CASE("MemoryTracker: Border upload partial range", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD * 2); + memory_track->MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); + memory_track->ForEachUploadRange(c + WORD - 1, 2, [](u64 offset, u64 size) { + REQUIRE(offset == c + WORD - PAGE); + REQUIRE(size == PAGE * 2); + }); + memory_track->MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); + memory_track->ForEachUploadRange(c + WORD - 1, 1, [](u64 offset, u64 size) { + REQUIRE(offset == c + WORD - PAGE); + REQUIRE(size == PAGE); + }); + memory_track->ForEachUploadRange(c + WORD + 50, 1, [](u64 offset, u64 size) { + REQUIRE(offset == c + WORD); + REQUIRE(size == PAGE); + }); +} + +TEST_CASE("MemoryTracker: Partial word uploads", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + int num = 0; + memory_track->ForEachUploadRange(c, WORD, [&](u64 offset, u64 size) { + REQUIRE(offset == c); + REQUIRE(size == WORD); + ++num; + }); + REQUIRE(num == 1); + memory_track->ForEachUploadRange(c + WORD, WORD, [&](u64 offset, u64 size) { + REQUIRE(offset == c + WORD); + REQUIRE(size == WORD); + ++num; + }); + REQUIRE(num == 2); + memory_track->ForEachUploadRange(c + 0x79000, 0x24000, [&](u64 offset, u64 size) { + REQUIRE(offset == c + WORD * 2); + REQUIRE(size == PAGE * 0x1d); + ++num; + }); + REQUIRE(num == 3); +} + +TEST_CASE("MemoryTracker: Partial page upload", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD); + int num = 0; + memory_track->MarkRegionAsCpuModified(c + PAGE * 2, PAGE); + memory_track->MarkRegionAsCpuModified(c + PAGE * 9, PAGE); + memory_track->ForEachUploadRange(c, PAGE * 3, [&](u64 offset, u64 size) { + REQUIRE(offset == c + PAGE * 2); + REQUIRE(size == PAGE); + ++num; + }); + REQUIRE(num == 1); + memory_track->ForEachUploadRange(c + PAGE * 7, PAGE * 3, [&](u64 offset, u64 size) { + REQUIRE(offset == c + PAGE * 9); + REQUIRE(size == PAGE); + ++num; + }); + REQUIRE(num == 2); +} + +TEST_CASE("MemoryTracker: Partial page upload with multiple words on the right") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD * 9); + memory_track->MarkRegionAsCpuModified(c + PAGE * 13, WORD * 7); + int num = 0; + memory_track->ForEachUploadRange(c + PAGE * 10, WORD * 7, [&](u64 offset, u64 size) { + REQUIRE(offset == c + PAGE * 13); + REQUIRE(size == WORD * 7 - PAGE * 3); + ++num; + }); + REQUIRE(num == 1); + memory_track->ForEachUploadRange(c + PAGE, WORD * 8, [&](u64 offset, u64 size) { + REQUIRE(offset == c + WORD * 7 + PAGE * 10); + REQUIRE(size == PAGE * 3); + ++num; + }); + REQUIRE(num == 2); +} + +TEST_CASE("MemoryTracker: Partial page upload with multiple words on the left", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD * 8); + memory_track->MarkRegionAsCpuModified(c + PAGE * 13, WORD * 7); + int num = 0; + memory_track->ForEachUploadRange(c + PAGE * 16, WORD * 7, [&](u64 offset, u64 size) { + REQUIRE(offset == c + PAGE * 16); + REQUIRE(size == WORD * 7 - PAGE * 3); + ++num; + }); + REQUIRE(num == 1); + memory_track->ForEachUploadRange(c + PAGE, WORD, [&](u64 offset, u64 size) { + REQUIRE(offset == c + PAGE * 13); + REQUIRE(size == PAGE * 3); + ++num; + }); + REQUIRE(num == 2); +} + +TEST_CASE("MemoryTracker: Partial page upload with multiple words in the middle", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD * 8); + memory_track->MarkRegionAsCpuModified(c + PAGE * 13, PAGE * 140); + int num = 0; + memory_track->ForEachUploadRange(c + PAGE * 16, WORD, [&](u64 offset, u64 size) { + REQUIRE(offset == c + PAGE * 16); + REQUIRE(size == WORD); + ++num; + }); + REQUIRE(num == 1); + memory_track->ForEachUploadRange(c, WORD, [&](u64 offset, u64 size) { + REQUIRE(offset == c + PAGE * 13); + REQUIRE(size == PAGE * 3); + ++num; + }); + REQUIRE(num == 2); + memory_track->ForEachUploadRange(c, WORD * 8, [&](u64 offset, u64 size) { + REQUIRE(offset == c + WORD + PAGE * 16); + REQUIRE(size == PAGE * 73); + ++num; + }); + REQUIRE(num == 3); +} + +TEST_CASE("MemoryTracker: Empty right bits", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD * 2048); + memory_track->MarkRegionAsCpuModified(c + WORD - PAGE, PAGE * 2); + memory_track->ForEachUploadRange(c, WORD * 2048, [](u64 offset, u64 size) { + REQUIRE(offset == c + WORD - PAGE); + REQUIRE(size == PAGE * 2); + }); +} + +TEST_CASE("MemoryTracker: Out of bound ranges 1", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c - WORD, 3 * WORD); + memory_track->MarkRegionAsCpuModified(c, PAGE); + REQUIRE(rasterizer.Count() == (3 * WORD - PAGE) / PAGE); + int num = 0; + memory_track->ForEachUploadRange(c - WORD, WORD, [&](u64 offset, u64 size) { ++num; }); + memory_track->ForEachUploadRange(c + WORD, WORD, [&](u64 offset, u64 size) { ++num; }); + memory_track->ForEachUploadRange(c - PAGE, PAGE, [&](u64 offset, u64 size) { ++num; }); + REQUIRE(num == 0); + memory_track->ForEachUploadRange(c - PAGE, PAGE * 2, [&](u64 offset, u64 size) { ++num; }); + REQUIRE(num == 1); + memory_track->MarkRegionAsCpuModified(c, WORD); + REQUIRE(rasterizer.Count() == 2 * WORD / PAGE); +} + +TEST_CASE("MemoryTracker: Out of bound ranges 2", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + REQUIRE_NOTHROW(memory_track->UnmarkRegionAsCpuModified(c + 0x22000, PAGE)); + REQUIRE_NOTHROW(memory_track->UnmarkRegionAsCpuModified(c + 0x28000, PAGE)); + REQUIRE(rasterizer.Count() == 2); + REQUIRE_NOTHROW(memory_track->UnmarkRegionAsCpuModified(c + 0x21100, PAGE - 0x100)); + REQUIRE(rasterizer.Count() == 3); + REQUIRE_NOTHROW(memory_track->UnmarkRegionAsCpuModified(c - PAGE, PAGE * 2)); + memory_track->UnmarkRegionAsCpuModified(c - PAGE * 3, PAGE * 2); + memory_track->UnmarkRegionAsCpuModified(c - PAGE * 2, PAGE * 2); + REQUIRE(rasterizer.Count() == 7); +} + +TEST_CASE("MemoryTracker: Out of bound ranges 3", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, 0x310720); + REQUIRE(rasterizer.Count(c) == 1); + REQUIRE(rasterizer.Count(c + PAGE) == 1); + REQUIRE(rasterizer.Count(c + WORD) == 1); + REQUIRE(rasterizer.Count(c + WORD + PAGE) == 1); +} + +TEST_CASE("MemoryTracker: Sparse regions 1", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD); + memory_track->MarkRegionAsCpuModified(c + PAGE * 1, PAGE); + memory_track->MarkRegionAsCpuModified(c + PAGE * 3, PAGE * 4); + memory_track->ForEachUploadRange(c, WORD, [i = 0](u64 offset, u64 size) mutable { + static constexpr std::array offsets{c + PAGE, c + PAGE * 3}; + static constexpr std::array sizes{PAGE, PAGE * 4}; + REQUIRE(offset == offsets.at(i)); + REQUIRE(size == sizes.at(i)); + ++i; + }); +} + +TEST_CASE("MemoryTracker: Sparse regions 2", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, PAGE * 0x23); + REQUIRE(rasterizer.Count() == 0x23); + memory_track->MarkRegionAsCpuModified(c + PAGE * 0x1B, PAGE); + memory_track->MarkRegionAsCpuModified(c + PAGE * 0x21, PAGE); + memory_track->ForEachUploadRange(c, PAGE * 0x23, [i = 0](u64 offset, u64 size) mutable { + static constexpr std::array offsets{c + PAGE * 0x1B, c + PAGE * 0x21}; + static constexpr std::array sizes{PAGE, PAGE}; + REQUIRE(offset == offsets.at(i)); + REQUIRE(size == sizes.at(i)); + ++i; + }); +} + +TEST_CASE("MemoryTracker: Single page modified range", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + REQUIRE(memory_track->IsRegionCpuModified(c, PAGE)); + memory_track->UnmarkRegionAsCpuModified(c, PAGE); + REQUIRE(!memory_track->IsRegionCpuModified(c, PAGE)); +} + +TEST_CASE("MemoryTracker: Two page modified range", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + REQUIRE(memory_track->IsRegionCpuModified(c, PAGE)); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE, PAGE)); + REQUIRE(memory_track->IsRegionCpuModified(c, PAGE * 2)); + memory_track->UnmarkRegionAsCpuModified(c, PAGE); + REQUIRE(!memory_track->IsRegionCpuModified(c, PAGE)); +} + +TEST_CASE("MemoryTracker: Multi word modified ranges", "[video_core]") { + for (int offset = 0; offset < 4; ++offset) { + const VAddr address = c + WORD * offset; + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + REQUIRE(memory_track->IsRegionCpuModified(address, PAGE)); + REQUIRE(memory_track->IsRegionCpuModified(address + PAGE * 48, PAGE)); + REQUIRE(memory_track->IsRegionCpuModified(address + PAGE * 56, PAGE)); + + memory_track->UnmarkRegionAsCpuModified(address + PAGE * 32, PAGE); + REQUIRE(memory_track->IsRegionCpuModified(address + PAGE, WORD)); + REQUIRE(memory_track->IsRegionCpuModified(address + PAGE * 31, PAGE)); + REQUIRE(!memory_track->IsRegionCpuModified(address + PAGE * 32, PAGE)); + REQUIRE(memory_track->IsRegionCpuModified(address + PAGE * 33, PAGE)); + REQUIRE(memory_track->IsRegionCpuModified(address + PAGE * 31, PAGE * 2)); + REQUIRE(memory_track->IsRegionCpuModified(address + PAGE * 32, PAGE * 2)); + + memory_track->UnmarkRegionAsCpuModified(address + PAGE * 33, PAGE); + REQUIRE(!memory_track->IsRegionCpuModified(address + PAGE * 32, PAGE * 2)); + } +} + +TEST_CASE("MemoryTracker: Single page in large region", "[video_core]") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD * 16); + REQUIRE(!memory_track->IsRegionCpuModified(c, WORD * 16)); + + memory_track->MarkRegionAsCpuModified(c + WORD * 12 + PAGE * 8, PAGE); + REQUIRE(memory_track->IsRegionCpuModified(c, WORD * 16)); + REQUIRE(memory_track->IsRegionCpuModified(c + WORD * 10, WORD * 2)); + REQUIRE(memory_track->IsRegionCpuModified(c + WORD * 11, WORD * 2)); + REQUIRE(memory_track->IsRegionCpuModified(c + WORD * 12, WORD * 2)); + REQUIRE(memory_track->IsRegionCpuModified(c + WORD * 12 + PAGE * 4, PAGE * 8)); + REQUIRE(memory_track->IsRegionCpuModified(c + WORD * 12 + PAGE * 6, PAGE * 8)); + REQUIRE(!memory_track->IsRegionCpuModified(c + WORD * 12 + PAGE * 6, PAGE)); + REQUIRE(memory_track->IsRegionCpuModified(c + WORD * 12 + PAGE * 7, PAGE * 2)); + REQUIRE(memory_track->IsRegionCpuModified(c + WORD * 12 + PAGE * 8, PAGE * 2)); +} + +TEST_CASE("MemoryTracker: Wrap word regions") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD * 32); + memory_track->MarkRegionAsCpuModified(c + PAGE * 63, PAGE * 2); + REQUIRE(memory_track->IsRegionCpuModified(c, WORD * 2)); + REQUIRE(!memory_track->IsRegionCpuModified(c + PAGE * 62, PAGE)); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE * 63, PAGE)); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE * 64, PAGE)); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE * 63, PAGE * 2)); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE * 63, PAGE * 8)); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE * 60, PAGE * 8)); + + REQUIRE(!memory_track->IsRegionCpuModified(c + PAGE * 127, WORD * 16)); + memory_track->MarkRegionAsCpuModified(c + PAGE * 127, PAGE); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE * 127, WORD * 16)); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE * 127, PAGE)); + REQUIRE(!memory_track->IsRegionCpuModified(c + PAGE * 126, PAGE)); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE * 126, PAGE * 2)); + REQUIRE(!memory_track->IsRegionCpuModified(c + PAGE * 128, WORD * 16)); +} + +TEST_CASE("MemoryTracker: Unaligned page region query") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD); + memory_track->MarkRegionAsCpuModified(c + 4000, 1000); + REQUIRE(memory_track->IsRegionCpuModified(c, PAGE)); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE, PAGE)); + REQUIRE(memory_track->IsRegionCpuModified(c + 4000, 1000)); + REQUIRE(memory_track->IsRegionCpuModified(c + 4000, 1)); +} + +TEST_CASE("MemoryTracker: Cached write") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD); + memory_track->CachedCpuWrite(c + PAGE, c + PAGE); + REQUIRE(!memory_track->IsRegionCpuModified(c + PAGE, PAGE)); + memory_track->FlushCachedWrites(); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE, PAGE)); + memory_track->MarkRegionAsCpuModified(c, WORD); + REQUIRE(rasterizer.Count() == 0); +} + +TEST_CASE("MemoryTracker: Multiple cached write") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD); + memory_track->CachedCpuWrite(c + PAGE, PAGE); + memory_track->CachedCpuWrite(c + PAGE * 3, PAGE); + REQUIRE(!memory_track->IsRegionCpuModified(c + PAGE, PAGE)); + REQUIRE(!memory_track->IsRegionCpuModified(c + PAGE * 3, PAGE)); + memory_track->FlushCachedWrites(); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE, PAGE)); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE * 3, PAGE)); + memory_track->MarkRegionAsCpuModified(c, WORD); + REQUIRE(rasterizer.Count() == 0); +} + +TEST_CASE("MemoryTracker: Cached write unmarked") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD); + memory_track->CachedCpuWrite(c + PAGE, PAGE); + memory_track->UnmarkRegionAsCpuModified(c + PAGE, PAGE); + REQUIRE(!memory_track->IsRegionCpuModified(c + PAGE, PAGE)); + memory_track->FlushCachedWrites(); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE, PAGE)); + memory_track->MarkRegionAsCpuModified(c, WORD); + REQUIRE(rasterizer.Count() == 0); +} + +TEST_CASE("MemoryTracker: Cached write iterated") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD); + memory_track->CachedCpuWrite(c + PAGE, PAGE); + int num = 0; + memory_track->ForEachUploadRange(c, WORD, [&](u64 offset, u64 size) { ++num; }); + REQUIRE(num == 0); + REQUIRE(!memory_track->IsRegionCpuModified(c + PAGE, PAGE)); + memory_track->FlushCachedWrites(); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE, PAGE)); + memory_track->MarkRegionAsCpuModified(c, WORD); + REQUIRE(rasterizer.Count() == 0); +} + +TEST_CASE("MemoryTracker: Cached write downloads") { + RasterizerInterface rasterizer; + std::unique_ptr memory_track(std::make_unique(rasterizer)); + memory_track->UnmarkRegionAsCpuModified(c, WORD); + REQUIRE(rasterizer.Count() == 64); + memory_track->CachedCpuWrite(c + PAGE, PAGE); + REQUIRE(rasterizer.Count() == 63); + memory_track->MarkRegionAsGpuModified(c + PAGE, PAGE); + int num = 0; + memory_track->ForEachDownloadRangeAndClear(c, WORD, [&](u64 offset, u64 size) { ++num; }); + memory_track->ForEachUploadRange(c, WORD, [&](u64 offset, u64 size) { ++num; }); + REQUIRE(num == 0); + REQUIRE(!memory_track->IsRegionCpuModified(c + PAGE, PAGE)); + REQUIRE(!memory_track->IsRegionGpuModified(c + PAGE, PAGE)); + memory_track->FlushCachedWrites(); + REQUIRE(memory_track->IsRegionCpuModified(c + PAGE, PAGE)); + REQUIRE(!memory_track->IsRegionGpuModified(c + PAGE, PAGE)); + memory_track->MarkRegionAsCpuModified(c, WORD); + REQUIRE(rasterizer.Count() == 0); +} \ No newline at end of file From f8d31d1ae18c27be37590a7d15e5e7b691bed14f Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 23 Apr 2023 21:03:50 +0200 Subject: [PATCH 0288/1181] Buffer Cache: Release stagging buffers on tick frame --- src/video_core/buffer_cache/buffer_cache.h | 28 ++++++++++++++----- .../buffer_cache/buffer_cache_base.h | 6 +--- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 8fed08dab..e5c626c36 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -22,7 +22,7 @@ BufferCache

::BufferCache(VideoCore::RasterizerInterface& rasterizer_, void(slot_buffers.insert(runtime, NullBufferParams{})); common_ranges.clear(); - active_async_buffers = IMPLEMENTS_ASYNC_DOWNLOADS && !Settings::IsGPULevelHigh(); + active_async_buffers = !Settings::IsGPULevelHigh(); if (!runtime.CanReportMemoryUsage()) { minimum_memory = DEFAULT_EXPECTED_MEMORY; @@ -74,7 +74,7 @@ void BufferCache

::TickFrame() { uniform_cache_hits[0] = 0; uniform_cache_shots[0] = 0; - active_async_buffers = IMPLEMENTS_ASYNC_DOWNLOADS && !Settings::IsGPULevelHigh(); + active_async_buffers = !Settings::IsGPULevelHigh(); const bool skip_preferred = hits * 256 < shots * 251; uniform_buffer_skip_cache_size = skip_preferred ? DEFAULT_SKIP_CACHE_SIZE : 0; @@ -88,6 +88,13 @@ void BufferCache

::TickFrame() { } ++frame_tick; delayed_destruction_ring.Tick(); + + if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + for (auto& buffer : async_buffers_death_ring) { + runtime.FreeDeferredStagingBuffer(buffer); + } + async_buffers_death_ring.clear(); + } } template @@ -468,8 +475,10 @@ void BufferCache

::CommitAsyncFlushesHigh() { AccumulateFlushes(); if (committed_ranges.empty()) { - if (active_async_buffers) { - async_buffers.emplace_back(std::optional{}); + if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + if (active_async_buffers) { + async_buffers.emplace_back(std::optional{}); + } } return; } @@ -529,8 +538,10 @@ void BufferCache

::CommitAsyncFlushesHigh() { } committed_ranges.clear(); if (downloads.empty()) { - if (active_async_buffers) { - async_buffers.emplace_back(std::optional{}); + if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + if (active_async_buffers) { + async_buffers.emplace_back(std::optional{}); + } } return; } @@ -555,6 +566,9 @@ void BufferCache

::CommitAsyncFlushesHigh() { runtime.PostCopyBarrier(); pending_downloads.emplace_back(std::move(normalized_copies)); async_buffers.emplace_back(download_staging); + } else { + committed_ranges.clear(); + uncommitted_ranges.clear(); } } else { if constexpr (USE_MEMORY_MAPS) { @@ -629,7 +643,7 @@ void BufferCache

::PopAsyncBuffers() { const IntervalType subtract_interval{cpu_addr, cpu_addr + copy.size}; RemoveEachInOverlapCounter(async_downloads, subtract_interval, -1); } - runtime.FreeDeferredStagingBuffer(*async_buffer); + async_buffers_death_ring.emplace_back(*async_buffer); async_buffers.pop_front(); pending_downloads.pop_front(); } diff --git a/src/video_core/buffer_cache/buffer_cache_base.h b/src/video_core/buffer_cache/buffer_cache_base.h index acff22d4f..75cb98ba3 100644 --- a/src/video_core/buffer_cache/buffer_cache_base.h +++ b/src/video_core/buffer_cache/buffer_cache_base.h @@ -554,11 +554,7 @@ private: std::deque> pending_downloads; std::optional current_buffer; - // queries - boost::container::small_vector, 8> pending_queries; - std::deque> committed_queries; - boost::container::small_vector flushed_queries; - std::deque> query_async_buffers; + std::deque async_buffers_death_ring; size_t immediate_buffer_capacity = 0; Common::ScratchBuffer immediate_buffer_alloc; From 4bc5469f52157cd18e697120df40e40e32365e89 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 23 Apr 2023 21:37:13 +0200 Subject: [PATCH 0289/1181] Texture Cache: Release stagging buffers on tick frame --- .../renderer_opengl/gl_texture_cache.cpp | 19 ++++++++++------ .../renderer_opengl/gl_texture_cache.h | 5 ++++- .../renderer_vulkan/vk_texture_cache.cpp | 13 ++++++++++- .../renderer_vulkan/vk_texture_cache.h | 5 ++++- src/video_core/texture_cache/texture_cache.h | 22 +++++++++++-------- .../texture_cache/texture_cache_base.h | 1 + 6 files changed, 46 insertions(+), 19 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index 670d8cafd..032a8ebc5 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -801,14 +801,22 @@ void Image::UploadMemory(const ImageBufferMap& map, UploadMemory(map.buffer, map.offset, copies); } -void Image::DownloadMemory(std::span buffer_handles, size_t buffer_offset, +void Image::DownloadMemory(GLuint buffer_handle, size_t buffer_offset, + std::span copies) { + std::array buffer_handles{buffer_handle}; + std::array buffer_offsets{buffer_offset}; + DownloadMemory(buffer_handles, buffer_offsets, copies); +} + +void Image::DownloadMemory(std::span buffer_handles, std::span buffer_offsets, std::span copies) { const bool is_rescaled = True(flags & ImageFlagBits::Rescaled); if (is_rescaled) { ScaleDown(); } glMemoryBarrier(GL_PIXEL_BUFFER_BARRIER_BIT); // TODO: Move this to its own API - for (auto buffer_handle : buffer_handles) { + for (size_t i = 0; i < buffer_handles.size(); i++) { + auto& buffer_handle = buffer_handles[i]; glBindBuffer(GL_PIXEL_PACK_BUFFER, buffer_handle); glPixelStorei(GL_PACK_ALIGNMENT, 1); @@ -827,7 +835,7 @@ void Image::DownloadMemory(std::span buffer_handles, size_t buffer_offse current_image_height = copy.buffer_image_height; glPixelStorei(GL_PACK_IMAGE_HEIGHT, current_image_height); } - CopyImageToBuffer(copy, buffer_offset); + CopyImageToBuffer(copy, buffer_offsets[i]); } } if (is_rescaled) { @@ -837,10 +845,7 @@ void Image::DownloadMemory(std::span buffer_handles, size_t buffer_offse void Image::DownloadMemory(ImageBufferMap& map, std::span copies) { - std::array buffers{ - map.buffer, - }; - DownloadMemory(buffers, map.offset, copies); + DownloadMemory(map.buffer, map.offset, copies); } GLuint Image::StorageHandle() noexcept { diff --git a/src/video_core/renderer_opengl/gl_texture_cache.h b/src/video_core/renderer_opengl/gl_texture_cache.h index 67d6910b4..0dd039ed2 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.h +++ b/src/video_core/renderer_opengl/gl_texture_cache.h @@ -212,7 +212,10 @@ public: void UploadMemory(const ImageBufferMap& map, std::span copies); - void DownloadMemory(std::span buffer_handle, size_t buffer_offset, + void DownloadMemory(GLuint buffer_handle, size_t buffer_offset, + std::span copies); + + void DownloadMemory(std::span buffer_handle, std::span buffer_offset, std::span copies); void DownloadMemory(ImageBufferMap& map, std::span copies); diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index da3841bb3..d0a7d8f35 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later #include @@ -1342,6 +1342,17 @@ void Image::UploadMemory(const StagingBufferRef& map, std::span copies) { + std::array buffer_handles{ + buffer, + }; + std::array buffer_offsets{ + offset, + }; + DownloadMemory(buffer_handles, buffer_offsets, copies); +} + void Image::DownloadMemory(std::span buffers_span, std::span offsets_span, std::span copies) { const bool is_rescaled = True(flags & ImageFlagBits::Rescaled); diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index bdaf43ba4..c656c5386 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later #pragma once @@ -138,6 +138,9 @@ public: void UploadMemory(const StagingBufferRef& map, std::span copies); + void DownloadMemory(VkBuffer buffer, VkDeviceSize offset, + std::span copies); + void DownloadMemory(std::span buffers, std::span offsets, std::span copies); diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 543ceb5aa..e601f8446 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -139,6 +139,13 @@ void TextureCache

::TickFrame() { runtime.TickFrame(); critical_gc = 0; ++frame_tick; + + if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + for (auto& buffer : async_buffers_death_ring) { + runtime.FreeDeferredStagingBuffer(buffer); + } + async_buffers_death_ring.clear(); + } } template @@ -688,10 +695,10 @@ void TextureCache

::CommitAsyncFlushes() { } uncommitted_async_buffers.emplace_back(download_map); } + async_buffers.emplace_back(std::move(uncommitted_async_buffers)); + uncommitted_async_buffers.clear(); } committed_downloads.emplace_back(std::move(uncommitted_downloads)); - async_buffers.emplace_back(std::move(uncommitted_async_buffers)); - uncommitted_async_buffers.clear(); uncommitted_downloads.clear(); } @@ -729,7 +736,7 @@ void TextureCache

::PopAsyncFlushes() { } } for (auto& download_buffer : download_map) { - runtime.FreeDeferredStagingBuffer(download_buffer); + async_buffers_death_ring.emplace_back(download_buffer); } committed_downloads.pop_front(); async_buffers.pop_front(); @@ -748,7 +755,7 @@ void TextureCache

::PopAsyncFlushes() { auto download_map = runtime.DownloadStagingBuffer(total_size_bytes); const size_t original_offset = download_map.offset; for (const PendingDownload& download_info : download_ids) { - if (download_info.is_swizzle) { + if (!download_info.is_swizzle) { continue; } Image& image = slot_images[download_info.object_id]; @@ -761,7 +768,7 @@ void TextureCache

::PopAsyncFlushes() { download_map.offset = original_offset; std::span download_span = download_map.mapped_span; for (const PendingDownload& download_info : download_ids) { - if (download_info.is_swizzle) { + if (!download_info.is_swizzle) { continue; } const ImageBase& image = slot_images[download_info.object_id]; @@ -887,10 +894,7 @@ void TextureCache

::DownloadImageIntoBuffer(typename TextureCache

::Image* i }; image->DownloadMemory(buffers, buffer_offsets, copies); } else { - std::array buffers{ - buffer, - }; - image->DownloadMemory(buffers, buffer_offset, copies); + image->DownloadMemory(buffer, buffer_offset, copies); } } diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index bb9ddb70e..758b7e212 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h @@ -449,6 +449,7 @@ private: std::deque> committed_downloads; std::vector uncommitted_async_buffers; std::deque> async_buffers; + std::deque async_buffers_death_ring; struct LRUItemParams { using ObjectType = ImageId; From 2afaa7aed7070907faed3d5f491672ea5f1aa480 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 29 Apr 2023 14:53:48 -0400 Subject: [PATCH 0290/1181] common: add intrusive list type --- src/common/intrusive_list.h | 631 ++++++++++++++++++++++++++++++++++++ 1 file changed, 631 insertions(+) create mode 100644 src/common/intrusive_list.h diff --git a/src/common/intrusive_list.h b/src/common/intrusive_list.h new file mode 100644 index 000000000..d330dc1c2 --- /dev/null +++ b/src/common/intrusive_list.h @@ -0,0 +1,631 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "common/common_funcs.h" +#include "common/parent_of_member.h" + +namespace Common { + +// Forward declare implementation class for Node. +namespace impl { + +class IntrusiveListImpl; + +} + +class IntrusiveListNode { + YUZU_NON_COPYABLE(IntrusiveListNode); + +private: + friend class impl::IntrusiveListImpl; + + IntrusiveListNode* m_prev; + IntrusiveListNode* m_next; + +public: + constexpr IntrusiveListNode() : m_prev(this), m_next(this) {} + + constexpr bool IsLinked() const { + return m_next != this; + } + +private: + constexpr void LinkPrev(IntrusiveListNode* node) { + // We can't link an already linked node. + ASSERT(!node->IsLinked()); + this->SplicePrev(node, node); + } + + constexpr void SplicePrev(IntrusiveListNode* first, IntrusiveListNode* last) { + // Splice a range into the list. + auto last_prev = last->m_prev; + first->m_prev = m_prev; + last_prev->m_next = this; + m_prev->m_next = first; + m_prev = last_prev; + } + + constexpr void LinkNext(IntrusiveListNode* node) { + // We can't link an already linked node. + ASSERT(!node->IsLinked()); + return this->SpliceNext(node, node); + } + + constexpr void SpliceNext(IntrusiveListNode* first, IntrusiveListNode* last) { + // Splice a range into the list. + auto last_prev = last->m_prev; + first->m_prev = this; + last_prev->m_next = m_next; + m_next->m_prev = last_prev; + m_next = first; + } + + constexpr void Unlink() { + this->Unlink(m_next); + } + + constexpr void Unlink(IntrusiveListNode* last) { + // Unlink a node from a next node. + auto last_prev = last->m_prev; + m_prev->m_next = last; + last->m_prev = m_prev; + last_prev->m_next = this; + m_prev = last_prev; + } + + constexpr IntrusiveListNode* GetPrev() { + return m_prev; + } + + constexpr const IntrusiveListNode* GetPrev() const { + return m_prev; + } + + constexpr IntrusiveListNode* GetNext() { + return m_next; + } + + constexpr const IntrusiveListNode* GetNext() const { + return m_next; + } +}; +// DEPRECATED: static_assert(std::is_literal_type::value); + +namespace impl { + +class IntrusiveListImpl { + YUZU_NON_COPYABLE(IntrusiveListImpl); + +private: + IntrusiveListNode m_root_node; + +public: + template + class Iterator; + + using value_type = IntrusiveListNode; + using size_type = size_t; + using difference_type = ptrdiff_t; + using pointer = value_type*; + using const_pointer = const value_type*; + using reference = value_type&; + using const_reference = const value_type&; + using iterator = Iterator; + using const_iterator = Iterator; + using reverse_iterator = std::reverse_iterator; + using const_reverse_iterator = std::reverse_iterator; + + template + class Iterator { + public: + using iterator_category = std::bidirectional_iterator_tag; + using value_type = typename IntrusiveListImpl::value_type; + using difference_type = typename IntrusiveListImpl::difference_type; + using pointer = + std::conditional_t; + using reference = std::conditional_t; + + private: + pointer m_node; + + public: + constexpr explicit Iterator(pointer n) : m_node(n) {} + + constexpr bool operator==(const Iterator& rhs) const { + return m_node == rhs.m_node; + } + + constexpr pointer operator->() const { + return m_node; + } + + constexpr reference operator*() const { + return *m_node; + } + + constexpr Iterator& operator++() { + m_node = m_node->m_next; + return *this; + } + + constexpr Iterator& operator--() { + m_node = m_node->m_prev; + return *this; + } + + constexpr Iterator operator++(int) { + const Iterator it{*this}; + ++(*this); + return it; + } + + constexpr Iterator operator--(int) { + const Iterator it{*this}; + --(*this); + return it; + } + + constexpr operator Iterator() const { + return Iterator(m_node); + } + + constexpr Iterator GetNonConstIterator() const { + return Iterator(const_cast(m_node)); + } + }; + +public: + constexpr IntrusiveListImpl() : m_root_node() {} + + // Iterator accessors. + constexpr iterator begin() { + return iterator(m_root_node.GetNext()); + } + + constexpr const_iterator begin() const { + return const_iterator(m_root_node.GetNext()); + } + + constexpr iterator end() { + return iterator(std::addressof(m_root_node)); + } + + constexpr const_iterator end() const { + return const_iterator(std::addressof(m_root_node)); + } + + constexpr iterator iterator_to(reference v) { + // Only allow iterator_to for values in lists. + ASSERT(v.IsLinked()); + return iterator(std::addressof(v)); + } + + constexpr const_iterator iterator_to(const_reference v) const { + // Only allow iterator_to for values in lists. + ASSERT(v.IsLinked()); + return const_iterator(std::addressof(v)); + } + + // Content management. + constexpr bool empty() const { + return !m_root_node.IsLinked(); + } + + constexpr size_type size() const { + return static_cast(std::distance(this->begin(), this->end())); + } + + constexpr reference back() { + return *m_root_node.GetPrev(); + } + + constexpr const_reference back() const { + return *m_root_node.GetPrev(); + } + + constexpr reference front() { + return *m_root_node.GetNext(); + } + + constexpr const_reference front() const { + return *m_root_node.GetNext(); + } + + constexpr void push_back(reference node) { + m_root_node.LinkPrev(std::addressof(node)); + } + + constexpr void push_front(reference node) { + m_root_node.LinkNext(std::addressof(node)); + } + + constexpr void pop_back() { + m_root_node.GetPrev()->Unlink(); + } + + constexpr void pop_front() { + m_root_node.GetNext()->Unlink(); + } + + constexpr iterator insert(const_iterator pos, reference node) { + pos.GetNonConstIterator()->LinkPrev(std::addressof(node)); + return iterator(std::addressof(node)); + } + + constexpr void splice(const_iterator pos, IntrusiveListImpl& o) { + splice_impl(pos, o.begin(), o.end()); + } + + constexpr void splice(const_iterator pos, IntrusiveListImpl& o, const_iterator first) { + const_iterator last(first); + std::advance(last, 1); + splice_impl(pos, first, last); + } + + constexpr void splice(const_iterator pos, IntrusiveListImpl& o, const_iterator first, + const_iterator last) { + splice_impl(pos, first, last); + } + + constexpr iterator erase(const_iterator pos) { + if (pos == this->end()) { + return this->end(); + } + iterator it(pos.GetNonConstIterator()); + (it++)->Unlink(); + return it; + } + + constexpr void clear() { + while (!this->empty()) { + this->pop_front(); + } + } + +private: + constexpr void splice_impl(const_iterator _pos, const_iterator _first, const_iterator _last) { + if (_first == _last) { + return; + } + iterator pos(_pos.GetNonConstIterator()); + iterator first(_first.GetNonConstIterator()); + iterator last(_last.GetNonConstIterator()); + first->Unlink(std::addressof(*last)); + pos->SplicePrev(std::addressof(*first), std::addressof(*first)); + } +}; + +} // namespace impl + +template +class IntrusiveList { + YUZU_NON_COPYABLE(IntrusiveList); + +private: + impl::IntrusiveListImpl m_impl; + +public: + template + class Iterator; + + using value_type = T; + using size_type = size_t; + using difference_type = ptrdiff_t; + using pointer = value_type*; + using const_pointer = const value_type*; + using reference = value_type&; + using const_reference = const value_type&; + using iterator = Iterator; + using const_iterator = Iterator; + using reverse_iterator = std::reverse_iterator; + using const_reverse_iterator = std::reverse_iterator; + + template + class Iterator { + public: + friend class Common::IntrusiveList; + + using ImplIterator = + std::conditional_t; + + using iterator_category = std::bidirectional_iterator_tag; + using value_type = typename IntrusiveList::value_type; + using difference_type = typename IntrusiveList::difference_type; + using pointer = + std::conditional_t; + using reference = + std::conditional_t; + + private: + ImplIterator m_iterator; + + private: + constexpr explicit Iterator(ImplIterator it) : m_iterator(it) {} + + constexpr ImplIterator GetImplIterator() const { + return m_iterator; + } + + public: + constexpr bool operator==(const Iterator& rhs) const { + return m_iterator == rhs.m_iterator; + } + + constexpr pointer operator->() const { + return std::addressof(Traits::GetParent(*m_iterator)); + } + + constexpr reference operator*() const { + return Traits::GetParent(*m_iterator); + } + + constexpr Iterator& operator++() { + ++m_iterator; + return *this; + } + + constexpr Iterator& operator--() { + --m_iterator; + return *this; + } + + constexpr Iterator operator++(int) { + const Iterator it{*this}; + ++m_iterator; + return it; + } + + constexpr Iterator operator--(int) { + const Iterator it{*this}; + --m_iterator; + return it; + } + + constexpr operator Iterator() const { + return Iterator(m_iterator); + } + }; + +private: + static constexpr IntrusiveListNode& GetNode(reference ref) { + return Traits::GetNode(ref); + } + + static constexpr IntrusiveListNode const& GetNode(const_reference ref) { + return Traits::GetNode(ref); + } + + static constexpr reference GetParent(IntrusiveListNode& node) { + return Traits::GetParent(node); + } + + static constexpr const_reference GetParent(IntrusiveListNode const& node) { + return Traits::GetParent(node); + } + +public: + constexpr IntrusiveList() : m_impl() {} + + // Iterator accessors. + constexpr iterator begin() { + return iterator(m_impl.begin()); + } + + constexpr const_iterator begin() const { + return const_iterator(m_impl.begin()); + } + + constexpr iterator end() { + return iterator(m_impl.end()); + } + + constexpr const_iterator end() const { + return const_iterator(m_impl.end()); + } + + constexpr const_iterator cbegin() const { + return this->begin(); + } + + constexpr const_iterator cend() const { + return this->end(); + } + + constexpr reverse_iterator rbegin() { + return reverse_iterator(this->end()); + } + + constexpr const_reverse_iterator rbegin() const { + return const_reverse_iterator(this->end()); + } + + constexpr reverse_iterator rend() { + return reverse_iterator(this->begin()); + } + + constexpr const_reverse_iterator rend() const { + return const_reverse_iterator(this->begin()); + } + + constexpr const_reverse_iterator crbegin() const { + return this->rbegin(); + } + + constexpr const_reverse_iterator crend() const { + return this->rend(); + } + + constexpr iterator iterator_to(reference v) { + return iterator(m_impl.iterator_to(GetNode(v))); + } + + constexpr const_iterator iterator_to(const_reference v) const { + return const_iterator(m_impl.iterator_to(GetNode(v))); + } + + // Content management. + constexpr bool empty() const { + return m_impl.empty(); + } + + constexpr size_type size() const { + return m_impl.size(); + } + + constexpr reference back() { + return GetParent(m_impl.back()); + } + + constexpr const_reference back() const { + return GetParent(m_impl.back()); + } + + constexpr reference front() { + return GetParent(m_impl.front()); + } + + constexpr const_reference front() const { + return GetParent(m_impl.front()); + } + + constexpr void push_back(reference ref) { + m_impl.push_back(GetNode(ref)); + } + + constexpr void push_front(reference ref) { + m_impl.push_front(GetNode(ref)); + } + + constexpr void pop_back() { + m_impl.pop_back(); + } + + constexpr void pop_front() { + m_impl.pop_front(); + } + + constexpr iterator insert(const_iterator pos, reference ref) { + return iterator(m_impl.insert(pos.GetImplIterator(), GetNode(ref))); + } + + constexpr void splice(const_iterator pos, IntrusiveList& o) { + m_impl.splice(pos.GetImplIterator(), o.m_impl); + } + + constexpr void splice(const_iterator pos, IntrusiveList& o, const_iterator first) { + m_impl.splice(pos.GetImplIterator(), o.m_impl, first.GetImplIterator()); + } + + constexpr void splice(const_iterator pos, IntrusiveList& o, const_iterator first, + const_iterator last) { + m_impl.splice(pos.GetImplIterator(), o.m_impl, first.GetImplIterator(), + last.GetImplIterator()); + } + + constexpr iterator erase(const_iterator pos) { + return iterator(m_impl.erase(pos.GetImplIterator())); + } + + constexpr void clear() { + m_impl.clear(); + } +}; + +template > +class IntrusiveListMemberTraits; + +template +class IntrusiveListMemberTraits { +public: + using ListType = IntrusiveList; + +private: + friend class IntrusiveList; + + static constexpr IntrusiveListNode& GetNode(Derived& parent) { + return parent.*Member; + } + + static constexpr IntrusiveListNode const& GetNode(Derived const& parent) { + return parent.*Member; + } + + static Derived& GetParent(IntrusiveListNode& node) { + return Common::GetParentReference(std::addressof(node)); + } + + static Derived const& GetParent(IntrusiveListNode const& node) { + return Common::GetParentReference(std::addressof(node)); + } +}; + +template > +class IntrusiveListMemberTraitsByNonConstexprOffsetOf; + +template +class IntrusiveListMemberTraitsByNonConstexprOffsetOf { +public: + using ListType = IntrusiveList; + +private: + friend class IntrusiveList; + + static constexpr IntrusiveListNode& GetNode(Derived& parent) { + return parent.*Member; + } + + static constexpr IntrusiveListNode const& GetNode(Derived const& parent) { + return parent.*Member; + } + + static Derived& GetParent(IntrusiveListNode& node) { + return *reinterpret_cast(reinterpret_cast(std::addressof(node)) - + GetOffset()); + } + + static Derived const& GetParent(IntrusiveListNode const& node) { + return *reinterpret_cast( + reinterpret_cast(std::addressof(node)) - GetOffset()); + } + + static uintptr_t GetOffset() { + return reinterpret_cast(std::addressof(reinterpret_cast(0)->*Member)); + } +}; + +template +class IntrusiveListBaseNode : public IntrusiveListNode {}; + +template +class IntrusiveListBaseTraits { +public: + using ListType = IntrusiveList; + +private: + friend class IntrusiveList; + + static constexpr IntrusiveListNode& GetNode(Derived& parent) { + return static_cast( + static_cast&>(parent)); + } + + static constexpr IntrusiveListNode const& GetNode(Derived const& parent) { + return static_cast( + static_cast&>(parent)); + } + + static constexpr Derived& GetParent(IntrusiveListNode& node) { + return static_cast(static_cast&>(node)); + } + + static constexpr Derived const& GetParent(IntrusiveListNode const& node) { + return static_cast( + static_cast&>(node)); + } +}; + +} // namespace Common From 1b5c87ab6aff8c53e4c27e916b282cce8073f118 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 29 Apr 2023 21:16:09 -0400 Subject: [PATCH 0291/1181] kernel: match calls to Register and Unregister --- src/core/core.cpp | 1 + src/core/hle/kernel/k_auto_object.h | 4 +-- src/core/hle/kernel/kernel.cpp | 31 ++++++++++++++++++++--- src/core/hle/service/ipc_helpers.h | 1 + src/core/hle/service/kernel_helpers.cpp | 3 +++ src/core/hle/service/mutex.cpp | 3 +++ src/core/hle/service/server_manager.cpp | 6 +++++ src/core/hle/service/sm/sm.cpp | 3 +++ src/core/hle/service/sm/sm_controller.cpp | 3 +++ 9 files changed, 50 insertions(+), 5 deletions(-) diff --git a/src/core/core.cpp b/src/core/core.cpp index caa6a77be..d7bf2bf51 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -293,6 +293,7 @@ struct System::Impl { ASSERT(Kernel::KProcess::Initialize(main_process, system, "main", Kernel::KProcess::ProcessType::Userland, resource_limit) .IsSuccess()); + Kernel::KProcess::Register(system.Kernel(), main_process); kernel.MakeApplicationProcess(main_process); const auto [load_result, load_parameters] = app_loader->Load(*main_process, system); if (load_result != Loader::ResultStatus::Success) { diff --git a/src/core/hle/kernel/k_auto_object.h b/src/core/hle/kernel/k_auto_object.h index 9b71fe371..f384b1568 100644 --- a/src/core/hle/kernel/k_auto_object.h +++ b/src/core/hle/kernel/k_auto_object.h @@ -182,8 +182,8 @@ public: explicit KAutoObjectWithList(KernelCore& kernel) : KAutoObject(kernel) {} static int Compare(const KAutoObjectWithList& lhs, const KAutoObjectWithList& rhs) { - const u64 lid = lhs.GetId(); - const u64 rid = rhs.GetId(); + const uintptr_t lid = reinterpret_cast(std::addressof(lhs)); + const uintptr_t rid = reinterpret_cast(std::addressof(rhs)); if (lid < rid) { return -1; diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 4f3366c9d..f33600ca5 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -95,7 +95,7 @@ struct KernelCore::Impl { pt_heap_region.GetSize()); } - InitializeHackSharedMemory(); + InitializeHackSharedMemory(kernel); RegisterHostThread(nullptr); } @@ -216,10 +216,12 @@ struct KernelCore::Impl { auto* main_thread{Kernel::KThread::Create(system.Kernel())}; main_thread->SetCurrentCore(core); ASSERT(Kernel::KThread::InitializeMainThread(system, main_thread, core).IsSuccess()); + KThread::Register(system.Kernel(), main_thread); auto* idle_thread{Kernel::KThread::Create(system.Kernel())}; idle_thread->SetCurrentCore(core); ASSERT(Kernel::KThread::InitializeIdleThread(system, idle_thread, core).IsSuccess()); + KThread::Register(system.Kernel(), idle_thread); schedulers[i]->Initialize(main_thread, idle_thread, core); } @@ -230,6 +232,7 @@ struct KernelCore::Impl { const Core::Timing::CoreTiming& core_timing) { system_resource_limit = KResourceLimit::Create(system.Kernel()); system_resource_limit->Initialize(&core_timing); + KResourceLimit::Register(kernel, system_resource_limit); const auto sizes{memory_layout->GetTotalAndKernelMemorySizes()}; const auto total_size{sizes.first}; @@ -355,6 +358,7 @@ struct KernelCore::Impl { ASSERT(KThread::InitializeHighPriorityThread(system, shutdown_threads[core_id], {}, {}, core_id) .IsSuccess()); + KThread::Register(system.Kernel(), shutdown_threads[core_id]); } } @@ -729,7 +733,7 @@ struct KernelCore::Impl { memory_manager->Initialize(management_region.GetAddress(), management_region.GetSize()); } - void InitializeHackSharedMemory() { + void InitializeHackSharedMemory(KernelCore& kernel) { // Setup memory regions for emulated processes // TODO(bunnei): These should not be hardcoded regions initialized within the kernel constexpr std::size_t hid_size{0x40000}; @@ -746,14 +750,23 @@ struct KernelCore::Impl { hid_shared_mem->Initialize(system.DeviceMemory(), nullptr, Svc::MemoryPermission::None, Svc::MemoryPermission::Read, hid_size); + KSharedMemory::Register(kernel, hid_shared_mem); + font_shared_mem->Initialize(system.DeviceMemory(), nullptr, Svc::MemoryPermission::None, Svc::MemoryPermission::Read, font_size); + KSharedMemory::Register(kernel, font_shared_mem); + irs_shared_mem->Initialize(system.DeviceMemory(), nullptr, Svc::MemoryPermission::None, Svc::MemoryPermission::Read, irs_size); + KSharedMemory::Register(kernel, irs_shared_mem); + time_shared_mem->Initialize(system.DeviceMemory(), nullptr, Svc::MemoryPermission::None, Svc::MemoryPermission::Read, time_size); + KSharedMemory::Register(kernel, time_shared_mem); + hidbus_shared_mem->Initialize(system.DeviceMemory(), nullptr, Svc::MemoryPermission::None, Svc::MemoryPermission::Read, hidbus_size); + KSharedMemory::Register(kernel, hidbus_shared_mem); } std::mutex registered_objects_lock; @@ -1072,12 +1085,15 @@ static std::jthread RunHostThreadFunc(KernelCore& kernel, KProcess* process, // Commit the thread reservation. thread_reservation.Commit(); + // Register the thread. + KThread::Register(kernel, thread); + return std::jthread( [&kernel, thread, thread_name{std::move(thread_name)}, func{std::move(func)}] { // Set the thread name. Common::SetCurrentThreadName(thread_name.c_str()); - // Register the thread. + // Set the thread as current. kernel.RegisterHostThread(thread); // Run the callback. @@ -1099,6 +1115,9 @@ std::jthread KernelCore::RunOnHostCoreProcess(std::string&& process_name, // Ensure that we don't hold onto any extra references. SCOPE_EXIT({ process->Close(); }); + // Register the new process. + KProcess::Register(*this, process); + // Run the host thread. return RunHostThreadFunc(*this, process, std::move(process_name), std::move(func)); } @@ -1124,6 +1143,9 @@ void KernelCore::RunOnGuestCoreProcess(std::string&& process_name, std::function // Ensure that we don't hold onto any extra references. SCOPE_EXIT({ process->Close(); }); + // Register the new process. + KProcess::Register(*this, process); + // Reserve a new thread from the process resource limit. KScopedResourceReservation thread_reservation(process, LimitableResource::ThreadCountMax); ASSERT(thread_reservation.Succeeded()); @@ -1136,6 +1158,9 @@ void KernelCore::RunOnGuestCoreProcess(std::string&& process_name, std::function // Commit the thread reservation. thread_reservation.Commit(); + // Register the new thread. + KThread::Register(*this, thread); + // Begin running the thread. ASSERT(R_SUCCEEDED(thread->Run())); } diff --git a/src/core/hle/service/ipc_helpers.h b/src/core/hle/service/ipc_helpers.h index e4cb4e1f2..0e222362e 100644 --- a/src/core/hle/service/ipc_helpers.h +++ b/src/core/hle/service/ipc_helpers.h @@ -156,6 +156,7 @@ public: auto* session = Kernel::KSession::Create(kernel); session->Initialize(nullptr, 0); + Kernel::KSession::Register(kernel, session); auto next_manager = std::make_shared( kernel, manager->GetServerManager()); diff --git a/src/core/hle/service/kernel_helpers.cpp b/src/core/hle/service/kernel_helpers.cpp index a39ce5212..6a313a03b 100644 --- a/src/core/hle/service/kernel_helpers.cpp +++ b/src/core/hle/service/kernel_helpers.cpp @@ -25,6 +25,9 @@ ServiceContext::ServiceContext(Core::System& system_, std::string name_) Kernel::KProcess::ProcessType::KernelInternal, kernel.GetSystemResourceLimit()) .IsSuccess()); + + // Register the process. + Kernel::KProcess::Register(kernel, process); process_created = true; } diff --git a/src/core/hle/service/mutex.cpp b/src/core/hle/service/mutex.cpp index 07589a0f0..b0ff71d1b 100644 --- a/src/core/hle/service/mutex.cpp +++ b/src/core/hle/service/mutex.cpp @@ -12,6 +12,9 @@ Mutex::Mutex(Core::System& system) : m_system(system) { m_event = Kernel::KEvent::Create(system.Kernel()); m_event->Initialize(nullptr); + // Register the event. + Kernel::KEvent::Register(system.Kernel(), m_event); + ASSERT(R_SUCCEEDED(m_event->Signal())); } diff --git a/src/core/hle/service/server_manager.cpp b/src/core/hle/service/server_manager.cpp index 6b4a1291e..156bc27d8 100644 --- a/src/core/hle/service/server_manager.cpp +++ b/src/core/hle/service/server_manager.cpp @@ -33,6 +33,9 @@ ServerManager::ServerManager(Core::System& system) : m_system{system}, m_serve_m // Initialize event. m_event = Kernel::KEvent::Create(system.Kernel()); m_event->Initialize(nullptr); + + // Register event. + Kernel::KEvent::Register(system.Kernel(), m_event); } ServerManager::~ServerManager() { @@ -160,6 +163,9 @@ Result ServerManager::ManageDeferral(Kernel::KEvent** out_event) { // Initialize the event. m_deferral_event->Initialize(nullptr); + // Register the event. + Kernel::KEvent::Register(m_system.Kernel(), m_deferral_event); + // Set the output. *out_event = m_deferral_event; diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index c45be5726..1608fa24c 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -64,6 +64,9 @@ Result ServiceManager::RegisterService(std::string name, u32 max_sessions, auto* port = Kernel::KPort::Create(kernel); port->Initialize(ServerSessionCountMax, false, 0); + // Register the port. + Kernel::KPort::Register(kernel, port); + service_ports.emplace(name, port); registered_services.emplace(name, handler); if (deferral_event) { diff --git a/src/core/hle/service/sm/sm_controller.cpp b/src/core/hle/service/sm/sm_controller.cpp index 419c1df2b..7dce28fe0 100644 --- a/src/core/hle/service/sm/sm_controller.cpp +++ b/src/core/hle/service/sm/sm_controller.cpp @@ -49,6 +49,9 @@ void Controller::CloneCurrentObject(HLERequestContext& ctx) { // Commit the session reservation. session_reservation.Commit(); + // Register the session. + Kernel::KSession::Register(system.Kernel(), session); + // Register with server manager. session_manager->GetServerManager().RegisterSession(&session->GetServerSession(), session_manager); From b143ce8134cc851d065410ba3a825cc6a5bf34e0 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 29 Apr 2023 15:10:09 -0400 Subject: [PATCH 0292/1181] kernel: remove general boost lists --- src/core/hle/kernel/k_event_info.h | 5 +++-- src/core/hle/kernel/k_object_name.h | 8 +++++--- src/core/hle/kernel/k_server_port.h | 4 ++-- src/core/hle/kernel/k_server_session.h | 7 ++++--- src/core/hle/kernel/k_session_request.h | 4 +++- src/core/hle/kernel/k_shared_memory_info.h | 4 ++-- src/core/hle/kernel/k_thread.h | 13 +++++++------ 7 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/core/hle/kernel/k_event_info.h b/src/core/hle/kernel/k_event_info.h index 25b3ff594..eacfa5dc6 100644 --- a/src/core/hle/kernel/k_event_info.h +++ b/src/core/hle/kernel/k_event_info.h @@ -5,14 +5,15 @@ #include -#include +#include "common/intrusive_list.h" #include "core/hle/kernel/slab_helpers.h" #include "core/hle/kernel/svc_types.h" namespace Kernel { -class KEventInfo : public KSlabAllocated, public boost::intrusive::list_base_hook<> { +class KEventInfo : public KSlabAllocated, + public Common::IntrusiveListBaseNode { public: struct InfoCreateThread { u32 thread_id{}; diff --git a/src/core/hle/kernel/k_object_name.h b/src/core/hle/kernel/k_object_name.h index 2d97fc777..a8876fe37 100644 --- a/src/core/hle/kernel/k_object_name.h +++ b/src/core/hle/kernel/k_object_name.h @@ -5,7 +5,8 @@ #include #include -#include + +#include "common/intrusive_list.h" #include "core/hle/kernel/k_light_lock.h" #include "core/hle/kernel/slab_helpers.h" @@ -15,13 +16,14 @@ namespace Kernel { class KObjectNameGlobalData; -class KObjectName : public KSlabAllocated, public boost::intrusive::list_base_hook<> { +class KObjectName : public KSlabAllocated, + public Common::IntrusiveListBaseNode { public: explicit KObjectName(KernelCore&) {} virtual ~KObjectName() = default; static constexpr size_t NameLengthMax = 12; - using List = boost::intrusive::list; + using List = Common::IntrusiveListBaseTraits::ListType; static Result NewFromName(KernelCore& kernel, KAutoObject* obj, const char* name); static Result Delete(KernelCore& kernel, KAutoObject* obj, const char* name); diff --git a/src/core/hle/kernel/k_server_port.h b/src/core/hle/kernel/k_server_port.h index 21c040e62..625280290 100644 --- a/src/core/hle/kernel/k_server_port.h +++ b/src/core/hle/kernel/k_server_port.h @@ -7,7 +7,7 @@ #include #include -#include +#include "common/intrusive_list.h" #include "core/hle/kernel/k_server_session.h" #include "core/hle/kernel/k_synchronization_object.h" @@ -42,7 +42,7 @@ public: bool IsSignaled() const override; private: - using SessionList = boost::intrusive::list; + using SessionList = Common::IntrusiveListBaseTraits::ListType; void CleanupSessions(); diff --git a/src/core/hle/kernel/k_server_session.h b/src/core/hle/kernel/k_server_session.h index 5ee02f556..403891919 100644 --- a/src/core/hle/kernel/k_server_session.h +++ b/src/core/hle/kernel/k_server_session.h @@ -8,7 +8,7 @@ #include #include -#include +#include "common/intrusive_list.h" #include "core/hle/kernel/k_light_lock.h" #include "core/hle/kernel/k_session_request.h" @@ -27,7 +27,7 @@ class KSession; class KThread; class KServerSession final : public KSynchronizationObject, - public boost::intrusive::list_base_hook<> { + public Common::IntrusiveListBaseNode { KERNEL_AUTOOBJECT_TRAITS(KServerSession, KSynchronizationObject); friend class ServiceThread; @@ -67,7 +67,8 @@ private: KSession* m_parent{}; /// List of threads which are pending a reply. - boost::intrusive::list m_request_list{}; + using RequestList = Common::IntrusiveListBaseTraits::ListType; + RequestList m_request_list{}; KSessionRequest* m_current_request{}; KLightLock m_lock; diff --git a/src/core/hle/kernel/k_session_request.h b/src/core/hle/kernel/k_session_request.h index b5f04907b..283669e0a 100644 --- a/src/core/hle/kernel/k_session_request.h +++ b/src/core/hle/kernel/k_session_request.h @@ -5,6 +5,8 @@ #include +#include "common/intrusive_list.h" + #include "core/hle/kernel/k_auto_object.h" #include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_memory_block.h" @@ -16,7 +18,7 @@ namespace Kernel { class KSessionRequest final : public KSlabAllocated, public KAutoObject, - public boost::intrusive::list_base_hook<> { + public Common::IntrusiveListBaseNode { KERNEL_AUTOOBJECT_TRAITS(KSessionRequest, KAutoObject); public: diff --git a/src/core/hle/kernel/k_shared_memory_info.h b/src/core/hle/kernel/k_shared_memory_info.h index 75b73ba39..2d8ff20d6 100644 --- a/src/core/hle/kernel/k_shared_memory_info.h +++ b/src/core/hle/kernel/k_shared_memory_info.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "common/intrusive_list.h" #include "core/hle/kernel/slab_helpers.h" @@ -12,7 +12,7 @@ namespace Kernel { class KSharedMemory; class KSharedMemoryInfo final : public KSlabAllocated, - public boost::intrusive::list_base_hook<> { + public Common::IntrusiveListBaseNode { public: explicit KSharedMemoryInfo(KernelCore&) {} diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h index 9c1a41128..f9814ac8f 100644 --- a/src/core/hle/kernel/k_thread.h +++ b/src/core/hle/kernel/k_thread.h @@ -12,7 +12,7 @@ #include #include -#include +#include "common/intrusive_list.h" #include "common/intrusive_red_black_tree.h" #include "common/spin_lock.h" @@ -119,7 +119,7 @@ s32 GetCurrentCoreId(KernelCore& kernel); Core::Memory::Memory& GetCurrentMemory(KernelCore& kernel); class KThread final : public KAutoObjectWithSlabHeapAndContainer, - public boost::intrusive::list_base_hook<>, + public Common::IntrusiveListBaseNode, public KTimerTask { KERNEL_AUTOOBJECT_TRAITS(KThread, KSynchronizationObject); @@ -138,7 +138,7 @@ public: public: using ThreadContext32 = Core::ARM_Interface::ThreadContext32; using ThreadContext64 = Core::ARM_Interface::ThreadContext64; - using WaiterList = boost::intrusive::list; + using WaiterList = Common::IntrusiveListBaseTraits::ListType; /** * Gets the thread's current priority @@ -750,8 +750,9 @@ private: ConditionVariableThreadTreeTraits::TreeType; public: - class LockWithPriorityInheritanceInfo : public KSlabAllocated, - public boost::intrusive::list_base_hook<> { + class LockWithPriorityInheritanceInfo + : public KSlabAllocated, + public Common::IntrusiveListBaseNode { public: explicit LockWithPriorityInheritanceInfo(KernelCore&) {} @@ -839,7 +840,7 @@ public: private: using LockWithPriorityInheritanceInfoList = - boost::intrusive::list; + Common::IntrusiveListBaseTraits::ListType; ConditionVariableThreadTree* m_condvar_tree{}; u64 m_condvar_key{}; From b566c98258ad368fb1c4b18fa5ffeb51ff4b0efb Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Sun, 30 Apr 2023 18:37:37 +0100 Subject: [PATCH 0293/1181] Define SampleMask as an array --- .../backend/spirv/emit_spirv_context_get_set.cpp | 3 ++- src/shader_recompiler/backend/spirv/spirv_emit_context.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp index 0cd87a48f..fee510f7b 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp @@ -473,7 +473,8 @@ void EmitSetFragColor(EmitContext& ctx, u32 index, u32 component, Id value) { } void EmitSetSampleMask(EmitContext& ctx, Id value) { - ctx.OpStore(ctx.sample_mask, value); + const Id pointer{ctx.OpAccessChain(ctx.output_u32, ctx.sample_mask, ctx.u32_zero_value)}; + ctx.OpStore(pointer, value); } void EmitSetFragDepth(EmitContext& ctx, Id value) { diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp index d48d4860e..47739794f 100644 --- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp +++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp @@ -1572,7 +1572,8 @@ void EmitContext::DefineOutputs(const IR::Program& program) { Decorate(frag_depth, spv::Decoration::BuiltIn, spv::BuiltIn::FragDepth); } if (info.stores_sample_mask) { - sample_mask = DefineOutput(*this, U32[1], std::nullopt); + const Id array_type{TypeArray(U32[1], Const(1U))}; + sample_mask = DefineOutput(*this, array_type, std::nullopt); Decorate(sample_mask, spv::Decoration::BuiltIn, spv::BuiltIn::SampleMask); } break; From 2cd9e1ecb6b67286ae89ef5758a389b58673c378 Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 30 Apr 2023 14:19:11 -0400 Subject: [PATCH 0294/1181] settings: rename extended memory layout to unsafe, move from general to system --- src/common/settings.cpp | 3 ++- src/common/settings.h | 3 ++- src/core/core.cpp | 6 +++--- .../hle/kernel/board/nintendo/nx/k_system_control.cpp | 7 ++++--- src/yuzu/configuration/config.cpp | 4 ++-- src/yuzu/configuration/configure_general.cpp | 9 --------- src/yuzu/configuration/configure_general.h | 1 - src/yuzu/configuration/configure_general.ui | 7 ------- src/yuzu/configuration/configure_system.cpp | 10 ++++++++++ src/yuzu/configuration/configure_system.h | 1 + src/yuzu/configuration/configure_system.ui | 7 +++++++ src/yuzu_cmd/config.cpp | 2 +- src/yuzu_cmd/default_ini.h | 4 ++-- 13 files changed, 34 insertions(+), 30 deletions(-) diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 84955030b..6dcf4ddb2 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -45,6 +45,7 @@ void LogSettings() { log_setting("System_LanguageIndex", values.language_index.GetValue()); log_setting("System_RegionIndex", values.region_index.GetValue()); log_setting("System_TimeZoneIndex", values.time_zone_index.GetValue()); + log_setting("System_UnsafeMemoryLayout", values.use_unsafe_extended_memory_layout.GetValue()); log_setting("Core_UseMultiCore", values.use_multi_core.GetValue()); log_setting("CPU_Accuracy", values.cpu_accuracy.GetValue()); log_setting("Renderer_UseResolutionScaling", values.resolution_setup.GetValue()); @@ -191,7 +192,7 @@ void RestoreGlobalState(bool is_powered_on) { // Core values.use_multi_core.SetGlobal(true); - values.use_extended_memory_layout.SetGlobal(true); + values.use_unsafe_extended_memory_layout.SetGlobal(true); // CPU values.cpu_accuracy.SetGlobal(true); diff --git a/src/common/settings.h b/src/common/settings.h index b77a1580a..a2a3aaae0 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -388,7 +388,8 @@ struct Values { // Core SwitchableSetting use_multi_core{true, "use_multi_core"}; - SwitchableSetting use_extended_memory_layout{false, "use_extended_memory_layout"}; + SwitchableSetting use_unsafe_extended_memory_layout{false, + "use_unsafe_extended_memory_layout"}; // Cpu SwitchableSetting cpu_accuracy{CPUAccuracy::Auto, CPUAccuracy::Auto, diff --git a/src/core/core.cpp b/src/core/core.cpp index caa6a77be..ac0fb7872 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -137,7 +137,7 @@ struct System::Impl { device_memory = std::make_unique(); is_multicore = Settings::values.use_multi_core.GetValue(); - extended_memory_layout = Settings::values.use_extended_memory_layout.GetValue(); + extended_memory_layout = Settings::values.use_unsafe_extended_memory_layout.GetValue(); core_timing.SetMulticore(is_multicore); core_timing.Initialize([&system]() { system.RegisterHostThread(); }); @@ -169,7 +169,7 @@ struct System::Impl { void ReinitializeIfNecessary(System& system) { const bool must_reinitialize = is_multicore != Settings::values.use_multi_core.GetValue() || - extended_memory_layout != Settings::values.use_extended_memory_layout.GetValue(); + extended_memory_layout != Settings::values.use_unsafe_extended_memory_layout.GetValue(); if (!must_reinitialize) { return; @@ -178,7 +178,7 @@ struct System::Impl { LOG_DEBUG(Kernel, "Re-initializing"); is_multicore = Settings::values.use_multi_core.GetValue(); - extended_memory_layout = Settings::values.use_extended_memory_layout.GetValue(); + extended_memory_layout = Settings::values.use_unsafe_extended_memory_layout.GetValue(); Initialize(system); } diff --git a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp index 36d0d20d2..49bdc671e 100644 --- a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp +++ b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp @@ -35,12 +35,13 @@ namespace { using namespace Common::Literals; u32 GetMemorySizeForInit() { - return Settings::values.use_extended_memory_layout ? Smc::MemorySize_8GB : Smc::MemorySize_4GB; + return Settings::values.use_unsafe_extended_memory_layout ? Smc::MemorySize_8GB + : Smc::MemorySize_4GB; } Smc::MemoryArrangement GetMemoryArrangeForInit() { - return Settings::values.use_extended_memory_layout ? Smc::MemoryArrangement_8GB - : Smc::MemoryArrangement_4GB; + return Settings::values.use_unsafe_extended_memory_layout ? Smc::MemoryArrangement_8GB + : Smc::MemoryArrangement_4GB; } } // namespace diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index bb731276e..6fa39721b 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -497,7 +497,7 @@ void Config::ReadCoreValues() { qt_config->beginGroup(QStringLiteral("Core")); ReadGlobalSetting(Settings::values.use_multi_core); - ReadGlobalSetting(Settings::values.use_extended_memory_layout); + ReadGlobalSetting(Settings::values.use_unsafe_extended_memory_layout); qt_config->endGroup(); } @@ -1161,7 +1161,7 @@ void Config::SaveCoreValues() { qt_config->beginGroup(QStringLiteral("Core")); WriteGlobalSetting(Settings::values.use_multi_core); - WriteGlobalSetting(Settings::values.use_extended_memory_layout); + WriteGlobalSetting(Settings::values.use_unsafe_extended_memory_layout); qt_config->endGroup(); } diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index 207bcdc4d..26258d744 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp @@ -35,9 +35,6 @@ void ConfigureGeneral::SetConfiguration() { ui->use_multi_core->setEnabled(runtime_lock); ui->use_multi_core->setChecked(Settings::values.use_multi_core.GetValue()); - ui->use_extended_memory_layout->setEnabled(runtime_lock); - ui->use_extended_memory_layout->setChecked( - Settings::values.use_extended_memory_layout.GetValue()); ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing.GetValue()); ui->toggle_user_on_boot->setChecked(UISettings::values.select_user_on_boot.GetValue()); @@ -79,9 +76,6 @@ void ConfigureGeneral::ResetDefaults() { void ConfigureGeneral::ApplyConfiguration() { ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_multi_core, ui->use_multi_core, use_multi_core); - ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_extended_memory_layout, - ui->use_extended_memory_layout, - use_extended_memory_layout); if (Settings::IsConfiguringGlobal()) { UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked(); @@ -141,9 +135,6 @@ void ConfigureGeneral::SetupPerGameUI() { Settings::values.use_speed_limit, use_speed_limit); ConfigurationShared::SetColoredTristate(ui->use_multi_core, Settings::values.use_multi_core, use_multi_core); - ConfigurationShared::SetColoredTristate(ui->use_extended_memory_layout, - Settings::values.use_extended_memory_layout, - use_extended_memory_layout); connect(ui->toggle_speed_limit, &QCheckBox::clicked, ui->speed_limit, [this]() { ui->speed_limit->setEnabled(ui->toggle_speed_limit->isChecked() && diff --git a/src/yuzu/configuration/configure_general.h b/src/yuzu/configuration/configure_general.h index a090c1a3f..7ff63f425 100644 --- a/src/yuzu/configuration/configure_general.h +++ b/src/yuzu/configuration/configure_general.h @@ -47,7 +47,6 @@ private: ConfigurationShared::CheckState use_speed_limit; ConfigurationShared::CheckState use_multi_core; - ConfigurationShared::CheckState use_extended_memory_layout; const Core::System& system; }; diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui index add110bb0..986a1625b 100644 --- a/src/yuzu/configuration/configure_general.ui +++ b/src/yuzu/configuration/configure_general.ui @@ -61,13 +61,6 @@ - - - - Extended memory layout (8GB DRAM) - - - diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index 6af34f793..286ccc5cd 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -111,6 +111,9 @@ void ConfigureSystem::SetConfiguration() { ui->custom_rtc_edit->setDateTime(QDateTime::fromSecsSinceEpoch(rtc_time)); ui->device_name_edit->setText( QString::fromUtf8(Settings::values.device_name.GetValue().c_str())); + ui->use_unsafe_extended_memory_layout->setEnabled(enabled); + ui->use_unsafe_extended_memory_layout->setChecked( + Settings::values.use_unsafe_extended_memory_layout.GetValue()); if (Settings::IsConfiguringGlobal()) { ui->combo_language->setCurrentIndex(Settings::values.language_index.GetValue()); @@ -160,6 +163,9 @@ void ConfigureSystem::ApplyConfiguration() { ConfigurationShared::ApplyPerGameSetting(&Settings::values.region_index, ui->combo_region); ConfigurationShared::ApplyPerGameSetting(&Settings::values.time_zone_index, ui->combo_time_zone); + ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_unsafe_extended_memory_layout, + ui->use_unsafe_extended_memory_layout, + use_unsafe_extended_memory_layout); if (Settings::IsConfiguringGlobal()) { // Guard if during game and set to game-specific value @@ -215,6 +221,10 @@ void ConfigureSystem::SetupPerGameUI() { Settings::values.rng_seed.GetValue().has_value(), Settings::values.rng_seed.GetValue(true).has_value(), use_rng_seed); + ConfigurationShared::SetColoredTristate(ui->use_unsafe_extended_memory_layout, + Settings::values.use_unsafe_extended_memory_layout, + use_unsafe_extended_memory_layout); + ui->custom_rtc_checkbox->setVisible(false); ui->custom_rtc_edit->setVisible(false); } diff --git a/src/yuzu/configuration/configure_system.h b/src/yuzu/configuration/configure_system.h index ec28724a1..ce1a91601 100644 --- a/src/yuzu/configuration/configure_system.h +++ b/src/yuzu/configuration/configure_system.h @@ -41,6 +41,7 @@ private: bool enabled = false; ConfigurationShared::CheckState use_rng_seed; + ConfigurationShared::CheckState use_unsafe_extended_memory_layout; Core::System& system; }; diff --git a/src/yuzu/configuration/configure_system.ui b/src/yuzu/configuration/configure_system.ui index 9e7bc3b93..e0caecd5e 100644 --- a/src/yuzu/configuration/configure_system.ui +++ b/src/yuzu/configuration/configure_system.ui @@ -478,6 +478,13 @@ + + + + Unsafe extended memory layout (8GB DRAM) + + + diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 464da3231..064d6a68e 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -274,7 +274,7 @@ void Config::ReadValues() { // Core ReadSetting("Core", Settings::values.use_multi_core); - ReadSetting("Core", Settings::values.use_extended_memory_layout); + ReadSetting("Core", Settings::values.use_unsafe_extended_memory_layout); // Cpu ReadSetting("Cpu", Settings::values.cpu_accuracy); diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 209cfc28a..201dba3b4 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -163,9 +163,9 @@ keyboard_enabled = # 0: Disabled, 1 (default): Enabled use_multi_core = -# Enable extended guest system memory layout (8GB DRAM) +# Enable unsafe extended guest system memory layout (8GB DRAM) # 0 (default): Disabled, 1: Enabled -use_extended_memory_layout = +use_unsafe_extended_memory_layout = [Cpu] # Adjusts various optimizations. From 2feb40f14dd54e819078cd8ac1df0a3f2e8b2902 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Mon, 1 May 2023 00:27:12 +0100 Subject: [PATCH 0295/1181] Wait for the terminate event before destroying a system instance --- src/audio_core/renderer/system.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/audio_core/renderer/system.cpp b/src/audio_core/renderer/system.cpp index ad869facb..53b258c4f 100644 --- a/src/audio_core/renderer/system.cpp +++ b/src/audio_core/renderer/system.cpp @@ -436,10 +436,7 @@ void System::Stop() { } if (execution_mode == ExecutionMode::Auto) { - // Should wait for the system to terminate here, but core timing (should have) already - // stopped, so this isn't needed. Find a way to make this definite. - - // terminate_event.Wait(); + terminate_event.Wait(); } } From 7ec66db22ce04e647f863633a9999ab4c11d3893 Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 30 Apr 2023 23:28:31 -0400 Subject: [PATCH 0296/1181] qt: warn on inoperable keys --- src/yuzu/main.cpp | 33 +++++++++++++++++++++++++++++++++ src/yuzu/main.h | 1 + 2 files changed, 34 insertions(+) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index b79409a68..ba9eece1d 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -27,6 +27,7 @@ #include "configuration/configure_input.h" #include "configuration/configure_per_game.h" #include "configuration/configure_tas.h" +#include "core/file_sys/romfs_factory.h" #include "core/file_sys/vfs.h" #include "core/file_sys/vfs_real.h" #include "core/frontend/applets/cabinet.h" @@ -4171,6 +4172,8 @@ void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) { } Core::Crypto::KeyManager& keys = Core::Crypto::KeyManager::Instance(); + bool all_keys_present{true}; + if (keys.BaseDeriveNecessary()) { Core::Crypto::PartitionDataManager pdm{vfs->OpenDirectory("", FileSys::Mode::Read)}; @@ -4195,6 +4198,7 @@ void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) { errors += tr(" - Missing PRODINFO"); } if (!errors.isEmpty()) { + all_keys_present = false; QMessageBox::warning( this, tr("Derivation Components Missing"), tr("Encryption keys are missing. " @@ -4222,11 +4226,40 @@ void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) { system->GetFileSystemController().CreateFactories(*vfs); + if (all_keys_present && !this->CheckSystemArchiveDecryption()) { + LOG_WARNING(Frontend, "Mii model decryption failed"); + QMessageBox::warning( + this, tr("System Archive Decryption Failed"), + tr("Encryption keys failed to decrypt firmware. " + "
Please follow the yuzu " + "quickstart guide to get all your keys, firmware and " + "games.")); + } + if (behavior == ReinitializeKeyBehavior::Warning) { game_list->PopulateAsync(UISettings::values.game_dirs); } } +bool GMainWindow::CheckSystemArchiveDecryption() { + constexpr u64 MiiModelId = 0x0100000000000802; + + auto bis_system = system->GetFileSystemController().GetSystemNANDContents(); + if (!bis_system) { + // Not having system BIS files is not an error. + return true; + } + + auto mii_nca = bis_system->GetEntry(MiiModelId, FileSys::ContentRecordType::Data); + if (!mii_nca) { + // Not having the Mii model is not an error. + return true; + } + + // Return whether we are able to decrypt the RomFS of the Mii model. + return mii_nca->GetRomFS().get() != nullptr; +} + std::optional GMainWindow::SelectRomFSDumpTarget(const FileSys::ContentProvider& installed, u64 program_id) { const auto dlc_entries = diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 8b5c1d747..3bbc31ada 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -392,6 +392,7 @@ private: void LoadTranslation(); void OpenPerGameConfiguration(u64 title_id, const std::string& file_name); bool CheckDarkMode(); + bool CheckSystemArchiveDecryption(); QString GetTasStateDescription() const; bool CreateShortcut(const std::string& shortcut_path, const std::string& title, From d6f565e5da22ec6a6a77ffabd88e59f3a25bcc96 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Fri, 28 Apr 2023 23:54:54 +0200 Subject: [PATCH 0297/1181] BufferCache: Fixes and address feedback --- src/tests/video_core/memory_tracker.cpp | 4 +- src/video_core/buffer_cache/buffer_base.h | 99 +---- src/video_core/buffer_cache/buffer_cache.h | 42 +- .../buffer_cache/buffer_cache_base.h | 19 +- .../buffer_cache/memory_tracker_base.h | 17 +- src/video_core/buffer_cache/word_manager.h | 384 +++++++++--------- 6 files changed, 243 insertions(+), 322 deletions(-) diff --git a/src/tests/video_core/memory_tracker.cpp b/src/tests/video_core/memory_tracker.cpp index 77d391f15..3981907a2 100644 --- a/src/tests/video_core/memory_tracker.cpp +++ b/src/tests/video_core/memory_tracker.cpp @@ -427,7 +427,7 @@ TEST_CASE("MemoryTracker: Single page in large region", "[video_core]") { memory_track->MarkRegionAsCpuModified(c + WORD * 12 + PAGE * 8, PAGE); REQUIRE(memory_track->IsRegionCpuModified(c, WORD * 16)); - REQUIRE(memory_track->IsRegionCpuModified(c + WORD * 10, WORD * 2)); + REQUIRE(!memory_track->IsRegionCpuModified(c + WORD * 10, WORD * 2)); REQUIRE(memory_track->IsRegionCpuModified(c + WORD * 11, WORD * 2)); REQUIRE(memory_track->IsRegionCpuModified(c + WORD * 12, WORD * 2)); REQUIRE(memory_track->IsRegionCpuModified(c + WORD * 12 + PAGE * 4, PAGE * 8)); @@ -535,6 +535,8 @@ TEST_CASE("MemoryTracker: Cached write downloads") { memory_track->MarkRegionAsGpuModified(c + PAGE, PAGE); int num = 0; memory_track->ForEachDownloadRangeAndClear(c, WORD, [&](u64 offset, u64 size) { ++num; }); + REQUIRE(num == 1); + num = 0; memory_track->ForEachUploadRange(c, WORD, [&](u64 offset, u64 size) { ++num; }); REQUIRE(num == 0); REQUIRE(!memory_track->IsRegionCpuModified(c + PAGE, PAGE)); diff --git a/src/video_core/buffer_cache/buffer_base.h b/src/video_core/buffer_cache/buffer_base.h index 095f79387..9cbd95c4b 100644 --- a/src/video_core/buffer_cache/buffer_base.h +++ b/src/video_core/buffer_cache/buffer_base.h @@ -38,10 +38,8 @@ public: static constexpr u64 BASE_PAGE_BITS = 16; static constexpr u64 BASE_PAGE_SIZE = 1ULL << BASE_PAGE_BITS; - explicit BufferBase(RasterizerInterface& rasterizer_, VAddr cpu_addr_, u64 size_bytes) - : cpu_addr{Common::AlignDown(cpu_addr_, BASE_PAGE_SIZE)}, - word_manager(cpu_addr, rasterizer_, - Common::AlignUp(size_bytes + (cpu_addr_ - cpu_addr), BASE_PAGE_SIZE)) {} + explicit BufferBase(RasterizerInterface& rasterizer_, VAddr cpu_addr_, u64 size_bytes_) + : cpu_addr{cpu_addr_}, size_bytes{size_bytes_} {} explicit BufferBase(NullBufferParams) {} @@ -51,88 +49,6 @@ public: BufferBase& operator=(BufferBase&&) = default; BufferBase(BufferBase&&) = default; - /// Returns the inclusive CPU modified range in a begin end pair - [[nodiscard]] std::pair ModifiedCpuRegion(VAddr query_cpu_addr, - u64 query_size) const noexcept { - const u64 offset = query_cpu_addr - cpu_addr; - return word_manager.template ModifiedRegion(offset, query_size); - } - - /// Returns the inclusive GPU modified range in a begin end pair - [[nodiscard]] std::pair ModifiedGpuRegion(VAddr query_cpu_addr, - u64 query_size) const noexcept { - const u64 offset = query_cpu_addr - cpu_addr; - return word_manager.template ModifiedRegion(offset, query_size); - } - - /// Returns true if a region has been modified from the CPU - [[nodiscard]] bool IsRegionCpuModified(VAddr query_cpu_addr, u64 query_size) const noexcept { - const u64 offset = query_cpu_addr - cpu_addr; - return word_manager.template IsRegionModified(offset, query_size); - } - - /// Returns true if a region has been modified from the GPU - [[nodiscard]] bool IsRegionGpuModified(VAddr query_cpu_addr, u64 query_size) const noexcept { - const u64 offset = query_cpu_addr - cpu_addr; - return word_manager.template IsRegionModified(offset, query_size); - } - - /// Mark region as CPU modified, notifying the rasterizer about this change - void MarkRegionAsCpuModified(VAddr dirty_cpu_addr, u64 size) { - word_manager.template ChangeRegionState(dirty_cpu_addr, size); - } - - /// Unmark region as CPU modified, notifying the rasterizer about this change - void UnmarkRegionAsCpuModified(VAddr dirty_cpu_addr, u64 size) { - word_manager.template ChangeRegionState(dirty_cpu_addr, size); - } - - /// Mark region as modified from the host GPU - void MarkRegionAsGpuModified(VAddr dirty_cpu_addr, u64 size) noexcept { - word_manager.template ChangeRegionState(dirty_cpu_addr, size); - } - - /// Unmark region as modified from the host GPU - void UnmarkRegionAsGpuModified(VAddr dirty_cpu_addr, u64 size) noexcept { - word_manager.template ChangeRegionState(dirty_cpu_addr, size); - } - - /// Mark region as modified from the CPU - /// but don't mark it as modified until FlusHCachedWrites is called. - void CachedCpuWrite(VAddr dirty_cpu_addr, u64 size) { - flags |= BufferFlagBits::CachedWrites; - word_manager.template ChangeRegionState(dirty_cpu_addr, size); - } - - /// Flushes cached CPU writes, and notify the rasterizer about the deltas - void FlushCachedWrites() noexcept { - flags &= ~BufferFlagBits::CachedWrites; - word_manager.FlushCachedWrites(); - } - - /// Call 'func' for each CPU modified range and unmark those pages as CPU modified - template - void ForEachUploadRange(VAddr query_cpu_range, u64 size, Func&& func) { - word_manager.template ForEachModifiedRange(query_cpu_range, size, true, func); - } - - /// Call 'func' for each GPU modified range and unmark those pages as GPU modified - template - void ForEachDownloadRange(VAddr query_cpu_range, u64 size, bool clear, Func&& func) { - word_manager.template ForEachModifiedRange(query_cpu_range, size, clear, func); - } - - template - void ForEachDownloadRangeAndClear(VAddr query_cpu_range, u64 size, Func&& func) { - word_manager.template ForEachModifiedRange(query_cpu_range, size, true, func); - } - - /// Call 'func' for each GPU modified range and unmark those pages as GPU modified - template - void ForEachDownloadRange(Func&& func) { - word_manager.template ForEachModifiedRange(cpu_addr, SizeBytes(), true, func); - } - /// Mark buffer as picked void Pick() noexcept { flags |= BufferFlagBits::Picked; @@ -179,11 +95,6 @@ public: return static_cast(other_cpu_addr - cpu_addr); } - /// Returns the size in bytes of the buffer - [[nodiscard]] u64 SizeBytes() const noexcept { - return word_manager.SizeBytes(); - } - size_t getLRUID() const noexcept { return lru_id; } @@ -192,12 +103,16 @@ public: lru_id = lru_id_; } + size_t SizeBytes() const { + return size_bytes; + } + private: VAddr cpu_addr = 0; - WordManager word_manager; BufferFlagBits flags{}; int stream_score = 0; size_t lru_id = SIZE_MAX; + size_t size_bytes = 0; }; } // namespace VideoCommon diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index e5c626c36..7975564b5 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -21,6 +21,7 @@ BufferCache

::BufferCache(VideoCore::RasterizerInterface& rasterizer_, // Ensure the first slot is used for the null buffer void(slot_buffers.insert(runtime, NullBufferParams{})); common_ranges.clear(); + inline_buffer_id = NULL_BUFFER_ID; active_async_buffers = !Settings::IsGPULevelHigh(); @@ -442,9 +443,6 @@ template void BufferCache

::FlushCachedWrites() { cached_write_buffer_ids.clear(); memory_tracker.FlushCachedWrites(); - for (auto& interval : cached_ranges) { - ClearDownload(interval); - } cached_ranges.clear(); } @@ -659,8 +657,8 @@ bool BufferCache

::IsRegionGpuModified(VAddr addr, size_t size) { template bool BufferCache

::IsRegionRegistered(VAddr addr, size_t size) { const VAddr end_addr = addr + size; - const u64 page_end = Common::DivCeil(end_addr, PAGE_SIZE); - for (u64 page = addr >> PAGE_BITS; page < page_end;) { + const u64 page_end = Common::DivCeil(end_addr, CACHING_PAGESIZE); + for (u64 page = addr >> CACHING_PAGEBITS; page < page_end;) { const BufferId buffer_id = page_table[page]; if (!buffer_id) { ++page; @@ -672,7 +670,7 @@ bool BufferCache

::IsRegionRegistered(VAddr addr, size_t size) { if (buf_start_addr < end_addr && addr < buf_end_addr) { return true; } - page = Common::DivCeil(end_addr, PAGE_SIZE); + page = Common::DivCeil(end_addr, CACHING_PAGESIZE); } return false; } @@ -689,7 +687,7 @@ void BufferCache

::BindHostIndexBuffer() { const u32 offset = buffer.Offset(index_buffer.cpu_addr); const u32 size = index_buffer.size; const auto& draw_state = maxwell3d->draw_manager->GetDrawState(); - if (!draw_state.inline_index_draw_indexes.empty()) { + if (!draw_state.inline_index_draw_indexes.empty()) [[unlikely]] { if constexpr (USE_MEMORY_MAPS) { auto upload_staging = runtime.UploadStagingBuffer(size); std::array copies{ @@ -1001,12 +999,20 @@ void BufferCache

::UpdateIndexBuffer() { return; } flags[Dirty::IndexBuffer] = false; - if (!draw_state.inline_index_draw_indexes.empty()) { + if (!draw_state.inline_index_draw_indexes.empty()) [[unlikely]] { auto inline_index_size = static_cast(draw_state.inline_index_draw_indexes.size()); + u32 buffer_size = Common::AlignUp(inline_index_size, CACHING_PAGESIZE); + if (inline_buffer_id == NULL_BUFFER_ID) [[unlikely]] { + inline_buffer_id = CreateBuffer(0, buffer_size); + } + if (slot_buffers[inline_buffer_id].SizeBytes() < buffer_size) [[unlikely]] { + slot_buffers.erase(inline_buffer_id); + inline_buffer_id = CreateBuffer(0, buffer_size); + } index_buffer = Binding{ .cpu_addr = 0, .size = inline_index_size, - .buffer_id = FindBuffer(0, inline_index_size), + .buffer_id = inline_buffer_id, }; return; } @@ -1224,7 +1230,7 @@ BufferId BufferCache

::FindBuffer(VAddr cpu_addr, u32 size) { if (cpu_addr == 0) { return NULL_BUFFER_ID; } - const u64 page = cpu_addr >> PAGE_BITS; + const u64 page = cpu_addr >> CACHING_PAGEBITS; const BufferId buffer_id = page_table[page]; if (!buffer_id) { return CreateBuffer(cpu_addr, size); @@ -1253,8 +1259,9 @@ typename BufferCache

::OverlapResult BufferCache

::ResolveOverlaps(VAddr cpu .has_stream_leap = has_stream_leap, }; } - for (; cpu_addr >> PAGE_BITS < Common::DivCeil(end, PAGE_SIZE); cpu_addr += PAGE_SIZE) { - const BufferId overlap_id = page_table[cpu_addr >> PAGE_BITS]; + for (; cpu_addr >> CACHING_PAGEBITS < Common::DivCeil(end, CACHING_PAGESIZE); + cpu_addr += CACHING_PAGESIZE) { + const BufferId overlap_id = page_table[cpu_addr >> CACHING_PAGEBITS]; if (!overlap_id) { continue; } @@ -1280,11 +1287,11 @@ typename BufferCache

::OverlapResult BufferCache

::ResolveOverlaps(VAddr cpu // as a stream buffer. Increase the size to skip constantly recreating buffers. has_stream_leap = true; if (expands_right) { - begin -= PAGE_SIZE * 256; + begin -= CACHING_PAGESIZE * 256; cpu_addr = begin; } if (expands_left) { - end += PAGE_SIZE * 256; + end += CACHING_PAGESIZE * 256; } } } @@ -1317,6 +1324,9 @@ void BufferCache

::JoinOverlap(BufferId new_buffer_id, BufferId overlap_id, template BufferId BufferCache

::CreateBuffer(VAddr cpu_addr, u32 wanted_size) { + VAddr cpu_addr_end = Common::AlignUp(cpu_addr + wanted_size, CACHING_PAGESIZE); + cpu_addr = Common::AlignDown(cpu_addr, CACHING_PAGESIZE); + wanted_size = static_cast(cpu_addr_end - cpu_addr); const OverlapResult overlap = ResolveOverlaps(cpu_addr, wanted_size); const u32 size = static_cast(overlap.end - overlap.begin); const BufferId new_buffer_id = slot_buffers.insert(runtime, rasterizer, overlap.begin, size); @@ -1354,8 +1364,8 @@ void BufferCache

::ChangeRegister(BufferId buffer_id) { } const VAddr cpu_addr_begin = buffer.CpuAddr(); const VAddr cpu_addr_end = cpu_addr_begin + size; - const u64 page_begin = cpu_addr_begin / PAGE_SIZE; - const u64 page_end = Common::DivCeil(cpu_addr_end, PAGE_SIZE); + const u64 page_begin = cpu_addr_begin / CACHING_PAGESIZE; + const u64 page_end = Common::DivCeil(cpu_addr_end, CACHING_PAGESIZE); for (u64 page = page_begin; page != page_end; ++page) { if constexpr (insert) { page_table[page] = buffer_id; diff --git a/src/video_core/buffer_cache/buffer_cache_base.h b/src/video_core/buffer_cache/buffer_cache_base.h index 75cb98ba3..656baa550 100644 --- a/src/video_core/buffer_cache/buffer_cache_base.h +++ b/src/video_core/buffer_cache/buffer_cache_base.h @@ -90,10 +90,8 @@ template class BufferCache : public VideoCommon::ChannelSetupCaches { // Page size for caching purposes. // This is unrelated to the CPU page size and it can be changed as it seems optimal. - static constexpr u32 PAGE_BITS = 16; - static constexpr u64 PAGE_SIZE = u64{1} << PAGE_BITS; - static constexpr u32 CPU_PAGE_BITS = 12; - static constexpr u64 CPU_PAGE_SIZE = u64{1} << CPU_PAGE_BITS; + static constexpr u32 CACHING_PAGEBITS = 16; + static constexpr u64 CACHING_PAGESIZE = u64{1} << CACHING_PAGEBITS; static constexpr bool IS_OPENGL = P::IS_OPENGL; static constexpr bool HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS = @@ -112,6 +110,10 @@ class BufferCache : public VideoCommon::ChannelSetupCaches void ForEachBufferInRange(VAddr cpu_addr, u64 size, Func&& func) { - const u64 page_end = Common::DivCeil(cpu_addr + size, PAGE_SIZE); - for (u64 page = cpu_addr >> PAGE_BITS; page < page_end;) { + const u64 page_end = Common::DivCeil(cpu_addr + size, CACHING_PAGESIZE); + for (u64 page = cpu_addr >> CACHING_PAGEBITS; page < page_end;) { const BufferId buffer_id = page_table[page]; if (!buffer_id) { ++page; @@ -297,7 +299,7 @@ private: func(buffer_id, buffer); const VAddr end_addr = buffer.CpuAddr() + buffer.SizeBytes(); - page = Common::DivCeil(end_addr, PAGE_SIZE); + page = Common::DivCeil(end_addr, CACHING_PAGESIZE); } } @@ -568,10 +570,11 @@ private: u64 total_used_memory = 0; u64 minimum_memory = 0; u64 critical_memory = 0; + BufferId inline_buffer_id; bool active_async_buffers = false; - std::array> PAGE_BITS)> page_table; + std::array> CACHING_PAGEBITS)> page_table; }; } // namespace VideoCommon diff --git a/src/video_core/buffer_cache/memory_tracker_base.h b/src/video_core/buffer_cache/memory_tracker_base.h index 016d8430f..4bc59017f 100644 --- a/src/video_core/buffer_cache/memory_tracker_base.h +++ b/src/video_core/buffer_cache/memory_tracker_base.h @@ -132,8 +132,8 @@ public: void ForEachUploadRange(VAddr query_cpu_range, u64 query_size, Func&& func) { IteratePages(query_cpu_range, query_size, [&func](Manager* manager, u64 offset, size_t size) { - manager->template ForEachModifiedRange( - manager->GetCpuAddr() + offset, size, true, func); + manager->template ForEachModifiedRange( + manager->GetCpuAddr() + offset, size, func); }); } @@ -142,8 +142,13 @@ public: void ForEachDownloadRange(VAddr query_cpu_range, u64 query_size, bool clear, Func&& func) { IteratePages(query_cpu_range, query_size, [&func, clear](Manager* manager, u64 offset, size_t size) { - manager->template ForEachModifiedRange( - manager->GetCpuAddr() + offset, size, clear, func); + if (clear) { + manager->template ForEachModifiedRange( + manager->GetCpuAddr() + offset, size, func); + } else { + manager->template ForEachModifiedRange( + manager->GetCpuAddr() + offset, size, func); + } }); } @@ -151,8 +156,8 @@ public: void ForEachDownloadRangeAndClear(VAddr query_cpu_range, u64 query_size, Func&& func) { IteratePages(query_cpu_range, query_size, [&func](Manager* manager, u64 offset, size_t size) { - manager->template ForEachModifiedRange( - manager->GetCpuAddr() + offset, size, true, func); + manager->template ForEachModifiedRange( + manager->GetCpuAddr() + offset, size, func); }); } diff --git a/src/video_core/buffer_cache/word_manager.h b/src/video_core/buffer_cache/word_manager.h index 21729752b..a42455045 100644 --- a/src/video_core/buffer_cache/word_manager.h +++ b/src/video_core/buffer_cache/word_manager.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "common/alignment.h" @@ -20,9 +21,16 @@ constexpr u64 PAGES_PER_WORD = 64; constexpr u64 BYTES_PER_PAGE = Core::Memory::YUZU_PAGESIZE; constexpr u64 BYTES_PER_WORD = PAGES_PER_WORD * BYTES_PER_PAGE; +enum class Type { + CPU, + GPU, + CachedCPU, + Untracked, +}; + /// Vector tracking modified pages tightly packed with small vector optimization template -union WordsArray { +struct WordsArray { /// Returns the pointer to the words state [[nodiscard]] const u64* Pointer(bool is_short) const noexcept { return is_short ? stack.data() : heap; @@ -41,13 +49,13 @@ template struct Words { explicit Words() = default; explicit Words(u64 size_bytes_) : size_bytes{size_bytes_} { + num_words = Common::DivCeil(size_bytes, BYTES_PER_WORD); if (IsShort()) { cpu.stack.fill(~u64{0}); gpu.stack.fill(0); cached_cpu.stack.fill(0); untracked.stack.fill(~u64{0}); } else { - const size_t num_words = NumWords(); // Share allocation between CPU and GPU pages and set their default values u64* const alloc = new u64[num_words * 4]; cpu.heap = alloc; @@ -75,6 +83,7 @@ struct Words { Words& operator=(Words&& rhs) noexcept { Release(); size_bytes = rhs.size_bytes; + num_words = rhs.num_words; cpu = rhs.cpu; gpu = rhs.gpu; cached_cpu = rhs.cached_cpu; @@ -84,7 +93,7 @@ struct Words { } Words(Words&& rhs) noexcept - : size_bytes{rhs.size_bytes}, cpu{rhs.cpu}, gpu{rhs.gpu}, + : size_bytes{rhs.size_bytes}, num_words{rhs.num_words}, cpu{rhs.cpu}, gpu{rhs.gpu}, cached_cpu{rhs.cached_cpu}, untracked{rhs.untracked} { rhs.cpu.heap = nullptr; } @@ -94,12 +103,12 @@ struct Words { /// Returns true when the buffer fits in the small vector optimization [[nodiscard]] bool IsShort() const noexcept { - return size_bytes <= stack_words * BYTES_PER_WORD; + return num_words <= stack_words; } /// Returns the number of words of the buffer [[nodiscard]] size_t NumWords() const noexcept { - return Common::DivCeil(size_bytes, BYTES_PER_WORD); + return num_words; } /// Release buffer resources @@ -110,20 +119,40 @@ struct Words { } } + template + std::span Span() noexcept { + if constexpr (type == Type::CPU) { + return std::span(cpu.Pointer(IsShort()), num_words); + } else if constexpr (type == Type::GPU) { + return std::span(gpu.Pointer(IsShort()), num_words); + } else if constexpr (type == Type::CachedCPU) { + return std::span(cached_cpu.Pointer(IsShort()), num_words); + } else if constexpr (type == Type::Untracked) { + return std::span(untracked.Pointer(IsShort()), num_words); + } + } + + template + std::span Span() const noexcept { + if constexpr (type == Type::CPU) { + return std::span(cpu.Pointer(IsShort()), num_words); + } else if constexpr (type == Type::GPU) { + return std::span(gpu.Pointer(IsShort()), num_words); + } else if constexpr (type == Type::CachedCPU) { + return std::span(cached_cpu.Pointer(IsShort()), num_words); + } else if constexpr (type == Type::Untracked) { + return std::span(untracked.Pointer(IsShort()), num_words); + } + } + u64 size_bytes = 0; + size_t num_words = 0; WordsArray cpu; WordsArray gpu; WordsArray cached_cpu; WordsArray untracked; }; -enum class Type { - CPU, - GPU, - CachedCPU, - Untracked, -}; - template class WordManager { public: @@ -140,6 +169,69 @@ public: return cpu_addr; } + static u64 ExtractBits(u64 word, size_t page_start, size_t page_end) { + constexpr size_t number_bits = sizeof(u64) * 8; + const size_t limit_page_end = number_bits - std::min(page_end, number_bits); + u64 bits = (word >> page_start) << page_start; + bits = (bits << limit_page_end) >> limit_page_end; + return bits; + } + + static std::pair GetWordPage(VAddr address) { + const size_t converted_address = static_cast(address); + const size_t word_number = converted_address / BYTES_PER_WORD; + const size_t amount_pages = converted_address % BYTES_PER_WORD; + return std::make_pair(word_number, amount_pages / BYTES_PER_PAGE); + } + + template + void IterateWords(size_t offset, size_t size, Func&& func) const { + using FuncReturn = std::invoke_result_t; + static constexpr bool BOOL_BREAK = std::is_same_v; + const size_t start = static_cast(std::max(static_cast(offset), 0LL)); + const size_t end = static_cast(std::max(static_cast(offset + size), 0LL)); + if (start >= SizeBytes() || end <= start) { + return; + } + auto [start_word, start_page] = GetWordPage(start); + auto [end_word, end_page] = GetWordPage(end + BYTES_PER_PAGE - 1ULL); + const size_t num_words = NumWords(); + start_word = std::min(start_word, num_words); + end_word = std::min(end_word, num_words); + const size_t diff = end_word - start_word; + end_word += (end_page + PAGES_PER_WORD - 1ULL) / PAGES_PER_WORD; + end_word = std::min(end_word, num_words); + end_page += diff * PAGES_PER_WORD; + constexpr u64 base_mask{~0ULL}; + for (size_t word_index = start_word; word_index < end_word; word_index++) { + const u64 mask = ExtractBits(base_mask, start_page, end_page); + start_page = 0; + end_page -= PAGES_PER_WORD; + if constexpr (BOOL_BREAK) { + if (func(word_index, mask)) { + return; + } + } else { + func(word_index, mask); + } + } + } + + template + void IteratePages(u64 mask, Func&& func) const { + size_t offset = 0; + while (mask != 0) { + const size_t empty_bits = std::countr_zero(mask); + offset += empty_bits; + mask = mask >> empty_bits; + + const size_t continuous_bits = std::countr_one(mask); + func(offset, continuous_bits); + mask = continuous_bits < PAGES_PER_WORD ? (mask >> continuous_bits) : 0; + offset += continuous_bits; + } + } + /** * Change the state of a range of pages * @@ -147,47 +239,33 @@ public: * @param size Size in bytes to mark or unmark as modified */ template - void ChangeRegionState(u64 dirty_addr, s64 size) noexcept(type == Type::GPU) { - const s64 difference = dirty_addr - cpu_addr; - const u64 offset = std::max(difference, 0); - size += std::min(difference, 0); - if (offset >= SizeBytes() || size < 0) { - return; - } - u64* const untracked_words = Array(); - u64* const state_words = Array(); - const u64 offset_end = std::min(offset + size, SizeBytes()); - const u64 begin_page_index = offset / BYTES_PER_PAGE; - const u64 begin_word_index = begin_page_index / PAGES_PER_WORD; - const u64 end_page_index = Common::DivCeil(offset_end, BYTES_PER_PAGE); - const u64 end_word_index = Common::DivCeil(end_page_index, PAGES_PER_WORD); - u64 page_index = begin_page_index % PAGES_PER_WORD; - u64 word_index = begin_word_index; - while (word_index < end_word_index) { - const u64 next_word_first_page = (word_index + 1) * PAGES_PER_WORD; - const u64 left_offset = - std::min(next_word_first_page - end_page_index, PAGES_PER_WORD) % PAGES_PER_WORD; - const u64 right_offset = page_index; - u64 bits = ~u64{0}; - bits = (bits >> right_offset) << right_offset; - bits = (bits << left_offset) >> left_offset; + void ChangeRegionState(u64 dirty_addr, u64 size) noexcept(type == Type::GPU) { + std::span state_words = words.template Span(); + [[maybe_unused]] std::span untracked_words = words.template Span(); + [[maybe_unused]] std::span cached_words = words.template Span(); + IterateWords(dirty_addr - cpu_addr, size, [&](size_t index, u64 mask) { if constexpr (type == Type::CPU || type == Type::CachedCPU) { - NotifyRasterizer(word_index, untracked_words[word_index], bits); + NotifyRasterizer(index, untracked_words[index], mask); } if constexpr (enable) { - state_words[word_index] |= bits; + state_words[index] |= mask; if constexpr (type == Type::CPU || type == Type::CachedCPU) { - untracked_words[word_index] |= bits; + untracked_words[index] |= mask; + } + if constexpr (type == Type::CPU) { + cached_words[index] &= ~mask; } } else { - state_words[word_index] &= ~bits; + if constexpr (type == Type::CPU) { + const u64 word = state_words[index] & mask; + cached_words[index] &= ~word; + } + state_words[index] &= ~mask; if constexpr (type == Type::CPU || type == Type::CachedCPU) { - untracked_words[word_index] &= ~bits; + untracked_words[index] &= ~mask; } } - page_index = 0; - ++word_index; - } + }); } /** @@ -198,117 +276,57 @@ public: * @param size Size in bytes of the CPU range to loop over * @param func Function to call for each turned off region */ - template - void ForEachModifiedRange(VAddr query_cpu_range, s64 size, bool clear, Func&& func) { + template + void ForEachModifiedRange(VAddr query_cpu_range, s64 size, Func&& func) { static_assert(type != Type::Untracked); - const s64 difference = query_cpu_range - cpu_addr; - const u64 query_begin = std::max(difference, 0); - size += std::min(difference, 0); - if (query_begin >= SizeBytes() || size < 0) { - return; - } - [[maybe_unused]] u64* const untracked_words = Array(); - [[maybe_unused]] u64* const cpu_words = Array(); - u64* const state_words = Array(); - const u64 query_end = query_begin + std::min(static_cast(size), SizeBytes()); - u64* const words_begin = state_words + query_begin / BYTES_PER_WORD; - u64* const words_end = state_words + Common::DivCeil(query_end, BYTES_PER_WORD); - u64 first_page = (query_begin / BYTES_PER_PAGE) % PAGES_PER_WORD; - - const auto modified = [](u64 word) { return word != 0; }; - const auto first_modified_word = std::find_if(words_begin, words_end, modified); - if (first_modified_word == words_end) { - // Exit early when the buffer is not modified - return; - } - if (first_modified_word != words_begin) { - first_page = 0; - } - std::reverse_iterator first_word_reverse(first_modified_word); - std::reverse_iterator last_word_iterator(words_end); - auto last_word_result = std::find_if(last_word_iterator, first_word_reverse, modified); - u64* const last_modified_word = &(*last_word_result) + 1; - - const u64 word_index_begin = std::distance(state_words, first_modified_word); - const u64 word_index_end = std::distance(state_words, last_modified_word); - const unsigned local_page_begin = std::countr_zero(*first_modified_word); - const unsigned local_page_end = - static_cast(PAGES_PER_WORD) - std::countl_zero(last_modified_word[-1]); - const u64 word_page_begin = word_index_begin * PAGES_PER_WORD; - const u64 word_page_end = (word_index_end - 1) * PAGES_PER_WORD; - const u64 query_page_begin = query_begin / BYTES_PER_PAGE; - const u64 query_page_end = Common::DivCeil(query_end, BYTES_PER_PAGE); - const u64 page_index_begin = std::max(word_page_begin + local_page_begin, query_page_begin); - const u64 page_index_end = std::min(word_page_end + local_page_end, query_page_end); - const u64 first_word_page_begin = page_index_begin % PAGES_PER_WORD; - const u64 last_word_page_end = (page_index_end - 1) % PAGES_PER_WORD + 1; - - u64 page_begin = std::max(first_word_page_begin, first_page); - u64 current_base = 0; - u64 current_size = 0; - bool on_going = false; - for (u64 word_index = word_index_begin; word_index < word_index_end; ++word_index) { - const bool is_last_word = word_index + 1 == word_index_end; - const u64 page_end = is_last_word ? last_word_page_end : PAGES_PER_WORD; - const u64 right_offset = page_begin; - const u64 left_offset = PAGES_PER_WORD - page_end; - u64 bits = ~u64{0}; - bits = (bits >> right_offset) << right_offset; - bits = (bits << left_offset) >> left_offset; - - const u64 current_word = state_words[word_index] & bits; - if (clear) { - state_words[word_index] &= ~bits; - } - - if constexpr (type == Type::CachedCPU) { - NotifyRasterizer(word_index, untracked_words[word_index], current_word); - untracked_words[word_index] |= current_word; - cpu_words[word_index] |= current_word; - } - - if constexpr (type == Type::CPU) { - const u64 current_bits = untracked_words[word_index] & bits; - untracked_words[word_index] &= ~bits; - NotifyRasterizer(word_index, current_bits, ~u64{0}); - } - const u64 word = current_word & ~(type == Type::GPU ? untracked_words[word_index] : 0); - u64 page = page_begin; - page_begin = 0; - - while (page < page_end) { - const int empty_bits = std::countr_zero(word >> page); - if (on_going && empty_bits != 0) { - InvokeModifiedRange(func, current_size, current_base); - current_size = 0; - on_going = false; + std::span state_words = words.template Span(); + [[maybe_unused]] std::span untracked_words = words.template Span(); + [[maybe_unused]] std::span cached_words = words.template Span(); + const size_t offset = query_cpu_range - cpu_addr; + bool pending = false; + size_t pending_offset{}; + size_t pending_pointer{}; + const auto release = [&]() { + func(cpu_addr + pending_offset * BYTES_PER_PAGE, + (pending_pointer - pending_offset) * BYTES_PER_PAGE); + }; + IterateWords(offset, size, [&](size_t index, u64 mask) { + const u64 word = state_words[index] & mask; + if constexpr (clear) { + if constexpr (type == Type::CPU || type == Type::CachedCPU) { + NotifyRasterizer(index, untracked_words[index], mask); } - if (empty_bits == PAGES_PER_WORD) { - break; + state_words[index] &= ~mask; + if constexpr (type == Type::CPU || type == Type::CachedCPU) { + untracked_words[index] &= ~mask; } - page += empty_bits; - - const int continuous_bits = std::countr_one(word >> page); - if (!on_going && continuous_bits != 0) { - current_base = word_index * PAGES_PER_WORD + page; - on_going = true; + if constexpr (type == Type::CPU) { + cached_words[index] &= ~word; } - current_size += continuous_bits; - page += continuous_bits; } + const size_t base_offset = index * PAGES_PER_WORD; + IteratePages(word, [&](size_t pages_offset, size_t pages_size) { + const auto reset = [&]() { + pending_offset = base_offset + pages_offset; + pending_pointer = base_offset + pages_offset + pages_size; + }; + if (!pending) { + reset(); + pending = true; + return; + } + if (pending_pointer == base_offset + pages_offset) { + pending_pointer += pages_size; + return; + } + release(); + reset(); + }); + }); + if (pending) { + release(); } - if (on_going && current_size > 0) { - InvokeModifiedRange(func, current_size, current_base); - } - } - - template - void InvokeModifiedRange(Func&& func, u64 current_size, u64 current_base) { - const u64 current_size_bytes = current_size * BYTES_PER_PAGE; - const u64 offset_begin = current_base * BYTES_PER_PAGE; - const u64 offset_end = std::min(offset_begin + current_size_bytes, SizeBytes()); - func(cpu_addr + offset_begin, offset_end - offset_begin); } /** @@ -321,27 +339,17 @@ public: [[nodiscard]] bool IsRegionModified(u64 offset, u64 size) const noexcept { static_assert(type != Type::Untracked); - const u64* const untracked_words = Array(); - const u64* const state_words = Array(); - const u64 num_query_words = size / BYTES_PER_WORD + 1; - const u64 word_begin = offset / BYTES_PER_WORD; - const u64 word_end = std::min(word_begin + num_query_words, NumWords()); - const u64 page_limit = Common::DivCeil(offset + size, BYTES_PER_PAGE); - u64 page_index = (offset / BYTES_PER_PAGE) % PAGES_PER_WORD; - for (u64 word_index = word_begin; word_index < word_end; ++word_index, page_index = 0) { - const u64 off_word = type == Type::GPU ? untracked_words[word_index] : 0; - const u64 word = state_words[word_index] & ~off_word; - if (word == 0) { - continue; - } - const u64 page_end = std::min((word_index + 1) * PAGES_PER_WORD, page_limit); - const u64 local_page_end = page_end % PAGES_PER_WORD; - const u64 page_end_shift = (PAGES_PER_WORD - local_page_end) % PAGES_PER_WORD; - if (((word >> page_index) << page_index) << page_end_shift != 0) { + const std::span state_words = words.template Span(); + bool result = false; + IterateWords(offset, size, [&](size_t index, u64 mask) { + const u64 word = state_words[index] & mask; + if (word != 0) { + result = true; return true; } - } - return false; + return false; + }); + return result; } /** @@ -353,34 +361,20 @@ public: template [[nodiscard]] std::pair ModifiedRegion(u64 offset, u64 size) const noexcept { static_assert(type != Type::Untracked); - const u64* const state_words = Array(); - const u64 num_query_words = size / BYTES_PER_WORD + 1; - const u64 word_begin = offset / BYTES_PER_WORD; - const u64 word_end = std::min(word_begin + num_query_words, NumWords()); - const u64 page_base = offset / BYTES_PER_PAGE; - u64 page_begin = page_base & (PAGES_PER_WORD - 1); - u64 page_end = - Common::DivCeil(offset + size, BYTES_PER_PAGE) - (page_base & ~(PAGES_PER_WORD - 1)); + const std::span state_words = words.template Span(); u64 begin = std::numeric_limits::max(); u64 end = 0; - for (u64 word_index = word_begin; word_index < word_end; ++word_index) { - const u64 base_mask = (1ULL << page_begin) - 1ULL; - const u64 end_mask = page_end >= PAGES_PER_WORD ? 0ULL : ~((1ULL << page_end) - 1ULL); - const u64 off_word = end_mask | base_mask; - const u64 word = state_words[word_index] & ~off_word; + IterateWords(offset, size, [&](size_t index, u64 mask) { + const u64 word = state_words[index] & mask; if (word == 0) { - page_begin = 0; - page_end -= PAGES_PER_WORD; - continue; + return; } const u64 local_page_begin = std::countr_zero(word); const u64 local_page_end = PAGES_PER_WORD - std::countl_zero(word); - const u64 page_index = word_index * PAGES_PER_WORD; + const u64 page_index = index * PAGES_PER_WORD; begin = std::min(begin, page_index + local_page_begin); end = page_index + local_page_end; - page_begin = 0; - page_end -= PAGES_PER_WORD; - } + }); static constexpr std::pair EMPTY{0, 0}; return begin < end ? std::make_pair(begin * BYTES_PER_PAGE, end * BYTES_PER_PAGE) : EMPTY; } @@ -454,18 +448,10 @@ private: void NotifyRasterizer(u64 word_index, u64 current_bits, u64 new_bits) const { u64 changed_bits = (add_to_rasterizer ? current_bits : ~current_bits) & new_bits; VAddr addr = cpu_addr + word_index * BYTES_PER_WORD; - while (changed_bits != 0) { - const int empty_bits = std::countr_zero(changed_bits); - addr += empty_bits * BYTES_PER_PAGE; - changed_bits >>= empty_bits; - - const u32 continuous_bits = std::countr_one(changed_bits); - const u64 size = continuous_bits * BYTES_PER_PAGE; - const VAddr begin_addr = addr; - addr += size; - changed_bits = continuous_bits < PAGES_PER_WORD ? (changed_bits >> continuous_bits) : 0; - rasterizer->UpdatePagesCachedCount(begin_addr, size, add_to_rasterizer ? 1 : -1); - } + IteratePages(changed_bits, [&](size_t offset, size_t size) { + rasterizer->UpdatePagesCachedCount(addr + offset * BYTES_PER_PAGE, + size * BYTES_PER_PAGE, add_to_rasterizer ? 1 : -1); + }); } VAddr cpu_addr = 0; From 1f079d9566a7b9fb95222b00624234b65904c61a Mon Sep 17 00:00:00 2001 From: zhaobot <50136859+zhaobot@users.noreply.github.com> Date: Mon, 1 May 2023 22:17:51 +0800 Subject: [PATCH 0298/1181] Update translations (2023-05-01) (#10129) Co-authored-by: The yuzu Community --- dist/languages/ca.ts | 4 +- dist/languages/cs.ts | 2 +- dist/languages/da.ts | 4 +- dist/languages/de.ts | 4 +- dist/languages/el.ts | 4 +- dist/languages/es.ts | 94 +- dist/languages/fr.ts | 28 +- dist/languages/id.ts | 4 +- dist/languages/it.ts | 14 +- dist/languages/ja_JP.ts | 4 +- dist/languages/ko_KR.ts | 4 +- dist/languages/nb.ts | 4 +- dist/languages/nl.ts | 1916 ++++++++++++++++++++------------------- dist/languages/pl.ts | 4 +- dist/languages/pt_BR.ts | 4 +- dist/languages/pt_PT.ts | 4 +- dist/languages/ru_RU.ts | 175 ++-- dist/languages/sv.ts | 70 +- dist/languages/tr_TR.ts | 4 +- dist/languages/uk.ts | 4 +- dist/languages/zh_CN.ts | 4 +- dist/languages/zh_TW.ts | 4 +- 22 files changed, 1219 insertions(+), 1140 deletions(-) diff --git a/dist/languages/ca.ts b/dist/languages/ca.ts index b4e77d029..6978a4536 100644 --- a/dist/languages/ca.ts +++ b/dist/languages/ca.ts @@ -1372,8 +1372,8 @@ This would ban both their forum username and their IP address. - Extended memory layout (6GB DRAM) - Interfície de memòria ampliada (6GB DRAM) + Extended memory layout (8GB DRAM) + diff --git a/dist/languages/cs.ts b/dist/languages/cs.ts index b1b12c019..c7f77b15d 100644 --- a/dist/languages/cs.ts +++ b/dist/languages/cs.ts @@ -1364,7 +1364,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - Extended memory layout (6GB DRAM) + Extended memory layout (8GB DRAM) diff --git a/dist/languages/da.ts b/dist/languages/da.ts index 7c43ff7df..4bb799f90 100644 --- a/dist/languages/da.ts +++ b/dist/languages/da.ts @@ -1380,8 +1380,8 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - Extended memory layout (6GB DRAM) - Udvidet hukommelsesopsætning (6GB DRAM) + Extended memory layout (8GB DRAM) + diff --git a/dist/languages/de.ts b/dist/languages/de.ts index a455a3e78..47def0166 100644 --- a/dist/languages/de.ts +++ b/dist/languages/de.ts @@ -1360,8 +1360,8 @@ This would ban both their forum username and their IP address. - Extended memory layout (6GB DRAM) - Erweitertes Speicherlayout (6GB DRAM) + Extended memory layout (8GB DRAM) + diff --git a/dist/languages/el.ts b/dist/languages/el.ts index 023cf4825..19abc7939 100644 --- a/dist/languages/el.ts +++ b/dist/languages/el.ts @@ -1364,8 +1364,8 @@ This would ban both their forum username and their IP address. - Extended memory layout (6GB DRAM) - Διάταξη εκτεταμένης μνήμης (6GB DRAM) + Extended memory layout (8GB DRAM) + diff --git a/dist/languages/es.ts b/dist/languages/es.ts index fb5ade667..7c7f97397 100644 --- a/dist/languages/es.ts +++ b/dist/languages/es.ts @@ -381,17 +381,17 @@ Esto banearía su nombre del foro y su dirección IP. Output Device: - + Dispositivo de salida: Input Device: - + Dispositivo de entrada: Sound Output Mode: - + Método de salida de sonido: @@ -1383,8 +1383,8 @@ Esto banearía su nombre del foro y su dirección IP. - Extended memory layout (6GB DRAM) - Interfaz de memoria extendida (6GB DRAM) + Extended memory layout (8GB DRAM) + Interfaz de memoria extendida (8GB DRAM) @@ -1638,7 +1638,7 @@ Esto banearía su nombre del foro y su dirección IP. AMD FidelityFX™️ Super Resolution - + AMD FidelityFX™️ Super Resolution @@ -1753,12 +1753,12 @@ Esto banearía su nombre del foro y su dirección IP. Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. - + Activa la decodificación de texturas asíncrona de ASTC, lo cuál podría reducir la duración de los parones. Esta función es experimental. Decode ASTC textures asynchronously (Hack) - + Decodificar texturas ASTC de manera asíncrona (Hack) @@ -2268,12 +2268,12 @@ Esto banearía su nombre del foro y su dirección IP. Enable direct JoyCon driver - + Activar driver directo JoyCon Enable direct Pro Controller driver [EXPERIMENTAL] - + Activar driver directo Pro Controller [EXPERIMENTAL] @@ -2637,7 +2637,7 @@ Esto banearía su nombre del foro y su dirección IP. Turbo button - + Botón Turbo @@ -3339,7 +3339,7 @@ UUID: %2 Virtual Ring Sensor Parameters - + Parámetros del sensor Ring virtual @@ -3361,29 +3361,29 @@ UUID: %2 Direct Joycon Driver - + Driver directo del JoyCon Enable Ring Input - + Activar entrada del Ring Enable - + Activar Ring Sensor Value - + Valor del sensor Ring Not connected - + No conectado @@ -3414,12 +3414,12 @@ UUID: %2 Error enabling ring input - + Error al activar la entrada del Ring Direct Joycon driver is not enabled - + El driver directo JoyCon no está activo. @@ -3429,17 +3429,17 @@ UUID: %2 The current mapped device doesn't support the ring controller - + El dispositivo de entrada actual no soporta el control Ring. The current mapped device doesn't have a ring attached - + El dispositivo de entrada actual no tiene puesto el Ring Unexpected driver result %1 - + Resultado inesperado del driver %1 @@ -4498,12 +4498,12 @@ Arrastra los puntos para cambiar de posición, o haz doble clic en las celdas de Server Address - + Dirección del Servidor <html><head/><body><p>Server address of the host</p></body></html> - + <html><head/><body><p>Dirección del servidor del anfitrión</p></body></html> @@ -4617,12 +4617,12 @@ Arrastra los puntos para cambiar de posición, o haz doble clic en las celdas de Emulated mouse is enabled - + El ratón emulado está activado Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + La entrada de un ratón real y la panoramización del ratón son incompatibles. Por favor, desactive el ratón emulado en la configuración avanzada de entrada para permitir así la panoramización del ratón. @@ -5489,13 +5489,13 @@ Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. VOLUME: MUTE - + VOLUMEN: SILENCIO VOLUME: %1% Volume percentage (e.g. 50%) - + VOLUMEN: %1% @@ -6227,7 +6227,7 @@ Mensaje de depuración: Hide Empty Rooms - + Ocultar salas vacías @@ -7152,12 +7152,12 @@ p, li { white-space: pre-wrap; } Stick L - + Palanca L Stick R - + Palanca R @@ -7214,19 +7214,19 @@ p, li { white-space: pre-wrap; } %1%2%3%4 - + %1%2%3%4 %1%2%3Hat %4 - + %1%2%3Rotación %4 %1%2%3Button %4 - + %1%2%3Botón %4 @@ -7647,7 +7647,7 @@ Por favor, inténtalo de nuevo o contacta con el desarrollador del software. Profile Creator - + Creador de perfil @@ -7658,57 +7658,57 @@ Por favor, inténtalo de nuevo o contacta con el desarrollador del software. Profile Icon Editor - + Editor de icono de perfil Profile Nickname Editor - + Editor de nombre de perfil Who will receive the points? - + ¿Quién recibirá los puntos? Who is using Nintendo eShop? - + ¿Quién va a utilizar Nintendo eShop? Who is making this purchase? - + ¿Quién está haciendo la compra? Who is posting? - + ¿Quién está publicando esto? Select a user to link to a Nintendo Account. - + Elige un usuario para vincularlo a una Cuenta Nintendo. Change settings for which user? - + ¿Para qué usuario desea cambiar la configuración? Format data for which user? - + ¿Para qué usuario se borrarán sus datos? Which user will be transferred to another console? - + ¿Qué usuario será transferido a otra consola? Send save data for which user? - + ¿A qué usuario se le enviarán los datos de guardado? @@ -7774,7 +7774,7 @@ p, li { white-space: pre-wrap; } [%1] %2 - + [%1] %2 diff --git a/dist/languages/fr.ts b/dist/languages/fr.ts index 7730208b7..606a8816e 100644 --- a/dist/languages/fr.ts +++ b/dist/languages/fr.ts @@ -1382,8 +1382,8 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - Extended memory layout (6GB DRAM) - Disposition de la mémoire étendue (6GB DRAM) + Extended memory layout (8GB DRAM) + Disposition de la mémoire étendue (8 Go de DRAM) @@ -7637,7 +7637,7 @@ Veuillez essayer à nouveau ou contactez le développeur du logiciel. Profile Creator - + Créateur de profil @@ -7648,57 +7648,57 @@ Veuillez essayer à nouveau ou contactez le développeur du logiciel. Profile Icon Editor - + Éditeur d'icônes de profil Profile Nickname Editor - + Éditeur de surnom de profil Who will receive the points? - + Qui recevra les points ? Who is using Nintendo eShop? - + Qui utilise le Nintendo eShop ? Who is making this purchase? - + Qui effectue cet achat ? Who is posting? - + Qui publie ? Select a user to link to a Nintendo Account. - + Sélectionnez un utilisateur à associer à un compte Nintendo. Change settings for which user? - + Modifier les paramètres pour quel utilisateur ? Format data for which user? - + Formater les données pour quel utilisateur ? Which user will be transferred to another console? - + Quel utilisateur sera transféré sur une autre console ? Send save data for which user? - + Envoyer les données de sauvegarde pour quel utilisateur ? diff --git a/dist/languages/id.ts b/dist/languages/id.ts index 15054a333..a6831d7e5 100644 --- a/dist/languages/id.ts +++ b/dist/languages/id.ts @@ -1339,8 +1339,8 @@ Memungkinkan berbagai macam optimasi IR. - Extended memory layout (6GB DRAM) - Tata letak memori yang diperluas (6GB DRAM) + Extended memory layout (8GB DRAM) + diff --git a/dist/languages/it.ts b/dist/languages/it.ts index 688a071e7..8c76842b5 100644 --- a/dist/languages/it.ts +++ b/dist/languages/it.ts @@ -1368,8 +1368,8 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - Extended memory layout (6GB DRAM) - Layout di memoria esteso (6GB DRAM) + Extended memory layout (8GB DRAM) + @@ -1846,7 +1846,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. Restore Defaults - Ripristina predefiniti + Ripristina predefinite @@ -1894,7 +1894,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. Restore Default - Ripristina predefinito + Ripristina predefinita @@ -3886,7 +3886,7 @@ UUID: %2 Pause execution during loads - + Metti in pausa l'esecuzione durante i caricamenti @@ -5352,7 +5352,7 @@ Configurazione &gt; Web. Scale: %1x %1 is the resolution scaling factor - + Risoluzione: %1x @@ -5601,7 +5601,7 @@ Desideri uscire comunque? yuzu has not been compiled with OpenGL support. - yuzu non è stato compilato con il supporto OpenGL. + yuzu è stato compilato senza il supporto a OpenGL. diff --git a/dist/languages/ja_JP.ts b/dist/languages/ja_JP.ts index 66c09d493..e61137ac7 100644 --- a/dist/languages/ja_JP.ts +++ b/dist/languages/ja_JP.ts @@ -1383,8 +1383,8 @@ This would ban both their forum username and their IP address. - Extended memory layout (6GB DRAM) - 拡張メモリレイアウト（6GB DRAM） + Extended memory layout (8GB DRAM) + diff --git a/dist/languages/ko_KR.ts b/dist/languages/ko_KR.ts index bd5e8fa18..ed0a9334b 100644 --- a/dist/languages/ko_KR.ts +++ b/dist/languages/ko_KR.ts @@ -1384,8 +1384,8 @@ This would ban both their forum username and their IP address. - Extended memory layout (6GB DRAM) - 확장 메모리 레이아웃(6GB DRAM) + Extended memory layout (8GB DRAM) + diff --git a/dist/languages/nb.ts b/dist/languages/nb.ts index 5aec4a1cc..86cd4ea85 100644 --- a/dist/languages/nb.ts +++ b/dist/languages/nb.ts @@ -1355,8 +1355,8 @@ This would ban both their forum username and their IP address. - Extended memory layout (6GB DRAM) - Utvidet minneutforming (6GB DRAM) + Extended memory layout (8GB DRAM) + diff --git a/dist/languages/nl.ts b/dist/languages/nl.ts index 074742e39..7f7ba6da2 100644 --- a/dist/languages/nl.ts +++ b/dist/languages/nl.ts @@ -25,7 +25,13 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">yuzu is an experimental open-source emulator for the Nintendo Switch licensed under GPLv3.0+.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">This software should not be used to play games you have not legally obtained.</span></p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">yuzu is een experimentele open-source emulator voor de Nintendo Switch met een licentie onder GPLv3.0+.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Deze software mag niet worden gebruikt om spellen te spelen die je niet legaal hebt verkregen.</span></p></body></html> @@ -48,17 +54,17 @@ p, li { white-space: pre-wrap; } Cancel - Annuleren + Annuleer Touch the top left corner <br>of your touchpad. - Raak de linkerbovenhoek <br> van uw touchpad aan. + Raak de linkerbovenhoek <br> van je touchpad aan. Now touch the bottom right corner <br>of your touchpad. - klik nu op toets <br> op je toetsenbord + Raak nu de rechterbenedenhoek <br>van je touchpad aan. @@ -76,17 +82,17 @@ p, li { white-space: pre-wrap; } Room Window - + Kamerraam Send Chat Message - Stuur Chatbericht + Verzend Chatbericht Send Message - Stuur Bericht + Verzend Bericht @@ -106,7 +112,7 @@ p, li { white-space: pre-wrap; } %1 has been kicked - %1 is verwijderd + %1 is kicked @@ -116,55 +122,57 @@ p, li { white-space: pre-wrap; } %1 has been unbanned - %1's ban is ongedaan gemaakt + Ban van %1 is ongedaan gemaakt View Profile - Profiel Bekijken + Bekijk Profiel Block Player - Speler Blokkeren + Blokkeer Speler When you block a player, you will no longer receive chat messages from them.<br><br>Are you sure you would like to block %1? - + Als je een speler blokkeert, ontvang je geen chatberichten meer van ze.<br><br>Weet je zeker dat je %1 wilt blokkeren? Kick - Verwijderen + Kick Ban - Verwijderen + Ban Kick Player - Speler verwijderen + Kick Speler Are you sure you would like to <b>kick</b> %1? - Weet je zeker dat je %1 wil <b>verwijderen</b>? + Weet je zeker dat je %1 wil <b>kicken</b>? Ban Player - Speler Verbannen + Ban Speler Are you sure you would like to <b>kick and ban</b> %1? This would ban both their forum username and their IP address. - + Weet je zeker dat je %1 wilt <b>kicken en bannen</b>? + +Dit zou zowel hun forum gebruikersnaam als hun IP-adres verbannen. @@ -172,12 +180,12 @@ This would ban both their forum username and their IP address. Room Window - + Kamervenster Room Description - Kamer Beschrijving + Kamerbeschrijving @@ -187,7 +195,7 @@ This would ban both their forum username and their IP address. Leave Room - + Verlaat Kamer @@ -200,12 +208,12 @@ This would ban both their forum username and their IP address. Disconnected - + Verbinding verbroken %1 - %2 (%3/%4 members) - connected - + %1 - %2 (%3/%4 leden) - verbonden @@ -224,112 +232,112 @@ This would ban both their forum username and their IP address. Report Game Compatibility - Rapporteer Game Compatibiliteit + Rapporteer Spelcompatibiliteit <html><head/><body><p><span style=" font-size:10pt;">Should you choose to submit a test case to the </span><a href="https://yuzu-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">yuzu Compatibility List</span></a><span style=" font-size:10pt;">, The following information will be collected and displayed on the site:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Hardware Information (CPU / GPU / Operating System)</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Which version of yuzu you are running</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The connected yuzu account</li></ul></body></html> - <html><head/><body><p><span style=" font-size:10pt;">Als je kiest een test case op te sturen naar de </span><a href="https://yuzu-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">yuzu compatibiliteitslijst</span></a><span style=" font-size:10pt;">, zal de volgende informatie worden verzameld en getoond op de site:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Hardware Informatie (CPU / GPU / Besturingssysteem)</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Welke versie van yuzu je draait</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Het verbonden yuzu account</li></ul></body></html> + <html><head/><body><p><span style=" font-size:10pt;">Als je kiest een test case op te sturen naar de </span><a href="https://yuzu-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">yuzu-compatibiliteitslijst</span></a><span style=" font-size:10pt;">, zal de volgende informatie worden verzameld en getoond op de site:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Hardware-informatie (CPU / GPU / Besturingssysteem)</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Welke versie van yuzu je draait</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Het verbonden yuzu-account</li></ul></body></html> <html><head/><body><p>Does the game boot?</p></body></html> - + <html><head/><body><p>Start het spel op?</p></body></html> Yes The game starts to output video or audio - + Ja Het spel begint video of audio te produceren No The game doesn't get past the "Launching..." screen - + Nee Het spel komt niet voorbij het "Starten..." scherm Yes The game gets past the intro/menu and into gameplay - + Ja Het spel komt voorbij het intro/menu en begint met het spel No The game crashes or freezes while loading or using the menu - + Nee Het spel loopt vast tijdens het laden of gebruik van het menu <html><head/><body><p>Does the game reach gameplay?</p></body></html> - + <html><head/><body><p>Bereikt het spel de gameplay?</p></body></html> Yes The game works without crashes - + Ja Het spel werkt zonder crashes No The game crashes or freezes during gameplay - + Nee Het spel loopt vast of loopt vast tijdens het spelen <html><head/><body><p>Does the game work without crashing, freezing or locking up during gameplay?</p></body></html> - + <html><head/><body><p>Werkt het spel zonder te crashen, te bevriezen of vast te lopen tijdens het spelen?</p></body></html> Yes The game can be finished without any workarounds - + Ja Het spel kan zonder omwegen worden uitgespeeld No The game can't progress past a certain area - + Nee Het spel kan niet verder dan een bepaald gebied <html><head/><body><p>Is the game completely playable from start to finish?</p></body></html> - + <html><head/><body><p>Is het spel volledig speelbaar van begin tot eind?</p></body></html> Major The game has major graphical errors - + Major Het spel heeft aanzienlijke grafische fouten Minor The game has minor graphical errors - + Minor Het spel heeft lichte grafische fouten None Everything is rendered as it looks on the Nintendo Switch - + Geen Alles wordt weergegeven zoals het eruit ziet op de Nintendo Switch <html><head/><body><p>Does the game have any graphical glitches?</p></body></html> - + <html><head/><body><p>Heeft het spel grafische glitches?</p></body></html> Major The game has major audio errors - + Major Het spel heeft aanzienlijke audiofouten Minor The game has minor audio errors - + Minor Het spel heeft lichte audiofouten None Audio is played perfectly - + Geen Audio wordt perfect afgespeeld <html><head/><body><p>Does the game have any audio glitches / missing effects?</p></body></html> - + <html><head/><body><p>Heeft het spel audio-glitches / ontbrekende effecten?</p></body></html> @@ -363,27 +371,27 @@ This would ban both their forum username and their IP address. Audio - Geluid + Audio Output Engine: - Output Engine: + Uitvoer-engine: Output Device: - + Uitvoerapparaat: Input Device: - + Invoerapparaat: Sound Output Mode: - + Geluidsuitvoermodus: @@ -408,7 +416,7 @@ This would ban both their forum username and their IP address. Set volume: - stel volume in: + Stel volume in: @@ -423,7 +431,7 @@ This would ban both their forum username and their IP address. Mute audio when in background - + Demp audio op de achtergrond @@ -437,37 +445,37 @@ This would ban both their forum username and their IP address. Configure Infrared Camera - + Configureer Infraroodcamera Select where the image of the emulated camera comes from. It may be a virtual camera or a real camera. - + Selecteer waar het beeld van de geëmuleerde camera vandaan komt. Het kan een virtuele camera of een echte camera zijn. Camera Image Source: - + Camera Beeldbron: Input device: - + Invoerapparaat: Preview - + Preview Resolution: 320*240 - + Resolutie: 320*240 Click to preview - + Klik om een preview te zien @@ -500,7 +508,7 @@ This would ban both their forum username and their IP address. Accuracy: - Accuratie: + Nauwkeurigheid: @@ -520,7 +528,7 @@ This would ban both their forum username and their IP address. Paranoid (disables most optimizations) - + Paranoid (schakelt de meeste optimalisaties uit) @@ -530,7 +538,7 @@ This would ban both their forum username and their IP address. Unsafe CPU Optimization Settings - Onveilige CPU optimalisatie instellingen + Onveilige CPU-optimalisatie-instellingen @@ -543,8 +551,7 @@ This would ban both their forum username and their IP address. <div>This option improves speed by reducing accuracy of fused-multiply-add instructions on CPUs without native FMA support.</div> -<div>Deze optie verbeterd de prestatie door de accuratie van fused-multiply-add instructies te verminderen op CPU's zonder native FMA support.</div> - +<div>Deze optie verbeterd de prestatie door de accuratie van fused-multiply-add-instructies te verminderen op CPU's zonder native FMA support.</div> @@ -570,13 +577,12 @@ This would ban both their forum username and their IP address. <div>This option improves the speed of 32 bits ASIMD floating-point functions by running with incorrect rounding modes.</div> -<div>Deze optie verbetert de snelheid of 32-bit ASIMD floating-point functies door incorrecte afronding modellen te gebruiken.</div> - +<div>Deze optie verbetert de snelheid of 32-bit ASIMD floating-point functies door incorrecte afronding modellen te gebruiken.</div> Faster ASIMD instructions (32 bits only) - + Snellere ASIMD-instructies (alleen 32-bits) @@ -589,36 +595,38 @@ This would ban both their forum username and their IP address. Inaccurate NaN handling - Onnauwkeurige verwerking van NaN + Onnauwkeurige NaN-verwerking <div>This option improves speed by eliminating a safety check before every memory read/write in guest. Disabling it may allow a game to read/write the emulator's memory.</div> - + +<div>Deze optie verbetert de snelheid door het elimineren van een veiligheidscontrole voor elk geheugen lezen/schrijven in de gast. Door deze optie uit te schakelen kan een spel het geheugen van de emulator lezen/schrijven.</div> Disable address space checks - + Schakel adresruimtecontroles uit <div>This option improves speed by relying only on the semantics of cmpxchg to ensure safety of exclusive access instructions. Please note this may result in deadlocks and other race conditions.</div> - + +<div>Deze optie verbetert de snelheid door alleen de semantiek van cmpxchg te gebruiken om de veiligheid van exclusieve toegangsinstructies te garanderen. Dit kan resulteren in deadlocks en andere "race conditions".</div> Ignore global monitor - + Negeer globale monitor CPU settings are available only when game is not running. - CPU settings zijn alleen toegankelijk als er geen spel draait + CPU-instellingen zijn alleen toegankelijk als er geen spel draait. @@ -626,13 +634,12 @@ This would ban both their forum username and their IP address. Form - Formulier + Vorm CPU - CPU - + CPU @@ -642,7 +649,7 @@ This would ban both their forum username and their IP address. <html><head/><body><p><span style=" font-weight:600;">For debugging only.</span><br/>If you're not sure what these do, keep all of these enabled. <br/>These settings, when disabled, only take effect when CPU Debugging is enabled. </p></body></html> - + <html><head/><body><p><span style=" font-weight:600;">Alleen voor debugging.</span><br/> Als u niet zeker weet wat deze doen, laat ze dan allemaal ingeschakeld. <br/>Deze instellingen, indien uitgeschakeld, hebben alleen effect wanneer CPU Debugging is ingeschakeld.</p></body></html> @@ -652,14 +659,14 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">Disabling this forces all memory accesses to go through the Memory::Read/Memory::Write functions.</div> -<div style="white-space: nowrap">Deze optimazie versneld geheugen toegang door het gastprogramma.</div> -<div style="white-space: nowrap">Door dit aan te leggen geeft toegang tot PageTable::pointers in uitgezonden code.</div> -<div style="white-space: nowrap">Door dit uit te leggen forceerd u alle geheugen toegang door Memory::Read/Memory::Write functies te gaan.</div> +<div style="white-space: nowrap">Deze optimalisatie versnelt exclusieve geheugentoegang door het gastprogramma.</div> +<div style="white-space: nowrap">Inschakelen zorgt ervoor dat exclusieve geheugenlees/schrijfacties van de gast rechtstreeks in het geheugen plaatsvinden en gebruik maken van de MMU van de host.</div> +<div style="white-space: nowrap">Uitschakelen forceert het gebruik van Software MMU-emulatie voor alle exclusieve geheugentoepassingen.</div> Enable inline page tables - Schakel inlijne pagina tafles in + Schakel inline paginatabellen in @@ -672,7 +679,7 @@ This would ban both their forum username and their IP address. Enable block linking - Schakel block linking in + Schakel blocklinking in @@ -680,13 +687,12 @@ This would ban both their forum username and their IP address. <div>This optimization avoids dispatcher lookups by keeping track potential return addresses of BL instructions. This approximates what happens with a return stack buffer on a real CPU.</div> -<div>Deze optimalisatie vermijdt het opzoeken van dispatchers door potentiële retouradressen van BL-instructies bij te houden. Dit benadert wat er gebeurt met een retourstackbuffer op een echte CPU.</div> +<div>Deze optimalisatie vermijdt dispatcher lookups door potentiële terugkeeradressen van BL-instructies bij te houden. Dit benadert wat er gebeurt met een return stack buffer op een echte CPU.</div> Enable return stack buffer - Return-stackbuffer inschakelen -  + Schakel return-stackbuffer in @@ -699,7 +705,7 @@ This would ban both their forum username and their IP address. Enable fast dispatcher - Shakel snelle dispatcher in + Schakel snelle dispatcher in @@ -712,7 +718,7 @@ This would ban both their forum username and their IP address. Enable context elimination - Shakel context eliminatie in + Schakel context eliminatie in @@ -725,7 +731,7 @@ This would ban both their forum username and their IP address. Enable constant propagation - Constante verspreiding inschakelen + Schakel constante verspreiding in @@ -738,7 +744,7 @@ This would ban both their forum username and their IP address. Enable miscellaneous optimizations - Diverse optimalisaties inschakelen + Schakel diverse optimalisaties in @@ -753,7 +759,7 @@ This would ban both their forum username and their IP address. Enable misalignment check reduction - Schakel verkeerde uitlijning vermindering in + Schakel verkeerde uitlijningsvermindering in @@ -763,14 +769,14 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">Disabling this forces all memory accesses to use Software MMU Emulation.</div> -<div style="white-space: nowrap">Deze optimazie versneld geheugen toegang door het gastprogramma.</div> -<div style="white-space: nowrap">Door dit aan te leggen geeft toegang tot PageTable::pointers in uitgezonden code.</div> -<div style="white-space: nowrap">Door dit uit te leggen forceerd u alle geheugen toegang door Memory::Read/Memory::Write functies te gaan.</div> +<div style="white-space: nowrap">Deze optimalisatie versnelt exclusieve geheugentoegang door het gastprogramma.</div> +<div style="white-space: nowrap">Inschakelen zorgt ervoor dat geheugenlees/schrijfacties rechtstreeks in het geheugen plaatsvinden en gebruik maken van de MMU van de host.</div> +<div style="white-space: nowrap">Uitschakelen forceert het gebruik van Software MMU-emulatie voor alle exclusieve geheugentoepassingen.</div> Enable Host MMU Emulation (general memory instructions) - + Schakel Host MMU-emulatie in (algemene geheugeninstructies) @@ -779,12 +785,15 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">Enabling it causes guest exclusive memory reads/writes to be done directly into memory and make use of Host's MMU.</div> <div style="white-space: nowrap">Disabling this forces all exclusive memory accesses to use Software MMU Emulation.</div> - + +<div style="white-space: nowrap">Deze optimalisatie versnelt exclusieve geheugentoegang door het gastprogramma.</div> +<div style="white-space: nowrap">Inschakelen zorgt ervoor dat exclusieve geheugenlees/schrijfacties van de gast rechtstreeks in het geheugen plaatsvinden en gebruik maken van de MMU van de host.</div> +<div style="white-space: nowrap">Uitschakelen forceert het gebruik van Software MMU-emulatie voor alle exclusieve geheugentoepassingen.</div> Enable Host MMU Emulation (exclusive memory instructions) - + Schakel Host MMU-emulatie in (exclusieve geheugeninstructies) @@ -792,12 +801,14 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">This optimization speeds up exclusive memory accesses by the guest program.</div> <div style="white-space: nowrap">Enabling it reduces the overhead of fastmem failure of exclusive memory accesses.</div> - + +<div style="white-space: nowrap">Deze optimalisatie versnelt exclusieve geheugentoegang door het gastprogramma.</div> +<div style="white-space: nowrap">Het inschakelen ervan vermindert de overhead van fastmem falen van exclusieve geheugentoegang.</div> Enable recompilation of exclusive memory instructions - + Schakel hercompilatie van exclusieve geheugeninstructies in @@ -805,12 +816,14 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">This optimization speeds up memory accesses by allowing invalid memory accesses to succeed.</div> <div style="white-space: nowrap">Enabling it reduces the overhead of all memory accesses and has no impact on programs that don't access invalid memory.</div> - + +<div style="white-space: nowrap">Deze optimalisering versnelt geheugentoepassingen door ongeldige geheugentoepassingen te laten slagen.</div> +<div style="white-space: nowrap">Het inschakelen ervan vermindert de overhead van alle geheugentoepassingen en heeft geen invloed op programma's die geen ongeldig geheugen gebruiken.</div> Enable fallbacks for invalid memory accesses - + Schakel fallbacks in voor ongeldige geheugentoegang @@ -823,12 +836,12 @@ This would ban both their forum username and their IP address. Debugger - + Debugger Enable GDB Stub - GDB Stub Aanzetten + Schakel GDB Stub in @@ -848,12 +861,12 @@ This would ban both their forum username and their IP address. Show Log in Console - Laat Log Venster Zien + Toon Login-console Open Log Location - Open Log Locatie + Open Loglocatie @@ -863,7 +876,7 @@ This would ban both their forum username and their IP address. Enable Extended Logging** - Activeer Uitgebreid Loggen** + Schakel Uitgebreid Loggen** in @@ -873,7 +886,7 @@ This would ban both their forum username and their IP address. Arguments String - Argumenten Rij + Argumentenrij @@ -888,42 +901,42 @@ This would ban both their forum username and their IP address. Enable Graphics Debugging - Grafische foutopsporing inschakelen + Schakel Graphics Foutopsporing in When checked, it enables Nsight Aftermath crash dumps - + Indien aangevinkt schakelt het Nsight Aftermath crashdumps in Enable Nsight Aftermath - + Schakel Nsight Aftermath in When checked, it will dump all the original assembler shaders from the disk shader cache or game as found - + Indien aangevinkt, zal het alle originele assembler shaders van de disk shader cache of het gevonden spel dumpen Dump Game Shaders - + Dump Spel-shaders When checked, it will dump all the macro programs of the GPU - + Indien aangevinkt, worden alle macroprogramma's van de GPU gedumpt Dump Maxwell Macros - + Dump Maxwell-macro's When checked, it disables the macro Just In Time compiler. Enabling this makes games run slower - Indien aangevinkt, wordt de macro Just In Time-compiler uitgeschakeld. Als u dit inschakelt, worden games langzamer + Indien aangevinkt, wordt de macro Just In Time-compiler uitgeschakeld. Als je dit inschakelt, worden spellen langzamer @@ -933,32 +946,32 @@ This would ban both their forum username and their IP address. When checked, it disables the macro HLE functions. Enabling this makes games run slower - + Indien aangevinkt, schakelt het de macro HLE functies uit. Inschakelen maakt spellen langzamer Disable Macro HLE - + Schakel Macro HLE uit When checked, yuzu will log statistics about the compiled pipeline cache - + Indien aangevinkt, zal yuzu statistieken registreren over de gecompileerde pijplijn-cache Enable Shader Feedback - + Schakel Shader Feedback in When checked, it executes shaders without loop logic changes - + Indien aangevinkt, voert het shaders uit zonder wijzigingen in de luslogica Disable Loop safety checks - + Schakel Lusveiligheidscontroles uit @@ -968,27 +981,27 @@ This would ban both their forum username and their IP address. Enable Verbose Reporting Services** - + Schakel Verbose Reporting Services** in Enable FS Access Log - + Schakel FS-toegangslogboek in Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Zet dit aan om de laatst gegenereerde audio commandolijst naar de console te sturen. Alleen van invloed op spellen die de audio renderer gebruiken. Dump Audio Commands To Console** - + Dump Audio-opdrachten naar Console** Create Minidump After Crash - + Maak Minidump na Crash @@ -998,42 +1011,42 @@ This would ban both their forum username and their IP address. Kiosk (Quest) Mode - Kiosk (Quest) Modus + Kiosk-modus (Quest) Enable CPU Debugging - + Schakel CPU-foutopsporing in Enable Debug Asserts - Schakel Debug asserties in + Schakel Debug-asserts in Enable Auto-Stub** - + Schakel Auto-Stub** in Enable All Controller Types - + Schakel Alle Controler-soorten in Disable Web Applet - + Schakel Webapplet uit Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Laat yuzu controleren op een werkende Vulkan-omgeving wanneer het programma opstart. Schakel dit uit als dit problemen veroorzaakt met externe programma's die yuzu zien. Perform Startup Vulkan Check - + Voer Vulkan-controle bij het opstarten uit @@ -1043,22 +1056,22 @@ This would ban both their forum username and their IP address. Restart Required - + Herstart Vereist yuzu is required to restart in order to apply this setting. - + yuzu moet opnieuw opstarten om deze instelling toe te passen. Web applet not compiled - + Webapplet niet gecompileerd MiniDump creation not compiled - + MiniDump-creatie niet gecompileerd @@ -1066,12 +1079,12 @@ This would ban both their forum username and their IP address. Configure Debug Controller - Debug-controller configureren + Configureer Debug-controller Clear - Verwijder + Wis @@ -1084,7 +1097,7 @@ This would ban both their forum username and their IP address. Form - Formulier + Vorm @@ -1095,8 +1108,7 @@ This would ban both their forum username and their IP address. CPU - CPU - + CPU @@ -1104,13 +1116,13 @@ This would ban both their forum username and their IP address. yuzu Configuration - yuzu Configuratie + yuzu-configuratie Audio - Geluid + Audio @@ -1138,12 +1150,12 @@ This would ban both their forum username and their IP address. Graphics - Grafisch + Graphics GraphicsAdvanced - GeAdvanceerdeGrafisch + Geavanceerde Graphics @@ -1164,7 +1176,7 @@ This would ban both their forum username and their IP address. Network - + Netwerk @@ -1175,7 +1187,7 @@ This would ban both their forum username and their IP address. Game List - Game Lijst + Spellijst @@ -1198,7 +1210,7 @@ This would ban both their forum username and their IP address. Storage Directories - Opslag Folders + Opslagmappen @@ -1217,12 +1229,12 @@ This would ban both their forum username and their IP address. SD Card - SD Kaart + SD-kaart Gamecard - Gamekaart + Spelkaart @@ -1232,7 +1244,7 @@ This would ban both their forum username and their IP address. Inserted - Ingevoerd + Geplaatst @@ -1242,7 +1254,7 @@ This would ban both their forum username and their IP address. Patch Manager - Patch Beheer + Patch-beheer @@ -1272,7 +1284,7 @@ This would ban both their forum username and their IP address. Cache Game List Metadata - Cache Spel Lijst Metadata + Cache Metagegevens van Spellijst @@ -1280,37 +1292,37 @@ This would ban both their forum username and their IP address. Reset Metadata Cache - Herstel Metadata Cache + Herstel Metagegevenscache Select Emulated NAND Directory... - Selecteer Geëmuleerde NAND Folder + Selecteer Geëmuleerde NAND-map... Select Emulated SD Directory... - Selecteer Geëmuleerde SD Folder + Selecteer Geëmuleerde SD-map... Select Gamecard Path... - Selecteer Gamekaart Pad + Selecteer Spelkaartpad... Select Dump Directory... - Selecteer Dump Folder + Selecteer Dump-map... Select Mod Load Directory... - Selecteer Mod Laad Folder + Selecteer Mod-laadmap... The metadata cache is already empty. - De metadata cache is al leeg. + De metagegevenscache is al leeg. @@ -1320,7 +1332,7 @@ This would ban both their forum username and their IP address. The metadata cache couldn't be deleted. It might be in use or non-existent. - De metadata cache kon niet worden verwijderd. Het wordt mogelijk gebruikt of bestaat niet. + De metagegevenscache kon niet worden verwijderd. Het wordt mogelijk gebruikt of bestaat niet. @@ -1339,7 +1351,7 @@ This would ban both their forum username and their IP address. Limit Speed Percent - Limiteer Snelheid Percentage + Beperk Snelheidspercentage @@ -1349,12 +1361,12 @@ This would ban both their forum username and their IP address. Multicore CPU Emulation - Multicore CPU Emulatie + Multicore CPU-emulatie - Extended memory layout (6GB DRAM) - + Extended memory layout (8GB DRAM) + Uitgebreide geheugenindeling (8 GB DRAM) @@ -1364,22 +1376,22 @@ This would ban both their forum username and their IP address. Prompt for user on game boot - Vraag voor gebruiker bij het opstartten van het spel. + Vraag aan gebruiker bij opstarten van het spel Pause emulation when in background - Pauzeer Emulatie wanneer yuzu op de achtergrond openstaat + Emulatie onderbreken op de achtergrond Hide mouse on inactivity - Verstop muis wanneer inactief + Verberg muis wanneer inactief Reset All Settings - Reset alle instellingen + Reset Alle Instellingen @@ -1402,17 +1414,17 @@ This would ban both their forum username and their IP address. Graphics - Grafisch + Graphics API Settings - API instellingen + API-instellingen Shader Backend: - + Shader Backend: @@ -1438,37 +1450,37 @@ This would ban both their forum username and their IP address. Use disk pipeline cache - + Gebruik schijfpijplijn-cache Use asynchronous GPU emulation - Gebruik asynchroon GPU emulatie + Gebruik asynchrone GPU-emulatie Accelerate ASTC texture decoding - + Versnel ASTC-textuurdecodering NVDEC emulation: - + NVDEC-emulatie: No Video Output - + Geen Video-uitvoer CPU Video Decoding - + CPU Videodecodering GPU Video Decoding (Default) - + GPU Videodecodering (Standaard) @@ -1478,7 +1490,7 @@ This would ban both their forum username and their IP address. Borderless Windowed - BoordLoos Venster + Randloos Venster @@ -1508,142 +1520,142 @@ This would ban both their forum username and their IP address. Force 16:10 - + Forceer 16:10 Stretch to Window - Rek naar Venster + Uitrekken naar Venster Resolution: - + Resolutie: 0.5X (360p/540p) [EXPERIMENTAL] - + 0.5X (360p/540p) [EXPERIMENTEEL] 0.75X (540p/810p) [EXPERIMENTAL] - + 0.75X (540p/810p) [EXPERIMENTEEL] 1X (720p/1080p) - + 1X (720p/1080p) 1.5X (1080p/1620p) [EXPERIMENTAL] - + 1.5X (1080p/1620p) [EXPERIMENTEEL] 2X (1440p/2160p) - + 2X (1440p/2160p) 3X (2160p/3240p) - + 3X (2160p/3240p) 4X (2880p/4320p) - + 4X (2880p/4320p) 5X (3600p/5400p) - + 5X (3600p/5400p) 6X (4320p/6480p) - + 6X (4320p/6480p) 7X (5040p/7560p) - + 7X (5040p/7560p) 8X (5760p/8640p) - + 8X (5760p/8640p) Window Adapting Filter: - + Window Adapting Filter: Nearest Neighbor - + Nearest Neighbor Bilinear - + Bilinear Bicubic - + Bicubic Gaussian - + Gaussian ScaleForce - + ScaleForce AMD FidelityFX™️ Super Resolution - + AMD FidelityFX™️ Super Resolution Anti-Aliasing Method: - + Antialiasing-methode: FXAA - + FXAA SMAA - + SMAA Use global FSR Sharpness - + Gebruik globale FSR-scherpte Set FSR Sharpness - + Stel FSR-scherpte in FSR Sharpness: - + FSR-scherpte: 100% - + 100% @@ -1664,12 +1676,12 @@ This would ban both their forum username and their IP address. GLASM (Assembly Shaders, NVIDIA Only) - + GLASM (Assembly Shaders, alleen NVIDIA) SPIR-V (Experimental, Mesa Only) - + SPIR-V (Experimenteel, alleen Mesa) @@ -1683,12 +1695,12 @@ This would ban both their forum username and their IP address. Form - Formulier + Vorm Advanced - Gedadvanceerd + Geavanceerd @@ -1703,12 +1715,12 @@ This would ban both their forum username and their IP address. Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - + Werkt op de achtergrond terwijl er wordt gewacht op grafische opdrachten om te voorkomen dat de GPU zijn kloksnelheid verlaagt. Force maximum clocks (Vulkan only) - + Forceer maximale klokken (alleen Vulkan) @@ -1718,17 +1730,17 @@ This would ban both their forum username and their IP address. Use VSync - + Gebruik VSync Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. - + Maakt asynchrone ASTC-textuurdecodering mogelijk, waardoor de laadtijd minder stottert. Deze functie is experimenteel. Decode ASTC textures asynchronously (Hack) - + Decodeer ASTC-texturen asynchroon (Hack) @@ -1738,37 +1750,37 @@ This would ban both their forum username and their IP address. Use asynchronous shader building (Hack) - + Gebruik asynchrone shaderbouw (Hack) Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Schakelt Snelle GPU-tijd in. Deze optie forceert de meeste games om op hun hoogste native resolutie te draaien. Use Fast GPU Time (Hack) - + Gebruik Snelle GPU-tijd (Hack) Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - + Schakelt pessimistische bufferschoonmaakacties in. Deze optie forceert het schoonmaken van ongewijzigde buffers, wat prestaties kan kosten. Use pessimistic buffer flushes (Hack) - + Gebruik pessimistische bufferleegmaakacties (Hack) Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Schakelt GPU-leverancier-specifieke pijplijn-cache in. Deze optie kan de laadtijd van shaders aanzienlijk verbeteren in gevallen waarin het Vulkan-stuurprogramma de pijplijncachebestanden niet intern opslaat. Use Vulkan pipeline cache - + Gebruik Vulkan-pijplijn-cache @@ -1778,7 +1790,7 @@ This would ban both their forum username and their IP address. Automatic - + Automatisch @@ -1811,7 +1823,7 @@ This would ban both their forum username and their IP address. Hotkey Settings - Sneltoets Instellingen + Sneltoets-instellingen @@ -1821,7 +1833,7 @@ This would ban both their forum username and their IP address. Double-click on a binding to change it. - Dubbel-klik op een binding om het te veranderen. + Dubbelklik op een instelling om deze te wijzigen. @@ -1846,14 +1858,14 @@ This would ban both their forum username and their IP address. Controller Hotkey - + Controller-sneltoets Conflicting Key Sequence - Ongeldige Toets Volgorde + Ongeldige Toetsvolgorde @@ -1864,7 +1876,7 @@ This would ban both their forum username and their IP address. Home+%1 - + Home+%1 @@ -1874,7 +1886,7 @@ This would ban both their forum username and their IP address. Invalid - + Ongeldig @@ -1884,17 +1896,17 @@ This would ban both their forum username and their IP address. Clear - Verwijder + Wis Conflicting Button Sequence - + Conflicterende Knoppencombinatie The default button sequence is already assigned to: %1 - + De standaard knoppencombinatie is al toegewezen aan: %1 @@ -1966,17 +1978,17 @@ This would ban both their forum username and their IP address. Console Mode - Console ID: + Console-modus: Docked - GeDocked + Docked Handheld - Mobiel + Handheld @@ -2052,7 +2064,7 @@ This would ban both their forum username and their IP address. Clear - Verwijder + Wis @@ -2065,7 +2077,7 @@ This would ban both their forum username and their IP address. Joycon Colors - Joycon Kleuren + Joycon-kleuren @@ -2082,7 +2094,7 @@ This would ban both their forum username and their IP address. L Body - L lichaam + L-lichaam @@ -2094,7 +2106,7 @@ This would ban both their forum username and their IP address. L Button - L Knop + L-knop @@ -2106,7 +2118,7 @@ This would ban both their forum username and their IP address. R Body - R lichaam + R-lichaam @@ -2118,7 +2130,7 @@ This would ban both their forum username and their IP address. R Button - R Knop + R-knop @@ -2158,7 +2170,7 @@ This would ban both their forum username and their IP address. Emulated Devices - + Geëmuleerde Apparaten @@ -2178,12 +2190,12 @@ This would ban both their forum username and their IP address. Advanced - Gedadvanceerd + Geavanceerd Debug Controller - Debug Controller + Debug-controller @@ -2196,12 +2208,12 @@ This would ban both their forum username and their IP address. Ring Controller - + Ring Controller Infrared Camera - + Infraroodcamera @@ -2211,49 +2223,49 @@ This would ban both their forum username and their IP address. Emulate Analog with Keyboard Input - Emuleer Anolooge invoer met toetsenbord + Emuleer Analoog met Toetsenbordinvoer Requires restarting yuzu - + Vereist het herstarten van yuzu Enable XInput 8 player support (disables web applet) - + Schakel ondersteuning voor XInput 8-speler in (schakelt webapplet uit) Enable UDP controllers (not needed for motion) - + Schakel UDP-controllers in (niet nodig voor beweging) Controller navigation - + Controller-navigering Enable direct JoyCon driver - + Schakel JoyCon-stuurprogramma in Enable direct Pro Controller driver [EXPERIMENTAL] - + Schakel Pro Controller-stuurprogramma in [EXPERIMENTEEL] Enable mouse panning - Schakel muis panning in + Schakel muispanning in Mouse sensitivity - Muis Gevoeligheid + Muisgevoeligheid @@ -2271,67 +2283,67 @@ This would ban both their forum username and their IP address. Form - Formulier + Vorm Graphics - Grafisch + Graphics Input Profiles - + Invoerprofielen Player 1 Profile - + Profiel Speler 1 Player 2 Profile - + Profiel Speler 2 Player 3 Profile - + Profiel Speler 3 Player 4 Profile - + Profiel Speler 4 Player 5 Profile - + Profiel Speler 5 Player 6 Profile - + Profiel Speler 6 Player 7 Profile - + Profiel Speler 7 Player 8 Profile - + Profiel Speler 8 Use global input configuration - + Gebruik globale invoerconfiguratie Player %1 profile - + Profiel Speler %1 @@ -2344,12 +2356,12 @@ This would ban both their forum username and their IP address. Connect Controller - Verbindt Controller + Verbind Controller Input Device - Invoer Apparaat + Invoerapparaat @@ -2385,7 +2397,7 @@ This would ban both their forum username and their IP address. Up - Boven: + Omhoog @@ -2396,7 +2408,7 @@ This would ban both their forum username and their IP address. Left - Links: + Links @@ -2407,7 +2419,7 @@ This would ban both their forum username and their IP address. Right - Rechts: + Rechts @@ -2417,7 +2429,7 @@ This would ban both their forum username and their IP address. Down - Beneden: + Omlaag @@ -2425,7 +2437,7 @@ This would ban both their forum username and their IP address. Pressed - Ingedrukt: + Ingedrukt @@ -2433,13 +2445,13 @@ This would ban both their forum username and their IP address. Modifier - Modificatie: + Modificator Range - Berijk + Bereik @@ -2457,7 +2469,7 @@ This would ban both their forum username and their IP address. Modifier Range: 0% - Bewerk Range: 0% + Modificatorbereik: 0% @@ -2495,13 +2507,13 @@ This would ban both their forum username and their IP address. Plus - Plus: + Plus Home - Home: + Home @@ -2509,7 +2521,7 @@ This would ban both their forum username and their IP address. R - R: + R @@ -2543,7 +2555,7 @@ This would ban both their forum username and their IP address. Face Buttons - Gezicht Knoppen + Gezichtsknoppen @@ -2581,7 +2593,7 @@ This would ban both their forum username and their IP address. Clear - Verwijder + Wis @@ -2596,64 +2608,64 @@ This would ban both their forum username and their IP address. Invert button - + Knop omkeren Toggle button - Shakel Knop + Schakel-knop Turbo button - + Turbo-knop Invert axis - Spiegel As + Spiegel as Set threshold - + Stel drempel in Choose a value between 0% and 100% - + Kies een waarde tussen 0% en 100% Toggle axis - + Schakel as Set gyro threshold - + Stel gyro-drempel in Map Analog Stick - Zet Analoge Stick + Analoge Stick Toewijzen After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. - Na OK in te drukken, beweeg je joystick eerst horizontaal en dan verticaal. -Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. + Nadat je op OK hebt gedrukt, beweeg je de joystick eerst horizontaal en vervolgens verticaal. +Om de assen om te keren, beweeg je de joystick eerst verticaal en vervolgens horizontaal. Center axis - + Midden as @@ -2665,7 +2677,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Modifier Range: %1% - Bewerk Range: %1% + Modificatorbereik: %1% @@ -2691,42 +2703,42 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Handheld - Mobiel + Handheld GameCube Controller - GameCube Controller + GameCube-controller Poke Ball Plus - + Poke Ball Plus NES Controller - + NES-controller SNES Controller - + SNES-controller N64 Controller - + N64-controller Sega Genesis - + Sega Genesis Start / Pause - Start / Pauze + Begin / Onderbreken @@ -2746,7 +2758,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Shake! - Shudden! + Schud! @@ -2761,53 +2773,53 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Enter a profile name: - Voer nieuwe gebruikersnaam in: + Voer een profielnaam in: Create Input Profile - Creëer een nieuw Invoer Profiel + Maak Invoerprofiel The given profile name is not valid! - De ingevoerde Profiel naam is niet geldig + De ingevoerde profielnaam is niet geldig! Failed to create the input profile "%1" - Het is mislukt om Invoer Profiel "%1 te Creëer + Kon invoerprofiel "%1" niet maken Delete Input Profile - Verwijder invoer profiel + Verwijder Invoerprofiel Failed to delete the input profile "%1" - Het is mislukt om Invoer Profiel "%1 te Verwijderen + Kon invoerprofiel "%1" niet verwijderen Load Input Profile - Laad invoer profiel + Laad Invoerprofiel Failed to load the input profile "%1" - Het is mislukt om Invoer Profiel "%1 te Laden + Kon invoerprofiel "%1" niet laden Save Input Profile - Sla Invoer profiel op + Sla Invoerprofiel op Failed to save the input profile "%1" - Het is mislukt om Invoer Profiel "%1 Op te slaan + Kon invoerprofiel "%1" niet opslaan @@ -2815,12 +2827,12 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Create Input Profile - Maak Invoer Profiel + Maak Invoerprofiel Clear - Verwijder + Wis @@ -2843,7 +2855,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. UDP Calibration: - UDP Calibratie: + UDP-calibratie: @@ -2860,17 +2872,17 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Touch from button profile: - + Raak van knop-profiel: CemuhookUDP Config - CemuhookUDP Configuratie + CemuhookUDP-configuratie You may use any Cemuhook compatible UDP input source to provide motion and touch input. - U kunt elke Cemuhook-compatibele UDP-invoerbron gebruiken voor bewegings- en aanraakinvoer. + Je kunt elke Cemuhook-compatibele UDP-invoerbron gebruiken om beweging en aanraking in te voeren. @@ -2885,7 +2897,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Learn More - Leer Meer + Meer Info @@ -2901,12 +2913,12 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Remove Server - Externe Server + Verwijder Server <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Learn More</span></a> - <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Leer Meer</span></a> + <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Meer Info</span></a> @@ -2921,7 +2933,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. yuzu - Yuzu + yuzu @@ -2936,12 +2948,12 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. IP address is not valid - IP adress is niet geldig + IP-adress is niet geldig This UDP server already exists - Deze UDP server bestaat al + Deze UDP-server bestaat al @@ -2961,7 +2973,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Test Successful - Test Succesvol + Test Succesvol @@ -2976,12 +2988,12 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. - Kan niet de juiste data van de server ontvangen.<br>Verifieer dat de server is goed opgezet en dat het adres en poort correct zijn. + Kan niet de juiste data van de server ontvangen.<br>Controleer of de server correct is ingesteld en of het adres en de poort correct zijn. UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. - UDP Test of calibratie configuratie is bezig.<br>Wacht alstublieft totdat het voltooid is. + UDP-test of kalibratieconfiguratie is bezig.<br>Wacht tot ze klaar zijn. @@ -2989,12 +3001,12 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Form - Formulier + Vorm Network - + Netwerk @@ -3004,7 +3016,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Network Interface - + Netwerkinterface @@ -3032,7 +3044,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Title ID - Titel ID + Titel-ID @@ -3082,22 +3094,22 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Graphics - Grafisch + Graphics Adv. Graphics - Adv. Grafisch + Adv. Graphics Audio - Geluid + Audio Input Profiles - + Invoerprofielen @@ -3115,7 +3127,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Form - Formulier + Vorm @@ -3125,7 +3137,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Patch Name - Patch Naam + Patch-naam @@ -3148,7 +3160,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Profile Manager - Profiel Beheer + Profielbeheer @@ -3163,12 +3175,12 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Set Image - Selecteer Afbeelding + Stel Afbeelding In Add - Voeg Toe + Toevoegen @@ -3183,7 +3195,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Profile management is available only when game is not running. - Profiel beheer is alleen beschikbaar wanneer het spel niet bezig is. + Profielbeheer is alleen beschikbaar wanneer het spel niet bezig is. @@ -3196,7 +3208,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Enter Username - Voer een Gebruikersnaam in + Voer Gebruikersnaam in @@ -3216,12 +3228,12 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Select User Image - Selecteer gebruiker's foto + Selecteer Gebruikersfoto JPEG Images (*.jpg *.jpeg) - JPEG foto's (*.jpg *.jpeg) + JPEG-foto's (*.jpg *.jpeg) @@ -3266,12 +3278,12 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Error resizing user image - + Fout bij het aanpassen van grootte van gebruikersafbeelding Unable to resize image - + Kon de grootte van de afbeelding niet wijzigen @@ -3279,7 +3291,7 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Delete this user? All of the user's save data will be deleted. - + Deze gebruiker verwijderen? Alle opgeslagen gegevens van de gebruiker worden verwijderd. @@ -3290,7 +3302,8 @@ Om de assen te spiegelen, beweek je joystick eerst verticaal en dan horizontaal. Name: %1 UUID: %2 - + Naam: %1 +UUID: %2 @@ -3298,29 +3311,29 @@ UUID: %2 Configure Ring Controller - + Configureer Ring-controller If you want to use this controller configure player 1 as right controller and player 2 as dual joycon before starting the game to allow this controller to be detected properly. - + Als je deze controller wilt gebruiken, configureer dan speler 1 als rechter controller en speler 2 als dual joycon voordat je het spel start, zodat deze controller goed wordt gedetecteerd. Virtual Ring Sensor Parameters - + Parameters Virtuele Ringsensor Pull - + Trek Push - + Duw @@ -3330,29 +3343,29 @@ UUID: %2 Direct Joycon Driver - + Direct Joycon-driver Enable Ring Input - + Schakel Ringinvoer in Enable - + Inschakelen Ring Sensor Value - + Ringsensorwaarde Not connected - + Niet verbonden @@ -3362,7 +3375,7 @@ UUID: %2 Clear - Verwijder + Wis @@ -3372,7 +3385,7 @@ UUID: %2 Invert axis - Spiegel As + Spiegel as @@ -3383,12 +3396,12 @@ UUID: %2 Error enabling ring input - + Fout tijdens inschakelen van ringinvoer Direct Joycon driver is not enabled - + Direct Joycon-driver niet ingeschakeld @@ -3398,17 +3411,17 @@ UUID: %2 The current mapped device doesn't support the ring controller - + Het huidige apparaat ondersteunt de ringcontroller niet The current mapped device doesn't have a ring attached - + Het huidige apparaat heeft geen ring Unexpected driver result %1 - + Onverwacht driverresultaat %1 @@ -3441,7 +3454,7 @@ UUID: %2 Auto - Automatisch + Auto @@ -3702,12 +3715,12 @@ UUID: %2 Time Zone: - Tijd Zone: + Tijdzone: Note: this can be overridden when region setting is auto-select - Noot: dit kan worden overschreven wanneer de regio instelling op automatisch selecteren staat. + Opmerking: dit kan worden overschreven wanneer de regio-instelling automatisch wordt geselecteerd @@ -3717,7 +3730,7 @@ UUID: %2 American English - + Amerikaans-Engels @@ -3742,7 +3755,7 @@ UUID: %2 Chinese - Chinees (正體中文 / 简体中文) + Chinees @@ -3772,17 +3785,17 @@ UUID: %2 British English - Brits Engels + Brits-Engels Canadian French - Canadees Frans + Canadees-Frans Latin American Spanish - Latijns Amerikaans Spaans + Latijns-Amerikaans Spaans @@ -3797,12 +3810,12 @@ UUID: %2 Brazilian Portuguese (português do Brasil) - + Braziliaans-Portugees (português do Brasil) Custom RTC - Handmatige RTC + Aangepaste RTC @@ -3817,7 +3830,7 @@ UUID: %2 Device Name - + Apparaatnaam @@ -3827,7 +3840,7 @@ UUID: %2 Warning: "%1" is not a valid language for region "%2" - + Waarschuwing: "%1" is geen geldige taal voor regio "%2" @@ -3835,47 +3848,47 @@ UUID: %2 TAS - + TAS <html><head/><body><p>Reads controller input from scripts in the same format as TAS-nx scripts.<br/>For a more detailed explanation, please consult the <a href="https://yuzu-emu.org/help/feature/tas/"><span style=" text-decoration: underline; color:#039be5;">help page</span></a> on the yuzu website.</p></body></html> - + <html><head/><body><p>Leest controller-invoer van scripts in hetzelfde formaat als TAS-nx-scripts.<br/>Voor een meer gedetailleerde uitleg kunt u de<a href="https://yuzu-emu.org/help/feature/tas/"><span style=" text-decoration: underline; color:#039be5;">help-pagina</span></a>op de yuzu-website raadplegen.</p></body></html> To check which hotkeys control the playback/recording, please refer to the Hotkey settings (Configure -> General -> Hotkeys). - + Om te controleren welke sneltoetsen het afspelen/opnemen regelen, raadpleeg de sneltoetsinstellingen (Configuratie -> Algemeen -> Sneltoetsen). WARNING: This is an experimental feature.<br/>It will not play back scripts frame perfectly with the current, imperfect syncing method. - + WAARSCHUWING: Dit is een experimentele functie.<br/>Met de huidige, onvolmaakte synchronisatiemethode worden scripts niet perfect afgespeeld. Settings - + Instellingen Enable TAS features - + Schakel TAS-functies in Loop script - + Lus script Pause execution during loads - + Onderbreek de uitvoering tijdens ladingen Script Directory - + Script-map @@ -3893,12 +3906,12 @@ UUID: %2 TAS Configuration - + TAS-configuratie Select TAS Load Directory... - + Selecteer TAS-laadmap... @@ -3906,12 +3919,12 @@ UUID: %2 Configure Touchscreen Mappings - Touchscreen Mappings Configureren + Configureer Touchscreen-toewijzingen Mapping: - Mapping: + Toewijzing: @@ -3926,14 +3939,14 @@ UUID: %2 Rename - Hernoemen + Hernoem Click the bottom area to add a point, then press a button to bind. Drag points to change position, or double-click table cells to edit values. - Klik in de onderste vlakte op een punt toe te voegen, daarna druk op een knop om het te verbinden. -Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen om de waardes te veranderen. + Klik op het onderste gebied om een punt toe te voegen en druk vervolgens op een knop om toe te wijzen. +Versleep punten om de positie te veranderen, of dubbelklik op tabelcellen om waarden te bewerken. @@ -3975,7 +3988,7 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Delete profile %1? - Verwijder Profiel %1? + Verwijder profiel %1? @@ -4003,22 +4016,22 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Warning: The settings in this page affect the inner workings of yuzu's emulated touchscreen. Changing them may result in undesirable behavior, such as the touchscreen partially or not working. You should only use this page if you know what you are doing. - Waarschuwing: Instellingen in deze pagina hebben invloed op de interne werking van yuzu's geemuleerde touchscreen. Veranderingen kunnen ongewenste resultaten hebben, zoals ervoor zorgen dat het touchscreen half of niet werkt. Gebruik deze pagina enkel als je weet wat je doet. + Waarschuwing: De instellingen in deze pagina beïnvloeden de innerlijke werking van yuzu's geëmuleerde touchscreen. Het veranderen ervan kan leiden tot ongewenst gedrag, zoals het gedeeltelijk of niet werken van het touchscreen. Je moet deze pagina alleen gebruiken als je weet wat je doet. Touch Parameters - Touch Parameters + Aanraakparameters Touch Diameter Y - Touch Diameter Y + Aanraakdiameter Y Touch Diameter X - Touch Diameter X + Aanraakdiameter X @@ -4028,7 +4041,7 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Restore Defaults - Herstel Standaardwaardes + Herstel Standaardwaarden @@ -4043,37 +4056,37 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Small (32x32) - + Klein (32x32) Standard (64x64) - + Standaard (64x64) Large (128x128) - + Groot (128x128) Full Size (256x256) - + Volledige Grootte (256x256) Small (24x24) - + Klein (24x24) Standard (48x48) - + Standaard (48x48) Large (72x72) - + Groot (72x72) @@ -4083,17 +4096,17 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Filetype - + Bestandstype Title ID - Titel ID + Titel-ID Title Name - + Titelnaam @@ -4116,12 +4129,12 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Note: Changing language will apply your configuration. - Notitie: De taal veranderen past uw configuratie toe. + Opmerking: Als je de taal wijzigt, wordt je configuratie toegepast. Interface language: - Interface taal: + Interfacetaal: @@ -4131,47 +4144,47 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Game List - Game Lijst + Spellijst Show Compatibility List - + Toon Compatibiliteitslijst Show Add-Ons Column - Toon Add-Ons Kolom + Toon Kolom Add-Ons Show Size Column - + Toon Kolomgrootte Show File Types Column - + Toon Kolom Bestandstypen Game Icon Size: - + Grootte Spelicoon: Folder Icon Size: - + Grootte Mapicoon: Row 1 Text: - Rij 1 Text: + Rij 1 Tekst: Row 2 Text: - Rij 2 Text: + Rij 2 Tekst: @@ -4181,12 +4194,12 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Ask Where To Save Screenshots (Windows Only) - + Vraag waar schermafbeeldingen moeten worden opgeslagen (alleen Windows) Screenshots Path: - + Schermafbeeldingspad: @@ -4196,7 +4209,7 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Select Screenshots Path... - + Selecteer Schermafbeeldingspad... @@ -4209,12 +4222,12 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Configure Vibration - + Configureer Trilling Press any controller button to vibrate the controller. - + Druk op een willekeurige knop om de controller te laten trillen. @@ -4276,12 +4289,12 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Settings - + Instellingen Enable Accurate Vibration - + Schakel Nauwkeurige Trillingen In @@ -4299,12 +4312,12 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen yuzu Web Service - yuzu Web Service + yuzu-webservice By providing your username and token, you agree to allow yuzu to collect additional usage data, which may include user identifying information. - Door je gebruikersnaam en token te geven, ga je akkoord dat yuzu extra gebruiksdata verzameld, waaronder mogelijk gebruikersidentificatie-informatie. + Door je gebruikersnaam en token op te geven, ga je ermee akkoord dat yuzu aanvullende gebruiksgegevens verzamelt, die informatie ter identificatie van de gebruiker kunnen bevatten. @@ -4335,7 +4348,7 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Web Service configuration can only be changed when a public room isn't being hosted. - + De configuratie van de webservice kan alleen worden gewijzigd als er geen openbare ruimte wordt gehost. @@ -4345,17 +4358,17 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Share anonymous usage data with the yuzu team - Deel anonieme gebruiksdata met het yuzu team + Deel anonieme gebruiksdata met het yuzu-team Learn more - Leer meer + Meer info Telemetry ID: - Telemetrie ID: + Telemetrie-ID: @@ -4365,17 +4378,17 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Discord Presence - Discord Presence + Aanwezigheid in Discord Show Current Game in your Discord Status - Toon huidige game in je Discord status + Toon huidige game in uw Discord-status <a href='https://yuzu-emu.org/help/feature/telemetry/'><span style="text-decoration: underline; color:#039be5;">Learn more</span></a> - <a href='https://yuzu-emu.org/help/feature/telemetry/'><span style="text-decoration: underline; color:#039be5;">Leer meer</span></a> + <a href='https://yuzu-emu.org/help/feature/telemetry/'><span style="text-decoration: underline; color:#039be5;">Meer info</span></a> @@ -4391,7 +4404,7 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Telemetry ID: 0x%1 - Telemetrie ID: 0x%1 + Telemetrie-ID: 0x%1 @@ -4413,7 +4426,7 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Unverified, please click Verify before saving configuration Tooltip - + Niet geverifieerd, klik op Verifiëren voordat je de configuratie opslaat @@ -4425,7 +4438,7 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Verified Tooltip - + Geverifiëerd @@ -4441,7 +4454,7 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Verification failed. Check that you have entered your token correctly, and that your internet connection is working. - Verificatie mislukt. Check dat uw token correct is en dat uw internet werkt. + Verificatie mislukt. Controleer of je je token correct hebt ingevoerd en of je internetverbinding werkt. @@ -4449,12 +4462,12 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Controller P1 - + Controller P1 &Controller P1 - + &Controller P1 @@ -4462,42 +4475,42 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Direct Connect - + Directe Verbinding Server Address - + Serveradres <html><head/><body><p>Server address of the host</p></body></html> - + <html><head/><body><p>Serveradres van de host</p></body></html> Port - + Poort <html><head/><body><p>Port number the host is listening on</p></body></html> - + <html><head/><body><p>Poortnummer waarop de host luistert</p></body></html> Nickname - + Gebruikersnaam Password - + Wachtwoord Connect - + Verbind @@ -4505,12 +4518,12 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Connecting - + Verbinden Connect - + Verbind @@ -4528,12 +4541,12 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Broken Vulkan Installation Detected - + Beschadigde Vulkan-installatie gedetecteerd Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Vulkan-initialisatie mislukt tijdens het opstarten.<br><br>Klik <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>hier voor instructies om het probleem op te lossen</a>. @@ -4544,79 +4557,80 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Disable Web Applet - + Schakel Webapplet uit Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + Het uitschakelen van de webapplet kan leiden tot ongedefinieerd gedrag en mag alleen gebruikt worden met Super Mario 3D All-Stars. Weet je zeker dat je de webapplet wilt uitschakelen? +(Deze kan opnieuw worden ingeschakeld in de Debug-instellingen). The amount of shaders currently being built - + Het aantal shaders dat momenteel wordt gebouwd The current selected resolution scaling multiplier. - + De huidige geselecteerde resolutieschaalmultiplier. Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. - Huidige emulatie snelheid. Waardes hoger of lager dan 100% betekent dat de emulatie sneller of langzamer loopt dan de Switch. + Huidige emulatiesnelheid. Waarden hoger of lager dan 100% geven aan dat de emulatie sneller of langzamer werkt dan een Switch. How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. - Hoeveel frames per seconde de game op dit moment weergeeft. Dit zal veranderen van game naar game en van scène naar scène. + Hoeveel beelden per seconde het spel momenteel weergeeft. Dit varieert van spel tot spel en van scène tot scène. Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. - Tijd gebruikt om een frame van de Switch te emuleren, waarbij framelimiteren of v-sync niet wordt meegerekend. Voor emulatie op volledige snelheid zou dit maximaal 16.67 ms zijn. + Tijd die nodig is om een Switch-beeld te emuleren, beeldbeperking of v-sync niet meegerekend. Voor emulatie op volle snelheid mag dit maximaal 16,67 ms zijn. &Clear Recent Files - + &Wis Recente Bestanden Emulated mouse is enabled - + Geëmuleerde muis is ingeschakeld Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + Echte muisinvoer en muispanning zijn niet compatibel. Schakel de geëmuleerde muis uit in de geavanceerde invoerinstellingen om muispanning mogelijk te maken. &Continue - + &Doorgaan &Pause - &Pauzeren + &Onderbreken yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + yuzu is een spel aan het uitvoeren Warning Outdated Game Format - Waarschuwing Verouderd Spel Formaat + Waarschuwing Verouderd Spelformaat You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. - Je gebruikt gedeconstrueerd ROM map formaat voor dit Spel, dit is een verouderd formaat en is vervangen door formaten zoals NCA, NAX, XCI of NSP. Gedeconstrueerd ROM map heeft geen iconen, metadata en update understeuning.<br><br>Voor een uitleg over welke Switch formaten yuzu ondersteund, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>kijk op onze wiki</a>. Dit bericht word niet nog een keer weergegeven. + Je gebruikt het gedeconstrueerde ROM-mapformaat voor dit spel, wat een verouderd formaat is dat vervangen is door andere zoals NCA, NAX, XCI, of NSP. Deconstructed ROM-mappen missen iconen, metadata, en update-ondersteuning.<br><br>Voor een uitleg van de verschillende Switch-formaten die yuzu ondersteunt,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'> bekijk onze wiki</a>. Dit bericht wordt niet meer getoond. @@ -4627,7 +4641,7 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen The ROM format is not supported. - Het formaat van de ROM is niet ondersteunt. + Het ROM-formaat wordt niet ondersteund. @@ -4637,19 +4651,19 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + yuzu is een fout tegengekomen tijdens het uitvoeren van de videokern. Dit wordt meestal veroorzaakt door verouderde GPU-drivers, inclusief geïntegreerde. Zie het logboek voor meer details. Voor meer informatie over toegang tot het log, zie de volgende pagina: <a href='https://yuzu-emu.org/help/reference/log-files/'>Hoe upload je het logbestand</a>. Error while loading ROM! %1 %1 signifies a numeric error code. - + Fout tijdens het laden van ROM! %1 %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + %1<br>Volg de <a href='https://yuzu-emu.org/help/quickstart/'>yuzu snelstartgids</a> om je bestanden te redumpen.<br>Je kunt de yuzu-wiki</a>of de yuzu-Discord</a> raadplegen voor hulp. @@ -4659,23 +4673,23 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen (64-bit) - + (64-bit) (32-bit) - + (32-bit) %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit - + %1 %2 Closing software... - + Software sluiten... @@ -4690,58 +4704,58 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Error Opening %1 Folder - Fout tijdens het openen van %1 folder + Fout tijdens het openen van %1 map Folder does not exist! - Folder bestaat niet! + Map bestaat niet! Error Opening Transferable Shader Cache - Fout Bij Het Openen Van Overdraagbare Shader Cache + Fout bij het openen van overdraagbare shader-cache Failed to create the shader cache directory for this title. - + Kon de shader-cache-map voor dit spel niet aanmaken. Error Removing Contents - + Fout bij het verwijderen van de inhoud Error Removing Update - + Fout bij het verwijderen van de update Error Removing DLC - + Fout bij het verwijderen van DLC Remove Installed Game Contents? - + Geïnstalleerde Spelinhoud Verwijderen? Remove Installed Game Update? - + Geïnstalleerde Spel-update Verwijderen? Remove Installed Game DLC? - + Geïnstalleerde Spel-DLC Verwijderen? Remove Entry - + Verwijder Invoer @@ -4751,147 +4765,147 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Successfully Removed - + Met Succes Verwijderd Successfully removed the installed base game. - + Het geïnstalleerde basisspel is succesvol verwijderd. The base game is not installed in the NAND and cannot be removed. - + Het basisspel is niet geïnstalleerd in de NAND en kan niet worden verwijderd. Successfully removed the installed update. - + De geïnstalleerde update is succesvol verwijderd. There is no update installed for this title. - + Er is geen update geïnstalleerd voor dit spel. There are no DLC installed for this title. - + Er is geen DLC geïnstalleerd voor dit spel. Successfully removed %1 installed DLC. - + %1 geïnstalleerde DLC met succes verwijderd. Delete OpenGL Transferable Shader Cache? - + Overdraagbare OpenGL-shader-cache Verwijderen? Delete Vulkan Transferable Shader Cache? - + Overdraagbare Vulkan-shader-cache Verwijderen? Delete All Transferable Shader Caches? - + Alle Overdraagbare Shader-caches Verwijderen? Remove Custom Game Configuration? - + Aangepaste Spelconfiguratie Verwijderen? Remove File - + Verwijder Bestand Error Removing Transferable Shader Cache - + Fout bij het verwijderen van Overdraagbare Shader-cache A shader cache for this title does not exist. - Er bestaat geen shader cache voor deze game + Er bestaat geen shader-cache voor dit spel. Successfully removed the transferable shader cache. - + De overdraagbare shader-cache is verwijderd. Failed to remove the transferable shader cache. - + Kon de overdraagbare shader-cache niet verwijderen. Error Removing Vulkan Driver Pipeline Cache - + Fout bij het verwijderen van Pijplijn-cache van Vulkan-driver Failed to remove the driver pipeline cache. - + Kon de pijplijn-cache van de driver niet verwijderen. Error Removing Transferable Shader Caches - + Fout bij het verwijderen van overdraagbare shader-caches Successfully removed the transferable shader caches. - + De overdraagbare shader-caches zijn verwijderd. Failed to remove the transferable shader cache directory. - + Kon de overdraagbare shader-cache-map niet verwijderen. Error Removing Custom Configuration - + Fout bij het verwijderen van aangepaste configuratie A custom configuration for this title does not exist. - + Er bestaat geen aangepaste configuratie voor dit spel. Successfully removed the custom game configuration. - + De aangepaste spelconfiguratie is verwijderd. Failed to remove the custom game configuration. - + Kon de aangepaste spelconfiguratie niet verwijderen. RomFS Extraction Failed! - RomFS Extractie Mislukt! + RomFS-extractie Mislukt! There was an error copying the RomFS files or the user cancelled the operation. - Er was een fout tijdens het kopiëren van de RomFS bestanden of de gebruiker heeft de operatie geannuleerd. + Er is een fout opgetreden bij het kopiëren van de RomFS-bestanden of de gebruiker heeft de bewerking geannuleerd. Full - Vol + Volledig @@ -4901,17 +4915,17 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Select RomFS Dump Mode - Selecteer RomFS Dump Mode + Selecteer RomFS-dumpmodus Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. - Selecteer alstublieft hoe je de RomFS wilt dumpen.<br>Volledig kopieërd alle bestanden in een map terwijl <br> skelet maakt alleen het map structuur. + Selecteer hoe je de RomFS gedumpt wilt hebben.<br>Volledig zal alle bestanden naar de nieuwe map kopiëren, terwijl <br>Skelet alleen de mapstructuur zal aanmaken. There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Er is niet genoeg vrije ruimte op %1 om de RomFS uit te pakken. Maak ruimte vrij of kies een andere dumpmap bij Emulatie > Configuratie > Systeem > Bestandssysteem > Dump Root. @@ -4927,12 +4941,12 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen RomFS Extraction Succeeded! - RomFS Extractie Geslaagd! + RomFS-extractie Geslaagd! The operation completed successfully. - De operatie is succesvol voltooid. + De bewerking is succesvol voltooid. @@ -4941,47 +4955,47 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Create Shortcut - + Maak Snelkoppeling This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Dit maakt een snelkoppeling naar de huidige AppImage. Dit werkt mogelijk niet goed als je een update uitvoert. Doorgaan? Cannot create shortcut on desktop. Path "%1" does not exist. - + Kan geen snelkoppeling op het bureaublad maken. Pad "%1" bestaat niet. Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Kan geen snelkoppeling maken in toepassingen menu. Pad "%1" bestaat niet en kan niet worden aangemaakt. Create Icon - + Maak Icoon Cannot create icon file. Path "%1" does not exist and cannot be created. - + Kan geen icoonbestand maken. Pad "%1" bestaat niet en kan niet worden aangemaakt. Start %1 with the yuzu Emulator - + Voer %1 uiit met de yuzu-emulator Failed to create a shortcut at %1 - + Er is geen snelkoppeling gemaakt op %1 Successfully created a shortcut to %1 - + Succesvol een snelkoppeling naar %1 gemaakt @@ -5001,13 +5015,13 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen The game properties could not be loaded. - De eigenschappen van de game kunnen niet geladen worden. + De speleigenschappen kunnen niet geladen worden. Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. - Switch Executable (%1);;Alle bestanden (*.*) + Switch Executable (%1);;Alle Bestanden (*.*) @@ -5017,7 +5031,7 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Open Extracted ROM Directory - Open Gedecomprimeerd ROM Map + Open Uitgepakte ROM-map @@ -5027,22 +5041,22 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen The directory you have selected does not contain a 'main' file. - De map die je hebt geselecteerd bevat geen 'main' bestand. + De map die je hebt geselecteerd bevat geen 'main'-bestand. Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Installeerbaar Switch-bestand (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Install Files - + Installeer Bestanden %n file(s) remaining - + %n bestand(en) resterend%n bestand(en) resterend @@ -5053,71 +5067,78 @@ Sleep punten om positie te veranderen, of dubbel klik één van de tabel cellen Install Results - + Installeerresultaten To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + Om mogelijke conflicten te voorkomen, raden we gebruikers af om basisgames te installeren op de NAND. +Gebruik deze functie alleen om updates en DLC te installeren. %n file(s) were newly installed - + %n bestand(en) zijn recent geïnstalleerd +%n bestand(en) zijn recent geïnstalleerd + %n file(s) were overwritten - + %n bestand(en) werden overschreven +%n bestand(en) werden overschreven + %n file(s) failed to install - + %n bestand(en) niet geïnstalleerd +%n bestand(en) niet geïnstalleerd + System Application - Systeem Applicatie + Systeemapplicatie System Archive - Systeem Archief + Systeemarchief System Application Update - Systeem Applicatie Update + Systeemapplicatie-update Firmware Package (Type A) - Filmware Pakket (Type A) + Filmware-pakket (Type A) Firmware Package (Type B) - Filmware Pakket (Type B) + Filmware-pakket (Type B) Game - Game + Spel Game Update - Game Update + Spelupdate Game DLC - Game DLC + Spel-DLC @@ -5127,14 +5148,14 @@ Please, only use this feature to install updates and DLC. Select NCA Install Type... - Selecteer NCA Installatie Type... + Selecteer NCA-installatiesoort... Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) - Selecteer het type titel hoe je wilt dat deze NCA installeerd: -(In de meeste gevallen is de standaard 'Game' juist.) + Selecteer het type titel waarin je deze NCA wilt installeren: +(In de meeste gevallen is de standaard "Spel" prima). @@ -5144,7 +5165,7 @@ Please, only use this feature to install updates and DLC. The title type you selected for the NCA is invalid. - Het type title dat je hebt geselecteerd voor de NCA is ongeldig. + Het soort title dat je hebt geselecteerd voor de NCA is ongeldig. @@ -5165,81 +5186,81 @@ Please, only use this feature to install updates and DLC. Hardware requirements not met - + Er is niet voldaan aan de hardwarevereisten Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Je systeem voldoet niet aan de aanbevolen hardwarevereisten. Compatibiliteitsrapportage is uitgeschakeld. Missing yuzu Account - Je yuzu account mist + yuzu-account Ontbreekt In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. - Om game campatibiliteit te raporteren, moet je je yuzu account koppelen.<br><br/> Om je yuzu account te koppelen, ga naar Emulatie &gt; Configuratie &gt; Web. + Om een spelcompatibiliteitstest in te dienen, moet je je yuzu-account koppelen.<br><br/>Om je yuzu-account te koppelen, ga naar Emulatie &gt; Configuratie &gt; Web. Error opening URL - + Fout bij het openen van URL Unable to open the URL "%1". - + Kan de URL "%1" niet openen. TAS Recording - + TAS-opname Overwrite file of player 1? - + Het bestand van speler 1 overschrijven? Invalid config detected - + Ongeldige configuratie gedetecteerd Handheld controller can't be used on docked mode. Pro controller will be selected. - + Handheld-controller kan niet gebruikt worden in docked-modus. Pro controller wordt geselecteerd. Amiibo - + Amiibo The current amiibo has been removed - + De huidige amiibo is verwijderd Error - + Fout The current game is not looking for amiibos - + Het huidige spel is niet op zoek naar amiibo's Amiibo File (%1);; All Files (*.*) - Amiibo Bestand (%1);; Alle Bestanden (*.*) + Amiibo-bestand (%1);; Alle Bestanden (*.*) @@ -5249,57 +5270,57 @@ Please, only use this feature to install updates and DLC. Error loading Amiibo data - Fout tijdens het laden van de Amiibo data + Fout tijdens het laden van de Amiibo-gegevens The selected file is not a valid amiibo - + Het geselecteerde bestand is geen geldige amiibo The selected file is already on use - + Het geselecteerde bestand is al in gebruik An unknown error occurred - + Er is een onbekende fout opgetreden Capture Screenshot - Screenshot Vastleggen + Leg Schermafbeelding Vast PNG Image (*.png) - PNG afbeelding (*.png) + PNG-afbeelding (*.png) TAS state: Running %1/%2 - + TAS-status: %1/%2 In werking TAS state: Recording %1 - + TAS-status: %1 Aan het opnemen TAS state: Idle %1/%2 - + TAS-status: %1/%2 Inactief TAS State: Invalid - + TAS-status: Ongeldig &Stop Running - + &Stop Uitvoering @@ -5309,23 +5330,23 @@ Please, only use this feature to install updates and DLC. Stop R&ecording - + Stop Opname R&ecord - + Opnemen Building: %n shader(s) - + Bouwen: %n shader(s)Bouwen: %n shader(s) Scale: %1x %1 is the resolution scaling factor - + Schaal: %1x @@ -5340,7 +5361,7 @@ Please, only use this feature to install updates and DLC. Game: %1 FPS (Unlocked) - + Spel: %1 FPS (Ontgrendeld) @@ -5355,110 +5376,110 @@ Please, only use this feature to install updates and DLC. GPU NORMAL - + GPU NORMAAL GPU HIGH - + GPU HOOG GPU EXTREME - + GPU EXTREEM GPU ERROR - + GPU FOUT DOCKED - + DOCKED HANDHELD - + HANDHELD OPENGL - + OPENGL VULKAN - + VULKAN NULL - + NULL NEAREST - + NEAREST BILINEAR - + BILINEAR BICUBIC - + BICUBIC GAUSSIAN - + GAUSSIAN SCALEFORCE - + SCALEFORCE FSR - + FSR NO AA - + GEEN AA FXAA - + FXAA SMAA - + SMAA VOLUME: MUTE - + VOLUME: GEDEMPT VOLUME: %1% Volume percentage (e.g. 50%) - + VOLUME: %1% Confirm Key Rederivation - Bevestig Sleutel Herafleiding + Bevestig Sleutelherhaling @@ -5469,61 +5490,62 @@ Please make sure this is what you want and optionally make backups. This will delete your autogenerated key files and re-run the key derivation module. - Je bent op het punt al je sleutels geforceerd opnieuw te verkrijgen. -Als je niet weet wat dit doet of wat je aan het doen bent, -dit is potentieel een vernietigende actie. -Zorg ervoor dat je zeker weet dat dit is wat je wilt doen -en optioneel maak backups. + Je staat op het punt om al je sleutels te forceren. +Als je niet weet wat dit betekent of wat je doet, +is dit een potentieel destructieve actie. +Zorg ervoor dat dit is wat je wilt +en maak eventueel back-ups. -Dit zal je automatisch gegenereerde sleutel bestanden verwijderen en de sleutel verkrijger module opnieuw starten +Dit zal je automatisch gegenereerde sleutelbestanden verwijderen en de sleutelafleidingsmodule opnieuw uitvoeren. Missing fuses - + Missing fuses - Missing BOOT0 - + - BOOT0 Ontbreekt - Missing BCPKG2-1-Normal-Main - + - BCPKG2-1-Normal-Main Ontbreekt - Missing PRODINFO - + - PRODINFO Ontbreekt Derivation Components Missing - + Afleidingscomponenten ontbreken Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Encryptiesleutels ontbreken. <br>Volg <a href='https://yuzu-emu.org/help/quickstart/'>de yuzu-snelstartgids</a> om al je sleutels, firmware en spellen te krijgen.<br><br><small>(%1)</small> Deriving keys... This may take up to a minute depending on your system's performance. - Dit zal misschien een paar minuten duren gebaseerd -op je systeem's performatie. + Sleutels afleiden... +Dit kan tot een minuut duren, +afhankelijk van de prestaties van je systeem. Deriving Keys - Sleutels afleiden + Sleutels Afleiden Select RomFS Dump Target - Selecteer RomFS Dump Doel + Selecteer RomFS-dumpdoel @@ -5545,7 +5567,7 @@ op je systeem's performatie. Are you sure you want to stop the emulation? Any unsaved progress will be lost. - Weet je zeker dat je de emulatie wilt stoppen? Alle onopgeslagen voortgang will verloren gaan. + Weet je zeker dat je de emulatie wilt stoppen? Alle niet opgeslagen voortgang zal verloren gaan. @@ -5554,7 +5576,7 @@ op je systeem's performatie. Would you like to bypass this and exit anyway? De momenteel actieve toepassing heeft yuzu gevraagd om niet af te sluiten. -Wilt u dit omzeilen en toch afsluiten? +Wil je toch afsluiten? @@ -5563,43 +5585,43 @@ Wilt u dit omzeilen en toch afsluiten? OpenGL not available! - + OpenGL niet beschikbaar! OpenGL shared contexts are not supported. - + OpenGL gedeelde contexten worden niet ondersteund. yuzu has not been compiled with OpenGL support. - + yuzu is niet gecompileerd met OpenGL-ondersteuning. Error while initializing OpenGL! - + Fout tijdens het initialiseren van OpenGL! Your GPU may not support OpenGL, or you do not have the latest graphics driver. - + Je GPU ondersteunt mogelijk geen OpenGL, of je hebt niet de laatste grafische stuurprogramma. Error while initializing OpenGL 4.6! - + Fout tijdens het initialiseren van OpenGL 4.6! Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 - + Je GPU ondersteunt mogelijk OpenGL 4.6 niet, of je hebt niet het laatste grafische stuurprogramma.<br><br>GL Renderer:<br>%1 Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 - + Je GPU ondersteunt mogelijk een of meer vereiste OpenGL-extensies niet. Zorg ervoor dat je het laatste grafische stuurprogramma hebt.<br><br>GL Renderer:<br>%1<br><br>Ondersteunde extensies:<br>%2 @@ -5607,32 +5629,32 @@ Wilt u dit omzeilen en toch afsluiten? Favorite - + Favoriet Start Game - + Start Spel Start Game without Custom Configuration - + Start Spel zonder Aangepaste Configuratie Open Save Data Location - Open Locatie Van Save Gegevens + Open Locatie van Save-data Open Mod Data Location - Open Mod Data Locatie + Open Locatie van Mod-data Open Transferable Pipeline Cache - + Open Overdraagbare Pijplijn-cache @@ -5642,37 +5664,37 @@ Wilt u dit omzeilen en toch afsluiten? Remove Installed Update - + Verwijder Geïnstalleerde Update Remove All Installed DLC - + Verwijder Alle Geïnstalleerde DLC's Remove Custom Configuration - + Verwijder Aangepaste Configuraties Remove OpenGL Pipeline Cache - + Verwijder OpenGL-pijplijn-cache Remove Vulkan Pipeline Cache - + Verwijder Vulkan-pijplijn-cache Remove All Pipeline Caches - + Verwijder Alle Pijplijn-caches Remove All Installed Contents - + Verwijder Alle Geïnstalleerde Inhoud @@ -5683,32 +5705,32 @@ Wilt u dit omzeilen en toch afsluiten? Dump RomFS to SDMC - + Dump RomFS naar SDMC Copy Title ID to Clipboard - Kopieer Titel ID naar Klembord + Kopiëer Titel-ID naar Klembord Navigate to GameDB entry - Navigeer naar GameDB inzending + Navigeer naar GameDB-invoer Create Shortcut - + Maak Snelkoppeling Add to Desktop - + Toevoegen aan Bureaublad Add to Applications Menu - + Toevoegen aan menu Toepassingen @@ -5718,27 +5740,27 @@ Wilt u dit omzeilen en toch afsluiten? Scan Subfolders - Scan Subfolders + Scan Submappen Remove Game Directory - Verwijder Game Directory + Verwijder Spelmap ▲ Move Up - + ▲ Omhoog ▼ Move Down - + ▼ Omlaag Open Directory Location - Open Directory Locatie + Open Maplocatie @@ -5758,12 +5780,12 @@ Wilt u dit omzeilen en toch afsluiten? Add-ons - Toevoegingen + Add-ons File type - Bestands type + Bestandssoort @@ -5776,12 +5798,12 @@ Wilt u dit omzeilen en toch afsluiten? Ingame - + In het spel Game starts, but crashes or major glitches prevent it from being completed. - + Het spel start, maar crashes of grote glitches voorkomen dat het wordt voltooid. @@ -5791,17 +5813,17 @@ Wilt u dit omzeilen en toch afsluiten? Game can be played without issues. - + Het spel kan zonder problemen gespeeld worden. Playable - + Speelbaar Game functions with minor graphical or audio glitches and is playable from start to finish. - + Het spel werkt met kleine grafische of audiofouten en is speelbaar van begin tot eind. @@ -5811,17 +5833,17 @@ Wilt u dit omzeilen en toch afsluiten? Game loads, but is unable to progress past the Start Screen. - + Het spel wordt geladen, maar komt niet verder dan het startscherm. Won't Boot - Start Niet + Start niet op The game crashes when attempting to startup. - De Game crasht wanneer hij probeert op te starten. + Het spel loopt vast bij het opstarten. @@ -5831,7 +5853,7 @@ Wilt u dit omzeilen en toch afsluiten? The game has not yet been tested. - Deze Game is nog niet getest. + Het spel is nog niet getest. @@ -5839,7 +5861,7 @@ Wilt u dit omzeilen en toch afsluiten? Double-click to add a new folder to the game list - Dubbel-klik om een ​​nieuwe map toe te voegen aan de lijst met games + Dubbel-klik om een ​​nieuwe map toe te voegen aan de spellijst @@ -5847,7 +5869,7 @@ Wilt u dit omzeilen en toch afsluiten? %1 of %n result(s) - + %1 van %n resultaat(en)%1 van %n resultaat(en) @@ -5857,7 +5879,7 @@ Wilt u dit omzeilen en toch afsluiten? Enter pattern to filter - Voer patroon in om te filteren: + Voer patroon in om te filteren @@ -5865,22 +5887,22 @@ Wilt u dit omzeilen en toch afsluiten? Create Room - + Maak Kamer Room Name - + Kamernaam Preferred Game - + Voorkeursspel Max Players - + Maximum Spelers @@ -5890,42 +5912,42 @@ Wilt u dit omzeilen en toch afsluiten? (Leave blank for open game) - + (Laat leeg voor open spel) Password - + Wachtwoord Port - + Poort Room Description - Kamer Beschrijving + Kamerbeschrijving Load Previous Ban List - + Laad Vorige Banlijst Public - + Openbaar Unlisted - + Niet Vermeld Host Room - + Hostkamer @@ -5933,13 +5955,14 @@ Wilt u dit omzeilen en toch afsluiten? Error - + Fout Failed to announce the room to the public lobby. In order to host a room publicly, you must have a valid yuzu account configured in Emulation -> Configure -> Web. If you do not want to publish a room in the public lobby, then select Unlisted instead. Debug Message: - + Het is niet gelukt om de kamer aan te kondigen in de openbare lobby. Om een kamer openbaar te hosten, moet je een geldige yuzu-account geconfigureerd hebben in Emulatie -> Configuratie -> Web. Als je geen kamer wilt publiceren in de openbare lobby, selecteer dan in plaats daarvan Niet Vermeld. +Debug-bericht: @@ -5947,7 +5970,7 @@ Debug Message: Audio Mute/Unmute - + Audio Dempen/Dempen Opheffen @@ -5973,52 +5996,52 @@ Debug Message: Main Window - + Hoofdvenster Audio Volume Down - + Audiovolume Omlaag Audio Volume Up - + Audiovolume Omhoog Capture Screenshot - Screenshot Vastleggen + Leg Schermafbeelding Vast Change Adapting Filter - + Wijzig Aanpassingsfilter Change Docked Mode - + Wijzig Docked-modus Change GPU Accuracy - + Wijzig GPU-nauwkeurigheid Continue/Pause Emulation - + Emulatie Doorgaan/Onderbreken Exit Fullscreen - + Volledig Scherm Afsluiten Exit yuzu - + yuzu afsluiten @@ -6033,52 +6056,52 @@ Debug Message: Load/Remove Amiibo - + Laad/Verwijder Amiibo Restart Emulation - + Herstart Emulatie Stop Emulation - + Stop Emulatie TAS Record - + TAS Opname TAS Reset - + TAS Reset TAS Start/Stop - + TAS Start/Stop Toggle Filter Bar - + Schakel Filterbalk Toggle Framerate Limit - + Schakel Frameratelimiet Toggle Mouse Panning - + Schakel Muispanning Toggle Status Bar - + Schakel Statusbalk @@ -6086,17 +6109,17 @@ Debug Message: Please confirm these are the files you wish to install. - + Bevestig dat dit de bestanden zijn die je wilt installeren. Installing an Update or DLC will overwrite the previously installed one. - + Het installeren van een Update of DLC overschrijft de eerder geïnstalleerde. Install - Installeren + Installeer @@ -6110,7 +6133,8 @@ Debug Message: The text can't contain any of the following characters: %1 - + De tekst kan geen van de volgende tekens bevatten: +%1 @@ -6118,12 +6142,12 @@ Debug Message: Loading Shaders 387 / 1628 - Shaders Laden 387 / 1628 + Shaders Laden 387 / 1628 Loading Shaders %v out of %m - %v Shaders Laden van de %m + Shaders Laden %v van %m @@ -6138,7 +6162,7 @@ Debug Message: Loading Shaders %1 / %2 - Shaders Laden %1 / %2 + Shaders Laden %1 / %2 @@ -6156,53 +6180,53 @@ Debug Message: Public Room Browser - + Browser voor Openbare Ruimten Nickname - + Gebruikersnaam Filters - + Filters Search - + Zoek Games I Own - + Spellen die ik bezit Hide Empty Rooms - + Verberg Lege Kamers Hide Full Rooms - + Verberg Volle Kamers Refresh Lobby - + Vernieuw Lobby Password Required to Join - + Wachtwoord vereist om toegang te krijgen Password: - + Wachtwoord: @@ -6212,27 +6236,27 @@ Debug Message: Room Name - + Kamernaam Preferred Game - + Voorkeursspel Host - + Host Refreshing - + Vernieuwen Refresh List - + Vernieuw Lijst @@ -6250,7 +6274,7 @@ Debug Message: &Recent Files - + &Recente Bestanden @@ -6265,57 +6289,57 @@ Debug Message: &Reset Window Size - + &Herstel Venstergrootte &Debugging - + &Debuggen Reset Window Size to &720p - + Herstel Venstergrootte naar &720p Reset Window Size to 720p - + Herstel Venstergrootte naar 720p Reset Window Size to &900p - + Herstel Venstergrootte naar &900p Reset Window Size to 900p - + Herstel Venstergrootte naar 900p Reset Window Size to &1080p - + Herstel Venstergrootte naar &1080p Reset Window Size to 1080p - + Herstel Venstergrootte naar 1080p &Multiplayer - + &Multiplayer &Tools - + &Tools &TAS - + &TAS @@ -6325,17 +6349,17 @@ Debug Message: &Install Files to NAND... - + &Installeer Bestanden naar NAND... L&oad File... - + L&aad Bestand... Load &Folder... - + Laad &Map... @@ -6345,7 +6369,7 @@ Debug Message: &Pause - &Pauzeren + &Onderbreken @@ -6355,122 +6379,122 @@ Debug Message: &Reinitialize keys... - + &Herinitialiseer toetsen... &About yuzu - + &Over yuzu Single &Window Mode - + Modus Enkel Venster Con&figure... - + Con&figureer... Display D&ock Widget Headers - + Toon Dock Widget Kopteksten Show &Filter Bar - + Toon &Filterbalk Show &Status Bar - + Toon &Statusbalk Show Status Bar - Laat status balk zien + Toon Statusbalk &Browse Public Game Lobby - + &Bladeren door Openbare Spellobby &Create Room - + &Maak Kamer &Leave Room - + &Verlaat Kamer &Direct Connect to Room - + &Directe Verbinding met Kamer &Show Current Room - + &Toon Huidige Kamer F&ullscreen - + Volledig Scherm &Restart - + &Herstart Load/Remove &Amiibo... - + Laad/Verwijder &Amiibo... &Report Compatibility - + &Rapporteer Compatibiliteit Open &Mods Page - + Open &Mod-pagina Open &Quickstart Guide - + Open &Snelstartgids &FAQ - + &FAQ Open &yuzu Folder - + Open &yuzu-map &Capture Screenshot - + &Leg Schermafbeelding Vast &Configure TAS... - + &Configureer TAS... Configure C&urrent Game... - + Configureer Huidig Spel... @@ -6480,12 +6504,12 @@ Debug Message: &Reset - + &Herstel R&ecord - + Opnemen @@ -6493,7 +6517,7 @@ Debug Message: &MicroProfile - + &MicroProfile @@ -6501,48 +6525,48 @@ Debug Message: Moderation - + Moderatie Ban List - + Banlijst Refreshing - + Vernieuwen Unban - + Ontban Subject - + Onderwerp Type - + Soort Forum Username - + Forum Gebruikersnaam IP Address - + IP-adres Refresh - + Vernieuw @@ -6550,17 +6574,17 @@ Debug Message: Current connection status - + Huidige verbindingsstatus Not Connected. Click here to find a room! - + Niet Verbonden. Klik hier om een kamer te vinden! Not Connected - + Niet Verbonden @@ -6570,18 +6594,19 @@ Debug Message: New Messages Received - + Nieuwe Berichten Ontvangen Error - + Fout Failed to update the room information. Please check your Internet connection and try hosting the room again. Debug Message: - + Het is niet gelukt om de kamerinformatie bij te werken. Controleer je internetverbinding en probeer de kamer opnieuw te hosten. +Debug-bericht: @@ -6589,135 +6614,138 @@ Debug Message: Username is not valid. Must be 4 to 20 alphanumeric characters. - + Gebruikersnaam is niet geldig. Moet bestaan uit 4 tot 20 alfanumerieke tekens. Room name is not valid. Must be 4 to 20 alphanumeric characters. - + Kamernaam is niet geldig. Moet bestaan uit 4 tot 20 alfanumerieke tekens. Username is already in use or not valid. Please choose another. - + Gebruikersnaam is al in gebruik of niet geldig. Kies een andere. IP is not a valid IPv4 address. - + IP is geen geldig IPv4-adres. Port must be a number between 0 to 65535. - + De poort moet een getal zijn tussen 0 en 65535. You must choose a Preferred Game to host a room. If you do not have any games in your game list yet, add a game folder by clicking on the plus icon in the game list. - + Je moet een Voorkeursspel kiezen om een kamer te hosten. Als je nog geen spellen in je spellenlijst hebt, voeg dan een spellenmap toe door op het plus-icoon in de spellenlijst te klikken. Unable to find an internet connection. Check your internet settings. - + Kan geen internetverbinding vinden. Controleer je Internetinstellingen. Unable to connect to the host. Verify that the connection settings are correct. If you still cannot connect, contact the room host and verify that the host is properly configured with the external port forwarded. - + Kan geen verbinding maken met de host. Controleer of de verbindingsinstellingen correct zijn. Als je nog steeds geen verbinding kunt maken, neem dan contact op met de ruimtehost en controleer of de host correct is geconfigureerd met de externe poort doorgestuurd. Unable to connect to the room because it is already full. - + Kan geen verbinding maken met de kamer omdat deze al vol is. Creating a room failed. Please retry. Restarting yuzu might be necessary. - + Het aanmaken van een kamer is mislukt. Probeer het opnieuw. Het herstarten van yuzu kan nodig zijn. The host of the room has banned you. Speak with the host to unban you or try a different room. - + De host van de kamer heeft je verbannen. Praat met de host om je ban op te heffen of probeer een andere kamer. Version mismatch! Please update to the latest version of yuzu. If the problem persists, contact the room host and ask them to update the server. - + Versie komt niet overeen! Update naar de laatste versie van yuzu. Als het probleem aanhoudt, neem dan contact op met de room host en vraag hen om de server bij te werken. Incorrect password. - + Verkeerd wachtwoord. An unknown error occurred. If this error continues to occur, please open an issue - + Er is een onbekende fout opgetreden. Als deze fout zich blijft voordoen, open dan een ticket Connection to room lost. Try to reconnect. - + Verbinding met kamer verloren. Probeer opnieuw verbinding te maken. You have been kicked by the room host. - + Je bent gekickt door de kamerhost. IP address is already in use. Please choose another. - + Het IP-adres is al in gebruik. Kies een ander. You do not have enough permission to perform this action. - + Je hebt niet genoeg rechten om deze actie uit te voeren. The user you are trying to kick/ban could not be found. They may have left the room. - + De gebruiker die je probeert te kicken/bannen kon niet gevonden worden. +Ze kunnen de ruimte hebben verlaten. No valid network interface is selected. Please go to Configure -> System -> Network and make a selection. - + Er is geen geldige netwerkinterface geselecteerd. +Ga naar Configuratie -> Systeem -> Netwerk en maak een selectie. Game already running - + Het spel draait al Joining a room when the game is already running is discouraged and can cause the room feature not to work correctly. Proceed anyway? - + Het wordt afgeraden om aan een kamer deel te nemen als het spel al bezig is en kan ervoor zorgen dat de kamerfunctie niet correct werkt. +Toch doorgaan? Leave Room - + Verlaat Kamer You are about to close the room. Any network connections will be closed. - + Je staat op het punt de kamer te sluiten. Alle netwerkverbindingen worden afgesloten. Disconnect - + Verbinding Verbreken You are about to leave the room. Any network connections will be closed. - + Je staat op het punt de kamer te verlaten. Alle netwerkverbindingen worden afgesloten. @@ -6725,7 +6753,7 @@ Proceed anyway? Error - + Fout @@ -6754,7 +6782,11 @@ Proceed anyway? p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:18pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:18pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> @@ -6762,7 +6794,7 @@ p, li { white-space: pre-wrap; } START/PAUSE - + START/ONDERBREKEN @@ -6770,42 +6802,42 @@ p, li { white-space: pre-wrap; } %1 is not playing a game - + %1 speelt geen spel %1 is playing %2 - + %1 speelt %2 Not playing a game - + Geen spel aan het spelen Installed SD Titles - Geïnstalleerde SD Titels + Geïnstalleerde SD-titels Installed NAND Titles - Geïnstalleerde NAND Titels + Geïnstalleerde NAND-titels System Titles - Systeem Titels + Systeemtitels Add New Game Directory - Voeg Nieuwe Game Map Toe + Voeg Nieuwe Spelmap Toe Favorites - + Favorieten @@ -6876,28 +6908,28 @@ p, li { white-space: pre-wrap; } Left - Links: + Links Right - Rechts: + Rechts Down - Beneden: + Omlaag Up - Boven: + Omhoog @@ -6909,7 +6941,7 @@ p, li { white-space: pre-wrap; } R - R: + R @@ -6951,79 +6983,79 @@ p, li { white-space: pre-wrap; } L1 - + L1 L2 - + L2 L3 - + L3 R1 - + R1 R2 - + R2 R3 - + R3 Circle - + Cirkel Cross - + Kruis Square - + Vierkant Triangle - + Driehoek Share - + Deel Options - + Opties [undefined] - + [ongedefinieerd] @@ -7034,13 +7066,13 @@ p, li { white-space: pre-wrap; } [invalid] - + [ongeldig] %1%2Hat %3 - + %1%2Hat %3 @@ -7050,25 +7082,25 @@ p, li { white-space: pre-wrap; } %1%2Axis %3 - + %1%2As %3 %1%2Axis %3,%4,%5 - + %1%2As %3,%4,%5 %1%2Motion %3 - + %1%2Beweging %3 %1%2Button %3 - + %1%2Knop %3 @@ -7099,17 +7131,17 @@ p, li { white-space: pre-wrap; } Stick L - + Stick L Stick R - + Stick R Plus - Plus: + Plus @@ -7120,7 +7152,7 @@ p, li { white-space: pre-wrap; } Home - Home: + Home @@ -7136,44 +7168,44 @@ p, li { white-space: pre-wrap; } Wheel Indicates the mouse wheel - + Wiel Backward - + Achteruit Forward - + Vooruit Task - + Taak Extra - + Extra %1%2%3%4 - + %1%2%3%4 %1%2%3Hat %4 - + %1%2%3Hat %4 %1%2%3Button %4 - + %1%2%3Knop %4 @@ -7181,22 +7213,22 @@ p, li { white-space: pre-wrap; } Amiibo Settings - + Amiibo-instellingen Amiibo Info - + Amiibo-info Series - + Serie Type - + Soort @@ -7206,52 +7238,52 @@ p, li { white-space: pre-wrap; } Amiibo Data - + Amiibo-gegevens Custom Name - + Aangepaste Naam Owner - + Eigenaar Creation Date - + Aanmaakdatum dd/MM/yyyy - + dd/MM/yyyy Modification Date - + Modificatiedatum dd/MM/yyyy - + dd/MM/yyyy Game Data - + Spelgegevens Game Id - + Spel-ID Mount Amiibo - + Gebruik Amiibo @@ -7261,32 +7293,32 @@ p, li { white-space: pre-wrap; } File Path - + Bestandspad No game data present - + Geen spelgegevens aanwezig The following amiibo data will be formatted: - + De volgende amiibo-gegevens worden zo geformatteerd: The following game data will removed: - + De volgende spelgegevens worden verwijderd: Set nickname and owner: - + Stel gebruikersnaam en eigenaar in: Do you wish to restore this amiibo? - + Wil je deze amiibo herstellen? @@ -7294,27 +7326,27 @@ p, li { white-space: pre-wrap; } Controller Applet - + Controller Applet Supported Controller Types: - + Ondersteunde Controller-typen: Players: - + Spelers: 1 - 8 - + 1 - 8 P4 - + P4 @@ -7378,59 +7410,59 @@ p, li { white-space: pre-wrap; } Use Current Config - + Gebruik Huidige Configuratie P2 - + P2 P1 - + P1 Handheld - Mobiel + Handheld P3 - + P3 P7 - + P7 P8 - + P8 P5 - + P5 P6 - + P6 Console Mode - Console ID: + Console-ID: Docked - GeDocked + Docked @@ -7456,7 +7488,7 @@ p, li { white-space: pre-wrap; } Create - + Maak @@ -7511,32 +7543,32 @@ p, li { white-space: pre-wrap; } GameCube Controller - GameCube Controller + GameCube-controller Poke Ball Plus - + Poke Ball Plus NES Controller - + NES-controller SNES Controller - + SNES-controller N64 Controller - + N64-controller Sega Genesis - + Sega Genesis @@ -7546,19 +7578,21 @@ p, li { white-space: pre-wrap; } Error Code: %1-%2 (0x%3) - + Foutcode: %1-%2 (0x%3) An error has occurred. Please try again or contact the developer of the software. - + Er is een fout opgetreden. +Probeer het opnieuw of neem contact op met de software-ontwikkelaar. An error occurred on %1 at %2. Please try again or contact the developer of the software. - + Er is een fout opgetreden op %1 bij %2. +Probeer het opnieuw of neem contact op met de software-ontwikkelaar. @@ -7567,7 +7601,11 @@ Please try again or contact the developer of the software. %1 %2 - + Er is een fout opgetreden. + +%1 + +%2 @@ -7588,68 +7626,68 @@ Please try again or contact the developer of the software. Profile Creator - + Profielmaker Profile Selector - Profiel keuzeschakelaar + Profielkiezer Profile Icon Editor - + Profielicoon-editor Profile Nickname Editor - + Profielnaam-editor Who will receive the points? - + Wie krijgt de punten? Who is using Nintendo eShop? - + Wie gebruikt de Nintendo eShop? Who is making this purchase? - + Wie doet deze aankoop? Who is posting? - + Wie post er? Select a user to link to a Nintendo Account. - + Selecteer een gebruiker om te koppelen aan een Nintendo-account. Change settings for which user? - + Instellingen wijzigen voor welke gebruiker? Format data for which user? - + Formatteer gegevens voor welke gebruiker? Which user will be transferred to another console? - + Welke gebruiker wordt overgezet naar een andere console? Send save data for which user? - + Gegevens verzenden voor welke gebruiker? @@ -7662,12 +7700,12 @@ Please try again or contact the developer of the software. Software Keyboard - Software Toetsenbord + Softwaretoetsenbord Enter Text - + Voer Tekst In @@ -7676,7 +7714,11 @@ Please try again or contact the developer of the software. p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:26pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:26pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> @@ -7695,7 +7737,7 @@ p, li { white-space: pre-wrap; } Enter a hotkey - Voer een hotkey in + Voer een sneltoets in @@ -7711,12 +7753,12 @@ p, li { white-space: pre-wrap; } [%1] %2 - + [%1] %2 waited by no thread - wachtend door geen draad + wachtend door geen thread @@ -7729,7 +7771,7 @@ p, li { white-space: pre-wrap; } paused - gepauzeerd + onderbroken @@ -7739,7 +7781,7 @@ p, li { white-space: pre-wrap; } waiting for IPC reply - wachten op IPC antwoord + wachten op IPC-antwoord @@ -7759,7 +7801,7 @@ p, li { white-space: pre-wrap; } waiting for suspend resume - + wachtend op hervatten onderbreking @@ -7769,7 +7811,7 @@ p, li { white-space: pre-wrap; } initialized - geinitialiseerd + geïnitialiseerd @@ -7809,7 +7851,7 @@ p, li { white-space: pre-wrap; } thread id = %1 - draad id = %1 + thread-id = %1 @@ -7827,7 +7869,7 @@ p, li { white-space: pre-wrap; } waited by thread - Wachtend door draad + wachtend door thread @@ -7835,7 +7877,7 @@ p, li { white-space: pre-wrap; } &Wait Tree - + &Wait Tree \ No newline at end of file diff --git a/dist/languages/pl.ts b/dist/languages/pl.ts index 36daf71d2..e822fcac8 100644 --- a/dist/languages/pl.ts +++ b/dist/languages/pl.ts @@ -1377,8 +1377,8 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d - Extended memory layout (6GB DRAM) - Rozszerzony układ pamięci (6GB DRAM) + Extended memory layout (8GB DRAM) + diff --git a/dist/languages/pt_BR.ts b/dist/languages/pt_BR.ts index 98f1345a2..50213db36 100644 --- a/dist/languages/pt_BR.ts +++ b/dist/languages/pt_BR.ts @@ -1383,8 +1383,8 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - Extended memory layout (6GB DRAM) - Layout de memória extendida (6GB DRAM) + Extended memory layout (8GB DRAM) + diff --git a/dist/languages/pt_PT.ts b/dist/languages/pt_PT.ts index 293283ac9..da8aa6d13 100644 --- a/dist/languages/pt_PT.ts +++ b/dist/languages/pt_PT.ts @@ -1373,8 +1373,8 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - Extended memory layout (6GB DRAM) - Layout de memória extendida (6GB DRAM) + Extended memory layout (8GB DRAM) + diff --git a/dist/languages/ru_RU.ts b/dist/languages/ru_RU.ts index eee646732..898c1800c 100644 --- a/dist/languages/ru_RU.ts +++ b/dist/languages/ru_RU.ts @@ -381,17 +381,17 @@ This would ban both their forum username and their IP address. Output Device: - + Устройство вывода: Input Device: - + Устройство ввода: Sound Output Mode: - + Режим вывода звука: @@ -551,13 +551,13 @@ This would ban both their forum username and their IP address. <div>This option improves speed by reducing accuracy of fused-multiply-add instructions on CPUs without native FMA support.</div> - <div>Эта опция повышает скорость, уменьшая точность сложенных умноженных инструкций на ЦП без поддержки FMA.</div> + <div>Эта опция повышает скорость за счет снижения точности инструкций fused-multiply-add на ЦП без встроенной поддержки FMA.</div> Unfuse FMA (improve performance on CPUs without FMA) - Не использовать FMA (улучшает производительность на ЦП без FMA) + Отключить FMA (улучшает производительность на ЦП без FMA) @@ -565,7 +565,7 @@ This would ban both their forum username and their IP address. <div>This option improves the speed of some approximate floating-point functions by using less accurate native approximations.</div> - <div>Эта опция повышает скорость некоторых аппроксимирующих функций с плавающей точкой за счет использования менее точных нативных приближений.</div> + <div>Эта опция повышает скорость некоторых приближенных функций с плавающей точкой за счет использования менее точных нативных приближений</div> @@ -579,13 +579,13 @@ This would ban both their forum username and their IP address. <div>This option improves the speed of 32 bits ASIMD floating-point functions by running with incorrect rounding modes.</div> - <div>Эта опция улучшает скорость 32-битных ASIMD-функций с плавающей запятой путём работы с некорректными режимами округления.</div> + <div>Эта опция повышает скорость работы 32-битных ASIMD-функций с плавающей запятой, работая с неправильными режимами округления.</div> Faster ASIMD instructions (32 bits only) - Более быстрые инструкции ASIMD (только 32 бит) + Ускоренные инструкции ASIMD (только 32 бит) @@ -593,20 +593,22 @@ This would ban both their forum username and their IP address. <div>This option improves speed by removing NaN checking. Please note this also reduces accuracy of certain floating-point instructions.</div> - <div>Эта опция повышает скорость, убирая проверку на NaN. Обратите внимание, что это также снижает точность некоторых инструкций с плавающей точкой.</div> + <div>Эта опция повышает скорость, удаляя проверку NaN. Обратите внимание, что это также снижает точность некоторых инструкций с плавающей точкой.</div> Inaccurate NaN handling - Неправильная обработка NaN + Неточная обработка NaN <div>This option improves speed by eliminating a safety check before every memory read/write in guest. Disabling it may allow a game to read/write the emulator's memory.</div> - + + <div>Эта опция повышает скорость за счет исключения проверки безопасности перед каждым чтением/записью памяти в гостевом режиме. Отключение этой опции может позволить игре читать/записывать память эмулятора. + @@ -618,12 +620,14 @@ This would ban both their forum username and their IP address. <div>This option improves speed by relying only on the semantics of cmpxchg to ensure safety of exclusive access instructions. Please note this may result in deadlocks and other race conditions.</div> - + + <div>Эта опция повышает скорость, полагаясь только на семантику cmpxchg для обеспечения безопасности инструкций исключительного доступа. Обратите внимание, что это может привести к полным зависаниям и другим условиям гонки.</div> + Ignore global monitor - + Игнорировать глобальный мониторинг @@ -660,7 +664,11 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">Enabling it inlines accesses to PageTable::pointers into emitted code.</div> <div style="white-space: nowrap">Disabling this forces all memory accesses to go through the Memory::Read/Memory::Write functions.</div> - + + <div style="white-space: nowrap">Эта оптимизация ускоряет доступ гостевой программы к памяти.</div> + <div style="white-space: nowrap"> Включение этой оптимизации встраивает доступ к указателям PageTable::pointers в эмулируемый код.</div> + <div style="white-space: nowrap">Отключение этой функции заставляет все обращения к памяти проходить через функции Memory::Read/Memory::Write.</div> + @@ -672,7 +680,9 @@ This would ban both their forum username and their IP address. <div>This optimization avoids dispatcher lookups by allowing emitted basic blocks to jump directly to other basic blocks if the destination PC is static.</div> - + + <div>Эта оптимизация позволяет избежать поиска диспетчера, позволяя эмитированным базовым блокам переходить непосредственно к другим базовым блокам, если конечный ПК статичен.</div> + @@ -684,7 +694,9 @@ This would ban both their forum username and their IP address. <div>This optimization avoids dispatcher lookups by keeping track potential return addresses of BL instructions. This approximates what happens with a return stack buffer on a real CPU.</div> - + + <div>Эта оптимизация позволяет избежать поиска диспетчера, отслеживая потенциальные адреса возврата инструкций BL. Это приближено к тому, что происходит с буфером стека возврата на реальном ЦП.</div> + @@ -696,7 +708,9 @@ This would ban both their forum username and their IP address. <div>Enable a two-tiered dispatch system. A faster dispatcher written in assembly has a small MRU cache of jump destinations is used first. If that fails, dispatch falls back to the slower C++ dispatcher.</div> - + + <div>Включите двухуровневую систему диспетчеризации. Сначала используется более быстрый диспетчер, написанный на ассемблере и имеющий небольшой кэш MRU для мест назначения переходов. Если он не справляется, диспетчеризация возвращается к более медленному диспетчеру на C++.</div> + @@ -708,7 +722,9 @@ This would ban both their forum username and their IP address. <div>Enables an IR optimization that reduces unnecessary accesses to the CPU context structure.</div> - + + <div>Включает IR-оптимизацию, которая уменьшает ненужные обращения к структуре контекста ЦП.</div> + @@ -720,19 +736,23 @@ This would ban both their forum username and their IP address. <div>Enables IR optimizations that involve constant propagation.</div> - + + <div>Включает IR-оптимизацию, которая включает распространение констант.</div> + Enable constant propagation - Включить постоянное распространение + Включить распространение констант <div>Enables miscellaneous IR optimizations.</div> - + + <div>Включает различные IR-оптимизации.</div> + @@ -745,12 +765,15 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">When enabled, a misalignment is only triggered when an access crosses a page boundary.</div> <div style="white-space: nowrap">When disabled, a misalignment is triggered on all misaligned accesses.</div> - + + <div style="white-space: nowrap">Если функция включена, смещение срабатывает только тогда, когда доступ пересекает границу страницы.</div> + <div style="white-space: nowrap">Если отключено, смещение срабатывает при всех смещенных доступах.</div> + Enable misalignment check reduction - + Включить уменьшение проверки несоосности @@ -759,12 +782,16 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">Enabling it causes guest memory reads/writes to be done directly into memory and make use of Host's MMU.</div> <div style="white-space: nowrap">Disabling this forces all memory accesses to use Software MMU Emulation.</div> - + + <div style="white-space: nowrap">Эта оптимизация ускоряет доступ гостевой программы к памяти.</div> + <div style="white-space: nowrap"> Включение этой оптимизации приводит к тому, что чтение/запись гостевой памяти производится непосредственно в память и использует MMU хоста.</div> + <div style="white-space: nowrap">Отключение этой функции заставляет все обращения к памяти использовать программную эмуляцию MMU.</div> + Enable Host MMU Emulation (general memory instructions) - + Включить эмуляцию MMU хоста (инструкции общей памяти) @@ -773,12 +800,16 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">Enabling it causes guest exclusive memory reads/writes to be done directly into memory and make use of Host's MMU.</div> <div style="white-space: nowrap">Disabling this forces all exclusive memory accesses to use Software MMU Emulation.</div> - + + <div style="white-space: nowrap">Эта оптимизация ускоряет доступ гостевой программы к эксклюзивной памяти.</div> + <div style="white-space: nowrap">Включение этой оптимизации приводит к тому, что чтение/запись в эксклюзивную память гостя выполняется непосредственно в память и использует MMU хоста.</div> + <div style="white-space: nowrap"> Отключение этой функции заставляет все эксклюзивные доступы к памяти использовать эмуляцию программного MMU.</div> + Enable Host MMU Emulation (exclusive memory instructions) - + Включить эмуляцию MMU хоста (инструкции исключительной памяти) @@ -786,12 +817,15 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">This optimization speeds up exclusive memory accesses by the guest program.</div> <div style="white-space: nowrap">Enabling it reduces the overhead of fastmem failure of exclusive memory accesses.</div> - + + <div style="white-space: nowrap">Эта оптимизация ускоряет обращение гостевой программы к исключительной памяти.</div> + <div style="white-space: nowrap">Ее включение снижает накладные расходы, связанные с отказом fastmem при доступе к исключительной памяти.</div> + Enable recompilation of exclusive memory instructions - + Разрешить перекомпиляцию инструкций исключительной памяти @@ -799,7 +833,10 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">This optimization speeds up memory accesses by allowing invalid memory accesses to succeed.</div> <div style="white-space: nowrap">Enabling it reduces the overhead of all memory accesses and has no impact on programs that don't access invalid memory.</div> - + + <div style="white-space: nowrap">Эта оптимизация ускоряет обращение к памяти, позволяя успешное обращение к недопустимой памяти.</div> + <div style="white-space: nowrap">Включение этой оптимизации снижает накладные расходы на все обращения к памяти и не влияет на программы, которые не обращаются к недопустимой памяти.</div> + @@ -917,17 +954,17 @@ This would ban both their forum username and their IP address. When checked, it disables the macro Just In Time compiler. Enabling this makes games run slower - Если включено, отключает компилятор макроса Just In Time. Включение опции делает игры медленнее + Если включено, отключает компилятор макроса Just In Time. Включение этого параметра замедляет работу игр Disable Macro JIT - Отключить Macro JIT + Отключить макрос JIT When checked, it disables the macro HLE functions. Enabling this makes games run slower - + Если флажок установлен, он отключает функции макроса HLE. Включение этого параметра замедляет работу игр @@ -947,12 +984,12 @@ This would ban both their forum username and their IP address. When checked, it executes shaders without loop logic changes - + Если включено, шейдеры выполняются без изменения логики цикла Disable Loop safety checks - + Отключить проверку безопасности цикла @@ -967,12 +1004,12 @@ This would ban both their forum username and their IP address. Enable FS Access Log - + Включить журнал доступа к ФС Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Включите эту опцию, чтобы вывести на консоль последний сгенерированный список аудиокоманд. Влияет только на игры, использующие аудио рендерер. @@ -1007,7 +1044,7 @@ This would ban both their forum username and their IP address. Enable Auto-Stub** - + Включить автоподставку** @@ -1346,8 +1383,8 @@ This would ban both their forum username and their IP address. - Extended memory layout (6GB DRAM) - Расширенная компоновка памяти (6 ГБ DRAM) + Extended memory layout (8GB DRAM) + Расширенная компоновка памяти (8 ГБ DRAM) @@ -1716,12 +1753,12 @@ This would ban both their forum username and their IP address. Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. - + Включает асинхронное декодирование текстур ASTC, что может уменьшить фризы при загрузке. Эта функция является экспериментальной. Decode ASTC textures asynchronously (Hack) - + Асинхронное декодирование текстур ASTC (Хак) @@ -2236,7 +2273,7 @@ This would ban both their forum username and their IP address. Enable direct Pro Controller driver [EXPERIMENTAL] - + Включить прямой драйвер Pro Controller [ЭКСПЕРИМЕНТАЛЬНО] @@ -4580,12 +4617,12 @@ Drag points to change position, or double-click table cells to edit values. Emulated mouse is enabled - + Эмулированная мышь включена Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + Ввод реальной мыши и панорамирование мышью несовместимы. Пожалуйста, отключите эмулированную мышь в расширенных настройках ввода, чтобы разрешить панорамирование мышью. @@ -7613,7 +7650,7 @@ Please try again or contact the developer of the software. Profile Creator - + Создатель профиля @@ -7624,57 +7661,57 @@ Please try again or contact the developer of the software. Profile Icon Editor - + Редактор иконки профиля Profile Nickname Editor - + Редактор никнейма профиля Who will receive the points? - + Кто будет получать очки? Who is using Nintendo eShop? - + Кто использует Nintendo eShop? Who is making this purchase? - + Кто совершает эту покупку? Who is posting? - + Кто публикует? Select a user to link to a Nintendo Account. - + Выберите пользователя для привязки к учетной записи Nintendo. Change settings for which user? - + Изменить настройки для какого пользователя? Format data for which user? - + Форматировать данные для какого пользователя? Which user will be transferred to another console? - + Какой пользователь будет переходить на другую консоль? Send save data for which user? - + Отправить сохранение какому пользователю? @@ -7740,7 +7777,7 @@ p, li { white-space: pre-wrap; } [%1] %2 - + [%1] %2 @@ -7753,17 +7790,17 @@ p, li { white-space: pre-wrap; } runnable - + runnable paused - + paused sleeping - + sleeping @@ -7778,32 +7815,32 @@ p, li { white-space: pre-wrap; } waiting for condition variable - + waiting for condition variable waiting for address arbiter - + waiting for address arbiter waiting for suspend resume - + waiting for suspend resume waiting - + waiting initialized - + initialized terminated - + terminated @@ -7818,7 +7855,7 @@ p, li { white-space: pre-wrap; } ideal - + ideal @@ -7848,7 +7885,7 @@ p, li { white-space: pre-wrap; } last running ticks = %1 - + last running ticks = %1 diff --git a/dist/languages/sv.ts b/dist/languages/sv.ts index b81ed7fd6..8c60a4942 100644 --- a/dist/languages/sv.ts +++ b/dist/languages/sv.ts @@ -122,7 +122,7 @@ p, li { white-space: pre-wrap; } %1 has been unbanned - + %1 har haft dess bannlysning upphävd. @@ -242,22 +242,22 @@ Detta kommer bannlysa både dennes användarnamn på forum samt IP-adress. <html><head/><body><p>Does the game boot?</p></body></html> - + <html><head/><body><p>Startar Spelet? </p></body></html> Yes The game starts to output video or audio - + Ja Spelet öppnar till utmatning av video eller audio No The game doesn't get past the "Launching..." screen - + Nej Spelet öppnar ej förbi "Startar..." skärmen Yes The game gets past the intro/menu and into gameplay - + Ja Spelet öppnar förbi introt/menyn och in i själva spelandet @@ -1031,7 +1031,7 @@ avgjord kod.</div> Disable Web Applet - + Avaktivera Webbappletten @@ -1360,8 +1360,8 @@ avgjord kod.</div> - Extended memory layout (6GB DRAM) - Utökad minnesöversikt (6GB DRAM) + Extended memory layout (8GB DRAM) + @@ -3320,13 +3320,13 @@ UUID: %2 Pull - + Dra Push - + Knuff @@ -3347,7 +3347,7 @@ UUID: %2 Enable - + Aktivera @@ -4493,17 +4493,17 @@ Dra punkter för att ändra position, eller dubbelklicka tabellceller för att r Nickname - + Smeknamn Password - + Lösenord Connect - + Anslut @@ -4511,12 +4511,12 @@ Dra punkter för att ändra position, eller dubbelklicka tabellceller för att r Connecting - + Ansluter Connect - + Anslut @@ -4534,7 +4534,7 @@ Dra punkter för att ändra position, eller dubbelklicka tabellceller för att r Broken Vulkan Installation Detected - + Felaktig Vulkaninstallation Upptäckt @@ -4550,7 +4550,7 @@ Dra punkter för att ändra position, eller dubbelklicka tabellceller för att r Disable Web Applet - + Avaktivera Webbappletten @@ -4591,7 +4591,7 @@ Dra punkter för att ändra position, eller dubbelklicka tabellceller för att r Emulated mouse is enabled - + Emulerad datormus är aktiverad @@ -5171,7 +5171,7 @@ Please, only use this feature to install updates and DLC. Hardware requirements not met - + Hårdvarukraven uppfylls ej @@ -5202,17 +5202,17 @@ Please, only use this feature to install updates and DLC. TAS Recording - + TAS Inspelning Overwrite file of player 1? - + Överskriv spelare 1:s fil? Invalid config detected - + Ogiltig konfiguration upptäckt @@ -5223,13 +5223,13 @@ Please, only use this feature to install updates and DLC. Amiibo - + Amiibo The current amiibo has been removed - + Den aktuella amiibon har avlägsnats @@ -5240,7 +5240,7 @@ Please, only use this feature to install updates and DLC. The current game is not looking for amiibos - + Det aktuella spelet letar ej efter amiibos @@ -5260,17 +5260,17 @@ Please, only use this feature to install updates and DLC. The selected file is not a valid amiibo - + Den valda filen är inte en giltig amiibo The selected file is already on use - + Den valda filen är redan använd An unknown error occurred - + Ett okänt fel har inträffat @@ -5285,22 +5285,22 @@ Please, only use this feature to install updates and DLC. TAS state: Running %1/%2 - + TAStillstånd: pågående %1/%2 TAS state: Recording %1 - + TAStillstånd: spelar in %1 TAS state: Idle %1/%2 - + TAStillstånd: inaktiv %1/%2 TAS State: Invalid - + TAStillstånd: ogiltigt @@ -5902,7 +5902,7 @@ Vill du strunta i detta och avsluta ändå? Password - + Lösenord @@ -6169,7 +6169,7 @@ Debug Message: Nickname - + Smeknamn diff --git a/dist/languages/tr_TR.ts b/dist/languages/tr_TR.ts index 98a7f479f..47a0ca9c8 100644 --- a/dist/languages/tr_TR.ts +++ b/dist/languages/tr_TR.ts @@ -1368,8 +1368,8 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - Extended memory layout (6GB DRAM) - Artırılmış hafıza düzeni (6GB DRAM) + Extended memory layout (8GB DRAM) + diff --git a/dist/languages/uk.ts b/dist/languages/uk.ts index 02bdf2233..3c4e788f6 100644 --- a/dist/languages/uk.ts +++ b/dist/languages/uk.ts @@ -1346,8 +1346,8 @@ This would ban both their forum username and their IP address. - Extended memory layout (6GB DRAM) - Розширене компонування пам'яті (6 ГБ DRAM) + Extended memory layout (8GB DRAM) + diff --git a/dist/languages/zh_CN.ts b/dist/languages/zh_CN.ts index 9da8b0b32..2de1e921e 100644 --- a/dist/languages/zh_CN.ts +++ b/dist/languages/zh_CN.ts @@ -1380,8 +1380,8 @@ This would ban both their forum username and their IP address. - Extended memory layout (6GB DRAM) - 扩展的内存布局 (6GB DRAM) + Extended memory layout (8GB DRAM) + 扩展的内存布局 (8GB DRAM) diff --git a/dist/languages/zh_TW.ts b/dist/languages/zh_TW.ts index 472b00114..f6cd1934d 100644 --- a/dist/languages/zh_TW.ts +++ b/dist/languages/zh_TW.ts @@ -1382,8 +1382,8 @@ This would ban both their forum username and their IP address. - Extended memory layout (6GB DRAM) - 扩展的内存布局 (6GB DRAM) + Extended memory layout (8GB DRAM) + 扩展的内存布局 (8GB DRAM) From 2ad9acf795fcb9f0f01ed85e1b4f1accd9c3965d Mon Sep 17 00:00:00 2001 From: GPUCode Date: Sun, 19 Mar 2023 17:23:24 +0200 Subject: [PATCH 0299/1181] renderer_vulkan: Async presentation --- src/video_core/CMakeLists.txt | 2 + .../renderer_vulkan/renderer_vulkan.cpp | 51 +- .../renderer_vulkan/renderer_vulkan.h | 2 + .../renderer_vulkan/vk_blit_screen.cpp | 222 +++++---- .../renderer_vulkan/vk_blit_screen.h | 34 +- .../renderer_vulkan/vk_present_manager.cpp | 440 ++++++++++++++++++ .../renderer_vulkan/vk_present_manager.h | 82 ++++ .../renderer_vulkan/vk_scheduler.cpp | 9 +- src/video_core/renderer_vulkan/vk_scheduler.h | 6 +- .../renderer_vulkan/vk_swapchain.cpp | 49 +- src/video_core/renderer_vulkan/vk_swapchain.h | 31 +- 11 files changed, 711 insertions(+), 217 deletions(-) create mode 100644 src/video_core/renderer_vulkan/vk_present_manager.cpp create mode 100644 src/video_core/renderer_vulkan/vk_present_manager.h diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 92cab93f3..a0009a36f 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -179,6 +179,8 @@ add_library(video_core STATIC renderer_vulkan/vk_master_semaphore.h renderer_vulkan/vk_pipeline_cache.cpp renderer_vulkan/vk_pipeline_cache.h + renderer_vulkan/vk_present_manager.cpp + renderer_vulkan/vk_present_manager.h renderer_vulkan/vk_query_cache.cpp renderer_vulkan/vk_query_cache.h renderer_vulkan/vk_rasterizer.cpp diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp index 2a8d9e377..69dc76180 100644 --- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp +++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp @@ -93,8 +93,9 @@ RendererVulkan::RendererVulkan(Core::TelemetrySession& telemetry_session_, state_tracker(), scheduler(device, state_tracker), swapchain(*surface, device, scheduler, render_window.GetFramebufferLayout().width, render_window.GetFramebufferLayout().height, false), - blit_screen(cpu_memory, render_window, device, memory_allocator, swapchain, scheduler, - screen_info), + present_manager(render_window, device, memory_allocator, scheduler, swapchain), + blit_screen(cpu_memory, render_window, device, memory_allocator, swapchain, present_manager, + scheduler, screen_info), rasterizer(render_window, gpu, cpu_memory, screen_info, device, memory_allocator, state_tracker, scheduler) { if (Settings::values.renderer_force_max_clock.GetValue() && device.ShouldBoostClocks()) { @@ -121,46 +122,19 @@ void RendererVulkan::SwapBuffers(const Tegra::FramebufferConfig* framebuffer) { return; } // Update screen info if the framebuffer size has changed. - if (screen_info.width != framebuffer->width || screen_info.height != framebuffer->height) { - screen_info.width = framebuffer->width; - screen_info.height = framebuffer->height; - } + screen_info.width = framebuffer->width; + screen_info.height = framebuffer->height; + const VAddr framebuffer_addr = framebuffer->address + framebuffer->offset; const bool use_accelerated = rasterizer.AccelerateDisplay(*framebuffer, framebuffer_addr, framebuffer->stride); const bool is_srgb = use_accelerated && screen_info.is_srgb; RenderScreenshot(*framebuffer, use_accelerated); - bool has_been_recreated = false; - const auto recreate_swapchain = [&](u32 width, u32 height) { - if (!has_been_recreated) { - has_been_recreated = true; - scheduler.Finish(); - } - swapchain.Create(width, height, is_srgb); - }; - - const Layout::FramebufferLayout layout = render_window.GetFramebufferLayout(); - if (swapchain.NeedsRecreation(is_srgb) || swapchain.GetWidth() != layout.width || - swapchain.GetHeight() != layout.height) { - recreate_swapchain(layout.width, layout.height); - } - bool is_outdated; - do { - swapchain.AcquireNextImage(); - is_outdated = swapchain.IsOutDated(); - if (is_outdated) { - recreate_swapchain(layout.width, layout.height); - } - } while (is_outdated); - if (has_been_recreated) { - blit_screen.Recreate(); - } - const VkSemaphore render_semaphore = blit_screen.DrawToSwapchain(*framebuffer, use_accelerated); - const VkSemaphore present_semaphore = swapchain.CurrentPresentSemaphore(); - scheduler.Flush(render_semaphore, present_semaphore); - scheduler.WaitWorker(); - swapchain.Present(render_semaphore); + Frame* frame = present_manager.GetRenderFrame(); + blit_screen.DrawToSwapchain(frame, *framebuffer, use_accelerated, is_srgb); + scheduler.Flush(*frame->render_ready); + scheduler.Record([this, frame](vk::CommandBuffer) { present_manager.PushFrame(frame); }); gpu.RendererFrameEndNotify(); rasterizer.TickFrame(); @@ -246,8 +220,7 @@ void Vulkan::RendererVulkan::RenderScreenshot(const Tegra::FramebufferConfig& fr }); const VkExtent2D render_area{.width = layout.width, .height = layout.height}; const vk::Framebuffer screenshot_fb = blit_screen.CreateFramebuffer(*dst_view, render_area); - // Since we're not rendering to the screen, ignore the render semaphore. - void(blit_screen.Draw(framebuffer, *screenshot_fb, layout, render_area, use_accelerated)); + blit_screen.Draw(framebuffer, *screenshot_fb, layout, render_area, use_accelerated); const auto buffer_size = static_cast(layout.width * layout.height * 4); const VkBufferCreateInfo dst_buffer_info{ @@ -270,7 +243,7 @@ void Vulkan::RendererVulkan::RenderScreenshot(const Tegra::FramebufferConfig& fr .pNext = nullptr, .srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT, .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT, - .oldLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, + .oldLayout = VK_IMAGE_LAYOUT_GENERAL, .newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.h b/src/video_core/renderer_vulkan/renderer_vulkan.h index 009e75e0d..f44367cb2 100644 --- a/src/video_core/renderer_vulkan/renderer_vulkan.h +++ b/src/video_core/renderer_vulkan/renderer_vulkan.h @@ -9,6 +9,7 @@ #include "common/dynamic_library.h" #include "video_core/renderer_base.h" #include "video_core/renderer_vulkan/vk_blit_screen.h" +#include "video_core/renderer_vulkan/vk_present_manager.h" #include "video_core/renderer_vulkan/vk_rasterizer.h" #include "video_core/renderer_vulkan/vk_scheduler.h" #include "video_core/renderer_vulkan/vk_state_tracker.h" @@ -76,6 +77,7 @@ private: StateTracker state_tracker; Scheduler scheduler; Swapchain swapchain; + PresentManager present_manager; BlitScreen blit_screen; RasterizerVulkan rasterizer; std::optional turbo_mode; diff --git a/src/video_core/renderer_vulkan/vk_blit_screen.cpp b/src/video_core/renderer_vulkan/vk_blit_screen.cpp index 2f0cc27e8..4e8ce3ec7 100644 --- a/src/video_core/renderer_vulkan/vk_blit_screen.cpp +++ b/src/video_core/renderer_vulkan/vk_blit_screen.cpp @@ -122,10 +122,12 @@ struct BlitScreen::BufferData { BlitScreen::BlitScreen(Core::Memory::Memory& cpu_memory_, Core::Frontend::EmuWindow& render_window_, const Device& device_, MemoryAllocator& memory_allocator_, - Swapchain& swapchain_, Scheduler& scheduler_, const ScreenInfo& screen_info_) + Swapchain& swapchain_, PresentManager& present_manager_, + Scheduler& scheduler_, const ScreenInfo& screen_info_) : cpu_memory{cpu_memory_}, render_window{render_window_}, device{device_}, - memory_allocator{memory_allocator_}, swapchain{swapchain_}, scheduler{scheduler_}, - image_count{swapchain.GetImageCount()}, screen_info{screen_info_} { + memory_allocator{memory_allocator_}, swapchain{swapchain_}, present_manager{present_manager_}, + scheduler{scheduler_}, image_count{swapchain.GetImageCount()}, screen_info{screen_info_}, + current_srgb{swapchain.IsSrgb()}, image_view_format{swapchain.GetImageViewFormat()} { resource_ticks.resize(image_count); CreateStaticResources(); @@ -135,25 +137,20 @@ BlitScreen::BlitScreen(Core::Memory::Memory& cpu_memory_, Core::Frontend::EmuWin BlitScreen::~BlitScreen() = default; void BlitScreen::Recreate() { + present_manager.WaitPresent(); + scheduler.Finish(); + device.GetLogical().WaitIdle(); CreateDynamicResources(); } -VkSemaphore BlitScreen::Draw(const Tegra::FramebufferConfig& framebuffer, - const VkFramebuffer& host_framebuffer, - const Layout::FramebufferLayout layout, VkExtent2D render_area, - bool use_accelerated) { +void BlitScreen::Draw(const Tegra::FramebufferConfig& framebuffer, + const VkFramebuffer& host_framebuffer, const Layout::FramebufferLayout layout, + VkExtent2D render_area, bool use_accelerated) { RefreshResources(framebuffer); // Finish any pending renderpass scheduler.RequestOutsideRenderPassOperationContext(); - if (const auto swapchain_images = swapchain.GetImageCount(); swapchain_images != image_count) { - image_count = swapchain_images; - Recreate(); - } - - const std::size_t image_index = swapchain.GetImageIndex(); - scheduler.Wait(resource_ticks[image_index]); resource_ticks[image_index] = scheduler.CurrentTick(); @@ -169,7 +166,7 @@ VkSemaphore BlitScreen::Draw(const Tegra::FramebufferConfig& framebuffer, std::memcpy(mapped_span.data(), &data, sizeof(data)); if (!use_accelerated) { - const u64 image_offset = GetRawImageOffset(framebuffer, image_index); + const u64 image_offset = GetRawImageOffset(framebuffer); const VAddr framebuffer_addr = framebuffer.address + framebuffer.offset; const u8* const host_ptr = cpu_memory.GetPointer(framebuffer_addr); @@ -204,8 +201,8 @@ VkSemaphore BlitScreen::Draw(const Tegra::FramebufferConfig& framebuffer, .depth = 1, }, }; - scheduler.Record([this, copy, image_index](vk::CommandBuffer cmdbuf) { - const VkImage image = *raw_images[image_index]; + scheduler.Record([this, copy, index = image_index](vk::CommandBuffer cmdbuf) { + const VkImage image = *raw_images[index]; const VkImageMemoryBarrier base_barrier{ .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, .pNext = nullptr, @@ -245,14 +242,15 @@ VkSemaphore BlitScreen::Draw(const Tegra::FramebufferConfig& framebuffer, const auto anti_alias_pass = Settings::values.anti_aliasing.GetValue(); if (use_accelerated && anti_alias_pass == Settings::AntiAliasing::Fxaa) { - UpdateAADescriptorSet(image_index, source_image_view, false); + UpdateAADescriptorSet(source_image_view, false); const u32 up_scale = Settings::values.resolution_info.up_scale; const u32 down_shift = Settings::values.resolution_info.down_shift; VkExtent2D size{ .width = (up_scale * framebuffer.width) >> down_shift, .height = (up_scale * framebuffer.height) >> down_shift, }; - scheduler.Record([this, image_index, size, anti_alias_pass](vk::CommandBuffer cmdbuf) { + scheduler.Record([this, index = image_index, size, + anti_alias_pass](vk::CommandBuffer cmdbuf) { const VkImageMemoryBarrier base_barrier{ .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, .pNext = nullptr, @@ -326,7 +324,7 @@ VkSemaphore BlitScreen::Draw(const Tegra::FramebufferConfig& framebuffer, cmdbuf.BindVertexBuffer(0, *buffer, offsetof(BufferData, vertices)); cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, *aa_pipeline_layout, 0, - aa_descriptor_sets[image_index], {}); + aa_descriptor_sets[index], {}); cmdbuf.Draw(4, 1, 0, 0); cmdbuf.EndRenderPass(); @@ -369,81 +367,99 @@ VkSemaphore BlitScreen::Draw(const Tegra::FramebufferConfig& framebuffer, }; VkImageView fsr_image_view = fsr->Draw(scheduler, image_index, source_image_view, fsr_input_size, crop_rect); - UpdateDescriptorSet(image_index, fsr_image_view, true); + UpdateDescriptorSet(fsr_image_view, true); } else { const bool is_nn = Settings::values.scaling_filter.GetValue() == Settings::ScalingFilter::NearestNeighbor; - UpdateDescriptorSet(image_index, source_image_view, is_nn); + UpdateDescriptorSet(source_image_view, is_nn); } - scheduler.Record( - [this, host_framebuffer, image_index, size = render_area](vk::CommandBuffer cmdbuf) { - const f32 bg_red = Settings::values.bg_red.GetValue() / 255.0f; - const f32 bg_green = Settings::values.bg_green.GetValue() / 255.0f; - const f32 bg_blue = Settings::values.bg_blue.GetValue() / 255.0f; - const VkClearValue clear_color{ - .color = {.float32 = {bg_red, bg_green, bg_blue, 1.0f}}, - }; - const VkRenderPassBeginInfo renderpass_bi{ - .sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO, - .pNext = nullptr, - .renderPass = *renderpass, - .framebuffer = host_framebuffer, - .renderArea = - { - .offset = {0, 0}, - .extent = size, - }, - .clearValueCount = 1, - .pClearValues = &clear_color, - }; - const VkViewport viewport{ - .x = 0.0f, - .y = 0.0f, - .width = static_cast(size.width), - .height = static_cast(size.height), - .minDepth = 0.0f, - .maxDepth = 1.0f, - }; - const VkRect2D scissor{ - .offset = {0, 0}, - .extent = size, - }; - cmdbuf.BeginRenderPass(renderpass_bi, VK_SUBPASS_CONTENTS_INLINE); - auto graphics_pipeline = [this]() { - switch (Settings::values.scaling_filter.GetValue()) { - case Settings::ScalingFilter::NearestNeighbor: - case Settings::ScalingFilter::Bilinear: - return *bilinear_pipeline; - case Settings::ScalingFilter::Bicubic: - return *bicubic_pipeline; - case Settings::ScalingFilter::Gaussian: - return *gaussian_pipeline; - case Settings::ScalingFilter::ScaleForce: - return *scaleforce_pipeline; - default: - return *bilinear_pipeline; - } - }(); - cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, graphics_pipeline); - cmdbuf.SetViewport(0, viewport); - cmdbuf.SetScissor(0, scissor); + scheduler.Record([this, host_framebuffer, index = image_index, + size = render_area](vk::CommandBuffer cmdbuf) { + const f32 bg_red = Settings::values.bg_red.GetValue() / 255.0f; + const f32 bg_green = Settings::values.bg_green.GetValue() / 255.0f; + const f32 bg_blue = Settings::values.bg_blue.GetValue() / 255.0f; + const VkClearValue clear_color{ + .color = {.float32 = {bg_red, bg_green, bg_blue, 1.0f}}, + }; + const VkRenderPassBeginInfo renderpass_bi{ + .sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO, + .pNext = nullptr, + .renderPass = *renderpass, + .framebuffer = host_framebuffer, + .renderArea = + { + .offset = {0, 0}, + .extent = size, + }, + .clearValueCount = 1, + .pClearValues = &clear_color, + }; + const VkViewport viewport{ + .x = 0.0f, + .y = 0.0f, + .width = static_cast(size.width), + .height = static_cast(size.height), + .minDepth = 0.0f, + .maxDepth = 1.0f, + }; + const VkRect2D scissor{ + .offset = {0, 0}, + .extent = size, + }; + cmdbuf.BeginRenderPass(renderpass_bi, VK_SUBPASS_CONTENTS_INLINE); + auto graphics_pipeline = [this]() { + switch (Settings::values.scaling_filter.GetValue()) { + case Settings::ScalingFilter::NearestNeighbor: + case Settings::ScalingFilter::Bilinear: + return *bilinear_pipeline; + case Settings::ScalingFilter::Bicubic: + return *bicubic_pipeline; + case Settings::ScalingFilter::Gaussian: + return *gaussian_pipeline; + case Settings::ScalingFilter::ScaleForce: + return *scaleforce_pipeline; + default: + return *bilinear_pipeline; + } + }(); + cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, graphics_pipeline); + cmdbuf.SetViewport(0, viewport); + cmdbuf.SetScissor(0, scissor); - cmdbuf.BindVertexBuffer(0, *buffer, offsetof(BufferData, vertices)); - cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, *pipeline_layout, 0, - descriptor_sets[image_index], {}); - cmdbuf.Draw(4, 1, 0, 0); - cmdbuf.EndRenderPass(); - }); - return *semaphores[image_index]; + cmdbuf.BindVertexBuffer(0, *buffer, offsetof(BufferData, vertices)); + cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, *pipeline_layout, 0, + descriptor_sets[index], {}); + cmdbuf.Draw(4, 1, 0, 0); + cmdbuf.EndRenderPass(); + }); } -VkSemaphore BlitScreen::DrawToSwapchain(const Tegra::FramebufferConfig& framebuffer, - bool use_accelerated) { - const std::size_t image_index = swapchain.GetImageIndex(); - const VkExtent2D render_area = swapchain.GetSize(); +void BlitScreen::DrawToSwapchain(Frame* frame, const Tegra::FramebufferConfig& framebuffer, + bool use_accelerated, bool is_srgb) { + // Recreate dynamic resources if the the image count or colorspace changed + if (const std::size_t swapchain_images = swapchain.GetImageCount(); + swapchain_images != image_count || current_srgb != is_srgb) { + current_srgb = is_srgb; + image_view_format = current_srgb ? VK_FORMAT_B8G8R8A8_SRGB : VK_FORMAT_B8G8R8A8_UNORM; + image_count = swapchain_images; + Recreate(); + } + + // Recreate the presentation frame if the dimensions of the window changed const Layout::FramebufferLayout layout = render_window.GetFramebufferLayout(); - return Draw(framebuffer, *framebuffers[image_index], layout, render_area, use_accelerated); + if (layout.width != frame->width || layout.height != frame->height || + is_srgb != frame->is_srgb) { + scheduler.Finish(); + present_manager.RecreateFrame(frame, layout.width, layout.height, is_srgb, + image_view_format, *renderpass); + } + + const VkExtent2D render_area{frame->width, frame->height}; + Draw(framebuffer, *frame->framebuffer, layout, render_area, use_accelerated); + if (++image_index >= image_count) { + image_index = 0; + } } vk::Framebuffer BlitScreen::CreateFramebuffer(const VkImageView& image_view, VkExtent2D extent) { @@ -471,13 +487,11 @@ void BlitScreen::CreateStaticResources() { } void BlitScreen::CreateDynamicResources() { - CreateSemaphores(); CreateDescriptorPool(); CreateDescriptorSetLayout(); CreateDescriptorSets(); CreatePipelineLayout(); CreateRenderPass(); - CreateFramebuffers(); CreateGraphicsPipeline(); fsr.reset(); smaa.reset(); @@ -525,11 +539,6 @@ void BlitScreen::CreateShaders() { } } -void BlitScreen::CreateSemaphores() { - semaphores.resize(image_count); - std::ranges::generate(semaphores, [this] { return device.GetLogical().CreateSemaphore(); }); -} - void BlitScreen::CreateDescriptorPool() { const std::array pool_sizes{{ { @@ -571,10 +580,10 @@ void BlitScreen::CreateDescriptorPool() { } void BlitScreen::CreateRenderPass() { - renderpass = CreateRenderPassImpl(swapchain.GetImageViewFormat()); + renderpass = CreateRenderPassImpl(image_view_format); } -vk::RenderPass BlitScreen::CreateRenderPassImpl(VkFormat format, bool is_present) { +vk::RenderPass BlitScreen::CreateRenderPassImpl(VkFormat format) { const VkAttachmentDescription color_attachment{ .flags = 0, .format = format, @@ -584,7 +593,7 @@ vk::RenderPass BlitScreen::CreateRenderPassImpl(VkFormat format, bool is_present .stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE, .stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE, .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED, - .finalLayout = is_present ? VK_IMAGE_LAYOUT_PRESENT_SRC_KHR : VK_IMAGE_LAYOUT_GENERAL, + .finalLayout = VK_IMAGE_LAYOUT_GENERAL, }; const VkAttachmentReference color_attachment_ref{ @@ -1052,16 +1061,6 @@ void BlitScreen::CreateSampler() { nn_sampler = device.GetLogical().CreateSampler(ci_nn); } -void BlitScreen::CreateFramebuffers() { - const VkExtent2D size{swapchain.GetSize()}; - framebuffers.resize(image_count); - - for (std::size_t i = 0; i < image_count; ++i) { - const VkImageView image_view{swapchain.GetImageViewIndex(i)}; - framebuffers[i] = CreateFramebuffer(image_view, size, renderpass); - } -} - void BlitScreen::ReleaseRawImages() { for (const u64 tick : resource_ticks) { scheduler.Wait(tick); @@ -1175,7 +1174,7 @@ void BlitScreen::CreateRawImages(const Tegra::FramebufferConfig& framebuffer) { aa_framebuffer = CreateFramebuffer(*aa_image_view, size, aa_renderpass); return; } - aa_renderpass = CreateRenderPassImpl(GetFormat(framebuffer), false); + aa_renderpass = CreateRenderPassImpl(GetFormat(framebuffer)); aa_framebuffer = CreateFramebuffer(*aa_image_view, size, aa_renderpass); const std::array fxaa_shader_stages{{ @@ -1319,8 +1318,7 @@ void BlitScreen::CreateRawImages(const Tegra::FramebufferConfig& framebuffer) { aa_pipeline = device.GetLogical().CreateGraphicsPipeline(fxaa_pipeline_ci); } -void BlitScreen::UpdateAADescriptorSet(std::size_t image_index, VkImageView image_view, - bool nn) const { +void BlitScreen::UpdateAADescriptorSet(VkImageView image_view, bool nn) const { const VkDescriptorImageInfo image_info{ .sampler = nn ? *nn_sampler : *sampler, .imageView = image_view, @@ -1356,8 +1354,7 @@ void BlitScreen::UpdateAADescriptorSet(std::size_t image_index, VkImageView imag device.GetLogical().UpdateDescriptorSets(std::array{sampler_write, sampler_write_2}, {}); } -void BlitScreen::UpdateDescriptorSet(std::size_t image_index, VkImageView image_view, - bool nn) const { +void BlitScreen::UpdateDescriptorSet(VkImageView image_view, bool nn) const { const VkDescriptorBufferInfo buffer_info{ .buffer = *buffer, .offset = offsetof(BufferData, uniform), @@ -1480,8 +1477,7 @@ u64 BlitScreen::CalculateBufferSize(const Tegra::FramebufferConfig& framebuffer) return sizeof(BufferData) + GetSizeInBytes(framebuffer) * image_count; } -u64 BlitScreen::GetRawImageOffset(const Tegra::FramebufferConfig& framebuffer, - std::size_t image_index) const { +u64 BlitScreen::GetRawImageOffset(const Tegra::FramebufferConfig& framebuffer) const { constexpr auto first_image_offset = static_cast(sizeof(BufferData)); return first_image_offset + GetSizeInBytes(framebuffer) * image_index; } diff --git a/src/video_core/renderer_vulkan/vk_blit_screen.h b/src/video_core/renderer_vulkan/vk_blit_screen.h index ebe10b08b..68ec20253 100644 --- a/src/video_core/renderer_vulkan/vk_blit_screen.h +++ b/src/video_core/renderer_vulkan/vk_blit_screen.h @@ -5,6 +5,7 @@ #include +#include "core/frontend/framebuffer_layout.h" #include "video_core/vulkan_common/vulkan_memory_allocator.h" #include "video_core/vulkan_common/vulkan_wrapper.h" @@ -42,6 +43,9 @@ class RasterizerVulkan; class Scheduler; class SMAA; class Swapchain; +class PresentManager; + +struct Frame; struct ScreenInfo { VkImage image{}; @@ -55,18 +59,17 @@ class BlitScreen { public: explicit BlitScreen(Core::Memory::Memory& cpu_memory, Core::Frontend::EmuWindow& render_window, const Device& device, MemoryAllocator& memory_manager, Swapchain& swapchain, - Scheduler& scheduler, const ScreenInfo& screen_info); + PresentManager& present_manager, Scheduler& scheduler, + const ScreenInfo& screen_info); ~BlitScreen(); void Recreate(); - [[nodiscard]] VkSemaphore Draw(const Tegra::FramebufferConfig& framebuffer, - const VkFramebuffer& host_framebuffer, - const Layout::FramebufferLayout layout, VkExtent2D render_area, - bool use_accelerated); + void Draw(const Tegra::FramebufferConfig& framebuffer, const VkFramebuffer& host_framebuffer, + const Layout::FramebufferLayout layout, VkExtent2D render_area, bool use_accelerated); - [[nodiscard]] VkSemaphore DrawToSwapchain(const Tegra::FramebufferConfig& framebuffer, - bool use_accelerated); + void DrawToSwapchain(Frame* frame, const Tegra::FramebufferConfig& framebuffer, + bool use_accelerated, bool is_srgb); [[nodiscard]] vk::Framebuffer CreateFramebuffer(const VkImageView& image_view, VkExtent2D extent); @@ -79,10 +82,9 @@ private: void CreateStaticResources(); void CreateShaders(); - void CreateSemaphores(); void CreateDescriptorPool(); void CreateRenderPass(); - vk::RenderPass CreateRenderPassImpl(VkFormat, bool is_present = true); + vk::RenderPass CreateRenderPassImpl(VkFormat format); void CreateDescriptorSetLayout(); void CreateDescriptorSets(); void CreatePipelineLayout(); @@ -90,15 +92,14 @@ private: void CreateSampler(); void CreateDynamicResources(); - void CreateFramebuffers(); void RefreshResources(const Tegra::FramebufferConfig& framebuffer); void ReleaseRawImages(); void CreateStagingBuffer(const Tegra::FramebufferConfig& framebuffer); void CreateRawImages(const Tegra::FramebufferConfig& framebuffer); - void UpdateDescriptorSet(std::size_t image_index, VkImageView image_view, bool nn) const; - void UpdateAADescriptorSet(std::size_t image_index, VkImageView image_view, bool nn) const; + void UpdateDescriptorSet(VkImageView image_view, bool nn) const; + void UpdateAADescriptorSet(VkImageView image_view, bool nn) const; void SetUniformData(BufferData& data, const Layout::FramebufferLayout layout) const; void SetVertexData(BufferData& data, const Tegra::FramebufferConfig& framebuffer, const Layout::FramebufferLayout layout) const; @@ -107,16 +108,17 @@ private: void CreateFSR(); u64 CalculateBufferSize(const Tegra::FramebufferConfig& framebuffer) const; - u64 GetRawImageOffset(const Tegra::FramebufferConfig& framebuffer, - std::size_t image_index) const; + u64 GetRawImageOffset(const Tegra::FramebufferConfig& framebuffer) const; Core::Memory::Memory& cpu_memory; Core::Frontend::EmuWindow& render_window; const Device& device; MemoryAllocator& memory_allocator; Swapchain& swapchain; + PresentManager& present_manager; Scheduler& scheduler; std::size_t image_count; + std::size_t image_index{}; const ScreenInfo& screen_info; vk::ShaderModule vertex_shader; @@ -135,7 +137,6 @@ private: vk::Pipeline gaussian_pipeline; vk::Pipeline scaleforce_pipeline; vk::RenderPass renderpass; - std::vector framebuffers; vk::DescriptorSets descriptor_sets; vk::Sampler nn_sampler; vk::Sampler sampler; @@ -145,7 +146,6 @@ private: std::vector resource_ticks; - std::vector semaphores; std::vector raw_images; std::vector raw_image_views; std::vector raw_buffer_commits; @@ -164,6 +164,8 @@ private: u32 raw_width = 0; u32 raw_height = 0; Service::android::PixelFormat pixel_format{}; + bool current_srgb; + VkFormat image_view_format; std::unique_ptr fsr; std::unique_ptr smaa; diff --git a/src/video_core/renderer_vulkan/vk_present_manager.cpp b/src/video_core/renderer_vulkan/vk_present_manager.cpp new file mode 100644 index 000000000..0b8e8ad27 --- /dev/null +++ b/src/video_core/renderer_vulkan/vk_present_manager.cpp @@ -0,0 +1,440 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "common/microprofile.h" +#include "common/thread.h" +#include "video_core/renderer_vulkan/vk_present_manager.h" +#include "video_core/renderer_vulkan/vk_scheduler.h" +#include "video_core/renderer_vulkan/vk_swapchain.h" +#include "video_core/vulkan_common/vulkan_device.h" + +namespace Vulkan { + +MICROPROFILE_DEFINE(Vulkan_WaitPresent, "Vulkan", "Wait For Present", MP_RGB(128, 128, 128)); +MICROPROFILE_DEFINE(Vulkan_CopyToSwapchain, "Vulkan", "Copy to swapchain", MP_RGB(192, 255, 192)); + +namespace { + +bool CanBlitToSwapchain(const vk::PhysicalDevice& physical_device, VkFormat format) { + const VkFormatProperties props{physical_device.GetFormatProperties(format)}; + return (props.optimalTilingFeatures & VK_FORMAT_FEATURE_BLIT_DST_BIT); +} + +[[nodiscard]] VkImageSubresourceLayers MakeImageSubresourceLayers() { + return VkImageSubresourceLayers{ + .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, + .mipLevel = 0, + .baseArrayLayer = 0, + .layerCount = 1, + }; +} + +[[nodiscard]] VkImageBlit MakeImageBlit(s32 frame_width, s32 frame_height, s32 swapchain_width, + s32 swapchain_height) { + return VkImageBlit{ + .srcSubresource = MakeImageSubresourceLayers(), + .srcOffsets = + { + { + .x = 0, + .y = 0, + .z = 0, + }, + { + .x = frame_width, + .y = frame_height, + .z = 1, + }, + }, + .dstSubresource = MakeImageSubresourceLayers(), + .dstOffsets = + { + { + .x = 0, + .y = 0, + .z = 0, + }, + { + .x = swapchain_width, + .y = swapchain_height, + .z = 1, + }, + }, + }; +} + +[[nodiscard]] VkImageCopy MakeImageCopy(u32 frame_width, u32 frame_height, u32 swapchain_width, + u32 swapchain_height) { + return VkImageCopy{ + .srcSubresource = MakeImageSubresourceLayers(), + .srcOffset = + { + .x = 0, + .y = 0, + .z = 0, + }, + .dstSubresource = MakeImageSubresourceLayers(), + .dstOffset = + { + .x = 0, + .y = 0, + .z = 0, + }, + .extent = + { + .width = std::min(frame_width, swapchain_width), + .height = std::min(frame_height, swapchain_height), + .depth = 1, + }, + }; +} + +} // Anonymous namespace + +PresentManager::PresentManager(Core::Frontend::EmuWindow& render_window_, const Device& device_, + MemoryAllocator& memory_allocator_, Scheduler& scheduler_, + Swapchain& swapchain_) + : render_window{render_window_}, device{device_}, + memory_allocator{memory_allocator_}, scheduler{scheduler_}, swapchain{swapchain_}, + blit_supported{CanBlitToSwapchain(device.GetPhysical(), swapchain.GetImageViewFormat())}, + image_count{swapchain.GetImageCount()} { + + auto& dld = device.GetLogical(); + cmdpool = dld.CreateCommandPool({ + .sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, + .pNext = nullptr, + .flags = + VK_COMMAND_POOL_CREATE_TRANSIENT_BIT | VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, + .queueFamilyIndex = device.GetGraphicsFamily(), + }); + auto cmdbuffers = cmdpool.Allocate(image_count); + + frames.resize(image_count); + for (u32 i = 0; i < frames.size(); i++) { + Frame& frame = frames[i]; + frame.cmdbuf = vk::CommandBuffer{cmdbuffers[i], device.GetDispatchLoader()}; + frame.render_ready = dld.CreateSemaphore({ + .sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, + .pNext = nullptr, + .flags = 0, + }); + frame.present_done = dld.CreateFence({ + .sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, + .pNext = nullptr, + .flags = VK_FENCE_CREATE_SIGNALED_BIT, + }); + free_queue.push(&frame); + } + + present_thread = std::jthread([this](std::stop_token token) { PresentThread(token); }); +} + +PresentManager::~PresentManager() = default; + +Frame* PresentManager::GetRenderFrame() { + MICROPROFILE_SCOPE(Vulkan_WaitPresent); + + // Wait for free presentation frames + std::unique_lock lock{free_mutex}; + free_cv.wait(lock, [this] { return !free_queue.empty(); }); + + // Take the frame from the queue + Frame* frame = free_queue.front(); + free_queue.pop(); + + // Wait for the presentation to be finished so all frame resources are free + frame->present_done.Wait(); + frame->present_done.Reset(); + + return frame; +} + +void PresentManager::PushFrame(Frame* frame) { + std::unique_lock lock{queue_mutex}; + present_queue.push(frame); + frame_cv.notify_one(); +} + +void PresentManager::RecreateFrame(Frame* frame, u32 width, u32 height, bool is_srgb, + VkFormat image_view_format, VkRenderPass rd) { + auto& dld = device.GetLogical(); + + frame->width = width; + frame->height = height; + frame->is_srgb = is_srgb; + + frame->image = dld.CreateImage({ + .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, + .pNext = nullptr, + .flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT, + .imageType = VK_IMAGE_TYPE_2D, + .format = swapchain.GetImageFormat(), + .extent = + { + .width = width, + .height = height, + .depth = 1, + }, + .mipLevels = 1, + .arrayLayers = 1, + .samples = VK_SAMPLE_COUNT_1_BIT, + .tiling = VK_IMAGE_TILING_OPTIMAL, + .usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, + .sharingMode = VK_SHARING_MODE_EXCLUSIVE, + .queueFamilyIndexCount = 0, + .pQueueFamilyIndices = nullptr, + .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED, + }); + + frame->image_commit = memory_allocator.Commit(frame->image, MemoryUsage::DeviceLocal); + + frame->image_view = dld.CreateImageView({ + .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, + .pNext = nullptr, + .flags = 0, + .image = *frame->image, + .viewType = VK_IMAGE_VIEW_TYPE_2D, + .format = image_view_format, + .components = + { + .r = VK_COMPONENT_SWIZZLE_IDENTITY, + .g = VK_COMPONENT_SWIZZLE_IDENTITY, + .b = VK_COMPONENT_SWIZZLE_IDENTITY, + .a = VK_COMPONENT_SWIZZLE_IDENTITY, + }, + .subresourceRange = + { + .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, + .baseMipLevel = 0, + .levelCount = 1, + .baseArrayLayer = 0, + .layerCount = 1, + }, + }); + + const VkImageView image_view{*frame->image_view}; + frame->framebuffer = dld.CreateFramebuffer({ + .sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO, + .pNext = nullptr, + .flags = 0, + .renderPass = rd, + .attachmentCount = 1, + .pAttachments = &image_view, + .width = width, + .height = height, + .layers = 1, + }); +} + +void PresentManager::WaitPresent() { + // Wait for the present queue to be empty + { + std::unique_lock queue_lock{queue_mutex}; + frame_cv.wait(queue_lock, [this] { return present_queue.empty(); }); + } + + // The above condition will be satisfied when the last frame is taken from the queue. + // To ensure that frame has been presented as well take hold of the swapchain + // mutex. + std::scoped_lock swapchain_lock{swapchain_mutex}; +} + +void PresentManager::PresentThread(std::stop_token token) { + Common::SetCurrentThreadName("VulkanPresent"); + while (!token.stop_requested()) { + std::unique_lock lock{queue_mutex}; + + // Wait for presentation frames + Common::CondvarWait(frame_cv, lock, token, [this] { return !present_queue.empty(); }); + if (token.stop_requested()) { + return; + } + + // Take the frame and notify anyone waiting + Frame* frame = present_queue.front(); + present_queue.pop(); + frame_cv.notify_one(); + + // By exchanging the lock ownership we take the swapchain lock + // before the queue lock goes out of scope. This way the swapchain + // lock in WaitPresent is guaranteed to occur after here. + std::exchange(lock, std::unique_lock{swapchain_mutex}); + + CopyToSwapchain(frame); + + // Free the frame for reuse + std::scoped_lock fl{free_mutex}; + free_queue.push(frame); + free_cv.notify_one(); + } +} + +void PresentManager::CopyToSwapchain(Frame* frame) { + MICROPROFILE_SCOPE(Vulkan_CopyToSwapchain); + + const auto recreate_swapchain = [&] { + swapchain.Create(frame->width, frame->height, frame->is_srgb); + image_count = swapchain.GetImageCount(); + }; + + // If the size or colorspace of the incoming frames has changed, recreate the swapchain + // to account for that. + const bool srgb_changed = swapchain.NeedsRecreation(frame->is_srgb); + const bool size_changed = + swapchain.GetWidth() != frame->width || swapchain.GetHeight() != frame->height; + if (srgb_changed || size_changed) { + recreate_swapchain(); + } + + while (swapchain.AcquireNextImage()) { + recreate_swapchain(); + } + + const vk::CommandBuffer cmdbuf{frame->cmdbuf}; + cmdbuf.Begin({ + .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, + .pNext = nullptr, + .flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, + .pInheritanceInfo = nullptr, + }); + + const VkImage image{swapchain.CurrentImage()}; + const VkExtent2D extent = swapchain.GetExtent(); + const std::array pre_barriers{ + VkImageMemoryBarrier{ + .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, + .pNext = nullptr, + .srcAccessMask = 0, + .dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT, + .oldLayout = VK_IMAGE_LAYOUT_UNDEFINED, + .newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .image = image, + .subresourceRange{ + .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, + .baseMipLevel = 0, + .levelCount = 1, + .baseArrayLayer = 0, + .layerCount = VK_REMAINING_ARRAY_LAYERS, + }, + }, + VkImageMemoryBarrier{ + .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, + .pNext = nullptr, + .srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, + .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT, + .oldLayout = VK_IMAGE_LAYOUT_GENERAL, + .newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .image = *frame->image, + .subresourceRange{ + .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, + .baseMipLevel = 0, + .levelCount = 1, + .baseArrayLayer = 0, + .layerCount = VK_REMAINING_ARRAY_LAYERS, + }, + }, + }; + const std::array post_barriers{ + VkImageMemoryBarrier{ + .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, + .pNext = nullptr, + .srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT, + .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT, + .oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + .newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, + .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .image = image, + .subresourceRange{ + .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, + .baseMipLevel = 0, + .levelCount = 1, + .baseArrayLayer = 0, + .layerCount = VK_REMAINING_ARRAY_LAYERS, + }, + }, + VkImageMemoryBarrier{ + .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, + .pNext = nullptr, + .srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT, + .dstAccessMask = VK_ACCESS_MEMORY_WRITE_BIT, + .oldLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + .newLayout = VK_IMAGE_LAYOUT_GENERAL, + .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, + .image = *frame->image, + .subresourceRange{ + .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, + .baseMipLevel = 0, + .levelCount = 1, + .baseArrayLayer = 0, + .layerCount = VK_REMAINING_ARRAY_LAYERS, + }, + }, + }; + + cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, {}, + {}, {}, pre_barriers); + + if (blit_supported) { + cmdbuf.BlitImage(*frame->image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, image, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + MakeImageBlit(frame->width, frame->height, extent.width, extent.height), + VK_FILTER_LINEAR); + } else { + cmdbuf.CopyImage(*frame->image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, image, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + MakeImageCopy(frame->width, frame->height, extent.width, extent.height)); + } + + cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, {}, + {}, {}, post_barriers); + + cmdbuf.End(); + + const VkSemaphore present_semaphore = swapchain.CurrentPresentSemaphore(); + const VkSemaphore render_semaphore = swapchain.CurrentRenderSemaphore(); + const std::array wait_semaphores = {present_semaphore, *frame->render_ready}; + + static constexpr std::array wait_stage_masks{ + VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + }; + + const VkSubmitInfo submit_info{ + .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, + .pNext = nullptr, + .waitSemaphoreCount = 2U, + .pWaitSemaphores = wait_semaphores.data(), + .pWaitDstStageMask = wait_stage_masks.data(), + .commandBufferCount = 1, + .pCommandBuffers = cmdbuf.address(), + .signalSemaphoreCount = 1U, + .pSignalSemaphores = &render_semaphore, + }; + + // Submit the image copy/blit to the swapchain + { + std::scoped_lock lock{scheduler.submit_mutex}; + switch (const VkResult result = + device.GetGraphicsQueue().Submit(submit_info, *frame->present_done)) { + case VK_SUCCESS: + break; + case VK_ERROR_DEVICE_LOST: + device.ReportLoss(); + [[fallthrough]]; + default: + vk::Check(result); + break; + } + } + + // Present + swapchain.Present(render_semaphore); +} + +} // namespace Vulkan diff --git a/src/video_core/renderer_vulkan/vk_present_manager.h b/src/video_core/renderer_vulkan/vk_present_manager.h new file mode 100644 index 000000000..f5d9fc96d --- /dev/null +++ b/src/video_core/renderer_vulkan/vk_present_manager.h @@ -0,0 +1,82 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include +#include +#include + +#include "common/common_types.h" +#include "common/polyfill_thread.h" +#include "video_core/vulkan_common/vulkan_memory_allocator.h" +#include "video_core/vulkan_common/vulkan_wrapper.h" + +namespace Core::Frontend { +class EmuWindow; +} // namespace Core::Frontend + +namespace Vulkan { + +class Device; +class Scheduler; +class Swapchain; + +struct Frame { + u32 width; + u32 height; + bool is_srgb; + vk::Image image; + vk::ImageView image_view; + vk::Framebuffer framebuffer; + MemoryCommit image_commit; + vk::CommandBuffer cmdbuf; + vk::Semaphore render_ready; + vk::Fence present_done; +}; + +class PresentManager { +public: + PresentManager(Core::Frontend::EmuWindow& render_window, const Device& device, + MemoryAllocator& memory_allocator, Scheduler& scheduler, Swapchain& swapchain); + ~PresentManager(); + + /// Returns the last used presentation frame + Frame* GetRenderFrame(); + + /// Pushes a frame for presentation + void PushFrame(Frame* frame); + + /// Recreates the present frame to match the provided parameters + void RecreateFrame(Frame* frame, u32 width, u32 height, bool is_srgb, + VkFormat image_view_format, VkRenderPass rd); + + /// Waits for the present thread to finish presenting all queued frames. + void WaitPresent(); + +private: + void PresentThread(std::stop_token token); + + void CopyToSwapchain(Frame* frame); + +private: + Core::Frontend::EmuWindow& render_window; + const Device& device; + MemoryAllocator& memory_allocator; + Scheduler& scheduler; + Swapchain& swapchain; + vk::CommandPool cmdpool; + std::vector frames; + std::queue present_queue; + std::queue free_queue; + std::condition_variable_any frame_cv; + std::condition_variable free_cv; + std::mutex swapchain_mutex; + std::mutex queue_mutex; + std::mutex free_mutex; + std::jthread present_thread; + bool blit_supported{}; + std::size_t image_count; +}; + +} // namespace Vulkan diff --git a/src/video_core/renderer_vulkan/vk_scheduler.cpp b/src/video_core/renderer_vulkan/vk_scheduler.cpp index 057e16967..80455ec08 100644 --- a/src/video_core/renderer_vulkan/vk_scheduler.cpp +++ b/src/video_core/renderer_vulkan/vk_scheduler.cpp @@ -46,10 +46,11 @@ Scheduler::Scheduler(const Device& device_, StateTracker& state_tracker_) Scheduler::~Scheduler() = default; -void Scheduler::Flush(VkSemaphore signal_semaphore, VkSemaphore wait_semaphore) { +u64 Scheduler::Flush(VkSemaphore signal_semaphore, VkSemaphore wait_semaphore) { // When flushing, we only send data to the worker thread; no waiting is necessary. - SubmitExecution(signal_semaphore, wait_semaphore); + const u64 signal_value = SubmitExecution(signal_semaphore, wait_semaphore); AllocateNewContext(); + return signal_value; } void Scheduler::Finish(VkSemaphore signal_semaphore, VkSemaphore wait_semaphore) { @@ -205,7 +206,7 @@ void Scheduler::AllocateWorkerCommandBuffer() { }); } -void Scheduler::SubmitExecution(VkSemaphore signal_semaphore, VkSemaphore wait_semaphore) { +u64 Scheduler::SubmitExecution(VkSemaphore signal_semaphore, VkSemaphore wait_semaphore) { EndPendingOperations(); InvalidateState(); @@ -217,6 +218,7 @@ void Scheduler::SubmitExecution(VkSemaphore signal_semaphore, VkSemaphore wait_s on_submit(); } + std::scoped_lock lock{submit_mutex}; switch (const VkResult result = master_semaphore->SubmitQueue( cmdbuf, signal_semaphore, wait_semaphore, signal_value)) { case VK_SUCCESS: @@ -231,6 +233,7 @@ void Scheduler::SubmitExecution(VkSemaphore signal_semaphore, VkSemaphore wait_s }); chunk->MarkSubmit(); DispatchWork(); + return signal_value; } void Scheduler::AllocateNewContext() { diff --git a/src/video_core/renderer_vulkan/vk_scheduler.h b/src/video_core/renderer_vulkan/vk_scheduler.h index 8d75ce987..475c682eb 100644 --- a/src/video_core/renderer_vulkan/vk_scheduler.h +++ b/src/video_core/renderer_vulkan/vk_scheduler.h @@ -34,7 +34,7 @@ public: ~Scheduler(); /// Sends the current execution context to the GPU. - void Flush(VkSemaphore signal_semaphore = nullptr, VkSemaphore wait_semaphore = nullptr); + u64 Flush(VkSemaphore signal_semaphore = nullptr, VkSemaphore wait_semaphore = nullptr); /// Sends the current execution context to the GPU and waits for it to complete. void Finish(VkSemaphore signal_semaphore = nullptr, VkSemaphore wait_semaphore = nullptr); @@ -106,6 +106,8 @@ public: return *master_semaphore; } + std::mutex submit_mutex; + private: class Command { public: @@ -201,7 +203,7 @@ private: void AllocateWorkerCommandBuffer(); - void SubmitExecution(VkSemaphore signal_semaphore, VkSemaphore wait_semaphore); + u64 SubmitExecution(VkSemaphore signal_semaphore, VkSemaphore wait_semaphore); void AllocateNewContext(); diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp index b1465e35c..23bbea7f1 100644 --- a/src/video_core/renderer_vulkan/vk_swapchain.cpp +++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp @@ -99,18 +99,16 @@ void Swapchain::Create(u32 width_, u32 height_, bool srgb) { return; } - device.GetLogical().WaitIdle(); Destroy(); CreateSwapchain(capabilities, srgb); CreateSemaphores(); - CreateImageViews(); resource_ticks.clear(); resource_ticks.resize(image_count); } -void Swapchain::AcquireNextImage() { +bool Swapchain::AcquireNextImage() { const VkResult result = device.GetLogical().AcquireNextImageKHR( *swapchain, std::numeric_limits::max(), *present_semaphores[frame_index], VK_NULL_HANDLE, &image_index); @@ -127,8 +125,11 @@ void Swapchain::AcquireNextImage() { LOG_ERROR(Render_Vulkan, "vkAcquireNextImageKHR returned {}", vk::ToString(result)); break; } + scheduler.Wait(resource_ticks[image_index]); resource_ticks[image_index] = scheduler.CurrentTick(); + + return is_suboptimal || is_outdated; } void Swapchain::Present(VkSemaphore render_semaphore) { @@ -143,6 +144,7 @@ void Swapchain::Present(VkSemaphore render_semaphore) { .pImageIndices = &image_index, .pResults = nullptr, }; + std::scoped_lock lock{scheduler.submit_mutex}; switch (const VkResult result = present_queue.Present(present_info)) { case VK_SUCCESS: break; @@ -168,7 +170,7 @@ void Swapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities, bo const auto present_modes{physical_device.GetSurfacePresentModesKHR(surface)}; const VkCompositeAlphaFlagBitsKHR alpha_flags{ChooseAlphaFlags(capabilities)}; - const VkSurfaceFormatKHR surface_format{ChooseSwapSurfaceFormat(formats)}; + surface_format = ChooseSwapSurfaceFormat(formats); present_mode = ChooseSwapPresentMode(present_modes); u32 requested_image_count{capabilities.minImageCount + 1}; @@ -193,7 +195,7 @@ void Swapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities, bo .imageColorSpace = surface_format.colorSpace, .imageExtent = {}, .imageArrayLayers = 1, - .imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, + .imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT, .imageSharingMode = VK_SHARING_MODE_EXCLUSIVE, .queueFamilyIndexCount = 0, .pQueueFamilyIndices = nullptr, @@ -241,45 +243,14 @@ void Swapchain::CreateSemaphores() { present_semaphores.resize(image_count); std::ranges::generate(present_semaphores, [this] { return device.GetLogical().CreateSemaphore(); }); -} - -void Swapchain::CreateImageViews() { - VkImageViewCreateInfo ci{ - .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, - .pNext = nullptr, - .flags = 0, - .image = {}, - .viewType = VK_IMAGE_VIEW_TYPE_2D, - .format = image_view_format, - .components = - { - .r = VK_COMPONENT_SWIZZLE_IDENTITY, - .g = VK_COMPONENT_SWIZZLE_IDENTITY, - .b = VK_COMPONENT_SWIZZLE_IDENTITY, - .a = VK_COMPONENT_SWIZZLE_IDENTITY, - }, - .subresourceRange = - { - .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, - .baseMipLevel = 0, - .levelCount = 1, - .baseArrayLayer = 0, - .layerCount = 1, - }, - }; - - image_views.resize(image_count); - for (std::size_t i = 0; i < image_count; i++) { - ci.image = images[i]; - image_views[i] = device.GetLogical().CreateImageView(ci); - } + render_semaphores.resize(image_count); + std::ranges::generate(render_semaphores, + [this] { return device.GetLogical().CreateSemaphore(); }); } void Swapchain::Destroy() { frame_index = 0; present_semaphores.clear(); - framebuffers.clear(); - image_views.clear(); swapchain.reset(); } diff --git a/src/video_core/renderer_vulkan/vk_swapchain.h b/src/video_core/renderer_vulkan/vk_swapchain.h index caf1ff32b..419742586 100644 --- a/src/video_core/renderer_vulkan/vk_swapchain.h +++ b/src/video_core/renderer_vulkan/vk_swapchain.h @@ -27,7 +27,7 @@ public: void Create(u32 width, u32 height, bool srgb); /// Acquires the next image in the swapchain, waits as needed. - void AcquireNextImage(); + bool AcquireNextImage(); /// Presents the rendered image to the swapchain. void Present(VkSemaphore render_semaphore); @@ -52,6 +52,11 @@ public: return is_suboptimal; } + /// Returns true when the swapchain format is in the srgb color space + bool IsSrgb() const { + return current_srgb; + } + VkExtent2D GetSize() const { return extent; } @@ -64,22 +69,34 @@ public: return image_index; } + std::size_t GetFrameIndex() const { + return frame_index; + } + VkImage GetImageIndex(std::size_t index) const { return images[index]; } - VkImageView GetImageViewIndex(std::size_t index) const { - return *image_views[index]; + VkImage CurrentImage() const { + return images[image_index]; } VkFormat GetImageViewFormat() const { return image_view_format; } + VkFormat GetImageFormat() const { + return surface_format.format; + } + VkSemaphore CurrentPresentSemaphore() const { return *present_semaphores[frame_index]; } + VkSemaphore CurrentRenderSemaphore() const { + return *render_semaphores[frame_index]; + } + u32 GetWidth() const { return width; } @@ -88,6 +105,10 @@ public: return height; } + VkExtent2D GetExtent() const { + return extent; + } + private: void CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities, bool srgb); void CreateSemaphores(); @@ -107,10 +128,9 @@ private: std::size_t image_count{}; std::vector images; - std::vector image_views; - std::vector framebuffers; std::vector resource_ticks; std::vector present_semaphores; + std::vector render_semaphores; u32 width; u32 height; @@ -121,6 +141,7 @@ private: VkFormat image_view_format{}; VkExtent2D extent{}; VkPresentModeKHR present_mode{}; + VkSurfaceFormatKHR surface_format{}; bool current_srgb{}; bool current_fps_unlocked{}; From 50791cb974e462c97dc133a619ddc2066961b526 Mon Sep 17 00:00:00 2001 From: GPUCode Date: Sat, 8 Apr 2023 21:53:13 +0300 Subject: [PATCH 0300/1181] renderer_vulkan: Fix crashing when updating descriptors * During pipeline configure the function would acquire some payload space from the descriptor update queue, write the descriptor data on the GPU thread and give the scheduler a pointer to the beginning of said space to update it later. TickFrame resets the payload cursor, used to track acquires, back to the beginning of the buffer. This wasn't a problem before since WaitWorker was called at the end of the frame but now it is. If a frame writes to a cursor before the scheduler catches up, it will crash * To fix this the payload buffer has been increased to account for the in flight frames that are allowed to exist now. TickFrame will switch between the payload spaces instead of resetting --- .../renderer_vulkan/vk_update_descriptor.cpp | 11 ++++++++--- src/video_core/renderer_vulkan/vk_update_descriptor.h | 10 +++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_update_descriptor.cpp b/src/video_core/renderer_vulkan/vk_update_descriptor.cpp index 009dab0b6..0630ebda5 100644 --- a/src/video_core/renderer_vulkan/vk_update_descriptor.cpp +++ b/src/video_core/renderer_vulkan/vk_update_descriptor.cpp @@ -14,13 +14,18 @@ namespace Vulkan { UpdateDescriptorQueue::UpdateDescriptorQueue(const Device& device_, Scheduler& scheduler_) : device{device_}, scheduler{scheduler_} { + payload_start = payload.data(); payload_cursor = payload.data(); } UpdateDescriptorQueue::~UpdateDescriptorQueue() = default; void UpdateDescriptorQueue::TickFrame() { - payload_cursor = payload.data(); + if (++frame_index >= FRAMES_IN_FLIGHT) { + frame_index = 0; + } + payload_start = payload.data() + frame_index * FRAME_PAYLOAD_SIZE; + payload_cursor = payload_start; } void UpdateDescriptorQueue::Acquire() { @@ -28,10 +33,10 @@ void UpdateDescriptorQueue::Acquire() { // This is the maximum number of entries a single draw call might use. static constexpr size_t MIN_ENTRIES = 0x400; - if (std::distance(payload.data(), payload_cursor) + MIN_ENTRIES >= payload.max_size()) { + if (std::distance(payload_start, payload_cursor) + MIN_ENTRIES >= FRAME_PAYLOAD_SIZE) { LOG_WARNING(Render_Vulkan, "Payload overflow, waiting for worker thread"); scheduler.WaitWorker(); - payload_cursor = payload.data(); + payload_cursor = payload_start; } upload_start = payload_cursor; } diff --git a/src/video_core/renderer_vulkan/vk_update_descriptor.h b/src/video_core/renderer_vulkan/vk_update_descriptor.h index 625bcc809..1c1a7020b 100644 --- a/src/video_core/renderer_vulkan/vk_update_descriptor.h +++ b/src/video_core/renderer_vulkan/vk_update_descriptor.h @@ -29,6 +29,12 @@ struct DescriptorUpdateEntry { }; class UpdateDescriptorQueue final { + // This should be plenty for the vast majority of cases. Most desktop platforms only + // provide up to 3 swapchain images. + static constexpr size_t FRAMES_IN_FLIGHT = 5; + static constexpr size_t FRAME_PAYLOAD_SIZE = 0x10000; + static constexpr size_t PAYLOAD_SIZE = FRAME_PAYLOAD_SIZE * FRAMES_IN_FLIGHT; + public: explicit UpdateDescriptorQueue(const Device& device_, Scheduler& scheduler_); ~UpdateDescriptorQueue(); @@ -73,9 +79,11 @@ private: const Device& device; Scheduler& scheduler; + size_t frame_index{0}; DescriptorUpdateEntry* payload_cursor = nullptr; + DescriptorUpdateEntry* payload_start = nullptr; const DescriptorUpdateEntry* upload_start = nullptr; - std::array payload; + std::array payload; }; } // namespace Vulkan From 1d7abac84be5652ba4fc5d9b7ebc006f425bb4fe Mon Sep 17 00:00:00 2001 From: GPUCode Date: Mon, 10 Apr 2023 15:26:59 +0300 Subject: [PATCH 0301/1181] vk_blit_screen: Recreate FSR when frame is recreated * Depends on the layout dimentions and thus should be recreated as well --- src/video_core/renderer_vulkan/vk_blit_screen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video_core/renderer_vulkan/vk_blit_screen.cpp b/src/video_core/renderer_vulkan/vk_blit_screen.cpp index 4e8ce3ec7..1e0fdd3d9 100644 --- a/src/video_core/renderer_vulkan/vk_blit_screen.cpp +++ b/src/video_core/renderer_vulkan/vk_blit_screen.cpp @@ -450,7 +450,7 @@ void BlitScreen::DrawToSwapchain(Frame* frame, const Tegra::FramebufferConfig& f const Layout::FramebufferLayout layout = render_window.GetFramebufferLayout(); if (layout.width != frame->width || layout.height != frame->height || is_srgb != frame->is_srgb) { - scheduler.Finish(); + Recreate(); present_manager.RecreateFrame(frame, layout.width, layout.height, is_srgb, image_view_format, *renderpass); } From f403d2794187bd136fb4d30fb7a6aea950145013 Mon Sep 17 00:00:00 2001 From: GPUCode Date: Mon, 1 May 2023 23:12:28 +0300 Subject: [PATCH 0302/1181] vk_present_manager: Add toggle for async presentation --- src/common/settings.cpp | 1 + src/common/settings.h | 1 + .../renderer_vulkan/vk_present_manager.cpp | 16 +++++++++++++++- .../renderer_vulkan/vk_present_manager.h | 3 ++- src/yuzu/configuration/config.cpp | 2 ++ .../configure_graphics_advanced.cpp | 7 +++++++ .../configuration/configure_graphics_advanced.h | 1 + .../configuration/configure_graphics_advanced.ui | 15 +++++++++++---- src/yuzu_cmd/config.cpp | 1 + src/yuzu_cmd/default_ini.h | 4 ++++ 10 files changed, 45 insertions(+), 6 deletions(-) diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 84955030b..77ff21128 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -205,6 +205,7 @@ void RestoreGlobalState(bool is_powered_on) { // Renderer values.fsr_sharpening_slider.SetGlobal(true); values.renderer_backend.SetGlobal(true); + values.async_presentation.SetGlobal(true); values.renderer_force_max_clock.SetGlobal(true); values.vulkan_device.SetGlobal(true); values.fullscreen_mode.SetGlobal(true); diff --git a/src/common/settings.h b/src/common/settings.h index b77a1580a..5379d0dd5 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -422,6 +422,7 @@ struct Values { // Renderer SwitchableSetting renderer_backend{ RendererBackend::Vulkan, RendererBackend::OpenGL, RendererBackend::Null, "backend"}; + SwitchableSetting async_presentation{false, "async_presentation"}; SwitchableSetting renderer_force_max_clock{false, "force_max_clock"}; Setting renderer_debug{false, "debug"}; Setting renderer_shader_feedback{false, "shader_feedback"}; diff --git a/src/video_core/renderer_vulkan/vk_present_manager.cpp b/src/video_core/renderer_vulkan/vk_present_manager.cpp index 0b8e8ad27..a137c66f2 100644 --- a/src/video_core/renderer_vulkan/vk_present_manager.cpp +++ b/src/video_core/renderer_vulkan/vk_present_manager.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/microprofile.h" +#include "common/settings.h" #include "common/thread.h" #include "video_core/renderer_vulkan/vk_present_manager.h" #include "video_core/renderer_vulkan/vk_scheduler.h" @@ -97,6 +98,7 @@ PresentManager::PresentManager(Core::Frontend::EmuWindow& render_window_, const : render_window{render_window_}, device{device_}, memory_allocator{memory_allocator_}, scheduler{scheduler_}, swapchain{swapchain_}, blit_supported{CanBlitToSwapchain(device.GetPhysical(), swapchain.GetImageViewFormat())}, + use_present_thread{Settings::values.async_presentation.GetValue()}, image_count{swapchain.GetImageCount()} { auto& dld = device.GetLogical(); @@ -126,7 +128,9 @@ PresentManager::PresentManager(Core::Frontend::EmuWindow& render_window_, const free_queue.push(&frame); } - present_thread = std::jthread([this](std::stop_token token) { PresentThread(token); }); + if (use_present_thread) { + present_thread = std::jthread([this](std::stop_token token) { PresentThread(token); }); + } } PresentManager::~PresentManager() = default; @@ -150,6 +154,12 @@ Frame* PresentManager::GetRenderFrame() { } void PresentManager::PushFrame(Frame* frame) { + if (!use_present_thread) { + CopyToSwapchain(frame); + free_queue.push(frame); + return; + } + std::unique_lock lock{queue_mutex}; present_queue.push(frame); frame_cv.notify_one(); @@ -227,6 +237,10 @@ void PresentManager::RecreateFrame(Frame* frame, u32 width, u32 height, bool is_ } void PresentManager::WaitPresent() { + if (!use_present_thread) { + return; + } + // Wait for the present queue to be empty { std::unique_lock queue_lock{queue_mutex}; diff --git a/src/video_core/renderer_vulkan/vk_present_manager.h b/src/video_core/renderer_vulkan/vk_present_manager.h index f5d9fc96d..9885fd7c6 100644 --- a/src/video_core/renderer_vulkan/vk_present_manager.h +++ b/src/video_core/renderer_vulkan/vk_present_manager.h @@ -75,7 +75,8 @@ private: std::mutex queue_mutex; std::mutex free_mutex; std::jthread present_thread; - bool blit_supported{}; + bool blit_supported; + bool use_present_thread; std::size_t image_count; }; diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index bb731276e..305891d18 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -692,6 +692,7 @@ void Config::ReadRendererValues() { qt_config->beginGroup(QStringLiteral("Renderer")); ReadGlobalSetting(Settings::values.renderer_backend); + ReadGlobalSetting(Settings::values.async_presentation); ReadGlobalSetting(Settings::values.renderer_force_max_clock); ReadGlobalSetting(Settings::values.vulkan_device); ReadGlobalSetting(Settings::values.fullscreen_mode); @@ -1313,6 +1314,7 @@ void Config::SaveRendererValues() { static_cast(Settings::values.renderer_backend.GetValue(global)), static_cast(Settings::values.renderer_backend.GetDefault()), Settings::values.renderer_backend.UsingGlobal()); + WriteGlobalSetting(Settings::values.async_presentation); WriteGlobalSetting(Settings::values.renderer_force_max_clock); WriteGlobalSetting(Settings::values.vulkan_device); WriteSetting(QString::fromStdString(Settings::values.fullscreen_mode.GetLabel()), diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp index 59fb1b334..7f7bf0e4d 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.cpp +++ b/src/yuzu/configuration/configure_graphics_advanced.cpp @@ -22,11 +22,13 @@ ConfigureGraphicsAdvanced::~ConfigureGraphicsAdvanced() = default; void ConfigureGraphicsAdvanced::SetConfiguration() { const bool runtime_lock = !system.IsPoweredOn(); ui->use_vsync->setEnabled(runtime_lock); + ui->async_present->setEnabled(runtime_lock); ui->renderer_force_max_clock->setEnabled(runtime_lock); ui->async_astc->setEnabled(runtime_lock); ui->use_asynchronous_shaders->setEnabled(runtime_lock); ui->anisotropic_filtering_combobox->setEnabled(runtime_lock); + ui->async_present->setChecked(Settings::values.async_presentation.GetValue()); ui->renderer_force_max_clock->setChecked(Settings::values.renderer_force_max_clock.GetValue()); ui->use_vsync->setChecked(Settings::values.use_vsync.GetValue()); ui->async_astc->setChecked(Settings::values.async_astc.GetValue()); @@ -54,6 +56,8 @@ void ConfigureGraphicsAdvanced::SetConfiguration() { void ConfigureGraphicsAdvanced::ApplyConfiguration() { ConfigurationShared::ApplyPerGameSetting(&Settings::values.gpu_accuracy, ui->gpu_accuracy); + ConfigurationShared::ApplyPerGameSetting(&Settings::values.async_presentation, + ui->async_present, async_present); ConfigurationShared::ApplyPerGameSetting(&Settings::values.renderer_force_max_clock, ui->renderer_force_max_clock, renderer_force_max_clock); @@ -90,6 +94,7 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { // Disable if not global (only happens during game) if (Settings::IsConfiguringGlobal()) { ui->gpu_accuracy->setEnabled(Settings::values.gpu_accuracy.UsingGlobal()); + ui->async_present->setEnabled(Settings::values.async_presentation.UsingGlobal()); ui->renderer_force_max_clock->setEnabled( Settings::values.renderer_force_max_clock.UsingGlobal()); ui->use_vsync->setEnabled(Settings::values.use_vsync.UsingGlobal()); @@ -107,6 +112,8 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { return; } + ConfigurationShared::SetColoredTristate(ui->async_present, Settings::values.async_presentation, + async_present); ConfigurationShared::SetColoredTristate(ui->renderer_force_max_clock, Settings::values.renderer_force_max_clock, renderer_force_max_clock); diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.h index bf1b04749..5394ed40a 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.h +++ b/src/yuzu/configuration/configure_graphics_advanced.h @@ -36,6 +36,7 @@ private: std::unique_ptr ui; + ConfigurationShared::CheckState async_present; ConfigurationShared::CheckState renderer_force_max_clock; ConfigurationShared::CheckState use_vsync; ConfigurationShared::CheckState async_astc; diff --git a/src/yuzu/configuration/configure_graphics_advanced.ui b/src/yuzu/configuration/configure_graphics_advanced.ui index a7dbdc18c..d7ec18939 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.ui +++ b/src/yuzu/configuration/configure_graphics_advanced.ui @@ -7,7 +7,7 @@ 0 0 404 - 321 + 376 @@ -69,6 +69,13 @@ + + + + Enable asynchronous presentation (Vulkan only) + + + @@ -112,7 +119,7 @@ - Enables Fast GPU Time. This option will force most games to run at their highest native resolution. + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Use Fast GPU Time (Hack) @@ -122,7 +129,7 @@ - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. Use pessimistic buffer flushes (Hack) @@ -132,7 +139,7 @@ - Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. Use Vulkan pipeline cache diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 464da3231..fa347fb8c 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -300,6 +300,7 @@ void Config::ReadValues() { // Renderer ReadSetting("Renderer", Settings::values.renderer_backend); + ReadSetting("Renderer", Settings::values.async_presentation); ReadSetting("Renderer", Settings::values.renderer_force_max_clock); ReadSetting("Renderer", Settings::values.renderer_debug); ReadSetting("Renderer", Settings::values.renderer_shader_feedback); diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 209cfc28a..c0c89fbb9 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -264,6 +264,10 @@ cpuopt_unsafe_ignore_global_monitor = # 0: OpenGL, 1 (default): Vulkan backend = +# Whether to enable asynchronous presentation (Vulkan only) +# 0 (default): Off, 1: On +async_presentation = + # Enable graphics API debugging mode. # 0 (default): Disabled, 1: Enabled debug = From 2007d0e4a0ad730415567df47fd700c63e2ac0ed Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Tue, 2 May 2023 01:57:22 -0400 Subject: [PATCH 0303/1181] CMakeLists: Enable checks on Clang Enables shadow-uncaptured-locals and implicit-fallthrough for Clang. implicit-fallthrough is not enabled by default in -Wall or -Wextra, and shadow-uncaptured-local doesn't seem to be enabled by default by -Wshadow, even though GCC has both of these by their respective cases. --- src/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 312a49f42..48ddbef9d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -113,6 +113,8 @@ else() $<$:-Wno-braced-scalar-init> $<$:-Wno-unused-private-field> + $<$:-Werror=shadow-uncaptured-local> + $<$:-Werror=implicit-fallthrough> $<$:-Wno-braced-scalar-init> $<$:-Wno-unused-private-field> ) From f7292c776bb851b5d85e83c057890ad5186e3cff Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Tue, 2 May 2023 02:07:36 -0400 Subject: [PATCH 0304/1181] CMake: Enable type limits on Clang --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 48ddbef9d..5e3a74c0f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -115,6 +115,7 @@ else() $<$:-Wno-unused-private-field> $<$:-Werror=shadow-uncaptured-local> $<$:-Werror=implicit-fallthrough> + $<$:-Werror=type-limits> $<$:-Wno-braced-scalar-init> $<$:-Wno-unused-private-field> ) From e1c74cea10591d1e9fba9353d20f3929ec41d4f0 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 2 May 2023 18:05:30 -0400 Subject: [PATCH 0305/1181] video_core: fix build on Apple Clang --- src/video_core/buffer_cache/buffer_cache.h | 2 +- src/video_core/buffer_cache/memory_tracker_base.h | 6 ++++-- src/video_core/texture_cache/texture_cache.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 7975564b5..e534e1e9c 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -1426,7 +1426,7 @@ bool BufferCache

::SynchronizeBufferNoModified(Buffer& buffer, VAddr cpu_addr, .size = sub_size, }); total_size_bytes += sub_size; - largest_copy = std::max(largest_copy, sub_size); + largest_copy = std::max(largest_copy, sub_size); } const std::span copies_span(copies.data(), copies.size()); UploadMemory(buffer, total_size_bytes, largest_copy, copies_span); diff --git a/src/video_core/buffer_cache/memory_tracker_base.h b/src/video_core/buffer_cache/memory_tracker_base.h index 4bc59017f..dc4ebfcaa 100644 --- a/src/video_core/buffer_cache/memory_tracker_base.h +++ b/src/video_core/buffer_cache/memory_tracker_base.h @@ -170,7 +170,8 @@ private: std::size_t page_index{cpu_address >> HIGHER_PAGE_BITS}; u64 page_offset{cpu_address & HIGHER_PAGE_MASK}; while (remaining_size > 0) { - const std::size_t copy_amount{std::min(HIGHER_PAGE_SIZE - page_offset, remaining_size)}; + const std::size_t copy_amount{ + std::min(HIGHER_PAGE_SIZE - page_offset, remaining_size)}; auto* manager{top_tier[page_index]}; if (manager) { if constexpr (BOOL_BREAK) { @@ -206,7 +207,8 @@ private: u64 begin = std::numeric_limits::max(); u64 end = 0; while (remaining_size > 0) { - const std::size_t copy_amount{std::min(HIGHER_PAGE_SIZE - page_offset, remaining_size)}; + const std::size_t copy_amount{ + std::min(HIGHER_PAGE_SIZE - page_offset, remaining_size)}; auto* manager{top_tier[page_index]}; const auto execute = [&] { auto [new_begin, new_end] = func(manager, page_offset, copy_amount); diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index e601f8446..f335009d0 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -888,7 +888,7 @@ void TextureCache

::DownloadImageIntoBuffer(typename TextureCache

::Image* i buffer, download_map.buffer, }; - std::array buffer_offsets{ + std::array buffer_offsets{ buffer_offset, download_map.offset, }; From 4df49631dec0156f1b7e05d6276bfad51a724f64 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 2 May 2023 18:14:57 -0400 Subject: [PATCH 0306/1181] vulkan: disable turbo when debugging tool is attached --- src/video_core/vulkan_common/vulkan_device.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 6f288b3f8..6ffca2af2 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -617,7 +617,9 @@ bool Device::ShouldBoostClocks() const { const bool is_steam_deck = vendor_id == 0x1002 && device_id == 0x163F; - return validated_driver && !is_steam_deck; + const bool is_debugging = this->HasDebuggingToolAttached(); + + return validated_driver && !is_steam_deck && !is_debugging; } bool Device::GetSuitability(bool requires_swapchain) { From f902cc2a2b5875eb20a403390ed849af68e094f0 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Tue, 2 May 2023 23:52:21 +0100 Subject: [PATCH 0307/1181] Fix code resize to use word size rather than byte size --- src/video_core/shader_cache.cpp | 4 ++-- src/video_core/shader_environment.cpp | 16 ++++++++++------ src/video_core/shader_environment.h | 6 ++++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/video_core/shader_cache.cpp b/src/video_core/shader_cache.cpp index d9482371b..c5213875b 100644 --- a/src/video_core/shader_cache.cpp +++ b/src/video_core/shader_cache.cpp @@ -228,14 +228,14 @@ const ShaderInfo* ShaderCache::MakeShaderInfo(GenericEnvironment& env, VAddr cpu auto info = std::make_unique(); if (const std::optional cached_hash{env.Analyze()}) { info->unique_hash = *cached_hash; - info->size_bytes = env.CachedSize(); + info->size_bytes = env.CachedSizeBytes(); } else { // Slow path, not really hit on commercial games // Build a control flow graph to get the real shader size Shader::ObjectPool flow_block; Shader::Maxwell::Flow::CFG cfg{env, flow_block, env.StartAddress()}; info->unique_hash = env.CalculateHash(); - info->size_bytes = env.ReadSize(); + info->size_bytes = env.ReadSizeBytes(); } const size_t size_bytes{info->size_bytes}; const ShaderInfo* const result{info.get()}; diff --git a/src/video_core/shader_environment.cpp b/src/video_core/shader_environment.cpp index 574760f80..c7cb56243 100644 --- a/src/video_core/shader_environment.cpp +++ b/src/video_core/shader_environment.cpp @@ -170,15 +170,19 @@ std::optional GenericEnvironment::Analyze() { void GenericEnvironment::SetCachedSize(size_t size_bytes) { cached_lowest = start_address; cached_highest = start_address + static_cast(size_bytes); - code.resize(CachedSize()); + code.resize(CachedSizeWords()); gpu_memory->ReadBlock(program_base + cached_lowest, code.data(), code.size() * sizeof(u64)); } -size_t GenericEnvironment::CachedSize() const noexcept { - return cached_highest - cached_lowest + INST_SIZE; +size_t GenericEnvironment::CachedSizeWords() const noexcept { + return CachedSizeBytes() / INST_SIZE; } -size_t GenericEnvironment::ReadSize() const noexcept { +size_t GenericEnvironment::CachedSizeBytes() const noexcept { + return static_cast(cached_highest) - cached_lowest + INST_SIZE; +} + +size_t GenericEnvironment::ReadSizeBytes() const noexcept { return read_highest - read_lowest + INST_SIZE; } @@ -187,7 +191,7 @@ bool GenericEnvironment::CanBeSerialized() const noexcept { } u64 GenericEnvironment::CalculateHash() const { - const size_t size{ReadSize()}; + const size_t size{ReadSizeBytes()}; const auto data{std::make_unique(size)}; gpu_memory->ReadBlock(program_base + read_lowest, data.get(), size); return Common::CityHash64(data.get(), size); @@ -198,7 +202,7 @@ void GenericEnvironment::Dump(u64 hash) { } void GenericEnvironment::Serialize(std::ofstream& file) const { - const u64 code_size{static_cast(CachedSize())}; + const u64 code_size{static_cast(CachedSizeBytes())}; const u64 num_texture_types{static_cast(texture_types.size())}; const u64 num_texture_pixel_formats{static_cast(texture_pixel_formats.size())}; const u64 num_cbuf_values{static_cast(cbuf_values.size())}; diff --git a/src/video_core/shader_environment.h b/src/video_core/shader_environment.h index d75987a52..a0f61cbda 100644 --- a/src/video_core/shader_environment.h +++ b/src/video_core/shader_environment.h @@ -48,9 +48,11 @@ public: void SetCachedSize(size_t size_bytes); - [[nodiscard]] size_t CachedSize() const noexcept; + [[nodiscard]] size_t CachedSizeWords() const noexcept; - [[nodiscard]] size_t ReadSize() const noexcept; + [[nodiscard]] size_t CachedSizeBytes() const noexcept; + + [[nodiscard]] size_t ReadSizeBytes() const noexcept; [[nodiscard]] bool CanBeSerialized() const noexcept; From d1dd54cbfae8418917ad83f9c7738220145340ce Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 2 May 2023 21:27:17 -0400 Subject: [PATCH 0308/1181] catch2: update to 3.3.1 --- vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index 0352dab77..19f99e89e 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -49,7 +49,7 @@ "overrides": [ { "name": "catch2", - "version": "3.0.1" + "version": "3.3.1" }, { "name": "fmt", From 6f0929df82be77f116988cf16cde4ebbc5f978dc Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sun, 30 Apr 2023 15:39:00 -0400 Subject: [PATCH 0309/1181] configuration: Expose separate swap present modes Previously, yuzu would try and guess which vsync mode to use given different scenarios, but apparently we didn't always get it right. This exposes the separate modes in a drop-down the user can select. If a mode isn't available in Vulkan, it defaults to FIFO. --- src/common/settings.cpp | 3 +- src/common/settings.h | 9 +++- src/core/telemetry_session.cpp | 15 +++++- .../renderer_vulkan/vk_swapchain.cpp | 27 +++++----- src/yuzu/bootmanager.cpp | 13 ++++- src/yuzu/configuration/config.cpp | 10 +++- src/yuzu/configuration/configure_graphics.cpp | 9 ++++ src/yuzu/configuration/configure_graphics.ui | 49 ++++++++++++++++++- .../configure_graphics_advanced.cpp | 5 -- .../configure_graphics_advanced.ui | 10 ---- src/yuzu_cmd/config.cpp | 2 +- 11 files changed, 115 insertions(+), 37 deletions(-) diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 77ff21128..92794f4a2 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -60,7 +60,7 @@ void LogSettings() { log_setting("Renderer_NvdecEmulation", values.nvdec_emulation.GetValue()); log_setting("Renderer_AccelerateASTC", values.accelerate_astc.GetValue()); log_setting("Renderer_AsyncASTC", values.async_astc.GetValue()); - log_setting("Renderer_UseVsync", values.use_vsync.GetValue()); + log_setting("Renderer_UseVsync", values.vsync_mode.GetValue()); log_setting("Renderer_ShaderBackend", values.shader_backend.GetValue()); log_setting("Renderer_UseAsynchronousShaders", values.use_asynchronous_shaders.GetValue()); log_setting("Renderer_AnisotropicFilteringLevel", values.max_anisotropy.GetValue()); @@ -222,7 +222,6 @@ void RestoreGlobalState(bool is_powered_on) { values.nvdec_emulation.SetGlobal(true); values.accelerate_astc.SetGlobal(true); values.async_astc.SetGlobal(true); - values.use_vsync.SetGlobal(true); values.shader_backend.SetGlobal(true); values.use_asynchronous_shaders.SetGlobal(true); values.use_fast_gpu_time.SetGlobal(true); diff --git a/src/common/settings.h b/src/common/settings.h index 5379d0dd5..2371495e4 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -16,6 +16,12 @@ namespace Settings { +enum class VSyncMode : u32 { + Immediate, + FIFO, + Mailbox, +}; + enum class RendererBackend : u32 { OpenGL = 0, Vulkan = 1, @@ -455,7 +461,8 @@ struct Values { SwitchableSetting nvdec_emulation{NvdecEmulation::GPU, "nvdec_emulation"}; SwitchableSetting accelerate_astc{true, "accelerate_astc"}; SwitchableSetting async_astc{false, "async_astc"}; - SwitchableSetting use_vsync{true, "use_vsync"}; + Setting vsync_mode{VSyncMode::FIFO, VSyncMode::Immediate, VSyncMode::Mailbox, + "use_vsync"}; SwitchableSetting shader_backend{ShaderBackend::GLSL, ShaderBackend::GLSL, ShaderBackend::SPIRV, "shader_backend"}; SwitchableSetting use_asynchronous_shaders{false, "use_asynchronous_shaders"}; diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp index 9178b00ca..6ec8e440c 100644 --- a/src/core/telemetry_session.cpp +++ b/src/core/telemetry_session.cpp @@ -85,6 +85,18 @@ static const char* TranslateNvdecEmulation(Settings::NvdecEmulation backend) { return "Unknown"; } +constexpr const char* TranslateVSyncMode(Settings::VSyncMode mode) { + switch (mode) { + case Settings::VSyncMode::Immediate: + return "Immediate"; + case Settings::VSyncMode::FIFO: + return "FIFO"; + case Settings::VSyncMode::Mailbox: + return "Mailbox"; + } + return "Unknown"; +} + u64 GetTelemetryId() { u64 telemetry_id{}; const auto filename = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) / "telemetry_id"; @@ -241,7 +253,8 @@ void TelemetrySession::AddInitialInfo(Loader::AppLoader& app_loader, AddField(field_type, "Renderer_NvdecEmulation", TranslateNvdecEmulation(Settings::values.nvdec_emulation.GetValue())); AddField(field_type, "Renderer_AccelerateASTC", Settings::values.accelerate_astc.GetValue()); - AddField(field_type, "Renderer_UseVsync", Settings::values.use_vsync.GetValue()); + AddField(field_type, "Renderer_UseVsync", + TranslateVSyncMode(Settings::values.vsync_mode.GetValue())); AddField(field_type, "Renderer_ShaderBackend", static_cast(Settings::values.shader_backend.GetValue())); AddField(field_type, "Renderer_UseAsynchronousShaders", diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp index 23bbea7f1..08d82769c 100644 --- a/src/video_core/renderer_vulkan/vk_swapchain.cpp +++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp @@ -34,21 +34,22 @@ VkSurfaceFormatKHR ChooseSwapSurfaceFormat(vk::Span formats) } VkPresentModeKHR ChooseSwapPresentMode(vk::Span modes) { - // Mailbox (triple buffering) doesn't lock the application like fifo (vsync), - // prefer it if vsync option is not selected - const auto found_mailbox = std::find(modes.begin(), modes.end(), VK_PRESENT_MODE_MAILBOX_KHR); - if (Settings::values.fullscreen_mode.GetValue() == Settings::FullscreenMode::Borderless && - found_mailbox != modes.end() && !Settings::values.use_vsync.GetValue()) { + // Mailbox (triple buffering) doesn't lock the application like FIFO (vsync) + // FIFO present mode locks the framerate to the monitor's refresh rate + const bool has_mailbox = + std::find(modes.begin(), modes.end(), VK_PRESENT_MODE_MAILBOX_KHR) != modes.end(); + const bool has_imm = + std::find(modes.begin(), modes.end(), VK_PRESENT_MODE_IMMEDIATE_KHR) != modes.end(); + const Settings::VSyncMode mode = Settings::values.vsync_mode.GetValue(); + + if (mode == Settings::VSyncMode::Immediate && has_imm) { + LOG_INFO(Render_Vulkan, "Using swap present mode Immediate"); + return VK_PRESENT_MODE_IMMEDIATE_KHR; + } else if (mode == Settings::VSyncMode::Mailbox && has_mailbox) { + LOG_INFO(Render_Vulkan, "Using swap present mode Mailbox"); return VK_PRESENT_MODE_MAILBOX_KHR; } - if (!Settings::values.use_speed_limit.GetValue()) { - // FIFO present mode locks the framerate to the monitor's refresh rate, - // Find an alternative to surpass this limitation if FPS is unlocked. - const auto found_imm = std::find(modes.begin(), modes.end(), VK_PRESENT_MODE_IMMEDIATE_KHR); - if (found_imm != modes.end()) { - return VK_PRESENT_MODE_IMMEDIATE_KHR; - } - } + LOG_INFO(Render_Vulkan, "Using swap present mode FIFO"); return VK_PRESENT_MODE_FIFO_KHR; } diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 4c7bf28d8..01dc51cff 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -154,7 +154,18 @@ public: // disable vsync for any shared contexts auto format = share_context->format(); - format.setSwapInterval(main_surface ? Settings::values.use_vsync.GetValue() : 0); + const int swap_interval = [&]() { + switch (Settings::values.vsync_mode.GetValue()) { + case Settings::VSyncMode::Immediate: + return 0; + case Settings::VSyncMode::FIFO: + return 1; + case Settings::VSyncMode::Mailbox: + return 2; + } + }(); + + format.setSwapInterval(main_surface ? swap_interval : 0); context = std::make_unique(); context->setShareContext(share_context); diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 305891d18..4a8436e5c 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -6,6 +6,7 @@ #include #include "common/fs/fs.h" #include "common/fs/path_util.h" +#include "common/settings.h" #include "core/core.h" #include "core/hle/service/acc/profile_manager.h" #include "core/hle/service/hid/controllers/npad.h" @@ -709,7 +710,6 @@ void Config::ReadRendererValues() { ReadGlobalSetting(Settings::values.nvdec_emulation); ReadGlobalSetting(Settings::values.accelerate_astc); ReadGlobalSetting(Settings::values.async_astc); - ReadGlobalSetting(Settings::values.use_vsync); ReadGlobalSetting(Settings::values.shader_backend); ReadGlobalSetting(Settings::values.use_asynchronous_shaders); ReadGlobalSetting(Settings::values.use_fast_gpu_time); @@ -720,6 +720,10 @@ void Config::ReadRendererValues() { ReadGlobalSetting(Settings::values.bg_blue); if (global) { + Settings::values.vsync_mode.SetValue(static_cast( + ReadSetting(QString::fromStdString(Settings::values.vsync_mode.GetLabel()), + static_cast(Settings::values.vsync_mode.GetDefault())) + .value())); ReadBasicSetting(Settings::values.renderer_debug); ReadBasicSetting(Settings::values.renderer_shader_feedback); ReadBasicSetting(Settings::values.enable_nsight_aftermath); @@ -1352,7 +1356,6 @@ void Config::SaveRendererValues() { Settings::values.nvdec_emulation.UsingGlobal()); WriteGlobalSetting(Settings::values.accelerate_astc); WriteGlobalSetting(Settings::values.async_astc); - WriteGlobalSetting(Settings::values.use_vsync); WriteSetting(QString::fromStdString(Settings::values.shader_backend.GetLabel()), static_cast(Settings::values.shader_backend.GetValue(global)), static_cast(Settings::values.shader_backend.GetDefault()), @@ -1366,6 +1369,9 @@ void Config::SaveRendererValues() { WriteGlobalSetting(Settings::values.bg_blue); if (global) { + WriteSetting(QString::fromStdString(Settings::values.vsync_mode.GetLabel()), + static_cast(Settings::values.vsync_mode.GetValue()), + static_cast(Settings::values.vsync_mode.GetDefault())); WriteBasicSetting(Settings::values.renderer_debug); WriteBasicSetting(Settings::values.renderer_shader_feedback); WriteBasicSetting(Settings::values.enable_nsight_aftermath); diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index e9388daad..17a54f0f4 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -99,6 +99,7 @@ void ConfigureGraphics::SetConfiguration() { ui->nvdec_emulation_widget->setEnabled(runtime_lock); ui->resolution_combobox->setEnabled(runtime_lock); ui->accelerate_astc->setEnabled(runtime_lock); + ui->vsync_mode_combobox->setEnabled(runtime_lock); ui->use_disk_shader_cache->setChecked(Settings::values.use_disk_shader_cache.GetValue()); ui->use_asynchronous_gpu_emulation->setChecked( Settings::values.use_asynchronous_gpu_emulation.GetValue()); @@ -118,6 +119,9 @@ void ConfigureGraphics::SetConfiguration() { ui->fsr_sharpening_slider->setValue(Settings::values.fsr_sharpening_slider.GetValue()); ui->anti_aliasing_combobox->setCurrentIndex( static_cast(Settings::values.anti_aliasing.GetValue())); + + ui->vsync_mode_combobox->setCurrentIndex( + static_cast(Settings::values.vsync_mode.GetValue())); } else { ConfigurationShared::SetPerGameSetting(ui->api, &Settings::values.renderer_backend); ConfigurationShared::SetHighlight(ui->api_widget, @@ -232,6 +236,9 @@ void ConfigureGraphics::ApplyConfiguration() { Settings::values.anti_aliasing.SetValue(anti_aliasing); } Settings::values.fsr_sharpening_slider.SetValue(ui->fsr_sharpening_slider->value()); + + Settings::values.vsync_mode.SetValue( + static_cast(ui->vsync_mode_combobox->currentIndex())); } else { if (ui->resolution_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) { Settings::values.resolution_setup.SetGlobal(true); @@ -465,4 +472,6 @@ void ConfigureGraphics::SetupPerGameUI() { ui->api, static_cast(Settings::values.renderer_backend.GetValue(true))); ConfigurationShared::InsertGlobalItem( ui->nvdec_emulation, static_cast(Settings::values.nvdec_emulation.GetValue(true))); + + ui->vsync_mode_layout->setVisible(false); } diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui index a45ec69ec..4c241e247 100644 --- a/src/yuzu/configuration/configure_graphics.ui +++ b/src/yuzu/configuration/configure_graphics.ui @@ -188,6 +188,53 @@ + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + VSync Mode + + + + + + + Off (Immediate) + + + + Off (Immediate) + + + + + Double Buffering (FIFO) + + + + + Triple Buffering (Mailbox) + + + + + + + @@ -366,7 +413,7 @@ - 1.5X (1080p/1620p) [EXPERIMENTAL] + 1.5X (1080p/1620p) [EXPERIMENTAL] diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp index 7f7bf0e4d..4072ce145 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.cpp +++ b/src/yuzu/configuration/configure_graphics_advanced.cpp @@ -21,7 +21,6 @@ ConfigureGraphicsAdvanced::~ConfigureGraphicsAdvanced() = default; void ConfigureGraphicsAdvanced::SetConfiguration() { const bool runtime_lock = !system.IsPoweredOn(); - ui->use_vsync->setEnabled(runtime_lock); ui->async_present->setEnabled(runtime_lock); ui->renderer_force_max_clock->setEnabled(runtime_lock); ui->async_astc->setEnabled(runtime_lock); @@ -30,7 +29,6 @@ void ConfigureGraphicsAdvanced::SetConfiguration() { ui->async_present->setChecked(Settings::values.async_presentation.GetValue()); ui->renderer_force_max_clock->setChecked(Settings::values.renderer_force_max_clock.GetValue()); - ui->use_vsync->setChecked(Settings::values.use_vsync.GetValue()); ui->async_astc->setChecked(Settings::values.async_astc.GetValue()); ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue()); ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue()); @@ -63,7 +61,6 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() { renderer_force_max_clock); ConfigurationShared::ApplyPerGameSetting(&Settings::values.max_anisotropy, ui->anisotropic_filtering_combobox); - ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vsync, ui->use_vsync, use_vsync); ConfigurationShared::ApplyPerGameSetting(&Settings::values.async_astc, ui->async_astc, async_astc); ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_shaders, @@ -97,7 +94,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { ui->async_present->setEnabled(Settings::values.async_presentation.UsingGlobal()); ui->renderer_force_max_clock->setEnabled( Settings::values.renderer_force_max_clock.UsingGlobal()); - ui->use_vsync->setEnabled(Settings::values.use_vsync.UsingGlobal()); ui->async_astc->setEnabled(Settings::values.async_astc.UsingGlobal()); ui->use_asynchronous_shaders->setEnabled( Settings::values.use_asynchronous_shaders.UsingGlobal()); @@ -117,7 +113,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { ConfigurationShared::SetColoredTristate(ui->renderer_force_max_clock, Settings::values.renderer_force_max_clock, renderer_force_max_clock); - ConfigurationShared::SetColoredTristate(ui->use_vsync, Settings::values.use_vsync, use_vsync); ConfigurationShared::SetColoredTristate(ui->async_astc, Settings::values.async_astc, async_astc); ConfigurationShared::SetColoredTristate(ui->use_asynchronous_shaders, diff --git a/src/yuzu/configuration/configure_graphics_advanced.ui b/src/yuzu/configuration/configure_graphics_advanced.ui index d7ec18939..134023032 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.ui +++ b/src/yuzu/configuration/configure_graphics_advanced.ui @@ -86,16 +86,6 @@ - - - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - - - Use VSync - - - diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index fa347fb8c..a692ef809 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -320,7 +320,7 @@ void Config::ReadValues() { ReadSetting("Renderer", Settings::values.use_disk_shader_cache); ReadSetting("Renderer", Settings::values.gpu_accuracy); ReadSetting("Renderer", Settings::values.use_asynchronous_gpu_emulation); - ReadSetting("Renderer", Settings::values.use_vsync); + ReadSetting("Renderer", Settings::values.vsync_mode); ReadSetting("Renderer", Settings::values.shader_backend); ReadSetting("Renderer", Settings::values.use_asynchronous_shaders); ReadSetting("Renderer", Settings::values.nvdec_emulation); From 66ed1c187202e9d914f8a8d5bb64d672b05f45bb Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sun, 30 Apr 2023 15:46:44 -0400 Subject: [PATCH 0310/1181] default_ini: Update V-Sync description default_ini: Update vsync text default_ini: Add tooltip from configure_graphics --- src/yuzu_cmd/default_ini.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index c0c89fbb9..1990c0707 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -325,8 +325,14 @@ aspect_ratio = # 0: Default, 1: 2x, 2: 4x, 3: 8x, 4: 16x max_anisotropy = -# Whether to enable V-Sync (caps the framerate at 60FPS) or not. -# 0 (default): Off, 1: On +# Whether to enable VSync or not. +# OpenGL: Values other than 0 enable VSync +# Vulkan: FIFO is selected if the requested mode is not supported by the driver. +# FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +# FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +# Mailbox can have lower latency than FIFO and does not tear but may drop frames. +# Immediate (no synchronization) just presents whatever is available and can exhibit tearing. +# 0: Immediate (Off), 1: Mailbox, 2 (Default): FIFO (On), 3: FIFO Relaxed use_vsync = # Selects the OpenGL shader backend. NV_gpu_program5 is required for GLASM. If NV_gpu_program5 is From 41a103c0fc0e2fbcef482b58b606dac5424fd429 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sun, 30 Apr 2023 15:48:20 -0400 Subject: [PATCH 0311/1181] configure_graphics: Fix typo --- src/yuzu/configuration/configure_graphics.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui index 4c241e247..2856b3bd0 100644 --- a/src/yuzu/configuration/configure_graphics.ui +++ b/src/yuzu/configuration/configure_graphics.ui @@ -206,7 +206,7 @@ - VSync Mode + V-Sync Mode From 29a56496bffcec6bad5865426e0ffd7091f76667 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sun, 30 Apr 2023 16:14:38 -0400 Subject: [PATCH 0312/1181] bootmanager: Return value in impossible case The setting is ranged, so this return statement is unreachable. But GCC can't tell I guess. --- src/yuzu/bootmanager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 01dc51cff..1cf239496 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -163,6 +163,7 @@ public: case Settings::VSyncMode::Mailbox: return 2; } + return 0; }(); format.setSwapInterval(main_surface ? swap_interval : 0); From 40f062f7496c916086c4e7e49adc4fb8eb9540d1 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sun, 30 Apr 2023 19:03:37 -0400 Subject: [PATCH 0313/1181] telemetry_session: Make translate function static Addresses review feedback Co-authored-by: Lioncash --- src/core/telemetry_session.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp index 6ec8e440c..1e60478e2 100644 --- a/src/core/telemetry_session.cpp +++ b/src/core/telemetry_session.cpp @@ -85,7 +85,7 @@ static const char* TranslateNvdecEmulation(Settings::NvdecEmulation backend) { return "Unknown"; } -constexpr const char* TranslateVSyncMode(Settings::VSyncMode mode) { +static constexpr const char* TranslateVSyncMode(Settings::VSyncMode mode) { switch (mode) { case Settings::VSyncMode::Immediate: return "Immediate"; From 6b973c5986ffdbb4c73edf5a18c6eaf8b02d7f32 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sun, 30 Apr 2023 22:28:53 -0400 Subject: [PATCH 0314/1181] configure_graphics: Fix another typo --- src/yuzu/configuration/configure_graphics.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui index 2856b3bd0..9ad1c88a7 100644 --- a/src/yuzu/configuration/configure_graphics.ui +++ b/src/yuzu/configuration/configure_graphics.ui @@ -206,7 +206,7 @@ - V-Sync Mode + V-Sync Mode: From 2528cf7c5416573fc8bf2e9316a3acc5a2395b79 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Mon, 1 May 2023 20:22:37 -0400 Subject: [PATCH 0315/1181] settings: Enable FIFO relaxed Not entirely sure if we need this, but there's also no reason not to support it. settings: Give VSyncMode values --- src/common/settings.h | 11 ++++++----- src/core/telemetry_session.cpp | 6 ++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/common/settings.h b/src/common/settings.h index 2371495e4..c0faa7406 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -17,9 +17,10 @@ namespace Settings { enum class VSyncMode : u32 { - Immediate, - FIFO, - Mailbox, + Immediate = 0, + Mailbox = 1, + FIFO = 2, + FIFORelaxed = 3, }; enum class RendererBackend : u32 { @@ -461,8 +462,8 @@ struct Values { SwitchableSetting nvdec_emulation{NvdecEmulation::GPU, "nvdec_emulation"}; SwitchableSetting accelerate_astc{true, "accelerate_astc"}; SwitchableSetting async_astc{false, "async_astc"}; - Setting vsync_mode{VSyncMode::FIFO, VSyncMode::Immediate, VSyncMode::Mailbox, - "use_vsync"}; + Setting vsync_mode{VSyncMode::FIFO, VSyncMode::Immediate, + VSyncMode::FIFORelaxed, "use_vsync"}; SwitchableSetting shader_backend{ShaderBackend::GLSL, ShaderBackend::GLSL, ShaderBackend::SPIRV, "shader_backend"}; SwitchableSetting use_asynchronous_shaders{false, "use_asynchronous_shaders"}; diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp index 1e60478e2..7a2f3c90a 100644 --- a/src/core/telemetry_session.cpp +++ b/src/core/telemetry_session.cpp @@ -89,10 +89,12 @@ static constexpr const char* TranslateVSyncMode(Settings::VSyncMode mode) { switch (mode) { case Settings::VSyncMode::Immediate: return "Immediate"; - case Settings::VSyncMode::FIFO: - return "FIFO"; case Settings::VSyncMode::Mailbox: return "Mailbox"; + case Settings::VSyncMode::FIFO: + return "FIFO"; + case Settings::VSyncMode::FIFORelaxed: + return "FIFO Relaxed"; } return "Unknown"; } From c6c11c1553675bc48a80acf6c966134eb32b5364 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Mon, 1 May 2023 20:25:53 -0400 Subject: [PATCH 0316/1181] vulkan_surface: Pass only window info for surface creation We don't need the whole EmuWindow when creating a surface, and it creates onerous requirements outside of typical usage for creating a surface elsewhere. --- src/video_core/renderer_vulkan/renderer_vulkan.cpp | 2 +- src/video_core/vulkan_common/vulkan_surface.cpp | 6 +++--- src/video_core/vulkan_common/vulkan_surface.h | 9 +++------ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp index 69dc76180..94ae2a2f8 100644 --- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp +++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp @@ -88,7 +88,7 @@ RendererVulkan::RendererVulkan(Core::TelemetrySession& telemetry_session_, instance(CreateInstance(library, dld, VK_API_VERSION_1_1, render_window.GetWindowInfo().type, Settings::values.renderer_debug.GetValue())), debug_callback(Settings::values.renderer_debug ? CreateDebugCallback(instance) : nullptr), - surface(CreateSurface(instance, render_window)), + surface(CreateSurface(instance, render_window.GetWindowInfo())), device(CreateDevice(instance, dld, *surface)), memory_allocator(device, false), state_tracker(), scheduler(device, state_tracker), swapchain(*surface, device, scheduler, render_window.GetFramebufferLayout().width, diff --git a/src/video_core/vulkan_common/vulkan_surface.cpp b/src/video_core/vulkan_common/vulkan_surface.cpp index fa9bafa20..c34599365 100644 --- a/src/video_core/vulkan_common/vulkan_surface.cpp +++ b/src/video_core/vulkan_common/vulkan_surface.cpp @@ -23,10 +23,10 @@ namespace Vulkan { -vk::SurfaceKHR CreateSurface(const vk::Instance& instance, - const Core::Frontend::EmuWindow& emu_window) { +vk::SurfaceKHR CreateSurface( + const vk::Instance& instance, + [[maybe_unused]] const Core::Frontend::EmuWindow::WindowSystemInfo& window_info) { [[maybe_unused]] const vk::InstanceDispatch& dld = instance.Dispatch(); - [[maybe_unused]] const auto& window_info = emu_window.GetWindowInfo(); VkSurfaceKHR unsafe_surface = nullptr; #ifdef _WIN32 diff --git a/src/video_core/vulkan_common/vulkan_surface.h b/src/video_core/vulkan_common/vulkan_surface.h index 5725143e6..5e18c06c4 100644 --- a/src/video_core/vulkan_common/vulkan_surface.h +++ b/src/video_core/vulkan_common/vulkan_surface.h @@ -3,15 +3,12 @@ #pragma once +#include "core/frontend/emu_window.h" #include "video_core/vulkan_common/vulkan_wrapper.h" -namespace Core::Frontend { -class EmuWindow; -} - namespace Vulkan { -[[nodiscard]] vk::SurfaceKHR CreateSurface(const vk::Instance& instance, - const Core::Frontend::EmuWindow& emu_window); +[[nodiscard]] vk::SurfaceKHR CreateSurface( + const vk::Instance& instance, const Core::Frontend::EmuWindow::WindowSystemInfo& window_info); } // namespace Vulkan From cbd79df233754113ac509bf8de034d8cd8ffd588 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Mon, 1 May 2023 20:27:45 -0400 Subject: [PATCH 0317/1181] qt_common: Move window info function out of bootmanager Function is useful outside of bootmanager, so put it in a common place. qt_common: Add missing include qt_common: Add some newlines qt_common: Add trailing newline qt_common: Add trainline newline --- src/yuzu/CMakeLists.txt | 2 ++ src/yuzu/bootmanager.cpp | 47 +++------------------------------- src/yuzu/qt_common.cpp | 55 ++++++++++++++++++++++++++++++++++++++++ src/yuzu/qt_common.h | 15 +++++++++++ 4 files changed, 75 insertions(+), 44 deletions(-) create mode 100644 src/yuzu/qt_common.cpp create mode 100644 src/yuzu/qt_common.h diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 0f8c1e6a6..2d7b9ab65 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -189,6 +189,8 @@ add_executable(yuzu multiplayer/state.h multiplayer/validation.h precompiled_headers.h + qt_common.cpp + qt_common.h startup_checks.cpp startup_checks.h uisettings.cpp diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 1cf239496..98161cc27 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -43,8 +43,7 @@ #include "video_core/renderer_base.h" #include "yuzu/bootmanager.h" #include "yuzu/main.h" - -static Core::Frontend::WindowSystemType GetWindowSystemType(); +#include "yuzu/qt_common.h" EmuThread::EmuThread(Core::System& system) : m_system{system} {} @@ -233,7 +232,7 @@ public: explicit RenderWidget(GRenderWindow* parent) : QWidget(parent), render_window(parent) { setAttribute(Qt::WA_NativeWindow); setAttribute(Qt::WA_PaintOnScreen); - if (GetWindowSystemType() == Core::Frontend::WindowSystemType::Wayland) { + if (YuzuQtCommon::GetWindowSystemType() == Core::Frontend::WindowSystemType::Wayland) { setAttribute(Qt::WA_DontCreateNativeAncestors); } } @@ -271,46 +270,6 @@ struct NullRenderWidget : public RenderWidget { explicit NullRenderWidget(GRenderWindow* parent) : RenderWidget(parent) {} }; -static Core::Frontend::WindowSystemType GetWindowSystemType() { - // Determine WSI type based on Qt platform. - QString platform_name = QGuiApplication::platformName(); - if (platform_name == QStringLiteral("windows")) - return Core::Frontend::WindowSystemType::Windows; - else if (platform_name == QStringLiteral("xcb")) - return Core::Frontend::WindowSystemType::X11; - else if (platform_name == QStringLiteral("wayland")) - return Core::Frontend::WindowSystemType::Wayland; - else if (platform_name == QStringLiteral("wayland-egl")) - return Core::Frontend::WindowSystemType::Wayland; - else if (platform_name == QStringLiteral("cocoa")) - return Core::Frontend::WindowSystemType::Cocoa; - else if (platform_name == QStringLiteral("android")) - return Core::Frontend::WindowSystemType::Android; - - LOG_CRITICAL(Frontend, "Unknown Qt platform {}!", platform_name.toStdString()); - return Core::Frontend::WindowSystemType::Windows; -} - -static Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow* window) { - Core::Frontend::EmuWindow::WindowSystemInfo wsi; - wsi.type = GetWindowSystemType(); - - // Our Win32 Qt external doesn't have the private API. -#if defined(WIN32) || defined(__APPLE__) - wsi.render_surface = window ? reinterpret_cast(window->winId()) : nullptr; -#else - QPlatformNativeInterface* pni = QGuiApplication::platformNativeInterface(); - wsi.display_connection = pni->nativeResourceForWindow("display", window); - if (wsi.type == Core::Frontend::WindowSystemType::Wayland) - wsi.render_surface = window ? pni->nativeResourceForWindow("surface", window) : nullptr; - else - wsi.render_surface = window ? reinterpret_cast(window->winId()) : nullptr; -#endif - wsi.render_surface_scale = window ? static_cast(window->devicePixelRatio()) : 1.0f; - - return wsi; -} - GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_, std::shared_ptr input_subsystem_, Core::System& system_) @@ -916,7 +875,7 @@ bool GRenderWindow::InitRenderTarget() { } // Update the Window System information with the new render target - window_info = GetWindowSystemInfo(child_widget->windowHandle()); + window_info = YuzuQtCommon::GetWindowSystemInfo(child_widget->windowHandle()); child_widget->resize(Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height); layout()->addWidget(child_widget); diff --git a/src/yuzu/qt_common.cpp b/src/yuzu/qt_common.cpp new file mode 100644 index 000000000..1b533ee40 --- /dev/null +++ b/src/yuzu/qt_common.cpp @@ -0,0 +1,55 @@ +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include +#include +#include "common/logging/log.h" +#include "core/frontend/emu_window.h" +#include "yuzu/qt_common.h" + +#ifdef __linux__ +#include +#endif + +namespace YuzuQtCommon { +Core::Frontend::WindowSystemType GetWindowSystemType() { + // Determine WSI type based on Qt platform. + QString platform_name = QGuiApplication::platformName(); + if (platform_name == QStringLiteral("windows")) + return Core::Frontend::WindowSystemType::Windows; + else if (platform_name == QStringLiteral("xcb")) + return Core::Frontend::WindowSystemType::X11; + else if (platform_name == QStringLiteral("wayland")) + return Core::Frontend::WindowSystemType::Wayland; + else if (platform_name == QStringLiteral("wayland-egl")) + return Core::Frontend::WindowSystemType::Wayland; + else if (platform_name == QStringLiteral("cocoa")) + return Core::Frontend::WindowSystemType::Cocoa; + else if (platform_name == QStringLiteral("android")) + return Core::Frontend::WindowSystemType::Android; + + LOG_CRITICAL(Frontend, "Unknown Qt platform {}!", platform_name.toStdString()); + return Core::Frontend::WindowSystemType::Windows; +} // namespace Core::Frontend::WindowSystemType + +Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow* window) { + Core::Frontend::EmuWindow::WindowSystemInfo wsi; + wsi.type = GetWindowSystemType(); + + // Our Win32 Qt external doesn't have the private API. +#if defined(WIN32) || defined(__APPLE__) + wsi.render_surface = window ? reinterpret_cast(window->winId()) : nullptr; +#else + QPlatformNativeInterface* pni = QGuiApplication::platformNativeInterface(); + wsi.display_connection = pni->nativeResourceForWindow("display", window); + if (wsi.type == Core::Frontend::WindowSystemType::Wayland) + wsi.render_surface = window ? pni->nativeResourceForWindow("surface", window) : nullptr; + else + wsi.render_surface = window ? reinterpret_cast(window->winId()) : nullptr; +#endif + wsi.render_surface_scale = window ? static_cast(window->devicePixelRatio()) : 1.0f; + + return wsi; +} +} // namespace YuzuQtCommon diff --git a/src/yuzu/qt_common.h b/src/yuzu/qt_common.h new file mode 100644 index 000000000..b366adee6 --- /dev/null +++ b/src/yuzu/qt_common.h @@ -0,0 +1,15 @@ +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include +#include "core/frontend/emu_window.h" + +namespace YuzuQtCommon { + +Core::Frontend::WindowSystemType GetWindowSystemType(); + +Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow* window); + +} // namespace YuzuQtCommon From a090a380be674ae001aea47434e1a2f008574a48 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Mon, 1 May 2023 20:29:13 -0400 Subject: [PATCH 0318/1181] bootmanager: Remove inaccurate switch Those vulkan settings do not correspond 1:1 to the swap intervals that they set for OpenGL, so remove it. bootmanager: Add missing include I didn't add this log why did it break --- src/yuzu/bootmanager.cpp | 13 ++----------- src/yuzu/bootmanager.h | 1 + 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 98161cc27..b064c9c64 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -153,17 +153,8 @@ public: // disable vsync for any shared contexts auto format = share_context->format(); - const int swap_interval = [&]() { - switch (Settings::values.vsync_mode.GetValue()) { - case Settings::VSyncMode::Immediate: - return 0; - case Settings::VSyncMode::FIFO: - return 1; - case Settings::VSyncMode::Mailbox: - return 2; - } - return 0; - }(); + const int swap_interval = + Settings::values.vsync_mode.GetValue() == Settings::VSyncMode::Immediate ? 0 : 1; format.setSwapInterval(main_surface ? swap_interval : 0); diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h index bb4eca07f..8a69cf973 100644 --- a/src/yuzu/bootmanager.h +++ b/src/yuzu/bootmanager.h @@ -14,6 +14,7 @@ #include #include +#include "common/logging/log.h" #include "common/polyfill_thread.h" #include "common/thread.h" #include "core/frontend/emu_window.h" From 952b2710920fdeef705a357762a7925483d27d20 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Mon, 1 May 2023 20:31:22 -0400 Subject: [PATCH 0319/1181] vk_swapchain: Use certain modes for unlocked Uses mailbox, then immediate for unlocked framerate depending on support for either. Also adds support for FIFO_RELAXED. This function now assumes vsync_mode was originially configured to a value that the driver supports. vk_swapchain: ChooseSwapPresentMode determines updates Simplifies swapchain a bit and allows us to change the present mode during guest runtime. vk_swapchain: Fix MSVC error vk_swapchain: Enforce available present modes Some frontends don't check the value of vsync_mode before comitting it. Just as well, since a driver update or misconfiguration could problems in the swap chain. vk_swapchain: Silence warnings Silences GCC warnings implicit-fallthrough and shadow, which apparently are not enabled on clang. --- .../renderer_vulkan/vk_swapchain.cpp | 76 ++++++++++++------- src/video_core/renderer_vulkan/vk_swapchain.h | 6 +- 2 files changed, 53 insertions(+), 29 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp index 08d82769c..1e80ce463 100644 --- a/src/video_core/renderer_vulkan/vk_swapchain.cpp +++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp @@ -14,6 +14,7 @@ #include "video_core/renderer_vulkan/vk_swapchain.h" #include "video_core/vulkan_common/vulkan_device.h" #include "video_core/vulkan_common/vulkan_wrapper.h" +#include "vulkan/vulkan_core.h" namespace Vulkan { @@ -33,24 +34,47 @@ VkSurfaceFormatKHR ChooseSwapSurfaceFormat(vk::Span formats) return found != formats.end() ? *found : formats[0]; } -VkPresentModeKHR ChooseSwapPresentMode(vk::Span modes) { - // Mailbox (triple buffering) doesn't lock the application like FIFO (vsync) +static constexpr VkPresentModeKHR ChooseSwapPresentMode(bool has_imm, bool has_mailbox, + bool has_fifo_relaxed) { + // Mailbox doesn't lock the application like FIFO (vsync) // FIFO present mode locks the framerate to the monitor's refresh rate - const bool has_mailbox = - std::find(modes.begin(), modes.end(), VK_PRESENT_MODE_MAILBOX_KHR) != modes.end(); - const bool has_imm = - std::find(modes.begin(), modes.end(), VK_PRESENT_MODE_IMMEDIATE_KHR) != modes.end(); - const Settings::VSyncMode mode = Settings::values.vsync_mode.GetValue(); - - if (mode == Settings::VSyncMode::Immediate && has_imm) { - LOG_INFO(Render_Vulkan, "Using swap present mode Immediate"); - return VK_PRESENT_MODE_IMMEDIATE_KHR; - } else if (mode == Settings::VSyncMode::Mailbox && has_mailbox) { - LOG_INFO(Render_Vulkan, "Using swap present mode Mailbox"); - return VK_PRESENT_MODE_MAILBOX_KHR; + Settings::VSyncMode setting = [has_imm, has_mailbox]() { + // Choose Mailbox or Immediate if unlocked and those modes are supported + const auto mode = Settings::values.vsync_mode.GetValue(); + if (Settings::values.use_speed_limit.GetValue()) { + return mode; + } + switch (mode) { + case Settings::VSyncMode::FIFO: + case Settings::VSyncMode::FIFORelaxed: + if (has_mailbox) { + return Settings::VSyncMode::Mailbox; + } else if (has_imm) { + return Settings::VSyncMode::Immediate; + } + [[fallthrough]]; + default: + return mode; + } + }(); + if ((setting == Settings::VSyncMode::Mailbox && !has_mailbox) || + (setting == Settings::VSyncMode::Immediate && !has_imm) || + (setting == Settings::VSyncMode::FIFORelaxed && !has_fifo_relaxed)) { + setting = Settings::VSyncMode::FIFO; + } + + switch (setting) { + case Settings::VSyncMode::Immediate: + return VK_PRESENT_MODE_IMMEDIATE_KHR; + case Settings::VSyncMode::Mailbox: + return VK_PRESENT_MODE_MAILBOX_KHR; + case Settings::VSyncMode::FIFO: + return VK_PRESENT_MODE_FIFO_KHR; + case Settings::VSyncMode::FIFORelaxed: + return VK_PRESENT_MODE_FIFO_RELAXED_KHR; + default: + return VK_PRESENT_MODE_FIFO_KHR; } - LOG_INFO(Render_Vulkan, "Using swap present mode FIFO"); - return VK_PRESENT_MODE_FIFO_KHR; } VkExtent2D ChooseSwapExtent(const VkSurfaceCapabilitiesKHR& capabilities, u32 width, u32 height) { @@ -168,11 +192,17 @@ void Swapchain::Present(VkSemaphore render_semaphore) { void Swapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities, bool srgb) { const auto physical_device{device.GetPhysical()}; const auto formats{physical_device.GetSurfaceFormatsKHR(surface)}; - const auto present_modes{physical_device.GetSurfacePresentModesKHR(surface)}; + const auto present_modes = physical_device.GetSurfacePresentModesKHR(surface); + has_mailbox = std::find(present_modes.begin(), present_modes.end(), + VK_PRESENT_MODE_MAILBOX_KHR) != present_modes.end(); + has_imm = std::find(present_modes.begin(), present_modes.end(), + VK_PRESENT_MODE_IMMEDIATE_KHR) != present_modes.end(); + has_fifo_relaxed = std::find(present_modes.begin(), present_modes.end(), + VK_PRESENT_MODE_FIFO_RELAXED_KHR) != present_modes.end(); const VkCompositeAlphaFlagBitsKHR alpha_flags{ChooseAlphaFlags(capabilities)}; surface_format = ChooseSwapSurfaceFormat(formats); - present_mode = ChooseSwapPresentMode(present_modes); + present_mode = ChooseSwapPresentMode(has_imm, has_mailbox, has_fifo_relaxed); u32 requested_image_count{capabilities.minImageCount + 1}; // Ensure Triple buffering if possible. @@ -233,7 +263,6 @@ void Swapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities, bo extent = swapchain_ci.imageExtent; current_srgb = srgb; - current_fps_unlocked = !Settings::values.use_speed_limit.GetValue(); images = swapchain.GetImages(); image_count = static_cast(images.size()); @@ -255,14 +284,9 @@ void Swapchain::Destroy() { swapchain.reset(); } -bool Swapchain::HasFpsUnlockChanged() const { - return current_fps_unlocked != !Settings::values.use_speed_limit.GetValue(); -} - bool Swapchain::NeedsPresentModeUpdate() const { - // Mailbox present mode is the ideal for all scenarios. If it is not available, - // A different present mode is needed to support unlocked FPS above the monitor's refresh rate. - return present_mode != VK_PRESENT_MODE_MAILBOX_KHR && HasFpsUnlockChanged(); + const auto requested_mode = ChooseSwapPresentMode(has_imm, has_mailbox, has_fifo_relaxed); + return present_mode != requested_mode; } } // namespace Vulkan diff --git a/src/video_core/renderer_vulkan/vk_swapchain.h b/src/video_core/renderer_vulkan/vk_swapchain.h index 419742586..bf1ea7254 100644 --- a/src/video_core/renderer_vulkan/vk_swapchain.h +++ b/src/video_core/renderer_vulkan/vk_swapchain.h @@ -116,8 +116,6 @@ private: void Destroy(); - bool HasFpsUnlockChanged() const; - bool NeedsPresentModeUpdate() const; const VkSurfaceKHR surface; @@ -142,9 +140,11 @@ private: VkExtent2D extent{}; VkPresentModeKHR present_mode{}; VkSurfaceFormatKHR surface_format{}; + bool has_imm{false}; + bool has_mailbox{false}; + bool has_fifo_relaxed{false}; bool current_srgb{}; - bool current_fps_unlocked{}; bool is_outdated{}; bool is_suboptimal{}; }; From a546ecbb1241a28b808d3a9ebe1a55f001c267ed Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Mon, 1 May 2023 20:36:23 -0400 Subject: [PATCH 0320/1181] configure_graphics: Actively find present modes When Vulkan devices are enumerated, this also determines the available present modes for each device, maps them to a vector, and gives those options to the user. OpenGL options are limited to On/Off. Required creating a VkSurfaceKHR during device enumeration, which may or may not be desireable. For the sake of a less confusing UI. Also fixes a bug where if a graphics device disappears on the host, we don't try and select the non-existant devices. configure_graphics: Remove vsync runtime lock for Vulkan configure_graphics: Recommend Mailbox present mode configure_graphics: Fix type-limits warning configure_graphics: Clean up includes configure_graphics: Add tooltip --- src/yuzu/configuration/configure_graphics.cpp | 155 ++++++++++++++++-- src/yuzu/configuration/configure_graphics.h | 10 ++ src/yuzu/configuration/configure_graphics.ui | 25 +-- 3 files changed, 162 insertions(+), 28 deletions(-) diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 17a54f0f4..3e3398f42 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -4,20 +4,62 @@ // Include this early to include Vulkan headers how we want to #include "video_core/vulkan_common/vulkan_wrapper.h" +#include #include +#include #include +#include +#include +#include "bootmanager.h" #include "common/common_types.h" #include "common/logging/log.h" #include "common/settings.h" #include "core/core.h" +#include "core/frontend/emu_window.h" #include "ui_configure_graphics.h" #include "video_core/vulkan_common/vulkan_instance.h" #include "video_core/vulkan_common/vulkan_library.h" +#include "video_core/vulkan_common/vulkan_surface.h" #include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configure_graphics.h" +#include "yuzu/qt_common.h" #include "yuzu/uisettings.h" +static const std::vector default_present_modes{VK_PRESENT_MODE_IMMEDIATE_KHR, + VK_PRESENT_MODE_FIFO_KHR}; + +// Converts a setting to a present mode (or vice versa) +static constexpr VkPresentModeKHR VSyncSettingToMode(Settings::VSyncMode mode) { + switch (mode) { + case Settings::VSyncMode::Immediate: + return VK_PRESENT_MODE_IMMEDIATE_KHR; + case Settings::VSyncMode::Mailbox: + return VK_PRESENT_MODE_MAILBOX_KHR; + case Settings::VSyncMode::FIFO: + return VK_PRESENT_MODE_FIFO_KHR; + case Settings::VSyncMode::FIFORelaxed: + return VK_PRESENT_MODE_FIFO_RELAXED_KHR; + default: + return VK_PRESENT_MODE_FIFO_KHR; + } +} + +static constexpr Settings::VSyncMode PresentModeToSetting(VkPresentModeKHR mode) { + switch (mode) { + case VK_PRESENT_MODE_IMMEDIATE_KHR: + return Settings::VSyncMode::Immediate; + case VK_PRESENT_MODE_MAILBOX_KHR: + return Settings::VSyncMode::Mailbox; + case VK_PRESENT_MODE_FIFO_KHR: + return Settings::VSyncMode::FIFO; + case VK_PRESENT_MODE_FIFO_RELAXED_KHR: + return Settings::VSyncMode::FIFORelaxed; + default: + return Settings::VSyncMode::FIFO; + } +} + ConfigureGraphics::ConfigureGraphics(const Core::System& system_, QWidget* parent) : QWidget(parent), ui{std::make_unique()}, system{system_} { vulkan_device = Settings::values.vulkan_device.GetValue(); @@ -39,13 +81,16 @@ ConfigureGraphics::ConfigureGraphics(const Core::System& system_, QWidget* paren connect(ui->api, qOverload(&QComboBox::currentIndexChanged), this, [this] { UpdateAPILayout(); + PopulateVSyncModeSelection(); if (!Settings::IsConfiguringGlobal()) { ConfigurationShared::SetHighlight( ui->api_widget, ui->api->currentIndex() != ConfigurationShared::USE_GLOBAL_INDEX); } }); - connect(ui->device, qOverload(&QComboBox::activated), this, - [this](int device) { UpdateDeviceSelection(device); }); + connect(ui->device, qOverload(&QComboBox::activated), this, [this](int device) { + UpdateDeviceSelection(device); + PopulateVSyncModeSelection(); + }); connect(ui->backend, qOverload(&QComboBox::activated), this, [this](int backend) { UpdateShaderBackendSelection(backend); }); @@ -70,6 +115,43 @@ ConfigureGraphics::ConfigureGraphics(const Core::System& system_, QWidget* paren ui->fsr_sharpening_label->setVisible(Settings::IsConfiguringGlobal()); } +void ConfigureGraphics::PopulateVSyncModeSelection() { + const Settings::RendererBackend backend{GetCurrentGraphicsBackend()}; + if (backend == Settings::RendererBackend::Null) { + ui->vsync_mode_combobox->setEnabled(false); + return; + } + ui->vsync_mode_combobox->setEnabled(true); + + const int current_index = //< current selected vsync mode from combobox + ui->vsync_mode_combobox->currentIndex(); + const auto current_mode = //< current selected vsync mode as a VkPresentModeKHR + current_index == -1 ? VSyncSettingToMode(Settings::values.vsync_mode.GetValue()) + : vsync_mode_combobox_enum_map[current_index]; + int index{}; + const int device{ui->device->currentIndex()}; //< current selected Vulkan device + const auto& present_modes = //< relevant vector of present modes for the selected device or API + backend == Settings::RendererBackend::Vulkan ? device_present_modes[device] + : default_present_modes; + + ui->vsync_mode_combobox->clear(); + vsync_mode_combobox_enum_map.clear(); + vsync_mode_combobox_enum_map.reserve(present_modes.size()); + for (const auto present_mode : present_modes) { + const auto mode_name = TranslateVSyncMode(present_mode, backend); + if (mode_name.isEmpty()) { + continue; + } + + ui->vsync_mode_combobox->insertItem(index, mode_name); + vsync_mode_combobox_enum_map.push_back(present_mode); + if (present_mode == current_mode) { + ui->vsync_mode_combobox->setCurrentIndex(index); + } + index++; + } +} + void ConfigureGraphics::UpdateDeviceSelection(int device) { if (device == -1) { return; @@ -99,7 +181,9 @@ void ConfigureGraphics::SetConfiguration() { ui->nvdec_emulation_widget->setEnabled(runtime_lock); ui->resolution_combobox->setEnabled(runtime_lock); ui->accelerate_astc->setEnabled(runtime_lock); - ui->vsync_mode_combobox->setEnabled(runtime_lock); + ui->vsync_mode_layout->setEnabled(runtime_lock || + Settings::values.renderer_backend.GetValue() == + Settings::RendererBackend::Vulkan); ui->use_disk_shader_cache->setChecked(Settings::values.use_disk_shader_cache.GetValue()); ui->use_asynchronous_gpu_emulation->setChecked( Settings::values.use_asynchronous_gpu_emulation.GetValue()); @@ -119,9 +203,6 @@ void ConfigureGraphics::SetConfiguration() { ui->fsr_sharpening_slider->setValue(Settings::values.fsr_sharpening_slider.GetValue()); ui->anti_aliasing_combobox->setCurrentIndex( static_cast(Settings::values.anti_aliasing.GetValue())); - - ui->vsync_mode_combobox->setCurrentIndex( - static_cast(Settings::values.vsync_mode.GetValue())); } else { ConfigurationShared::SetPerGameSetting(ui->api, &Settings::values.renderer_backend); ConfigurationShared::SetHighlight(ui->api_widget, @@ -174,7 +255,24 @@ void ConfigureGraphics::SetConfiguration() { Settings::values.bg_green.GetValue(), Settings::values.bg_blue.GetValue())); UpdateAPILayout(); + PopulateVSyncModeSelection(); //< must happen after UpdateAPILayout SetFSRIndicatorText(ui->fsr_sharpening_slider->sliderPosition()); + + // V-Sync setting needs to be determined after populating the V-Sync combobox + if (Settings::IsConfiguringGlobal()) { + const auto vsync_mode_setting = Settings::values.vsync_mode.GetValue(); + const auto vsync_mode = VSyncSettingToMode(vsync_mode_setting); + int index{}; + for (const auto mode : vsync_mode_combobox_enum_map) { + if (mode == vsync_mode) { + break; + } + index++; + } + if (static_cast(index) < vsync_mode_combobox_enum_map.size()) { + ui->vsync_mode_combobox->setCurrentIndex(index); + } + } } void ConfigureGraphics::SetFSRIndicatorText(int percentage) { @@ -182,6 +280,27 @@ void ConfigureGraphics::SetFSRIndicatorText(int percentage) { tr("%1%", "FSR sharpening percentage (e.g. 50%)").arg(100 - (percentage / 2))); } +const QString ConfigureGraphics::TranslateVSyncMode(VkPresentModeKHR mode, + Settings::RendererBackend backend) const { + switch (mode) { + case VK_PRESENT_MODE_IMMEDIATE_KHR: + return backend == Settings::RendererBackend::OpenGL + ? tr("Off") + : QStringLiteral("Immediate (%1)").arg(tr("V-Sync Off")); + case VK_PRESENT_MODE_MAILBOX_KHR: + return QStringLiteral("Mailbox (%1)").arg(tr("Recommended")); + case VK_PRESENT_MODE_FIFO_KHR: + return backend == Settings::RendererBackend::OpenGL + ? tr("On") + : QStringLiteral("FIFO (%1)").arg(tr("V-Sync On")); + case VK_PRESENT_MODE_FIFO_RELAXED_KHR: + return QStringLiteral("FIFO Relaxed"); + default: + return {}; + break; + } +} + void ConfigureGraphics::ApplyConfiguration() { const auto resolution_setup = static_cast( ui->resolution_combobox->currentIndex() - @@ -237,8 +356,9 @@ void ConfigureGraphics::ApplyConfiguration() { } Settings::values.fsr_sharpening_slider.SetValue(ui->fsr_sharpening_slider->value()); - Settings::values.vsync_mode.SetValue( - static_cast(ui->vsync_mode_combobox->currentIndex())); + const auto mode = vsync_mode_combobox_enum_map[ui->vsync_mode_combobox->currentIndex()]; + const auto vsync_mode = PresentModeToSetting(mode); + Settings::values.vsync_mode.SetValue(vsync_mode); } else { if (ui->resolution_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) { Settings::values.resolution_setup.SetGlobal(true); @@ -352,7 +472,9 @@ void ConfigureGraphics::UpdateAPILayout() { ui->backend_widget->setVisible(true); break; case Settings::RendererBackend::Vulkan: - ui->device->setCurrentIndex(vulkan_device); + if (static_cast(vulkan_device) < ui->device->count()) { + ui->device->setCurrentIndex(vulkan_device); + } ui->device_widget->setVisible(true); ui->backend_widget->setVisible(false); break; @@ -370,16 +492,27 @@ void ConfigureGraphics::RetrieveVulkanDevices() try { using namespace Vulkan; + auto* window = this->window()->windowHandle(); + auto wsi = YuzuQtCommon::GetWindowSystemInfo(window); + vk::InstanceDispatch dld; const Common::DynamicLibrary library = OpenLibrary(); - const vk::Instance instance = CreateInstance(library, dld, VK_API_VERSION_1_1); + const vk::Instance instance = CreateInstance(library, dld, VK_API_VERSION_1_1, wsi.type); const std::vector physical_devices = instance.EnumeratePhysicalDevices(); + vk::SurfaceKHR surface = //< needed to view present modes for a device + CreateSurface(instance, wsi); vulkan_devices.clear(); vulkan_devices.reserve(physical_devices.size()); + device_present_modes.clear(); + device_present_modes.reserve(physical_devices.size()); for (const VkPhysicalDevice device : physical_devices) { - const std::string name = vk::PhysicalDevice(device, dld).GetProperties().deviceName; + const auto physical_device = vk::PhysicalDevice(device, dld); + const std::string name = physical_device.GetProperties().deviceName; + const std::vector present_modes = + physical_device.GetSurfacePresentModesKHR(*surface); vulkan_devices.push_back(QString::fromStdString(name)); + device_present_modes.push_back(present_modes); } } catch (const Vulkan::vk::Exception& exception) { LOG_ERROR(Frontend, "Failed to enumerate devices with error: {}", exception.what()); diff --git a/src/yuzu/configuration/configure_graphics.h b/src/yuzu/configuration/configure_graphics.h index d98d6624e..6d8002de2 100644 --- a/src/yuzu/configuration/configure_graphics.h +++ b/src/yuzu/configuration/configure_graphics.h @@ -7,6 +7,7 @@ #include #include #include +#include #include "common/settings.h" namespace Core { @@ -35,6 +36,7 @@ private: void changeEvent(QEvent* event) override; void RetranslateUI(); + void PopulateVSyncModeSelection(); void UpdateBackgroundColorButton(QColor color); void UpdateAPILayout(); void UpdateDeviceSelection(int device); @@ -43,6 +45,10 @@ private: void RetrieveVulkanDevices(); void SetFSRIndicatorText(int percentage); + /* Turns a Vulkan present mode into a textual string for a UI + * (and eventually for a human to read) */ + const QString TranslateVSyncMode(VkPresentModeKHR mode, + Settings::RendererBackend backend) const; void SetupPerGameUI(); @@ -58,6 +64,10 @@ private: ConfigurationShared::CheckState use_asynchronous_gpu_emulation; std::vector vulkan_devices; + std::vector> device_present_modes; + std::vector + vsync_mode_combobox_enum_map; //< Keeps track of which present mode corresponds to which + // selection in the combobox u32 vulkan_device{}; Settings::ShaderBackend shader_backend{}; diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui index 9ad1c88a7..94eba6c7e 100644 --- a/src/yuzu/configuration/configure_graphics.ui +++ b/src/yuzu/configuration/configure_graphics.ui @@ -212,24 +212,15 @@ - - Off (Immediate) + + FIFO (V-Sync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + - - - Off (Immediate) - - - - - Double Buffering (FIFO) - - - - - Triple Buffering (Mailbox) - - From 0c0f5b7ccc1dcc2b223063ea75286203edb0eab0 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Tue, 2 May 2023 16:54:19 -0400 Subject: [PATCH 0321/1181] bootmanager: Clean up includes [IWYU] bootmanager: Remove system-specific headers IWYU can be too complete I suppose. --- src/yuzu/bootmanager.cpp | 40 +++++++++++++++++++++++++++++----------- src/yuzu/bootmanager.h | 25 +++++++++++++++++++++---- 2 files changed, 50 insertions(+), 15 deletions(-) diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index b064c9c64..d0c72b820 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -1,36 +1,48 @@ // SPDX-FileCopyrightText: 2014 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA +#include #include #include #endif +#include +#include +#include #include +#include +#include +#include #include -#include #include -#include -#include +#include +#include +#include +#include #include +#include #ifdef HAS_OPENGL #include #include #endif -#if !defined(WIN32) -#include -#endif - -#include - -#include "common/assert.h" #include "common/microprofile.h" +#include "common/polyfill_thread.h" #include "common/scm_rev.h" #include "common/settings.h" +#include "common/settings_input.h" +#include "common/thread.h" #include "core/core.h" #include "core/cpu_manager.h" #include "core/frontend/framebuffer_layout.h" @@ -40,11 +52,17 @@ #include "input_common/drivers/tas_input.h" #include "input_common/drivers/touch_screen.h" #include "input_common/main.h" +#include "video_core/gpu.h" +#include "video_core/rasterizer_interface.h" #include "video_core/renderer_base.h" #include "yuzu/bootmanager.h" #include "yuzu/main.h" #include "yuzu/qt_common.h" +class QObject; +class QPaintEngine; +class QSurface; + EmuThread::EmuThread(Core::System& system) : m_system{system} {} EmuThread::~EmuThread() = default; diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h index 8a69cf973..4276be82b 100644 --- a/src/yuzu/bootmanager.h +++ b/src/yuzu/bootmanager.h @@ -5,28 +5,46 @@ #include #include +#include #include #include +#include +#include +#include +#include #include +#include +#include +#include #include #include -#include #include +#include +#include +#include +#include "common/common_types.h" #include "common/logging/log.h" #include "common/polyfill_thread.h" #include "common/thread.h" #include "core/frontend/emu_window.h" -class GRenderWindow; class GMainWindow; class QCamera; class QCameraImageCapture; +class QCloseEvent; +class QFocusEvent; class QKeyEvent; +class QMouseEvent; +class QObject; +class QResizeEvent; +class QShowEvent; +class QTimer; +class QTouchEvent; +class QWheelEvent; namespace Core { -enum class SystemResultStatus : u32; class System; } // namespace Core @@ -41,7 +59,6 @@ enum class TasState; namespace VideoCore { enum class LoadCallbackStage; -class RendererBase; } // namespace VideoCore class EmuThread final : public QThread { From cd2981ee125bb4fac48b8acd31a3bd921cc362c4 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Tue, 2 May 2023 16:54:32 -0400 Subject: [PATCH 0322/1181] configure_graphics: Clean up includes [IWYU] --- src/yuzu/configuration/configure_graphics.cpp | 24 +++++++++++++++---- src/yuzu/configuration/configure_graphics.h | 13 +++++++++- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 3e3398f42..4a4a7bb0b 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -4,19 +4,33 @@ // Include this early to include Vulkan headers how we want to #include "video_core/vulkan_common/vulkan_wrapper.h" +#include +#include +#include +#include +#include +#include #include +#include +#include #include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include "bootmanager.h" #include "common/common_types.h" +#include "common/dynamic_library.h" #include "common/logging/log.h" #include "common/settings.h" #include "core/core.h" -#include "core/frontend/emu_window.h" #include "ui_configure_graphics.h" #include "video_core/vulkan_common/vulkan_instance.h" #include "video_core/vulkan_common/vulkan_library.h" diff --git a/src/yuzu/configuration/configure_graphics.h b/src/yuzu/configuration/configure_graphics.h index 6d8002de2..901f604a5 100644 --- a/src/yuzu/configuration/configure_graphics.h +++ b/src/yuzu/configuration/configure_graphics.h @@ -5,10 +5,21 @@ #include #include +#include #include #include +#include #include -#include "common/settings.h" +#include "common/common_types.h" + +class QEvent; +class QObject; + +namespace Settings { +enum class NvdecEmulation : u32; +enum class RendererBackend : u32; +enum class ShaderBackend : u32; +} // namespace Settings namespace Core { class System; From d82cad3fb3c03e678a5f1b34ab4a97b70611b081 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Tue, 2 May 2023 18:49:18 -0400 Subject: [PATCH 0323/1181] configure_input_player: Add missing include Cleaning up includes in bootmanager and configure_graphics has exposed a missing include here. --- src/yuzu/configuration/configure_input_player.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 50b62293e..a21a3eaa9 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "common/assert.h" #include "common/param_package.h" From 35e7f36a39775c48ba2c8ed6b5a52dcbbe381a19 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Tue, 2 May 2023 19:22:54 -0400 Subject: [PATCH 0324/1181] configure_graphics: No there isn't a hyphen in VSync Most sources seem to suggest VSync and not V-Sync --- src/yuzu/configuration/configure_graphics.cpp | 6 +++--- src/yuzu/configuration/configure_graphics.ui | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 4a4a7bb0b..6f5bc8d90 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -272,7 +272,7 @@ void ConfigureGraphics::SetConfiguration() { PopulateVSyncModeSelection(); //< must happen after UpdateAPILayout SetFSRIndicatorText(ui->fsr_sharpening_slider->sliderPosition()); - // V-Sync setting needs to be determined after populating the V-Sync combobox + // VSync setting needs to be determined after populating the VSync combobox if (Settings::IsConfiguringGlobal()) { const auto vsync_mode_setting = Settings::values.vsync_mode.GetValue(); const auto vsync_mode = VSyncSettingToMode(vsync_mode_setting); @@ -300,13 +300,13 @@ const QString ConfigureGraphics::TranslateVSyncMode(VkPresentModeKHR mode, case VK_PRESENT_MODE_IMMEDIATE_KHR: return backend == Settings::RendererBackend::OpenGL ? tr("Off") - : QStringLiteral("Immediate (%1)").arg(tr("V-Sync Off")); + : QStringLiteral("Immediate (%1)").arg(tr("VSync Off")); case VK_PRESENT_MODE_MAILBOX_KHR: return QStringLiteral("Mailbox (%1)").arg(tr("Recommended")); case VK_PRESENT_MODE_FIFO_KHR: return backend == Settings::RendererBackend::OpenGL ? tr("On") - : QStringLiteral("FIFO (%1)").arg(tr("V-Sync On")); + : QStringLiteral("FIFO (%1)").arg(tr("VSync On")); case VK_PRESENT_MODE_FIFO_RELAXED_KHR: return QStringLiteral("FIFO Relaxed"); default: diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui index 94eba6c7e..39f70e406 100644 --- a/src/yuzu/configuration/configure_graphics.ui +++ b/src/yuzu/configuration/configure_graphics.ui @@ -206,14 +206,14 @@ - V-Sync Mode: + VSync Mode: - FIFO (V-Sync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. Mailbox can have lower latency than FIFO and does not tear but may drop frames. Immediate (no synchronization) just presents whatever is available and can exhibit tearing. From f3fcc15ad5d77aa6d8cbd8dcc3f043e218224dee Mon Sep 17 00:00:00 2001 From: GPUCode Date: Wed, 3 May 2023 07:48:18 +0300 Subject: [PATCH 0325/1181] vk_present_manager: Fix softlocks when disabling async present --- src/video_core/renderer_vulkan/renderer_vulkan.cpp | 2 +- src/video_core/renderer_vulkan/vk_present_manager.cpp | 11 +++++++---- src/video_core/renderer_vulkan/vk_present_manager.h | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp index 69dc76180..908625c66 100644 --- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp +++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp @@ -134,7 +134,7 @@ void RendererVulkan::SwapBuffers(const Tegra::FramebufferConfig* framebuffer) { Frame* frame = present_manager.GetRenderFrame(); blit_screen.DrawToSwapchain(frame, *framebuffer, use_accelerated, is_srgb); scheduler.Flush(*frame->render_ready); - scheduler.Record([this, frame](vk::CommandBuffer) { present_manager.PushFrame(frame); }); + present_manager.Present(frame); gpu.RendererFrameEndNotify(); rasterizer.TickFrame(); diff --git a/src/video_core/renderer_vulkan/vk_present_manager.cpp b/src/video_core/renderer_vulkan/vk_present_manager.cpp index a137c66f2..c49583013 100644 --- a/src/video_core/renderer_vulkan/vk_present_manager.cpp +++ b/src/video_core/renderer_vulkan/vk_present_manager.cpp @@ -153,16 +153,19 @@ Frame* PresentManager::GetRenderFrame() { return frame; } -void PresentManager::PushFrame(Frame* frame) { +void PresentManager::Present(Frame* frame) { if (!use_present_thread) { + scheduler.WaitWorker(); CopyToSwapchain(frame); free_queue.push(frame); return; } - std::unique_lock lock{queue_mutex}; - present_queue.push(frame); - frame_cv.notify_one(); + scheduler.Record([this, frame](vk::CommandBuffer) { + std::unique_lock lock{queue_mutex}; + present_queue.push(frame); + frame_cv.notify_one(); + }); } void PresentManager::RecreateFrame(Frame* frame, u32 width, u32 height, bool is_srgb, diff --git a/src/video_core/renderer_vulkan/vk_present_manager.h b/src/video_core/renderer_vulkan/vk_present_manager.h index 9885fd7c6..420a775e2 100644 --- a/src/video_core/renderer_vulkan/vk_present_manager.h +++ b/src/video_core/renderer_vulkan/vk_present_manager.h @@ -45,7 +45,7 @@ public: Frame* GetRenderFrame(); /// Pushes a frame for presentation - void PushFrame(Frame* frame); + void Present(Frame* frame); /// Recreates the present frame to match the provided parameters void RecreateFrame(Frame* frame, u32 width, u32 height, bool is_srgb, From 87a9be8decdb89bc0e438569ae1aba8dfd63316c Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Tue, 2 May 2023 21:43:24 +0200 Subject: [PATCH 0326/1181] GPU: implement missing ASTC --- src/video_core/compatible_formats.cpp | 20 ++++++++++--------- .../renderer_opengl/gl_texture_cache.cpp | 3 +++ .../renderer_opengl/maxwell_to_gl.h | 3 +++ .../renderer_vulkan/maxwell_to_vk.cpp | 3 +++ src/video_core/surface.cpp | 5 +++++ src/video_core/surface.h | 12 +++++++++++ .../texture_cache/format_lookup_table.cpp | 6 ++++++ src/video_core/texture_cache/formatter.h | 6 ++++++ 8 files changed, 49 insertions(+), 9 deletions(-) diff --git a/src/video_core/compatible_formats.cpp b/src/video_core/compatible_formats.cpp index 4e75f33ca..ab4f4d407 100644 --- a/src/video_core/compatible_formats.cpp +++ b/src/video_core/compatible_formats.cpp @@ -126,15 +126,14 @@ constexpr std::array VIEW_CLASS_ASTC_8x8_RGBA{ PixelFormat::ASTC_2D_8X8_SRGB, }; -// Missing formats: -// PixelFormat::ASTC_2D_10X5_UNORM -// PixelFormat::ASTC_2D_10X5_SRGB - -// Missing formats: -// PixelFormat::ASTC_2D_10X6_SRGB +constexpr std::array VIEW_CLASS_ASTC_10x5_RGBA{ + PixelFormat::ASTC_2D_10X5_UNORM, + PixelFormat::ASTC_2D_10X5_SRGB, +}; constexpr std::array VIEW_CLASS_ASTC_10x6_RGBA{ PixelFormat::ASTC_2D_10X6_UNORM, + PixelFormat::ASTC_2D_10X6_SRGB, }; constexpr std::array VIEW_CLASS_ASTC_10x8_RGBA{ @@ -147,9 +146,10 @@ constexpr std::array VIEW_CLASS_ASTC_10x10_RGBA{ PixelFormat::ASTC_2D_10X10_SRGB, }; -// Missing formats -// ASTC_2D_12X10_UNORM, -// ASTC_2D_12X10_SRGB, +constexpr std::array VIEW_CLASS_ASTC_12x10_RGBA{ + PixelFormat::ASTC_2D_12X10_UNORM, + PixelFormat::ASTC_2D_12X10_SRGB, +}; constexpr std::array VIEW_CLASS_ASTC_12x12_RGBA{ PixelFormat::ASTC_2D_12X12_UNORM, @@ -229,9 +229,11 @@ constexpr Table MakeViewTable() { EnableRange(view, VIEW_CLASS_ASTC_6x6_RGBA); EnableRange(view, VIEW_CLASS_ASTC_8x5_RGBA); EnableRange(view, VIEW_CLASS_ASTC_8x8_RGBA); + EnableRange(view, VIEW_CLASS_ASTC_10x5_RGBA); EnableRange(view, VIEW_CLASS_ASTC_10x6_RGBA); EnableRange(view, VIEW_CLASS_ASTC_10x8_RGBA); EnableRange(view, VIEW_CLASS_ASTC_10x10_RGBA); + EnableRange(view, VIEW_CLASS_ASTC_12x10_RGBA); EnableRange(view, VIEW_CLASS_ASTC_12x12_RGBA); return view; } diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index 032a8ebc5..47cccd0e5 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -861,9 +861,12 @@ GLuint Image::StorageHandle() noexcept { case PixelFormat::ASTC_2D_8X5_SRGB: case PixelFormat::ASTC_2D_5X4_SRGB: case PixelFormat::ASTC_2D_5X5_SRGB: + case PixelFormat::ASTC_2D_10X5_SRGB: + case PixelFormat::ASTC_2D_10X6_SRGB: case PixelFormat::ASTC_2D_10X8_SRGB: case PixelFormat::ASTC_2D_6X6_SRGB: case PixelFormat::ASTC_2D_10X10_SRGB: + case PixelFormat::ASTC_2D_12X10_SRGB: case PixelFormat::ASTC_2D_12X12_SRGB: case PixelFormat::ASTC_2D_8X6_SRGB: case PixelFormat::ASTC_2D_6X5_SRGB: diff --git a/src/video_core/renderer_opengl/maxwell_to_gl.h b/src/video_core/renderer_opengl/maxwell_to_gl.h index ef1190e1f..c7dc7e0a1 100644 --- a/src/video_core/renderer_opengl/maxwell_to_gl.h +++ b/src/video_core/renderer_opengl/maxwell_to_gl.h @@ -100,10 +100,13 @@ constexpr std::array FORMAT_TAB {GL_COMPRESSED_RGBA_ASTC_6x6_KHR}, // ASTC_2D_6X6_UNORM {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR}, // ASTC_2D_6X6_SRGB {GL_COMPRESSED_RGBA_ASTC_10x6_KHR}, // ASTC_2D_10X6_UNORM + {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR}, // ASTC_2D_10X6_SRGB {GL_COMPRESSED_RGBA_ASTC_10x5_KHR}, // ASTC_2D_10X5_UNORM {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR}, // ASTC_2D_10X5_SRGB {GL_COMPRESSED_RGBA_ASTC_10x10_KHR}, // ASTC_2D_10X10_UNORM {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR}, // ASTC_2D_10X10_SRGB + {GL_COMPRESSED_RGBA_ASTC_12x10_KHR}, // ASTC_2D_12X10_UNORM + {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR}, // ASTC_2D_12X10_SRGB {GL_COMPRESSED_RGBA_ASTC_12x12_KHR}, // ASTC_2D_12X12_UNORM {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR}, // ASTC_2D_12X12_SRGB {GL_COMPRESSED_RGBA_ASTC_8x6_KHR}, // ASTC_2D_8X6_UNORM diff --git a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp index 5dce51be8..8853cf0f7 100644 --- a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp +++ b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp @@ -197,10 +197,13 @@ struct FormatTuple { {VK_FORMAT_ASTC_6x6_UNORM_BLOCK}, // ASTC_2D_6X6_UNORM {VK_FORMAT_ASTC_6x6_SRGB_BLOCK}, // ASTC_2D_6X6_SRGB {VK_FORMAT_ASTC_10x6_UNORM_BLOCK}, // ASTC_2D_10X6_UNORM + {VK_FORMAT_ASTC_10x6_SRGB_BLOCK}, // ASTC_2D_10X6_SRGB {VK_FORMAT_ASTC_10x5_UNORM_BLOCK}, // ASTC_2D_10X5_UNORM {VK_FORMAT_ASTC_10x5_SRGB_BLOCK}, // ASTC_2D_10X5_SRGB {VK_FORMAT_ASTC_10x10_UNORM_BLOCK}, // ASTC_2D_10X10_UNORM {VK_FORMAT_ASTC_10x10_SRGB_BLOCK}, // ASTC_2D_10X10_SRGB + {VK_FORMAT_ASTC_12x10_UNORM_BLOCK}, // ASTC_2D_12X10_UNORM + {VK_FORMAT_ASTC_12x10_SRGB_BLOCK}, // ASTC_2D_12X10_SRGB {VK_FORMAT_ASTC_12x12_UNORM_BLOCK}, // ASTC_2D_12X12_UNORM {VK_FORMAT_ASTC_12x12_SRGB_BLOCK}, // ASTC_2D_12X12_SRGB {VK_FORMAT_ASTC_8x6_UNORM_BLOCK}, // ASTC_2D_8X6_UNORM diff --git a/src/video_core/surface.cpp b/src/video_core/surface.cpp index 1a76d4178..cb51529e4 100644 --- a/src/video_core/surface.cpp +++ b/src/video_core/surface.cpp @@ -250,10 +250,13 @@ bool IsPixelFormatASTC(PixelFormat format) { case PixelFormat::ASTC_2D_6X6_UNORM: case PixelFormat::ASTC_2D_6X6_SRGB: case PixelFormat::ASTC_2D_10X6_UNORM: + case PixelFormat::ASTC_2D_10X6_SRGB: case PixelFormat::ASTC_2D_10X5_UNORM: case PixelFormat::ASTC_2D_10X5_SRGB: case PixelFormat::ASTC_2D_10X10_UNORM: case PixelFormat::ASTC_2D_10X10_SRGB: + case PixelFormat::ASTC_2D_12X10_UNORM: + case PixelFormat::ASTC_2D_12X10_SRGB: case PixelFormat::ASTC_2D_12X12_UNORM: case PixelFormat::ASTC_2D_12X12_SRGB: case PixelFormat::ASTC_2D_8X6_UNORM: @@ -279,11 +282,13 @@ bool IsPixelFormatSRGB(PixelFormat format) { case PixelFormat::ASTC_2D_8X5_SRGB: case PixelFormat::ASTC_2D_5X4_SRGB: case PixelFormat::ASTC_2D_5X5_SRGB: + case PixelFormat::ASTC_2D_10X6_SRGB: case PixelFormat::ASTC_2D_10X8_SRGB: case PixelFormat::ASTC_2D_6X6_SRGB: case PixelFormat::ASTC_2D_10X5_SRGB: case PixelFormat::ASTC_2D_10X10_SRGB: case PixelFormat::ASTC_2D_12X12_SRGB: + case PixelFormat::ASTC_2D_12X10_SRGB: case PixelFormat::ASTC_2D_8X6_SRGB: case PixelFormat::ASTC_2D_6X5_SRGB: return true; diff --git a/src/video_core/surface.h b/src/video_core/surface.h index 44b79af20..0225d3287 100644 --- a/src/video_core/surface.h +++ b/src/video_core/surface.h @@ -95,10 +95,13 @@ enum class PixelFormat { ASTC_2D_6X6_UNORM, ASTC_2D_6X6_SRGB, ASTC_2D_10X6_UNORM, + ASTC_2D_10X6_SRGB, ASTC_2D_10X5_UNORM, ASTC_2D_10X5_SRGB, ASTC_2D_10X10_UNORM, ASTC_2D_10X10_SRGB, + ASTC_2D_12X10_UNORM, + ASTC_2D_12X10_SRGB, ASTC_2D_12X12_UNORM, ASTC_2D_12X12_SRGB, ASTC_2D_8X6_UNORM, @@ -232,10 +235,13 @@ constexpr std::array BLOCK_WIDTH_TABLE = {{ 6, // ASTC_2D_6X6_UNORM 6, // ASTC_2D_6X6_SRGB 10, // ASTC_2D_10X6_UNORM + 10, // ASTC_2D_10X6_SRGB 10, // ASTC_2D_10X5_UNORM 10, // ASTC_2D_10X5_SRGB 10, // ASTC_2D_10X10_UNORM 10, // ASTC_2D_10X10_SRGB + 12, // ASTC_2D_12X10_UNORM + 12, // ASTC_2D_12X10_SRGB 12, // ASTC_2D_12X12_UNORM 12, // ASTC_2D_12X12_SRGB 8, // ASTC_2D_8X6_UNORM @@ -338,10 +344,13 @@ constexpr std::array BLOCK_HEIGHT_TABLE = {{ 6, // ASTC_2D_6X6_UNORM 6, // ASTC_2D_6X6_SRGB 6, // ASTC_2D_10X6_UNORM + 6, // ASTC_2D_10X6_SRGB 5, // ASTC_2D_10X5_UNORM 5, // ASTC_2D_10X5_SRGB 10, // ASTC_2D_10X10_UNORM 10, // ASTC_2D_10X10_SRGB + 10, // ASTC_2D_12X10_UNORM + 10, // ASTC_2D_12X10_SRGB 12, // ASTC_2D_12X12_UNORM 12, // ASTC_2D_12X12_SRGB 6, // ASTC_2D_8X6_UNORM @@ -444,10 +453,13 @@ constexpr std::array BITS_PER_BLOCK_TABLE = {{ 128, // ASTC_2D_6X6_UNORM 128, // ASTC_2D_6X6_SRGB 128, // ASTC_2D_10X6_UNORM + 128, // ASTC_2D_10X6_SRGB 128, // ASTC_2D_10X5_UNORM 128, // ASTC_2D_10X5_SRGB 128, // ASTC_2D_10X10_UNORM 128, // ASTC_2D_10X10_SRGB + 128, // ASTC_2D_12X10_UNORM + 128, // ASTC_2D_12X10_SRGB 128, // ASTC_2D_12X12_UNORM 128, // ASTC_2D_12X12_SRGB 128, // ASTC_2D_8X6_UNORM diff --git a/src/video_core/texture_cache/format_lookup_table.cpp b/src/video_core/texture_cache/format_lookup_table.cpp index 5fc2b2fec..11ced6c38 100644 --- a/src/video_core/texture_cache/format_lookup_table.cpp +++ b/src/video_core/texture_cache/format_lookup_table.cpp @@ -210,6 +210,8 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red, return PixelFormat::ASTC_2D_6X6_SRGB; case Hash(TextureFormat::ASTC_2D_10X6, UNORM, LINEAR): return PixelFormat::ASTC_2D_10X6_UNORM; + case Hash(TextureFormat::ASTC_2D_10X6, UNORM, SRGB): + return PixelFormat::ASTC_2D_10X6_SRGB; case Hash(TextureFormat::ASTC_2D_10X5, UNORM, LINEAR): return PixelFormat::ASTC_2D_10X5_UNORM; case Hash(TextureFormat::ASTC_2D_10X5, UNORM, SRGB): @@ -218,6 +220,10 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red, return PixelFormat::ASTC_2D_10X10_UNORM; case Hash(TextureFormat::ASTC_2D_10X10, UNORM, SRGB): return PixelFormat::ASTC_2D_10X10_SRGB; + case Hash(TextureFormat::ASTC_2D_12X10, UNORM, LINEAR): + return PixelFormat::ASTC_2D_12X10_UNORM; + case Hash(TextureFormat::ASTC_2D_12X10, UNORM, SRGB): + return PixelFormat::ASTC_2D_12X10_SRGB; case Hash(TextureFormat::ASTC_2D_12X12, UNORM, LINEAR): return PixelFormat::ASTC_2D_12X12_UNORM; case Hash(TextureFormat::ASTC_2D_12X12, UNORM, SRGB): diff --git a/src/video_core/texture_cache/formatter.h b/src/video_core/texture_cache/formatter.h index f1f0a057b..b97147797 100644 --- a/src/video_core/texture_cache/formatter.h +++ b/src/video_core/texture_cache/formatter.h @@ -179,6 +179,8 @@ struct fmt::formatter : fmt::formatter : fmt::formatter Date: Wed, 3 May 2023 18:11:34 -0400 Subject: [PATCH 0327/1181] qt_common: Remove yuzu prefix --- src/yuzu/bootmanager.cpp | 4 ++-- src/yuzu/configuration/configure_graphics.cpp | 2 +- src/yuzu/qt_common.cpp | 4 ++-- src/yuzu/qt_common.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index d0c72b820..59d226113 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -241,7 +241,7 @@ public: explicit RenderWidget(GRenderWindow* parent) : QWidget(parent), render_window(parent) { setAttribute(Qt::WA_NativeWindow); setAttribute(Qt::WA_PaintOnScreen); - if (YuzuQtCommon::GetWindowSystemType() == Core::Frontend::WindowSystemType::Wayland) { + if (QtCommon::GetWindowSystemType() == Core::Frontend::WindowSystemType::Wayland) { setAttribute(Qt::WA_DontCreateNativeAncestors); } } @@ -884,7 +884,7 @@ bool GRenderWindow::InitRenderTarget() { } // Update the Window System information with the new render target - window_info = YuzuQtCommon::GetWindowSystemInfo(child_widget->windowHandle()); + window_info = QtCommon::GetWindowSystemInfo(child_widget->windowHandle()); child_widget->resize(Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height); layout()->addWidget(child_widget); diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 6f5bc8d90..76e5b7499 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -507,7 +507,7 @@ void ConfigureGraphics::RetrieveVulkanDevices() try { using namespace Vulkan; auto* window = this->window()->windowHandle(); - auto wsi = YuzuQtCommon::GetWindowSystemInfo(window); + auto wsi = QtCommon::GetWindowSystemInfo(window); vk::InstanceDispatch dld; const Common::DynamicLibrary library = OpenLibrary(); diff --git a/src/yuzu/qt_common.cpp b/src/yuzu/qt_common.cpp index 1b533ee40..5ac9fe310 100644 --- a/src/yuzu/qt_common.cpp +++ b/src/yuzu/qt_common.cpp @@ -12,7 +12,7 @@ #include #endif -namespace YuzuQtCommon { +namespace QtCommon { Core::Frontend::WindowSystemType GetWindowSystemType() { // Determine WSI type based on Qt platform. QString platform_name = QGuiApplication::platformName(); @@ -52,4 +52,4 @@ Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow* window) return wsi; } -} // namespace YuzuQtCommon +} // namespace QtCommon diff --git a/src/yuzu/qt_common.h b/src/yuzu/qt_common.h index b366adee6..9c63f08f3 100644 --- a/src/yuzu/qt_common.h +++ b/src/yuzu/qt_common.h @@ -6,10 +6,10 @@ #include #include "core/frontend/emu_window.h" -namespace YuzuQtCommon { +namespace QtCommon { Core::Frontend::WindowSystemType GetWindowSystemType(); Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow* window); -} // namespace YuzuQtCommon +} // namespace QtCommon From 1c13c74295ebd63a1236c1522e2f9f842742ccd8 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Thu, 4 May 2023 00:04:22 +0200 Subject: [PATCH 0328/1181] Memory manager: Fix possible softlock --- src/video_core/memory_manager.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index e06ce5d14..7b2cde7a7 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -82,6 +82,7 @@ void MemoryManager::SetEntry(size_t position, MemoryManager::EntryType entry) { } PTEKind MemoryManager::GetPageKind(GPUVAddr gpu_addr) const { + std::unique_lock lock(guard); return kind_map.GetValueAt(gpu_addr); } @@ -160,7 +161,10 @@ GPUVAddr MemoryManager::BigPageTableOp(GPUVAddr gpu_addr, [[maybe_unused]] VAddr } remaining_size -= big_page_size; } - kind_map.Map(gpu_addr, gpu_addr + size, kind); + { + std::unique_lock lock(guard); + kind_map.Map(gpu_addr, gpu_addr + size, kind); + } return gpu_addr; } @@ -170,7 +174,6 @@ void MemoryManager::BindRasterizer(VideoCore::RasterizerInterface* rasterizer_) GPUVAddr MemoryManager::Map(GPUVAddr gpu_addr, VAddr cpu_addr, std::size_t size, PTEKind kind, bool is_big_pages) { - std::unique_lock lock(guard); if (is_big_pages) [[likely]] { return BigPageTableOp(gpu_addr, cpu_addr, size, kind); } @@ -178,7 +181,6 @@ GPUVAddr MemoryManager::Map(GPUVAddr gpu_addr, VAddr cpu_addr, std::size_t size, } GPUVAddr MemoryManager::MapSparse(GPUVAddr gpu_addr, std::size_t size, bool is_big_pages) { - std::unique_lock lock(guard); if (is_big_pages) [[likely]] { return BigPageTableOp(gpu_addr, 0, size, PTEKind::INVALID); } @@ -189,7 +191,6 @@ void MemoryManager::Unmap(GPUVAddr gpu_addr, std::size_t size) { if (size == 0) { return; } - std::unique_lock lock(guard); GetSubmappedRangeImpl(gpu_addr, size, page_stash); for (const auto& [map_addr, map_size] : page_stash) { From ae59ffc56c6e93f603a6cfc3efec02de93c3c19b Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 3 May 2023 18:51:44 -0400 Subject: [PATCH 0329/1181] settings: remove pessimistic flushing --- src/common/settings.cpp | 1 - src/common/settings.h | 1 - src/yuzu/configuration/config.cpp | 2 -- src/yuzu/configuration/configure_graphics_advanced.cpp | 8 -------- src/yuzu/configuration/configure_graphics_advanced.h | 1 - src/yuzu/configuration/configure_graphics_advanced.ui | 10 ---------- src/yuzu_cmd/config.cpp | 1 - src/yuzu_cmd/default_ini.h | 4 ---- 8 files changed, 28 deletions(-) diff --git a/src/common/settings.cpp b/src/common/settings.cpp index cb1bca467..174460c5e 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -227,7 +227,6 @@ void RestoreGlobalState(bool is_powered_on) { values.shader_backend.SetGlobal(true); values.use_asynchronous_shaders.SetGlobal(true); values.use_fast_gpu_time.SetGlobal(true); - values.use_pessimistic_flushes.SetGlobal(true); values.use_vulkan_driver_pipeline_cache.SetGlobal(true); values.bg_red.SetGlobal(true); values.bg_green.SetGlobal(true); diff --git a/src/common/settings.h b/src/common/settings.h index adebb0ca7..55200c36f 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -461,7 +461,6 @@ struct Values { ShaderBackend::SPIRV, "shader_backend"}; SwitchableSetting use_asynchronous_shaders{false, "use_asynchronous_shaders"}; SwitchableSetting use_fast_gpu_time{true, "use_fast_gpu_time"}; - SwitchableSetting use_pessimistic_flushes{false, "use_pessimistic_flushes"}; SwitchableSetting use_vulkan_driver_pipeline_cache{true, "use_vulkan_driver_pipeline_cache"}; diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index be33e4d79..0131f63e7 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -713,7 +713,6 @@ void Config::ReadRendererValues() { ReadGlobalSetting(Settings::values.shader_backend); ReadGlobalSetting(Settings::values.use_asynchronous_shaders); ReadGlobalSetting(Settings::values.use_fast_gpu_time); - ReadGlobalSetting(Settings::values.use_pessimistic_flushes); ReadGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache); ReadGlobalSetting(Settings::values.bg_red); ReadGlobalSetting(Settings::values.bg_green); @@ -1359,7 +1358,6 @@ void Config::SaveRendererValues() { Settings::values.shader_backend.UsingGlobal()); WriteGlobalSetting(Settings::values.use_asynchronous_shaders); WriteGlobalSetting(Settings::values.use_fast_gpu_time); - WriteGlobalSetting(Settings::values.use_pessimistic_flushes); WriteGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache); WriteGlobalSetting(Settings::values.bg_red); WriteGlobalSetting(Settings::values.bg_green); diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp index 7f7bf0e4d..ddda79983 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.cpp +++ b/src/yuzu/configuration/configure_graphics_advanced.cpp @@ -34,7 +34,6 @@ void ConfigureGraphicsAdvanced::SetConfiguration() { ui->async_astc->setChecked(Settings::values.async_astc.GetValue()); ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue()); ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue()); - ui->use_pessimistic_flushes->setChecked(Settings::values.use_pessimistic_flushes.GetValue()); ui->use_vulkan_driver_pipeline_cache->setChecked( Settings::values.use_vulkan_driver_pipeline_cache.GetValue()); @@ -71,8 +70,6 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() { use_asynchronous_shaders); ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time, ui->use_fast_gpu_time, use_fast_gpu_time); - ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_pessimistic_flushes, - ui->use_pessimistic_flushes, use_pessimistic_flushes); ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vulkan_driver_pipeline_cache, ui->use_vulkan_driver_pipeline_cache, use_vulkan_driver_pipeline_cache); @@ -102,8 +99,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { ui->use_asynchronous_shaders->setEnabled( Settings::values.use_asynchronous_shaders.UsingGlobal()); ui->use_fast_gpu_time->setEnabled(Settings::values.use_fast_gpu_time.UsingGlobal()); - ui->use_pessimistic_flushes->setEnabled( - Settings::values.use_pessimistic_flushes.UsingGlobal()); ui->use_vulkan_driver_pipeline_cache->setEnabled( Settings::values.use_vulkan_driver_pipeline_cache.UsingGlobal()); ui->anisotropic_filtering_combobox->setEnabled( @@ -125,9 +120,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { use_asynchronous_shaders); ConfigurationShared::SetColoredTristate(ui->use_fast_gpu_time, Settings::values.use_fast_gpu_time, use_fast_gpu_time); - ConfigurationShared::SetColoredTristate(ui->use_pessimistic_flushes, - Settings::values.use_pessimistic_flushes, - use_pessimistic_flushes); ConfigurationShared::SetColoredTristate(ui->use_vulkan_driver_pipeline_cache, Settings::values.use_vulkan_driver_pipeline_cache, use_vulkan_driver_pipeline_cache); diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.h index 5394ed40a..ff5060957 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.h +++ b/src/yuzu/configuration/configure_graphics_advanced.h @@ -42,7 +42,6 @@ private: ConfigurationShared::CheckState async_astc; ConfigurationShared::CheckState use_asynchronous_shaders; ConfigurationShared::CheckState use_fast_gpu_time; - ConfigurationShared::CheckState use_pessimistic_flushes; ConfigurationShared::CheckState use_vulkan_driver_pipeline_cache; const Core::System& system; diff --git a/src/yuzu/configuration/configure_graphics_advanced.ui b/src/yuzu/configuration/configure_graphics_advanced.ui index d7ec18939..1234f695c 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.ui +++ b/src/yuzu/configuration/configure_graphics_advanced.ui @@ -126,16 +126,6 @@ - - - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - - - Use pessimistic buffer flushes (Hack) - - - diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index e4f91d07c..605280949 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -327,7 +327,6 @@ void Config::ReadValues() { ReadSetting("Renderer", Settings::values.accelerate_astc); ReadSetting("Renderer", Settings::values.async_astc); ReadSetting("Renderer", Settings::values.use_fast_gpu_time); - ReadSetting("Renderer", Settings::values.use_pessimistic_flushes); ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache); ReadSetting("Renderer", Settings::values.bg_red); diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index f714eae17..db6fba922 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -374,10 +374,6 @@ use_asynchronous_gpu_emulation = # 0: Off, 1 (default): On use_fast_gpu_time = -# Force unmodified buffers to be flushed, which can cost performance. -# 0: Off (default), 1: On -use_pessimistic_flushes = - # Whether to use garbage collection or not for GPU caches. # 0 (default): Off, 1: On use_caches_gc = From b095a0242de751fb286013290feb21a4d93ac69c Mon Sep 17 00:00:00 2001 From: Valeri Date: Thu, 4 May 2023 15:36:47 +0300 Subject: [PATCH 0330/1181] Remove LGTM config LGTM.com is no longer available since it was superseded by CodeQL. --- .lgtm.yml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 .lgtm.yml diff --git a/.lgtm.yml b/.lgtm.yml deleted file mode 100644 index 7cd3f9926..000000000 --- a/.lgtm.yml +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-FileCopyrightText: 2020 yuzu Emulator Project -# SPDX-License-Identifier: GPL-2.0-or-later - -path_classifiers: - library: "externals" -extraction: - cpp: - prepare: - packages: - - "libsdl2-dev" - - "qtmultimedia5-dev" - - "libtbb-dev" - - "libjack-jackd2-dev" From 8df3aed2f154193869881c4eccf507f9d1ba5ff4 Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 4 May 2023 22:36:59 -0600 Subject: [PATCH 0331/1181] core: hid: Fix state of capture and home buttons --- src/core/hid/emulated_controller.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index a70f8807c..db71f1c19 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp @@ -551,6 +551,8 @@ void EmulatedController::EnableSystemButtons() { void EmulatedController::DisableSystemButtons() { std::scoped_lock lock{mutex}; system_buttons_enabled = false; + controller.home_button_state.raw = 0; + controller.capture_button_state.raw = 0; } void EmulatedController::ResetSystemButtons() { @@ -734,6 +736,8 @@ void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback if (is_configuring) { controller.npad_button_state.raw = NpadButton::None; controller.debug_pad_button_state.raw = 0; + controller.home_button_state.raw = 0; + controller.capture_button_state.raw = 0; lock.unlock(); TriggerOnChange(ControllerTriggerType::Button, false); return; From 740c3498202e7ffe79e0cede54c802a1da0cbb4c Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Fri, 5 May 2023 03:48:28 -0400 Subject: [PATCH 0332/1181] yuzu-sdl,audio_core: Remove antiquated warning ignore Issue was fixed a long time ago, both by SDL2 and in yuzu by including SDL2 as a system library. --- src/audio_core/sink/sdl2_sink.cpp | 11 +---------- src/yuzu_cmd/config.cpp | 12 +----------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/audio_core/sink/sdl2_sink.cpp b/src/audio_core/sink/sdl2_sink.cpp index ee1a0652f..c1529d1f9 100644 --- a/src/audio_core/sink/sdl2_sink.cpp +++ b/src/audio_core/sink/sdl2_sink.cpp @@ -3,6 +3,7 @@ #include #include +#include #include "audio_core/common/common.h" #include "audio_core/sink/sdl2_sink.h" @@ -10,16 +11,6 @@ #include "common/logging/log.h" #include "core/core.h" -// Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307 -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wimplicit-fallthrough" -#endif -#include -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - namespace AudioCore::Sink { /** * SDL sink stream, responsible for sinking samples to hardware. diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index fa347fb8c..a2f1d3d7e 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -4,18 +4,8 @@ #include #include #include - -// Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307 -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wimplicit-fallthrough" -#endif -#include -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - #include +#include #include "common/fs/file.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" From 432d754d7df14df7bd151e798fc71068eba99702 Mon Sep 17 00:00:00 2001 From: Merry Date: Fri, 5 May 2023 16:30:18 +0100 Subject: [PATCH 0333/1181] externals: Update dynarmic to 6.4.7 --- externals/dynarmic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/dynarmic b/externals/dynarmic index c08c5a936..f9e6a3df5 160000 --- a/externals/dynarmic +++ b/externals/dynarmic @@ -1 +1 @@ -Subproject commit c08c5a9362bb224dc343c2f616c24df027dfdf13 +Subproject commit f9e6a3df5c84bcc74be46c289a74a78e5e28d62d From 0a6bd8b236219c0ca7d140c3552c6a72d5c3ccd0 Mon Sep 17 00:00:00 2001 From: marius david Date: Sun, 30 Apr 2023 14:07:40 +0200 Subject: [PATCH 0334/1181] Improve emulation of HD Rumble --- src/input_common/drivers/sdl_driver.cpp | 35 ++++++++++++++++++++----- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index 7f9e8dbb9..9a0439bb5 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp @@ -109,14 +109,37 @@ public: } bool RumblePlay(const Common::Input::VibrationStatus vibration) { - constexpr u32 rumble_max_duration_ms = 1000; + constexpr u32 rumble_max_duration_ms = 2000; + constexpr f32 low_start_sensitivity_limit = 140.0; + constexpr f32 low_width_sensitivity_limit = 400.0; + constexpr f32 high_start_sensitivity_limit = 200.0; + constexpr f32 high_width_sensitivity_limit = 700.0; + // Try to provide some feeling of the frequency by reducing the amplitude depending on it. + f32 low_frequency_scale = 1.0; + if (vibration.low_frequency > low_start_sensitivity_limit) { + low_frequency_scale = + std::max(1.0f - (vibration.low_frequency - low_start_sensitivity_limit) / + low_width_sensitivity_limit, + 0.3f); + } + f32 low_amplitude = vibration.low_amplitude * low_frequency_scale; + + f32 high_frequency_scale = 1.0; + if (vibration.high_frequency > high_start_sensitivity_limit) { + high_frequency_scale = + std::max(1.0f - (vibration.high_frequency - high_start_sensitivity_limit) / + high_width_sensitivity_limit, + 0.3f); + } + f32 high_amplitude = vibration.high_amplitude * high_frequency_scale; + if (sdl_controller) { - return SDL_GameControllerRumble( - sdl_controller.get(), static_cast(vibration.low_amplitude), - static_cast(vibration.high_amplitude), rumble_max_duration_ms) != -1; + return SDL_GameControllerRumble(sdl_controller.get(), static_cast(low_amplitude), + static_cast(high_amplitude), + rumble_max_duration_ms) != -1; } else if (sdl_joystick) { - return SDL_JoystickRumble(sdl_joystick.get(), static_cast(vibration.low_amplitude), - static_cast(vibration.high_amplitude), + return SDL_JoystickRumble(sdl_joystick.get(), static_cast(low_amplitude), + static_cast(high_amplitude), rumble_max_duration_ms) != -1; } From 46e835f2d6531baea061a2723d171a2f5a1abf6a Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Fri, 5 May 2023 12:29:26 -0600 Subject: [PATCH 0335/1181] yuzu: Add motion preview to controller input --- src/common/vector_math.h | 14 +++ src/core/hid/emulated_controller.cpp | 6 +- src/core/hid/emulated_controller.h | 1 + src/core/hid/motion_input.cpp | 36 ++++++++ src/core/hid/motion_input.h | 2 + .../configure_input_player_widget.cpp | 91 +++++++++++++++++++ .../configure_input_player_widget.h | 5 + 7 files changed, 151 insertions(+), 4 deletions(-) diff --git a/src/common/vector_math.h b/src/common/vector_math.h index 0e2095c45..9a7d50abd 100644 --- a/src/common/vector_math.h +++ b/src/common/vector_math.h @@ -259,6 +259,20 @@ public: return *this; } + void RotateFromOrigin(float roll, float pitch, float yaw) { + float temp = y; + y = std::cos(roll) * y - std::sin(roll) * z; + z = std::sin(roll) * temp + std::cos(roll) * z; + + temp = x; + x = std::cosf(pitch) * x + std::sin(pitch) * z; + z = -std::sin(pitch) * temp + std::cos(pitch) * z; + + temp = x; + x = std::cos(yaw) * x - std::sin(yaw) * y; + y = std::sin(yaw) * temp + std::cos(yaw) * y; + } + [[nodiscard]] constexpr T Length2() const { return x * x + y * y + z * z; } diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index a70f8807c..a5c2e3db8 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp @@ -376,6 +376,7 @@ void EmulatedController::ReloadInput() { motion.accel = emulated_motion.GetAcceleration(); motion.gyro = emulated_motion.GetGyroscope(); motion.rotation = emulated_motion.GetRotations(); + motion.euler = emulated_motion.GetEulerAngles(); motion.orientation = emulated_motion.GetOrientation(); motion.is_at_rest = !emulated_motion.IsMoving(motion_sensitivity); } @@ -976,14 +977,11 @@ void EmulatedController::SetMotion(const Common::Input::CallbackStatus& callback emulated.UpdateOrientation(raw_status.delta_timestamp); force_update_motion = raw_status.force_update; - if (is_configuring) { - return; - } - auto& motion = controller.motion_state[index]; motion.accel = emulated.GetAcceleration(); motion.gyro = emulated.GetGyroscope(); motion.rotation = emulated.GetRotations(); + motion.euler = emulated.GetEulerAngles(); motion.orientation = emulated.GetOrientation(); motion.is_at_rest = !emulated.IsMoving(motion_sensitivity); } diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index 429655355..6e01f4e12 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h @@ -106,6 +106,7 @@ struct ControllerMotion { Common::Vec3f accel{}; Common::Vec3f gyro{}; Common::Vec3f rotation{}; + Common::Vec3f euler{}; std::array orientation{}; bool is_at_rest{}; }; diff --git a/src/core/hid/motion_input.cpp b/src/core/hid/motion_input.cpp index 0dd66c1cc..b60478dbb 100644 --- a/src/core/hid/motion_input.cpp +++ b/src/core/hid/motion_input.cpp @@ -1,6 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include + #include "common/math_util.h" #include "core/hid/motion_input.h" @@ -51,6 +53,20 @@ void MotionInput::SetQuaternion(const Common::Quaternion& quaternion) { quat = quaternion; } +void MotionInput::SetEulerAngles(const Common::Vec3f& euler_angles) { + const float cr = std::cos(euler_angles.x * 0.5f); + const float sr = std::sin(euler_angles.x * 0.5f); + const float cp = std::cos(euler_angles.y * 0.5f); + const float sp = std::sin(euler_angles.y * 0.5f); + const float cy = std::cos(euler_angles.z * 0.5f); + const float sy = std::sin(euler_angles.z * 0.5f); + + quat.w = cr * cp * cy + sr * sp * sy; + quat.xyz.x = sr * cp * cy - cr * sp * sy; + quat.xyz.y = cr * sp * cy + sr * cp * sy; + quat.xyz.z = cr * cp * sy - sr * sp * cy; +} + void MotionInput::SetGyroBias(const Common::Vec3f& bias) { gyro_bias = bias; } @@ -222,6 +238,26 @@ Common::Vec3f MotionInput::GetRotations() const { return rotations; } +Common::Vec3f MotionInput::GetEulerAngles() const { + // roll (x-axis rotation) + const float sinr_cosp = 2 * (quat.w * quat.xyz.x + quat.xyz.y * quat.xyz.z); + const float cosr_cosp = 1 - 2 * (quat.xyz.x * quat.xyz.x + quat.xyz.y * quat.xyz.y); + + // pitch (y-axis rotation) + const float sinp = std::sqrt(1 + 2 * (quat.w * quat.xyz.y - quat.xyz.x * quat.xyz.z)); + const float cosp = std::sqrt(1 - 2 * (quat.w * quat.xyz.y - quat.xyz.x * quat.xyz.z)); + + // yaw (z-axis rotation) + const float siny_cosp = 2 * (quat.w * quat.xyz.z + quat.xyz.x * quat.xyz.y); + const float cosy_cosp = 1 - 2 * (quat.xyz.y * quat.xyz.y + quat.xyz.z * quat.xyz.z); + + return { + std::atan2(sinr_cosp, cosr_cosp), + 2 * std::atan2(sinp, cosp) - Common::PI / 2, + std::atan2(siny_cosp, cosy_cosp), + }; +} + void MotionInput::ResetOrientation() { if (!reset_enabled || only_accelerometer) { return; diff --git a/src/core/hid/motion_input.h b/src/core/hid/motion_input.h index 9f3fc1cf7..482719359 100644 --- a/src/core/hid/motion_input.h +++ b/src/core/hid/motion_input.h @@ -35,6 +35,7 @@ public: void SetAcceleration(const Common::Vec3f& acceleration); void SetGyroscope(const Common::Vec3f& gyroscope); void SetQuaternion(const Common::Quaternion& quaternion); + void SetEulerAngles(const Common::Vec3f& euler_angles); void SetGyroBias(const Common::Vec3f& bias); void SetGyroThreshold(f32 threshold); @@ -54,6 +55,7 @@ public: [[nodiscard]] Common::Vec3f GetGyroBias() const; [[nodiscard]] Common::Vec3f GetRotations() const; [[nodiscard]] Common::Quaternion GetQuaternion() const; + [[nodiscard]] Common::Vec3f GetEulerAngles() const; [[nodiscard]] bool IsMoving(f32 sensitivity) const; [[nodiscard]] bool IsCalibrated(f32 sensitivity) const; diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp index c287220fc..fe1ee2289 100644 --- a/src/yuzu/configuration/configure_input_player_widget.cpp +++ b/src/yuzu/configuration/configure_input_player_widget.cpp @@ -180,6 +180,10 @@ void PlayerControlPreview::ControllerUpdate(Core::HID::ControllerTriggerType typ battery_values = controller->GetBatteryValues(); needs_redraw = true; break; + case Core::HID::ControllerTriggerType::Motion: + motion_values = controller->GetMotions(); + needs_redraw = true; + break; default: break; } @@ -313,6 +317,15 @@ void PlayerControlPreview::DrawLeftController(QPainter& p, const QPointF center) DrawRawJoystick(p, center + QPointF(-140, 90), QPointF(0, 0)); } + { + // Draw motion cubes + using namespace Settings::NativeMotion; + p.setPen(colors.outline); + p.setBrush(colors.transparent); + Draw3dCube(p, center + QPointF(-140, 90), + motion_values[Settings::NativeMotion::MotionLeft].euler, 20.0f); + } + using namespace Settings::NativeButton; // D-pad constants @@ -435,6 +448,15 @@ void PlayerControlPreview::DrawRightController(QPainter& p, const QPointF center DrawRawJoystick(p, QPointF(0, 0), center + QPointF(140, 90)); } + { + // Draw motion cubes + using namespace Settings::NativeMotion; + p.setPen(colors.outline); + p.setBrush(colors.transparent); + Draw3dCube(p, center + QPointF(140, 90), + motion_values[Settings::NativeMotion::MotionRight].euler, 20.0f); + } + using namespace Settings::NativeButton; // Face buttons constants @@ -555,6 +577,17 @@ void PlayerControlPreview::DrawDualController(QPainter& p, const QPointF center) DrawRawJoystick(p, center + QPointF(-180, 90), center + QPointF(180, 90)); } + { + // Draw motion cubes + using namespace Settings::NativeMotion; + p.setPen(colors.outline); + p.setBrush(colors.transparent); + Draw3dCube(p, center + QPointF(-180, -5), + motion_values[Settings::NativeMotion::MotionLeft].euler, 20.0f); + Draw3dCube(p, center + QPointF(180, -5), + motion_values[Settings::NativeMotion::MotionRight].euler, 20.0f); + } + using namespace Settings::NativeButton; // Face buttons constants @@ -647,6 +680,15 @@ void PlayerControlPreview::DrawHandheldController(QPainter& p, const QPointF cen DrawRawJoystick(p, center + QPointF(-50, 0), center + QPointF(50, 0)); } + { + // Draw motion cubes + using namespace Settings::NativeMotion; + p.setPen(colors.outline); + p.setBrush(colors.transparent); + Draw3dCube(p, center + QPointF(0, -115), + motion_values[Settings::NativeMotion::MotionLeft].euler, 15.0f); + } + using namespace Settings::NativeButton; // Face buttons constants @@ -750,6 +792,15 @@ void PlayerControlPreview::DrawProController(QPainter& p, const QPointF center) DrawRawJoystick(p, center + QPointF(-50, 105), center + QPointF(50, 105)); } + { + // Draw motion cubes + using namespace Settings::NativeMotion; + p.setPen(colors.button); + p.setBrush(colors.transparent); + Draw3dCube(p, center + QPointF(0, -100), + motion_values[Settings::NativeMotion::MotionLeft].euler, 15.0f); + } + using namespace Settings::NativeButton; // Face buttons constants @@ -2871,6 +2922,46 @@ void PlayerControlPreview::DrawArrow(QPainter& p, const QPointF center, const Di DrawPolygon(p, arrow_symbol); } +// Draw motion functions +void PlayerControlPreview::Draw3dCube(QPainter& p, QPointF center, const Common::Vec3f& euler, + float size) { + std::array cube{ + Common::Vec3f{-1, -1, -1}, + {-1, 1, -1}, + {1, 1, -1}, + {1, -1, -1}, + {-1, -1, 1}, + {-1, 1, 1}, + {1, 1, 1}, + {1, -1, 1}, + }; + + for (Common::Vec3f& point : cube) { + point.RotateFromOrigin(euler.x, euler.y, euler.z); + point *= size; + } + + const std::array front_face{ + center + QPointF{cube[0].x, cube[0].y}, + center + QPointF{cube[1].x, cube[1].y}, + center + QPointF{cube[2].x, cube[2].y}, + center + QPointF{cube[3].x, cube[3].y}, + }; + const std::array back_face{ + center + QPointF{cube[4].x, cube[4].y}, + center + QPointF{cube[5].x, cube[5].y}, + center + QPointF{cube[6].x, cube[6].y}, + center + QPointF{cube[7].x, cube[7].y}, + }; + + DrawPolygon(p, front_face); + DrawPolygon(p, back_face); + p.drawLine(center + QPointF{cube[0].x, cube[0].y}, center + QPointF{cube[4].x, cube[4].y}); + p.drawLine(center + QPointF{cube[1].x, cube[1].y}, center + QPointF{cube[5].x, cube[5].y}); + p.drawLine(center + QPointF{cube[2].x, cube[2].y}, center + QPointF{cube[6].x, cube[6].y}); + p.drawLine(center + QPointF{cube[3].x, cube[3].y}, center + QPointF{cube[7].x, cube[7].y}); +} + template void PlayerControlPreview::DrawPolygon(QPainter& p, const std::array& polygon) { p.drawPolygon(polygon.data(), static_cast(polygon.size())); diff --git a/src/yuzu/configuration/configure_input_player_widget.h b/src/yuzu/configuration/configure_input_player_widget.h index 267d134de..a16943c3c 100644 --- a/src/yuzu/configuration/configure_input_player_widget.h +++ b/src/yuzu/configuration/configure_input_player_widget.h @@ -9,6 +9,7 @@ #include "common/input.h" #include "common/settings_input.h" +#include "common/vector_math.h" #include "core/hid/emulated_controller.h" #include "core/hid/hid_types.h" @@ -193,6 +194,9 @@ private: void DrawSymbol(QPainter& p, QPointF center, Symbol symbol, float icon_size); void DrawArrow(QPainter& p, QPointF center, Direction direction, float size); + // Draw motion functions + void Draw3dCube(QPainter& p, QPointF center, const Common::Vec3f& euler, float size); + // Draw primitive types template void DrawPolygon(QPainter& p, const std::array& polygon); @@ -222,4 +226,5 @@ private: Core::HID::SticksValues stick_values{}; Core::HID::TriggerValues trigger_values{}; Core::HID::BatteryValues battery_values{}; + Core::HID::MotionState motion_values{}; }; From f764223f938ec49e99a662581c18af98661be1af Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Fri, 5 May 2023 17:11:53 -0600 Subject: [PATCH 0336/1181] input_common: Add property to invert an axis button --- src/common/input.h | 2 ++ src/core/hid/input_converter.cpp | 1 + src/input_common/input_poller.cpp | 1 + src/yuzu/configuration/configure_input_player.cpp | 10 ++++++++-- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/common/input.h b/src/common/input.h index 51b277c1f..66fb15f0a 100644 --- a/src/common/input.h +++ b/src/common/input.h @@ -111,6 +111,8 @@ struct AnalogProperties { float offset{}; // Invert direction of the sensor data bool inverted{}; + // Invert the state if it's converted to a button + bool inverted_button{}; // Press once to activate, press again to release bool toggle{}; }; diff --git a/src/core/hid/input_converter.cpp b/src/core/hid/input_converter.cpp index 7cee39a53..a38e3bb3f 100644 --- a/src/core/hid/input_converter.cpp +++ b/src/core/hid/input_converter.cpp @@ -54,6 +54,7 @@ Common::Input::ButtonStatus TransformToButton(const Common::Input::CallbackStatu case Common::Input::InputType::Analog: status.value = TransformToTrigger(callback).pressed.value; status.toggle = callback.analog_status.properties.toggle; + status.inverted = callback.analog_status.properties.inverted_button; break; case Common::Input::InputType::Trigger: status.value = TransformToTrigger(callback).pressed.value; diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cpp index 8c6a6521a..5c2c4a463 100644 --- a/src/input_common/input_poller.cpp +++ b/src/input_common/input_poller.cpp @@ -939,6 +939,7 @@ std::unique_ptr InputFactory::CreateAnalogDevice( .threshold = std::clamp(params.Get("threshold", 0.5f), 0.0f, 1.0f), .offset = std::clamp(params.Get("offset", 0.0f), -1.0f, 1.0f), .inverted = params.Get("invert", "+") == "-", + .inverted_button = params.Get("inverted", false) != 0, .toggle = params.Get("toggle", false) != 0, }; input_engine->PreSetController(identifier); diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 50b62293e..54f42e0c9 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -206,7 +206,7 @@ QString ConfigureInputPlayer::ButtonToText(const Common::ParamPackage& param) { } if (param.Has("axis")) { const QString axis = QString::fromStdString(param.Get("axis", "")); - return QObject::tr("%1%2Axis %3").arg(toggle, invert, axis); + return QObject::tr("%1%2%3Axis %4").arg(toggle, inverted, invert, axis); } if (param.Has("axis_x") && param.Has("axis_y") && param.Has("axis_z")) { const QString axis_x = QString::fromStdString(param.Get("axis_x", "")); @@ -229,7 +229,7 @@ QString ConfigureInputPlayer::ButtonToText(const Common::ParamPackage& param) { return QObject::tr("%1%2%3Hat %4").arg(turbo, toggle, inverted, button_name); } if (param.Has("axis")) { - return QObject::tr("%1%2Axis %3").arg(toggle, inverted, button_name); + return QObject::tr("%1%2%3Axis %4").arg(toggle, inverted, invert, button_name); } if (param.Has("motion")) { return QObject::tr("%1%2Axis %3").arg(toggle, inverted, button_name); @@ -410,6 +410,12 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i button_map[button_id]->setText(ButtonToText(param)); emulated_controller->SetButtonParam(button_id, param); }); + context_menu.addAction(tr("Invert button"), [&] { + const bool invert_value = !param.Get("inverted", false); + param.Set("inverted", invert_value); + button_map[button_id]->setText(ButtonToText(param)); + emulated_controller->SetButtonParam(button_id, param); + }); context_menu.addAction(tr("Set threshold"), [&] { const int button_threshold = static_cast(param.Get("threshold", 0.5f) * 100.0f); From f017335fef95d2cecc0fcda185f0e59cc1945101 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Fri, 5 May 2023 17:11:53 -0600 Subject: [PATCH 0337/1181] input_common: Add property to invert an axis button --- src/common/input.h | 2 ++ src/common/vector_math.h | 2 +- src/core/hid/input_converter.cpp | 1 + src/input_common/input_engine.cpp | 2 ++ src/input_common/input_poller.cpp | 1 + src/yuzu/configuration/configure_input_player.cpp | 10 ++++++++-- 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/common/input.h b/src/common/input.h index 51b277c1f..66fb15f0a 100644 --- a/src/common/input.h +++ b/src/common/input.h @@ -111,6 +111,8 @@ struct AnalogProperties { float offset{}; // Invert direction of the sensor data bool inverted{}; + // Invert the state if it's converted to a button + bool inverted_button{}; // Press once to activate, press again to release bool toggle{}; }; diff --git a/src/common/vector_math.h b/src/common/vector_math.h index 9a7d50abd..b4885835d 100644 --- a/src/common/vector_math.h +++ b/src/common/vector_math.h @@ -265,7 +265,7 @@ public: z = std::sin(roll) * temp + std::cos(roll) * z; temp = x; - x = std::cosf(pitch) * x + std::sin(pitch) * z; + x = std::cos(pitch) * x + std::sin(pitch) * z; z = -std::sin(pitch) * temp + std::cos(pitch) * z; temp = x; diff --git a/src/core/hid/input_converter.cpp b/src/core/hid/input_converter.cpp index 7cee39a53..a38e3bb3f 100644 --- a/src/core/hid/input_converter.cpp +++ b/src/core/hid/input_converter.cpp @@ -54,6 +54,7 @@ Common::Input::ButtonStatus TransformToButton(const Common::Input::CallbackStatu case Common::Input::InputType::Analog: status.value = TransformToTrigger(callback).pressed.value; status.toggle = callback.analog_status.properties.toggle; + status.inverted = callback.analog_status.properties.inverted_button; break; case Common::Input::InputType::Trigger: status.value = TransformToTrigger(callback).pressed.value; diff --git a/src/input_common/input_engine.cpp b/src/input_common/input_engine.cpp index 91aa96aa7..49f5e7f54 100644 --- a/src/input_common/input_engine.cpp +++ b/src/input_common/input_engine.cpp @@ -58,6 +58,8 @@ void InputEngine::SetHatButton(const PadIdentifier& identifier, int button, u8 v } void InputEngine::SetAxis(const PadIdentifier& identifier, int axis, f32 value) { + value /= 2.0f; + value -= 0.5f; { std::scoped_lock lock{mutex}; ControllerData& controller = controller_list.at(identifier); diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cpp index 8c6a6521a..5c2c4a463 100644 --- a/src/input_common/input_poller.cpp +++ b/src/input_common/input_poller.cpp @@ -939,6 +939,7 @@ std::unique_ptr InputFactory::CreateAnalogDevice( .threshold = std::clamp(params.Get("threshold", 0.5f), 0.0f, 1.0f), .offset = std::clamp(params.Get("offset", 0.0f), -1.0f, 1.0f), .inverted = params.Get("invert", "+") == "-", + .inverted_button = params.Get("inverted", false) != 0, .toggle = params.Get("toggle", false) != 0, }; input_engine->PreSetController(identifier); diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 50b62293e..54f42e0c9 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -206,7 +206,7 @@ QString ConfigureInputPlayer::ButtonToText(const Common::ParamPackage& param) { } if (param.Has("axis")) { const QString axis = QString::fromStdString(param.Get("axis", "")); - return QObject::tr("%1%2Axis %3").arg(toggle, invert, axis); + return QObject::tr("%1%2%3Axis %4").arg(toggle, inverted, invert, axis); } if (param.Has("axis_x") && param.Has("axis_y") && param.Has("axis_z")) { const QString axis_x = QString::fromStdString(param.Get("axis_x", "")); @@ -229,7 +229,7 @@ QString ConfigureInputPlayer::ButtonToText(const Common::ParamPackage& param) { return QObject::tr("%1%2%3Hat %4").arg(turbo, toggle, inverted, button_name); } if (param.Has("axis")) { - return QObject::tr("%1%2Axis %3").arg(toggle, inverted, button_name); + return QObject::tr("%1%2%3Axis %4").arg(toggle, inverted, invert, button_name); } if (param.Has("motion")) { return QObject::tr("%1%2Axis %3").arg(toggle, inverted, button_name); @@ -410,6 +410,12 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i button_map[button_id]->setText(ButtonToText(param)); emulated_controller->SetButtonParam(button_id, param); }); + context_menu.addAction(tr("Invert button"), [&] { + const bool invert_value = !param.Get("inverted", false); + param.Set("inverted", invert_value); + button_map[button_id]->setText(ButtonToText(param)); + emulated_controller->SetButtonParam(button_id, param); + }); context_menu.addAction(tr("Set threshold"), [&] { const int button_threshold = static_cast(param.Get("threshold", 0.5f) * 100.0f); From ca6bf06ef7e1a8b198167822a510b9f5ee43dec7 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Sat, 6 May 2023 03:54:20 +0100 Subject: [PATCH 0338/1181] Log object names with debug renderer, add a GPU address to ImageViews --- src/video_core/renderer_opengl/gl_device.cpp | 3 ++- .../renderer_opengl/gl_texture_cache.cpp | 9 ++++---- .../renderer_opengl/gl_texture_cache.h | 1 - .../renderer_vulkan/vk_texture_cache.cpp | 9 ++++---- .../renderer_vulkan/vk_texture_cache.h | 1 - src/video_core/texture_cache/formatter.cpp | 22 ++++++++++--------- src/video_core/texture_cache/formatter.h | 2 +- .../texture_cache/image_view_base.cpp | 8 +++---- .../texture_cache/image_view_base.h | 7 +++--- src/video_core/vulkan_common/vulkan_device.h | 3 ++- 10 files changed, 35 insertions(+), 30 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_device.cpp b/src/video_core/renderer_opengl/gl_device.cpp index 22ed16ebf..400c21981 100644 --- a/src/video_core/renderer_opengl/gl_device.cpp +++ b/src/video_core/renderer_opengl/gl_device.cpp @@ -108,7 +108,8 @@ bool IsASTCSupported() { [[nodiscard]] bool IsDebugToolAttached(std::span extensions) { const bool nsight = std::getenv("NVTX_INJECTION64_PATH") || std::getenv("NSIGHT_LAUNCHED"); - return nsight || HasExtension(extensions, "GL_EXT_debug_tool"); + return nsight || HasExtension(extensions, "GL_EXT_debug_tool") || + Settings::values.renderer_debug.GetValue(); } } // Anonymous namespace diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index 47cccd0e5..052456f61 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -1126,7 +1126,8 @@ bool Image::ScaleDown(bool ignore) { ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::ImageViewInfo& info, ImageId image_id_, Image& image, const SlotVector&) - : VideoCommon::ImageViewBase{info, image.info, image_id_}, views{runtime.null_image_views} { + : VideoCommon::ImageViewBase{info, image.info, image_id_, image.gpu_addr}, + views{runtime.null_image_views} { const Device& device = runtime.device; if (True(image.flags & ImageFlagBits::Converted)) { internal_format = IsPixelFormatSRGB(info.format) ? GL_SRGB8_ALPHA8 : GL_RGBA8; @@ -1217,12 +1218,12 @@ ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::ImageViewI ImageView::ImageView(TextureCacheRuntime&, const VideoCommon::ImageInfo& info, const VideoCommon::ImageViewInfo& view_info, GPUVAddr gpu_addr_) - : VideoCommon::ImageViewBase{info, view_info}, gpu_addr{gpu_addr_}, + : VideoCommon::ImageViewBase{info, view_info, gpu_addr_}, buffer_size{VideoCommon::CalculateGuestSizeInBytes(info)} {} ImageView::ImageView(TextureCacheRuntime&, const VideoCommon::ImageInfo& info, const VideoCommon::ImageViewInfo& view_info) - : VideoCommon::ImageViewBase{info, view_info} {} + : VideoCommon::ImageViewBase{info, view_info, 0} {} ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::NullImageViewParams& params) : VideoCommon::ImageViewBase{params}, views{runtime.null_image_views} {} @@ -1282,7 +1283,7 @@ GLuint ImageView::MakeView(Shader::TextureType view_type, GLenum view_format) { ApplySwizzle(view.handle, format, casted_swizzle); } if (set_object_label) { - const std::string name = VideoCommon::Name(*this); + const std::string name = VideoCommon::Name(*this, gpu_addr); glObjectLabel(GL_TEXTURE, view.handle, static_cast(name.size()), name.data()); } return view.handle; diff --git a/src/video_core/renderer_opengl/gl_texture_cache.h b/src/video_core/renderer_opengl/gl_texture_cache.h index 0dd039ed2..1190999a8 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.h +++ b/src/video_core/renderer_opengl/gl_texture_cache.h @@ -314,7 +314,6 @@ private: std::unique_ptr storage_views; GLenum internal_format = GL_NONE; GLuint default_handle = 0; - GPUVAddr gpu_addr = 0; u32 buffer_size = 0; GLuint original_texture = 0; int num_samples = 0; diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index d0a7d8f35..99dd1260a 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -1584,8 +1584,9 @@ bool Image::NeedsScaleHelper() const { ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::ImageViewInfo& info, ImageId image_id_, Image& image) - : VideoCommon::ImageViewBase{info, image.info, image_id_}, device{&runtime.device}, - image_handle{image.Handle()}, samples(ConvertSampleCount(image.info.num_samples)) { + : VideoCommon::ImageViewBase{info, image.info, image_id_, image.gpu_addr}, + device{&runtime.device}, image_handle{image.Handle()}, + samples(ConvertSampleCount(image.info.num_samples)) { using Shader::TextureType; const VkImageAspectFlags aspect_mask = ImageViewAspectMask(info); @@ -1631,7 +1632,7 @@ ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::ImageViewI } vk::ImageView handle = device->GetLogical().CreateImageView(ci); if (device->HasDebuggingToolAttached()) { - handle.SetObjectNameEXT(VideoCommon::Name(*this).c_str()); + handle.SetObjectNameEXT(VideoCommon::Name(*this, gpu_addr).c_str()); } image_views[static_cast(tex_type)] = std::move(handle); }; @@ -1672,7 +1673,7 @@ ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::ImageViewI ImageView::ImageView(TextureCacheRuntime&, const VideoCommon::ImageInfo& info, const VideoCommon::ImageViewInfo& view_info, GPUVAddr gpu_addr_) - : VideoCommon::ImageViewBase{info, view_info}, gpu_addr{gpu_addr_}, + : VideoCommon::ImageViewBase{info, view_info, gpu_addr_}, buffer_size{VideoCommon::CalculateGuestSizeInBytes(info)} {} ImageView::ImageView(TextureCacheRuntime&, const VideoCommon::NullImageViewParams& params) diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index c656c5386..6f360177a 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h @@ -265,7 +265,6 @@ private: VkImage image_handle = VK_NULL_HANDLE; VkImageView render_target = VK_NULL_HANDLE; VkSampleCountFlagBits samples = VK_SAMPLE_COUNT_1_BIT; - GPUVAddr gpu_addr = 0; u32 buffer_size = 0; }; diff --git a/src/video_core/texture_cache/formatter.cpp b/src/video_core/texture_cache/formatter.cpp index 30f72361d..6279d8e9e 100644 --- a/src/video_core/texture_cache/formatter.cpp +++ b/src/video_core/texture_cache/formatter.cpp @@ -46,7 +46,7 @@ std::string Name(const ImageBase& image) { return "Invalid"; } -std::string Name(const ImageViewBase& image_view) { +std::string Name(const ImageViewBase& image_view, GPUVAddr addr) { const u32 width = image_view.size.width; const u32 height = image_view.size.height; const u32 depth = image_view.size.depth; @@ -56,23 +56,25 @@ std::string Name(const ImageViewBase& image_view) { const std::string level = num_levels > 1 ? fmt::format(":{}", num_levels) : ""; switch (image_view.type) { case ImageViewType::e1D: - return fmt::format("ImageView 1D {}{}", width, level); + return fmt::format("ImageView 1D 0x{:X} {}{}", addr, width, level); case ImageViewType::e2D: - return fmt::format("ImageView 2D {}x{}{}", width, height, level); + return fmt::format("ImageView 2D 0x{:X} {}x{}{}", addr, width, height, level); case ImageViewType::Cube: - return fmt::format("ImageView Cube {}x{}{}", width, height, level); + return fmt::format("ImageView Cube 0x{:X} {}x{}{}", addr, width, height, level); case ImageViewType::e3D: - return fmt::format("ImageView 3D {}x{}x{}{}", width, height, depth, level); + return fmt::format("ImageView 3D 0x{:X} {}x{}x{}{}", addr, width, height, depth, level); case ImageViewType::e1DArray: - return fmt::format("ImageView 1DArray {}{}|{}", width, level, num_layers); + return fmt::format("ImageView 1DArray 0x{:X} {}{}|{}", addr, width, level, num_layers); case ImageViewType::e2DArray: - return fmt::format("ImageView 2DArray {}x{}{}|{}", width, height, level, num_layers); + return fmt::format("ImageView 2DArray 0x{:X} {}x{}{}|{}", addr, width, height, level, + num_layers); case ImageViewType::CubeArray: - return fmt::format("ImageView CubeArray {}x{}{}|{}", width, height, level, num_layers); + return fmt::format("ImageView CubeArray 0x{:X} {}x{}{}|{}", addr, width, height, level, + num_layers); case ImageViewType::Rect: - return fmt::format("ImageView Rect {}x{}{}", width, height, level); + return fmt::format("ImageView Rect 0x{:X} {}x{}{}", addr, width, height, level); case ImageViewType::Buffer: - return fmt::format("BufferView {}", width); + return fmt::format("BufferView 0x{:X} {}", addr, width); } return "Invalid"; } diff --git a/src/video_core/texture_cache/formatter.h b/src/video_core/texture_cache/formatter.h index b97147797..9ee57a076 100644 --- a/src/video_core/texture_cache/formatter.h +++ b/src/video_core/texture_cache/formatter.h @@ -274,7 +274,7 @@ struct RenderTargets; [[nodiscard]] std::string Name(const ImageBase& image); -[[nodiscard]] std::string Name(const ImageViewBase& image_view); +[[nodiscard]] std::string Name(const ImageViewBase& image_view, GPUVAddr addr); [[nodiscard]] std::string Name(const RenderTargets& render_targets); diff --git a/src/video_core/texture_cache/image_view_base.cpp b/src/video_core/texture_cache/image_view_base.cpp index 04fb84bfa..bcad40353 100644 --- a/src/video_core/texture_cache/image_view_base.cpp +++ b/src/video_core/texture_cache/image_view_base.cpp @@ -16,8 +16,8 @@ namespace VideoCommon { ImageViewBase::ImageViewBase(const ImageViewInfo& info, const ImageInfo& image_info, - ImageId image_id_) - : image_id{image_id_}, format{info.format}, type{info.type}, range{info.range}, + ImageId image_id_, GPUVAddr addr) + : image_id{image_id_}, gpu_addr{addr}, format{info.format}, type{info.type}, range{info.range}, size{ .width = std::max(image_info.size.width >> range.base.level, 1u), .height = std::max(image_info.size.height >> range.base.level, 1u), @@ -35,8 +35,8 @@ ImageViewBase::ImageViewBase(const ImageViewInfo& info, const ImageInfo& image_i } } -ImageViewBase::ImageViewBase(const ImageInfo& info, const ImageViewInfo& view_info) - : image_id{NULL_IMAGE_ID}, format{info.format}, type{ImageViewType::Buffer}, +ImageViewBase::ImageViewBase(const ImageInfo& info, const ImageViewInfo& view_info, GPUVAddr addr) + : image_id{NULL_IMAGE_ID}, gpu_addr{addr}, format{info.format}, type{ImageViewType::Buffer}, size{ .width = info.size.width, .height = 1, diff --git a/src/video_core/texture_cache/image_view_base.h b/src/video_core/texture_cache/image_view_base.h index 69c9776e7..a25ae1d4a 100644 --- a/src/video_core/texture_cache/image_view_base.h +++ b/src/video_core/texture_cache/image_view_base.h @@ -24,9 +24,9 @@ enum class ImageViewFlagBits : u16 { DECLARE_ENUM_FLAG_OPERATORS(ImageViewFlagBits) struct ImageViewBase { - explicit ImageViewBase(const ImageViewInfo& info, const ImageInfo& image_info, - ImageId image_id); - explicit ImageViewBase(const ImageInfo& info, const ImageViewInfo& view_info); + explicit ImageViewBase(const ImageViewInfo& info, const ImageInfo& image_info, ImageId image_id, + GPUVAddr addr); + explicit ImageViewBase(const ImageInfo& info, const ImageViewInfo& view_info, GPUVAddr addr); explicit ImageViewBase(const NullImageViewParams&); [[nodiscard]] bool IsBuffer() const noexcept { @@ -34,6 +34,7 @@ struct ImageViewBase { } ImageId image_id{}; + GPUVAddr gpu_addr = 0; PixelFormat format{}; ImageViewType type{}; SubresourceRange range; diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h index 7d5018151..5f1c63ff9 100644 --- a/src/video_core/vulkan_common/vulkan_device.h +++ b/src/video_core/vulkan_common/vulkan_device.h @@ -10,6 +10,7 @@ #include #include "common/common_types.h" +#include "common/settings.h" #include "video_core/vulkan_common/vulkan_wrapper.h" // Define all features which may be used by the implementation here. @@ -510,7 +511,7 @@ public: /// Returns true when a known debugging tool is attached. bool HasDebuggingToolAttached() const { - return has_renderdoc || has_nsight_graphics; + return has_renderdoc || has_nsight_graphics || Settings::values.renderer_debug.GetValue(); } /// Returns true when the device does not properly support cube compatibility. From 94151097b9abadf35c55ea06a31925c9848f4c62 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Wed, 19 Apr 2023 19:01:23 -0600 Subject: [PATCH 0339/1181] service: nfc: Merge device interfaces and create the device manager --- src/core/CMakeLists.txt | 21 +- src/core/frontend/applets/cabinet.cpp | 2 +- src/core/frontend/applets/cabinet.h | 10 +- .../hle/service/am/applets/applet_cabinet.cpp | 24 +- .../hle/service/am/applets/applet_cabinet.h | 6 +- .../{nfp => nfc/common}/amiibo_crypto.cpp | 4 +- .../{nfp => nfc/common}/amiibo_crypto.h | 4 +- .../nfp_device.cpp => nfc/common/device.cpp} | 702 ++++++++------ src/core/hle/service/nfc/common/device.h | 138 +++ .../hle/service/nfc/common/device_manager.cpp | 695 ++++++++++++++ .../hle/service/nfc/common/device_manager.h | 100 ++ src/core/hle/service/nfc/mifare_interface.cpp | 382 -------- src/core/hle/service/nfc/mifare_interface.h | 52 -- src/core/hle/service/nfc/mifare_result.h | 17 + src/core/hle/service/nfc/mifare_types.h | 63 ++ src/core/hle/service/nfc/nfc.cpp | 125 +-- src/core/hle/service/nfc/nfc_device.cpp | 287 ------ src/core/hle/service/nfc/nfc_device.h | 78 -- src/core/hle/service/nfc/nfc_interface.cpp | 439 +++++---- src/core/hle/service/nfc/nfc_interface.h | 33 +- src/core/hle/service/nfc/nfc_result.h | 33 +- src/core/hle/service/nfc/nfc_types.h | 90 ++ src/core/hle/service/nfp/nfp.cpp | 12 +- src/core/hle/service/nfp/nfp_device.h | 120 --- src/core/hle/service/nfp/nfp_interface.cpp | 879 +++--------------- src/core/hle/service/nfp/nfp_interface.h | 37 +- src/core/hle/service/nfp/nfp_result.h | 29 +- src/core/hle/service/nfp/nfp_types.h | 129 +-- src/yuzu/applets/qt_amiibo_settings.cpp | 12 +- src/yuzu/applets/qt_amiibo_settings.h | 14 +- src/yuzu/main.cpp | 6 +- src/yuzu/main.h | 8 +- 32 files changed, 2086 insertions(+), 2465 deletions(-) rename src/core/hle/service/{nfp => nfc/common}/amiibo_crypto.cpp (99%) rename src/core/hle/service/{nfp => nfc/common}/amiibo_crypto.h (98%) rename src/core/hle/service/{nfp/nfp_device.cpp => nfc/common/device.cpp} (61%) create mode 100644 src/core/hle/service/nfc/common/device.h create mode 100644 src/core/hle/service/nfc/common/device_manager.cpp create mode 100644 src/core/hle/service/nfc/common/device_manager.h delete mode 100644 src/core/hle/service/nfc/mifare_interface.cpp delete mode 100644 src/core/hle/service/nfc/mifare_interface.h create mode 100644 src/core/hle/service/nfc/mifare_result.h create mode 100644 src/core/hle/service/nfc/mifare_types.h delete mode 100644 src/core/hle/service/nfc/nfc_device.cpp delete mode 100644 src/core/hle/service/nfc/nfc_device.h create mode 100644 src/core/hle/service/nfc/nfc_types.h delete mode 100644 src/core/hle/service/nfp/nfp_device.h diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 8817a99c9..45328158f 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -555,21 +555,22 @@ add_library(core STATIC hle/service/mnpp/mnpp_app.h hle/service/ncm/ncm.cpp hle/service/ncm/ncm.h - hle/service/nfc/mifare_user.cpp - hle/service/nfc/mifare_user.h + hle/service/nfc/common/amiibo_crypto.cpp + hle/service/nfc/common/amiibo_crypto.h + hle/service/nfc/common/device.cpp + hle/service/nfc/common/device.h + hle/service/nfc/common/device_manager.cpp + hle/service/nfc/common/device_manager.h + hle/service/nfc/mifare_result.h + hle/service/nfc/mifare_types.h hle/service/nfc/nfc.cpp hle/service/nfc/nfc.h - hle/service/nfc/nfc_device.cpp - hle/service/nfc/nfc_device.h + hle/service/nfc/nfc_interface.cpp + hle/service/nfc/nfc_interface.h hle/service/nfc/nfc_result.h - hle/service/nfc/nfc_user.cpp - hle/service/nfc/nfc_user.h - hle/service/nfp/amiibo_crypto.cpp - hle/service/nfp/amiibo_crypto.h + hle/service/nfc/nfc_types.h hle/service/nfp/nfp.cpp hle/service/nfp/nfp.h - hle/service/nfp/nfp_device.cpp - hle/service/nfp/nfp_device.h hle/service/nfp/nfp_interface.cpp hle/service/nfp/nfp_interface.h hle/service/nfp/nfp_result.h diff --git a/src/core/frontend/applets/cabinet.cpp b/src/core/frontend/applets/cabinet.cpp index 2d501eeae..c33ce248b 100644 --- a/src/core/frontend/applets/cabinet.cpp +++ b/src/core/frontend/applets/cabinet.cpp @@ -14,7 +14,7 @@ void DefaultCabinetApplet::Close() const {} void DefaultCabinetApplet::ShowCabinetApplet( const CabinetCallback& callback, const CabinetParameters& parameters, - std::shared_ptr nfp_device) const { + std::shared_ptr nfp_device) const { LOG_WARNING(Service_AM, "(STUBBED) called"); callback(false, {}); } diff --git a/src/core/frontend/applets/cabinet.h b/src/core/frontend/applets/cabinet.h index 74dc5a4f6..af3fc6c3d 100644 --- a/src/core/frontend/applets/cabinet.h +++ b/src/core/frontend/applets/cabinet.h @@ -7,9 +7,9 @@ #include "core/frontend/applets/applet.h" #include "core/hle/service/nfp/nfp_types.h" -namespace Service::NFP { -class NfpDevice; -} // namespace Service::NFP +namespace Service::NFC { +class NfcDevice; +} // namespace Service::NFC namespace Core::Frontend { @@ -26,14 +26,14 @@ public: virtual ~CabinetApplet(); virtual void ShowCabinetApplet(const CabinetCallback& callback, const CabinetParameters& parameters, - std::shared_ptr nfp_device) const = 0; + std::shared_ptr nfp_device) const = 0; }; class DefaultCabinetApplet final : public CabinetApplet { public: void Close() const override; void ShowCabinetApplet(const CabinetCallback& callback, const CabinetParameters& parameters, - std::shared_ptr nfp_device) const override; + std::shared_ptr nfp_device) const override; }; } // namespace Core::Frontend diff --git a/src/core/hle/service/am/applets/applet_cabinet.cpp b/src/core/hle/service/am/applets/applet_cabinet.cpp index 93c9f2a55..8b754e9d4 100644 --- a/src/core/hle/service/am/applets/applet_cabinet.cpp +++ b/src/core/hle/service/am/applets/applet_cabinet.cpp @@ -11,7 +11,7 @@ #include "core/hle/service/am/am.h" #include "core/hle/service/am/applets/applet_cabinet.h" #include "core/hle/service/mii/mii_manager.h" -#include "core/hle/service/nfp/nfp_device.h" +#include "core/hle/service/nfc/common/device.h" namespace Service::AM::Applets { @@ -72,10 +72,10 @@ void Cabinet::Execute() { // TODO: listen on all controllers if (nfp_device == nullptr) { - nfp_device = std::make_shared( + nfp_device = std::make_shared( system.HIDCore().GetFirstNpadId(), system, service_context, availability_change_event); nfp_device->Initialize(); - nfp_device->StartDetection(Service::NFP::TagProtocol::All); + nfp_device->StartDetection(Service::NFC::NfcProtocol::All); } const Core::Frontend::CabinetParameters parameters{ @@ -106,20 +106,22 @@ void Cabinet::DisplayCompleted(bool apply_changes, std::string_view amiibo_name) Cancel(); } - if (nfp_device->GetCurrentState() != Service::NFP::DeviceState::TagFound && - nfp_device->GetCurrentState() != Service::NFP::DeviceState::TagMounted) { + if (nfp_device->GetCurrentState() != Service::NFC::DeviceState::TagFound && + nfp_device->GetCurrentState() != Service::NFC::DeviceState::TagMounted) { Cancel(); } - if (nfp_device->GetCurrentState() == Service::NFP::DeviceState::TagFound) { - nfp_device->Mount(Service::NFP::MountTarget::All); + if (nfp_device->GetCurrentState() == Service::NFC::DeviceState::TagFound) { + nfp_device->Mount(Service::NFP::ModelType::Amiibo, Service::NFP::MountTarget::All); } switch (applet_input_common.applet_mode) { case Service::NFP::CabinetMode::StartNicknameAndOwnerSettings: { - Service::NFP::AmiiboName name{}; - std::memcpy(name.data(), amiibo_name.data(), std::min(amiibo_name.size(), name.size() - 1)); - nfp_device->SetRegisterInfoPrivate(name); + Service::NFP::RegisterInfoPrivate register_info{}; + std::memcpy(register_info.amiibo_name.data(), amiibo_name.data(), + std::min(amiibo_name.size(), register_info.amiibo_name.size() - 1)); + + nfp_device->SetRegisterInfoPrivate(register_info); break; } case Service::NFP::CabinetMode::StartGameDataEraser: @@ -139,7 +141,7 @@ void Cabinet::DisplayCompleted(bool apply_changes, std::string_view amiibo_name) applet_output.device_handle = applet_input_common.device_handle; applet_output.result = CabinetResult::Cancel; const auto reg_result = nfp_device->GetRegisterInfo(applet_output.register_info); - const auto tag_result = nfp_device->GetTagInfo(applet_output.tag_info); + const auto tag_result = nfp_device->GetTagInfo(applet_output.tag_info, false); nfp_device->Finalize(); if (reg_result.IsSuccess()) { diff --git a/src/core/hle/service/am/applets/applet_cabinet.h b/src/core/hle/service/am/applets/applet_cabinet.h index edd295a27..b56427021 100644 --- a/src/core/hle/service/am/applets/applet_cabinet.h +++ b/src/core/hle/service/am/applets/applet_cabinet.h @@ -19,8 +19,8 @@ namespace Core { class System; } // namespace Core -namespace Service::NFP { -class NfpDevice; +namespace Service::NFC { +class NfcDevice; } namespace Service::AM::Applets { @@ -96,7 +96,7 @@ private: Core::System& system; bool is_complete{false}; - std::shared_ptr nfp_device; + std::shared_ptr nfp_device; Kernel::KEvent* availability_change_event; KernelHelpers::ServiceContext service_context; StartParamForAmiiboSettings applet_input_common{}; diff --git a/src/core/hle/service/nfp/amiibo_crypto.cpp b/src/core/hle/service/nfc/common/amiibo_crypto.cpp similarity index 99% rename from src/core/hle/service/nfp/amiibo_crypto.cpp rename to src/core/hle/service/nfc/common/amiibo_crypto.cpp index a3622e792..f3901ee8d 100644 --- a/src/core/hle/service/nfp/amiibo_crypto.cpp +++ b/src/core/hle/service/nfc/common/amiibo_crypto.cpp @@ -12,7 +12,7 @@ #include "common/fs/fs.h" #include "common/fs/path_util.h" #include "common/logging/log.h" -#include "core/hle/service/nfp/amiibo_crypto.h" +#include "core/hle/service/nfc/common/amiibo_crypto.h" namespace Service::NFP::AmiiboCrypto { @@ -55,7 +55,7 @@ bool IsAmiiboValid(const EncryptedNTAG215File& ntag_file) { if (amiibo_data.constant_value != 0xA5) { return false; } - if (amiibo_data.model_info.tag_type != PackedTagType::Type2) { + if (amiibo_data.model_info.tag_type != NFC::PackedTagType::Type2) { return false; } if ((ntag_file.dynamic_lock & 0xFFFFFF) != 0x0F0001U) { diff --git a/src/core/hle/service/nfp/amiibo_crypto.h b/src/core/hle/service/nfc/common/amiibo_crypto.h similarity index 98% rename from src/core/hle/service/nfp/amiibo_crypto.h rename to src/core/hle/service/nfc/common/amiibo_crypto.h index f6208ee6b..bf3044ed9 100644 --- a/src/core/hle/service/nfp/amiibo_crypto.h +++ b/src/core/hle/service/nfc/common/amiibo_crypto.h @@ -24,9 +24,9 @@ using DrgbOutput = std::array; struct HashSeed { u16_be magic; std::array padding; - UniqueSerialNumber uid_1; + NFC::UniqueSerialNumber uid_1; u8 nintendo_id_1; - UniqueSerialNumber uid_2; + NFC::UniqueSerialNumber uid_2; u8 nintendo_id_2; std::array keygen_salt; }; diff --git a/src/core/hle/service/nfp/nfp_device.cpp b/src/core/hle/service/nfc/common/device.cpp similarity index 61% rename from src/core/hle/service/nfp/nfp_device.cpp rename to src/core/hle/service/nfc/common/device.cpp index 3f9af53c8..e5de65ce0 100644 --- a/src/core/hle/service/nfp/nfp_device.cpp +++ b/src/core/hle/service/nfc/common/device.cpp @@ -1,8 +1,6 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include - #ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4701) // Potentially uninitialized local variable 'result' used @@ -26,21 +24,22 @@ #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/mii/mii_manager.h" #include "core/hle/service/mii/types.h" -#include "core/hle/service/nfp/amiibo_crypto.h" -#include "core/hle/service/nfp/nfp_device.h" -#include "core/hle/service/nfp/nfp_result.h" +#include "core/hle/service/nfc/common/amiibo_crypto.h" +#include "core/hle/service/nfc/common/device.h" +#include "core/hle/service/nfc/mifare_result.h" +#include "core/hle/service/nfc/nfc_result.h" #include "core/hle/service/time/time_manager.h" #include "core/hle/service/time/time_zone_content_manager.h" #include "core/hle/service/time/time_zone_types.h" -namespace Service::NFP { -NfpDevice::NfpDevice(Core::HID::NpadIdType npad_id_, Core::System& system_, +namespace Service::NFC { +NfcDevice::NfcDevice(Core::HID::NpadIdType npad_id_, Core::System& system_, KernelHelpers::ServiceContext& service_context_, Kernel::KEvent* availability_change_event_) : npad_id{npad_id_}, system{system_}, service_context{service_context_}, availability_change_event{availability_change_event_} { - activate_event = service_context.CreateEvent("IUser:NFPActivateEvent"); - deactivate_event = service_context.CreateEvent("IUser:NFPDeactivateEvent"); + activate_event = service_context.CreateEvent("NFC:ActivateEvent"); + deactivate_event = service_context.CreateEvent("NFC:DeactivateEvent"); npad_device = system.HIDCore().GetEmulatedController(npad_id); Core::HID::ControllerUpdateCallback engine_callback{ @@ -54,9 +53,9 @@ NfpDevice::NfpDevice(Core::HID::NpadIdType npad_id_, Core::System& system_, current_posix_time = standard_steady_clock.GetCurrentTimePoint(system).time_point; } -NfpDevice::~NfpDevice() { - activate_event->Close(); - deactivate_event->Close(); +NfcDevice::~NfcDevice() { + service_context.CloseEvent(activate_event); + service_context.CloseEvent(deactivate_event); if (!is_controller_set) { return; } @@ -64,7 +63,7 @@ NfpDevice::~NfpDevice() { is_controller_set = false; }; -void NfpDevice::NpadUpdate(Core::HID::ControllerTriggerType type) { +void NfcDevice::NpadUpdate(Core::HID::ControllerTriggerType type) { if (!is_initalized) { return; } @@ -92,14 +91,14 @@ void NfpDevice::NpadUpdate(Core::HID::ControllerTriggerType type) { const auto nfc_status = npad_device->GetNfc(); switch (nfc_status.state) { case Common::Input::NfcState::NewAmiibo: - LoadAmiibo(nfc_status.data); + LoadNfcTag(nfc_status.data); break; case Common::Input::NfcState::AmiiboRemoved: if (device_state == DeviceState::Initialized || device_state == DeviceState::TagRemoved) { break; } if (device_state != DeviceState::SearchingForTag) { - CloseAmiibo(); + CloseNfcTag(); } break; default: @@ -107,28 +106,29 @@ void NfpDevice::NpadUpdate(Core::HID::ControllerTriggerType type) { } } -bool NfpDevice::LoadAmiibo(std::span data) { +bool NfcDevice::LoadNfcTag(std::span data) { if (device_state != DeviceState::SearchingForTag) { - LOG_ERROR(Service_NFP, "Game is not looking for amiibos, current state {}", device_state); + LOG_ERROR(Service_NFC, "Game is not looking for nfc tag, current state {}", device_state); return false; } - if (data.size() != sizeof(EncryptedNTAG215File)) { - LOG_ERROR(Service_NFP, "Not an amiibo, size={}", data.size()); + if (data.size() < sizeof(NFP::EncryptedNTAG215File)) { + LOG_ERROR(Service_NFC, "Not an amiibo, size={}", data.size()); return false; } - // TODO: Filter by allowed_protocols here + mifare_data.resize(data.size()); + memcpy(mifare_data.data(), data.data(), data.size()); - memcpy(&tag_data, data.data(), sizeof(EncryptedNTAG215File)); - is_plain_amiibo = AmiiboCrypto::IsAmiiboValid(tag_data); + memcpy(&tag_data, data.data(), sizeof(NFP::EncryptedNTAG215File)); + is_plain_amiibo = NFP::AmiiboCrypto::IsAmiiboValid(tag_data); if (is_plain_amiibo) { - encrypted_tag_data = AmiiboCrypto::EncodedDataToNfcData(tag_data); + encrypted_tag_data = NFP::AmiiboCrypto::EncodedDataToNfcData(tag_data); LOG_INFO(Service_NFP, "Using plain amiibo"); } else { tag_data = {}; - memcpy(&encrypted_tag_data, data.data(), sizeof(EncryptedNTAG215File)); + memcpy(&encrypted_tag_data, data.data(), sizeof(NFP::EncryptedNTAG215File)); } device_state = DeviceState::TagFound; @@ -137,8 +137,8 @@ bool NfpDevice::LoadAmiibo(std::span data) { return true; } -void NfpDevice::CloseAmiibo() { - LOG_INFO(Service_NFP, "Remove amiibo"); +void NfcDevice::CloseNfcTag() { + LOG_INFO(Service_NFC, "Remove nfc tag"); if (device_state == DeviceState::TagMounted) { Unmount(); @@ -147,26 +147,28 @@ void NfpDevice::CloseAmiibo() { device_state = DeviceState::TagRemoved; encrypted_tag_data = {}; tag_data = {}; + mifare_data = {}; activate_event->GetReadableEvent().Clear(); deactivate_event->Signal(); } -Kernel::KReadableEvent& NfpDevice::GetActivateEvent() const { +Kernel::KReadableEvent& NfcDevice::GetActivateEvent() const { return activate_event->GetReadableEvent(); } -Kernel::KReadableEvent& NfpDevice::GetDeactivateEvent() const { +Kernel::KReadableEvent& NfcDevice::GetDeactivateEvent() const { return deactivate_event->GetReadableEvent(); } -void NfpDevice::Initialize() { +void NfcDevice::Initialize() { device_state = npad_device->HasNfc() ? DeviceState::Initialized : DeviceState::Unavailable; encrypted_tag_data = {}; tag_data = {}; + mifare_data = {}; is_initalized = true; } -void NfpDevice::Finalize() { +void NfcDevice::Finalize() { if (device_state == DeviceState::TagMounted) { Unmount(); } @@ -177,17 +179,17 @@ void NfpDevice::Finalize() { is_initalized = false; } -Result NfpDevice::StartDetection(TagProtocol allowed_protocol) { +Result NfcDevice::StartDetection(NfcProtocol allowed_protocol) { if (device_state != DeviceState::Initialized && device_state != DeviceState::TagRemoved) { - LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); - return WrongDeviceState; + LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); + return ResultWrongDeviceState; } if (npad_device->SetPollingMode(Core::HID::EmulatedDeviceIndex::RightIndex, Common::Input::PollingMode::NFC) != Common::Input::DriverResult::Success) { - LOG_ERROR(Service_NFP, "Nfc not supported"); - return NfcDisabled; + LOG_ERROR(Service_NFC, "Nfc not supported"); + return ResultNfcDisabled; } device_state = DeviceState::SearchingForTag; @@ -195,7 +197,7 @@ Result NfpDevice::StartDetection(TagProtocol allowed_protocol) { return ResultSuccess; } -Result NfpDevice::StopDetection() { +Result NfcDevice::StopDetection() { npad_device->SetPollingMode(Core::HID::EmulatedDeviceIndex::RightIndex, Common::Input::PollingMode::Active); @@ -204,7 +206,7 @@ Result NfpDevice::StopDetection() { } if (device_state == DeviceState::TagFound || device_state == DeviceState::TagMounted) { - CloseAmiibo(); + CloseNfcTag(); } if (device_state == DeviceState::SearchingForTag || device_state == DeviceState::TagRemoved) { @@ -212,22 +214,194 @@ Result NfpDevice::StopDetection() { return ResultSuccess; } - LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); - return WrongDeviceState; + LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); + return ResultWrongDeviceState; } -Result NfpDevice::Flush() { +Result NfcDevice::GetTagInfo(NFP::TagInfo& tag_info, bool is_mifare) const { + if (device_state != DeviceState::TagFound && device_state != DeviceState::TagMounted) { + LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); + if (device_state == DeviceState::TagRemoved) { + return ResultTagRemoved; + } + return ResultWrongDeviceState; + } + + if (is_mifare) { + tag_info = { + .uuid = encrypted_tag_data.uuid.uid, + .uuid_extension = {}, + .uuid_length = static_cast(encrypted_tag_data.uuid.uid.size()), + .protocol = NfcProtocol::TypeA, + .tag_type = TagType::Type4, + }; + return ResultSuccess; + } + + // Protocol and tag type may change here + tag_info = { + .uuid = encrypted_tag_data.uuid.uid, + .uuid_extension = {}, + .uuid_length = static_cast(encrypted_tag_data.uuid.uid.size()), + .protocol = NfcProtocol::TypeA, + .tag_type = TagType::Type2, + }; + + return ResultSuccess; +} + +Result NfcDevice::ReadMifare(std::span parameters, + std::span read_block_data) const { + Result result = ResultSuccess; + + for (std::size_t i = 0; i < parameters.size(); i++) { + result = ReadMifare(parameters[i], read_block_data[i]); + if (result.IsError()) { + break; + } + } + + return result; +} + +Result NfcDevice::ReadMifare(const MifareReadBlockParameter& parameter, + MifareReadBlockData& read_block_data) const { + const std::size_t sector_index = parameter.sector_number * sizeof(DataBlock); + read_block_data.sector_number = parameter.sector_number; + + if (device_state != DeviceState::TagFound && device_state != DeviceState::TagMounted) { + LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); + if (device_state == DeviceState::TagRemoved) { + return ResultTagRemoved; + } + return ResultWrongDeviceState; + } + + if (mifare_data.size() < sector_index + sizeof(DataBlock)) { + return Mifare::ResultReadError; + } + + // TODO: Use parameter.sector_key to read encrypted data + memcpy(read_block_data.data.data(), mifare_data.data() + sector_index, sizeof(DataBlock)); + + return ResultSuccess; +} + +Result NfcDevice::WriteMifare(std::span parameters) { + Result result = ResultSuccess; + + for (std::size_t i = 0; i < parameters.size(); i++) { + result = WriteMifare(parameters[i]); + if (result.IsError()) { + break; + } + } + + if (!npad_device->WriteNfc(mifare_data)) { + LOG_ERROR(Service_NFP, "Error writing to file"); + return Mifare::ResultReadError; + } + + return result; +} + +Result NfcDevice::WriteMifare(const MifareWriteBlockParameter& parameter) { + const std::size_t sector_index = parameter.sector_number * sizeof(DataBlock); + + if (device_state != DeviceState::TagFound && device_state != DeviceState::TagMounted) { + LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); + if (device_state == DeviceState::TagRemoved) { + return ResultTagRemoved; + } + return ResultWrongDeviceState; + } + + if (mifare_data.size() < sector_index + sizeof(DataBlock)) { + return Mifare::ResultReadError; + } + + // TODO: Use parameter.sector_key to encrypt the data + memcpy(mifare_data.data() + sector_index, parameter.data.data(), sizeof(DataBlock)); + + return ResultSuccess; +} + +Result NfcDevice::SendCommandByPassThrough(const Time::Clock::TimeSpanType& timeout, + std::span command_data, + std::span out_data) { + // Not implemented + return ResultSuccess; +} + +Result NfcDevice::Mount(NFP::ModelType model_type, NFP::MountTarget mount_target_) { + if (device_state != DeviceState::TagFound) { + LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); + return ResultWrongDeviceState; + } + + // The loaded amiibo is not encrypted + if (is_plain_amiibo) { + device_state = DeviceState::TagMounted; + mount_target = mount_target_; + return ResultSuccess; + } + + if (!NFP::AmiiboCrypto::IsAmiiboValid(encrypted_tag_data)) { + LOG_ERROR(Service_NFP, "Not an amiibo"); + return ResultNotAnAmiibo; + } + + // Mark amiibos as read only when keys are missing + if (!NFP::AmiiboCrypto::IsKeyAvailable()) { + LOG_ERROR(Service_NFP, "No keys detected"); + device_state = DeviceState::TagMounted; + mount_target = NFP::MountTarget::Rom; + return ResultSuccess; + } + + if (!NFP::AmiiboCrypto::DecodeAmiibo(encrypted_tag_data, tag_data)) { + LOG_ERROR(Service_NFP, "Can't decode amiibo {}", device_state); + return ResultCorruptedData; + } + + device_state = DeviceState::TagMounted; + mount_target = mount_target_; + return ResultSuccess; +} + +Result NfcDevice::Unmount() { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + // Save data before unloading the amiibo + if (is_data_moddified) { + Flush(); + } + + device_state = DeviceState::TagFound; + mount_target = NFP::MountTarget::None; + is_app_area_open = false; + + return ResultSuccess; +} + +Result NfcDevice::Flush() { + if (device_state != DeviceState::TagMounted) { + LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); + if (device_state == DeviceState::TagRemoved) { + return ResultTagRemoved; + } + return ResultWrongDeviceState; + } + + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFP, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } auto& settings = tag_data.settings; @@ -240,49 +414,49 @@ Result NfpDevice::Flush() { tag_data.write_counter++; - FlushWithBreak(BreakType::Normal); + FlushWithBreak(NFP::BreakType::Normal); is_data_moddified = false; return ResultSuccess; } -Result NfpDevice::FlushDebug() { +Result NfcDevice::FlushDebug() { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } tag_data.write_counter++; - FlushWithBreak(BreakType::Normal); + FlushWithBreak(NFP::BreakType::Normal); is_data_moddified = false; return ResultSuccess; } -Result NfpDevice::FlushWithBreak(BreakType break_type) { - if (break_type != BreakType::Normal) { +Result NfcDevice::FlushWithBreak(NFP::BreakType break_type) { + if (break_type != NFP::BreakType::Normal) { LOG_ERROR(Service_NFC, "Break type not implemented {}", break_type); - return WrongDeviceState; + return ResultWrongDeviceState; } - std::vector data(sizeof(EncryptedNTAG215File)); + std::vector data(sizeof(NFP::EncryptedNTAG215File)); if (is_plain_amiibo) { memcpy(data.data(), &tag_data, sizeof(tag_data)); } else { - if (!AmiiboCrypto::EncodeAmiibo(tag_data, encrypted_tag_data)) { + if (!NFP::AmiiboCrypto::EncodeAmiibo(tag_data, encrypted_tag_data)) { LOG_ERROR(Service_NFP, "Failed to encode data"); - return WriteAmiiboFailed; + return ResultWriteAmiiboFailed; } memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data)); @@ -290,100 +464,43 @@ Result NfpDevice::FlushWithBreak(BreakType break_type) { if (!npad_device->WriteNfc(data)) { LOG_ERROR(Service_NFP, "Error writing to file"); - return WriteAmiiboFailed; + return ResultWriteAmiiboFailed; } return ResultSuccess; } -Result NfpDevice::Mount(MountTarget mount_target_) { - if (device_state != DeviceState::TagFound) { - LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); - return WrongDeviceState; - } - - // The loaded amiibo is not encrypted - if (is_plain_amiibo) { - device_state = DeviceState::TagMounted; - mount_target = mount_target_; - return ResultSuccess; - } - - if (!AmiiboCrypto::IsAmiiboValid(encrypted_tag_data)) { - LOG_ERROR(Service_NFP, "Not an amiibo"); - return NotAnAmiibo; - } - - // Mark amiibos as read only when keys are missing - if (!AmiiboCrypto::IsKeyAvailable()) { - LOG_ERROR(Service_NFP, "No keys detected"); - device_state = DeviceState::TagMounted; - mount_target = MountTarget::Rom; - return ResultSuccess; - } - - if (!AmiiboCrypto::DecodeAmiibo(encrypted_tag_data, tag_data)) { - LOG_ERROR(Service_NFP, "Can't decode amiibo {}", device_state); - return CorruptedData; - } - - device_state = DeviceState::TagMounted; - mount_target = mount_target_; - return ResultSuccess; -} - -Result NfpDevice::Unmount() { +Result NfcDevice::Restore() { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - // Save data before unloading the amiibo - if (is_data_moddified) { - Flush(); + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { + LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); + return ResultWrongDeviceState; } - device_state = DeviceState::TagFound; - mount_target = MountTarget::None; - is_app_area_open = false; - + // TODO: Load amiibo from backup on system + LOG_ERROR(Service_NFP, "Not Implemented"); return ResultSuccess; } -Result NfpDevice::GetTagInfo(TagInfo& tag_info) const { - if (device_state != DeviceState::TagFound && device_state != DeviceState::TagMounted) { - LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); - if (device_state == DeviceState::TagRemoved) { - return TagRemoved; - } - return WrongDeviceState; - } - - tag_info = { - .uuid = encrypted_tag_data.uuid.uid, - .uuid_length = static_cast(encrypted_tag_data.uuid.uid.size()), - .protocol = TagProtocol::TypeA, - .tag_type = TagType::Type2, - }; - - return ResultSuccess; -} - -Result NfpDevice::GetCommonInfo(CommonInfo& common_info) const { +Result NfcDevice::GetCommonInfo(NFP::CommonInfo& common_info) const { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFP, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } const auto& settings = tag_data.settings; @@ -393,18 +510,18 @@ Result NfpDevice::GetCommonInfo(CommonInfo& common_info) const { .last_write_date = settings.write_date.GetWriteDate(), .write_counter = tag_data.write_counter, .version = tag_data.amiibo_version, - .application_area_size = sizeof(ApplicationArea), + .application_area_size = sizeof(NFP::ApplicationArea), }; return ResultSuccess; } -Result NfpDevice::GetModelInfo(ModelInfo& model_info) const { +Result NfcDevice::GetModelInfo(NFP::ModelInfo& model_info) const { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } const auto& model_info_data = encrypted_tag_data.user_memory.model_info; @@ -418,22 +535,22 @@ Result NfpDevice::GetModelInfo(ModelInfo& model_info) const { return ResultSuccess; } -Result NfpDevice::GetRegisterInfo(RegisterInfo& register_info) const { +Result NfcDevice::GetRegisterInfo(NFP::RegisterInfo& register_info) const { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFP, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } if (tag_data.settings.settings.amiibo_initialized == 0) { - return RegistrationIsNotInitialized; + return ResultRegistrationIsNotInitialized; } Service::Mii::MiiManager manager; @@ -450,22 +567,22 @@ Result NfpDevice::GetRegisterInfo(RegisterInfo& register_info) const { return ResultSuccess; } -Result NfpDevice::GetRegisterInfoPrivate(RegisterInfoPrivate& register_info) const { +Result NfcDevice::GetRegisterInfoPrivate(NFP::RegisterInfoPrivate& register_info) const { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFP, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } if (tag_data.settings.settings.amiibo_initialized == 0) { - return RegistrationIsNotInitialized; + return ResultRegistrationIsNotInitialized; } Service::Mii::MiiManager manager; @@ -482,18 +599,18 @@ Result NfpDevice::GetRegisterInfoPrivate(RegisterInfoPrivate& register_info) con return ResultSuccess; } -Result NfpDevice::GetAdminInfo(AdminInfo& admin_info) const { +Result NfcDevice::GetAdminInfo(NFP::AdminInfo& admin_info) const { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } u8 flags = static_cast(tag_data.settings.settings.raw >> 0x4); @@ -503,17 +620,18 @@ Result NfpDevice::GetAdminInfo(AdminInfo& admin_info) const { u64 application_id = 0; u32 application_area_id = 0; - AppAreaVersion app_area_version = AppAreaVersion::NotSet; + NFP::AppAreaVersion app_area_version = NFP::AppAreaVersion::NotSet; if (tag_data.settings.settings.appdata_initialized != 0) { application_id = tag_data.application_id; - app_area_version = - static_cast(application_id >> application_id_version_offset & 0xf); + app_area_version = static_cast( + application_id >> NFP::application_id_version_offset & 0xf); // Restore application id to original value if (application_id >> 0x38 != 0) { const u8 application_byte = tag_data.application_id_byte & 0xf; - application_id = RemoveVersionByte(application_id) | - (static_cast(application_byte) << application_id_version_offset); + application_id = + RemoveVersionByte(application_id) | + (static_cast(application_byte) << NFP::application_id_version_offset); } application_area_id = tag_data.application_area_id; @@ -532,22 +650,22 @@ Result NfpDevice::GetAdminInfo(AdminInfo& admin_info) const { return ResultSuccess; } -Result NfpDevice::DeleteRegisterInfo() { +Result NfcDevice::DeleteRegisterInfo() { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } if (tag_data.settings.settings.amiibo_initialized == 0) { - return RegistrationIsNotInitialized; + return ResultRegistrationIsNotInitialized; } Common::TinyMT rng{}; @@ -564,18 +682,18 @@ Result NfpDevice::DeleteRegisterInfo() { return Flush(); } -Result NfpDevice::SetRegisterInfoPrivate(const AmiiboName& amiibo_name) { +Result NfcDevice::SetRegisterInfoPrivate(const NFP::RegisterInfoPrivate& register_info) { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFP, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } Service::Mii::MiiManager manager; @@ -587,7 +705,7 @@ Result NfpDevice::SetRegisterInfoPrivate(const AmiiboName& amiibo_name) { settings.write_date.raw_date = 0; } - SetAmiiboName(settings, amiibo_name); + SetAmiiboName(settings, register_info.amiibo_name); tag_data.owner_mii = manager.BuildFromStoreData(mii); tag_data.mii_extension = manager.SetFromStoreData(mii); tag_data.unknown = 0; @@ -601,18 +719,18 @@ Result NfpDevice::SetRegisterInfoPrivate(const AmiiboName& amiibo_name) { return Flush(); } -Result NfpDevice::RestoreAmiibo() { +Result NfcDevice::RestoreAmiibo() { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFP, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } // TODO: Load amiibo from backup on system @@ -620,7 +738,7 @@ Result NfpDevice::RestoreAmiibo() { return ResultSuccess; } -Result NfpDevice::Format() { +Result NfcDevice::Format() { auto result1 = DeleteApplicationArea(); auto result2 = DeleteRegisterInfo(); @@ -635,28 +753,28 @@ Result NfpDevice::Format() { return Flush(); } -Result NfpDevice::OpenApplicationArea(u32 access_id) { +Result NfcDevice::OpenApplicationArea(u32 access_id) { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFP, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } if (tag_data.settings.settings.appdata_initialized.Value() == 0) { LOG_WARNING(Service_NFP, "Application area is not initialized"); - return ApplicationAreaIsNotInitialized; + return ResultApplicationAreaIsNotInitialized; } if (tag_data.application_area_id != access_id) { LOG_WARNING(Service_NFP, "Wrong application area id"); - return WrongApplicationAreaId; + return ResultWrongApplicationAreaId; } is_app_area_open = true; @@ -664,25 +782,25 @@ Result NfpDevice::OpenApplicationArea(u32 access_id) { return ResultSuccess; } -Result NfpDevice::GetApplicationAreaId(u32& application_area_id) const { +Result NfcDevice::GetApplicationAreaId(u32& application_area_id) const { application_area_id = {}; if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFP, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } if (tag_data.settings.settings.appdata_initialized.Value() == 0) { LOG_WARNING(Service_NFP, "Application area is not initialized"); - return ApplicationAreaIsNotInitialized; + return ResultApplicationAreaIsNotInitialized; } application_area_id = tag_data.application_area_id; @@ -690,64 +808,61 @@ Result NfpDevice::GetApplicationAreaId(u32& application_area_id) const { return ResultSuccess; } -Result NfpDevice::GetApplicationArea(std::vector& data) const { +Result NfcDevice::GetApplicationArea(std::span data) const { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFP, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } if (!is_app_area_open) { LOG_ERROR(Service_NFP, "Application area is not open"); - return WrongDeviceState; + return ResultWrongDeviceState; } if (tag_data.settings.settings.appdata_initialized.Value() == 0) { LOG_ERROR(Service_NFP, "Application area is not initialized"); - return ApplicationAreaIsNotInitialized; + return ResultApplicationAreaIsNotInitialized; } - if (data.size() > sizeof(ApplicationArea)) { - data.resize(sizeof(ApplicationArea)); - } - - memcpy(data.data(), tag_data.application_area.data(), data.size()); + memcpy(data.data(), tag_data.application_area.data(), + std::min(data.size(), sizeof(NFP::ApplicationArea))); return ResultSuccess; } -Result NfpDevice::SetApplicationArea(std::span data) { +Result NfcDevice::SetApplicationArea(std::span data) { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFP, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } if (!is_app_area_open) { LOG_ERROR(Service_NFP, "Application area is not open"); - return WrongDeviceState; + return ResultWrongDeviceState; } if (tag_data.settings.settings.appdata_initialized.Value() == 0) { LOG_ERROR(Service_NFP, "Application area is not initialized"); - return ApplicationAreaIsNotInitialized; + return ResultApplicationAreaIsNotInitialized; } - if (data.size() > sizeof(ApplicationArea)) { + if (data.size() > sizeof(NFP::ApplicationArea)) { LOG_ERROR(Service_NFP, "Wrong data size {}", data.size()); return ResultUnknown; } @@ -756,9 +871,9 @@ Result NfpDevice::SetApplicationArea(std::span data) { std::memcpy(tag_data.application_area.data(), data.data(), data.size()); // Fill remaining data with random numbers rng.GenerateRandomBytes(tag_data.application_area.data() + data.size(), - sizeof(ApplicationArea) - data.size()); + sizeof(NFP::ApplicationArea) - data.size()); - if (tag_data.application_write_counter != counter_limit) { + if (tag_data.application_write_counter != NFP::counter_limit) { tag_data.application_write_counter++; } @@ -767,64 +882,64 @@ Result NfpDevice::SetApplicationArea(std::span data) { return ResultSuccess; } -Result NfpDevice::CreateApplicationArea(u32 access_id, std::span data) { +Result NfcDevice::CreateApplicationArea(u32 access_id, std::span data) { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } if (tag_data.settings.settings.appdata_initialized.Value() != 0) { LOG_ERROR(Service_NFP, "Application area already exist"); - return ApplicationAreaExist; + return ResultApplicationAreaExist; } return RecreateApplicationArea(access_id, data); } -Result NfpDevice::RecreateApplicationArea(u32 access_id, std::span data) { +Result NfcDevice::RecreateApplicationArea(u32 access_id, std::span data) { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } if (is_app_area_open) { LOG_ERROR(Service_NFP, "Application area is open"); - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFP, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } - if (data.size() > sizeof(ApplicationArea)) { + if (data.size() > sizeof(NFP::ApplicationArea)) { LOG_ERROR(Service_NFP, "Wrong data size {}", data.size()); - return WrongApplicationAreaSize; + return ResultWrongApplicationAreaSize; } Common::TinyMT rng{}; std::memcpy(tag_data.application_area.data(), data.data(), data.size()); // Fill remaining data with random numbers rng.GenerateRandomBytes(tag_data.application_area.data() + data.size(), - sizeof(ApplicationArea) - data.size()); + sizeof(NFP::ApplicationArea) - data.size()); - if (tag_data.application_write_counter != counter_limit) { + if (tag_data.application_write_counter != NFP::counter_limit) { tag_data.application_write_counter++; } const u64 application_id = system.GetApplicationProcessProgramID(); tag_data.application_id_byte = - static_cast(application_id >> application_id_version_offset & 0xf); + static_cast(application_id >> NFP::application_id_version_offset & 0xf); tag_data.application_id = - RemoveVersionByte(application_id) | - (static_cast(AppAreaVersion::NintendoSwitch) << application_id_version_offset); + RemoveVersionByte(application_id) | (static_cast(NFP::AppAreaVersion::NintendoSwitch) + << NFP::application_id_version_offset); tag_data.settings.settings.appdata_initialized.Assign(1); tag_data.application_area_id = access_id; tag_data.unknown = {}; @@ -835,30 +950,30 @@ Result NfpDevice::RecreateApplicationArea(u32 access_id, std::span dat return Flush(); } -Result NfpDevice::DeleteApplicationArea() { +Result NfcDevice::DeleteApplicationArea() { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFP, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFP, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } if (tag_data.settings.settings.appdata_initialized == 0) { - return ApplicationAreaIsNotInitialized; + return ResultApplicationAreaIsNotInitialized; } - if (tag_data.application_write_counter != counter_limit) { + if (tag_data.application_write_counter != NFP::counter_limit) { tag_data.application_write_counter++; } Common::TinyMT rng{}; - rng.GenerateRandomBytes(tag_data.application_area.data(), sizeof(ApplicationArea)); + rng.GenerateRandomBytes(tag_data.application_area.data(), sizeof(NFP::ApplicationArea)); rng.GenerateRandomBytes(&tag_data.application_id, sizeof(u64)); rng.GenerateRandomBytes(&tag_data.application_area_id, sizeof(u32)); rng.GenerateRandomBytes(&tag_data.application_id_byte, sizeof(u8)); @@ -872,18 +987,18 @@ Result NfpDevice::DeleteApplicationArea() { return Flush(); } -Result NfpDevice::ExistApplicationArea(bool& has_application_area) { +Result NfcDevice::ExistsApplicationArea(bool& has_application_area) const { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } has_application_area = tag_data.settings.settings.appdata_initialized.Value() != 0; @@ -891,21 +1006,21 @@ Result NfpDevice::ExistApplicationArea(bool& has_application_area) { return ResultSuccess; } -Result NfpDevice::GetAll(NfpData& data) const { +Result NfcDevice::GetAll(NFP::NfpData& data) const { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } - CommonInfo common_info{}; + NFP::CommonInfo common_info{}; Service::Mii::MiiManager manager; const u64 application_id = tag_data.application_id; @@ -930,8 +1045,8 @@ Result NfpDevice::GetAll(NfpData& data) const { .settings_crc_counter = tag_data.settings.crc_counter, .font_region = tag_data.settings.settings.font_region, .tag_type = PackedTagType::Type2, - .console_type = - static_cast(application_id >> application_id_version_offset & 0xf), + .console_type = static_cast( + application_id >> NFP::application_id_version_offset & 0xf), .application_id_byte = tag_data.application_id_byte, .application_area = tag_data.application_area, }; @@ -939,18 +1054,18 @@ Result NfpDevice::GetAll(NfpData& data) const { return ResultSuccess; } -Result NfpDevice::SetAll(const NfpData& data) { +Result NfcDevice::SetAll(const NFP::NfpData& data) { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } tag_data.constant_value = data.magic; @@ -977,18 +1092,18 @@ Result NfpDevice::SetAll(const NfpData& data) { return ResultSuccess; } -Result NfpDevice::BreakTag(BreakType break_type) { +Result NfcDevice::BreakTag(NFP::BreakType break_type) { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } // TODO: Complete this implementation @@ -996,28 +1111,28 @@ Result NfpDevice::BreakTag(BreakType break_type) { return FlushWithBreak(break_type); } -Result NfpDevice::ReadBackupData() { +Result NfcDevice::ReadBackupData(std::span data) const { // Not implemented return ResultSuccess; } -Result NfpDevice::WriteBackupData() { +Result NfcDevice::WriteBackupData(std::span data) { // Not implemented return ResultSuccess; } -Result NfpDevice::WriteNtf() { +Result NfcDevice::WriteNtf(std::span data) { if (device_state != DeviceState::TagMounted) { LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); if (device_state == DeviceState::TagRemoved) { - return TagRemoved; + return ResultTagRemoved; } - return WrongDeviceState; + return ResultWrongDeviceState; } - if (mount_target == MountTarget::None || mount_target == MountTarget::Rom) { + if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) { LOG_ERROR(Service_NFC, "Amiibo is read only", device_state); - return WrongDeviceState; + return ResultWrongDeviceState; } // Not implemented @@ -1025,29 +1140,12 @@ Result NfpDevice::WriteNtf() { return ResultSuccess; } -u64 NfpDevice::GetHandle() const { - // Generate a handle based of the npad id - return static_cast(npad_id); -} - -u32 NfpDevice::GetApplicationAreaSize() const { - return sizeof(ApplicationArea); -} - -DeviceState NfpDevice::GetCurrentState() const { - return device_state; -} - -Core::HID::NpadIdType NfpDevice::GetNpadId() const { - return npad_id; -} - -AmiiboName NfpDevice::GetAmiiboName(const AmiiboSettings& settings) const { - std::array settings_amiibo_name{}; - AmiiboName amiibo_name{}; +NFP::AmiiboName NfcDevice::GetAmiiboName(const NFP::AmiiboSettings& settings) const { + std::array settings_amiibo_name{}; + NFP::AmiiboName amiibo_name{}; // Convert from big endian to little endian - for (std::size_t i = 0; i < amiibo_name_length; i++) { + for (std::size_t i = 0; i < NFP::amiibo_name_length; i++) { settings_amiibo_name[i] = static_cast(settings.amiibo_name[i]); } @@ -1058,8 +1156,8 @@ AmiiboName NfpDevice::GetAmiiboName(const AmiiboSettings& settings) const { return amiibo_name; } -void NfpDevice::SetAmiiboName(AmiiboSettings& settings, const AmiiboName& amiibo_name) { - std::array settings_amiibo_name{}; +void NfcDevice::SetAmiiboName(NFP::AmiiboSettings& settings, const NFP::AmiiboName& amiibo_name) { + std::array settings_amiibo_name{}; // Convert from utf8 to utf16 const auto amiibo_name_utf16 = Common::UTF8ToUTF16(amiibo_name.data()); @@ -1067,16 +1165,16 @@ void NfpDevice::SetAmiiboName(AmiiboSettings& settings, const AmiiboName& amiibo amiibo_name_utf16.size() * sizeof(char16_t)); // Convert from little endian to big endian - for (std::size_t i = 0; i < amiibo_name_length; i++) { + for (std::size_t i = 0; i < NFP::amiibo_name_length; i++) { settings.amiibo_name[i] = static_cast(settings_amiibo_name[i]); } } -AmiiboDate NfpDevice::GetAmiiboDate(s64 posix_time) const { +NFP::AmiiboDate NfcDevice::GetAmiiboDate(s64 posix_time) const { const auto& time_zone_manager = system.GetTimeManager().GetTimeZoneContentManager().GetTimeZoneManager(); Time::TimeZone::CalendarInfo calendar_info{}; - AmiiboDate amiibo_date{}; + NFP::AmiiboDate amiibo_date{}; amiibo_date.SetYear(2000); amiibo_date.SetMonth(1); @@ -1091,14 +1189,14 @@ AmiiboDate NfpDevice::GetAmiiboDate(s64 posix_time) const { return amiibo_date; } -u64 NfpDevice::RemoveVersionByte(u64 application_id) const { - return application_id & ~(0xfULL << application_id_version_offset); +u64 NfcDevice::RemoveVersionByte(u64 application_id) const { + return application_id & ~(0xfULL << NFP::application_id_version_offset); } -void NfpDevice::UpdateSettingsCrc() { +void NfcDevice::UpdateSettingsCrc() { auto& settings = tag_data.settings; - if (settings.crc_counter != counter_limit) { + if (settings.crc_counter != NFP::counter_limit) { settings.crc_counter++; } @@ -1109,7 +1207,7 @@ void NfpDevice::UpdateSettingsCrc() { settings.crc = crc.checksum(); } -void NfpDevice::UpdateRegisterInfoCrc() { +void NfcDevice::UpdateRegisterInfoCrc() { #pragma pack(push, 1) struct CrcData { Mii::Ver3StoreData mii; @@ -1134,4 +1232,18 @@ void NfpDevice::UpdateRegisterInfoCrc() { tag_data.register_info_crc = crc.checksum(); } -} // namespace Service::NFP +u64 NfcDevice::GetHandle() const { + // Generate a handle based of the npad id + return static_cast(npad_id); +} + +DeviceState NfcDevice::GetCurrentState() const { + return device_state; +} + +Result NfcDevice::GetNpadId(Core::HID::NpadIdType& out_npad_id) const { + out_npad_id = npad_id; + return ResultSuccess; +} + +} // namespace Service::NFC diff --git a/src/core/hle/service/nfc/common/device.h b/src/core/hle/service/nfc/common/device.h new file mode 100644 index 000000000..654eda98e --- /dev/null +++ b/src/core/hle/service/nfc/common/device.h @@ -0,0 +1,138 @@ +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include + +#include "common/common_types.h" +#include "core/hle/service/kernel_helpers.h" +#include "core/hle/service/nfc/mifare_types.h" +#include "core/hle/service/nfc/nfc_types.h" +#include "core/hle/service/nfp/nfp_types.h" +#include "core/hle/service/service.h" +#include "core/hle/service/time/clock_types.h" + +namespace Kernel { +class KEvent; +class KReadableEvent; +} // namespace Kernel + +namespace Core { +class System; +} // namespace Core + +namespace Core::HID { +class EmulatedController; +enum class ControllerTriggerType; +enum class NpadIdType : u32; +} // namespace Core::HID + +namespace Service::NFC { +class NfcDevice { +public: + NfcDevice(Core::HID::NpadIdType npad_id_, Core::System& system_, + KernelHelpers::ServiceContext& service_context_, + Kernel::KEvent* availability_change_event_); + ~NfcDevice(); + + void Initialize(); + void Finalize(); + + Result StartDetection(NfcProtocol allowed_protocol); + Result StopDetection(); + + Result GetTagInfo(TagInfo& tag_info, bool is_mifare) const; + + Result ReadMifare(std::span parameters, + std::span read_block_data) const; + Result ReadMifare(const MifareReadBlockParameter& parameter, + MifareReadBlockData& read_block_data) const; + + Result WriteMifare(std::span parameters); + Result WriteMifare(const MifareWriteBlockParameter& parameter); + + Result SendCommandByPassThrough(const Time::Clock::TimeSpanType& timeout, + std::span command_data, std::span out_data); + + Result Mount(NFP::ModelType model_type, NFP::MountTarget mount_target); + Result Unmount(); + + Result Flush(); + Result FlushDebug(); + Result FlushWithBreak(NFP::BreakType break_type); + Result Restore(); + + Result GetCommonInfo(NFP::CommonInfo& common_info) const; + Result GetModelInfo(NFP::ModelInfo& model_info) const; + Result GetRegisterInfo(NFP::RegisterInfo& register_info) const; + Result GetRegisterInfoPrivate(NFP::RegisterInfoPrivate& register_info) const; + Result GetAdminInfo(NFP::AdminInfo& admin_info) const; + + Result DeleteRegisterInfo(); + Result SetRegisterInfoPrivate(const NFP::RegisterInfoPrivate& register_info); + Result RestoreAmiibo(); + Result Format(); + + Result OpenApplicationArea(u32 access_id); + Result GetApplicationAreaId(u32& application_area_id) const; + Result GetApplicationArea(std::span data) const; + Result SetApplicationArea(std::span data); + Result CreateApplicationArea(u32 access_id, std::span data); + Result RecreateApplicationArea(u32 access_id, std::span data); + Result DeleteApplicationArea(); + Result ExistsApplicationArea(bool& has_application_area) const; + + Result GetAll(NFP::NfpData& data) const; + Result SetAll(const NFP::NfpData& data); + Result BreakTag(NFP::BreakType break_type); + Result ReadBackupData(std::span data) const; + Result WriteBackupData(std::span data); + Result WriteNtf(std::span data); + + u64 GetHandle() const; + DeviceState GetCurrentState() const; + Result GetNpadId(Core::HID::NpadIdType& out_npad_id) const; + + Kernel::KReadableEvent& GetActivateEvent() const; + Kernel::KReadableEvent& GetDeactivateEvent() const; + +private: + void NpadUpdate(Core::HID::ControllerTriggerType type); + bool LoadNfcTag(std::span data); + void CloseNfcTag(); + + NFP::AmiiboName GetAmiiboName(const NFP::AmiiboSettings& settings) const; + void SetAmiiboName(NFP::AmiiboSettings& settings, const NFP::AmiiboName& amiibo_name); + NFP::AmiiboDate GetAmiiboDate(s64 posix_time) const; + u64 RemoveVersionByte(u64 application_id) const; + void UpdateSettingsCrc(); + void UpdateRegisterInfoCrc(); + + bool is_controller_set{}; + int callback_key; + const Core::HID::NpadIdType npad_id; + Core::System& system; + Core::HID::EmulatedController* npad_device = nullptr; + KernelHelpers::ServiceContext& service_context; + Kernel::KEvent* activate_event = nullptr; + Kernel::KEvent* deactivate_event = nullptr; + Kernel::KEvent* availability_change_event = nullptr; + + bool is_initalized{}; + NfcProtocol allowed_protocols{}; + DeviceState device_state{DeviceState::Unavailable}; + + // NFP data + bool is_data_moddified{}; + bool is_app_area_open{}; + bool is_plain_amiibo{}; + s64 current_posix_time{}; + NFP::MountTarget mount_target{NFP::MountTarget::None}; + + NFP::NTAG215File tag_data{}; + std::vector mifare_data{}; + NFP::EncryptedNTAG215File encrypted_tag_data{}; +}; + +} // namespace Service::NFC diff --git a/src/core/hle/service/nfc/common/device_manager.cpp b/src/core/hle/service/nfc/common/device_manager.cpp new file mode 100644 index 000000000..d5deaaf27 --- /dev/null +++ b/src/core/hle/service/nfc/common/device_manager.cpp @@ -0,0 +1,695 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#include "common/logging/log.h" +#include "core/core.h" +#include "core/hid/hid_types.h" +#include "core/hle/kernel/k_event.h" +#include "core/hle/service/ipc_helpers.h" +#include "core/hle/service/nfc/common/device.h" +#include "core/hle/service/nfc/common/device_manager.h" +#include "core/hle/service/nfc/nfc_result.h" +#include "core/hle/service/time/clock_types.h" + +namespace Service::NFC { + +DeviceManager::DeviceManager(Core::System& system_, KernelHelpers::ServiceContext& service_context_) + : system{system_}, service_context{service_context_} { + + availability_change_event = + service_context.CreateEvent("Nfc:DeviceManager:AvailabilityChangeEvent"); + + for (u32 device_index = 0; device_index < devices.size(); device_index++) { + devices[device_index] = + std::make_shared(Core::HID::IndexToNpadIdType(device_index), system, + service_context, availability_change_event); + } + + is_initialized = false; +} + +DeviceManager ::~DeviceManager() { + service_context.CloseEvent(availability_change_event); +} + +Result DeviceManager::Initialize() { + for (auto& device : devices) { + device->Initialize(); + } + is_initialized = true; + return ResultSuccess; +} + +Result DeviceManager::Finalize() { + for (auto& device : devices) { + device->Finalize(); + } + is_initialized = false; + return ResultSuccess; +} + +Result DeviceManager::ListDevices(std::vector& nfp_devices, + std::size_t max_allowed_devices) const { + for (auto& device : devices) { + if (nfp_devices.size() >= max_allowed_devices) { + continue; + } + if (device->GetCurrentState() != DeviceState::Unavailable) { + nfp_devices.push_back(device->GetHandle()); + } + } + + if (nfp_devices.empty()) { + return ResultDeviceNotFound; + } + + return ResultSuccess; +} + +DeviceState DeviceManager::GetDeviceState(u64 device_handle) const { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + const auto result = GetDeviceFromHandle(device_handle, device, false); + + if (result.IsSuccess()) { + return device->GetCurrentState(); + } + + return DeviceState::Unavailable; +} + +Result DeviceManager::GetNpadId(u64 device_handle, Core::HID::NpadIdType& npad_id) const { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->GetNpadId(npad_id); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Kernel::KReadableEvent& DeviceManager::AttachAvailabilityChangeEvent() const { + return availability_change_event->GetReadableEvent(); +} + +Result DeviceManager::StartDetection(u64 device_handle, NfcProtocol tag_protocol) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->StartDetection(tag_protocol); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::StopDetection(u64 device_handle) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->StopDetection(); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::GetTagInfo(u64 device_handle, TagInfo& tag_info, bool is_mifare) const { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->GetTagInfo(tag_info, is_mifare); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Kernel::KReadableEvent& DeviceManager::AttachActivateEvent(u64 device_handle) const { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + GetDeviceFromHandle(device_handle, device, false); + + // TODO: Return proper error code on failure + return device->GetActivateEvent(); +} + +Kernel::KReadableEvent& DeviceManager::AttachDeactivateEvent(u64 device_handle) const { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + GetDeviceFromHandle(device_handle, device, false); + + // TODO: Return proper error code on failure + return device->GetDeactivateEvent(); +} + +Result DeviceManager::ReadMifare(u64 device_handle, + std::span read_parameters, + std::span read_data) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->ReadMifare(read_parameters, read_data); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::WriteMifare(u64 device_handle, + std::span write_parameters) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->WriteMifare(write_parameters); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::SendCommandByPassThrough(u64 device_handle, + const Time::Clock::TimeSpanType& timeout, + std::span command_data, + std::span out_data) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->SendCommandByPassThrough(timeout, command_data, out_data); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::Mount(u64 device_handle, NFP::ModelType model_type, + NFP::MountTarget mount_target) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->Mount(model_type, mount_target); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::Unmount(u64 device_handle) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->Unmount(); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::OpenApplicationArea(u64 device_handle, u32 access_id) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->OpenApplicationArea(access_id); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::GetApplicationArea(u64 device_handle, std::span data) const { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->GetApplicationArea(data); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::SetApplicationArea(u64 device_handle, std::span data) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->SetApplicationArea(data); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::Flush(u64 device_handle) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->Flush(); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::Restore(u64 device_handle) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->Restore(); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::CreateApplicationArea(u64 device_handle, u32 access_id, + std::span data) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->CreateApplicationArea(access_id, data); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::GetRegisterInfo(u64 device_handle, NFP::RegisterInfo& register_info) const { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->GetRegisterInfo(register_info); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::GetCommonInfo(u64 device_handle, NFP::CommonInfo& common_info) const { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->GetCommonInfo(common_info); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::GetModelInfo(u64 device_handle, NFP::ModelInfo& model_info) const { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->GetModelInfo(model_info); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +u32 DeviceManager::GetApplicationAreaSize() const { + return sizeof(NFP::ApplicationArea); +} + +Result DeviceManager::RecreateApplicationArea(u64 device_handle, u32 access_id, + std::span data) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->RecreateApplicationArea(access_id, data); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::Format(u64 device_handle) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->Format(); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::GetAdminInfo(u64 device_handle, NFP::AdminInfo& admin_info) const { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->GetAdminInfo(admin_info); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::GetRegisterInfoPrivate(u64 device_handle, + NFP::RegisterInfoPrivate& register_info) const { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->GetRegisterInfoPrivate(register_info); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::SetRegisterInfoPrivate(u64 device_handle, + const NFP::RegisterInfoPrivate& register_info) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->SetRegisterInfoPrivate(register_info); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::DeleteRegisterInfo(u64 device_handle) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->DeleteRegisterInfo(); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::DeleteApplicationArea(u64 device_handle) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->DeleteApplicationArea(); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::ExistsApplicationArea(u64 device_handle, bool& has_application_area) const { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->ExistsApplicationArea(has_application_area); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::GetAll(u64 device_handle, NFP::NfpData& nfp_data) const { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->GetAll(nfp_data); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::SetAll(u64 device_handle, const NFP::NfpData& nfp_data) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->SetAll(nfp_data); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::FlushDebug(u64 device_handle) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->FlushDebug(); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::BreakTag(u64 device_handle, NFP::BreakType break_type) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->BreakTag(break_type); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::ReadBackupData(u64 device_handle, std::span data) const { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->ReadBackupData(data); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::WriteBackupData(u64 device_handle, std::span data) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->WriteBackupData(data); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::WriteNtf(u64 device_handle, NFP::WriteType, std::span data) { + std::scoped_lock lock{mutex}; + + std::shared_ptr device = nullptr; + auto result = GetDeviceHandle(device_handle, device); + + if (result.IsSuccess()) { + result = device->WriteNtf(data); + result = VerifyDeviceResult(device, result); + } + + return result; +} + +Result DeviceManager::GetDeviceFromHandle(u64 handle, std::shared_ptr& nfc_device, + bool check_state) const { + if (check_state) { + const Result is_parameter_set = IsNfcParameterSet(); + if (is_parameter_set.IsError()) { + return is_parameter_set; + } + const Result is_enabled = IsNfcEnabled(); + if (is_enabled.IsError()) { + return is_enabled; + } + const Result is_nfc_initialized = IsNfcInitialized(); + if (is_nfc_initialized.IsError()) { + return is_nfc_initialized; + } + } + + for (auto& device : devices) { + if (device->GetHandle() == handle) { + nfc_device = device; + return ResultSuccess; + } + } + + return ResultDeviceNotFound; +} + +std::optional> DeviceManager::GetNfcDevice(u64 handle) { + for (auto& device : devices) { + if (device->GetHandle() == handle) { + return device; + } + } + return std::nullopt; +} + +const std::optional> DeviceManager::GetNfcDevice(u64 handle) const { + for (auto& device : devices) { + if (device->GetHandle() == handle) { + return device; + } + } + return std::nullopt; +} + +Result DeviceManager::GetDeviceHandle(u64 handle, std::shared_ptr& device) const { + const auto result = GetDeviceFromHandle(handle, device, true); + if (result.IsError()) { + return result; + } + return CheckDeviceState(device); +} + +Result DeviceManager::VerifyDeviceResult(std::shared_ptr device, + Result operation_result) const { + if (operation_result.IsSuccess()) { + return operation_result; + } + + const Result is_parameter_set = IsNfcParameterSet(); + if (is_parameter_set.IsError()) { + return is_parameter_set; + } + const Result is_enabled = IsNfcEnabled(); + if (is_enabled.IsError()) { + return is_enabled; + } + const Result is_nfc_initialized = IsNfcInitialized(); + if (is_nfc_initialized.IsError()) { + return is_nfc_initialized; + } + const Result device_state = CheckDeviceState(device); + if (device_state.IsError()) { + return device_state; + } + + return operation_result; +} + +Result DeviceManager::CheckDeviceState(std::shared_ptr device) const { + if (device == nullptr) { + return ResultInvalidArgument; + } + + return ResultSuccess; +} + +Result DeviceManager::IsNfcEnabled() const { + // TODO: This calls nn::settings::detail::GetNfcEnableFlag + const bool is_enabled = true; + if (!is_enabled) { + return ResultNfcDisabled; + } + return ResultSuccess; +} + +Result DeviceManager::IsNfcParameterSet() const { + // TODO: This calls checks against a bool on offset 0x450 + const bool is_set = true; + if (!is_set) { + return ResultUnknown76; + } + return ResultSuccess; +} + +Result DeviceManager::IsNfcInitialized() const { + if (!is_initialized) { + return ResultNfcNotInitialized; + } + return ResultSuccess; +} + +} // namespace Service::NFC diff --git a/src/core/hle/service/nfc/common/device_manager.h b/src/core/hle/service/nfc/common/device_manager.h new file mode 100644 index 000000000..2971e280f --- /dev/null +++ b/src/core/hle/service/nfc/common/device_manager.h @@ -0,0 +1,100 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include +#include +#include +#include + +#include "core/hid/hid_types.h" +#include "core/hle/service/kernel_helpers.h" +#include "core/hle/service/nfc/mifare_types.h" +#include "core/hle/service/nfc/nfc_types.h" +#include "core/hle/service/nfp/nfp_types.h" +#include "core/hle/service/service.h" +#include "core/hle/service/time/clock_types.h" + +namespace Service::NFC { +class NfcDevice; + +class DeviceManager { +public: + explicit DeviceManager(Core::System& system_, KernelHelpers::ServiceContext& service_context_); + ~DeviceManager(); + + // Nfc device manager + Result Initialize(); + Result Finalize(); + Result ListDevices(std::vector& nfp_devices, std::size_t max_allowed_devices) const; + DeviceState GetDeviceState(u64 device_handle) const; + Result GetNpadId(u64 device_handle, Core::HID::NpadIdType& npad_id) const; + Kernel::KReadableEvent& AttachAvailabilityChangeEvent() const; + Result StartDetection(u64 device_handle, NfcProtocol tag_protocol); + Result StopDetection(u64 device_handle); + Result GetTagInfo(u64 device_handle, NFP::TagInfo& tag_info, bool is_mifare) const; + Kernel::KReadableEvent& AttachActivateEvent(u64 device_handle) const; + Kernel::KReadableEvent& AttachDeactivateEvent(u64 device_handle) const; + Result ReadMifare(u64 device_handle, + const std::span read_parameters, + std::span read_data); + Result WriteMifare(u64 device_handle, + std::span write_parameters); + Result SendCommandByPassThrough(u64 device_handle, const Time::Clock::TimeSpanType& timeout, + std::span command_data, std::span out_data); + + // Nfp device manager + Result Mount(u64 device_handle, NFP::ModelType model_type, NFP::MountTarget mount_target); + Result Unmount(u64 device_handle); + Result OpenApplicationArea(u64 device_handle, u32 access_id); + Result GetApplicationArea(u64 device_handle, std::span data) const; + Result SetApplicationArea(u64 device_handle, std::span data); + Result Flush(u64 device_handle); + Result Restore(u64 device_handle); + Result CreateApplicationArea(u64 device_handle, u32 access_id, std::span data); + Result GetRegisterInfo(u64 device_handle, NFP::RegisterInfo& register_info) const; + Result GetCommonInfo(u64 device_handle, NFP::CommonInfo& common_info) const; + Result GetModelInfo(u64 device_handle, NFP::ModelInfo& model_info) const; + u32 GetApplicationAreaSize() const; + Result RecreateApplicationArea(u64 device_handle, u32 access_id, std::span data); + Result Format(u64 device_handle); + Result GetAdminInfo(u64 device_handle, NFP::AdminInfo& admin_info) const; + Result GetRegisterInfoPrivate(u64 device_handle, NFP::RegisterInfoPrivate& register_info) const; + Result SetRegisterInfoPrivate(u64 device_handle, const NFP::RegisterInfoPrivate& register_info); + Result DeleteRegisterInfo(u64 device_handle); + Result DeleteApplicationArea(u64 device_handle); + Result ExistsApplicationArea(u64 device_handle, bool& has_application_area) const; + Result GetAll(u64 device_handle, NFP::NfpData& nfp_data) const; + Result SetAll(u64 device_handle, const NFP::NfpData& nfp_data); + Result FlushDebug(u64 device_handle); + Result BreakTag(u64 device_handle, NFP::BreakType break_type); + Result ReadBackupData(u64 device_handle, std::span data) const; + Result WriteBackupData(u64 device_handle, std::span data); + Result WriteNtf(u64 device_handle, NFP::WriteType, std::span data); + +private: + Result IsNfcEnabled() const; + Result IsNfcParameterSet() const; + Result IsNfcInitialized() const; + + Result GetDeviceFromHandle(u64 handle, std::shared_ptr& device, + bool check_state) const; + + Result GetDeviceHandle(u64 handle, std::shared_ptr& device) const; + Result VerifyDeviceResult(std::shared_ptr device, Result operation_result) const; + Result CheckDeviceState(std::shared_ptr device) const; + + std::optional> GetNfcDevice(u64 handle); + const std::optional> GetNfcDevice(u64 handle) const; + + bool is_initialized = false; + mutable std::mutex mutex; + std::array, 10> devices{}; + + Core::System& system; + KernelHelpers::ServiceContext service_context; + Kernel::KEvent* availability_change_event; +}; + +} // namespace Service::NFC diff --git a/src/core/hle/service/nfc/mifare_interface.cpp b/src/core/hle/service/nfc/mifare_interface.cpp deleted file mode 100644 index 7e6635ba2..000000000 --- a/src/core/hle/service/nfc/mifare_interface.cpp +++ /dev/null @@ -1,382 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "common/logging/log.h" -#include "core/core.h" -#include "core/hid/hid_types.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nfc/mifare_interface.h" -#include "core/hle/service/nfc/nfc_device.h" -#include "core/hle/service/nfc/nfc_result.h" - -namespace Service::NFC { - -MFInterface::MFInterface(Core::System& system_, const char* name) - : ServiceFramework{system_, name}, service_context{system_, service_name} { - availability_change_event = service_context.CreateEvent("MFInterface:AvailabilityChangeEvent"); - - for (u32 device_index = 0; device_index < 10; device_index++) { - devices[device_index] = - std::make_shared(Core::HID::IndexToNpadIdType(device_index), system, - service_context, availability_change_event); - } -} - -MFInterface ::~MFInterface() { - availability_change_event->Close(); -} - -void MFInterface::Initialize(HLERequestContext& ctx) { - LOG_INFO(Service_NFC, "called"); - - state = State::Initialized; - - for (auto& device : devices) { - device->Initialize(); - } - - IPC::ResponseBuilder rb{ctx, 2, 0}; - rb.Push(ResultSuccess); -} - -void MFInterface::Finalize(HLERequestContext& ctx) { - LOG_INFO(Service_NFC, "called"); - - state = State::NonInitialized; - - for (auto& device : devices) { - device->Finalize(); - } - - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); -} - -void MFInterface::ListDevices(HLERequestContext& ctx) { - LOG_DEBUG(Service_NFC, "called"); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareNfcDisabled); - return; - } - - if (!ctx.CanWriteBuffer()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareInvalidArgument); - return; - } - - if (ctx.GetWriteBufferSize() == 0) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareInvalidArgument); - return; - } - - std::vector nfp_devices; - const std::size_t max_allowed_devices = ctx.GetWriteBufferNumElements(); - - for (const auto& device : devices) { - if (nfp_devices.size() >= max_allowed_devices) { - continue; - } - if (device->GetCurrentState() != NFP::DeviceState::Unavailable) { - nfp_devices.push_back(device->GetHandle()); - } - } - - if (nfp_devices.empty()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareDeviceNotFound); - return; - } - - ctx.WriteBuffer(nfp_devices); - - IPC::ResponseBuilder rb{ctx, 3}; - rb.Push(ResultSuccess); - rb.Push(static_cast(nfp_devices.size())); -} - -void MFInterface::StartDetection(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareNfcDisabled); - return; - } - - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareDeviceNotFound); - return; - } - - const auto result = device.value()->StartDetection(NFP::TagProtocol::All); - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); -} - -void MFInterface::StopDetection(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareNfcDisabled); - return; - } - - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareDeviceNotFound); - return; - } - - const auto result = device.value()->StopDetection(); - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); -} - -void MFInterface::Read(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - const auto buffer{ctx.ReadBuffer()}; - const auto number_of_commands{ctx.GetReadBufferNumElements()}; - std::vector read_commands(number_of_commands); - - memcpy(read_commands.data(), buffer.data(), - number_of_commands * sizeof(NFP::MifareReadBlockParameter)); - - LOG_INFO(Service_NFC, "(STUBBED) called, device_handle={}, read_commands_size={}", - device_handle, number_of_commands); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareNfcDisabled); - return; - } - - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareDeviceNotFound); - return; - } - - Result result = ResultSuccess; - std::vector out_data(number_of_commands); - for (std::size_t i = 0; i < number_of_commands; i++) { - result = device.value()->MifareRead(read_commands[i], out_data[i]); - if (result.IsError()) { - break; - } - } - - ctx.WriteBuffer(out_data); - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); -} - -void MFInterface::Write(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - const auto buffer{ctx.ReadBuffer()}; - const auto number_of_commands{ctx.GetReadBufferNumElements()}; - std::vector write_commands(number_of_commands); - - memcpy(write_commands.data(), buffer.data(), - number_of_commands * sizeof(NFP::MifareWriteBlockParameter)); - - LOG_INFO(Service_NFC, "(STUBBED) called, device_handle={}, write_commands_size={}", - device_handle, number_of_commands); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareNfcDisabled); - return; - } - - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareDeviceNotFound); - return; - } - - Result result = ResultSuccess; - std::vector out_data(number_of_commands); - for (std::size_t i = 0; i < number_of_commands; i++) { - result = device.value()->MifareWrite(write_commands[i]); - if (result.IsError()) { - break; - } - } - - if (result.IsSuccess()) { - result = device.value()->Flush(); - } - - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); -} - -void MFInterface::GetTagInfo(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareNfcDisabled); - return; - } - - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareDeviceNotFound); - return; - } - - NFP::TagInfo tag_info{}; - const auto result = device.value()->GetTagInfo(tag_info, true); - ctx.WriteBuffer(tag_info); - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); -} - -void MFInterface::GetActivateEventHandle(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareNfcDisabled); - return; - } - - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareDeviceNotFound); - return; - } - - IPC::ResponseBuilder rb{ctx, 2, 1}; - rb.Push(ResultSuccess); - rb.PushCopyObjects(device.value()->GetActivateEvent()); -} - -void MFInterface::GetDeactivateEventHandle(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareNfcDisabled); - return; - } - - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareDeviceNotFound); - return; - } - - IPC::ResponseBuilder rb{ctx, 2, 1}; - rb.Push(ResultSuccess); - rb.PushCopyObjects(device.value()->GetDeactivateEvent()); -} - -void MFInterface::GetState(HLERequestContext& ctx) { - LOG_DEBUG(Service_NFC, "called"); - - IPC::ResponseBuilder rb{ctx, 3}; - rb.Push(ResultSuccess); - rb.PushEnum(state); -} - -void MFInterface::GetDeviceState(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); - - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareDeviceNotFound); - return; - } - - IPC::ResponseBuilder rb{ctx, 3}; - rb.Push(ResultSuccess); - rb.PushEnum(device.value()->GetCurrentState()); -} - -void MFInterface::GetNpadId(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareNfcDisabled); - return; - } - - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareDeviceNotFound); - return; - } - - IPC::ResponseBuilder rb{ctx, 3}; - rb.Push(ResultSuccess); - rb.PushEnum(device.value()->GetNpadId()); -} - -void MFInterface::GetAvailabilityChangeEventHandle(HLERequestContext& ctx) { - LOG_INFO(Service_NFC, "called"); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(MifareNfcDisabled); - return; - } - - IPC::ResponseBuilder rb{ctx, 2, 1}; - rb.Push(ResultSuccess); - rb.PushCopyObjects(availability_change_event->GetReadableEvent()); -} - -std::optional> MFInterface::GetNfcDevice(u64 handle) { - for (auto& device : devices) { - if (device->GetHandle() == handle) { - return device; - } - } - return std::nullopt; -} - -} // namespace Service::NFC diff --git a/src/core/hle/service/nfc/mifare_interface.h b/src/core/hle/service/nfc/mifare_interface.h deleted file mode 100644 index 698c8a6b6..000000000 --- a/src/core/hle/service/nfc/mifare_interface.h +++ /dev/null @@ -1,52 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include -#include -#include - -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/service.h" - -namespace Service::NFC { -class NfcDevice; - -class MFInterface : public ServiceFramework { -public: - explicit MFInterface(Core::System& system_, const char* name); - ~MFInterface(); - - void Initialize(HLERequestContext& ctx); - void Finalize(HLERequestContext& ctx); - void ListDevices(HLERequestContext& ctx); - void StartDetection(HLERequestContext& ctx); - void StopDetection(HLERequestContext& ctx); - void Read(HLERequestContext& ctx); - void Write(HLERequestContext& ctx); - void GetTagInfo(HLERequestContext& ctx); - void GetActivateEventHandle(HLERequestContext& ctx); - void GetDeactivateEventHandle(HLERequestContext& ctx); - void GetState(HLERequestContext& ctx); - void GetDeviceState(HLERequestContext& ctx); - void GetNpadId(HLERequestContext& ctx); - void GetAvailabilityChangeEventHandle(HLERequestContext& ctx); - -private: - enum class State : u32 { - NonInitialized, - Initialized, - }; - - std::optional> GetNfcDevice(u64 handle); - - KernelHelpers::ServiceContext service_context; - - std::array, 10> devices{}; - - State state{State::NonInitialized}; - Kernel::KEvent* availability_change_event; -}; - -} // namespace Service::NFC diff --git a/src/core/hle/service/nfc/mifare_result.h b/src/core/hle/service/nfc/mifare_result.h new file mode 100644 index 000000000..4b60048a5 --- /dev/null +++ b/src/core/hle/service/nfc/mifare_result.h @@ -0,0 +1,17 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include "core/hle/result.h" + +namespace Service::NFC::Mifare { + +constexpr Result ResultDeviceNotFound(ErrorModule::NFCMifare, 64); +constexpr Result ResultInvalidArgument(ErrorModule::NFCMifare, 65); +constexpr Result ResultWrongDeviceState(ErrorModule::NFCMifare, 73); +constexpr Result ResultNfcDisabled(ErrorModule::NFCMifare, 80); +constexpr Result ResultTagRemoved(ErrorModule::NFCMifare, 97); +constexpr Result ResultReadError(ErrorModule::NFCMifare, 288); + +} // namespace Service::NFC::Mifare diff --git a/src/core/hle/service/nfc/mifare_types.h b/src/core/hle/service/nfc/mifare_types.h new file mode 100644 index 000000000..75b59f021 --- /dev/null +++ b/src/core/hle/service/nfc/mifare_types.h @@ -0,0 +1,63 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include + +#include "common/common_funcs.h" +#include "common/common_types.h" + +namespace Service::NFC { + +enum class MifareCmd : u8 { + AuthA = 0x60, + AuthB = 0x61, + Read = 0x30, + Write = 0xA0, + Transfer = 0xB0, + Decrement = 0xC0, + Increment = 0xC1, + Store = 0xC2 +}; + +using DataBlock = std::array; +using KeyData = std::array; + +struct SectorKey { + MifareCmd command; + u8 unknown; // Usually 1 + INSERT_PADDING_BYTES(0x6); + KeyData sector_key; + INSERT_PADDING_BYTES(0x2); +}; +static_assert(sizeof(SectorKey) == 0x10, "SectorKey is an invalid size"); + +// This is nn::nfc::MifareReadBlockParameter +struct MifareReadBlockParameter { + u8 sector_number; + INSERT_PADDING_BYTES(0x7); + SectorKey sector_key; +}; +static_assert(sizeof(MifareReadBlockParameter) == 0x18, + "MifareReadBlockParameter is an invalid size"); + +// This is nn::nfc::MifareReadBlockData +struct MifareReadBlockData { + DataBlock data; + u8 sector_number; + INSERT_PADDING_BYTES(0x7); +}; +static_assert(sizeof(MifareReadBlockData) == 0x18, "MifareReadBlockData is an invalid size"); + +// This is nn::nfc::MifareWriteBlockParameter +struct MifareWriteBlockParameter { + DataBlock data; + u8 sector_number; + INSERT_PADDING_BYTES(0x7); + SectorKey sector_key; +}; +static_assert(sizeof(MifareWriteBlockParameter) == 0x28, + "MifareWriteBlockParameter is an invalid size"); + +} // namespace Service::NFC diff --git a/src/core/hle/service/nfc/nfc.cpp b/src/core/hle/service/nfc/nfc.cpp index 444d65f07..30ae989b9 100644 --- a/src/core/hle/service/nfc/nfc.cpp +++ b/src/core/hle/service/nfc/nfc.cpp @@ -6,7 +6,6 @@ #include "common/logging/log.h" #include "common/settings.h" #include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nfc/mifare_interface.h" #include "core/hle/service/nfc/nfc.h" #include "core/hle/service/nfc/nfc_interface.h" #include "core/hle/service/server_manager.h" @@ -14,31 +13,31 @@ namespace Service::NFC { -class IUser final : public Interface { +class IUser final : public NfcInterface { public: - explicit IUser(Core::System& system_) : Interface(system_, "NFC::IUser") { + explicit IUser(Core::System& system_) : NfcInterface(system_, "NFC::IUser", BackendType::Nfc) { // clang-format off static const FunctionInfo functions[] = { - {0, &Interface::Initialize, "InitializeOld"}, - {1, &Interface::Finalize, "FinalizeOld"}, - {2, &Interface::GetState, "GetStateOld"}, - {3, &Interface::IsNfcEnabled, "IsNfcEnabledOld"}, - {400, &Interface::Initialize, "Initialize"}, - {401, &Interface::Finalize, "Finalize"}, - {402, &Interface::GetState, "GetState"}, - {403, &Interface::IsNfcEnabled, "IsNfcEnabled"}, - {404, &Interface::ListDevices, "ListDevices"}, - {405, &Interface::GetDeviceState, "GetDeviceState"}, - {406, &Interface::GetNpadId, "GetNpadId"}, - {407, &Interface::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"}, - {408, &Interface::StartDetection, "StartDetection"}, - {409, &Interface::StopDetection, "StopDetection"}, - {410, &Interface::GetTagInfo, "GetTagInfo"}, - {411, &Interface::AttachActivateEvent, "AttachActivateEvent"}, - {412, &Interface::AttachDeactivateEvent, "AttachDeactivateEvent"}, - {1000, nullptr, "ReadMifare"}, - {1001, nullptr, "WriteMifare"}, - {1300, &Interface::SendCommandByPassThrough, "SendCommandByPassThrough"}, + {0, &NfcInterface::Initialize, "InitializeOld"}, + {1, &NfcInterface::Finalize, "FinalizeOld"}, + {2, &NfcInterface::GetState, "GetStateOld"}, + {3, &NfcInterface::IsNfcEnabled, "IsNfcEnabledOld"}, + {400, &NfcInterface::Initialize, "Initialize"}, + {401, &NfcInterface::Finalize, "Finalize"}, + {402, &NfcInterface::GetState, "GetState"}, + {403, &NfcInterface::IsNfcEnabled, "IsNfcEnabled"}, + {404, &NfcInterface::ListDevices, "ListDevices"}, + {405, &NfcInterface::GetDeviceState, "GetDeviceState"}, + {406, &NfcInterface::GetNpadId, "GetNpadId"}, + {407, &NfcInterface::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"}, + {408, &NfcInterface::StartDetection, "StartDetection"}, + {409, &NfcInterface::StopDetection, "StopDetection"}, + {410, &NfcInterface::GetTagInfo, "GetTagInfo"}, + {411, &NfcInterface::AttachActivateEvent, "AttachActivateEvent"}, + {412, &NfcInterface::AttachDeactivateEvent, "AttachDeactivateEvent"}, + {1000, &NfcInterface::ReadMifare, "ReadMifare"}, + {1001, &NfcInterface::WriteMifare ,"WriteMifare"}, + {1300, &NfcInterface::SendCommandByPassThrough, "SendCommandByPassThrough"}, {1301, nullptr, "KeepPassThroughSession"}, {1302, nullptr, "ReleasePassThroughSession"}, }; @@ -48,34 +47,35 @@ public: } }; -class ISystem final : public Interface { +class ISystem final : public NfcInterface { public: - explicit ISystem(Core::System& system_) : Interface{system_, "NFC::ISystem"} { + explicit ISystem(Core::System& system_) + : NfcInterface{system_, "NFC::ISystem", BackendType::Nfc} { // clang-format off static const FunctionInfo functions[] = { - {0, &Interface::Initialize, "InitializeOld"}, - {1, &Interface::Finalize, "FinalizeOld"}, - {2, &Interface::GetState, "GetStateOld"}, - {3, &Interface::IsNfcEnabled, "IsNfcEnabledOld"}, + {0, &NfcInterface::Initialize, "InitializeOld"}, + {1, &NfcInterface::Finalize, "FinalizeOld"}, + {2, &NfcInterface::GetState, "GetStateOld"}, + {3, &NfcInterface::IsNfcEnabled, "IsNfcEnabledOld"}, {100, nullptr, "SetNfcEnabledOld"}, - {400, &Interface::Initialize, "Initialize"}, - {401, &Interface::Finalize, "Finalize"}, - {402, &Interface::GetState, "GetState"}, - {403, &Interface::IsNfcEnabled, "IsNfcEnabled"}, - {404, &Interface::ListDevices, "ListDevices"}, - {405, &Interface::GetDeviceState, "GetDeviceState"}, - {406, &Interface::GetNpadId, "GetNpadId"}, - {407, &Interface::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"}, - {408, &Interface::StartDetection, "StartDetection"}, - {409, &Interface::StopDetection, "StopDetection"}, - {410, &Interface::GetTagInfo, "GetTagInfo"}, - {411, &Interface::AttachActivateEvent, "AttachActivateEvent"}, - {412, &Interface::AttachDeactivateEvent, "AttachDeactivateEvent"}, + {400, &NfcInterface::Initialize, "Initialize"}, + {401, &NfcInterface::Finalize, "Finalize"}, + {402, &NfcInterface::GetState, "GetState"}, + {403, &NfcInterface::IsNfcEnabled, "IsNfcEnabled"}, + {404, &NfcInterface::ListDevices, "ListDevices"}, + {405, &NfcInterface::GetDeviceState, "GetDeviceState"}, + {406, &NfcInterface::GetNpadId, "GetNpadId"}, + {407, &NfcInterface::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"}, + {408, &NfcInterface::StartDetection, "StartDetection"}, + {409, &NfcInterface::StopDetection, "StopDetection"}, + {410, &NfcInterface::GetTagInfo, "GetTagInfo"}, + {411, &NfcInterface::AttachActivateEvent, "AttachActivateEvent"}, + {412, &NfcInterface::AttachDeactivateEvent, "AttachDeactivateEvent"}, {500, nullptr, "SetNfcEnabled"}, {510, nullptr, "OutputTestWave"}, - {1000, nullptr, "ReadMifare"}, - {1001, nullptr, "WriteMifare"}, - {1300, &Interface::SendCommandByPassThrough, "SendCommandByPassThrough"}, + {1000, &NfcInterface::ReadMifare, "ReadMifare"}, + {1001, &NfcInterface::WriteMifare, "WriteMifare"}, + {1300, &NfcInterface::SendCommandByPassThrough, "SendCommandByPassThrough"}, {1301, nullptr, "KeepPassThroughSession"}, {1302, nullptr, "ReleasePassThroughSession"}, }; @@ -85,25 +85,29 @@ public: } }; +// MFInterface has an unique interface but it's identical to NfcInterface so we can keep the code +// simpler +using MFInterface = NfcInterface; class MFIUser final : public MFInterface { public: - explicit MFIUser(Core::System& system_) : MFInterface{system_, "NFC::MFInterface"} { + explicit MFIUser(Core::System& system_) + : MFInterface{system_, "NFC::MFInterface", BackendType::Mifare} { // clang-format off - static const FunctionInfo functions[] = { + static const FunctionInfoTyped functions[] = { {0, &MFIUser::Initialize, "Initialize"}, {1, &MFIUser::Finalize, "Finalize"}, {2, &MFIUser::ListDevices, "ListDevices"}, {3, &MFIUser::StartDetection, "StartDetection"}, {4, &MFIUser::StopDetection, "StopDetection"}, - {5, &MFIUser::Read, "Read"}, - {6, &MFIUser::Write, "Write"}, + {5, &MFIUser::ReadMifare, "Read"}, + {6, &MFIUser::WriteMifare, "Write"}, {7, &MFIUser::GetTagInfo, "GetTagInfo"}, - {8, &MFIUser::GetActivateEventHandle, "GetActivateEventHandle"}, - {9, &MFIUser::GetDeactivateEventHandle, "GetDeactivateEventHandle"}, + {8, &MFIUser::AttachActivateEvent, "GetActivateEventHandle"}, + {9, &MFIUser::AttachDeactivateEvent, "GetDeactivateEventHandle"}, {10, &MFIUser::GetState, "GetState"}, {11, &MFIUser::GetDeviceState, "GetDeviceState"}, {12, &MFIUser::GetNpadId, "GetNpadId"}, - {13, &MFIUser::GetAvailabilityChangeEventHandle, "GetAvailabilityChangeEventHandle"}, + {13, &MFIUser::AttachAvailabilityChangeEvent, "GetAvailabilityChangeEventHandle"}, }; // clang-format on @@ -131,7 +135,7 @@ public: explicit NFC_AM(Core::System& system_) : ServiceFramework{system_, "nfc:am"} { // clang-format off static const FunctionInfo functions[] = { - {0, &NFC_AM::CreateAmInterface, "CreateAmInterface"}, + {0, &NFC_AM::CreateAmNfcInterface, "CreateAmNfcInterface"}, }; // clang-format on @@ -139,7 +143,7 @@ public: } private: - void CreateAmInterface(HLERequestContext& ctx) { + void CreateAmNfcInterface(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -153,7 +157,7 @@ public: explicit NFC_MF_U(Core::System& system_) : ServiceFramework{system_, "nfc:mf:u"} { // clang-format off static const FunctionInfo functions[] = { - {0, &NFC_MF_U::CreateUserInterface, "CreateUserInterface"}, + {0, &NFC_MF_U::CreateUserNfcInterface, "CreateUserNfcInterface"}, }; // clang-format on @@ -161,7 +165,7 @@ public: } private: - void CreateUserInterface(HLERequestContext& ctx) { + void CreateUserNfcInterface(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -175,7 +179,7 @@ public: explicit NFC_U(Core::System& system_) : ServiceFramework{system_, "nfc:user"} { // clang-format off static const FunctionInfo functions[] = { - {0, &NFC_U::CreateUserInterface, "CreateUserInterface"}, + {0, &NFC_U::CreateUserNfcInterface, "CreateUserNfcInterface"}, }; // clang-format on @@ -183,7 +187,7 @@ public: } private: - void CreateUserInterface(HLERequestContext& ctx) { + void CreateUserNfcInterface(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -197,7 +201,7 @@ public: explicit NFC_SYS(Core::System& system_) : ServiceFramework{system_, "nfc:sys"} { // clang-format off static const FunctionInfo functions[] = { - {0, &NFC_SYS::CreateSystemInterface, "CreateSystemInterface"}, + {0, &NFC_SYS::CreateSystemNfcInterface, "CreateSystemNfcInterface"}, }; // clang-format on @@ -205,7 +209,7 @@ public: } private: - void CreateSystemInterface(HLERequestContext& ctx) { + void CreateSystemNfcInterface(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; @@ -221,6 +225,7 @@ void LoopProcess(Core::System& system) { server_manager->RegisterNamedService("nfc:mf:u", std::make_shared(system)); server_manager->RegisterNamedService("nfc:user", std::make_shared(system)); server_manager->RegisterNamedService("nfc:sys", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); } diff --git a/src/core/hle/service/nfc/nfc_device.cpp b/src/core/hle/service/nfc/nfc_device.cpp deleted file mode 100644 index 47bc1a05d..000000000 --- a/src/core/hle/service/nfc/nfc_device.cpp +++ /dev/null @@ -1,287 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "common/input.h" -#include "common/logging/log.h" -#include "core/core.h" -#include "core/hid/emulated_controller.h" -#include "core/hid/hid_core.h" -#include "core/hid/hid_types.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nfc/nfc_device.h" -#include "core/hle/service/nfc/nfc_result.h" - -namespace Service::NFC { -NfcDevice::NfcDevice(Core::HID::NpadIdType npad_id_, Core::System& system_, - KernelHelpers::ServiceContext& service_context_, - Kernel::KEvent* availability_change_event_) - : npad_id{npad_id_}, system{system_}, service_context{service_context_}, - availability_change_event{availability_change_event_} { - activate_event = service_context.CreateEvent("IUser:NFCActivateEvent"); - deactivate_event = service_context.CreateEvent("IUser:NFCDeactivateEvent"); - npad_device = system.HIDCore().GetEmulatedController(npad_id); - - Core::HID::ControllerUpdateCallback engine_callback{ - .on_change = [this](Core::HID::ControllerTriggerType type) { NpadUpdate(type); }, - .is_npad_service = false, - }; - is_controller_set = true; - callback_key = npad_device->SetCallback(engine_callback); -} - -NfcDevice::~NfcDevice() { - activate_event->Close(); - deactivate_event->Close(); - if (!is_controller_set) { - return; - } - npad_device->DeleteCallback(callback_key); - is_controller_set = false; -}; - -void NfcDevice::NpadUpdate(Core::HID::ControllerTriggerType type) { - if (!is_initalized) { - return; - } - - if (type == Core::HID::ControllerTriggerType::Connected) { - Initialize(); - availability_change_event->Signal(); - return; - } - - if (type == Core::HID::ControllerTriggerType::Disconnected) { - device_state = NFP::DeviceState::Unavailable; - availability_change_event->Signal(); - return; - } - - if (type != Core::HID::ControllerTriggerType::Nfc) { - return; - } - - if (!npad_device->IsConnected()) { - return; - } - - const auto nfc_status = npad_device->GetNfc(); - switch (nfc_status.state) { - case Common::Input::NfcState::NewAmiibo: - LoadNfcTag(nfc_status.data); - break; - case Common::Input::NfcState::AmiiboRemoved: - if (device_state != NFP::DeviceState::SearchingForTag) { - CloseNfcTag(); - } - break; - default: - break; - } -} - -bool NfcDevice::LoadNfcTag(std::span data) { - if (device_state != NFP::DeviceState::SearchingForTag) { - LOG_ERROR(Service_NFC, "Game is not looking for nfc tag, current state {}", device_state); - return false; - } - - if (data.size() < sizeof(NFP::EncryptedNTAG215File)) { - LOG_ERROR(Service_NFC, "Not an amiibo, size={}", data.size()); - return false; - } - - tag_data.resize(data.size()); - memcpy(tag_data.data(), data.data(), data.size()); - memcpy(&encrypted_tag_data, data.data(), sizeof(NFP::EncryptedNTAG215File)); - - device_state = NFP::DeviceState::TagFound; - deactivate_event->GetReadableEvent().Clear(); - activate_event->Signal(); - return true; -} - -void NfcDevice::CloseNfcTag() { - LOG_INFO(Service_NFC, "Remove nfc tag"); - - device_state = NFP::DeviceState::TagRemoved; - encrypted_tag_data = {}; - activate_event->GetReadableEvent().Clear(); - deactivate_event->Signal(); -} - -Kernel::KReadableEvent& NfcDevice::GetActivateEvent() const { - return activate_event->GetReadableEvent(); -} - -Kernel::KReadableEvent& NfcDevice::GetDeactivateEvent() const { - return deactivate_event->GetReadableEvent(); -} - -void NfcDevice::Initialize() { - device_state = - npad_device->HasNfc() ? NFP::DeviceState::Initialized : NFP::DeviceState::Unavailable; - encrypted_tag_data = {}; - is_initalized = true; -} - -void NfcDevice::Finalize() { - if (device_state == NFP::DeviceState::SearchingForTag || - device_state == NFP::DeviceState::TagRemoved) { - StopDetection(); - } - device_state = NFP::DeviceState::Unavailable; - is_initalized = false; -} - -Result NfcDevice::StartDetection(NFP::TagProtocol allowed_protocol) { - if (device_state != NFP::DeviceState::Initialized && - device_state != NFP::DeviceState::TagRemoved) { - LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); - return WrongDeviceState; - } - - if (npad_device->SetPollingMode(Core::HID::EmulatedDeviceIndex::RightIndex, - Common::Input::PollingMode::NFC) != - Common::Input::DriverResult::Success) { - LOG_ERROR(Service_NFC, "Nfc not supported"); - return NfcDisabled; - } - - device_state = NFP::DeviceState::SearchingForTag; - allowed_protocols = allowed_protocol; - return ResultSuccess; -} - -Result NfcDevice::StopDetection() { - npad_device->SetPollingMode(Core::HID::EmulatedDeviceIndex::RightIndex, - Common::Input::PollingMode::Active); - - if (device_state == NFP::DeviceState::Initialized) { - return ResultSuccess; - } - - if (device_state == NFP::DeviceState::TagFound || - device_state == NFP::DeviceState::TagMounted) { - CloseNfcTag(); - return ResultSuccess; - } - if (device_state == NFP::DeviceState::SearchingForTag || - device_state == NFP::DeviceState::TagRemoved) { - device_state = NFP::DeviceState::Initialized; - return ResultSuccess; - } - - LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); - return WrongDeviceState; -} - -Result NfcDevice::Flush() { - if (device_state != NFP::DeviceState::TagFound && - device_state != NFP::DeviceState::TagMounted) { - LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); - if (device_state == NFP::DeviceState::TagRemoved) { - return TagRemoved; - } - return WrongDeviceState; - } - - if (!npad_device->WriteNfc(tag_data)) { - LOG_ERROR(Service_NFP, "Error writing to file"); - return MifareReadError; - } - - return ResultSuccess; -} - -Result NfcDevice::GetTagInfo(NFP::TagInfo& tag_info, bool is_mifare) const { - if (device_state != NFP::DeviceState::TagFound && - device_state != NFP::DeviceState::TagMounted) { - LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); - if (device_state == NFP::DeviceState::TagRemoved) { - return TagRemoved; - } - return WrongDeviceState; - } - - if (is_mifare) { - tag_info = { - .uuid = encrypted_tag_data.uuid.uid, - .uuid_length = static_cast(encrypted_tag_data.uuid.uid.size()), - .protocol = NFP::TagProtocol::TypeA, - .tag_type = NFP::TagType::Type4, - }; - return ResultSuccess; - } - - // Protocol and tag type may change here - tag_info = { - .uuid = encrypted_tag_data.uuid.uid, - .uuid_length = static_cast(encrypted_tag_data.uuid.uid.size()), - .protocol = NFP::TagProtocol::TypeA, - .tag_type = NFP::TagType::Type2, - }; - - return ResultSuccess; -} - -Result NfcDevice::MifareRead(const NFP::MifareReadBlockParameter& parameter, - NFP::MifareReadBlockData& read_block_data) { - const std::size_t sector_index = parameter.sector_number * sizeof(NFP::DataBlock); - read_block_data.sector_number = parameter.sector_number; - - if (device_state != NFP::DeviceState::TagFound && - device_state != NFP::DeviceState::TagMounted) { - LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); - if (device_state == NFP::DeviceState::TagRemoved) { - return TagRemoved; - } - return WrongDeviceState; - } - - if (tag_data.size() < sector_index + sizeof(NFP::DataBlock)) { - return MifareReadError; - } - - // TODO: Use parameter.sector_key to read encrypted data - memcpy(read_block_data.data.data(), tag_data.data() + sector_index, sizeof(NFP::DataBlock)); - - return ResultSuccess; -} - -Result NfcDevice::MifareWrite(const NFP::MifareWriteBlockParameter& parameter) { - const std::size_t sector_index = parameter.sector_number * sizeof(NFP::DataBlock); - - if (device_state != NFP::DeviceState::TagFound && - device_state != NFP::DeviceState::TagMounted) { - LOG_ERROR(Service_NFC, "Wrong device state {}", device_state); - if (device_state == NFP::DeviceState::TagRemoved) { - return TagRemoved; - } - return WrongDeviceState; - } - - if (tag_data.size() < sector_index + sizeof(NFP::DataBlock)) { - return MifareReadError; - } - - // TODO: Use parameter.sector_key to encrypt the data - memcpy(tag_data.data() + sector_index, parameter.data.data(), sizeof(NFP::DataBlock)); - - return ResultSuccess; -} - -u64 NfcDevice::GetHandle() const { - // Generate a handle based of the npad id - return static_cast(npad_id); -} - -NFP::DeviceState NfcDevice::GetCurrentState() const { - return device_state; -} - -Core::HID::NpadIdType NfcDevice::GetNpadId() const { - return npad_id; -} - -} // namespace Service::NFC diff --git a/src/core/hle/service/nfc/nfc_device.h b/src/core/hle/service/nfc/nfc_device.h deleted file mode 100644 index ea63f0537..000000000 --- a/src/core/hle/service/nfc/nfc_device.h +++ /dev/null @@ -1,78 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "common/common_types.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/nfp/nfp_types.h" -#include "core/hle/service/service.h" - -namespace Kernel { -class KEvent; -class KReadableEvent; -} // namespace Kernel - -namespace Core { -class System; -} // namespace Core - -namespace Core::HID { -class EmulatedController; -enum class ControllerTriggerType; -enum class NpadIdType : u32; -} // namespace Core::HID - -namespace Service::NFC { -class NfcDevice { -public: - NfcDevice(Core::HID::NpadIdType npad_id_, Core::System& system_, - KernelHelpers::ServiceContext& service_context_, - Kernel::KEvent* availability_change_event_); - ~NfcDevice(); - - void Initialize(); - void Finalize(); - - Result StartDetection(NFP::TagProtocol allowed_protocol); - Result StopDetection(); - Result Flush(); - - Result GetTagInfo(NFP::TagInfo& tag_info, bool is_mifare) const; - - Result MifareRead(const NFP::MifareReadBlockParameter& parameter, - NFP::MifareReadBlockData& read_block_data); - - Result MifareWrite(const NFP::MifareWriteBlockParameter& parameter); - - u64 GetHandle() const; - NFP::DeviceState GetCurrentState() const; - Core::HID::NpadIdType GetNpadId() const; - - Kernel::KReadableEvent& GetActivateEvent() const; - Kernel::KReadableEvent& GetDeactivateEvent() const; - -private: - void NpadUpdate(Core::HID::ControllerTriggerType type); - bool LoadNfcTag(std::span data); - void CloseNfcTag(); - - bool is_controller_set{}; - int callback_key; - const Core::HID::NpadIdType npad_id; - Core::System& system; - Core::HID::EmulatedController* npad_device = nullptr; - KernelHelpers::ServiceContext& service_context; - Kernel::KEvent* activate_event = nullptr; - Kernel::KEvent* deactivate_event = nullptr; - Kernel::KEvent* availability_change_event = nullptr; - - bool is_initalized{}; - NFP::TagProtocol allowed_protocols{}; - NFP::DeviceState device_state{NFP::DeviceState::Unavailable}; - - NFP::EncryptedNTAG215File encrypted_tag_data{}; - std::vector tag_data{}; -}; - -} // namespace Service::NFC diff --git a/src/core/hle/service/nfc/nfc_interface.cpp b/src/core/hle/service/nfc/nfc_interface.cpp index be96d0cbc..0fa29d398 100644 --- a/src/core/hle/service/nfc/nfc_interface.cpp +++ b/src/core/hle/service/nfc/nfc_interface.cpp @@ -6,55 +6,56 @@ #include "core/hid/hid_types.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nfc/nfc_device.h" +#include "core/hle/service/nfc/common/device.h" +#include "core/hle/service/nfc/common/device_manager.h" +#include "core/hle/service/nfc/mifare_result.h" +#include "core/hle/service/nfc/mifare_types.h" #include "core/hle/service/nfc/nfc_interface.h" #include "core/hle/service/nfc/nfc_result.h" +#include "core/hle/service/nfc/nfc_types.h" +#include "core/hle/service/nfp/nfp_result.h" #include "core/hle/service/time/clock_types.h" namespace Service::NFC { -Interface::Interface(Core::System& system_, const char* name) - : ServiceFramework{system_, name}, service_context{system_, service_name} { - availability_change_event = service_context.CreateEvent("Interface:AvailabilityChangeEvent"); +NfcInterface::NfcInterface(Core::System& system_, const char* name, BackendType service_backend) + : ServiceFramework{system_, name}, service_context{system_, service_name}, + backend_type{service_backend} {} - for (u32 device_index = 0; device_index < 10; device_index++) { - devices[device_index] = - std::make_shared(Core::HID::IndexToNpadIdType(device_index), system, - service_context, availability_change_event); - } -} +NfcInterface ::~NfcInterface() = default; -Interface ::~Interface() { - availability_change_event->Close(); -} - -void Interface::Initialize(HLERequestContext& ctx) { +void NfcInterface::Initialize(HLERequestContext& ctx) { LOG_INFO(Service_NFC, "called"); - state = State::Initialized; + auto manager = GetManager(); + auto result = manager->Initialize(); - for (auto& device : devices) { - device->Initialize(); + if (result.IsSuccess()) { + state = State::Initialized; + } else { + manager->Finalize(); } IPC::ResponseBuilder rb{ctx, 2, 0}; - rb.Push(ResultSuccess); + rb.Push(result); } -void Interface::Finalize(HLERequestContext& ctx) { +void NfcInterface::Finalize(HLERequestContext& ctx) { LOG_INFO(Service_NFC, "called"); - state = State::NonInitialized; - - for (auto& device : devices) { - device->Finalize(); + if (state != State::NonInitialized) { + if (GetBackendType() != BackendType::None) { + GetManager()->Finalize(); + } + device_manager = nullptr; + state = State::NonInitialized; } IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); } -void Interface::GetState(HLERequestContext& ctx) { +void NfcInterface::GetState(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); IPC::ResponseBuilder rb{ctx, 3}; @@ -62,50 +63,28 @@ void Interface::GetState(HLERequestContext& ctx) { rb.PushEnum(state); } -void Interface::IsNfcEnabled(HLERequestContext& ctx) { +void NfcInterface::IsNfcEnabled(HLERequestContext& ctx) { LOG_DEBUG(Service_NFC, "called"); + // TODO: This calls nn::settings::detail::GetNfcEnableFlag + const bool is_enabled = true; + IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); - rb.Push(state != State::NonInitialized); + rb.Push(is_enabled); } -void Interface::ListDevices(HLERequestContext& ctx) { - LOG_DEBUG(Service_NFC, "called"); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - if (!ctx.CanWriteBuffer()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(InvalidArgument); - return; - } - - if (ctx.GetWriteBufferSize() == 0) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(InvalidArgument); - return; - } - +void NfcInterface::ListDevices(HLERequestContext& ctx) { std::vector nfp_devices; const std::size_t max_allowed_devices = ctx.GetWriteBufferNumElements(); + LOG_DEBUG(Service_NFC, "called"); - for (auto& device : devices) { - if (nfp_devices.size() >= max_allowed_devices) { - continue; - } - if (device->GetCurrentState() != NFP::DeviceState::Unavailable) { - nfp_devices.push_back(device->GetHandle()); - } - } + auto result = GetManager()->ListDevices(nfp_devices, max_allowed_devices); + result = TranslateResultToServiceError(result); - if (nfp_devices.empty()) { + if (result.IsError()) { IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); + rb.Push(result); return; } @@ -116,210 +95,177 @@ void Interface::ListDevices(HLERequestContext& ctx) { rb.Push(static_cast(nfp_devices.size())); } -void Interface::GetDeviceState(HLERequestContext& ctx) { +void NfcInterface::GetDeviceState(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); - auto device = GetNfcDevice(device_handle); + const auto device_state = GetManager()->GetDeviceState(device_handle); - if (!device.has_value()) { + if (device_state > DeviceState::Finalized) { + ASSERT_MSG(false, "Invalid device state"); + } + + IPC::ResponseBuilder rb{ctx, 3}; + rb.Push(ResultSuccess); + rb.PushEnum(device_state); +} + +void NfcInterface::GetNpadId(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); + + Core::HID::NpadIdType npad_id{}; + auto result = GetManager()->GetNpadId(device_handle, npad_id); + result = TranslateResultToServiceError(result); + + if (result.IsError()) { IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); + rb.Push(result); return; } IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); - rb.PushEnum(device.value()->GetCurrentState()); + rb.PushEnum(npad_id); } -void Interface::GetNpadId(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - IPC::ResponseBuilder rb{ctx, 3}; - rb.Push(ResultSuccess); - rb.PushEnum(device.value()->GetNpadId()); -} - -void Interface::AttachAvailabilityChangeEvent(HLERequestContext& ctx) { +void NfcInterface::AttachAvailabilityChangeEvent(HLERequestContext& ctx) { LOG_INFO(Service_NFC, "called"); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - IPC::ResponseBuilder rb{ctx, 2, 1}; rb.Push(ResultSuccess); - rb.PushCopyObjects(availability_change_event->GetReadableEvent()); + rb.PushCopyObjects(GetManager()->AttachAvailabilityChangeEvent()); } -void Interface::StartDetection(HLERequestContext& ctx) { +void NfcInterface::StartDetection(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; - const auto nfp_protocol{rp.PopEnum()}; - LOG_INFO(Service_NFC, "called, device_handle={}, nfp_protocol={}", device_handle, nfp_protocol); + const auto tag_protocol{rp.PopEnum()}; + LOG_INFO(Service_NFC, "called, device_handle={}, nfp_protocol={}", device_handle, tag_protocol); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->StartDetection(device_handle, tag_protocol); + result = TranslateResultToServiceError(result); - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->StartDetection(nfp_protocol); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } -void Interface::StopDetection(HLERequestContext& ctx) { +void NfcInterface::StopDetection(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->StopDetection(device_handle); + result = TranslateResultToServiceError(result); - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->StopDetection(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } -void Interface::GetTagInfo(HLERequestContext& ctx) { +void NfcInterface::GetTagInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; + TagInfo tag_info{}; + auto result = + GetManager()->GetTagInfo(device_handle, tag_info, backend_type == BackendType::Mifare); + result = TranslateResultToServiceError(result); + + if (result.IsSuccess()) { + ctx.WriteBuffer(tag_info); } - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - NFP::TagInfo tag_info{}; - const auto result = device.value()->GetTagInfo(tag_info, false); - ctx.WriteBuffer(tag_info); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } -void Interface::AttachActivateEvent(HLERequestContext& ctx) { +void NfcInterface::AttachActivateEvent(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - IPC::ResponseBuilder rb{ctx, 2, 1}; rb.Push(ResultSuccess); - rb.PushCopyObjects(device.value()->GetActivateEvent()); + rb.PushCopyObjects(GetManager()->AttachActivateEvent(device_handle)); } -void Interface::AttachDeactivateEvent(HLERequestContext& ctx) { +void NfcInterface::AttachDeactivateEvent(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - IPC::ResponseBuilder rb{ctx, 2, 1}; rb.Push(ResultSuccess); - rb.PushCopyObjects(device.value()->GetDeactivateEvent()); + rb.PushCopyObjects(GetManager()->AttachDeactivateEvent(device_handle)); } -void Interface::SendCommandByPassThrough(HLERequestContext& ctx) { +void NfcInterface::ReadMifare(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + const auto buffer{ctx.ReadBuffer()}; + const auto number_of_commands{ctx.GetReadBufferNumElements()}; + std::vector read_commands(number_of_commands); + + memcpy(read_commands.data(), buffer.data(), + number_of_commands * sizeof(MifareReadBlockParameter)); + + LOG_INFO(Service_NFC, "(STUBBED) called, device_handle={}, read_commands_size={}", + device_handle, number_of_commands); + + std::vector out_data(number_of_commands); + auto result = GetManager()->ReadMifare(device_handle, read_commands, out_data); + result = TranslateResultToServiceError(result); + + if (result.IsSuccess()) { + ctx.WriteBuffer(out_data); + } + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void NfcInterface::WriteMifare(HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto device_handle{rp.Pop()}; + const auto buffer{ctx.ReadBuffer()}; + const auto number_of_commands{ctx.GetReadBufferNumElements()}; + std::vector write_commands(number_of_commands); + + memcpy(write_commands.data(), buffer.data(), + number_of_commands * sizeof(MifareWriteBlockParameter)); + + LOG_INFO(Service_NFC, "(STUBBED) called, device_handle={}, write_commands_size={}", + device_handle, number_of_commands); + + auto result = GetManager()->WriteMifare(device_handle, write_commands); + result = TranslateResultToServiceError(result); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); +} + +void NfcInterface::SendCommandByPassThrough(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto timeout{rp.PopRaw()}; const auto command_data{ctx.ReadBuffer()}; - LOG_INFO(Service_NFC, "(STUBBED) called, device_handle={}, timeout={}, data_size={}", device_handle, timeout.ToSeconds(), command_data.size()); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfcDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - std::vector out_data(1); - // TODO: Request data from nfc device + auto result = + GetManager()->SendCommandByPassThrough(device_handle, timeout, command_data, out_data); + result = TranslateResultToServiceError(result); + + if (result.IsError()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); + return; + } + ctx.WriteBuffer(out_data); IPC::ResponseBuilder rb{ctx, 3}; @@ -327,13 +273,110 @@ void Interface::SendCommandByPassThrough(HLERequestContext& ctx) { rb.Push(static_cast(out_data.size())); } -std::optional> Interface::GetNfcDevice(u64 handle) { - for (auto& device : devices) { - if (device->GetHandle() == handle) { - return device; - } +std::shared_ptr NfcInterface::GetManager() { + if (device_manager == nullptr) { + device_manager = std::make_shared(system, service_context); } - return std::nullopt; + return device_manager; +} + +BackendType NfcInterface::GetBackendType() const { + return backend_type; +} + +Result NfcInterface::TranslateResultToServiceError(Result result) const { + const auto backend = GetBackendType(); + + if (result.IsSuccess()) { + return result; + } + + if (result.module != ErrorModule::NFC) { + return result; + } + + switch (backend) { + case BackendType::Mifare: + return TranslateResultToNfp(result); + case BackendType::Nfp: { + return TranslateResultToNfp(result); + } + default: + if (result != ResultUnknown216) { + return result; + } + return ResultUnknown74; + } +} + +Result NfcInterface::TranslateResultToNfp(Result result) const { + if (result == ResultDeviceNotFound) { + return NFP::ResultDeviceNotFound; + } + if (result == ResultInvalidArgument) { + return NFP::ResultInvalidArgument; + } + if (result == ResultWrongApplicationAreaSize) { + return NFP::ResultWrongApplicationAreaSize; + } + if (result == ResultWrongDeviceState) { + return NFP::ResultWrongDeviceState; + } + if (result == ResultUnknown74) { + return NFP::ResultUnknown74; + } + if (result == ResultNfcDisabled) { + return NFP::ResultNfcDisabled; + } + if (result == ResultNfcNotInitialized) { + return NFP::ResultNfcDisabled; + } + if (result == ResultWriteAmiiboFailed) { + return NFP::ResultWriteAmiiboFailed; + } + if (result == ResultTagRemoved) { + return NFP::ResultTagRemoved; + } + if (result == ResultRegistrationIsNotInitialized) { + return NFP::ResultRegistrationIsNotInitialized; + } + if (result == ResultApplicationAreaIsNotInitialized) { + return NFP::ResultApplicationAreaIsNotInitialized; + } + if (result == ResultCorruptedData) { + return NFP::ResultCorruptedData; + } + if (result == ResultWrongApplicationAreaId) { + return NFP::ResultWrongApplicationAreaId; + } + if (result == ResultApplicationAreaExist) { + return NFP::ResultApplicationAreaExist; + } + if (result == ResultNotAnAmiibo) { + return NFP::ResultNotAnAmiibo; + } + LOG_WARNING(Service_NFC, "Result conversion not handled"); + return result; +} + +Result NfcInterface::TranslateResultToMifare(Result result) const { + if (result == ResultDeviceNotFound) { + return Mifare::ResultDeviceNotFound; + } + if (result == ResultInvalidArgument) { + return Mifare::ResultInvalidArgument; + } + if (result == ResultWrongDeviceState) { + return Mifare::ResultWrongDeviceState; + } + if (result == ResultNfcDisabled) { + return Mifare::ResultNfcDisabled; + } + if (result == ResultTagRemoved) { + return Mifare::ResultTagRemoved; + } + LOG_WARNING(Service_NFC, "Result conversion not handled"); + return result; } } // namespace Service::NFC diff --git a/src/core/hle/service/nfc/nfc_interface.h b/src/core/hle/service/nfc/nfc_interface.h index 8c1bf5a59..08be174d8 100644 --- a/src/core/hle/service/nfc/nfc_interface.h +++ b/src/core/hle/service/nfc/nfc_interface.h @@ -3,20 +3,17 @@ #pragma once -#include -#include -#include - #include "core/hle/service/kernel_helpers.h" +#include "core/hle/service/nfc/nfc_types.h" #include "core/hle/service/service.h" namespace Service::NFC { -class NfcDevice; +class DeviceManager; -class Interface : public ServiceFramework { +class NfcInterface : public ServiceFramework { public: - explicit Interface(Core::System& system_, const char* name); - ~Interface(); + explicit NfcInterface(Core::System& system_, const char* name, BackendType service_backend); + ~NfcInterface(); void Initialize(HLERequestContext& ctx); void Finalize(HLERequestContext& ctx); @@ -31,22 +28,22 @@ public: void GetTagInfo(HLERequestContext& ctx); void AttachActivateEvent(HLERequestContext& ctx); void AttachDeactivateEvent(HLERequestContext& ctx); + void ReadMifare(HLERequestContext& ctx); + void WriteMifare(HLERequestContext& ctx); void SendCommandByPassThrough(HLERequestContext& ctx); -private: - enum class State : u32 { - NonInitialized, - Initialized, - }; - - std::optional> GetNfcDevice(u64 handle); +protected: + std::shared_ptr GetManager(); + BackendType GetBackendType() const; + Result TranslateResultToServiceError(Result result) const; + Result TranslateResultToNfp(Result result) const; + Result TranslateResultToMifare(Result result) const; KernelHelpers::ServiceContext service_context; - std::array, 10> devices{}; - + BackendType backend_type; State state{State::NonInitialized}; - Kernel::KEvent* availability_change_event; + std::shared_ptr device_manager = nullptr; }; } // namespace Service::NFC diff --git a/src/core/hle/service/nfc/nfc_result.h b/src/core/hle/service/nfc/nfc_result.h index 146b8ba61..917d79ef8 100644 --- a/src/core/hle/service/nfc/nfc_result.h +++ b/src/core/hle/service/nfc/nfc_result.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once @@ -7,17 +7,22 @@ namespace Service::NFC { -constexpr Result DeviceNotFound(ErrorModule::NFC, 64); -constexpr Result InvalidArgument(ErrorModule::NFC, 65); -constexpr Result WrongDeviceState(ErrorModule::NFC, 73); -constexpr Result NfcDisabled(ErrorModule::NFC, 80); -constexpr Result TagRemoved(ErrorModule::NFC, 97); - -constexpr Result MifareDeviceNotFound(ErrorModule::NFCMifare, 64); -constexpr Result MifareInvalidArgument(ErrorModule::NFCMifare, 65); -constexpr Result MifareWrongDeviceState(ErrorModule::NFCMifare, 73); -constexpr Result MifareNfcDisabled(ErrorModule::NFCMifare, 80); -constexpr Result MifareTagRemoved(ErrorModule::NFCMifare, 97); -constexpr Result MifareReadError(ErrorModule::NFCMifare, 288); +constexpr Result ResultDeviceNotFound(ErrorModule::NFC, 64); +constexpr Result ResultInvalidArgument(ErrorModule::NFC, 65); +constexpr Result ResultWrongApplicationAreaSize(ErrorModule::NFP, 68); +constexpr Result ResultWrongDeviceState(ErrorModule::NFC, 73); +constexpr Result ResultUnknown74(ErrorModule::NFC, 74); +constexpr Result ResultUnknown76(ErrorModule::NFC, 76); +constexpr Result ResultNfcNotInitialized(ErrorModule::NFC, 77); +constexpr Result ResultNfcDisabled(ErrorModule::NFC, 80); +constexpr Result ResultWriteAmiiboFailed(ErrorModule::NFP, 88); +constexpr Result ResultTagRemoved(ErrorModule::NFC, 97); +constexpr Result ResultRegistrationIsNotInitialized(ErrorModule::NFP, 120); +constexpr Result ResultApplicationAreaIsNotInitialized(ErrorModule::NFP, 128); +constexpr Result ResultCorruptedData(ErrorModule::NFP, 144); +constexpr Result ResultWrongApplicationAreaId(ErrorModule::NFP, 152); +constexpr Result ResultApplicationAreaExist(ErrorModule::NFP, 168); +constexpr Result ResultNotAnAmiibo(ErrorModule::NFP, 178); +constexpr Result ResultUnknown216(ErrorModule::NFC, 216); } // namespace Service::NFC diff --git a/src/core/hle/service/nfc/nfc_types.h b/src/core/hle/service/nfc/nfc_types.h new file mode 100644 index 000000000..c7ebd1fdb --- /dev/null +++ b/src/core/hle/service/nfc/nfc_types.h @@ -0,0 +1,90 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include + +#include "common/common_funcs.h" +#include "common/common_types.h" + +namespace Service::NFC { +enum class BackendType : u32 { + None, + Nfc, + Nfp, + Mifare, +}; + +// This is nn::nfc::DeviceState +enum class DeviceState : u32 { + Initialized, + SearchingForTag, + TagFound, + TagRemoved, + TagMounted, + Unavailable, + Finalized, +}; + +// This is nn::nfc::State +enum class State : u32 { + NonInitialized, + Initialized, +}; + +// This is nn::nfc::TagType +enum class TagType : u32 { + None, + Type1, // ISO14443A RW 96-2k bytes 106kbit/s + Type2, // ISO14443A RW/RO 540 bytes 106kbit/s + Type3, // Sony FeliCa RW/RO 2k bytes 212kbit/s + Type4, // ISO14443A RW/RO 4k-32k bytes 424kbit/s + Type5, // ISO15693 RW/RO 540 bytes 106kbit/s +}; + +enum class PackedTagType : u8 { + None, + Type1, // ISO14443A RW 96-2k bytes 106kbit/s + Type2, // ISO14443A RW/RO 540 bytes 106kbit/s + Type3, // Sony FeliCa RW/RO 2k bytes 212kbit/s + Type4, // ISO14443A RW/RO 4k-32k bytes 424kbit/s + Type5, // ISO15693 RW/RO 540 bytes 106kbit/s +}; + +// This is nn::nfc::NfcProtocol +// Verify this enum. It might be completely wrong default protocol is 0x48 +enum class NfcProtocol : u32 { + None, + TypeA = 1U << 0, // ISO14443A + TypeB = 1U << 1, // ISO14443B + TypeF = 1U << 2, // Sony FeliCa + Unknown1 = 1U << 3, + Unknown2 = 1U << 5, + All = 0xFFFFFFFFU, +}; + +// this is nn::nfc::TestWaveType +enum class TestWaveType : u32 { + Unknown, +}; + +using UniqueSerialNumber = std::array; +using UniqueSerialNumberExtension = std::array; + +// This is nn::nfc::DeviceHandle +using DeviceHandle = u64; + +// This is nn::nfc::TagInfo +struct TagInfo { + UniqueSerialNumber uuid; + UniqueSerialNumberExtension uuid_extension; + u8 uuid_length; + INSERT_PADDING_BYTES(0x15); + NfcProtocol protocol; + TagType tag_type; + INSERT_PADDING_BYTES(0x30); +}; +static_assert(sizeof(TagInfo) == 0x58, "TagInfo is an invalid size"); + +} // namespace Service::NFC diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp index 2559fe598..2eeabc138 100644 --- a/src/core/hle/service/nfp/nfp.cpp +++ b/src/core/hle/service/nfp/nfp.cpp @@ -13,7 +13,7 @@ class IUser final : public Interface { public: explicit IUser(Core::System& system_) : Interface(system_, "NFP:IUser") { // clang-format off - static const FunctionInfo functions[] = { + static const FunctionInfoTyped functions[] = { {0, &IUser::Initialize, "Initialize"}, {1, &IUser::Finalize, "Finalize"}, {2, &IUser::ListDevices, "ListDevices"}, @@ -50,7 +50,7 @@ class ISystem final : public Interface { public: explicit ISystem(Core::System& system_) : Interface(system_, "NFP:ISystem") { // clang-format off - static const FunctionInfo functions[] = { + static const FunctionInfoTyped functions[] = { {0, &ISystem::InitializeSystem, "InitializeSystem"}, {1, &ISystem::FinalizeSystem, "FinalizeSystem"}, {2, &ISystem::ListDevices, "ListDevices"}, @@ -89,7 +89,7 @@ class IDebug final : public Interface { public: explicit IDebug(Core::System& system_) : Interface(system_, "NFP:IDebug") { // clang-format off - static const FunctionInfo functions[] = { + static const FunctionInfoTyped functions[] = { {0, &IDebug::InitializeDebug, "InitializeDebug"}, {1, &IDebug::FinalizeDebug, "FinalizeDebug"}, {2, &IDebug::ListDevices, "ListDevices"}, @@ -126,9 +126,9 @@ public: {201, &IDebug::SetAll, "SetAll"}, {202, &IDebug::FlushDebug, "FlushDebug"}, {203, &IDebug::BreakTag, "BreakTag"}, - {204, nullptr, "ReadBackupData"}, - {205, nullptr, "WriteBackupData"}, - {206, nullptr, "WriteNtf"}, + {204, &IDebug::ReadBackupData, "ReadBackupData"}, + {205, &IDebug::WriteBackupData, "WriteBackupData"}, + {206, &IDebug::WriteNtf, "WriteNtf"}, }; // clang-format on diff --git a/src/core/hle/service/nfp/nfp_device.h b/src/core/hle/service/nfp/nfp_device.h deleted file mode 100644 index bab05538a..000000000 --- a/src/core/hle/service/nfp/nfp_device.h +++ /dev/null @@ -1,120 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include -#include - -#include "common/common_types.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/nfp/nfp_types.h" -#include "core/hle/service/service.h" - -namespace Kernel { -class KEvent; -class KReadableEvent; -} // namespace Kernel - -namespace Core { -class System; -} // namespace Core - -namespace Core::HID { -class EmulatedController; -enum class ControllerTriggerType; -enum class NpadIdType : u32; -} // namespace Core::HID - -namespace Service::NFP { -class NfpDevice { -public: - NfpDevice(Core::HID::NpadIdType npad_id_, Core::System& system_, - KernelHelpers::ServiceContext& service_context_, - Kernel::KEvent* availability_change_event_); - ~NfpDevice(); - - void Initialize(); - void Finalize(); - - Result StartDetection(TagProtocol allowed_protocol); - Result StopDetection(); - Result Mount(MountTarget mount_target); - Result Unmount(); - - Result Flush(); - Result FlushDebug(); - Result FlushWithBreak(BreakType break_type); - - Result GetTagInfo(TagInfo& tag_info) const; - Result GetCommonInfo(CommonInfo& common_info) const; - Result GetModelInfo(ModelInfo& model_info) const; - Result GetRegisterInfo(RegisterInfo& register_info) const; - Result GetRegisterInfoPrivate(RegisterInfoPrivate& register_info) const; - Result GetAdminInfo(AdminInfo& admin_info) const; - - Result DeleteRegisterInfo(); - Result SetRegisterInfoPrivate(const AmiiboName& amiibo_name); - Result RestoreAmiibo(); - Result Format(); - - Result OpenApplicationArea(u32 access_id); - Result GetApplicationAreaId(u32& application_area_id) const; - Result GetApplicationArea(std::vector& data) const; - Result SetApplicationArea(std::span data); - Result CreateApplicationArea(u32 access_id, std::span data); - Result RecreateApplicationArea(u32 access_id, std::span data); - Result DeleteApplicationArea(); - Result ExistApplicationArea(bool& has_application_area); - - Result GetAll(NfpData& data) const; - Result SetAll(const NfpData& data); - Result BreakTag(BreakType break_type); - Result ReadBackupData(); - Result WriteBackupData(); - Result WriteNtf(); - - u64 GetHandle() const; - u32 GetApplicationAreaSize() const; - DeviceState GetCurrentState() const; - Core::HID::NpadIdType GetNpadId() const; - - Kernel::KReadableEvent& GetActivateEvent() const; - Kernel::KReadableEvent& GetDeactivateEvent() const; - -private: - void NpadUpdate(Core::HID::ControllerTriggerType type); - bool LoadAmiibo(std::span data); - void CloseAmiibo(); - - AmiiboName GetAmiiboName(const AmiiboSettings& settings) const; - void SetAmiiboName(AmiiboSettings& settings, const AmiiboName& amiibo_name); - AmiiboDate GetAmiiboDate(s64 posix_time) const; - u64 RemoveVersionByte(u64 application_id) const; - void UpdateSettingsCrc(); - void UpdateRegisterInfoCrc(); - - bool is_controller_set{}; - int callback_key; - const Core::HID::NpadIdType npad_id; - Core::System& system; - Core::HID::EmulatedController* npad_device = nullptr; - KernelHelpers::ServiceContext& service_context; - Kernel::KEvent* activate_event = nullptr; - Kernel::KEvent* deactivate_event = nullptr; - Kernel::KEvent* availability_change_event = nullptr; - - bool is_initalized{}; - bool is_data_moddified{}; - bool is_app_area_open{}; - bool is_plain_amiibo{}; - TagProtocol allowed_protocols{}; - s64 current_posix_time{}; - MountTarget mount_target{MountTarget::None}; - DeviceState device_state{DeviceState::Unavailable}; - - NTAG215File tag_data{}; - EncryptedNTAG215File encrypted_tag_data{}; -}; - -} // namespace Service::NFP diff --git a/src/core/hle/service/nfp/nfp_interface.cpp b/src/core/hle/service/nfp/nfp_interface.cpp index 2ed8bb1ba..21d159154 100644 --- a/src/core/hle/service/nfp/nfp_interface.cpp +++ b/src/core/hle/service/nfp/nfp_interface.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" @@ -6,198 +6,34 @@ #include "core/hid/hid_types.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nfp/nfp_device.h" +#include "core/hle/service/nfc/common/device.h" +#include "core/hle/service/nfc/common/device_manager.h" +#include "core/hle/service/nfc/nfc_types.h" #include "core/hle/service/nfp/nfp_interface.h" #include "core/hle/service/nfp/nfp_result.h" +#include "core/hle/service/nfp/nfp_types.h" namespace Service::NFP { Interface::Interface(Core::System& system_, const char* name) - : ServiceFramework{system_, name}, service_context{system_, service_name} { - availability_change_event = service_context.CreateEvent("IUser:AvailabilityChangeEvent"); + : NfcInterface{system_, name, NFC::BackendType::Nfp} {} - for (u32 device_index = 0; device_index < 10; device_index++) { - devices[device_index] = - std::make_shared(Core::HID::IndexToNpadIdType(device_index), system, - service_context, availability_change_event); - } -} - -Interface::~Interface() { - availability_change_event->Close(); -} - -void Interface::Initialize(HLERequestContext& ctx) { - LOG_INFO(Service_NFP, "called"); - - state = State::Initialized; - - for (auto& device : devices) { - device->Initialize(); - } - - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); -} +Interface::~Interface() = default; void Interface::InitializeSystem(HLERequestContext& ctx) { - LOG_INFO(Service_NFP, "called"); - - state = State::Initialized; - - for (auto& device : devices) { - device->Initialize(); - } - - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); + Initialize(ctx); } void Interface::InitializeDebug(HLERequestContext& ctx) { - LOG_INFO(Service_NFP, "called"); - - state = State::Initialized; - - for (auto& device : devices) { - device->Initialize(); - } - - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); -} - -void Interface::Finalize(HLERequestContext& ctx) { - LOG_INFO(Service_NFP, "called"); - - state = State::NonInitialized; - - for (auto& device : devices) { - device->Finalize(); - } - - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); + Initialize(ctx); } void Interface::FinalizeSystem(HLERequestContext& ctx) { - LOG_INFO(Service_NFP, "called"); - - state = State::NonInitialized; - - for (auto& device : devices) { - device->Finalize(); - } - - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); + Finalize(ctx); } void Interface::FinalizeDebug(HLERequestContext& ctx) { - LOG_INFO(Service_NFP, "called"); - - state = State::NonInitialized; - - for (auto& device : devices) { - device->Finalize(); - } - - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultSuccess); -} - -void Interface::ListDevices(HLERequestContext& ctx) { - LOG_DEBUG(Service_NFP, "called"); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - if (!ctx.CanWriteBuffer()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(InvalidArgument); - return; - } - - if (ctx.GetWriteBufferSize() == 0) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(InvalidArgument); - return; - } - - std::vector nfp_devices; - const std::size_t max_allowed_devices = ctx.GetWriteBufferNumElements(); - - for (const auto& device : devices) { - if (nfp_devices.size() >= max_allowed_devices) { - continue; - } - if (device->GetCurrentState() != DeviceState::Unavailable) { - nfp_devices.push_back(device->GetHandle()); - } - } - - if (nfp_devices.empty()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - ctx.WriteBuffer(nfp_devices); - - IPC::ResponseBuilder rb{ctx, 3}; - rb.Push(ResultSuccess); - rb.Push(static_cast(nfp_devices.size())); -} - -void Interface::StartDetection(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - const auto nfp_protocol{rp.PopEnum()}; - LOG_INFO(Service_NFP, "called, device_handle={}, nfp_protocol={}", device_handle, nfp_protocol); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->StartDetection(nfp_protocol); - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); -} - -void Interface::StopDetection(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->StopDetection(); - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); + Finalize(ctx); } void Interface::Mount(HLERequestContext& ctx) { @@ -208,21 +44,9 @@ void Interface::Mount(HLERequestContext& ctx) { LOG_INFO(Service_NFP, "called, device_handle={}, model_type={}, mount_target={}", device_handle, model_type, mount_target); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->Mount(device_handle, model_type, mount_target); + result = TranslateResultToServiceError(result); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->Mount(mount_target); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -232,21 +56,9 @@ void Interface::Unmount(HLERequestContext& ctx) { const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->Unmount(device_handle); + result = TranslateResultToServiceError(result); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->Unmount(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -257,21 +69,9 @@ void Interface::OpenApplicationArea(HLERequestContext& ctx) { const auto access_id{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}, access_id={}", device_handle, access_id); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->OpenApplicationArea(device_handle, access_id); + result = TranslateResultToServiceError(result); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->OpenApplicationArea(access_id); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -282,28 +82,16 @@ void Interface::GetApplicationArea(HLERequestContext& ctx) { const auto data_size = ctx.GetWriteBufferSize(); LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - if (!ctx.CanWriteBuffer()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(InvalidArgument); - return; - } - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - std::vector data(data_size); - const auto result = device.value()->GetApplicationArea(data); + auto result = GetManager()->GetApplicationArea(device_handle, data); + result = TranslateResultToServiceError(result); + + if (result.IsError()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); + return; + } + ctx.WriteBuffer(data); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(result); @@ -316,27 +104,9 @@ void Interface::SetApplicationArea(HLERequestContext& ctx) { const auto data{ctx.ReadBuffer()}; LOG_INFO(Service_NFP, "called, device_handle={}, data_size={}", device_handle, data.size()); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->SetApplicationArea(device_handle, data); + result = TranslateResultToServiceError(result); - if (!ctx.CanReadBuffer()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(InvalidArgument); - return; - } - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->SetApplicationArea(data); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -346,21 +116,9 @@ void Interface::Flush(HLERequestContext& ctx) { const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->Flush(device_handle); + result = TranslateResultToServiceError(result); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->Flush(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -370,21 +128,9 @@ void Interface::Restore(HLERequestContext& ctx) { const auto device_handle{rp.Pop()}; LOG_WARNING(Service_NFP, "(STUBBED) called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->Restore(device_handle); + result = TranslateResultToServiceError(result); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->RestoreAmiibo(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -397,53 +143,9 @@ void Interface::CreateApplicationArea(HLERequestContext& ctx) { LOG_INFO(Service_NFP, "called, device_handle={}, data_size={}, access_id={}", device_handle, access_id, data.size()); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->CreateApplicationArea(device_handle, access_id, data); + result = TranslateResultToServiceError(result); - if (!ctx.CanReadBuffer()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(InvalidArgument); - return; - } - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->CreateApplicationArea(access_id, data); - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); -} - -void Interface::GetTagInfo(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - TagInfo tag_info{}; - const auto result = device.value()->GetTagInfo(tag_info); - ctx.WriteBuffer(tag_info); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -453,23 +155,14 @@ void Interface::GetRegisterInfo(HLERequestContext& ctx) { const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - RegisterInfo register_info{}; - const auto result = device.value()->GetRegisterInfo(register_info); - ctx.WriteBuffer(register_info); + auto result = GetManager()->GetRegisterInfo(device_handle, register_info); + result = TranslateResultToServiceError(result); + + if (result.IsSuccess()) { + ctx.WriteBuffer(register_info); + } + IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -479,23 +172,14 @@ void Interface::GetCommonInfo(HLERequestContext& ctx) { const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - CommonInfo common_info{}; - const auto result = device.value()->GetCommonInfo(common_info); - ctx.WriteBuffer(common_info); + auto result = GetManager()->GetCommonInfo(device_handle, common_info); + result = TranslateResultToServiceError(result); + + if (result.IsSuccess()) { + ctx.WriteBuffer(common_info); + } + IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -505,155 +189,26 @@ void Interface::GetModelInfo(HLERequestContext& ctx) { const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - ModelInfo model_info{}; - const auto result = device.value()->GetModelInfo(model_info); - ctx.WriteBuffer(model_info); + auto result = GetManager()->GetModelInfo(device_handle, model_info); + result = TranslateResultToServiceError(result); + + if (result.IsSuccess()) { + ctx.WriteBuffer(model_info); + } + IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } -void Interface::AttachActivateEvent(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - IPC::ResponseBuilder rb{ctx, 2, 1}; - rb.Push(ResultSuccess); - rb.PushCopyObjects(device.value()->GetActivateEvent()); -} - -void Interface::AttachDeactivateEvent(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - IPC::ResponseBuilder rb{ctx, 2, 1}; - rb.Push(ResultSuccess); - rb.PushCopyObjects(device.value()->GetDeactivateEvent()); -} - -void Interface::GetState(HLERequestContext& ctx) { - LOG_DEBUG(Service_NFP, "called"); - - IPC::ResponseBuilder rb{ctx, 3}; - rb.Push(ResultSuccess); - rb.PushEnum(state); -} - -void Interface::GetDeviceState(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - IPC::ResponseBuilder rb{ctx, 3}; - rb.Push(ResultSuccess); - rb.PushEnum(device.value()->GetCurrentState()); -} - -void Interface::GetNpadId(HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - IPC::ResponseBuilder rb{ctx, 3}; - rb.Push(ResultSuccess); - rb.PushEnum(device.value()->GetNpadId()); -} - void Interface::GetApplicationAreaSize(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); - rb.Push(device.value()->GetApplicationAreaSize()); -} - -void Interface::AttachAvailabilityChangeEvent(HLERequestContext& ctx) { - LOG_INFO(Service_NFP, "called"); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - IPC::ResponseBuilder rb{ctx, 2, 1}; - rb.Push(ResultSuccess); - rb.PushCopyObjects(availability_change_event->GetReadableEvent()); + rb.Push(GetManager()->GetApplicationAreaSize()); } void Interface::RecreateApplicationArea(HLERequestContext& ctx) { @@ -664,21 +219,9 @@ void Interface::RecreateApplicationArea(HLERequestContext& ctx) { LOG_INFO(Service_NFP, "called, device_handle={}, data_size={}, access_id={}", device_handle, access_id, data.size()); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->RecreateApplicationArea(device_handle, access_id, data); + result = TranslateResultToServiceError(result); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->RecreateApplicationArea(access_id, data); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -686,23 +229,11 @@ void Interface::RecreateApplicationArea(HLERequestContext& ctx) { void Interface::Format(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->Format(device_handle); + result = TranslateResultToServiceError(result); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->Format(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -712,23 +243,14 @@ void Interface::GetAdminInfo(HLERequestContext& ctx) { const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - AdminInfo admin_info{}; - const auto result = device.value()->GetAdminInfo(admin_info); - ctx.WriteBuffer(admin_info); + auto result = GetManager()->GetAdminInfo(device_handle, admin_info); + result = TranslateResultToServiceError(result); + + if (result.IsSuccess()) { + ctx.WriteBuffer(admin_info); + } + IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -738,23 +260,14 @@ void Interface::GetRegisterInfoPrivate(HLERequestContext& ctx) { const auto device_handle{rp.Pop()}; LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - RegisterInfoPrivate register_info{}; - const auto result = device.value()->GetRegisterInfoPrivate(register_info); - ctx.WriteBuffer(register_info); + auto result = GetManager()->GetRegisterInfoPrivate(device_handle, register_info); + result = TranslateResultToServiceError(result); + + if (result.IsSuccess()) { + ctx.WriteBuffer(register_info); + } + IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -762,25 +275,15 @@ void Interface::GetRegisterInfoPrivate(HLERequestContext& ctx) { void Interface::SetRegisterInfoPrivate(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; - const auto buffer{ctx.ReadBuffer()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}, buffer_size={}", device_handle, - buffer.size()); + const auto register_info_buffer{ctx.ReadBuffer()}; + LOG_INFO(Service_NFP, "called, device_handle={}, buffer_size={}", device_handle, + register_info_buffer.size()); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + RegisterInfoPrivate register_info{}; + memcpy(®ister_info, register_info_buffer.data(), sizeof(RegisterInfoPrivate)); + auto result = GetManager()->SetRegisterInfoPrivate(device_handle, register_info); + result = TranslateResultToServiceError(result); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->SetRegisterInfoPrivate({}); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -788,23 +291,11 @@ void Interface::SetRegisterInfoPrivate(HLERequestContext& ctx) { void Interface::DeleteRegisterInfo(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->DeleteRegisterInfo(device_handle); + result = TranslateResultToServiceError(result); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->DeleteRegisterInfo(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -812,23 +303,11 @@ void Interface::DeleteRegisterInfo(HLERequestContext& ctx) { void Interface::DeleteApplicationArea(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->DeleteApplicationArea(device_handle); + result = TranslateResultToServiceError(result); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->DeleteApplicationArea(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -836,24 +315,18 @@ void Interface::DeleteApplicationArea(HLERequestContext& ctx) { void Interface::ExistsApplicationArea(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); - - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } - - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } + LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); bool has_application_area = false; - const auto result = device.value()->ExistApplicationArea(has_application_area); + auto result = GetManager()->ExistsApplicationArea(device_handle, has_application_area); + result = TranslateResultToServiceError(result); + + if (result.IsError()) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(result); + return; + } + IPC::ResponseBuilder rb{ctx, 3}; rb.Push(result); rb.Push(has_application_area); @@ -862,27 +335,16 @@ void Interface::ExistsApplicationArea(HLERequestContext& ctx) { void Interface::GetAll(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; + NfpData nfp_data{}; + auto result = GetManager()->GetAll(device_handle, nfp_data); + result = TranslateResultToServiceError(result); + + if (result.IsSuccess()) { + ctx.WriteBuffer(nfp_data); } - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - NfpData data{}; - const auto result = device.value()->GetAll(data); - - ctx.WriteBuffer(data); - IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -890,28 +352,15 @@ void Interface::GetAll(HLERequestContext& ctx) { void Interface::SetAll(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; - const auto nfp_data{ctx.ReadBuffer()}; + const auto nfp_data_buffer{ctx.ReadBuffer()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + NfpData nfp_data{}; + memcpy(&nfp_data, nfp_data_buffer.data(), sizeof(NfpData)); + auto result = GetManager()->SetAll(device_handle, nfp_data); + result = TranslateResultToServiceError(result); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - NfpData data{}; - memcpy(&data, nfp_data.data(), sizeof(NfpData)); - - const auto result = device.value()->SetAll(data); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -919,23 +368,11 @@ void Interface::SetAll(HLERequestContext& ctx) { void Interface::FlushDebug(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + LOG_INFO(Service_NFP, "called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->FlushDebug(device_handle); + result = TranslateResultToServiceError(result); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->FlushDebug(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -944,23 +381,12 @@ void Interface::BreakTag(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; const auto break_type{rp.PopEnum()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}, break_type={}", device_handle, break_type); + LOG_WARNING(Service_NFP, "(STUBBED) called, device_handle={}, break_type={}", device_handle, + break_type); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->BreakTag(device_handle, break_type); + result = TranslateResultToServiceError(result); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->BreakTag(break_type); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -968,23 +394,16 @@ void Interface::BreakTag(HLERequestContext& ctx) { void Interface::ReadBackupData(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + LOG_WARNING(Service_NFP, "(STUBBED) called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; + std::vector backup_data{}; + auto result = GetManager()->ReadBackupData(device_handle, backup_data); + result = TranslateResultToServiceError(result); + + if (result.IsSuccess()) { + ctx.WriteBuffer(backup_data); } - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->ReadBackupData(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -992,23 +411,12 @@ void Interface::ReadBackupData(HLERequestContext& ctx) { void Interface::WriteBackupData(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + const auto backup_data_buffer{ctx.ReadBuffer()}; + LOG_WARNING(Service_NFP, "(STUBBED) called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->WriteBackupData(device_handle, backup_data_buffer); + result = TranslateResultToServiceError(result); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->WriteBackupData(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } @@ -1016,34 +424,15 @@ void Interface::WriteBackupData(HLERequestContext& ctx) { void Interface::WriteNtf(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto device_handle{rp.Pop()}; - LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle); + const auto write_type{rp.PopEnum()}; + const auto ntf_data_buffer{ctx.ReadBuffer()}; + LOG_WARNING(Service_NFP, "(STUBBED) called, device_handle={}", device_handle); - if (state == State::NonInitialized) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(NfcDisabled); - return; - } + auto result = GetManager()->WriteNtf(device_handle, write_type, ntf_data_buffer); + result = TranslateResultToServiceError(result); - auto device = GetNfpDevice(device_handle); - - if (!device.has_value()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(DeviceNotFound); - return; - } - - const auto result = device.value()->WriteNtf(); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(result); } -std::optional> Interface::GetNfpDevice(u64 handle) { - for (auto& device : devices) { - if (device->GetHandle() == handle) { - return device; - } - } - return std::nullopt; -} - } // namespace Service::NFP diff --git a/src/core/hle/service/nfp/nfp_interface.h b/src/core/hle/service/nfp/nfp_interface.h index 616c94b06..fa985b068 100644 --- a/src/core/hle/service/nfp/nfp_interface.h +++ b/src/core/hle/service/nfp/nfp_interface.h @@ -1,32 +1,23 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include -#include -#include - #include "core/hle/service/kernel_helpers.h" +#include "core/hle/service/nfc/nfc_interface.h" #include "core/hle/service/service.h" namespace Service::NFP { -class NfpDevice; -class Interface : public ServiceFramework { +class Interface : public NFC::NfcInterface { public: explicit Interface(Core::System& system_, const char* name); ~Interface() override; - void Initialize(HLERequestContext& ctx); void InitializeSystem(HLERequestContext& ctx); void InitializeDebug(HLERequestContext& ctx); - void Finalize(HLERequestContext& ctx); void FinalizeSystem(HLERequestContext& ctx); void FinalizeDebug(HLERequestContext& ctx); - void ListDevices(HLERequestContext& ctx); - void StartDetection(HLERequestContext& ctx); - void StopDetection(HLERequestContext& ctx); void Mount(HLERequestContext& ctx); void Unmount(HLERequestContext& ctx); void OpenApplicationArea(HLERequestContext& ctx); @@ -35,17 +26,10 @@ public: void Flush(HLERequestContext& ctx); void Restore(HLERequestContext& ctx); void CreateApplicationArea(HLERequestContext& ctx); - void GetTagInfo(HLERequestContext& ctx); void GetRegisterInfo(HLERequestContext& ctx); void GetCommonInfo(HLERequestContext& ctx); void GetModelInfo(HLERequestContext& ctx); - void AttachActivateEvent(HLERequestContext& ctx); - void AttachDeactivateEvent(HLERequestContext& ctx); - void GetState(HLERequestContext& ctx); - void GetDeviceState(HLERequestContext& ctx); - void GetNpadId(HLERequestContext& ctx); void GetApplicationAreaSize(HLERequestContext& ctx); - void AttachAvailabilityChangeEvent(HLERequestContext& ctx); void RecreateApplicationArea(HLERequestContext& ctx); void Format(HLERequestContext& ctx); void GetAdminInfo(HLERequestContext& ctx); @@ -61,21 +45,6 @@ public: void ReadBackupData(HLERequestContext& ctx); void WriteBackupData(HLERequestContext& ctx); void WriteNtf(HLERequestContext& ctx); - -private: - enum class State : u32 { - NonInitialized, - Initialized, - }; - - std::optional> GetNfpDevice(u64 handle); - - KernelHelpers::ServiceContext service_context; - - std::array, 10> devices{}; - - State state{State::NonInitialized}; - Kernel::KEvent* availability_change_event; }; } // namespace Service::NFP diff --git a/src/core/hle/service/nfp/nfp_result.h b/src/core/hle/service/nfp/nfp_result.h index d8e4cf094..4c126cd81 100644 --- a/src/core/hle/service/nfp/nfp_result.h +++ b/src/core/hle/service/nfp/nfp_result.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -7,18 +7,19 @@ namespace Service::NFP { -constexpr Result DeviceNotFound(ErrorModule::NFP, 64); -constexpr Result InvalidArgument(ErrorModule::NFP, 65); -constexpr Result WrongApplicationAreaSize(ErrorModule::NFP, 68); -constexpr Result WrongDeviceState(ErrorModule::NFP, 73); -constexpr Result NfcDisabled(ErrorModule::NFP, 80); -constexpr Result WriteAmiiboFailed(ErrorModule::NFP, 88); -constexpr Result TagRemoved(ErrorModule::NFP, 97); -constexpr Result RegistrationIsNotInitialized(ErrorModule::NFP, 120); -constexpr Result ApplicationAreaIsNotInitialized(ErrorModule::NFP, 128); -constexpr Result CorruptedData(ErrorModule::NFP, 144); -constexpr Result WrongApplicationAreaId(ErrorModule::NFP, 152); -constexpr Result ApplicationAreaExist(ErrorModule::NFP, 168); -constexpr Result NotAnAmiibo(ErrorModule::NFP, 178); +constexpr Result ResultDeviceNotFound(ErrorModule::NFP, 64); +constexpr Result ResultInvalidArgument(ErrorModule::NFP, 65); +constexpr Result ResultWrongApplicationAreaSize(ErrorModule::NFP, 68); +constexpr Result ResultWrongDeviceState(ErrorModule::NFP, 73); +constexpr Result ResultUnknown74(ErrorModule::NFC, 74); +constexpr Result ResultNfcDisabled(ErrorModule::NFP, 80); +constexpr Result ResultWriteAmiiboFailed(ErrorModule::NFP, 88); +constexpr Result ResultTagRemoved(ErrorModule::NFP, 97); +constexpr Result ResultRegistrationIsNotInitialized(ErrorModule::NFP, 120); +constexpr Result ResultApplicationAreaIsNotInitialized(ErrorModule::NFP, 128); +constexpr Result ResultCorruptedData(ErrorModule::NFP, 144); +constexpr Result ResultWrongApplicationAreaId(ErrorModule::NFP, 152); +constexpr Result ResultApplicationAreaExist(ErrorModule::NFP, 168); +constexpr Result ResultNotAnAmiibo(ErrorModule::NFP, 178); } // namespace Service::NFP diff --git a/src/core/hle/service/nfp/nfp_types.h b/src/core/hle/service/nfp/nfp_types.h index 1ef047cee..7d36d5ee6 100644 --- a/src/core/hle/service/nfp/nfp_types.h +++ b/src/core/hle/service/nfp/nfp_types.h @@ -7,32 +7,19 @@ #include "common/swap.h" #include "core/hle/service/mii/types.h" +#include "core/hle/service/nfc/nfc_types.h" namespace Service::NFP { static constexpr std::size_t amiibo_name_length = 0xA; static constexpr std::size_t application_id_version_offset = 0x1c; static constexpr std::size_t counter_limit = 0xffff; -enum class ServiceType : u32 { - User, - Debug, - System, -}; - -enum class DeviceState : u32 { - Initialized, - SearchingForTag, - TagFound, - TagRemoved, - TagMounted, - Unavailable, - Finalized, -}; - +// This is nn::nfp::ModelType enum class ModelType : u32 { Amiibo, }; +// This is nn::nfp::MountTarget enum class MountTarget : u32 { None, Rom, @@ -72,35 +59,6 @@ enum class AmiiboSeries : u8 { Diablo, }; -enum class TagType : u32 { - None, - Type1, // ISO14443A RW 96-2k bytes 106kbit/s - Type2, // ISO14443A RW/RO 540 bytes 106kbit/s - Type3, // Sony Felica RW/RO 2k bytes 212kbit/s - Type4, // ISO14443A RW/RO 4k-32k bytes 424kbit/s - Type5, // ISO15693 RW/RO 540 bytes 106kbit/s -}; - -enum class PackedTagType : u8 { - None, - Type1, // ISO14443A RW 96-2k bytes 106kbit/s - Type2, // ISO14443A RW/RO 540 bytes 106kbit/s - Type3, // Sony Felica RW/RO 2k bytes 212kbit/s - Type4, // ISO14443A RW/RO 4k-32k bytes 424kbit/s - Type5, // ISO15693 RW/RO 540 bytes 106kbit/s -}; - -// Verify this enum. It might be completely wrong default protocol is 0x48 -enum class TagProtocol : u32 { - None, - TypeA = 1U << 0, // ISO14443A - TypeB = 1U << 1, // ISO14443B - TypeF = 1U << 2, // Sony Felica - Unknown1 = 1U << 3, - Unknown2 = 1U << 5, - All = 0xFFFFFFFFU, -}; - enum class AppAreaVersion : u8 { Nintendo3DS = 0, NintendoWiiU = 1, @@ -115,6 +73,11 @@ enum class BreakType : u32 { Unknown2, }; +enum class WriteType : u32 { + Unknown0, + Unknown1, +}; + enum class CabinetMode : u8 { StartNicknameAndOwnerSettings, StartGameDataEraser, @@ -122,27 +85,16 @@ enum class CabinetMode : u8 { StartFormatter, }; -enum class MifareCmd : u8 { - AuthA = 0x60, - AuthB = 0x61, - Read = 0x30, - Write = 0xA0, - Transfer = 0xB0, - Decrement = 0xC0, - Increment = 0xC1, - Store = 0xC2 -}; - -using UniqueSerialNumber = std::array; using LockBytes = std::array; using HashData = std::array; using ApplicationArea = std::array; using AmiiboName = std::array; -using DataBlock = std::array; -using KeyData = std::array; + +// This is nn::nfp::TagInfo +using TagInfo = NFC::TagInfo; struct TagUuid { - UniqueSerialNumber uid; + NFC::UniqueSerialNumber uid; u8 nintendo_id; LockBytes lock_bytes; }; @@ -243,7 +195,7 @@ struct AmiiboModelInfo { AmiiboType amiibo_type; u16_be model_number; AmiiboSeries series; - PackedTagType tag_type; + NFC::PackedTagType tag_type; INSERT_PADDING_BYTES(0x4); // Unknown }; static_assert(sizeof(AmiiboModelInfo) == 0xC, "AmiiboModelInfo is an invalid size"); @@ -298,7 +250,7 @@ struct NTAG215File { u32_be register_info_crc; ApplicationArea application_area; // Encrypted Game data HashData hmac_tag; // Hash - UniqueSerialNumber uid; // Unique serial number + NFC::UniqueSerialNumber uid; // Unique serial number u8 nintendo_id; // Tag UUID AmiiboModelInfo model_info; HashData keygen_salt; // Salt @@ -326,17 +278,7 @@ static_assert(sizeof(EncryptedNTAG215File) == sizeof(NTAG215File), static_assert(std::is_trivially_copyable_v, "EncryptedNTAG215File must be trivially copyable."); -struct TagInfo { - UniqueSerialNumber uuid; - INSERT_PADDING_BYTES(0x3); - u8 uuid_length; - INSERT_PADDING_BYTES(0x15); - TagProtocol protocol; - TagType tag_type; - INSERT_PADDING_BYTES(0x30); -}; -static_assert(sizeof(TagInfo) == 0x58, "TagInfo is an invalid size"); - +// This is nn::nfp::CommonInfo struct CommonInfo { WriteDate last_write_date; u16 write_counter; @@ -347,6 +289,7 @@ struct CommonInfo { }; static_assert(sizeof(CommonInfo) == 0x40, "CommonInfo is an invalid size"); +// This is nn::nfp::ModelInfo struct ModelInfo { u16 character_id; u8 character_variant; @@ -357,6 +300,7 @@ struct ModelInfo { }; static_assert(sizeof(ModelInfo) == 0x40, "ModelInfo is an invalid size"); +// This is nn::nfp::RegisterInfo struct RegisterInfo { Service::Mii::CharInfo mii_char_info; WriteDate creation_date; @@ -366,6 +310,7 @@ struct RegisterInfo { }; static_assert(sizeof(RegisterInfo) == 0x100, "RegisterInfo is an invalid size"); +// This is nn::nfp::RegisterInfoPrivate struct RegisterInfoPrivate { Service::Mii::MiiStoreData mii_store_data; WriteDate creation_date; @@ -375,12 +320,13 @@ struct RegisterInfoPrivate { }; static_assert(sizeof(RegisterInfoPrivate) == 0x100, "RegisterInfoPrivate is an invalid size"); +// This is nn::nfp::AdminInfo struct AdminInfo { u64 application_id; u32 application_area_id; u16 crc_change_counter; u8 flags; - PackedTagType tag_type; + NFC::PackedTagType tag_type; AppAreaVersion app_area_version; INSERT_PADDING_BYTES(0x7); INSERT_PADDING_BYTES(0x28); @@ -411,7 +357,7 @@ struct NfpData { u32 access_id; u16 settings_crc_counter; u8 font_region; - PackedTagType tag_type; + NFC::PackedTagType tag_type; AppAreaVersion console_type; u8 application_id_byte; INSERT_PADDING_BYTES(0x2E); @@ -420,37 +366,4 @@ struct NfpData { static_assert(sizeof(NfpData) == 0x298, "NfpData is an invalid size"); #pragma pack() -struct SectorKey { - MifareCmd command; - u8 unknown; // Usually 1 - INSERT_PADDING_BYTES(0x6); - KeyData sector_key; - INSERT_PADDING_BYTES(0x2); -}; -static_assert(sizeof(SectorKey) == 0x10, "SectorKey is an invalid size"); - -struct MifareReadBlockParameter { - u8 sector_number; - INSERT_PADDING_BYTES(0x7); - SectorKey sector_key; -}; -static_assert(sizeof(MifareReadBlockParameter) == 0x18, - "MifareReadBlockParameter is an invalid size"); - -struct MifareReadBlockData { - DataBlock data; - u8 sector_number; - INSERT_PADDING_BYTES(0x7); -}; -static_assert(sizeof(MifareReadBlockData) == 0x18, "MifareReadBlockData is an invalid size"); - -struct MifareWriteBlockParameter { - DataBlock data; - u8 sector_number; - INSERT_PADDING_BYTES(0x7); - SectorKey sector_key; -}; -static_assert(sizeof(MifareWriteBlockParameter) == 0x28, - "MifareWriteBlockParameter is an invalid size"); - } // namespace Service::NFP diff --git a/src/yuzu/applets/qt_amiibo_settings.cpp b/src/yuzu/applets/qt_amiibo_settings.cpp index 4559df5b1..4988fcc83 100644 --- a/src/yuzu/applets/qt_amiibo_settings.cpp +++ b/src/yuzu/applets/qt_amiibo_settings.cpp @@ -8,7 +8,7 @@ #include "common/assert.h" #include "common/string_util.h" -#include "core/hle/service/nfp/nfp_device.h" +#include "core/hle/service/nfc/common/device.h" #include "core/hle/service/nfp/nfp_result.h" #include "input_common/drivers/virtual_amiibo.h" #include "input_common/main.h" @@ -22,7 +22,7 @@ QtAmiiboSettingsDialog::QtAmiiboSettingsDialog(QWidget* parent, Core::Frontend::CabinetParameters parameters_, InputCommon::InputSubsystem* input_subsystem_, - std::shared_ptr nfp_device_) + std::shared_ptr nfp_device_) : QDialog(parent), ui(std::make_unique()), input_subsystem{input_subsystem_}, nfp_device{std::move(nfp_device_)}, parameters(std::move(parameters_)) { @@ -52,11 +52,11 @@ void QtAmiiboSettingsDialog::LoadInfo() { return; } - if (nfp_device->GetCurrentState() != Service::NFP::DeviceState::TagFound && - nfp_device->GetCurrentState() != Service::NFP::DeviceState::TagMounted) { + if (nfp_device->GetCurrentState() != Service::NFC::DeviceState::TagFound && + nfp_device->GetCurrentState() != Service::NFC::DeviceState::TagMounted) { return; } - nfp_device->Mount(Service::NFP::MountTarget::All); + nfp_device->Mount(Service::NFP::ModelType::Amiibo, Service::NFP::MountTarget::All); LoadAmiiboInfo(); LoadAmiiboData(); @@ -261,7 +261,7 @@ void QtAmiiboSettings::Close() const { void QtAmiiboSettings::ShowCabinetApplet( const Core::Frontend::CabinetCallback& callback_, const Core::Frontend::CabinetParameters& parameters, - std::shared_ptr nfp_device) const { + std::shared_ptr nfp_device) const { callback = std::move(callback_); emit MainWindowShowAmiiboSettings(parameters, nfp_device); } diff --git a/src/yuzu/applets/qt_amiibo_settings.h b/src/yuzu/applets/qt_amiibo_settings.h index bc389a33f..ee66a0255 100644 --- a/src/yuzu/applets/qt_amiibo_settings.h +++ b/src/yuzu/applets/qt_amiibo_settings.h @@ -23,9 +23,9 @@ namespace Ui { class QtAmiiboSettingsDialog; } -namespace Service::NFP { -class NfpDevice; -} // namespace Service::NFP +namespace Service::NFC { +class NfcDevice; +} // namespace Service::NFC class QtAmiiboSettingsDialog final : public QDialog { Q_OBJECT @@ -33,7 +33,7 @@ class QtAmiiboSettingsDialog final : public QDialog { public: explicit QtAmiiboSettingsDialog(QWidget* parent, Core::Frontend::CabinetParameters parameters_, InputCommon::InputSubsystem* input_subsystem_, - std::shared_ptr nfp_device_); + std::shared_ptr nfp_device_); ~QtAmiiboSettingsDialog() override; int exec() override; @@ -52,7 +52,7 @@ private: std::unique_ptr ui; InputCommon::InputSubsystem* input_subsystem; - std::shared_ptr nfp_device; + std::shared_ptr nfp_device; // Parameters sent in from the backend HLE applet. Core::Frontend::CabinetParameters parameters; @@ -71,11 +71,11 @@ public: void Close() const override; void ShowCabinetApplet(const Core::Frontend::CabinetCallback& callback_, const Core::Frontend::CabinetParameters& parameters, - std::shared_ptr nfp_device) const override; + std::shared_ptr nfp_device) const override; signals: void MainWindowShowAmiiboSettings(const Core::Frontend::CabinetParameters& parameters, - std::shared_ptr nfp_device) const; + std::shared_ptr nfp_device) const; void MainWindowRequestExit() const; private: diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index b79409a68..e051e35df 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -570,8 +570,8 @@ void GMainWindow::RegisterMetaTypes() { // Cabinet Applet qRegisterMetaType("Core::Frontend::CabinetParameters"); - qRegisterMetaType>( - "std::shared_ptr"); + qRegisterMetaType>( + "std::shared_ptr"); // Controller Applet qRegisterMetaType("Core::Frontend::ControllerParameters"); @@ -599,7 +599,7 @@ void GMainWindow::RegisterMetaTypes() { } void GMainWindow::AmiiboSettingsShowDialog(const Core::Frontend::CabinetParameters& parameters, - std::shared_ptr nfp_device) { + std::shared_ptr nfp_device) { cabinet_applet = new QtAmiiboSettingsDialog(this, parameters, input_subsystem.get(), nfp_device); SCOPE_EXIT({ diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 8b5c1d747..ac90bd5ae 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -93,9 +93,9 @@ enum class SwkbdReplyType : u32; enum class WebExitReason : u32; } // namespace Service::AM::Applets -namespace Service::NFP { -class NfpDevice; -} // namespace Service::NFP +namespace Service::NFC { +class NfcDevice; +} // namespace Service::NFC namespace Ui { class MainWindow; @@ -188,7 +188,7 @@ public slots: void OnExit(); void OnSaveConfig(); void AmiiboSettingsShowDialog(const Core::Frontend::CabinetParameters& parameters, - std::shared_ptr nfp_device); + std::shared_ptr nfp_device); void AmiiboSettingsRequestExit(); void ControllerSelectorReconfigureControllers( const Core::Frontend::ControllerParameters& parameters); From 9b771bcb8f2da7af507aa7be1b44599901028284 Mon Sep 17 00:00:00 2001 From: german77 Date: Fri, 5 May 2023 22:48:52 -0600 Subject: [PATCH 0340/1181] input_common: Add experimental motion to button --- src/core/hid/input_converter.cpp | 7 +++++++ src/input_common/input_mapping.cpp | 3 +++ 2 files changed, 10 insertions(+) diff --git a/src/core/hid/input_converter.cpp b/src/core/hid/input_converter.cpp index 7cee39a53..2772bc012 100644 --- a/src/core/hid/input_converter.cpp +++ b/src/core/hid/input_converter.cpp @@ -61,6 +61,9 @@ Common::Input::ButtonStatus TransformToButton(const Common::Input::CallbackStatu case Common::Input::InputType::Button: status = callback.button_status; break; + case Common::Input::InputType::Motion: + status.value = std::abs(callback.motion_status.gyro.x.raw_value) > 1.0f; + break; default: LOG_ERROR(Input, "Conversion from type {} to button not implemented", callback.type); break; @@ -226,6 +229,10 @@ Common::Input::TriggerStatus TransformToTrigger(const Common::Input::CallbackSta status = callback.trigger_status; calculate_button_value = false; break; + case Common::Input::InputType::Motion: + status.analog.properties.range = 1.0f; + raw_value = callback.motion_status.accel.x.raw_value; + break; default: LOG_ERROR(Input, "Conversion from type {} to trigger not implemented", callback.type); break; diff --git a/src/input_common/input_mapping.cpp b/src/input_common/input_mapping.cpp index 9361b00c5..8c2ee4eb3 100644 --- a/src/input_common/input_mapping.cpp +++ b/src/input_common/input_mapping.cpp @@ -82,6 +82,9 @@ void MappingFactory::RegisterButton(const MappingData& data) { new_input.Set("axis", data.index); new_input.Set("threshold", 0.5f); break; + case EngineInputType::Motion: + new_input.Set("motion", data.index); + break; default: return; } From a13fd5f7cc4005297d87d0a53a15bc62e14f4fd4 Mon Sep 17 00:00:00 2001 From: Roni Kirla Date: Sun, 7 May 2023 00:13:33 +0300 Subject: [PATCH 0341/1181] Fix read access violation --- src/common/address_space.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/address_space.inc b/src/common/address_space.inc index 2195dabd5..c97dc8651 100644 --- a/src/common/address_space.inc +++ b/src/common/address_space.inc @@ -72,7 +72,7 @@ MAP_MEMBER(void)::MapLocked(VaType virt, PaType phys, VaType size, ExtraBlockInf } }()}; - if (block_end_predecessor->virt >= virt) { + if (block_end_predecessor != blocks.begin() && block_end_predecessor->virt >= virt) { // If this block's start would be overlapped by the map then reuse it as a tail // block block_end_predecessor->virt = virt_end; From 725aacb4bc86a64fd54ba086110a3e62438fa1a6 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Tue, 2 May 2023 16:41:10 -0700 Subject: [PATCH 0342/1181] settings: Add enable compute pipelines For the Intel proprietary driver's deficiencies. settings: Restore compute option global state --- src/common/settings.cpp | 1 + src/common/settings.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/common/settings.cpp b/src/common/settings.cpp index f1ee42ab2..61b5d0c1a 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -230,6 +230,7 @@ void RestoreGlobalState(bool is_powered_on) { values.bg_red.SetGlobal(true); values.bg_green.SetGlobal(true); values.bg_blue.SetGlobal(true); + values.enable_compute_pipelines.SetGlobal(true); // System values.language_index.SetGlobal(true); diff --git a/src/common/settings.h b/src/common/settings.h index 2bf191cef..573597f3d 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -471,6 +471,7 @@ struct Values { SwitchableSetting use_fast_gpu_time{true, "use_fast_gpu_time"}; SwitchableSetting use_vulkan_driver_pipeline_cache{true, "use_vulkan_driver_pipeline_cache"}; + SwitchableSetting enable_compute_pipelines{false, "enable_compute_pipelines"}; SwitchableSetting bg_red{0, "bg_red"}; SwitchableSetting bg_green{0, "bg_green"}; From 6ed6e6e18e99bdfb4518647abd36a4cf9fc1c083 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Tue, 2 May 2023 16:44:28 -0700 Subject: [PATCH 0343/1181] vk_pipeline_cache: Use setting to disable intel compute --- src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index a318d643e..e5219e7e0 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -698,7 +698,8 @@ std::unique_ptr PipelineCache::CreateComputePipeline( PipelineStatistics* statistics, bool build_in_parallel) try { // TODO: Remove this when Intel fixes their shader compiler. // https://github.com/IGCIT/Intel-GPU-Community-Issue-Tracker-IGCIT/issues/159 - if (device.GetDriverID() == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS) { + if (device.GetDriverID() == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS && + !Settings::values.enable_compute_pipelines.GetValue()) { LOG_ERROR(Render_Vulkan, "Skipping 0x{:016x}", key.Hash()); return nullptr; } From 55c77dd25b7ab7a12acb764d27ada77c9d16cb00 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Tue, 2 May 2023 16:48:45 -0700 Subject: [PATCH 0344/1181] yuzu-qt/config: Add option to disable compute on Intel This option is only visible if an Intel GPU using the proprietary driver is found during Vulkan device enumeration. configure_graphics: More directly get driver id Vulkan::Device does quite a bit more than we need just to see the driver ID here. --- src/yuzu/configuration/config.cpp | 2 ++ src/yuzu/configuration/configure_dialog.cpp | 3 ++- src/yuzu/configuration/configure_dialog.h | 2 +- src/yuzu/configuration/configure_graphics.cpp | 23 +++++++++++++++---- src/yuzu/configuration/configure_graphics.h | 6 ++++- .../configure_graphics_advanced.cpp | 17 ++++++++++++++ .../configure_graphics_advanced.h | 3 +++ .../configure_graphics_advanced.ui | 11 +++++++++ src/yuzu/configuration/configure_per_game.cpp | 3 ++- src/yuzu/configuration/configure_per_game.h | 2 +- 10 files changed, 63 insertions(+), 9 deletions(-) diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index a85eb4687..b52203ff1 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -714,6 +714,7 @@ void Config::ReadRendererValues() { ReadGlobalSetting(Settings::values.use_asynchronous_shaders); ReadGlobalSetting(Settings::values.use_fast_gpu_time); ReadGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache); + ReadGlobalSetting(Settings::values.enable_compute_pipelines); ReadGlobalSetting(Settings::values.bg_red); ReadGlobalSetting(Settings::values.bg_green); ReadGlobalSetting(Settings::values.bg_blue); @@ -1362,6 +1363,7 @@ void Config::SaveRendererValues() { WriteGlobalSetting(Settings::values.use_asynchronous_shaders); WriteGlobalSetting(Settings::values.use_fast_gpu_time); WriteGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache); + WriteGlobalSetting(Settings::values.enable_compute_pipelines); WriteGlobalSetting(Settings::values.bg_red); WriteGlobalSetting(Settings::values.bg_green); WriteGlobalSetting(Settings::values.bg_blue); diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp index 2aaefcc05..8e76a819a 100644 --- a/src/yuzu/configuration/configure_dialog.cpp +++ b/src/yuzu/configuration/configure_dialog.cpp @@ -36,8 +36,9 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, debug_tab_tab{std::make_unique(system_, this)}, filesystem_tab{std::make_unique(this)}, general_tab{std::make_unique(system_, this)}, - graphics_tab{std::make_unique(system_, this)}, graphics_advanced_tab{std::make_unique(system_, this)}, + graphics_tab{std::make_unique( + system_, [&]() { graphics_advanced_tab->ExposeComputeOption(); }, this)}, hotkeys_tab{std::make_unique(system_.HIDCore(), this)}, input_tab{std::make_unique(system_, this)}, network_tab{std::make_unique(system_, this)}, diff --git a/src/yuzu/configuration/configure_dialog.h b/src/yuzu/configuration/configure_dialog.h index 1f724834a..a086a07c4 100644 --- a/src/yuzu/configuration/configure_dialog.h +++ b/src/yuzu/configuration/configure_dialog.h @@ -72,8 +72,8 @@ private: std::unique_ptr debug_tab_tab; std::unique_ptr filesystem_tab; std::unique_ptr general_tab; - std::unique_ptr graphics_tab; std::unique_ptr graphics_advanced_tab; + std::unique_ptr graphics_tab; std::unique_ptr hotkeys_tab; std::unique_ptr input_tab; std::unique_ptr network_tab; diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 76e5b7499..f316b598c 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -2,9 +2,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Include this early to include Vulkan headers how we want to +#include "video_core/vulkan_common/vulkan_device.h" #include "video_core/vulkan_common/vulkan_wrapper.h" #include +#include #include #include #include @@ -74,8 +76,11 @@ static constexpr Settings::VSyncMode PresentModeToSetting(VkPresentModeKHR mode) } } -ConfigureGraphics::ConfigureGraphics(const Core::System& system_, QWidget* parent) - : QWidget(parent), ui{std::make_unique()}, system{system_} { +ConfigureGraphics::ConfigureGraphics(const Core::System& system_, + const std::function& expose_compute_option_, + QWidget* parent) + : QWidget(parent), ui{std::make_unique()}, + expose_compute_option{expose_compute_option_}, system{system_} { vulkan_device = Settings::values.vulkan_device.GetValue(); RetrieveVulkanDevices(); @@ -513,8 +518,7 @@ void ConfigureGraphics::RetrieveVulkanDevices() try { const Common::DynamicLibrary library = OpenLibrary(); const vk::Instance instance = CreateInstance(library, dld, VK_API_VERSION_1_1, wsi.type); const std::vector physical_devices = instance.EnumeratePhysicalDevices(); - vk::SurfaceKHR surface = //< needed to view present modes for a device - CreateSurface(instance, wsi); + vk::SurfaceKHR surface = CreateSurface(instance, wsi); vulkan_devices.clear(); vulkan_devices.reserve(physical_devices.size()); @@ -527,6 +531,17 @@ void ConfigureGraphics::RetrieveVulkanDevices() try { physical_device.GetSurfacePresentModesKHR(*surface); vulkan_devices.push_back(QString::fromStdString(name)); device_present_modes.push_back(present_modes); + + VkPhysicalDeviceDriverProperties driver_properties{}; + driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES; + driver_properties.pNext = nullptr; + VkPhysicalDeviceProperties2 properties{}; + properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR; + properties.pNext = &driver_properties; + dld.vkGetPhysicalDeviceProperties2(physical_device, &properties); + if (driver_properties.driverID == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS) { + expose_compute_option(); + } } } catch (const Vulkan::vk::Exception& exception) { LOG_ERROR(Frontend, "Failed to enumerate devices with error: {}", exception.what()); diff --git a/src/yuzu/configuration/configure_graphics.h b/src/yuzu/configuration/configure_graphics.h index 901f604a5..364b1cac2 100644 --- a/src/yuzu/configuration/configure_graphics.h +++ b/src/yuzu/configuration/configure_graphics.h @@ -3,6 +3,7 @@ #pragma once +#include #include #include #include @@ -37,7 +38,9 @@ class ConfigureGraphics : public QWidget { Q_OBJECT public: - explicit ConfigureGraphics(const Core::System& system_, QWidget* parent = nullptr); + explicit ConfigureGraphics(const Core::System& system_, + const std::function& expose_compute_option_, + QWidget* parent = nullptr); ~ConfigureGraphics() override; void ApplyConfiguration(); @@ -81,6 +84,7 @@ private: // selection in the combobox u32 vulkan_device{}; Settings::ShaderBackend shader_backend{}; + const std::function& expose_compute_option; const Core::System& system; }; diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp index 005b022ca..7975285a7 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.cpp +++ b/src/yuzu/configuration/configure_graphics_advanced.cpp @@ -12,6 +12,8 @@ ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced(const Core::System& system_ ui->setupUi(this); + ui->enable_compute_pipelines_checkbox->setVisible(false); + SetupPerGameUI(); SetConfiguration(); @@ -26,6 +28,7 @@ void ConfigureGraphicsAdvanced::SetConfiguration() { ui->async_astc->setEnabled(runtime_lock); ui->use_asynchronous_shaders->setEnabled(runtime_lock); ui->anisotropic_filtering_combobox->setEnabled(runtime_lock); + ui->enable_compute_pipelines_checkbox->setEnabled(runtime_lock); ui->async_present->setChecked(Settings::values.async_presentation.GetValue()); ui->renderer_force_max_clock->setChecked(Settings::values.renderer_force_max_clock.GetValue()); @@ -34,6 +37,8 @@ void ConfigureGraphicsAdvanced::SetConfiguration() { ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue()); ui->use_vulkan_driver_pipeline_cache->setChecked( Settings::values.use_vulkan_driver_pipeline_cache.GetValue()); + ui->enable_compute_pipelines_checkbox->setChecked( + Settings::values.enable_compute_pipelines.GetValue()); if (Settings::IsConfiguringGlobal()) { ui->gpu_accuracy->setCurrentIndex( @@ -70,6 +75,9 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() { ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vulkan_driver_pipeline_cache, ui->use_vulkan_driver_pipeline_cache, use_vulkan_driver_pipeline_cache); + ConfigurationShared::ApplyPerGameSetting(&Settings::values.enable_compute_pipelines, + ui->enable_compute_pipelines_checkbox, + enable_compute_pipelines); } void ConfigureGraphicsAdvanced::changeEvent(QEvent* event) { @@ -99,6 +107,8 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { Settings::values.use_vulkan_driver_pipeline_cache.UsingGlobal()); ui->anisotropic_filtering_combobox->setEnabled( Settings::values.max_anisotropy.UsingGlobal()); + ui->enable_compute_pipelines_checkbox->setEnabled( + Settings::values.enable_compute_pipelines.UsingGlobal()); return; } @@ -118,6 +128,9 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { ConfigurationShared::SetColoredTristate(ui->use_vulkan_driver_pipeline_cache, Settings::values.use_vulkan_driver_pipeline_cache, use_vulkan_driver_pipeline_cache); + ConfigurationShared::SetColoredTristate(ui->enable_compute_pipelines_checkbox, + Settings::values.enable_compute_pipelines, + enable_compute_pipelines); ConfigurationShared::SetColoredComboBox( ui->gpu_accuracy, ui->label_gpu_accuracy, static_cast(Settings::values.gpu_accuracy.GetValue(true))); @@ -125,3 +138,7 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { ui->anisotropic_filtering_combobox, ui->af_label, static_cast(Settings::values.max_anisotropy.GetValue(true))); } + +void ConfigureGraphicsAdvanced::ExposeComputeOption() { + ui->enable_compute_pipelines_checkbox->setVisible(true); +} diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.h index ff5060957..2d8c7fd2d 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.h +++ b/src/yuzu/configuration/configure_graphics_advanced.h @@ -28,6 +28,8 @@ public: void ApplyConfiguration(); void SetConfiguration(); + void ExposeComputeOption(); + private: void changeEvent(QEvent* event) override; void RetranslateUI(); @@ -43,6 +45,7 @@ private: ConfigurationShared::CheckState use_asynchronous_shaders; ConfigurationShared::CheckState use_fast_gpu_time; ConfigurationShared::CheckState use_vulkan_driver_pipeline_cache; + ConfigurationShared::CheckState enable_compute_pipelines; const Core::System& system; }; diff --git a/src/yuzu/configuration/configure_graphics_advanced.ui b/src/yuzu/configuration/configure_graphics_advanced.ui index d073fe9b1..a222d294b 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.ui +++ b/src/yuzu/configuration/configure_graphics_advanced.ui @@ -126,6 +126,17 @@ + + + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + + + Enable Compute Pipelines (Intel Vulkan only) + + + diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp index 7e757eafd..7ac162586 100644 --- a/src/yuzu/configuration/configure_per_game.cpp +++ b/src/yuzu/configuration/configure_per_game.cpp @@ -48,8 +48,9 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st audio_tab = std::make_unique(system_, this); cpu_tab = std::make_unique(system_, this); general_tab = std::make_unique(system_, this); - graphics_tab = std::make_unique(system_, this); graphics_advanced_tab = std::make_unique(system_, this); + graphics_tab = std::make_unique( + system_, [&]() { graphics_advanced_tab->ExposeComputeOption(); }, this); input_tab = std::make_unique(system_, game_config.get(), this); system_tab = std::make_unique(system_, this); diff --git a/src/yuzu/configuration/configure_per_game.h b/src/yuzu/configuration/configure_per_game.h index 4ecc43541..85752f1fa 100644 --- a/src/yuzu/configuration/configure_per_game.h +++ b/src/yuzu/configuration/configure_per_game.h @@ -75,8 +75,8 @@ private: std::unique_ptr audio_tab; std::unique_ptr cpu_tab; std::unique_ptr general_tab; - std::unique_ptr graphics_tab; std::unique_ptr graphics_advanced_tab; + std::unique_ptr graphics_tab; std::unique_ptr input_tab; std::unique_ptr system_tab; }; From 91695a453b796b720b8031f7a3addeed44be9af0 Mon Sep 17 00:00:00 2001 From: german77 Date: Sat, 6 May 2023 23:06:44 -0600 Subject: [PATCH 0345/1181] input_common: Revert debugging changes --- src/input_common/input_engine.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/input_common/input_engine.cpp b/src/input_common/input_engine.cpp index 49f5e7f54..91aa96aa7 100644 --- a/src/input_common/input_engine.cpp +++ b/src/input_common/input_engine.cpp @@ -58,8 +58,6 @@ void InputEngine::SetHatButton(const PadIdentifier& identifier, int button, u8 v } void InputEngine::SetAxis(const PadIdentifier& identifier, int axis, f32 value) { - value /= 2.0f; - value -= 0.5f; { std::scoped_lock lock{mutex}; ControllerData& controller = controller_list.at(identifier); From 6fed48b3a45369bebf262fc047fe68e2110d63cf Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Sun, 7 May 2023 15:11:16 +0100 Subject: [PATCH 0346/1181] Fix address space allocator slow path to avoid OOB --- src/common/address_space.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/address_space.inc b/src/common/address_space.inc index c97dc8651..1ee82df53 100644 --- a/src/common/address_space.inc +++ b/src/common/address_space.inc @@ -336,7 +336,7 @@ ALLOC_MEMBER(VaType)::Allocate(VaType size) { ASSERT_MSG(false, "Unexpected allocator state!"); } - auto search_predecessor{this->blocks.begin()}; + auto search_predecessor{std::next(this->blocks.begin())}; auto search_successor{std::next(search_predecessor)}; while (search_successor != this->blocks.end() && From 4366a21eaed655bdbff8cf8c94a1a9796d36aafa Mon Sep 17 00:00:00 2001 From: QGJ Date: Sun, 7 May 2023 18:05:42 +0200 Subject: [PATCH 0347/1181] yuzu/applets/qt_profile_select: connect double-click to accept() In the profile selection window: Allow the user to start the game by double-clicking a profile to avoid having to additionally click the OK button. This avoids an unnecessary "step" to the start of the game... --- src/yuzu/applets/qt_profile_select.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/yuzu/applets/qt_profile_select.cpp b/src/yuzu/applets/qt_profile_select.cpp index 2448e46b6..1f3f23038 100644 --- a/src/yuzu/applets/qt_profile_select.cpp +++ b/src/yuzu/applets/qt_profile_select.cpp @@ -95,6 +95,7 @@ QtProfileSelectionDialog::QtProfileSelectionDialog( scroll_area->setLayout(layout); connect(tree_view, &QTreeView::clicked, this, &QtProfileSelectionDialog::SelectUser); + connect(tree_view, &QTreeView::doubleClicked, this, &QtProfileSelectionDialog::accept); connect(controller_navigation, &ControllerNavigation::TriggerKeyboardEvent, [this](Qt::Key key) { if (!this->isActiveWindow()) { From e46074a2e3e4134fe34469e978acf8f2293badc3 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 7 May 2023 12:04:42 -0700 Subject: [PATCH 0348/1181] externals: Update dynarmic to include latest patch. --- externals/dynarmic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/dynarmic b/externals/dynarmic index f9e6a3df5..d5c2b473a 160000 --- a/externals/dynarmic +++ b/externals/dynarmic @@ -1 +1 @@ -Subproject commit f9e6a3df5c84bcc74be46c289a74a78e5e28d62d +Subproject commit d5c2b473a831ca9e2a93bda30dc131b4fee7314f From 5792a72c29dbc7af6a28603136206e97ef58943d Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 7 May 2023 01:19:13 -0400 Subject: [PATCH 0349/1181] vfs_vector: avoid n^2 lookup in layeredfs building --- src/core/file_sys/vfs_vector.cpp | 19 +++++++++++++++++++ src/core/file_sys/vfs_vector.h | 4 ++++ 2 files changed, 23 insertions(+) diff --git a/src/core/file_sys/vfs_vector.cpp b/src/core/file_sys/vfs_vector.cpp index 251d9d7c9..af1df4c51 100644 --- a/src/core/file_sys/vfs_vector.cpp +++ b/src/core/file_sys/vfs_vector.cpp @@ -67,6 +67,23 @@ VectorVfsDirectory::VectorVfsDirectory(std::vector files_, VectorVfsDirectory::~VectorVfsDirectory() = default; +VirtualFile VectorVfsDirectory::GetFile(std::string_view file_name) const { + if (!optimized_file_index_built) { + optimized_file_index.clear(); + for (size_t i = 0; i < files.size(); i++) { + optimized_file_index.emplace(files[i]->GetName(), i); + } + optimized_file_index_built = true; + } + + const auto it = optimized_file_index.find(file_name); + if (it != optimized_file_index.end()) { + return files[it->second]; + } + + return nullptr; +} + std::vector VectorVfsDirectory::GetFiles() const { return files; } @@ -107,6 +124,7 @@ bool VectorVfsDirectory::DeleteSubdirectory(std::string_view subdir_name) { } bool VectorVfsDirectory::DeleteFile(std::string_view file_name) { + optimized_file_index_built = false; return FindAndRemoveVectorElement(files, file_name); } @@ -124,6 +142,7 @@ VirtualFile VectorVfsDirectory::CreateFile(std::string_view file_name) { } void VectorVfsDirectory::AddFile(VirtualFile file) { + optimized_file_index_built = false; files.push_back(std::move(file)); } diff --git a/src/core/file_sys/vfs_vector.h b/src/core/file_sys/vfs_vector.h index bfedb6e42..c9955755b 100644 --- a/src/core/file_sys/vfs_vector.h +++ b/src/core/file_sys/vfs_vector.h @@ -105,6 +105,7 @@ public: VirtualDir parent = nullptr); ~VectorVfsDirectory() override; + VirtualFile GetFile(std::string_view file_name) const override; std::vector GetFiles() const override; std::vector GetSubdirectories() const override; bool IsWritable() const override; @@ -126,6 +127,9 @@ private: VirtualDir parent; std::string name; + + mutable std::map> optimized_file_index; + mutable bool optimized_file_index_built{}; }; } // namespace FileSys From c6cac2ffaad4ac27f35cea25022d9c59c7ecfbf4 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 30 Apr 2023 17:14:06 +0200 Subject: [PATCH 0350/1181] GPU: Add Reactive flushing --- src/core/core.cpp | 4 +++ src/core/core.h | 2 ++ src/core/memory.cpp | 27 ++++++++++---- src/video_core/buffer_cache/buffer_base.h | 9 +++++ src/video_core/buffer_cache/buffer_cache.h | 35 ++++++++++++++----- .../buffer_cache/buffer_cache_base.h | 5 +-- .../buffer_cache/memory_tracker_base.h | 26 ++++++++++++++ src/video_core/buffer_cache/word_manager.h | 14 ++++++-- src/video_core/engines/maxwell_dma.cpp | 8 ++--- src/video_core/fence_manager.h | 4 +-- src/video_core/gpu.cpp | 19 ++++++++++ src/video_core/gpu.h | 4 +++ src/video_core/rasterizer_download_area.h | 13 +++++++ src/video_core/rasterizer_interface.h | 3 ++ .../renderer_null/null_rasterizer.cpp | 10 ++++++ .../renderer_null/null_rasterizer.h | 1 + .../renderer_opengl/gl_rasterizer.cpp | 23 ++++++++++++ .../renderer_opengl/gl_rasterizer.h | 1 + .../renderer_vulkan/vk_rasterizer.cpp | 23 ++++++++++++ .../renderer_vulkan/vk_rasterizer.h | 1 + src/video_core/texture_cache/image_info.h | 1 + .../texture_cache/image_view_base.cpp | 3 +- src/video_core/texture_cache/texture_cache.h | 32 ++++++++++++++++- .../texture_cache/texture_cache_base.h | 2 ++ 24 files changed, 240 insertions(+), 30 deletions(-) create mode 100644 src/video_core/rasterizer_download_area.h diff --git a/src/core/core.cpp b/src/core/core.cpp index 06fba4ce5..b5f62690e 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -612,6 +612,10 @@ void System::PrepareReschedule(const u32 core_index) { impl->kernel.PrepareReschedule(core_index); } +size_t System::GetCurrentHostThreadID() const { + return impl->kernel.GetCurrentHostThreadID(); +} + PerfStatsResults System::GetAndResetPerfStats() { return impl->GetAndResetPerfStats(); } diff --git a/src/core/core.h b/src/core/core.h index 4a5aba032..4f153154f 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -222,6 +222,8 @@ public: /// Prepare the core emulation for a reschedule void PrepareReschedule(u32 core_index); + [[nodiscard]] size_t GetCurrentHostThreadID() const; + /// Gets and resets core performance statistics [[nodiscard]] PerfStatsResults GetAndResetPerfStats(); diff --git a/src/core/memory.cpp b/src/core/memory.cpp index a9667463f..7b79cb8bc 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -13,10 +13,13 @@ #include "common/swap.h" #include "core/core.h" #include "core/device_memory.h" +#include "core/hardware_properties.h" #include "core/hle/kernel/k_page_table.h" #include "core/hle/kernel/k_process.h" #include "core/memory.h" #include "video_core/gpu.h" +#include "video_core/rasterizer_download_area.h" + namespace Core::Memory { @@ -243,7 +246,7 @@ struct Memory::Impl { [&](const Common::ProcessAddress current_vaddr, const std::size_t copy_amount, const u8* const host_ptr) { if constexpr (!UNSAFE) { - system.GPU().FlushRegion(GetInteger(current_vaddr), copy_amount); + HandleRasterizerDownload(GetInteger(current_vaddr), copy_amount); } std::memcpy(dest_buffer, host_ptr, copy_amount); }, @@ -334,7 +337,7 @@ struct Memory::Impl { }, [&](const Common::ProcessAddress current_vaddr, const std::size_t copy_amount, u8* const host_ptr) { - system.GPU().FlushRegion(GetInteger(current_vaddr), copy_amount); + HandleRasterizerDownload(GetInteger(current_vaddr), copy_amount); WriteBlockImpl(process, dest_addr, host_ptr, copy_amount); }, [&](const std::size_t copy_amount) { @@ -373,7 +376,7 @@ struct Memory::Impl { const std::size_t block_size) { // dc ivac: Invalidate to point of coherency // GPU flush -> CPU invalidate - system.GPU().FlushRegion(GetInteger(current_vaddr), block_size); + HandleRasterizerDownload(GetInteger(current_vaddr), block_size); }; return PerformCacheOperation(process, dest_addr, size, on_rasterizer); } @@ -462,8 +465,7 @@ struct Memory::Impl { } if (Settings::IsFastmemEnabled()) { - const bool is_read_enable = !Settings::IsGPULevelExtreme() || !cached; - system.DeviceMemory().buffer.Protect(vaddr, size, is_read_enable, !cached); + system.DeviceMemory().buffer.Protect(vaddr, size, !cached, !cached); } // Iterate over a contiguous CPU address space, which corresponds to the specified GPU @@ -651,7 +653,9 @@ struct Memory::Impl { LOG_ERROR(HW_Memory, "Unmapped Read{} @ 0x{:016X}", sizeof(T) * 8, GetInteger(vaddr)); }, - [&]() { system.GPU().FlushRegion(GetInteger(vaddr), sizeof(T)); }); + [&]() { + HandleRasterizerDownload(GetInteger(vaddr), sizeof(T)); + }); if (ptr) { std::memcpy(&result, ptr, sizeof(T)); } @@ -712,7 +716,18 @@ struct Memory::Impl { return true; } + void HandleRasterizerDownload(VAddr address, size_t size) { + const size_t core = system.GetCurrentHostThreadID(); + auto& current_area = rasterizer_areas[core]; + const VAddr end_address = address + size; + if (current_area.start_address <= address && end_address <= current_area.end_address) [[likely]] { + return; + } + current_area = system.GPU().OnCPURead(address, size); + } + Common::PageTable* current_page_table = nullptr; + std::array rasterizer_areas{}; Core::System& system; }; diff --git a/src/video_core/buffer_cache/buffer_base.h b/src/video_core/buffer_cache/buffer_base.h index 9cbd95c4b..0bb3bf8ae 100644 --- a/src/video_core/buffer_cache/buffer_base.h +++ b/src/video_core/buffer_cache/buffer_base.h @@ -18,6 +18,7 @@ namespace VideoCommon { enum class BufferFlagBits { Picked = 1 << 0, CachedWrites = 1 << 1, + PreemtiveDownload = 1 << 2, }; DECLARE_ENUM_FLAG_OPERATORS(BufferFlagBits) @@ -54,6 +55,10 @@ public: flags |= BufferFlagBits::Picked; } + void MarkPreemtiveDownload() noexcept { + flags |= BufferFlagBits::PreemtiveDownload; + } + /// Unmark buffer as picked void Unpick() noexcept { flags &= ~BufferFlagBits::Picked; @@ -84,6 +89,10 @@ public: return True(flags & BufferFlagBits::CachedWrites); } + bool IsPreemtiveDownload() const noexcept { + return True(flags & BufferFlagBits::PreemtiveDownload); + } + /// Returns the base CPU address of the buffer [[nodiscard]] VAddr CpuAddr() const noexcept { return cpu_addr; diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index e534e1e9c..479a1a508 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -111,9 +111,24 @@ void BufferCache

::WriteMemory(VAddr cpu_addr, u64 size) { template void BufferCache

::CachedWriteMemory(VAddr cpu_addr, u64 size) { memory_tracker.CachedCpuWrite(cpu_addr, size); - const IntervalType add_interval{Common::AlignDown(cpu_addr, YUZU_PAGESIZE), - Common::AlignUp(cpu_addr + size, YUZU_PAGESIZE)}; - cached_ranges.add(add_interval); +} + +template +std::optional BufferCache

::GetFlushArea(VAddr cpu_addr, + u64 size) { + std::optional area{}; + area.emplace(); + VAddr cpu_addr_start_aligned = Common::AlignDown(cpu_addr, Core::Memory::YUZU_PAGESIZE); + VAddr cpu_addr_end_aligned = Common::AlignUp(cpu_addr + size, Core::Memory::YUZU_PAGESIZE); + area->start_address = cpu_addr_start_aligned; + area->end_address = cpu_addr_end_aligned; + if (memory_tracker.IsRegionPreflushable(cpu_addr, size)) { + area->preemtive = true; + return area; + }; + memory_tracker.MarkRegionAsPreflushable(cpu_addr_start_aligned, cpu_addr_end_aligned - cpu_addr_start_aligned); + area->preemtive = !IsRegionGpuModified(cpu_addr, size); + return area; } template @@ -191,8 +206,10 @@ bool BufferCache

::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am const VAddr new_base_address = *cpu_dest_address + diff; const IntervalType add_interval{new_base_address, new_base_address + size}; tmp_intervals.push_back(add_interval); - uncommitted_ranges.add(add_interval); - pending_ranges.add(add_interval); + if (memory_tracker.IsRegionPreflushable(new_base_address, new_base_address + size)) { + uncommitted_ranges.add(add_interval); + pending_ranges.add(add_interval); + } }; ForEachInRangeSet(common_ranges, *cpu_src_address, amount, mirror); // This subtraction in this order is important for overlapping copies. @@ -205,7 +222,7 @@ bool BufferCache

::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am if (has_new_downloads) { memory_tracker.MarkRegionAsGpuModified(*cpu_dest_address, amount); } - std::vector tmp_buffer(amount); + tmp_buffer.resize(amount); cpu_memory.ReadBlockUnsafe(*cpu_src_address, tmp_buffer.data(), amount); cpu_memory.WriteBlockUnsafe(*cpu_dest_address, tmp_buffer.data(), amount); return true; @@ -441,9 +458,7 @@ void BufferCache

::BindComputeTextureBuffer(size_t tbo_index, GPUVAddr gpu_add template void BufferCache

::FlushCachedWrites() { - cached_write_buffer_ids.clear(); memory_tracker.FlushCachedWrites(); - cached_ranges.clear(); } template @@ -1221,6 +1236,9 @@ void BufferCache

::MarkWrittenBuffer(BufferId buffer_id, VAddr cpu_addr, u32 s const IntervalType base_interval{cpu_addr, cpu_addr + size}; common_ranges.add(base_interval); + if (!memory_tracker.IsRegionPreflushable(cpu_addr, cpu_addr + size)) { + return; + } uncommitted_ranges.add(base_interval); pending_ranges.add(base_interval); } @@ -1629,7 +1647,6 @@ void BufferCache

::DeleteBuffer(BufferId buffer_id, bool do_not_mark) { replace(transform_feedback_buffers); replace(compute_uniform_buffers); replace(compute_storage_buffers); - std::erase(cached_write_buffer_ids, buffer_id); // Mark the whole buffer as CPU written to stop tracking CPU writes if (!do_not_mark) { diff --git a/src/video_core/buffer_cache/buffer_cache_base.h b/src/video_core/buffer_cache/buffer_cache_base.h index 656baa550..e3914a53a 100644 --- a/src/video_core/buffer_cache/buffer_cache_base.h +++ b/src/video_core/buffer_cache/buffer_cache_base.h @@ -188,6 +188,8 @@ public: void DownloadMemory(VAddr cpu_addr, u64 size); + std::optional GetFlushArea(VAddr cpu_addr, u64 size); + bool InlineMemory(VAddr dest_address, size_t copy_size, std::span inlined_buffer); void BindGraphicsUniformBuffer(size_t stage, u32 index, GPUVAddr gpu_addr, u32 size); @@ -541,8 +543,6 @@ private: std::array, NUM_STAGES>, Empty> uniform_buffer_binding_sizes{}; - std::vector cached_write_buffer_ids; - MemoryTracker memory_tracker; IntervalSet uncommitted_ranges; IntervalSet common_ranges; @@ -575,6 +575,7 @@ private: bool active_async_buffers = false; std::array> CACHING_PAGEBITS)> page_table; + std::vector tmp_buffer; }; } // namespace VideoCommon diff --git a/src/video_core/buffer_cache/memory_tracker_base.h b/src/video_core/buffer_cache/memory_tracker_base.h index dc4ebfcaa..6036b21c9 100644 --- a/src/video_core/buffer_cache/memory_tracker_base.h +++ b/src/video_core/buffer_cache/memory_tracker_base.h @@ -66,6 +66,14 @@ public: }); } + /// Returns true if a region has been marked as Preflushable + [[nodiscard]] bool IsRegionPreflushable(VAddr query_cpu_addr, u64 query_size) noexcept { + return IteratePages( + query_cpu_addr, query_size, [](Manager* manager, u64 offset, size_t size) { + return manager->template IsRegionModified(offset, size); + }); + } + /// Mark region as CPU modified, notifying the rasterizer about this change void MarkRegionAsCpuModified(VAddr dirty_cpu_addr, u64 query_size) { IteratePages(dirty_cpu_addr, query_size, @@ -93,6 +101,15 @@ public: }); } + /// Mark region as modified from the host GPU + void MarkRegionAsPreflushable(VAddr dirty_cpu_addr, u64 query_size) noexcept { + IteratePages(dirty_cpu_addr, query_size, + [](Manager* manager, u64 offset, size_t size) { + manager->template ChangeRegionState( + manager->GetCpuAddr() + offset, size); + }); + } + /// Unmark region as modified from the host GPU void UnmarkRegionAsGpuModified(VAddr dirty_cpu_addr, u64 query_size) noexcept { IteratePages(dirty_cpu_addr, query_size, @@ -102,6 +119,15 @@ public: }); } + /// Unmark region as modified from the host GPU + void UnmarkRegionAsPreflushable(VAddr dirty_cpu_addr, u64 query_size) noexcept { + IteratePages(dirty_cpu_addr, query_size, + [](Manager* manager, u64 offset, size_t size) { + manager->template ChangeRegionState( + manager->GetCpuAddr() + offset, size); + }); + } + /// Mark region as modified from the CPU /// but don't mark it as modified until FlusHCachedWrites is called. void CachedCpuWrite(VAddr dirty_cpu_addr, u64 query_size) { diff --git a/src/video_core/buffer_cache/word_manager.h b/src/video_core/buffer_cache/word_manager.h index a42455045..0fb199a54 100644 --- a/src/video_core/buffer_cache/word_manager.h +++ b/src/video_core/buffer_cache/word_manager.h @@ -26,6 +26,7 @@ enum class Type { GPU, CachedCPU, Untracked, + Preflushable, }; /// Vector tracking modified pages tightly packed with small vector optimization @@ -55,17 +56,20 @@ struct Words { gpu.stack.fill(0); cached_cpu.stack.fill(0); untracked.stack.fill(~u64{0}); + preflushable.stack.fill(0); } else { // Share allocation between CPU and GPU pages and set their default values - u64* const alloc = new u64[num_words * 4]; + u64* const alloc = new u64[num_words * 5]; cpu.heap = alloc; gpu.heap = alloc + num_words; cached_cpu.heap = alloc + num_words * 2; untracked.heap = alloc + num_words * 3; + preflushable.heap = alloc + num_words * 4; std::fill_n(cpu.heap, num_words, ~u64{0}); std::fill_n(gpu.heap, num_words, 0); std::fill_n(cached_cpu.heap, num_words, 0); std::fill_n(untracked.heap, num_words, ~u64{0}); + std::fill_n(preflushable.heap, num_words, 0); } // Clean up tailing bits const u64 last_word_size = size_bytes % BYTES_PER_WORD; @@ -88,13 +92,14 @@ struct Words { gpu = rhs.gpu; cached_cpu = rhs.cached_cpu; untracked = rhs.untracked; + preflushable = rhs.preflushable; rhs.cpu.heap = nullptr; return *this; } Words(Words&& rhs) noexcept : size_bytes{rhs.size_bytes}, num_words{rhs.num_words}, cpu{rhs.cpu}, gpu{rhs.gpu}, - cached_cpu{rhs.cached_cpu}, untracked{rhs.untracked} { + cached_cpu{rhs.cached_cpu}, untracked{rhs.untracked}, preflushable{rhs.preflushable} { rhs.cpu.heap = nullptr; } @@ -129,6 +134,8 @@ struct Words { return std::span(cached_cpu.Pointer(IsShort()), num_words); } else if constexpr (type == Type::Untracked) { return std::span(untracked.Pointer(IsShort()), num_words); + } else if constexpr (type == Type::Preflushable) { + return std::span(preflushable.Pointer(IsShort()), num_words); } } @@ -142,6 +149,8 @@ struct Words { return std::span(cached_cpu.Pointer(IsShort()), num_words); } else if constexpr (type == Type::Untracked) { return std::span(untracked.Pointer(IsShort()), num_words); + } else if constexpr (type == Type::Preflushable) { + return std::span(preflushable.Pointer(IsShort()), num_words); } } @@ -151,6 +160,7 @@ struct Words { WordsArray gpu; WordsArray cached_cpu; WordsArray untracked; + WordsArray preflushable; }; template diff --git a/src/video_core/engines/maxwell_dma.cpp b/src/video_core/engines/maxwell_dma.cpp index e68850dc5..f7400aac8 100644 --- a/src/video_core/engines/maxwell_dma.cpp +++ b/src/video_core/engines/maxwell_dma.cpp @@ -223,7 +223,7 @@ void MaxwellDMA::CopyBlockLinearToPitch() { write_buffer.resize_destructive(dst_size); memory_manager.ReadBlock(src_operand.address, read_buffer.data(), src_size); - memory_manager.ReadBlockUnsafe(dst_operand.address, write_buffer.data(), dst_size); + memory_manager.ReadBlock(dst_operand.address, write_buffer.data(), dst_size); UnswizzleSubrect(write_buffer, read_buffer, bytes_per_pixel, width, height, depth, x_offset, src_params.origin.y, x_elements, regs.line_count, block_height, block_depth, @@ -288,11 +288,7 @@ void MaxwellDMA::CopyPitchToBlockLinear() { write_buffer.resize_destructive(dst_size); memory_manager.ReadBlock(regs.offset_in, read_buffer.data(), src_size); - if (Settings::IsGPULevelExtreme()) { - memory_manager.ReadBlock(regs.offset_out, write_buffer.data(), dst_size); - } else { - memory_manager.ReadBlockUnsafe(regs.offset_out, write_buffer.data(), dst_size); - } + memory_manager.ReadBlock(regs.offset_out, write_buffer.data(), dst_size); // If the input is linear and the output is tiled, swizzle the input and copy it over. SwizzleSubrect(write_buffer, read_buffer, bytes_per_pixel, width, height, depth, x_offset, diff --git a/src/video_core/fence_manager.h b/src/video_core/fence_manager.h index 3b2f6aab6..850d6f27d 100644 --- a/src/video_core/fence_manager.h +++ b/src/video_core/fence_manager.h @@ -55,8 +55,8 @@ public: // Unlike other fences, this one doesn't void SignalOrdering() { - std::scoped_lock lock{buffer_cache.mutex}; - buffer_cache.AccumulateFlushes(); + std::function do_nothing([]{}); + SignalFence(std::move(do_nothing)); } void SyncOperation(std::function&& func) { diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index 2e7f9c5ed..295a416a8 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp @@ -283,6 +283,21 @@ struct GPU::Impl { gpu_thread.FlushRegion(addr, size); } + VideoCore::RasterizerDownloadArea OnCPURead(VAddr addr, u64 size) { + auto raster_area = rasterizer->GetFlushArea(addr, size); + if (raster_area.preemtive) { + return raster_area; + } + raster_area.preemtive = true; + const u64 fence = RequestSyncOperation([this, &raster_area]() { + rasterizer->FlushRegion(raster_area.start_address, + raster_area.end_address - raster_area.start_address); + }); + gpu_thread.TickGPU(); + WaitForSyncOperation(fence); + return raster_area; + } + /// Notify rasterizer that any caches of the specified region should be invalidated void InvalidateRegion(VAddr addr, u64 size) { gpu_thread.InvalidateRegion(addr, size); @@ -538,6 +553,10 @@ void GPU::SwapBuffers(const Tegra::FramebufferConfig* framebuffer) { impl->SwapBuffers(framebuffer); } +VideoCore::RasterizerDownloadArea GPU::OnCPURead(VAddr addr, u64 size) { + return impl->OnCPURead(addr, size); +} + void GPU::FlushRegion(VAddr addr, u64 size) { impl->FlushRegion(addr, size); } diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h index 8a871593a..e49c40cf2 100644 --- a/src/video_core/gpu.h +++ b/src/video_core/gpu.h @@ -10,6 +10,7 @@ #include "core/hle/service/nvdrv/nvdata.h" #include "video_core/cdma_pusher.h" #include "video_core/framebuffer_config.h" +#include "video_core/rasterizer_download_area.h" namespace Core { class System; @@ -240,6 +241,9 @@ public: /// Swap buffers (render frame) void SwapBuffers(const Tegra::FramebufferConfig* framebuffer); + /// Notify rasterizer that any caches of the specified region should be flushed to Switch memory + [[nodiscard]] VideoCore::RasterizerDownloadArea OnCPURead(VAddr addr, u64 size); + /// Notify rasterizer that any caches of the specified region should be flushed to Switch memory void FlushRegion(VAddr addr, u64 size); diff --git a/src/video_core/rasterizer_download_area.h b/src/video_core/rasterizer_download_area.h new file mode 100644 index 000000000..771ce903d --- /dev/null +++ b/src/video_core/rasterizer_download_area.h @@ -0,0 +1,13 @@ +#pragma once + +#include "common/common_types.h" + +namespace VideoCore { + +struct RasterizerDownloadArea { + VAddr start_address; + VAddr end_address; + bool preemtive; +}; + +} // namespace VideoCore \ No newline at end of file diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.h index 33e2610bc..7566a8c4e 100644 --- a/src/video_core/rasterizer_interface.h +++ b/src/video_core/rasterizer_interface.h @@ -12,6 +12,7 @@ #include "video_core/cache_types.h" #include "video_core/engines/fermi_2d.h" #include "video_core/gpu.h" +#include "video_core/rasterizer_download_area.h" namespace Tegra { class MemoryManager; @@ -95,6 +96,8 @@ public: virtual bool MustFlushRegion(VAddr addr, u64 size, VideoCommon::CacheType which = VideoCommon::CacheType::All) = 0; + virtual RasterizerDownloadArea GetFlushArea(VAddr addr, u64 size) = 0; + /// Notify rasterizer that any caches of the specified region should be invalidated virtual void InvalidateRegion(VAddr addr, u64 size, VideoCommon::CacheType which = VideoCommon::CacheType::All) = 0; diff --git a/src/video_core/renderer_null/null_rasterizer.cpp b/src/video_core/renderer_null/null_rasterizer.cpp index 2b5c7defa..bf2ce4c49 100644 --- a/src/video_core/renderer_null/null_rasterizer.cpp +++ b/src/video_core/renderer_null/null_rasterizer.cpp @@ -1,6 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include "common/alignment.h" +#include "core/memory.h" #include "video_core/host1x/host1x.h" #include "video_core/memory_manager.h" #include "video_core/renderer_null/null_rasterizer.h" @@ -46,6 +48,14 @@ bool RasterizerNull::MustFlushRegion(VAddr addr, u64 size, VideoCommon::CacheTyp } void RasterizerNull::InvalidateRegion(VAddr addr, u64 size, VideoCommon::CacheType) {} void RasterizerNull::OnCPUWrite(VAddr addr, u64 size) {} +VideoCore::RasterizerDownloadArea RasterizerNull::GetFlushArea(VAddr addr, u64 size) { + VideoCore::RasterizerDownloadArea new_area{ + .start_address = Common::AlignDown(addr, Core::Memory::YUZU_PAGESIZE), + .end_address = Common::AlignUp(addr + size, Core::Memory::YUZU_PAGESIZE), + .preemtive = true, + }; + return new_area; +} void RasterizerNull::InvalidateGPUCache() {} void RasterizerNull::UnmapMemory(VAddr addr, u64 size) {} void RasterizerNull::ModifyGPUMemory(size_t as_id, GPUVAddr addr, u64 size) {} diff --git a/src/video_core/renderer_null/null_rasterizer.h b/src/video_core/renderer_null/null_rasterizer.h index 0c59e6a1f..a8d35d2c1 100644 --- a/src/video_core/renderer_null/null_rasterizer.h +++ b/src/video_core/renderer_null/null_rasterizer.h @@ -54,6 +54,7 @@ public: void InvalidateRegion(VAddr addr, u64 size, VideoCommon::CacheType which = VideoCommon::CacheType::All) override; void OnCPUWrite(VAddr addr, u64 size) override; + VideoCore::RasterizerDownloadArea GetFlushArea(VAddr addr, u64 size) override; void InvalidateGPUCache() override; void UnmapMemory(VAddr addr, u64 size) override; void ModifyGPUMemory(size_t as_id, GPUVAddr addr, u64 size) override; diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 0089b4b27..3f07fe8bb 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -433,6 +433,29 @@ bool RasterizerOpenGL::MustFlushRegion(VAddr addr, u64 size, VideoCommon::CacheT return false; } +VideoCore::RasterizerDownloadArea RasterizerOpenGL::GetFlushArea(VAddr addr, u64 size) { + { + std::scoped_lock lock{texture_cache.mutex}; + auto area = texture_cache.GetFlushArea(addr, size); + if (area) { + return *area; + } + } + { + std::scoped_lock lock{buffer_cache.mutex}; + auto area = buffer_cache.GetFlushArea(addr, size); + if (area) { + return *area; + } + } + VideoCore::RasterizerDownloadArea new_area{ + .start_address = Common::AlignDown(addr, Core::Memory::YUZU_PAGESIZE), + .end_address = Common::AlignUp(addr + size, Core::Memory::YUZU_PAGESIZE), + .preemtive = true, + }; + return new_area; +} + void RasterizerOpenGL::InvalidateRegion(VAddr addr, u64 size, VideoCommon::CacheType which) { MICROPROFILE_SCOPE(OpenGL_CacheManagement); if (addr == 0 || size == 0) { diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index ad6978bd0..410d8ffc5 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -95,6 +95,7 @@ public: VideoCommon::CacheType which = VideoCommon::CacheType::All) override; bool MustFlushRegion(VAddr addr, u64 size, VideoCommon::CacheType which = VideoCommon::CacheType::All) override; + VideoCore::RasterizerDownloadArea GetFlushArea(VAddr addr, u64 size) override; void InvalidateRegion(VAddr addr, u64 size, VideoCommon::CacheType which = VideoCommon::CacheType::All) override; void OnCPUWrite(VAddr addr, u64 size) override; diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index d1489fc95..bae4aa611 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -502,6 +502,29 @@ bool RasterizerVulkan::MustFlushRegion(VAddr addr, u64 size, VideoCommon::CacheT return false; } +VideoCore::RasterizerDownloadArea RasterizerVulkan::GetFlushArea(VAddr addr, u64 size) { + { + std::scoped_lock lock{texture_cache.mutex}; + auto area = texture_cache.GetFlushArea(addr, size); + if (area) { + return *area; + } + } + { + std::scoped_lock lock{buffer_cache.mutex}; + auto area = buffer_cache.GetFlushArea(addr, size); + if (area) { + return *area; + } + } + VideoCore::RasterizerDownloadArea new_area{ + .start_address = Common::AlignDown(addr, Core::Memory::YUZU_PAGESIZE), + .end_address = Common::AlignUp(addr + size, Core::Memory::YUZU_PAGESIZE), + .preemtive = true, + }; + return new_area; +} + void RasterizerVulkan::InvalidateRegion(VAddr addr, u64 size, VideoCommon::CacheType which) { if (addr == 0 || size == 0) { return; diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.h b/src/video_core/renderer_vulkan/vk_rasterizer.h index 1659fbc13..9bd422850 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.h +++ b/src/video_core/renderer_vulkan/vk_rasterizer.h @@ -92,6 +92,7 @@ public: VideoCommon::CacheType which = VideoCommon::CacheType::All) override; bool MustFlushRegion(VAddr addr, u64 size, VideoCommon::CacheType which = VideoCommon::CacheType::All) override; + VideoCore::RasterizerDownloadArea GetFlushArea(VAddr addr, u64 size) override; void InvalidateRegion(VAddr addr, u64 size, VideoCommon::CacheType which = VideoCommon::CacheType::All) override; void InnerInvalidation(std::span> sequences) override; diff --git a/src/video_core/texture_cache/image_info.h b/src/video_core/texture_cache/image_info.h index 4b7dfa315..cfb85a3dc 100644 --- a/src/video_core/texture_cache/image_info.h +++ b/src/video_core/texture_cache/image_info.h @@ -39,6 +39,7 @@ struct ImageInfo { u32 tile_width_spacing = 0; bool rescaleable = false; bool downscaleable = false; + bool forced_flushed = false; }; } // namespace VideoCommon diff --git a/src/video_core/texture_cache/image_view_base.cpp b/src/video_core/texture_cache/image_view_base.cpp index bcad40353..8f28342d5 100644 --- a/src/video_core/texture_cache/image_view_base.cpp +++ b/src/video_core/texture_cache/image_view_base.cpp @@ -26,8 +26,7 @@ ImageViewBase::ImageViewBase(const ImageViewInfo& info, const ImageInfo& image_i ASSERT_MSG(VideoCore::Surface::IsViewCompatible(image_info.format, info.format, false, true), "Image view format {} is incompatible with image format {}", info.format, image_info.format); - const bool is_async = Settings::values.use_asynchronous_gpu_emulation.GetValue(); - if (image_info.type == ImageType::Linear && is_async) { + if (image_info.forced_flushed) { flags |= ImageViewFlagBits::PreemtiveDownload; } if (image_info.type == ImageType::e3D && info.type != ImageViewType::e3D) { diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index b5297e76b..fb8ffc002 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -490,6 +490,32 @@ void TextureCache

::DownloadMemory(VAddr cpu_addr, size_t size) { } } +template +std::optional TextureCache

::GetFlushArea(VAddr cpu_addr, + u64 size) { + std::optional area{}; + ForEachImageInRegion(cpu_addr, size, [&](ImageId, ImageBase& image) { + if (False(image.flags & ImageFlagBits::GpuModified)) { + return; + } + if (!area) { + area.emplace(); + area->start_address = cpu_addr; + area->end_address = cpu_addr + size; + area->preemtive = true; + } + area->start_address = std::min(area->start_address, image.cpu_addr); + area->end_address = std::max(area->end_address, image.cpu_addr_end); + for (auto image_view_id : image.image_view_ids) { + auto& image_view = slot_image_views[image_view_id]; + image_view.flags |= ImageViewFlagBits::PreemtiveDownload; + } + area->preemtive &= image.info.forced_flushed; + image.info.forced_flushed = true; + }); + return area; +} + template void TextureCache

::UnmapMemory(VAddr cpu_addr, size_t size) { std::vector deleted_images; @@ -789,11 +815,15 @@ ImageId TextureCache

::DmaImageId(const Tegra::DMA::ImageOperand& operand) { if (!dst_id) { return NULL_IMAGE_ID; } - const auto& image = slot_images[dst_id]; + auto& image = slot_images[dst_id]; if (False(image.flags & ImageFlagBits::GpuModified)) { // No need to waste time on an image that's synced with guest return NULL_IMAGE_ID; } + if (!image.info.forced_flushed) { + image.info.forced_flushed = true; + return NULL_IMAGE_ID; + } const auto base = image.TryFindBase(operand.address); if (!base) { return NULL_IMAGE_ID; diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index 758b7e212..01f5ac588 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h @@ -179,6 +179,8 @@ public: /// Download contents of host images to guest memory in a region void DownloadMemory(VAddr cpu_addr, size_t size); + std::optional GetFlushArea(VAddr cpu_addr, u64 size); + /// Remove images in a region void UnmapMemory(VAddr cpu_addr, size_t size); From 0f4f18265f4f45ae1314b0fef10c4bdf9b870b8b Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Mon, 1 May 2023 17:34:03 +0200 Subject: [PATCH 0351/1181] Texture cache: sync the first flush. --- src/video_core/texture_cache/image_info.h | 1 + src/video_core/texture_cache/texture_cache.h | 32 ++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/video_core/texture_cache/image_info.h b/src/video_core/texture_cache/image_info.h index cfb85a3dc..8a4cb0cbd 100644 --- a/src/video_core/texture_cache/image_info.h +++ b/src/video_core/texture_cache/image_info.h @@ -40,6 +40,7 @@ struct ImageInfo { bool rescaleable = false; bool downscaleable = false; bool forced_flushed = false; + bool dma_downloaded = false; }; } // namespace VideoCommon diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index fb8ffc002..762e8a52f 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -709,18 +709,43 @@ void TextureCache

::CommitAsyncFlushes() { download_info.async_buffer_id = last_async_buffer_id; } } + if (any_none_dma) { + bool all_pre_sync = true; auto download_map = runtime.DownloadStagingBuffer(total_size_bytes, true); for (const PendingDownload& download_info : download_ids) { if (download_info.is_swizzle) { Image& image = slot_images[download_info.object_id]; + all_pre_sync &= image.info.dma_downloaded; + image.info.dma_downloaded = true; const auto copies = FullDownloadCopies(image.info); image.DownloadMemory(download_map, copies); download_map.offset += Common::AlignUp(image.unswizzled_size_bytes, 64); } } - uncommitted_async_buffers.emplace_back(download_map); + if (!all_pre_sync) { + runtime.Finish(); + auto it = download_ids.begin(); + while (it != download_ids.end()) { + const PendingDownload& download_info = *it; + if (download_info.is_swizzle) { + const ImageBase& image = slot_images[download_info.object_id]; + const auto copies = FullDownloadCopies(image.info); + download_map.offset -= Common::AlignUp(image.unswizzled_size_bytes, 64); + std::span download_span = + download_map.mapped_span.subspan(download_map.offset); + SwizzleImage(*gpu_memory, image.gpu_addr, image.info, copies, download_span, + swizzle_data_buffer); + it = download_ids.erase(it); + } else { + it++; + } + } + } else { + uncommitted_async_buffers.emplace_back(download_map); + } } + async_buffers.emplace_back(std::move(uncommitted_async_buffers)); uncommitted_async_buffers.clear(); } @@ -820,8 +845,9 @@ ImageId TextureCache

::DmaImageId(const Tegra::DMA::ImageOperand& operand) { // No need to waste time on an image that's synced with guest return NULL_IMAGE_ID; } - if (!image.info.forced_flushed) { - image.info.forced_flushed = true; + if (!image.info.dma_downloaded) { + // Force a full sync. + image.info.dma_downloaded = true; return NULL_IMAGE_ID; } const auto base = image.TryFindBase(operand.address); From 92da86290c5ea657ae918bfe36071bdf7ac15075 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Thu, 4 May 2023 02:34:49 +0200 Subject: [PATCH 0352/1181] Settings: add option to enable / disable reactive flushing --- src/common/settings.cpp | 2 ++ src/common/settings.h | 1 + src/core/memory.cpp | 3 ++- src/video_core/buffer_cache/buffer_cache.h | 9 ++++++--- src/video_core/texture_cache/image_view_base.cpp | 3 ++- src/yuzu/configuration/config.cpp | 2 ++ src/yuzu/configuration/configure_graphics_advanced.cpp | 7 +++++++ src/yuzu/configuration/configure_graphics_advanced.h | 1 + src/yuzu/configuration/configure_graphics_advanced.ui | 10 ++++++++++ src/yuzu_cmd/config.cpp | 1 + src/yuzu_cmd/default_ini.h | 4 ++++ 11 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/common/settings.cpp b/src/common/settings.cpp index f1ee42ab2..db1774c71 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -62,6 +62,7 @@ void LogSettings() { log_setting("Renderer_AccelerateASTC", values.accelerate_astc.GetValue()); log_setting("Renderer_AsyncASTC", values.async_astc.GetValue()); log_setting("Renderer_UseVsync", values.vsync_mode.GetValue()); + log_setting("Renderer_UseReactiveFlushing", values.use_reactive_flushing.GetValue()); log_setting("Renderer_ShaderBackend", values.shader_backend.GetValue()); log_setting("Renderer_UseAsynchronousShaders", values.use_asynchronous_shaders.GetValue()); log_setting("Renderer_AnisotropicFilteringLevel", values.max_anisotropy.GetValue()); @@ -223,6 +224,7 @@ void RestoreGlobalState(bool is_powered_on) { values.nvdec_emulation.SetGlobal(true); values.accelerate_astc.SetGlobal(true); values.async_astc.SetGlobal(true); + values.use_reactive_flushing.SetGlobal(true); values.shader_backend.SetGlobal(true); values.use_asynchronous_shaders.SetGlobal(true); values.use_fast_gpu_time.SetGlobal(true); diff --git a/src/common/settings.h b/src/common/settings.h index 2bf191cef..f4eb4e3cd 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -465,6 +465,7 @@ struct Values { SwitchableSetting async_astc{false, "async_astc"}; Setting vsync_mode{VSyncMode::FIFO, VSyncMode::Immediate, VSyncMode::FIFORelaxed, "use_vsync"}; + SwitchableSetting use_reactive_flushing{true, "use_reactive_flushing"}; SwitchableSetting shader_backend{ShaderBackend::GLSL, ShaderBackend::GLSL, ShaderBackend::SPIRV, "shader_backend"}; SwitchableSetting use_asynchronous_shaders{false, "use_asynchronous_shaders"}; diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 7b79cb8bc..549b64ac4 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -465,7 +465,8 @@ struct Memory::Impl { } if (Settings::IsFastmemEnabled()) { - system.DeviceMemory().buffer.Protect(vaddr, size, !cached, !cached); + const bool is_read_enable = !Settings::values.use_reactive_flushing.GetValue() || !cached; + system.DeviceMemory().buffer.Protect(vaddr, size, is_read_enable, !cached); } // Iterate over a contiguous CPU address space, which corresponds to the specified GPU diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 479a1a508..474822354 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -126,7 +126,8 @@ std::optional BufferCache

::GetFlushArea(VA area->preemtive = true; return area; }; - memory_tracker.MarkRegionAsPreflushable(cpu_addr_start_aligned, cpu_addr_end_aligned - cpu_addr_start_aligned); + memory_tracker.MarkRegionAsPreflushable(cpu_addr_start_aligned, + cpu_addr_end_aligned - cpu_addr_start_aligned); area->preemtive = !IsRegionGpuModified(cpu_addr, size); return area; } @@ -206,7 +207,8 @@ bool BufferCache

::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am const VAddr new_base_address = *cpu_dest_address + diff; const IntervalType add_interval{new_base_address, new_base_address + size}; tmp_intervals.push_back(add_interval); - if (memory_tracker.IsRegionPreflushable(new_base_address, new_base_address + size)) { + if (!Settings::values.use_reactive_flushing.GetValue() || + memory_tracker.IsRegionPreflushable(new_base_address, new_base_address + size)) { uncommitted_ranges.add(add_interval); pending_ranges.add(add_interval); } @@ -1236,7 +1238,8 @@ void BufferCache

::MarkWrittenBuffer(BufferId buffer_id, VAddr cpu_addr, u32 s const IntervalType base_interval{cpu_addr, cpu_addr + size}; common_ranges.add(base_interval); - if (!memory_tracker.IsRegionPreflushable(cpu_addr, cpu_addr + size)) { + if (Settings::values.use_reactive_flushing.GetValue() && + !memory_tracker.IsRegionPreflushable(cpu_addr, cpu_addr + size)) { return; } uncommitted_ranges.add(base_interval); diff --git a/src/video_core/texture_cache/image_view_base.cpp b/src/video_core/texture_cache/image_view_base.cpp index 8f28342d5..30a7c11f5 100644 --- a/src/video_core/texture_cache/image_view_base.cpp +++ b/src/video_core/texture_cache/image_view_base.cpp @@ -26,7 +26,8 @@ ImageViewBase::ImageViewBase(const ImageViewInfo& info, const ImageInfo& image_i ASSERT_MSG(VideoCore::Surface::IsViewCompatible(image_info.format, info.format, false, true), "Image view format {} is incompatible with image format {}", info.format, image_info.format); - if (image_info.forced_flushed) { + const bool preemptive = !Settings::values.use_reactive_flushing.GetValue() && image_info.type == ImageType::Linear; + if (image_info.forced_flushed || preemptive) { flags |= ImageViewFlagBits::PreemtiveDownload; } if (image_info.type == ImageType::e3D && info.type != ImageViewType::e3D) { diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index a85eb4687..a49d12266 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -710,6 +710,7 @@ void Config::ReadRendererValues() { ReadGlobalSetting(Settings::values.nvdec_emulation); ReadGlobalSetting(Settings::values.accelerate_astc); ReadGlobalSetting(Settings::values.async_astc); + ReadGlobalSetting(Settings::values.use_reactive_flushing); ReadGlobalSetting(Settings::values.shader_backend); ReadGlobalSetting(Settings::values.use_asynchronous_shaders); ReadGlobalSetting(Settings::values.use_fast_gpu_time); @@ -1355,6 +1356,7 @@ void Config::SaveRendererValues() { Settings::values.nvdec_emulation.UsingGlobal()); WriteGlobalSetting(Settings::values.accelerate_astc); WriteGlobalSetting(Settings::values.async_astc); + WriteGlobalSetting(Settings::values.use_reactive_flushing); WriteSetting(QString::fromStdString(Settings::values.shader_backend.GetLabel()), static_cast(Settings::values.shader_backend.GetValue(global)), static_cast(Settings::values.shader_backend.GetDefault()), diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp index 005b022ca..627ed8b17 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.cpp +++ b/src/yuzu/configuration/configure_graphics_advanced.cpp @@ -21,6 +21,7 @@ ConfigureGraphicsAdvanced::~ConfigureGraphicsAdvanced() = default; void ConfigureGraphicsAdvanced::SetConfiguration() { const bool runtime_lock = !system.IsPoweredOn(); + ui->use_reactive_flushing->setEnabled(runtime_lock); ui->async_present->setEnabled(runtime_lock); ui->renderer_force_max_clock->setEnabled(runtime_lock); ui->async_astc->setEnabled(runtime_lock); @@ -29,6 +30,7 @@ void ConfigureGraphicsAdvanced::SetConfiguration() { ui->async_present->setChecked(Settings::values.async_presentation.GetValue()); ui->renderer_force_max_clock->setChecked(Settings::values.renderer_force_max_clock.GetValue()); + ui->use_reactive_flushing->setChecked(Settings::values.use_reactive_flushing.GetValue()); ui->async_astc->setChecked(Settings::values.async_astc.GetValue()); ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue()); ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue()); @@ -60,6 +62,8 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() { renderer_force_max_clock); ConfigurationShared::ApplyPerGameSetting(&Settings::values.max_anisotropy, ui->anisotropic_filtering_combobox); + ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_reactive_flushing, + ui->use_reactive_flushing, use_reactive_flushing); ConfigurationShared::ApplyPerGameSetting(&Settings::values.async_astc, ui->async_astc, async_astc); ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_shaders, @@ -91,6 +95,7 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { ui->async_present->setEnabled(Settings::values.async_presentation.UsingGlobal()); ui->renderer_force_max_clock->setEnabled( Settings::values.renderer_force_max_clock.UsingGlobal()); + ui->use_reactive_flushing->setEnabled(Settings::values.use_reactive_flushing.UsingGlobal()); ui->async_astc->setEnabled(Settings::values.async_astc.UsingGlobal()); ui->use_asynchronous_shaders->setEnabled( Settings::values.use_asynchronous_shaders.UsingGlobal()); @@ -108,6 +113,8 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { ConfigurationShared::SetColoredTristate(ui->renderer_force_max_clock, Settings::values.renderer_force_max_clock, renderer_force_max_clock); + ConfigurationShared::SetColoredTristate( + ui->use_reactive_flushing, Settings::values.use_reactive_flushing, use_reactive_flushing); ConfigurationShared::SetColoredTristate(ui->async_astc, Settings::values.async_astc, async_astc); ConfigurationShared::SetColoredTristate(ui->use_asynchronous_shaders, diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.h index ff5060957..ae3c10946 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.h +++ b/src/yuzu/configuration/configure_graphics_advanced.h @@ -40,6 +40,7 @@ private: ConfigurationShared::CheckState renderer_force_max_clock; ConfigurationShared::CheckState use_vsync; ConfigurationShared::CheckState async_astc; + ConfigurationShared::CheckState use_reactive_flushing; ConfigurationShared::CheckState use_asynchronous_shaders; ConfigurationShared::CheckState use_fast_gpu_time; ConfigurationShared::CheckState use_vulkan_driver_pipeline_cache; diff --git a/src/yuzu/configuration/configure_graphics_advanced.ui b/src/yuzu/configuration/configure_graphics_advanced.ui index d073fe9b1..9d8cbea09 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.ui +++ b/src/yuzu/configuration/configure_graphics_advanced.ui @@ -96,6 +96,16 @@ + + + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + + + Enable Reactive Flushing + + + diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index a6418e693..abe7092fc 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -312,6 +312,7 @@ void Config::ReadValues() { ReadSetting("Renderer", Settings::values.use_asynchronous_gpu_emulation); ReadSetting("Renderer", Settings::values.vsync_mode); ReadSetting("Renderer", Settings::values.shader_backend); + ReadSetting("Renderer", Settings::values.use_reactive_flushing); ReadSetting("Renderer", Settings::values.use_asynchronous_shaders); ReadSetting("Renderer", Settings::values.nvdec_emulation); ReadSetting("Renderer", Settings::values.accelerate_astc); diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 086ed4cfa..5e7c3ac04 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -340,6 +340,10 @@ use_vsync = # 0: GLSL, 1 (default): GLASM, 2: SPIR-V shader_backend = +# Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. +# 0: Off, 1 (default): On +use_reactive_flushing = + # Whether to allow asynchronous shader building. # 0 (default): Off, 1: On use_asynchronous_shaders = From ab0c0a469c29900314847520f30d6edb914fa028 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Thu, 4 May 2023 02:36:18 +0200 Subject: [PATCH 0353/1181] Query cache: stop updating pages as it's not affected by cpu writes --- src/video_core/query_cache.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.h index 941de95c1..1528cc1dd 100644 --- a/src/video_core/query_cache.h +++ b/src/video_core/query_cache.h @@ -255,7 +255,6 @@ private: if (!in_range(query)) { continue; } - rasterizer.UpdatePagesCachedCount(query.GetCpuAddr(), query.SizeInBytes(), -1); AsyncJobId async_job_id = query.GetAsyncJob(); auto flush_result = query.Flush(async); if (async_job_id == NULL_ASYNC_JOB_ID) { @@ -273,7 +272,6 @@ private: /// Registers the passed parameters as cached and returns a pointer to the stored cached query. CachedQuery* Register(VideoCore::QueryType type, VAddr cpu_addr, u8* host_ptr, bool timestamp) { - rasterizer.UpdatePagesCachedCount(cpu_addr, CachedQuery::SizeInBytes(timestamp), 1); const u64 page = static_cast(cpu_addr) >> YUZU_PAGEBITS; return &cached_queries[page].emplace_back(static_cast(*this), type, cpu_addr, host_ptr); From 6f90dff2938b5bd5e9311e924e8a29945f16ac18 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Thu, 4 May 2023 03:16:57 +0200 Subject: [PATCH 0354/1181] Address feedback, add CR notice, etc --- src/core/memory.cpp | 11 +++++------ src/video_core/fence_manager.h | 7 ++++++- src/video_core/rasterizer_download_area.h | 3 +++ src/video_core/renderer_vulkan/vk_rasterizer.cpp | 4 ++-- src/video_core/texture_cache/image_view_base.cpp | 3 ++- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 549b64ac4..514ba0d66 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -20,7 +20,6 @@ #include "video_core/gpu.h" #include "video_core/rasterizer_download_area.h" - namespace Core::Memory { // Implementation class used to keep the specifics of the memory subsystem hidden @@ -465,7 +464,8 @@ struct Memory::Impl { } if (Settings::IsFastmemEnabled()) { - const bool is_read_enable = !Settings::values.use_reactive_flushing.GetValue() || !cached; + const bool is_read_enable = + !Settings::values.use_reactive_flushing.GetValue() || !cached; system.DeviceMemory().buffer.Protect(vaddr, size, is_read_enable, !cached); } @@ -654,9 +654,7 @@ struct Memory::Impl { LOG_ERROR(HW_Memory, "Unmapped Read{} @ 0x{:016X}", sizeof(T) * 8, GetInteger(vaddr)); }, - [&]() { - HandleRasterizerDownload(GetInteger(vaddr), sizeof(T)); - }); + [&]() { HandleRasterizerDownload(GetInteger(vaddr), sizeof(T)); }); if (ptr) { std::memcpy(&result, ptr, sizeof(T)); } @@ -721,7 +719,8 @@ struct Memory::Impl { const size_t core = system.GetCurrentHostThreadID(); auto& current_area = rasterizer_areas[core]; const VAddr end_address = address + size; - if (current_area.start_address <= address && end_address <= current_area.end_address) [[likely]] { + if (current_area.start_address <= address && end_address <= current_area.end_address) + [[likely]] { return; } current_area = system.GPU().OnCPURead(address, size); diff --git a/src/video_core/fence_manager.h b/src/video_core/fence_manager.h index 850d6f27d..35d699bbf 100644 --- a/src/video_core/fence_manager.h +++ b/src/video_core/fence_manager.h @@ -55,7 +55,12 @@ public: // Unlike other fences, this one doesn't void SignalOrdering() { - std::function do_nothing([]{}); + std::scoped_lock lock{buffer_cache.mutex}; + buffer_cache.AccumulateFlushes(); + } + + void SignalReference() { + std::function do_nothing([] {}); SignalFence(std::move(do_nothing)); } diff --git a/src/video_core/rasterizer_download_area.h b/src/video_core/rasterizer_download_area.h index 771ce903d..2d7425c79 100644 --- a/src/video_core/rasterizer_download_area.h +++ b/src/video_core/rasterizer_download_area.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include "common/common_types.h" diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index bae4aa611..2beb0efea 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -621,7 +621,7 @@ void RasterizerVulkan::SignalSyncPoint(u32 value) { } void RasterizerVulkan::SignalReference() { - fence_manager.SignalOrdering(); + fence_manager.SignalReference(); } void RasterizerVulkan::ReleaseFences() { @@ -654,7 +654,7 @@ void RasterizerVulkan::WaitForIdle() { cmdbuf.SetEvent(event, flags); cmdbuf.WaitEvents(event, flags, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, {}, {}, {}); }); - SignalReference(); + fence_manager.SignalOrdering(); } void RasterizerVulkan::FragmentBarrier() { diff --git a/src/video_core/texture_cache/image_view_base.cpp b/src/video_core/texture_cache/image_view_base.cpp index 30a7c11f5..c3b2b196d 100644 --- a/src/video_core/texture_cache/image_view_base.cpp +++ b/src/video_core/texture_cache/image_view_base.cpp @@ -26,7 +26,8 @@ ImageViewBase::ImageViewBase(const ImageViewInfo& info, const ImageInfo& image_i ASSERT_MSG(VideoCore::Surface::IsViewCompatible(image_info.format, info.format, false, true), "Image view format {} is incompatible with image format {}", info.format, image_info.format); - const bool preemptive = !Settings::values.use_reactive_flushing.GetValue() && image_info.type == ImageType::Linear; + const bool preemptive = + !Settings::values.use_reactive_flushing.GetValue() && image_info.type == ImageType::Linear; if (image_info.forced_flushed || preemptive) { flags |= ImageViewFlagBits::PreemtiveDownload; } From 36c302fa32b475abb1b211934eab14fe0cad936a Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Thu, 4 May 2023 13:23:36 +0200 Subject: [PATCH 0355/1181] Buffer cache: always use async buffer downloads and fix regression. --- src/tests/video_core/memory_tracker.cpp | 4 +- src/video_core/buffer_cache/buffer_cache.h | 114 +++++++++--------- .../buffer_cache/buffer_cache_base.h | 2 - src/video_core/buffer_cache/word_manager.h | 13 ++ 4 files changed, 70 insertions(+), 63 deletions(-) diff --git a/src/tests/video_core/memory_tracker.cpp b/src/tests/video_core/memory_tracker.cpp index 3981907a2..618793668 100644 --- a/src/tests/video_core/memory_tracker.cpp +++ b/src/tests/video_core/memory_tracker.cpp @@ -535,12 +535,12 @@ TEST_CASE("MemoryTracker: Cached write downloads") { memory_track->MarkRegionAsGpuModified(c + PAGE, PAGE); int num = 0; memory_track->ForEachDownloadRangeAndClear(c, WORD, [&](u64 offset, u64 size) { ++num; }); - REQUIRE(num == 1); + REQUIRE(num == 0); num = 0; memory_track->ForEachUploadRange(c, WORD, [&](u64 offset, u64 size) { ++num; }); REQUIRE(num == 0); REQUIRE(!memory_track->IsRegionCpuModified(c + PAGE, PAGE)); - REQUIRE(!memory_track->IsRegionGpuModified(c + PAGE, PAGE)); + REQUIRE(memory_track->IsRegionGpuModified(c + PAGE, PAGE)); memory_track->FlushCachedWrites(); REQUIRE(memory_track->IsRegionCpuModified(c + PAGE, PAGE)); REQUIRE(!memory_track->IsRegionGpuModified(c + PAGE, PAGE)); diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 474822354..0b15944d6 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -23,8 +23,6 @@ BufferCache

::BufferCache(VideoCore::RasterizerInterface& rasterizer_, common_ranges.clear(); inline_buffer_id = NULL_BUFFER_ID; - active_async_buffers = !Settings::IsGPULevelHigh(); - if (!runtime.CanReportMemoryUsage()) { minimum_memory = DEFAULT_EXPECTED_MEMORY; critical_memory = DEFAULT_CRITICAL_MEMORY; @@ -75,8 +73,6 @@ void BufferCache

::TickFrame() { uniform_cache_hits[0] = 0; uniform_cache_shots[0] = 0; - active_async_buffers = !Settings::IsGPULevelHigh(); - const bool skip_preferred = hits * 256 < shots * 251; uniform_buffer_skip_cache_size = skip_preferred ? DEFAULT_SKIP_CACHE_SIZE : 0; @@ -491,9 +487,8 @@ void BufferCache

::CommitAsyncFlushesHigh() { if (committed_ranges.empty()) { if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { - if (active_async_buffers) { - async_buffers.emplace_back(std::optional{}); - } + + async_buffers.emplace_back(std::optional{}); } return; } @@ -554,64 +549,65 @@ void BufferCache

::CommitAsyncFlushesHigh() { committed_ranges.clear(); if (downloads.empty()) { if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { - if (active_async_buffers) { - async_buffers.emplace_back(std::optional{}); - } + + async_buffers.emplace_back(std::optional{}); } return; } - if (active_async_buffers) { - if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { - auto download_staging = runtime.DownloadStagingBuffer(total_size_bytes, true); - boost::container::small_vector normalized_copies; - IntervalSet new_async_range{}; - runtime.PreCopyBarrier(); - for (auto& [copy, buffer_id] : downloads) { - copy.dst_offset += download_staging.offset; - const std::array copies{copy}; - BufferCopy second_copy{copy}; - Buffer& buffer = slot_buffers[buffer_id]; - second_copy.src_offset = static_cast(buffer.CpuAddr()) + copy.src_offset; - VAddr orig_cpu_addr = static_cast(second_copy.src_offset); - const IntervalType base_interval{orig_cpu_addr, orig_cpu_addr + copy.size}; - async_downloads += std::make_pair(base_interval, 1); - runtime.CopyBuffer(download_staging.buffer, buffer, copies, false); - normalized_copies.push_back(second_copy); - } - runtime.PostCopyBarrier(); - pending_downloads.emplace_back(std::move(normalized_copies)); - async_buffers.emplace_back(download_staging); - } else { + if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { + auto download_staging = runtime.DownloadStagingBuffer(total_size_bytes, true); + boost::container::small_vector normalized_copies; + IntervalSet new_async_range{}; + runtime.PreCopyBarrier(); + for (auto& [copy, buffer_id] : downloads) { + copy.dst_offset += download_staging.offset; + const std::array copies{copy}; + BufferCopy second_copy{copy}; + Buffer& buffer = slot_buffers[buffer_id]; + second_copy.src_offset = static_cast(buffer.CpuAddr()) + copy.src_offset; + VAddr orig_cpu_addr = static_cast(second_copy.src_offset); + const IntervalType base_interval{orig_cpu_addr, orig_cpu_addr + copy.size}; + async_downloads += std::make_pair(base_interval, 1); + runtime.CopyBuffer(download_staging.buffer, buffer, copies, false); + normalized_copies.push_back(second_copy); + } + runtime.PostCopyBarrier(); + pending_downloads.emplace_back(std::move(normalized_copies)); + async_buffers.emplace_back(download_staging); + } else { + if (!Settings::IsGPULevelHigh()) { committed_ranges.clear(); uncommitted_ranges.clear(); - } - } else { - if constexpr (USE_MEMORY_MAPS) { - auto download_staging = runtime.DownloadStagingBuffer(total_size_bytes); - runtime.PreCopyBarrier(); - for (auto& [copy, buffer_id] : downloads) { - // Have in mind the staging buffer offset for the copy - copy.dst_offset += download_staging.offset; - const std::array copies{copy}; - runtime.CopyBuffer(download_staging.buffer, slot_buffers[buffer_id], copies, false); - } - runtime.PostCopyBarrier(); - runtime.Finish(); - for (const auto& [copy, buffer_id] : downloads) { - const Buffer& buffer = slot_buffers[buffer_id]; - const VAddr cpu_addr = buffer.CpuAddr() + copy.src_offset; - // Undo the modified offset - const u64 dst_offset = copy.dst_offset - download_staging.offset; - const u8* read_mapped_memory = download_staging.mapped_span.data() + dst_offset; - cpu_memory.WriteBlockUnsafe(cpu_addr, read_mapped_memory, copy.size); - } } else { - const std::span immediate_buffer = ImmediateBuffer(largest_copy); - for (const auto& [copy, buffer_id] : downloads) { - Buffer& buffer = slot_buffers[buffer_id]; - buffer.ImmediateDownload(copy.src_offset, immediate_buffer.subspan(0, copy.size)); - const VAddr cpu_addr = buffer.CpuAddr() + copy.src_offset; - cpu_memory.WriteBlockUnsafe(cpu_addr, immediate_buffer.data(), copy.size); + if constexpr (USE_MEMORY_MAPS) { + auto download_staging = runtime.DownloadStagingBuffer(total_size_bytes); + runtime.PreCopyBarrier(); + for (auto& [copy, buffer_id] : downloads) { + // Have in mind the staging buffer offset for the copy + copy.dst_offset += download_staging.offset; + const std::array copies{copy}; + runtime.CopyBuffer(download_staging.buffer, slot_buffers[buffer_id], copies, + false); + } + runtime.PostCopyBarrier(); + runtime.Finish(); + for (const auto& [copy, buffer_id] : downloads) { + const Buffer& buffer = slot_buffers[buffer_id]; + const VAddr cpu_addr = buffer.CpuAddr() + copy.src_offset; + // Undo the modified offset + const u64 dst_offset = copy.dst_offset - download_staging.offset; + const u8* read_mapped_memory = download_staging.mapped_span.data() + dst_offset; + cpu_memory.WriteBlockUnsafe(cpu_addr, read_mapped_memory, copy.size); + } + } else { + const std::span immediate_buffer = ImmediateBuffer(largest_copy); + for (const auto& [copy, buffer_id] : downloads) { + Buffer& buffer = slot_buffers[buffer_id]; + buffer.ImmediateDownload(copy.src_offset, + immediate_buffer.subspan(0, copy.size)); + const VAddr cpu_addr = buffer.CpuAddr() + copy.src_offset; + cpu_memory.WriteBlockUnsafe(cpu_addr, immediate_buffer.data(), copy.size); + } } } } diff --git a/src/video_core/buffer_cache/buffer_cache_base.h b/src/video_core/buffer_cache/buffer_cache_base.h index e3914a53a..0445ec47f 100644 --- a/src/video_core/buffer_cache/buffer_cache_base.h +++ b/src/video_core/buffer_cache/buffer_cache_base.h @@ -572,8 +572,6 @@ private: u64 critical_memory = 0; BufferId inline_buffer_id; - bool active_async_buffers = false; - std::array> CACHING_PAGEBITS)> page_table; std::vector tmp_buffer; }; diff --git a/src/video_core/buffer_cache/word_manager.h b/src/video_core/buffer_cache/word_manager.h index 0fb199a54..a336bde41 100644 --- a/src/video_core/buffer_cache/word_manager.h +++ b/src/video_core/buffer_cache/word_manager.h @@ -302,6 +302,9 @@ public: (pending_pointer - pending_offset) * BYTES_PER_PAGE); }; IterateWords(offset, size, [&](size_t index, u64 mask) { + if constexpr (type == Type::GPU) { + mask &= ~untracked_words[index]; + } const u64 word = state_words[index] & mask; if constexpr (clear) { if constexpr (type == Type::CPU || type == Type::CachedCPU) { @@ -350,8 +353,13 @@ public: static_assert(type != Type::Untracked); const std::span state_words = words.template Span(); + [[maybe_unused]] const std::span untracked_words = + words.template Span(); bool result = false; IterateWords(offset, size, [&](size_t index, u64 mask) { + if constexpr (type == Type::GPU) { + mask &= ~untracked_words[index]; + } const u64 word = state_words[index] & mask; if (word != 0) { result = true; @@ -372,9 +380,14 @@ public: [[nodiscard]] std::pair ModifiedRegion(u64 offset, u64 size) const noexcept { static_assert(type != Type::Untracked); const std::span state_words = words.template Span(); + [[maybe_unused]] const std::span untracked_words = + words.template Span(); u64 begin = std::numeric_limits::max(); u64 end = 0; IterateWords(offset, size, [&](size_t index, u64 mask) { + if constexpr (type == Type::GPU) { + mask &= ~untracked_words[index]; + } const u64 word = state_words[index] & mask; if (word == 0) { return; From 016c6feb49255792e4093be381e20509eb94e6d1 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Thu, 4 May 2023 17:44:49 +0200 Subject: [PATCH 0356/1181] Texture cache: reverse inmediate flush changes --- src/video_core/texture_cache/image_info.cpp | 12 +++++++++ .../texture_cache/image_view_base.cpp | 5 +--- src/video_core/texture_cache/texture_cache.h | 25 +------------------ 3 files changed, 14 insertions(+), 28 deletions(-) diff --git a/src/video_core/texture_cache/image_info.cpp b/src/video_core/texture_cache/image_info.cpp index 11f3f78a1..e8ddde691 100644 --- a/src/video_core/texture_cache/image_info.cpp +++ b/src/video_core/texture_cache/image_info.cpp @@ -4,6 +4,7 @@ #include #include "common/assert.h" +#include "common/settings.h" #include "video_core/surface.h" #include "video_core/texture_cache/format_lookup_table.h" #include "video_core/texture_cache/image_info.h" @@ -22,6 +23,8 @@ using VideoCore::Surface::PixelFormat; using VideoCore::Surface::SurfaceType; ImageInfo::ImageInfo(const TICEntry& config) noexcept { + forced_flushed = config.IsPitchLinear() && !Settings::values.use_reactive_flushing.GetValue(); + dma_downloaded = forced_flushed; format = PixelFormatFromTextureInfo(config.format, config.r_type, config.g_type, config.b_type, config.a_type, config.srgb_conversion); num_samples = NumSamples(config.msaa_mode); @@ -117,6 +120,9 @@ ImageInfo::ImageInfo(const TICEntry& config) noexcept { ImageInfo::ImageInfo(const Maxwell3D::Regs::RenderTargetConfig& ct, Tegra::Texture::MsaaMode msaa_mode) noexcept { + forced_flushed = + ct.tile_mode.is_pitch_linear && !Settings::values.use_reactive_flushing.GetValue(); + dma_downloaded = forced_flushed; format = VideoCore::Surface::PixelFormatFromRenderTargetFormat(ct.format); rescaleable = false; if (ct.tile_mode.is_pitch_linear) { @@ -155,6 +161,9 @@ ImageInfo::ImageInfo(const Maxwell3D::Regs::RenderTargetConfig& ct, ImageInfo::ImageInfo(const Maxwell3D::Regs::Zeta& zt, const Maxwell3D::Regs::ZetaSize& zt_size, Tegra::Texture::MsaaMode msaa_mode) noexcept { + forced_flushed = + zt.tile_mode.is_pitch_linear && !Settings::values.use_reactive_flushing.GetValue(); + dma_downloaded = forced_flushed; format = VideoCore::Surface::PixelFormatFromDepthFormat(zt.format); size.width = zt_size.width; size.height = zt_size.height; @@ -195,6 +204,9 @@ ImageInfo::ImageInfo(const Maxwell3D::Regs::Zeta& zt, const Maxwell3D::Regs::Zet ImageInfo::ImageInfo(const Fermi2D::Surface& config) noexcept { UNIMPLEMENTED_IF_MSG(config.layer != 0, "Surface layer is not zero"); + forced_flushed = config.linear == Fermi2D::MemoryLayout::Pitch && + !Settings::values.use_reactive_flushing.GetValue(); + dma_downloaded = forced_flushed; format = VideoCore::Surface::PixelFormatFromRenderTargetFormat(config.format); rescaleable = false; if (config.linear == Fermi2D::MemoryLayout::Pitch) { diff --git a/src/video_core/texture_cache/image_view_base.cpp b/src/video_core/texture_cache/image_view_base.cpp index c3b2b196d..d134b6738 100644 --- a/src/video_core/texture_cache/image_view_base.cpp +++ b/src/video_core/texture_cache/image_view_base.cpp @@ -4,7 +4,6 @@ #include #include "common/assert.h" -#include "common/settings.h" #include "video_core/compatible_formats.h" #include "video_core/surface.h" #include "video_core/texture_cache/formatter.h" @@ -26,9 +25,7 @@ ImageViewBase::ImageViewBase(const ImageViewInfo& info, const ImageInfo& image_i ASSERT_MSG(VideoCore::Surface::IsViewCompatible(image_info.format, info.format, false, true), "Image view format {} is incompatible with image format {}", info.format, image_info.format); - const bool preemptive = - !Settings::values.use_reactive_flushing.GetValue() && image_info.type == ImageType::Linear; - if (image_info.forced_flushed || preemptive) { + if (image_info.forced_flushed) { flags |= ImageViewFlagBits::PreemtiveDownload; } if (image_info.type == ImageType::e3D && info.type != ImageViewType::e3D) { diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 762e8a52f..29ac01eb4 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -711,39 +711,16 @@ void TextureCache

::CommitAsyncFlushes() { } if (any_none_dma) { - bool all_pre_sync = true; auto download_map = runtime.DownloadStagingBuffer(total_size_bytes, true); for (const PendingDownload& download_info : download_ids) { if (download_info.is_swizzle) { Image& image = slot_images[download_info.object_id]; - all_pre_sync &= image.info.dma_downloaded; - image.info.dma_downloaded = true; const auto copies = FullDownloadCopies(image.info); image.DownloadMemory(download_map, copies); download_map.offset += Common::AlignUp(image.unswizzled_size_bytes, 64); } } - if (!all_pre_sync) { - runtime.Finish(); - auto it = download_ids.begin(); - while (it != download_ids.end()) { - const PendingDownload& download_info = *it; - if (download_info.is_swizzle) { - const ImageBase& image = slot_images[download_info.object_id]; - const auto copies = FullDownloadCopies(image.info); - download_map.offset -= Common::AlignUp(image.unswizzled_size_bytes, 64); - std::span download_span = - download_map.mapped_span.subspan(download_map.offset); - SwizzleImage(*gpu_memory, image.gpu_addr, image.info, copies, download_span, - swizzle_data_buffer); - it = download_ids.erase(it); - } else { - it++; - } - } - } else { - uncommitted_async_buffers.emplace_back(download_map); - } + uncommitted_async_buffers.emplace_back(download_map); } async_buffers.emplace_back(std::move(uncommitted_async_buffers)); From 2df19ef0fd5a91ca87e2c2cf201166a40c9d44dc Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 7 May 2023 23:25:34 +0200 Subject: [PATCH 0357/1181] Buffer Cache: disable reactive flushing in it. --- src/video_core/buffer_cache/buffer_cache.h | 11 ++--------- src/video_core/renderer_vulkan/vk_rasterizer.cpp | 7 ------- src/video_core/texture_cache/texture_cache.h | 8 ++++++-- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 0b15944d6..6624919a4 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -203,11 +203,8 @@ bool BufferCache

::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am const VAddr new_base_address = *cpu_dest_address + diff; const IntervalType add_interval{new_base_address, new_base_address + size}; tmp_intervals.push_back(add_interval); - if (!Settings::values.use_reactive_flushing.GetValue() || - memory_tracker.IsRegionPreflushable(new_base_address, new_base_address + size)) { - uncommitted_ranges.add(add_interval); - pending_ranges.add(add_interval); - } + uncommitted_ranges.add(add_interval); + pending_ranges.add(add_interval); }; ForEachInRangeSet(common_ranges, *cpu_src_address, amount, mirror); // This subtraction in this order is important for overlapping copies. @@ -1234,10 +1231,6 @@ void BufferCache

::MarkWrittenBuffer(BufferId buffer_id, VAddr cpu_addr, u32 s const IntervalType base_interval{cpu_addr, cpu_addr + size}; common_ranges.add(base_interval); - if (Settings::values.use_reactive_flushing.GetValue() && - !memory_tracker.IsRegionPreflushable(cpu_addr, cpu_addr + size)) { - return; - } uncommitted_ranges.add(base_interval); pending_ranges.add(base_interval); } diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 2beb0efea..0bcc20544 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -510,13 +510,6 @@ VideoCore::RasterizerDownloadArea RasterizerVulkan::GetFlushArea(VAddr addr, u64 return *area; } } - { - std::scoped_lock lock{buffer_cache.mutex}; - auto area = buffer_cache.GetFlushArea(addr, size); - if (area) { - return *area; - } - } VideoCore::RasterizerDownloadArea new_area{ .start_address = Common::AlignDown(addr, Core::Memory::YUZU_PAGESIZE), .end_address = Common::AlignUp(addr + size, Core::Memory::YUZU_PAGESIZE), diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 29ac01eb4..d49f3a7a0 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1323,7 +1323,6 @@ ImageId TextureCache

::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA all_siblings.push_back(overlap_id); } else { bad_overlap_ids.push_back(overlap_id); - overlap.flags |= ImageFlagBits::BadOverlap; } }; ForEachImageInRegion(cpu_addr, size_bytes, region_check); @@ -1434,7 +1433,12 @@ ImageId TextureCache

::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA ImageBase& aliased = slot_images[aliased_id]; aliased.overlapping_images.push_back(new_image_id); new_image.overlapping_images.push_back(aliased_id); - new_image.flags |= ImageFlagBits::BadOverlap; + if (aliased.info.resources.levels == 1 && aliased.overlapping_images.size() > 1) { + aliased.flags |= ImageFlagBits::BadOverlap; + } + if (new_image.info.resources.levels == 1 && new_image.overlapping_images.size() > 1) { + new_image.flags |= ImageFlagBits::BadOverlap; + } } RegisterImage(new_image_id); return new_image_id; From 8014dd82594dbb40e13749203e67b21e8447733c Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 7 May 2023 23:34:52 +0200 Subject: [PATCH 0358/1181] Texture cache: Only force flush the dma downloads --- src/video_core/engines/maxwell_dma.cpp | 2 +- src/video_core/renderer_opengl/gl_rasterizer.cpp | 2 +- src/video_core/renderer_vulkan/vk_rasterizer.cpp | 2 +- src/video_core/texture_cache/texture_cache.h | 4 ++-- src/video_core/texture_cache/texture_cache_base.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/video_core/engines/maxwell_dma.cpp b/src/video_core/engines/maxwell_dma.cpp index f7400aac8..ebe5536de 100644 --- a/src/video_core/engines/maxwell_dma.cpp +++ b/src/video_core/engines/maxwell_dma.cpp @@ -288,7 +288,7 @@ void MaxwellDMA::CopyPitchToBlockLinear() { write_buffer.resize_destructive(dst_size); memory_manager.ReadBlock(regs.offset_in, read_buffer.data(), src_size); - memory_manager.ReadBlock(regs.offset_out, write_buffer.data(), dst_size); + memory_manager.ReadBlockUnsafe(regs.offset_out, write_buffer.data(), dst_size); // If the input is linear and the output is tiled, swizzle the input and copy it over. SwizzleSubrect(write_buffer, read_buffer, bytes_per_pixel, width, height, depth, x_offset, diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 3f07fe8bb..f5baa0f3c 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -1304,7 +1304,7 @@ bool AccelerateDMA::DmaBufferImageCopy(const Tegra::DMA::ImageCopy& copy_info, const Tegra::DMA::BufferOperand& buffer_operand, const Tegra::DMA::ImageOperand& image_operand) { std::scoped_lock lock{buffer_cache.mutex, texture_cache.mutex}; - const auto image_id = texture_cache.DmaImageId(image_operand); + const auto image_id = texture_cache.DmaImageId(image_operand, IS_IMAGE_UPLOAD); if (image_id == VideoCommon::NULL_IMAGE_ID) { return false; } diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 0bcc20544..628e1376f 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -793,7 +793,7 @@ bool AccelerateDMA::DmaBufferImageCopy(const Tegra::DMA::ImageCopy& copy_info, const Tegra::DMA::BufferOperand& buffer_operand, const Tegra::DMA::ImageOperand& image_operand) { std::scoped_lock lock{buffer_cache.mutex, texture_cache.mutex}; - const auto image_id = texture_cache.DmaImageId(image_operand); + const auto image_id = texture_cache.DmaImageId(image_operand, IS_IMAGE_UPLOAD); if (image_id == VideoCommon::NULL_IMAGE_ID) { return false; } diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index d49f3a7a0..e1198dcf8 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -811,7 +811,7 @@ void TextureCache

::PopAsyncFlushes() { } template -ImageId TextureCache

::DmaImageId(const Tegra::DMA::ImageOperand& operand) { +ImageId TextureCache

::DmaImageId(const Tegra::DMA::ImageOperand& operand, bool is_upload) { const ImageInfo dst_info(operand); const ImageId dst_id = FindDMAImage(dst_info, operand.address); if (!dst_id) { @@ -822,7 +822,7 @@ ImageId TextureCache

::DmaImageId(const Tegra::DMA::ImageOperand& operand) { // No need to waste time on an image that's synced with guest return NULL_IMAGE_ID; } - if (!image.info.dma_downloaded) { + if (!is_upload && !image.info.dma_downloaded) { // Force a full sync. image.info.dma_downloaded = true; return NULL_IMAGE_ID; diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index 01f5ac588..0720494e5 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h @@ -207,7 +207,7 @@ public: /// Pop asynchronous downloads void PopAsyncFlushes(); - [[nodiscard]] ImageId DmaImageId(const Tegra::DMA::ImageOperand& operand); + [[nodiscard]] ImageId DmaImageId(const Tegra::DMA::ImageOperand& operand, bool is_upload); [[nodiscard]] std::pair DmaBufferImageCopy( const Tegra::DMA::ImageCopy& copy_info, const Tegra::DMA::BufferOperand& buffer_operand, From 7eb17f3aa583a4283c57b054d6fee943a6f06538 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 7 May 2023 15:06:58 -0700 Subject: [PATCH 0359/1181] externals: Update dynarmic to include latest patch. --- externals/dynarmic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/dynarmic b/externals/dynarmic index d5c2b473a..7da378033 160000 --- a/externals/dynarmic +++ b/externals/dynarmic @@ -1 +1 @@ -Subproject commit d5c2b473a831ca9e2a93bda30dc131b4fee7314f +Subproject commit 7da378033a7764f955516f75194856d87bbcd7a5 From cf023aa8ec93193d4827b3034c9e7d35a0edfc2a Mon Sep 17 00:00:00 2001 From: german77 Date: Sun, 7 May 2023 16:38:41 -0600 Subject: [PATCH 0360/1181] core: hid: Update motion on a better place --- src/core/hid/emulated_controller.cpp | 29 +++++++++---------- src/core/hid/emulated_controller.h | 5 ++-- src/core/hid/input_converter.cpp | 2 +- src/core/hle/service/hid/controllers/npad.cpp | 4 +-- src/input_common/input_poller.cpp | 2 +- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index ecab85893..c7f0af71f 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp @@ -979,7 +979,6 @@ void EmulatedController::SetMotion(const Common::Input::CallbackStatus& callback emulated.SetUserGyroThreshold(raw_status.gyro.x.properties.threshold); emulated.UpdateRotation(raw_status.delta_timestamp); emulated.UpdateOrientation(raw_status.delta_timestamp); - force_update_motion = raw_status.force_update; auto& motion = controller.motion_state[index]; motion.accel = emulated.GetAcceleration(); @@ -1618,19 +1617,6 @@ NpadGcTriggerState EmulatedController::GetTriggers() const { MotionState EmulatedController::GetMotions() const { std::unique_lock lock{mutex}; - - // Some drivers like mouse motion need constant refreshing - if (force_update_motion) { - for (auto& device : motion_devices) { - if (!device) { - continue; - } - lock.unlock(); - device->ForceUpdate(); - lock.lock(); - } - } - return controller.motion_state; } @@ -1696,8 +1682,21 @@ void EmulatedController::DeleteCallback(int key) { callback_list.erase(iterator); } -void EmulatedController::TurboButtonUpdate() { +void EmulatedController::StatusUpdate() { turbo_button_state = (turbo_button_state + 1) % (TURBO_BUTTON_DELAY * 2); + + // Some drivers like key motion need constant refreshing + for (std::size_t index = 0; index < motion_devices.size(); ++index) { + const auto& raw_status = controller.motion_values[index].raw_status; + auto& device = motion_devices[index]; + if (!raw_status.force_update) { + continue; + } + if (!device) { + continue; + } + device->ForceUpdate(); + } } NpadButton EmulatedController::GetTurboButtonMask() const { diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index 6e01f4e12..fa4ad7fae 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h @@ -415,8 +415,8 @@ public: */ void DeleteCallback(int key); - /// Swaps the state of the turbo buttons - void TurboButtonUpdate(); + /// Swaps the state of the turbo buttons and updates motion input + void StatusUpdate(); private: /// creates input devices from params @@ -528,7 +528,6 @@ private: bool is_configuring{false}; bool system_buttons_enabled{true}; f32 motion_sensitivity{Core::HID::MotionInput::IsAtRestStandard}; - bool force_update_motion{false}; u32 turbo_button_state{0}; // Temporary values to avoid doing changes while the controller is in configuring mode diff --git a/src/core/hid/input_converter.cpp b/src/core/hid/input_converter.cpp index 53b00b1f9..4ccb1c596 100644 --- a/src/core/hid/input_converter.cpp +++ b/src/core/hid/input_converter.cpp @@ -86,7 +86,7 @@ Common::Input::MotionStatus TransformToMotion(const Common::Input::CallbackStatu .range = 1.0f, .offset = 0.0f, }; - status.delta_timestamp = 5000; + status.delta_timestamp = 1000; status.force_update = true; status.accel.x = { .value = 0.0f, diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 8abf71608..ef4aec4ea 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -423,8 +423,8 @@ void Controller_NPad::RequestPadStateUpdate(Core::HID::NpadIdType npad_id) { return; } - // This function is unique to yuzu for the turbo buttons to work properly - controller.device->TurboButtonUpdate(); + // This function is unique to yuzu for the turbo buttons and motion to work properly + controller.device->StatusUpdate(); auto& pad_entry = controller.npad_pad_state; auto& trigger_entry = controller.npad_trigger_state; diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cpp index 5c2c4a463..380a01542 100644 --- a/src/input_common/input_poller.cpp +++ b/src/input_common/input_poller.cpp @@ -667,7 +667,7 @@ public: .raw_value = input_engine->GetAxis(identifier, axis_z), .properties = properties_z, }; - status.delta_timestamp = 5000; + status.delta_timestamp = 1000; status.force_update = true; return status; } From d100de27ee77fc98e1f3fa3dc6d2db0999da0a1a Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 7 May 2023 16:33:35 -0400 Subject: [PATCH 0361/1181] vfs_layered: avoid n^2 lookup in layeredfs building --- src/core/file_sys/vfs_layered.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/core/file_sys/vfs_layered.cpp b/src/core/file_sys/vfs_layered.cpp index da05dd395..3e6426afc 100644 --- a/src/core/file_sys/vfs_layered.cpp +++ b/src/core/file_sys/vfs_layered.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include +#include #include #include "core/file_sys/vfs_layered.h" @@ -58,11 +59,13 @@ std::string LayeredVfsDirectory::GetFullPath() const { std::vector LayeredVfsDirectory::GetFiles() const { std::vector out; + std::set> out_names; + for (const auto& layer : dirs) { for (const auto& file : layer->GetFiles()) { - if (std::find_if(out.begin(), out.end(), [&file](const VirtualFile& comp) { - return comp->GetName() == file->GetName(); - }) == out.end()) { + auto file_name = file->GetName(); + if (!out_names.contains(file_name)) { + out_names.emplace(std::move(file_name)); out.push_back(file); } } From bdb7c11d8e3af27b5c8d454d5971c239039c5a1c Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 7 May 2023 19:20:09 -0400 Subject: [PATCH 0362/1181] bootmanager: remove stop_token header --- src/yuzu/bootmanager.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h index 4276be82b..b7b9d4141 100644 --- a/src/yuzu/bootmanager.h +++ b/src/yuzu/bootmanager.h @@ -8,7 +8,6 @@ #include #include #include -#include #include #include From 40f3e2fbf1dc173fa2595d01f5b3a1defb7b186d Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Mon, 8 May 2023 12:32:41 -0400 Subject: [PATCH 0363/1181] configure_graphics_advanced: Hide input compute toggle a little later SetColoredTristate causes the setting to become visible as it calls `show()` on it. --- src/yuzu/configuration/configure_graphics_advanced.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp index 7975285a7..7a11db89b 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.cpp +++ b/src/yuzu/configuration/configure_graphics_advanced.cpp @@ -12,11 +12,11 @@ ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced(const Core::System& system_ ui->setupUi(this); - ui->enable_compute_pipelines_checkbox->setVisible(false); - SetupPerGameUI(); SetConfiguration(); + + ui->enable_compute_pipelines_checkbox->setVisible(false); } ConfigureGraphicsAdvanced::~ConfigureGraphicsAdvanced() = default; From 97bd6d641811cafc3ec99879fa53beda1a2334b5 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Mon, 8 May 2023 11:17:27 -0600 Subject: [PATCH 0364/1181] core: hid: Allow to calibrate gyro sensor --- src/core/hid/emulated_controller.cpp | 6 ++++++ src/core/hid/emulated_controller.h | 3 +++ src/core/hid/motion_input.cpp | 21 ++++++++++++++++++- src/core/hid/motion_input.h | 11 ++++++++++ .../configuration/configure_input_player.cpp | 3 +++ 5 files changed, 43 insertions(+), 1 deletion(-) diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index c7f0af71f..366880711 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp @@ -688,6 +688,12 @@ void EmulatedController::SetMotionParam(std::size_t index, Common::ParamPackage ReloadInput(); } +void EmulatedController::StartMotionCalibration() { + for (ControllerMotionInfo& motion : controller.motion_values) { + motion.emulated.Calibrate(); + } +} + void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback, std::size_t index, Common::UUID uuid) { if (index >= controller.button_values.size()) { diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index fa4ad7fae..88fad2f56 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h @@ -290,6 +290,9 @@ public: */ void SetMotionParam(std::size_t index, Common::ParamPackage param); + /// Auto calibrates the current motion devices + void StartMotionCalibration(); + /// Returns the latest button status from the controller with parameters ButtonValues GetButtonsValues() const; diff --git a/src/core/hid/motion_input.cpp b/src/core/hid/motion_input.cpp index b60478dbb..f56f2ae1d 100644 --- a/src/core/hid/motion_input.cpp +++ b/src/core/hid/motion_input.cpp @@ -37,11 +37,17 @@ void MotionInput::SetGyroscope(const Common::Vec3f& gyroscope) { gyro.y = std::clamp(gyro.y, -GyroMaxValue, GyroMaxValue); gyro.z = std::clamp(gyro.z, -GyroMaxValue, GyroMaxValue); - // Auto adjust drift to minimize drift + // Auto adjust gyro_bias to minimize drift if (!IsMoving(IsAtRestRelaxed)) { gyro_bias = (gyro_bias * 0.9999f) + (gyroscope * 0.0001f); } + // Adjust drift when calibration mode is enabled + if (calibration_mode) { + gyro_bias = (gyro_bias * 0.99f) + (gyroscope * 0.01f); + StopCalibration(); + } + if (gyro.Length() < gyro_threshold * user_gyro_threshold) { gyro = {}; } else { @@ -107,6 +113,19 @@ void MotionInput::UpdateRotation(u64 elapsed_time) { rotations += gyro * sample_period; } +void MotionInput::Calibrate() { + calibration_mode = true; + calibration_counter = 0; +} + +void MotionInput::StopCalibration() { + if (calibration_counter++ > CalibrationSamples) { + calibration_mode = false; + ResetQuaternion(); + ResetRotations(); + } +} + // Based on Madgwick's implementation of Mayhony's AHRS algorithm. // https://github.com/xioTechnologies/Open-Source-AHRS-With-x-IMU/blob/master/x-IMU%20IMU%20and%20AHRS%20Algorithms/x-IMU%20IMU%20and%20AHRS%20Algorithms/AHRS/MahonyAHRS.cs void MotionInput::UpdateOrientation(u64 elapsed_time) { diff --git a/src/core/hid/motion_input.h b/src/core/hid/motion_input.h index 482719359..11678983d 100644 --- a/src/core/hid/motion_input.h +++ b/src/core/hid/motion_input.h @@ -23,6 +23,8 @@ public: static constexpr float GyroMaxValue = 5.0f; static constexpr float AccelMaxValue = 7.0f; + static constexpr std::size_t CalibrationSamples = 300; + explicit MotionInput(); MotionInput(const MotionInput&) = default; @@ -49,6 +51,8 @@ public: void UpdateRotation(u64 elapsed_time); void UpdateOrientation(u64 elapsed_time); + void Calibrate(); + [[nodiscard]] std::array GetOrientation() const; [[nodiscard]] Common::Vec3f GetAcceleration() const; [[nodiscard]] Common::Vec3f GetGyroscope() const; @@ -61,6 +65,7 @@ public: [[nodiscard]] bool IsCalibrated(f32 sensitivity) const; private: + void StopCalibration(); void ResetOrientation(); void SetOrientationFromAccelerometer(); @@ -103,6 +108,12 @@ private: // Use accelerometer values to calculate position bool only_accelerometer = true; + + // When enabled it will aggressively adjust for gyro drift + bool calibration_mode = false; + + // Used to auto disable calibration mode + std::size_t calibration_counter = 0; }; } // namespace Core::HID diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 561a08dc5..2c2e7e47b 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -479,6 +479,9 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i param.Set("threshold", new_threshold / 1000.0f); emulated_controller->SetMotionParam(motion_id, param); }); + context_menu.addAction(tr("Calibrate sensor"), [&] { + emulated_controller->StartMotionCalibration(); + }); } context_menu.exec(motion_map[motion_id]->mapToGlobal(menu_location)); }); From e1838f51a3538fcbce6a43189b219df137d60f27 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Mon, 8 May 2023 11:46:50 -0600 Subject: [PATCH 0365/1181] yuzu: Make 3d cube with joycon shape --- .../configure_input_player_widget.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp index fe1ee2289..a188eef92 100644 --- a/src/yuzu/configuration/configure_input_player_widget.cpp +++ b/src/yuzu/configuration/configure_input_player_widget.cpp @@ -582,9 +582,9 @@ void PlayerControlPreview::DrawDualController(QPainter& p, const QPointF center) using namespace Settings::NativeMotion; p.setPen(colors.outline); p.setBrush(colors.transparent); - Draw3dCube(p, center + QPointF(-180, -5), + Draw3dCube(p, center + QPointF(-180, 90), motion_values[Settings::NativeMotion::MotionLeft].euler, 20.0f); - Draw3dCube(p, center + QPointF(180, -5), + Draw3dCube(p, center + QPointF(180, 90), motion_values[Settings::NativeMotion::MotionRight].euler, 20.0f); } @@ -2926,14 +2926,14 @@ void PlayerControlPreview::DrawArrow(QPainter& p, const QPointF center, const Di void PlayerControlPreview::Draw3dCube(QPainter& p, QPointF center, const Common::Vec3f& euler, float size) { std::array cube{ - Common::Vec3f{-1, -1, -1}, - {-1, 1, -1}, - {1, 1, -1}, - {1, -1, -1}, - {-1, -1, 1}, - {-1, 1, 1}, - {1, 1, 1}, - {1, -1, 1}, + Common::Vec3f{-0.7f, -1, -0.5f}, + {-0.7f, 1, -0.5f}, + {0.7f, 1, -0.5f}, + {0.7f, -1, -0.5f}, + {-0.7f, -1, 0.5f}, + {-0.7f, 1, 0.5f}, + {0.7f, 1, 0.5f}, + {0.7f, -1, 0.5f}, }; for (Common::Vec3f& point : cube) { From a4362765a606564b36d8aa9ebef38440f14aa465 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 8 May 2023 20:44:50 +0000 Subject: [PATCH 0366/1181] qt_common: consistently ifdef QPlatform after cbd79df23375 src/yuzu/qt_common.cpp:45:33: error: member access into incomplete type 'QPlatformNativeInterface' wsi.display_connection = pni->nativeResourceForWindow("display", window); ^ /usr/include/qt6/QtGui/qguiapplication.h:20:7: note: forward declaration of 'QPlatformNativeInterface' class QPlatformNativeInterface; ^ src/yuzu/qt_common.cpp:47:42: error: member access into incomplete type 'QPlatformNativeInterface' wsi.render_surface = window ? pni->nativeResourceForWindow("surface", window) : nullptr; ^ /usr/include/qt6/QtGui/qguiapplication.h:20:7: note: forward declaration of 'QPlatformNativeInterface' class QPlatformNativeInterface; ^ --- src/yuzu/qt_common.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yuzu/qt_common.cpp b/src/yuzu/qt_common.cpp index 5ac9fe310..5d0fd7674 100644 --- a/src/yuzu/qt_common.cpp +++ b/src/yuzu/qt_common.cpp @@ -8,7 +8,7 @@ #include "core/frontend/emu_window.h" #include "yuzu/qt_common.h" -#ifdef __linux__ +#if !defined(WIN32) && !defined(__APPLE__) #include #endif From 8a214e5530311e9809030e2c55d2d1784169d5e7 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Mon, 8 May 2023 23:16:57 +0200 Subject: [PATCH 0367/1181] Texture Cache: Fix ASTC textures --- src/video_core/renderer_opengl/gl_texture_cache.cpp | 2 +- src/video_core/renderer_vulkan/vk_texture_cache.cpp | 2 +- src/video_core/texture_cache/util.cpp | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index 052456f61..31118886f 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -231,7 +231,7 @@ void ApplySwizzle(GLuint handle, PixelFormat format, std::arraydevice.IsOptimalAstcSupported()) { if (Settings::values.async_astc.GetValue()) { flags |= VideoCommon::ImageFlagBits::AsynchronousDecode; - } else if (Settings::values.accelerate_astc.GetValue()) { + } else if (Settings::values.accelerate_astc.GetValue() && info.size.depth == 1) { flags |= VideoCommon::ImageFlagBits::AcceleratedUpload; } flags |= VideoCommon::ImageFlagBits::Converted; diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cpp index de37db684..f1071aa23 100644 --- a/src/video_core/texture_cache/util.cpp +++ b/src/video_core/texture_cache/util.cpp @@ -896,11 +896,11 @@ void ConvertImage(std::span input, const ImageInfo& info, std::span Date: Tue, 9 May 2023 00:30:25 -0600 Subject: [PATCH 0368/1181] input_common: Fix nfc detection for joycons --- .../joycon_protocol/common_protocol.cpp | 7 +++--- .../helpers/joycon_protocol/common_protocol.h | 2 +- .../helpers/joycon_protocol/joycon_types.h | 7 ++++-- .../helpers/joycon_protocol/nfc.cpp | 24 +++++++++---------- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/input_common/helpers/joycon_protocol/common_protocol.cpp b/src/input_common/helpers/joycon_protocol/common_protocol.cpp index 2b42a4555..077d72cd0 100644 --- a/src/input_common/helpers/joycon_protocol/common_protocol.cpp +++ b/src/input_common/helpers/joycon_protocol/common_protocol.cpp @@ -236,13 +236,13 @@ DriverResult JoyconCommonProtocol::GetMCUDataResponse(ReportMode report_mode, return DriverResult::Success; } -DriverResult JoyconCommonProtocol::SendMCUData(ReportMode report_mode, SubCommand sc, +DriverResult JoyconCommonProtocol::SendMCUData(ReportMode report_mode, MCUSubCommand sc, std::span buffer, MCUCommandResponse& output) { SubCommandPacket packet{ .output_report = OutputReport::MCU_DATA, .packet_counter = GetCounter(), - .sub_command = sc, + .mcu_sub_command = sc, .command_data = {}, }; @@ -269,8 +269,7 @@ DriverResult JoyconCommonProtocol::WaitSetMCUMode(ReportMode report_mode, MCUMod std::size_t tries{}; do { - const std::vector mcu_data{static_cast(MCUMode::Standby)}; - const auto result = SendMCUData(report_mode, SubCommand::STATE, mcu_data, output); + const auto result = SendMCUData(report_mode, MCUSubCommand::SetDeviceMode, {}, output); if (result != DriverResult::Success) { return result; diff --git a/src/input_common/helpers/joycon_protocol/common_protocol.h b/src/input_common/helpers/joycon_protocol/common_protocol.h index 62cae739a..411ec018a 100644 --- a/src/input_common/helpers/joycon_protocol/common_protocol.h +++ b/src/input_common/helpers/joycon_protocol/common_protocol.h @@ -156,7 +156,7 @@ public: * @param buffer data to be send * @returns output buffer containing the response */ - DriverResult SendMCUData(ReportMode report_mode, SubCommand sc, std::span buffer, + DriverResult SendMCUData(ReportMode report_mode, MCUSubCommand sc, std::span buffer, MCUCommandResponse& output); /** diff --git a/src/input_common/helpers/joycon_protocol/joycon_types.h b/src/input_common/helpers/joycon_protocol/joycon_types.h index dcac0e422..b03143e04 100644 --- a/src/input_common/helpers/joycon_protocol/joycon_types.h +++ b/src/input_common/helpers/joycon_protocol/joycon_types.h @@ -575,7 +575,6 @@ struct NFCPollingCommandData { static_assert(sizeof(NFCPollingCommandData) == 0x05, "NFCPollingCommandData is an invalid size"); struct NFCRequestState { - MCUSubCommand sub_command; NFCReadCommand command_argument; u8 packet_id; INSERT_PADDING_BYTES(0x1); @@ -587,6 +586,7 @@ struct NFCRequestState { NFCPollingCommandData nfc_polling; }; u8 crc; + INSERT_PADDING_BYTES(0x1); }; static_assert(sizeof(NFCRequestState) == 0x26, "NFCRequestState is an invalid size"); @@ -659,7 +659,10 @@ struct SubCommandPacket { OutputReport output_report; u8 packet_counter; INSERT_PADDING_BYTES(0x8); // This contains vibration data - SubCommand sub_command; + union { + SubCommand sub_command; + MCUSubCommand mcu_sub_command; + }; std::array command_data; }; static_assert(sizeof(SubCommandPacket) == 0x31, "SubCommandPacket is an invalid size"); diff --git a/src/input_common/helpers/joycon_protocol/nfc.cpp b/src/input_common/helpers/joycon_protocol/nfc.cpp index eeba82986..77ea6d5cf 100644 --- a/src/input_common/helpers/joycon_protocol/nfc.cpp +++ b/src/input_common/helpers/joycon_protocol/nfc.cpp @@ -278,7 +278,6 @@ DriverResult NfcProtocol::GetAmiiboData(std::vector& ntag_data) { DriverResult NfcProtocol::SendStartPollingRequest(MCUCommandResponse& output) { NFCRequestState request{ - .sub_command = MCUSubCommand::ReadDeviceMode, .command_argument = NFCReadCommand::StartPolling, .packet_id = 0x0, .packet_flag = MCUPacketFlag::LastCommandPacket, @@ -296,13 +295,13 @@ DriverResult NfcProtocol::SendStartPollingRequest(MCUCommandResponse& output) { std::array request_data{}; memcpy(request_data.data(), &request, sizeof(NFCRequestState)); - request_data[37] = CalculateMCU_CRC8(request_data.data() + 1, 36); - return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, SubCommand::STATE, request_data, output); + request_data[36] = CalculateMCU_CRC8(request_data.data(), 36); + return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, MCUSubCommand::ReadDeviceMode, request_data, + output); } DriverResult NfcProtocol::SendStopPollingRequest(MCUCommandResponse& output) { NFCRequestState request{ - .sub_command = MCUSubCommand::ReadDeviceMode, .command_argument = NFCReadCommand::StopPolling, .packet_id = 0x0, .packet_flag = MCUPacketFlag::LastCommandPacket, @@ -313,13 +312,13 @@ DriverResult NfcProtocol::SendStopPollingRequest(MCUCommandResponse& output) { std::array request_data{}; memcpy(request_data.data(), &request, sizeof(NFCRequestState)); - request_data[37] = CalculateMCU_CRC8(request_data.data() + 1, 36); - return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, SubCommand::STATE, request_data, output); + request_data[36] = CalculateMCU_CRC8(request_data.data(), 36); + return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, MCUSubCommand::ReadDeviceMode, request_data, + output); } DriverResult NfcProtocol::SendStartWaitingRecieveRequest(MCUCommandResponse& output) { NFCRequestState request{ - .sub_command = MCUSubCommand::ReadDeviceMode, .command_argument = NFCReadCommand::StartWaitingRecieve, .packet_id = 0x0, .packet_flag = MCUPacketFlag::LastCommandPacket, @@ -330,13 +329,13 @@ DriverResult NfcProtocol::SendStartWaitingRecieveRequest(MCUCommandResponse& out std::vector request_data(sizeof(NFCRequestState)); memcpy(request_data.data(), &request, sizeof(NFCRequestState)); - request_data[37] = CalculateMCU_CRC8(request_data.data() + 1, 36); - return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, SubCommand::STATE, request_data, output); + request_data[36] = CalculateMCU_CRC8(request_data.data(), 36); + return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, MCUSubCommand::ReadDeviceMode, request_data, + output); } DriverResult NfcProtocol::SendReadAmiiboRequest(MCUCommandResponse& output, NFCPages ntag_pages) { NFCRequestState request{ - .sub_command = MCUSubCommand::ReadDeviceMode, .command_argument = NFCReadCommand::Ntag, .packet_id = 0x0, .packet_flag = MCUPacketFlag::LastCommandPacket, @@ -355,8 +354,9 @@ DriverResult NfcProtocol::SendReadAmiiboRequest(MCUCommandResponse& output, NFCP std::array request_data{}; memcpy(request_data.data(), &request, sizeof(NFCRequestState)); - request_data[37] = CalculateMCU_CRC8(request_data.data() + 1, 36); - return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, SubCommand::STATE, request_data, output); + request_data[36] = CalculateMCU_CRC8(request_data.data(), 36); + return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, MCUSubCommand::ReadDeviceMode, request_data, + output); } NFCReadBlockCommand NfcProtocol::GetReadBlockCommand(NFCPages pages) const { From b3691fc33c09c479d86154d341e1983995193da8 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Tue, 9 May 2023 20:21:08 +0100 Subject: [PATCH 0369/1181] Swap order of checking/setting region modifications in the buffer_cache --- src/video_core/buffer_cache/buffer_cache.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 6624919a4..fff57ffa9 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -96,12 +96,12 @@ void BufferCache

::TickFrame() { template void BufferCache

::WriteMemory(VAddr cpu_addr, u64 size) { - memory_tracker.MarkRegionAsCpuModified(cpu_addr, size); if (memory_tracker.IsRegionGpuModified(cpu_addr, size)) { const IntervalType subtract_interval{cpu_addr, cpu_addr + size}; ClearDownload(subtract_interval); common_ranges.subtract(subtract_interval); } + memory_tracker.MarkRegionAsCpuModified(cpu_addr, size); } template @@ -122,9 +122,10 @@ std::optional BufferCache

::GetFlushArea(VA area->preemtive = true; return area; }; + area->preemtive = + !IsRegionGpuModified(cpu_addr_start_aligned, cpu_addr_end_aligned - cpu_addr_start_aligned); memory_tracker.MarkRegionAsPreflushable(cpu_addr_start_aligned, cpu_addr_end_aligned - cpu_addr_start_aligned); - area->preemtive = !IsRegionGpuModified(cpu_addr, size); return area; } @@ -1223,11 +1224,10 @@ void BufferCache

::UpdateComputeTextureBuffers() { template void BufferCache

::MarkWrittenBuffer(BufferId buffer_id, VAddr cpu_addr, u32 size) { - memory_tracker.MarkRegionAsGpuModified(cpu_addr, size); - if (memory_tracker.IsRegionCpuModified(cpu_addr, size)) { SynchronizeBuffer(slot_buffers[buffer_id], cpu_addr, size); } + memory_tracker.MarkRegionAsGpuModified(cpu_addr, size); const IntervalType base_interval{cpu_addr, cpu_addr + size}; common_ranges.add(base_interval); From a386003b649e24a9df916a81b95cbcc9ab8bcbaa Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Tue, 9 May 2023 22:13:15 +0100 Subject: [PATCH 0370/1181] Use the rendertarget format of the correct RT rather than the first valid --- .../renderer_vulkan/vk_rasterizer.cpp | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 628e1376f..cbf23552c 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -349,25 +349,12 @@ void RasterizerVulkan::Clear(u32 layer_count) { const u32 color_attachment = regs.clear_surface.RT; if (use_color && framebuffer->HasAspectColorBit(color_attachment)) { - VkClearValue clear_value; - bool is_integer = false; - bool is_signed = false; - size_t int_size = 8; - for (std::size_t i = 0; i < Tegra::Engines::Maxwell3D::Regs::NumRenderTargets; ++i) { - const auto& this_rt = regs.rt[i]; - if (this_rt.Address() == 0) { - continue; - } - if (this_rt.format == Tegra::RenderTargetFormat::NONE) { - continue; - } - const auto format = - VideoCore::Surface::PixelFormatFromRenderTargetFormat(this_rt.format); - is_integer = IsPixelFormatInteger(format); - is_signed = IsPixelFormatSignedInteger(format); - int_size = PixelComponentSizeBitsInteger(format); - break; - } + const auto format = + VideoCore::Surface::PixelFormatFromRenderTargetFormat(regs.rt[color_attachment].format); + bool is_integer = IsPixelFormatInteger(format); + bool is_signed = IsPixelFormatSignedInteger(format); + size_t int_size = PixelComponentSizeBitsInteger(format); + VkClearValue clear_value{}; if (!is_integer) { std::memcpy(clear_value.color.float32, regs.clear_color.data(), regs.clear_color.size() * sizeof(f32)); From 1968cc7b106159e2bd2166459c3cb04d5f79601f Mon Sep 17 00:00:00 2001 From: german77 Date: Mon, 8 May 2023 22:03:32 -0600 Subject: [PATCH 0371/1181] service: nfp: Allow to load with a different amiibo id --- src/common/settings.h | 2 ++ src/core/hle/service/nfc/common/device.cpp | 17 ++++++++++---- src/yuzu/configuration/config.cpp | 2 ++ .../configure_input_advanced.cpp | 2 ++ .../configuration/configure_input_advanced.ui | 22 ++++++++++++++++--- src/yuzu_cmd/config.cpp | 1 + 6 files changed, 39 insertions(+), 7 deletions(-) diff --git a/src/common/settings.h b/src/common/settings.h index f4eb4e3cd..5f4caaab9 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -535,6 +535,8 @@ struct Values { Setting enable_ir_sensor{false, "enable_ir_sensor"}; Setting ir_sensor_device{"auto", "ir_sensor_device"}; + Setting random_amiibo_id{false, "random_amiibo_id"}; + // Data Storage Setting use_virtual_sd{true, "use_virtual_sd"}; Setting gamecard_inserted{false, "gamecard_inserted"}; diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp index e5de65ce0..9b0685bdb 100644 --- a/src/core/hle/service/nfc/common/device.cpp +++ b/src/core/hle/service/nfc/common/device.cpp @@ -227,11 +227,20 @@ Result NfcDevice::GetTagInfo(NFP::TagInfo& tag_info, bool is_mifare) const { return ResultWrongDeviceState; } + UniqueSerialNumber uuid = encrypted_tag_data.uuid.uid; + + // Generate random UUID to bypass amiibo load limits + if (Settings::values.random_amiibo_id) { + Common::TinyMT rng{}; + rng.GenerateRandomBytes(uuid.data(), sizeof(UniqueSerialNumber)); + uuid[3] = 0x88 ^ uuid[0] ^ uuid[1] ^ uuid[2]; + } + if (is_mifare) { tag_info = { - .uuid = encrypted_tag_data.uuid.uid, + .uuid = uuid, .uuid_extension = {}, - .uuid_length = static_cast(encrypted_tag_data.uuid.uid.size()), + .uuid_length = static_cast(uuid.size()), .protocol = NfcProtocol::TypeA, .tag_type = TagType::Type4, }; @@ -240,9 +249,9 @@ Result NfcDevice::GetTagInfo(NFP::TagInfo& tag_info, bool is_mifare) const { // Protocol and tag type may change here tag_info = { - .uuid = encrypted_tag_data.uuid.uid, + .uuid = uuid, .uuid_extension = {}, - .uuid_length = static_cast(encrypted_tag_data.uuid.uid.size()), + .uuid_length = static_cast(uuid.size()), .protocol = NfcProtocol::TypeA, .tag_type = TagType::Type2, }; diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index a49d12266..b94d36838 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -443,6 +443,7 @@ void Config::ReadControlValues() { ReadBasicSetting(Settings::values.mouse_panning_sensitivity); ReadBasicSetting(Settings::values.enable_joycon_driver); ReadBasicSetting(Settings::values.enable_procon_driver); + ReadBasicSetting(Settings::values.random_amiibo_id); ReadBasicSetting(Settings::values.tas_enable); ReadBasicSetting(Settings::values.tas_loop); @@ -1150,6 +1151,7 @@ void Config::SaveControlValues() { WriteBasicSetting(Settings::values.enable_raw_input); WriteBasicSetting(Settings::values.enable_joycon_driver); WriteBasicSetting(Settings::values.enable_procon_driver); + WriteBasicSetting(Settings::values.random_amiibo_id); WriteBasicSetting(Settings::values.keyboard_enabled); WriteBasicSetting(Settings::values.emulate_analog_keyboard); WriteBasicSetting(Settings::values.mouse_panning_sensitivity); diff --git a/src/yuzu/configuration/configure_input_advanced.cpp b/src/yuzu/configuration/configure_input_advanced.cpp index 8d81322f3..f13156434 100644 --- a/src/yuzu/configuration/configure_input_advanced.cpp +++ b/src/yuzu/configuration/configure_input_advanced.cpp @@ -140,6 +140,7 @@ void ConfigureInputAdvanced::ApplyConfiguration() { Settings::values.enable_ir_sensor = ui->enable_ir_sensor->isChecked(); Settings::values.enable_joycon_driver = ui->enable_joycon_driver->isChecked(); Settings::values.enable_procon_driver = ui->enable_procon_driver->isChecked(); + Settings::values.random_amiibo_id = ui->random_amiibo_id->isChecked(); } void ConfigureInputAdvanced::LoadConfiguration() { @@ -176,6 +177,7 @@ void ConfigureInputAdvanced::LoadConfiguration() { ui->enable_ir_sensor->setChecked(Settings::values.enable_ir_sensor.GetValue()); ui->enable_joycon_driver->setChecked(Settings::values.enable_joycon_driver.GetValue()); ui->enable_procon_driver->setChecked(Settings::values.enable_procon_driver.GetValue()); + ui->random_amiibo_id->setChecked(Settings::values.random_amiibo_id.GetValue()); UpdateUIEnabled(); } diff --git a/src/yuzu/configuration/configure_input_advanced.ui b/src/yuzu/configuration/configure_input_advanced.ui index 0eb2b34bc..2e8b13660 100644 --- a/src/yuzu/configuration/configure_input_advanced.ui +++ b/src/yuzu/configuration/configure_input_advanced.ui @@ -2728,6 +2728,22 @@ + + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + + + + 0 + 23 + + + + Use random Amiibo ID + + + + @@ -2740,7 +2756,7 @@ - + Mouse sensitivity @@ -2762,14 +2778,14 @@ - + Motion / Touch - + Configure diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index abe7092fc..dc9a3d68f 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -169,6 +169,7 @@ void Config::ReadValues() { ReadSetting("ControlsGeneral", Settings::values.enable_raw_input); ReadSetting("ControlsGeneral", Settings::values.enable_joycon_driver); ReadSetting("ControlsGeneral", Settings::values.enable_procon_driver); + ReadSetting("ControlsGeneral", Settings::values.random_amiibo_id); ReadSetting("ControlsGeneral", Settings::values.emulate_analog_keyboard); ReadSetting("ControlsGeneral", Settings::values.vibration_enabled); ReadSetting("ControlsGeneral", Settings::values.enable_accurate_vibrations); From 42e1db4b0e254d10898f4a2bceb452fbfbaae063 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Tue, 9 May 2023 17:49:56 -0600 Subject: [PATCH 0372/1181] service: nfc: Seed all random values --- src/core/hle/service/nfc/common/device.cpp | 18 +++++++++++++----- src/core/hle/service/nfc/common/device.h | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp index 9b0685bdb..322bde2ed 100644 --- a/src/core/hle/service/nfc/common/device.cpp +++ b/src/core/hle/service/nfc/common/device.cpp @@ -48,9 +48,6 @@ NfcDevice::NfcDevice(Core::HID::NpadIdType npad_id_, Core::System& system_, }; is_controller_set = true; callback_key = npad_device->SetCallback(engine_callback); - - auto& standard_steady_clock{system.GetTimeManager().GetStandardSteadyClockCore()}; - current_posix_time = standard_steady_clock.GetCurrentTimePoint(system).time_point; } NfcDevice::~NfcDevice() { @@ -232,6 +229,7 @@ Result NfcDevice::GetTagInfo(NFP::TagInfo& tag_info, bool is_mifare) const { // Generate random UUID to bypass amiibo load limits if (Settings::values.random_amiibo_id) { Common::TinyMT rng{}; + rng.Initialize(static_cast(GetCurrentPosixTime())); rng.GenerateRandomBytes(uuid.data(), sizeof(UniqueSerialNumber)); uuid[3] = 0x88 ^ uuid[0] ^ uuid[1] ^ uuid[2]; } @@ -415,7 +413,7 @@ Result NfcDevice::Flush() { auto& settings = tag_data.settings; - const auto& current_date = GetAmiiboDate(current_posix_time); + const auto& current_date = GetAmiiboDate(GetCurrentPosixTime()); if (settings.write_date.raw_date != current_date.raw_date) { settings.write_date = current_date; UpdateSettingsCrc(); @@ -534,6 +532,7 @@ Result NfcDevice::GetModelInfo(NFP::ModelInfo& model_info) const { } const auto& model_info_data = encrypted_tag_data.user_memory.model_info; + model_info = { .character_id = model_info_data.character_id, .character_variant = model_info_data.character_variant, @@ -678,6 +677,7 @@ Result NfcDevice::DeleteRegisterInfo() { } Common::TinyMT rng{}; + rng.Initialize(static_cast(GetCurrentPosixTime())); rng.GenerateRandomBytes(&tag_data.owner_mii, sizeof(tag_data.owner_mii)); rng.GenerateRandomBytes(&tag_data.settings.amiibo_name, sizeof(tag_data.settings.amiibo_name)); rng.GenerateRandomBytes(&tag_data.unknown, sizeof(u8)); @@ -710,7 +710,7 @@ Result NfcDevice::SetRegisterInfoPrivate(const NFP::RegisterInfoPrivate& registe auto& settings = tag_data.settings; if (tag_data.settings.settings.amiibo_initialized == 0) { - settings.init_date = GetAmiiboDate(current_posix_time); + settings.init_date = GetAmiiboDate(GetCurrentPosixTime()); settings.write_date.raw_date = 0; } @@ -877,6 +877,7 @@ Result NfcDevice::SetApplicationArea(std::span data) { } Common::TinyMT rng{}; + rng.Initialize(static_cast(GetCurrentPosixTime())); std::memcpy(tag_data.application_area.data(), data.data(), data.size()); // Fill remaining data with random numbers rng.GenerateRandomBytes(tag_data.application_area.data() + data.size(), @@ -933,6 +934,7 @@ Result NfcDevice::RecreateApplicationArea(u32 access_id, std::span dat } Common::TinyMT rng{}; + rng.Initialize(static_cast(GetCurrentPosixTime())); std::memcpy(tag_data.application_area.data(), data.data(), data.size()); // Fill remaining data with random numbers rng.GenerateRandomBytes(tag_data.application_area.data() + data.size(), @@ -982,6 +984,7 @@ Result NfcDevice::DeleteApplicationArea() { } Common::TinyMT rng{}; + rng.Initialize(static_cast(GetCurrentPosixTime())); rng.GenerateRandomBytes(tag_data.application_area.data(), sizeof(NFP::ApplicationArea)); rng.GenerateRandomBytes(&tag_data.application_id, sizeof(u64)); rng.GenerateRandomBytes(&tag_data.application_area_id, sizeof(u32)); @@ -1198,6 +1201,11 @@ NFP::AmiiboDate NfcDevice::GetAmiiboDate(s64 posix_time) const { return amiibo_date; } +u64 NfcDevice::GetCurrentPosixTime() const { + auto& standard_steady_clock{system.GetTimeManager().GetStandardSteadyClockCore()}; + return standard_steady_clock.GetCurrentTimePoint(system).time_point; +} + u64 NfcDevice::RemoveVersionByte(u64 application_id) const { return application_id & ~(0xfULL << NFP::application_id_version_offset); } diff --git a/src/core/hle/service/nfc/common/device.h b/src/core/hle/service/nfc/common/device.h index 654eda98e..98e1945c1 100644 --- a/src/core/hle/service/nfc/common/device.h +++ b/src/core/hle/service/nfc/common/device.h @@ -105,6 +105,7 @@ private: NFP::AmiiboName GetAmiiboName(const NFP::AmiiboSettings& settings) const; void SetAmiiboName(NFP::AmiiboSettings& settings, const NFP::AmiiboName& amiibo_name); NFP::AmiiboDate GetAmiiboDate(s64 posix_time) const; + u64 GetCurrentPosixTime() const; u64 RemoveVersionByte(u64 application_id) const; void UpdateSettingsCrc(); void UpdateRegisterInfoCrc(); @@ -127,7 +128,6 @@ private: bool is_data_moddified{}; bool is_app_area_open{}; bool is_plain_amiibo{}; - s64 current_posix_time{}; NFP::MountTarget mount_target{NFP::MountTarget::None}; NFP::NTAG215File tag_data{}; From 67fd1df762c125fe8a04d7bbded42ba50a1cdef1 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 10 May 2023 13:35:25 -0400 Subject: [PATCH 0373/1181] renderer_vulkan: separate guest and host compute descriptor queues --- .../renderer_vulkan/pipeline_helper.h | 6 +-- .../renderer_vulkan/vk_buffer_cache.cpp | 10 +++-- .../renderer_vulkan/vk_buffer_cache.h | 9 +++-- .../renderer_vulkan/vk_compute_pass.cpp | 39 ++++++++++--------- .../renderer_vulkan/vk_compute_pass.h | 14 +++---- .../renderer_vulkan/vk_compute_pipeline.cpp | 12 +++--- .../renderer_vulkan/vk_compute_pipeline.h | 4 +- .../renderer_vulkan/vk_graphics_pipeline.cpp | 10 ++--- .../renderer_vulkan/vk_graphics_pipeline.h | 5 +-- .../renderer_vulkan/vk_pipeline_cache.cpp | 8 ++-- .../renderer_vulkan/vk_pipeline_cache.h | 5 +-- .../renderer_vulkan/vk_rasterizer.cpp | 18 ++++----- .../renderer_vulkan/vk_rasterizer.h | 3 +- .../renderer_vulkan/vk_texture_cache.cpp | 4 +- .../renderer_vulkan/vk_texture_cache.h | 3 +- .../renderer_vulkan/vk_update_descriptor.h | 6 ++- 16 files changed, 81 insertions(+), 75 deletions(-) diff --git a/src/video_core/renderer_vulkan/pipeline_helper.h b/src/video_core/renderer_vulkan/pipeline_helper.h index 28b893e25..983e1c2e1 100644 --- a/src/video_core/renderer_vulkan/pipeline_helper.h +++ b/src/video_core/renderer_vulkan/pipeline_helper.h @@ -176,7 +176,7 @@ public: }; inline void PushImageDescriptors(TextureCache& texture_cache, - UpdateDescriptorQueue& update_descriptor_queue, + GuestDescriptorQueue& guest_descriptor_queue, const Shader::Info& info, RescalingPushConstant& rescaling, const VkSampler*& samplers, const VideoCommon::ImageViewInOut*& views) { @@ -190,7 +190,7 @@ inline void PushImageDescriptors(TextureCache& texture_cache, const VkSampler sampler{*(samplers++)}; ImageView& image_view{texture_cache.GetImageView(image_view_id)}; const VkImageView vk_image_view{image_view.Handle(desc.type)}; - update_descriptor_queue.AddSampledImage(vk_image_view, sampler); + guest_descriptor_queue.AddSampledImage(vk_image_view, sampler); rescaling.PushTexture(texture_cache.IsRescaling(image_view)); } } @@ -201,7 +201,7 @@ inline void PushImageDescriptors(TextureCache& texture_cache, texture_cache.MarkModification(image_view.image_id); } const VkImageView vk_image_view{image_view.StorageView(desc.type, desc.format)}; - update_descriptor_queue.AddImage(vk_image_view); + guest_descriptor_queue.AddImage(vk_image_view); rescaling.PushImage(texture_cache.IsRescaling(image_view)); } } diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp index 510602e8e..9627eb129 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp @@ -298,12 +298,14 @@ private: BufferCacheRuntime::BufferCacheRuntime(const Device& device_, MemoryAllocator& memory_allocator_, Scheduler& scheduler_, StagingBufferPool& staging_pool_, - UpdateDescriptorQueue& update_descriptor_queue_, + GuestDescriptorQueue& guest_descriptor_queue_, + ComputePassDescriptorQueue& compute_pass_descriptor_queue, DescriptorPool& descriptor_pool) : device{device_}, memory_allocator{memory_allocator_}, scheduler{scheduler_}, - staging_pool{staging_pool_}, update_descriptor_queue{update_descriptor_queue_}, - uint8_pass(device, scheduler, descriptor_pool, staging_pool, update_descriptor_queue), - quad_index_pass(device, scheduler, descriptor_pool, staging_pool, update_descriptor_queue) { + staging_pool{staging_pool_}, guest_descriptor_queue{guest_descriptor_queue_}, + uint8_pass(device, scheduler, descriptor_pool, staging_pool, compute_pass_descriptor_queue), + quad_index_pass(device, scheduler, descriptor_pool, staging_pool, + compute_pass_descriptor_queue) { quad_array_index_buffer = std::make_shared(device_, memory_allocator_, scheduler_, staging_pool_); quad_strip_index_buffer = std::make_shared(device_, memory_allocator_, diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.h b/src/video_core/renderer_vulkan/vk_buffer_cache.h index 879f1ed94..5e9602905 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.h +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h @@ -63,7 +63,8 @@ class BufferCacheRuntime { public: explicit BufferCacheRuntime(const Device& device_, MemoryAllocator& memory_manager_, Scheduler& scheduler_, StagingBufferPool& staging_pool_, - UpdateDescriptorQueue& update_descriptor_queue_, + GuestDescriptorQueue& guest_descriptor_queue, + ComputePassDescriptorQueue& compute_pass_descriptor_queue, DescriptorPool& descriptor_pool); void Finish(); @@ -116,12 +117,12 @@ public: void BindTextureBuffer(Buffer& buffer, u32 offset, u32 size, VideoCore::Surface::PixelFormat format) { - update_descriptor_queue.AddTexelBuffer(buffer.View(offset, size, format)); + guest_descriptor_queue.AddTexelBuffer(buffer.View(offset, size, format)); } private: void BindBuffer(VkBuffer buffer, u32 offset, u32 size) { - update_descriptor_queue.AddBuffer(buffer, offset, size); + guest_descriptor_queue.AddBuffer(buffer, offset, size); } void ReserveNullBuffer(); @@ -130,7 +131,7 @@ private: MemoryAllocator& memory_allocator; Scheduler& scheduler; StagingBufferPool& staging_pool; - UpdateDescriptorQueue& update_descriptor_queue; + GuestDescriptorQueue& guest_descriptor_queue; std::shared_ptr quad_array_index_buffer; std::shared_ptr quad_strip_index_buffer; diff --git a/src/video_core/renderer_vulkan/vk_compute_pass.cpp b/src/video_core/renderer_vulkan/vk_compute_pass.cpp index 1a316b6eb..3bc8553e1 100644 --- a/src/video_core/renderer_vulkan/vk_compute_pass.cpp +++ b/src/video_core/renderer_vulkan/vk_compute_pass.cpp @@ -200,12 +200,12 @@ ComputePass::~ComputePass() = default; Uint8Pass::Uint8Pass(const Device& device_, Scheduler& scheduler_, DescriptorPool& descriptor_pool, StagingBufferPool& staging_buffer_pool_, - UpdateDescriptorQueue& update_descriptor_queue_) + ComputePassDescriptorQueue& compute_pass_descriptor_queue_) : ComputePass(device_, descriptor_pool, INPUT_OUTPUT_DESCRIPTOR_SET_BINDINGS, INPUT_OUTPUT_DESCRIPTOR_UPDATE_TEMPLATE, INPUT_OUTPUT_BANK_INFO, {}, VULKAN_UINT8_COMP_SPV), scheduler{scheduler_}, staging_buffer_pool{staging_buffer_pool_}, - update_descriptor_queue{update_descriptor_queue_} {} + compute_pass_descriptor_queue{compute_pass_descriptor_queue_} {} Uint8Pass::~Uint8Pass() = default; @@ -214,10 +214,10 @@ std::pair Uint8Pass::Assemble(u32 num_vertices, VkBuffer const u32 staging_size = static_cast(num_vertices * sizeof(u16)); const auto staging = staging_buffer_pool.Request(staging_size, MemoryUsage::DeviceLocal); - update_descriptor_queue.Acquire(); - update_descriptor_queue.AddBuffer(src_buffer, src_offset, num_vertices); - update_descriptor_queue.AddBuffer(staging.buffer, staging.offset, staging_size); - const void* const descriptor_data{update_descriptor_queue.UpdateData()}; + compute_pass_descriptor_queue.Acquire(); + compute_pass_descriptor_queue.AddBuffer(src_buffer, src_offset, num_vertices); + compute_pass_descriptor_queue.AddBuffer(staging.buffer, staging.offset, staging_size); + const void* const descriptor_data{compute_pass_descriptor_queue.UpdateData()}; scheduler.RequestOutsideRenderPassOperationContext(); scheduler.Record([this, descriptor_data, num_vertices](vk::CommandBuffer cmdbuf) { @@ -242,12 +242,12 @@ std::pair Uint8Pass::Assemble(u32 num_vertices, VkBuffer QuadIndexedPass::QuadIndexedPass(const Device& device_, Scheduler& scheduler_, DescriptorPool& descriptor_pool_, StagingBufferPool& staging_buffer_pool_, - UpdateDescriptorQueue& update_descriptor_queue_) + ComputePassDescriptorQueue& compute_pass_descriptor_queue_) : ComputePass(device_, descriptor_pool_, INPUT_OUTPUT_DESCRIPTOR_SET_BINDINGS, INPUT_OUTPUT_DESCRIPTOR_UPDATE_TEMPLATE, INPUT_OUTPUT_BANK_INFO, COMPUTE_PUSH_CONSTANT_RANGE, VULKAN_QUAD_INDEXED_COMP_SPV), scheduler{scheduler_}, staging_buffer_pool{staging_buffer_pool_}, - update_descriptor_queue{update_descriptor_queue_} {} + compute_pass_descriptor_queue{compute_pass_descriptor_queue_} {} QuadIndexedPass::~QuadIndexedPass() = default; @@ -272,10 +272,10 @@ std::pair QuadIndexedPass::Assemble( const std::size_t staging_size = num_tri_vertices * sizeof(u32); const auto staging = staging_buffer_pool.Request(staging_size, MemoryUsage::DeviceLocal); - update_descriptor_queue.Acquire(); - update_descriptor_queue.AddBuffer(src_buffer, src_offset, input_size); - update_descriptor_queue.AddBuffer(staging.buffer, staging.offset, staging_size); - const void* const descriptor_data{update_descriptor_queue.UpdateData()}; + compute_pass_descriptor_queue.Acquire(); + compute_pass_descriptor_queue.AddBuffer(src_buffer, src_offset, input_size); + compute_pass_descriptor_queue.AddBuffer(staging.buffer, staging.offset, staging_size); + const void* const descriptor_data{compute_pass_descriptor_queue.UpdateData()}; scheduler.RequestOutsideRenderPassOperationContext(); scheduler.Record([this, descriptor_data, num_tri_vertices, base_vertex, index_shift, @@ -304,13 +304,14 @@ std::pair QuadIndexedPass::Assemble( ASTCDecoderPass::ASTCDecoderPass(const Device& device_, Scheduler& scheduler_, DescriptorPool& descriptor_pool_, StagingBufferPool& staging_buffer_pool_, - UpdateDescriptorQueue& update_descriptor_queue_, + ComputePassDescriptorQueue& compute_pass_descriptor_queue_, MemoryAllocator& memory_allocator_) : ComputePass(device_, descriptor_pool_, ASTC_DESCRIPTOR_SET_BINDINGS, ASTC_PASS_DESCRIPTOR_UPDATE_TEMPLATE_ENTRY, ASTC_BANK_INFO, COMPUTE_PUSH_CONSTANT_RANGE, ASTC_DECODER_COMP_SPV), scheduler{scheduler_}, staging_buffer_pool{staging_buffer_pool_}, - update_descriptor_queue{update_descriptor_queue_}, memory_allocator{memory_allocator_} {} + compute_pass_descriptor_queue{compute_pass_descriptor_queue_}, memory_allocator{ + memory_allocator_} {} ASTCDecoderPass::~ASTCDecoderPass() = default; @@ -358,11 +359,11 @@ void ASTCDecoderPass::Assemble(Image& image, const StagingBufferRef& map, const u32 num_dispatches_y = Common::DivCeil(swizzle.num_tiles.height, 8U); const u32 num_dispatches_z = image.info.resources.layers; - update_descriptor_queue.Acquire(); - update_descriptor_queue.AddBuffer(map.buffer, input_offset, - image.guest_size_bytes - swizzle.buffer_offset); - update_descriptor_queue.AddImage(image.StorageImageView(swizzle.level)); - const void* const descriptor_data{update_descriptor_queue.UpdateData()}; + compute_pass_descriptor_queue.Acquire(); + compute_pass_descriptor_queue.AddBuffer(map.buffer, input_offset, + image.guest_size_bytes - swizzle.buffer_offset); + compute_pass_descriptor_queue.AddImage(image.StorageImageView(swizzle.level)); + const void* const descriptor_data{compute_pass_descriptor_queue.UpdateData()}; // To unswizzle the ASTC data const auto params = MakeBlockLinearSwizzle2DParams(swizzle, image.info); diff --git a/src/video_core/renderer_vulkan/vk_compute_pass.h b/src/video_core/renderer_vulkan/vk_compute_pass.h index c4c8fa081..dd3927376 100644 --- a/src/video_core/renderer_vulkan/vk_compute_pass.h +++ b/src/video_core/renderer_vulkan/vk_compute_pass.h @@ -9,6 +9,7 @@ #include "common/common_types.h" #include "video_core/engines/maxwell_3d.h" #include "video_core/renderer_vulkan/vk_descriptor_pool.h" +#include "video_core/renderer_vulkan/vk_update_descriptor.h" #include "video_core/vulkan_common/vulkan_memory_allocator.h" #include "video_core/vulkan_common/vulkan_wrapper.h" @@ -21,7 +22,6 @@ namespace Vulkan { class Device; class StagingBufferPool; class Scheduler; -class UpdateDescriptorQueue; class Image; struct StagingBufferRef; @@ -50,7 +50,7 @@ class Uint8Pass final : public ComputePass { public: explicit Uint8Pass(const Device& device_, Scheduler& scheduler_, DescriptorPool& descriptor_pool_, StagingBufferPool& staging_buffer_pool_, - UpdateDescriptorQueue& update_descriptor_queue_); + ComputePassDescriptorQueue& compute_pass_descriptor_queue_); ~Uint8Pass(); /// Assemble uint8 indices into an uint16 index buffer @@ -61,7 +61,7 @@ public: private: Scheduler& scheduler; StagingBufferPool& staging_buffer_pool; - UpdateDescriptorQueue& update_descriptor_queue; + ComputePassDescriptorQueue& compute_pass_descriptor_queue; }; class QuadIndexedPass final : public ComputePass { @@ -69,7 +69,7 @@ public: explicit QuadIndexedPass(const Device& device_, Scheduler& scheduler_, DescriptorPool& descriptor_pool_, StagingBufferPool& staging_buffer_pool_, - UpdateDescriptorQueue& update_descriptor_queue_); + ComputePassDescriptorQueue& compute_pass_descriptor_queue_); ~QuadIndexedPass(); std::pair Assemble( @@ -79,7 +79,7 @@ public: private: Scheduler& scheduler; StagingBufferPool& staging_buffer_pool; - UpdateDescriptorQueue& update_descriptor_queue; + ComputePassDescriptorQueue& compute_pass_descriptor_queue; }; class ASTCDecoderPass final : public ComputePass { @@ -87,7 +87,7 @@ public: explicit ASTCDecoderPass(const Device& device_, Scheduler& scheduler_, DescriptorPool& descriptor_pool_, StagingBufferPool& staging_buffer_pool_, - UpdateDescriptorQueue& update_descriptor_queue_, + ComputePassDescriptorQueue& compute_pass_descriptor_queue_, MemoryAllocator& memory_allocator_); ~ASTCDecoderPass(); @@ -97,7 +97,7 @@ public: private: Scheduler& scheduler; StagingBufferPool& staging_buffer_pool; - UpdateDescriptorQueue& update_descriptor_queue; + ComputePassDescriptorQueue& compute_pass_descriptor_queue; MemoryAllocator& memory_allocator; }; diff --git a/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp b/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp index 2a0f0dbf0..733e70d9d 100644 --- a/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp @@ -26,13 +26,13 @@ using Tegra::Texture::TexturePair; ComputePipeline::ComputePipeline(const Device& device_, vk::PipelineCache& pipeline_cache_, DescriptorPool& descriptor_pool, - UpdateDescriptorQueue& update_descriptor_queue_, + GuestDescriptorQueue& guest_descriptor_queue_, Common::ThreadWorker* thread_worker, PipelineStatistics* pipeline_statistics, VideoCore::ShaderNotify* shader_notify, const Shader::Info& info_, vk::ShaderModule spv_module_) - : device{device_}, pipeline_cache(pipeline_cache_), - update_descriptor_queue{update_descriptor_queue_}, info{info_}, + : device{device_}, + pipeline_cache(pipeline_cache_), guest_descriptor_queue{guest_descriptor_queue_}, info{info_}, spv_module(std::move(spv_module_)) { if (shader_notify) { shader_notify->MarkShaderBuilding(); @@ -99,7 +99,7 @@ ComputePipeline::ComputePipeline(const Device& device_, vk::PipelineCache& pipel void ComputePipeline::Configure(Tegra::Engines::KeplerCompute& kepler_compute, Tegra::MemoryManager& gpu_memory, Scheduler& scheduler, BufferCache& buffer_cache, TextureCache& texture_cache) { - update_descriptor_queue.Acquire(); + guest_descriptor_queue.Acquire(); buffer_cache.SetComputeUniformBufferState(info.constant_buffer_mask, &uniform_buffer_sizes); buffer_cache.UnbindComputeStorageBuffers(); @@ -194,7 +194,7 @@ void ComputePipeline::Configure(Tegra::Engines::KeplerCompute& kepler_compute, RescalingPushConstant rescaling; const VkSampler* samplers_it{samplers.data()}; const VideoCommon::ImageViewInOut* views_it{views.data()}; - PushImageDescriptors(texture_cache, update_descriptor_queue, info, rescaling, samplers_it, + PushImageDescriptors(texture_cache, guest_descriptor_queue, info, rescaling, samplers_it, views_it); if (!is_built.load(std::memory_order::relaxed)) { @@ -204,7 +204,7 @@ void ComputePipeline::Configure(Tegra::Engines::KeplerCompute& kepler_compute, build_condvar.wait(lock, [this] { return is_built.load(std::memory_order::relaxed); }); }); } - const void* const descriptor_data{update_descriptor_queue.UpdateData()}; + const void* const descriptor_data{guest_descriptor_queue.UpdateData()}; const bool is_rescaling = !info.texture_descriptors.empty() || !info.image_descriptors.empty(); scheduler.Record([this, descriptor_data, is_rescaling, rescaling_data = rescaling.Data()](vk::CommandBuffer cmdbuf) { diff --git a/src/video_core/renderer_vulkan/vk_compute_pipeline.h b/src/video_core/renderer_vulkan/vk_compute_pipeline.h index 78d77027f..d1a1e2c46 100644 --- a/src/video_core/renderer_vulkan/vk_compute_pipeline.h +++ b/src/video_core/renderer_vulkan/vk_compute_pipeline.h @@ -30,7 +30,7 @@ class ComputePipeline { public: explicit ComputePipeline(const Device& device, vk::PipelineCache& pipeline_cache, DescriptorPool& descriptor_pool, - UpdateDescriptorQueue& update_descriptor_queue, + GuestDescriptorQueue& guest_descriptor_queue, Common::ThreadWorker* thread_worker, PipelineStatistics* pipeline_statistics, VideoCore::ShaderNotify* shader_notify, const Shader::Info& info, @@ -48,7 +48,7 @@ public: private: const Device& device; vk::PipelineCache& pipeline_cache; - UpdateDescriptorQueue& update_descriptor_queue; + GuestDescriptorQueue& guest_descriptor_queue; Shader::Info info; VideoCommon::ComputeUniformBufferSizes uniform_buffer_sizes{}; diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index baedc4424..f1bcd5cd6 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -236,13 +236,13 @@ GraphicsPipeline::GraphicsPipeline( Scheduler& scheduler_, BufferCache& buffer_cache_, TextureCache& texture_cache_, vk::PipelineCache& pipeline_cache_, VideoCore::ShaderNotify* shader_notify, const Device& device_, DescriptorPool& descriptor_pool, - UpdateDescriptorQueue& update_descriptor_queue_, Common::ThreadWorker* worker_thread, + GuestDescriptorQueue& guest_descriptor_queue_, Common::ThreadWorker* worker_thread, PipelineStatistics* pipeline_statistics, RenderPassCache& render_pass_cache, const GraphicsPipelineCacheKey& key_, std::array stages, const std::array& infos) : key{key_}, device{device_}, texture_cache{texture_cache_}, buffer_cache{buffer_cache_}, pipeline_cache(pipeline_cache_), scheduler{scheduler_}, - update_descriptor_queue{update_descriptor_queue_}, spv_modules{std::move(stages)} { + guest_descriptor_queue{guest_descriptor_queue_}, spv_modules{std::move(stages)} { if (shader_notify) { shader_notify->MarkShaderBuilding(); } @@ -449,7 +449,7 @@ void GraphicsPipeline::ConfigureImpl(bool is_indexed) { buffer_cache.UpdateGraphicsBuffers(is_indexed); buffer_cache.BindHostGeometryBuffers(is_indexed); - update_descriptor_queue.Acquire(); + guest_descriptor_queue.Acquire(); RescalingPushConstant rescaling; RenderAreaPushConstant render_area; @@ -457,7 +457,7 @@ void GraphicsPipeline::ConfigureImpl(bool is_indexed) { const VideoCommon::ImageViewInOut* views_it{views.data()}; const auto prepare_stage{[&](size_t stage) LAMBDA_FORCEINLINE { buffer_cache.BindHostStageBuffers(stage); - PushImageDescriptors(texture_cache, update_descriptor_queue, stage_infos[stage], rescaling, + PushImageDescriptors(texture_cache, guest_descriptor_queue, stage_infos[stage], rescaling, samplers_it, views_it); const auto& info{stage_infos[0]}; if (info.uses_render_area) { @@ -499,7 +499,7 @@ void GraphicsPipeline::ConfigureDraw(const RescalingPushConstant& rescaling, const bool is_rescaling{texture_cache.IsRescaling()}; const bool update_rescaling{scheduler.UpdateRescaling(is_rescaling)}; const bool bind_pipeline{scheduler.UpdateGraphicsPipeline(this)}; - const void* const descriptor_data{update_descriptor_queue.UpdateData()}; + const void* const descriptor_data{guest_descriptor_queue.UpdateData()}; scheduler.Record([this, descriptor_data, bind_pipeline, rescaling_data = rescaling.Data(), is_rescaling, update_rescaling, uses_render_area = render_area.uses_render_area, diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.h b/src/video_core/renderer_vulkan/vk_graphics_pipeline.h index 67c657d0e..99e56e9ad 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.h +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.h @@ -64,7 +64,6 @@ class RenderPassCache; class RescalingPushConstant; class RenderAreaPushConstant; class Scheduler; -class UpdateDescriptorQueue; class GraphicsPipeline { static constexpr size_t NUM_STAGES = Tegra::Engines::Maxwell3D::Regs::MaxShaderStage; @@ -74,7 +73,7 @@ public: Scheduler& scheduler, BufferCache& buffer_cache, TextureCache& texture_cache, vk::PipelineCache& pipeline_cache, VideoCore::ShaderNotify* shader_notify, const Device& device, DescriptorPool& descriptor_pool, - UpdateDescriptorQueue& update_descriptor_queue, Common::ThreadWorker* worker_thread, + GuestDescriptorQueue& guest_descriptor_queue, Common::ThreadWorker* worker_thread, PipelineStatistics* pipeline_statistics, RenderPassCache& render_pass_cache, const GraphicsPipelineCacheKey& key, std::array stages, const std::array& infos); @@ -133,7 +132,7 @@ private: BufferCache& buffer_cache; vk::PipelineCache& pipeline_cache; Scheduler& scheduler; - UpdateDescriptorQueue& update_descriptor_queue; + GuestDescriptorQueue& guest_descriptor_queue; void (*configure_func)(GraphicsPipeline*, bool){}; diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index a318d643e..596996bec 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -277,11 +277,11 @@ bool GraphicsPipelineCacheKey::operator==(const GraphicsPipelineCacheKey& rhs) c PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, const Device& device_, Scheduler& scheduler_, DescriptorPool& descriptor_pool_, - UpdateDescriptorQueue& update_descriptor_queue_, + GuestDescriptorQueue& guest_descriptor_queue_, RenderPassCache& render_pass_cache_, BufferCache& buffer_cache_, TextureCache& texture_cache_, VideoCore::ShaderNotify& shader_notify_) : VideoCommon::ShaderCache{rasterizer_}, device{device_}, scheduler{scheduler_}, - descriptor_pool{descriptor_pool_}, update_descriptor_queue{update_descriptor_queue_}, + descriptor_pool{descriptor_pool_}, guest_descriptor_queue{guest_descriptor_queue_}, render_pass_cache{render_pass_cache_}, buffer_cache{buffer_cache_}, texture_cache{texture_cache_}, shader_notify{shader_notify_}, use_asynchronous_shaders{Settings::values.use_asynchronous_shaders.GetValue()}, @@ -643,7 +643,7 @@ std::unique_ptr PipelineCache::CreateGraphicsPipeline( Common::ThreadWorker* const thread_worker{build_in_parallel ? &workers : nullptr}; return std::make_unique( scheduler, buffer_cache, texture_cache, vulkan_pipeline_cache, &shader_notify, device, - descriptor_pool, update_descriptor_queue, thread_worker, statistics, render_pass_cache, key, + descriptor_pool, guest_descriptor_queue, thread_worker, statistics, render_pass_cache, key, std::move(modules), infos); } catch (const Shader::Exception& exception) { @@ -722,7 +722,7 @@ std::unique_ptr PipelineCache::CreateComputePipeline( } Common::ThreadWorker* const thread_worker{build_in_parallel ? &workers : nullptr}; return std::make_unique(device, vulkan_pipeline_cache, descriptor_pool, - update_descriptor_queue, thread_worker, statistics, + guest_descriptor_queue, thread_worker, statistics, &shader_notify, program.info, std::move(spv_module)); } catch (const Shader::Exception& exception) { diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.h b/src/video_core/renderer_vulkan/vk_pipeline_cache.h index 5171912d7..15aa7e224 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.h +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.h @@ -82,7 +82,6 @@ class PipelineStatistics; class RasterizerVulkan; class RenderPassCache; class Scheduler; -class UpdateDescriptorQueue; using VideoCommon::ShaderInfo; @@ -102,7 +101,7 @@ class PipelineCache : public VideoCommon::ShaderCache { public: explicit PipelineCache(RasterizerVulkan& rasterizer, const Device& device, Scheduler& scheduler, DescriptorPool& descriptor_pool, - UpdateDescriptorQueue& update_descriptor_queue, + GuestDescriptorQueue& guest_descriptor_queue, RenderPassCache& render_pass_cache, BufferCache& buffer_cache, TextureCache& texture_cache, VideoCore::ShaderNotify& shader_notify_); ~PipelineCache(); @@ -144,7 +143,7 @@ private: const Device& device; Scheduler& scheduler; DescriptorPool& descriptor_pool; - UpdateDescriptorQueue& update_descriptor_queue; + GuestDescriptorQueue& guest_descriptor_queue; RenderPassCache& render_pass_cache; BufferCache& buffer_cache; TextureCache& texture_cache; diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 628e1376f..64bd2f6a5 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -160,17 +160,16 @@ RasterizerVulkan::RasterizerVulkan(Core::Frontend::EmuWindow& emu_window_, Tegra : RasterizerAccelerated{cpu_memory_}, gpu{gpu_}, screen_info{screen_info_}, device{device_}, memory_allocator{memory_allocator_}, state_tracker{state_tracker_}, scheduler{scheduler_}, staging_pool(device, memory_allocator, scheduler), descriptor_pool(device, scheduler), - update_descriptor_queue(device, scheduler), - blit_image(device, scheduler, state_tracker, descriptor_pool), - render_pass_cache(device), texture_cache_runtime{device, scheduler, - memory_allocator, staging_pool, - blit_image, render_pass_cache, - descriptor_pool, update_descriptor_queue}, + guest_descriptor_queue(device, scheduler), compute_pass_descriptor_queue(device, scheduler), + blit_image(device, scheduler, state_tracker, descriptor_pool), render_pass_cache(device), + texture_cache_runtime{ + device, scheduler, memory_allocator, staging_pool, + blit_image, render_pass_cache, descriptor_pool, compute_pass_descriptor_queue}, texture_cache(texture_cache_runtime, *this), buffer_cache_runtime(device, memory_allocator, scheduler, staging_pool, - update_descriptor_queue, descriptor_pool), + guest_descriptor_queue, compute_pass_descriptor_queue, descriptor_pool), buffer_cache(*this, cpu_memory_, buffer_cache_runtime), - pipeline_cache(*this, device, scheduler, descriptor_pool, update_descriptor_queue, + pipeline_cache(*this, device, scheduler, descriptor_pool, guest_descriptor_queue, render_pass_cache, buffer_cache, texture_cache, gpu.ShaderNotify()), query_cache{*this, cpu_memory_, device, scheduler}, accelerate_dma(buffer_cache, texture_cache, scheduler), @@ -669,7 +668,8 @@ void RasterizerVulkan::FlushCommands() { void RasterizerVulkan::TickFrame() { draw_counter = 0; - update_descriptor_queue.TickFrame(); + guest_descriptor_queue.TickFrame(); + compute_pass_descriptor_queue.TickFrame(); fence_manager.TickFrame(); staging_pool.TickFrame(); { diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.h b/src/video_core/renderer_vulkan/vk_rasterizer.h index 9bd422850..b39710b3c 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.h +++ b/src/video_core/renderer_vulkan/vk_rasterizer.h @@ -184,7 +184,8 @@ private: StagingBufferPool staging_pool; DescriptorPool descriptor_pool; - UpdateDescriptorQueue update_descriptor_queue; + GuestDescriptorQueue guest_descriptor_queue; + ComputePassDescriptorQueue compute_pass_descriptor_queue; BlitImageHelper blit_image; RenderPassCache render_pass_cache; diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index 9ca7751c5..012d6fa73 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -798,13 +798,13 @@ TextureCacheRuntime::TextureCacheRuntime(const Device& device_, Scheduler& sched BlitImageHelper& blit_image_helper_, RenderPassCache& render_pass_cache_, DescriptorPool& descriptor_pool, - UpdateDescriptorQueue& update_descriptor_queue) + ComputePassDescriptorQueue& compute_pass_descriptor_queue) : device{device_}, scheduler{scheduler_}, memory_allocator{memory_allocator_}, staging_buffer_pool{staging_buffer_pool_}, blit_image_helper{blit_image_helper_}, render_pass_cache{render_pass_cache_}, resolution{Settings::values.resolution_info} { if (Settings::values.accelerate_astc) { astc_decoder_pass.emplace(device, scheduler, descriptor_pool, staging_buffer_pool, - update_descriptor_queue, memory_allocator); + compute_pass_descriptor_queue, memory_allocator); } } diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index 6f360177a..23473bf9c 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h @@ -34,7 +34,6 @@ class ImageView; class Framebuffer; class RenderPassCache; class StagingBufferPool; -class UpdateDescriptorQueue; class Scheduler; class TextureCacheRuntime { @@ -45,7 +44,7 @@ public: BlitImageHelper& blit_image_helper_, RenderPassCache& render_pass_cache_, DescriptorPool& descriptor_pool, - UpdateDescriptorQueue& update_descriptor_queue); + ComputePassDescriptorQueue& compute_pass_descriptor_queue); void Finish(); diff --git a/src/video_core/renderer_vulkan/vk_update_descriptor.h b/src/video_core/renderer_vulkan/vk_update_descriptor.h index 1c1a7020b..310fb551a 100644 --- a/src/video_core/renderer_vulkan/vk_update_descriptor.h +++ b/src/video_core/renderer_vulkan/vk_update_descriptor.h @@ -32,7 +32,7 @@ class UpdateDescriptorQueue final { // This should be plenty for the vast majority of cases. Most desktop platforms only // provide up to 3 swapchain images. static constexpr size_t FRAMES_IN_FLIGHT = 5; - static constexpr size_t FRAME_PAYLOAD_SIZE = 0x10000; + static constexpr size_t FRAME_PAYLOAD_SIZE = 0x20000; static constexpr size_t PAYLOAD_SIZE = FRAME_PAYLOAD_SIZE * FRAMES_IN_FLIGHT; public: @@ -86,4 +86,8 @@ private: std::array payload; }; +// TODO: should these be separate classes instead? +using GuestDescriptorQueue = UpdateDescriptorQueue; +using ComputePassDescriptorQueue = UpdateDescriptorQueue; + } // namespace Vulkan From ceb65c259a8aeb3e5aabe8a94235073c9e1e1c80 Mon Sep 17 00:00:00 2001 From: grimkor Date: Fri, 28 Apr 2023 17:42:18 +0100 Subject: [PATCH 0374/1181] Allow fully customisable controller hotkeys --- src/yuzu/configuration/configure_hotkeys.cpp | 65 ++++++++++++-------- src/yuzu/configuration/configure_hotkeys.h | 2 +- src/yuzu/main.cpp | 18 ++++-- src/yuzu/main.h | 3 +- 4 files changed, 56 insertions(+), 32 deletions(-) diff --git a/src/yuzu/configuration/configure_hotkeys.cpp b/src/yuzu/configuration/configure_hotkeys.cpp index daa77a8f8..0b2a965f8 100644 --- a/src/yuzu/configuration/configure_hotkeys.cpp +++ b/src/yuzu/configuration/configure_hotkeys.cpp @@ -48,7 +48,9 @@ ConfigureHotkeys::ConfigureHotkeys(Core::HID::HIDCore& hid_core, QWidget* parent connect(poll_timer.get(), &QTimer::timeout, [this] { const auto buttons = controller->GetNpadButtons(); - if (buttons.raw != Core::HID::NpadButton::None) { + const auto home_pressed = controller->GetHomeButtons().home != 0; + const auto capture_pressed = controller->GetCaptureButtons().capture != 0; + if (home_pressed || capture_pressed) { SetPollingResult(buttons.raw, false); return; } @@ -154,8 +156,10 @@ void ConfigureHotkeys::ConfigureController(QModelIndex index) { model->setData(index, previous_key); return; } - - const QString button_string = tr("Home+%1").arg(GetButtonName(button)); + const auto home_pressed = this->controller->GetHomeButtons().home != 0; + const auto capture_pressed = this->controller->GetCaptureButtons().capture != 0; + const QString button_string = + GetButtonCombinationName(button, home_pressed, capture_pressed); const auto [key_sequence_used, used_action] = IsUsedControllerKey(button_string); @@ -174,72 +178,83 @@ void ConfigureHotkeys::ConfigureController(QModelIndex index) { poll_timer->start(200); // Check for new inputs every 200ms // We need to disable configuration to be able to read npad buttons controller->DisableConfiguration(); - controller->DisableSystemButtons(); } void ConfigureHotkeys::SetPollingResult(Core::HID::NpadButton button, const bool cancel) { timeout_timer->stop(); poll_timer->stop(); + (*input_setter)(button, cancel); // Re-Enable configuration controller->EnableConfiguration(); - controller->EnableSystemButtons(); - - (*input_setter)(button, cancel); input_setter = std::nullopt; } -QString ConfigureHotkeys::GetButtonName(Core::HID::NpadButton button) const { +QString ConfigureHotkeys::GetButtonCombinationName(Core::HID::NpadButton button, + const bool home = false, + const bool capture = false) const { Core::HID::NpadButtonState state{button}; + QString button_combination; + if (home) { + button_combination.append(QStringLiteral("Home+")); + } + if (capture) { + button_combination.append(QStringLiteral("Screenshot+")); + } if (state.a) { - return QStringLiteral("A"); + button_combination.append(QStringLiteral("A+")); } if (state.b) { - return QStringLiteral("B"); + button_combination.append(QStringLiteral("B+")); } if (state.x) { - return QStringLiteral("X"); + button_combination.append(QStringLiteral("X+")); } if (state.y) { - return QStringLiteral("Y"); + button_combination.append(QStringLiteral("Y+")); } if (state.l || state.right_sl || state.left_sl) { - return QStringLiteral("L"); + button_combination.append(QStringLiteral("L+")); } if (state.r || state.right_sr || state.left_sr) { - return QStringLiteral("R"); + button_combination.append(QStringLiteral("R+")); } if (state.zl) { - return QStringLiteral("ZL"); + button_combination.append(QStringLiteral("ZL+")); } if (state.zr) { - return QStringLiteral("ZR"); + button_combination.append(QStringLiteral("ZR+")); } if (state.left) { - return QStringLiteral("Dpad_Left"); + button_combination.append(QStringLiteral("Dpad_Left+")); } if (state.right) { - return QStringLiteral("Dpad_Right"); + button_combination.append(QStringLiteral("Dpad_Right+")); } if (state.up) { - return QStringLiteral("Dpad_Up"); + button_combination.append(QStringLiteral("Dpad_Up+")); } if (state.down) { - return QStringLiteral("Dpad_Down"); + button_combination.append(QStringLiteral("Dpad_Down+")); } if (state.stick_l) { - return QStringLiteral("Left_Stick"); + button_combination.append(QStringLiteral("Left_Stick+")); } if (state.stick_r) { - return QStringLiteral("Right_Stick"); + button_combination.append(QStringLiteral("Right_Stick+")); } if (state.minus) { - return QStringLiteral("Minus"); + button_combination.append(QStringLiteral("Minus+")); } if (state.plus) { - return QStringLiteral("Plus"); + button_combination.append(QStringLiteral("Plus+")); + } + if (button_combination.isEmpty()) { + return tr("Invalid"); + } else { + button_combination.chop(1); + return button_combination; } - return tr("Invalid"); } std::pair ConfigureHotkeys::IsUsedKey(QKeySequence key_sequence) const { diff --git a/src/yuzu/configuration/configure_hotkeys.h b/src/yuzu/configuration/configure_hotkeys.h index e8e414320..5fd1bcbfe 100644 --- a/src/yuzu/configuration/configure_hotkeys.h +++ b/src/yuzu/configuration/configure_hotkeys.h @@ -59,7 +59,7 @@ private: QStandardItemModel* model; void SetPollingResult(Core::HID::NpadButton button, bool cancel); - QString GetButtonName(Core::HID::NpadButton button) const; + QString GetButtonCombinationName(Core::HID::NpadButton button, bool home, bool capture) const; Core::HID::EmulatedController* controller; std::unique_ptr timeout_timer; std::unique_ptr poll_timer; diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index b79409a68..519a2906f 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1163,7 +1163,8 @@ void GMainWindow::InitializeRecentFileMenuActions() { UpdateRecentFiles(); } -void GMainWindow::LinkActionShortcut(QAction* action, const QString& action_name) { +void GMainWindow::LinkActionShortcut(QAction* action, const QString& action_name, + const bool tas_allowed) { static const QString main_window = QStringLiteral("Main Window"); action->setShortcut(hotkey_registry.GetKeySequence(main_window, action_name)); action->setShortcutContext(hotkey_registry.GetShortcutContext(main_window, action_name)); @@ -1175,7 +1176,14 @@ void GMainWindow::LinkActionShortcut(QAction* action, const QString& action_name const auto* controller_hotkey = hotkey_registry.GetControllerHotkey(main_window, action_name, controller); connect( - controller_hotkey, &ControllerShortcut::Activated, this, [action] { action->trigger(); }, + controller_hotkey, &ControllerShortcut::Activated, this, + [action, tas_allowed, this] { + auto [tas_status, current_tas_frame, total_tas_frames] = + input_subsystem->GetTas()->GetStatus(); + if (tas_allowed || tas_status == InputCommon::TasInput::TasState::Stopped) { + action->trigger(); + } + }, Qt::QueuedConnection); } @@ -1192,9 +1200,9 @@ void GMainWindow::InitializeHotkeys() { LinkActionShortcut(ui->action_Show_Status_Bar, QStringLiteral("Toggle Status Bar")); LinkActionShortcut(ui->action_Fullscreen, QStringLiteral("Fullscreen")); LinkActionShortcut(ui->action_Capture_Screenshot, QStringLiteral("Capture Screenshot")); - LinkActionShortcut(ui->action_TAS_Start, QStringLiteral("TAS Start/Stop")); - LinkActionShortcut(ui->action_TAS_Record, QStringLiteral("TAS Record")); - LinkActionShortcut(ui->action_TAS_Reset, QStringLiteral("TAS Reset")); + LinkActionShortcut(ui->action_TAS_Start, QStringLiteral("TAS Start/Stop"), true); + LinkActionShortcut(ui->action_TAS_Record, QStringLiteral("TAS Record"), true); + LinkActionShortcut(ui->action_TAS_Reset, QStringLiteral("TAS Reset"), true); static const QString main_window = QStringLiteral("Main Window"); const auto connect_shortcut = [&](const QString& action_name, const Fn& function) { diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 8b5c1d747..71d78a3db 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -214,7 +214,8 @@ public slots: private: /// Updates an action's shortcut and text to reflect an updated hotkey from the hotkey registry. - void LinkActionShortcut(QAction* action, const QString& action_name); + void LinkActionShortcut(QAction* action, const QString& action_name, + const bool tas_allowed = false); void RegisterMetaTypes(); From 2fe922aae55f23023f94d27210aa0520c98893da Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 10 May 2023 15:52:30 -0700 Subject: [PATCH 0375/1181] Update README.md to remove Skyline license exception. --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 7f0461e5e..fd705ad70 100644 --- a/README.md +++ b/README.md @@ -83,5 +83,3 @@ If you wish to support us a different way, please join our [Discord](https://dis ## License yuzu is licensed under the GPLv3 (or any later version). Refer to the [LICENSE.txt](https://github.com/yuzu-emu/yuzu/blob/master/LICENSE.txt) file. - -The [Skyline-Emulator Team](https://github.com/skyline-emu/skyline) may choose to use the code from these contributors under the GPL-3.0-or-later OR MPL-2.0: [FernandoS27](https://github.com/FernandoS27), [lioncash](https://github.com/lioncash), [bunnei](https://github.com/bunnei), [ReinUsesLisp](https://github.com/ReinUsesLisp), [Morph1984](https://github.com/Morph1984), [ogniK5377](https://github.com/ogniK5377), [german77](https://github.com/german77), [ameerj](https://github.com/ameerj), [Kelebek1](https://github.com/Kelebek1) and [lat9nq](https://github.com/lat9nq) From bf08bc3c0fe7dc6c3ebc32861d954c0ea7598a5e Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Mon, 1 May 2023 18:46:03 +0100 Subject: [PATCH 0376/1181] Allow Fermi blit accelerate to add src/dst to the cache if they don't exist already. Use ScratchBuffers in the software blit path. --- src/common/scratch_buffer.h | 9 +++++++ src/video_core/engines/sw_blitter/blitter.cpp | 25 +++++++++++-------- src/video_core/texture_cache/texture_cache.h | 2 +- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/common/scratch_buffer.h b/src/common/scratch_buffer.h index 26d4e76dc..a69a5a7af 100644 --- a/src/common/scratch_buffer.h +++ b/src/common/scratch_buffer.h @@ -23,7 +23,10 @@ public: buffer{Common::make_unique_for_overwrite(initial_capacity)} {} ~ScratchBuffer() = default; + ScratchBuffer(const ScratchBuffer&) = delete; + ScratchBuffer& operator=(const ScratchBuffer&) = delete; ScratchBuffer(ScratchBuffer&&) = default; + ScratchBuffer& operator=(ScratchBuffer&&) = default; /// This will only grow the buffer's capacity if size is greater than the current capacity. /// The previously held data will remain intact. @@ -87,6 +90,12 @@ public: return buffer_capacity; } + void swap(ScratchBuffer& other) noexcept { + std::swap(last_requested_size, other.last_requested_size); + std::swap(buffer_capacity, other.buffer_capacity); + std::swap(buffer, other.buffer); + } + private: size_t last_requested_size{}; size_t buffer_capacity{}; diff --git a/src/video_core/engines/sw_blitter/blitter.cpp b/src/video_core/engines/sw_blitter/blitter.cpp index 3c9f38559..ff88cd03d 100644 --- a/src/video_core/engines/sw_blitter/blitter.cpp +++ b/src/video_core/engines/sw_blitter/blitter.cpp @@ -5,6 +5,7 @@ #include #include +#include "common/scratch_buffer.h" #include "video_core/engines/sw_blitter/blitter.h" #include "video_core/engines/sw_blitter/converter.h" #include "video_core/memory_manager.h" @@ -112,11 +113,11 @@ void Bilinear(std::span input, std::span output, size_t src_widt } // namespace struct SoftwareBlitEngine::BlitEngineImpl { - std::vector tmp_buffer; - std::vector src_buffer; - std::vector dst_buffer; - std::vector intermediate_src; - std::vector intermediate_dst; + Common::ScratchBuffer tmp_buffer; + Common::ScratchBuffer src_buffer; + Common::ScratchBuffer dst_buffer; + Common::ScratchBuffer intermediate_src; + Common::ScratchBuffer intermediate_dst; ConverterFactory converter_factory; }; @@ -158,14 +159,14 @@ bool SoftwareBlitEngine::Blit(Fermi2D::Surface& src, Fermi2D::Surface& dst, const auto src_bytes_per_pixel = BytesPerBlock(PixelFormatFromRenderTargetFormat(src.format)); const auto dst_bytes_per_pixel = BytesPerBlock(PixelFormatFromRenderTargetFormat(dst.format)); const size_t src_size = get_surface_size(src, src_bytes_per_pixel); - impl->tmp_buffer.resize(src_size); + impl->tmp_buffer.resize_destructive(src_size); memory_manager.ReadBlock(src.Address(), impl->tmp_buffer.data(), src_size); const size_t src_copy_size = src_extent_x * src_extent_y * src_bytes_per_pixel; const size_t dst_copy_size = dst_extent_x * dst_extent_y * dst_bytes_per_pixel; - impl->src_buffer.resize(src_copy_size); + impl->src_buffer.resize_destructive(src_copy_size); const bool no_passthrough = src.format != dst.format || src_extent_x != dst_extent_x || src_extent_y != dst_extent_y; @@ -177,8 +178,10 @@ bool SoftwareBlitEngine::Blit(Fermi2D::Surface& src, Fermi2D::Surface& dst, const auto convertion_phase_ir = [&]() { auto* input_converter = impl->converter_factory.GetFormatConverter(src.format); - impl->intermediate_src.resize((src_copy_size / src_bytes_per_pixel) * ir_components); - impl->intermediate_dst.resize((dst_copy_size / dst_bytes_per_pixel) * ir_components); + impl->intermediate_src.resize_destructive((src_copy_size / src_bytes_per_pixel) * + ir_components); + impl->intermediate_dst.resize_destructive((dst_copy_size / dst_bytes_per_pixel) * + ir_components); input_converter->ConvertTo(impl->src_buffer, impl->intermediate_src); if (config.filter != Fermi2D::Filter::Bilinear) { @@ -195,7 +198,7 @@ bool SoftwareBlitEngine::Blit(Fermi2D::Surface& src, Fermi2D::Surface& dst, // Do actual Blit - impl->dst_buffer.resize(dst_copy_size); + impl->dst_buffer.resize_destructive(dst_copy_size); if (src.linear == Fermi2D::MemoryLayout::BlockLinear) { UnswizzleSubrect(impl->src_buffer, impl->tmp_buffer, src_bytes_per_pixel, src.width, src.height, src.depth, config.src_x0, config.src_y0, src_extent_x, @@ -218,7 +221,7 @@ bool SoftwareBlitEngine::Blit(Fermi2D::Surface& src, Fermi2D::Surface& dst, } const size_t dst_size = get_surface_size(dst, dst_bytes_per_pixel); - impl->tmp_buffer.resize(dst_size); + impl->tmp_buffer.resize_destructive(dst_size); memory_manager.ReadBlock(dst.Address(), impl->tmp_buffer.data(), dst_size); if (dst.linear == Fermi2D::MemoryLayout::BlockLinear) { diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index e1198dcf8..b24086fce 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1469,7 +1469,7 @@ std::optional::BlitImages> TextureCache

::GetBlitImag if (!copy.must_accelerate) { do { if (!src_id && !dst_id) { - return std::nullopt; + break; } if (src_id && True(slot_images[src_id].flags & ImageFlagBits::GpuModified)) { break; From e42b4a16b6024c18e860c17c5c33d28f4dc37c58 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Thu, 11 May 2023 19:25:24 +0100 Subject: [PATCH 0377/1181] Fix Tears of the Kingdom flickering clouds and depths. --- .../backend/spirv/emit_spirv_context_get_set.cpp | 8 ++------ .../maxwell/translate/impl/texture_mipmap_level.cpp | 7 +------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp index fee510f7b..07c2b7b8a 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp @@ -339,9 +339,7 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, Id vertex) { if (ctx.profile.support_vertex_instance_id) { return ctx.OpBitcast(ctx.F32[1], ctx.OpLoad(ctx.U32[1], ctx.vertex_id)); } else { - const Id index{ctx.OpLoad(ctx.U32[1], ctx.vertex_index)}; - const Id base{ctx.OpLoad(ctx.U32[1], ctx.base_vertex)}; - return ctx.OpBitcast(ctx.F32[1], ctx.OpISub(ctx.U32[1], index, base)); + return ctx.OpBitcast(ctx.F32[1], ctx.OpLoad(ctx.U32[1], ctx.vertex_index)); } case IR::Attribute::BaseInstance: return ctx.OpBitcast(ctx.F32[1], ctx.OpLoad(ctx.U32[1], ctx.base_instance)); @@ -386,9 +384,7 @@ Id EmitGetAttributeU32(EmitContext& ctx, IR::Attribute attr, Id) { if (ctx.profile.support_vertex_instance_id) { return ctx.OpLoad(ctx.U32[1], ctx.vertex_id); } else { - const Id index{ctx.OpLoad(ctx.U32[1], ctx.vertex_index)}; - const Id base{ctx.OpLoad(ctx.U32[1], ctx.base_vertex)}; - return ctx.OpISub(ctx.U32[1], index, base); + return ctx.OpLoad(ctx.U32[1], ctx.vertex_index); } case IR::Attribute::BaseInstance: return ctx.OpLoad(ctx.U32[1], ctx.base_instance); diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/texture_mipmap_level.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/texture_mipmap_level.cpp index 639da1e9c..eeb49444f 100644 --- a/src/shader_recompiler/frontend/maxwell/translate/impl/texture_mipmap_level.cpp +++ b/src/shader_recompiler/frontend/maxwell/translate/impl/texture_mipmap_level.cpp @@ -102,12 +102,7 @@ void Impl(TranslatorVisitor& v, u64 insn, bool is_bindless) { } IR::F32 value{v.ir.CompositeExtract(sample, element)}; if (element < 2) { - IR::U32 casted_value; - if (element == 0) { - casted_value = v.ir.ConvertFToU(32, value); - } else { - casted_value = v.ir.ConvertFToS(16, value); - } + IR::U32 casted_value = v.ir.ConvertFToU(32, value); v.X(dest_reg, v.ir.ShiftLeftLogical(casted_value, v.ir.Imm32(8))); } else { v.F(dest_reg, value); From 6e10a0c1305f4210f725da03cfc5ebc4e34a672c Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 11 May 2023 17:08:14 -0400 Subject: [PATCH 0378/1181] nvnflinger: fix producer slot fence init --- src/core/hle/service/nvnflinger/buffer_queue_producer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp b/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp index cd0a13094..c9e9fedd1 100644 --- a/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp +++ b/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp @@ -793,6 +793,7 @@ Status BufferQueueProducer::SetPreallocatedBuffer(s32 slot, std::scoped_lock lock{core->mutex}; slots[slot] = {}; + slots[slot].fence = Fence::NoFence(); slots[slot].graphic_buffer = buffer; slots[slot].frame_number = 0; From bb94beed15a4b95a896dfd68160e386c0be7b063 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 11 May 2023 17:09:19 -0400 Subject: [PATCH 0379/1181] nvnflinger: fix Parcel serialization --- .../nvnflinger/buffer_queue_producer.cpp | 4 +- src/core/hle/service/nvnflinger/parcel.h | 76 ++++++++++--------- src/core/hle/service/vi/vi.cpp | 12 ++- 3 files changed, 51 insertions(+), 41 deletions(-) diff --git a/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp b/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp index c9e9fedd1..b16f9933f 100644 --- a/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp +++ b/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp @@ -855,7 +855,7 @@ void BufferQueueProducer::Transact(HLERequestContext& ctx, TransactionId code, u status = DequeueBuffer(&slot, &fence, is_async, width, height, pixel_format, usage); parcel_out.Write(slot); - parcel_out.WriteObject(&fence); + parcel_out.WriteFlattenedObject(&fence); break; } case TransactionId::RequestBuffer: { @@ -865,7 +865,7 @@ void BufferQueueProducer::Transact(HLERequestContext& ctx, TransactionId code, u status = RequestBuffer(slot, &buf); - parcel_out.WriteObject(buf); + parcel_out.WriteFlattenedObject(buf); break; } case TransactionId::QueueBuffer: { diff --git a/src/core/hle/service/nvnflinger/parcel.h b/src/core/hle/service/nvnflinger/parcel.h index d1b6201e0..fb56d75d7 100644 --- a/src/core/hle/service/nvnflinger/parcel.h +++ b/src/core/hle/service/nvnflinger/parcel.h @@ -117,61 +117,67 @@ private: class OutputParcel final { public: - static constexpr std::size_t DefaultBufferSize = 0x40; - - OutputParcel() : buffer(DefaultBufferSize) {} - - template - explicit OutputParcel(const T& out_data) : buffer(DefaultBufferSize) { - Write(out_data); - } + OutputParcel() = default; template void Write(const T& val) { - static_assert(std::is_trivially_copyable_v, "T must be trivially copyable."); - - if (buffer.size() < write_index + sizeof(T)) { - buffer.resize(buffer.size() + sizeof(T) + DefaultBufferSize); - } - - std::memcpy(buffer.data() + write_index, &val, sizeof(T)); - write_index += sizeof(T); - write_index = Common::AlignUp(write_index, 4); + this->WriteImpl(val, m_data_buffer); } template - void WriteObject(const T* ptr) { - static_assert(std::is_trivially_copyable_v, "T must be trivially copyable."); - + void WriteFlattenedObject(const T* ptr) { if (!ptr) { - Write(0); + this->Write(0); return; } - Write(1); - Write(sizeof(T)); - Write(*ptr); + this->Write(1); + this->Write(sizeof(T)); + this->Write(*ptr); } template - void WriteObject(const std::shared_ptr ptr) { - WriteObject(ptr.get()); + void WriteFlattenedObject(const std::shared_ptr ptr) { + this->WriteFlattenedObject(ptr.get()); + } + + template + void WriteInterface(const T& val) { + this->WriteImpl(val, m_data_buffer); + this->WriteImpl(0U, m_object_buffer); } std::vector Serialize() const { - ParcelHeader header{}; - header.data_size = static_cast(write_index - sizeof(ParcelHeader)); - header.data_offset = sizeof(ParcelHeader); - header.objects_size = 4; - header.objects_offset = static_cast(sizeof(ParcelHeader) + header.data_size); - std::memcpy(buffer.data(), &header, sizeof(ParcelHeader)); + std::vector output_buffer(sizeof(ParcelHeader) + m_data_buffer.size() + + m_object_buffer.size()); - return buffer; + ParcelHeader header{}; + header.data_size = static_cast(m_data_buffer.size()); + header.data_offset = sizeof(ParcelHeader); + header.objects_size = static_cast(m_object_buffer.size()); + header.objects_offset = header.data_offset + header.data_size; + + std::memcpy(output_buffer.data(), &header, sizeof(header)); + std::ranges::copy(m_data_buffer, output_buffer.data() + header.data_offset); + std::ranges::copy(m_object_buffer, output_buffer.data() + header.objects_offset); + + return output_buffer; } private: - mutable std::vector buffer; - std::size_t write_index = sizeof(ParcelHeader); + template + requires(std::is_trivially_copyable_v) + void WriteImpl(const T& val, std::vector& buffer) { + const size_t aligned_size = Common::AlignUp(sizeof(T), 4); + const size_t old_size = buffer.size(); + buffer.resize(old_size + aligned_size); + + std::memcpy(buffer.data() + old_size, &val, sizeof(T)); + } + +private: + std::vector m_data_buffer; + std::vector m_object_buffer; }; } // namespace Service::android diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index 68eab5133..1b193f00c 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -64,8 +64,8 @@ public: private: const u32 magic = 2; const u32 process_id = 1; - const u32 id; - INSERT_PADDING_WORDS(3); + const u64 id; + INSERT_PADDING_WORDS(2); std::array dispdrv = {'d', 'i', 's', 'p', 'd', 'r', 'v', '\0'}; INSERT_PADDING_WORDS(2); }; @@ -608,7 +608,9 @@ private: return; } - const auto parcel = android::OutputParcel{NativeWindow{*buffer_queue_id}}; + android::OutputParcel parcel; + parcel.WriteInterface(NativeWindow{*buffer_queue_id}); + const auto buffer_size = ctx.WriteBuffer(parcel.Serialize()); IPC::ResponseBuilder rb{ctx, 4}; @@ -654,7 +656,9 @@ private: return; } - const auto parcel = android::OutputParcel{NativeWindow{*buffer_queue_id}}; + android::OutputParcel parcel; + parcel.WriteInterface(NativeWindow{*buffer_queue_id}); + const auto buffer_size = ctx.WriteBuffer(parcel.Serialize()); IPC::ResponseBuilder rb{ctx, 6}; From 13e4ceb9909fc15310c2e5d08ca008c06c8cbb70 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 11 May 2023 17:10:45 -0400 Subject: [PATCH 0380/1181] fs: stub cache storage and fix params alignment --- src/core/hle/service/filesystem/fsp_srv.cpp | 21 ++++++++++++++++----- src/core/hle/service/filesystem/fsp_srv.h | 1 + 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index 9e559d97e..3a142f5d0 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp_srv.cpp @@ -24,8 +24,10 @@ #include "core/file_sys/savedata_factory.h" #include "core/file_sys/system_archive/system_archive.h" #include "core/file_sys/vfs.h" +#include "core/hle/result.h" #include "core/hle/service/filesystem/filesystem.h" #include "core/hle/service/filesystem/fsp_srv.h" +#include "core/hle/service/hle_ipc.h" #include "core/hle/service/ipc_helpers.h" #include "core/reporter.h" @@ -308,8 +310,8 @@ private: class IFileSystem final : public ServiceFramework { public: explicit IFileSystem(Core::System& system_, FileSys::VirtualDir backend_, SizeGetter size_) - : ServiceFramework{system_, "IFileSystem"}, backend{std::move(backend_)}, size{std::move( - size_)} { + : ServiceFramework{system_, "IFileSystem"}, backend{std::move(backend_)}, + size{std::move(size_)} { static const FunctionInfo functions[] = { {0, &IFileSystem::CreateFile, "CreateFile"}, {1, &IFileSystem::DeleteFile, "DeleteFile"}, @@ -552,9 +554,9 @@ public: // Write the data to memory ctx.WriteBuffer(begin, range_size); - IPC::ResponseBuilder rb{ctx, 3}; + IPC::ResponseBuilder rb{ctx, 4}; rb.Push(ResultSuccess); - rb.Push(static_cast(actual_entries)); + rb.Push(actual_entries); } private: @@ -712,7 +714,7 @@ FSP_SRV::FSP_SRV(Core::System& system_) {59, nullptr, "WriteSaveDataFileSystemExtraData"}, {60, nullptr, "OpenSaveDataInfoReader"}, {61, &FSP_SRV::OpenSaveDataInfoReaderBySaveDataSpaceId, "OpenSaveDataInfoReaderBySaveDataSpaceId"}, - {62, nullptr, "OpenCacheStorageList"}, + {62, &FSP_SRV::OpenSaveDataInfoReaderOnlyCacheStorage, "OpenSaveDataInfoReaderOnlyCacheStorage"}, {64, nullptr, "OpenSaveDataInternalStorageFileSystem"}, {65, nullptr, "UpdateSaveDataMacForDebug"}, {66, nullptr, "WriteSaveDataFileSystemExtraData2"}, @@ -921,6 +923,15 @@ void FSP_SRV::OpenSaveDataInfoReaderBySaveDataSpaceId(HLERequestContext& ctx) { std::make_shared(system, space, fsc)); } +void FSP_SRV::OpenSaveDataInfoReaderOnlyCacheStorage(HLERequestContext& ctx) { + LOG_WARNING(Service_FS, "(STUBBED) called"); + + IPC::ResponseBuilder rb{ctx, 2, 0, 1}; + rb.Push(ResultSuccess); + rb.PushIpcInterface(system, FileSys::SaveDataSpaceId::TemporaryStorage, + fsc); +} + void FSP_SRV::WriteSaveDataFileSystemExtraDataBySaveDataAttribute(HLERequestContext& ctx) { LOG_WARNING(Service_FS, "(STUBBED) called."); diff --git a/src/core/hle/service/filesystem/fsp_srv.h b/src/core/hle/service/filesystem/fsp_srv.h index 49f17c7c3..4f3c2f6de 100644 --- a/src/core/hle/service/filesystem/fsp_srv.h +++ b/src/core/hle/service/filesystem/fsp_srv.h @@ -42,6 +42,7 @@ private: void OpenSaveDataFileSystem(HLERequestContext& ctx); void OpenReadOnlySaveDataFileSystem(HLERequestContext& ctx); void OpenSaveDataInfoReaderBySaveDataSpaceId(HLERequestContext& ctx); + void OpenSaveDataInfoReaderOnlyCacheStorage(HLERequestContext& ctx); void WriteSaveDataFileSystemExtraDataBySaveDataAttribute(HLERequestContext& ctx); void ReadSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute(HLERequestContext& ctx); void OpenDataStorageByCurrentProcess(HLERequestContext& ctx); From 62bcb99ba8f0d31c2668550014cd8c0e4d318ffb Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 11 May 2023 17:11:19 -0400 Subject: [PATCH 0381/1181] am: stub CreateCacheStorage --- src/core/hle/service/am/am.cpp | 33 ++++++++++++++++++++++++++++++++- src/core/hle/service/am/am.h | 1 + 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index e59de844c..a2375508a 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -13,6 +13,7 @@ #include "core/file_sys/savedata_factory.h" #include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_transfer_memory.h" +#include "core/hle/result.h" #include "core/hle/service/acc/profile_manager.h" #include "core/hle/service/am/am.h" #include "core/hle/service/am/applet_ae.h" @@ -1335,7 +1336,7 @@ IApplicationFunctions::IApplicationFunctions(Core::System& system_) {24, nullptr, "GetLaunchStorageInfoForDebug"}, {25, &IApplicationFunctions::ExtendSaveData, "ExtendSaveData"}, {26, &IApplicationFunctions::GetSaveDataSize, "GetSaveDataSize"}, - {27, nullptr, "CreateCacheStorage"}, + {27, &IApplicationFunctions::CreateCacheStorage, "CreateCacheStorage"}, {28, nullptr, "GetSaveDataSizeMax"}, {29, nullptr, "GetCacheStorageMax"}, {30, &IApplicationFunctions::BeginBlockingHomeButtonShortAndLongPressed, "BeginBlockingHomeButtonShortAndLongPressed"}, @@ -1738,6 +1739,36 @@ void IApplicationFunctions::GetSaveDataSize(HLERequestContext& ctx) { rb.Push(size.journal); } +void IApplicationFunctions::CreateCacheStorage(HLERequestContext& ctx) { + struct InputParameters { + u16 index; + s64 size; + s64 journal_size; + }; + static_assert(sizeof(InputParameters) == 24); + + struct OutputParameters { + u32 storage_target; + u64 required_size; + }; + static_assert(sizeof(OutputParameters) == 16); + + IPC::RequestParser rp{ctx}; + const auto params = rp.PopRaw(); + + LOG_WARNING(Service_AM, "(STUBBED) called with index={}, size={:#x}, journal_size={:#x}", + params.index, params.size, params.journal_size); + + const OutputParameters resp{ + .storage_target = 1, + .required_size = 0, + }; + + IPC::ResponseBuilder rb{ctx, 6}; + rb.Push(ResultSuccess); + rb.PushRaw(resp); +} + void IApplicationFunctions::QueryApplicationPlayStatistics(HLERequestContext& ctx) { LOG_WARNING(Service_AM, "(STUBBED) called"); diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h index 0dbc6485e..d4fd163da 100644 --- a/src/core/hle/service/am/am.h +++ b/src/core/hle/service/am/am.h @@ -333,6 +333,7 @@ private: void GetPseudoDeviceId(HLERequestContext& ctx); void ExtendSaveData(HLERequestContext& ctx); void GetSaveDataSize(HLERequestContext& ctx); + void CreateCacheStorage(HLERequestContext& ctx); void BeginBlockingHomeButtonShortAndLongPressed(HLERequestContext& ctx); void EndBlockingHomeButtonShortAndLongPressed(HLERequestContext& ctx); void BeginBlockingHomeButton(HLERequestContext& ctx); From 351079a4baf94290c32aa132a6e963b16636425f Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 11 May 2023 17:29:33 -0400 Subject: [PATCH 0382/1181] fs: adjust future save path --- src/core/file_sys/savedata_factory.cpp | 4 ++-- src/core/hle/service/filesystem/fsp_srv.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/file_sys/savedata_factory.cpp b/src/core/file_sys/savedata_factory.cpp index 769065b6f..70b36f170 100644 --- a/src/core/file_sys/savedata_factory.cpp +++ b/src/core/file_sys/savedata_factory.cpp @@ -82,9 +82,9 @@ std::string GetFutureSaveDataPath(SaveDataSpaceId space_id, SaveDataType type, u // Only detect account/device saves from the future location. switch (type) { case SaveDataType::SaveData: - return fmt::format("{}/account/{}/{:016X}/1", space_id_path, uuid.RawString(), title_id); + return fmt::format("{}/account/{}/{:016X}/0", space_id_path, uuid.RawString(), title_id); case SaveDataType::DeviceSaveData: - return fmt::format("{}/device/{:016X}/1", space_id_path, title_id); + return fmt::format("{}/device/{:016X}/0", space_id_path, title_id); default: return ""; } diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index 3a142f5d0..f73a864c3 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp_srv.cpp @@ -310,8 +310,8 @@ private: class IFileSystem final : public ServiceFramework { public: explicit IFileSystem(Core::System& system_, FileSys::VirtualDir backend_, SizeGetter size_) - : ServiceFramework{system_, "IFileSystem"}, backend{std::move(backend_)}, - size{std::move(size_)} { + : ServiceFramework{system_, "IFileSystem"}, backend{std::move(backend_)}, size{std::move( + size_)} { static const FunctionInfo functions[] = { {0, &IFileSystem::CreateFile, "CreateFile"}, {1, &IFileSystem::DeleteFile, "DeleteFile"}, From cd0ded77716dbafb1aca423ec22d562c56f046a7 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Fri, 12 May 2023 01:40:21 +0100 Subject: [PATCH 0383/1181] Correctly track RT indexes for image aspect lookup during clears --- src/video_core/renderer_vulkan/vk_texture_cache.cpp | 1 + src/video_core/renderer_vulkan/vk_texture_cache.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index 012d6fa73..4d0481f2a 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -1864,6 +1864,7 @@ void Framebuffer::CreateFramebuffer(TextureCacheRuntime& runtime, num_layers = std::max(num_layers, color_buffer->range.extent.layers); images[num_images] = color_buffer->ImageHandle(); image_ranges[num_images] = MakeSubresourceRange(color_buffer); + rt_map[index] = num_images; samples = color_buffer->Samples(); ++num_images; } diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index 23473bf9c..4166b3d20 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h @@ -334,7 +334,7 @@ public: } [[nodiscard]] bool HasAspectColorBit(size_t index) const noexcept { - return (image_ranges.at(index).aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) != 0; + return (image_ranges.at(rt_map[index]).aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) != 0; } [[nodiscard]] bool HasAspectDepthBit() const noexcept { @@ -354,6 +354,7 @@ private: u32 num_images = 0; std::array images{}; std::array image_ranges{}; + std::array rt_map{}; bool has_depth{}; bool has_stencil{}; }; From a22c5a388065997211090e97c34d7320699e4a00 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 11 May 2023 21:05:27 -0400 Subject: [PATCH 0384/1181] time: implement ContinuousAdjustmentTimePoint --- src/core/hle/service/time/clock_types.h | 12 ++++++++++++ .../hle/service/time/time_sharedmemory.cpp | 19 +++++++++++++++++++ src/core/hle/service/time/time_sharedmemory.h | 5 +++-- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/time/clock_types.h b/src/core/hle/service/time/clock_types.h index ed1eb5b2d..e6293ffb9 100644 --- a/src/core/hle/service/time/clock_types.h +++ b/src/core/hle/service/time/clock_types.h @@ -59,6 +59,18 @@ static_assert(sizeof(SystemClockContext) == 0x20, "SystemClockContext is incorre static_assert(std::is_trivially_copyable_v, "SystemClockContext must be trivially copyable"); +struct ContinuousAdjustmentTimePoint { + s64 measurement_offset; + s64 diff_scale; + u32 shift_amount; + s64 lower; + s64 upper; + Common::UUID clock_source_id; +}; +static_assert(sizeof(ContinuousAdjustmentTimePoint) == 0x38); +static_assert(std::is_trivially_copyable_v, + "ContinuousAdjustmentTimePoint must be trivially copyable"); + /// https://switchbrew.org/wiki/Glue_services#TimeSpanType struct TimeSpanType { s64 nanoseconds{}; diff --git a/src/core/hle/service/time/time_sharedmemory.cpp b/src/core/hle/service/time/time_sharedmemory.cpp index ff53a7d6f..ce1c85bcc 100644 --- a/src/core/hle/service/time/time_sharedmemory.cpp +++ b/src/core/hle/service/time/time_sharedmemory.cpp @@ -30,6 +30,25 @@ void SharedMemory::SetupStandardSteadyClock(const Common::UUID& clock_source_id, } void SharedMemory::UpdateLocalSystemClockContext(const Clock::SystemClockContext& context) { + // lower and upper are related to the measurement point for the steady time point, + // and compare equal on boot + const s64 time_point_ns = context.steady_time_point.time_point * 1'000'000'000LL; + + // This adjusts for some sort of time skew + // Both 0 on boot + const s64 diff_scale = 0; + const u32 shift_amount = 0; + + const Clock::ContinuousAdjustmentTimePoint adjustment{ + .measurement_offset = system.CoreTiming().GetGlobalTimeNs().count(), + .diff_scale = diff_scale, + .shift_amount = shift_amount, + .lower = time_point_ns, + .upper = time_point_ns, + .clock_source_id = context.steady_time_point.clock_source_id, + }; + + StoreToLockFreeAtomicType(&GetFormat()->continuous_adjustment_timepoint, adjustment); StoreToLockFreeAtomicType(&GetFormat()->standard_local_system_clock_context, context); } diff --git a/src/core/hle/service/time/time_sharedmemory.h b/src/core/hle/service/time/time_sharedmemory.h index 044a4d24e..c89be9765 100644 --- a/src/core/hle/service/time/time_sharedmemory.h +++ b/src/core/hle/service/time/time_sharedmemory.h @@ -65,14 +65,15 @@ public: LockFreeAtomicType standard_local_system_clock_context; LockFreeAtomicType standard_network_system_clock_context; LockFreeAtomicType is_standard_user_system_clock_automatic_correction_enabled; - u32 format_version; + LockFreeAtomicType continuous_adjustment_timepoint; }; static_assert(offsetof(Format, standard_steady_clock_timepoint) == 0x0); static_assert(offsetof(Format, standard_local_system_clock_context) == 0x38); static_assert(offsetof(Format, standard_network_system_clock_context) == 0x80); static_assert(offsetof(Format, is_standard_user_system_clock_automatic_correction_enabled) == 0xc8); - static_assert(sizeof(Format) == 0xd8, "Format is an invalid size"); + static_assert(offsetof(Format, continuous_adjustment_timepoint) == 0xd0); + static_assert(sizeof(Format) == 0x148, "Format is an invalid size"); void SetupStandardSteadyClock(const Common::UUID& clock_source_id, Clock::TimeSpanType current_time_point); From 9367769fe732505bf021aacc6342cf8a69eee283 Mon Sep 17 00:00:00 2001 From: Danila Malyutin Date: Fri, 12 May 2023 22:30:59 +0400 Subject: [PATCH 0385/1181] Fix missing pic_order_present_flag in h264 header Fixes #9635 --- src/video_core/host1x/codecs/h264.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video_core/host1x/codecs/h264.cpp b/src/video_core/host1x/codecs/h264.cpp index e87bd65fa..6ce179167 100644 --- a/src/video_core/host1x/codecs/h264.cpp +++ b/src/video_core/host1x/codecs/h264.cpp @@ -111,7 +111,7 @@ const std::vector& H264::ComposeFrame(const Host1x::NvdecCommon::NvdecRegist writer.WriteUe(0); writer.WriteBit(context.h264_parameter_set.entropy_coding_mode_flag != 0); - writer.WriteBit(false); + writer.WriteBit(context.h264_parameter_set.pic_order_present_flag != 0); writer.WriteUe(0); writer.WriteUe(context.h264_parameter_set.num_refidx_l0_default_active); writer.WriteUe(context.h264_parameter_set.num_refidx_l1_default_active); @@ -129,7 +129,7 @@ const std::vector& H264::ComposeFrame(const Host1x::NvdecCommon::NvdecRegist writer.WriteBit(context.h264_parameter_set.redundant_pic_cnt_present_flag != 0); writer.WriteBit(context.h264_parameter_set.transform_8x8_mode_flag != 0); - writer.WriteBit(true); + writer.WriteBit(true); // pic_scaling_matrix_present_flag for (s32 index = 0; index < 6; index++) { writer.WriteBit(true); From 856838f7ce98cc4447f2d06b831de7962cf83de8 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 13 May 2023 00:31:31 -0400 Subject: [PATCH 0386/1181] vulkan_common: disable depth clamp dynamic state for older radv --- src/video_core/vulkan_common/vulkan_device.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 6ffca2af2..7132bae99 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -406,6 +406,14 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = false; features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation = false; dynamic_state3_blending = false; + + const u32 version = (properties.properties.driverVersion << 3) >> 3; + if (version < VK_MAKE_API_VERSION(0, 23, 1, 0)) { + LOG_WARNING(Render_Vulkan, + "RADV versions older than 23.1.0 have broken depth clamp dynamic state"); + features.extended_dynamic_state3.extendedDynamicState3DepthClampEnable = false; + dynamic_state3_enables = false; + } } if (extensions.vertex_input_dynamic_state && is_radv) { // TODO(ameerj): Blacklist only offending driver versions From c9c5d140b84685a03dc59b930cebb802b4c14892 Mon Sep 17 00:00:00 2001 From: Danila Malyutin Date: Sat, 13 May 2023 23:58:17 +0400 Subject: [PATCH 0387/1181] Use TARGET_FILE_DIR generator expression Use $ where appropriate instead of trying to guess where the binary will end up. --- CMakeModules/CopyYuzuFFmpegDeps.cmake | 2 +- CMakeModules/CopyYuzuQt5Deps.cmake | 2 +- CMakeModules/CopyYuzuSDLDeps.cmake | 2 +- src/yuzu/CMakeLists.txt | 6 +----- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CMakeModules/CopyYuzuFFmpegDeps.cmake b/CMakeModules/CopyYuzuFFmpegDeps.cmake index c6231737e..7aaa073ee 100644 --- a/CMakeModules/CopyYuzuFFmpegDeps.cmake +++ b/CMakeModules/CopyYuzuFFmpegDeps.cmake @@ -3,7 +3,7 @@ function(copy_yuzu_FFmpeg_deps target_dir) include(WindowsCopyFiles) - set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$/") + set(DLL_DEST "$/") file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS) string(STRIP "${FFmpeg_REQUIRED_DLLS}" FFmpeg_REQUIRED_DLLS) windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS}) diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index ab56de444..b3a65c347 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake @@ -4,7 +4,7 @@ function(copy_yuzu_Qt5_deps target_dir) include(WindowsCopyFiles) if (MSVC) - set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$/") + set(DLL_DEST "$/") set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") else() set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/") diff --git a/CMakeModules/CopyYuzuSDLDeps.cmake b/CMakeModules/CopyYuzuSDLDeps.cmake index 7ffdd8a1d..464eed5e9 100644 --- a/CMakeModules/CopyYuzuSDLDeps.cmake +++ b/CMakeModules/CopyYuzuSDLDeps.cmake @@ -3,6 +3,6 @@ function(copy_yuzu_SDL_deps target_dir) include(WindowsCopyFiles) - set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$/") + set(DLL_DEST "$/") windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) endfunction(copy_yuzu_SDL_deps) diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 2d7b9ab65..84d9ca796 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -378,11 +378,7 @@ if(UNIX AND NOT APPLE) endif() if (WIN32 AND QT_VERSION VERSION_GREATER_EQUAL 6) - if (MSVC AND NOT ${CMAKE_GENERATOR} STREQUAL "Ninja") - set(YUZU_EXE_DIR "${CMAKE_BINARY_DIR}/bin/$") - else() - set(YUZU_EXE_DIR "${CMAKE_BINARY_DIR}/bin") - endif() + set(YUZU_EXE_DIR "$") add_custom_command(TARGET yuzu POST_BUILD COMMAND ${WINDEPLOYQT_EXECUTABLE} "${YUZU_EXE_DIR}/yuzu.exe" --dir "${YUZU_EXE_DIR}" --libdir "${YUZU_EXE_DIR}" --plugindir "${YUZU_EXE_DIR}/plugins" --no-compiler-runtime --no-opengl-sw --no-system-d3d-compiler --no-translations --verbose 0) endif() From 7325fb054dda17fb56f4485806af3fa06a16c9a5 Mon Sep 17 00:00:00 2001 From: Danila Malyutin Date: Sun, 14 May 2023 01:23:07 +0300 Subject: [PATCH 0388/1181] Fixup upload.ps1 for GHA No extra folders are created with ninja generator after previous CMake fixes. --- .ci/scripts/windows/upload.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.ci/scripts/windows/upload.ps1 b/.ci/scripts/windows/upload.ps1 index 21abcd752..492763420 100644 --- a/.ci/scripts/windows/upload.ps1 +++ b/.ci/scripts/windows/upload.ps1 @@ -26,7 +26,11 @@ $env:BUILD_ZIP = $MSVC_BUILD_ZIP $env:BUILD_SYMBOLS = $MSVC_BUILD_PDB $env:BUILD_UPDATE = $MSVC_SEVENZIP -$BUILD_DIR = ".\build\bin\Release" +if (Test-Path -Path ".\build\bin\Release") { + $BUILD_DIR = ".\build\bin\Release" +} else { + $BUILD_DIR = ".\build\bin\" +} # Cleanup unneeded data in submodules git submodule foreach git clean -fxd From 122435e0804b0817b2d86ce82a38ca87535ad798 Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 14 May 2023 01:13:11 -0400 Subject: [PATCH 0389/1181] vulkan_common: fix incompatible property flags --- src/video_core/vulkan_common/vulkan_memory_allocator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video_core/vulkan_common/vulkan_memory_allocator.cpp b/src/video_core/vulkan_common/vulkan_memory_allocator.cpp index 1732866e0..e28a556f8 100644 --- a/src/video_core/vulkan_common/vulkan_memory_allocator.cpp +++ b/src/video_core/vulkan_common/vulkan_memory_allocator.cpp @@ -147,7 +147,7 @@ public: /// Returns whether this allocation is compatible with the arguments. [[nodiscard]] bool IsCompatible(VkMemoryPropertyFlags flags, u32 type_mask) const { - return (flags & property_flags) == property_flags && (type_mask & shifted_memory_type) != 0; + return (flags & property_flags) == flags && (type_mask & shifted_memory_type) != 0; } private: From ac531aa15f35b2e6584b8b306b5c3258ef66dc73 Mon Sep 17 00:00:00 2001 From: german77 Date: Sat, 13 May 2023 00:04:18 -0600 Subject: [PATCH 0390/1181] input_common: Make amiibo scanning less demanding --- .../helpers/joycon_protocol/joycon_types.h | 1 + src/input_common/helpers/joycon_protocol/nfc.cpp | 10 +++++++--- src/input_common/helpers/joycon_protocol/nfc.h | 6 +++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/input_common/helpers/joycon_protocol/joycon_types.h b/src/input_common/helpers/joycon_protocol/joycon_types.h index b03143e04..1c8d294b0 100644 --- a/src/input_common/helpers/joycon_protocol/joycon_types.h +++ b/src/input_common/helpers/joycon_protocol/joycon_types.h @@ -394,6 +394,7 @@ enum class DriverResult { InvalidHandle, NotSupported, Disabled, + Delayed, Unknown, }; diff --git a/src/input_common/helpers/joycon_protocol/nfc.cpp b/src/input_common/helpers/joycon_protocol/nfc.cpp index 77ea6d5cf..14818ae33 100644 --- a/src/input_common/helpers/joycon_protocol/nfc.cpp +++ b/src/input_common/helpers/joycon_protocol/nfc.cpp @@ -72,6 +72,11 @@ DriverResult NfcProtocol::StartNFCPollingMode() { } DriverResult NfcProtocol::ScanAmiibo(std::vector& data) { + if (update_counter++ < AMIIBO_UPDATE_DELAY) { + return DriverResult::Delayed; + } + update_counter = 0; + LOG_DEBUG(Input, "Start NFC pooling Mode"); ScopedSetBlocking sb(this); DriverResult result{DriverResult::Success}; @@ -87,7 +92,7 @@ DriverResult NfcProtocol::ScanAmiibo(std::vector& data) { result = WaitUntilNfcIsReady(); } if (result == DriverResult::Success) { - result = StartPolling(tag_data); + result = StartPolling(tag_data, 7); } if (result == DriverResult::Success) { result = GetAmiiboData(data); @@ -129,9 +134,8 @@ DriverResult NfcProtocol::WaitUntilNfcIsReady() { return DriverResult::Success; } -DriverResult NfcProtocol::StartPolling(TagFoundData& data) { +DriverResult NfcProtocol::StartPolling(TagFoundData& data, std::size_t timeout_limit) { LOG_DEBUG(Input, "Start Polling for tag"); - constexpr std::size_t timeout_limit = 7; MCUCommandResponse output{}; std::size_t tries = 0; diff --git a/src/input_common/helpers/joycon_protocol/nfc.h b/src/input_common/helpers/joycon_protocol/nfc.h index 11e263e07..4cb992d1d 100644 --- a/src/input_common/helpers/joycon_protocol/nfc.h +++ b/src/input_common/helpers/joycon_protocol/nfc.h @@ -32,6 +32,9 @@ public: bool IsEnabled() const; private: + // Number of times the function will be delayed until it outputs valid data + static constexpr std::size_t AMIIBO_UPDATE_DELAY = 15; + struct TagFoundData { u8 type; std::vector uuid; @@ -39,7 +42,7 @@ private: DriverResult WaitUntilNfcIsReady(); - DriverResult StartPolling(TagFoundData& data); + DriverResult StartPolling(TagFoundData& data, std::size_t timeout_limit = 1); DriverResult ReadTag(const TagFoundData& data); @@ -56,6 +59,7 @@ private: NFCReadBlockCommand GetReadBlockCommand(NFCPages pages) const; bool is_enabled{}; + std::size_t update_counter{}; }; } // namespace InputCommon::Joycon From 2be751100b1028b0bf06d8a70343e7f7a153cbfb Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 14 May 2023 01:49:29 -0400 Subject: [PATCH 0391/1181] vulkan_device: reserve extra memory to prevent swaps --- src/video_core/vulkan_common/vulkan_device.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 6ffca2af2..161f050b8 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -1009,6 +1009,8 @@ void Device::CollectPhysicalMemoryInfo() { device_access_memory += mem_properties.memoryHeaps[element].size; } if (!is_integrated) { + const u64 reserve_memory = std::min(device_access_memory / 8, 1_GiB); + device_access_memory -= reserve_memory; return; } const s64 available_memory = static_cast(device_access_memory - device_initial_usage); From c4bfbc6d25d4001d780d22e8501986ce09ff0957 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Fri, 12 May 2023 14:46:38 +0200 Subject: [PATCH 0392/1181] Buffer Cache: Clear sync code. --- src/video_core/buffer_cache/buffer_cache.h | 29 +++---------------- .../buffer_cache/buffer_cache_base.h | 3 -- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index fff57ffa9..98756e4da 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -131,33 +131,15 @@ std::optional BufferCache

::GetFlushArea(VA template void BufferCache

::DownloadMemory(VAddr cpu_addr, u64 size) { - WaitOnAsyncFlushes(cpu_addr, size); ForEachBufferInRange(cpu_addr, size, [&](BufferId, Buffer& buffer) { DownloadBufferMemory(buffer, cpu_addr, size); }); } -template -void BufferCache

::WaitOnAsyncFlushes(VAddr cpu_addr, u64 size) { - bool must_wait = false; - ForEachInOverlapCounter(async_downloads, cpu_addr, size, - [&](VAddr, VAddr, int) { must_wait = true; }); - bool must_release = false; - ForEachInRangeSet(pending_ranges, cpu_addr, size, [&](VAddr, VAddr) { must_release = true; }); - if (must_release) { - std::function tmp([]() {}); - rasterizer.SignalFence(std::move(tmp)); - } - if (must_wait || must_release) { - rasterizer.ReleaseFences(); - } -} - template void BufferCache

::ClearDownload(IntervalType subtract_interval) { RemoveEachInOverlapCounter(async_downloads, subtract_interval, -1024); uncommitted_ranges.subtract(subtract_interval); - pending_ranges.subtract(subtract_interval); for (auto& interval_set : committed_ranges) { interval_set.subtract(subtract_interval); } @@ -177,7 +159,6 @@ bool BufferCache

::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am } const IntervalType subtract_interval{*cpu_dest_address, *cpu_dest_address + amount}; - WaitOnAsyncFlushes(*cpu_src_address, static_cast(amount)); ClearDownload(subtract_interval); BufferId buffer_a; @@ -205,7 +186,6 @@ bool BufferCache

::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am const IntervalType add_interval{new_base_address, new_base_address + size}; tmp_intervals.push_back(add_interval); uncommitted_ranges.add(add_interval); - pending_ranges.add(add_interval); }; ForEachInRangeSet(common_ranges, *cpu_src_address, amount, mirror); // This subtraction in this order is important for overlapping copies. @@ -492,7 +472,6 @@ void BufferCache

::CommitAsyncFlushesHigh() { } MICROPROFILE_SCOPE(GPU_DownloadMemory); - pending_ranges.clear(); auto it = committed_ranges.begin(); while (it != committed_ranges.end()) { auto& current_intervals = *it; @@ -1232,7 +1211,6 @@ void BufferCache

::MarkWrittenBuffer(BufferId buffer_id, VAddr cpu_addr, u32 s const IntervalType base_interval{cpu_addr, cpu_addr + size}; common_ranges.add(base_interval); uncommitted_ranges.add(base_interval); - pending_ranges.add(base_interval); } template @@ -1677,14 +1655,15 @@ typename BufferCache

::Binding BufferCache

::StorageBufferBinding(GPUVAddr s const bool is_nvn_cbuf = cbuf_index == 0; // The NVN driver buffer (index 0) is known to pack the SSBO address followed by its size. if (is_nvn_cbuf) { - return gpu_memory->Read(ssbo_addr + 8); + const u32 ssbo_size = gpu_memory->Read(ssbo_addr + 8); + if (ssbo_size != 0) { + return ssbo_size; + } } // Other titles (notably Doom Eternal) may use STG/LDG on buffer addresses in custom defined // cbufs, which do not store the sizes adjacent to the addresses, so use the fully // mapped buffer size for now. const u32 memory_layout_size = static_cast(gpu_memory->GetMemoryLayoutSize(gpu_addr)); - LOG_INFO(HW_GPU, "Binding storage buffer for cbuf index {}, MemoryLayoutSize 0x{:X}", - cbuf_index, memory_layout_size); return memory_layout_size; }(); const std::optional cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr); diff --git a/src/video_core/buffer_cache/buffer_cache_base.h b/src/video_core/buffer_cache/buffer_cache_base.h index 0445ec47f..ac00d4d9d 100644 --- a/src/video_core/buffer_cache/buffer_cache_base.h +++ b/src/video_core/buffer_cache/buffer_cache_base.h @@ -381,8 +381,6 @@ private: void RunGarbageCollector(); - void WaitOnAsyncFlushes(VAddr cpu_addr, u64 size); - void BindHostIndexBuffer(); void BindHostVertexBuffers(); @@ -547,7 +545,6 @@ private: IntervalSet uncommitted_ranges; IntervalSet common_ranges; IntervalSet cached_ranges; - IntervalSet pending_ranges; std::deque committed_ranges; // Async Buffers From 6e54615b16df2004af0bfbb9543a3fd21c678dbb Mon Sep 17 00:00:00 2001 From: german77 Date: Sun, 14 May 2023 09:22:00 -0600 Subject: [PATCH 0393/1181] service: hid: Use span instead of vector reference --- src/core/hle/service/hid/controllers/npad.cpp | 4 ++-- src/core/hle/service/hid/controllers/npad.h | 4 ++-- src/core/hle/service/hid/hid.cpp | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index ef4aec4ea..28818c813 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -979,8 +979,8 @@ void Controller_NPad::VibrateController( } void Controller_NPad::VibrateControllers( - const std::vector& vibration_device_handles, - const std::vector& vibration_values) { + std::span vibration_device_handles, + std::span vibration_values) { if (!Settings::values.vibration_enabled.GetValue() && !permit_vibration_session_enabled) { return; } diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 9cfe298f1..776411261 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -112,8 +112,8 @@ public: const Core::HID::VibrationValue& vibration_value); void VibrateControllers( - const std::vector& vibration_device_handles, - const std::vector& vibration_values); + std::span vibration_device_handles, + std::span vibration_values); Core::HID::VibrationValue GetLastVibration( const Core::HID::VibrationDeviceHandle& vibration_device_handle) const; diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 87e7b864a..2bf1d8a27 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -1601,16 +1601,16 @@ void Hid::SendVibrationValues(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; - const auto handles = ctx.ReadBuffer(0); - const auto vibrations = ctx.ReadBuffer(1); + const auto handle_data = ctx.ReadBuffer(0); + const auto handle_count = ctx.GetReadBufferNumElements(0); + const auto vibration_data = ctx.ReadBuffer(1); + const auto vibration_count = ctx.GetReadBufferNumElements(1); - std::vector vibration_device_handles( - handles.size() / sizeof(Core::HID::VibrationDeviceHandle)); - std::vector vibration_values(vibrations.size() / - sizeof(Core::HID::VibrationValue)); - - std::memcpy(vibration_device_handles.data(), handles.data(), handles.size()); - std::memcpy(vibration_values.data(), vibrations.data(), vibrations.size()); + auto vibration_device_handles = + std::span(reinterpret_cast(handle_data.data()), + handle_count); + auto vibration_values = std::span( + reinterpret_cast(vibration_data.data()), vibration_count); applet_resource->GetController(HidController::NPad) .VibrateControllers(vibration_device_handles, vibration_values); From 5693434b8ad74a5c46155f1e60fa0d3f475aa153 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Mon, 15 May 2023 22:44:50 -0600 Subject: [PATCH 0394/1181] input_common: Fix pro controller amiibo support --- src/input_common/drivers/joycon.cpp | 9 +- src/input_common/drivers/joycon.h | 3 +- .../joycon_protocol/common_protocol.cpp | 2 +- .../helpers/joycon_protocol/joycon_types.h | 2 +- .../helpers/joycon_protocol/nfc.cpp | 169 +++++++----------- .../helpers/joycon_protocol/nfc.h | 6 +- 6 files changed, 79 insertions(+), 112 deletions(-) diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp index 8b57ebe07..653862a72 100644 --- a/src/input_common/drivers/joycon.cpp +++ b/src/input_common/drivers/joycon.cpp @@ -195,8 +195,8 @@ void Joycons::RegisterNewDevice(SDL_hid_device_info* device_info) { OnMotionUpdate(port, type, id, value); }}, .on_ring_data = {[this](f32 ring_data) { OnRingConUpdate(ring_data); }}, - .on_amiibo_data = {[this, port](const std::vector& amiibo_data) { - OnAmiiboUpdate(port, amiibo_data); + .on_amiibo_data = {[this, port, type](const std::vector& amiibo_data) { + OnAmiiboUpdate(port, type, amiibo_data); }}, .on_camera_data = {[this, port](const std::vector& camera_data, Joycon::IrsResolution format) { @@ -398,8 +398,9 @@ void Joycons::OnRingConUpdate(f32 ring_data) { SetAxis(identifier, 100, ring_data); } -void Joycons::OnAmiiboUpdate(std::size_t port, const std::vector& amiibo_data) { - const auto identifier = GetIdentifier(port, Joycon::ControllerType::Right); +void Joycons::OnAmiiboUpdate(std::size_t port, Joycon::ControllerType type, + const std::vector& amiibo_data) { + const auto identifier = GetIdentifier(port, type); const auto nfc_state = amiibo_data.empty() ? Common::Input::NfcState::AmiiboRemoved : Common::Input::NfcState::NewAmiibo; SetNfc(identifier, {nfc_state, amiibo_data}); diff --git a/src/input_common/drivers/joycon.h b/src/input_common/drivers/joycon.h index 5b40817e2..e3f0ad78f 100644 --- a/src/input_common/drivers/joycon.h +++ b/src/input_common/drivers/joycon.h @@ -81,7 +81,8 @@ private: void OnMotionUpdate(std::size_t port, Joycon::ControllerType type, int id, const Joycon::MotionData& value); void OnRingConUpdate(f32 ring_data); - void OnAmiiboUpdate(std::size_t port, const std::vector& amiibo_data); + void OnAmiiboUpdate(std::size_t port, Joycon::ControllerType type, + const std::vector& amiibo_data); void OnCameraUpdate(std::size_t port, const std::vector& camera_data, Joycon::IrsResolution format); diff --git a/src/input_common/helpers/joycon_protocol/common_protocol.cpp b/src/input_common/helpers/joycon_protocol/common_protocol.cpp index 077d72cd0..51669261a 100644 --- a/src/input_common/helpers/joycon_protocol/common_protocol.cpp +++ b/src/input_common/helpers/joycon_protocol/common_protocol.cpp @@ -265,7 +265,7 @@ DriverResult JoyconCommonProtocol::SendMCUData(ReportMode report_mode, MCUSubCom DriverResult JoyconCommonProtocol::WaitSetMCUMode(ReportMode report_mode, MCUMode mode) { MCUCommandResponse output{}; - constexpr std::size_t MaxTries{8}; + constexpr std::size_t MaxTries{16}; std::size_t tries{}; do { diff --git a/src/input_common/helpers/joycon_protocol/joycon_types.h b/src/input_common/helpers/joycon_protocol/joycon_types.h index 1c8d294b0..353dc744d 100644 --- a/src/input_common/helpers/joycon_protocol/joycon_types.h +++ b/src/input_common/helpers/joycon_protocol/joycon_types.h @@ -577,8 +577,8 @@ static_assert(sizeof(NFCPollingCommandData) == 0x05, "NFCPollingCommandData is a struct NFCRequestState { NFCReadCommand command_argument; - u8 packet_id; INSERT_PADDING_BYTES(0x1); + u8 packet_id; MCUPacketFlag packet_flag; u8 data_length; union { diff --git a/src/input_common/helpers/joycon_protocol/nfc.cpp b/src/input_common/helpers/joycon_protocol/nfc.cpp index 14818ae33..46c9e9489 100644 --- a/src/input_common/helpers/joycon_protocol/nfc.cpp +++ b/src/input_common/helpers/joycon_protocol/nfc.cpp @@ -64,6 +64,20 @@ DriverResult NfcProtocol::StartNFCPollingMode() { if (result == DriverResult::Success) { result = WaitUntilNfcIsReady(); } + if (result == DriverResult::Success) { + MCUCommandResponse output{}; + result = SendStopPollingRequest(output); + } + if (result == DriverResult::Success) { + result = WaitUntilNfcIsReady(); + } + if (result == DriverResult::Success) { + MCUCommandResponse output{}; + result = SendStartPollingRequest(output); + } + if (result == DriverResult::Success) { + result = WaitUntilNfcIsPolling(); + } if (result == DriverResult::Success) { is_enabled = true; } @@ -77,24 +91,21 @@ DriverResult NfcProtocol::ScanAmiibo(std::vector& data) { } update_counter = 0; - LOG_DEBUG(Input, "Start NFC pooling Mode"); + LOG_DEBUG(Input, "Scan for amiibos"); ScopedSetBlocking sb(this); DriverResult result{DriverResult::Success}; TagFoundData tag_data{}; if (result == DriverResult::Success) { - result = StartPolling(tag_data); - } - if (result == DriverResult::Success) { - result = ReadTag(tag_data); - } - if (result == DriverResult::Success) { - result = WaitUntilNfcIsReady(); - } - if (result == DriverResult::Success) { - result = StartPolling(tag_data, 7); + result = IsTagInRange(tag_data); } + if (result == DriverResult::Success) { + std::string uuid_string; + for (auto& content : tag_data.uuid) { + uuid_string += fmt::format(" {:02x}", content); + } + LOG_INFO(Input, "Tag detected, type={}, uuid={}", tag_data.type, uuid_string); result = GetAmiiboData(data); } @@ -102,12 +113,17 @@ DriverResult NfcProtocol::ScanAmiibo(std::vector& data) { } bool NfcProtocol::HasAmiibo() { + if (update_counter++ < AMIIBO_UPDATE_DELAY) { + return true; + } + update_counter = 0; + ScopedSetBlocking sb(this); DriverResult result{DriverResult::Success}; TagFoundData tag_data{}; if (result == DriverResult::Success) { - result = StartPolling(tag_data); + result = IsTagInRange(tag_data, 7); } return result == DriverResult::Success; @@ -119,7 +135,7 @@ DriverResult NfcProtocol::WaitUntilNfcIsReady() { std::size_t tries = 0; do { - auto result = SendStartWaitingRecieveRequest(output); + auto result = SendNextPackageRequest(output, {}); if (result != DriverResult::Success) { return result; @@ -134,13 +150,14 @@ DriverResult NfcProtocol::WaitUntilNfcIsReady() { return DriverResult::Success; } -DriverResult NfcProtocol::StartPolling(TagFoundData& data, std::size_t timeout_limit) { - LOG_DEBUG(Input, "Start Polling for tag"); +DriverResult NfcProtocol::WaitUntilNfcIsPolling() { + constexpr std::size_t timeout_limit = 10; MCUCommandResponse output{}; std::size_t tries = 0; do { - const auto result = SendStartPollingRequest(output); + auto result = SendNextPackageRequest(output, {}); + if (result != DriverResult::Success) { return result; } @@ -149,7 +166,26 @@ DriverResult NfcProtocol::StartPolling(TagFoundData& data, std::size_t timeout_l } } while (output.mcu_report != MCUReport::NFCState || (output.mcu_data[1] << 8) + output.mcu_data[0] != 0x0500 || - output.mcu_data[6] != 0x09); + output.mcu_data[5] != 0x31 || output.mcu_data[6] != 0x01); + + return DriverResult::Success; +} + +DriverResult NfcProtocol::IsTagInRange(TagFoundData& data, std::size_t timeout_limit) { + MCUCommandResponse output{}; + std::size_t tries = 0; + + do { + const auto result = SendNextPackageRequest(output, {}); + if (result != DriverResult::Success) { + return result; + } + if (tries++ > timeout_limit) { + return DriverResult::Timeout; + } + } while (output.mcu_report != MCUReport::NFCState || + (output.mcu_data[1] << 8) + output.mcu_data[0] != 0x0500 || + (output.mcu_data[6] != 0x09 && output.mcu_data[6] != 0x04)); data.type = output.mcu_data[12]; data.uuid.resize(output.mcu_data[14]); @@ -158,85 +194,22 @@ DriverResult NfcProtocol::StartPolling(TagFoundData& data, std::size_t timeout_l return DriverResult::Success; } -DriverResult NfcProtocol::ReadTag(const TagFoundData& data) { - constexpr std::size_t timeout_limit = 10; - MCUCommandResponse output{}; - std::size_t tries = 0; - - std::string uuid_string; - for (auto& content : data.uuid) { - uuid_string += fmt::format(" {:02x}", content); - } - - LOG_INFO(Input, "Tag detected, type={}, uuid={}", data.type, uuid_string); - - tries = 0; - NFCPages ntag_pages = NFCPages::Block0; - // Read Tag data - while (true) { - auto result = SendReadAmiiboRequest(output, ntag_pages); - const auto nfc_status = static_cast(output.mcu_data[6]); - - if (result != DriverResult::Success) { - return result; - } - - if ((output.mcu_report == MCUReport::NFCReadData || - output.mcu_report == MCUReport::NFCState) && - nfc_status == NFCStatus::TagLost) { - return DriverResult::ErrorReadingData; - } - - if (output.mcu_report == MCUReport::NFCReadData && output.mcu_data[1] == 0x07 && - output.mcu_data[2] == 0x01) { - if (data.type != 2) { - continue; - } - switch (output.mcu_data[24]) { - case 0: - ntag_pages = NFCPages::Block135; - break; - case 3: - ntag_pages = NFCPages::Block45; - break; - case 4: - ntag_pages = NFCPages::Block231; - break; - default: - return DriverResult::ErrorReadingData; - } - continue; - } - - if (output.mcu_report == MCUReport::NFCState && nfc_status == NFCStatus::LastPackage) { - // finished - SendStopPollingRequest(output); - return DriverResult::Success; - } - - // Ignore other state reports - if (output.mcu_report == MCUReport::NFCState) { - continue; - } - - if (tries++ > timeout_limit) { - return DriverResult::Timeout; - } - } - - return DriverResult::Success; -} - DriverResult NfcProtocol::GetAmiiboData(std::vector& ntag_data) { - constexpr std::size_t timeout_limit = 10; + constexpr std::size_t timeout_limit = 60; MCUCommandResponse output{}; std::size_t tries = 0; - NFCPages ntag_pages = NFCPages::Block135; + u8 package_index = 0; std::size_t ntag_buffer_pos = 0; + auto result = SendReadAmiiboRequest(output, NFCPages::Block135); + + if (result != DriverResult::Success) { + return result; + } + // Read Tag data - while (true) { - auto result = SendReadAmiiboRequest(output, ntag_pages); + while (tries++ < timeout_limit) { + result = SendNextPackageRequest(output, package_index); const auto nfc_status = static_cast(output.mcu_data[6]); if (result != DriverResult::Success) { @@ -259,6 +232,7 @@ DriverResult NfcProtocol::GetAmiiboData(std::vector& ntag_data) { memcpy(ntag_data.data() + ntag_buffer_pos, output.mcu_data.data() + 6, payload_size); } + package_index++; continue; } @@ -266,18 +240,9 @@ DriverResult NfcProtocol::GetAmiiboData(std::vector& ntag_data) { LOG_INFO(Input, "Finished reading amiibo"); return DriverResult::Success; } - - // Ignore other state reports - if (output.mcu_report == MCUReport::NFCState) { - continue; - } - - if (tries++ > timeout_limit) { - return DriverResult::Timeout; - } } - return DriverResult::Success; + return DriverResult::Timeout; } DriverResult NfcProtocol::SendStartPollingRequest(MCUCommandResponse& output) { @@ -321,10 +286,10 @@ DriverResult NfcProtocol::SendStopPollingRequest(MCUCommandResponse& output) { output); } -DriverResult NfcProtocol::SendStartWaitingRecieveRequest(MCUCommandResponse& output) { +DriverResult NfcProtocol::SendNextPackageRequest(MCUCommandResponse& output, u8 packet_id) { NFCRequestState request{ .command_argument = NFCReadCommand::StartWaitingRecieve, - .packet_id = 0x0, + .packet_id = packet_id, .packet_flag = MCUPacketFlag::LastCommandPacket, .data_length = 0, .raw_data = {}, diff --git a/src/input_common/helpers/joycon_protocol/nfc.h b/src/input_common/helpers/joycon_protocol/nfc.h index 4cb992d1d..c9e9af03f 100644 --- a/src/input_common/helpers/joycon_protocol/nfc.h +++ b/src/input_common/helpers/joycon_protocol/nfc.h @@ -42,9 +42,9 @@ private: DriverResult WaitUntilNfcIsReady(); - DriverResult StartPolling(TagFoundData& data, std::size_t timeout_limit = 1); + DriverResult WaitUntilNfcIsPolling(); - DriverResult ReadTag(const TagFoundData& data); + DriverResult IsTagInRange(TagFoundData& data, std::size_t timeout_limit = 1); DriverResult GetAmiiboData(std::vector& data); @@ -52,7 +52,7 @@ private: DriverResult SendStopPollingRequest(MCUCommandResponse& output); - DriverResult SendStartWaitingRecieveRequest(MCUCommandResponse& output); + DriverResult SendNextPackageRequest(MCUCommandResponse& output, u8 packet_id); DriverResult SendReadAmiiboRequest(MCUCommandResponse& output, NFCPages ntag_pages); From c1a8a508bc9bd01449412e08f5b06f74a560d9d3 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Wed, 17 May 2023 22:15:08 -0400 Subject: [PATCH 0395/1181] vulkan_device: Disable VK_KHR_push_descriptor on ANV Mesa commit ff91c5ca42bc80aa411cb3fd8f550aa6fdd16bdc breaks VK_KHR_push_descriptor usage on ANV drivers 22.3.0, so disable it and allow games to boot. --- src/video_core/vulkan_common/vulkan_device.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 9a8763e6a..f6e6f2736 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -471,6 +471,17 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR LOG_WARNING(Render_Vulkan, "ANV driver does not support native BGR format"); must_emulate_bgr565 = true; } + if (extensions.push_descriptor && is_intel_anv) { + const u32 version = (properties.properties.driverVersion << 3) >> 3; + if (version >= VK_MAKE_API_VERSION(0, 22, 3, 0)) { + // Disable VK_KHR_push_descriptor due to + // mesa/mesa/-/commit/ff91c5ca42bc80aa411cb3fd8f550aa6fdd16bdc + LOG_WARNING(Render_Vulkan, + "ANV drivers 22.3.0 and later have broken VK_KHR_push_descriptor"); + extensions.push_descriptor = false; + loaded_extensions.erase(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME); + } + } if (is_mvk) { LOG_WARNING(Render_Vulkan, "MVK driver breaks when using more than 16 vertex attributes/bindings"); From d75bcdd07793954e6c33ba131871c183492b32b0 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Wed, 10 May 2023 17:59:21 +0100 Subject: [PATCH 0396/1181] Smooth out the DSP callback by adding a 5ms wait time limit --- src/audio_core/renderer/adsp/audio_renderer.cpp | 5 +++++ src/audio_core/renderer/system_manager.cpp | 9 ++++----- src/audio_core/renderer/system_manager.h | 10 +--------- src/audio_core/sink/sink_stream.cpp | 4 ++-- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/audio_core/renderer/adsp/audio_renderer.cpp b/src/audio_core/renderer/adsp/audio_renderer.cpp index 503f40349..1cbeed302 100644 --- a/src/audio_core/renderer/adsp/audio_renderer.cpp +++ b/src/audio_core/renderer/adsp/audio_renderer.cpp @@ -154,6 +154,11 @@ void AudioRenderer::ThreadFunc() { return; case RenderMessage::AudioRenderer_Render: { + if (system.IsShuttingDown()) [[unlikely]] { + std::this_thread::sleep_for(std::chrono::milliseconds(5)); + mailbox->ADSPSendMessage(RenderMessage::AudioRenderer_RenderResponse); + continue; + } std::array buffers_reset{}; std::array render_times_taken{}; const auto start_time{system.CoreTiming().GetClockTicks()}; diff --git a/src/audio_core/renderer/system_manager.cpp b/src/audio_core/renderer/system_manager.cpp index 07d8ed093..300ecdbf1 100644 --- a/src/audio_core/renderer/system_manager.cpp +++ b/src/audio_core/renderer/system_manager.cpp @@ -27,7 +27,7 @@ bool SystemManager::InitializeUnsafe() { if (!active) { if (adsp.Start()) { active = true; - thread = std::jthread([this](std::stop_token stop_token) { ThreadFunc(); }); + thread = std::jthread([this](std::stop_token stop_token) { ThreadFunc(stop_token); }); } } @@ -39,8 +39,7 @@ void SystemManager::Stop() { return; } active = false; - update.store(true); - update.notify_all(); + thread.request_stop(); thread.join(); adsp.Stop(); } @@ -85,12 +84,12 @@ bool SystemManager::Remove(System& system_) { return true; } -void SystemManager::ThreadFunc() { +void SystemManager::ThreadFunc(std::stop_token stop_token) { static constexpr char name[]{"AudioRenderSystemManager"}; MicroProfileOnThreadCreate(name); Common::SetCurrentThreadName(name); Common::SetCurrentThreadPriority(Common::ThreadPriority::High); - while (active) { + while (active && !stop_token.stop_requested()) { { std::scoped_lock l{mutex1}; diff --git a/src/audio_core/renderer/system_manager.h b/src/audio_core/renderer/system_manager.h index 1f0bbd8b4..9681fd121 100644 --- a/src/audio_core/renderer/system_manager.h +++ b/src/audio_core/renderer/system_manager.h @@ -66,13 +66,7 @@ private: /** * Main thread responsible for command generation. */ - void ThreadFunc(); - - enum class StreamState { - Filling, - Steady, - Draining, - }; + void ThreadFunc(std::stop_token stop_token); /// Core system Core::System& core; @@ -90,8 +84,6 @@ private: ADSP::ADSP& adsp; /// AudioRenderer mailbox for communication ADSP::AudioRenderer_Mailbox* mailbox{}; - /// Atomic for main thread to wait on - std::atomic update{}; }; } // namespace AudioCore::AudioRenderer diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index 13ba26e74..9bbb54162 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -271,8 +271,8 @@ u64 SinkStream::GetExpectedPlayedSampleCount() { void SinkStream::WaitFreeSpace() { std::unique_lock lk{release_mutex}; - release_cv.wait( - lk, [this]() { return queued_buffers < max_queue_size || system.IsShuttingDown(); }); + release_cv.wait_for(lk, std::chrono::milliseconds(5), + [this]() { return queued_buffers < max_queue_size; }); } } // namespace AudioCore::Sink From de7c92d7c4dcb65beef3c9248f1a8e5e05afee34 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 18 May 2023 18:01:01 -0400 Subject: [PATCH 0397/1181] renderer_vulkan: remove wrong constexpr --- src/video_core/renderer_vulkan/vk_swapchain.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp index 1e80ce463..8c0dec590 100644 --- a/src/video_core/renderer_vulkan/vk_swapchain.cpp +++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp @@ -34,8 +34,8 @@ VkSurfaceFormatKHR ChooseSwapSurfaceFormat(vk::Span formats) return found != formats.end() ? *found : formats[0]; } -static constexpr VkPresentModeKHR ChooseSwapPresentMode(bool has_imm, bool has_mailbox, - bool has_fifo_relaxed) { +static VkPresentModeKHR ChooseSwapPresentMode(bool has_imm, bool has_mailbox, + bool has_fifo_relaxed) { // Mailbox doesn't lock the application like FIFO (vsync) // FIFO present mode locks the framerate to the monitor's refresh rate Settings::VSyncMode setting = [has_imm, has_mailbox]() { From 55d740fffa540ffae483a46b4a3b907b40fc3b15 Mon Sep 17 00:00:00 2001 From: Danila Malyutin Date: Fri, 19 May 2023 01:24:45 +0300 Subject: [PATCH 0398/1181] externals: update cubeb (#10362) --- externals/cubeb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/cubeb b/externals/cubeb index 75d9d125e..2d817de7c 160000 --- a/externals/cubeb +++ b/externals/cubeb @@ -1 +1 @@ -Subproject commit 75d9d125ee655ef80f3bfcd97ae5a805931042b8 +Subproject commit 2d817de7c58b33a7c045edf873f3f9c98e4a2082 From dbcdb3523bc12a461256d66fb853b6ef7b50ed66 Mon Sep 17 00:00:00 2001 From: german77 Date: Fri, 19 May 2023 21:19:29 -0600 Subject: [PATCH 0399/1181] input_common: Map motion with relative values not absolute ones --- src/input_common/input_engine.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/input_common/input_engine.cpp b/src/input_common/input_engine.cpp index 91aa96aa7..e4c5b5b3c 100644 --- a/src/input_common/input_engine.cpp +++ b/src/input_common/input_engine.cpp @@ -380,13 +380,16 @@ void InputEngine::TriggerOnMotionChange(const PadIdentifier& identifier, int mot if (!configuring || !mapping_callback.on_data) { return; } + const auto old_value = GetMotion(identifier, motion); bool is_active = false; - if (std::abs(value.accel_x) > 1.5f || std::abs(value.accel_y) > 1.5f || - std::abs(value.accel_z) > 1.5f) { + if (std::abs(value.accel_x - old_value.accel_x) > 1.5f || + std::abs(value.accel_y - old_value.accel_y) > 1.5f || + std::abs(value.accel_z - old_value.accel_z) > 1.5f) { is_active = true; } - if (std::abs(value.gyro_x) > 0.6f || std::abs(value.gyro_y) > 0.6f || - std::abs(value.gyro_z) > 0.6f) { + if (std::abs(value.gyro_x - old_value.gyro_x) > 0.6f || + std::abs(value.gyro_y - old_value.gyro_y) > 0.6f || + std::abs(value.gyro_z - old_value.gyro_z) > 0.6f) { is_active = true; } if (!is_active) { From 4e491ab59ba8b9c08253ca9cce5bb9fe909ac2ff Mon Sep 17 00:00:00 2001 From: GPUCode Date: Sat, 20 May 2023 14:08:05 +0300 Subject: [PATCH 0400/1181] vk_master_semaphore: Move fence wait on separate thread --- .../renderer_vulkan/vk_master_semaphore.cpp | 52 +++++++++++++++++-- .../renderer_vulkan/vk_master_semaphore.h | 15 +++++- 2 files changed, 61 insertions(+), 6 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_master_semaphore.cpp b/src/video_core/renderer_vulkan/vk_master_semaphore.cpp index 47c74e4d8..8b65aeaeb 100644 --- a/src/video_core/renderer_vulkan/vk_master_semaphore.cpp +++ b/src/video_core/renderer_vulkan/vk_master_semaphore.cpp @@ -10,11 +10,16 @@ namespace Vulkan { +constexpr u64 FENCE_RESERVE_SIZE = 8; + MasterSemaphore::MasterSemaphore(const Device& device_) : device(device_) { if (!device.HasTimelineSemaphore()) { static constexpr VkFenceCreateInfo fence_ci{ .sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, .pNext = nullptr, .flags = 0}; - fence = device.GetLogical().CreateFence(fence_ci); + free_queue.resize(FENCE_RESERVE_SIZE); + std::ranges::generate(free_queue, + [&] { return device.GetLogical().CreateFence(fence_ci); }); + wait_thread = std::jthread([this](std::stop_token token) { WaitThread(token); }); return; } @@ -167,16 +172,53 @@ VkResult MasterSemaphore::SubmitQueueFence(vk::CommandBuffer& cmdbuf, VkSemaphor .pSignalSemaphores = &signal_semaphore, }; + auto fence = GetFreeFence(); auto result = device.GetGraphicsQueue().Submit(submit_info, *fence); if (result == VK_SUCCESS) { - fence.Wait(); - fence.Reset(); - gpu_tick.store(host_tick); - gpu_tick.notify_all(); + std::scoped_lock lock{wait_mutex}; + wait_queue.emplace(host_tick, std::move(fence)); + wait_cv.notify_one(); } return result; } +void MasterSemaphore::WaitThread(std::stop_token token) { + while (!token.stop_requested()) { + u64 host_tick; + vk::Fence fence; + { + std::unique_lock lock{wait_mutex}; + Common::CondvarWait(wait_cv, lock, token, [this] { return !wait_queue.empty(); }); + if (token.stop_requested()) { + return; + } + std::tie(host_tick, fence) = std::move(wait_queue.front()); + wait_queue.pop(); + } + + fence.Wait(); + fence.Reset(); + gpu_tick.store(host_tick); + gpu_tick.notify_all(); + + std::scoped_lock lock{free_mutex}; + free_queue.push_front(std::move(fence)); + } +} + +vk::Fence MasterSemaphore::GetFreeFence() { + std::scoped_lock lock{free_mutex}; + if (free_queue.empty()) { + static constexpr VkFenceCreateInfo fence_ci{ + .sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, .pNext = nullptr, .flags = 0}; + return device.GetLogical().CreateFence(fence_ci); + } + + auto fence = std::move(free_queue.back()); + free_queue.pop_back(); + return fence; +} + } // namespace Vulkan diff --git a/src/video_core/renderer_vulkan/vk_master_semaphore.h b/src/video_core/renderer_vulkan/vk_master_semaphore.h index f2f61f781..1e7c90215 100644 --- a/src/video_core/renderer_vulkan/vk_master_semaphore.h +++ b/src/video_core/renderer_vulkan/vk_master_semaphore.h @@ -5,8 +5,10 @@ #include #include +#include #include #include +#include #include "common/common_types.h" #include "common/polyfill_thread.h" @@ -17,6 +19,8 @@ namespace Vulkan { class Device; class MasterSemaphore { + using Waitable = std::pair; + public: explicit MasterSemaphore(const Device& device); ~MasterSemaphore(); @@ -57,13 +61,22 @@ private: VkResult SubmitQueueFence(vk::CommandBuffer& cmdbuf, VkSemaphore signal_semaphore, VkSemaphore wait_semaphore, u64 host_tick); + void WaitThread(std::stop_token token); + + vk::Fence GetFreeFence(); + private: const Device& device; ///< Device. - vk::Fence fence; ///< Fence. vk::Semaphore semaphore; ///< Timeline semaphore. std::atomic gpu_tick{0}; ///< Current known GPU tick. std::atomic current_tick{1}; ///< Current logical tick. + std::mutex wait_mutex; + std::mutex free_mutex; + std::condition_variable_any wait_cv; + std::queue wait_queue; ///< Queue for the fences to be waited on by the wait thread. + std::deque free_queue; ///< Holds available fences for submission. std::jthread debug_thread; ///< Debug thread to workaround validation layer bugs. + std::jthread wait_thread; ///< Helper thread that waits for submitted fences. }; } // namespace Vulkan From e5c2ec223aa3cc45974fbc4c046bbf2e8f8e8797 Mon Sep 17 00:00:00 2001 From: Danila Malyutin Date: Sun, 21 May 2023 03:02:26 +0400 Subject: [PATCH 0401/1181] externals: update cubeb --- externals/cubeb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/cubeb b/externals/cubeb index 2d817de7c..48689ae7a 160000 --- a/externals/cubeb +++ b/externals/cubeb @@ -1 +1 @@ -Subproject commit 2d817de7c58b33a7c045edf873f3f9c98e4a2082 +Subproject commit 48689ae7a73caeb747953f9ed664dc71d2f918d8 From 7701a00a0277ad59c1b743b9aa14c6861624b847 Mon Sep 17 00:00:00 2001 From: Danila Malyutin Date: Sun, 14 May 2023 01:35:01 +0400 Subject: [PATCH 0402/1181] Add support for deinterlaced videos playback This is a follow up to #10254 to improve the playback of cut scenes in Layton's Mystery Journey. It uses ffmpeg's yadif filter for deinterlacing. --- CMakeLists.txt | 1 + externals/ffmpeg/CMakeLists.txt | 5 +- src/video_core/host1x/codecs/codec.cpp | 93 +++++++++++++++++++++++++- src/video_core/host1x/codecs/codec.h | 8 +++ 4 files changed, 103 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 561eaafb2..7276ac9dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -453,6 +453,7 @@ endif() # List of all FFmpeg components required set(FFmpeg_COMPONENTS avcodec + avfilter avutil swscale) diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index 0baac8e17..03fad0778 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt @@ -131,7 +131,6 @@ if (NOT WIN32) COMMAND /bin/bash ${FFmpeg_PREFIX}/configure --disable-avdevice - --disable-avfilter --disable-avformat --disable-doc --disable-everything @@ -143,6 +142,7 @@ if (NOT WIN32) --enable-decoder=h264 --enable-decoder=vp8 --enable-decoder=vp9 + --enable-filter=yadif --cc="${FFmpeg_CC}" --cxx="${FFmpeg_CXX}" ${FFmpeg_HWACCEL_FLAGS} @@ -199,7 +199,7 @@ if (NOT WIN32) endif() else(WIN32) # Use yuzu FFmpeg binaries - set(FFmpeg_EXT_NAME "ffmpeg-4.4") + set(FFmpeg_EXT_NAME "ffmpeg-5.1.3") set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") set(FFmpeg_FOUND YES) @@ -210,6 +210,7 @@ else(WIN32) set(FFmpeg_LIBRARIES ${FFmpeg_LIBRARY_DIR}/swscale.lib ${FFmpeg_LIBRARY_DIR}/avcodec.lib + ${FFmpeg_LIBRARY_DIR}/avfilter.lib ${FFmpeg_LIBRARY_DIR}/avutil.lib CACHE PATH "Paths to FFmpeg libraries" FORCE) # exported variables diff --git a/src/video_core/host1x/codecs/codec.cpp b/src/video_core/host1x/codecs/codec.cpp index 3e9022dce..cd6a3a9b8 100644 --- a/src/video_core/host1x/codecs/codec.cpp +++ b/src/video_core/host1x/codecs/codec.cpp @@ -5,6 +5,7 @@ #include #include #include "common/assert.h" +#include "common/scope_exit.h" #include "common/settings.h" #include "video_core/host1x/codecs/codec.h" #include "video_core/host1x/codecs/h264.h" @@ -14,6 +15,8 @@ #include "video_core/memory_manager.h" extern "C" { +#include +#include #include #ifdef LIBVA_FOUND // for querying VAAPI driver information @@ -85,6 +88,10 @@ Codec::~Codec() { // Free libav memory avcodec_free_context(&av_codec_ctx); av_buffer_unref(&av_gpu_decoder); + + if (filters_initialized) { + avfilter_graph_free(&av_filter_graph); + } } bool Codec::CreateGpuAvDevice() { @@ -167,6 +174,62 @@ void Codec::InitializeGpuDecoder() { av_codec_ctx->get_format = GetGpuFormat; } +void Codec::InitializeAvFilters(AVFrame* frame) { + const AVFilter* buffer_src = avfilter_get_by_name("buffer"); + const AVFilter* buffer_sink = avfilter_get_by_name("buffersink"); + AVFilterInOut* inputs = avfilter_inout_alloc(); + AVFilterInOut* outputs = avfilter_inout_alloc(); + SCOPE_EXIT({ + avfilter_inout_free(&inputs); + avfilter_inout_free(&outputs); + }); + + // Don't know how to get the accurate time_base but it doesn't matter for yadif filter + // so just use 1/1 to make buffer filter happy + std::string args = fmt::format("video_size={}x{}:pix_fmt={}:time_base=1/1", frame->width, + frame->height, frame->format); + + av_filter_graph = avfilter_graph_alloc(); + int ret = avfilter_graph_create_filter(&av_filter_src_ctx, buffer_src, "in", args.c_str(), + nullptr, av_filter_graph); + if (ret < 0) { + LOG_ERROR(Service_NVDRV, "avfilter_graph_create_filter source error: {}", ret); + return; + } + + ret = avfilter_graph_create_filter(&av_filter_sink_ctx, buffer_sink, "out", nullptr, nullptr, + av_filter_graph); + if (ret < 0) { + LOG_ERROR(Service_NVDRV, "avfilter_graph_create_filter sink error: {}", ret); + return; + } + + inputs->name = av_strdup("out"); + inputs->filter_ctx = av_filter_sink_ctx; + inputs->pad_idx = 0; + inputs->next = nullptr; + + outputs->name = av_strdup("in"); + outputs->filter_ctx = av_filter_src_ctx; + outputs->pad_idx = 0; + outputs->next = nullptr; + + const char* description = "yadif=1:-1:0"; + ret = avfilter_graph_parse_ptr(av_filter_graph, description, &inputs, &outputs, nullptr); + if (ret < 0) { + LOG_ERROR(Service_NVDRV, "avfilter_graph_parse_ptr error: {}", ret); + return; + } + + ret = avfilter_graph_config(av_filter_graph, nullptr); + if (ret < 0) { + LOG_ERROR(Service_NVDRV, "avfilter_graph_config error: {}", ret); + return; + } + + filters_initialized = true; +} + void Codec::Initialize() { const AVCodecID codec = [&] { switch (current_codec) { @@ -271,8 +334,34 @@ void Codec::Decode() { UNIMPLEMENTED_MSG("Unexpected video format: {}", final_frame->format); return; } - av_frames.push(std::move(final_frame)); - if (av_frames.size() > 10) { + if (!final_frame->interlaced_frame) { + av_frames.push(std::move(final_frame)); + } else { + if (!filters_initialized) { + InitializeAvFilters(final_frame.get()); + } + if (const int ret = av_buffersrc_add_frame_flags(av_filter_src_ctx, final_frame.get(), + AV_BUFFERSRC_FLAG_KEEP_REF); + ret) { + LOG_DEBUG(Service_NVDRV, "av_buffersrc_add_frame_flags error {}", ret); + return; + } + while (true) { + auto filter_frame = AVFramePtr{av_frame_alloc(), AVFrameDeleter}; + + int ret = av_buffersink_get_frame(av_filter_sink_ctx, filter_frame.get()); + + if (ret == AVERROR(EAGAIN) || ret == AVERROR(AVERROR_EOF)) + break; + if (ret < 0) { + LOG_DEBUG(Service_NVDRV, "av_buffersink_get_frame error {}", ret); + return; + } + + av_frames.push(std::move(filter_frame)); + } + } + while (av_frames.size() > 10) { LOG_TRACE(Service_NVDRV, "av_frames.push overflow dropped frame"); av_frames.pop(); } diff --git a/src/video_core/host1x/codecs/codec.h b/src/video_core/host1x/codecs/codec.h index 0d45fb7fe..06fe00a4b 100644 --- a/src/video_core/host1x/codecs/codec.h +++ b/src/video_core/host1x/codecs/codec.h @@ -15,6 +15,7 @@ extern "C" { #pragma GCC diagnostic ignored "-Wconversion" #endif #include +#include #if defined(__GNUC__) || defined(__clang__) #pragma GCC diagnostic pop #endif @@ -61,17 +62,24 @@ public: private: void InitializeAvCodecContext(); + void InitializeAvFilters(AVFrame* frame); + void InitializeGpuDecoder(); bool CreateGpuAvDevice(); bool initialized{}; + bool filters_initialized{}; Host1x::NvdecCommon::VideoCodec current_codec{Host1x::NvdecCommon::VideoCodec::None}; const AVCodec* av_codec{nullptr}; AVCodecContext* av_codec_ctx{nullptr}; AVBufferRef* av_gpu_decoder{nullptr}; + AVFilterContext* av_filter_src_ctx{nullptr}; + AVFilterContext* av_filter_sink_ctx{nullptr}; + AVFilterGraph* av_filter_graph{nullptr}; + Host1x::Host1x& host1x; const Host1x::NvdecCommon::NvdecRegisters& state; std::unique_ptr h264_decoder; From fdb2002f77de6af19cc7f526b2e7540c329161c3 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Wed, 17 May 2023 22:17:16 -0600 Subject: [PATCH 0403/1181] input_common: Implement amiibo writting --- src/core/hid/emulated_controller.cpp | 9 +- src/core/hle/service/nfc/common/device.cpp | 8 +- src/input_common/drivers/joycon.cpp | 8 +- src/input_common/helpers/joycon_driver.cpp | 20 ++ src/input_common/helpers/joycon_driver.h | 1 + .../helpers/joycon_protocol/joycon_types.h | 50 ++- .../helpers/joycon_protocol/nfc.cpp | 332 +++++++++++++++--- .../helpers/joycon_protocol/nfc.h | 27 +- 8 files changed, 387 insertions(+), 68 deletions(-) diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index 366880711..bbfea7117 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp @@ -1283,9 +1283,14 @@ bool EmulatedController::HasNfc() const { } bool EmulatedController::WriteNfc(const std::vector& data) { - auto& nfc_output_device = output_devices[3]; + auto& nfc_output_device = output_devices[static_cast(DeviceIndex::Right)]; + auto& nfc_virtual_output_device = output_devices[3]; - return nfc_output_device->WriteNfcData(data) == Common::Input::NfcState::Success; + if (nfc_output_device->SupportsNfc() != Common::Input::NfcState::NotSupported) { + return nfc_output_device->WriteNfcData(data) == Common::Input::NfcState::Success; + } + + return nfc_virtual_output_device->WriteNfcData(data) == Common::Input::NfcState::Success; } void EmulatedController::SetLedPattern() { diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp index 322bde2ed..8a7e9edac 100644 --- a/src/core/hle/service/nfc/common/device.cpp +++ b/src/core/hle/service/nfc/common/device.cpp @@ -421,11 +421,11 @@ Result NfcDevice::Flush() { tag_data.write_counter++; - FlushWithBreak(NFP::BreakType::Normal); + const auto result = FlushWithBreak(NFP::BreakType::Normal); is_data_moddified = false; - return ResultSuccess; + return result; } Result NfcDevice::FlushDebug() { @@ -444,11 +444,11 @@ Result NfcDevice::FlushDebug() { tag_data.write_counter++; - FlushWithBreak(NFP::BreakType::Normal); + const auto result = FlushWithBreak(NFP::BreakType::Normal); is_data_moddified = false; - return ResultSuccess; + return result; } Result NfcDevice::FlushWithBreak(NFP::BreakType break_type) { diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp index 653862a72..b2b5677c8 100644 --- a/src/input_common/drivers/joycon.cpp +++ b/src/input_common/drivers/joycon.cpp @@ -291,9 +291,13 @@ Common::Input::NfcState Joycons::SupportsNfc(const PadIdentifier& identifier_) c return Common::Input::NfcState::Success; }; -Common::Input::NfcState Joycons::WriteNfcData(const PadIdentifier& identifier_, +Common::Input::NfcState Joycons::WriteNfcData(const PadIdentifier& identifier, const std::vector& data) { - return Common::Input::NfcState::NotSupported; + auto handle = GetHandle(identifier); + if (handle->WriteNfcData(data) != Joycon::DriverResult::Success) { + return Common::Input::NfcState::WriteFailed; + } + return Common::Input::NfcState::Success; }; Common::Input::DriverResult Joycons::SetPollingMode(const PadIdentifier& identifier, diff --git a/src/input_common/helpers/joycon_driver.cpp b/src/input_common/helpers/joycon_driver.cpp index 83429a336..95106f16d 100644 --- a/src/input_common/helpers/joycon_driver.cpp +++ b/src/input_common/helpers/joycon_driver.cpp @@ -492,6 +492,26 @@ DriverResult JoyconDriver::SetRingConMode() { return result; } +DriverResult JoyconDriver::WriteNfcData(std::span data) { + std::scoped_lock lock{mutex}; + disable_input_thread = true; + + if (!supported_features.nfc) { + return DriverResult::NotSupported; + } + if (!nfc_protocol->IsEnabled()) { + return DriverResult::Disabled; + } + if (!amiibo_detected) { + return DriverResult::ErrorWritingData; + } + + const auto result = nfc_protocol->WriteAmiibo(data); + + disable_input_thread = false; + return result; +} + bool JoyconDriver::IsConnected() const { std::scoped_lock lock{mutex}; return is_connected.load(); diff --git a/src/input_common/helpers/joycon_driver.h b/src/input_common/helpers/joycon_driver.h index 72a9e71dc..e9b2fccbb 100644 --- a/src/input_common/helpers/joycon_driver.h +++ b/src/input_common/helpers/joycon_driver.h @@ -49,6 +49,7 @@ public: DriverResult SetIrMode(); DriverResult SetNfcMode(); DriverResult SetRingConMode(); + DriverResult WriteNfcData(std::span data); void SetCallbacks(const JoyconCallbacks& callbacks); diff --git a/src/input_common/helpers/joycon_protocol/joycon_types.h b/src/input_common/helpers/joycon_protocol/joycon_types.h index 353dc744d..5007b0e18 100644 --- a/src/input_common/helpers/joycon_protocol/joycon_types.h +++ b/src/input_common/helpers/joycon_protocol/joycon_types.h @@ -23,6 +23,7 @@ constexpr std::array DefaultVibrationBuffer{0x0, 0x1, 0x40, 0x40, 0x0, 0x using MacAddress = std::array; using SerialNumber = std::array; +using TagUUID = std::array; enum class ControllerType : u8 { None = 0x00, @@ -276,12 +277,13 @@ enum class MCUPacketFlag : u8 { LastCommandPacket = 0x08, }; -enum class NFCReadCommand : u8 { +enum class NFCCommand : u8 { CancelAll = 0x00, StartPolling = 0x01, StopPolling = 0x02, StartWaitingRecieve = 0x04, - Ntag = 0x06, + ReadNtag = 0x06, + WriteNtag = 0x08, Mifare = 0x0F, }; @@ -292,14 +294,19 @@ enum class NFCTagType : u8 { enum class NFCPages { Block0 = 0, + Block3 = 3, Block45 = 45, Block135 = 135, Block231 = 231, }; enum class NFCStatus : u8 { + Ready = 0x00, + Polling = 0x01, LastPackage = 0x04, + WriteDone = 0x05, TagLost = 0x07, + WriteReady = 0x09, }; enum class IrsMode : u8 { @@ -559,13 +566,32 @@ static_assert(sizeof(NFCReadBlockCommand) == 0x9, "NFCReadBlockCommand is an inv struct NFCReadCommandData { u8 unknown; u8 uuid_length; - u8 unknown_2; - std::array uid; + TagUUID uid; NFCTagType tag_type; NFCReadBlockCommand read_block; }; static_assert(sizeof(NFCReadCommandData) == 0x13, "NFCReadCommandData is an invalid size"); +#pragma pack(push, 1) +struct NFCWriteCommandData { + u8 unknown; + u8 uuid_length; + TagUUID uid; + NFCTagType tag_type; + u8 unknown2; + u8 unknown3; + u8 unknown4; + u8 unknown5; + u8 unknown6; + u8 unknown7; + u8 unknown8; + u8 magic; + u16_be write_count; + u8 amiibo_version; +}; +static_assert(sizeof(NFCWriteCommandData) == 0x15, "NFCWriteCommandData is an invalid size"); +#pragma pack(pop) + struct NFCPollingCommandData { u8 enable_mifare; u8 unknown_1; @@ -576,8 +602,8 @@ struct NFCPollingCommandData { static_assert(sizeof(NFCPollingCommandData) == 0x05, "NFCPollingCommandData is an invalid size"); struct NFCRequestState { - NFCReadCommand command_argument; - INSERT_PADDING_BYTES(0x1); + NFCCommand command_argument; + u8 block_id; u8 packet_id; MCUPacketFlag packet_flag; u8 data_length; @@ -591,6 +617,18 @@ struct NFCRequestState { }; static_assert(sizeof(NFCRequestState) == 0x26, "NFCRequestState is an invalid size"); +struct NFCDataChunk { + u8 nfc_page; + u8 data_size; + std::array data; +}; + +struct NFCWritePackage { + NFCWriteCommandData command_data; + u8 number_of_chunks; + std::array data_chunks; +}; + struct IrsConfigure { MCUCommand command; MCUSubCommand sub_command; diff --git a/src/input_common/helpers/joycon_protocol/nfc.cpp b/src/input_common/helpers/joycon_protocol/nfc.cpp index 46c9e9489..3b7a628e5 100644 --- a/src/input_common/helpers/joycon_protocol/nfc.cpp +++ b/src/input_common/helpers/joycon_protocol/nfc.cpp @@ -34,6 +34,12 @@ DriverResult NfcProtocol::EnableNfc() { result = ConfigureMCU(config); } + if (result == DriverResult::Success) { + result = WaitSetMCUMode(ReportMode::NFC_IR_MODE_60HZ, MCUMode::NFC); + } + if (result == DriverResult::Success) { + result = WaitUntilNfcIs(NFCStatus::Ready); + } return result; } @@ -56,27 +62,20 @@ DriverResult NfcProtocol::StartNFCPollingMode() { LOG_DEBUG(Input, "Start NFC pooling Mode"); ScopedSetBlocking sb(this); DriverResult result{DriverResult::Success}; - TagFoundData tag_data{}; - if (result == DriverResult::Success) { - result = WaitSetMCUMode(ReportMode::NFC_IR_MODE_60HZ, MCUMode::NFC); - } - if (result == DriverResult::Success) { - result = WaitUntilNfcIsReady(); - } if (result == DriverResult::Success) { MCUCommandResponse output{}; result = SendStopPollingRequest(output); } if (result == DriverResult::Success) { - result = WaitUntilNfcIsReady(); + result = WaitUntilNfcIs(NFCStatus::Ready); } if (result == DriverResult::Success) { MCUCommandResponse output{}; result = SendStartPollingRequest(output); } if (result == DriverResult::Success) { - result = WaitUntilNfcIsPolling(); + result = WaitUntilNfcIs(NFCStatus::Polling); } if (result == DriverResult::Success) { is_enabled = true; @@ -112,6 +111,49 @@ DriverResult NfcProtocol::ScanAmiibo(std::vector& data) { return result; } +DriverResult NfcProtocol::WriteAmiibo(std::span data) { + LOG_DEBUG(Input, "Write amiibo"); + ScopedSetBlocking sb(this); + DriverResult result{DriverResult::Success}; + TagUUID tag_uuid = GetTagUUID(data); + TagFoundData tag_data{}; + + if (result == DriverResult::Success) { + result = IsTagInRange(tag_data, 7); + } + if (result == DriverResult::Success) { + if (tag_data.uuid != tag_uuid) { + result = DriverResult::InvalidParameters; + } + } + if (result == DriverResult::Success) { + MCUCommandResponse output{}; + result = SendStopPollingRequest(output); + } + if (result == DriverResult::Success) { + result = WaitUntilNfcIs(NFCStatus::Ready); + } + if (result == DriverResult::Success) { + MCUCommandResponse output{}; + result = SendStartPollingRequest(output, true); + } + if (result == DriverResult::Success) { + result = WaitUntilNfcIs(NFCStatus::WriteReady); + } + if (result == DriverResult::Success) { + result = WriteAmiiboData(tag_uuid, data); + } + if (result == DriverResult::Success) { + result = WaitUntilNfcIs(NFCStatus::WriteDone); + } + if (result == DriverResult::Success) { + MCUCommandResponse output{}; + result = SendStopPollingRequest(output); + } + + return result; +} + bool NfcProtocol::HasAmiibo() { if (update_counter++ < AMIIBO_UPDATE_DELAY) { return true; @@ -129,7 +171,7 @@ bool NfcProtocol::HasAmiibo() { return result == DriverResult::Success; } -DriverResult NfcProtocol::WaitUntilNfcIsReady() { +DriverResult NfcProtocol::WaitUntilNfcIs(NFCStatus status) { constexpr std::size_t timeout_limit = 10; MCUCommandResponse output{}; std::size_t tries = 0; @@ -145,28 +187,7 @@ DriverResult NfcProtocol::WaitUntilNfcIsReady() { } } while (output.mcu_report != MCUReport::NFCState || (output.mcu_data[1] << 8) + output.mcu_data[0] != 0x0500 || - output.mcu_data[5] != 0x31 || output.mcu_data[6] != 0x00); - - return DriverResult::Success; -} - -DriverResult NfcProtocol::WaitUntilNfcIsPolling() { - constexpr std::size_t timeout_limit = 10; - MCUCommandResponse output{}; - std::size_t tries = 0; - - do { - auto result = SendNextPackageRequest(output, {}); - - if (result != DriverResult::Success) { - return result; - } - if (tries++ > timeout_limit) { - return DriverResult::Timeout; - } - } while (output.mcu_report != MCUReport::NFCState || - (output.mcu_data[1] << 8) + output.mcu_data[0] != 0x0500 || - output.mcu_data[5] != 0x31 || output.mcu_data[6] != 0x01); + output.mcu_data[5] != 0x31 || output.mcu_data[6] != static_cast(status)); return DriverResult::Success; } @@ -188,7 +209,7 @@ DriverResult NfcProtocol::IsTagInRange(TagFoundData& data, std::size_t timeout_l (output.mcu_data[6] != 0x09 && output.mcu_data[6] != 0x04)); data.type = output.mcu_data[12]; - data.uuid.resize(output.mcu_data[14]); + data.uuid_size = std::min(output.mcu_data[14], static_cast(sizeof(TagUUID))); memcpy(data.uuid.data(), output.mcu_data.data() + 15, data.uuid.size()); return DriverResult::Success; @@ -245,17 +266,94 @@ DriverResult NfcProtocol::GetAmiiboData(std::vector& ntag_data) { return DriverResult::Timeout; } -DriverResult NfcProtocol::SendStartPollingRequest(MCUCommandResponse& output) { +DriverResult NfcProtocol::WriteAmiiboData(const TagUUID& tag_uuid, std::span data) { + constexpr std::size_t timeout_limit = 60; + const auto nfc_data = MakeAmiiboWritePackage(tag_uuid, data); + const std::vector nfc_buffer_data = SerializeWritePackage(nfc_data); + std::span buffer(nfc_buffer_data); + MCUCommandResponse output{}; + u8 block_id = 1; + u8 package_index = 0; + std::size_t tries = 0; + std::size_t current_position = 0; + + LOG_INFO(Input, "Writing amiibo data"); + + auto result = SendWriteAmiiboRequest(output, tag_uuid); + + if (result != DriverResult::Success) { + return result; + } + + // Read Tag data but ignore the actual sent data + while (tries++ < timeout_limit) { + result = SendNextPackageRequest(output, package_index); + const auto nfc_status = static_cast(output.mcu_data[6]); + + if (result != DriverResult::Success) { + return result; + } + + if ((output.mcu_report == MCUReport::NFCReadData || + output.mcu_report == MCUReport::NFCState) && + nfc_status == NFCStatus::TagLost) { + return DriverResult::ErrorReadingData; + } + + if (output.mcu_report == MCUReport::NFCReadData && output.mcu_data[1] == 0x07) { + package_index++; + continue; + } + + if (output.mcu_report == MCUReport::NFCState && nfc_status == NFCStatus::LastPackage) { + LOG_INFO(Input, "Finished reading amiibo"); + break; + } + } + + // Send Data. Nfc buffer size is 31, Send the data in smaller packages + while (current_position < buffer.size() && tries++ < timeout_limit) { + const std::size_t next_position = + std::min(current_position + sizeof(NFCRequestState::raw_data), buffer.size()); + const std::size_t block_size = next_position - current_position; + const bool is_last_packet = block_size < sizeof(NFCRequestState::raw_data); + + SendWriteDataAmiiboRequest(output, block_id, is_last_packet, + buffer.subspan(current_position, block_size)); + + const auto nfc_status = static_cast(output.mcu_data[6]); + + if ((output.mcu_report == MCUReport::NFCReadData || + output.mcu_report == MCUReport::NFCState) && + nfc_status == NFCStatus::TagLost) { + return DriverResult::ErrorReadingData; + } + + // Increase position when data is confirmed by the joycon + if (output.mcu_report == MCUReport::NFCState && + (output.mcu_data[1] << 8) + output.mcu_data[0] == 0x0500 && + output.mcu_data[3] == block_id) { + block_id++; + current_position = next_position; + } + } + + return result; +} + +DriverResult NfcProtocol::SendStartPollingRequest(MCUCommandResponse& output, + bool is_second_attempt) { NFCRequestState request{ - .command_argument = NFCReadCommand::StartPolling, - .packet_id = 0x0, + .command_argument = NFCCommand::StartPolling, + .block_id = {}, + .packet_id = {}, .packet_flag = MCUPacketFlag::LastCommandPacket, .data_length = sizeof(NFCPollingCommandData), .nfc_polling = { - .enable_mifare = 0x01, - .unknown_1 = 0x00, - .unknown_2 = 0x00, + .enable_mifare = 0x00, + .unknown_1 = static_cast(is_second_attempt ? 0xe8 : 0x00), + .unknown_2 = static_cast(is_second_attempt ? 0x03 : 0x00), .unknown_3 = 0x2c, .unknown_4 = 0x01, }, @@ -271,10 +369,11 @@ DriverResult NfcProtocol::SendStartPollingRequest(MCUCommandResponse& output) { DriverResult NfcProtocol::SendStopPollingRequest(MCUCommandResponse& output) { NFCRequestState request{ - .command_argument = NFCReadCommand::StopPolling, - .packet_id = 0x0, + .command_argument = NFCCommand::StopPolling, + .block_id = {}, + .packet_id = {}, .packet_flag = MCUPacketFlag::LastCommandPacket, - .data_length = 0, + .data_length = {}, .raw_data = {}, .crc = {}, }; @@ -288,10 +387,11 @@ DriverResult NfcProtocol::SendStopPollingRequest(MCUCommandResponse& output) { DriverResult NfcProtocol::SendNextPackageRequest(MCUCommandResponse& output, u8 packet_id) { NFCRequestState request{ - .command_argument = NFCReadCommand::StartWaitingRecieve, + .command_argument = NFCCommand::StartWaitingRecieve, + .block_id = {}, .packet_id = packet_id, .packet_flag = MCUPacketFlag::LastCommandPacket, - .data_length = 0, + .data_length = {}, .raw_data = {}, .crc = {}, }; @@ -305,17 +405,17 @@ DriverResult NfcProtocol::SendNextPackageRequest(MCUCommandResponse& output, u8 DriverResult NfcProtocol::SendReadAmiiboRequest(MCUCommandResponse& output, NFCPages ntag_pages) { NFCRequestState request{ - .command_argument = NFCReadCommand::Ntag, - .packet_id = 0x0, + .command_argument = NFCCommand::ReadNtag, + .block_id = {}, + .packet_id = {}, .packet_flag = MCUPacketFlag::LastCommandPacket, .data_length = sizeof(NFCReadCommandData), .nfc_read = { .unknown = 0xd0, - .uuid_length = 0x07, - .unknown_2 = 0x00, + .uuid_length = sizeof(NFCReadCommandData::uid), .uid = {}, - .tag_type = NFCTagType::AllTags, + .tag_type = NFCTagType::Ntag215, .read_block = GetReadBlockCommand(ntag_pages), }, .crc = {}, @@ -328,12 +428,135 @@ DriverResult NfcProtocol::SendReadAmiiboRequest(MCUCommandResponse& output, NFCP output); } +DriverResult NfcProtocol::SendWriteAmiiboRequest(MCUCommandResponse& output, + const TagUUID& tag_uuid) { + NFCRequestState request{ + .command_argument = NFCCommand::ReadNtag, + .block_id = {}, + .packet_id = {}, + .packet_flag = MCUPacketFlag::LastCommandPacket, + .data_length = sizeof(NFCReadCommandData), + .nfc_read = + { + .unknown = 0xd0, + .uuid_length = sizeof(NFCReadCommandData::uid), + .uid = tag_uuid, + .tag_type = NFCTagType::Ntag215, + .read_block = GetReadBlockCommand(NFCPages::Block3), + }, + .crc = {}, + }; + + std::array request_data{}; + memcpy(request_data.data(), &request, sizeof(NFCRequestState)); + request_data[36] = CalculateMCU_CRC8(request_data.data(), 36); + return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, MCUSubCommand::ReadDeviceMode, request_data, + output); +} + +DriverResult NfcProtocol::SendWriteDataAmiiboRequest(MCUCommandResponse& output, u8 block_id, + bool is_last_packet, + std::span data) { + const auto data_size = std::min(data.size(), sizeof(NFCRequestState::raw_data)); + NFCRequestState request{ + .command_argument = NFCCommand::WriteNtag, + .block_id = block_id, + .packet_id = {}, + .packet_flag = + is_last_packet ? MCUPacketFlag::LastCommandPacket : MCUPacketFlag::MorePacketsRemaining, + .data_length = static_cast(data_size), + .raw_data = {}, + .crc = {}, + }; + memcpy(request.raw_data.data(), data.data(), data_size); + + std::array request_data{}; + memcpy(request_data.data(), &request, sizeof(NFCRequestState)); + request_data[36] = CalculateMCU_CRC8(request_data.data(), 36); + return SendMCUData(ReportMode::NFC_IR_MODE_60HZ, MCUSubCommand::ReadDeviceMode, request_data, + output); +} + +std::vector NfcProtocol::SerializeWritePackage(const NFCWritePackage& package) const { + const std::size_t header_size = + sizeof(NFCWriteCommandData) + sizeof(NFCWritePackage::number_of_chunks); + std::vector serialized_data(header_size); + std::size_t start_index = 0; + + memcpy(serialized_data.data(), &package, header_size); + start_index += header_size; + + for (const auto& data_chunk : package.data_chunks) { + const std::size_t chunk_size = + sizeof(NFCDataChunk::nfc_page) + sizeof(NFCDataChunk::data_size) + data_chunk.data_size; + + serialized_data.resize(start_index + chunk_size); + memcpy(serialized_data.data() + start_index, &data_chunk, chunk_size); + start_index += chunk_size; + } + + return serialized_data; +} + +NFCWritePackage NfcProtocol::MakeAmiiboWritePackage(const TagUUID& tag_uuid, + std::span data) const { + return { + .command_data{ + .unknown = 0xd0, + .uuid_length = sizeof(NFCReadCommandData::uid), + .uid = tag_uuid, + .tag_type = NFCTagType::Ntag215, + .unknown2 = 0x00, + .unknown3 = 0x01, + .unknown4 = 0x04, + .unknown5 = 0xff, + .unknown6 = 0xff, + .unknown7 = 0xff, + .unknown8 = 0xff, + .magic = data[16], + .write_count = static_cast((data[17] << 8) + data[18]), + .amiibo_version = data[19], + }, + .number_of_chunks = 3, + .data_chunks = + { + MakeAmiiboChunk(0x05, 0x20, data), + MakeAmiiboChunk(0x20, 0xf0, data), + MakeAmiiboChunk(0x5c, 0x98, data), + }, + }; +} + +NFCDataChunk NfcProtocol::MakeAmiiboChunk(u8 page, u8 size, std::span data) const { + constexpr u8 PAGE_SIZE = 4; + + if (static_cast(page * PAGE_SIZE) + size >= data.size()) { + return {}; + } + + NFCDataChunk chunk{ + .nfc_page = page, + .data_size = size, + .data = {}, + }; + std::memcpy(chunk.data.data(), data.data() + (page * PAGE_SIZE), size); + return chunk; +} + NFCReadBlockCommand NfcProtocol::GetReadBlockCommand(NFCPages pages) const { switch (pages) { case NFCPages::Block0: return { .block_count = 1, }; + case NFCPages::Block3: + return { + .block_count = 1, + .blocks = + { + NFCReadBlock{0x03, 0x03}, + }, + }; case NFCPages::Block45: return { .block_count = 1, @@ -368,6 +591,17 @@ NFCReadBlockCommand NfcProtocol::GetReadBlockCommand(NFCPages pages) const { }; } +TagUUID NfcProtocol::GetTagUUID(std::span data) const { + if (data.size() < 10) { + return {}; + } + + // crc byte 3 is omitted in this operation + return { + data[0], data[1], data[2], data[4], data[5], data[6], data[7], + }; +} + bool NfcProtocol::IsEnabled() const { return is_enabled; } diff --git a/src/input_common/helpers/joycon_protocol/nfc.h b/src/input_common/helpers/joycon_protocol/nfc.h index c9e9af03f..eb58c427d 100644 --- a/src/input_common/helpers/joycon_protocol/nfc.h +++ b/src/input_common/helpers/joycon_protocol/nfc.h @@ -27,6 +27,8 @@ public: DriverResult ScanAmiibo(std::vector& data); + DriverResult WriteAmiibo(std::span data); + bool HasAmiibo(); bool IsEnabled() const; @@ -37,18 +39,20 @@ private: struct TagFoundData { u8 type; - std::vector uuid; + u8 uuid_size; + TagUUID uuid; }; - DriverResult WaitUntilNfcIsReady(); - - DriverResult WaitUntilNfcIsPolling(); + DriverResult WaitUntilNfcIs(NFCStatus status); DriverResult IsTagInRange(TagFoundData& data, std::size_t timeout_limit = 1); DriverResult GetAmiiboData(std::vector& data); - DriverResult SendStartPollingRequest(MCUCommandResponse& output); + DriverResult WriteAmiiboData(const TagUUID& tag_uuid, std::span data); + + DriverResult SendStartPollingRequest(MCUCommandResponse& output, + bool is_second_attempt = false); DriverResult SendStopPollingRequest(MCUCommandResponse& output); @@ -56,8 +60,21 @@ private: DriverResult SendReadAmiiboRequest(MCUCommandResponse& output, NFCPages ntag_pages); + DriverResult SendWriteAmiiboRequest(MCUCommandResponse& output, const TagUUID& tag_uuid); + + DriverResult SendWriteDataAmiiboRequest(MCUCommandResponse& output, u8 block_id, + bool is_last_packet, std::span data); + + std::vector SerializeWritePackage(const NFCWritePackage& package) const; + + NFCWritePackage MakeAmiiboWritePackage(const TagUUID& tag_uuid, std::span data) const; + + NFCDataChunk MakeAmiiboChunk(u8 page, u8 size, std::span data) const; + NFCReadBlockCommand GetReadBlockCommand(NFCPages pages) const; + TagUUID GetTagUUID(std::span data) const; + bool is_enabled{}; std::size_t update_counter{}; }; From f8e7b44d2816108ace9e262f5161a98079a4ca7b Mon Sep 17 00:00:00 2001 From: scorpion81 Date: Mon, 22 May 2023 16:48:55 +0200 Subject: [PATCH 0404/1181] Limit the device access memory to 4 GB Hardly limiting the device access memory to 4 GB for integrated vulkan devices here. This works for the Steam Deck in order not to go above 4 GB VRAM usage any more (above this value the likelihood to crash when the RAM exceeds 12 GB as well raises). But there will be perhaps a detection mechanism necessary for detecting the real memory limit for integrated vulkan devices. Those likely might have small limits anyway, but what about integrated GPUs on machines with > 16 GB RAM, aka larger amounts ? --- src/video_core/vulkan_common/vulkan_device.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index f6e6f2736..c0b2b3e17 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -1034,7 +1034,7 @@ void Device::CollectPhysicalMemoryInfo() { } const s64 available_memory = static_cast(device_access_memory - device_initial_usage); device_access_memory = static_cast(std::max( - std::min(available_memory - 8_GiB, 4_GiB), static_cast(local_memory))); + std::min(available_memory - 8_GiB, 4_GiB), std::min(local_memory, 4_GiB))); } void Device::CollectToolingInfo() { From 8758932031ff4836652e7577ec566fd733f46e0b Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 22 May 2023 01:13:47 -0400 Subject: [PATCH 0405/1181] renderer_vulkan: barrier attachment feedback loops --- .../renderer_opengl/gl_texture_cache.h | 4 +++ .../renderer_vulkan/vk_graphics_pipeline.cpp | 3 +- .../renderer_vulkan/vk_texture_cache.cpp | 4 +++ .../renderer_vulkan/vk_texture_cache.h | 2 ++ src/video_core/texture_cache/texture_cache.h | 36 +++++++++++++++++++ .../texture_cache/texture_cache_base.h | 3 ++ 6 files changed, 51 insertions(+), 1 deletion(-) diff --git a/src/video_core/renderer_opengl/gl_texture_cache.h b/src/video_core/renderer_opengl/gl_texture_cache.h index 1190999a8..3e9b3302b 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.h +++ b/src/video_core/renderer_opengl/gl_texture_cache.h @@ -144,6 +144,10 @@ public: return state_tracker; } + void BarrierFeedbackLoop() const noexcept { + // OpenGL does not require a barrier for attachment feedback loops. + } + private: struct StagingBuffers { explicit StagingBuffers(GLenum storage_flags_, GLenum map_flags_); diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index f1bcd5cd6..506b78f08 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -481,12 +481,13 @@ void GraphicsPipeline::ConfigureImpl(bool is_indexed) { if constexpr (Spec::enabled_stages[4]) { prepare_stage(4); } + texture_cache.UpdateRenderTargets(false); + texture_cache.CheckFeedbackLoop(views); ConfigureDraw(rescaling, render_area); } void GraphicsPipeline::ConfigureDraw(const RescalingPushConstant& rescaling, const RenderAreaPushConstant& render_area) { - texture_cache.UpdateRenderTargets(false); scheduler.RequestRenderpass(texture_cache.GetFramebuffer()); if (!is_built.load(std::memory_order::relaxed)) { diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index 4d0481f2a..da5af25eb 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -861,6 +861,10 @@ VkBuffer TextureCacheRuntime::GetTemporaryBuffer(size_t needed_size) { return *buffers[level]; } +void TextureCacheRuntime::BarrierFeedbackLoop() { + scheduler.RequestOutsideRenderPassOperationContext(); +} + void TextureCacheRuntime::ReinterpretImage(Image& dst, Image& src, std::span copies) { std::vector vk_in_copies(copies.size()); diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index 4166b3d20..0f7a5ffd4 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h @@ -103,6 +103,8 @@ public: [[nodiscard]] VkBuffer GetTemporaryBuffer(size_t needed_size); + void BarrierFeedbackLoop(); + const Device& device; Scheduler& scheduler; MemoryAllocator& memory_allocator; diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index b24086fce..8e62a5f78 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -183,6 +183,42 @@ void TextureCache

::FillComputeImageViews(std::span views) { views); } +template +void TextureCache

::CheckFeedbackLoop(std::span views) { + const bool requires_barrier = [&] { + for (const auto& view : views) { + if (!view.id) { + continue; + } + auto& image_view = slot_image_views[view.id]; + + // Check color targets + for (const auto& ct_view_id : render_targets.color_buffer_ids) { + if (ct_view_id) { + auto& ct_view = slot_image_views[ct_view_id]; + if (image_view.image_id == ct_view.image_id) { + return true; + } + } + } + + // Check zeta target + if (render_targets.depth_buffer_id) { + auto& zt_view = slot_image_views[render_targets.depth_buffer_id]; + if (image_view.image_id == zt_view.image_id) { + return true; + } + } + } + + return false; + }(); + + if (requires_barrier) { + runtime.BarrierFeedbackLoop(); + } +} + template typename P::Sampler* TextureCache

::GetGraphicsSampler(u32 index) { if (index > channel_state->graphics_sampler_table.Limit()) { diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index 0720494e5..1a3308e2d 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h @@ -148,6 +148,9 @@ public: /// Fill image_view_ids with the compute images in indices void FillComputeImageViews(std::span views); + /// Handle feedback loops during draws. + void CheckFeedbackLoop(std::span views); + /// Get the sampler from the graphics descriptor table in the specified index Sampler* GetGraphicsSampler(u32 index); From 8bba9f7deaa78c523fbf12a1b10f4428436479ec Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 22 May 2023 19:53:20 -0400 Subject: [PATCH 0406/1181] vulkan_device: Enable VK_KHR_push_descriptor on newer ANV --- src/video_core/vulkan_common/vulkan_device.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index f6e6f2736..c03f4a56b 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -473,11 +473,12 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR } if (extensions.push_descriptor && is_intel_anv) { const u32 version = (properties.properties.driverVersion << 3) >> 3; - if (version >= VK_MAKE_API_VERSION(0, 22, 3, 0)) { + if (version >= VK_MAKE_API_VERSION(0, 22, 3, 0) && + version < VK_MAKE_API_VERSION(0, 23, 2, 0)) { // Disable VK_KHR_push_descriptor due to // mesa/mesa/-/commit/ff91c5ca42bc80aa411cb3fd8f550aa6fdd16bdc LOG_WARNING(Render_Vulkan, - "ANV drivers 22.3.0 and later have broken VK_KHR_push_descriptor"); + "ANV drivers 22.3.0 to 23.1.0 have broken VK_KHR_push_descriptor"); extensions.push_descriptor = false; loaded_extensions.erase(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME); } From f63586c5f5aad1eb4d25e59d81a83e58529988ff Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Mon, 22 May 2023 18:31:39 -0600 Subject: [PATCH 0407/1181] service: nfc: Remove encryption key requirement --- .../hle/service/nfc/common/amiibo_crypto.cpp | 3 - src/core/hle/service/nfc/common/device.cpp | 71 +++++++++++++------ src/core/hle/service/nfc/common/device.h | 3 + 3 files changed, 54 insertions(+), 23 deletions(-) diff --git a/src/core/hle/service/nfc/common/amiibo_crypto.cpp b/src/core/hle/service/nfc/common/amiibo_crypto.cpp index f3901ee8d..b2bcb68c3 100644 --- a/src/core/hle/service/nfc/common/amiibo_crypto.cpp +++ b/src/core/hle/service/nfc/common/amiibo_crypto.cpp @@ -52,9 +52,6 @@ bool IsAmiiboValid(const EncryptedNTAG215File& ntag_file) { if (ntag_file.compability_container != 0xEEFF10F1U) { return false; } - if (amiibo_data.constant_value != 0xA5) { - return false; - } if (amiibo_data.model_info.tag_type != NFC::PackedTagType::Type2) { return false; } diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp index 322bde2ed..e5d4545a8 100644 --- a/src/core/hle/service/nfc/common/device.cpp +++ b/src/core/hle/service/nfc/common/device.cpp @@ -119,18 +119,31 @@ bool NfcDevice::LoadNfcTag(std::span data) { memcpy(&tag_data, data.data(), sizeof(NFP::EncryptedNTAG215File)); is_plain_amiibo = NFP::AmiiboCrypto::IsAmiiboValid(tag_data); - - if (is_plain_amiibo) { - encrypted_tag_data = NFP::AmiiboCrypto::EncodedDataToNfcData(tag_data); - LOG_INFO(Service_NFP, "Using plain amiibo"); - } else { - tag_data = {}; - memcpy(&encrypted_tag_data, data.data(), sizeof(NFP::EncryptedNTAG215File)); - } + is_write_protected = false; device_state = DeviceState::TagFound; deactivate_event->GetReadableEvent().Clear(); activate_event->Signal(); + + // Fallback for plain amiibos + if (is_plain_amiibo) { + LOG_INFO(Service_NFP, "Using plain amiibo"); + encrypted_tag_data = NFP::AmiiboCrypto::EncodedDataToNfcData(tag_data); + return true; + } + + // Fallback for encrypted amiibos without keys + if (!NFP::AmiiboCrypto::IsKeyAvailable()) { + LOG_INFO(Service_NFC, "Loading amiibo without keys"); + memcpy(&encrypted_tag_data, data.data(), sizeof(NFP::EncryptedNTAG215File)); + BuildAmiiboWithoutKeys(); + is_plain_amiibo = true; + is_write_protected = true; + return true; + } + + tag_data = {}; + memcpy(&encrypted_tag_data, data.data(), sizeof(NFP::EncryptedNTAG215File)); return true; } @@ -346,23 +359,15 @@ Result NfcDevice::Mount(NFP::ModelType model_type, NFP::MountTarget mount_target return ResultWrongDeviceState; } - // The loaded amiibo is not encrypted - if (is_plain_amiibo) { - device_state = DeviceState::TagMounted; - mount_target = mount_target_; - return ResultSuccess; - } - if (!NFP::AmiiboCrypto::IsAmiiboValid(encrypted_tag_data)) { LOG_ERROR(Service_NFP, "Not an amiibo"); return ResultNotAnAmiibo; } - // Mark amiibos as read only when keys are missing - if (!NFP::AmiiboCrypto::IsKeyAvailable()) { - LOG_ERROR(Service_NFP, "No keys detected"); + // The loaded amiibo is not encrypted + if (is_plain_amiibo) { device_state = DeviceState::TagMounted; - mount_target = NFP::MountTarget::Rom; + mount_target = mount_target_; return ResultSuccess; } @@ -457,6 +462,11 @@ Result NfcDevice::FlushWithBreak(NFP::BreakType break_type) { return ResultWrongDeviceState; } + if (is_write_protected) { + LOG_ERROR(Service_NFP, "No keys available skipping write request"); + return ResultSuccess; + } + std::vector data(sizeof(NFP::EncryptedNTAG215File)); if (is_plain_amiibo) { memcpy(data.data(), &tag_data, sizeof(tag_data)); @@ -1033,7 +1043,6 @@ Result NfcDevice::GetAll(NFP::NfpData& data) const { } NFP::CommonInfo common_info{}; - Service::Mii::MiiManager manager; const u64 application_id = tag_data.application_id; GetCommonInfo(common_info); @@ -1249,6 +1258,28 @@ void NfcDevice::UpdateRegisterInfoCrc() { tag_data.register_info_crc = crc.checksum(); } +void NfcDevice::BuildAmiiboWithoutKeys() { + Service::Mii::MiiManager manager; + auto& settings = tag_data.settings; + + tag_data = NFP::AmiiboCrypto::NfcDataToEncodedData(encrypted_tag_data); + + // Common info + tag_data.write_counter = 0; + tag_data.amiibo_version = 0; + settings.write_date = GetAmiiboDate(GetCurrentPosixTime()); + + // Register info + SetAmiiboName(settings, {'y', 'u', 'z', 'u', 'A', 'm', 'i', 'i', 'b', 'o'}); + settings.settings.font_region.Assign(0); + settings.init_date = GetAmiiboDate(GetCurrentPosixTime()); + tag_data.owner_mii = manager.BuildFromStoreData(manager.BuildDefault(0)); + + // Admin info + settings.settings.amiibo_initialized.Assign(1); + settings.settings.appdata_initialized.Assign(0); +} + u64 NfcDevice::GetHandle() const { // Generate a handle based of the npad id return static_cast(npad_id); diff --git a/src/core/hle/service/nfc/common/device.h b/src/core/hle/service/nfc/common/device.h index 98e1945c1..6a37e8458 100644 --- a/src/core/hle/service/nfc/common/device.h +++ b/src/core/hle/service/nfc/common/device.h @@ -110,6 +110,8 @@ private: void UpdateSettingsCrc(); void UpdateRegisterInfoCrc(); + void BuildAmiiboWithoutKeys(); + bool is_controller_set{}; int callback_key; const Core::HID::NpadIdType npad_id; @@ -128,6 +130,7 @@ private: bool is_data_moddified{}; bool is_app_area_open{}; bool is_plain_amiibo{}; + bool is_write_protected{}; NFP::MountTarget mount_target{NFP::MountTarget::None}; NFP::NTAG215File tag_data{}; From 5e3b3c6643817a8174823910886f9df162ff368d Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 23 May 2023 01:18:55 -0400 Subject: [PATCH 0408/1181] k_memory_block_manager: remove auditing calls --- src/core/hle/kernel/k_memory_block_manager.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/core/hle/kernel/k_memory_block_manager.h b/src/core/hle/kernel/k_memory_block_manager.h index 7c0bd16f0..96496e990 100644 --- a/src/core/hle/kernel/k_memory_block_manager.h +++ b/src/core/hle/kernel/k_memory_block_manager.h @@ -144,14 +144,10 @@ private: class KScopedMemoryBlockManagerAuditor { public: - explicit KScopedMemoryBlockManagerAuditor(KMemoryBlockManager* m) : m_manager(m) { - ASSERT(m_manager->CheckState()); - } + explicit KScopedMemoryBlockManagerAuditor(KMemoryBlockManager* m) : m_manager(m) {} explicit KScopedMemoryBlockManagerAuditor(KMemoryBlockManager& m) : KScopedMemoryBlockManagerAuditor(std::addressof(m)) {} - ~KScopedMemoryBlockManagerAuditor() { - ASSERT(m_manager->CheckState()); - } + ~KScopedMemoryBlockManagerAuditor() = default; private: KMemoryBlockManager* m_manager; From 415c78b87c008f0d963679ea9bc06c8aa566b506 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 20 May 2023 17:15:36 -0400 Subject: [PATCH 0409/1181] textures: add BC1 and BC3 compressors and recompression setting --- externals/CMakeLists.txt | 4 + externals/stb/stb_dxt.cpp | 765 ++++++++++++++++++ externals/stb/stb_dxt.h | 36 + src/common/settings.cpp | 2 + src/common/settings.h | 9 + src/video_core/CMakeLists.txt | 6 +- src/video_core/buffer_cache/buffer_cache.h | 2 +- .../renderer_opengl/gl_texture_cache.cpp | 31 +- .../renderer_vulkan/maxwell_to_vk.cpp | 24 +- .../renderer_vulkan/vk_texture_cache.cpp | 8 +- src/video_core/texture_cache/util.cpp | 79 +- src/video_core/textures/astc.cpp | 5 +- src/video_core/textures/bcn.cpp | 87 ++ src/video_core/textures/bcn.h | 17 + src/video_core/textures/workers.cpp | 15 + src/video_core/textures/workers.h | 12 + .../vulkan_common/vulkan_device.cpp | 6 + src/yuzu/configuration/config.cpp | 5 + src/yuzu/configuration/config.h | 1 + .../configure_graphics_advanced.cpp | 14 + .../configure_graphics_advanced.ui | 44 + src/yuzu_cmd/config.cpp | 1 + src/yuzu_cmd/default_ini.h | 4 + 23 files changed, 1150 insertions(+), 27 deletions(-) create mode 100644 externals/stb/stb_dxt.cpp create mode 100644 externals/stb/stb_dxt.h create mode 100644 src/video_core/textures/bcn.cpp create mode 100644 src/video_core/textures/bcn.h create mode 100644 src/video_core/textures/workers.cpp create mode 100644 src/video_core/textures/workers.h diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index f2a560f04..e59eeb489 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -139,3 +139,7 @@ if (NOT TARGET LLVM::Demangle) target_sources(demangle PRIVATE demangle/ItaniumDemangle.cpp) add_library(LLVM::Demangle ALIAS demangle) endif() + +add_library(stb STATIC) +target_include_directories(stb PUBLIC ./stb) +target_sources(stb PRIVATE stb/stb_dxt.cpp) diff --git a/externals/stb/stb_dxt.cpp b/externals/stb/stb_dxt.cpp new file mode 100644 index 000000000..64f1f3d03 --- /dev/null +++ b/externals/stb/stb_dxt.cpp @@ -0,0 +1,765 @@ +// SPDX-FileCopyrightText: fabian "ryg" giesen +// SPDX-License-Identifier: MIT + +// stb_dxt.h - v1.12 - DXT1/DXT5 compressor + +#include + +#include +#include + +#if !defined(STBD_FABS) +#include +#endif + +#ifndef STBD_FABS +#define STBD_FABS(x) fabs(x) +#endif + +static const unsigned char stb__OMatch5[256][2] = { + {0, 0}, {0, 0}, {0, 1}, {0, 1}, {1, 0}, {1, 0}, {1, 0}, {1, 1}, {1, 1}, + {1, 1}, {1, 2}, {0, 4}, {2, 1}, {2, 1}, {2, 1}, {2, 2}, {2, 2}, {2, 2}, + {2, 3}, {1, 5}, {3, 2}, {3, 2}, {4, 0}, {3, 3}, {3, 3}, {3, 3}, {3, 4}, + {3, 4}, {3, 4}, {3, 5}, {4, 3}, {4, 3}, {5, 2}, {4, 4}, {4, 4}, {4, 5}, + {4, 5}, {5, 4}, {5, 4}, {5, 4}, {6, 3}, {5, 5}, {5, 5}, {5, 6}, {4, 8}, + {6, 5}, {6, 5}, {6, 5}, {6, 6}, {6, 6}, {6, 6}, {6, 7}, {5, 9}, {7, 6}, + {7, 6}, {8, 4}, {7, 7}, {7, 7}, {7, 7}, {7, 8}, {7, 8}, {7, 8}, {7, 9}, + {8, 7}, {8, 7}, {9, 6}, {8, 8}, {8, 8}, {8, 9}, {8, 9}, {9, 8}, {9, 8}, + {9, 8}, {10, 7}, {9, 9}, {9, 9}, {9, 10}, {8, 12}, {10, 9}, {10, 9}, {10, 9}, + {10, 10}, {10, 10}, {10, 10}, {10, 11}, {9, 13}, {11, 10}, {11, 10}, {12, 8}, {11, 11}, + {11, 11}, {11, 11}, {11, 12}, {11, 12}, {11, 12}, {11, 13}, {12, 11}, {12, 11}, {13, 10}, + {12, 12}, {12, 12}, {12, 13}, {12, 13}, {13, 12}, {13, 12}, {13, 12}, {14, 11}, {13, 13}, + {13, 13}, {13, 14}, {12, 16}, {14, 13}, {14, 13}, {14, 13}, {14, 14}, {14, 14}, {14, 14}, + {14, 15}, {13, 17}, {15, 14}, {15, 14}, {16, 12}, {15, 15}, {15, 15}, {15, 15}, {15, 16}, + {15, 16}, {15, 16}, {15, 17}, {16, 15}, {16, 15}, {17, 14}, {16, 16}, {16, 16}, {16, 17}, + {16, 17}, {17, 16}, {17, 16}, {17, 16}, {18, 15}, {17, 17}, {17, 17}, {17, 18}, {16, 20}, + {18, 17}, {18, 17}, {18, 17}, {18, 18}, {18, 18}, {18, 18}, {18, 19}, {17, 21}, {19, 18}, + {19, 18}, {20, 16}, {19, 19}, {19, 19}, {19, 19}, {19, 20}, {19, 20}, {19, 20}, {19, 21}, + {20, 19}, {20, 19}, {21, 18}, {20, 20}, {20, 20}, {20, 21}, {20, 21}, {21, 20}, {21, 20}, + {21, 20}, {22, 19}, {21, 21}, {21, 21}, {21, 22}, {20, 24}, {22, 21}, {22, 21}, {22, 21}, + {22, 22}, {22, 22}, {22, 22}, {22, 23}, {21, 25}, {23, 22}, {23, 22}, {24, 20}, {23, 23}, + {23, 23}, {23, 23}, {23, 24}, {23, 24}, {23, 24}, {23, 25}, {24, 23}, {24, 23}, {25, 22}, + {24, 24}, {24, 24}, {24, 25}, {24, 25}, {25, 24}, {25, 24}, {25, 24}, {26, 23}, {25, 25}, + {25, 25}, {25, 26}, {24, 28}, {26, 25}, {26, 25}, {26, 25}, {26, 26}, {26, 26}, {26, 26}, + {26, 27}, {25, 29}, {27, 26}, {27, 26}, {28, 24}, {27, 27}, {27, 27}, {27, 27}, {27, 28}, + {27, 28}, {27, 28}, {27, 29}, {28, 27}, {28, 27}, {29, 26}, {28, 28}, {28, 28}, {28, 29}, + {28, 29}, {29, 28}, {29, 28}, {29, 28}, {30, 27}, {29, 29}, {29, 29}, {29, 30}, {29, 30}, + {30, 29}, {30, 29}, {30, 29}, {30, 30}, {30, 30}, {30, 30}, {30, 31}, {30, 31}, {31, 30}, + {31, 30}, {31, 30}, {31, 31}, {31, 31}, +}; +static const unsigned char stb__OMatch6[256][2] = { + {0, 0}, {0, 1}, {1, 0}, {1, 1}, {1, 1}, {1, 2}, {2, 1}, {2, 2}, {2, 2}, + {2, 3}, {3, 2}, {3, 3}, {3, 3}, {3, 4}, {4, 3}, {4, 4}, {4, 4}, {4, 5}, + {5, 4}, {5, 5}, {5, 5}, {5, 6}, {6, 5}, {6, 6}, {6, 6}, {6, 7}, {7, 6}, + {7, 7}, {7, 7}, {7, 8}, {8, 7}, {8, 8}, {8, 8}, {8, 9}, {9, 8}, {9, 9}, + {9, 9}, {9, 10}, {10, 9}, {10, 10}, {10, 10}, {10, 11}, {11, 10}, {8, 16}, {11, 11}, + {11, 12}, {12, 11}, {9, 17}, {12, 12}, {12, 13}, {13, 12}, {11, 16}, {13, 13}, {13, 14}, + {14, 13}, {12, 17}, {14, 14}, {14, 15}, {15, 14}, {14, 16}, {15, 15}, {15, 16}, {16, 14}, + {16, 15}, {17, 14}, {16, 16}, {16, 17}, {17, 16}, {18, 15}, {17, 17}, {17, 18}, {18, 17}, + {20, 14}, {18, 18}, {18, 19}, {19, 18}, {21, 15}, {19, 19}, {19, 20}, {20, 19}, {20, 20}, + {20, 20}, {20, 21}, {21, 20}, {21, 21}, {21, 21}, {21, 22}, {22, 21}, {22, 22}, {22, 22}, + {22, 23}, {23, 22}, {23, 23}, {23, 23}, {23, 24}, {24, 23}, {24, 24}, {24, 24}, {24, 25}, + {25, 24}, {25, 25}, {25, 25}, {25, 26}, {26, 25}, {26, 26}, {26, 26}, {26, 27}, {27, 26}, + {24, 32}, {27, 27}, {27, 28}, {28, 27}, {25, 33}, {28, 28}, {28, 29}, {29, 28}, {27, 32}, + {29, 29}, {29, 30}, {30, 29}, {28, 33}, {30, 30}, {30, 31}, {31, 30}, {30, 32}, {31, 31}, + {31, 32}, {32, 30}, {32, 31}, {33, 30}, {32, 32}, {32, 33}, {33, 32}, {34, 31}, {33, 33}, + {33, 34}, {34, 33}, {36, 30}, {34, 34}, {34, 35}, {35, 34}, {37, 31}, {35, 35}, {35, 36}, + {36, 35}, {36, 36}, {36, 36}, {36, 37}, {37, 36}, {37, 37}, {37, 37}, {37, 38}, {38, 37}, + {38, 38}, {38, 38}, {38, 39}, {39, 38}, {39, 39}, {39, 39}, {39, 40}, {40, 39}, {40, 40}, + {40, 40}, {40, 41}, {41, 40}, {41, 41}, {41, 41}, {41, 42}, {42, 41}, {42, 42}, {42, 42}, + {42, 43}, {43, 42}, {40, 48}, {43, 43}, {43, 44}, {44, 43}, {41, 49}, {44, 44}, {44, 45}, + {45, 44}, {43, 48}, {45, 45}, {45, 46}, {46, 45}, {44, 49}, {46, 46}, {46, 47}, {47, 46}, + {46, 48}, {47, 47}, {47, 48}, {48, 46}, {48, 47}, {49, 46}, {48, 48}, {48, 49}, {49, 48}, + {50, 47}, {49, 49}, {49, 50}, {50, 49}, {52, 46}, {50, 50}, {50, 51}, {51, 50}, {53, 47}, + {51, 51}, {51, 52}, {52, 51}, {52, 52}, {52, 52}, {52, 53}, {53, 52}, {53, 53}, {53, 53}, + {53, 54}, {54, 53}, {54, 54}, {54, 54}, {54, 55}, {55, 54}, {55, 55}, {55, 55}, {55, 56}, + {56, 55}, {56, 56}, {56, 56}, {56, 57}, {57, 56}, {57, 57}, {57, 57}, {57, 58}, {58, 57}, + {58, 58}, {58, 58}, {58, 59}, {59, 58}, {59, 59}, {59, 59}, {59, 60}, {60, 59}, {60, 60}, + {60, 60}, {60, 61}, {61, 60}, {61, 61}, {61, 61}, {61, 62}, {62, 61}, {62, 62}, {62, 62}, + {62, 63}, {63, 62}, {63, 63}, {63, 63}, +}; + +static int stb__Mul8Bit(int a, int b) { + int t = a * b + 128; + return (t + (t >> 8)) >> 8; +} + +static void stb__From16Bit(unsigned char* out, unsigned short v) { + int rv = (v & 0xf800) >> 11; + int gv = (v & 0x07e0) >> 5; + int bv = (v & 0x001f) >> 0; + + // expand to 8 bits via bit replication + out[0] = static_cast((rv * 33) >> 2); + out[1] = static_cast((gv * 65) >> 4); + out[2] = static_cast((bv * 33) >> 2); + out[3] = 0; +} + +static unsigned short stb__As16Bit(int r, int g, int b) { + return (unsigned short)((stb__Mul8Bit(r, 31) << 11) + (stb__Mul8Bit(g, 63) << 5) + + stb__Mul8Bit(b, 31)); +} + +// linear interpolation at 1/3 point between a and b, using desired rounding +// type +static int stb__Lerp13(int a, int b) { +#ifdef STB_DXT_USE_ROUNDING_BIAS + // with rounding bias + return a + stb__Mul8Bit(b - a, 0x55); +#else + // without rounding bias + // replace "/ 3" by "* 0xaaab) >> 17" if your compiler sucks or you really + // need every ounce of speed. + return (2 * a + b) / 3; +#endif +} + +// linear interpolation at 1/2 point between a and b +static int stb__Lerp12(int a, int b) { + return (a + b) / 2; +} + +// lerp RGB color +static void stb__Lerp13RGB(unsigned char* out, unsigned char* p1, unsigned char* p2) { + out[0] = (unsigned char)stb__Lerp13(p1[0], p2[0]); + out[1] = (unsigned char)stb__Lerp13(p1[1], p2[1]); + out[2] = (unsigned char)stb__Lerp13(p1[2], p2[2]); +} + +static void stb__Lerp12RGB(unsigned char* out, unsigned char* p1, unsigned char* p2) { + out[0] = (unsigned char)stb__Lerp12(p1[0], p2[0]); + out[1] = (unsigned char)stb__Lerp12(p1[1], p2[1]); + out[2] = (unsigned char)stb__Lerp12(p1[2], p2[2]); +} + +/****************************************************************************/ + +static void stb__Eval4Colors(unsigned char* color, unsigned short c0, unsigned short c1) { + stb__From16Bit(color + 0, c0); + stb__From16Bit(color + 4, c1); + stb__Lerp13RGB(color + 8, color + 0, color + 4); + stb__Lerp13RGB(color + 12, color + 4, color + 0); +} + +static void stb__Eval3Colors(unsigned char* color, unsigned short c0, unsigned short c1) { + stb__From16Bit(color + 0, c0); + stb__From16Bit(color + 4, c1); + stb__Lerp12RGB(color + 8, color + 0, color + 4); +} + +// The color matching function +static unsigned int stb__MatchColorsBlock(unsigned char* block, unsigned char* color) { + unsigned int mask = 0; + int dirr = color[0 * 4 + 0] - color[1 * 4 + 0]; + int dirg = color[0 * 4 + 1] - color[1 * 4 + 1]; + int dirb = color[0 * 4 + 2] - color[1 * 4 + 2]; + int dots[16]; + int stops[4]; + int i; + int c0Point, halfPoint, c3Point; + + for (i = 0; i < 16; i++) + dots[i] = block[i * 4 + 0] * dirr + block[i * 4 + 1] * dirg + block[i * 4 + 2] * dirb; + + for (i = 0; i < 4; i++) + stops[i] = color[i * 4 + 0] * dirr + color[i * 4 + 1] * dirg + color[i * 4 + 2] * dirb; + + // think of the colors as arranged on a line; project point onto that line, + // then choose next color out of available ones. we compute the crossover + // points for "best color in top half"/"best in bottom half" and then the same + // inside that subinterval. + // + // relying on this 1d approximation isn't always optimal in terms of euclidean + // distance, but it's very close and a lot faster. + // http://cbloomrants.blogspot.com/2008/12/12-08-08-dxtc-summary.html + + c0Point = (stops[1] + stops[3]); + halfPoint = (stops[3] + stops[2]); + c3Point = (stops[2] + stops[0]); + + for (i = 15; i >= 0; i--) { + int dot = dots[i] * 2; + mask <<= 2; + + if (dot < halfPoint) + mask |= (dot < c0Point) ? 1 : 3; + else + mask |= (dot < c3Point) ? 2 : 0; + } + + return mask; +} + +static unsigned int stb__MatchColorsAlphaBlock(unsigned char* block, unsigned char* color) { + unsigned int mask = 0; + int dirr = color[0 * 4 + 0] - color[1 * 4 + 0]; + int dirg = color[0 * 4 + 1] - color[1 * 4 + 1]; + int dirb = color[0 * 4 + 2] - color[1 * 4 + 2]; + int dots[16]; + int stops[3]; + int i; + int c0Point, c2Point; + + for (i = 0; i < 16; i++) + dots[i] = block[i * 4 + 0] * dirr + block[i * 4 + 1] * dirg + block[i * 4 + 2] * dirb; + + for (i = 0; i < 3; i++) + stops[i] = color[i * 4 + 0] * dirr + color[i * 4 + 1] * dirg + color[i * 4 + 2] * dirb; + + c0Point = (stops[1] + stops[2]); + c2Point = (stops[2] + stops[0]); + + for (i = 15; i >= 0; i--) { + int dot = dots[i] * 2; + mask <<= 2; + + if (block[i * 4 + 3] == 0) + mask |= 3; + else if (dot < c2Point) + mask |= (dot < c0Point) ? 0 : 2; + else + mask |= (dot < c0Point) ? 1 : 0; + } + + return mask; +} + +static void stb__ReorderColors(unsigned short* pmax16, unsigned short* pmin16) { + if (*pmin16 < *pmax16) { + unsigned short t = *pmin16; + *pmin16 = *pmax16; + *pmax16 = t; + } +} + +static void stb__FinalizeColors(unsigned short* pmax16, unsigned short* pmin16, + unsigned int* pmask) { + if (*pmax16 < *pmin16) { + unsigned short t = *pmin16; + *pmin16 = *pmax16; + *pmax16 = t; + *pmask ^= 0x55555555; + } +} + +// The color optimization function. (Clever code, part 1) +static void stb__OptimizeColorsBlock(unsigned char* block, unsigned short* pmax16, + unsigned short* pmin16) { + int mind, maxd; + unsigned char *minp, *maxp; + double magn; + int v_r, v_g, v_b; + static const int nIterPower = 4; + float covf[6], vfr, vfg, vfb; + + // determine color distribution + int cov[6]; + int mu[3], min[3], max[3]; + int ch, i, iter; + + for (ch = 0; ch < 3; ch++) { + const unsigned char* bp = ((const unsigned char*)block) + ch; + int muv, minv, maxv; + + muv = minv = maxv = bp[0]; + for (i = 4; i < 64; i += 4) { + muv += bp[i]; + if (bp[i] < minv) + minv = bp[i]; + else if (bp[i] > maxv) + maxv = bp[i]; + } + + mu[ch] = (muv + 8) >> 4; + min[ch] = minv; + max[ch] = maxv; + } + + // determine covariance matrix + for (i = 0; i < 6; i++) + cov[i] = 0; + + for (i = 0; i < 16; i++) { + int r = block[i * 4 + 0] - mu[0]; + int g = block[i * 4 + 1] - mu[1]; + int b = block[i * 4 + 2] - mu[2]; + + cov[0] += r * r; + cov[1] += r * g; + cov[2] += r * b; + cov[3] += g * g; + cov[4] += g * b; + cov[5] += b * b; + } + + // convert covariance matrix to float, find principal axis via power iter + for (i = 0; i < 6; i++) + covf[i] = static_cast(cov[i]) / 255.0f; + + vfr = (float)(max[0] - min[0]); + vfg = (float)(max[1] - min[1]); + vfb = (float)(max[2] - min[2]); + + for (iter = 0; iter < nIterPower; iter++) { + float r = vfr * covf[0] + vfg * covf[1] + vfb * covf[2]; + float g = vfr * covf[1] + vfg * covf[3] + vfb * covf[4]; + float b = vfr * covf[2] + vfg * covf[4] + vfb * covf[5]; + + vfr = r; + vfg = g; + vfb = b; + } + + magn = STBD_FABS(vfr); + if (STBD_FABS(vfg) > magn) + magn = STBD_FABS(vfg); + if (STBD_FABS(vfb) > magn) + magn = STBD_FABS(vfb); + + if (magn < 4.0f) { // too small, default to luminance + v_r = 299; // JPEG YCbCr luma coefs, scaled by 1000. + v_g = 587; + v_b = 114; + } else { + magn = 512.0 / magn; + v_r = (int)(vfr * magn); + v_g = (int)(vfg * magn); + v_b = (int)(vfb * magn); + } + + minp = maxp = block; + mind = maxd = block[0] * v_r + block[1] * v_g + block[2] * v_b; + // Pick colors at extreme points + for (i = 1; i < 16; i++) { + int dot = block[i * 4 + 0] * v_r + block[i * 4 + 1] * v_g + block[i * 4 + 2] * v_b; + + if (dot < mind) { + mind = dot; + minp = block + i * 4; + } + + if (dot > maxd) { + maxd = dot; + maxp = block + i * 4; + } + } + + *pmax16 = stb__As16Bit(maxp[0], maxp[1], maxp[2]); + *pmin16 = stb__As16Bit(minp[0], minp[1], minp[2]); + stb__ReorderColors(pmax16, pmin16); +} + +static void stb__OptimizeColorsAlphaBlock(unsigned char* block, unsigned short* pmax16, + unsigned short* pmin16) { + int mind, maxd; + unsigned char *minp, *maxp; + double magn; + int v_r, v_g, v_b; + static const int nIterPower = 4; + float covf[6], vfr, vfg, vfb; + + // determine color distribution + int cov[6]; + int mu[3], min[3], max[3]; + int ch, i, iter; + + for (ch = 0; ch < 3; ch++) { + const unsigned char* bp = ((const unsigned char*)block) + ch; + int muv = 0, minv = 256, maxv = -1; + int num = 0; + + for (i = 0; i < 64; i += 4) { + if (bp[3 - ch] == 0) { + continue; + } + + muv += bp[i]; + if (bp[i] < minv) + minv = bp[i]; + else if (bp[i] > maxv) + maxv = bp[i]; + + num++; + } + + mu[ch] = num > 0 ? (muv + 8) / num : 0; + min[ch] = minv; + max[ch] = maxv; + } + + // determine covariance matrix + for (i = 0; i < 6; i++) + cov[i] = 0; + + for (i = 0; i < 16; i++) { + if (block[i * 4 + 3] == 0) { + continue; + } + + int r = block[i * 4 + 0] - mu[0]; + int g = block[i * 4 + 1] - mu[1]; + int b = block[i * 4 + 2] - mu[2]; + + cov[0] += r * r; + cov[1] += r * g; + cov[2] += r * b; + cov[3] += g * g; + cov[4] += g * b; + cov[5] += b * b; + } + + // convert covariance matrix to float, find principal axis via power iter + for (i = 0; i < 6; i++) + covf[i] = static_cast(cov[i]) / 255.0f; + + vfr = (float)(max[0] - min[0]); + vfg = (float)(max[1] - min[1]); + vfb = (float)(max[2] - min[2]); + + for (iter = 0; iter < nIterPower; iter++) { + float r = vfr * covf[0] + vfg * covf[1] + vfb * covf[2]; + float g = vfr * covf[1] + vfg * covf[3] + vfb * covf[4]; + float b = vfr * covf[2] + vfg * covf[4] + vfb * covf[5]; + + vfr = r; + vfg = g; + vfb = b; + } + + magn = STBD_FABS(vfr); + if (STBD_FABS(vfg) > magn) + magn = STBD_FABS(vfg); + if (STBD_FABS(vfb) > magn) + magn = STBD_FABS(vfb); + + if (magn < 4.0f) { // too small, default to luminance + v_r = 299; // JPEG YCbCr luma coefs, scaled by 1000. + v_g = 587; + v_b = 114; + } else { + magn = 512.0 / magn; + v_r = (int)(vfr * magn); + v_g = (int)(vfg * magn); + v_b = (int)(vfb * magn); + } + + minp = maxp = NULL; + mind = 0x7fffffff; + maxd = -0x80000000; + + // Pick colors at extreme points + for (i = 0; i < 16; i++) { + if (block[i * 4 + 3] == 0) { + continue; + } + + int dot = block[i * 4 + 0] * v_r + block[i * 4 + 1] * v_g + block[i * 4 + 2] * v_b; + + if (dot < mind) { + mind = dot; + minp = block + i * 4; + } + + if (dot > maxd) { + maxd = dot; + maxp = block + i * 4; + } + } + + if (!maxp) { + // all alpha, no color + *pmin16 = 0xffff; + *pmax16 = 0; + } else { + // endpoint colors found + *pmax16 = stb__As16Bit(maxp[0], maxp[1], maxp[2]); + *pmin16 = stb__As16Bit(minp[0], minp[1], minp[2]); + + if (*pmax16 == *pmin16) { + // modify the endpoints to indicate presence of an alpha block + if (*pmax16 > 0) { + (*pmax16)--; + } else { + (*pmin16)++; + } + } + + stb__ReorderColors(pmax16, pmin16); + } +} + +static const float stb__midpoints5[32] = { + 0.015686f, 0.047059f, 0.078431f, 0.111765f, 0.145098f, 0.176471f, 0.207843f, 0.241176f, + 0.274510f, 0.305882f, 0.337255f, 0.370588f, 0.403922f, 0.435294f, 0.466667f, 0.5f, + 0.533333f, 0.564706f, 0.596078f, 0.629412f, 0.662745f, 0.694118f, 0.725490f, 0.758824f, + 0.792157f, 0.823529f, 0.854902f, 0.888235f, 0.921569f, 0.952941f, 0.984314f, 1.0f}; + +static const float stb__midpoints6[64] = { + 0.007843f, 0.023529f, 0.039216f, 0.054902f, 0.070588f, 0.086275f, 0.101961f, 0.117647f, + 0.133333f, 0.149020f, 0.164706f, 0.180392f, 0.196078f, 0.211765f, 0.227451f, 0.245098f, + 0.262745f, 0.278431f, 0.294118f, 0.309804f, 0.325490f, 0.341176f, 0.356863f, 0.372549f, + 0.388235f, 0.403922f, 0.419608f, 0.435294f, 0.450980f, 0.466667f, 0.482353f, 0.500000f, + 0.517647f, 0.533333f, 0.549020f, 0.564706f, 0.580392f, 0.596078f, 0.611765f, 0.627451f, + 0.643137f, 0.658824f, 0.674510f, 0.690196f, 0.705882f, 0.721569f, 0.737255f, 0.754902f, + 0.772549f, 0.788235f, 0.803922f, 0.819608f, 0.835294f, 0.850980f, 0.866667f, 0.882353f, + 0.898039f, 0.913725f, 0.929412f, 0.945098f, 0.960784f, 0.976471f, 0.992157f, 1.0f}; + +static unsigned short stb__Quantize5(float x) { + unsigned short q; + x = x < 0 ? 0 : x > 1 ? 1 : x; // saturate + q = (unsigned short)(x * 31); + q += (x > stb__midpoints5[q]); + return q; +} + +static unsigned short stb__Quantize6(float x) { + unsigned short q; + x = x < 0 ? 0 : x > 1 ? 1 : x; // saturate + q = (unsigned short)(x * 63); + q += (x > stb__midpoints6[q]); + return q; +} + +// The refinement function. (Clever code, part 2) +// Tries to optimize colors to suit block contents better. +// (By solving a least squares system via normal equations+Cramer's rule) +static int stb__RefineBlock(unsigned char* block, unsigned short* pmax16, unsigned short* pmin16, + unsigned int mask) { + static const int w1Tab[4] = {3, 0, 2, 1}; + static const int prods[4] = {0x090000, 0x000900, 0x040102, 0x010402}; + // ^some magic to save a lot of multiplies in the accumulating loop... + // (precomputed products of weights for least squares system, accumulated + // inside one 32-bit register) + + float f; + unsigned short oldMin, oldMax, min16, max16; + int i, akku = 0, xx, xy, yy; + int At1_r, At1_g, At1_b; + int At2_r, At2_g, At2_b; + unsigned int cm = mask; + + oldMin = *pmin16; + oldMax = *pmax16; + + if ((mask ^ (mask << 2)) < 4) // all pixels have the same index? + { + // yes, linear system would be singular; solve using optimal + // single-color match on average color + int r = 8, g = 8, b = 8; + for (i = 0; i < 16; ++i) { + r += block[i * 4 + 0]; + g += block[i * 4 + 1]; + b += block[i * 4 + 2]; + } + + r >>= 4; + g >>= 4; + b >>= 4; + + max16 = static_cast((stb__OMatch5[r][0] << 11) | (stb__OMatch6[g][0] << 5) | + stb__OMatch5[b][0]); + min16 = static_cast((stb__OMatch5[r][1] << 11) | (stb__OMatch6[g][1] << 5) | + stb__OMatch5[b][1]); + } else { + At1_r = At1_g = At1_b = 0; + At2_r = At2_g = At2_b = 0; + for (i = 0; i < 16; ++i, cm >>= 2) { + int step = cm & 3; + int w1 = w1Tab[step]; + int r = block[i * 4 + 0]; + int g = block[i * 4 + 1]; + int b = block[i * 4 + 2]; + + akku += prods[step]; + At1_r += w1 * r; + At1_g += w1 * g; + At1_b += w1 * b; + At2_r += r; + At2_g += g; + At2_b += b; + } + + At2_r = 3 * At2_r - At1_r; + At2_g = 3 * At2_g - At1_g; + At2_b = 3 * At2_b - At1_b; + + // extract solutions and decide solvability + xx = akku >> 16; + yy = (akku >> 8) & 0xff; + xy = (akku >> 0) & 0xff; + + f = 3.0f / 255.0f / static_cast(xx * yy - xy * xy); + + max16 = static_cast( + stb__Quantize5(static_cast(At1_r * yy - At2_r * xy) * f) << 11); + max16 |= static_cast( + stb__Quantize6(static_cast(At1_g * yy - At2_g * xy) * f) << 5); + max16 |= static_cast( + stb__Quantize5(static_cast(At1_b * yy - At2_b * xy) * f) << 0); + + min16 = static_cast( + stb__Quantize5(static_cast(At2_r * xx - At1_r * xy) * f) << 11); + min16 |= static_cast( + stb__Quantize6(static_cast(At2_g * xx - At1_g * xy) * f) << 5); + min16 |= static_cast( + stb__Quantize5(static_cast(At2_b * xx - At1_b * xy) * f) << 0); + } + + *pmin16 = min16; + *pmax16 = max16; + stb__ReorderColors(pmax16, pmin16); + + return oldMin != min16 || oldMax != max16; +} + +// Color block compression +static void stb__CompressColorBlock(unsigned char* dest, unsigned char* block, int alpha, + int mode) { + unsigned int mask; + int i; + int refinecount; + unsigned short max16, min16; + unsigned char color[4 * 4]; + + refinecount = (mode & STB_DXT_HIGHQUAL) ? 2 : 1; + + // check if block is constant + for (i = 1; i < 16; i++) + if (((unsigned int*)block)[i] != ((unsigned int*)block)[0]) + break; + + if (i == 16 && block[3] == 0 && alpha) { // constant alpha + mask = 0xffffffff; + max16 = 0; + min16 = 0xffff; + } else if (i == 16) { // constant color + int r = block[0], g = block[1], b = block[2]; + mask = 0xaaaaaaaa; + max16 = static_cast((stb__OMatch5[r][0] << 11) | (stb__OMatch6[g][0] << 5) | + stb__OMatch5[b][0]); + min16 = static_cast((stb__OMatch5[r][1] << 11) | (stb__OMatch6[g][1] << 5) | + stb__OMatch5[b][1]); + } else if (alpha) { + stb__OptimizeColorsAlphaBlock(block, &max16, &min16); + stb__Eval3Colors(color, max16, min16); + mask = stb__MatchColorsAlphaBlock(block, color); + } else { + // first step: PCA+map along principal axis + stb__OptimizeColorsBlock(block, &max16, &min16); + if (max16 != min16) { + stb__Eval4Colors(color, max16, min16); + mask = stb__MatchColorsBlock(block, color); + } else + mask = 0; + + // third step: refine (multiple times if requested) + for (i = 0; i < refinecount; i++) { + unsigned int lastmask = mask; + + if (stb__RefineBlock(block, &max16, &min16, mask)) { + if (max16 != min16) { + stb__Eval4Colors(color, max16, min16); + mask = stb__MatchColorsBlock(block, color); + } else { + mask = 0; + break; + } + } + + if (mask == lastmask) + break; + } + } + + // write the color block + if (!alpha) + stb__FinalizeColors(&max16, &min16, &mask); + + dest[0] = (unsigned char)(max16); + dest[1] = (unsigned char)(max16 >> 8); + dest[2] = (unsigned char)(min16); + dest[3] = (unsigned char)(min16 >> 8); + dest[4] = (unsigned char)(mask); + dest[5] = (unsigned char)(mask >> 8); + dest[6] = (unsigned char)(mask >> 16); + dest[7] = (unsigned char)(mask >> 24); +} + +// Alpha block compression (this is easy for a change) +static void stb__CompressAlphaBlock(unsigned char* dest, unsigned char* src, int stride) { + int i, dist, bias, dist4, dist2, bits, mask; + + // find min/max color + int mn, mx; + mn = mx = src[0]; + + for (i = 1; i < 16; i++) { + if (src[i * stride] < mn) + mn = src[i * stride]; + else if (src[i * stride] > mx) + mx = src[i * stride]; + } + + // encode them + dest[0] = (unsigned char)mx; + dest[1] = (unsigned char)mn; + dest += 2; + + // determine bias and emit color indices + // given the choice of mx/mn, these indices are optimal: + // http://fgiesen.wordpress.com/2009/12/15/dxt5-alpha-block-index-determination/ + dist = mx - mn; + dist4 = dist * 4; + dist2 = dist * 2; + bias = (dist < 8) ? (dist - 1) : (dist / 2 + 2); + bias -= mn * 7; + bits = 0, mask = 0; + + for (i = 0; i < 16; i++) { + int a = src[i * stride] * 7 + bias; + int ind, t; + + // select index. this is a "linear scale" lerp factor between 0 (val=min) + // and 7 (val=max). + t = (a >= dist4) ? -1 : 0; + ind = t & 4; + a -= dist4 & t; + t = (a >= dist2) ? -1 : 0; + ind += t & 2; + a -= dist2 & t; + ind += (a >= dist); + + // turn linear scale into DXT index (0/1 are extremal pts) + ind = -ind & 7; + ind ^= (2 > ind); + + // write index + mask |= ind << bits; + if ((bits += 3) >= 8) { + *dest++ = (unsigned char)mask; + mask >>= 8; + bits -= 8; + } + } +} + +void stb_compress_bc1_block(unsigned char* dest, const unsigned char* src, int alpha, int mode) { + stb__CompressColorBlock(dest, (unsigned char*)src, alpha, mode); +} + +void stb_compress_bc3_block(unsigned char* dest, const unsigned char* src, int mode) { + unsigned char data[16][4]; + int i; + + stb__CompressAlphaBlock(dest, (unsigned char*)src + 3, 4); + dest += 8; + // make a new copy of the data in which alpha is opaque, + // because code uses a fast test for color constancy + memcpy(data, src, 4 * 16); + for (i = 0; i < 16; ++i) + data[i][3] = 255; + src = &data[0][0]; + + stb__CompressColorBlock(dest, (unsigned char*)src, 0, mode); +} diff --git a/externals/stb/stb_dxt.h b/externals/stb/stb_dxt.h new file mode 100644 index 000000000..07d1d1de4 --- /dev/null +++ b/externals/stb/stb_dxt.h @@ -0,0 +1,36 @@ +// SPDX-FileCopyrightText: fabian "ryg" giesen +// SPDX-License-Identifier: MIT + +// stb_dxt.h - v1.12 - DXT1/DXT5 compressor + +#ifndef STB_INCLUDE_STB_DXT_H +#define STB_INCLUDE_STB_DXT_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef STB_DXT_STATIC +#define STBDDEF static +#else +#define STBDDEF extern +#endif + +// compression mode (bitflags) +#define STB_DXT_NORMAL 0 +#define STB_DXT_DITHER 1 // use dithering. was always dubious, now deprecated. does nothing! +#define STB_DXT_HIGHQUAL \ + 2 // high quality mode, does two refinement steps instead of 1. ~30-40% slower. + +STBDDEF void stb_compress_bc1_block(unsigned char* dest, + const unsigned char* src_rgba_four_bytes_per_pixel, int alpha, + int mode); + +STBDDEF void stb_compress_bc3_block(unsigned char* dest, const unsigned char* src, int mode); + +#define STB_COMPRESS_DXT_BLOCK + +#ifdef __cplusplus +} +#endif +#endif // STB_INCLUDE_STB_DXT_H diff --git a/src/common/settings.cpp b/src/common/settings.cpp index ba617aea1..ff53e80bb 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -61,6 +61,7 @@ void LogSettings() { log_setting("Renderer_NvdecEmulation", values.nvdec_emulation.GetValue()); log_setting("Renderer_AccelerateASTC", values.accelerate_astc.GetValue()); log_setting("Renderer_AsyncASTC", values.async_astc.GetValue()); + log_setting("Renderer_AstcRecompression", values.astc_recompression.GetValue()); log_setting("Renderer_UseVsync", values.vsync_mode.GetValue()); log_setting("Renderer_UseReactiveFlushing", values.use_reactive_flushing.GetValue()); log_setting("Renderer_ShaderBackend", values.shader_backend.GetValue()); @@ -224,6 +225,7 @@ void RestoreGlobalState(bool is_powered_on) { values.nvdec_emulation.SetGlobal(true); values.accelerate_astc.SetGlobal(true); values.async_astc.SetGlobal(true); + values.astc_recompression.SetGlobal(true); values.use_reactive_flushing.SetGlobal(true); values.shader_backend.SetGlobal(true); values.use_asynchronous_shaders.SetGlobal(true); diff --git a/src/common/settings.h b/src/common/settings.h index 36ffcd693..7f865b2a7 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -90,6 +90,12 @@ enum class AntiAliasing : u32 { LastAA = Smaa, }; +enum class AstcRecompression : u32 { + Uncompressed = 0, + Bc1 = 1, + Bc3 = 2, +}; + struct ResolutionScalingInfo { u32 up_scale{1}; u32 down_shift{0}; @@ -473,6 +479,9 @@ struct Values { SwitchableSetting use_vulkan_driver_pipeline_cache{true, "use_vulkan_driver_pipeline_cache"}; SwitchableSetting enable_compute_pipelines{false, "enable_compute_pipelines"}; + SwitchableSetting astc_recompression{ + AstcRecompression::Uncompressed, AstcRecompression::Uncompressed, AstcRecompression::Bc3, + "astc_recompression"}; SwitchableSetting bg_red{0, "bg_red"}; SwitchableSetting bg_green{0, "bg_green"}; diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index a0009a36f..308d013d6 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -246,10 +246,14 @@ add_library(video_core STATIC texture_cache/util.h textures/astc.h textures/astc.cpp + textures/bcn.cpp + textures/bcn.h textures/decoders.cpp textures/decoders.h textures/texture.cpp textures/texture.h + textures/workers.cpp + textures/workers.h transform_feedback.cpp transform_feedback.h video_core.cpp @@ -275,7 +279,7 @@ add_library(video_core STATIC create_target_directory_groups(video_core) target_link_libraries(video_core PUBLIC common core) -target_link_libraries(video_core PUBLIC glad shader_recompiler) +target_link_libraries(video_core PUBLIC glad shader_recompiler stb) if (YUZU_USE_BUNDLED_FFMPEG AND NOT WIN32) add_dependencies(video_core ffmpeg-build) diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 98756e4da..f2508fbf0 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -1664,7 +1664,7 @@ typename BufferCache

::Binding BufferCache

::StorageBufferBinding(GPUVAddr s // cbufs, which do not store the sizes adjacent to the addresses, so use the fully // mapped buffer size for now. const u32 memory_layout_size = static_cast(gpu_memory->GetMemoryLayoutSize(gpu_addr)); - return memory_layout_size; + return std::min(memory_layout_size, static_cast(8_MiB)); }(); const std::optional cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr); if (!cpu_addr || size == 0) { diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index 31118886f..1e0823836 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -233,6 +233,8 @@ void ApplySwizzle(GLuint handle, PixelFormat format, std::arraydevice, info.format, info.type)) { flags |= ImageFlagBits::Converted; flags |= ImageFlagBits::CostlyLoad; - gl_internal_format = IsPixelFormatSRGB(info.format) ? GL_SRGB8_ALPHA8 : GL_RGBA8; + + const bool is_srgb = IsPixelFormatSRGB(info.format); + gl_internal_format = is_srgb ? GL_SRGB8_ALPHA8 : GL_RGBA8; gl_format = GL_RGBA; gl_type = GL_UNSIGNED_INT_8_8_8_8_REV; + + if (IsPixelFormatASTC(info.format)) { + gl_internal_format = SelectAstcFormat(info.format, is_srgb); + gl_format = GL_NONE; + } } else { const auto& tuple = MaxwellToGL::GetFormatTuple(info.format); gl_internal_format = tuple.internal_format; @@ -1130,7 +1152,12 @@ ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::ImageViewI views{runtime.null_image_views} { const Device& device = runtime.device; if (True(image.flags & ImageFlagBits::Converted)) { - internal_format = IsPixelFormatSRGB(info.format) ? GL_SRGB8_ALPHA8 : GL_RGBA8; + const bool is_srgb = IsPixelFormatSRGB(info.format); + internal_format = is_srgb ? GL_SRGB8_ALPHA8 : GL_RGBA8; + + if (IsPixelFormatASTC(info.format)) { + internal_format = SelectAstcFormat(info.format, is_srgb); + } } else { internal_format = MaxwellToGL::GetFormatTuple(format).internal_format; } diff --git a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp index 8853cf0f7..b75d7220d 100644 --- a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp +++ b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp @@ -6,6 +6,7 @@ #include "common/assert.h" #include "common/common_types.h" #include "common/logging/log.h" +#include "common/settings.h" #include "video_core/engines/maxwell_3d.h" #include "video_core/renderer_vulkan/maxwell_to_vk.h" #include "video_core/surface.h" @@ -237,14 +238,25 @@ FormatInfo SurfaceFormat(const Device& device, FormatType format_type, bool with PixelFormat pixel_format) { ASSERT(static_cast(pixel_format) < std::size(tex_format_tuples)); FormatTuple tuple = tex_format_tuples[static_cast(pixel_format)]; - // Use A8B8G8R8_UNORM on hardware that doesn't support ASTC natively + // Transcode on hardware that doesn't support ASTC natively if (!device.IsOptimalAstcSupported() && VideoCore::Surface::IsPixelFormatASTC(pixel_format)) { const bool is_srgb = with_srgb && VideoCore::Surface::IsPixelFormatSRGB(pixel_format); - if (is_srgb) { - tuple.format = VK_FORMAT_A8B8G8R8_SRGB_PACK32; - } else { - tuple.format = VK_FORMAT_A8B8G8R8_UNORM_PACK32; - tuple.usage |= Storage; + + switch (Settings::values.astc_recompression.GetValue()) { + case Settings::AstcRecompression::Uncompressed: + if (is_srgb) { + tuple.format = VK_FORMAT_A8B8G8R8_SRGB_PACK32; + } else { + tuple.format = VK_FORMAT_A8B8G8R8_UNORM_PACK32; + tuple.usage |= Storage; + } + break; + case Settings::AstcRecompression::Bc1: + tuple.format = is_srgb ? VK_FORMAT_BC1_RGBA_SRGB_BLOCK : VK_FORMAT_BC1_RGBA_UNORM_BLOCK; + break; + case Settings::AstcRecompression::Bc3: + tuple.format = is_srgb ? VK_FORMAT_BC3_SRGB_BLOCK : VK_FORMAT_BC3_UNORM_BLOCK; + break; } } const bool attachable = (tuple.usage & Attachable) != 0; diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index 4d0481f2a..77d72697e 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -1268,7 +1268,9 @@ Image::Image(TextureCacheRuntime& runtime_, const ImageInfo& info_, GPUVAddr gpu if (IsPixelFormatASTC(info.format) && !runtime->device.IsOptimalAstcSupported()) { if (Settings::values.async_astc.GetValue()) { flags |= VideoCommon::ImageFlagBits::AsynchronousDecode; - } else if (Settings::values.accelerate_astc.GetValue() && info.size.depth == 1) { + } else if (Settings::values.astc_recompression.GetValue() == + Settings::AstcRecompression::Uncompressed && + Settings::values.accelerate_astc.GetValue() && info.size.depth == 1) { flags |= VideoCommon::ImageFlagBits::AcceleratedUpload; } flags |= VideoCommon::ImageFlagBits::Converted; @@ -1283,7 +1285,9 @@ Image::Image(TextureCacheRuntime& runtime_, const ImageInfo& info_, GPUVAddr gpu .usage = VK_IMAGE_USAGE_STORAGE_BIT, }; current_image = *original_image; - if (IsPixelFormatASTC(info.format) && !runtime->device.IsOptimalAstcSupported()) { + if (IsPixelFormatASTC(info.format) && !runtime->device.IsOptimalAstcSupported() && + Settings::values.astc_recompression.GetValue() == + Settings::AstcRecompression::Uncompressed) { const auto& device = runtime->device.GetLogical(); storage_image_views.reserve(info.resources.levels); for (s32 level = 0; level < info.resources.levels; ++level) { diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cpp index f1071aa23..1463f157b 100644 --- a/src/video_core/texture_cache/util.cpp +++ b/src/video_core/texture_cache/util.cpp @@ -18,6 +18,8 @@ #include "common/bit_util.h" #include "common/common_types.h" #include "common/div_ceil.h" +#include "common/scratch_buffer.h" +#include "common/settings.h" #include "video_core/compatible_formats.h" #include "video_core/engines/maxwell_3d.h" #include "video_core/memory_manager.h" @@ -28,6 +30,7 @@ #include "video_core/texture_cache/samples_helper.h" #include "video_core/texture_cache/util.h" #include "video_core/textures/astc.h" +#include "video_core/textures/bcn.h" #include "video_core/textures/decoders.h" namespace VideoCommon { @@ -585,6 +588,21 @@ u32 CalculateConvertedSizeBytes(const ImageInfo& info) noexcept { return info.size.width * BytesPerBlock(info.format); } static constexpr Extent2D TILE_SIZE{1, 1}; + if (IsPixelFormatASTC(info.format) && Settings::values.astc_recompression.GetValue() != + Settings::AstcRecompression::Uncompressed) { + const u32 bpp_div = + Settings::values.astc_recompression.GetValue() == Settings::AstcRecompression::Bc1 ? 2 + : 1; + // NumBlocksPerLayer doesn't account for this correctly, so we have to do it manually. + u32 output_size = 0; + for (s32 i = 0; i < info.resources.levels; i++) { + const auto mip_size = AdjustMipSize(info.size, i); + const u32 plane_dim = + Common::AlignUp(mip_size.width, 4U) * Common::AlignUp(mip_size.height, 4U); + output_size += (plane_dim * info.size.depth * info.resources.layers) / bpp_div; + } + return output_size; + } return NumBlocksPerLayer(info, TILE_SIZE) * info.resources.layers * CONVERTED_BYTES_PER_BLOCK; } @@ -885,6 +903,7 @@ BufferCopy UploadBufferCopy(Tegra::MemoryManager& gpu_memory, GPUVAddr gpu_addr, void ConvertImage(std::span input, const ImageInfo& info, std::span output, std::span copies) { u32 output_offset = 0; + Common::ScratchBuffer decode_scratch; const Extent2D tile_size = DefaultBlockSize(info.format); for (BufferImageCopy& copy : copies) { @@ -895,22 +914,58 @@ void ConvertImage(std::span input, const ImageInfo& info, std::span(copy.buffer_size); + } else { + DecompressBC4(input_offset, copy.image_extent, output.subspan(output_offset)); + + output_offset += copy.image_extent.width * copy.image_extent.height * + copy.image_subresource.num_layers * CONVERTED_BYTES_PER_BLOCK; + } } } diff --git a/src/video_core/textures/astc.cpp b/src/video_core/textures/astc.cpp index a68bc0d77..fef0be31d 100644 --- a/src/video_core/textures/astc.cpp +++ b/src/video_core/textures/astc.cpp @@ -16,8 +16,8 @@ #include "common/alignment.h" #include "common/common_types.h" #include "common/polyfill_ranges.h" -#include "common/thread_worker.h" #include "video_core/textures/astc.h" +#include "video_core/textures/workers.h" class InputBitStream { public: @@ -1656,8 +1656,7 @@ void Decompress(std::span data, uint32_t width, uint32_t height, const u32 rows = Common::DivideUp(height, block_height); const u32 cols = Common::DivideUp(width, block_width); - static Common::ThreadWorker workers{std::max(std::thread::hardware_concurrency(), 2U) / 2, - "ASTCDecompress"}; + Common::ThreadWorker& workers{GetThreadWorkers()}; for (u32 z = 0; z < depth; ++z) { const u32 depth_offset = z * height * width * 4; diff --git a/src/video_core/textures/bcn.cpp b/src/video_core/textures/bcn.cpp new file mode 100644 index 000000000..671212a49 --- /dev/null +++ b/src/video_core/textures/bcn.cpp @@ -0,0 +1,87 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include + +#include "common/alignment.h" +#include "video_core/textures/bcn.h" +#include "video_core/textures/workers.h" + +namespace Tegra::Texture::BCN { + +using BCNCompressor = void(u8* block_output, const u8* block_input, bool any_alpha); + +template +void CompressBCN(std::span data, uint32_t width, uint32_t height, uint32_t depth, + std::span output, BCNCompressor f) { + constexpr u8 alpha_threshold = 128; + constexpr u32 bytes_per_px = 4; + const u32 plane_dim = width * height; + + Common::ThreadWorker& workers{GetThreadWorkers()}; + + for (u32 z = 0; z < depth; z++) { + for (u32 y = 0; y < height; y += 4) { + auto compress_row = [z, y, width, height, plane_dim, f, data, output]() { + for (u32 x = 0; x < width; x += 4) { + // Gather 4x4 block of RGBA texels + u8 input_colors[4][4][4]; + bool any_alpha = false; + + for (u32 j = 0; j < 4; j++) { + for (u32 i = 0; i < 4; i++) { + const size_t coord = + (z * plane_dim + (y + j) * width + (x + i)) * bytes_per_px; + + if ((x + i < width) && (y + j < height)) { + if constexpr (ThresholdAlpha) { + if (data[coord + 3] >= alpha_threshold) { + input_colors[j][i][0] = data[coord + 0]; + input_colors[j][i][1] = data[coord + 1]; + input_colors[j][i][2] = data[coord + 2]; + input_colors[j][i][3] = 255; + } else { + any_alpha = true; + memset(input_colors[j][i], 0, bytes_per_px); + } + } else { + memcpy(input_colors[j][i], &data[coord], bytes_per_px); + } + } else { + memset(input_colors[j][i], 0, bytes_per_px); + } + } + } + + const u32 bytes_per_row = BytesPerBlock * Common::DivideUp(width, 4U); + const u32 bytes_per_plane = bytes_per_row * Common::DivideUp(height, 4U); + f(output.data() + z * bytes_per_plane + (y / 4) * bytes_per_row + + (x / 4) * BytesPerBlock, + reinterpret_cast(input_colors), any_alpha); + } + }; + workers.QueueWork(std::move(compress_row)); + } + workers.WaitForRequests(); + } +} + +void CompressBC1(std::span data, uint32_t width, uint32_t height, uint32_t depth, + std::span output) { + CompressBCN<8, true>(data, width, height, depth, output, + [](u8* block_output, const u8* block_input, bool any_alpha) { + stb_compress_bc1_block(block_output, block_input, any_alpha, + STB_DXT_NORMAL); + }); +} + +void CompressBC3(std::span data, uint32_t width, uint32_t height, uint32_t depth, + std::span output) { + CompressBCN<16, false>(data, width, height, depth, output, + [](u8* block_output, const u8* block_input, bool any_alpha) { + stb_compress_bc3_block(block_output, block_input, STB_DXT_NORMAL); + }); +} + +} // namespace Tegra::Texture::BCN diff --git a/src/video_core/textures/bcn.h b/src/video_core/textures/bcn.h new file mode 100644 index 000000000..6464af885 --- /dev/null +++ b/src/video_core/textures/bcn.h @@ -0,0 +1,17 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include +#include + +namespace Tegra::Texture::BCN { + +void CompressBC1(std::span data, uint32_t width, uint32_t height, uint32_t depth, + std::span output); + +void CompressBC3(std::span data, uint32_t width, uint32_t height, uint32_t depth, + std::span output); + +} // namespace Tegra::Texture::BCN diff --git a/src/video_core/textures/workers.cpp b/src/video_core/textures/workers.cpp new file mode 100644 index 000000000..a71c305f4 --- /dev/null +++ b/src/video_core/textures/workers.cpp @@ -0,0 +1,15 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "video_core/textures/workers.h" + +namespace Tegra::Texture { + +Common::ThreadWorker& GetThreadWorkers() { + static Common::ThreadWorker workers{std::max(std::thread::hardware_concurrency(), 2U) / 2, + "ImageTranscode"}; + + return workers; +} + +} // namespace Tegra::Texture diff --git a/src/video_core/textures/workers.h b/src/video_core/textures/workers.h new file mode 100644 index 000000000..008dd05b3 --- /dev/null +++ b/src/video_core/textures/workers.h @@ -0,0 +1,12 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "common/thread_worker.h" + +namespace Tegra::Texture { + +Common::ThreadWorker& GetThreadWorkers(); + +} diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index f6e6f2736..b49f78bc9 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -1001,6 +1001,11 @@ u64 Device::GetDeviceMemoryUsage() const { } void Device::CollectPhysicalMemoryInfo() { + // 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); + + // Calculate limits using memory budget VkPhysicalDeviceMemoryBudgetPropertiesEXT budget{}; budget.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT; const auto mem_info = @@ -1030,6 +1035,7 @@ void Device::CollectPhysicalMemoryInfo() { if (!is_integrated) { const u64 reserve_memory = std::min(device_access_memory / 8, 1_GiB); device_access_memory -= reserve_memory; + device_access_memory = std::min(device_access_memory, normal_memory + scaler_memory); return; } const s64 available_memory = static_cast(device_access_memory - device_initial_usage); diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 70737c54e..662651196 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -711,6 +711,7 @@ void Config::ReadRendererValues() { ReadGlobalSetting(Settings::values.nvdec_emulation); ReadGlobalSetting(Settings::values.accelerate_astc); ReadGlobalSetting(Settings::values.async_astc); + ReadGlobalSetting(Settings::values.astc_recompression); ReadGlobalSetting(Settings::values.use_reactive_flushing); ReadGlobalSetting(Settings::values.shader_backend); ReadGlobalSetting(Settings::values.use_asynchronous_shaders); @@ -1359,6 +1360,10 @@ void Config::SaveRendererValues() { Settings::values.nvdec_emulation.UsingGlobal()); WriteGlobalSetting(Settings::values.accelerate_astc); WriteGlobalSetting(Settings::values.async_astc); + WriteSetting(QString::fromStdString(Settings::values.astc_recompression.GetLabel()), + static_cast(Settings::values.astc_recompression.GetValue(global)), + static_cast(Settings::values.astc_recompression.GetDefault()), + Settings::values.astc_recompression.UsingGlobal()); WriteGlobalSetting(Settings::values.use_reactive_flushing); WriteSetting(QString::fromStdString(Settings::values.shader_backend.GetLabel()), static_cast(Settings::values.shader_backend.GetValue(global)), diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h index 7d26e9ab6..9cb9db6cf 100644 --- a/src/yuzu/configuration/config.h +++ b/src/yuzu/configuration/config.h @@ -208,3 +208,4 @@ Q_DECLARE_METATYPE(Settings::ScalingFilter); Q_DECLARE_METATYPE(Settings::AntiAliasing); Q_DECLARE_METATYPE(Settings::RendererBackend); Q_DECLARE_METATYPE(Settings::ShaderBackend); +Q_DECLARE_METATYPE(Settings::AstcRecompression); diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp index 1f3e489d0..896863f87 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.cpp +++ b/src/yuzu/configuration/configure_graphics_advanced.cpp @@ -27,6 +27,7 @@ void ConfigureGraphicsAdvanced::SetConfiguration() { ui->async_present->setEnabled(runtime_lock); ui->renderer_force_max_clock->setEnabled(runtime_lock); ui->async_astc->setEnabled(runtime_lock); + ui->astc_recompression_combobox->setEnabled(runtime_lock); ui->use_asynchronous_shaders->setEnabled(runtime_lock); ui->anisotropic_filtering_combobox->setEnabled(runtime_lock); ui->enable_compute_pipelines_checkbox->setEnabled(runtime_lock); @@ -47,14 +48,20 @@ void ConfigureGraphicsAdvanced::SetConfiguration() { static_cast(Settings::values.gpu_accuracy.GetValue())); ui->anisotropic_filtering_combobox->setCurrentIndex( Settings::values.max_anisotropy.GetValue()); + ui->astc_recompression_combobox->setCurrentIndex( + static_cast(Settings::values.astc_recompression.GetValue())); } else { ConfigurationShared::SetPerGameSetting(ui->gpu_accuracy, &Settings::values.gpu_accuracy); ConfigurationShared::SetPerGameSetting(ui->anisotropic_filtering_combobox, &Settings::values.max_anisotropy); + ConfigurationShared::SetPerGameSetting(ui->astc_recompression_combobox, + &Settings::values.astc_recompression); ConfigurationShared::SetHighlight(ui->label_gpu_accuracy, !Settings::values.gpu_accuracy.UsingGlobal()); ConfigurationShared::SetHighlight(ui->af_label, !Settings::values.max_anisotropy.UsingGlobal()); + ConfigurationShared::SetHighlight(ui->label_astc_recompression, + !Settings::values.astc_recompression.UsingGlobal()); } } @@ -71,6 +78,8 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() { ui->use_reactive_flushing, use_reactive_flushing); ConfigurationShared::ApplyPerGameSetting(&Settings::values.async_astc, ui->async_astc, async_astc); + ConfigurationShared::ApplyPerGameSetting(&Settings::values.astc_recompression, + ui->astc_recompression_combobox); ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_shaders, ui->use_asynchronous_shaders, use_asynchronous_shaders); @@ -105,6 +114,8 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { Settings::values.renderer_force_max_clock.UsingGlobal()); ui->use_reactive_flushing->setEnabled(Settings::values.use_reactive_flushing.UsingGlobal()); ui->async_astc->setEnabled(Settings::values.async_astc.UsingGlobal()); + ui->astc_recompression_combobox->setEnabled( + Settings::values.astc_recompression.UsingGlobal()); ui->use_asynchronous_shaders->setEnabled( Settings::values.use_asynchronous_shaders.UsingGlobal()); ui->use_fast_gpu_time->setEnabled(Settings::values.use_fast_gpu_time.UsingGlobal()); @@ -144,6 +155,9 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { ConfigurationShared::SetColoredComboBox( ui->anisotropic_filtering_combobox, ui->af_label, static_cast(Settings::values.max_anisotropy.GetValue(true))); + ConfigurationShared::SetColoredComboBox( + ui->astc_recompression_combobox, ui->label_astc_recompression, + static_cast(Settings::values.astc_recompression.GetValue(true))); } void ConfigureGraphicsAdvanced::ExposeComputeOption() { diff --git a/src/yuzu/configuration/configure_graphics_advanced.ui b/src/yuzu/configuration/configure_graphics_advanced.ui index 9ef7c8e8f..37757a918 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.ui +++ b/src/yuzu/configuration/configure_graphics_advanced.ui @@ -69,6 +69,50 @@ + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + ASTC recompression: + + + + + + + + Uncompressed (Best quality) + + + + + BC1 (Low quality) + + + + + BC3 (Medium quality) + + + + + + + diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index dc9a3d68f..c5bc472ca 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -318,6 +318,7 @@ void Config::ReadValues() { ReadSetting("Renderer", Settings::values.nvdec_emulation); ReadSetting("Renderer", Settings::values.accelerate_astc); ReadSetting("Renderer", Settings::values.async_astc); + ReadSetting("Renderer", Settings::values.astc_recompression); ReadSetting("Renderer", Settings::values.use_fast_gpu_time); ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache); diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 5e7c3ac04..644a30e59 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -360,6 +360,10 @@ accelerate_astc = # 0 (default): Off, 1: On async_astc = +# Recompress ASTC textures to a different format. +# 0 (default): Uncompressed, 1: BC1 (Low quality), 2: BC3: (Medium quality) +async_astc = + # Turns on the speed limiter, which will limit the emulation speed to the desired speed limit value # 0: Off, 1: On (default) use_speed_limit = From 3b1172c10f9312c9a6f49f61872c75bfbe701e1b Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 20 May 2023 18:07:31 -0400 Subject: [PATCH 0410/1181] video_core: tune garbage collection aggressiveness --- src/video_core/buffer_cache/buffer_cache.h | 4 ++-- src/video_core/texture_cache/texture_cache.h | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 98756e4da..f3a6d5069 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -30,8 +30,8 @@ BufferCache

::BufferCache(VideoCore::RasterizerInterface& rasterizer_, } const s64 device_memory = static_cast(runtime.GetDeviceLocalMemory()); - const s64 min_spacing_expected = device_memory - 1_GiB - 512_MiB; - const s64 min_spacing_critical = device_memory - 1_GiB; + const s64 min_spacing_expected = device_memory - 1_GiB; + const s64 min_spacing_critical = device_memory - 512_MiB; const s64 mem_threshold = std::min(device_memory, TARGET_THRESHOLD); const s64 min_vacancy_expected = (6 * mem_threshold) / 10; const s64 min_vacancy_critical = (3 * mem_threshold) / 10; diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index b24086fce..6abafa877 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -49,8 +49,8 @@ TextureCache

::TextureCache(Runtime& runtime_, VideoCore::RasterizerInterface& if constexpr (HAS_DEVICE_MEMORY_INFO) { const s64 device_memory = static_cast(runtime.GetDeviceLocalMemory()); - const s64 min_spacing_expected = device_memory - 1_GiB - 512_MiB; - const s64 min_spacing_critical = device_memory - 1_GiB; + const s64 min_spacing_expected = device_memory - 1_GiB; + const s64 min_spacing_critical = device_memory - 512_MiB; const s64 mem_threshold = std::min(device_memory, TARGET_THRESHOLD); const s64 min_vacancy_expected = (6 * mem_threshold) / 10; const s64 min_vacancy_critical = (3 * mem_threshold) / 10; @@ -86,10 +86,12 @@ void TextureCache

::RunGarbageCollector() { // used by the async decoder thread. return false; } + if (!aggressive_mode && True(image.flags & ImageFlagBits::CostlyLoad)) { + return false; + } const bool must_download = image.IsSafeDownload() && False(image.flags & ImageFlagBits::BadOverlap); - if (!high_priority_mode && - (must_download || True(image.flags & ImageFlagBits::CostlyLoad))) { + if (!high_priority_mode && must_download) { return false; } if (must_download) { From b3ebfd24811bcff2a6f442d45b55765618d10761 Mon Sep 17 00:00:00 2001 From: grimkor Date: Tue, 16 May 2023 20:17:54 +0100 Subject: [PATCH 0411/1181] add context menu for filter and anti-aliasing status buttons --- src/yuzu/configuration/config.cpp | 36 ++++++ src/yuzu/configuration/config.h | 6 + src/yuzu/main.cpp | 181 ++++++++++++++++++------------ 3 files changed, 152 insertions(+), 71 deletions(-) diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 70737c54e..037475ebc 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -65,6 +65,42 @@ const std::array Config::default_ringcon_analogs{{ Qt::Key_D, }}; +const std::map Config::anti_aliasing_texts_map = { + {Settings::AntiAliasing::None, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "None"))}, + {Settings::AntiAliasing::Fxaa, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "FXAA"))}, + {Settings::AntiAliasing::Smaa, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "SMAA"))}, +}; + +const std::map Config::scaling_filter_texts_map = { + {Settings::ScalingFilter::NearestNeighbor, + QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Nearest"))}, + {Settings::ScalingFilter::Bilinear, + QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Bilinear"))}, + {Settings::ScalingFilter::Bicubic, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Bicubic"))}, + {Settings::ScalingFilter::Gaussian, + QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Gaussian"))}, + {Settings::ScalingFilter::ScaleForce, + QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "ScaleForce"))}, + {Settings::ScalingFilter::Fsr, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "FSR"))}, +}; + +const std::map Config::use_docked_mode_texts_map = { + {true, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Docked"))}, + {false, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Handheld"))}, +}; + +const std::map Config::gpu_accuracy_texts_map = { + {Settings::GPUAccuracy::Normal, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Normal"))}, + {Settings::GPUAccuracy::High, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "High"))}, + {Settings::GPUAccuracy::Extreme, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Extreme"))}, +}; + +const std::map Config::renderer_backend_texts_map = { + {Settings::RendererBackend::Vulkan, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Vulkan"))}, + {Settings::RendererBackend::OpenGL, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "OpenGL"))}, + {Settings::RendererBackend::Null, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Null"))}, +}; + // This shouldn't have anything except static initializers (no functions). So // QKeySequence(...).toString() is NOT ALLOWED HERE. // This must be in alphabetical order according to action name as it must have the same order as diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h index 7d26e9ab6..991a6eb23 100644 --- a/src/yuzu/configuration/config.h +++ b/src/yuzu/configuration/config.h @@ -49,6 +49,12 @@ public: static const std::array default_keyboard_mods; static const std::array default_hotkeys; + static const std::map anti_aliasing_texts_map; + static const std::map scaling_filter_texts_map; + static const std::map use_docked_mode_texts_map; + static const std::map gpu_accuracy_texts_map; + static const std::map renderer_backend_texts_map; + static constexpr UISettings::Theme default_theme{ #ifdef _WIN32 UISettings::Theme::DarkColorful diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 4489f43af..1b412295b 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1054,6 +1054,24 @@ void GMainWindow::InitializeWidgets() { bottomLeft.setY(bottomLeft.y() - volume_popup->geometry().height()); volume_popup->setGeometry(QRect(bottomLeft, QSize(rect.width(), rect.height()))); }); + volume_button->setContextMenuPolicy(Qt::CustomContextMenu); + connect(volume_button, &QPushButton::customContextMenuRequested, + [this](const QPoint& menu_location) { + QMenu context_menu; + context_menu.addAction( + Settings::values.audio_muted ? tr("Unmute") : tr("Mute"), [this] { + Settings::values.audio_muted = !Settings::values.audio_muted; + UpdateVolumeUI(); + }); + + context_menu.addAction(tr("Reset Volume"), [this] { + Settings::values.volume.SetValue(100); + UpdateVolumeUI(); + }); + + context_menu.exec(volume_button->mapToGlobal(menu_location)); + volume_button->repaint(); + }); statusBar()->insertPermanentWidget(0, volume_button); // setup AA button @@ -1074,6 +1092,19 @@ void GMainWindow::InitializeWidgets() { UpdateAAText(); aa_status_button->setCheckable(true); aa_status_button->setChecked(true); + aa_status_button->setContextMenuPolicy(Qt::CustomContextMenu); + connect(aa_status_button, &QPushButton::customContextMenuRequested, + [this](const QPoint& menu_location) { + QMenu context_menu; + for (auto const& aa_text_pair : Config::anti_aliasing_texts_map) { + context_menu.addAction(aa_text_pair.second, [this, aa_text_pair] { + Settings::values.anti_aliasing.SetValue(aa_text_pair.first); + UpdateAAText(); + }); + } + context_menu.exec(aa_status_button->mapToGlobal(menu_location)); + aa_status_button->repaint(); + }); statusBar()->insertPermanentWidget(0, aa_status_button); // Setup Filter button @@ -1085,6 +1116,19 @@ void GMainWindow::InitializeWidgets() { UpdateFilterText(); filter_status_button->setCheckable(true); filter_status_button->setChecked(true); + filter_status_button->setContextMenuPolicy(Qt::CustomContextMenu); + connect(filter_status_button, &QPushButton::customContextMenuRequested, + [this](const QPoint& menu_location) { + QMenu context_menu; + for (auto const& filter_text_pair : Config::scaling_filter_texts_map) { + context_menu.addAction(filter_text_pair.second, [this, filter_text_pair] { + Settings::values.scaling_filter.SetValue(filter_text_pair.first); + UpdateFilterText(); + }); + } + context_menu.exec(filter_status_button->mapToGlobal(menu_location)); + filter_status_button->repaint(); + }); statusBar()->insertPermanentWidget(0, filter_status_button); // Setup Dock button @@ -1094,14 +1138,47 @@ void GMainWindow::InitializeWidgets() { connect(dock_status_button, &QPushButton::clicked, this, &GMainWindow::OnToggleDockedMode); dock_status_button->setCheckable(true); UpdateDockedButton(); + dock_status_button->setContextMenuPolicy(Qt::CustomContextMenu); + connect(dock_status_button, &QPushButton::customContextMenuRequested, + [this](const QPoint& menu_location) { + QMenu context_menu; + + for (auto const& docked_mode_pair : Config::use_docked_mode_texts_map) { + context_menu.addAction(docked_mode_pair.second, [this, docked_mode_pair] { + if (docked_mode_pair.first != Settings::values.use_docked_mode.GetValue()) { + OnToggleDockedMode(); + } + }); + } + context_menu.exec(dock_status_button->mapToGlobal(menu_location)); + dock_status_button->repaint(); + }); statusBar()->insertPermanentWidget(0, dock_status_button); + // Setup GPU Accuracy button gpu_accuracy_button = new QPushButton(); gpu_accuracy_button->setObjectName(QStringLiteral("GPUStatusBarButton")); gpu_accuracy_button->setCheckable(true); gpu_accuracy_button->setFocusPolicy(Qt::NoFocus); connect(gpu_accuracy_button, &QPushButton::clicked, this, &GMainWindow::OnToggleGpuAccuracy); UpdateGPUAccuracyButton(); + gpu_accuracy_button->setContextMenuPolicy(Qt::CustomContextMenu); + connect(gpu_accuracy_button, &QPushButton::customContextMenuRequested, + [this](const QPoint& menu_location) { + QMenu context_menu; + + for (auto const& gpu_accuracy_pair : Config::gpu_accuracy_texts_map) { + if (gpu_accuracy_pair.first == Settings::GPUAccuracy::Extreme) { + continue; + } + context_menu.addAction(gpu_accuracy_pair.second, [this, gpu_accuracy_pair] { + Settings::values.gpu_accuracy.SetValue(gpu_accuracy_pair.first); + UpdateGPUAccuracyButton(); + }); + } + context_menu.exec(gpu_accuracy_button->mapToGlobal(menu_location)); + gpu_accuracy_button->repaint(); + }); statusBar()->insertPermanentWidget(0, gpu_accuracy_button); // Setup Renderer API button @@ -1114,6 +1191,24 @@ void GMainWindow::InitializeWidgets() { renderer_status_button->setCheckable(true); renderer_status_button->setChecked(Settings::values.renderer_backend.GetValue() == Settings::RendererBackend::Vulkan); + renderer_status_button->setContextMenuPolicy(Qt::CustomContextMenu); + connect(renderer_status_button, &QPushButton::customContextMenuRequested, + [this](const QPoint& menu_location) { + QMenu context_menu; + + for (auto const& renderer_backend_pair : Config::renderer_backend_texts_map) { + if (renderer_backend_pair.first == Settings::RendererBackend::Null) { + continue; + } + context_menu.addAction( + renderer_backend_pair.second, [this, renderer_backend_pair] { + Settings::values.renderer_backend.SetValue(renderer_backend_pair.first); + UpdateAPIText(); + }); + } + context_menu.exec(renderer_status_button->mapToGlobal(menu_location)); + renderer_status_button->repaint(); + }); statusBar()->insertPermanentWidget(0, renderer_status_button); statusBar()->setVisible(true); @@ -3980,94 +4075,38 @@ void GMainWindow::UpdateStatusBar() { } void GMainWindow::UpdateGPUAccuracyButton() { - switch (Settings::values.gpu_accuracy.GetValue()) { - case Settings::GPUAccuracy::Normal: { - gpu_accuracy_button->setText(tr("GPU NORMAL")); - gpu_accuracy_button->setChecked(false); - break; - } - case Settings::GPUAccuracy::High: { - gpu_accuracy_button->setText(tr("GPU HIGH")); - gpu_accuracy_button->setChecked(true); - break; - } - case Settings::GPUAccuracy::Extreme: { - gpu_accuracy_button->setText(tr("GPU EXTREME")); - gpu_accuracy_button->setChecked(true); - break; - } - default: { - gpu_accuracy_button->setText(tr("GPU ERROR")); - gpu_accuracy_button->setChecked(true); - break; - } - } + const auto gpu_accuracy = Settings::values.gpu_accuracy.GetValue(); + const auto gpu_accuracy_text = Config::gpu_accuracy_texts_map.find(gpu_accuracy)->second; + gpu_accuracy_button->setText(gpu_accuracy_text.toUpper()); + gpu_accuracy_button->setChecked(gpu_accuracy != Settings::GPUAccuracy::Normal); } void GMainWindow::UpdateDockedButton() { const bool is_docked = Settings::values.use_docked_mode.GetValue(); dock_status_button->setChecked(is_docked); - dock_status_button->setText(is_docked ? tr("DOCKED") : tr("HANDHELD")); + dock_status_button->setText( + Config::use_docked_mode_texts_map.find(is_docked)->second.toUpper()); } void GMainWindow::UpdateAPIText() { const auto api = Settings::values.renderer_backend.GetValue(); - switch (api) { - case Settings::RendererBackend::OpenGL: - renderer_status_button->setText(tr("OPENGL")); - break; - case Settings::RendererBackend::Vulkan: - renderer_status_button->setText(tr("VULKAN")); - break; - case Settings::RendererBackend::Null: - renderer_status_button->setText(tr("NULL")); - break; - } + const auto renderer_status_text = Config::renderer_backend_texts_map.find(api)->second; + renderer_status_button->setText(renderer_status_text.toUpper()); } void GMainWindow::UpdateFilterText() { const auto filter = Settings::values.scaling_filter.GetValue(); - switch (filter) { - case Settings::ScalingFilter::NearestNeighbor: - filter_status_button->setText(tr("NEAREST")); - break; - case Settings::ScalingFilter::Bilinear: - filter_status_button->setText(tr("BILINEAR")); - break; - case Settings::ScalingFilter::Bicubic: - filter_status_button->setText(tr("BICUBIC")); - break; - case Settings::ScalingFilter::Gaussian: - filter_status_button->setText(tr("GAUSSIAN")); - break; - case Settings::ScalingFilter::ScaleForce: - filter_status_button->setText(tr("SCALEFORCE")); - break; - case Settings::ScalingFilter::Fsr: - filter_status_button->setText(tr("FSR")); - break; - default: - filter_status_button->setText(tr("BILINEAR")); - break; - } + const auto filter_text = Config::scaling_filter_texts_map.find(filter)->second; + filter_status_button->setText(filter == Settings::ScalingFilter::Fsr ? tr("FSR") + : filter_text.toUpper()); } void GMainWindow::UpdateAAText() { const auto aa_mode = Settings::values.anti_aliasing.GetValue(); - switch (aa_mode) { - case Settings::AntiAliasing::None: - aa_status_button->setText(tr("NO AA")); - break; - case Settings::AntiAliasing::Fxaa: - aa_status_button->setText(tr("FXAA")); - break; - case Settings::AntiAliasing::Smaa: - aa_status_button->setText(tr("SMAA")); - break; - default: - aa_status_button->setText(tr("NO AA")); - break; - } + const auto aa_text = Config::anti_aliasing_texts_map.find(aa_mode)->second; + aa_status_button->setText(aa_mode == Settings::AntiAliasing::None + ? QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "NO AA")) + : aa_text.toUpper()); } void GMainWindow::UpdateVolumeUI() { From 9c3c7ec009ff4d4b006222328736fa0f66d5598a Mon Sep 17 00:00:00 2001 From: Alexandre Bouvier Date: Wed, 1 Mar 2023 21:31:27 +0100 Subject: [PATCH 0412/1181] cmake: apply defaults to all externals --- externals/CMakeLists.txt | 42 ++++++++++++++++++--------------- externals/glad/CMakeLists.txt | 2 +- externals/libusb/CMakeLists.txt | 2 +- externals/opus/CMakeLists.txt | 2 +- 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index e59eeb489..d78d10147 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -8,15 +8,21 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) # Disable tests in all externals supporting the standard option name set(BUILD_TESTING OFF) +# Build only static externals +set(BUILD_SHARED_LIBS OFF) + +# Skip install rules for all externals +set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON) + # xbyak if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak) - add_subdirectory(xbyak EXCLUDE_FROM_ALL) + add_subdirectory(xbyak) endif() # Dynarmic if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmic) set(DYNARMIC_IGNORE_ASSERTS ON) - add_subdirectory(dynarmic EXCLUDE_FROM_ALL) + add_subdirectory(dynarmic) add_library(dynarmic::dynarmic ALIAS dynarmic) endif() @@ -34,7 +40,7 @@ if (NOT TARGET inih::INIReader) endif() # mbedtls -add_subdirectory(mbedtls EXCLUDE_FROM_ALL) +add_subdirectory(mbedtls) target_include_directories(mbedtls PUBLIC ./mbedtls/include) # MicroProfile @@ -48,7 +54,7 @@ endif() # libusb if (ENABLE_LIBUSB AND NOT TARGET libusb::usb) - add_subdirectory(libusb EXCLUDE_FROM_ALL) + add_subdirectory(libusb) endif() # SDL2 @@ -67,18 +73,16 @@ if (YUZU_USE_EXTERNAL_SDL2) set(HIDAPI ON) endif() - set(SDL_STATIC ON) - set(SDL_SHARED OFF) if (APPLE) set(SDL_FILE ON) endif() - add_subdirectory(SDL EXCLUDE_FROM_ALL) + add_subdirectory(SDL) endif() # ENet if (NOT TARGET enet::enet) - add_subdirectory(enet EXCLUDE_FROM_ALL) + add_subdirectory(enet) target_include_directories(enet INTERFACE ./enet/include) add_library(enet::enet ALIAS enet) endif() @@ -86,24 +90,26 @@ endif() # Cubeb if (ENABLE_CUBEB AND NOT TARGET cubeb::cubeb) set(BUILD_TESTS OFF) - add_subdirectory(cubeb EXCLUDE_FROM_ALL) + set(BUILD_TOOLS OFF) + add_subdirectory(cubeb) add_library(cubeb::cubeb ALIAS cubeb) endif() # DiscordRPC if (USE_DISCORD_PRESENCE AND NOT TARGET DiscordRPC::discord-rpc) - add_subdirectory(discord-rpc EXCLUDE_FROM_ALL) + set(BUILD_EXAMPLES OFF) + add_subdirectory(discord-rpc) target_include_directories(discord-rpc INTERFACE ./discord-rpc/include) add_library(DiscordRPC::discord-rpc ALIAS discord-rpc) endif() # Sirit -add_subdirectory(sirit EXCLUDE_FROM_ALL) +add_subdirectory(sirit) # httplib if (ENABLE_WEB_SERVICE AND NOT TARGET httplib::httplib) set(HTTPLIB_REQUIRE_OPENSSL ON) - add_subdirectory(cpp-httplib EXCLUDE_FROM_ALL) + add_subdirectory(cpp-httplib) endif() # cpp-jwt @@ -111,12 +117,12 @@ if (ENABLE_WEB_SERVICE AND NOT TARGET cpp-jwt::cpp-jwt) set(CPP_JWT_BUILD_EXAMPLES OFF) set(CPP_JWT_BUILD_TESTS OFF) set(CPP_JWT_USE_VENDORED_NLOHMANN_JSON OFF) - add_subdirectory(cpp-jwt EXCLUDE_FROM_ALL) + add_subdirectory(cpp-jwt) endif() # Opus if (NOT TARGET Opus::opus) - add_subdirectory(opus EXCLUDE_FROM_ALL) + add_subdirectory(opus) endif() # FFMpeg @@ -130,16 +136,14 @@ endif() # Vulkan-Headers if (YUZU_USE_EXTERNAL_VULKAN_HEADERS) - add_subdirectory(Vulkan-Headers EXCLUDE_FROM_ALL) + add_subdirectory(Vulkan-Headers) endif() if (NOT TARGET LLVM::Demangle) - add_library(demangle STATIC) + add_library(demangle demangle/ItaniumDemangle.cpp) target_include_directories(demangle PUBLIC ./demangle) - target_sources(demangle PRIVATE demangle/ItaniumDemangle.cpp) add_library(LLVM::Demangle ALIAS demangle) endif() -add_library(stb STATIC) +add_library(stb stb/stb_dxt.cpp) target_include_directories(stb PUBLIC ./stb) -target_sources(stb PRIVATE stb/stb_dxt.cpp) diff --git a/externals/glad/CMakeLists.txt b/externals/glad/CMakeLists.txt index 3dfcac2fd..0c8e285a4 100644 --- a/externals/glad/CMakeLists.txt +++ b/externals/glad/CMakeLists.txt @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2015 Yuri Kunde Schlesner # SPDX-License-Identifier: GPL-2.0-or-later -add_library(glad STATIC +add_library(glad src/glad.c include/KHR/khrplatform.h include/glad/glad.h diff --git a/externals/libusb/CMakeLists.txt b/externals/libusb/CMakeLists.txt index 6317ea807..6757b59da 100644 --- a/externals/libusb/CMakeLists.txt +++ b/externals/libusb/CMakeLists.txt @@ -122,7 +122,7 @@ else() # MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") add_compile_options(/utf-8) endif() - add_library(usb STATIC EXCLUDE_FROM_ALL + add_library(usb libusb/libusb/core.c libusb/libusb/core.c libusb/libusb/descriptor.c diff --git a/externals/opus/CMakeLists.txt b/externals/opus/CMakeLists.txt index 410ff7c08..d9a03423d 100644 --- a/externals/opus/CMakeLists.txt +++ b/externals/opus/CMakeLists.txt @@ -23,7 +23,7 @@ else() endif() endif() -add_library(opus STATIC +add_library(opus # CELT sources opus/celt/bands.c opus/celt/celt.c From 72c1ee1bf96be45e2794f26ad83dbd13e892c22d Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Tue, 23 May 2023 01:34:46 -0400 Subject: [PATCH 0413/1181] texture_cache: process aliases and overlaps in the correct order --- src/video_core/texture_cache/image_base.cpp | 7 +- src/video_core/texture_cache/image_base.h | 2 +- src/video_core/texture_cache/texture_cache.h | 141 +++++++++++------- .../texture_cache/texture_cache_base.h | 16 ++ 4 files changed, 105 insertions(+), 61 deletions(-) diff --git a/src/video_core/texture_cache/image_base.cpp b/src/video_core/texture_cache/image_base.cpp index 91512022f..d79594ce5 100644 --- a/src/video_core/texture_cache/image_base.cpp +++ b/src/video_core/texture_cache/image_base.cpp @@ -155,7 +155,7 @@ void ImageBase::CheckAliasState() { flags &= ~ImageFlagBits::Alias; } -void AddImageAlias(ImageBase& lhs, ImageBase& rhs, ImageId lhs_id, ImageId rhs_id) { +bool AddImageAlias(ImageBase& lhs, ImageBase& rhs, ImageId lhs_id, ImageId rhs_id) { static constexpr auto OPTIONS = RelaxedOptions::Size | RelaxedOptions::Format; ASSERT(lhs.info.type == rhs.info.type); std::optional base; @@ -169,7 +169,7 @@ void AddImageAlias(ImageBase& lhs, ImageBase& rhs, ImageId lhs_id, ImageId rhs_i } if (!base) { LOG_ERROR(HW_GPU, "Image alias should have been flipped"); - return; + return false; } const PixelFormat lhs_format = lhs.info.format; const PixelFormat rhs_format = rhs.info.format; @@ -248,12 +248,13 @@ void AddImageAlias(ImageBase& lhs, ImageBase& rhs, ImageId lhs_id, ImageId rhs_i } ASSERT(lhs_alias.copies.empty() == rhs_alias.copies.empty()); if (lhs_alias.copies.empty()) { - return; + return false; } lhs.aliased_images.push_back(std::move(lhs_alias)); rhs.aliased_images.push_back(std::move(rhs_alias)); lhs.flags &= ~ImageFlagBits::IsRescalable; rhs.flags &= ~ImageFlagBits::IsRescalable; + return true; } } // namespace VideoCommon diff --git a/src/video_core/texture_cache/image_base.h b/src/video_core/texture_cache/image_base.h index 329396bb6..1b8a17ee8 100644 --- a/src/video_core/texture_cache/image_base.h +++ b/src/video_core/texture_cache/image_base.h @@ -142,6 +142,6 @@ struct ImageAllocBase { std::vector images; }; -void AddImageAlias(ImageBase& lhs, ImageBase& rhs, ImageId lhs_id, ImageId rhs_id); +bool AddImageAlias(ImageBase& lhs, ImageBase& rhs, ImageId lhs_id, ImageId rhs_id); } // namespace VideoCommon diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index b24086fce..f5c12d992 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1274,17 +1274,18 @@ ImageId TextureCache

::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA const size_t size_bytes = CalculateGuestSizeInBytes(new_info); const bool broken_views = runtime.HasBrokenTextureViewFormats(); const bool native_bgr = runtime.HasNativeBgr(); - boost::container::small_vector overlap_ids; - std::unordered_set overlaps_found; - boost::container::small_vector left_aliased_ids; - boost::container::small_vector right_aliased_ids; - std::unordered_set ignore_textures; - boost::container::small_vector bad_overlap_ids; - boost::container::small_vector all_siblings; + join_overlap_ids.clear(); + join_overlaps_found.clear(); + join_left_aliased_ids.clear(); + join_right_aliased_ids.clear(); + join_ignore_textures.clear(); + join_bad_overlap_ids.clear(); + join_copies_to_do.clear(); + join_alias_indices.clear(); const bool this_is_linear = info.type == ImageType::Linear; const auto region_check = [&](ImageId overlap_id, ImageBase& overlap) { if (True(overlap.flags & ImageFlagBits::Remapped)) { - ignore_textures.insert(overlap_id); + join_ignore_textures.insert(overlap_id); return; } const bool overlap_is_linear = overlap.info.type == ImageType::Linear; @@ -1294,11 +1295,11 @@ ImageId TextureCache

::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA if (this_is_linear && overlap_is_linear) { if (info.pitch == overlap.info.pitch && gpu_addr == overlap.gpu_addr) { // Alias linear images with the same pitch - left_aliased_ids.push_back(overlap_id); + join_left_aliased_ids.push_back(overlap_id); } return; } - overlaps_found.insert(overlap_id); + join_overlaps_found.insert(overlap_id); static constexpr bool strict_size = true; const std::optional solution = ResolveOverlap( new_info, gpu_addr, cpu_addr, overlap, strict_size, broken_views, native_bgr); @@ -1306,33 +1307,33 @@ ImageId TextureCache

::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA gpu_addr = solution->gpu_addr; cpu_addr = solution->cpu_addr; new_info.resources = solution->resources; - overlap_ids.push_back(overlap_id); - all_siblings.push_back(overlap_id); + join_overlap_ids.push_back(overlap_id); + join_copies_to_do.emplace_back(JoinCopy{false, overlap_id}); return; } static constexpr auto options = RelaxedOptions::Size | RelaxedOptions::Format; const ImageBase new_image_base(new_info, gpu_addr, cpu_addr); if (IsSubresource(new_info, overlap, gpu_addr, options, broken_views, native_bgr)) { - left_aliased_ids.push_back(overlap_id); + join_left_aliased_ids.push_back(overlap_id); overlap.flags |= ImageFlagBits::Alias; - all_siblings.push_back(overlap_id); + join_copies_to_do.emplace_back(JoinCopy{true, overlap_id}); } else if (IsSubresource(overlap.info, new_image_base, overlap.gpu_addr, options, broken_views, native_bgr)) { - right_aliased_ids.push_back(overlap_id); + join_right_aliased_ids.push_back(overlap_id); overlap.flags |= ImageFlagBits::Alias; - all_siblings.push_back(overlap_id); + join_copies_to_do.emplace_back(JoinCopy{true, overlap_id}); } else { - bad_overlap_ids.push_back(overlap_id); + join_bad_overlap_ids.push_back(overlap_id); } }; ForEachImageInRegion(cpu_addr, size_bytes, region_check); const auto region_check_gpu = [&](ImageId overlap_id, ImageBase& overlap) { - if (!overlaps_found.contains(overlap_id)) { + if (!join_overlaps_found.contains(overlap_id)) { if (True(overlap.flags & ImageFlagBits::Remapped)) { - ignore_textures.insert(overlap_id); + join_ignore_textures.insert(overlap_id); } if (overlap.gpu_addr == gpu_addr && overlap.guest_size_bytes == size_bytes) { - ignore_textures.insert(overlap_id); + join_ignore_textures.insert(overlap_id); } } }; @@ -1340,11 +1341,11 @@ ImageId TextureCache

::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA bool can_rescale = info.rescaleable; bool any_rescaled = false; - for (const ImageId sibling_id : all_siblings) { + for (const auto& copy : join_copies_to_do) { if (!can_rescale) { break; } - Image& sibling = slot_images[sibling_id]; + Image& sibling = slot_images[copy.id]; can_rescale &= ImageCanRescale(sibling); any_rescaled |= True(sibling.flags & ImageFlagBits::Rescaled); } @@ -1352,13 +1353,13 @@ ImageId TextureCache

::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA can_rescale &= any_rescaled; if (can_rescale) { - for (const ImageId sibling_id : all_siblings) { - Image& sibling = slot_images[sibling_id]; + for (const auto& copy : join_copies_to_do) { + Image& sibling = slot_images[copy.id]; ScaleUp(sibling); } } else { - for (const ImageId sibling_id : all_siblings) { - Image& sibling = slot_images[sibling_id]; + for (const auto& copy : join_copies_to_do) { + Image& sibling = slot_images[copy.id]; ScaleDown(sibling); } } @@ -1370,7 +1371,7 @@ ImageId TextureCache

::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA new_image.flags |= ImageFlagBits::Sparse; } - for (const ImageId overlap_id : ignore_textures) { + for (const ImageId overlap_id : join_ignore_textures) { Image& overlap = slot_images[overlap_id]; if (True(overlap.flags & ImageFlagBits::GpuModified)) { UNIMPLEMENTED(); @@ -1391,14 +1392,60 @@ ImageId TextureCache

::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA ScaleDown(new_image); } - std::ranges::sort(overlap_ids, [this](const ImageId lhs, const ImageId rhs) { - const ImageBase& lhs_image = slot_images[lhs]; - const ImageBase& rhs_image = slot_images[rhs]; + std::ranges::sort(join_copies_to_do, [this](const JoinCopy& lhs, const JoinCopy& rhs) { + const ImageBase& lhs_image = slot_images[lhs.id]; + const ImageBase& rhs_image = slot_images[rhs.id]; return lhs_image.modification_tick < rhs_image.modification_tick; }); - for (const ImageId overlap_id : overlap_ids) { - Image& overlap = slot_images[overlap_id]; + ImageBase& new_image_base = new_image; + for (const ImageId aliased_id : join_right_aliased_ids) { + ImageBase& aliased = slot_images[aliased_id]; + size_t alias_index = new_image_base.aliased_images.size(); + if (!AddImageAlias(new_image_base, aliased, new_image_id, aliased_id)) { + continue; + } + join_alias_indices.emplace(aliased_id, alias_index); + new_image.flags |= ImageFlagBits::Alias; + } + for (const ImageId aliased_id : join_left_aliased_ids) { + ImageBase& aliased = slot_images[aliased_id]; + size_t alias_index = new_image_base.aliased_images.size(); + if (!AddImageAlias(aliased, new_image_base, aliased_id, new_image_id)) { + continue; + } + join_alias_indices.emplace(aliased_id, alias_index); + new_image.flags |= ImageFlagBits::Alias; + } + for (const ImageId aliased_id : join_bad_overlap_ids) { + ImageBase& aliased = slot_images[aliased_id]; + aliased.overlapping_images.push_back(new_image_id); + new_image.overlapping_images.push_back(aliased_id); + if (aliased.info.resources.levels == 1 && aliased.info.block.depth == 0 && + aliased.overlapping_images.size() > 1) { + aliased.flags |= ImageFlagBits::BadOverlap; + } + if (new_image.info.resources.levels == 1 && new_image.info.block.depth == 0 && + new_image.overlapping_images.size() > 1) { + new_image.flags |= ImageFlagBits::BadOverlap; + } + } + + for (const auto& copy_object : join_copies_to_do) { + Image& overlap = slot_images[copy_object.id]; + if (copy_object.is_alias) { + if (!overlap.IsSafeDownload()) { + continue; + } + const auto alias_pointer = join_alias_indices.find(copy_object.id); + if (alias_pointer == join_alias_indices.end()) { + continue; + } + const AliasedImage& aliased = new_image.aliased_images[alias_pointer->second]; + CopyImage(new_image_id, aliased.id, aliased.copies); + new_image.modification_tick = overlap.modification_tick; + continue; + } if (True(overlap.flags & ImageFlagBits::GpuModified)) { new_image.flags |= ImageFlagBits::GpuModified; const auto& resolution = Settings::values.resolution_info; @@ -1411,35 +1458,15 @@ ImageId TextureCache

::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA } else { runtime.CopyImage(new_image, overlap, std::move(copies)); } + new_image.modification_tick = overlap.modification_tick; } if (True(overlap.flags & ImageFlagBits::Tracked)) { - UntrackImage(overlap, overlap_id); - } - UnregisterImage(overlap_id); - DeleteImage(overlap_id); - } - ImageBase& new_image_base = new_image; - for (const ImageId aliased_id : right_aliased_ids) { - ImageBase& aliased = slot_images[aliased_id]; - AddImageAlias(new_image_base, aliased, new_image_id, aliased_id); - new_image.flags |= ImageFlagBits::Alias; - } - for (const ImageId aliased_id : left_aliased_ids) { - ImageBase& aliased = slot_images[aliased_id]; - AddImageAlias(aliased, new_image_base, aliased_id, new_image_id); - new_image.flags |= ImageFlagBits::Alias; - } - for (const ImageId aliased_id : bad_overlap_ids) { - ImageBase& aliased = slot_images[aliased_id]; - aliased.overlapping_images.push_back(new_image_id); - new_image.overlapping_images.push_back(aliased_id); - if (aliased.info.resources.levels == 1 && aliased.overlapping_images.size() > 1) { - aliased.flags |= ImageFlagBits::BadOverlap; - } - if (new_image.info.resources.levels == 1 && new_image.overlapping_images.size() > 1) { - new_image.flags |= ImageFlagBits::BadOverlap; + UntrackImage(overlap, copy_object.id); } + UnregisterImage(copy_object.id); + DeleteImage(copy_object.id); } + RegisterImage(new_image_id); return new_image_id; } diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index 0720494e5..9e5289977 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h @@ -10,7 +10,9 @@ #include #include #include +#include #include +#include #include #include "common/common_types.h" @@ -474,6 +476,20 @@ private: Common::ThreadWorker texture_decode_worker{1, "TextureDecoder"}; std::vector> async_decodes; + + // Join caching + boost::container::small_vector join_overlap_ids; + std::unordered_set join_overlaps_found; + boost::container::small_vector join_left_aliased_ids; + boost::container::small_vector join_right_aliased_ids; + std::unordered_set join_ignore_textures; + boost::container::small_vector join_bad_overlap_ids; + struct JoinCopy { + bool is_alias; + ImageId id; + }; + boost::container::small_vector join_copies_to_do; + std::unordered_map join_alias_indices; }; } // namespace VideoCommon From 01c4568786631515ea13ec8cf991d534272e87b7 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Wed, 24 May 2023 09:55:47 +0200 Subject: [PATCH 0414/1181] Texture Cache Util: Fix block depth adjustment on slices. --- src/video_core/texture_cache/util.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cpp index 1463f157b..95a5b47d8 100644 --- a/src/video_core/texture_cache/util.cpp +++ b/src/video_core/texture_cache/util.cpp @@ -123,7 +123,9 @@ template return { .width = AdjustMipBlockSize(num_tiles.width, block_size.width, level), .height = AdjustMipBlockSize(num_tiles.height, block_size.height, level), - .depth = AdjustMipBlockSize(num_tiles.depth, block_size.depth, level), + .depth = level == 0 + ? block_size.depth + : AdjustMipBlockSize(num_tiles.depth, block_size.depth, level), }; } @@ -165,6 +167,13 @@ template } [[nodiscard]] constexpr Extent3D TileShift(const LevelInfo& info, u32 level) { + if (level == 0) { + return Extent3D{ + .width = info.block.width, + .height = info.block.height, + .depth = info.block.depth, + }; + } const Extent3D blocks = NumLevelBlocks(info, level); return Extent3D{ .width = AdjustTileSize(info.block.width, GOB_SIZE_X, blocks.width), @@ -1288,7 +1297,9 @@ u32 MapSizeBytes(const ImageBase& image) { static_assert(CalculateLevelSize(LevelInfo{{1920, 1080, 1}, {0, 2, 0}, {1, 1}, 2, 0}, 0) == 0x7f8000); -static_assert(CalculateLevelSize(LevelInfo{{32, 32, 1}, {0, 0, 4}, {1, 1}, 4, 0}, 0) == 0x4000); +static_assert(CalculateLevelSize(LevelInfo{{32, 32, 1}, {0, 0, 4}, {1, 1}, 4, 0}, 0) == 0x40000); + +static_assert(CalculateLevelSize(LevelInfo{{128, 8, 1}, {0, 4, 0}, {1, 1}, 4, 0}, 0) == 0x40000); static_assert(CalculateLevelOffset(PixelFormat::R8_SINT, {1920, 1080, 1}, {0, 2, 0}, 0, 7) == 0x2afc00); From be3a7f4096a5e8554ca81ef5176a6a32d28d609e Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Wed, 24 May 2023 10:52:02 +0200 Subject: [PATCH 0415/1181] Texture cache: revert wrong acceleration assumption --- src/video_core/texture_cache/texture_cache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 9790949f5..31d754550 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1507,7 +1507,7 @@ std::optional::BlitImages> TextureCache

::GetBlitImag if (!copy.must_accelerate) { do { if (!src_id && !dst_id) { - break; + return std::nullopt; } if (src_id && True(slot_images[src_id].flags & ImageFlagBits::GpuModified)) { break; From d33bdc97d070788af8f6ae979fd48383f90b6a52 Mon Sep 17 00:00:00 2001 From: Ariel Cabello <080ariel@gmail.com> Date: Thu, 25 May 2023 16:05:22 +0200 Subject: [PATCH 0416/1181] Add short "-u" option for yuzu_cmd. The -u short option was documented but not implemented in yuzu_cmd. The same long option --user worked before. --- src/yuzu_cmd/yuzu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 5f39ece32..ca5ce0f53 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -227,7 +227,7 @@ int main(int argc, char** argv) { }; while (optind < argc) { - int arg = getopt_long(argc, argv, "g:fhvp::c:", long_options, &option_index); + int arg = getopt_long(argc, argv, "g:fhvp::c:u:", long_options, &option_index); if (arg != -1) { switch (static_cast(arg)) { case 'c': From 904dc1a5676998225de9a2c0979c026006843ad5 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 25 May 2023 12:03:12 -0400 Subject: [PATCH 0417/1181] video_core: don't garbage collect during configuration --- src/video_core/texture_cache/texture_cache.h | 5 ----- src/video_core/texture_cache/texture_cache_base.h | 1 - 2 files changed, 6 deletions(-) diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 31d754550..fe13cac93 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -139,7 +139,6 @@ void TextureCache

::TickFrame() { TickAsyncDecode(); runtime.TickFrame(); - critical_gc = 0; ++frame_tick; if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { @@ -1885,10 +1884,6 @@ void TextureCache

::RegisterImage(ImageId image_id) { tentative_size = EstimatedDecompressedSize(tentative_size, image.info.format); } total_used_memory += Common::AlignUp(tentative_size, 1024); - if (total_used_memory > critical_memory && critical_gc < GC_EMERGENCY_COUNTS) { - RunGarbageCollector(); - critical_gc++; - } image.lru_index = lru_cache.Insert(image_id, frame_tick); ForEachGPUPage(image.gpu_addr, image.guest_size_bytes, [this, image_id](u64 page) { diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index 1a3308e2d..cc27286f7 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h @@ -427,7 +427,6 @@ private: u64 minimum_memory; u64 expected_memory; u64 critical_memory; - size_t critical_gc; struct BufferDownload { GPUVAddr address; From 7d5df4f0ba62acf1089c15bf30eacb385934f2ab Mon Sep 17 00:00:00 2001 From: Ariel Cabello <080ariel@gmail.com> Date: Thu, 25 May 2023 20:07:52 +0200 Subject: [PATCH 0418/1181] Don't exit when using "-u" option in yuzu-cmd --- src/yuzu_cmd/yuzu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index ca5ce0f53..7b6d49c63 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -283,7 +283,7 @@ int main(int argc, char** argv) { break; case 'u': selected_user = atoi(optarg); - return 0; + break; case 'v': PrintVersion(); return 0; From 13d25063a1cf2173636ea6af4589b4f19565f77f Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 26 May 2023 00:29:43 -0400 Subject: [PATCH 0419/1181] shader_recompiler: fix copy-paste error --- .../frontend/maxwell/translate/impl/integer_funnel_shift.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/integer_funnel_shift.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/integer_funnel_shift.cpp index 442365a26..c2a0ee6f1 100644 --- a/src/shader_recompiler/frontend/maxwell/translate/impl/integer_funnel_shift.cpp +++ b/src/shader_recompiler/frontend/maxwell/translate/impl/integer_funnel_shift.cpp @@ -30,7 +30,7 @@ void SHF(TranslatorVisitor& v, u64 insn, const IR::U32& shift, const IR::U32& hi union { u64 insn; BitField<0, 8, IR::Reg> dest_reg; - BitField<0, 8, IR::Reg> lo_bits_reg; + BitField<8, 8, IR::Reg> lo_bits_reg; BitField<37, 2, MaxShift> max_shift; BitField<47, 1, u64> cc; BitField<48, 2, u64> x_mode; From 7ce181edcf1af2efe8d3b4a162cffb4ba6ff5bc9 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Mon, 24 Apr 2023 14:07:32 +0100 Subject: [PATCH 0420/1181] Fix buffer overlap checking skipping a page for stream score right expand --- src/video_core/buffer_cache/buffer_cache.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 65494097b..88d3b2515 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -1262,7 +1262,7 @@ typename BufferCache

::OverlapResult BufferCache

::ResolveOverlaps(VAddr cpu const VAddr overlap_cpu_addr = overlap.CpuAddr(); const bool expands_left = overlap_cpu_addr < begin; if (expands_left) { - cpu_addr = begin = overlap_cpu_addr; + begin = overlap_cpu_addr; } const VAddr overlap_end = overlap_cpu_addr + overlap.SizeBytes(); const bool expands_right = overlap_end > end; @@ -1276,7 +1276,7 @@ typename BufferCache

::OverlapResult BufferCache

::ResolveOverlaps(VAddr cpu has_stream_leap = true; if (expands_right) { begin -= CACHING_PAGESIZE * 256; - cpu_addr = begin; + cpu_addr = begin - CACHING_PAGESIZE; } if (expands_left) { end += CACHING_PAGESIZE * 256; @@ -1299,7 +1299,7 @@ void BufferCache

::JoinOverlap(BufferId new_buffer_id, BufferId overlap_id, if (accumulate_stream_score) { new_buffer.IncreaseStreamScore(overlap.StreamScore() + 1); } - boost::container::small_vector copies; + boost::container::small_vector copies; const size_t dst_base_offset = overlap.CpuAddr() - new_buffer.CpuAddr(); copies.push_back(BufferCopy{ .src_offset = 0, From 0596a4afb1b3b835f3cf9912551e4fbf74c2b70b Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 26 May 2023 15:41:17 -0400 Subject: [PATCH 0421/1181] vfs_concat: fix time complexity of read --- src/core/core.cpp | 3 +- src/core/file_sys/romfs.cpp | 3 +- src/core/file_sys/vfs_concat.cpp | 169 +++++++++++++++++++------------ src/core/file_sys/vfs_concat.h | 28 +++-- 4 files changed, 129 insertions(+), 74 deletions(-) diff --git a/src/core/core.cpp b/src/core/core.cpp index b5f62690e..4406ae30e 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -117,8 +117,7 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs, return nullptr; } - return FileSys::ConcatenatedVfsFile::MakeConcatenatedFile(std::move(concat), - dir->GetName()); + return FileSys::ConcatenatedVfsFile::MakeConcatenatedFile(concat, dir->GetName()); } if (Common::FS::IsDir(path)) { diff --git a/src/core/file_sys/romfs.cpp b/src/core/file_sys/romfs.cpp index ddcfe5980..fb5683a6b 100644 --- a/src/core/file_sys/romfs.cpp +++ b/src/core/file_sys/romfs.cpp @@ -140,7 +140,8 @@ VirtualFile CreateRomFS(VirtualDir dir, VirtualDir ext) { return nullptr; RomFSBuildContext ctx{dir, ext}; - return ConcatenatedVfsFile::MakeConcatenatedFile(0, ctx.Build(), dir->GetName()); + auto file_map = ctx.Build(); + return ConcatenatedVfsFile::MakeConcatenatedFile(0, file_map, dir->GetName()); } } // namespace FileSys diff --git a/src/core/file_sys/vfs_concat.cpp b/src/core/file_sys/vfs_concat.cpp index d23623aa0..853b893a1 100644 --- a/src/core/file_sys/vfs_concat.cpp +++ b/src/core/file_sys/vfs_concat.cpp @@ -10,84 +10,105 @@ namespace FileSys { -static bool VerifyConcatenationMapContinuity(const std::multimap& map) { - const auto last_valid = --map.end(); - for (auto iter = map.begin(); iter != last_valid;) { - const auto old = iter++; - if (old->first + old->second->GetSize() != iter->first) { +ConcatenatedVfsFile::ConcatenatedVfsFile(ConcatenationMap&& concatenation_map_, std::string&& name_) + : concatenation_map(std::move(concatenation_map_)), name(std::move(name_)) { + DEBUG_ASSERT(this->VerifyContinuity()); +} + +bool ConcatenatedVfsFile::VerifyContinuity() const { + u64 last_offset = 0; + for (auto& entry : concatenation_map) { + if (entry.offset != last_offset) { return false; } + + last_offset = entry.offset + entry.file->GetSize(); } - return map.begin()->first == 0; -} - -ConcatenatedVfsFile::ConcatenatedVfsFile(std::vector files_, std::string name_) - : name(std::move(name_)) { - std::size_t next_offset = 0; - for (const auto& file : files_) { - files.emplace(next_offset, file); - next_offset += file->GetSize(); - } -} - -ConcatenatedVfsFile::ConcatenatedVfsFile(std::multimap files_, std::string name_) - : files(std::move(files_)), name(std::move(name_)) { - ASSERT(VerifyConcatenationMapContinuity(files)); + return true; } ConcatenatedVfsFile::~ConcatenatedVfsFile() = default; -VirtualFile ConcatenatedVfsFile::MakeConcatenatedFile(std::vector files, - std::string name) { - if (files.empty()) +VirtualFile ConcatenatedVfsFile::MakeConcatenatedFile(const std::vector& files, + std::string&& name) { + // Fold trivial cases. + if (files.empty()) { return nullptr; - if (files.size() == 1) - return files[0]; + } + if (files.size() == 1) { + return files.front(); + } - return VirtualFile(new ConcatenatedVfsFile(std::move(files), std::move(name))); + // Make the concatenation map from the input. + std::vector concatenation_map; + concatenation_map.reserve(files.size()); + u64 last_offset = 0; + + for (auto& file : files) { + concatenation_map.emplace_back(ConcatenationEntry{ + .offset = last_offset, + .file = file, + }); + + last_offset += file->GetSize(); + } + + return VirtualFile(new ConcatenatedVfsFile(std::move(concatenation_map), std::move(name))); } VirtualFile ConcatenatedVfsFile::MakeConcatenatedFile(u8 filler_byte, - std::multimap files, - std::string name) { - if (files.empty()) + const std::multimap& files, + std::string&& name) { + // Fold trivial cases. + if (files.empty()) { return nullptr; - if (files.size() == 1) + } + if (files.size() == 1) { return files.begin()->second; - - const auto last_valid = --files.end(); - for (auto iter = files.begin(); iter != last_valid;) { - const auto old = iter++; - if (old->first + old->second->GetSize() != iter->first) { - files.emplace(old->first + old->second->GetSize(), - std::make_shared(filler_byte, iter->first - old->first - - old->second->GetSize())); - } } - // Ensure the map starts at offset 0 (start of file), otherwise pad to fill. - if (files.begin()->first != 0) - files.emplace(0, std::make_shared(filler_byte, files.begin()->first)); + // Make the concatenation map from the input. + std::vector concatenation_map; - return VirtualFile(new ConcatenatedVfsFile(std::move(files), std::move(name))); + concatenation_map.reserve(files.size()); + u64 last_offset = 0; + + // Iteration of a multimap is ordered, so offset will be strictly non-decreasing. + for (auto& [offset, file] : files) { + if (offset > last_offset) { + concatenation_map.emplace_back(ConcatenationEntry{ + .offset = last_offset, + .file = std::make_shared(filler_byte, offset - last_offset), + }); + } + + concatenation_map.emplace_back(ConcatenationEntry{ + .offset = offset, + .file = file, + }); + + last_offset = offset + file->GetSize(); + } + + return VirtualFile(new ConcatenatedVfsFile(std::move(concatenation_map), std::move(name))); } std::string ConcatenatedVfsFile::GetName() const { - if (files.empty()) { + if (concatenation_map.empty()) { return ""; } if (!name.empty()) { return name; } - return files.begin()->second->GetName(); + return concatenation_map.front().file->GetName(); } std::size_t ConcatenatedVfsFile::GetSize() const { - if (files.empty()) { + if (concatenation_map.empty()) { return 0; } - return files.rbegin()->first + files.rbegin()->second->GetSize(); + return concatenation_map.back().offset + concatenation_map.back().file->GetSize(); } bool ConcatenatedVfsFile::Resize(std::size_t new_size) { @@ -95,10 +116,10 @@ bool ConcatenatedVfsFile::Resize(std::size_t new_size) { } VirtualDir ConcatenatedVfsFile::GetContainingDirectory() const { - if (files.empty()) { + if (concatenation_map.empty()) { return nullptr; } - return files.begin()->second->GetContainingDirectory(); + return concatenation_map.front().file->GetContainingDirectory(); } bool ConcatenatedVfsFile::IsWritable() const { @@ -110,25 +131,45 @@ bool ConcatenatedVfsFile::IsReadable() const { } std::size_t ConcatenatedVfsFile::Read(u8* data, std::size_t length, std::size_t offset) const { - auto entry = --files.end(); - for (auto iter = files.begin(); iter != files.end(); ++iter) { - if (iter->first > offset) { - entry = --iter; + const ConcatenationEntry key{ + .offset = offset, + .file = nullptr, + }; + + // Read nothing if the map is empty. + if (concatenation_map.empty()) { + return 0; + } + + // Binary search to find the iterator to the first position we can check. + // It must exist, since we are not empty and are comparing unsigned integers. + auto it = std::prev(std::upper_bound(concatenation_map.begin(), concatenation_map.end(), key)); + u64 cur_length = length; + u64 cur_offset = offset; + + while (cur_length > 0 && it != concatenation_map.end()) { + // Check if we can read the file at this position. + const auto& file = it->file; + const u64 file_offset = it->offset; + const u64 file_size = file->GetSize(); + + if (cur_offset >= file_offset + file_size) { + // Entirely out of bounds read. break; } + + // Read the file at this position. + const u64 intended_read_size = std::min(cur_length, file_size); + const u64 actual_read_size = + file->Read(data + (cur_offset - offset), intended_read_size, cur_offset - file_offset); + + // Update tracking. + cur_offset += actual_read_size; + cur_length -= actual_read_size; + it++; } - if (entry->first + entry->second->GetSize() <= offset) - return 0; - - const auto read_in = - std::min(entry->first + entry->second->GetSize() - offset, entry->second->GetSize()); - if (length > read_in) { - return entry->second->Read(data, read_in, offset - entry->first) + - Read(data + read_in, length - read_in, offset + read_in); - } - - return entry->second->Read(data, std::min(read_in, length), offset - entry->first); + return cur_offset - offset; } std::size_t ConcatenatedVfsFile::Write(const u8* data, std::size_t length, std::size_t offset) { diff --git a/src/core/file_sys/vfs_concat.h b/src/core/file_sys/vfs_concat.h index 9be0261b6..6b329d545 100644 --- a/src/core/file_sys/vfs_concat.h +++ b/src/core/file_sys/vfs_concat.h @@ -3,6 +3,7 @@ #pragma once +#include #include #include #include "core/file_sys/vfs.h" @@ -12,19 +13,33 @@ namespace FileSys { // Class that wraps multiple vfs files and concatenates them, making reads seamless. Currently // read-only. class ConcatenatedVfsFile : public VfsFile { - explicit ConcatenatedVfsFile(std::vector files, std::string name_); - explicit ConcatenatedVfsFile(std::multimap files, std::string name_); +private: + struct ConcatenationEntry { + u64 offset; + VirtualFile file; + + auto operator<=>(const ConcatenationEntry& other) const { + return this->offset <=> other.offset; + } + }; + using ConcatenationMap = std::vector; + + explicit ConcatenatedVfsFile(std::vector&& concatenation_map, + std::string&& name); + bool VerifyContinuity() const; public: ~ConcatenatedVfsFile() override; /// Wrapper function to allow for more efficient handling of files.size() == 0, 1 cases. - static VirtualFile MakeConcatenatedFile(std::vector files, std::string name); + static VirtualFile MakeConcatenatedFile(const std::vector& files, + std::string&& name); /// Convenience function that turns a map of offsets to files into a concatenated file, filling /// gaps with a given filler byte. - static VirtualFile MakeConcatenatedFile(u8 filler_byte, std::multimap files, - std::string name); + static VirtualFile MakeConcatenatedFile(u8 filler_byte, + const std::multimap& files, + std::string&& name); std::string GetName() const override; std::size_t GetSize() const override; @@ -37,8 +52,7 @@ public: bool Rename(std::string_view new_name) override; private: - // Maps starting offset to file -- more efficient. - std::multimap files; + ConcatenationMap concatenation_map; std::string name; }; From fcd48eb239df4be823bd37b3cf373b87263e5810 Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 26 May 2023 23:21:18 -0400 Subject: [PATCH 0422/1181] qt: add menu item to remove cache storage --- src/yuzu/game_list.cpp | 4 ++++ src/yuzu/game_list.h | 1 + src/yuzu/main.cpp | 20 ++++++++++++++++++++ src/yuzu/main.h | 1 + 4 files changed, 26 insertions(+) diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp index c21828b1d..465084fea 100644 --- a/src/yuzu/game_list.cpp +++ b/src/yuzu/game_list.cpp @@ -544,6 +544,7 @@ void GameList::AddGamePopup(QMenu& context_menu, u64 program_id, const std::stri QAction* remove_update = remove_menu->addAction(tr("Remove Installed Update")); QAction* remove_dlc = remove_menu->addAction(tr("Remove All Installed DLC")); QAction* remove_custom_config = remove_menu->addAction(tr("Remove Custom Configuration")); + QAction* remove_cache_storage = remove_menu->addAction(tr("Remove Cache Storage")); QAction* remove_gl_shader_cache = remove_menu->addAction(tr("Remove OpenGL Pipeline Cache")); QAction* remove_vk_shader_cache = remove_menu->addAction(tr("Remove Vulkan Pipeline Cache")); remove_menu->addSeparator(); @@ -614,6 +615,9 @@ void GameList::AddGamePopup(QMenu& context_menu, u64 program_id, const std::stri connect(remove_custom_config, &QAction::triggered, [this, program_id, path]() { emit RemoveFileRequested(program_id, GameListRemoveTarget::CustomConfiguration, path); }); + connect(remove_cache_storage, &QAction::triggered, [this, program_id, path] { + emit RemoveFileRequested(program_id, GameListRemoveTarget::CacheStorage, path); + }); connect(dump_romfs, &QAction::triggered, [this, program_id, path]() { emit DumpRomFSRequested(program_id, path, DumpRomFSTarget::Normal); }); diff --git a/src/yuzu/game_list.h b/src/yuzu/game_list.h index 64e5af4c1..6c2f75e53 100644 --- a/src/yuzu/game_list.h +++ b/src/yuzu/game_list.h @@ -45,6 +45,7 @@ enum class GameListRemoveTarget { VkShaderCache, AllShaderCache, CustomConfiguration, + CacheStorage, }; enum class DumpRomFSTarget { diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 4489f43af..25cfef6d5 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -2323,6 +2323,8 @@ void GMainWindow::OnGameListRemoveFile(u64 program_id, GameListRemoveTarget targ return tr("Delete All Transferable Shader Caches?"); case GameListRemoveTarget::CustomConfiguration: return tr("Remove Custom Game Configuration?"); + case GameListRemoveTarget::CacheStorage: + return tr("Remove Cache Storage?"); default: return QString{}; } @@ -2346,6 +2348,9 @@ void GMainWindow::OnGameListRemoveFile(u64 program_id, GameListRemoveTarget targ case GameListRemoveTarget::CustomConfiguration: RemoveCustomConfiguration(program_id, game_path); break; + case GameListRemoveTarget::CacheStorage: + RemoveCacheStorage(program_id); + break; } } @@ -2435,6 +2440,21 @@ void GMainWindow::RemoveCustomConfiguration(u64 program_id, const std::string& g } } +void GMainWindow::RemoveCacheStorage(u64 program_id) { + const auto nand_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir); + auto vfs_nand_dir = + vfs->OpenDirectory(Common::FS::PathToUTF8String(nand_dir), FileSys::Mode::Read); + + const auto cache_storage_path = FileSys::SaveDataFactory::GetFullPath( + *system, vfs_nand_dir, FileSys::SaveDataSpaceId::NandUser, + FileSys::SaveDataType::CacheStorage, 0 /* program_id */, {}, 0); + + const auto path = Common::FS::ConcatPathSafe(nand_dir, cache_storage_path); + + // Not an error if it wasn't cleared. + Common::FS::RemoveDirRecursively(path); +} + void GMainWindow::OnGameListDumpRomFS(u64 program_id, const std::string& game_path, DumpRomFSTarget target) { const auto failed = [this] { diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 17631a2d9..6bb70972f 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -370,6 +370,7 @@ private: void RemoveVulkanDriverPipelineCache(u64 program_id); void RemoveAllTransferableShaderCaches(u64 program_id); void RemoveCustomConfiguration(u64 program_id, const std::string& game_path); + void RemoveCacheStorage(u64 program_id); std::optional SelectRomFSDumpTarget(const FileSys::ContentProvider&, u64 program_id); InstallResult InstallNSPXCI(const QString& filename); InstallResult InstallNCA(const QString& filename); From b0bea13ed8422119cc4f09763be095cbc3762795 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Sat, 27 May 2023 15:45:36 +0100 Subject: [PATCH 0423/1181] Move buffer bindings to per-channel state --- src/video_core/buffer_cache/buffer_cache.cpp | 4 + src/video_core/buffer_cache/buffer_cache.h | 291 +++++++++--------- .../buffer_cache/buffer_cache_base.h | 141 ++++----- .../renderer_opengl/gl_buffer_cache.cpp | 2 +- 4 files changed, 228 insertions(+), 210 deletions(-) diff --git a/src/video_core/buffer_cache/buffer_cache.cpp b/src/video_core/buffer_cache/buffer_cache.cpp index 40db243d2..4b4f7061b 100644 --- a/src/video_core/buffer_cache/buffer_cache.cpp +++ b/src/video_core/buffer_cache/buffer_cache.cpp @@ -2,6 +2,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "common/microprofile.h" +#include "video_core/buffer_cache/buffer_cache_base.h" +#include "video_core/control/channel_state_cache.inc" namespace VideoCommon { @@ -9,4 +11,6 @@ MICROPROFILE_DEFINE(GPU_PrepareBuffers, "GPU", "Prepare buffers", MP_RGB(224, 12 MICROPROFILE_DEFINE(GPU_BindUploadBuffers, "GPU", "Bind and upload buffers", MP_RGB(224, 128, 128)); MICROPROFILE_DEFINE(GPU_DownloadMemory, "GPU", "Download buffers", MP_RGB(224, 128, 128)); +template class VideoCommon::ChannelSetupCaches; + } // namespace VideoCommon diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 65494097b..c336be707 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -64,17 +64,22 @@ void BufferCache

::RunGarbageCollector() { template void BufferCache

::TickFrame() { // Calculate hits and shots and move hit bits to the right - const u32 hits = std::reduce(uniform_cache_hits.begin(), uniform_cache_hits.end()); - const u32 shots = std::reduce(uniform_cache_shots.begin(), uniform_cache_shots.end()); - std::copy_n(uniform_cache_hits.begin(), uniform_cache_hits.size() - 1, - uniform_cache_hits.begin() + 1); - std::copy_n(uniform_cache_shots.begin(), uniform_cache_shots.size() - 1, - uniform_cache_shots.begin() + 1); - uniform_cache_hits[0] = 0; - uniform_cache_shots[0] = 0; + + const u32 hits = std::reduce(channel_state->uniform_cache_hits.begin(), + channel_state->uniform_cache_hits.end()); + const u32 shots = std::reduce(channel_state->uniform_cache_shots.begin(), + channel_state->uniform_cache_shots.end()); + std::copy_n(channel_state->uniform_cache_hits.begin(), + channel_state->uniform_cache_hits.size() - 1, + channel_state->uniform_cache_hits.begin() + 1); + std::copy_n(channel_state->uniform_cache_shots.begin(), + channel_state->uniform_cache_shots.size() - 1, + channel_state->uniform_cache_shots.begin() + 1); + channel_state->uniform_cache_hits[0] = 0; + channel_state->uniform_cache_shots[0] = 0; const bool skip_preferred = hits * 256 < shots * 251; - uniform_buffer_skip_cache_size = skip_preferred ? DEFAULT_SKIP_CACHE_SIZE : 0; + channel_state->uniform_buffer_skip_cache_size = skip_preferred ? DEFAULT_SKIP_CACHE_SIZE : 0; // If we can obtain the memory info, use it instead of the estimate. if (runtime.CanReportMemoryUsage()) { @@ -164,10 +169,10 @@ bool BufferCache

::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am BufferId buffer_a; BufferId buffer_b; do { - has_deleted_buffers = false; + channel_state->has_deleted_buffers = false; buffer_a = FindBuffer(*cpu_src_address, static_cast(amount)); buffer_b = FindBuffer(*cpu_dest_address, static_cast(amount)); - } while (has_deleted_buffers); + } while (channel_state->has_deleted_buffers); auto& src_buffer = slot_buffers[buffer_a]; auto& dest_buffer = slot_buffers[buffer_b]; SynchronizeBuffer(src_buffer, *cpu_src_address, static_cast(amount)); @@ -272,30 +277,30 @@ void BufferCache

::BindGraphicsUniformBuffer(size_t stage, u32 index, GPUVAddr .size = size, .buffer_id = BufferId{}, }; - uniform_buffers[stage][index] = binding; + channel_state->uniform_buffers[stage][index] = binding; } template void BufferCache

::DisableGraphicsUniformBuffer(size_t stage, u32 index) { - uniform_buffers[stage][index] = NULL_BINDING; + channel_state->uniform_buffers[stage][index] = NULL_BINDING; } template void BufferCache

::UpdateGraphicsBuffers(bool is_indexed) { MICROPROFILE_SCOPE(GPU_PrepareBuffers); do { - has_deleted_buffers = false; + channel_state->has_deleted_buffers = false; DoUpdateGraphicsBuffers(is_indexed); - } while (has_deleted_buffers); + } while (channel_state->has_deleted_buffers); } template void BufferCache

::UpdateComputeBuffers() { MICROPROFILE_SCOPE(GPU_PrepareBuffers); do { - has_deleted_buffers = false; + channel_state->has_deleted_buffers = false; DoUpdateComputeBuffers(); - } while (has_deleted_buffers); + } while (channel_state->has_deleted_buffers); } template @@ -338,98 +343,102 @@ template void BufferCache

::SetUniformBuffersState(const std::array& mask, const UniformBufferSizes* sizes) { if constexpr (HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS) { - if (enabled_uniform_buffer_masks != mask) { + if (channel_state->enabled_uniform_buffer_masks != mask) { if constexpr (IS_OPENGL) { - fast_bound_uniform_buffers.fill(0); + channel_state->fast_bound_uniform_buffers.fill(0); } - dirty_uniform_buffers.fill(~u32{0}); - uniform_buffer_binding_sizes.fill({}); + channel_state->dirty_uniform_buffers.fill(~u32{0}); + channel_state->uniform_buffer_binding_sizes.fill({}); } } - enabled_uniform_buffer_masks = mask; - uniform_buffer_sizes = sizes; + channel_state->enabled_uniform_buffer_masks = mask; + channel_state->uniform_buffer_sizes = sizes; } template void BufferCache

::SetComputeUniformBufferState(u32 mask, const ComputeUniformBufferSizes* sizes) { - enabled_compute_uniform_buffer_mask = mask; - compute_uniform_buffer_sizes = sizes; + channel_state->enabled_compute_uniform_buffer_mask = mask; + channel_state->compute_uniform_buffer_sizes = sizes; } template void BufferCache

::UnbindGraphicsStorageBuffers(size_t stage) { - enabled_storage_buffers[stage] = 0; - written_storage_buffers[stage] = 0; + channel_state->enabled_storage_buffers[stage] = 0; + channel_state->written_storage_buffers[stage] = 0; } template void BufferCache

::BindGraphicsStorageBuffer(size_t stage, size_t ssbo_index, u32 cbuf_index, u32 cbuf_offset, bool is_written) { - enabled_storage_buffers[stage] |= 1U << ssbo_index; - written_storage_buffers[stage] |= (is_written ? 1U : 0U) << ssbo_index; + channel_state->enabled_storage_buffers[stage] |= 1U << ssbo_index; + channel_state->written_storage_buffers[stage] |= (is_written ? 1U : 0U) << ssbo_index; const auto& cbufs = maxwell3d->state.shader_stages[stage]; const GPUVAddr ssbo_addr = cbufs.const_buffers[cbuf_index].address + cbuf_offset; - storage_buffers[stage][ssbo_index] = StorageBufferBinding(ssbo_addr, cbuf_index, is_written); + channel_state->storage_buffers[stage][ssbo_index] = + StorageBufferBinding(ssbo_addr, cbuf_index, is_written); } template void BufferCache

::UnbindGraphicsTextureBuffers(size_t stage) { - enabled_texture_buffers[stage] = 0; - written_texture_buffers[stage] = 0; - image_texture_buffers[stage] = 0; + channel_state->enabled_texture_buffers[stage] = 0; + channel_state->written_texture_buffers[stage] = 0; + channel_state->image_texture_buffers[stage] = 0; } template void BufferCache

::BindGraphicsTextureBuffer(size_t stage, size_t tbo_index, GPUVAddr gpu_addr, u32 size, PixelFormat format, bool is_written, bool is_image) { - enabled_texture_buffers[stage] |= 1U << tbo_index; - written_texture_buffers[stage] |= (is_written ? 1U : 0U) << tbo_index; + channel_state->enabled_texture_buffers[stage] |= 1U << tbo_index; + channel_state->written_texture_buffers[stage] |= (is_written ? 1U : 0U) << tbo_index; if constexpr (SEPARATE_IMAGE_BUFFERS_BINDINGS) { - image_texture_buffers[stage] |= (is_image ? 1U : 0U) << tbo_index; + channel_state->image_texture_buffers[stage] |= (is_image ? 1U : 0U) << tbo_index; } - texture_buffers[stage][tbo_index] = GetTextureBufferBinding(gpu_addr, size, format); + channel_state->texture_buffers[stage][tbo_index] = + GetTextureBufferBinding(gpu_addr, size, format); } template void BufferCache

::UnbindComputeStorageBuffers() { - enabled_compute_storage_buffers = 0; - written_compute_storage_buffers = 0; - image_compute_texture_buffers = 0; + channel_state->enabled_compute_storage_buffers = 0; + channel_state->written_compute_storage_buffers = 0; + channel_state->image_compute_texture_buffers = 0; } template void BufferCache

::BindComputeStorageBuffer(size_t ssbo_index, u32 cbuf_index, u32 cbuf_offset, bool is_written) { - enabled_compute_storage_buffers |= 1U << ssbo_index; - written_compute_storage_buffers |= (is_written ? 1U : 0U) << ssbo_index; + channel_state->enabled_compute_storage_buffers |= 1U << ssbo_index; + channel_state->written_compute_storage_buffers |= (is_written ? 1U : 0U) << ssbo_index; const auto& launch_desc = kepler_compute->launch_description; ASSERT(((launch_desc.const_buffer_enable_mask >> cbuf_index) & 1) != 0); const auto& cbufs = launch_desc.const_buffer_config; const GPUVAddr ssbo_addr = cbufs[cbuf_index].Address() + cbuf_offset; - compute_storage_buffers[ssbo_index] = StorageBufferBinding(ssbo_addr, cbuf_index, is_written); + channel_state->compute_storage_buffers[ssbo_index] = + StorageBufferBinding(ssbo_addr, cbuf_index, is_written); } template void BufferCache

::UnbindComputeTextureBuffers() { - enabled_compute_texture_buffers = 0; - written_compute_texture_buffers = 0; - image_compute_texture_buffers = 0; + channel_state->enabled_compute_texture_buffers = 0; + channel_state->written_compute_texture_buffers = 0; + channel_state->image_compute_texture_buffers = 0; } template void BufferCache

::BindComputeTextureBuffer(size_t tbo_index, GPUVAddr gpu_addr, u32 size, PixelFormat format, bool is_written, bool is_image) { - enabled_compute_texture_buffers |= 1U << tbo_index; - written_compute_texture_buffers |= (is_written ? 1U : 0U) << tbo_index; + channel_state->enabled_compute_texture_buffers |= 1U << tbo_index; + channel_state->written_compute_texture_buffers |= (is_written ? 1U : 0U) << tbo_index; if constexpr (SEPARATE_IMAGE_BUFFERS_BINDINGS) { - image_compute_texture_buffers |= (is_image ? 1U : 0U) << tbo_index; + channel_state->image_compute_texture_buffers |= (is_image ? 1U : 0U) << tbo_index; } - compute_texture_buffers[tbo_index] = GetTextureBufferBinding(gpu_addr, size, format); + channel_state->compute_texture_buffers[tbo_index] = + GetTextureBufferBinding(gpu_addr, size, format); } template @@ -672,10 +681,10 @@ bool BufferCache

::IsRegionCpuModified(VAddr addr, size_t size) { template void BufferCache

::BindHostIndexBuffer() { - Buffer& buffer = slot_buffers[index_buffer.buffer_id]; - TouchBuffer(buffer, index_buffer.buffer_id); - const u32 offset = buffer.Offset(index_buffer.cpu_addr); - const u32 size = index_buffer.size; + Buffer& buffer = slot_buffers[channel_state->index_buffer.buffer_id]; + TouchBuffer(buffer, channel_state->index_buffer.buffer_id); + const u32 offset = buffer.Offset(channel_state->index_buffer.cpu_addr); + const u32 size = channel_state->index_buffer.size; const auto& draw_state = maxwell3d->draw_manager->GetDrawState(); if (!draw_state.inline_index_draw_indexes.empty()) [[unlikely]] { if constexpr (USE_MEMORY_MAPS) { @@ -689,7 +698,7 @@ void BufferCache

::BindHostIndexBuffer() { buffer.ImmediateUpload(0, draw_state.inline_index_draw_indexes); } } else { - SynchronizeBuffer(buffer, index_buffer.cpu_addr, size); + SynchronizeBuffer(buffer, channel_state->index_buffer.cpu_addr, size); } if constexpr (HAS_FULL_INDEX_AND_PRIMITIVE_SUPPORT) { const u32 new_offset = @@ -706,7 +715,7 @@ template void BufferCache

::BindHostVertexBuffers() { auto& flags = maxwell3d->dirty.flags; for (u32 index = 0; index < NUM_VERTEX_BUFFERS; ++index) { - const Binding& binding = vertex_buffers[index]; + const Binding& binding = channel_state->vertex_buffers[index]; Buffer& buffer = slot_buffers[binding.buffer_id]; TouchBuffer(buffer, binding.buffer_id); SynchronizeBuffer(buffer, binding.cpu_addr, binding.size); @@ -729,19 +738,19 @@ void BufferCache

::BindHostDrawIndirectBuffers() { SynchronizeBuffer(buffer, binding.cpu_addr, binding.size); }; if (current_draw_indirect->include_count) { - bind_buffer(count_buffer_binding); + bind_buffer(channel_state->count_buffer_binding); } - bind_buffer(indirect_buffer_binding); + bind_buffer(channel_state->indirect_buffer_binding); } template void BufferCache

::BindHostGraphicsUniformBuffers(size_t stage) { u32 dirty = ~0U; if constexpr (HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS) { - dirty = std::exchange(dirty_uniform_buffers[stage], 0); + dirty = std::exchange(channel_state->dirty_uniform_buffers[stage], 0); } u32 binding_index = 0; - ForEachEnabledBit(enabled_uniform_buffer_masks[stage], [&](u32 index) { + ForEachEnabledBit(channel_state->enabled_uniform_buffer_masks[stage], [&](u32 index) { const bool needs_bind = ((dirty >> index) & 1) != 0; BindHostGraphicsUniformBuffer(stage, index, binding_index, needs_bind); if constexpr (NEEDS_BIND_UNIFORM_INDEX) { @@ -753,13 +762,13 @@ void BufferCache

::BindHostGraphicsUniformBuffers(size_t stage) { template void BufferCache

::BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32 binding_index, bool needs_bind) { - const Binding& binding = uniform_buffers[stage][index]; + const Binding& binding = channel_state->uniform_buffers[stage][index]; const VAddr cpu_addr = binding.cpu_addr; - const u32 size = std::min(binding.size, (*uniform_buffer_sizes)[stage][index]); + const u32 size = std::min(binding.size, (*channel_state->uniform_buffer_sizes)[stage][index]); Buffer& buffer = slot_buffers[binding.buffer_id]; TouchBuffer(buffer, binding.buffer_id); const bool use_fast_buffer = binding.buffer_id != NULL_BUFFER_ID && - size <= uniform_buffer_skip_cache_size && + size <= channel_state->uniform_buffer_skip_cache_size && !memory_tracker.IsRegionGpuModified(cpu_addr, size); if (use_fast_buffer) { if constexpr (IS_OPENGL) { @@ -767,11 +776,11 @@ void BufferCache

::BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32 // Fast path for Nvidia const bool should_fast_bind = !HasFastUniformBufferBound(stage, binding_index) || - uniform_buffer_binding_sizes[stage][binding_index] != size; + channel_state->uniform_buffer_binding_sizes[stage][binding_index] != size; if (should_fast_bind) { // We only have to bind when the currently bound buffer is not the fast version - fast_bound_uniform_buffers[stage] |= 1U << binding_index; - uniform_buffer_binding_sizes[stage][binding_index] = size; + channel_state->fast_bound_uniform_buffers[stage] |= 1U << binding_index; + channel_state->uniform_buffer_binding_sizes[stage][binding_index] = size; runtime.BindFastUniformBuffer(stage, binding_index, size); } const auto span = ImmediateBufferWithData(cpu_addr, size); @@ -780,8 +789,8 @@ void BufferCache

::BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32 } } if constexpr (IS_OPENGL) { - fast_bound_uniform_buffers[stage] |= 1U << binding_index; - uniform_buffer_binding_sizes[stage][binding_index] = size; + channel_state->fast_bound_uniform_buffers[stage] |= 1U << binding_index; + channel_state->uniform_buffer_binding_sizes[stage][binding_index] = size; } // Stream buffer path to avoid stalling on non-Nvidia drivers or Vulkan const std::span span = runtime.BindMappedUniformBuffer(stage, binding_index, size); @@ -791,15 +800,15 @@ void BufferCache

::BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32 // Classic cached path const bool sync_cached = SynchronizeBuffer(buffer, cpu_addr, size); if (sync_cached) { - ++uniform_cache_hits[0]; + ++channel_state->uniform_cache_hits[0]; } - ++uniform_cache_shots[0]; + ++channel_state->uniform_cache_shots[0]; // Skip binding if it's not needed and if the bound buffer is not the fast version // This exists to avoid instances where the fast buffer is bound and a GPU write happens needs_bind |= HasFastUniformBufferBound(stage, binding_index); if constexpr (HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS) { - needs_bind |= uniform_buffer_binding_sizes[stage][binding_index] != size; + needs_bind |= channel_state->uniform_buffer_binding_sizes[stage][binding_index] != size; } if (!needs_bind) { return; @@ -807,14 +816,14 @@ void BufferCache

::BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32 const u32 offset = buffer.Offset(cpu_addr); if constexpr (IS_OPENGL) { // Fast buffer will be unbound - fast_bound_uniform_buffers[stage] &= ~(1U << binding_index); + channel_state->fast_bound_uniform_buffers[stage] &= ~(1U << binding_index); // Mark the index as dirty if offset doesn't match const bool is_copy_bind = offset != 0 && !runtime.SupportsNonZeroUniformOffset(); - dirty_uniform_buffers[stage] |= (is_copy_bind ? 1U : 0U) << index; + channel_state->dirty_uniform_buffers[stage] |= (is_copy_bind ? 1U : 0U) << index; } if constexpr (HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS) { - uniform_buffer_binding_sizes[stage][binding_index] = size; + channel_state->uniform_buffer_binding_sizes[stage][binding_index] = size; } if constexpr (NEEDS_BIND_UNIFORM_INDEX) { runtime.BindUniformBuffer(stage, binding_index, buffer, offset, size); @@ -826,15 +835,15 @@ void BufferCache

::BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32 template void BufferCache

::BindHostGraphicsStorageBuffers(size_t stage) { u32 binding_index = 0; - ForEachEnabledBit(enabled_storage_buffers[stage], [&](u32 index) { - const Binding& binding = storage_buffers[stage][index]; + ForEachEnabledBit(channel_state->enabled_storage_buffers[stage], [&](u32 index) { + const Binding& binding = channel_state->storage_buffers[stage][index]; Buffer& buffer = slot_buffers[binding.buffer_id]; TouchBuffer(buffer, binding.buffer_id); const u32 size = binding.size; SynchronizeBuffer(buffer, binding.cpu_addr, size); const u32 offset = buffer.Offset(binding.cpu_addr); - const bool is_written = ((written_storage_buffers[stage] >> index) & 1) != 0; + const bool is_written = ((channel_state->written_storage_buffers[stage] >> index) & 1) != 0; if constexpr (NEEDS_BIND_STORAGE_INDEX) { runtime.BindStorageBuffer(stage, binding_index, buffer, offset, size, is_written); ++binding_index; @@ -846,8 +855,8 @@ void BufferCache

::BindHostGraphicsStorageBuffers(size_t stage) { template void BufferCache

::BindHostGraphicsTextureBuffers(size_t stage) { - ForEachEnabledBit(enabled_texture_buffers[stage], [&](u32 index) { - const TextureBufferBinding& binding = texture_buffers[stage][index]; + ForEachEnabledBit(channel_state->enabled_texture_buffers[stage], [&](u32 index) { + const TextureBufferBinding& binding = channel_state->texture_buffers[stage][index]; Buffer& buffer = slot_buffers[binding.buffer_id]; const u32 size = binding.size; SynchronizeBuffer(buffer, binding.cpu_addr, size); @@ -855,7 +864,7 @@ void BufferCache

::BindHostGraphicsTextureBuffers(size_t stage) { const u32 offset = buffer.Offset(binding.cpu_addr); const PixelFormat format = binding.format; if constexpr (SEPARATE_IMAGE_BUFFERS_BINDINGS) { - if (((image_texture_buffers[stage] >> index) & 1) != 0) { + if (((channel_state->image_texture_buffers[stage] >> index) & 1) != 0) { runtime.BindImageBuffer(buffer, offset, size, format); } else { runtime.BindTextureBuffer(buffer, offset, size, format); @@ -872,7 +881,7 @@ void BufferCache

::BindHostTransformFeedbackBuffers() { return; } for (u32 index = 0; index < NUM_TRANSFORM_FEEDBACK_BUFFERS; ++index) { - const Binding& binding = transform_feedback_buffers[index]; + const Binding& binding = channel_state->transform_feedback_buffers[index]; Buffer& buffer = slot_buffers[binding.buffer_id]; TouchBuffer(buffer, binding.buffer_id); const u32 size = binding.size; @@ -887,15 +896,16 @@ template void BufferCache

::BindHostComputeUniformBuffers() { if constexpr (HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS) { // Mark all uniform buffers as dirty - dirty_uniform_buffers.fill(~u32{0}); - fast_bound_uniform_buffers.fill(0); + channel_state->dirty_uniform_buffers.fill(~u32{0}); + channel_state->fast_bound_uniform_buffers.fill(0); } u32 binding_index = 0; - ForEachEnabledBit(enabled_compute_uniform_buffer_mask, [&](u32 index) { - const Binding& binding = compute_uniform_buffers[index]; + ForEachEnabledBit(channel_state->enabled_compute_uniform_buffer_mask, [&](u32 index) { + const Binding& binding = channel_state->compute_uniform_buffers[index]; Buffer& buffer = slot_buffers[binding.buffer_id]; TouchBuffer(buffer, binding.buffer_id); - const u32 size = std::min(binding.size, (*compute_uniform_buffer_sizes)[index]); + const u32 size = + std::min(binding.size, (*channel_state->compute_uniform_buffer_sizes)[index]); SynchronizeBuffer(buffer, binding.cpu_addr, size); const u32 offset = buffer.Offset(binding.cpu_addr); @@ -911,15 +921,16 @@ void BufferCache

::BindHostComputeUniformBuffers() { template void BufferCache

::BindHostComputeStorageBuffers() { u32 binding_index = 0; - ForEachEnabledBit(enabled_compute_storage_buffers, [&](u32 index) { - const Binding& binding = compute_storage_buffers[index]; + ForEachEnabledBit(channel_state->enabled_compute_storage_buffers, [&](u32 index) { + const Binding& binding = channel_state->compute_storage_buffers[index]; Buffer& buffer = slot_buffers[binding.buffer_id]; TouchBuffer(buffer, binding.buffer_id); const u32 size = binding.size; SynchronizeBuffer(buffer, binding.cpu_addr, size); const u32 offset = buffer.Offset(binding.cpu_addr); - const bool is_written = ((written_compute_storage_buffers >> index) & 1) != 0; + const bool is_written = + ((channel_state->written_compute_storage_buffers >> index) & 1) != 0; if constexpr (NEEDS_BIND_STORAGE_INDEX) { runtime.BindComputeStorageBuffer(binding_index, buffer, offset, size, is_written); ++binding_index; @@ -931,8 +942,8 @@ void BufferCache

::BindHostComputeStorageBuffers() { template void BufferCache

::BindHostComputeTextureBuffers() { - ForEachEnabledBit(enabled_compute_texture_buffers, [&](u32 index) { - const TextureBufferBinding& binding = compute_texture_buffers[index]; + ForEachEnabledBit(channel_state->enabled_compute_texture_buffers, [&](u32 index) { + const TextureBufferBinding& binding = channel_state->compute_texture_buffers[index]; Buffer& buffer = slot_buffers[binding.buffer_id]; const u32 size = binding.size; SynchronizeBuffer(buffer, binding.cpu_addr, size); @@ -940,7 +951,7 @@ void BufferCache

::BindHostComputeTextureBuffers() { const u32 offset = buffer.Offset(binding.cpu_addr); const PixelFormat format = binding.format; if constexpr (SEPARATE_IMAGE_BUFFERS_BINDINGS) { - if (((image_compute_texture_buffers >> index) & 1) != 0) { + if (((channel_state->image_compute_texture_buffers >> index) & 1) != 0) { runtime.BindImageBuffer(buffer, offset, size, format); } else { runtime.BindTextureBuffer(buffer, offset, size, format); @@ -954,7 +965,7 @@ void BufferCache

::BindHostComputeTextureBuffers() { template void BufferCache

::DoUpdateGraphicsBuffers(bool is_indexed) { do { - has_deleted_buffers = false; + channel_state->has_deleted_buffers = false; if (is_indexed) { UpdateIndexBuffer(); } @@ -968,7 +979,7 @@ void BufferCache

::DoUpdateGraphicsBuffers(bool is_indexed) { if (current_draw_indirect) { UpdateDrawIndirect(); } - } while (has_deleted_buffers); + } while (channel_state->has_deleted_buffers); } template @@ -999,7 +1010,7 @@ void BufferCache

::UpdateIndexBuffer() { slot_buffers.erase(inline_buffer_id); inline_buffer_id = CreateBuffer(0, buffer_size); } - index_buffer = Binding{ + channel_state->index_buffer = Binding{ .cpu_addr = 0, .size = inline_index_size, .buffer_id = inline_buffer_id, @@ -1015,10 +1026,10 @@ void BufferCache

::UpdateIndexBuffer() { (index_buffer_ref.count + index_buffer_ref.first) * index_buffer_ref.FormatSizeInBytes(); const u32 size = std::min(address_size, draw_size); if (size == 0 || !cpu_addr) { - index_buffer = NULL_BINDING; + channel_state->index_buffer = NULL_BINDING; return; } - index_buffer = Binding{ + channel_state->index_buffer = Binding{ .cpu_addr = *cpu_addr, .size = size, .buffer_id = FindBuffer(*cpu_addr, size), @@ -1051,13 +1062,13 @@ void BufferCache

::UpdateVertexBuffer(u32 index) { const u32 address_size = static_cast(gpu_addr_end - gpu_addr_begin); u32 size = address_size; // TODO: Analyze stride and number of vertices if (array.enable == 0 || size == 0 || !cpu_addr) { - vertex_buffers[index] = NULL_BINDING; + channel_state->vertex_buffers[index] = NULL_BINDING; return; } if (!gpu_memory->IsWithinGPUAddressRange(gpu_addr_end)) { size = static_cast(gpu_memory->MaxContinuousRange(gpu_addr_begin, size)); } - vertex_buffers[index] = Binding{ + channel_state->vertex_buffers[index] = Binding{ .cpu_addr = *cpu_addr, .size = size, .buffer_id = FindBuffer(*cpu_addr, size), @@ -1079,23 +1090,24 @@ void BufferCache

::UpdateDrawIndirect() { }; }; if (current_draw_indirect->include_count) { - update(current_draw_indirect->count_start_address, sizeof(u32), count_buffer_binding); + update(current_draw_indirect->count_start_address, sizeof(u32), + channel_state->count_buffer_binding); } update(current_draw_indirect->indirect_start_address, current_draw_indirect->buffer_size, - indirect_buffer_binding); + channel_state->indirect_buffer_binding); } template void BufferCache

::UpdateUniformBuffers(size_t stage) { - ForEachEnabledBit(enabled_uniform_buffer_masks[stage], [&](u32 index) { - Binding& binding = uniform_buffers[stage][index]; + ForEachEnabledBit(channel_state->enabled_uniform_buffer_masks[stage], [&](u32 index) { + Binding& binding = channel_state->uniform_buffers[stage][index]; if (binding.buffer_id) { // Already updated return; } // Mark as dirty if constexpr (HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS) { - dirty_uniform_buffers[stage] |= 1U << index; + channel_state->dirty_uniform_buffers[stage] |= 1U << index; } // Resolve buffer binding.buffer_id = FindBuffer(binding.cpu_addr, binding.size); @@ -1104,10 +1116,10 @@ void BufferCache

::UpdateUniformBuffers(size_t stage) { template void BufferCache

::UpdateStorageBuffers(size_t stage) { - const u32 written_mask = written_storage_buffers[stage]; - ForEachEnabledBit(enabled_storage_buffers[stage], [&](u32 index) { + const u32 written_mask = channel_state->written_storage_buffers[stage]; + ForEachEnabledBit(channel_state->enabled_storage_buffers[stage], [&](u32 index) { // Resolve buffer - Binding& binding = storage_buffers[stage][index]; + Binding& binding = channel_state->storage_buffers[stage][index]; const BufferId buffer_id = FindBuffer(binding.cpu_addr, binding.size); binding.buffer_id = buffer_id; // Mark buffer as written if needed @@ -1119,11 +1131,11 @@ void BufferCache

::UpdateStorageBuffers(size_t stage) { template void BufferCache

::UpdateTextureBuffers(size_t stage) { - ForEachEnabledBit(enabled_texture_buffers[stage], [&](u32 index) { - Binding& binding = texture_buffers[stage][index]; + ForEachEnabledBit(channel_state->enabled_texture_buffers[stage], [&](u32 index) { + Binding& binding = channel_state->texture_buffers[stage][index]; binding.buffer_id = FindBuffer(binding.cpu_addr, binding.size); // Mark buffer as written if needed - if (((written_texture_buffers[stage] >> index) & 1) != 0) { + if (((channel_state->written_texture_buffers[stage] >> index) & 1) != 0) { MarkWrittenBuffer(binding.buffer_id, binding.cpu_addr, binding.size); } }); @@ -1146,11 +1158,11 @@ void BufferCache

::UpdateTransformFeedbackBuffer(u32 index) { const u32 size = binding.size; const std::optional cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr); if (binding.enable == 0 || size == 0 || !cpu_addr) { - transform_feedback_buffers[index] = NULL_BINDING; + channel_state->transform_feedback_buffers[index] = NULL_BINDING; return; } const BufferId buffer_id = FindBuffer(*cpu_addr, size); - transform_feedback_buffers[index] = Binding{ + channel_state->transform_feedback_buffers[index] = Binding{ .cpu_addr = *cpu_addr, .size = size, .buffer_id = buffer_id, @@ -1160,8 +1172,8 @@ void BufferCache

::UpdateTransformFeedbackBuffer(u32 index) { template void BufferCache

::UpdateComputeUniformBuffers() { - ForEachEnabledBit(enabled_compute_uniform_buffer_mask, [&](u32 index) { - Binding& binding = compute_uniform_buffers[index]; + ForEachEnabledBit(channel_state->enabled_compute_uniform_buffer_mask, [&](u32 index) { + Binding& binding = channel_state->compute_uniform_buffers[index]; binding = NULL_BINDING; const auto& launch_desc = kepler_compute->launch_description; if (((launch_desc.const_buffer_enable_mask >> index) & 1) != 0) { @@ -1178,12 +1190,12 @@ void BufferCache

::UpdateComputeUniformBuffers() { template void BufferCache

::UpdateComputeStorageBuffers() { - ForEachEnabledBit(enabled_compute_storage_buffers, [&](u32 index) { + ForEachEnabledBit(channel_state->enabled_compute_storage_buffers, [&](u32 index) { // Resolve buffer - Binding& binding = compute_storage_buffers[index]; + Binding& binding = channel_state->compute_storage_buffers[index]; binding.buffer_id = FindBuffer(binding.cpu_addr, binding.size); // Mark as written if needed - if (((written_compute_storage_buffers >> index) & 1) != 0) { + if (((channel_state->written_compute_storage_buffers >> index) & 1) != 0) { MarkWrittenBuffer(binding.buffer_id, binding.cpu_addr, binding.size); } }); @@ -1191,11 +1203,11 @@ void BufferCache

::UpdateComputeStorageBuffers() { template void BufferCache

::UpdateComputeTextureBuffers() { - ForEachEnabledBit(enabled_compute_texture_buffers, [&](u32 index) { - Binding& binding = compute_texture_buffers[index]; + ForEachEnabledBit(channel_state->enabled_compute_texture_buffers, [&](u32 index) { + Binding& binding = channel_state->compute_texture_buffers[index]; binding.buffer_id = FindBuffer(binding.cpu_addr, binding.size); // Mark as written if needed - if (((written_compute_texture_buffers >> index) & 1) != 0) { + if (((channel_state->written_compute_texture_buffers >> index) & 1) != 0) { MarkWrittenBuffer(binding.buffer_id, binding.cpu_addr, binding.size); } }); @@ -1610,13 +1622,13 @@ void BufferCache

::DeleteBuffer(BufferId buffer_id, bool do_not_mark) { const auto replace = [scalar_replace](std::span bindings) { std::ranges::for_each(bindings, scalar_replace); }; - scalar_replace(index_buffer); - replace(vertex_buffers); - std::ranges::for_each(uniform_buffers, replace); - std::ranges::for_each(storage_buffers, replace); - replace(transform_feedback_buffers); - replace(compute_uniform_buffers); - replace(compute_storage_buffers); + scalar_replace(channel_state->index_buffer); + replace(channel_state->vertex_buffers); + std::ranges::for_each(channel_state->uniform_buffers, replace); + std::ranges::for_each(channel_state->storage_buffers, replace); + replace(channel_state->transform_feedback_buffers); + replace(channel_state->compute_uniform_buffers); + replace(channel_state->compute_storage_buffers); // Mark the whole buffer as CPU written to stop tracking CPU writes if (!do_not_mark) { @@ -1634,8 +1646,8 @@ void BufferCache

::DeleteBuffer(BufferId buffer_id, bool do_not_mark) { template void BufferCache

::NotifyBufferDeletion() { if constexpr (HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS) { - dirty_uniform_buffers.fill(~u32{0}); - uniform_buffer_binding_sizes.fill({}); + channel_state->dirty_uniform_buffers.fill(~u32{0}); + channel_state->uniform_buffer_binding_sizes.fill({}); } auto& flags = maxwell3d->dirty.flags; flags[Dirty::IndexBuffer] = true; @@ -1643,13 +1655,12 @@ void BufferCache

::NotifyBufferDeletion() { for (u32 index = 0; index < NUM_VERTEX_BUFFERS; ++index) { flags[Dirty::VertexBuffer0 + index] = true; } - has_deleted_buffers = true; + channel_state->has_deleted_buffers = true; } template -typename BufferCache

::Binding BufferCache

::StorageBufferBinding(GPUVAddr ssbo_addr, - u32 cbuf_index, - bool is_written) const { +Binding BufferCache

::StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index, + bool is_written) const { const GPUVAddr gpu_addr = gpu_memory->Read(ssbo_addr); const auto size = [&]() { const bool is_nvn_cbuf = cbuf_index == 0; @@ -1681,8 +1692,8 @@ typename BufferCache

::Binding BufferCache

::StorageBufferBinding(GPUVAddr s } template -typename BufferCache

::TextureBufferBinding BufferCache

::GetTextureBufferBinding( - GPUVAddr gpu_addr, u32 size, PixelFormat format) { +TextureBufferBinding BufferCache

::GetTextureBufferBinding(GPUVAddr gpu_addr, u32 size, + PixelFormat format) { const std::optional cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr); TextureBufferBinding binding; if (!cpu_addr || size == 0) { @@ -1721,7 +1732,7 @@ std::span BufferCache

::ImmediateBuffer(size_t wanted_capacity) { template bool BufferCache

::HasFastUniformBufferBound(size_t stage, u32 binding_index) const noexcept { if constexpr (IS_OPENGL) { - return ((fast_bound_uniform_buffers[stage] >> binding_index) & 1) != 0; + return ((channel_state->fast_bound_uniform_buffers[stage] >> binding_index) & 1) != 0; } else { // Only OpenGL has fast uniform buffers return false; @@ -1730,14 +1741,14 @@ bool BufferCache

::HasFastUniformBufferBound(size_t stage, u32 binding_index) template std::pair::Buffer*, u32> BufferCache

::GetDrawIndirectCount() { - auto& buffer = slot_buffers[count_buffer_binding.buffer_id]; - return std::make_pair(&buffer, buffer.Offset(count_buffer_binding.cpu_addr)); + auto& buffer = slot_buffers[channel_state->count_buffer_binding.buffer_id]; + return std::make_pair(&buffer, buffer.Offset(channel_state->count_buffer_binding.cpu_addr)); } template std::pair::Buffer*, u32> BufferCache

::GetDrawIndirectBuffer() { - auto& buffer = slot_buffers[indirect_buffer_binding.buffer_id]; - return std::make_pair(&buffer, buffer.Offset(indirect_buffer_binding.cpu_addr)); + auto& buffer = slot_buffers[channel_state->indirect_buffer_binding.buffer_id]; + return std::make_pair(&buffer, buffer.Offset(channel_state->indirect_buffer_binding.cpu_addr)); } } // namespace VideoCommon diff --git a/src/video_core/buffer_cache/buffer_cache_base.h b/src/video_core/buffer_cache/buffer_cache_base.h index ac00d4d9d..c689fe06b 100644 --- a/src/video_core/buffer_cache/buffer_cache_base.h +++ b/src/video_core/buffer_cache/buffer_cache_base.h @@ -86,8 +86,78 @@ enum class ObtainBufferOperation : u32 { MarkQuery = 3, }; -template -class BufferCache : public VideoCommon::ChannelSetupCaches { +static constexpr BufferId NULL_BUFFER_ID{0}; +static constexpr u32 DEFAULT_SKIP_CACHE_SIZE = static_cast(4_KiB); + +struct Binding { + VAddr cpu_addr{}; + u32 size{}; + BufferId buffer_id; +}; + +struct TextureBufferBinding : Binding { + PixelFormat format; +}; + +static constexpr Binding NULL_BINDING{ + .cpu_addr = 0, + .size = 0, + .buffer_id = NULL_BUFFER_ID, +}; + +class BufferCacheChannelInfo : public ChannelInfo { +public: + BufferCacheChannelInfo() = delete; + BufferCacheChannelInfo(Tegra::Control::ChannelState& state) noexcept : ChannelInfo(state) {} + BufferCacheChannelInfo(const BufferCacheChannelInfo& state) = delete; + BufferCacheChannelInfo& operator=(const BufferCacheChannelInfo&) = delete; + + Binding index_buffer; + std::array vertex_buffers; + std::array, NUM_STAGES> uniform_buffers; + std::array, NUM_STAGES> storage_buffers; + std::array, NUM_STAGES> texture_buffers; + std::array transform_feedback_buffers; + Binding count_buffer_binding; + Binding indirect_buffer_binding; + + std::array compute_uniform_buffers; + std::array compute_storage_buffers; + std::array compute_texture_buffers; + + std::array enabled_uniform_buffer_masks{}; + u32 enabled_compute_uniform_buffer_mask = 0; + + const UniformBufferSizes* uniform_buffer_sizes{}; + const ComputeUniformBufferSizes* compute_uniform_buffer_sizes{}; + + std::array enabled_storage_buffers{}; + std::array written_storage_buffers{}; + u32 enabled_compute_storage_buffers = 0; + u32 written_compute_storage_buffers = 0; + + std::array enabled_texture_buffers{}; + std::array written_texture_buffers{}; + std::array image_texture_buffers{}; + u32 enabled_compute_texture_buffers = 0; + u32 written_compute_texture_buffers = 0; + u32 image_compute_texture_buffers = 0; + + std::array uniform_cache_hits{}; + std::array uniform_cache_shots{}; + + u32 uniform_buffer_skip_cache_size = DEFAULT_SKIP_CACHE_SIZE; + + bool has_deleted_buffers = false; + + std::array dirty_uniform_buffers{}; + std::array fast_bound_uniform_buffers{}; + std::array, NUM_STAGES> + uniform_buffer_binding_sizes{}; +}; + +template +class BufferCache : public VideoCommon::ChannelSetupCaches { // Page size for caching purposes. // This is unrelated to the CPU page size and it can be changed as it seems optimal. static constexpr u32 CACHING_PAGEBITS = 16; @@ -104,8 +174,6 @@ class BufferCache : public VideoCommon::ChannelSetupCaches; using OverlapCounter = boost::icl::split_interval_map; - struct Empty {}; - struct OverlapResult { std::vector ids; VAddr begin; @@ -158,25 +224,7 @@ class BufferCache : public VideoCommon::ChannelSetupCaches(4_KiB); - explicit BufferCache(VideoCore::RasterizerInterface& rasterizer_, Core::Memory::Memory& cpu_memory_, Runtime& runtime_); @@ -496,51 +544,6 @@ private: u32 last_index_count = 0; - Binding index_buffer; - std::array vertex_buffers; - std::array, NUM_STAGES> uniform_buffers; - std::array, NUM_STAGES> storage_buffers; - std::array, NUM_STAGES> texture_buffers; - std::array transform_feedback_buffers; - Binding count_buffer_binding; - Binding indirect_buffer_binding; - - std::array compute_uniform_buffers; - std::array compute_storage_buffers; - std::array compute_texture_buffers; - - std::array enabled_uniform_buffer_masks{}; - u32 enabled_compute_uniform_buffer_mask = 0; - - const UniformBufferSizes* uniform_buffer_sizes{}; - const ComputeUniformBufferSizes* compute_uniform_buffer_sizes{}; - - std::array enabled_storage_buffers{}; - std::array written_storage_buffers{}; - u32 enabled_compute_storage_buffers = 0; - u32 written_compute_storage_buffers = 0; - - std::array enabled_texture_buffers{}; - std::array written_texture_buffers{}; - std::array image_texture_buffers{}; - u32 enabled_compute_texture_buffers = 0; - u32 written_compute_texture_buffers = 0; - u32 image_compute_texture_buffers = 0; - - std::array uniform_cache_hits{}; - std::array uniform_cache_shots{}; - - u32 uniform_buffer_skip_cache_size = DEFAULT_SKIP_CACHE_SIZE; - - bool has_deleted_buffers = false; - - std::conditional_t, Empty> - dirty_uniform_buffers{}; - std::conditional_t, Empty> fast_bound_uniform_buffers{}; - std::conditional_t, NUM_STAGES>, Empty> - uniform_buffer_binding_sizes{}; - MemoryTracker memory_tracker; IntervalSet uncommitted_ranges; IntervalSet common_ranges; diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.cpp b/src/video_core/renderer_opengl/gl_buffer_cache.cpp index 6af4ae793..6d3bda192 100644 --- a/src/video_core/renderer_opengl/gl_buffer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_buffer_cache.cpp @@ -117,7 +117,7 @@ BufferCacheRuntime::BufferCacheRuntime(const Device& device_) for (auto& stage_uniforms : fast_uniforms) { for (OGLBuffer& buffer : stage_uniforms) { buffer.Create(); - glNamedBufferData(buffer.handle, BufferCache::DEFAULT_SKIP_CACHE_SIZE, nullptr, + glNamedBufferData(buffer.handle, VideoCommon::DEFAULT_SKIP_CACHE_SIZE, nullptr, GL_STREAM_DRAW); } } From 9c2b211f128f39f5cbcf761cc1222e01011f47e2 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Sat, 27 May 2023 17:38:07 +0100 Subject: [PATCH 0424/1181] Audren wait as suggested by ByLaws --- src/audio_core/sink/sink_stream.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index 9bbb54162..2331aaff9 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -273,6 +273,9 @@ void SinkStream::WaitFreeSpace() { std::unique_lock lk{release_mutex}; release_cv.wait_for(lk, std::chrono::milliseconds(5), [this]() { return queued_buffers < max_queue_size; }); + if (queued_buffers > max_queue_size + 3) { + release_cv.wait(lk, [this]() { return queued_buffers < max_queue_size; }); + } } } // namespace AudioCore::Sink From 4a292efbff70ed9009f1c364cc9250898be18887 Mon Sep 17 00:00:00 2001 From: GPUCode Date: Sun, 28 May 2023 02:39:44 +0300 Subject: [PATCH 0425/1181] renderer_vulkan: Remove timeline semaphore wait --- .../renderer_vulkan/vk_master_semaphore.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_master_semaphore.cpp b/src/video_core/renderer_vulkan/vk_master_semaphore.cpp index 8b65aeaeb..b128c4f6e 100644 --- a/src/video_core/renderer_vulkan/vk_master_semaphore.cpp +++ b/src/video_core/renderer_vulkan/vk_master_semaphore.cpp @@ -128,15 +128,12 @@ VkResult MasterSemaphore::SubmitQueueTimeline(vk::CommandBuffer& cmdbuf, const std::array signal_values{host_tick, u64(0)}; const std::array signal_semaphores{timeline_semaphore, signal_semaphore}; - const u32 num_wait_semaphores = wait_semaphore ? 2 : 1; - const std::array wait_values{host_tick - 1, u64(1)}; - const std::array wait_semaphores{timeline_semaphore, wait_semaphore}; - + const u32 num_wait_semaphores = wait_semaphore ? 1 : 0; const VkTimelineSemaphoreSubmitInfo timeline_si{ .sType = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO, .pNext = nullptr, - .waitSemaphoreValueCount = num_wait_semaphores, - .pWaitSemaphoreValues = wait_values.data(), + .waitSemaphoreValueCount = 0, + .pWaitSemaphoreValues = nullptr, .signalSemaphoreValueCount = num_signal_semaphores, .pSignalSemaphoreValues = signal_values.data(), }; @@ -144,7 +141,7 @@ VkResult MasterSemaphore::SubmitQueueTimeline(vk::CommandBuffer& cmdbuf, .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, .pNext = &timeline_si, .waitSemaphoreCount = num_wait_semaphores, - .pWaitSemaphores = wait_semaphores.data(), + .pWaitSemaphores = &wait_semaphore, .pWaitDstStageMask = wait_stage_masks.data(), .commandBufferCount = 1, .pCommandBuffers = cmdbuf.address(), From fee91096ca71a7215a3d6e6b92cacc1227e23fd0 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Sat, 27 May 2023 22:10:54 -0400 Subject: [PATCH 0426/1181] microprofile: Avoid crashing due to OOB stack pos --- externals/microprofile/microprofile.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h index 639f3618c..8f75a25aa 100644 --- a/externals/microprofile/microprofile.h +++ b/externals/microprofile/microprofile.h @@ -1697,7 +1697,13 @@ void MicroProfileFlip() { int nTimer = MicroProfileLogTimerIndex(LE); uint8_t nGroup = pTimerToGroup[nTimer]; - MP_ASSERT(nStackPos < MICROPROFILE_STACK_MAX); + + // To avoid crashing due to OOB memory accesses/asserts + // simply skip this iteration + // MP_ASSERT(nStackPos < MICROPROFILE_STACK_MAX); + if (nStackPos >= MICROPROFILE_STACK_MAX) { + break; + } MP_ASSERT(nGroup < MICROPROFILE_MAX_GROUPS); pGroupStackPos[nGroup]++; pStack[nStackPos++] = k; From 642c14f0c7ee71f1f4daa50cee84ec9143697af6 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Sat, 27 May 2023 21:46:15 -0400 Subject: [PATCH 0427/1181] OpenGL: Make use of persistent buffer maps in buffer cache downloads Persistent buffer maps were already used by the texture cache, this extends their usage for the buffer cache. In my testing, using the memory maps for uploads was slower than the existing "ImmediateUpload" path, so the memory map usage is limited to downloads for the time being. --- src/video_core/CMakeLists.txt | 4 +- src/video_core/buffer_cache/buffer_cache.h | 10 +- .../buffer_cache/buffer_cache_base.h | 1 + .../renderer_opengl/gl_buffer_cache.cpp | 58 +++++++- .../renderer_opengl/gl_buffer_cache.h | 29 +++- .../renderer_opengl/gl_rasterizer.cpp | 6 +- .../renderer_opengl/gl_rasterizer.h | 1 + .../gl_staging_buffer_pool.cpp | 134 ++++++++++++++++++ ...ream_buffer.h => gl_staging_buffer_pool.h} | 42 ++++++ .../renderer_opengl/gl_stream_buffer.cpp | 63 -------- .../renderer_opengl/gl_texture_cache.cpp | 87 ++---------- .../renderer_opengl/gl_texture_cache.h | 47 ++---- .../renderer_opengl/util_shaders.cpp | 9 +- src/video_core/renderer_opengl/util_shaders.h | 10 +- .../renderer_vulkan/vk_buffer_cache.h | 1 + 15 files changed, 298 insertions(+), 204 deletions(-) create mode 100644 src/video_core/renderer_opengl/gl_staging_buffer_pool.cpp rename src/video_core/renderer_opengl/{gl_stream_buffer.h => gl_staging_buffer_pool.h} (54%) delete mode 100644 src/video_core/renderer_opengl/gl_stream_buffer.cpp diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 308d013d6..3e8bd0060 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -133,8 +133,8 @@ add_library(video_core STATIC renderer_opengl/gl_shader_util.h renderer_opengl/gl_state_tracker.cpp renderer_opengl/gl_state_tracker.h - renderer_opengl/gl_stream_buffer.cpp - renderer_opengl/gl_stream_buffer.h + renderer_opengl/gl_staging_buffer_pool.cpp + renderer_opengl/gl_staging_buffer_pool.h renderer_opengl/gl_texture_cache.cpp renderer_opengl/gl_texture_cache.h renderer_opengl/gl_texture_cache_base.cpp diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 65494097b..08bc66aaa 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -465,7 +465,6 @@ void BufferCache

::CommitAsyncFlushesHigh() { if (committed_ranges.empty()) { if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { - async_buffers.emplace_back(std::optional{}); } return; @@ -526,7 +525,6 @@ void BufferCache

::CommitAsyncFlushesHigh() { committed_ranges.clear(); if (downloads.empty()) { if constexpr (IMPLEMENTS_ASYNC_DOWNLOADS) { - async_buffers.emplace_back(std::optional{}); } return; @@ -678,7 +676,7 @@ void BufferCache

::BindHostIndexBuffer() { const u32 size = index_buffer.size; const auto& draw_state = maxwell3d->draw_manager->GetDrawState(); if (!draw_state.inline_index_draw_indexes.empty()) [[unlikely]] { - if constexpr (USE_MEMORY_MAPS) { + if constexpr (USE_MEMORY_MAPS_FOR_UPLOADS) { auto upload_staging = runtime.UploadStagingBuffer(size); std::array copies{ {BufferCopy{.src_offset = upload_staging.offset, .dst_offset = 0, .size = size}}}; @@ -1446,7 +1444,7 @@ bool BufferCache

::SynchronizeBufferNoModified(Buffer& buffer, VAddr cpu_addr, template void BufferCache

::UploadMemory(Buffer& buffer, u64 total_size_bytes, u64 largest_copy, std::span copies) { - if constexpr (USE_MEMORY_MAPS) { + if constexpr (USE_MEMORY_MAPS_FOR_UPLOADS) { MappedUploadMemory(buffer, total_size_bytes, copies); } else { ImmediateUploadMemory(buffer, largest_copy, copies); @@ -1457,7 +1455,7 @@ template void BufferCache

::ImmediateUploadMemory([[maybe_unused]] Buffer& buffer, [[maybe_unused]] u64 largest_copy, [[maybe_unused]] std::span copies) { - if constexpr (!USE_MEMORY_MAPS) { + if constexpr (!USE_MEMORY_MAPS_FOR_UPLOADS) { std::span immediate_buffer; for (const BufferCopy& copy : copies) { std::span upload_span; @@ -1516,7 +1514,7 @@ bool BufferCache

::InlineMemory(VAddr dest_address, size_t copy_size, auto& buffer = slot_buffers[buffer_id]; SynchronizeBuffer(buffer, dest_address, static_cast(copy_size)); - if constexpr (USE_MEMORY_MAPS) { + if constexpr (USE_MEMORY_MAPS_FOR_UPLOADS) { auto upload_staging = runtime.UploadStagingBuffer(copy_size); std::array copies{BufferCopy{ .src_offset = upload_staging.offset, diff --git a/src/video_core/buffer_cache/buffer_cache_base.h b/src/video_core/buffer_cache/buffer_cache_base.h index ac00d4d9d..7c6ef49d5 100644 --- a/src/video_core/buffer_cache/buffer_cache_base.h +++ b/src/video_core/buffer_cache/buffer_cache_base.h @@ -103,6 +103,7 @@ class BufferCache : public VideoCommon::ChannelSetupCaches()} { @@ -140,6 +142,14 @@ BufferCacheRuntime::BufferCacheRuntime(const Device& device_) }(); } +StagingBufferMap BufferCacheRuntime::UploadStagingBuffer(size_t size) { + return staging_buffer_pool.RequestUploadBuffer(size); +} + +StagingBufferMap BufferCacheRuntime::DownloadStagingBuffer(size_t size) { + return staging_buffer_pool.RequestDownloadBuffer(size); +} + u64 BufferCacheRuntime::GetDeviceMemoryUsage() const { if (device.CanReportMemoryUsage()) { return device_access_memory - device.GetCurrentDedicatedVideoMemory(); @@ -147,13 +157,47 @@ u64 BufferCacheRuntime::GetDeviceMemoryUsage() const { return 2_GiB; } +void BufferCacheRuntime::CopyBuffer(GLuint dst_buffer, GLuint src_buffer, + std::span copies, bool barrier) { + if (barrier) { + PreCopyBarrier(); + } + for (const VideoCommon::BufferCopy& copy : copies) { + glCopyNamedBufferSubData(src_buffer, dst_buffer, static_cast(copy.src_offset), + static_cast(copy.dst_offset), + static_cast(copy.size)); + } + if (barrier) { + PostCopyBarrier(); + } +} + +void BufferCacheRuntime::CopyBuffer(GLuint dst_buffer, Buffer& src_buffer, + std::span copies, bool barrier) { + CopyBuffer(dst_buffer, src_buffer.Handle(), copies, barrier); +} + +void BufferCacheRuntime::CopyBuffer(Buffer& dst_buffer, GLuint src_buffer, + std::span copies, bool barrier) { + CopyBuffer(dst_buffer.Handle(), src_buffer, copies, barrier); +} + void BufferCacheRuntime::CopyBuffer(Buffer& dst_buffer, Buffer& src_buffer, std::span copies) { - for (const VideoCommon::BufferCopy& copy : copies) { - glCopyNamedBufferSubData( - src_buffer.Handle(), dst_buffer.Handle(), static_cast(copy.src_offset), - static_cast(copy.dst_offset), static_cast(copy.size)); - } + CopyBuffer(dst_buffer.Handle(), src_buffer.Handle(), copies); +} + +void BufferCacheRuntime::PreCopyBarrier() { + // TODO: finer grained barrier? + glMemoryBarrier(GL_ALL_BARRIER_BITS); +} + +void BufferCacheRuntime::PostCopyBarrier() { + glMemoryBarrier(GL_BUFFER_UPDATE_BARRIER_BIT | GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT); +} + +void BufferCacheRuntime::Finish() { + glFinish(); } void BufferCacheRuntime::ClearBuffer(Buffer& dest_buffer, u32 offset, size_t size, u32 value) { diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.h b/src/video_core/renderer_opengl/gl_buffer_cache.h index 18d3c3ac0..a24991585 100644 --- a/src/video_core/renderer_opengl/gl_buffer_cache.h +++ b/src/video_core/renderer_opengl/gl_buffer_cache.h @@ -12,7 +12,7 @@ #include "video_core/rasterizer_interface.h" #include "video_core/renderer_opengl/gl_device.h" #include "video_core/renderer_opengl/gl_resource_manager.h" -#include "video_core/renderer_opengl/gl_stream_buffer.h" +#include "video_core/renderer_opengl/gl_staging_buffer_pool.h" namespace OpenGL { @@ -60,11 +60,28 @@ class BufferCacheRuntime { public: static constexpr u8 INVALID_BINDING = std::numeric_limits::max(); - explicit BufferCacheRuntime(const Device& device_); + explicit BufferCacheRuntime(const Device& device_, StagingBufferPool& staging_buffer_pool_); + + [[nodiscard]] StagingBufferMap UploadStagingBuffer(size_t size); + + [[nodiscard]] StagingBufferMap DownloadStagingBuffer(size_t size); + + void CopyBuffer(GLuint dst_buffer, GLuint src_buffer, + std::span copies, bool barrier = true); + + void CopyBuffer(GLuint dst_buffer, Buffer& src_buffer, + std::span copies, bool barrier = true); + + void CopyBuffer(Buffer& dst_buffer, GLuint src_buffer, + std::span copies, bool barrier = true); void CopyBuffer(Buffer& dst_buffer, Buffer& src_buffer, std::span copies); + void PreCopyBarrier(); + void PostCopyBarrier(); + void Finish(); + void ClearBuffer(Buffer& dest_buffer, u32 offset, size_t size, u32 value); void BindIndexBuffer(Buffer& buffer, u32 offset, u32 size); @@ -169,6 +186,7 @@ private: }; const Device& device; + StagingBufferPool& staging_buffer_pool; bool has_fast_buffer_sub_data = false; bool use_assembly_shaders = false; @@ -201,7 +219,7 @@ private: struct BufferCacheParams { using Runtime = OpenGL::BufferCacheRuntime; using Buffer = OpenGL::Buffer; - using Async_Buffer = u32; + using Async_Buffer = OpenGL::StagingBufferMap; using MemoryTracker = VideoCommon::MemoryTrackerBase; static constexpr bool IS_OPENGL = true; @@ -209,9 +227,12 @@ struct BufferCacheParams { static constexpr bool HAS_FULL_INDEX_AND_PRIMITIVE_SUPPORT = true; static constexpr bool NEEDS_BIND_UNIFORM_INDEX = true; static constexpr bool NEEDS_BIND_STORAGE_INDEX = true; - static constexpr bool USE_MEMORY_MAPS = false; + static constexpr bool USE_MEMORY_MAPS = true; static constexpr bool SEPARATE_IMAGE_BUFFER_BINDINGS = true; static constexpr bool IMPLEMENTS_ASYNC_DOWNLOADS = false; + + // TODO: Investigate why OpenGL seems to perform worse with persistently mapped buffer uploads + static constexpr bool USE_MEMORY_MAPS_FOR_UPLOADS = false; }; using BufferCache = VideoCommon::BufferCache; diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index f5baa0f3c..fc711c44a 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -24,6 +24,7 @@ #include "video_core/renderer_opengl/gl_query_cache.h" #include "video_core/renderer_opengl/gl_rasterizer.h" #include "video_core/renderer_opengl/gl_shader_cache.h" +#include "video_core/renderer_opengl/gl_staging_buffer_pool.h" #include "video_core/renderer_opengl/gl_texture_cache.h" #include "video_core/renderer_opengl/maxwell_to_gl.h" #include "video_core/renderer_opengl/renderer_opengl.h" @@ -58,8 +59,9 @@ RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& emu_window_, Tegra StateTracker& state_tracker_) : RasterizerAccelerated(cpu_memory_), gpu(gpu_), device(device_), screen_info(screen_info_), program_manager(program_manager_), state_tracker(state_tracker_), - texture_cache_runtime(device, program_manager, state_tracker), - texture_cache(texture_cache_runtime, *this), buffer_cache_runtime(device), + texture_cache_runtime(device, program_manager, state_tracker, staging_buffer_pool), + texture_cache(texture_cache_runtime, *this), + buffer_cache_runtime(device, staging_buffer_pool), buffer_cache(*this, cpu_memory_, buffer_cache_runtime), shader_cache(*this, emu_window_, device, texture_cache, buffer_cache, program_manager, state_tracker, gpu.ShaderNotify()), diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 410d8ffc5..a73ad15c1 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -230,6 +230,7 @@ private: ProgramManager& program_manager; StateTracker& state_tracker; + StagingBufferPool staging_buffer_pool; TextureCacheRuntime texture_cache_runtime; TextureCache texture_cache; BufferCacheRuntime buffer_cache_runtime; diff --git a/src/video_core/renderer_opengl/gl_staging_buffer_pool.cpp b/src/video_core/renderer_opengl/gl_staging_buffer_pool.cpp new file mode 100644 index 000000000..72b1dbb32 --- /dev/null +++ b/src/video_core/renderer_opengl/gl_staging_buffer_pool.cpp @@ -0,0 +1,134 @@ +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include +#include + +#include + +#include "common/alignment.h" +#include "common/assert.h" +#include "video_core/renderer_opengl/gl_staging_buffer_pool.h" + +namespace OpenGL { + +StagingBufferMap::~StagingBufferMap() { + if (sync) { + sync->Create(); + } +} + +StagingBuffers::StagingBuffers(GLenum storage_flags_, GLenum map_flags_) + : storage_flags{storage_flags_}, map_flags{map_flags_} {} + +StagingBuffers::~StagingBuffers() = default; + +StagingBufferMap StagingBuffers::RequestMap(size_t requested_size, bool insert_fence) { + const size_t index = RequestBuffer(requested_size); + OGLSync* const sync = insert_fence ? &syncs[index] : nullptr; + return StagingBufferMap{ + .mapped_span = std::span(maps[index], requested_size), + .sync = sync, + .buffer = buffers[index].handle, + }; +} + +size_t StagingBuffers::RequestBuffer(size_t requested_size) { + if (const std::optional index = FindBuffer(requested_size); index) { + return *index; + } + + OGLBuffer& buffer = buffers.emplace_back(); + buffer.Create(); + glNamedBufferStorage(buffer.handle, requested_size, nullptr, + storage_flags | GL_MAP_PERSISTENT_BIT); + maps.push_back(static_cast(glMapNamedBufferRange(buffer.handle, 0, requested_size, + map_flags | GL_MAP_PERSISTENT_BIT))); + + syncs.emplace_back(); + sizes.push_back(requested_size); + + ASSERT(syncs.size() == buffers.size() && buffers.size() == maps.size() && + maps.size() == sizes.size()); + + return buffers.size() - 1; +} + +std::optional StagingBuffers::FindBuffer(size_t requested_size) { + size_t smallest_buffer = std::numeric_limits::max(); + std::optional found; + const size_t num_buffers = sizes.size(); + for (size_t index = 0; index < num_buffers; ++index) { + const size_t buffer_size = sizes[index]; + if (buffer_size < requested_size || buffer_size >= smallest_buffer) { + continue; + } + if (syncs[index].handle != 0) { + if (!syncs[index].IsSignaled()) { + continue; + } + syncs[index].Release(); + } + smallest_buffer = buffer_size; + found = index; + } + return found; +} + +StreamBuffer::StreamBuffer() { + static constexpr GLenum flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + buffer.Create(); + glObjectLabel(GL_BUFFER, buffer.handle, -1, "Stream Buffer"); + glNamedBufferStorage(buffer.handle, STREAM_BUFFER_SIZE, nullptr, flags); + mapped_pointer = + static_cast(glMapNamedBufferRange(buffer.handle, 0, STREAM_BUFFER_SIZE, flags)); + for (OGLSync& sync : fences) { + sync.Create(); + } +} + +std::pair, size_t> StreamBuffer::Request(size_t size) noexcept { + ASSERT(size < REGION_SIZE); + for (size_t region = Region(used_iterator), region_end = Region(iterator); region < region_end; + ++region) { + fences[region].Create(); + } + used_iterator = iterator; + + for (size_t region = Region(free_iterator) + 1, + region_end = std::min(Region(iterator + size) + 1, NUM_SYNCS); + region < region_end; ++region) { + glClientWaitSync(fences[region].handle, 0, GL_TIMEOUT_IGNORED); + fences[region].Release(); + } + if (iterator + size >= free_iterator) { + free_iterator = iterator + size; + } + if (iterator + size > STREAM_BUFFER_SIZE) { + for (size_t region = Region(used_iterator); region < NUM_SYNCS; ++region) { + fences[region].Create(); + } + used_iterator = 0; + iterator = 0; + free_iterator = size; + + for (size_t region = 0, region_end = Region(size); region <= region_end; ++region) { + glClientWaitSync(fences[region].handle, 0, GL_TIMEOUT_IGNORED); + fences[region].Release(); + } + } + const size_t offset = iterator; + iterator = Common::AlignUp(iterator + size, MAX_ALIGNMENT); + return {std::span(mapped_pointer + offset, size), offset}; +} + +StagingBufferMap StagingBufferPool::RequestUploadBuffer(size_t size) { + return upload_buffers.RequestMap(size, true); +} + +StagingBufferMap StagingBufferPool::RequestDownloadBuffer(size_t size) { + return download_buffers.RequestMap(size, false); +} + +} // namespace OpenGL diff --git a/src/video_core/renderer_opengl/gl_stream_buffer.h b/src/video_core/renderer_opengl/gl_staging_buffer_pool.h similarity index 54% rename from src/video_core/renderer_opengl/gl_stream_buffer.h rename to src/video_core/renderer_opengl/gl_staging_buffer_pool.h index 8fe927aaf..2c467be3d 100644 --- a/src/video_core/renderer_opengl/gl_stream_buffer.h +++ b/src/video_core/renderer_opengl/gl_staging_buffer_pool.h @@ -4,8 +4,10 @@ #pragma once #include +#include #include #include +#include #include @@ -17,6 +19,33 @@ namespace OpenGL { using namespace Common::Literals; +struct StagingBufferMap { + ~StagingBufferMap(); + + std::span mapped_span; + size_t offset = 0; + OGLSync* sync; + GLuint buffer; +}; + +struct StagingBuffers { + explicit StagingBuffers(GLenum storage_flags_, GLenum map_flags_); + ~StagingBuffers(); + + StagingBufferMap RequestMap(size_t requested_size, bool insert_fence); + + size_t RequestBuffer(size_t requested_size); + + std::optional FindBuffer(size_t requested_size); + + std::vector syncs; + std::vector buffers; + std::vector maps; + std::vector sizes; + GLenum storage_flags; + GLenum map_flags; +}; + class StreamBuffer { static constexpr size_t STREAM_BUFFER_SIZE = 64_MiB; static constexpr size_t NUM_SYNCS = 16; @@ -48,4 +77,17 @@ private: std::array fences; }; +class StagingBufferPool { +public: + StagingBufferPool() = default; + ~StagingBufferPool() = default; + + StagingBufferMap RequestUploadBuffer(size_t size); + StagingBufferMap RequestDownloadBuffer(size_t size); + +private: + StagingBuffers upload_buffers{GL_MAP_WRITE_BIT, GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT}; + StagingBuffers download_buffers{GL_MAP_READ_BIT | GL_CLIENT_STORAGE_BIT, GL_MAP_READ_BIT}; +}; + } // namespace OpenGL diff --git a/src/video_core/renderer_opengl/gl_stream_buffer.cpp b/src/video_core/renderer_opengl/gl_stream_buffer.cpp deleted file mode 100644 index 2005c8993..000000000 --- a/src/video_core/renderer_opengl/gl_stream_buffer.cpp +++ /dev/null @@ -1,63 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include -#include -#include - -#include - -#include "common/alignment.h" -#include "common/assert.h" -#include "video_core/renderer_opengl/gl_stream_buffer.h" - -namespace OpenGL { - -StreamBuffer::StreamBuffer() { - static constexpr GLenum flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; - buffer.Create(); - glObjectLabel(GL_BUFFER, buffer.handle, -1, "Stream Buffer"); - glNamedBufferStorage(buffer.handle, STREAM_BUFFER_SIZE, nullptr, flags); - mapped_pointer = - static_cast(glMapNamedBufferRange(buffer.handle, 0, STREAM_BUFFER_SIZE, flags)); - for (OGLSync& sync : fences) { - sync.Create(); - } -} - -std::pair, size_t> StreamBuffer::Request(size_t size) noexcept { - ASSERT(size < REGION_SIZE); - for (size_t region = Region(used_iterator), region_end = Region(iterator); region < region_end; - ++region) { - fences[region].Create(); - } - used_iterator = iterator; - - for (size_t region = Region(free_iterator) + 1, - region_end = std::min(Region(iterator + size) + 1, NUM_SYNCS); - region < region_end; ++region) { - glClientWaitSync(fences[region].handle, 0, GL_TIMEOUT_IGNORED); - fences[region].Release(); - } - if (iterator + size >= free_iterator) { - free_iterator = iterator + size; - } - if (iterator + size > STREAM_BUFFER_SIZE) { - for (size_t region = Region(used_iterator); region < NUM_SYNCS; ++region) { - fences[region].Create(); - } - used_iterator = 0; - iterator = 0; - free_iterator = size; - - for (size_t region = 0, region_end = Region(size); region <= region_end; ++region) { - glClientWaitSync(fences[region].handle, 0, GL_TIMEOUT_IGNORED); - fences[region].Release(); - } - } - const size_t offset = iterator; - iterator = Common::AlignUp(iterator + size, MAX_ALIGNMENT); - return {std::span(mapped_pointer + offset, size), offset}; -} - -} // namespace OpenGL diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index 1e0823836..ad87f3e80 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -451,19 +451,14 @@ OGLTexture MakeImage(const VideoCommon::ImageInfo& info, GLenum gl_internal_form return is_srgb ? GL_SRGB8_ALPHA8 : GL_RGBA8; } } - } // Anonymous namespace -ImageBufferMap::~ImageBufferMap() { - if (sync) { - sync->Create(); - } -} - TextureCacheRuntime::TextureCacheRuntime(const Device& device_, ProgramManager& program_manager, - StateTracker& state_tracker_) - : device{device_}, state_tracker{state_tracker_}, util_shaders(program_manager), - format_conversion_pass{util_shaders}, resolution{Settings::values.resolution_info} { + StateTracker& state_tracker_, + StagingBufferPool& staging_buffer_pool_) + : device{device_}, state_tracker{state_tracker_}, staging_buffer_pool{staging_buffer_pool_}, + util_shaders(program_manager), format_conversion_pass{util_shaders}, + resolution{Settings::values.resolution_info} { static constexpr std::array TARGETS{GL_TEXTURE_1D_ARRAY, GL_TEXTURE_2D_ARRAY, GL_TEXTURE_3D}; for (size_t i = 0; i < TARGETS.size(); ++i) { const GLenum target = TARGETS[i]; @@ -553,12 +548,12 @@ void TextureCacheRuntime::Finish() { glFinish(); } -ImageBufferMap TextureCacheRuntime::UploadStagingBuffer(size_t size) { - return upload_buffers.RequestMap(size, true); +StagingBufferMap TextureCacheRuntime::UploadStagingBuffer(size_t size) { + return staging_buffer_pool.RequestUploadBuffer(size); } -ImageBufferMap TextureCacheRuntime::DownloadStagingBuffer(size_t size) { - return download_buffers.RequestMap(size, false); +StagingBufferMap TextureCacheRuntime::DownloadStagingBuffer(size_t size) { + return staging_buffer_pool.RequestDownloadBuffer(size); } u64 TextureCacheRuntime::GetDeviceMemoryUsage() const { @@ -643,7 +638,7 @@ void TextureCacheRuntime::BlitFramebuffer(Framebuffer* dst, Framebuffer* src, is_linear ? GL_LINEAR : GL_NEAREST); } -void TextureCacheRuntime::AccelerateImageUpload(Image& image, const ImageBufferMap& map, +void TextureCacheRuntime::AccelerateImageUpload(Image& image, const StagingBufferMap& map, std::span swizzles) { switch (image.info.type) { case ImageType::e2D: @@ -685,64 +680,6 @@ bool TextureCacheRuntime::HasNativeASTC() const noexcept { return device.HasASTC(); } -TextureCacheRuntime::StagingBuffers::StagingBuffers(GLenum storage_flags_, GLenum map_flags_) - : storage_flags{storage_flags_}, map_flags{map_flags_} {} - -TextureCacheRuntime::StagingBuffers::~StagingBuffers() = default; - -ImageBufferMap TextureCacheRuntime::StagingBuffers::RequestMap(size_t requested_size, - bool insert_fence) { - const size_t index = RequestBuffer(requested_size); - OGLSync* const sync = insert_fence ? &syncs[index] : nullptr; - return ImageBufferMap{ - .mapped_span = std::span(maps[index], requested_size), - .sync = sync, - .buffer = buffers[index].handle, - }; -} - -size_t TextureCacheRuntime::StagingBuffers::RequestBuffer(size_t requested_size) { - if (const std::optional index = FindBuffer(requested_size); index) { - return *index; - } - - OGLBuffer& buffer = buffers.emplace_back(); - buffer.Create(); - glNamedBufferStorage(buffer.handle, requested_size, nullptr, - storage_flags | GL_MAP_PERSISTENT_BIT); - maps.push_back(static_cast(glMapNamedBufferRange(buffer.handle, 0, requested_size, - map_flags | GL_MAP_PERSISTENT_BIT))); - - syncs.emplace_back(); - sizes.push_back(requested_size); - - ASSERT(syncs.size() == buffers.size() && buffers.size() == maps.size() && - maps.size() == sizes.size()); - - return buffers.size() - 1; -} - -std::optional TextureCacheRuntime::StagingBuffers::FindBuffer(size_t requested_size) { - size_t smallest_buffer = std::numeric_limits::max(); - std::optional found; - const size_t num_buffers = sizes.size(); - for (size_t index = 0; index < num_buffers; ++index) { - const size_t buffer_size = sizes[index]; - if (buffer_size < requested_size || buffer_size >= smallest_buffer) { - continue; - } - if (syncs[index].handle != 0) { - if (!syncs[index].IsSignaled()) { - continue; - } - syncs[index].Release(); - } - smallest_buffer = buffer_size; - found = index; - } - return found; -} - Image::Image(TextureCacheRuntime& runtime_, const VideoCommon::ImageInfo& info_, GPUVAddr gpu_addr_, VAddr cpu_addr_) : VideoCommon::ImageBase(info_, gpu_addr_, cpu_addr_), runtime{&runtime_} { @@ -818,7 +755,7 @@ void Image::UploadMemory(GLuint buffer_handle, size_t buffer_offset, } } -void Image::UploadMemory(const ImageBufferMap& map, +void Image::UploadMemory(const StagingBufferMap& map, std::span copies) { UploadMemory(map.buffer, map.offset, copies); } @@ -865,7 +802,7 @@ void Image::DownloadMemory(std::span buffer_handles, std::span b } } -void Image::DownloadMemory(ImageBufferMap& map, +void Image::DownloadMemory(StagingBufferMap& map, std::span copies) { DownloadMemory(map.buffer, map.offset, copies); } diff --git a/src/video_core/renderer_opengl/gl_texture_cache.h b/src/video_core/renderer_opengl/gl_texture_cache.h index 3e9b3302b..1148b73d7 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.h +++ b/src/video_core/renderer_opengl/gl_texture_cache.h @@ -11,6 +11,7 @@ #include "shader_recompiler/shader_info.h" #include "video_core/renderer_opengl/gl_device.h" #include "video_core/renderer_opengl/gl_resource_manager.h" +#include "video_core/renderer_opengl/gl_staging_buffer_pool.h" #include "video_core/renderer_opengl/util_shaders.h" #include "video_core/texture_cache/image_view_base.h" #include "video_core/texture_cache/texture_cache_base.h" @@ -37,15 +38,6 @@ using VideoCommon::Region2D; using VideoCommon::RenderTargets; using VideoCommon::SlotVector; -struct ImageBufferMap { - ~ImageBufferMap(); - - std::span mapped_span; - size_t offset = 0; - OGLSync* sync; - GLuint buffer; -}; - struct FormatProperties { GLenum compatibility_class; bool compatibility_by_size; @@ -74,14 +66,15 @@ class TextureCacheRuntime { public: explicit TextureCacheRuntime(const Device& device, ProgramManager& program_manager, - StateTracker& state_tracker); + StateTracker& state_tracker, + StagingBufferPool& staging_buffer_pool); ~TextureCacheRuntime(); void Finish(); - ImageBufferMap UploadStagingBuffer(size_t size); + StagingBufferMap UploadStagingBuffer(size_t size); - ImageBufferMap DownloadStagingBuffer(size_t size); + StagingBufferMap DownloadStagingBuffer(size_t size); u64 GetDeviceLocalMemory() const { return device_access_memory; @@ -120,7 +113,7 @@ public: const Region2D& src_region, Tegra::Engines::Fermi2D::Filter filter, Tegra::Engines::Fermi2D::Operation operation); - void AccelerateImageUpload(Image& image, const ImageBufferMap& map, + void AccelerateImageUpload(Image& image, const StagingBufferMap& map, std::span swizzles); void InsertUploadMemoryBarrier(); @@ -149,35 +142,16 @@ public: } private: - struct StagingBuffers { - explicit StagingBuffers(GLenum storage_flags_, GLenum map_flags_); - ~StagingBuffers(); - - ImageBufferMap RequestMap(size_t requested_size, bool insert_fence); - - size_t RequestBuffer(size_t requested_size); - - std::optional FindBuffer(size_t requested_size); - - std::vector syncs; - std::vector buffers; - std::vector maps; - std::vector sizes; - GLenum storage_flags; - GLenum map_flags; - }; - const Device& device; StateTracker& state_tracker; + StagingBufferPool& staging_buffer_pool; + UtilShaders util_shaders; FormatConversionPass format_conversion_pass; std::array, 3> format_properties; bool has_broken_texture_view_formats = false; - StagingBuffers upload_buffers{GL_MAP_WRITE_BIT, GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT}; - StagingBuffers download_buffers{GL_MAP_READ_BIT | GL_CLIENT_STORAGE_BIT, GL_MAP_READ_BIT}; - OGLTexture null_image_1d_array; OGLTexture null_image_cube_array; OGLTexture null_image_3d; @@ -213,7 +187,7 @@ public: void UploadMemory(GLuint buffer_handle, size_t buffer_offset, std::span copies); - void UploadMemory(const ImageBufferMap& map, + void UploadMemory(const StagingBufferMap& map, std::span copies); void DownloadMemory(GLuint buffer_handle, size_t buffer_offset, @@ -222,7 +196,8 @@ public: void DownloadMemory(std::span buffer_handle, std::span buffer_offset, std::span copies); - void DownloadMemory(ImageBufferMap& map, std::span copies); + void DownloadMemory(StagingBufferMap& map, + std::span copies); GLuint StorageHandle() noexcept; diff --git a/src/video_core/renderer_opengl/util_shaders.cpp b/src/video_core/renderer_opengl/util_shaders.cpp index 2c7ac210b..544982d18 100644 --- a/src/video_core/renderer_opengl/util_shaders.cpp +++ b/src/video_core/renderer_opengl/util_shaders.cpp @@ -19,6 +19,7 @@ #include "video_core/host_shaders/pitch_unswizzle_comp.h" #include "video_core/renderer_opengl/gl_shader_manager.h" #include "video_core/renderer_opengl/gl_shader_util.h" +#include "video_core/renderer_opengl/gl_staging_buffer_pool.h" #include "video_core/renderer_opengl/gl_texture_cache.h" #include "video_core/renderer_opengl/util_shaders.h" #include "video_core/texture_cache/accelerated_swizzle.h" @@ -63,7 +64,7 @@ UtilShaders::UtilShaders(ProgramManager& program_manager_) UtilShaders::~UtilShaders() = default; -void UtilShaders::ASTCDecode(Image& image, const ImageBufferMap& map, +void UtilShaders::ASTCDecode(Image& image, const StagingBufferMap& map, std::span swizzles) { static constexpr GLuint BINDING_INPUT_BUFFER = 0; static constexpr GLuint BINDING_OUTPUT_IMAGE = 0; @@ -111,7 +112,7 @@ void UtilShaders::ASTCDecode(Image& image, const ImageBufferMap& map, program_manager.RestoreGuestCompute(); } -void UtilShaders::BlockLinearUpload2D(Image& image, const ImageBufferMap& map, +void UtilShaders::BlockLinearUpload2D(Image& image, const StagingBufferMap& map, std::span swizzles) { static constexpr Extent3D WORKGROUP_SIZE{32, 32, 1}; static constexpr GLuint BINDING_SWIZZLE_BUFFER = 0; @@ -148,7 +149,7 @@ void UtilShaders::BlockLinearUpload2D(Image& image, const ImageBufferMap& map, program_manager.RestoreGuestCompute(); } -void UtilShaders::BlockLinearUpload3D(Image& image, const ImageBufferMap& map, +void UtilShaders::BlockLinearUpload3D(Image& image, const StagingBufferMap& map, std::span swizzles) { static constexpr Extent3D WORKGROUP_SIZE{16, 8, 8}; @@ -189,7 +190,7 @@ void UtilShaders::BlockLinearUpload3D(Image& image, const ImageBufferMap& map, program_manager.RestoreGuestCompute(); } -void UtilShaders::PitchUpload(Image& image, const ImageBufferMap& map, +void UtilShaders::PitchUpload(Image& image, const StagingBufferMap& map, std::span swizzles) { static constexpr Extent3D WORKGROUP_SIZE{32, 32, 1}; static constexpr GLuint BINDING_INPUT_BUFFER = 0; diff --git a/src/video_core/renderer_opengl/util_shaders.h b/src/video_core/renderer_opengl/util_shaders.h index 9013808e7..feecd404c 100644 --- a/src/video_core/renderer_opengl/util_shaders.h +++ b/src/video_core/renderer_opengl/util_shaders.h @@ -16,23 +16,23 @@ namespace OpenGL { class Image; class ProgramManager; -struct ImageBufferMap; +struct StagingBufferMap; class UtilShaders { public: explicit UtilShaders(ProgramManager& program_manager); ~UtilShaders(); - void ASTCDecode(Image& image, const ImageBufferMap& map, + void ASTCDecode(Image& image, const StagingBufferMap& map, std::span swizzles); - void BlockLinearUpload2D(Image& image, const ImageBufferMap& map, + void BlockLinearUpload2D(Image& image, const StagingBufferMap& map, std::span swizzles); - void BlockLinearUpload3D(Image& image, const ImageBufferMap& map, + void BlockLinearUpload3D(Image& image, const StagingBufferMap& map, std::span swizzles); - void PitchUpload(Image& image, const ImageBufferMap& map, + void PitchUpload(Image& image, const StagingBufferMap& map, std::span swizzles); void CopyBC4(Image& dst_image, Image& src_image, diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.h b/src/video_core/renderer_vulkan/vk_buffer_cache.h index 5e9602905..b1f3c071f 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.h +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h @@ -157,6 +157,7 @@ struct BufferCacheParams { static constexpr bool USE_MEMORY_MAPS = true; static constexpr bool SEPARATE_IMAGE_BUFFER_BINDINGS = false; static constexpr bool IMPLEMENTS_ASYNC_DOWNLOADS = true; + static constexpr bool USE_MEMORY_MAPS_FOR_UPLOADS = true; }; using BufferCache = VideoCommon::BufferCache; From cb0a41090705f974d5bec009c571344bf72aa375 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Sat, 27 May 2023 22:04:16 -0400 Subject: [PATCH 0428/1181] gl_staging_buffers: Optimization to reduce fence waiting --- .../gl_staging_buffer_pool.cpp | 24 +++++++++++++++---- .../renderer_opengl/gl_staging_buffer_pool.h | 2 ++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_staging_buffer_pool.cpp b/src/video_core/renderer_opengl/gl_staging_buffer_pool.cpp index 72b1dbb32..bbb06e51f 100644 --- a/src/video_core/renderer_opengl/gl_staging_buffer_pool.cpp +++ b/src/video_core/renderer_opengl/gl_staging_buffer_pool.cpp @@ -9,8 +9,12 @@ #include "common/alignment.h" #include "common/assert.h" +#include "common/bit_util.h" +#include "common/microprofile.h" #include "video_core/renderer_opengl/gl_staging_buffer_pool.h" +MICROPROFILE_DEFINE(OpenGL_BufferRequest, "OpenGL", "BufferRequest", MP_RGB(128, 128, 192)); + namespace OpenGL { StagingBufferMap::~StagingBufferMap() { @@ -25,8 +29,11 @@ StagingBuffers::StagingBuffers(GLenum storage_flags_, GLenum map_flags_) StagingBuffers::~StagingBuffers() = default; StagingBufferMap StagingBuffers::RequestMap(size_t requested_size, bool insert_fence) { + MICROPROFILE_SCOPE(OpenGL_BufferRequest); + const size_t index = RequestBuffer(requested_size); OGLSync* const sync = insert_fence ? &syncs[index] : nullptr; + sync_indices[index] = insert_fence ? ++current_sync_index : 0; return StagingBufferMap{ .mapped_span = std::span(maps[index], requested_size), .sync = sync, @@ -41,13 +48,14 @@ size_t StagingBuffers::RequestBuffer(size_t requested_size) { OGLBuffer& buffer = buffers.emplace_back(); buffer.Create(); - glNamedBufferStorage(buffer.handle, requested_size, nullptr, + const auto next_pow2_size = Common::NextPow2(requested_size); + glNamedBufferStorage(buffer.handle, next_pow2_size, nullptr, storage_flags | GL_MAP_PERSISTENT_BIT); - maps.push_back(static_cast(glMapNamedBufferRange(buffer.handle, 0, requested_size, + maps.push_back(static_cast(glMapNamedBufferRange(buffer.handle, 0, next_pow2_size, map_flags | GL_MAP_PERSISTENT_BIT))); - syncs.emplace_back(); - sizes.push_back(requested_size); + sync_indices.emplace_back(); + sizes.push_back(next_pow2_size); ASSERT(syncs.size() == buffers.size() && buffers.size() == maps.size() && maps.size() == sizes.size()); @@ -56,6 +64,7 @@ size_t StagingBuffers::RequestBuffer(size_t requested_size) { } std::optional StagingBuffers::FindBuffer(size_t requested_size) { + size_t known_unsignaled_index = current_sync_index + 1; size_t smallest_buffer = std::numeric_limits::max(); std::optional found; const size_t num_buffers = sizes.size(); @@ -65,7 +74,14 @@ std::optional StagingBuffers::FindBuffer(size_t requested_size) { continue; } if (syncs[index].handle != 0) { + if (sync_indices[index] >= known_unsignaled_index) { + // This fence is later than a fence that is known to not be signaled + continue; + } if (!syncs[index].IsSignaled()) { + // Since this fence hasn't been signaled, it's safe to assume all later + // fences haven't been signaled either + known_unsignaled_index = std::min(known_unsignaled_index, sync_indices[index]); continue; } syncs[index].Release(); diff --git a/src/video_core/renderer_opengl/gl_staging_buffer_pool.h b/src/video_core/renderer_opengl/gl_staging_buffer_pool.h index 2c467be3d..60f72d3a0 100644 --- a/src/video_core/renderer_opengl/gl_staging_buffer_pool.h +++ b/src/video_core/renderer_opengl/gl_staging_buffer_pool.h @@ -42,8 +42,10 @@ struct StagingBuffers { std::vector buffers; std::vector maps; std::vector sizes; + std::vector sync_indices; GLenum storage_flags; GLenum map_flags; + size_t current_sync_index = 0; }; class StreamBuffer { From ea2e155b0b95620e1cc9cc7112315f0cc80b6343 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Sun, 28 May 2023 13:14:51 -0400 Subject: [PATCH 0429/1181] gl_texture_cache: Fix ASTC CPU decoding with compression disabled gl_format was incorrectly being overwritten when compression was disabled --- src/video_core/renderer_opengl/gl_texture_cache.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index 1e0823836..56d0ff869 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -439,6 +439,11 @@ OGLTexture MakeImage(const VideoCommon::ImageInfo& info, GLenum gl_internal_form return GL_R32UI; } +[[nodiscard]] bool IsAstcRecompressionEnabled() { + return Settings::values.astc_recompression.GetValue() != + Settings::AstcRecompression::Uncompressed; +} + [[nodiscard]] GLenum SelectAstcFormat(PixelFormat format, bool is_srgb) { switch (Settings::values.astc_recompression.GetValue()) { case Settings::AstcRecompression::Bc1: @@ -760,7 +765,7 @@ Image::Image(TextureCacheRuntime& runtime_, const VideoCommon::ImageInfo& info_, gl_format = GL_RGBA; gl_type = GL_UNSIGNED_INT_8_8_8_8_REV; - if (IsPixelFormatASTC(info.format)) { + if (IsPixelFormatASTC(info.format) && IsAstcRecompressionEnabled()) { gl_internal_format = SelectAstcFormat(info.format, is_srgb); gl_format = GL_NONE; } @@ -1155,7 +1160,7 @@ ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::ImageViewI const bool is_srgb = IsPixelFormatSRGB(info.format); internal_format = is_srgb ? GL_SRGB8_ALPHA8 : GL_RGBA8; - if (IsPixelFormatASTC(info.format)) { + if (IsPixelFormatASTC(info.format) && IsAstcRecompressionEnabled()) { internal_format = SelectAstcFormat(info.format, is_srgb); } } else { From 9950a388d23b69cd86bed5306a0c6b99d7c751cb Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sun, 28 May 2023 15:00:05 -0400 Subject: [PATCH 0430/1181] externals: Update to fmt 10 and add format_as formatter for BitField Implicit conversions are now disallowed in fmt 10. Use format_as to convert to the underlying type. --- CMakeLists.txt | 2 +- externals/vcpkg | 2 +- src/common/bit_field.h | 5 +++++ vcpkg.json | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7276ac9dd..7e8f35a4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,7 +212,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) # Enforce the search mode of non-required packages for better and shorter failure messages find_package(Boost 1.79.0 REQUIRED context) find_package(enet 1.3 MODULE) -find_package(fmt 9 REQUIRED) +find_package(fmt 10 REQUIRED) find_package(inih 52 MODULE COMPONENTS INIReader) find_package(LLVM MODULE COMPONENTS Demangle) find_package(lz4 REQUIRED) diff --git a/externals/vcpkg b/externals/vcpkg index a7b6122f6..656fcc6ab 160000 --- a/externals/vcpkg +++ b/externals/vcpkg @@ -1 +1 @@ -Subproject commit a7b6122f6b6504d16d96117336a0562693579933 +Subproject commit 656fcc6ab2b05c6d999b7eaca717027ac3738f71 diff --git a/src/common/bit_field.h b/src/common/bit_field.h index e4e58ea45..0168ff9cb 100644 --- a/src/common/bit_field.h +++ b/src/common/bit_field.h @@ -188,3 +188,8 @@ private: template using BitFieldBE = BitField; + +template +inline auto format_as(BitField bitfield) { + return bitfield.Value(); +} diff --git a/vcpkg.json b/vcpkg.json index 19f99e89e..26f545c6c 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "yuzu", - "builtin-baseline": "acc3bcf76b84ae5041c86ab55fe138ae7b8255c7", + "builtin-baseline": "656fcc6ab2b05c6d999b7eaca717027ac3738f71", "version": "1.0", "dependencies": [ "boost-algorithm", @@ -53,7 +53,7 @@ }, { "name": "fmt", - "version": "9.0.0" + "version": "10.0.0" } ] } From 124dd86820278f8b0870280703ba2224e75d9c4d Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sun, 28 May 2023 15:20:35 -0400 Subject: [PATCH 0431/1181] CMakeLists: Rollback minimum to fmt 9 The mingw fmt package https://aur.archlinux.org/packages/mingw-w64-fmt has not been updated yet. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e8f35a4b..7276ac9dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,7 +212,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) # Enforce the search mode of non-required packages for better and shorter failure messages find_package(Boost 1.79.0 REQUIRED context) find_package(enet 1.3 MODULE) -find_package(fmt 10 REQUIRED) +find_package(fmt 9 REQUIRED) find_package(inih 52 MODULE COMPONENTS INIReader) find_package(LLVM MODULE COMPONENTS Demangle) find_package(lz4 REQUIRED) From e5be1835ab8321d1130a502cf49b5133d9b88849 Mon Sep 17 00:00:00 2001 From: german77 Date: Sun, 28 May 2023 10:14:41 -0600 Subject: [PATCH 0432/1181] yuzu: Disable game list while game is running --- src/yuzu/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 25cfef6d5..5b338c6e5 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1798,6 +1798,7 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t } system->SetShuttingDown(false); + game_list->setDisabled(true); // Create and start the emulation thread emu_thread = std::make_unique(*system); @@ -1993,6 +1994,9 @@ void GMainWindow::OnEmulationStopped() { // When closing the game, destroy the GLWindow to clear the context after the game is closed render_window->ReleaseRenderTarget(); + // Enable game list + game_list->setEnabled(true); + Settings::RestoreGlobalState(system->IsPoweredOn()); system->HIDCore().ReloadInputDevices(); UpdateStatusButtons(); From f78f82e08dcd49c2bed90daab0e494010e0084f5 Mon Sep 17 00:00:00 2001 From: 12101111 Date: Tue, 30 May 2023 16:59:06 +0800 Subject: [PATCH 0433/1181] input_common: rename PAGE_SIZE to avoid conflict See also: https://github.com/yuzu-emu/yuzu/issues/8779 --- src/input_common/helpers/joycon_protocol/nfc.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/input_common/helpers/joycon_protocol/nfc.cpp b/src/input_common/helpers/joycon_protocol/nfc.cpp index 3b7a628e5..f7058c4a7 100644 --- a/src/input_common/helpers/joycon_protocol/nfc.cpp +++ b/src/input_common/helpers/joycon_protocol/nfc.cpp @@ -528,9 +528,9 @@ NFCWritePackage NfcProtocol::MakeAmiiboWritePackage(const TagUUID& tag_uuid, } NFCDataChunk NfcProtocol::MakeAmiiboChunk(u8 page, u8 size, std::span data) const { - constexpr u8 PAGE_SIZE = 4; + constexpr u8 NFC_PAGE_SIZE = 4; - if (static_cast(page * PAGE_SIZE) + size >= data.size()) { + if (static_cast(page * NFC_PAGE_SIZE) + size >= data.size()) { return {}; } @@ -539,7 +539,7 @@ NFCDataChunk NfcProtocol::MakeAmiiboChunk(u8 page, u8 size, std::span .data_size = size, .data = {}, }; - std::memcpy(chunk.data.data(), data.data() + (page * PAGE_SIZE), size); + std::memcpy(chunk.data.data(), data.data() + (page * NFC_PAGE_SIZE), size); return chunk; } From 661375a222399f6b731362c849417a82a17531ee Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Tue, 30 May 2023 21:57:13 +0100 Subject: [PATCH 0434/1181] Skip BufferCache tickframe with no channel state set --- src/video_core/buffer_cache/buffer_cache.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index c336be707..427afd5fc 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -63,8 +63,12 @@ void BufferCache

::RunGarbageCollector() { template void BufferCache

::TickFrame() { - // Calculate hits and shots and move hit bits to the right + // Homebrew console apps don't create or bind any channels, so this will be nullptr. + if (!channel_state) { + return; + } + // Calculate hits and shots and move hit bits to the right const u32 hits = std::reduce(channel_state->uniform_cache_hits.begin(), channel_state->uniform_cache_hits.end()); const u32 shots = std::reduce(channel_state->uniform_cache_shots.begin(), From 9a1c64264dd223b083675d47f4a94fa640fc7f97 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Wed, 31 May 2023 03:59:46 +0000 Subject: [PATCH 0435/1181] CopyFFmpegDeps: Update variable name FFmpeg_DLL_DIR does not exist anywhere else in the repository. Evidently, the variable name was antiquated at some point, but it continued to work here as a zombie. Update the name and avoid copy issues. --- CMakeModules/CopyYuzuFFmpegDeps.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeModules/CopyYuzuFFmpegDeps.cmake b/CMakeModules/CopyYuzuFFmpegDeps.cmake index 7aaa073ee..e50696cc0 100644 --- a/CMakeModules/CopyYuzuFFmpegDeps.cmake +++ b/CMakeModules/CopyYuzuFFmpegDeps.cmake @@ -6,5 +6,5 @@ function(copy_yuzu_FFmpeg_deps target_dir) set(DLL_DEST "$/") file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS) string(STRIP "${FFmpeg_REQUIRED_DLLS}" FFmpeg_REQUIRED_DLLS) - windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS}) + windows_copy_files(${target_dir} ${FFmpeg_LIBRARY_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS}) endfunction(copy_yuzu_FFmpeg_deps) From 6839341f17326ad932565e7c1a5a07e3d3020da2 Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Wed, 31 May 2023 19:10:00 +0100 Subject: [PATCH 0436/1181] Fix incorrect id check and potential out of bounds lookup --- src/core/hle/service/nvdrv/core/syncpoint_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp b/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp index aba51d280..c4c4c2593 100644 --- a/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp +++ b/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp @@ -64,7 +64,7 @@ void SyncpointManager::FreeSyncpoint(u32 id) { } bool SyncpointManager::IsSyncpointAllocated(u32 id) const { - return (id <= SyncpointCount) && syncpoints[id].reserved; + return (id < SyncpointCount) && syncpoints[id].reserved; } bool SyncpointManager::HasSyncpointExpired(u32 id, u32 threshold) const { From 96a9032d6dc033c31ff1cd113e444aaf4a558a2c Mon Sep 17 00:00:00 2001 From: The yuzu Community Date: Thu, 1 Jun 2023 03:01:52 +0000 Subject: [PATCH 0437/1181] Update translations (2023-06-01) --- dist/languages/ca.ts | 1283 ++++++++++++---------- dist/languages/cs.ts | 1283 ++++++++++++---------- dist/languages/da.ts | 1283 ++++++++++++---------- dist/languages/de.ts | 1396 +++++++++++++----------- dist/languages/el.ts | 1349 ++++++++++++----------- dist/languages/es.ts | 1293 ++++++++++++---------- dist/languages/fr.ts | 1271 ++++++++++++---------- dist/languages/id.ts | 1285 ++++++++++++---------- dist/languages/it.ts | 1267 ++++++++++++---------- dist/languages/ja_JP.ts | 1331 ++++++++++++----------- dist/languages/ko_KR.ts | 1332 ++++++++++++----------- dist/languages/nb.ts | 2286 +++++++++++++++++++++------------------ dist/languages/nl.ts | 1275 ++++++++++++---------- dist/languages/pl.ts | 1284 ++++++++++++---------- dist/languages/pt_BR.ts | 1267 ++++++++++++---------- dist/languages/pt_PT.ts | 1267 ++++++++++++---------- dist/languages/ru_RU.ts | 1273 ++++++++++++---------- dist/languages/sv.ts | 1283 ++++++++++++---------- dist/languages/tr_TR.ts | 1679 ++++++++++++++-------------- dist/languages/uk.ts | 1486 +++++++++++++------------ dist/languages/vi.ts | 2069 ++++++++++++++++++++--------------- dist/languages/vi_VN.ts | 2069 ++++++++++++++++++++--------------- dist/languages/zh_CN.ts | 1273 ++++++++++++---------- dist/languages/zh_TW.ts | 1293 ++++++++++++---------- 24 files changed, 18565 insertions(+), 15612 deletions(-) diff --git a/dist/languages/ca.ts b/dist/languages/ca.ts index 6978a4536..7964da0d2 100644 --- a/dist/languages/ca.ts +++ b/dist/languages/ca.ts @@ -1126,78 +1126,78 @@ This would ban both their forum username and their IP address. Configuració de yuzu - - + + Audio Àudio - - + + CPU CPU - + Debug Depuració - + Filesystem Sistema de fitxers - - + + General General - - + + Graphics Gràfics - + GraphicsAdvanced GràficsAvançat - + Hotkeys Tecles d'accés ràpid - - + + Controls Controls - + Profiles Perfils - + Network Xarxa - - + + System Sistema - + Game List Llista de jocs - + Web Web @@ -1372,41 +1372,36 @@ This would ban both their forum username and their IP address. - Extended memory layout (8GB DRAM) - - - - Confirm exit while emulation is running Confirmar la sortida mentre s'està executant l'emulació - + Prompt for user on game boot Sol·licitar l'usuari en l'arrencada del joc - + Pause emulation when in background Pausa l'emulació quan la finestra està en segon pla - + Hide mouse on inactivity Ocultar el cursor del ratolí en cas d'inactivitat - + Reset All Settings Reiniciar tots els paràmetres - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Això restablirà tota la configuració i eliminarà totes les configuracions dels jocs. No eliminarà ni els directoris de jocs, ni els perfils, ni els perfils dels controladors. Procedir? @@ -1445,7 +1440,7 @@ This would ban both their forum username and their IP address. - + None Cap @@ -1471,231 +1466,269 @@ This would ban both their forum username and their IP address. + VSync Mode: + + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: Emulació NVDEC: - + No Video Output Sense sortida de vídeo - + CPU Video Decoding Descodificació de vídeo a la CPU - + GPU Video Decoding (Default) Descodificació de vídeo a la GPU (Valor Predeterminat) - + Fullscreen Mode: Mode pantalla completa: - + Borderless Windowed Finestra sense vores - + Exclusive Fullscreen Pantalla completa exclusiva - + Aspect Ratio: Relació d'aspecte: - + Default (16:9) Valor predeterminat (16:9) - + Force 4:3 Forçar 4:3 - + Force 21:9 Forçar 21:9 - + Force 16:10 - + Stretch to Window Estirar a la finestra - + Resolution: Resolució: - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [EXPERIMENTAL] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [EXPERIMENTAL] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) - + 8X (5760p/8640p) - + Window Adapting Filter: Filtre d'adaptació de finestra: - + Nearest Neighbor Veí més proper - + Bilinear Bilineal - + Bicubic Bicúbic - + Gaussian Gaussià - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: Mètode d'anti-aliasing - + FXAA FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Utilitza un color de fons global - + Set background color: Configura un color de fons: - + Background Color: Color de fons: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (Assembly Shaders, només NVIDIA) - + SPIR-V (Experimental, Mesa Only) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + + + + + VSync Off + + + + + Recommended + + + + + On + + + + + VSync On + + ConfigureGraphicsAdvanced @@ -1720,107 +1753,133 @@ This would ban both their forum username and their IP address. Nivell de precisió: - - Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - - - - - Force maximum clocks (Vulkan only) - - - - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync evita que la pantalla s'esquinci, però algunes tarjetes gràfiques tenen un rendiment menor amb VSync actiu. Mantén-lo actiu si no notes una diferència de rendiment. - - - - Use VSync - - - - - Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + ASTC recompression: + Uncompressed (Best quality) + + + + + BC1 (Low quality) + + + + + BC3 (Medium quality) + + + + + Enable asynchronous presentation (Vulkan only) + + + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + + + + + Force maximum clocks (Vulkan only) + + + + + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + Decode ASTC textures asynchronously (Hack) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + + + + + Enable Reactive Flushing + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Activa la compilació asíncrona de shaders, el qual podria reduir el tartamudeig dels shaders. Aquesta funcionalitat és experimental. - + Use asynchronous shader building (Hack) Utilitzar la construcció de shaders asíncrona (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Habilita el temps ràpid de la GPU. Aquesta opció obligarà a la majoria dels jocs a executar-se a la seva resolució nativa més alta. - + Use Fast GPU Time (Hack) Utilitzar temps ràpid a la GPU (Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - - - - - Use pessimistic buffer flushes (Hack) - - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + + + + + Enable Compute Pipelines (Intel Vulkan only) + + + + Anisotropic Filtering: Filtrat anisotròpic: - + Automatic Automàtic - + Default Valor predeterminat - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1853,70 +1912,65 @@ This would ban both their forum username and their IP address. Restaurar els valors predeterminats - + Action Acció - + Hotkey Tecla d'accés ràpid - + Controller Hotkey Tecla d'accés ràpid del controlador - - - + + + Conflicting Key Sequence Seqüència de tecles en conflicte - - + + The entered key sequence is already assigned to: %1 La seqüència de tecles introduïda ja ha estat assignada a: %1 - - Home+%1 - Inici+%1 - - - + [waiting] [esperant] - + Invalid Invàlid - + Restore Default Restaurar el valor predeterminat - + Clear Esborrar - + Conflicting Button Sequence Seqüència de botons en conflicte - + The default button sequence is already assigned to: %1 La seqüència de botons per defecte ja està assignada a: %1 - + The default key sequence is already assigned to: %1 La seqüència de tecles predeterminada ja ha estat assignada a: %1 @@ -2208,7 +2262,7 @@ This would ban both their forum username and their IP address. - + Configure Configurar @@ -2265,22 +2319,32 @@ This would ban both their forum username and their IP address. - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + + + + + Use random Amiibo ID + + + + Enable mouse panning Activar desplaçament del ratolí - + Mouse sensitivity Sensibilitat del ratolí - + % % - + Motion / Touch Moviment / Tàctil @@ -2392,7 +2456,7 @@ This would ban both their forum username and their IP address. - + Left Stick Palanca esquerra @@ -2486,14 +2550,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2512,7 +2576,7 @@ This would ban both their forum username and their IP address. - + Plus Més @@ -2525,15 +2589,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2590,241 +2654,247 @@ This would ban both their forum username and their IP address. - + Right Stick Palanca dreta - - - - + + + + Clear Esborrar - - - - - + + + + + [not set] [no establert] - - + + + Invert button Botó d'inversió - - + + Toggle button Botó commutador - + Turbo button - - + + Invert axis Invertir eixos - - - + + + Set threshold Configurar llindar - - + + Choose a value between 0% and 100% Esculli un valor entre 0% i 100% - + Toggle axis - + Set gyro threshold Configurar llindar giroscopi - + + Calibrate sensor + + + + Map Analog Stick Configuració de palanca analògica - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Després de prémer D'acord, primer moveu el joystick horitzontalment i després verticalment. Per invertir els eixos, primer moveu el joystick verticalment i després horitzontalment. - + Center axis Centrar eixos - - + + Deadzone: %1% Zona morta: %1% - - + + Modifier Range: %1% Rang del modificador: %1% - - + + Pro Controller Controlador Pro - + Dual Joycons Joycons duals - + Left Joycon Joycon esquerra - + Right Joycon Joycon dret - + Handheld Portàtil - + GameCube Controller Controlador de GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Controlador NES - + SNES Controller Controlador SNES - + N64 Controller Controlador N64 - + Sega Genesis Sega Genesis - + Start / Pause Inici / Pausa - + Z Z - + Control Stick Palanca de control - + C-Stick C-Stick - + Shake! Sacseja! - + [waiting] [esperant] - + New Profile Nou perfil - + Enter a profile name: Introdueixi un nom de perfil: - - + + Create Input Profile Crear perfil d'entrada - + The given profile name is not valid! El nom de perfil introduït no és vàlid! - + Failed to create the input profile "%1" Error al crear el perfil d'entrada "%1" - + Delete Input Profile Eliminar perfil d'entrada - + Failed to delete the input profile "%1" Error al eliminar el perfil d'entrada "%1" - + Load Input Profile Carregar perfil d'entrada - + Failed to load the input profile "%1" Error al carregar el perfil d'entrada "%1" - + Save Input Profile Guardar perfil d'entrada - + Failed to save the input profile "%1" Error al guardar el perfil d'entrada "%1" @@ -3079,47 +3149,47 @@ Per invertir els eixos, primer moveu el joystick verticalment i després horitzo Desenvolupador - + Add-Ons Complements - + General General - + System Sistema - + CPU CPU - + Graphics Gràfics - + Adv. Graphics Gràfics avanç. - + Audio Àudio - + Input Profiles - + Properties Propietats @@ -3839,7 +3909,12 @@ UUID: %2 - + + Unsafe extended memory layout (8GB DRAM) + + + + System settings are available only when game is not running. Els paràmetres del sistema només estan disponibles quan el joc no s'està executant. @@ -4535,555 +4610,560 @@ Arrossegui els punts per a canviar la posició, o faci doble clic a les cel·les GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Es recullen dades anònimes</a> per ajudar a millorar yuzu. <br/><br/>Desitja compartir les seves dades d'ús amb nosaltres? - + Telemetry Telemetria - + Broken Vulkan Installation Detected - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... Carregant Web applet... - - + + Disable Web Applet Desactivar el Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Desactivar l'Applet Web pot provocar comportaments indefinits i només hauria d'utilitzar-se amb Super Mario 3D All-Stars. Estàs segur de que vols desactivar l'Applet Web? (Això pot ser reactivat als paràmetres Debug.) - + The amount of shaders currently being built La quantitat de shaders que s'estan compilant actualment - + The current selected resolution scaling multiplier. El multiplicador d'escala de resolució seleccionat actualment. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Velocitat d'emulació actual. Valors superiors o inferiors a 100% indiquen que l'emulació s'està executant més ràpidament o més lentament que a la Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Quants fotogrames per segon està mostrant el joc actualment. Això variarà d'un joc a un altre i d'una escena a una altra. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Temps que costa emular un fotograma de la Switch, sense tenir en compte la limitació de fotogrames o la sincronització vertical. Per a una emulació òptima, aquest valor hauria de ser com a màxim de 16.67 ms. - + &Clear Recent Files &Esborrar arxius recents - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Continuar - + &Pause &Pausar - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu està executant un joc - + Warning Outdated Game Format Advertència format del joc desfasat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Està utilitzant el format de directori de ROM deconstruït per a aquest joc, que és un format desactualitzat que ha sigut reemplaçat per altres, com NCA, NAX, XCI o NSP. Els directoris de ROM deconstruïts careixen d'icones, metadades i suport d'actualitzacions.<br><br>Per a obtenir una explicació dels diversos formats de Switch que suporta yuzu,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>faci una ullada a la nostra wiki</a>. Aquest missatge no es tornarà a mostrar. - - + + Error while loading ROM! Error carregant la ROM! - + The ROM format is not supported. El format de la ROM no està suportat. - + An error occurred initializing the video core. S'ha produït un error inicialitzant el nucli de vídeo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu ha trobat un error mentre executava el nucli de vídeo. Això sol ser causat per controladors de la GPU obsolets, inclosos els integrats. Si us plau, consulti el registre per a més detalls. Per obtenir més informació sobre com accedir al registre, consulti la següent pàgina: <a href='https://yuzu-emu.org/help/reference/log-files/'>Com carregar el fitxer de registre</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Error al carregar la ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Si us plau, segueixi <a href='https://yuzu-emu.org/help/quickstart/'>la guia d'inici de yuzu</a> per a bolcar de nou els seus fitxers.<br>Pot consultar la wiki de yuzu wiki</a> o el Discord de yuzu</a> per obtenir ajuda. - + An unknown error occurred. Please see the log for more details. S'ha produït un error desconegut. Si us plau, consulti el registre per a més detalls. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Dades de partides guardades - + Mod Data Dades de mods - + Error Opening %1 Folder Error obrint la carpeta %1 - - + + Folder does not exist! La carpeta no existeix! - + Error Opening Transferable Shader Cache Error obrint la cache transferible de shaders - + Failed to create the shader cache directory for this title. No s'ha pogut crear el directori de la cache dels shaders per aquest títol. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Eliminar entrada - - - - - - + + + + + + Successfully Removed S'ha eliminat correctament - + Successfully removed the installed base game. S'ha eliminat correctament el joc base instal·lat. - + The base game is not installed in the NAND and cannot be removed. El joc base no està instal·lat a la NAND i no pot ser eliminat. - + Successfully removed the installed update. S'ha eliminat correctament l'actualització instal·lada. - + There is no update installed for this title. No hi ha cap actualització instal·lada per aquest títol. - + There are no DLC installed for this title. No hi ha cap DLC instal·lat per aquest títol. - + Successfully removed %1 installed DLC. S'ha eliminat correctament %1 DLC instal·lat/s. - + Delete OpenGL Transferable Shader Cache? Desitja eliminar la cache transferible de shaders d'OpenGL? - + Delete Vulkan Transferable Shader Cache? Desitja eliminar la cache transferible de shaders de Vulkan? - + Delete All Transferable Shader Caches? Desitja eliminar totes les caches transferibles de shaders? - + Remove Custom Game Configuration? Desitja eliminar la configuració personalitzada del joc? - + + Remove Cache Storage? + + + + Remove File Eliminar arxiu - - + + Error Removing Transferable Shader Cache Error eliminant la cache transferible de shaders - - + + A shader cache for this title does not exist. No existeix una cache de shaders per aquest títol. - + Successfully removed the transferable shader cache. S'ha eliminat correctament la cache transferible de shaders. - + Failed to remove the transferable shader cache. No s'ha pogut eliminar la cache transferible de shaders. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches Error al eliminar les caches de shaders transferibles - + Successfully removed the transferable shader caches. Caches de shaders transferibles eliminades correctament. - + Failed to remove the transferable shader cache directory. No s'ha pogut eliminar el directori de caches de shaders transferibles. - - + + Error Removing Custom Configuration Error eliminant la configuració personalitzada - + A custom configuration for this title does not exist. No existeix una configuració personalitzada per aquest joc. - + Successfully removed the custom game configuration. S'ha eliminat correctament la configuració personalitzada del joc. - + Failed to remove the custom game configuration. No s'ha pogut eliminar la configuració personalitzada del joc. - - + + RomFS Extraction Failed! La extracció de RomFS ha fallat! - + There was an error copying the RomFS files or the user cancelled the operation. S'ha produït un error copiant els arxius RomFS o l'usuari ha cancel·lat la operació. - + Full Completa - + Skeleton Esquelet - + Select RomFS Dump Mode Seleccioni el mode de bolcat de RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Si us plau, seleccioni la forma en que desitja bolcar la RomFS.<br>Completa copiarà tots els arxius al nou directori mentre que<br>esquelet només crearà l'estructura de directoris. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root No hi ha suficient espai lliure a %1 per extreure el RomFS. Si us plau, alliberi espai o esculli un altre directori de bolcat a Emulació > Configuració > Sistema > Sistema d'arxius > Carpeta arrel de bolcat - + Extracting RomFS... Extraient RomFS... - - + + Cancel Cancel·la - + RomFS Extraction Succeeded! Extracció de RomFS completada correctament! - + The operation completed successfully. L'operació s'ha completat correctament. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Error obrint %1 - + Select Directory Seleccionar directori - + Properties Propietats - + The game properties could not be loaded. Les propietats del joc no s'han pogut carregar. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Executable de Switch (%1);;Tots els Arxius (*.*) - + Load File Carregar arxiu - + Open Extracted ROM Directory Obrir el directori de la ROM extreta - + Invalid Directory Selected Directori seleccionat invàlid - + The directory you have selected does not contain a 'main' file. El directori que ha seleccionat no conté un arxiu 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Arxiu de Switch Instal·lable (*.nca *.nsp *.xci);;Arxiu de Continguts Nintendo (*.nca);;Paquet d'enviament Nintendo (*.nsp);;Imatge de Cartutx NX (*.xci) - + Install Files Instal·lar arxius - + %n file(s) remaining %n arxiu(s) restants%n arxiu(s) restants - + Installing file "%1"... Instal·lant arxiu "%1"... - - + + Install Results Resultats instal·lació - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Per evitar possibles conflictes, no recomanem als usuaris que instal·lin jocs base a la NAND. Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i DLCs. - + %n file(s) were newly installed %n nou(s) arxiu(s) s'ha(n) instal·lat @@ -5091,7 +5171,7 @@ Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i - + %n file(s) were overwritten %n arxiu(s) s'han sobreescrit @@ -5099,7 +5179,7 @@ Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i - + %n file(s) failed to install %n arxiu(s) no s'han instal·lat @@ -5107,388 +5187,388 @@ Si us plau, utilitzi aquesta funció només per a instal·lar actualitzacions i - + System Application Aplicació del sistema - + System Archive Arxiu del sistema - + System Application Update Actualització de l'aplicació del sistema - + Firmware Package (Type A) Paquet de firmware (Tipus A) - + Firmware Package (Type B) Paquet de firmware (Tipus B) - + Game Joc - + Game Update Actualització de joc - + Game DLC DLC del joc - + Delta Title Títol delta - + Select NCA Install Type... Seleccioni el tipus d'instal·lació NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Seleccioni el tipus de títol que desitja instal·lar aquest NCA com a: (En la majoria dels casos, el valor predeterminat 'Joc' està bé.) - + Failed to Install Ha fallat la instal·lació - + The title type you selected for the NCA is invalid. El tipus de títol seleccionat per el NCA és invàlid. - + File not found Arxiu no trobat - + File "%1" not found Arxiu "%1" no trobat - + OK D'acord - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Falta el compte de yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Per tal d'enviar un cas de prova de compatibilitat de joc, ha de vincular el seu compte de yuzu.<br><br/>Per a vincular el seu compte de yuzu, vagi a Emulació & gt; Configuració & gt; Web. - + Error opening URL Error obrint URL - + Unable to open the URL "%1". No es pot obrir la URL "%1". - + TAS Recording Gravació TAS - + Overwrite file of player 1? Sobreescriure l'arxiu del jugador 1? - + Invalid config detected Configuració invàlida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. El controlador del mode portàtil no es pot fer servir en el mode acoblat. Es seleccionarà el controlador Pro en el seu lloc. - - + + Amiibo Amiibo - - + + The current amiibo has been removed L'amiibo actual ha sigut eliminat - + Error Error - - + + The current game is not looking for amiibos El joc actual no està buscant amiibos - + Amiibo File (%1);; All Files (*.*) Arxiu Amiibo (%1);; Tots els Arxius (*.*) - + Load Amiibo Carregar Amiibo - + Error loading Amiibo data Error al carregar les dades d'Amiibo - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Captura de pantalla - + PNG Image (*.png) Imatge PNG (*.png) - + TAS state: Running %1/%2 Estat TAS: executant %1/%2 - + TAS state: Recording %1 Estat TAS: gravant %1 - + TAS state: Idle %1/%2 Estat TAS: inactiu %1/%2 - + TAS State: Invalid Estat TAS: invàlid - + &Stop Running &Parar l'execució - + &Start &Iniciar - + Stop R&ecording Parar g&ravació - + R&ecord G&ravar - + Building: %n shader(s) Construint: %n shader(s)Construint: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escala: %1x - + Speed: %1% / %2% Velocitat: %1% / %2% - + Speed: %1% Velocitat: %1% - + Game: %1 FPS (Unlocked) Joc: %1 FPS (desbloquejat) - + Game: %1 FPS Joc: %1 FPS - + Frame: %1 ms Fotograma: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR ERROR GPU - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST MÉS PROPER - - + + BILINEAR BILINEAL - + BICUBIC BICÚBIC - + GAUSSIAN GAUSSIÀ - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA SENSE AA - + FXAA FXAA - + SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation Confirmi la clau de rederivació - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5505,37 +5585,37 @@ i opcionalment faci còpies de seguretat. Això eliminarà els arxius de les claus generats automàticament i tornarà a executar el mòdul de derivació de claus. - + Missing fuses Falten fusibles - + - Missing BOOT0 - Falta BOOT0 - + - Missing BCPKG2-1-Normal-Main - Falta BCPKG2-1-Normal-Main - + - Missing PRODINFO - Falta PRODINFO - + Derivation Components Missing Falten components de derivació - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Falten les claus d'encriptació. <br>Si us plau, segueixi <a href='https://yuzu-emu.org/help/quickstart/'>la guia ràpida de yuzu</a> per a obtenir totes les seves claus, firmware i jocs.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5544,39 +5624,49 @@ Això pot prendre fins a un minut depenent del rendiment del seu sistema. - + Deriving Keys Derivant claus - + + System Archive Decryption Failed + + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target Seleccioni el destinatari per a bolcar el RomFS - + Please select which RomFS you would like to dump. Si us plau, seleccioni quin RomFS desitja bolcar. - + Are you sure you want to close yuzu? Està segur de que vol tancar yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Està segur de que vol aturar l'emulació? Qualsevol progrés no guardat es perdrà. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5588,44 +5678,44 @@ Desitja tancar-lo de totes maneres? GRenderWindow - - + + OpenGL not available! OpenGL no disponible! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu no ha estat compilat amb suport per OpenGL. + - Error while initializing OpenGL! Error al inicialitzar OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. La seva GPU no suporta OpenGL, o no té instal·lat els últims controladors gràfics. - + Error while initializing OpenGL 4.6! Error inicialitzant OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 La seva GPU no suporta OpenGL 4.6, o no té instal·lats els últims controladors gràfics.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 És possible que la seva GPU no suporti una o més extensions necessàries d'OpenGL. Si us plau, asseguris de tenir els últims controladors de la tarjeta gràfica.<br><br>GL Renderer:<br>%1<br><br>Extensions no suportades:<br>%2 @@ -5684,117 +5774,122 @@ Desitja tancar-lo de totes maneres? + Remove Cache Storage + + + + Remove OpenGL Pipeline Cache Eliminar cache de canonada d'OpenGL - + Remove Vulkan Pipeline Cache Eliminar cache de canonada de Vulkan - + Remove All Pipeline Caches Eliminar totes les caches de canonada - + Remove All Installed Contents Eliminar tots els continguts instal·lats - + Dump RomFS Bolcar RomFS - + Dump RomFS to SDMC Bolcar RomFS a SDMC - + Copy Title ID to Clipboard Copiar la ID del títol al porta-retalls - + Navigate to GameDB entry Navegar a l'entrada de GameDB - + Create Shortcut - + Add to Desktop - + Add to Applications Menu - + Properties Propietats - + Scan Subfolders Escanejar subdirectoris - + Remove Game Directory Eliminar directori de jocs - + ▲ Move Up ▲ Moure amunt - + ▼ Move Down ▼ Move avall - + Open Directory Location Obre ubicació del directori - + Clear Esborrar - + Name Nom - + Compatibility Compatibilitat - + Add-ons Complements - + File type Tipus d'arxiu - + Size Mida @@ -5865,7 +5960,7 @@ Desitja tancar-lo de totes maneres? GameListPlaceholder - + Double-click to add a new folder to the game list Faci doble clic per afegir un nou directori a la llista de jocs @@ -5878,12 +5973,12 @@ Desitja tancar-lo de totes maneres? %1 de %n resultat(s)%1 de %n resultat(s) - + Filter: Filtre: - + Enter pattern to filter Introdueixi patró per a filtrar @@ -5973,12 +6068,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute - @@ -6000,111 +6094,112 @@ Debug Message: + Main Window - + Audio Volume Down - + Audio Volume Up - + Capture Screenshot Captura de pantalla - + Change Adapting Filter - + Change Docked Mode - + Change GPU Accuracy - + Continue/Pause Emulation - + Exit Fullscreen - + Exit yuzu - + Fullscreen Pantalla Completa - + Load File Carregar arxiu - + Load/Remove Amiibo - + Restart Emulation - + Stop Emulation - + TAS Record - + TAS Reset - + TAS Start/Stop - + Toggle Filter Bar - + Toggle Framerate Limit - + Toggle Mouse Panning - + Toggle Status Bar @@ -6793,7 +6888,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE INICI/PAUSAR @@ -6843,21 +6938,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6865,8 +6960,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [no establert] @@ -6881,10 +6976,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Eix %1%2 @@ -6898,163 +6993,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [desconegut] - - + + Left Esquerra - - + + Right Dreta - - + + Down Avall - - + + Up Amunt - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Inici - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle Cercle - + Cross Creu - + Square Cuadrat - + Triangle Triangle - + Share Compartir - + Options Opcions - + [undefined] [indefinit] @@ -7065,7 +7160,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [invàlid] @@ -7079,21 +7174,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2Eix %3 - + %1%2Axis %3,%4,%5 %1%2Eixos %3,%4,%5 - + %1%2Motion %3 %1%2Moviment %3 @@ -7105,106 +7198,112 @@ p, li { white-space: pre-wrap; } - + [unused] [sense ús] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L - + Stick R - + Plus Més - + Minus Menys - - + + Home Inici - + Capture Captura - + Touch Tàctil - + Wheel Indicates the mouse wheel Roda - + Backward Enrere - + Forward Endavant - + Task Tasca - + Extra Extra - + %1%2%3%4 - - + + %1%2%3Hat %4 - - + + + %1%2%3Axis %4 + + + + + %1%2%3Button %4 @@ -7625,73 +7724,73 @@ Si us plau, intenti-ho de nou o contacti el desenvolupador del programari.Usuaris - + Profile Creator - - + + Profile Selector Selector de perfil - + Profile Icon Editor - + Profile Nickname Editor - + Who will receive the points? - + Who is using Nintendo eShop? - + Who is making this purchase? - + Who is posting? - + Select a user to link to a Nintendo Account. - + Change settings for which user? - + Format data for which user? - + Which user will be transferred to another console? - + Send save data for which user? - + Select a user: Seleccioni un usuari: diff --git a/dist/languages/cs.ts b/dist/languages/cs.ts index c7f77b15d..486a812d9 100644 --- a/dist/languages/cs.ts +++ b/dist/languages/cs.ts @@ -1118,78 +1118,78 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj Nastavení yuzu. - - + + Audio Zvuk - - + + CPU CPU - + Debug Ladění - + Filesystem Souborový systém - - + + General Obecné - - + + Graphics Grafika - + GraphicsAdvanced GrafickyPokročilé - + Hotkeys Zkratky - - + + Controls Ovládání - + Profiles Profily - + Network Síť - - + + System Systém - + Game List Seznam her - + Web Web @@ -1364,41 +1364,36 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - Extended memory layout (8GB DRAM) - - - - Confirm exit while emulation is running Potvrzovat exit při spuštěné emulaci - + Prompt for user on game boot Zeptat se na uživatele při spuštění hry - + Pause emulation when in background Pozastavit emulaci, když je aplikace v pozadí - + Hide mouse on inactivity Skrýt myš při neaktivitě - + Reset All Settings Resetovat všechna nastavení - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Toto vyresetuje všechna nastavení a odstraní konfigurace pro jednotlivé hry. Složky s hrami a profily zůstanou zachovány. Přejete si pokračovat? @@ -1437,7 +1432,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + None Žádné @@ -1463,231 +1458,269 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj + VSync Mode: + + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: - + No Video Output - + CPU Video Decoding - + GPU Video Decoding (Default) - + Fullscreen Mode: Režim celé obrazovky: - + Borderless Windowed Okno bez okrajů - + Exclusive Fullscreen Exkluzivní - + Aspect Ratio: Poměr stran: - + Default (16:9) Výchozí (16:9) - + Force 4:3 Vynutit 4:3 - + Force 21:9 Vynutit 21:9 - + Force 16:10 - + Stretch to Window Roztáhnout podle okna - + Resolution: - + 0.5X (360p/540p) [EXPERIMENTAL] - + 0.75X (540p/810p) [EXPERIMENTAL] - + 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] - + 2X (1440p/2160p) - + 3X (2160p/3240p) - + 4X (2880p/4320p) - + 5X (3600p/5400p) - + 6X (4320p/6480p) - + 7X (5040p/7560p) - + 8X (5760p/8640p) - + Window Adapting Filter: - + Nearest Neighbor - + Bilinear - + Bicubic - + Gaussian - + ScaleForce - + AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: - + FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Použít globální barvu pozadí - + Set background color: Nastavit barvu pozadí: - + Background Color: Barva Pozadí: - + GLASM (Assembly Shaders, NVIDIA Only) - + SPIR-V (Experimental, Mesa Only) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + + + + + VSync Off + + + + + Recommended + + + + + On + + + + + VSync On + + ConfigureGraphicsAdvanced @@ -1712,107 +1745,133 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj Přesnost: - - Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - - - - - Force maximum clocks (Vulkan only) - - - - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - V-Sync brání obrazovce před trháním, ale některé grafické karty mají menší výkon se zapnutým V-Sync. Nechte toto zapnuté, pokud si nevšimnete žádných rozdílů ve výkonu. - - - - Use VSync - - - - - Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + ASTC recompression: + Uncompressed (Best quality) + + + + + BC1 (Low quality) + + + + + BC3 (Medium quality) + + + + + Enable asynchronous presentation (Vulkan only) + + + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + + + + + Force maximum clocks (Vulkan only) + + + + + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + Decode ASTC textures asynchronously (Hack) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + + + + + Enable Reactive Flushing + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Zapnout asynchronní kompilaci shaderů, která může snížit zasekávání shaderů. Tato funkce je experimentální. - + Use asynchronous shader building (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Use Fast GPU Time (Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - - - - - Use pessimistic buffer flushes (Hack) - - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + + + + + Enable Compute Pipelines (Intel Vulkan only) + + + + Anisotropic Filtering: Anizotropní filtrování: - + Automatic - + Default Výchozí - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1845,70 +1904,65 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj Vrátit výchozí nastavení - + Action Akce - + Hotkey Zkratka - + Controller Hotkey - - - + + + Conflicting Key Sequence Protichůdné klávesové sekvence - - + + The entered key sequence is already assigned to: %1 Vložená klávesová sekvence je již přiřazena k: %1 - - Home+%1 - - - - + [waiting] [čekání] - + Invalid - + Restore Default Vrátit výchozí nastavení - + Clear Vyčistit - + Conflicting Button Sequence - + The default button sequence is already assigned to: %1 - + The default key sequence is already assigned to: %1 Výchozí klávesová sekvence je již přiřazena k: %1 @@ -2200,7 +2254,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + Configure Nastavení @@ -2257,22 +2311,32 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + + + + + Use random Amiibo ID + + + + Enable mouse panning Povolit naklánění myší - + Mouse sensitivity Citlivost myši - + % % - + Motion / Touch Pohyb / Dotyk @@ -2384,7 +2448,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + Left Stick Levá Páčka @@ -2478,14 +2542,14 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + L L - + ZL ZL @@ -2504,7 +2568,7 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + Plus Plus @@ -2517,15 +2581,15 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - - + + R R - + ZR ZR @@ -2582,241 +2646,247 @@ Tato možnost zlepšuje rychlost díky závislosti na sémantice cmpxchg pro zaj - + Right Stick Pravá páčka - - - - + + + + Clear Vyčistit - - - - - + + + + + [not set] [nenastaveno] - - + + + Invert button - - + + Toggle button Přepnout tlačítko - + Turbo button - - + + Invert axis Převrátit osy - - - + + + Set threshold - - + + Choose a value between 0% and 100% - + Toggle axis - + Set gyro threshold - + + Calibrate sensor + + + + Map Analog Stick Namapovat analogovou páčku - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Po stisknutí OK nejprve posuňte joystick horizontálně, poté vertikálně. Pro převrácení os nejprve posuňte joystick vertikálně, poté horizontálně. - + Center axis - - + + Deadzone: %1% Deadzone: %1% - - + + Modifier Range: %1% Rozsah modifikátoru: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Dual Joycons - + Left Joycon Levý Joycon - + Right Joycon Pravý Joycon - + Handheld V rukou - + GameCube Controller Ovladač GameCube - + Poke Ball Plus - + NES Controller - + SNES Controller - + N64 Controller - + Sega Genesis - + Start / Pause Start / Pause - + Z Z - + Control Stick Control Stick - + C-Stick C-Stick - + Shake! Shake! - + [waiting] [čekání] - + New Profile Nový profil - + Enter a profile name: Zadejte název profilu: - - + + Create Input Profile Vytvořit profil vstupu - + The given profile name is not valid! Zadaný název profilu není platný! - + Failed to create the input profile "%1" Nepodařilo se vytvořit profil vstupu "%1" - + Delete Input Profile Odstranit profil vstupu - + Failed to delete the input profile "%1" Nepodařilo se odstranit profil vstupu "%1" - + Load Input Profile Načíst profil vstupu - + Failed to load the input profile "%1" Nepodařilo se načíst profil vstupu "%1" - + Save Input Profile Uložit profil vstupu - + Failed to save the input profile "%1" Nepodařilo se uložit profil vstupu "%1" @@ -3071,47 +3141,47 @@ Pro převrácení os nejprve posuňte joystick vertikálně, poté horizontáln Vývojář - + Add-Ons Doplňky - + General Obecné - + System Systém - + CPU CPU - + Graphics Grafika - + Adv. Graphics Pokroč. grafika - + Audio Zvuk - + Input Profiles - + Properties Vlastnosti @@ -3831,7 +3901,12 @@ UUID: %2 - + + Unsafe extended memory layout (8GB DRAM) + + + + System settings are available only when game is not running. Systémová nastavení jsou dostupná pouze, pokud hra neběží. @@ -4527,953 +4602,958 @@ Táhněte body pro změnu pozice nebo dvojitě klikněte na buňky tabulky pro z GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymní data jsou sbírána</a> pro vylepšení yuzu. <br/><br/>Chcete s námi sdílet anonymní data? - + Telemetry Telemetry - + Broken Vulkan Installation Detected - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... Načítání Web Appletu... - - + + Disable Web Applet Zakázat Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Počet aktuálně sestavovaných shaderů - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Aktuální emulační rychlost. Hodnoty vyšší než 100% indikují, že emulace běží rychleji nebo pomaleji než na Switchi. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Kolik snímků za sekundu aktuálně hra zobrazuje. Tohle závisí na hře od hry a scény od scény. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Čas potřebný na emulaci framu scény, nepočítá se limit nebo v-sync. Pro plnou rychlost by se tohle mělo pohybovat okolo 16.67 ms. - + &Clear Recent Files &Vymazat poslední soubory - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Pokračovat - + &Pause &Pauza - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Varování Zastaralý Formát Hry - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Používáte rozbalený formát hry, který je zastaralý a byl nahrazen jinými jako NCA, NAX, XCI, nebo NSP. Rozbalená ROM nemá ikony, metadata, a podporu updatů.<br><br>Pro vysvětlení všech možných podporovaných typů, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>zkoukni naší wiki</a>. Tato zpráva se nebude znova zobrazovat. - - + + Error while loading ROM! Chyba při načítání ROM! - + The ROM format is not supported. Tento formát ROM není podporován. - + An error occurred initializing the video core. Nastala chyba při inicializaci jádra videa. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Chyba při načítání ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Pro extrakci souborů postupujte podle <a href='https://yuzu-emu.org/help/quickstart/'>rychlého průvodce yuzu</a>. Nápovědu naleznete na <br>wiki</a> nebo na Discordu</a>. - + An unknown error occurred. Please see the log for more details. Nastala chyba. Koukni do logu. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Uložit data - + Mod Data Módovat Data - + Error Opening %1 Folder Chyba otevírání složky %1 - - + + Folder does not exist! Složka neexistuje! - + Error Opening Transferable Shader Cache Chyba při otevírání přenositelné mezipaměti shaderů - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Odebrat položku - - - - - - + + + + + + Successfully Removed Úspěšně odebráno - + Successfully removed the installed base game. Úspěšně odebrán nainstalovaný základ hry. - + The base game is not installed in the NAND and cannot be removed. Základ hry není nainstalovaný na NAND a nemůže být odstraněn. - + Successfully removed the installed update. Úspěšně odebrána nainstalovaná aktualizace. - + There is no update installed for this title. Není nainstalovaná žádná aktualizace pro tento titul. - + There are no DLC installed for this title. Není nainstalované žádné DLC pro tento titul. - + Successfully removed %1 installed DLC. Úspěšně odstraněno %1 nainstalovaných DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? Odstranit vlastní konfiguraci hry? - + + Remove Cache Storage? + + + + Remove File Odstranit soubor - - + + Error Removing Transferable Shader Cache Chyba při odstraňování přenositelné mezipaměti shaderů - - + + A shader cache for this title does not exist. Mezipaměť shaderů pro tento titul neexistuje. - + Successfully removed the transferable shader cache. Přenositelná mezipaměť shaderů úspěšně odstraněna - + Failed to remove the transferable shader cache. Nepodařilo se odstranit přenositelnou mezipaměť shaderů - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Chyba při odstraňování vlastní konfigurace hry - + A custom configuration for this title does not exist. Vlastní konfigurace hry pro tento titul neexistuje. - + Successfully removed the custom game configuration. Úspěšně odstraněna vlastní konfigurace hry. - + Failed to remove the custom game configuration. Nepodařilo se odstranit vlastní konfiguraci hry. - - + + RomFS Extraction Failed! Extrakce RomFS se nepovedla! - + There was an error copying the RomFS files or the user cancelled the operation. Nastala chyba při kopírování RomFS souborů, nebo uživatel operaci zrušil. - + Full Plný - + Skeleton Kostra - + Select RomFS Dump Mode Vyber RomFS Dump Mode - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Vyber jak by si chtěl RomFS vypsat.<br>Plné zkopíruje úplně všechno, ale<br>kostra zkopíruje jen strukturu složky. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Extrahuji RomFS... - - + + Cancel Zrušit - + RomFS Extraction Succeeded! Extrakce RomFS se povedla! - + The operation completed successfully. Operace byla dokončena úspěšně. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Chyba při otevírání %1 - + Select Directory Vybraná Složka - + Properties Vlastnosti - + The game properties could not be loaded. Herní vlastnosti nemohly být načteny. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Executable (%1);;Všechny soubory (*.*) - + Load File Načíst soubor - + Open Extracted ROM Directory Otevřít složku s extrahovanou ROM - + Invalid Directory Selected Vybraná složka je neplatná - + The directory you have selected does not contain a 'main' file. Složka kterou jste vybrali neobsahuje soubor "main" - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Instalovatelný soubor pro Switch (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Instalovat Soubory - + %n file(s) remaining - + Installing file "%1"... Instalování souboru "%1"... - - + + Install Results Výsledek instalace - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Abychom předešli možným konfliktům, nedoporučujeme uživatelům instalovat základní hry na paměť NAND. Tuto funkci prosím používejte pouze k instalaci aktualizací a DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systémová Aplikace - + System Archive Systémový archív - + System Application Update Systémový Update Aplikace - + Firmware Package (Type A) Firmware-ový baliček (Typu A) - + Firmware Package (Type B) Firmware-ový baliček (Typu B) - + Game Hra - + Game Update Update Hry - + Game DLC Herní DLC - + Delta Title Delta Title - + Select NCA Install Type... Vyberte typ instalace NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Vyberte typ title-u, který chcete nainstalovat tenhle NCA jako: (Většinou základní "game" stačí.) - + Failed to Install Chyba v instalaci - + The title type you selected for the NCA is invalid. Tento typ pro tento NCA není platný. - + File not found Soubor nenalezen - + File "%1" not found Soubor "%1" nenalezen - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Chybí účet yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Pro přidání recenze kompatibility je třeba mít účet yuzu<br><br/>Pro nalinkování yuzu účtu jdi do Emulace &gt; Konfigurace &gt; Web. - + Error opening URL Chyba při otevírání URL - + Unable to open the URL "%1". Nelze otevřít URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected Zjištěno neplatné nastavení - + Handheld controller can't be used on docked mode. Pro controller will be selected. Ruční ovladač nelze používat v dokovacím režimu. Bude vybrán ovladač Pro Controller. - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Soubor Amiibo (%1);; Všechny Soubory (*.*) - + Load Amiibo Načíst Amiibo - + Error loading Amiibo data Chyba načítání Amiiba - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Pořídit Snímek Obrazovky - + PNG Image (*.png) PNG Image (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Rychlost: %1% / %2% - + Speed: %1% Rychlost: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Hra: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMÁLNÍ - + GPU HIGH GPU VYSOKÝ - + GPU EXTREME GPU EXTRÉMNÍ - + GPU ERROR GPU ERROR - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA - + SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation Potvďte Rederivaci Klíčů - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5490,37 +5570,37 @@ a udělejte si zálohu. Toto vymaže věechny vaše automaticky generované klíče a znova spustí modul derivace klíčů. - + Missing fuses Chybí Fuses - + - Missing BOOT0 - Chybí BOOT0 - + - Missing BCPKG2-1-Normal-Main - Chybí BCPKG2-1-Normal-Main - + - Missing PRODINFO - Chybí PRODINFO - + Derivation Components Missing Chybé odvozené komponenty - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5529,39 +5609,49 @@ Tohle může zabrat až minutu podle výkonu systému. - + Deriving Keys Derivuji Klíče - + + System Archive Decryption Failed + + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target Vyberte Cíl vypsaní RomFS - + Please select which RomFS you would like to dump. Vyberte, kterou RomFS chcete vypsat. - + Are you sure you want to close yuzu? Jste si jist, že chcete zavřít yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Jste si jist, že chcete ukončit emulaci? Jakýkolic neuložený postup bude ztracen. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5573,44 +5663,44 @@ Opravdu si přejete ukončit tuto aplikaci? GRenderWindow - - + + OpenGL not available! OpenGL není k dispozici! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu nebylo sestaveno s OpenGL podporou. + - Error while initializing OpenGL! Chyba při inicializaci OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Vaše grafická karta pravděpodobně nepodporuje OpenGL nebo nejsou nainstalovány nejnovější ovladače. - + Error while initializing OpenGL 4.6! Chyba při inicializaci OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Vaše grafická karta pravděpodobně nepodporuje OpenGL 4.6 nebo nejsou nainstalovány nejnovější ovladače.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Vaše grafická karta pravděpodobně nepodporuje jedno nebo více rozšíření OpenGL. Ujistěte se prosím, že jsou nainstalovány nejnovější ovladače.<br><br>GL Renderer:<br>%1<br><br>Nepodporované rozšíření:<br>%2 @@ -5669,117 +5759,122 @@ Opravdu si přejete ukončit tuto aplikaci? - Remove OpenGL Pipeline Cache + Remove Cache Storage + Remove OpenGL Pipeline Cache + + + + Remove Vulkan Pipeline Cache - + Remove All Pipeline Caches - + Remove All Installed Contents Odstranit všechen nainstalovaný obsah - + Dump RomFS Vypsat RomFS - + Dump RomFS to SDMC - + Copy Title ID to Clipboard Zkopírovat ID Titulu do schránky - + Navigate to GameDB entry Navigovat do GameDB - + Create Shortcut - + Add to Desktop - + Add to Applications Menu - + Properties Vlastnosti - + Scan Subfolders Prohledat podsložky - + Remove Game Directory Odstranit složku se hrou - + ▲ Move Up ▲ Posunout nahoru - + ▼ Move Down ▼ Posunout dolů - + Open Directory Location Otevřít umístění složky - + Clear Vymazat - + Name Název - + Compatibility Kompatibilita - + Add-ons Modifkace - + File type Typ-Souboru - + Size Velikost @@ -5850,7 +5945,7 @@ Opravdu si přejete ukončit tuto aplikaci? GameListPlaceholder - + Double-click to add a new folder to the game list Dvojitým kliknutím přidáte novou složku do seznamu her @@ -5863,12 +5958,12 @@ Opravdu si přejete ukončit tuto aplikaci? - + Filter: Filtr: - + Enter pattern to filter Zadejte filtr @@ -5958,12 +6053,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute - @@ -5985,111 +6079,112 @@ Debug Message: + Main Window - + Audio Volume Down - + Audio Volume Up - + Capture Screenshot Pořídit Snímek Obrazovky - + Change Adapting Filter - + Change Docked Mode - + Change GPU Accuracy - + Continue/Pause Emulation - + Exit Fullscreen - + Exit yuzu - + Fullscreen Celá Obrazovka - + Load File Načíst soubor - + Load/Remove Amiibo - + Restart Emulation - + Stop Emulation - + TAS Record - + TAS Reset - + TAS Start/Stop - + Toggle Filter Bar - + Toggle Framerate Limit - + Toggle Mouse Panning - + Toggle Status Bar @@ -6777,7 +6872,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE START/PAUSE @@ -6827,21 +6922,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6849,8 +6944,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [Nenastaveno] @@ -6865,10 +6960,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Osa %1%2 @@ -6882,163 +6977,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [Neznámá] - - + + Left Doleva - - + + Right Doprava - - + + Down Dolů - - + + Up Nahoru - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Start - + L1 - + L2 - + L3 - + R1 - + R2 - + R3 - + Circle - + Cross - + Square - + Triangle - + Share - + Options - + [undefined] @@ -7049,7 +7144,7 @@ p, li { white-space: pre-wrap; } - + [invalid] @@ -7063,21 +7158,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 - + %1%2Axis %3,%4,%5 - + %1%2Motion %3 @@ -7089,106 +7182,112 @@ p, li { white-space: pre-wrap; } - + [unused] [nepoužito] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L - + Stick R - + Plus Plus - + Minus Minus - - + + Home Home - + Capture Capture - + Touch Dotyk - + Wheel Indicates the mouse wheel - + Backward - + Forward - + Task - + Extra - + %1%2%3%4 - - + + %1%2%3Hat %4 - - + + + %1%2%3Axis %4 + + + + + %1%2%3Button %4 @@ -7609,73 +7708,73 @@ Zkuste to prosím znovu nebo kontaktujte vývojáře softwaru. Uživatelé - + Profile Creator - - + + Profile Selector Profilový Manažer - + Profile Icon Editor - + Profile Nickname Editor - + Who will receive the points? - + Who is using Nintendo eShop? - + Who is making this purchase? - + Who is posting? - + Select a user to link to a Nintendo Account. - + Change settings for which user? - + Format data for which user? - + Which user will be transferred to another console? - + Send save data for which user? - + Select a user: Vyber Uživatele: diff --git a/dist/languages/da.ts b/dist/languages/da.ts index 4bb799f90..082f839cf 100644 --- a/dist/languages/da.ts +++ b/dist/languages/da.ts @@ -1134,78 +1134,78 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse.yuzu Konfiguration - - + + Audio Lyd - - + + CPU CPU - + Debug Fejlfind - + Filesystem Filsystem - - + + General Generelt - - + + Graphics Grafik - + GraphicsAdvanced GrafikAvanceret - + Hotkeys Genvejstaster - - + + Controls Styring - + Profiles Profiler - + Network Netværk - - + + System System - + Game List Spilliste - + Web Net @@ -1380,41 +1380,36 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - Extended memory layout (8GB DRAM) - - - - Confirm exit while emulation is running Bekræft afslutning, mens emulering kører - + Prompt for user on game boot Spørg efter bruger, ved opstart af spil - + Pause emulation when in background Sæt emulering på pause, når i baggrund - + Hide mouse on inactivity Skjul mus ved inaktivitet - + Reset All Settings Nulstil Alle Indstillinger - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? dette nulstiller alle indstillinger og fjerner alle pr-spil-konfigurationer. Dette vil ikke slette spilmapper, -profiler, eller input-profiler. Fortsæt? @@ -1453,7 +1448,7 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + None Ingen @@ -1479,231 +1474,269 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. + VSync Mode: + + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: NVDEC-emulering: - + No Video Output Ingen Video-Output - + CPU Video Decoding CPU-Video Afkodning - + GPU Video Decoding (Default) GPU-Video Afkodning (Standard) - + Fullscreen Mode: Fuldskærmstilstand: - + Borderless Windowed Uindrammet Vindue - + Exclusive Fullscreen Eksklusiv Fuld Skærm - + Aspect Ratio: Skærmformat: - + Default (16:9) Standard (16:9) - + Force 4:3 Tving 4:3 - + Force 21:9 Tving 21:9 - + Force 16:10 - + Stretch to Window Stræk til Vindue - + Resolution: Opløsning: - + 0.5X (360p/540p) [EXPERIMENTAL] 0,5X (360p/540p) [EKSPERIMENTEL] - + 0.75X (540p/810p) [EXPERIMENTAL] 0,75X (540p/810p) [EKSPERIMENTEL] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) - + 8X (5760p/8640p) - + Window Adapting Filter: Vinduestilpassende Filter: - + Nearest Neighbor Nærmeste Nabo - + Bilinear Bilineær - + Bicubic Bikubisk - + Gaussian Gausisk - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: Anti-Aliaseringsmetode: - + FXAA FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Brug global baggrundsfarve - + Set background color: Angiv baggrundsfarve: - + Background Color: Baggrundsfarve: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (Assembly-Shadere, kun NVIDIA) - + SPIR-V (Experimental, Mesa Only) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + + + + + VSync Off + + + + + Recommended + + + + + On + + + + + VSync On + + ConfigureGraphicsAdvanced @@ -1728,107 +1761,133 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse.Nøjagtighedsniveau - - Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - - - - - Force maximum clocks (Vulkan only) - - - - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync forhindrer skærmen i at frynse, men nogle grafikkort har lavere ydeevne med VSync aktiveret. Behold det aktiveret, hvis du ikke bemærker en forskel i ydeevne. - - - - Use VSync - Brug VSync - - - - Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + ASTC recompression: + Uncompressed (Best quality) + + + + + BC1 (Low quality) + + + + + BC3 (Medium quality) + + + + + Enable asynchronous presentation (Vulkan only) + + + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + + + + + Force maximum clocks (Vulkan only) + + + + + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + Decode ASTC textures asynchronously (Hack) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + + + + + Enable Reactive Flushing + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Aktiverer asynkron shader-kompilering, hvilket kan reducere shader-stammen. Denne funktion er eksperimentiel. - + Use asynchronous shader building (Hack) Brug asynkron shader-opbygning (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Aktiverer Hurtig GPU-Tid. Denne valgmulighed vil tvinge de fleste spil, til at køre i deres højeste indbyggede opløsning. - + Use Fast GPU Time (Hack) Brug Hurtig GPU-Tid (Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - - - - - Use pessimistic buffer flushes (Hack) - - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + + + + + Enable Compute Pipelines (Intel Vulkan only) + + + + Anisotropic Filtering: Anisotropisk Filtrering: - + Automatic - + Default Standard - + 2x - + 4x - + 8x - + 16x @@ -1861,70 +1920,65 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse.Gendan Standarder - + Action Handling - + Hotkey Genvejstast - + Controller Hotkey - - - + + + Conflicting Key Sequence Modstridende Tastesekvens - - + + The entered key sequence is already assigned to: %1 Den indtastede tastesekvens er allerede tilegnet: %1 - - Home+%1 - - - - + [waiting] [venter] - + Invalid - + Restore Default Gendan Standard - + Clear Ryd - + Conflicting Button Sequence - + The default button sequence is already assigned to: %1 - + The default key sequence is already assigned to: %1 Standard-tastesekvensen er allerede tilegnet: %1 @@ -2216,7 +2270,7 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + Configure Konfigurér @@ -2273,22 +2327,32 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + + + + + Use random Amiibo ID + + + + Enable mouse panning Aktivér kig med mus - + Mouse sensitivity Mus-følsomhed - + % % - + Motion / Touch Bevægelse / Berøring @@ -2400,7 +2464,7 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + Left Stick Venstre Styrepind @@ -2494,14 +2558,14 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + L L - + ZL ZL @@ -2520,7 +2584,7 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + Plus Plus @@ -2533,15 +2597,15 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - - + + R R - + ZR ZR @@ -2598,241 +2662,247 @@ Dette vil bandlyse både vedkommendes forum-brugernavn og IP-adresse. - + Right Stick Højre Styrepind - - - - + + + + Clear Ryd - - - - - + + + + + [not set] [ikke indstillet] - - + + + Invert button - - + + Toggle button Funktionsskifteknap - + Turbo button - - + + Invert axis Omvend akser - - - + + + Set threshold Angiv tærskel - - + + Choose a value between 0% and 100% Vælg en værdi imellem 0% og 100% - + Toggle axis - + Set gyro threshold - + + Calibrate sensor + + + + Map Analog Stick Tilsted Analog Pind - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Bevæg, efter tryk på OK, først din styrepind vandret og så lodret. Bevæg, for at omvende akserne, først din styrepind lodret og så vandret. - + Center axis - - + + Deadzone: %1% Dødzone: %1% - - + + Modifier Range: %1% Forandringsrækkevidde: %1% - - + + Pro Controller Pro-Styringsenhed - + Dual Joycons Dobbelt-Joycon - + Left Joycon Venstre Joycon - + Right Joycon Højre Joycon - + Handheld Håndholdt - + GameCube Controller GameCube-Styringsenhed - + Poke Ball Plus - + NES Controller - + SNES Controller - + N64 Controller - + Sega Genesis - + Start / Pause Start / Pause - + Z Z - + Control Stick Styrepind - + C-Stick C-Pind - + Shake! Ryst! - + [waiting] [venter] - + New Profile Ny Profil - + Enter a profile name: Indtast et profilnavn: - - + + Create Input Profile Opret Input-Profil - + The given profile name is not valid! Det angivne profilnavn er ikke gyldigt! - + Failed to create the input profile "%1" Oprettelse af input-profil "%1" mislykkedes - + Delete Input Profile Slet Input-Profil - + Failed to delete the input profile "%1" Sletning af input-profil "%1" mislykkedes - + Load Input Profile Indlæs Input-Profil - + Failed to load the input profile "%1" Indlæsning af input-profil "%1" mislykkedes - + Save Input Profile Gem Input-Profil - + Failed to save the input profile "%1" Lagring af input-profil "%1" mislykkedes @@ -3087,47 +3157,47 @@ Bevæg, for at omvende akserne, først din styrepind lodret og så vandret.Udvikler - + Add-Ons Tilføjelser - + General Generelt - + System System - + CPU CPU - + Graphics Grafik - + Adv. Graphics - + Audio Lyd - + Input Profiles - + Properties Egenskaber @@ -3847,7 +3917,12 @@ UUID: %2 - + + Unsafe extended memory layout (8GB DRAM) + + + + System settings are available only when game is not running. Systemindstillinger er kun tilgængelige, når spil ikke kører. @@ -4543,951 +4618,956 @@ Træk punkter, for at skifte position, eller dobbeltklik i tabelceller, for at r GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonym data indsamles</a>, for at hjælp med, at forbedre yuzu. <br/><br/>Kunne du tænke dig, at dele dine brugsdata med os? - + Telemetry Telemetri - + Broken Vulkan Installation Detected - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... Indlæser Net-Applet... - - + + Disable Web Applet Deaktivér Net-Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Aktuel emuleringshastighed. Værdier højere eller lavere end 100% indikerer, at emulering kører hurtigere eller langsommere end en Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. - + &Clear Recent Files - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue - + &Pause - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Advarsel, Forældet Spilformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. - - + + Error while loading ROM! Fejl under indlæsning af ROM! - + The ROM format is not supported. ROM-formatet understøttes ikke. - + An error occurred initializing the video core. Der skete en fejl under initialisering af video-kerne. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. - + (64-bit) - + (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit - + Closing software... - + Save Data - + Mod Data - + Error Opening %1 Folder Fejl ved Åbning af %1 Mappe - - + + Folder does not exist! Mappe eksisterer ikke! - + Error Opening Transferable Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + + Remove Cache Storage? + + + + Remove File - - + + Error Removing Transferable Shader Cache - - + + A shader cache for this title does not exist. - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! RomFS-Udpakning Mislykkedes! - + There was an error copying the RomFS files or the user cancelled the operation. Der skete en fejl ved kopiering af RomFS-filerne, eller brugeren afbrød opgaven. - + Full Fuld - + Skeleton Skelet - + Select RomFS Dump Mode Vælg RomFS-Nedfældelsestilstand - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Udpakker RomFS... - - + + Cancel Afbryd - + RomFS Extraction Succeeded! RomFS-Udpakning Lykkedes! - + The operation completed successfully. Fuldførelse af opgaven lykkedes. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Fejl ved Åbning af %1 - + Select Directory Vælg Mappe - + Properties Egenskaber - + The game properties could not be loaded. Spil-egenskaberne kunne ikke indlæses. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch-Eksekverbar (%1);;Alle filer (*.*) - + Load File Indlæs Fil - + Open Extracted ROM Directory Åbn Udpakket ROM-Mappe - + Invalid Directory Selected Ugyldig Mappe Valgt - + The directory you have selected does not contain a 'main' file. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files - + %n file(s) remaining - + Installing file "%1"... Installér fil "%1"... - - + + Install Results - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systemapplikation - + System Archive Systemarkiv - + System Application Update Systemapplikationsopdatering - + Firmware Package (Type A) Firmwarepakke (Type A) - + Firmware Package (Type B) Firmwarepakke (Type B) - + Game Spil - + Game Update Spilopdatering - + Game DLC Spiludvidelse - + Delta Title Delta-Titel - + Select NCA Install Type... Vælg NCA-Installationstype... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) - + Failed to Install Installation mislykkedes - + The title type you selected for the NCA is invalid. - + File not found Fil ikke fundet - + File "%1" not found Fil "%1" ikke fundet - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Manglende yuzu-Konto - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. - + Error opening URL - + Unable to open the URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo-Fil (%1);; Alle Filer (*.*) - + Load Amiibo Indlæs Amiibo - + Error loading Amiibo data Fejl ved indlæsning af Amiibo-data - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Optag Skærmbillede - + PNG Image (*.png) PNG-Billede (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Hastighed: %1% / %2% - + Speed: %1% Hastighed: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Spil: %1 FPS - + Frame: %1 ms Billede: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL - + VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA FXAA - + SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5498,76 +5578,86 @@ This will delete your autogenerated key files and re-run the key derivation modu - + Missing fuses - + - Missing BOOT0 - + - Missing BCPKG2-1-Normal-Main - + - Missing PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. - + Deriving Keys - + + System Archive Decryption Failed + + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target - + Please select which RomFS you would like to dump. - + Are you sure you want to close yuzu? Er du sikker på, at du vil lukke yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Er du sikker på, at du vil stoppe emulereingen? Enhver ulagret data, vil gå tabt. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5577,44 +5667,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. + - Error while initializing OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. - + Error while initializing OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 @@ -5673,117 +5763,122 @@ Would you like to bypass this and exit anyway? - Remove OpenGL Pipeline Cache + Remove Cache Storage + Remove OpenGL Pipeline Cache + + + + Remove Vulkan Pipeline Cache - + Remove All Pipeline Caches - + Remove All Installed Contents - + Dump RomFS - + Dump RomFS to SDMC - + Copy Title ID to Clipboard Kopiér Titel-ID til Udklipsholder - + Navigate to GameDB entry - + Create Shortcut - + Add to Desktop - + Add to Applications Menu - + Properties Egenskaber - + Scan Subfolders - + Remove Game Directory - + ▲ Move Up - + ▼ Move Down - + Open Directory Location - + Clear Ryd - + Name Navn - + Compatibility Kompatibilitet - + Add-ons Tilføjelser - + File type Filtype - + Size Størrelse @@ -5854,7 +5949,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list @@ -5867,12 +5962,12 @@ Would you like to bypass this and exit anyway? - + Filter: Filter: - + Enter pattern to filter @@ -5962,12 +6057,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute - @@ -5989,111 +6083,112 @@ Debug Message: + Main Window - + Audio Volume Down - + Audio Volume Up - + Capture Screenshot Optag Skærmbillede - + Change Adapting Filter - + Change Docked Mode - + Change GPU Accuracy - + Continue/Pause Emulation - + Exit Fullscreen - + Exit yuzu - + Fullscreen Fuldskærm - + Load File Indlæs Fil - + Load/Remove Amiibo - + Restart Emulation - + Stop Emulation - + TAS Record - + TAS Reset - + TAS Start/Stop - + Toggle Filter Bar - + Toggle Framerate Limit - + Toggle Mouse Panning - + Toggle Status Bar @@ -6777,7 +6872,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE @@ -6827,21 +6922,21 @@ p, li { white-space: pre-wrap; } - + Shift Skift - + Ctrl Ctrl - + Alt Alt @@ -6849,8 +6944,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [ikke indstillet] @@ -6865,10 +6960,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Akse %1%2 @@ -6882,163 +6977,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [ukendt] - - + + Left Venstre - - + + Right Højre - - + + Down ed - - + + Up Op - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Start - + L1 - + L2 - + L3 - + R1 - + R2 - + R3 - + Circle - + Cross - + Square - + Triangle - + Share - + Options - + [undefined] @@ -7049,7 +7144,7 @@ p, li { white-space: pre-wrap; } - + [invalid] @@ -7063,21 +7158,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 - + %1%2Axis %3,%4,%5 - + %1%2Motion %3 @@ -7089,106 +7182,112 @@ p, li { white-space: pre-wrap; } - + [unused] [ubrugt] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L - + Stick R - + Plus Plus - + Minus Minus - - + + Home Hjem - + Capture Optag - + Touch Berøring - + Wheel Indicates the mouse wheel - + Backward - + Forward - + Task - + Extra - + %1%2%3%4 - - + + %1%2%3Hat %4 - - + + + %1%2%3Axis %4 + + + + + %1%2%3Button %4 @@ -7603,73 +7702,73 @@ Please try again or contact the developer of the software. Brugere - + Profile Creator - - + + Profile Selector Profilvælger - + Profile Icon Editor - + Profile Nickname Editor - + Who will receive the points? - + Who is using Nintendo eShop? - + Who is making this purchase? - + Who is posting? - + Select a user to link to a Nintendo Account. - + Change settings for which user? - + Format data for which user? - + Which user will be transferred to another console? - + Send save data for which user? - + Select a user: Vælg en bruger: diff --git a/dist/languages/de.ts b/dist/languages/de.ts index 47def0166..817f03fb8 100644 --- a/dist/languages/de.ts +++ b/dist/languages/de.ts @@ -158,7 +158,7 @@ p, li { white-space: pre-wrap; } Are you sure you would like to <b>kick</b> %1? - + Bist du sicher, dass du %1? <b>kicken</b> möchtest? @@ -170,7 +170,8 @@ p, li { white-space: pre-wrap; } Are you sure you would like to <b>kick and ban</b> %1? This would ban both their forum username and their IP address. - + Bist du sicher, dass du %1? kicken und sperren möchtest? +Dies würde deren Forum Benutzernamen und deren IP-Adresse sperren. @@ -245,7 +246,7 @@ This would ban both their forum username and their IP address. Yes The game starts to output video or audio - + Ja Das Spiel beginnt mit der Video- oder Audioausgabe @@ -300,17 +301,17 @@ This would ban both their forum username and their IP address. Major The game has major graphical errors - + Schwerwiegend  Das Spiel hat schwerwiegende graphische Fehler Minor The game has minor graphical errors - + Kleinere Das Spiel hat kleinere graphische Fehler None Everything is rendered as it looks on the Nintendo Switch - + Keine  Alles wird genau so gerendert wie es auf der Nintendo Switch aussieht @@ -320,12 +321,12 @@ This would ban both their forum username and their IP address. Major The game has major audio errors - + Schwerwiegend Das Spiel hat schwerwiegende Audio Fehler Minor The game has minor audio errors - + Kleinere Das Spiel hat kleinere Audio Fehler @@ -1114,78 +1115,78 @@ This would ban both their forum username and their IP address. yuzu-Konfiguration - - + + Audio Audio - - + + CPU CPU - + Debug Debug - + Filesystem Dateisystem - - + + General Allgemein - - + + Graphics Grafik - + GraphicsAdvanced GraphicsAdvanced - + Hotkeys Hotkeys - - + + Controls Steuerung - + Profiles Nutzer - + Network Netzwerk - - + + System System - + Game List Spieleliste - + Web Web @@ -1360,41 +1361,36 @@ This would ban both their forum username and their IP address. - Extended memory layout (8GB DRAM) - - - - Confirm exit while emulation is running Schließen des Emulators bestätigen, falls ein Spiel läuft - + Prompt for user on game boot Beim Spielstart nach Nutzer fragen - + Pause emulation when in background Emulation im Hintergrund pausieren - + Hide mouse on inactivity Mauszeiger verstecken - + Reset All Settings Setze alle Einstellungen zurück - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Hierdurch werden alle Einstellungen zurückgesetzt und alle spielspezifischen Konfigurationen gelöscht. Spiel-Ordner, Profile oder Eingabeprofile werden nicht gelöscht. Fortfahren? @@ -1433,7 +1429,7 @@ This would ban both their forum username and their IP address. - + None Keiner @@ -1455,235 +1451,273 @@ This would ban both their forum username and their IP address. Accelerate ASTC texture decoding - + Beschleunigt ASTC Texturen Decodierung + VSync Mode: + VSync Modus: + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: NVDEC Emulation: - + No Video Output Keine Videoausgabe - + CPU Video Decoding CPU Video Dekodierung - + GPU Video Decoding (Default) GPU Video Dekodierung (Standard) - + Fullscreen Mode: Vollbild Modus: - + Borderless Windowed Rahmenloses Fenster - + Exclusive Fullscreen Exklusiver Vollbildmodus - + Aspect Ratio: Seitenverhältnis: - + Default (16:9) Standard (16:9) - + Force 4:3 4:3 erzwingen - + Force 21:9 21:9 erzwingen - + Force 16:10 Erzwinge 16:10 - + Stretch to Window Auf Fenster anpassen - + Resolution: Auflösung: - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [EXPERIMENTELL] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [EXPERIMENTELL] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] 1.5X (1080p/1620p) [EXPERIMENTELL] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) 7X (5040p/7560p) - + 8X (5760p/8640p) 8X (5760p/8640p) - + Window Adapting Filter: - + Nearest Neighbor - + Nächste-Nachbarn - + Bilinear Bilinear - + Bicubic Bikubisch - + Gaussian Gaussian - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution - + AMD FidelityFX™️Super Resolution - + Anti-Aliasing Method: Kantenglättungs-Methode: - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness - + Verwende Globale FSR Schärfe - + Set FSR Sharpness - + Setze FSR Schärfe - + FSR Sharpness: - + FSR Schärfe - + 100% 100% - - + + Use global background color Globale Hintergrundfarbe verwenden - + Set background color: Hintergrundfarbe: - + Background Color: Hintergrundfarbe: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (Assembly Shaders, Nur NVIDIA) - + SPIR-V (Experimental, Mesa Only) SPIR-V (Experimentell, Nur Mesa) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + Aus + + + + VSync Off + Vsync Aus + + + + Recommended + Empfohlen + + + + On + An + + + + VSync On + Vsync An + ConfigureGraphicsAdvanced @@ -1708,107 +1742,133 @@ This would ban both their forum username and their IP address. Genauigkeit der Emulation: - - Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - - - - - Force maximum clocks (Vulkan only) - - - - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync verhindert Screen-Tearing, aber manche Grafikkarten haben eine schlechtere Leistung, wenn es aktiviert ist. Wenn du keinen Unterschied merkst, lasse es aktiviert. - - - - Use VSync - VSync verwenden - - - - Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. - + + ASTC recompression: + ASTC Rekompression: + Uncompressed (Best quality) + Unkomprimiert (Beste Qualität) + + + + BC1 (Low quality) + BC1 (Niedrige Qualität) + + + + BC3 (Medium quality) + BC3 (Mittlere Qualität) + + + + Enable asynchronous presentation (Vulkan only) + Erlaube Asynchrone Präsentation (Nur Vulkan) + + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + Lässt im Hintergrund die GPU Aufgaben erledigen während diese auf Grafikbefehle wartet, damit diese nicht herunter taktet. + + + + Force maximum clocks (Vulkan only) + Erzwinge Maximale Taktrate (Vulkan only) + + + + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + Aktiviere asynchrone ASTC Texturen Dekodierung, welche möglicherweise Ladezeiten stotter verringert. Diese Funktion ist experimentell + + + Decode ASTC textures asynchronously (Hack) + Dekodiere ASTC-Texturen asynchron (Hack) + + + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. - + + Enable Reactive Flushing + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Nutze asynchrone Shader-Kompilierung. Dies kann Stottern durch Shader reduzieren. Dieses Feature ist experimentell. - + Use asynchronous shader building (Hack) Aktiviere asynchrones Shader Kompilieren. (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Use Fast GPU Time (Hack) - + Verwende Schnelle GPU-Zeit (Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - - - - - Use pessimistic buffer flushes (Hack) - - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache Vulkan-Pipeline-Cache verwernden - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + + + + + Enable Compute Pipelines (Intel Vulkan only) + + + + Anisotropic Filtering: Anisotrope Filterung: - + Automatic Automatisch - + Default Standard - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1841,70 +1901,65 @@ This would ban both their forum username and their IP address. Standardwerte wiederherstellen - + Action Aktion - + Hotkey Hotkey - + Controller Hotkey Controller-Hotkey - - - + + + Conflicting Key Sequence Tastensequenz bereits belegt - - + + The entered key sequence is already assigned to: %1 Die eingegebene Sequenz ist bereits vergeben an: %1 - - Home+%1 - Home+%1 - - - + [waiting] [wartet] - + Invalid Ungültig - + Restore Default Standardwerte wiederherstellen - + Clear Löschen - + Conflicting Button Sequence - + The default button sequence is already assigned to: %1 - + The default key sequence is already assigned to: %1 Die Standard-Sequenz ist bereits vergeben an: %1 @@ -2196,7 +2251,7 @@ This would ban both their forum username and their IP address. - + Configure Konfigurieren @@ -2245,30 +2300,40 @@ This would ban both their forum username and their IP address. Enable direct JoyCon driver - + Aktiviere direkten JoyCon-Treiber Enable direct Pro Controller driver [EXPERIMENTAL] + Aktiviere direkten Pro Controller-Treiber [EXPERIMENTELL] + + + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. - + + Use random Amiibo ID + Zufällige Amiibo-ID verwenden + + + Enable mouse panning Maus-Panning aktivieren - + Mouse sensitivity Maus-Empfindlichkeit - + % % - + Motion / Touch Bewegung / Touch @@ -2338,7 +2403,7 @@ This would ban both their forum username and their IP address. Player %1 profile - + Profil Spieler %1 @@ -2380,7 +2445,7 @@ This would ban both their forum username and their IP address. - + Left Stick Linker Analogstick @@ -2474,14 +2539,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2500,7 +2565,7 @@ This would ban both their forum username and their IP address. - + Plus Plus @@ -2513,15 +2578,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2578,241 +2643,247 @@ This would ban both their forum username and their IP address. - + Right Stick Rechter Analogstick - - - - + + + + Clear Löschen - - - - - + + + + + [not set] [nicht belegt] - - + + + Invert button Knopf invertieren - - + + Toggle button Taste umschalten - + Turbo button - + Turbo Knopf - - + + Invert axis Achsen umkehren - - - + + + Set threshold - - + + Choose a value between 0% and 100% Wert zwischen 0% und 100% wählen - + Toggle axis - + Set gyro threshold - + + Calibrate sensor + Kalibriere den Sensor + + + Map Analog Stick Analog-Stick festlegen - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Nach dem Drücken von OK den Joystick zuerst horizontal, dann vertikal bewegen. Um die Achsen umzukehren, bewege den Joystick zuerst vertikal und dann horizontal. - + Center axis Achse zentrieren - - + + Deadzone: %1% Deadzone: %1% - - + + Modifier Range: %1% Modifikator-Radius: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Zwei Joycons - + Left Joycon Linker Joycon - + Right Joycon Rechter Joycon - + Handheld Handheld - + GameCube Controller GameCube-Controller - + Poke Ball Plus Poke-Ball Plus - + NES Controller NES Controller - + SNES Controller SNES Controller - + N64 Controller N64 Controller - + Sega Genesis Sega Genesis - + Start / Pause Start / Pause - + Z Z - + Control Stick Analog Stick - + C-Stick C-Stick - + Shake! Schütteln! - + [waiting] [wartet] - + New Profile Neues Profil - + Enter a profile name: Profilnamen eingeben: - - + + Create Input Profile Eingabeprofil erstellen - + The given profile name is not valid! Angegebener Profilname ist nicht gültig! - + Failed to create the input profile "%1" Erstellen des Eingabeprofils "%1" ist fehlgeschlagen - + Delete Input Profile Eingabeprofil löschen - + Failed to delete the input profile "%1" Löschen des Eingabeprofils "%1" ist fehlgeschlagen - + Load Input Profile Eingabeprofil laden - + Failed to load the input profile "%1" Laden des Eingabeprofils "%1" ist fehlgeschlagen - + Save Input Profile Eingabeprofil speichern - + Failed to save the input profile "%1" Speichern des Eingabeprofils "%1" ist fehlgeschlagen @@ -3067,47 +3138,47 @@ Um die Achsen umzukehren, bewege den Joystick zuerst vertikal und dann horizonta Entwickler - + Add-Ons Add-Ons - + General Allgemeines - + System System - + CPU CPU - + Graphics Grafik - + Adv. Graphics Erw. Grafik - + Audio Audio - + Input Profiles Eingabe-Profile - + Properties Einstellungen @@ -3337,18 +3408,18 @@ UUID: %2 Direct Joycon Driver - + Direkter Joycon-Treiber Enable Ring Input - + Ring-Eingabe aktivieren Enable - + Aktiviere @@ -3395,7 +3466,7 @@ UUID: %2 Direct Joycon driver is not enabled - + Direkter JoyCon-Treiber ist nicht aktiviert @@ -3827,7 +3898,12 @@ UUID: %2 Gerätename - + + Unsafe extended memory layout (8GB DRAM) + Unsicheres erweitertes Speicherlayout (8GB DRAM) + + + System settings are available only when game is not running. Die Systemeinstellungen sind nur verfügbar, wenn kein Spiel aktiv ist. @@ -4474,7 +4550,7 @@ Ziehe die Punkte mit deiner Maus, um ihre Position zu ändern. Doppelklicke auf Server Address - + Serveradresse @@ -4523,554 +4599,559 @@ Ziehe die Punkte mit deiner Maus, um ihre Position zu ändern. Doppelklicke auf GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonyme Daten werden gesammelt,</a> um yuzu zu verbessern.<br/><br/>Möchstest du deine Nutzungsdaten mit uns teilen? - + Telemetry Telemetrie - + Broken Vulkan Installation Detected Defekte Vulkan-Installation erkannt - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... Lade Web-Applet... - - + + Disable Web Applet Deaktiviere die Web Applikation - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Wie viele Shader im Moment kompiliert werden - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Derzeitige Emulations-Geschwindigkeit. Werte höher oder niedriger als 100% zeigen, dass die Emulation scheller oder langsamer läuft als auf einer Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Wie viele Bilder pro Sekunde angezeigt werden variiert von Spiel zu Spiel und von Szene zu Szene. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Zeit, die gebraucht wurde, um einen Switch-Frame zu emulieren, ohne Framelimit oder V-Sync. Für eine Emulation bei voller Geschwindigkeit sollte dieser Wert bei höchstens 16.67ms liegen. - + &Clear Recent Files &Zuletzt geladene Dateien leeren - + Emulated mouse is enabled - + Emulierte Maus ist aktiviert - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Fortsetzen - + &Pause &Pause - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu betreibt ein Speil - + Warning Outdated Game Format Warnung veraltetes Spielformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Du nutzt eine entpackte ROM-Ordnerstruktur für dieses Spiel, welches ein veraltetes Format ist und von anderen Formaten wie NCA, NAX, XCI oder NSP überholt wurde. Entpackte ROM-Ordner unterstützen keine Icons, Metadaten oder Updates.<br><br><a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Unser Wiki</a> enthält eine Erklärung der verschiedenen Formate, die yuzu unterstützt. Diese Nachricht wird nicht noch einmal angezeigt. - - + + Error while loading ROM! ROM konnte nicht geladen werden! - + The ROM format is not supported. ROM-Format wird nicht unterstützt. - + An error occurred initializing the video core. Beim Initialisieren des Video-Kerns ist ein Fehler aufgetreten. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. ROM konnte nicht geladen werden! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Bitte folge der <a href='https://yuzu-emu.org/help/quickstart/'>yuzu-Schnellstart-Anleitung</a> um deine Dateien zu extrahieren.<br>Hilfe findest du im yuzu-Wiki</a> oder dem yuzu-Discord</a>. - + An unknown error occurred. Please see the log for more details. Ein unbekannter Fehler ist aufgetreten. Bitte prüfe die Log-Dateien auf mögliche Fehlermeldungen. - + (64-bit) (64-Bit) - + (32-bit) (32-Bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Schließe Software... - + Save Data Speicherdaten - + Mod Data Mod-Daten - + Error Opening %1 Folder Konnte Verzeichnis %1 nicht öffnen - - + + Folder does not exist! Verzeichnis existiert nicht! - + Error Opening Transferable Shader Cache Fehler beim Öffnen des transferierbaren Shader-Caches - + Failed to create the shader cache directory for this title. Fehler beim erstellen des Shader-Cache-Ordner für den ausgewählten Titel. - + Error Removing Contents - + Fehler beim Entfernen des Inhalts - + Error Removing Update Fehler beim Entfernen des Updates - + Error Removing DLC Fehler beim Entfernen des DLCs - + Remove Installed Game Contents? Installierten Spiele-Content entfernen? - + Remove Installed Game Update? Installierte Spiele-Updates entfernen? - + Remove Installed Game DLC? Installierte Spiele-DLCs entfernen? - + Remove Entry Eintrag entfernen - - - - - - + + + + + + Successfully Removed Erfolgreich entfernt - + Successfully removed the installed base game. Das Spiel wurde entfernt. - + The base game is not installed in the NAND and cannot be removed. Das Spiel ist nicht im NAND installiert und kann somit nicht entfernt werden. - + Successfully removed the installed update. Das Update wurde entfernt. - + There is no update installed for this title. Es ist kein Update für diesen Titel installiert. - + There are no DLC installed for this title. Es sind keine DLC für diesen Titel installiert. - + Successfully removed %1 installed DLC. %1 DLC entfernt. - + Delete OpenGL Transferable Shader Cache? Transferierbaren OpenGL Shader Cache löschen? - + Delete Vulkan Transferable Shader Cache? Transferierbaren Vulkan Shader Cache löschen? - + Delete All Transferable Shader Caches? Alle transferierbaren Shader Caches löschen? - + Remove Custom Game Configuration? Spiel-Einstellungen entfernen? - + + Remove Cache Storage? + Cache-Speicher entfernen? + + + Remove File Datei entfernen - - + + Error Removing Transferable Shader Cache Fehler beim Entfernen - - + + A shader cache for this title does not exist. Es existiert kein Shader-Cache für diesen Titel. - + Successfully removed the transferable shader cache. Der transferierbare Shader-Cache wurde entfernt. - + Failed to remove the transferable shader cache. Konnte den transferierbaren Shader-Cache nicht entfernen. - + Error Removing Vulkan Driver Pipeline Cache Fehler beim Entfernen des Vulkan-Pipeline-Cache - + Failed to remove the driver pipeline cache. Fehler beim Entfernen des Driver-Pipeline-Cache - - + + Error Removing Transferable Shader Caches Fehler beim Entfernen der transferierbaren Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Fehler beim Entfernen - + A custom configuration for this title does not exist. Es existieren keine Spiel-Einstellungen für dieses Spiel. - + Successfully removed the custom game configuration. Die Spiel-Einstellungen wurden entfernt. - + Failed to remove the custom game configuration. Die Spiel-Einstellungen konnten nicht entfernt werden. - - + + RomFS Extraction Failed! RomFS-Extraktion fehlgeschlagen! - + There was an error copying the RomFS files or the user cancelled the operation. Das RomFS konnte wegen eines Fehlers oder Abbruchs nicht kopiert werden. - + Full Komplett - + Skeleton Nur Ordnerstruktur - + Select RomFS Dump Mode RomFS Extraktions-Modus auswählen - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Bitte wähle, wie das RomFS gespeichert werden soll.<br>"Full" wird alle Dateien des Spiels extrahieren, während <br>"Skeleton" nur die Ordnerstruktur erstellt. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Es ist nicht genügend Speicher (%1) vorhanden um das RomFS zu entpacken. Bitte sorge für genügend Speicherplatze oder wähle ein anderes Verzeichnis aus. (Emulation > Konfiguration > System > Dateisystem > Dump Root) - + Extracting RomFS... RomFS wird extrahiert... - - + + Cancel Abbrechen - + RomFS Extraction Succeeded! RomFS wurde extrahiert! - + The operation completed successfully. Der Vorgang wurde erfolgreich abgeschlossen. - - - - - + + + + + Create Shortcut Verknüpfung erstellen - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon Icon erstellen - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Fehler beim Öffnen von %1 - + Select Directory Verzeichnis auswählen - + Properties Einstellungen - + The game properties could not be loaded. Spiel-Einstellungen konnten nicht geladen werden. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch-Programme (%1);;Alle Dateien (*.*) - + Load File Datei laden - + Open Extracted ROM Directory Öffne das extrahierte ROM-Verzeichnis - + Invalid Directory Selected Ungültiges Verzeichnis ausgewählt - + The directory you have selected does not contain a 'main' file. Das Verzeichnis, das du ausgewählt hast, enthält keine 'main'-Datei. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Installierbares Switch-Programm (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submissions Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Dateien installieren - + %n file(s) remaining %n Datei verbleibend%n Dateien verbleibend - + Installing file "%1"... Datei "%1" wird installiert... - - + + Install Results NAND-Installation - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Um Konflikte zu vermeiden, raten wir Nutzern davon ab, Spiele im NAND zu installieren. Bitte nutze diese Funktion nur zum Installieren von Updates und DLC. - + %n file(s) were newly installed %n file was newly installed @@ -5078,400 +5159,400 @@ Bitte nutze diese Funktion nur zum Installieren von Updates und DLC. - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systemanwendung - + System Archive Systemarchiv - + System Application Update Systemanwendungsupdate - + Firmware Package (Type A) Firmware-Paket (Typ A) - + Firmware Package (Type B) Firmware-Paket (Typ B) - + Game Spiel - + Game Update Spiel-Update - + Game DLC Spiel-DLC - + Delta Title Delta-Titel - + Select NCA Install Type... Wähle den NCA-Installationstyp aus... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Bitte wähle, als was diese NCA installiert werden soll: (In den meisten Fällen sollte die Standardeinstellung 'Spiel' ausreichen.) - + Failed to Install Installation fehlgeschlagen - + The title type you selected for the NCA is invalid. Der Titel-Typ, den du für diese NCA ausgewählt hast, ist ungültig. - + File not found Datei nicht gefunden - + File "%1" not found Datei "%1" nicht gefunden - + OK OK - - + + Hardware requirements not met Hardwareanforderungen nicht erfüllt - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Dein System erfüllt nicht die empfohlenen Mindestanforderungen der Hardware. Meldung der Komptabilität wurde deaktiviert. - + Missing yuzu Account Fehlender yuzu-Account - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Um einen Kompatibilitätsbericht abzuschicken, musst du einen yuzu-Account mit yuzu verbinden.<br><br/>Um einen yuzu-Account zu verbinden, prüfe die Einstellungen unter Emulation &gt; Konfiguration &gt; Web. - + Error opening URL Fehler beim Öffnen der URL - + Unable to open the URL "%1". URL "%1" kann nicht geöffnet werden. - + TAS Recording TAS Aufnahme - + Overwrite file of player 1? Datei von Spieler 1 überschreiben? - + Invalid config detected Ungültige Konfiguration erkannt - + Handheld controller can't be used on docked mode. Pro controller will be selected. Handheld-Controller können nicht im Dock verwendet werden. Der Pro-Controller wird verwendet. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Das aktuelle Amiibo wurde entfernt - + Error Fehler - - + + The current game is not looking for amiibos Das aktuelle Spiel sucht nicht nach Amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo-Datei (%1);; Alle Dateien (*.*) - + Load Amiibo Amiibo laden - + Error loading Amiibo data Fehler beim Laden der Amiibo-Daten - + The selected file is not a valid amiibo Die ausgewählte Datei ist keine gültige Amiibo - + The selected file is already on use Die ausgewählte Datei wird bereits verwendet - + An unknown error occurred Ein unbekannter Fehler ist aufgetreten - + Capture Screenshot Screenshot aufnehmen - + PNG Image (*.png) PNG Bild (*.png) - + TAS state: Running %1/%2 TAS Zustand: Läuft %1/%2 - + TAS state: Recording %1 TAS Zustand: Aufnahme %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid TAS Zustand: Ungültig - + &Stop Running - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Skalierung: %1x - + Speed: %1% / %2% Geschwindigkeit: %1% / %2% - + Speed: %1% Geschwindigkeit: %1% - + Game: %1 FPS (Unlocked) Spiel: %1 FPS (Unbegrenzt) - + Game: %1 FPS Spiel: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HOCH - + GPU EXTREME GPU EXTREM - + GPU ERROR GPU FEHLER - + DOCKED DOCKED - + HANDHELD HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NULL - + NEAREST NÄCHSTER - - + + BILINEAR BILINEAR - + BICUBIC BIKUBISCH - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA KEIN AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE LAUTSTÄRKE: STUMM - + VOLUME: %1% Volume percentage (e.g. 50%) LAUTSTÄRKE: %1% - + Confirm Key Rederivation Schlüsselableitung bestätigen - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5484,37 +5565,37 @@ This will delete your autogenerated key files and re-run the key derivation modu Dieser Prozess wird die generierten Schlüsseldateien löschen und die Schlüsselableitung neu starten. - + Missing fuses Fuses fehlen - + - Missing BOOT0 - BOOT0 fehlt - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main fehlt - + - Missing PRODINFO - PRODINFO fehlt - + Derivation Components Missing Derivationskomponenten fehlen - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5522,39 +5603,49 @@ on your system's performance. Dies könnte, je nach Leistung deines Systems, bis zu einer Minute dauern. - + Deriving Keys Schlüsselableitung - + + System Archive Decryption Failed + + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target RomFS wählen - + Please select which RomFS you would like to dump. Wähle, welches RomFS du speichern möchtest. - + Are you sure you want to close yuzu? Bist du sicher, dass du yuzu beenden willst? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Bist du sicher, dass du die Emulation stoppen willst? Jeder nicht gespeicherte Fortschritt geht verloren. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5566,44 +5657,44 @@ Möchtest du dies umgehen und sie trotzdem beenden? GRenderWindow - - + + OpenGL not available! OpenGL nicht verfügbar! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu wurde nicht mit OpenGL-Unterstützung kompiliert. + - Error while initializing OpenGL! Fehler beim Initialisieren von OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Deine Grafikkarte unterstützt kein OpenGL oder du hast nicht den neusten Treiber installiert. - + Error while initializing OpenGL 4.6! Fehler beim Initialisieren von OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Deine Grafikkarte unterstützt OpenGL 4.6 nicht, oder du benutzt nicht die neuste Treiberversion.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Deine Grafikkarte unterstützt anscheinend nicht eine oder mehrere von yuzu benötigten OpenGL-Erweiterungen. Bitte stelle sicher, dass du den neusten Grafiktreiber installiert hast.<br><br>GL Renderer:<br>%1<br><br>Nicht unterstützte Erweiterungen:<br>%2 @@ -5662,117 +5753,122 @@ Möchtest du dies umgehen und sie trotzdem beenden? + Remove Cache Storage + Cache-Speicher entfernen + + + Remove OpenGL Pipeline Cache OpenGL-Pipeline-Cache entfernen - + Remove Vulkan Pipeline Cache Vulkan-Pipeline-Cache entfernen - + Remove All Pipeline Caches Alle Pipeline-Caches entfernen - + Remove All Installed Contents Alle installierten Inhalte entfernen - + Dump RomFS RomFS speichern - + Dump RomFS to SDMC - + RomFS nach SDMC dumpen - + Copy Title ID to Clipboard Title-ID in die Zwischenablage kopieren - + Navigate to GameDB entry GameDB-Eintrag öffnen - + Create Shortcut Verknüpfung erstellen - + Add to Desktop Zum Desktop hinzufügen - + Add to Applications Menu - + Properties Eigenschaften - + Scan Subfolders Unterordner scannen - + Remove Game Directory Spieleverzeichnis entfernen - + ▲ Move Up ▲ Nach Oben - + ▼ Move Down ▼ Nach Unten - + Open Directory Location Verzeichnis öffnen - + Clear Löschen - + Name Name - + Compatibility Kompatibilität - + Add-ons Add-ons - + File type Dateityp - + Size Größe @@ -5782,7 +5878,7 @@ Möchtest du dies umgehen und sie trotzdem beenden? Ingame - + Im Spiel @@ -5843,7 +5939,7 @@ Möchtest du dies umgehen und sie trotzdem beenden? GameListPlaceholder - + Double-click to add a new folder to the game list Doppelklicke, um einen neuen Ordner zur Spieleliste hinzuzufügen. @@ -5856,12 +5952,12 @@ Möchtest du dies umgehen und sie trotzdem beenden? %1 von %n Ergebnis%1 von %n Ergebnisse - + Filter: Filter: - + Enter pattern to filter Wörter zum Filtern eingeben @@ -5951,12 +6047,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute Audio aktivieren / deaktivieren - @@ -5978,111 +6073,112 @@ Debug Message: + Main Window Hauptfenster - + Audio Volume Down Lautstärke verringern - + Audio Volume Up Lautstärke erhöhen - + Capture Screenshot Screenshot aufnehmen - + Change Adapting Filter Adaptiven Filter ändern - + Change Docked Mode - + Change GPU Accuracy GPU-Genauigkeit ändern - + Continue/Pause Emulation Emulation fortsetzen/pausieren - + Exit Fullscreen Vollbild verlassen - + Exit yuzu yuzu verlassen - + Fullscreen Vollbild - + Load File Datei laden - + Load/Remove Amiibo Amiibo laden/entfernen - + Restart Emulation Emulation neustarten - + Stop Emulation Emulation stoppen - + TAS Record TAS aufnehmen - + TAS Reset TAS neustarten - + TAS Start/Stop TAS starten/stoppen - + Toggle Filter Bar - + Toggle Framerate Limit - + Aktiviere Bildraten Limitierung - + Toggle Mouse Panning - + Toggle Status Bar @@ -6625,7 +6721,7 @@ Debug Message: Unable to find an internet connection. Check your internet settings. - + Es konnte keine Internetverbindung hergestellt werden. Überprüfe deine Interneteinstellungen. @@ -6645,7 +6741,7 @@ Debug Message: The host of the room has banned you. Speak with the host to unban you or try a different room. - + Der Ersteller des Raumes hat dich gebannt. Wende dich an den Ersteller, um den Bann aufzuheben oder probiere einen anderen Raum aus. @@ -6704,7 +6800,7 @@ Please go to Configure -> System -> Network and make a selection. Joining a room when the game is already running is discouraged and can cause the room feature not to work correctly. Proceed anyway? - + Einen Raum beizutreten während das Spiel bereits läuft wird nicht empfohlen und könnte zu Problemen mit dem Raum führen. Trotzdem fortfahren? @@ -6714,7 +6810,7 @@ Proceed anyway? You are about to close the room. Any network connections will be closed. - + Du bist dabei den Raum zu schließen. Jede Verbindung zum Netzwerk wird geschlossen. @@ -6724,7 +6820,7 @@ Proceed anyway? You are about to leave the room. Any network connections will be closed. - + Du bist dabei den Raum zu verlassen. Jede Verbindung zum Netzwerk wird geschlossen. @@ -6771,7 +6867,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE START/PAUSE @@ -6821,21 +6917,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Strg - + Alt Alt @@ -6843,8 +6939,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [nicht gesetzt] @@ -6859,10 +6955,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Achse %1%2 @@ -6876,163 +6972,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [unbekannt] - - + + Left Links - - + + Right Rechts - - + + Down Runter - - + + Up Hoch - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Start - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle Kreis - + Cross Kreuz - + Square Quadrat - + Triangle Dreieck - + Share Teilen - + Options Optionen - + [undefined] [undefiniert] @@ -7043,7 +7139,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [ungültig] @@ -7057,21 +7153,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2Achse %3 - + %1%2Axis %3,%4,%5 %1%2Achse %3,%4,%5 - + %1%2Motion %3 %1%2Bewegung %3 @@ -7083,106 +7177,112 @@ p, li { white-space: pre-wrap; } - + [unused] [unbenutzt] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L - + Stick L - + Stick R - + Stick R - + Plus Plus - + Minus Minus - - + + Home Home - + Capture Screenshot - + Touch Touch - + Wheel Indicates the mouse wheel Mausrad - + Backward Rückwärts - + Forward Vorwärts - + Task Aufgabe - + Extra Extra - + %1%2%3%4 - - + + %1%2%3Hat %4 - - + + + %1%2%3Axis %4 + + + + + %1%2%3Button %4 @@ -7232,7 +7332,7 @@ p, li { white-space: pre-wrap; } Creation Date - + Erstellungsdatum @@ -7242,7 +7342,7 @@ p, li { white-space: pre-wrap; } Modification Date - + Modifizierungsdatum @@ -7252,12 +7352,12 @@ p, li { white-space: pre-wrap; } Game Data - + Spieldaten Game Id - + Spiel ID @@ -7277,7 +7377,7 @@ p, li { white-space: pre-wrap; } No game data present - + Keine Spieldaten vorhanden @@ -7287,12 +7387,12 @@ p, li { white-space: pre-wrap; } The following game data will removed: - + Die folgenden Spieldaten werden entfernt: Set nickname and owner: - + Spitzname und Besitzer festlegen: @@ -7603,73 +7703,73 @@ Bitte versuche es noch einmal oder kontaktiere den Entwickler der Software.Nutzer - + Profile Creator - + Profil Ersteller - - + + Profile Selector Profilauswahl - + Profile Icon Editor - + Profil-Icon Editor - + Profile Nickname Editor - + Profil-Spitzname Editor - + Who will receive the points? - + Wer wird die Punkte erhalten? - + Who is using Nintendo eShop? - + Wer verwendet den Nintendo eShop? - + Who is making this purchase? - + Wer macht den Einkauf? - + Who is posting? - + Wer postet? - + Select a user to link to a Nintendo Account. - + Wähle einen Nutzer aus, den du mit dem Nintendo Account verknüpfen willst. - + Change settings for which user? - + Für welchen Nutzer sollen die Einstellungen geändert werden? - + Format data for which user? - + Daten für welchen Nutzer formatieren? - + Which user will be transferred to another console? - + Welcher Nutzer wird auf eine andere Konsole übertragen? - + Send save data for which user? - + Select a user: Wähle einen Benutzer aus: diff --git a/dist/languages/el.ts b/dist/languages/el.ts index 19abc7939..2d16da565 100644 --- a/dist/languages/el.ts +++ b/dist/languages/el.ts @@ -25,7 +25,13 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">yuzu is an experimental open-source emulator for the Nintendo Switch licensed under GPLv3.0+.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">This software should not be used to play games you have not legally obtained.</span></p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Το yuzu είναι ένας πειραματικός εξομοιωτής ανοιχτού κώδικα για το Nintendo Switch κάτω από την άδεια χρήσης GPLv3.0+.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Αυτό το λογισμικό δεν πρέπει να χρησιμοποιείται για την αναπαραγωγή παιχνιδιών που δεν έχετε αποκτήσει νόμιμα.</span></p></body></html> @@ -35,7 +41,7 @@ p, li { white-space: pre-wrap; } <html><head/><body><p><span style=" font-size:7pt;">&quot;Nintendo Switch&quot; is a trademark of Nintendo. yuzu is not affiliated with Nintendo in any way.</span></p></body></html> - <html><head/><body><p><span style=" font-size:7pt;">Το &quot;Nintendo Switch&quot; είναι ένα εμπορικό σήμα της Nintendo. Ο yuzu δε συνδέεται με την Nintendo με κανέναν τρόπο.</span></p></body></html> + <html><head/><body><p><span style=" font-size:7pt;">Το &quot;Nintendo Switch&quot; είναι ένα εμπορικό σήμα της Nintendo. Το yuzu δεν συνδέεται με την Nintendo με κανέναν τρόπο.</span></p></body></html> @@ -68,7 +74,7 @@ p, li { white-space: pre-wrap; } OK - OK + Εντάξει @@ -76,95 +82,97 @@ p, li { white-space: pre-wrap; } Room Window - + Παράθυρο Δωματίου Send Chat Message - + Αποστολή Μηνύματος Συνομιλίας Send Message - + Αποστολή Μηνύματος Members - + Μέλη %1 has joined - + Ο %1 έχει συνδεθεί %1 has left - + Ο %1 αποχώρησε %1 has been kicked - + Ο %1 έχει διωχθεί %1 has been banned - + Ο %1 έχει αποκλειστεί %1 has been unbanned - + Ο %1 έχει καταργηθεί από τους αποκλεισμένους View Profile - + Εμφάνιση Προφίλ Block Player - + Αποκλεισμός Παίχτη When you block a player, you will no longer receive chat messages from them.<br><br>Are you sure you would like to block %1? - + Όταν αποκλείετε έναν παίκτη, δεν θα λαμβάνετε πλέον μηνύματα συνομιλίας από αυτόν. Είστε βέβαιοι ότι θέλετε να αποκλείσετε τον %1; Kick - + Διώξιμο Ban - + Αποκλεισμός Kick Player - + Διώξιμο Παίχτη Are you sure you would like to <b>kick</b> %1? - + Είστε βέβαιοι ότι θέλετε να <b>διώξετε</b> τον %1; Ban Player - + Αποκλεισμός Παίκτη Are you sure you would like to <b>kick and ban</b> %1? This would ban both their forum username and their IP address. - + Είστε βέβαιοι ότι θέλετε να <b>διώξετε και να αποκλείσετε</b> τον %1; + +Αυτό θα απαγόρευε τόσο το όνομα χρήστη του φόρουμ όσο και τη διεύθυνση IP τους. @@ -172,12 +180,12 @@ This would ban both their forum username and their IP address. Room Window - + Παράθυρο Δωματίου Room Description - + Περιγραφή Δωματίου @@ -187,7 +195,7 @@ This would ban both their forum username and their IP address. Leave Room - Αποχωρήσει από το δωμάτιο + Αποχώρηση Δωματίου @@ -200,7 +208,7 @@ This would ban both their forum username and their IP address. Disconnected - + Αποσυνδεμένο @@ -213,7 +221,7 @@ This would ban both their forum username and their IP address. Report Compatibility - Αναφορά συμβατότητας + Αναφορά Συμβατότητας @@ -224,12 +232,12 @@ This would ban both their forum username and their IP address. Report Game Compatibility - Αναφορά συμβατότητας παιχνιδιού + Αναφορά Συμβατότητας Παιχνιδιού <html><head/><body><p><span style=" font-size:10pt;">Should you choose to submit a test case to the </span><a href="https://yuzu-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">yuzu Compatibility List</span></a><span style=" font-size:10pt;">, The following information will be collected and displayed on the site:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Hardware Information (CPU / GPU / Operating System)</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Which version of yuzu you are running</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The connected yuzu account</li></ul></body></html> - <html><head/><body><p><span style=" font-size:10pt;">Αν επιλέξετε να υποβάλλετε μια υπόθεση για τεστ στη </span><a href="https://yuzu-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">Λίστα Συμβατότητας του yuzu</span></a><span style=" font-size:10pt;">, Οι ακόλουθες πληροφορίες θα μαζευτούν και θα προβληθούν στο site:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Πληροφορίες Υλικού (CPU / GPU / Λειτουργικό Σύστημα)</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ποιά έκδοση του yuzu τρέχετε </li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Τον συνδεδεμένο λογαριασμό yuzu</li></ul></body></html> + <html><head/><body><p><span style=" font-size:10pt;">Εάν επιλέξετε να υποβάλετε μια υπόθεση δοκιμής στη </span><a href="https://yuzu-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">Λίστα Συμβατότητας του yuzu</span></a><span style=" font-size:10pt;">, Οι ακόλουθες πληροφορίες θα συλλεχθούν και θα προβληθούν στον ιστότοπο:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Πληροφορίες Υλικού (CPU / GPU / Λειτουργικό Σύστημα)</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ποιά έκδοση του yuzu τρέχετε </li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Τον συνδεδεμένο λογαριασμό yuzu</li></ul></body></html> @@ -1118,78 +1126,78 @@ This would ban both their forum username and their IP address. Διαμόρφωση yuzu - - + + Audio Ήχος - - + + CPU CPU - + Debug Αποσφαλμάτωση - + Filesystem Σύστημα Αρχείων - - + + General Γενικά - - + + Graphics Γραφικά - + GraphicsAdvanced - + Hotkeys Πλήκτρα Συντόμευσης - - + + Controls Χειρισμός - + Profiles Τα προφίλ - + Network Δίκτυο - - + + System Σύστημα - + Game List Λίστα Παιχνιδιών - + Web Ιστός @@ -1364,41 +1372,36 @@ This would ban both their forum username and their IP address. - Extended memory layout (8GB DRAM) - - - - Confirm exit while emulation is running Επιβεβαίωση εξόδου κατά την εκτέλεση εξομοίωσης - + Prompt for user on game boot Επιλογή χρήστη κατά την εκκίνηση παιχνιδιού - + Pause emulation when in background Παύση εξομοίωσης όταν βρίσκεται στο παρασκήνιο - + Hide mouse on inactivity Απόκρυψη δρομέα ποντικιού στην αδράνεια - + Reset All Settings Επαναφορά Όλων των Ρυθμίσεων - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Επαναφέρει όλες τις ρυθμίσεις και καταργεί όλες τις επιλογές ανά παιχνίδι. Δεν θα διαγράψει καταλόγους παιχνιδιών, προφίλ ή προφίλ εισόδου. Συνέχιση; @@ -1437,7 +1440,7 @@ This would ban both their forum username and their IP address. - + None Κανένα @@ -1463,231 +1466,269 @@ This would ban both their forum username and their IP address. + VSync Mode: + + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: Εξομοίωση NVDEC: - + No Video Output Χωρίς Έξοδο Βίντεο - + CPU Video Decoding Αποκωδικοποίηση Βίντεο CPU - + GPU Video Decoding (Default) Αποκωδικοποίηση Βίντεο GPU (Προεπιλογή) - + Fullscreen Mode: Λειτουργία Πλήρους Οθόνης: - + Borderless Windowed Παραθυροποιημένο Χωρίς Όρια - + Exclusive Fullscreen Αποκλειστική Πλήρης Οθόνη - + Aspect Ratio: Αναλογία Απεικόνισης: - + Default (16:9) Προεπιλογή (16:9) - + Force 4:3 Επιβολή 4:3 - + Force 21:9 Επιβολή 21:9 - + Force 16:10 Επιβολή 16:10 - + Stretch to Window Επέκταση στο Παράθυρο - + Resolution: Ανάλυση: - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [ΠΕΙΡΑΜΑΤΙΚΟ] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [ΠΕΙΡΑΜΑΤΙΚΟ] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) - + 8X (5760p/8640p) - + Window Adapting Filter: Φίλτρο Προσαρμογής Παραθύρου: - + Nearest Neighbor Πλησιέστερος Γείτονας - + Bilinear Διγραμμικό - + Bicubic Δικυβικό - + Gaussian Gaussian - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: Μέθοδος Anti-Aliasing: - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% 100% - - + + Use global background color Χρησιμοποιήστε καθολικό χρώμα φόντου - + Set background color: Ορισμός χρώματος φόντου: - + Background Color: Χρώμα Φόντου: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (Shaders Γλώσσας Μηχανής, μόνο NVIDIA) - + SPIR-V (Experimental, Mesa Only) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + + + + + VSync Off + + + + + Recommended + + + + + On + + + + + VSync On + + ConfigureGraphicsAdvanced @@ -1712,107 +1753,133 @@ This would ban both their forum username and their IP address. Επίπεδο Ακρίβειας: - - Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - - - - - Force maximum clocks (Vulkan only) - - - - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - Το VSync αποτρέπει το "σκίσιμο" της οθόνης, αλλά ορισμένες κάρτες γραφικών έχουν χαμηλότερη απόδοση με ενεργοποιημένο το VSync. Διατηρήστε το ενεργοποιημένο εάν δεν παρατηρείτε διαφορά απόδοσης. - - - - Use VSync - Χρήση VSync - - - - Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + ASTC recompression: + Uncompressed (Best quality) + + + + + BC1 (Low quality) + + + + + BC3 (Medium quality) + + + + + Enable asynchronous presentation (Vulkan only) + + + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + + + + + Force maximum clocks (Vulkan only) + + + + + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + Decode ASTC textures asynchronously (Hack) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + + + + + Enable Reactive Flushing + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Ενεργοποιεί τη σύνταξη ασύγχρονων shader, η οποία μπορεί να μειώσει το shader stutter. Αυτή η δυνατότητα είναι πειραματική. - + Use asynchronous shader building (Hack) Χρήση ασύγχρονης σύνταξης σκίασης (Τέχνασμα) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Ενεργοποιεί τον Γοργό Ρυθμό GPU. Αυτή η επιλογή θα αναγκάσει τα περισσότερα παιχνίδια να εκτελούνται στην υψηλότερη εγγενή τους ανάλυση. - + Use Fast GPU Time (Hack) Χρήση Γοργού Ρυθμού GPU (Τέχνασμα) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - Ενεργοποιεί περιστασιακές εκκαθαρίσεις των ρυθμιστικών διαύλων. Αυτή η επιλογή θα αναγκάσει τους μη τροποποιημένους ρυθμιστικούς διαύλους να εκκαθαριστούν, πράγμα που μπορεί να κοστίσει σε απόδοση. - - - - Use pessimistic buffer flushes (Hack) - Χρήση περιστασιακών εκκαθαρίσεων ρυθμιστικού διαύλου (Hack) - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + + + + + Enable Compute Pipelines (Intel Vulkan only) + + + + Anisotropic Filtering: Ανισοτροπικό Φιλτράρισμα: - + Automatic Αυτόματα - + Default Προεπιλεγμένο - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1845,70 +1912,65 @@ This would ban both their forum username and their IP address. Επαναφορά Προεπιλογών - + Action Δράση - + Hotkey Πλήκτρο Συντόμευσης - + Controller Hotkey Πλήκτρο Συντόμευσης Χειριστηρίου - - - + + + Conflicting Key Sequence Αντικρουόμενη Ακολουθία Πλήκτρων - - + + The entered key sequence is already assigned to: %1 Η εισαγόμενη ακολουθία πλήκτρων έχει ήδη αντιστοιχιστεί στο: %1 - - Home+%1 - - - - + [waiting] [αναμονή] - + Invalid Μη Έγκυρο - + Restore Default Επαναφορά Προκαθορισμένων - + Clear Καθαρισμός - + Conflicting Button Sequence Αντικρουόμενη Ακολουθία Κουμπιών - + The default button sequence is already assigned to: %1 Η προεπιλεγμένη ακολουθία κουμπιών έχει ήδη αντιστοιχιστεί στο: %1 - + The default key sequence is already assigned to: %1 Η προεπιλεγμένη ακολουθία πλήκτρων έχει ήδη αντιστοιχιστεί στο: %1 @@ -2200,7 +2262,7 @@ This would ban both their forum username and their IP address. - + Configure Διαμόρφωση @@ -2257,22 +2319,32 @@ This would ban both their forum username and their IP address. - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + + + + + Use random Amiibo ID + + + + Enable mouse panning Ενεργοποιήστε τη μετατόπιση του ποντικιού - + Mouse sensitivity Ευαισθησία ποντικιού - + % % - + Motion / Touch @@ -2384,7 +2456,7 @@ This would ban both their forum username and their IP address. - + Left Stick Αριστερό Stick @@ -2478,14 +2550,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2504,7 +2576,7 @@ This would ban both their forum username and their IP address. - + Plus Συν @@ -2517,15 +2589,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2582,241 +2654,247 @@ This would ban both their forum username and their IP address. - + Right Stick Δεξιός Μοχλός - - - - + + + + Clear Καθαρισμός - - - - - + + + + + [not set] [άδειο] - - + + + Invert button Κουμπί αντιστροφής - - + + Toggle button Κουμπί εναλλαγής - + Turbo button - - + + Invert axis Αντιστροφή άξονα - - - + + + Set threshold Ορισμός ορίου - - + + Choose a value between 0% and 100% Επιλέξτε μια τιμή μεταξύ 0% και 100% - + Toggle axis Εναλλαγή αξόνων - + Set gyro threshold Ρύθμιση κατωφλίου γυροσκοπίου - + + Calibrate sensor + + + + Map Analog Stick Χαρτογράφηση Αναλογικού Stick - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Αφού πατήσετε OK, μετακινήστε πρώτα το joystick σας οριζόντια και μετά κατακόρυφα. Για να αντιστρέψετε τους άξονες, μετακινήστε πρώτα το joystick κατακόρυφα και μετά οριζόντια. - + Center axis Κεντρικός άξονας - - + + Deadzone: %1% Νεκρή Ζώνη: %1% - - + + Modifier Range: %1% Εύρος Τροποποιητή: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Διπλά Joycons - + Left Joycon Αριστερό Joycon - + Right Joycon Δεξί Joycon - + Handheld Handheld - + GameCube Controller Χειριστήριο GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Χειριστήριο NES - + SNES Controller Χειριστήριο SNES - + N64 Controller Χειριστήριο N64 - + Sega Genesis Sega Genesis - + Start / Pause - + Z Z - + Control Stick - + C-Stick C-Stick - + Shake! - + [waiting] [αναμονή] - + New Profile Νέο Προφίλ - + Enter a profile name: Εισαγάγετε ένα όνομα προφίλ: - - + + Create Input Profile Δημιουργία Προφίλ Χειρισμού - + The given profile name is not valid! Το όνομα του προφίλ δεν είναι έγκυρο! - + Failed to create the input profile "%1" Η δημιουργία του προφίλ χειρισμού "%1" απέτυχε - + Delete Input Profile Διαγραφή Προφίλ Χειρισμού - + Failed to delete the input profile "%1" Η διαγραφή του προφίλ χειρισμού "%1" απέτυχε - + Load Input Profile Φόρτωση Προφίλ Χειρισμού - + Failed to load the input profile "%1" Η φόρτωση του προφίλ χειρισμού "%1" απέτυχε - + Save Input Profile Αποθήκευση Προφίλ Χειρισμού - + Failed to save the input profile "%1" Η αποθήκευση του προφίλ χειρισμού "%1" απέτυχε @@ -3071,47 +3149,47 @@ To invert the axes, first move your joystick vertically, and then horizontally.< Προγραμματιστής - + Add-Ons Πρόσθετα - + General Γενικά - + System Σύστημα - + CPU CPU - + Graphics Γραφικά - + Adv. Graphics Προχ. Γραφικά - + Audio Ήχος - + Input Profiles - + Properties Ιδιότητες @@ -3831,7 +3909,12 @@ UUID: %2 - + + Unsafe extended memory layout (8GB DRAM) + + + + System settings are available only when game is not running. Οι ρυθμίσεις συστήματος είναι διαθέσιμες μόνο όταν το παιχνίδι δεν εκτελείται. @@ -4526,105 +4609,105 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? - + Telemetry Τηλεμετρία - + Broken Vulkan Installation Detected - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... - - + + Disable Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Πόσα καρέ ανά δευτερόλεπτο εμφανίζει το παιχνίδι αυτή τη στιγμή. Αυτό διαφέρει από παιχνίδι σε παιχνίδι και από σκηνή σε σκηνή. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. - + &Clear Recent Files - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Συνέχεια - + &Pause &Παύση - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Μη μεταφρασμένη συμβολοσειρά @@ -4632,850 +4715,855 @@ Drag points to change position, or double-click table cells to edit values. - - + + Error while loading ROM! Σφάλμα κατά τη φόρτωση της ROM! - + The ROM format is not supported. - + An error occurred initializing the video core. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Εμφανίστηκε ένα απροσδιόριστο σφάλμα. Ανατρέξτε στο αρχείο καταγραφής για περισσότερες λεπτομέρειες. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Αποθήκευση δεδομένων - + Mod Data - + Error Opening %1 Folder - - + + Folder does not exist! Ο φάκελος δεν υπάρχει! - + Error Opening Transferable Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + + Remove Cache Storage? + + + + Remove File Αφαίρεση Αρχείου - - + + Error Removing Transferable Shader Cache - - + + A shader cache for this title does not exist. - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! - + There was an error copying the RomFS files or the user cancelled the operation. - + Full - + Skeleton - + Select RomFS Dump Mode Επιλογή λειτουργίας απόρριψης RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Μη αποθηκευμένη μετάφραση. Παρακαλούμε επιλέξτε τον τρόπο με τον οποίο θα θέλατε να γίνει η απόρριψη της RomFS.<br> Η επιλογή Πλήρης θα αντιγράψει όλα τα αρχεία στο νέο κατάλογο, ενώ η επιλογή <br> Σκελετός θα δημιουργήσει μόνο τη δομή του καταλόγου. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... - - + + Cancel Ακύρωση - + RomFS Extraction Succeeded! - + The operation completed successfully. Η επέμβαση ολοκληρώθηκε με επιτυχία. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 - + Select Directory Επιλογή καταλόγου - + Properties Ιδιότητες - + The game properties could not be loaded. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. - + Load File Φόρτωση αρχείου - + Open Extracted ROM Directory - + Invalid Directory Selected - + The directory you have selected does not contain a 'main' file. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files - + %n file(s) remaining - + Installing file "%1"... - - + + Install Results Αποτελέσματα εγκατάστασης - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Εφαρμογή συστήματος - + System Archive - + System Application Update - + Firmware Package (Type A) - + Firmware Package (Type B) - + Game Παιχνίδι - + Game Update Ενημέρωση παιχνιδιού - + Game DLC DLC παιχνιδιού - + Delta Title - + Select NCA Install Type... Επιλέξτε τον τύπο εγκατάστασης NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) - + Failed to Install - + The title type you selected for the NCA is invalid. - + File not found Το αρχείο δεν βρέθηκε - + File "%1" not found Το αρχείο "%1" δεν βρέθηκε - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. - + Error opening URL Σφάλμα κατα το άνοιγμα του URL - + Unable to open the URL "%1". Αδυναμία ανοίγματος του URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo Amiibo - - + + The current amiibo has been removed - + Error Σφάλμα - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) - + Load Amiibo Φόρτωση Amiibo - + Error loading Amiibo data Σφάλμα φόρτωσης δεδομένων Amiibo - + The selected file is not a valid amiibo Το επιλεγμένο αρχείο δεν αποτελεί έγκυρο amiibo - + The selected file is already on use Το επιλεγμένο αρχείο χρησιμοποιείται ήδη - + An unknown error occurred - + Capture Screenshot Λήψη στιγμιότυπου οθόνης - + PNG Image (*.png) Εικόνα PBG (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Έναρξη - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Κλίμακα: %1x - + Speed: %1% / %2% Ταχύτητα: %1% / %2% - + Speed: %1% Ταχύτητα: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS - + Frame: %1 ms Καρέ: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR FSR - - + + NO AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5486,76 +5574,86 @@ This will delete your autogenerated key files and re-run the key derivation modu - + Missing fuses - + - Missing BOOT0 - Λείπει το BOOT0 - + - Missing BCPKG2-1-Normal-Main - Λείπει το BCPKG2-1-Normal-Main - + - Missing PRODINFO - Λείπει το PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. - + Deriving Keys - + + System Archive Decryption Failed + + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target - + Please select which RomFS you would like to dump. - + Are you sure you want to close yuzu? Είστε σίγουροι ότι θέλετε να κλείσετε το yuzu; - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5565,44 +5663,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! Το OpenGL δεν είναι διαθέσιμο! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. + - Error while initializing OpenGL! Σφάλμα κατα την αρχικοποίηση του OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. - + Error while initializing OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 @@ -5661,117 +5759,122 @@ Would you like to bypass this and exit anyway? - Remove OpenGL Pipeline Cache + Remove Cache Storage + Remove OpenGL Pipeline Cache + + + + Remove Vulkan Pipeline Cache - + Remove All Pipeline Caches Καταργήστε Όλη την Κρυφή μνήμη του Pipeline - + Remove All Installed Contents Καταργήστε Όλο το Εγκατεστημένο Περιεχόμενο - + Dump RomFS Απόθεση του RomFS - + Dump RomFS to SDMC Απόθεση του RomFS στο SDMC - + Copy Title ID to Clipboard Αντιγραφή του Title ID στο Πρόχειρο - + Navigate to GameDB entry Μεταβείτε στην καταχώρηση GameDB - + Create Shortcut - + Add to Desktop - + Add to Applications Menu - + Properties Ιδιότητες - + Scan Subfolders Σκανάρισμα Υποφακέλων - + Remove Game Directory Αφαίρεση Φακέλου Παιχνιδιών - + ▲ Move Up ▲ Μετακίνηση Επάνω - + ▼ Move Down ▼ Μετακίνηση Κάτω - + Open Directory Location Ανοίξτε την Τοποθεσία Καταλόγου - + Clear Καθαρισμός - + Name Όνομα - + Compatibility Συμβατότητα - + Add-ons Πρόσθετα - + File type Τύπος αρχείου - + Size Μέγεθος @@ -5842,7 +5945,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list Διπλο-κλικ για προσθήκη νεου φακέλου στη λίστα παιχνιδιών @@ -5855,12 +5958,12 @@ Would you like to bypass this and exit anyway? - + Filter: Φίλτρο: - + Enter pattern to filter Εισαγάγετε μοτίβο για φιλτράρισμα @@ -5910,7 +6013,7 @@ Would you like to bypass this and exit anyway? Room Description - + Περιγραφή Δωματίου @@ -5950,12 +6053,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute - @@ -5977,111 +6079,112 @@ Debug Message: + Main Window - + Audio Volume Down - + Audio Volume Up - + Capture Screenshot Λήψη στιγμιότυπου οθόνης - + Change Adapting Filter - + Change Docked Mode - + Change GPU Accuracy - + Continue/Pause Emulation - + Exit Fullscreen - + Exit yuzu - + Fullscreen Πλήρη Οθόνη - + Load File Φόρτωση αρχείου - + Load/Remove Amiibo - + Restart Emulation - + Stop Emulation - + TAS Record - + TAS Reset - + TAS Start/Stop - + Toggle Filter Bar - + Toggle Framerate Limit - + Toggle Mouse Panning - + Toggle Status Bar @@ -6768,7 +6871,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE @@ -6818,21 +6921,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6840,8 +6943,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [μη ορισμένο] @@ -6856,10 +6959,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Άξονας%1%2 @@ -6873,163 +6976,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [άγνωστο] - - + + Left Αριστερά - - + + Right Δεξιά - - + + Down Κάτω - - + + Up Πάνω - + Z Z - + R R - + L L - + A A - + B B - + X Χ - + Y Υ - + Start - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle - + Cross - + Square - + Triangle - + Share - + Options - + [undefined] @@ -7040,7 +7143,7 @@ p, li { white-space: pre-wrap; } - + [invalid] @@ -7054,21 +7157,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 - + %1%2Axis %3,%4,%5 - + %1%2Motion %3 @@ -7080,106 +7181,112 @@ p, li { white-space: pre-wrap; } - + [unused] [άδειο] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L - + Stick R - + Plus Συν - + Minus Μείον - - + + Home Αρχική - + Capture Στιγμιότυπο - + Touch - + Wheel Indicates the mouse wheel - + Backward - + Forward - + Task - + Extra - + %1%2%3%4 - - + + %1%2%3Hat %4 - - + + + %1%2%3Axis %4 + + + + + %1%2%3Button %4 @@ -7594,73 +7701,73 @@ Please try again or contact the developer of the software. Χρήστες - + Profile Creator - - + + Profile Selector - + Profile Icon Editor - + Profile Nickname Editor - + Who will receive the points? - + Who is using Nintendo eShop? - + Who is making this purchase? - + Who is posting? - + Select a user to link to a Nintendo Account. - + Change settings for which user? - + Format data for which user? - + Which user will be transferred to another console? - + Send save data for which user? - + Select a user: Επιλογή Χρήστη diff --git a/dist/languages/es.ts b/dist/languages/es.ts index 7c7f97397..f57671af8 100644 --- a/dist/languages/es.ts +++ b/dist/languages/es.ts @@ -29,9 +29,9 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">yuzu es un emulador experimental código abierto de Nintendo Switch licenciada bajo GPLv3.0+.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">yuzu es un emulador experimental de código abierto de Nintendo Switch licenciada bajo GPLv3.0+.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Este software no debe ser utilizado para jugar a juegos que no se hayan obtenido legalmente.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Este software no debe ser utilizado para jugar a juegos que no se hayan obtenido de forma legal.</span></p></body></html> @@ -1059,7 +1059,7 @@ Esto banearía su nombre del foro y su dirección IP. Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - Permite que yuzu compruebe si el entorno de Vulkan funciona cuando el programa se inicia. Desactiva esto si está causando problemas con los programas externos ligados a yuzu. + Permite a yuzu comprobar si el entorno de Vulkan funciona cuando el programa se inicia. Desactiva esto si está causando problemas con los programas externos ligados a yuzu. @@ -1137,78 +1137,78 @@ Esto banearía su nombre del foro y su dirección IP. Configuración de yuzu - - + + Audio Audio - - + + CPU CPU - + Debug Depuración - + Filesystem Sistema de archivos - - + + General General - - + + Graphics Gráficos - + GraphicsAdvanced Gráficosavanzados - + Hotkeys Teclas de acceso rápido - - + + Controls Controles - + Profiles Perfiles - + Network Red - - + + System Sistema - + Game List Lista de juegos - + Web Web @@ -1383,41 +1383,36 @@ Esto banearía su nombre del foro y su dirección IP. - Extended memory layout (8GB DRAM) - Interfaz de memoria extendida (8GB DRAM) - - - Confirm exit while emulation is running Confirmar salida mientras se ejecuta la emulación - + Prompt for user on game boot Mostrar usuario actual al abrir el juego - + Pause emulation when in background Pausar emulación cuando la ventana esté en segundo plano - + Hide mouse on inactivity Ocultar el cursor en caso de inactividad. - + Reset All Settings Reiniciar todos los ajustes - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Esto reiniciará y eliminará todas las configuraciones de los juegos. No eliminará ni los directorios de juego, ni los perfiles, ni los perfiles de los mandos. ¿Continuar? @@ -1456,7 +1451,7 @@ Esto banearía su nombre del foro y su dirección IP. - + None Ninguno @@ -1482,231 +1477,272 @@ Esto banearía su nombre del foro y su dirección IP. + VSync Mode: + Modo VSync: + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + FIFO (VSync) no pierde frames ni muestra tearing, pero está limitado por la tasa de refresco de la pantalla. +FIFO Relaxed es similar a FIFO, pero permite el tearing tan pronto como se recupera de una ralentización. +Mailbox puede tener una latencia más baja que FIFO y no causa tearing, pero podría hacer perder frames. +Inmediato (sin sincronización) sólo muestra lo que está disponible y puede mostrar tearing. + + + NVDEC emulation: Emulación NVDEC: - + No Video Output Sin salida de vídeo - + CPU Video Decoding Decodificación de vídeo en la CPU - + GPU Video Decoding (Default) Decodificación de vídeo en GPU (Por defecto) - + Fullscreen Mode: Modo pantalla completa: - + Borderless Windowed Ventana sin bordes - + Exclusive Fullscreen Pantalla completa - + Aspect Ratio: Relación de aspecto: - + Default (16:9) Valor predeterminado (16:9) - + Force 4:3 Forzar a 4:3 - + Force 21:9 Forzar a 21:9 - + Force 16:10 Forzar 16:10 - + Stretch to Window Ajustar a la ventana - + Resolution: Resolución: - + 0.5X (360p/540p) [EXPERIMENTAL] x0.5 (360p/540p) [EXPERIMENTAL] - + 0.75X (540p/810p) [EXPERIMENTAL] x0.75 (540p/810p) [EXPERIMENTAL] - + 1X (720p/1080p) x1 (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] x1.5 (1080p/1620p) [EXPERIMENTAL] - + 2X (1440p/2160p) x2 (1440p/2160p) - + 3X (2160p/3240p) x3 (2160p/3240p) - + 4X (2880p/4320p) x4 (2880p/4320p) - + 5X (3600p/5400p) x5 (3600p/5400p) - + 6X (4320p/6480p) x6 (4320p/6480p) - + 7X (5040p/7560p) x7 (5040p/7560p) - + 8X (5760p/8640p) x8 (5760p/8640p) - + Window Adapting Filter: Filtro adaptable de ventana: - + Nearest Neighbor Vecino más próximo - + Bilinear Bilineal - + Bicubic Bicúbico - + Gaussian Gaussiano - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: Método de Anti-Aliasing: - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness Usar nitidez global FSR - + Set FSR Sharpness Ajustar nitidez FSR - + FSR Sharpness: Nitidez FSR: - + 100% 100% - - + + Use global background color Usar el color de fondo global - + Set background color: Establecer el color de fondo: - + Background Color: Color de fondo: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (Shaders de ensamblado, sólo NVIDIA) - + SPIR-V (Experimental, Mesa Only) SPIR-V (Experimental, sólo Mesa) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + Desactivado + + + + VSync Off + VSync Desactivado + + + + Recommended + Recomendado + + + + On + Activado + + + + VSync On + VSync Activado + ConfigureGraphicsAdvanced @@ -1731,107 +1767,134 @@ Esto banearía su nombre del foro y su dirección IP. Nivel de precisión: - + + ASTC recompression: + Recompresión ASTC: + + + + Uncompressed (Best quality) + Sin compresión (Calidad óptima) + + + + BC1 (Low quality) + BC1 (Calidad baja) + + + + BC3 (Medium quality) + BC3 (Calidad media) + + + + Enable asynchronous presentation (Vulkan only) + Activar presentación asíncrona (sólo Vulkan) + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. Ejecuta los procesos en segundo plano mientras espera las instrucciones gráficas para evitar que la GPU reduzca su velocidad de reloj. - + Force maximum clocks (Vulkan only) Forzar relojes máximos (sólo Vulkan) - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - El VSync evita que la pantalla se distorsione, pero algunas tarjetas gráficas tienen un menor rendimiento con el VSync activado. Mantenlo activado si no notas diferencias en el rendimiento. - - - - Use VSync - Usar VSync - - - + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. Activa la decodificación de texturas asíncrona de ASTC, lo cuál podría reducir la duración de los parones. Esta función es experimental. - + Decode ASTC textures asynchronously (Hack) Decodificar texturas ASTC de manera asíncrona (Hack) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + Usa una limpieza reactiva en vez de una limpieza predictiva, permitiendo así una sincronización de memoria más precisa. + + + + Enable Reactive Flushing + Activar Limpieza Reactiva + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Activa la compilación de shaders en modo asíncrono, lo que puede reducir la sobrecarga de shaders. Esta función es experimental. - + Use asynchronous shader building (Hack) Usar la construcción de shaders asíncronos (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Activa el tiempo rápido de GPU. Esta opción hará que muchos juegos estén forzados a ejecutarse en su resolución nativa máxima. - + Use Fast GPU Time (Hack) Usar tiempo rápido en la GPU (Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - Activa el flujo de búferes pesado. Esta opción forzará el flujo de los búferes no modificados, lo que puede afectar al rendimiento. - - - - Use pessimistic buffer flushes (Hack) - Utilizar flujos de búferes pesados (Hack) - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. Activa la caché de canalización específica del fabricante de la GPU. Esta opción puede mejorar significativamente el tiempo de carga de sombreadores en los casos en los que el controlador de Vulkan no almacena internamente archivos de caché de canalización. - + Use Vulkan pipeline cache Usar caché de canalización de Vulkan - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + Activa las canalizaciones de cómputo, que son necesarias en algunos juegos. Esta opción sólo está para los drivers propietarios de AMD, y puede colgarse si se activa. +Las canalizaciones de cómputo están siempre activadas en los otros drivers. + + + + Enable Compute Pipelines (Intel Vulkan only) + Activar canalizaciones de cómputo (sólo Intel Vulkan) + + + Anisotropic Filtering: Filtrado anisotrópico: - + Automatic Automático - + Default Valor predeterminado - + 2x x2 - + 4x x4 - + 8x x8 - + 16x x16 @@ -1864,70 +1927,65 @@ Esto banearía su nombre del foro y su dirección IP. Restaurar valores predeterminados - + Action Acción - + Hotkey Tecla de acceso rápido - + Controller Hotkey Teclas de atajo del control - - - + + + Conflicting Key Sequence Combinación de teclas en conflicto - - + + The entered key sequence is already assigned to: %1 La combinación de teclas introducida ya ha sido asignada a: %1 - - Home+%1 - Home+%1 - - - + [waiting] [esperando] - + Invalid No válido - + Restore Default Restaurar valor predeterminado - + Clear Eliminar - + Conflicting Button Sequence Secuencia de botones en conflicto - + The default button sequence is already assigned to: %1 La secuencia de botones por defecto ya esta asignada a: %1 - + The default key sequence is already assigned to: %1 La combinación de teclas predeterminada ya ha sido asignada a: %1 @@ -2219,7 +2277,7 @@ Esto banearía su nombre del foro y su dirección IP. - + Configure Configurar @@ -2276,22 +2334,32 @@ Esto banearía su nombre del foro y su dirección IP. Activar driver directo Pro Controller [EXPERIMENTAL] - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + Permite usos ilimitados del mismo Amiibo en juegos que, de otra manera, sólo te permiten usarlo una vez. + + + + Use random Amiibo ID + Usar un ID de Amiibo aleatorio + + + Enable mouse panning Activar desplazamiento del ratón - + Mouse sensitivity Sensibilidad del ratón - + % % - + Motion / Touch Movimiento / táctil @@ -2403,7 +2471,7 @@ Esto banearía su nombre del foro y su dirección IP. - + Left Stick Palanca izquierda @@ -2497,14 +2565,14 @@ Esto banearía su nombre del foro y su dirección IP. - + L L - + ZL ZL @@ -2523,7 +2591,7 @@ Esto banearía su nombre del foro y su dirección IP. - + Plus Más @@ -2536,15 +2604,15 @@ Esto banearía su nombre del foro y su dirección IP. - - + + R R - + ZR ZR @@ -2601,241 +2669,247 @@ Esto banearía su nombre del foro y su dirección IP. - + Right Stick Palanca derecha - - - - + + + + Clear Borrar - - - - - + + + + + [not set] [no definido] - - + + + Invert button Invertir botón - - + + Toggle button Alternar botón - + Turbo button - Botón Turbo + Botón turbo - - + + Invert axis Invertir ejes - - - + + + Set threshold Configurar umbral - - + + Choose a value between 0% and 100% Seleccione un valor entre 0% y 100%. - + Toggle axis Alternar ejes - + Set gyro threshold Configurar umbral del Giroscopio - + + Calibrate sensor + Calibrar sensor + + + Map Analog Stick Configuración de palanca analógico - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Después de pulsar OK, mueve primero el joystick de manera horizontal, y luego verticalmente. Para invertir los ejes, mueve primero el joystick de manera vertical, y luego horizontalmente. - + Center axis Centrar ejes - - + + Deadzone: %1% Punto muerto: %1% - - + + Modifier Range: %1% Rango del modificador: %1% - - + + Pro Controller Controlador Pro - + Dual Joycons Joycons duales - + Left Joycon Joycon izquierdo - + Right Joycon Joycon derecho - + Handheld Portátil - + GameCube Controller Controlador de GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Controlador NES - + SNES Controller Controlador SNES - + N64 Controller Controlador N64 - + Sega Genesis Sega Genesis - + Start / Pause Inicio / Pausa - + Z Z - + Control Stick Palanca de control - + C-Stick C-Stick - + Shake! ¡Agita! - + [waiting] [esperando] - + New Profile Nuevo perfil - + Enter a profile name: Introduce un nombre de perfil: - - + + Create Input Profile Crear perfil de entrada - + The given profile name is not valid! ¡El nombre de perfil introducido no es válido! - + Failed to create the input profile "%1" Error al crear el perfil de entrada "%1" - + Delete Input Profile Eliminar perfil de entrada - + Failed to delete the input profile "%1" Error al eliminar el perfil de entrada "%1" - + Load Input Profile Cargar perfil de entrada - + Failed to load the input profile "%1" Error al cargar el perfil de entrada "%1" - + Save Input Profile Guardar perfil de entrada - + Failed to save the input profile "%1" Error al guardar el perfil de entrada "%1" @@ -3090,47 +3164,47 @@ Para invertir los ejes, mueve primero el joystick de manera vertical, y luego ho Desarrollador - + Add-Ons Extras / Add-Ons - + General General - + System Sistema - + CPU CPU - + Graphics Gráficos - + Adv. Graphics Gráficos avanz. - + Audio Audio - + Input Profiles Perfiles de entrada - + Properties Propiedades @@ -3434,7 +3508,7 @@ UUID: %2 The current mapped device doesn't have a ring attached - El dispositivo de entrada actual no tiene puesto el Ring + El dispositivo de entrada actual no tiene el Ring incorporado @@ -3851,7 +3925,12 @@ UUID: %2 Nombre del dispositivo - + + Unsafe extended memory layout (8GB DRAM) + Interfaz de memoria extendida no segura (8GB DRAM) + + + System settings are available only when game is not running. Los ajustes del sistema sólo se encuentran disponibles cuando no se esté ejecutando ningún juego. @@ -4547,555 +4626,560 @@ Arrastra los puntos para cambiar de posición, o haz doble clic en las celdas de GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Los datos de uso anónimos se recogen</a> para ayudar a mejorar yuzu. <br/><br/>¿Deseas compartir tus datos de uso con nosotros? - + Telemetry Telemetría - + Broken Vulkan Installation Detected Se ha detectado una instalación corrupta de Vulkan - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. La inicialización de Vulkan ha fallado durante la ejecución. Haz clic <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>aquí para más información sobre como arreglar el problema</a>. - + Loading Web Applet... Cargando Web applet... - - + + Disable Web Applet Desactivar Web applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Deshabilitar el Applet Web puede causar comportamientos imprevistos y debería solo ser usado con Super Mario 3D All-Stars. ¿Estas seguro que quieres deshabilitar el Applet Web? (Puede ser reactivado en las configuraciones de Depuración.) - + The amount of shaders currently being built La cantidad de shaders que se están construyendo actualmente - + The current selected resolution scaling multiplier. El multiplicador de escala de resolución seleccionado actualmente. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. La velocidad de emulación actual. Los valores superiores o inferiores al 100% indican que la emulación se está ejecutando más rápido o más lento que en una Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. La cantidad de fotogramas por segundo que se está mostrando el juego actualmente. Esto variará de un juego a otro y de una escena a otra. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tiempo que lleva emular un fotograma de la Switch, sin tener en cuenta la limitación de fotogramas o sincronización vertical. Para una emulación óptima, este valor debería ser como máximo de 16.67 ms. - + &Clear Recent Files &Eliminar archivos recientes - + Emulated mouse is enabled El ratón emulado está activado - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. La entrada de un ratón real y la panoramización del ratón son incompatibles. Por favor, desactive el ratón emulado en la configuración avanzada de entrada para permitir así la panoramización del ratón. - + &Continue &Continuar - + &Pause &Pausar - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu está ejecutando un juego - + Warning Outdated Game Format Advertencia: formato del juego obsoleto - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Está utilizando el formato de directorio de ROM deconstruido para este juego, que es un formato desactualizado que ha sido reemplazado por otros, como los NCA, NAX, XCI o NSP. Los directorios de ROM deconstruidos carecen de íconos, metadatos y soporte de actualizaciones.<br><br>Para ver una explicación de los diversos formatos de Switch que soporta yuzu,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>echa un vistazo a nuestra wiki</a>. Este mensaje no se volverá a mostrar. - - + + Error while loading ROM! ¡Error al cargar la ROM! - + The ROM format is not supported. El formato de la ROM no es compatible. - + An error occurred initializing the video core. Se ha producido un error al inicializar el núcleo de video. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu ha encontrado un error al ejecutar el núcleo de video. Esto suele ocurrir al no tener los controladores de la GPU actualizados, incluyendo los integrados. Por favor, revisa el registro para más detalles. Para más información sobre cómo acceder al registro, por favor, consulta la siguiente página: <a href='https://yuzu-emu.org/help/reference/log-files/'>Como cargar el archivo de registro</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. ¡Error al cargar la ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Por favor, sigue <a href='https://yuzu-emu.org/help/quickstart/'>la guía de inicio rápido de yuzu</a> para revolcar los archivos.<br>Puedes consultar la wiki de yuzu</a> o el Discord de yuzu</a> para obtener ayuda. - + An unknown error occurred. Please see the log for more details. Error desconocido. Por favor, consulte el archivo de registro para ver más detalles. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Cerrando software... - + Save Data Datos de guardado - + Mod Data Datos de mods - + Error Opening %1 Folder Error al abrir la carpeta %1 - - + + Folder does not exist! ¡La carpeta no existe! - + Error Opening Transferable Shader Cache Error al abrir el caché transferible de shaders - + Failed to create the shader cache directory for this title. No se pudo crear el directorio de la caché de los shaders para este título. - + Error Removing Contents Error al eliminar el contenido - + Error Removing Update Error al eliminar la actualización - + Error Removing DLC Error al eliminar el DLC - + Remove Installed Game Contents? - ¿Eliminar el contenido del juego instalado? + ¿Eliminar contenido del juego instalado? - + Remove Installed Game Update? - ¿Eliminar la actualización del juego instalado? + ¿Eliminar actualización del juego instalado? - + Remove Installed Game DLC? ¿Eliminar el DLC del juego instalado? - + Remove Entry Eliminar entrada - - - - - - + + + + + + Successfully Removed Se ha eliminado con éxito - + Successfully removed the installed base game. Se ha eliminado con éxito el juego base instalado. - + The base game is not installed in the NAND and cannot be removed. El juego base no está instalado en el NAND y no se puede eliminar. - + Successfully removed the installed update. Se ha eliminado con éxito la actualización instalada. - + There is no update installed for this title. No hay ninguna actualización instalada para este título. - + There are no DLC installed for this title. No hay ningún DLC instalado para este título. - + Successfully removed %1 installed DLC. Se ha eliminado con éxito %1 DLC instalado(s). - + Delete OpenGL Transferable Shader Cache? ¿Deseas eliminar el caché transferible de shaders de OpenGL? - + Delete Vulkan Transferable Shader Cache? ¿Deseas eliminar el caché transferible de shaders de Vulkan? - + Delete All Transferable Shader Caches? ¿Deseas eliminar todo el caché transferible de shaders? - + Remove Custom Game Configuration? ¿Deseas eliminar la configuración personalizada del juego? - + + Remove Cache Storage? + + + + Remove File Eliminar archivo - - + + Error Removing Transferable Shader Cache Error al eliminar la caché de shaders transferibles - - + + A shader cache for this title does not exist. No existe caché de shaders para este título. - + Successfully removed the transferable shader cache. El caché de shaders transferibles se ha eliminado con éxito. - + Failed to remove the transferable shader cache. No se ha podido eliminar la caché de shaders transferibles. - + Error Removing Vulkan Driver Pipeline Cache Error al eliminar la caché de canalización del controlador Vulkan - + Failed to remove the driver pipeline cache. No se ha podido eliminar la caché de canalización del controlador. - - + + Error Removing Transferable Shader Caches Error al eliminar las cachés de shaders transferibles - + Successfully removed the transferable shader caches. Cachés de shaders transferibles eliminadas con éxito. - + Failed to remove the transferable shader cache directory. No se ha podido eliminar el directorio de cachés de shaders transferibles. - - + + Error Removing Custom Configuration Error al eliminar la configuración personalizada del juego - + A custom configuration for this title does not exist. No existe una configuración personalizada para este título. - + Successfully removed the custom game configuration. Se eliminó con éxito la configuración personalizada del juego. - + Failed to remove the custom game configuration. No se ha podido eliminar la configuración personalizada del juego. - - + + RomFS Extraction Failed! ¡La extracción de RomFS ha fallado! - + There was an error copying the RomFS files or the user cancelled the operation. Se ha producido un error al copiar los archivos RomFS o el usuario ha cancelado la operación. - + Full Completo - + Skeleton En secciones - + Select RomFS Dump Mode Elegir método de volcado de RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Por favor, selecciona el método en que quieres volcar el RomFS.<br>Completo copiará todos los archivos al nuevo directorio <br> mientras que en secciones solo creará la estructura del directorio. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root No hay suficiente espacio en %1 para extraer el RomFS. Por favor, libera espacio o elige otro directorio de volcado en Emulación > Configuración > Sistema > Sistema de archivos > Raíz de volcado - + Extracting RomFS... Extrayendo RomFS... - - + + Cancel Cancelar - + RomFS Extraction Succeeded! ¡La extracción RomFS ha tenido éxito! - + The operation completed successfully. La operación se completó con éxito. - - - - - + + + + + Create Shortcut Crear acceso directo - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Esto creará un acceso directo a la AppImage actual. Esto puede no funcionar bien si se actualiza. ¿Continuar? - + Cannot create shortcut on desktop. Path "%1" does not exist. No se puede crear un acceso directo en el escritorio. La ruta "%1" no existe. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. No se puede crear un acceso directo en el menú de aplicaciones. La ruta "%1" no existe y no se puede crear. - + Create Icon Crear icono - + Cannot create icon file. Path "%1" does not exist and cannot be created. - No se puede crear el archivo de icono. La ruta "%1" no existe y no se puede crear. + No se puede crear el archivo de icono. La ruta "%1" no existe y no se ha podido crear. - + Start %1 with the yuzu Emulator Iniciar %1 con el Emulador yuzu - + Failed to create a shortcut at %1 Error al crear un acceso directo en %1 - + Successfully created a shortcut to %1 Se ha creado un acceso directo a %1 - + Error Opening %1 Error al intentar abrir %1 - + Select Directory Seleccionar directorio - + Properties Propiedades - + The game properties could not be loaded. No se pueden cargar las propiedades del juego. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Ejecutable de Switch (%1);;Todos los archivos (*.*) - + Load File Cargar archivo - + Open Extracted ROM Directory Abrir el directorio de la ROM extraída - + Invalid Directory Selected Directorio seleccionado no válido - + The directory you have selected does not contain a 'main' file. El directorio que ha seleccionado no contiene ningún archivo 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Archivo de Switch Instalable (*.nca *.nsp *.xci);;Archivo de contenidos de Nintendo (*.nca);;Paquete de envío de Nintendo (*.nsp);;Imagen de cartucho NX (*.xci) - + Install Files Instalar archivos - + %n file(s) remaining %n archivo(s) restantes%n archivo(s) restantes%n archivo(s) restantes - + Installing file "%1"... Instalando el archivo "%1"... - - + + Install Results Instalar resultados - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Para evitar posibles conflictos, no se recomienda a los usuarios que instalen juegos base en el NAND. Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + %n file(s) were newly installed %n archivo(s) recién instalado/s @@ -5104,7 +5188,7 @@ Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + %n file(s) were overwritten %n archivo(s) recién sobreescrito/s @@ -5113,7 +5197,7 @@ Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + %n file(s) failed to install %n archivo(s) no se instaló/instalaron @@ -5122,388 +5206,388 @@ Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. - + System Application Aplicación del sistema - + System Archive Archivo del sistema - + System Application Update Actualización de la aplicación del sistema - + Firmware Package (Type A) Paquete de firmware (Tipo A) - + Firmware Package (Type B) Paquete de firmware (Tipo B) - + Game Juego - + Game Update Actualización de juego - + Game DLC DLC del juego - + Delta Title Titulo delta - + Select NCA Install Type... Seleccione el tipo de instalación NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Seleccione el tipo de título en el que deseas instalar este NCA como: (En la mayoría de los casos, el 'Juego' predeterminado está bien). - + Failed to Install Fallo en la instalación - + The title type you selected for the NCA is invalid. El tipo de título que seleccionó para el NCA no es válido. - + File not found Archivo no encontrado - + File "%1" not found Archivo "%1" no encontrado - + OK Aceptar - - + + Hardware requirements not met No se cumplen los requisitos de hardware - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - El sistema no cumple los requisitos de hardware recomendados. Los informes de compatibilidad se han desactivado. + El sistema no cumple con los requisitos de hardware recomendados. Los informes de compatibilidad se han desactivado. - + Missing yuzu Account Falta la cuenta de Yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Para enviar un caso de prueba de compatibilidad de juegos, debes vincular tu cuenta de yuzu.<br><br/> Para vincular tu cuenta de yuzu, ve a Emulación &gt; Configuración &gt; Web. - + Error opening URL Error al abrir la URL - + Unable to open the URL "%1". No se puede abrir la URL "%1". - + TAS Recording Grabación TAS - + Overwrite file of player 1? ¿Sobrescribir archivo del jugador 1? - + Invalid config detected Configuración no válida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. El controlador del modo portátil no puede ser usado en el modo sobremesa. Se seleccionará el controlador Pro en su lugar. - - + + Amiibo Amiibo - - + + The current amiibo has been removed El amiibo actual ha sido eliminado - + Error Error - - + + The current game is not looking for amiibos El juego actual no está buscando amiibos - + Amiibo File (%1);; All Files (*.*) Archivo amiibo (%1);; Todos los archivos (*.*) - + Load Amiibo Cargar amiibo - + Error loading Amiibo data Error al cargar los datos Amiibo - + The selected file is not a valid amiibo El archivo seleccionado no es un amiibo válido - + The selected file is already on use El archivo seleccionado ya se encuentra en uso - + An unknown error occurred Ha ocurrido un error inesperado - + Capture Screenshot Captura de pantalla - + PNG Image (*.png) Imagen PNG (*.png) - + TAS state: Running %1/%2 Estado TAS: ejecutando %1/%2 - + TAS state: Recording %1 Estado TAS: grabando %1 - + TAS state: Idle %1/%2 Estado TAS: inactivo %1/%2 - + TAS State: Invalid Estado TAS: nulo - + &Stop Running &Parar de ejecutar - + &Start &Iniciar - + Stop R&ecording Pausar g&rabación - + R&ecord G&rabar - + Building: %n shader(s) Creando: %n shader(s)Construyendo: %n shader(s)Construyendo: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escalado: %1x - + Speed: %1% / %2% Velocidad: %1% / %2% - + Speed: %1% Velocidad: %1% - + Game: %1 FPS (Unlocked) Juego: %1 FPS (desbloqueado) - + Game: %1 FPS Juego: %1 FPS - + Frame: %1 ms Fotogramas: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR GPU ERROR - + DOCKED SOBREMESA - + HANDHELD PORTÁTIL - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST PRÓXIMO - - + + BILINEAR BILINEAL - + BICUBIC BICÚBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA NO AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE VOLUMEN: SILENCIO - + VOLUME: %1% Volume percentage (e.g. 50%) VOLUMEN: %1% - + Confirm Key Rederivation Confirmar la clave de rederivación - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5520,37 +5604,37 @@ es lo que quieres hacer si es necesario. Esto eliminará los archivos de las claves generadas automáticamente y volverá a ejecutar el módulo de derivación de claves. - + Missing fuses Faltan fuses - + - Missing BOOT0 - Falta BOOT0 - + - Missing BCPKG2-1-Normal-Main - Falta BCPKG2-1-Normal-Main - + - Missing PRODINFO - Falta PRODINFO - + Derivation Components Missing Faltan componentes de derivación - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Faltan las claves de encriptación. <br>Por favor, sigue <a href='https://yuzu-emu.org/help/quickstart/'>la guía rápida de yuzu</a> para obtener todas tus claves, firmware y juegos.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5559,39 +5643,49 @@ Esto puede llevar unos minutos dependiendo del rendimiento de su sistema. - + Deriving Keys Obtención de claves - + + System Archive Decryption Failed + Desencriptación del Sistema de Archivos Fallida + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + Las claves de encriptación no han podido desencriptar el firmware. <br>Por favor, siga<a href='https://yuzu-emu.org/help/quickstart/'>la guía de inicio rápido de yuzu</a> para obtener todas tus claves, firmware y juegos. + + + Select RomFS Dump Target Selecciona el destinatario para volcar el RomFS - + Please select which RomFS you would like to dump. Por favor, seleccione los RomFS que deseas volcar. - + Are you sure you want to close yuzu? ¿Estás seguro de que quieres cerrar yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. ¿Estás seguro de que quieres detener la emulación? Cualquier progreso no guardado se perderá. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5603,44 +5697,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! ¡OpenGL no está disponible! - + OpenGL shared contexts are not supported. Los contextos compartidos de OpenGL no son compatibles. - + yuzu has not been compiled with OpenGL support. yuzu no ha sido compilado con soporte de OpenGL. + - Error while initializing OpenGL! ¡Error al inicializar OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Tu GPU no soporta OpenGL, o no tienes instalados los últimos controladores gráficos. - + Error while initializing OpenGL 4.6! ¡Error al iniciar OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Tu GPU no soporta OpenGL 4.6, o no tienes instalado el último controlador de la tarjeta gráfica.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Es posible que la GPU no soporte una o más extensiones necesarias de OpenGL . Por favor, asegúrate de tener los últimos controladores de la tarjeta gráfica.<br><br>GL Renderer:<br>%1<br><br>Extensiones no soportadas:<br>%2 @@ -5699,117 +5793,122 @@ Would you like to bypass this and exit anyway? + Remove Cache Storage + + + + Remove OpenGL Pipeline Cache Eliminar caché de canalización de OpenGL - + Remove Vulkan Pipeline Cache Eliminar caché de canalización de Vulkan - + Remove All Pipeline Caches Eliminar todas las cachés de canalización - + Remove All Installed Contents Eliminar todo el contenido instalado - + Dump RomFS Volcar RomFS - + Dump RomFS to SDMC Volcar RomFS a SDMC - + Copy Title ID to Clipboard Copiar la ID del título al portapapeles - + Navigate to GameDB entry Ir a la sección de bases de datos del juego - + Create Shortcut Crear Acceso directo - + Add to Desktop Añadir al Escritorio - + Add to Applications Menu Añadir al menú de Aplicaciones - + Properties Propiedades - + Scan Subfolders Escanear subdirectorios - + Remove Game Directory Eliminar directorio de juegos - + ▲ Move Up ▲ Mover hacia arriba - + ▼ Move Down ▼ Mover hacia abajo - + Open Directory Location Abrir ubicación del directorio - + Clear Limpiar - + Name Nombre - + Compatibility Compatibilidad - + Add-ons Extras/Add-ons - + File type Tipo de archivo - + Size Tamaño @@ -5824,7 +5923,7 @@ Would you like to bypass this and exit anyway? Game starts, but crashes or major glitches prevent it from being completed. - El juego se inicia, pero los bloqueos o fallos importantes impiden que se pueda completar. + El juego se inicia, pero se bloquea o se producen fallos importantes que impiden completarlo. @@ -5880,7 +5979,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list Haz doble clic para agregar un nuevo directorio a la lista de juegos. @@ -5893,12 +5992,12 @@ Would you like to bypass this and exit anyway? %1 de %n resultado(s)%1 de %n resultado(s)%1 de %n resultado(s) - + Filter: Búsqueda: - + Enter pattern to filter Introduce un patrón para buscar @@ -5989,12 +6088,11 @@ Mensaje de depuración: Hotkeys - + Audio Mute/Unmute Activar/Desactivar audio - @@ -6016,111 +6114,112 @@ Mensaje de depuración: + Main Window Ventana principal - + Audio Volume Down Bajar volumen del audio - + Audio Volume Up Subir volumen del audio - + Capture Screenshot Captura de pantalla - + Change Adapting Filter Cambiar filtro adaptable - + Change Docked Mode Cambiar a modo sobremesa - + Change GPU Accuracy Cambiar precisión de GPU - + Continue/Pause Emulation Continuar/Pausar emulación - + Exit Fullscreen Salir de pantalla completa - + Exit yuzu Cerrar yuzu - + Fullscreen Pantalla completa - + Load File Cargar archivo - + Load/Remove Amiibo Cargar/Eliminar Amiibo - + Restart Emulation Reiniciar emulación - + Stop Emulation Detener emulación - + TAS Record Grabar TAS - + TAS Reset Reiniciar TAS - + TAS Start/Stop Iniciar/detener TAS - + Toggle Filter Bar Alternar barra de filtro - + Toggle Framerate Limit Alternar limite de fotogramas - + Toggle Mouse Panning Alternar desplazamiento del ratón - + Toggle Status Bar Alternar barra de estado @@ -6680,7 +6779,7 @@ Mensaje de depuración: Creating a room failed. Please retry. Restarting yuzu might be necessary. - La creación de la sala ha fallado. Por favor reintente. Reiniciar yuzu puede ser necesario. + Error al crear una sala. Por favor, inténtalo de nuevo. Puede que sea necesario reiniciar yuzu. @@ -6813,7 +6912,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE INICIO/PAUSAR @@ -6863,21 +6962,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6885,8 +6984,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [no definido] @@ -6901,10 +7000,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Eje %1%2 @@ -6918,163 +7017,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [desconocido] - - + + Left Izquierda - - + + Right Derecha - - + + Down Abajo - - + + Up Arriba - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Comenzar - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle Círculo - + Cross Cruz - + Square Cuadrado - + Triangle Triángulo - + Share Compartir - + Options Opciones - + [undefined] [sin definir] @@ -7085,7 +7184,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [inválido] @@ -7099,21 +7198,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2Eje %3 - + %1%2Axis %3,%4,%5 %1%2Eje %3,%4,%5 - + %1%2Motion %3 %1%2Movimiento %3 @@ -7125,106 +7222,112 @@ p, li { white-space: pre-wrap; } - + [unused] [no usado] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L Palanca L - + Stick R Palanca R - + Plus Más - + Minus Menos - - + + Home Inicio - + Capture Captura - + Touch Táctil - + Wheel Indicates the mouse wheel Rueda - + Backward Atrás - + Forward Adelante - + Task Tarea - + Extra Extra - + %1%2%3%4 %1%2%3%4 - - + + %1%2%3Hat %4 %1%2%3Rotación %4 - - + + + %1%2%3Axis %4 + %1%2%3Axis %4 + + + + %1%2%3Button %4 %1%2%3Botón %4 @@ -7645,73 +7748,73 @@ Por favor, inténtalo de nuevo o contacta con el desarrollador del software.Usuarios - + Profile Creator Creador de perfil - - + + Profile Selector Selector de perfil - + Profile Icon Editor Editor de icono de perfil - + Profile Nickname Editor Editor de nombre de perfil - + Who will receive the points? ¿Quién recibirá los puntos? - + Who is using Nintendo eShop? ¿Quién va a utilizar Nintendo eShop? - + Who is making this purchase? ¿Quién está haciendo la compra? - + Who is posting? ¿Quién está publicando esto? - + Select a user to link to a Nintendo Account. Elige un usuario para vincularlo a una Cuenta Nintendo. - + Change settings for which user? ¿Para qué usuario desea cambiar la configuración? - + Format data for which user? ¿Para qué usuario se borrarán sus datos? - + Which user will be transferred to another console? ¿Qué usuario será transferido a otra consola? - + Send save data for which user? ¿A qué usuario se le enviarán los datos de guardado? - + Select a user: Seleccione un usuario: diff --git a/dist/languages/fr.ts b/dist/languages/fr.ts index 606a8816e..0046c3128 100644 --- a/dist/languages/fr.ts +++ b/dist/languages/fr.ts @@ -1136,78 +1136,78 @@ Cette option améliore la vitesse en réduisant la précision des instructions f Configuration de yuzu - - + + Audio Son - - + + CPU CPU - + Debug Débogage - + Filesystem Système de fichiers - - + + General Général - - + + Graphics Vidéo - + GraphicsAdvanced Graphismes avancés - + Hotkeys Raccourcis clavier - - + + Controls Contrôles - + Profiles Profils - + Network Réseau - - + + System Système - + Game List Liste des jeux - + Web Web @@ -1382,41 +1382,36 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - Extended memory layout (8GB DRAM) - Disposition de la mémoire étendue (8 Go de DRAM) - - - Confirm exit while emulation is running Confirmer la sortie pendent l'émulation en cours - + Prompt for user on game boot Demander un utilisateur au lancement d'un jeu - + Pause emulation when in background Mettre en pause l’émulation lorsque mis en arrière-plan - + Hide mouse on inactivity Cacher la souris en cas d'inactivité - + Reset All Settings Réinitialiser tous les paramètres - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Ceci réinitialise tout les paramètres et supprime toutes les configurations par jeu. Cela ne va pas supprimer les répertoires de jeu, les profils, ou les profils d'entrée. Continuer ? @@ -1455,7 +1450,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + None Aucune @@ -1481,231 +1476,272 @@ Cette option améliore la vitesse en réduisant la précision des instructions f + VSync Mode: + Mode VSync : + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + FIFO (VSync) ne perd pas de trames ni ne présente de déchirures, mais est limité par le taux de rafraîchissement de l'écran. +FIFO Relaxé est similaire à FIFO mais autorise les déchirures lorsqu'il récupère d'un ralentissement. +Mailbox peut avoir une latence plus faible que FIFO et ne présente pas de déchirures, mais peut perdre des trames. +Immédiat (sans synchronisation) présente simplement ce qui est disponible et peut présenter des déchirures. + + + NVDEC emulation: Émulation NVDEC - + No Video Output Pas de sortie vidéo - + CPU Video Decoding Décodage Vidéo sur le CPU - + GPU Video Decoding (Default) Décodage Vidéo sur le GPU (par défaut) - + Fullscreen Mode: Mode Plein écran : - + Borderless Windowed Fenêtré sans bordure - + Exclusive Fullscreen Plein écran exclusif - + Aspect Ratio: Format : - + Default (16:9) Par défaut (16:9) - + Force 4:3 Forcer le 4:3 - + Force 21:9 Forcer le 21:9 - + Force 16:10 Forcer le 16:10 - + Stretch to Window Étirer à la fenêtre - + Resolution: Résolution : - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [EXPÉRIMENTAL] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [EXPÉRIMENTAL] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] 1.5X (1080p/1620p) [EXPÉRIMENTAL] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) 7X (5040p/7560p) - + 8X (5760p/8640p) 8X (5760p/8640p) - + Window Adapting Filter: Filtre de fenêtre adaptatif - + Nearest Neighbor Plus proche voisin - + Bilinear Bilinéaire - + Bicubic Bicubique - + Gaussian Gaussien - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: Méthode d'anticrénelage : - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness Utiliser la netteté FSR globale - + Set FSR Sharpness Définir la netteté FSR - + FSR Sharpness: Netteté FSR : - + 100% 100% - - + + Use global background color Utiliser une couleur d'arrière-plan globale - + Set background color: Définir la couleur d'arrière-plan : - + Background Color: Couleur de L’arrière plan : - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (Shaders en Assembleur, NVIDIA Seulement) - + SPIR-V (Experimental, Mesa Only) SPIR-V (Expérimental, Mesa seulement) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + Désactivé + + + + VSync Off + VSync Désactivée + + + + Recommended + Recommandé + + + + On + Activé + + + + VSync On + VSync Activée + ConfigureGraphicsAdvanced @@ -1730,107 +1766,134 @@ Cette option améliore la vitesse en réduisant la précision des instructions f Niveau de Précision : - + + ASTC recompression: + Recompression ASTC : + + + + Uncompressed (Best quality) + Non compressé (Meilleure qualité) + + + + BC1 (Low quality) + BC1 (Basse qualité) + + + + BC3 (Medium quality) + BC3 (Qualité moyenne) + + + + Enable asynchronous presentation (Vulkan only) + Activer la présentation asynchrone (uniquement pour Vulkan) + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. Les exécutions fonctionnent en arrière-plan en attendant les commandes graphiques pour empêcher le GPU de réduire sa vitesse de fréquence d'horloge. - + Force maximum clocks (Vulkan only) Forcer la fréquence d'horloge maximale (Vulkan uniquement) - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - La VSync empêche les déchirements de l'image, mais cela peut causer des baisses de performances sur certaines cartes graphiques. Gardez la activée si vous ne voyez pas de différence. - - - - Use VSync - Utiliser VSync - - - + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. Active le décodage asynchrone de textures ASTC, qui peut réduire les saccades de chargement. Cette fonctionnalité est expérimentale. - + Decode ASTC textures asynchronously (Hack) Décoder les textures ASTC de manière asynchrone (Hack) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + Utilise le vidage réactif à la place du vidage prédictif. Permet une synchronisation de mémoire plus précise. + + + + Enable Reactive Flushing + Activer le Vidage Réactif + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Active la compilation de shaders asynchrone, qui peut réduire les saccades des shaders. Cette fonctionnalité est expérimentale. - + Use asynchronous shader building (Hack) Utiliser la compilation asynchrone des shaders (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Active le Temps GPU Rapide. Cette option forcera la plupart des jeux à utiliser leur plus grande résolution native. - + Use Fast GPU Time (Hack) Utiliser le Temps GPU Rapide (Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - Active les vidages de tampon pessimistes. Cette option va forcer les tampons non-modifiés à être vidé, cela peut affecter la performance. - - - - Use pessimistic buffer flushes (Hack) - Utiliser des vidages de tampon pessimistes (Hack) - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. Active le cache de pipeline spécifique au fournisseur de GPU. Cette option peut améliorer considérablement le temps de chargement du shader dans les cas où le pilote Vulkan ne stocke pas les fichiers de cache du pipeline en interne. - + Use Vulkan pipeline cache Utiliser le cache de pipeline Vulkan - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + Activer les pipelines de calcul, requis par certains jeux. Ce paramètre n'existe que pour les pilotes propriétaires Intel et peut provoquer des plantages s'il est activé. +Les pipelines de calcul sont toujours activés sur tous les autres pilotes. + + + + Enable Compute Pipelines (Intel Vulkan only) + Activer les pipelines de calcul (uniquement pour Intel Vulkan) + + + Anisotropic Filtering: Filtrage anisotropique : - + Automatic Automatique - + Default Défaut - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1863,70 +1926,65 @@ Cette option améliore la vitesse en réduisant la précision des instructions f Restaurer les défauts - + Action Action - + Hotkey Raccourci clavier - + Controller Hotkey Raccourci Manette - - - + + + Conflicting Key Sequence Séquence de touches conflictuelle - - + + The entered key sequence is already assigned to: %1 La séquence de touches entrée est déjà attribuée à : %1 - - Home+%1 - Home+%1 - - - + [waiting] [En attente] - + Invalid Invalide - + Restore Default Rétablir les défauts - + Clear Effacer - + Conflicting Button Sequence Séquence de bouton conflictuelle - + The default button sequence is already assigned to: %1 La séquence de bouton par défaut est déjà assignée à : %1 - + The default key sequence is already assigned to: %1 La séquence de touches par défaut est déjà attribuée à : %1 @@ -2218,7 +2276,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + Configure Configurer @@ -2275,22 +2333,32 @@ Cette option améliore la vitesse en réduisant la précision des instructions f Activer le pilote Pro Controller direct [EXPERIMENTAL] - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + Permet des utilisations illimitées du même Amiibo dans des jeux qui vous limitent à une seule utilisation. + + + + Use random Amiibo ID + Utiliser un ID d'Amiibo aléatoire + + + Enable mouse panning Activer le mouvement panorama avec la souris - + Mouse sensitivity Sensibilité de la souris - + % % - + Motion / Touch La motion / Toucher @@ -2402,7 +2470,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + Left Stick Stick Gauche @@ -2496,14 +2564,14 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + L L - + ZL ZL @@ -2522,7 +2590,7 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + Plus Plus @@ -2535,15 +2603,15 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - - + + R R - + ZR ZR @@ -2600,241 +2668,247 @@ Cette option améliore la vitesse en réduisant la précision des instructions f - + Right Stick Stick Droit - - - - + + + + Clear Effacer - - - - - + + + + + [not set] [non défini] - - + + + Invert button Inverser les boutons - - + + Toggle button Bouton d'activation - + Turbo button Bouton Turbo - - + + Invert axis Inverser l'axe - - - + + + Set threshold Définir le seuil - - + + Choose a value between 0% and 100% Choisissez une valeur entre 0% et 100% - + Toggle axis Basculer les axes - + Set gyro threshold Définir le seuil du gyroscope - + + Calibrate sensor + Calibrer le capteur + + + Map Analog Stick Mapper le stick analogique - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Après avoir appuyé sur OK, bougez d'abord votre joystick horizontalement, puis verticalement. Pour inverser les axes, bougez d'abord votre joystick verticalement, puis horizontalement. - + Center axis Axe central - - + + Deadzone: %1% Zone morte : %1% - - + + Modifier Range: %1% Modification de la course : %1% - - + + Pro Controller Pro Controller - + Dual Joycons Deux Joycons - + Left Joycon Joycon de gauche - + Right Joycon Joycon de droit - + Handheld Mode Portable - + GameCube Controller Manette GameCube - + Poke Ball Plus Poké Ball Plus - + NES Controller Manette NES - + SNES Controller Manette SNES - + N64 Controller Manette N64 - + Sega Genesis Sega Genesis - + Start / Pause Start / Pause - + Z Z - + Control Stick Stick de contrôle - + C-Stick C-Stick - + Shake! Secouez ! - + [waiting] [en attente] - + New Profile Nouveau Profil - + Enter a profile name: Entrez un nom de profil : - - + + Create Input Profile Créer un profil d'entrée - + The given profile name is not valid! Le nom de profil donné est invalide ! - + Failed to create the input profile "%1" Échec de la création du profil d'entrée "%1" - + Delete Input Profile Supprimer le profil d'entrée - + Failed to delete the input profile "%1" Échec de la suppression du profil d'entrée "%1" - + Load Input Profile Charger le profil d'entrée - + Failed to load the input profile "%1" Échec du chargement du profil d'entrée "%1" - + Save Input Profile Sauvegarder le profil d'entrée - + Failed to save the input profile "%1" Échec de la sauvegarde du profil d'entrée "%1" @@ -3089,47 +3163,47 @@ Pour inverser les axes, bougez d'abord votre joystick verticalement, puis h Développeur - + Add-Ons Extensions - + General Général - + System Système - + CPU CPU - + Graphics Graphiques - + Adv. Graphics Adv. Graphiques - + Audio Audio - + Input Profiles Profils d'entrée - + Properties Propriétés @@ -3850,7 +3924,12 @@ UUID : %2 Nom de l'appareil - + + Unsafe extended memory layout (8GB DRAM) + Disposition de mémoire étendue non sécurisée (8 Go de DRAM) + + + System settings are available only when game is not running. Les paramètres systèmes ne sont accessibles que lorsque le jeu n'est pas en cours. @@ -4546,954 +4625,959 @@ Faites glisser les points pour modifier la position ou double-cliquez sur les ce GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Des données anonymes sont collectées</a> pour aider à améliorer yuzu. <br/><br/>Voulez-vous partager vos données d'utilisations avec nous ? - + Telemetry Télémétrie - + Broken Vulkan Installation Detected Installation Vulkan Cassée Détectée - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. L'initialisation de Vulkan a échoué lors du démarrage.<br><br>Cliquez <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>ici pour obtenir des instructions pour résoudre le problème</a>. - + Loading Web Applet... Chargement du Web Applet... - - + + Disable Web Applet Désactiver l'applet web - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) La désactivation de l'applet Web peut entraîner un comportement indéfini et ne doit être utilisée qu'avec Super Mario 3D All-Stars. Voulez-vous vraiment désactiver l'applet Web ? (Cela peut être réactivé dans les paramètres de débogage.) - + The amount of shaders currently being built La quantité de shaders en cours de construction - + The current selected resolution scaling multiplier. Le multiplicateur de mise à l'échelle de résolution actuellement sélectionné. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Valeur actuelle de la vitesse de l'émulation. Des valeurs plus hautes ou plus basses que 100% indique que l'émulation fonctionne plus vite ou plus lentement qu'une véritable Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Combien d'image par seconde le jeu est en train d'afficher. Ceci vas varier de jeu en jeu et de scènes en scènes. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Temps pris pour émuler une image par seconde de la switch, sans compter le limiteur d'image par seconde ou la synchronisation verticale. Pour une émulation à pleine vitesse, ceci devrait être au maximum à 16.67 ms. - + &Clear Recent Files &Effacer les fichiers récents - + Emulated mouse is enabled La souris émulée est activée - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. La saisie réelle de la souris et le panoramique de la souris sont incompatibles. Veuillez désactiver la souris émulée dans les paramètres avancés d'entrée pour permettre le panoramique de la souris. - + &Continue &Continuer - + &Pause &Pause - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu exécute un jeu - + Warning Outdated Game Format Avertissement : Le Format de jeu est dépassé - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Vous utilisez un format de ROM déconstruite pour ce jeu, qui est donc un format dépassé qui à été remplacer par d'autre. Par exemple les formats NCA, NAX, XCI, ou NSP. Les destinations de ROM déconstruites manque des icônes, des métadonnée et du support de mise à jour.<br><br>Pour une explication des divers formats Switch que yuzu supporte, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Regardez dans le wiki</a>. Ce message ne sera pas montré une autre fois. - - + + Error while loading ROM! Erreur lors du chargement de la ROM ! - + The ROM format is not supported. Le format de la ROM n'est pas supporté. - + An error occurred initializing the video core. Une erreur s'est produite lors de l'initialisation du noyau dédié à la vidéo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu a rencontré une erreur en exécutant le cœur vidéo. Cela est généralement causé par des pilotes graphiques trop anciens. Veuillez consulter les logs pour plus d'informations. Pour savoir comment accéder aux logs, veuillez vous référer à la page suivante : <a href='https://yuzu-emu.org/help/reference/log-files/'>Comment partager un fichier de log </a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Erreur lors du chargement de la ROM ! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Veuillez suivre <a href='https://yuzu-emu.org/help/quickstart/'>le guide de démarrage rapide yuzu</a> pour retransférer vos fichiers.<br>Vous pouvez vous référer au wiki yuzu</a> ou le Discord yuzu</a> pour de l'assistance. - + An unknown error occurred. Please see the log for more details. Une erreur inconnue est survenue. Veuillez consulter le journal des logs pour plus de détails. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Fermeture du logiciel... - + Save Data Enregistrer les données - + Mod Data Donnés du Mod - + Error Opening %1 Folder Erreur dans l'ouverture du dossier %1. - - + + Folder does not exist! Le dossier n'existe pas ! - + Error Opening Transferable Shader Cache Erreur lors de l'ouverture des Shader Cache Transferable - + Failed to create the shader cache directory for this title. Impossible de créer le dossier de cache du shader pour ce jeu. - + Error Removing Contents Erreur en enlevant le contenu - + Error Removing Update Erreur en enlevant la Mise à Jour - + Error Removing DLC Erreur en enlevant le DLC - + Remove Installed Game Contents? Enlever les données du jeu installé ? - + Remove Installed Game Update? Enlever la mise à jour du jeu installé ? - + Remove Installed Game DLC? Enlever le DLC du jeu installé ? - + Remove Entry Supprimer l'entrée - - - - - - + + + + + + Successfully Removed Supprimé avec succès - + Successfully removed the installed base game. Suppression du jeu de base installé avec succès. - + The base game is not installed in the NAND and cannot be removed. Le jeu de base n'est pas installé dans la NAND et ne peut pas être supprimé. - + Successfully removed the installed update. Suppression de la mise à jour installée avec succès. - + There is no update installed for this title. Il n'y a pas de mise à jour installée pour ce titre. - + There are no DLC installed for this title. Il n'y a pas de DLC installé pour ce titre. - + Successfully removed %1 installed DLC. Suppression de %1 DLC installé(s) avec succès. - + Delete OpenGL Transferable Shader Cache? Supprimer la Cache OpenGL de Shader Transférable? - + Delete Vulkan Transferable Shader Cache? Supprimer la Cache Vulkan de Shader Transférable? - + Delete All Transferable Shader Caches? Supprimer Toutes les Caches de Shader Transférable? - + Remove Custom Game Configuration? Supprimer la configuration personnalisée du jeu? - + + Remove Cache Storage? + Supprimer le stockage du cache ? + + + Remove File Supprimer fichier - - + + Error Removing Transferable Shader Cache Erreur lors de la suppression du cache de shader transférable - - + + A shader cache for this title does not exist. Un shader cache pour ce titre n'existe pas. - + Successfully removed the transferable shader cache. Suppression du cache de shader transférable avec succès. - + Failed to remove the transferable shader cache. Échec de la suppression du cache de shader transférable. - + Error Removing Vulkan Driver Pipeline Cache Erreur lors de la suppression du cache de pipeline de pilotes Vulkan - + Failed to remove the driver pipeline cache. Échec de la suppression du cache de pipeline de pilotes. - - + + Error Removing Transferable Shader Caches Erreur durant la Suppression des Caches de Shader Transférable - + Successfully removed the transferable shader caches. Suppression des caches de shader transférable effectuée avec succès. - + Failed to remove the transferable shader cache directory. Impossible de supprimer le dossier de la cache de shader transférable. - - + + Error Removing Custom Configuration Erreur lors de la suppression de la configuration personnalisée - + A custom configuration for this title does not exist. Il n'existe pas de configuration personnalisée pour ce titre. - + Successfully removed the custom game configuration. Suppression de la configuration de jeu personnalisée avec succès. - + Failed to remove the custom game configuration. Échec de la suppression de la configuration personnalisée du jeu. - - + + RomFS Extraction Failed! L'extraction de la RomFS a échoué ! - + There was an error copying the RomFS files or the user cancelled the operation. Une erreur s'est produite lors de la copie des fichiers RomFS ou l'utilisateur a annulé l'opération. - + Full Plein - + Skeleton Squelette - + Select RomFS Dump Mode Sélectionnez le mode d'extraction de la RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Veuillez sélectionner la manière dont vous souhaitez que le fichier RomFS soit extrait.<br>Full copiera tous les fichiers dans le nouveau répertoire, tandis que<br>skeleton créera uniquement la structure de répertoires. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Il n'y a pas assez d'espace libre dans %1 pour extraire la RomFS. Veuillez libérer de l'espace ou sélectionner un autre dossier d'extraction dans Émulation > Configurer > Système > Système de fichiers > Extraire la racine - + Extracting RomFS... Extraction de la RomFS ... - - + + Cancel Annuler - + RomFS Extraction Succeeded! Extraction de la RomFS réussi ! - + The operation completed successfully. L'opération s'est déroulée avec succès. - - - - - + + + + + Create Shortcut Créer un raccourci - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Cela créera un raccourci vers l'AppImage actuelle. Cela peut ne pas fonctionner correctement si vous mettez à jour. Continuer ? - + Cannot create shortcut on desktop. Path "%1" does not exist. Impossible de créer un raccourci sur le bureau. Le chemin "%1" n'existe pas. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Impossible de créer un raccourci dans le menu des applications. Le chemin "%1" n'existe pas et ne peut pas être créé. - + Create Icon Créer une icône - + Cannot create icon file. Path "%1" does not exist and cannot be created. Impossible de créer le fichier d'icône. Le chemin "%1" n'existe pas et ne peut pas être créé. - + Start %1 with the yuzu Emulator Démarrer %1 avec l'émulateur Yuzu - + Failed to create a shortcut at %1 Impossible de créer un raccourci vers %1 - + Successfully created a shortcut to %1 Création réussie d'un raccourci vers %1 - + Error Opening %1 Erreur lors de l'ouverture %1 - + Select Directory Sélectionner un répertoire - + Properties Propriétés - + The game properties could not be loaded. Les propriétés du jeu n'ont pas pu être chargées. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Exécutable Switch (%1);;Tous les fichiers (*.*) - + Load File Charger un fichier - + Open Extracted ROM Directory Ouvrir le dossier des ROM extraites - + Invalid Directory Selected Destination sélectionnée invalide - + The directory you have selected does not contain a 'main' file. Le répertoire que vous avez sélectionné ne contient pas de fichier "main". - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Fichier Switch installable (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Installer les fichiers - + %n file(s) remaining %n fichier restant%n fichiers restants%n fichiers restants - + Installing file "%1"... Installation du fichier "%1" ... - - + + Install Results Résultats d'installation - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Pour éviter d'éventuels conflits, nous déconseillons aux utilisateurs d'installer des jeux de base sur la NAND. Veuillez n'utiliser cette fonctionnalité que pour installer des mises à jour et des DLC. - + %n file(s) were newly installed %n fichier a été nouvellement installé%n fichiers ont été nouvellement installés%n fichiers ont été nouvellement installés - + %n file(s) were overwritten %n fichier a été écrasé%n fichiers ont été écrasés%n fichiers ont été écrasés - + %n file(s) failed to install %n fichier n'a pas pu être installé%n fichiers n'ont pas pu être installés%n fichiers n'ont pas pu être installés - + System Application Application Système - + System Archive Archive Système - + System Application Update Mise à jour de l'application système - + Firmware Package (Type A) Paquet micrologiciel (Type A) - + Firmware Package (Type B) Paquet micrologiciel (Type B) - + Game Jeu - + Game Update Mise à jour de jeu - + Game DLC DLC de jeu - + Delta Title Titre Delta - + Select NCA Install Type... Sélectionner le type d'installation du NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Veuillez sélectionner le type de titre auquel vous voulez installer ce NCA : (Dans la plupart des cas, le titre par défaut : 'Jeu' est correct.) - + Failed to Install Échec de l'installation - + The title type you selected for the NCA is invalid. Le type de titre que vous avez sélectionné pour le NCA n'est pas valide. - + File not found Fichier non trouvé - + File "%1" not found Fichier "%1" non trouvé - + OK OK - - + + Hardware requirements not met Éxigences matérielles non respectées - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Votre système ne correspond pas aux éxigences matérielles. Les rapports de comptabilité ont été désactivés. - + Missing yuzu Account Compte yuzu manquant - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Pour soumettre un test de compatibilité pour un jeu, vous devez lier votre compte yuzu.<br><br/>Pour lier votre compte yuzu, aller à Emulation &gt; Configuration&gt; Web. - + Error opening URL Erreur lors de l'ouverture de l'URL - + Unable to open the URL "%1". Impossible d'ouvrir l'URL "%1". - + TAS Recording Enregistrement TAS - + Overwrite file of player 1? Écraser le fichier du joueur 1 ? - + Invalid config detected Configuration invalide détectée - + Handheld controller can't be used on docked mode. Pro controller will be selected. Contrôleur portable ne peut pas être utilisé en mode téléviseur. La manette Pro sera sélectionnée. - - + + Amiibo Amiibo - - + + The current amiibo has been removed L'amiibo actuel a été retiré - + Error Erreur - - + + The current game is not looking for amiibos Le jeu actuel ne cherche pas d'amiibos. - + Amiibo File (%1);; All Files (*.*) Fichier Amiibo (%1);; Tous les fichiers (*.*) - + Load Amiibo Charger un Amiibo - + Error loading Amiibo data Erreur lors du chargement des données Amiibo - + The selected file is not a valid amiibo Le fichier choisi n'est pas un amiibo valide - + The selected file is already on use Le fichier sélectionné est déjà utilisé - + An unknown error occurred Une erreur inconnue s'est produite - + Capture Screenshot Capture d'écran - + PNG Image (*.png) Image PNG (*.png) - + TAS state: Running %1/%2 État du TAS : En cours d'exécution %1/%2 - + TAS state: Recording %1 État du TAS : Enregistrement %1 - + TAS state: Idle %1/%2 État du TAS : Inactif %1:%2 - + TAS State: Invalid État du TAS : Invalide - + &Stop Running &Stopper l'exécution - + &Start &Start - + Stop R&ecording Stopper l'en&registrement - + R&ecord En&registrer - + Building: %n shader(s) Compilation: %n shaderCompilation : %n shadersCompilation : %n shaders - + Scale: %1x %1 is the resolution scaling factor Échelle : %1x - + Speed: %1% / %2% Vitesse : %1% / %2% - + Speed: %1% Vitesse : %1% - + Game: %1 FPS (Unlocked) Jeu : %1 IPS (Débloqué) - + Game: %1 FPS Jeu : %1 FPS - + Frame: %1 ms Frame : %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HAUT - + GPU EXTREME GPU EXTRÊME - + GPU ERROR GPU ERREUR - + DOCKED MODE TV - + HANDHELD PORTABLE - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST PLUS PROCHE - - + + BILINEAR BILINÉAIRE - + BICUBIC BICUBIQUE - + GAUSSIAN GAUSSIEN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA AUCUN AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE VOLUME: MUET - + VOLUME: %1% Volume percentage (e.g. 50%) VOLUME: %1% - + Confirm Key Rederivation Confirmer la réinstallation de la clé - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5510,37 +5594,37 @@ et éventuellement faites des sauvegardes. Cela supprimera vos fichiers de clé générés automatiquement et ré exécutera le module d'installation de clé. - + Missing fuses Fusibles manquants - + - Missing BOOT0 - BOOT0 manquant - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main manquant - + - Missing PRODINFO - PRODINFO manquant - + Derivation Components Missing Composants de dérivation manquants - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Les clés de chiffrement sont manquantes. <br>Veuillez suivre <a href='https://yuzu-emu.org/help/quickstart/'>le guide de démarrage rapide yuzu</a> pour obtenir tous vos clés, firmware et jeux.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5549,39 +5633,49 @@ Cela peut prendre jusqu'à une minute en fonction des performances de votre système. - + Deriving Keys Installation des clés - + + System Archive Decryption Failed + Échec du déchiffrement de l'archive système. + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + Les clés de chiffrement n'ont pas réussi à déchiffrer le firmware. <br>Veuillez suivre <a href='https://yuzu-emu.org/help/quickstart/'>le guide de démarrage rapide du yuzu</a> pour obtenir toutes vos clés, firmware et jeux. + + + Select RomFS Dump Target Sélectionner la cible d'extraction du RomFS - + Please select which RomFS you would like to dump. Veuillez sélectionner quel RomFS vous voulez extraire. - + Are you sure you want to close yuzu? Êtes vous sûr de vouloir fermer yuzu ? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Êtes-vous sûr d'arrêter l'émulation ? Tout progrès non enregistré sera perdu. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5593,44 +5687,44 @@ Voulez-vous ignorer ceci and quitter quand même ? GRenderWindow - - + + OpenGL not available! OpenGL n'est pas disponible ! - + OpenGL shared contexts are not supported. Les contextes OpenGL partagés ne sont pas pris en charge. - + yuzu has not been compiled with OpenGL support. yuzu n'a pas été compilé avec le support OpenGL. + - Error while initializing OpenGL! Erreur lors de l'initialisation d'OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Votre GPU peut ne pas prendre en charge OpenGL, ou vous n'avez pas les derniers pilotes graphiques. - + Error while initializing OpenGL 4.6! Erreur lors de l'initialisation d'OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Votre GPU peut ne pas prendre en charge OpenGL 4.6 ou vous ne disposez pas du dernier pilote graphique: %1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Votre GPU peut ne pas prendre en charge une ou plusieurs extensions OpenGL requises. Veuillez vous assurer que vous disposez du dernier pilote graphique.<br><br>GL Renderer :<br>%1<br><br>Extensions non prises en charge :<br>%2 @@ -5689,117 +5783,122 @@ Voulez-vous ignorer ceci and quitter quand même ? + Remove Cache Storage + Supprimer le stockage du cache + + + Remove OpenGL Pipeline Cache Supprimer la Cache de Pipeline OpenGL - + Remove Vulkan Pipeline Cache Supprimer la Cache de Pipeline Vulkan - + Remove All Pipeline Caches Supprimer Toutes les Caches de Pipeline - + Remove All Installed Contents Supprimer tout le contenu installé - + Dump RomFS Extraire la RomFS - + Dump RomFS to SDMC Décharger RomFS vers SDMC - + Copy Title ID to Clipboard Copier l'ID du titre dans le Presse-papiers - + Navigate to GameDB entry Accédez à l'entrée GameDB - + Create Shortcut Créer un raccourci - + Add to Desktop Ajouter au bureau - + Add to Applications Menu Ajouter au menu des applications - + Properties Propriétés - + Scan Subfolders Scanner les sous-dossiers - + Remove Game Directory Supprimer le répertoire du jeu - + ▲ Move Up ▲ Monter - + ▼ Move Down ▼ Descendre - + Open Directory Location Ouvrir l'emplacement du répertoire - + Clear Effacer - + Name Nom - + Compatibility Compatibilité - + Add-ons Extensions - + File type Type de fichier - + Size Taille @@ -5870,7 +5969,7 @@ Voulez-vous ignorer ceci and quitter quand même ? GameListPlaceholder - + Double-click to add a new folder to the game list Double-cliquez pour ajouter un nouveau dossier à la liste de jeux @@ -5883,12 +5982,12 @@ Voulez-vous ignorer ceci and quitter quand même ? %1 sur %n résultat%1 sur %n résultats%1 sur %n résultats - + Filter: Filtre : - + Enter pattern to filter Entrez un motif à filtrer @@ -5979,12 +6078,11 @@ Message de débogage : Hotkeys - + Audio Mute/Unmute Désactiver/Activer le Son - @@ -6006,111 +6104,112 @@ Message de débogage : + Main Window Fenêtre Principale - + Audio Volume Down Baisser le volume audio - + Audio Volume Up Augmenter le volume audio - + Capture Screenshot Prendre une capture d'ecran - + Change Adapting Filter Modifier le filtre d'adaptation - + Change Docked Mode Changer le mode de la station d'accueil - + Change GPU Accuracy Modifier la précision du GPU - + Continue/Pause Emulation Continuer/Suspendre l'Émulation - + Exit Fullscreen Quitter le plein écran - + Exit yuzu Quitter yuzu - + Fullscreen Plein écran - + Load File Charger un fichier - + Load/Remove Amiibo Charger/Supprimer un Amiibo - + Restart Emulation Redémarrer l'Émulation - + Stop Emulation Arrêter l'Émulation - + TAS Record Enregistrement TAS - + TAS Reset Réinitialiser le TAS - + TAS Start/Stop Démarrer/Arrêter le TAS - + Toggle Filter Bar Activer la barre de filtre - + Toggle Framerate Limit Activer la limite de fréquence d'images - + Toggle Mouse Panning Activer le panoramique de la souris - + Toggle Status Bar Activer la barre d'état @@ -6803,7 +6902,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE Démarrer/Pause @@ -6853,21 +6952,21 @@ p, li { white-space: pre-wrap; } - + Shift Maj - + Ctrl Ctrl - + Alt Alt @@ -6875,8 +6974,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [non défini] @@ -6891,10 +6990,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Axe %1%2 @@ -6908,163 +7007,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [inconnu] - - + + Left Gauche - - + + Right Droite - - + + Down Bas - - + + Up Haut - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Start - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle Cercle - + Cross Croix - + Square Carré - + Triangle Triangle - + Share Partager - + Options Options - + [undefined] [non défini] @@ -7075,7 +7174,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [invalide] @@ -7089,21 +7188,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2Axe %3 - + %1%2Axis %3,%4,%5 %1%2Axe %3,%4,%5 - + %1%2Motion %3 %1%2Mouvement %3 @@ -7115,106 +7212,112 @@ p, li { white-space: pre-wrap; } - + [unused] [inutilisé] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L Stick Gauche - + Stick R Stick Droit - + Plus Plus - + Minus Moins - - + + Home Home - + Capture Capturer - + Touch Tactile - + Wheel Indicates the mouse wheel Molette - + Backward Reculer - + Forward Avancer - + Task Tâche - + Extra Extra - + %1%2%3%4 %1%2%3%4 - - + + %1%2%3Hat %4 %1%2%3Chapeau %4 - - + + + %1%2%3Axis %4 + %1%2%3Axe %4 + + + + %1%2%3Button %4 %1%2%3Bouton %4 @@ -7635,73 +7738,73 @@ Veuillez essayer à nouveau ou contactez le développeur du logiciel.Utilisateurs - + Profile Creator Créateur de profil - - + + Profile Selector Sélecteur de profil - + Profile Icon Editor Éditeur d'icônes de profil - + Profile Nickname Editor Éditeur de surnom de profil - + Who will receive the points? Qui recevra les points ? - + Who is using Nintendo eShop? Qui utilise le Nintendo eShop ? - + Who is making this purchase? Qui effectue cet achat ? - + Who is posting? Qui publie ? - + Select a user to link to a Nintendo Account. Sélectionnez un utilisateur à associer à un compte Nintendo. - + Change settings for which user? Modifier les paramètres pour quel utilisateur ? - + Format data for which user? Formater les données pour quel utilisateur ? - + Which user will be transferred to another console? Quel utilisateur sera transféré sur une autre console ? - + Send save data for which user? Envoyer les données de sauvegarde pour quel utilisateur ? - + Select a user: Choisir un utilisateur : diff --git a/dist/languages/id.ts b/dist/languages/id.ts index a6831d7e5..eefc9de49 100644 --- a/dist/languages/id.ts +++ b/dist/languages/id.ts @@ -1093,78 +1093,78 @@ Memungkinkan berbagai macam optimasi IR. Komfigurasi yuzu - - + + Audio Audio - - + + CPU CPU - + Debug Awakutu - + Filesystem Sistem berkas - - + + General Umum - - + + Graphics Grafis - + GraphicsAdvanced GrafisLanjutan - + Hotkeys Pintasan - - + + Controls Kendali - + Profiles Profil - + Network Jaringan - - + + System Sistem - + Game List Daftar Permainan - + Web Jejaring @@ -1339,41 +1339,36 @@ Memungkinkan berbagai macam optimasi IR. - Extended memory layout (8GB DRAM) - - - - Confirm exit while emulation is running Konfirmasi jika ingin keluar saat emulasi berjalan - + Prompt for user on game boot Tanyakan pengguna ketika memulai permainan - + Pause emulation when in background Jeda pengemulasian ketika berada di latar - + Hide mouse on inactivity Sembunyikan mouse saat tidak aktif - + Reset All Settings Atur Ulang Semua Pengaturan - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? @@ -1412,7 +1407,7 @@ Memungkinkan berbagai macam optimasi IR. - + None Tak ada @@ -1438,231 +1433,269 @@ Memungkinkan berbagai macam optimasi IR. + VSync Mode: + + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: Emulasi NVDEC: - + No Video Output Tidak ada Keluaran Suara - + CPU Video Decoding Penguraian Video menggunakan CPU - + GPU Video Decoding (Default) Penguraian Video menggunakan GPU (Bawaan) - + Fullscreen Mode: Mode Layar Penuh: - + Borderless Windowed Layar Tanpa Batas - + Exclusive Fullscreen Layar Penuh Eksklusif - + Aspect Ratio: Rasio Aspek: - + Default (16:9) Bawaan (16:9) - + Force 4:3 Paksa 4:3 - + Force 21:9 Paksa 21:9 - + Force 16:10 - + Stretch to Window Regangkan ke Layar - + Resolution: Resolusi: - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [EKSPERIMENTAL] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [EKSPERIMENTAL] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) - + 8X (5760p/8640p) - + Window Adapting Filter: Filter Menyelaraskan dengan Layar: - + Nearest Neighbor Nearest Neighbor - + Bilinear Biliner - + Bicubic Bikubik - + Gaussian Gaussian - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: Metode Anti-Aliasing: - + FXAA FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Gunakan warna latar global - + Set background color: Setel warna latar: - + Background Color: Warna Latar: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (Shader perakit, hanya NVIDIA) - + SPIR-V (Experimental, Mesa Only) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + + + + + VSync Off + + + + + Recommended + + + + + On + + + + + VSync On + + ConfigureGraphicsAdvanced @@ -1687,107 +1720,133 @@ Memungkinkan berbagai macam optimasi IR. Tingkat Akurasi: - - Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - - - - - Force maximum clocks (Vulkan only) - - - - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync mencegah robekan layar, tapi beberapa kartu grafis memiliki performa yang lebih rendah dengan VSnyc dinyalakan. Biarkan menyala jika anda tidak memerhatikan perbedaan performa. - - - - Use VSync - - - - - Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + ASTC recompression: - Decode ASTC textures asynchronously (Hack) + Uncompressed (Best quality) - - Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. + + BC1 (Low quality) + BC3 (Medium quality) + + + + + Enable asynchronous presentation (Vulkan only) + + + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + + + + + Force maximum clocks (Vulkan only) + + + + + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + + + + + Enable Reactive Flushing + + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. + + + + Use asynchronous shader building (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Use Fast GPU Time (Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - - - - - Use pessimistic buffer flushes (Hack) - - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + + + + + Enable Compute Pipelines (Intel Vulkan only) + + + + Anisotropic Filtering: Anisotropic Filtering: - + Automatic Otomatis - + Default Bawaan - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1820,70 +1879,65 @@ Memungkinkan berbagai macam optimasi IR. Kembalikan ke Semula - + Action Tindakan - + Hotkey Pintasan - + Controller Hotkey - - - + + + Conflicting Key Sequence Urutan Tombol yang Konflik - - + + The entered key sequence is already assigned to: %1 Urutan tombol yang dimasukkan sudah menerap ke: %1 - - Home+%1 - - - - + [waiting] [menunggu] - + Invalid - + Restore Default Kembalikan ke Semula - + Clear Bersihkan - + Conflicting Button Sequence - + The default button sequence is already assigned to: %1 - + The default key sequence is already assigned to: %1 Urutan tombol bawaan sudah diterapkan ke: %1 @@ -2175,7 +2229,7 @@ Memungkinkan berbagai macam optimasi IR. - + Configure Konfigurasi @@ -2232,22 +2286,32 @@ Memungkinkan berbagai macam optimasi IR. - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + + + + + Use random Amiibo ID + + + + Enable mouse panning Nyalakan geseran tetikus - + Mouse sensitivity Sensitivitas mouse - + % % - + Motion / Touch Gerakan / Sentuhan @@ -2359,7 +2423,7 @@ Memungkinkan berbagai macam optimasi IR. - + Left Stick Stik Kiri @@ -2453,14 +2517,14 @@ Memungkinkan berbagai macam optimasi IR. - + L L - + ZL ZL @@ -2479,7 +2543,7 @@ Memungkinkan berbagai macam optimasi IR. - + Plus Tambah @@ -2492,15 +2556,15 @@ Memungkinkan berbagai macam optimasi IR. - - + + R R - + ZR ZR @@ -2557,241 +2621,247 @@ Memungkinkan berbagai macam optimasi IR. - + Right Stick Stik Kanan - - - - + + + + Clear Bersihkan - - - - - + + + + + [not set] [belum diatur] - - + + + Invert button Balikkan tombol - - + + Toggle button Atur tombol - + Turbo button - - + + Invert axis Balikkan poros - - - + + + Set threshold Atur batasan - - + + Choose a value between 0% and 100% Pilih sebuah angka diantara 0% dan 100% - + Toggle axis - + Set gyro threshold - + + Calibrate sensor + + + + Map Analog Stick Petakan Stik Analog - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Setelah menekan OK, pertama gerakkan joystik secara mendatar, lalu tegak lurus. Untuk membalikkan sumbu, pertama gerakkan joystik secara tegak lurus, lalu mendatar. - + Center axis - - + + Deadzone: %1% Titik Mati: %1% - - + + Modifier Range: %1% Rentang Pengubah: %1% - - + + Pro Controller Kontroler Pro - + Dual Joycons Joycon Dual - + Left Joycon Joycon Kiri - + Right Joycon Joycon Kanan - + Handheld Jinjing - + GameCube Controller Kontroler GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Kontroler NES - + SNES Controller Kontroler SNES - + N64 Controller Kontroler N64 - + Sega Genesis Sega Genesis - + Start / Pause Mulai / Jeda - + Z Z - + Control Stick Stik Kendali - + C-Stick C-Stick - + Shake! Getarkan! - + [waiting] [menunggu] - + New Profile Profil Baru - + Enter a profile name: Masukkan nama profil: - - + + Create Input Profile Ciptakan Profil Masukan - + The given profile name is not valid! Nama profil yang diberi tidak sah! - + Failed to create the input profile "%1" Gagal membuat profil masukan "%1" - + Delete Input Profile Hapus Profil Masukan - + Failed to delete the input profile "%1" Gagal menghapus profil masukan "%1" - + Load Input Profile Muat Profil Masukan - + Failed to load the input profile "%1" Gagal memuat profil masukan "%1" - + Save Input Profile Simpat Profil Masukan - + Failed to save the input profile "%1" Gagal menyimpan profil masukan "%1" @@ -3046,47 +3116,47 @@ Untuk membalikkan sumbu, pertama gerakkan joystik secara tegak lurus, lalu menda Pengembang - + Add-Ons Pengaya (Add-On) - + General Umum - + System Sistem - + CPU CPU - + Graphics Grafis - + Adv. Graphics Ljtan. Grafik - + Audio Audio - + Input Profiles - + Properties Properti @@ -3806,7 +3876,12 @@ UUID: %2 - + + Unsafe extended memory layout (8GB DRAM) + + + + System settings are available only when game is not running. Pengaturan sistem hanya tersedia saat permainan tidak dijalankan. @@ -4501,955 +4576,960 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Data anonim dikumpulkan</a> untuk membantu yuzu. <br/><br/>Apa Anda ingin membagi data penggunaan dengan kami? - + Telemetry Telemetri - + Broken Vulkan Installation Detected - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... Memuat Applet Web... - - + + Disable Web Applet Matikan Applet Web - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Jumlah shader yang sedang dibuat - + The current selected resolution scaling multiplier. Pengali skala resolusi yang terpilih. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Kecepatan emulasi saat ini. Nilai yang lebih tinggi atau rendah dari 100% menandakan pengemulasian berjalan lebih cepat atau lambat dibanding Switch aslinya. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Berapa banyak frame per second (bingkai per detik) permainan akan ditampilkan. Ini akan berubah dari berbagai permainan dan pemandangan. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Waktu yang diperlukan untuk mengemulasikan bingkai Switch, tak menghitung pembatas bingkai atau v-sync. Agar emulasi berkecepatan penuh, ini harus 16.67 mdtk. - + &Clear Recent Files &Bersihkan Berkas Baru-baru Ini - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Lanjutkan - + &Pause &Jeda - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu sedang menjalankan game - + Warning Outdated Game Format Peringatan Format Permainan yang Usang - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Anda menggunakan format direktori ROM yang sudah didekonstruksi untuk permainan ini, yang mana itu merupakan format lawas yang sudah tergantikan oleh yang lain seperti NCA, NAX, XCI, atau NSP. Direktori ROM yang sudah didekonstruksi kekurangan ikon, metadata, dan dukungan pembaruan.<br><br>Untuk penjelasan berbagai format Switch yang didukung yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>periksa wiki kami</a>. Pesan ini tidak akan ditampilkan lagi. - - + + Error while loading ROM! Kesalahan ketika memuat ROM! - + The ROM format is not supported. Format ROM tak didukung. - + An error occurred initializing the video core. Terjadi kesalahan ketika menginisialisasi inti video. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu telah mengalami error saat menjalankan inti video. Ini biasanya disebabkan oleh pemicu piranti (driver) GPU yang usang, termasuk yang terintegrasi. Mohon lihat catatan untuk informasi lebih rinci. Untuk informasi cara mengakses catatan, mohon lihat halaman berikut: <a href='https://yuzu-emu.org/help/reference/log-files/'>Cara Mengupload Berkas Catatan</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Terjadi kesalahan yang tak diketahui. Mohon lihat catatan untuk informasi lebih rinci. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data Simpan Data - + Mod Data Mod Data - + Error Opening %1 Folder Gagal Membuka Folder %1 - - + + Folder does not exist! Folder tak ada! - + Error Opening Transferable Shader Cache Gagal Ketika Membuka Tembolok Shader yang Dapat Ditransfer - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Hapus Masukan - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. Tidak ada DLC yang terinstall untuk judul ini. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + + Remove Cache Storage? + + + + Remove File Hapus File - - + + Error Removing Transferable Shader Cache Kesalahan Menghapus Transferable Shader Cache - - + + A shader cache for this title does not exist. Cache shader bagi judul ini tidak ada - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Kesalahan Menghapus Konfigurasi Buatan - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! Pengekstrakan RomFS Gagal! - + There was an error copying the RomFS files or the user cancelled the operation. Terjadi kesalahan ketika menyalin berkas RomFS atau dibatalkan oleh pengguna. - + Full Penuh - + Skeleton Skeleton - + Select RomFS Dump Mode Pilih Mode Dump RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Mohon pilih cara RomFS akan di-dump.<br>FPenuh akan menyalin seluruh berkas ke dalam direktori baru sementara <br>jerangkong hanya akan menciptakan struktur direktorinya saja. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Mengekstrak RomFS... - - + + Cancel Batal - + RomFS Extraction Succeeded! Pengekstrakan RomFS Berhasil! - + The operation completed successfully. Operasi selesai dengan sukses, - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Gagal membuka %1 - + Select Directory Pilih Direktori - + Properties Properti - + The game properties could not be loaded. Properti permainan tak dapat dimuat. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Eksekutabel Switch (%1);;Semua Berkas (*.*) - + Load File Muat Berkas - + Open Extracted ROM Directory Buka Direktori ROM Terekstrak - + Invalid Directory Selected Direktori Terpilih Tidak Sah - + The directory you have selected does not contain a 'main' file. Direktori yang Anda pilih tak memiliki berkas 'utama.' - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Install File - + %n file(s) remaining - + Installing file "%1"... Memasang berkas "%1"... - - + + Install Results Hasil Install - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed %n file(s) baru diinstall - + %n file(s) were overwritten %n file(s) telah ditimpa - + %n file(s) failed to install %n file(s) gagal di install - + System Application Aplikasi Sistem - + System Archive Arsip Sistem - + System Application Update Pembaruan Aplikasi Sistem - + Firmware Package (Type A) Paket Perangkat Tegar (Tipe A) - + Firmware Package (Type B) Paket Perangkat Tegar (Tipe B) - + Game Permainan - + Game Update Pembaruan Permainan - + Game DLC DLC Permainan - + Delta Title Judul Delta - + Select NCA Install Type... Pilih Tipe Pemasangan NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Mohon pilih jenis judul yang Anda ingin pasang sebagai NCA ini: (Dalam kebanyakan kasus, pilihan bawaan 'Permainan' tidak apa-apa`.) - + Failed to Install Gagal Memasang - + The title type you selected for the NCA is invalid. Jenis judul yang Anda pilih untuk NCA tidak sah. - + File not found Berkas tak ditemukan - + File "%1" not found Berkas "%1" tak ditemukan - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Akun yuzu Hilang - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Agar dapat mengirimkan berkas uju kompatibilitas permainan, Anda harus menautkan akun yuzu Anda.<br><br/>TUntuk mennautkan akun yuzu Anda, pergi ke Emulasi &gt; Konfigurasi &gt; Web. - + Error opening URL Kesalahan saat membuka URL - + Unable to open the URL "%1". Tidak dapat membuka URL "%1". - + TAS Recording Rekaman TAS - + Overwrite file of player 1? Timpa file pemain 1? - + Invalid config detected Konfigurasi tidak sah terdeteksi - + Handheld controller can't be used on docked mode. Pro controller will be selected. Kontroller jinjing tidak bisa digunakan dalam mode dock. Kontroller Pro akan dipilih - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Berkas Amiibo (%1);; Semua Berkas (*.*) - + Load Amiibo Muat Amiibo - + Error loading Amiibo data Gagal memuat data Amiibo - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Tangkapan Layar - + PNG Image (*.png) Berkas PNG (*.png) - + TAS state: Running %1/%2 Status TAS: Berjalan %1/%2 - + TAS state: Recording %1 Status TAS: Merekam %1 - + TAS state: Idle %1/%2 Status TAS: Diam %1/%2 - + TAS State: Invalid Status TAS: Tidak Valid - + &Stop Running &Matikan - + &Start &Mulai - + Stop R&ecording Berhenti Mer&ekam - + R&ecord R&ekam - + Building: %n shader(s) Membangun: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Skala: %1x - + Speed: %1% / %2% Kecepatan: %1% / %2% - + Speed: %1% Kecepatan: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Permainan: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU TINGGI - + GPU EXTREME GPU EKSTRIM - + GPU ERROR KESALAHAN GPU - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST NEAREST - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA TANPA AA - + FXAA FXAA - + SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5460,76 +5540,86 @@ This will delete your autogenerated key files and re-run the key derivation modu - + Missing fuses - + - Missing BOOT0 - Kehilangan BOOT0 - + - Missing BCPKG2-1-Normal-Main - Kehilangan BCPKG2-1-Normal-Main - + - Missing PRODINFO - Kehilangan PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. - + Deriving Keys - + + System Archive Decryption Failed + + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target - + Please select which RomFS you would like to dump. - + Are you sure you want to close yuzu? Apakah anda yakin ingin menutup yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5539,44 +5629,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGL tidak tersedia! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. + - Error while initializing OpenGL! Terjadi kesalahan menginisialisasi OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. VGA anda mungkin tidak mendukung OpenGL, atau anda tidak memiliki pemacu piranti (driver) grafis terbaharu. - + Error while initializing OpenGL 4.6! Terjadi kesalahan menginisialisasi OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 VGA anda mungkin tidak mendukung OpenGL 4.6, atau anda tidak memiliki pemacu piranti (driver) grafis terbaharu.<br><br>Pemuat GL:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 VGA anda mungkin tidak mendukung satu atau lebih ekstensi OpenGL. Mohon pastikan bahwa anda memiliki pemacu piranti (driver) grafis terbaharu.<br><br>Pemuat GL:<br>%1<br><br>Ekstensi yang tidak didukung:<br>%2 @@ -5635,117 +5725,122 @@ Would you like to bypass this and exit anyway? - Remove OpenGL Pipeline Cache + Remove Cache Storage + Remove OpenGL Pipeline Cache + + + + Remove Vulkan Pipeline Cache - + Remove All Pipeline Caches - + Remove All Installed Contents - + Dump RomFS - + Dump RomFS to SDMC - + Copy Title ID to Clipboard - + Navigate to GameDB entry - + Create Shortcut - + Add to Desktop - + Add to Applications Menu - + Properties Properti - + Scan Subfolders - + Remove Game Directory - + ▲ Move Up - + ▼ Move Down - + Open Directory Location - + Clear Bersihkan - + Name Nama - + Compatibility Kompatibilitas - + Add-ons Pengaya (Add-On) - + File type - + Size Ukuran @@ -5816,7 +5911,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list @@ -5829,12 +5924,12 @@ Would you like to bypass this and exit anyway? - + Filter: - + Enter pattern to filter @@ -5924,12 +6019,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute - @@ -5951,111 +6045,112 @@ Debug Message: + Main Window - + Audio Volume Down - + Audio Volume Up - + Capture Screenshot Tangkapan Layar - + Change Adapting Filter - + Change Docked Mode - + Change GPU Accuracy - + Continue/Pause Emulation - + Exit Fullscreen - + Exit yuzu - + Fullscreen - + Load File Muat Berkas - + Load/Remove Amiibo - + Restart Emulation - + Stop Emulation - + TAS Record - + TAS Reset - + TAS Start/Stop - + Toggle Filter Bar - + Toggle Framerate Limit - + Toggle Mouse Panning - + Toggle Status Bar @@ -6739,7 +6834,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE @@ -6789,21 +6884,21 @@ p, li { white-space: pre-wrap; } - + Shift - + Ctrl - + Alt @@ -6811,8 +6906,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [belum diatur] @@ -6827,10 +6922,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 @@ -6844,163 +6939,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] - - + + Left Kiri - - + + Right Kanan - - + + Down Bawah - - + + Up Atas - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Mulai - + L1 - + L2 - + L3 - + R1 - + R2 - + R3 - + Circle - + Cross - + Square - + Triangle - + Share - + Options - + [undefined] @@ -7011,7 +7106,7 @@ p, li { white-space: pre-wrap; } - + [invalid] @@ -7025,21 +7120,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 - + %1%2Axis %3,%4,%5 - + %1%2Motion %3 %1%2Gerakan %3 @@ -7051,106 +7144,112 @@ p, li { white-space: pre-wrap; } - + [unused] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L - + Stick R - + Plus Tambah - + Minus Kurang - - + + Home Home - + Capture Tangkapan - + Touch Sentuh - + Wheel Indicates the mouse wheel - + Backward - + Forward - + Task - + Extra - + %1%2%3%4 - - + + %1%2%3Hat %4 - - + + + %1%2%3Axis %4 + + + + + %1%2%3Button %4 @@ -7565,73 +7664,73 @@ Please try again or contact the developer of the software. Pengguna - + Profile Creator - - + + Profile Selector - + Profile Icon Editor - + Profile Nickname Editor - + Who will receive the points? - + Who is using Nintendo eShop? - + Who is making this purchase? - + Who is posting? - + Select a user to link to a Nintendo Account. - + Change settings for which user? - + Format data for which user? - + Which user will be transferred to another console? - + Send save data for which user? - + Select a user: diff --git a/dist/languages/it.ts b/dist/languages/it.ts index 8c76842b5..ab3aa7611 100644 --- a/dist/languages/it.ts +++ b/dist/languages/it.ts @@ -1122,78 +1122,78 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP.Configurazione di yuzu - - + + Audio Audio - - + + CPU CPU - + Debug Debug - + Filesystem Filesystem - - + + General Generale - - + + Graphics Grafica - + GraphicsAdvanced Grafica avanzata - + Hotkeys Scorciatoie - - + + Controls Comandi - + Profiles Profili - + Network Rete - - + + System Sistema - + Game List Lista dei giochi - + Web Web @@ -1368,41 +1368,36 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - Extended memory layout (8GB DRAM) - - - - Confirm exit while emulation is running Richiedi conferma di uscire mentre l'emulazione è in corso - + Prompt for user on game boot Richiedi utente all'avvio di un gioco - + Pause emulation when in background Metti in pausa l'emulazione quando la finestra è in background - + Hide mouse on inactivity Nascondi il puntatore del mouse se inattivo - + Reset All Settings Ripristina tutte le impostazioni - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Tutte le impostazioni verranno ripristinate e tutte le configurazioni dei giochi verranno rimosse. Le cartelle di gioco, i profili e i profili di input non saranno cancellati. Vuoi procedere? @@ -1441,7 +1436,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + None Nessuno @@ -1467,231 +1462,269 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. + VSync Mode: + + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: Emulazione NVDEC: - + No Video Output Nessun output video - + CPU Video Decoding Decodifica video CPU - + GPU Video Decoding (Default) Decodifica video GPU (predefinita) - + Fullscreen Mode: Modalità schermo intero: - + Borderless Windowed Finestra senza bordi - + Exclusive Fullscreen Esclusivamente a schermo intero - + Aspect Ratio: Rapporto d'aspetto: - + Default (16:9) Predefinito (16:9) - + Force 4:3 Forza 4:3 - + Force 21:9 Forza 21:9 - + Force 16:10 Forza 16:10 - + Stretch to Window Allunga a finestra - + Resolution: Risoluzione: - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [SPERIMENTALE] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [SPERIMENTALE] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] 1.5X (1080p/1620p) [SPERIMENTALE] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) 7X (5040p/7560p) - + 8X (5760p/8640p) 8X (5760p/8640p) - + Window Adapting Filter: Filtro di adattamento alla finestra: - + Nearest Neighbor Nearest neighbor - + Bilinear Bilineare - + Bicubic Bicubico - + Gaussian Gaussiano - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: Metodo di anti-aliasing: - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness Usa la nitidezza FSR globale - + Set FSR Sharpness Imposta la nitidezza FSR - + FSR Sharpness: Nitidezza FSR: - + 100% 100% - - + + Use global background color Usa il colore di sfondo globale - + Set background color: Imposta il colore di sfondo: - + Background Color: Colore dello sfondo: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (shader assembly, solo NVIDIA) - + SPIR-V (Experimental, Mesa Only) SPIR-V (sperimentale, solo Mesa) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + + + + + VSync Off + + + + + Recommended + + + + + On + + + + + VSync On + + ConfigureGraphicsAdvanced @@ -1716,107 +1749,133 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP.Livello di accuratezza: - + + ASTC recompression: + + + + + Uncompressed (Best quality) + + + + + BC1 (Low quality) + + + + + BC3 (Medium quality) + + + + + Enable asynchronous presentation (Vulkan only) + + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. Esegue del lavoro in background durante l'attesa dei comandi grafici per evitare che la GPU diminuisca la sua velocità di clock. - + Force maximum clocks (Vulkan only) Forza clock massimi (solo Vulkan) - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - Il VSync evita il tearing dello schermo, ma alcune schede video hanno prestazioni peggiori quando il VSync è abilitato. Lascialo abilitato se non noti una differenza nelle prestazioni. - - - - Use VSync - Utilizza VSync - - - + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. Abilita la decodifica asincrona delle texture ASTC, che può ridurre gli scatti durante il caricamento. Questa funzione è sperimentale. - + Decode ASTC textures asynchronously (Hack) Decodifica le texture ASTC in maniera asincrona (espediente) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + + + + + Enable Reactive Flushing + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Abilita la compilazione degli shader asincrona, che può ridurre gli scatti causati dagli shader. Questa funzione è sperimentale. - + Use asynchronous shader building (Hack) Utilizza la compilazione asincrona degli shader (espediente) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Use Fast GPU Time (Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - - - - - Use pessimistic buffer flushes (Hack) - - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache Utilizza la cache delle pipeline di Vulkan - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + + + + + Enable Compute Pipelines (Intel Vulkan only) + + + + Anisotropic Filtering: Filtro anisotropico: - + Automatic Automatico - + Default Predefinito - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1849,70 +1908,65 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP.Ripristina predefinite - + Action Azione - + Hotkey Scorciatoia - + Controller Hotkey Scorciatoia del controller - - - + + + Conflicting Key Sequence Sequenza di tasti in conflitto - - + + The entered key sequence is already assigned to: %1 La sequenza di tasti inserita è già assegnata a: %1 - - Home+%1 - Home+%1 - - - + [waiting] [in attesa] - + Invalid Non valido - + Restore Default Ripristina predefinita - + Clear Cancella - + Conflicting Button Sequence Sequenza di pulsanti in conflitto - + The default button sequence is already assigned to: %1 La sequenza di pulsanti predefinita è già assegnata a: %1 - + The default key sequence is already assigned to: %1 La sequenza di tasti predefinita è già assegnata a: %1 @@ -2204,7 +2258,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + Configure Configura @@ -2261,22 +2315,32 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP.Abilita il driver Pro Controller diretto [SPERIMENTALE] - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + + + + + Use random Amiibo ID + + + + Enable mouse panning Abilita il mouse panning - + Mouse sensitivity Sensibilità del mouse - + % % - + Motion / Touch Movimento/tocco @@ -2388,7 +2452,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + Left Stick Levetta sinistra @@ -2482,14 +2546,14 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + L L - + ZL ZL @@ -2508,7 +2572,7 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + Plus Più @@ -2521,15 +2585,15 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - - + + R R - + ZR ZR @@ -2586,241 +2650,247 @@ Questo bannerà sia il suo nome utente del forum che il suo indirizzo IP. - + Right Stick Levetta destra - - - - + + + + Clear Cancella - - - - - + + + + + [not set] [non impost.] - - + + + Invert button Inverti pulsante - - + + Toggle button Premi il pulsante - + Turbo button - - + + Invert axis Inverti asse - - - + + + Set threshold Imposta soglia - - + + Choose a value between 0% and 100% Scegli un valore compreso tra 0% e 100% - + Toggle axis - + Set gyro threshold - + + Calibrate sensor + + + + Map Analog Stick Mappa la levetta analogica - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Dopo aver premuto OK, prima muovi la levetta orizzontalmente, e poi verticalmente. Per invertire gli assi, prima muovi la levetta verticalmente, e poi orizzontalmente. - + Center axis Centra asse - - + + Deadzone: %1% Zona morta: %1% - - + + Modifier Range: %1% Modifica raggio: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Due Joycon - + Left Joycon Joycon sinistro - + Right Joycon Joycon destro - + Handheld Portatile - + GameCube Controller Controller GameCube - + Poke Ball Plus Poké Ball Plus - + NES Controller Controller NES - + SNES Controller Controller SNES - + N64 Controller Controller N64 - + Sega Genesis Sega Genesis - + Start / Pause Avvia / Metti in pausa - + Z Z - + Control Stick Levetta di Controllo - + C-Stick Levetta C - + Shake! Scuoti! - + [waiting] [in attesa] - + New Profile Nuovo profilo - + Enter a profile name: Inserisci un nome profilo: - - + + Create Input Profile Crea un profilo di input - + The given profile name is not valid! Il nome profilo inserito non è valido! - + Failed to create the input profile "%1" Impossibile creare il profilo di input "%1" - + Delete Input Profile Elimina un profilo di input - + Failed to delete the input profile "%1" Impossibile eliminare il profilo di input "%1" - + Load Input Profile Carica un profilo di input - + Failed to load the input profile "%1" Impossibile caricare il profilo di input "%1" - + Save Input Profile Salva un profilo di Input - + Failed to save the input profile "%1" Impossibile creare il profilo di input "%1" @@ -3075,47 +3145,47 @@ Per invertire gli assi, prima muovi la levetta verticalmente, e poi orizzontalme Sviluppatore - + Add-Ons Add-on - + General Generale - + System Sistema - + CPU CPU - + Graphics Grafica - + Adv. Graphics Grafica (Avanzate) - + Audio Audio - + Input Profiles Profili di input - + Properties Proprietà @@ -3836,7 +3906,12 @@ UUID: %2 Nome del dispositivo - + + Unsafe extended memory layout (8GB DRAM) + + + + System settings are available only when game is not running. Le impostazioni di sistema sono disponibili solamente quando il gioco non è in esecuzione. @@ -4532,554 +4607,559 @@ Trascina i punti per cambiare posizione, oppure clicca due volte la cella in tab GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Vengono raccolti dati anonimi</a> per aiutarci a migliorare yuzu. <br/><br/>Desideri condividere i tuoi dati di utilizzo con noi? - + Telemetry Telemetria - + Broken Vulkan Installation Detected Rilevata installazione di Vulkan non funzionante - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. L'inizializzazione di Vulkan è fallita durante l'avvio.<br><br>Clicca <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>qui per istruzioni su come risolvere il problema</a>. - + Loading Web Applet... Caricamento dell'applet web... - - + + Disable Web Applet Disabilita l'applet web - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Il numero di shaders al momento in costruzione - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Velocità corrente dell'emulazione. Valori più alti o più bassi di 100% indicano che l'emulazione sta funzionando più velocemente o lentamente rispetto a una Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Il numero di fotogrammi al secondo che il gioco visualizza attualmente. Può variare in base al gioco e alla situazione. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tempo necessario per emulare un fotogramma della Switch, senza tenere conto del limite al framerate o del V-Sync. Per un'emulazione alla massima velocità, il valore non dovrebbe essere superiore a 16.67 ms. - + &Clear Recent Files &Cancella i file recenti - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Continua - + &Pause &Pausa - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Formato del gioco obsoleto - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Stai usando una cartella con dentro una ROM decostruita come formato per avviare questo gioco, è un formato obsoleto ed è stato sostituito da altri come NCA, NAX, XCI o NSP. Le ROM decostruite non hanno icone, metadata e non supportano gli aggiornamenti. <br><br>Per una spiegazione sui vari formati di Switch che yuzu supporta, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>controlla la nostra wiki</a>. Questo messaggio non verrà più mostrato. - - + + Error while loading ROM! Errore nel caricamento della ROM! - + The ROM format is not supported. Il formato della ROM non è supportato. - + An error occurred initializing the video core. È stato riscontrato un errore nell'inizializzazione del core video. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Errore nel caricamento della ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Segui <a href='https://yuzu-emu.org/help/quickstart/'>la guida introduttiva di yuzu</a> per rifare il dump dei file.<br>Puoi fare riferimento alla wiki di yuzu</a> o al server Discord di yuzu</a> per assistenza. - + An unknown error occurred. Please see the log for more details. Si è verificato un errore sconosciuto. Visualizza il log per maggiori dettagli. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Chiusura del software in corso... - + Save Data Dati di salvataggio - + Mod Data Dati delle mod - + Error Opening %1 Folder Impossibile aprire la cartella %1 - - + + Folder does not exist! La cartella non esiste! - + Error Opening Transferable Shader Cache Impossibile aprire la cache trasferibile degli shader - + Failed to create the shader cache directory for this title. Impossibile creare la cartella della cache degli shader per questo titolo. - + Error Removing Contents Impossibile rimuovere il contentuto - + Error Removing Update Impossibile rimuovere l'aggiornamento - + Error Removing DLC Impossibile rimuovere il DLC - + Remove Installed Game Contents? Rimuovere il contenuto del gioco installato? - + Remove Installed Game Update? Rimuovere l'aggiornamento installato? - + Remove Installed Game DLC? Rimuovere il DLC installato? - + Remove Entry Rimuovi voce - - - - - - + + + + + + Successfully Removed Rimozione completata - + Successfully removed the installed base game. Il gioco base installato è stato rimosso con successo. - + The base game is not installed in the NAND and cannot be removed. Il gioco base non è installato su NAND e non può essere rimosso. - + Successfully removed the installed update. Aggiornamento rimosso con successo. - + There is no update installed for this title. Non c'è alcun aggiornamento installato per questo gioco. - + There are no DLC installed for this title. Non c'è alcun DLC installato per questo gioco. - + Successfully removed %1 installed DLC. %1 DLC rimossi con successo. - + Delete OpenGL Transferable Shader Cache? Vuoi rimuovere la cache trasferibile degli shader OpenGL? - + Delete Vulkan Transferable Shader Cache? Vuoi rimuovere la cache trasferibile degli shader Vulkan? - + Delete All Transferable Shader Caches? Vuoi rimuovere tutte le cache trasferibili degli shader? - + Remove Custom Game Configuration? Rimuovere la configurazione personalizzata del gioco? - + + Remove Cache Storage? + + + + Remove File Rimuovi file - - + + Error Removing Transferable Shader Cache Impossibile rimuovere la cache trasferibile degli shader - - + + A shader cache for this title does not exist. Per questo titolo non esiste una cache degli shader. - + Successfully removed the transferable shader cache. La cache trasferibile degli shader è stata rimossa con successo. - + Failed to remove the transferable shader cache. Impossibile rimuovere la cache trasferibile degli shader. - + Error Removing Vulkan Driver Pipeline Cache Impossibile rimuovere la cache delle pipeline del driver Vulkan - + Failed to remove the driver pipeline cache. Impossibile rimuovere la cache delle pipeline del driver. - - + + Error Removing Transferable Shader Caches Impossibile rimuovere le cache trasferibili degli shader - + Successfully removed the transferable shader caches. Le cache trasferibili degli shader sono state rimosse con successo. - + Failed to remove the transferable shader cache directory. Impossibile rimuovere la cartella della cache trasferibile degli shader. - - + + Error Removing Custom Configuration Impossibile rimuovere la configurazione personalizzata - + A custom configuration for this title does not exist. Non esiste una configurazione personalizzata per questo gioco. - + Successfully removed the custom game configuration. La configurazione personalizzata del gioco è stata rimossa con successo. - + Failed to remove the custom game configuration. Impossibile rimuovere la configurazione personalizzata del gioco. - - + + RomFS Extraction Failed! Estrazione RomFS fallita! - + There was an error copying the RomFS files or the user cancelled the operation. C'è stato un errore nella copia dei file del RomFS o l'operazione è stata annullata dall'utente. - + Full Completa - + Skeleton Cartelle - + Select RomFS Dump Mode Seleziona la modalità di estrazione della RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Seleziona come vorresti estrarre la RomFS. <br>La modalità Completa copierà tutti i file in una nuova cartella mentre<br>la modalità Cartelle creerà solamente le cartelle e le sottocartelle. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Estrazione RomFS in corso... - - + + Cancel Annulla - + RomFS Extraction Succeeded! Estrazione RomFS riuscita! - + The operation completed successfully. L'operazione è stata completata con successo. - - - - - + + + + + Create Shortcut Crea scorciatoia - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Verrà creata una scorciatoia all'AppImage attuale. Potrebbe non funzionare correttamente se effettui un aggiornamento. Vuoi continuare? - + Cannot create shortcut on desktop. Path "%1" does not exist. Impossibile creare la scorciatoia sul desktop. Il percorso "%1" non esiste. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Impossibile creare la scorciatoia nel menù delle applicazioni. Il percorso "%1" non esiste e non può essere creato. - + Create Icon Crea icona - + Cannot create icon file. Path "%1" does not exist and cannot be created. Impossibile creare il file dell'icona. Il percorso "%1" non esiste e non può essere creato. - + Start %1 with the yuzu Emulator Avvia %1 con l'emulatore yuzu - + Failed to create a shortcut at %1 Impossibile creare la scorciatoia in %1 - + Successfully created a shortcut to %1 Scorciatoia creata con successo in %1 - + Error Opening %1 Impossibile aprire %1 - + Select Directory Seleziona cartella - + Properties Proprietà - + The game properties could not be loaded. Non è stato possibile caricare le proprietà del gioco. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Eseguibile Switch (%1);;Tutti i file (*.*) - + Load File Carica file - + Open Extracted ROM Directory Apri cartella ROM estratta - + Invalid Directory Selected Cartella selezionata non valida - + The directory you have selected does not contain a 'main' file. La cartella che hai selezionato non contiene un file "main". - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) File installabili Switch (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Installa file - + %n file(s) remaining %n file rimanente%n file rimanenti%n file rimanenti - + Installing file "%1"... Installazione del file "%1"... - - + + Install Results Risultati dell'installazione - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Per evitare possibli conflitti, sconsigliamo di installare i giochi base su NAND. Usa questa funzione solo per installare aggiornamenti e DLC. - + %n file(s) were newly installed %n nuovo file è stato installato @@ -5088,7 +5168,7 @@ Usa questa funzione solo per installare aggiornamenti e DLC. - + %n file(s) were overwritten %n file è stato sovrascritto @@ -5097,7 +5177,7 @@ Usa questa funzione solo per installare aggiornamenti e DLC. - + %n file(s) failed to install %n file non è stato installato a causa di errori @@ -5106,389 +5186,389 @@ Usa questa funzione solo per installare aggiornamenti e DLC. - + System Application Applicazione di sistema - + System Archive Archivio di sistema - + System Application Update Aggiornamento di un'applicazione di sistema - + Firmware Package (Type A) Pacchetto firmware (tipo A) - + Firmware Package (Type B) Pacchetto firmware (tipo B) - + Game Gioco - + Game Update Aggiornamento di gioco - + Game DLC DLC - + Delta Title Titolo delta - + Select NCA Install Type... Seleziona il tipo di installazione NCA - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Seleziona il tipo del file NCA da installare: (Nella maggior parte dei casi, il valore predefinito 'Gioco' va bene.) - + Failed to Install Installazione fallita - + The title type you selected for the NCA is invalid. Il tipo che hai selezionato per l'NCA non è valido. - + File not found File non trovato - + File "%1" not found File "%1" non trovato - + OK OK - - + + Hardware requirements not met Requisiti hardware non soddisfatti - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Il tuo sistema non soddisfa i requisiti hardware consigliati. La funzionalità di segnalazione della compatibilità è stata disattivata. - + Missing yuzu Account Account di yuzu non trovato - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Per segnalare la compatibilità di un gioco, devi collegare il tuo account yuzu. <br><br/>Per collegare il tuo account yuzu, vai su Emulazione &gt; Configurazione &gt; Web. - + Error opening URL Impossibile aprire l'URL - + Unable to open the URL "%1". Non è stato possibile aprire l'URL "%1". - + TAS Recording - + Overwrite file of player 1? Vuoi sovrascrivere il file del giocatore 1? - + Invalid config detected Trovata configurazione invalida - + Handheld controller can't be used on docked mode. Pro controller will be selected. Il controller portatile non può essere utilizzato in modalità dock. Verrà selezionato il controller Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed L'Amiibo corrente è stato rimosso - + Error Errore - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) File Amiibo (%1);; Tutti i file (*.*) - + Load Amiibo Carica Amiibo - + Error loading Amiibo data Impossibile caricare i dati dell'Amiibo - + The selected file is not a valid amiibo Il file selezionato non è un Amiibo valido - + The selected file is already on use Il file selezionato è già in uso - + An unknown error occurred Si è verificato un errore sconosciuto - + Capture Screenshot Cattura screenshot - + PNG Image (*.png) Immagine PNG (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running &Interrompi - + &Start &Avvia - + Stop R&ecording Interrompi r&egistrazione - + R&ecord R&egistra - + Building: %n shader(s) Compilazione di %n shaderCompilazione di %n shaderCompilazione di %n shader - + Scale: %1x %1 is the resolution scaling factor Risoluzione: %1x - + Speed: %1% / %2% Velocità: %1% / %2% - + Speed: %1% Velocità: %1% - + Game: %1 FPS (Unlocked) Gioco: %1 FPS (Sbloccati) - + Game: %1 FPS Gioco: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMALE - + GPU HIGH GPU ALTA - + GPU EXTREME GPU ESTREMA - + GPU ERROR ERRORE GPU - + DOCKED DOCK - + HANDHELD PORTATILE - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST NEAREST - - + + BILINEAR BILINEARE - + BICUBIC BICUBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA NO AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE VOLUME: MUTO - + VOLUME: %1% Volume percentage (e.g. 50%) VOLUME: %1% - + Confirm Key Rederivation Conferma ri-derivazione chiavi - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5505,37 +5585,37 @@ e facoltativamente fai dei backup. Questo eliminerà i tuoi file di chiavi autogenerati e ri-avvierà il processo di derivazione delle chiavi. - + Missing fuses Fusi mancanti - + - Missing BOOT0 - BOOT0 mancante - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main mancante - + - Missing PRODINFO - PRODINFO mancante - + Derivation Components Missing Componenti di derivazione mancanti - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Chiavi di crittografia mancanti. <br>Segui <a href='https://yuzu-emu.org/help/quickstart/'>la guida introduttiva di yuzu</a> per ottenere tutte le tue chiavi, il tuo firmware e i tuoi giochi.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5544,39 +5624,49 @@ Questa operazione potrebbe durare fino a un minuto in base alle prestazioni del tuo sistema. - + Deriving Keys Derivazione chiavi - + + System Archive Decryption Failed + + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target Seleziona Target dell'Estrazione del RomFS - + Please select which RomFS you would like to dump. Seleziona quale RomFS vorresti estrarre. - + Are you sure you want to close yuzu? Sei sicuro di voler chiudere yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Sei sicuro di voler arrestare l'emulazione? Tutti i progressi non salvati verranno perduti. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5588,44 +5678,44 @@ Desideri uscire comunque? GRenderWindow - - + + OpenGL not available! OpenGL non disponibile! - + OpenGL shared contexts are not supported. Gli shared context di OpenGL non sono supportati. - + yuzu has not been compiled with OpenGL support. yuzu è stato compilato senza il supporto a OpenGL. + - Error while initializing OpenGL! Errore durante l'inizializzazione di OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. La tua GPU potrebbe non supportare OpenGL, o non hai installato l'ultima versione dei driver video. - + Error while initializing OpenGL 4.6! Errore durante l'inizializzazione di OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 La tua GPU potrebbe non supportare OpenGL 4.6, o non hai installato l'ultima versione dei driver video.<br><br>Renderer GL:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 La tua GPU potrebbe non supportare una o più estensioni OpenGL richieste. Assicurati di aver installato i driver video più recenti.<br><br>Renderer GL:<br>%1<br><br>Estensioni non supportate:<br>%2 @@ -5684,117 +5774,122 @@ Desideri uscire comunque? + Remove Cache Storage + + + + Remove OpenGL Pipeline Cache Rimuovi la cache delle pipeline OpenGL - + Remove Vulkan Pipeline Cache Rimuovi la cache delle pipeline Vulkan - + Remove All Pipeline Caches Rimuovi tutte le cache delle pipeline - + Remove All Installed Contents Rimuovi tutti i contenuti installati - + Dump RomFS Estrai RomFS - + Dump RomFS to SDMC Estrai RomFS su SDMC - + Copy Title ID to Clipboard Copia il Title ID negli Appunti - + Navigate to GameDB entry Vai alla pagina di GameDB - + Create Shortcut Crea scorciatoia - + Add to Desktop Aggiungi al desktop - + Add to Applications Menu Aggiungi al menù delle applicazioni - + Properties Proprietà - + Scan Subfolders Scansiona le sottocartelle - + Remove Game Directory Rimuovi cartella dei giochi - + ▲ Move Up ▲ Sposta in alto - + ▼ Move Down ▼ Sposta in basso - + Open Directory Location Apri cartella - + Clear Cancella - + Name Nome - + Compatibility Compatibilità - + Add-ons Add-on - + File type Tipo di file - + Size Dimensione @@ -5865,7 +5960,7 @@ Desideri uscire comunque? GameListPlaceholder - + Double-click to add a new folder to the game list Clicca due volte per aggiungere una nuova cartella alla lista dei giochi @@ -5878,12 +5973,12 @@ Desideri uscire comunque? %1 di %n risultato%1 di %n risultati%1 di %n risultati - + Filter: Filtro: - + Enter pattern to filter Inserisci pattern per filtrare @@ -5974,12 +6069,11 @@ Messaggio di debug: Hotkeys - + Audio Mute/Unmute Attiva/disattiva l'audio - @@ -6001,111 +6095,112 @@ Messaggio di debug: + Main Window Finestra principale - + Audio Volume Down Abbassa il volume dell'audio - + Audio Volume Up Alza il volume dell'audio - + Capture Screenshot Cattura screenshot - + Change Adapting Filter Cambia filtro di adattamento - + Change Docked Mode Cambia modalità console - + Change GPU Accuracy Cambia accuratezza GPU - + Continue/Pause Emulation Continua/Metti in pausa l'emulazione - + Exit Fullscreen Esci dalla modalità schermo intero - + Exit yuzu Esci da yuzu - + Fullscreen Schermo intero - + Load File Carica file - + Load/Remove Amiibo Carica/Rimuovi Amiibo - + Restart Emulation Riavvia l'emulazione - + Stop Emulation Arresta l'emulazione - + TAS Record Registra TAS - + TAS Reset Reimposta TAS - + TAS Start/Stop Avvia/interrompi TAS - + Toggle Filter Bar Mostra/nascondi la barra del filtro - + Toggle Framerate Limit Attiva/disattiva il limite del framerate - + Toggle Mouse Panning Attiva/disattiva il mouse panning - + Toggle Status Bar Mostra/nascondi la barra di stato @@ -6797,7 +6892,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE AVVIA/PAUSA @@ -6847,21 +6942,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6869,8 +6964,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [non impost.] @@ -6885,10 +6980,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Asse %1%2 @@ -6902,163 +6997,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [sconosciuto] - - + + Left Sinistra - - + + Right Destra - - + + Down Giù - - + + Up Su - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Start - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle Cerchio - + Cross Croce - + Square Quadrato - + Triangle Triangolo - + Share Condividi - + Options Opzioni - + [undefined] @@ -7069,7 +7164,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [non valido] @@ -7083,21 +7178,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2Asse %3 - + %1%2Axis %3,%4,%5 %1%2Asse %3,%4,%5 - + %1%2Motion %3 @@ -7109,106 +7202,112 @@ p, li { white-space: pre-wrap; } - + [unused] [inutilizzato] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L Levetta L - + Stick R Levetta R - + Plus Più - + Minus Meno - - + + Home Home - + Capture Cattura - + Touch Touch - + Wheel Indicates the mouse wheel Rotella - + Backward Indietro - + Forward Avanti - + Task - + Extra Extra - + %1%2%3%4 - - + + %1%2%3Hat %4 - - + + + %1%2%3Axis %4 + + + + + %1%2%3Button %4 %1%2%3Pulsante %4 @@ -7629,73 +7728,73 @@ Riprova o contatta gli sviluppatori del programma. Utenti - + Profile Creator - - + + Profile Selector Selettore profili - + Profile Icon Editor - + Profile Nickname Editor - + Who will receive the points? - + Who is using Nintendo eShop? - + Who is making this purchase? - + Who is posting? - + Select a user to link to a Nintendo Account. - + Change settings for which user? - + Format data for which user? - + Which user will be transferred to another console? - + Send save data for which user? - + Select a user: Seleziona un utente: diff --git a/dist/languages/ja_JP.ts b/dist/languages/ja_JP.ts index e61137ac7..282855584 100644 --- a/dist/languages/ja_JP.ts +++ b/dist/languages/ja_JP.ts @@ -538,7 +538,7 @@ This would ban both their forum username and their IP address. Unsafe CPU Optimization Settings - CPU最適化設定 + 不安定なCPU最適化設定 @@ -1084,7 +1084,7 @@ This would ban both their forum username and their IP address. Web applet not compiled - ウェブアプレットがコンパイルされていない + ウェブアプレットがコンパイルされていません @@ -1137,78 +1137,78 @@ This would ban both their forum username and their IP address. yuzuの設定 - - + + Audio サウンド - - + + CPU CPU - + Debug デバッグ - + Filesystem ファイルシステム - - + + General 全般 - - + + Graphics グラフィック - + GraphicsAdvanced 拡張グラフィック - + Hotkeys ホットキー - - + + Controls 操作 - + Profiles プロファイル - + Network ネットワーク - - + + System システム - + Game List ゲームリスト - + Web Web @@ -1383,41 +1383,36 @@ This would ban both their forum username and their IP address. - Extended memory layout (8GB DRAM) - + Confirm exit while emulation is running + エミュレーションの停止を確認 - Confirm exit while emulation is running - エミュレーション停止時に確認 - - - Prompt for user on game boot ゲーム起動時に確認を表示 - + Pause emulation when in background 非アクティブ時にエミュレーションを一時停止 - + Hide mouse on inactivity 非アクティブ時にマウスカーソルを隠す - + Reset All Settings すべての設定をリセット - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? すべての設定がリセットされ、ゲームごとの設定もすべて削除されます。ゲームディレクトリ、プロファイル、入力プロファイルは削除されません。続行しますか? @@ -1456,7 +1451,7 @@ This would ban both their forum username and their IP address. - + None なし @@ -1482,231 +1477,269 @@ This would ban both their forum username and their IP address. + VSync Mode: + 垂直同期: + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: NVDEC エミュレーション: - + No Video Output ビデオ出力しない - + CPU Video Decoding ビデオをCPUでデコード - + GPU Video Decoding (Default) ビデオをGPUでデコード (デフォルト) - + Fullscreen Mode: 全画面モード: - + Borderless Windowed ボーダーレスウィンドウ - + Exclusive Fullscreen 排他的フルスクリーン - + Aspect Ratio: アスペクト比： - + Default (16:9) デフォルト (16:9) - + Force 4:3 強制 4:3 - + Force 21:9 強制 21:9 - + Force 16:10 強制 16:10 - + Stretch to Window ウィンドウに合わせる - + Resolution: 解像度: - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [実験的] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [実験的] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] 1.5X (1080p/1620p) [実験的] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) 7X (5040p/7560p) - + 8X (5760p/8640p) 8X (5760p/8640p) - + Window Adapting Filter: - ウィンドウ　アダプティング　フィルター: + ウィンドウ アダプティング フィルター: - + Nearest Neighbor Nearest Neighbor - + Bilinear Bilinear - + Bicubic Bicubic - + Gaussian Gaussian - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: アンチエイリアス方式: - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness - + 共通設定を使用 - + Set FSR Sharpness FSR シャープネスを設定 - + FSR Sharpness: FSR シャープネス: - + 100% 100% - - + + Use global background color 共通設定を使用 - + Set background color: 背景色の設定： - + Background Color: 背景色： - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (アセンブリシェーダ、NVIDIA のみ) - + SPIR-V (Experimental, Mesa Only) SPIR-V (実験的, Mesa のみ) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + + + + + VSync Off + + + + + Recommended + + + + + On + + + + + VSync On + + ConfigureGraphicsAdvanced @@ -1731,107 +1764,133 @@ This would ban both their forum username and their IP address. 精度： - + + ASTC recompression: + + + + + Uncompressed (Best quality) + + + + + BC1 (Low quality) + + + + + BC3 (Medium quality) + + + + + Enable asynchronous presentation (Vulkan only) + 非同期プレゼンテーション (Vulkan のみ) + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. GPUのクロックスピードを下げないように、グラフィックコマンドを待っている間、バックグラウンドで作業を実行させます。 - + Force maximum clocks (Vulkan only) - 強制最大クロック (Vulkan のみ) + 最大クロック強制 (Vulkan のみ) - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSyncは画面のちらつきを防ぎますが、一部のグラフィックカードではパフォーマンスが低下します。パフォーマンス低下を感じない限り、有効のままにしてください。 - - - - Use VSync - VSyncを使用 - - - + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. 非同期ASTCテクスチャーデコードを有効にし、ロード時間のスタッターを減らすことができます。この機能は実験的なものです。 - + Decode ASTC textures asynchronously (Hack) ASTCテクスチャを非同期でデコードする（ハック） - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + + + + + Enable Reactive Flushing + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. 非同期でのシェーダーのコンパイルを有効にします。シェーダーのスタッターが減少する場合があります。この機能は実験的です。 - + Use asynchronous shader building (Hack) 非同期でのシェーダー構築を使用 (ハック) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. 高速なGPUタイミングを有効にします。このオプションは、ほとんどのゲームをその最高のネイティブ解像度で実行することを強制します。 - + Use Fast GPU Time (Hack) - 高速なGPUタイミングを有効化(ハック) + 高速なGPUタイミング(ハック) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - 悲観的なバッファフラッシュを有効にします. このオプションは, 変更されていないバッファを強制的にフラッシュさせるので, パフォーマンスが低下する可能性があります. - - - - Use pessimistic buffer flushes (Hack) - 悲観的なバッファフラッシュを使用 (ハック) - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. GPU ベンダー固有のパイプラインキャッシュを有効にします。このオプションは、Vulkanドライバがパイプラインキャッシュファイルを内部に保存していない場合に、シェーダのロード時間を大幅に改善することができます。 - + Use Vulkan pipeline cache Vulkan パイプラインキャッシュを使用 - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + + + + + Enable Compute Pipelines (Intel Vulkan only) + + + + Anisotropic Filtering: 異方性フィルタリング： - + Automatic 自動 - + Default デフォルト - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1864,70 +1923,65 @@ This would ban both their forum username and their IP address. デフォルトに戻す - + Action 操作 - + Hotkey ホットキー - + Controller Hotkey コントローラホットキー - - - + + + Conflicting Key Sequence 入力された組合せの衝突 - - + + The entered key sequence is already assigned to: %1 入力された組合せは既に次の操作に割り当てられています：%1 - - Home+%1 - - - - + [waiting] [入力待ち] - + Invalid 無効 - + Restore Default デフォルトに戻す - + Clear 消去 - + Conflicting Button Sequence ボタンが競合しています - + The default button sequence is already assigned to: %1 デフォルトのボタン配列はすでに %1 に割り当てられています。 - + The default key sequence is already assigned to: %1 デフォルトの組合せはすでに %1 に割り当てられています。 @@ -2219,7 +2273,7 @@ This would ban both their forum username and their IP address. - + Configure 設定 @@ -2276,22 +2330,32 @@ This would ban both their forum username and their IP address. - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + + + + + Use random Amiibo ID + + + + Enable mouse panning - + Mouse sensitivity マウス感度 - + % % - + Motion / Touch モーション / タッチ @@ -2403,7 +2467,7 @@ This would ban both their forum username and their IP address. - + Left Stick Lスティック @@ -2497,14 +2561,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2523,7 +2587,7 @@ This would ban both their forum username and their IP address. - + Plus + @@ -2536,15 +2600,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2601,241 +2665,247 @@ This would ban both their forum username and their IP address. - + Right Stick Rスティック - - - - + + + + Clear クリア - - - - - + + + + + [not set] [未設定] - - + + + Invert button ボタンを反転 - - + + Toggle button - + Turbo button - - + + Invert axis 軸を反転 - - - + + + Set threshold しきい値を設定 - - + + Choose a value between 0% and 100% 0%から100%の間の値を選択してください - + Toggle axis - + Set gyro threshold ジャイロのしきい値を設定 - + + Calibrate sensor + センサーを補正 + + + Map Analog Stick アナログスティックをマップ - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. OKを押した後、スティックを水平方向に動かし、次に垂直方向に動かしてください。 軸を反転させる場合、 最初に垂直方向に動かし、次に水平方向に動かしてください。 - + Center axis - - + + Deadzone: %1% デッドゾーン：%1% - - + + Modifier Range: %1% 変更範囲：%1% - - + + Pro Controller Proコントローラ - + Dual Joycons Joy-Con(L/R) - + Left Joycon Joy-Con(L) - + Right Joycon Joy-Con(R) - + Handheld 携帯モード - + GameCube Controller ゲームキューブコントローラ - + Poke Ball Plus モンスターボールプラス - + NES Controller ファミコン・コントローラー - + SNES Controller スーパーファミコン・コントローラー - + N64 Controller ニンテンドウ64・コントローラー - + Sega Genesis メガドライブ - + Start / Pause スタート/ ポーズ - + Z Z - + Control Stick - + C-Stick Cスティック - + Shake! 振ってください - + [waiting] [待機中] - + New Profile 新規プロファイル - + Enter a profile name: プロファイル名を入力: - - + + Create Input Profile 入力プロファイルを作成 - + The given profile name is not valid! プロファイル名が無効です! - + Failed to create the input profile "%1" 入力プロファイル "%1" の作成に失敗しました - + Delete Input Profile 入力プロファイルを削除 - + Failed to delete the input profile "%1" 入力プロファイル "%1" の削除に失敗しました - + Load Input Profile 入力プロファイルをロード - + Failed to load the input profile "%1" 入力プロファイル "%1" のロードに失敗しました - + Save Input Profile 入力プロファイルをセーブ - + Failed to save the input profile "%1" 入力プロファイル "%1" のセーブに失敗しました @@ -3090,47 +3160,47 @@ To invert the axes, first move your joystick vertically, and then horizontally.< 開発元 - + Add-Ons アドオン - + General 全般 - + System システム - + CPU CPU - + Graphics グラフィック - + Adv. Graphics 高度なグラフィック - + Audio サウンド - + Input Profiles 入力プロファイル - + Properties プロパティ @@ -3743,7 +3813,7 @@ UUID: %2 Japanese (日本語) - Japanese (日本語) + 日本語 @@ -3753,82 +3823,82 @@ UUID: %2 French (français) - French (français) + フランス語 (français) German (Deutsch) - German (Deutsch) + ドイツ語 (Deutsch) Italian (italiano) - Italian (italiano) + イタリア語 (italiano) Spanish (español) - Spanish (español) + スペイン語 (español) Chinese - Chinese + 中国語 Korean (한국어) - Korean (한국어) + 韓国語 (한국어) Dutch (Nederlands) - Dutch (Nederlands) + オランダ語 (Nederlands) Portuguese (português) - Portuguese (português) + ポルトガル語 (português) Russian (Русский) - Russian (Русский) + ロシア語 (Русский) Taiwanese - Taiwanese + 台湾語 British English - British English + イギリス英語 Canadian French - Canadian French + カナダフランス語 Latin American Spanish - Latin American Spanish + ラテンアメリカスペイン語 Simplified Chinese - Simplified Chinese + 簡体字中国語 Traditional Chinese (正體中文) - Traditional Chinese (正體中文) + 繁体字中国語 (正體中文) Brazilian Portuguese (português do Brasil) - Brazilian Portuguese (português do Brasil) + ブラジルポルトガル語 (português do Brasil) @@ -3851,7 +3921,12 @@ UUID: %2 デバイス名 - + + Unsafe extended memory layout (8GB DRAM) + 不安定な拡張メモリレイアウト (8GB DRAM) + + + System settings are available only when game is not running. システム設定はゲーム未実行時にのみ変更できます。 @@ -4547,957 +4622,962 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? - yuzuを改善するための<a href='https://yuzu-emu.org/help/feature/telemetry/'>匿名データが収集されました</a>。<br/><br/>統計情報データを共有しますか？ + yuzuの改善に役立てるため、<a href='https://yuzu-emu.org/help/feature/telemetry/'>匿名データが収集されます</a>。<br/><br/>統計情報を共有しますか？ - + Telemetry テレメトリ - + Broken Vulkan Installation Detected 壊れたVulkanのインストールが検出されました。 - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - ブート時にVulkanの初期化に失敗しました。<br><br>この問題を解決するための手順は<a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>こちら</a>。 + 起動時にVulkanの初期化に失敗しました。<br><br>この問題を解決するための手順は<a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>こちら</a>。 - + Loading Web Applet... Webアプレットをロード中... - - + + Disable Web Applet Webアプレットの無効化 - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Webアプレットを無効にすると、未定義の動作になる可能性があるため、スーパーマリオ3Dオールスターズでのみ使用するようにしてください。本当にWebアプレットを無効化しますか？ (デバッグ設定で再度有効にすることができます）。 - + The amount of shaders currently being built ビルド中のシェーダー数 - + The current selected resolution scaling multiplier. 現在選択されている解像度の倍率。 - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. 現在のエミュレーション速度。値が100%より高いか低い場合、エミュレーション速度がSwitchより速いか遅いことを示します。 - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. ゲームが現在表示している1秒あたりのフレーム数。これはゲームごと、シーンごとに異なります。 - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Switchフレームをエミュレートするのにかかる時間で、フレームリミットやV-Syncは含まれません。フルスピードエミュレーションの場合、最大で16.67ミリ秒になります。 - + &Clear Recent Files 最近のファイルをクリア(&C) - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue 再開(&C) - + &Pause 中断(&P) - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzuはゲームを起動しています - + Warning Outdated Game Format 古いゲームフォーマットの警告 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. このゲームでは、分解されたROMディレクトリフォーマットを使用しています。これは、NCA、NAX、XCI、またはNSPなどに取って代わられた古いフォーマットです。分解されたROMディレクトリには、アイコン、メタデータ、およびアップデートサポートがありません。<br><br>yuzuがサポートするSwitchフォーマットの説明については、<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>wikiをチェックしてください</a>。このメッセージは二度と表示されません。 - - + + Error while loading ROM! ROMロード中にエラーが発生しました！ - + The ROM format is not supported. このROMフォーマットはサポートされていません。 - + An error occurred initializing the video core. ビデオコア初期化中にエラーが発生しました。 - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzuは、ビデオコアの実行中にエラーが発生しました。これは通常、内蔵GPUも含め、古いGPUドライバが原因です。詳しくはログをご覧ください。ログへのアクセス方法については、以下のページをご覧ください:<a href='https://yuzu-emu.org/help/reference/log-files/'>ログファイルのアップロード方法について</a>。 - + Error while loading ROM! %1 %1 signifies a numeric error code. ROMのロード中にエラー! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br><a href='https://yuzu-emu.org/help/quickstart/'>yuzuクイックスタートガイド</a>を参照してファイルを再ダンプしてください。<br>またはyuzu wiki及び</a>yuzu Discord</a>を参照するとよいでしょう。 - + An unknown error occurred. Please see the log for more details. 不明なエラーが発生しました。詳細はログを確認して下さい。 - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Save Data データのセーブ - + Mod Data Modデータ - + Error Opening %1 Folder ”%1”フォルダを開けませんでした - - + + Folder does not exist! フォルダが存在しません！ - + Error Opening Transferable Shader Cache シェーダキャッシュを開けませんでした - + Failed to create the shader cache directory for this title. このタイトル用のシェーダキャッシュディレクトリの作成に失敗しました - + Error Removing Contents コンテンツの削除エラー - + Error Removing Update アップデートの削除エラー - + Error Removing DLC DLC の削除エラー - + Remove Installed Game Contents? インストールされたゲームのコンテンツを削除しますか? - + Remove Installed Game Update? インストールされたゲームのアップデートを削除しますか? - + Remove Installed Game DLC? インストールされたゲームの DLC を削除しますか? - + Remove Entry エントリ削除 - - - - - - + + + + + + Successfully Removed 削除しました - + Successfully removed the installed base game. インストールされたゲームを正常に削除しました。 - + The base game is not installed in the NAND and cannot be removed. ゲームはNANDにインストールされていないため、削除できません。 - + Successfully removed the installed update. インストールされたアップデートを正常に削除しました。 - + There is no update installed for this title. このタイトルのアップデートはインストールされていません。 - + There are no DLC installed for this title. このタイトルにはDLCがインストールされていません。 - + Successfully removed %1 installed DLC. ％1にインストールされたDLCを正常に削除しました。 - + Delete OpenGL Transferable Shader Cache? 転送可能なOpenGLシェーダキャッシュを削除しますか? - + Delete Vulkan Transferable Shader Cache? 転送可能なVulkanシェーダキャッシュを削除しますか? - + Delete All Transferable Shader Caches? 転送可能なすべてのシェーダキャッシュを削除しますか? - + Remove Custom Game Configuration? このタイトルのカスタム設定を削除しますか？ - + + Remove Cache Storage? + + + + Remove File ファイル削除 - - + + Error Removing Transferable Shader Cache 転送可能なシェーダーキャッシュの削除エラー - - + + A shader cache for this title does not exist. このタイトル用のシェーダキャッシュは存在しません。 - + Successfully removed the transferable shader cache. 転送可能なシェーダーキャッシュが正常に削除されました。 - + Failed to remove the transferable shader cache. 転送可能なシェーダーキャッシュを削除できませんでした。 - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches 転送可能なシェーダキャッシュの削除エラー - + Successfully removed the transferable shader caches. 転送可能なシェーダキャッシュを正常に削除しました。 - + Failed to remove the transferable shader cache directory. 転送可能なシェーダキャッシュディレクトリの削除に失敗しました。 - - + + Error Removing Custom Configuration カスタム設定の削除エラー - + A custom configuration for this title does not exist. このタイトルのカスタム設定は存在しません。 - + Successfully removed the custom game configuration. カスタム設定を正常に削除しました。 - + Failed to remove the custom game configuration. カスタム設定の削除に失敗しました。 - - + + RomFS Extraction Failed! - RomFSの解析に失敗しました！ + RomFSの抽出に失敗しました！ - + There was an error copying the RomFS files or the user cancelled the operation. RomFSファイルをコピー中にエラーが発生したか、ユーザー操作によりキャンセルされました。 - + Full フル - + Skeleton スケルトン - + Select RomFS Dump Mode RomFSダンプモードの選択 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. RomFSのダンプ方法を選択してください。<br>”完全”はすべてのファイルが新しいディレクトリにコピーされます。<br>”スケルトン”はディレクトリ構造を作成するだけです。 - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 に RomFS を展開するための十分な空き領域がありません。Emulation > Configure > System > Filesystem > Dump Root で、空き容量を確保するか、別のダンプディレクトリを選択してください。 - + Extracting RomFS... - RomFSを解析中... + RomFSを抽出中... - - + + Cancel キャンセル - + RomFS Extraction Succeeded! - RomFS解析成功！ + RomFS抽出成功！ - + The operation completed successfully. 操作は成功しました。 - - - - - + + + + + Create Shortcut ショートカットを作成 - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon アイコンを作成 - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 ”%1”を開けませんでした - + Select Directory ディレクトリの選択 - + Properties プロパティ - + The game properties could not be loaded. ゲームプロパティをロード出来ませんでした。 - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch実行ファイル (%1);;すべてのファイル (*.*) - + Load File ファイルのロード - + Open Extracted ROM Directory 展開されているROMディレクトリを開く - + Invalid Directory Selected 無効なディレクトリが選択されました - + The directory you have selected does not contain a 'main' file. 選択されたディレクトリに”main”ファイルが見つかりませんでした。 - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) インストール可能なスイッチファイル (*.nca *.nsp *.xci);;任天堂コンテンツアーカイブ (*.nca);;任天堂サブミッションパッケージ (*.nsp);;NXカートリッジイメージ (*.xci) - + Install Files ファイルのインストール - + %n file(s) remaining 残り %n ファイル - + Installing file "%1"... "%1"ファイルをインストールしています・・・ - - + + Install Results インストール結果 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 競合を避けるため、NANDにゲーム本体をインストールすることはお勧めしません。 この機能は、アップデートやDLCのインストールにのみ使用してください。 - + %n file(s) were newly installed %n ファイルが新たにインストールされました - + %n file(s) were overwritten %n ファイルが上書きされました - + %n file(s) failed to install %n ファイルのインストールに失敗しました - + System Application システムアプリケーション - + System Archive システムアーカイブ - + System Application Update システムアプリケーションアップデート - + Firmware Package (Type A) ファームウェアパッケージ（Type A） - + Firmware Package (Type B) ファームウェアパッケージ（Type B） - + Game ゲーム - + Game Update ゲームアップデート - + Game DLC ゲームDLC - + Delta Title 差分タイトル - + Select NCA Install Type... NCAインストール種別を選択・・・ - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) インストールするNCAタイトル種別を選択して下さい： （ほとんどの場合、デフォルトの”ゲーム”で問題ありません。） - + Failed to Install インストール失敗 - + The title type you selected for the NCA is invalid. 選択されたNCAのタイトル種別が無効です。 - + File not found ファイルが存在しません - + File "%1" not found ファイル”%1”が存在しません - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account yuzuアカウントが存在しません - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. ゲームの互換性テストケースを送信するには、yuzuアカウントをリンクする必要があります。<br><br/>yuzuアカウントをリンクするには、エミュレーション ＞ 設定 ＞ Web から行います。 - + Error opening URL URLオープンエラー - + Unable to open the URL "%1". URL"%1"を開けません。 - + TAS Recording TAS 記録中 - + Overwrite file of player 1? プレイヤー1のファイルを上書きしますか? - + Invalid config detected 無効な設定を検出しました - + Handheld controller can't be used on docked mode. Pro controller will be selected. 携帯コントローラはドックモードで使用できないため、Proコントローラが選択されます。 - - + + Amiibo Amiibo - - + + The current amiibo has been removed 現在の amiibo は削除されました - + Error エラー - - + + The current game is not looking for amiibos 現在のゲームはamiiboを要求しません - + Amiibo File (%1);; All Files (*.*) amiiboファイル (%1);;すべてのファイル (*.*) - + Load Amiibo amiiboのロード - + Error loading Amiibo data amiiboデータ読み込み中にエラーが発生しました - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot スクリーンショットのキャプチャ - + PNG Image (*.png) PNG画像 (*.png) - + TAS state: Running %1/%2 TAS 状態: 実行中 %1/%2 - + TAS state: Recording %1 TAS 状態: 記録中 %1 - + TAS state: Idle %1/%2 TAS 状態: アイドル %1/%2 - + TAS State: Invalid TAS 状態: 無効 - + &Stop Running 実行停止(&S) - + &Start 実行(&S) - + Stop R&ecording 記録停止(&R) - + R&ecord 記録(&R) - + Building: %n shader(s) - 構築中: %n シェーダー + 構築中: %n 個のシェーダー - + Scale: %1x %1 is the resolution scaling factor 拡大率: %1x - + Speed: %1% / %2% 速度：%1% / %2% - + Speed: %1% 速度：%1% - + Game: %1 FPS (Unlocked) Game: %1 FPS（制限解除） - + Game: %1 FPS ゲーム：%1 FPS - + Frame: %1 ms フレーム：%1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HIGH - + GPU EXTREME GPU EXTREME - + GPU ERROR GPU ERROR - + DOCKED DOCKED - + HANDHELD HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST NEAREST - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA NO AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE 音量: ミュート - + VOLUME: %1% Volume percentage (e.g. 50%) 音量: %1% - + Confirm Key Rederivation キーの再取得確認 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5514,37 +5594,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 実行すると、自動生成された鍵ファイルが削除され、鍵生成モジュールが再実行されます。 - + Missing fuses ヒューズがありません - + - Missing BOOT0 - BOOT0がありません - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Mainがありません - + - Missing PRODINFO - PRODINFOがありません - + Derivation Components Missing 派生コンポーネントがありません - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 暗号化キーがありません。<br>キー、ファームウェア、ゲームを取得するには<a href='https://yuzu-emu.org/help/quickstart/'>yuzu クイックスタートガイド</a>を参照ください。<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5553,39 +5633,49 @@ on your system's performance. 1分以上かかります。 - + Deriving Keys 派生キー - + + System Archive Decryption Failed + + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target RomFSダンプターゲットの選択 - + Please select which RomFS you would like to dump. ダンプしたいRomFSを選択して下さい。 - + Are you sure you want to close yuzu? yuzuを終了しますか？ - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. エミュレーションを停止しますか？セーブされていない進行状況は失われます。 - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5597,44 +5687,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGLは使用できません！ - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzuはOpenGLサポート付きでコンパイルされていません。 + - Error while initializing OpenGL! OpenGL初期化エラー - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. GPUがOpenGLをサポートしていないか、グラフィックスドライバーが最新ではありません。 - + Error while initializing OpenGL 4.6! OpenGL4.6初期化エラー! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 GPUがOpenGL4.6をサポートしていないか、グラフィックスドライバーが最新ではありません。<br><br>GL レンダラ:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 GPUが1つ以上の必要なOpenGL拡張機能をサポートしていない可能性があります。最新のグラフィックドライバを使用していることを確認してください。<br><br>GL レンダラ:<br>%1<br><br>サポートされていない拡張機能:<br>%2 @@ -5693,117 +5783,122 @@ Would you like to bypass this and exit anyway? + Remove Cache Storage + + + + Remove OpenGL Pipeline Cache OpenGLパイプラインキャッシュを削除 - + Remove Vulkan Pipeline Cache Vulkanパイプラインキャッシュを削除 - + Remove All Pipeline Caches すべてのパイプラインキャッシュを削除 - + Remove All Installed Contents 全てのインストールされているコンテンツを削除 - + Dump RomFS RomFSをダンプ - + Dump RomFS to SDMC RomFSをSDMCにダンプ - + Copy Title ID to Clipboard タイトルIDをクリップボードへコピー - + Navigate to GameDB entry GameDBエントリを表示 - + Create Shortcut ショートカットを作成 - + Add to Desktop デスクトップに追加 - + Add to Applications Menu アプリケーションメニューに追加 - + Properties プロパティ - + Scan Subfolders サブフォルダをスキャンする - + Remove Game Directory ゲームディレクトリを削除する - + ▲ Move Up ▲ 上へ移動 - + ▼ Move Down ▼ 下へ移動 - + Open Directory Location ディレクトリの場所を開く - + Clear クリア - + Name ゲーム名 - + Compatibility 互換性 - + Add-ons アドオン - + File type ファイル種別 - + Size ファイルサイズ @@ -5833,7 +5928,7 @@ Would you like to bypass this and exit anyway? Playable - + プレイ可 @@ -5874,7 +5969,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list 新しいゲームリストフォルダを追加するにはダブルクリックしてください。 @@ -5887,12 +5982,12 @@ Would you like to bypass this and exit anyway? - + Filter: フィルター： - + Enter pattern to filter フィルターパターンを入力 @@ -5983,12 +6078,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute 音声ミュート/解除 - @@ -6010,111 +6104,112 @@ Debug Message: + Main Window メイン画面 - + Audio Volume Down 音量を下げる - + Audio Volume Up 音量を上げる - + Capture Screenshot スクリーンショットを撮る - + Change Adapting Filter アダプティングフィルターの変更 - + Change Docked Mode ドックモードを変更 - + Change GPU Accuracy GPU精度を変更 - + Continue/Pause Emulation エミュレーションの一時停止/再開 - + Exit Fullscreen フルスクリーンをやめる - + Exit yuzu yuzuを終了 - + Fullscreen フルスクリーン - + Load File ファイルのロード - + Load/Remove Amiibo 読み込み/解除 Amiibo - + Restart Emulation エミュレーションをリスタート - + Stop Emulation エミュレーションをやめる - + TAS Record TAS 記録 - + TAS Reset TAS リセット - + TAS Start/Stop TAS 開始/停止 - + Toggle Filter Bar フィルタバー切り替え - + Toggle Framerate Limit フレームレート制限切り替え - + Toggle Mouse Panning - + Toggle Status Bar ステータスバー切り替え @@ -6806,7 +6901,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE スタート/ ポーズ @@ -6856,21 +6951,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6878,8 +6973,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [未設定] @@ -6894,12 +6989,12 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 - 軸 %1%2 + スティック %1%2 @@ -6911,163 +7006,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [不明] - - + + Left 左 - - + + Right 右 - - + + Down 下 - - + + Up 上 - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start 開始 - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle マル - + Cross バツ - + Square 四角 - + Triangle 三角 - + Share Share - + Options Options - + [undefined] [未定義] @@ -7078,7 +7173,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [無効] @@ -7092,21 +7187,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 - + %1%2Axis %3,%4,%5 - + %1%2Motion %3 @@ -7118,106 +7211,112 @@ p, li { white-space: pre-wrap; } - + [unused] [未使用] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L L スティック - + Stick R R スティック - + Plus + - + Minus - - - + + Home HOME - + Capture キャプチャ - + Touch タッチの設定 - + Wheel Indicates the mouse wheel ホイール - + Backward 後ろ - + Forward 前 - + Task - + Extra - + %1%2%3%4 %1%2%3%4 - - + + %1%2%3Hat %4 - - + + + %1%2%3Axis %4 + + + + + %1%2%3Button %4 @@ -7638,73 +7737,73 @@ Please try again or contact the developer of the software. ユーザー - + Profile Creator - - + + Profile Selector プロファイル選択 - + Profile Icon Editor - + Profile Nickname Editor - + Who will receive the points? - + Who is using Nintendo eShop? - + Who is making this purchase? - + Who is posting? - + Select a user to link to a Nintendo Account. - + Change settings for which user? - + Format data for which user? - + Which user will be transferred to another console? - + Send save data for which user? - + Select a user: ユーザー選択： diff --git a/dist/languages/ko_KR.ts b/dist/languages/ko_KR.ts index ed0a9334b..573d5e77b 100644 --- a/dist/languages/ko_KR.ts +++ b/dist/languages/ko_KR.ts @@ -381,17 +381,17 @@ This would ban both their forum username and their IP address. Output Device: - + 출력 장치: Input Device: - + 입력 장치: Sound Output Mode: - + 소리 출력 모드: @@ -1138,78 +1138,78 @@ This would ban both their forum username and their IP address. yuzu 설정 - - + + Audio 오디오 - - + + CPU CPU - + Debug 디버그 - + Filesystem 파일 시스템 - - + + General 일반 - - + + Graphics 그래픽 - + GraphicsAdvanced 그래픽 고급 - + Hotkeys 단축키 - - + + Controls 조작 - + Profiles 프로필 - + Network 네트워크 - - + + System 시스템 - + Game List 게임 목록 - + Web 웹 @@ -1384,41 +1384,36 @@ This would ban both their forum username and their IP address. - Extended memory layout (8GB DRAM) - - - - Confirm exit while emulation is running 에뮬레이터가 작동 중일 때 종료 시 확인 - + Prompt for user on game boot 게임 부팅시 유저 선택 화면 표시 - + Pause emulation when in background 백그라운드에 있을 시 에뮬레이션 일시중지 - + Hide mouse on inactivity 비활성 상태일 때 마우스 숨기기 - + Reset All Settings 모든 설정 초기화 - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? 모든 환경 설정과 게임별 맞춤 설정이 초기화됩니다. 게임 디렉토리나 프로필, 또는 입력 프로필은 삭제되지 않습니다. 진행하시겠습니까? @@ -1457,7 +1452,7 @@ This would ban both their forum username and their IP address. - + None 없음 @@ -1483,231 +1478,269 @@ This would ban both their forum username and their IP address. + VSync Mode: + VSync 모드: + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: NVDEC 에뮬레이션: - + No Video Output 비디오 출력 없음 - + CPU Video Decoding CPU 비디오 디코딩 - + GPU Video Decoding (Default) GPU 비디오 디코딩(기본값) - + Fullscreen Mode: 전체 화면 모드: - + Borderless Windowed 경계 없는 창 모드 - + Exclusive Fullscreen 독점 전체화면 모드 - + Aspect Ratio: 화면비: - + Default (16:9) 기본 (16:9) - + Force 4:3 강제 4:3 - + Force 21:9 강제 21:9 - + Force 16:10 강제 16:10 - + Stretch to Window 창에 맞게 늘림 - + Resolution: 해상도: - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [실험적] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [실험적] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] - + 1.5X (1080p/1620p) [실험적] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) - + 7X (5040p/7560p) - + 8X (5760p/8640p) - + 8X (5760p/8640p) - + Window Adapting Filter: 윈도우 적응형 필터: - + Nearest Neighbor Nearest Neighbor - + Bilinear 이중선형 - + Bicubic 고등차수보간 - + Gaussian 가우시안 - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution - + AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: 안티에일리어싱 방식: - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness 글로벌 FSR 선명도 사용 - + Set FSR Sharpness FSR 선명도 설정 - + FSR Sharpness: FSR 선명도: - + 100% 100% - - + + Use global background color 전역 배경색 사용 - + Set background color: 배경색 설정: - + Background Color: 배경색: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM(어셈블리 셰이더, NVIDIA 전용) - + SPIR-V (Experimental, Mesa Only) - SPIR-V (실험용, Mesa 전용) + SPIR-V (실험적, Mesa 전용) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + + + + + VSync Off + + + + + Recommended + + + + + On + + + + + VSync On + + ConfigureGraphicsAdvanced @@ -1732,107 +1765,134 @@ This would ban both their forum username and their IP address. 정확도 수준: - + + ASTC recompression: + ASTC 재압축: + + + + Uncompressed (Best quality) + 비압축(최고 품질) + + + + BC1 (Low quality) + BC1(저품질) + + + + BC3 (Medium quality) + BC3(중간 품질) + + + + Enable asynchronous presentation (Vulkan only) + 비동기 프레젠테이션 활성화(Vulkan만 해당) + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. 실행은 GPU가 클럭 속도를 낮추지 않도록 그래픽 명령을 기다리는 동안 백그라운드에서 작동합니다. - + Force maximum clocks (Vulkan only) 강제 최대 클록 (Vulkan 전용) - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - 수직 동기화는 화면 찢어짐 현상을 예방하지만, 몇몇의 그래픽카드는 수직 동기화로 인해 성능이 감소합니다. 성능의 변화를 느끼지 않는다면 활성화하는 것이 좋습니다. - - - - Use VSync - 수직 동기화 사용 - - - + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. - + 로드 시간 끊김을 줄일 수 있는 비동기 ASTC 텍스처 디코딩을 활성화합니다. 이 기능은 실험적입니다. - + Decode ASTC textures asynchronously (Hack) - + ASTC 텍스처를 비동기식으로 디코딩(해킹) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + 예측 플러싱 대신 반응형 플러싱 를 사용합니다. 보다 정확한 메모리 동기화를 허용합니다. + + + + Enable Reactive Flushing + 반응형 플러싱 활성화 + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. 비동기 셰이더 컴파일을 활성화하여 셰이더의 버벅임을 감소시킬 수 있습니다. 이 기능은 실험적 기능입니다. - + Use asynchronous shader building (Hack) 비동기식 셰이더 빌드 사용(Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. 빠른 GPU 시간을 활성화합니다. 이 옵션을 사용하면 대부분의 게임이 가장 높은 기본 해상도에서 실행됩니다. - + Use Fast GPU Time (Hack) 빠른 GPU 시간 사용(Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - 비관적 버퍼 플러시를 활성화합니다. 이 옵션은 수정되지 않은 버퍼를 강제로 비우므로 성능이 저하될 수 있습니다. - - - - Use pessimistic buffer flushes (Hack) - 비관적 버퍼 플러시 사용(Hack) - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. GPU 공급업체별 파이프라인 캐시를 활성화합니다. 이 옵션은 Vulkan 드라이버가 파이프라인 캐시 파일을 내부에 저장하지 않는 경우 셰이더 로딩 시간을 크게 개선할 수 있습니다. - + Use Vulkan pipeline cache Vulkan 파이프라인 캐시 사용 - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + 일부 게임에 필요한 컴퓨팅 파이프라인을 활성화합니다. 이 설정은 인텔 독점 드라이버에만 존재하며 활성화된 경우 충돌이 발생할 수 있습니다. +컴퓨팅 파이프라인은 다른 모든 드라이버에서 항상 활성화됩니다. + + + + Enable Compute Pipelines (Intel Vulkan only) + 컴퓨팅 파이프라인 활성화(Intel Vulkan만 해당) + + + Anisotropic Filtering: 비등방성 필터링: - + Automatic 자동 - + Default 기본값 - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1865,70 +1925,65 @@ This would ban both their forum username and their IP address. 초기화 - + Action 액션 - + Hotkey 단축키 - + Controller Hotkey 컨트롤러 단축키 - - - + + + Conflicting Key Sequence 키 시퀀스 충돌 - - + + The entered key sequence is already assigned to: %1 입력한 키 시퀀스가 %1에 이미 할당되었습니다. - - Home+%1 - Home+%1 - - - + [waiting] [대기중] - + Invalid 유효하지않음 - + Restore Default 초기화 - + Clear 비우기 - + Conflicting Button Sequence 키 시퀀스 충돌 - + The default button sequence is already assigned to: %1 기본 키 시퀀스가 %1에 이미 할당되었습니다. - + The default key sequence is already assigned to: %1 기본 키 시퀀스가 %1에 이미 할당되었습니다. @@ -2220,7 +2275,7 @@ This would ban both their forum username and their IP address. - + Configure 설정 @@ -2269,30 +2324,40 @@ This would ban both their forum username and their IP address. Enable direct JoyCon driver - + 다이렉트 JoyCon 드라이버 활성화 Enable direct Pro Controller driver [EXPERIMENTAL] + 다이렉트 Pro 컨트롤러 드라이버 활성화[실험적]  + + + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. - + + Use random Amiibo ID + + + + Enable mouse panning 마우스 패닝 활성화 - + Mouse sensitivity 마우스 감도 - + % % - + Motion / Touch 모션 컨트롤/ 터치 @@ -2404,7 +2469,7 @@ This would ban both their forum username and their IP address. - + Left Stick L 스틱 @@ -2498,14 +2563,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2524,7 +2589,7 @@ This would ban both their forum username and their IP address. - + Plus + @@ -2537,15 +2602,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2602,241 +2667,247 @@ This would ban both their forum username and their IP address. - + Right Stick R 스틱 - - - - + + + + Clear 초기화 - - - - - + + + + + [not set] [설정 안 됨] - - + + + Invert button 버튼 반전 - - + + Toggle button 토글 버튼 - + Turbo button - - + + Invert axis 축 뒤집기 - - - + + + Set threshold 임계값 설정 - - + + Choose a value between 0% and 100% 0%에서 100% 안의 값을 고르세요 - + Toggle axis axis 토글 - + Set gyro threshold 자이로 임계값 설정 - + + Calibrate sensor + + + + Map Analog Stick 아날로그 스틱 맵핑 - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. OK 버튼을 누른 후에 먼저 조이스틱을 수평으로 움직이고, 그 다음 수직으로 움직이세요. 축을 뒤집으려면 수직으로 먼저 움직인 뒤에 수평으로 움직이세요. - + Center axis 중심축 - - + + Deadzone: %1% 데드존: %1% - - + + Modifier Range: %1% 수정자 범위: %1% - - + + Pro Controller 프로 컨트롤러 - + Dual Joycons 듀얼 조이콘 - + Left Joycon 왼쪽 조이콘 - + Right Joycon 오른쪽 조이콘 - + Handheld 휴대 모드 - + GameCube Controller GameCube 컨트롤러 - + Poke Ball Plus 몬스터볼 Plus - + NES Controller NES 컨트롤러 - + SNES Controller SNES 컨트롤러 - + N64 Controller N64 컨트롤러 - + Sega Genesis 세가 제네시스 - + Start / Pause 시작 / 일시중지 - + Z Z - + Control Stick 컨트롤 스틱 - + C-Stick C-Stick - + Shake! 흔드세요! - + [waiting] [대기중] - + New Profile 새 프로필 - + Enter a profile name: 프로필 이름을 입력하세요: - - + + Create Input Profile 입력 프로필 생성 - + The given profile name is not valid! 해당 프로필 이름은 사용할 수 없습니다! - + Failed to create the input profile "%1" "%1" 입력 프로필 생성 실패 - + Delete Input Profile 입력 프로필 삭제 - + Failed to delete the input profile "%1" "%1" 입력 프로필 삭제 실패 - + Load Input Profile 입력 프로필 불러오기 - + Failed to load the input profile "%1" "%1" 입력 프로필 불러오기 실패 - + Save Input Profile 입력 프로필 저장 - + Failed to save the input profile "%1" "%1" 입력 프로필 저장 실패 @@ -3091,47 +3162,47 @@ To invert the axes, first move your joystick vertically, and then horizontally.< 개발자 - + Add-Ons 부가 기능 - + General 일반 - + System 시스템 - + CPU CPU - + Graphics 그래픽 - + Adv. Graphics 고급 그래픽 - + Audio 오디오 - + Input Profiles 입력 프로파일 - + Properties 속성 @@ -3852,7 +3923,12 @@ UUID: %2 장치 이름 - + + Unsafe extended memory layout (8GB DRAM) + + + + System settings are available only when game is not running. 시스템 설정은 게임이 꺼져 있을 때만 수정 가능합니다. @@ -4548,957 +4624,962 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? yuzu를 개선하기 위해 <a href='https://yuzu-emu.org/help/feature/telemetry/'>익명 데이터가 수집됩니다.</a> <br/><br/>사용 데이터를 공유하시겠습니까? - + Telemetry 원격 측정 - + Broken Vulkan Installation Detected 망가진 Vulkan 설치 감지됨 - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. 부팅하는 동안 Vulkan 초기화에 실패했습니다.<br><br>문제 해결 지침을 보려면 <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>여기</a>를 클릭하세요. - + Loading Web Applet... 웹 애플릿을 로드하는 중... - - + + Disable Web Applet 웹 애플릿 비활성화 - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) 웹 애플릿을 비활성화하면 정의되지 않은 동작이 발생할 수 있으며 Super Mario 3D All-Stars에서만 사용해야 합니다. 웹 애플릿을 비활성화하시겠습니까? (디버그 설정에서 다시 활성화할 수 있습니다.) - + The amount of shaders currently being built 현재 생성중인 셰이더의 양 - + The current selected resolution scaling multiplier. 현재 선택된 해상도 배율입니다. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. 현재 에뮬레이션 속도. 100%보다 높거나 낮은 값은 에뮬레이션이 Switch보다 빠르거나 느린 것을 나타냅니다. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. 게임이 현재 표시하고 있는 초당 프레임 수입니다. 이것은 게임마다 다르고 장면마다 다릅니다. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. 프레임 제한이나 수직 동기화를 계산하지 않고 Switch 프레임을 에뮬레이션 하는 데 걸린 시간. 최대 속도로 에뮬레이트 중일 때에는 대부분 16.67 ms 근처입니다. - + &Clear Recent Files Clear Recent Files(&C) - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue 재개(&C) - + &Pause 일시중지(&P) - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu가 게임을 실행중입니다 - + Warning Outdated Game Format 오래된 게임 포맷 경고 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. 이 게임 파일은 '분해된 ROM 디렉토리'라는 오래된 포맷을 사용하고 있습니다. 해당 포맷은 NCA, NAX, XCI 또는 NSP와 같은 다른 포맷으로 대체되었으며 분해된 ROM 디렉토리에는 아이콘, 메타 데이터 및 업데이트가 지원되지 않습니다.<br><br>yuzu가 지원하는 다양한 Switch 포맷에 대한 설명은 <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>위키를 확인하세요.</a> 이 메시지는 다시 표시되지 않습니다. - - + + Error while loading ROM! ROM 로드 중 오류 발생! - + The ROM format is not supported. 지원되지 않는 롬 포맷입니다. - + An error occurred initializing the video core. 비디오 코어를 초기화하는 동안 오류가 발생했습니다. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. 비디오 코어를 실행하는 동안 yuzu에 오류가 발생했습니다. 이것은 일반적으로 통합 드라이버를 포함하여 오래된 GPU 드라이버로 인해 발생합니다. 자세한 내용은 로그를 참조하십시오. 로그 액세스에 대한 자세한 내용은 <a href='https://yuzu-emu.org/help/reference/log-files/'>로그 파일 업로드 방법</a> 페이지를 참조하세요. - + Error while loading ROM! %1 %1 signifies a numeric error code. ROM 불러오는 중 오류 발생! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>파일들을 다시 덤프하기 위해<a href='https://yuzu-emu.org/help/quickstart/'>yuzu 빠른 시작 가이드</a> 를 따라주세요.<br>도움이 필요할 시 yuzu 위키</a> 를 참고하거나 yuzu 디스코드</a> 를 이용해보세요. - + An unknown error occurred. Please see the log for more details. 알 수 없는 오류가 발생했습니다. 자세한 내용은 로그를 참고하십시오. - + (64-bit) (64비트) - + (32-bit) (32비트) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... 소프트웨어를 닫는 중... - + Save Data 세이브 데이터 - + Mod Data 모드 데이터 - + Error Opening %1 Folder %1 폴더 열기 오류 - - + + Folder does not exist! 폴더가 존재하지 않습니다! - + Error Opening Transferable Shader Cache 전송 가능한 셰이더 캐시 열기 오류 - + Failed to create the shader cache directory for this title. 이 타이틀에 대한 셰이더 캐시 디렉토리를 생성하지 못했습니다. - + Error Removing Contents 콘텐츠 제거 중 오류 발생 - + Error Removing Update 업데이트 제거 오류 - + Error Removing DLC DLC 제거 오류 - + Remove Installed Game Contents? 설치된 게임 콘텐츠를 제거하겠습니까? - + Remove Installed Game Update? 설치된 게임 업데이트를 제거하겠습니까? - + Remove Installed Game DLC? 설치된 게임 DLC를 제거하겠습니까? - + Remove Entry 항목 제거 - - - - - - + + + + + + Successfully Removed 삭제 완료 - + Successfully removed the installed base game. 설치된 기본 게임을 성공적으로 제거했습니다. - + The base game is not installed in the NAND and cannot be removed. 기본 게임은 NAND에 설치되어 있지 않으며 제거 할 수 없습니다. - + Successfully removed the installed update. 설치된 업데이트를 성공적으로 제거했습니다. - + There is no update installed for this title. 이 타이틀에 대해 설치된 업데이트가 없습니다. - + There are no DLC installed for this title. 이 타이틀에 설치된 DLC가 없습니다. - + Successfully removed %1 installed DLC. 설치된 %1 DLC를 성공적으로 제거했습니다. - + Delete OpenGL Transferable Shader Cache? OpenGL 전송 가능한 셰이더 캐시를 삭제하시겠습니까? - + Delete Vulkan Transferable Shader Cache? Vulkan 전송 가능한 셰이더 캐시를 삭제하시겠습니까? - + Delete All Transferable Shader Caches? 모든 전송 가능한 셰이더 캐시를 삭제하시겠습니까? - + Remove Custom Game Configuration? 사용자 지정 게임 구성을 제거 하시겠습니까? - + + Remove Cache Storage? + + + + Remove File 파일 제거 - - + + Error Removing Transferable Shader Cache 전송 가능한 셰이더 캐시 제거 오류 - - + + A shader cache for this title does not exist. 이 타이틀에 대한 셰이더 캐시가 존재하지 않습니다. - + Successfully removed the transferable shader cache. 전송 가능한 셰이더 캐시를 성공적으로 제거했습니다. - + Failed to remove the transferable shader cache. 전송 가능한 셰이더 캐시를 제거하지 못했습니다. - + Error Removing Vulkan Driver Pipeline Cache Vulkan 드라이버 파이프라인 캐시 제거 오류 - + Failed to remove the driver pipeline cache. 드라이버 파이프라인 캐시를 제거하지 못했습니다. - - + + Error Removing Transferable Shader Caches 전송 가능한 셰이더 캐시 제거 오류 - + Successfully removed the transferable shader caches. 전송 가능한 셰이더 캐시를 성공적으로 제거했습니다. - + Failed to remove the transferable shader cache directory. 전송 가능한 셰이더 캐시 디렉토리를 제거하지 못했습니다. - - + + Error Removing Custom Configuration 사용자 지정 구성 제거 오류 - + A custom configuration for this title does not exist. 이 타이틀에 대한 사용자 지정 구성이 존재하지 않습니다. - + Successfully removed the custom game configuration. 사용자 지정 게임 구성을 성공적으로 제거했습니다. - + Failed to remove the custom game configuration. 사용자 지정 게임 구성을 제거하지 못했습니다. - - + + RomFS Extraction Failed! RomFS 추출 실패! - + There was an error copying the RomFS files or the user cancelled the operation. RomFS 파일을 복사하는 중에 오류가 발생했거나 사용자가 작업을 취소했습니다. - + Full 전체 - + Skeleton 뼈대 - + Select RomFS Dump Mode RomFS 덤프 모드 선택 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. RomFS 덤프 방법을 선택하십시오.<br>전체는 모든 파일을 새 디렉토리에 복사하고<br>뼈대는 디렉토리 구조 만 생성합니다. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1에 RomFS를 추출하기에 충분한 여유 공간이 없습니다. 공간을 확보하거나 에뮬레이견 > 설정 > 시스템 > 파일시스템 > 덤프 경로에서 다른 덤프 디렉토리를 선택하십시오. - + Extracting RomFS... RomFS 추출 중... - - + + Cancel 취소 - + RomFS Extraction Succeeded! RomFS 추출이 성공했습니다! - + The operation completed successfully. 작업이 성공적으로 완료되었습니다. - - - - - + + + + + Create Shortcut 바로가기 만들기 - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? 현재 AppImage에 대한 바로 가기가 생성됩니다. 업데이트하면 제대로 작동하지 않을 수 있습니다. 계속합니까? - + Cannot create shortcut on desktop. Path "%1" does not exist. 바탕 화면에 바로가기를 만들 수 없습니다. 경로 "%1"이(가) 존재하지 않습니다. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. 애플리케이션 메뉴에서 바로가기를 만들 수 없습니다. 경로 "%1"이(가) 존재하지 않으며 생성할 수 없습니다. - + Create Icon 아이콘 만들기 - + Cannot create icon file. Path "%1" does not exist and cannot be created. 아이콘 파일을 만들 수 없습니다. 경로 "%1"이(가) 존재하지 않으며 생성할 수 없습니다. - + Start %1 with the yuzu Emulator yuzu 에뮬레이터로 %1 시작 - + Failed to create a shortcut at %1 %1에서 바로가기를 만들기 실패 - + Successfully created a shortcut to %1 %1 바로가기를 성공적으로 만듬 - + Error Opening %1 %1 열기 오류 - + Select Directory 경로 선택 - + Properties 속성 - + The game properties could not be loaded. 게임 속성을 로드 할 수 없습니다. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch 실행파일 (%1);;모든 파일 (*.*) - + Load File 파일 로드 - + Open Extracted ROM Directory 추출된 ROM 디렉토리 열기 - + Invalid Directory Selected 잘못된 디렉토리 선택 - + The directory you have selected does not contain a 'main' file. 선택한 디렉토리에 'main'파일이 없습니다. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) 설치 가능한 Switch 파일 (*.nca *.nsp *.xci);;Nintendo 컨텐츠 아카이브 (*.nca);;Nintendo 서브미션 패키지 (*.nsp);;NX 카트리지 이미지 (*.xci) - + Install Files 파일 설치 - + %n file(s) remaining %n개의 파일이 남음 - + Installing file "%1"... 파일 "%1" 설치 중... - - + + Install Results 설치 결과 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 충돌을 피하기 위해, 낸드에 베이스 게임을 설치하는 것을 권장하지 않습니다. 이 기능은 업데이트나 DLC를 설치할 때에만 사용해주세요. - + %n file(s) were newly installed %n개의 파일이 새로 설치되었습니다. - + %n file(s) were overwritten %n개의 파일을 덮어썼습니다. - + %n file(s) failed to install %n개의 파일을 설치하지 못했습니다. - + System Application 시스템 애플리케이션 - + System Archive 시스템 아카이브 - + System Application Update 시스템 애플리케이션 업데이트 - + Firmware Package (Type A) 펌웨어 패키지 (A타입) - + Firmware Package (Type B) 펌웨어 패키지 (B타입) - + Game 게임 - + Game Update 게임 업데이트 - + Game DLC 게임 DLC - + Delta Title 델타 타이틀 - + Select NCA Install Type... NCA 설치 유형 선택... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) 이 NCA를 설치할 타이틀 유형을 선택하세요: (대부분의 경우 기본값인 '게임'이 괜찮습니다.) - + Failed to Install 설치 실패 - + The title type you selected for the NCA is invalid. NCA 타이틀 유형이 유효하지 않습니다. - + File not found 파일을 찾을 수 없음 - + File "%1" not found 파일 "%1"을 찾을 수 없습니다 - + OK OK - - + + Hardware requirements not met 하드웨어 요구 사항이 충족되지 않음 - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. 시스템이 권장 하드웨어 요구 사항을 충족하지 않습니다. 호환성 보고가 비활성화되었습니다. - + Missing yuzu Account yuzu 계정 누락 - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. 게임 호환성 테스트 결과를 제출하려면 yuzu 계정을 연결해야합니다.<br><br/>yuzu 계정을 연결하려면 에뮬레이션 &gt; 설정 &gt; 웹으로 가세요. - + Error opening URL URL 열기 오류 - + Unable to open the URL "%1". URL "%1"을 열 수 없습니다. - + TAS Recording TAS 레코딩 - + Overwrite file of player 1? 플레이어 1의 파일을 덮어쓰시겠습니까? - + Invalid config detected 유효하지 않은 설정 감지 - + Handheld controller can't be used on docked mode. Pro controller will be selected. 휴대 모드용 컨트롤러는 거치 모드에서 사용할 수 없습니다. 프로 컨트롤러로 대신 선택됩니다. - - + + Amiibo Amiibo - - + + The current amiibo has been removed 현재 amiibo가 제거되었습니다. - + Error 오류 - - + + The current game is not looking for amiibos 현재 게임은 amiibo를 찾고 있지 않습니다 - + Amiibo File (%1);; All Files (*.*) Amiibo 파일 (%1);; 모든 파일 (*.*) - + Load Amiibo Amiibo 로드 - + Error loading Amiibo data Amiibo 데이터 로드 오류 - + The selected file is not a valid amiibo 선택한 파일은 유효한 amiibo가 아닙니다 - + The selected file is already on use 선택한 파일은 이미 사용 중입니다 - + An unknown error occurred 알수없는 오류가 발생했습니다 - + Capture Screenshot 스크린샷 캡처 - + PNG Image (*.png) PNG 이미지 (*.png) - + TAS state: Running %1/%2 TAS 상태: %1/%2 실행 중 - + TAS state: Recording %1 TAS 상태: 레코딩 %1 - + TAS state: Idle %1/%2 TAS 상태: 유휴 %1/%2 - + TAS State: Invalid TAS 상태: 유효하지 않음 - + &Stop Running 실행 중지(&S) - + &Start 시작(&S) - + Stop R&ecording 레코딩 중지(&e) - + R&ecord 레코드(&R) - + Building: %n shader(s) 빌드중: %n개 셰이더 - + Scale: %1x %1 is the resolution scaling factor 스케일: %1x - + Speed: %1% / %2% 속도: %1% / %2% - + Speed: %1% 속도: %1% - + Game: %1 FPS (Unlocked) 게임: %1 FPS (제한없음) - + Game: %1 FPS 게임: %1 FPS - + Frame: %1 ms 프레임: %1 ms - + GPU NORMAL GPU 보통 - + GPU HIGH GPU 높음 - + GPU EXTREME GPU 굉장함 - + GPU ERROR GPU 오류 - + DOCKED 거치 모드 - + HANDHELD 휴대 모드 - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST NEAREST - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA AA 없음 - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE - + 볼륨: 음소거 - + VOLUME: %1% Volume percentage (e.g. 50%) - + 볼륨: %1% - + Confirm Key Rederivation 키 재생성 확인 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5515,37 +5596,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 자동 생성되었던 키 파일들이 삭제되고 키 생성 모듈이 다시 실행됩니다. - + Missing fuses fuses 누락 - + - Missing BOOT0 - BOOT0 누락 - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main 누락 - + - Missing PRODINFO - PRODINFO 누락 - + Derivation Components Missing 파생 구성 요소 누락 - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 암호화 키가 없습니다. <br>모든 키, 펌웨어 및 게임을 얻으려면 <a href='https://yuzu-emu.org/help/quickstart/'>yuzu 빠른 시작 가이드</a>를 따르세요.<br><br> <small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5554,39 +5635,49 @@ on your system's performance. 소요될 수 있습니다. - + Deriving Keys 파생 키 - + + System Archive Decryption Failed + 시스템 아카이브 암호 해독 실패 + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target RomFS 덤프 대상 선택 - + Please select which RomFS you would like to dump. 덤프할 RomFS를 선택하십시오. - + Are you sure you want to close yuzu? yuzu를 닫으시겠습니까? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. 에뮬레이션을 중지하시겠습니까? 모든 저장되지 않은 진행 상황은 사라집니다. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5598,44 +5689,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGL을 사용할 수 없습니다! - + OpenGL shared contexts are not supported. OpenGL 공유 컨텍스트는 지원되지 않습니다. - + yuzu has not been compiled with OpenGL support. yuzu는 OpenGL 지원으로 컴파일되지 않았습니다. + - Error while initializing OpenGL! OpenGL을 초기화하는 동안 오류가 발생했습니다! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. 사용하시는 GPU가 OpenGL을 지원하지 않거나, 최신 그래픽 드라이버가 설치되어 있지 않습니다. - + Error while initializing OpenGL 4.6! OpenGL 4.6 초기화 중 오류 발생! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 사용하시는 GPU가 OpenGL 4.6을 지원하지 않거나 최신 그래픽 드라이버가 설치되어 있지 않습니다. <br><br>GL 렌더링 장치:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 사용하시는 GPU가 1개 이상의 OpenGL 확장 기능을 지원하지 않습니다. 최신 그래픽 드라이버가 설치되어 있는지 확인하세요. <br><br>GL 렌더링 장치:<br>%1<br><br>지원하지 않는 확장 기능:<br>%2 @@ -5694,117 +5785,122 @@ Would you like to bypass this and exit anyway? + Remove Cache Storage + + + + Remove OpenGL Pipeline Cache OpenGL 파이프라인 캐시 제거 - + Remove Vulkan Pipeline Cache Vulkan 파이프라인 캐시 제거 - + Remove All Pipeline Caches 모든 파이프라인 캐시 제거 - + Remove All Installed Contents 설치된 모든 컨텐츠 제거 - + Dump RomFS RomFS를 덤프 - + Dump RomFS to SDMC RomFS를 SDMC로 덤프 - + Copy Title ID to Clipboard 클립보드에 타이틀 ID 복사 - + Navigate to GameDB entry GameDB 항목으로 이동 - + Create Shortcut 바로가기 만들기 - + Add to Desktop 데스크톱에 추가 - + Add to Applications Menu 애플리케이션 메뉴에 추가 - + Properties 속성 - + Scan Subfolders 하위 폴더 스캔 - + Remove Game Directory 게임 디렉토리 제거 - + ▲ Move Up ▲ 위로 이동 - + ▼ Move Down ▼ 아래로 이동 - + Open Directory Location 디렉토리 위치 열기 - + Clear 초기화 - + Name 이름 - + Compatibility 호환성 - + Add-ons 부가 기능 - + File type 파일 형식 - + Size 크기 @@ -5875,7 +5971,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list 더블 클릭하여 게임 목록에 새 폴더 추가 @@ -5888,12 +5984,12 @@ Would you like to bypass this and exit anyway? %1 중의 %n 결과 - + Filter: 필터: - + Enter pattern to filter 검색 필터 입력 @@ -5984,12 +6080,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute 오디오 음소거/음소거 해제 - @@ -6011,111 +6106,112 @@ Debug Message: + Main Window 메인 윈도우 - + Audio Volume Down 오디오 볼륨 낮추기 - + Audio Volume Up 오디오 볼륨 키우기 - + Capture Screenshot 스크린샷 캡처 - + Change Adapting Filter 적응형 필터 변경 - + Change Docked Mode 독 모드 변경 - + Change GPU Accuracy GPU 정확성 변경 - + Continue/Pause Emulation 재개/에뮬레이션 일시중지 - + Exit Fullscreen 전체화면 종료 - + Exit yuzu yuzu 종료 - + Fullscreen 전체화면 - + Load File 파일 로드 - + Load/Remove Amiibo Amiibo 로드/제거 - + Restart Emulation 에뮬레이션 재시작 - + Stop Emulation 에뮬레이션 중단 - + TAS Record TAS 기록 - + TAS Reset TAS 리셋 - + TAS Start/Stop TAS 시작/멈춤 - + Toggle Filter Bar 상태 표시줄 전환 - + Toggle Framerate Limit 프레임속도 제한 토글 - + Toggle Mouse Panning 마우스 패닝 활성화 - + Toggle Status Bar 상태 표시줄 전환 @@ -6222,7 +6318,7 @@ Debug Message: Hide Empty Rooms - + 빈 방 숨기기 @@ -6808,7 +6904,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE 시작/일시중지 @@ -6858,21 +6954,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6880,8 +6976,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [설정 안 됨] @@ -6896,10 +6992,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 축 %1%2 @@ -6913,163 +7009,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [알 수 없음] - - + + Left 왼쪽 - - + + Right 오른쪽 - - + + Down 아래 - - + + Up 위 - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Start - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle 동그라미 - + Cross 엑스 - + Square 네모 - + Triangle 세모 - + Share Share - + Options Options - + [undefined] [설정안됨] @@ -7080,7 +7176,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [유효하지않음] @@ -7094,21 +7190,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2Axis %3 - + %1%2Axis %3,%4,%5 %1%2Axis %3,%4,%5 - + %1%2Motion %3 %1%2모션 %3 @@ -7120,108 +7214,114 @@ p, li { white-space: pre-wrap; } - + [unused] [미사용] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L - + L 스틱 - + Stick R - + R 스틱 - + Plus Plus - + Minus Minus - - + + Home 홈 - + Capture 캡쳐 - + Touch 터치 - + Wheel Indicates the mouse wheel 휠 - + Backward 뒤로가기 - + Forward 앞으로가기 - + Task Task - + Extra Extra - + %1%2%3%4 - + %1%2%3%4 - - + + %1%2%3Hat %4 - + %1%2%3방향키%4 - - + + + %1%2%3Axis %4 + %1%2%3Axis %4 + + + + %1%2%3Button %4 - + %1%2%3버튼%4 @@ -7640,73 +7740,73 @@ Please try again or contact the developer of the software. 사용자 - + Profile Creator - + 프로필 생성기 - - + + Profile Selector 프로필 선택 - + Profile Icon Editor - + 프로필 아이콘 에디터 - + Profile Nickname Editor - + 프로필 이름 에디터 - + Who will receive the points? - + 누가 포인트를 받을까요? - + Who is using Nintendo eShop? - + 누가 Nintendo eShop을 사용하고 있습니까? - + Who is making this purchase? - + 누가 이 구매를 하고 있습니까? - + Who is posting? - + 누가 게시하고 있습니까? - + Select a user to link to a Nintendo Account. - + Nintendo 계정에 연결할 사용자를 선택하십시오. - + Change settings for which user? - + 어떤 사용자의 설정을 변경하시겠습니까? - + Format data for which user? - + 어떤 사용자의 데이터를 포맷하시겠습니까? - + Which user will be transferred to another console? - + 어떤 사용자가 다른 본체로 이전되나요? - + Send save data for which user? - + 어떤 사용자의 저장 데이터를 보내시겠습니까? - + Select a user: 사용자를 선택하세요: @@ -7769,7 +7869,7 @@ p, li { white-space: pre-wrap; } [%1] %2 - + [%1] %2 diff --git a/dist/languages/nb.ts b/dist/languages/nb.ts index 86cd4ea85..f6f79ca02 100644 --- a/dist/languages/nb.ts +++ b/dist/languages/nb.ts @@ -25,12 +25,18 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">yuzu is an experimental open-source emulator for the Nintendo Switch licensed under GPLv3.0+.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">This software should not be used to play games you have not legally obtained.</span></p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">yuzu er en eksperimentell åpen kildekode emulator til Nintendo Switch lisensiert under GPLv3.0+.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Denne programvaren skal ikke brukes til å spille spill du ikke eier lovlig.</span></p></body></html> <html><head/><body><p><a href="https://yuzu-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Website</span></a> | <a href="https://github.com/yuzu-emu"><span style=" text-decoration: underline; color:#039be5;">Source Code</span></a> | <a href="https://github.com/yuzu-emu/yuzu/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://github.com/yuzu-emu/yuzu/blob/master/LICENSE.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html> - + <html><head/><body><p><a href="https://yuzu-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Nettside</span></a>|<a href="https://github.com/yuzu-emu"><span style=" text-decoration: underline; color:#039be5;">Kildekode</span></a>|<a href="https://github.com/yuzu-emu/yuzu/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Bidragsytere</span></a>|<a href="https://github.com/yuzu-emu/yuzu/blob/master/license.txt"><span style=" text-decoration: underline; color:#039be5;">Lisens</span></a></p></body></html> @@ -76,95 +82,97 @@ p, li { white-space: pre-wrap; } Room Window - + Rom Vindu Send Chat Message - + Send Chat Melding Send Message - + Send Melding Members - + Medlemmer %1 has joined - + %1 ble med %1 has left - + %1 har forlatt %1 has been kicked - + %1 har blitt sparket %1 has been banned - + %1 har blitt utestengt %1 has been unbanned - + %1 har fått opphevet utestengelsen View Profile - + Vis Profil Block Player - + Blokker Spiller When you block a player, you will no longer receive chat messages from them.<br><br>Are you sure you would like to block %1? - + Når du blokkerer en spiller vil du ikke lengere kunne motta chat meldinger fra dem.<br><br>Er du sikker på at du vil blokkere %1? Kick - + Spark ut Ban - + Bannlys Kick Player - + Spark Ut Spiller Are you sure you would like to <b>kick</b> %1? - + Er du sikker på at du vil <b>spake ut</b> %1? Ban Player - + Bannlys Spiller Are you sure you would like to <b>kick and ban</b> %1? This would ban both their forum username and their IP address. - + Er du sikker på at du vil <b>sparke ut og bannlyse</b> %1? + +Dette vil bannlyse både deres forum brukernavn og deres IP adresse. @@ -172,22 +180,22 @@ This would ban both their forum username and their IP address. Room Window - + Rom Vindu Room Description - + Rom Beskrivelse Moderation... - + Moderasjon... Leave Room - + Forlat Rommet @@ -200,12 +208,12 @@ This would ban both their forum username and their IP address. Disconnected - + Frakoblet %1 - %2 (%3/%4 members) - connected - + %1 - %2 (%3/%4 medlemmer) - tilkoblet @@ -234,102 +242,102 @@ This would ban both their forum username and their IP address. <html><head/><body><p>Does the game boot?</p></body></html> - + <html><head/><body><p>Starter spillet?</p></body></html> Yes The game starts to output video or audio - + Ja Spillet begynner å sende ut video eller lyd No The game doesn't get past the "Launching..." screen - + Nei Spillet kommer ikke forbi "Starter..." skjermen Yes The game gets past the intro/menu and into gameplay - + Ja Spillet kommer forbi introen/menyen og inn i spillet No The game crashes or freezes while loading or using the menu - + Nei Spillet kræsjer eller fryser mens den laster eller mens man bruker menyen <html><head/><body><p>Does the game reach gameplay?</p></body></html> - + <html><head/><body><p>Kommer spillet til spillingen?</p></body></html> Yes The game works without crashes - + Ja Spillet fungerer uten noen kræsj No The game crashes or freezes during gameplay - + Nei Spillet kræsjer eller fryser under spilling <html><head/><body><p>Does the game work without crashing, freezing or locking up during gameplay?</p></body></html> - + <html><head/><body><p>Fungerer spillet uten å kræsje, fryse eller låse seg under spilling?</p></body></html> Yes The game can be finished without any workarounds - + Ja Spillet kan bli fullført uten noen omveier No The game can't progress past a certain area - + Nei Spillet kommer ikke forbi et vist punkt <html><head/><body><p>Is the game completely playable from start to finish?</p></body></html> - + <html><head/><body><p>Er spillet fullstendig spillbart fra start til slutt?</p></body></html> Major The game has major graphical errors - + Større Spillet har større grafiske problemer Minor The game has minor graphical errors - + Mindre Spillet har mindre grafiske problemer None Everything is rendered as it looks on the Nintendo Switch - + Ingen Alt er gjengitt slik det ser ut på Nintendo Switch <html><head/><body><p>Does the game have any graphical glitches?</p></body></html> - + <html><head/><body><p>Har spillet noen grafiske glicher?</p></body></html> Major The game has major audio errors - + Større Spillet har større lydproblemer Minor The game has minor audio errors - + Mindre Spillet har mindre lydproblemer None Audio is played perfectly - + Ingen Lyden spilles av perfekt <html><head/><body><p>Does the game have any audio glitches / missing effects?</p></body></html> - + <html><head/><body><p>Har spillet noen glicher med lyd / manglende effekter?</p></body></html> @@ -373,17 +381,17 @@ This would ban both their forum username and their IP address. Output Device: - + Utgangsenhet: Input Device: - + Inngangsenhet: Sound Output Mode: - + Lydutgangsmodus: @@ -437,37 +445,37 @@ This would ban both their forum username and their IP address. Configure Infrared Camera - + Konfigurer Infrarødt Kamera Select where the image of the emulated camera comes from. It may be a virtual camera or a real camera. - + Velg hvor bildet for the emulerte kameraet kommer fra. Det kan være et virituelt kamera eller et ekte kamera. Camera Image Source: - + Kilde For Kamerabilde Input device: - + Inngangsenhet: Preview - + Forhåndsvisning Resolution: 320*240 - + Oppløsning: 320*240 Click to preview - + Klikk for å forhåndsvise @@ -520,7 +528,7 @@ This would ban both their forum username and their IP address. Paranoid (disables most optimizations) - + Paranoid (deaktiverer de fleste optimaliseringer) @@ -619,7 +627,7 @@ This would ban both their forum username and their IP address. Ignore global monitor - + Ignorer global overvåkning @@ -647,7 +655,7 @@ This would ban both their forum username and their IP address. <html><head/><body><p><span style=" font-weight:600;">For debugging only.</span><br/>If you're not sure what these do, keep all of these enabled. <br/>These settings, when disabled, only take effect when CPU Debugging is enabled. </p></body></html> - + <html><head/><body><p><span style=" font-weight:600;">Kun for feilsøking.</span><br/>Hvis du ikke vet hva disse gjør, behold alle disse aktivert. <br/>Disse innstillingene, når deaktivert, Trer bare i kraft når CPU feilsøking er aktivert. </p></body></html> @@ -656,72 +664,86 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">Enabling it inlines accesses to PageTable::pointers into emitted code.</div> <div style="white-space: nowrap">Disabling this forces all memory accesses to go through the Memory::Read/Memory::Write functions.</div> - + + <div style="white-space: nowrap">Denne optimaliseringen gir raskere minnetilgang for gjesteprogrammet.</div> + <div style="white-space: nowrap">Ved å aktivere den innbygger tilgang til PageTable::pointere i utstedt kode.</div> + <div style="white-space: nowrap">Deaktivering av dette tvinger alle minnetilganger til å gå gjennom funksjonene Memory::Read/Memory::Write.</div> + Enable inline page tables - + Aktiver innebygde sidetabeller <div>This optimization avoids dispatcher lookups by allowing emitted basic blocks to jump directly to other basic blocks if the destination PC is static.</div> - + + <div>Denne optimaliseringen unngår dispatcher-oppslag ved å la utsendte grunnblokker hoppe direkte til andre grunnblokker hvis destinasjons-PC-en er statisk.</div> + Enable block linking - + Aktiver kobling av blokker <div>This optimization avoids dispatcher lookups by keeping track potential return addresses of BL instructions. This approximates what happens with a return stack buffer on a real CPU.</div> - + + <div>Denne optimaliseringen unngår dispatcher-oppslag ved å holde oversikt over potensielle returadresser for BL-instruksjoner. Dette er tilnærmet hva som skjer med en returbuffer på en ekte CPU.</div> + Enable return stack buffer - + Aktiver returstabelbuffer <div>Enable a two-tiered dispatch system. A faster dispatcher written in assembly has a small MRU cache of jump destinations is used first. If that fails, dispatch falls back to the slower C++ dispatcher.</div> - + + <div>Aktiver et todelt utsendingssystem. En raskere utsender skrevet i assembly har en liten MRU-cache med hoppdestinasjoner som brukes først. Hvis det mislykkes, faller utsendelsen tilbake til den tregere C++ utsenderen.</div> + Enable fast dispatcher - + Aktiver rask avsender <div>Enables an IR optimization that reduces unnecessary accesses to the CPU context structure.</div> - + + <div>Muliggjør en IR-optimalisering som reduserer unødvendige tilganger til CPU-kontekststrukturen.</div> + Enable context elimination - + Aktiver Konteksteliminering <div>Enables IR optimizations that involve constant propagation.</div> - + + <div>Muliggjør IR-optimaliseringer som innebærer konstant utbredelse.</div> + Enable constant propagation - + Aktiver konstant utbredelse @@ -743,12 +765,15 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">When enabled, a misalignment is only triggered when an access crosses a page boundary.</div> <div style="white-space: nowrap">When disabled, a misalignment is triggered on all misaligned accesses.</div> - + + <div style="white-space: nowrap">Når dette er aktivert, utløses en feiljustering bare når en tilgang krysser en sidegrense.</div> + <div style="white-space: nowrap">Når dette er deaktivert, utløses en feiljustering på alle feiljusterte tilganger.</div> + Enable misalignment check reduction - + Aktiver reduksjon av feiljusteringskontroll @@ -808,12 +833,15 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">This optimization speeds up memory accesses by allowing invalid memory accesses to succeed.</div> <div style="white-space: nowrap">Enabling it reduces the overhead of all memory accesses and has no impact on programs that don't access invalid memory.</div> - + + <div style="white-space: nowrap">Denne optimaliseringen gir raskere minnetilgang ved å la ugyldige minnetilganger lykkes.</div> + <div style="white-space: nowrap">Aktivering av det reduserer overhead for alle minnetilganger og har ingen innvirkning på programmer som ikke har tilgang til ugyldig minne.</div> + Enable fallbacks for invalid memory accesses - + Aktiver tilbakefall for ugyldige minnetilganger @@ -826,7 +854,7 @@ This would ban both their forum username and their IP address. Debugger - + Feilsøker @@ -896,57 +924,57 @@ This would ban both their forum username and their IP address. When checked, it enables Nsight Aftermath crash dumps - + Når avhuket, aktiverer Nsight Aftermath kræsjdumper Enable Nsight Aftermath - + Aktiver Nsight Aftermath When checked, it will dump all the original assembler shaders from the disk shader cache or game as found - + Når det er merket av, vil det dumpe alle de originale assembler shaders fra disk shader cache eller spillet som funnet Dump Game Shaders - + Dump Spill Shadere When checked, it will dump all the macro programs of the GPU - + Når det er merket av, vil det dumpe alle makroprogrammene til GPUen Dump Maxwell Macros - + Dump Maxwell Makroer When checked, it disables the macro Just In Time compiler. Enabling this makes games run slower - + Når den er merket av, deaktiverer den makrokompilatoren Just In Time. Aktivering av dette gjør at spill kjører saktere Disable Macro JIT - + Deaktiver Macro JIT When checked, it disables the macro HLE functions. Enabling this makes games run slower - + Når det er merket av, deaktiverer det makro HLE-funksjonene. Aktivering av dette gjør at spillene kjører saktere Disable Macro HLE - + Deaktiver Macro HLE When checked, yuzu will log statistics about the compiled pipeline cache - + Når det er merket av, vil yuzu logge statistikk om den kompilerte rørledningsbufferen @@ -961,7 +989,7 @@ This would ban both their forum username and their IP address. Disable Loop safety checks - + Deaktive Loop sikkerhetssjekker @@ -971,27 +999,27 @@ This would ban both their forum username and their IP address. Enable Verbose Reporting Services** - + Aktiver Verbose Reporting Services** Enable FS Access Log - + Aktiver FS Tilgangs Logg Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Aktiver dette for å sende den siste genererte lydkommandolisten til konsollen. Påvirker bare spill som bruker lydrenderen. Dump Audio Commands To Console** - + Dump Lydkommandoer Til Konsollen** Create Minidump After Crash - + Lag Minidump Etter Kræsj @@ -1001,7 +1029,7 @@ This would ban both their forum username and their IP address. Kiosk (Quest) Mode - + Kiosk (Quest) Modus @@ -1011,17 +1039,17 @@ This would ban both their forum username and their IP address. Enable Debug Asserts - + Aktiver Feilsøkingsoppgaver Enable Auto-Stub** - + Aktiver Auto-Stub** Enable All Controller Types - + Aktiver Alle Kontrollertyper @@ -1031,12 +1059,12 @@ This would ban both their forum username and their IP address. Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Gjør det mulig for yuzu å se etter et fungerende Vulkan-miljø når programmet starter opp. Deaktiver dette hvis dette forårsaker problemer ved at eksterne programmer ser yuzu. Perform Startup Vulkan Check - + Utfør Vulkan-Sjekk Ved Oppstart @@ -1046,22 +1074,22 @@ This would ban both their forum username and their IP address. Restart Required - + Omstart Nødvendig yuzu is required to restart in order to apply this setting. - + yuzu må startes på nytt for å bruke denne innstillingen. Web applet not compiled - + Web-applet ikke kompilert MiniDump creation not compiled - + MiniDump-opprettelse ikke kompilert @@ -1109,78 +1137,78 @@ This would ban both their forum username and their IP address. yuzu Konfigurasjon - - + + Audio Lyd - - + + CPU CPU - + Debug Feilsøk - + Filesystem Filsystem - - + + General Generelt - - + + Graphics Grafikk - + GraphicsAdvanced - + AvnsertGrafikk - + Hotkeys Hurtigtaster - - + + Controls Kontrollere - + Profiles Profiler - + Network Nettverk - - + + System System - + Game List Spill Liste - + Web Nett @@ -1259,7 +1287,7 @@ This would ban both their forum username and their IP address. Mod Load Root - + Modifikasjonlastingsopprinnelsen @@ -1274,7 +1302,7 @@ This would ban both their forum username and their IP address. Cache Game List Metadata - + Mellomlagre Spillistens Metadata @@ -1282,7 +1310,7 @@ This would ban both their forum username and their IP address. Reset Metadata Cache - + Tilbakestill Mellomlagringen for Metadata @@ -1302,7 +1330,7 @@ This would ban both their forum username and their IP address. Select Dump Directory... - + Velg Dump-Katalog @@ -1312,7 +1340,7 @@ This would ban both their forum username and their IP address. The metadata cache is already empty. - + Mellomlagringen for metadata er allerede tom. @@ -1322,7 +1350,7 @@ This would ban both their forum username and their IP address. The metadata cache couldn't be deleted. It might be in use or non-existent. - + Mellomlagringen for metadata kunne ikke slettes. Den kan være i bruk eller ikke-eksisterende. @@ -1355,41 +1383,36 @@ This would ban both their forum username and their IP address. - Extended memory layout (8GB DRAM) - - - - Confirm exit while emulation is running Bekreft lukking mens emuleringen kjører - + Prompt for user on game boot Spør om bruker når et spill starter - + Pause emulation when in background Paus emulering når yuzu kjører i bakgrunnen - + Hide mouse on inactivity Gjem mus under inaktivitet - + Reset All Settings Tilbakestill alle innstillinger - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Dette tilbakestiller alle innstillinger og fjerner alle spillinnstillinger. Spillmapper, profiler og inndataprofiler blir ikke slettet. Fortsett? @@ -1428,7 +1451,7 @@ This would ban both their forum username and their IP address. - + None Ingen @@ -1440,7 +1463,7 @@ This would ban both their forum username and their IP address. Use disk pipeline cache - + Bruk diskens rørledningsmellomlagring @@ -1454,231 +1477,272 @@ This would ban both their forum username and their IP address. + VSync Mode: + VSync Modus: + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + FIFO (VSync) slipper ikke bilder eller viser tearing, men er begrenset av skjermoppdateringsfrekvensen. +FIFO Relaxed ligner på FIFO, men tillater riving etter hvert som den kommer seg etter en oppbremsing. +Mailbox kan ha lavere ventetid enn FIFO og river ikke, men kan slippe rammer. +Umiddelbar (ingen synkronisering) presenterer bare det som er tilgjengelig og kan vise riving. + + + NVDEC emulation: NVDEC-emulering: - + No Video Output Ingen videoutdata - + CPU Video Decoding Prosessorvideodekoding - + GPU Video Decoding (Default) GPU-videodekoding (standard) - + Fullscreen Mode: Fullskjermmodus: - + Borderless Windowed Rammeløst vindu - + Exclusive Fullscreen Eksklusiv fullskjerm - + Aspect Ratio: Størrelsesforhold: - + Default (16:9) Standard (16:9) - + Force 4:3 Tving 4:3 - + Force 21:9 Tving 21:9 - + Force 16:10 - + Tving 16:10 - + Stretch to Window Strekk til Vindu - + Resolution: Oppløsning: - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [EKSPERIMENTELL] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [EKSPERIMENTELL] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] - + 1.5X (1080p/1620p) [EXPERIMENTELL] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) - + 7X (5040p/7560p) - + 8X (5760p/8640p) - + 8X (5760p/8640p) - + Window Adapting Filter: - + Vindustilpasningsfilter: - + Nearest Neighbor Nærmeste nabo - + Bilinear Bilineær - + Bicubic Bikubisk - + Gaussian Gaussisk - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution - + AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: Anti-aliasing–metode: - + FXAA FXAA - + SMAA - + SMAA - + Use global FSR Sharpness - + Bruk global FSR skarphet - + Set FSR Sharpness - + Sett FSR skarphet - + FSR Sharpness: - + FSR Skarphet: - + 100% - + 100% - - + + Use global background color Bruk global bakgrunnsfarge - + Set background color: Velg bakgrunnsfarge: - + Background Color: Bakgrunnsfarge: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (assembly-shader-e, kun med NVIDIA) - + SPIR-V (Experimental, Mesa Only) - + SPIR-V (Eksperimentell, Kun Mesa) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + Av + + + + VSync Off + VSync Av + + + + Recommended + Anbefalt + + + + On + På + + + + VSync On + VSync På + ConfigureGraphicsAdvanced @@ -1703,107 +1767,134 @@ This would ban both their forum username and their IP address. Nøyaktighetsnivå: - - Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - - - - - Force maximum clocks (Vulkan only) - - - - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync hindrer skjermen fra å brytes, men noen grafikkort har lavere ytelse med VSync på. Behold det på hvis du ikke legger merke til forskjell i ytelse. - - - - Use VSync - - - - - Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. - + + ASTC recompression: + ASTC rekomprimering: - Decode ASTC textures asynchronously (Hack) - + Uncompressed (Best quality) + Ukomprimert (beste kvalitet) - + + BC1 (Low quality) + BC1 (Lav kvalitet) + + + + BC3 (Medium quality) + BC3 (Medium kvalitet) + + + + Enable asynchronous presentation (Vulkan only) + Aktiver asynkron presentasjon (kun Vulkan) + + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + Kjører arbeid i bakgrunnen mens den venter på grafikkommandoer for å forhindre at GPU-en senker klokkehastigheten. + + + + Force maximum clocks (Vulkan only) + Tving maksikal klokkehastighet (kun Vulkan) + + + + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + Aktiverer asynkron ASTC-teksturavkoding, noe som kan redusere hakking i lastetiden. Denne funksjonen er eksperimentell. + + + + Decode ASTC textures asynchronously (Hack) + Dekode ASTC-teksturer asynkront (Hack) + + + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + Bruker reaktiv tømming i stedet for prediktiv tømming. Tillater en mer nøyaktig synkronisering av minnet. + + + + Enable Reactive Flushing + Aktiver Reaktiv Tømming + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Slår på asynkron shader-kompilering, som kan redusere shader-hakking. Denne funksjonaliteten er eksperimentell. - + Use asynchronous shader building (Hack) Bruk asynkron shader-bygging (hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Aktiverer rask GPU-tid. Dette alternativet vil tvinge de fleste spill til å kjøre med sin høyeste opprinnelige oppløsning. - + Use Fast GPU Time (Hack) - + Bruk Rask GPU-Tid (Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - - - - - Use pessimistic buffer flushes (Hack) - - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Aktiverer GPU-leverandørspesifikk rørledningsbuffer. Dette alternativet kan forbedre shader-innlastingstiden betydelig i tilfeller der Vulkan-driveren ikke lagrer rørledningsbufferfiler internt. - + Use Vulkan pipeline cache - + Bruk Vulkan rørledningsbuffer - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + Aktiver beregningsrørledninger, kreves av noen spill. Denne innstillingen finnes bare for Intel-proprietære drivere, og kan krasje hvis den er aktivert. +Beregningsrørledninger er alltid aktivert på alle andre drivere. + + + + Enable Compute Pipelines (Intel Vulkan only) + Aktiver beregningsrørledninger (kun Intel Vulkan) + + + Anisotropic Filtering: Anisotropisk filtrering: - + Automatic Automatisk - + Default Standard - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1836,70 +1927,65 @@ This would ban both their forum username and their IP address. Gjenopprett Standardverdier - + Action Handling - + Hotkey Hurtigtast - + Controller Hotkey Kontrollerhurtigtast - - - + + + Conflicting Key Sequence Mostridende tastesekvens - - + + The entered key sequence is already assigned to: %1 Den inntastede tastesekvensen er allerede tildelt til: %1 - - Home+%1 - Hjem+%1 - - - + [waiting] [venter] - + Invalid Ugyldig - + Restore Default Gjenopprett Standardverdi - + Clear Fjern - + Conflicting Button Sequence Motstridende knappesekvens - + The default button sequence is already assigned to: %1 Standardknappesekvensen er allerede tildelt til: %1 - + The default key sequence is already assigned to: %1 Standardtastesekvensen er allerede tildelt til: %1 @@ -2191,19 +2277,19 @@ This would ban both their forum username and their IP address. - + Configure Konfigurer Ring Controller - + Ring-Kontroller Infrared Camera - + Infrarødt Kamera @@ -2240,30 +2326,40 @@ This would ban both their forum username and their IP address. Enable direct JoyCon driver - + Aktiver driver for direkte JoyCon tilkobling Enable direct Pro Controller driver [EXPERIMENTAL] - + Aktiver driver for direkte Pro Controller tilkobling (EKSPERIMENTELL) - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + Tillater ubegrenset bruk av samme Amiibo i spill som ellers ville begrenset deg til én bruk. + + + + Use random Amiibo ID + Bruk tilfeldig Amiibo ID + + + Enable mouse panning Slå på musepanorering - + Mouse sensitivity Musesensitivitet - + % % - + Motion / Touch Bevegelse / Touch @@ -2283,57 +2379,57 @@ This would ban both their forum username and their IP address. Input Profiles - + Inndataprofiler Player 1 Profile - + Spiller 1 Profil Player 2 Profile - + Spiller 2 Profil Player 3 Profile - + Spiller 3 Profil Player 4 Profile - + Spiller 4 Profil Player 5 Profile - + Spiller 5 Profil Player 6 Profile - + Spiller 6 Profil Player 7 Profile - + Spiller 7 Profil Player 8 Profile - + Spiller 8 Profil Use global input configuration - + Bruk global inndatakonfigurasjon Player %1 profile - + Spiller %1 profile @@ -2375,7 +2471,7 @@ This would ban both their forum username and their IP address. - + Left Stick Venstre Pinne @@ -2469,14 +2565,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2490,12 +2586,12 @@ This would ban both their forum username and their IP address. Capture - + Opptak - + Plus Pluss @@ -2508,15 +2604,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2573,241 +2669,247 @@ This would ban both their forum username and their IP address. - + Right Stick Høyre Pinne - - - - + + + + Clear Fjern - - - - - + + + + + [not set] [ikke satt] - - + + + Invert button Inverter knapp - - + + Toggle button Veksle knapp - + Turbo button - + Turbo-Knapp - - + + Invert axis Inverter akse - - - + + + Set threshold Set grense - - + + Choose a value between 0% and 100% Velg en verdi mellom 0% og 100% - + Toggle axis - + veksle akse - + Set gyro threshold - + Angi gyroterskel - + + Calibrate sensor + Kalibrer sensor + + + Map Analog Stick - + Kartlegg Analog Spak - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Etter du har trykker på OK, flytt først stikken horisontalt, og så vertikalt. For å invertere aksene, flytt først stikken vertikalt, og så horistonalt. - + Center axis Senterakse - - + + Deadzone: %1% Dødsone: %1% - - + + Modifier Range: %1% Modifikatorområde: %1% - - + + Pro Controller Pro-Kontroller - + Dual Joycons Doble Joycons - + Left Joycon Venstre Joycon - + Right Joycon Høyre Joycon - + Handheld Håndholdt - + GameCube Controller GameCube-kontroller - + Poke Ball Plus Poke Ball Plus - + NES Controller NES-kontroller - + SNES Controller SNES-kontroller - + N64 Controller N64-kontroller - + Sega Genesis Sega Genesis - + Start / Pause Start / paus - + Z Z - + Control Stick Kontrollstikke - + C-Stick C-stikke - + Shake! Rist! - + [waiting] [venter] - + New Profile Ny Profil - + Enter a profile name: Skriv inn et profilnavn: - - + + Create Input Profile Lag inndataprofil - + The given profile name is not valid! Det oppgitte profilenavnet er ugyldig! - + Failed to create the input profile "%1" Klarte ikke lage inndataprofil "%1" - + Delete Input Profile Slett inndataprofil - + Failed to delete the input profile "%1" Klarte ikke slette inndataprofil "%1" - + Load Input Profile Last inn inndataprofil - + Failed to load the input profile "%1" Klarte ikke laste inn inndataprofil "%1" - + Save Input Profile Lagre inndataprofil - + Failed to save the input profile "%1" Klarte ikke lagre inndataprofil "%1" @@ -2862,7 +2964,7 @@ For å invertere aksene, flytt først stikken vertikalt, og så horistonalt. Touch from button profile: - + Trykk fra knappens profil: @@ -3062,47 +3164,47 @@ For å invertere aksene, flytt først stikken vertikalt, og så horistonalt.Utvikler - + Add-Ons Tillegg - + General Generelt - + System System - + CPU CPU - + Graphics Grafikk - + Adv. Graphics Avn. Grafikk - + Audio Lyd - + Input Profiles - + Inndataprofiler - + Properties Egenskaper @@ -3281,7 +3383,7 @@ For å invertere aksene, flytt først stikken vertikalt, og så horistonalt. Delete this user? All of the user's save data will be deleted. - + Slett denne brukeren? Alle brukerens lagrede data vil bli slettet. @@ -3292,7 +3394,8 @@ For å invertere aksene, flytt først stikken vertikalt, og så horistonalt. Name: %1 UUID: %2 - + Navn: %1 +UUID: %2 @@ -3300,29 +3403,29 @@ UUID: %2 Configure Ring Controller - + Konfigurer Ring-Kontroller If you want to use this controller configure player 1 as right controller and player 2 as dual joycon before starting the game to allow this controller to be detected properly. - + Hvis du vil bruke denne kontrolleren, må du konfigurere spiller 1 som høyre kontroller og spiller 2 som dobbel joycon før du starter spillet, slik at denne kontrolleren kan oppdages riktig. Virtual Ring Sensor Parameters - + Parametre For Virituell Ringsensor Pull - + Dra Push - + Skyv @@ -3332,29 +3435,29 @@ UUID: %2 Direct Joycon Driver - + Driver For Direkte JoyCon Tilkobling Enable Ring Input - + Aktiver Ringinndata Enable - + Aktiver Ring Sensor Value - + Sensorverdier For Ring Not connected - + Ikke Tilkoblet @@ -3385,12 +3488,12 @@ UUID: %2 Error enabling ring input - + Feil ved aktivering av ringinndata Direct Joycon driver is not enabled - + Driver for direkte JoyCon tilkobling er ikke aktivert @@ -3400,17 +3503,17 @@ UUID: %2 The current mapped device doesn't support the ring controller - + Den gjeldende tilordnede enheten støtter ikke ringkontrolleren. The current mapped device doesn't have a ring attached - + Den gjeldende kartlagte enheten har ikke en ring festet Unexpected driver result %1 - + Uventet driverresultat %1 @@ -3719,7 +3822,7 @@ UUID: %2 American English - + Amerikans Engelsk @@ -3814,22 +3917,27 @@ UUID: %2 RNG Seed - + Frø For Tilfeldig Nummergenerering Device Name - + Enhetsnavn - + + Unsafe extended memory layout (8GB DRAM) + Usikkert utvidet minneoppsett (8 GB DRAM) + + + System settings are available only when game is not running. Systeminnstillinger er bare tilgjengelige når ingen spill kjører. Warning: "%1" is not a valid language for region "%2" - + Advarsel: "%1" er ikke et gyldig språk for region "%2" @@ -3867,7 +3975,7 @@ UUID: %2 Loop script - + Loop script @@ -3908,12 +4016,12 @@ UUID: %2 Configure Touchscreen Mappings - + Konfigurer Kartlegging av Berøringsskjerm Mapping: - + Kartlegging: @@ -4118,7 +4226,7 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re Note: Changing language will apply your configuration. - + Merk: Hvis du endrer språk, brukes konfigurasjonen din. @@ -4138,7 +4246,7 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re Show Compatibility List - + Vis Kompabilitetsliste @@ -4148,12 +4256,12 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re Show Size Column - + Vis Kolonne For Størrelse Show File Types Column - + Vis Kolonne For Filtype @@ -4216,7 +4324,7 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re Press any controller button to vibrate the controller. - + Trykk hvilken som helst knapp for å vibrere kontrolleren @@ -4337,7 +4445,7 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re Web Service configuration can only be changed when a public room isn't being hosted. - + Webtjenestekonfigurasjonen kan bare endres når et offentlig rom ikke blir arangert. @@ -4409,13 +4517,13 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re Token was not verified. The change to your token has not been saved. - + Token ble ikke bekreftet. Endringen av tokenet ditt er ikke lagret. Unverified, please click Verify before saving configuration Tooltip - + Ubekreftet, klikk på Bekreft før du lagrer konfigurasjonen. @@ -4427,7 +4535,7 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re Verified Tooltip - + Bekreftet @@ -4443,7 +4551,7 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re Verification failed. Check that you have entered your token correctly, and that your internet connection is working. - + Bekreftelsen mislyktes. Kontroller at du har tastet inn tokenet ditt riktig, og at internettforbindelsen din fungerer. @@ -4456,7 +4564,7 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re &Controller P1 - + &Controller P1 @@ -4464,42 +4572,42 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re Direct Connect - + Direkte Tilkobling Server Address - + Server Adresse <html><head/><body><p>Server address of the host</p></body></html> - + <html><head/><body><p>Server addressen til verten</p></body></html> Port - + Port <html><head/><body><p>Port number the host is listening on</p></body></html> - + <html><head/><body><p>Portnummeret verten lytter på</p></body></html> Nickname - + Kallenavn Password - + Passord Connect - + Koble Til @@ -4507,572 +4615,579 @@ Dra punkter for å endre posisjon, eller dobbelttrykk på tabellfelter for å re Connecting - + Kobler Til Connect - + Koble Til GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonym data blir samlet inn</a>for å hjelpe til med å forbedre yuzu.<br/><br/>Vil du dele din bruksdata med oss? - + Telemetry Telemetri - - - Broken Vulkan Installation Detected - - - Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Broken Vulkan Installation Detected + Ødelagt Vulkan-installasjon oppdaget - + + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. + Vulkan-initialisering mislyktes under oppstart.<br><br>Klikk<a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>her for instruksjoner for å løse problemet</a>. + + + Loading Web Applet... Laster web-applet... - - + + Disable Web Applet Slå av web-applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + Deaktivering av webappleten kan føre til udefinert oppførsel og bør bare brukes med Super Mario 3D All-Stars. Er du sikker på at du vil deaktivere webappleten? +(Dette kan aktiveres på nytt i feilsøkingsinnstillingene). - + The amount of shaders currently being built Antall shader-e som bygges for øyeblikket - + The current selected resolution scaling multiplier. Den valgte oppløsningsskaleringsfaktoren. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Nåværende emuleringshastighet. Verdier høyere eller lavere en 100% indikerer at emuleringen kjører raskere eller tregere enn en Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Hvor mange bilder per sekund spiller viser. Dette vil variere fra spill til spill og scene til scene. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tid det tar for å emulere et Switch bilde. Teller ikke med bildebegrensing eller v-sync. For full-hastighet emulering burde dette være 16.67 ms. på det høyeste. - + &Clear Recent Files - + &Tøm Nylige Filer - + Emulated mouse is enabled - + Emulert mus er aktivert - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + Ekte museinndata og musepanning er inkompatible. Deaktiver den emulerte musen i avanserte innstillinger for inndata for å tillate musepanning. - + &Continue - + &Fortsett - + &Pause &Paus - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping Et spill kjører i yuzu - + Warning Outdated Game Format Advarsel: Utdatert Spillformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Du bruker en dekonstruert ROM-mappe for dette spillet, som er et utdatert format som har blitt erstattet av andre formater som NCA, NAX, XCI, eller NSP. Dekonstruerte ROM-mapper mangler ikoner, metadata, og oppdateringsstøtte.<br><br>For en forklaring på diverse Switch-formater som yuzu støtter,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>sjekk vår wiki</a>. Denne meldingen vil ikke bli vist igjen. - - + + Error while loading ROM! Feil under innlasting av ROM! - + The ROM format is not supported. Dette ROM-formatet er ikke støttet. - + An error occurred initializing the video core. En feil oppstod under initialisering av videokjernen. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu har oppdaget en feil under kjøring av videokjernen. Dette er vanligvis forårsaket av utdaterte GPU-drivere, inkludert for integrert grafikk. Vennligst sjekk loggen for flere detaljer. For mer informasjon om å finne loggen, besøk følgende side: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Uploadd the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Feil under lasting av ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + %1<br>Vennligst følg <a href='https://yuzu-emu.org/help/quickstart/'>hurtigstartsguiden</a> for å redumpe filene dine. <br>Du kan henvise til yuzu wikien</a> eller yuzu Discorden</a> for hjelp. - + An unknown error occurred. Please see the log for more details. En ukjent feil oppstod. Se loggen for flere detaljer. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Lukker programvare... - + Save Data Lagre Data - + Mod Data Mod Data - + Error Opening %1 Folder Feil Under Åpning av %1 Mappen - - + + Folder does not exist! Mappen eksisterer ikke! - + Error Opening Transferable Shader Cache - + Feil ved åpning av overførbar shaderbuffer - + Failed to create the shader cache directory for this title. - + Kunne ikke opprette shader cache-katalogen for denne tittelen. - + Error Removing Contents - + Feil ved fjerning av innhold - + Error Removing Update - - - - - Error Removing DLC - + Feil ved fjerning av oppdatering + Error Removing DLC + Feil ved fjerning av DLC + + + Remove Installed Game Contents? - + Fjern Innstallert Spillinnhold? - + Remove Installed Game Update? - + Fjern Installert Spilloppdatering? - + Remove Installed Game DLC? - + Fjern Installert Spill DLC? - + Remove Entry Fjern oppføring - - - - - - + + + + + + Successfully Removed Fjerning lykkes - + Successfully removed the installed base game. - + Vellykket fjerning av det installerte basisspillet. - + The base game is not installed in the NAND and cannot be removed. Grunnspillet er ikke installert i NAND og kan ikke bli fjernet. - + Successfully removed the installed update. Fjernet vellykket den installerte oppdateringen. - + There is no update installed for this title. Det er ingen oppdatering installert for denne tittelen. - + There are no DLC installed for this title. Det er ingen DLC installert for denne tittelen. - + Successfully removed %1 installed DLC. Fjernet vellykket %1 installerte DLC-er. - + Delete OpenGL Transferable Shader Cache? - + Slette OpenGL Overførbar Shaderbuffer? - + Delete Vulkan Transferable Shader Cache? - + Slette Vulkan Overførbar Shaderbuffer? - + Delete All Transferable Shader Caches? - + Slette Alle Overførbare Shaderbuffere? - + Remove Custom Game Configuration? Fjern Tilpasset Spillkonfigurasjon? - + + Remove Cache Storage? + Fjerne Hurtiglagringen? + + + Remove File Fjern Fil - - + + Error Removing Transferable Shader Cache Feil under fjerning av overførbar shader cache - - + + A shader cache for this title does not exist. - + En shaderbuffer for denne tittelen eksisterer ikke. - + Successfully removed the transferable shader cache. Lykkes i å fjerne den overførbare shader cachen. - + Failed to remove the transferable shader cache. Feil under fjerning av den overførbare shader cachen. - + Error Removing Vulkan Driver Pipeline Cache - + Feil ved fjerning av Vulkan Driver-Rørledningsbuffer - + Failed to remove the driver pipeline cache. - - - - - - Error Removing Transferable Shader Caches - - - - - Successfully removed the transferable shader caches. - - - - - Failed to remove the transferable shader cache directory. - + Kunne ikke fjerne driverens rørledningsbuffer. + - + Error Removing Transferable Shader Caches + Feil ved fjerning av overførbare shaderbuffere + + + + Successfully removed the transferable shader caches. + Vellykket fjerning av overførbare shaderbuffere. + + + + Failed to remove the transferable shader cache directory. + Feil ved fjerning av overførbar shaderbuffer katalog. + + + + Error Removing Custom Configuration Feil Under Fjerning Av Tilpasset Konfigurasjon - + A custom configuration for this title does not exist. En tilpasset konfigurasjon for denne tittelen finnes ikke. - + Successfully removed the custom game configuration. Fjernet vellykket den tilpassede spillkonfigurasjonen. - + Failed to remove the custom game configuration. Feil under fjerning av den tilpassede spillkonfigurasjonen. - - + + RomFS Extraction Failed! Utvinning av RomFS Feilet! - + There was an error copying the RomFS files or the user cancelled the operation. Det oppstod en feil under kopiering av RomFS filene eller så kansellerte brukeren operasjonen. - + Full Fullstendig - + Skeleton Skjelett - + Select RomFS Dump Mode Velg RomFS Dump Modus - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Velg hvordan du vil dumpe RomFS.<br>Fullstendig vil kopiere alle filene til en ny mappe mens <br>skjelett vil bare skape mappestrukturen. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Det er ikke nok ledig plass på %1 til å pakke ut RomFS. Vennligst frigjør plass eller velg en annen dump-katalog under Emulering > Konfigurer > System > Filsystem > Dump Root. - + Extracting RomFS... Utvinner RomFS... - - + + Cancel Avbryt - + RomFS Extraction Succeeded! RomFS Utpakking lyktes! - + The operation completed successfully. Operasjonen fullført vellykket. - - - - - - Create Shortcut - - - - - This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - - - - - Cannot create shortcut on desktop. Path "%1" does not exist. - - - - - Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - - - - - Create Icon - - - + + + + + Create Shortcut + Lag Snarvei + + + + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? + Dette vil opprette en snarvei til gjeldende AppImage. Dette fungerer kanskje ikke bra hvis du oppdaterer. Fortsette? + + + + Cannot create shortcut on desktop. Path "%1" does not exist. + Kan ikke opprette snarvei på skrivebordet. Stien "%1" finnes ikke. + + + + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. + Kan ikke opprette snarvei i applikasjonsmenyen. Stien "%1" finnes ikke og kan ikke opprettes. + + + + Create Icon + Lag Ikon + + + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Kan ikke opprette ikonfil. Stien "%1" finnes ikke og kan ikke opprettes. - + Start %1 with the yuzu Emulator - - - - - Failed to create a shortcut at %1 - - - - - Successfully created a shortcut to %1 - + Start %1 med yuzu-emulatoren + Failed to create a shortcut at %1 + Mislyktes i å opprette en snarvei ved %1 + + + + Successfully created a shortcut to %1 + Opprettet en snarvei til %1 + + + Error Opening %1 Feil ved åpning av %1 - + Select Directory Velg Mappe - + Properties Egenskaper - + The game properties could not be loaded. Spillets egenskaper kunne ikke bli lastet inn. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Kjørbar Fil (%1);;Alle Filer (*.*) - + Load File Last inn Fil - + Open Extracted ROM Directory Åpne Utpakket ROM Mappe - + Invalid Directory Selected Ugyldig Mappe Valgt - + The directory you have selected does not contain a 'main' file. Mappen du valgte inneholder ikke en 'main' fil. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Installerbar Switch-Fil (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xcI) - + Install Files Installer Filer - + %n file(s) remaining %n fil gjenstår%n filer gjenstår - + Installing file "%1"... Installerer fil "%1"... - - + + Install Results Insallasjonsresultater - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + For å unngå mulige konflikter fraråder vi brukere å installere basisspill på NAND. +Bruk kun denne funksjonen til å installere oppdateringer og DLC. - + %n file(s) were newly installed %n fil ble nylig installert -%n filer ble nylig installert +%n fil(er) ble nylig installert - + %n file(s) were overwritten %n fil ble overskrevet @@ -5080,7 +5195,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) failed to install %n fil ble ikke installert @@ -5088,388 +5203,388 @@ Please, only use this feature to install updates and DLC. - + System Application Systemapplikasjon - + System Archive Systemarkiv - + System Application Update Systemapplikasjonsoppdatering - + Firmware Package (Type A) Firmware Pakke (Type A) - + Firmware Package (Type B) Firmware-Pakke (Type B) - + Game Spill - + Game Update Spilloppdatering - + Game DLC Spill tilleggspakke - + Delta Title Delta Tittel - + Select NCA Install Type... Velg NCA Installasjonstype... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Vennligst velg typen tittel du vil installere denne NCA-en som: (I de fleste tilfellene, standarden 'Spill' fungerer.) - + Failed to Install Feil under Installasjon - + The title type you selected for the NCA is invalid. Titteltypen du valgte for NCA-en er ugyldig. - + File not found Fil ikke funnet - + File "%1" not found Filen "%1" ikke funnet - + OK OK - - + + Hardware requirements not met - + Krav til maskinvare ikke oppfylt - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Systemet ditt oppfyller ikke de anbefalte maskinvarekravene. Kompatibilitetsrapportering er deaktivert. - + Missing yuzu Account Mangler yuzu Bruker - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. For å sende inn et testtilfelle for spillkompatibilitet, må du linke yuzu-brukeren din.<br><br/>For å linke yuzu-brukeren din, gå til Emulasjon &gt; Konfigurasjon &gt; Nett. - + Error opening URL Feil under åpning av URL - + Unable to open the URL "%1". Kunne ikke åpne URL "%1". - + TAS Recording TAS-innspilling - + Overwrite file of player 1? Overskriv filen til spiller 1? - + Invalid config detected Ugyldig konfigurasjon oppdaget - + Handheld controller can't be used on docked mode. Pro controller will be selected. Håndholdt kontroller kan ikke brukes i dokket modus. Pro-kontroller vil bli valgt. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Den valgte amiibo-en har blitt fjernet - + Error Feil - - + + The current game is not looking for amiibos Det kjørende spillet sjekker ikke for amiibo-er - + Amiibo File (%1);; All Files (*.*) Amiibo-Fil (%1);; Alle Filer (*.*) - + Load Amiibo Last inn Amiibo - + Error loading Amiibo data Feil ved lasting av Amiibo data - + The selected file is not a valid amiibo - + Den valgte filen er ikke en gyldig amiibo - + The selected file is already on use - + Den valgte filen er allerede i bruk - + An unknown error occurred - + En ukjent feil oppso - + Capture Screenshot Ta Skjermbilde - + PNG Image (*.png) PNG Bilde (*.png) - + TAS state: Running %1/%2 TAS-tilstand: Kjører %1/%2 - + TAS state: Recording %1 TAS-tilstand: Spiller inn %1 - + TAS state: Idle %1/%2 TAS-tilstand: Venter %1%2 - + TAS State: Invalid TAS-tilstand: Ugyldig - + &Stop Running &Stopp kjøring - + &Start &Start - + Stop R&ecording - + Stopp innspilling (&E) - + R&ecord - + Spill inn (%E) - + Building: %n shader(s) Bygger: %n shaderBygger: %n shader-e - + Scale: %1x %1 is the resolution scaling factor Skala: %1x - + Speed: %1% / %2% Hastighet: %1% / %2% - + Speed: %1% Hastighet: %1% - + Game: %1 FPS (Unlocked) Spill: %1 FPS (ubegrenset) - + Game: %1 FPS Spill: %1 FPS - + Frame: %1 ms Ramme: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HØY - + GPU EXTREME GPU EKSTREM - + GPU ERROR GPU FEIL - + DOCKED - + FORANKRET - + HANDHELD - + HÅNDHOLDT - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NULL - + NEAREST NÆRMESTE - - + + BILINEAR BILINEÆR - + BICUBIC BIKUBISK - + GAUSSIAN GAUSSISK - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA INGEN AA - + FXAA FXAA - + SMAA - + SMAA - + VOLUME: MUTE - + VOLUM: DEMPET - + VOLUME: %1% Volume percentage (e.g. 50%) - + VOLUM: %1% - + Confirm Key Rederivation Bekreft Nøkkel-Redirevasjon - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5486,37 +5601,37 @@ og eventuelt lag backups. Dette vil slette dine autogenererte nøkkel-filer og kjøre nøkkel-derivasjonsmodulen på nytt. - + Missing fuses Mangler fuses - + - Missing BOOT0 - Mangler BOOT0 - + - Missing BCPKG2-1-Normal-Main - Mangler BCPKG2-1-Normal-Main - + - Missing PRODINFO - Mangler PRODINFO - + Derivation Components Missing Derivasjonskomponenter Mangler - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Krypteringsnøkler mangler. <br>Vennligst følg <a href='https://yuzu-emu.org/help/quickstart/'>yuzus oppstartsguide</a> for å få alle nøklene, fastvaren og spillene dine.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5525,39 +5640,49 @@ Dette kan ta opp til et minutt avhengig av systemytelsen din. - + Deriving Keys Deriverer Nøkler - + + System Archive Decryption Failed + Dekryptering av systemarkiv mislyktes + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + Krypteringsnøkler klarte ikke å dekryptere firmware. <br>Vennligst følg <a href='https://yuzu-emu.org/help/quickstart/'>quickstartguiden for yuzu </a> for å få alle nøkler, firmware og spill. + + + Select RomFS Dump Target Velg RomFS Dump-Mål - + Please select which RomFS you would like to dump. Vennligst velg hvilken RomFS du vil dumpe. - + Are you sure you want to close yuzu? Er du sikker på at du vil lukke yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Er du sikker på at du vil stoppe emulasjonen? All ulagret fremgang vil bli tapt. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5569,44 +5694,44 @@ Vil du overstyre dette og lukke likevel? GRenderWindow - - + + OpenGL not available! OpenGL ikke tilgjengelig! - + OpenGL shared contexts are not supported. - + Delte OpenGL-kontekster støttes ikke. - + yuzu has not been compiled with OpenGL support. yuzu har ikke blitt kompilert med OpenGL-støtte. + - Error while initializing OpenGL! Feil under initialisering av OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Det kan hende at GPU-en din ikke støtter OpenGL, eller at du ikke har den nyeste grafikkdriveren. - + Error while initializing OpenGL 4.6! Feil under initialisering av OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Det kan hende at GPU-en din ikke støtter OpenGL 4.6, eller at du ikke har den nyeste grafikkdriveren.<br><br>GL-renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Det kan hende at GPU-en din ikke støtter én eller flere nødvendige OpenGL-utvidelser. Vennligst sørg for at du har den nyeste grafikkdriveren.<br><br>GL-renderer: <br>%1<br><br>Ikke-støttede utvidelser:<br>%2 @@ -5621,12 +5746,12 @@ Vil du overstyre dette og lukke likevel? Start Game - + Start Spill Start Game without Custom Configuration - + Star Spill Uten Tilpasset Konfigurasjon @@ -5641,7 +5766,7 @@ Vil du overstyre dette og lukke likevel? Open Transferable Pipeline Cache - + Åpne Overførbar Rørledningsbuffer @@ -5665,117 +5790,122 @@ Vil du overstyre dette og lukke likevel? - Remove OpenGL Pipeline Cache - + Remove Cache Storage + Fjern Hurtiglagring - Remove Vulkan Pipeline Cache - + Remove OpenGL Pipeline Cache + Fjer OpenGL Rørledningsbuffer - - Remove All Pipeline Caches - + + Remove Vulkan Pipeline Cache + Fjern Vulkan Rørledningsbuffer + Remove All Pipeline Caches + Fjern Alle Rørledningsbuffere + + + Remove All Installed Contents Fjern All Installert Innhold - + Dump RomFS Dump RomFS - + Dump RomFS to SDMC - + Dump RomFS til SDMC - + Copy Title ID to Clipboard Kopier Tittel-ID til Utklippstavle - + Navigate to GameDB entry Naviger til GameDB-oppføring - - - Create Shortcut - - + Create Shortcut + lag Snarvei + + + Add to Desktop - + Legg Til På Skrivebordet - + Add to Applications Menu - + Legg Til Applikasjonsmenyen - + Properties Egenskaper - + Scan Subfolders Skann Undermapper - + Remove Game Directory Fjern Spillmappe - + ▲ Move Up ▲ Flytt Opp - + ▼ Move Down ▼ Flytt Ned - + Open Directory Location Åpne Spillmappe - + Clear Fjern - + Name Navn - + Compatibility Kompatibilitet - + Add-ons Tilleggsprogrammer - + File type Fil Type - + Size Størrelse @@ -5785,12 +5915,12 @@ Vil du overstyre dette og lukke likevel? Ingame - + i Spillet Game starts, but crashes or major glitches prevent it from being completed. - + Spillet starter, men krasjer eller større feil gjør at det ikke kan fullføres. @@ -5800,17 +5930,17 @@ Vil du overstyre dette og lukke likevel? Game can be played without issues. - + Spillet kan spilles uten problemer. Playable - + Spillbart Game functions with minor graphical or audio glitches and is playable from start to finish. - + Spillet fungerer med mindre grafiske eller lydfeil og kan spilles fra start til slutt. @@ -5820,7 +5950,7 @@ Vil du overstyre dette og lukke likevel? Game loads, but is unable to progress past the Start Screen. - + Spillet lastes inn, men kan ikke gå videre forbi startskjermen. @@ -5846,7 +5976,7 @@ Vil du overstyre dette og lukke likevel? GameListPlaceholder - + Double-click to add a new folder to the game list Dobbeltrykk for å legge til en ny mappe i spillisten @@ -5859,14 +5989,14 @@ Vil du overstyre dette og lukke likevel? %1 of %n resultat%1 of %n resultater - + Filter: Filter: - + Enter pattern to filter - + Angi mønster for å filtrere @@ -5874,22 +6004,22 @@ Vil du overstyre dette og lukke likevel? Create Room - + Opprett Rom Room Name - + Romnavn Preferred Game - + Foretrukket spill Max Players - + Maks Spillere @@ -5899,42 +6029,42 @@ Vil du overstyre dette og lukke likevel? (Leave blank for open game) - + (La stå tomt for åpent spill) Password - + Passord Port - + Port Room Description - + Rombeskrivelse Load Previous Ban List - + Last inn tidligere forbudsliste Public - + Offentlig Unlisted - + Ikke oppført Host Room - + Bli vertskap for et rom @@ -5948,18 +6078,18 @@ Vil du overstyre dette og lukke likevel? Failed to announce the room to the public lobby. In order to host a room publicly, you must have a valid yuzu account configured in Emulation -> Configure -> Web. If you do not want to publish a room in the public lobby, then select Unlisted instead. Debug Message: - + Kunne ikke annonsere rommet til den offentlige lobbyen. For å være vert for et rom offentlig, må du ha en gyldig yuzu-konto konfigurert i Emulering -> Konfigurer -> Web. Hvis du ikke vil publisere et rom i den offentlige lobbyen, velger du ikke oppført i stedet. +Feilmelding: Hotkeys - + Audio Mute/Unmute - + Lyd av/på - @@ -5981,113 +6111,114 @@ Debug Message: + Main Window - - - - - Audio Volume Down - + Hovedvindu - Audio Volume Up - + Audio Volume Down + Lydvolum Ned + Audio Volume Up + Lydvolum Opp + + + Capture Screenshot Ta Skjermbilde - - - Change Adapting Filter - - - Change Docked Mode - + Change Adapting Filter + Endre tilpasningsfilter - Change GPU Accuracy - + Change Docked Mode + Endre forankret modus - Continue/Pause Emulation - + Change GPU Accuracy + Endre GPU-nøyaktighet - Exit Fullscreen - + Continue/Pause Emulation + Fortsett/Pause Emuleringen - Exit yuzu - + Exit Fullscreen + Avslutt fullskjerm + Exit yuzu + Avslutt yuzu + + + Fullscreen Fullskjerm - + Load File Last inn Fil - - - Load/Remove Amiibo - - - Restart Emulation - + Load/Remove Amiibo + Last/Fjern Amiibo - Stop Emulation - + Restart Emulation + Omstart Emuleringen - TAS Record - + Stop Emulation + Stopp Emuleringen - TAS Reset - + TAS Record + Spill inn TAS - TAS Start/Stop - + TAS Reset + Tilbakestill TAS - Toggle Filter Bar - + TAS Start/Stop + Start/Stopp TAS - Toggle Framerate Limit - + Toggle Filter Bar + Veksle Filterlinje - Toggle Mouse Panning - + Toggle Framerate Limit + Veksle Bildefrekvensgrense + Toggle Mouse Panning + Veksle Muspanorering + + + Toggle Status Bar - + Veksle Statuslinje @@ -6100,7 +6231,7 @@ Debug Message: Installing an Update or DLC will overwrite the previously installed one. - + Installering av en oppdatering eller DLC vil overskrive den tidligere installerte. @@ -6166,53 +6297,53 @@ Debug Message: Public Room Browser - + Nettleser for offentlige rom Nickname - + Kallenavn Filters - + Filtre Search - + Søk Games I Own - + Spill Jeg Eier Hide Empty Rooms - + Gjem Tomme Rom Hide Full Rooms - + Gjem Fulle Rom Refresh Lobby - + Oppdater Lobbyen Password Required to Join - + Passord Kreves For Å Delta Password: - + Passord: @@ -6222,27 +6353,27 @@ Debug Message: Room Name - + Romnavn Preferred Game - + Foretrukket spill Host - + Vert Refreshing - + Oppdaterer Refresh List - + Oppdater liste @@ -6280,7 +6411,7 @@ Debug Message: &Debugging - + Feilsøking (&D) @@ -6315,7 +6446,7 @@ Debug Message: &Multiplayer - + Flerspiller (&M) @@ -6340,12 +6471,12 @@ Debug Message: L&oad File... - + Last inn fil... (&O) Load &Folder... - + Last inn mappe (&F) @@ -6370,12 +6501,12 @@ Debug Message: &About yuzu - + Om yuzu (&A) Single &Window Mode - + Énvindusmodus (&W) @@ -6385,7 +6516,7 @@ Debug Message: Display D&ock Widget Headers - + Vis Overskrifter for Dock Widget (&O) @@ -6405,27 +6536,27 @@ Debug Message: &Browse Public Game Lobby - + Bla gjennom den offentlige spillobbyen (&B) &Create Room - + Opprett Rom (&C) &Leave Room - + Forlat Rommet (&L) &Direct Connect to Room - + Direkte Tilkobling Til Rommet (&D) &Show Current Room - + Vis nåværende rom (&S) @@ -6435,52 +6566,52 @@ Debug Message: &Restart - + Omstart (&R) Load/Remove &Amiibo... - + Last/Fjern Amiibo (&A) &Report Compatibility - + Rapporter kompatibilitet (&R) Open &Mods Page - + Åpne Modifikasjonssiden (&M) Open &Quickstart Guide - + Åpne Hurtigstartsguiden (&Q) &FAQ - + &FAQ Open &yuzu Folder - + Åpne &yuzu Mappen &Capture Screenshot - + Ta Skjermbilde (&C) &Configure TAS... - + Konfigurer TAS (&C) Configure C&urrent Game... - + Konfigurer Gjeldende Spill (&U) @@ -6490,12 +6621,12 @@ Debug Message: &Reset - + Tilbakestill (&R) R&ecord - + Spill inn (%E) @@ -6503,7 +6634,7 @@ Debug Message: &MicroProfile - + Mikroprofil (&M) @@ -6511,48 +6642,48 @@ Debug Message: Moderation - + Moderasjon Ban List - + Utestengelsesliste Refreshing - + Oppdaterer Unban - + Fjern Utestengning Subject - + Emne Type - + Type Forum Username - + Forum Brukernavn IP Address - + IP Adresse Refresh - + Oppdater @@ -6560,17 +6691,17 @@ Debug Message: Current connection status - + Gjeldende tilkoblingsstatus Not Connected. Click here to find a room! - + Ikke tilkoblet. Klikk her for å finne et rom! Not Connected - + Ikke Tilkoblet @@ -6580,7 +6711,7 @@ Debug Message: New Messages Received - + Nye meldinger mottatt @@ -6591,7 +6722,8 @@ Debug Message: Failed to update the room information. Please check your Internet connection and try hosting the room again. Debug Message: - + Kunne ikke oppdatere rominformasjonen. Kontroller Internett-tilkoblingen din og prøv å være vert for rommet på nytt. +Feilsøkingsmelding: @@ -6599,135 +6731,138 @@ Debug Message: Username is not valid. Must be 4 to 20 alphanumeric characters. - + Brukernavnet er ikke gyldig. Må være mellom 4 og 20 alfanumeriske karakterer. Room name is not valid. Must be 4 to 20 alphanumeric characters. - + Romnavnet er ikke gyldig. Må være mellom 4 og 20 alfanumeriske karakterer. Username is already in use or not valid. Please choose another. - + Brukernavnet er i bruk eller ikke gyldig. Vennligs velg et annet. IP is not a valid IPv4 address. - + IP er ikke en gyldig IPv4 adresse. Port must be a number between 0 to 65535. - + Porten må være et nummer mellom 0 og 65535. You must choose a Preferred Game to host a room. If you do not have any games in your game list yet, add a game folder by clicking on the plus icon in the game list. - + Du må velge et foretrukket spill for å være vert for et rom. Hvis du ikke har noen spill i spillelisten din ennå, kan du legge til en spillmappe ved å klikke på plussikonet i spillelisten. Unable to find an internet connection. Check your internet settings. - + Finner ikke en internettforbindelse. Sjekk internettinnstillingene dine. Unable to connect to the host. Verify that the connection settings are correct. If you still cannot connect, contact the room host and verify that the host is properly configured with the external port forwarded. - + Kan ikke koble til verten. Kontroller at tilkoblingsinnstillingene er riktige. Hvis du fortsatt ikke kan koble til, kontakt romverten og kontroller at verten er riktig konfigurert med den eksterne porten videresendt. Unable to connect to the room because it is already full. - + Kan ikke koble til rommet fordi det allerede er fullt. Creating a room failed. Please retry. Restarting yuzu might be necessary. - + Opprettelse av rom mislyktes. Vennligst prøv på nytt. Det kan være nødvendig å starte yuzu på nytt. The host of the room has banned you. Speak with the host to unban you or try a different room. - + Verten for rommet har utestengt deg. Snakk med verten for å oppheve utestengingen eller prøv et annet rom. Version mismatch! Please update to the latest version of yuzu. If the problem persists, contact the room host and ask them to update the server. - + Feil versjon! Vennligst oppdater til den nyeste versjonen av yuzu. Hvis problemet vedvarer, kontakt romverten og be dem om å oppdatere serveren. Incorrect password. - + Feil passord. An unknown error occurred. If this error continues to occur, please open an issue - + Det oppstod en ukjent feil. Hvis denne feilen fortsetter å oppstå, vennligst åpne et problem. Connection to room lost. Try to reconnect. - + Forbindelsen til rommet er brutt. Prøv å koble til igjen. You have been kicked by the room host. - + Du har blitt sparket av romverten. IP address is already in use. Please choose another. - + IP-adressen er allerede i bruk. Vennligst velg en annen. You do not have enough permission to perform this action. - + Du har ikke tilstrekkelig tillatelse til å utføre denne handlingen. The user you are trying to kick/ban could not be found. They may have left the room. - + Brukeren du prøver å utestenge ble ikke funnet. +De kan ha forlatt rommet. No valid network interface is selected. Please go to Configure -> System -> Network and make a selection. - + Ingen gyldig nettverksgrensesnitt er valgt. +Gå til Konfigurer -> System -> Nettverk og gjør et valg. Game already running - + Spillet kjører allerede Joining a room when the game is already running is discouraged and can cause the room feature not to work correctly. Proceed anyway? - + Å bli med i et rom når spillet allerede er i gang frarådes og kan føre til at romfunksjonen ikke fungerer som den skal. +Fortsette likevel? Leave Room - + Forlat Rommet You are about to close the room. Any network connections will be closed. - + Du er i ferd med å lukke rommet. Eventuelle nettverkstilkoblinger vil bli stengt. Disconnect - + Koble Fra You are about to leave the room. Any network connections will be closed. - + Du er i ferd med å forlate rommet. Eventuelle nettverkstilkoblinger vil bli stengt. @@ -6774,7 +6909,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE START/PAUS @@ -6784,17 +6919,17 @@ p, li { white-space: pre-wrap; } %1 is not playing a game - + %1 spiller ikke et spill %1 is playing %2 - + %1 spiller %2 Not playing a game - + Spiller ikke et spill @@ -6824,21 +6959,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6846,8 +6981,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [ikke satt] @@ -6862,10 +6997,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Akse %1%2 @@ -6879,174 +7014,174 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [ukjent] - - + + Left Venstre - - + + Right Høyre - - + + Down Ned - - + + Up Opp - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Start - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle Sirkel - + Cross Kryss - + Square Firkant - + Triangle Trekant - + Share Del - + Options Instillinger - + [undefined] [udefinert] %1%2 - + %1%2 - + [invalid] [ugyldig] @@ -7054,27 +7189,25 @@ p, li { white-space: pre-wrap; } %1%2Hat %3 - + %1%2Hat %3 - - - + %1%2Axis %3 %1%2Akse %3 - + %1%2Axis %3,%4,%5 %1%2Akse %3,%4,%5 - + %1%2Motion %3 %1%2Bevegelse %3 @@ -7086,108 +7219,114 @@ p, li { white-space: pre-wrap; } - + [unused] [ubrukt] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L - + Venstre Stikke - + Stick R - + Høyre Stikke - + Plus Pluss - + Minus Minus - - + + Home Hjem - + Capture - + Opptak - + Touch Touch - + Wheel Indicates the mouse wheel Hjul - + Backward Bakover - + Forward Fremover - + Task - + oppgave - + Extra Ekstra - + %1%2%3%4 - + %1%2%3%4 - - + + %1%2%3Hat %4 - + %1%2%3Hat %4 - - + + + %1%2%3Axis %4 + %1%2%3Akse %4 + + + + %1%2%3Button %4 - + %1%2%3Knapp %4 @@ -7195,22 +7334,22 @@ p, li { white-space: pre-wrap; } Amiibo Settings - + Amiibo Innstillinger Amiibo Info - + Amiibo Info Series - + Serie Type - + TypeType @@ -7220,52 +7359,52 @@ p, li { white-space: pre-wrap; } Amiibo Data - + Amiibo Data Custom Name - + Tilpasset Navn Owner - + Eier Creation Date - + Skapelsesdato dd/MM/yyyy - + dd/MM/yyyy Modification Date - + Modifiseringsdato dd/MM/yyyy - + dd/MM/yyyy Game Data - + Spilldata Game Id - + Spillid Mount Amiibo - + Monter Amiibo @@ -7275,32 +7414,32 @@ p, li { white-space: pre-wrap; } File Path - + Filbane No game data present - + Ingen spilldata til stede The following amiibo data will be formatted: - + Følgende amiibo-data vil bli formatert: The following game data will removed: - + Følgende spilldata vil bli fjernet: Set nickname and owner: - + Angi kallenavn og eier: Do you wish to restore this amiibo? - + Ønsker du å gjenopprette denne amiiboen? @@ -7308,7 +7447,7 @@ p, li { white-space: pre-wrap; } Controller Applet - + Applet for kontroller @@ -7573,7 +7712,8 @@ Vennligst prøv igjen eller kontakt programmets utvikler. An error occurred on %1 at %2. Please try again or contact the developer of the software. - + Det oppstod en feil på %1 ved %2. +Prøv igjen eller kontakt utvikleren av programvaren. @@ -7605,73 +7745,73 @@ Please try again or contact the developer of the software. Brukere - + Profile Creator - + Profilskaper - - + + Profile Selector Profilvelger - + Profile Icon Editor - + Redigering av profilikon - + Profile Nickname Editor - + Redigering av kallenavn - + Who will receive the points? - + Hvem vil motta poengene? - + Who is using Nintendo eShop? - + Hvem bruker Nintendo eShop? - + Who is making this purchase? - + Hvem foretar dette kjøpet? - + Who is posting? - + Hvem legger ut? - + Select a user to link to a Nintendo Account. - + Velg en bruker for å koble til en Nintendo-konto. - + Change settings for which user? - + Endre innstillinger for hvilken bruker? - + Format data for which user? - + Formater data for hvilken bruker? - + Which user will be transferred to another console? - + Hvilken bruker vil bli overført til en annen konsoll? - + Send save data for which user? - + Send lagrede data for hvilken bruker? - + Select a user: Velg en bruker: @@ -7726,7 +7866,7 @@ p, li { white-space: pre-wrap; } Call stack - + Anropsstabel @@ -7734,12 +7874,12 @@ p, li { white-space: pre-wrap; } [%1] %2 - + [%1] %2 waited by no thread - + ventet på ingen tråd @@ -7747,7 +7887,7 @@ p, li { white-space: pre-wrap; } runnable - + kjørbar @@ -7772,17 +7912,17 @@ p, li { white-space: pre-wrap; } waiting for condition variable - + venter på tilstandsvariabel waiting for address arbiter - + venter på adresseforhandler waiting for suspend resume - + venter på gjenopptakelse av suspensjon @@ -7792,12 +7932,12 @@ p, li { white-space: pre-wrap; } initialized - + initialisert terminated - + terminert @@ -7827,7 +7967,7 @@ p, li { white-space: pre-wrap; } affinity mask = %1 - + affinitetsmaske = %1 @@ -7842,7 +7982,7 @@ p, li { white-space: pre-wrap; } last running ticks = %1 - + siste løpende tick = %1 @@ -7850,7 +7990,7 @@ p, li { white-space: pre-wrap; } waited by thread - + ventet med tråd @@ -7858,7 +7998,7 @@ p, li { white-space: pre-wrap; } &Wait Tree - + Ventetre (&W) \ No newline at end of file diff --git a/dist/languages/nl.ts b/dist/languages/nl.ts index 7f7ba6da2..b2fe2669e 100644 --- a/dist/languages/nl.ts +++ b/dist/languages/nl.ts @@ -1119,78 +1119,78 @@ Dit zou zowel hun forum gebruikersnaam als hun IP-adres verbannen. yuzu-configuratie - - + + Audio Audio - - + + CPU CPU - + Debug Debug - + Filesystem Bestandssysteem - - + + General Algemeen - - + + Graphics Graphics - + GraphicsAdvanced Geavanceerde Graphics - + Hotkeys Sneltoetsen - - + + Controls Bediening - + Profiles Profielen - + Network Netwerk - - + + System Systeem - + Game List Spellijst - + Web Web @@ -1365,41 +1365,36 @@ Dit zou zowel hun forum gebruikersnaam als hun IP-adres verbannen. - Extended memory layout (8GB DRAM) - Uitgebreide geheugenindeling (8 GB DRAM) - - - Confirm exit while emulation is running Bevestig sluiten terwijl emulatie nog bezig is - + Prompt for user on game boot Vraag aan gebruiker bij opstarten van het spel - + Pause emulation when in background Emulatie onderbreken op de achtergrond - + Hide mouse on inactivity Verberg muis wanneer inactief - + Reset All Settings Reset Alle Instellingen - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Hiermee worden alle instellingen gereset en alle configuraties per game verwijderd. Hiermee worden gamedirectory's, profielen of invoerprofielen niet verwijderd. Doorgaan? @@ -1438,7 +1433,7 @@ Dit zou zowel hun forum gebruikersnaam als hun IP-adres verbannen. - + None Geen @@ -1464,231 +1459,272 @@ Dit zou zowel hun forum gebruikersnaam als hun IP-adres verbannen. + VSync Mode: + VSync-modus: + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + FIFO (VSync) dropt geen frames en vertoont geen scheuren, maar wordt beperkt door de vernieuwingsfrequentie van het scherm. +FIFO Relaxed is vergelijkbaar met FIFO, maar staat scheuren toe wanneer het zich herstelt van een vertraging. +Mailbox kan een lagere latentie hebben dan FIFO en scheurt niet, maar kan frames droppen. +Immediate (geen synchronisatie) presenteert gewoon wat beschikbaar is en kan scheuren vertonen. + + + NVDEC emulation: NVDEC-emulatie: - + No Video Output Geen Video-uitvoer - + CPU Video Decoding CPU Videodecodering - + GPU Video Decoding (Default) GPU Videodecodering (Standaard) - + Fullscreen Mode: Volledig scherm modus: - + Borderless Windowed Randloos Venster - + Exclusive Fullscreen Exclusief Volledig Scherm - + Aspect Ratio: Aspect Ratio: - + Default (16:9) Standaart (16:9) - + Force 4:3 Forceer 4:3 - + Force 21:9 Forceer 21:9 - + Force 16:10 Forceer 16:10 - + Stretch to Window Uitrekken naar Venster - + Resolution: Resolutie: - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [EXPERIMENTEEL] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [EXPERIMENTEEL] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] 1.5X (1080p/1620p) [EXPERIMENTEEL] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) 7X (5040p/7560p) - + 8X (5760p/8640p) 8X (5760p/8640p) - + Window Adapting Filter: Window Adapting Filter: - + Nearest Neighbor Nearest Neighbor - + Bilinear Bilinear - + Bicubic Bicubic - + Gaussian Gaussian - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: Antialiasing-methode: - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness Gebruik globale FSR-scherpte - + Set FSR Sharpness Stel FSR-scherpte in - + FSR Sharpness: FSR-scherpte: - + 100% 100% - - + + Use global background color Gebruik globale achtergrondkleur - + Set background color: Gebruik achtergrondkleur: - + Background Color: Achtergrondkleur: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (Assembly Shaders, alleen NVIDIA) - + SPIR-V (Experimental, Mesa Only) SPIR-V (Experimenteel, alleen Mesa) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + Uit + + + + VSync Off + VSync Uit + + + + Recommended + Aanbevolen + + + + On + Aan + + + + VSync On + VSync Aan + ConfigureGraphicsAdvanced @@ -1713,107 +1749,134 @@ Dit zou zowel hun forum gebruikersnaam als hun IP-adres verbannen. Nauwkeurigheidsniveau: - + + ASTC recompression: + + + + + Uncompressed (Best quality) + + + + + BC1 (Low quality) + + + + + BC3 (Medium quality) + + + + + Enable asynchronous presentation (Vulkan only) + Schakel asynchrone presentatie in (alleen Vulkan) + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. Werkt op de achtergrond terwijl er wordt gewacht op grafische opdrachten om te voorkomen dat de GPU zijn kloksnelheid verlaagt. - + Force maximum clocks (Vulkan only) Forceer maximale klokken (alleen Vulkan) - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync voorkomt dat het scherm beweegt, maar sommige grafische kaarten geven lagere prestaties wanneer VSync is ingeschakeld. Hou het aan als je geen prestatie verschil merkt. - - - - Use VSync - Gebruik VSync - - - + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. Maakt asynchrone ASTC-textuurdecodering mogelijk, waardoor de laadtijd minder stottert. Deze functie is experimenteel. - + Decode ASTC textures asynchronously (Hack) Decodeer ASTC-texturen asynchroon (Hack) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + Gebruikt reactieve flushing in plaats van predictieve flushing. Maakt een nauwkeuriger synchronisatie van het geheugen mogelijk. + + + + Enable Reactive Flushing + Schakel Reactive Flushing In + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Laat shaders asynchroon compileren, wat haperingen kunnen verminderen. Deze instelling is experimenteel. - + Use asynchronous shader building (Hack) Gebruik asynchrone shaderbouw (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Schakelt Snelle GPU-tijd in. Deze optie forceert de meeste games om op hun hoogste native resolutie te draaien. - + Use Fast GPU Time (Hack) Gebruik Snelle GPU-tijd (Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - Schakelt pessimistische bufferschoonmaakacties in. Deze optie forceert het schoonmaken van ongewijzigde buffers, wat prestaties kan kosten. - - - - Use pessimistic buffer flushes (Hack) - Gebruik pessimistische bufferleegmaakacties (Hack) - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. Schakelt GPU-leverancier-specifieke pijplijn-cache in. Deze optie kan de laadtijd van shaders aanzienlijk verbeteren in gevallen waarin het Vulkan-stuurprogramma de pijplijncachebestanden niet intern opslaat. - + Use Vulkan pipeline cache Gebruik Vulkan-pijplijn-cache - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + Schakel compute pipelines in, vereist door sommige games. Deze instelling bestaat alleen voor Intel-eigen drivers, en kan crashen indien ingeschakeld. +Compute pipelines is altijd ingeschakeld bij alle andere drivers. + + + + Enable Compute Pipelines (Intel Vulkan only) + Schakel Compute Pipelines in (alleen Intel Vulkan) + + + Anisotropic Filtering: Anisotrope Filtering: - + Automatic Automatisch - + Default Standaard - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1846,70 +1909,65 @@ Dit zou zowel hun forum gebruikersnaam als hun IP-adres verbannen. Standaard Herstellen - + Action Actie - + Hotkey Sneltoets - + Controller Hotkey Controller-sneltoets - - - + + + Conflicting Key Sequence Ongeldige Toetsvolgorde - - + + The entered key sequence is already assigned to: %1 De ingevoerde toetsencombinatie is al in gebruik door: %1 - - Home+%1 - Home+%1 - - - + [waiting] [aan het wachten] - + Invalid Ongeldig - + Restore Default Standaard Herstellen - + Clear Wis - + Conflicting Button Sequence Conflicterende Knoppencombinatie - + The default button sequence is already assigned to: %1 De standaard knoppencombinatie is al toegewezen aan: %1 - + The default key sequence is already assigned to: %1 De ingevoerde toetsencombinatie is al in gebruik door: %1 @@ -2201,7 +2259,7 @@ Dit zou zowel hun forum gebruikersnaam als hun IP-adres verbannen. - + Configure Configureer @@ -2250,30 +2308,40 @@ Dit zou zowel hun forum gebruikersnaam als hun IP-adres verbannen. Enable direct JoyCon driver - Schakel JoyCon-stuurprogramma in + Schakel JoyCon-driver in Enable direct Pro Controller driver [EXPERIMENTAL] - Schakel Pro Controller-stuurprogramma in [EXPERIMENTEEL] + Schakel Pro Controller-driver in [EXPERIMENTEEL] - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + Maakt onbeperkt gebruik van dezelfde Amiibo mogelijk in spellen die je anders zou beperken tot één gebruik. + + + + Use random Amiibo ID + Gebruik willekeurige Amiibo-ID + + + Enable mouse panning Schakel muispanning in - + Mouse sensitivity Muisgevoeligheid - + % % - + Motion / Touch Beweging / Touch @@ -2385,7 +2453,7 @@ Dit zou zowel hun forum gebruikersnaam als hun IP-adres verbannen. - + Left Stick Linker Stick @@ -2479,14 +2547,14 @@ Dit zou zowel hun forum gebruikersnaam als hun IP-adres verbannen. - + L L - + ZL ZL @@ -2505,7 +2573,7 @@ Dit zou zowel hun forum gebruikersnaam als hun IP-adres verbannen. - + Plus Plus @@ -2518,15 +2586,15 @@ Dit zou zowel hun forum gebruikersnaam als hun IP-adres verbannen. - - + + R R - + ZR ZR @@ -2583,241 +2651,247 @@ Dit zou zowel hun forum gebruikersnaam als hun IP-adres verbannen. - + Right Stick Rechter Stick - - - - + + + + Clear Wis - - - - - + + + + + [not set] [niet ingesteld] - - + + + Invert button Knop omkeren - - + + Toggle button Schakel-knop - + Turbo button Turbo-knop - - + + Invert axis Spiegel as - - - + + + Set threshold Stel drempel in - - + + Choose a value between 0% and 100% Kies een waarde tussen 0% en 100% - + Toggle axis Schakel as - + Set gyro threshold Stel gyro-drempel in - + + Calibrate sensor + Kalibreer sensor + + + Map Analog Stick Analoge Stick Toewijzen - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Nadat je op OK hebt gedrukt, beweeg je de joystick eerst horizontaal en vervolgens verticaal. Om de assen om te keren, beweeg je de joystick eerst verticaal en vervolgens horizontaal. - + Center axis Midden as - - + + Deadzone: %1% Deadzone: %1% - - + + Modifier Range: %1% Modificatorbereik: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Twee Joycons - + Left Joycon Linker Joycon - + Right Joycon Rechter Joycon - + Handheld Handheld - + GameCube Controller GameCube-controller - + Poke Ball Plus Poke Ball Plus - + NES Controller NES-controller - + SNES Controller SNES-controller - + N64 Controller N64-controller - + Sega Genesis Sega Genesis - + Start / Pause Begin / Onderbreken - + Z Z - + Control Stick Control Stick - + C-Stick C-Stick - + Shake! Schud! - + [waiting] [aan het wachten] - + New Profile Nieuw Profiel - + Enter a profile name: Voer een profielnaam in: - - + + Create Input Profile Maak Invoerprofiel - + The given profile name is not valid! De ingevoerde profielnaam is niet geldig! - + Failed to create the input profile "%1" Kon invoerprofiel "%1" niet maken - + Delete Input Profile Verwijder Invoerprofiel - + Failed to delete the input profile "%1" Kon invoerprofiel "%1" niet verwijderen - + Load Input Profile Laad Invoerprofiel - + Failed to load the input profile "%1" Kon invoerprofiel "%1" niet laden - + Save Input Profile Sla Invoerprofiel op - + Failed to save the input profile "%1" Kon invoerprofiel "%1" niet opslaan @@ -3072,47 +3146,47 @@ Om de assen om te keren, beweeg je de joystick eerst verticaal en vervolgens hor Ontwikkelaar - + Add-Ons Add-Ons - + General Algemeen - + System Systeem - + CPU CPU - + Graphics Graphics - + Adv. Graphics Adv. Graphics - + Audio Audio - + Input Profiles Invoerprofielen - + Properties Eigenschappen @@ -3833,7 +3907,12 @@ UUID: %2 Apparaatnaam - + + Unsafe extended memory layout (8GB DRAM) + Onveilige uitgebreide geheugenindeling (8GB DRAM) + + + System settings are available only when game is not running. Systeeminstellingen zijn enkel toegankelijk wanneer er geen game draait. @@ -4529,555 +4608,560 @@ Versleep punten om de positie te veranderen, of dubbelklik op tabelcellen om waa GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Annonieme gegevens worden verzameld</a> om yuzu te helpen verbeteren. <br/><br/> Zou je jouw gebruiksgegevens met ons willen delen? - + Telemetry Telemetrie - + Broken Vulkan Installation Detected Beschadigde Vulkan-installatie gedetecteerd - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. Vulkan-initialisatie mislukt tijdens het opstarten.<br><br>Klik <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>hier voor instructies om het probleem op te lossen</a>. - + Loading Web Applet... Web Applet Laden... - - + + Disable Web Applet Schakel Webapplet uit - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Het uitschakelen van de webapplet kan leiden tot ongedefinieerd gedrag en mag alleen gebruikt worden met Super Mario 3D All-Stars. Weet je zeker dat je de webapplet wilt uitschakelen? (Deze kan opnieuw worden ingeschakeld in de Debug-instellingen). - + The amount of shaders currently being built Het aantal shaders dat momenteel wordt gebouwd - + The current selected resolution scaling multiplier. De huidige geselecteerde resolutieschaalmultiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Huidige emulatiesnelheid. Waarden hoger of lager dan 100% geven aan dat de emulatie sneller of langzamer werkt dan een Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Hoeveel beelden per seconde het spel momenteel weergeeft. Dit varieert van spel tot spel en van scène tot scène. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tijd die nodig is om een Switch-beeld te emuleren, beeldbeperking of v-sync niet meegerekend. Voor emulatie op volle snelheid mag dit maximaal 16,67 ms zijn. - + &Clear Recent Files &Wis Recente Bestanden - + Emulated mouse is enabled Geëmuleerde muis is ingeschakeld - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. Echte muisinvoer en muispanning zijn niet compatibel. Schakel de geëmuleerde muis uit in de geavanceerde invoerinstellingen om muispanning mogelijk te maken. - + &Continue &Doorgaan - + &Pause &Onderbreken - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu is een spel aan het uitvoeren - + Warning Outdated Game Format Waarschuwing Verouderd Spelformaat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Je gebruikt het gedeconstrueerde ROM-mapformaat voor dit spel, wat een verouderd formaat is dat vervangen is door andere zoals NCA, NAX, XCI, of NSP. Deconstructed ROM-mappen missen iconen, metadata, en update-ondersteuning.<br><br>Voor een uitleg van de verschillende Switch-formaten die yuzu ondersteunt,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'> bekijk onze wiki</a>. Dit bericht wordt niet meer getoond. - - + + Error while loading ROM! Fout tijdens het laden van een ROM! - + The ROM format is not supported. Het ROM-formaat wordt niet ondersteund. - + An error occurred initializing the video core. Er is een fout opgetreden tijdens het initialiseren van de videokern. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu is een fout tegengekomen tijdens het uitvoeren van de videokern. Dit wordt meestal veroorzaakt door verouderde GPU-drivers, inclusief geïntegreerde. Zie het logboek voor meer details. Voor meer informatie over toegang tot het log, zie de volgende pagina: <a href='https://yuzu-emu.org/help/reference/log-files/'>Hoe upload je het logbestand</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Fout tijdens het laden van ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Volg de <a href='https://yuzu-emu.org/help/quickstart/'>yuzu snelstartgids</a> om je bestanden te redumpen.<br>Je kunt de yuzu-wiki</a>of de yuzu-Discord</a> raadplegen voor hulp. - + An unknown error occurred. Please see the log for more details. Een onbekende fout heeft plaatsgevonden. Kijk in de log voor meer details. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Software sluiten... - + Save Data Save Data - + Mod Data Mod Data - + Error Opening %1 Folder Fout tijdens het openen van %1 map - - + + Folder does not exist! Map bestaat niet! - + Error Opening Transferable Shader Cache Fout bij het openen van overdraagbare shader-cache - + Failed to create the shader cache directory for this title. Kon de shader-cache-map voor dit spel niet aanmaken. - + Error Removing Contents Fout bij het verwijderen van de inhoud - + Error Removing Update Fout bij het verwijderen van de update - + Error Removing DLC Fout bij het verwijderen van DLC - + Remove Installed Game Contents? Geïnstalleerde Spelinhoud Verwijderen? - + Remove Installed Game Update? Geïnstalleerde Spel-update Verwijderen? - + Remove Installed Game DLC? Geïnstalleerde Spel-DLC Verwijderen? - + Remove Entry Verwijder Invoer - - - - - - + + + + + + Successfully Removed Met Succes Verwijderd - + Successfully removed the installed base game. Het geïnstalleerde basisspel is succesvol verwijderd. - + The base game is not installed in the NAND and cannot be removed. Het basisspel is niet geïnstalleerd in de NAND en kan niet worden verwijderd. - + Successfully removed the installed update. De geïnstalleerde update is succesvol verwijderd. - + There is no update installed for this title. Er is geen update geïnstalleerd voor dit spel. - + There are no DLC installed for this title. Er is geen DLC geïnstalleerd voor dit spel. - + Successfully removed %1 installed DLC. %1 geïnstalleerde DLC met succes verwijderd. - + Delete OpenGL Transferable Shader Cache? Overdraagbare OpenGL-shader-cache Verwijderen? - + Delete Vulkan Transferable Shader Cache? Overdraagbare Vulkan-shader-cache Verwijderen? - + Delete All Transferable Shader Caches? Alle Overdraagbare Shader-caches Verwijderen? - + Remove Custom Game Configuration? Aangepaste Spelconfiguratie Verwijderen? - + + Remove Cache Storage? + + + + Remove File Verwijder Bestand - - + + Error Removing Transferable Shader Cache Fout bij het verwijderen van Overdraagbare Shader-cache - - + + A shader cache for this title does not exist. Er bestaat geen shader-cache voor dit spel. - + Successfully removed the transferable shader cache. De overdraagbare shader-cache is verwijderd. - + Failed to remove the transferable shader cache. Kon de overdraagbare shader-cache niet verwijderen. - + Error Removing Vulkan Driver Pipeline Cache Fout bij het verwijderen van Pijplijn-cache van Vulkan-driver - + Failed to remove the driver pipeline cache. Kon de pijplijn-cache van de driver niet verwijderen. - - + + Error Removing Transferable Shader Caches Fout bij het verwijderen van overdraagbare shader-caches - + Successfully removed the transferable shader caches. De overdraagbare shader-caches zijn verwijderd. - + Failed to remove the transferable shader cache directory. Kon de overdraagbare shader-cache-map niet verwijderen. - - + + Error Removing Custom Configuration Fout bij het verwijderen van aangepaste configuratie - + A custom configuration for this title does not exist. Er bestaat geen aangepaste configuratie voor dit spel. - + Successfully removed the custom game configuration. De aangepaste spelconfiguratie is verwijderd. - + Failed to remove the custom game configuration. Kon de aangepaste spelconfiguratie niet verwijderen. - - + + RomFS Extraction Failed! RomFS-extractie Mislukt! - + There was an error copying the RomFS files or the user cancelled the operation. Er is een fout opgetreden bij het kopiëren van de RomFS-bestanden of de gebruiker heeft de bewerking geannuleerd. - + Full Volledig - + Skeleton Skelet - + Select RomFS Dump Mode Selecteer RomFS-dumpmodus - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Selecteer hoe je de RomFS gedumpt wilt hebben.<br>Volledig zal alle bestanden naar de nieuwe map kopiëren, terwijl <br>Skelet alleen de mapstructuur zal aanmaken. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Er is niet genoeg vrije ruimte op %1 om de RomFS uit te pakken. Maak ruimte vrij of kies een andere dumpmap bij Emulatie > Configuratie > Systeem > Bestandssysteem > Dump Root. - + Extracting RomFS... RomFS uitpakken... - - + + Cancel Annuleren - + RomFS Extraction Succeeded! RomFS-extractie Geslaagd! - + The operation completed successfully. De bewerking is succesvol voltooid. - - - - - + + + + + Create Shortcut Maak Snelkoppeling - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Dit maakt een snelkoppeling naar de huidige AppImage. Dit werkt mogelijk niet goed als je een update uitvoert. Doorgaan? - + Cannot create shortcut on desktop. Path "%1" does not exist. Kan geen snelkoppeling op het bureaublad maken. Pad "%1" bestaat niet. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Kan geen snelkoppeling maken in toepassingen menu. Pad "%1" bestaat niet en kan niet worden aangemaakt. - + Create Icon Maak Icoon - + Cannot create icon file. Path "%1" does not exist and cannot be created. Kan geen icoonbestand maken. Pad "%1" bestaat niet en kan niet worden aangemaakt. - + Start %1 with the yuzu Emulator Voer %1 uiit met de yuzu-emulator - + Failed to create a shortcut at %1 Er is geen snelkoppeling gemaakt op %1 - + Successfully created a shortcut to %1 Succesvol een snelkoppeling naar %1 gemaakt - + Error Opening %1 Fout bij openen %1 - + Select Directory Selecteer Map - + Properties Eigenschappen - + The game properties could not be loaded. De speleigenschappen kunnen niet geladen worden. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Executable (%1);;Alle Bestanden (*.*) - + Load File Laad Bestand - + Open Extracted ROM Directory Open Uitgepakte ROM-map - + Invalid Directory Selected Ongeldige Map Geselecteerd - + The directory you have selected does not contain a 'main' file. De map die je hebt geselecteerd bevat geen 'main'-bestand. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Installeerbaar Switch-bestand (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Installeer Bestanden - + %n file(s) remaining %n bestand(en) resterend%n bestand(en) resterend - + Installing file "%1"... Bestand "%1" Installeren... - - + + Install Results Installeerresultaten - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Om mogelijke conflicten te voorkomen, raden we gebruikers af om basisgames te installeren op de NAND. Gebruik deze functie alleen om updates en DLC te installeren. - + %n file(s) were newly installed %n bestand(en) zijn recent geïnstalleerd @@ -5085,7 +5169,7 @@ Gebruik deze functie alleen om updates en DLC te installeren. - + %n file(s) were overwritten %n bestand(en) werden overschreven @@ -5093,7 +5177,7 @@ Gebruik deze functie alleen om updates en DLC te installeren. - + %n file(s) failed to install %n bestand(en) niet geïnstalleerd @@ -5101,388 +5185,388 @@ Gebruik deze functie alleen om updates en DLC te installeren. - + System Application Systeemapplicatie - + System Archive Systeemarchief - + System Application Update Systeemapplicatie-update - + Firmware Package (Type A) Filmware-pakket (Type A) - + Firmware Package (Type B) Filmware-pakket (Type B) - + Game Spel - + Game Update Spelupdate - + Game DLC Spel-DLC - + Delta Title Delta Titel - + Select NCA Install Type... Selecteer NCA-installatiesoort... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Selecteer het type titel waarin je deze NCA wilt installeren: (In de meeste gevallen is de standaard "Spel" prima). - + Failed to Install Installatie Mislukt - + The title type you selected for the NCA is invalid. Het soort title dat je hebt geselecteerd voor de NCA is ongeldig. - + File not found Bestand niet gevonden - + File "%1" not found Bestand "%1" niet gevonden - + OK OK - - + + Hardware requirements not met Er is niet voldaan aan de hardwarevereisten - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Je systeem voldoet niet aan de aanbevolen hardwarevereisten. Compatibiliteitsrapportage is uitgeschakeld. - + Missing yuzu Account yuzu-account Ontbreekt - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Om een spelcompatibiliteitstest in te dienen, moet je je yuzu-account koppelen.<br><br/>Om je yuzu-account te koppelen, ga naar Emulatie &gt; Configuratie &gt; Web. - + Error opening URL Fout bij het openen van URL - + Unable to open the URL "%1". Kan de URL "%1" niet openen. - + TAS Recording TAS-opname - + Overwrite file of player 1? Het bestand van speler 1 overschrijven? - + Invalid config detected Ongeldige configuratie gedetecteerd - + Handheld controller can't be used on docked mode. Pro controller will be selected. Handheld-controller kan niet gebruikt worden in docked-modus. Pro controller wordt geselecteerd. - - + + Amiibo Amiibo - - + + The current amiibo has been removed De huidige amiibo is verwijderd - + Error Fout - - + + The current game is not looking for amiibos Het huidige spel is niet op zoek naar amiibo's - + Amiibo File (%1);; All Files (*.*) Amiibo-bestand (%1);; Alle Bestanden (*.*) - + Load Amiibo Laad Amiibo - + Error loading Amiibo data Fout tijdens het laden van de Amiibo-gegevens - + The selected file is not a valid amiibo Het geselecteerde bestand is geen geldige amiibo - + The selected file is already on use Het geselecteerde bestand is al in gebruik - + An unknown error occurred Er is een onbekende fout opgetreden - + Capture Screenshot Leg Schermafbeelding Vast - + PNG Image (*.png) PNG-afbeelding (*.png) - + TAS state: Running %1/%2 TAS-status: %1/%2 In werking - + TAS state: Recording %1 TAS-status: %1 Aan het opnemen - + TAS state: Idle %1/%2 TAS-status: %1/%2 Inactief - + TAS State: Invalid TAS-status: Ongeldig - + &Stop Running &Stop Uitvoering - + &Start &Start - + Stop R&ecording Stop Opname - + R&ecord Opnemen - + Building: %n shader(s) Bouwen: %n shader(s)Bouwen: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Schaal: %1x - + Speed: %1% / %2% Snelheid: %1% / %2% - + Speed: %1% Snelheid: %1% - + Game: %1 FPS (Unlocked) Spel: %1 FPS (Ontgrendeld) - + Game: %1 FPS Game: %1 FPS - + Frame: %1 ms Frame: %1 ms - + GPU NORMAL GPU NORMAAL - + GPU HIGH GPU HOOG - + GPU EXTREME GPU EXTREEM - + GPU ERROR GPU FOUT - + DOCKED DOCKED - + HANDHELD HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST NEAREST - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA GEEN AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE VOLUME: GEDEMPT - + VOLUME: %1% Volume percentage (e.g. 50%) VOLUME: %1% - + Confirm Key Rederivation Bevestig Sleutelherhaling - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5499,37 +5583,37 @@ en maak eventueel back-ups. Dit zal je automatisch gegenereerde sleutelbestanden verwijderen en de sleutelafleidingsmodule opnieuw uitvoeren. - + Missing fuses Missing fuses - + - Missing BOOT0 - BOOT0 Ontbreekt - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main Ontbreekt - + - Missing PRODINFO - PRODINFO Ontbreekt - + Derivation Components Missing Afleidingscomponenten ontbreken - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Encryptiesleutels ontbreken. <br>Volg <a href='https://yuzu-emu.org/help/quickstart/'>de yuzu-snelstartgids</a> om al je sleutels, firmware en spellen te krijgen.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5538,39 +5622,49 @@ Dit kan tot een minuut duren, afhankelijk van de prestaties van je systeem. - + Deriving Keys Sleutels Afleiden - + + System Archive Decryption Failed + Decryptie van Systeemarchief Mislukt + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + Encryptiesleutels zijn mislukt om firmware te decoderen. <br>Volg <a href='https://yuzu-emu.org/help/quickstart/'>de yuzu-snelstartgids</a> om al je sleutels, firmware en games te krijgen. + + + Select RomFS Dump Target Selecteer RomFS-dumpdoel - + Please select which RomFS you would like to dump. Selecteer welke RomFS je zou willen dumpen. - + Are you sure you want to close yuzu? Weet je zeker dat je yuzu wilt sluiten? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Weet je zeker dat je de emulatie wilt stoppen? Alle niet opgeslagen voortgang zal verloren gaan. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5582,44 +5676,44 @@ Wil je toch afsluiten? GRenderWindow - - + + OpenGL not available! OpenGL niet beschikbaar! - + OpenGL shared contexts are not supported. OpenGL gedeelde contexten worden niet ondersteund. - + yuzu has not been compiled with OpenGL support. yuzu is niet gecompileerd met OpenGL-ondersteuning. + - Error while initializing OpenGL! Fout tijdens het initialiseren van OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Je GPU ondersteunt mogelijk geen OpenGL, of je hebt niet de laatste grafische stuurprogramma. - + Error while initializing OpenGL 4.6! Fout tijdens het initialiseren van OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Je GPU ondersteunt mogelijk OpenGL 4.6 niet, of je hebt niet het laatste grafische stuurprogramma.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Je GPU ondersteunt mogelijk een of meer vereiste OpenGL-extensies niet. Zorg ervoor dat je het laatste grafische stuurprogramma hebt.<br><br>GL Renderer:<br>%1<br><br>Ondersteunde extensies:<br>%2 @@ -5678,117 +5772,122 @@ Wil je toch afsluiten? + Remove Cache Storage + + + + Remove OpenGL Pipeline Cache Verwijder OpenGL-pijplijn-cache - + Remove Vulkan Pipeline Cache Verwijder Vulkan-pijplijn-cache - + Remove All Pipeline Caches Verwijder Alle Pijplijn-caches - + Remove All Installed Contents Verwijder Alle Geïnstalleerde Inhoud - + Dump RomFS Dump RomFS - + Dump RomFS to SDMC Dump RomFS naar SDMC - + Copy Title ID to Clipboard Kopiëer Titel-ID naar Klembord - + Navigate to GameDB entry Navigeer naar GameDB-invoer - + Create Shortcut Maak Snelkoppeling - + Add to Desktop Toevoegen aan Bureaublad - + Add to Applications Menu Toevoegen aan menu Toepassingen - + Properties Eigenschappen - + Scan Subfolders Scan Submappen - + Remove Game Directory Verwijder Spelmap - + ▲ Move Up ▲ Omhoog - + ▼ Move Down ▼ Omlaag - + Open Directory Location Open Maplocatie - + Clear Verwijder - + Name Naam - + Compatibility Compatibiliteit - + Add-ons Add-ons - + File type Bestandssoort - + Size Grootte @@ -5859,7 +5958,7 @@ Wil je toch afsluiten? GameListPlaceholder - + Double-click to add a new folder to the game list Dubbel-klik om een ​​nieuwe map toe te voegen aan de spellijst @@ -5872,12 +5971,12 @@ Wil je toch afsluiten? %1 van %n resultaat(en)%1 van %n resultaat(en) - + Filter: Filter: - + Enter pattern to filter Voer patroon in om te filteren @@ -5968,12 +6067,11 @@ Debug-bericht: Hotkeys - + Audio Mute/Unmute Audio Dempen/Dempen Opheffen - @@ -5995,111 +6093,112 @@ Debug-bericht: + Main Window Hoofdvenster - + Audio Volume Down Audiovolume Omlaag - + Audio Volume Up Audiovolume Omhoog - + Capture Screenshot Leg Schermafbeelding Vast - + Change Adapting Filter Wijzig Aanpassingsfilter - + Change Docked Mode Wijzig Docked-modus - + Change GPU Accuracy Wijzig GPU-nauwkeurigheid - + Continue/Pause Emulation Emulatie Doorgaan/Onderbreken - + Exit Fullscreen Volledig Scherm Afsluiten - + Exit yuzu yuzu afsluiten - + Fullscreen Volledig Scherm - + Load File Laad Bestand - + Load/Remove Amiibo Laad/Verwijder Amiibo - + Restart Emulation Herstart Emulatie - + Stop Emulation Stop Emulatie - + TAS Record TAS Opname - + TAS Reset TAS Reset - + TAS Start/Stop TAS Start/Stop - + Toggle Filter Bar Schakel Filterbalk - + Toggle Framerate Limit Schakel Frameratelimiet - + Toggle Mouse Panning Schakel Muispanning - + Toggle Status Bar Schakel Statusbalk @@ -6792,7 +6891,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE START/ONDERBREKEN @@ -6842,21 +6941,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6864,8 +6963,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [niet aangegeven] @@ -6880,10 +6979,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Axis %1%2 @@ -6897,163 +6996,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [onbekend] - - + + Left Links - - + + Right Rechts - - + + Down Omlaag - - + + Up Omhoog - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Start - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle Cirkel - + Cross Kruis - + Square Vierkant - + Triangle Driehoek - + Share Deel - + Options Opties - + [undefined] [ongedefinieerd] @@ -7064,7 +7163,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [ongeldig] @@ -7078,21 +7177,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2As %3 - + %1%2Axis %3,%4,%5 %1%2As %3,%4,%5 - + %1%2Motion %3 %1%2Beweging %3 @@ -7104,106 +7201,112 @@ p, li { white-space: pre-wrap; } - + [unused] [ongebruikt] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L Stick L - + Stick R Stick R - + Plus Plus - + Minus Min - - + + Home Home - + Capture Vastleggen - + Touch Touch - + Wheel Indicates the mouse wheel Wiel - + Backward Achteruit - + Forward Vooruit - + Task Taak - + Extra Extra - + %1%2%3%4 %1%2%3%4 - - + + %1%2%3Hat %4 %1%2%3Hat %4 - - + + + %1%2%3Axis %4 + %1%2%3As %4 + + + + %1%2%3Button %4 %1%2%3Knop %4 @@ -7624,73 +7727,73 @@ Probeer het opnieuw of neem contact op met de software-ontwikkelaar.Gebruikers - + Profile Creator Profielmaker - - + + Profile Selector Profielkiezer - + Profile Icon Editor Profielicoon-editor - + Profile Nickname Editor Profielnaam-editor - + Who will receive the points? Wie krijgt de punten? - + Who is using Nintendo eShop? Wie gebruikt de Nintendo eShop? - + Who is making this purchase? Wie doet deze aankoop? - + Who is posting? Wie post er? - + Select a user to link to a Nintendo Account. Selecteer een gebruiker om te koppelen aan een Nintendo-account. - + Change settings for which user? Instellingen wijzigen voor welke gebruiker? - + Format data for which user? Formatteer gegevens voor welke gebruiker? - + Which user will be transferred to another console? Welke gebruiker wordt overgezet naar een andere console? - + Send save data for which user? Gegevens verzenden voor welke gebruiker? - + Select a user: Selecteer een gebruiker: diff --git a/dist/languages/pl.ts b/dist/languages/pl.ts index e822fcac8..19132bf95 100644 --- a/dist/languages/pl.ts +++ b/dist/languages/pl.ts @@ -1131,78 +1131,78 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d Ustawienia yuzu - - + + Audio Dźwięk - - + + CPU CPU - + Debug Wyszukiwanie usterek - + Filesystem System plików - - + + General Ogólne - - + + Graphics Grafika - + GraphicsAdvanced Zaawansowana grafika - + Hotkeys Skróty klawiszowe - - + + Controls Sterowanie - + Profiles Profile - + Network Sieć - - + + System System - + Game List Lista Gier - + Web Web @@ -1377,41 +1377,36 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d - Extended memory layout (8GB DRAM) - - - - Confirm exit while emulation is running Potwierdź wyjście podczas emulacji - + Prompt for user on game boot Pytaj o użytkownika podczas uruchamiania gry - + Pause emulation when in background Wstrzymaj emulację w tle - + Hide mouse on inactivity Ukryj mysz przy braku aktywności - + Reset All Settings Resetuj wszystkie ustawienia - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Spowoduje to zresetowanie wszystkich ustawień i usunięcie wszystkich konfiguracji gier. Nie spowoduje to usunięcia katalogów gier, profili ani profili wejściowych. Kontynuować? @@ -1450,7 +1445,7 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d - + None Żadny @@ -1476,231 +1471,269 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d + VSync Mode: + + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: Emulacja NVDEC: - + No Video Output Brak wyjścia wideo - + CPU Video Decoding Dekodowanie Wideo przez CPU - + GPU Video Decoding (Default) Dekodowanie Wideo przez GPU (Domyślne) - + Fullscreen Mode: Tryb Pełnoekranowy: - + Borderless Windowed W oknie (Bezramkowy) - + Exclusive Fullscreen Exclusive Fullscreen - + Aspect Ratio: Format obrazu: - + Default (16:9) Domyślne (16:9) - + Force 4:3 Wymuś 4:3 - + Force 21:9 Wymuś 21:9 - + Force 16:10 Wymuś 16:10 - + Stretch to Window Rozciągnij do Okna - + Resolution: Rozdzielczość: - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [EKSPERYMENTALNE] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [EKSPERYMENTALNE] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) - + 8X (5760p/8640p) - + Window Adapting Filter: Filtr Adaptującego Okna: - + Nearest Neighbor Najbliższy Sąsiad - + Bilinear Bilinearny - + Bicubic Bikubiczny - + Gaussian Gauss - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: Metoda Anty-Aliasingu: - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness Użyj globalnej ostrości FSR - + Set FSR Sharpness Ustaw ostrość FSR - + FSR Sharpness: Ostrość FSR: - + 100% 100% - - + + Use global background color Ustaw globalny kolor tła - + Set background color: Ustaw kolor tła: - + Background Color: Kolor tła - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (Zgromadzone Shadery, tylko NVIDIA) - + SPIR-V (Experimental, Mesa Only) SPIR-V (Eksperymentalne, Tylko Mesa) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + + + + + VSync Off + + + + + Recommended + + + + + On + + + + + VSync On + + ConfigureGraphicsAdvanced @@ -1725,108 +1758,133 @@ Gdy ta opcja jest włączona, niedopasowanie jest uruchamiane tylko wtedy, gdy d Precyzja: - - Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - Uruchamia pracę w tle podczas oczekiwania na komendy graficzne aby GPU nie obniżało taktowania. - - - - Force maximum clocks (Vulkan only) - Wymuś maksymalne zegary (Tylko Vulkan) - - - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync zapobiega rozwarstwianiu obrazu, ale niektóre karty graficzne mogą działać wolniej używając VSync. -Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - - - - Use VSync - Używaj VSync - - - - Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + ASTC recompression: + Uncompressed (Best quality) + + + + + BC1 (Low quality) + + + + + BC3 (Medium quality) + + + + + Enable asynchronous presentation (Vulkan only) + + + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + Uruchamia pracę w tle podczas oczekiwania na komendy graficzne aby GPU nie obniżało taktowania. + + + + Force maximum clocks (Vulkan only) + Wymuś maksymalne zegary (Tylko Vulkan) + + + + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + Decode ASTC textures asynchronously (Hack) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + + + + + Enable Reactive Flushing + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Włącza asynchroniczną kompilację shaderów, co może zmniejszyć zacinanie się shaderów. Ta funkcja jest eksperymentalna. - + Use asynchronous shader building (Hack) Użyj asynchronicznego budowania shaderów (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Włącza Szybszy Czas GPU. Ta opcja zmusza większość gier do wyświetlania w swojej najwyższej natywnej rozdzielczości. - + Use Fast GPU Time (Hack) Użyj Szybszego Czasu GPU (Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - Włącza pesymistyczne opróżnianie bufora. Ta opcja wymusi opróżnianie niezmodyfikowanych buforów, gdzie to wpłynie na wydajność. - - - - Use pessimistic buffer flushes (Hack) - Użyj pesymistycznego opróżniania buforów (Hack) - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. Włącza pamięć podręczną strumienia specyficzną dla dostawcy GPU. Ta opcja może znacznie skrócić czas ładowania modułu cieniującego w przypadkach, gdy sterownik Vulkan nie przechowuje wewnętrznie plików pamięci podręcznej strumienia. - + Use Vulkan pipeline cache Użyj pamięci podręcznej strumienia dla Vulkana - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + + + + + Enable Compute Pipelines (Intel Vulkan only) + + + + Anisotropic Filtering: Filtrowanie anizotropowe: - + Automatic Automatyczne - + Default Domyślne - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1859,70 +1917,65 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności.Przywróć domyślne - + Action Akcja - + Hotkey Skrót klawiszowy - + Controller Hotkey Skrót Klawiszowy Kontrolera - - - + + + Conflicting Key Sequence Sprzeczna sekwencja klawiszy - - + + The entered key sequence is already assigned to: %1 Wprowadzona sekwencja klawiszy jest już przypisana do: %1 - - Home+%1 - Menu+%1 - - - + [waiting] [oczekiwanie] - + Invalid Nieprawidłowe - + Restore Default Przywróć ustawienia domyślne - + Clear Wyczyść - + Conflicting Button Sequence Sprzeczna Sekwencja Przycisków - + The default button sequence is already assigned to: %1 Domyślna sekwencja przycisków już jest przypisana do: %1 - + The default key sequence is already assigned to: %1 Domyślna sekwencja klawiszy jest już przypisana do: %1 @@ -2214,7 +2267,7 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + Configure Konfiguruj @@ -2271,22 +2324,32 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + + + + + Use random Amiibo ID + + + + Enable mouse panning Włącz panoramowanie myszą - + Mouse sensitivity Czułość myszy - + % % - + Motion / Touch Ruch / Dotyk @@ -2398,7 +2461,7 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + Left Stick Lewa gałka @@ -2492,14 +2555,14 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + L L - + ZL ZL @@ -2518,7 +2581,7 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + Plus Plus @@ -2531,15 +2594,15 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - - + + R R - + ZR ZR @@ -2596,241 +2659,247 @@ Pozostaw tą funkcję włączoną, jeśli nie widać różnicy w wydajności. - + Right Stick Prawa gałka - - - - + + + + Clear Wyczyść - - - - - + + + + + [not set] [nie ustawione] - - + + + Invert button Odwróć przycisk - - + + Toggle button Przycisk Toggle - + Turbo button - - + + Invert axis Odwróć oś - - - + + + Set threshold Ustaw próg - - + + Choose a value between 0% and 100% Wybierz wartość od 0% do 100% - + Toggle axis Przełącz oś - + Set gyro threshold Ustaw próg gyro - + + Calibrate sensor + + + + Map Analog Stick Przypisz Drążek Analogowy - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Po naciśnięciu OK, najpierw przesuń joystick w poziomie, a następnie w pionie. Aby odwrócić osie, najpierw przesuń joystick pionowo, a następnie poziomo. - + Center axis Środkowa oś - - + + Deadzone: %1% Martwa strefa: %1% - - + + Modifier Range: %1% Zasięg Modyfikatora: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Para Joyconów - + Left Joycon Lewy Joycon - + Right Joycon Prawy Joycon - + Handheld Handheld - + GameCube Controller Kontroler GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Kontroler NES/Pegasus - + SNES Controller Kontroler SNES - + N64 Controller Kontroler N64 - + Sega Genesis Sega Mega Drive - + Start / Pause Start / Pauza - + Z Z - + Control Stick Lewa gałka - + C-Stick C-gałka - + Shake! Potrząśnij! - + [waiting] [oczekiwanie] - + New Profile Nowy profil - + Enter a profile name: Wpisz nazwę profilu: - - + + Create Input Profile Utwórz profil wejściowy - + The given profile name is not valid! Podana nazwa profilu jest nieprawidłowa! - + Failed to create the input profile "%1" Nie udało się utworzyć profilu wejściowego "%1" - + Delete Input Profile Usuń profil wejściowy - + Failed to delete the input profile "%1" Nie udało się usunąć profilu wejściowego "%1" - + Load Input Profile Załaduj profil wejściowy - + Failed to load the input profile "%1" Nie udało się wczytać profilu wejściowego "%1" - + Save Input Profile Zapisz profil wejściowy - + Failed to save the input profile "%1" Nie udało się zapisać profilu wejściowego "%1" @@ -3085,47 +3154,47 @@ Aby odwrócić osie, najpierw przesuń joystick pionowo, a następnie poziomo.Deweloper - + Add-Ons Dodatki - + General Ogólne - + System System - + CPU CPU - + Graphics Grafika - + Adv. Graphics Zaaw. Grafika - + Audio Dźwięk - + Input Profiles Profil wejściowy - + Properties Właściwości @@ -3846,7 +3915,12 @@ UUID: %2 Nazwa urządzenia - + + Unsafe extended memory layout (8GB DRAM) + + + + System settings are available only when game is not running. Ustawienia systemu są dostępne tylko wtedy, gdy gra nie jest uruchomiona. @@ -4542,556 +4616,561 @@ Przeciągnij punkty, aby zmienić pozycję, lub kliknij dwukrotnie komórki tabe GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Dane anonimowe są gromadzone</a> aby ulepszyć yuzu. <br/><br/>Czy chcesz udostępnić nam swoje dane o użytkowaniu? - + Telemetry Telemetria - + Broken Vulkan Installation Detected Wykryto uszkodzoną instalację Vulkana - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. Inicjalizacja Vulkana nie powiodła się podczas uruchamiania.<br><br>Kliknij<a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>tutaj aby uzyskać instrukcje dotyczące rozwiązania tego problemu</a>. - + Loading Web Applet... Ładowanie apletu internetowego... - - + + Disable Web Applet Wyłącz Aplet internetowy - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Wyłączanie web appletu może doprowadzić do nieokreślonych zachowań - wyłączyć applet należy jedynie grając w Super Mario 3D All-Stars. Na pewno chcesz wyłączyć web applet? (Można go ponownie włączyć w ustawieniach debug.) - + The amount of shaders currently being built Ilość budowanych shaderów - + The current selected resolution scaling multiplier. Obecnie wybrany mnożnik rozdzielczości. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Aktualna prędkość emulacji. Wartości większe lub niższe niż 100% wskazują, że emulacja działa szybciej lub wolniej niż Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Ile klatek na sekundę gra aktualnie wyświetla. To będzie się różnić w zależności od gry, od sceny do sceny. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Czas potrzebny do emulacji klatki na sekundę Switcha, nie licząc ograniczania klatek ani v-sync. Dla emulacji pełnej szybkości powinno to wynosić co najwyżej 16,67 ms. - + &Clear Recent Files &Usuń Ostatnie pliki - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Kontynuuj - + &Pause &Pauza - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu jest w trakcie gry - + Warning Outdated Game Format OSTRZEŻENIE! Nieaktualny format gry - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Używasz zdekonstruowanego formatu katalogu ROM dla tej gry, który jest przestarzałym formatem, który został zastąpiony przez inne, takie jak NCA, NAX, XCI lub NSP. W zdekonstruowanych katalogach ROM brakuje ikon, metadanych i obsługi aktualizacji.<br><br> Aby znaleźć wyjaśnienie różnych formatów Switch obsługiwanych przez yuzu,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'> sprawdź nasze wiki</a>. Ta wiadomość nie pojawi się ponownie. - - + + Error while loading ROM! Błąd podczas wczytywania ROMu! - + The ROM format is not supported. Ten format ROMu nie jest wspierany. - + An error occurred initializing the video core. Wystąpił błąd podczas inicjowania rdzenia wideo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu napotkał błąd podczas uruchamiania rdzenia wideo. Jest to zwykle spowodowane przestarzałymi sterownikami GPU, w tym zintegrowanymi. Więcej szczegółów znajdziesz w pliku log. Więcej informacji na temat dostępu do log-u można znaleźć na następującej stronie: <a href='https://yuzu-emu.org/help/reference/log-files/'>Jak przesłać plik log</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Błąd podczas wczytywania ROMu! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Postępuj zgodnie z<a href='https://yuzu-emu.org/help/quickstart/'>yuzu quickstart guide</a> aby zrzucić ponownie swoje pliki.<br>Możesz odwołać się do wiki yuzu</a>lub discord yuzu </a> po pomoc. - + An unknown error occurred. Please see the log for more details. Wystąpił nieznany błąd. Więcej informacji można znaleźć w pliku log. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Zamykanie aplikacji... - + Save Data Zapis danych - + Mod Data Dane modów - + Error Opening %1 Folder Błąd podczas otwarcia folderu %1 - - + + Folder does not exist! Folder nie istnieje! - + Error Opening Transferable Shader Cache Błąd podczas otwierania przenośnej pamięci podręcznej Shaderów. - + Failed to create the shader cache directory for this title. Nie udało się stworzyć ścieżki shaderów dla tego tytułu. - + Error Removing Contents Błąd podczas usuwania zawartości - + Error Removing Update Błąd podczas usuwania aktualizacji - + Error Removing DLC Błąd podczas usuwania dodatków - + Remove Installed Game Contents? Czy usunąć zainstalowaną zawartość gry? - + Remove Installed Game Update? Czy usunąć zainstalowaną aktualizację gry? - + Remove Installed Game DLC? Czy usunąć zainstalowane dodatki gry? - + Remove Entry Usuń wpis - - - - - - + + + + + + Successfully Removed Pomyślnie usunięto - + Successfully removed the installed base game. Pomyślnie usunięto zainstalowaną grę. - + The base game is not installed in the NAND and cannot be removed. Gra nie jest zainstalowana w NAND i nie może zostać usunięta. - + Successfully removed the installed update. Pomyślnie usunięto zainstalowaną łatkę. - + There is no update installed for this title. Brak zainstalowanych łatek dla tego tytułu. - + There are no DLC installed for this title. Brak zainstalowanych DLC dla tego tytułu. - + Successfully removed %1 installed DLC. Pomyślnie usunięto %1 zainstalowane DLC. - + Delete OpenGL Transferable Shader Cache? Usunąć Transferowalne Shadery OpenGL? - + Delete Vulkan Transferable Shader Cache? Usunąć Transferowalne Shadery Vulkan? - + Delete All Transferable Shader Caches? Usunąć Wszystkie Transferowalne Shadery? - + Remove Custom Game Configuration? Usunąć niestandardową konfigurację gry? - + + Remove Cache Storage? + + + + Remove File Usuń plik - - + + Error Removing Transferable Shader Cache Błąd podczas usuwania przenośnej pamięci podręcznej Shaderów. - - + + A shader cache for this title does not exist. Pamięć podręczna Shaderów dla tego tytułu nie istnieje. - + Successfully removed the transferable shader cache. Pomyślnie usunięto przenośną pamięć podręczną Shaderów. - + Failed to remove the transferable shader cache. Nie udało się usunąć przenośnej pamięci Shaderów. - + Error Removing Vulkan Driver Pipeline Cache Błąd podczas usuwania pamięci podręcznej strumienia sterownika Vulkana - + Failed to remove the driver pipeline cache. Błąd podczas usuwania pamięci podręcznej strumienia sterownika. - - + + Error Removing Transferable Shader Caches Błąd podczas usuwania Transferowalnych Shaderów - + Successfully removed the transferable shader caches. Pomyślnie usunięto transferowalne shadery. - + Failed to remove the transferable shader cache directory. Nie udało się usunąć ścieżki transferowalnych shaderów. - - + + Error Removing Custom Configuration Błąd podczas usuwania niestandardowej konfiguracji - + A custom configuration for this title does not exist. Niestandardowa konfiguracja nie istnieje dla tego tytułu. - + Successfully removed the custom game configuration. Pomyślnie usunięto niestandardową konfiguracje gry. - + Failed to remove the custom game configuration. Nie udało się usunąć niestandardowej konfiguracji gry. - - + + RomFS Extraction Failed! Wypakowanie RomFS nieudane! - + There was an error copying the RomFS files or the user cancelled the operation. Wystąpił błąd podczas kopiowania plików RomFS lub użytkownik anulował operację. - + Full Pełny - + Skeleton Szkielet - + Select RomFS Dump Mode Wybierz tryb zrzutu RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Proszę wybrać w jaki sposób chcesz, aby zrzut pliku RomFS został wykonany. <br>Pełna kopia ze wszystkimi plikami do nowego folderu, gdy <br>skielet utworzy tylko strukturę folderu. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Nie ma wystarczająco miejsca w %1 aby wyodrębnić RomFS. Zwolnij trochę miejsca, albo zmień ścieżkę zrzutu RomFs w Emulacja> Konfiguruj> System> System Plików> Źródło Zrzutu - + Extracting RomFS... Wypakowywanie RomFS... - - + + Cancel Anuluj - + RomFS Extraction Succeeded! Wypakowanie RomFS zakończone pomyślnie! - + The operation completed successfully. Operacja zakończona sukcesem. - - - - - + + + + + Create Shortcut Utwórz skrót - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Utworzy to skrót do obecnego AppImage. Może nie działać dobrze po aktualizacji. Kontynuować? - + Cannot create shortcut on desktop. Path "%1" does not exist. Nie można utworzyć skrótu na pulpicie. Ścieżka "%1" nie istnieje. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Nie można utworzyć skrótu w menu aplikacji. Ścieżka "%1" nie istnieje oraz nie może być utworzona. - + Create Icon Utwórz ikonę - + Cannot create icon file. Path "%1" does not exist and cannot be created. Nie można utworzyć pliku ikony. Ścieżka "%1" nie istnieje oraz nie może być utworzona. - + Start %1 with the yuzu Emulator Włącz %1 z emulatorem yuzu - + Failed to create a shortcut at %1 Nie udało się utworzyć skrótu pod %1 - + Successfully created a shortcut to %1 Pomyślnie utworzono skrót do %1 - + Error Opening %1 Błąd podczas otwierania %1 - + Select Directory Wybierz folder... - + Properties Właściwości - + The game properties could not be loaded. Właściwości tej gry nie mogły zostać załadowane. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Plik wykonywalny Switcha (%1);;Wszystkie pliki (*.*) - + Load File Załaduj plik... - + Open Extracted ROM Directory Otwórz folder wypakowanego ROMu - + Invalid Directory Selected Wybrano niewłaściwy folder - + The directory you have selected does not contain a 'main' file. Folder wybrany przez ciebie nie zawiera 'głownego' pliku. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Instalacyjne pliki Switch'a (*.nca *.nsp *.xci);;Archiwum zawartości Nintendo (*.nca);;Pakiet poddany Nintendo (*.nsp);;Obraz z kartridża NX (*.xci) - + Install Files Zainstaluj pliki - + %n file(s) remaining 1 plik został%n plików zostało%n plików zostało%n plików zostało - + Installing file "%1"... Instalowanie pliku "%1"... - - + + Install Results Wynik instalacji - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Aby uniknąć ewentualnych konfliktów, odradzamy użytkownikom instalowanie gier na NAND. Proszę, używaj tej funkcji tylko do instalowania łatek i DLC. - + %n file(s) were newly installed 1 nowy plik został zainstalowany @@ -5101,400 +5180,400 @@ Proszę, używaj tej funkcji tylko do instalowania łatek i DLC. - + %n file(s) were overwritten 1 plik został nadpisany%n plików zostało nadpisane%n plików zostało nadpisane%n plików zostało nadpisane - + %n file(s) failed to install 1 pliku nie udało się zainstalować%n plików nie udało się zainstalować%n plików nie udało się zainstalować%n plików nie udało się zainstalować - + System Application Aplikacja systemowa - + System Archive Archiwum systemu - + System Application Update Aktualizacja aplikacji systemowej - + Firmware Package (Type A) Paczka systemowa (Typ A) - + Firmware Package (Type B) Paczka systemowa (Typ B) - + Game Gra - + Game Update Aktualizacja gry - + Game DLC Dodatek do gry - + Delta Title Tytuł Delta - + Select NCA Install Type... Wybierz typ instalacji NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Wybierz typ tytułu, do którego chcesz zainstalować ten NCA, jako: (W większości przypadków domyślna "gra" jest w porządku.) - + Failed to Install Instalacja nieudana - + The title type you selected for the NCA is invalid. Typ tytułu wybrany dla NCA jest nieprawidłowy. - + File not found Nie znaleziono pliku - + File "%1" not found Nie znaleziono pliku "%1" - + OK OK - - + + Hardware requirements not met Wymagania sprzętowe nie są spełnione - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Twój system nie spełnia rekomendowanych wymagań sprzętowych. Raportowanie kompatybilności zostało wyłączone. - + Missing yuzu Account Brakuje konta Yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Aby przesłać test zgodności gry, musisz połączyć swoje konto yuzu.<br><br/> Aby połączyć swoje konto yuzu, przejdź do opcji Emulacja &gt; Konfiguracja &gt; Sieć. - + Error opening URL Błąd otwierania adresu URL - + Unable to open the URL "%1". Nie można otworzyć adresu URL "%1". - + TAS Recording Nagrywanie TAS - + Overwrite file of player 1? Nadpisać plik gracza 1? - + Invalid config detected Wykryto nieprawidłową konfigurację - + Handheld controller can't be used on docked mode. Pro controller will be selected. Nie można używać kontrolera handheld w trybie zadokowanym. Zostanie wybrany kontroler Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Amiibo zostało "zdjęte" - + Error Błąd - - + + The current game is not looking for amiibos Ta gra nie szuka amiibo - + Amiibo File (%1);; All Files (*.*) Plik Amiibo (%1);;Wszyskie pliki (*.*) - + Load Amiibo Załaduj Amiibo - + Error loading Amiibo data Błąd podczas ładowania pliku danych Amiibo - + The selected file is not a valid amiibo Wybrany plik nie jest poprawnym amiibo - + The selected file is already on use Wybrany plik jest już w użyciu - + An unknown error occurred Wystąpił nieznany błąd - + Capture Screenshot Zrób zrzut ekranu - + PNG Image (*.png) Obrazek PNG (*.png) - + TAS state: Running %1/%2 Status TAS: Działa %1%2 - + TAS state: Recording %1 Status TAS: Nagrywa %1 - + TAS state: Idle %1/%2 Status TAS: Bezczynny %1%2 - + TAS State: Invalid Status TAS: Niepoprawny - + &Stop Running &Wyłącz - + &Start &Start - + Stop R&ecording Przestań N&agrywać - + R&ecord N&agraj - + Building: %n shader(s) Budowanie shaderaBudowanie: %n shaderówBudowanie: %n shaderówBudowanie: %n shaderów - + Scale: %1x %1 is the resolution scaling factor Skala: %1x - + Speed: %1% / %2% Prędkość: %1% / %2% - + Speed: %1% Prędkość: %1% - + Game: %1 FPS (Unlocked) Gra: %1 FPS (Odblokowane) - + Game: %1 FPS Gra: %1 FPS - + Frame: %1 ms Klatka: %1 ms - + GPU NORMAL GPU NORMALNE - + GPU HIGH GPU WYSOKIE - + GPU EXTREME GPU EKSTREMALNE - + GPU ERROR BŁĄD GPU - + DOCKED TRYB ZADOKOWANY - + HANDHELD TRYB PRZENOŚNY - + OPENGL OPENGL - + VULKAN VULKAN - + NULL Zero - + NEAREST NAJBLIŻSZY - - + + BILINEAR BILINEARNY - + BICUBIC BIKUBICZNY - + GAUSSIAN GAUSSIAN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA BEZ AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation Potwierdź ponowną aktywacje klucza - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5511,37 +5590,37 @@ i opcjonalnie tworzyć kopie zapasowe. Spowoduje to usunięcie wygenerowanych automatycznie plików kluczy i ponowne uruchomienie modułu pochodnego klucza. - + Missing fuses Brakujące bezpieczniki - + - Missing BOOT0 - Brak BOOT0 - + - Missing BCPKG2-1-Normal-Main - Brak BCPKG2-1-Normal-Main - + - Missing PRODINFO - Brak PRODINFO - + Derivation Components Missing Brak komponentów wyprowadzania - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Brakuje elementów, które mogą uniemożliwić zakończenie wyprowadzania kluczy. <br>Postępuj zgodnie z <a href='https://yuzu-emu.org/help/quickstart/'>yuzu quickstart guide</a> aby zdobyć wszystkie swoje klucze i gry.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5550,39 +5629,49 @@ Zależnie od tego może potrwać do minuty na wydajność twojego systemu. - + Deriving Keys Wyprowadzanie kluczy... - + + System Archive Decryption Failed + + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target Wybierz cel zrzutu RomFS - + Please select which RomFS you would like to dump. Proszę wybrać RomFS, jakie chcesz zrzucić. - + Are you sure you want to close yuzu? Czy na pewno chcesz zamknąć yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Czy na pewno chcesz zatrzymać emulację? Wszystkie niezapisane postępy zostaną utracone. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5594,44 +5683,44 @@ Czy chcesz to ominąć i mimo to wyjść? GRenderWindow - - + + OpenGL not available! OpenGL niedostępny! - + OpenGL shared contexts are not supported. Współdzielone konteksty OpenGL nie są obsługiwane. - + yuzu has not been compiled with OpenGL support. yuzu nie zostało skompilowane z obsługą OpenGL. + - Error while initializing OpenGL! Błąd podczas inicjowania OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Twoja karta graficzna może nie obsługiwać OpenGL lub nie masz najnowszych sterowników karty graficznej. - + Error while initializing OpenGL 4.6! Błąd podczas inicjowania OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Twoja karta graficzna może nie obsługiwać OpenGL 4.6 lub nie masz najnowszych sterowników karty graficznej.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Twoja karta graficzna może nie obsługiwać co najmniej jednego wymaganego rozszerzenia OpenGL. Upewnij się, że masz najnowsze sterowniki karty graficznej<br><br>GL Renderer:<br>%1<br><br>Nieobsługiwane rozszerzenia:<br>%2 @@ -5690,117 +5779,122 @@ Czy chcesz to ominąć i mimo to wyjść? + Remove Cache Storage + + + + Remove OpenGL Pipeline Cache Usuń Pamięć Podręczną Pipeline OpenGL - + Remove Vulkan Pipeline Cache Usuń Pamięć Podręczną Pipeline Vulkan - + Remove All Pipeline Caches Usuń całą pamięć podręczną Pipeline - + Remove All Installed Contents Usuń całą zainstalowaną zawartość - + Dump RomFS Zrzuć RomFS - + Dump RomFS to SDMC Zrzuć RomFS do SDMC - + Copy Title ID to Clipboard Kopiuj identyfikator gry do schowka - + Navigate to GameDB entry Nawiguj do wpisu kompatybilności gry - + Create Shortcut Utwórz skrót - + Add to Desktop Dodaj do pulpitu - + Add to Applications Menu Dodaj do menu aplikacji - + Properties Właściwości - + Scan Subfolders Skanuj podfoldery - + Remove Game Directory Usuń katalog gier - + ▲ Move Up ▲ Przenieś w górę - + ▼ Move Down ▼ Przenieś w dół - + Open Directory Location Otwórz lokalizacje katalogu - + Clear Wyczyść - + Name Nazwa gry - + Compatibility Kompatybilność - + Add-ons Dodatki - + File type Typ pliku - + Size Rozmiar @@ -5871,7 +5965,7 @@ Czy chcesz to ominąć i mimo to wyjść? GameListPlaceholder - + Double-click to add a new folder to the game list Kliknij podwójnie aby dodać folder do listy gier @@ -5884,12 +5978,12 @@ Czy chcesz to ominąć i mimo to wyjść? 1 z %n rezultatów%1 z %n rezultatów%1 z %n rezultatów%1 z %n rezultatów - + Filter: Filter: - + Enter pattern to filter Wpisz typ do filtra @@ -5980,12 +6074,11 @@ Komunikat debugowania: Hotkeys - + Audio Mute/Unmute Wycisz/Odcisz Audio - @@ -6007,111 +6100,112 @@ Komunikat debugowania: + Main Window Okno główne - + Audio Volume Down Zmniejsz głośność dźwięku - + Audio Volume Up Zwiększ głośność dźwięku - + Capture Screenshot Zrób zrzut ekranu - + Change Adapting Filter Zmień filtr adaptacyjny - + Change Docked Mode Zmień tryb dokowania - + Change GPU Accuracy Zmień dokładność GPU - + Continue/Pause Emulation Kontynuuj/Zatrzymaj Emulację - + Exit Fullscreen Wyłącz Pełny Ekran - + Exit yuzu Wyjdź z yuzu - + Fullscreen Pełny ekran - + Load File Załaduj plik... - + Load/Remove Amiibo Załaduj/Usuń Amiibo - + Restart Emulation Zrestartuj Emulację - + Stop Emulation Zatrzymaj Emulację - + TAS Record Nagrywanie TAS - + TAS Reset Reset TAS - + TAS Start/Stop TAS Start/Stop - + Toggle Filter Bar Pokaż pasek filtrowania - + Toggle Framerate Limit Przełącz limit liczby klatek na sekundę - + Toggle Mouse Panning Włącz przesuwanie myszką - + Toggle Status Bar Przełącz pasek stanu @@ -6804,7 +6898,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE START/PAUZA @@ -6854,21 +6948,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6876,8 +6970,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [nie ustawione] @@ -6892,10 +6986,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Oś %1%2 @@ -6909,163 +7003,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [nieznane] - - + + Left Lewo - - + + Right Prawo - - + + Down Dół - - + + Up Góra - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Start - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle Kółko - + Cross Krzyż - + Square Kwadrat - + Triangle Trójkąt - + Share Udostępnij - + Options Opcje - + [undefined] [niezdefiniowane] @@ -7076,7 +7170,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [niepoprawne] @@ -7090,21 +7184,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2Oś %3 - + %1%2Axis %3,%4,%5 %1%2Oś %3,%4,%5 - + %1%2Motion %3 %1%2Ruch %3 @@ -7116,106 +7208,112 @@ p, li { white-space: pre-wrap; } - + [unused] [nieużywane] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L - + Stick R - + Plus Plus - + Minus Minus - - + + Home Home - + Capture Zrzut ekranu - + Touch Dotyk - + Wheel Indicates the mouse wheel Kółko - + Backward Do tyłu - + Forward Do przodu - + Task Zadanie - + Extra Dodatkowe - + %1%2%3%4 - - + + %1%2%3Hat %4 - - + + + %1%2%3Axis %4 + + + + + %1%2%3Button %4 @@ -7636,73 +7734,73 @@ Spróbuj ponownie lub skontaktuj się z twórcą oprogramowania. Użytkownicy - + Profile Creator - - + + Profile Selector Wybór profilu - + Profile Icon Editor - + Profile Nickname Editor - + Who will receive the points? - + Who is using Nintendo eShop? - + Who is making this purchase? - + Who is posting? - + Select a user to link to a Nintendo Account. - + Change settings for which user? - + Format data for which user? - + Which user will be transferred to another console? - + Send save data for which user? - + Select a user: Wybierz użytkownika: diff --git a/dist/languages/pt_BR.ts b/dist/languages/pt_BR.ts index 50213db36..a81ba4c22 100644 --- a/dist/languages/pt_BR.ts +++ b/dist/languages/pt_BR.ts @@ -1137,78 +1137,78 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP.Configurações do yuzu - - + + Audio Áudio - - + + CPU CPU - + Debug Depuração - + Filesystem Sistema de arquivos - - + + General Geral - - + + Graphics Gráficos - + GraphicsAdvanced GráficosAvançado - + Hotkeys Teclas de atalho - - + + Controls Controles - + Profiles Perfis - + Network Rede - - + + System Sistema - + Game List Lista de jogos - + Web Rede @@ -1383,41 +1383,36 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - Extended memory layout (8GB DRAM) - - - - Confirm exit while emulation is running Confirmar saída quando a emulação estiver em execução - + Prompt for user on game boot Escolher um usuário ao iniciar um jogo - + Pause emulation when in background Pausar emulação quando a janela ficar em segundo plano - + Hide mouse on inactivity Esconder cursor do mouse quando em inatividade - + Reset All Settings Redefinir todas as configurações - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Isto restaura todas as configurações e exclui as configurações individuais de todos os jogos. As pastas de jogos, perfis de jogos e perfis de controles não serão excluídos. Deseja prosseguir? @@ -1456,7 +1451,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + None Nenhum @@ -1482,231 +1477,269 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. + VSync Mode: + + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: Emulação NVDEC: - + No Video Output Sem saída de vídeo - + CPU Video Decoding Decodificação de vídeo pela CPU - + GPU Video Decoding (Default) Decodificação de vídeo pela GPU (Padrão) - + Fullscreen Mode: Modo de tela cheia: - + Borderless Windowed Janela em tela cheia - + Exclusive Fullscreen Tela cheia exclusiva - + Aspect Ratio: Proporção de tela: - + Default (16:9) Padrão (16:9) - + Force 4:3 Forçar 4:3 - + Force 21:9 Forçar 21:9 - + Force 16:10 Forçar 16:10 - + Stretch to Window Esticar para a janela - + Resolution: Resolução: - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [EXPERIMENTAL] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [EXPERIMENTAL] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] 1.5X (1080p/1620p) [EXPERIMENTAL] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) 7X (5040p/7560p) - + 8X (5760p/8640p) 8X (5760p/8640p) - + Window Adapting Filter: Filtro de adaptação de janela: - + Nearest Neighbor Vizinho mais próximo - + Bilinear Bilinear - + Bicubic Bicúbico - + Gaussian Gaussiano - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: Método de Anti-Aliasing - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness Usar FSR Sharpness global - + Set FSR Sharpness Definir FSR Sharpness - + FSR Sharpness: FSR Sharpness: - + 100% 100% - - + + Use global background color Usar cor de fundo global - + Set background color: Configurar cor de fundo: - + Background Color: Cor de fundo: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (Shaders Assembly, apenas NVIDIA) - + SPIR-V (Experimental, Mesa Only) SPIR-V (Experimental, Somente Mesa) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + + + + + VSync Off + + + + + Recommended + + + + + On + + + + + VSync On + + ConfigureGraphicsAdvanced @@ -1731,107 +1764,133 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP.Nível de precisão: - + + ASTC recompression: + + + + + Uncompressed (Best quality) + + + + + BC1 (Low quality) + + + + + BC3 (Medium quality) + + + + + Enable asynchronous presentation (Vulkan only) + + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. Executa trabalho em segundo plano aguardando pelos comandos gráficos para evitar a GPU de reduzir seu clock. - + Force maximum clocks (Vulkan only) Forçar clock máximo (somente Vulkan) - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - A sincronização vertical (VSync) evita que as imagens do jogo pareçam cortadas, porém algumas placas gráficas apresentam redução de desempenho quando estiver ativa. Deixe-a ativada se você não reparar alguma diferença de desempenho. - - - - Use VSync - Usar VSync - - - + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. Habilitar decodificação assíncrona de texturas ASTC, isso pode reduzir interrupções no tempo de carga. Essa funcionalidade é experimental. - + Decode ASTC textures asynchronously (Hack) Decodificação assíncrona de texturas ASTC (Hack) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + + + + + Enable Reactive Flushing + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Realiza a compilação de shaders de forma assíncrona, o que pode reduzir engasgos de shaders. Esta opção é experimental. - + Use asynchronous shader building (Hack) Usar compilação assíncrona de shaders (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Ativa um tempo de resposta rápido da GPU. Esta opção forçará a maioria dos jogos a rodar em sua resolução nativa mais alta. - + Use Fast GPU Time (Hack) Usar tempo de resposta rápido da GPU (Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - Habilita limpeza de buffer pessimista. Essa opção irá forçar que buffer não modificados sejam eliminados, que pode causar impacto na performance. - - - - Use pessimistic buffer flushes (Hack) - Usar limpeza de buffer pessimista (Hack) - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. Habilita cache de pipeline específico do fabricante. Essa opção pode melhorar o tempo de carga dos shaders significativamente nos casos onde o driver do Vulkan não armazena os arquivos cache de pipeline internamente. - + Use Vulkan pipeline cache Utilizar cache de pipeline do Vulkan - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + + + + + Enable Compute Pipelines (Intel Vulkan only) + + + + Anisotropic Filtering: Filtragem anisotrópica: - + Automatic Automático - + Default Padrão - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1864,70 +1923,65 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP.Restaurar padrões - + Action Ação - + Hotkey Atalho - + Controller Hotkey Atalho do controle - - - + + + Conflicting Key Sequence Combinação de teclas já utilizada - - + + The entered key sequence is already assigned to: %1 A sequência de teclas pressionada já esta atribuída para: %1 - - Home+%1 - Home+%1 - - - + [waiting] [aguardando] - + Invalid Inválido - + Restore Default Restaurar padrão - + Clear Limpar - + Conflicting Button Sequence Sequência de botões conflitante - + The default button sequence is already assigned to: %1 A sequência de botões padrão já está vinculada a %1 - + The default key sequence is already assigned to: %1 A sequência de teclas padrão já esta atribuida para: %1 @@ -2219,7 +2273,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Configure Configurar @@ -2276,22 +2330,32 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP.Habilitar driver direto do Pro Controller [EXPERIMENTAL] - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + + + + + Use random Amiibo ID + + + + Enable mouse panning Ativar o giro do mouse - + Mouse sensitivity Sensibilidade do mouse - + % % - + Motion / Touch Movimento/toque @@ -2403,7 +2467,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Left Stick Analógico esquerdo @@ -2497,14 +2561,14 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + L L - + ZL ZL @@ -2523,7 +2587,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Plus Mais @@ -2536,15 +2600,15 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - - + + R R - + ZR ZR @@ -2601,241 +2665,247 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Right Stick Analógico direito - - - - + + + + Clear Limpar - - - - - + + + + + [not set] [não definido] - - + + + Invert button Inverter botão - - + + Toggle button Alternar pressionamento do botão - + Turbo button Botão Turbo - - + + Invert axis Inverter eixo - - - + + + Set threshold Definir limite - - + + Choose a value between 0% and 100% Escolha um valor entre 0% e 100% - + Toggle axis Alternar eixos - + Set gyro threshold Definir limite do giroscópio - + + Calibrate sensor + + + + Map Analog Stick Mapear analógico - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Após pressionar OK, mova o seu direcional analógico primeiro horizontalmente e depois verticalmente. Para inverter os eixos, mova seu analógico primeiro verticalmente e depois horizontalmente. - + Center axis Eixo central - - + + Deadzone: %1% Zona morta: %1% - - + + Modifier Range: %1% Alcance de modificador: %1% - - + + Pro Controller Pro Controller - + Dual Joycons Par de Joycons - + Left Joycon Joycon Esquerdo - + Right Joycon Joycon Direito - + Handheld Portátil - + GameCube Controller Controle de GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Controle NES - + SNES Controller Controle SNES - + N64 Controller Controle N64 - + Sega Genesis Mega Drive - + Start / Pause Iniciar / Pausar - + Z Z - + Control Stick Direcional de controle - + C-Stick C-Stick - + Shake! Balance! - + [waiting] [esperando] - + New Profile Novo perfil - + Enter a profile name: Insira um nome para o perfil: - - + + Create Input Profile Criar perfil de controle - + The given profile name is not valid! O nome de perfil inserido não é válido! - + Failed to create the input profile "%1" Falha ao criar o perfil de controle "%1" - + Delete Input Profile Excluir perfil de controle - + Failed to delete the input profile "%1" Falha ao excluir o perfil de controle "%1" - + Load Input Profile Carregar perfil de controle - + Failed to load the input profile "%1" Falha ao carregar o perfil de controle "%1" - + Save Input Profile Salvar perfil de controle - + Failed to save the input profile "%1" Falha ao salvar o perfil de controle "%1" @@ -3090,47 +3160,47 @@ Para inverter os eixos, mova seu analógico primeiro verticalmente e depois hori Desenvolvedor - + Add-Ons Adicionais - + General Geral - + System Sistema - + CPU CPU - + Graphics Gráficos - + Adv. Graphics Gráf. avançados - + Audio Áudio - + Input Profiles Perfis de controle - + Properties Propriedades @@ -3851,7 +3921,12 @@ UUID: %2 Nome do Dispositivo - + + Unsafe extended memory layout (8GB DRAM) + + + + System settings are available only when game is not running. As configurações de sistema são acessíveis apenas quando não houver nenhum jogo em execução. @@ -4547,555 +4622,560 @@ Mova os pontos para mudar a posição, ou clique duas vezes nas células da tabe GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Dados anônimos são recolhidos</a> para ajudar a melhorar o yuzu. <br/><br/>Gostaria de compartilhar os seus dados de uso conosco? - + Telemetry Telemetria - + Broken Vulkan Installation Detected Detectada Instalação Defeituosa do Vulkan - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. A inicialização do Vulkan falhou durante a carga do programa. <br><br>Clique <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>aqui para instruções de como resolver o problema</a>. - + Loading Web Applet... Carregando applet web... - - + + Disable Web Applet Desativar o applet da web - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) A desativação do applet da web pode causar comportamento inesperado e deve apenas ser usada com Super Mario 3D All-Stars. Você deseja mesmo desativar o applet da web? (Ele pode ser reativado nas configurações de depuração.) - + The amount of shaders currently being built A quantidade de shaders sendo construídos - + The current selected resolution scaling multiplier. O atualmente multiplicador de escala de resolução selecionado. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Velocidade atual de emulação. Valores maiores ou menores que 100% indicam que a emulação está rodando mais rápida ou lentamente que em um Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Quantos quadros por segundo o jogo está exibindo atualmente. Isto irá variar de jogo para jogo e cena para cena. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tempo que leva para emular um quadro do Switch, sem considerar o limitador de taxa de quadros ou a sincronização vertical. Um valor menor ou igual a 16.67 ms indica que a emulação está em velocidade plena. - + &Clear Recent Files &Limpar arquivos recentes - + Emulated mouse is enabled Mouse emulado está habilitado - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. Controle de mouse real e controle panorâmico do mouse são incompatíveis. Por favor desabilite a emulação do mouse em configurações avançadas de controles para permitir o controle panorâmico do mouse. - + &Continue &Continuar - + &Pause &Pausar - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu está rodando um jogo - + Warning Outdated Game Format Aviso - formato de jogo desatualizado - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Você está usando neste jogo o formato de ROM desconstruída e extraída em uma pasta, que é um formato desatualizado que foi substituído por outros, como NCA, NAX, XCI ou NSP. Pastas desconstruídas de ROMs não possuem ícones, metadados e suporte a atualizações.<br><br>Para saber mais sobre os vários formatos de ROMs de Switch compatíveis com o yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>confira a nossa wiki</a>. Esta mensagem não será exibida novamente. - - + + Error while loading ROM! Erro ao carregar a ROM! - + The ROM format is not supported. O formato da ROM não é suportado. - + An error occurred initializing the video core. Ocorreu um erro ao inicializar o núcleo de vídeo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu encontrou um erro enquanto rodando o núcleo de vídeo. Normalmente isto é causado por drivers de GPU desatualizados, incluindo integrados. Por favor veja o registro para mais detalhes. Para mais informações em acesso ao registro por favor veja a seguinte página: <a href='https://yuzu-emu.org/help/reference/log-files/'>Como fazer envio de arquivo de registro</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Erro ao carregar a ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>o guia de início rápido</a> para reextrair os seus arquivos.<br>Você pode consultar a wiki do yuzu</a> ou o Discord do yuzu</a> para obter ajuda. - + An unknown error occurred. Please see the log for more details. Ocorreu um erro desconhecido. Consulte o registro para mais detalhes. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Encerrando software... - + Save Data Dados de jogos salvos - + Mod Data Dados de mods - + Error Opening %1 Folder Erro ao abrir a pasta %1 - - + + Folder does not exist! A pasta não existe! - + Error Opening Transferable Shader Cache Erro ao abrir o cache de shaders transferível - + Failed to create the shader cache directory for this title. Falha ao criar o diretório de cache de shaders para este título. - + Error Removing Contents Erro ao Remover Conteúdos - + Error Removing Update Erro ao Remover Atualização - + Error Removing DLC Erro ao Remover DLC - + Remove Installed Game Contents? Remover Conteúdo Instalado do Jogo? - + Remove Installed Game Update? Remover Atualização Instalada do Jogo? - + Remove Installed Game DLC? Remover DLC Instalada do Jogo? - + Remove Entry Remover item - - - - - - + + + + + + Successfully Removed Removido com sucesso - + Successfully removed the installed base game. O jogo base foi removido com sucesso. - + The base game is not installed in the NAND and cannot be removed. O jogo base não está instalado na NAND e não pode ser removido. - + Successfully removed the installed update. A atualização instalada foi removida com sucesso. - + There is no update installed for this title. Não há nenhuma atualização instalada para este título. - + There are no DLC installed for this title. Não há nenhum DLC instalado para este título. - + Successfully removed %1 installed DLC. %1 DLC(s) instalados foram removidos com sucesso. - + Delete OpenGL Transferable Shader Cache? Apagar o cache de shaders transferível do OpenGL? - + Delete Vulkan Transferable Shader Cache? Apagar o cache de shaders transferível do Vulkan? - + Delete All Transferable Shader Caches? Apagar todos os caches de shaders transferíveis? - + Remove Custom Game Configuration? Remover configurações customizadas do jogo? - + + Remove Cache Storage? + + + + Remove File Remover arquivo - - + + Error Removing Transferable Shader Cache Erro ao remover cache de shaders transferível - - + + A shader cache for this title does not exist. Não existe um cache de shaders para este título. - + Successfully removed the transferable shader cache. O cache de shaders transferível foi removido com sucesso. - + Failed to remove the transferable shader cache. Falha ao remover o cache de shaders transferível. - + Error Removing Vulkan Driver Pipeline Cache Erro ao Remover Cache de Pipeline do Driver Vulkan - + Failed to remove the driver pipeline cache. Falha ao remover o pipeline de cache do driver. - - + + Error Removing Transferable Shader Caches Erro ao remover os caches de shaders transferíveis - + Successfully removed the transferable shader caches. Os caches de shaders transferíveis foram removidos com sucesso. - + Failed to remove the transferable shader cache directory. Falha ao remover o diretório do cache de shaders transferível. - - + + Error Removing Custom Configuration Erro ao remover as configurações customizadas do jogo. - + A custom configuration for this title does not exist. Não há uma configuração customizada para este título. - + Successfully removed the custom game configuration. As configurações customizadas do jogo foram removidas com sucesso. - + Failed to remove the custom game configuration. Falha ao remover as configurações customizadas do jogo. - - + + RomFS Extraction Failed! Falha ao extrair RomFS! - + There was an error copying the RomFS files or the user cancelled the operation. Houve um erro ao copiar os arquivos RomFS ou o usuário cancelou a operação. - + Full Extração completa - + Skeleton Apenas estrutura - + Select RomFS Dump Mode Selecione o modo de extração do RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Selecione a forma como você gostaria que o RomFS seja extraído.<br>"Extração completa" copiará todos os arquivos para a nova pasta, enquanto que <br>"Apenas estrutura" criará apenas a estrutura de pastas. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Não há espaço suficiente em %1 para extrair o RomFS. Por favor abra espaço ou selecione um diretório diferente em Emulação > Configurar > Sistema > Sistema de arquivos > Extrair raiz - + Extracting RomFS... Extraindo RomFS... - - + + Cancel Cancelar - + RomFS Extraction Succeeded! Extração do RomFS concluida! - + The operation completed successfully. A operação foi concluída com sucesso. - - - - - + + + + + Create Shortcut Criar Atalho - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Isso irá criar um atalho para o AppImage atual. Isso pode não funcionar corretamente se você fizer uma atualização. Continuar? - + Cannot create shortcut on desktop. Path "%1" does not exist. Não foi possível criar um atalho na área de trabalho. O caminho "%1" não existe. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Não foi possível criar um atalho no menu de aplicativos. O caminho "%1" não existe e não pode ser criado. - + Create Icon Criar Ícone - + Cannot create icon file. Path "%1" does not exist and cannot be created. Não foi possível criar o arquivo de ícone. O caminho "%1" não existe e não pode ser criado. - + Start %1 with the yuzu Emulator Iniciar %1 com o Emulador yuzu - + Failed to create a shortcut at %1 Falha ao criar um atalho em %1 - + Successfully created a shortcut to %1 Atalho criado com sucesso em %1 - + Error Opening %1 Erro ao abrir %1 - + Select Directory Selecionar pasta - + Properties Propriedades - + The game properties could not be loaded. As propriedades do jogo não puderam ser carregadas. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Executável do Switch (%1);;Todos os arquivos (*.*) - + Load File Carregar arquivo - + Open Extracted ROM Directory Abrir pasta da ROM extraída - + Invalid Directory Selected Pasta inválida selecionada - + The directory you have selected does not contain a 'main' file. A pasta que você selecionou não contém um arquivo 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Arquivo de Switch instalável (*.nca *.nsp *.xci);; Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Instalar arquivos - + %n file(s) remaining %n arquivo restante%n arquivo(s) restante(s)%n arquivo(s) restante(s) - + Installing file "%1"... Instalando arquivo "%1"... - - + + Install Results Resultados da instalação - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Para evitar possíveis conflitos, desencorajamos que os usuários instalem os jogos base na NAND. Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + %n file(s) were newly installed %n arquivo(s) instalado(s) @@ -5104,7 +5184,7 @@ Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + %n file(s) were overwritten %n arquivo(s) sobrescrito(s) @@ -5113,7 +5193,7 @@ Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + %n file(s) failed to install %n arquivo(s) não instalado(s) @@ -5122,388 +5202,388 @@ Por favor, use esse recurso apenas para instalar atualizações e DLCs. - + System Application Aplicativo do sistema - + System Archive Arquivo do sistema - + System Application Update Atualização de aplicativo do sistema - + Firmware Package (Type A) Pacote de firmware (tipo A) - + Firmware Package (Type B) Pacote de firmware (tipo B) - + Game Jogo - + Game Update Atualização de jogo - + Game DLC DLC de jogo - + Delta Title Título delta - + Select NCA Install Type... Selecione o tipo de instalação do NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Selecione o tipo de título como o qual você gostaria de instalar este NCA: (Na maioria dos casos, o padrão 'Jogo' serve bem.) - + Failed to Install Falha ao instalar - + The title type you selected for the NCA is invalid. O tipo de título que você selecionou para o NCA é inválido. - + File not found Arquivo não encontrado - + File "%1" not found Arquivo "%1" não encontrado - + OK OK - - + + Hardware requirements not met Requisitos de hardware não atendidos - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Seu sistema não atende os requisitos de harwdare. O relatório de compatibilidade foi desabilitado. - + Missing yuzu Account Conta do yuzu faltando - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Para enviar um caso de teste de compatibilidade de jogo, você precisa entrar com a sua conta do yuzu.<br><br/>Para isso, vá para Emulação &gt; Configurar... &gt; Rede. - + Error opening URL Erro ao abrir URL - + Unable to open the URL "%1". Não foi possível abrir o URL "%1". - + TAS Recording Gravando TAS - + Overwrite file of player 1? Sobrescrever arquivo do jogador 1? - + Invalid config detected Configuração inválida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. O controle portátil não pode ser usado no modo encaixado na base. O Pro Controller será selecionado. - - + + Amiibo Amiibo - - + + The current amiibo has been removed O amiibo atual foi removido - + Error Erro - - + + The current game is not looking for amiibos O jogo atual não está procurando amiibos - + Amiibo File (%1);; All Files (*.*) Arquivo Amiibo (%1);; Todos os arquivos (*.*) - + Load Amiibo Carregar Amiibo - + Error loading Amiibo data Erro ao carregar dados do Amiibo - + The selected file is not a valid amiibo O arquivo selecionado não é um amiibo válido - + The selected file is already on use O arquivo selecionado já está em uso - + An unknown error occurred Ocorreu um erro desconhecido - + Capture Screenshot Capturar tela - + PNG Image (*.png) Imagem PNG (*.png) - + TAS state: Running %1/%2 Situação TAS: Rodando %1%2 - + TAS state: Recording %1 Situação TAS: Gravando %1 - + TAS state: Idle %1/%2 Situação TAS: Repouso %1%2 - + TAS State: Invalid Situação TAS: Inválido - + &Stop Running &Parar de rodar - + &Start &Iniciar - + Stop R&ecording Parar G&ravação - + R&ecord G&ravação - + Building: %n shader(s) Compilando: %n shader(s)Compilando: %n shader(s)Compilando: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escala: %1x - + Speed: %1% / %2% Velocidade: %1% / %2% - + Speed: %1% Velocidade: %1% - + Game: %1 FPS (Unlocked) Jogo: %1 FPS (Desbloqueado) - + Game: %1 FPS Jogo: %1 FPS - + Frame: %1 ms Quadro: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR ERRO DE GPU - + DOCKED ANCORADO - + HANDHELD PORTÁTIL - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULO - + NEAREST VIZINHO - - + + BILINEAR BILINEAR - + BICUBIC BICÚBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA Sem AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE VOLUME: MUDO - + VOLUME: %1% Volume percentage (e.g. 50%) VOLUME: %1% - + Confirm Key Rederivation Confirmar rederivação de chave - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5520,37 +5600,37 @@ e opcionalmente faça cópias de segurança. Isto excluirá o seus arquivos de chaves geradas automaticamente, e reexecutar o módulo de derivação de chaves. - + Missing fuses Faltando fusíveis - + - Missing BOOT0 - Faltando BOOT0 - + - Missing BCPKG2-1-Normal-Main - Faltando BCPKG2-1-Normal-Main - + - Missing PRODINFO - Faltando PRODINFO - + Derivation Components Missing Faltando componentes de derivação - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Chaves de encriptação faltando. <br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>o guia de início rápido</a> para extrair suas chaves, firmware e jogos. <br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5559,39 +5639,49 @@ Isto pode demorar até um minuto, dependendo do desempenho do seu sistema. - + Deriving Keys Derivando chaves - + + System Archive Decryption Failed + + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target Selecionar alvo de extração do RomFS - + Please select which RomFS you would like to dump. Selecione qual RomFS você quer extrair. - + Are you sure you want to close yuzu? Você deseja mesmo fechar o yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Deseja mesmo parar a emulação? Qualquer progresso não salvo será perdido. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5603,44 +5693,44 @@ Deseja ignorar isso e sair mesmo assim? GRenderWindow - - + + OpenGL not available! OpenGL não disponível! - + OpenGL shared contexts are not supported. Shared contexts do OpenGL não são suportados. - + yuzu has not been compiled with OpenGL support. O yuzu não foi compilado com suporte para OpenGL. + - Error while initializing OpenGL! Erro ao inicializar o OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Sua GPU pode não suportar OpenGL, ou você não possui o driver gráfico mais recente. - + Error while initializing OpenGL 4.6! Erro ao inicializar o OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Sua GPU pode não suportar o OpenGL 4.6, ou você não possui os drivers gráficos mais recentes.<br><br>Renderizador GL:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Sua GPU pode não suportar uma ou mais extensões necessárias do OpenGL. Verifique se você possui a última versão dos drivers gráficos.<br><br>Renderizador GL:<br>%1<br><br>Extensões não suportadas:<br>%2 @@ -5699,117 +5789,122 @@ Deseja ignorar isso e sair mesmo assim? + Remove Cache Storage + + + + Remove OpenGL Pipeline Cache Remover cache de pipeline do OpenGL - + Remove Vulkan Pipeline Cache Remover cache de pipeline do Vulkan - + Remove All Pipeline Caches Remover todos os caches de pipeline - + Remove All Installed Contents Remover todo o conteúdo instalado - + Dump RomFS Extrair RomFS - + Dump RomFS to SDMC Extrair RomFS para SDMC - + Copy Title ID to Clipboard Copiar ID do título para a área de transferência - + Navigate to GameDB entry Abrir artigo do jogo no GameDB - + Create Shortcut Criar Atalho - + Add to Desktop Adicionar à Área de Trabalho - + Add to Applications Menu Adicionar ao Menu de Aplicativos - + Properties Propriedades - + Scan Subfolders Examinar subpastas - + Remove Game Directory Remover pasta de jogo - + ▲ Move Up ▲ Mover para cima - + ▼ Move Down ▼ Mover para baixo - + Open Directory Location Abrir local da pasta - + Clear Limpar - + Name Nome - + Compatibility Compatibilidade - + Add-ons Adicionais - + File type Tipo de arquivo - + Size Tamanho @@ -5880,7 +5975,7 @@ Deseja ignorar isso e sair mesmo assim? GameListPlaceholder - + Double-click to add a new folder to the game list Clique duas vezes para adicionar uma pasta à lista de jogos @@ -5893,12 +5988,12 @@ Deseja ignorar isso e sair mesmo assim? %1 de %n resultado(s)%1 de %n resultado(s)%1 de %n resultado(s) - + Filter: Filtro: - + Enter pattern to filter Digite o padrão para filtrar @@ -5989,12 +6084,11 @@ Mensagem de depuração: Hotkeys - + Audio Mute/Unmute Mutar/Desmutar Áudio - @@ -6016,111 +6110,112 @@ Mensagem de depuração: + Main Window Janela Principal - + Audio Volume Down Volume Menos - + Audio Volume Up Volume Mais - + Capture Screenshot Capturar Tela - + Change Adapting Filter Alterar Filtro de Adaptação - + Change Docked Mode Alterar Modo de Ancoragem - + Change GPU Accuracy Alterar Precisão da GPU - + Continue/Pause Emulation Continuar/Pausar Emulação - + Exit Fullscreen Sair da Tela Cheia - + Exit yuzu Sair do yuzu - + Fullscreen Tela Cheia - + Load File Carregar Arquivo - + Load/Remove Amiibo Carregar/Remover Amiibo - + Restart Emulation Reiniciar Emulação - + Stop Emulation Parar Emulação - + TAS Record Gravar TAS - + TAS Reset Reiniciar TAS - + TAS Start/Stop Iniciar/Parar TAS - + Toggle Filter Bar Alternar Barra de Filtro - + Toggle Framerate Limit Alternar Limite de Quadros por Segundo - + Toggle Mouse Panning Alternar o Giro do Mouse - + Toggle Status Bar Alternar Barra de Status @@ -6810,7 +6905,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE INICIAR/PAUSAR @@ -6860,21 +6955,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6882,8 +6977,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [não definido] @@ -6898,10 +6993,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Eixo %1%2 @@ -6915,163 +7010,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [desconhecido] - - + + Left Esquerda - - + + Right Direita - - + + Down Baixo - - + + Up Cima - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Start - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle Círculo - + Cross Cruz - + Square Quadrado - + Triangle Triângulo - + Share Compartilhar - + Options Opções - + [undefined] [indefinido] @@ -7082,7 +7177,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [inválido] @@ -7096,21 +7191,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2Eixo %3 - + %1%2Axis %3,%4,%5 %1%2Eixo %3,%4,%5 - + %1%2Motion %3 %1%2Movimentação %3 @@ -7122,106 +7215,112 @@ p, li { white-space: pre-wrap; } - + [unused] [não utilizado] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L - + Stick R - + Plus Mais - + Minus Menos - - + + Home Botão Home - + Capture Capturar - + Touch Toque - + Wheel Indicates the mouse wheel Volante - + Backward Para trás - + Forward Para a frente - + Task Tarefa - + Extra Extra - + %1%2%3%4 - - + + %1%2%3Hat %4 - - + + + %1%2%3Axis %4 + + + + + %1%2%3Button %4 @@ -7642,73 +7741,73 @@ Tente novamente ou entre em contato com o desenvolvedor do software.Usuários - + Profile Creator - - + + Profile Selector Seletor de perfil - + Profile Icon Editor - + Profile Nickname Editor - + Who will receive the points? - + Who is using Nintendo eShop? - + Who is making this purchase? - + Who is posting? - + Select a user to link to a Nintendo Account. - + Change settings for which user? - + Format data for which user? - + Which user will be transferred to another console? - + Send save data for which user? - + Select a user: Selecione um usuário: diff --git a/dist/languages/pt_PT.ts b/dist/languages/pt_PT.ts index da8aa6d13..0a526cb12 100644 --- a/dist/languages/pt_PT.ts +++ b/dist/languages/pt_PT.ts @@ -1127,78 +1127,78 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP.Configuração yuzu - - + + Audio Audio - - + + CPU CPU - + Debug Depurar - + Filesystem Sistema de Ficheiros - - + + General Geral - - + + Graphics Gráficos - + GraphicsAdvanced GráficosAvançados - + Hotkeys Teclas de Atalhos - - + + Controls Controlos - + Profiles Perfis - + Network Rede - - + + System Sistema - + Game List Lista de Jogos - + Web Rede @@ -1373,41 +1373,36 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - Extended memory layout (8GB DRAM) - - - - Confirm exit while emulation is running Confirme a saída enquanto a emulação está em execução - + Prompt for user on game boot Solicitar para o utilizador na inicialização do jogo - + Pause emulation when in background Pausar o emulador quando estiver em segundo plano - + Hide mouse on inactivity Esconder rato quando inactivo. - + Reset All Settings Restaurar todas as configurações - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Isto restaura todas as configurações e remove as configurações específicas de cada jogo. As pastas de jogos, perfis de jogos e perfis de controlo não serão removidos. Continuar? @@ -1446,7 +1441,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + None Nenhum @@ -1472,231 +1467,269 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. + VSync Mode: + + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: Emulação NVDEC: - + No Video Output Sem saída de vídeo - + CPU Video Decoding Decodificação de vídeo pela CPU - + GPU Video Decoding (Default) Decodificação de vídeo pela GPU (Padrão) - + Fullscreen Mode: Tela Cheia - + Borderless Windowed Janela sem bordas - + Exclusive Fullscreen Tela cheia exclusiva - + Aspect Ratio: Proporção do Ecrã: - + Default (16:9) Padrão (16:9) - + Force 4:3 Forçar 4:3 - + Force 21:9 Forçar 21:9 - + Force 16:10 Forçar 16:10 - + Stretch to Window Esticar à Janela - + Resolution: Resolução: - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [EXPERIMENTAL] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [EXPERIMENTAL] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] 1.5X (1080p/1620p) [EXPERIMENTAL] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) 7X (5040p/7560p) - + 8X (5760p/8640p) 8X (5760p/8640p) - + Window Adapting Filter: Filtro de adaptação de janela: - + Nearest Neighbor Vizinho mais próximo - + Bilinear Bilinear - + Bicubic Bicúbico - + Gaussian Gaussiano - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: Método de Anti-Aliasing - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness Usar FSR Sharpness global - + Set FSR Sharpness Definir FSR Sharpness - + FSR Sharpness: FSR Sharpness: - + 100% 100% - - + + Use global background color Usar cor de fundo global - + Set background color: Definir cor de fundo: - + Background Color: Cor de fundo: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (Shaders Assembly, apenas NVIDIA) - + SPIR-V (Experimental, Mesa Only) SPIR-V (Experimental, Somente Mesa) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + + + + + VSync Off + + + + + Recommended + + + + + On + + + + + VSync On + + ConfigureGraphicsAdvanced @@ -1721,107 +1754,133 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP.Nível de Precisão: - + + ASTC recompression: + + + + + Uncompressed (Best quality) + + + + + BC1 (Low quality) + + + + + BC3 (Medium quality) + + + + + Enable asynchronous presentation (Vulkan only) + + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. Executa trabalho em segundo plano aguardando pelos comandos gráficos para evitar a GPU de reduzir seu clock. - + Force maximum clocks (Vulkan only) Forçar clock máximo (somente Vulkan) - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - O Vsync previne cortes na imagem, mas algumas placas gráficas têm performance mais baixa com o Vsync activo. Mantém-no activo se não notares diferença na performance. - - - - Use VSync - Usar VSync - - - + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. Habilitar decodificação assíncrona de texturas ASTC, isso pode reduzir interrupções no tempo de carga. Essa funcionalidade é experimental. - + Decode ASTC textures asynchronously (Hack) Decodificação assíncrona de texturas ASTC (Hack) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + + + + + Enable Reactive Flushing + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Activa a compilação de shader assíncrona, podendo reduzir o engasgue do shader. Esta função é experimental. - + Use asynchronous shader building (Hack) Usar compilação assíncrona de shaders (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Ativa um tempo de resposta rápido da GPU. Esta opção forçará a maioria dos jogos a rodar em sua resolução nativa mais alta. - + Use Fast GPU Time (Hack) Usar tempo de resposta rápido da GPU (Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - Habilita limpeza de buffer pessimista. Essa opção irá forçar que buffer não modificados sejam eliminados, que pode causar impacto na performance. - - - - Use pessimistic buffer flushes (Hack) - Usar limpeza de buffer pessimista (Hack) - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. Habilita cache de pipeline específico do fabricante. Essa opção pode melhorar o tempo de carga dos shaders significativamente nos casos onde o driver do Vulkan não armazena os arquivos cache de pipeline internamente. - + Use Vulkan pipeline cache Utilizar cache de pipeline do Vulkan - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + + + + + Enable Compute Pipelines (Intel Vulkan only) + + + + Anisotropic Filtering: Filtro Anisotrópico: - + Automatic Automático - + Default Padrão - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1854,70 +1913,65 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP.Restaurar Padrões - + Action Ação - + Hotkey Tecla de Atalho - + Controller Hotkey Atalho do controle - - - + + + Conflicting Key Sequence Sequência de teclas em conflito - - + + The entered key sequence is already assigned to: %1 A sequência de teclas inserida já está atribuída a: %1 - - Home+%1 - Home+%1 - - - + [waiting] [em espera] - + Invalid Inválido - + Restore Default Restaurar Padrão - + Clear Limpar - + Conflicting Button Sequence Sequência de botões conflitante - + The default button sequence is already assigned to: %1 A sequência de botões padrão já está vinculada a %1 - + The default key sequence is already assigned to: %1 A sequência de teclas padrão já está atribuída a: %1 @@ -2209,7 +2263,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Configure Configurar @@ -2266,22 +2320,32 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP.Habilitar driver direto do Pro Controller [EXPERIMENTAL] - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + + + + + Use random Amiibo ID + + + + Enable mouse panning Ativar o giro do mouse - + Mouse sensitivity Sensibilidade do rato - + % % - + Motion / Touch Movimento / Toque @@ -2393,7 +2457,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Left Stick Analógico Esquerdo @@ -2487,14 +2551,14 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + L L - + ZL ZL @@ -2513,7 +2577,7 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Plus Mais @@ -2526,15 +2590,15 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - - + + R R - + ZR ZR @@ -2591,241 +2655,247 @@ Isto banirá tanto o nome de usuário do fórum como o endereço IP. - + Right Stick Analógico Direito - - - - + + + + Clear Limpar - - - - - + + + + + [not set] [não definido] - - + + + Invert button Inverter botão - - + + Toggle button Alternar pressionamento do botão - + Turbo button Botão Turbo - - + + Invert axis Inverter eixo - - - + + + Set threshold Definir limite - - + + Choose a value between 0% and 100% Escolha um valor entre 0% e 100% - + Toggle axis Alternar eixos - + Set gyro threshold Definir limite do giroscópio - + + Calibrate sensor + + + + Map Analog Stick Mapear analógicos - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Após pressionar OK, mova o seu analógico primeiro horizontalmente e depois verticalmente. Para inverter os eixos, mova o seu analógico primeiro verticalmente e depois horizontalmente. - + Center axis Eixo central - - + + Deadzone: %1% Ponto Morto: %1% - - + + Modifier Range: %1% Modificador de Alcance: %1% - - + + Pro Controller Comando Pro - + Dual Joycons Joycons Duplos - + Left Joycon Joycon Esquerdo - + Right Joycon Joycon Direito - + Handheld Portátil - + GameCube Controller Controlador de depuração - + Poke Ball Plus Poke Ball Plus - + NES Controller Controle NES - + SNES Controller Controle SNES - + N64 Controller Controle N64 - + Sega Genesis Mega Drive - + Start / Pause Iniciar / Pausar - + Z Z - + Control Stick Direcional de controle - + C-Stick C-Stick - + Shake! Abane! - + [waiting] [em espera] - + New Profile Novo Perfil - + Enter a profile name: Introduza um novo nome de perfil: - - + + Create Input Profile Criar perfil de controlo - + The given profile name is not valid! O nome de perfil dado não é válido! - + Failed to create the input profile "%1" Falha ao criar o perfil de controlo "%1" - + Delete Input Profile Apagar Perfil de Controlo - + Failed to delete the input profile "%1" Falha ao apagar o perfil de controlo "%1" - + Load Input Profile Carregar perfil de controlo - + Failed to load the input profile "%1" Falha ao carregar o perfil de controlo "%1" - + Save Input Profile Guardar perfil de controlo - + Failed to save the input profile "%1" Falha ao guardar o perfil de controlo "%1" @@ -3080,47 +3150,47 @@ Para inverter os eixos, mova o seu analógico primeiro verticalmente e depois ho Desenvolvedor - + Add-Ons Add-Ons - + General Geral - + System Sistema - + CPU CPU - + Graphics Gráficos - + Adv. Graphics Gráficos Avç. - + Audio Audio - + Input Profiles Perfis de controle - + Properties Propriedades @@ -3841,7 +3911,12 @@ UUID: %2 Nome do Dispositivo - + + Unsafe extended memory layout (8GB DRAM) + + + + System settings are available only when game is not running. As configurações do sistema estão disponíveis apenas quando o jogo não está em execução. @@ -4537,954 +4612,959 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Dados anônimos são coletados</a>para ajudar a melhorar o yuzu.<br/><br/>Gostaria de compartilhar seus dados de uso conosco? - + Telemetry Telemetria - + Broken Vulkan Installation Detected Detectada Instalação Defeituosa do Vulkan - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. A inicialização do Vulkan falhou durante a carga do programa. <br><br>Clique <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>aqui para instruções de como resolver o problema</a>. - + Loading Web Applet... A Carregar o Web Applet ... - - + + Disable Web Applet Desativar Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) A desativação do applet da web pode causar comportamento inesperado e deve apenas ser usada com Super Mario 3D All-Stars. Você deseja mesmo desativar o applet da web? (Ele pode ser reativado nas configurações de depuração.) - + The amount of shaders currently being built Quantidade de shaders a serem construídos - + The current selected resolution scaling multiplier. O atualmente multiplicador de escala de resolução selecionado. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Velocidade da emulação actual. Valores acima ou abaixo de 100% indicam que a emulação está sendo executada mais depressa ou mais devagar do que a Switch - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Quantos quadros por segundo o jogo está exibindo de momento. Isto irá variar de jogo para jogo e de cena para cena. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tempo gasto para emular um frame da Switch, sem contar o a limitação de quadros ou o v-sync. Para emulação de velocidade máxima, esta deve ser no máximo 16.67 ms. - + &Clear Recent Files &Limpar arquivos recentes - + Emulated mouse is enabled Mouse emulado está habilitado - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. Controle de mouse real e controle panorâmico do mouse são incompatíveis. Por favor desabilite a emulação do mouse em configurações avançadas de controles para permitir o controle panorâmico do mouse. - + &Continue &Continuar - + &Pause &Pausa - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu está rodando um jogo - + Warning Outdated Game Format Aviso de Formato de Jogo Desactualizado - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Você está usando o formato de directório ROM desconstruído para este jogo, que é um formato desactualizado que foi substituído por outros, como NCA, NAX, XCI ou NSP. Os directórios de ROM não construídos não possuem ícones, metadados e suporte de actualização.<br><br>Para uma explicação dos vários formatos de Switch que o yuzu suporta,<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Verifique a nossa Wiki</a>. Esta mensagem não será mostrada novamente. - - + + Error while loading ROM! Erro ao carregar o ROM! - + The ROM format is not supported. O formato do ROM não é suportado. - + An error occurred initializing the video core. Ocorreu um erro ao inicializar o núcleo do vídeo. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu encontrou um erro enquanto rodando o núcleo de vídeo. Normalmente isto é causado por drivers de GPU desatualizados, incluindo integrados. Por favor veja o registro para mais detalhes. Para mais informações em acesso ao registro por favor veja a seguinte página: <a href='https://yuzu-emu.org/help/reference/log-files/'>Como fazer envio de arquivo de registro</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Erro ao carregar a ROM! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>a guia de início rápido do yuzu</a> para fazer o redespejo dos seus arquivos.<br>Você pode consultar a wiki do yuzu</a> ou o Discord do yuzu</a> para obter ajuda. - + An unknown error occurred. Please see the log for more details. Ocorreu um erro desconhecido. Por favor, veja o log para mais detalhes. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Encerrando software... - + Save Data Save Data - + Mod Data Mod Data - + Error Opening %1 Folder Erro ao abrir a pasta %1 - - + + Folder does not exist! A Pasta não existe! - + Error Opening Transferable Shader Cache Erro ao abrir os Shader Cache transferíveis - + Failed to create the shader cache directory for this title. Falha ao criar o diretório de cache de shaders para este título. - + Error Removing Contents Erro Removendo Conteúdos - + Error Removing Update Erro ao Remover Atualização - + Error Removing DLC Erro Removendo DLC - + Remove Installed Game Contents? Remover Conteúdo Instalado do Jogo? - + Remove Installed Game Update? Remover Atualização Instalada do Jogo? - + Remove Installed Game DLC? Remover DLC Instalada do Jogo? - + Remove Entry Remover Entrada - - - - - - + + + + + + Successfully Removed Removido com Sucesso - + Successfully removed the installed base game. Removida a instalação do jogo base com sucesso. - + The base game is not installed in the NAND and cannot be removed. O jogo base não está instalado no NAND e não pode ser removido. - + Successfully removed the installed update. Removida a actualização instalada com sucesso. - + There is no update installed for this title. Não há actualização instalada neste título. - + There are no DLC installed for this title. Não há DLC instalado neste título. - + Successfully removed %1 installed DLC. Removido DLC instalado %1 com sucesso. - + Delete OpenGL Transferable Shader Cache? Apagar o cache de shaders transferível do OpenGL? - + Delete Vulkan Transferable Shader Cache? Apagar o cache de shaders transferível do Vulkan? - + Delete All Transferable Shader Caches? Apagar todos os caches de shaders transferíveis? - + Remove Custom Game Configuration? Remover Configuração Personalizada do Jogo? - + + Remove Cache Storage? + + + + Remove File Remover Ficheiro - - + + Error Removing Transferable Shader Cache Error ao Remover Cache de Shader Transferível - - + + A shader cache for this title does not exist. O Shader Cache para este titulo não existe. - + Successfully removed the transferable shader cache. Removido a Cache de Shader Transferível com Sucesso. - + Failed to remove the transferable shader cache. Falha ao remover a cache de shader transferível. - + Error Removing Vulkan Driver Pipeline Cache Erro ao Remover Cache de Pipeline do Driver Vulkan - + Failed to remove the driver pipeline cache. Falha ao remover o pipeline de cache do driver. - - + + Error Removing Transferable Shader Caches Erro ao remover os caches de shaders transferíveis - + Successfully removed the transferable shader caches. Os caches de shaders transferíveis foram removidos com sucesso. - + Failed to remove the transferable shader cache directory. Falha ao remover o diretório do cache de shaders transferível. - - + + Error Removing Custom Configuration Erro ao Remover Configuração Personalizada - + A custom configuration for this title does not exist. Não existe uma configuração personalizada para este titúlo. - + Successfully removed the custom game configuration. Removida a configuração personalizada do jogo com sucesso. - + Failed to remove the custom game configuration. Falha ao remover a configuração personalizada do jogo. - - + + RomFS Extraction Failed! A Extração de RomFS falhou! - + There was an error copying the RomFS files or the user cancelled the operation. Houve um erro ao copiar os arquivos RomFS ou o usuário cancelou a operação. - + Full Cheio - + Skeleton Esqueleto - + Select RomFS Dump Mode Selecione o modo de despejo do RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Por favor, selecione a forma como você gostaria que o RomFS fosse despejado<br>Full irá copiar todos os arquivos para o novo diretório enquanto<br>skeleton criará apenas a estrutura de diretórios. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root Não há espaço suficiente em %1 para extrair o RomFS. Por favor abra espaço ou selecione um diretório diferente em Emulação > Configurar > Sistema > Sistema de arquivos > Extrair raiz - + Extracting RomFS... Extraindo o RomFS ... - - + + Cancel Cancelar - + RomFS Extraction Succeeded! Extração de RomFS Bem-Sucedida! - + The operation completed successfully. A operação foi completa com sucesso. - - - - - + + + + + Create Shortcut Criar Atalho - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Isso irá criar um atalho para o AppImage atual. Isso pode não funcionar corretamente se você fizer uma atualização. Continuar? - + Cannot create shortcut on desktop. Path "%1" does not exist. Não foi possível criar um atalho na área de trabalho. O caminho "%1" não existe. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Não foi possível criar um atalho no menu de aplicativos. O caminho "%1" não existe e não pode ser criado. - + Create Icon Criar Ícone - + Cannot create icon file. Path "%1" does not exist and cannot be created. Não foi possível criar o arquivo de ícone. O caminho "%1" não existe e não pode ser criado. - + Start %1 with the yuzu Emulator Iniciar %1 com o Emulador Yuzu - + Failed to create a shortcut at %1 Falha ao criar um atalho em %1 - + Successfully created a shortcut to %1 Atalho criado com sucesso em %1 - + Error Opening %1 Erro ao abrir %1 - + Select Directory Selecione o Diretório - + Properties Propriedades - + The game properties could not be loaded. As propriedades do jogo não puderam ser carregadas. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Executáveis Switch (%1);;Todos os Ficheiros (*.*) - + Load File Carregar Ficheiro - + Open Extracted ROM Directory Abrir o directório ROM extraído - + Invalid Directory Selected Diretório inválido selecionado - + The directory you have selected does not contain a 'main' file. O diretório que você selecionou não contém um arquivo 'Main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Ficheiro Switch Instalável (*.nca *.nsp *.xci);;Arquivo de Conteúdo Nintendo (*.nca);;Pacote de Envio Nintendo (*.nsp);;Imagem de Cartucho NX (*.xci) - + Install Files Instalar Ficheiros - + %n file(s) remaining - + Installing file "%1"... Instalando arquivo "%1"... - - + + Install Results Instalar Resultados - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Para evitar possíveis conflitos, desencorajamos que os utilizadores instalem os jogos base na NAND. Por favor, use esse recurso apenas para instalar atualizações e DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Aplicação do sistema - + System Archive Arquivo do sistema - + System Application Update Atualização do aplicativo do sistema - + Firmware Package (Type A) Pacote de Firmware (Tipo A) - + Firmware Package (Type B) Pacote de Firmware (Tipo B) - + Game Jogo - + Game Update Actualização do Jogo - + Game DLC DLC do Jogo - + Delta Title Título Delta - + Select NCA Install Type... Selecione o tipo de instalação do NCA ... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Por favor, selecione o tipo de título que você gostaria de instalar este NCA como: (Na maioria dos casos, o padrão 'Jogo' é suficiente). - + Failed to Install Falha na instalação - + The title type you selected for the NCA is invalid. O tipo de título que você selecionou para o NCA é inválido. - + File not found Arquivo não encontrado - + File "%1" not found Arquivo "%1" não encontrado - + OK OK - - + + Hardware requirements not met Requisitos de hardware não atendidos - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Seu sistema não atende os requisitos de harwdare. O relatório de compatibilidade foi desabilitado. - + Missing yuzu Account Conta Yuzu Ausente - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Para enviar um caso de teste de compatibilidade de jogos, você deve vincular sua conta yuzu.<br><br/>Para vincular sua conta yuzu, vá para Emulação &gt; Configuração &gt; Rede. - + Error opening URL Erro ao abrir URL - + Unable to open the URL "%1". Não foi possível abrir o URL "%1". - + TAS Recording Gravando TAS - + Overwrite file of player 1? Sobrescrever arquivo do jogador 1? - + Invalid config detected Configação inválida detectada - + Handheld controller can't be used on docked mode. Pro controller will be selected. O comando portátil não pode ser usado no modo encaixado na base. O Pro controller será selecionado. - - + + Amiibo Amiibo - - + + The current amiibo has been removed O amiibo atual foi removido - + Error Erro - - + + The current game is not looking for amiibos O jogo atual não está procurando amiibos - + Amiibo File (%1);; All Files (*.*) Arquivo Amiibo (%1);; Todos os Arquivos (*.*) - + Load Amiibo Carregar Amiibo - + Error loading Amiibo data Erro ao carregar dados do Amiibo - + The selected file is not a valid amiibo O arquivo selecionado não é um amiibo válido - + The selected file is already on use O arquivo selecionado já está em uso - + An unknown error occurred Ocorreu um erro desconhecido - + Capture Screenshot Captura de Tela - + PNG Image (*.png) Imagem PNG (*.png) - + TAS state: Running %1/%2 Situação TAS: Rodando %1%2 - + TAS state: Recording %1 Situação TAS: Gravando %1 - + TAS state: Idle %1/%2 Situação TAS: Repouso %1%2 - + TAS State: Invalid Situação TAS: Inválido - + &Stop Running &Parar de rodar - + &Start &Começar - + Stop R&ecording Parar G&ravação - + R&ecord G&ravação - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor Escala: %1x - + Speed: %1% / %2% Velocidade: %1% / %2% - + Speed: %1% Velocidade: %1% - + Game: %1 FPS (Unlocked) Jogo: %1 FPS (Desbloqueado) - + Game: %1 FPS Jogo: %1 FPS - + Frame: %1 ms Quadro: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU ALTA - + GPU EXTREME GPU EXTREMA - + GPU ERROR ERRO DE GPU - + DOCKED ANCORADO - + HANDHELD PORTÁTIL - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULO - + NEAREST VIZINHO - - + + BILINEAR BILINEAR - + BICUBIC BICÚBICO - + GAUSSIAN GAUSSIANO - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA Sem AA - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE VOLUME: MUDO - + VOLUME: %1% Volume percentage (e.g. 50%) VOLUME: %1% - + Confirm Key Rederivation Confirme a rederivação da chave - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5501,37 +5581,37 @@ e opcionalmente faça backups. Isso irá excluir os seus arquivos de chave gerados automaticamente e executará novamente o módulo de derivação de chave. - + Missing fuses Fusíveis em Falta - + - Missing BOOT0 - BOOT0 em Falta - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main em Falta - + - Missing PRODINFO - PRODINFO em Falta - + Derivation Components Missing Componentes de Derivação em Falta - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Chaves de encriptação faltando. <br>Por favor, siga <a href='https://yuzu-emu.org/help/quickstart/'>o guia de início rápido</a> para extrair suas chaves, firmware e jogos. <br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5540,39 +5620,49 @@ Isto pode demorar até um minuto, dependendo do desempenho do seu sistema. - + Deriving Keys Derivando Chaves - + + System Archive Decryption Failed + + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target Selecione o destino de despejo do RomFS - + Please select which RomFS you would like to dump. Por favor, selecione qual o RomFS que você gostaria de despejar. - + Are you sure you want to close yuzu? Tem a certeza que quer fechar o yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Tem a certeza de que quer parar a emulação? Qualquer progresso não salvo será perdido. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5584,44 +5674,44 @@ Deseja ignorar isso e sair mesmo assim? GRenderWindow - - + + OpenGL not available! OpenGL não está disponível! - + OpenGL shared contexts are not supported. Shared contexts do OpenGL não são suportados. - + yuzu has not been compiled with OpenGL support. yuzu não foi compilado com suporte OpenGL. + - Error while initializing OpenGL! Erro ao inicializar OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. O seu GPU pode não suportar OpenGL, ou não tem os drivers gráficos mais recentes. - + Error while initializing OpenGL 4.6! Erro ao inicializar o OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 O teu GPU pode não suportar OpenGL 4.6, ou não tem os drivers gráficos mais recentes. - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Sua GPU pode não suportar uma ou mais extensões necessárias do OpenGL. Verifique se você possui a última versão dos drivers gráficos.<br><br>Renderizador GL:<br>%1<br><br>Extensões não suportadas:<br>%2 @@ -5680,117 +5770,122 @@ Deseja ignorar isso e sair mesmo assim? + Remove Cache Storage + + + + Remove OpenGL Pipeline Cache Remover cache de pipeline do OpenGL - + Remove Vulkan Pipeline Cache Remover cache de pipeline do Vulkan - + Remove All Pipeline Caches Remover todos os caches de pipeline - + Remove All Installed Contents Remover Todos os Conteúdos Instalados - + Dump RomFS Despejar RomFS - + Dump RomFS to SDMC Extrair RomFS para SDMC - + Copy Title ID to Clipboard Copiar título de ID para a área de transferência - + Navigate to GameDB entry Navegue para a Entrada da Base de Dados de Jogos - + Create Shortcut Criar Atalho - + Add to Desktop Adicionar à Área de Trabalho - + Add to Applications Menu Adicionar ao Menu de Aplicativos - + Properties Propriedades - + Scan Subfolders Examinar Sub-pastas - + Remove Game Directory Remover diretório do Jogo - + ▲ Move Up ▲ Mover para Cima - + ▼ Move Down ▼ Mover para Baixo - + Open Directory Location Abrir Localização do diretório - + Clear Limpar - + Name Nome - + Compatibility Compatibilidade - + Add-ons Add-ons - + File type Tipo de Arquivo - + Size Tamanho @@ -5861,7 +5956,7 @@ Deseja ignorar isso e sair mesmo assim? GameListPlaceholder - + Double-click to add a new folder to the game list Clique duas vezes para adicionar uma nova pasta à lista de jogos @@ -5874,12 +5969,12 @@ Deseja ignorar isso e sair mesmo assim? - + Filter: Filtro: - + Enter pattern to filter Digite o padrão para filtrar @@ -5970,12 +6065,11 @@ Mensagem de depuração: Hotkeys - + Audio Mute/Unmute Mutar/Desmutar Áudio - @@ -5997,111 +6091,112 @@ Mensagem de depuração: + Main Window Janela Principal - + Audio Volume Down Volume Menos - + Audio Volume Up Volume Mais - + Capture Screenshot Captura de Tela - + Change Adapting Filter Alterar Filtro de Adaptação - + Change Docked Mode Alterar Modo de Ancoragem - + Change GPU Accuracy Alterar Precisão da GPU - + Continue/Pause Emulation Continuar/Pausar Emulação - + Exit Fullscreen Sair da Tela Cheia - + Exit yuzu Sair do yuzu - + Fullscreen Tela Cheia - + Load File Carregar Ficheiro - + Load/Remove Amiibo Carregar/Remover Amiibo - + Restart Emulation Reiniciar Emulação - + Stop Emulation Parar Emulação - + TAS Record Gravar TAS - + TAS Reset Reiniciar TAS - + TAS Start/Stop Iniciar/Parar TAS - + Toggle Filter Bar Alternar Barra de Filtro - + Toggle Framerate Limit Alternar Limite de Quadros por Segundo - + Toggle Mouse Panning Alternar o Giro do Mouse - + Toggle Status Bar Alternar Barra de Status @@ -6791,7 +6886,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE INICIAR/PAUSAR @@ -6841,21 +6936,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6863,8 +6958,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [não configurado] @@ -6879,10 +6974,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Eixo %1%2 @@ -6896,163 +6991,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [Desconhecido] - - + + Left Esquerda - - + + Right Direita - - + + Down Baixo - - + + Up Cima - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Começar - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle Círculo - + Cross Cruz - + Square Quadrado - + Triangle Triângulo - + Share Compartilhar - + Options Opções - + [undefined] [indefinido] @@ -7063,7 +7158,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [inválido] @@ -7077,21 +7172,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2Eixo %3 - + %1%2Axis %3,%4,%5 %1%2Eixo %3,%4,%5 - + %1%2Motion %3 %1%2Movimentação %3 @@ -7103,106 +7196,112 @@ p, li { white-space: pre-wrap; } - + [unused] [sem uso] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L - + Stick R - + Plus Mais - + Minus Menos - - + + Home Home - + Capture Capturar - + Touch Toque - + Wheel Indicates the mouse wheel Volante - + Backward Para trás - + Forward Para a frente - + Task Tarefa - + Extra Extra - + %1%2%3%4 - - + + %1%2%3Hat %4 - - + + + %1%2%3Axis %4 + + + + + %1%2%3Button %4 @@ -7623,73 +7722,73 @@ Tente novamente ou entre em contato com o desenvolvedor do software.Utilizadores - + Profile Creator - - + + Profile Selector Seleccionador de Perfil - + Profile Icon Editor - + Profile Nickname Editor - + Who will receive the points? - + Who is using Nintendo eShop? - + Who is making this purchase? - + Who is posting? - + Select a user to link to a Nintendo Account. - + Change settings for which user? - + Format data for which user? - + Which user will be transferred to another console? - + Send save data for which user? - + Select a user: Selecione um usuário: diff --git a/dist/languages/ru_RU.ts b/dist/languages/ru_RU.ts index 898c1800c..672fa78b0 100644 --- a/dist/languages/ru_RU.ts +++ b/dist/languages/ru_RU.ts @@ -1039,7 +1039,7 @@ This would ban both their forum username and their IP address. Enable Debug Asserts - Включить отладочные сигналы + Включить отладочные утверждения @@ -1137,78 +1137,78 @@ This would ban both their forum username and their IP address. Параметры yuzu - - + + Audio Звук - - + + CPU ЦП - + Debug Отладка - + Filesystem Файловая система - - + + General Общие - - + + Graphics Графика - + GraphicsAdvanced ГрафикаРасширенные - + Hotkeys Горячие клавиши - - + + Controls Управление - + Profiles Профили - + Network Сеть - - + + System Система - + Game List Список игр - + Web Сеть @@ -1383,41 +1383,36 @@ This would ban both their forum username and their IP address. - Extended memory layout (8GB DRAM) - Расширенная компоновка памяти (8 ГБ DRAM) - - - Confirm exit while emulation is running Подтверждать выход во время эмуляции - + Prompt for user on game boot Спрашивать пользователя при запуске игры - + Pause emulation when in background Приостанавливать эмуляцию в фоновом режиме - + Hide mouse on inactivity Спрятать мышь при неактивности - + Reset All Settings Сбросить все настройки - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Это сбросит все настройки и удалит все конфигурации под отдельные игры. При этом не будут удалены пути для игр, профили или профили ввода. Продолжить? @@ -1456,7 +1451,7 @@ This would ban both their forum username and their IP address. - + None Выкл. @@ -1482,231 +1477,272 @@ This would ban both their forum username and their IP address. + VSync Mode: + Режим верт. синхронизации: + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + FIFO (VSync) не пропускает кадры и не имеет разрывов, но ограничен частотой обновления экрана. +FIFO Relaxed похож на FIFO, но может иметь разрывы при восстановлении после просадок. +Mailbox может иметь меньшую задержку, чем FIFO, и не имеет разрывов, но может пропускать кадры. +Моментальный (без синхронизации) просто показывает все кадры и может иметь разрывы. + + + NVDEC emulation: Эмуляция NVDEC: - + No Video Output Отсутствие видеовыхода - + CPU Video Decoding Декодирование видео на ЦП - + GPU Video Decoding (Default) Декодирование видео на ГП (по умолчанию) - + Fullscreen Mode: Полноэкранный режим: - + Borderless Windowed Окно без границ - + Exclusive Fullscreen Эксклюзивный полноэкранный - + Aspect Ratio: Соотношение сторон: - + Default (16:9) Стандартное (16:9) - + Force 4:3 Заставить 4:3 - + Force 21:9 Заставить 21:9 - + Force 16:10 Заставить 16:10 - + Stretch to Window Растянуть до окна - + Resolution: Разрешение: - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [ЭКСПЕРИМЕНТАЛЬНО] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [ЭКСПЕРИМЕНТАЛЬНО] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] 1.5X (1080p/1620p) [ЭКСПЕРИМЕНТАЛЬНО] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) 7X (5040p/7560p) - + 8X (5760p/8640p) 8X (5760p/8640p) - + Window Adapting Filter: Фильтр адаптации окна: - + Nearest Neighbor Ближайший сосед - + Bilinear Билинейный - + Bicubic Бикубический - + Gaussian Гаусс - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: Метод сглаживания: - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness Использовать глобальную резкость FSR - + Set FSR Sharpness Установить резкость FSR - + FSR Sharpness: Резкость FSR: - + 100% 100% - - + + Use global background color Использовать общий фоновый цвет - + Set background color: Установить фоновый цвет: - + Background Color: Фоновый цвет: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (ассемблерные шейдеры, только для NVIDIA) - + SPIR-V (Experimental, Mesa Only) SPIR-V (Экспериментально, только для Mesa) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + Отключена + + + + VSync Off + Верт. синхронизация отключена + + + + Recommended + Рекомендуется + + + + On + Включена + + + + VSync On + Верт. синхронизация включена + ConfigureGraphicsAdvanced @@ -1731,107 +1767,134 @@ This would ban both their forum username and their IP address. Уровень точности: - + + ASTC recompression: + Рекомпрессия ASTC: + + + + Uncompressed (Best quality) + Без сжатия (наилучшее качество) + + + + BC1 (Low quality) + BC1 (низкое качество) + + + + BC3 (Medium quality) + BC3 (среднее качество) + + + + Enable asynchronous presentation (Vulkan only) + Включите асинхронное отображение (только для Vulkan) + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. Выполняет работу в фоновом режиме в ожидании графических команд, не позволяя ГП снижать тактовую частоту. - + Force maximum clocks (Vulkan only) Принудительно заставить максимальную тактовую частоту (только для Vulkan) - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - Вертикальная синхронизация предотвращает разрывы экрана, но некоторые видеокарты имеют более низкую производительность при вертикальной синхронизации. Оставляйте включенным если вы не замечаете разницы в производительности. - - - - Use VSync - Использовать вертикальную синхронизацию - - - + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. Включает асинхронное декодирование текстур ASTC, что может уменьшить фризы при загрузке. Эта функция является экспериментальной. - + Decode ASTC textures asynchronously (Hack) Асинхронное декодирование текстур ASTC (Хак) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + Использует реактивную очистку вместо прогнозируемой. Это позволяет более точно синхронизировать память. + + + + Enable Reactive Flushing + Включить реактивную очистку + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Включает асинхронную компиляцию шейдеров, что уменьшит зависания из-за шейдеров. Функция является экспериментальной. - + Use asynchronous shader building (Hack) Использовать асинхронное построение шейдеров (Хак) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Включает функцию Fast GPU Time. Этот параметр заставит большинство игр работать в максимальном родном разрешении. - + Use Fast GPU Time (Hack) Включить Fast GPU Time (Хак) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - Включает пессимистическую очистку буферов. Эта опция заставляет промывать немодифицированные буферы, что может снизить производительность. - - - - Use pessimistic buffer flushes (Hack) - Использовать пессимистическую очистку буферов (Хак) - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. Включает кэш конвейера, специфичный для производителя ГП. Эта опция может значительно улучшить время загрузки шейдеров в тех случаях, когда драйвер Vulkan не хранит внутренние файлы кэша конвейера. - + Use Vulkan pipeline cache Использовать конвейерный кэш Vulkan - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + Включить вычислительные конвейеры, требуемые некоторыми играми. Этот параметр существует только для проприетарных драйверов Intel, и при его включении возможны сбои. +Вычислительные конвейеры всегда включены для всех остальных драйверов. + + + + Enable Compute Pipelines (Intel Vulkan only) + Включить вычислительные конвейеры (только для Intel Vulkan) + + + Anisotropic Filtering: Анизотропная фильтрация: - + Automatic Автоматически - + Default Стандартная - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1864,70 +1927,65 @@ This would ban both their forum username and their IP address. Ввостановить значения по умолчанию. - + Action Действие - + Hotkey Горячая клавиша - + Controller Hotkey Горячая клавиша контроллера - - - + + + Conflicting Key Sequence Конфликтующее сочетание клавиш - - + + The entered key sequence is already assigned to: %1 Введенное сочетание уже назначено на: %1 - - Home+%1 - Домой+%1 - - - + [waiting] [ожидание] - + Invalid Недопустимо - + Restore Default Ввостановить значение по умолчанию - + Clear Очистить - + Conflicting Button Sequence Конфликтующее сочетание кнопок - + The default button sequence is already assigned to: %1 Сочетание кнопок по умолчанию уже назначено на: %1 - + The default key sequence is already assigned to: %1 Сочетание клавиш по умолчанию уже назначено на: %1 @@ -2219,7 +2277,7 @@ This would ban both their forum username and their IP address. - + Configure Настроить @@ -2276,22 +2334,32 @@ This would ban both their forum username and their IP address. Включить прямой драйвер Pro Controller [ЭКСПЕРИМЕНТАЛЬНО] - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + Позволяет неограниченно использовать один и тот же Amiibo в играх, которые обычно разрешают только одно использование. + + + + Use random Amiibo ID + Использовать случайный идентификатор Amiibo + + + Enable mouse panning Включить панорамирование мыши - + Mouse sensitivity Чувствительность мыши - + % % - + Motion / Touch Движение и сенсор @@ -2403,7 +2471,7 @@ This would ban both their forum username and their IP address. - + Left Stick Левый мини-джойстик @@ -2497,14 +2565,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2523,7 +2591,7 @@ This would ban both their forum username and their IP address. - + Plus Плюс @@ -2536,15 +2604,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2601,241 +2669,247 @@ This would ban both their forum username and their IP address. - + Right Stick Правый мини-джойстик - - - - + + + + Clear Очистить - - - - - + + + + + [not set] [не задано] - - + + + Invert button Инвертировать кнопку - - + + Toggle button Переключить кнопку - + Turbo button Турбо кнопка - - + + Invert axis Инвертировать оси - - - + + + Set threshold Установить порог - - + + Choose a value between 0% and 100% Выберите значение между 0% и 100% - + Toggle axis Переключить оси - + Set gyro threshold Установить порог гироскопа - + + Calibrate sensor + Калибровка датчика + + + Map Analog Stick Задать аналоговый мини-джойстик - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. После нажатия на ОК, двигайте ваш мини-джойстик горизонтально, а затем вертикально. Чтобы инвертировать оси, сначала двигайте ваш мини-джойстик вертикально, а затем горизонтально. - + Center axis Центрировать оси - - + + Deadzone: %1% Мёртвая зона: %1% - - + + Modifier Range: %1% Диапазон модификатора: %1% - - + + Pro Controller Контроллер Pro - + Dual Joycons Двойные Joy-Con'ы - + Left Joycon Левый Joy-Сon - + Right Joycon Правый Joy-Сon - + Handheld Портативный - + GameCube Controller Контроллер GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Контроллер NES - + SNES Controller Контроллер SNES - + N64 Controller Контроллер N64 - + Sega Genesis Sega Genesis - + Start / Pause Старт / Пауза - + Z Z - + Control Stick Мини-джойстик управления - + C-Stick C-Джойстик - + Shake! Встряхните! - + [waiting] [ожидание] - + New Profile Новый профиль - + Enter a profile name: Введите имя профиля: - - + + Create Input Profile Создать профиль управления - + The given profile name is not valid! Заданное имя профиля недействительно! - + Failed to create the input profile "%1" Не удалось создать профиль управления "%1" - + Delete Input Profile Удалить профиль управления - + Failed to delete the input profile "%1" Не удалось удалить профиль управления "%1" - + Load Input Profile Загрузить профиль управления - + Failed to load the input profile "%1" Не удалось загрузить профиль управления "%1" - + Save Input Profile Сохранить профиль управления - + Failed to save the input profile "%1" Не удалось сохранить профиль управления "%1" @@ -3090,47 +3164,47 @@ To invert the axes, first move your joystick vertically, and then horizontally.< Разработчик - + Add-Ons Дополнения - + General Общие - + System Система - + CPU ЦП - + Graphics Графика - + Adv. Graphics Расш. Графика - + Audio Звук - + Input Profiles Профили управления - + Properties Свойства @@ -3851,7 +3925,12 @@ UUID: %2 Название устройства - + + Unsafe extended memory layout (8GB DRAM) + Небезопасное расширение компоновки памяти (8 ГБ DRAM) + + + System settings are available only when game is not running. Настройки системы доступны только тогда, когда игра не запущена. @@ -4547,555 +4626,560 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Анонимные данные собираются для того,</a> чтобы помочь улучшить работу yuzu. <br/><br/>Хотели бы вы делиться данными об использовании с нами? - + Telemetry Телеметрия - + Broken Vulkan Installation Detected Обнаружена поврежденная установка Vulkan - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. Не удалось выполнить инициализацию Vulkan во время загрузки.<br><br>Нажмите <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>здесь для получения инструкций по устранению проблемы</a>. - + Loading Web Applet... Загрузка веб-апплета... - - + + Disable Web Applet Отключить веб-апплет - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Отключение веб-апплета может привести к неожиданному поведению и должно использоваться только с Super Mario 3D All-Stars. Вы уверены, что хотите отключить веб-апплет? (Его можно снова включить в настройках отладки.) - + The amount of shaders currently being built Количество создаваемых шейдеров на данный момент - + The current selected resolution scaling multiplier. Текущий выбранный множитель масштабирования разрешения. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Текущая скорость эмуляции. Значения выше или ниже 100% указывают на то, что эмуляция идет быстрее или медленнее, чем на Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Количество кадров в секунду в данный момент. Значение будет меняться между играми и сценами. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Время, которое нужно для эмуляции 1 кадра Switch, не принимая во внимание ограничение FPS или вертикальную синхронизацию. Для эмуляции в полной скорости значение должно быть не больше 16,67 мс. - + &Clear Recent Files [&C] Очистить недавние файлы - + Emulated mouse is enabled Эмулированная мышь включена - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. Ввод реальной мыши и панорамирование мышью несовместимы. Пожалуйста, отключите эмулированную мышь в расширенных настройках ввода, чтобы разрешить панорамирование мышью. - + &Continue [&C] Продолжить - + &Pause [&P] Пауза - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping В yuzu запущена игра - + Warning Outdated Game Format Предупреждение устаревший формат игры - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Для этой игры вы используете разархивированный формат ROM'а, который является устаревшим и был заменен другими, такими как NCA, NAX, XCI или NSP. В разархивированных каталогах ROM'а отсутствуют иконки, метаданные и поддержка обновлений. <br><br>Для получения информации о различных форматах Switch, поддерживаемых yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>просмотрите нашу вики</a>. Это сообщение больше не будет отображаться. - - + + Error while loading ROM! Ошибка при загрузке ROM'а! - + The ROM format is not supported. Формат ROM'а не поддерживается. - + An error occurred initializing the video core. Произошла ошибка при инициализации видеоядра. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu столкнулся с ошибкой при запуске видеоядра. Обычно это вызвано устаревшими драйверами ГП, включая интегрированные. Проверьте журнал для получения более подробной информации. Дополнительную информацию о доступе к журналу смотрите на следующей странице: <a href='https://yuzu-emu.org/help/reference/log-files/'>Как загрузить файл журнала</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Ошибка при загрузке ROM'а! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Пожалуйста, следуйте <a href='https://yuzu-emu.org/help/quickstart/'>краткому руководству пользователя yuzu</a> чтобы пере-дампить ваши файлы<br>Вы можете обратиться к вики yuzu</a> или Discord yuzu</a> для помощи. - + An unknown error occurred. Please see the log for more details. Произошла неизвестная ошибка. Пожалуйста, проверьте журнал для подробностей. - + (64-bit) (64-х битный) - + (32-bit) (32-х битный) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Закрываем программу... - + Save Data Сохранения - + Mod Data Данные модов - + Error Opening %1 Folder Ошибка при открытии папки %1 - - + + Folder does not exist! Папка не существует! - + Error Opening Transferable Shader Cache Ошибка при открытии переносного кэша шейдеров - + Failed to create the shader cache directory for this title. Не удалось создать папку кэша шейдеров для этой игры. - + Error Removing Contents Ошибка при удалении содержимого - + Error Removing Update Ошибка при удалении обновлений - + Error Removing DLC Ошибка при удалении DLC - + Remove Installed Game Contents? Удалить установленное содержимое игр? - + Remove Installed Game Update? Удалить установленные обновления игры? - + Remove Installed Game DLC? Удалить установленные DLC игры? - + Remove Entry Удалить запись - - - - - - + + + + + + Successfully Removed Успешно удалено - + Successfully removed the installed base game. Установленная игра успешно удалена. - + The base game is not installed in the NAND and cannot be removed. Игра не установлена в NAND и не может быть удалена. - + Successfully removed the installed update. Установленное обновление успешно удалено. - + There is no update installed for this title. Для этой игры не было установлено обновление. - + There are no DLC installed for this title. Для этой игры не были установлены DLC. - + Successfully removed %1 installed DLC. Установленное DLC %1 было успешно удалено - + Delete OpenGL Transferable Shader Cache? Удалить переносной кэш шейдеров OpenGL? - + Delete Vulkan Transferable Shader Cache? Удалить переносной кэш шейдеров Vulkan? - + Delete All Transferable Shader Caches? Удалить весь переносной кэш шейдеров? - + Remove Custom Game Configuration? Удалить пользовательскую настройку игры? - + + Remove Cache Storage? + + + + Remove File Удалить файл - - + + Error Removing Transferable Shader Cache Ошибка при удалении переносного кэша шейдеров - - + + A shader cache for this title does not exist. Кэш шейдеров для этой игры не существует. - + Successfully removed the transferable shader cache. Переносной кэш шейдеров успешно удалён. - + Failed to remove the transferable shader cache. Не удалось удалить переносной кэш шейдеров. - + Error Removing Vulkan Driver Pipeline Cache Ошибка при удалении конвейерного кэша Vulkan - + Failed to remove the driver pipeline cache. Не удалось удалить конвейерный кэш шейдеров. - - + + Error Removing Transferable Shader Caches Ошибка при удалении переносного кэша шейдеров - + Successfully removed the transferable shader caches. Переносной кэш шейдеров успешно удален. - + Failed to remove the transferable shader cache directory. Ошибка при удалении папки переносного кэша шейдеров. - - + + Error Removing Custom Configuration Ошибка при удалении пользовательской настройки - + A custom configuration for this title does not exist. Пользовательская настройка для этой игры не существует. - + Successfully removed the custom game configuration. Пользовательская настройка игры успешно удалена. - + Failed to remove the custom game configuration. Не удалось удалить пользовательскую настройку игры. - - + + RomFS Extraction Failed! Не удалось извлечь RomFS! - + There was an error copying the RomFS files or the user cancelled the operation. Произошла ошибка при копировании файлов RomFS или пользователь отменил операцию. - + Full Полный - + Skeleton Скелет - + Select RomFS Dump Mode Выберите режим дампа RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Пожалуйста, выберите, как вы хотите выполнить дамп RomFS. <br>Полный скопирует все файлы в новую папку, в то время как <br>скелет создаст только структуру папок. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root В %1 недостаточно свободного места для извлечения RomFS. Пожалуйста, освободите место или выберите другую папку для дампа в Эмуляция > Настройка > Система > Файловая система > Корень дампа - + Extracting RomFS... Извлечение RomFS... - - + + Cancel Отмена - + RomFS Extraction Succeeded! Извлечение RomFS прошло успешно! - + The operation completed successfully. Операция выполнена. - - - - - + + + + + Create Shortcut Создать ярлык - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Это создаст ярлык для текущего AppImage. Он может не работать после обновлений. Продолжить? - + Cannot create shortcut on desktop. Path "%1" does not exist. Не удается создать ярлык на рабочем столе. Путь "%1" не существует. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Невозможно создать ярлык в меню приложений. Путь "%1" не существует и не может быть создан. - + Create Icon Создать иконку - + Cannot create icon file. Path "%1" does not exist and cannot be created. Невозможно создать файл иконки. Путь "%1" не существует и не может быть создан. - + Start %1 with the yuzu Emulator Запустить %1 с помощью эмулятора yuzu - + Failed to create a shortcut at %1 Не удалось создать ярлык в %1 - + Successfully created a shortcut to %1 Успешно создан ярлык в %1 - + Error Opening %1 Ошибка открытия %1 - + Select Directory Выбрать папку - + Properties Свойства - + The game properties could not be loaded. Не удалось загрузить свойства игры. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Исполняемый файл Switch (%1);;Все файлы (*.*) - + Load File Загрузить файл - + Open Extracted ROM Directory Открыть папку извлечённого ROM'а - + Invalid Directory Selected Выбрана недопустимая папка - + The directory you have selected does not contain a 'main' file. Папка, которую вы выбрали, не содержит файла 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Устанавливаемый файл Switch (*.nca, *.nsp, *.xci);;Архив контента Nintendo (*.nca);;Пакет подачи Nintendo (*.nsp);;Образ картриджа NX (*.xci) - + Install Files Установить файлы - + %n file(s) remaining Остался %n файлОсталось %n файл(ов)Осталось %n файл(ов)Осталось %n файл(ов) - + Installing file "%1"... Установка файла "%1"... - - + + Install Results Результаты установки - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Чтобы избежать возможных конфликтов, мы не рекомендуем пользователям устанавливать игры в NAND. Пожалуйста, используйте эту функцию только для установки обновлений и DLC. - + %n file(s) were newly installed %n файл был недавно установлен @@ -5105,7 +5189,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) were overwritten %n файл был перезаписан @@ -5115,7 +5199,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) failed to install %n файл не удалось установить @@ -5125,388 +5209,388 @@ Please, only use this feature to install updates and DLC. - + System Application Системное приложение - + System Archive Системный архив - + System Application Update Обновление системного приложения - + Firmware Package (Type A) Пакет прошивки (Тип А) - + Firmware Package (Type B) Пакет прошивки (Тип Б) - + Game Игра - + Game Update Обновление игры - + Game DLC DLC игры - + Delta Title Дельта-титул - + Select NCA Install Type... Выберите тип установки NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Пожалуйста, выберите тип приложения, который вы хотите установить для этого NCA: (В большинстве случаев, подходит стандартный выбор «Игра».) - + Failed to Install Ошибка установки - + The title type you selected for the NCA is invalid. Тип приложения, который вы выбрали для NCA, недействителен. - + File not found Файл не найден - + File "%1" not found Файл "%1" не найден - + OK ОК - - + + Hardware requirements not met Не удовлетворены системные требования - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Ваша система не соответствует рекомендуемым системным требованиям. Отчеты о совместимости были отключены. - + Missing yuzu Account Отсутствует аккаунт yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Чтобы отправить отчет о совместимости игры, необходимо привязать свою учетную запись yuzu.<br><br/>Чтобы привязать свою учетную запись yuzu, перейдите в раздел Эмуляция &gt; Параметры &gt; Сеть. - + Error opening URL Ошибка при открытии URL - + Unable to open the URL "%1". Не удалось открыть URL: "%1". - + TAS Recording Запись TAS - + Overwrite file of player 1? Перезаписать файл игрока 1? - + Invalid config detected Обнаружена недопустимая конфигурация - + Handheld controller can't be used on docked mode. Pro controller will be selected. Портативный контроллер не может быть использован в режиме док-станции. Будет выбран контроллер Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Текущий amiibo был убран - + Error Ошибка - - + + The current game is not looking for amiibos Текущая игра не ищет amiibo - + Amiibo File (%1);; All Files (*.*) Файл Amiibo (%1);; Все Файлы (*.*) - + Load Amiibo Загрузить Amiibo - + Error loading Amiibo data Ошибка загрузки данных Amiibo - + The selected file is not a valid amiibo Выбранный файл не является допустимым amiibo - + The selected file is already on use Выбранный файл уже используется - + An unknown error occurred Произошла неизвестная ошибка - + Capture Screenshot Сделать скриншот - + PNG Image (*.png) Изображение PNG (*.png) - + TAS state: Running %1/%2 Состояние TAS: Выполняется %1/%2 - + TAS state: Recording %1 Состояние TAS: Записывается %1 - + TAS state: Idle %1/%2 Состояние TAS: Простой %1/%2 - + TAS State: Invalid Состояние TAS: Неверное - + &Stop Running [&S] Остановка - + &Start [&S] Начать - + Stop R&ecording [&E] Закончить запись - + R&ecord [&E] Запись - + Building: %n shader(s) Постройка: %n шейдерПостройка: %n шейдер(ов)Постройка: %n шейдер(ов)Постройка: %n шейдер(ов) - + Scale: %1x %1 is the resolution scaling factor Масштаб: %1x - + Speed: %1% / %2% Скорость: %1% / %2% - + Speed: %1% Скорость: %1% - + Game: %1 FPS (Unlocked) Игра: %1 FPS (Неограниченно) - + Game: %1 FPS Игра: %1 FPS - + Frame: %1 ms Кадр: %1 мс - + GPU NORMAL ГП НОРМАЛЬНО - + GPU HIGH ГП ВЫСОКО - + GPU EXTREME ГП ЭКСТРИМ - + GPU ERROR ГП ОШИБКА - + DOCKED В ДОК-СТАНЦИИ - + HANDHELD ПОРТАТИВНЫЙ - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST БЛИЖАЙШИЙ - - + + BILINEAR БИЛИНЕЙНЫЙ - + BICUBIC БИКУБИЧЕСКИЙ - + GAUSSIAN ГАУСС - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA БЕЗ СГЛАЖИВАНИЯ - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE ГРОМКОСТЬ: ЗАГЛУШЕНА - + VOLUME: %1% Volume percentage (e.g. 50%) ГРОМКОСТЬ: %1% - + Confirm Key Rederivation Подтвердите перерасчет ключа - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5523,37 +5607,37 @@ This will delete your autogenerated key files and re-run the key derivation modu Это удалит ваши автоматически сгенерированные файлы ключей и повторно запустит модуль расчета ключей. - + Missing fuses Отсутствуют предохранители - + - Missing BOOT0 - Отсутствует BOOT0 - + - Missing BCPKG2-1-Normal-Main - Отсутствует BCPKG2-1-Normal-Main - + - Missing PRODINFO - Отсутствует PRODINFO - + Derivation Components Missing Компоненты расчета отсутствуют - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Ключи шифрования отсутствуют. <br>Пожалуйста, следуйте <a href='https://yuzu-emu.org/help/quickstart/'>краткому руководству пользователя yuzu</a>, чтобы получить все ваши ключи, прошивку и игры.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5562,39 +5646,49 @@ on your system's performance. от производительности вашей системы. - + Deriving Keys Получение ключей - + + System Archive Decryption Failed + Не удалось расшифровать системный архив + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + Ключи шифрования не смогли расшифровать прошивку. <br>Пожалуйста, следуйте <a href='https://yuzu-emu.org/help/quickstart/'>краткому руководству пользователя yuzu</a> чтобы получить все ваши ключи, прошивку и игры. + + + Select RomFS Dump Target Выберите цель для дампа RomFS - + Please select which RomFS you would like to dump. Пожалуйста, выберите, какой RomFS вы хотите сдампить. - + Are you sure you want to close yuzu? Вы уверены, что хотите закрыть yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Вы уверены, что хотите остановить эмуляцию? Любой несохраненный прогресс будет потерян. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5606,44 +5700,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGL не доступен! - + OpenGL shared contexts are not supported. Общие контексты OpenGL не поддерживаются. - + yuzu has not been compiled with OpenGL support. yuzu не был скомпилирован с поддержкой OpenGL. + - Error while initializing OpenGL! Ошибка при инициализации OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Ваш ГП может не поддерживать OpenGL, или у вас установлен устаревший графический драйвер. - + Error while initializing OpenGL 4.6! Ошибка при инициализации OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Ваш ГП может не поддерживать OpenGL 4.6, или у вас установлен устаревший графический драйвер.<br><br>Рендерер GL:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Ваш ГП может не поддерживать одно или несколько требуемых расширений OpenGL. Пожалуйста, убедитесь в том, что у вас установлен последний графический драйвер.<br><br>Рендерер GL:<br>%1<br><br>Неподдерживаемые расширения:<br>%2 @@ -5702,117 +5796,122 @@ Would you like to bypass this and exit anyway? + Remove Cache Storage + + + + Remove OpenGL Pipeline Cache Удалить кэш конвейера OpenGL - + Remove Vulkan Pipeline Cache Удалить кэш конвейера Vulkan - + Remove All Pipeline Caches Удалить весь кэш конвейеров - + Remove All Installed Contents Удалить все установленное содержимое - + Dump RomFS Дамп RomFS - + Dump RomFS to SDMC Сдампить RomFS в SDMC - + Copy Title ID to Clipboard Скопировать ID приложения в буфер обмена - + Navigate to GameDB entry Перейти к странице GameDB - + Create Shortcut Создать ярлык - + Add to Desktop Добавить на Рабочий стол - + Add to Applications Menu Добавить в меню приложений - + Properties Свойства - + Scan Subfolders Сканировать подпапки - + Remove Game Directory Удалить папку с играми - + ▲ Move Up ▲ Переместить вверх - + ▼ Move Down ▼ Переместить вниз - + Open Directory Location Открыть расположение папки - + Clear Очистить - + Name Имя - + Compatibility Совместимость - + Add-ons Дополнения - + File type Тип файла - + Size Размер @@ -5883,7 +5982,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list Нажмите дважды, чтобы добавить новую папку в список игр @@ -5896,12 +5995,12 @@ Would you like to bypass this and exit anyway? %1 из %n результат(ов)%1 из %n результат(ов)%1 из %n результат(ов)%1 из %n результат(ов) - + Filter: Поиск: - + Enter pattern to filter Введите текст для поиска @@ -5992,12 +6091,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute Включение/отключение звука - @@ -6019,111 +6117,112 @@ Debug Message: + Main Window Основное окно - + Audio Volume Down Уменьшить громкость звука - + Audio Volume Up Повысить громкость звука - + Capture Screenshot Сделать скриншот - + Change Adapting Filter Изменить адаптирующий фильтр - + Change Docked Mode Изменить режим консоли - + Change GPU Accuracy Изменить точность ГП - + Continue/Pause Emulation Продолжение/Пауза эмуляции - + Exit Fullscreen Выйти из полноэкранного режима - + Exit yuzu Выйти из yuzu - + Fullscreen Полный экран - + Load File Загрузить файл - + Load/Remove Amiibo Загрузить/удалить Amiibo - + Restart Emulation Перезапустить эмуляцию - + Stop Emulation Остановить эмуляцию - + TAS Record Запись TAS - + TAS Reset Сброс TAS - + TAS Start/Stop Старт/Стоп TAS - + Toggle Filter Bar Переключить панель поиска - + Toggle Framerate Limit Переключить ограничение частоты кадров - + Toggle Mouse Panning Переключить панорамирование мыши - + Toggle Status Bar Переключить панель состояния @@ -6816,7 +6915,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE СТАРТ/ПАУЗА @@ -6866,21 +6965,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6888,8 +6987,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [не задано] @@ -6904,10 +7003,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Ось %1%2 @@ -6921,163 +7020,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [неизвестно] - - + + Left Влево - - + + Right Вправо - - + + Down Вниз - - + + Up Вверх - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Start - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle Круг - + Cross Крестик - + Square Квадрат - + Triangle Треугольник - + Share Share - + Options Options - + [undefined] [не определено] @@ -7088,7 +7187,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [недопустимо] @@ -7102,21 +7201,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2Ось %3 - + %1%2Axis %3,%4,%5 %1%2Ось %3,%4,%5 - + %1%2Motion %3 %1%2Движение %3 @@ -7128,106 +7225,112 @@ p, li { white-space: pre-wrap; } - + [unused] [не используется] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L Левый стик - + Stick R Правый стик - + Plus Плюс - + Minus Минус - - + + Home Home - + Capture Захват - + Touch Сенсор - + Wheel Indicates the mouse wheel Колёсико - + Backward Назад - + Forward Вперёд - + Task Задача - + Extra Дополнительная - + %1%2%3%4 %1%2%3%4 - - + + %1%2%3Hat %4 %1%2%3Крест. %4 - - + + + %1%2%3Axis %4 + %1%2%3Ось %4 + + + + %1%2%3Button %4 %1%2%3Кнопка %4 @@ -7648,73 +7751,73 @@ Please try again or contact the developer of the software. Пользователи - + Profile Creator Создатель профиля - - + + Profile Selector Выбор профиля - + Profile Icon Editor Редактор иконки профиля - + Profile Nickname Editor Редактор никнейма профиля - + Who will receive the points? Кто будет получать очки? - + Who is using Nintendo eShop? Кто использует Nintendo eShop? - + Who is making this purchase? Кто совершает эту покупку? - + Who is posting? Кто публикует? - + Select a user to link to a Nintendo Account. Выберите пользователя для привязки к учетной записи Nintendo. - + Change settings for which user? Изменить настройки для какого пользователя? - + Format data for which user? Форматировать данные для какого пользователя? - + Which user will be transferred to another console? Какой пользователь будет переходить на другую консоль? - + Send save data for which user? Отправить сохранение какому пользователю? - + Select a user: Выберите пользователя: diff --git a/dist/languages/sv.ts b/dist/languages/sv.ts index 8c60a4942..7aa5f082e 100644 --- a/dist/languages/sv.ts +++ b/dist/languages/sv.ts @@ -1114,78 +1114,78 @@ avgjord kod.</div> yuzu Konfigurering - - + + Audio Ljud - - + + CPU CPU - + Debug Debug - + Filesystem Filsystem - - + + General Allmänt - - + + Graphics Grafik - + GraphicsAdvanced Avancerade grafikinställningar - + Hotkeys Snabbknappar - - + + Controls Kontroller - + Profiles Profiler - + Network Nätverk - - + + System System - + Game List Spellista - + Web Webb @@ -1360,41 +1360,36 @@ avgjord kod.</div> - Extended memory layout (8GB DRAM) - - - - Confirm exit while emulation is running Godkänn avslut medans emulering pågår - + Prompt for user on game boot Fråga efter användare vid spelstart - + Pause emulation when in background Pausa emulationen när fönstret är i bakgrunden - + Hide mouse on inactivity Göm mus när inaktiv - + Reset All Settings Återställ Alla Inställningar - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? @@ -1433,7 +1428,7 @@ avgjord kod.</div> - + None Ingen @@ -1459,231 +1454,269 @@ avgjord kod.</div> + VSync Mode: + + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: - + No Video Output - + CPU Video Decoding - + GPU Video Decoding (Default) - + Fullscreen Mode: - + Borderless Windowed - + Exclusive Fullscreen - + Aspect Ratio: Bildförhållande: - + Default (16:9) Standard (16:9) - + Force 4:3 Tvinga 4:3 - + Force 21:9 Tvinga 21:9 - + Force 16:10 - + Stretch to Window Tänj över fönster - + Resolution: - + 0.5X (360p/540p) [EXPERIMENTAL] - + 0.75X (540p/810p) [EXPERIMENTAL] - + 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] - + 2X (1440p/2160p) - + 3X (2160p/3240p) - + 4X (2880p/4320p) - + 5X (3600p/5400p) - + 6X (4320p/6480p) - + 7X (5040p/7560p) - + 8X (5760p/8640p) - + Window Adapting Filter: - + Nearest Neighbor - + Bilinear - + Bicubic - + Gaussian - + ScaleForce - + AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: - + FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Använd global bakgrundsfärg - + Set background color: Sätt backgrundsfärg: - + Background Color: Bakgrundsfärg: - + GLASM (Assembly Shaders, NVIDIA Only) - + SPIR-V (Experimental, Mesa Only) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + + + + + VSync Off + + + + + Recommended + + + + + On + + + + + VSync On + + ConfigureGraphicsAdvanced @@ -1708,107 +1741,133 @@ avgjord kod.</div> Noggranhetsnivå: - - Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - - - - - Force maximum clocks (Vulkan only) - - - - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync hindrar skärmen från tearing, men vissa grafikkort har lägre prestanda med VSync på. Ha det på om du inte noterar någon prestandaskillnad. - - - - Use VSync - - - - - Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + ASTC recompression: + Uncompressed (Best quality) + + + + + BC1 (Low quality) + + + + + BC3 (Medium quality) + + + + + Enable asynchronous presentation (Vulkan only) + + + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + + + + + Force maximum clocks (Vulkan only) + + + + + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + Decode ASTC textures asynchronously (Hack) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + + + + + Enable Reactive Flushing + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Sätt på asynchronous shader-kompilering, vilket kan minska shader stutter. Denna funktion är experimentiell. - + Use asynchronous shader building (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. - + Use Fast GPU Time (Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - - - - - Use pessimistic buffer flushes (Hack) - - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + Use Vulkan pipeline cache - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + + + + + Enable Compute Pipelines (Intel Vulkan only) + + + + Anisotropic Filtering: Anisotropisk filtrering: - + Automatic - + Default Standard - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1841,70 +1900,65 @@ avgjord kod.</div> Återställ till standard - + Action Handling - + Hotkey Snabbtangent - + Controller Hotkey - - - + + + Conflicting Key Sequence Motstridig Tangentsekvens - - + + The entered key sequence is already assigned to: %1 Den valda tangentsekvensen är redan tilldelad: %1 - - Home+%1 - - - - + [waiting] [väntar] - + Invalid - + Restore Default Återställ standard - + Clear Rensa - + Conflicting Button Sequence - + The default button sequence is already assigned to: %1 - + The default key sequence is already assigned to: %1 Standardtangentsekvensen är redan tilldelad: %1 @@ -2196,7 +2250,7 @@ avgjord kod.</div> - + Configure Konfigurera @@ -2253,22 +2307,32 @@ avgjord kod.</div> - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + + + + + Use random Amiibo ID + + + + Enable mouse panning - + Mouse sensitivity - + % % - + Motion / Touch Rörelse / Touch @@ -2380,7 +2444,7 @@ avgjord kod.</div> - + Left Stick Vänster Spak @@ -2474,14 +2538,14 @@ avgjord kod.</div> - + L L - + ZL ZL @@ -2500,7 +2564,7 @@ avgjord kod.</div> - + Plus Pluss @@ -2513,15 +2577,15 @@ avgjord kod.</div> - - + + R R - + ZR ZR @@ -2578,240 +2642,246 @@ avgjord kod.</div> - + Right Stick Höger Spak - - - - + + + + Clear Rensa - - - - - + + + + + [not set] [ej angett] - - + + + Invert button - - + + Toggle button - + Turbo button - - + + Invert axis - - - + + + Set threshold - - + + Choose a value between 0% and 100% - + Toggle axis - + Set gyro threshold - + + Calibrate sensor + + + + Map Analog Stick - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. - + Center axis - - + + Deadzone: %1% Dödzon: %1% - - + + Modifier Range: %1% Modifieringsräckvidd: %1% - - + + Pro Controller Prokontroller - + Dual Joycons Dubbla Joycons - + Left Joycon Vänster Joycon - + Right Joycon Höger Joycon - + Handheld Handhållen - + GameCube Controller GameCube-kontroll - + Poke Ball Plus Poke Ball Plus - + NES Controller NES-kontroll - + SNES Controller SNES-kontroll - + N64 Controller N64-kontroll - + Sega Genesis Sega Genesis - + Start / Pause - + Z Z - + Control Stick - + C-Stick - + Shake! - + [waiting] [väntar] - + New Profile Ny profil - + Enter a profile name: - - + + Create Input Profile - + The given profile name is not valid! - + Failed to create the input profile "%1" - + Delete Input Profile - + Failed to delete the input profile "%1" - + Load Input Profile - + Failed to load the input profile "%1" - + Save Input Profile - + Failed to save the input profile "%1" @@ -3066,47 +3136,47 @@ To invert the axes, first move your joystick vertically, and then horizontally.< Utvecklare - + Add-Ons Tillägg - + General Allmänt - + System System - + CPU CPU - + Graphics Grafik - + Adv. Graphics Avancerade Grafikinställningar - + Audio Ljud - + Input Profiles - + Properties egenskaper @@ -3826,7 +3896,12 @@ UUID: %2 - + + Unsafe extended memory layout (8GB DRAM) + + + + System settings are available only when game is not running. Systeminställningar är endast tillgängliga när spel inte körs. @@ -4522,952 +4597,957 @@ Dra punkter för att ändra position, eller dubbelklicka tabellceller för att r GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonym data skickas </a>För att förbättra yuzu. <br/><br/>Vill du dela med dig av din användarstatistik med oss? - + Telemetry Telemetri - + Broken Vulkan Installation Detected Felaktig Vulkaninstallation Upptäckt - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... Laddar WebApplet... - - + + Disable Web Applet Avaktivera Webbappletten - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built Mängden shaders som just nu byggs - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Nuvarande emuleringshastighet. Värden över eller under 100% indikerar på att emulationen körs snabbare eller långsammare än en Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Hur många bilder per sekund som spelet just nu visar. Detta varierar från spel till spel och scen till scen. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Tid det tar att emulera en Switch bild, utan att räkna med framelimiting eller v-sync. För emulering på full hastighet så ska det vara som mest 16.67 ms. - + &Clear Recent Files - + Emulated mouse is enabled Emulerad datormus är aktiverad - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue - + &Pause &Paus - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Varning Föråldrat Spelformat - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Du använder det dekonstruerade ROM-formatet för det här spelet. Det är ett föråldrat format som har överträffats av andra som NCA, NAX, XCI eller NSP. Dekonstruerade ROM-kataloger saknar ikoner, metadata och uppdatering.<br><br>För en förklaring av de olika format som yuzu stöder, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>kolla in vår wiki</a>. Det här meddelandet visas inte igen. - - + + Error while loading ROM! Fel vid laddning av ROM! - + The ROM format is not supported. ROM-formatet stöds inte. - + An error occurred initializing the video core. Ett fel inträffade vid initiering av videokärnan. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Ett okänt fel har uppstått. Se loggen för mer information. - + (64-bit) - + (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit - + Closing software... - + Save Data Spardata - + Mod Data Mod-data - + Error Opening %1 Folder Fel Öppnar %1 Mappen - - + + Folder does not exist! Mappen finns inte! - + Error Opening Transferable Shader Cache Fel Under Öppning Av Överförbar Shadercache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry Ta bort katalog - - - - - - + + + + + + Successfully Removed Framgångsrikt borttagen - + Successfully removed the installed base game. Tog bort det installerade basspelet framgångsrikt. - + The base game is not installed in the NAND and cannot be removed. Basspelet är inte installerat i NAND och kan inte tas bort. - + Successfully removed the installed update. Tog bort den installerade uppdateringen framgångsrikt. - + There is no update installed for this title. Det finns ingen uppdatering installerad för denna titel. - + There are no DLC installed for this title. Det finns inga DLC installerade för denna titel. - + Successfully removed %1 installed DLC. Tog framgångsrikt bort den %1 installerade DLCn. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? Ta Bort Anpassad Spelkonfiguration? - + + Remove Cache Storage? + + + + Remove File Radera fil - - + + Error Removing Transferable Shader Cache Fel När Överförbar Shader Cache Raderades - - + + A shader cache for this title does not exist. En shader cache för denna titel existerar inte. - + Successfully removed the transferable shader cache. Raderade den överförbara shadercachen framgångsrikt. - + Failed to remove the transferable shader cache. Misslyckades att ta bort den överförbara shadercache - + Error Removing Vulkan Driver Pipeline Cache - + Failed to remove the driver pipeline cache. - - + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration Fel När Anpassad Konfiguration Raderades - + A custom configuration for this title does not exist. En anpassad konfiguration för denna titel existerar inte. - + Successfully removed the custom game configuration. Tog bort den anpassade spelkonfigurationen framgångsrikt. - + Failed to remove the custom game configuration. Misslyckades att ta bort den anpassade spelkonfigurationen. - - + + RomFS Extraction Failed! RomFS Extraktion Misslyckades! - + There was an error copying the RomFS files or the user cancelled the operation. Det uppstod ett fel vid kopiering av RomFS filer eller användaren avbröt operationen. - + Full Full - + Skeleton Skelett - + Select RomFS Dump Mode Välj RomFS Dump-Läge - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Välj hur du vill att RomFS ska dumpas. <br>Full kommer att kopiera alla filer i den nya katalogen medan <br>skelett bara skapar katalogstrukturen. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Extraherar RomFS... - - + + Cancel Avbryt - + RomFS Extraction Succeeded! RomFS Extraktion Lyckades! - + The operation completed successfully. Operationen var lyckad. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 Fel under öppning av %1 - + Select Directory Välj Katalog - + Properties Egenskaper - + The game properties could not be loaded. Spelegenskaperna kunde inte laddas. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Körbar (%1);;Alla Filer (*.*) - + Load File Ladda Fil - + Open Extracted ROM Directory Öppna Extraherad ROM-Katalog - + Invalid Directory Selected Ogiltig Katalog Vald - + The directory you have selected does not contain a 'main' file. Katalogen du har valt innehåller inte en 'main'-fil. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Installerbar Switch-fil (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Installera filer - + %n file(s) remaining - + Installing file "%1"... Installerar Fil "%1"... - - + + Install Results Installera resultat - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Systemapplikation - + System Archive Systemarkiv - + System Application Update Systemapplikationsuppdatering - + Firmware Package (Type A) Firmwarepaket (Typ A) - + Firmware Package (Type B) Firmwarepaket (Typ B) - + Game Spel - + Game Update Speluppdatering - + Game DLC Spel DLC - + Delta Title Delta Titel - + Select NCA Install Type... Välj NCA-Installationsläge... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Välj vilken typ av titel du vill installera som: (I de flesta fallen, standard 'Spel' är bra.) - + Failed to Install Misslyckades med Installationen - + The title type you selected for the NCA is invalid. Den titeltyp du valt för NCA är ogiltig. - + File not found Filen hittades inte - + File "%1" not found Filen "%1" hittades inte - + OK OK - - + + Hardware requirements not met Hårdvarukraven uppfylls ej - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account yuzu Konto hittades inte - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. För att skicka ett spelkompatibilitetstest, du måste länka ditt yuzu-konto.<br><br/>För att länka ditt yuzu-konto, gå till Emulering &gt, Konfigurering &gt, Web. - + Error opening URL Fel när URL öppnades - + Unable to open the URL "%1". Oförmögen att öppna URL:en "%1". - + TAS Recording TAS Inspelning - + Overwrite file of player 1? Överskriv spelare 1:s fil? - + Invalid config detected Ogiltig konfiguration upptäckt - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Den aktuella amiibon har avlägsnats - + Error Fel - - + + The current game is not looking for amiibos Det aktuella spelet letar ej efter amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo Fil (%1);; Alla Filer (*.*) - + Load Amiibo Ladda Amiibo - + Error loading Amiibo data Fel vid laddning av Amiibodata - + The selected file is not a valid amiibo Den valda filen är inte en giltig amiibo - + The selected file is already on use Den valda filen är redan använd - + An unknown error occurred Ett okänt fel har inträffat - + Capture Screenshot Skärmdump - + PNG Image (*.png) PNG Bild (*.png) - + TAS state: Running %1/%2 TAStillstånd: pågående %1/%2 - + TAS state: Recording %1 TAStillstånd: spelar in %1 - + TAS state: Idle %1/%2 TAStillstånd: inaktiv %1/%2 - + TAS State: Invalid TAStillstånd: ogiltigt - + &Stop Running - + &Start &Start - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Hastighet: %1% / %2% - + Speed: %1% Hastighet: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Spel: %1 FPS - + Frame: %1 ms Ruta: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA - + SMAA - + VOLUME: MUTE - + VOLUME: %1% Volume percentage (e.g. 50%) - + Confirm Key Rederivation Bekräfta Nyckel Rederivering - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5484,37 +5564,37 @@ och eventuellt göra säkerhetskopior. Detta raderar dina autogenererade nyckelfiler och kör nyckelderivationsmodulen. - + Missing fuses Saknade säkringar - + - Missing BOOT0 - Saknar BOOT0 - + - Missing BCPKG2-1-Normal-Main - Saknar BCPKG2-1-Normal-Main - + - Missing PRODINFO - Saknar PRODINFO - + Derivation Components Missing Deriveringsdelar saknas - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5523,39 +5603,49 @@ Detta kan ta upp till en minut beroende på systemets prestanda. - + Deriving Keys Härleda Nycklar - + + System Archive Decryption Failed + + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target Välj RomFS Dumpa Mål - + Please select which RomFS you would like to dump. Välj vilken RomFS du vill dumpa. - + Are you sure you want to close yuzu? Är du säker på att du vill stänga yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Är du säker på att du vill stoppa emuleringen? Du kommer att förlora osparade framsteg. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5567,44 +5657,44 @@ Vill du strunta i detta och avsluta ändå? GRenderWindow - - + + OpenGL not available! OpenGL inte tillgängligt! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. yuzu har inte komilerats med OpenGL support. + - Error while initializing OpenGL! Fel under initialisering av OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. - + Error while initializing OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 @@ -5663,117 +5753,122 @@ Vill du strunta i detta och avsluta ändå? - Remove OpenGL Pipeline Cache + Remove Cache Storage + Remove OpenGL Pipeline Cache + + + + Remove Vulkan Pipeline Cache - + Remove All Pipeline Caches - + Remove All Installed Contents Ta Bort Allt Installerat Innehåll - + Dump RomFS Dumpa RomFS - + Dump RomFS to SDMC - + Copy Title ID to Clipboard Kopiera Titel ID till Urklipp - + Navigate to GameDB entry Navigera till GameDB-sida - + Create Shortcut - + Add to Desktop - + Add to Applications Menu - + Properties Egenskaper - + Scan Subfolders Skanna Underkataloger - + Remove Game Directory Radera Spelkatalog - + ▲ Move Up ▲ Flytta upp - + ▼ Move Down ▼ Flytta ner - + Open Directory Location Öppna Sökvägsplats - + Clear Rensa - + Name Namn - + Compatibility Kompatibilitet - + Add-ons Add-Ons - + File type Filtyp - + Size Storlek @@ -5844,7 +5939,7 @@ Vill du strunta i detta och avsluta ändå? GameListPlaceholder - + Double-click to add a new folder to the game list Dubbelklicka för att lägga till en ny mapp i spellistan. @@ -5857,12 +5952,12 @@ Vill du strunta i detta och avsluta ändå? - + Filter: Filter: - + Enter pattern to filter Ange mönster för att filtrera @@ -5952,12 +6047,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute - @@ -5979,111 +6073,112 @@ Debug Message: + Main Window - + Audio Volume Down - + Audio Volume Up - + Capture Screenshot Skärmdump - + Change Adapting Filter - + Change Docked Mode - + Change GPU Accuracy - + Continue/Pause Emulation - + Exit Fullscreen - + Exit yuzu - + Fullscreen Fullskärm - + Load File Ladda Fil - + Load/Remove Amiibo - + Restart Emulation - + Stop Emulation - + TAS Record - + TAS Reset - + TAS Start/Stop - + Toggle Filter Bar - + Toggle Framerate Limit - + Toggle Mouse Panning - + Toggle Status Bar @@ -6767,7 +6862,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE START/PAUSE @@ -6817,21 +6912,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6839,8 +6934,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [inte inställd] @@ -6855,10 +6950,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Axel %1%2 @@ -6872,163 +6967,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [okänd] - - + + Left Vänster - - + + Right Höger - - + + Down Ner - - + + Up Upp - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Start - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle Cirkel - + Cross Kors - + Square Fyrkant - + Triangle Triangel - + Share Dela - + Options Val - + [undefined] [odefinerad] @@ -7039,7 +7134,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [felaktig] @@ -7053,21 +7148,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2Axel %3 - + %1%2Axis %3,%4,%5 %1%2Axel %3,%4%5 - + %1%2Motion %3 %1%2Rörelse %3 @@ -7079,106 +7172,112 @@ p, li { white-space: pre-wrap; } - + [unused] [oanvänd] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L - + Stick R - + Plus Pluss - + Minus Minus - - + + Home Hem - + Capture Fånga - + Touch Touch - + Wheel Indicates the mouse wheel Hjul - + Backward Bakåt - + Forward Framåt - + Task Åtgärd - + Extra Extra - + %1%2%3%4 - - + + %1%2%3Hat %4 - - + + + %1%2%3Axis %4 + + + + + %1%2%3Button %4 @@ -7599,73 +7698,73 @@ Vänligen försök igen eller kontakta utvecklaren av programvaran.Användare - + Profile Creator - - + + Profile Selector Profilväljare - + Profile Icon Editor - + Profile Nickname Editor - + Who will receive the points? - + Who is using Nintendo eShop? - + Who is making this purchase? - + Who is posting? - + Select a user to link to a Nintendo Account. - + Change settings for which user? - + Format data for which user? - + Which user will be transferred to another console? - + Send save data for which user? - + Select a user: Välj en användare: diff --git a/dist/languages/tr_TR.ts b/dist/languages/tr_TR.ts index 47a0ca9c8..8a1ebdc7e 100644 --- a/dist/languages/tr_TR.ts +++ b/dist/languages/tr_TR.ts @@ -242,97 +242,97 @@ Bu işlem onların hem forum kullanıcı adını hem de IP adresini banlar. <html><head/><body><p>Does the game boot?</p></body></html> - + <html><head/><body><p>Oyun açılıyor mu?</p></body></html> Yes The game starts to output video or audio - + Evet Oyun açılıyor ve ses ve/veya görüntü çıktısı veriyor No The game doesn't get past the "Launching..." screen - + Hayır Oyun "Başlatılıyor..." ekranında takılı kalıyor Yes The game gets past the intro/menu and into gameplay - + Evet Oyun, ana menü/intro bölümü geçildikten sonra asıl oyuna başlatılabiliyor. No The game crashes or freezes while loading or using the menu - + Hayır Oyun yüklenirken veya ana menüdeyken takılı kalıyor. <html><head/><body><p>Does the game reach gameplay?</p></body></html> - + <html><head/><body><p>Oyun, oynanma aşamasına gelebiliyor mu?</p></body></html> Yes The game works without crashes - + Evet Oyundayken takılı kalma yaşanmıyor. No The game crashes or freezes during gameplay - + Hayır Oyun, oyundayken donuyor veya çöküyor <html><head/><body><p>Does the game work without crashing, freezing or locking up during gameplay?</p></body></html> - + <html><head/><body><p>Oyun, oynanış sırasında takılmadan veya çökmeden oynanabiliyor mu?</p></body></html> Yes The game can be finished without any workarounds - + Evet Oyun, herhangi bir kısmı atlanmadan bitirilebiliyor No The game can't progress past a certain area - + Hayır Oyun belirli bölgelerde takılı kalıyor veya çalışmıyor <html><head/><body><p>Is the game completely playable from start to finish?</p></body></html> - + <html><head/><body><p>Oyun, baştan sona oynanıp bitirilebiliyor mu?</p></body></html> Major The game has major graphical errors - + Büyük Oyunda bariz grafik hataları mevcut Minor The game has minor graphical errors - + Küçük Oyunda ufak tefek grafik hataları mevcut None Everything is rendered as it looks on the Nintendo Switch - + Yok Oyun, bir Nintendo Switch'de nasıl görünüyorsa aynı görünüyor <html><head/><body><p>Does the game have any graphical glitches?</p></body></html> - + <html><head/><body><p>Oyunda herhangi bir grafik hatası var mı?</p></body></html> Major The game has major audio errors - + Büyük Oyunda bariz ses hataları mevcut Minor The game has minor audio errors - + Küçük Oyunda ufak tefek ses hataları mevcut None Audio is played perfectly - + Yok Oyun sesi mükemmel duyuluyor @@ -381,17 +381,17 @@ Bu işlem onların hem forum kullanıcı adını hem de IP adresini banlar. Output Device: - + Çıkış Cihazı: Input Device: - + Giriş Cihazı: Sound Output Mode: - + Ses Çıkış Modu: @@ -615,7 +615,9 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra <div>This option improves speed by relying only on the semantics of cmpxchg to ensure safety of exclusive access instructions. Please note this may result in deadlocks and other race conditions.</div> - + + <div>Bu ayar, özel erişim talimatlarının güvenliğini sağlayarak hızı artırmak adına yalnızca semantik cmpxchg kullanır. Kullanılması çıkmaz döngülere ya da başka yarışma durumlarına sebep olabilir.</div> + @@ -782,7 +784,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra Enable Host MMU Emulation (general memory instructions) - Host MMU Emülasyonunu Etkinleştir (genel bellek talimatları) + Ana Bilgisayar MMU Emülasyonunu Etkinleştir (genel bellek talimatları) @@ -800,7 +802,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra Enable Host MMU Emulation (exclusive memory instructions) - + Ana Bilgisayar MMU Emülasyonunu Etkinleştir (özel bellek talimatları) @@ -808,12 +810,15 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra <div style="white-space: nowrap">This optimization speeds up exclusive memory accesses by the guest program.</div> <div style="white-space: nowrap">Enabling it reduces the overhead of fastmem failure of exclusive memory accesses.</div> - + + <div style="white-space: nowrap">Bu optimizasyon, misafir uygulamanın özel talimat erişim hızını artırır.</div> + <div style="white-space: nowrap">Kullanılırsa, fastmem sebepli özel hafıza erişim hatalarıyla oluşan yükü azaltır.</div> + Enable recompilation of exclusive memory instructions - + Özel hafıza talimatlarının yeniden derlenmesini etkinleştir @@ -821,12 +826,15 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra <div style="white-space: nowrap">This optimization speeds up memory accesses by allowing invalid memory accesses to succeed.</div> <div style="white-space: nowrap">Enabling it reduces the overhead of all memory accesses and has no impact on programs that don't access invalid memory.</div> - + + <div style="white-space: nowrap">Bu optimizasyon, geçersiz hafıza erişim isteklerine izin vererek genel hafıza erişim hızını artırır.</div> + <div style="white-space: nowrap">Kullanılırsa, bütün hafıza erişim yükünü azaltır. Hatalı hafıza erişimi yapmayan uygulamalar etkilenmez.</div> + Enable fallbacks for invalid memory accesses - + Hatalı hafıza erişimleri için yedeği etkinleştir @@ -919,22 +927,22 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra When checked, it will dump all the original assembler shaders from the disk shader cache or game as found - + Kullanılırsa, asıl assembler shader dosyaları diskten shader önbelleği ya da oyun bulundukça dump'lanır Dump Game Shaders - + Oyun Shader'larını Dump'la When checked, it will dump all the macro programs of the GPU - + Kullanılırsa, GPU'daki bütün makro uygulamalar dump'lanır Dump Maxwell Macros - + Maxwell Makro'larını Dump'la @@ -949,12 +957,12 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra When checked, it disables the macro HLE functions. Enabling this makes games run slower - + Kullanılırsa makro HLE işlevselliği kapatılır. Bu seçeneği açmak oyunların yavaşlamasına sebep olur Disable Macro HLE - + Makro HLE'yi Kapat @@ -994,7 +1002,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Bu seçenek açıksa son oluşturulan ses komutları konsolda gösterilir. Sadece ses işleyicisi kullanan oyunları etkiler. @@ -1004,7 +1012,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra Create Minidump After Crash - + Çöküş Sonrası Küçük Dump Oluştur @@ -1044,12 +1052,12 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Bu seçenek, program açılırken Vulkan ortam işlevselliğini kontrol etmesini sağlar. Diğer programlar yuzu'yu görmekte sorun yaşıyorsa bu seçeneği kapatın. Perform Startup Vulkan Check - + Açılırken Vulkan Taraması Yap @@ -1069,12 +1077,12 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra Web applet not compiled - + Web uygulaması derlenmemiş MiniDump creation not compiled - + Küçük Dump oluşumu derlenmemiş @@ -1122,78 +1130,78 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra yuzu Yapılandırması - - + + Audio Ses - - + + CPU CPU - + Debug Hata Ayıklama - + Filesystem Dosya sistemi - - + + General Genel - - + + Graphics Grafikler - + GraphicsAdvanced Gelişmiş Grafik Ayarları - + Hotkeys Kısayollar - - + + Controls Kontroller - + Profiles Profiller - + Network Ağ - - + + System Sistem - + Game List Oyun Listesi - + Web Web @@ -1368,41 +1376,36 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - Extended memory layout (8GB DRAM) - - - - Confirm exit while emulation is running Emülasyon devam ederken çıkışı onaylayın - + Prompt for user on game boot Oyun başlatılırken kullanıcı verisi iste - + Pause emulation when in background Arka plana alındığında emülasyonu duraklat - + Hide mouse on inactivity Hareketsizlik durumunda imleci gizle - + Reset All Settings Tüm Ayarları Sıfırla - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Bu seçenek tüm genel ve oyuna özgü ayarları silecektir. Oyun dizinleri, profiller ve giriş profilleri silinmeyecektir. Devam etmek istiyor musunuz? @@ -1441,7 +1444,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + None Yok @@ -1467,231 +1470,269 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra + VSync Mode: + + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: NVDEC emülasyonu: - + No Video Output Video Çıkışı Yok - + CPU Video Decoding CPU Video Decoding - + GPU Video Decoding (Default) GPU Video Decoding (Varsayılan) - + Fullscreen Mode: Tam Ekran Modu: - + Borderless Windowed Kenarlıksız Tam Ekran - + Exclusive Fullscreen Ayrılmış Tam Ekran - + Aspect Ratio: En-Boy Oranı: - + Default (16:9) Varsayılan (16:9) - + Force 4:3 4:3'e Zorla - + Force 21:9 21:9'a Zorla - + Force 16:10 16:10'a Zorla - + Stretch to Window Ekrana Sığdır - + Resolution: Çözünürlük: - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [DENEYSEL] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [DENEYSEL] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] - + 1.5X (1080p/1620p) [DENEYSEL] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) - + 7X (5040p/7560p) - + 8X (5760p/8640p) - + 8X (5760p/8640p) - + Window Adapting Filter: Pencereye Uyarlı Filtre: - + Nearest Neighbor En Yakın Komşu Algoritması - + Bilinear Bilinear - + Bicubic Bicubic - + Gaussian Gausyen - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution - + AMD FidelityFX™️ Süper Çözünürlük - + Anti-Aliasing Method: Kenar Yumuşatma Yöntemi: - + FXAA FXAA - + SMAA - + SMAA - + Use global FSR Sharpness - + Evrensel FSR Keskinleştirici Kullan - + Set FSR Sharpness - + FSR Keskinliğini Ayarla - + FSR Sharpness: - + FSR Keskinliği: - + 100% - + 100% - - + + Use global background color Global arka plan rengini kullan - + Set background color: Arka plan rengini ayarla: - + Background Color: Arkaplan Rengi: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (Assembly Shaderları, Yalnızca NVIDIA için) - + SPIR-V (Experimental, Mesa Only) - + SPIR-V (Deneysel, Yalnızca Mesa için) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + + + + + VSync Off + + + + + Recommended + + + + + On + + + + + VSync On + + ConfigureGraphicsAdvanced @@ -1716,107 +1757,133 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra Kesinlik Düzeyi: - - Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. - - - - - Force maximum clocks (Vulkan only) - - - - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync ekrandaki yırtılmaları önler fakat bazı ekran kartları VSync etkinleştirildiğinde daha düşük performans verebilir. Eğer bir fark görmüyorsanız etkinleştirin. - - - - Use VSync - VSync Kullan - - - - Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + ASTC recompression: - Decode ASTC textures asynchronously (Hack) + Uncompressed (Best quality) - + + BC1 (Low quality) + + + + + BC3 (Medium quality) + + + + + Enable asynchronous presentation (Vulkan only) + + + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + Grafik komutlarını beklerken GPU'nun hızının düşmesini engellemek için arka planda görev yürütür + + + + Force maximum clocks (Vulkan only) + En yüksek hızı zorla (Yalnızca Vulkan için) + + + + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + Asenkronize ASTC doku çözücüyü aktive eder. Bunu etkinleştirmek takılmaları azaltabilir. Bu özellik deneyseldir. + + + + Decode ASTC textures asynchronously (Hack) + ASTC dokularını asenkronize şekilde çöz (Hack) + + + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + + + + + Enable Reactive Flushing + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Asenkronize shader derlemesini aktive eder. Bunu etkinleştirmek takılmaları azaltabilir. Bu özellik deneyseldir. - + Use asynchronous shader building (Hack) Asenkronize shader derlemesini kullan (Hack) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Hızlı GPU Saati'ni etkinleştir. Bu seçenek çoğu oyunu en yüksek gerçek çözünürlükte çalıştırır. - + Use Fast GPU Time (Hack) Hızlı GPU Saati Kullan (Hack) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - - - - - Use pessimistic buffer flushes (Hack) - - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. - + GPU üreticisine özel pipeline önbelleğini aktive eder. Bu özellik, Vulkan sürücüsünün pipeline önbelleğini depolamadığı zamanlarda shader yüklenme süresini önemli derecede azaltabilir. - + Use Vulkan pipeline cache + Vulkan pipeline önbelleği kullan + + + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. - + + Enable Compute Pipelines (Intel Vulkan only) + + + + Anisotropic Filtering: Anisotropic Filtering: - + Automatic Otomatik - + Default Varsayılan - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1849,70 +1916,65 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra Varsayılana Döndür - + Action İşlem - + Hotkey Kısayol - + Controller Hotkey Kontrolcü Kısayolu - - - + + + Conflicting Key Sequence Tutarsız Anahtar Dizisi - - + + The entered key sequence is already assigned to: %1 Girilen anahtar dizisi zaten %1'e atanmış. - - Home+%1 - Ev+%1 - - - + [waiting] [bekleniyor] - + Invalid Geçersiz - + Restore Default Varsayılana Döndür - + Clear Temizle - + Conflicting Button Sequence - + Tutarsız Tuş Dizisi - + The default button sequence is already assigned to: %1 Varsayılan buton dizisi zaten %1'e atanmış. - + The default key sequence is already assigned to: %1 Varsayılan anahtar dizisi zaten %1'e atanmış. @@ -2204,7 +2266,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + Configure Yapılandır @@ -2253,30 +2315,40 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra Enable direct JoyCon driver - + Direkt JoyCon sürücüsünü kullan Enable direct Pro Controller driver [EXPERIMENTAL] + Direkt Pro Controller sürücüsünü kullan [DENEYSEL] + + + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. - + + Use random Amiibo ID + + + + Enable mouse panning Mouse ile kaydırmayı etkinleştir - + Mouse sensitivity Fare hassasiyeti - + % % - + Motion / Touch Hareket / Dokunmatik @@ -2296,57 +2368,57 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra Input Profiles - + Kontrol Profilleri Player 1 Profile - + 1. Oyuncu Profili Player 2 Profile - + 2. Oyuncu Profili Player 3 Profile - + 3. Oyuncu Profili Player 4 Profile - + 4. Oyuncu Profili Player 5 Profile - + 5. Oyuncu Profili Player 6 Profile - + 6. Oyuncu Profili Player 7 Profile - + 7. Oyuncu Profili Player 8 Profile - + 8. Oyuncu Profili Use global input configuration - + Evrensel giriş yapılandırmasını kullan Player %1 profile - + %1 . Oyuncu Profili @@ -2388,7 +2460,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + Left Stick Sol Analog @@ -2482,14 +2554,14 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + L L - + ZL ZL @@ -2508,7 +2580,7 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + Plus Artı @@ -2521,15 +2593,15 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - - + + R R - + ZR ZR @@ -2586,241 +2658,247 @@ Bu seçenek belleğe yazma/okuma işlemlerindeki güvenlik kontrolünü kaldıra - + Right Stick Sağ Analog - - - - + + + + Clear Temizle - - - - - + + + + + [not set] [belirlenmedi] - - + + + Invert button Tuşları ters çevir - - + + Toggle button Tuşu Aç/Kapa - + Turbo button - + Turbo tuşu - - + + Invert axis Ekseni ters çevir - - - + + + Set threshold Alt sınır ayarla - - + + Choose a value between 0% and 100% %0 ve %100 arasında bir değer seçin - + Toggle axis - + Ekseni aç/kapa - + Set gyro threshold + Gyro alt sınırı ayarla + + + + Calibrate sensor - + Map Analog Stick Analog Çubuğu Ayarla - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Tamama bastıktan sonra, joystikinizi önce yatay sonra dikey olarak hareket ettirin. Eksenleri ters çevirmek için, önce joystickinizi dikey sonra yatay olarak hareket ettirin. - + Center axis - + Ekseni merkezle - - + + Deadzone: %1% Ölü Bölge: %1% - - + + Modifier Range: %1% Düzenleyici Aralığı: %1% - - + + Pro Controller Pro Controller - + Dual Joycons İkili Joyconlar - + Left Joycon Sol Joycon - + Right Joycon Sağ Joycon - + Handheld Handheld - + GameCube Controller GameCube Kontrolcüsü - + Poke Ball Plus Poke Ball Plus - + NES Controller NES Kontrolcüsü - + SNES Controller SNES Kontrolcüsü - + N64 Controller N64 Kontrolcüsü - + Sega Genesis Sega Genesis - + Start / Pause Başlat / Duraklat - + Z Z - + Control Stick Kontrol Çubuğu - + C-Stick C-Çubuğu - + Shake! Salla! - + [waiting] [bekleniyor] - + New Profile Yeni Profil - + Enter a profile name: Bir profil ismi girin: - - + + Create Input Profile Kontrol Profili Oluştur - + The given profile name is not valid! Girilen profil ismi geçerli değil! - + Failed to create the input profile "%1" "%1" kontrol profili oluşturulamadı - + Delete Input Profile Kontrol Profilini Kaldır - + Failed to delete the input profile "%1" "%1" kontrol profili kaldırılamadı - + Load Input Profile Kontrol Profilini Yükle - + Failed to load the input profile "%1" "%1" kontrol profili yüklenemedi - + Save Input Profile Kontrol Profilini Kaydet - + Failed to save the input profile "%1" "%1" kontrol profili kaydedilemedi @@ -3075,47 +3153,47 @@ Eksenleri ters çevirmek için, önce joystickinizi dikey sonra yatay olarak har Geliştirici - + Add-Ons Eklentiler - + General Genel - + System Sistem - + CPU CPU - + Graphics Grafikler - + Adv. Graphics Gelişmiş Grafikler - + Audio Ses - + Input Profiles - + Kontrol Profilleri - + Properties Özellikler @@ -3294,7 +3372,7 @@ Eksenleri ters çevirmek için, önce joystickinizi dikey sonra yatay olarak har Delete this user? All of the user's save data will be deleted. - + Kullanıcıyı silmek istediğinize emin misiniz? Kayıtlı oyun verileri de birlikte silinecek. @@ -3305,7 +3383,8 @@ Eksenleri ters çevirmek için, önce joystickinizi dikey sonra yatay olarak har Name: %1 UUID: %2 - + İsim: %1 +UUID: %2 @@ -3323,7 +3402,7 @@ UUID: %2 Virtual Ring Sensor Parameters - + Sanal Ring Sensör Parametreleri @@ -3345,29 +3424,29 @@ UUID: %2 Direct Joycon Driver - + Direkt Joycon Sürücüsü Enable Ring Input - + Ring Girişini Aç Enable - + Aç Ring Sensor Value - + Ring Sensör Değeri Not connected - + Bağlantı yok @@ -3398,12 +3477,12 @@ UUID: %2 Error enabling ring input - + Ring giriş hatası Direct Joycon driver is not enabled - + Direkt Joycon sürücüsü açık değil @@ -3413,17 +3492,17 @@ UUID: %2 The current mapped device doesn't support the ring controller - + Atanmış cihaz ring kontrolünü desteklemiyor The current mapped device doesn't have a ring attached - + Atanmış cihaza ring takılı değil Unexpected driver result %1 - + Beklenmeyen sürücü sonucu %1 @@ -3732,7 +3811,7 @@ UUID: %2 American English - + Amerikan İngilizcesi @@ -3832,17 +3911,22 @@ UUID: %2 Device Name + Cihaz İsmi + + + + Unsafe extended memory layout (8GB DRAM) - + System settings are available only when game is not running. Sistem ayarlarına sadece oyun çalışmıyorken erişilebilir. Warning: "%1" is not a valid language for region "%2" - + Hata: "%1" bölgesi için "%2" geçerli bir dil değil @@ -4151,7 +4235,7 @@ Noktanın konumunu değiştirmek için sürükleyin ya da sayıların üstüne Show Compatibility List - + Uyumluluk Listesini Göster @@ -4161,12 +4245,12 @@ Noktanın konumunu değiştirmek için sürükleyin ya da sayıların üstüne Show Size Column - + Boyut Sütununu Göster Show File Types Column - + Dosya Türü Sütununu Göster @@ -4350,7 +4434,7 @@ Noktanın konumunu değiştirmek için sürükleyin ya da sayıların üstüne Web Service configuration can only be changed when a public room isn't being hosted. - + Web Sunucu ayarları yalnızca halka açık bir oda sunulmuyorken değiştirilebilir. @@ -4482,12 +4566,12 @@ Noktanın konumunu değiştirmek için sürükleyin ya da sayıların üstüne Server Address - + Sunucu Adresi <html><head/><body><p>Server address of the host</p></body></html> - + <html><head/><body><p>Ana bilgisayarın sunucu adresi</p></body></html> @@ -4531,554 +4615,560 @@ Noktanın konumunu değiştirmek için sürükleyin ya da sayıların üstüne GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Yuzuyu geliştirmeye yardımcı olmak için </a> anonim veri toplandı. <br/><br/>Kullanım verinizi bizimle paylaşmak ister misiniz? - + Telemetry Telemetri - + Broken Vulkan Installation Detected Bozuk Vulkan Kurulumu Algılandı - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Açılışta Vulkan başlatılırken hata. Hata yardımını görüntülemek için <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>buraya tıklayın</a>. - + Loading Web Applet... Web Uygulaması Yükleniyor... - - + + Disable Web Applet Web Uygulamasını Devre Dışı Bırak - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + Web uygulamasını kapatmak bilinmeyen hatalara neden olabileceğinden dolayı sadece Super Mario 3D All-Stars için kapatılması önerilir. Web uygulamasını kapatmak istediğinize emin misiniz? +(Hata ayıklama ayarlarından tekrar açılabilir) - + The amount of shaders currently being built Şu anda derlenen shader miktarı - + The current selected resolution scaling multiplier. Geçerli seçili çözünürlük ölçekleme çarpanı. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Geçerli emülasyon hızı. %100'den yüksek veya düşük değerler emülasyonun bir Switch'den daha hızlı veya daha yavaş çalıştığını gösterir. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Oyunun şuanda saniye başına kaç kare gösterdiği. Bu oyundan oyuna ve sahneden sahneye değişiklik gösterir. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Bir Switch karesini emüle etmekte geçen zaman, karelimitleme ve v-sync hariç. Tam hız emülasyon için bu en çok 16,67 ms olmalı. - + &Clear Recent Files &Son Dosyaları Temizle - + Emulated mouse is enabled - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + &Continue &Devam Et - + &Pause &Duraklat - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu şu anda bir oyun çalıştırıyor - + Warning Outdated Game Format Uyarı, Eski Oyun Formatı - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Bu oyun için dekonstrükte ROM formatı kullanıyorsunuz, bu fromatın yerine NCA, NAX, XCI ve NSP formatları kullanılmaktadır. Dekonstrükte ROM formatları ikon, üst veri ve güncelleme desteği içermemektedir.<br><br>Yuzu'nun desteklediği çeşitli Switch formatları için<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>Wiki'yi ziyaret edin</a>. Bu mesaj yeniden gösterilmeyecektir. - - + + Error while loading ROM! ROM yüklenirken hata oluştu! - + The ROM format is not supported. Bu ROM biçimi desteklenmiyor. - + An error occurred initializing the video core. Video çekirdeğini başlatılırken bir hata oluştu. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu video çekirdeğini çalıştırırken bir hatayla karşılaştı. Bu sorun genellikle eski GPU sürücüleri sebebiyle ortaya çıkar. Daha fazla detay için lütfen log dosyasına bakın. Log dosyasını incelemeye dair daha fazla bilgi için lütfen bu sayfaya ulaşın: <a href='https://yuzu-emu.org/help/reference/log-files/'>Log dosyası nasıl yüklenir</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. ROM yüklenirken hata oluştu! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Lütfen dosyalarınızı yeniden dump etmek için<a href='https://yuzu-emu.org/help/quickstart/'>yuzu hızlı başlangıç kılavuzu'nu</a> takip edin.<br> Yardım için yuzu wiki</a>veya yuzu Discord'una</a> bakabilirsiniz. - + An unknown error occurred. Please see the log for more details. Bilinmeyen bir hata oluştu. Lütfen daha fazla detay için kütüğe göz atınız. - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... - + Yazılım kapatılıyor... - + Save Data Kayıt Verisi - + Mod Data Mod Verisi - + Error Opening %1 Folder %1 klasörü açılırken hata - - + + Folder does not exist! Klasör mevcut değil! - + Error Opening Transferable Shader Cache Transfer Edilebilir Shader Cache'ini Açarken Bir Hata Oluştu - + Failed to create the shader cache directory for this title. Bu oyun için shader cache konumu oluşturulamadı. - + Error Removing Contents - + İçerik Kaldırma Hatası - + Error Removing Update - - - - - Error Removing DLC - + Güncelleme Kaldırma hatası + Error Removing DLC + DLC Kaldırma Hatası + + + Remove Installed Game Contents? - + Yüklenmiş Oyun İçeriğini Kaldırmak İstediğinize Emin Misiniz? - + Remove Installed Game Update? - + Yüklenmiş Oyun Güncellemesini Kaldırmak İstediğinize Emin Misiniz? - + Remove Installed Game DLC? - + Yüklenmiş DLC'yi Kaldırmak İstediğinize Emin Misiniz? - + Remove Entry Girdiyi Kaldır - - - - - - + + + + + + Successfully Removed Başarıyla Kaldırıldı - + Successfully removed the installed base game. Yüklenmiş oyun başarıyla kaldırıldı. - + The base game is not installed in the NAND and cannot be removed. Asıl oyun NAND'de kurulu değil ve kaldırılamaz. - + Successfully removed the installed update. Yüklenmiş güncelleme başarıyla kaldırıldı. - + There is no update installed for this title. Bu oyun için yüklenmiş bir güncelleme yok. - + There are no DLC installed for this title. Bu oyun için yüklenmiş bir DLC yok. - + Successfully removed %1 installed DLC. %1 yüklenmiş DLC başarıyla kaldırıldı. - + Delete OpenGL Transferable Shader Cache? OpenGL Transfer Edilebilir Shader Cache'ini Kaldırmak İstediğinize Emin Misiniz? - + Delete Vulkan Transferable Shader Cache? Vulkan Transfer Edilebilir Shader Cache'ini Kaldırmak İstediğinize Emin Misiniz? - + Delete All Transferable Shader Caches? Tüm Transfer Edilebilir Shader Cache'leri Kaldırmak İstediğinize Emin Misiniz? - + Remove Custom Game Configuration? Oyuna Özel Yapılandırmayı Kaldırmak İstediğinize Emin Misiniz? - + + Remove Cache Storage? + + + + Remove File Dosyayı Sil - - + + Error Removing Transferable Shader Cache Transfer Edilebilir Shader Cache Kaldırılırken Bir Hata Oluştu - - + + A shader cache for this title does not exist. Bu oyun için oluşturulmuş bir shader cache yok. - + Successfully removed the transferable shader cache. Transfer edilebilir shader cache başarıyla kaldırıldı. - + Failed to remove the transferable shader cache. Transfer edilebilir shader cache kaldırılamadı. - + Error Removing Vulkan Driver Pipeline Cache - + Vulkan Pipeline Önbelleği Kaldırılırken Hata - + Failed to remove the driver pipeline cache. - + Sürücü pipeline önbelleği kaldırılamadı. - - + + Error Removing Transferable Shader Caches Transfer Edilebilir Shader Cache'ler Kaldırılırken Bir Hata Oluştu - + Successfully removed the transferable shader caches. Transfer edilebilir shader cacheler başarıyla kaldırıldı. - + Failed to remove the transferable shader cache directory. Transfer edilebilir shader cache konumu kaldırılamadı. - - + + Error Removing Custom Configuration Oyuna Özel Yapılandırma Kaldırılırken Bir Hata Oluştu. - + A custom configuration for this title does not exist. Bu oyun için bir özel yapılandırma yok. - + Successfully removed the custom game configuration. Oyuna özel yapılandırma başarıyla kaldırıldı. - + Failed to remove the custom game configuration. Oyuna özel yapılandırma kaldırılamadı. - - + + RomFS Extraction Failed! RomFS Çıkartımı Başarısız! - + There was an error copying the RomFS files or the user cancelled the operation. RomFS dosyaları kopyalanırken bir hata oluştu veya kullanıcı işlemi iptal etti. - + Full Full - + Skeleton Çerçeve - + Select RomFS Dump Mode RomFS Dump Modunu Seçiniz - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Lütfen RomFS'in nasıl dump edilmesini istediğinizi seçin.<br>"Full" tüm dosyaları yeni bir klasöre kopyalarken <br>"skeleton" sadece klasör yapısını oluşturur. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 konumunda RomFS çıkarmaya yetecek alan yok. Lütfen yer açın ya da Emülasyon > Yapılandırma > Sistem > Dosya Sistemi > Dump konumu kısmından farklı bir çıktı konumu belirleyin. - + Extracting RomFS... RomFS çıkartılıyor... - - + + Cancel İptal - + RomFS Extraction Succeeded! RomFS Çıkartımı Başarılı! - + The operation completed successfully. İşlem başarıyla tamamlandı. - - - - - - Create Shortcut - - - - - This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - - - - - Cannot create shortcut on desktop. Path "%1" does not exist. - - - - - Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - - - - - Create Icon - - - + + + + + Create Shortcut + Kısayol Oluştur + + + + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? + Bu seçenek, şu anki AppImage dosyasının kısayolunu oluşturacak. Uygulama güncellenirse kısayol çalışmayabilir. Devam edilsin mi? + + + + Cannot create shortcut on desktop. Path "%1" does not exist. + Masaüstünde kısayol oluşturulamadı. "%1" dizini yok. + + + + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. + Uygulamalar menüsünde kısayol oluşturulamadı. "%1" dizini yok ve oluşturulamıyor. + + + + Create Icon + Simge Oluştur + + + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Simge dosyası oluşturulamadı. "%1" dizini yok ve oluşturulamıyor. - + Start %1 with the yuzu Emulator - - - - - Failed to create a shortcut at %1 - - - - - Successfully created a shortcut to %1 - + yuzu Emülatörü başlatılırken %1 başlatılsın + Failed to create a shortcut at %1 + %1 dizininde kısayol oluşturulamadı + + + + Successfully created a shortcut to %1 + %1 dizinine kısayol oluşturuldu + + + Error Opening %1 %1 Açılırken Bir Hata Oluştu - + Select Directory Klasör Seç - + Properties Özellikler - + The game properties could not be loaded. Oyun özellikleri yüklenemedi. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch Çalıştırılabilir Dosyası (%1);;Tüm Dosyalar (*.*) - + Load File Dosya Aç - + Open Extracted ROM Directory Çıkartılmış ROM klasörünü aç - + Invalid Directory Selected Geçersiz Klasör Seçildi - + The directory you have selected does not contain a 'main' file. Seçtiğiniz klasör bir "main" dosyası içermiyor. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Yüklenilebilir Switch Dosyası (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submissions Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files Dosya Kur - + %n file(s) remaining %n dosya kaldı%n dosya kaldı - + Installing file "%1"... "%1" dosyası kuruluyor... - - + + Install Results Kurulum Sonuçları - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Olası çakışmaları önlemek için oyunları NAND'e yüklememenizi tavsiye ediyoruz. Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + %n file(s) were newly installed %n dosya güncel olarak yüklendi @@ -5086,7 +5176,7 @@ Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + %n file(s) were overwritten %n dosyanın üstüne yazıldı @@ -5094,7 +5184,7 @@ Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + %n file(s) failed to install %n dosya yüklenemedi @@ -5102,388 +5192,388 @@ Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. - + System Application Sistem Uygulaması - + System Archive Sistem Arşivi - + System Application Update Sistem Uygulama Güncellemesi - + Firmware Package (Type A) Yazılım Paketi (Tür A) - + Firmware Package (Type B) Yazılım Paketi (Tür B) - + Game Oyun - + Game Update Oyun Güncellemesi - + Game DLC Oyun DLC'si - + Delta Title Delta Başlık - + Select NCA Install Type... NCA Kurulum Tipi Seçin... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Lütfen bu NCA dosyası için belirlemek istediğiniz başlık türünü seçiniz: (Çoğu durumda, varsayılan olan 'Oyun' kullanılabilir.) - + Failed to Install Kurulum Başarısız Oldu - + The title type you selected for the NCA is invalid. NCA için seçtiğiniz başlık türü geçersiz - + File not found Dosya Bulunamadı - + File "%1" not found Dosya "%1" Bulunamadı - + OK Tamam - - + + Hardware requirements not met - + Donanım gereksinimleri karşılanmıyor - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Sisteminiz, önerilen donanım gereksinimlerini karşılamıyor. Uyumluluk raporlayıcı kapatıldı. - + Missing yuzu Account Kayıp yuzu Hesabı - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Oyun uyumluluk test çalışması göndermek için öncelikle yuzu hesabınla giriş yapmanız gerekiyor.<br><br/>Yuzu hesabınızla giriş yapmak için, Emülasyon &gt; Yapılandırma &gt; Web'e gidiniz. - + Error opening URL URL açılırken bir hata oluştu - + Unable to open the URL "%1". URL "%1" açılamıyor. - + TAS Recording TAS kayıtta - + Overwrite file of player 1? Oyuncu 1'in dosyasının üstüne yazılsın mı? - + Invalid config detected Geçersiz yapılandırma tespit edildi - + Handheld controller can't be used on docked mode. Pro controller will be selected. Handheld kontrolcü dock modunda kullanılamaz. Pro kontrolcü seçilecek. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Amiibo kaldırıldı - + Error Hata - - + + The current game is not looking for amiibos Aktif oyun amiibo beklemiyor - + Amiibo File (%1);; All Files (*.*) Amiibo Dosyası (%1);; Tüm Dosyalar (*.*) - + Load Amiibo Amiibo Yükle - + Error loading Amiibo data Amiibo verisi yüklenirken hata - + The selected file is not a valid amiibo Seçtiğiniz dosya geçerli bir amiibo değil - + The selected file is already on use Seçtiğiniz dosya hali hazırda kullanılıyor - + An unknown error occurred - + Bilinmeyen bir hata oluştu - + Capture Screenshot Ekran Görüntüsü Al - + PNG Image (*.png) PNG görüntüsü (*.png) - + TAS state: Running %1/%2 TAS durumu: %1%2 çalışıyor - + TAS state: Recording %1 TAS durumu: %1 kaydediliyor - + TAS state: Idle %1/%2 TAS durumu: %1%2 boşta - + TAS State: Invalid TAS durumu: Geçersiz - + &Stop Running &Çalıştırmayı durdur - + &Start &Başlat - + Stop R&ecording K&aydetmeyi Durdur - + R&ecord K&aydet - + Building: %n shader(s) Oluşturuluyor: %n shaderOluşturuluyor: %n shader - + Scale: %1x %1 is the resolution scaling factor Ölçek: %1x - + Speed: %1% / %2% Hız %1% / %2% - + Speed: %1% Hız: %1% - + Game: %1 FPS (Unlocked) Oyun: %1 FPS (Sınırsız) - + Game: %1 FPS Oyun: %1 FPS - + Frame: %1 ms Kare: %1 ms - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU YÜKSEK - + GPU EXTREME GPU EKSTREM - + GPU ERROR GPU HATASI - + DOCKED - + TAKILI MOD - + HANDHELD - + TAŞIMA MODU - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + YOK - + NEAREST EN YAKIN - - + + BILINEAR BILINEAR - + BICUBIC BICUBIC - + GAUSSIAN GAUSYEN - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA AA YOK - + FXAA FXAA - + SMAA - + SMAA - + VOLUME: MUTE - + SES: KAPALI - + VOLUME: %1% Volume percentage (e.g. 50%) - + SES: %%1 - + Confirm Key Rederivation Anahtar Yeniden Türetimini Onayla - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5500,37 +5590,37 @@ ve opsiyonel olarak yedekler alın. Bu sizin otomatik oluşturulmuş anahtar dosyalarınızı silecek ve anahtar türetme modülünü tekrar çalıştıracak. - + Missing fuses Anahtarlar Kayıp - + - Missing BOOT0 - BOOT0 Kayıp - + - Missing BCPKG2-1-Normal-Main - BCPKG2-1-Normal-Main Kayıp - + - Missing PRODINFO - PRODINFO Kayıp - + Derivation Components Missing Türeten Bileşenleri Kayıp - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Şifreleme anahtarları eksik. <br>Lütfen takip edin<a href='https://yuzu-emu.org/help/quickstart/'>yuzu hızlı başlangıç kılavuzunu</a>tüm anahtarlarınızı, aygıt yazılımınızı ve oyunlarınızı almada.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5539,39 +5629,49 @@ Bu sistem performansınıza bağlı olarak bir dakika kadar zaman alabilir. - + Deriving Keys Anahtarlar Türetiliyor - + + System Archive Decryption Failed + + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target RomFS Dump Hedefini Seçiniz - + Please select which RomFS you would like to dump. Lütfen dump etmek istediğiniz RomFS'i seçiniz. - + Are you sure you want to close yuzu? yuzu'yu kapatmak istediğinizden emin misiniz? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Emülasyonu durdurmak istediğinizden emin misiniz? Kaydedilmemiş veriler kaybolur. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5583,44 +5683,44 @@ Görmezden gelip kapatmak ister misiniz? GRenderWindow - - + + OpenGL not available! OpenGL kullanıma uygun değil! - + OpenGL shared contexts are not supported. - + OpenGL paylaşılan bağlam desteklenmiyor. - + yuzu has not been compiled with OpenGL support. Yuzu OpenGL desteklememektedir. + - Error while initializing OpenGL! OpenGl başlatılırken bir hata oluştu! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. GPU'nuz OpenGL desteklemiyor veya güncel bir grafik sürücüsüne sahip değilsiniz. - + Error while initializing OpenGL 4.6! OpenGl 4.6 başlatılırken bir hata oluştu! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 GPU'nuz OpenGL 4.6'yı desteklemiyor veya güncel bir grafik sürücüsüne sahip değilsiniz.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 GPU'nuz gereken bir yada daha fazla OpenGL eklentisini desteklemiyor Lütfen güncel bir grafik sürücüsüne sahip olduğunuzdan emin olun.<br><br>GL Renderer:<br>%1<br><br> Desteklenmeyen Eklentiler:<br>%2 @@ -5679,117 +5779,122 @@ Görmezden gelip kapatmak ister misiniz? + Remove Cache Storage + + + + Remove OpenGL Pipeline Cache OpenGL Pipeline Cache'ini Kaldır - + Remove Vulkan Pipeline Cache Vulkan Pipeline Cache'ini Kaldır - + Remove All Pipeline Caches Bütün Pipeline Cache'lerini Kaldır - + Remove All Installed Contents Tüm Yüklenmiş İçeriği Kaldır - + Dump RomFS RomFS Dump Et - + Dump RomFS to SDMC RomFS'i SDMC'ye çıkar. - + Copy Title ID to Clipboard Title ID'yi Panoya Kopyala - + Navigate to GameDB entry GameDB sayfasına yönlendir - - - Create Shortcut - - + Create Shortcut + Kısayol Oluştur + + + Add to Desktop - + Masaüstüne Ekle - + Add to Applications Menu - + Uygulamalar Menüsüne Ekl - + Properties Özellikler - + Scan Subfolders Alt Klasörleri Tara - + Remove Game Directory Oyun Konumunu Kaldır - + ▲ Move Up ▲Yukarı Git - + ▼ Move Down ▼Aşağı Git - + Open Directory Location Oyun Dosyası Konumunu Aç - + Clear Temizle - + Name İsim - + Compatibility Uyumluluk - + Add-ons Eklentiler - + File type Dosya türü - + Size Boyut @@ -5799,12 +5904,12 @@ Görmezden gelip kapatmak ister misiniz? Ingame - + Oyunda Game starts, but crashes or major glitches prevent it from being completed. - + Oyun başlatılabiliyor, fakat bariz hatalardan veya çökme sorunlarından dolayı bitirilemiyor. @@ -5814,17 +5919,17 @@ Görmezden gelip kapatmak ister misiniz? Game can be played without issues. - + Oyun sorunsuz bir şekilde oynanabiliyor. Playable - + Oynanabilir Game functions with minor graphical or audio glitches and is playable from start to finish. - + Oyun küçük grafik veya ses hatalarıyla çalışıyor ve baştan sona kadar oynanabilir. @@ -5834,7 +5939,7 @@ Görmezden gelip kapatmak ister misiniz? Game loads, but is unable to progress past the Start Screen. - + Oyun açılıyor, fakat ana menüden ileri gidilemiyor. @@ -5860,7 +5965,7 @@ Görmezden gelip kapatmak ister misiniz? GameListPlaceholder - + Double-click to add a new folder to the game list Oyun listesine yeni bir klasör eklemek için çift tıklayın. @@ -5873,12 +5978,12 @@ Görmezden gelip kapatmak ister misiniz? %n sonucun %1'i%n sonucun %1'i - + Filter: Filtre: - + Enter pattern to filter Filtrelemek için bir düzen giriniz @@ -5968,12 +6073,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute Sesi Sustur/Aç - @@ -5995,111 +6099,112 @@ Debug Message: + Main Window Ana Pencere - + Audio Volume Down Ses Kapa - + Audio Volume Up Ses Aç - + Capture Screenshot Ekran Görüntüsü Al - + Change Adapting Filter Uyarlanan Filtreyi Değiştir - + Change Docked Mode - + Takılı Modu Kullan - + Change GPU Accuracy GPU Doğruluğunu Değiştir - + Continue/Pause Emulation Sürdür/Emülasyonu duraklat - + Exit Fullscreen Tam Ekrandan Çık - + Exit yuzu Yuzu'dan çık - + Fullscreen Tam Ekran - + Load File Dosya Aç - + Load/Remove Amiibo Amiibo Yükle/Kaldır - + Restart Emulation Emülasyonu Yeniden Başlat - + Stop Emulation Emülasyonu Durdur - + TAS Record TAS Kaydet - + TAS Reset TAS Sıfırla - + TAS Start/Stop TAS Başlat/Durdur - + Toggle Filter Bar Filtre Çubuğunu Aç/Kapa - + Toggle Framerate Limit FPS Limitini Aç/Kapa - + Toggle Mouse Panning Mouse ile Kaydırmayı Aç/Kapa - + Toggle Status Bar Durum Çubuğunu Aç/Kapa @@ -6206,7 +6311,7 @@ Debug Message: Hide Empty Rooms - + Boş Odaları Gizle @@ -6649,7 +6754,7 @@ Debug Bilgisi: Unable to connect to the host. Verify that the connection settings are correct. If you still cannot connect, contact the room host and verify that the host is properly configured with the external port forwarded. - + Ana bilgisayara bağlanılamadı. Bağlantı ayarlarının doğru olduğundan emin olun. Hala bağlanamıyorsanız, ana bilgisayar yöneticisiyle iletişime geçip sunucunun doğru ayarlandığından ve dış portun yönlendirildiğinden emin olun. @@ -6792,7 +6897,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE BAŞLAT/DURAKLAT @@ -6842,21 +6947,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6864,8 +6969,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [belirlenmedi] @@ -6880,10 +6985,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Eksen %1%2 @@ -6897,163 +7002,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [bilinmeyen] - - + + Left Sol - - + + Right Sağ - - + + Down Aşağı - - + + Up Yukarı - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Start - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle Yuvarlak - + Cross Çarpı - + Square Kare - + Triangle Üçgen - + Share Share - + Options Options - + [undefined] [belirsiz] @@ -7064,7 +7169,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [geçersiz] @@ -7078,21 +7183,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2Eksen %3 - + %1%2Axis %3,%4,%5 %1%2Eksen %3,%4,%5 - + %1%2Motion %3 %1%2Hareket %3 @@ -7104,108 +7207,114 @@ p, li { white-space: pre-wrap; } - + [unused] [kullanılmayan] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L - + L Çubuğu - + Stick R - + R Çubuğu - + Plus Artı - + Minus Eksi - - + + Home Home - + Capture Kaydet - + Touch Dokunmatik - + Wheel Indicates the mouse wheel Fare Tekerleği - + Backward Geri - + Forward İleri - + Task - + Görev - + Extra Ekstra - + %1%2%3%4 - + %1%2%3%4 - - + + %1%2%3Hat %4 + %1%2%3Hat %4 + + + + + %1%2%3Axis %4 - - + + %1%2%3Button %4 - + %1%2%3Tuş %4 @@ -7213,17 +7322,17 @@ p, li { white-space: pre-wrap; } Amiibo Settings - + Amiibo Ayarları Amiibo Info - + Amiibo Detayları Series - + Seriler @@ -7238,52 +7347,52 @@ p, li { white-space: pre-wrap; } Amiibo Data - + Amiibo Verisi Custom Name - + Özel İsim Owner - + Sahip Creation Date - + Oluşturulma Tarihi dd/MM/yyyy - + gg/AA/yyyy Modification Date - + Değiştirilme Tarihi dd/MM/yyyy - + gg/AA/yyyy Game Data - + Oyun Verisi Game Id - + Oyun No Mount Amiibo - + Amiibo Tak @@ -7293,32 +7402,32 @@ p, li { white-space: pre-wrap; } File Path - + Dosya Adresi No game data present - + Oyun verisi yok The following amiibo data will be formatted: - + Şu amiibo verisi biçimlendirilecek: The following game data will removed: - + Şu oyun verisi kaldırılacak: Set nickname and owner: - + Kullanıcı adı ve sahip ayarla: Do you wish to restore this amiibo? - + Bu amiibo'yu geri yüklemek istediğinize emin misiniz? @@ -7624,73 +7733,73 @@ Lütfen tekrar deneyin ya da yazılımın geliştiricisiyle iletişime geçin.Kullanıcılar - + Profile Creator - + Profil Oluşturucu - - + + Profile Selector Profil Seçici - + Profile Icon Editor - + Profil Simgesi Düzenleyici - + Profile Nickname Editor - + Profil Kullanıcı İsmi Düzenleyici - + Who will receive the points? - + Puanları kim kazanacak? - + Who is using Nintendo eShop? - + Nintendo eShop'u kim kullanıyor? - + Who is making this purchase? - + Bu satın almayı kim gerçekleştiriyor? - + Who is posting? - + Gönderiyi kim yapıyor? - + Select a user to link to a Nintendo Account. - + Nintendo Hesabına bağlanacak bir kullanıcı seçin. - + Change settings for which user? - + Hangi kullanıcının ayarları değiştirilsin? - + Format data for which user? - + Hangi kullanıcının verisi biçimlendirilsin? - + Which user will be transferred to another console? - + Hangi kullanıcı başka bir konsola taşınacak? - + Send save data for which user? - + Hangi kullanıcı için kayıtlı veri gönderilsin? - + Select a user: Kullanıcı Seç: @@ -7753,7 +7862,7 @@ p, li { white-space: pre-wrap; } [%1] %2 - + [%1] %2 diff --git a/dist/languages/uk.ts b/dist/languages/uk.ts index 3c4e788f6..d82fc1e66 100644 --- a/dist/languages/uk.ts +++ b/dist/languages/uk.ts @@ -36,7 +36,7 @@ p, li { white-space: pre-wrap; } <html><head/><body><p><a href="https://yuzu-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Website</span></a> | <a href="https://github.com/yuzu-emu"><span style=" text-decoration: underline; color:#039be5;">Source Code</span></a> | <a href="https://github.com/yuzu-emu/yuzu/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://github.com/yuzu-emu/yuzu/blob/master/LICENSE.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html> - <html><head/><body><p><a href="https://yuzu-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Веб-сайт</span></a> | <a href="https://github.com/yuzu-emu"><span style=" text-decoration: underline; color:#039be5;">Вихідний код</span></a> | <a href="https://github.com/yuzu-emu/yuzu/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Вкладники</span></a> | <a href="https://github.com/yuzu-emu/yuzu/blob/master/LICENSE.txt"><span style=" text-decoration: underline; color:#039be5;">Ліцензія</span></a></p></body></html> + <html><head/><body><p><a href="https://yuzu-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Веб-сайт</span></a> | <a href="https://github.com/yuzu-emu"><span style=" text-decoration: underline; color:#039be5;">Першокод</span></a> | <a href="https://github.com/yuzu-emu/yuzu/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Вкладники</span></a> | <a href="https://github.com/yuzu-emu/yuzu/blob/master/LICENSE.txt"><span style=" text-decoration: underline; color:#039be5;">Ліцензія</span></a></p></body></html> @@ -172,7 +172,7 @@ p, li { white-space: pre-wrap; } This would ban both their forum username and their IP address. Ви впевнені що бажаєте <b>вигнати і заблокувати</b> %1? -Ця дія заблокує ім'я користувача на форумі та IP-адресу. +Ця дія заблокує ім'я користувача на форумі та їх IP-адресу. @@ -381,17 +381,17 @@ This would ban both their forum username and their IP address. Output Device: - + Пристрій відтворення: Input Device: - + Пристрій вводу: Sound Output Mode: - + Режим відстворення звуку: @@ -551,7 +551,7 @@ This would ban both their forum username and their IP address. <div>This option improves speed by reducing accuracy of fused-multiply-add instructions on CPUs without native FMA support.</div> - <div>Ця опція підвищує швидкість, зменшуючи точність складених помножених інструкцій на ЦП без підтримки FMA.</div> + <div>Ця опція підвищує швидкість за рахунок зниження точності інструкцій fused-multiply-add на ЦП без вбудованої підтримки FMA.</div> @@ -565,7 +565,7 @@ This would ban both their forum username and their IP address. <div>This option improves the speed of some approximate floating-point functions by using less accurate native approximations.</div> - <div>Ця опція підвищує швидкість роботи деяких функцій із плаваючою комою за рахунок використання менш точних рідних наближень.</div> + <div>Ця опція підвищує швидкість деяких наближених функцій з плаваючою точкою за рахунок використання менш точних нативних наближень</div> @@ -593,7 +593,7 @@ This would ban both their forum username and their IP address. <div>This option improves speed by removing NaN checking. Please note this also reduces accuracy of certain floating-point instructions.</div> - <div>Ця опція підвищує швидкість, прибираючи перевірку NaN. Зверніть увагу, що це також знижує точність деяких інструкцій із плаваючою крапкою. </div> + <div>Ця опція підвищує швидкість, видаляючи перевірку NaN. Зверніть увагу, що це також знижує точність деяких інструкцій із плаваючою крапкою. </div> @@ -606,7 +606,9 @@ This would ban both their forum username and their IP address. <div>This option improves speed by eliminating a safety check before every memory read/write in guest. Disabling it may allow a game to read/write the emulator's memory.</div> - + + <div>Ця опція підвищує швидкість за рахунок виключення перевірки безпеки перед кожним читанням/записом пам'яті в гостьовому режимі. Вимкнення цієї опції може дозволити грі читати/записувати пам'ять емулятора.</div> + @@ -618,12 +620,14 @@ This would ban both their forum username and their IP address. <div>This option improves speed by relying only on the semantics of cmpxchg to ensure safety of exclusive access instructions. Please note this may result in deadlocks and other race conditions.</div> - + + <div>Ця опція підвищує швидкість, покладаючись тільки на семантику cmpxchg для забезпечення безпеки інструкцій виняткового доступу. Зверніть увагу, що це може призвести до повних зависань та інших умов перегонів.</div> + Ignore global monitor - + Ігнорувати глобальний моніторинг @@ -651,7 +655,7 @@ This would ban both their forum username and their IP address. <html><head/><body><p><span style=" font-weight:600;">For debugging only.</span><br/>If you're not sure what these do, keep all of these enabled. <br/>These settings, when disabled, only take effect when CPU Debugging is enabled. </p></body></html> - <html><head/><body><p><span style=" font-weight:600;">Тільки для налагодження.</span><br/>Якщо ви не впевнені в тому, що вони роблять, залиште всі ці параметри увімкненими. <br/>Коли їх вимкнено, ці параметри набувають чинності лише за увімкненого налагодження ЦП. </p></body></html> + <html><head/><body><p><span style=" font-weight:600;">Тільки для налагодження.</span><br/>Якщо ви не впевнені в тому, що вони роблять, залиште всі ці параметри увімкненими. <br/>Коли їх вимкнено, ці параметри набувають чинності лише за ввімкненого налагодження ЦП. </p></body></html> @@ -660,79 +664,95 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">Enabling it inlines accesses to PageTable::pointers into emitted code.</div> <div style="white-space: nowrap">Disabling this forces all memory accesses to go through the Memory::Read/Memory::Write functions.</div> - + + <div style="white-space: nowrap">Ця оптимізація прискорює доступ гостьової програми до пам'яті.</div> + <div style="white-space: nowrap">Увімкнення цієї оптимізації вбудовує доступ до покажчиків PageTable::pointers в емульований код.</div> + <div style="white-space: nowrap">Вимкнення цієї функції змушує всі звернення до пам'яті проходити через функції Memory::Read/Memory::Write.</div> + Enable inline page tables - + Увімкнути вбудовані таблиці сторінок <div>This optimization avoids dispatcher lookups by allowing emitted basic blocks to jump directly to other basic blocks if the destination PC is static.</div> - + + <div>Ця опція дозволяє уникнути запитів диспетчера, дозволяючи випущеним базовим блокам переходити безпосередньо до інших базових блоків, якщо призначений ПК є статичним.</div> + Enable block linking - + Увімкнути зв'язування блоків <div>This optimization avoids dispatcher lookups by keeping track potential return addresses of BL instructions. This approximates what happens with a return stack buffer on a real CPU.</div> - + + <div>Ця опція дозволяє уникнути запитів диспетчера шляхом відстеження потенційних адрес повернення інструкцій BL. Це приблизно те, що відбувається з буфером стека повернення на реальному ЦП. </div> + Enable return stack buffer - + Увімкнути буфер стека повернення <div>Enable a two-tiered dispatch system. A faster dispatcher written in assembly has a small MRU cache of jump destinations is used first. If that fails, dispatch falls back to the slower C++ dispatcher.</div> - + + <div>Увімкнути дворівневу систему диспетчеризації. Швидший диспетчер, написаний на асемблері, має невеликий MRU-кеш, який використовується першим. Якщо це не вдається, система диспетчеризації повертається до повільнішого диспетчера C++.</div> + Enable fast dispatcher - + Увімкнути швидшу систему диспетчеризації <div>Enables an IR optimization that reduces unnecessary accesses to the CPU context structure.</div> - + + <div>Вмикає IR-оптимізацію, яка зменшує непотрібні звернення до структури контексту ЦП.</div> + Enable context elimination - + Увімкнути вилучення контексту ЦП <div>Enables IR optimizations that involve constant propagation.</div> - + + <div>Вмикає IR-оптимізацію, яка включає поширення констант.</div> + Enable constant propagation - + Увімкнути постійне поширення <div>Enables miscellaneous IR optimizations.</div> - + + <div>Вмикає різні IR оптимізації.</div> + @@ -745,12 +765,15 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">When enabled, a misalignment is only triggered when an access crosses a page boundary.</div> <div style="white-space: nowrap">When disabled, a misalignment is triggered on all misaligned accesses.</div> - + + <div style="white-space: nowrap">Якщо ввімкнено, зміщення запускається лише тоді, коли доступ перетинає межу сторінки.</div> + <div style="white-space: nowrap">Якщо вимкнено, зміщення запускається для всіх невирівняних доступів.</div> + Enable misalignment check reduction - + Увімкнути зменшення перевірки зміщення @@ -759,12 +782,16 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">Enabling it causes guest memory reads/writes to be done directly into memory and make use of Host's MMU.</div> <div style="white-space: nowrap">Disabling this forces all memory accesses to use Software MMU Emulation.</div> - + + <div style="white-space: nowrap">Ця оптимізація прискорює доступ гостьової програми до пам'яті.</div> + <div style="white-space: nowrap"> Увімкнення цієї оптимізації призводить до того, що читання/запис гостьової пам'яті проводиться безпосередньо в пам'ять і використовує MMU хоста.</div> + <div style="white-space: nowrap">Вимкнення цієї функції змушує всі звернення до пам'яті використовувати програмну емуляцію MMU.</div> + Enable Host MMU Emulation (general memory instructions) - + Увімкнути емуляцію MMU хоста (інструкції загальної пам'яті) @@ -773,12 +800,16 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">Enabling it causes guest exclusive memory reads/writes to be done directly into memory and make use of Host's MMU.</div> <div style="white-space: nowrap">Disabling this forces all exclusive memory accesses to use Software MMU Emulation.</div> - + + <div style="white-space: nowrap">Ця оптимізація прискорює доступ гостьової програми до ексклюзивної пам'яті.</div> + <div style="white-space: nowrap">Увімкнення цієї оптимізації призводить до того, що читання/запис в ексклюзивну пам'ять гостя виконується безпосередньо в пам'ять і використовує MMU хоста.</div> + <div style="white-space: nowrap"> Вимкнення цієї функції змушує всі ексклюзивні доступи до пам'яті використовувати емуляцію програмного MMU.</div> + Enable Host MMU Emulation (exclusive memory instructions) - + Увімкнути емуляцію MMU хоста (інструкції виняткової пам'яті) @@ -786,12 +817,15 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">This optimization speeds up exclusive memory accesses by the guest program.</div> <div style="white-space: nowrap">Enabling it reduces the overhead of fastmem failure of exclusive memory accesses.</div> - + + <div style="white-space: nowrap">Ця оптимізація прискорює звернення гостьової програми до виняткової пам'яті.</div> + <div style="white-space: nowrap">Її ввімкнення знижує накладні витрати, пов'язані з відмовою fastmem під час доступу до виняткової пам'яті.</div> + Enable recompilation of exclusive memory instructions - + Дозволити перекомпіляцію інструкцій виняткової пам'яті @@ -799,12 +833,15 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">This optimization speeds up memory accesses by allowing invalid memory accesses to succeed.</div> <div style="white-space: nowrap">Enabling it reduces the overhead of all memory accesses and has no impact on programs that don't access invalid memory.</div> - + + <div style="white-space: nowrap">Ця оптимізація прискорює звернення до пам'яті, дозволяючи успішне звернення до неприпустимої пам'яті.</div> + <div style="white-space: nowrap">Увімкнення цієї оптимізації знижує накладні витрати на всі звернення до пам'яті та не впливає на програми, які не звертаються до неприпустимої пам'яті.</div> + Enable fallbacks for invalid memory accesses - + Увімкнути запасні варіанти для неприпустимих звернень до пам'яті @@ -917,17 +954,17 @@ This would ban both their forum username and their IP address. When checked, it disables the macro Just In Time compiler. Enabling this makes games run slower - Якщо увімкнено, макрос компілятор Just In Time вимикається. Якщо ввімкнути це, ігри будуть працювати повільніше + Якщо ввімкнено, вимикає компілятор макросу Just In Time. Увімкнення цього параметра уповільнює роботу ігор Disable Macro JIT - Вимкнути Макрос JIT + Вимкнути макрос JIT When checked, it disables the macro HLE functions. Enabling this makes games run slower - + Якщо прапорець встановлено, він вимикає функції макроса HLE. Увімкнення цього параметра уповільнює роботу ігор @@ -947,12 +984,12 @@ This would ban both their forum username and their IP address. When checked, it executes shaders without loop logic changes - + Якщо увімкнено, шейдери виконуються без зміни логіки циклу Disable Loop safety checks - + Вимкнути перевірку безпеки циклу @@ -962,22 +999,22 @@ This would ban both their forum username and their IP address. Enable Verbose Reporting Services** - + Увімкнути службу звітів у розгорнутому вигляді** Enable FS Access Log - + Увімкнути журнал доступу до ФС Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Увімкніть це щоб виводити останній згенерирований список аудіо команд в консоль. Впливає лише на ігри, які використовують аудіо рендерер. Dump Audio Commands To Console** - + Вивантажувати аудіо команди в консоль** @@ -1002,12 +1039,12 @@ This would ban both their forum username and their IP address. Enable Debug Asserts - Увімкнути налагоджувальні сигнали + Увімкнути налагоджувальні припущення Enable Auto-Stub** - + Увімкнути автопідставку** @@ -1042,7 +1079,7 @@ This would ban both their forum username and their IP address. yuzu is required to restart in order to apply this setting. - yuzu потрібно перезапустити, щоб застосувати це налаштування. + yuzu необхідно перезапустити, щоб застосувати це налаштування. @@ -1100,78 +1137,78 @@ This would ban both their forum username and their IP address. Налаштування yuzu - - + + Audio Аудіо - - + + CPU ЦП - + Debug Налагодження - + Filesystem Файлова система - - + + General Загальні - - + + Graphics Графіка - + GraphicsAdvanced ГрафікаРозширені - + Hotkeys Гарячі клавіші - - + + Controls Керування - + Profiles Профілі - + Network Мережа - - + + System Система - + Game List Список ігор - + Web Мережа @@ -1346,41 +1383,36 @@ This would ban both their forum username and their IP address. - Extended memory layout (8GB DRAM) - - - - Confirm exit while emulation is running Підтверджувати вихід під час емуляції - + Prompt for user on game boot Запитувати користувача під час запуску гри - + Pause emulation when in background Призупиняти емуляцію у фоновому режимі - + Hide mouse on inactivity Приховування миші при бездіяльності - + Reset All Settings Скинути всі налаштування - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Це скине всі налаштування і видалить усі конфігурації під окремі ігри. При цьому не будуть видалені шляхи до ігор, профілів або профілів вводу. Продовжити? @@ -1419,7 +1451,7 @@ This would ban both their forum username and their IP address. - + None Вимкнено @@ -1445,231 +1477,272 @@ This would ban both their forum username and their IP address. + VSync Mode: + Режим верт. синхронізації: + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + FIFO (VSync) не пропускає кадри і не має розривів, але обмежений частотою оновлення екрана. +FIFO Relaxed схожий на FIFO, але може мати розриви під час відновлення після просідань. +Mailbox може мати меншу затримку, ніж FIFO, і не має розривів, але може пропускати кадри. +Моментальний (без синхронізації) просто показує всі кадри і може мати розриви. + + + NVDEC emulation: Емуляція NVDEC: - + No Video Output Відсутність відеовиходу - + CPU Video Decoding Декодування відео на ЦП - + GPU Video Decoding (Default) Декодування відео на ГП (за замовчуванням) - + Fullscreen Mode: Повноекранний режим: - + Borderless Windowed Вікно без рамок - + Exclusive Fullscreen Ексклюзивний повноекранний - + Aspect Ratio: Співвідношення сторін: - + Default (16:9) За замовчуванням (16:9) - + Force 4:3 Змусити 4:3 - + Force 21:9 Змусити 21:9 - + Force 16:10 Змусити 16:10 - + Stretch to Window Розтягнути до вікна - + Resolution: Роздільна здатність: - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [ЕКСПЕРИМЕНТАЛЬНЕ] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [ЕКСПЕРИМЕНТАЛЬНЕ] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] 1.5X (1080p/1620p) [ЕКСПЕРИМЕНТАЛЬНО] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) 7X (5040p/7560p) - + 8X (5760p/8640p) 8X (5760p/8640p) - + Window Adapting Filter: Фільтр адаптації вікна: - + Nearest Neighbor Найближчий сусід - + Bilinear Білінійне - + Bicubic Бікубічне - + Gaussian Гауса - + ScaleForce ScaleForce - + AMD FidelityFX™️ Super Resolution AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: Метод згладжування: - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness Використовувати глобальну різкість FSR - + Set FSR Sharpness Встановити різкість FSR - + FSR Sharpness: Різкість FSR: - + 100% 100% - - + + Use global background color Використовувати глобальний фоновий колір - + Set background color: Встановити фоновий колір: - + Background Color: Фоновий колір: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (асемблерні шейдери, лише для NVIDIA) - + SPIR-V (Experimental, Mesa Only) SPIR-V (Експериментально, лише для Mesa) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + Вимкнено + + + + VSync Off + Верт. синхронізацію вимкнено + + + + Recommended + Рекомендовано + + + + On + Увімкнено + + + + VSync On + Верт. синхронізація увімкнена + ConfigureGraphicsAdvanced @@ -1694,107 +1767,134 @@ This would ban both their forum username and their IP address. Рівень точності: - + + ASTC recompression: + Рекомпресія ASTC: + + + + Uncompressed (Best quality) + Без стиснення (Найкраща якість) + + + + BC1 (Low quality) + ВС1 (Низька якість) + + + + BC3 (Medium quality) + ВС3 (Середня якість) + + + + Enable asynchronous presentation (Vulkan only) + Увімкнути асинхронну презентацію (Vulkan) + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. Виконує роботу у фоновому режимі в очікуванні графічних команд, не даючи змоги ГП знижувати тактову частоту. - + Force maximum clocks (Vulkan only) Примусово змусити максимальну тактову частоту (тільки для Vulkan) - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - Вертикальна синхронізація запобігає розривам екрана, але деякі відеокарти мають нижчу продуктивність при вертикальній синхронізації. Залишайте увімкненим, якщо ви не помічаєте різниці в продуктивності. - - - - Use VSync - Використувати вертикальну сінхронізацію - - - + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. - + Включає асинхронне декодування ASTC текстур, що може зменшити зависання під час завантаження. Ця функція є експериментальною. - + Decode ASTC textures asynchronously (Hack) - + Декодувати ASTC текстури асинхронно (хак) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + Використовує реактивне очищення замість прогнозованого. Це дає змогу точніше синхронізувати пам'ять. + + + + Enable Reactive Flushing + Увімкнути реактивне очищення + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. Вмикає асинхронну компіляцію шейдерів, що зменшить зависання через шейдери. Функція є експериментальною. - + Use asynchronous shader building (Hack) Використовувати асинхронну побудову шейдерів (хак) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. Вмикає функцію Fast GPU Time. Цей параметр змусить більшість ігор працювати в максимальній рідній роздільній здатності. - + Use Fast GPU Time (Hack) - Увімкнути Fast GPU Time (Хак) + Увімкнути Fast GPU Time (хак) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - Вмикає песимістичне очищення буферів. Ця опція змушує промивати немодифіковані буфери, що може знизити продуктивність. - - - - Use pessimistic buffer flushes (Hack) - Використовувати песимістичне очищення буферів (Хак) - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. Вмикає кеш конвеєра, специфічний для виробника GPU. Ця опція може значно поліпшити час завантаження шейдерів у тих випадках, коли драйвер Vulkan не зберігає внутрішні файли кешу конвеєра. - + Use Vulkan pipeline cache Використовувати конвеєрний кеш Vulkan - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + Вмикає обчислювальні конвеєри, які обов'язкові для деяких ігор. Цей параметр існує лише для власних драйверів Intel і може призвести до збоїв, якщо його ввімкнути. +Обчислювальні конвеєри завжди увімкнені на всіх інших драйверах. + + + + Enable Compute Pipelines (Intel Vulkan only) + Увімкнути обчислювальні конвеєри (тільки для Intel Vulkan) + + + Anisotropic Filtering: Анізотропна фільтрація: - + Automatic Автоматично - + Default За замовчуванням - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1827,70 +1927,65 @@ This would ban both their forum username and their IP address. Відновити значення за замовчуванням. - + Action Дія - + Hotkey Гаряча клавіша - + Controller Hotkey Гаряча клавіша контролера - - - + + + Conflicting Key Sequence Конфліктуюча комбінація клавіш - - + + The entered key sequence is already assigned to: %1 Введена комбінація вже призначена до: %1 - - Home+%1 - Home+%1 - - - + [waiting] [очікування] - + Invalid Неприпустимо - + Restore Default Відновити значення за замовчуванням - + Clear Очистити - + Conflicting Button Sequence Конфліктуюче поєднання кнопок - + The default button sequence is already assigned to: %1 Типова комбінація кнопок вже призначена до: %1 - + The default key sequence is already assigned to: %1 Типова комбінація клавіш вже призначена до: %1 @@ -2182,7 +2277,7 @@ This would ban both their forum username and their IP address. - + Configure Налаштувати @@ -2236,25 +2331,35 @@ This would ban both their forum username and their IP address. Enable direct Pro Controller driver [EXPERIMENTAL] - + Увімкнути прямий драйвер Pro Controller [ЕКСПЕРЕМИНТАЛЬНО] - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + Дозволяє необмежено використовувати один і той самий Amiibo в іграх, які зазвичай дозволяють тільки одне використання. + + + + Use random Amiibo ID + Використовувати випадкове Amiibo ID + + + Enable mouse panning Увімкнути панорамування миші - + Mouse sensitivity Чутливість миші - + % % - + Motion / Touch Рух і сенсор @@ -2274,7 +2379,7 @@ This would ban both their forum username and their IP address. Input Profiles - Профілі Вводу + Профілі вводу @@ -2366,7 +2471,7 @@ This would ban both their forum username and their IP address. - + Left Stick Лівий міні-джойстик @@ -2460,14 +2565,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2486,7 +2591,7 @@ This would ban both their forum username and their IP address. - + Plus Плюс @@ -2499,15 +2604,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2564,241 +2669,247 @@ This would ban both their forum username and their IP address. - + Right Stick Правий міні-джойстик - - - - + + + + Clear Очистити - - - - - + + + + + [not set] [не задано] - - + + + Invert button Інвертувати кнопку - - + + Toggle button Переключити кнопку - + Turbo button Турбо кнопка - - + + Invert axis Інвертувати осі - - - + + + Set threshold Встановити поріг - - + + Choose a value between 0% and 100% Оберіть значення між 0% і 100% - + Toggle axis Переключити осі - + Set gyro threshold Встановити поріг гіроскопа - + + Calibrate sensor + Калібрувати сенсор + + + Map Analog Stick Задати аналоговий міні-джойстик - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Після натискання на ОК, рухайте ваш міні-джойстик горизонтально, а потім вертикально. Щоб інвертувати осі, спочатку рухайте ваш міні-джойстик вертикально, а потім горизонтально. - + Center axis Центрувати осі - - + + Deadzone: %1% Мертва зона: %1% - - + + Modifier Range: %1% Діапазон модифікатора: %1% - - + + Pro Controller Контролер Pro - + Dual Joycons Подвійні Joy-Con'и - + Left Joycon Лівий Joy-Con - + Right Joycon Правий Joy-Con - + Handheld Портативний - + GameCube Controller Контролер GameCube - + Poke Ball Plus Poke Ball Plus - + NES Controller Контролер NES - + SNES Controller Контролер SNES - + N64 Controller Контролер N64 - + Sega Genesis Sega Genesis - + Start / Pause Старт / Пауза - + Z Z - + Control Stick Міні-джойстик керування - + C-Stick C-Джойстик - + Shake! Потрусіть! - + [waiting] [очікування] - + New Profile Новий профіль - + Enter a profile name: Введіть ім'я профілю: - - + + Create Input Profile Створити профіль контролю - + The given profile name is not valid! Задане ім'я профілю недійсне! - + Failed to create the input profile "%1" Не вдалося створити профіль контролю "%1" - + Delete Input Profile Видалити профіль контролю - + Failed to delete the input profile "%1" Не вдалося видалити профіль контролю "%1" - + Load Input Profile Завантажити профіль контролю - + Failed to load the input profile "%1" Не вдалося завантажити профіль контролю "%1" - + Save Input Profile Зберегти профіль контролю - + Failed to save the input profile "%1" Не вдалося зберегти профіль контролю "%1" @@ -3053,47 +3164,47 @@ To invert the axes, first move your joystick vertically, and then horizontally.< Розробник - + Add-Ons Доповнення - + General Загальні - + System Система - + CPU ЦП - + Graphics Графіка - + Adv. Graphics Розш. Графіка - + Audio Аудіо - + Input Profiles - Профілі Вводу + Профілі вводу - + Properties Властивості @@ -3814,7 +3925,12 @@ UUID: %2 Назва пристрою - + + Unsafe extended memory layout (8GB DRAM) + Небезпечне розширення компонування пам'яті (8 ГБ DRAM) + + + System settings are available only when game is not running. Налаштування системи доступні тільки тоді, коли гру не запущено. @@ -4510,555 +4626,560 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Анонімні дані збираються для того,</a> щоб допомогти поліпшити роботу yuzu. <br/><br/>Хотіли б ви ділитися даними про використання з нами? - + Telemetry Телеметрія - + Broken Vulkan Installation Detected Виявлено пошкоджену інсталяцію Vulkan - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. Не вдалося виконати ініціалізацію Vulkan під час завантаження.<br><br>Натисніть <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>тут для отримання інструкцій щодо усунення проблеми</a>. - + Loading Web Applet... Завантаження веб-аплета... - - + + Disable Web Applet Вимкнути веб-аплет - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) Вимкнення веб-апплета може призвести до несподіваної поведінки, і його слід вимикати лише заради Super Mario 3D All-Stars. Ви впевнені, що хочете вимкнути веб-апплет? (Його можна знову ввімкнути в налаштуваннях налагодження.) - + The amount of shaders currently being built Кількість створюваних шейдерів на цей момент - + The current selected resolution scaling multiplier. Поточний обраний множник масштабування роздільної здатності. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Поточна швидкість емуляції. Значення вище або нижче 100% вказують на те, що емуляція йде швидше або повільніше, ніж на Switch. - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Кількість кадрів на секунду в цей момент. Значення буде змінюватися між іграми та сценами. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Час, який потрібен для емуляції 1 кадру Switch, не беручи до уваги обмеження FPS або вертикальну синхронізацію. Для емуляції в повній швидкості значення має бути не більше 16,67 мс. - + &Clear Recent Files [&C] Очистити нещодавні файли - + Emulated mouse is enabled - + Емульована мишка увімкнена - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. - + Введення реальної миші та панорамування мишею несумісні. Будь ласка, вимкніть емульовану мишу в розширених налаштуваннях введення, щоб дозволити панорамування мишею. - + &Continue [&C] Продовжити - + &Pause [&P] Пауза - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping В yuzu запущено гру - + Warning Outdated Game Format Попередження застарілий формат гри - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Для цієї гри ви використовуєте розархівований формат ROM'а, який є застарілим і був замінений іншими, такими як NCA, NAX, XCI або NSP. У розархівованих каталогах ROM'а відсутні іконки, метадані та підтримка оновлень. <br><br>Для отримання інформації про різні формати Switch, підтримувані yuzu, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>перегляньте нашу вікі</a>. Це повідомлення більше не буде відображатися. - - + + Error while loading ROM! Помилка під час завантаження ROM! - + The ROM format is not supported. Формат ROM'а не підтримується. - + An error occurred initializing the video core. Сталася помилка під час ініціалізації відеоядра. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu зіткнувся з помилкою під час запуску відеоядра. Зазвичай це спричинено застарілими драйверами ГП, включно з інтегрованими. Перевірте журнал для отримання більш детальної інформації. Додаткову інформацію про доступ до журналу дивіться на наступній сторінці: <a href='https://yuzu-emu.org/help/reference/log-files/'>Як завантажити файл журналу</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. Помилка під час завантаження ROM'а! %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>Будь ласка, дотримуйтесь <a href='https://yuzu-emu.org/help/quickstart/'>короткого керівництва користувача yuzu</a> щоб пере-дампити ваші файли<br>Ви можете звернутися до вікі yuzu</a> або Discord yuzu</a> для допомоги - + An unknown error occurred. Please see the log for more details. Сталася невідома помилка. Будь ласка, перевірте журнал для подробиць. - + (64-bit) (64-бітний) - + (32-bit) (32-бітний) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... Закриваємо програму... - + Save Data Збереження - + Mod Data Дані модів - + Error Opening %1 Folder Помилка під час відкриття папки %1 - - + + Folder does not exist! Папка не існує! - + Error Opening Transferable Shader Cache Помилка під час відкриття переносного кешу шейдерів - + Failed to create the shader cache directory for this title. Не вдалося створити папку кешу шейдерів для цієї гри. - + Error Removing Contents Помилка під час видалення вмісту - + Error Removing Update Помилка під час видалення оновлень - + Error Removing DLC Помилка під час видалення DLC - + Remove Installed Game Contents? Видалити встановлений вміст ігор? - + Remove Installed Game Update? Видалити встановлені оновлення гри? - + Remove Installed Game DLC? Видалити встановлені DLC гри? - + Remove Entry Видалити запис - - - - - - + + + + + + Successfully Removed Успішно видалено - + Successfully removed the installed base game. Встановлену гру успішно видалено. - + The base game is not installed in the NAND and cannot be removed. Гру не встановлено в NAND і не може буде видалено. - + Successfully removed the installed update. Встановлене оновлення успішно видалено. - + There is no update installed for this title. Для цієї гри не було встановлено оновлення. - + There are no DLC installed for this title. Для цієї гри не було встановлено DLC. - + Successfully removed %1 installed DLC. Встановлений DLC %1 було успішно видалено - + Delete OpenGL Transferable Shader Cache? Видалити переносний кеш шейдерів OpenGL? - + Delete Vulkan Transferable Shader Cache? Видалити переносний кеш шейдерів Vulkan? - + Delete All Transferable Shader Caches? Видалити весь переносний кеш шейдерів? - + Remove Custom Game Configuration? Видалити користувацьке налаштування гри? - + + Remove Cache Storage? + + + + Remove File Видалити файл - - + + Error Removing Transferable Shader Cache Помилка під час видалення переносного кешу шейдерів - - + + A shader cache for this title does not exist. Кеш шейдерів для цієї гри не існує. - + Successfully removed the transferable shader cache. Переносний кеш шейдерів успішно видалено. - + Failed to remove the transferable shader cache. Не вдалося видалити переносний кеш шейдерів. - + Error Removing Vulkan Driver Pipeline Cache Помилка під час видалення конвеєрного кешу Vulkan - + Failed to remove the driver pipeline cache. Не вдалося видалити конвеєрний кеш шейдерів. - - + + Error Removing Transferable Shader Caches Помилка під час видалення переносного кешу шейдерів - + Successfully removed the transferable shader caches. Переносний кеш шейдерів успішно видалено. - + Failed to remove the transferable shader cache directory. Помилка під час видалення папки переносного кешу шейдерів. - - + + Error Removing Custom Configuration Помилка під час видалення користувацького налаштування - + A custom configuration for this title does not exist. Користувацьких налаштувань для цієї гри не існує. - + Successfully removed the custom game configuration. Користувацьке налаштування гри успішно видалено. - + Failed to remove the custom game configuration. Не вдалося видалити користувацьке налаштування гри. - - + + RomFS Extraction Failed! Не вдалося вилучити RomFS! - + There was an error copying the RomFS files or the user cancelled the operation. Сталася помилка під час копіювання файлів RomFS або користувач скасував операцію. - + Full Повний - + Skeleton Скелет - + Select RomFS Dump Mode Виберіть режим дампа RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Будь ласка, виберіть, як ви хочете виконати дамп RomFS <br>Повний скопіює всі файли в нову папку, тоді як <br>скелет створить лише структуру папок. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root В %1 недостатньо вільного місця для вилучення RomFS. Будь ласка, звільніть місце або виберіть іншу папку для дампа в Емуляція > Налаштування > Система > Файлова система > Корінь дампа - + Extracting RomFS... Вилучення RomFS... - - + + Cancel Скасувати - + RomFS Extraction Succeeded! Вилучення RomFS пройшло успішно! - + The operation completed successfully. Операція завершилася успішно. - - - - - + + + + + Create Shortcut Створити ярлик - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? Це створить ярлик для поточного AppImage. Він може не працювати після оновлень. Продовжити? - + Cannot create shortcut on desktop. Path "%1" does not exist. Не вдається створити ярлик на робочому столі. Шлях "%1" не існує. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. Неможливо створити ярлик у меню додатків. Шлях "%1" не існує і не може бути створений. - + Create Icon Створити іконку - + Cannot create icon file. Path "%1" does not exist and cannot be created. Неможливо створити файл іконки. Шлях "%1" не існує і не може бути створений. - + Start %1 with the yuzu Emulator Запустити %1 за допомогою емулятора yuzu - + Failed to create a shortcut at %1 Не вдалося створити ярлик у %1 - + Successfully created a shortcut to %1 Успішно створено ярлик у %1 - + Error Opening %1 Помилка відкриття %1 - + Select Directory Обрати папку - + Properties Властивості - + The game properties could not be loaded. Не вдалося завантажити властивості гри. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Виконуваний файл Switch (%1);;Усі файли (*.*) - + Load File Завантажити файл - + Open Extracted ROM Directory Відкрити папку вилученого ROM'а - + Invalid Directory Selected Вибрано неприпустиму папку - + The directory you have selected does not contain a 'main' file. Папка, яку ви вибрали, не містить файлу 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Встановлюваний файл Switch (*.nca, *.nsp, *.xci);;Архів контенту Nintendo (*.nca);;Пакет подачі Nintendo (*.nsp);;Образ картриджа NX (*.xci) - + Install Files Встановити файли - + %n file(s) remaining Залишився %n файлЗалишилося %n файл(ів)Залишилося %n файл(ів)Залишилося %n файл(ів) - + Installing file "%1"... Встановлення файлу "%1"... - - + + Install Results Результати встановлення - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. Щоб уникнути можливих конфліктів, ми не рекомендуємо користувачам встановлювати ігри в NAND. Будь ласка, використовуйте цю функцію тільки для встановлення оновлень і завантажуваного контенту. - + %n file(s) were newly installed %n файл було нещодавно встановлено @@ -5068,7 +5189,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) were overwritten %n файл було перезаписано @@ -5078,7 +5199,7 @@ Please, only use this feature to install updates and DLC. - + %n file(s) failed to install %n файл не вдалося встановити @@ -5088,388 +5209,388 @@ Please, only use this feature to install updates and DLC. - + System Application Системний додаток - + System Archive Системний архів - + System Application Update Оновлення системного додатку - + Firmware Package (Type A) Пакет прошивки (Тип А) - + Firmware Package (Type B) Пакет прошивки (Тип Б) - + Game Гра - + Game Update Оновлення гри - + Game DLC DLC до гри - + Delta Title Дельта-титул - + Select NCA Install Type... Виберіть тип установки NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Будь ласка, виберіть тип додатку, який ви хочете встановити для цього NCA: (У більшості випадків, підходить стандартний вибір "Гра".) - + Failed to Install Помилка встановлення - + The title type you selected for the NCA is invalid. Тип додатку, який ви вибрали для NCA, недійсний. - + File not found Файл не знайдено - + File "%1" not found Файл "%1" не знайдено - + OK ОК - - + + Hardware requirements not met Не задоволені системні вимоги - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. Ваша система не відповідає рекомендованим системним вимогам. Звіти про сумісність було вимкнено. - + Missing yuzu Account Відсутній обліковий запис yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Щоб надіслати звіт про сумісність гри, необхідно прив'язати свій обліковий запис yuzu. <br><br/>Щоб прив'язати свій обліковий запис yuzu, перейдіть у розділ Емуляція &gt; Параметри &gt; Мережа. - + Error opening URL Помилка під час відкриття URL - + Unable to open the URL "%1". Не вдалося відкрити URL: "%1". - + TAS Recording Запис TAS - + Overwrite file of player 1? Перезаписати файл гравця 1? - + Invalid config detected Виявлено неприпустиму конфігурацію - + Handheld controller can't be used on docked mode. Pro controller will be selected. Портативний контролер не може бути використаний у режимі док-станції. Буде обрано контролер Pro. - - + + Amiibo Amiibo - - + + The current amiibo has been removed Поточний amiibo було прибрано - + Error Помилка - - + + The current game is not looking for amiibos Поточна гра не шукає amiibo - + Amiibo File (%1);; All Files (*.*) Файл Amiibo (%1);; Всі Файли (*.*) - + Load Amiibo Завантажити Amiibo - + Error loading Amiibo data Помилка під час завантаження даних Amiibo - + The selected file is not a valid amiibo Обраний файл не є допустимим amiibo - + The selected file is already on use Обраний файл уже використовується - + An unknown error occurred Виникла невідома помилка - + Capture Screenshot Зробити знімок екрану - + PNG Image (*.png) Зображення PNG (*.png) - + TAS state: Running %1/%2 Стан TAS: Виконується %1/%2 - + TAS state: Recording %1 Стан TAS: Записується %1 - + TAS state: Idle %1/%2 Стан TAS: Простий %1/%2 - + TAS State: Invalid Стан TAS: Неприпустимий - + &Stop Running [&S] Зупинка - + &Start [&S] Почати - + Stop R&ecording [&E] Закінчити запис - + R&ecord [&E] Запис - + Building: %n shader(s) Побудова: %n шейдерПобудова: %n шейдер(ів)Побудова: %n шейдер(ів)Побудова: %n шейдер(ів) - + Scale: %1x %1 is the resolution scaling factor Масштаб: %1x - + Speed: %1% / %2% Швидкість: %1% / %2% - + Speed: %1% Швидкість: %1% - + Game: %1 FPS (Unlocked) Гра: %1 FPS (Необмежено) - + Game: %1 FPS Гра: %1 FPS - + Frame: %1 ms Кадр: %1 мс - + GPU NORMAL ГП НОРМАЛЬНО - + GPU HIGH ГП ВИСОКО - + GPU EXTREME ГП ЕКСТРИМ - + GPU ERROR ГП ПОМИЛКА - + DOCKED В ДОК-СТАНЦІЇ - + HANDHELD ПОРТАТИВНИЙ - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST НАЙБЛИЖЧІЙ - - + + BILINEAR БІЛІНІЙНИЙ - + BICUBIC БІКУБІЧНИЙ - + GAUSSIAN ГАУС - + SCALEFORCE SCALEFORCE - + FSR FSR - - + + NO AA БЕЗ ЗГЛАДЖУВАННЯ - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE ГУЧНІСТЬ: ЗАГЛУШЕНА - + VOLUME: %1% Volume percentage (e.g. 50%) ГУЧНІСТЬ: %1% - + Confirm Key Rederivation Підтвердіть перерахунок ключа - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5486,37 +5607,37 @@ This will delete your autogenerated key files and re-run the key derivation modu Це видалить ваші автоматично згенеровані файли ключів і повторно запустить модуль розрахунку ключів. - + Missing fuses Відсутні запобіжники - + - Missing BOOT0 - Відсутній BOOT0 - + - Missing BCPKG2-1-Normal-Main - Відсутній BCPKG2-1-Normal-Main - + - Missing PRODINFO - Відсутній PRODINFO - + Derivation Components Missing Компоненти розрахунку відсутні - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> Ключі шифрування відсутні.<br>Будь ласка, дотримуйтесь <a href='https://yuzu-emu.org/help/quickstart/'>короткого керівництва користувача yuzu</a>, щоб отримати всі ваші ключі, прошивку та ігри<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5525,39 +5646,49 @@ on your system's performance. від продуктивності вашої системи. - + Deriving Keys Отримання ключів - + + System Archive Decryption Failed + Не вдалося розшифрувати системний архів + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + Ключі шифрування не змогли розшифрувати прошивку.<br>Будь ласка, дотримуйтесь <a href='https://yuzu-emu.org/help/quickstart/'>короткого керівництва користувача yuzu</a> щоб отримати всі ваші ключі, прошивку та ігри. + + + Select RomFS Dump Target Оберіть ціль для дампа RomFS - + Please select which RomFS you would like to dump. Будь ласка, виберіть, який RomFS ви хочете здампити. - + Are you sure you want to close yuzu? Ви впевнені, що хочете закрити yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Ви впевнені, що хочете зупинити емуляцію? Будь-який незбережений прогрес буде втрачено. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5569,44 +5700,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGL недоступний! - + OpenGL shared contexts are not supported. Загальні контексти OpenGL не підтримуються. - + yuzu has not been compiled with OpenGL support. yuzu не було зібрано з підтримкою OpenGL. + - Error while initializing OpenGL! Помилка під час ініціалізації OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. Ваш ГП може не підтримувати OpenGL, або у вас встановлено застарілий графічний драйвер. - + Error while initializing OpenGL 4.6! Помилка під час ініціалізації OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 Ваш ГП може не підтримувати OpenGL 4.6, або у вас встановлено застарілий графічний драйвер.<br><br>Рендерер GL:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 Ваш ГП може не підтримувати одне або кілька необхідних розширень OpenGL. Будь ласка, переконайтеся в тому, що у вас встановлено останній графічний драйвер.<br><br>Рендерер GL:<br>%1<br><br>Розширення, що не підтримуються:<br>%2 @@ -5665,117 +5796,122 @@ Would you like to bypass this and exit anyway? + Remove Cache Storage + + + + Remove OpenGL Pipeline Cache Видалити кеш конвеєра OpenGL - + Remove Vulkan Pipeline Cache Видалити кеш конвеєра Vulkan - + Remove All Pipeline Caches Видалити весь кеш конвеєра - + Remove All Installed Contents Видалити весь встановлений вміст - + Dump RomFS Дамп RomFS - + Dump RomFS to SDMC Здампити RomFS у SDMC - + Copy Title ID to Clipboard Скопіювати ідентифікатор додатку в буфер обміну - + Navigate to GameDB entry Перейти до сторінки GameDB - + Create Shortcut Створити ярлик - + Add to Desktop Додати на Робочий стіл - + Add to Applications Menu Додати до меню застосунків - + Properties Властивості - + Scan Subfolders Сканувати підпапки - + Remove Game Directory Видалити директорію гри - + ▲ Move Up ▲ Перемістити вверх - + ▼ Move Down ▼ Перемістити вниз - + Open Directory Location Відкрити розташування папки - + Clear Очистити - + Name Назва - + Compatibility Сумісність - + Add-ons Доповнення - + File type Тип файлу - + Size Розмір @@ -5846,7 +5982,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list Натисніть двічі, щоб додати нову папку до списку ігор @@ -5859,12 +5995,12 @@ Would you like to bypass this and exit anyway? %1 із %n результат(ів)%1 із %n результат(ів)%1 із %n результат(ів)%1 із %n результат(ів) - + Filter: Пошук: - + Enter pattern to filter Введіть текст для пошуку @@ -5955,12 +6091,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute Увімкнення/вимкнення звуку - @@ -5982,111 +6117,112 @@ Debug Message: + Main Window Основне вікно - + Audio Volume Down Зменшити гучність звуку - + Audio Volume Up Підвищити гучність звуку - + Capture Screenshot Зробити знімок екрану - + Change Adapting Filter Змінити адаптуючий фільтр - + Change Docked Mode Змінити режим консолі - + Change GPU Accuracy Змінити точність ГП - + Continue/Pause Emulation Продовження/Пауза емуляції - + Exit Fullscreen Вийти з повноекранного режиму - + Exit yuzu Вийти з yuzu - + Fullscreen Повний екран - + Load File Завантажити файл - + Load/Remove Amiibo Завантажити/видалити Amiibo - + Restart Emulation Перезапустити емуляцію - + Stop Emulation Зупинити емуляцію - + TAS Record Запис TAS - + TAS Reset Скидання TAS - + TAS Start/Stop Старт/Стоп TAS - + Toggle Filter Bar Переключити панель пошуку - + Toggle Framerate Limit Переключити обмеження частоти кадрів - + Toggle Mouse Panning Переключити панорамування миші - + Toggle Status Bar Переключити панель стану @@ -6779,7 +6915,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE СТАРТ/ПАУЗА @@ -6829,21 +6965,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6851,8 +6987,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [не задано] @@ -6867,10 +7003,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Ось %1%2 @@ -6884,163 +7020,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [невідомо] - - + + Left Вліво - - + + Right Вправо - - + + Down Вниз - - + + Up Вгору - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start Start - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle Кружечок - + Cross Хрестик - + Square Квадратик - + Triangle Трикутничок - + Share Share - + Options Options - + [undefined] [невизначено] @@ -7051,7 +7187,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [неприпустимо] @@ -7065,21 +7201,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2Ось %3 - + %1%2Axis %3,%4,%5 %1%2Ось %3,%4,%5 - + %1%2Motion %3 %1%2Рух %3 @@ -7091,106 +7225,112 @@ p, li { white-space: pre-wrap; } - + [unused] [не використаний] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L Лівий стік - + Stick R Правий стік - + Plus Плюс - + Minus Мінус - - + + Home Home - + Capture Захоплення - + Touch Сенсор - + Wheel Indicates the mouse wheel Коліщатко - + Backward Назад - + Forward Вперед - + Task Задача - + Extra Додаткова - + %1%2%3%4 %1%2%3%4 - - + + %1%2%3Hat %4 %1%2%3Напр. %4 - - + + + %1%2%3Axis %4 + %1%2%3Вісь %4 + + + + %1%2%3Button %4 %1%2%3Кнопка %4 @@ -7611,73 +7751,73 @@ Please try again or contact the developer of the software. Користувачі - + Profile Creator - + Творець профілю - - + + Profile Selector Вибір профілю - + Profile Icon Editor - + Редактор іконки профілю - + Profile Nickname Editor - + Редактор нікнейма профілю - + Who will receive the points? - + Хто отримуватиме очки? - + Who is using Nintendo eShop? - + Хто використовує Nintendo eShop? - + Who is making this purchase? - + Хто здійснює цю покупку? - + Who is posting? - + Хто публікує? - + Select a user to link to a Nintendo Account. - + Виберіть користувача для прив'язки до облікового запису Nintendo. - + Change settings for which user? - + Змінити налаштування для якого користувача? - + Format data for which user? - + Форматувати дані для якого користувача? - + Which user will be transferred to another console? - + Який користувач буде переходити на іншу консоль? - + Send save data for which user? - + Надіслати збереження якому користувачеві? - + Select a user: Оберить користувача @@ -7740,12 +7880,12 @@ p, li { white-space: pre-wrap; } [%1] %2 - + [%1] %2 waited by no thread - + не очікується жодним потоком @@ -7753,62 +7893,62 @@ p, li { white-space: pre-wrap; } runnable - + runnable paused - + paused sleeping - + sleeping waiting for IPC reply - + очікування відповіді IPC waiting for objects - + очікування об'єктів waiting for condition variable - + waiting for condition variable waiting for address arbiter - + waiting for address arbiter waiting for suspend resume - + waiting for suspend resume waiting - + waiting initialized - + initialized terminated - + terminated unknown - + невідомо @@ -7818,37 +7958,37 @@ p, li { white-space: pre-wrap; } ideal - + ideal core %1 - + ядро %1 processor = %1 - + процесор = %1 affinity mask = %1 - + маска подібності = %1 thread id = %1 - + ідентифікатор потоку = %1 priority = %1(current) / %2(normal) - + пріоритет = %1(поточний) / %2(звичайний) last running ticks = %1 - + last running ticks = %1 @@ -7856,7 +7996,7 @@ p, li { white-space: pre-wrap; } waited by thread - + очікується потоком diff --git a/dist/languages/vi.ts b/dist/languages/vi.ts index 66ba533b8..2829ef62a 100644 --- a/dist/languages/vi.ts +++ b/dist/languages/vi.ts @@ -25,12 +25,18 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">yuzu is an experimental open-source emulator for the Nintendo Switch licensed under GPLv3.0+.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">This software should not be used to play games you have not legally obtained.</span></p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">yuzu là một phần mềm giả lập thử nghiệm mã nguồn mở cho máy Nintendo Switch, được cấp phép theo giấy phép GPLv3.0+.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Bạn không được phép sử dụng phần mềm này cho để chơi game mà bạn kiếm được một cách bất hợp pháp.</span></p></body></html> <html><head/><body><p><a href="https://yuzu-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Website</span></a> | <a href="https://github.com/yuzu-emu"><span style=" text-decoration: underline; color:#039be5;">Source Code</span></a> | <a href="https://github.com/yuzu-emu/yuzu/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://github.com/yuzu-emu/yuzu/blob/master/LICENSE.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html> - + <html><head/><body><p><a href="https://yuzu-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Trang web</span></a> | <a href="https://github.com/yuzu-emu"><span style=" text-decoration: underline; color:#039be5;">Mã nguồn</span></a> | <a href="https://github.com/yuzu-emu/yuzu/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Đóng góp</span></a> | <a href="https://github.com/yuzu-emu/yuzu/blob/master/license.txt"><span style=" text-decoration: underline; color:#039be5;">Giấy phép</span></a></p></body></html> @@ -81,90 +87,92 @@ p, li { white-space: pre-wrap; } Send Chat Message - + Gửi tin nhắn Send Message - + Gửi tin nhắn Members - + Thành viên %1 has joined - + %1 đã vô %1 has left - + %1 đã thoát %1 has been kicked - + %1 đã bị kick %1 has been banned - + %1 đã bị ban %1 has been unbanned - + %1 đã được unban View Profile - + Xem hồ sơ Block Player - + Chặn người chơi When you block a player, you will no longer receive chat messages from them.<br><br>Are you sure you would like to block %1? - + Khi bạn chặn một người chơi, bạn sẽ không còn nhận được tin nhắn từ người chơi đó nữa. Bạn có chắc là muốn chặn %1? Kick - + Kick Ban - + Ban Kick Player - + Kick người chơi Are you sure you would like to <b>kick</b> %1? - + Bạn có chắc là bạn muốn <b>kick</b> %1? Ban Player - + Ban người chơi Are you sure you would like to <b>kick and ban</b> %1? This would ban both their forum username and their IP address. - + Bạn có chắc là bạn muốn <b>kick và ban</b> %1? + +Điều này sẽ ban tên trên diễn đàn của họ và IP của họ luôn @@ -177,17 +185,17 @@ This would ban both their forum username and their IP address. Room Description - + Nội dung phòng chơi Moderation... - + Quản lý... Leave Room - + Rời khỏi phòng @@ -200,12 +208,12 @@ This would ban both their forum username and their IP address. Disconnected - + Mất kết nối %1 - %2 (%3/%4 members) - connected - + %1 - %2 (%3/%4 members) - đã kết nối @@ -234,102 +242,102 @@ This would ban both their forum username and their IP address. <html><head/><body><p>Does the game boot?</p></body></html> - + <html><head/><body><p>Game có chạy lên thành công hay không?</p></body></html> Yes The game starts to output video or audio - + Có Game có xuất ra hình và âm thanh No The game doesn't get past the "Launching..." screen - + Không Game không thể qua khỏi được khúc màn hình "Launching..." Yes The game gets past the intro/menu and into gameplay - + Có Game có thể qua được khúc intro/menu và vô được game No The game crashes or freezes while loading or using the menu - + Không Game crash hoặc đơ khi đang loading hoặc sử dụng menu <html><head/><body><p>Does the game reach gameplay?</p></body></html> - + <html><head/><body><p>Game có chạy được tới vô bên trong hay không?</p></body></html> Yes The game works without crashes - + Có Game chạy ổn định, không bị crash No The game crashes or freezes during gameplay - + Không Game crash hoặc đơ trong lúc chơi <html><head/><body><p>Does the game work without crashing, freezing or locking up during gameplay?</p></body></html> - + <html><head/><body><p>Game chạy có ổn định với không crash, đơ hoặc bị kẹt trong lúc chơi hay không?</p></body></html> Yes The game can be finished without any workarounds - + Có Game có thể hoàn thành mà không cần phải làm gì thêm No The game can't progress past a certain area - + Không Game không thể qua được mốt số khúc <html><head/><body><p>Is the game completely playable from start to finish?</p></body></html> - + <html><head/><body><p>Game có chơi được từ đầu đến cuối hay không?</p></body></html> Major The game has major graphical errors - + Lỗi nặng Game bị lỗi hình ảnh nặng Minor The game has minor graphical errors - + Lỗi nhẹ Game bị lỗi hình ảnh nhẹ None Everything is rendered as it looks on the Nintendo Switch - + Không lỗi Game nhìn y hệt như trên Nintendo Switch <html><head/><body><p>Does the game have any graphical glitches?</p></body></html> - + <html><head/><body><p>Game có bị lỗi gì về hình ảnh không?</p></body></html> Major The game has major audio errors - + Lỗi nặng Game bị lỗi âm thanh nặng Minor The game has minor audio errors - + Lỗi nhẹ Game bị lỗi âm thanh nhẹ None Audio is played perfectly - + Không lỗi Âm thanh hoạt động hoàn hảo <html><head/><body><p>Does the game have any audio glitches / missing effects?</p></body></html> - + <html><head/><body><p>Game có bị lỗi âm thanh hay lỗi hiệu ứng hay không?</p></body></html> @@ -372,36 +380,61 @@ This would ban both their forum username and their IP address. - Output Device - + Output Device: + Đầu ra hệ thống: - Input Device - Thiết bị Nhập + Input Device: + Đầu vào thiết bị: - + + Sound Output Mode: + Chế độ đầu ra âm thanh + + + + Mono + Mono + + + + Stereo + Stereo + + + + Surround + Xung quanh + + + Use global volume Sử dụng âm lượng trong cài đặt - + Set volume: Âm lượng tuỳ chỉnh: - + Volume: Âm lượng: - + 0 % 0 % - + + Mute audio when in background + Tắt âm thanh khi chạy nền + + + %1% Volume percentage (e.g. 50%) %1% @@ -412,37 +445,37 @@ This would ban both their forum username and their IP address. Configure Infrared Camera - + Chỉnh sửa camera hồng ngoại Select where the image of the emulated camera comes from. It may be a virtual camera or a real camera. - + Chọn hình ảnh từ camera giả lập. Nó có thể là một camera giả hoặc là một camera thật Camera Image Source: - + Camera ảnh gốc: Input device: - + Đầu vào thiết bị: Preview - + Xem trước Resolution: 320*240 - + Độ phân giải: 320*240 Click to preview - + Nhấn để xem @@ -708,7 +741,7 @@ This would ban both their forum username and their IP address. Enable miscellaneous optimizations - + Bật tối ưu hóa tính năng phụ @@ -730,12 +763,16 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">Enabling it causes guest memory reads/writes to be done directly into memory and make use of Host's MMU.</div> <div style="white-space: nowrap">Disabling this forces all memory accesses to use Software MMU Emulation.</div> - + + <div style="white-space: nowrap">Cái này sẽ tăng tốc độ truy cập bộ nhớ bằng cách truy cập dưới dạng chương trình guest</div> + <div style="white-space: nowrap">Khi bật lên sẽ viết/đọc trực tiếp vô bộ nhớ và sử dụng Host MMU</div> + <div style="white-space: nowrap">Tắt cái này đi sẽ ép mọi phương thức truy cập bộ nhớ đi qua Software MMU Emulation</div> + Enable Host MMU Emulation (general memory instructions) - + Bật Host MMU Emulation (general memory instructions) @@ -895,103 +932,113 @@ This would ban both their forum username and their IP address. Disable Macro JIT Không dùng Macro JIT - - - When checked, yuzu will log statistics about the compiled pipeline cache - - - Enable Shader Feedback + When checked, it disables the macro HLE functions. Enabling this makes games run slower - - When checked, it executes shaders without loop logic changes + + Disable Macro HLE - Disable Loop safety checks + When checked, yuzu will log statistics about the compiled pipeline cache + + + + + Enable Shader Feedback - Debugging - Vá lỗi + When checked, it executes shaders without loop logic changes + - - Enable Verbose Reporting Services** + + Disable Loop safety checks + Debugging + Vá lỗi + + + + Enable Verbose Reporting Services** + + + + Enable FS Access Log - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** - + Create Minidump After Crash - + Advanced Nâng Cao - + Kiosk (Quest) Mode - + Enable CPU Debugging Bật Vá Lỗi CPU - + Enable Debug Asserts - + Enable Auto-Stub** - + Enable All Controller Types - + Disable Web Applet - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Perform Startup Vulkan Check - + **This will be reset automatically when yuzu closes. **Sẽ tự động thiết lập lại khi tắt yuzu. @@ -1006,12 +1053,12 @@ This would ban both their forum username and their IP address. - + Web applet not compiled - + MiniDump creation not compiled @@ -1061,78 +1108,78 @@ This would ban both their forum username and their IP address. Thiết lập yuzu - + Audio Âm thanh - + CPU CPU - + Debug Gỡ lỗi - + Filesystem Hệ thống tệp tin - + General Chung - + Graphics Đồ hoạ - + GraphicsAdvanced Đồ họa Nâng cao - + Hotkeys Phím tắt - + Controls Phím - + Profiles Hồ sơ - + Network Mạng - + System Hệ thống - + Game List Danh sách trò chơi - + Web Web @@ -1307,46 +1354,36 @@ This would ban both their forum username and their IP address. - Extended memory layout (6GB DRAM) - - - - Confirm exit while emulation is running Xác nhận thoát trong khi đang chạy giả lập - + Prompt for user on game boot Hiển thị cửa sổ chọn người dùng khi bắt đầu trò chơi - + Pause emulation when in background Tạm dừng giả lập khi chạy nền - - Mute audio when in background - - - - + Hide mouse on inactivity Ẩn con trỏ chuột khi không dùng - + Reset All Settings Đặt lại mọi tùy chỉnh - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Quá trình này sẽ thiết lập lại toàn bộ tùy chỉnh và gỡ hết mọi cài đặt cho từng game riêng lẻ. Quá trình này không xóa đường dẫn tới thư mục game, hồ sơ, hay hồ sơ của thiết lập phím. Tiếp tục? @@ -1385,7 +1422,7 @@ This would ban both their forum username and their IP address. - + None Trống @@ -1411,216 +1448,269 @@ This would ban both their forum username and their IP address. + VSync Mode: + + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: Giả lập NVDEC - + No Video Output Không Video Đầu Ra - + CPU Video Decoding - + GPU Video Decoding (Default) - + Fullscreen Mode: Chế độ Toàn màn hình: - + Borderless Windowed Cửa sổ không viền - + Exclusive Fullscreen Toàn màn hình - + Aspect Ratio: Tỉ lệ khung hình: - + Default (16:9) Mặc định (16:9) - + Force 4:3 Dùng 4:3 - + Force 21:9 Dùng 21:9 - + Force 16:10 - + Stretch to Window Kéo dãn đến cửa sổ phần mềm - + Resolution: - + 0.5X (360p/540p) [EXPERIMENTAL] - + 0.75X (540p/810p) [EXPERIMENTAL] - + 1X (720p/1080p) - + + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) - + 3X (2160p/3240p) - + 4X (2880p/4320p) - + 5X (3600p/5400p) - + 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: - + Nearest Neighbor - + Bilinear - + Bicubic - + Gaussian - + ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - + + AMD FidelityFX™️ Super Resolution + AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: - + FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Dùng màu nền theo cài đặt - + Set background color: Chọn màu nền: - + Background Color: Màu nền: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (Assembly Shaders, Chỉ Cho NVIDIA) - + SPIR-V (Experimental, Mesa Only) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + + + + + VSync Off + + + + + Recommended + + + + + On + + + + + VSync On + + ConfigureGraphicsAdvanced @@ -1645,77 +1735,133 @@ This would ban both their forum username and their IP address. Độ chính xác: - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync tránh cho màn hình bị "xước", tuy nhiên một số cạc đồ hoạ có hiệu năng chậm hơn khi VSync được kích hoạt. Bật chức năng này nếu nó không ảnh hưởng gì đến hiệu năng. - - - - Use VSync - - - - - Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. - Kích hoạt tính năng tạo shader không đồng bộ nhằm tránh cho trò chơi bị giật khi tạo shader. Tính năng này vẫn đang thử nghiệm. - - - - Use asynchronous shader building (Hack) - - - - - Enables Fast GPU Time. This option will force most games to run at their highest native resolution. + + ASTC recompression: - Use Fast GPU Time (Hack) - Tăng Tốc Thời Gian GPU (Hack) + Uncompressed (Best quality) + - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + + BC1 (Low quality) - Use pessimistic buffer flushes (Hack) + BC3 (Medium quality) - + + Enable asynchronous presentation (Vulkan only) + + + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + + + + + Force maximum clocks (Vulkan only) + + + + + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + + + + + Enable Reactive Flushing + + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. + Kích hoạt tính năng tạo shader không đồng bộ nhằm tránh cho trò chơi bị giật khi tạo shader. Tính năng này vẫn đang thử nghiệm. + + + + Use asynchronous shader building (Hack) + + + + + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. + + + + + Use Fast GPU Time (Hack) + Tăng Tốc Thời Gian GPU (Hack) + + + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + + + + + Enable Compute Pipelines (Intel Vulkan only) + + + + Anisotropic Filtering: Bộ lọc góc nghiêng: - + Automatic - + Default Mặc định - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1748,70 +1894,65 @@ This would ban both their forum username and their IP address. Khôi phục về mặc định - + Action Hành động - + Hotkey Phím tắt - + Controller Hotkey - - - + + + Conflicting Key Sequence Tổ hợp phím bị xung đột - - + + The entered key sequence is already assigned to: %1 Tổ hợp phím này đã gán với: %1 - - Home+%1 - - - - + [waiting] [Chờ] - + Invalid - + Restore Default Khôi phục về mặc định - + Clear Xóa - + Conflicting Button Sequence - + The default button sequence is already assigned to: %1 - + The default key sequence is already assigned to: %1 Tổ hợp phím này đã gán với: %1 @@ -2103,7 +2244,7 @@ This would ban both their forum username and their IP address. - + Configure Thiết lập @@ -2129,6 +2270,8 @@ This would ban both their forum username and their IP address. + + Requires restarting yuzu Phải khởi động lại yuzu @@ -2148,22 +2291,42 @@ This would ban both their forum username and their IP address. - + + Enable direct JoyCon driver + + + + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + + + + + Use random Amiibo ID + + + + Enable mouse panning - + Mouse sensitivity Độ nhạy chuột - + % % - + Motion / Touch Chuyển động / Cảm ứng @@ -2275,7 +2438,7 @@ This would ban both their forum username and their IP address. - + Left Stick Cần trái @@ -2369,14 +2532,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2395,7 +2558,7 @@ This would ban both their forum username and their IP address. - + Plus Cộng @@ -2408,15 +2571,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2473,236 +2636,247 @@ This would ban both their forum username and their IP address. - + Right Stick Cần phải - - - - + + + + Clear Bỏ trống - - - - - + + + + + [not set] [không đặt] - - + + + Invert button - - + + Toggle button - - + + Turbo button + + + + + Invert axis - - - + + + Set threshold - - + + Choose a value between 0% and 100% Chọn một giá trị giữa 0% và 100% - + Toggle axis - + Set gyro threshold - + + Calibrate sensor + + + + Map Analog Stick Thiết lập Cần Điều Khiển - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Sau khi bấm OK, di chuyển cần sang ngang, rồi sau đó sang dọc. Nếu muốn đảo ngược hướng cần điều khiển, di chuyển cần sang dọc trước, rồi sang ngang. - + Center axis - - + + Deadzone: %1% - - + + Modifier Range: %1% - - + + Pro Controller Tay cầm Pro Controller - + Dual Joycons Joycon đôi - + Left Joycon Joycon Trái - + Right Joycon Joycon Phải - + Handheld Cầm tay - + GameCube Controller Tay cầm GameCube - + Poke Ball Plus - + NES Controller - + SNES Controller - + N64 Controller - + Sega Genesis - + Start / Pause Bắt đầu / Tạm ngưng - + Z Z - + Control Stick - + C-Stick C-Stick - + Shake! Lắc! - + [waiting] [Chờ] - + New Profile Hồ sơ mới - + Enter a profile name: Nhập tên hồ sơ: - - + + Create Input Profile Tạo Hồ Sơ Phím - + The given profile name is not valid! Tên hồ sơ không hợp lệ! - + Failed to create the input profile "%1" Quá trình tạo hồ sơ phím "%1" thất bại - + Delete Input Profile Xóa Hồ Sơ Phím - + Failed to delete the input profile "%1" Quá trình xóa hồ sơ phím "%1" thất bại - + Load Input Profile Nạp Hồ Sơ Phím - + Failed to load the input profile "%1" Quá trình nạp hồ sơ phím "%1" thất bại - + Save Input Profile Lưu Hồ Sơ Phím - + Failed to save the input profile "%1" Quá trình lưu hồ sơ phím "%1" thất bại @@ -2750,7 +2924,7 @@ Nếu muốn đảo ngược hướng cần điều khiển, di chuyển cần s - + Configure Thiết lập @@ -2786,7 +2960,7 @@ Nếu muốn đảo ngược hướng cần điều khiển, di chuyển cần s - + Test Thử nghiệm @@ -2806,77 +2980,77 @@ Nếu muốn đảo ngược hướng cần điều khiển, di chuyển cần s <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Tìm hiểu thêm</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters Cổng có kí tự không hợp lệ - + Port has to be in range 0 and 65353 Cổng phải từ 0 đến 65353 - + IP address is not valid Địa chỉ IP không hợp lệ - + This UDP server already exists Server UDP đã tồn tại - + Unable to add more than 8 servers Không thể vượt quá 8 server - + Testing Thử nghiệm - + Configuring Cài đặt - + Test Successful Thử Nghiệm Thành Công - + Successfully received data from the server. Nhận được dữ liệu từ server! - + Test Failed Thử Nghiệm Thất Bại - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Không thể nhận được dữ liệu hợp lệ từ server. <br>Hãy chắc chắn server được thiết lập chính xác, từ địa chỉ lẫn cổng phải được thiết lập đúng. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. @@ -2957,47 +3131,47 @@ Nếu muốn đảo ngược hướng cần điều khiển, di chuyển cần s Nhà Phát Hành - + Add-Ons Bổ Sung - + General Chung - + System Hệ thống - + CPU CPU - + Graphics Đồ hoạ - + Adv. Graphics Đồ Họa Nâng Cao - + Audio Âm thanh - + Input Profiles - + Properties Thuộc tính @@ -3204,7 +3378,7 @@ UUID: %2 - Ring Sensor Parameters + Virtual Ring Sensor Parameters @@ -3225,33 +3399,90 @@ UUID: %2 - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Khôi phục về mặc định - + Clear Bỏ trống - + [not set] [không đặt] - + Invert axis - - + + Deadzone: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Cài đặt + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [Chờ] @@ -3556,8 +3787,8 @@ UUID: %2 - English - Tiếng Anh + American English + @@ -3660,54 +3891,19 @@ UUID: %2 - - Mono - Mono + + Unsafe extended memory layout (8GB DRAM) + - - Stereo - Stereo - - - - Surround - Xung quanh - - - - Console ID: - ID bàn giao tiếp: - - - - Sound output mode - Chế độ đầu ra âm thanh - - - - Regenerate - Tạo mới - - - + System settings are available only when game is not running. Cài đặt hệ thống chỉ khả dụng khi trò chơi không chạy. - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Điều này sẽ thay thế Switch ảo hiện tại của bạn bằng một cái mới. Switch ảo hiện tại của bạn sẽ không thể phục hồi lại. Điều này có thể gây ra tác dụng không mong muốn trong trò chơi. Điều này có thể thất bại, nếu thiết lập của bản lưu game đã lỗi thời. Tiếp tục? - - - - Warning - Chú ý - - - - Console ID: 0x%1 - ID của máy: 0x%1 + + Warning: "%1" is not a valid language for region "%2" + @@ -3776,7 +3972,7 @@ UUID: %2 - + Select TAS Load Directory... @@ -4331,7 +4527,7 @@ Drag points to change position, or double-click table cells to edit values. - + &Controller P1 @@ -4344,42 +4540,37 @@ Drag points to change position, or double-click table cells to edit values. - - IP Address + + Server Address - - IP + + <html><head/><body><p>Server address of the host</p></body></html> - - <html><head/><body><p>IPv4 address of the host</p></body></html> - - - - + Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> - + Nickname - + Password - + Connect @@ -4387,12 +4578,12 @@ Drag points to change position, or double-click table cells to edit values. DirectConnectWindow - + Connecting - + Connect @@ -4400,921 +4591,957 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Dữ liệu ẩn danh được thu thập</a>để hỗ trợ cải thiện yuzu. <br/><br/>Bạn có muốn chia sẽ dữ liệu sử dụng cho chúng tôi? - + Telemetry Viễn trắc - + Broken Vulkan Installation Detected - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... - - + + Disable Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Tốc độ giả lập hiện tại. Giá trị cao hơn hoặc thấp hơn 100% chỉ ra giả lập sẽ chạy nhanh hơn hoặc chậm hơn trên máy Switch - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Có bao nhiêu khung hình trên mỗi giây mà trò chơi đang hiển thị. Điều này sẽ thay đổi từ giữa các trò chơi và các khung cảnh khác nhau. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Thời gian mà giả lập lấy từ khung hình Switch, sẽ không kể đến giới hạn khung hình hoặc v-sync. Đối với tốc độ tối đa mà giả lập nhận được nhiều nhất là ở độ khoảng 16.67 ms. - + &Clear Recent Files - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue - + &Pause &Tạm dừng - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Chú ý định dạng trò chơi đã lỗi thời - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Bạn đang sử dụng định dạng danh mục ROM giải mã cho trò chơi này, và đó là một định dạng lỗi thời đã được thay thế bởi những thứ khác như NCA, NAX, XCI, hoặc NSP. Danh mục ROM giải mã có thể thiếu các icon, metadata, và hỗ trợ cập nhật.<br><br>Để hiểu thêm về các định dạng khác nhau của Switch mà yuzu hỗ trợ, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>vui lòng kiểm tra trên wiki của chúng tôi</a>. Thông báo này sẽ không hiển thị lại lần sau. - - + + Error while loading ROM! Lỗi xảy ra khi nạp ROM! - + The ROM format is not supported. Định dạng ROM này không hỗ trợ. - + An error occurred initializing the video core. Đã xảy ra lỗi khi khởi tạo lõi đồ hoạ. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Đã xảy ra lỗi không xác định. Hãy kiểm tra phần báo cáo để biết thêm chi tiết. - + (64-bit) - + (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit - + Closing software... - + Save Data - + Mod Data - + Error Opening %1 Folder Xảy ra lỗi khi mở %1 thư mục - - + + Folder does not exist! Thư mục này không tồn tại! - + Error Opening Transferable Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + + Remove Cache Storage? + + + + Remove File - - + + Error Removing Transferable Shader Cache - - + + A shader cache for this title does not exist. - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - - + + Error Removing Vulkan Driver Pipeline Cache + + + + + Failed to remove the driver pipeline cache. + + + + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! Khai thác RomFS không thành công! - + There was an error copying the RomFS files or the user cancelled the operation. Đã xảy ra lỗi khi sao chép tệp tin RomFS hoặc người dùng đã hủy bỏ hoạt động này. - + Full - + Skeleton Sườn - + Select RomFS Dump Mode Chọn chế độ kết xuất RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Vui lòng chọn cách mà bạn muốn RomFS kết xuất.<br>Chế độ Đầy Đủ sẽ sao chép toàn bộ tệp tin vào một danh mục mới trong khi <br>chế độ Sườn chỉ tạo kết cấu danh mục. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Khai thác RomFS... - - + + Cancel Hủy bỏ - + RomFS Extraction Succeeded! Khai thác RomFS thành công! - + The operation completed successfully. Các hoạt động đã hoàn tất thành công. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 - + Select Directory Chọn danh mục - + Properties Thuộc tính - + The game properties could not be loaded. Không thể tải thuộc tính của trò chơi. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Thực thi Switch (%1);;Tất cả tệp tin (*.*) - + Load File Nạp tệp tin - + Open Extracted ROM Directory Mở danh mục ROM đã trích xuất - + Invalid Directory Selected Danh mục đã chọn không hợp lệ - + The directory you have selected does not contain a 'main' file. Danh mục mà bạn đã chọn không có chứa tệp tin 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Những tệp tin Switch cài được (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files - + %n file(s) remaining - + Installing file "%1"... Đang cài đặt tệp tin "%1"... - - + + Install Results - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Ứng dụng hệ thống - + System Archive Hệ thống lưu trữ - + System Application Update Cập nhật hệ thống ứng dụng - + Firmware Package (Type A) Gói phần mềm hệ thống (Loại A) - + Firmware Package (Type B) Gói phần mềm (Loại B) - + Game Trò chơi - + Game Update Cập nhật trò chơi - + Game DLC Nội dung trò chơi có thể tải xuống - + Delta Title Tiêu đề Delta - + Select NCA Install Type... Chọn cách cài đặt NCA... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Vui lòng chọn loại tiêu đề mà bạn muốn cài đặt NCA này: (Trong hầu hết trường hợp, chọn mặc định 'Game' là tốt nhất.) - + Failed to Install Cài đặt đã không thành công - + The title type you selected for the NCA is invalid. Loại tiêu đề NCA mà bạn chọn nó không hợp lệ. - + File not found Không tìm thấy tệp tin - + File "%1" not found Không tìm thấy tệp tin "%1" - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Thiếu tài khoản yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Để gửi trường hợp thử nghiệm trò chơi tương thích, bạn phải liên kết tài khoản yuzu.<br><br/>Để liên kết tải khoản yuzu của bạn, hãy đến Giả lập &gt; Thiết lập &gt; Web. - + Error opening URL - + Unable to open the URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Tệp tin Amiibo (%1);; Tất cả tệp tin (*.*) - + Load Amiibo Nạp dữ liệu Amiibo - + Error loading Amiibo data Xảy ra lỗi khi nạp dữ liệu Amiibo - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Chụp ảnh màn hình - + PNG Image (*.png) Hình ảnh PNG (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Bắt đầu - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Tốc độ: %1% / %2% - + Speed: %1% Tốc độ: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Trò chơi: %1 FPS - + Frame: %1 ms Khung hình: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA - + SMAA - + + VOLUME: MUTE + + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + + + + Confirm Key Rederivation Xác nhận mã khóa Rederivation - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5331,37 +5558,37 @@ và phải tạo ra một bản sao lưu lại. Điều này sẽ xóa mã khóa tự động tạo trên tệp tin của bạn và chạy lại mô-đun chiết xuất mã khoá. - + Missing fuses - + - Missing BOOT0 - + - Missing BCPKG2-1-Normal-Main - + - Missing PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5370,39 +5597,49 @@ on your system's performance. hệ thống của bạn. - + Deriving Keys Mã khóa xuất phát - + + System Archive Decryption Failed + + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target Chọn thư mục để sao chép RomFS - + Please select which RomFS you would like to dump. Vui lòng chọn RomFS mà bạn muốn chiết xuất. - + Are you sure you want to close yuzu? Bạn có chắc chắn muốn đóng yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Bạn có chắc rằng muốn dừng giả lập? Bất kì tiến trình nào chưa được lưu sẽ bị mất. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5414,44 +5651,44 @@ Bạn có muốn bỏ qua yêu cầu đó và thoát luôn không? GRenderWindow - - + + OpenGL not available! Không có sẵn OpenGL! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. - - + + Error while initializing OpenGL! Đã xảy ra lỗi khi khởi tạo OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. - + Error while initializing OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 @@ -5510,117 +5747,122 @@ Bạn có muốn bỏ qua yêu cầu đó và thoát luôn không? - Remove OpenGL Pipeline Cache + Remove Cache Storage + Remove OpenGL Pipeline Cache + + + + Remove Vulkan Pipeline Cache - + Remove All Pipeline Caches - + Remove All Installed Contents - + Dump RomFS Kết xuất RomFS - + Dump RomFS to SDMC - + Copy Title ID to Clipboard Sao chép ID tiêu đề vào bộ nhớ tạm - + Navigate to GameDB entry Điều hướng đến mục cơ sở dữ liệu trò chơi - + Create Shortcut - + Add to Desktop - + Add to Applications Menu - + Properties Thuộc tính - + Scan Subfolders - + Remove Game Directory - + ▲ Move Up - + ▼ Move Down - + Open Directory Location - + Clear Bỏ trống - + Name Tên - + Compatibility Độ tương thích - + Add-ons Tiện ích ngoài - + File type Loại tệp tin - + Size Kích cỡ @@ -5691,7 +5933,7 @@ Bạn có muốn bỏ qua yêu cầu đó và thoát luôn không? GameListPlaceholder - + Double-click to add a new folder to the game list @@ -5704,12 +5946,12 @@ Bạn có muốn bỏ qua yêu cầu đó và thoát luôn không? - + Filter: Bộ lọc: - + Enter pattern to filter Nhập khuôn để lọc @@ -5759,7 +6001,7 @@ Bạn có muốn bỏ qua yêu cầu đó và thoát luôn không? Room Description - + Nội dung phòng chơi @@ -5799,12 +6041,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute - @@ -5826,111 +6067,112 @@ Debug Message: + Main Window - + Audio Volume Down - + Audio Volume Up - + Capture Screenshot Chụp ảnh màn hình - + Change Adapting Filter - + Change Docked Mode - + Change GPU Accuracy - + Continue/Pause Emulation - + Exit Fullscreen - + Exit yuzu - + Fullscreen Toàn màn hình - + Load File Nạp tệp tin - + Load/Remove Amiibo - + Restart Emulation - + Stop Emulation - + TAS Record - + TAS Reset - + TAS Start/Stop - + Toggle Filter Bar - + Toggle Framerate Limit - + Toggle Mouse Panning - + Toggle Status Bar @@ -5953,7 +6195,7 @@ Debug Message: Cài đặt - + Install Files to NAND @@ -5961,7 +6203,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 @@ -6035,51 +6277,56 @@ Debug Message: + Hide Empty Rooms + + + + Hide Full Rooms - + Refresh Lobby - + Password Required to Join - + Password: - + Players Người chơi - + Room Name - + Preferred Game - + Host - + Refreshing - + Refresh List @@ -6551,7 +6798,7 @@ Proceed anyway? Leave Room - + Rời khỏi phòng @@ -6609,7 +6856,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE @@ -6658,31 +6905,31 @@ p, li { white-space: pre-wrap; } - - + + Shift Shift - - + + Ctrl Ctrl - - + + Alt Alt - - - - + + + + [not set] [chưa đặt nút] @@ -6693,14 +6940,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Trục %1%2 @@ -6711,263 +6958,321 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [không xác định] - - - + + + Left Trái - - - + + + Right Phải - - - + + + Down Xuống - - - + + + Up Lên - - + + Z Z - - + + R R - - + + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Bắt đầu - - + + L1 - - + + L2 - - + + L3 - - + + R1 - - + + R2 - - + + R3 - - + + Circle - - + + Cross - - + + Square - - + + Triangle - - + + Share - - + + Options - - + + [undefined] - + %1%2 - - + + [invalid] - - - - + + %1%2Hat %3 - - - - - - + + + + %1%2Axis %3 - - + + %1%2Axis %3,%4,%5 - - + + %1%2Motion %3 - - - - + + %1%2Button %3 - - + + [unused] [không sử dụng] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Cộng + + + + Minus + Trừ + + + + Home Home - + + Capture + + + + Touch Cảm Ứng - + Wheel Indicates the mouse wheel - + Backward - + Forward - + Task - + Extra - - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Axis %4 + + + + + + %1%2%3Button %4 @@ -7337,26 +7642,26 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. - + An error has occurred. %1 @@ -7376,20 +7681,81 @@ Please try again or contact the developer of the software. %2 - - Select a user: - Chọn một người dùng: - - - + Users Người Dùng - + + Profile Creator + + + + + Profile Selector Chọn hồ sơ + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Chọn một người dùng: + QtSoftwareKeyboardDialog @@ -7435,51 +7801,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Chùm cuộc gọi - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - chờ đợi loại trừ lẫn nhau 0x%1 - - - - has waiters: %1 - có chờ đợi: %1 - - - - owner handle: 0x%1 - chủ điều khiển: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - chờ đợi toàn bộ đối tượng - - - - waiting for one of the following objects - chờ đợi một đối tượng đang theo dõi - - WaitTreeSynchronizationObject - - [%1] %2 %3 + + [%1] %2 - + waited by no thread chờ đợi bởi vì không có luồng @@ -7487,120 +7822,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable - + paused tạm dừng - + sleeping ngủ - + waiting for IPC reply đang đợi IPC phản hồi - + waiting for objects đang đợi đối tượng - + waiting for condition variable - + waiting for address arbiter chờ đợi địa chỉ người đứng giữa - + waiting for suspend resume - + waiting - + initialized - + terminated - + unknown - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal - + core %1 lõi %1 - + processor = %1 bộ xử lý = %1 - - ideal core = %1 - lõi lý tưởng = %1 - - - + affinity mask = %1 che đậy tánh giống nhau = %1 - + thread id = %1 id luồng = %1 - + priority = %1(current) / %2(normal) quyền ưu tiên = %1(hiện tại) / %2(bình thường) - + last running ticks = %1 các tick chạy cuối cùng = %1 - - - not waiting for mutex - không đợi mutex - WaitTreeThreadList - + waited by thread đợi vì luồng @@ -7608,7 +7933,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree diff --git a/dist/languages/vi_VN.ts b/dist/languages/vi_VN.ts index a4a8e8b8a..c09edc5d6 100644 --- a/dist/languages/vi_VN.ts +++ b/dist/languages/vi_VN.ts @@ -25,12 +25,18 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">yuzu is an experimental open-source emulator for the Nintendo Switch licensed under GPLv3.0+.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">This software should not be used to play games you have not legally obtained.</span></p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">yuzu là một phần mềm giả lập thử nghiệm mã nguồn mở cho máy Nintendo Switch, được cấp phép theo giấy phép GPLv3.0+.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Bạn không được phép sử dụng phần mềm này cho để chơi game mà bạn kiếm được một cách bất hợp pháp.</span></p></body></html> <html><head/><body><p><a href="https://yuzu-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Website</span></a> | <a href="https://github.com/yuzu-emu"><span style=" text-decoration: underline; color:#039be5;">Source Code</span></a> | <a href="https://github.com/yuzu-emu/yuzu/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://github.com/yuzu-emu/yuzu/blob/master/LICENSE.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html> - + <html><head/><body><p><a href="https://yuzu-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Trang web</span></a> | <a href="https://github.com/yuzu-emu"><span style=" text-decoration: underline; color:#039be5;">Mã nguồn</span></a> | <a href="https://github.com/yuzu-emu/yuzu/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Đóng góp</span></a> | <a href="https://github.com/yuzu-emu/yuzu/blob/master/license.txt"><span style=" text-decoration: underline; color:#039be5;">Giấy phép</span></a></p></body></html> @@ -81,90 +87,92 @@ p, li { white-space: pre-wrap; } Send Chat Message - + Tin nhắn Send Message - + Gửi tin nhắn Members - + Thành viên %1 has joined - + %1 đã vô %1 has left - + %1 đã thoát %1 has been kicked - + %1 đã bị kick %1 has been banned - + %1 đã bị ban %1 has been unbanned - + %1 đã được unban View Profile - + Xem hồ sơ Block Player - + Chặn người chơi When you block a player, you will no longer receive chat messages from them.<br><br>Are you sure you would like to block %1? - + Khi bạn chặn một người chơi, bạn sẽ không còn nhận được tin nhắn từ người chơi đó nữa.<br><br>Bạn có chắc là muốn chặn %1? Kick - + Kick Ban - + Ban Kick Player - + Kick người chơi Are you sure you would like to <b>kick</b> %1? - + Bạn có chắc là bạn muốn <b>kick</b> %1? Ban Player - + Ban người chơi Are you sure you would like to <b>kick and ban</b> %1? This would ban both their forum username and their IP address. - + Bạn có chắc là bạn muốn <b>kick và ban</b> %1? + +Điều này sẽ ban tên trên diễn đàn của họ và IP của họ luôn @@ -177,17 +185,17 @@ This would ban both their forum username and their IP address. Room Description - + Nội dung phòng chơi Moderation... - + Quản lý... Leave Room - + Rời khỏi phòng @@ -200,12 +208,12 @@ This would ban both their forum username and their IP address. Disconnected - + Mất kết nối %1 - %2 (%3/%4 members) - connected - + %1 - %2 (%3/%4 members) - đã kết nối @@ -234,102 +242,102 @@ This would ban both their forum username and their IP address. <html><head/><body><p>Does the game boot?</p></body></html> - + <html><head/><body><p>Game có chạy lên thành công hay không?</p></body></html> Yes The game starts to output video or audio - + Có Game có xuất ra hình và âm thanh No The game doesn't get past the "Launching..." screen - + Không Game không thể qua khỏi được khúc màn hình "Launching..." Yes The game gets past the intro/menu and into gameplay - + Có Game có thể qua được khúc intro/menu và vô được game No The game crashes or freezes while loading or using the menu - + Không Game crash hoặc đơ khi đang loading hoặc sử dụng menu <html><head/><body><p>Does the game reach gameplay?</p></body></html> - + <html><head/><body><p>Game có chạy được tới vô bên trong hay không?</p></body></html> Yes The game works without crashes - + Có Game chạy ổn định, không bị crash No The game crashes or freezes during gameplay - + Không Game crash hoặc đơ trong lúc chơi <html><head/><body><p>Does the game work without crashing, freezing or locking up during gameplay?</p></body></html> - + <html><head/><body><p>Game chạy có ổn định với không crash, đơ hoặc bị kẹt trong lúc chơi hay không?</p></body></html> Yes The game can be finished without any workarounds - + Có Game có thể hoàn thành mà không cần phải làm gì thêm No The game can't progress past a certain area - + Không Game không thể qua được mốt số khúc <html><head/><body><p>Is the game completely playable from start to finish?</p></body></html> - + <html><head/><body><p>Game có chơi được từ đầu đến cuối hay không?</p></body></html> Major The game has major graphical errors - + Lỗi nặng Game bị lỗi hình ảnh nặng Minor The game has minor graphical errors - + Lỗi nhẹ Game bị lỗi hình ảnh nhẹ None Everything is rendered as it looks on the Nintendo Switch - + Không lỗi Game nhìn y hệt như trên Nintendo Switch <html><head/><body><p>Does the game have any graphical glitches?</p></body></html> - + <html><head/><body><p>Game có bị lỗi gì về hình ảnh không?</p></body></html> Major The game has major audio errors - + Lỗi nặng Game bị lỗi âm thanh nặng Minor The game has minor audio errors - + Lỗi nhẹ Game bị lỗi âm thanh nhẹ None Audio is played perfectly - + Không lỗi Âm thanh hoạt động hoàn hảo <html><head/><body><p>Does the game have any audio glitches / missing effects?</p></body></html> - + <html><head/><body><p>Game có bị lỗi âm thanh hay lỗi hiệu ứng hay không?</p></body></html> @@ -372,36 +380,61 @@ This would ban both their forum username and their IP address. - Output Device - + Output Device: + Đầu ra thiết bị: - Input Device - Thiết bị Nhập + Input Device: + Đầu vào thiết bị: - + + Sound Output Mode: + Chế độ đầu ra âm thanh + + + + Mono + Mono + + + + Stereo + Stereo + + + + Surround + Surround + + + Use global volume Sử dụng âm lượng trong cài đặt - + Set volume: Âm lượng tuỳ chỉnh: - + Volume: Âm lượng: - + 0 % 0 % - + + Mute audio when in background + Tắt âm thanh khi chạy nền + + + %1% Volume percentage (e.g. 50%) %1% @@ -412,37 +445,37 @@ This would ban both their forum username and their IP address. Configure Infrared Camera - + Chỉnh sửa camera hồng ngoại Select where the image of the emulated camera comes from. It may be a virtual camera or a real camera. - + Chọn hình ảnh từ camera giả lập. Nó có thể là một camera giả hoặc là một camera thật Camera Image Source: - + Camera ảnh gốc: Input device: - + Đầu vào thiết bị: Preview - + Xem trước Resolution: 320*240 - + Độ phân giải: 320*240 Click to preview - + Nhấn để xem @@ -708,7 +741,7 @@ This would ban both their forum username and their IP address. Enable miscellaneous optimizations - + Bật tối ưu hóa tính năng phụ @@ -730,12 +763,16 @@ This would ban both their forum username and their IP address. <div style="white-space: nowrap">Enabling it causes guest memory reads/writes to be done directly into memory and make use of Host's MMU.</div> <div style="white-space: nowrap">Disabling this forces all memory accesses to use Software MMU Emulation.</div> - + + <div style="white-space: nowrap">Cái này sẽ tăng tốc độ truy cập bộ nhớ bằng cách truy cập dưới dạng chương trình guest</div> + <div style="white-space: nowrap">Khi bật lên sẽ viết/đọc trực tiếp vô bộ nhớ và sử dụng Host MMU</div> + <div style="white-space: nowrap">Tắt cái này đi sẽ ép mọi phương thức truy cập bộ nhớ đi qua Software MMU Emulation</div> + Enable Host MMU Emulation (general memory instructions) - + Bật Host MMU Emulation (general memory instructions) @@ -895,103 +932,113 @@ This would ban both their forum username and their IP address. Disable Macro JIT Không dùng Macro JIT - - - When checked, yuzu will log statistics about the compiled pipeline cache - - - Enable Shader Feedback + When checked, it disables the macro HLE functions. Enabling this makes games run slower - - When checked, it executes shaders without loop logic changes + + Disable Macro HLE - Disable Loop safety checks + When checked, yuzu will log statistics about the compiled pipeline cache + + + + + Enable Shader Feedback - Debugging - Vá lỗi + When checked, it executes shaders without loop logic changes + - - Enable Verbose Reporting Services** + + Disable Loop safety checks + Debugging + Vá lỗi + + + + Enable Verbose Reporting Services** + + + + Enable FS Access Log - + Enable this to output the latest generated audio command list to the console. Only affects games using the audio renderer. - + Dump Audio Commands To Console** - + Create Minidump After Crash - + Advanced Nâng Cao - + Kiosk (Quest) Mode - + Enable CPU Debugging Bật Vá Lỗi CPU - + Enable Debug Asserts - + Enable Auto-Stub** - + Enable All Controller Types - + Disable Web Applet - + Enables yuzu to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing yuzu. - + Perform Startup Vulkan Check - + **This will be reset automatically when yuzu closes. **Sẽ tự động thiết lập lại khi tắt yuzu. @@ -1006,12 +1053,12 @@ This would ban both their forum username and their IP address. - + Web applet not compiled - + MiniDump creation not compiled @@ -1061,78 +1108,78 @@ This would ban both their forum username and their IP address. Thiết lập yuzu - + Audio Âm thanh - + CPU CPU - + Debug Gỡ lỗi - + Filesystem Hệ thống tệp tin - + General Chung - + Graphics Đồ hoạ - + GraphicsAdvanced Đồ họa Nâng cao - + Hotkeys Phím tắt - + Controls Phím - + Profiles Hồ sơ - + Network Mạng - + System Hệ thống - + Game List Danh sách trò chơi - + Web Web @@ -1307,46 +1354,36 @@ This would ban both their forum username and their IP address. - Extended memory layout (6GB DRAM) - - - - Confirm exit while emulation is running Xác nhận thoát trong khi đang chạy giả lập - + Prompt for user on game boot Hiển thị cửa sổ chọn người dùng khi bắt đầu trò chơi - + Pause emulation when in background Tạm dừng giả lập khi chạy nền - - Mute audio when in background - - - - + Hide mouse on inactivity Ẩn con trỏ chuột khi không dùng - + Reset All Settings Đặt lại mọi tùy chỉnh - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? Quá trình này sẽ thiết lập lại toàn bộ tùy chỉnh và gỡ hết mọi cài đặt cho từng game riêng lẻ. Quá trình này không xóa đường dẫn tới thư mục game, hồ sơ, hay hồ sơ của thiết lập phím. Tiếp tục? @@ -1385,7 +1422,7 @@ This would ban both their forum username and their IP address. - + None Trống @@ -1411,216 +1448,269 @@ This would ban both their forum username and their IP address. + VSync Mode: + + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + + + + NVDEC emulation: Giả lập NVDEC - + No Video Output Không Video Đầu Ra - + CPU Video Decoding - + GPU Video Decoding (Default) - + Fullscreen Mode: Chế độ Toàn màn hình: - + Borderless Windowed Cửa sổ không viền - + Exclusive Fullscreen Toàn màn hình - + Aspect Ratio: Tỉ lệ khung hình: - + Default (16:9) Mặc định (16:9) - + Force 4:3 Dùng 4:3 - + Force 21:9 Dùng 21:9 - + Force 16:10 - + Stretch to Window Kéo dãn đến cửa sổ phần mềm - + Resolution: - + 0.5X (360p/540p) [EXPERIMENTAL] - + 0.75X (540p/810p) [EXPERIMENTAL] - + 1X (720p/1080p) - + + 1.5X (1080p/1620p) [EXPERIMENTAL] + + + + 2X (1440p/2160p) - + 3X (2160p/3240p) - + 4X (2880p/4320p) - + 5X (3600p/5400p) - + 6X (4320p/6480p) - + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + + + Window Adapting Filter: - + Nearest Neighbor - + Bilinear - + Bicubic - + Gaussian - + ScaleForce - - AMD FidelityFX™️ Super Resolution (Vulkan Only) - + + AMD FidelityFX™️ Super Resolution + AMD FidelityFX™️ Super Resolution - + Anti-Aliasing Method: - + FXAA - + SMAA - + Use global FSR Sharpness - + Set FSR Sharpness - + FSR Sharpness: - + 100% - - + + Use global background color Dùng màu nền theo cài đặt - + Set background color: Chọn màu nền: - + Background Color: Màu nền: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM (Assembly Shaders, Chỉ Cho NVIDIA) - + SPIR-V (Experimental, Mesa Only) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + + + + + VSync Off + + + + + Recommended + + + + + On + + + + + VSync On + + ConfigureGraphicsAdvanced @@ -1645,77 +1735,133 @@ This would ban both their forum username and their IP address. Độ chính xác: - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - VSync tránh cho màn hình bị "xước", tuy nhiên một số cạc đồ hoạ có hiệu năng chậm hơn khi VSync được kích hoạt. Bật chức năng này nếu nó không ảnh hưởng gì đến hiệu năng. - - - - Use VSync - - - - - Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. - Kích hoạt tính năng tạo shader không đồng bộ nhằm tránh cho trò chơi bị giật khi tạo shader. Tính năng này vẫn đang thử nghiệm. - - - - Use asynchronous shader building (Hack) - - - - - Enables Fast GPU Time. This option will force most games to run at their highest native resolution. + + ASTC recompression: - Use Fast GPU Time (Hack) - Tăng Tốc Thời Gian GPU (Hack) + Uncompressed (Best quality) + - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. + + BC1 (Low quality) - Use pessimistic buffer flushes (Hack) + BC3 (Medium quality) - + + Enable asynchronous presentation (Vulkan only) + + + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. + + + + + Force maximum clocks (Vulkan only) + + + + + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. + + + + + Decode ASTC textures asynchronously (Hack) + + + + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + + + + + Enable Reactive Flushing + + + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. + Kích hoạt tính năng tạo shader không đồng bộ nhằm tránh cho trò chơi bị giật khi tạo shader. Tính năng này vẫn đang thử nghiệm. + + + + Use asynchronous shader building (Hack) + + + + + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. + + + + + Use Fast GPU Time (Hack) + Tăng Tốc Thời Gian GPU (Hack) + + + + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. + + + + + Use Vulkan pipeline cache + + + + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + + + + + Enable Compute Pipelines (Intel Vulkan only) + + + + Anisotropic Filtering: Bộ lọc góc nghiêng: - + Automatic - + Default Mặc định - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1748,70 +1894,65 @@ This would ban both their forum username and their IP address. Khôi phục về mặc định - + Action Hành động - + Hotkey Phím tắt - + Controller Hotkey - - - + + + Conflicting Key Sequence Tổ hợp phím bị xung đột - - + + The entered key sequence is already assigned to: %1 Tổ hợp phím này đã gán với: %1 - - Home+%1 - - - - + [waiting] [Chờ] - + Invalid - + Restore Default Khôi phục về mặc định - + Clear Xóa - + Conflicting Button Sequence - + The default button sequence is already assigned to: %1 - + The default key sequence is already assigned to: %1 Tổ hợp phím này đã gán với: %1 @@ -2103,7 +2244,7 @@ This would ban both their forum username and their IP address. - + Configure Thiết lập @@ -2129,6 +2270,8 @@ This would ban both their forum username and their IP address. + + Requires restarting yuzu Phải khởi động lại yuzu @@ -2148,22 +2291,42 @@ This would ban both their forum username and their IP address. - + + Enable direct JoyCon driver + + + + + Enable direct Pro Controller driver [EXPERIMENTAL] + + + + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + + + + + Use random Amiibo ID + + + + Enable mouse panning - + Mouse sensitivity Độ nhạy chuột - + % % - + Motion / Touch Chuyển động / Cảm ứng @@ -2275,7 +2438,7 @@ This would ban both their forum username and their IP address. - + Left Stick Cần trái @@ -2369,14 +2532,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2395,7 +2558,7 @@ This would ban both their forum username and their IP address. - + Plus Cộng @@ -2408,15 +2571,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2473,236 +2636,247 @@ This would ban both their forum username and their IP address. - + Right Stick Cần phải - - - - + + + + Clear Bỏ trống - - - - - + + + + + [not set] [không đặt] - - + + + Invert button - - + + Toggle button - - + + Turbo button + + + + + Invert axis - - - + + + Set threshold - - + + Choose a value between 0% and 100% Chọn một giá trị giữa 0% và 100% - + Toggle axis - + Set gyro threshold - + + Calibrate sensor + + + + Map Analog Stick Thiết lập Cần Điều Khiển - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. Sau khi bấm OK, di chuyển cần sang ngang, rồi sau đó sang dọc. Nếu muốn đảo ngược hướng cần điều khiển, di chuyển cần sang dọc trước, rồi sang ngang. - + Center axis - - + + Deadzone: %1% - - + + Modifier Range: %1% - - + + Pro Controller Tay cầm Pro Controller - + Dual Joycons Joycon đôi - + Left Joycon Joycon Trái - + Right Joycon Joycon Phải - + Handheld Cầm tay - + GameCube Controller Tay cầm GameCube - + Poke Ball Plus - + NES Controller - + SNES Controller - + N64 Controller - + Sega Genesis - + Start / Pause Bắt đầu / Tạm ngưng - + Z Z - + Control Stick - + C-Stick C-Stick - + Shake! Lắc! - + [waiting] [Chờ] - + New Profile Hồ sơ mới - + Enter a profile name: Nhập tên hồ sơ: - - + + Create Input Profile Tạo Hồ Sơ Phím - + The given profile name is not valid! Tên hồ sơ không hợp lệ! - + Failed to create the input profile "%1" Quá trình tạo hồ sơ phím "%1" thất bại - + Delete Input Profile Xóa Hồ Sơ Phím - + Failed to delete the input profile "%1" Quá trình xóa hồ sơ phím "%1" thất bại - + Load Input Profile Nạp Hồ Sơ Phím - + Failed to load the input profile "%1" Quá trình nạp hồ sơ phím "%1" thất bại - + Save Input Profile Lưu Hồ Sơ Phím - + Failed to save the input profile "%1" Quá trình lưu hồ sơ phím "%1" thất bại @@ -2750,7 +2924,7 @@ Nếu muốn đảo ngược hướng cần điều khiển, di chuyển cần s - + Configure Cài đặt @@ -2786,7 +2960,7 @@ Nếu muốn đảo ngược hướng cần điều khiển, di chuyển cần s - + Test Thử nghiệm @@ -2806,77 +2980,77 @@ Nếu muốn đảo ngược hướng cần điều khiển, di chuyển cần s <a href='https://yuzu-emu.org/wiki/using-a-controller-or-android-phone-for-motion-or-touch-input'><span style="text-decoration: underline; color:#039be5;">Tìm hiểu thêm</span></a> - + %1:%2 %1:%2 - - - - - - + + + + + + yuzu yuzu - + Port number has invalid characters Cổng có kí tự không hợp lệ - + Port has to be in range 0 and 65353 Cổng phải từ 0 đến 65353 - + IP address is not valid Địa chỉ IP không hợp lệ - + This UDP server already exists Server UDP đã tồn tại - + Unable to add more than 8 servers Không thể vượt quá 8 server - + Testing Thử nghiệm - + Configuring Cài đặt - + Test Successful Thử Nghiệm Thành Công - + Successfully received data from the server. Nhận được dữ liệu từ server! - + Test Failed Thử Nghiệm Thất Bại - + Could not receive valid data from the server.<br>Please verify that the server is set up correctly and the address and port are correct. Không thể nhận được dữ liệu hợp lệ từ server. <br>Hãy chắc chắn server được thiết lập chính xác, từ địa chỉ lẫn cổng phải được thiết lập đúng. - + UDP Test or calibration configuration is in progress.<br>Please wait for them to finish. @@ -2957,47 +3131,47 @@ Nếu muốn đảo ngược hướng cần điều khiển, di chuyển cần s Nhà Phát Hành - + Add-Ons Bổ Sung - + General Tổng Quan - + System Hệ Thống - + CPU CPU - + Graphics Đồ Họa - + Adv. Graphics Đồ Họa Nâng Cao - + Audio Âm Thanh - + Input Profiles - + Properties Thuộc tính @@ -3204,7 +3378,7 @@ UUID: %2 - Ring Sensor Parameters + Virtual Ring Sensor Parameters @@ -3225,33 +3399,90 @@ UUID: %2 - + + Direct Joycon Driver + + + + + Enable Ring Input + + + + + + Enable + + + + + Ring Sensor Value + + + + + + Not connected + + + + Restore Defaults Khôi phục về mặc định - + Clear Bỏ trống - + [not set] [không đặt] - + Invert axis - - + + Deadzone: %1% - + + Error enabling ring input + + + + + Direct Joycon driver is not enabled + + + + + Configuring + Cài đặt + + + + The current mapped device doesn't support the ring controller + + + + + The current mapped device doesn't have a ring attached + + + + + Unexpected driver result %1 + + + + [waiting] [Chờ] @@ -3556,8 +3787,8 @@ UUID: %2 - English - Tiếng Anh + American English + @@ -3660,54 +3891,19 @@ UUID: %2 - - Mono - Mono + + Unsafe extended memory layout (8GB DRAM) + - - Stereo - Stereo - - - - Surround - Surround - - - - Console ID: - ID bàn giao tiếp: - - - - Sound output mode - Chế độ đầu ra âm thanh - - - - Regenerate - Tạo mới - - - + System settings are available only when game is not running. Cài đặt hệ thống chỉ khả dụng khi trò chơi không chạy. - - This will replace your current virtual Switch with a new one. Your current virtual Switch will not be recoverable. This might have unexpected effects in games. This might fail, if you use an outdated config savegame. Continue? - Điều này sẽ thay thế Switch ảo hiện tại của bạn sang một cái mới. Switch ảo hiện tại của bạn sẽ không thể hồi phục lại. Điều này có thể gây ra tác dụng không mong muốn trong trò chơi. Điều này có thể gây thất bại, nếu bạn đang sử dụng thiết lập lưu trữ đã lỗi thời. Tiếp tục? - - - - Warning - Chú ý - - - - Console ID: 0x%1 - ID của máy: 0x%1 + + Warning: "%1" is not a valid language for region "%2" + @@ -3776,7 +3972,7 @@ UUID: %2 - + Select TAS Load Directory... @@ -4331,7 +4527,7 @@ Drag points to change position, or double-click table cells to edit values. - + &Controller P1 @@ -4344,42 +4540,37 @@ Drag points to change position, or double-click table cells to edit values. - - IP Address + + Server Address - - IP + + <html><head/><body><p>Server address of the host</p></body></html> - - <html><head/><body><p>IPv4 address of the host</p></body></html> - - - - + Port - + <html><head/><body><p>Port number the host is listening on</p></body></html> - + Nickname - + Password - + Connect @@ -4387,12 +4578,12 @@ Drag points to change position, or double-click table cells to edit values. DirectConnectWindow - + Connecting - + Connect @@ -4400,921 +4591,957 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>Dữ liệu ẩn danh được thu thập</a>để hỗ trợ cải thiện yuzu. <br/><br/>Bạn có muốn chia sẽ dữ liệu sử dụng cho chúng tôi? - + Telemetry Viễn trắc - + Broken Vulkan Installation Detected - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. - + Loading Web Applet... - - + + Disable Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) - + The amount of shaders currently being built - + The current selected resolution scaling multiplier. - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. Tốc độ giả lập hiện tại. Giá trị cao hơn hoặc thấp hơn 100% chỉ ra giả lập sẽ chạy nhanh hơn hoặc chậm hơn trên máy Switch - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. Có bao nhiêu khung hình trên mỗi giây mà trò chơi đang hiển thị. Điều này sẽ thay đổi từ trò chơi này đến trò chơi kia và khung cảnh này đến khung cảnh kia. - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. Thời gian mà giả lập lấy từ khung hình Switch, sẽ không kể đến giới hạn khung hình hoặc v-sync. Đối với tốc độ tối đa mà giả lập nhận được nhiều nhất là ở độ khoảng 16.67 ms. - + &Clear Recent Files - + + Emulated mouse is enabled + + + + + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. + + + + &Continue - + &Pause &Tạm dừng - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping - + Warning Outdated Game Format Chú ý định dạng trò chơi đã lỗi thời - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. Bạn đang sử dụng định dạng danh mục ROM giải mã cho trò chơi này, và đó là một định dạng lỗi thời đã được thay thế bởi những thứ khác như NCA, NAX, XCI, hoặc NSP. Danh mục ROM giải mã có thể thiếu biểu tượng, metadata, và hỗ trợ cập nhật.<br><br>Để giải thích về các định dạng khác nhau của Switch mà yuzu hỗ trợ, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>vui lòng kiểm tra trên wiki của chúng tôi</a>. Thông báo này sẽ không hiển thị lại lần sau. - - + + Error while loading ROM! Xảy ra lỗi khi đang nạp ROM! - + The ROM format is not supported. Định dạng ROM này không hỗ trợ. - + An error occurred initializing the video core. Đã xảy ra lỗi khi khởi tạo lõi video. - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - + Error while loading ROM! %1 %1 signifies a numeric error code. - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. - + An unknown error occurred. Please see the log for more details. Đã xảy ra lỗi không xác định. Vui lòng kiểm tra sổ ghi chép để biết thêm chi tiết. - + (64-bit) - + (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit - + Closing software... - + Save Data - + Mod Data - + Error Opening %1 Folder Xảy ra lỗi khi mở %1 thư mục - - + + Folder does not exist! Thư mục này không tồn tại! - + Error Opening Transferable Shader Cache - + Failed to create the shader cache directory for this title. - + Error Removing Contents - + Error Removing Update - + Error Removing DLC - + Remove Installed Game Contents? - + Remove Installed Game Update? - + Remove Installed Game DLC? - + Remove Entry - - - - - - + + + + + + Successfully Removed - + Successfully removed the installed base game. - + The base game is not installed in the NAND and cannot be removed. - + Successfully removed the installed update. - + There is no update installed for this title. - + There are no DLC installed for this title. - + Successfully removed %1 installed DLC. - + Delete OpenGL Transferable Shader Cache? - + Delete Vulkan Transferable Shader Cache? - + Delete All Transferable Shader Caches? - + Remove Custom Game Configuration? - + + Remove Cache Storage? + + + + Remove File - - + + Error Removing Transferable Shader Cache - - + + A shader cache for this title does not exist. - + Successfully removed the transferable shader cache. - + Failed to remove the transferable shader cache. - - + + Error Removing Vulkan Driver Pipeline Cache + + + + + Failed to remove the driver pipeline cache. + + + + + Error Removing Transferable Shader Caches - + Successfully removed the transferable shader caches. - + Failed to remove the transferable shader cache directory. - - + + Error Removing Custom Configuration - + A custom configuration for this title does not exist. - + Successfully removed the custom game configuration. - + Failed to remove the custom game configuration. - - + + RomFS Extraction Failed! Khai thác RomFS không thành công! - + There was an error copying the RomFS files or the user cancelled the operation. Đã xảy ra lỗi khi sao chép tệp tin RomFS hoặc người dùng đã hủy bỏ hoạt động này. - + Full - + Skeleton Sườn - + Select RomFS Dump Mode Chọn chế độ kết xuất RomFS - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. Vui lòng chọn RomFS mà bạn muốn kết xuất như thế nào.<br>Đầy đủ sẽ sao chép toàn bộ tệp tin vào một danh mục mới trong khi <br>bộ xương chỉ tạo kết cấu danh mục. - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root - + Extracting RomFS... Khai thác RomFS... - - + + Cancel Hủy bỏ - + RomFS Extraction Succeeded! Khai thác RomFS thành công! - + The operation completed successfully. Các hoạt động đã hoàn tất thành công. - - - - - + + + + + Create Shortcut - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? - + Cannot create shortcut on desktop. Path "%1" does not exist. - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. - + Create Icon - + Cannot create icon file. Path "%1" does not exist and cannot be created. - + Start %1 with the yuzu Emulator - + Failed to create a shortcut at %1 - + Successfully created a shortcut to %1 - + Error Opening %1 - + Select Directory Chọn danh mục - + Properties Thuộc tính - + The game properties could not be loaded. Thuộc tính của trò chơi không thể nạp được. - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Thực thi Switch (%1);;Tất cả tệp tin (*.*) - + Load File Nạp tệp tin - + Open Extracted ROM Directory Mở danh mục ROM đã trích xuất - + Invalid Directory Selected Danh mục đã chọn không hợp lệ - + The directory you have selected does not contain a 'main' file. Danh mục mà bạn đã chọn không có chứa tệp tin 'main'. - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) Những tệp tin Switch cài được (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) - + Install Files - + %n file(s) remaining - + Installing file "%1"... Đang cài đặt tệp tin "%1"... - - + + Install Results - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. - + %n file(s) were newly installed - + %n file(s) were overwritten - + %n file(s) failed to install - + System Application Hệ thống ứng dụng - + System Archive Hệ thống lưu trữ - + System Application Update Cập nhật hệ thống ứng dụng - + Firmware Package (Type A) Gói phần mềm (Loại A) - + Firmware Package (Type B) Gói phần mềm (Loại B) - + Game Trò chơi - + Game Update Cập nhật trò chơi - + Game DLC Nội dung trò chơi có thể tải xuống - + Delta Title Tiêu đề Delta - + Select NCA Install Type... Chọn loại NCA để cài đặt... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) Vui lòng chọn loại tiêu đề mà bạn muốn cài đặt NCA này: (Trong hầu hết trường hợp, chọn mặc định 'Game' là tốt nhất.) - + Failed to Install Cài đặt đã không thành công - + The title type you selected for the NCA is invalid. Loại tiêu đề NCA mà bạn chọn nó không hợp lệ. - + File not found Không tìm thấy tệp tin - + File "%1" not found Không tìm thấy "%1" tệp tin - + OK OK - - + + Hardware requirements not met - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. - + Missing yuzu Account Thiếu tài khoản yuzu - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. Để gửi trường hợp thử nghiệm trò chơi tương thích, bạn phải liên kết tài khoản yuzu.<br><br/>Để liên kết tải khoản yuzu của bạn, hãy đến Giả lập &gt; Thiết lập &gt; Web. - + Error opening URL - + Unable to open the URL "%1". - + TAS Recording - + Overwrite file of player 1? - + Invalid config detected - + Handheld controller can't be used on docked mode. Pro controller will be selected. - - + + Amiibo - - + + The current amiibo has been removed - + Error - - + + The current game is not looking for amiibos - + Amiibo File (%1);; All Files (*.*) Tệp tin Amiibo (%1);; Tất cả tệp tin (*.*) - + Load Amiibo Nạp dữ liệu Amiibo - + Error loading Amiibo data Xảy ra lỗi khi nạp dữ liệu Amiibo - + The selected file is not a valid amiibo - + The selected file is already on use - + An unknown error occurred - + Capture Screenshot Chụp ảnh màn hình - + PNG Image (*.png) Hình ảnh PNG (*.png) - + TAS state: Running %1/%2 - + TAS state: Recording %1 - + TAS state: Idle %1/%2 - + TAS State: Invalid - + &Stop Running - + &Start &Bắt đầu - + Stop R&ecording - + R&ecord - + Building: %n shader(s) - + Scale: %1x %1 is the resolution scaling factor - + Speed: %1% / %2% Tốc độ: %1% / %2% - + Speed: %1% Tốc độ: %1% - + Game: %1 FPS (Unlocked) - + Game: %1 FPS Trò chơi: %1 FPS - + Frame: %1 ms Khung hình: %1 ms - + GPU NORMAL - + GPU HIGH - + GPU EXTREME - + GPU ERROR - + DOCKED - + HANDHELD - + OPENGL OPENGL - + VULKAN VULKAN - + NULL - + NEAREST - - + + BILINEAR - + BICUBIC - + GAUSSIAN - + SCALEFORCE - + FSR - - + + NO AA - + FXAA - + SMAA - + + VOLUME: MUTE + + + + + VOLUME: %1% + Volume percentage (e.g. 50%) + + + + Confirm Key Rederivation Xác nhận mã khóa Rederivation - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5331,37 +5558,37 @@ và phải tạo ra một bản sao lưu lại. Điều này sẽ xóa mã khóa tự động tạo trên tệp tin của bạn và chạy lại mô-đun mã khóa derivation. - + Missing fuses - + - Missing BOOT0 - + - Missing BCPKG2-1-Normal-Main - + - Missing PRODINFO - + Derivation Components Missing - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5370,39 +5597,49 @@ on your system's performance. vào hiệu suất hệ thống của bạn. - + Deriving Keys Mã khóa xuất phát - + + System Archive Decryption Failed + + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + + + + Select RomFS Dump Target Chọn thư mục để sao chép RomFS - + Please select which RomFS you would like to dump. Vui lòng chọn RomFS mà bạn muốn sao chép. - + Are you sure you want to close yuzu? Bạn có chắc chắn muốn đóng yuzu? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. Bạn có chắc rằng muốn dừng giả lập? Bất kì tiến trình nào chưa được lưu sẽ bị mất. - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5414,44 +5651,44 @@ Bạn có muốn bỏ qua yêu cầu đó và thoát luôn không? GRenderWindow - - + + OpenGL not available! Không có sẵn OpenGL! - + OpenGL shared contexts are not supported. - + yuzu has not been compiled with OpenGL support. - - + + Error while initializing OpenGL! Đã xảy ra lỗi khi khởi tạo OpenGL! - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. - + Error while initializing OpenGL 4.6! - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 @@ -5510,117 +5747,122 @@ Bạn có muốn bỏ qua yêu cầu đó và thoát luôn không? - Remove OpenGL Pipeline Cache + Remove Cache Storage + Remove OpenGL Pipeline Cache + + + + Remove Vulkan Pipeline Cache - + Remove All Pipeline Caches - + Remove All Installed Contents - + Dump RomFS Kết xuất RomFS - + Dump RomFS to SDMC - + Copy Title ID to Clipboard Sao chép ID tiêu đề vào bộ nhớ tạm - + Navigate to GameDB entry Điều hướng đến mục cơ sở dữ liệu trò chơi - + Create Shortcut - + Add to Desktop - + Add to Applications Menu - + Properties Thuộc tính - + Scan Subfolders - + Remove Game Directory - + ▲ Move Up - + ▼ Move Down - + Open Directory Location - + Clear Bỏ trống - + Name Tên - + Compatibility Tương thích - + Add-ons Tiện ích ngoài - + File type Loại tệp tin - + Size Kích cỡ @@ -5691,7 +5933,7 @@ Bạn có muốn bỏ qua yêu cầu đó và thoát luôn không? GameListPlaceholder - + Double-click to add a new folder to the game list @@ -5704,12 +5946,12 @@ Bạn có muốn bỏ qua yêu cầu đó và thoát luôn không? - + Filter: Bộ lọc: - + Enter pattern to filter Nhập khuôn để lọc @@ -5759,7 +6001,7 @@ Bạn có muốn bỏ qua yêu cầu đó và thoát luôn không? Room Description - + Nội dung phòng chơi @@ -5799,12 +6041,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute - @@ -5826,111 +6067,112 @@ Debug Message: + Main Window - + Audio Volume Down - + Audio Volume Up - + Capture Screenshot Chụp ảnh màn hình - + Change Adapting Filter - + Change Docked Mode - + Change GPU Accuracy - + Continue/Pause Emulation - + Exit Fullscreen - + Exit yuzu - + Fullscreen Toàn màn hình - + Load File Nạp tệp tin - + Load/Remove Amiibo - + Restart Emulation - + Stop Emulation - + TAS Record - + TAS Reset - + TAS Start/Stop - + Toggle Filter Bar - + Toggle Framerate Limit - + Toggle Mouse Panning - + Toggle Status Bar @@ -5953,7 +6195,7 @@ Debug Message: Cài đặt - + Install Files to NAND @@ -5961,7 +6203,7 @@ Debug Message: LimitableInputDialog - + The text can't contain any of the following characters: %1 @@ -6035,51 +6277,56 @@ Debug Message: + Hide Empty Rooms + + + + Hide Full Rooms - + Refresh Lobby - + Password Required to Join - + Password: - + Players Người chơi - + Room Name - + Preferred Game - + Host - + Refreshing - + Refresh List @@ -6551,7 +6798,7 @@ Proceed anyway? Leave Room - + Rời khỏi phòng @@ -6609,7 +6856,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE @@ -6658,31 +6905,31 @@ p, li { white-space: pre-wrap; } - - + + Shift Shift - - + + Ctrl Ctrl - - + + Alt Alt - - - - + + + + [not set] [chưa đặt nút] @@ -6693,14 +6940,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - + + + + + + + + Axis %1%2 Trục %1%2 @@ -6711,263 +6958,321 @@ p, li { white-space: pre-wrap; } - - - - - - + + + + + + [unknown] [không xác định] - - - + + + Left Trái - - - + + + Right Phải - - - + + + Down Xuống - - - + + + Up Lên - - + + Z Z - - + + R R - - + + L L - - + + A A - - + + B B - - + + X X - - + + Y Y - - + + Start Bắt đầu - - + + L1 - - + + L2 - - + + L3 - - + + R1 - - + + R2 - - + + R3 - - + + Circle - - + + Cross - - + + Square - - + + Triangle - - + + Share - - + + Options - - + + [undefined] - + %1%2 - - + + [invalid] - - - - + + %1%2Hat %3 - - - - - - + + + + %1%2Axis %3 - - + + %1%2Axis %3,%4,%5 - - + + %1%2Motion %3 - - - - + + %1%2Button %3 - - + + [unused] [không sử dụng] - + + ZR + ZR + + + + ZL + ZL + + + + SR + SR + + + + SL + SL + + + + Stick L + + + + + Stick R + + + + + Plus + Cộng + + + + Minus + Trừ + + + + Home Home - + + Capture + + + + Touch Cảm Ứng - + Wheel Indicates the mouse wheel - + Backward - + Forward - + Task - + Extra - - %1%2%3 + + %1%2%3%4 + + + + + + %1%2%3Hat %4 + + + + + + %1%2%3Axis %4 + + + + + + %1%2%3Button %4 @@ -7337,26 +7642,26 @@ p, li { white-space: pre-wrap; } QtErrorDisplay - - - + + + Error Code: %1-%2 (0x%3) - + An error has occurred. Please try again or contact the developer of the software. - + An error occurred on %1 at %2. Please try again or contact the developer of the software. - + An error has occurred. %1 @@ -7376,20 +7681,81 @@ Please try again or contact the developer of the software. %2 - - Select a user: - Chọn một người dùng: - - - + Users Người Dùng - + + Profile Creator + + + + + Profile Selector Chọn hồ sơ + + + Profile Icon Editor + + + + + Profile Nickname Editor + + + + + Who will receive the points? + + + + + Who is using Nintendo eShop? + + + + + Who is making this purchase? + + + + + Who is posting? + + + + + Select a user to link to a Nintendo Account. + + + + + Change settings for which user? + + + + + Format data for which user? + + + + + Which user will be transferred to another console? + + + + + Send save data for which user? + + + + + Select a user: + Chọn một người dùng: + QtSoftwareKeyboardDialog @@ -7435,51 +7801,20 @@ p, li { white-space: pre-wrap; } WaitTreeCallstack - + Call stack Chùm cuộc gọi - - WaitTreeMutexInfo - - - waiting for mutex 0x%1 - chờ đợi loại trừ lẫn nhau 0x%1 - - - - has waiters: %1 - đã chờ đợi: %1 - - - - owner handle: 0x%1 - chủ điều khiển: 0x%1 - - - - WaitTreeObjectList - - - waiting for all objects - chờ đợi toàn bộ đối tượng - - - - waiting for one of the following objects - chờ đợi một đối tượng đang theo dõi - - WaitTreeSynchronizationObject - - [%1] %2 %3 + + [%1] %2 - + waited by no thread chờ đợi bởi vì không có luồng @@ -7487,120 +7822,110 @@ p, li { white-space: pre-wrap; } WaitTreeThread - + runnable - + paused tạm dừng - + sleeping ngủ - + waiting for IPC reply chờ đợi IPC phản hồi - + waiting for objects chờ đợi đối tượng - + waiting for condition variable - + waiting for address arbiter chờ đợi địa chỉ người đứng giữa - + waiting for suspend resume - + waiting - + initialized - + terminated - + unknown - + PC = 0x%1 LR = 0x%2 PC = 0x%1 LR = 0x%2 - + ideal - + core %1 lõi %1 - + processor = %1 bộ xử lý = %1 - - ideal core = %1 - lõi lý tưởng = %1 - - - + affinity mask = %1 che đậy tánh giống nhau = %1 - + thread id = %1 id luồng = %1 - + priority = %1(current) / %2(normal) quyền ưu tiên = %1(hiện tại) / %2(bình thường) - + last running ticks = %1 lần chạy cuối cùng = %1 - - - not waiting for mutex - không có chờ đợi loại trừ lẫn nhau - WaitTreeThreadList - + waited by thread chờ đợi bởi vì có luồng @@ -7608,7 +7933,7 @@ p, li { white-space: pre-wrap; } WaitTreeWidget - + &Wait Tree diff --git a/dist/languages/zh_CN.ts b/dist/languages/zh_CN.ts index 2de1e921e..50b88e2b4 100644 --- a/dist/languages/zh_CN.ts +++ b/dist/languages/zh_CN.ts @@ -1134,78 +1134,78 @@ This would ban both their forum username and their IP address. yuzu 设置 - - + + Audio 声音 - - + + CPU CPU - + Debug 调试 - + Filesystem 文件系统 - - + + General 通用 - - + + Graphics 图形 - + GraphicsAdvanced 高级图形选项 - + Hotkeys 热键 - - + + Controls 控制 - + Profiles 用户配置 - + Network 网络 - - + + System 系统 - + Game List 游戏列表 - + Web 网络 @@ -1380,41 +1380,36 @@ This would ban both their forum username and their IP address. - Extended memory layout (8GB DRAM) - 扩展的内存布局 (8GB DRAM) - - - Confirm exit while emulation is running 在游戏运行时退出需要确认 - + Prompt for user on game boot 游戏启动时提示选择用户 - + Pause emulation when in background 模拟器位于后台时暂停模拟 - + Hide mouse on inactivity 自动隐藏鼠标光标 - + Reset All Settings 重置所有设置项 - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? 将重置模拟器所有设置并删除所有游戏的单独设置。这不会删除游戏目录、个人文件及输入配置文件。是否继续？ @@ -1453,7 +1448,7 @@ This would ban both their forum username and their IP address. - + None 无 @@ -1479,231 +1474,272 @@ This would ban both their forum username and their IP address. + VSync Mode: + 垂直同步模式： + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + FIFO (垂直同步)不会掉帧或产生画面撕裂，但受到屏幕刷新率的限制。 +FIFO Relaxed 类似于 FIFO，但允许从低 FPS 恢复时产生撕裂。 +Mailbox 具有比 FIFO 更低的延迟，不会产生撕裂但可能会掉帧。 +Immediate (无同步)只显示可用内容，并可能产生撕裂。 + + + NVDEC emulation: NVDEC 模拟方式： - + No Video Output 无视频输出 - + CPU Video Decoding CPU 视频解码 - + GPU Video Decoding (Default) GPU 视频解码 (默认) - + Fullscreen Mode: 全屏模式： - + Borderless Windowed 无边框窗口 - + Exclusive Fullscreen 独占全屏 - + Aspect Ratio: 屏幕纵横比： - + Default (16:9) 默认 (16:9) - + Force 4:3 强制 4:3 - + Force 21:9 强制 21:9 - + Force 16:10 强制 16:10 - + Stretch to Window 拉伸窗口 - + Resolution: 画面分辨率： - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [实验性] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [实验性] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] 1.5X (1080p/1620p) [实验性] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) 7X (5040p/7560p) - + 8X (5760p/8640p) 8X (5760p/8640p) - + Window Adapting Filter: 窗口滤镜： - + Nearest Neighbor 近邻取样 - + Bilinear 双线性过滤 - + Bicubic 双三线过滤 - + Gaussian 高斯模糊 - + ScaleForce 强制缩放 - + AMD FidelityFX™️ Super Resolution AMD FidelityFX™️ 超级分辨率锐画技术 - + Anti-Aliasing Method: 抗锯齿方式： - + FXAA 快速近似抗锯齿 - + SMAA 子像素形态学抗锯齿 - + Use global FSR Sharpness 使用全局 FSR 锐化度 - + Set FSR Sharpness 设置 FSR 锐化度 - + FSR Sharpness: FSR 锐化度： - + 100% 100% - - + + Use global background color 使用全局背景颜色 - + Set background color: 设置背景颜色: - + Background Color: 背景颜色: - + GLASM (Assembly Shaders, NVIDIA Only) - GLASM（汇编着色器，仅限 NVIDIA 显卡） + GLASM (汇编着色器，仅限 NVIDIA 显卡) - + SPIR-V (Experimental, Mesa Only) SPIR-V (实验性，仅限 Mesa) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + 关闭 + + + + VSync Off + 垂直同步关 + + + + Recommended + 推荐 + + + + On + 开启 + + + + VSync On + 垂直同步开 + ConfigureGraphicsAdvanced @@ -1728,107 +1764,134 @@ This would ban both their forum username and their IP address. 精度： - + + ASTC recompression: + ASTC 纹理重压缩： + + + + Uncompressed (Best quality) + 不压缩 (最高质量) + + + + BC1 (Low quality) + BC1 (低质量) + + + + BC3 (Medium quality) + BC3 (中等质量) + + + + Enable asynchronous presentation (Vulkan only) + 启用异步帧提交 (仅限 Vulkan) + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. 在后台运行的同时等待图形命令，以防止 GPU 降低时钟速度。 - + Force maximum clocks (Vulkan only) 强制最大时钟 (仅限 Vulkan 模式) - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - 垂直同步可防止画面产生撕裂感。但启用垂直同步后，某些设备性能可能会有所降低。如果您没有感到性能差异，请保持启用状态。 - - - - Use VSync - 启用垂直同步 - - - + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. 启用异步 ASTC 纹理解码，可能减少加载时的卡顿。实验性功能。 - + Decode ASTC textures asynchronously (Hack) 异步 ASTC 纹理解码 (不稳定) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + 使用反应性刷新取代预测性刷新，从而更精确地同步内存。 + + + + Enable Reactive Flushing + 启用反应性刷新 + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. 启用异步着色器编译，这可能会减少着色器卡顿。实验性功能。 - + Use asynchronous shader building (Hack) 启用异步着色器构建 (不稳定) - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. 启用快速 GPU 时钟。此选项将强制大多数游戏以其最高分辨率运行。 - + Use Fast GPU Time (Hack) 启用快速 GPU 时钟 (不稳定) - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - 启用悲观缓冲区刷新。此选项将强制刷新未修改的缓冲区，可能会降低性能。 - - - - Use pessimistic buffer flushes (Hack) - 启用悲观缓冲区刷新 (不稳定) - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. 启用 GPU 供应商专用的管线缓存。在 Vulkan 驱动程序内部不存储管线缓存的情况下，此选项可显著提高着色器加载速度。 - + Use Vulkan pipeline cache 启用 Vulkan 管线缓存 - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + 启用某些游戏所需的计算管线。此选项仅适用于英特尔专有驱动程序。如果启用，可能会造成崩溃。 +在其他的驱动程序上将始终启用计算管线。 + + + + Enable Compute Pipelines (Intel Vulkan only) + 启用计算管线 (仅限 Intel 显卡 Vulkan 模式) + + + Anisotropic Filtering: 各向异性过滤： - + Automatic 自动 - + Default 系统默认 - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1861,70 +1924,65 @@ This would ban both their forum username and their IP address. 恢复默认 - + Action 作用 - + Hotkey 热键 - + Controller Hotkey 控制器热键 - - - + + + Conflicting Key Sequence 按键冲突 - - + + The entered key sequence is already assigned to: %1 输入的按键序列已分配给: %1 - - Home+%1 - Home+%1 - - - + [waiting] [请按键] - + Invalid 无效 - + Restore Default 恢复默认 - + Clear 清除 - + Conflicting Button Sequence 键位冲突 - + The default button sequence is already assigned to: %1 默认的按键序列已分配给: %1 - + The default key sequence is already assigned to: %1 默认的按键序列已分配给: %1 @@ -2216,7 +2274,7 @@ This would ban both their forum username and their IP address. - + Configure 设置 @@ -2273,22 +2331,32 @@ This would ban both their forum username and their IP address. 启用 Pro Controller 直接驱动 [实验性] - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + 此选项允许您在游戏中无限使用相同的 Amiibo。 + + + + Use random Amiibo ID + 使用 Amiibo 随机 ID + + + Enable mouse panning 启用鼠标平移 - + Mouse sensitivity 鼠标灵敏度 - + % % - + Motion / Touch 体感/触摸 @@ -2400,7 +2468,7 @@ This would ban both their forum username and their IP address. - + Left Stick 左摇杆 @@ -2494,14 +2562,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2520,7 +2588,7 @@ This would ban both their forum username and their IP address. - + Plus ＋ @@ -2533,15 +2601,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2598,241 +2666,247 @@ This would ban both their forum username and their IP address. - + Right Stick 右摇杆 - - - - + + + + Clear 清除 - - - - - + + + + + [not set] [未设置] - - + + + Invert button 反转按键 - - + + Toggle button 切换键 - + Turbo button 连发键 - - + + Invert axis 体感方向倒置 - - - + + + Set threshold 阈值设定 - - + + Choose a value between 0% and 100% 选择一个介于 0% 和 100% 之间的值 - + Toggle axis 切换轴 - + Set gyro threshold 陀螺仪阈值设定 - + + Calibrate sensor + 校准传感器 + + + Map Analog Stick 映射摇杆 - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. 在按下确定后，首先水平移动你的手柄，然后垂直移动它。 如果要使体感方向倒置，首先垂直移动你的手柄，然后水平移动它。 - + Center axis 中心轴 - - + + Deadzone: %1% 摇杆死区：%1% - - + + Modifier Range: %1% 摇杆灵敏度：%1% - - + + Pro Controller Pro Controller - + Dual Joycons 双 Joycons 手柄 - + Left Joycon 左 Joycon 手柄 - + Right Joycon 右 Joycon 手柄 - + Handheld 掌机模式 - + GameCube Controller GameCube 控制器 - + Poke Ball Plus 精灵球 PLUS - + NES Controller NES 控制器 - + SNES Controller SNES 控制器 - + N64 Controller N64 控制器 - + Sega Genesis 世嘉创世纪 - + Start / Pause 开始 / 暂停 - + Z Z - + Control Stick 控制摇杆 - + C-Stick C 摇杆 - + Shake! 摇动！ - + [waiting] [等待中] - + New Profile 新建自定义设置 - + Enter a profile name: 输入配置文件名称： - - + + Create Input Profile 新建输入配置文件 - + The given profile name is not valid! 输入的配置文件名称无效！ - + Failed to create the input profile "%1" 新建输入配置文件 "%1" 失败 - + Delete Input Profile 删除输入配置文件 - + Failed to delete the input profile "%1" 删除输入配置文件 "%1" 失败 - + Load Input Profile 加载输入配置文件 - + Failed to load the input profile "%1" 加载输入配置文件 "%1" 失败 - + Save Input Profile 保存输入配置文件 - + Failed to save the input profile "%1" 保存输入配置文件 "%1" 失败 @@ -3087,47 +3161,47 @@ To invert the axes, first move your joystick vertically, and then horizontally.< 开发商 - + Add-Ons 附加项 - + General 通用 - + System 系统 - + CPU CPU - + Graphics 图形 - + Adv. Graphics 高级图形 - + Audio 声音 - + Input Profiles 输入配置文件 - + Properties 属性 @@ -3848,7 +3922,12 @@ UUID: %2 设备名称 - + + Unsafe extended memory layout (8GB DRAM) + 不安全的内存布局扩展 (8GB DRAM) + + + System settings are available only when game is not running. 只有当游戏不在运行时，系统设置才可用。 @@ -4544,957 +4623,962 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? <a href='https://yuzu-emu.org/help/feature/telemetry/'>我们收集匿名数据</a>来帮助改进 yuzu 。<br/><br/>您愿意和我们分享您的使用数据吗？ - + Telemetry 使用数据共享 - + Broken Vulkan Installation Detected 检测到 Vulkan 的安装已损坏 - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. Vulkan 初始化失败。<br><br>点击<a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>这里</a>获取此问题的相关信息。 - + Loading Web Applet... 正在加载 Web 应用程序... - - + + Disable Web Applet 禁用 Web 应用程序 - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) 禁用 Web 应用程序可能会发生未知的行为，且只能在《超级马里奥 3D 全明星》中使用。您确定要禁用 Web 应用程序吗？ (您可以在调试选项中重新启用它。) - + The amount of shaders currently being built 当前正在构建的着色器数量 - + The current selected resolution scaling multiplier. 当前选定的分辨率缩放比例。 - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. 当前的模拟速度。高于或低于 100% 的值表示运行速度比实际的 Switch 更快或更慢。 - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. 游戏当前运行的帧率。这将因游戏和场景的不同而有所变化。 - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. 在不计算速度限制和垂直同步的情况下，模拟一个 Switch 帧的实际时间。若要进行全速模拟，这个数值不应超过 16.67 毫秒。 - + &Clear Recent Files 清除最近文件 (&C) - + Emulated mouse is enabled 已启用模拟鼠标 - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. 实体鼠标输入与鼠标平移不兼容。请在高级输入设置中禁用模拟鼠标以使用鼠标平移。 - + &Continue 继续 (&C) - + &Pause 暂停 (&P) - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu 正在运行中 - + Warning Outdated Game Format 过时游戏格式警告 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. 目前使用的游戏为解体的 ROM 目录格式，这是一种过时的格式，已被其他格式替代，如 NCA，NAX，XCI 或 NSP。解体的 ROM 目录缺少图标、元数据和更新支持。<br><br>有关 yuzu 支持的各种 Switch 格式的说明，<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>请查看我们的 wiki</a>。此消息将不会再次出现。 - - + + Error while loading ROM! 加载 ROM 时出错！ - + The ROM format is not supported. 该 ROM 格式不受支持。 - + An error occurred initializing the video core. 初始化视频核心时发生错误 - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu 在运行视频核心时发生错误。这可能是由 GPU 驱动程序过旧造成的。有关详细信息，请参阅日志文件。关于日志文件的更多信息，请参考以下页面：<a href='https://yuzu-emu.org/help/reference/log-files/'>如何上传日志文件</a>。 - + Error while loading ROM! %1 %1 signifies a numeric error code. 加载 ROM 时出错！ %1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>请参考<a href='https://yuzu-emu.org/help/quickstart/'>yuzu 快速导航</a>以获取相关文件。<br>您可以参考 yuzu 的 wiki 页面</a>或 Discord 社区</a>以获得帮助。 - + An unknown error occurred. Please see the log for more details. 发生了未知错误。请查看日志了解详情。 - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... 正在关闭… - + Save Data 保存数据 - + Mod Data Mod 数据 - + Error Opening %1 Folder 打开 %1 文件夹时出错 - - + + Folder does not exist! 文件夹不存在！ - + Error Opening Transferable Shader Cache 打开可转移着色器缓存时出错 - + Failed to create the shader cache directory for this title. 为该游戏创建着色器缓存目录时失败。 - + Error Removing Contents 删除内容时出错 - + Error Removing Update 删除更新时出错 - + Error Removing DLC 删除 DLC 时出错 - + Remove Installed Game Contents? 删除已安装的游戏内容？ - + Remove Installed Game Update? 删除已安装的游戏更新？ - + Remove Installed Game DLC? 删除已安装的游戏 DLC 内容？ - + Remove Entry 删除项目 - - - - - - + + + + + + Successfully Removed 删除成功 - + Successfully removed the installed base game. 成功删除已安装的游戏。 - + The base game is not installed in the NAND and cannot be removed. 该游戏未安装于 NAND 中，无法删除。 - + Successfully removed the installed update. 成功删除已安装的游戏更新。 - + There is no update installed for this title. 这个游戏没有任何已安装的更新。 - + There are no DLC installed for this title. 这个游戏没有任何已安装的 DLC 。 - + Successfully removed %1 installed DLC. 成功删除游戏 %1 安装的 DLC 。 - + Delete OpenGL Transferable Shader Cache? 删除 OpenGL 模式的着色器缓存？ - + Delete Vulkan Transferable Shader Cache? 删除 Vulkan 模式的着色器缓存？ - + Delete All Transferable Shader Caches? 删除所有的着色器缓存？ - + Remove Custom Game Configuration? 移除自定义游戏设置？ - + + Remove Cache Storage? + 移除缓存？ + + + Remove File 删除文件 - - + + Error Removing Transferable Shader Cache 删除着色器缓存时出错 - - + + A shader cache for this title does not exist. 这个游戏的着色器缓存不存在。 - + Successfully removed the transferable shader cache. 成功删除着色器缓存。 - + Failed to remove the transferable shader cache. 删除着色器缓存失败。 - + Error Removing Vulkan Driver Pipeline Cache 删除 Vulkan 驱动程序管线缓存时出错 - + Failed to remove the driver pipeline cache. 删除驱动程序管线缓存失败。 - - + + Error Removing Transferable Shader Caches 删除着色器缓存时出错 - + Successfully removed the transferable shader caches. 着色器缓存删除成功。 - + Failed to remove the transferable shader cache directory. 删除着色器缓存目录失败。 - - + + Error Removing Custom Configuration 移除自定义游戏设置时出错 - + A custom configuration for this title does not exist. 这个游戏的自定义设置不存在。 - + Successfully removed the custom game configuration. 成功移除自定义游戏设置。 - + Failed to remove the custom game configuration. 移除自定义游戏设置失败。 - - + + RomFS Extraction Failed! RomFS 提取失败！ - + There was an error copying the RomFS files or the user cancelled the operation. 复制 RomFS 文件时出错，或用户取消了操作。 - + Full 完整 - + Skeleton 框架 - + Select RomFS Dump Mode 选择 RomFS 转储模式 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. 请选择 RomFS 转储的方式。<br>“完整” 会将所有文件复制到新目录中，而<br>“框架” 只会创建目录结构。 - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 没有足够的空间用于提取 RomFS。请保持足够的空间或于模拟—>设置—>系统—>文件系统—>转储根目录中选择一个其他目录。 - + Extracting RomFS... 正在提取 RomFS... - - + + Cancel 取消 - + RomFS Extraction Succeeded! RomFS 提取成功！ - + The operation completed successfully. 操作成功完成。 - - - - - + + + + + Create Shortcut 创建快捷方式 - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? 这将为当前的游戏创建快捷方式。但在其更新后，快捷方式可能无法正常工作。是否继续？ - + Cannot create shortcut on desktop. Path "%1" does not exist. 无法在桌面创建快捷方式。路径“ %1 ”不存在。 - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. 无法在应用程序菜单中创建快捷方式。路径“ %1 ”不存在且无法被创建。 - + Create Icon 创建图标 - + Cannot create icon file. Path "%1" does not exist and cannot be created. 无法创建图标文件。路径“ %1 ”不存在且无法被创建。 - + Start %1 with the yuzu Emulator 使用 yuzu 启动 %1 - + Failed to create a shortcut at %1 在 %1 处创建快捷方式时失败 - + Successfully created a shortcut to %1 成功地在 %1 处创建快捷方式 - + Error Opening %1 打开 %1 时出错 - + Select Directory 选择目录 - + Properties 属性 - + The game properties could not be loaded. 无法加载该游戏的属性信息。 - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch 可执行文件 (%1);;所有文件 (*.*) - + Load File 加载文件 - + Open Extracted ROM Directory 打开提取的 ROM 目录 - + Invalid Directory Selected 选择的目录无效 - + The directory you have selected does not contain a 'main' file. 选择的目录不包含 “main” 文件。 - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) 可安装 Switch 文件 (*.nca *.nsp *.xci);;任天堂内容档案 (*.nca);;任天堂应用包 (*.nsp);;NX 卡带镜像 (*.xci) - + Install Files 安装文件 - + %n file(s) remaining 剩余 %n 个文件 - + Installing file "%1"... 正在安装文件 "%1"... - - + + Install Results 安装结果 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 为了避免可能存在的冲突，我们不建议将游戏本体安装到 NAND 中。 此功能仅用于安装游戏更新和 DLC 。 - + %n file(s) were newly installed 最近安装了 %n 个文件 - + %n file(s) were overwritten %n 个文件被覆盖 - + %n file(s) failed to install %n 个文件安装失败 - + System Application 系统应用 - + System Archive 系统档案 - + System Application Update 系统应用更新 - + Firmware Package (Type A) 固件包 (A型) - + Firmware Package (Type B) 固件包 (B型) - + Game 游戏 - + Game Update 游戏更新 - + Game DLC 游戏 DLC - + Delta Title 差量程序 - + Select NCA Install Type... 选择 NCA 安装类型... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) 请选择此 NCA 的程序类型： （在大多数情况下，选择默认的“游戏”即可。） - + Failed to Install 安装失败 - + The title type you selected for the NCA is invalid. 选择的 NCA 程序类型无效。 - + File not found 找不到文件 - + File "%1" not found 文件 "%1" 未找到 - + OK 确定 - - + + Hardware requirements not met 硬件不满足要求 - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. 您的系统不满足运行 yuzu 的推荐配置。兼容性报告已被禁用。 - + Missing yuzu Account 未设置 yuzu 账户 - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. 要提交游戏兼容性测试用例，您必须设置您的 yuzu 帐户。<br><br/>要设置您的 yuzu 帐户，请转到模拟 &gt; 设置 &gt; 网络。 - + Error opening URL 打开 URL 时出错 - + Unable to open the URL "%1". 无法打开 URL : "%1" 。 - + TAS Recording TAS 录制中 - + Overwrite file of player 1? 覆盖玩家 1 的文件？ - + Invalid config detected 检测到无效配置 - + Handheld controller can't be used on docked mode. Pro controller will be selected. 掌机手柄无法在主机模式中使用。将会选择 Pro controller。 - - + + Amiibo Amiibo - - + + The current amiibo has been removed 当前的 Amiibo 已被移除。 - + Error 错误 - - + + The current game is not looking for amiibos 当前游戏并没有在寻找 Amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo 文件 (%1);; 全部文件 (*.*) - + Load Amiibo 加载 Amiibo - + Error loading Amiibo data 加载 Amiibo 数据时出错 - + The selected file is not a valid amiibo 选择的文件并不是有效的 amiibo - + The selected file is already on use 选择的文件已在使用中 - + An unknown error occurred 发生了未知错误 - + Capture Screenshot 捕获截图 - + PNG Image (*.png) PNG 图像 (*.png) - + TAS state: Running %1/%2 TAS 状态：正在运行 %1/%2 - + TAS state: Recording %1 TAS 状态：正在录制 %1 - + TAS state: Idle %1/%2 TAS 状态：空闲 %1/%2 - + TAS State: Invalid TAS 状态：无效 - + &Stop Running 停止运行 (&S) - + &Start 开始 (&S) - + Stop R&ecording 停止录制 (&E) - + R&ecord 录制 (&E) - + Building: %n shader(s) 正在编译 %n 个着色器文件 - + Scale: %1x %1 is the resolution scaling factor 缩放比例: %1x - + Speed: %1% / %2% 速度: %1% / %2% - + Speed: %1% 速度: %1% - + Game: %1 FPS (Unlocked) FPS: %1 (未锁定) - + Game: %1 FPS FPS: %1 - + Frame: %1 ms 帧延迟: %1 毫秒 - + GPU NORMAL GPU NORMAL - + GPU HIGH GPU HIGH - + GPU EXTREME GPU EXTREME - + GPU ERROR GPU ERROR - + DOCKED 主机模式 - + HANDHELD 掌机模式 - + OPENGL OPENGL - + VULKAN VULKAN - + NULL 无 - + NEAREST 邻近取样 - - + + BILINEAR 双线性过滤 - + BICUBIC 双三线过滤 - + GAUSSIAN 高斯模糊 - + SCALEFORCE 强制缩放 - + FSR FSR - - + + NO AA 抗锯齿关 - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE 音量: 静音 - + VOLUME: %1% Volume percentage (e.g. 50%) 音量: %1% - + Confirm Key Rederivation 确认重新生成密钥 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5510,37 +5594,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 这将删除您自动生成的密钥文件并重新运行密钥生成模块。 - + Missing fuses 项目丢失 - + - Missing BOOT0 - 丢失 BOOT0 - + - Missing BCPKG2-1-Normal-Main - 丢失 BCPKG2-1-Normal-Main - + - Missing PRODINFO - 丢失 PRODINFO - + Derivation Components Missing 组件丢失 - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 密钥缺失。<br>请查看<a href='https://yuzu-emu.org/help/quickstart/'>yuzu 快速导航</a>以获得你的密钥、固件和游戏。<br><br><small>(%1)</small> - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5549,39 +5633,49 @@ on your system's performance. 您的系统性能。 - + Deriving Keys 生成密钥 - + + System Archive Decryption Failed + 系统固件解密失败 + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + 当前密钥无法解密系统固件。<br>请查看<a href='https://yuzu-emu.org/help/quickstart/'>yuzu 快速导航</a>以获得你的密钥、固件和游戏。 + + + Select RomFS Dump Target 选择 RomFS 转储目标 - + Please select which RomFS you would like to dump. 请选择希望转储的 RomFS。 - + Are you sure you want to close yuzu? 您确定要关闭 yuzu 吗？ - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. 您确定要停止模拟吗？未保存的进度将会丢失。 - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5593,44 +5687,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! OpenGL 模式不可用！ - + OpenGL shared contexts are not supported. 不支持 OpenGL 共享上下文。 - + yuzu has not been compiled with OpenGL support. yuzu 没有使用 OpenGL 进行编译。 + - Error while initializing OpenGL! 初始化 OpenGL 时出错！ - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. 您的 GPU 可能不支持 OpenGL ，或者您没有安装最新的显卡驱动。 - + Error while initializing OpenGL 4.6! 初始化 OpenGL 4.6 时出错！ - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 您的 GPU 可能不支持 OpenGL 4.6 ，或者您没有安装最新的显卡驱动。<br><br>GL 渲染器：<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 您的 GPU 可能不支持某些必需的 OpenGL 扩展。请确保您已经安装最新的显卡驱动。<br><br>GL 渲染器：<br>%1<br><br>不支持的扩展：<br>%2 @@ -5689,117 +5783,122 @@ Would you like to bypass this and exit anyway? + Remove Cache Storage + 移除缓存 + + + Remove OpenGL Pipeline Cache 删除 OpenGL 着色器缓存 - + Remove Vulkan Pipeline Cache 删除 Vulkan 着色器缓存 - + Remove All Pipeline Caches 删除所有着色器缓存 - + Remove All Installed Contents 删除所有安装的项目 - + Dump RomFS 转储 RomFS - + Dump RomFS to SDMC 转储 RomFS 到 SDMC - + Copy Title ID to Clipboard 复制游戏 ID 到剪贴板 - + Navigate to GameDB entry 查看兼容性报告 - + Create Shortcut 创建快捷方式 - + Add to Desktop 添加到桌面 - + Add to Applications Menu 添加到应用程序菜单 - + Properties 属性 - + Scan Subfolders 扫描子文件夹 - + Remove Game Directory 移除游戏目录 - + ▲ Move Up ▲ 向上移动 - + ▼ Move Down ▼ 向下移动 - + Open Directory Location 打开目录位置 - + Clear 清除 - + Name 名称 - + Compatibility 兼容性 - + Add-ons 附加项 - + File type 文件类型 - + Size 大小 @@ -5870,7 +5969,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list 双击添加新的游戏文件夹 @@ -5883,12 +5982,12 @@ Would you like to bypass this and exit anyway? %1 / %n 个结果 - + Filter: 搜索: - + Enter pattern to filter 搜索游戏 @@ -5979,12 +6078,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute 开启/关闭静音 - @@ -6006,111 +6104,112 @@ Debug Message: + Main Window 主窗口 - + Audio Volume Down 调低音量 - + Audio Volume Up 调高音量 - + Capture Screenshot 捕获截图 - + Change Adapting Filter 更改窗口滤镜 - + Change Docked Mode 更改主机运行模式 - + Change GPU Accuracy 更改 GPU 精度 - + Continue/Pause Emulation 继续/暂停模拟 - + Exit Fullscreen 退出全屏 - + Exit yuzu 退出 yuzu - + Fullscreen 全屏 - + Load File 加载文件 - + Load/Remove Amiibo 加载/移除 Amiibo - + Restart Emulation 重新启动模拟 - + Stop Emulation 停止模拟 - + TAS Record TAS 录制 - + TAS Reset 重置 TAS - + TAS Start/Stop TAS 开始/停止 - + Toggle Filter Bar 切换搜索栏 - + Toggle Framerate Limit 切换帧率限制 - + Toggle Mouse Panning 切换鼠标平移 - + Toggle Status Bar 切换状态栏 @@ -6803,7 +6902,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE 开始/暂停 @@ -6853,21 +6952,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6875,8 +6974,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [未设置] @@ -6891,10 +6990,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 轴 %1%2 @@ -6908,163 +7007,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [未知] - - + + Left 左 - - + + Right 右 - - + + Down 下 - - + + Up 上 - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start 开始 - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle ○ - + Cross ╳ - + Square □ - + Triangle Δ - + Share 分享 - + Options 选项 - + [undefined] [未指定] @@ -7075,7 +7174,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [无效] @@ -7089,21 +7188,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2轴 %3 - + %1%2Axis %3,%4,%5 %1%2轴 %3,%4,%5 - + %1%2Motion %3 %1%2体感 %3 @@ -7115,106 +7212,112 @@ p, li { white-space: pre-wrap; } - + [unused] [未使用] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L 左摇杆 - + Stick R 右摇杆 - + Plus ＋ - + Minus － - - + + Home Home - + Capture 截图 - + Touch 触摸 - + Wheel Indicates the mouse wheel 鼠标滚轮 - + Backward 后退 - + Forward 前进 - + Task 任务键 - + Extra 额外按键 - + %1%2%3%4 %1%2%3%4 - - + + %1%2%3Hat %4 %1%2%3 控制器 %4 - - + + + %1%2%3Axis %4 + %1%2%3轴 %4 + + + + %1%2%3Button %4 %1%2%3 按键 %4 @@ -7635,73 +7738,73 @@ Please try again or contact the developer of the software. 用户 - + Profile Creator 创建用户 - - + + Profile Selector 选择用户 - + Profile Icon Editor 修改用户图像 - + Profile Nickname Editor 修改用户昵称 - + Who will receive the points? 谁将获得黄金点数？ - + Who is using Nintendo eShop? 谁正在使用任天堂 eShop？ - + Who is making this purchase? 是谁购买了这个？ - + Who is posting? 谁在发帖？ - + Select a user to link to a Nintendo Account. 选择要链接到任天堂账户的用户。 - + Change settings for which user? 要更改哪个用户的设置？ - + Format data for which user? 要为哪个用户格式化数据？ - + Which user will be transferred to another console? 哪个用户将被转移到另一个控制台？ - + Send save data for which user? 要为哪个用户发送保存数据？ - + Select a user: 选择一个用户: diff --git a/dist/languages/zh_TW.ts b/dist/languages/zh_TW.ts index f6cd1934d..a4605917f 100644 --- a/dist/languages/zh_TW.ts +++ b/dist/languages/zh_TW.ts @@ -381,17 +381,17 @@ This would ban both their forum username and their IP address. Output Device: - 输出设备： + 輸出裝置： Input Device: - 输入设备： + 輸入裝置： Sound Output Mode: - 声音输出模式： + 音訊輸出模式： @@ -431,7 +431,7 @@ This would ban both their forum username and their IP address. Mute audio when in background - 模拟器位于后台时静音 + 模擬器在背景執行時靜音 @@ -963,12 +963,12 @@ This would ban both their forum username and their IP address. When checked, it disables the macro HLE functions. Enabling this makes games run slower - 启用时，将禁用宏高阶模拟。这会降低游戏运行速度。 + 停用macro HLE，將會降低遊戲效能。 Disable Macro HLE - 禁用宏高阶模拟 + 停用macro HLE @@ -1136,78 +1136,78 @@ This would ban both their forum username and their IP address. yuzu 設定 - - + + Audio 音訊 - - + + CPU CPU - + Debug 偵錯 - + Filesystem 檔案系統 - - + + General 一般 - - + + Graphics 圖形 - + GraphicsAdvanced 進階圖形 - + Hotkeys 快速鍵 - - + + Controls 控制 - + Profiles 設定檔 - + Network 網路 - - + + System 系統 - + Game List 遊戲清單 - + Web 網路服務 @@ -1382,41 +1382,36 @@ This would ban both their forum username and their IP address. - Extended memory layout (8GB DRAM) - 扩展的内存布局 (8GB DRAM) - - - Confirm exit while emulation is running 退出遊戲時需要確認 - + Prompt for user on game boot 啟動遊戲時提示選擇使用者 - + Pause emulation when in background 模擬器在背景執行時暫停 - + Hide mouse on inactivity 滑鼠閒置時自動隱藏 - + Reset All Settings 重設所有設定 - + yuzu yuzu - + This reset all settings and remove all per-game configurations. This will not delete game directories, profiles, or input profiles. Proceed? 這將重設所有遊戲的額外設定，但不會刪除遊戲資料夾、使用者設定檔、輸入設定檔，是否繼續？ @@ -1455,7 +1450,7 @@ This would ban both their forum username and their IP address. - + None 無 @@ -1481,231 +1476,272 @@ This would ban both their forum username and their IP address. + VSync Mode: + 垂直同步模式： + + + + FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate. +FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down. +Mailbox can have lower latency than FIFO and does not tear but may drop frames. +Immediate (no synchronization) just presents whatever is available and can exhibit tearing. + FIFO (垂直同步)不会掉帧或产生画面撕裂，但受到屏幕刷新率的限制。 +FIFO Relaxed 类似于 FIFO，但允许从低 FPS 恢复时产生撕裂。 +Mailbox 具有比 FIFO 更低的延迟，不会产生撕裂但可能会掉帧。 +Immediate (无同步)只显示可用内容，并可能产生撕裂。 + + + NVDEC emulation: NVDEC 模擬方式： - + No Video Output 無視訊輸出 - + CPU Video Decoding CPU 視訊解碼 - + GPU Video Decoding (Default) GPU 視訊解碼（預設） - + Fullscreen Mode: 全螢幕模式： - + Borderless Windowed 無邊框視窗 - + Exclusive Fullscreen 全螢幕獨占 - + Aspect Ratio: 長寬比： - + Default (16:9) 預設 (16:9) - + Force 4:3 強制 4:3 - + Force 21:9 強制 21:9 - + Force 16:10 强制 16:10 - + Stretch to Window 延伸視窗 - + Resolution: 解析度： - + 0.5X (360p/540p) [EXPERIMENTAL] 0.5X (360p/540p) [實驗性] - + 0.75X (540p/810p) [EXPERIMENTAL] 0.75X (540p/810p) [實驗性] - + 1X (720p/1080p) 1X (720p/1080p) - + 1.5X (1080p/1620p) [EXPERIMENTAL] - 1.5X (1080p/1620p) [实验性] + 1.5X (1080p/1620p) [實驗性] - + 2X (1440p/2160p) 2X (1440p/2160p) - + 3X (2160p/3240p) 3X (2160p/3240p) - + 4X (2880p/4320p) 4X (2880p/4320p) - + 5X (3600p/5400p) 5X (3600p/5400p) - + 6X (4320p/6480p) 6X (4320p/6480p) - + 7X (5040p/7560p) 7X (5040p/7560p) - + 8X (5760p/8640p) 8X (5760p/8640p) - + Window Adapting Filter: 視窗濾鏡： - + Nearest Neighbor 最近鄰域 - + Bilinear 雙線性 - + Bicubic 雙三次 - + Gaussian 高斯 - + ScaleForce 強制縮放 - + AMD FidelityFX™️ Super Resolution - AMD FidelityFX™️ 超级分辨率锐画技术 + AMD FidelityFX™️ 超級解析度技術 - + Anti-Aliasing Method: 抗鋸齒方式： - + FXAA FXAA - + SMAA SMAA - + Use global FSR Sharpness 启用全局 FSR 锐化 - + Set FSR Sharpness 设置 FSR 锐化 - + FSR Sharpness: FSR 锐化度： - + 100% 100% - - + + Use global background color 使用全域背景顏色 - + Set background color: 設定背景顏色： - + Background Color: 背景顏色: - + GLASM (Assembly Shaders, NVIDIA Only) GLASM（組合語言著色器，僅限 NVIDIA） - + SPIR-V (Experimental, Mesa Only) SPIR-V (实验性，仅限 Mesa) - + %1% FSR sharpening percentage (e.g. 50%) %1% + + + Off + 關閉 + + + + VSync Off + 垂直同步關 + + + + Recommended + 推薦 + + + + On + 開啟 + + + + VSync On + 垂直同步開 + ConfigureGraphicsAdvanced @@ -1730,107 +1766,134 @@ This would ban both their forum username and their IP address. 精度： - + + ASTC recompression: + ASTC 纹理重压缩： + + + + Uncompressed (Best quality) + 不压缩 (最高质量) + + + + BC1 (Low quality) + BC1 (低质量) + + + + BC3 (Medium quality) + BC3 (中等质量) + + + + Enable asynchronous presentation (Vulkan only) + 启用异步帧提交 (仅限 Vulkan) + + + Runs work in the background while waiting for graphics commands to keep the GPU from lowering its clock speed. 在后台运行的同时等待图形命令，以防止 GPU 降低时钟速度。 - + Force maximum clocks (Vulkan only) 强制最大时钟 (仅限 Vulkan 模式) - - VSync prevents the screen from tearing, but some graphics cards have lower performance with VSync enabled. Keep it enabled if you don't notice a performance difference. - 垂直同步可防止畫面撕裂，但啟用後某些顯示卡效能可能會降低。如果您沒有發現效能降低，請保持啟用。 - - - - Use VSync - 启用垂直同步 - - - + Enables asynchronous ASTC texture decoding, which may reduce load time stutter. This feature is experimental. 启用异步 ASTC 纹理解码，可能减少加载时的卡顿。实验性功能。 - + Decode ASTC textures asynchronously (Hack) 异步 ASTC 纹理解码 (不稳定) - + + Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. + 使用反应性刷新取代预测性刷新，从而更精确地同步内存。 + + + + Enable Reactive Flushing + 启用反应性刷新 + + + Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental. 啟用非同步著色器編譯，可能會減少著色器不流暢的問題。實驗性功能。 - + Use asynchronous shader building (Hack) 使用非同步著色器編譯（不穩定） - + Enables Fast GPU Time. This option will force most games to run at their highest native resolution. 啟用快速 GPU 時間。此選項將強制大多數遊戲以其最高解析度執行。 - + Use Fast GPU Time (Hack) 使用快速 GPU 時間（不穩定） - - Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance. - 启用悲观缓冲区刷新。此选项将强制刷新未修改的缓冲区，可能会降低性能。 - - - - Use pessimistic buffer flushes (Hack) - 启用悲观缓冲区刷新 (不稳定) - - - + Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally. 启用 GPU 专用的管线缓存。在 Vulkan 驱动程序内部不存储管线缓存的情况下，此选项可显著提高着色器加载速度。 - + Use Vulkan pipeline cache 启用 Vulkan 管线缓存 - + + Enable compute pipelines, required by some games. This setting only exists for Intel proprietary drivers, and may crash if enabled. +Compute pipelines are always enabled on all other drivers. + 启用某些游戏所需的计算管线。此选项仅适用于英特尔专有驱动程序。如果启用，可能会造成崩溃。 +在其他的驱动程序上将始终启用计算管线。 + + + + Enable Compute Pipelines (Intel Vulkan only) + 启用计算管线 (仅限 Intel 显卡 Vulkan 模式) + + + Anisotropic Filtering: 各向異性過濾： - + Automatic 自動 - + Default 預設 - + 2x 2x - + 4x 4x - + 8x 8x - + 16x 16x @@ -1863,70 +1926,65 @@ This would ban both their forum username and their IP address. 還原預設值 - + Action 動作 - + Hotkey 快速鍵 - + Controller Hotkey 控制器快捷鍵 - - - + + + Conflicting Key Sequence 按鍵衝突 - - + + The entered key sequence is already assigned to: %1 輸入的金鑰已指定給：%1 - - Home+%1 - Home+%1 - - - + [waiting] [請按按鍵] - + Invalid 無效 - + Restore Default 還原預設值 - + Clear 清除 - + Conflicting Button Sequence 按鍵衝突 - + The default button sequence is already assigned to: %1 預設的按鍵序列已分配給: %1 - + The default key sequence is already assigned to: %1 預設金鑰已指定給：%1 @@ -2218,7 +2276,7 @@ This would ban both their forum username and their IP address. - + Configure 設定 @@ -2275,22 +2333,32 @@ This would ban both their forum username and their IP address. 启用 Pro Controller 直接驱动 [实验性] - + + Allows unlimited uses of the same Amiibo in games that would otherwise limit you to one use. + 此选项允许您在游戏中无限使用相同的 Amiibo。 + + + + Use random Amiibo ID + 启用 Amiibo 随机 ID + + + Enable mouse panning 啟用滑鼠平移 - + Mouse sensitivity 滑鼠靈敏度 - + % % - + Motion / Touch 體感/觸控 @@ -2402,7 +2470,7 @@ This would ban both their forum username and their IP address. - + Left Stick 左搖桿 @@ -2496,14 +2564,14 @@ This would ban both their forum username and their IP address. - + L L - + ZL ZL @@ -2522,7 +2590,7 @@ This would ban both their forum username and their IP address. - + Plus ＋ @@ -2535,15 +2603,15 @@ This would ban both their forum username and their IP address. - - + + R R - + ZR ZR @@ -2600,241 +2668,247 @@ This would ban both their forum username and their IP address. - + Right Stick 右搖桿 - - - - + + + + Clear 清除 - - - - - + + + + + [not set] [未設定] - - + + + Invert button 無效按鈕 - - + + Toggle button 切換按鍵 - + Turbo button 连发键 - - + + Invert axis 方向反轉 - - - + + + Set threshold 設定閾值 - - + + Choose a value between 0% and 100% 選擇介於 0% 和 100% 之間的值 - + Toggle axis 切换轴 - + Set gyro threshold 陀螺仪阈值设定 - + + Calibrate sensor + 校准传感器 + + + Map Analog Stick 搖桿映射 - + After pressing OK, first move your joystick horizontally, and then vertically. To invert the axes, first move your joystick vertically, and then horizontally. 按下確定後，先水平再上下移動您的搖桿。 要反轉方向，則先上下再水平移動您的搖桿。 - + Center axis 中心轴 - - + + Deadzone: %1% 無感帶：%1% - - + + Modifier Range: %1% 輕推靈敏度：%1% - - + + Pro Controller Pro 手把 - + Dual Joycons 雙 Joycon 手把 - + Left Joycon 左 Joycon 手把 - + Right Joycon 右 Joycon 手把 - + Handheld 掌機模式 - + GameCube Controller GameCube 手把 - + Poke Ball Plus 精靈球 PLUS - + NES Controller NES 控制器 - + SNES Controller SNES 控制器 - + N64 Controller N64 控制器 - + Sega Genesis Mega Drive - + Start / Pause 開始 / 暫停 - + Z Z - + Control Stick 控制搖桿 - + C-Stick C 搖桿 - + Shake! 搖動！ - + [waiting] [等待中] - + New Profile 新增設定檔 - + Enter a profile name: 輸入設定檔名稱： - - + + Create Input Profile 建立輸入設定檔 - + The given profile name is not valid! 輸入的設定檔名稱無效！ - + Failed to create the input profile "%1" 建立輸入設定檔「%1」失敗 - + Delete Input Profile 刪除輸入設定檔 - + Failed to delete the input profile "%1" 刪除輸入設定檔「%1」失敗 - + Load Input Profile 載入輸入設定檔 - + Failed to load the input profile "%1" 載入輸入設定檔「%1」失敗 - + Save Input Profile 儲存輸入設定檔 - + Failed to save the input profile "%1" 儲存輸入設定檔「%1」失敗 @@ -3089,47 +3163,47 @@ To invert the axes, first move your joystick vertically, and then horizontally.< 出版商 - + Add-Ons 延伸模組 - + General 一般 - + System 系統 - + CPU CPU - + Graphics 圖形 - + Adv. Graphics 進階圖形 - + Audio 音訊 - + Input Profiles 输入配置文件 - + Properties 屬性 @@ -3850,7 +3924,12 @@ UUID: %2 设备名称 - + + Unsafe extended memory layout (8GB DRAM) + 不安全的内存布局扩展 (8GB DRAM) + + + System settings are available only when game is not running. 僅在遊戲未執行時才能修改使用者設定檔 @@ -4546,956 +4625,961 @@ Drag points to change position, or double-click table cells to edit values. GMainWindow - + <a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous data is collected</a> to help improve yuzu. <br/><br/>Would you like to share your usage data with us? 我們<a href='https://yuzu-emu.org/help/feature/telemetry/'>蒐集匿名的資料</a>以幫助改善 yuzu。<br/><br/>您願意和我們分享您的使用資料嗎？ - + Telemetry 遙測 - + Broken Vulkan Installation Detected 检测到 Vulkan 的安装已损坏 - + Vulkan initialization failed during boot.<br><br>Click <a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>here for instructions to fix the issue</a>. Vulkan 初始化失败。<br><br>点击<a href='https://yuzu-emu.org/wiki/faq/#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>这里</a>获取此问题的相关信息。 - + Loading Web Applet... 載入 Web Applet... - - + + Disable Web Applet 停用 Web Applet - + Disabling the web applet can lead to undefined behavior and should only be used with Super Mario 3D All-Stars. Are you sure you want to disable the web applet? (This can be re-enabled in the Debug settings.) 禁用 Web 应用程序可能会导致未知的行为，且只能在《超级马里奥 3D 全明星》中使用。您确定要禁用 Web 应用程序吗？ (您可以在调试选项中重新启用它。) - + The amount of shaders currently being built 目前正在建構的著色器數量 - + The current selected resolution scaling multiplier. 目前選擇的解析度縮放比例。 - + Current emulation speed. Values higher or lower than 100% indicate emulation is running faster or slower than a Switch. 目前的模擬速度。高於或低於 100% 表示比實際 Switch 執行速度更快或更慢。 - + How many frames per second the game is currently displaying. This will vary from game to game and scene to scene. 遊戲即時 FPS。會因遊戲和場景的不同而改變。 - + Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For full-speed emulation this should be at most 16.67 ms. 在不考慮幀數限制和垂直同步的情況下模擬一個 Switch 畫格的實際時間，若要全速模擬，此數值不得超過 16.67 毫秒。 - + &Clear Recent Files 清除最近的檔案(&C) - + Emulated mouse is enabled 已启用模拟鼠标 - + Real mouse input and mouse panning are incompatible. Please disable the emulated mouse in input advanced settings to allow mouse panning. 实体鼠标输入与鼠标平移不兼容。请在高级输入设置中禁用模拟鼠标以使用鼠标平移。 - + &Continue 繼續(&C) - + &Pause &暫停 - + yuzu is running a game TRANSLATORS: This string is shown to the user to explain why yuzu needs to prevent the computer from sleeping yuzu 正在執行中 - + Warning Outdated Game Format 過時遊戲格式警告 - + You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats yuzu supports, <a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. 此遊戲為解構的 ROM 資料夾格式，這是一種過時的格式，已被其他格式取代，如 NCA、NAX、XCI、NSP。解構的 ROM 目錄缺少圖示、中繼資料和更新支援。<br><br>有關 yuzu 支援的各種 Switch 格式說明，<a href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>請參閱我們的 wiki </a>。此訊息將不再顯示。 - - + + Error while loading ROM! 載入 ROM 時發生錯誤！ - + The ROM format is not supported. 此 ROM 格式不支援 - + An error occurred initializing the video core. 初始化視訊核心時發生錯誤 - + yuzu has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://yuzu-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. yuzu 在執行視訊核心時發生錯誤。 這可能是 GPU 驅動程序過舊造成的。 詳細資訊請查閱日誌檔案。 關於日誌檔案的更多資訊，請參考以下頁面：<a href='https://yuzu-emu.org/help/reference/log-files/'>如何上傳日誌檔案</a>。 - + Error while loading ROM! %1 %1 signifies a numeric error code. 載入 ROM 時發生錯誤！%1 - + %1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to redump your files.<br>You can refer to the yuzu wiki</a> or the yuzu Discord</a> for help. %1 signifies an error string. %1<br>請參閱 <a href='https://yuzu-emu.org/help/quickstart/'>yuzu 快速指引</a>以重新傾印檔案。<br>您可以前往 yuzu 的 wiki</a> 或 Discord 社群</a>以獲得幫助。 - + An unknown error occurred. Please see the log for more details. 發生未知錯誤，請檢視紀錄了解細節。 - + (64-bit) (64-bit) - + (32-bit) (32-bit) - + %1 %2 %1 is the title name. %2 indicates if the title is 64-bit or 32-bit %1 %2 - + Closing software... 正在关闭… - + Save Data 儲存資料 - + Mod Data 模組資料 - + Error Opening %1 Folder 開啟資料夾 %1 時發生錯誤 - - + + Folder does not exist! 資料夾不存在 - + Error Opening Transferable Shader Cache 開啟通用著色器快取位置時發生錯誤 - + Failed to create the shader cache directory for this title. 無法新增此遊戲的著色器快取資料夾。 - + Error Removing Contents 删除内容时出错 - + Error Removing Update 删除更新时出错 - + Error Removing DLC 删除 DLC 时出错 - + Remove Installed Game Contents? 删除已安装的游戏内容？ - + Remove Installed Game Update? 删除已安装的游戏更新？ - + Remove Installed Game DLC? 删除已安装的游戏 DLC 内容？ - + Remove Entry 移除項目 - - - - - - + + + + + + Successfully Removed 移除成功 - + Successfully removed the installed base game. 成功移除已安裝的遊戲。 - + The base game is not installed in the NAND and cannot be removed. 此遊戲並非安裝在內部儲存空間，因此無法移除。 - + Successfully removed the installed update. 成功移除已安裝的遊戲更新。 - + There is no update installed for this title. 此遊戲沒有已安裝的更新。 - + There are no DLC installed for this title. 此遊戲沒有已安裝的 DLC。 - + Successfully removed %1 installed DLC. 成功移除遊戲 %1 已安裝的 DLC。 - + Delete OpenGL Transferable Shader Cache? 刪除 OpenGL 模式的著色器快取？ - + Delete Vulkan Transferable Shader Cache? 刪除 Vulkan 模式的著色器快取？ - + Delete All Transferable Shader Caches? 刪除所有的著色器快取？ - + Remove Custom Game Configuration? 移除額外遊戲設定？ - + + Remove Cache Storage? + 移除缓存？ + + + Remove File 刪除檔案 - - + + Error Removing Transferable Shader Cache 刪除通用著色器快取時發生錯誤 - - + + A shader cache for this title does not exist. 此遊戲沒有著色器快取 - + Successfully removed the transferable shader cache. 成功刪除著色器快取。 - + Failed to remove the transferable shader cache. 刪除通用著色器快取失敗。 - + Error Removing Vulkan Driver Pipeline Cache 移除 Vulkan 驱动程序管线缓存时出错 - + Failed to remove the driver pipeline cache. 删除驱动程序管线缓存失败。 - - + + Error Removing Transferable Shader Caches 刪除通用著色器快取時發生錯誤 - + Successfully removed the transferable shader caches. 成功刪除通用著色器快取。 - + Failed to remove the transferable shader cache directory. 無法刪除著色器快取資料夾。 - - + + Error Removing Custom Configuration 移除額外遊戲設定時發生錯誤 - + A custom configuration for this title does not exist. 此遊戲沒有額外設定。 - + Successfully removed the custom game configuration. 成功移除額外遊戲設定。 - + Failed to remove the custom game configuration. 移除額外遊戲設定失敗。 - - + + RomFS Extraction Failed! RomFS 抽取失敗！ - + There was an error copying the RomFS files or the user cancelled the operation. 複製 RomFS 檔案時發生錯誤或使用者取消動作。 - + Full 全部 - + Skeleton 部分 - + Select RomFS Dump Mode 選擇RomFS傾印模式 - + Please select the how you would like the RomFS dumped.<br>Full will copy all of the files into the new directory while <br>skeleton will only create the directory structure. 請選擇如何傾印 RomFS。<br>「全部」會複製所有檔案到新資料夾中，而<br>「部分」只會建立資料夾結構。 - + There is not enough free space at %1 to extract the RomFS. Please free up space or select a different dump directory at Emulation > Configure > System > Filesystem > Dump Root %1 沒有足夠的空間用於抽取 RomFS。請確保有足夠的空間或於模擬 > 設定 >系統 >檔案系統 > 傾印根目錄中選擇其他資料夾。 - + Extracting RomFS... 抽取 RomFS 中... - - + + Cancel 取消 - + RomFS Extraction Succeeded! RomFS 抽取完成！ - + The operation completed successfully. 動作已成功完成 - - - - - + + + + + Create Shortcut 创建快捷方式 - + This will create a shortcut to the current AppImage. This may not work well if you update. Continue? 这将为当前的软件镜像创建快捷方式。但在其更新后，快捷方式可能无法正常使用。是否继续？ - + Cannot create shortcut on desktop. Path "%1" does not exist. 无法在桌面创建快捷方式。路径“ %1 ”不存在。 - + Cannot create shortcut in applications menu. Path "%1" does not exist and cannot be created. 无法在应用程序菜单中创建快捷方式。路径“ %1 ”不存在且无法被创建。 - + Create Icon 创建图标 - + Cannot create icon file. Path "%1" does not exist and cannot be created. 无法创建图标文件。路径“ %1 ”不存在且无法被创建。 - + Start %1 with the yuzu Emulator 使用 yuzu 启动 %1 - + Failed to create a shortcut at %1 在 %1 处创建快捷方式时失败 - + Successfully created a shortcut to %1 成功地在 %1 处创建快捷方式 - + Error Opening %1 開啟 %1 時發生錯誤 - + Select Directory 選擇資料夾 - + Properties 屬性 - + The game properties could not be loaded. 無法載入遊戲屬性 - + Switch Executable (%1);;All Files (*.*) %1 is an identifier for the Switch executable file extensions. Switch 執行檔 (%1);;所有檔案 (*.*) - + Load File 開啟檔案 - + Open Extracted ROM Directory 開啟已抽取的 ROM 資料夾 - + Invalid Directory Selected 選擇的資料夾無效 - + The directory you have selected does not contain a 'main' file. 選擇的資料夾未包含「main」檔案。 - + Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge Image (*.xci) 可安装的 Switch 檔案 (*.nca *.nsp *.xci);;Nintendo Content Archive (*.nca);;Nintendo Submission Package (*.nsp);;NX 卡帶映像 (*.xci) - + Install Files 安裝檔案 - + %n file(s) remaining 剩餘 %n 個檔案 - + Installing file "%1"... 正在安裝檔案「%1」... - - + + Install Results 安裝結果 - + To avoid possible conflicts, we discourage users from installing base games to the NAND. Please, only use this feature to install updates and DLC. 為了避免潛在的衝突，不建議將遊戲本體安裝至內部儲存空間。 此功能僅用於安裝遊戲更新和 DLC。 - + %n file(s) were newly installed 最近安裝了 %n 個檔案 - + %n file(s) were overwritten %n 個檔案被取代 - + %n file(s) failed to install %n 個檔案安裝失敗 - + System Application 系統應用程式 - + System Archive 系統檔案 - + System Application Update 系統應用程式更新 - + Firmware Package (Type A) 韌體包(A型) - + Firmware Package (Type B) 韌體包(B型) - + Game 遊戲 - + Game Update 遊戲更新 - + Game DLC 遊戲 DLC - + Delta Title Delta Title - + Select NCA Install Type... 選擇 NCA 安裝類型... - + Please select the type of title you would like to install this NCA as: (In most instances, the default 'Game' is fine.) 請選擇此 NCA 的安裝類型： （在多數情況下，選擇預設的「遊戲」即可。） - + Failed to Install 安裝失敗 - + The title type you selected for the NCA is invalid. 選擇的 NCA 安裝類型無效。 - + File not found 找不到檔案 - + File "%1" not found 找不到「%1」檔案 - + OK 確定 - - + + Hardware requirements not met 硬件不满足要求 - - + + Your system does not meet the recommended hardware requirements. Compatibility reporting has been disabled. 您的系统不满足运行 yuzu 推荐的推荐配置。兼容性报告已被禁用。 - + Missing yuzu Account 未設定 yuzu 帳號 - + In order to submit a game compatibility test case, you must link your yuzu account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration &gt; Web. 為了上傳相容性測試結果，您必須登入 yuzu 帳號。<br><br/>欲登入 yuzu 帳號請至模擬 &gt; 設定 &gt; 網路。 - + Error opening URL 開啟 URL 時發生錯誤 - + Unable to open the URL "%1". 無法開啟 URL：「%1」。 - + TAS Recording TAS 錄製 - + Overwrite file of player 1? 覆寫玩家 1 的檔案？ - + Invalid config detected 偵測到無效設定 - + Handheld controller can't be used on docked mode. Pro controller will be selected. 掌機手把無法在主機模式中使用。將會選擇 Pro 手把。 - - + + Amiibo Amiibo - - + + The current amiibo has been removed 当前的 Amiibo 已被移除。 - + Error 错误 - - + + The current game is not looking for amiibos 当前游戏并没有在寻找 Amiibos - + Amiibo File (%1);; All Files (*.*) Amiibo 檔案 (%1);; 所有檔案 (*.*) - + Load Amiibo 開啟 Amiibo - + Error loading Amiibo data 載入 Amiibo 資料時發生錯誤 - + The selected file is not a valid amiibo 选择的文件并不是有效的 amiibo - + The selected file is already on use 选择的文件已在使用中 - + An unknown error occurred 发生了未知错误 - + Capture Screenshot 截圖 - + PNG Image (*.png) PNG 圖片 (*.png) - + TAS state: Running %1/%2 TAS 狀態：正在執行 %1/%2 - + TAS state: Recording %1 TAS 狀態：正在錄製 %1 - + TAS state: Idle %1/%2 TAS 狀態：閒置 %1/%2 - + TAS State: Invalid TAS 狀態：無效 - + &Stop Running &停止執行 - + &Start 開始(&S) - + Stop R&ecording 停止錄製 - + R&ecord 錄製 (&E) - + Building: %n shader(s) 正在編譯 %n 個著色器檔案 - + Scale: %1x %1 is the resolution scaling factor 縮放比例：%1x - + Speed: %1% / %2% 速度：%1% / %2% - + Speed: %1% 速度：%1% - + Game: %1 FPS (Unlocked) 遊戲: %1 FPS（未限制） - + Game: %1 FPS 遊戲：%1 FPS - + Frame: %1 ms 畫格延遲：%1 ms - + GPU NORMAL GPU 一般效能 - + GPU HIGH GPU 高效能 - + GPU EXTREME GPU 最高效能 - + GPU ERROR GPU 錯誤 - + DOCKED - 主机模式 + 主機模式 - + HANDHELD - 掌机模式 + 掌機模式 - + OPENGL OPENGL - + VULKAN VULKAN - + NULL NULL - + NEAREST 最近鄰域 - - + + BILINEAR 雙線性 - + BICUBIC 雙三次 - + GAUSSIAN 高斯 - + SCALEFORCE 強制縮放 - + FSR FSR - - + + NO AA 抗鋸齒關 - + FXAA FXAA - + SMAA SMAA - + VOLUME: MUTE 音量: 静音 - + VOLUME: %1% Volume percentage (e.g. 50%) 音量: %1% - + Confirm Key Rederivation 確認重新產生金鑰 - + You are about to force rederive all of your keys. If you do not know what this means or what you are doing, this is a potentially destructive action. @@ -5511,37 +5595,37 @@ This will delete your autogenerated key files and re-run the key derivation modu 這將刪除您自動產生的金鑰檔案並重新執行產生金鑰模組。 - + Missing fuses 遺失項目 - + - Missing BOOT0 - 遺失 BOOT0 - + - Missing BCPKG2-1-Normal-Main - 遺失 BCPKG2-1-Normal-Main - + - Missing PRODINFO - 遺失 PRODINFO - + Derivation Components Missing 遺失產生元件 - + Encryption keys are missing. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games.<br><br><small>(%1)</small> 缺少加密金鑰。 <br>請按照<a href='https://yuzu-emu.org/help/quickstart/'>《Yuzu快速入門指南》來取得所有金鑰、韌體、遊戲<br><br><small>(%1)。 - + Deriving keys... This may take up to a minute depending on your system's performance. @@ -5550,39 +5634,49 @@ on your system's performance. 您的系統效能。 - + Deriving Keys 產生金鑰 - + + System Archive Decryption Failed + 系统固件解密失败 + + + + Encryption keys failed to decrypt firmware. <br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu quickstart guide</a> to get all your keys, firmware and games. + 当前密钥无法解密系统固件。<br>请查看<a href='https://yuzu-emu.org/help/quickstart/'>yuzu 快速导航</a>以获得你的密钥、固件和游戏。 + + + Select RomFS Dump Target 選擇 RomFS 傾印目標 - + Please select which RomFS you would like to dump. 請選擇希望傾印的 RomFS。 - + Are you sure you want to close yuzu? 您確定要關閉 yuzu 嗎? - - - + + + yuzu yuzu - + Are you sure you want to stop the emulation? Any unsaved progress will be lost. 您確定要停止模擬嗎？未儲存的進度將會遺失。 - + The currently running application has requested yuzu to not exit. Would you like to bypass this and exit anyway? @@ -5594,44 +5688,44 @@ Would you like to bypass this and exit anyway? GRenderWindow - - + + OpenGL not available! 無法使用 OpenGL 模式！ - + OpenGL shared contexts are not supported. 不支持 OpenGL 共享上下文。 - + yuzu has not been compiled with OpenGL support. yuzu 未以支援 OpenGL 的方式編譯。 + - Error while initializing OpenGL! 初始化 OpenGL 時發生錯誤！ - + Your GPU may not support OpenGL, or you do not have the latest graphics driver. 您的 GPU 可能不支援 OpenGL，或是未安裝最新的圖形驅動程式 - + Error while initializing OpenGL 4.6! 初始化 OpenGL 4.6 時發生錯誤！ - + Your GPU may not support OpenGL 4.6, or you do not have the latest graphics driver.<br><br>GL Renderer:<br>%1 您的 GPU 可能不支援 OpenGL 4.6，或是未安裝最新的圖形驅動程式<br><br>GL 渲染器：<br>%1 - + Your GPU may not support one or more required OpenGL extensions. Please ensure you have the latest graphics driver.<br><br>GL Renderer:<br>%1<br><br>Unsupported extensions:<br>%2 您的 GPU 可能不支援某些必需的 OpenGL 功能。請確保您已安裝最新的圖形驅動程式。<br><br>GL 渲染器：<br>%1<br><br>不支援的功能：<br>%2 @@ -5690,117 +5784,122 @@ Would you like to bypass this and exit anyway? + Remove Cache Storage + 移除缓存 + + + Remove OpenGL Pipeline Cache 刪除 OpenGL 著色器管線快取 - + Remove Vulkan Pipeline Cache 刪除 Vulkan 著色器管線快取 - + Remove All Pipeline Caches 刪除所有著色器管線快取 - + Remove All Installed Contents 移除所有安裝項目 - + Dump RomFS 傾印 RomFS - + Dump RomFS to SDMC 傾印 RomFS 到 SDMC - + Copy Title ID to Clipboard 複製遊戲 ID 到剪貼簿 - + Navigate to GameDB entry 檢視遊戲相容性報告 - + Create Shortcut 创建快捷方式 - + Add to Desktop 添加到桌面 - + Add to Applications Menu 添加到应用程序菜单 - + Properties 屬性 - + Scan Subfolders 包含子資料夾 - + Remove Game Directory 移除遊戲資料夾 - + ▲ Move Up ▲ 向上移動 - + ▼ Move Down ▼ 向下移動 - + Open Directory Location 開啟資料夾位置 - + Clear 清除 - + Name 名稱 - + Compatibility 相容性 - + Add-ons 延伸模組 - + File type 檔案格式 - + Size 大小 @@ -5871,7 +5970,7 @@ Would you like to bypass this and exit anyway? GameListPlaceholder - + Double-click to add a new folder to the game list 連點兩下以新增資料夾至遊戲清單 @@ -5884,12 +5983,12 @@ Would you like to bypass this and exit anyway? %1 / %n 個結果 - + Filter: 搜尋： - + Enter pattern to filter 輸入文字以搜尋 @@ -5980,12 +6079,11 @@ Debug Message: Hotkeys - + Audio Mute/Unmute 静音/关闭静音 - @@ -6007,111 +6105,112 @@ Debug Message: + Main Window 主窗口 - + Audio Volume Down 调低音量 - + Audio Volume Up 调高音量 - + Capture Screenshot 截圖 - + Change Adapting Filter 更改窗口滤镜 - + Change Docked Mode 更改运行模式 - + Change GPU Accuracy 更改 GPU 精度 - + Continue/Pause Emulation 继续/暂停模拟 - + Exit Fullscreen 退出全屏 - + Exit yuzu 退出 yuzu - + Fullscreen 全屏 - + Load File 開啟檔案 - + Load/Remove Amiibo 加载/移除 Amiibo - + Restart Emulation 重新启动模拟 - + Stop Emulation 停止模拟 - + TAS Record TAS 录制 - + TAS Reset 重设 TAS - + TAS Start/Stop TAS 开始/停止 - + Toggle Filter Bar 切换搜索栏 - + Toggle Framerate Limit 切换帧率限制 - + Toggle Mouse Panning 切换鼠标平移 - + Toggle Status Bar 切换状态栏 @@ -6340,7 +6439,7 @@ Debug Message: &Multiplayer - 多人游戏 (&M) + 多人遊戲 (&M) @@ -6803,7 +6902,7 @@ p, li { white-space: pre-wrap; } PlayerControlPreview - + START/PAUSE 開始 / 暫停 @@ -6853,21 +6952,21 @@ p, li { white-space: pre-wrap; } - + Shift Shift - + Ctrl Ctrl - + Alt Alt @@ -6875,8 +6974,8 @@ p, li { white-space: pre-wrap; } - - + + [not set] [未設定] @@ -6891,10 +6990,10 @@ p, li { white-space: pre-wrap; } - - - - + + + + Axis %1%2 Axis %1%2 @@ -6908,163 +7007,163 @@ p, li { white-space: pre-wrap; } - - - + + + [unknown] [未知] - - + + Left 左 - - + + Right 右 - - + + Down 下 - - + + Up 上 - + Z Z - + R R - + L L - + A A - + B B - + X X - + Y Y - + Start 開始 - + L1 L1 - + L2 L2 - + L3 L3 - + R1 R1 - + R2 R2 - + R3 R3 - + Circle ○ - + Cross ╳ - + Square □ - + Triangle Δ - + Share 分享 - + Options 選項 - + [undefined] [未指定] @@ -7075,7 +7174,7 @@ p, li { white-space: pre-wrap; } - + [invalid] [無效] @@ -7089,21 +7188,19 @@ p, li { white-space: pre-wrap; } - - - + %1%2Axis %3 %1%2軸 %3 - + %1%2Axis %3,%4,%5 %1%2軸 %3,%4,%5 - + %1%2Motion %3 %1%2體感 %3 @@ -7115,106 +7212,112 @@ p, li { white-space: pre-wrap; } - + [unused] [未使用] - + ZR ZR - + ZL ZL - + SR SR - + SL SL - + Stick L 左摇杆 - + Stick R 右摇杆 - + Plus ＋ - + Minus － - - + + Home HOME - + Capture 截圖 - + Touch 觸控 - + Wheel Indicates the mouse wheel 滑鼠滾輪 - + Backward 後退 - + Forward 前進 - + Task 任務鍵 - + Extra 額外按鍵 - + %1%2%3%4 %1%2%3%4 - - + + %1%2%3Hat %4 %1%2%3 控制器 %4 - - + + + %1%2%3Axis %4 + %1%2%3轴 %4 + + + + %1%2%3Button %4 %1%2%3 按键 %4 @@ -7635,73 +7738,73 @@ Please try again or contact the developer of the software. 使用者 - + Profile Creator 创建用户 - - + + Profile Selector 設定檔選擇 - + Profile Icon Editor 修改用户图像 - + Profile Nickname Editor 修改用户昵称 - + Who will receive the points? 谁将获得黄金点数？ - + Who is using Nintendo eShop? 谁正在使用任天堂 eShop？ - + Who is making this purchase? 是谁购买了这个？ - + Who is posting? 谁在发帖？ - + Select a user to link to a Nintendo Account. 选择要链接到任天堂账户的用户。 - + Change settings for which user? 要更改哪个用户的设置？ - + Format data for which user? 要为哪个用户格式化数据？ - + Which user will be transferred to another console? 哪个用户将被转移到另一个控制台？ - + Send save data for which user? 要为哪个用户发送保存数据？ - + Select a user: 選擇一位使用者： From 584e8b5c52db95a92f818a0fc1b2a64f8a42e524 Mon Sep 17 00:00:00 2001 From: kkoniuszy <120419423+kkoniuszy@users.noreply.github.com> Date: Thu, 1 Jun 2023 17:21:22 +0200 Subject: [PATCH 0438/1181] host_memory: merge adjacent placeholder mappings on Linux Track the private anonymous placeholder mappings created by Unmap() and wherever possible, replace existing placeholders with larger ones instead of creating many small ones. This helps with the buildup of mappings in /proc/YUZU_PID/maps after a longer gaming session, improving stability without having to increase vm.max_map_count to a ridiculous value. The amount of placeholder mappings will no longer outgrow the amount of actual memfd mappings in cases of high memory fragmentation. --- src/common/host_memory.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp index 8e4f1f97a..01457d8c6 100644 --- a/src/common/host_memory.cpp +++ b/src/common/host_memory.cpp @@ -14,6 +14,7 @@ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif +#include #include #include #include @@ -415,6 +416,7 @@ public: madvise(virtual_base, virtual_size, MADV_HUGEPAGE); #endif + placeholders.add({0, virtual_size}); good = true; } @@ -423,6 +425,10 @@ public: } void Map(size_t virtual_offset, size_t host_offset, size_t length) { + { + std::scoped_lock lock{placeholder_mutex}; + placeholders.subtract({virtual_offset, virtual_offset + length}); + } void* ret = mmap(virtual_base + virtual_offset, length, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, fd, host_offset); @@ -433,6 +439,19 @@ public: // The method name is wrong. We're still talking about the virtual range. // We don't want to unmap, we want to reserve this memory. + { + std::scoped_lock lock{placeholder_mutex}; + auto it = placeholders.find({virtual_offset - 1, virtual_offset + length + 1}); + + if (it != placeholders.end()) { + size_t prev_upper = virtual_offset + length; + virtual_offset = std::min(virtual_offset, it->lower()); + length = std::max(it->upper(), prev_upper) - virtual_offset; + } + + placeholders.add({virtual_offset, virtual_offset + length}); + } + void* ret = mmap(virtual_base + virtual_offset, length, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0); ASSERT_MSG(ret != MAP_FAILED, "mmap failed: {}", strerror(errno)); @@ -476,6 +495,9 @@ private: } int fd{-1}; // memfd file descriptor, -1 is the error value of memfd_create + + boost::icl::interval_set placeholders; ///< Mapped placeholders + std::mutex placeholder_mutex; ///< Mutex for placeholders }; #else // ^^^ Linux ^^^ vvv Generic vvv From 206fe987e1f5aebcdfb9857714b630db598073ac Mon Sep 17 00:00:00 2001 From: Baptiste Marie Date: Fri, 2 Jun 2023 16:49:25 +0200 Subject: [PATCH 0439/1181] issue_template: Add link to website, Getting Log Files --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 1405ccce8..a28f0473f 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -43,7 +43,7 @@ body: id: log attributes: label: Log File - description: A log file will help our developers to better diagnose and fix the issue. + description: A log file will help our developers to better diagnose and fix the issue. Instructions can be found [here](https://yuzu-emu.org/help/reference/log-files). validations: required: true - type: textarea From 1fc47361a12afd91d8ea0b76378e0b3d4feb93a6 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Fri, 2 Jun 2023 18:07:34 -0400 Subject: [PATCH 0440/1181] texture_cache: Fix incorrect logic for AccelerateDMA --- src/video_core/texture_cache/texture_cache.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 2cf082c5d..c7f7448e9 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -850,15 +850,11 @@ void TextureCache

::PopAsyncFlushes() { template ImageId TextureCache

::DmaImageId(const Tegra::DMA::ImageOperand& operand, bool is_upload) { const ImageInfo dst_info(operand); - const ImageId dst_id = FindDMAImage(dst_info, operand.address); - if (!dst_id) { - return NULL_IMAGE_ID; - } - auto& image = slot_images[dst_id]; - if (False(image.flags & ImageFlagBits::GpuModified)) { - // No need to waste time on an image that's synced with guest + const ImageId image_id = FindDMAImage(dst_info, operand.address); + if (!image_id) { return NULL_IMAGE_ID; } + auto& image = slot_images[image_id]; if (!is_upload && !image.info.dma_downloaded) { // Force a full sync. image.info.dma_downloaded = true; @@ -868,7 +864,7 @@ ImageId TextureCache

::DmaImageId(const Tegra::DMA::ImageOperand& operand, boo if (!base) { return NULL_IMAGE_ID; } - return dst_id; + return image_id; } template From 5de8ee7bba12690d736abd457419d6829c759b3a Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 29 Dec 2022 23:25:03 -0800 Subject: [PATCH 0441/1181] cmake: Integrate submoduled LLVM & fixes for Android. --- CMakeLists.txt | 56 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7276ac9dd..bcd88784b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modul include(DownloadExternals) include(CMakeDependentOption) include(CTest) +include(FetchContent) # Set bundled sdl2/qt as dependent options. # OFF by default, but if ENABLE_SDL2 and MSVC are true then ON @@ -19,7 +20,7 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" ON # On Linux system SDL2 is likely to be lacking HIDAPI support which have drawbacks but is needed for SDL motion CMAKE_DEPENDENT_OPTION(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" ON "ENABLE_SDL2;NOT MSVC" OFF) -option(ENABLE_LIBUSB "Enable the use of LibUSB" ON) +option(ENABLE_LIBUSB "Enable the use of LibUSB" "NOT ${ANDROID}") option(ENABLE_OPENGL "Enable OpenGL" ON) mark_as_advanced(FORCE ENABLE_OPENGL) @@ -48,7 +49,7 @@ option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}") option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON) -option(YUZU_ROOM "Compile LDN room server" ON) +option(YUZU_ROOM "Compile LDN room server" "NOT ${ANDROID}") CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile Windows crash dump (Minidump) support" OFF "WIN32" OFF) @@ -60,7 +61,56 @@ option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF) CMAKE_DEPENDENT_OPTION(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "NOT WIN32" OFF) +# On Android, fetch and compile libcxx before doing anything else +if (ANDROID) + set(CMAKE_SKIP_INSTALL_RULES ON) + set(LLVM_VERSION "15.0.6") + + # Note: even though libcxx and libcxxabi have separate releases on the project page, + # the separated releases cannot be compiled. Only in-tree builds work. Therefore we + # must fetch the source release for the entire llvm tree. + FetchContent_Declare(llvm + URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz" + URL_HASH SHA256=9d53ad04dc60cb7b30e810faf64c5ab8157dadef46c8766f67f286238256ff92 + TLS_VERIFY TRUE + ) + FetchContent_MakeAvailable(llvm) + + # libcxx has support for most of the range library, but it's gated behind a flag: + add_compile_definitions(_LIBCPP_ENABLE_EXPERIMENTAL) + + # Disable standard header inclusion + set(ANDROID_STL "none") + + # libcxxabi + set(LIBCXXABI_INCLUDE_TESTS OFF) + set(LIBCXXABI_ENABLE_SHARED FALSE) + set(LIBCXXABI_ENABLE_STATIC TRUE) + set(LIBCXXABI_LIBCXX_INCLUDES "${LIBCXX_TARGET_INCLUDE_DIRECTORY}" CACHE STRING "" FORCE) + add_subdirectory("${llvm_SOURCE_DIR}/libcxxabi" "${llvm_BINARY_DIR}/libcxxabi") + link_libraries(cxxabi_static) + + # libcxx + set(LIBCXX_ABI_NAMESPACE "__ndk1" CACHE STRING "" FORCE) + set(LIBCXX_CXX_ABI "libcxxabi") + set(LIBCXX_INCLUDE_TESTS OFF) + set(LIBCXX_INCLUDE_BENCHMARKS OFF) + set(LIBCXX_INCLUDE_DOCS OFF) + set(LIBCXX_ENABLE_SHARED FALSE) + set(LIBCXX_ENABLE_STATIC TRUE) + set(LIBCXX_ENABLE_ASSERTIONS FALSE) + add_subdirectory("${llvm_SOURCE_DIR}/libcxx" "${llvm_BINARY_DIR}/libcxx") + set_target_properties(cxx-headers PROPERTIES INTERFACE_COMPILE_OPTIONS "-isystem${CMAKE_BINARY_DIR}/${LIBCXX_INSTALL_INCLUDE_DIR}") + link_libraries(cxx_static cxx-headers) +endif() + if (YUZU_USE_BUNDLED_VCPKG) + if (ANDROID) + set(VCPKG_TARGET_TRIPLET "arm64-android") + set(ENV{ANDROID_NDK_HOME} "${ANDROID_NDK}") + list(APPEND VCPKG_MANIFEST_FEATURES "android") + endif() + if (YUZU_TESTS) list(APPEND VCPKG_MANIFEST_FEATURES "yuzu-tests") endif() @@ -457,7 +507,7 @@ set(FFmpeg_COMPONENTS avutil swscale) -if (UNIX AND NOT APPLE) +if (UNIX AND NOT APPLE AND NOT ANDROID) find_package(PkgConfig REQUIRED) pkg_check_modules(LIBVA libva) endif() From 851b1008a881010b90002f4af9d0a4ac36710fea Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 30 Dec 2022 00:29:53 -0800 Subject: [PATCH 0442/1181] cmake: Integrate bundled FFmpeg for Android. --- CMakeModules/DownloadExternals.cmake | 7 ++- externals/ffmpeg/CMakeLists.txt | 64 ++++++++++++++++++++++++---- src/video_core/CMakeLists.txt | 2 +- 3 files changed, 63 insertions(+), 10 deletions(-) diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index 8fe5ba48d..814069f0b 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake @@ -7,6 +7,7 @@ # prefix_var: name of a variable which will be set with the path to the extracted contents function(download_bundled_external remote_path lib_name prefix_var) +set(package_base_url "https://github.com/yuzu-emu/") set(package_repo "no_platform") set(package_extension "no_platform") if (WIN32) @@ -15,10 +16,14 @@ if (WIN32) elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") set(package_repo "ext-linux-bin/raw/main/") set(package_extension ".tar.xz") +elseif (ANDROID) + set(package_base_url "https://gitlab.com/tertius42/") + set(package_repo "ext-android-bin/-/raw/main/") + set(package_extension ".tar.xz") #ffmpeg/ffmpeg-android-20221229.tar.xz") else() message(FATAL_ERROR "No package available for this platform") endif() -set(package_url "https://github.com/yuzu-emu/${package_repo}") +set(package_url "${package_base_url}${package_repo}") set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}") if (NOT EXISTS "${prefix}") diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index 03fad0778..093616629 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2021 yuzu Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later -if (NOT WIN32) +if (NOT WIN32 AND NOT ANDROID) # Build FFmpeg from externals message(STATUS "Using FFmpeg from externals") @@ -44,10 +44,12 @@ if (NOT WIN32) endforeach() find_package(PkgConfig REQUIRED) - pkg_check_modules(LIBVA libva) - pkg_check_modules(CUDA cuda) - pkg_check_modules(FFNVCODEC ffnvcodec) - pkg_check_modules(VDPAU vdpau) + if (NOT ANDROID) + pkg_check_modules(LIBVA libva) + pkg_check_modules(CUDA cuda) + pkg_check_modules(FFNVCODEC ffnvcodec) + pkg_check_modules(VDPAU vdpau) + endif() set(FFmpeg_HWACCEL_LIBRARIES) set(FFmpeg_HWACCEL_FLAGS) @@ -121,6 +123,26 @@ if (NOT WIN32) list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vdpau) endif() + find_program(BASH_PROGRAM bash REQUIRED) + + set(FFmpeg_CROSS_COMPILE_FLAGS "") + if (ANDROID) + string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" FFmpeg_HOST_SYSTEM_NAME) + set(TOOLCHAIN "${ANDROID_NDK}/toolchains/llvm/prebuilt/${FFmpeg_HOST_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}") + set(SYSROOT "${TOOLCHAIN}/sysroot") + set(FFmpeg_CPU "armv8-a") + list(APPEND FFmpeg_CROSS_COMPILE_FLAGS + --arch=arm64 + #--cpu=${FFmpeg_CPU} + --enable-cross-compile + --cross-prefix=${TOOLCHAIN}/bin/aarch64-linux-android- + --sysroot=${SYSROOT} + --target-os=android + --extra-ldflags="--ld-path=${TOOLCHAIN}/bin/ld.lld" + --extra-ldflags="-nostdlib" + ) + endif() + # `configure` parameters builds only exactly what yuzu needs from FFmpeg # `--disable-vdpau` is needed to avoid linking issues set(FFmpeg_CC ${CMAKE_C_COMPILER_LAUNCHER} ${CMAKE_C_COMPILER}) @@ -129,7 +151,7 @@ if (NOT WIN32) OUTPUT ${FFmpeg_MAKEFILE} COMMAND - /bin/bash ${FFmpeg_PREFIX}/configure + ${BASH_PROGRAM} ${FFmpeg_PREFIX}/configure --disable-avdevice --disable-avformat --disable-doc @@ -146,12 +168,14 @@ if (NOT WIN32) --cc="${FFmpeg_CC}" --cxx="${FFmpeg_CXX}" ${FFmpeg_HWACCEL_FLAGS} + ${FFmpeg_CROSS_COMPILE_FLAGS} WORKING_DIRECTORY ${FFmpeg_BUILD_DIR} ) unset(FFmpeg_CC) unset(FFmpeg_CXX) unset(FFmpeg_HWACCEL_FLAGS) + unset(FFmpeg_CROSS_COMPILE_FLAGS) # Workaround for Ubuntu 18.04's older version of make not being able to call make as a child # with context of the jobserver. Also helps ninja users. @@ -197,7 +221,32 @@ if (NOT WIN32) else() message(FATAL_ERROR "FFmpeg not found") endif() -else(WIN32) +elseif(ANDROID) + # Use yuzu FFmpeg binaries + set(FFmpeg_EXT_NAME "ffmpeg-android-v4.4.LTS") + set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") + download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") + set(FFmpeg_FOUND YES) + set(FFmpeg_INCLUDE_DIR "${FFmpeg_PATH}/include" CACHE PATH "Path to FFmpeg headers" FORCE) + set(FFmpeg_LIBRARY_DIR "${FFmpeg_PATH}/lib" CACHE PATH "Path to FFmpeg library directory" FORCE) + set(FFmpeg_LDFLAGS "" CACHE STRING "FFmpeg linker flags" FORCE) + set(FFmpeg_LIBRARIES + ${FFmpeg_LIBRARY_DIR}/libavcodec.so + ${FFmpeg_LIBRARY_DIR}/libavdevice.so + ${FFmpeg_LIBRARY_DIR}/libavfilter.so + ${FFmpeg_LIBRARY_DIR}/libavformat.so + ${FFmpeg_LIBRARY_DIR}/libavutil.so + ${FFmpeg_LIBRARY_DIR}/libswresample.so + ${FFmpeg_LIBRARY_DIR}/libswscale.so + ${FFmpeg_LIBRARY_DIR}/libvpx.a + ${FFmpeg_LIBRARY_DIR}/libx264.a + CACHE PATH "Paths to FFmpeg libraries" FORCE) + # exported variables + set(FFmpeg_PATH "${FFmpeg_PATH}" PARENT_SCOPE) + set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE) + set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE) + set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE) +elseif(WIN32) # Use yuzu FFmpeg binaries set(FFmpeg_EXT_NAME "ffmpeg-5.1.3") set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") @@ -206,7 +255,6 @@ else(WIN32) set(FFmpeg_INCLUDE_DIR "${FFmpeg_PATH}/include" CACHE PATH "Path to FFmpeg headers" FORCE) set(FFmpeg_LIBRARY_DIR "${FFmpeg_PATH}/bin" CACHE PATH "Path to FFmpeg library directory" FORCE) set(FFmpeg_LDFLAGS "" CACHE STRING "FFmpeg linker flags" FORCE) - set(FFmpeg_DLL_DIR "${FFmpeg_PATH}/bin" CACHE PATH "Path to FFmpeg dll's" FORCE) set(FFmpeg_LIBRARIES ${FFmpeg_LIBRARY_DIR}/swscale.lib ${FFmpeg_LIBRARY_DIR}/avcodec.lib diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 308d013d6..027259f57 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -281,7 +281,7 @@ create_target_directory_groups(video_core) target_link_libraries(video_core PUBLIC common core) target_link_libraries(video_core PUBLIC glad shader_recompiler stb) -if (YUZU_USE_BUNDLED_FFMPEG AND NOT WIN32) +if (YUZU_USE_BUNDLED_FFMPEG AND NOT (WIN32 OR ANDROID)) add_dependencies(video_core ffmpeg-build) endif() From bb2cbbfba3ba255c11953f2bcca912046519cfb1 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 17 Dec 2022 23:25:46 -0800 Subject: [PATCH 0443/1181] android: Add Citra frontend. --- src/android/.gitignore | 62 ++ src/android/app/build.gradle | 163 ++++ src/android/app/proguard-rules.pro | 21 + .../citra_emu/ExampleInstrumentedTest.java | 3 + src/android/app/src/main/AndroidManifest.xml | 99 ++ .../org/citra/citra_emu/CitraApplication.java | 56 ++ .../org/citra/citra_emu/NativeLibrary.java | 631 +++++++++++++ .../activities/CustomFilePickerActivity.java | 38 + .../activities/EmulationActivity.java | 755 +++++++++++++++ .../citra/citra_emu/adapters/GameAdapter.java | 247 +++++ .../citra/citra_emu/applets/MiiSelector.java | 122 +++ .../citra_emu/applets/SoftwareKeyboard.java | 264 ++++++ .../camera/StillImageCameraHelper.java | 65 ++ .../citra_emu/dialogs/MotionAlertDialog.java | 140 +++ .../DiskShaderCacheProgress.java | 138 +++ .../features/cheats/model/Cheat.java | 57 ++ .../features/cheats/model/CheatEngine.java | 13 + .../cheats/model/CheatsViewModel.java | 177 ++++ .../cheats/ui/CheatDetailsFragment.java | 174 ++++ .../features/cheats/ui/CheatListFragment.java | 46 + .../features/cheats/ui/CheatViewHolder.java | 56 ++ .../features/cheats/ui/CheatsActivity.java | 161 ++++ .../features/cheats/ui/CheatsAdapter.java | 72 ++ .../settings/model/BooleanSetting.java | 23 + .../features/settings/model/FloatSetting.java | 23 + .../features/settings/model/IntSetting.java | 23 + .../features/settings/model/Setting.java | 42 + .../settings/model/SettingSection.java | 55 ++ .../features/settings/model/Settings.java | 132 +++ .../settings/model/StringSetting.java | 23 + .../settings/model/view/CheckBoxSetting.java | 80 ++ .../settings/model/view/DateTimeSetting.java | 40 + .../settings/model/view/HeaderSetting.java | 14 + .../model/view/InputBindingSetting.java | 382 ++++++++ .../settings/model/view/PremiumHeader.java | 12 + .../view/PremiumSingleChoiceSetting.java | 59 ++ .../settings/model/view/SettingsItem.java | 107 +++ .../model/view/SingleChoiceSetting.java | 60 ++ .../settings/model/view/SliderSetting.java | 101 ++ .../model/view/StringSingleChoiceSetting.java | 82 ++ .../settings/model/view/SubmenuSetting.java | 21 + .../settings/ui/SettingsActivity.java | 215 +++++ .../ui/SettingsActivityPresenter.java | 124 +++ .../settings/ui/SettingsActivityView.java | 103 ++ .../features/settings/ui/SettingsAdapter.java | 487 ++++++++++ .../settings/ui/SettingsFragment.java | 136 +++ .../ui/SettingsFragmentPresenter.java | 416 +++++++++ .../settings/ui/SettingsFragmentView.java | 78 ++ .../settings/ui/SettingsFrameLayout.java | 48 + .../viewholder/CheckBoxSettingViewHolder.java | 54 ++ .../ui/viewholder/DateTimeViewHolder.java | 47 + .../ui/viewholder/HeaderViewHolder.java | 32 + .../InputBindingSettingViewHolder.java | 55 ++ .../ui/viewholder/PremiumViewHolder.java | 57 ++ .../ui/viewholder/SettingViewHolder.java | 49 + .../ui/viewholder/SingleChoiceViewHolder.java | 76 ++ .../ui/viewholder/SliderViewHolder.java | 45 + .../ui/viewholder/SubmenuViewHolder.java | 45 + .../features/settings/utils/SettingsFile.java | 341 +++++++ .../fragments/CustomFilePickerFragment.java | 120 +++ .../fragments/EmulationFragment.java | 380 ++++++++ .../java/org/citra/citra_emu/model/Game.java | 76 ++ .../citra/citra_emu/model/GameDatabase.java | 276 ++++++ .../citra/citra_emu/model/GameProvider.java | 138 +++ .../citra/citra_emu/overlay/InputOverlay.java | 878 ++++++++++++++++++ .../overlay/InputOverlayDrawableButton.java | 122 +++ .../overlay/InputOverlayDrawableDpad.java | 193 ++++ .../overlay/InputOverlayDrawableJoystick.java | 264 ++++++ .../citra_emu/ui/DividerItemDecoration.java | 130 +++ .../ui/TwoPaneOnBackPressedCallback.java | 37 + .../citra/citra_emu/ui/main/MainActivity.java | 267 ++++++ .../citra_emu/ui/main/MainPresenter.java | 82 ++ .../org/citra/citra_emu/ui/main/MainView.java | 25 + .../ui/platform/PlatformGamesFragment.java | 86 ++ .../ui/platform/PlatformGamesPresenter.java | 42 + .../ui/platform/PlatformGamesView.java | 21 + .../org/citra/citra_emu/utils/Action1.java | 5 + .../citra_emu/utils/AddDirectoryHelper.java | 38 + .../java/org/citra/citra_emu/utils/BiMap.java | 22 + .../citra/citra_emu/utils/BillingManager.java | 215 +++++ .../utils/ControllerMappingHelper.java | 66 ++ .../utils/DirectoryInitialization.java | 186 ++++ .../utils/DirectoryStateReceiver.java | 22 + .../utils/EmulationMenuSettings.java | 78 ++ .../citra_emu/utils/FileBrowserHelper.java | 73 ++ .../org/citra/citra_emu/utils/FileUtil.java | 37 + .../citra_emu/utils/ForegroundService.java | 63 ++ .../utils/GameIconRequestHandler.java | 27 + .../java/org/citra/citra_emu/utils/Log.java | 39 + .../citra_emu/utils/PermissionsHandler.java | 35 + .../PicassoRoundedCornersTransformation.java | 45 + .../citra/citra_emu/utils/PicassoUtils.java | 57 ++ .../citra/citra_emu/utils/StartupHandler.java | 45 + .../org/citra/citra_emu/utils/ThemeUtil.java | 34 + .../citra_emu/viewholders/GameViewHolder.java | 46 + .../src/main/res/animator/settings_enter.xml | 28 + .../src/main/res/animator/settings_exit.xml | 28 + .../main/res/animator/settings_pop_enter.xml | 28 + .../main/res/animator/setttings_pop_exit.xml | 27 + .../src/main/res/drawable-hdpi/button_a.png | Bin 0 -> 10674 bytes .../res/drawable-hdpi/button_a_pressed.png | Bin 0 -> 10738 bytes .../src/main/res/drawable-hdpi/button_b.png | Bin 0 -> 9479 bytes .../res/drawable-hdpi/button_b_pressed.png | Bin 0 -> 9555 bytes .../src/main/res/drawable-hdpi/button_l.png | Bin 0 -> 2738 bytes .../res/drawable-hdpi/button_l_pressed.png | Bin 0 -> 2795 bytes .../src/main/res/drawable-hdpi/button_r.png | Bin 0 -> 5680 bytes .../res/drawable-hdpi/button_r_pressed.png | Bin 0 -> 5784 bytes .../main/res/drawable-hdpi/button_select.png | Bin 0 -> 13280 bytes .../drawable-hdpi/button_select_pressed.png | Bin 0 -> 13344 bytes .../main/res/drawable-hdpi/button_start.png | Bin 0 -> 9518 bytes .../drawable-hdpi/button_start_pressed.png | Bin 0 -> 14872 bytes .../src/main/res/drawable-hdpi/button_x.png | Bin 0 -> 12124 bytes .../res/drawable-hdpi/button_x_pressed.png | Bin 0 -> 12390 bytes .../src/main/res/drawable-hdpi/button_y.png | Bin 0 -> 9321 bytes .../res/drawable-hdpi/button_y_pressed.png | Bin 0 -> 9498 bytes .../src/main/res/drawable-hdpi/button_zl.png | Bin 0 -> 4423 bytes .../res/drawable-hdpi/button_zl_pressed.png | Bin 0 -> 4426 bytes .../src/main/res/drawable-hdpi/button_zr.png | Bin 0 -> 6239 bytes .../res/drawable-hdpi/button_zr_pressed.png | Bin 0 -> 6201 bytes .../app/src/main/res/drawable-hdpi/dpad.png | Bin 0 -> 4273 bytes .../dpad_pressed_one_direction.png | Bin 0 -> 3824 bytes .../dpad_pressed_two_directions.png | Bin 0 -> 5658 bytes .../main/res/drawable-hdpi/ic_cia_install.png | Bin 0 -> 514 bytes .../src/main/res/drawable-hdpi/ic_folder.png | Bin 0 -> 275 bytes .../src/main/res/drawable-hdpi/ic_premium.png | Bin 0 -> 961 bytes .../res/drawable-hdpi/ic_settings_core.png | Bin 0 -> 793 bytes .../ic_stat_notification_logo.png | Bin 0 -> 2824 bytes .../src/main/res/drawable-hdpi/stick_c.png | Bin 0 -> 14819 bytes .../res/drawable-hdpi/stick_c_pressed.png | Bin 0 -> 14825 bytes .../main/res/drawable-hdpi/stick_c_range.png | Bin 0 -> 8813 bytes .../src/main/res/drawable-hdpi/stick_main.png | Bin 0 -> 12828 bytes .../res/drawable-hdpi/stick_main_pressed.png | Bin 0 -> 8244 bytes .../res/drawable-hdpi/stick_main_range.png | Bin 0 -> 32592 bytes .../main/res/drawable-mdpi/ic_cia_install.png | Bin 0 -> 364 bytes .../src/main/res/drawable-mdpi/ic_folder.png | Bin 0 -> 214 bytes .../src/main/res/drawable-mdpi/ic_premium.png | Bin 0 -> 605 bytes .../drawable-night-hdpi/ic_cia_install.png | Bin 0 -> 556 bytes .../res/drawable-night-hdpi/ic_folder.png | Bin 0 -> 289 bytes .../res/drawable-night-hdpi/ic_premium.png | Bin 0 -> 955 bytes .../drawable-night-hdpi/ic_settings_core.png | Bin 0 -> 1152 bytes .../drawable-night-mdpi/ic_cia_install.png | Bin 0 -> 405 bytes .../res/drawable-night-mdpi/ic_folder.png | Bin 0 -> 227 bytes .../res/drawable-night-mdpi/ic_premium.png | Bin 0 -> 595 bytes .../drawable-night-xhdpi/ic_cia_install.png | Bin 0 -> 729 bytes .../res/drawable-night-xhdpi/ic_folder.png | Bin 0 -> 347 bytes .../res/drawable-night-xhdpi/ic_premium.png | Bin 0 -> 1281 bytes .../drawable-night-xhdpi/ic_settings_core.png | Bin 0 -> 1431 bytes .../drawable-night-xxhdpi/ic_cia_install.png | Bin 0 -> 1168 bytes .../res/drawable-night-xxhdpi/ic_folder.png | Bin 0 -> 555 bytes .../res/drawable-night-xxhdpi/ic_premium.png | Bin 0 -> 2049 bytes .../ic_settings_core.png | Bin 0 -> 2125 bytes .../drawable-night-xxxhdpi/ic_cia_install.png | Bin 0 -> 1433 bytes .../res/drawable-night-xxxhdpi/ic_folder.png | Bin 0 -> 657 bytes .../res/drawable-night-xxxhdpi/ic_premium.png | Bin 0 -> 2614 bytes .../ic_settings_core.png | Bin 0 -> 2587 bytes .../src/main/res/drawable-night/no_icon.png | Bin 0 -> 9238 bytes .../src/main/res/drawable-xhdpi/button_a.png | Bin 0 -> 14645 bytes .../res/drawable-xhdpi/button_a_pressed.png | Bin 0 -> 14643 bytes .../src/main/res/drawable-xhdpi/button_b.png | Bin 0 -> 13040 bytes .../res/drawable-xhdpi/button_b_pressed.png | Bin 0 -> 13046 bytes .../src/main/res/drawable-xhdpi/button_l.png | Bin 0 -> 3461 bytes .../res/drawable-xhdpi/button_l_pressed.png | Bin 0 -> 3471 bytes .../src/main/res/drawable-xhdpi/button_r.png | Bin 0 -> 7603 bytes .../res/drawable-xhdpi/button_r_pressed.png | Bin 0 -> 7595 bytes .../main/res/drawable-xhdpi/button_select.png | Bin 0 -> 17681 bytes .../drawable-xhdpi/button_select_pressed.png | Bin 0 -> 17648 bytes .../main/res/drawable-xhdpi/button_start.png | Bin 0 -> 19588 bytes .../drawable-xhdpi/button_start_pressed.png | Bin 0 -> 19743 bytes .../src/main/res/drawable-xhdpi/button_x.png | Bin 0 -> 16315 bytes .../res/drawable-xhdpi/button_x_pressed.png | Bin 0 -> 16543 bytes .../src/main/res/drawable-xhdpi/button_y.png | Bin 0 -> 12529 bytes .../res/drawable-xhdpi/button_y_pressed.png | Bin 0 -> 12698 bytes .../src/main/res/drawable-xhdpi/button_zl.png | Bin 0 -> 5584 bytes .../res/drawable-xhdpi/button_zl_pressed.png | Bin 0 -> 5616 bytes .../src/main/res/drawable-xhdpi/button_zr.png | Bin 0 -> 8283 bytes .../res/drawable-xhdpi/button_zr_pressed.png | Bin 0 -> 8330 bytes .../app/src/main/res/drawable-xhdpi/dpad.png | Bin 0 -> 5296 bytes .../dpad_pressed_one_direction.png | Bin 0 -> 4781 bytes .../dpad_pressed_two_directions.png | Bin 0 -> 7857 bytes .../res/drawable-xhdpi/ic_cia_install.png | Bin 0 -> 656 bytes .../src/main/res/drawable-xhdpi/ic_folder.png | Bin 0 -> 325 bytes .../main/res/drawable-xhdpi/ic_premium.png | Bin 0 -> 1334 bytes .../res/drawable-xhdpi/ic_settings_core.png | Bin 0 -> 1029 bytes .../ic_stat_notification_logo.png | Bin 0 -> 4026 bytes .../src/main/res/drawable-xhdpi/stick_c.png | Bin 0 -> 23215 bytes .../res/drawable-xhdpi/stick_c_pressed.png | Bin 0 -> 20594 bytes .../main/res/drawable-xhdpi/stick_c_range.png | Bin 0 -> 18277 bytes .../main/res/drawable-xhdpi/stick_main.png | Bin 0 -> 19086 bytes .../res/drawable-xhdpi/stick_main_pressed.png | Bin 0 -> 11657 bytes .../res/drawable-xhdpi/stick_main_range.png | Bin 0 -> 53646 bytes .../src/main/res/drawable-xxhdpi/button_a.png | Bin 0 -> 23552 bytes .../res/drawable-xxhdpi/button_a_pressed.png | Bin 0 -> 23611 bytes .../src/main/res/drawable-xxhdpi/button_b.png | Bin 0 -> 20371 bytes .../res/drawable-xxhdpi/button_b_pressed.png | Bin 0 -> 20591 bytes .../src/main/res/drawable-xxhdpi/button_l.png | Bin 0 -> 5288 bytes .../res/drawable-xxhdpi/button_l_pressed.png | Bin 0 -> 5352 bytes .../src/main/res/drawable-xxhdpi/button_r.png | Bin 0 -> 11960 bytes .../res/drawable-xxhdpi/button_r_pressed.png | Bin 0 -> 11969 bytes .../res/drawable-xxhdpi/button_select.png | Bin 0 -> 27251 bytes .../drawable-xxhdpi/button_select_pressed.png | Bin 0 -> 27436 bytes .../main/res/drawable-xxhdpi/button_start.png | Bin 0 -> 30505 bytes .../drawable-xxhdpi/button_start_pressed.png | Bin 0 -> 30785 bytes .../src/main/res/drawable-xxhdpi/button_x.png | Bin 0 -> 27021 bytes .../res/drawable-xxhdpi/button_x_pressed.png | Bin 0 -> 27645 bytes .../src/main/res/drawable-xxhdpi/button_y.png | Bin 0 -> 19978 bytes .../res/drawable-xxhdpi/button_y_pressed.png | Bin 0 -> 20426 bytes .../main/res/drawable-xxhdpi/button_zl.png | Bin 0 -> 8675 bytes .../res/drawable-xxhdpi/button_zl_pressed.png | Bin 0 -> 8675 bytes .../main/res/drawable-xxhdpi/button_zr.png | Bin 0 -> 13105 bytes .../res/drawable-xxhdpi/button_zr_pressed.png | Bin 0 -> 13182 bytes .../app/src/main/res/drawable-xxhdpi/dpad.png | Bin 0 -> 7816 bytes .../dpad_pressed_one_direction.png | Bin 0 -> 6977 bytes .../dpad_pressed_two_directions.png | Bin 0 -> 12762 bytes .../res/drawable-xxhdpi/ic_cia_install.png | Bin 0 -> 967 bytes .../main/res/drawable-xxhdpi/ic_folder.png | Bin 0 -> 487 bytes .../main/res/drawable-xxhdpi/ic_premium.png | Bin 0 -> 2096 bytes .../res/drawable-xxhdpi/ic_settings_core.png | Bin 0 -> 1647 bytes .../ic_stat_notification_logo.png | Bin 0 -> 5936 bytes .../src/main/res/drawable-xxhdpi/stick_c.png | Bin 0 -> 41218 bytes .../res/drawable-xxhdpi/stick_c_pressed.png | Bin 0 -> 32729 bytes .../res/drawable-xxhdpi/stick_c_range.png | Bin 0 -> 28519 bytes .../main/res/drawable-xxhdpi/stick_main.png | Bin 0 -> 35658 bytes .../drawable-xxhdpi/stick_main_pressed.png | Bin 0 -> 19150 bytes .../res/drawable-xxhdpi/stick_main_range.png | Bin 0 -> 99656 bytes .../main/res/drawable-xxxhdpi/button_a.png | Bin 0 -> 29133 bytes .../res/drawable-xxxhdpi/button_a_pressed.png | Bin 0 -> 29190 bytes .../main/res/drawable-xxxhdpi/button_b.png | Bin 0 -> 24653 bytes .../res/drawable-xxxhdpi/button_b_pressed.png | Bin 0 -> 24931 bytes .../main/res/drawable-xxxhdpi/button_l.png | Bin 0 -> 6396 bytes .../res/drawable-xxxhdpi/button_l_pressed.png | Bin 0 -> 6455 bytes .../main/res/drawable-xxxhdpi/button_r.png | Bin 0 -> 14580 bytes .../res/drawable-xxxhdpi/button_r_pressed.png | Bin 0 -> 14493 bytes .../res/drawable-xxxhdpi/button_select.png | Bin 0 -> 32098 bytes .../button_select_pressed.png | Bin 0 -> 32299 bytes .../res/drawable-xxxhdpi/button_start.png | Bin 0 -> 36683 bytes .../drawable-xxxhdpi/button_start_pressed.png | Bin 0 -> 36775 bytes .../main/res/drawable-xxxhdpi/button_x.png | Bin 0 -> 33016 bytes .../res/drawable-xxxhdpi/button_x_pressed.png | Bin 0 -> 34053 bytes .../main/res/drawable-xxxhdpi/button_y.png | Bin 0 -> 24127 bytes .../res/drawable-xxxhdpi/button_y_pressed.png | Bin 0 -> 24408 bytes .../main/res/drawable-xxxhdpi/button_zl.png | Bin 0 -> 10479 bytes .../drawable-xxxhdpi/button_zl_pressed.png | Bin 0 -> 10484 bytes .../main/res/drawable-xxxhdpi/button_zr.png | Bin 0 -> 15653 bytes .../drawable-xxxhdpi/button_zr_pressed.png | Bin 0 -> 15648 bytes .../src/main/res/drawable-xxxhdpi/dpad.png | Bin 0 -> 9253 bytes .../dpad_pressed_one_direction.png | Bin 0 -> 8434 bytes .../dpad_pressed_two_directions.png | Bin 0 -> 16159 bytes .../res/drawable-xxxhdpi/ic_cia_install.png | Bin 0 -> 1244 bytes .../main/res/drawable-xxxhdpi/ic_folder.png | Bin 0 -> 591 bytes .../main/res/drawable-xxxhdpi/ic_premium.png | Bin 0 -> 2654 bytes .../res/drawable-xxxhdpi/ic_settings_core.png | Bin 0 -> 2093 bytes .../src/main/res/drawable-xxxhdpi/stick_c.png | Bin 0 -> 57013 bytes .../res/drawable-xxxhdpi/stick_c_pressed.png | Bin 0 -> 40273 bytes .../res/drawable-xxxhdpi/stick_c_range.png | Bin 0 -> 34281 bytes .../main/res/drawable-xxxhdpi/stick_main.png | Bin 0 -> 45881 bytes .../drawable-xxxhdpi/stick_main_pressed.png | Bin 0 -> 24942 bytes .../res/drawable-xxxhdpi/stick_main_range.png | Bin 0 -> 136109 bytes .../main/res/drawable/gamelist_divider.xml | 11 + .../app/src/main/res/drawable/ic_add.xml | 9 + .../app/src/main/res/drawable/no_icon.png | Bin 0 -> 8610 bytes .../main/res/layout-ldrtl/list_item_cheat.xml | 38 + .../src/main/res/layout/activity_cheats.xml | 22 + .../main/res/layout/activity_emulation.xml | 17 + .../app/src/main/res/layout/activity_main.xml | 27 + .../src/main/res/layout/activity_settings.xml | 5 + .../app/src/main/res/layout/card_game.xml | 81 ++ .../src/main/res/layout/dialog_checkbox.xml | 16 + .../main/res/layout/dialog_progress_bar.xml | 26 + .../src/main/res/layout/dialog_seekbar.xml | 37 + .../main/res/layout/filepicker_toolbar.xml | 32 + .../res/layout/fragment_cheat_details.xml | 163 ++++ .../main/res/layout/fragment_cheat_list.xml | 27 + .../main/res/layout/fragment_emulation.xml | 47 + .../app/src/main/res/layout/fragment_grid.xml | 33 + .../src/main/res/layout/fragment_settings.xml | 12 + .../src/main/res/layout/list_item_cheat.xml | 38 + .../src/main/res/layout/list_item_setting.xml | 43 + .../res/layout/list_item_setting_checkbox.xml | 52 ++ .../res/layout/list_item_settings_header.xml | 19 + .../main/res/layout/premium_item_setting.xml | 43 + .../res/layout/sysclock_datetime_picker.xml | 22 + .../app/src/main/res/menu/menu_emulation.xml | 118 +++ .../app/src/main/res/menu/menu_game_grid.xml | 34 + .../app/src/main/res/menu/menu_settings.xml | 2 + .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 5899 bytes .../mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 7416 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 3377 bytes .../mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 4413 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 8742 bytes .../mipmap-xhdpi/ic_launcher_foreground.png | Bin 0 -> 10530 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 14300 bytes .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 17511 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 20804 bytes .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 24886 bytes .../app/src/main/res/values-night/colors.xml | 17 + .../res/values-night/styles_filepicker.xml | 5 + .../src/main/res/values-w1000dp/integers.xml | 4 + .../src/main/res/values-w1050dp/dimens.xml | 6 + .../src/main/res/values-w500dp/integers.xml | 4 + .../src/main/res/values-w750dp/integers.xml | 4 + .../app/src/main/res/values-w820dp/dimens.xml | 5 + .../app/src/main/res/values/arrays.xml | 174 ++++ .../app/src/main/res/values/colors.xml | 17 + .../app/src/main/res/values/dimens.xml | 10 + .../res/values/ic_launcher_background.xml | 4 + .../app/src/main/res/values/integers.xml | 65 ++ .../app/src/main/res/values/strings.xml | 246 +++++ .../app/src/main/res/values/styles.xml | 65 ++ .../src/main/res/values/styles_filepicker.xml | 5 + .../org/citra/citra_emu/ExampleUnitTest.java | 17 + src/android/build.gradle | 26 + src/android/code-style-java.xml | 240 +++++ src/android/gradle.properties | 15 + src/android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54708 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + src/android/gradlew | 172 ++++ src/android/gradlew.bat | 84 ++ src/android/settings.gradle | 1 + 319 files changed, 13799 insertions(+) create mode 100644 src/android/.gitignore create mode 100644 src/android/app/build.gradle create mode 100644 src/android/app/proguard-rules.pro create mode 100644 src/android/app/src/androidTest/java/org/citra/citra_emu/ExampleInstrumentedTest.java create mode 100644 src/android/app/src/main/AndroidManifest.xml create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/CitraApplication.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/activities/CustomFilePickerActivity.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/applets/MiiSelector.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/applets/SoftwareKeyboard.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/camera/StillImageCameraHelper.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/dialogs/MotionAlertDialog.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/disk_shader_cache/DiskShaderCacheProgress.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/Cheat.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/CheatEngine.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/CheatsViewModel.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatDetailsFragment.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatListFragment.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatViewHolder.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsActivity.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsAdapter.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/FloatSetting.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntSetting.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Setting.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/SettingSection.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/StringSetting.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/CheckBoxSetting.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/DateTimeSetting.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/HeaderSetting.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/InputBindingSetting.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/PremiumHeader.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/PremiumSingleChoiceSetting.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SettingsItem.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SingleChoiceSetting.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SliderSetting.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/StringSingleChoiceSetting.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SubmenuSetting.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityView.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragment.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentView.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFrameLayout.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/CheckBoxSettingViewHolder.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/DateTimeViewHolder.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/HeaderViewHolder.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/InputBindingSettingViewHolder.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/PremiumViewHolder.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SettingViewHolder.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SliderViewHolder.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SubmenuViewHolder.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/fragments/CustomFilePickerFragment.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/model/Game.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/model/GameDatabase.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/model/GameProvider.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableButton.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableDpad.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableJoystick.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/ui/DividerItemDecoration.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/ui/TwoPaneOnBackPressedCallback.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainPresenter.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainView.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesFragment.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesPresenter.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesView.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/Action1.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/AddDirectoryHelper.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/BiMap.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/BillingManager.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/ControllerMappingHelper.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryStateReceiver.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/EmulationMenuSettings.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/FileBrowserHelper.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/FileUtil.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/ForegroundService.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/GameIconRequestHandler.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/Log.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/PermissionsHandler.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoRoundedCornersTransformation.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoUtils.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/StartupHandler.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/utils/ThemeUtil.java create mode 100644 src/android/app/src/main/java/org/citra/citra_emu/viewholders/GameViewHolder.java create mode 100644 src/android/app/src/main/res/animator/settings_enter.xml create mode 100644 src/android/app/src/main/res/animator/settings_exit.xml create mode 100644 src/android/app/src/main/res/animator/settings_pop_enter.xml create mode 100644 src/android/app/src/main/res/animator/setttings_pop_exit.xml create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_a.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_a_pressed.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_b.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_b_pressed.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_l.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_l_pressed.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_r.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_r_pressed.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_select.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_select_pressed.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_start.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_start_pressed.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_x.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_x_pressed.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_y.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_y_pressed.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_zl.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_zl_pressed.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_zr.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/button_zr_pressed.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/dpad.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/dpad_pressed_one_direction.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/dpad_pressed_two_directions.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/ic_cia_install.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/ic_folder.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/ic_premium.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/ic_settings_core.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/ic_stat_notification_logo.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/stick_c.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/stick_c_pressed.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/stick_c_range.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/stick_main.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/stick_main_pressed.png create mode 100644 src/android/app/src/main/res/drawable-hdpi/stick_main_range.png create mode 100644 src/android/app/src/main/res/drawable-mdpi/ic_cia_install.png create mode 100644 src/android/app/src/main/res/drawable-mdpi/ic_folder.png create mode 100644 src/android/app/src/main/res/drawable-mdpi/ic_premium.png create mode 100644 src/android/app/src/main/res/drawable-night-hdpi/ic_cia_install.png create mode 100644 src/android/app/src/main/res/drawable-night-hdpi/ic_folder.png create mode 100644 src/android/app/src/main/res/drawable-night-hdpi/ic_premium.png create mode 100644 src/android/app/src/main/res/drawable-night-hdpi/ic_settings_core.png create mode 100644 src/android/app/src/main/res/drawable-night-mdpi/ic_cia_install.png create mode 100644 src/android/app/src/main/res/drawable-night-mdpi/ic_folder.png create mode 100644 src/android/app/src/main/res/drawable-night-mdpi/ic_premium.png create mode 100644 src/android/app/src/main/res/drawable-night-xhdpi/ic_cia_install.png create mode 100644 src/android/app/src/main/res/drawable-night-xhdpi/ic_folder.png create mode 100644 src/android/app/src/main/res/drawable-night-xhdpi/ic_premium.png create mode 100644 src/android/app/src/main/res/drawable-night-xhdpi/ic_settings_core.png create mode 100644 src/android/app/src/main/res/drawable-night-xxhdpi/ic_cia_install.png create mode 100644 src/android/app/src/main/res/drawable-night-xxhdpi/ic_folder.png create mode 100644 src/android/app/src/main/res/drawable-night-xxhdpi/ic_premium.png create mode 100644 src/android/app/src/main/res/drawable-night-xxhdpi/ic_settings_core.png create mode 100644 src/android/app/src/main/res/drawable-night-xxxhdpi/ic_cia_install.png create mode 100644 src/android/app/src/main/res/drawable-night-xxxhdpi/ic_folder.png create mode 100644 src/android/app/src/main/res/drawable-night-xxxhdpi/ic_premium.png create mode 100644 src/android/app/src/main/res/drawable-night-xxxhdpi/ic_settings_core.png create mode 100644 src/android/app/src/main/res/drawable-night/no_icon.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_a.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_a_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_b.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_b_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_l.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_l_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_r.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_r_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_select.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_select_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_start.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_start_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_x.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_x_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_y.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_y_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_zl.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_zl_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_zr.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/button_zr_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/dpad.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/dpad_pressed_one_direction.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/dpad_pressed_two_directions.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/ic_cia_install.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/ic_folder.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/ic_premium.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/ic_settings_core.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/ic_stat_notification_logo.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/stick_c.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/stick_c_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/stick_c_range.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/stick_main.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/stick_main_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xhdpi/stick_main_range.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_a.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_a_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_b.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_b_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_l.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_l_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_r.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_r_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_select.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_select_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_start.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_start_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_x.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_x_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_y.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_y_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_zl.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_zl_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_zr.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/button_zr_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/dpad.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/dpad_pressed_one_direction.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/dpad_pressed_two_directions.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/ic_cia_install.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/ic_folder.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/ic_premium.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/ic_settings_core.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/ic_stat_notification_logo.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/stick_c.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/stick_c_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/stick_c_range.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/stick_main.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/stick_main_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxhdpi/stick_main_range.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_a.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_a_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_b.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_b_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_l.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_l_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_r.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_r_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_select.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_select_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_start.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_start_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_x.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_x_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_y.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_y_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_zl.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_zl_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_zr.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/button_zr_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/dpad.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/dpad_pressed_one_direction.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/dpad_pressed_two_directions.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/ic_cia_install.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/ic_folder.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/ic_premium.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/ic_settings_core.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/stick_c.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/stick_c_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/stick_c_range.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/stick_main.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/stick_main_pressed.png create mode 100644 src/android/app/src/main/res/drawable-xxxhdpi/stick_main_range.png create mode 100644 src/android/app/src/main/res/drawable/gamelist_divider.xml create mode 100644 src/android/app/src/main/res/drawable/ic_add.xml create mode 100644 src/android/app/src/main/res/drawable/no_icon.png create mode 100644 src/android/app/src/main/res/layout-ldrtl/list_item_cheat.xml create mode 100644 src/android/app/src/main/res/layout/activity_cheats.xml create mode 100644 src/android/app/src/main/res/layout/activity_emulation.xml create mode 100644 src/android/app/src/main/res/layout/activity_main.xml create mode 100644 src/android/app/src/main/res/layout/activity_settings.xml create mode 100644 src/android/app/src/main/res/layout/card_game.xml create mode 100644 src/android/app/src/main/res/layout/dialog_checkbox.xml create mode 100644 src/android/app/src/main/res/layout/dialog_progress_bar.xml create mode 100644 src/android/app/src/main/res/layout/dialog_seekbar.xml create mode 100644 src/android/app/src/main/res/layout/filepicker_toolbar.xml create mode 100644 src/android/app/src/main/res/layout/fragment_cheat_details.xml create mode 100644 src/android/app/src/main/res/layout/fragment_cheat_list.xml create mode 100644 src/android/app/src/main/res/layout/fragment_emulation.xml create mode 100644 src/android/app/src/main/res/layout/fragment_grid.xml create mode 100644 src/android/app/src/main/res/layout/fragment_settings.xml create mode 100644 src/android/app/src/main/res/layout/list_item_cheat.xml create mode 100644 src/android/app/src/main/res/layout/list_item_setting.xml create mode 100644 src/android/app/src/main/res/layout/list_item_setting_checkbox.xml create mode 100644 src/android/app/src/main/res/layout/list_item_settings_header.xml create mode 100644 src/android/app/src/main/res/layout/premium_item_setting.xml create mode 100644 src/android/app/src/main/res/layout/sysclock_datetime_picker.xml create mode 100644 src/android/app/src/main/res/menu/menu_emulation.xml create mode 100644 src/android/app/src/main/res/menu/menu_game_grid.xml create mode 100644 src/android/app/src/main/res/menu/menu_settings.xml create mode 100644 src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 src/android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 src/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png create mode 100644 src/android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 src/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png create mode 100644 src/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 src/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png create mode 100644 src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png create mode 100644 src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png create mode 100644 src/android/app/src/main/res/values-night/colors.xml create mode 100644 src/android/app/src/main/res/values-night/styles_filepicker.xml create mode 100644 src/android/app/src/main/res/values-w1000dp/integers.xml create mode 100644 src/android/app/src/main/res/values-w1050dp/dimens.xml create mode 100644 src/android/app/src/main/res/values-w500dp/integers.xml create mode 100644 src/android/app/src/main/res/values-w750dp/integers.xml create mode 100644 src/android/app/src/main/res/values-w820dp/dimens.xml create mode 100644 src/android/app/src/main/res/values/arrays.xml create mode 100644 src/android/app/src/main/res/values/colors.xml create mode 100644 src/android/app/src/main/res/values/dimens.xml create mode 100644 src/android/app/src/main/res/values/ic_launcher_background.xml create mode 100644 src/android/app/src/main/res/values/integers.xml create mode 100644 src/android/app/src/main/res/values/strings.xml create mode 100644 src/android/app/src/main/res/values/styles.xml create mode 100644 src/android/app/src/main/res/values/styles_filepicker.xml create mode 100644 src/android/app/src/test/java/org/citra/citra_emu/ExampleUnitTest.java create mode 100644 src/android/build.gradle create mode 100644 src/android/code-style-java.xml create mode 100644 src/android/gradle.properties create mode 100644 src/android/gradle/wrapper/gradle-wrapper.jar create mode 100644 src/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 src/android/gradlew create mode 100644 src/android/gradlew.bat create mode 100644 src/android/settings.gradle diff --git a/src/android/.gitignore b/src/android/.gitignore new file mode 100644 index 000000000..40b6c5cd0 --- /dev/null +++ b/src/android/.gitignore @@ -0,0 +1,62 @@ +# Built application files +*.apk +*.ap_ + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ +*.iml +.idea/ + +# Keystore files +# Uncomment the following line if you do not want to check your keystore files in. +#*.jks + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild + +# CXX compile cache +app/.cxx + +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/readme.md diff --git a/src/android/app/build.gradle b/src/android/app/build.gradle new file mode 100644 index 000000000..5a108743b --- /dev/null +++ b/src/android/app/build.gradle @@ -0,0 +1,163 @@ +apply plugin: 'com.android.application' + +/** + * Use the number of seconds/10 since Jan 1 2016 as the versionCode. + * This lets us upload a new build at most every 10 seconds for the + * next 680 years. + */ +def autoVersion = (int) (((new Date().getTime() / 1000) - 1451606400) / 10) +def buildType +def abiFilter = "arm64-v8a" //, "x86" + +android { + compileSdkVersion 32 + ndkVersion "25.1.8937393" + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + lintOptions { + // This is important as it will run lint but not abort on error + // Lint has some overly obnoxious "errors" that should really be warnings + abortOnError false + + //Uncomment disable lines for test builds... + //disable 'MissingTranslation'bin + //disable 'ExtraTranslation' + } + + defaultConfig { + // TODO If this is ever modified, change application_id in strings.xml + applicationId "org.citra.citra_emu" + minSdkVersion 28 + targetSdkVersion 29 + versionCode autoVersion + versionName getVersion() + ndk.abiFilters abiFilter + } + + signingConfigs { + //release { + // storeFile file('') + // storePassword System.getenv('ANDROID_KEYPASS') + // keyAlias = 'key0' + // keyPassword System.getenv('ANDROID_KEYPASS') + //} + } + + applicationVariants.all { variant -> + buildType = variant.buildType.name // sets the current build type + } + + // Define build types, which are orthogonal to product flavors. + buildTypes { + + // Signed by release key, allowing for upload to Play Store. + release { + signingConfig signingConfigs.debug + } + + // builds a release build that doesn't need signing + // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build. + relWithDebInfo { + initWith release + applicationIdSuffix ".debug" + versionNameSuffix '-debug' + signingConfig signingConfigs.debug + minifyEnabled false + testCoverageEnabled false + debuggable true + jniDebuggable true + } + + // Signed by debug key disallowing distribution on Play Store. + // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build. + debug { + // TODO If this is ever modified, change application_id in debug/strings.xml + applicationIdSuffix ".debug" + versionNameSuffix '-debug' + debuggable true + jniDebuggable true + } + } + + flavorDimensions "version" + productFlavors { + canary { + dimension "version" + applicationIdSuffix ".canary" + } + nightly { + dimension "version" + } + } + + externalNativeBuild { + cmake { + version "3.22.1" + path "../../../CMakeLists.txt" + } + } + + defaultConfig { + externalNativeBuild { + cmake { + arguments "-DENABLE_QT=0", // Don't use QT + "-DENABLE_SDL2=0", // Don't use SDL + "-DENABLE_WEB_SERVICE=0", // Don't use telemetry + "-DANDROID_ARM_NEON=true", // cryptopp requires Neon to work + "-DYUZU_USE_BUNDLED_VCPKG=ON", + "-DYUZU_USE_BUNDLED_FFMPEG=ON" + + abiFilters abiFilter + } + } + } +} + +dependencies { + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.exifinterface:exifinterface:1.3.4' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1' + implementation 'androidx.fragment:fragment:1.5.3' + implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0" + implementation 'com.google.android.material:material:1.6.1' + + // For loading huge screenshots from the disk. + implementation 'com.squareup.picasso:picasso:2.71828' + + // Allows FRP-style asynchronous operations in Android. + implementation 'io.reactivex:rxandroid:1.2.1' + implementation 'com.nononsenseapps:filepicker:4.2.1' + implementation 'org.ini4j:ini4j:0.5.4' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' + + // Please don't upgrade the billing library as the newer version is not GPL-compatible + implementation 'com.android.billingclient:billing:2.0.3' +} + +def getVersion() { + def versionName = '0.0' + + try { + versionName = 'git describe --always --long'.execute([], project.rootDir).text + .trim() + .replaceAll(/(-0)?-[^-]+$/, "") + } catch (Exception) { + logger.error('Cannot find git, defaulting to dummy version number') + } + + if (System.getenv("GITHUB_ACTIONS") != null) { + def gitTag = System.getenv("GIT_TAG_NAME") + versionName = gitTag ?: versionName + } + + return versionName +} diff --git a/src/android/app/proguard-rules.pro b/src/android/app/proguard-rules.pro new file mode 100644 index 000000000..f1b424510 --- /dev/null +++ b/src/android/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/src/android/app/src/androidTest/java/org/citra/citra_emu/ExampleInstrumentedTest.java b/src/android/app/src/androidTest/java/org/citra/citra_emu/ExampleInstrumentedTest.java new file mode 100644 index 000000000..6a25f2ce6 --- /dev/null +++ b/src/android/app/src/androidTest/java/org/citra/citra_emu/ExampleInstrumentedTest.java @@ -0,0 +1,3 @@ +package org.citra.citra_emu; + +import android.content.Context; diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml new file mode 100644 index 000000000..c2463e079 --- /dev/null +++ b/src/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/android/app/src/main/java/org/citra/citra_emu/CitraApplication.java b/src/android/app/src/main/java/org/citra/citra_emu/CitraApplication.java new file mode 100644 index 000000000..41ac7e27c --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/CitraApplication.java @@ -0,0 +1,56 @@ +// Copyright 2019 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +package org.citra.citra_emu; + +import android.app.Application; +import android.app.NotificationChannel; +import android.app.NotificationManager; +import android.content.Context; +import android.os.Build; + +import org.citra.citra_emu.model.GameDatabase; +import org.citra.citra_emu.utils.DirectoryInitialization; +import org.citra.citra_emu.utils.PermissionsHandler; + +public class CitraApplication extends Application { + public static GameDatabase databaseHelper; + private static CitraApplication application; + + private void createNotificationChannel() { + // Create the NotificationChannel, but only on API 26+ because + // the NotificationChannel class is new and not in the support library + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + CharSequence name = getString(R.string.app_notification_channel_name); + String description = getString(R.string.app_notification_channel_description); + NotificationChannel channel = new NotificationChannel(getString(R.string.app_notification_channel_id), name, NotificationManager.IMPORTANCE_LOW); + channel.setDescription(description); + channel.setSound(null, null); + channel.setVibrationPattern(null); + // Register the channel with the system; you can't change the importance + // or other notification behaviors after this + NotificationManager notificationManager = getSystemService(NotificationManager.class); + notificationManager.createNotificationChannel(channel); + } + } + + @Override + public void onCreate() { + super.onCreate(); + application = this; + + if (PermissionsHandler.hasWriteAccess(getApplicationContext())) { + DirectoryInitialization.start(getApplicationContext()); + } + + NativeLibrary.LogDeviceInfo(); + createNotificationChannel(); + + databaseHelper = new GameDatabase(this); + } + + public static Context getAppContext() { + return application.getApplicationContext(); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.java b/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.java new file mode 100644 index 000000000..baff99dc8 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.java @@ -0,0 +1,631 @@ +/* + * Copyright 2013 Dolphin Emulator Project + * Licensed under GPLv2+ + * Refer to the license.txt file included. + */ + +package org.citra.citra_emu; + +import android.app.Activity; +import android.app.Dialog; +import android.content.pm.PackageManager; +import android.content.res.Configuration; +import android.os.Bundle; +import android.text.Html; +import android.text.method.LinkMovementMethod; +import android.view.Surface; +import android.view.ViewGroup; +import android.widget.EditText; +import android.widget.FrameLayout; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.DialogFragment; + +import org.citra.citra_emu.activities.EmulationActivity; +import org.citra.citra_emu.utils.EmulationMenuSettings; +import org.citra.citra_emu.utils.Log; + +import java.lang.ref.WeakReference; +import java.util.Objects; + +import static android.Manifest.permission.CAMERA; +import static android.Manifest.permission.RECORD_AUDIO; + +/** + * Class which contains methods that interact + * with the native side of the Citra code. + */ +public final class NativeLibrary { + /** + * Default touchscreen device + */ + public static final String TouchScreenDevice = "Touchscreen"; + public static WeakReference sEmulationActivity = new WeakReference<>(null); + + private static boolean alertResult = false; + private static String alertPromptResult = ""; + private static int alertPromptButton = 0; + private static final Object alertPromptLock = new Object(); + private static boolean alertPromptInProgress = false; + private static String alertPromptCaption = ""; + private static int alertPromptButtonConfig = 0; + private static EditText alertPromptEditText = null; + + static { + try { + System.loadLibrary("yuzu-android"); + } catch (UnsatisfiedLinkError ex) { + Log.error("[NativeLibrary] " + ex.toString()); + } + } + + private NativeLibrary() { + // Disallows instantiation. + } + + /** + * Handles button press events for a gamepad. + * + * @param Device The input descriptor of the gamepad. + * @param Button Key code identifying which button was pressed. + * @param Action Mask identifying which action is happening (button pressed down, or button released). + * @return If we handled the button press. + */ + public static native boolean onGamePadEvent(String Device, int Button, int Action); + + /** + * Handles gamepad movement events. + * + * @param Device The device ID of the gamepad. + * @param Axis The axis ID + * @param x_axis The value of the x-axis represented by the given ID. + * @param y_axis The value of the y-axis represented by the given ID + */ + public static native boolean onGamePadMoveEvent(String Device, int Axis, float x_axis, float y_axis); + + /** + * Handles gamepad movement events. + * + * @param Device The device ID of the gamepad. + * @param Axis_id The axis ID + * @param axis_val The value of the axis represented by the given ID. + */ + public static native boolean onGamePadAxisEvent(String Device, int Axis_id, float axis_val); + + /** + * Handles touch events. + * + * @param x_axis The value of the x-axis. + * @param y_axis The value of the y-axis + * @param pressed To identify if the touch held down or released. + * @return true if the pointer is within the touchscreen + */ + public static native boolean onTouchEvent(float x_axis, float y_axis, boolean pressed); + + /** + * Handles touch movement. + * + * @param x_axis The value of the instantaneous x-axis. + * @param y_axis The value of the instantaneous y-axis. + */ + public static native void onTouchMoved(float x_axis, float y_axis); + + public static native void ReloadSettings(); + + public static native String GetUserSetting(String gameID, String Section, String Key); + + public static native void SetUserSetting(String gameID, String Section, String Key, String Value); + + public static native void InitGameIni(String gameID); + + /** + * Gets the embedded icon within the given ROM. + * + * @param filename the file path to the ROM. + * @return an integer array containing the color data for the icon. + */ + public static native int[] GetIcon(String filename); + + /** + * Gets the embedded title of the given ISO/ROM. + * + * @param filename The file path to the ISO/ROM. + * @return the embedded title of the ISO/ROM. + */ + public static native String GetTitle(String filename); + + public static native String GetDescription(String filename); + + public static native String GetGameId(String filename); + + public static native String GetRegions(String filename); + + public static native String GetCompany(String filename); + + public static native String GetGitRevision(); + + /** + * Sets the current working user directory + * If not set, it auto-detects a location + */ + public static native void SetUserDirectory(String directory); + + // Create the config.ini file. + public static native void CreateConfigFile(); + + public static native int DefaultCPUCore(); + + /** + * Begins emulation. + */ + public static native void Run(String path); + + /** + * Begins emulation from the specified savestate. + */ + public static native void Run(String path, String savestatePath, boolean deleteSavestate); + + // Surface Handling + public static native void SurfaceChanged(Surface surf); + + public static native void SurfaceDestroyed(); + + public static native void DoFrame(); + + /** + * Unpauses emulation from a paused state. + */ + public static native void UnPauseEmulation(); + + /** + * Pauses emulation. + */ + public static native void PauseEmulation(); + + /** + * Stops emulation. + */ + public static native void StopEmulation(); + + /** + * Returns true if emulation is running (or is paused). + */ + public static native boolean IsRunning(); + + /** + * Returns the performance stats for the current game + **/ + public static native double[] GetPerfStats(); + + /** + * Notifies the core emulation that the orientation has changed. + */ + public static native void NotifyOrientationChange(int layout_option, int rotation); + + public enum CoreError { + ErrorSystemFiles, + ErrorSavestate, + ErrorUnknown, + } + + private static boolean coreErrorAlertResult = false; + private static final Object coreErrorAlertLock = new Object(); + + public static class CoreErrorDialogFragment extends DialogFragment { + static CoreErrorDialogFragment newInstance(String title, String message) { + CoreErrorDialogFragment frag = new CoreErrorDialogFragment(); + Bundle args = new Bundle(); + args.putString("title", title); + args.putString("message", message); + frag.setArguments(args); + return frag; + } + + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + final Activity emulationActivity = Objects.requireNonNull(getActivity()); + + final String title = Objects.requireNonNull(Objects.requireNonNull(getArguments()).getString("title")); + final String message = Objects.requireNonNull(Objects.requireNonNull(getArguments()).getString("message")); + + return new AlertDialog.Builder(emulationActivity) + .setTitle(title) + .setMessage(message) + .setPositiveButton(R.string.continue_button, (dialog, which) -> { + coreErrorAlertResult = true; + synchronized (coreErrorAlertLock) { + coreErrorAlertLock.notify(); + } + }) + .setNegativeButton(R.string.abort_button, (dialog, which) -> { + coreErrorAlertResult = false; + synchronized (coreErrorAlertLock) { + coreErrorAlertLock.notify(); + } + }).setOnDismissListener(dialog -> { + coreErrorAlertResult = true; + synchronized (coreErrorAlertLock) { + coreErrorAlertLock.notify(); + } + }).create(); + } + } + + private static void OnCoreErrorImpl(String title, String message) { + final EmulationActivity emulationActivity = sEmulationActivity.get(); + if (emulationActivity == null) { + Log.error("[NativeLibrary] EmulationActivity not present"); + return; + } + + CoreErrorDialogFragment fragment = CoreErrorDialogFragment.newInstance(title, message); + fragment.show(emulationActivity.getSupportFragmentManager(), "coreError"); + } + + /** + * Handles a core error. + * @return true: continue; false: abort + */ + public static boolean OnCoreError(CoreError error, String details) { + final EmulationActivity emulationActivity = sEmulationActivity.get(); + if (emulationActivity == null) { + Log.error("[NativeLibrary] EmulationActivity not present"); + return false; + } + + String title, message; + switch (error) { + case ErrorSystemFiles: { + title = emulationActivity.getString(R.string.system_archive_not_found); + message = emulationActivity.getString(R.string.system_archive_not_found_message, details.isEmpty() ? emulationActivity.getString(R.string.system_archive_general) : details); + break; + } + case ErrorSavestate: { + title = emulationActivity.getString(R.string.save_load_error); + message = details; + break; + } + case ErrorUnknown: { + title = emulationActivity.getString(R.string.fatal_error); + message = emulationActivity.getString(R.string.fatal_error_message); + break; + } + default: { + return true; + } + } + + // Show the AlertDialog on the main thread. + emulationActivity.runOnUiThread(() -> OnCoreErrorImpl(title, message)); + + // Wait for the lock to notify that it is complete. + synchronized (coreErrorAlertLock) { + try { + coreErrorAlertLock.wait(); + } catch (Exception ignored) { + } + } + + return coreErrorAlertResult; + } + + public static boolean isPortraitMode() { + return CitraApplication.getAppContext().getResources().getConfiguration().orientation == + Configuration.ORIENTATION_PORTRAIT; + } + + public static int landscapeScreenLayout() { + return EmulationMenuSettings.getLandscapeScreenLayout(); + } + + public static boolean displayAlertMsg(final String caption, final String text, + final boolean yesNo) { + Log.error("[NativeLibrary] Alert: " + text); + final EmulationActivity emulationActivity = sEmulationActivity.get(); + boolean result = false; + if (emulationActivity == null) { + Log.warning("[NativeLibrary] EmulationActivity is null, can't do panic alert."); + } else { + // Create object used for waiting. + final Object lock = new Object(); + AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity) + .setTitle(caption) + .setMessage(text); + + // If not yes/no dialog just have one button that dismisses modal, + // otherwise have a yes and no button that sets alertResult accordingly. + if (!yesNo) { + builder + .setCancelable(false) + .setPositiveButton(android.R.string.ok, (dialog, whichButton) -> + { + dialog.dismiss(); + synchronized (lock) { + lock.notify(); + } + }); + } else { + alertResult = false; + + builder + .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> + { + alertResult = true; + dialog.dismiss(); + synchronized (lock) { + lock.notify(); + } + }) + .setNegativeButton(android.R.string.no, (dialog, whichButton) -> + { + alertResult = false; + dialog.dismiss(); + synchronized (lock) { + lock.notify(); + } + }); + } + + // Show the AlertDialog on the main thread. + emulationActivity.runOnUiThread(builder::show); + + // Wait for the lock to notify that it is complete. + synchronized (lock) { + try { + lock.wait(); + } catch (Exception e) { + } + } + + if (yesNo) + result = alertResult; + } + return result; + } + + public static void retryDisplayAlertPrompt() { + if (!alertPromptInProgress) { + return; + } + displayAlertPromptImpl(alertPromptCaption, alertPromptEditText.getText().toString(), alertPromptButtonConfig).show(); + } + + public static String displayAlertPrompt(String caption, String text, int buttonConfig) { + alertPromptCaption = caption; + alertPromptButtonConfig = buttonConfig; + alertPromptInProgress = true; + + // Show the AlertDialog on the main thread + sEmulationActivity.get().runOnUiThread(() -> displayAlertPromptImpl(alertPromptCaption, text, alertPromptButtonConfig).show()); + + // Wait for the lock to notify that it is complete + synchronized (alertPromptLock) { + try { + alertPromptLock.wait(); + } catch (Exception e) { + } + } + alertPromptInProgress = false; + + return alertPromptResult; + } + + public static AlertDialog.Builder displayAlertPromptImpl(String caption, String text, int buttonConfig) { + final EmulationActivity emulationActivity = sEmulationActivity.get(); + alertPromptResult = ""; + alertPromptButton = 0; + + FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); + params.leftMargin = params.rightMargin = CitraApplication.getAppContext().getResources().getDimensionPixelSize(R.dimen.dialog_margin); + + // Set up the input + alertPromptEditText = new EditText(CitraApplication.getAppContext()); + alertPromptEditText.setText(text); + alertPromptEditText.setSingleLine(); + alertPromptEditText.setLayoutParams(params); + + FrameLayout container = new FrameLayout(emulationActivity); + container.addView(alertPromptEditText); + + AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity) + .setTitle(caption) + .setView(container) + .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> + { + alertPromptButton = buttonConfig; + alertPromptResult = alertPromptEditText.getText().toString(); + synchronized (alertPromptLock) { + alertPromptLock.notifyAll(); + } + }) + .setOnDismissListener(dialogInterface -> + { + alertPromptResult = ""; + synchronized (alertPromptLock) { + alertPromptLock.notifyAll(); + } + }); + + if (buttonConfig > 0) { + builder.setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> + { + alertPromptResult = ""; + synchronized (alertPromptLock) { + alertPromptLock.notifyAll(); + } + }); + } + + return builder; + } + + public static int alertPromptButton() { + return alertPromptButton; + } + + public static void exitEmulationActivity(int resultCode) { + final int Success = 0; + final int ErrorNotInitialized = 1; + final int ErrorGetLoader = 2; + final int ErrorSystemMode = 3; + final int ErrorLoader = 4; + final int ErrorLoader_ErrorEncrypted = 5; + final int ErrorLoader_ErrorInvalidFormat = 6; + final int ErrorSystemFiles = 7; + final int ErrorVideoCore = 8; + final int ErrorVideoCore_ErrorGenericDrivers = 9; + final int ErrorVideoCore_ErrorBelowGL33 = 10; + final int ShutdownRequested = 11; + final int ErrorUnknown = 12; + + final EmulationActivity emulationActivity = sEmulationActivity.get(); + if (emulationActivity == null) { + Log.warning("[NativeLibrary] EmulationActivity is null, can't exit."); + return; + } + + int captionId = R.string.loader_error_invalid_format; + if (resultCode == ErrorLoader_ErrorEncrypted) { + captionId = R.string.loader_error_encrypted; + } + + AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity) + .setTitle(captionId) + .setMessage(Html.fromHtml("Please follow the guides to redump your game cartidges or installed titles.", Html.FROM_HTML_MODE_LEGACY)) + .setPositiveButton(android.R.string.ok, (dialog, whichButton) -> emulationActivity.finish()) + .setOnDismissListener(dialogInterface -> emulationActivity.finish()); + emulationActivity.runOnUiThread(() -> { + AlertDialog alert = builder.create(); + alert.show(); + ((TextView) alert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); + }); + } + + public static void setEmulationActivity(EmulationActivity emulationActivity) { + Log.verbose("[NativeLibrary] Registering EmulationActivity."); + sEmulationActivity = new WeakReference<>(emulationActivity); + } + + public static void clearEmulationActivity() { + Log.verbose("[NativeLibrary] Unregistering EmulationActivity."); + + sEmulationActivity.clear(); + } + + private static final Object cameraPermissionLock = new Object(); + private static boolean cameraPermissionGranted = false; + public static final int REQUEST_CODE_NATIVE_CAMERA = 800; + + public static boolean RequestCameraPermission() { + final EmulationActivity emulationActivity = sEmulationActivity.get(); + if (emulationActivity == null) { + Log.error("[NativeLibrary] EmulationActivity not present"); + return false; + } + if (ContextCompat.checkSelfPermission(emulationActivity, CAMERA) == PackageManager.PERMISSION_GRANTED) { + // Permission already granted + return true; + } + emulationActivity.requestPermissions(new String[]{CAMERA}, REQUEST_CODE_NATIVE_CAMERA); + + // Wait until result is returned + synchronized (cameraPermissionLock) { + try { + cameraPermissionLock.wait(); + } catch (InterruptedException ignored) { + } + } + return cameraPermissionGranted; + } + + public static void CameraPermissionResult(boolean granted) { + cameraPermissionGranted = granted; + synchronized (cameraPermissionLock) { + cameraPermissionLock.notify(); + } + } + + private static final Object micPermissionLock = new Object(); + private static boolean micPermissionGranted = false; + public static final int REQUEST_CODE_NATIVE_MIC = 900; + + public static boolean RequestMicPermission() { + final EmulationActivity emulationActivity = sEmulationActivity.get(); + if (emulationActivity == null) { + Log.error("[NativeLibrary] EmulationActivity not present"); + return false; + } + if (ContextCompat.checkSelfPermission(emulationActivity, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED) { + // Permission already granted + return true; + } + emulationActivity.requestPermissions(new String[]{RECORD_AUDIO}, REQUEST_CODE_NATIVE_MIC); + + // Wait until result is returned + synchronized (micPermissionLock) { + try { + micPermissionLock.wait(); + } catch (InterruptedException ignored) { + } + } + return micPermissionGranted; + } + + public static void MicPermissionResult(boolean granted) { + micPermissionGranted = granted; + synchronized (micPermissionLock) { + micPermissionLock.notify(); + } + } + + /** + * Logs the Citra version, Android version and, CPU. + */ + public static native void LogDeviceInfo(); + + /** + * Button type for use in onTouchEvent + */ + public static final class ButtonType { + public static final int BUTTON_A = 0; + public static final int BUTTON_B = 1; + public static final int BUTTON_X = 2; + public static final int BUTTON_Y = 3; + public static final int BUTTON_START = 11; + public static final int BUTTON_SELECT = 12; + public static final int BUTTON_HOME = 19; + public static final int BUTTON_ZL = 9; + public static final int BUTTON_ZR = 10; + public static final int DPAD_UP = 14; + public static final int DPAD_DOWN = 16; + public static final int DPAD_LEFT = 13; + public static final int DPAD_RIGHT = 15; + public static final int STICK_LEFT = 5; + public static final int STICK_LEFT_UP = 714; + public static final int STICK_LEFT_DOWN = 715; + public static final int STICK_LEFT_LEFT = 716; + public static final int STICK_LEFT_RIGHT = 717; + public static final int STICK_C = 6; + public static final int STICK_C_UP = 719; + public static final int STICK_C_DOWN = 720; + public static final int STICK_C_LEFT = 771; + public static final int STICK_C_RIGHT = 772; + public static final int TRIGGER_L = 7; + public static final int TRIGGER_R = 8; + public static final int DPAD = 780; + public static final int BUTTON_DEBUG = 781; + public static final int BUTTON_GPIO14 = 782; + } + + /** + * Button states + */ + public static final class ButtonState { + public static final int RELEASED = 0; + public static final int PRESSED = 1; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/activities/CustomFilePickerActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/activities/CustomFilePickerActivity.java new file mode 100644 index 000000000..3083286e2 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/activities/CustomFilePickerActivity.java @@ -0,0 +1,38 @@ +package org.citra.citra_emu.activities; + +import android.content.Intent; +import android.os.Environment; + +import androidx.annotation.Nullable; + +import com.nononsenseapps.filepicker.AbstractFilePickerFragment; +import com.nononsenseapps.filepicker.FilePickerActivity; + +import org.citra.citra_emu.fragments.CustomFilePickerFragment; + +import java.io.File; + +public class CustomFilePickerActivity extends FilePickerActivity { + public static final String EXTRA_TITLE = "filepicker.intent.TITLE"; + public static final String EXTRA_EXTENSIONS = "filepicker.intent.EXTENSIONS"; + + @Override + protected AbstractFilePickerFragment getFragment( + @Nullable final String startPath, final int mode, final boolean allowMultiple, + final boolean allowCreateDir, final boolean allowExistingFile, + final boolean singleClick) { + CustomFilePickerFragment fragment = new CustomFilePickerFragment(); + // startPath is allowed to be null. In that case, default folder should be SD-card and not "/" + fragment.setArgs( + startPath != null ? startPath : Environment.getExternalStorageDirectory().getPath(), + mode, allowMultiple, allowCreateDir, allowExistingFile, singleClick); + + Intent intent = getIntent(); + int title = intent == null ? 0 : intent.getIntExtra(EXTRA_TITLE, 0); + fragment.setTitle(title); + String allowedExtensions = intent == null ? "*" : intent.getStringExtra(EXTRA_EXTENSIONS); + fragment.setAllowedExtensions(allowedExtensions); + + return fragment; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java new file mode 100644 index 000000000..47ef0fd23 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java @@ -0,0 +1,755 @@ +package org.citra.citra_emu.activities; + +import android.app.Activity; +import android.content.Intent; +import android.content.SharedPreferences; +import android.content.pm.PackageManager; +import android.os.Bundle; +import android.os.Handler; +import android.preference.PreferenceManager; +import android.util.SparseIntArray; +import android.view.InputDevice; +import android.view.KeyEvent; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; +import android.view.MotionEvent; +import android.view.View; +import android.widget.CheckBox; +import android.widget.SeekBar; +import android.widget.TextView; + +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.NotificationManagerCompat; +import androidx.fragment.app.FragmentActivity; + +import org.citra.citra_emu.CitraApplication; +import org.citra.citra_emu.NativeLibrary; +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.cheats.ui.CheatsActivity; +import org.citra.citra_emu.features.settings.model.view.InputBindingSetting; +import org.citra.citra_emu.features.settings.ui.SettingsActivity; +import org.citra.citra_emu.features.settings.utils.SettingsFile; +import org.citra.citra_emu.camera.StillImageCameraHelper; +import org.citra.citra_emu.fragments.EmulationFragment; +import org.citra.citra_emu.ui.main.MainActivity; +import org.citra.citra_emu.utils.ControllerMappingHelper; +import org.citra.citra_emu.utils.EmulationMenuSettings; +import org.citra.citra_emu.utils.FileBrowserHelper; +import org.citra.citra_emu.utils.FileUtil; +import org.citra.citra_emu.utils.ForegroundService; + +import java.io.File; +import java.io.IOException; +import java.lang.annotation.Retention; +import java.util.Collections; +import java.util.List; + +import static android.Manifest.permission.CAMERA; +import static android.Manifest.permission.RECORD_AUDIO; +import static java.lang.annotation.RetentionPolicy.SOURCE; + +public final class EmulationActivity extends AppCompatActivity { + public static final String EXTRA_SELECTED_GAME = "SelectedGame"; + public static final String EXTRA_SELECTED_TITLE = "SelectedTitle"; + public static final int MENU_ACTION_EDIT_CONTROLS_PLACEMENT = 0; + public static final int MENU_ACTION_TOGGLE_CONTROLS = 1; + public static final int MENU_ACTION_ADJUST_SCALE = 2; + public static final int MENU_ACTION_EXIT = 3; + public static final int MENU_ACTION_SHOW_FPS = 4; + public static final int MENU_ACTION_SCREEN_LAYOUT_LANDSCAPE = 5; + public static final int MENU_ACTION_SCREEN_LAYOUT_PORTRAIT = 6; + public static final int MENU_ACTION_SCREEN_LAYOUT_SINGLE = 7; + public static final int MENU_ACTION_SCREEN_LAYOUT_SIDEBYSIDE = 8; + public static final int MENU_ACTION_SWAP_SCREENS = 9; + public static final int MENU_ACTION_RESET_OVERLAY = 10; + public static final int MENU_ACTION_SHOW_OVERLAY = 11; + public static final int MENU_ACTION_OPEN_SETTINGS = 12; + public static final int MENU_ACTION_LOAD_AMIIBO = 13; + public static final int MENU_ACTION_REMOVE_AMIIBO = 14; + public static final int MENU_ACTION_JOYSTICK_REL_CENTER = 15; + public static final int MENU_ACTION_DPAD_SLIDE_ENABLE = 16; + public static final int MENU_ACTION_OPEN_CHEATS = 17; + + public static final int REQUEST_SELECT_AMIIBO = 2; + private static final int EMULATION_RUNNING_NOTIFICATION = 0x1000; + private static SparseIntArray buttonsActionsMap = new SparseIntArray(); + + static { + buttonsActionsMap.append(R.id.menu_emulation_edit_layout, + EmulationActivity.MENU_ACTION_EDIT_CONTROLS_PLACEMENT); + buttonsActionsMap.append(R.id.menu_emulation_toggle_controls, + EmulationActivity.MENU_ACTION_TOGGLE_CONTROLS); + buttonsActionsMap + .append(R.id.menu_emulation_adjust_scale, EmulationActivity.MENU_ACTION_ADJUST_SCALE); + buttonsActionsMap.append(R.id.menu_emulation_show_fps, + EmulationActivity.MENU_ACTION_SHOW_FPS); + buttonsActionsMap.append(R.id.menu_screen_layout_landscape, + EmulationActivity.MENU_ACTION_SCREEN_LAYOUT_LANDSCAPE); + buttonsActionsMap.append(R.id.menu_screen_layout_portrait, + EmulationActivity.MENU_ACTION_SCREEN_LAYOUT_PORTRAIT); + buttonsActionsMap.append(R.id.menu_screen_layout_single, + EmulationActivity.MENU_ACTION_SCREEN_LAYOUT_SINGLE); + buttonsActionsMap.append(R.id.menu_screen_layout_sidebyside, + EmulationActivity.MENU_ACTION_SCREEN_LAYOUT_SIDEBYSIDE); + buttonsActionsMap.append(R.id.menu_emulation_swap_screens, + EmulationActivity.MENU_ACTION_SWAP_SCREENS); + buttonsActionsMap + .append(R.id.menu_emulation_reset_overlay, EmulationActivity.MENU_ACTION_RESET_OVERLAY); + buttonsActionsMap + .append(R.id.menu_emulation_show_overlay, EmulationActivity.MENU_ACTION_SHOW_OVERLAY); + buttonsActionsMap + .append(R.id.menu_emulation_open_settings, EmulationActivity.MENU_ACTION_OPEN_SETTINGS); + buttonsActionsMap + .append(R.id.menu_emulation_amiibo_load, EmulationActivity.MENU_ACTION_LOAD_AMIIBO); + buttonsActionsMap + .append(R.id.menu_emulation_amiibo_remove, EmulationActivity.MENU_ACTION_REMOVE_AMIIBO); + buttonsActionsMap.append(R.id.menu_emulation_joystick_rel_center, + EmulationActivity.MENU_ACTION_JOYSTICK_REL_CENTER); + buttonsActionsMap.append(R.id.menu_emulation_dpad_slide_enable, + EmulationActivity.MENU_ACTION_DPAD_SLIDE_ENABLE); + buttonsActionsMap + .append(R.id.menu_emulation_open_cheats, EmulationActivity.MENU_ACTION_OPEN_CHEATS); + } + + private View mDecorView; + private EmulationFragment mEmulationFragment; + private SharedPreferences mPreferences; + private ControllerMappingHelper mControllerMappingHelper; + private Intent foregroundService; + private boolean activityRecreated; + private String mSelectedTitle; + private String mPath; + + public static void launch(FragmentActivity activity, String path, String title) { + Intent launcher = new Intent(activity, EmulationActivity.class); + + launcher.putExtra(EXTRA_SELECTED_GAME, path); + launcher.putExtra(EXTRA_SELECTED_TITLE, title); + activity.startActivity(launcher); + } + + public static void tryDismissRunningNotification(Activity activity) { + NotificationManagerCompat.from(activity).cancel(EMULATION_RUNNING_NOTIFICATION); + } + + @Override + protected void onDestroy() { + stopService(foregroundService); + super.onDestroy(); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + if (savedInstanceState == null) { + // Get params we were passed + Intent gameToEmulate = getIntent(); + mPath = gameToEmulate.getStringExtra(EXTRA_SELECTED_GAME); + mSelectedTitle = gameToEmulate.getStringExtra(EXTRA_SELECTED_TITLE); + activityRecreated = false; + } else { + activityRecreated = true; + restoreState(savedInstanceState); + } + + mControllerMappingHelper = new ControllerMappingHelper(); + + // Get a handle to the Window containing the UI. + mDecorView = getWindow().getDecorView(); + mDecorView.setOnSystemUiVisibilityChangeListener(visibility -> + { + if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) { + // Go back to immersive fullscreen mode in 3s + Handler handler = new Handler(getMainLooper()); + handler.postDelayed(this::enableFullscreenImmersive, 3000 /* 3s */); + } + }); + // Set these options now so that the SurfaceView the game renders into is the right size. + enableFullscreenImmersive(); + + setTheme(R.style.CitraEmulationBase); + + setContentView(R.layout.activity_emulation); + + // Find or create the EmulationFragment + mEmulationFragment = (EmulationFragment) getSupportFragmentManager() + .findFragmentById(R.id.frame_emulation_fragment); + if (mEmulationFragment == null) { + mEmulationFragment = EmulationFragment.newInstance(mPath); + getSupportFragmentManager().beginTransaction() + .add(R.id.frame_emulation_fragment, mEmulationFragment) + .commit(); + } + + setTitle(mSelectedTitle); + + mPreferences = PreferenceManager.getDefaultSharedPreferences(this); + + // Start a foreground service to prevent the app from getting killed in the background + foregroundService = new Intent(EmulationActivity.this, ForegroundService.class); + startForegroundService(foregroundService); + } + + @Override + protected void onSaveInstanceState(@NonNull Bundle outState) { + outState.putString(EXTRA_SELECTED_GAME, mPath); + outState.putString(EXTRA_SELECTED_TITLE, mSelectedTitle); + super.onSaveInstanceState(outState); + } + + protected void restoreState(Bundle savedInstanceState) { + mPath = savedInstanceState.getString(EXTRA_SELECTED_GAME); + mSelectedTitle = savedInstanceState.getString(EXTRA_SELECTED_TITLE); + + // If an alert prompt was in progress when state was restored, retry displaying it + NativeLibrary.retryDisplayAlertPrompt(); + } + + @Override + public void onRestart() { + super.onRestart(); + } + + @Override + public void onBackPressed() { + NativeLibrary.PauseEmulation(); + new AlertDialog.Builder(this) + .setTitle(R.string.emulation_close_game) + .setMessage(R.string.emulation_close_game_message) + .setPositiveButton(android.R.string.yes, (dialogInterface, i) -> + { + mEmulationFragment.stopEmulation(); + finish(); + }) + .setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> + NativeLibrary.UnPauseEmulation()) + .setOnCancelListener(dialogInterface -> + NativeLibrary.UnPauseEmulation()) + .create() + .show(); + } + + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + switch (requestCode) { + case NativeLibrary.REQUEST_CODE_NATIVE_CAMERA: + if (grantResults[0] != PackageManager.PERMISSION_GRANTED && + shouldShowRequestPermissionRationale(CAMERA)) { + new AlertDialog.Builder(this) + .setTitle(R.string.camera) + .setMessage(R.string.camera_permission_needed) + .setPositiveButton(android.R.string.ok, null) + .show(); + } + NativeLibrary.CameraPermissionResult(grantResults[0] == PackageManager.PERMISSION_GRANTED); + break; + case NativeLibrary.REQUEST_CODE_NATIVE_MIC: + if (grantResults[0] != PackageManager.PERMISSION_GRANTED && + shouldShowRequestPermissionRationale(RECORD_AUDIO)) { + new AlertDialog.Builder(this) + .setTitle(R.string.microphone) + .setMessage(R.string.microphone_permission_needed) + .setPositiveButton(android.R.string.ok, null) + .show(); + } + NativeLibrary.MicPermissionResult(grantResults[0] == PackageManager.PERMISSION_GRANTED); + break; + default: + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + break; + } + } + + private void enableFullscreenImmersive() { + // It would be nice to use IMMERSIVE_STICKY, but that doesn't show the toolbar. + mDecorView.setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_STABLE | + View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | + View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | + View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | + View.SYSTEM_UI_FLAG_FULLSCREEN | + View.SYSTEM_UI_FLAG_IMMERSIVE); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.menu_emulation, menu); + + int layoutOptionMenuItem = R.id.menu_screen_layout_landscape; + switch (EmulationMenuSettings.getLandscapeScreenLayout()) { + case EmulationMenuSettings.LayoutOption_SingleScreen: + layoutOptionMenuItem = R.id.menu_screen_layout_single; + break; + case EmulationMenuSettings.LayoutOption_SideScreen: + layoutOptionMenuItem = R.id.menu_screen_layout_sidebyside; + break; + case EmulationMenuSettings.LayoutOption_MobilePortrait: + layoutOptionMenuItem = R.id.menu_screen_layout_portrait; + break; + } + + menu.findItem(layoutOptionMenuItem).setChecked(true); + menu.findItem(R.id.menu_emulation_joystick_rel_center).setChecked(EmulationMenuSettings.getJoystickRelCenter()); + menu.findItem(R.id.menu_emulation_dpad_slide_enable).setChecked(EmulationMenuSettings.getDpadSlideEnable()); + menu.findItem(R.id.menu_emulation_show_fps).setChecked(EmulationMenuSettings.getShowFps()); + menu.findItem(R.id.menu_emulation_swap_screens).setChecked(EmulationMenuSettings.getSwapScreens()); + menu.findItem(R.id.menu_emulation_show_overlay).setChecked(EmulationMenuSettings.getShowOverlay()); + + return true; + } + + private void DisplaySavestateWarning() { + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext()); + if (preferences.getBoolean("savestateWarningShown", false)) { + return; + } + + LayoutInflater inflater = mEmulationFragment.requireActivity().getLayoutInflater(); + View view = inflater.inflate(R.layout.dialog_checkbox, null); + CheckBox checkBox = view.findViewById(R.id.checkBox); + + new AlertDialog.Builder(this) + .setTitle(R.string.savestate_warning_title) + .setMessage(R.string.savestate_warning_message) + .setView(view) + .setPositiveButton(android.R.string.ok, (dialog, which) -> { + preferences.edit().putBoolean("savestateWarningShown", checkBox.isChecked()).apply(); + }) + .show(); + } + + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + super.onPrepareOptionsMenu(menu); + menu.findItem(R.id.menu_emulation_save_state).setVisible(false); + menu.findItem(R.id.menu_emulation_load_state).setVisible(false); + return true; + } + + @SuppressWarnings("WrongConstant") + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int action = buttonsActionsMap.get(item.getItemId(), -1); + + switch (action) { + // Edit the placement of the controls + case MENU_ACTION_EDIT_CONTROLS_PLACEMENT: + editControlsPlacement(); + break; + + // Enable/Disable specific buttons or the entire input overlay. + case MENU_ACTION_TOGGLE_CONTROLS: + toggleControls(); + break; + + // Adjust the scale of the overlay controls. + case MENU_ACTION_ADJUST_SCALE: + adjustScale(); + break; + + // Toggle the visibility of the Performance stats TextView + case MENU_ACTION_SHOW_FPS: { + final boolean isEnabled = !EmulationMenuSettings.getShowFps(); + EmulationMenuSettings.setShowFps(isEnabled); + item.setChecked(isEnabled); + + mEmulationFragment.updateShowFpsOverlay(); + break; + } + // Sets the screen layout to Landscape + case MENU_ACTION_SCREEN_LAYOUT_LANDSCAPE: + changeScreenOrientation(EmulationMenuSettings.LayoutOption_MobileLandscape, item); + break; + + // Sets the screen layout to Portrait + case MENU_ACTION_SCREEN_LAYOUT_PORTRAIT: + changeScreenOrientation(EmulationMenuSettings.LayoutOption_MobilePortrait, item); + break; + + // Sets the screen layout to Single + case MENU_ACTION_SCREEN_LAYOUT_SINGLE: + changeScreenOrientation(EmulationMenuSettings.LayoutOption_SingleScreen, item); + break; + + // Sets the screen layout to Side by Side + case MENU_ACTION_SCREEN_LAYOUT_SIDEBYSIDE: + changeScreenOrientation(EmulationMenuSettings.LayoutOption_SideScreen, item); + break; + + // Swap the top and bottom screen locations + case MENU_ACTION_SWAP_SCREENS: { + final boolean isEnabled = !EmulationMenuSettings.getSwapScreens(); + EmulationMenuSettings.setSwapScreens(isEnabled); + item.setChecked(isEnabled); + break; + } + + // Reset overlay placement + case MENU_ACTION_RESET_OVERLAY: + resetOverlay(); + break; + + // Show or hide overlay + case MENU_ACTION_SHOW_OVERLAY: { + final boolean isEnabled = !EmulationMenuSettings.getShowOverlay(); + EmulationMenuSettings.setShowOverlay(isEnabled); + item.setChecked(isEnabled); + + mEmulationFragment.refreshInputOverlay(); + break; + } + + case MENU_ACTION_EXIT: + mEmulationFragment.stopEmulation(); + finish(); + break; + + case MENU_ACTION_OPEN_SETTINGS: + SettingsActivity.launch(this, SettingsFile.FILE_NAME_CONFIG, ""); + break; + + case MENU_ACTION_LOAD_AMIIBO: + FileBrowserHelper.openFilePicker(this, REQUEST_SELECT_AMIIBO, + R.string.select_amiibo, + Collections.singletonList("bin"), false); + break; + + case MENU_ACTION_REMOVE_AMIIBO: + RemoveAmiibo(); + break; + + case MENU_ACTION_JOYSTICK_REL_CENTER: + final boolean isJoystickRelCenterEnabled = !EmulationMenuSettings.getJoystickRelCenter(); + EmulationMenuSettings.setJoystickRelCenter(isJoystickRelCenterEnabled); + item.setChecked(isJoystickRelCenterEnabled); + break; + + case MENU_ACTION_DPAD_SLIDE_ENABLE: + final boolean isDpadSlideEnabled = !EmulationMenuSettings.getDpadSlideEnable(); + EmulationMenuSettings.setDpadSlideEnable(isDpadSlideEnabled); + item.setChecked(isDpadSlideEnabled); + break; + + case MENU_ACTION_OPEN_CHEATS: + CheatsActivity.launch(this); + break; + } + + return true; + } + + private void changeScreenOrientation(int layoutOption, MenuItem item) { + item.setChecked(true); + NativeLibrary.NotifyOrientationChange(layoutOption, getWindowManager().getDefaultDisplay() + .getRotation()); + EmulationMenuSettings.setLandscapeScreenLayout(layoutOption); + } + + private void editControlsPlacement() { + if (mEmulationFragment.isConfiguringControls()) { + mEmulationFragment.stopConfiguringControls(); + } else { + mEmulationFragment.startConfiguringControls(); + } + } + + // Gets button presses + @Override + public boolean dispatchKeyEvent(KeyEvent event) { + int action; + int button = mPreferences.getInt(InputBindingSetting.getInputButtonKey(event.getKeyCode()), event.getKeyCode()); + + switch (event.getAction()) { + case KeyEvent.ACTION_DOWN: + // Handling the case where the back button is pressed. + if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) { + onBackPressed(); + return true; + } + + // Normal key events. + action = NativeLibrary.ButtonState.PRESSED; + break; + case KeyEvent.ACTION_UP: + action = NativeLibrary.ButtonState.RELEASED; + break; + default: + return false; + } + InputDevice input = event.getDevice(); + + if (input == null) { + // Controller was disconnected + return false; + } + + return NativeLibrary.onGamePadEvent(input.getDescriptor(), button, action); + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent result) { + super.onActivityResult(requestCode, resultCode, result); + switch (requestCode) { + case StillImageCameraHelper.REQUEST_CAMERA_FILE_PICKER: + StillImageCameraHelper.OnFilePickerResult(resultCode == RESULT_OK ? result : null); + break; + case REQUEST_SELECT_AMIIBO: + // If the user picked a file, as opposed to just backing out. + if (resultCode == MainActivity.RESULT_OK) { + String[] selectedFiles = FileBrowserHelper.getSelectedFiles(result); + if (selectedFiles == null) + return; + + onAmiiboSelected(selectedFiles[0]); + } + break; + } + } + + private void onAmiiboSelected(String selectedFile) { + File file = new File(selectedFile); + boolean success = false; + try { + byte[] bytes = FileUtil.getBytesFromFile(file); + } catch (IOException e) { + e.printStackTrace(); + } + + if (!success) { + new AlertDialog.Builder(this) + .setTitle(R.string.amiibo_load_error) + .setMessage(R.string.amiibo_load_error_message) + .setPositiveButton(android.R.string.ok, null) + .create() + .show(); + } + } + + private void RemoveAmiibo() { + + } + + private void toggleControls() { + final SharedPreferences.Editor editor = mPreferences.edit(); + boolean[] enabledButtons = new boolean[14]; + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(R.string.emulation_toggle_controls); + + for (int i = 0; i < enabledButtons.length; i++) { + // Buttons that are disabled by default + boolean defaultValue = true; + switch (i) { + case 6: // ZL + case 7: // ZR + case 12: // C-stick + defaultValue = false; + break; + } + + enabledButtons[i] = mPreferences.getBoolean("buttonToggle" + i, defaultValue); + } + builder.setMultiChoiceItems(R.array.n3dsButtons, enabledButtons, + (dialog, indexSelected, isChecked) -> editor + .putBoolean("buttonToggle" + indexSelected, isChecked)); + builder.setPositiveButton(android.R.string.ok, (dialogInterface, i) -> + { + editor.apply(); + + mEmulationFragment.refreshInputOverlay(); + }); + + AlertDialog alertDialog = builder.create(); + alertDialog.show(); + } + + private void adjustScale() { + LayoutInflater inflater = LayoutInflater.from(this); + View view = inflater.inflate(R.layout.dialog_seekbar, null); + + final SeekBar seekbar = view.findViewById(R.id.seekbar); + final TextView value = view.findViewById(R.id.text_value); + final TextView units = view.findViewById(R.id.text_units); + + seekbar.setMax(150); + seekbar.setProgress(mPreferences.getInt("controlScale", 50)); + seekbar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { + public void onStartTrackingTouch(SeekBar seekBar) { + } + + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + value.setText(String.valueOf(progress + 50)); + } + + public void onStopTrackingTouch(SeekBar seekBar) { + setControlScale(seekbar.getProgress()); + } + }); + + value.setText(String.valueOf(seekbar.getProgress() + 50)); + units.setText("%"); + + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(R.string.emulation_control_scale); + builder.setView(view); + final int previousProgress = seekbar.getProgress(); + builder.setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> { + setControlScale(previousProgress); + }); + builder.setPositiveButton(android.R.string.ok, (dialogInterface, i) -> + { + setControlScale(seekbar.getProgress()); + }); + builder.setNeutralButton(R.string.slider_default, (dialogInterface, i) -> { + setControlScale(50); + }); + + AlertDialog alertDialog = builder.create(); + alertDialog.show(); + } + + private void setControlScale(int scale) { + SharedPreferences.Editor editor = mPreferences.edit(); + editor.putInt("controlScale", scale); + editor.apply(); + mEmulationFragment.refreshInputOverlay(); + } + + private void resetOverlay() { + new AlertDialog.Builder(this) + .setTitle(getString(R.string.emulation_touch_overlay_reset)) + .setPositiveButton(android.R.string.yes, (dialogInterface, i) -> mEmulationFragment.resetInputOverlay()) + .setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> { + }) + .create() + .show(); + } + + @Override + public boolean dispatchGenericMotionEvent(MotionEvent event) { + if (((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0)) { + return super.dispatchGenericMotionEvent(event); + } + + // Don't attempt to do anything if we are disconnecting a device. + if (event.getActionMasked() == MotionEvent.ACTION_CANCEL) { + return true; + } + + InputDevice input = event.getDevice(); + List motions = input.getMotionRanges(); + + float[] axisValuesCirclePad = {0.0f, 0.0f}; + float[] axisValuesCStick = {0.0f, 0.0f}; + float[] axisValuesDPad = {0.0f, 0.0f}; + boolean isTriggerPressedLMapped = false; + boolean isTriggerPressedRMapped = false; + boolean isTriggerPressedZLMapped = false; + boolean isTriggerPressedZRMapped = false; + boolean isTriggerPressedL = false; + boolean isTriggerPressedR = false; + boolean isTriggerPressedZL = false; + boolean isTriggerPressedZR = false; + + for (InputDevice.MotionRange range : motions) { + int axis = range.getAxis(); + float origValue = event.getAxisValue(axis); + float value = mControllerMappingHelper.scaleAxis(input, axis, origValue); + int nextMapping = mPreferences.getInt(InputBindingSetting.getInputAxisButtonKey(axis), -1); + int guestOrientation = mPreferences.getInt(InputBindingSetting.getInputAxisOrientationKey(axis), -1); + + if (nextMapping == -1 || guestOrientation == -1) { + // Axis is unmapped + continue; + } + + if ((value > 0.f && value < 0.1f) || (value < 0.f && value > -0.1f)) { + // Skip joystick wobble + value = 0.f; + } + + if (nextMapping == NativeLibrary.ButtonType.STICK_LEFT) { + axisValuesCirclePad[guestOrientation] = value; + } else if (nextMapping == NativeLibrary.ButtonType.STICK_C) { + axisValuesCStick[guestOrientation] = value; + } else if (nextMapping == NativeLibrary.ButtonType.DPAD) { + axisValuesDPad[guestOrientation] = value; + } else if (nextMapping == NativeLibrary.ButtonType.TRIGGER_L) { + isTriggerPressedLMapped = true; + isTriggerPressedL = value != 0.f; + } else if (nextMapping == NativeLibrary.ButtonType.TRIGGER_R) { + isTriggerPressedRMapped = true; + isTriggerPressedR = value != 0.f; + } else if (nextMapping == NativeLibrary.ButtonType.BUTTON_ZL) { + isTriggerPressedZLMapped = true; + isTriggerPressedZL = value != 0.f; + } else if (nextMapping == NativeLibrary.ButtonType.BUTTON_ZR) { + isTriggerPressedZRMapped = true; + isTriggerPressedZR = value != 0.f; + } + } + + // Circle-Pad and C-Stick status + NativeLibrary.onGamePadMoveEvent(input.getDescriptor(), NativeLibrary.ButtonType.STICK_LEFT, axisValuesCirclePad[0], axisValuesCirclePad[1]); + NativeLibrary.onGamePadMoveEvent(input.getDescriptor(), NativeLibrary.ButtonType.STICK_C, axisValuesCStick[0], axisValuesCStick[1]); + + // Triggers L/R and ZL/ZR + if (isTriggerPressedLMapped) { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.TRIGGER_L, isTriggerPressedL ? NativeLibrary.ButtonState.PRESSED : NativeLibrary.ButtonState.RELEASED); + } + if (isTriggerPressedRMapped) { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.TRIGGER_R, isTriggerPressedR ? NativeLibrary.ButtonState.PRESSED : NativeLibrary.ButtonState.RELEASED); + } + if (isTriggerPressedZLMapped) { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.BUTTON_ZL, isTriggerPressedZL ? NativeLibrary.ButtonState.PRESSED : NativeLibrary.ButtonState.RELEASED); + } + if (isTriggerPressedZRMapped) { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.BUTTON_ZR, isTriggerPressedZR ? NativeLibrary.ButtonState.PRESSED : NativeLibrary.ButtonState.RELEASED); + } + + // Work-around to allow D-pad axis to be bound to emulated buttons + if (axisValuesDPad[0] == 0.f) { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.DPAD_LEFT, NativeLibrary.ButtonState.RELEASED); + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.DPAD_RIGHT, NativeLibrary.ButtonState.RELEASED); + } + if (axisValuesDPad[0] < 0.f) { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.DPAD_LEFT, NativeLibrary.ButtonState.PRESSED); + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.DPAD_RIGHT, NativeLibrary.ButtonState.RELEASED); + } + if (axisValuesDPad[0] > 0.f) { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.DPAD_LEFT, NativeLibrary.ButtonState.RELEASED); + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.DPAD_RIGHT, NativeLibrary.ButtonState.PRESSED); + } + if (axisValuesDPad[1] == 0.f) { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.DPAD_UP, NativeLibrary.ButtonState.RELEASED); + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.DPAD_DOWN, NativeLibrary.ButtonState.RELEASED); + } + if (axisValuesDPad[1] < 0.f) { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.DPAD_UP, NativeLibrary.ButtonState.PRESSED); + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.DPAD_DOWN, NativeLibrary.ButtonState.RELEASED); + } + if (axisValuesDPad[1] > 0.f) { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.DPAD_UP, NativeLibrary.ButtonState.RELEASED); + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, NativeLibrary.ButtonType.DPAD_DOWN, NativeLibrary.ButtonState.PRESSED); + } + + return true; + } + + public boolean isActivityRecreated() { + return activityRecreated; + } + + @Retention(SOURCE) + @IntDef({MENU_ACTION_EDIT_CONTROLS_PLACEMENT, MENU_ACTION_TOGGLE_CONTROLS, MENU_ACTION_ADJUST_SCALE, + MENU_ACTION_EXIT, MENU_ACTION_SHOW_FPS, MENU_ACTION_SCREEN_LAYOUT_LANDSCAPE, + MENU_ACTION_SCREEN_LAYOUT_PORTRAIT, MENU_ACTION_SCREEN_LAYOUT_SINGLE, MENU_ACTION_SCREEN_LAYOUT_SIDEBYSIDE, + MENU_ACTION_SWAP_SCREENS, MENU_ACTION_RESET_OVERLAY, MENU_ACTION_SHOW_OVERLAY, MENU_ACTION_OPEN_SETTINGS}) + public @interface MenuAction { + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java b/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java new file mode 100644 index 000000000..bc791638a --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java @@ -0,0 +1,247 @@ +package org.citra.citra_emu.adapters; + +import android.database.Cursor; +import android.database.DataSetObserver; +import android.graphics.Rect; +import android.graphics.drawable.Drawable; +import android.os.Build; +import android.os.SystemClock; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.FragmentActivity; +import androidx.recyclerview.widget.RecyclerView; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.activities.EmulationActivity; +import org.citra.citra_emu.model.GameDatabase; +import org.citra.citra_emu.ui.DividerItemDecoration; +import org.citra.citra_emu.utils.Log; +import org.citra.citra_emu.utils.PicassoUtils; +import org.citra.citra_emu.viewholders.GameViewHolder; + +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.stream.Stream; + +/** + * This adapter gets its information from a database Cursor. This fact, paired with the usage of + * ContentProviders and Loaders, allows for efficient display of a limited view into a (possibly) + * large dataset. + */ +public final class GameAdapter extends RecyclerView.Adapter implements + View.OnClickListener { + private Cursor mCursor; + private GameDataSetObserver mObserver; + + private boolean mDatasetValid; + private long mLastClickTime = 0; + + /** + * Initializes the adapter's observer, which watches for changes to the dataset. The adapter will + * display no data until a Cursor is supplied by a CursorLoader. + */ + public GameAdapter() { + mDatasetValid = false; + mObserver = new GameDataSetObserver(); + } + + /** + * Called by the LayoutManager when it is necessary to create a new view. + * + * @param parent The RecyclerView (I think?) the created view will be thrown into. + * @param viewType Not used here, but useful when more than one type of child will be used in the RecyclerView. + * @return The created ViewHolder with references to all the child view's members. + */ + @Override + public GameViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + // Create a new view. + View gameCard = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.card_game, parent, false); + + gameCard.setOnClickListener(this); + + // Use that view to create a ViewHolder. + return new GameViewHolder(gameCard); + } + + /** + * Called by the LayoutManager when a new view is not necessary because we can recycle + * an existing one (for example, if a view just scrolled onto the screen from the bottom, we + * can use the view that just scrolled off the top instead of inflating a new one.) + * + * @param holder A ViewHolder representing the view we're recycling. + * @param position The position of the 'new' view in the dataset. + */ + @RequiresApi(api = Build.VERSION_CODES.O) + @Override + public void onBindViewHolder(@NonNull GameViewHolder holder, int position) { + if (mDatasetValid) { + if (mCursor.moveToPosition(position)) { + PicassoUtils.loadGameIcon(holder.imageIcon, + mCursor.getString(GameDatabase.GAME_COLUMN_PATH)); + + holder.textGameTitle.setText(mCursor.getString(GameDatabase.GAME_COLUMN_TITLE).replaceAll("[\\t\\n\\r]+", " ")); + holder.textCompany.setText(mCursor.getString(GameDatabase.GAME_COLUMN_COMPANY)); + + final Path gamePath = Paths.get(mCursor.getString(GameDatabase.GAME_COLUMN_PATH)); + holder.textFileName.setText(gamePath.getFileName().toString()); + + // TODO These shouldn't be necessary once the move to a DB-based model is complete. + holder.gameId = mCursor.getString(GameDatabase.GAME_COLUMN_GAME_ID); + holder.path = mCursor.getString(GameDatabase.GAME_COLUMN_PATH); + holder.title = mCursor.getString(GameDatabase.GAME_COLUMN_TITLE); + holder.description = mCursor.getString(GameDatabase.GAME_COLUMN_DESCRIPTION); + holder.regions = mCursor.getString(GameDatabase.GAME_COLUMN_REGIONS); + holder.company = mCursor.getString(GameDatabase.GAME_COLUMN_COMPANY); + + final int backgroundColorId = isValidGame(holder.path) ? R.color.card_view_background : R.color.card_view_disabled; + View itemView = holder.getItemView(); + itemView.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), backgroundColorId)); + } else { + Log.error("[GameAdapter] Can't bind view; Cursor is not valid."); + } + } else { + Log.error("[GameAdapter] Can't bind view; dataset is not valid."); + } + } + + /** + * Called by the LayoutManager to find out how much data we have. + * + * @return Size of the dataset. + */ + @Override + public int getItemCount() { + if (mDatasetValid && mCursor != null) { + return mCursor.getCount(); + } + Log.error("[GameAdapter] Dataset is not valid."); + return 0; + } + + /** + * Return the contents of the _id column for a given row. + * + * @param position The row for which Android wants an ID. + * @return A valid ID from the database, or 0 if not available. + */ + @Override + public long getItemId(int position) { + if (mDatasetValid && mCursor != null) { + if (mCursor.moveToPosition(position)) { + return mCursor.getLong(GameDatabase.COLUMN_DB_ID); + } + } + + Log.error("[GameAdapter] Dataset is not valid."); + return 0; + } + + /** + * Tell Android whether or not each item in the dataset has a stable identifier. + * Which it does, because it's a database, so always tell Android 'true'. + * + * @param hasStableIds ignored. + */ + @Override + public void setHasStableIds(boolean hasStableIds) { + super.setHasStableIds(true); + } + + /** + * When a load is finished, call this to replace the existing data with the newly-loaded + * data. + * + * @param cursor The newly-loaded Cursor. + */ + public void swapCursor(Cursor cursor) { + // Sanity check. + if (cursor == mCursor) { + return; + } + + // Before getting rid of the old cursor, disassociate it from the Observer. + final Cursor oldCursor = mCursor; + if (oldCursor != null && mObserver != null) { + oldCursor.unregisterDataSetObserver(mObserver); + } + + mCursor = cursor; + if (mCursor != null) { + // Attempt to associate the new Cursor with the Observer. + if (mObserver != null) { + mCursor.registerDataSetObserver(mObserver); + } + + mDatasetValid = true; + } else { + mDatasetValid = false; + } + + notifyDataSetChanged(); + } + + /** + * Launches the game that was clicked on. + * + * @param view The card representing the game the user wants to play. + */ + @Override + public void onClick(View view) { + // Double-click prevention, using threshold of 1000 ms + if (SystemClock.elapsedRealtime() - mLastClickTime < 1000) { + return; + } + mLastClickTime = SystemClock.elapsedRealtime(); + + GameViewHolder holder = (GameViewHolder) view.getTag(); + + EmulationActivity.launch((FragmentActivity) view.getContext(), holder.path, holder.title); + } + + public static class SpacesItemDecoration extends DividerItemDecoration { + private int space; + + public SpacesItemDecoration(Drawable divider, int space) { + super(divider); + this.space = space; + } + + @Override + public void getItemOffsets(Rect outRect, @NonNull View view, @NonNull RecyclerView parent, + @NonNull RecyclerView.State state) { + outRect.left = 0; + outRect.right = 0; + outRect.bottom = space; + outRect.top = 0; + } + } + + private boolean isValidGame(String path) { + return Stream.of( + ".rar", ".zip", ".7z", ".torrent", ".tar", ".gz").noneMatch(suffix -> path.toLowerCase().endsWith(suffix)); + } + + private final class GameDataSetObserver extends DataSetObserver { + @Override + public void onChanged() { + super.onChanged(); + + mDatasetValid = true; + notifyDataSetChanged(); + } + + @Override + public void onInvalidated() { + super.onInvalidated(); + + mDatasetValid = false; + notifyDataSetChanged(); + } + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/applets/MiiSelector.java b/src/android/app/src/main/java/org/citra/citra_emu/applets/MiiSelector.java new file mode 100644 index 000000000..3586a9b34 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/applets/MiiSelector.java @@ -0,0 +1,122 @@ +// Copyright 2020 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +package org.citra.citra_emu.applets; + +import android.app.Activity; +import android.app.Dialog; +import android.os.Bundle; + +import org.citra.citra_emu.NativeLibrary; +import org.citra.citra_emu.R; +import org.citra.citra_emu.activities.EmulationActivity; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Objects; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; + +public final class MiiSelector { + public static class MiiSelectorConfig implements java.io.Serializable { + public boolean enable_cancel_button; + public String title; + public long initially_selected_mii_index; + // List of Miis to display + public String[] mii_names; + } + + public static class MiiSelectorData { + public long return_code; + public int index; + + private MiiSelectorData(long return_code, int index) { + this.return_code = return_code; + this.index = index; + } + } + + public static class MiiSelectorDialogFragment extends DialogFragment { + static MiiSelectorDialogFragment newInstance(MiiSelectorConfig config) { + MiiSelectorDialogFragment frag = new MiiSelectorDialogFragment(); + Bundle args = new Bundle(); + args.putSerializable("config", config); + frag.setArguments(args); + return frag; + } + + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + final Activity emulationActivity = Objects.requireNonNull(getActivity()); + + MiiSelectorConfig config = + Objects.requireNonNull((MiiSelectorConfig) Objects.requireNonNull(getArguments()) + .getSerializable("config")); + + // Note: we intentionally leave out the Standard Mii in the native code so that + // the string can get translated + ArrayList list = new ArrayList<>(); + list.add(emulationActivity.getString(R.string.standard_mii)); + list.addAll(Arrays.asList(config.mii_names)); + + final int initialIndex = config.initially_selected_mii_index < list.size() + ? (int) config.initially_selected_mii_index + : 0; + data.index = initialIndex; + AlertDialog.Builder builder = + new AlertDialog.Builder(emulationActivity) + .setTitle(config.title.isEmpty() + ? emulationActivity.getString(R.string.mii_selector) + : config.title) + .setSingleChoiceItems(list.toArray(new String[]{}), initialIndex, + (dialog, which) -> { + data.index = which; + }) + .setPositiveButton(android.R.string.ok, (dialog, which) -> { + data.return_code = 0; + synchronized (finishLock) { + finishLock.notifyAll(); + } + }); + if (config.enable_cancel_button) { + builder.setNegativeButton(android.R.string.cancel, (dialog, which) -> { + data.return_code = 1; + synchronized (finishLock) { + finishLock.notifyAll(); + } + }); + } + setCancelable(false); + return builder.create(); + } + } + + private static MiiSelectorData data; + private static final Object finishLock = new Object(); + + private static void ExecuteImpl(MiiSelectorConfig config) { + final EmulationActivity emulationActivity = NativeLibrary.sEmulationActivity.get(); + + data = new MiiSelectorData(0, 0); + + MiiSelectorDialogFragment fragment = MiiSelectorDialogFragment.newInstance(config); + fragment.show(emulationActivity.getSupportFragmentManager(), "mii_selector"); + } + + public static MiiSelectorData Execute(MiiSelectorConfig config) { + NativeLibrary.sEmulationActivity.get().runOnUiThread(() -> ExecuteImpl(config)); + + synchronized (finishLock) { + try { + finishLock.wait(); + } catch (Exception ignored) { + } + } + + return data; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/applets/SoftwareKeyboard.java b/src/android/app/src/main/java/org/citra/citra_emu/applets/SoftwareKeyboard.java new file mode 100644 index 000000000..7be5f6d97 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/applets/SoftwareKeyboard.java @@ -0,0 +1,264 @@ +// Copyright 2020 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +package org.citra.citra_emu.applets; + +import android.app.Activity; +import android.app.Dialog; +import android.content.DialogInterface; +import android.os.Bundle; +import android.text.InputFilter; +import android.text.Spanned; +import android.view.ViewGroup; +import android.widget.EditText; +import android.widget.FrameLayout; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; + +import org.citra.citra_emu.CitraApplication; +import org.citra.citra_emu.NativeLibrary; +import org.citra.citra_emu.R; +import org.citra.citra_emu.activities.EmulationActivity; +import org.citra.citra_emu.utils.Log; + +import java.util.Objects; + +public final class SoftwareKeyboard { + /// Corresponds to Frontend::ButtonConfig + private interface ButtonConfig { + int Single = 0; /// Ok button + int Dual = 1; /// Cancel | Ok buttons + int Triple = 2; /// Cancel | I Forgot | Ok buttons + int None = 3; /// No button (returned by swkbdInputText in special cases) + } + + /// Corresponds to Frontend::ValidationError + public enum ValidationError { + None, + // Button Selection + ButtonOutOfRange, + // Configured Filters + MaxDigitsExceeded, + AtSignNotAllowed, + PercentNotAllowed, + BackslashNotAllowed, + ProfanityNotAllowed, + CallbackFailed, + // Allowed Input Type + FixedLengthRequired, + MaxLengthExceeded, + BlankInputNotAllowed, + EmptyInputNotAllowed, + } + + public static class KeyboardConfig implements java.io.Serializable { + public int button_config; + public int max_text_length; + public boolean multiline_mode; /// True if the keyboard accepts multiple lines of input + public String hint_text; /// Displayed in the field as a hint before + @Nullable + public String[] button_text; /// Contains the button text that the caller provides + } + + /// Corresponds to Frontend::KeyboardData + public static class KeyboardData { + public int button; + public String text; + + private KeyboardData(int button, String text) { + this.button = button; + this.text = text; + } + } + + private static class Filter implements InputFilter { + @Override + public CharSequence filter(CharSequence source, int start, int end, Spanned dest, + int dstart, int dend) { + String text = new StringBuilder(dest) + .replace(dstart, dend, source.subSequence(start, end).toString()) + .toString(); + if (ValidateFilters(text) == ValidationError.None) { + return null; // Accept replacement + } + return dest.subSequence(dstart, dend); // Request the subsequence to be unchanged + } + } + + public static class KeyboardDialogFragment extends DialogFragment { + static KeyboardDialogFragment newInstance(KeyboardConfig config) { + KeyboardDialogFragment frag = new KeyboardDialogFragment(); + Bundle args = new Bundle(); + args.putSerializable("config", config); + frag.setArguments(args); + return frag; + } + + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + final Activity emulationActivity = getActivity(); + assert emulationActivity != null; + + FrameLayout.LayoutParams params = new FrameLayout.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); + params.leftMargin = params.rightMargin = + CitraApplication.getAppContext().getResources().getDimensionPixelSize( + R.dimen.dialog_margin); + + KeyboardConfig config = Objects.requireNonNull( + (KeyboardConfig) Objects.requireNonNull(getArguments()).getSerializable("config")); + + // Set up the input + EditText editText = new EditText(CitraApplication.getAppContext()); + editText.setHint(config.hint_text); + editText.setSingleLine(!config.multiline_mode); + editText.setLayoutParams(params); + editText.setFilters(new InputFilter[]{ + new Filter(), new InputFilter.LengthFilter(config.max_text_length)}); + + FrameLayout container = new FrameLayout(emulationActivity); + container.addView(editText); + + AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity) + .setTitle(R.string.software_keyboard) + .setView(container); + setCancelable(false); + + switch (config.button_config) { + case ButtonConfig.Triple: { + final String text = config.button_text[1].isEmpty() + ? emulationActivity.getString(R.string.i_forgot) + : config.button_text[1]; + builder.setNeutralButton(text, null); + } + // fallthrough + case ButtonConfig.Dual: { + final String text = config.button_text[0].isEmpty() + ? emulationActivity.getString(android.R.string.cancel) + : config.button_text[0]; + builder.setNegativeButton(text, null); + } + // fallthrough + case ButtonConfig.Single: { + final String text = config.button_text[2].isEmpty() + ? emulationActivity.getString(android.R.string.ok) + : config.button_text[2]; + builder.setPositiveButton(text, null); + break; + } + } + + final AlertDialog dialog = builder.create(); + dialog.create(); + if (dialog.getButton(DialogInterface.BUTTON_POSITIVE) != null) { + dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener((view) -> { + data.button = config.button_config; + data.text = editText.getText().toString(); + final ValidationError error = ValidateInput(data.text); + if (error != ValidationError.None) { + HandleValidationError(config, error); + return; + } + + dialog.dismiss(); + + synchronized (finishLock) { + finishLock.notifyAll(); + } + }); + } + if (dialog.getButton(DialogInterface.BUTTON_NEUTRAL) != null) { + dialog.getButton(DialogInterface.BUTTON_NEUTRAL).setOnClickListener((view) -> { + data.button = 1; + dialog.dismiss(); + synchronized (finishLock) { + finishLock.notifyAll(); + } + }); + } + if (dialog.getButton(DialogInterface.BUTTON_NEGATIVE) != null) { + dialog.getButton(DialogInterface.BUTTON_NEGATIVE).setOnClickListener((view) -> { + data.button = 0; + dialog.dismiss(); + synchronized (finishLock) { + finishLock.notifyAll(); + } + }); + } + + return dialog; + } + } + + private static KeyboardData data; + private static final Object finishLock = new Object(); + + private static void ExecuteImpl(KeyboardConfig config) { + final EmulationActivity emulationActivity = NativeLibrary.sEmulationActivity.get(); + + data = new KeyboardData(0, ""); + + KeyboardDialogFragment fragment = KeyboardDialogFragment.newInstance(config); + fragment.show(emulationActivity.getSupportFragmentManager(), "keyboard"); + } + + private static void HandleValidationError(KeyboardConfig config, ValidationError error) { + final EmulationActivity emulationActivity = NativeLibrary.sEmulationActivity.get(); + String message = ""; + switch (error) { + case FixedLengthRequired: + message = + emulationActivity.getString(R.string.fixed_length_required, config.max_text_length); + break; + case MaxLengthExceeded: + message = + emulationActivity.getString(R.string.max_length_exceeded, config.max_text_length); + break; + case BlankInputNotAllowed: + message = emulationActivity.getString(R.string.blank_input_not_allowed); + break; + case EmptyInputNotAllowed: + message = emulationActivity.getString(R.string.empty_input_not_allowed); + break; + } + + new AlertDialog.Builder(emulationActivity) + .setTitle(R.string.software_keyboard) + .setMessage(message) + .setPositiveButton(android.R.string.ok, null) + .show(); + } + + public static KeyboardData Execute(KeyboardConfig config) { + if (config.button_config == ButtonConfig.None) { + Log.error("Unexpected button config None"); + return new KeyboardData(0, ""); + } + + NativeLibrary.sEmulationActivity.get().runOnUiThread(() -> ExecuteImpl(config)); + + synchronized (finishLock) { + try { + finishLock.wait(); + } catch (Exception ignored) { + } + } + + return data; + } + + public static void ShowError(String error) { + NativeLibrary.displayAlertMsg( + CitraApplication.getAppContext().getResources().getString(R.string.software_keyboard), + error, false); + } + + private static native ValidationError ValidateFilters(String text); + + private static native ValidationError ValidateInput(String text); +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/camera/StillImageCameraHelper.java b/src/android/app/src/main/java/org/citra/citra_emu/camera/StillImageCameraHelper.java new file mode 100644 index 000000000..701cb0710 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/camera/StillImageCameraHelper.java @@ -0,0 +1,65 @@ +// Copyright 2020 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +package org.citra.citra_emu.camera; + +import android.content.Intent; +import android.graphics.Bitmap; +import android.provider.MediaStore; + +import org.citra.citra_emu.NativeLibrary; +import org.citra.citra_emu.R; +import org.citra.citra_emu.activities.EmulationActivity; +import org.citra.citra_emu.utils.PicassoUtils; + +import androidx.annotation.Nullable; + +// Used in native code. +public final class StillImageCameraHelper { + public static final int REQUEST_CAMERA_FILE_PICKER = 1; + private static final Object filePickerLock = new Object(); + private static @Nullable + String filePickerPath; + + // Opens file picker for camera. + public static @Nullable + String OpenFilePicker() { + final EmulationActivity emulationActivity = NativeLibrary.sEmulationActivity.get(); + + // At this point, we are assuming that we already have permissions as they are + // needed to launch a game + emulationActivity.runOnUiThread(() -> { + Intent intent = new Intent(Intent.ACTION_PICK); + intent.setDataAndType(MediaStore.Images.Media.INTERNAL_CONTENT_URI, "image/*"); + emulationActivity.startActivityForResult( + Intent.createChooser(intent, + emulationActivity.getString(R.string.camera_select_image)), + REQUEST_CAMERA_FILE_PICKER); + }); + + synchronized (filePickerLock) { + try { + filePickerLock.wait(); + } catch (InterruptedException ignored) { + } + } + + return filePickerPath; + } + + // Called from EmulationActivity. + public static void OnFilePickerResult(Intent result) { + filePickerPath = result == null ? null : result.getDataString(); + + synchronized (filePickerLock) { + filePickerLock.notifyAll(); + } + } + + // Blocking call. Load image from file and crop/resize it to fit in width x height. + @Nullable + public static Bitmap LoadImageFromFile(String uri, int width, int height) { + return PicassoUtils.LoadBitmapFromFile(uri, width, height); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/dialogs/MotionAlertDialog.java b/src/android/app/src/main/java/org/citra/citra_emu/dialogs/MotionAlertDialog.java new file mode 100644 index 000000000..0f10f1858 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/dialogs/MotionAlertDialog.java @@ -0,0 +1,140 @@ +package org.citra.citra_emu.dialogs; + +import android.content.Context; +import android.view.InputDevice; +import android.view.KeyEvent; +import android.view.MotionEvent; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; + +import org.citra.citra_emu.features.settings.model.view.InputBindingSetting; +import org.citra.citra_emu.utils.Log; + +import java.util.ArrayList; +import java.util.List; + +/** + * {@link AlertDialog} derivative that listens for + * motion events from controllers and joysticks. + */ +public final class MotionAlertDialog extends AlertDialog { + // The selected input preference + private final InputBindingSetting setting; + private final ArrayList mPreviousValues = new ArrayList<>(); + private int mPrevDeviceId = 0; + private boolean mWaitingForEvent = true; + + /** + * Constructor + * + * @param context The current {@link Context}. + * @param setting The Preference to show this dialog for. + */ + public MotionAlertDialog(Context context, InputBindingSetting setting) { + super(context); + + this.setting = setting; + } + + public boolean onKeyEvent(int keyCode, KeyEvent event) { + Log.debug("[MotionAlertDialog] Received key event: " + event.getAction()); + switch (event.getAction()) { + case KeyEvent.ACTION_UP: + setting.onKeyInput(event); + dismiss(); + // Even if we ignore the key, we still consume it. Thus return true regardless. + return true; + + default: + return false; + } + } + + @Override + public boolean onKeyLongPress(int keyCode, @NonNull KeyEvent event) { + return super.onKeyLongPress(keyCode, event); + } + + @Override + public boolean dispatchKeyEvent(KeyEvent event) { + // Handle this key if we care about it, otherwise pass it down the framework + return onKeyEvent(event.getKeyCode(), event) || super.dispatchKeyEvent(event); + } + + @Override + public boolean dispatchGenericMotionEvent(@NonNull MotionEvent event) { + // Handle this event if we care about it, otherwise pass it down the framework + return onMotionEvent(event) || super.dispatchGenericMotionEvent(event); + } + + private boolean onMotionEvent(MotionEvent event) { + if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0) + return false; + if (event.getAction() != MotionEvent.ACTION_MOVE) + return false; + + InputDevice input = event.getDevice(); + + List motionRanges = input.getMotionRanges(); + + if (input.getId() != mPrevDeviceId) { + mPreviousValues.clear(); + } + mPrevDeviceId = input.getId(); + boolean firstEvent = mPreviousValues.isEmpty(); + + int numMovedAxis = 0; + float axisMoveValue = 0.0f; + InputDevice.MotionRange lastMovedRange = null; + char lastMovedDir = '?'; + if (mWaitingForEvent) { + for (int i = 0; i < motionRanges.size(); i++) { + InputDevice.MotionRange range = motionRanges.get(i); + int axis = range.getAxis(); + float origValue = event.getAxisValue(axis); + float value = origValue;//ControllerMappingHelper.scaleAxis(input, axis, origValue); + if (firstEvent) { + mPreviousValues.add(value); + } else { + float previousValue = mPreviousValues.get(i); + + // Only handle the axes that are not neutral (more than 0.5) + // but ignore any axis that has a constant value (e.g. always 1) + if (Math.abs(value) > 0.5f && value != previousValue) { + // It is common to have multiple axes with the same physical input. For example, + // shoulder butters are provided as both AXIS_LTRIGGER and AXIS_BRAKE. + // To handle this, we ignore an axis motion that's the exact same as a motion + // we already saw. This way, we ignore axes with two names, but catch the case + // where a joystick is moved in two directions. + // ref: bottom of https://developer.android.com/training/game-controllers/controller-input.html + if (value != axisMoveValue) { + axisMoveValue = value; + numMovedAxis++; + lastMovedRange = range; + lastMovedDir = value < 0.0f ? '-' : '+'; + } + } + // Special case for d-pads (axis value jumps between 0 and 1 without any values + // in between). Without this, the user would need to press the d-pad twice + // due to the first press being caught by the "if (firstEvent)" case further up. + else if (Math.abs(value) < 0.25f && Math.abs(previousValue) > 0.75f) { + numMovedAxis++; + lastMovedRange = range; + lastMovedDir = previousValue < 0.0f ? '-' : '+'; + } + } + + mPreviousValues.set(i, value); + } + + // If only one axis moved, that's the winner. + if (numMovedAxis == 1) { + mWaitingForEvent = false; + setting.onMotionInput(input, lastMovedRange, lastMovedDir); + dismiss(); + } + } + return true; + } +} \ No newline at end of file diff --git a/src/android/app/src/main/java/org/citra/citra_emu/disk_shader_cache/DiskShaderCacheProgress.java b/src/android/app/src/main/java/org/citra/citra_emu/disk_shader_cache/DiskShaderCacheProgress.java new file mode 100644 index 000000000..d6d14cc5f --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/disk_shader_cache/DiskShaderCacheProgress.java @@ -0,0 +1,138 @@ +// Copyright 2021 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +package org.citra.citra_emu.disk_shader_cache; + +import android.app.Activity; +import android.app.Dialog; +import android.content.DialogInterface; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.ProgressBar; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; + +import org.citra.citra_emu.NativeLibrary; +import org.citra.citra_emu.R; +import org.citra.citra_emu.activities.EmulationActivity; +import org.citra.citra_emu.utils.Log; + +import java.util.Objects; + +public class DiskShaderCacheProgress { + + // Equivalent to VideoCore::LoadCallbackStage + public enum LoadCallbackStage { + Prepare, + Decompile, + Build, + Complete, + } + + private static final Object finishLock = new Object(); + private static ProgressDialogFragment fragment; + + public static class ProgressDialogFragment extends DialogFragment { + ProgressBar progressBar; + TextView progressText; + AlertDialog dialog; + + static ProgressDialogFragment newInstance(String title, String message) { + ProgressDialogFragment frag = new ProgressDialogFragment(); + Bundle args = new Bundle(); + args.putString("title", title); + args.putString("message", message); + frag.setArguments(args); + return frag; + } + + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + final Activity emulationActivity = Objects.requireNonNull(getActivity()); + + final String title = Objects.requireNonNull(Objects.requireNonNull(getArguments()).getString("title")); + final String message = Objects.requireNonNull(Objects.requireNonNull(getArguments()).getString("message")); + + LayoutInflater inflater = LayoutInflater.from(emulationActivity); + View view = inflater.inflate(R.layout.dialog_progress_bar, null); + + progressBar = view.findViewById(R.id.progress_bar); + progressText = view.findViewById(R.id.progress_text); + progressText.setText(""); + + setCancelable(false); + setRetainInstance(true); + + AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity); + builder.setTitle(title); + builder.setMessage(message); + builder.setView(view); + builder.setNegativeButton(android.R.string.cancel, null); + + dialog = builder.create(); + dialog.create(); + + dialog.getButton(DialogInterface.BUTTON_NEGATIVE).setOnClickListener((v) -> emulationActivity.onBackPressed()); + + synchronized (finishLock) { + finishLock.notifyAll(); + } + + return dialog; + } + + private void onUpdateProgress(String msg, int progress, int max) { + Objects.requireNonNull(getActivity()).runOnUiThread(() -> { + progressBar.setProgress(progress); + progressBar.setMax(max); + progressText.setText(String.format("%d/%d", progress, max)); + dialog.setMessage(msg); + }); + } + } + + private static void prepareDialog() { + NativeLibrary.sEmulationActivity.get().runOnUiThread(() -> { + final EmulationActivity emulationActivity = NativeLibrary.sEmulationActivity.get(); + fragment = ProgressDialogFragment.newInstance(emulationActivity.getString(R.string.loading), emulationActivity.getString(R.string.preparing_shaders)); + fragment.show(emulationActivity.getSupportFragmentManager(), "diskShaders"); + }); + + synchronized (finishLock) { + try { + finishLock.wait(); + } catch (Exception ignored) { + } + } + } + + public static void loadProgress(LoadCallbackStage stage, int progress, int max) { + final EmulationActivity emulationActivity = NativeLibrary.sEmulationActivity.get(); + if (emulationActivity == null) { + Log.error("[DiskShaderCacheProgress] EmulationActivity not present"); + return; + } + + switch (stage) { + case Prepare: + prepareDialog(); + break; + case Decompile: + fragment.onUpdateProgress(emulationActivity.getString(R.string.preparing_shaders), progress, max); + break; + case Build: + fragment.onUpdateProgress(emulationActivity.getString(R.string.building_shaders), progress, max); + break; + case Complete: + // Workaround for when dialog is dismissed when the app is in the background + fragment.dismissAllowingStateLoss(); + break; + } + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/Cheat.java b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/Cheat.java new file mode 100644 index 000000000..93b026364 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/Cheat.java @@ -0,0 +1,57 @@ +package org.citra.citra_emu.features.cheats.model; + +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +public class Cheat { + @Keep + private final long mPointer; + + private Runnable mEnabledChangedCallback = null; + + @Keep + private Cheat(long pointer) { + mPointer = pointer; + } + + @Override + protected native void finalize(); + + @NonNull + public native String getName(); + + @NonNull + public native String getNotes(); + + @NonNull + public native String getCode(); + + public native boolean getEnabled(); + + public void setEnabled(boolean enabled) { + setEnabledImpl(enabled); + onEnabledChanged(); + } + + private native void setEnabledImpl(boolean enabled); + + public void setEnabledChangedCallback(@Nullable Runnable callback) { + mEnabledChangedCallback = callback; + } + + private void onEnabledChanged() { + if (mEnabledChangedCallback != null) { + mEnabledChangedCallback.run(); + } + } + + /** + * If the code is valid, returns 0. Otherwise, returns the 1-based index + * for the line containing the error. + */ + public static native int isValidGatewayCode(@NonNull String code); + + public static native Cheat createGatewayCode(@NonNull String name, @NonNull String notes, + @NonNull String code); +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/CheatEngine.java b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/CheatEngine.java new file mode 100644 index 000000000..5748162bb --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/CheatEngine.java @@ -0,0 +1,13 @@ +package org.citra.citra_emu.features.cheats.model; + +public class CheatEngine { + public static native Cheat[] getCheats(); + + public static native void addCheat(Cheat cheat); + + public static native void removeCheat(int index); + + public static native void updateCheat(int index, Cheat newCheat); + + public static native void saveCheatFile(); +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/CheatsViewModel.java b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/CheatsViewModel.java new file mode 100644 index 000000000..66f4202d8 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/CheatsViewModel.java @@ -0,0 +1,177 @@ +package org.citra.citra_emu.features.cheats.model; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; + +public class CheatsViewModel extends ViewModel { + private int mSelectedCheatPosition = -1; + private final MutableLiveData mSelectedCheat = new MutableLiveData<>(null); + private final MutableLiveData mIsAdding = new MutableLiveData<>(false); + private final MutableLiveData mIsEditing = new MutableLiveData<>(false); + + private final MutableLiveData mCheatAddedEvent = new MutableLiveData<>(null); + private final MutableLiveData mCheatChangedEvent = new MutableLiveData<>(null); + private final MutableLiveData mCheatDeletedEvent = new MutableLiveData<>(null); + private final MutableLiveData mOpenDetailsViewEvent = new MutableLiveData<>(false); + + private Cheat[] mCheats; + private boolean mCheatsNeedSaving = false; + + public void load() { + mCheats = CheatEngine.getCheats(); + + for (int i = 0; i < mCheats.length; i++) { + int position = i; + mCheats[i].setEnabledChangedCallback(() -> { + mCheatsNeedSaving = true; + notifyCheatUpdated(position); + }); + } + } + + public void saveIfNeeded() { + if (mCheatsNeedSaving) { + CheatEngine.saveCheatFile(); + mCheatsNeedSaving = false; + } + } + + public Cheat[] getCheats() { + return mCheats; + } + + public LiveData getSelectedCheat() { + return mSelectedCheat; + } + + public void setSelectedCheat(Cheat cheat, int position) { + if (mIsEditing.getValue()) { + setIsEditing(false); + } + + mSelectedCheat.setValue(cheat); + mSelectedCheatPosition = position; + } + + public LiveData getIsAdding() { + return mIsAdding; + } + + public LiveData getIsEditing() { + return mIsEditing; + } + + public void setIsEditing(boolean isEditing) { + mIsEditing.setValue(isEditing); + + if (mIsAdding.getValue() && !isEditing) { + mIsAdding.setValue(false); + setSelectedCheat(null, -1); + } + } + + /** + * When a cheat is added, the integer stored in the returned LiveData + * changes to the position of that cheat, then changes back to null. + */ + public LiveData getCheatAddedEvent() { + return mCheatAddedEvent; + } + + private void notifyCheatAdded(int position) { + mCheatAddedEvent.setValue(position); + mCheatAddedEvent.setValue(null); + } + + public void startAddingCheat() { + mSelectedCheat.setValue(null); + mSelectedCheatPosition = -1; + + mIsAdding.setValue(true); + mIsEditing.setValue(true); + } + + public void finishAddingCheat(Cheat cheat) { + if (!mIsAdding.getValue()) { + throw new IllegalStateException(); + } + + mIsAdding.setValue(false); + mIsEditing.setValue(false); + + int position = mCheats.length; + + CheatEngine.addCheat(cheat); + + mCheatsNeedSaving = true; + load(); + + notifyCheatAdded(position); + setSelectedCheat(mCheats[position], position); + } + + /** + * When a cheat is edited, the integer stored in the returned LiveData + * changes to the position of that cheat, then changes back to null. + */ + public LiveData getCheatUpdatedEvent() { + return mCheatChangedEvent; + } + + /** + * Notifies that an edit has been made to the contents of the cheat at the given position. + */ + private void notifyCheatUpdated(int position) { + mCheatChangedEvent.setValue(position); + mCheatChangedEvent.setValue(null); + } + + public void updateSelectedCheat(Cheat newCheat) { + CheatEngine.updateCheat(mSelectedCheatPosition, newCheat); + + mCheatsNeedSaving = true; + load(); + + notifyCheatUpdated(mSelectedCheatPosition); + setSelectedCheat(mCheats[mSelectedCheatPosition], mSelectedCheatPosition); + } + + /** + * When a cheat is deleted, the integer stored in the returned LiveData + * changes to the position of that cheat, then changes back to null. + */ + public LiveData getCheatDeletedEvent() { + return mCheatDeletedEvent; + } + + /** + * Notifies that the cheat at the given position has been deleted. + */ + private void notifyCheatDeleted(int position) { + mCheatDeletedEvent.setValue(position); + mCheatDeletedEvent.setValue(null); + } + + public void deleteSelectedCheat() { + int position = mSelectedCheatPosition; + + setSelectedCheat(null, -1); + + CheatEngine.removeCheat(position); + + mCheatsNeedSaving = true; + load(); + + notifyCheatDeleted(position); + } + + public LiveData getOpenDetailsViewEvent() { + return mOpenDetailsViewEvent; + } + + public void openDetailsView() { + mOpenDetailsViewEvent.setValue(true); + mOpenDetailsViewEvent.setValue(false); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatDetailsFragment.java b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatDetailsFragment.java new file mode 100644 index 000000000..762cdb80e --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatDetailsFragment.java @@ -0,0 +1,174 @@ +package org.citra.citra_emu.features.cheats.ui; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.EditText; +import android.widget.ScrollView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.ViewModelProvider; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.cheats.model.Cheat; +import org.citra.citra_emu.features.cheats.model.CheatsViewModel; + +public class CheatDetailsFragment extends Fragment { + private View mRoot; + private ScrollView mScrollView; + private TextView mLabelName; + private EditText mEditName; + private EditText mEditNotes; + private EditText mEditCode; + private Button mButtonDelete; + private Button mButtonEdit; + private Button mButtonCancel; + private Button mButtonOk; + + private CheatsViewModel mViewModel; + + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_cheat_details, container, false); + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + mRoot = view.findViewById(R.id.root); + mScrollView = view.findViewById(R.id.scroll_view); + mLabelName = view.findViewById(R.id.label_name); + mEditName = view.findViewById(R.id.edit_name); + mEditNotes = view.findViewById(R.id.edit_notes); + mEditCode = view.findViewById(R.id.edit_code); + mButtonDelete = view.findViewById(R.id.button_delete); + mButtonEdit = view.findViewById(R.id.button_edit); + mButtonCancel = view.findViewById(R.id.button_cancel); + mButtonOk = view.findViewById(R.id.button_ok); + + CheatsActivity activity = (CheatsActivity) requireActivity(); + mViewModel = new ViewModelProvider(activity).get(CheatsViewModel.class); + + mViewModel.getSelectedCheat().observe(getViewLifecycleOwner(), + this::onSelectedCheatUpdated); + mViewModel.getIsEditing().observe(getViewLifecycleOwner(), this::onIsEditingUpdated); + + mButtonDelete.setOnClickListener(this::onDeleteClicked); + mButtonEdit.setOnClickListener(this::onEditClicked); + mButtonCancel.setOnClickListener(this::onCancelClicked); + mButtonOk.setOnClickListener(this::onOkClicked); + + // On a portrait phone screen (or other narrow screen), only one of the two panes are shown + // at the same time. If the user is navigating using a d-pad and moves focus to an element + // in the currently hidden pane, we need to manually show that pane. + CheatsActivity.setOnFocusChangeListenerRecursively(view, + (v, hasFocus) -> activity.onDetailsViewFocusChange(hasFocus)); + } + + private void clearEditErrors() { + mEditName.setError(null); + mEditCode.setError(null); + } + + private void onDeleteClicked(View view) { + String name = mEditName.getText().toString(); + + AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + builder.setMessage(getString(R.string.cheats_delete_confirmation, name)); + builder.setPositiveButton(android.R.string.yes, + (dialog, i) -> mViewModel.deleteSelectedCheat()); + builder.setNegativeButton(android.R.string.no, null); + builder.show(); + } + + private void onEditClicked(View view) { + mViewModel.setIsEditing(true); + mButtonOk.requestFocus(); + } + + private void onCancelClicked(View view) { + mViewModel.setIsEditing(false); + onSelectedCheatUpdated(mViewModel.getSelectedCheat().getValue()); + mButtonDelete.requestFocus(); + } + + private void onOkClicked(View view) { + clearEditErrors(); + + String name = mEditName.getText().toString(); + String notes = mEditNotes.getText().toString(); + String code = mEditCode.getText().toString(); + + if (name.isEmpty()) { + mEditName.setError(getString(R.string.cheats_error_no_name)); + mScrollView.smoothScrollTo(0, mLabelName.getTop()); + return; + } else if (code.isEmpty()) { + mEditCode.setError(getString(R.string.cheats_error_no_code_lines)); + mScrollView.smoothScrollTo(0, mEditCode.getBottom()); + return; + } + + int validityResult = Cheat.isValidGatewayCode(code); + + if (validityResult != 0) { + mEditCode.setError(getString(R.string.cheats_error_on_line, validityResult)); + mScrollView.smoothScrollTo(0, mEditCode.getBottom()); + return; + } + + Cheat newCheat = Cheat.createGatewayCode(name, notes, code); + + if (mViewModel.getIsAdding().getValue()) { + mViewModel.finishAddingCheat(newCheat); + } else { + mViewModel.updateSelectedCheat(newCheat); + } + + mButtonEdit.requestFocus(); + } + + private void onSelectedCheatUpdated(@Nullable Cheat cheat) { + clearEditErrors(); + + boolean isEditing = mViewModel.getIsEditing().getValue(); + + mRoot.setVisibility(isEditing || cheat != null ? View.VISIBLE : View.GONE); + + // If the fragment was recreated while editing a cheat, it's vital that we + // don't repopulate the fields, otherwise the user's changes will be lost + if (!isEditing) { + if (cheat == null) { + mEditName.setText(""); + mEditNotes.setText(""); + mEditCode.setText(""); + } else { + mEditName.setText(cheat.getName()); + mEditNotes.setText(cheat.getNotes()); + mEditCode.setText(cheat.getCode()); + } + } + } + + private void onIsEditingUpdated(boolean isEditing) { + if (isEditing) { + mRoot.setVisibility(View.VISIBLE); + } + + mEditName.setEnabled(isEditing); + mEditNotes.setEnabled(isEditing); + mEditCode.setEnabled(isEditing); + + mButtonDelete.setVisibility(isEditing ? View.GONE : View.VISIBLE); + mButtonEdit.setVisibility(isEditing ? View.GONE : View.VISIBLE); + mButtonCancel.setVisibility(isEditing ? View.VISIBLE : View.GONE); + mButtonOk.setVisibility(isEditing ? View.VISIBLE : View.GONE); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatListFragment.java b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatListFragment.java new file mode 100644 index 000000000..6c67a31d4 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatListFragment.java @@ -0,0 +1,46 @@ +package org.citra.citra_emu.features.cheats.ui; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.ViewModelProvider; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.cheats.model.CheatsViewModel; +import org.citra.citra_emu.ui.DividerItemDecoration; + +public class CheatListFragment extends Fragment { + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_cheat_list, container, false); + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + RecyclerView recyclerView = view.findViewById(R.id.cheat_list); + FloatingActionButton fab = view.findViewById(R.id.fab); + + CheatsActivity activity = (CheatsActivity) requireActivity(); + CheatsViewModel viewModel = new ViewModelProvider(activity).get(CheatsViewModel.class); + + recyclerView.setAdapter(new CheatsAdapter(activity, viewModel)); + recyclerView.setLayoutManager(new LinearLayoutManager(activity)); + recyclerView.addItemDecoration(new DividerItemDecoration(activity, null)); + + fab.setOnClickListener(v -> { + viewModel.startAddingCheat(); + viewModel.openDetailsView(); + }); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatViewHolder.java new file mode 100644 index 000000000..8ba8f86e7 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatViewHolder.java @@ -0,0 +1,56 @@ +package org.citra.citra_emu.features.cheats.ui; + +import android.view.View; +import android.widget.CheckBox; +import android.widget.CompoundButton; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.lifecycle.ViewModelProvider; +import androidx.recyclerview.widget.RecyclerView; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.cheats.model.Cheat; +import org.citra.citra_emu.features.cheats.model.CheatsViewModel; + +public class CheatViewHolder extends RecyclerView.ViewHolder + implements View.OnClickListener, CompoundButton.OnCheckedChangeListener { + private final View mRoot; + private final TextView mName; + private final CheckBox mCheckbox; + + private CheatsViewModel mViewModel; + private Cheat mCheat; + private int mPosition; + + public CheatViewHolder(@NonNull View itemView) { + super(itemView); + + mRoot = itemView.findViewById(R.id.root); + mName = itemView.findViewById(R.id.text_name); + mCheckbox = itemView.findViewById(R.id.checkbox); + } + + public void bind(CheatsActivity activity, Cheat cheat, int position) { + mCheckbox.setOnCheckedChangeListener(null); + + mViewModel = new ViewModelProvider(activity).get(CheatsViewModel.class); + mCheat = cheat; + mPosition = position; + + mName.setText(mCheat.getName()); + mCheckbox.setChecked(mCheat.getEnabled()); + + mRoot.setOnClickListener(this); + mCheckbox.setOnCheckedChangeListener(this); + } + + public void onClick(View root) { + mViewModel.setSelectedCheat(mCheat, mPosition); + mViewModel.openDetailsView(); + } + + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + mCheat.setEnabled(isChecked); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsActivity.java new file mode 100644 index 000000000..a36bf427c --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsActivity.java @@ -0,0 +1,161 @@ +package org.citra.citra_emu.features.cheats.ui; + +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.view.ViewCompat; +import androidx.lifecycle.ViewModelProvider; +import androidx.slidingpanelayout.widget.SlidingPaneLayout; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.cheats.model.Cheat; +import org.citra.citra_emu.features.cheats.model.CheatsViewModel; +import org.citra.citra_emu.ui.TwoPaneOnBackPressedCallback; + +public class CheatsActivity extends AppCompatActivity + implements SlidingPaneLayout.PanelSlideListener { + private CheatsViewModel mViewModel; + + private SlidingPaneLayout mSlidingPaneLayout; + private View mCheatList; + private View mCheatDetails; + + private View mCheatListLastFocus; + private View mCheatDetailsLastFocus; + + public static void launch(Context context) { + Intent intent = new Intent(context, CheatsActivity.class); + context.startActivity(intent); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + mViewModel = new ViewModelProvider(this).get(CheatsViewModel.class); + mViewModel.load(); + + setContentView(R.layout.activity_cheats); + + mSlidingPaneLayout = findViewById(R.id.sliding_pane_layout); + mCheatList = findViewById(R.id.cheat_list); + mCheatDetails = findViewById(R.id.cheat_details); + + mCheatListLastFocus = mCheatList; + mCheatDetailsLastFocus = mCheatDetails; + + mSlidingPaneLayout.addPanelSlideListener(this); + + getOnBackPressedDispatcher().addCallback(this, + new TwoPaneOnBackPressedCallback(mSlidingPaneLayout)); + + mViewModel.getSelectedCheat().observe(this, this::onSelectedCheatChanged); + mViewModel.getIsEditing().observe(this, this::onIsEditingChanged); + onSelectedCheatChanged(mViewModel.getSelectedCheat().getValue()); + + mViewModel.getOpenDetailsViewEvent().observe(this, this::openDetailsView); + + // Show "Up" button in the action bar for navigation + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.menu_settings, menu); + + return true; + } + + @Override + protected void onStop() { + super.onStop(); + + mViewModel.saveIfNeeded(); + } + + @Override + public void onPanelSlide(@NonNull View panel, float slideOffset) { + } + + @Override + public void onPanelOpened(@NonNull View panel) { + boolean rtl = ViewCompat.getLayoutDirection(panel) == ViewCompat.LAYOUT_DIRECTION_RTL; + mCheatDetailsLastFocus.requestFocus(rtl ? View.FOCUS_LEFT : View.FOCUS_RIGHT); + } + + @Override + public void onPanelClosed(@NonNull View panel) { + boolean rtl = ViewCompat.getLayoutDirection(panel) == ViewCompat.LAYOUT_DIRECTION_RTL; + mCheatListLastFocus.requestFocus(rtl ? View.FOCUS_RIGHT : View.FOCUS_LEFT); + } + + private void onIsEditingChanged(boolean isEditing) { + if (isEditing) { + mSlidingPaneLayout.setLockMode(SlidingPaneLayout.LOCK_MODE_UNLOCKED); + } + } + + private void onSelectedCheatChanged(Cheat selectedCheat) { + boolean cheatSelected = selectedCheat != null || mViewModel.getIsEditing().getValue(); + + if (!cheatSelected && mSlidingPaneLayout.isOpen()) { + mSlidingPaneLayout.close(); + } + + mSlidingPaneLayout.setLockMode(cheatSelected ? + SlidingPaneLayout.LOCK_MODE_UNLOCKED : SlidingPaneLayout.LOCK_MODE_LOCKED_CLOSED); + } + + public void onListViewFocusChange(boolean hasFocus) { + if (hasFocus) { + mCheatListLastFocus = mCheatList.findFocus(); + if (mCheatListLastFocus == null) + throw new NullPointerException(); + + mSlidingPaneLayout.close(); + } + } + + public void onDetailsViewFocusChange(boolean hasFocus) { + if (hasFocus) { + mCheatDetailsLastFocus = mCheatDetails.findFocus(); + if (mCheatDetailsLastFocus == null) + throw new NullPointerException(); + + mSlidingPaneLayout.open(); + } + } + + @Override + public boolean onSupportNavigateUp() { + onBackPressed(); + return true; + } + + private void openDetailsView(boolean open) { + if (open) { + mSlidingPaneLayout.open(); + } + } + + public static void setOnFocusChangeListenerRecursively(@NonNull View view, + View.OnFocusChangeListener listener) { + view.setOnFocusChangeListener(listener); + + if (view instanceof ViewGroup) { + ViewGroup viewGroup = (ViewGroup) view; + for (int i = 0; i < viewGroup.getChildCount(); i++) { + View child = viewGroup.getChildAt(i); + setOnFocusChangeListenerRecursively(child, listener); + } + } + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsAdapter.java b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsAdapter.java new file mode 100644 index 000000000..9cb2ce8d8 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsAdapter.java @@ -0,0 +1,72 @@ +package org.citra.citra_emu.features.cheats.ui; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.cheats.model.Cheat; +import org.citra.citra_emu.features.cheats.model.CheatsViewModel; + +public class CheatsAdapter extends RecyclerView.Adapter { + private final CheatsActivity mActivity; + private final CheatsViewModel mViewModel; + + public CheatsAdapter(CheatsActivity activity, CheatsViewModel viewModel) { + mActivity = activity; + mViewModel = viewModel; + + mViewModel.getCheatAddedEvent().observe(activity, (position) -> { + if (position != null) { + notifyItemInserted(position); + } + }); + + mViewModel.getCheatUpdatedEvent().observe(activity, (position) -> { + if (position != null) { + notifyItemChanged(position); + } + }); + + mViewModel.getCheatDeletedEvent().observe(activity, (position) -> { + if (position != null) { + notifyItemRemoved(position); + } + }); + } + + @NonNull + @Override + public CheatViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + LayoutInflater inflater = LayoutInflater.from(parent.getContext()); + + View cheatView = inflater.inflate(R.layout.list_item_cheat, parent, false); + addViewListeners(cheatView); + return new CheatViewHolder(cheatView); + } + + @Override + public void onBindViewHolder(@NonNull CheatViewHolder holder, int position) { + holder.bind(mActivity, getItemAt(position), position); + } + + @Override + public int getItemCount() { + return mViewModel.getCheats().length; + } + + private void addViewListeners(View view) { + // On a portrait phone screen (or other narrow screen), only one of the two panes are shown + // at the same time. If the user is navigating using a d-pad and moves focus to an element + // in the currently hidden pane, we need to manually show that pane. + CheatsActivity.setOnFocusChangeListenerRecursively(view, + (v, hasFocus) -> mActivity.onListViewFocusChange(hasFocus)); + } + + private Cheat getItemAt(int position) { + return mViewModel.getCheats()[position]; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.java new file mode 100644 index 000000000..932dcf1d3 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.java @@ -0,0 +1,23 @@ +package org.citra.citra_emu.features.settings.model; + +public final class BooleanSetting extends Setting { + private boolean mValue; + + public BooleanSetting(String key, String section, boolean value) { + super(key, section); + mValue = value; + } + + public boolean getValue() { + return mValue; + } + + public void setValue(boolean value) { + mValue = value; + } + + @Override + public String getValueAsString() { + return mValue ? "True" : "False"; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/FloatSetting.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/FloatSetting.java new file mode 100644 index 000000000..275f0ecea --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/FloatSetting.java @@ -0,0 +1,23 @@ +package org.citra.citra_emu.features.settings.model; + +public final class FloatSetting extends Setting { + private float mValue; + + public FloatSetting(String key, String section, float value) { + super(key, section); + mValue = value; + } + + public float getValue() { + return mValue; + } + + public void setValue(float value) { + mValue = value; + } + + @Override + public String getValueAsString() { + return Float.toString(mValue); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntSetting.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntSetting.java new file mode 100644 index 000000000..f712e5bfa --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntSetting.java @@ -0,0 +1,23 @@ +package org.citra.citra_emu.features.settings.model; + +public final class IntSetting extends Setting { + private int mValue; + + public IntSetting(String key, String section, int value) { + super(key, section); + mValue = value; + } + + public int getValue() { + return mValue; + } + + public void setValue(int value) { + mValue = value; + } + + @Override + public String getValueAsString() { + return Integer.toString(mValue); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Setting.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Setting.java new file mode 100644 index 000000000..b762847c9 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Setting.java @@ -0,0 +1,42 @@ +package org.citra.citra_emu.features.settings.model; + +/** + * Abstraction for a setting item as read from / written to Citra's configuration ini files. + * These files generally consist of a key/value pair, though the type of value is ambiguous and + * must be inferred at read-time. The type of value determines which child of this class is used + * to represent the Setting. + */ +public abstract class Setting { + private String mKey; + private String mSection; + + /** + * Base constructor. + * + * @param key Everything to the left of the = in a line from the ini file. + * @param section The corresponding recent section header; e.g. [Core] or [Enhancements] without the brackets. + */ + public Setting(String key, String section) { + mKey = key; + mSection = section; + } + + /** + * @return The identifier used to write this setting to the ini file. + */ + public String getKey() { + return mKey; + } + + /** + * @return The name of the header under which this Setting should be written in the ini file. + */ + public String getSection() { + return mSection; + } + + /** + * @return A representation of this Setting's backing value converted to a String (e.g. for serialization). + */ + public abstract String getValueAsString(); +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/SettingSection.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/SettingSection.java new file mode 100644 index 000000000..0a291aa6b --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/SettingSection.java @@ -0,0 +1,55 @@ +package org.citra.citra_emu.features.settings.model; + +import java.util.HashMap; + +/** + * A semantically-related group of Settings objects. These Settings are + * internally stored as a HashMap. + */ +public final class SettingSection { + private String mName; + + private HashMap mSettings = new HashMap<>(); + + /** + * Create a new SettingSection with no Settings in it. + * + * @param name The header of this section; e.g. [Core] or [Enhancements] without the brackets. + */ + public SettingSection(String name) { + mName = name; + } + + public String getName() { + return mName; + } + + /** + * Convenience method; inserts a value directly into the backing HashMap. + * + * @param setting The Setting to be inserted. + */ + public void putSetting(Setting setting) { + mSettings.put(setting.getKey(), setting); + } + + /** + * Convenience method; gets a value directly from the backing HashMap. + * + * @param key Used to retrieve the Setting. + * @return A Setting object (you should probably cast this before using) + */ + public Setting getSetting(String key) { + return mSettings.get(key); + } + + public HashMap getSettings() { + return mSettings; + } + + public void mergeSection(SettingSection settingSection) { + for (Setting setting : settingSection.mSettings.values()) { + putSetting(setting); + } + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.java new file mode 100644 index 000000000..9684966f2 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.java @@ -0,0 +1,132 @@ +package org.citra.citra_emu.features.settings.model; + +import android.text.TextUtils; + +import org.citra.citra_emu.CitraApplication; +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.ui.SettingsActivityView; +import org.citra.citra_emu.features.settings.utils.SettingsFile; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +public class Settings { + public static final String SECTION_PREMIUM = "Premium"; + public static final String SECTION_CORE = "Core"; + public static final String SECTION_SYSTEM = "System"; + public static final String SECTION_CAMERA = "Camera"; + public static final String SECTION_CONTROLS = "Controls"; + public static final String SECTION_RENDERER = "Renderer"; + public static final String SECTION_LAYOUT = "Layout"; + public static final String SECTION_UTILITY = "Utility"; + public static final String SECTION_AUDIO = "Audio"; + public static final String SECTION_DEBUG = "Debug"; + + private String gameId; + + private static final Map> configFileSectionsMap = new HashMap<>(); + + static { + configFileSectionsMap.put(SettingsFile.FILE_NAME_CONFIG, Arrays.asList(SECTION_PREMIUM, SECTION_CORE, SECTION_SYSTEM, SECTION_CAMERA, SECTION_CONTROLS, SECTION_RENDERER, SECTION_LAYOUT, SECTION_UTILITY, SECTION_AUDIO, SECTION_DEBUG)); + } + + /** + * A HashMap that constructs a new SettingSection instead of returning null + * when getting a key not already in the map + */ + public static final class SettingsSectionMap extends HashMap { + @Override + public SettingSection get(Object key) { + if (!(key instanceof String)) { + return null; + } + + String stringKey = (String) key; + + if (!super.containsKey(stringKey)) { + SettingSection section = new SettingSection(stringKey); + super.put(stringKey, section); + return section; + } + return super.get(key); + } + } + + private HashMap sections = new Settings.SettingsSectionMap(); + + public SettingSection getSection(String sectionName) { + return sections.get(sectionName); + } + + public boolean isEmpty() { + return sections.isEmpty(); + } + + public HashMap getSections() { + return sections; + } + + public void loadSettings(SettingsActivityView view) { + sections = new Settings.SettingsSectionMap(); + loadCitraSettings(view); + + if (!TextUtils.isEmpty(gameId)) { + loadCustomGameSettings(gameId, view); + } + } + + private void loadCitraSettings(SettingsActivityView view) { + for (Map.Entry> entry : configFileSectionsMap.entrySet()) { + String fileName = entry.getKey(); + sections.putAll(SettingsFile.readFile(fileName, view)); + } + } + + private void loadCustomGameSettings(String gameId, SettingsActivityView view) { + // custom game settings + mergeSections(SettingsFile.readCustomGameSettings(gameId, view)); + } + + private void mergeSections(HashMap updatedSections) { + for (Map.Entry entry : updatedSections.entrySet()) { + if (sections.containsKey(entry.getKey())) { + SettingSection originalSection = sections.get(entry.getKey()); + SettingSection updatedSection = entry.getValue(); + originalSection.mergeSection(updatedSection); + } else { + sections.put(entry.getKey(), entry.getValue()); + } + } + } + + public void loadSettings(String gameId, SettingsActivityView view) { + this.gameId = gameId; + loadSettings(view); + } + + public void saveSettings(SettingsActivityView view) { + if (TextUtils.isEmpty(gameId)) { + view.showToastMessage(CitraApplication.getAppContext().getString(R.string.ini_saved), false); + + for (Map.Entry> entry : configFileSectionsMap.entrySet()) { + String fileName = entry.getKey(); + List sectionNames = entry.getValue(); + TreeMap iniSections = new TreeMap<>(); + for (String section : sectionNames) { + iniSections.put(section, sections.get(section)); + } + + SettingsFile.saveFile(fileName, iniSections, view); + } + } else { + // custom game settings + view.showToastMessage(CitraApplication.getAppContext().getString(R.string.gameid_saved, gameId), false); + + SettingsFile.saveCustomGameSettings(gameId, sections); + } + + } +} \ No newline at end of file diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/StringSetting.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/StringSetting.java new file mode 100644 index 000000000..b906b7010 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/StringSetting.java @@ -0,0 +1,23 @@ +package org.citra.citra_emu.features.settings.model; + +public final class StringSetting extends Setting { + private String mValue; + + public StringSetting(String key, String section, String value) { + super(key, section); + mValue = value; + } + + public String getValue() { + return mValue; + } + + public void setValue(String value) { + mValue = value; + } + + @Override + public String getValueAsString() { + return mValue; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/CheckBoxSetting.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/CheckBoxSetting.java new file mode 100644 index 000000000..baf40709f --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/CheckBoxSetting.java @@ -0,0 +1,80 @@ +package org.citra.citra_emu.features.settings.model.view; + +import org.citra.citra_emu.CitraApplication; +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.model.BooleanSetting; +import org.citra.citra_emu.features.settings.model.IntSetting; +import org.citra.citra_emu.features.settings.model.Setting; +import org.citra.citra_emu.features.settings.ui.SettingsFragmentView; + +public final class CheckBoxSetting extends SettingsItem { + private boolean mDefaultValue; + private boolean mShowPerformanceWarning; + private SettingsFragmentView mView; + + public CheckBoxSetting(String key, String section, int titleId, int descriptionId, + boolean defaultValue, Setting setting) { + super(key, section, setting, titleId, descriptionId); + mDefaultValue = defaultValue; + mShowPerformanceWarning = false; + } + + public CheckBoxSetting(String key, String section, int titleId, int descriptionId, + boolean defaultValue, Setting setting, boolean show_performance_warning, SettingsFragmentView view) { + super(key, section, setting, titleId, descriptionId); + mDefaultValue = defaultValue; + mView = view; + mShowPerformanceWarning = show_performance_warning; + } + + public boolean isChecked() { + if (getSetting() == null) { + return mDefaultValue; + } + + // Try integer setting + try { + IntSetting setting = (IntSetting) getSetting(); + return setting.getValue() == 1; + } catch (ClassCastException exception) { + } + + // Try boolean setting + try { + BooleanSetting setting = (BooleanSetting) getSetting(); + return setting.getValue() == true; + } catch (ClassCastException exception) { + } + + return mDefaultValue; + } + + /** + * Write a value to the backing boolean. If that boolean was previously null, + * initializes a new one and returns it, so it can be added to the Hashmap. + * + * @param checked Pretty self explanatory. + * @return null if overwritten successfully; otherwise, a newly created BooleanSetting. + */ + public IntSetting setChecked(boolean checked) { + // Show a performance warning if the setting has been disabled + if (mShowPerformanceWarning && !checked) { + mView.showToastMessage(CitraApplication.getAppContext().getString(R.string.performance_warning), true); + } + + if (getSetting() == null) { + IntSetting setting = new IntSetting(getKey(), getSection(), checked ? 1 : 0); + setSetting(setting); + return setting; + } else { + IntSetting setting = (IntSetting) getSetting(); + setting.setValue(checked ? 1 : 0); + return null; + } + } + + @Override + public int getType() { + return TYPE_CHECKBOX; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/DateTimeSetting.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/DateTimeSetting.java new file mode 100644 index 000000000..afc3352cc --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/DateTimeSetting.java @@ -0,0 +1,40 @@ +package org.citra.citra_emu.features.settings.model.view; + +import org.citra.citra_emu.features.settings.model.Setting; +import org.citra.citra_emu.features.settings.model.StringSetting; + +public final class DateTimeSetting extends SettingsItem { + private String mDefaultValue; + + public DateTimeSetting(String key, String section, int titleId, int descriptionId, + String defaultValue, Setting setting) { + super(key, section, setting, titleId, descriptionId); + mDefaultValue = defaultValue; + } + + public String getValue() { + if (getSetting() != null) { + StringSetting setting = (StringSetting) getSetting(); + return setting.getValue(); + } else { + return mDefaultValue; + } + } + + public StringSetting setSelectedValue(String datetime) { + if (getSetting() == null) { + StringSetting setting = new StringSetting(getKey(), getSection(), datetime); + setSetting(setting); + return setting; + } else { + StringSetting setting = (StringSetting) getSetting(); + setting.setValue(datetime); + return null; + } + } + + @Override + public int getType() { + return TYPE_DATETIME_SETTING; + } +} \ No newline at end of file diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/HeaderSetting.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/HeaderSetting.java new file mode 100644 index 000000000..bac8876cd --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/HeaderSetting.java @@ -0,0 +1,14 @@ +package org.citra.citra_emu.features.settings.model.view; + +import org.citra.citra_emu.features.settings.model.Setting; + +public final class HeaderSetting extends SettingsItem { + public HeaderSetting(String key, Setting setting, int titleId, int descriptionId) { + super(key, null, setting, titleId, descriptionId); + } + + @Override + public int getType() { + return SettingsItem.TYPE_HEADER; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/InputBindingSetting.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/InputBindingSetting.java new file mode 100644 index 000000000..e9141a208 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/InputBindingSetting.java @@ -0,0 +1,382 @@ +package org.citra.citra_emu.features.settings.model.view; + +import android.content.SharedPreferences; +import android.preference.PreferenceManager; +import android.view.InputDevice; +import android.view.KeyEvent; +import android.widget.Toast; + +import org.citra.citra_emu.CitraApplication; +import org.citra.citra_emu.NativeLibrary; +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.model.Setting; +import org.citra.citra_emu.features.settings.model.StringSetting; +import org.citra.citra_emu.features.settings.utils.SettingsFile; + +public final class InputBindingSetting extends SettingsItem { + private static final String INPUT_MAPPING_PREFIX = "InputMapping"; + + public InputBindingSetting(String key, String section, int titleId, Setting setting) { + super(key, section, setting, titleId, 0); + } + + public String getValue() { + if (getSetting() == null) { + return ""; + } + + StringSetting setting = (StringSetting) getSetting(); + return setting.getValue(); + } + + /** + * Returns true if this key is for the 3DS Circle Pad + */ + private boolean IsCirclePad() { + switch (getKey()) { + case SettingsFile.KEY_CIRCLEPAD_AXIS_HORIZONTAL: + case SettingsFile.KEY_CIRCLEPAD_AXIS_VERTICAL: + return true; + } + return false; + } + + /** + * Returns true if this key is for a horizontal axis for a 3DS analog stick or D-pad + */ + public boolean IsHorizontalOrientation() { + switch (getKey()) { + case SettingsFile.KEY_CIRCLEPAD_AXIS_HORIZONTAL: + case SettingsFile.KEY_CSTICK_AXIS_HORIZONTAL: + case SettingsFile.KEY_DPAD_AXIS_HORIZONTAL: + return true; + } + return false; + } + + /** + * Returns true if this key is for the 3DS C-Stick + */ + private boolean IsCStick() { + switch (getKey()) { + case SettingsFile.KEY_CSTICK_AXIS_HORIZONTAL: + case SettingsFile.KEY_CSTICK_AXIS_VERTICAL: + return true; + } + return false; + } + + /** + * Returns true if this key is for the 3DS D-Pad + */ + private boolean IsDPad() { + switch (getKey()) { + case SettingsFile.KEY_DPAD_AXIS_HORIZONTAL: + case SettingsFile.KEY_DPAD_AXIS_VERTICAL: + return true; + } + return false; + } + + /** + * Returns true if this key is for the 3DS L/R or ZL/ZR buttons. Note, these are not real + * triggers on the 3DS, but we support them as such on a physical gamepad. + */ + public boolean IsTrigger() { + switch (getKey()) { + case SettingsFile.KEY_BUTTON_L: + case SettingsFile.KEY_BUTTON_R: + case SettingsFile.KEY_BUTTON_ZL: + case SettingsFile.KEY_BUTTON_ZR: + return true; + } + return false; + } + + /** + * Returns true if a gamepad axis can be used to map this key. + */ + public boolean IsAxisMappingSupported() { + return IsCirclePad() || IsCStick() || IsDPad() || IsTrigger(); + } + + /** + * Returns true if a gamepad button can be used to map this key. + */ + private boolean IsButtonMappingSupported() { + return !IsAxisMappingSupported() || IsTrigger(); + } + + /** + * Returns the Citra button code for the settings key. + */ + private int getButtonCode() { + switch (getKey()) { + case SettingsFile.KEY_BUTTON_A: + return NativeLibrary.ButtonType.BUTTON_A; + case SettingsFile.KEY_BUTTON_B: + return NativeLibrary.ButtonType.BUTTON_B; + case SettingsFile.KEY_BUTTON_X: + return NativeLibrary.ButtonType.BUTTON_X; + case SettingsFile.KEY_BUTTON_Y: + return NativeLibrary.ButtonType.BUTTON_Y; + case SettingsFile.KEY_BUTTON_L: + return NativeLibrary.ButtonType.TRIGGER_L; + case SettingsFile.KEY_BUTTON_R: + return NativeLibrary.ButtonType.TRIGGER_R; + case SettingsFile.KEY_BUTTON_ZL: + return NativeLibrary.ButtonType.BUTTON_ZL; + case SettingsFile.KEY_BUTTON_ZR: + return NativeLibrary.ButtonType.BUTTON_ZR; + case SettingsFile.KEY_BUTTON_SELECT: + return NativeLibrary.ButtonType.BUTTON_SELECT; + case SettingsFile.KEY_BUTTON_START: + return NativeLibrary.ButtonType.BUTTON_START; + case SettingsFile.KEY_BUTTON_UP: + return NativeLibrary.ButtonType.DPAD_UP; + case SettingsFile.KEY_BUTTON_DOWN: + return NativeLibrary.ButtonType.DPAD_DOWN; + case SettingsFile.KEY_BUTTON_LEFT: + return NativeLibrary.ButtonType.DPAD_LEFT; + case SettingsFile.KEY_BUTTON_RIGHT: + return NativeLibrary.ButtonType.DPAD_RIGHT; + } + return -1; + } + + /** + * Returns the settings key for the specified Citra button code. + */ + private static String getButtonKey(int buttonCode) { + switch (buttonCode) { + case NativeLibrary.ButtonType.BUTTON_A: + return SettingsFile.KEY_BUTTON_A; + case NativeLibrary.ButtonType.BUTTON_B: + return SettingsFile.KEY_BUTTON_B; + case NativeLibrary.ButtonType.BUTTON_X: + return SettingsFile.KEY_BUTTON_X; + case NativeLibrary.ButtonType.BUTTON_Y: + return SettingsFile.KEY_BUTTON_Y; + case NativeLibrary.ButtonType.TRIGGER_L: + return SettingsFile.KEY_BUTTON_L; + case NativeLibrary.ButtonType.TRIGGER_R: + return SettingsFile.KEY_BUTTON_R; + case NativeLibrary.ButtonType.BUTTON_ZL: + return SettingsFile.KEY_BUTTON_ZL; + case NativeLibrary.ButtonType.BUTTON_ZR: + return SettingsFile.KEY_BUTTON_ZR; + case NativeLibrary.ButtonType.BUTTON_SELECT: + return SettingsFile.KEY_BUTTON_SELECT; + case NativeLibrary.ButtonType.BUTTON_START: + return SettingsFile.KEY_BUTTON_START; + case NativeLibrary.ButtonType.DPAD_UP: + return SettingsFile.KEY_BUTTON_UP; + case NativeLibrary.ButtonType.DPAD_DOWN: + return SettingsFile.KEY_BUTTON_DOWN; + case NativeLibrary.ButtonType.DPAD_LEFT: + return SettingsFile.KEY_BUTTON_LEFT; + case NativeLibrary.ButtonType.DPAD_RIGHT: + return SettingsFile.KEY_BUTTON_RIGHT; + } + return ""; + } + + /** + * Returns the key used to lookup the reverse mapping for this key, which is used to cleanup old + * settings on re-mapping or clearing of a setting. + */ + private String getReverseKey() { + String reverseKey = INPUT_MAPPING_PREFIX + "_ReverseMapping_" + getKey(); + + if (IsAxisMappingSupported() && !IsTrigger()) { + // Triggers are the only axis-supported mappings without orientation + reverseKey += "_" + (IsHorizontalOrientation() ? 0 : 1); + } + + return reverseKey; + } + + /** + * Removes the old mapping for this key from the settings, e.g. on user clearing the setting. + */ + public void removeOldMapping() { + // Get preferences editor + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext()); + SharedPreferences.Editor editor = preferences.edit(); + + // Try remove all possible keys we wrote for this setting + String oldKey = preferences.getString(getReverseKey(), ""); + if (!oldKey.equals("")) { + editor.remove(getKey()); // Used for ui text + editor.remove(oldKey); // Used for button mapping + editor.remove(oldKey + "_GuestOrientation"); // Used for axis orientation + editor.remove(oldKey + "_GuestButton"); // Used for axis button + } + + // Apply changes + editor.apply(); + } + + /** + * Helper function to get the settings key for an gamepad button. + */ + public static String getInputButtonKey(int keyCode) { + return INPUT_MAPPING_PREFIX + "_Button_" + keyCode; + } + + /** + * Helper function to get the settings key for an gamepad axis. + */ + public static String getInputAxisKey(int axis) { + return INPUT_MAPPING_PREFIX + "_HostAxis_" + axis; + } + + /** + * Helper function to get the settings key for an gamepad axis button (stick or trigger). + */ + public static String getInputAxisButtonKey(int axis) { + return getInputAxisKey(axis) + "_GuestButton"; + } + + /** + * Helper function to get the settings key for an gamepad axis orientation. + */ + public static String getInputAxisOrientationKey(int axis) { + return getInputAxisKey(axis) + "_GuestOrientation"; + } + + /** + * Helper function to write a gamepad button mapping for the setting. + */ + private void WriteButtonMapping(String key) { + // Get preferences editor + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext()); + SharedPreferences.Editor editor = preferences.edit(); + + // Remove mapping for another setting using this input + int oldButtonCode = preferences.getInt(key, -1); + if (oldButtonCode != -1) { + String oldKey = getButtonKey(oldButtonCode); + editor.remove(oldKey); // Only need to remove UI text setting, others will be overwritten + } + + // Cleanup old mapping for this setting + removeOldMapping(); + + // Write new mapping + editor.putInt(key, getButtonCode()); + + // Write next reverse mapping for future cleanup + editor.putString(getReverseKey(), key); + + // Apply changes + editor.apply(); + } + + /** + * Helper function to write a gamepad axis mapping for the setting. + */ + private void WriteAxisMapping(int axis, int value) { + // Get preferences editor + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext()); + SharedPreferences.Editor editor = preferences.edit(); + + // Cleanup old mapping + removeOldMapping(); + + // Write new mapping + editor.putInt(getInputAxisOrientationKey(axis), IsHorizontalOrientation() ? 0 : 1); + editor.putInt(getInputAxisButtonKey(axis), value); + + // Write next reverse mapping for future cleanup + editor.putString(getReverseKey(), getInputAxisKey(axis)); + + // Apply changes + editor.apply(); + } + + /** + * Saves the provided key input setting as an Android preference. + * + * @param keyEvent KeyEvent of this key press. + */ + public void onKeyInput(KeyEvent keyEvent) { + if (!IsButtonMappingSupported()) { + Toast.makeText(CitraApplication.getAppContext(), R.string.input_message_analog_only, Toast.LENGTH_LONG).show(); + return; + } + + InputDevice device = keyEvent.getDevice(); + + WriteButtonMapping(getInputButtonKey(keyEvent.getKeyCode())); + + String uiString = device.getName() + ": Button " + keyEvent.getKeyCode(); + setUiString(uiString); + } + + /** + * Saves the provided motion input setting as an Android preference. + * + * @param device InputDevice from which the input event originated. + * @param motionRange MotionRange of the movement + * @param axisDir Either '-' or '+' (currently unused) + */ + public void onMotionInput(InputDevice device, InputDevice.MotionRange motionRange, + char axisDir) { + if (!IsAxisMappingSupported()) { + Toast.makeText(CitraApplication.getAppContext(), R.string.input_message_button_only, Toast.LENGTH_LONG).show(); + return; + } + + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext()); + SharedPreferences.Editor editor = preferences.edit(); + + int button; + if (IsCirclePad()) { + button = NativeLibrary.ButtonType.STICK_LEFT; + } else if (IsCStick()) { + button = NativeLibrary.ButtonType.STICK_C; + } else if (IsDPad()) { + button = NativeLibrary.ButtonType.DPAD; + } else { + button = getButtonCode(); + } + + WriteAxisMapping(motionRange.getAxis(), button); + + String uiString = device.getName() + ": Axis " + motionRange.getAxis(); + setUiString(uiString); + + editor.apply(); + } + + /** + * Sets the string to use in the configuration UI for the gamepad input. + */ + private StringSetting setUiString(String ui) { + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext()); + SharedPreferences.Editor editor = preferences.edit(); + + if (getSetting() == null) { + StringSetting setting = new StringSetting(getKey(), getSection(), ""); + setSetting(setting); + + editor.putString(setting.getKey(), ui); + editor.apply(); + + return setting; + } else { + StringSetting setting = (StringSetting) getSetting(); + + editor.putString(setting.getKey(), ui); + editor.apply(); + + return null; + } + } + + @Override + public int getType() { + return TYPE_INPUT_BINDING; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/PremiumHeader.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/PremiumHeader.java new file mode 100644 index 000000000..2b1793d3e --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/PremiumHeader.java @@ -0,0 +1,12 @@ +package org.citra.citra_emu.features.settings.model.view; + +public final class PremiumHeader extends SettingsItem { + public PremiumHeader() { + super(null, null, null, 0, 0); + } + + @Override + public int getType() { + return SettingsItem.TYPE_PREMIUM; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/PremiumSingleChoiceSetting.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/PremiumSingleChoiceSetting.java new file mode 100644 index 000000000..c0560d2dc --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/PremiumSingleChoiceSetting.java @@ -0,0 +1,59 @@ +package org.citra.citra_emu.features.settings.model.view; + +import android.content.SharedPreferences; +import android.preference.PreferenceManager; + +import org.citra.citra_emu.CitraApplication; +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.model.Setting; +import org.citra.citra_emu.features.settings.ui.SettingsFragmentView; + +public final class PremiumSingleChoiceSetting extends SettingsItem { + private int mDefaultValue; + + private int mChoicesId; + private int mValuesId; + private SettingsFragmentView mView; + + private static SharedPreferences mPreferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext()); + + public PremiumSingleChoiceSetting(String key, String section, int titleId, int descriptionId, + int choicesId, int valuesId, int defaultValue, Setting setting, SettingsFragmentView view) { + super(key, section, setting, titleId, descriptionId); + mValuesId = valuesId; + mChoicesId = choicesId; + mDefaultValue = defaultValue; + mView = view; + } + + public int getChoicesId() { + return mChoicesId; + } + + public int getValuesId() { + return mValuesId; + } + + public int getSelectedValue() { + return mPreferences.getInt(getKey(), mDefaultValue); + } + + /** + * Write a value to the backing int. If that int was previously null, + * initializes a new one and returns it, so it can be added to the Hashmap. + * + * @param selection New value of the int. + * @return null if overwritten successfully otherwise; a newly created IntSetting. + */ + public void setSelectedValue(int selection) { + final SharedPreferences.Editor editor = mPreferences.edit(); + editor.putInt(getKey(), selection); + editor.apply(); + mView.showToastMessage(CitraApplication.getAppContext().getString(R.string.design_updated), false); + } + + @Override + public int getType() { + return TYPE_SINGLE_CHOICE; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SettingsItem.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SettingsItem.java new file mode 100644 index 000000000..305352022 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SettingsItem.java @@ -0,0 +1,107 @@ +package org.citra.citra_emu.features.settings.model.view; + +import org.citra.citra_emu.features.settings.model.Setting; +import org.citra.citra_emu.features.settings.model.Settings; +import org.citra.citra_emu.features.settings.ui.SettingsAdapter; + +/** + * ViewModel abstraction for an Item in the RecyclerView powering SettingsFragments. + * Each one corresponds to a {@link Setting} object, so this class's subclasses + * should vaguely correspond to those subclasses. There are a few with multiple analogues + * and a few with none (Headers, for example, do not correspond to anything in the ini + * file.) + */ +public abstract class SettingsItem { + public static final int TYPE_HEADER = 0; + public static final int TYPE_CHECKBOX = 1; + public static final int TYPE_SINGLE_CHOICE = 2; + public static final int TYPE_SLIDER = 3; + public static final int TYPE_SUBMENU = 4; + public static final int TYPE_INPUT_BINDING = 5; + public static final int TYPE_STRING_SINGLE_CHOICE = 6; + public static final int TYPE_DATETIME_SETTING = 7; + public static final int TYPE_PREMIUM = 8; + + private String mKey; + private String mSection; + + private Setting mSetting; + + private int mNameId; + private int mDescriptionId; + private boolean mIsPremium; + + /** + * Base constructor. Takes a key / section name in case the third parameter, the Setting, + * is null; in which case, one can be constructed and saved using the key / section. + * + * @param key Identifier for the Setting represented by this Item. + * @param section Section to which the Setting belongs. + * @param setting A possibly-null backing Setting, to be modified on UI events. + * @param nameId Resource ID for a text string to be displayed as this setting's name. + * @param descriptionId Resource ID for a text string to be displayed as this setting's description. + */ + public SettingsItem(String key, String section, Setting setting, int nameId, + int descriptionId) { + mKey = key; + mSection = section; + mSetting = setting; + mNameId = nameId; + mDescriptionId = descriptionId; + mIsPremium = (section == Settings.SECTION_PREMIUM); + } + + /** + * @return The identifier for the backing Setting. + */ + public String getKey() { + return mKey; + } + + /** + * @return The header under which the backing Setting belongs. + */ + public String getSection() { + return mSection; + } + + /** + * @return The backing Setting, possibly null. + */ + public Setting getSetting() { + return mSetting; + } + + /** + * Replace the backing setting with a new one. Generally used in cases where + * the backing setting is null. + * + * @param setting A non-null Setting. + */ + public void setSetting(Setting setting) { + mSetting = setting; + } + + /** + * @return A resource ID for a text string representing this Setting's name. + */ + public int getNameId() { + return mNameId; + } + + public int getDescriptionId() { + return mDescriptionId; + } + + public boolean isPremium() { + return mIsPremium; + } + + /** + * Used by {@link SettingsAdapter}'s onCreateViewHolder() + * method to determine which type of ViewHolder should be created. + * + * @return An integer (ideally, one of the constants defined in this file) + */ + public abstract int getType(); +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SingleChoiceSetting.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SingleChoiceSetting.java new file mode 100644 index 000000000..ee9d225d6 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SingleChoiceSetting.java @@ -0,0 +1,60 @@ +package org.citra.citra_emu.features.settings.model.view; + +import org.citra.citra_emu.features.settings.model.IntSetting; +import org.citra.citra_emu.features.settings.model.Setting; + +public final class SingleChoiceSetting extends SettingsItem { + private int mDefaultValue; + + private int mChoicesId; + private int mValuesId; + + public SingleChoiceSetting(String key, String section, int titleId, int descriptionId, + int choicesId, int valuesId, int defaultValue, Setting setting) { + super(key, section, setting, titleId, descriptionId); + mValuesId = valuesId; + mChoicesId = choicesId; + mDefaultValue = defaultValue; + } + + public int getChoicesId() { + return mChoicesId; + } + + public int getValuesId() { + return mValuesId; + } + + public int getSelectedValue() { + if (getSetting() != null) { + IntSetting setting = (IntSetting) getSetting(); + return setting.getValue(); + } else { + return mDefaultValue; + } + } + + /** + * Write a value to the backing int. If that int was previously null, + * initializes a new one and returns it, so it can be added to the Hashmap. + * + * @param selection New value of the int. + * @return null if overwritten successfully otherwise; a newly created IntSetting. + */ + public IntSetting setSelectedValue(int selection) { + if (getSetting() == null) { + IntSetting setting = new IntSetting(getKey(), getSection(), selection); + setSetting(setting); + return setting; + } else { + IntSetting setting = (IntSetting) getSetting(); + setting.setValue(selection); + return null; + } + } + + @Override + public int getType() { + return TYPE_SINGLE_CHOICE; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SliderSetting.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SliderSetting.java new file mode 100644 index 000000000..551b13f99 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SliderSetting.java @@ -0,0 +1,101 @@ +package org.citra.citra_emu.features.settings.model.view; + +import org.citra.citra_emu.features.settings.model.FloatSetting; +import org.citra.citra_emu.features.settings.model.IntSetting; +import org.citra.citra_emu.features.settings.model.Setting; +import org.citra.citra_emu.utils.Log; + +public final class SliderSetting extends SettingsItem { + private int mMin; + private int mMax; + private int mDefaultValue; + + private String mUnits; + + public SliderSetting(String key, String section, int titleId, int descriptionId, + int min, int max, String units, int defaultValue, Setting setting) { + super(key, section, setting, titleId, descriptionId); + mMin = min; + mMax = max; + mUnits = units; + mDefaultValue = defaultValue; + } + + public int getMin() { + return mMin; + } + + public int getMax() { + return mMax; + } + + public int getDefaultValue() { + return mDefaultValue; + } + + public int getSelectedValue() { + Setting setting = getSetting(); + + if (setting == null) { + return mDefaultValue; + } + + if (setting instanceof IntSetting) { + IntSetting intSetting = (IntSetting) setting; + return intSetting.getValue(); + } else if (setting instanceof FloatSetting) { + FloatSetting floatSetting = (FloatSetting) setting; + return Math.round(floatSetting.getValue()); + } else { + Log.error("[SliderSetting] Error casting setting type."); + return -1; + } + } + + /** + * Write a value to the backing int. If that int was previously null, + * initializes a new one and returns it, so it can be added to the Hashmap. + * + * @param selection New value of the int. + * @return null if overwritten successfully otherwise; a newly created IntSetting. + */ + public IntSetting setSelectedValue(int selection) { + if (getSetting() == null) { + IntSetting setting = new IntSetting(getKey(), getSection(), selection); + setSetting(setting); + return setting; + } else { + IntSetting setting = (IntSetting) getSetting(); + setting.setValue(selection); + return null; + } + } + + /** + * Write a value to the backing float. If that float was previously null, + * initializes a new one and returns it, so it can be added to the Hashmap. + * + * @param selection New value of the float. + * @return null if overwritten successfully otherwise; a newly created FloatSetting. + */ + public FloatSetting setSelectedValue(float selection) { + if (getSetting() == null) { + FloatSetting setting = new FloatSetting(getKey(), getSection(), selection); + setSetting(setting); + return setting; + } else { + FloatSetting setting = (FloatSetting) getSetting(); + setting.setValue(selection); + return null; + } + } + + public String getUnits() { + return mUnits; + } + + @Override + public int getType() { + return TYPE_SLIDER; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/StringSingleChoiceSetting.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/StringSingleChoiceSetting.java new file mode 100644 index 000000000..057145d9d --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/StringSingleChoiceSetting.java @@ -0,0 +1,82 @@ +package org.citra.citra_emu.features.settings.model.view; + +import org.citra.citra_emu.features.settings.model.Setting; +import org.citra.citra_emu.features.settings.model.StringSetting; + +public class StringSingleChoiceSetting extends SettingsItem { + private String mDefaultValue; + + private String[] mChoicesId; + private String[] mValuesId; + + public StringSingleChoiceSetting(String key, String section, int titleId, int descriptionId, + String[] choicesId, String[] valuesId, String defaultValue, Setting setting) { + super(key, section, setting, titleId, descriptionId); + mValuesId = valuesId; + mChoicesId = choicesId; + mDefaultValue = defaultValue; + } + + public String[] getChoicesId() { + return mChoicesId; + } + + public String[] getValuesId() { + return mValuesId; + } + + public String getValueAt(int index) { + if (mValuesId == null) + return null; + + if (index >= 0 && index < mValuesId.length) { + return mValuesId[index]; + } + + return ""; + } + + public String getSelectedValue() { + if (getSetting() != null) { + StringSetting setting = (StringSetting) getSetting(); + return setting.getValue(); + } else { + return mDefaultValue; + } + } + + public int getSelectValueIndex() { + String selectedValue = getSelectedValue(); + for (int i = 0; i < mValuesId.length; i++) { + if (mValuesId[i].equals(selectedValue)) { + return i; + } + } + + return -1; + } + + /** + * Write a value to the backing int. If that int was previously null, + * initializes a new one and returns it, so it can be added to the Hashmap. + * + * @param selection New value of the int. + * @return null if overwritten successfully otherwise; a newly created IntSetting. + */ + public StringSetting setSelectedValue(String selection) { + if (getSetting() == null) { + StringSetting setting = new StringSetting(getKey(), getSection(), selection); + setSetting(setting); + return setting; + } else { + StringSetting setting = (StringSetting) getSetting(); + setting.setValue(selection); + return null; + } + } + + @Override + public int getType() { + return TYPE_STRING_SINGLE_CHOICE; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SubmenuSetting.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SubmenuSetting.java new file mode 100644 index 000000000..9d44a923f --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SubmenuSetting.java @@ -0,0 +1,21 @@ +package org.citra.citra_emu.features.settings.model.view; + +import org.citra.citra_emu.features.settings.model.Setting; + +public final class SubmenuSetting extends SettingsItem { + private String mMenuKey; + + public SubmenuSetting(String key, Setting setting, int titleId, int descriptionId, String menuKey) { + super(key, null, setting, titleId, descriptionId); + mMenuKey = menuKey; + } + + public String getMenuKey() { + return mMenuKey; + } + + @Override + public int getType() { + return TYPE_SUBMENU; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.java new file mode 100644 index 000000000..23c3c4c9e --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.java @@ -0,0 +1,215 @@ +package org.citra.citra_emu.features.settings.ui; + +import android.app.ProgressDialog; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.os.Bundle; +import android.provider.Settings; +import android.view.Menu; +import android.view.MenuInflater; +import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.FragmentTransaction; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + +import org.citra.citra_emu.NativeLibrary; +import org.citra.citra_emu.R; +import org.citra.citra_emu.utils.DirectoryInitialization; +import org.citra.citra_emu.utils.DirectoryStateReceiver; +import org.citra.citra_emu.utils.EmulationMenuSettings; + +public final class SettingsActivity extends AppCompatActivity implements SettingsActivityView { + private static final String ARG_MENU_TAG = "menu_tag"; + private static final String ARG_GAME_ID = "game_id"; + private static final String FRAGMENT_TAG = "settings"; + private SettingsActivityPresenter mPresenter = new SettingsActivityPresenter(this); + + private ProgressDialog dialog; + + public static void launch(Context context, String menuTag, String gameId) { + Intent settings = new Intent(context, SettingsActivity.class); + settings.putExtra(ARG_MENU_TAG, menuTag); + settings.putExtra(ARG_GAME_ID, gameId); + context.startActivity(settings); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.activity_settings); + + Intent launcher = getIntent(); + String gameID = launcher.getStringExtra(ARG_GAME_ID); + String menuTag = launcher.getStringExtra(ARG_MENU_TAG); + + mPresenter.onCreate(savedInstanceState, menuTag, gameID); + + // Show "Back" button in the action bar for navigation + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + } + + @Override + public boolean onSupportNavigateUp() { + onBackPressed(); + + return true; + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.menu_settings, menu); + + return true; + } + + @Override + protected void onSaveInstanceState(@NonNull Bundle outState) { + // Critical: If super method is not called, rotations will be busted. + super.onSaveInstanceState(outState); + mPresenter.saveState(outState); + } + + @Override + protected void onStart() { + super.onStart(); + mPresenter.onStart(); + } + + /** + * If this is called, the user has left the settings screen (potentially through the + * home button) and will expect their changes to be persisted. So we kick off an + * IntentService which will do so on a background thread. + */ + @Override + protected void onStop() { + super.onStop(); + + mPresenter.onStop(isFinishing()); + + // Update framebuffer layout when closing the settings + NativeLibrary.NotifyOrientationChange(EmulationMenuSettings.getLandscapeScreenLayout(), + getWindowManager().getDefaultDisplay().getRotation()); + } + + @Override + public void showSettingsFragment(String menuTag, boolean addToStack, String gameID) { + if (!addToStack && getFragment() != null) { + return; + } + + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + + if (addToStack) { + if (areSystemAnimationsEnabled()) { + transaction.setCustomAnimations( + R.animator.settings_enter, + R.animator.settings_exit, + R.animator.settings_pop_enter, + R.animator.setttings_pop_exit); + } + + transaction.addToBackStack(null); + } + transaction.replace(R.id.frame_content, SettingsFragment.newInstance(menuTag, gameID), FRAGMENT_TAG); + + transaction.commit(); + } + + private boolean areSystemAnimationsEnabled() { + float duration = Settings.Global.getFloat( + getContentResolver(), + Settings.Global.ANIMATOR_DURATION_SCALE, 1); + float transition = Settings.Global.getFloat( + getContentResolver(), + Settings.Global.TRANSITION_ANIMATION_SCALE, 1); + return duration != 0 && transition != 0; + } + + @Override + public void startDirectoryInitializationService(DirectoryStateReceiver receiver, IntentFilter filter) { + LocalBroadcastManager.getInstance(this).registerReceiver( + receiver, + filter); + DirectoryInitialization.start(this); + } + + @Override + public void stopListeningToDirectoryInitializationService(DirectoryStateReceiver receiver) { + LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver); + } + + @Override + public void showLoading() { + if (dialog == null) { + dialog = new ProgressDialog(this); + dialog.setMessage(getString(R.string.load_settings)); + dialog.setIndeterminate(true); + } + + dialog.show(); + } + + @Override + public void hideLoading() { + dialog.dismiss(); + } + + @Override + public void showPermissionNeededHint() { + Toast.makeText(this, R.string.write_permission_needed, Toast.LENGTH_SHORT) + .show(); + } + + @Override + public void showExternalStorageNotMountedHint() { + Toast.makeText(this, R.string.external_storage_not_mounted, Toast.LENGTH_SHORT) + .show(); + } + + @Override + public org.citra.citra_emu.features.settings.model.Settings getSettings() { + return mPresenter.getSettings(); + } + + @Override + public void setSettings(org.citra.citra_emu.features.settings.model.Settings settings) { + mPresenter.setSettings(settings); + } + + @Override + public void onSettingsFileLoaded(org.citra.citra_emu.features.settings.model.Settings settings) { + SettingsFragmentView fragment = getFragment(); + + if (fragment != null) { + fragment.onSettingsFileLoaded(settings); + } + } + + @Override + public void onSettingsFileNotFound() { + SettingsFragmentView fragment = getFragment(); + + if (fragment != null) { + fragment.loadDefaultSettings(); + } + } + + @Override + public void showToastMessage(String message, boolean is_long) { + Toast.makeText(this, message, is_long ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT).show(); + } + + @Override + public void onSettingChanged() { + mPresenter.onSettingChanged(); + } + + private SettingsFragment getFragment() { + return (SettingsFragment) getSupportFragmentManager().findFragmentByTag(FRAGMENT_TAG); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.java new file mode 100644 index 000000000..0d63873bb --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.java @@ -0,0 +1,124 @@ +package org.citra.citra_emu.features.settings.ui; + +import android.content.IntentFilter; +import android.os.Bundle; +import android.text.TextUtils; + +import org.citra.citra_emu.NativeLibrary; +import org.citra.citra_emu.features.settings.model.Settings; +import org.citra.citra_emu.features.settings.utils.SettingsFile; +import org.citra.citra_emu.utils.DirectoryInitialization; +import org.citra.citra_emu.utils.DirectoryInitialization.DirectoryInitializationState; +import org.citra.citra_emu.utils.DirectoryStateReceiver; +import org.citra.citra_emu.utils.Log; +import org.citra.citra_emu.utils.ThemeUtil; + +import java.io.File; + +public final class SettingsActivityPresenter { + private static final String KEY_SHOULD_SAVE = "should_save"; + + private SettingsActivityView mView; + + private Settings mSettings = new Settings(); + + private boolean mShouldSave; + + private DirectoryStateReceiver directoryStateReceiver; + + private String menuTag; + private String gameId; + + public SettingsActivityPresenter(SettingsActivityView view) { + mView = view; + } + + public void onCreate(Bundle savedInstanceState, String menuTag, String gameId) { + if (savedInstanceState == null) { + this.menuTag = menuTag; + this.gameId = gameId; + } else { + mShouldSave = savedInstanceState.getBoolean(KEY_SHOULD_SAVE); + } + } + + public void onStart() { + prepareCitraDirectoriesIfNeeded(); + } + + void loadSettingsUI() { + if (mSettings.isEmpty()) { + if (!TextUtils.isEmpty(gameId)) { + mSettings.loadSettings(gameId, mView); + } else { + mSettings.loadSettings(mView); + } + } + + mView.showSettingsFragment(menuTag, false, gameId); + mView.onSettingsFileLoaded(mSettings); + } + + private void prepareCitraDirectoriesIfNeeded() { + File configFile = new File(DirectoryInitialization.getUserDirectory() + "/config/" + SettingsFile.FILE_NAME_CONFIG + ".ini"); + if (!configFile.exists()) { + Log.error("Citra config file could not be found!"); + } + if (DirectoryInitialization.areCitraDirectoriesReady()) { + loadSettingsUI(); + } else { + mView.showLoading(); + IntentFilter statusIntentFilter = new IntentFilter( + DirectoryInitialization.BROADCAST_ACTION); + + directoryStateReceiver = + new DirectoryStateReceiver(directoryInitializationState -> + { + if (directoryInitializationState == DirectoryInitializationState.CITRA_DIRECTORIES_INITIALIZED) { + mView.hideLoading(); + loadSettingsUI(); + } else if (directoryInitializationState == DirectoryInitializationState.EXTERNAL_STORAGE_PERMISSION_NEEDED) { + mView.showPermissionNeededHint(); + mView.hideLoading(); + } else if (directoryInitializationState == DirectoryInitializationState.CANT_FIND_EXTERNAL_STORAGE) { + mView.showExternalStorageNotMountedHint(); + mView.hideLoading(); + } + }); + + mView.startDirectoryInitializationService(directoryStateReceiver, statusIntentFilter); + } + } + + public void setSettings(Settings settings) { + mSettings = settings; + } + + public Settings getSettings() { + return mSettings; + } + + public void onStop(boolean finishing) { + if (directoryStateReceiver != null) { + mView.stopListeningToDirectoryInitializationService(directoryStateReceiver); + directoryStateReceiver = null; + } + + if (mSettings != null && finishing && mShouldSave) { + Log.debug("[SettingsActivity] Settings activity stopping. Saving settings to INI..."); + mSettings.saveSettings(mView); + } + + ThemeUtil.applyTheme(); + + NativeLibrary.ReloadSettings(); + } + + public void onSettingChanged() { + mShouldSave = true; + } + + public void saveState(Bundle outState) { + outState.putBoolean(KEY_SHOULD_SAVE, mShouldSave); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityView.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityView.java new file mode 100644 index 000000000..0d26d48a7 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityView.java @@ -0,0 +1,103 @@ +package org.citra.citra_emu.features.settings.ui; + +import android.content.IntentFilter; + +import org.citra.citra_emu.features.settings.model.Settings; +import org.citra.citra_emu.utils.DirectoryStateReceiver; + +/** + * Abstraction for the Activity that manages SettingsFragments. + */ +public interface SettingsActivityView { + /** + * Show a new SettingsFragment. + * + * @param menuTag Identifier for the settings group that should be displayed. + * @param addToStack Whether or not this fragment should replace a previous one. + */ + void showSettingsFragment(String menuTag, boolean addToStack, String gameId); + + /** + * Called by a contained Fragment to get access to the Setting HashMap + * loaded from disk, so that each Fragment doesn't need to perform its own + * read operation. + * + * @return A possibly null HashMap of Settings. + */ + Settings getSettings(); + + /** + * Used to provide the Activity with Settings HashMaps if a Fragment already + * has one; for example, if a rotation occurs, the Fragment will not be killed, + * but the Activity will, so the Activity needs to have its HashMaps resupplied. + * + * @param settings The ArrayList of all the Settings HashMaps. + */ + void setSettings(Settings settings); + + /** + * Called when an asynchronous load operation completes. + * + * @param settings The (possibly null) result of the ini load operation. + */ + void onSettingsFileLoaded(Settings settings); + + /** + * Called when an asynchronous load operation fails. + */ + void onSettingsFileNotFound(); + + /** + * Display a popup text message on screen. + * + * @param message The contents of the onscreen message. + * @param is_long Whether this should be a long Toast or short one. + */ + void showToastMessage(String message, boolean is_long); + + /** + * End the activity. + */ + void finish(); + + /** + * Called by a containing Fragment to tell the Activity that a setting was changed; + * unless this has been called, the Activity will not save to disk. + */ + void onSettingChanged(); + + /** + * Show loading dialog while loading the settings + */ + void showLoading(); + + /** + * Hide the loading the dialog + */ + void hideLoading(); + + /** + * Show a hint to the user that the app needs write to external storage access + */ + void showPermissionNeededHint(); + + /** + * Show a hint to the user that the app needs the external storage to be mounted + */ + void showExternalStorageNotMountedHint(); + + /** + * Start the DirectoryInitialization and listen for the result. + * + * @param receiver the broadcast receiver for the DirectoryInitialization + * @param filter the Intent broadcasts to be received. + */ + void startDirectoryInitializationService(DirectoryStateReceiver receiver, IntentFilter filter); + + /** + * Stop listening to the DirectoryInitialization. + * + * @param receiver The broadcast receiver to unregister. + */ + void stopListeningToDirectoryInitializationService(DirectoryStateReceiver receiver); +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.java new file mode 100644 index 000000000..bfd7c71a9 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.java @@ -0,0 +1,487 @@ +package org.citra.citra_emu.features.settings.ui; + +import android.content.Context; +import android.content.DialogInterface; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.DatePicker; +import android.widget.SeekBar; +import android.widget.TextView; +import android.widget.TimePicker; + +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.RecyclerView; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.dialogs.MotionAlertDialog; +import org.citra.citra_emu.features.settings.model.FloatSetting; +import org.citra.citra_emu.features.settings.model.IntSetting; +import org.citra.citra_emu.features.settings.model.StringSetting; +import org.citra.citra_emu.features.settings.model.view.CheckBoxSetting; +import org.citra.citra_emu.features.settings.model.view.DateTimeSetting; +import org.citra.citra_emu.features.settings.model.view.InputBindingSetting; +import org.citra.citra_emu.features.settings.model.view.PremiumSingleChoiceSetting; +import org.citra.citra_emu.features.settings.model.view.SettingsItem; +import org.citra.citra_emu.features.settings.model.view.SingleChoiceSetting; +import org.citra.citra_emu.features.settings.model.view.SliderSetting; +import org.citra.citra_emu.features.settings.model.view.StringSingleChoiceSetting; +import org.citra.citra_emu.features.settings.model.view.SubmenuSetting; +import org.citra.citra_emu.features.settings.ui.viewholder.CheckBoxSettingViewHolder; +import org.citra.citra_emu.features.settings.ui.viewholder.DateTimeViewHolder; +import org.citra.citra_emu.features.settings.ui.viewholder.HeaderViewHolder; +import org.citra.citra_emu.features.settings.ui.viewholder.InputBindingSettingViewHolder; +import org.citra.citra_emu.features.settings.ui.viewholder.PremiumViewHolder; +import org.citra.citra_emu.features.settings.ui.viewholder.SettingViewHolder; +import org.citra.citra_emu.features.settings.ui.viewholder.SingleChoiceViewHolder; +import org.citra.citra_emu.features.settings.ui.viewholder.SliderViewHolder; +import org.citra.citra_emu.features.settings.ui.viewholder.SubmenuViewHolder; +import org.citra.citra_emu.ui.main.MainActivity; +import org.citra.citra_emu.utils.Log; + +import java.util.ArrayList; + +public final class SettingsAdapter extends RecyclerView.Adapter + implements DialogInterface.OnClickListener, SeekBar.OnSeekBarChangeListener { + private SettingsFragmentView mView; + private Context mContext; + private ArrayList mSettings; + + private SettingsItem mClickedItem; + private int mClickedPosition; + private int mSeekbarProgress; + + private AlertDialog mDialog; + private TextView mTextSliderValue; + + public SettingsAdapter(SettingsFragmentView view, Context context) { + mView = view; + mContext = context; + mClickedPosition = -1; + } + + @Override + public SettingViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View view; + LayoutInflater inflater = LayoutInflater.from(parent.getContext()); + + switch (viewType) { + case SettingsItem.TYPE_HEADER: + view = inflater.inflate(R.layout.list_item_settings_header, parent, false); + return new HeaderViewHolder(view, this); + + case SettingsItem.TYPE_CHECKBOX: + view = inflater.inflate(R.layout.list_item_setting_checkbox, parent, false); + return new CheckBoxSettingViewHolder(view, this); + + case SettingsItem.TYPE_SINGLE_CHOICE: + case SettingsItem.TYPE_STRING_SINGLE_CHOICE: + view = inflater.inflate(R.layout.list_item_setting, parent, false); + return new SingleChoiceViewHolder(view, this); + + case SettingsItem.TYPE_SLIDER: + view = inflater.inflate(R.layout.list_item_setting, parent, false); + return new SliderViewHolder(view, this); + + case SettingsItem.TYPE_SUBMENU: + view = inflater.inflate(R.layout.list_item_setting, parent, false); + return new SubmenuViewHolder(view, this); + + case SettingsItem.TYPE_INPUT_BINDING: + view = inflater.inflate(R.layout.list_item_setting, parent, false); + return new InputBindingSettingViewHolder(view, this, mContext); + + case SettingsItem.TYPE_DATETIME_SETTING: + view = inflater.inflate(R.layout.list_item_setting, parent, false); + return new DateTimeViewHolder(view, this); + + case SettingsItem.TYPE_PREMIUM: + view = inflater.inflate(R.layout.premium_item_setting, parent, false); + return new PremiumViewHolder(view, this, mView); + + default: + Log.error("[SettingsAdapter] Invalid view type: " + viewType); + return null; + } + } + + @Override + public void onBindViewHolder(SettingViewHolder holder, int position) { + holder.bind(getItem(position)); + } + + private SettingsItem getItem(int position) { + return mSettings.get(position); + } + + @Override + public int getItemCount() { + if (mSettings != null) { + return mSettings.size(); + } else { + return 0; + } + } + + @Override + public int getItemViewType(int position) { + return getItem(position).getType(); + } + + public void setSettings(ArrayList settings) { + mSettings = settings; + notifyDataSetChanged(); + } + + public void onBooleanClick(CheckBoxSetting item, int position, boolean checked) { + IntSetting setting = item.setChecked(checked); + notifyItemChanged(position); + + if (setting != null) { + mView.putSetting(setting); + } + + mView.onSettingChanged(); + } + + public void onSingleChoiceClick(PremiumSingleChoiceSetting item) { + mClickedItem = item; + + int value = getSelectionForSingleChoiceValue(item); + + AlertDialog.Builder builder = new AlertDialog.Builder(mView.getActivity()); + + builder.setTitle(item.getNameId()); + builder.setSingleChoiceItems(item.getChoicesId(), value, this); + + mDialog = builder.show(); + } + + public void onSingleChoiceClick(SingleChoiceSetting item) { + mClickedItem = item; + + int value = getSelectionForSingleChoiceValue(item); + + AlertDialog.Builder builder = new AlertDialog.Builder(mView.getActivity()); + + builder.setTitle(item.getNameId()); + builder.setSingleChoiceItems(item.getChoicesId(), value, this); + + mDialog = builder.show(); + } + + public void onSingleChoiceClick(SingleChoiceSetting item, int position) { + mClickedPosition = position; + + if (!item.isPremium() || MainActivity.isPremiumActive()) { + // Setting is either not Premium, or the user has Premium + onSingleChoiceClick(item); + return; + } + + // User needs Premium, invoke the billing flow + MainActivity.invokePremiumBilling(() -> onSingleChoiceClick(item)); + } + + public void onSingleChoiceClick(PremiumSingleChoiceSetting item, int position) { + mClickedPosition = position; + + if (!item.isPremium() || MainActivity.isPremiumActive()) { + // Setting is either not Premium, or the user has Premium + onSingleChoiceClick(item); + return; + } + + // User needs Premium, invoke the billing flow + MainActivity.invokePremiumBilling(() -> onSingleChoiceClick(item)); + } + + public void onStringSingleChoiceClick(StringSingleChoiceSetting item) { + mClickedItem = item; + + AlertDialog.Builder builder = new AlertDialog.Builder(mView.getActivity()); + + builder.setTitle(item.getNameId()); + builder.setSingleChoiceItems(item.getChoicesId(), item.getSelectValueIndex(), this); + + mDialog = builder.show(); + } + + public void onStringSingleChoiceClick(StringSingleChoiceSetting item, int position) { + mClickedPosition = position; + + if (!item.isPremium() || MainActivity.isPremiumActive()) { + // Setting is either not Premium, or the user has Premium + onStringSingleChoiceClick(item); + return; + } + + // User needs Premium, invoke the billing flow + MainActivity.invokePremiumBilling(() -> onStringSingleChoiceClick(item)); + } + + DialogInterface.OnClickListener defaultCancelListener = (dialog, which) -> closeDialog(); + + public void onDateTimeClick(DateTimeSetting item, int position) { + mClickedItem = item; + mClickedPosition = position; + + AlertDialog.Builder builder = new AlertDialog.Builder(mView.getActivity()); + + LayoutInflater inflater = LayoutInflater.from(mView.getActivity()); + View view = inflater.inflate(R.layout.sysclock_datetime_picker, null); + + DatePicker dp = view.findViewById(R.id.date_picker); + TimePicker tp = view.findViewById(R.id.time_picker); + + //set date and time to substrings of settingValue; format = 2018-12-24 04:20:69 (alright maybe not that 69) + String settingValue = item.getValue(); + dp.updateDate(Integer.parseInt(settingValue.substring(0, 4)), Integer.parseInt(settingValue.substring(5, 7)) - 1, Integer.parseInt(settingValue.substring(8, 10))); + + tp.setIs24HourView(true); + tp.setHour(Integer.parseInt(settingValue.substring(11, 13))); + tp.setMinute(Integer.parseInt(settingValue.substring(14, 16))); + + DialogInterface.OnClickListener ok = (dialog, which) -> { + //set it + int year = dp.getYear(); + if (year < 2000) { + year = 2000; + } + String month = ("00" + (dp.getMonth() + 1)).substring(String.valueOf(dp.getMonth() + 1).length()); + String day = ("00" + dp.getDayOfMonth()).substring(String.valueOf(dp.getDayOfMonth()).length()); + String hr = ("00" + tp.getHour()).substring(String.valueOf(tp.getHour()).length()); + String min = ("00" + tp.getMinute()).substring(String.valueOf(tp.getMinute()).length()); + String datetime = year + "-" + month + "-" + day + " " + hr + ":" + min + ":01"; + + StringSetting setting = item.setSelectedValue(datetime); + if (setting != null) { + mView.putSetting(setting); + } + + mView.onSettingChanged(); + + mClickedItem = null; + closeDialog(); + }; + + builder.setView(view); + builder.setPositiveButton(android.R.string.ok, ok); + builder.setNegativeButton(android.R.string.cancel, defaultCancelListener); + mDialog = builder.show(); + } + + public void onSliderClick(SliderSetting item, int position) { + mClickedItem = item; + mClickedPosition = position; + mSeekbarProgress = item.getSelectedValue(); + AlertDialog.Builder builder = new AlertDialog.Builder(mView.getActivity()); + + LayoutInflater inflater = LayoutInflater.from(mView.getActivity()); + View view = inflater.inflate(R.layout.dialog_seekbar, null); + + SeekBar seekbar = view.findViewById(R.id.seekbar); + + builder.setTitle(item.getNameId()); + builder.setView(view); + builder.setPositiveButton(android.R.string.ok, this); + builder.setNegativeButton(android.R.string.cancel, defaultCancelListener); + builder.setNeutralButton(R.string.slider_default, (DialogInterface dialog, int which) -> { + seekbar.setProgress(item.getDefaultValue()); + onClick(dialog, which); + }); + mDialog = builder.show(); + + mTextSliderValue = view.findViewById(R.id.text_value); + mTextSliderValue.setText(String.valueOf(mSeekbarProgress)); + + TextView units = view.findViewById(R.id.text_units); + units.setText(item.getUnits()); + + seekbar.setMin(item.getMin()); + seekbar.setMax(item.getMax()); + seekbar.setProgress(mSeekbarProgress); + + seekbar.setOnSeekBarChangeListener(this); + } + + public void onSubmenuClick(SubmenuSetting item) { + mView.loadSubMenu(item.getMenuKey()); + } + + public void onInputBindingClick(final InputBindingSetting item, final int position) { + final MotionAlertDialog dialog = new MotionAlertDialog(mContext, item); + dialog.setTitle(R.string.input_binding); + + int messageResId = R.string.input_binding_description; + if (item.IsAxisMappingSupported() && !item.IsTrigger()) { + // Use specialized message for axis left/right or up/down + if (item.IsHorizontalOrientation()) { + messageResId = R.string.input_binding_description_horizontal_axis; + } else { + messageResId = R.string.input_binding_description_vertical_axis; + } + } + + dialog.setMessage(String.format(mContext.getString(messageResId), mContext.getString(item.getNameId()))); + dialog.setButton(AlertDialog.BUTTON_NEGATIVE, mContext.getString(android.R.string.cancel), this); + dialog.setButton(AlertDialog.BUTTON_NEUTRAL, mContext.getString(R.string.clear), (dialogInterface, i) -> + item.removeOldMapping()); + dialog.setOnDismissListener(dialog1 -> + { + StringSetting setting = new StringSetting(item.getKey(), item.getSection(), item.getValue()); + notifyItemChanged(position); + + mView.putSetting(setting); + + mView.onSettingChanged(); + }); + dialog.setCanceledOnTouchOutside(false); + dialog.show(); + } + + @Override + public void onClick(DialogInterface dialog, int which) { + if (mClickedItem instanceof SingleChoiceSetting) { + SingleChoiceSetting scSetting = (SingleChoiceSetting) mClickedItem; + + int value = getValueForSingleChoiceSelection(scSetting, which); + if (scSetting.getSelectedValue() != value) { + mView.onSettingChanged(); + } + + // Get the backing Setting, which may be null (if for example it was missing from the file) + IntSetting setting = scSetting.setSelectedValue(value); + if (setting != null) { + mView.putSetting(setting); + } + + closeDialog(); + } else if (mClickedItem instanceof PremiumSingleChoiceSetting) { + PremiumSingleChoiceSetting scSetting = (PremiumSingleChoiceSetting) mClickedItem; + scSetting.setSelectedValue(getValueForSingleChoiceSelection(scSetting, which)); + closeDialog(); + } else if (mClickedItem instanceof StringSingleChoiceSetting) { + StringSingleChoiceSetting scSetting = (StringSingleChoiceSetting) mClickedItem; + String value = scSetting.getValueAt(which); + if (!scSetting.getSelectedValue().equals(value)) + mView.onSettingChanged(); + + StringSetting setting = scSetting.setSelectedValue(value); + if (setting != null) { + mView.putSetting(setting); + } + + closeDialog(); + } else if (mClickedItem instanceof SliderSetting) { + SliderSetting sliderSetting = (SliderSetting) mClickedItem; + if (sliderSetting.getSelectedValue() != mSeekbarProgress) { + mView.onSettingChanged(); + } + + if (sliderSetting.getSetting() instanceof FloatSetting) { + float value = (float) mSeekbarProgress; + + FloatSetting setting = sliderSetting.setSelectedValue(value); + if (setting != null) { + mView.putSetting(setting); + } + } else { + IntSetting setting = sliderSetting.setSelectedValue(mSeekbarProgress); + if (setting != null) { + mView.putSetting(setting); + } + } + + closeDialog(); + } + + mClickedItem = null; + mSeekbarProgress = -1; + } + + public void closeDialog() { + if (mDialog != null) { + if (mClickedPosition != -1) { + notifyItemChanged(mClickedPosition); + mClickedPosition = -1; + } + mDialog.dismiss(); + mDialog = null; + } + } + + @Override + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + mSeekbarProgress = progress; + mTextSliderValue.setText(String.valueOf(mSeekbarProgress)); + } + + @Override + public void onStartTrackingTouch(SeekBar seekBar) { + } + + @Override + public void onStopTrackingTouch(SeekBar seekBar) { + } + + private int getValueForSingleChoiceSelection(SingleChoiceSetting item, int which) { + int valuesId = item.getValuesId(); + + if (valuesId > 0) { + int[] valuesArray = mContext.getResources().getIntArray(valuesId); + return valuesArray[which]; + } else { + return which; + } + } + + private int getValueForSingleChoiceSelection(PremiumSingleChoiceSetting item, int which) { + int valuesId = item.getValuesId(); + + if (valuesId > 0) { + int[] valuesArray = mContext.getResources().getIntArray(valuesId); + return valuesArray[which]; + } else { + return which; + } + } + + private int getSelectionForSingleChoiceValue(SingleChoiceSetting item) { + int value = item.getSelectedValue(); + int valuesId = item.getValuesId(); + + if (valuesId > 0) { + int[] valuesArray = mContext.getResources().getIntArray(valuesId); + for (int index = 0; index < valuesArray.length; index++) { + int current = valuesArray[index]; + if (current == value) { + return index; + } + } + } else { + return value; + } + + return -1; + } + + private int getSelectionForSingleChoiceValue(PremiumSingleChoiceSetting item) { + int value = item.getSelectedValue(); + int valuesId = item.getValuesId(); + + if (valuesId > 0) { + int[] valuesArray = mContext.getResources().getIntArray(valuesId); + for (int index = 0; index < valuesArray.length; index++) { + int current = valuesArray[index]; + if (current == value) { + return index; + } + } + } else { + return value; + } + + return -1; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragment.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragment.java new file mode 100644 index 000000000..5799dcb8d --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragment.java @@ -0,0 +1,136 @@ +package org.citra.citra_emu.features.settings.ui; + +import android.content.Context; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.model.Setting; +import org.citra.citra_emu.features.settings.model.Settings; +import org.citra.citra_emu.features.settings.model.view.SettingsItem; +import org.citra.citra_emu.ui.DividerItemDecoration; + +import java.util.ArrayList; + +public final class SettingsFragment extends Fragment implements SettingsFragmentView { + private static final String ARGUMENT_MENU_TAG = "menu_tag"; + private static final String ARGUMENT_GAME_ID = "game_id"; + + private SettingsFragmentPresenter mPresenter = new SettingsFragmentPresenter(this); + private SettingsActivityView mActivity; + + private SettingsAdapter mAdapter; + + public static Fragment newInstance(String menuTag, String gameId) { + SettingsFragment fragment = new SettingsFragment(); + + Bundle arguments = new Bundle(); + arguments.putString(ARGUMENT_MENU_TAG, menuTag); + arguments.putString(ARGUMENT_GAME_ID, gameId); + + fragment.setArguments(arguments); + return fragment; + } + + @Override + public void onAttach(@NonNull Context context) { + super.onAttach(context); + + mActivity = (SettingsActivityView) context; + mPresenter.onAttach(); + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setRetainInstance(true); + String menuTag = getArguments().getString(ARGUMENT_MENU_TAG); + String gameId = getArguments().getString(ARGUMENT_GAME_ID); + + mAdapter = new SettingsAdapter(this, getActivity()); + + mPresenter.onCreate(menuTag, gameId); + } + + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_settings, container, false); + } + + @Override + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { + LinearLayoutManager manager = new LinearLayoutManager(getActivity()); + + RecyclerView recyclerView = view.findViewById(R.id.list_settings); + + recyclerView.setAdapter(mAdapter); + recyclerView.setLayoutManager(manager); + recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), null)); + + SettingsActivityView activity = (SettingsActivityView) getActivity(); + + mPresenter.onViewCreated(activity.getSettings()); + } + + @Override + public void onDetach() { + super.onDetach(); + mActivity = null; + + if (mAdapter != null) { + mAdapter.closeDialog(); + } + } + + @Override + public void onSettingsFileLoaded(Settings settings) { + mPresenter.setSettings(settings); + } + + @Override + public void passSettingsToActivity(Settings settings) { + if (mActivity != null) { + mActivity.setSettings(settings); + } + } + + @Override + public void showSettingsList(ArrayList settingsList) { + mAdapter.setSettings(settingsList); + } + + @Override + public void loadDefaultSettings() { + mPresenter.loadDefaultSettings(); + } + + @Override + public void loadSubMenu(String menuKey) { + mActivity.showSettingsFragment(menuKey, true, getArguments().getString(ARGUMENT_GAME_ID)); + } + + @Override + public void showToastMessage(String message, boolean is_long) { + mActivity.showToastMessage(message, is_long); + } + + @Override + public void putSetting(Setting setting) { + mPresenter.putSetting(setting); + } + + @Override + public void onSettingChanged() { + mActivity.onSettingChanged(); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java new file mode 100644 index 000000000..31f3e68eb --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java @@ -0,0 +1,416 @@ +package org.citra.citra_emu.features.settings.ui; + +import android.app.Activity; +import android.content.Context; +import android.hardware.camera2.CameraAccessException; +import android.hardware.camera2.CameraCharacteristics; +import android.hardware.camera2.CameraManager; +import android.text.TextUtils; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.model.Setting; +import org.citra.citra_emu.features.settings.model.SettingSection; +import org.citra.citra_emu.features.settings.model.Settings; +import org.citra.citra_emu.features.settings.model.StringSetting; +import org.citra.citra_emu.features.settings.model.view.CheckBoxSetting; +import org.citra.citra_emu.features.settings.model.view.DateTimeSetting; +import org.citra.citra_emu.features.settings.model.view.HeaderSetting; +import org.citra.citra_emu.features.settings.model.view.InputBindingSetting; +import org.citra.citra_emu.features.settings.model.view.PremiumHeader; +import org.citra.citra_emu.features.settings.model.view.PremiumSingleChoiceSetting; +import org.citra.citra_emu.features.settings.model.view.SettingsItem; +import org.citra.citra_emu.features.settings.model.view.SingleChoiceSetting; +import org.citra.citra_emu.features.settings.model.view.SliderSetting; +import org.citra.citra_emu.features.settings.model.view.StringSingleChoiceSetting; +import org.citra.citra_emu.features.settings.model.view.SubmenuSetting; +import org.citra.citra_emu.features.settings.utils.SettingsFile; +import org.citra.citra_emu.utils.Log; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Objects; + +public final class SettingsFragmentPresenter { + private SettingsFragmentView mView; + + private String mMenuTag; + private String mGameID; + + private Settings mSettings; + private ArrayList mSettingsList; + + public SettingsFragmentPresenter(SettingsFragmentView view) { + mView = view; + } + + public void onCreate(String menuTag, String gameId) { + mGameID = gameId; + mMenuTag = menuTag; + } + + public void onViewCreated(Settings settings) { + setSettings(settings); + } + + /** + * If the screen is rotated, the Activity will forget the settings map. This fragment + * won't, though; so rather than have the Activity reload from disk, have the fragment pass + * the settings map back to the Activity. + */ + public void onAttach() { + if (mSettings != null) { + mView.passSettingsToActivity(mSettings); + } + } + + public void putSetting(Setting setting) { + mSettings.getSection(setting.getSection()).putSetting(setting); + } + + private StringSetting asStringSetting(Setting setting) { + if (setting == null) { + return null; + } + + StringSetting stringSetting = new StringSetting(setting.getKey(), setting.getSection(), setting.getValueAsString()); + putSetting(stringSetting); + return stringSetting; + } + + public void loadDefaultSettings() { + loadSettingsList(); + } + + public void setSettings(Settings settings) { + if (mSettingsList == null && settings != null) { + mSettings = settings; + + loadSettingsList(); + } else { + mView.getActivity().setTitle(R.string.preferences_settings); + mView.showSettingsList(mSettingsList); + } + } + + private void loadSettingsList() { + if (!TextUtils.isEmpty(mGameID)) { + mView.getActivity().setTitle("Game Settings: " + mGameID); + } + ArrayList sl = new ArrayList<>(); + + if (mMenuTag == null) { + return; + } + + switch (mMenuTag) { + case SettingsFile.FILE_NAME_CONFIG: + addConfigSettings(sl); + break; + case Settings.SECTION_PREMIUM: + addPremiumSettings(sl); + break; + case Settings.SECTION_CORE: + addGeneralSettings(sl); + break; + case Settings.SECTION_SYSTEM: + addSystemSettings(sl); + break; + case Settings.SECTION_CAMERA: + addCameraSettings(sl); + break; + case Settings.SECTION_CONTROLS: + addInputSettings(sl); + break; + case Settings.SECTION_RENDERER: + addGraphicsSettings(sl); + break; + case Settings.SECTION_AUDIO: + addAudioSettings(sl); + break; + case Settings.SECTION_DEBUG: + addDebugSettings(sl); + break; + default: + mView.showToastMessage("Unimplemented menu", false); + return; + } + + mSettingsList = sl; + mView.showSettingsList(mSettingsList); + } + + private void addConfigSettings(ArrayList sl) { + mView.getActivity().setTitle(R.string.preferences_settings); + + sl.add(new SubmenuSetting(null, null, R.string.preferences_premium, 0, Settings.SECTION_PREMIUM)); + sl.add(new SubmenuSetting(null, null, R.string.preferences_general, 0, Settings.SECTION_CORE)); + sl.add(new SubmenuSetting(null, null, R.string.preferences_system, 0, Settings.SECTION_SYSTEM)); + sl.add(new SubmenuSetting(null, null, R.string.preferences_camera, 0, Settings.SECTION_CAMERA)); + sl.add(new SubmenuSetting(null, null, R.string.preferences_controls, 0, Settings.SECTION_CONTROLS)); + sl.add(new SubmenuSetting(null, null, R.string.preferences_graphics, 0, Settings.SECTION_RENDERER)); + sl.add(new SubmenuSetting(null, null, R.string.preferences_audio, 0, Settings.SECTION_AUDIO)); + sl.add(new SubmenuSetting(null, null, R.string.preferences_debug, 0, Settings.SECTION_DEBUG)); + } + + private void addPremiumSettings(ArrayList sl) { + mView.getActivity().setTitle(R.string.preferences_premium); + + SettingSection premiumSection = mSettings.getSection(Settings.SECTION_PREMIUM); + Setting design = premiumSection.getSetting(SettingsFile.KEY_DESIGN); + + sl.add(new PremiumHeader()); + + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) { + sl.add(new PremiumSingleChoiceSetting(SettingsFile.KEY_DESIGN, Settings.SECTION_PREMIUM, R.string.design, 0, R.array.designNames, R.array.designValues, 0, design, mView)); + } else { + // Pre-Android 10 does not support System Default + sl.add(new PremiumSingleChoiceSetting(SettingsFile.KEY_DESIGN, Settings.SECTION_PREMIUM, R.string.design, 0, R.array.designNamesOld, R.array.designValuesOld, 0, design, mView)); + } + + //Setting textureFilterName = premiumSection.getSetting(SettingsFile.KEY_TEXTURE_FILTER_NAME); + //sl.add(new StringSingleChoiceSetting(SettingsFile.KEY_TEXTURE_FILTER_NAME, Settings.SECTION_PREMIUM, R.string.texture_filter_name, R.string.texture_filter_description, textureFilterNames, textureFilterNames, "none", textureFilterName)); + } + + private void addGeneralSettings(ArrayList sl) { + mView.getActivity().setTitle(R.string.preferences_general); + + SettingSection rendererSection = mSettings.getSection(Settings.SECTION_RENDERER); + Setting frameLimitEnable = rendererSection.getSetting(SettingsFile.KEY_FRAME_LIMIT_ENABLED); + Setting frameLimitValue = rendererSection.getSetting(SettingsFile.KEY_FRAME_LIMIT); + + sl.add(new CheckBoxSetting(SettingsFile.KEY_FRAME_LIMIT_ENABLED, Settings.SECTION_RENDERER, R.string.frame_limit_enable, R.string.frame_limit_enable_description, true, frameLimitEnable)); + sl.add(new SliderSetting(SettingsFile.KEY_FRAME_LIMIT, Settings.SECTION_RENDERER, R.string.frame_limit_slider, R.string.frame_limit_slider_description, 1, 200, "%", 100, frameLimitValue)); + } + + private void addSystemSettings(ArrayList sl) { + mView.getActivity().setTitle(R.string.preferences_system); + + SettingSection systemSection = mSettings.getSection(Settings.SECTION_SYSTEM); + Setting region = systemSection.getSetting(SettingsFile.KEY_REGION_VALUE); + Setting language = systemSection.getSetting(SettingsFile.KEY_LANGUAGE); + Setting systemClock = systemSection.getSetting(SettingsFile.KEY_INIT_CLOCK); + Setting dateTime = systemSection.getSetting(SettingsFile.KEY_INIT_TIME); + + sl.add(new SingleChoiceSetting(SettingsFile.KEY_REGION_VALUE, Settings.SECTION_SYSTEM, R.string.emulated_region, 0, R.array.regionNames, R.array.regionValues, -1, region)); + sl.add(new SingleChoiceSetting(SettingsFile.KEY_LANGUAGE, Settings.SECTION_SYSTEM, R.string.emulated_language, 0, R.array.languageNames, R.array.languageValues, 1, language)); + sl.add(new SingleChoiceSetting(SettingsFile.KEY_INIT_CLOCK, Settings.SECTION_SYSTEM, R.string.init_clock, R.string.init_clock_description, R.array.systemClockNames, R.array.systemClockValues, 0, systemClock)); + sl.add(new DateTimeSetting(SettingsFile.KEY_INIT_TIME, Settings.SECTION_SYSTEM, R.string.init_time, R.string.init_time_description, "2000-01-01 00:00:01", dateTime)); + } + + private void addCameraSettings(ArrayList sl) { + final Activity activity = mView.getActivity(); + activity.setTitle(R.string.preferences_camera); + + // Get the camera IDs + CameraManager cameraManager = (CameraManager) activity.getSystemService(Context.CAMERA_SERVICE); + ArrayList supportedCameraNameList = new ArrayList<>(); + ArrayList supportedCameraIdList = new ArrayList<>(); + if (cameraManager != null) { + try { + for (String id : cameraManager.getCameraIdList()) { + final CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(id); + if (Objects.requireNonNull(characteristics.get(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL)) == CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY) { + continue; // Legacy cameras cannot be used with the NDK + } + + supportedCameraIdList.add(id); + + final int facing = Objects.requireNonNull(characteristics.get(CameraCharacteristics.LENS_FACING)); + int stringId = R.string.camera_facing_external; + switch (facing) { + case CameraCharacteristics.LENS_FACING_FRONT: + stringId = R.string.camera_facing_front; + break; + case CameraCharacteristics.LENS_FACING_BACK: + stringId = R.string.camera_facing_back; + break; + case CameraCharacteristics.LENS_FACING_EXTERNAL: + stringId = R.string.camera_facing_external; + break; + } + supportedCameraNameList.add(String.format("%1$s (%2$s)", id, activity.getString(stringId))); + } + } catch (CameraAccessException e) { + Log.error("Couldn't retrieve camera list"); + e.printStackTrace(); + } + } + + // Create the names and values for display + ArrayList cameraDeviceNameList = new ArrayList<>(Arrays.asList(activity.getResources().getStringArray(R.array.cameraDeviceNames))); + cameraDeviceNameList.addAll(supportedCameraNameList); + ArrayList cameraDeviceValueList = new ArrayList<>(Arrays.asList(activity.getResources().getStringArray(R.array.cameraDeviceValues))); + cameraDeviceValueList.addAll(supportedCameraIdList); + + final String[] cameraDeviceNames = cameraDeviceNameList.toArray(new String[]{}); + final String[] cameraDeviceValues = cameraDeviceValueList.toArray(new String[]{}); + + final boolean haveCameraDevices = !supportedCameraIdList.isEmpty(); + + String[] imageSourceNames = activity.getResources().getStringArray(R.array.cameraImageSourceNames); + String[] imageSourceValues = activity.getResources().getStringArray(R.array.cameraImageSourceValues); + if (!haveCameraDevices) { + // Remove the last entry (ndk / Device Camera) + imageSourceNames = Arrays.copyOfRange(imageSourceNames, 0, imageSourceNames.length - 1); + imageSourceValues = Arrays.copyOfRange(imageSourceValues, 0, imageSourceValues.length - 1); + } + + final String defaultImageSource = haveCameraDevices ? "ndk" : "image"; + + SettingSection cameraSection = mSettings.getSection(Settings.SECTION_CAMERA); + + Setting innerCameraImageSource = cameraSection.getSetting(SettingsFile.KEY_CAMERA_INNER_NAME); + Setting innerCameraConfig = asStringSetting(cameraSection.getSetting(SettingsFile.KEY_CAMERA_INNER_CONFIG)); + Setting innerCameraFlip = cameraSection.getSetting(SettingsFile.KEY_CAMERA_INNER_FLIP); + sl.add(new HeaderSetting(null, null, R.string.inner_camera, 0)); + sl.add(new StringSingleChoiceSetting(SettingsFile.KEY_CAMERA_INNER_NAME, Settings.SECTION_CAMERA, R.string.image_source, R.string.image_source_description, imageSourceNames, imageSourceValues, defaultImageSource, innerCameraImageSource)); + if (haveCameraDevices) + sl.add(new StringSingleChoiceSetting(SettingsFile.KEY_CAMERA_INNER_CONFIG, Settings.SECTION_CAMERA, R.string.camera_device, R.string.camera_device_description, cameraDeviceNames, cameraDeviceValues, "_front", innerCameraConfig)); + sl.add(new SingleChoiceSetting(SettingsFile.KEY_CAMERA_INNER_FLIP, Settings.SECTION_CAMERA, R.string.image_flip, 0, R.array.cameraFlipNames, R.array.cameraFlipValues, 0, innerCameraFlip)); + + Setting outerLeftCameraImageSource = cameraSection.getSetting(SettingsFile.KEY_CAMERA_OUTER_LEFT_NAME); + Setting outerLeftCameraConfig = asStringSetting(cameraSection.getSetting(SettingsFile.KEY_CAMERA_OUTER_LEFT_CONFIG)); + Setting outerLeftCameraFlip = cameraSection.getSetting(SettingsFile.KEY_CAMERA_OUTER_LEFT_FLIP); + sl.add(new HeaderSetting(null, null, R.string.outer_left_camera, 0)); + sl.add(new StringSingleChoiceSetting(SettingsFile.KEY_CAMERA_OUTER_LEFT_NAME, Settings.SECTION_CAMERA, R.string.image_source, R.string.image_source_description, imageSourceNames, imageSourceValues, defaultImageSource, outerLeftCameraImageSource)); + if (haveCameraDevices) + sl.add(new StringSingleChoiceSetting(SettingsFile.KEY_CAMERA_OUTER_LEFT_CONFIG, Settings.SECTION_CAMERA, R.string.camera_device, R.string.camera_device_description, cameraDeviceNames, cameraDeviceValues, "_back", outerLeftCameraConfig)); + sl.add(new SingleChoiceSetting(SettingsFile.KEY_CAMERA_OUTER_LEFT_FLIP, Settings.SECTION_CAMERA, R.string.image_flip, 0, R.array.cameraFlipNames, R.array.cameraFlipValues, 0, outerLeftCameraFlip)); + + Setting outerRightCameraImageSource = cameraSection.getSetting(SettingsFile.KEY_CAMERA_OUTER_RIGHT_NAME); + Setting outerRightCameraConfig = asStringSetting(cameraSection.getSetting(SettingsFile.KEY_CAMERA_OUTER_RIGHT_CONFIG)); + Setting outerRightCameraFlip = cameraSection.getSetting(SettingsFile.KEY_CAMERA_OUTER_RIGHT_FLIP); + sl.add(new HeaderSetting(null, null, R.string.outer_right_camera, 0)); + sl.add(new StringSingleChoiceSetting(SettingsFile.KEY_CAMERA_OUTER_RIGHT_NAME, Settings.SECTION_CAMERA, R.string.image_source, R.string.image_source_description, imageSourceNames, imageSourceValues, defaultImageSource, outerRightCameraImageSource)); + if (haveCameraDevices) + sl.add(new StringSingleChoiceSetting(SettingsFile.KEY_CAMERA_OUTER_RIGHT_CONFIG, Settings.SECTION_CAMERA, R.string.camera_device, R.string.camera_device_description, cameraDeviceNames, cameraDeviceValues, "_back", outerRightCameraConfig)); + sl.add(new SingleChoiceSetting(SettingsFile.KEY_CAMERA_OUTER_RIGHT_FLIP, Settings.SECTION_CAMERA, R.string.image_flip, 0, R.array.cameraFlipNames, R.array.cameraFlipValues, 0, outerRightCameraFlip)); + } + + private void addInputSettings(ArrayList sl) { + mView.getActivity().setTitle(R.string.preferences_controls); + + SettingSection controlsSection = mSettings.getSection(Settings.SECTION_CONTROLS); + Setting buttonA = controlsSection.getSetting(SettingsFile.KEY_BUTTON_A); + Setting buttonB = controlsSection.getSetting(SettingsFile.KEY_BUTTON_B); + Setting buttonX = controlsSection.getSetting(SettingsFile.KEY_BUTTON_X); + Setting buttonY = controlsSection.getSetting(SettingsFile.KEY_BUTTON_Y); + Setting buttonSelect = controlsSection.getSetting(SettingsFile.KEY_BUTTON_SELECT); + Setting buttonStart = controlsSection.getSetting(SettingsFile.KEY_BUTTON_START); + Setting circlepadAxisVert = controlsSection.getSetting(SettingsFile.KEY_CIRCLEPAD_AXIS_VERTICAL); + Setting circlepadAxisHoriz = controlsSection.getSetting(SettingsFile.KEY_CIRCLEPAD_AXIS_HORIZONTAL); + Setting cstickAxisVert = controlsSection.getSetting(SettingsFile.KEY_CSTICK_AXIS_VERTICAL); + Setting cstickAxisHoriz = controlsSection.getSetting(SettingsFile.KEY_CSTICK_AXIS_HORIZONTAL); + Setting dpadAxisVert = controlsSection.getSetting(SettingsFile.KEY_DPAD_AXIS_VERTICAL); + Setting dpadAxisHoriz = controlsSection.getSetting(SettingsFile.KEY_DPAD_AXIS_HORIZONTAL); + // Setting buttonUp = controlsSection.getSetting(SettingsFile.KEY_BUTTON_UP); + // Setting buttonDown = controlsSection.getSetting(SettingsFile.KEY_BUTTON_DOWN); + // Setting buttonLeft = controlsSection.getSetting(SettingsFile.KEY_BUTTON_LEFT); + // Setting buttonRight = controlsSection.getSetting(SettingsFile.KEY_BUTTON_RIGHT); + Setting buttonL = controlsSection.getSetting(SettingsFile.KEY_BUTTON_L); + Setting buttonR = controlsSection.getSetting(SettingsFile.KEY_BUTTON_R); + Setting buttonZL = controlsSection.getSetting(SettingsFile.KEY_BUTTON_ZL); + Setting buttonZR = controlsSection.getSetting(SettingsFile.KEY_BUTTON_ZR); + + sl.add(new HeaderSetting(null, null, R.string.generic_buttons, 0)); + sl.add(new InputBindingSetting(SettingsFile.KEY_BUTTON_A, Settings.SECTION_CONTROLS, R.string.button_a, buttonA)); + sl.add(new InputBindingSetting(SettingsFile.KEY_BUTTON_B, Settings.SECTION_CONTROLS, R.string.button_b, buttonB)); + sl.add(new InputBindingSetting(SettingsFile.KEY_BUTTON_X, Settings.SECTION_CONTROLS, R.string.button_x, buttonX)); + sl.add(new InputBindingSetting(SettingsFile.KEY_BUTTON_Y, Settings.SECTION_CONTROLS, R.string.button_y, buttonY)); + sl.add(new InputBindingSetting(SettingsFile.KEY_BUTTON_SELECT, Settings.SECTION_CONTROLS, R.string.button_select, buttonSelect)); + sl.add(new InputBindingSetting(SettingsFile.KEY_BUTTON_START, Settings.SECTION_CONTROLS, R.string.button_start, buttonStart)); + + sl.add(new HeaderSetting(null, null, R.string.controller_circlepad, 0)); + sl.add(new InputBindingSetting(SettingsFile.KEY_CIRCLEPAD_AXIS_VERTICAL, Settings.SECTION_CONTROLS, R.string.controller_axis_vertical, circlepadAxisVert)); + sl.add(new InputBindingSetting(SettingsFile.KEY_CIRCLEPAD_AXIS_HORIZONTAL, Settings.SECTION_CONTROLS, R.string.controller_axis_horizontal, circlepadAxisHoriz)); + + sl.add(new HeaderSetting(null, null, R.string.controller_c, 0)); + sl.add(new InputBindingSetting(SettingsFile.KEY_CSTICK_AXIS_VERTICAL, Settings.SECTION_CONTROLS, R.string.controller_axis_vertical, cstickAxisVert)); + sl.add(new InputBindingSetting(SettingsFile.KEY_CSTICK_AXIS_HORIZONTAL, Settings.SECTION_CONTROLS, R.string.controller_axis_horizontal, cstickAxisHoriz)); + + sl.add(new HeaderSetting(null, null, R.string.controller_dpad, 0)); + sl.add(new InputBindingSetting(SettingsFile.KEY_DPAD_AXIS_VERTICAL, Settings.SECTION_CONTROLS, R.string.controller_axis_vertical, dpadAxisVert)); + sl.add(new InputBindingSetting(SettingsFile.KEY_DPAD_AXIS_HORIZONTAL, Settings.SECTION_CONTROLS, R.string.controller_axis_horizontal, dpadAxisHoriz)); + + // TODO(bunnei): Figure out what to do with these. Configuring is functional, but removing for MVP because they are confusing. + // sl.add(new InputBindingSetting(SettingsFile.KEY_BUTTON_UP, Settings.SECTION_CONTROLS, R.string.generic_up, buttonUp)); + // sl.add(new InputBindingSetting(SettingsFile.KEY_BUTTON_DOWN, Settings.SECTION_CONTROLS, R.string.generic_down, buttonDown)); + // sl.add(new InputBindingSetting(SettingsFile.KEY_BUTTON_LEFT, Settings.SECTION_CONTROLS, R.string.generic_left, buttonLeft)); + // sl.add(new InputBindingSetting(SettingsFile.KEY_BUTTON_RIGHT, Settings.SECTION_CONTROLS, R.string.generic_right, buttonRight)); + + sl.add(new HeaderSetting(null, null, R.string.controller_triggers, 0)); + sl.add(new InputBindingSetting(SettingsFile.KEY_BUTTON_L, Settings.SECTION_CONTROLS, R.string.button_l, buttonL)); + sl.add(new InputBindingSetting(SettingsFile.KEY_BUTTON_R, Settings.SECTION_CONTROLS, R.string.button_r, buttonR)); + sl.add(new InputBindingSetting(SettingsFile.KEY_BUTTON_ZL, Settings.SECTION_CONTROLS, R.string.button_zl, buttonZL)); + sl.add(new InputBindingSetting(SettingsFile.KEY_BUTTON_ZR, Settings.SECTION_CONTROLS, R.string.button_zr, buttonZR)); + } + + private void addGraphicsSettings(ArrayList sl) { + mView.getActivity().setTitle(R.string.preferences_graphics); + + SettingSection rendererSection = mSettings.getSection(Settings.SECTION_RENDERER); + Setting resolutionFactor = rendererSection.getSetting(SettingsFile.KEY_RESOLUTION_FACTOR); + Setting filterMode = rendererSection.getSetting(SettingsFile.KEY_FILTER_MODE); + Setting shadersAccurateMul = rendererSection.getSetting(SettingsFile.KEY_SHADERS_ACCURATE_MUL); + Setting render3dMode = rendererSection.getSetting(SettingsFile.KEY_RENDER_3D); + Setting factor3d = rendererSection.getSetting(SettingsFile.KEY_FACTOR_3D); + Setting useDiskShaderCache = rendererSection.getSetting(SettingsFile.KEY_USE_DISK_SHADER_CACHE); + SettingSection layoutSection = mSettings.getSection(Settings.SECTION_LAYOUT); + Setting cardboardScreenSize = layoutSection.getSetting(SettingsFile.KEY_CARDBOARD_SCREEN_SIZE); + Setting cardboardXShift = layoutSection.getSetting(SettingsFile.KEY_CARDBOARD_X_SHIFT); + Setting cardboardYShift = layoutSection.getSetting(SettingsFile.KEY_CARDBOARD_Y_SHIFT); + SettingSection utilitySection = mSettings.getSection(Settings.SECTION_UTILITY); + Setting dumpTextures = utilitySection.getSetting(SettingsFile.KEY_DUMP_TEXTURES); + Setting customTextures = utilitySection.getSetting(SettingsFile.KEY_CUSTOM_TEXTURES); + //Setting preloadTextures = utilitySection.getSetting(SettingsFile.KEY_PRELOAD_TEXTURES); + + sl.add(new HeaderSetting(null, null, R.string.renderer, 0)); + sl.add(new SliderSetting(SettingsFile.KEY_RESOLUTION_FACTOR, Settings.SECTION_RENDERER, R.string.internal_resolution, R.string.internal_resolution_description, 1, 4, "x", 1, resolutionFactor)); + sl.add(new CheckBoxSetting(SettingsFile.KEY_FILTER_MODE, Settings.SECTION_RENDERER, R.string.linear_filtering, R.string.linear_filtering_description, true, filterMode)); + sl.add(new CheckBoxSetting(SettingsFile.KEY_SHADERS_ACCURATE_MUL, Settings.SECTION_RENDERER, R.string.shaders_accurate_mul, R.string.shaders_accurate_mul_description, false, shadersAccurateMul)); + sl.add(new CheckBoxSetting(SettingsFile.KEY_USE_DISK_SHADER_CACHE, Settings.SECTION_RENDERER, R.string.use_disk_shader_cache, R.string.use_disk_shader_cache_description, true, useDiskShaderCache)); + + sl.add(new HeaderSetting(null, null, R.string.stereoscopy, 0)); + sl.add(new SingleChoiceSetting(SettingsFile.KEY_RENDER_3D, Settings.SECTION_RENDERER, R.string.render3d, 0, R.array.render3dModes, R.array.render3dValues, 0, render3dMode)); + sl.add(new SliderSetting(SettingsFile.KEY_FACTOR_3D, Settings.SECTION_RENDERER, R.string.factor3d, R.string.factor3d_description, 0, 100, "%", 0, factor3d)); + + sl.add(new HeaderSetting(null, null, R.string.cardboard_vr, 0)); + sl.add(new SliderSetting(SettingsFile.KEY_CARDBOARD_SCREEN_SIZE, Settings.SECTION_LAYOUT, R.string.cardboard_screen_size, R.string.cardboard_screen_size_description, 30, 100, "%", 85, cardboardScreenSize)); + sl.add(new SliderSetting(SettingsFile.KEY_CARDBOARD_X_SHIFT, Settings.SECTION_LAYOUT, R.string.cardboard_x_shift, R.string.cardboard_x_shift_description, -100, 100, "%", 0, cardboardXShift)); + sl.add(new SliderSetting(SettingsFile.KEY_CARDBOARD_Y_SHIFT, Settings.SECTION_LAYOUT, R.string.cardboard_y_shift, R.string.cardboard_y_shift_description, -100, 100, "%", 0, cardboardYShift)); + + sl.add(new HeaderSetting(null, null, R.string.utility, 0)); + sl.add(new CheckBoxSetting(SettingsFile.KEY_DUMP_TEXTURES, Settings.SECTION_UTILITY, R.string.dump_textures, R.string.dump_textures_description, false, dumpTextures)); + sl.add(new CheckBoxSetting(SettingsFile.KEY_CUSTOM_TEXTURES, Settings.SECTION_UTILITY, R.string.custom_textures, R.string.custom_textures_description, false, customTextures)); + //Disabled until custom texture implementation gets rewrite, current one overloads RAM and crashes Citra. + //sl.add(new CheckBoxSetting(SettingsFile.KEY_PRELOAD_TEXTURES, Settings.SECTION_UTILITY, R.string.preload_textures, R.string.preload_textures_description, false, preloadTextures)); + } + + private void addAudioSettings(ArrayList sl) { + mView.getActivity().setTitle(R.string.preferences_audio); + + SettingSection audioSection = mSettings.getSection(Settings.SECTION_AUDIO); + Setting audioStretch = audioSection.getSetting(SettingsFile.KEY_ENABLE_AUDIO_STRETCHING); + Setting micInputType = audioSection.getSetting(SettingsFile.KEY_MIC_INPUT_TYPE); + + sl.add(new CheckBoxSetting(SettingsFile.KEY_ENABLE_AUDIO_STRETCHING, Settings.SECTION_AUDIO, R.string.audio_stretch, R.string.audio_stretch_description, true, audioStretch)); + sl.add(new SingleChoiceSetting(SettingsFile.KEY_MIC_INPUT_TYPE, Settings.SECTION_AUDIO, R.string.audio_input_type, 0, R.array.audioInputTypeNames, R.array.audioInputTypeValues, 1, micInputType)); + } + + private void addDebugSettings(ArrayList sl) { + mView.getActivity().setTitle(R.string.preferences_debug); + + SettingSection coreSection = mSettings.getSection(Settings.SECTION_CORE); + SettingSection rendererSection = mSettings.getSection(Settings.SECTION_RENDERER); + Setting useCpuJit = coreSection.getSetting(SettingsFile.KEY_CPU_JIT); + Setting hardwareRenderer = rendererSection.getSetting(SettingsFile.KEY_HW_RENDERER); + Setting hardwareShader = rendererSection.getSetting(SettingsFile.KEY_HW_SHADER); + Setting vsyncEnable = rendererSection.getSetting(SettingsFile.KEY_USE_VSYNC); + + sl.add(new HeaderSetting(null, null, R.string.debug_warning, 0)); + sl.add(new CheckBoxSetting(SettingsFile.KEY_CPU_JIT, Settings.SECTION_CORE, R.string.cpu_jit, R.string.cpu_jit_description, true, useCpuJit, true, mView)); + sl.add(new CheckBoxSetting(SettingsFile.KEY_HW_RENDERER, Settings.SECTION_RENDERER, R.string.hw_renderer, R.string.hw_renderer_description, true, hardwareRenderer, true, mView)); + sl.add(new CheckBoxSetting(SettingsFile.KEY_HW_SHADER, Settings.SECTION_RENDERER, R.string.hw_shaders, R.string.hw_shaders_description, true, hardwareShader, true, mView)); + sl.add(new CheckBoxSetting(SettingsFile.KEY_USE_VSYNC, Settings.SECTION_RENDERER, R.string.vsync, R.string.vsync_description, true, vsyncEnable)); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentView.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentView.java new file mode 100644 index 000000000..c36eb55a7 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentView.java @@ -0,0 +1,78 @@ +package org.citra.citra_emu.features.settings.ui; + +import androidx.fragment.app.FragmentActivity; + +import org.citra.citra_emu.features.settings.model.Setting; +import org.citra.citra_emu.features.settings.model.Settings; +import org.citra.citra_emu.features.settings.model.view.SettingsItem; + +import java.util.ArrayList; + +/** + * Abstraction for a screen showing a list of settings. Instances of + * this type of view will each display a layer of the setting hierarchy. + */ +public interface SettingsFragmentView { + /** + * Called by the containing Activity to notify the Fragment that an + * asynchronous load operation completed. + * + * @param settings The (possibly null) result of the ini load operation. + */ + void onSettingsFileLoaded(Settings settings); + + /** + * Pass a settings HashMap to the containing activity, so that it can + * share the HashMap with other SettingsFragments; useful so that rotations + * do not require an additional load operation. + * + * @param settings An ArrayList containing all the settings HashMaps. + */ + void passSettingsToActivity(Settings settings); + + /** + * Pass an ArrayList to the View so that it can be displayed on screen. + * + * @param settingsList The result of converting the HashMap to an ArrayList + */ + void showSettingsList(ArrayList settingsList); + + /** + * Called by the containing Activity when an asynchronous load operation fails. + * Instructs the Fragment to load the settings screen with defaults selected. + */ + void loadDefaultSettings(); + + /** + * @return The Fragment's containing activity. + */ + FragmentActivity getActivity(); + + /** + * Tell the Fragment to tell the containing Activity to show a new + * Fragment containing a submenu of settings. + * + * @param menuKey Identifier for the settings group that should be shown. + */ + void loadSubMenu(String menuKey); + + /** + * Tell the Fragment to tell the containing activity to display a toast message. + * + * @param message Text to be shown in the Toast + * @param is_long Whether this should be a long Toast or short one. + */ + void showToastMessage(String message, boolean is_long); + + /** + * Have the fragment add a setting to the HashMap. + * + * @param setting The (possibly previously missing) new setting. + */ + void putSetting(Setting setting); + + /** + * Have the fragment tell the containing Activity that a setting was modified. + */ + void onSettingChanged(); +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFrameLayout.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFrameLayout.java new file mode 100644 index 000000000..67bde5709 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFrameLayout.java @@ -0,0 +1,48 @@ +package org.citra.citra_emu.features.settings.ui; + +import android.content.Context; +import android.util.AttributeSet; +import android.widget.FrameLayout; + +/** + * FrameLayout subclass with few Properties added to simplify animations. + * Don't remove the methods appearing as unused, in order not to break the menu animations + */ +public final class SettingsFrameLayout extends FrameLayout { + private float mVisibleness = 1.0f; + + public SettingsFrameLayout(Context context) { + super(context); + } + + public SettingsFrameLayout(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public SettingsFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + public SettingsFrameLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + } + + public float getYFraction() { + return getY() / getHeight(); + } + + public void setYFraction(float yFraction) { + final int height = getHeight(); + setY((height > 0) ? (yFraction * height) : -9999); + } + + public float getVisibleness() { + return mVisibleness; + } + + public void setVisibleness(float visibleness) { + setScaleX(visibleness); + setScaleY(visibleness); + setAlpha(visibleness); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/CheckBoxSettingViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/CheckBoxSettingViewHolder.java new file mode 100644 index 000000000..d914f7d0b --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/CheckBoxSettingViewHolder.java @@ -0,0 +1,54 @@ +package org.citra.citra_emu.features.settings.ui.viewholder; + +import android.view.View; +import android.widget.CheckBox; +import android.widget.TextView; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.model.view.CheckBoxSetting; +import org.citra.citra_emu.features.settings.model.view.SettingsItem; +import org.citra.citra_emu.features.settings.ui.SettingsAdapter; + +public final class CheckBoxSettingViewHolder extends SettingViewHolder { + private CheckBoxSetting mItem; + + private TextView mTextSettingName; + private TextView mTextSettingDescription; + + private CheckBox mCheckbox; + + public CheckBoxSettingViewHolder(View itemView, SettingsAdapter adapter) { + super(itemView, adapter); + } + + @Override + protected void findViews(View root) { + mTextSettingName = root.findViewById(R.id.text_setting_name); + mTextSettingDescription = root.findViewById(R.id.text_setting_description); + mCheckbox = root.findViewById(R.id.checkbox); + } + + @Override + public void bind(SettingsItem item) { + mItem = (CheckBoxSetting) item; + + mTextSettingName.setText(item.getNameId()); + + if (item.getDescriptionId() > 0) { + mTextSettingDescription.setText(item.getDescriptionId()); + mTextSettingDescription.setVisibility(View.VISIBLE); + } else { + mTextSettingDescription.setText(""); + mTextSettingDescription.setVisibility(View.GONE); + } + + mCheckbox.setChecked(mItem.isChecked()); + } + + @Override + public void onClick(View clicked) { + mCheckbox.toggle(); + + getAdapter().onBooleanClick(mItem, getAdapterPosition(), mCheckbox.isChecked()); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/DateTimeViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/DateTimeViewHolder.java new file mode 100644 index 000000000..09ea93010 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/DateTimeViewHolder.java @@ -0,0 +1,47 @@ +package org.citra.citra_emu.features.settings.ui.viewholder; + +import android.view.View; +import android.widget.TextView; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.model.view.DateTimeSetting; +import org.citra.citra_emu.features.settings.model.view.SettingsItem; +import org.citra.citra_emu.features.settings.ui.SettingsAdapter; +import org.citra.citra_emu.utils.Log; + +public final class DateTimeViewHolder extends SettingViewHolder { + private DateTimeSetting mItem; + + private TextView mTextSettingName; + private TextView mTextSettingDescription; + + public DateTimeViewHolder(View itemView, SettingsAdapter adapter) { + super(itemView, adapter); + } + + @Override + protected void findViews(View root) { + mTextSettingName = root.findViewById(R.id.text_setting_name); + Log.error("test " + mTextSettingName); + mTextSettingDescription = root.findViewById(R.id.text_setting_description); + Log.error("test " + mTextSettingDescription); + } + + @Override + public void bind(SettingsItem item) { + mItem = (DateTimeSetting) item; + mTextSettingName.setText(item.getNameId()); + + if (item.getDescriptionId() > 0) { + mTextSettingDescription.setText(item.getDescriptionId()); + mTextSettingDescription.setVisibility(View.VISIBLE); + } else { + mTextSettingDescription.setVisibility(View.GONE); + } + } + + @Override + public void onClick(View clicked) { + getAdapter().onDateTimeClick(mItem, getAdapterPosition()); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/HeaderViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/HeaderViewHolder.java new file mode 100644 index 000000000..baf80ed76 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/HeaderViewHolder.java @@ -0,0 +1,32 @@ +package org.citra.citra_emu.features.settings.ui.viewholder; + +import android.view.View; +import android.widget.TextView; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.model.view.SettingsItem; +import org.citra.citra_emu.features.settings.ui.SettingsAdapter; + +public final class HeaderViewHolder extends SettingViewHolder { + private TextView mHeaderName; + + public HeaderViewHolder(View itemView, SettingsAdapter adapter) { + super(itemView, adapter); + itemView.setOnClickListener(null); + } + + @Override + protected void findViews(View root) { + mHeaderName = root.findViewById(R.id.text_header_name); + } + + @Override + public void bind(SettingsItem item) { + mHeaderName.setText(item.getNameId()); + } + + @Override + public void onClick(View clicked) { + // no-op + } +} \ No newline at end of file diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/InputBindingSettingViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/InputBindingSettingViewHolder.java new file mode 100644 index 000000000..7d95c250a --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/InputBindingSettingViewHolder.java @@ -0,0 +1,55 @@ +package org.citra.citra_emu.features.settings.ui.viewholder; + +import android.content.Context; +import android.content.SharedPreferences; +import android.preference.PreferenceManager; +import android.view.View; +import android.widget.TextView; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.model.view.InputBindingSetting; +import org.citra.citra_emu.features.settings.model.view.SettingsItem; +import org.citra.citra_emu.features.settings.ui.SettingsAdapter; + +public final class InputBindingSettingViewHolder extends SettingViewHolder { + private InputBindingSetting mItem; + + private TextView mTextSettingName; + private TextView mTextSettingDescription; + + private Context mContext; + + public InputBindingSettingViewHolder(View itemView, SettingsAdapter adapter, Context context) { + super(itemView, adapter); + + mContext = context; + } + + @Override + protected void findViews(View root) { + mTextSettingName = root.findViewById(R.id.text_setting_name); + mTextSettingDescription = root.findViewById(R.id.text_setting_description); + } + + @Override + public void bind(SettingsItem item) { + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mContext); + + mItem = (InputBindingSetting) item; + + mTextSettingName.setText(item.getNameId()); + + String key = sharedPreferences.getString(mItem.getKey(), ""); + if (key != null && !key.isEmpty()) { + mTextSettingDescription.setText(key); + mTextSettingDescription.setVisibility(View.VISIBLE); + } else { + mTextSettingDescription.setVisibility(View.GONE); + } + } + + @Override + public void onClick(View clicked) { + getAdapter().onInputBindingClick(mItem, getAdapterPosition()); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/PremiumViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/PremiumViewHolder.java new file mode 100644 index 000000000..be0853ff0 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/PremiumViewHolder.java @@ -0,0 +1,57 @@ +package org.citra.citra_emu.features.settings.ui.viewholder; + +import android.view.View; +import android.widget.TextView; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.model.view.SettingsItem; +import org.citra.citra_emu.features.settings.ui.SettingsAdapter; +import org.citra.citra_emu.features.settings.ui.SettingsFragmentView; +import org.citra.citra_emu.ui.main.MainActivity; + +public final class PremiumViewHolder extends SettingViewHolder { + private TextView mHeaderName; + private TextView mTextDescription; + private SettingsFragmentView mView; + + public PremiumViewHolder(View itemView, SettingsAdapter adapter, SettingsFragmentView view) { + super(itemView, adapter); + mView = view; + itemView.setOnClickListener(this); + } + + @Override + protected void findViews(View root) { + mHeaderName = root.findViewById(R.id.text_setting_name); + mTextDescription = root.findViewById(R.id.text_setting_description); + } + + @Override + public void bind(SettingsItem item) { + updateText(); + } + + @Override + public void onClick(View clicked) { + if (MainActivity.isPremiumActive()) { + return; + } + + // Invoke billing flow if Premium is not already active, then refresh the UI to indicate + // the purchase has completed. + MainActivity.invokePremiumBilling(() -> updateText()); + } + + /** + * Update the text shown to the user, based on whether Premium is active + */ + private void updateText() { + if (MainActivity.isPremiumActive()) { + mHeaderName.setText(R.string.premium_settings_welcome); + mTextDescription.setText(R.string.premium_settings_welcome_description); + } else { + mHeaderName.setText(R.string.premium_settings_upsell); + mTextDescription.setText(R.string.premium_settings_upsell_description); + } + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SettingViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SettingViewHolder.java new file mode 100644 index 000000000..2643ea121 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SettingViewHolder.java @@ -0,0 +1,49 @@ +package org.citra.citra_emu.features.settings.ui.viewholder; + +import android.view.View; + +import androidx.recyclerview.widget.RecyclerView; + +import org.citra.citra_emu.features.settings.model.view.SettingsItem; +import org.citra.citra_emu.features.settings.ui.SettingsAdapter; + +public abstract class SettingViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener { + private SettingsAdapter mAdapter; + + public SettingViewHolder(View itemView, SettingsAdapter adapter) { + super(itemView); + + mAdapter = adapter; + + itemView.setOnClickListener(this); + + findViews(itemView); + } + + protected SettingsAdapter getAdapter() { + return mAdapter; + } + + /** + * Gets handles to all this ViewHolder's child views using their XML-defined identifiers. + * + * @param root The newly inflated top-level view. + */ + protected abstract void findViews(View root); + + /** + * Called by the adapter to set this ViewHolder's child views to display the list item + * it must now represent. + * + * @param item The list item that should be represented by this ViewHolder. + */ + public abstract void bind(SettingsItem item); + + /** + * Called when this ViewHolder's view is clicked on. Implementations should usually pass + * this event up to the adapter. + * + * @param clicked The view that was clicked on. + */ + public abstract void onClick(View clicked); +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.java new file mode 100644 index 000000000..a175af9f8 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.java @@ -0,0 +1,76 @@ +package org.citra.citra_emu.features.settings.ui.viewholder; + +import android.content.res.Resources; +import android.view.View; +import android.widget.TextView; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.model.view.PremiumSingleChoiceSetting; +import org.citra.citra_emu.features.settings.model.view.SettingsItem; +import org.citra.citra_emu.features.settings.model.view.SingleChoiceSetting; +import org.citra.citra_emu.features.settings.model.view.StringSingleChoiceSetting; +import org.citra.citra_emu.features.settings.ui.SettingsAdapter; + +public final class SingleChoiceViewHolder extends SettingViewHolder { + private SettingsItem mItem; + + private TextView mTextSettingName; + private TextView mTextSettingDescription; + + public SingleChoiceViewHolder(View itemView, SettingsAdapter adapter) { + super(itemView, adapter); + } + + @Override + protected void findViews(View root) { + mTextSettingName = root.findViewById(R.id.text_setting_name); + mTextSettingDescription = root.findViewById(R.id.text_setting_description); + } + + @Override + public void bind(SettingsItem item) { + mItem = item; + + mTextSettingName.setText(item.getNameId()); + mTextSettingDescription.setVisibility(View.VISIBLE); + if (item.getDescriptionId() > 0) { + mTextSettingDescription.setText(item.getDescriptionId()); + } else if (item instanceof SingleChoiceSetting) { + SingleChoiceSetting setting = (SingleChoiceSetting) item; + int selected = setting.getSelectedValue(); + Resources resMgr = mTextSettingDescription.getContext().getResources(); + String[] choices = resMgr.getStringArray(setting.getChoicesId()); + int[] values = resMgr.getIntArray(setting.getValuesId()); + for (int i = 0; i < values.length; ++i) { + if (values[i] == selected) { + mTextSettingDescription.setText(choices[i]); + } + } + } else if (item instanceof PremiumSingleChoiceSetting) { + PremiumSingleChoiceSetting setting = (PremiumSingleChoiceSetting) item; + int selected = setting.getSelectedValue(); + Resources resMgr = mTextSettingDescription.getContext().getResources(); + String[] choices = resMgr.getStringArray(setting.getChoicesId()); + int[] values = resMgr.getIntArray(setting.getValuesId()); + for (int i = 0; i < values.length; ++i) { + if (values[i] == selected) { + mTextSettingDescription.setText(choices[i]); + } + } + } else { + mTextSettingDescription.setVisibility(View.GONE); + } + } + + @Override + public void onClick(View clicked) { + int position = getAdapterPosition(); + if (mItem instanceof SingleChoiceSetting) { + getAdapter().onSingleChoiceClick((SingleChoiceSetting) mItem, position); + } else if (mItem instanceof PremiumSingleChoiceSetting) { + getAdapter().onSingleChoiceClick((PremiumSingleChoiceSetting) mItem, position); + } else if (mItem instanceof StringSingleChoiceSetting) { + getAdapter().onStringSingleChoiceClick((StringSingleChoiceSetting) mItem, position); + } + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SliderViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SliderViewHolder.java new file mode 100644 index 000000000..3dd048a29 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SliderViewHolder.java @@ -0,0 +1,45 @@ +package org.citra.citra_emu.features.settings.ui.viewholder; + +import android.view.View; +import android.widget.TextView; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.model.view.SettingsItem; +import org.citra.citra_emu.features.settings.model.view.SliderSetting; +import org.citra.citra_emu.features.settings.ui.SettingsAdapter; + +public final class SliderViewHolder extends SettingViewHolder { + private SliderSetting mItem; + + private TextView mTextSettingName; + private TextView mTextSettingDescription; + + public SliderViewHolder(View itemView, SettingsAdapter adapter) { + super(itemView, adapter); + } + + @Override + protected void findViews(View root) { + mTextSettingName = root.findViewById(R.id.text_setting_name); + mTextSettingDescription = root.findViewById(R.id.text_setting_description); + } + + @Override + public void bind(SettingsItem item) { + mItem = (SliderSetting) item; + + mTextSettingName.setText(item.getNameId()); + + if (item.getDescriptionId() > 0) { + mTextSettingDescription.setText(item.getDescriptionId()); + mTextSettingDescription.setVisibility(View.VISIBLE); + } else { + mTextSettingDescription.setVisibility(View.GONE); + } + } + + @Override + public void onClick(View clicked) { + getAdapter().onSliderClick(mItem, getAdapterPosition()); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SubmenuViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SubmenuViewHolder.java new file mode 100644 index 000000000..cb8c3e92a --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SubmenuViewHolder.java @@ -0,0 +1,45 @@ +package org.citra.citra_emu.features.settings.ui.viewholder; + +import android.view.View; +import android.widget.TextView; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.model.view.SettingsItem; +import org.citra.citra_emu.features.settings.model.view.SubmenuSetting; +import org.citra.citra_emu.features.settings.ui.SettingsAdapter; + +public final class SubmenuViewHolder extends SettingViewHolder { + private SubmenuSetting mItem; + + private TextView mTextSettingName; + private TextView mTextSettingDescription; + + public SubmenuViewHolder(View itemView, SettingsAdapter adapter) { + super(itemView, adapter); + } + + @Override + protected void findViews(View root) { + mTextSettingName = root.findViewById(R.id.text_setting_name); + mTextSettingDescription = root.findViewById(R.id.text_setting_description); + } + + @Override + public void bind(SettingsItem item) { + mItem = (SubmenuSetting) item; + + mTextSettingName.setText(item.getNameId()); + + if (item.getDescriptionId() > 0) { + mTextSettingDescription.setText(item.getDescriptionId()); + mTextSettingDescription.setVisibility(View.VISIBLE); + } else { + mTextSettingDescription.setVisibility(View.GONE); + } + } + + @Override + public void onClick(View clicked) { + getAdapter().onSubmenuClick(mItem); + } +} \ No newline at end of file diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java new file mode 100644 index 000000000..8ae6b70d7 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java @@ -0,0 +1,341 @@ +package org.citra.citra_emu.features.settings.utils; + +import androidx.annotation.NonNull; + +import org.citra.citra_emu.CitraApplication; +import org.citra.citra_emu.NativeLibrary; +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.model.FloatSetting; +import org.citra.citra_emu.features.settings.model.IntSetting; +import org.citra.citra_emu.features.settings.model.Setting; +import org.citra.citra_emu.features.settings.model.SettingSection; +import org.citra.citra_emu.features.settings.model.Settings; +import org.citra.citra_emu.features.settings.model.StringSetting; +import org.citra.citra_emu.features.settings.ui.SettingsActivityView; +import org.citra.citra_emu.utils.BiMap; +import org.citra.citra_emu.utils.DirectoryInitialization; +import org.citra.citra_emu.utils.Log; +import org.ini4j.Wini; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.util.HashMap; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; + +/** + * Contains static methods for interacting with .ini files in which settings are stored. + */ +public final class SettingsFile { + public static final String FILE_NAME_CONFIG = "config"; + + public static final String KEY_CPU_JIT = "use_cpu_jit"; + + public static final String KEY_DESIGN = "design"; + + public static final String KEY_PREMIUM = "premium"; + + public static final String KEY_HW_RENDERER = "use_hw_renderer"; + public static final String KEY_HW_SHADER = "use_hw_shader"; + public static final String KEY_SHADERS_ACCURATE_MUL = "shaders_accurate_mul"; + public static final String KEY_USE_SHADER_JIT = "use_shader_jit"; + public static final String KEY_USE_DISK_SHADER_CACHE = "use_disk_shader_cache"; + public static final String KEY_USE_VSYNC = "use_vsync_new"; + public static final String KEY_RESOLUTION_FACTOR = "resolution_factor"; + public static final String KEY_FRAME_LIMIT_ENABLED = "use_frame_limit"; + public static final String KEY_FRAME_LIMIT = "frame_limit"; + public static final String KEY_BACKGROUND_RED = "bg_red"; + public static final String KEY_BACKGROUND_BLUE = "bg_blue"; + public static final String KEY_BACKGROUND_GREEN = "bg_green"; + public static final String KEY_RENDER_3D = "render_3d"; + public static final String KEY_FACTOR_3D = "factor_3d"; + public static final String KEY_PP_SHADER_NAME = "pp_shader_name"; + public static final String KEY_FILTER_MODE = "filter_mode"; + public static final String KEY_TEXTURE_FILTER_NAME = "texture_filter_name"; + public static final String KEY_USE_ASYNCHRONOUS_GPU_EMULATION = "use_asynchronous_gpu_emulation"; + + public static final String KEY_LAYOUT_OPTION = "layout_option"; + public static final String KEY_SWAP_SCREEN = "swap_screen"; + public static final String KEY_CARDBOARD_SCREEN_SIZE = "cardboard_screen_size"; + public static final String KEY_CARDBOARD_X_SHIFT = "cardboard_x_shift"; + public static final String KEY_CARDBOARD_Y_SHIFT = "cardboard_y_shift"; + + public static final String KEY_DUMP_TEXTURES = "dump_textures"; + public static final String KEY_CUSTOM_TEXTURES = "custom_textures"; + public static final String KEY_PRELOAD_TEXTURES = "preload_textures"; + + public static final String KEY_AUDIO_OUTPUT_ENGINE = "output_engine"; + public static final String KEY_ENABLE_AUDIO_STRETCHING = "enable_audio_stretching"; + public static final String KEY_VOLUME = "volume"; + public static final String KEY_MIC_INPUT_TYPE = "mic_input_type"; + + public static final String KEY_USE_VIRTUAL_SD = "use_virtual_sd"; + + public static final String KEY_IS_NEW_3DS = "is_new_3ds"; + public static final String KEY_REGION_VALUE = "region_value"; + public static final String KEY_LANGUAGE = "language"; + + public static final String KEY_INIT_CLOCK = "init_clock"; + public static final String KEY_INIT_TIME = "init_time"; + + public static final String KEY_BUTTON_A = "button_a"; + public static final String KEY_BUTTON_B = "button_b"; + public static final String KEY_BUTTON_X = "button_x"; + public static final String KEY_BUTTON_Y = "button_y"; + public static final String KEY_BUTTON_SELECT = "button_select"; + public static final String KEY_BUTTON_START = "button_start"; + public static final String KEY_BUTTON_UP = "button_up"; + public static final String KEY_BUTTON_DOWN = "button_down"; + public static final String KEY_BUTTON_LEFT = "button_left"; + public static final String KEY_BUTTON_RIGHT = "button_right"; + public static final String KEY_BUTTON_L = "button_l"; + public static final String KEY_BUTTON_R = "button_r"; + public static final String KEY_BUTTON_ZL = "button_zl"; + public static final String KEY_BUTTON_ZR = "button_zr"; + public static final String KEY_CIRCLEPAD_AXIS_VERTICAL = "circlepad_axis_vertical"; + public static final String KEY_CIRCLEPAD_AXIS_HORIZONTAL = "circlepad_axis_horizontal"; + public static final String KEY_CSTICK_AXIS_VERTICAL = "cstick_axis_vertical"; + public static final String KEY_CSTICK_AXIS_HORIZONTAL = "cstick_axis_horizontal"; + public static final String KEY_DPAD_AXIS_VERTICAL = "dpad_axis_vertical"; + public static final String KEY_DPAD_AXIS_HORIZONTAL = "dpad_axis_horizontal"; + public static final String KEY_CIRCLEPAD_UP = "circlepad_up"; + public static final String KEY_CIRCLEPAD_DOWN = "circlepad_down"; + public static final String KEY_CIRCLEPAD_LEFT = "circlepad_left"; + public static final String KEY_CIRCLEPAD_RIGHT = "circlepad_right"; + public static final String KEY_CSTICK_UP = "cstick_up"; + public static final String KEY_CSTICK_DOWN = "cstick_down"; + public static final String KEY_CSTICK_LEFT = "cstick_left"; + public static final String KEY_CSTICK_RIGHT = "cstick_right"; + + public static final String KEY_CAMERA_OUTER_RIGHT_NAME = "camera_outer_right_name"; + public static final String KEY_CAMERA_OUTER_RIGHT_CONFIG = "camera_outer_right_config"; + public static final String KEY_CAMERA_OUTER_RIGHT_FLIP = "camera_outer_right_flip"; + public static final String KEY_CAMERA_OUTER_LEFT_NAME = "camera_outer_left_name"; + public static final String KEY_CAMERA_OUTER_LEFT_CONFIG = "camera_outer_left_config"; + public static final String KEY_CAMERA_OUTER_LEFT_FLIP = "camera_outer_left_flip"; + public static final String KEY_CAMERA_INNER_NAME = "camera_inner_name"; + public static final String KEY_CAMERA_INNER_CONFIG = "camera_inner_config"; + public static final String KEY_CAMERA_INNER_FLIP = "camera_inner_flip"; + + public static final String KEY_LOG_FILTER = "log_filter"; + + private static BiMap sectionsMap = new BiMap<>(); + + static { + //TODO: Add members to sectionsMap when game-specific settings are added + } + + + private SettingsFile() { + } + + /** + * Reads a given .ini file from disk and returns it as a HashMap of Settings, themselves + * effectively a HashMap of key/value settings. If unsuccessful, outputs an error telling why it + * failed. + * + * @param ini The ini file to load the settings from + * @param isCustomGame + * @param view The current view. + * @return An Observable that emits a HashMap of the file's contents, then completes. + */ + static HashMap readFile(final File ini, boolean isCustomGame, SettingsActivityView view) { + HashMap sections = new Settings.SettingsSectionMap(); + + BufferedReader reader = null; + + try { + reader = new BufferedReader(new FileReader(ini)); + + SettingSection current = null; + for (String line; (line = reader.readLine()) != null; ) { + if (line.startsWith("[") && line.endsWith("]")) { + current = sectionFromLine(line, isCustomGame); + sections.put(current.getName(), current); + } else if ((current != null)) { + Setting setting = settingFromLine(current, line); + if (setting != null) { + current.putSetting(setting); + } + } + } + } catch (FileNotFoundException e) { + Log.error("[SettingsFile] File not found: " + ini.getAbsolutePath() + e.getMessage()); + if (view != null) + view.onSettingsFileNotFound(); + } catch (IOException e) { + Log.error("[SettingsFile] Error reading from: " + ini.getAbsolutePath() + e.getMessage()); + if (view != null) + view.onSettingsFileNotFound(); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + Log.error("[SettingsFile] Error closing: " + ini.getAbsolutePath() + e.getMessage()); + } + } + } + + return sections; + } + + public static HashMap readFile(final String fileName, SettingsActivityView view) { + return readFile(getSettingsFile(fileName), false, view); + } + + /** + * Reads a given .ini file from disk and returns it as a HashMap of SettingSections, themselves + * effectively a HashMap of key/value settings. If unsuccessful, outputs an error telling why it + * failed. + * + * @param gameId the id of the game to load it's settings. + * @param view The current view. + */ + public static HashMap readCustomGameSettings(final String gameId, SettingsActivityView view) { + return readFile(getCustomGameSettingsFile(gameId), true, view); + } + + /** + * Saves a Settings HashMap to a given .ini file on disk. If unsuccessful, outputs an error + * telling why it failed. + * + * @param fileName The target filename without a path or extension. + * @param sections The HashMap containing the Settings we want to serialize. + * @param view The current view. + */ + public static void saveFile(final String fileName, TreeMap sections, + SettingsActivityView view) { + File ini = getSettingsFile(fileName); + + try { + Wini writer = new Wini(ini); + + Set keySet = sections.keySet(); + for (String key : keySet) { + SettingSection section = sections.get(key); + writeSection(writer, section); + } + writer.store(); + } catch (IOException e) { + Log.error("[SettingsFile] File not found: " + fileName + ".ini: " + e.getMessage()); + view.showToastMessage(CitraApplication.getAppContext().getString(R.string.error_saving, fileName, e.getMessage()), false); + } + } + + + public static void saveCustomGameSettings(final String gameId, final HashMap sections) { + Set sortedSections = new TreeSet<>(sections.keySet()); + + for (String sectionKey : sortedSections) { + SettingSection section = sections.get(sectionKey); + + HashMap settings = section.getSettings(); + Set sortedKeySet = new TreeSet<>(settings.keySet()); + + for (String settingKey : sortedKeySet) { + Setting setting = settings.get(settingKey); + NativeLibrary.SetUserSetting(gameId, mapSectionNameFromIni(section.getName()), setting.getKey(), setting.getValueAsString()); + } + } + } + + private static String mapSectionNameFromIni(String generalSectionName) { + if (sectionsMap.getForward(generalSectionName) != null) { + return sectionsMap.getForward(generalSectionName); + } + + return generalSectionName; + } + + private static String mapSectionNameToIni(String generalSectionName) { + if (sectionsMap.getBackward(generalSectionName) != null) { + return sectionsMap.getBackward(generalSectionName); + } + + return generalSectionName; + } + + @NonNull + private static File getSettingsFile(String fileName) { + return new File( + DirectoryInitialization.getUserDirectory() + "/config/" + fileName + ".ini"); + } + + private static File getCustomGameSettingsFile(String gameId) { + return new File(DirectoryInitialization.getUserDirectory() + "/GameSettings/" + gameId + ".ini"); + } + + private static SettingSection sectionFromLine(String line, boolean isCustomGame) { + String sectionName = line.substring(1, line.length() - 1); + if (isCustomGame) { + sectionName = mapSectionNameToIni(sectionName); + } + return new SettingSection(sectionName); + } + + /** + * For a line of text, determines what type of data is being represented, and returns + * a Setting object containing this data. + * + * @param current The section currently being parsed by the consuming method. + * @param line The line of text being parsed. + * @return A typed Setting containing the key/value contained in the line. + */ + private static Setting settingFromLine(SettingSection current, String line) { + String[] splitLine = line.split("="); + + if (splitLine.length != 2) { + Log.warning("Skipping invalid config line \"" + line + "\""); + return null; + } + + String key = splitLine[0].trim(); + String value = splitLine[1].trim(); + + if (value.isEmpty()) { + Log.warning("Skipping null value in config line \"" + line + "\""); + return null; + } + + try { + int valueAsInt = Integer.parseInt(value); + + return new IntSetting(key, current.getName(), valueAsInt); + } catch (NumberFormatException ex) { + } + + try { + float valueAsFloat = Float.parseFloat(value); + + return new FloatSetting(key, current.getName(), valueAsFloat); + } catch (NumberFormatException ex) { + } + + return new StringSetting(key, current.getName(), value); + } + + /** + * Writes the contents of a Section HashMap to disk. + * + * @param parser A Wini pointed at a file on disk. + * @param section A section containing settings to be written to the file. + */ + private static void writeSection(Wini parser, SettingSection section) { + // Write the section header. + String header = section.getName(); + + // Write this section's values. + HashMap settings = section.getSettings(); + Set keySet = settings.keySet(); + + for (String key : keySet) { + Setting setting = settings.get(key); + parser.put(header, setting.getKey(), setting.getValueAsString()); + } + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/CustomFilePickerFragment.java b/src/android/app/src/main/java/org/citra/citra_emu/fragments/CustomFilePickerFragment.java new file mode 100644 index 000000000..c18ecd4c3 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/CustomFilePickerFragment.java @@ -0,0 +1,120 @@ +package org.citra.citra_emu.fragments; + +import android.net.Uri; +import android.os.Bundle; +import android.os.Environment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.FileProvider; + +import com.nononsenseapps.filepicker.FilePickerFragment; + +import org.citra.citra_emu.R; + +import java.io.File; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +public class CustomFilePickerFragment extends FilePickerFragment { + private static String ALL_FILES = "*"; + private int mTitle; + private static List extensions = Collections.singletonList(ALL_FILES); + + @NonNull + @Override + public Uri toUri(@NonNull final File file) { + return FileProvider + .getUriForFile(getContext(), + getContext().getApplicationContext().getPackageName() + ".filesprovider", + file); + } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + + if (mode == MODE_DIR) { + TextView ok = getActivity().findViewById(R.id.nnf_button_ok); + ok.setText(R.string.select_dir); + + TextView cancel = getActivity().findViewById(R.id.nnf_button_cancel); + cancel.setVisibility(View.GONE); + } + } + + @Override + protected View inflateRootView(LayoutInflater inflater, ViewGroup container) { + View view = super.inflateRootView(inflater, container); + if (mTitle != 0) { + Toolbar toolbar = view.findViewById(com.nononsenseapps.filepicker.R.id.nnf_picker_toolbar); + ViewGroup parent = (ViewGroup) toolbar.getParent(); + int index = parent.indexOfChild(toolbar); + View newToolbar = inflater.inflate(R.layout.filepicker_toolbar, toolbar, false); + TextView title = newToolbar.findViewById(R.id.filepicker_title); + title.setText(mTitle); + parent.removeView(toolbar); + parent.addView(newToolbar, index); + } + return view; + } + + public void setTitle(int title) { + mTitle = title; + } + + public void setAllowedExtensions(String allowedExtensions) { + if (allowedExtensions == null) + return; + + extensions = Arrays.asList(allowedExtensions.split(",")); + } + + @Override + protected boolean isItemVisible(@NonNull final File file) { + // Some users jump to the conclusion that Dolphin isn't able to detect their + // files if the files don't show up in the file picker when mode == MODE_DIR. + // To avoid this, show files even when the user needs to select a directory. + return (showHiddenItems || !file.isHidden()) && + (file.isDirectory() || extensions.contains(ALL_FILES) || + extensions.contains(fileExtension(file.getName()).toLowerCase())); + } + + @Override + public boolean isCheckable(@NonNull final File file) { + // We need to make a small correction to the isCheckable logic due to + // overriding isItemVisible to show files when mode == MODE_DIR. + // AbstractFilePickerFragment always treats files as checkable when + // allowExistingFile == true, but we don't want files to be checkable when mode == MODE_DIR. + return super.isCheckable(file) && !(mode == MODE_DIR && file.isFile()); + } + + @Override + public void goUp() { + if (Environment.getExternalStorageDirectory().getPath().equals(mCurrentPath.getPath())) { + goToDir(new File("/storage/")); + return; + } + if (mCurrentPath.equals(new File("/storage/"))){ + return; + } + super.goUp(); + } + + @Override + public void onClickDir(@NonNull View view, @NonNull DirViewHolder viewHolder) { + if(viewHolder.file.equals(new File("/storage/emulated/"))) + viewHolder.file = new File("/storage/emulated/0/"); + super.onClickDir(view, viewHolder); + } + + private static String fileExtension(@NonNull String filename) { + int i = filename.lastIndexOf('.'); + return i < 0 ? "" : filename.substring(i + 1); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.java b/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.java new file mode 100644 index 000000000..cdb40d6f8 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.java @@ -0,0 +1,380 @@ +package org.citra.citra_emu.fragments; + +import android.content.Context; +import android.content.IntentFilter; +import android.content.SharedPreferences; +import android.graphics.Color; +import android.os.Bundle; +import android.os.Handler; +import android.preference.PreferenceManager; +import android.view.Choreographer; +import android.view.LayoutInflater; +import android.view.Surface; +import android.view.SurfaceHolder; +import android.view.SurfaceView; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.TextView; +import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + +import org.citra.citra_emu.NativeLibrary; +import org.citra.citra_emu.R; +import org.citra.citra_emu.activities.EmulationActivity; +import org.citra.citra_emu.overlay.InputOverlay; +import org.citra.citra_emu.utils.DirectoryInitialization; +import org.citra.citra_emu.utils.DirectoryInitialization.DirectoryInitializationState; +import org.citra.citra_emu.utils.DirectoryStateReceiver; +import org.citra.citra_emu.utils.EmulationMenuSettings; +import org.citra.citra_emu.utils.Log; + +public final class EmulationFragment extends Fragment implements SurfaceHolder.Callback, Choreographer.FrameCallback { + private static final String KEY_GAMEPATH = "gamepath"; + + private static final Handler perfStatsUpdateHandler = new Handler(); + + private SharedPreferences mPreferences; + + private InputOverlay mInputOverlay; + + private EmulationState mEmulationState; + + private DirectoryStateReceiver directoryStateReceiver; + + private EmulationActivity activity; + + private TextView mPerfStats; + + private Runnable perfStatsUpdater; + + public static EmulationFragment newInstance(String gamePath) { + Bundle args = new Bundle(); + args.putString(KEY_GAMEPATH, gamePath); + + EmulationFragment fragment = new EmulationFragment(); + fragment.setArguments(args); + return fragment; + } + + @Override + public void onAttach(@NonNull Context context) { + super.onAttach(context); + + if (context instanceof EmulationActivity) { + activity = (EmulationActivity) context; + NativeLibrary.setEmulationActivity((EmulationActivity) context); + } else { + throw new IllegalStateException("EmulationFragment must have EmulationActivity parent"); + } + } + + /** + * Initialize anything that doesn't depend on the layout / views in here. + */ + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + // So this fragment doesn't restart on configuration changes; i.e. rotation. + setRetainInstance(true); + + mPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity()); + + String gamePath = getArguments().getString(KEY_GAMEPATH); + mEmulationState = new EmulationState(gamePath); + } + + /** + * Initialize the UI and start emulation in here. + */ + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View contents = inflater.inflate(R.layout.fragment_emulation, container, false); + + SurfaceView surfaceView = contents.findViewById(R.id.surface_emulation); + surfaceView.getHolder().addCallback(this); + + mInputOverlay = contents.findViewById(R.id.surface_input_overlay); + mPerfStats = contents.findViewById(R.id.show_fps_text); + mPerfStats.setTextColor(Color.YELLOW); + + Button doneButton = contents.findViewById(R.id.done_control_config); + if (doneButton != null) { + doneButton.setOnClickListener(v -> stopConfiguringControls()); + } + + // Show/hide the "Show FPS" overlay + updateShowFpsOverlay(); + + // The new Surface created here will get passed to the native code via onSurfaceChanged. + return contents; + } + + @Override + public void onResume() { + super.onResume(); + Choreographer.getInstance().postFrameCallback(this); + if (DirectoryInitialization.areCitraDirectoriesReady()) { + mEmulationState.run(activity.isActivityRecreated()); + } else { + setupCitraDirectoriesThenStartEmulation(); + } + } + + @Override + public void onPause() { + if (directoryStateReceiver != null) { + LocalBroadcastManager.getInstance(getActivity()).unregisterReceiver(directoryStateReceiver); + directoryStateReceiver = null; + } + + if (mEmulationState.isRunning()) { + mEmulationState.pause(); + } + + Choreographer.getInstance().removeFrameCallback(this); + super.onPause(); + } + + @Override + public void onDetach() { + NativeLibrary.clearEmulationActivity(); + super.onDetach(); + } + + private void setupCitraDirectoriesThenStartEmulation() { + IntentFilter statusIntentFilter = new IntentFilter( + DirectoryInitialization.BROADCAST_ACTION); + + directoryStateReceiver = + new DirectoryStateReceiver(directoryInitializationState -> + { + if (directoryInitializationState == + DirectoryInitializationState.CITRA_DIRECTORIES_INITIALIZED) { + mEmulationState.run(activity.isActivityRecreated()); + } else if (directoryInitializationState == + DirectoryInitializationState.EXTERNAL_STORAGE_PERMISSION_NEEDED) { + Toast.makeText(getContext(), R.string.write_permission_needed, Toast.LENGTH_SHORT) + .show(); + } else if (directoryInitializationState == + DirectoryInitializationState.CANT_FIND_EXTERNAL_STORAGE) { + Toast.makeText(getContext(), R.string.external_storage_not_mounted, + Toast.LENGTH_SHORT) + .show(); + } + }); + + // Registers the DirectoryStateReceiver and its intent filters + LocalBroadcastManager.getInstance(getActivity()).registerReceiver( + directoryStateReceiver, + statusIntentFilter); + DirectoryInitialization.start(getActivity()); + } + + public void refreshInputOverlay() { + mInputOverlay.refreshControls(); + } + + public void resetInputOverlay() { + // Reset button scale + SharedPreferences.Editor editor = mPreferences.edit(); + editor.putInt("controlScale", 50); + editor.apply(); + + mInputOverlay.resetButtonPlacement(); + } + + public void updateShowFpsOverlay() { + if (true) { + final int SYSTEM_FPS = 0; + final int FPS = 1; + final int FRAMETIME = 2; + final int SPEED = 3; + + perfStatsUpdater = () -> + { + final double[] perfStats = NativeLibrary.GetPerfStats(); + if (perfStats[FPS] > 0) { + mPerfStats.setText(String.format("FPS: %d Speed: %d%%", (int) (perfStats[FPS]), + (int) (perfStats[SPEED] * 100.0))); + } + + perfStatsUpdateHandler.postDelayed(perfStatsUpdater, 3000); + }; + perfStatsUpdateHandler.post(perfStatsUpdater); + + mPerfStats.setVisibility(View.VISIBLE); + } else { + if (perfStatsUpdater != null) { + perfStatsUpdateHandler.removeCallbacks(perfStatsUpdater); + } + + mPerfStats.setVisibility(View.GONE); + } + } + + @Override + public void surfaceCreated(SurfaceHolder holder) { + // We purposely don't do anything here. + // All work is done in surfaceChanged, which we are guaranteed to get even for surface creation. + } + + @Override + public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { + Log.debug("[EmulationFragment] Surface changed. Resolution: " + width + "x" + height); + mEmulationState.newSurface(holder.getSurface()); + } + + @Override + public void surfaceDestroyed(SurfaceHolder holder) { + mEmulationState.clearSurface(); + } + + @Override + public void doFrame(long frameTimeNanos) { + Choreographer.getInstance().postFrameCallback(this); + NativeLibrary.DoFrame(); + } + + public void stopEmulation() { + mEmulationState.stop(); + } + + public void startConfiguringControls() { + getView().findViewById(R.id.done_control_config).setVisibility(View.VISIBLE); + mInputOverlay.setIsInEditMode(true); + } + + public void stopConfiguringControls() { + getView().findViewById(R.id.done_control_config).setVisibility(View.GONE); + mInputOverlay.setIsInEditMode(false); + } + + public boolean isConfiguringControls() { + return mInputOverlay.isInEditMode(); + } + + private static class EmulationState { + private final String mGamePath; + private State state; + private Surface mSurface; + private boolean mRunWhenSurfaceIsValid; + + EmulationState(String gamePath) { + mGamePath = gamePath; + // Starting state is stopped. + state = State.STOPPED; + } + + public synchronized boolean isStopped() { + return state == State.STOPPED; + } + + // Getters for the current state + + public synchronized boolean isPaused() { + return state == State.PAUSED; + } + + public synchronized boolean isRunning() { + return state == State.RUNNING; + } + + public synchronized void stop() { + if (state != State.STOPPED) { + Log.debug("[EmulationFragment] Stopping emulation."); + state = State.STOPPED; + NativeLibrary.StopEmulation(); + } else { + Log.warning("[EmulationFragment] Stop called while already stopped."); + } + } + + // State changing methods + + public synchronized void pause() { + if (state != State.PAUSED) { + state = State.PAUSED; + Log.debug("[EmulationFragment] Pausing emulation."); + + // Release the surface before pausing, since emulation has to be running for that. + NativeLibrary.SurfaceDestroyed(); + NativeLibrary.PauseEmulation(); + } else { + Log.warning("[EmulationFragment] Pause called while already paused."); + } + } + + public synchronized void run(boolean isActivityRecreated) { + if (isActivityRecreated) { + if (NativeLibrary.IsRunning()) { + state = State.PAUSED; + } + } else { + Log.debug("[EmulationFragment] activity resumed or fresh start"); + } + + // If the surface is set, run now. Otherwise, wait for it to get set. + if (mSurface != null) { + runWithValidSurface(); + } else { + mRunWhenSurfaceIsValid = true; + } + } + + // Surface callbacks + public synchronized void newSurface(Surface surface) { + mSurface = surface; + if (mRunWhenSurfaceIsValid) { + runWithValidSurface(); + } + } + + public synchronized void clearSurface() { + if (mSurface == null) { + Log.warning("[EmulationFragment] clearSurface called, but surface already null."); + } else { + mSurface = null; + Log.debug("[EmulationFragment] Surface destroyed."); + + if (state == State.RUNNING) { + NativeLibrary.SurfaceDestroyed(); + state = State.PAUSED; + } else if (state == State.PAUSED) { + Log.warning("[EmulationFragment] Surface cleared while emulation paused."); + } else { + Log.warning("[EmulationFragment] Surface cleared while emulation stopped."); + } + } + } + + private void runWithValidSurface() { + mRunWhenSurfaceIsValid = false; + if (state == State.STOPPED) { + NativeLibrary.SurfaceChanged(mSurface); + Thread mEmulationThread = new Thread(() -> + { + Log.debug("[EmulationFragment] Starting emulation thread."); + NativeLibrary.Run(mGamePath); + }, "NativeEmulation"); + mEmulationThread.start(); + + } else if (state == State.PAUSED) { + Log.debug("[EmulationFragment] Resuming emulation."); + NativeLibrary.SurfaceChanged(mSurface); + NativeLibrary.UnPauseEmulation(); + } else { + Log.debug("[EmulationFragment] Bug, run called while already running."); + } + state = State.RUNNING; + } + + private enum State { + STOPPED, RUNNING, PAUSED + } + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/model/Game.java b/src/android/app/src/main/java/org/citra/citra_emu/model/Game.java new file mode 100644 index 000000000..a4ffc59c7 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/model/Game.java @@ -0,0 +1,76 @@ +package org.citra.citra_emu.model; + +import android.content.ContentValues; +import android.database.Cursor; + +import java.nio.file.Paths; + +public final class Game { + private String mTitle; + private String mDescription; + private String mPath; + private String mGameId; + private String mCompany; + private String mRegions; + + public Game(String title, String description, String regions, String path, + String gameId, String company) { + mTitle = title; + mDescription = description; + mRegions = regions; + mPath = path; + mGameId = gameId; + mCompany = company; + } + + public static ContentValues asContentValues(String title, String description, String regions, String path, String gameId, String company) { + ContentValues values = new ContentValues(); + + if (gameId.isEmpty()) { + // Homebrew, etc. may not have a game ID, use filename as a unique identifier + gameId = Paths.get(path).getFileName().toString(); + } + + values.put(GameDatabase.KEY_GAME_TITLE, title); + values.put(GameDatabase.KEY_GAME_DESCRIPTION, description); + values.put(GameDatabase.KEY_GAME_REGIONS, regions); + values.put(GameDatabase.KEY_GAME_PATH, path); + values.put(GameDatabase.KEY_GAME_ID, gameId); + values.put(GameDatabase.KEY_GAME_COMPANY, company); + + return values; + } + + public static Game fromCursor(Cursor cursor) { + return new Game(cursor.getString(GameDatabase.GAME_COLUMN_TITLE), + cursor.getString(GameDatabase.GAME_COLUMN_DESCRIPTION), + cursor.getString(GameDatabase.GAME_COLUMN_REGIONS), + cursor.getString(GameDatabase.GAME_COLUMN_PATH), + cursor.getString(GameDatabase.GAME_COLUMN_GAME_ID), + cursor.getString(GameDatabase.GAME_COLUMN_COMPANY)); + } + + public String getTitle() { + return mTitle; + } + + public String getDescription() { + return mDescription; + } + + public String getCompany() { + return mCompany; + } + + public String getRegions() { + return mRegions; + } + + public String getPath() { + return mPath; + } + + public String getGameId() { + return mGameId; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/model/GameDatabase.java b/src/android/app/src/main/java/org/citra/citra_emu/model/GameDatabase.java new file mode 100644 index 000000000..8232d0489 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/model/GameDatabase.java @@ -0,0 +1,276 @@ +package org.citra.citra_emu.model; + +import android.content.ContentValues; +import android.content.Context; +import android.database.Cursor; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; + +import org.citra.citra_emu.NativeLibrary; +import org.citra.citra_emu.utils.Log; + +import java.io.File; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +import rx.Observable; + +/** + * A helper class that provides several utilities simplifying interaction with + * the SQLite database. + */ +public final class GameDatabase extends SQLiteOpenHelper { + public static final int COLUMN_DB_ID = 0; + public static final int GAME_COLUMN_PATH = 1; + public static final int GAME_COLUMN_TITLE = 2; + public static final int GAME_COLUMN_DESCRIPTION = 3; + public static final int GAME_COLUMN_REGIONS = 4; + public static final int GAME_COLUMN_GAME_ID = 5; + public static final int GAME_COLUMN_COMPANY = 6; + public static final int FOLDER_COLUMN_PATH = 1; + public static final String KEY_DB_ID = "_id"; + public static final String KEY_GAME_PATH = "path"; + public static final String KEY_GAME_TITLE = "title"; + public static final String KEY_GAME_DESCRIPTION = "description"; + public static final String KEY_GAME_REGIONS = "regions"; + public static final String KEY_GAME_ID = "game_id"; + public static final String KEY_GAME_COMPANY = "company"; + public static final String KEY_FOLDER_PATH = "path"; + public static final String TABLE_NAME_FOLDERS = "folders"; + public static final String TABLE_NAME_GAMES = "games"; + private static final int DB_VERSION = 2; + private static final String TYPE_PRIMARY = " INTEGER PRIMARY KEY"; + private static final String TYPE_INTEGER = " INTEGER"; + private static final String TYPE_STRING = " TEXT"; + + private static final String CONSTRAINT_UNIQUE = " UNIQUE"; + + private static final String SEPARATOR = ", "; + + private static final String SQL_CREATE_GAMES = "CREATE TABLE " + TABLE_NAME_GAMES + "(" + + KEY_DB_ID + TYPE_PRIMARY + SEPARATOR + + KEY_GAME_PATH + TYPE_STRING + SEPARATOR + + KEY_GAME_TITLE + TYPE_STRING + SEPARATOR + + KEY_GAME_DESCRIPTION + TYPE_STRING + SEPARATOR + + KEY_GAME_REGIONS + TYPE_STRING + SEPARATOR + + KEY_GAME_ID + TYPE_STRING + SEPARATOR + + KEY_GAME_COMPANY + TYPE_STRING + ")"; + + private static final String SQL_CREATE_FOLDERS = "CREATE TABLE " + TABLE_NAME_FOLDERS + "(" + + KEY_DB_ID + TYPE_PRIMARY + SEPARATOR + + KEY_FOLDER_PATH + TYPE_STRING + CONSTRAINT_UNIQUE + ")"; + + private static final String SQL_DELETE_FOLDERS = "DROP TABLE IF EXISTS " + TABLE_NAME_FOLDERS; + private static final String SQL_DELETE_GAMES = "DROP TABLE IF EXISTS " + TABLE_NAME_GAMES; + + public GameDatabase(Context context) { + // Superclass constructor builds a database or uses an existing one. + super(context, "games.db", null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase database) { + Log.debug("[GameDatabase] GameDatabase - Creating database..."); + + execSqlAndLog(database, SQL_CREATE_GAMES); + execSqlAndLog(database, SQL_CREATE_FOLDERS); + } + + @Override + public void onDowngrade(SQLiteDatabase database, int oldVersion, int newVersion) { + Log.verbose("[GameDatabase] Downgrades not supporting, clearing databases.."); + execSqlAndLog(database, SQL_DELETE_FOLDERS); + execSqlAndLog(database, SQL_CREATE_FOLDERS); + + execSqlAndLog(database, SQL_DELETE_GAMES); + execSqlAndLog(database, SQL_CREATE_GAMES); + } + + @Override + public void onUpgrade(SQLiteDatabase database, int oldVersion, int newVersion) { + Log.info("[GameDatabase] Upgrading database from schema version " + oldVersion + " to " + + newVersion); + + // Delete all the games + execSqlAndLog(database, SQL_DELETE_GAMES); + execSqlAndLog(database, SQL_CREATE_GAMES); + } + + public void resetDatabase(SQLiteDatabase database) { + execSqlAndLog(database, SQL_DELETE_FOLDERS); + execSqlAndLog(database, SQL_CREATE_FOLDERS); + + execSqlAndLog(database, SQL_DELETE_GAMES); + execSqlAndLog(database, SQL_CREATE_GAMES); + } + + public void scanLibrary(SQLiteDatabase database) { + // Before scanning known folders, go through the game table and remove any entries for which the file itself is missing. + Cursor fileCursor = database.query(TABLE_NAME_GAMES, + null, // Get all columns. + null, // Get all rows. + null, + null, // No grouping. + null, + null); // Order of games is irrelevant. + + // Possibly overly defensive, but ensures that moveToNext() does not skip a row. + fileCursor.moveToPosition(-1); + + while (fileCursor.moveToNext()) { + String gamePath = fileCursor.getString(GAME_COLUMN_PATH); + File game = new File(gamePath); + + if (!game.exists()) { + Log.error("[GameDatabase] Game file no longer exists. Removing from the library: " + + gamePath); + database.delete(TABLE_NAME_GAMES, + KEY_DB_ID + " = ?", + new String[]{Long.toString(fileCursor.getLong(COLUMN_DB_ID))}); + } + } + + // Get a cursor listing all the folders the user has added to the library. + Cursor folderCursor = database.query(TABLE_NAME_FOLDERS, + null, // Get all columns. + null, // Get all rows. + null, + null, // No grouping. + null, + null); // Order of folders is irrelevant. + + Set allowedExtensions = new HashSet(Arrays.asList( + ".xci", ".nsp", ".nca", ".nro")); + + // Possibly overly defensive, but ensures that moveToNext() does not skip a row. + folderCursor.moveToPosition(-1); + + // Iterate through all results of the DB query (i.e. all folders in the library.) + while (folderCursor.moveToNext()) { + String folderPath = folderCursor.getString(FOLDER_COLUMN_PATH); + + File folder = new File(folderPath); + // If the folder is empty because it no longer exists, remove it from the library. + if (!folder.exists()) { + Log.error( + "[GameDatabase] Folder no longer exists. Removing from the library: " + folderPath); + database.delete(TABLE_NAME_FOLDERS, + KEY_DB_ID + " = ?", + new String[]{Long.toString(folderCursor.getLong(COLUMN_DB_ID))}); + } + + addGamesRecursive(database, folder, allowedExtensions, 3); + } + + fileCursor.close(); + folderCursor.close(); + + database.close(); + } + + private static void addGamesRecursive(SQLiteDatabase database, File parent, Set allowedExtensions, int depth) { + if (depth <= 0) { + return; + } + + File[] children = parent.listFiles(); + if (children != null) { + for (File file : children) { + if (file.isHidden()) { + continue; + } + + if (file.isDirectory()) { + Set newExtensions = new HashSet<>(Arrays.asList( + ".xci", ".nsp", ".nca", ".nro")); + addGamesRecursive(database, file, newExtensions, depth - 1); + } else { + String filePath = file.getPath(); + + int extensionStart = filePath.lastIndexOf('.'); + if (extensionStart > 0) { + String fileExtension = filePath.substring(extensionStart); + + // Check that the file has an extension we care about before trying to read out of it. + if (allowedExtensions.contains(fileExtension.toLowerCase())) { + attemptToAddGame(database, filePath); + } + } + } + } + } + } + + private static void attemptToAddGame(SQLiteDatabase database, String filePath) { + String name = NativeLibrary.GetTitle(filePath); + + // If the game's title field is empty, use the filename. + if (name.isEmpty()) { + name = filePath.substring(filePath.lastIndexOf("/") + 1); + } + + String gameId = NativeLibrary.GetGameId(filePath); + + // If the game's ID field is empty, use the filename without extension. + if (gameId.isEmpty()) { + gameId = filePath.substring(filePath.lastIndexOf("/") + 1, + filePath.lastIndexOf(".")); + } + + ContentValues game = Game.asContentValues(name, + NativeLibrary.GetDescription(filePath).replace("\n", " "), + NativeLibrary.GetRegions(filePath), + filePath, + gameId, + NativeLibrary.GetCompany(filePath)); + + // Try to update an existing game first. + int rowsMatched = database.update(TABLE_NAME_GAMES, // Which table to update. + game, + // The values to fill the row with. + KEY_GAME_ID + " = ?", + // The WHERE clause used to find the right row. + new String[]{game.getAsString( + KEY_GAME_ID)}); // The ? in WHERE clause is replaced with this, + // which is provided as an array because there + // could potentially be more than one argument. + + // If update fails, insert a new game instead. + if (rowsMatched == 0) { + Log.verbose("[GameDatabase] Adding game: " + game.getAsString(KEY_GAME_TITLE)); + database.insert(TABLE_NAME_GAMES, null, game); + } else { + Log.verbose("[GameDatabase] Updated game: " + game.getAsString(KEY_GAME_TITLE)); + } + } + + public Observable getGames() { + return Observable.create(subscriber -> + { + Log.info("[GameDatabase] Reading games list..."); + + SQLiteDatabase database = getReadableDatabase(); + Cursor resultCursor = database.query( + TABLE_NAME_GAMES, + null, + null, + null, + null, + null, + KEY_GAME_TITLE + " ASC" + ); + + // Pass the result cursor to the consumer. + subscriber.onNext(resultCursor); + + // Tell the consumer we're done; it will unsubscribe implicitly. + subscriber.onCompleted(); + }); + } + + private void execSqlAndLog(SQLiteDatabase database, String sql) { + Log.verbose("[GameDatabase] Executing SQL: " + sql); + database.execSQL(sql); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/model/GameProvider.java b/src/android/app/src/main/java/org/citra/citra_emu/model/GameProvider.java new file mode 100644 index 000000000..33b289fc4 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/model/GameProvider.java @@ -0,0 +1,138 @@ +package org.citra.citra_emu.model; + +import android.content.ContentProvider; +import android.content.ContentValues; +import android.database.Cursor; +import android.database.sqlite.SQLiteDatabase; +import android.net.Uri; + +import androidx.annotation.NonNull; + +import org.citra.citra_emu.BuildConfig; +import org.citra.citra_emu.utils.Log; + +/** + * Provides an interface allowing Activities to interact with the SQLite database. + * CRUD methods in this class can be called by Activities using getContentResolver(). + */ +public final class GameProvider extends ContentProvider { + public static final String REFRESH_LIBRARY = "refresh"; + public static final String RESET_LIBRARY = "reset"; + + public static final String AUTHORITY = "content://" + BuildConfig.APPLICATION_ID + ".provider"; + public static final Uri URI_FOLDER = + Uri.parse(AUTHORITY + "/" + GameDatabase.TABLE_NAME_FOLDERS + "/"); + public static final Uri URI_REFRESH = Uri.parse(AUTHORITY + "/" + REFRESH_LIBRARY + "/"); + public static final Uri URI_RESET = Uri.parse(AUTHORITY + "/" + RESET_LIBRARY + "/"); + + public static final String MIME_TYPE_FOLDER = "vnd.android.cursor.item/vnd.dolphin.folder"; + public static final String MIME_TYPE_GAME = "vnd.android.cursor.item/vnd.dolphin.game"; + + + private GameDatabase mDbHelper; + + @Override + public boolean onCreate() { + Log.info("[GameProvider] Creating Content Provider..."); + + mDbHelper = new GameDatabase(getContext()); + + return true; + } + + @Override + public Cursor query(@NonNull Uri uri, String[] projection, String selection, + String[] selectionArgs, String sortOrder) { + Log.info("[GameProvider] Querying URI: " + uri); + + SQLiteDatabase db = mDbHelper.getReadableDatabase(); + + String table = uri.getLastPathSegment(); + + if (table == null) { + Log.error("[GameProvider] Badly formatted URI: " + uri); + return null; + } + + Cursor cursor = db.query(table, projection, selection, selectionArgs, null, null, sortOrder); + cursor.setNotificationUri(getContext().getContentResolver(), uri); + + return cursor; + } + + @Override + public String getType(@NonNull Uri uri) { + Log.verbose("[GameProvider] Getting MIME type for URI: " + uri); + String lastSegment = uri.getLastPathSegment(); + + if (lastSegment == null) { + Log.error("[GameProvider] Badly formatted URI: " + uri); + return null; + } + + if (lastSegment.equals(GameDatabase.TABLE_NAME_FOLDERS)) { + return MIME_TYPE_FOLDER; + } else if (lastSegment.equals(GameDatabase.TABLE_NAME_GAMES)) { + return MIME_TYPE_GAME; + } + + Log.error("[GameProvider] Unknown MIME type for URI: " + uri); + return null; + } + + @Override + public Uri insert(@NonNull Uri uri, ContentValues values) { + Log.info("[GameProvider] Inserting row at URI: " + uri); + + SQLiteDatabase database = mDbHelper.getWritableDatabase(); + String table = uri.getLastPathSegment(); + + if (table != null) { + if (table.equals(RESET_LIBRARY)) { + mDbHelper.resetDatabase(database); + return uri; + } + if (table.equals(REFRESH_LIBRARY)) { + Log.info( + "[GameProvider] URI specified table REFRESH_LIBRARY. No insertion necessary; refreshing library contents..."); + mDbHelper.scanLibrary(database); + return uri; + } + + long id = database.insertWithOnConflict(table, null, values, SQLiteDatabase.CONFLICT_IGNORE); + + // If insertion was successful... + if (id > 0) { + // If we just added a folder, add its contents to the game list. + if (table.equals(GameDatabase.TABLE_NAME_FOLDERS)) { + mDbHelper.scanLibrary(database); + } + + // Notify the UI that its contents should be refreshed. + getContext().getContentResolver().notifyChange(uri, null); + uri = Uri.withAppendedPath(uri, Long.toString(id)); + } else { + Log.error("[GameProvider] Row already exists: " + uri + " id: " + id); + } + } else { + Log.error("[GameProvider] Badly formatted URI: " + uri); + } + + database.close(); + + return uri; + } + + @Override + public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) { + Log.error("[GameProvider] Delete operations unsupported. URI: " + uri); + return 0; + } + + @Override + public int update(@NonNull Uri uri, ContentValues values, String selection, + String[] selectionArgs) { + Log.error("[GameProvider] Update operations unsupported. URI: " + uri); + return 0; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.java b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.java new file mode 100644 index 000000000..cdb2f7666 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.java @@ -0,0 +1,878 @@ +/** + * Copyright 2013 Dolphin Emulator Project + * Licensed under GPLv2+ + * Refer to the license.txt file included. + */ + +package org.citra.citra_emu.overlay; + +import android.app.Activity; +import android.content.Context; +import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.content.res.Resources; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Canvas; +import android.graphics.Rect; +import android.graphics.drawable.Drawable; +import android.preference.PreferenceManager; +import android.util.AttributeSet; +import android.util.DisplayMetrics; +import android.view.Display; +import android.view.MotionEvent; +import android.view.SurfaceView; +import android.view.View; +import android.view.View.OnTouchListener; + +import org.citra.citra_emu.NativeLibrary; +import org.citra.citra_emu.NativeLibrary.ButtonState; +import org.citra.citra_emu.NativeLibrary.ButtonType; +import org.citra.citra_emu.R; +import org.citra.citra_emu.utils.EmulationMenuSettings; + +import java.util.HashSet; +import java.util.Set; + +/** + * Draws the interactive input overlay on top of the + * {@link SurfaceView} that is rendering emulation. + */ +public final class InputOverlay extends SurfaceView implements OnTouchListener { + private final Set overlayButtons = new HashSet<>(); + private final Set overlayDpads = new HashSet<>(); + private final Set overlayJoysticks = new HashSet<>(); + + private boolean mIsInEditMode = false; + private InputOverlayDrawableButton mButtonBeingConfigured; + private InputOverlayDrawableDpad mDpadBeingConfigured; + private InputOverlayDrawableJoystick mJoystickBeingConfigured; + + private SharedPreferences mPreferences; + + // Stores the ID of the pointer that interacted with the 3DS touchscreen. + private int mTouchscreenPointerId = -1; + + /** + * Constructor + * + * @param context The current {@link Context}. + * @param attrs {@link AttributeSet} for parsing XML attributes. + */ + public InputOverlay(Context context, AttributeSet attrs) { + super(context, attrs); + + mPreferences = PreferenceManager.getDefaultSharedPreferences(getContext()); + if (!mPreferences.getBoolean("OverlayInit", false)) { + defaultOverlay(); + } + + // Reset 3ds touchscreen pointer ID + mTouchscreenPointerId = -1; + + // Load the controls. + refreshControls(); + + // Set the on touch listener. + setOnTouchListener(this); + + // Force draw + setWillNotDraw(false); + + // Request focus for the overlay so it has priority on presses. + requestFocus(); + } + + /** + * Resizes a {@link Bitmap} by a given scale factor + * + * @param context The current {@link Context} + * @param bitmap The {@link Bitmap} to scale. + * @param scale The scale factor for the bitmap. + * @return The scaled {@link Bitmap} + */ + public static Bitmap resizeBitmap(Context context, Bitmap bitmap, float scale) { + // Determine the button size based on the smaller screen dimension. + // This makes sure the buttons are the same size in both portrait and landscape. + DisplayMetrics dm = context.getResources().getDisplayMetrics(); + int minDimension = Math.min(dm.widthPixels, dm.heightPixels); + + return Bitmap.createScaledBitmap(bitmap, + (int) (minDimension * scale), + (int) (minDimension * scale), + true); + } + + /** + * Initializes an InputOverlayDrawableButton, given by resId, with all of the + * parameters set for it to be properly shown on the InputOverlay. + *

+ * This works due to the way the X and Y coordinates are stored within + * the {@link SharedPreferences}. + *

+ * In the input overlay configuration menu, + * once a touch event begins and then ends (ie. Organizing the buttons to one's own liking for the overlay). + * the X and Y coordinates of the button at the END of its touch event + * (when you remove your finger/stylus from the touchscreen) are then stored + * within a SharedPreferences instance so that those values can be retrieved here. + *

+ * This has a few benefits over the conventional way of storing the values + * (ie. within the Citra ini file). + *

+ *

+ * Technically no modifications should need to be performed on the returned + * InputOverlayDrawableButton. Simply add it to the HashSet of overlay items and wait + * for Android to call the onDraw method. + * + * @param context The current {@link Context}. + * @param defaultResId The resource ID of the {@link Drawable} to get the {@link Bitmap} of (Default State). + * @param pressedResId The resource ID of the {@link Drawable} to get the {@link Bitmap} of (Pressed State). + * @param buttonId Identifier for determining what type of button the initialized InputOverlayDrawableButton represents. + * @return An {@link InputOverlayDrawableButton} with the correct drawing bounds set. + */ + private static InputOverlayDrawableButton initializeOverlayButton(Context context, + int defaultResId, int pressedResId, int buttonId, String orientation) { + // Resources handle for fetching the initial Drawable resource. + final Resources res = context.getResources(); + + // SharedPreference to retrieve the X and Y coordinates for the InputOverlayDrawableButton. + final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(context); + + // Decide scale based on button ID and user preference + float scale; + + switch (buttonId) { + case ButtonType.BUTTON_HOME: + case ButtonType.BUTTON_START: + case ButtonType.BUTTON_SELECT: + scale = 0.08f; + break; + case ButtonType.TRIGGER_L: + case ButtonType.TRIGGER_R: + case ButtonType.BUTTON_ZL: + case ButtonType.BUTTON_ZR: + scale = 0.18f; + break; + default: + scale = 0.11f; + break; + } + + scale *= (sPrefs.getInt("controlScale", 50) + 50); + scale /= 100; + + // Initialize the InputOverlayDrawableButton. + final Bitmap defaultStateBitmap = + resizeBitmap(context, BitmapFactory.decodeResource(res, defaultResId), scale); + final Bitmap pressedStateBitmap = + resizeBitmap(context, BitmapFactory.decodeResource(res, pressedResId), scale); + final InputOverlayDrawableButton overlayDrawable = + new InputOverlayDrawableButton(res, defaultStateBitmap, pressedStateBitmap, buttonId); + + // The X and Y coordinates of the InputOverlayDrawableButton on the InputOverlay. + // These were set in the input overlay configuration menu. + String xKey; + String yKey; + + xKey = buttonId + orientation + "-X"; + yKey = buttonId + orientation + "-Y"; + + int drawableX = (int) sPrefs.getFloat(xKey, 0f); + int drawableY = (int) sPrefs.getFloat(yKey, 0f); + + int width = overlayDrawable.getWidth(); + int height = overlayDrawable.getHeight(); + + // Now set the bounds for the InputOverlayDrawableButton. + // This will dictate where on the screen (and the what the size) the InputOverlayDrawableButton will be. + overlayDrawable.setBounds(drawableX, drawableY, drawableX + width, drawableY + height); + + // Need to set the image's position + overlayDrawable.setPosition(drawableX, drawableY); + + return overlayDrawable; + } + + /** + * Initializes an {@link InputOverlayDrawableDpad} + * + * @param context The current {@link Context}. + * @param defaultResId The {@link Bitmap} resource ID of the default sate. + * @param pressedOneDirectionResId The {@link Bitmap} resource ID of the pressed sate in one direction. + * @param pressedTwoDirectionsResId The {@link Bitmap} resource ID of the pressed sate in two directions. + * @param buttonUp Identifier for the up button. + * @param buttonDown Identifier for the down button. + * @param buttonLeft Identifier for the left button. + * @param buttonRight Identifier for the right button. + * @return the initialized {@link InputOverlayDrawableDpad} + */ + private static InputOverlayDrawableDpad initializeOverlayDpad(Context context, + int defaultResId, + int pressedOneDirectionResId, + int pressedTwoDirectionsResId, + int buttonUp, + int buttonDown, + int buttonLeft, + int buttonRight, + String orientation) { + // Resources handle for fetching the initial Drawable resource. + final Resources res = context.getResources(); + + // SharedPreference to retrieve the X and Y coordinates for the InputOverlayDrawableDpad. + final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(context); + + // Decide scale based on button ID and user preference + float scale = 0.22f; + + scale *= (sPrefs.getInt("controlScale", 50) + 50); + scale /= 100; + + // Initialize the InputOverlayDrawableDpad. + final Bitmap defaultStateBitmap = + resizeBitmap(context, BitmapFactory.decodeResource(res, defaultResId), scale); + final Bitmap pressedOneDirectionStateBitmap = + resizeBitmap(context, BitmapFactory.decodeResource(res, pressedOneDirectionResId), + scale); + final Bitmap pressedTwoDirectionsStateBitmap = + resizeBitmap(context, BitmapFactory.decodeResource(res, pressedTwoDirectionsResId), + scale); + final InputOverlayDrawableDpad overlayDrawable = + new InputOverlayDrawableDpad(res, defaultStateBitmap, + pressedOneDirectionStateBitmap, pressedTwoDirectionsStateBitmap, + buttonUp, buttonDown, buttonLeft, buttonRight); + + // The X and Y coordinates of the InputOverlayDrawableDpad on the InputOverlay. + // These were set in the input overlay configuration menu. + int drawableX = (int) sPrefs.getFloat(buttonUp + orientation + "-X", 0f); + int drawableY = (int) sPrefs.getFloat(buttonUp + orientation + "-Y", 0f); + + int width = overlayDrawable.getWidth(); + int height = overlayDrawable.getHeight(); + + // Now set the bounds for the InputOverlayDrawableDpad. + // This will dictate where on the screen (and the what the size) the InputOverlayDrawableDpad will be. + overlayDrawable.setBounds(drawableX, drawableY, drawableX + width, drawableY + height); + + // Need to set the image's position + overlayDrawable.setPosition(drawableX, drawableY); + + return overlayDrawable; + } + + /** + * Initializes an {@link InputOverlayDrawableJoystick} + * + * @param context The current {@link Context} + * @param resOuter Resource ID for the outer image of the joystick (the static image that shows the circular bounds). + * @param defaultResInner Resource ID for the default inner image of the joystick (the one you actually move around). + * @param pressedResInner Resource ID for the pressed inner image of the joystick. + * @param joystick Identifier for which joystick this is. + * @return the initialized {@link InputOverlayDrawableJoystick}. + */ + private static InputOverlayDrawableJoystick initializeOverlayJoystick(Context context, + int resOuter, int defaultResInner, int pressedResInner, int joystick, String orientation) { + // Resources handle for fetching the initial Drawable resource. + final Resources res = context.getResources(); + + // SharedPreference to retrieve the X and Y coordinates for the InputOverlayDrawableJoystick. + final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(context); + + // Decide scale based on user preference + float scale = 0.275f; + scale *= (sPrefs.getInt("controlScale", 50) + 50); + scale /= 100; + + // Initialize the InputOverlayDrawableJoystick. + final Bitmap bitmapOuter = + resizeBitmap(context, BitmapFactory.decodeResource(res, resOuter), scale); + final Bitmap bitmapInnerDefault = BitmapFactory.decodeResource(res, defaultResInner); + final Bitmap bitmapInnerPressed = BitmapFactory.decodeResource(res, pressedResInner); + + // The X and Y coordinates of the InputOverlayDrawableButton on the InputOverlay. + // These were set in the input overlay configuration menu. + int drawableX = (int) sPrefs.getFloat(joystick + orientation + "-X", 0f); + int drawableY = (int) sPrefs.getFloat(joystick + orientation + "-Y", 0f); + + // Decide inner scale based on joystick ID + float outerScale = 1.f; + if (joystick == ButtonType.STICK_C) { + outerScale = 2.f; + } + + // Now set the bounds for the InputOverlayDrawableJoystick. + // This will dictate where on the screen (and the what the size) the InputOverlayDrawableJoystick will be. + int outerSize = bitmapOuter.getWidth(); + Rect outerRect = new Rect(drawableX, drawableY, drawableX + (int) (outerSize / outerScale), drawableY + (int) (outerSize / outerScale)); + Rect innerRect = new Rect(0, 0, (int) (outerSize / outerScale), (int) (outerSize / outerScale)); + + // Send the drawableId to the joystick so it can be referenced when saving control position. + final InputOverlayDrawableJoystick overlayDrawable + = new InputOverlayDrawableJoystick(res, bitmapOuter, + bitmapInnerDefault, bitmapInnerPressed, + outerRect, innerRect, joystick); + + // Need to set the image's position + overlayDrawable.setPosition(drawableX, drawableY); + + return overlayDrawable; + } + + @Override + public void draw(Canvas canvas) { + super.draw(canvas); + + for (InputOverlayDrawableButton button : overlayButtons) { + button.draw(canvas); + } + + for (InputOverlayDrawableDpad dpad : overlayDpads) { + dpad.draw(canvas); + } + + for (InputOverlayDrawableJoystick joystick : overlayJoysticks) { + joystick.draw(canvas); + } + } + + @Override + public boolean onTouch(View v, MotionEvent event) { + if (isInEditMode()) { + return onTouchWhileEditing(event); + } + + int pointerIndex = event.getActionIndex(); + + if (mPreferences.getBoolean("isTouchEnabled", true)) { + switch (event.getAction() & MotionEvent.ACTION_MASK) { + case MotionEvent.ACTION_DOWN: + case MotionEvent.ACTION_POINTER_DOWN: + if (NativeLibrary.onTouchEvent(event.getX(pointerIndex), event.getY(pointerIndex), true)) { + mTouchscreenPointerId = event.getPointerId(pointerIndex); + } + break; + case MotionEvent.ACTION_UP: + case MotionEvent.ACTION_POINTER_UP: + if (mTouchscreenPointerId == event.getPointerId(pointerIndex)) { + // We don't really care where the touch has been released. We only care whether it has been + // released or not. + NativeLibrary.onTouchEvent(0, 0, false); + mTouchscreenPointerId = -1; + } + break; + } + + for (int i = 0; i < event.getPointerCount(); i++) { + if (mTouchscreenPointerId == event.getPointerId(i)) { + NativeLibrary.onTouchMoved(event.getX(i), event.getY(i)); + } + } + } + + for (InputOverlayDrawableButton button : overlayButtons) { + // Determine the button state to apply based on the MotionEvent action flag. + switch (event.getAction() & MotionEvent.ACTION_MASK) { + case MotionEvent.ACTION_DOWN: + case MotionEvent.ACTION_POINTER_DOWN: + // If a pointer enters the bounds of a button, press that button. + if (button.getBounds() + .contains((int) event.getX(pointerIndex), (int) event.getY(pointerIndex))) { + button.setPressedState(true); + button.setTrackId(event.getPointerId(pointerIndex)); + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, button.getId(), + ButtonState.PRESSED); + } + break; + case MotionEvent.ACTION_UP: + case MotionEvent.ACTION_POINTER_UP: + // If a pointer ends, release the button it was pressing. + if (button.getTrackId() == event.getPointerId(pointerIndex)) { + button.setPressedState(false); + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, button.getId(), + ButtonState.RELEASED); + } + break; + } + } + + for (InputOverlayDrawableDpad dpad : overlayDpads) { + // Determine the button state to apply based on the MotionEvent action flag. + switch (event.getAction() & MotionEvent.ACTION_MASK) { + case MotionEvent.ACTION_DOWN: + case MotionEvent.ACTION_POINTER_DOWN: + // If a pointer enters the bounds of a button, press that button. + if (dpad.getBounds() + .contains((int) event.getX(pointerIndex), (int) event.getY(pointerIndex))) { + dpad.setTrackId(event.getPointerId(pointerIndex)); + } + break; + case MotionEvent.ACTION_UP: + case MotionEvent.ACTION_POINTER_UP: + // If a pointer ends, release the buttons. + if (dpad.getTrackId() == event.getPointerId(pointerIndex)) { + for (int i = 0; i < 4; i++) { + dpad.setState(InputOverlayDrawableDpad.STATE_DEFAULT); + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, dpad.getId(i), + NativeLibrary.ButtonState.RELEASED); + } + dpad.setTrackId(-1); + } + break; + } + + if (dpad.getTrackId() != -1) { + for (int i = 0; i < event.getPointerCount(); i++) { + if (dpad.getTrackId() == event.getPointerId(i)) { + float touchX = event.getX(i); + float touchY = event.getY(i); + float maxY = dpad.getBounds().bottom; + float maxX = dpad.getBounds().right; + touchX -= dpad.getBounds().centerX(); + maxX -= dpad.getBounds().centerX(); + touchY -= dpad.getBounds().centerY(); + maxY -= dpad.getBounds().centerY(); + final float AxisX = touchX / maxX; + final float AxisY = touchY / maxY; + + boolean up = false; + boolean down = false; + boolean left = false; + boolean right = false; + if (EmulationMenuSettings.getDpadSlideEnable() || + (event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_DOWN || + (event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_POINTER_DOWN) { + if (AxisY < -InputOverlayDrawableDpad.VIRT_AXIS_DEADZONE) { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, dpad.getId(0), + NativeLibrary.ButtonState.PRESSED); + up = true; + } else { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, dpad.getId(0), + NativeLibrary.ButtonState.RELEASED); + } + if (AxisY > InputOverlayDrawableDpad.VIRT_AXIS_DEADZONE) { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, dpad.getId(1), + NativeLibrary.ButtonState.PRESSED); + down = true; + } else { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, dpad.getId(1), + NativeLibrary.ButtonState.RELEASED); + } + if (AxisX < -InputOverlayDrawableDpad.VIRT_AXIS_DEADZONE) { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, dpad.getId(2), + NativeLibrary.ButtonState.PRESSED); + left = true; + } else { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, dpad.getId(2), + NativeLibrary.ButtonState.RELEASED); + } + if (AxisX > InputOverlayDrawableDpad.VIRT_AXIS_DEADZONE) { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, dpad.getId(3), + NativeLibrary.ButtonState.PRESSED); + right = true; + } else { + NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, dpad.getId(3), + NativeLibrary.ButtonState.RELEASED); + } + + // Set state + if (up) { + if (left) + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_UP_LEFT); + else if (right) + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_UP_RIGHT); + else + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_UP); + } else if (down) { + if (left) + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_DOWN_LEFT); + else if (right) + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_DOWN_RIGHT); + else + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_DOWN); + } else if (left) { + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_LEFT); + } else if (right) { + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_RIGHT); + } else { + dpad.setState(InputOverlayDrawableDpad.STATE_DEFAULT); + } + } + } + } + } + } + + for (InputOverlayDrawableJoystick joystick : overlayJoysticks) { + joystick.TrackEvent(event); + int axisID = joystick.getId(); + float[] axises = joystick.getAxisValues(); + + NativeLibrary + .onGamePadMoveEvent(NativeLibrary.TouchScreenDevice, axisID, axises[0], axises[1]); + } + + invalidate(); + + return true; + } + + public boolean onTouchWhileEditing(MotionEvent event) { + int pointerIndex = event.getActionIndex(); + int fingerPositionX = (int) event.getX(pointerIndex); + int fingerPositionY = (int) event.getY(pointerIndex); + + String orientation = + getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT ? + "-Portrait" : ""; + + // Maybe combine Button and Joystick as subclasses of the same parent? + // Or maybe create an interface like IMoveableHUDControl? + + for (InputOverlayDrawableButton button : overlayButtons) { + // Determine the button state to apply based on the MotionEvent action flag. + switch (event.getAction() & MotionEvent.ACTION_MASK) { + case MotionEvent.ACTION_DOWN: + case MotionEvent.ACTION_POINTER_DOWN: + // If no button is being moved now, remember the currently touched button to move. + if (mButtonBeingConfigured == null && + button.getBounds().contains(fingerPositionX, fingerPositionY)) { + mButtonBeingConfigured = button; + mButtonBeingConfigured.onConfigureTouch(event); + } + break; + case MotionEvent.ACTION_MOVE: + if (mButtonBeingConfigured != null) { + mButtonBeingConfigured.onConfigureTouch(event); + invalidate(); + return true; + } + break; + + case MotionEvent.ACTION_UP: + case MotionEvent.ACTION_POINTER_UP: + if (mButtonBeingConfigured == button) { + // Persist button position by saving new place. + saveControlPosition(mButtonBeingConfigured.getId(), + mButtonBeingConfigured.getBounds().left, + mButtonBeingConfigured.getBounds().top, orientation); + mButtonBeingConfigured = null; + } + break; + } + } + + for (InputOverlayDrawableDpad dpad : overlayDpads) { + // Determine the button state to apply based on the MotionEvent action flag. + switch (event.getAction() & MotionEvent.ACTION_MASK) { + case MotionEvent.ACTION_DOWN: + case MotionEvent.ACTION_POINTER_DOWN: + // If no button is being moved now, remember the currently touched button to move. + if (mButtonBeingConfigured == null && + dpad.getBounds().contains(fingerPositionX, fingerPositionY)) { + mDpadBeingConfigured = dpad; + mDpadBeingConfigured.onConfigureTouch(event); + } + break; + case MotionEvent.ACTION_MOVE: + if (mDpadBeingConfigured != null) { + mDpadBeingConfigured.onConfigureTouch(event); + invalidate(); + return true; + } + break; + + case MotionEvent.ACTION_UP: + case MotionEvent.ACTION_POINTER_UP: + if (mDpadBeingConfigured == dpad) { + // Persist button position by saving new place. + saveControlPosition(mDpadBeingConfigured.getId(0), + mDpadBeingConfigured.getBounds().left, mDpadBeingConfigured.getBounds().top, + orientation); + mDpadBeingConfigured = null; + } + break; + } + } + + for (InputOverlayDrawableJoystick joystick : overlayJoysticks) { + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + case MotionEvent.ACTION_POINTER_DOWN: + if (mJoystickBeingConfigured == null && + joystick.getBounds().contains(fingerPositionX, fingerPositionY)) { + mJoystickBeingConfigured = joystick; + mJoystickBeingConfigured.onConfigureTouch(event); + } + break; + case MotionEvent.ACTION_MOVE: + if (mJoystickBeingConfigured != null) { + mJoystickBeingConfigured.onConfigureTouch(event); + invalidate(); + } + break; + case MotionEvent.ACTION_UP: + case MotionEvent.ACTION_POINTER_UP: + if (mJoystickBeingConfigured != null) { + saveControlPosition(mJoystickBeingConfigured.getId(), + mJoystickBeingConfigured.getBounds().left, + mJoystickBeingConfigured.getBounds().top, orientation); + mJoystickBeingConfigured = null; + } + break; + } + } + + return true; + } + + private void setDpadState(InputOverlayDrawableDpad dpad, boolean up, boolean down, boolean left, + boolean right) { + if (up) { + if (left) + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_UP_LEFT); + else if (right) + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_UP_RIGHT); + else + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_UP); + } else if (down) { + if (left) + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_DOWN_LEFT); + else if (right) + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_DOWN_RIGHT); + else + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_DOWN); + } else if (left) { + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_LEFT); + } else if (right) { + dpad.setState(InputOverlayDrawableDpad.STATE_PRESSED_RIGHT); + } + } + + private void addOverlayControls(String orientation) { + if (mPreferences.getBoolean("buttonToggle0", true)) { + overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_a, + R.drawable.button_a_pressed, ButtonType.BUTTON_A, orientation)); + } + if (mPreferences.getBoolean("buttonToggle1", true)) { + overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_b, + R.drawable.button_b_pressed, ButtonType.BUTTON_B, orientation)); + } + if (mPreferences.getBoolean("buttonToggle2", true)) { + overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_x, + R.drawable.button_x_pressed, ButtonType.BUTTON_X, orientation)); + } + if (mPreferences.getBoolean("buttonToggle3", true)) { + overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_y, + R.drawable.button_y_pressed, ButtonType.BUTTON_Y, orientation)); + } + if (mPreferences.getBoolean("buttonToggle4", true)) { + overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_l, + R.drawable.button_l_pressed, ButtonType.TRIGGER_L, orientation)); + } + if (mPreferences.getBoolean("buttonToggle5", true)) { + overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_r, + R.drawable.button_r_pressed, ButtonType.TRIGGER_R, orientation)); + } + if (mPreferences.getBoolean("buttonToggle6", false)) { + overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_zl, + R.drawable.button_zl_pressed, ButtonType.BUTTON_ZL, orientation)); + } + if (mPreferences.getBoolean("buttonToggle7", false)) { + overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_zr, + R.drawable.button_zr_pressed, ButtonType.BUTTON_ZR, orientation)); + } + if (mPreferences.getBoolean("buttonToggle8", true)) { + overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_start, + R.drawable.button_start_pressed, ButtonType.BUTTON_START, orientation)); + } + if (mPreferences.getBoolean("buttonToggle9", true)) { + overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_select, + R.drawable.button_select_pressed, ButtonType.BUTTON_SELECT, orientation)); + } + if (mPreferences.getBoolean("buttonToggle10", true)) { + overlayDpads.add(initializeOverlayDpad(getContext(), R.drawable.dpad, + R.drawable.dpad_pressed_one_direction, + R.drawable.dpad_pressed_two_directions, + ButtonType.DPAD_UP, ButtonType.DPAD_DOWN, + ButtonType.DPAD_LEFT, ButtonType.DPAD_RIGHT, orientation)); + } + if (mPreferences.getBoolean("buttonToggle11", true)) { + overlayJoysticks.add(initializeOverlayJoystick(getContext(), R.drawable.stick_main_range, + R.drawable.stick_main, R.drawable.stick_main_pressed, + ButtonType.STICK_LEFT, orientation)); + } + if (mPreferences.getBoolean("buttonToggle12", false)) { + overlayJoysticks.add(initializeOverlayJoystick(getContext(), R.drawable.stick_c_range, + R.drawable.stick_c, R.drawable.stick_c_pressed, ButtonType.STICK_C, orientation)); + } + } + + public void refreshControls() { + // Remove all the overlay buttons from the HashSet. + overlayButtons.clear(); + overlayDpads.clear(); + overlayJoysticks.clear(); + + String orientation = + getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT ? + "-Portrait" : ""; + + // Add all the enabled overlay items back to the HashSet. + if (EmulationMenuSettings.getShowOverlay()) { + addOverlayControls(orientation); + } + + invalidate(); + } + + private void saveControlPosition(int sharedPrefsId, int x, int y, String orientation) { + final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + SharedPreferences.Editor sPrefsEditor = sPrefs.edit(); + sPrefsEditor.putFloat(sharedPrefsId + orientation + "-X", x); + sPrefsEditor.putFloat(sharedPrefsId + orientation + "-Y", y); + sPrefsEditor.apply(); + } + + public void setIsInEditMode(boolean isInEditMode) { + mIsInEditMode = isInEditMode; + } + + private void defaultOverlay() { + if (!mPreferences.getBoolean("OverlayInit", false)) { + // It's possible that a user has created their overlay before this was added + // Only change the overlay if the 'A' button is not in the upper corner. + if (mPreferences.getFloat(ButtonType.BUTTON_A + "-X", 0f) == 0f) { + defaultOverlayLandscape(); + } + if (mPreferences.getFloat(ButtonType.BUTTON_A + "-Portrait" + "-X", 0f) == 0f) { + defaultOverlayPortrait(); + } + } + + SharedPreferences.Editor sPrefsEditor = mPreferences.edit(); + sPrefsEditor.putBoolean("OverlayInit", true); + sPrefsEditor.apply(); + } + + public void resetButtonPlacement() { + boolean isLandscape = + getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE; + + if (isLandscape) { + defaultOverlayLandscape(); + } else { + defaultOverlayPortrait(); + } + + refreshControls(); + } + + private void defaultOverlayLandscape() { + SharedPreferences.Editor sPrefsEditor = mPreferences.edit(); + // Get screen size + Display display = ((Activity) getContext()).getWindowManager().getDefaultDisplay(); + DisplayMetrics outMetrics = new DisplayMetrics(); + display.getMetrics(outMetrics); + float maxX = outMetrics.heightPixels; + float maxY = outMetrics.widthPixels; + // Height and width changes depending on orientation. Use the larger value for height. + if (maxY > maxX) { + float tmp = maxX; + maxX = maxY; + maxY = tmp; + } + Resources res = getResources(); + + // Each value is a percent from max X/Y stored as an int. Have to bring that value down + // to a decimal before multiplying by MAX X/Y. + sPrefsEditor.putFloat(ButtonType.BUTTON_A + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_A_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_A + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_A_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_B + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_B_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_B + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_B_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_X + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_X_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_X + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_X_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_Y + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_Y_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_Y + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_Y_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_ZL + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_ZL_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_ZL + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_ZL_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_ZR + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_ZR_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_ZR + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_ZR_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.DPAD_UP + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_UP_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.DPAD_UP + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_UP_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.TRIGGER_L + "-X", (((float) res.getInteger(R.integer.N3DS_TRIGGER_L_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.TRIGGER_L + "-Y", (((float) res.getInteger(R.integer.N3DS_TRIGGER_L_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.TRIGGER_R + "-X", (((float) res.getInteger(R.integer.N3DS_TRIGGER_R_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.TRIGGER_R + "-Y", (((float) res.getInteger(R.integer.N3DS_TRIGGER_R_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_START + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_START_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_START + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_START_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_SELECT + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_SELECT_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_SELECT + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_SELECT_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_HOME + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_HOME_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_HOME + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_HOME_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.STICK_C + "-X", (((float) res.getInteger(R.integer.N3DS_STICK_C_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.STICK_C + "-Y", (((float) res.getInteger(R.integer.N3DS_STICK_C_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.STICK_LEFT + "-X", (((float) res.getInteger(R.integer.N3DS_STICK_MAIN_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.STICK_LEFT + "-Y", (((float) res.getInteger(R.integer.N3DS_STICK_MAIN_Y) / 1000) * maxY)); + + // We want to commit right away, otherwise the overlay could load before this is saved. + sPrefsEditor.commit(); + } + + private void defaultOverlayPortrait() { + SharedPreferences.Editor sPrefsEditor = mPreferences.edit(); + // Get screen size + Display display = ((Activity) getContext()).getWindowManager().getDefaultDisplay(); + DisplayMetrics outMetrics = new DisplayMetrics(); + display.getMetrics(outMetrics); + float maxX = outMetrics.heightPixels; + float maxY = outMetrics.widthPixels; + // Height and width changes depending on orientation. Use the larger value for height. + if (maxY < maxX) { + float tmp = maxX; + maxX = maxY; + maxY = tmp; + } + Resources res = getResources(); + String portrait = "-Portrait"; + + // Each value is a percent from max X/Y stored as an int. Have to bring that value down + // to a decimal before multiplying by MAX X/Y. + sPrefsEditor.putFloat(ButtonType.BUTTON_A + portrait + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_A_PORTRAIT_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_A + portrait + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_A_PORTRAIT_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_B + portrait + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_B_PORTRAIT_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_B + portrait + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_B_PORTRAIT_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_X + portrait + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_X_PORTRAIT_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_X + portrait + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_X_PORTRAIT_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_Y + portrait + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_Y_PORTRAIT_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_Y + portrait + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_Y_PORTRAIT_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_ZL + portrait + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_ZL_PORTRAIT_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_ZL + portrait + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_ZL_PORTRAIT_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_ZR + portrait + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_ZR_PORTRAIT_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_ZR + portrait + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_ZR_PORTRAIT_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.DPAD_UP + portrait + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_UP_PORTRAIT_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.DPAD_UP + portrait + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_UP_PORTRAIT_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.TRIGGER_L + portrait + "-X", (((float) res.getInteger(R.integer.N3DS_TRIGGER_L_PORTRAIT_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.TRIGGER_L + portrait + "-Y", (((float) res.getInteger(R.integer.N3DS_TRIGGER_L_PORTRAIT_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.TRIGGER_R + portrait + "-X", (((float) res.getInteger(R.integer.N3DS_TRIGGER_R_PORTRAIT_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.TRIGGER_R + portrait + "-Y", (((float) res.getInteger(R.integer.N3DS_TRIGGER_R_PORTRAIT_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_START + portrait + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_START_PORTRAIT_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_START + portrait + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_START_PORTRAIT_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_SELECT + portrait + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_SELECT_PORTRAIT_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_SELECT + portrait + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_SELECT_PORTRAIT_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.BUTTON_HOME + portrait + "-X", (((float) res.getInteger(R.integer.N3DS_BUTTON_HOME_PORTRAIT_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.BUTTON_HOME + portrait + "-Y", (((float) res.getInteger(R.integer.N3DS_BUTTON_HOME_PORTRAIT_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.STICK_C + portrait + "-X", (((float) res.getInteger(R.integer.N3DS_STICK_C_PORTRAIT_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.STICK_C + portrait + "-Y", (((float) res.getInteger(R.integer.N3DS_STICK_C_PORTRAIT_Y) / 1000) * maxY)); + sPrefsEditor.putFloat(ButtonType.STICK_LEFT + portrait + "-X", (((float) res.getInteger(R.integer.N3DS_STICK_MAIN_PORTRAIT_X) / 1000) * maxX)); + sPrefsEditor.putFloat(ButtonType.STICK_LEFT + portrait + "-Y", (((float) res.getInteger(R.integer.N3DS_STICK_MAIN_PORTRAIT_Y) / 1000) * maxY)); + + // We want to commit right away, otherwise the overlay could load before this is saved. + sPrefsEditor.commit(); + } + + public boolean isInEditMode() { + return mIsInEditMode; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableButton.java b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableButton.java new file mode 100644 index 000000000..81352296c --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableButton.java @@ -0,0 +1,122 @@ +/** + * Copyright 2013 Dolphin Emulator Project + * Licensed under GPLv2+ + * Refer to the license.txt file included. + */ + +package org.citra.citra_emu.overlay; + +import android.content.res.Resources; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Rect; +import android.graphics.drawable.BitmapDrawable; +import android.view.MotionEvent; + +/** + * Custom {@link BitmapDrawable} that is capable + * of storing it's own ID. + */ +public final class InputOverlayDrawableButton { + // The ID identifying what type of button this Drawable represents. + private int mButtonType; + private int mTrackId; + private int mPreviousTouchX, mPreviousTouchY; + private int mControlPositionX, mControlPositionY; + private int mWidth; + private int mHeight; + private BitmapDrawable mDefaultStateBitmap; + private BitmapDrawable mPressedStateBitmap; + private boolean mPressedState = false; + + /** + * Constructor + * + * @param res {@link Resources} instance. + * @param defaultStateBitmap {@link Bitmap} to use with the default state Drawable. + * @param pressedStateBitmap {@link Bitmap} to use with the pressed state Drawable. + * @param buttonType Identifier for this type of button. + */ + public InputOverlayDrawableButton(Resources res, Bitmap defaultStateBitmap, + Bitmap pressedStateBitmap, int buttonType) { + mDefaultStateBitmap = new BitmapDrawable(res, defaultStateBitmap); + mPressedStateBitmap = new BitmapDrawable(res, pressedStateBitmap); + mButtonType = buttonType; + + mWidth = mDefaultStateBitmap.getIntrinsicWidth(); + mHeight = mDefaultStateBitmap.getIntrinsicHeight(); + } + + /** + * Gets this InputOverlayDrawableButton's button ID. + * + * @return this InputOverlayDrawableButton's button ID. + */ + public int getId() { + return mButtonType; + } + + public int getTrackId() { + return mTrackId; + } + + public void setTrackId(int trackId) { + mTrackId = trackId; + } + + public boolean onConfigureTouch(MotionEvent event) { + int pointerIndex = event.getActionIndex(); + int fingerPositionX = (int) event.getX(pointerIndex); + int fingerPositionY = (int) event.getY(pointerIndex); + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + mPreviousTouchX = fingerPositionX; + mPreviousTouchY = fingerPositionY; + break; + case MotionEvent.ACTION_MOVE: + mControlPositionX += fingerPositionX - mPreviousTouchX; + mControlPositionY += fingerPositionY - mPreviousTouchY; + setBounds(mControlPositionX, mControlPositionY, getWidth() + mControlPositionX, + getHeight() + mControlPositionY); + mPreviousTouchX = fingerPositionX; + mPreviousTouchY = fingerPositionY; + break; + + } + return true; + } + + public void setPosition(int x, int y) { + mControlPositionX = x; + mControlPositionY = y; + } + + public void draw(Canvas canvas) { + getCurrentStateBitmapDrawable().draw(canvas); + } + + private BitmapDrawable getCurrentStateBitmapDrawable() { + return mPressedState ? mPressedStateBitmap : mDefaultStateBitmap; + } + + public void setBounds(int left, int top, int right, int bottom) { + mDefaultStateBitmap.setBounds(left, top, right, bottom); + mPressedStateBitmap.setBounds(left, top, right, bottom); + } + + public Rect getBounds() { + return mDefaultStateBitmap.getBounds(); + } + + public int getWidth() { + return mWidth; + } + + public int getHeight() { + return mHeight; + } + + public void setPressedState(boolean isPressed) { + mPressedState = isPressed; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableDpad.java b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableDpad.java new file mode 100644 index 000000000..87f3b7cd9 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableDpad.java @@ -0,0 +1,193 @@ +/** + * Copyright 2016 Dolphin Emulator Project + * Licensed under GPLv2+ + * Refer to the license.txt file included. + */ + +package org.citra.citra_emu.overlay; + +import android.content.res.Resources; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Rect; +import android.graphics.drawable.BitmapDrawable; +import android.view.MotionEvent; + +/** + * Custom {@link BitmapDrawable} that is capable + * of storing it's own ID. + */ +public final class InputOverlayDrawableDpad { + public static final int STATE_DEFAULT = 0; + public static final int STATE_PRESSED_UP = 1; + public static final int STATE_PRESSED_DOWN = 2; + public static final int STATE_PRESSED_LEFT = 3; + public static final int STATE_PRESSED_RIGHT = 4; + public static final int STATE_PRESSED_UP_LEFT = 5; + public static final int STATE_PRESSED_UP_RIGHT = 6; + public static final int STATE_PRESSED_DOWN_LEFT = 7; + public static final int STATE_PRESSED_DOWN_RIGHT = 8; + public static final float VIRT_AXIS_DEADZONE = 0.5f; + // The ID identifying what type of button this Drawable represents. + private int[] mButtonType = new int[4]; + private int mTrackId; + private int mPreviousTouchX, mPreviousTouchY; + private int mControlPositionX, mControlPositionY; + private int mWidth; + private int mHeight; + private BitmapDrawable mDefaultStateBitmap; + private BitmapDrawable mPressedOneDirectionStateBitmap; + private BitmapDrawable mPressedTwoDirectionsStateBitmap; + private int mPressState = STATE_DEFAULT; + + /** + * Constructor + * + * @param res {@link Resources} instance. + * @param defaultStateBitmap {@link Bitmap} of the default state. + * @param pressedOneDirectionStateBitmap {@link Bitmap} of the pressed state in one direction. + * @param pressedTwoDirectionsStateBitmap {@link Bitmap} of the pressed state in two direction. + * @param buttonUp Identifier for the up button. + * @param buttonDown Identifier for the down button. + * @param buttonLeft Identifier for the left button. + * @param buttonRight Identifier for the right button. + */ + public InputOverlayDrawableDpad(Resources res, + Bitmap defaultStateBitmap, + Bitmap pressedOneDirectionStateBitmap, + Bitmap pressedTwoDirectionsStateBitmap, + int buttonUp, int buttonDown, + int buttonLeft, int buttonRight) { + mDefaultStateBitmap = new BitmapDrawable(res, defaultStateBitmap); + mPressedOneDirectionStateBitmap = new BitmapDrawable(res, pressedOneDirectionStateBitmap); + mPressedTwoDirectionsStateBitmap = new BitmapDrawable(res, pressedTwoDirectionsStateBitmap); + + mWidth = mDefaultStateBitmap.getIntrinsicWidth(); + mHeight = mDefaultStateBitmap.getIntrinsicHeight(); + + mButtonType[0] = buttonUp; + mButtonType[1] = buttonDown; + mButtonType[2] = buttonLeft; + mButtonType[3] = buttonRight; + + mTrackId = -1; + } + + public void draw(Canvas canvas) { + int px = mControlPositionX + (getWidth() / 2); + int py = mControlPositionY + (getHeight() / 2); + switch (mPressState) { + case STATE_DEFAULT: + mDefaultStateBitmap.draw(canvas); + break; + case STATE_PRESSED_UP: + mPressedOneDirectionStateBitmap.draw(canvas); + break; + case STATE_PRESSED_RIGHT: + canvas.save(); + canvas.rotate(90, px, py); + mPressedOneDirectionStateBitmap.draw(canvas); + canvas.restore(); + break; + case STATE_PRESSED_DOWN: + canvas.save(); + canvas.rotate(180, px, py); + mPressedOneDirectionStateBitmap.draw(canvas); + canvas.restore(); + break; + case STATE_PRESSED_LEFT: + canvas.save(); + canvas.rotate(270, px, py); + mPressedOneDirectionStateBitmap.draw(canvas); + canvas.restore(); + break; + case STATE_PRESSED_UP_LEFT: + mPressedTwoDirectionsStateBitmap.draw(canvas); + break; + case STATE_PRESSED_UP_RIGHT: + canvas.save(); + canvas.rotate(90, px, py); + mPressedTwoDirectionsStateBitmap.draw(canvas); + canvas.restore(); + break; + case STATE_PRESSED_DOWN_RIGHT: + canvas.save(); + canvas.rotate(180, px, py); + mPressedTwoDirectionsStateBitmap.draw(canvas); + canvas.restore(); + break; + case STATE_PRESSED_DOWN_LEFT: + canvas.save(); + canvas.rotate(270, px, py); + mPressedTwoDirectionsStateBitmap.draw(canvas); + canvas.restore(); + break; + } + } + + /** + * Gets one of the InputOverlayDrawableDpad's button IDs. + * + * @return the requested InputOverlayDrawableDpad's button ID. + */ + public int getId(int direction) { + return mButtonType[direction]; + } + + public int getTrackId() { + return mTrackId; + } + + public void setTrackId(int trackId) { + mTrackId = trackId; + } + + public boolean onConfigureTouch(MotionEvent event) { + int pointerIndex = event.getActionIndex(); + int fingerPositionX = (int) event.getX(pointerIndex); + int fingerPositionY = (int) event.getY(pointerIndex); + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + mPreviousTouchX = fingerPositionX; + mPreviousTouchY = fingerPositionY; + break; + case MotionEvent.ACTION_MOVE: + mControlPositionX += fingerPositionX - mPreviousTouchX; + mControlPositionY += fingerPositionY - mPreviousTouchY; + setBounds(mControlPositionX, mControlPositionY, getWidth() + mControlPositionX, + getHeight() + mControlPositionY); + mPreviousTouchX = fingerPositionX; + mPreviousTouchY = fingerPositionY; + break; + + } + return true; + } + + public void setPosition(int x, int y) { + mControlPositionX = x; + mControlPositionY = y; + } + + public void setBounds(int left, int top, int right, int bottom) { + mDefaultStateBitmap.setBounds(left, top, right, bottom); + mPressedOneDirectionStateBitmap.setBounds(left, top, right, bottom); + mPressedTwoDirectionsStateBitmap.setBounds(left, top, right, bottom); + } + + public Rect getBounds() { + return mDefaultStateBitmap.getBounds(); + } + + public int getWidth() { + return mWidth; + } + + public int getHeight() { + return mHeight; + } + + public void setState(int pressState) { + mPressState = pressState; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableJoystick.java b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableJoystick.java new file mode 100644 index 000000000..956a8b1e9 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableJoystick.java @@ -0,0 +1,264 @@ +/** + * Copyright 2013 Dolphin Emulator Project + * Licensed under GPLv2+ + * Refer to the license.txt file included. + */ + +package org.citra.citra_emu.overlay; + +import android.content.res.Resources; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Rect; +import android.graphics.drawable.BitmapDrawable; +import android.view.MotionEvent; + +import org.citra.citra_emu.NativeLibrary.ButtonType; +import org.citra.citra_emu.utils.EmulationMenuSettings; + +/** + * Custom {@link BitmapDrawable} that is capable + * of storing it's own ID. + */ +public final class InputOverlayDrawableJoystick { + private final int[] axisIDs = {0, 0, 0, 0}; + private final float[] axises = {0f, 0f}; + private int trackId = -1; + private int mJoystickType; + private int mControlPositionX, mControlPositionY; + private int mPreviousTouchX, mPreviousTouchY; + private int mWidth; + private int mHeight; + private Rect mVirtBounds; + private Rect mOrigBounds; + private BitmapDrawable mOuterBitmap; + private BitmapDrawable mDefaultStateInnerBitmap; + private BitmapDrawable mPressedStateInnerBitmap; + private BitmapDrawable mBoundsBoxBitmap; + private boolean mPressedState = false; + + /** + * Constructor + * + * @param res {@link Resources} instance. + * @param bitmapOuter {@link Bitmap} which represents the outer non-movable part of the joystick. + * @param bitmapInnerDefault {@link Bitmap} which represents the default inner movable part of the joystick. + * @param bitmapInnerPressed {@link Bitmap} which represents the pressed inner movable part of the joystick. + * @param rectOuter {@link Rect} which represents the outer joystick bounds. + * @param rectInner {@link Rect} which represents the inner joystick bounds. + * @param joystick Identifier for which joystick this is. + */ + public InputOverlayDrawableJoystick(Resources res, Bitmap bitmapOuter, + Bitmap bitmapInnerDefault, Bitmap bitmapInnerPressed, + Rect rectOuter, Rect rectInner, int joystick) { + axisIDs[0] = joystick + 1; // Up + axisIDs[1] = joystick + 2; // Down + axisIDs[2] = joystick + 3; // Left + axisIDs[3] = joystick + 4; // Right + mJoystickType = joystick; + + mOuterBitmap = new BitmapDrawable(res, bitmapOuter); + mDefaultStateInnerBitmap = new BitmapDrawable(res, bitmapInnerDefault); + mPressedStateInnerBitmap = new BitmapDrawable(res, bitmapInnerPressed); + mBoundsBoxBitmap = new BitmapDrawable(res, bitmapOuter); + mWidth = bitmapOuter.getWidth(); + mHeight = bitmapOuter.getHeight(); + + setBounds(rectOuter); + mDefaultStateInnerBitmap.setBounds(rectInner); + mPressedStateInnerBitmap.setBounds(rectInner); + mVirtBounds = getBounds(); + mOrigBounds = mOuterBitmap.copyBounds(); + mBoundsBoxBitmap.setAlpha(0); + mBoundsBoxBitmap.setBounds(getVirtBounds()); + SetInnerBounds(); + } + + /** + * Gets this InputOverlayDrawableJoystick's button ID. + * + * @return this InputOverlayDrawableJoystick's button ID. + */ + public int getId() { + return mJoystickType; + } + + public void draw(Canvas canvas) { + mOuterBitmap.draw(canvas); + getCurrentStateBitmapDrawable().draw(canvas); + mBoundsBoxBitmap.draw(canvas); + } + + public void TrackEvent(MotionEvent event) { + int pointerIndex = event.getActionIndex(); + + switch (event.getAction() & MotionEvent.ACTION_MASK) { + case MotionEvent.ACTION_DOWN: + case MotionEvent.ACTION_POINTER_DOWN: + if (getBounds().contains((int) event.getX(pointerIndex), (int) event.getY(pointerIndex))) { + mPressedState = true; + mOuterBitmap.setAlpha(0); + mBoundsBoxBitmap.setAlpha(255); + if (EmulationMenuSettings.getJoystickRelCenter()) { + getVirtBounds().offset((int) event.getX(pointerIndex) - getVirtBounds().centerX(), + (int) event.getY(pointerIndex) - getVirtBounds().centerY()); + } + mBoundsBoxBitmap.setBounds(getVirtBounds()); + trackId = event.getPointerId(pointerIndex); + } + break; + case MotionEvent.ACTION_UP: + case MotionEvent.ACTION_POINTER_UP: + if (trackId == event.getPointerId(pointerIndex)) { + mPressedState = false; + axises[0] = axises[1] = 0.0f; + mOuterBitmap.setAlpha(255); + mBoundsBoxBitmap.setAlpha(0); + setVirtBounds(new Rect(mOrigBounds.left, mOrigBounds.top, mOrigBounds.right, + mOrigBounds.bottom)); + setBounds(new Rect(mOrigBounds.left, mOrigBounds.top, mOrigBounds.right, + mOrigBounds.bottom)); + SetInnerBounds(); + trackId = -1; + } + break; + } + + if (trackId == -1) + return; + + for (int i = 0; i < event.getPointerCount(); i++) { + if (trackId == event.getPointerId(i)) { + float touchX = event.getX(i); + float touchY = event.getY(i); + float maxY = getVirtBounds().bottom; + float maxX = getVirtBounds().right; + touchX -= getVirtBounds().centerX(); + maxX -= getVirtBounds().centerX(); + touchY -= getVirtBounds().centerY(); + maxY -= getVirtBounds().centerY(); + final float AxisX = touchX / maxX; + final float AxisY = touchY / maxY; + + // Clamp the circle pad input to a circle + final float angle = (float) Math.atan2(AxisY, AxisX); + float radius = (float) Math.sqrt(AxisX * AxisX + AxisY * AxisY); + if(radius > 1.0f) + { + radius = 1.0f; + } + axises[0] = ((float)Math.cos(angle) * radius); + axises[1] = ((float)Math.sin(angle) * radius); + SetInnerBounds(); + } + } + } + + public boolean onConfigureTouch(MotionEvent event) { + int pointerIndex = event.getActionIndex(); + int fingerPositionX = (int) event.getX(pointerIndex); + int fingerPositionY = (int) event.getY(pointerIndex); + + int scale = 1; + if (mJoystickType == ButtonType.STICK_C) { + // C-stick is scaled down to be half the size of the circle pad + scale = 2; + } + + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + mPreviousTouchX = fingerPositionX; + mPreviousTouchY = fingerPositionY; + break; + case MotionEvent.ACTION_MOVE: + int deltaX = fingerPositionX - mPreviousTouchX; + int deltaY = fingerPositionY - mPreviousTouchY; + mControlPositionX += deltaX; + mControlPositionY += deltaY; + setBounds(new Rect(mControlPositionX, mControlPositionY, + mOuterBitmap.getIntrinsicWidth() / scale + mControlPositionX, + mOuterBitmap.getIntrinsicHeight() / scale + mControlPositionY)); + setVirtBounds(new Rect(mControlPositionX, mControlPositionY, + mOuterBitmap.getIntrinsicWidth() / scale + mControlPositionX, + mOuterBitmap.getIntrinsicHeight() / scale + mControlPositionY)); + SetInnerBounds(); + setOrigBounds(new Rect(new Rect(mControlPositionX, mControlPositionY, + mOuterBitmap.getIntrinsicWidth() / scale + mControlPositionX, + mOuterBitmap.getIntrinsicHeight() / scale + mControlPositionY))); + mPreviousTouchX = fingerPositionX; + mPreviousTouchY = fingerPositionY; + break; + } + return true; + } + + + public float[] getAxisValues() { + return axises; + } + + public int[] getAxisIDs() { + return axisIDs; + } + + private void SetInnerBounds() { + int X = getVirtBounds().centerX() + (int) ((axises[0]) * (getVirtBounds().width() / 2)); + int Y = getVirtBounds().centerY() + (int) ((axises[1]) * (getVirtBounds().height() / 2)); + + if (mJoystickType == ButtonType.STICK_LEFT) { + X += 1; + Y += 1; + } + + if (X > getVirtBounds().centerX() + (getVirtBounds().width() / 2)) + X = getVirtBounds().centerX() + (getVirtBounds().width() / 2); + if (X < getVirtBounds().centerX() - (getVirtBounds().width() / 2)) + X = getVirtBounds().centerX() - (getVirtBounds().width() / 2); + if (Y > getVirtBounds().centerY() + (getVirtBounds().height() / 2)) + Y = getVirtBounds().centerY() + (getVirtBounds().height() / 2); + if (Y < getVirtBounds().centerY() - (getVirtBounds().height() / 2)) + Y = getVirtBounds().centerY() - (getVirtBounds().height() / 2); + + int width = mPressedStateInnerBitmap.getBounds().width() / 2; + int height = mPressedStateInnerBitmap.getBounds().height() / 2; + mDefaultStateInnerBitmap.setBounds(X - width, Y - height, X + width, Y + height); + mPressedStateInnerBitmap.setBounds(mDefaultStateInnerBitmap.getBounds()); + } + + public void setPosition(int x, int y) { + mControlPositionX = x; + mControlPositionY = y; + } + + private BitmapDrawable getCurrentStateBitmapDrawable() { + return mPressedState ? mPressedStateInnerBitmap : mDefaultStateInnerBitmap; + } + + public Rect getBounds() { + return mOuterBitmap.getBounds(); + } + + public void setBounds(Rect bounds) { + mOuterBitmap.setBounds(bounds); + } + + private void setOrigBounds(Rect bounds) { + mOrigBounds = bounds; + } + + private Rect getVirtBounds() { + return mVirtBounds; + } + + private void setVirtBounds(Rect bounds) { + mVirtBounds = bounds; + } + + public int getWidth() { + return mWidth; + } + + public int getHeight() { + return mHeight; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/DividerItemDecoration.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/DividerItemDecoration.java new file mode 100644 index 000000000..96ccc08bb --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/DividerItemDecoration.java @@ -0,0 +1,130 @@ +package org.citra.citra_emu.ui; + +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Canvas; +import android.graphics.Rect; +import android.graphics.drawable.Drawable; +import android.util.AttributeSet; +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +/** + * Implementation from: + * https://gist.github.com/lapastillaroja/858caf1a82791b6c1a36 + */ +public class DividerItemDecoration extends RecyclerView.ItemDecoration { + + private Drawable mDivider; + private boolean mShowFirstDivider = false; + private boolean mShowLastDivider = false; + + public DividerItemDecoration(Context context, AttributeSet attrs) { + final TypedArray a = context + .obtainStyledAttributes(attrs, new int[]{android.R.attr.listDivider}); + mDivider = a.getDrawable(0); + a.recycle(); + } + + public DividerItemDecoration(Context context, AttributeSet attrs, boolean showFirstDivider, + boolean showLastDivider) { + this(context, attrs); + mShowFirstDivider = showFirstDivider; + mShowLastDivider = showLastDivider; + } + + public DividerItemDecoration(Drawable divider) { + mDivider = divider; + } + + public DividerItemDecoration(Drawable divider, boolean showFirstDivider, + boolean showLastDivider) { + this(divider); + mShowFirstDivider = showFirstDivider; + mShowLastDivider = showLastDivider; + } + + @Override + public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, + @NonNull RecyclerView.State state) { + super.getItemOffsets(outRect, view, parent, state); + if (mDivider == null) { + return; + } + if (parent.getChildAdapterPosition(view) < 1) { + return; + } + + if (getOrientation(parent) == LinearLayoutManager.VERTICAL) { + outRect.top = mDivider.getIntrinsicHeight(); + } else { + outRect.left = mDivider.getIntrinsicWidth(); + } + } + + @Override + public void onDrawOver(@NonNull Canvas c, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { + if (mDivider == null) { + super.onDrawOver(c, parent, state); + return; + } + + // Initialization needed to avoid compiler warning + int left = 0, right = 0, top = 0, bottom = 0, size; + int orientation = getOrientation(parent); + int childCount = parent.getChildCount(); + + if (orientation == LinearLayoutManager.VERTICAL) { + size = mDivider.getIntrinsicHeight(); + left = parent.getPaddingLeft(); + right = parent.getWidth() - parent.getPaddingRight(); + } else { //horizontal + size = mDivider.getIntrinsicWidth(); + top = parent.getPaddingTop(); + bottom = parent.getHeight() - parent.getPaddingBottom(); + } + + for (int i = mShowFirstDivider ? 0 : 1; i < childCount; i++) { + View child = parent.getChildAt(i); + RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams(); + + if (orientation == LinearLayoutManager.VERTICAL) { + top = child.getTop() - params.topMargin; + bottom = top + size; + } else { //horizontal + left = child.getLeft() - params.leftMargin; + right = left + size; + } + mDivider.setBounds(left, top, right, bottom); + mDivider.draw(c); + } + + // show last divider + if (mShowLastDivider && childCount > 0) { + View child = parent.getChildAt(childCount - 1); + RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams(); + if (orientation == LinearLayoutManager.VERTICAL) { + top = child.getBottom() + params.bottomMargin; + bottom = top + size; + } else { // horizontal + left = child.getRight() + params.rightMargin; + right = left + size; + } + mDivider.setBounds(left, top, right, bottom); + mDivider.draw(c); + } + } + + private int getOrientation(RecyclerView parent) { + if (parent.getLayoutManager() instanceof LinearLayoutManager) { + LinearLayoutManager layoutManager = (LinearLayoutManager) parent.getLayoutManager(); + return layoutManager.getOrientation(); + } else { + throw new IllegalStateException( + "DividerItemDecoration can only be used with a LinearLayoutManager."); + } + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/TwoPaneOnBackPressedCallback.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/TwoPaneOnBackPressedCallback.java new file mode 100644 index 000000000..d07fe30d8 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/TwoPaneOnBackPressedCallback.java @@ -0,0 +1,37 @@ +package org.citra.citra_emu.ui; + +import android.view.View; + +import androidx.activity.OnBackPressedCallback; +import androidx.annotation.NonNull; +import androidx.slidingpanelayout.widget.SlidingPaneLayout; + +public class TwoPaneOnBackPressedCallback extends OnBackPressedCallback + implements SlidingPaneLayout.PanelSlideListener { + private final SlidingPaneLayout mSlidingPaneLayout; + + public TwoPaneOnBackPressedCallback(@NonNull SlidingPaneLayout slidingPaneLayout) { + super(slidingPaneLayout.isSlideable() && slidingPaneLayout.isOpen()); + mSlidingPaneLayout = slidingPaneLayout; + slidingPaneLayout.addPanelSlideListener(this); + } + + @Override + public void handleOnBackPressed() { + mSlidingPaneLayout.close(); + } + + @Override + public void onPanelSlide(@NonNull View panel, float slideOffset) { + } + + @Override + public void onPanelOpened(@NonNull View panel) { + setEnabled(true); + } + + @Override + public void onPanelClosed(@NonNull View panel) { + setEnabled(false); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java new file mode 100644 index 000000000..4ba419a48 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java @@ -0,0 +1,267 @@ +package org.citra.citra_emu.ui.main; + +import android.content.Intent; +import android.content.pm.PackageManager; +import android.os.Bundle; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.activities.EmulationActivity; +import org.citra.citra_emu.features.settings.ui.SettingsActivity; +import org.citra.citra_emu.model.GameProvider; +import org.citra.citra_emu.ui.platform.PlatformGamesFragment; +import org.citra.citra_emu.utils.AddDirectoryHelper; +import org.citra.citra_emu.utils.BillingManager; +import org.citra.citra_emu.utils.DirectoryInitialization; +import org.citra.citra_emu.utils.FileBrowserHelper; +import org.citra.citra_emu.utils.PermissionsHandler; +import org.citra.citra_emu.utils.PicassoUtils; +import org.citra.citra_emu.utils.StartupHandler; +import org.citra.citra_emu.utils.ThemeUtil; + +import java.util.Arrays; +import java.util.Collections; + +/** + * The main Activity of the Lollipop style UI. Manages several PlatformGamesFragments, which + * individually display a grid of available games for each Fragment, in a tabbed layout. + */ +public final class MainActivity extends AppCompatActivity implements MainView { + private Toolbar mToolbar; + private int mFrameLayoutId; + private PlatformGamesFragment mPlatformGamesFragment; + + private MainPresenter mPresenter = new MainPresenter(this); + + // Singleton to manage user billing state + private static BillingManager mBillingManager; + + private static MenuItem mPremiumButton; + + @Override + protected void onCreate(Bundle savedInstanceState) { + ThemeUtil.applyTheme(); + + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + findViews(); + + setSupportActionBar(mToolbar); + + mFrameLayoutId = R.id.games_platform_frame; + mPresenter.onCreate(); + + if (savedInstanceState == null) { + StartupHandler.HandleInit(this); + if (PermissionsHandler.hasWriteAccess(this)) { + mPlatformGamesFragment = new PlatformGamesFragment(); + getSupportFragmentManager().beginTransaction().add(mFrameLayoutId, mPlatformGamesFragment) + .commit(); + } + } else { + mPlatformGamesFragment = (PlatformGamesFragment) getSupportFragmentManager().getFragment(savedInstanceState, "mPlatformGamesFragment"); + } + PicassoUtils.init(); + + // Setup billing manager, so we can globally query for Premium status + mBillingManager = new BillingManager(this); + + // Dismiss previous notifications (should not happen unless a crash occurred) + EmulationActivity.tryDismissRunningNotification(this); + } + + @Override + protected void onSaveInstanceState(@NonNull Bundle outState) { + super.onSaveInstanceState(outState); + if (PermissionsHandler.hasWriteAccess(this)) { + if (getSupportFragmentManager() == null) { + return; + } + if (outState == null) { + return; + } + getSupportFragmentManager().putFragment(outState, "mPlatformGamesFragment", mPlatformGamesFragment); + } + } + + @Override + protected void onResume() { + super.onResume(); + mPresenter.addDirIfNeeded(new AddDirectoryHelper(this)); + } + + // TODO: Replace with a ButterKnife injection. + private void findViews() { + mToolbar = findViewById(R.id.toolbar_main); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.menu_game_grid, menu); + mPremiumButton = menu.findItem(R.id.button_premium); + + if (mBillingManager.isPremiumCached()) { + // User had premium in a previous session, hide upsell option + setPremiumButtonVisible(false); + } + + return true; + } + + static public void setPremiumButtonVisible(boolean isVisible) { + if (mPremiumButton != null) { + mPremiumButton.setVisible(isVisible); + } + } + + /** + * MainView + */ + + @Override + public void setVersionString(String version) { + mToolbar.setSubtitle(version); + } + + @Override + public void refresh() { + getContentResolver().insert(GameProvider.URI_REFRESH, null); + refreshFragment(); + } + + @Override + public void launchSettingsActivity(String menuTag) { + if (PermissionsHandler.hasWriteAccess(this)) { + SettingsActivity.launch(this, menuTag, ""); + } else { + PermissionsHandler.checkWritePermission(this); + } + } + + @Override + public void launchFileListActivity(int request) { + if (PermissionsHandler.hasWriteAccess(this)) { + switch (request) { + case MainPresenter.REQUEST_ADD_DIRECTORY: + FileBrowserHelper.openDirectoryPicker(this, + MainPresenter.REQUEST_ADD_DIRECTORY, + R.string.select_game_folder, + Arrays.asList("xci", "nsp", "cci", "3ds", + "cxi", "app", "3dsx", "cia", + "rar", "zip", "7z", "torrent", + "tar", "gz", "nro")); + break; + case MainPresenter.REQUEST_INSTALL_CIA: + FileBrowserHelper.openFilePicker(this, MainPresenter.REQUEST_INSTALL_CIA, + R.string.install_cia_title, + Collections.singletonList("cia"), true); + break; + } + } else { + PermissionsHandler.checkWritePermission(this); + } + } + + /** + * @param requestCode An int describing whether the Activity that is returning did so successfully. + * @param resultCode An int describing what Activity is giving us this callback. + * @param result The information the returning Activity is providing us. + */ + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent result) { + super.onActivityResult(requestCode, resultCode, result); + switch (requestCode) { + case MainPresenter.REQUEST_ADD_DIRECTORY: + // If the user picked a file, as opposed to just backing out. + if (resultCode == MainActivity.RESULT_OK) { + // When a new directory is picked, we currently will reset the existing games + // database. This effectively means that only one game directory is supported. + // TODO(bunnei): Consider fixing this in the future, or removing code for this. + getContentResolver().insert(GameProvider.URI_RESET, null); + // Add the new directory + mPresenter.onDirectorySelected(FileBrowserHelper.getSelectedDirectory(result)); + } + break; + case MainPresenter.REQUEST_INSTALL_CIA: + // If the user picked a file, as opposed to just backing out. + if (resultCode == MainActivity.RESULT_OK) { + mPresenter.refeshGameList(); + } + break; + } + } + + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + switch (requestCode) { + case PermissionsHandler.REQUEST_CODE_WRITE_PERMISSION: + if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { + DirectoryInitialization.start(this); + + mPlatformGamesFragment = new PlatformGamesFragment(); + getSupportFragmentManager().beginTransaction().add(mFrameLayoutId, mPlatformGamesFragment) + .commit(); + + // Immediately prompt user to select a game directory on first boot + if (mPresenter != null) { + mPresenter.launchFileListActivity(MainPresenter.REQUEST_ADD_DIRECTORY); + } + } else { + Toast.makeText(this, R.string.write_permission_needed, Toast.LENGTH_SHORT) + .show(); + } + break; + default: + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + break; + } + } + + /** + * Called by the framework whenever any actionbar/toolbar icon is clicked. + * + * @param item The icon that was clicked on. + * @return True if the event was handled, false to bubble it up to the OS. + */ + @Override + public boolean onOptionsItemSelected(MenuItem item) { + return mPresenter.handleOptionSelection(item.getItemId()); + } + + private void refreshFragment() { + if (mPlatformGamesFragment != null) { + mPlatformGamesFragment.refresh(); + } + } + + @Override + protected void onDestroy() { + EmulationActivity.tryDismissRunningNotification(this); + super.onDestroy(); + } + + /** + * @return true if Premium subscription is currently active + */ + public static boolean isPremiumActive() { + return mBillingManager.isPremiumActive(); + } + + /** + * Invokes the billing flow for Premium + * + * @param callback Optional callback, called once, on completion of billing + */ + public static void invokePremiumBilling(Runnable callback) { + mBillingManager.invokePremiumBilling(callback); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainPresenter.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainPresenter.java new file mode 100644 index 000000000..4e9994c2a --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainPresenter.java @@ -0,0 +1,82 @@ +package org.citra.citra_emu.ui.main; + +import android.os.SystemClock; + +import org.citra.citra_emu.BuildConfig; +import org.citra.citra_emu.CitraApplication; +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.model.Settings; +import org.citra.citra_emu.features.settings.utils.SettingsFile; +import org.citra.citra_emu.model.GameDatabase; +import org.citra.citra_emu.utils.AddDirectoryHelper; + +public final class MainPresenter { + public static final int REQUEST_ADD_DIRECTORY = 1; + public static final int REQUEST_INSTALL_CIA = 2; + + private final MainView mView; + private String mDirToAdd; + private long mLastClickTime = 0; + + public MainPresenter(MainView view) { + mView = view; + } + + public void onCreate() { + String versionName = BuildConfig.VERSION_NAME; + mView.setVersionString(versionName); + refeshGameList(); + } + + public void launchFileListActivity(int request) { + if (mView != null) { + mView.launchFileListActivity(request); + } + } + + public boolean handleOptionSelection(int itemId) { + // Double-click prevention, using threshold of 500 ms + if (SystemClock.elapsedRealtime() - mLastClickTime < 500) { + return false; + } + mLastClickTime = SystemClock.elapsedRealtime(); + + switch (itemId) { + case R.id.menu_settings_core: + mView.launchSettingsActivity(SettingsFile.FILE_NAME_CONFIG); + return true; + + case R.id.button_add_directory: + launchFileListActivity(REQUEST_ADD_DIRECTORY); + return true; + + case R.id.button_install_cia: + launchFileListActivity(REQUEST_INSTALL_CIA); + return true; + + case R.id.button_premium: + mView.launchSettingsActivity(Settings.SECTION_PREMIUM); + return true; + } + + return false; + } + + public void addDirIfNeeded(AddDirectoryHelper helper) { + if (mDirToAdd != null) { + helper.addDirectory(mDirToAdd, mView::refresh); + + mDirToAdd = null; + } + } + + public void onDirectorySelected(String dir) { + mDirToAdd = dir; + } + + public void refeshGameList() { + GameDatabase databaseHelper = CitraApplication.databaseHelper; + databaseHelper.scanLibrary(databaseHelper.getWritableDatabase()); + mView.refresh(); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainView.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainView.java new file mode 100644 index 000000000..de7c04875 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainView.java @@ -0,0 +1,25 @@ +package org.citra.citra_emu.ui.main; + +/** + * Abstraction for the screen that shows on application launch. + * Implementations will differ primarily to target touch-screen + * or non-touch screen devices. + */ +public interface MainView { + /** + * Pass the view the native library's version string. Displaying + * it is optional. + * + * @param version A string pulled from native code. + */ + void setVersionString(String version); + + /** + * Tell the view to refresh its contents. + */ + void refresh(); + + void launchSettingsActivity(String menuTag); + + void launchFileListActivity(int request); +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesFragment.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesFragment.java new file mode 100644 index 000000000..9fc30796f --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesFragment.java @@ -0,0 +1,86 @@ +package org.citra.citra_emu.ui.platform; + +import android.database.Cursor; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + +import org.citra.citra_emu.CitraApplication; +import org.citra.citra_emu.R; +import org.citra.citra_emu.adapters.GameAdapter; +import org.citra.citra_emu.model.GameDatabase; + +public final class PlatformGamesFragment extends Fragment implements PlatformGamesView { + private PlatformGamesPresenter mPresenter = new PlatformGamesPresenter(this); + + private GameAdapter mAdapter; + private RecyclerView mRecyclerView; + private TextView mTextView; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View rootView = inflater.inflate(R.layout.fragment_grid, container, false); + + findViews(rootView); + + mPresenter.onCreateView(); + + return rootView; + } + + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + int columns = getResources().getInteger(R.integer.game_grid_columns); + RecyclerView.LayoutManager layoutManager = new GridLayoutManager(getActivity(), columns); + mAdapter = new GameAdapter(); + + mRecyclerView.setLayoutManager(layoutManager); + mRecyclerView.setAdapter(mAdapter); + mRecyclerView.addItemDecoration(new GameAdapter.SpacesItemDecoration(ContextCompat.getDrawable(getActivity(), R.drawable.gamelist_divider), 1)); + + // Add swipe down to refresh gesture + final SwipeRefreshLayout pullToRefresh = view.findViewById(R.id.refresh_grid_games); + pullToRefresh.setOnRefreshListener(() -> { + GameDatabase databaseHelper = CitraApplication.databaseHelper; + databaseHelper.scanLibrary(databaseHelper.getWritableDatabase()); + refresh(); + pullToRefresh.setRefreshing(false); + }); + } + + @Override + public void refresh() { + mPresenter.refresh(); + updateTextView(); + } + + @Override + public void showGames(Cursor games) { + if (mAdapter != null) { + mAdapter.swapCursor(games); + } + updateTextView(); + } + + private void updateTextView() { + mTextView.setVisibility(mAdapter.getItemCount() == 0 ? View.VISIBLE : View.GONE); + } + + private void findViews(View root) { + mRecyclerView = root.findViewById(R.id.grid_games); + mTextView = root.findViewById(R.id.gamelist_empty_text); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesPresenter.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesPresenter.java new file mode 100644 index 000000000..9d8040e1b --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesPresenter.java @@ -0,0 +1,42 @@ +package org.citra.citra_emu.ui.platform; + + +import org.citra.citra_emu.CitraApplication; +import org.citra.citra_emu.model.GameDatabase; +import org.citra.citra_emu.utils.Log; + +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public final class PlatformGamesPresenter { + private final PlatformGamesView mView; + + public PlatformGamesPresenter(PlatformGamesView view) { + mView = view; + } + + public void onCreateView() { + loadGames(); + } + + public void refresh() { + Log.debug("[PlatformGamesPresenter] : Refreshing..."); + loadGames(); + } + + private void loadGames() { + Log.debug("[PlatformGamesPresenter] : Loading games..."); + + GameDatabase databaseHelper = CitraApplication.databaseHelper; + + databaseHelper.getGames() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(games -> + { + Log.debug("[PlatformGamesPresenter] : Load finished, swapping cursor..."); + + mView.showGames(games); + }); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesView.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesView.java new file mode 100644 index 000000000..4332121eb --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesView.java @@ -0,0 +1,21 @@ +package org.citra.citra_emu.ui.platform; + +import android.database.Cursor; + +/** + * Abstraction for a screen representing a single platform's games. + */ +public interface PlatformGamesView { + /** + * Tell the view to refresh its contents. + */ + void refresh(); + + /** + * To be called when an asynchronous database read completes. Passes the + * result, in this case a {@link Cursor}, to the view. + * + * @param games A Cursor containing the games read from the database. + */ + void showGames(Cursor games); +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/Action1.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/Action1.java new file mode 100644 index 000000000..886846ec5 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/Action1.java @@ -0,0 +1,5 @@ +package org.citra.citra_emu.utils; + +public interface Action1 { + void call(T t); +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/AddDirectoryHelper.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/AddDirectoryHelper.java new file mode 100644 index 000000000..7578c353f --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/AddDirectoryHelper.java @@ -0,0 +1,38 @@ +package org.citra.citra_emu.utils; + +import android.content.AsyncQueryHandler; +import android.content.ContentValues; +import android.content.Context; +import android.net.Uri; + +import org.citra.citra_emu.model.GameDatabase; +import org.citra.citra_emu.model.GameProvider; + +public class AddDirectoryHelper { + private Context mContext; + + public AddDirectoryHelper(Context context) { + this.mContext = context; + } + + public void addDirectory(String dir, AddDirectoryListener addDirectoryListener) { + AsyncQueryHandler handler = new AsyncQueryHandler(mContext.getContentResolver()) { + @Override + protected void onInsertComplete(int token, Object cookie, Uri uri) { + addDirectoryListener.onDirectoryAdded(); + } + }; + + ContentValues file = new ContentValues(); + file.put(GameDatabase.KEY_FOLDER_PATH, dir); + + handler.startInsert(0, // We don't need to identify this call to the handler + null, // We don't need to pass additional data to the handler + GameProvider.URI_FOLDER, // Tell the GameProvider we are adding a folder + file); + } + + public interface AddDirectoryListener { + void onDirectoryAdded(); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/BiMap.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/BiMap.java new file mode 100644 index 000000000..dfbab1780 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/BiMap.java @@ -0,0 +1,22 @@ +package org.citra.citra_emu.utils; + +import java.util.HashMap; +import java.util.Map; + +public class BiMap { + private Map forward = new HashMap(); + private Map backward = new HashMap(); + + public synchronized void add(K key, V value) { + forward.put(key, value); + backward.put(value, key); + } + + public synchronized V getForward(K key) { + return forward.get(key); + } + + public synchronized K getBackward(V key) { + return backward.get(key); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/BillingManager.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/BillingManager.java new file mode 100644 index 000000000..5dc54c235 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/BillingManager.java @@ -0,0 +1,215 @@ +package org.citra.citra_emu.utils; + +import android.app.Activity; +import android.content.SharedPreferences; +import android.preference.PreferenceManager; +import android.widget.Toast; + +import com.android.billingclient.api.AcknowledgePurchaseParams; +import com.android.billingclient.api.AcknowledgePurchaseResponseListener; +import com.android.billingclient.api.BillingClient; +import com.android.billingclient.api.BillingClientStateListener; +import com.android.billingclient.api.BillingFlowParams; +import com.android.billingclient.api.BillingResult; +import com.android.billingclient.api.Purchase; +import com.android.billingclient.api.Purchase.PurchasesResult; +import com.android.billingclient.api.PurchasesUpdatedListener; +import com.android.billingclient.api.SkuDetails; +import com.android.billingclient.api.SkuDetailsParams; + +import org.citra.citra_emu.CitraApplication; +import org.citra.citra_emu.R; +import org.citra.citra_emu.features.settings.utils.SettingsFile; +import org.citra.citra_emu.ui.main.MainActivity; + +import java.util.ArrayList; +import java.util.List; + +public class BillingManager implements PurchasesUpdatedListener { + private final String BILLING_SKU_PREMIUM = "citra.citra_emu.product_id.premium"; + + private final Activity mActivity; + private BillingClient mBillingClient; + private SkuDetails mSkuPremium; + private boolean mIsPremiumActive = false; + private boolean mIsServiceConnected = false; + private Runnable mUpdateBillingCallback; + + private static SharedPreferences mPreferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext()); + + public BillingManager(Activity activity) { + mActivity = activity; + mBillingClient = BillingClient.newBuilder(mActivity).enablePendingPurchases().setListener(this).build(); + querySkuDetails(); + } + + static public boolean isPremiumCached() { + return mPreferences.getBoolean(SettingsFile.KEY_PREMIUM, false); + } + + /** + * @return true if Premium subscription is currently active + */ + public boolean isPremiumActive() { + return mIsPremiumActive; + } + + /** + * Invokes the billing flow for Premium + * + * @param callback Optional callback, called once, on completion of billing + */ + public void invokePremiumBilling(Runnable callback) { + if (mSkuPremium == null) { + return; + } + + // Optional callback to refresh the UI for the caller when billing completes + mUpdateBillingCallback = callback; + + // Invoke the billing flow + BillingFlowParams flowParams = BillingFlowParams.newBuilder() + .setSkuDetails(mSkuPremium) + .build(); + mBillingClient.launchBillingFlow(mActivity, flowParams); + } + + private void updatePremiumState(boolean isPremiumActive) { + mIsPremiumActive = isPremiumActive; + + // Cache state for synchronous UI + SharedPreferences.Editor editor = mPreferences.edit(); + editor.putBoolean(SettingsFile.KEY_PREMIUM, isPremiumActive); + editor.apply(); + + // No need to show button in action bar if Premium is active + MainActivity.setPremiumButtonVisible(!isPremiumActive); + } + + @Override + public void onPurchasesUpdated(BillingResult billingResult, List purchaseList) { + if (purchaseList == null || purchaseList.isEmpty()) { + // Premium is not active, or billing is unavailable + updatePremiumState(false); + return; + } + + Purchase premiumPurchase = null; + for (Purchase purchase : purchaseList) { + if (purchase.getSku().equals(BILLING_SKU_PREMIUM)) { + premiumPurchase = purchase; + } + } + + if (premiumPurchase != null && premiumPurchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED) { + // Premium has been purchased + updatePremiumState(true); + + // Acknowledge the purchase if it hasn't already been acknowledged. + if (!premiumPurchase.isAcknowledged()) { + AcknowledgePurchaseParams acknowledgePurchaseParams = + AcknowledgePurchaseParams.newBuilder() + .setPurchaseToken(premiumPurchase.getPurchaseToken()) + .build(); + + AcknowledgePurchaseResponseListener acknowledgePurchaseResponseListener = billingResult1 -> { + Toast.makeText(mActivity, R.string.premium_settings_welcome, Toast.LENGTH_SHORT).show(); + }; + mBillingClient.acknowledgePurchase(acknowledgePurchaseParams, acknowledgePurchaseResponseListener); + } + + if (mUpdateBillingCallback != null) { + try { + mUpdateBillingCallback.run(); + } catch (Exception e) { + e.printStackTrace(); + } + mUpdateBillingCallback = null; + } + } + } + + private void onQuerySkuDetailsFinished(List skuDetailsList) { + if (skuDetailsList == null) { + // This can happen when no user is signed in + return; + } + + if (skuDetailsList.isEmpty()) { + return; + } + + mSkuPremium = skuDetailsList.get(0); + + queryPurchases(); + } + + private void querySkuDetails() { + Runnable queryToExecute = new Runnable() { + @Override + public void run() { + SkuDetailsParams.Builder params = SkuDetailsParams.newBuilder(); + List skuList = new ArrayList<>(); + + skuList.add(BILLING_SKU_PREMIUM); + params.setSkusList(skuList).setType(BillingClient.SkuType.INAPP); + + mBillingClient.querySkuDetailsAsync(params.build(), + (billingResult, skuDetailsList) -> onQuerySkuDetailsFinished(skuDetailsList)); + } + }; + + executeServiceRequest(queryToExecute); + } + + private void onQueryPurchasesFinished(PurchasesResult result) { + // Have we been disposed of in the meantime? If so, or bad result code, then quit + if (mBillingClient == null || result.getResponseCode() != BillingClient.BillingResponseCode.OK) { + updatePremiumState(false); + return; + } + // Update the UI and purchases inventory with new list of purchases + onPurchasesUpdated(result.getBillingResult(), result.getPurchasesList()); + } + + private void queryPurchases() { + Runnable queryToExecute = new Runnable() { + @Override + public void run() { + final PurchasesResult purchasesResult = mBillingClient.queryPurchases(BillingClient.SkuType.INAPP); + onQueryPurchasesFinished(purchasesResult); + } + }; + + executeServiceRequest(queryToExecute); + } + + private void startServiceConnection(final Runnable executeOnFinish) { + mBillingClient.startConnection(new BillingClientStateListener() { + @Override + public void onBillingSetupFinished(BillingResult billingResult) { + if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK) { + mIsServiceConnected = true; + } + + if (executeOnFinish != null) { + executeOnFinish.run(); + } + } + + @Override + public void onBillingServiceDisconnected() { + mIsServiceConnected = false; + } + }); + } + + private void executeServiceRequest(Runnable runnable) { + if (mIsServiceConnected) { + runnable.run(); + } else { + // If billing service was disconnected, we try to reconnect 1 time. + startServiceConnection(runnable); + } + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/ControllerMappingHelper.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/ControllerMappingHelper.java new file mode 100644 index 000000000..f801a05f0 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/ControllerMappingHelper.java @@ -0,0 +1,66 @@ +package org.citra.citra_emu.utils; + +import android.view.InputDevice; +import android.view.KeyEvent; +import android.view.MotionEvent; + +/** + * Some controllers have incorrect mappings. This class has special-case fixes for them. + */ +public class ControllerMappingHelper { + /** + * Some controllers report extra button presses that can be ignored. + */ + public boolean shouldKeyBeIgnored(InputDevice inputDevice, int keyCode) { + if (isDualShock4(inputDevice)) { + // The two analog triggers generate analog motion events as well as a keycode. + // We always prefer to use the analog values, so throw away the button press + return keyCode == KeyEvent.KEYCODE_BUTTON_L2 || keyCode == KeyEvent.KEYCODE_BUTTON_R2; + } + return false; + } + + /** + * Scale an axis to be zero-centered with a proper range. + */ + public float scaleAxis(InputDevice inputDevice, int axis, float value) { + if (isDualShock4(inputDevice)) { + // Android doesn't have correct mappings for this controller's triggers. It reports them + // as RX & RY, centered at -1.0, and with a range of [-1.0, 1.0] + // Scale them to properly zero-centered with a range of [0.0, 1.0]. + if (axis == MotionEvent.AXIS_RX || axis == MotionEvent.AXIS_RY) { + return (value + 1) / 2.0f; + } + } else if (isXboxOneWireless(inputDevice)) { + // Same as the DualShock 4, the mappings are missing. + if (axis == MotionEvent.AXIS_Z || axis == MotionEvent.AXIS_RZ) { + return (value + 1) / 2.0f; + } + if (axis == MotionEvent.AXIS_GENERIC_1) { + // This axis is stuck at ~.5. Ignore it. + return 0.0f; + } + } else if (isMogaPro2Hid(inputDevice)) { + // This controller has a broken axis that reports a constant value. Ignore it. + if (axis == MotionEvent.AXIS_GENERIC_1) { + return 0.0f; + } + } + return value; + } + + private boolean isDualShock4(InputDevice inputDevice) { + // Sony DualShock 4 controller + return inputDevice.getVendorId() == 0x54c && inputDevice.getProductId() == 0x9cc; + } + + private boolean isXboxOneWireless(InputDevice inputDevice) { + // Microsoft Xbox One controller + return inputDevice.getVendorId() == 0x45e && inputDevice.getProductId() == 0x2e0; + } + + private boolean isMogaPro2Hid(InputDevice inputDevice) { + // Moga Pro 2 HID + return inputDevice.getVendorId() == 0x20d6 && inputDevice.getProductId() == 0x6271; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.java new file mode 100644 index 000000000..58e552f5e --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.java @@ -0,0 +1,186 @@ +/** + * Copyright 2014 Dolphin Emulator Project + * Licensed under GPLv2+ + * Refer to the license.txt file included. + */ + +package org.citra.citra_emu.utils; + +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Environment; +import android.preference.PreferenceManager; + +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + +import org.citra.citra_emu.NativeLibrary; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.concurrent.atomic.AtomicBoolean; + +/** + * A service that spawns its own thread in order to copy several binary and shader files + * from the Citra APK to the external file system. + */ +public final class DirectoryInitialization { + public static final String BROADCAST_ACTION = "org.citra.citra_emu.BROADCAST"; + + public static final String EXTRA_STATE = "directoryState"; + private static volatile DirectoryInitializationState directoryState = null; + private static String userPath; + private static AtomicBoolean isCitraDirectoryInitializationRunning = new AtomicBoolean(false); + + public static void start(Context context) { + // Can take a few seconds to run, so don't block UI thread. + //noinspection TrivialFunctionalExpressionUsage + ((Runnable) () -> init(context)).run(); + } + + private static void init(Context context) { + if (!isCitraDirectoryInitializationRunning.compareAndSet(false, true)) + return; + + if (directoryState != DirectoryInitializationState.CITRA_DIRECTORIES_INITIALIZED) { + if (PermissionsHandler.hasWriteAccess(context)) { + if (setCitraUserDirectory()) { + initializeInternalStorage(context); + NativeLibrary.CreateConfigFile(); + directoryState = DirectoryInitializationState.CITRA_DIRECTORIES_INITIALIZED; + } else { + directoryState = DirectoryInitializationState.CANT_FIND_EXTERNAL_STORAGE; + } + } else { + directoryState = DirectoryInitializationState.EXTERNAL_STORAGE_PERMISSION_NEEDED; + } + } + + isCitraDirectoryInitializationRunning.set(false); + sendBroadcastState(directoryState, context); + } + + private static void deleteDirectoryRecursively(File file) { + if (file.isDirectory()) { + for (File child : file.listFiles()) + deleteDirectoryRecursively(child); + } + file.delete(); + } + + public static boolean areCitraDirectoriesReady() { + return directoryState == DirectoryInitializationState.CITRA_DIRECTORIES_INITIALIZED; + } + + public static String getUserDirectory() { + if (directoryState == null) { + throw new IllegalStateException("DirectoryInitialization has to run at least once!"); + } else if (isCitraDirectoryInitializationRunning.get()) { + throw new IllegalStateException( + "DirectoryInitialization has to finish running first!"); + } + return userPath; + } + + private static native void SetSysDirectory(String path); + + private static boolean setCitraUserDirectory() { + if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) { + File externalPath = Environment.getExternalStorageDirectory(); + if (externalPath != null) { + userPath = externalPath.getAbsolutePath() + "/citra-emu"; + Log.debug("[DirectoryInitialization] User Dir: " + userPath); + // NativeLibrary.SetUserDirectory(userPath); + return true; + } + + } + + return false; + } + + private static void initializeInternalStorage(Context context) { + File sysDirectory = new File(context.getFilesDir(), "Sys"); + + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context); + String revision = NativeLibrary.GetGitRevision(); + if (!preferences.getString("sysDirectoryVersion", "").equals(revision)) { + // There is no extracted Sys directory, or there is a Sys directory from another + // version of Citra that might contain outdated files. Let's (re-)extract Sys. + deleteDirectoryRecursively(sysDirectory); + copyAssetFolder("Sys", sysDirectory, true, context); + + SharedPreferences.Editor editor = preferences.edit(); + editor.putString("sysDirectoryVersion", revision); + editor.apply(); + } + + // Let the native code know where the Sys directory is. + SetSysDirectory(sysDirectory.getPath()); + } + + private static void sendBroadcastState(DirectoryInitializationState state, Context context) { + Intent localIntent = + new Intent(BROADCAST_ACTION) + .putExtra(EXTRA_STATE, state); + LocalBroadcastManager.getInstance(context).sendBroadcast(localIntent); + } + + private static void copyAsset(String asset, File output, Boolean overwrite, Context context) { + Log.verbose("[DirectoryInitialization] Copying File " + asset + " to " + output); + + try { + if (!output.exists() || overwrite) { + InputStream in = context.getAssets().open(asset); + OutputStream out = new FileOutputStream(output); + copyFile(in, out); + in.close(); + out.close(); + } + } catch (IOException e) { + Log.error("[DirectoryInitialization] Failed to copy asset file: " + asset + + e.getMessage()); + } + } + + private static void copyAssetFolder(String assetFolder, File outputFolder, Boolean overwrite, + Context context) { + Log.verbose("[DirectoryInitialization] Copying Folder " + assetFolder + " to " + + outputFolder); + + try { + boolean createdFolder = false; + for (String file : context.getAssets().list(assetFolder)) { + if (!createdFolder) { + outputFolder.mkdir(); + createdFolder = true; + } + copyAssetFolder(assetFolder + File.separator + file, new File(outputFolder, file), + overwrite, context); + copyAsset(assetFolder + File.separator + file, new File(outputFolder, file), overwrite, + context); + } + } catch (IOException e) { + Log.error("[DirectoryInitialization] Failed to copy asset folder: " + assetFolder + + e.getMessage()); + } + } + + private static void copyFile(InputStream in, OutputStream out) throws IOException { + byte[] buffer = new byte[1024]; + int read; + + while ((read = in.read(buffer)) != -1) { + out.write(buffer, 0, read); + } + } + + public enum DirectoryInitializationState { + CITRA_DIRECTORIES_INITIALIZED, + EXTERNAL_STORAGE_PERMISSION_NEEDED, + CANT_FIND_EXTERNAL_STORAGE + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryStateReceiver.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryStateReceiver.java new file mode 100644 index 000000000..5d1e951ca --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryStateReceiver.java @@ -0,0 +1,22 @@ +package org.citra.citra_emu.utils; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; + +import org.citra.citra_emu.utils.DirectoryInitialization.DirectoryInitializationState; + +public class DirectoryStateReceiver extends BroadcastReceiver { + Action1 callback; + + public DirectoryStateReceiver(Action1 callback) { + this.callback = callback; + } + + @Override + public void onReceive(Context context, Intent intent) { + DirectoryInitializationState state = (DirectoryInitializationState) intent + .getSerializableExtra(DirectoryInitialization.EXTRA_STATE); + callback.call(state); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/EmulationMenuSettings.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/EmulationMenuSettings.java new file mode 100644 index 000000000..9664f8464 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/EmulationMenuSettings.java @@ -0,0 +1,78 @@ +package org.citra.citra_emu.utils; + +import android.content.SharedPreferences; +import android.preference.PreferenceManager; + +import org.citra.citra_emu.CitraApplication; + +public class EmulationMenuSettings { + private static SharedPreferences mPreferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext()); + + // These must match what is defined in src/core/settings.h + public static final int LayoutOption_Default = 0; + public static final int LayoutOption_SingleScreen = 1; + public static final int LayoutOption_LargeScreen = 2; + public static final int LayoutOption_SideScreen = 3; + public static final int LayoutOption_MobilePortrait = 4; + public static final int LayoutOption_MobileLandscape = 5; + + public static boolean getJoystickRelCenter() { + return mPreferences.getBoolean("EmulationMenuSettings_JoystickRelCenter", true); + } + + public static void setJoystickRelCenter(boolean value) { + final SharedPreferences.Editor editor = mPreferences.edit(); + editor.putBoolean("EmulationMenuSettings_JoystickRelCenter", value); + editor.apply(); + } + + public static boolean getDpadSlideEnable() { + return mPreferences.getBoolean("EmulationMenuSettings_DpadSlideEnable", true); + } + + public static void setDpadSlideEnable(boolean value) { + final SharedPreferences.Editor editor = mPreferences.edit(); + editor.putBoolean("EmulationMenuSettings_DpadSlideEnable", value); + editor.apply(); + } + + public static int getLandscapeScreenLayout() { + return mPreferences.getInt("EmulationMenuSettings_LandscapeScreenLayout", LayoutOption_MobileLandscape); + } + + public static void setLandscapeScreenLayout(int value) { + final SharedPreferences.Editor editor = mPreferences.edit(); + editor.putInt("EmulationMenuSettings_LandscapeScreenLayout", value); + editor.apply(); + } + + public static boolean getShowFps() { + return mPreferences.getBoolean("EmulationMenuSettings_ShowFps", false); + } + + public static void setShowFps(boolean value) { + final SharedPreferences.Editor editor = mPreferences.edit(); + editor.putBoolean("EmulationMenuSettings_ShowFps", value); + editor.apply(); + } + + public static boolean getSwapScreens() { + return mPreferences.getBoolean("EmulationMenuSettings_SwapScreens", false); + } + + public static void setSwapScreens(boolean value) { + final SharedPreferences.Editor editor = mPreferences.edit(); + editor.putBoolean("EmulationMenuSettings_SwapScreens", value); + editor.apply(); + } + + public static boolean getShowOverlay() { + return mPreferences.getBoolean("EmulationMenuSettings_ShowOverylay", true); + } + + public static void setShowOverlay(boolean value) { + final SharedPreferences.Editor editor = mPreferences.edit(); + editor.putBoolean("EmulationMenuSettings_ShowOverylay", value); + editor.apply(); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/FileBrowserHelper.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/FileBrowserHelper.java new file mode 100644 index 000000000..baf691f5c --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/FileBrowserHelper.java @@ -0,0 +1,73 @@ +package org.citra.citra_emu.utils; + +import android.content.Intent; +import android.net.Uri; +import android.os.Environment; + +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; + +import com.nononsenseapps.filepicker.FilePickerActivity; +import com.nononsenseapps.filepicker.Utils; + +import org.citra.citra_emu.activities.CustomFilePickerActivity; + +import java.io.File; +import java.util.List; + +public final class FileBrowserHelper { + public static void openDirectoryPicker(FragmentActivity activity, int requestCode, int title, List extensions) { + Intent i = new Intent(activity, CustomFilePickerActivity.class); + + i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false); + i.putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, false); + i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_DIR); + i.putExtra(FilePickerActivity.EXTRA_START_PATH, + Environment.getExternalStorageDirectory().getPath()); + i.putExtra(CustomFilePickerActivity.EXTRA_TITLE, title); + i.putExtra(CustomFilePickerActivity.EXTRA_EXTENSIONS, String.join(",", extensions)); + + activity.startActivityForResult(i, requestCode); + } + + public static void openFilePicker(FragmentActivity activity, int requestCode, int title, + List extensions, boolean allowMultiple) { + Intent i = new Intent(activity, CustomFilePickerActivity.class); + + i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, allowMultiple); + i.putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, false); + i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_FILE); + i.putExtra(FilePickerActivity.EXTRA_START_PATH, + Environment.getExternalStorageDirectory().getPath()); + i.putExtra(CustomFilePickerActivity.EXTRA_TITLE, title); + i.putExtra(CustomFilePickerActivity.EXTRA_EXTENSIONS, String.join(",", extensions)); + + activity.startActivityForResult(i, requestCode); + } + + @Nullable + public static String getSelectedDirectory(Intent result) { + // Use the provided utility method to parse the result + List files = Utils.getSelectedFilesFromResult(result); + if (!files.isEmpty()) { + File file = Utils.getFileForUri(files.get(0)); + return file.getAbsolutePath(); + } + + return null; + } + + @Nullable + public static String[] getSelectedFiles(Intent result) { + // Use the provided utility method to parse the result + List files = Utils.getSelectedFilesFromResult(result); + if (!files.isEmpty()) { + String[] paths = new String[files.size()]; + for (int i = 0; i < files.size(); i++) + paths[i] = Utils.getFileForUri(files.get(i)).getAbsolutePath(); + return paths; + } + + return null; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/FileUtil.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/FileUtil.java new file mode 100644 index 000000000..f9025171b --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/FileUtil.java @@ -0,0 +1,37 @@ +package org.citra.citra_emu.utils; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; + +public class FileUtil { + public static byte[] getBytesFromFile(File file) throws IOException { + final long length = file.length(); + + // You cannot create an array using a long type. + if (length > Integer.MAX_VALUE) { + // File is too large + throw new IOException("File is too large!"); + } + + byte[] bytes = new byte[(int) length]; + + int offset = 0; + int numRead; + + try (InputStream is = new FileInputStream(file)) { + while (offset < bytes.length + && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) { + offset += numRead; + } + } + + // Ensure all the bytes have been read in + if (offset < bytes.length) { + throw new IOException("Could not completely read file " + file.getName()); + } + + return bytes; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/ForegroundService.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/ForegroundService.java new file mode 100644 index 000000000..31c415779 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/ForegroundService.java @@ -0,0 +1,63 @@ +/** + * Copyright 2014 Dolphin Emulator Project + * Licensed under GPLv2+ + * Refer to the license.txt file included. + */ + +package org.citra.citra_emu.utils; + +import android.app.PendingIntent; +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; + +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.activities.EmulationActivity; + +/** + * A service that shows a permanent notification in the background to avoid the app getting + * cleared from memory by the system. + */ +public class ForegroundService extends Service { + private static final int EMULATION_RUNNING_NOTIFICATION = 0x1000; + + private void showRunningNotification() { + // Intent is used to resume emulation if the notification is clicked + PendingIntent contentIntent = PendingIntent.getActivity(this, 0, + new Intent(this, EmulationActivity.class), PendingIntent.FLAG_IMMUTABLE); + + NotificationCompat.Builder builder = new NotificationCompat.Builder(this, getString(R.string.app_notification_channel_id)) + .setSmallIcon(R.drawable.ic_stat_notification_logo) + .setContentTitle(getString(R.string.app_name)) + .setContentText(getString(R.string.app_notification_running)) + .setPriority(NotificationCompat.PRIORITY_LOW) + .setOngoing(true) + .setVibrate(null) + .setSound(null) + .setContentIntent(contentIntent); + startForeground(EMULATION_RUNNING_NOTIFICATION, builder.build()); + } + + @Override + public IBinder onBind(Intent intent) { + return null; + } + + @Override + public void onCreate() { + showRunningNotification(); + } + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + return START_STICKY; + } + + @Override + public void onDestroy() { + NotificationManagerCompat.from(this).cancel(EMULATION_RUNNING_NOTIFICATION); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/GameIconRequestHandler.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/GameIconRequestHandler.java new file mode 100644 index 000000000..b790c2480 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/GameIconRequestHandler.java @@ -0,0 +1,27 @@ +package org.citra.citra_emu.utils; + +import android.graphics.Bitmap; + +import com.squareup.picasso.Picasso; +import com.squareup.picasso.Request; +import com.squareup.picasso.RequestHandler; + +import org.citra.citra_emu.NativeLibrary; + +import java.nio.IntBuffer; + +public class GameIconRequestHandler extends RequestHandler { + @Override + public boolean canHandleRequest(Request data) { + return "iso".equals(data.uri.getScheme()); + } + + @Override + public Result load(Request request, int networkPolicy) { + String url = request.uri.getHost() + request.uri.getPath(); + int[] vector = NativeLibrary.GetIcon(url); + Bitmap bitmap = Bitmap.createBitmap(48, 48, Bitmap.Config.RGB_565); + bitmap.copyPixelsFromBuffer(IntBuffer.wrap(vector)); + return new Result(bitmap, Picasso.LoadedFrom.DISK); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/Log.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/Log.java new file mode 100644 index 000000000..070d01eb1 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/Log.java @@ -0,0 +1,39 @@ +package org.citra.citra_emu.utils; + +import org.citra.citra_emu.BuildConfig; + +/** + * Contains methods that call through to {@link android.util.Log}, but + * with the same TAG automatically provided. Also no-ops VERBOSE and DEBUG log + * levels in release builds. + */ +public final class Log { + private static final String TAG = "Citra Frontend"; + + private Log() { + } + + public static void verbose(String message) { + if (BuildConfig.DEBUG) { + android.util.Log.v(TAG, message); + } + } + + public static void debug(String message) { + if (BuildConfig.DEBUG) { + android.util.Log.d(TAG, message); + } + } + + public static void info(String message) { + android.util.Log.i(TAG, message); + } + + public static void warning(String message) { + android.util.Log.w(TAG, message); + } + + public static void error(String message) { + android.util.Log.e(TAG, message); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/PermissionsHandler.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/PermissionsHandler.java new file mode 100644 index 000000000..a29e23e8d --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/PermissionsHandler.java @@ -0,0 +1,35 @@ +package org.citra.citra_emu.utils; + +import android.annotation.TargetApi; +import android.content.Context; +import android.content.pm.PackageManager; +import android.os.Build; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.FragmentActivity; + +import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE; + +public class PermissionsHandler { + public static final int REQUEST_CODE_WRITE_PERMISSION = 500; + + // We use permissions acceptance as an indicator if this is a first boot for the user. + public static boolean isFirstBoot(final FragmentActivity activity) { + return ContextCompat.checkSelfPermission(activity, WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED; + } + + @TargetApi(Build.VERSION_CODES.M) + public static boolean checkWritePermission(final FragmentActivity activity) { + if (isFirstBoot(activity)) { + activity.requestPermissions(new String[]{WRITE_EXTERNAL_STORAGE}, + REQUEST_CODE_WRITE_PERMISSION); + return false; + } + + return true; + } + + public static boolean hasWriteAccess(Context context) { + return ContextCompat.checkSelfPermission(context, WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED; + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoRoundedCornersTransformation.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoRoundedCornersTransformation.java new file mode 100644 index 000000000..892b46387 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoRoundedCornersTransformation.java @@ -0,0 +1,45 @@ +package org.citra.citra_emu.utils; + +import android.graphics.Bitmap; +import android.graphics.BitmapShader; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.Rect; +import android.graphics.RectF; + +import com.squareup.picasso.Transformation; + +public class PicassoRoundedCornersTransformation implements Transformation { + @Override + public Bitmap transform(Bitmap icon) { + final int width = icon.getWidth(); + final int height = icon.getHeight(); + final Rect rect = new Rect(0, 0, width, height); + final int size = Math.min(width, height); + final int x = (width - size) / 2; + final int y = (height - size) / 2; + + Bitmap squaredBitmap = Bitmap.createBitmap(icon, x, y, size, size); + if (squaredBitmap != icon) { + icon.recycle(); + } + + Bitmap output = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); + Canvas canvas = new Canvas(output); + BitmapShader shader = new BitmapShader(squaredBitmap, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP); + Paint paint = new Paint(); + paint.setAntiAlias(true); + paint.setShader(shader); + + canvas.drawRoundRect(new RectF(rect), 10, 10, paint); + + squaredBitmap.recycle(); + + return output; + } + + @Override + public String key() { + return "circle"; + } +} \ No newline at end of file diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoUtils.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoUtils.java new file mode 100644 index 000000000..c99726685 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoUtils.java @@ -0,0 +1,57 @@ +package org.citra.citra_emu.utils; + +import android.graphics.Bitmap; +import android.net.Uri; +import android.widget.ImageView; + +import com.squareup.picasso.Picasso; + +import org.citra.citra_emu.CitraApplication; +import org.citra.citra_emu.R; + +import java.io.IOException; + +import androidx.annotation.Nullable; + +public class PicassoUtils { + private static boolean mPicassoInitialized = false; + + public static void init() { + if (mPicassoInitialized) { + return; + } + Picasso picassoInstance = new Picasso.Builder(CitraApplication.getAppContext()) + .addRequestHandler(new GameIconRequestHandler()) + .build(); + + Picasso.setSingletonInstance(picassoInstance); + mPicassoInitialized = true; + } + + public static void loadGameIcon(ImageView imageView, String gamePath) { + Picasso + .get() + .load(Uri.parse("iso:/" + gamePath)) + .fit() + .centerInside() + .config(Bitmap.Config.RGB_565) + .error(R.drawable.no_icon) + .transform(new PicassoRoundedCornersTransformation()) + .into(imageView); + } + + // Blocking call. Load image from file and crop/resize it to fit in width x height. + @Nullable + public static Bitmap LoadBitmapFromFile(String uri, int width, int height) { + try { + return Picasso.get() + .load(Uri.parse(uri)) + .config(Bitmap.Config.ARGB_8888) + .centerCrop() + .resize(width, height) + .get(); + } catch (IOException e) { + return null; + } + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/StartupHandler.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/StartupHandler.java new file mode 100644 index 000000000..9112bf90c --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/StartupHandler.java @@ -0,0 +1,45 @@ +package org.citra.citra_emu.utils; + +import android.content.Intent; +import android.os.Bundle; +import android.text.TextUtils; + +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.FragmentActivity; + +import org.citra.citra_emu.R; +import org.citra.citra_emu.activities.EmulationActivity; + +public final class StartupHandler { + private static void handlePermissionsCheck(FragmentActivity parent) { + // Ask the user to grant write permission if it's not already granted + PermissionsHandler.checkWritePermission(parent); + + String start_file = ""; + Bundle extras = parent.getIntent().getExtras(); + if (extras != null) { + start_file = extras.getString("AutoStartFile"); + } + + if (!TextUtils.isEmpty(start_file)) { + // Start the emulation activity, send the ISO passed in and finish the main activity + Intent emulation_intent = new Intent(parent, EmulationActivity.class); + emulation_intent.putExtra("SelectedGame", start_file); + parent.startActivity(emulation_intent); + parent.finish(); + } + } + + public static void HandleInit(FragmentActivity parent) { + if (PermissionsHandler.isFirstBoot(parent)) { + // Prompt user with standard first boot disclaimer + new AlertDialog.Builder(parent) + .setTitle(R.string.app_name) + .setIcon(R.mipmap.ic_launcher) + .setMessage(parent.getResources().getString(R.string.app_disclaimer)) + .setPositiveButton(android.R.string.ok, null) + .setOnDismissListener(dialogInterface -> handlePermissionsCheck(parent)) + .show(); + } + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/ThemeUtil.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/ThemeUtil.java new file mode 100644 index 000000000..74ef3867f --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/ThemeUtil.java @@ -0,0 +1,34 @@ +package org.citra.citra_emu.utils; + +import android.content.SharedPreferences; +import android.os.Build; +import android.preference.PreferenceManager; + +import androidx.appcompat.app.AppCompatDelegate; + +import org.citra.citra_emu.CitraApplication; +import org.citra.citra_emu.features.settings.utils.SettingsFile; + +public class ThemeUtil { + private static SharedPreferences mPreferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext()); + + private static void applyTheme(int designValue) { + switch (designValue) { + case 0: + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); + break; + case 1: + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); + break; + case 2: + AppCompatDelegate.setDefaultNightMode(android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ? + AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM : + AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY); + break; + } + } + + public static void applyTheme() { + applyTheme(mPreferences.getInt(SettingsFile.KEY_DESIGN, 0)); + } +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/viewholders/GameViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/viewholders/GameViewHolder.java new file mode 100644 index 000000000..50dbcbe18 --- /dev/null +++ b/src/android/app/src/main/java/org/citra/citra_emu/viewholders/GameViewHolder.java @@ -0,0 +1,46 @@ +package org.citra.citra_emu.viewholders; + +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.recyclerview.widget.RecyclerView; + +import org.citra.citra_emu.R; + +/** + * A simple class that stores references to views so that the GameAdapter doesn't need to + * keep calling findViewById(), which is expensive. + */ +public class GameViewHolder extends RecyclerView.ViewHolder { + private View itemView; + public ImageView imageIcon; + public TextView textGameTitle; + public TextView textCompany; + public TextView textFileName; + + public String gameId; + + // TODO Not need any of this stuff. Currently only the properties dialog needs it. + public String path; + public String title; + public String description; + public String regions; + public String company; + + public GameViewHolder(View itemView) { + super(itemView); + + this.itemView = itemView; + itemView.setTag(this); + + imageIcon = itemView.findViewById(R.id.image_game_screen); + textGameTitle = itemView.findViewById(R.id.text_game_title); + textCompany = itemView.findViewById(R.id.text_company); + textFileName = itemView.findViewById(R.id.text_filename); + } + + public View getItemView() { + return itemView; + } +} diff --git a/src/android/app/src/main/res/animator/settings_enter.xml b/src/android/app/src/main/res/animator/settings_enter.xml new file mode 100644 index 000000000..3c216a054 --- /dev/null +++ b/src/android/app/src/main/res/animator/settings_enter.xml @@ -0,0 +1,28 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/animator/settings_exit.xml b/src/android/app/src/main/res/animator/settings_exit.xml new file mode 100644 index 000000000..a233b6757 --- /dev/null +++ b/src/android/app/src/main/res/animator/settings_exit.xml @@ -0,0 +1,28 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/animator/settings_pop_enter.xml b/src/android/app/src/main/res/animator/settings_pop_enter.xml new file mode 100644 index 000000000..080bc27c4 --- /dev/null +++ b/src/android/app/src/main/res/animator/settings_pop_enter.xml @@ -0,0 +1,28 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/animator/setttings_pop_exit.xml b/src/android/app/src/main/res/animator/setttings_pop_exit.xml new file mode 100644 index 000000000..4fccbcca2 --- /dev/null +++ b/src/android/app/src/main/res/animator/setttings_pop_exit.xml @@ -0,0 +1,27 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/android/app/src/main/res/drawable-hdpi/button_a.png b/src/android/app/src/main/res/drawable-hdpi/button_a.png new file mode 100644 index 0000000000000000000000000000000000000000..f96a2061ef3f909b32fed8adda5494e290ad0af6 GIT binary patch literal 10674 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/button_a_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_a_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..785a258ee54a7fc735d9dd18cdacae127bd9ef8e GIT binary patch literal 10738 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/button_b_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_b_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..b11d5fcee19bfac7cb811ab0906bf5d65fb6291f GIT binary patch literal 9555 zcmX|n1y~ec)c5YvjYxM2NSAa-tCWOvFWsx{mxQC4$e}J1O*bjlo$Om{@+q&2xm~HGFoZMwu(XAb<%uaAwRzopO zK}}C3J4Yw=Aa6UpAT52{AQxLnIIFxIzD$4=7{JXAVa*)i=IZVv6(Gy{KjTV)|Nnh0 zz{>nThag;JSs(v9A+wRD4zrSnw;i(>|06zIAyHvwaY=rmM}m^VqP)z)fkC^z~u@2-}QkH{}&-UcMukDaQ%h!R%i%>8S+H=v3@}QZb6`@*-68?{Mr2c?-^6R zpFC5&u+Owgo-ZS!7Nf*}S}|i-zr+b(oc~%gsA1=<8>Jupl%f>&)*^c4@tOJRz(=*vG1h!V^rNi^v)hV;aUzu#ZI793G=4kyr*D@E{ z-m!2|;1jm~UQAT9sE^=r5&j3vt-8BYd-NFwV`pX?4N`XRg4PP^)QPF90E>hD+!>Z* zesyy;lHdMXxXWOJzzBIB5mZEj3)PIPHH1>cjY`K5+YG)qwNJeW6t3UVWbz-Yt4>#q zx~CQ;h>5_EwGC4}I#C^fav;mgp;?dtq)HNP2$oI$kYfQ%xX;l|#Cc_g_wIITax`ta zJG(80qR-!v?XwEz1}p^{8$n#;pB3IwI+{UnEF{y(-Pyl0{5=kru&48W9P0JTaGyi} zREG!iUunCz zcUDg4h;s^Qy%&)ow#o~^Fv7^ksD#npD~V^7Yg9R)3$B{#3qD{=L=YJZ&_izVLm)}y zJ6rhblK575HIzcvDsfEmNz`q&TfSD2o@(xp(~@Z|QqS69UFTH@j4sGMQGF$=Cf8%8hxqF9f?L++=VkjIN6aZ9lg zk9*Dws9S7;jQV&@5-Zc^p%yBXBOH&*aXYchpsotVk{EGIJmQ@4MscS4sZm;Yak$oB z(x@^?k`fXU6fL`5jY<9xhTz9fp0VQbi2YqBc~8#vvhx1Wz`Q8?&qgcbK9~{SHRqyF zU-o~|CVz&+Qb@5;eWO_F{NKx;n0WFkQ}tn(VVT8Hhl#H;^z)Kywdvvhlt4oY)p}~J zj2uNe13MR>>ujU(k5xZ%P#h)RH;QAqcqx)5^9&}T+qs=bNuUC;Sj1j@*7so{K1r^B zj$4NI(43HUdNnZ(_6;MBIw3Eb87YFShOM*4FsUgQaq%PAaqp?r?NTu(uB9kijO&xP zLaJcy${~Zx9|FQ^mqWydT=$=pW?Y9pn8(!DNicwj#Z`yXkWC~NtKLLMrBo99?KGY? zrBlff=Te2%L;PU_sLe6ui%SAjtxKeedb>T6)h9kd6Y>Vy$joFx_3)b>zQpR9JG)*r z8=ZH;OB=Gz>ZBf@JEc()2?|0=f{g8l36&WyA=G>Do)5%LUq7f;^c`!>%fQ$*?& zk0+~gY|i?xM@M|fcX6|}%+7|r)g!2lv=n#>iAXAIjy6;jYUwb3o;h3M>8ZS^X#etN za7^|3f=ofy=9)3%fJZBZ4TfQSf5)EjlyXq5uNHQW?z4H1V|SepFGO0R4ZWi{pk2#o zrbMQEMPb9cJ|5RPVrJorx!(TLE zAM+;%!))3zW2~2Vh8KR87gkGL)Moka#_)k?J0W)&o;0i+bbt4CqI{Z%7Svs_MeM_^ zOhSk!VL7?QYc$nR6R4SRYlL{(Lsz{)N}|oPahz+uz!bvOSp|>BHn*W%9hNBhd`&Sa zPoBW~*${jyw*RP9RYJ&pBF1je`$ksP)9a1XNubnm z+v%!}ZRIM}HvB@UHjLLavVWa=SCk;H(?k%#hsQzq-{Fqxj`d{csh>k@r)hVd_M91p zb=b&xnY|@IG1!UNH^RQ$<2HLbeCSJ_kUK(hjZ?bltvaX*xg$2dKK=DS-xjgF9d#~s zI!wwbUwQ-!?{++T7+p*%QSePbRSIA0buKOXcc0u)u}AnPu0Ub+)h;oSz(Wm8&j+ve zb?4~Gzavw=EPYI~?;i_0M2w_mt$HOCeJW5ysVGtQgh!5-tPUcu_Ma#_-F%43E)MXd z>|tT&eIqjF^z1LRO8L|^EC0YW%g!__x{PA&(`HMRT`knrRI_HRM^f-Wc+uB;M^u~v zAca&5Ls<{2d`s0fN}V00@gSXiuPwK)j3f=(JK{UXK!`mj_huN&ipN0XJFYN+8T8tR zU%Sr$!nmmWbo^u!jb>`!ZJZst`%BdkU;-%CRn7rwKG~r0z*ePXbZ~#)(>Wj@U}dV- zwzfnqm6%B`Bw%CYt&$Q-9gaI9s(JML_wNgH{%m{WEVAw&qo`N;+N_+@XWA!GW>}s= z!k0{MdsM@b2r1dac<9{r#nGB~VAajc&6;w8|ocN=FwVd%oKfeC;c*o@w1|8Fo1PA`pabvyHnO z1Oi`c&c0Jwy6$dm(Gp@uigj6y*yfdyy)0s5yHn}p>Ek}V|0)r}uTUZT%=?%rw#>=o zE#)`PjiEYTX~xv|%Lf57b-boyqI}eZK~){Mm!GS_i_d&8x~)Y1_8|4{_S|_Y=JG|g1w+{J zs9N=0d*~G(ow&Q%@3FBlip1}_#)cJtgwnW1IMb9SIN=o}AF(8o$%sPvmFa~L2!yhU zsj2j2m3iy=YPMzjru4$a(7J7{QT_Y(oNM0A8Mw?b^zC)-bvT+Qk3S9H>fhR--fp+p zQ^!nzEqrIHc0;`5;@7bJ*&iSAoU&ZGuJS!&Z4L10NJ<&Bi=$G!++xj}11ja6vF6f6h9oyr+&7dBtzuQXd575~awppkc}L z`is<30~<b=m7x3PX<+olUMo>#j~;T26y;u8xCOv4;4%ihh$Y-%Zl zX8v=&4l>vK-8_vR3t{Z^#DIjV=5=7W$&u@ zCI$vZ?Qq!X=l7ywV!w%qiL-)5hcREIb{xTBMiEK3t1>p^SXp+{?oFoE<>gLc*9SlD z&d1)|9`Ax2nzR$n&BuP<)zyW{(zMClZFg^vkq{HMS6-O@iCI&?q@If!7c=B1ye^-jh~;zVVXc1( z1(NDXSowzbJ)7A_1_lNZvcadvdsDR~Y=+`onNM>8hHW2R$du*5{wj$4#fNeN@$3C{ zv`@w|gH`RTMKw120zg=c)F0`3*fXMh%LfjpFoVsp5<$}r+7tr>qdW#V^Xz*W0`tp-ksl^C>X zb#bYfI;pP6=eKvTB9JlZF1iC?uT8CyFhE*_xgm_&97nY41BCXozdb(Uc>;Z3qh>w8 zRTxt4w}#d1BMJ(Nz2zUNYPPjgag*BxUYmY+)-2PD*whpXxCVE6$ECX55dUY-o`pV0 z&lN7s-4!WC&$Tv@^nEewzoju>f7JZ}lBYwkSgblG%8F7CnXa=F+n%hp{4+V3ozqVw zOsFKHDRMI;jsEbNUW+}M@RA9yh%yt(?~E`P*BGO}{V%(Hyv}vH?s92q>B&cFx7o7x z_W2Hf^!z+v8sGDf_Ixr2J7kP&awRq)!!)^G^vtzIJ$1}mUq3(9EwHtpHdLF73JQ|G zsR%7`%6kD8cK=^G8sTk5a6U|r>DJuywDgV zGW*d2;THogB=iy^;s!DcARp+7C*_Vul%!90XD6RqT3VLx++p&vZ|H3+hOmggV%8zg zarLnXg~QoJL`BEf{aR(UWe$2yn&yMHqt#OAH=B3|@+!@rN)bEQ9xe$8R z#t0bv`DojL1nh$s3xO3UW(8%JOFWSE$1>{7yUq~(0?Qng1ggQ@8 zPgw@)E?Zk$9cC%N56u(48D5tKthO!Cyz+|U^&>au=D!I%FW%{LyDYSanu9p%C0~Dh z@u}k3gY-@9@XImz*^cmVZChJgCH{+-!pch6*F^;75CdYHl+rP$u|~J5*1Z;ypr9Zd z##D#?WNyyxI^J3ISu0q@uK>F!-sgKiU9B+qxMgBuvh_MIuVQSoJ`ix!TOg=3C-A=m zWU1qAefRENZEI`rem_t3^?QF1B1Z{&V$-a5N#QoUMc<-bBlP#QQ+k#U>Z`VAY*S@V zv9br=4U4vbns2EBSS?y7;t50(2_a!peM7?uMk7EaI7NQ0MsGz$#i1C0N04`)PGacX z15W!;Y#0Dot$h*yW#k|yvCefw6ow?+`wo_Wlq}PkYT~Rnry%nuX?zraMa6jJm93rx z&GEdb#N|l;xzctvf8_y!H_QZSD=+6RO?lRjN8l;VpLW?<_N38&*tIbH+ueJUXVNx+ zJm<^G%KG&mW(J*3J1ktypS7P&3>8R|V8J5twzizBP4?H4h^YDDmj+BGsB~FUCG^Gy z_2uvCu#-uL!oam|Fk=Qx88Fji5TgF`_uth-kaVjs3RzIwg*R7c{<5c2wyhQcOVJaK zqO=^rmChgnI522a|EU%M9oLmDf|9V-h?fRG`XRa%-OeKiSZsD7?u3hW>r;{ql=5n*;02b+xnaE+gF^0 z0e_!)v|p_KqI=|OG&46hm#NM!?EEN)wn4=)ZwkO=UfJ)7iA%!n952Ss$77;(=5&Jy zDYv{bCrKRJ^|~dHBv(MmMnb48LkbSBJF*!aSp!inD3ZUh0mx;=9%O-d8v6%*!*V(+rx^(f%WZ=q2 zU0=C=L-zyr?(XhpI|%rCRQB54#M0P!6NJ_!TvAjNu5V}<>?3PdqA`L@VuP&mti{=e z$1Ag@|AY(2E89#Ih!&4Ju7PkoFQS{ybH2I>yOUhcAM;$zG_3lv*Rnm4AGnsAcy)DU z3+7+@^ArQb!#K;X3Cz~Q=a-lZQ|R&N27~{fgW}0;-$0o{Zs{i(_oUMNSPJSgAl^Mf z%pD8p|9s~Po@K9XrioeUmS;2rB{{?(?MHv!MG{uyGmypSf^ONaN(7Lmcy)$Gzjl4p zmt{P)ySqF0>r+ppXw)3xO;UgR?6N-+`%`j*mUc}FBf?X-M54Uh=}rTqwO-XnAqBZd=XP_mEbD*(y^4J7tYD_VMer;rccDu3@+7_?P>qQ_ABX}e`&c9!nw z>Lvm#@11uike<%iq=d}nY;(-xA9Q-A8j}IX=;`St53E*9)!7YHH@VMUPEzo^i285y zxD*>y!$~9#$*J2+{pKJ~_1DAWhzO_{0j?COuRVkU&jgZF<`k{?7Fp)h1%$W!01d81;3G`qsFLOTALda6pgD$5C3pxRYxm?Lq_F&{Fv5Hi=m?wc z7@}tw5ejy^lsxNNi&A8_=t&etR4ghKnt-J^fj;wCXup{n8POSBKhiXreCI?91YEqq z#}~f~LQkiOYK>g`*IGD|B96OgCs0`Xg5FO{Z6bj10M^=nu`{9z#ETd+vWvT;0~9i_ zRF@N##`lZAnp(G@x))>VJHjCb)J==~S2sa`R1X)sB9$T(Iy1W?Xd0`wtMs&G8?Y~` z2E6cVP^zSnaFH&^4-`oWy?h#0qBV7%opEk^d%JSgdiZpso4B|*4%D_{-wAISc4;Mg zI2NlB{}e(%KvV+?rfM(AKCjF`Pj4CefbSibH9eg?aS3cgIfS+0u{~5c5`Wm6aU=h- ziE&*Xax*=f?QusiDX z+Newsm-&jn*wg0pjB8a^j9=pK!509xAv}gvmGP=2oAiV;e$8f=ot+9~f&(@5-&Cbo z{3QI7C_3-4t5iK@rG&IpxqzY`{qH~BCgTn^Beu=*s14S_Kz2G1~rWZ`<@6Fi)8taeU7kLR}rEhS7bZ@IP z&U2cjf0B<6rJkd((}lzIHRR_jjs~#u2WBnLCP8Q8485>$2X-94(AUo}?HN}6`a04U zO)r4F>Dw|gh@oTwml74+s!Y7h?+x;jTw(zo`C^oaM&eUdjsX?eRrO6e~ser2XKp?!j~jXN=clJ7C1hm&gaZ?4esDadZ8-~c zD>Xg6#tPX_A>B6csf2F z^)-L?e(VLX^5k)Eyn1O8JFe!?VL@YMn(Kake#9!QD3qBQ69nL8qnq^6VkF6)g76O$ z8oziEWau(lCKob8YWM;Agoft<^P7?nPI-P(1&wtK>$>V%y`e*r>!NPcb*q)8?#-*$ zKrAI-;1C~!0IfS;g8-V;+NdnE0r%dU!XSMbtN6B8STu}DcmHDP+%jJSLRmv4K`|{* zY5!74g8#>8i5gp@8_DtU@!$hjnZ^eTAAsoLHLhc?vH6~`2GBw}Wb<7%f9p=&K-TZc zNke}yd0)W#U(BkW3==Ru1Jim@WoFz2^m)lY?S*c$@W`~L&X|V2dZa_Nqv$7J*r|*{ z`bP|)oJ#(vCO)B|q4_!0_-PKbcCz7fX*6njb!^Sg0f!MqE8ecHtyuxJSOcVYaYe;L zE8{F*&`$ZM2vV)7O{z-d`uY~e$H_$ryW0E5KOmK=be=;Ss&os2lsI!%mk|Ekn! zZ6zd3z*Pr~e-co91^)BR^MZtt(>Mg8q(bau@fyICkPs7>0okeAw^X^9j`|6&)Zx;9 z4(yrNFR@9PHkZjNV8OrCY9udkhg}W)43nJRIN|rCtuxncer!yCwhVf9fppY$vF`aJ zJAM_PUvjb*XuVFP5~#ul$_>Ey-QmUhn>!cKY|txwF8kx=LiRtbzqT3=kmjB1X*ph! z9z}B87rdo|Y6fLMso5F(0XHQ9#CUbfR)yu)^S_DcNnlpCTB?$~d=;JpY^nsk71`bTvAlosifw!1Q}8utzWtdS85vojFVWv{;U#TQ|GT{idPn^Y z(T)iVaFTwGsIvz(*iYEGpyZJCadnXC#IfDb?19xiV9bLKe{%ZYUa!lCqkoAn zxMF+-@xBMQ=i29>qP_1G9`*w>(K6NyvxWdKeu6bVN|*96iww5(Rcu76bGT=-SqqRK zz}E%dgmusfN=r-I0%CnS3+UB*5wzYkXA5P6Q!w^)xW>~oJu^SHiWEYGt?s-kaMoBM z1OXURNh_F7pF`|{__9ocQ*Lt--p73FwTDI*Niu;r)fSVE@Uzxz?+H z6ZLmrXm48v7VnwBe-mt^#IZ_wW!A=7=JwNbKWoxDe|31h8bk+p|FUt%kc-qGC(^TF z^=zGMFOc^4i|Sr72Vh!zQFph~ZsGIK@Cggs5Rs5@#>T{uF)%P33=IuA1_uYP0Dpnf ze<=1UG@%JJ1-~sH=+Bf44m9vHhr}&)3Fv}1w7ruH1c&N2bpGX1R0=kWH{Ds3Yi%JJoMnDMWpbtu{A5l zwE**zKlwR(;_VDSi9YPq6z9}LJT2YeTOVbzUqjy#)QxbJ(h^t5OI@q%! z=Q^bo?hEg7kw^Ey6yqEYdl7GB^xmIg!3PSRi{EjH@|W5KZfg|E=s^)|W17tqxjYFN z_Z?MLZzpoUcDjCJyi3T)ohVT*$_dYZ!HF^Gc^o^<8G4JC8#aFLW5R_hhBMM3jZNF3 z#}&(yw7l6U%7m0>jpWD4bOa{cUPDe;ewgj`MmN_zt~EvinhUm00f#G_3sNM}HKEhn z;uIs@K{5VP`gNzeAN0RsLRN26AswpT82I1KtXcO?c{E1W;4Lek&sY89v>T~c@wpFE z;|XhU(xN>q`utBOhf(y8aXDZrw>4>L4zvNUWLl;#C_8cYQ`L?18;lHBFxKHeOcvkw zL0*fm72lq53Ez(*W%-~|YxBr4ZlNPn=HkXy2sn$wn>^-SF40BUQ%^L~X5P~;piPDG z=C*cll{k$mP31s0gQqk{POHa3et+ET2Gu+dJHgZ~s}TO4uxZ5_|J!0Qc5n$IH3_Rh ziF?vFge#!v9_U)-VlvuO`pPv6GQGCC-$|0@_Ygd6Q2X!JPl~&g&2?b%d4AHx43-@3 zHAb$Y%>&)Pi%Llyp>nqyA&rkWpp1(4NbC$;@{%0&h}TR38D0(-LmWO7*adO8 z-fNv$aWf?uM(KRt>uEf$nWTSu@#lI#k#UQ%%9y@=GYauVGG3Hl`QZg${M!YJNMVpT zXgF+0QL%JOV&YKe-%<&C^dS@mzGF!fBK6>>X({SwgQYqaPt>J z8h(gTs<@xA!p%ZX`D4;DD(P}qa7M0U!HXhBcXGMjM)hF=0Cp_nZZE~vq!)e{GsSNNQuH zQ>nJT;3HP_I|9iOPo_F(ITw%U`h5;$sx33CQRYoEuG7L_Md2d6(jg9|C2%;JE{XQ5 z&!@<^U?0+-Q;asE&p#;OF;l(l6o$9eQ0FpK)Sc1Ay|tsJh>riFeL?mEJRI^_oT{#4 zBE1cpAh(<~u8T#eb7Dkn#WhadN`v#XZr9*^qe9wO$?`5+i2Pqj> zjvm#?`)bk8@%8la^^EAnz5P*l$EettNbKNYhwfO9yd&AF#GZa>lqU7>S*Rx}TFO<5 HRxke_Y5P>P literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/button_l.png b/src/android/app/src/main/res/drawable-hdpi/button_l.png new file mode 100644 index 0000000000000000000000000000000000000000..e19469a7b8b5bb40a2807bc4186134ac571dd7d1 GIT binary patch literal 2738 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/button_l_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_l_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..280857f642e4dd2ffbd1df75ee30bb6de349deda GIT binary patch literal 2795 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/button_r_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_r_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..c47d342535e994d1d6af2ae1195e38558107b308 GIT binary patch literal 5784 zcmcIo2U`y%LqJEPIpFn z@MtuBj{yK6dalOie&*QQN_a01342E`2ZBVPhd1~h0F>1Nz3uVt1V5w$!P(VQ1+`Vz zghIMHs-Vo|u~JxXO@fQ-&0rtG-C%uVe6Twn(j@QDCB>d__?c~G)@g7&9MeZO)nn;QeHwq94{>=gG6H_q!pwvGIC-_87XPB zq!e0GT2@?2T1iSlNfv|r?}k!^A(ed`os^8UbpC4$yi-BB`1yG&NlFF;1V{wPN_hD= zOG;xf7)dD^Nf{Y&u!Xp9kf)!0ptz^+l~aiS#n2-7;(c7b{an2~k*ApU4qpC#DkzlX zsS(NlS^xa_t7fP+z2OT#!YePbr*9@lsn!_TcWv}{P9 z&2)TTATEbso!4hUx|E-i+$Ak)>9a0METNV9qNsma(dGOPUXC7K4JiBJmBTA6qKG(r zg?9V}($$J*R&Cx>)hX*k*cbFOH@A3c7!6;hbT-@qr-8l*k;072&3?Nd#-f{XQ$$4SP*%_mjHed?P zq7jC6y*kNYkYYj7WX&IE_}d7TBk$ldJpdm1Aw~+*Hr?vLm6~h!NH+qK1(l&F1Guv+ zAC#ZzEPD`e1&DsTOb^Ke68iVm%3fnRfPNr@<`d_4O|FQ8p&7~8zNT&?GqmuuIEx)! zTfnNS^SqM*Tr)J_1ULeIK@q82=WWG2U(p>Y6P@`;|AY@|+pY@I!y*|O>4=>Zh&E<1 z8asB1yfd{e=*!kvw<)RHi1-e&PVddF&H^;ObJlXglhcyZOnMfaf+96u%(x+Y{Q82z z7*UK8G}ZIR^x=-8`lcDxIv{hEwnzWh_b$Mb;dI?Vs$U1?Mim3V^Nrjx>k9tC6nO>23~v6{bgE# zu}aCGOI@7U4=5;ov~EU;%K2hPc_L!J!-avaUp0hiuC|KvkvGqRZy%D?m*uZmjeg!> zqkG$OJrj<5F|97F?wFXv7V(Kbhe6|S%iGDf_pzg@tiwjt{Fcy5c)KbnV4gzPOTO1j zwo4VfHx=!gO7Oxz=a0jv-R%i<_S`E3h8c=j)URpfPMO568?`6#xrKd*QcbF9LEsBq zEe=CxyB2-uwXji;ZM9n4b3NfHJrdqil^#s!5a-%NndRxruqb0~!)lMIc)`Rv0MRBd zKd&4P%i;X}3YfK_?54g*&^ETKIX{58$_~>JeaV@qlWXDY>nq2T$iT_Tc|7d$g%=i8 zpKZ`}o+V~X9hp^F+@r$7x}2^zAn&nO>$$WWbmiqO4h9B>T^br1{3{9TTekIq_w(xN zLTFKgYw?{6d;=J8cHX`!~c z0ei8Cl!oT!=IL7hH3#RxjFVcADN|e9xxgZ08Rphc)7L7Jr{0)m%vO4&Nz)J1{MbGG z5vaVmoF1}!7`oYyo>Tt2(<}M#=O5};=6-O)@J;^jvc0ggjz;uaZqI=s$UO2wpw*di zxedeE2#NS`W5Y6Yxz=x=oX1P8`}2*udlr52$xMG!9{p_VpK$)(@w&Pp*H{!+WLzvI zC-*`g-Z}|(D@?Nf=XFa|5+m2O2kX;czrN;Si8*;8kV>L8oFGLAUsPrsZW69D5c-@) zRxh0zoBUeI+<{Q$NnGEja+sJ1fSq;>nNCGoj{D2L>U}v4__#$<5O}hfto3;R?(*P1 z^(1`p^4vkkUVj=Iy*^p7#v2k6665aX=J4X&?e3Dt)$rliN>++HplTJHj3Ys$E{)20 zn3x3N@pu^!lenxXxUf8D7KIT zAu;tDy9rt%2nt4}>1ga@<96NL$>tIGfk@`yMW(1nu83$tsvy7aqvB%FwwuhGFBTRS z#gkK0YY*1HmIb#)Gyg6!cKh)0qvZQyQ3kCPT|@TSu`z#-jmZlC7#8ly-L~_0j>9Bg z$%1~L2=ilWlw!p_LW^ z%i6W!3B^faM^pIYSiaa@=x{twop}k0-=23OJf+dvcsXwMd_`C0nN_m8k)lp zVEqvyF?^7v{zKo7(sjAB=FN5nMI|L32u{usHR{A*9jcn?kRV<+xGzy1xhF~U^^CMc*zE8{Ic&83>xzmBL*Te(IU_{n<*mh> z;lid+UR}~_kEx^cca(?Wl)IuY3z5pQ@EmHl5YPzNb%ydjhuYD@Tcu9((d?tm2DST6 z_(;-i!PWxT*^wv8Qc_a0lar}dH9iEfxB7Qkr{4J9ee|AfMu;b4Fwzj{drrU!5{HI! zZ`9q;(HXJ%xSzt8S7TLbY;9dqf-4tvN_9%=ft0r(-J*{m^^Eg>4wcyGDDa8Or*={+ zV92;I{{I?3L?!)vb@8fLFB!~^k*{A7kA=S)()K;0HI$WOk+#d;x>(;LF~lqGki-4 zw9@@`ycFAkMP30}3PMvbx%(royr8(Gq-1hK;NK@&sM$odKZ^c)>l1vLgJ|afQRuuA z>&S05dCh>QP`hY;-S3qi?=pjy-i&oSl0{$j&a7y;Afh>7QIEK}xy|kt8H<8x3-qa6 zatI_`)6$%<&IVpX25P>HkH31Rle_H|zMGcG$-^_CSfK)F{T3#UWNXF@KnxK07bkCc z;V8xjz`;V@p(Z;p%HK%st2VPKOe-2ryAp`qbQyTkn-^UaaA!AGm_&^BO^pl~DbxD@WE zIwvWFRqFoMUk*Uq#N_DS@~dm&xh%uh4yKv=#;PCg_ z`1r{|r`qh{!9wE4n$W`?VqGQySD7QMoOH9zHh49^)p;O&wWzezMq}a8))|(vEInDG z8lAUe!NXJj8a25DrbjN&K~GO#Uo|oImRWy9uAjP+oA{5~ZlCPh-sVi52%}dB^6YHB@B37mxxat*=MFXlny9uB>d2+v!TBNyHSZNa-ot9KqAWvU$wC(iP6bN9D7lyTxx>~R;YkC|>fGA~^f0feOc zCkjttHowSbAGc%{f+Z#J*UGSL$o{4Z9GP4EZ=%EmKp2QHd5(|!+zkjI7SSjcwX4t=gkC*|gT}Mrq6an#kSyURU_}l)KG=58H*$qLDAac& zZam|XM&L7U@B}%wpVo(s=^EeGmsibnz-iu$aV{?2nVp^eK)~&NYmI68GC3JMf7$?a ztBEm_@mUy~o~%bFH)m%G_Cgm~EKNE(H8qu(Bb=>;I-7n^PcV7dQ3l5yr*&OOKYeAQ z!hO7%_jsP6$<4(jwx~E5AH)y33d9#%w!(PNQ<8zc>)Gle>V$bV`RlASLj{xfCuk{t zHRa9Sea`!4Qm1QGLiRrA8x`?YA+Z;x z72B?JS-zW$Yy2Scy1*55ar@T(c<7qt+|gopvXJClz+Bkyj!njZTXOryunl();6?4sjbECBbCTkl3M z6<;V}grk7XNb{#oMj)TrA)+tAqP}}I9xmPJOyq4cHZ!{@;UzTWKV!t+PW_R5rxa?C z2NWVUt0VTNHq;?f*wlhv zg$kR>%Y9dVt&Y-c2Tq&)2?j+DSd%O7FLclX7F@YL)xHUpvzyv7Sk=tLi}CH#tE2Cz zVXB!`%9nqzpE>AwdN~;=d}y#JED1;JhbBSomexn#-C@Os8j<*&5Ydew4nMw6FCK5q ze%|5H41-W3I4BzZ{zRXpzBkR+v!A~r9Cj>sB3f5gT*6O|e#e1j%Nxv&i$9IKOZa0; zN7e*GBKnA(3)>kOU#FiV`Fce+`F(oZ%s}ZG92OQw*)#IP7 z;T;G`-ZM)B@EMRAY1FgFzF&PpJFMsTyG^JYu80m@+;93D)?|+e4q8TcATEQ%Q}OvT zKdIZ1Kds*glSOs}+k4>e&kSlp%Og5MIWDaI35N-|lzflI`lkEp(?#@rGmR;wO>qIb$bF7Dr}W*+ zX;i8e_Z4X$XOT9Upadx@FyMCkzH-m5u^|1hq)R(Vl=i#~jW%!=29T{LDCgeO3pmm%0?AOKn3)Xm{+Wm7 z{x`aeoHcJJ&Iv)J)Ny>|`sxZ_l}(q!I?qc2j%T-ln=~sVz$)@4OW~XnjztW(5AZ^6 z>H@WV!JURUq8Ni`&HiJm9-6quc0SgqR{+;@8>j$OA6IYkY4D%fqA7$DBD+Qin()VE zkmL8%JWHxCltPG=e_6P20ayGlq@E>fFsy|cI8Ra26q8z~BSdwLI6%zl=FNaVb;oq2 zu4vOFt_XziCuRp|cK1=$dGhOO^o|q23mhD_are*wfP_+_B_Dm)N|ufcS@9B^J1rUr zyhwSUydftI09i~Zfv@l+?w;#;v@bZHw^JUkte9>oH$D?Fjn5PVfO#l!m+igVhnD_0 z?HLOcjNV9hdToSBdO49dr+C){cvld7MUVenz|lfxgt-%W7NdR!<*sE?;Fzt;)}Uk( zd+o2V7Sq;Ws3Q8Un$%msdxmu$65HHnG7wQz87syfkTEDngaBs9o=>Y$$|C=N{|L!l aCu%@_I${LkQ9ef+97-Cm;wYphzPjA~m!$2uPQ7 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 EAMXqA*8l(j literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/button_select_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_select_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..8ee4714199fb357cd42f25e5bcc3358215b9d852 GIT binary patch literal 13344 zcmX|o2RxN=`~Gu|%`sA;gN$U~K)_$j(+mNKV-zBzu!t z_{H`?{|CD@sFMiIN;i4nYv5it;@z@U`ROKPfTztTp9K0zoiU z2W@?f{zElMD>oND3u`w^8$Lf5ckn(0Ny+-TTUa^SU|20}>>OOB*|(b8*;yT|rP=jF z9|}BlSFo{nP!904c^sgwZ57~Tb;p`rR)$>4PZHd~#Rg-+>gVF@>LuwX&HkVJN`mh% zUgl?K{m&&BCuw%MiwCmmKh$7VaPzcb73CA-wGtE&Vimu`CnzRxM@R(4DkLB%&MzR& zFDT3_ASfvyCMkS}^?(1^Wyo2jJgsddweH>j-^0L9((LvajJqU1zpt+^pRX{Vo2MPW z;GH{n_yvUcg@ky)6}(>lt{4kHURSRh7q|HDJ?`0fS$R6RV;tOESugHsVd>_Lk!EM- zzjz4$|DFP-$Nzux13&!V3fZ`VW$^^_&t@{;f*@8%<({0j-|LMme+<(|)>eB%%I0dT zQLDq=tsm6`Xn`0u&RJdy>aRC^uu8;C3^kwp)7i+&5LQcjK_ege!de+|^yG;W zoP&GY-4ekNOCQTde52Q}<+EXvQR~*U&i>hZ9bKc*?}>(5suhEGf@?9pBjqJChkWgS zo7+{VT*XBmL^jUa5SSCOLU@<}ce__#4D=#-tGInBSr3UON9!I-le5BEO}D>u!=|k1 z&7&;|X5q82S>2EZEb^auBp<;G@{rWO%t=>T(!ytSEPg}Q=%<&6Xb5PaS$;po?m5Fk z(F`c^8B|21L1|8my`_;a9)`RNV+|i2HCQ;5I6<_XS4HQxOK8iz>+@&Em6MkSiIu+= zhHw-e9uOCVLAayh;Lk^ikTm?*M#we-*-C=d^yjBAq*%i1Mjtc&b1w>?mFwXlhRE=nnwPN=INnd!degZf zMywYsh`fVIBSIt2^wY5T(cBBP5s40h2U3E9pjicIPUZFlhdU>k`E@J>^p61IvNw|< zHykRxo+?bKgAjuP@N$2YpaTL4si=hvfv<$H*Cew;xYIysd&<;L=}vzLa($8rHK-pG zqlK})uohW^rx~OLH4q<>`z5R-zTzPbhP7YKHn#wBEY*Om+PaWj{m6&^D^Z^23O7eP z{Z*Cwd+4CiNm4r*@}{UfoS@c5f@+o*+M4}y9LLj-q3zIuO68{0$RM_b^NhI!N*z)k zyvq9QI`3K5?%0u`OMG=WZ--isff?mE(`y&+A2pWz+h9H7>gpl(wtI{zM0Wow0 z5@yF{YaA&~+G?V(FK~B8tPYOASXRV$(K`2jNu=C-0w19O3tGGYZ#}6^+ffI(61xQ4 zmE(FRlDhc26Dt!#YCk*s6lXy{kYrF~nNAKbB6R1%_M_cANrz?2M@|+ZCdqqVwev$+ ze$Gni{6BeoVaDXMRCvR4!sUChx@)QYh-GUl1`K6ap`6`xzu0(%F;NHnNC_GX8)cQV zuRGJueJ5%zr>Fr#T50=SwqM|e__5~%$f^mlRR?pfx_iicIcCOB(CfD?RQX?;?k#X$ z1Op}JAKYb@+Sua6=9;o}zp-M_mBN8%EV(hc=2# zQQ>_l-$*)Zt07*<0diKG^GTX(>>!+f6dF>c7+zYX2C zpZo~bW|&#+vf_#{6$I0(-k)N1p&UJRh6qk5u2*5YsFU0=>4vQcJdI$M*4~sQZWnE$ z;zPDf9CgD|1pb~%N2EQvo}rCRjH=`Up>cdF%%vH!kGk0^SWO_X6^dC!cA zOfO<_^L4GZ4-%RjTpEw^|=&OlmGx^iiat@P1=nJ-kNK`nEJTK8wGnkrMW~Lox#j^A3Ddj zwY7u6dn&mQEr#9ap;i%uzei*Ynpru@p&yr1{~$+jVbgKFQ31IlXUNASaK{=7xv@*s zeeUr0q#{-2^E5_-wyL`6EYkX=CUwlTyb>Mr5R)V z{#v168kBts2d8d&B|xG+g$Nb8Q0gX|A8- znhy${tG}5+dvZfrzd4IEkjTr5R3gEBJmu(6*q5jEKlQ8vO67;U2XEsVT?LFO_kp;jJu_nmm**Ir-mR5Ue7HcvRyy;d*eOMaj- z=PtpFAWkYTFMnBIUr%FCXO`46FIe)Hq3j7$k6_e2cKW#cHwcn*36&+YzOG{=mS-p`-KNbVI503^vEXk9F-*BO zL|HH>Ct@b|Yzq22W#^1;lnWTpMLYp zUW3wO<3E4?bg9y3;!KL7SM)$D^x4+<7Y;cX*E<`Ob4Pzii@Tw~UC(AeL`;LVVrw-W zq;KO=Nkpk6wm45zBf+H)3Wx5b*pT&j{GRrmk)GQ-P7G*mrK3w zEGjBWmpM?dBoS|8kOEuYQ!gAkMzg+fc6LUrk5|pxD<~-R_ppRc!O%rzWwj3yIg0nQ zQT?B7YmO=STi%rv6m+Mk7kbT4(DYR!QrKgn?Ll1W z%8jQavl8)S#1X}6oJsHJhPB+{_n~BhTnFA>pwsxSh;i`ovw|O=D{G7u%YfnV45L*8*C99=C14E%}c6d;a} z3;t=$O7mP)L`3BDs7Lna-Zv$dtam>)t_HMbCv&LKDQZ#?M^r^dMlx13E@n`GMX`TP z#JaX0uvG8zuP&xQBjeN!2ttSDXfj}1yQZrE53h1{nfEETaSM49j~YG8jY5j zwTBp>=wd|0#Sh=1REgI*qw~0L(ndK;T_03Vs+G3mwNd$Bovj}zaX5h*87C7Uuf}bR)3FW6)IZI^h-5Lg@g83A2r$>bi8|< zAhr8>VJXY^=WBp4_AV}z{ne;a-k@`@OY*EL-+PyM`-Q-wyPlrx)0Z1HY?eLD6mvPB z7!0ZJHy6-%5zAy%NhHOBAmTAd$>&mk{XDJ#x_H>(!9f8!#{!9I>nCQ-BgfH-{9~&K zd1=8wo6sYC93*r4Z*MTvVPmpxiRF&xo4YxKs!TmuOv?;$_kY@p?1J?lSlaUh6X&Fj zD&tTQ>J)flV?YaV3nY8+T6u%1wOFP%qnPuND!7I`T);e4K4l@PQfnrbU5218^0Dds zBAxD*1<#{grqX4CYE=IP7_q;6J{7ptntHnZOt$606~&e9xz1@sCzc!RLJg`PJlm9p z5M)~wKqmkhIm#T>jmGNM43RYQFVr}_0DMgIrS>0yfMmj4k)^RYa%$hEFqYiuxKRtC<3w zfZkjH{ys$|}>A&j;UdHEc=A8dq3IrG)7Z1kj z$NrM$PP|n~X(=VWS&+xbM#D_V+3rIBQkH}VJ5x;8cdx}S9tB#(UrKaJvt1n=$O5IV zI|)X}0x$=!P61R*D9z58YZGR0ZMgeu@0j)pO~}!sM<}p@1J*)~hd%==6;f;v!wcNR zVB$M|mebSI3Z`6agdi-Ud**Y`{|%nE>}CgU8U(M83z~^#4tO#3JkR4M3-1`rx;r*9 zJPt%_3UI#N#^Wm-n4xtN1ZbXl#QtV1=`isRi;wC%Ix5whvHdv<{#jLQJ1+s zf)d>C!IU(()RmHw@->c8-1K@(mnX=&$?obh{P*v)QkZ4DX8Q~a%j!!2{#B@cZ9P3B zunZh3i6gtgM|01zz@}O<*y1;fQTA9k*|{a_Lc@KkLFp<{kBJq+=6*P3_xjd_w&^&$MzCAa_j0uJ&v~LsOw#) z1Gd9RuIpF%?=3EXph@XpNW86E=I3~RcFGK@+YJ>h&ANAhQ?%}MGnVU_c#mxPXOFGy zpJ=-EvGrG%4XsF|_S-NY*84trKkYh{EgcwddV!=#98rP{i2MVI-fGmI)L^4A-w&Fx zUcv~u8QzAeYRpi!f-mS4z0$sX4}v9D?@EZN_314w`M}8 zK;?-M4XOLr_t27zjfu^AI6||Ffk9rmw}<{F+Qs6IJgEZdwIqD96~ZqI)t?Bm=kv#> z6s0+SzoJUzb2UVgA1vsn*myR+mT($HDcwr$3!0-aJL=3i`%@SJeYu{{Q_6JmiU5fq zPN88JKv*3f2SvFBuNhIgwVxhT0rU^~Hov0}mIpsRzTA8;>6GK*;W`WQwPQjUutppk#h9bIhGpE5F-CfGST zI!ed(1UoMgNy9z^_<$SiMQKS%S;WI?kVT+oGPAweoqNXe^KiXp@cO^)PU_R^33hL~ zD+7?vSxH};R@!+>PN%gBF6jOx2p)3~V9FTaa@Nb0q&ude?7HsA~+$^7_B4XBM}0sQ1kv=EwxFlAn%emro*jnx@u zJ_n_FIPTuQ2GQ{v{zjF#WT_W=3}#C+gB@QLNmo0VvsJvQlE_OJ!$%imBMauHVPo?) z7|cyG;L4bf`9Ox~`8(TzjINE14OsS)flA`<=xB0+!M*pJO=}_NJ3TBp+X1aQv~P>Z z6|TMhxZtVN4nU@-qIt84H}G(C18{On5LJrBw%=8;q^o}fJ#cmH*ZXLd6>r9NSqc{A zq}W^o)Yr|)iNdaCqISfQxq8rh7nR3-E$;qTYax$_fip)n6kuu`Pu$H;SM^f4MH}9{ z=a2faQSUtUerI92*|!1IfYoo>`hAe;fuGc9s#!>5m$|?)*g$6+>wnNyEEzVAVB?%V zK3+$CCG(Oz&h(Qqv!KoRyu=N*C#+0VN~!#2GQRt(BVGyDrIEG_kzmg+U=tLe_{9sH zZw9NwXytyj)a#OK!w)!QWBU)P^QObb!8R!N>9MHjUn-R}Y=jfex_<&%IU!@Q%n?+8 zqdfH7?C2x?VhyTvaKV!u-D$!Q`I04IId>Yeu9^7qXzzh4aR_%l1`IWvnmiG zQE*MbUxyXxO|*qW&w`XVXroF#XdoXy(?_LvNifwX-`4vIlnWVHG=r3dj11%&Ab^Gq zEkOG~^sN%;19YILo?MW!k&)3Ge9VgnZ#_X={W;wVJ=cO(fYx}!8D31lMhJL? z|4;uVe>#-@EcsJ;2ds}C2&D7fets6>7h=dbyS_ybOJOi(N>vR**v)Mfzw^_>z#tj3 zkJdsv&^~iRUENdHmYr^|oS@y_IslRr)6*M3z;vK_;;K194<_saL9I3|UjQm@W@zYg z2p~(6q-+IR&umk9R(F+ekYp&FzKW^;u@Twb-MyK0*Y~;+2+2D@hJ|#|qW~G>!2I24 zFnjMlCqH(2IMZ(R_h3T_dQKei!H{NIyE^l8HA>U+YtjlPKut4Uz3{OH*Zu>YHmzL5 z{kLGT2s^qht2D4i67IiDf=@_<6XM5Kq92c>R58 z-ai{+l?8^`VYx}OPgR%Yx0^}5WxFpvbv~me;cGkkm0sC;FexhrD7y6Fl-Dz`?mmF_ z5CY&c- z8yLT`!jvHis$phKpN?uGN3${C-yd%6!ABoRSf-A%wt|+T0gkDA*8@3TTUSTqEy;YL zK6p)QYzGXUQ8BOn1QGr6Vx?#5ob-Bj=6g;dLO{4QExVPx?Sf^@ECJ`c`lG?E-KJL0 zQ7HY$S}5J9HDG@$Gc!{G1d+hM22MIa9EvI`!0hWc7QbCr06aCt#vcGuyR6?fZf3)W zapVwaZTp&uKOj{ATiqja@?40IkGCh|vnXLxAbZMy7cfY9I^kS@fwPrkV`F#6Dog@H z0s{jZBt1S>qi#g!4Np!YIi9>IDY^BdJC0Gd)nmT zI3gELw9{!mf^ui|s`WM)NTh{z-A(St*4({>0+DOl;jN@6(qn+d-esa{1*Nih^O3ip zs-4|Z`g@`Z1eRIkmqsGT1mM3wo`g&{d54Zy+o<|nNQ@r9Ira4Pw6mnOn=j{TaF6`> zk;(Cd2B_`E3%1#~kYe;Tcro3M%K2x@@c^KJ*s(S5zG_t5@41o~!Ngu`pIW^>0fbhu zwmMlfa>Jtgs^V*_CiO<>kFfns`B!ri@sIDpi9`_f+5NU|BE-u+IA{iU{>o7+drs^zV=znlFP zO{*nDV`ibJUL;gZ%i8&{7{0f(jDvgsib&coh$LY9>G#9n68>2lbg{AIS?WDhH$369 zuXHsosrvtXMTSeeYLM7DM^in4I+s1)ll^NNu<|zL?pBLeZ{FjUyyK)g9 zIu`c)>x?v0sEsHmnAf~-Io(lTgYzuCc%|_>iQHn?JJ#+xA-1T3gn`!ksyZk_g$)hj z`z+@>EI(L4eLU1H(-&L=_>@x}Na7*DX&(&c9>@;UEDn&s4h{}0ChyF{)}GRv z>NkL)n1MBVHR5YsrO$ujB=<)h{xFrim)=8%LLrG0(fwesh{DgAm zm!s~vZvAXklB@I>HpvCGI0?{?i z?)UOvIr~N5u7AFqpRl?2_tc?zx`Jgh2#7nWLE&&#eNgXQ%P1`Sz8%2=vOql0#dO8e zqMq}Jgg_c}E!Kdk(rI1}DmKLd?~er1y`qSyYVm23gMMGbj|k?QV0nSaH!9c70?9M6 z;j?CTelj+C^|r3_@dxUVclp3ULXpBNzp#KJUAXuqeO@1!Vh{OJRkLz~2UX+*or|lg zG^dY@IiI{x=19D=R#r0wlBdis;wy0I5Clz(u}!9)!$4H;NjiZtBvJJ`l*;2OB?r04Aat_j~_1sER*iCng3cPU+Ux)+o=|WF(gm!d~)^ z)B~x@pfp0tz}B0Q#Xej+c|`Rfru4j%UO z2f$Uhdx%)cAJY;za$w5L)~bDcLX!wMF<{7x66*2y*e5LYu$Sa%;_g2NO0L$rm)4E@ zN*@#)Gk@V!D4Hd*$C2GD9J&Pk=8`?`H8n_4l%w&3p7+cf7^I}noEH0RWxb1nvdWTFAM`e8k#5QO`v~jsYzi+`pTb zvID>VsB;<%P)XbcHboV?Vh6C%wg<##TKqPr8aKf}iS32n0OolHQUeb8xzI@M06fyu z)*hb;SSw%T0=($-ny~Hr;n*2KopVo4PWtpr{TD(n%YOppg0;U|t%_Ha?cVfhmpBkX zgZ!b#{iVRh+MeSrt=M-QNGyKMi(Nk+GpoyN^g*Kce4lN5PWkMdAyVKZA>Qs@8n zmV(d!&X{fP9b2wmX{8;-H@eNV@c{^xD%U5#@s+3)4*7$Ckczpjl2|sjW+2)XD7d6| zK=K)sK94sUI!oxt%yF$sVc>Uje<)km80+1Wn)Clz3-XE?%+F@J%%El+*h6GMIy1=x zNxTEzUK1ec=R;ua{`CMWfiL2NhDF1V{XA|eWG~47BxMfID*du0Ag!{$;qmTCfZB_Q ziTMEQd>+Uq%tI5Cti1~zd@Z4;rf=~^5)m~k#9DB2Zl#fOe{s+M4iJLku2X)!7a4KB z0Nj&j)GRVSos{B1t94_h&E8L*xE><@}xc zc;T)xM9u+unn45Cyka9qgWzx3mVbOJIXYdfz|sxUypH4U_cTqh@j&t8@dO_j1zesxS?c+K+5uo_Y@BEZ zmFZgG!TNDwW$5Wzst_V+4LC46Ag2L}J$$QWDU*{5wDButj$L3P171CSIi~9uFd5(b z0jkuXqo?=7(8wqP)O28otpIL?kECSOtu(B2ROg_*CUoPE#Epo^;d?OUl1s$6dyxkR z2a)2SK>q_Y(b((Przk#e9&1%q)mczW&E5fxR#KQ9u-b7UbinSU;0Bje!L9_hnp%9z zQ><|V&Vu5Fe|=o6{XjC{kG($dB>_tjw)ks8$mRD9(eCh!llOK#oBoz>}{Tf}sLbjA(O1U0#G&fi-vPHO0mpD~l#5tzE>+% zufhlgXE8=IfE6ASHmO;yuG395DL@eNGaxu0y_UH2%Rf8W#sGAJip$HrPr-&xoq?CO^LhErKQBm^~TyZhaEHKY6Jf7XVoA2j8f<2f8p4u;9 z=nC6@5f~d8X#_^R`@f?dW#E4Bbn|Bp*tW8geiU!piEEGSoV#a{I6U{+S||?)fK)yc zNh_@B*mI4KCA?J66kgc)k2{2_BmxN0HZ$7-DL!T2WCof&`kI<-(C{+xUm!rQ0$Vop z0}=f&-0EwA5-8J6)$ha_B_>DGQob1)*i%3G;MO)94&1AomL?2!IP7G-G8z2e`*^qNjo-pb_9> z$4}~V-2EXC(OIHSx?R7zVp>a_gc%S8fdK)uh)xx|PpAhl%1 z?e0UMi}Yq_MJn>Wdio-v<+@MvUiH<=5!p z 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/button_x.png b/src/android/app/src/main/res/drawable-hdpi/button_x.png new file mode 100644 index 0000000000000000000000000000000000000000..1a0fd19245ee8ba19a3cf8aa7062b254ec116951 GIT binary patch literal 12124 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 Ve%xH_e)~|os-l)csodl6{{cXt8|ha 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 G$o~VQxM}bJ literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/button_zl.png b/src/android/app/src/main/res/drawable-hdpi/button_zl.png new file mode 100644 index 0000000000000000000000000000000000000000..dd5d4d5b32ff66bf52586818e5dcca337e3adea5 GIT binary patch literal 4423 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 F`Cro;_yPa` literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/button_zr_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_zr_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..1218776102c7b27dd4a7ca6998c4c4e3262da1fc GIT binary patch literal 6201 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/dpad.png b/src/android/app/src/main/res/drawable-hdpi/dpad.png new file mode 100644 index 0000000000000000000000000000000000000000..921b3902d095ae1f48c827afe6792d7aecc71fa6 GIT binary patch literal 4273 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/ic_cia_install.png b/src/android/app/src/main/res/drawable-hdpi/ic_cia_install.png new file mode 100644 index 0000000000000000000000000000000000000000..8c00d8c34106eb6e1fb045821696da60afe0841f GIT binary patch literal 514 zcmV+d0{#7oP)KqsZu0-DxFb3>J z3FBznrHHcRS+rk0Y>Gr~D^)2%Ul~(=pdyEHN8D`z|dyY|oeh9X8q*^|J~6*6GOh zj7eM0Q~DI2b1?&=5Fl|VGCi*cP)SV_C|_HaqJCr}VSG8I@AP=kXO=2d(68YWa;Pf$ z0t`i5yjo?HW!XOhqx7LxXbxD@kDu}8w!6F;F7(5^Y5P>ih!9Z~}l-{jVW?$(3~YeGaJjVPoMg*2j& zMikPBLK-H8G6No-RD>EfT;4QAXm3EobCljU5QBUTe5f0`Y~OKVPhS25IbZIu1jRY9 Zd;z`*c?FdiugL%a002ovPDHLkV1g@hY}5b% literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/ic_premium.png b/src/android/app/src/main/res/drawable-hdpi/ic_premium.png new file mode 100644 index 0000000000000000000000000000000000000000..7dd45a4055928d18ea4b3f8f47537f69aafce256 GIT binary patch literal 961 zcmV;y13vtTP)mRl$ONvM-ArT1)k!)GAW#1WL z7$)o3Gh^vY&(+)O-fzD7X7JS4z2Ezu_r1?O_nhaPw_N#(l?XvsUz8Ld}7tz>rvrfW5#x;F>cw9heQ&jIr)D zumD&U524P$5g@e~G6B8=J%Q7}eqd0X>kJ!#j97#k0QZ5=?-v94zzu!kl42P!Gm6l0 zz3sn-eU-EBGm|v>TF_a6`D?>7t(sO{1-gpgV=6i3v3h*iTlcZl+VLUKZWResP+a;=RfOo)c zV4WiqpWJ7ghpqx`%7D-)DY0Pyuo7tH%-jDT63_sqUsFW*H=!-Sm{O9-l1dvU$pbzb z0pEZZ-uMTgm&#I+TMv|y%oB%9{}3|Ifx!y&JYb;i15{O=tBX98D#NM?5}F9Cm&)7Q zS9j(tK3a-^725(yfF;obpt56Yr23eLz5t68BxCO0qWj4n8ALQk8q`&(o+GbidA7ZQ zERGymvYy%4QnNuPMW#+_tjSoBC@Nr6lXP5;napu421anA- zhd{H&tI>C1`yY>|^)QX<1MG{K@22!d>bt?2s{kAX_Gq6}#gI=XQ+@p(=d$8pk}x{N z#%fkuDY0Q8FxRsgsX*W5jG1~*a|xD|5b6jghm05M(*-ftPR-hoki%oPVrjMCj)dt@ zahRev^F2`Db)Q#s7_@@h0cfghybhe#{U1ogLjlZ7!I9XyPU~~5ikAw>$tj6AsR;I# j7CTln?ObPGD;z_hwA$Jo1U((Y8s^! zp$6OpO28cO1^5hHs|&LZGQEH@*r8C|6yam9#dk0i)JjN14v5G)gL{=Fbd3RTy@>RQ zNP{ub@Hv`+XL|d~z}bj@DKKvNWFLT*NX!6G(f(IJ*69oZO+c~6A|t>);2bb(Ayc(a zz(rseP^jUbjFSF`kbd*$4vQ_8jRVVVgpMRgrfNrRS@weD$4l#>22LlqJLjE*5g1B< z%$T!M18W^Y^T1)COIts1+cCD=htTC1uu))>rL1)PrDG<$;;KU}S`1A_#vL@9-c^Z-3TH?RRPm5U0HQ%aRw(nmxxS|FDgrc42^wQ?7gQjY-!Jr3g4fUe+@ z2Yw#lr$@l<07Bb5@aI#&cSiv$1JeP*_YU~wIJcAn791xp=!57xDjso?0y2)1n}D_e zLT$h@$GO>*ZVg;VZvdhF9&_{6wC@LYXhG|=?8KZ>YK0FQ5%~zLG~wx#p8|%JQiWPs zu{tIb?s;U`ofxck*V0jl0lEb=ScnL4JqF{EPc7?m(2TdhNnj(8*46=>0NyynZ}lN` z-?No?ugxcB$hEkhO0YpY6W8SDVk-UruufY~y;+}yB*z|OPwnsnxY#xgw7N8ClQn{$ z0>|~!b-@uGGi*qNR@W@cMt15##J?Swu@ET%J0mfJk-yfQ*L4ig2pj{p82k^sMemPh z^#RSMb<>thh%#{3au{bVz8M4N1TYbN9TPL2SbU?wsC8cH-2lD;U-gyV58xq?4#oTp XV;1BxGI*AY00000NkvXXu0mjf6ZTW7 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/ic_stat_notification_logo.png b/src/android/app/src/main/res/drawable-hdpi/ic_stat_notification_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..2282f1a3b936767a009858111f1177dad3acc260 GIT binary patch literal 2824 zcmX|@c{~&TAIE2w`$&!v)tY0@jaiN{cV=eD9dd1pWkxI(k~ve(k&sk!B;{D;rXfcc zCFPC~I*5pn{Pg{OAK%a8@%g+z@6Y@Fc)lL5_g|kBdt0oqz(D~303eLBvT)doR)04i z&)(_0_z(*KaN#LVZge+-4VoAn1otHc`;p;{ppd;f0AOg$2=OHblIajXvOk4}fqrj( z0)DlH7nz(D`u zqWA89pAk^VKP~h?4Ak_mAjFMe4>1o8B}0zEbu@@tC?rHzAFidNsgFddLy($Ux(H2O zgqF63rWRUL2d%9S`FBB$1R#c?q|;~z3(J4S_A(4KfKCrVBM=c05%36YcyOpcLQ7v? zAEAjvAdwn-9U5WhX>?zP1}#kfFXI0U3vw7SloCRx1k)gYnZAC(=ja$H6!BLC@vq9B zJ;Zu}OarSF-8-ETdL%=)qMC2;1t-Bsb)*6~%sL_C_?k+}+--)1QC zivZ1I%{j=axE!NzAo!0zJc}-XNd$Tfgy9~k+={_%7aA~{9F0}FCU#ln5A_n$Gd5XG z$A2}t4Tx=cIJy}_uvnGx^a+@{zc1>!06B6sYW z`?_VvH9|CMMh&W-(uVW-=@C6*gJKNvh1_;6@TuA&7ZG>jwhsn#vB@{e%h?20UC5lc z)GDnd$bKe6|#G+Du^ltK9;a;?bjDcmxMS5TfV zd@@)3Ql4EX7pOh$Y*7Dl=rdI^S-kl9siRw1g&o%cJX><}0W0b5{wuZ~mZuw%-j$}l zBWcbN)2T~wC3S3>h@6=n$I(fZG2LcYoklvWu+$oXJ3?;ACHr<8-E7ZPz?5~^nqF0R zI*OA$G-mE3$7`nZMxED#ys}g$04uK)z~?_=D7~BtR1uQP+{bp0YT_oJFaXQ9HW?I# zVG7q-OG(`y2_wMwt+{<{*&Inx-e)q`?N=}--QEo~+YAisZ&Yj9^5F#L-PxWWq$Lxp zFY|waQZD4{l<(uemzF#9g!~ok9m6V#uozl7% zy@U9z`^4=D>K{DYz9QKFj7)e(NIgB;2CY}#aOzovs@FQb`)O~GgVttgca5?fD@fv( z&e97Xd69StvrO-*>_sibE)Ug~xtSW|>-S?Sqgm=P-!gp57k*KWA0D0>fi*}~@*L)B z%k^tzOTBo%Ao5$A`MZj9wjg%UQ2kpdz@zz9r_0Xy8PT4YiV#?j+77+NcD*6mGVx`a z-fyoi%t9In{gXutrz??{j|r!fV}Fetif8)cz$K%XyC|Uh#hHy_$!W})Bm-h z1M~FVlpk|Aqv|QS_G&k)x;n(cxf-ipj8^F<}&#U$M9`P=Z9qC@%0zs(b^yb7W_ zAbtE{Q2V4xN_PRIJ7II?u)6x~U$WRTtc-}~k-1pMd(M#@8nwm!dG%C^_ub5S$MR{a zhC*x6?G^ON!U_qk`CcQKUO{`f*MiKntFmbfqR}K#`L=;RK7NR#w&h^D{sHM1mx3px z9Z@azPY&9qu3PUvEB-K^BjCfITej`O-&hUQuX7|nsh)FP$_B)23+T!Kk(4s^(f_F9iau~&uiOtfZYR}(PG&u2yuI*iQju# zmwPdN(ajbX6C{!7#ZmN{xkfyB2nH?7jFnS1^t(|rUkj^Kj@~DDimDVXTaO9Jg-!A< zWL$7^AgpGnoy`;ZjjRX>5sH+Gl8gSmR@7>9s3$c-NkPH7VQ4&`+6_j}7(_?Th ze1^^Tk~D6n_V-M80WP?6AO+0TPrRO-mfo_9u|-f_!}sUTjLYID30LBWM{A@6ud8>q zc^VaFTz~dvc-MGAo%+Bf?LyC4r8+15eP1cbT1X?nmm0e^T`pOxT=aOH)T61{?p?sU Xi!REX(-EbAKd`vtwiZ=pK5_p811}ST literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/stick_c.png b/src/android/app/src/main/res/drawable-hdpi/stick_c.png new file mode 100644 index 0000000000000000000000000000000000000000..d4c1d6c976af87d2a85cef90c27c14d756a355c8 GIT binary patch literal 14819 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 Y4Z`$9zn%|2*R3 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/stick_main.png b/src/android/app/src/main/res/drawable-hdpi/stick_main.png new file mode 100644 index 0000000000000000000000000000000000000000..ae6d025a5caadda387625488432ca3e10ae430b5 GIT binary patch literal 12828 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

Vh@maJ|Xj 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/stick_main_pressed.png b/src/android/app/src/main/res/drawable-hdpi/stick_main_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..ca469c6a7c7f17b11ebc33ce33cd240185512ab2 GIT binary patch literal 8244 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 LQ?Xp$;?@5FtG<`< literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-hdpi/stick_main_range.png b/src/android/app/src/main/res/drawable-hdpi/stick_main_range.png new file mode 100644 index 0000000000000000000000000000000000000000..9b5445edcf72a1f0d7660ab3d396e0833649e500 GIT binary patch literal 32592 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

EdgFuW6azMpZ`6kKb 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 DPrjT< literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-mdpi/ic_cia_install.png b/src/android/app/src/main/res/drawable-mdpi/ic_cia_install.png new file mode 100644 index 0000000000000000000000000000000000000000..c6dc232b44e3d1f2aee1efaaea1ca15fc431fc33 GIT binary patch literal 364 zcmV-y0h9iTP)!UKp& z7gW?l7G_~s9yt5*()h!`%w+y=c8j+mLaV?t@B*yG7_DjmGl^rXX(?jCr^-JTv0$q5 zpG7Q4rT@9$5O@IU5u6?19yqcL&s6NIeogfcRKFT{{?ties3m|J(%TMZPpwyO2F5Z_ zQuQXV9?Z0?aIZ6Eo&W>jTfT=OFjBv_W8q%s!6~Of?V_6&?$t_w`smLK_qs@cUs}xt zV8bxiQSd9nykoAo2Gb32YnZDG^U)PwQVa}6t9t&n?x}bc(!3HF|Hk`EvQgc0B978O6-(I!lVlot9yRf~x zzISTIQ%0N4@DECHhiBi2%6e#+!xAX6{fg7Z0H$b8rx;JgHwVI5+A38VS=b^Tb}94a z@0{{_V%OFK#!9Sh_k|?Sy>S1QZ{W<{%WrGBDScyGLQJ>!ygKR{rf*u{ z&%2^g>W8p`w}m~ogR$ZTt^<0C8~BeKACt+wb1MA9bS~q=^&byBVQqZsYc^MSWgyU@ N44$rjF6*2UngF(pO?ChP literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-mdpi/ic_premium.png b/src/android/app/src/main/res/drawable-mdpi/ic_premium.png new file mode 100644 index 0000000000000000000000000000000000000000..4dfb625961f6f7c7b125454449d7be2e456c9789 GIT binary patch literal 605 zcmV-j0;2tiP)tEYHhcmu9owL_odwqMY^{sun)i-pPVHFl&48G$IPT)Z1GZ1Sr z9YgRES8)jKN+<|=;w&bV9ReK@uozZ8w12`-+)wtpMAF6J z$FVSer-m*@k5JtU>_uDQoH9ta8DC}ao1vtBQJ%qJ-xLHpV|@j)@GkYB2`yC;q~P!I z82!Vx16y%1D$)`?ot^rV2+}ZZtRi@OG;>=VPB@BPn1>PAgFcuT7wD`BeQ&9P;9z{O z%WOB$6q(HpCDms8EAyu!)pXKd2u9;BzGb%O5%?NbM}|3G*JO*C#c))>*FTth<1%K1 zdghldP@5Bcz!bc#Krk|t@+GrfiIObBdORwA$Wb4kk74VGvLw8T2|gJzeT4z#3<}(f;d@-NCs}^NoLDzU){UX2 zYgzEA_*{t~;c1ZE&TQ$==rGP;ERKae_2PUqcwZ>)=ebHHDwiew8BL3Inuq1tetI_2 rUQ$`|`%NU(5EM8agH_E?{sMjgYyxm5Sn*(S00000NkvXXu0mjftwt2> literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-night-hdpi/ic_cia_install.png b/src/android/app/src/main/res/drawable-night-hdpi/ic_cia_install.png new file mode 100644 index 0000000000000000000000000000000000000000..cc986c8ac9865062c63f5c1d78c195e8246daff9 GIT binary patch literal 556 zcmV+{0@MA8P)9dv~5!)izFSAv$pwS;>SV_0P+AbGQ}f+ zVE_fwlyMsx0386@m3|k1v`s==AP2yk)-Tl(sN$*vl~Wz4oc|>4DyL90 zV+s@%DiVw-ke_|JvL?ArfkfL5fDz|RyxKs1_8G&tK>Z}wNG_9Xv9xd3V0=o}77Trm z_Y+sEhDUZz^4f4_)|L9%B!FJ!NuobzO<4N~@&`!m{T- u0weSyW@rY$iu`J!UV_z>_|DV>VBr%0;-TvT!dD{z00005t(aoJW|Pg% z=F999`4 zs1>|t3XI%Sm%gaeMx?+7xIA}65Of5F0z->s|qK zffex(Y7ZO&(uyDx;2Y2tI0@_p`p3D>upY>cMW`-t2PmJwriORGRej<_u>_bFMd+yB z_Fu!kN{;)?6b=3lGKTs7Kq@fuFF*7GkgM!62h>*bGzNO={+3Iq?Oz~~2dq{$UXQTp z3{2JYe-pA8dIHocK{A%oGl7rZc)Bw4y*FMF_!Rs}(XXU18ki_DDGG13u~l z`M@)8`~%QUW$Bk&_Z5@OLx)W75He4J0SffzKtJ6FsH8eq6L~02hLw^eG!|GZmAALA z;>=lmG!+3Wwgr*^OQO3#1;^G%^)L^aR4+)9jJbQ0?#Fv%5YaqoP)DVDp1iimv+WLa z2r_J`=f-$(STAH46|yGKpbXW$T-D7wz>^UB?0}Hz!;mBh1?`7DqsDI);sTXPLZs z9HdnM&E_)e>9%f!!)V~uqR@^lhPZh?>c9$EU+KgrG3&ALq3_w>g)eFmlXw*gyA7J zRGpXa%|k1|%Oc%$UKz!04SB5>XQ2>tmIipR1RclAn~S zSCLx)lxJYDv9BmdOwLX%QAkQn&&;z`dcS+Wl0s&Rtx~wDuYqrYb81GWM^#a3aFt(3 za#eP+Wr~u$9hXgo70`g()RIJnirk#MVyg;UC9t_xKsHENUr7P1q$Jx`$q{6sLWFOC zf^&XRs)DJWnQpS7iIIZ2rJkXgfu)g&j)IYap}D?+xxS&Xu7RPIfti)Dr2-Tv*>Ne@ z6s4qD1-ZCEEd%mwl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{ z^NN*0MnKGPNi9w;$}A|!%+FH*nVFcBUs__Tq@)kBL?3Dk(0lrD{{cDh5K7Gh21^mp z|MO%L-ZL;TeeiT~42fvnJHy{2)KTPE{rjbo5*;1_UV@xc|2AhO&ivbIu&8BI?v@}|n*cKa4(qIa23{w!kty92n5oWM>iPKuwJQ!#RK0kvZK&_&2-C)f>mQ zb*`LnC13JM>yo>Z&Ur|E?>L$0bji~5wn}N_A7`JXR=84{d$9ZB;d@kEN>6%5-#48K-KcB%Zp1aX(la_1y zLhiqljN}YGUw{5^#%q;Xa*_8o?QOjWwC>FBmRuk$QO0#h#VwiJu{_FAow>97pk{H+ zX1P_YZjGA`%njkWCRm%$Snqw~tEw3D2IZd#TveVtB z%gqgp)sJSVi``dWWPS6x<=SmN;U#B%0jqWTjmsOQ<^JzDZvHGo{>YwoNsVX!FDUn~-yRTj seXox0I)PBGuC+21d@@Q}XPQ1rJ4x-znjevE3@SK0UHx3vIVCg!0Ft@Vr2qf` literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-night-mdpi/ic_cia_install.png b/src/android/app/src/main/res/drawable-night-mdpi/ic_cia_install.png new file mode 100644 index 0000000000000000000000000000000000000000..f61d84961525c9e2ebe234ab1af54b2f401b153c GIT binary patch literal 405 zcmV;G0c!qLZ84!O9c@HNwCx|t(}lU5EMm05DbW|m6h07X=CFf_yA(; z#J`v$D;pSZe(oeDjRSMb!1}!Gz$`EZi~w_9P&)$e zCVuOMK-I)wy%6Zg{-?k?a0}$y;8_H2fI{6#=!1k?TQz4nv%hBcmlBv?e2psDF!33X zi}8oquf+EPaBlXCo(h6*CT=w)Y1FJIC5~6lJ^Yxu_Hfl4us%7f>s=$ z3rUxbynN)m3yaUVC^?1{5OPj1BSc#;N*lD8(zVHeQi@^WL6ag~VITN9-`hm$r$Bc{Iy5B3>dwo0T{C!BfL?E%AmvI)Ch`F~BDl zZGpC#C9uJ$5U{EX6<;ze4IE1Y?!X=RCqPxOze=E65a=baE(m<*Z#uyT9&pGRbYp2g ddCrRyroS`LbonQ*OvL~I002ovPDHLkV1lmpSy=!8 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-night-mdpi/ic_premium.png b/src/android/app/src/main/res/drawable-night-mdpi/ic_premium.png new file mode 100644 index 0000000000000000000000000000000000000000..87bac27dfa30bf09c36b3bb6d80cdaf8105103d8 GIT binary patch literal 595 zcmV-Z0<8UsP)i7#9>}G5q>%EU7!rw;BHlbm@}Q7gDJ7(MkXtD)Vls>g zNfIJS?$^n^%{sN6e0*R2b=qgIz4rR=wf0(Tcly-vQHCX$h2i*y8#snNnND9U$7Bq| z3tYy2oKr$U&=qGfrmPTX3xiEKfyN4YTd_J96a?)USz%Lwr|9($orJa6loK>#cNH6J zK?>vJq~93}|HIHloWw0OLWy+&8RAkUyCsGj_?c!`I;cu67v>J!`tM+sTv4o#CQ|k<9~A){vPSR z9%FGHqwBD(O5>@Bo?v5U{4n-n0p?-@w#QmJbaP$g_qr+w_Qkj&lU+ss2-}RP`uc2r zao#FYOvn9&U>I)WYbJXZhFh@|J4$_0h|Q;9jNV5kec}mN4qUkYj3a=X@n_4sD6VXwLAmLGv zT+d|bF*<-V7=a@pPj`_DD_!ue$he>TDut*Vmh>1+ig~Js)G-UBwvpCSmL5P)^GyCWEX51Xy2Lrcn?!EVYyF0^svq%axPD^?#>4T)f zPBzxp#*$$*ychc3MF9PVXKBn6iUEqxfSfl1*MJeAFOx@xitj+AuB=*HlFz848l6n>*&*pm#OI)oYIGoS zy##n9Cc6$G~0>0=j_-V1;9@oaUTGz~vabc@j^6JsD!e z!K|lA$DL2h{RdeDi~*-&=E_#Y?i}Q|+B?50X8sazJ2grJ?c0E3Vb<_n($2d7-b-1; zn8zw~`@aW{`R8_SgQV$%I9EeA_2(0kf0DFT(iz9xkfbh2uM_-l zHp(aOX~19tiIEtCWE#b-ygZr_V8%rcMJx01DHM~TCj?|ii%nyz|{HcJPFvBr76jXvOTu1Z+w=Q9mn4D9*@GS9%KCienxDw z?Q@}`;Sx}?qh$q{HSn$gE@_x?eY%RB`Cq`-C7{!u7PJI9TIqdv z!3gMDe6%uSwGr^DMaa4^Won`Izzv|seofcnh)z`&^F>Eaj?(fW4g-Yh0Z5x4X2 zqL!SJj(EZ&__1sR{m+<$uf$aS66 z6Hm>Kf4IMAimCuJKda6g28n4Kn_U(J2E0{&uy4UF`xEXp46j)2l9^>1Rh)T$UXEcf zP2fG#AR3pzAMj{an^LB{Ts5YW|H| literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-night-xhdpi/ic_premium.png b/src/android/app/src/main/res/drawable-night-xhdpi/ic_premium.png new file mode 100644 index 0000000000000000000000000000000000000000..23a5cec5135b940f18327604b3d6a1edf43fb001 GIT binary patch literal 1281 zcmV+c1^)VpP)dcLCgU& z^k$$9Xeu+tdSC%C2lyePb15(rI5dY%F9UOdH*)9(9heL}01VGFfWz;=wZNlJHV(KS zIIhC64D*0l<&@G6Tn*e;#bh3~60?C5fY*V>8pc|z4;qDc;B4T98jVlzFfaw!y`Zt$ zV~vReHc=n2a{&|91CxN~L*pjPJLi9Fyx~D$hfqVKQswl)x2YoR7269X#eOXttqA<6 z-v-%a_2B?uh#T8J^3x#)j{lF0eic}z=Sra8wIz{Zb>nnkB5)$GZ@SjlCSDF4Gl+&; zrn?h(r-D9BT7kEKUf*C2tdeK-#v0%%;JL^=yU5T1t;Sz@>?sXW{C}u0Sdo%X5H~sr z7!B+v`M1DVq7@cqU&aQu73fjPuNOW5T7k`O{8n+TQ&MyGXa$aRGAmS10=EIHLJnBD zKDSQBTiA>N);gKR|8)`l?G-u$fwtdNkr#QPh0puN+Wap}Od0=dhVh6I49RG-{?oj$ zQ888z*s{Ot#=TekD1=vlGk|rX=ci`yGGn`^C4Ukw^eJ$7flh1%4sbOT>LTQmdF?7|@AJ zp$h^jt`haQFqxXySo`r@Ok$VETsY(Ziy7%=t`xv2nTbErHawCC-+T5!% z`fbc&qMciD8rOqdr$!?Q`iggcaqe^cAWRm0+yX{XTsFarjPmP@c+I z2Kouu19(KTr5PWgJI`6*;@Fi&1kJkpOz>hv&zze9T?qt*$!TnA2B%5m68FDP_fBb8&hM1Wa{c3y zm2|nAtjvv(IqV)bdOMwkyLHoC4(-n2l5%`YppT7pPh>2UUlWnftkwaPp>8On(=V#9 zQU6Elc)52#ce&VThc@!?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&% zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3 z;GAESs$i;TrkiYNVx(Yhsb^?rU}!BPbD z|2&z5_Y4dy?4B-;AsLNlXT^4ehKd}o|6b%SyY*x98J#&FjYXz*yiwHZ@XC-gaeJXy ztLeqgVjs}4Xu%6tAUdwzT_w+Ioo$sB&X*p^#6K_2 z*)EdVBRD^4{}Mk>c9p-v3j5^bJ*qq|o#xwp)@<&!+eIUN^`0SNx0{Rn_Xo$Y$^a^Z^Oo93=R86j4&uHUOF z_L7$8Wvc@)^HA-2Q|I&^MgWks*Pizfeb)>$2e}7E4+V%L}FIM4F5wnkmZuhiX zb)ey4#}lQTDk|Le-O7RX)dL?i#KLZ46fu-_8&_G5ht#SwF;Ah+lTP zHnYdN;kH5R(r1nZA`wzAZH_Yhn;t7}sD593hTc~5^&5O9nS@_*JfHL_hS@b|_wxR@ zndf%so(^=Wo3Fl8#a2qO&X?i8mURE=ll+W+Ys$?nlY<%F2MA6-eep13pUO*P&;Ao7 zTO!xZT5@%g9q*GjT9;mUUHQ!{{OMo{5A*#G_jR4vpEb;oJ~2J(#YQ{bj&~am%*|4p zH^p`N+og44%T8u>-q@Jt;9&i1@?ZI!&Rs`KA9&+$*-dghyL6PvX(f>CDO z{1d{O4=&9(!FjxNZG9ZW;sb5ZvN?~1Jvjb4E%&Bw@Qkhkhh?G`R}Z`_vU*r?Ix#&r zJf=0LyY<6QtJy0j&6{*ZUg3|o=iN!mu70$6{7~D1L8x#sXXO4R)w*SCC;j`vlhD`t zSZ}7{`ZcFZ`#Wb Y@y85OmXvM@N&uCop00i_>zopr07r*qhyVZp literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-night-xxhdpi/ic_cia_install.png b/src/android/app/src/main/res/drawable-night-xxhdpi/ic_cia_install.png new file mode 100644 index 0000000000000000000000000000000000000000..fc3c434b0802be5af58f6ad39ae560ef6077ffa7 GIT binary patch literal 1168 zcmV;B1aJF^P)YfJs*n>Mb>JDO`6$hScR z+5x-`dH;c&W5?h985xLLP<~9+T zEwJ@U$g_rsGg9$DhJy(O8WWM33VVBepEo4L9=6;!P5bEtVYM50%aY@M(${E+K+7D; zyc}61vw!xwLx+5w?=y!8^tod>BhtYD`@W0;?>LTDW79_p?`R z{9I9{DS3#@i1JF6m=h79J(P}&Jv4^i#nmS>&N>7fhY{GZ}XMsn7FX}ejVtYgeN;nXDt+{?-n;adAj+PWm;#GfL#hFe!R3ciZu*F5?Kx*pgB{G-XGnF#gUCX+G4$}D&8 zQXRh26z%`3`NJaeXWxqWgoxZ-<4V8k+8`nm1*`JEL}W`OAMO{C&-yY3CL^#3 zlC*(IT`Z5};K~K55+ly$NOhZraIQpyr-pQApa|19)R{-F;#Wx78 zzhS0u#reL~{8#w*Fv&gL@J`Qw@r?NQi~s#~FN7xW?U?%bmh}OP4HF*Ea-X);e#R+F zza0#FSo5Cmc{lNhSc!auPC?uH1I!6~4@gFJ>ApxjXw0)D`Qp~5=NVc|vHAyP1Yi1E z1y1oYzYspDF>jgh(d-227nTc8cZYquELHgOqwo)=H75Ja`W)vsO3TVT+46(0h9z#9 z{;TzC4&T3&S;Q*Al-BtCYvY>*8J~D&sJu;@f9YR7`_Zfa7HnT|t*TL-@5;Rn=B?%r z9GaN7ZhsFXIr&s9CV;pUFa#R4md@LdFmwB&ZM!yo5w6L87d|cT(S~PcN*Ah+XTEg4 z(cRses}up?!NTdH$kf6dwxFCKL$UBU^mWxf-b;Bz~JfX=d#Wzp$Pzm Ct^54| literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-night-xxhdpi/ic_premium.png b/src/android/app/src/main/res/drawable-night-xxhdpi/ic_premium.png new file mode 100644 index 0000000000000000000000000000000000000000..2a0f1568fa4085becbe422c2a9c3a1b94750cc63 GIT binary patch literal 2049 zcmV+c2>$npP)% zcZ?QA7>6Ga6%Pap#tI^KV>z)v>xe(cE(0RHe?wQX|+a8jAaya^ZxH0AA>B%rnR zMRqI8^cLqc;6&gZ=Ssb{#Of6q^KD=+;IBNLd;&71`z)||S*N!+&C+LY0Q&(A!15Iy za{|y;3O$I{u|{oyQB@F*u`F;0a4c|R6@+7S2k!BF??mD&=vL{6|2sp0v+@ea%<02R zfp8*hTR)T4$X#lKDn6y!;zC*KR3ZWO*Zy3Z*abKwR6u=~GT}t@&uU6z(>I6!0(QbOuuvl>VP%mx@-gN zm9xw}#Qllr}?R?Ywg!8^zwOB7JIB}6#3LT&)=RBELt zGZgJVEdh1cYMbY~pZP)WYw6W07Lp7Bt}PO5mP(r%*FWC?M+5I=w6hhkCeTHCC-QHa zl*F@y+Mh)x&?aeV)c}@g>z9&|TtWJyw-jx?ES8UNC1ktjD-wJVw#CLuv)2-j$%#wS zHOB*I0NWOrv*n>41+G@wB^C1(zOFIhSgPgl1mT$V`2e^#ML6S>yWUn=%s3q+VAH+V zWMvUr=UHx5!2FuyfVrNb1}ec;pD~Te5>jKv3bE~YfpSEfCN*lUN!0=~^<-yw=6E-7 zW#AlLJyaLaelsQQ_D&LzN%^-L5YV6mk9L^Sv!VRtwEHozPbWE^J>wUmd{9G3WLrTR zHM#iKx=be_S^OqJ4hKGtS>_G3ZBGq2u9_x;H8n1vQ_|e+DsUt)CN|7IAqg$u7hn(I z!;E$t$i#QfX!oL$`wNXkliMFccMCy>?TC4~Vl zyQldj4zs0ykZF%n#`B#v(dXSIJd^?nQ75K{+Q!d^Zj+L#7Vmq;=@mG3vtzB6&nU#O zijf zfb8k^_k4+R@lVX+P(VP&0VGg>zu03?y1HK+KwkU+iG)Paz4iB=uEB1%Pc-l zSE{54P0AijiuJuDz#!ZntIDlcvg=X(y}j~Hk^8WUtXSG>71MQ;Z7JHa2?)LDGCXIn z88K4*<2()=n9=usJ)o=#`VF))vT898(<#qF$|)d}FmFi6$)sVv%bq%QaOtF+a#n_M ziq6{KlphtXnAK#x4$?|XDsG4vEGzvV_}y})~o(&+_S z(Z>b$vs0Aw;{PmFN&9$C!C~?Tq=X|etFdS#Hw)WLY4Jxt4TJq`RJ~s*ue?cXX(K# zkYe@;X}V&|p;={pl@<_k^BV%JQJlC5cWI@!5s%P2CS3#W*DQr^=VA|qzDrvT0U^^r zJi(MF@szTKS+r9r-gYXA@1Rg(u2#o%)lrWP3`rKDS^|o=QMv9cf?rpvG?h})Nt_cP zpo?lnIJCeDis-MZG51(zt_r2@Z;1&d(NY3J^*`oNt}I=#Z{REARi)Zn%*7I87WdeZ fv00*;6Ar+?6yC-joZ~%a00000NkvXXu0mjfZu9Dg literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-night-xxhdpi/ic_settings_core.png b/src/android/app/src/main/res/drawable-night-xxhdpi/ic_settings_core.png new file mode 100644 index 0000000000000000000000000000000000000000..23706188b6beaafec4fd6c2f604cdfe653995ef1 GIT binary patch literal 2125 zcmX|DdpHy98{TH-5Q>x>TQi3oHbc%s5vGQmLddWfGm9;AD8pCC;c{Mb_*RY2AzC?9 z3@gc5k}?!>N+G3EWc8cx*Y&;E^*rzMyzhP8_jNyiyw{uV;$$x=t{@Ho037zu;^3!#LgVMliapQwB zqD)Oqk$U<_eSKX4LN_{=M8VN?Nztl16#wV2#YYE45y%umBni61i3^ORQqV9Maz_OD zM@3){`JX>Q^WTKv=wdKf zeKV>ijjdA+&v^p5uDAEHor9Pn-$mU>dh^iD-emQwdougjw`C*Pwr>4mqw0!{?{1^{ z-*Ih>vE{b!D{ap#*Zik>s!#Gw(AIu=oCqiV_{j^^@OpEpikNrO}6~mi$dz z(g97vEy7Dwk*zMOTCpQ|Nn(ZtXv?-<>uHC(rUR(J4}7v;(23G24Gq|e+_T$!1O z0LHD4=aYXL=PR_iY z`^|_X*B3Ol4M=hhS4Ye9+wVPL5q;uiM?G&IbQA` zkGX|+PQ0ITNv0J(m}lteda=CBKuwoS3~E$bo206vm1qY`ezoe$d+k06-l8S`ByEE& zcCA3l!Py(b%95Px@Oc^L4XzHeEcLU^WktGipBP-YO7Yc~pBBY7>1A9~UWr!$D|Yxz z%kp!XAl9B2#oVF3?4n~H8jaliOVk#dl ztxR@#&RMD_fF z*;PqsLYf?T?sB_f;3}p-t?GI38i(eDr zfVZE&?%A?KnNi5n^`os7 zOX+ohK(`W)gJ2x~!VSu^sy7phzR~+74sope8N2kuVn|smH@Y*si*WKUJaD_VWqT>B zZZkp4+1E?Lw_L~w(8*rUJMe843@y6}jMzbG|Z*r+zRPKrspgd~dhL}s@Owc{=zewFOi-YlBs63M6 zMM(26pk07X0?ZP)C4NA5$-U{WM9G3iIr6-6SNY9vV3C#AdV^+uJ$CEKm5~<9x??SYlVfTa@nJoYVwj^}YY}Pf5&$j?4;;r#LY_o_B-KO8#`tQ(nuk`D<5TUuyGrores;poOv;I~~b$2Ji6Iv(N4jct*-Ocl>csU|z#p;)Rx~>#wH>~{XWeqC1|;z{IET4~ ty!RjMq*gfLC714l%!fWvPne5-I%qQ6lix-gFW&hDV2(T4)*lN<{vWu>#l-*s literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-night-xxxhdpi/ic_cia_install.png b/src/android/app/src/main/res/drawable-night-xxxhdpi/ic_cia_install.png new file mode 100644 index 0000000000000000000000000000000000000000..b4d1b92b754f4874ae4a465328da0893c0e8104b GIT binary patch literal 1433 zcmbW1X*k;l0LK53Af&V*)LPL;kW^`DT4&~%#MPE!i5|{6>%JzX6@rq4HUx90st2V9 z-CRwTIEJ~+MrpKKXBbK}O}1e6eV_I`zxRDVyV{yiQCZ3U{xQ>US~)^SaUAvnGwF8H{Rs)Iux7s^>%>*YvTydPmF|K`4SLxXxY+!} zbq1&c@wABUD%)TYlv|}5XrVZ(D~HpDv>f5aY4EE;QJpe?EZ{kXo>2svyH(MeT(Hh> z&YSX!p1S2JKUP!T`EB5BsGyv)L#-t>&{a@UpV4&Dy|*?x5YwZ%y$nONOA~?uSRRLq zrQ3fgG|=RRrHXlxh49oZfBsybk4iLq(jQiIh-*9C#%+xPtEtp$7R2)weUx+ew5c;M zWgILrIZV-OZtM6tqe>Ih)=c)o8({a2k7nmTK8$ zjg6W`GTROgwp+2F83Md8M`eilM8JwRon}M_6P(_TjG=8!OmLMftG-W+{8-CbQ|b^4 zb-Lt4AnYCGxv|7wU@GF1C2&UUR9PzQBvf+eZAui}c{>9q+*U9gna(sv8 zLbH0iaxsXIrt7B1`d8DKF>#N)lrtO4a}KBmA?FsC8{EWQlH#X!ih6TFBKVi3tO4X0 z*%EuT)U?YWjKnbP$0Jwf$w8h5IgPXn@V~Hm*#g$bPrSNU{>~)jp4eDRtQV4k;CcbW zP@fy+n53UjlM8(N7PJGyaM&L|#S-jNwRorZloHttPj*hJI**e|dob|gDt?&d<3dAX zePoR7uh=JdbRHS)ilP;5a*EFNbX)M3N=GB7Ohv#(jsCOUG7mF4-QL4$XX)_!niw#A z%{u_ocNYEyw*G*zW9l*7FoitBV!bJ&FWyp;ms7^9jixeQEOWXj}ydW&WDmQ;zyTVcrzQSFeJ35Me~bbbX@tsP;}Q zqH74SoRfTY)K@wDD0_0?MR?q=2D~bcKx2VZ{kRNB${TY^9%iqt43-}hPHt#OJzLR_ z8I5PA!1BiPozKkk>tKQJ!J*Nau}7hXLzmfy$}((lkJHxn{cW?j z0fi-zUa7F=q~kZi>pShYjHM@JkNZpg%eWz&$iFTUPS`2A8z(4KRdzK;lDZcQXs&AK zw_MVjv(^o*NW=R+2=zW{-WhEDHKsQ_|8qz*rmr=Dk01jnAi{Lhy#Pvl$i8v`M_XsY J3mf0Ge*i6Kna}_L literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-night-xxxhdpi/ic_folder.png b/src/android/app/src/main/res/drawable-night-xxxhdpi/ic_folder.png new file mode 100644 index 0000000000000000000000000000000000000000..166bd052df4b1a63528452577279b1a565dbb003 GIT binary patch literal 657 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 YA4=f~i5K>1qW}N^07*qoM6N<$f>n3_dH?_b literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-night-xxxhdpi/ic_settings_core.png b/src/android/app/src/main/res/drawable-night-xxxhdpi/ic_settings_core.png new file mode 100644 index 0000000000000000000000000000000000000000..32eb4faff6531285cac44352ce1a6203a4f74772 GIT binary patch literal 2587 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_a.png b/src/android/app/src/main/res/drawable-xhdpi/button_a.png new file mode 100644 index 0000000000000000000000000000000000000000..4e20f2b0ed79a750e8750278d5dc9d6e2d1f4220 GIT binary patch literal 14645 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_b.png b/src/android/app/src/main/res/drawable-xhdpi/button_b.png new file mode 100644 index 0000000000000000000000000000000000000000..deb83a09d4bb77d4c982e37a6539bfc97feb85a7 GIT binary patch literal 13040 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_l.png b/src/android/app/src/main/res/drawable-xhdpi/button_l.png new file mode 100644 index 0000000000000000000000000000000000000000..d24039fbffde2e72625e6b6cfb723fb5246d65ae GIT binary patch literal 3461 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 LzV3~?B2WGYo1`T$ literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_l_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/button_l_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..378ac87518eac3f14e157e18364ce7dd317f943e GIT binary patch literal 3471 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_r.png b/src/android/app/src/main/res/drawable-xhdpi/button_r.png new file mode 100644 index 0000000000000000000000000000000000000000..7b01c043e3149c1445c54ac308db1398b6e53b4f GIT binary patch literal 7603 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_r_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/button_r_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..9b3e3e75a54a87ad6dccd596f3fc7b096c2ce75c GIT binary patch literal 7595 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_select_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/button_select_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..29eda72af678e18bbeed4fe10fddb3c8d6ee6660 GIT binary patch literal 17648 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�VsKYXXgiK{SXipl>y_{fVQ8F3ytDt@3t*~ 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_start.png b/src/android/app/src/main/res/drawable-xhdpi/button_start.png new file mode 100644 index 0000000000000000000000000000000000000000..f9cf0d6678e78dc042ccd98757bb5017ba1a6b19 GIT binary patch literal 19588 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 LNkvXXu0mjf<1iD; literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_x.png b/src/android/app/src/main/res/drawable-xhdpi/button_x.png new file mode 100644 index 0000000000000000000000000000000000000000..93a2ee9976dedde9a429cb318a61a9feab3948a6 GIT binary patch literal 16315 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 z%0D20NuSZ?t5437pR`Qm<>{RDNmbc$0cOY1uEaSZ>lOR; zGXXzOac)d&Yv2qUU<6#?0j?CED zRbe~lf@00B#})yT4inA5qge#LY$&cLGgS>lXGABNMDqnsWvm{a-l=TF}2R5gx7 zYB097otZWPG$BA{ohK(^RqO}Zy<%T^t4Iho!ik5zaBIE`o5N`9nO1W?B( zQ$K%dA@wD>Vczf~E>Y&MW}*-zd8K{d%u2}GmH|Ia?Lp0?yB=_6OQ-_$Hwb`*U072y zs>_|-CR5EO`TQPXQL@=}+(Q)qR4eWc6oeYDguMGOrg;t`<#keceeA()sEdZ7uS zIG(7B8%3paB|u-%pCZC%&(N+&Idg~)o`%M|=yzmL(Z2D-{boR0B43{k13t2-h!xDc zf>{WVt5b>J#t!Sy;_~Q5e@>YDcu16?_TR{;CFDo%jO6QhkNw=I6lRZJl(f$pU%?Wz zccY}Fv($|IBTXArFir&e+~<$Xw%FkRG;Y#s7(svV{_!Mm++^U#D)fp_K@!+{bV#7< z4VHl>dbB`w7C2m_Dta9MQ}GZyLBh&8Kb0Pc1iXOMA?bdkAYLwo#+A%2w#*v`@Wlf?ss7wYr70 z=e@IK3Rz>7@XO_~`aPsDp6zg%tAcs`qBHvt6Xujamzes>5_ASXU)|eK7e@lZUyK^S zNPz9rkh{iOUGlVh=40N;O>2LV2Yl zaeqk8-m_3j@Q#X!>)0{6R?AU~I-lFxiO0GVMfF6X*H{URb|`w#sy*}?NOgllCKr6^*w=jz_VOYy$J#89IUxf_@-(;^HtQ3EU0wuVv#PNy7PvJw=%+ zzf?hRuZ%Gi+}82)L)qGe_S8i7Y)0@Oho=mcpOLnUQo`o(XyF-S zX&7zrP9E7MGuFe@Qjdwz84f{Tpd*S@ia)5H_{@|6ZHZO2eq)clV8`FGq2@TnnKI&J1$qct`yoyHnQthDFq)$r#o$~X&`R=|@k|aok>)fW zx)ulC_%nn*htDff8nhFvb2AgFp`vGyMGNQDCFx_}8q36n&{>8aBmfg)QgYafA&w4H zG}vQKW|96M85t-5WcCl| zlE@;xNmw0gmTyh^YtoD0{kA-e2T{z72VOc&CTU-TZeaal)uWfLe8$v8U!eJWgt0jX zq-qDVWsn@+m9H6A3P@}~5VQ!(!MEXnZuRuje=1aYX~uC3oklj*3T4*g6=0lf^ zr+!PoD6jZaL0~xu%*j2+R79R*>gdJQ)N8^Sq8KFlw-DBkiwVyL0Z}AOQsP~~f9NT1 zUJfq|jUmJ9iIcz{8Ii-w@!nCllapdELL0!s=P~3QIg;>_Bp*h#D~S+0Wzo_0x6Y`W zlw)LrSVBc=wQqSy^+6B(cUSGR{(24-3NpqMWB=&FsP4YTcM;yipCn~Z$i0dug>3S| zhEWsG=mgSn#DBsnUX?@GbxK5Ytc_hCGvq+Q*+}t2YMkU&t>s$E3+R2=?IKxmQ=#R(h*o6aD`H6!(

j(XP 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 JmTBAG{U6BG3)lbv literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_start.png b/src/android/app/src/main/res/drawable-xxhdpi/button_start.png new file mode 100644 index 0000000000000000000000000000000000000000..4e9585bb4fa8a830931b484b50b77757e9fc6622 GIT binary patch literal 30505 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_start_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_start_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..8c089e2375e42dfe35cc2de38586ab04838e4596 GIT binary patch literal 30785 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 Hk}TUpu3POB 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_x.png b/src/android/app/src/main/res/drawable-xxhdpi/button_x.png new file mode 100644 index 0000000000000000000000000000000000000000..0500f964f10848f857e88e608c4ad315cacd6c3a GIT binary patch literal 27021 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 Q6TzR=UYk8nEIi`>2e#cFZ~y=R literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_x_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_x_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..56db5843d117cc58472ba3dafb5b285f5e43beb0 GIT binary patch literal 27645 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 z%0D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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_zl.png b/src/android/app/src/main/res/drawable-xxhdpi/button_zl.png new file mode 100644 index 0000000000000000000000000000000000000000..f8ce9a0c620e175d8aa3557a718ad14f4f1769ad GIT binary patch literal 8675 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_zl_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_zl_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..981c8b0c82d5b297ae10d8043dd8d6d0726020e4 GIT binary patch literal 8675 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 aY91bwy$r|@ufG7OK_mCP!w-SG<{(J%8RANjT( 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_zr_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_zr_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..b30b2e799a687b65789e85a4d22548cbb0afe8eb GIT binary patch literal 13182 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 Tx3i^Ogew*0)i5P;=1>0%?^akJ literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/dpad.png b/src/android/app/src/main/res/drawable-xxhdpi/dpad.png new file mode 100644 index 0000000000000000000000000000000000000000..36b7ea18323070137e5efe68f1a6803a445dd48b GIT binary patch literal 7816 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/dpad_pressed_one_direction.png b/src/android/app/src/main/res/drawable-xxhdpi/dpad_pressed_one_direction.png new file mode 100644 index 0000000000000000000000000000000000000000..3715e1c11dc280a1d71e972bea817866cfaaa702 GIT binary patch literal 6977 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/ic_cia_install.png b/src/android/app/src/main/res/drawable-xxhdpi/ic_cia_install.png new file mode 100644 index 0000000000000000000000000000000000000000..e6812f0d48724cae80aa63a67070b5ee5f5f14b0 GIT binary patch literal 967 zcmV;&133JNP)w_2cdY?oAlzvgLtVY&r-4K z$?c#X)Z&VQbP<;d)>?^X;PKv@WHK`^$$QNQey0hUU%r!Xl1XOpgvG!$;63mOxCylS zlALRn0Uv;ok{ATGjBaWEbE|?lQ9Sk`L6^)1-YEq70jzeJ;26gOjRP7q*C$%crwrEu z{RV~=*N0^pXSf!q;Q0PpTnpqqK_Cr5APqqv4M89cK_Cr5APqqv4M89cK_Cr5APqqv z4M89cSp_P{JsTh2$_sL@DN}A)1lk950^Pt>U{#hxa;62i4BVCn0LSEmv_^Z(7U>DY z1m?(-jJPe=pTIi9I(GtpD%5qwmN;7#4H9wMpsu_H+6xRR>N}jGy~bS92qfZU!bK6{B$L%*2NKvS3UQ=8uj-FW(iC%CY&s@o5onizINw~H^)~}A4MaLyp^mfy z>1M0q=mR!c(4!&?fj1d?QW}Bw8}yt3pv{#y5sM7%Ry=T<3bfnMRx8~|QjV$J&d3_X zp!rcz?ia9LmNl`}fJkZZQ;e>UG*=nPol9bbEXt%5(dgEH(M9^Wnm`odAffasB5zkWK zMHR(yx(LjRM#IHq(h#;B(7;adzvgCtJml)^0UD zTbW{Nx4O1f97*lg=gXPfH2G54X7P|sx0tkPtFiJyYzJnRUKG21pNkT^XK{#9l`91;bdDY|&Or6iGd86=Ge#e zAJtDD>T2D)$U~Fc%&BYd+D}Y-*y9?uiYrJ5ojMezxin%zZ$#9lg-`5d=dSLV`8y!( z*@K_g*3Udz^8B8EdfK}rKiT=xjLRAv7qC_^#d+;{x4SjjnkU zooAi!$o%0JX7O{|4P)v*Rs1`ZZ9uV8WafhK-a9xn?@$VUZ_7dp_>Q;WY@=9U7TD7hrH(`^+ ziwhR=YIh{gOM9G;Ik2+Zp;q+In*Z0{HLg2UAAVvb=M2+;x@5Lf>n}SfF+csDqcE}2 zg-uA(BZV?XNXP$@(p0Sq(WhbZ1?z7kAE@G zmb9Y12U-K~slN%A){6`KdthGSy|8luZ9z5sBGayz7zlr#(Dr`Car>I}A`Y(}e-2Jy gjp*IIk+Fi+=}@5zOG=tHFajAoUHx3vIVCg!02Hyv+5i9m literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/ic_premium.png b/src/android/app/src/main/res/drawable-xxhdpi/ic_premium.png new file mode 100644 index 0000000000000000000000000000000000000000..63f162e529bf138d38907d4b3b4d0ef6bdbdcd2a GIT binary patch literal 2096 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_zr.png b/src/android/app/src/main/res/drawable-xhdpi/button_zr.png new file mode 100644 index 0000000000000000000000000000000000000000..a76658351ac9514584f4c902b7830343aa03dd81 GIT binary patch literal 8283 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 QWzVlePa6TR(R7IYe+|`!;Q#;t literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_zr_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/button_zr_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..bbe4e64ce18da132f3e51683a555310f30c10486 GIT binary patch literal 8330 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 MWn)%j;`#gk0of~ui~s-t literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/dpad_pressed_one_direction.png b/src/android/app/src/main/res/drawable-xhdpi/dpad_pressed_one_direction.png new file mode 100644 index 0000000000000000000000000000000000000000..d6ccb2c4f88b9eb86264414f58a5341c8eb0342d GIT binary patch literal 4781 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/dpad_pressed_two_directions.png b/src/android/app/src/main/res/drawable-xhdpi/dpad_pressed_two_directions.png new file mode 100644 index 0000000000000000000000000000000000000000..2bba7749e2f68586819f9621c7415c73851be33a GIT binary patch literal 7857 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 RA6A;Lnclek$=KoX{{RfeREq!r literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/ic_cia_install.png b/src/android/app/src/main/res/drawable-xhdpi/ic_cia_install.png new file mode 100644 index 0000000000000000000000000000000000000000..83986940130f8813dc1a43d78d04da476367de8e GIT binary patch literal 656 zcmV;B0&o3^P)A!638V;Wz$T5AK~WGzkYGSWNS7*qfSA}?S%?T)ND3iEibO*~K;b|xpcWDc zSeQbzi69o~Ed2mK^NCUKk}xt8j?H^>d&xVuyRZ*TGrRM?zu(T>?mKe?Q7* z;u^RF6oDz=R6xz$z&P+2=+_F`7b(ihw$DdNDCXwtj5!A^N5%|j7?>BtY}#3=MWY7J z0;|H9_w~fZSwd|>UkmU8xEN!6Jx&8JfezumR)zTgr!o3uT>A%H5XQuv0rPwM<%xe) z!+_z2C&?e6cMk?m0^dDxN3_H{Zh4aZ270RQovCBsIPldIZ&X{n@&a>;DqZKw6%;&G^muQSQT?tDQ0z1x#4zgKO#@c?6?jnC46PS z%o=nEv-+7DwaHPXq-I0Xt`zH#uxndt6^^|tibvsP#aNqm169p>elCh)z`)4k>Eaj?(fW3#Js+c^NW1-R zuBp-*a~u{4_P&U5h;dK~3|yfS)#|70)yll$i`P`Ar3(sp1fQtxUic+FeZJ?t>3h=3 z)4zW|d&Vr^$Yv#D?gFM0U$x&WpMTzHdf{h6OwyNzY9~`~>l)L89}0ahi9}cmOpsct zT2Q2-aJ5`Eu5O=kK*5h**#gEx^7j-cPh{S7KrDh`_K#(!MGGRC7l{fqCMgxqwflPD z@&iNX`>bC3xKnDxcl^?8;LJ#7x;3N0Ol?6gI+Mlzo6c6w<`v~H-!gR^c*x&Wb2{*t zsm)tIZ`0(D8`~c)7y9#c$|ly5#-b9Z%HNycD&3Cdv-oyECW6U^;nJT^em|48`T>K7 N!PC{xWt~$(69D}tg?9h| literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/ic_premium.png b/src/android/app/src/main/res/drawable-xhdpi/ic_premium.png new file mode 100644 index 0000000000000000000000000000000000000000..ac4b19ff4221bfb6e731b04453457fcf8e898f2c GIT binary patch literal 1334 zcmV-61hP=Qz!HIbBAAQkk$GP4PC znkcO)(ZC+Y4COSvpHyo0P}2!T3mYd^{3mwXz0W=O&Yj60F6W$m*4}%qv)5khU;CEz z8!(U*j0DaHjsdEH(ZFutC*TXD<^n%PWUdBo29C<0)9b(kz^V+gK?9}(j{zgH4B+5*;1=L%r)>i8 zC~!i7V;SZFv+@a5ROE8*^Nqm53|~D2`x55?gMgL5$-rv4N-?Mfjs})wHNYl+w#dm` z)B$6Fdy4!JE^0K^t1*GZh4uqB=ap%>;t7AhNUHTqt! z%oqZE34G#r$jSH1iyylr_*uX0(#i6}p+KcG_zd9rkO3$CPfD)=ycwdD~Vd( zI188xoB|x==Nj9@ZNPDTsQAmkg9@=(F<2|`4$$EnuwIt+HZ}q`053-786riywHkkA z(I?kO{{NxeV6E3aS={JU#ruQR{vGhOXob1iSFwR@1=^MJdkbrn-2QOJuM^ig-J7#r zD=^7v+X*ZN?giF|3}^-}=q2UNZN>qcoHq0STO;!QveqyctUhyAGHmXE7hg+ul5bFYPh#tmUahzGSgU#1xBa{A;l^q(n8T`T#Gy1!iaX()>kIVk(s}l@!xlyVTC+ZL_h8<~4bWWZP6vIfT{hJ7{iD9SCqdr$y-Qa}N5Z30S z($^_R6oT=N><@kc;^2GW5s%7P1o{OS4m_o{Whoz_HA^jUMeIl;f-0ToBzPqvXU5$G zT;{ZOE573-zwIdoG-oYlruj5B4=!4hCOky<*Y&sKu3I*U60QrSE*x? zHF{p93H<}(6U8jwmaA=%%dFJ<`M_0y@#iNioA3XD7%W2Fo=2urRAGmn$H<@q0VaY~OGlDvX!0_9mH5rLNT1|%Ft%x%w37e6FVuxxtX8>rc8bhc z@tYNT?o_2VT>tv`*s49|kGWa@JrfrMz^koG zY5?NyucdIGkO2uSLLDoAA13$MB<1%w%=J+!0}yX%5sz^(JHuWn8l^MG)rRGFg$LK`p56T-#O=ZE`Cp)R_i(6=lh)B|2%I;RF#k-BI|($ zU^wu@{JS6U7HCq{BSGzjbU;L=0c|mAGgS3fD4Q9=%2ErR`j7@gJ5UoyC#(Y^k}o19 z7OG<{bSg!pFvi|E5h=6sKvnx(z(U{&&<&gcYWmRq2&ly>$+3Sta2EIlbOEbl`Nfc5 znS;Q_fAp$=CQI@P90n#t*!mQq+vw#$ALRe86Xxrj0)9J?&tB(&`M~ZNy#^--3^7gF zS{cRlzdRr!#lRb&kaWpUpiEUi#6_V&DI^b&2Mo4~LO@Fje?nJX?m)Q-WodGt+BFKT zN)h?(zIk9@0;BJNduDYez&W2JkySey>jn-2wLt$YoFZT@upjvBh&eNf1Fa5*T7a<@ zrAY;F&H?v|ZzisCFtR6(cm)0~2mDFa4gmSUFyN>qc(W_{EL$fnZ5%f_Kq51-h)guK z&s1PCPz(&PNG@H#2vzOz?BMc%cg9|vd;vOu2f%&cqN-j4s55EWCqnG>J^ie&uq8o+ z+63@80l>Hb4vb7t&3??75a%N=RrOiY0!LNfm_ziD?-`)SbMvEsg_ex8n|Eyx-|j$4VE@qO=UdTrI?%Ta5Bq0$k#dG z*ZP*zPaKRiIFMiOfZLv=A6Vd++Ajl(f&2)pJab_$Ibts9i(_8QEuZ5U73P`sT14&u zFS6qN6mz#+We(8nJlq9Vq^PN1<2qU_HR(Mq4*Uj2MRCoQg?E`ml@<}xA;$lNOedDM zp;pe`IO+>1@Rf8*kL_%9c?wUz(RHlS5CeG1lmc%Pka}k@j`@}=afz%k2jI3Woq@nw z;D!V7o4`6?NEXiKI9tvR7~r*LWT=MZtQ>kpz&A?=%5z{$H$~(xa}OKi_*uQwi%11f zs;akR^qyOEY8|Rt9{0=&bgOEI&8vsaTp59aUg(DwcSTpQ9dBBo+l00000NkvXXu0mjf1w6>+ literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/ic_stat_notification_logo.png b/src/android/app/src/main/res/drawable-xhdpi/ic_stat_notification_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..5e2787ba36b293bb89958c547475af1afc93405d GIT binary patch literal 4026 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 aPed{S4=#Srw6p(Xxly{tIu*AtQU3>{W>bj( literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/stick_c.png b/src/android/app/src/main/res/drawable-xhdpi/stick_c.png new file mode 100644 index 0000000000000000000000000000000000000000..7819f220a819dad38e42e9242f12d66300bd20eb GIT binary patch literal 23215 zcmc$G2Uk;F(C$fSp(sd4T4+L~7o`&jQbdp@LIA1KM0&3Y9RVp)MWhKRy(qnfj)H)q zL8$>mq<2CMH}7}9b^pT6%33)mIcx9Pvu96vW+pET9%@~qx=959z_t6@_ly7lM7#t6 z5OU&&rS}I%;>`n>M`pfedb$es9&Tc`Pd)4$!~)$siN6DY5a6)L4b1>yj14!*X~K)2`a zJ_>=#y#F(<0`dC4uf=(x|MQ5it1_?Je-lE@^bDZt9^MYnJ7RZ5?ImTTptAB}l6NKK zrDQ~)QWBD~;u5mrlG36Qk_r-c6{O{%|NG)qp@J%TKXp_vx~KWSlM(Nfd7XWIJr%^o z0|ElX0;I(}yq&})<>lqYC8Wfqq(q5Ni24M%``QMIy8H0`H^l!Pboe`g^sPyGL_k9hO{IOO0?WQ#X({rMa=I{*L$?%z{;6qvW! z8B*u=8OeRTv3)chQsA@gtaz!6E?n5jK_tu5Rk~L+3nT0-w4cu{WIlyEg?$y3|dn7MIZcP_ljTb zc=*a|(23MlG)eMPI0Z(yG$Tb=fQtp8%o80LWAuzC`a_11FwebPrJoQGZ5Sz(hqPa1 zg%sClg{hV#$C}$Ft-X|dDe35xEz>TphKB~oPw*#iUOx3V2g9cKj{$vg+t zuvqgDAyO;B=nIk3AM7O=wO^!;ax&Ic%d18YbZ?h_%J?EA(3sI+s^f=<&t*i@^@71h z3D6HE6nUE#X4H#>amsFE;4!QHZTrI_tb+8Qc6HjA?Ce(9cz4kGU876mc9CC7*Hpt!d&kC^>?gN#Y?IqJ zzqz@toq{Rzt9mgqvQV8FOItb)1=d*u>CT-XaPdw^OQ~ynjq6!g z_e|3hY}40ty~&Pxm)u(S+`qrOc2MfBm+Xl6l(H$g|S=&Teu7_Y3@ zXEJGYPApa;Uj3j95li4@L1yudzis4>whr2;ja+fsBMhJUkO8TxFH*5>%^RF?B-m%& z*Tqkw1TnqfebNrZzeS}8tHZFkrY+xvfcHj()jK#h$9Fp> z5zurELBDqXHrYQ0Xm8A$Gb7>yoRG&34#;qS6Vd&FVg=a9eyftWK~~K00pck#wpa*P ztzwb4^4<*Ic=mM9h3CPJ(e4-2YO8m>Dac@}Cj(rl6tsTBK+dMxb`i}GYA&7%ED4iiQl z&5}A)^2i#QwbEWu5jgF5PjEK-^7M8CkqmsgC3P^!ih^5ZyPlwi%?*n#w z6)WCe4Q3)LhK!}6BSy>`Jc+zoNakTF!HZ9+je@2N)#-i#I%tbf`p`2{yPj18G{mug{`qG;Jen`E7SH)o|n!c+QFn^%?(vZOnR;31u$#W*%?Z)d%{wTK;XH+fI~y z^OfbN-{r<&P67FD+G~-EQ3+x6I559{pQpb-C}Al@j7XPh<k zNDL+Fh0=KHs&RcdGikWZ$q+XD%U24zAiz*7@=x#%Q+W(iufk$LckF>zt&Nc3SR}Y` zOH%&B<=r95RPb&d&{m_4^mm@YiodMdFc)Y3>619XyRhZIGyD9mwb|6sdE@p~Cf$CJ zQKa-X?MHCn>)n@^5B8O=CM$ogm;Zd`*I_A^FE*m{$b_f~5lDr_ai4|@GJAX?-D*36 z>rTVjy?rlJ?sziz*6ck5L@dwuTSym0;5bi}U;_Wj4ek3AS1minuSudrKK4+@yF$tk zk@G$z)p*Fw42PJqat9=~t)gPJ@|ofD<~Oyo?y}a8roN6lS1$;b{`(sa!N(y%vw|I| z%B2}+gDc*ragQsbw!B+IgX=%sGZB4ilIi()fwDXC2sS3JxvA28JiAUS7QQ*3vgB=V zBiS^FW;vuR3XlgSF{0<*1K+oNm7WN;7!|)-&Jgz0F@_CvfZx-^vwL!>-C$HT{PVAk z%gv%tC>N)Z=>QvP*c@pH^{+Rpy8Gs1Ikk@fRFvZmX))2h3)W&@9Oz51FbD#uMUtw1<5(ZgIU8|B@o;C%i1 zV{QwvY`gjokC2beM3{v}i0p%o3p2)yY&jv5i-!^B9@<+kjf2WVY8zvD@cFIB&pFVz zWBXoejQj@2S{95969eDuYmMKPHnw@X7K7#&kAQ*BeDMN2rAJ&5(UMW76L{r@Dy@ap z;fCvB1@GLXg)-j>nHxMFfcvaVL^G-yy z&T{?wb(PiK-G8Sm-oHhdsT(cD7NZvi&KM7j4QVAWGX6e5US|CGIQpI4)wVHt>C9#& zJ@6`A1jWCZC4I(#>*t-u9kkv7DV_@3=!1Le3-AqhSfB*f{ z=HTE64{bD$AFwO`($MR@R@KFKrbBZY_Hf@J9o7jIdL*a5t?XCl^}-huLON{@aeaHf zqp+5ep-T7nAfuP@Rs*nhe87kXY)WXJ7LfvCPpv?ti^oGq`@$FJ+Px(E(eaF>pB8sT z&V@o=IV9YudSv+eL2W$Tka1vfZEekZ{`p;xN%Jf9(nlfOdW(ZZnWGtdgN>ov7q5Oy zVIA)4d$`oo^Q_ZS%)~@A5~tYU0li4zl~LkeUF}E-=RbLuATPelj6VLN%1WaChnpo> z!Y&1d7V6g5LAyg%OD-=w(tMN*wLINfF@tB)^DBah3+WrQ(UM^G>F=zprBIMIkIk!x zdcOK497|TIY#HljjZZh=nRqZl>vrj*rm=?5?A24#{I_pAi`-_onGm6&*C{z1$#9Eg z2Yx~MSF2iDTD5Q`rBKI4^Vcih<;;l!%!xen0r#xgsDjC};oPN%EjS9<0*mm3#n(qu zfNHmG{L!S*EYYFsH#>p79SWyDFG1ioC^6CFXP1F`01`D)1&5Jsq>wO#n>P=tPDmF? zL?`c!YiLty@UaOjf<$%JR7<`~MOy|9e+r~kb9~*PQ=YOKMELXh^JhHKf}-q_UaNyg zsQ}e~9R~x6154tZoO7Rv(wA>lo%O8M^7DXQ1o18Nb(PIIYnuHgZ;ET&L#bPk(D);U z;*{v${59cbg7kDEU4lKjb61OhZH@;n2KyH}Q_0nwR(S`YxZmO2xn_SQwe4+6Y0hH| z)V|;}w96!-8zThiun29+`&OxRd;+W8RW)gLdr~8%7>5DbNO8sq>%)PRz zF56yiMxX;HZJVqF>K{e@IgUyT&Z8)NBQJie-=y{CVzuigux;Wg3x7(V!&`??b>3?F zCg0&rl{L>TeBb3{6F3$E)U6^V>yYH1JA{{*j8bg=NmYlkVlty&8GW(RIr1uP2*}UR z57nPq<9=l{J2zwCF5zAco-h|K{b8-Fq;&C0F<@J%)11?J=h(j062pWS>6o!T;R+3c zUgTN8co%86yG#LQbZK4}XYBVS9v}ykUir`pOi3F=mL{tzyY%E)jnKUc;3R-~`F)NK zQ*vPB3;TEqPvm9K7gtwxN7eKd{OTvqq6kLtP1f(xBGNX$@0eY2lw=qnTI|zz(VEJC zm-(*ul^QmdMrK56>V})cj@p)&)4S(oj%Xn~`JHZmaH5X@=D~jsSu0m7-@bjbNKQ`9 zSCNyetNf`WmMttd)r~MQG3!fv*@LRm`55|Ij4SCySAw5X1Mui> zhT#xLMD#JwP>W!xjuLr!bm}-IkJZZO9_~+A!nT_cxcMQ-*)6%D>SRnYAUR(_K_U1r z4rjo{QPuC=N_-zahL7#NC-L|6ekKEuHy`F59?WQ;L_}{M@Bqz+Fv=V%3$vj@8Quvm z%JQL<2R+8&mU|`2Bx@IH!@vC?$0$bL=tyW8>8FKTWWrovXb!-x4>h+h)b8qBdC6>SlY&IX4|ckIR_jd_M!JnE ze}W!YW(r;ija$ErhKv3Kb^H{}E|?9czn~n1H(pq>?YjN>zOywqM4A{*TXJ)Y22b~CLYOam-qeP z!y#Y$&aFXip0o)7MZxva!mn;6#}Z??!u3M+3Ry~a)vG8aH{e>*0zo2 zl1(U~ofW5kTyTLgR^ThM&kw*N7hMrbPtVC~F>OBzkBZP)^u4UvI)@1n zafUkOsW9!%2)USHEn_N&Q5}evNOT?cKPtb{0!xD-;ARBKx!N=+A2ns4qI|4FPl$?A zuX;STr7sFUT3i+AEFa;v3%_+TyM922wjijUfz+)EDC-yKNT)p29KK)@^< z1v#Ail@wjLj4#X2L!V}DPqFS>Y753cS(E^sjXg#vr4sV~t*Y6T_d9$|+#-JkH(t-y zD(izRqm_HdZ&2PPp14`<<4*19DpMdsti;=99}<|QrnA<;KdspTkkJ0j1KML2cwvAM zJ>gWCr=QY>7_e?F(DxF?1_C^lz1}gQB{dz9$D9G%v!|Qy-o1NoDx7di%exp*(=EKC zr+A>fFzoy%_d`~J1xoBd5UQ4jPlLC)+(WN6BwKCTBUF^?p5k&XSO1=E6^ zv326)4*VVG9{5WN!RwvE9vuk&5s!|@sNHfk%ng)L@0kP|L1Iu^)VPiMNb_Yno}*;L z+ZUl^T6|t-J7->$R4+Ja=2Cr`+*WfHo3Zr!#rxnbFMA@LH+4RDdj|#{wi3-SH#bB0 zNa|{Bh3z5NyhlM5o#1&@z?BwErJ$F(UfGmK>Xs_)dw42C*Q%3P&q?B@hLYNKpPqrzNU;^{sm`h0T%+ZW>*=D<$xKv&f!h({!eM+>8i4}z%0=~K`t!T>!X`e{bE_1Aogw5U&; ziK}zxMa#3H6j%hCy;U8y>$o&~JKSliaY1G%`$MNYgn>~={j#;Slui16xR)8yqg+nKhyG^ z8a&oSLHi<^&!fj8AYl&{qPh$*D}YIK)c}L4z1i1=nZ7hgw}?a}^@2tYGp{YUJS2g) zzK|MJs%#8jCHhjb3nf<3vYMcioQu5%k?t+x2_1V}`P048ynMiJWim{?qE<-f@iaR% zs_xiaU3zi#ZD8>;cnzrpBwTx8Z{eT$9CyssGG4;Z8XtT`%V4~^pv4HD_t=LaW4Ecz40#p?9E1@940-LQEkBMu;JVmsmU!tO-RWRgP!kAHP$AvxMg_PYtT# zFQ2~H5t=HfBRm@6p5rs7NfX4hqO*BUOe5lTS|d95?#!gbQ7XC8!4S}gZS@oJ`Ql8V z`z>5qy}~5){`qWmD*T0KAYk}byqf(mNufaQsTr$%aP>LMC+tGQ@8>Glacdhjq+)s? zrD2NI&!zAHqQ73&*VmUKn*BgS7k;$K*TcPkaryxxSa&)5Q~%(i{AgjBKmy?bZa9`> zv=F0nI3G`9?8q(G*B!u}w@?eMI@h;S)23UKUYU&;r)S-W<)r3goUF(0Nr53`>d35@ zW6FVm``!VwcJ)!)#$horSMyzF>nd>Wevd0R_(T)$KtWMiyVnXn#T2zOTsPE!anGJ%QrivxBK2RUkZ`{)pM}>5LL(sb+{2pPljkhuV0A7>QW)Y7c;d~ zA94Oug(1SfiWNVQM@zJpe>X=J@0`~v$;+RL+K-AqnKHnc3j^?oew4qjZw@y{mCBao zl>qy26nq@x~$sn`#SM^tZwhmSM$*e?hytc z=jHV1n!a5gP8j$LN2)B(MMyJ*GeR>TlS4gW2~u^fZm+rYooPb36P*<Yp1nmM=ejlKpb359z+ogl;dCtSo?>tMGK|^^SYx^J@1+$`}JSte*W_a);M;sd@nS zd@!u&Wdv{6P#ojpa{@=`y;YGBR*F=gksT+=?Qi(E>*s`YH;eA&KP6Yo*lCo{TnE~< z9O&4%ax$$XX*UxI7+FE=Ew&FOp_D=y1^rq)Eovd!!}2%of#GMQgO}UNj*H#0o)HV} zU#}xy71FQ@(w)%(h6Ugy2gcCM4;k(!-l)92b1LYl>OHPvBX?|(9G}Ff-DZYrN{uW0 zx6E9@Z+BU4MucUh0d5)wh)e7s#Y}hP&=92Z@s+V&3p5+6C*x^+T&Al+28NU zmuywaAI}WWwj%?t)R<0YnRSCm(s@9G33o;nRTo+46t1WFy?6N>ZB45a*<_0&i9IFD zW5KDE%XAzT0hB25>82SjuBKY&nZM)Ds=HDD0od5-cNG;~i@UqKF)Q9Mp>1vm-0tF( z^zH3b#ju5xTkE(IZYA#2v1#djn%RLC*QJe*IFx3~Fni&9!C(HaxvxZ`9#l?gP+C?Zp!PHw zuNHhg>lDnySjI(|GjCR0=)iqtQ_h*LT|jJDTc^N=tN9rx%X?w#+XsU(Mx-Bi;dBOR zwDca(_2>O^;B}s1f398-CM~in8SwNY9h@RDqxl(wh{sXt{-pR5#C4m5g0}GBfh+Cx z>-xE6K^{a=vx0buQbpI8kVQ2fR};hR5!1>j{Z|{~qTPw-2NHQK+~f+nKWyDR&jsW5 zcr^eT^^i#q#tlI#p0i}+2{-9?U7a?!L-vD-e<6Vdhl-v0+oz}YM*6AowknGdJ;<_S z?9E$=ty!F z&pZ^1&Ddfm4HZ8Bg6KD4Msfi3nDipJ?&4F|YL{cr)u^YHwyKp{|6jo!64ggajKc^j zP-rK>9TDH;rGg0pvwgZdd_ZHq`tKZUZu&3eWsU1MnQF`G>nbKwMw5xFA%3*9t0x+7>w3k>OaT;M!tnLlGxyF|Bq^`h1{tWl!AZ77<}dWj9miRzitVlH|676h1i} zZj*o>=GB!cab^`acfzO5PbJ00`A|MS-YyQfH$(HLP=FF&985d^IP{1c_l$ZNL!$%5 z$HvFKBVrXS;>0|KIO%Rv6QWkUgN#f{SqJwMmkFQ7tbyfE*Wt23 zKpsh;z7YDN_WzvMlY8Z53P<`fR-$Q7q3}f zBB4rLjXp8;zyc23FmdBH%_2QCKbRw?Ut(7p6hudK`tJ~eCNMHBTEnLyQ(vEP4zANi zdc?w7@W@yh0-i;N?MgqaV9(ieJ_I*=?NxyM(foU=9>mPvZ$9-RbVeErZrXNRn&c1V zqYo7^R$`{Z2N#vqjp@>?@40r~4Q4(DkXc~^cJ;FvE4{RfPsqP}UpFfNek=DXkdCmnPI%Rgi^m%36}Y(fax!v>M3 zCME?n733YUH5JSc zN`G*7Cb+HY+y+b!YP+7*n-S&znk2#DHAQw}bU_uIdnP6Ov`oxOrkIv4T_ZFs`Mj1% za~u9~{qDRZ{YBws*qg;6Pj~1S=6anTn2HUQj5@=ChdFV*v_a%b0^KK1+9KOgAu`fz z`g4i+m4M#teHhF7KlKCrH`ZLZZ|t(9ulwa$LZAb# z17NElJ+R~%q0)!^m07G38u7L;NfeBx+ffjwX`!){C$mY4$k?AVF{%F2;QSWDGP<%# z21owea;oOWCR+Wv=eH0MAZ>aWh*c7n~0A{B}8Vu27XxlpDkPpP!# zLrPB-%#i^xZ79OLa(Db7;M&kvE{w_trSS!%NunPzt9QUCi2nTGm9=EXWmzFnu5e*_|6}K}p_8-(3nJx;K0!pX&f&4@1ntpHS zm-}`mK3d5x5z)?f2!E&unU0Fwu%eq%V$Et@zCpb8jlzKuO{1mo&PJ4xmN!syw-FL*tnV>FtU4`x8^mvdBD8$|L6!4Y z-%99ed>7~Bidy!ZSJaIW;{{(He-klaSmYZx=nz9EM3D>7kyqZ(FswOHLQ$g!`a19- z1DS>Zz)Z|+{Z@vWp2{X|WowjhZ@}a-F7~t2g-Fw>;2|$$uu6jQMx$SFj?imI&QBNb zyN(}Ua~rT7hj! zgBTn4FAdQ~>(ziGeJV6MG*R$Ugm^@w;d)n~cty9mZ2O#4t=|B710j_0H;hPPtZfP= zZXu8r(+OZb`s@7fiqX)k=$69%eT=6aZqWS`RR6hQQx9t{=>vGu%8fLPizV1?R1o&# z5BZJ@a!^)h>{KBiCgQ9Z{nqzZn`Qhj$Y?{DPu|3J?)V~3Eocr%N% z5Px=$#tudDI9L6&Ph!T@=c(ggsNOJvv>8AjL5>}eV#JD>rep8K zNUNE+gbL7-dH)HThn3FL;QT`XthqL<;C4c9OVEY3#dR{c*lI15H1VpM zbI@1)!ds&L`Y~@rB4sy{ZI(-yKIXo~BA*7IAyoz&5J*wfW78_uCq);jgIz(%GVHeD7m39=+>|4<_cqeb$HNP}6nkc3 z7bK#S@)&ZQ^_65G1y#4{(E8L04iZo6hFf4yk@Jp7LNwjdQOZ&{e(`n^)kTTX`U{bf z03C3pGm(~NY(RU3o!hu&3L`! zsq}*_uf>2bXrmdbp!@)$LB&?{gVth8GipZ~s@Ng)Y@$)S?aO63ru5I-AF)(aMyQ`ecJS3C%K5yM6N!ul<=k;{6kl;<#7rXspnI4(tmT6Q=tf8B4LqLOV zbjnSMTW{D2XVRw`?Pd)EV7Ai1Y#smNs#73bqhQob{S?HLPwIj$%p7{mT;*UA!5Rco zH9i()c>fs|U_L{VRS*Ki4r`#MSuw;&+g!M$D{#|C%hnH90GGl^Dr0p*! z*!W*L>0%oEd2%rCNf+Z$#rDw_OTL9Ri|ELV?@y7BDS5cM{kYIkfe2XRquZ0PgW8Ow zeF9KSg^5QOaS91zu6S2S>0FPH7arWl$dI##lOuXe>7{PTrbUBms`87V{sA=|*c*q} zjEIhXtOID4gef4ysMM&pB@o5B$#+b8ODz541u?-ru2Zu-t$LaNcxLZwJC4He%d!nk)|3ciIx7C zU7`&#HUfJk`z92==m2;x|0$kd!)i)i=>lT_J*dD;UpexJu`Uz2hp8oHs#@YH@SEr( zV5c`D<|e{$-x<+U@wEmzY_L+!Xe-U_bYa3Cg#aw)N7#Eh=<}7{iQo(`-e<86kwKxxMT-S$4h@-_vu)KUj_Cm`+CWH>=e z3q0CYz%mrG^JyLKwAbDF%c-6c%xZD&+x=qs*0=zM6fWkLZFDqGA{UC3-Dg{pVp6?T zDpc|)SMx-mdHC}s-Fe(pW87!`7nsjiArrC^%YUQd?ep=?cOOdo)XF?hPzKRUZ!^)9 zG}jsFkQD}#2FUa}U_rAt5Sjnw?|1^OuZqZR{vieE1Hzx43VxUQ=D|Q}lS_E*m6-N4 z34J+>$yj{N`);xYeyfQ@-Z|4q2T~uZ9pEn}W(?xcf$6|BAfSImEn4vYD;IH0IURs8 z=#U(^rfbfn%A=6P;p-z!X4!2RfcRSpq#B!?2!J_ioImA&fNXyMqv`kxUAo6jcPowz@G}%5d1B z4D=wM*^64D=sG90CuM>g%vnHP_*&jYUKX3{H;DW-OG=ysYqROz%l1z@M8?VsBxnUq{xPK9pDN@Bnys2h3QHr+du(;ovQq9mSCyF4FP)}QCniYv8R zH5g`QziTclF=*zx^;en*rwlpVMl-nT*;jv_CGq@N)euLY5ebKKuzwOq{dz$kFVm7T za?4r@zM3>cO(3Lq5z^-!gP(urio5aQNr*r7z{TA_l0jD6>YvSHBy@m}YL&+na)q2b~FgGrRB-*7cuJLBxF7uwUyLZnc9K~i3Xe*d*CeudM#(6(WUxjGhy(V83Zhjvc(&i` z6Lx<^EUIa3R$hsAaGd3H1#lI~Ek9oBP5wu@%w27tM;1R+rz_fJOloc+_wK!PwVr77 z1TA4qY_Rkp4H(z56H?uHLrF#F32F%xO_!>q@i8tGG${VGxJF`Ab~%f$Tx>2I%s~lX z%`@`A6a>Uyey+Qgh$YrUmp7_(iP-y=cY>-Lhs@t-x{7w*J*15ZAyxN>BF>7k*a9%k%Q6Vs3#5XxxdffqpZ`Z`J)=bu&o zgq|dGzFh)N%r-1N`}9s&pbSN2Gzi9_Z}QyVJHNKH(UpJKhuG~iYpmZ0JTBOIV5Mq6 z>fS#-?0M>2ka7tlm6$M3?AmE;4D9)OZU3Lw=gFvLf$DRH>hp@7M!)hK4QIiO^ZOdtVyFLIm_36CFg%rziZf1k~u}AJ_mnO&YEs4;`dhf7K9YXRf}#; z#v#jkA8LN~c|;O$=f`>ahJHaO|5^{3KB+ zT>%BeitL>uBiGAfx}`&G8X5r+Dz&K&>)L6zB5uy(Xsj|dSy>-oGl6*pi;{_Za9%p& zIQuZ~{pS5tQM<*}?vxxt2FY&xNVxsq1sLdM*N%7f(R;3oC-aJ8VY;fo_)!>Y8sGW7 zjUomdR?GHcDFeX7tLiu1o4)x1tEv0PQ#36994?$N6VbUzn|K6DS`KyhJW&Z})0v?t z5){Ye%s1~?`92XQ*2@Q^t*>|*X0w8$SB%3JP;EQy8Vf|)&kK267HJu6vbf`))c;_} zfkM_!7(Y%dgz9$Mi~TxOPB{9lKzm2sBHjJ*hRnIlC**wAHOq4%8sE9z7EUZ^jxONZ zw4FO{ZSkd5g%s`_`MAx9{#z{Rh5OR$^a8SRCvsc|g2`MJbbO8h%x5!+hRt)z#1aXi zZ;@s=7r0gbV35cdsKtLi^T|{<1c$^i2Lm>ZL4*HN{GSM(b+MF?Cat}Tlg%(}NWeS= z4gN+CGvw@(|CPW!j>1d5TngJ}(%mI@xjk*#B(?7$bjjIZ!GF=|HWU6Ee|dl?d~mgF zxI`5QfU(mlO>QC6eqj&!3#myIx({m2MUj>-PnuW_psauMmw*WQLm zO1m>2cX`ZnnX#%OdS3L{n1vqSPq4kX&*QMGQvQ?ooXzC;L1* zLb!<7nq@z_b63x`t;YDtR8$7w@=&MXo)utkqfz`)fX<3h(4Du^!wu?Pwxrq>HuzPQ z|Hr2^hLIOMY!2DD&v4ii#e;%vnY@e1h>7HC6p@?RL?L>l<08;#8zf&GD8Ptb1*yz7 zeHCo4dE)!T74Jk!PL@g^@x$a-fy@%9*zNGA>p}U(YcFYu;OtT1Ki&GU@EW?|!jc5F zhPwkpAAMIgqj1e`#A^Nte6@4#;InFYp5rw!5>rhOgeSLa=c>>p*I~-9X+vR$%vbkD zzdaeL)P(C|A&s2cKZ4B<^;Fj@>Q;1I(1A1;TiLu1G$m+ue0qqnNW^&jJGB&Bx!3GM z5Wf4P-lW(}(`AO_-#)woDWR`F(*W>2FyElPqxY_@CjH5jjR9Ew+L0<%n|%qZ>q>mb zYxDOzIqr<_c0Ou(ihAV>vXCmSIowQsL%08}*AmZj-0adrYpK1#s5;X`@nkBDG+PGZ zoIqqYnvVS9@#H7*yLum;XU2l7*_6=b?!6gNnNLrVwy7nEqH=?X)_^s?&Gs&~DVC6h zjeLYu+NYPQq_3J&Tdve=O}@5N+MIrC;%uwQ)SHAR*-}?kpX$O`b1u2t zjH8}$fcXYqzxAqFj8uD$yXjxeMtG;oI&tRblb`;zWepgvsVYy!Th`wQlbA!x3NGq;S`WYbi$ zK@^aJCMSjgeJGp>y28LCZ&A(st{R>_AbBk{aIN_ zfs+@ST(-yH8nR=rySzyK%&?m`H3uW&vXw?N=$UP5;7$aJrCK)&89mpHHlm`&yOKD0 z?nv9hb%|Ikj{A(-ZH92{ZVI25dFe7kP7Ip=lDv|~76r}@T1l*u@n4vMtrAnpf^#8c zj)>i0o?ylD#PJ2!{g8|s+SPDaRR0+*7r;Vbelk_)a&t!J$h&!_lN2|VVTAjM@)58B zKW5ma_UmNOo7Co3k7xit(Xv#PVfyc+Hf+a{K1vVU@O+h_~#aGSBFr~@6xbrUttdjMT@tFUHcp?c$t z$#2eVmCQh1fC=(a>l(cgA}v$U?d#H&Om$x$h-+12CTKY~hVaGKdX^g*#NSHz(QC|p zfAaI_7K;(0zL(qkD(+dg!LE7@e7#N7zkLqNdg(L!rsIeor$L7(+?ckWcMlK_&e5AR z&=IKkw6t8~CCXXqL2reY31eiitE1XPh;@vyWyeu>N;$5yVo2%{(8O`-FPKa;3$b3< zo=jE#3Ttsi6ec23Ms;uvlEH+%6kCfw`;%V$o4TiQ+nqX~-n7p}Z!wKL zT<1QE+zDZMyNYBJIc@Wu4KDuNq`PS&yr*KlCRHTyGR2aAS%~F@ABjCKV>mLo*vt%I zN8x#OY|P}+A^o`Co~IhcQl7-Q3U9iEaKuROAD_Q_ehu8H?zD*45RlP`c+3NFeh^VbA?-b!7C%n+?Z~Nsj;Xegr}{^4Heuz$MMteWm&o5)V0`A)lrJw zw5Spz_xrP9?w6<31&?TSci$t>NJ=GhUFC(0P3jqXeRRf|(4PnE8pUFNjTAhL;y-&^ z^Ips%u-(}9xxX*w-0?f0Jw=&KyvB$FPC*D@wGR((p9>Fdo>6I<`B~<&9?!@zMNY#R z6Hl9Jl^8dQW=%&ciE+e$h@BB_67?!aM6j$UV}={%;J$a+Rx%%Q{}+qM6)CdHY>~EF z-y-}AK7GZ*U`lb*->>WUbB!s#o%H=@%`w8Y0HCVl(pD3);P_Gb!-jcqxU8Snb;@k$-=6Tdw610R7=yHNM7Rti-jFoSx5fKVF)p-Ctw%MUmwy6~k^ z|MuzUci#vSiPAT7wFYVkA>A@$p543R`+P*nG$kg&O*0%$bqyJB|JSIPEHaX|`r7_E z6DoonoA6=hZdFX?_psh;H|;>I-J<;|SOqc==ESvbz7n8wOe>Z86Q*Oc(8RWCfBSEN z_c^hn`DxM3@cCB3{>v)9*LDk&d2qo?vo7xTxv}TXGegA5h>if>FrPZDv&w@dE6wOXf=0Dakjw4-pUPc@}p2w^DUIT~~i<%ok zq;yyXSMg|Lj@kWlw~zFJ5_03~=i+_O&R*Xpxq2NNnl`i3NilCI=y3Ud{o?c4jz3Y< z6kC5kPtGkn)iU~W+!l?R8YF>2cph%F5mud?HatWV?B1@v9zJ-^Nc9w{Ns5V`tgA~8DBY^5DR5QfRep1-FDd6iG2q=^PDawQxhr{oIc^pz_+YO}0|68G z-R$9ol!s0K+4J@B>OP#FTa4(B*t6BX5(t__wU~*Q^oWxNo_zAGcglMg&?&!Y)FN@6UzwI+F{{4@JHA zXAp<3Z%QYezdZ^t2`2{oJb&>c%tZPBNHi`BEQrvvwiZG(v9t&P@$AmJH=pl){P?ju zb@g;eh{lr#%?F;N&NO(21GSJDV4!u6l>WqUAuy?x+MV6K-L&a%sE^skR+OXbcI5Lh zK{Fl-$CM9pr&c%8STJ@MH#Wve3x>|$1=DGsftEv2=Bw6I*P3Q-`gQjCw@(tgn(h$E zxRM^cIP~Ko$kmjCA&nq-rrtH3xvTnF|c+%|n5y?&LgYYBz9|awbIEBUO+W<5g3=j7A zKZgGa3eRv@7a7UmCsVDeafSRSjMd~Ty;t_brnPgzycF?&Iyv)ysQxdGUt<|dvScf= zB}@@fD9a#9l4YVSEq2Pz$2yF$?@O5^WUR?vWZwp5k4OfCAzNc&$UYd~+rRL=kNe~O z>74sM@ArAX&g&V))40PefQZ$QiA5xIe&f4b5ha#Dq4i>eEa&zD84gj+Lk*8QIMUT8 z`J(;0R2VW=2^~>b4yH5FNf)YcX(*kePj7?I{t#h-D`i#OR8>XhSNew<=^xmh%YV%O z*o6@Qv}2onpPWSeOABZ;e^@doUGznB^`p5Q2{WG(vz-HI37$zBaV+;;hx0PtC5^@o z{$-OpN*|3+d<3x30R|q;dGVsv)BH#2tik)+tQpP68PdasjMx++KUe4|$Jv#N_N>u_ z@)O*Cv%;1%K4r}>Va=}qPp&Bj>%_2?OXyM)SEvyFJ@-b-mVn)C`=l$)H+|_@mcwKZ z1`)4@_A;{;KN@8hlf;BOu3YaD0W6zk!Z?#J%S-aG-#xht;h0(v1m=H4jpZ@mj7ZrLaddrX2W&wg;!Ob?LQJC*+hYea5F4;g-5S>Kj778gyg-QU`a)KnIJ zKn1!(PG59k)toVAJ4U2-)&bGF*BveHL0olXT zsHaQ(Y@z(T)CPzM0Fd zm{kl3i(+mhPJB2(EoS{W`W5#%RGp3J7<1%c7)yEB7Uu_)C|3Y8mjmB^+jw(x zOPgpD+;3!0eEN+|Uhlx&DAlRuCrFy=p~Cj>0!nz&Pd!MA*m4ZUSTlnyy!ap>jzYV7 zY+D~Hy*(M!9a=CvWQe_~u6}4{H<;4A>!o-Nmjv=%u1g;JfJMoxXi-_eMB_@)$IcGq z>cVGHs9EGlarD3`d(_Oi1wD1U>^q{tBdOzJym}<9OHz`;=peCIOZ@`b#xZBa3n z&Ky?WX6gVlop=>G{)4>v3xqSkgcxJ1y7()Zct&=ScDQvXt>y3j)6=*7jiP|*wUvu) zB}*dA?UIEDbp&>$tR#L~4PICT8~mAaDAH)?OWO+~bv1?W&3mu@*el>5?dsuwvS z7^?t1NqMx(yL^zV( zi{CDk%d5{z#Zx>2?cDV_MibIsXAuN0W|MYh@jy9CcAQ+Rp=t$31qZu=jgFN?`nzOzD$`u| zB>+f8SXS(CWM^jw*K__#Li9UDdY%W)>x?bWNS$GI3F#3JGtiHfiP+VaYaz%5tGR?c zqtoX<*I?YK5dQtr5(dI@t%&#T#?^+73&Ob57dSV|gyMb)m%;m>66^j=vQw{V$bRbK zf)4c^Qo>;3g16kKec<+$c7}Y|Y#?(gXj_`>c}zQ|4;ph79d`S8l=ba)6`tH@B}@h%ESBICOl7Ofkpng<~b3b}4-_A2~;vKf9!?849= zha<~|DPp!;XOyw)F!SK19v!hi-!_fRPfS@-H>^ZUHVVYCeI05aCtX_!?c+{PPX6n& ztD;t{baM^Bi9$ivOU9ZAl zCR1tIC{7?r%sB=zFFz*mte!6(MyI9D7I(ZC-^I!mAIDI}pG)a@=fq%Rtbw?h|MHy6 zDvLzF4UeHUCjyoH+uu)kc1zZK{%)Knhv<$F_kalXZw-ifp?f;hQ+mAbNm2W@!n7&$ ze(k+`YfBrk=7{D~F+4QxpPWLe{AVs>7DH`GvcWy?@c@8y(NI(6F*YS7<>WF@1^rWF zX|?p>rgBk+AUyRlJ-rK?d4ll`KIY;=ipq7w0^@Y`jKF*>>-RY= zdXd(^t;ZiE@_7G82A1t47Z^V#ktP?Uq@=(dcP~OamSg6>d8qqK2*7}OCFMp4A`zd=X79dNfodIXQ?a1*mZ1Yuw6j| zy6HKr5s9^VSqj6aQ&)gfv)YULJ{)t9FcCNmy3WF2hKmfh^_d#t9g5{yB&PYcrP#-d zCLJ)cPm}Pk>uH4&(H8lK@^*6A(q^}X46rq`X`QvMvDgF8Yp?w&!euk=hsTJ1VoOSo zZ-rL^4={&8PxwCBQ%*^t(D=tQhZX;kb85%WT{Y(zkYPD8xaE#apOhBL)pb!f*Zm75 z#!ZLlA4c7TAe3e!FE6OEVH{fmxDW2lf8K@d8L3zn(DRP zI>8!4KFe+|t)ye+rl-;#;cP=dH-4a-3C(Af+^8>mYlvb#e0yQEktz7 zT&94-FYWB^@SX}&VD^lBcZP@t2-_kdkBbwp4h!1(bqnYw#W_ZJJ&Xzn7qZ~9xb-kM-^vzSj(d}<2Ao~(1M;py2lnJFEaR`%wgVmS?YcMy+e3%zp4aVF8y()0?sH z`_mgd;vkSm&0k-1pgNbi@UuyODvy?QeqM{p*AsgZBUxop9jdGSO@$ta_{rZDdn+yC zRd^9k8ZxC@W4nhgmMZBf#xb6qb3Q|!gX2G)Bi*YS=ex>-F=VH75!zJaPvvO*)>fQq z=7$F_1JehMN#B`0VG$9~{z7iA zrtHkL;hij9bXjvLNYkHl>^!=sE1sC=);cQkl$cES`~1|&KFjSW_eT_kmQiD4m)TJV zqV?5`1d`1|bHp}Q=BKr${#@t|4Uh)pF(mItSXx?$w=(u}SnescvjXgRS@WipO=(S; z{U1Mkex%Nfy=i9&q1F??`{>;(CrYZSsv*bVnZIYM?$`vjq}Y;5QUaL{EQOd>(DSdN zs(Ppg+7QQl*Fa(w|Iyfj?FX65t&fbUu)=Hc;t}I#KMx%rF6{RW#ix;R#M=;&wr>5fP$MY0@Hp@# zNB!=0u-jD!a@>B?*Yn^VWG)@PI$Q;^b4Eb$#N~et(~F9emxy?d;{Y!)HS;Jn(pI=z zkaNYUJ_R!{mcFL;T^%yqdO~SE@r_e#kBcB&S0!aU@R%JCbgl z8~akrbA`~kvbfMmK_J&_lFHkB4g{;IFKQ-RP^}uO&%s(vzkjxxs`wtvDiZDSMP!#@ zUU|&-_&O8{^>1?DDXDYwCHPgl-7__ds&g|*zZjp-oG`%Ssry~3MxfY-Uw)J`!dHrs zb2Pj}T=N%=Sj?@0r*2W=#OKnnDWkXA&jj4WgmzEzid*?Ie_~1)E+(JM;Z8MjuP1PTh_>0L%63l>T9ZDo{Cs|VQHR~)_#kSVE@9X8#k%~hstWSdx?gj|H^;5`ouK1QP=4aZ zLG$yb9kUbuv5?f1H_ERrL&42r)&jqSU-K(d1|7GC=>tp8EtK+0FPWtCHdX2n_ z4sS0ELp`kZ_)kwlV2aWg#XG;l=)wXF=^2&)`E-#%dOcYh$Y1!ww6{kG+{SZW;(Pl> zVY^(&D&&!=!!0i}qKm-7FL1Vm|7ey?qiBE1c$|D^bEJ8ua>`w~3WP^V-T!gaaCJEZ zp|6-0{EyVsVi4dlM-K{@bBl}nE~`O%IZNK4!^1n!zwvQ-LOx%D?nQ7PqyGn4>dyrp z*NH;0qto|YgpFL!;W<@w=V;G>)LFo2yXD@c>Gem_?`52WlC>r}B4?{V@kW~j#9(r6 z6MLTc#cV(2=K&h2UJlRfR)Ze>@godRxz>S+gyZ*)+cAi?fFHNXA*LXt$qDG5Jpql5 z?W1)wNWbPa@Y?}pnKuK?ZdMfu`5;=0d5CQ>kPC+HxL~Yx_SA!{=8|vDeizo+Pqokq z#Qo+DG%-2dJd4!Lv@CQxswaKbbXmQAW4lzSd+7&g)#4agOAq_KRoPxbZklkfHv;c{ zD?!+ipdE@8*W>t#qS*BhI@a>ht)liM|9K|Xjj)^IR!@+7Cc|eW`(_}mwA3&m|D%J2 z{tDNk^Z>WTasXYu{Y&LsQzqpK3#DJo4dS9kXi4=XHM*XOsI|(V)SJueJ)h^Su$}_9 zjU?|;G!|4sJ@;Z}gKmYgA^_Q@JPH(U*h#6-NIjjk9CTlt>nLn`;f&Xp67{ED#Hb_GkI(Pj z1TFC2Y@Se(>j*RV+z3b6ph6VIDe{iICnDp>xWPFW*Qw~T*6y0Q{H)$>&w;SEJL6!{ z_WYAM#?0&;#-Y(SPg88#DOydgg}YZ>Dm7}%Mqo4je&Bj11EUyF6ksxMKkHnlm0oAK)Rn?s{t)hvSdDoX7*nOEB9qqI-X)_#D`;H4aq09e{67 zUyuXgZB8L~gnwQG!+}qDU!n{y8b=~|&&ma!i&@2Fs;;RSfR&gFU9N!UaH)W|5J(X- zl?S&1+i3Y}aRI z6hrDWh+aZ-viv>~&h=Qj@@B0RH31rT?^W#hx~z$I?kPBg=KT77H&ZJVN{>5hVS(`w z|CNM9%4gNiEG$fhn6)~M&tw`j2|mHQ8A_(jmS_3CV|QFGGEaUDvB+VUiNKMz&_7xs zWh7im_AIqZjl-*>H_C-ih-(&mYoI zKReUjba>ex+jO`!7z~|bM8nWt)J>_B_|dnvfJ)DJ9a)jE?{RIic za9w5G(9+QuY~Kpu|D__Lv%*P_gFD{f&+Yxfm3pT%;AU0ruoRO^Mem@jSu5+Dx8qZ; zk$d6|fVGv`MMeK*Y?_ybG#lCoNLH+&Q;F{#1~lU5>>Pz4)VpSer|I$7+w`8^n=r2b e_ZbOY6Z{V%vPWv|R0c8Az+GKKol0%%@c#kOfdvBq literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/stick_c_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/stick_c_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..a111c2ac782333d521d6d3347468b128399a8ca5 GIT binary patch literal 20594 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 GiGKr1P^t(3 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/stick_c_range.png b/src/android/app/src/main/res/drawable-xhdpi/stick_c_range.png new file mode 100644 index 0000000000000000000000000000000000000000..774c54292e048a4e05dffc5d3aac5506949e6822 GIT binary patch literal 18277 zcmX`T2{_bm)IR>1F&O)VkbPe=*^6Y0D7%Dg+4nG$#AF>?z9PyR${MmSWyv~|kR%C_ zb)?8Xl70I>-uM0gx?ER`na^@Q&vVXw?)yICOpLBG&~nm35X7K+Z&d1yLzA{c# z@PCf048A{oSz3_)f8OGMS5@%p=?VEQ4Nds9Fn+H57o{#;aF$h&<5#>aC3{KcvYY~% zUrt6=QCdb(T2}sojI6TEC1v@`{Qvh)P>q&f#m~h}+4P#u|D6o{q$=p)?~hfMmJSRI zlnRuW!uYvM%U-^GSz1O;T2Af)c*lkN4}JX|aTk2=3!NU~e~)p^^}e&8C)VE+To1fCQhO}Omjw4o|Ika!5sfyW*>OXKb){s@8_>E~u#7&(T^s8Q0NU zW{SKoG!m|(yt<6Q(@3GtVy}wBK1R{KSHQ#Z^!R_8VV8;D_z?~dlM!EGd6XJrO|ui- zRX>OId?L9T%}<(4PMX`^=lT@ci~o8Xeil0*XxX7iX^XZzvh%+A5zav^V;*jxiKFkM z6@c`U5P8&-qyv~g>;}GNo%e;DFV7@{^v_Bi-}}YpMwA(*)-V~EOuZg*Xsfh63-&rQiBf-t;>)YyCqc|%xtXfVg!{Y{P#B#`oDza0gQrju;f=>~wUM(Dj!Vx*ZWu?DfXhM^S69r8`__ zB0qX%1GA+dq44fYC$wLpQ25OuiZ$PMiq@;{RIM!xD5+yp=Xl?9lkz4+t-3xKH>`$w zQXch!QUG!<;Uh3Wmm*q@b2okF-+2tD}`H9qJa?s{u z*^ut(l>!lnLjV!ox>z9tJ$230{gxTd)6HQp6r#^w5ZZrvbbf}vZB4b2+t$}^vT`C3XhB^AbMsqUxC#yayx8}SLd;J%!>VsHJ<<$P;jN~G!-P=C zKXESKgdyjIGo3OnHV#YgHI_OEeq$u(SgKnjkq_mB`v~I*x`>C{B~^A(X0Sgn@)gn# zCx(*b;J>ERsXj8v!nMt^oOZbbW-giL=g*4Ri{r#ZMGJm-e^CUC1;@pSYs@DehW9vR=_!oQfSoj3yN_B7fNr#N)x84Dlkw z{niW-O}Ml`VuV=WIwZZShMYF>zj{@w=9vS6fT3uj3Gx2Ux?5HwEO|V6)((V;HpV}9 zz}-4E*(pD-xTGXXNJwaQ_Sv&PyJMD0DMr+F?_Q|ei|@X6)kWYd#D|x+tREMcSfzWa zcDpw`dpVz+>)ALv;d^&&;B!Arru#ovt7KQJ(+4j@uRZ#pl-I3BL*}&@3(bX*Z>DR1 z{)h+e{QK3?(h|?Jx>{r@cyqI?%$4Jj?fJA}uln=SQ8mQr_7@O)6g%vYRV4y<6)QkP z=z_x7TZ7RQ)9&qmB#&(inW*48GOTjKx&=k1z4DhXvGH+S6x(A2EMeBwG6S2Ms>cjwc3wlb(UzZSuM;ys#tEO?6s<9&P-G@mZlSu@bj?YFI78<{Ql;!bkatZdKRVqPK;jW3 zDM&HWxVG1U#%nLtR8W_hjw(t=ob?;5#$TC7Dd3;S&yUZ9dYyX`MIOb*7J>`bM@E#D zrO&J@nw!@P>jn)qXT1N){@#|NDn9a+XI6=I<)`5~;pzc*|F@0oqjvs-pS!p&xk%e} zs7?Hsx?`rwTL#`_cD^(q*^lM}0nXRPMqSNzh*B}Ltgi@wSu&A!h$$hrNZER9J|m5D z-W@X-ox;H~VO@W3Z*&Nm5HWmwbYR2CcR4vLCyO?-SfaelD@IeGt-X0P_e=U6y(yXo z0r_qRt8_D|4D(9UXIGIwA$L9K!AyHYik8;BzPeYIXbT1e{E@Kk=fs!N{$Nv5+^Dp; z1rkl$BgY#)K0ZZHxD<=4TmOElHOy8t7E95sv_uEFgI_1qf>O3}W{HP1m8bsUd^u~y zCD<4hiGtM9DO!UpZ*TLuUN~qi%v@S5pGlzW*fZ>TGoU&eiak00?o|3KUZ-%xMEq4> zoxyUE4AH74=H`%stD9T5F*2Y1j{nW=vhpgn7%hn~$Cat0WF8siB&!sderN$ zU^F#rYs71ckf=fR+2Md+XZyTR0Gt^|HsXx%?)%vmqv}&+CO&1>@SkyFRNHGmhEn=n zH1n~R)nbRwEmygsd?tVUS-pIjxlw9YUF*91y*JypdGSMo&xEMCc@cOhChJ)5;&0=j z6sx4)@58C8*(xk8nxP6xvIO>wM_He-gh(_>I7RmY3OUTkqnsMFI~zN?Hua_iT=za$ zmu$2#|1O7aL{i5=LO==jY=qr9Tl!9$Plw* zBcU*O`#TTqx@1by9nwZSZ0+&IuHTIe%53rG&KtNbQUpbBZ1`SZ{Px<^#4R*i=!MeM z`OO1{*?DQHWMNs54!lKKWG=*ekH7W&8|d4zI(G54y{gVRp2PNK!xE&C*m`zw2|i zeD^3U%Je*aI8E&)V$ok&L!#@-%-)xc2~5Y)$M2F=&xg;Sy_nLw>obr~BaI0}1w_Qc zXW&c>7W9&a5E5^U9|+^Rp7JxaukOFHvbSx8g=XTc!?C;}*i|hiwWcsXKe@^2X*))+ z)?KaM_uK1?Y07{Cm5i*dYMFgRY*}kw{&?cGVmIhKzR(dziwoKL!i0-zqiJi@zp#vG%7l z#>L7F)Z@$-FX(j&Z>}cpw5^kU8fU`L+>F^NEGz;;3fX7bEJ?F?M$$TA;Ii#@1uN`7 z*e(k;jYo?mITS=ogWsW{zCJCHPo4LmG5ny>FgRd+jSc~KJD>KA<9fxuB*H4)s@BqM zXwl!{Xn!k{DRj59x?_3#?)Aqpkku3 zm3jQA`(V3l1_Z?|p*Ht;A-w8jFe%I*9PnR&zke#L_L=@GlBq#^PhSl!YE)XJ_%?w! zC55dxS3h|0Ag#N*TTthI8KvlM@I?fvg_IJPapCV&V7OoD`mC)#Y!}{ipdLfT)dA|^ zz=C}6!T#UtNxV;H!e>IS@P?3y4EfkG4+qivIl(N}@lUQ|x%Coo_-0jWGL%vT#R% zKDj_h0(r2pqf!>fpQq}U`AB;Dx_#2SJ z1g4x`7>DnNn5jBj1V5Y)lHYaQ$DcaZ|G-n@C^VU>=!M<{V%Of_Yur(!TS zuPn(8YYqo^;a^o?+g)MixIZzP#0ma0PYG=hJ{TTb^TD}0U5lA~pS0R0AC4691VFPG zfaU4t*k2?C{Y_%1u#&(3>*KR@^@GEOnWOGn=h}#fh#yqGd+EeYh;|pw;r&7TWlbv8 zh8;9IJ6vm9Rg2bNT3R{}(D>fT?zfD9wW*dy%qi%5jJ7HGAog5(OGozG=xByC8||@l z_@cg|+Ro(t)uW@MHw-WS2}dmecHtPM?-H+{Mu8K&2>-yVn-h7Z)WGo;;yk z-}`hsfRT|=^k9Gg?`yG#oY;X#I(j{cxNC*=kBdu_)b{_31Hk#S0i<*^TfACd9p_Ea zR6<`Qd&D{)Ze*2`{gWwDLlLh|#Wz_>Ec)AjbNMHU)zyBw40}>~ zke>-Pzv}j%LWzzAyD2EhcHt0Cv&IzCbX{EcajMv}gXO8o@Qq>;RdKGM4 zMMh6j&IUi*2KHMQ8~%jn@OhQ40{^1>>D3I|IBbSpGeB5TqzajvVm33M}_1p8${@ zqL%x612 zbwfi#_c~)4MUH>w1P5dlm%eRm%!uBg%j%lA#?L$$urelVcb+Yj!Gouv@k|e4;H_=y z{-F~Mp@{V6P;?OgD%Um3^c2Z^c!-A#+-|SCRXsAiotT)6J)rD&t3s++u}1_M<=qrC zf!9!llzolRncRG5Ne@F(?4ogWE;LfN!@;6UtOCr>uU99h5r6XAw0CrRP+&5QSl}3s zFA!hpEy>~Zz+j}kCmMX@at991IeTb0)gT<`aB;1r6gupk9%_vIkEw)@0LB_0AO8d} z|K{!Ry^PWRUw#pZw<_D<#Dbfci=!+6ZX6%1wYcr9O-;3hh5}GKu~X1?&x49^ouCz2 zJm}r|4rbfiJv+UtEBNfSsosy#cCZU#V`Jy;OigLeZqudH_SM}00F#OWwt2F@esXk& zdVAgY-@kvqxX3wRMg4-2Dc^c34B?bvhrFCMb8)76n)y%9&{LJ~Oa;ztkJ<-U7TPVa zGpI$1bk(6Ho*7s`H|$TwN5k%hgs6;x;!!slkEd_P`ogg(%Ur5-{jB&T{HUTN_Srws zE+_S9*-VV<&Fp_~Y*5+zz;btgf8VXkJB;W@tV5U9*Vikg^iiJdPY2HwEh_^QKSG5z zL4*{3eMu@|R(#<`L#TwLs4yPbJL~Ifi@hfcN#P+I6zYew-8s|KaDi)||FEMaK?s|J zgJ`cOa(nJ|AMIe6Vme0vC}^Hk)F32rIzwuc&##0^_M`AdSIQ79=E{^k(5~i zfN)d{VUR-Pty!3hiiuIoG@Tstl$CwMD%rBM>?8Wlc5?_Me>lCSnUm?AOX`1@?RR#z zx97S3lF@$`^b$Yyo4%u)+Ns^--Isb-StuA%kJ2{$=&op=qVuJn@8u^>CFm*RX zO`bD;erd0xW8(==x@WQndj5NG{Q|W&Wlg1Q;J76W$Jc~p zo&B;U20j#1k`q+6(8HvHwE{J()-g~Vg=Q}H)O-2zWtUbgV}01cm6>-cnK#T>weMv! zPu_D+3}2Iz3jW3B2Zu?#$Dm19bT3S&<%SbYI8PV?KFTk zSx-3StX?Vhh*FZdn`0xW%|e)Yuw!!-gW)>I%UJ*Rt(k3(wm`(~F<Ls`iqqdkkeZT!8)4**te+j}mMYYqZ#@BIGxE({BMe(yeyp2Q-cLsb8L)nZrO{4C#g z`dovn9Y(H7hzxp|W%n-}o$O1W{AKKzsV*;D>h4P;=&x}Rs2?l0|98umYNmXpY2~_v z2x#Aw<>Z+6i8~$PRv=9WB>n3u zB*g|bSs#g5x#gR@-ac9n#W;(;WbAU1o!zIixcIo>tBH~~c)lkG#Rj5t56-RWkuEi{ z5z>sLNzpG!h3(v!t$MJ}JTTI2=q6nMZwg7>@aGz&Nh<1ik;49Vnba3m!g$u6ib`T81XiY(V;k^-pq)bjRoT@l}Rasg2?@wV8|d?^W_1?Hq4XNku@8>Z^v?dLF8(PmI9sl21S&K|6ex{I5;|3NoM z<>4?Xixa>%Z~?wb1!NBURK23}W(GTFZ1YU?bipq7oM{i`F;?3$!`RqlXWQbZ*s&7$ z=@=EycJB)Nu_w?|OLVa+_#hL&zmJ5T{U;T$Pb1|btm~wfJ8(E69sclUt=V6YT83f_ zpOdt-=3mlT{s-Aothp(94VMBuNdy?ocy0XRQ*hq*TkN)fz-jgM^?#FyQI#z@xPt1U zqOK=*P~@daQSuM&1=n`?S6KU;bR&MD^~nuk)8JpXJFMkF(?}cJ>9oa;gixA*J*yPs z4R7tRm6ANxAT0V`4Q6wvCzx+Od>`^;&x?FZk6tXWi$e&kXg*$EM)h}hZ-)z}G4q7O zuY#qL-0Sk2oUc_GyuGrhE0S`Sy@iqnr;D{yg>9aJnDG7B%tN}^&U&%jkUHs?z0vRU zO$;lJ;Y0~=$GqnCyx}Xg5r8!eZnG;n3xoTXtCC!a_dC{9q?*oYNbZ__qojkJ>GMr) z7?%tkpC&(b<|nkH_WVi=!OoNUQPei}VSB%~UE~&vRg8!}2dxJb^FojfafkPc;qfz^ z;LXsrAMPzW*L4a8Z@fCsxQ#+iCl-jaIVY%qn~-)*=&f6EEBYLjf#_V=&)=lcfUE2+ zj2+!JA31+E{u4lz!AD^oBltH%l#%ATp|!)Oq*tO)ER)#Wm+W6FE)MX?D0RsN7JMK+ zgT)KW52czW8x*}AwF|CX1&`xGt))SsnfDGm^2@bQ<#a2+LX)|$w0_$#x`7*W|p z-{%$!kb-%@WT4p4ldaDkYD!8R6O9=AU=?2WT7cAfS6=OX{CMME+HJdgcNLYJsKdWA zXf810`;~qlOLN%t+J!9^Z37zb>C8GibqEr%sgW%Fx=b(kq#x4^SZ$jDD++9{mHjfe z@g&49b{N!VCz(4?F5SNCbe*3=LHn;U|8u@n(+^IyOS4+Brag(ghSv&jmW0Y9CZpCV zpQ;Qoy)cBBNly@oQzu}(T?qp8=@Z528{LA>%5EIfAU1oJx3b>swPL_N@!3+r51k!` z8W-e)VD2ngJ%?J(@pdN*{L>0M3rmeOiGs&mjk1!-i*SJqahiwyQQrr>Vp;^5{{9sL3wb@MA&! zo%MKoNkM`23Mgr4?zlfvk&EYde;%`anTIJ=9tpA1E^3JxgXOGK;HdUjzv%=Xp~Y%d zoTjI(8nTNu-NL<)dW}$dh3WMCO&Fr&N3h$3!!)*Vp9`-i3hNamFKytiZQJu>VFHLc z^c&~vNuoe)5Z3iuLOdru3B{b_2x^A>qmo#@y=;vHT&jZM;>W>430-FDLt4ZWehzw0 zF{2kZ3=9n^qlkG!`T5%k_~Uo>DpPvFgmNhHQ#hbLKD)^sr$j~7I>`Ka8>_*O8ZMnk zd)DW61nA2T0Jg#wMj)P$XW=PBlzDt$t6g)tA;Y0yl%sO4|J4v|@IV@+K&6|^;hMm$ z8h|EpI5RdPC*m^vrTo!C(Xt}_`7AzwylsD-3l9d{ly|2H77fw;6Nc$ZFt8mk8hl8RtFj81ggH$6&6-NC zvr1P`Q{&}N{=ofcyyExhupuEfmN zz>uW-pYOl3g<6e&EV_cXJ|qXVegFJ9p~Dir&z-{#n5xh)NOly?-zQi8-OEKZW3%t^ z&tJ^oLGsFU=ZQZ)-O+kQKZ|F&5$hEH=|ins#@sZZF?{=cpj=*FzU(!GMD%N0uv(l? zQ~6=gT@s`+tS#}Cj$b^Y`gnSuoyQ0MjiIy9Gwb#<*PAdDGV4FIuGx@+@jKI-XSMG& zljN{AJGvxiLJ0ONrALc!m(yUSK3J&pS3{T5ZKcv$8OHqh(g{=H6BL#*yxNW+$lzEj zPPug&{LjUh1pv)gnkuX4vx9g5BjcGU?ghv{)-2DO2O{a2`w(U1ye1Ncyb8oZBFDWS z^sK4iNIf5uKhO`E`FB1Q(Pb9EYt$e;vWlD0O*YW*J2+`96l79f*%NzyOI8l(Pjl6< z{6nMFbQt-DQfEZOX4f#^Sa&OT34QTxU&*0C~^ukL!aH3vBAf&7+xN>1^0Yb9d@i#%w2t5=u z;AvPOqfsV$G|mZ4hOPQoCE5_F0y-0ZOBHmVAlNddtX+PYcrj*MZv=d4BT9+J5(H&s zWTvnz9f;%!rX{~M;CN+aI`Z3cnT~;;0TxuJ1|qWf7CX#jNhxrE&~}oA$n&-zT^xC} z&kZ>q!>?}EqT_MPywHOmQ9{Johj<912MLf5LW(VqC?mBatkOk5qtv&sX~kA#6pL+L zgn1;cznV_wpouknh6E9%9#V)?N7WpLb+~3Gj$&x=60q0bJ4oJdkW~1G7o_4gHT^=W6@iz%4RK$UNMqHORXu$4!9XU$;S8A?t~^;ZPu_YFdC(u^_CEPNhRP+3_k( zkT@1~%S113X@euIqr>g*YMj)%EdLqt{lXH{i0nrNt91*+WnTH zntp9VQ*dPJE58`2qI|V{DOGk9o$d3G>_ZU}MSxE^OLl`wGR`0o3qXbJ-N4xb3~D}< z3CUn>s^K3e*gyU>^K@{$T^7)LK^-3;*2E0~EPoCn^o3F&dd}4d}H0bV@kGet=Pd-0-*Vh0~~La=l@RX0M|#f!T@ZkjQ)_^> z2#76Xb5-ADc@d!Tj^1cayOwt$Nl@k7cj&9u$ti1a#z1_10&3L1g%s(k_Vr<|-&Ch&D~HYwjoD>o?xzjv3%Hs1C7B z5+9d0ttcoc-lTi#2{Q4c6c|CY5)%`hguxO+gGNp zhC?c+CuoW_)dS81_DY+Kaz5&{k7~rW1A5#XAHI=}AkNKuRtFgYI2XCh;eBeVzrX!{ z7`_0>om_n9VRG-Q1~&(X2D9^*mqtnpBc=ah{FKUGg=!U2fi^rGtp1xWTs?(=}WgM@Q@E4^wnMC;72Lp zQSZyLice)#Wp4VVdh7nu3%aD|eh7K6dGo1h=dXz*k4 zjvRjC+*Ll4tq+@vmlKNvMmHibC#v`M6~D~S^HGA!RN#MQQF$I1W}5f@_LV$VVXFDs zheWU|M58RkSzAx(=B?%LziGP)3R}6GJfaEgTa7#vxJwl3@EkPOj1fUlFx+efTGsQ& z*8~eV`BCVn`&3t4`_eD4%-;C$+PvIX)aT*phwfd1eI#mgm>ApbO11C)TxkZL1+Y%{ zg>{)7@ftG5pgjV7M17xhM@ZS{lyIZf9=i7Dd@4hV1HXUr!IF5m+iI$oLH5eDY4pi{ zZFc_gb2c>UGm~zzjJ*8Z1h!WsGyZ#J-&tD9>dujwfRospxv<@aQRSW#dkVg@^G#y> zxdXwCJ`ul@6`qrBx!d~6s0rBjI zGpVMU=TfTL_m|FCrC)eP&x-uQAQ0UTZnvs+sci5|Rh4O}ncvc7dFTv;!LLIqLZH(P zCDHzjp^yeGV|t&3zQsLD;zL8^c0IQ~PQ#fKxUUSdWAYTFy9XPxi@6B~D zR@yWgxyhaDh@U=3GihP}Vt^@!iDL2zmYWKt3G~E~aR5ts;5Jz!M` zoW{-NjV>2SC62vG2`?nIsVum(`yOEkOw3q?`FPZO+P&6BV3YEndNBI(^Tt?rZxJHW z{CemXldWH`$k3?m{eBP8Y=$OF{?)b<>Cemc3l9fruorbBlg|2G%eVa3zL0KX^!A=K z!80&Lqoyn`H5v3VGeOIh7(~?7TjgdiwvQ%yJGk)+^PABz=+0nbY>cuYl~X{#_tBY| z+>W*VW#i%@Pes{8jhgdMh2sF^CW&O&DIZnct>!T-8G^9~5Fueg3r>Gw&+2%eu4y-n z{Dr{rVgWw3vQlx9Zi7*s1}PsqIEO}6&;sxTd;rZ`ZR@J@ObB#F&yob>1?A+dv#<$5 z^pllX6`8kdl(++GD%$mTzta`vG83{dU5{|k7V4AJ2L`&+J@d19xr$5I*to^&NCNj? z7)k}EB+a(;MV&6J%92B>760#_KRMmT_p(}zo1s)jUz~{s_G-a$Gia&Tn&uLP9v8^4 z3w1!gea!e0w*6Nzc@#Kal`q&8%2YiOV^DXt60fW&nSz9nYI>6yWoz=W?lYkOwNB&Q zyLu%c!59#3wpGV8z&3p623pS03VAD{$TCv&TNs)PK zt353Ah<`J|CkIT+%~ee+`zeH-WtGKWadbuW4otQ<7z9eG>&P52d@o8}i6HJOmBI%n zJ_g3h;^N}Sj?f98>(Xs2bt`XM#&RRX=8YkoYrb*7QqVel#)E|Ot3mg9J2?q9tv;3% z^=;jopOd=74?<>w+27a!s$A>(mn%#QbykgWSoqqLbw7V~M*FvLJFovbwVhE#te~yf zAu@%KG=OiwQAZd-SnjIIuJnQZ4eTwc&WH-ScY*FCG`YB%& zz;N`o5!}_|(WpzH&kI_wY|Lre&$|2Q`t|Fbf&$`}KERR$ELTS$P5<364*3ZhtOCwQ zv)#wycvjrh$qOy@FAwddd?Aumk1Sa@T1Z4FIuBs8i+6S=k4lYKf#JkD)bA+@Ml6dk zJ^$P9@(i`wE^!nHu(V*8t_It}a)&nP6nB1GKnBrSjX(hDELASOzX6eNGw?F{7}|La>_U5x=sFE&&73^JWw6A5~z9L;>v z-oFy{BPX!PJcEM9*ZmxwN#!Tbq{4$cgW@m_#EjTi#IPU}FW z!bif5Sg^(-clXdv3L~YAUG=-+g zdxx^AO^2ZB+j(^7k_GgbB#4TQkLD+cy)rN~qEg@9NLmN9-N8q|FPhzCJwuDMIAxLm zF#-%d_3B4M>Y<4!O;F-Ti^T4V9ot1lrO&(>{9|w+Pb&P+W>%0DY__yMS74<0w4i>n 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/stick_main.png b/src/android/app/src/main/res/drawable-xhdpi/stick_main.png new file mode 100644 index 0000000000000000000000000000000000000000..3f80cdf6c2c4b3fda6f66019409ad786f32be7d6 GIT binary patch literal 19086 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 P?HVbXyAP$_H8ksAt`02y literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/stick_main_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/stick_main_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..2a7675ef78460a239bc7f5a38d29b2f806a05ff4 GIT binary patch literal 11657 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"s)fFZ9)5@f0(O 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 aIc~e3MS>*TtQ2;FT17!qzC_ma+5ZCrv@PKP literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xhdpi/stick_main_range.png b/src/android/app/src/main/res/drawable-xhdpi/stick_main_range.png new file mode 100644 index 0000000000000000000000000000000000000000..ca1672caf039db8d9019fb19b37b18b41816c053 GIT binary patch literal 53646 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�yft!EpT|x1-@bK_ZPqWjx8U{pG9;(z5z;g;> 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 P00000NkvXXu0mjfSHG7t literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_b_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_b_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..86f5d535e2f00126e93d62ac953d1d1db9d64952 GIT binary patch literal 20591 zcmX_o1z40_wDp-8U}zALE(=Kk=^n5L2?^F)Z^eE0sBM;`=+c~9)K_S$Rh<5L~2>vYr{)Bpgwn>ViL0)W7g{!&uF?|f(~t%qM| zIO!XC8)@EBuyuF6Xnoh+#_pn@s|Wl!07|NU9@e(bcHVq8b`DN%%4e3V>(B5x-Bmtg zD6J{3>2cZ4(dkBjr=4DamcDI(v#tEyGpZ`oN`4CP4P5QKt@-?1UEI7B{FKl9_r417 z-=uGgo#FfMCEm`;XVgd!^WdQiV%`0m9erXFM{?E;R`>P%- zS86OPk0>kWez5KgCu2fBql8Tiyr` zdtUa9h2-GQ>}@hU%a-BYyntvEOJLiy8bPtZ0#1NGU4_58noKYeH4+nVlR^w$^Gv>B z?~q^LUVj@#ahzQ58|s5)*sr)wjd{26TIetZ`JC)I1$k5@#hFH-XDECv|4d6LniwEwxL5~#_#(K z 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 h-u29LFS0U);6Gj`7Z4P%Is5|C3#kiWvWJ_|n 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 WwITgEe5Ze3P=dD3Hq|Hmul);${FNpE literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_r.png b/src/android/app/src/main/res/drawable-xxhdpi/button_r.png new file mode 100644 index 0000000000000000000000000000000000000000..abbcadede116fbd0d2ac6de817ebb88ef11a7197 GIT binary patch literal 11960 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 ToW>IloZq>juU(^Q8}okvE_YLs literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_r_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_r_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..07421767fdf0575e98ab96d9a8f966f5edcd3074 GIT binary patch literal 11969 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_select.png b/src/android/app/src/main/res/drawable-xxhdpi/button_select.png new file mode 100644 index 0000000000000000000000000000000000000000..42c3b7c43c258a25f4633454edf69ceb5b5beed6 GIT binary patch literal 27251 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 literal 0 HcmV?d00001 diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_select_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_select_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..0d1e56f6ae46558613b6a4a184e771452b8835f1 GIT binary patch literal 27436 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