Android 231

README.md

@@ -4,10 +4,11 @@
 | [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 |
 | [12873](https://github.com/yuzu-emu/yuzu-android//pull/12873) | [`023c3aa65`](https://github.com/yuzu-emu/yuzu-android//pull/12873/files) | GPU: Implement channel scheduling. | [FernandoS27](https://github.com/FernandoS27/) | Yes |
-| [12903](https://github.com/yuzu-emu/yuzu-android//pull/12903) | [`f296a9ce9`](https://github.com/yuzu-emu/yuzu-android//pull/12903/files) | shader_recompiler: use only ConstOffset for OpImageFetch | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12914](https://github.com/yuzu-emu/yuzu-android//pull/12914) | [`fa47ac1c9`](https://github.com/yuzu-emu/yuzu-android//pull/12914/files) | VideoCore Refactor Part 1. | [FernandoS27](https://github.com/FernandoS27/) | 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 |
+| [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 |
+| [12914](https://github.com/yuzu-emu/yuzu-android//pull/12914) | [`3a6d8ae2c`](https://github.com/yuzu-emu/yuzu-android//pull/12914/files) | VideoCore Refactor Part 1. | [FernandoS27](https://github.com/FernandoS27/) | 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 |
 | [12920](https://github.com/yuzu-emu/yuzu-android//pull/12920) | [`62fc6d5c3`](https://github.com/yuzu-emu/yuzu-android//pull/12920/files) | android: Move JNI setup and helpers to common | [t895](https://github.com/t895/) | Yes |
-| [12928](https://github.com/yuzu-emu/yuzu-android//pull/12928) | [`8f192b494`](https://github.com/yuzu-emu/yuzu-android//pull/12928/files) | service: hid: Add multiprocess support to six axis input | [german77](https://github.com/german77/) | Yes |
 
 
 End of merge log. You can find the original README.md below the break.

dist/languages/.tx/config

@@ -11,4 +11,3 @@ type = QT
 file_filter = ../../src/android/app/src/main/res/values-<lang>/strings.xml
 source_file = ../../src/android/app/src/main/res/values/strings.xml
 type = ANDROID
-lang_map = ja_JP:ja, ko_KR:ko, pt_BR:pt-rBR, pt_PT:pt-rPT, ru_RU:ru, vi_VN:vi, zh_CN:zh-rCN, zh_TW:zh-rTW

src/common/range_sets.h

@@ -70,4 +70,4 @@ private:
     std::unique_ptr<OverlapRangeSetImpl> m_impl;
 };
 
-} // namespace Common
+} // namespace Common

src/common/range_sets.inc

@@ -301,4 +301,4 @@ void OverlapRangeSet<AddressType>::ForEachInRange(AddressType base_address, size
     m_impl->ForEachInRange(base_address, size, std::move(func));
 }
 
-} // namespace Common
+} // namespace Common

src/common/typed_address.h

@@ -186,68 +186,68 @@ static_assert(std::is_trivially_destructible_v<PhysicalAddress>);
 static_assert(std::is_trivially_destructible_v<VirtualAddress>);
 static_assert(std::is_trivially_destructible_v<ProcessAddress>);
 
-static_assert(Null<uint64_t> == 0U);
+static_assert(Null<uint64_t> == 0);
 static_assert(Null<PhysicalAddress> == Null<uint64_t>);
 static_assert(Null<VirtualAddress> == Null<uint64_t>);
 static_assert(Null<ProcessAddress> == Null<uint64_t>);
 
 // Constructor/assignment validations.
 static_assert([] {
-    const PhysicalAddress a(5U);
+    const PhysicalAddress a(5);
     PhysicalAddress b(a);
     return b;
-}() == PhysicalAddress(5U));
+}() == PhysicalAddress(5));
 static_assert([] {
-    const PhysicalAddress a(5U);
-    PhysicalAddress b(10U);
+    const PhysicalAddress a(5);
+    PhysicalAddress b(10);
     b = a;
     return b;
-}() == PhysicalAddress(5U));
+}() == PhysicalAddress(5));
 
 // Arithmetic validations.
