Compare commits
6 Commits
android-23
...
android-22
Author | SHA1 | Date | |
---|---|---|---|
4a76eaeaf5 | |||
19973127dd | |||
6a88da3923 | |||
4d24a4d5a9 | |||
e25355eb2b | |||
5264702256 |
@ -2,10 +2,9 @@
|
|||||||
|----|----|----|----|----|
|
|----|----|----|----|----|
|
||||||
| [12461](https://github.com/yuzu-emu/yuzu-android//pull/12461) | [`4c08a0e6d`](https://github.com/yuzu-emu/yuzu-android//pull/12461/files) | Rework Nvdec and VIC to fix out-of-order videos, and speed up decoding. | [Kelebek1](https://github.com/Kelebek1/) | Yes |
|
| [12461](https://github.com/yuzu-emu/yuzu-android//pull/12461) | [`4c08a0e6d`](https://github.com/yuzu-emu/yuzu-android//pull/12461/files) | Rework Nvdec and VIC to fix out-of-order videos, and speed up decoding. | [Kelebek1](https://github.com/Kelebek1/) | Yes |
|
||||||
| [12749](https://github.com/yuzu-emu/yuzu-android//pull/12749) | [`aad4b0d6f`](https://github.com/yuzu-emu/yuzu-android//pull/12749/files) | general: workarounds for SMMU syncing issues | [liamwhite](https://github.com/liamwhite/) | Yes |
|
| [12749](https://github.com/yuzu-emu/yuzu-android//pull/12749) | [`aad4b0d6f`](https://github.com/yuzu-emu/yuzu-android//pull/12749/files) | general: workarounds for SMMU syncing issues | [liamwhite](https://github.com/liamwhite/) | Yes |
|
||||||
| [12756](https://github.com/yuzu-emu/yuzu-android//pull/12756) | [`cd3de0848`](https://github.com/yuzu-emu/yuzu-android//pull/12756/files) | general: applet multiprocess | [liamwhite](https://github.com/liamwhite/) | Yes |
|
| [12756](https://github.com/yuzu-emu/yuzu-android//pull/12756) | [`f6e8080cb`](https://github.com/yuzu-emu/yuzu-android//pull/12756/files) | general: applet multiprocess | [liamwhite](https://github.com/liamwhite/) | Yes |
|
||||||
| [12903](https://github.com/yuzu-emu/yuzu-android//pull/12903) | [`5be8121af`](https://github.com/yuzu-emu/yuzu-android//pull/12903/files) | shader_recompiler: use only ConstOffset for OpImageFetch | [liamwhite](https://github.com/liamwhite/) | Yes |
|
| [12874](https://github.com/yuzu-emu/yuzu-android//pull/12874) | [`f410cf681`](https://github.com/yuzu-emu/yuzu-android//pull/12874/files) | Revert "shader_recompiler: fix Offset operand usage for non-OpImage*Gather" | [liamwhite](https://github.com/liamwhite/) | Yes |
|
||||||
| [12905](https://github.com/yuzu-emu/yuzu-android//pull/12905) | [`5eb5c9675`](https://github.com/yuzu-emu/yuzu-android//pull/12905/files) | nvnflinger: release buffers before presentation sleep | [liamwhite](https://github.com/liamwhite/) | Yes |
|
| [12877](https://github.com/yuzu-emu/yuzu-android//pull/12877) | [`818721d12`](https://github.com/yuzu-emu/yuzu-android//pull/12877/files) | service: hid: Multiple fixes | [german77](https://github.com/german77/) | Yes |
|
||||||
| [12915](https://github.com/yuzu-emu/yuzu-android//pull/12915) | [`504abbd6e`](https://github.com/yuzu-emu/yuzu-android//pull/12915/files) | dmnt: cheats: Update cheat vm to latest version | [german77](https://github.com/german77/) | Yes |
|
|
||||||
|
|
||||||
|
|
||||||
End of merge log. You can find the original README.md below the break.
|
End of merge log. You can find the original README.md below the break.
|
||||||
|
@ -9,7 +9,6 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
#include "common/assert.h"
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
|
|
||||||
namespace Common {
|
namespace Common {
|
||||||
@ -30,8 +29,6 @@ namespace Common {
|
|||||||
|
|
||||||
template <std::size_t Size, bool le = false>
|
template <std::size_t Size, bool le = false>
|
||||||
[[nodiscard]] constexpr std::array<u8, Size> HexStringToArray(std::string_view str) {
|
[[nodiscard]] constexpr std::array<u8, Size> HexStringToArray(std::string_view str) {
|
||||||
ASSERT_MSG(Size * 2 <= str.size(), "Invalid string size");
|
|
||||||
|
|
||||||
std::array<u8, Size> out{};
|
std::array<u8, Size> out{};
|
||||||
if constexpr (le) {
|
if constexpr (le) {
|
||||||
for (std::size_t i = 2 * Size - 2; i <= 2 * Size; i -= 2) {
|
for (std::size_t i = 2 * Size - 2; i <= 2 * Size; i -= 2) {
|
||||||
|
@ -118,17 +118,23 @@ std::shared_ptr<ILibraryAppletAccessor> CreateGuestApplet(Core::System& system,
|
|||||||
switch (mode) {
|
switch (mode) {
|
||||||
case LibraryAppletMode::AllForeground:
|
case LibraryAppletMode::AllForeground:
|
||||||
case LibraryAppletMode::NoUi:
|
case LibraryAppletMode::NoUi:
|
||||||
case LibraryAppletMode::PartialForeground:
|
|
||||||
case LibraryAppletMode::PartialForegroundIndirectDisplay:
|
|
||||||
applet->hid_registration.EnableAppletToGetInput(true);
|
|
||||||
applet->focus_state = FocusState::InFocus;
|
applet->focus_state = FocusState::InFocus;
|
||||||
|
applet->hid_registration.EnableAppletToGetInput(true);
|
||||||
applet->message_queue.PushMessage(AppletMessageQueue::AppletMessage::ChangeIntoForeground);
|
applet->message_queue.PushMessage(AppletMessageQueue::AppletMessage::ChangeIntoForeground);
|
||||||
|
applet->message_queue.PushMessage(AppletMessageQueue::AppletMessage::FocusStateChanged);
|
||||||
break;
|
break;
|
||||||
case LibraryAppletMode::AllForegroundInitiallyHidden:
|
case LibraryAppletMode::AllForegroundInitiallyHidden:
|
||||||
applet->hid_registration.EnableAppletToGetInput(false);
|
|
||||||
applet->focus_state = FocusState::NotInFocus;
|
|
||||||
applet->system_buffer_manager.SetWindowVisibility(false);
|
applet->system_buffer_manager.SetWindowVisibility(false);
|
||||||
applet->message_queue.PushMessage(AppletMessageQueue::AppletMessage::ChangeIntoBackground);
|
applet->focus_state = FocusState::NotInFocus;
|
||||||
|
applet->hid_registration.EnableAppletToGetInput(false);
|
||||||
|
applet->message_queue.PushMessage(AppletMessageQueue::AppletMessage::FocusStateChanged);
|
||||||
|
break;
|
||||||
|
case LibraryAppletMode::PartialForeground:
|
||||||
|
case LibraryAppletMode::PartialForegroundIndirectDisplay:
|
||||||
|
default:
|
||||||
|
applet->focus_state = FocusState::Background;
|
||||||
|
applet->hid_registration.EnableAppletToGetInput(true);
|
||||||
|
applet->message_queue.PushMessage(AppletMessageQueue::AppletMessage::FocusStateChanged);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,13 +1,10 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
#include "common/logging/log.h"
|
|
||||||
#include "core/hle/result.h"
|
|
||||||
#include "core/hle/service/am/am_results.h"
|
#include "core/hle/service/am/am_results.h"
|
||||||
#include "core/hle/service/am/frontend/applets.h"
|
#include "core/hle/service/am/frontend/applets.h"
|
||||||
#include "core/hle/service/am/self_controller.h"
|
#include "core/hle/service/am/self_controller.h"
|
||||||
#include "core/hle/service/caps/caps_su.h"
|
#include "core/hle/service/caps/caps_su.h"
|
||||||
#include "core/hle/service/hle_ipc.h"
|
|
||||||
#include "core/hle/service/ipc_helpers.h"
|
#include "core/hle/service/ipc_helpers.h"
|
||||||
#include "core/hle/service/nvnflinger/fb_share_buffer_manager.h"
|
#include "core/hle/service/nvnflinger/fb_share_buffer_manager.h"
|
||||||
#include "core/hle/service/nvnflinger/nvnflinger.h"
|
#include "core/hle/service/nvnflinger/nvnflinger.h"
|
||||||
@ -50,7 +47,7 @@ ISelfController::ISelfController(Core::System& system_, std::shared_ptr<Applet>
|
|||||||
{50, &ISelfController::SetHandlesRequestToDisplay, "SetHandlesRequestToDisplay"},
|
{50, &ISelfController::SetHandlesRequestToDisplay, "SetHandlesRequestToDisplay"},
|
||||||
{51, &ISelfController::ApproveToDisplay, "ApproveToDisplay"},
|
{51, &ISelfController::ApproveToDisplay, "ApproveToDisplay"},
|
||||||
{60, nullptr, "OverrideAutoSleepTimeAndDimmingTime"},
|
{60, nullptr, "OverrideAutoSleepTimeAndDimmingTime"},
|
||||||
{61, &ISelfController::SetMediaPlaybackState, "SetMediaPlaybackState"},
|
{61, nullptr, "SetMediaPlaybackState"},
|
||||||
{62, &ISelfController::SetIdleTimeDetectionExtension, "SetIdleTimeDetectionExtension"},
|
{62, &ISelfController::SetIdleTimeDetectionExtension, "SetIdleTimeDetectionExtension"},
|
||||||
{63, &ISelfController::GetIdleTimeDetectionExtension, "GetIdleTimeDetectionExtension"},
|
{63, &ISelfController::GetIdleTimeDetectionExtension, "GetIdleTimeDetectionExtension"},
|
||||||
{64, nullptr, "SetInputDetectionSourceSet"},
|
{64, nullptr, "SetInputDetectionSourceSet"},
|
||||||
@ -327,16 +324,6 @@ void ISelfController::ApproveToDisplay(HLERequestContext& ctx) {
|
|||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ISelfController::SetMediaPlaybackState(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
const u8 state = rp.Pop<u8>();
|
|
||||||
|
|
||||||
LOG_WARNING(Service_AM, "(STUBBED) called, state={}", state);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ISelfController::SetIdleTimeDetectionExtension(HLERequestContext& ctx) {
|
void ISelfController::SetIdleTimeDetectionExtension(HLERequestContext& ctx) {
|
||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
|
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "core/hle/service/hle_ipc.h"
|
|
||||||
#include "core/hle/service/kernel_helpers.h"
|
#include "core/hle/service/kernel_helpers.h"
|
||||||
#include "core/hle/service/service.h"
|
#include "core/hle/service/service.h"
|
||||||
|
|
||||||
@ -39,7 +38,6 @@ private:
|
|||||||
void CreateManagedDisplaySeparableLayer(HLERequestContext& ctx);
|
void CreateManagedDisplaySeparableLayer(HLERequestContext& ctx);
|
||||||
void SetHandlesRequestToDisplay(HLERequestContext& ctx);
|
void SetHandlesRequestToDisplay(HLERequestContext& ctx);
|
||||||
void ApproveToDisplay(HLERequestContext& ctx);
|
void ApproveToDisplay(HLERequestContext& ctx);
|
||||||
void SetMediaPlaybackState(HLERequestContext& ctx);
|
|
||||||
void SetIdleTimeDetectionExtension(HLERequestContext& ctx);
|
void SetIdleTimeDetectionExtension(HLERequestContext& ctx);
|
||||||
void GetIdleTimeDetectionExtension(HLERequestContext& ctx);
|
void GetIdleTimeDetectionExtension(HLERequestContext& ctx);
|
||||||
void ReportUserIsActive(HLERequestContext& ctx);
|
void ReportUserIsActive(HLERequestContext& ctx);
|
||||||
|
@ -38,8 +38,7 @@ bool SystemBufferManager::Initialize(Nvnflinger::Nvnflinger* nvnflinger, Kernel:
|
|||||||
}
|
}
|
||||||
|
|
||||||
Nvnflinger::LayerBlending blending = Nvnflinger::LayerBlending::None;
|
Nvnflinger::LayerBlending blending = Nvnflinger::LayerBlending::None;
|
||||||
if (mode == LibraryAppletMode::PartialForeground ||
|
if (mode == LibraryAppletMode::PartialForeground) {
|
||||||
mode == LibraryAppletMode::PartialForegroundIndirectDisplay) {
|
|
||||||
blending = Nvnflinger::LayerBlending::Coverage;
|
blending = Nvnflinger::LayerBlending::Coverage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,12 +62,12 @@ void IWindowController::SetAppletWindowVisibility(HLERequestContext& ctx) {
|
|||||||
applet->hid_registration.EnableAppletToGetInput(visible);
|
applet->hid_registration.EnableAppletToGetInput(visible);
|
||||||
|
|
||||||
if (visible) {
|
if (visible) {
|
||||||
applet->focus_state = FocusState::InFocus;
|
|
||||||
applet->message_queue.PushMessage(AppletMessageQueue::AppletMessage::ChangeIntoForeground);
|
applet->message_queue.PushMessage(AppletMessageQueue::AppletMessage::ChangeIntoForeground);
|
||||||
|
applet->focus_state = FocusState::InFocus;
|
||||||
} else {
|
} else {
|
||||||
applet->focus_state = FocusState::NotInFocus;
|
applet->focus_state = FocusState::NotInFocus;
|
||||||
applet->message_queue.PushMessage(AppletMessageQueue::AppletMessage::ChangeIntoBackground);
|
|
||||||
}
|
}
|
||||||
|
applet->message_queue.PushMessage(AppletMessageQueue::AppletMessage::FocusStateChanged);
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
|
@ -115,11 +115,6 @@ struct ArgumentTraits {
|
|||||||
static constexpr ArgumentType Type = ArgumentType::InData;
|
static constexpr ArgumentType Type = ArgumentType::InData;
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename... Ts>
|
|
||||||
consteval bool ConstIfReference() {
|
|
||||||
return ((!std::is_reference_v<Ts> || std::is_const_v<std::remove_reference_t<Ts>>) && ... && true);
|
|
||||||
}
|
|
||||||
|
|
||||||
struct RequestLayout {
|
struct RequestLayout {
|
||||||
u32 copy_handle_count;
|
u32 copy_handle_count;
|
||||||
u32 move_handle_count;
|
u32 move_handle_count;
|
||||||
@ -440,7 +435,6 @@ void CmifReplyWrapImpl(HLERequestContext& ctx, T& t, Result (T::*f)(A...)) {
|
|||||||
}
|
}
|
||||||
const bool is_domain = Domain ? ctx.GetManager()->IsDomain() : false;
|
const bool is_domain = Domain ? ctx.GetManager()->IsDomain() : false;
|
||||||
|
|
||||||
static_assert(ConstIfReference<A...>(), "Arguments taken by reference must be const");
|
|
||||||
using MethodArguments = std::tuple<std::remove_cvref_t<A>...>;
|
using MethodArguments = std::tuple<std::remove_cvref_t<A>...>;
|
||||||
|
|
||||||
OutTemporaryBuffers buffers{};
|
OutTemporaryBuffers buffers{};
|
||||||
|
@ -4,9 +4,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <span>
|
|
||||||
|
|
||||||
|
#include "common/common_funcs.h"
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
|
#include "core/hle/service/hle_ipc.h"
|
||||||
|
|
||||||
namespace Service {
|
namespace Service {
|
||||||
|
|
||||||
@ -21,10 +22,8 @@ class Out {
|
|||||||
public:
|
public:
|
||||||
using Type = T;
|
using Type = T;
|
||||||
|
|
||||||
/* implicit */ Out(const Out& t) : raw(t.raw) {}
|
|
||||||
/* implicit */ Out(AutoOut<Type>& t) : raw(&t.raw) {}
|
/* implicit */ Out(AutoOut<Type>& t) : raw(&t.raw) {}
|
||||||
/* implicit */ Out(Type* t) : raw(t) {}
|
/* implicit */ Out(Type* t) : raw(t) {}
|
||||||
Out& operator=(const Out&) = delete;
|
|
||||||
|
|
||||||
Type* Get() const {
|
Type* Get() const {
|
||||||
return raw;
|
return raw;
|
||||||
@ -38,10 +37,6 @@ public:
|
|||||||
return raw;
|
return raw;
|
||||||
}
|
}
|
||||||
|
|
||||||
operator Type*() const {
|
|
||||||
return raw;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Type* raw;
|
Type* raw;
|
||||||
};
|
};
|
||||||
@ -118,10 +113,8 @@ class OutCopyHandle {
|
|||||||
public:
|
public:
|
||||||
using Type = T*;
|
using Type = T*;
|
||||||
|
|
||||||
/* implicit */ OutCopyHandle(const OutCopyHandle& t) : raw(t.raw) {}
|
|
||||||
/* implicit */ OutCopyHandle(AutoOut<Type>& t) : raw(&t.raw) {}
|
/* implicit */ OutCopyHandle(AutoOut<Type>& t) : raw(&t.raw) {}
|
||||||
/* implicit */ OutCopyHandle(Type* t) : raw(t) {}
|
/* implicit */ OutCopyHandle(Type* t) : raw(t) {}
|
||||||
OutCopyHandle& operator=(const OutCopyHandle&) = delete;
|
|
||||||
|
|
||||||
Type* Get() const {
|
Type* Get() const {
|
||||||
return raw;
|
return raw;
|
||||||
@ -135,10 +128,6 @@ public:
|
|||||||
return raw;
|
return raw;
|
||||||
}
|
}
|
||||||
|
|
||||||
operator Type*() const {
|
|
||||||
return raw;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Type* raw;
|
Type* raw;
|
||||||
};
|
};
|
||||||
@ -148,10 +137,8 @@ class OutMoveHandle {
|
|||||||
public:
|
public:
|
||||||
using Type = T*;
|
using Type = T*;
|
||||||
|
|
||||||
/* implicit */ OutMoveHandle(const OutMoveHandle& t) : raw(t.raw) {}
|
|
||||||
/* implicit */ OutMoveHandle(AutoOut<Type>& t) : raw(&t.raw) {}
|
/* implicit */ OutMoveHandle(AutoOut<Type>& t) : raw(&t.raw) {}
|
||||||
/* implicit */ OutMoveHandle(Type* t) : raw(t) {}
|
/* implicit */ OutMoveHandle(Type* t) : raw(t) {}
|
||||||
OutMoveHandle& operator=(const OutMoveHandle&) = delete;
|
|
||||||
|
|
||||||
Type* Get() const {
|
Type* Get() const {
|
||||||
return raw;
|
return raw;
|
||||||
@ -165,10 +152,6 @@ public:
|
|||||||
return raw;
|
return raw;
|
||||||
}
|
}
|
||||||
|
|
||||||
operator Type*() const {
|
|
||||||
return raw;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Type* raw;
|
Type* raw;
|
||||||
};
|
};
|
||||||
@ -265,10 +248,8 @@ public:
|
|||||||
static constexpr BufferAttr Attr = static_cast<BufferAttr>(A | BufferAttr_In | BufferAttr_FixedSize);
|
static constexpr BufferAttr Attr = static_cast<BufferAttr>(A | BufferAttr_In | BufferAttr_FixedSize);
|
||||||
using Type = T;
|
using Type = T;
|
||||||
|
|
||||||
/* implicit */ OutLargeData(const OutLargeData& t) : raw(t.raw) {}
|
|
||||||
/* implicit */ OutLargeData(Type* t) : raw(t) {}
|
/* implicit */ OutLargeData(Type* t) : raw(t) {}
|
||||||
/* implicit */ OutLargeData(AutoOut<T>& t) : raw(&t.raw) {}
|
/* implicit */ OutLargeData(AutoOut<T>& t) : raw(&t.raw) {}
|
||||||
OutLargeData& operator=(const OutLargeData&) = delete;
|
|
||||||
|
|
||||||
Type* Get() const {
|
Type* Get() const {
|
||||||
return raw;
|
return raw;
|
||||||
@ -282,10 +263,6 @@ public:
|
|||||||
return raw;
|
return raw;
|
||||||
}
|
}
|
||||||
|
|
||||||
operator Type*() const {
|
|
||||||
return raw;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Type* raw;
|
Type* raw;
|
||||||
};
|
};
|
||||||
|
@ -115,11 +115,6 @@ private:
|
|||||||
if (type->GetName() == "save") {
|
if (type->GetName() == "save") {
|
||||||
for (const auto& save_id : type->GetSubdirectories()) {
|
for (const auto& save_id : type->GetSubdirectories()) {
|
||||||
for (const auto& user_id : save_id->GetSubdirectories()) {
|
for (const auto& user_id : save_id->GetSubdirectories()) {
|
||||||
// Skip non user id subdirectories
|
|
||||||
if (user_id->GetName().size() != 0x20) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const auto save_id_numeric = stoull_be(save_id->GetName());
|
const auto save_id_numeric = stoull_be(save_id->GetName());
|
||||||
auto user_id_numeric = Common::HexStringToArray<0x10>(user_id->GetName());
|
auto user_id_numeric = Common::HexStringToArray<0x10>(user_id->GetName());
|
||||||
std::reverse(user_id_numeric.begin(), user_id_numeric.end());
|
std::reverse(user_id_numeric.begin(), user_id_numeric.end());
|
||||||
@ -165,10 +160,6 @@ private:
|
|||||||
} else if (space == FileSys::SaveDataSpaceId::TemporaryStorage) {
|
} else if (space == FileSys::SaveDataSpaceId::TemporaryStorage) {
|
||||||
// Temporary Storage
|
// Temporary Storage
|
||||||
for (const auto& user_id : type->GetSubdirectories()) {
|
for (const auto& user_id : type->GetSubdirectories()) {
|
||||||
// Skip non user id subdirectories
|
|
||||||
if (user_id->GetName().size() != 0x20) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
for (const auto& title_id : user_id->GetSubdirectories()) {
|
for (const auto& title_id : user_id->GetSubdirectories()) {
|
||||||
if (!title_id->GetFiles().empty() ||
|
if (!title_id->GetFiles().empty() ||
|
||||||
!title_id->GetSubdirectories().empty()) {
|
!title_id->GetSubdirectories().empty()) {
|
||||||
|
@ -65,7 +65,6 @@ Result MountTimeZoneBinary(Core::System& system) {
|
|||||||
// Validate that the romfs is readable, using invalid firmware keys can cause this to get
|
// Validate that the romfs is readable, using invalid firmware keys can cause this to get
|
||||||
// set but the files to be garbage. In that case, we want to hit the next path and
|
// set but the files to be garbage. In that case, we want to hit the next path and
|
||||||
// synthesise them instead.
|
// synthesise them instead.
|
||||||
g_time_zone_binary_mount_result = ResultSuccess;
|
|
||||||
Service::PSC::Time::LocationName name{"Etc/GMT"};
|
Service::PSC::Time::LocationName name{"Etc/GMT"};
|
||||||
if (!IsTimeZoneBinaryValid(name)) {
|
if (!IsTimeZoneBinaryValid(name)) {
|
||||||
ResetTimeZoneBinary();
|
ResetTimeZoneBinary();
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
#include "core/hle/service/nvdrv/devices/nvdisp_disp0.h"
|
#include "core/hle/service/nvdrv/devices/nvdisp_disp0.h"
|
||||||
#include "core/hle/service/nvnflinger/buffer_item.h"
|
#include "core/hle/service/nvnflinger/buffer_item.h"
|
||||||
#include "core/hle/service/nvnflinger/buffer_item_consumer.h"
|
#include "core/hle/service/nvnflinger/buffer_item_consumer.h"
|
||||||
|
#include "core/hle/service/nvnflinger/buffer_queue_producer.h"
|
||||||
#include "core/hle/service/nvnflinger/hardware_composer.h"
|
#include "core/hle/service/nvnflinger/hardware_composer.h"
|
||||||
#include "core/hle/service/nvnflinger/hwc_layer.h"
|
#include "core/hle/service/nvnflinger/hwc_layer.h"
|
||||||
#include "core/hle/service/nvnflinger/ui/graphic_buffer.h"
|
#include "core/hle/service/nvnflinger/ui/graphic_buffer.h"
|
||||||
@ -45,9 +46,31 @@ HardwareComposer::HardwareComposer() = default;
|
|||||||
HardwareComposer::~HardwareComposer() = default;
|
HardwareComposer::~HardwareComposer() = default;
|
||||||
|
|
||||||
u32 HardwareComposer::ComposeLocked(f32* out_speed_scale, VI::Display& display,
|
u32 HardwareComposer::ComposeLocked(f32* out_speed_scale, VI::Display& display,
|
||||||
Nvidia::Devices::nvdisp_disp0& nvdisp) {
|
Nvidia::Devices::nvdisp_disp0& nvdisp, u32 frame_advance) {
|
||||||
boost::container::small_vector<HwcLayer, 2> composition_stack;
|
boost::container::small_vector<HwcLayer, 2> composition_stack;
|
||||||
|
|
||||||
|
m_frame_number += frame_advance;
|
||||||
|
|
||||||
|
// Release any necessary framebuffers.
|
||||||
|
for (auto& [layer_id, framebuffer] : m_framebuffers) {
|
||||||
|
if (framebuffer.release_frame_number > m_frame_number) {
|
||||||
|
// Not yet ready to release this framebuffer.
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!framebuffer.is_acquired) {
|
||||||
|
// Already released.
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (auto* layer = display.FindLayer(layer_id); layer != nullptr) {
|
||||||
|
// TODO: support release fence
|
||||||
|
// This is needed to prevent screen tearing
|
||||||
|
layer->GetConsumer().ReleaseBuffer(framebuffer.item, android::Fence::NoFence());
|
||||||
|
framebuffer.is_acquired = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Set default speed limit to 100%.
|
// Set default speed limit to 100%.
|
||||||
*out_speed_scale = 1.0f;
|
*out_speed_scale = 1.0f;
|
||||||
|
|
||||||
@ -120,30 +143,7 @@ u32 HardwareComposer::ComposeLocked(f32* out_speed_scale, VI::Display& display,
|
|||||||
MicroProfileFlip();
|
MicroProfileFlip();
|
||||||
|
|
||||||
// Advance by at least one frame.
|
// Advance by at least one frame.
|
||||||
const u32 frame_advance = swap_interval.value_or(1);
|
return swap_interval.value_or(1);
|
||||||
m_frame_number += frame_advance;
|
|
||||||
|
|
||||||
// Release any necessary framebuffers.
|
|
||||||
for (auto& [layer_id, framebuffer] : m_framebuffers) {
|
|
||||||
if (framebuffer.release_frame_number > m_frame_number) {
|
|
||||||
// Not yet ready to release this framebuffer.
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!framebuffer.is_acquired) {
|
|
||||||
// Already released.
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (auto* layer = display.FindLayer(layer_id); layer != nullptr) {
|
|
||||||
// TODO: support release fence
|
|
||||||
// This is needed to prevent screen tearing
|
|
||||||
layer->GetConsumer().ReleaseBuffer(framebuffer.item, android::Fence::NoFence());
|
|
||||||
framebuffer.is_acquired = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return frame_advance;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void HardwareComposer::RemoveLayerLocked(VI::Display& display, LayerId layer_id) {
|
void HardwareComposer::RemoveLayerLocked(VI::Display& display, LayerId layer_id) {
|
||||||
|
@ -27,7 +27,7 @@ public:
|
|||||||
~HardwareComposer();
|
~HardwareComposer();
|
||||||
|
|
||||||
u32 ComposeLocked(f32* out_speed_scale, VI::Display& display,
|
u32 ComposeLocked(f32* out_speed_scale, VI::Display& display,
|
||||||
Nvidia::Devices::nvdisp_disp0& nvdisp);
|
Nvidia::Devices::nvdisp_disp0& nvdisp, u32 frame_advance);
|
||||||
void RemoveLayerLocked(VI::Display& display, LayerId layer_id);
|
void RemoveLayerLocked(VI::Display& display, LayerId layer_id);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -292,7 +292,8 @@ void Nvnflinger::Compose() {
|
|||||||
auto nvdisp = nvdrv->GetDevice<Nvidia::Devices::nvdisp_disp0>(disp_fd);
|
auto nvdisp = nvdrv->GetDevice<Nvidia::Devices::nvdisp_disp0>(disp_fd);
|
||||||
ASSERT(nvdisp);
|
ASSERT(nvdisp);
|
||||||
|
|
||||||
swap_interval = display.GetComposer().ComposeLocked(&compose_speed_scale, display, *nvdisp);
|
swap_interval = display.GetComposer().ComposeLocked(&compose_speed_scale, display, *nvdisp,
|
||||||
|
swap_interval);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,7 +9,6 @@
|
|||||||
#include "core/core_timing.h"
|
#include "core/core_timing.h"
|
||||||
#include "core/hle/kernel/k_page_table.h"
|
#include "core/hle/kernel/k_page_table.h"
|
||||||
#include "core/hle/kernel/k_process.h"
|
#include "core/hle/kernel/k_process.h"
|
||||||
#include "core/hle/kernel/k_process_page_table.h"
|
|
||||||
#include "core/hle/service/hid/hid_server.h"
|
#include "core/hle/service/hid/hid_server.h"
|
||||||
#include "core/hle/service/sm/sm.h"
|
#include "core/hle/service/sm/sm.h"
|
||||||
#include "core/memory.h"
|
#include "core/memory.h"
|
||||||
@ -86,12 +85,8 @@ VAddr StandardVmCallbacks::SanitizeAddress(VAddr in) const {
|
|||||||
if ((in < metadata.main_nso_extents.base ||
|
if ((in < metadata.main_nso_extents.base ||
|
||||||
in >= metadata.main_nso_extents.base + metadata.main_nso_extents.size) &&
|
in >= metadata.main_nso_extents.base + metadata.main_nso_extents.size) &&
|
||||||
(in < metadata.heap_extents.base ||
|
(in < metadata.heap_extents.base ||
|
||||||
in >= metadata.heap_extents.base + metadata.heap_extents.size) &&
|
in >= metadata.heap_extents.base + metadata.heap_extents.size)) {
|
||||||
(in < metadata.alias_extents.base ||
|
LOG_ERROR(CheatEngine,
|
||||||
in >= metadata.heap_extents.base + metadata.alias_extents.size) &&
|
|
||||||
(in < metadata.aslr_extents.base ||
|
|
||||||
in >= metadata.heap_extents.base + metadata.aslr_extents.size)) {
|
|
||||||
LOG_DEBUG(CheatEngine,
|
|
||||||
"Cheat attempting to access memory at invalid address={:016X}, if this "
|
"Cheat attempting to access memory at invalid address={:016X}, if this "
|
||||||
"persists, "
|
"persists, "
|
||||||
"the cheat may be incorrect. However, this may be normal early in execution if "
|
"the cheat may be incorrect. However, this may be normal early in execution if "
|
||||||
@ -216,14 +211,16 @@ void CheatEngine::Initialize() {
|
|||||||
.base = GetInteger(page_table.GetHeapRegionStart()),
|
.base = GetInteger(page_table.GetHeapRegionStart()),
|
||||||
.size = page_table.GetHeapRegionSize(),
|
.size = page_table.GetHeapRegionSize(),
|
||||||
};
|
};
|
||||||
metadata.aslr_extents = {
|
|
||||||
|
metadata.address_space_extents = {
|
||||||
|
.base = GetInteger(page_table.GetAddressSpaceStart()),
|
||||||
|
.size = page_table.GetAddressSpaceSize(),
|
||||||
|
};
|
||||||
|
|
||||||
|
metadata.alias_extents = {
|
||||||
.base = GetInteger(page_table.GetAliasCodeRegionStart()),
|
.base = GetInteger(page_table.GetAliasCodeRegionStart()),
|
||||||
.size = page_table.GetAliasCodeRegionSize(),
|
.size = page_table.GetAliasCodeRegionSize(),
|
||||||
};
|
};
|
||||||
metadata.alias_extents = {
|
|
||||||
.base = GetInteger(page_table.GetAliasRegionStart()),
|
|
||||||
.size = page_table.GetAliasRegionSize(),
|
|
||||||
};
|
|
||||||
|
|
||||||
is_pending_reload.exchange(true);
|
is_pending_reload.exchange(true);
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ private:
|
|||||||
VAddr SanitizeAddress(VAddr address) const;
|
VAddr SanitizeAddress(VAddr address) const;
|
||||||
|
|
||||||
const CheatProcessMetadata& metadata;
|
const CheatProcessMetadata& metadata;
|
||||||
Core::System& system;
|
System& system;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Intermediary class that parses a text file or other disk format for storing cheats into a
|
// Intermediary class that parses a text file or other disk format for storing cheats into a
|
||||||
|
@ -18,7 +18,7 @@ struct CheatProcessMetadata {
|
|||||||
MemoryRegionExtents main_nso_extents{};
|
MemoryRegionExtents main_nso_extents{};
|
||||||
MemoryRegionExtents heap_extents{};
|
MemoryRegionExtents heap_extents{};
|
||||||
MemoryRegionExtents alias_extents{};
|
MemoryRegionExtents alias_extents{};
|
||||||
MemoryRegionExtents aslr_extents{};
|
MemoryRegionExtents address_space_extents{};
|
||||||
std::array<u8, 0x20> main_nso_build_id{};
|
std::array<u8, 0x20> main_nso_build_id{};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -322,9 +322,8 @@ bool DmntCheatVm::DecodeNextOpcode(CheatVmOpcode& out) {
|
|||||||
} break;
|
} break;
|
||||||
case CheatVmOpcodeType::EndConditionalBlock: {
|
case CheatVmOpcodeType::EndConditionalBlock: {
|
||||||
// 20000000
|
// 20000000
|
||||||
opcode.opcode = EndConditionalOpcode{
|
// There's actually nothing left to process here!
|
||||||
.is_else = ((first_dword >> 24) & 0xf) == 1,
|
opcode.opcode = EndConditionalOpcode{};
|
||||||
};
|
|
||||||
} break;
|
} break;
|
||||||
case CheatVmOpcodeType::ControlLoop: {
|
case CheatVmOpcodeType::ControlLoop: {
|
||||||
// 300R0000 VVVVVVVV
|
// 300R0000 VVVVVVVV
|
||||||
@ -556,18 +555,6 @@ bool DmntCheatVm::DecodeNextOpcode(CheatVmOpcode& out) {
|
|||||||
.idx = first_dword & 0xF,
|
.idx = first_dword & 0xF,
|
||||||
};
|
};
|
||||||
} break;
|
} break;
|
||||||
case CheatVmOpcodeType::PauseProcess: {
|
|
||||||
/* FF0????? */
|
|
||||||
/* FF0 = opcode 0xFF0 */
|
|
||||||
/* Pauses the current process. */
|
|
||||||
opcode.opcode = PauseProcessOpcode{};
|
|
||||||
} break;
|
|
||||||
case CheatVmOpcodeType::ResumeProcess: {
|
|
||||||
/* FF0????? */
|
|
||||||
/* FF0 = opcode 0xFF0 */
|
|
||||||
/* Pauses the current process. */
|
|
||||||
opcode.opcode = ResumeProcessOpcode{};
|
|
||||||
} break;
|
|
||||||
case CheatVmOpcodeType::DebugLog: {
|
case CheatVmOpcodeType::DebugLog: {
|
||||||
// FFFTIX##
|
// FFFTIX##
|
||||||
// FFFTI0Ma aaaaaaaa
|
// FFFTI0Ma aaaaaaaa
|
||||||
@ -634,7 +621,7 @@ bool DmntCheatVm::DecodeNextOpcode(CheatVmOpcode& out) {
|
|||||||
return valid;
|
return valid;
|
||||||
}
|
}
|
||||||
|
|
||||||
void DmntCheatVm::SkipConditionalBlock(bool is_if) {
|
void DmntCheatVm::SkipConditionalBlock() {
|
||||||
if (condition_depth > 0) {
|
if (condition_depth > 0) {
|
||||||
// We want to continue until we're out of the current block.
|
// We want to continue until we're out of the current block.
|
||||||
const std::size_t desired_depth = condition_depth - 1;
|
const std::size_t desired_depth = condition_depth - 1;
|
||||||
@ -650,12 +637,8 @@ void DmntCheatVm::SkipConditionalBlock(bool is_if) {
|
|||||||
// We also support nesting of conditional blocks, and Gateway does not.
|
// We also support nesting of conditional blocks, and Gateway does not.
|
||||||
if (skip_opcode.begin_conditional_block) {
|
if (skip_opcode.begin_conditional_block) {
|
||||||
condition_depth++;
|
condition_depth++;
|
||||||
} else if (auto end_cond = std::get_if<EndConditionalOpcode>(&skip_opcode.opcode)) {
|
} else if (std::holds_alternative<EndConditionalOpcode>(skip_opcode.opcode)) {
|
||||||
if (!end_cond->is_else) {
|
condition_depth--;
|
||||||
condition_depth--;
|
|
||||||
} else if (is_if && condition_depth - 1 == desired_depth) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -692,10 +675,6 @@ u64 DmntCheatVm::GetCheatProcessAddress(const CheatProcessMetadata& metadata,
|
|||||||
return metadata.main_nso_extents.base + rel_address;
|
return metadata.main_nso_extents.base + rel_address;
|
||||||
case MemoryAccessType::Heap:
|
case MemoryAccessType::Heap:
|
||||||
return metadata.heap_extents.base + rel_address;
|
return metadata.heap_extents.base + rel_address;
|
||||||
case MemoryAccessType::Alias:
|
|
||||||
return metadata.alias_extents.base + rel_address;
|
|
||||||
case MemoryAccessType::Aslr:
|
|
||||||
return metadata.aslr_extents.base + rel_address;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -703,6 +682,7 @@ void DmntCheatVm::ResetState() {
|
|||||||
registers.fill(0);
|
registers.fill(0);
|
||||||
saved_values.fill(0);
|
saved_values.fill(0);
|
||||||
loop_tops.fill(0);
|
loop_tops.fill(0);
|
||||||
|
static_registers.fill(0);
|
||||||
instruction_ptr = 0;
|
instruction_ptr = 0;
|
||||||
condition_depth = 0;
|
condition_depth = 0;
|
||||||
decode_success = true;
|
decode_success = true;
|
||||||
@ -814,18 +794,13 @@ void DmntCheatVm::Execute(const CheatProcessMetadata& metadata) {
|
|||||||
}
|
}
|
||||||
// Skip conditional block if condition not met.
|
// Skip conditional block if condition not met.
|
||||||
if (!cond_met) {
|
if (!cond_met) {
|
||||||
SkipConditionalBlock(true);
|
SkipConditionalBlock();
|
||||||
}
|
}
|
||||||
} else if (auto end_cond = std::get_if<EndConditionalOpcode>(&cur_opcode.opcode)) {
|
} else if (std::holds_alternative<EndConditionalOpcode>(cur_opcode.opcode)) {
|
||||||
if (end_cond->is_else) {
|
// Decrement the condition depth.
|
||||||
/* Skip to the end of the conditional block. */
|
// We will assume, graciously, that mismatched conditional block ends are a nop.
|
||||||
this->SkipConditionalBlock(false);
|
if (condition_depth > 0) {
|
||||||
} else {
|
condition_depth--;
|
||||||
/* Decrement the condition depth. */
|
|
||||||
/* We will assume, graciously, that mismatched conditional block ends are a nop. */
|
|
||||||
if (condition_depth > 0) {
|
|
||||||
condition_depth--;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else if (auto ctrl_loop = std::get_if<ControlLoopOpcode>(&cur_opcode.opcode)) {
|
} else if (auto ctrl_loop = std::get_if<ControlLoopOpcode>(&cur_opcode.opcode)) {
|
||||||
if (ctrl_loop->start_loop) {
|
if (ctrl_loop->start_loop) {
|
||||||
@ -933,7 +908,7 @@ void DmntCheatVm::Execute(const CheatProcessMetadata& metadata) {
|
|||||||
// Check for keypress.
|
// Check for keypress.
|
||||||
if ((begin_keypress_cond->key_mask & kDown) != begin_keypress_cond->key_mask) {
|
if ((begin_keypress_cond->key_mask & kDown) != begin_keypress_cond->key_mask) {
|
||||||
// Keys not pressed. Skip conditional block.
|
// Keys not pressed. Skip conditional block.
|
||||||
SkipConditionalBlock(true);
|
SkipConditionalBlock();
|
||||||
}
|
}
|
||||||
} else if (auto perform_math_reg =
|
} else if (auto perform_math_reg =
|
||||||
std::get_if<PerformArithmeticRegisterOpcode>(&cur_opcode.opcode)) {
|
std::get_if<PerformArithmeticRegisterOpcode>(&cur_opcode.opcode)) {
|
||||||
@ -1141,7 +1116,7 @@ void DmntCheatVm::Execute(const CheatProcessMetadata& metadata) {
|
|||||||
|
|
||||||
// Skip conditional block if condition not met.
|
// Skip conditional block if condition not met.
|
||||||
if (!cond_met) {
|
if (!cond_met) {
|
||||||
SkipConditionalBlock(true);
|
SkipConditionalBlock();
|
||||||
}
|
}
|
||||||
} else if (auto save_restore_reg =
|
} else if (auto save_restore_reg =
|
||||||
std::get_if<SaveRestoreRegisterOpcode>(&cur_opcode.opcode)) {
|
std::get_if<SaveRestoreRegisterOpcode>(&cur_opcode.opcode)) {
|
||||||
@ -1203,10 +1178,6 @@ void DmntCheatVm::Execute(const CheatProcessMetadata& metadata) {
|
|||||||
// Store a register to a static register.
|
// Store a register to a static register.
|
||||||
static_registers[rw_static_reg->static_idx] = registers[rw_static_reg->idx];
|
static_registers[rw_static_reg->static_idx] = registers[rw_static_reg->idx];
|
||||||
}
|
}
|
||||||
} else if (std::holds_alternative<PauseProcessOpcode>(cur_opcode.opcode)) {
|
|
||||||
// TODO: Pause cheat process
|
|
||||||
} else if (std::holds_alternative<ResumeProcessOpcode>(cur_opcode.opcode)) {
|
|
||||||
// TODO: Resume cheat process
|
|
||||||
} else if (auto debug_log = std::get_if<DebugLogOpcode>(&cur_opcode.opcode)) {
|
} else if (auto debug_log = std::get_if<DebugLogOpcode>(&cur_opcode.opcode)) {
|
||||||
// Read value from memory.
|
// Read value from memory.
|
||||||
u64 log_value = 0;
|
u64 log_value = 0;
|
||||||
|
@ -42,16 +42,12 @@ enum class CheatVmOpcodeType : u32 {
|
|||||||
DoubleExtendedWidth = 0xF0,
|
DoubleExtendedWidth = 0xF0,
|
||||||
|
|
||||||
// Double-extended width opcodes.
|
// Double-extended width opcodes.
|
||||||
PauseProcess = 0xFF0,
|
|
||||||
ResumeProcess = 0xFF1,
|
|
||||||
DebugLog = 0xFFF,
|
DebugLog = 0xFFF,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class MemoryAccessType : u32 {
|
enum class MemoryAccessType : u32 {
|
||||||
MainNso = 0,
|
MainNso = 0,
|
||||||
Heap = 1,
|
Heap = 1,
|
||||||
Alias = 2,
|
|
||||||
Aslr = 3,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class ConditionalComparisonType : u32 {
|
enum class ConditionalComparisonType : u32 {
|
||||||
@ -135,9 +131,7 @@ struct BeginConditionalOpcode {
|
|||||||
VmInt value{};
|
VmInt value{};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct EndConditionalOpcode {
|
struct EndConditionalOpcode {};
|
||||||
bool is_else;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct ControlLoopOpcode {
|
struct ControlLoopOpcode {
|
||||||
bool start_loop{};
|
bool start_loop{};
|
||||||
@ -228,10 +222,6 @@ struct ReadWriteStaticRegisterOpcode {
|
|||||||
u32 idx{};
|
u32 idx{};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct PauseProcessOpcode {};
|
|
||||||
|
|
||||||
struct ResumeProcessOpcode {};
|
|
||||||
|
|
||||||
struct DebugLogOpcode {
|
struct DebugLogOpcode {
|
||||||
u32 bit_width{};
|
u32 bit_width{};
|
||||||
u32 log_id{};
|
u32 log_id{};
|
||||||
@ -254,8 +244,8 @@ struct CheatVmOpcode {
|
|||||||
PerformArithmeticStaticOpcode, BeginKeypressConditionalOpcode,
|
PerformArithmeticStaticOpcode, BeginKeypressConditionalOpcode,
|
||||||
PerformArithmeticRegisterOpcode, StoreRegisterToAddressOpcode,
|
PerformArithmeticRegisterOpcode, StoreRegisterToAddressOpcode,
|
||||||
BeginRegisterConditionalOpcode, SaveRestoreRegisterOpcode,
|
BeginRegisterConditionalOpcode, SaveRestoreRegisterOpcode,
|
||||||
SaveRestoreRegisterMaskOpcode, ReadWriteStaticRegisterOpcode, PauseProcessOpcode,
|
SaveRestoreRegisterMaskOpcode, ReadWriteStaticRegisterOpcode, DebugLogOpcode,
|
||||||
ResumeProcessOpcode, DebugLogOpcode, UnrecognizedInstruction>
|
UnrecognizedInstruction>
|
||||||
opcode{};
|
opcode{};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -306,7 +296,7 @@ private:
|
|||||||
std::array<std::size_t, NumRegisters> loop_tops{};
|
std::array<std::size_t, NumRegisters> loop_tops{};
|
||||||
|
|
||||||
bool DecodeNextOpcode(CheatVmOpcode& out);
|
bool DecodeNextOpcode(CheatVmOpcode& out);
|
||||||
void SkipConditionalBlock(bool is_if);
|
void SkipConditionalBlock();
|
||||||
void ResetState();
|
void ResetState();
|
||||||
|
|
||||||
// For implementing the DebugLog opcode.
|
// For implementing the DebugLog opcode.
|
||||||
|
@ -12,11 +12,6 @@ namespace Shader::Backend::SPIRV {
|
|||||||
namespace {
|
namespace {
|
||||||
class ImageOperands {
|
class ImageOperands {
|
||||||
public:
|
public:
|
||||||
[[maybe_unused]] static constexpr bool ImageSampleOffsetAllowed = false;
|
|
||||||
[[maybe_unused]] static constexpr bool ImageGatherOffsetAllowed = true;
|
|
||||||
[[maybe_unused]] static constexpr bool ImageFetchOffsetAllowed = false;
|
|
||||||
[[maybe_unused]] static constexpr bool ImageGradientOffsetAllowed = false;
|
|
||||||
|
|
||||||
explicit ImageOperands(EmitContext& ctx, bool has_bias, bool has_lod, bool has_lod_clamp,
|
explicit ImageOperands(EmitContext& ctx, bool has_bias, bool has_lod, bool has_lod_clamp,
|
||||||
Id lod, const IR::Value& offset) {
|
Id lod, const IR::Value& offset) {
|
||||||
if (has_bias) {
|
if (has_bias) {
|
||||||
@ -27,7 +22,7 @@ public:
|
|||||||
const Id lod_value{has_lod_clamp ? ctx.OpCompositeExtract(ctx.F32[1], lod, 0) : lod};
|
const Id lod_value{has_lod_clamp ? ctx.OpCompositeExtract(ctx.F32[1], lod, 0) : lod};
|
||||||
Add(spv::ImageOperandsMask::Lod, lod_value);
|
Add(spv::ImageOperandsMask::Lod, lod_value);
|
||||||
}
|
}
|
||||||
AddOffset(ctx, offset, ImageSampleOffsetAllowed);
|
AddOffset(ctx, offset);
|
||||||
if (has_lod_clamp) {
|
if (has_lod_clamp) {
|
||||||
const Id lod_clamp{has_bias ? ctx.OpCompositeExtract(ctx.F32[1], lod, 1) : lod};
|
const Id lod_clamp{has_bias ? ctx.OpCompositeExtract(ctx.F32[1], lod, 1) : lod};
|
||||||
Add(spv::ImageOperandsMask::MinLod, lod_clamp);
|
Add(spv::ImageOperandsMask::MinLod, lod_clamp);
|
||||||
@ -60,18 +55,20 @@ public:
|
|||||||
Add(spv::ImageOperandsMask::ConstOffsets, offsets);
|
Add(spv::ImageOperandsMask::ConstOffsets, offsets);
|
||||||
}
|
}
|
||||||
|
|
||||||
explicit ImageOperands(EmitContext& ctx, const IR::Value& offset, Id lod, Id ms) {
|
explicit ImageOperands(Id offset, Id lod, Id ms) {
|
||||||
AddOffset(ctx, offset, ImageFetchOffsetAllowed);
|
|
||||||
if (Sirit::ValidId(lod)) {
|
if (Sirit::ValidId(lod)) {
|
||||||
Add(spv::ImageOperandsMask::Lod, lod);
|
Add(spv::ImageOperandsMask::Lod, lod);
|
||||||
}
|
}
|
||||||
|
if (Sirit::ValidId(offset)) {
|
||||||
|
Add(spv::ImageOperandsMask::Offset, offset);
|
||||||
|
}
|
||||||
if (Sirit::ValidId(ms)) {
|
if (Sirit::ValidId(ms)) {
|
||||||
Add(spv::ImageOperandsMask::Sample, ms);
|
Add(spv::ImageOperandsMask::Sample, ms);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
explicit ImageOperands(EmitContext& ctx, bool has_lod_clamp, Id derivatives,
|
explicit ImageOperands(EmitContext& ctx, bool has_lod_clamp, Id derivatives,
|
||||||
u32 num_derivatives, const IR::Value& offset, Id lod_clamp) {
|
u32 num_derivatives, Id offset, Id lod_clamp) {
|
||||||
if (!Sirit::ValidId(derivatives)) {
|
if (!Sirit::ValidId(derivatives)) {
|
||||||
throw LogicError("Derivatives must be present");
|
throw LogicError("Derivatives must be present");
|
||||||
}
|
}
|
||||||
@ -86,14 +83,16 @@ public:
|
|||||||
const Id derivatives_Y{ctx.OpCompositeConstruct(
|
const Id derivatives_Y{ctx.OpCompositeConstruct(
|
||||||
ctx.F32[num_derivatives], std::span{deriv_y_accum.data(), deriv_y_accum.size()})};
|
ctx.F32[num_derivatives], std::span{deriv_y_accum.data(), deriv_y_accum.size()})};
|
||||||
Add(spv::ImageOperandsMask::Grad, derivatives_X, derivatives_Y);
|
Add(spv::ImageOperandsMask::Grad, derivatives_X, derivatives_Y);
|
||||||
AddOffset(ctx, offset, ImageGradientOffsetAllowed);
|
if (Sirit::ValidId(offset)) {
|
||||||
|
Add(spv::ImageOperandsMask::Offset, offset);
|
||||||
|
}
|
||||||
if (has_lod_clamp) {
|
if (has_lod_clamp) {
|
||||||
Add(spv::ImageOperandsMask::MinLod, lod_clamp);
|
Add(spv::ImageOperandsMask::MinLod, lod_clamp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
explicit ImageOperands(EmitContext& ctx, bool has_lod_clamp, Id derivatives_1, Id derivatives_2,
|
explicit ImageOperands(EmitContext& ctx, bool has_lod_clamp, Id derivatives_1, Id derivatives_2,
|
||||||
const IR::Value& offset, Id lod_clamp) {
|
Id offset, Id lod_clamp) {
|
||||||
if (!Sirit::ValidId(derivatives_1) || !Sirit::ValidId(derivatives_2)) {
|
if (!Sirit::ValidId(derivatives_1) || !Sirit::ValidId(derivatives_2)) {
|
||||||
throw LogicError("Derivatives must be present");
|
throw LogicError("Derivatives must be present");
|
||||||
}
|
}
|
||||||
@ -112,7 +111,9 @@ public:
|
|||||||
const Id derivatives_id2{ctx.OpCompositeConstruct(
|
const Id derivatives_id2{ctx.OpCompositeConstruct(
|
||||||
ctx.F32[3], std::span{deriv_2_accum.data(), deriv_2_accum.size()})};
|
ctx.F32[3], std::span{deriv_2_accum.data(), deriv_2_accum.size()})};
|
||||||
Add(spv::ImageOperandsMask::Grad, derivatives_id1, derivatives_id2);
|
Add(spv::ImageOperandsMask::Grad, derivatives_id1, derivatives_id2);
|
||||||
AddOffset(ctx, offset, ImageGradientOffsetAllowed);
|
if (Sirit::ValidId(offset)) {
|
||||||
|
Add(spv::ImageOperandsMask::Offset, offset);
|
||||||
|
}
|
||||||
if (has_lod_clamp) {
|
if (has_lod_clamp) {
|
||||||
Add(spv::ImageOperandsMask::MinLod, lod_clamp);
|
Add(spv::ImageOperandsMask::MinLod, lod_clamp);
|
||||||
}
|
}
|
||||||
@ -131,7 +132,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void AddOffset(EmitContext& ctx, const IR::Value& offset, bool runtime_offset_allowed) {
|
void AddOffset(EmitContext& ctx, const IR::Value& offset) {
|
||||||
if (offset.IsEmpty()) {
|
if (offset.IsEmpty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -164,9 +165,7 @@ private:
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (runtime_offset_allowed) {
|
Add(spv::ImageOperandsMask::Offset, ctx.Def(offset));
|
||||||
Add(spv::ImageOperandsMask::Offset, ctx.Def(offset));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Add(spv::ImageOperandsMask new_mask, Id value) {
|
void Add(spv::ImageOperandsMask new_mask, Id value) {
|
||||||
@ -494,8 +493,8 @@ Id EmitImageGatherDref(EmitContext& ctx, IR::Inst* inst, const IR::Value& index,
|
|||||||
operands.Span());
|
operands.Span());
|
||||||
}
|
}
|
||||||
|
|
||||||
Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords, Id offset,
|
||||||
const IR::Value& offset, Id lod, Id ms) {
|
Id lod, Id ms) {
|
||||||
const auto info{inst->Flags<IR::TextureInstInfo>()};
|
const auto info{inst->Flags<IR::TextureInstInfo>()};
|
||||||
if (info.type == TextureType::Buffer) {
|
if (info.type == TextureType::Buffer) {
|
||||||
lod = Id{};
|
lod = Id{};
|
||||||
@ -504,7 +503,7 @@ Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id c
|
|||||||
// This image is multisampled, lod must be implicit
|
// This image is multisampled, lod must be implicit
|
||||||
lod = Id{};
|
lod = Id{};
|
||||||
}
|
}
|
||||||
const ImageOperands operands(ctx, offset, lod, ms);
|
const ImageOperands operands(offset, lod, ms);
|
||||||
return Emit(&EmitContext::OpImageSparseFetch, &EmitContext::OpImageFetch, ctx, inst, ctx.F32[4],
|
return Emit(&EmitContext::OpImageSparseFetch, &EmitContext::OpImageFetch, ctx, inst, ctx.F32[4],
|
||||||
TextureImage(ctx, info, index), coords, operands.MaskOptional(), operands.Span());
|
TextureImage(ctx, info, index), coords, operands.MaskOptional(), operands.Span());
|
||||||
}
|
}
|
||||||
@ -549,13 +548,13 @@ Id EmitImageQueryLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, I
|
|||||||
}
|
}
|
||||||
|
|
||||||
Id EmitImageGradient(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
Id EmitImageGradient(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
||||||
Id derivatives, const IR::Value& offset, Id lod_clamp) {
|
Id derivatives, Id offset, Id lod_clamp) {
|
||||||
const auto info{inst->Flags<IR::TextureInstInfo>()};
|
const auto info{inst->Flags<IR::TextureInstInfo>()};
|
||||||
const auto operands = info.num_derivatives == 3
|
const auto operands =
|
||||||
? ImageOperands(ctx, info.has_lod_clamp != 0, derivatives,
|
info.num_derivatives == 3
|
||||||
ctx.Def(offset), {}, lod_clamp)
|
? ImageOperands(ctx, info.has_lod_clamp != 0, derivatives, offset, {}, lod_clamp)
|
||||||
: ImageOperands(ctx, info.has_lod_clamp != 0, derivatives,
|
: ImageOperands(ctx, info.has_lod_clamp != 0, derivatives, info.num_derivatives, offset,
|
||||||
info.num_derivatives, offset, lod_clamp);
|
lod_clamp);
|
||||||
return Emit(&EmitContext::OpImageSparseSampleExplicitLod,
|
return Emit(&EmitContext::OpImageSparseSampleExplicitLod,
|
||||||
&EmitContext::OpImageSampleExplicitLod, ctx, inst, ctx.F32[4],
|
&EmitContext::OpImageSampleExplicitLod, ctx, inst, ctx.F32[4],
|
||||||
Texture(ctx, info, index), coords, operands.Mask(), operands.Span());
|
Texture(ctx, info, index), coords, operands.Mask(), operands.Span());
|
||||||
|
@ -537,13 +537,13 @@ Id EmitImageGather(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id
|
|||||||
const IR::Value& offset, const IR::Value& offset2);
|
const IR::Value& offset, const IR::Value& offset2);
|
||||||
Id EmitImageGatherDref(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
Id EmitImageGatherDref(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
||||||
const IR::Value& offset, const IR::Value& offset2, Id dref);
|
const IR::Value& offset, const IR::Value& offset2, Id dref);
|
||||||
Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords, Id offset,
|
||||||
const IR::Value& offset, Id lod, Id ms);
|
Id lod, Id ms);
|
||||||
Id EmitImageQueryDimensions(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id lod,
|
Id EmitImageQueryDimensions(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id lod,
|
||||||
const IR::Value& skip_mips);
|
const IR::Value& skip_mips);
|
||||||
Id EmitImageQueryLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords);
|
Id EmitImageQueryLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords);
|
||||||
Id EmitImageGradient(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
Id EmitImageGradient(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,
|
||||||
Id derivatives, const IR::Value& offset, Id lod_clamp);
|
Id derivatives, Id offset, Id lod_clamp);
|
||||||
Id EmitImageRead(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords);
|
Id EmitImageRead(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords);
|
||||||
void EmitImageWrite(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords, Id color);
|
void EmitImageWrite(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords, Id color);
|
||||||
Id EmitIsTextureScaled(EmitContext& ctx, const IR::Value& index);
|
Id EmitIsTextureScaled(EmitContext& ctx, const IR::Value& index);
|
||||||
|
@ -1353,13 +1353,6 @@ void GMainWindow::InitializeHotkeys() {
|
|||||||
LinkActionShortcut(ui->action_TAS_Start, QStringLiteral("TAS Start/Stop"), true);
|
LinkActionShortcut(ui->action_TAS_Start, QStringLiteral("TAS Start/Stop"), true);
|
||||||
LinkActionShortcut(ui->action_TAS_Record, QStringLiteral("TAS Record"), true);
|
LinkActionShortcut(ui->action_TAS_Record, QStringLiteral("TAS Record"), true);
|
||||||
LinkActionShortcut(ui->action_TAS_Reset, QStringLiteral("TAS Reset"), true);
|
LinkActionShortcut(ui->action_TAS_Reset, QStringLiteral("TAS Reset"), true);
|
||||||
LinkActionShortcut(ui->action_View_Lobby,
|
|
||||||
QStringLiteral("Multiplayer Browse Public Game Lobby"));
|
|
||||||
LinkActionShortcut(ui->action_Start_Room, QStringLiteral("Multiplayer Create Room"));
|
|
||||||
LinkActionShortcut(ui->action_Connect_To_Room,
|
|
||||||
QStringLiteral("Multiplayer Direct Connect to Room"));
|
|
||||||
LinkActionShortcut(ui->action_Show_Room, QStringLiteral("Multiplayer Show Current Room"));
|
|
||||||
LinkActionShortcut(ui->action_Leave_Room, QStringLiteral("Multiplayer Leave Room"));
|
|
||||||
|
|
||||||
static const QString main_window = QStringLiteral("Main Window");
|
static const QString main_window = QStringLiteral("Main Window");
|
||||||
const auto connect_shortcut = [&]<typename Fn>(const QString& action_name, const Fn& function) {
|
const auto connect_shortcut = [&]<typename Fn>(const QString& action_name, const Fn& function) {
|
||||||
|
@ -77,23 +77,16 @@ Lobby::Lobby(QWidget* parent, QStandardItemModel* list,
|
|||||||
|
|
||||||
// UI Buttons
|
// UI Buttons
|
||||||
connect(ui->refresh_list, &QPushButton::clicked, this, &Lobby::RefreshLobby);
|
connect(ui->refresh_list, &QPushButton::clicked, this, &Lobby::RefreshLobby);
|
||||||
connect(ui->search, &QLineEdit::textChanged, proxy, &LobbyFilterProxyModel::SetFilterSearch);
|
|
||||||
connect(ui->games_owned, &QCheckBox::toggled, proxy, &LobbyFilterProxyModel::SetFilterOwned);
|
connect(ui->games_owned, &QCheckBox::toggled, proxy, &LobbyFilterProxyModel::SetFilterOwned);
|
||||||
connect(ui->hide_empty, &QCheckBox::toggled, proxy, &LobbyFilterProxyModel::SetFilterEmpty);
|
connect(ui->hide_empty, &QCheckBox::toggled, proxy, &LobbyFilterProxyModel::SetFilterEmpty);
|
||||||
connect(ui->hide_full, &QCheckBox::toggled, proxy, &LobbyFilterProxyModel::SetFilterFull);
|
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);
|
connect(ui->room_list, &QTreeView::doubleClicked, this, &Lobby::OnJoinRoom);
|
||||||
connect(ui->room_list, &QTreeView::clicked, this, &Lobby::OnExpandRoom);
|
connect(ui->room_list, &QTreeView::clicked, this, &Lobby::OnExpandRoom);
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
connect(&room_list_watcher, &QFutureWatcher<AnnounceMultiplayerRoom::RoomList>::finished, this,
|
connect(&room_list_watcher, &QFutureWatcher<AnnounceMultiplayerRoom::RoomList>::finished, this,
|
||||||
&Lobby::OnRefreshLobby);
|
&Lobby::OnRefreshLobby);
|
||||||
|
|
||||||
// Load persistent filters after events are connected to make sure they apply
|
|
||||||
ui->search->setText(
|
|
||||||
QString::fromStdString(UISettings::values.multiplayer_filter_text.GetValue()));
|
|
||||||
ui->games_owned->setChecked(UISettings::values.multiplayer_filter_games_owned.GetValue());
|
|
||||||
ui->hide_empty->setChecked(UISettings::values.multiplayer_filter_hide_empty.GetValue());
|
|
||||||
ui->hide_full->setChecked(UISettings::values.multiplayer_filter_hide_full.GetValue());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Lobby::~Lobby() = default;
|
Lobby::~Lobby() = default;
|
||||||
@ -211,10 +204,6 @@ void Lobby::OnJoinRoom(const QModelIndex& source) {
|
|||||||
|
|
||||||
// Save settings
|
// Save settings
|
||||||
UISettings::values.multiplayer_nickname = ui->nickname->text().toStdString();
|
UISettings::values.multiplayer_nickname = ui->nickname->text().toStdString();
|
||||||
UISettings::values.multiplayer_filter_text = ui->search->text().toStdString();
|
|
||||||
UISettings::values.multiplayer_filter_games_owned = ui->games_owned->isChecked();
|
|
||||||
UISettings::values.multiplayer_filter_hide_empty = ui->hide_empty->isChecked();
|
|
||||||
UISettings::values.multiplayer_filter_hide_full = ui->hide_full->isChecked();
|
|
||||||
UISettings::values.multiplayer_ip =
|
UISettings::values.multiplayer_ip =
|
||||||
proxy->data(connection_index, LobbyItemHost::HostIPRole).value<QString>().toStdString();
|
proxy->data(connection_index, LobbyItemHost::HostIPRole).value<QString>().toStdString();
|
||||||
UISettings::values.multiplayer_port =
|
UISettings::values.multiplayer_port =
|
||||||
|
@ -193,29 +193,12 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
QVariant data(int role) const override {
|
QVariant data(int role) const override {
|
||||||
switch (role) {
|
if (role != Qt::DisplayRole) {
|
||||||
case Qt::DisplayRole: {
|
|
||||||
auto members = data(MemberListRole).toList();
|
|
||||||
return QStringLiteral("%1 / %2 ")
|
|
||||||
.arg(QString::number(members.size()), data(MaxPlayerRole).toString());
|
|
||||||
}
|
|
||||||
case Qt::ForegroundRole: {
|
|
||||||
auto members = data(MemberListRole).toList();
|
|
||||||
auto max_players = data(MaxPlayerRole).toInt();
|
|
||||||
if (members.size() >= max_players) {
|
|
||||||
return QBrush(QColor(255, 48, 32));
|
|
||||||
} else if (members.size() == (max_players - 1)) {
|
|
||||||
return QBrush(QColor(255, 140, 32));
|
|
||||||
} else if (members.size() == 0) {
|
|
||||||
return QBrush(QColor(128, 128, 128));
|
|
||||||
}
|
|
||||||
// FIXME: How to return a value that tells Qt not to modify the
|
|
||||||
// text color from the default (as if Qt::ForegroundRole wasn't overridden)?
|
|
||||||
return QBrush(nullptr);
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
return LobbyItem::data(role);
|
return LobbyItem::data(role);
|
||||||
}
|
}
|
||||||
|
auto members = data(MemberListRole).toList();
|
||||||
|
return QStringLiteral("%1 / %2 ")
|
||||||
|
.arg(QString::number(members.size()), data(MaxPlayerRole).toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool operator<(const QStandardItem& other) const override {
|
bool operator<(const QStandardItem& other) const override {
|
||||||
|
@ -169,13 +169,6 @@ struct Values {
|
|||||||
|
|
||||||
// multiplayer settings
|
// multiplayer settings
|
||||||
Setting<std::string> multiplayer_nickname{linkage, {}, "nickname", Category::Multiplayer};
|
Setting<std::string> multiplayer_nickname{linkage, {}, "nickname", Category::Multiplayer};
|
||||||
Setting<std::string> multiplayer_filter_text{linkage, {}, "filter_text", Category::Multiplayer};
|
|
||||||
Setting<bool> multiplayer_filter_games_owned{linkage, false, "filter_games_owned",
|
|
||||||
Category::Multiplayer};
|
|
||||||
Setting<bool> multiplayer_filter_hide_empty{linkage, false, "filter_games_hide_empty",
|
|
||||||
Category::Multiplayer};
|
|
||||||
Setting<bool> multiplayer_filter_hide_full{linkage, false, "filter_games_hide_full",
|
|
||||||
Category::Multiplayer};
|
|
||||||
Setting<std::string> multiplayer_ip{linkage, {}, "ip", Category::Multiplayer};
|
Setting<std::string> multiplayer_ip{linkage, {}, "ip", Category::Multiplayer};
|
||||||
Setting<u16, true> multiplayer_port{linkage, 24872, 0,
|
Setting<u16, true> multiplayer_port{linkage, 24872, 0,
|
||||||
UINT16_MAX, "port", Category::Multiplayer};
|
UINT16_MAX, "port", Category::Multiplayer};
|
||||||
@ -229,7 +222,7 @@ void RestoreWindowState(std::unique_ptr<QtConfig>& qtConfig);
|
|||||||
// This must be in alphabetical order according to action name as it must have the same order as
|
// This must be in alphabetical order according to action name as it must have the same order as
|
||||||
// UISetting::values.shortcuts, which is alphabetically ordered.
|
// UISetting::values.shortcuts, which is alphabetically ordered.
|
||||||
// clang-format off
|
// clang-format off
|
||||||
const std::array<Shortcut, 28> default_hotkeys{{
|
const std::array<Shortcut, 23> default_hotkeys{{
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Audio Mute/Unmute")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+M"), std::string("Home+Dpad_Right"), Qt::WindowShortcut, false}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Audio Mute/Unmute")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+M"), std::string("Home+Dpad_Right"), Qt::WindowShortcut, false}},
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Audio Volume Down")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("-"), std::string("Home+Dpad_Down"), Qt::ApplicationShortcut, true}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Audio Volume Down")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("-"), std::string("Home+Dpad_Down"), Qt::ApplicationShortcut, true}},
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Audio Volume Up")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("="), std::string("Home+Dpad_Up"), Qt::ApplicationShortcut, true}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Audio Volume Up")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("="), std::string("Home+Dpad_Up"), Qt::ApplicationShortcut, true}},
|
||||||
@ -243,11 +236,6 @@ const std::array<Shortcut, 28> default_hotkeys{{
|
|||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Fullscreen")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F11"), std::string("Home+B"), Qt::WindowShortcut, false}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Fullscreen")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F11"), std::string("Home+B"), Qt::WindowShortcut, false}},
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Load File")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+O"), std::string(""), Qt::WidgetWithChildrenShortcut, false}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Load File")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+O"), std::string(""), Qt::WidgetWithChildrenShortcut, false}},
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Load/Remove Amiibo")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F2"), std::string("Home+A"), Qt::WidgetWithChildrenShortcut, false}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Load/Remove Amiibo")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F2"), std::string("Home+A"), Qt::WidgetWithChildrenShortcut, false}},
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Multiplayer Browse Public Game Lobby")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+B"), std::string(""), Qt::ApplicationShortcut, false}},
|
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Multiplayer Create Room")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+N"), std::string(""), Qt::ApplicationShortcut, false}},
|
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Multiplayer Direct Connect to Room")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+C"), std::string(""), Qt::ApplicationShortcut, false}},
|
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Multiplayer Leave Room")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+L"), std::string(""), Qt::ApplicationShortcut, false}},
|
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Multiplayer Show Current Room")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+R"), std::string(""), Qt::ApplicationShortcut, false}},
|
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Restart Emulation")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F6"), std::string("R+Plus+Minus"), Qt::WindowShortcut, false}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Restart Emulation")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F6"), std::string("R+Plus+Minus"), Qt::WindowShortcut, false}},
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Stop Emulation")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F5"), std::string("L+Plus+Minus"), Qt::WindowShortcut, false}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Stop Emulation")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("F5"), std::string("L+Plus+Minus"), Qt::WindowShortcut, false}},
|
||||||
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "TAS Record")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+F7"), std::string(""), Qt::ApplicationShortcut, false}},
|
{QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "TAS Record")).toStdString(), QStringLiteral(QT_TRANSLATE_NOOP("Hotkeys", "Main Window")).toStdString(), {std::string("Ctrl+F7"), std::string(""), Qt::ApplicationShortcut, false}},
|
||||||
|
Reference in New Issue
Block a user