-static_assert(PhysicalAddress(10U) + 5U == PhysicalAddress(15U));
-static_assert(PhysicalAddress(10U) - 5U == PhysicalAddress(5U));
+static_assert(PhysicalAddress(10) + 5 == PhysicalAddress(15));
+static_assert(PhysicalAddress(10) - 5 == PhysicalAddress(5));
 static_assert([] {
-    PhysicalAddress v(10U);
-    v += 5U;
+    PhysicalAddress v(10);
+    v += 5;
     return v;
-}() == PhysicalAddress(15U));
+}() == PhysicalAddress(15));
 static_assert([] {
-    PhysicalAddress v(10U);
-    v -= 5U;
+    PhysicalAddress v(10);
+    v -= 5;
     return v;
-}() == PhysicalAddress(5U));
-static_assert(PhysicalAddress(10U)++ == PhysicalAddress(10U));
-static_assert(++PhysicalAddress(10U) == PhysicalAddress(11U));
-static_assert(PhysicalAddress(10U)-- == PhysicalAddress(10U));
-static_assert(--PhysicalAddress(10U) == PhysicalAddress(9U));
+}() == 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(0b11111111U) >> 1) == 0b01111111U);
-static_assert((PhysicalAddress(0b10101010U) >> 1) == 0b01010101U);
-static_assert((PhysicalAddress(0b11111111U) << 1) == 0b111111110U);
-static_assert((PhysicalAddress(0b01010101U) << 1) == 0b10101010U);
-static_assert((PhysicalAddress(0b11111111U) & 0b01010101U) == 0b01010101U);
-static_assert((PhysicalAddress(0b11111111U) & 0b10101010U) == 0b10101010U);
-static_assert((PhysicalAddress(0b01010101U) & 0b10101010U) == 0b00000000U);
-static_assert((PhysicalAddress(0b00000000U) | 0b01010101U) == 0b01010101U);
-static_assert((PhysicalAddress(0b11111111U) | 0b01010101U) == 0b11111111U);
-static_assert((PhysicalAddress(0b10101010U) | 0b01010101U) == 0b11111111U);
+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(0U) == PhysicalAddress(0U));
-static_assert(PhysicalAddress(0U) != PhysicalAddress(1U));
-static_assert(PhysicalAddress(0U) < PhysicalAddress(1U));
-static_assert(PhysicalAddress(0U) <= PhysicalAddress(1U));
-static_assert(PhysicalAddress(1U) > PhysicalAddress(0U));
-static_assert(PhysicalAddress(1U) >= PhysicalAddress(0U));
+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(0U) == PhysicalAddress(1U)));
-static_assert(!(PhysicalAddress(0U) != PhysicalAddress(0U)));
-static_assert(!(PhysicalAddress(1U) < PhysicalAddress(0U)));
-static_assert(!(PhysicalAddress(1U) <= PhysicalAddress(0U)));
-static_assert(!(PhysicalAddress(0U) > PhysicalAddress(1U)));
-static_assert(!(PhysicalAddress(0U) >= PhysicalAddress(1U)));
+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
 

src/core/debugger/gdbstub_arch.cpp

@@ -383,7 +383,7 @@ std::string GDBStubA32::RegRead(const Kernel::KThread* thread, size_t id) const
     } else if (id == CPSR_REGISTER) {
         return ValueToHex(context.pstate);
     } else if (id >= D0_REGISTER && id < Q0_REGISTER) {
-        return ValueToHex(fprs[(id - D0_REGISTER) / 2][(id - D0_REGISTER) % 2]);
+        return ValueToHex(fprs[id - D0_REGISTER][0]);
     } else if (id >= Q0_REGISTER && id < FPSCR_REGISTER) {
         return ValueToHex(fprs[id - Q0_REGISTER]);
     } else if (id == FPSCR_REGISTER) {
@@ -406,7 +406,7 @@ void GDBStubA32::RegWrite(Kernel::KThread* thread, size_t id, std::string_view v
     } else if (id == CPSR_REGISTER) {
         context.pstate = HexToValue<u32>(value);
     } else if (id >= D0_REGISTER && id < Q0_REGISTER) {
-        fprs[(id - D0_REGISTER) / 2][(id - D0_REGISTER) % 2] = HexToValue<u64>(value);
+        fprs[id - D0_REGISTER] = {HexToValue<u64>(value), 0};
     } else if (id >= Q0_REGISTER && id < FPSCR_REGISTER) {
         fprs[id - Q0_REGISTER] = HexToValue<u128>(value);
     } else if (id == FPSCR_REGISTER) {

src/core/memory/cheat_engine.cpp

@@ -47,23 +47,12 @@ StandardVmCallbacks::StandardVmCallbacks(System& system_, const CheatProcessMeta
 
 StandardVmCallbacks::~StandardVmCallbacks() = default;
 
-void StandardVmCallbacks::MemoryReadUnsafe(VAddr address, void* data, u64 size) {
-    // Return zero on invalid address
-    if (!IsAddressInRange(address) || !system.ApplicationMemory().IsValidVirtualAddress(address)) {
-        std::memset(data, 0, size);
-        return;
-    }
-
-    system.ApplicationMemory().ReadBlock(address, data, size);
+void StandardVmCallbacks::MemoryRead(VAddr address, void* data, u64 size) {
+    system.ApplicationMemory().ReadBlock(SanitizeAddress(address), data, size);
 }
 
-void StandardVmCallbacks::MemoryWriteUnsafe(VAddr address, const void* data, u64 size) {
-    // Skip invalid memory write address
-    if (!IsAddressInRange(address) || !system.ApplicationMemory().IsValidVirtualAddress(address)) {
-        return;
-    }
-
-    system.ApplicationMemory().WriteBlock(address, data, size);
+void StandardVmCallbacks::MemoryWrite(VAddr address, const void* data, u64 size) {
+    system.ApplicationMemory().WriteBlock(SanitizeAddress(address), data, size);
 }
 
 u64 StandardVmCallbacks::HidKeysDown() {
@@ -93,7 +82,7 @@ void StandardVmCallbacks::CommandLog(std::string_view data) {
               data.back() == '\n' ? data.substr(0, data.size() - 1) : data);
 }
 
-bool StandardVmCallbacks::IsAddressInRange(VAddr in) const {
+VAddr StandardVmCallbacks::SanitizeAddress(VAddr in) const {
     if ((in < metadata.main_nso_extents.base ||
          in >= metadata.main_nso_extents.base + metadata.main_nso_extents.size) &&
         (in < metadata.heap_extents.base ||
@@ -108,10 +97,10 @@ bool StandardVmCallbacks::IsAddressInRange(VAddr in) const {
                   "the cheat may be incorrect. However, this may be normal early in execution if "
                   "the game has not properly set up yet.",
                   in);
-        return false; ///< Invalid addresses will hard crash
+        return 0; ///< Invalid addresses will hard crash
     }
 
-    return true;
+    return in;
 }
 
 CheatParser::~CheatParser() = default;

src/core/memory/cheat_engine.h

@@ -27,14 +27,14 @@ public:
     StandardVmCallbacks(System& system_, const CheatProcessMetadata& metadata_);
     ~StandardVmCallbacks() override;
 
-    void MemoryReadUnsafe(VAddr address, void* data, u64 size) override;
-    void MemoryWriteUnsafe(VAddr address, const void* data, u64 size) override;
+    void MemoryRead(VAddr address, void* data, u64 size) override;
+    void MemoryWrite(VAddr address, const void* data, u64 size) override;
     u64 HidKeysDown() override;
     void DebugLog(u8 id, u64 value) override;
     void CommandLog(std::string_view data) override;
 
 private:
-    bool IsAddressInRange(VAddr address) const;
+    VAddr SanitizeAddress(VAddr address) const;
 
     const CheatProcessMetadata& metadata;
     Core::System& system;

src/core/memory/dmnt_cheat_vm.cpp

@@ -773,7 +773,7 @@ void DmntCheatVm::Execute(const CheatProcessMetadata& metadata) {
             case 2:
             case 4:
             case 8:
-                callbacks->MemoryWriteUnsafe(dst_address, &dst_value, store_static->bit_width);
+                callbacks->MemoryWrite(dst_address, &dst_value, store_static->bit_width);
                 break;
             }
         } else if (auto begin_cond = std::get_if<BeginConditionalOpcode>(&cur_opcode.opcode)) {
@@ -786,7 +786,7 @@ void DmntCheatVm::Execute(const CheatProcessMetadata& metadata) {
             case 2:
             case 4:
             case 8:
-                callbacks->MemoryReadUnsafe(src_address, &src_value, begin_cond->bit_width);
+                callbacks->MemoryRead(src_address, &src_value, begin_cond->bit_width);
                 break;
             }
             // Check against condition.
@@ -857,8 +857,8 @@ void DmntCheatVm::Execute(const CheatProcessMetadata& metadata) {
             case 2:
             case 4:
             case 8:
-                callbacks->MemoryReadUnsafe(src_address, &registers[ldr_memory->reg_index],
-                                            ldr_memory->bit_width);
+                callbacks->MemoryRead(src_address, &registers[ldr_memory->reg_index],
+                                      ldr_memory->bit_width);
                 break;
             }
         } else if (auto str_static = std::get_if<StoreStaticToAddressOpcode>(&cur_opcode.opcode)) {
@@ -874,7 +874,7 @@ void DmntCheatVm::Execute(const CheatProcessMetadata& metadata) {
             case 2:
             case 4:
             case 8:
-                callbacks->MemoryWriteUnsafe(dst_address, &dst_value, str_static->bit_width);
+                callbacks->MemoryWrite(dst_address, &dst_value, str_static->bit_width);
                 break;
             }
             // Increment register if relevant.
@@ -1032,7 +1032,7 @@ void DmntCheatVm::Execute(const CheatProcessMetadata& metadata) {
             case 2:
             case 4:
             case 8:
-                callbacks->MemoryWriteUnsafe(dst_address, &dst_value, str_register->bit_width);
+                callbacks->MemoryWrite(dst_address, &dst_value, str_register->bit_width);
                 break;
             }
 
@@ -1111,8 +1111,7 @@ void DmntCheatVm::Execute(const CheatProcessMetadata& metadata) {
                 case 2:
                 case 4:
                 case 8:
-                    callbacks->MemoryReadUnsafe(cond_address, &cond_value,
-                                                begin_reg_cond->bit_width);
+                    callbacks->MemoryRead(cond_address, &cond_value, begin_reg_cond->bit_width);
                     break;
                 }
             }
@@ -1254,7 +1253,7 @@ void DmntCheatVm::Execute(const CheatProcessMetadata& metadata) {
                 case 2:
                 case 4:
                 case 8:
-                    callbacks->MemoryReadUnsafe(val_address, &log_value, debug_log->bit_width);
+                    callbacks->MemoryRead(val_address, &log_value, debug_log->bit_width);
                     break;
                 }
             }

src/core/memory/dmnt_cheat_vm.h

@@ -266,8 +266,8 @@ public:
     public:
         virtual ~Callbacks();
 
-        virtual void MemoryReadUnsafe(VAddr address, void* data, u64 size) = 0;
-        virtual void MemoryWriteUnsafe(VAddr address, const void* data, u64 size) = 0;
+        virtual void MemoryRead(VAddr address, void* data, u64 size) = 0;
+        virtual void MemoryWrite(VAddr address, const void* data, u64 size) = 0;
 
         virtual u64 HidKeysDown() = 0;
 

src/hid_core/resources/abstracted_pad/abstract_sixaxis_handler.cpp

@@ -57,7 +57,7 @@ Result NpadAbstractSixAxisHandler::UpdateSixAxisState() {
     Core::HID::NpadIdType npad_id = properties_handler->GetNpadId();
     for (std::size_t i = 0; i < AruidIndexMax; i++) {
         auto* data = applet_resource_holder->applet_resource->GetAruidDataByIndex(i);
-        if (data == nullptr || !data->flag.is_assigned) {
+        if (data->flag.is_assigned) {
             continue;
         }
         auto& npad_entry = data->shared_memory_format->npad.npad_entry[NpadIdTypeToIndex(npad_id)];

src/hid_core/resources/npad/npad.cpp

@@ -131,7 +131,7 @@ void NPad::ControllerUpdate(Core::HID::ControllerTriggerType type, std::size_t c
 
         auto* data = applet_resource_holder.applet_resource->GetAruidDataByIndex(aruid_index);
 
-        if (data == nullptr || !data->flag.is_assigned) {
+        if (!data->flag.is_assigned) {
             continue;
         }
 
@@ -463,13 +463,13 @@ void NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
     std::scoped_lock lock{*applet_resource_holder.shared_mutex};
     for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; ++aruid_index) {
         const auto* data = applet_resource_holder.applet_resource->GetAruidDataByIndex(aruid_index);
+        const auto aruid = data->aruid;
 
-        if (data == nullptr || !data->flag.is_assigned) {
+        if (!data->flag.is_assigned) {
             continue;
         }
 
         bool is_set{};
-        const auto aruid = data->aruid;
         npad_resource.IsSupportedNpadStyleSet(is_set, aruid);
         // Wait until style is defined
         if (!is_set) {

src/hid_core/resources/six_axis/six_axis.cpp

@@ -28,148 +28,142 @@ void SixAxis::OnRelease() {}
 
 void SixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
     std::scoped_lock shared_lock{*shared_mutex};
+    const u64 aruid = applet_resource->GetActiveAruid();
+    auto* data = applet_resource->GetAruidData(aruid);
 
-    for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; ++aruid_index) {
-        const auto* data = applet_resource->GetAruidDataByIndex(aruid_index);
+    if (data == nullptr || !data->flag.is_assigned) {
+        return;
+    }
 
-        if (data == nullptr || !data->flag.is_assigned) {
+    if (!IsControllerActivated()) {
+        return;
+    }
+
+    for (std::size_t i = 0; i < controller_data.size(); ++i) {
+        NpadSharedMemoryEntry& shared_memory = data->shared_memory_format->npad.npad_entry[i];
+        auto& controller = controller_data[i];
+        const auto& controller_type = controller.device->GetNpadStyleIndex();
+
+        if (controller_type == Core::HID::NpadStyleIndex::None ||
+            !controller.device->IsConnected()) {
             continue;
         }
 
-        if (!IsControllerActivated()) {
-            return;
+        const auto& motion_state = controller.device->GetMotions();
+        auto& sixaxis_fullkey_state = controller.sixaxis_fullkey_state;
+        auto& sixaxis_handheld_state = controller.sixaxis_handheld_state;
+        auto& sixaxis_dual_left_state = controller.sixaxis_dual_left_state;
+        auto& sixaxis_dual_right_state = controller.sixaxis_dual_right_state;
+        auto& sixaxis_left_lifo_state = controller.sixaxis_left_lifo_state;
+        auto& sixaxis_right_lifo_state = controller.sixaxis_right_lifo_state;
+
+        auto& sixaxis_fullkey_lifo = shared_memory.internal_state.sixaxis_fullkey_lifo;
+        auto& sixaxis_handheld_lifo = shared_memory.internal_state.sixaxis_handheld_lifo;
+        auto& sixaxis_dual_left_lifo = shared_memory.internal_state.sixaxis_dual_left_lifo;
+        auto& sixaxis_dual_right_lifo = shared_memory.internal_state.sixaxis_dual_right_lifo;
+        auto& sixaxis_left_lifo = shared_memory.internal_state.sixaxis_left_lifo;
+        auto& sixaxis_right_lifo = shared_memory.internal_state.sixaxis_right_lifo;
+
+        // Clear previous state
+        sixaxis_fullkey_state = {};
+        sixaxis_handheld_state = {};
+        sixaxis_dual_left_state = {};
+        sixaxis_dual_right_state = {};
+        sixaxis_left_lifo_state = {};
+        sixaxis_right_lifo_state = {};
+
+        if (controller.sixaxis_sensor_enabled && Settings::values.motion_enabled.GetValue()) {
+            controller.sixaxis_at_rest = true;
+            for (std::size_t e = 0; e < motion_state.size(); ++e) {
+                controller.sixaxis_at_rest =
+                    controller.sixaxis_at_rest && motion_state[e].is_at_rest;
+            }
         }
 
-        for (std::size_t i = 0; i < controller_data.size(); ++i) {
-            NpadSharedMemoryEntry& shared_memory = data->shared_memory_format->npad.npad_entry[i];
-            auto& controller = controller_data[i];
-            const auto& controller_type = controller.device->GetNpadStyleIndex();
-
-            if (!data->flag.enable_six_axis_sensor) {
-                continue;
-            }
-
-            if (controller_type == Core::HID::NpadStyleIndex::None ||
-                !controller.device->IsConnected()) {
-                continue;
-            }
-
-            const auto& motion_state = controller.device->GetMotions();
-            auto& sixaxis_fullkey_state = controller.sixaxis_fullkey_state;
-            auto& sixaxis_handheld_state = controller.sixaxis_handheld_state;
-            auto& sixaxis_dual_left_state = controller.sixaxis_dual_left_state;
-            auto& sixaxis_dual_right_state = controller.sixaxis_dual_right_state;
-            auto& sixaxis_left_lifo_state = controller.sixaxis_left_lifo_state;
-            auto& sixaxis_right_lifo_state = controller.sixaxis_right_lifo_state;
-
-            auto& sixaxis_fullkey_lifo = shared_memory.internal_state.sixaxis_fullkey_lifo;
-            auto& sixaxis_handheld_lifo = shared_memory.internal_state.sixaxis_handheld_lifo;
-            auto& sixaxis_dual_left_lifo = shared_memory.internal_state.sixaxis_dual_left_lifo;
-            auto& sixaxis_dual_right_lifo = shared_memory.internal_state.sixaxis_dual_right_lifo;
-            auto& sixaxis_left_lifo = shared_memory.internal_state.sixaxis_left_lifo;
-            auto& sixaxis_right_lifo = shared_memory.internal_state.sixaxis_right_lifo;
-
-            // Clear previous state
-            sixaxis_fullkey_state = {};
-            sixaxis_handheld_state = {};
-            sixaxis_dual_left_state = {};
-            sixaxis_dual_right_state = {};
-            sixaxis_left_lifo_state = {};
-            sixaxis_right_lifo_state = {};
-
-            if (controller.sixaxis_sensor_enabled && Settings::values.motion_enabled.GetValue()) {
-                controller.sixaxis_at_rest = true;
-                for (std::size_t e = 0; e < motion_state.size(); ++e) {
-                    controller.sixaxis_at_rest =
-                        controller.sixaxis_at_rest && motion_state[e].is_at_rest;
-                }
-            }
-
-            const auto set_motion_state = [&](Core::HID::SixAxisSensorState& state,
-                                              const Core::HID::ControllerMotion& hid_state) {
-                using namespace std::literals::chrono_literals;
-                static constexpr Core::HID::SixAxisSensorState default_motion_state = {
-                    .delta_time = std::chrono::nanoseconds(5ms).count(),
-                    .accel = {0, 0, -1.0f},
-                    .orientation =
-                        {
-                            Common::Vec3f{1.0f, 0, 0},
-                            Common::Vec3f{0, 1.0f, 0},
-                            Common::Vec3f{0, 0, 1.0f},
-                        },
-                    .attribute = {1},
-                };
-                if (!controller.sixaxis_sensor_enabled) {
-                    state = default_motion_state;
-                    return;
-                }
-                if (!Settings::values.motion_enabled.GetValue()) {
-                    state = default_motion_state;
-                    return;
-                }
-                state.attribute.is_connected.Assign(1);
-                state.delta_time = std::chrono::nanoseconds(5ms).count();
-                state.accel = hid_state.accel;
-                state.gyro = hid_state.gyro;
-                state.rotation = hid_state.rotation;
-                state.orientation = hid_state.orientation;
+        const auto set_motion_state = [&](Core::HID::SixAxisSensorState& state,
+                                          const Core::HID::ControllerMotion& hid_state) {
+            using namespace std::literals::chrono_literals;
+            static constexpr Core::HID::SixAxisSensorState default_motion_state = {
+                .delta_time = std::chrono::nanoseconds(5ms).count(),
+                .accel = {0, 0, -1.0f},
+                .orientation =
+                    {
+                        Common::Vec3f{1.0f, 0, 0},
+                        Common::Vec3f{0, 1.0f, 0},
+                        Common::Vec3f{0, 0, 1.0f},
+                    },
+                .attribute = {1},
             };
-
-            switch (controller_type) {
-            case Core::HID::NpadStyleIndex::None:
-                ASSERT(false);
-                break;
-            case Core::HID::NpadStyleIndex::Fullkey:
-                set_motion_state(sixaxis_fullkey_state, motion_state[0]);
-                break;
-            case Core::HID::NpadStyleIndex::Handheld:
-                set_motion_state(sixaxis_handheld_state, motion_state[0]);
-                break;
-            case Core::HID::NpadStyleIndex::JoyconDual:
-                set_motion_state(sixaxis_dual_left_state, motion_state[0]);
-                set_motion_state(sixaxis_dual_right_state, motion_state[1]);
-                break;
-            case Core::HID::NpadStyleIndex::JoyconLeft:
-                set_motion_state(sixaxis_left_lifo_state, motion_state[0]);
-                break;
-            case Core::HID::NpadStyleIndex::JoyconRight:
-                set_motion_state(sixaxis_right_lifo_state, motion_state[1]);
-                break;
-            case Core::HID::NpadStyleIndex::Pokeball:
-                using namespace std::literals::chrono_literals;
-                set_motion_state(sixaxis_fullkey_state, motion_state[0]);
-                sixaxis_fullkey_state.delta_time = std::chrono::nanoseconds(15ms).count();
-                break;
-            default:
-                break;
+            if (!controller.sixaxis_sensor_enabled) {
+                state = default_motion_state;
+                return;
             }
-
-            sixaxis_fullkey_state.sampling_number =
-                sixaxis_fullkey_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
-            sixaxis_handheld_state.sampling_number =
-                sixaxis_handheld_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
-            sixaxis_dual_left_state.sampling_number =
-                sixaxis_dual_left_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
-            sixaxis_dual_right_state.sampling_number =
-                sixaxis_dual_right_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
-            sixaxis_left_lifo_state.sampling_number =
-                sixaxis_left_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
-            sixaxis_right_lifo_state.sampling_number =
-                sixaxis_right_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
-
-            if (IndexToNpadIdType(i) == Core::HID::NpadIdType::Handheld) {
-                // This buffer only is updated on handheld on HW
-                sixaxis_handheld_lifo.lifo.WriteNextEntry(sixaxis_handheld_state);
-            } else {
-                // Handheld doesn't update this buffer on HW
-                sixaxis_fullkey_lifo.lifo.WriteNextEntry(sixaxis_fullkey_state);
+            if (!Settings::values.motion_enabled.GetValue()) {
+                state = default_motion_state;
+                return;
             }
+            state.attribute.is_connected.Assign(1);
+            state.delta_time = std::chrono::nanoseconds(5ms).count();
+            state.accel = hid_state.accel;
+            state.gyro = hid_state.gyro;
+            state.rotation = hid_state.rotation;
+            state.orientation = hid_state.orientation;
+        };
 
-            sixaxis_dual_left_lifo.lifo.WriteNextEntry(sixaxis_dual_left_state);
-            sixaxis_dual_right_lifo.lifo.WriteNextEntry(sixaxis_dual_right_state);
-            sixaxis_left_lifo.lifo.WriteNextEntry(sixaxis_left_lifo_state);
-            sixaxis_right_lifo.lifo.WriteNextEntry(sixaxis_right_lifo_state);
+        switch (controller_type) {
+        case Core::HID::NpadStyleIndex::None:
+            ASSERT(false);
+            break;
+        case Core::HID::NpadStyleIndex::Fullkey:
+            set_motion_state(sixaxis_fullkey_state, motion_state[0]);
+            break;
+        case Core::HID::NpadStyleIndex::Handheld:
+            set_motion_state(sixaxis_handheld_state, motion_state[0]);
+            break;
+        case Core::HID::NpadStyleIndex::JoyconDual:
+            set_motion_state(sixaxis_dual_left_state, motion_state[0]);
+            set_motion_state(sixaxis_dual_right_state, motion_state[1]);
+            break;
+        case Core::HID::NpadStyleIndex::JoyconLeft:
+            set_motion_state(sixaxis_left_lifo_state, motion_state[0]);
+            break;
+        case Core::HID::NpadStyleIndex::JoyconRight:
+            set_motion_state(sixaxis_right_lifo_state, motion_state[1]);
+            break;
+        case Core::HID::NpadStyleIndex::Pokeball:
+            using namespace std::literals::chrono_literals;
+            set_motion_state(sixaxis_fullkey_state, motion_state[0]);
+            sixaxis_fullkey_state.delta_time = std::chrono::nanoseconds(15ms).count();
+            break;
+        default:
+            break;
         }
+
+        sixaxis_fullkey_state.sampling_number =
+            sixaxis_fullkey_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
+        sixaxis_handheld_state.sampling_number =
+            sixaxis_handheld_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
+        sixaxis_dual_left_state.sampling_number =
+            sixaxis_dual_left_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
+        sixaxis_dual_right_state.sampling_number =
+            sixaxis_dual_right_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
+        sixaxis_left_lifo_state.sampling_number =
+            sixaxis_left_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
+        sixaxis_right_lifo_state.sampling_number =
+            sixaxis_right_lifo.lifo.ReadCurrentEntry().state.sampling_number + 1;
+
+        if (IndexToNpadIdType(i) == Core::HID::NpadIdType::Handheld) {
+            // This buffer only is updated on handheld on HW
+            sixaxis_handheld_lifo.lifo.WriteNextEntry(sixaxis_handheld_state);
+        } else {
+            // Handheld doesn't update this buffer on HW
+            sixaxis_fullkey_lifo.lifo.WriteNextEntry(sixaxis_fullkey_state);
+        }
+
+        sixaxis_dual_left_lifo.lifo.WriteNextEntry(sixaxis_dual_left_state);
+        sixaxis_dual_right_lifo.lifo.WriteNextEntry(sixaxis_dual_right_state);
+        sixaxis_left_lifo.lifo.WriteNextEntry(sixaxis_left_lifo_state);
+        sixaxis_right_lifo.lifo.WriteNextEntry(sixaxis_right_lifo_state);
     }
 }
 

src/hid_core/resources/touch_screen/touch_screen_resource.cpp

@@ -63,7 +63,7 @@ Result TouchResource::ActivateTouch(u64 aruid) {
         auto* applet_data = applet_resource->GetAruidDataByIndex(aruid_index);
         TouchAruidData& touch_data = aruid_data[aruid_index];
 
-        if (applet_data == nullptr || !applet_data->flag.is_assigned) {
+        if (!applet_data->flag.is_assigned) {
             touch_data = {};
             continue;
         }
@@ -124,7 +124,7 @@ Result TouchResource::ActivateGesture(u64 aruid, u32 basic_gesture_id) {
         auto* applet_data = applet_resource->GetAruidDataByIndex(aruid_index);
         TouchAruidData& touch_data = aruid_data[aruid_index];
 
-        if (applet_data == nullptr || !applet_data->flag.is_assigned) {
+        if (!applet_data->flag.is_assigned) {
             touch_data = {};
             continue;
         }
@@ -324,7 +324,7 @@ Result TouchResource::SetTouchScreenConfiguration(
         const auto* applet_data = applet_resource->GetAruidDataByIndex(aruid_index);
         TouchAruidData& data = aruid_data[aruid_index];
 
-        if (applet_data == nullptr || !applet_data->flag.is_assigned) {
+        if (!applet_data->flag.is_assigned) {
             continue;
         }
         if (aruid != data.aruid) {
@@ -344,7 +344,7 @@ Result TouchResource::GetTouchScreenConfiguration(
         const auto* applet_data = applet_resource->GetAruidDataByIndex(aruid_index);
         const TouchAruidData& data = aruid_data[aruid_index];
 
-        if (applet_data == nullptr || !applet_data->flag.is_assigned) {
+        if (!applet_data->flag.is_assigned) {
             continue;
         }
         if (aruid != data.aruid) {

src/shader_recompiler/backend/spirv/emit_spirv_image.cpp

@@ -61,10 +61,10 @@ public:
     }
 
     explicit ImageOperands(EmitContext& ctx, const IR::Value& offset, Id lod, Id ms) {
+        AddOffset(ctx, offset, ImageFetchOffsetAllowed);
         if (Sirit::ValidId(lod)) {
             Add(spv::ImageOperandsMask::Lod, lod);
         }
-        AddOffset(ctx, offset, ImageFetchOffsetAllowed);
         if (Sirit::ValidId(ms)) {
             Add(spv::ImageOperandsMask::Sample, ms);
         }

src/yuzu/configuration/configure_per_game.cpp

@@ -73,11 +73,8 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st
     ui->tabWidget->addTab(graphics_advanced_tab.get(), tr("Adv. Graphics"));
     ui->tabWidget->addTab(audio_tab.get(), tr("Audio"));
     ui->tabWidget->addTab(input_tab.get(), tr("Input Profiles"));
-
     // Only show Linux tab on Unix
-    linux_tab->setVisible(false);
 #ifdef __unix__
-    linux_tab->setVisible(true);
     ui->tabWidget->addTab(linux_tab.get(), tr("Linux"));
 #endif