vk_shader_cache: Small cleanup

.gitmodules

@@ -81,7 +81,4 @@
 [submodule "externals/ffmpeg-core"]
 	path = externals/ffmpeg-core
 	url = https://github.com/shadps4-emu/ext-ffmpeg-core.git
-	shallow = true
+	shallow = true
-[submodule "externals/half"]
-	path = externals/half
-	url = https://github.com/ROCm/half.git

CMakeLists.txt

@@ -644,9 +644,6 @@ if (APPLE)
 
   # Replacement for std::chrono::time_zone
   target_link_libraries(shadps4 PRIVATE date::date-tz)
-
-  # Half float conversions for F16C patches
-  target_link_libraries(shadps4 PRIVATE half)
 endif()
 
 if (NOT ENABLE_QT_GUI)

externals/CMakeLists.txt

@@ -142,17 +142,11 @@ if (WIN32)
     target_compile_options(sirit PUBLIC "-Wno-error=unused-command-line-argument")
 endif()
 
-if (APPLE)
+# date
-    # half
+if (APPLE AND NOT TARGET date::date-tz)
-    add_library(half INTERFACE)
+    option(BUILD_TZ_LIB "" ON)
-    target_include_directories(half INTERFACE half/include)
+    option(USE_SYSTEM_TZ_DB "" ON)
-
+    add_subdirectory(date)
-    # date
-    if (NOT TARGET date::date-tz)
-        option(BUILD_TZ_LIB "" ON)
-        option(USE_SYSTEM_TZ_DB "" ON)
-        add_subdirectory(date)
-    endif()
 endif()
 
 # Tracy

externals/glslang

@@ -1 +1 @@
-Subproject commit 12cbda959b6df2af119a76a73ff906c2bed36884
+Subproject commit d59c84d388c805022e2bddea08aa41cbe7e43e55

externals/half

@@ -1 +0,0 @@
-Subproject commit 1ddada225144cac0de8f6b5c0dd9acffd99a2e68

externals/robin-map

@@ -1 +1 @@
-Subproject commit 2c48a1a50203bbaf1e3d0d64c5d726d56f8d3bb3
+Subproject commit 1115dad3ffa0994e3f43b693d9b9cc99944c64c1

externals/sirit

@@ -1 +1 @@
-Subproject commit 37090c74cc6e680f2bc334cac8fd182f7634a1f6
+Subproject commit 8db09231c448b913ae905d5237ce2eca46e3fe87

externals/toml11

@@ -1 +1 @@
-Subproject commit 4b740127230472779c4a4d71e1a75aaa3a367a2d
+Subproject commit cc0bee4fd46ea1f5db147d63ea545208cc9e8405

externals/xbyak

@@ -1 +1 @@
-Subproject commit ccdf68421bc8eb85693f573080fc0a5faad862db
+Subproject commit aabb091ae37068498751fd58202a9854408ecb0e

src/core/cpu_patches.cpp

@@ -15,7 +15,6 @@
 #else
 #include <pthread.h>
 #ifdef __APPLE__
-#include <half.hpp>
 #include <sys/sysctl.h>
 #endif
 #endif
@@ -31,12 +30,6 @@ static Xbyak::Reg ZydisToXbyakRegister(const ZydisRegister reg) {
     if (reg >= ZYDIS_REGISTER_RAX && reg <= ZYDIS_REGISTER_R15) {
         return Xbyak::Reg64(reg - ZYDIS_REGISTER_RAX + Xbyak::Operand::RAX);
     }
-    if (reg >= ZYDIS_REGISTER_XMM0 && reg <= ZYDIS_REGISTER_XMM31) {
-        return Xbyak::Xmm(reg - ZYDIS_REGISTER_XMM0 + xmm0.getIdx());
-    }
-    if (reg >= ZYDIS_REGISTER_YMM0 && reg <= ZYDIS_REGISTER_YMM31) {
-        return Xbyak::Ymm(reg - ZYDIS_REGISTER_YMM0 + ymm0.getIdx());
-    }
     UNREACHABLE_MSG("Unsupported register: {}", static_cast<u32>(reg));
 }
 
@@ -73,12 +66,6 @@ static Xbyak::Address ZydisToXbyakMemoryOperand(const ZydisDecodedOperand& opera
     return ptr[expression];
 }
 
-static u64 ZydisToXbyakImmediateOperand(const ZydisDecodedOperand& operand) {
-    ASSERT_MSG(operand.type == ZYDIS_OPERAND_TYPE_IMMEDIATE,
-               "Expected immediate operand, got type: {}", static_cast<u32>(operand.type));
-    return operand.imm.value.u;
-}
-
 static std::unique_ptr<Xbyak::Operand> ZydisToXbyakOperand(const ZydisDecodedOperand& operand) {
     switch (operand.type) {
     case ZYDIS_OPERAND_TYPE_REGISTER: {
@@ -123,135 +110,51 @@ static Xbyak::Reg AllocateScratchRegister(
 
 #ifdef __APPLE__
 
-static pthread_key_t stack_pointer_slot;
+static constexpr u32 MaxSavedRegisters = 3;
-static pthread_key_t patch_stack_slot;
+static pthread_key_t register_save_slots[MaxSavedRegisters];
-static std::once_flag patch_context_slots_init_flag;
+static std::once_flag register_save_init_flag;
 
 static_assert(sizeof(void*) == sizeof(u64),
               "Cannot fit a register inside a thread local storage slot.");
 
-static void InitializePatchContextSlots() {
+static void InitializeRegisterSaveSlots() {
-    ASSERT_MSG(pthread_key_create(&stack_pointer_slot, nullptr) == 0,
+    for (u32 i = 0; i < MaxSavedRegisters; i++) {
-               "Unable to allocate thread-local register for stack pointer.");
+        ASSERT_MSG(pthread_key_create(&register_save_slots[i], nullptr) == 0,
-    ASSERT_MSG(pthread_key_create(&patch_stack_slot, nullptr) == 0,
+                   "Unable to allocate thread-local register save slot {}", i);
-               "Unable to allocate thread-local register for patch stack.");
-}
-
-void InitializeThreadPatchStack() {
-    std::call_once(patch_context_slots_init_flag, InitializePatchContextSlots);
-
-    const auto* patch_stack = std::malloc(0x1000);
-    pthread_setspecific(patch_stack_slot, patch_stack);
-}
-
-void CleanupThreadPatchStack() {
-    std::call_once(patch_context_slots_init_flag, InitializePatchContextSlots);
-
-    auto* patch_stack = pthread_getspecific(patch_stack_slot);
-    if (patch_stack != nullptr) {
-        std::free(patch_stack);
-        pthread_setspecific(patch_stack_slot, nullptr);
     }
 }
 
-/// Saves the stack pointer to thread local storage and loads the patch stack.
-static void SaveStack(Xbyak::CodeGenerator& c) {
-    std::call_once(patch_context_slots_init_flag, InitializePatchContextSlots);
-
-    // Save stack pointer and load patch stack.
-    c.putSeg(gs);
-    c.mov(qword[reinterpret_cast<void*>(stack_pointer_slot * sizeof(void*))], rsp);
-    c.putSeg(gs);
-    c.mov(rsp, qword[reinterpret_cast<void*>(patch_stack_slot * sizeof(void*))]);
-}
-
-/// Restores the stack pointer from thread local storage.
-static void RestoreStack(Xbyak::CodeGenerator& c) {
-    std::call_once(patch_context_slots_init_flag, InitializePatchContextSlots);
-
-    // Save patch stack pointer and load original stack.
-    c.putSeg(gs);
-    c.mov(qword[reinterpret_cast<void*>(patch_stack_slot * sizeof(void*))], rsp);
-    c.putSeg(gs);
-    c.mov(rsp, qword[reinterpret_cast<void*>(stack_pointer_slot * sizeof(void*))]);
-}
-
-#else
-
-// These utilities are not implemented as we can't save anything to thread local storage without
-// temporary registers.
-void InitializeThreadPatchStack() {
-    // No-op
-}
-
-void CleanupThreadPatchStack() {
-    // No-op
-}
-
-/// Saves the stack pointer to thread local storage and loads the patch stack.
-static void SaveStack(Xbyak::CodeGenerator& c) {
-    UNIMPLEMENTED();
-}
-
-/// Restores the stack pointer from thread local storage.
-static void RestoreStack(Xbyak::CodeGenerator& c) {
-    UNIMPLEMENTED();
-}
-
-#endif
-
-/// Switches to the patch stack, saves registers, and restores the original stack.
 static void SaveRegisters(Xbyak::CodeGenerator& c, const std::initializer_list<Xbyak::Reg> regs) {
-    SaveStack(c);
+    ASSERT_MSG(regs.size() <= MaxSavedRegisters, "Not enough space to save {} registers.",
+               regs.size());
+
+    std::call_once(register_save_init_flag, &InitializeRegisterSaveSlots);
+
+    u32 index = 0;
     for (const auto& reg : regs) {
-        c.push(reg.cvt64());
+        const auto offset = reinterpret_cast<void*>(register_save_slots[index++] * sizeof(void*));
+
+        c.putSeg(gs);
+        c.mov(qword[offset], reg.cvt64());
     }
-    RestoreStack(c);
 }
 
-/// Switches to the patch stack, restores registers, and restores the original stack.
 static void RestoreRegisters(Xbyak::CodeGenerator& c,
                              const std::initializer_list<Xbyak::Reg> regs) {
-    SaveStack(c);
+    ASSERT_MSG(regs.size() <= MaxSavedRegisters, "Not enough space to restore {} registers.",
+               regs.size());
+
+    std::call_once(register_save_init_flag, &InitializeRegisterSaveSlots);
+
+    u32 index = 0;
     for (const auto& reg : regs) {
-        c.pop(reg.cvt64());
+        const auto offset = reinterpret_cast<void*>(register_save_slots[index++] * sizeof(void*));
-    }
-    RestoreStack(c);
-}
 
-/// Switches to the patch stack and stores all registers.
+        c.putSeg(gs);
-static void SaveContext(Xbyak::CodeGenerator& c) {
+        c.mov(reg.cvt64(), qword[offset]);
-    SaveStack(c);
-    for (int reg = Xbyak::Operand::RAX; reg <= Xbyak::Operand::R15; reg++) {
-        c.push(Xbyak::Reg64(reg));
-    }
-    for (int reg = 0; reg <= 7; reg++) {
-        c.sub(rsp, 32);
-        c.vmovdqu(ptr[rsp], Xbyak::Ymm(reg));
     }
 }
 
-/// Restores all registers and restores the original stack.
-/// If the destination is a register, it is not restored to preserve the output.
-static void RestoreContext(Xbyak::CodeGenerator& c, const Xbyak::Operand& dst) {
-    for (int reg = 7; reg >= 0; reg--) {
-        if ((!dst.isXMM() && !dst.isYMM()) || dst.getIdx() != reg) {
-            c.vmovdqu(Xbyak::Ymm(reg), ptr[rsp]);
-        }
-        c.add(rsp, 32);
-    }
-    for (int reg = Xbyak::Operand::R15; reg >= Xbyak::Operand::RAX; reg--) {
-        if (!dst.isREG() || dst.getIdx() != reg) {
-            c.pop(Xbyak::Reg64(reg));
-        } else {
-            c.add(rsp, 4);
-        }
-    }
-    RestoreStack(c);
-}
-
-#ifdef __APPLE__
-
 static void GenerateANDN(const ZydisDecodedOperand* operands, Xbyak::CodeGenerator& c) {
     const auto dst = ZydisToXbyakRegisterOperand(operands[0]);
     const auto src1 = ZydisToXbyakRegisterOperand(operands[1]);
@@ -301,9 +204,9 @@ static void GenerateBEXTR(const ZydisDecodedOperand* operands, Xbyak::CodeGenera
     c.and_(dst, scratch2);
 
     if (dst.getIdx() == shift.getIdx()) {
-        RestoreRegisters(c, {scratch2, scratch1});
+        RestoreRegisters(c, {scratch1, scratch2});
     } else {
-        RestoreRegisters(c, {shift, scratch2, scratch1});
+        RestoreRegisters(c, {scratch1, scratch2, shift});
     }
 }
 
@@ -355,138 +258,10 @@ static void GenerateBLSR(const ZydisDecodedOperand* operands, Xbyak::CodeGenerat
     RestoreRegisters(c, {scratch});
 }
 
-static __attribute__((sysv_abi)) void PerformVCVTPH2PS(float* out, const half_float::half* in,
+bool FilterRosetta2Only(const ZydisDecodedOperand*) {
-                                                       const u32 count) {
-    for (u32 i = 0; i < count; i++) {
-        out[i] = half_float::half_cast<float>(in[i]);
-    }
-}
-
-static void GenerateVCVTPH2PS(const ZydisDecodedOperand* operands, Xbyak::CodeGenerator& c) {
-    const auto dst = ZydisToXbyakRegisterOperand(operands[0]);
-    const auto src = ZydisToXbyakOperand(operands[1]);
-
-    const auto float_count = dst.getBit() / 32;
-    const auto byte_count = float_count * 4;
-
-    SaveContext(c);
-
-    // Allocate stack space for outputs and load into first parameter.
-    c.sub(rsp, byte_count);
-    c.mov(rdi, rsp);
-
-    if (src->isXMM()) {
-        // Allocate stack space for inputs and load into second parameter.
-        c.sub(rsp, byte_count);
-        c.mov(rsi, rsp);
-
-        // Move input to the allocated space.
-        c.movdqu(ptr[rsp], *reinterpret_cast<Xbyak::Xmm*>(src.get()));
-    } else {
-        c.lea(rsi, src->getAddress());
-    }
-
-    // Load float count into third parameter.
-    c.mov(rdx, float_count);
-
-    c.mov(rax, reinterpret_cast<u64>(PerformVCVTPH2PS));
-    c.call(rax);
-
-    if (src->isXMM()) {
-        // Clean up after inputs space.
-        c.add(rsp, byte_count);
-    }
-
-    // Load outputs into destination register and clean up space.
-    if (dst.isYMM()) {
-        c.vmovdqu(*reinterpret_cast<const Xbyak::Ymm*>(&dst), ptr[rsp]);
-    } else {
-        c.movdqu(*reinterpret_cast<const Xbyak::Xmm*>(&dst), ptr[rsp]);
-    }
-    c.add(rsp, byte_count);
-
-    RestoreContext(c, dst);
-}
-
-using SingleToHalfFloatConverter = half_float::half (*)(float);
-static const SingleToHalfFloatConverter SingleToHalfFloatConverters[4] = {
-    half_float::half_cast<half_float::half, std::round_to_nearest, float>,
-    half_float::half_cast<half_float::half, std::round_toward_neg_infinity, float>,
-    half_float::half_cast<half_float::half, std::round_toward_infinity, float>,
-    half_float::half_cast<half_float::half, std::round_toward_zero, float>,
-};
-
-static __attribute__((sysv_abi)) void PerformVCVTPS2PH(half_float::half* out, const float* in,
-                                                       const u32 count, const u8 rounding_mode) {
-    const auto conversion_func = SingleToHalfFloatConverters[rounding_mode];
-
-    for (u32 i = 0; i < count; i++) {
-        out[i] = conversion_func(in[i]);
-    }
-}
-
-static void GenerateVCVTPS2PH(const ZydisDecodedOperand* operands, Xbyak::CodeGenerator& c) {
-    const auto dst = ZydisToXbyakOperand(operands[0]);
-    const auto src = ZydisToXbyakRegisterOperand(operands[1]);
-    const auto ctrl = ZydisToXbyakImmediateOperand(operands[2]);
-
-    const auto float_count = src.getBit() / 32;
-    const auto byte_count = float_count * 4;
-
-    SaveContext(c);
-
-    if (dst->isXMM()) {
-        // Allocate stack space for outputs and load into first parameter.
-        c.sub(rsp, byte_count);
-        c.mov(rdi, rsp);
-    } else {
-        c.lea(rdi, dst->getAddress());
-    }
-
-    // Allocate stack space for inputs and load into second parameter.
-    c.sub(rsp, byte_count);
-    c.mov(rsi, rsp);
-
-    // Move input to the allocated space.
-    if (src.isYMM()) {
-        c.vmovdqu(ptr[rsp], *reinterpret_cast<const Xbyak::Ymm*>(&src));
-    } else {
-        c.movdqu(ptr[rsp], *reinterpret_cast<const Xbyak::Xmm*>(&src));
-    }
-
-    // Load float count into third parameter.
-    c.mov(rdx, float_count);
-
-    // Load rounding mode into fourth parameter.
-    if (ctrl & 4) {
-        // Load from MXCSR.RC.
-        c.stmxcsr(ptr[rsp - 4]);
-        c.mov(rcx, ptr[rsp - 4]);
-        c.shr(rcx, 13);
-        c.and_(rcx, 3);
-    } else {
-        c.mov(rcx, ctrl & 3);
-    }
-
-    c.mov(rax, reinterpret_cast<u64>(PerformVCVTPS2PH));
-    c.call(rax);
-
-    // Clean up after inputs space.
-    c.add(rsp, byte_count);
-
-    if (dst->isXMM()) {
-        // Load outputs into destination register and clean up space.
-        c.movdqu(*reinterpret_cast<Xbyak::Xmm*>(dst.get()), ptr[rsp]);
-        c.add(rsp, byte_count);
-    }
-
-    RestoreContext(c, *dst);
-}
-
-static bool FilterRosetta2Only(const ZydisDecodedOperand*) {
     int ret = 0;
     size_t size = sizeof(ret);
-    if (sysctlbyname("sysctl.proc_translated", &ret, &size, nullptr, 0) != 0) {
+    if (sysctlbyname("sysctl.proc_translated", &ret, &size, NULL, 0) != 0) {
         return false;
     }
     return ret;
@@ -564,16 +339,12 @@ static const std::unordered_map<ZydisMnemonic, PatchInfo> Patches = {
 #endif
 
 #ifdef __APPLE__
-    // Patches for instruction sets not supported by Rosetta 2.
+    // BMI1 instructions that are not supported by Rosetta 2 on Apple Silicon.
-    // BMI1
     {ZYDIS_MNEMONIC_ANDN, {FilterRosetta2Only, GenerateANDN, true}},
     {ZYDIS_MNEMONIC_BEXTR, {FilterRosetta2Only, GenerateBEXTR, true}},
     {ZYDIS_MNEMONIC_BLSI, {FilterRosetta2Only, GenerateBLSI, true}},
     {ZYDIS_MNEMONIC_BLSMSK, {FilterRosetta2Only, GenerateBLSMSK, true}},
     {ZYDIS_MNEMONIC_BLSR, {FilterRosetta2Only, GenerateBLSR, true}},
-    // F16C
-    {ZYDIS_MNEMONIC_VCVTPH2PS, {FilterRosetta2Only, GenerateVCVTPH2PS, true}},
-    {ZYDIS_MNEMONIC_VCVTPS2PH, {FilterRosetta2Only, GenerateVCVTPS2PH, true}},
 #endif
 };
 

src/core/cpu_patches.h

@@ -9,12 +9,6 @@ class CodeGenerator;
 
 namespace Core {
 
-/// Initializes a stack for the current thread for use by patch implementations.
-void InitializeThreadPatchStack();
-
-/// Cleans up the patch stack for the current thread.
-void CleanupThreadPatchStack();
-
 /// Patches CPU instructions that cannot run as-is on the host.
 void PatchInstructions(u64 segment_addr, u64 segment_size, Xbyak::CodeGenerator& c);
 

src/core/libraries/app_content/app_content.cpp

@@ -1,16 +1,17 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+// Generated By moduleGenerator
 #include <cmath>
+#include <common/path_util.h>
+#include <common/singleton.h>
+#include <core/file_format/psf.h>
+#include <core/file_sys/fs.h>
 
 #include "app_content.h"
 #include "common/io_file.h"
 #include "common/logging/log.h"
-#include "common/path_util.h"
-#include "common/singleton.h"
 #include "common/string_util.h"
-#include "core/file_format/psf.h"
-#include "core/file_sys/fs.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"
 

src/core/libraries/audio/audioout.cpp

@@ -2,10 +2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <memory>
+#include <common/assert.h>
 #include <magic_enum.hpp>
-
 #include "audio_core/sdl_audio.h"
-#include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/libraries/audio/audioout.h"
 #include "core/libraries/error_codes.h"

src/core/libraries/dialogs/error_dialog.cpp

@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+// Generated By moduleGenerator
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"

src/core/libraries/dialogs/ime_dialog.cpp

@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+// Generated By moduleGenerator
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"

src/core/libraries/disc_map/disc_map.cpp

@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+// Generated By moduleGenerator
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"

src/core/libraries/gnmdriver/gnmdriver.cpp

@@ -650,12 +650,12 @@ s32 PS4_SYSV_ABI sceGnmDrawIndexAuto(u32* cmdbuf, u32 size, u32 index_count, u32
 }
 
 s32 PS4_SYSV_ABI sceGnmDrawIndexIndirect(u32* cmdbuf, u32 size, u32 data_offset, u32 shader_stage,
-                                         u32 vertex_sgpr_offset, u32 instance_sgpr_offset,
+                                         u32 vertex_sgpr_offset, u32 instance_vgpr_offset,
                                          u32 flags) {
     LOG_TRACE(Lib_GnmDriver, "called");
 
     if (cmdbuf && (size == 9) && (shader_stage < ShaderStages::Max) &&
-        (vertex_sgpr_offset < 0x10u) && (instance_sgpr_offset < 0x10u)) {
+        (vertex_sgpr_offset < 0x10u) && (instance_vgpr_offset < 0x10u)) {
 
         const auto predicate = flags & 1 ? PM4Predicate::PredEnable : PM4Predicate::PredDisable;
         cmdbuf = WriteHeader<PM4ItOpcode::DrawIndexIndirect>(
@@ -665,7 +665,7 @@ s32 PS4_SYSV_ABI sceGnmDrawIndexIndirect(u32* cmdbuf, u32 size, u32 data_offset,
 
         cmdbuf[0] = data_offset;
         cmdbuf[1] = vertex_sgpr_offset == 0 ? 0 : (vertex_sgpr_offset & 0xffffu) + sgpr_offset;
-        cmdbuf[2] = instance_sgpr_offset == 0 ? 0 : (instance_sgpr_offset & 0xffffu) + sgpr_offset;
+        cmdbuf[2] = instance_vgpr_offset == 0 ? 0 : (instance_vgpr_offset & 0xffffu) + sgpr_offset;
         cmdbuf[3] = 0;
 
         cmdbuf += 4;
@@ -707,11 +707,11 @@ s32 PS4_SYSV_ABI sceGnmDrawIndexOffset(u32* cmdbuf, u32 size, u32 index_offset,
 }
 
 s32 PS4_SYSV_ABI sceGnmDrawIndirect(u32* cmdbuf, u32 size, u32 data_offset, u32 shader_stage,
-                                    u32 vertex_sgpr_offset, u32 instance_sgpr_offset, u32 flags) {
+                                    u32 vertex_sgpr_offset, u32 instance_vgpr_offset, u32 flags) {
     LOG_TRACE(Lib_GnmDriver, "called");
 
     if (cmdbuf && (size == 9) && (shader_stage < ShaderStages::Max) &&
-        (vertex_sgpr_offset < 0x10u) && (instance_sgpr_offset < 0x10u)) {
+        (vertex_sgpr_offset < 0x10u) && (instance_vgpr_offset < 0x10u)) {
 
         const auto predicate = flags & 1 ? PM4Predicate::PredEnable : PM4Predicate::PredDisable;
         cmdbuf = WriteHeader<PM4ItOpcode::DrawIndirect>(cmdbuf, 4, PM4ShaderType::ShaderGraphics,
@@ -721,7 +721,7 @@ s32 PS4_SYSV_ABI sceGnmDrawIndirect(u32* cmdbuf, u32 size, u32 data_offset, u32
 
         cmdbuf[0] = data_offset;
         cmdbuf[1] = vertex_sgpr_offset == 0 ? 0 : (vertex_sgpr_offset & 0xffffu) + sgpr_offset;
-        cmdbuf[2] = instance_sgpr_offset == 0 ? 0 : (instance_sgpr_offset & 0xffffu) + sgpr_offset;
+        cmdbuf[2] = instance_vgpr_offset == 0 ? 0 : (instance_vgpr_offset & 0xffffu) + sgpr_offset;
         cmdbuf[3] = 2; // auto index
 
         cmdbuf += 4;

src/core/libraries/gnmdriver/gnmdriver.h

@@ -45,7 +45,7 @@ s32 PS4_SYSV_ABI sceGnmDrawIndex(u32* cmdbuf, u32 size, u32 index_count, uintptr
                                  u32 flags, u32 type);
 s32 PS4_SYSV_ABI sceGnmDrawIndexAuto(u32* cmdbuf, u32 size, u32 index_count, u32 flags);
 s32 PS4_SYSV_ABI sceGnmDrawIndexIndirect(u32* cmdbuf, u32 size, u32 data_offset, u32 shader_stage,
-                                         u32 vertex_sgpr_offset, u32 instance_sgpr_offset,
+                                         u32 vertex_sgpr_offset, u32 instance_vgpr_offset,
                                          u32 flags);
 int PS4_SYSV_ABI sceGnmDrawIndexIndirectCountMulti();
 int PS4_SYSV_ABI sceGnmDrawIndexIndirectMulti();
@@ -53,7 +53,7 @@ int PS4_SYSV_ABI sceGnmDrawIndexMultiInstanced();
 s32 PS4_SYSV_ABI sceGnmDrawIndexOffset(u32* cmdbuf, u32 size, u32 index_offset, u32 index_count,
                                        u32 flags);
 s32 PS4_SYSV_ABI sceGnmDrawIndirect(u32* cmdbuf, u32 size, u32 data_offset, u32 shader_stage,
-                                    u32 vertex_sgpr_offset, u32 instance_sgpr_offset, u32 flags);
+                                    u32 vertex_sgpr_offset, u32 instance_vgpr_offset, u32 flags);
 int PS4_SYSV_ABI sceGnmDrawIndirectCountMulti();
 int PS4_SYSV_ABI sceGnmDrawIndirectMulti();
 u32 PS4_SYSV_ABI sceGnmDrawInitDefaultHardwareState(u32* cmdbuf, u32 size);

src/core/libraries/kernel/event_flag/event_flag.cpp

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "common/assert.h"
+#include <common/assert.h>
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"

src/core/libraries/kernel/event_flag/event_flag_obj.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <thread>
-
 #include "core/libraries/error_codes.h"
 #include "event_flag_obj.h"
 

src/core/libraries/kernel/event_flag/event_flag_obj.h

@@ -2,10 +2,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
-
 #include <condition_variable>
 #include <mutex>
-
 #include "common/types.h"
 
 namespace Libraries::Kernel {

src/core/libraries/kernel/event_queue.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <thread>
-
 #include "common/assert.h"
 #include "core/libraries/kernel/event_queue.h"
 

src/core/libraries/kernel/libkernel.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <sys/types.h>
-
 #include "common/types.h"
 
 namespace Core::Loader {

src/core/libraries/kernel/memory_management.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <bit>
-
 #include "common/alignment.h"
 #include "common/assert.h"
 #include "common/logging/log.h"

src/core/libraries/kernel/thread_management.cpp

@@ -4,14 +4,12 @@
 #include <mutex>
 #include <semaphore>
 #include <thread>
-
 #include "common/alignment.h"
 #include "common/assert.h"
 #include "common/error.h"
 #include "common/logging/log.h"
 #include "common/singleton.h"
 #include "common/thread.h"
-#include "core/cpu_patches.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/kernel/libkernel.h"
 #include "core/libraries/kernel/thread_management.h"
@@ -987,7 +985,6 @@ static void cleanup_thread(void* arg) {
             destructor(value);
         }
     }
-    Core::CleanupThreadPatchStack();
     thread->is_almost_done = true;
 }
 
@@ -995,7 +992,6 @@ static void* run_thread(void* arg) {
     auto* thread = static_cast<ScePthread>(arg);
     Common::SetCurrentThreadName(thread->name.c_str());
     auto* linker = Common::Singleton<Core::Linker>::Instance();
-    Core::InitializeThreadPatchStack();
     linker->InitTlsForThread(false);
     void* ret = nullptr;
     g_pthread_self = thread;

src/core/libraries/kernel/thread_management.h

@@ -10,7 +10,6 @@
 #include <vector>
 #include <pthread.h>
 #include <sched.h>
-
 #include "common/types.h"
 
 namespace Core::Loader {

src/core/libraries/kernel/threads/semaphore.cpp

@@ -5,7 +5,6 @@
 #include <list>
 #include <mutex>
 #include <pthread.h>
-
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"

src/core/libraries/kernel/time_management.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <thread>
-
 #include "common/assert.h"
 #include "common/debug.h"
 #include "common/native_clock.h"

src/core/libraries/libc_internal/libc_internal.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <cmath>
-
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"

src/core/libraries/libs.cpp

@@ -2,18 +2,13 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "common/config.h"
-#include "core/libraries/ajm/ajm.h"
 #include "core/libraries/app_content/app_content.h"
 #include "core/libraries/audio/audioin.h"
 #include "core/libraries/audio/audioout.h"
-#include "core/libraries/avplayer/avplayer.h"
-#include "core/libraries/dialogs/error_dialog.h"
-#include "core/libraries/dialogs/ime_dialog.h"
 #include "core/libraries/disc_map/disc_map.h"
 #include "core/libraries/gnmdriver/gnmdriver.h"
 #include "core/libraries/kernel/libkernel.h"
 #include "core/libraries/libc_internal/libc_internal.h"
-#include "core/libraries/libpng/pngdec.h"
 #include "core/libraries/libs.h"
 #include "core/libraries/network/http.h"
 #include "core/libraries/network/net.h"
@@ -37,6 +32,11 @@
 #include "core/libraries/system/userservice.h"
 #include "core/libraries/usbd/usbd.h"
 #include "core/libraries/videoout/video_out.h"
+#include "src/core/libraries/ajm/ajm.h"
+#include "src/core/libraries/avplayer/avplayer.h"
+#include "src/core/libraries/dialogs/error_dialog.h"
+#include "src/core/libraries/dialogs/ime_dialog.h"
+#include "src/core/libraries/libpng/pngdec.h"
 
 namespace Libraries {
 

src/core/libraries/libs.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <functional>
-
 #include "common/logging/log.h"
 #include "core/loader/elf.h"
 #include "core/loader/symbols_resolver.h"

src/core/libraries/np_manager/np_manager.cpp

@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+// Generated By moduleGenerator
 #include "common/config.h"
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"

src/core/libraries/np_score/np_score.cpp

@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+// Generated By moduleGenerator
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"

src/core/libraries/np_trophy/np_trophy.cpp

@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+// Generated By moduleGenerator
 #include <unordered_map>
 
 #include "common/logging/log.h"

src/core/libraries/pad/pad.cpp

@@ -1,10 +1,11 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "common/assert.h"
+// Generated By moduleGenerator
+#include <common/assert.h>
+#include <common/singleton.h>
 #include "common/config.h"
 #include "common/logging/log.h"
-#include "common/singleton.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"
 #include "input/controller.h"

src/core/libraries/playgo/playgo.cpp

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <core/file_format/playgo_chunk.h>
 #include "common/logging/log.h"
 #include "common/singleton.h"
-#include "core/file_format/playgo_chunk.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"
 #include "core/libraries/system/systemservice.h"

src/core/libraries/playgo/playgo.h

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
-
 #include "common/types.h"
 #include "playgo_types.h"
 

src/core/libraries/random/random.h

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
-
 #include "common/types.h"
 
 namespace Core::Loader {

src/core/libraries/rtc/rtc.cpp

@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+// Generated By moduleGenerator
 #include <chrono>
-
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"

src/core/libraries/save_data/savedata.cpp

@@ -3,13 +3,12 @@
 
 #include <span>
 #include <vector>
-
+#include <common/path_util.h>
+#include <common/singleton.h>
+#include <core/file_format/psf.h>
+#include <core/file_sys/fs.h>
 #include "common/assert.h"
 #include "common/logging/log.h"
-#include "common/path_util.h"
-#include "common/singleton.h"
-#include "core/file_format/psf.h"
-#include "core/file_sys/fs.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"
 #include "core/libraries/save_data/savedata.h"

src/core/libraries/screenshot/screenshot.cpp

@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+// Generated By moduleGenerator
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"

src/core/libraries/usbd/usbd.cpp

@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+// Generated By moduleGenerator
 #include "common/logging/log.h"
 #include "common/singleton.h"
 #include "core/libraries/error_codes.h"

src/core/libraries/usbd/usbd.h

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
-
 #include "common/types.h"
 
 namespace Core::Loader {

src/core/libraries/videoout/buffer.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <string_view>
-
 #include "common/assert.h"
 #include "common/types.h"
 

src/core/libraries/videoout/driver.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <pthread.h>
-
 #include "common/assert.h"
 #include "common/config.h"
 #include "common/debug.h"

src/core/linker.cpp

@@ -10,7 +10,6 @@
 #include "common/thread.h"
 #include "core/aerolib/aerolib.h"
 #include "core/aerolib/stubs.h"
-#include "core/cpu_patches.h"
 #include "core/libraries/kernel/memory_management.h"
 #include "core/libraries/kernel/thread_management.h"
 #include "core/linker.h"
@@ -86,7 +85,6 @@ void Linker::Execute() {
     // Init primary thread.
     Common::SetCurrentThreadName("GAME_MainThread");
     Libraries::Kernel::pthreadInitSelfMainThread();
-    InitializeThreadPatchStack();
     InitTlsForThread(true);
 
     // Start shared library modules
@@ -106,8 +104,6 @@ void Linker::Execute() {
             RunMainEntry(m->GetEntryAddress(), &p, ProgramExitFunc);
         }
     }
-
-    CleanupThreadPatchStack();
 }
 
 s32 Linker::LoadModule(const std::filesystem::path& elf_name, bool is_dynamic) {

src/qt_gui/cheats_patches.cpp

@@ -130,7 +130,7 @@ void CheatsPatches::setupUI() {
     // Call the method to fill the list of cheat files
     populateFileListCheats();
 
-    QLabel* repositoryLabel = new QLabel(tr("Repository:"));
+    QLabel* repositoryLabel = new QLabel("Repository:");
     repositoryLabel->setAlignment(Qt::AlignLeft);
     repositoryLabel->setAlignment(Qt::AlignVCenter);
 
@@ -175,8 +175,7 @@ void CheatsPatches::setupUI() {
 
         int ret = QMessageBox::warning(
             this, tr("Delete File"),
-            QString(tr("Do you want to delete the selected file?\\n%1").replace("\\n", "\n"))
+            QString(tr("Do you want to delete the selected file?\n%1")).arg(selectedFileName),
-                .arg(selectedFileName),
             QMessageBox::Yes | QMessageBox::No);
 
         if (ret == QMessageBox::Yes) {
@@ -1124,7 +1123,7 @@ void CheatsPatches::addPatchesToLayout(const QString& filePath) {
 void CheatsPatches::updateNoteTextEdit(const QString& patchName) {
     if (m_patchInfos.contains(patchName)) {
         const PatchInfo& patchInfo = m_patchInfos[patchName];
-        QString text = QString(tr("Name:") + " %1\n" + tr("Author: ") + "%2\n\n%3")
+        QString text = QString(tr("Name:") + " %1\n" + tr("Author:") + " %2\n\n%3")
                            .arg(patchInfo.name)
                            .arg(patchInfo.author)
                            .arg(patchInfo.note);
@@ -1262,4 +1261,4 @@ void CheatsPatches::onPatchCheckBoxHovered(QCheckBox* checkBox, bool hovered) {
     } else {
         instructionsTextEdit->setText(defaultTextEdit);
     }
-}
+}

src/qt_gui/cheats_patches.h

@@ -36,7 +36,6 @@ public:
     void downloadCheats(const QString& source, const QString& m_gameSerial,
                         const QString& m_gameVersion, bool showMessageBox);
     void downloadPatches(const QString repository, const bool showMessageBox);
-    void createFilesJson(const QString& repository);
 
 signals:
     void downloadFinished();
@@ -59,6 +58,7 @@ private:
     void applyCheat(const QString& modName, bool enabled);
     void applyPatch(const QString& patchName, bool enabled);
 
+    void createFilesJson(const QString& repository);
     void uncheckAllCheatCheckBoxes();
     void updateNoteTextEdit(const QString& patchName);
 

src/qt_gui/gui_context_menus.h

@@ -140,7 +140,7 @@ public:
                 new CheatsPatches(gameName, gameSerial, gameVersion, gameSize, gameImage);
             cheatsPatches->show();
             connect(widget->parent(), &QWidget::destroyed, cheatsPatches,
-                    [cheatsPatches]() { cheatsPatches->deleteLater(); });
+                    [widget, cheatsPatches]() { cheatsPatches->deleteLater(); });
         }
 
         if (selected == &openTrophyViewer) {

src/qt_gui/main_window.cpp

@@ -366,7 +366,7 @@ void MainWindow::CreateConnects() {
 
             panelDialog->accept();
         });
-        connect(downloadAllPatchesButton, &QPushButton::clicked, [panelDialog]() {
+        connect(downloadAllPatchesButton, &QPushButton::clicked, this, [this, panelDialog]() {
             QEventLoop eventLoop;
             int pendingDownloads = 0;
 
@@ -391,8 +391,6 @@ void MainWindow::CreateConnects() {
                 nullptr, tr("Download Complete"),
                 QString(tr("Patches Downloaded Successfully!") + "\n" +
                         tr("All Patches available for all games have been downloaded.")));
-            cheatsPatches->createFilesJson("GoldHEN");
-            cheatsPatches->createFilesJson("shadPS4");
             panelDialog->accept();
         });
         panelDialog->exec();
@@ -642,24 +640,24 @@ void MainWindow::InstallDragDropPkg(std::filesystem::path file, int pkgNum, int
                 double appD = game_app_version.toDouble();
                 double pkgD = pkg_app_version.toDouble();
                 if (pkgD == appD) {
-                    msgBox.setText(QString(tr("Patch detected!") + "\n" +
+                    msgBox.setText(QString(tr("Patch detected!\nPKG and Game versions match!: "
-                                           tr("PKG and Game versions match: ") + pkg_app_version +
+                                              "%1\nWould you like ") +
-                                           "\n" + tr("Would you like to overwrite?")));
+                                           tr("to overwrite?"))
+                                       .arg(pkg_app_version));
                     msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
                     msgBox.setDefaultButton(QMessageBox::No);
                 } else if (pkgD < appD) {
-                    msgBox.setText(QString(tr("Patch detected!") + "\n" +
+                    msgBox.setText(QString(tr("Patch detected!\nPKG Version %1 is older ") +
-                                           tr("PKG Version %1 is older than installed version: ")
+                                           tr("than installed version!: %2\nWould you like ") +
-                                               .arg(pkg_app_version) +
+                                           tr("to overwrite?"))
-                                           game_app_version + "\n" +
+                                       .arg(pkg_app_version, game_app_version));
-                                           tr("Would you like to overwrite?")));
                     msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
                     msgBox.setDefaultButton(QMessageBox::No);
                 } else {
-                    msgBox.setText(QString(tr("Patch detected!") + "\n" +
+                    msgBox.setText(
-                                           tr("Game is installed: ") + game_app_version + "\n" +
+                        QString(tr("Patch detected!\nGame is installed: %1\nWould you like ") +
-                                           tr("Would you like to install Patch: ") +
+                                tr("to install Patch: %2?"))
-                                           pkg_app_version + " ?"));
+                            .arg(game_app_version, pkg_app_version));
                     msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
                     msgBox.setDefaultButton(QMessageBox::No);
                 }
@@ -685,9 +683,9 @@ void MainWindow::InstallDragDropPkg(std::filesystem::path file, int pkgNum, int
                         return;
                     }
                 } else {
-                    msgBox.setText(QString(tr("DLC already installed:") + "\n" +
+                    msgBox.setText(
-                                           QString::fromStdString(addon_extract_path.string()) +
+                        QString("DLC already installed\n%1\nWould you like to overwrite?")
-                                           "\n\n" + tr("Would you like to overwrite?")));
+                            .arg(QString::fromStdString(addon_extract_path.string())));
                     msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
                     msgBox.setDefaultButton(QMessageBox::No);
                     int result = msgBox.exec();
@@ -698,9 +696,9 @@ void MainWindow::InstallDragDropPkg(std::filesystem::path file, int pkgNum, int
                     }
                 }
             } else {
-                msgBox.setText(QString(tr("Game already installed") + "\n" +
+                msgBox.setText(
-                                       QString::fromStdString(extract_path.string()) + "\n" +
+                    QString(tr("Game already installed\n%1\nWould you like to overwrite?"))
-                                       tr("Would you like to overwrite?")));
+                        .arg(QString::fromStdString(extract_path.string())));
                 msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
                 msgBox.setDefaultButton(QMessageBox::No);
                 int result = msgBox.exec();

src/qt_gui/translations/da_DK.ts

@@ -566,34 +566,44 @@
             <translation>PKG-udtrækning</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+            <source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Opdatering detekteret!</translation>
+            <translation>Patch opdaget!\nPKG- og spilversioner stemmer overens!: %1\nVil du </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+            <source>to overwrite?</source>
-        	<translation>PKG og spilversioner matcher: </translation>
+            <translation>overskrive?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="647"/>
+            <location filename="../main_window.cpp" line="639"/>
-        	<source>Would you like to overwrite?</source>
+            <source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>Vil du overskrive?</translation>
+            <translation>Patch opdaget!\nPKG-version %1 er ældre </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="639"/>
+            <location filename="../main_window.cpp" line="640"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+            <source>than installed version!: %2\nWould you like </source>
-        	<translation>PKG Version %1 er ældre end den installerede version: </translation>
+            <translation>end installeret version!: %2\nVil du </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="641"/>
-        	<source>Game is installed: </source>
+            <source>to overwrite?</source>
-        	<translation>Spillet er installeret: </translation>
+            <translation>overskrive?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="646"/>
-        	<source>Would you like to install Patch: </source>
+            <source>Patch detected!\nGame is installed: %1\nWould you like </source>
-        	<translation>Vil du installere opdateringen: </translation>
+            <translation>Patch opdaget!\nSpillet er installeret: %1\nVil du </translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="647"/>
+            <source>to install Patch: %2?</source>
+            <translation>installere patch: %2?</translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="659"/>
+            <source>Game already installed\n%1\nWould you like to overwrite?</source>
+            <translation>Spil allerede installeret\n%1\nVil du overskrive?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
@@ -603,17 +613,7 @@
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>Vil du installere DLC: %1?</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC allerede installeret:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Spillet er allerede installeret</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/de.ts

@@ -566,54 +566,54 @@
             <translation>PKG-Extraktion</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+            <source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Patch erkannt!</translation>
+            <translation>Patch erkannt!\nPKG- und Spielversion stimmen überein!: %1\nMöchten Sie </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+            <source>to overwrite?</source>
-        	<translation>PKG- und Spielversionen stimmen überein: </translation>
+            <translation>überschreiben?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="647"/>
+            <location filename="../main_window.cpp" line="639"/>
-        	<source>Would you like to overwrite?</source>
+            <source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>Würden Sie gerne überschreiben?</translation>
+            <translation>Patch erkannt!\nPKG-Version %1 ist älter </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="639"/>
+            <location filename="../main_window.cpp" line="640"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+            <source>than installed version!: %2\nWould you like </source>
-        	<translation>PKG-Version %1 ist älter als die installierte Version: </translation>
+            <translation>als die installierte Version!: %2\nMöchten Sie </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="641"/>
-        	<source>Game is installed: </source>
+            <source>to overwrite?</source>
-        	<translation>Spiel ist installiert: </translation>
+            <translation>überschreiben?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="646"/>
-        	<source>Would you like to install Patch: </source>
+            <source>Patch detected!\nGame is installed: %1\nWould you like </source>
-        	<translation>Möchten Sie den Patch installieren: </translation>
+            <translation>Patch erkannt!\nSpiel ist installiert: %1\nMöchten Sie </translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="647"/>
+            <source>to install Patch: %2?</source>
+            <translation>Patch installieren: %2?</translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="659"/>
+            <source>Game already installed\n%1\nWould you like to overwrite?</source>
+            <translation>Spiel bereits installiert\n%1\nMöchten Sie überschreiben?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>DLC-Installation</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>Würden Sie gerne DLC installieren: %1?</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC bereits installiert:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Spiel bereits installiert</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/el.ts

@@ -566,54 +566,54 @@
             <translation>Εξαγωγή PKG</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+            <source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Αναγνώριση ενημέρωσης!</translation>
+            <translation>Ανίχνευση Patch!\nΟι εκδόσεις PKG και παιχνιδιού ταιριάζουν!: %1\nΘέλετε </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+            <source>to overwrite?</source>
-        	<translation>Οι εκδόσεις PKG και παιχνιδιού ταιριάζουν: </translation>
+            <translation>να αντικαταστήσετε;</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="647"/>
+            <location filename="../main_window.cpp" line="639"/>
-        	<source>Would you like to overwrite?</source>
+            <source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>Θέλετε να αντικαταστήσετε;</translation>
+            <translation>Ανίχνευση Patch!\nΗ έκδοση PKG %1 είναι παλαιότερη </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="639"/>
+            <location filename="../main_window.cpp" line="640"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+            <source>than installed version!: %2\nWould you like </source>
-        	<translation>Η έκδοση PKG %1 είναι παλαιότερη από την εγκατεστημένη έκδοση: </translation>
+            <translation>από την εγκατεστημένη έκδοση!: %2\nΘέλετε </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="641"/>
-        	<source>Game is installed: </source>
+            <source>to overwrite?</source>
-        	<translation>Το παιχνίδι είναι εγκατεστημένο: </translation>
+            <translation>να αντικαταστήσετε;</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="646"/>
-        	<source>Would you like to install Patch: </source>
+            <source>Patch detected!\nGame is installed: %1\nWould you like </source>
-        	<translation>Θέλετε να εγκαταστήσετε την ενημέρωση: </translation>
+            <translation>Ανίχνευση Patch!\nΤο παιχνίδι είναι εγκατεστημένο: %1\nΘέλετε </translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="647"/>
+            <source>to install Patch: %2?</source>
+            <translation>να εγκαταστήσετε το Patch: %2;</translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="659"/>
+            <source>Game already installed\n%1\nWould you like to overwrite?</source>
+            <translation>Το παιχνίδι είναι ήδη εγκατεστημένο\n%1\nΘέλετε να αντικαταστήσετε;</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>Εγκατάσταση DLC</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>Θέλετε να εγκαταστήσετε το DLC: %1;</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC ήδη εγκατεστημένο:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Παιχνίδι ήδη εγκατεστημένο</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/en.ts

@@ -566,34 +566,44 @@
         	<translation>PKG Extraction</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+        	<source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Patch detected!</translation>
+        	<translation>Patch detected!\nPKG and Game versions match!: %1\nWould you like </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+        	<source>to overwrite?</source>
-        	<translation>PKG and Game versions match: </translation>
+        	<translation>to overwrite?</translation>
-        </message>
-        <message>
-        	<location filename="../main_window.cpp" line="647"/>
-        	<source>Would you like to overwrite?</source>
-        	<translation>Would you like to overwrite?</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="639"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+        	<source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>PKG Version %1 is older than installed version: </translation>
+        	<translation>Patch detected!\nPKG Version %1 is older </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="640"/>
-        	<source>Game is installed: </source>
+        	<source>than installed version!: %2\nWould you like </source>
-        	<translation>Game is installed: </translation>
+        	<translation>than installed version!: %2\nWould you like </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="641"/>
-        	<source>Would you like to install Patch: </source>
+        	<source>to overwrite?</source>
-        	<translation>Would you like to install Patch: </translation>
+        	<translation>to overwrite?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="646"/>
+        	<source>Patch detected!\nGame is installed: %1\nWould you like </source>
+        	<translation>Patch detected!\nGame is installed: %1\nWould you like </translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="647"/>
+        	<source>to install Patch: %2?</source>
+        	<translation>to install Patch: %2?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="659"/>
+        	<source>Game already installed\n%1\nWould you like to overwrite?</source>
+        	<translation>Game already installed\n%1\nWould you like to overwrite?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
@@ -605,16 +615,6 @@
             <source>Would you like to install DLC: %1?</source>
             <translation>Would you like to install DLC: %1?</translation>
         </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC already installed:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Game already installed</translation>
-        </message>
         <message>
         	<location filename="../main_window.cpp" line="674"/>
         	<source>PKG is a patch, please install the game first!</source>

src/qt_gui/translations/es_ES.ts

@@ -566,54 +566,54 @@
         	<translation>Extracción de PKG</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+        	<source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>¡Actualización detectada!</translation>
+        	<translation>¡Parche detectado!\n¡La versión de PKG y del juego coinciden!: %1\n¿Te gustaría </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+        	<source>to overwrite?</source>
-        	<translation>Las versiones de PKG y del juego coinciden: </translation>
+        	<translation>¿sobrescribir?</translation>
-        </message>
-        <message>
-        	<location filename="../main_window.cpp" line="647"/>
-        	<source>Would you like to overwrite?</source>
-        	<translation>¿Desea sobrescribir?</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="639"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+        	<source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>La versión de PKG %1 es más antigua que la versión instalada: </translation>
+        	<translation>¡Parche detectado!\nLa versión de PKG %1 es más antigua </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="640"/>
-        	<source>Game is installed: </source>
+        	<source>than installed version!: %2\nWould you like </source>
-        	<translation>El juego está instalado: </translation>
+        	<translation>que la versión instalada!: %2\n¿Te gustaría </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="641"/>
-        	<source>Would you like to install Patch: </source>
+        	<source>to overwrite?</source>
-        	<translation>¿Desea instalar la actualización: </translation>
+        	<translation>¿sobrescribir?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="646"/>
+        	<source>Patch detected!\nGame is installed: %1\nWould you like </source>
+        	<translation>¡Parche detectado!\nJuego está instalado: %1\n¿Te gustaría </translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="647"/>
+        	<source>to install Patch: %2?</source>
+        	<translation>¿instalar el parche: %2?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="659"/>
+        	<source>Game already installed\n%1\nWould you like to overwrite?</source>
+        	<translation>Juego ya instalado\n%1\n¿Te gustaría sobrescribirlo?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>Instalación de DLC</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>¿Desea instalar el DLC: %1?</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC ya instalado:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Juego ya instalado</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/fi.ts

@@ -566,54 +566,54 @@
             <translation>PKG:n purku</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+            <source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Päivitys havaittu!</translation>
+            <translation>Korjaus havaittu!\nPKG:n ja pelin versiot vastaavat!: %1\nHaluatko </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+            <source>to overwrite?</source>
-        	<translation>PKG- ja peliversiot vastaavat: </translation>
+            <translation>korvata?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="647"/>
+            <location filename="../main_window.cpp" line="639"/>
-        	<source>Would you like to overwrite?</source>
+            <source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>Haluatko korvata?</translation>
+            <translation>Korjaus havaittu!\nPKG Version %1 on vanhempi </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="639"/>
+            <location filename="../main_window.cpp" line="640"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+            <source>than installed version!: %2\nWould you like </source>
-        	<translation>PKG-versio %1 on vanhempi kuin asennettu versio: </translation>
+            <translation>kuin asennettu versio!: %2\nHaluatko </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="641"/>
-        	<source>Game is installed: </source>
+            <source>to overwrite?</source>
-        	<translation>Peli on asennettu: </translation>
+            <translation>korvata?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="646"/>
-        	<source>Would you like to install Patch: </source>
+            <source>Patch detected!\nGame is installed: %1\nWould you like </source>
-        	<translation>Haluatko asentaa päivityksen: </translation>
+            <translation>Korjaus havaittu!\nPeli on asennettu: %1\nHaluatko </translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="647"/>
+            <source>to install Patch: %2?</source>
+            <translation>asentaa korjaus: %2?</translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="659"/>
+            <source>Game already installed\n%1\nWould you like to overwrite?</source>
+            <translation>Peli on jo asennettu\n%1\nHaluatko korvata sen?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>DLC-asennus</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>Haluatko asentaa DLC:n: %1?</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC on jo asennettu:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Peli on jo asennettu</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/fr.ts

@@ -566,54 +566,54 @@
             <translation>Extraction du PKG</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+            <source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Patch détecté !</translation>
+            <translation>Patch détecté !\nLa version du PKG et du jeu correspondent : %1\nSouhaitez-vous </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+            <source>to overwrite?</source>
-        	<translation>Les versions PKG et jeu correspondent : </translation>
+            <translation>écraser ?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="647"/>
+            <location filename="../main_window.cpp" line="639"/>
-        	<source>Would you like to overwrite?</source>
+            <source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>Souhaitez-vous remplacer ?</translation>
+            <translation>Patch détecté !\nVersion PKG %1 est plus ancienne </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="639"/>
+            <location filename="../main_window.cpp" line="640"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+            <source>than installed version!: %2\nWould you like </source>
-        	<translation>La version PKG %1 est plus ancienne que la version installée : </translation>
+            <translation>que la version installée ! : %2\nSouhaitez-vous </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="641"/>
-        	<source>Game is installed: </source>
+            <source>to overwrite?</source>
-        	<translation>Jeu installé : </translation>
+            <translation>écraser ?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="646"/>
-        	<source>Would you like to install Patch: </source>
+            <source>Patch detected!\nGame is installed: %1\nWould you like </source>
-        	<translation>Souhaitez-vous installer le patch : </translation>
+            <translation>Patch détecté !\nJeu est installé : %1\nSouhaitez-vous </translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="647"/>
+            <source>to install Patch: %2?</source>
+            <translation>installer le patch : %2 ?</translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="659"/>
+            <source>Game already installed\n%1\nWould you like to overwrite?</source>
+            <translation>Jeu déjà installé\n%1\nSouhaitez-vous écraser ?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>Installation du DLC</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>Souhaitez-vous installer le DLC : %1 ?</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC déjà installé :</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Jeu déjà installé</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/hu_HU.ts

@@ -566,54 +566,54 @@
         	<translation>PKG kicsomagolás</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+        	<source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Frissítés észlelve!</translation>
+        	<translation>Javítás észlelve!\nA PKG és a játék verziók egyeznek: %1\nSzeretnéd </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+        	<source>to overwrite?</source>
-        	<translation>A PKG és a játék verziói egyeznek: </translation>
+        	<translation>felülírni?</translation>
-        </message>
-        <message>
-        	<location filename="../main_window.cpp" line="647"/>
-        	<source>Would you like to overwrite?</source>
-        	<translation>Szeretné felülírni?</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="639"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+        	<source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>A %1-es PKG verzió régebbi, mint a telepített verzió: </translation>
+        	<translation>Javítás észlelve!\nA PKG verzió %1 régebbi </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="640"/>
-        	<source>Game is installed: </source>
+        	<source>than installed version!: %2\nWould you like </source>
-        	<translation>A játék telepítve van: </translation>
+        	<translation>mint a telepített verzió: %2\nSzeretnéd </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="641"/>
-        	<source>Would you like to install Patch: </source>
+        	<source>to overwrite?</source>
-        	<translation>Szeretné telepíteni a frissítést: </translation>
+        	<translation>felülírni?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="646"/>
+        	<source>Patch detected!\nGame is installed: %1\nWould you like </source>
+        	<translation>Javítás észlelve!\nA játék telepítve van: %1\nSzeretnéd </translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="647"/>
+        	<source>to install Patch: %2?</source>
+        	<translation>a javítást telepíteni: %2?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="659"/>
+        	<source>Game already installed\n%1\nWould you like to overwrite?</source>
+        	<translation>A játék már telepítve van\n%1\nSzeretnéd felülírni?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>DLC Telepítés</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>Szeretné telepíteni a DLC-t: %1?</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC már telepítve:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>A játék már telepítve van</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/id.ts

@@ -566,54 +566,54 @@
         	<translation>Ekstraksi PKG</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+        	<source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Patch terdeteksi!</translation>
+        	<translation>Patch terdeteksi!\nVersi PKG dan Game cocok!: %1\nApakah Anda ingin </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+        	<source>to overwrite?</source>
-        	<translation>Versi PKG dan Game cocok: </translation>
+        	<translation>menimpa?</translation>
-        </message>
-        <message>
-        	<location filename="../main_window.cpp" line="647"/>
-        	<source>Would you like to overwrite?</source>
-        	<translation>Apakah Anda ingin menimpa?</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="639"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+        	<source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>Versi PKG %1 lebih lama dari versi yang terpasang: </translation>
+        	<translation>Patch terdeteksi!\nVersi PKG %1 lebih lama </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="640"/>
-        	<source>Game is installed: </source>
+        	<source>than installed version!: %2\nWould you like </source>
-        	<translation>Game telah terpasang: </translation>
+        	<translation>daripada versi yang terpasang!: %2\nApakah Anda ingin </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="641"/>
-        	<source>Would you like to install Patch: </source>
+        	<source>to overwrite?</source>
-        	<translation>Apakah Anda ingin menginstal patch: </translation>
+        	<translation>menimpa?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="646"/>
+        	<source>Patch detected!\nGame is installed: %1\nWould you like </source>
+        	<translation>Patch terdeteksi!\nGame terpasang: %1\nApakah Anda ingin </translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="647"/>
+        	<source>to install Patch: %2?</source>
+        	<translation>memasang Patch: %2?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="659"/>
+        	<source>Game already installed\n%1\nWould you like to overwrite?</source>
+        	<translation>Game sudah terpasang\n%1\nApakah Anda ingin menimpa?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>Instalasi DLC</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>Apakah Anda ingin menginstal DLC: %1?</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC sudah terpasang:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Game sudah terpasang</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/it.ts

@@ -181,7 +181,7 @@
         <message>
             <location filename="../main_window_ui.h" line="318"/>
             <source>Install application from a .pkg file</source>
-            <translation>Installa applicazione da un file .pkg</translation>
+            <translation>Installa applicazione da un file .pkg file</translation>
         </message>
         <message>
             <location filename="../main_window_ui.h" line="320"/>
@@ -236,7 +236,7 @@
         <message>
             <location filename="../main_window_ui.h" line="338"/>
             <source>List View</source>
-            <translation>Visualizzazione Lista</translation>
+            <translation>Visualizzazione lista</translation>
         </message>
         <message>
             <location filename="../main_window_ui.h" line="340"/>
@@ -341,7 +341,7 @@
         <message>
             <location filename="../main_window_ui.h" line="364"/>
             <source>toolBar</source>
-            <translation>Barra strumenti</translation>
+            <translation>barra strumenti</translation>
         </message>
     </context>
     <context>
@@ -566,34 +566,44 @@
             <translation>Estrazione file PKG</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+            <source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Patch rilevata!</translation>
+            <translation>Patch rilevata! Il\nPKG e la versione del gioco coincidono!: %1\nVuoi </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+            <source>to overwrite?</source>
-        	<translation>Le versioni di PKG e del gioco corrispondono: </translation>
+            <translation>sovrascrivere?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="647"/>
+            <location filename="../main_window.cpp" line="639"/>
-        	<source>Would you like to overwrite?</source>
+            <source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>Vuoi sovrascrivere?</translation>
+            <translation>Patch rilevata! La \nPKG Versione %1 è più vecchia </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="639"/>
+            <location filename="../main_window.cpp" line="640"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+            <source>than installed version!: %2\nWould you like </source>
-        	<translation>La versione PKG %1 è più vecchia rispetto alla versione installata: </translation>
+            <translation>della versione installata!: %2\nVuoi </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="641"/>
-        	<source>Game is installed: </source>
+            <source>to overwrite?</source>
-        	<translation>Gioco installato: </translation>
+            <translation>sovrascrivere?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="646"/>
-        	<source>Would you like to install Patch: </source>
+            <source>Patch detected!\nGame is installed: %1\nWould you like </source>
-        	<translation>Vuoi installare la patch: </translation>
+            <translation>Patch rilevata!\nGioco installato: %1\Vuoi </translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="647"/>
+            <source>to install Patch: %2?</source>
+            <translation>installare la Patch: %2?</translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="659"/>
+            <source>Game already installed\n%1\nWould you like to overwrite?</source>
+            <translation>Gioco già installato\n%1\nVuoi sovrascrivere??</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
@@ -605,16 +615,6 @@
             <source>Would you like to install DLC: %1?</source>
             <translation>Vuoi installare il DLC: %1?</translation>
         </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC già installato:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Gioco già installato</translation>
-        </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>PKG is a patch, please install the game first!</source>
@@ -651,12 +651,12 @@
         <message>
             <location filename="../cheats_patches.cpp" line="44"/>
             <source>Cheats / Patches</source>
-            <translation>Trucchi / Patch</translation>
+            <translation>Cheat / Patch</translation>
         </message>
         <message>
             <location filename="../cheats_patches.cpp" line="50"/>
             <source>defaultTextEdit_MSG</source>
-            <translation>I trucchi e le patch sono sperimentali.\nUtilizzali con cautela.\n\nScarica i trucchi singolarmente selezionando l'archivio e cliccando sul pulsante di download.\nNella scheda Patch, puoi scaricare tutte le patch in una volta sola, scegliere quali vuoi utilizzare e salvare la tua selezione.\n\nPoiché non sviluppiamo i trucchi e le patch,\nper favore segnala i problemi all'autore dei trucchi.\n\nHai creato un nuovo trucco? Visita:\nhttps://github.com/shadps4-emu/ps4_cheats</translation>
+            <translation>I cheats/patches sono sperimentali.\nUtilizzali con cautela.\n\nScarica i cheats singolarmente selezionando il repository e cliccando sul pulsante di download.\nNella scheda Patches, puoi scaricare tutti i patch in una volta sola, scegliere quali vuoi utilizzare e salvare la tua selezione.\n\nPoiché non sviluppiamo i Cheats/Patches,\nper favore segnala i problemi all'autore del cheat.\n\nHai creato un nuovo cheat? Visita:\nhttps://github.com/shadps4-emu/ps4_cheats</translation>
         </message>
         <message>
             <location filename="../cheats_patches.cpp" line="69"/>

src/qt_gui/translations/ja_JP.ts

@@ -566,54 +566,54 @@
         	<translation>PKG抽出</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+        	<source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>パッチが検出されました！</translation>
+        	<translation>パッチが検出されました！\nPKGとゲームバージョンが一致しています！: %1\n上書きしますか</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+        	<source>to overwrite?</source>
-        	<translation>PKGとゲームのバージョンが一致しています: </translation>
+        	<translation>上書きしますか？</translation>
-        </message>
-        <message>
-        	<location filename="../main_window.cpp" line="647"/>
-        	<source>Would you like to overwrite?</source>
-        	<translation>上書きしてもよろしいですか？</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="639"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+        	<source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>PKGバージョン %1 はインストールされているバージョンよりも古いです: </translation>
+        	<translation>パッチが検出されました！\nPKGバージョン %1 は古い </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="640"/>
-        	<source>Game is installed: </source>
+        	<source>than installed version!: %2\nWould you like </source>
-        	<translation>ゲームはインストール済みです: </translation>
+        	<translation>インストールされているバージョンよりも古いです！: %2\n上書きしますか</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="641"/>
-        	<source>Would you like to install Patch: </source>
+        	<source>to overwrite?</source>
-        	<translation>パッチをインストールしてもよろしいですか: </translation>
+        	<translation>上書きしますか？</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="646"/>
+        	<source>Patch detected!\nGame is installed: %1\nWould you like </source>
+        	<translation>パッチが検出されました！\nゲームがインストールされています: %1\nインストールしますか</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="647"/>
+        	<source>to install Patch: %2?</source>
+        	<translation>パッチをインストールしますか: %2?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="659"/>
+        	<source>Game already installed\n%1\nWould you like to overwrite?</source>
+        	<translation>ゲームはすでにインストールされています\n%1\n上書きしますか？</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>DLCのインストール</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>DLCをインストールしてもよろしいですか: %1?</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLCはすでにインストールされています:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>ゲームはすでにインストールされています</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/ko_KR.ts

@@ -566,34 +566,44 @@
         	<translation>PKG Extraction</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+        	<source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Patch detected!</translation>
+        	<translation>Patch detected!\nPKG and Game versions match!: %1\nWould you like </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+        	<source>to overwrite?</source>
-        	<translation>PKG and Game versions match: </translation>
+        	<translation>to overwrite?</translation>
-        </message>
-        <message>
-        	<location filename="../main_window.cpp" line="647"/>
-        	<source>Would you like to overwrite?</source>
-        	<translation>Would you like to overwrite?</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="639"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+        	<source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>PKG Version %1 is older than installed version: </translation>
+        	<translation>Patch detected!\nPKG Version %1 is older </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="640"/>
-        	<source>Game is installed: </source>
+        	<source>than installed version!: %2\nWould you like </source>
-        	<translation>Game is installed: </translation>
+        	<translation>than installed version!: %2\nWould you like </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="641"/>
-        	<source>Would you like to install Patch: </source>
+        	<source>to overwrite?</source>
-        	<translation>Would you like to install Patch: </translation>
+        	<translation>to overwrite?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="646"/>
+        	<source>Patch detected!\nGame is installed: %1\nWould you like </source>
+        	<translation>Patch detected!\nGame is installed: %1\nWould you like </translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="647"/>
+        	<source>to install Patch: %2?</source>
+        	<translation>to install Patch: %2?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="659"/>
+        	<source>Game already installed\n%1\nWould you like to overwrite?</source>
+        	<translation>Game already installed\n%1\nWould you like to overwrite?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
@@ -605,16 +615,6 @@
             <source>Would you like to install DLC: %1?</source>
             <translation>Would you like to install DLC: %1?</translation>
         </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC already installed:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Game already installed</translation>
-        </message>
         <message>
         	<location filename="../main_window.cpp" line="674"/>
         	<source>PKG is a patch, please install the game first!</source>

src/qt_gui/translations/lt_LT.ts

@@ -566,54 +566,54 @@
         	<translation>PKG ištraukimas</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+        	<source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Rasta atnaujinimą!</translation>
+        	<translation>Pataisa aptikta!\nPKG ir žaidimo versijos atitinka!: %1\nAr norėtumėte </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+        	<source>to overwrite?</source>
-        	<translation>PKG ir žaidimo versijos sutampa: </translation>
+        	<translation>perrašyti?</translation>
-        </message>
-        <message>
-        	<location filename="../main_window.cpp" line="647"/>
-        	<source>Would you like to overwrite?</source>
-        	<translation>Ar norite perrašyti?</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="639"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+        	<source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>PKG versija %1 yra senesnė nei įdiegta versija: </translation>
+        	<translation>Pataisa aptikta!\nPKG versija %1 yra senesnė </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="640"/>
-        	<source>Game is installed: </source>
+        	<source>than installed version!: %2\nWould you like </source>
-        	<translation>Žaidimas įdiegtas: </translation>
+        	<translation>nei įdiegta versija!: %2\nAr norėtumėte </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="641"/>
-        	<source>Would you like to install Patch: </source>
+        	<source>to overwrite?</source>
-        	<translation>Ar norite įdiegti atnaujinimą: </translation>
+        	<translation>perrašyti?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="646"/>
+        	<source>Patch detected!\nGame is installed: %1\nWould you like </source>
+        	<translation>Pataisa aptikta!\nŽaidimas įdiegtas: %1\nAr norėtumėte </translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="647"/>
+        	<source>to install Patch: %2?</source>
+        	<translation>įdiegti pataisą: %2?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="659"/>
+        	<source>Game already installed\n%1\nWould you like to overwrite?</source>
+        	<translation>Žaidimas jau įdiegtas\n%1\nAr norėtumėte perrašyti?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>DLC diegimas</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>Ar norite įdiegti DLC: %1?</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC jau įdiegtas:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Žaidimas jau įdiegtas</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/nb.ts

@@ -566,54 +566,54 @@
             <translation>PKG-ekstraksjon</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+            <source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Oppdatering oppdaget!</translation>
+            <translation>Oppdatering oppdaget!\nPKG og spillversjoner stemmer!: %1\nØnsker du å </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+            <source>to overwrite?</source>
-        	<translation>PKG- og spillversjoner stemmer overens: </translation>
+            <translation>overskrive?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="647"/>
+            <location filename="../main_window.cpp" line="639"/>
-        	<source>Would you like to overwrite?</source>
+            <source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>Ønsker du å overskrive?</translation>
+            <translation>Oppdatering oppdaget!\nPKG-versjon %1 er eldre </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="639"/>
+            <location filename="../main_window.cpp" line="640"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+            <source>than installed version!: %2\nWould you like </source>
-        	<translation>PKG-versjon %1 er eldre enn installert versjon: </translation>
+            <translation>enn installert versjon!: %2\nØnsker du å </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="641"/>
-        	<source>Game is installed: </source>
+            <source>to overwrite?</source>
-        	<translation>Spillet er installert: </translation>
+            <translation>overskrive?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="646"/>
-        	<source>Would you like to install Patch: </source>
+            <source>Patch detected!\nGame is installed: %1\nWould you like </source>
-        	<translation>Ønsker du å installere oppdateringen: </translation>
+            <translation>Oppdatering oppdaget!\nSpillet er installert: %1\nØnsker du å </translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="647"/>
+            <source>to install Patch: %2?</source>
+            <translation>installere oppdateringen: %2?</translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="659"/>
+            <source>Game already installed\n%1\nWould you like to overwrite?</source>
+            <translation>Spill allerede installert\n%1\nØnsker du å overskrive?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>DLC-installasjon</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>Ønsker du å installere DLC: %1?</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC allerede installert:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Spillet er allerede installert</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/nl.ts

@@ -566,54 +566,54 @@
             <translation>PKG-extractie</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+            <source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Patch gedetecteerd!</translation>
+            <translation>Patch gedetecteerd!\nPKG en spelversies komen overeen!: %1\nWil je </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+            <source>to overwrite?</source>
-        	<translation>PKG- en gameversies komen overeen: </translation>
+            <translation>overschrijven?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="647"/>
+            <location filename="../main_window.cpp" line="639"/>
-        	<source>Would you like to overwrite?</source>
+            <source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>Wilt u overschrijven?</translation>
+            <translation>Patch gedetecteerd!\nPKG-versie %1 is ouder </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="639"/>
+            <location filename="../main_window.cpp" line="640"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+            <source>than installed version!: %2\nWould you like </source>
-        	<translation>PKG-versie %1 is ouder dan de geïnstalleerde versie: </translation>
+            <translation>dan de geïnstalleerde versie!: %2\nWil je </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="641"/>
-        	<source>Game is installed: </source>
+            <source>to overwrite?</source>
-        	<translation>Game is geïnstalleerd: </translation>
+            <translation>overschrijven?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="646"/>
-        	<source>Would you like to install Patch: </source>
+            <source>Patch detected!\nGame is installed: %1\nWould you like </source>
-        	<translation>Wilt u de patch installeren: </translation>
+            <translation>Patch gedetecteerd!\nSpel is geïnstalleerd: %1\nWil je </translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="647"/>
+            <source>to install Patch: %2?</source>
+            <translation>de patch installeren: %2?</translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="659"/>
+            <source>Game already installed\n%1\nWould you like to overwrite?</source>
+            <translation>Spel al geïnstalleerd\n%1\nWil je het overschrijven?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>DLC-installatie</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>Wilt u DLC installeren: %1?</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC al geïnstalleerd:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Game al geïnstalleerd</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/pl_PL.ts

@@ -566,54 +566,54 @@
             <translation>Ekstrakcja PKG</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+            <source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Wykryto łatkę!</translation>
+            <translation>Wykryto poprawkę!\nWersje PKG i gry pasują do siebie!: %1\nCzy chcesz </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+            <source>to overwrite?</source>
-        	<translation>Wersje PKG i gry są zgodne: </translation>
+            <translation>nadpisać?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="647"/>
+            <location filename="../main_window.cpp" line="639"/>
-        	<source>Would you like to overwrite?</source>
+            <source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>Czy chcesz nadpisać?</translation>
+            <translation>Wykryto poprawkę!\nWersja PKG %1 jest starsza </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="639"/>
+            <location filename="../main_window.cpp" line="640"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+            <source>than installed version!: %2\nWould you like </source>
-        	<translation>Wersja PKG %1 jest starsza niż zainstalowana wersja: </translation>
+            <translation>niż zainstalowana wersja!: %2\nCzy chcesz </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="641"/>
-        	<source>Game is installed: </source>
+            <source>to overwrite?</source>
-        	<translation>Gra jest zainstalowana: </translation>
+            <translation>nadpisać?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="646"/>
-        	<source>Would you like to install Patch: </source>
+            <source>Patch detected!\nGame is installed: %1\nWould you like </source>
-        	<translation>Czy chcesz zainstalować łatkę: </translation>
+            <translation>Wykryto poprawkę!\nGra jest zainstalowana: %1\nCzy chcesz </translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="647"/>
+            <source>to install Patch: %2?</source>
+            <translation>zainstalować poprawkę: %2?</translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="659"/>
+            <source>Game already installed\n%1\nWould you like to overwrite?</source>
+            <translation>Gra już zainstalowana\n%1\nCzy chcesz ją nadpisać?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>Instalacja DLC</translation>
+            <translation>Instalacja dodadkowej zawartości (DLC)</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>Czy chcesz zainstalować DLC: %1?</translation>
+            <translation>Czy na pewno chcesz zainstalować dodatkową zawartość (DLC): %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC już zainstalowane:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Gra już zainstalowana</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/pt_BR.ts

@@ -37,7 +37,7 @@
         <message>
             <location filename="../game_info.cpp" line="26"/>
             <source>Loading game list, please wait :3</source>
-            <translation>Carregando a lista de jogos, por favor aguarde :3</translation>
+            <translation>Carregando lista de jogos, por favor aguarde :3</translation>
         </message>
         <message>
             <location filename="../game_info.cpp" line="26"/>
@@ -256,7 +256,7 @@
         <message>
             <location filename="../main_window_ui.h" line="343"/>
             <source>Download Cheats/Patches</source>
-            <translation>Baixar Cheats/Patches</translation>
+            <translation>Baixar Trapaças / Patches</translation>
         </message>
         <message>
             <location filename="../main_window_ui.h" line="345"/>
@@ -291,7 +291,7 @@
         <message>
             <location filename="../main_window_ui.h" line="354"/>
             <source>Game List Mode</source>
-            <translation>Modo da Lista de Jogos</translation>
+            <translation>Modo de Lista de Jogos</translation>
         </message>
         <message>
             <location filename="../main_window_ui.h" line="355"/>
@@ -425,7 +425,7 @@
         <message>
             <location filename="../settings_dialog.ui" line="235"/>
             <source>Log Filter</source>
-            <translation>Filtro do Registro</translation>
+            <translation>Filtro</translation>
         </message>
         <message>
             <location filename="../settings_dialog.ui" line="272"/>
@@ -508,12 +508,12 @@
         <message>
         	<location filename="../main_window.cpp" line="326"/>
         	<source>Download Cheats For All Installed Games</source>
-        	<translation>Baixar Cheats para Todos os Jogos Instalados</translation>
+        	<translation>Baixar Trapaças para todos os jogos instalados</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="328"/>
         	<source>Download Patches For All Games</source>
-        	<translation>Baixar Patches para Todos os Jogos</translation>
+        	<translation>Baixar Patches para todos os jogos</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="363"/>
@@ -523,7 +523,7 @@
         <message>
         	<location filename="../main_window.cpp" line="364"/>
         	<source>You have downloaded cheats for all the games you have installed.</source>
-        	<translation>Você baixou cheats para todos os jogos que instalou.</translation>
+        	<translation>Você baixou trapaças para todos os jogos que instalou.</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="391"/>
@@ -566,64 +566,64 @@
         	<translation>Extração de PKG</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+        	<source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Atualização detectada!</translation>
+        	<translation>Patch detectado!\nVersões PKG e do Jogo correspondem!: %1\nGostaria de </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+        	<source>to overwrite?</source>
-        	<translation>As versões do PKG e do Jogo são igual: </translation>
+        	<translation>substituir?</translation>
-        </message>
-        <message>
-        	<location filename="../main_window.cpp" line="647"/>
-        	<source>Would you like to overwrite?</source>
-        	<translation>Gostaria de substituir?</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="639"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+        	<source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>Versão do PKG %1 é mais antiga do que a versão instalada: </translation>
+        	<translation>Patch detectado!\nVersão PKG %1 é mais antiga </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="640"/>
-        	<source>Game is installed: </source>
+        	<source>than installed version!: %2\nWould you like </source>
-        	<translation>Jogo instalado: </translation>
+        	<translation>do que a versão instalada!: %2\nGostaria de </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="641"/>
-        	<source>Would you like to install Patch: </source>
+        	<source>to overwrite?</source>
-        	<translation>Você gostaria de instalar a atualização: </translation>
+        	<translation>substituir?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="646"/>
+        	<source>Patch detected!\nGame is installed: %1\nWould you like </source>
+        	<translation>Patch detectado!\nJogo está instalado: %1\nGostaria de </translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="647"/>
+        	<source>to install Patch: %2?</source>
+        	<translation>instalar o Patch: %2?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="659"/>
+        	<source>Game already installed\n%1\nWould you like to overwrite?</source>
+        	<translation>Jogo já instalado\n%1\nGostaria de substituir?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>Instalação de DLC</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>Você gostaria de instalar o DLC: %1?</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC já instalada:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>O jogo já está instalado:</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="674"/>
         	<source>PKG is a patch, please install the game first!</source>
-        	<translation>O PKG é um patch, por favor, instale o jogo primeiro!</translation>
+        	<translation>PKG é um patch, por favor, instale o jogo primeiro!</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="681"/>
         	<source>PKG ERROR</source>
-        	<translation>ERRO de PKG</translation>
+        	<translation>ERRO PKG</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="693"/>
@@ -651,12 +651,12 @@
         <message>
         	<location filename="../cheats_patches.cpp" line="44"/>
         	<source>Cheats / Patches</source>
-        	<translation>Cheats / Patches</translation>
+        	<translation>Trapaças / Patches</translation>
         </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="50"/>
         	<source>defaultTextEdit_MSG</source>
-        	<translation>Cheats/Patches são experimentais.\nUse com cautela.\n\nBaixe os cheats individualmente selecionando o repositório e clicando no botão de download.\nNa aba Patches, você pode baixar todos os Patches de uma vez, escolha qual deseja usar e salve a opção.\n\nComo não desenvolvemos os Cheats/Patches,\npor favor, reporte problemas relacionados ao autor do cheat.\n\nCriou um novo cheat? Visite:\nhttps://github.com/shadps4-emu/ps4_cheats</translation>
+        	<translation>Trapaças/Patches são experimentais.\nUse com cautela.\n\nBaixe as trapaças individualmente selecionando o repositório e clicando no botão de download.\nNa aba Patches, você pode baixar todos os Patches de uma vez, escolher qual deseja usar e salvar a opção.\n\nComo não desenvolvemos as Trapaças/Patches,\npor favor, reporte problemas relacionados ao autor da trapaça.\n\nCriou uma nova trapaça? Visite:\nhttps://github.com/shadps4-emu/ps4_cheats</translation>
         </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="69"/>
@@ -666,7 +666,7 @@
         <message>
         	<location filename="../cheats_patches.cpp" line="79"/>
         	<source>Serial: </source>
-        	<translation>Serial: </translation>
+        	<translation>Série: </translation>
         </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="83"/>
@@ -681,7 +681,7 @@
         <message>
         	<location filename="../cheats_patches.cpp" line="126"/>
         	<source>Select Cheat File:</source>
-        	<translation>Selecione o Arquivo de Cheat:</translation>
+        	<translation>Selecione o Arquivo de Trapaça:</translation>
         </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="133"/>
@@ -691,7 +691,7 @@
         <message>
         	<location filename="../cheats_patches.cpp" line="149"/>
         	<source>Download Cheats</source>
-        	<translation>Baixar Cheats</translation>
+        	<translation>Baixar Trapaças</translation>
         </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="155"/>
@@ -706,7 +706,7 @@
         <message>
         	<location filename="../cheats_patches.cpp" line="170"/>
         	<source>You can delete the cheats you don't want after downloading them.</source>
-        	<translation>Você pode excluir os cheats que não deseja após baixá-las.</translation>
+        	<translation>Você pode excluir as trapaças que não deseja após baixá-las.</translation>
         </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="178"/>
@@ -731,7 +731,7 @@
         <message>
         	<location filename="../cheats_patches.cpp" line="256"/>
         	<source>Cheats</source>
-        	<translation>Cheats</translation>
+        	<translation>Trapaças</translation>
         </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="257"/>
@@ -756,7 +756,7 @@
         <message>
         	<location filename="../cheats_patches.cpp" line="316"/>
         	<source>No patch file found for the current serial.</source>
-        	<translation>Nenhum arquivo de patch encontrado para o serial atual.</translation>
+        	<translation>Nenhum arquivo de patch encontrado para a série atual.</translation>
         </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="323"/>
@@ -816,22 +816,22 @@
         <message>
         	<location filename="../cheats_patches.cpp" line="556"/>
         	<source>Cheats Not Found</source>
-        	<translation>Cheats Não Encontrados</translation>
+        	<translation>Trapaças Não Encontradas</translation>
         </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="556"/>
         	<source>CheatsNotFound_MSG</source>
-        	<translation>Nenhum cheat encontrado para este jogo nesta versão do repositório selecionado, tente outro repositório ou uma versão diferente do jogo.</translation>
+        	<translation>Nenhuma trapaça encontrada para este jogo nesta versão do repositório selecionado, tente outro repositório ou uma versão diferente do jogo.</translation>
         </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="593"/>
         	<source>Cheats Downloaded Successfully</source>
-        	<translation>Cheats Baixados com Sucesso</translation>
+        	<translation>Trapaças Baixadas com Sucesso</translation>
         </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="594"/>
         	<source>CheatsDownloadedSuccessfully_MSG</source>
-        	<translation>Você baixou os cheats com sucesso. Para esta versão do jogo a partir do repositório selecionado. Você pode tentar baixar de outro repositório, se estiver disponível, também será possível usá-lo selecionando o arquivo da lista.</translation>
+        	<translation>Você baixou as trapaças com sucesso. Para esta versão do jogo a partir do repositório selecionado.Você pode tentar baixar de outro repositório, se estiver disponível, também será possível usá-lo selecionando o arquivo da lista.</translation>
         </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="747"/>
@@ -851,7 +851,7 @@
         <message>
         	<location filename="../cheats_patches.cpp" line="763"/>
         	<source>DownloadComplete_MSG</source>
-        	<translation>Patches Baixados com Sucesso! Todos os patches disponíveis para todos os jogos foram baixados, não é necessário baixá-los individualmente para cada jogo como acontece com os Cheats.</translation>
+        	<translation>Patches Baixados com Sucesso! Todos os patches disponíveis para todos os jogos foram baixados, não é necessário baixá-los individualmente para cada jogo como acontece com as Trapaças.</translation>
         </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="773"/>
@@ -871,7 +871,7 @@
         <message>
         	<location filename="../cheats_patches.cpp" line="819"/>
         	<source>XML ERROR:</source>
-        	<translation>ERRO de XML:</translation>
+        	<translation>ERRO XML:</translation>
         </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="826"/>
@@ -886,7 +886,7 @@
         <message>
         	<location filename="../cheats_patches.cpp" line="997"/>
         	<source>Directory does not exist:</source>
-        	<translation>O Diretório não existe:</translation>
+        	<translation>Diretório não existe:</translation>
         </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="1006"/>

src/qt_gui/translations/ro_RO.ts

@@ -566,54 +566,54 @@
             <translation>Extracție PKG</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+            <source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Patch detectat!</translation>
+            <translation>Patch detectat!\nVersiunile PKG și Joc se potrivesc!: %1\nAi dori să </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+            <source>to overwrite?</source>
-        	<translation>Versiunile PKG și ale jocului sunt compatibile: </translation>
+            <translation>să suprascrii?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="647"/>
+            <location filename="../main_window.cpp" line="639"/>
-        	<source>Would you like to overwrite?</source>
+            <source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>Doriți să suprascrieți?</translation>
+            <translation>Patch detectat!\nVersiunea PKG %1 este mai veche </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="639"/>
+            <location filename="../main_window.cpp" line="640"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+            <source>than installed version!: %2\nWould you like </source>
-        	<translation>Versiunea PKG %1 este mai veche decât versiunea instalată: </translation>
+            <translation>decât versiunea instalată!: %2\nAi dori să </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="641"/>
-        	<source>Game is installed: </source>
+            <source>to overwrite?</source>
-        	<translation>Jocul este instalat: </translation>
+            <translation>să suprascrii?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="646"/>
-        	<source>Would you like to install Patch: </source>
+            <source>Patch detected!\nGame is installed: %1\nWould you like </source>
-        	<translation>Doriți să instalați patch-ul: </translation>
+            <translation>Patch detectat!\nJocul este instalat: %1\nAi dori să </translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="647"/>
+            <source>to install Patch: %2?</source>
+            <translation>să instalezi Patch-ul: %2?</translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="659"/>
+            <source>Game already installed\n%1\nWould you like to overwrite?</source>
+            <translation>Jocul este deja instalat\n%1\nAi dori să suprascrii?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>Instalare DLC</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>Doriți să instalați DLC-ul: %1?</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC deja instalat:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Jocul deja instalat</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/ru_RU.ts

@@ -93,7 +93,7 @@
         <message>
             <location filename="../gui_context_menus.h" line="48"/>
             <source>Cheats / Patches</source>
-            <translation>Читы и патчи</translation>
+            <translation>Читы / Патчи</translation>
         </message>
         <message>
             <location filename="../gui_context_menus.h" line="49"/>
@@ -256,7 +256,7 @@
         <message>
             <location filename="../main_window_ui.h" line="343"/>
             <source>Download Cheats/Patches</source>
-            <translation>Скачать читы или патчи</translation>
+            <translation>Скачать Читы / Патчи</translation>
         </message>
         <message>
             <location filename="../main_window_ui.h" line="345"/>
@@ -566,55 +566,55 @@
         	<translation>Извлечение PKG</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+        	<source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Обнаружен патч!</translation>
+        	<translation>Обнаружен патч!\nВерсии PKG и игры совпадают!: %1\nХотите </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+        	<source>to overwrite?</source>
-        	<translation>Версии PKG и игры совпадают: </translation>
+        	<translation>перезаписать?</translation>
-        </message>
-        <message>
-        	<location filename="../main_window.cpp" line="647"/>
-        	<source>Would you like to overwrite?</source>
-        	<translation>Хотите перезаписать?</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="639"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+        	<source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>Версия PKG %1 старее установленной версии: </translation>
+        	<translation>Обнаружен патч!\nВерсия PKG %1 устарела </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="640"/>
-        	<source>Game is installed: </source>
+        	<source>than installed version!: %2\nWould you like </source>
-        	<translation>Игра установлена: </translation>
+        	<translation>по сравнению с установленной версией!: %2\nХотите </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="641"/>
-        	<source>Would you like to install Patch: </source>
+        	<source>to overwrite?</source>
-        	<translation>Хотите установить патч: </translation>
+        	<translation>перезаписать?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="646"/>
+        	<source>Patch detected!\nGame is installed: %1\nWould you like </source>
+        	<translation>Обнаружен патч!\nИгра установлена: %1\nХотите </translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="647"/>
+        	<source>to install Patch: %2?</source>
+        	<translation>установить патч: %2?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="659"/>
+        	<source>Game already installed\n%1\nWould you like to overwrite?</source>
+        	<translation>Игра уже установлена\n%1\nХотите перезаписать?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>Установка DLC</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>Вы хотите установить DLC: %1??</translation>
+            <translation>Would you like to install DLC: %1?</translation>
         </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC уже установлен:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Игра уже установлена</translation>
-        </message>	
         <message>
         	<location filename="../main_window.cpp" line="674"/>
         	<source>PKG is a patch, please install the game first!</source>
@@ -638,7 +638,7 @@
         <message>
         	<location filename="../main_window.cpp" line="704"/>
         	<source>Game successfully installed at %1</source>
-        	<translation>Игра успешно установлена в %1</translation>
+        	<translation>Игра успешно установлена по адресу %1</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="725"/>
@@ -651,13 +651,13 @@
         <message>
         	<location filename="../cheats_patches.cpp" line="44"/>
         	<source>Cheats / Patches</source>
-        	<translation>Читы и патчи</translation>
+        	<translation>Читы / Патчи</translation>
         </message>
         <message>
             <location filename="../cheats_patches.cpp" line="50"/>
             <source>defaultTextEdit_MSG</source>
-            <translation>Читы и патчи экспериментальны.\nИспользуйте с осторожностью.\n\nСкачивайте читы, выбрав репозиторий и нажав на кнопку загрузки.\nВо вкладке "Патчи" вы можете скачать все патчи сразу, выбирать какие вы хотите использовать, и сохранять выбор.\n\nПоскольку мы не разрабатываем читы/патчи,\nпожалуйста сообщайте о проблемах автору чита/патча.\n\nСоздали новый чит? Посетите:\nhttps://github.com/shadps4-emu/ps4_cheats</translation>
+            <translation>Cheats/Patches sunt experimentale.\nUtilizați cu prudență.\n\nDescărcați cheats individual prin selectarea depozitului și făcând clic pe butonul de descărcare.\nÎn fila Patches, puteți descărca toate patch-urile deodată, alege pe cele pe care doriți să le utilizați și salvați selecția.\n\nDeoarece nu dezvoltăm Cheats/Patches,\nte rugăm să raportezi problemele autorului cheat-ului.\n\nAi creat un nou cheat? Vizitează:\nhttps://github.com/shadps4-emu/ps4_cheats</translation>
-            </message>
+        </message>
         <message>
         	<location filename="../cheats_patches.cpp" line="69"/>
         	<source>No Image Available</source>

src/qt_gui/translations/tr_TR.ts

@@ -566,54 +566,54 @@
         	<translation>PKG Çıkartma</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+        	<source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Yamanın tespit edildi!</translation>
+        	<translation>Yama tespit edildi!\nPKG ve Oyun sürümleri uyuyor!: %1\nÜzerine yazmak ister misiniz?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+        	<location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+        	<source>to overwrite?</source>
-        	<translation>PKG ve oyun sürümleri uyumlu: </translation>
+        	<translation>üzerine yazmak?</translation>
-        </message>
-        <message>
-        	<location filename="../main_window.cpp" line="647"/>
-        	<source>Would you like to overwrite?</source>
-        	<translation>Üzerine yazmak ister misiniz?</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="639"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+        	<source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>PKG Sürümü %1, kurulu sürümden daha eski: </translation>
+        	<translation>Yama tespit edildi!\nPKG Sürümü %1 daha eski </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="640"/>
-        	<source>Game is installed: </source>
+        	<source>than installed version!: %2\nWould you like </source>
-        	<translation>Oyun yüklendi: </translation>
+        	<translation>yüklü sürümden!: %2\nÜzerine yazmak ister misiniz?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+        	<location filename="../main_window.cpp" line="641"/>
-        	<source>Would you like to install Patch: </source>
+        	<source>to overwrite?</source>
-        	<translation>Yamanın yüklenmesini ister misiniz: </translation>
+        	<translation>üzerine yazmak?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="646"/>
+        	<source>Patch detected!\nGame is installed: %1\nWould you like </source>
+        	<translation>Yama tespit edildi!\nOyun yüklü: %1\nÜzerine yazmak ister misiniz?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="647"/>
+        	<source>to install Patch: %2?</source>
+        	<translation>Yamayı kurmak ister misiniz: %2?</translation>
+        </message>
+        <message>
+        	<location filename="../main_window.cpp" line="659"/>
+        	<source>Game already installed\n%1\nWould you like to overwrite?</source>
+        	<translation>Oyun zaten yüklü\n%1\nÜzerine yazmak ister misiniz?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>DLC Yükleme</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>DLC'yi yüklemek ister misiniz: %1?</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC zaten yüklü:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Oyun zaten yüklü</translation>
         </message>
         <message>
         	<location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/vi_VN.ts

@@ -566,55 +566,55 @@
             <translation>Giải nén PKG</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+            <source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>Đã phát hiện bản vá!</translation>
+            <translation>Đã phát hiện bản vá!\nPhiên bản PKG và trò chơi khớp!: %1\nBạn có muốn </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+            <source>to overwrite?</source>
-        	<translation>Các phiên bản PKG và trò chơi khớp nhau: </translation>
+            <translation>ghi đè không?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="647"/>
+            <location filename="../main_window.cpp" line="639"/>
-        	<source>Would you like to overwrite?</source>
+            <source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>Bạn có muốn ghi đè không?</translation>
+            <translation>Đã phát hiện bản vá!\nPhiên bản PKG %1 cũ hơn </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="639"/>
+            <location filename="../main_window.cpp" line="640"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+            <source>than installed version!: %2\nWould you like </source>
-        	<translation>Phiên bản PKG %1 cũ hơn phiên bản đã cài đặt: </translation>
+            <translation>so với phiên bản đã cài đặt!: %2\nBạn có muốn </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="641"/>
-        	<source>Game is installed: </source>
+            <source>to overwrite?</source>
-        	<translation>Trò chơi đã được cài đặt: </translation>
+            <translation>ghi đè không?</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="646"/>
-        	<source>Would you like to install Patch: </source>
+            <source>Patch detected!\nGame is installed: %1\nWould you like </source>
-        	<translation>Bạn có muốn cài đặt bản vá: </translation>
+            <translation>Đã phát hiện bản vá!\nTrò chơi đã được cài đặt: %1\nBạn có muốn </translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="647"/>
+            <source>to install Patch: %2?</source>
+            <translation>cài đặt bản vá: %2?</translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="659"/>
+            <source>Game already installed\n%1\nWould you like to overwrite?</source>
+            <translation>Trò chơi đã được cài đặt\n%1\nBạn có muốn ghi đè không?</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>Cài đặt DLC</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>Bạn có muốn cài đặt DLC: %1?</translation>
+            <translation>Would you like to install DLC: %1?</translation>
         </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC đã được cài đặt:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>Trò chơi đã được cài đặt</translation>
-        </message>	
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>PKG is a patch, please install the game first!</source>

src/qt_gui/translations/zh_CN.ts

@@ -566,54 +566,54 @@
             <translation>PKG 解压</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+            <source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>检测到补丁！</translation>
+            <translation>检测到补丁！\nPKG 和游戏版本匹配：%1\n您想要 </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+            <source>to overwrite?</source>
-        	<translation>PKG 和游戏版本匹配: </translation>
+            <translation>覆盖吗？</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="647"/>
+            <location filename="../main_window.cpp" line="639"/>
-        	<source>Would you like to overwrite?</source>
+            <source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>您想要覆盖吗？</translation>
+            <translation>检测到补丁！\nPKG 版本 %1 较旧 </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="639"/>
+            <location filename="../main_window.cpp" line="640"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+            <source>than installed version!: %2\nWould you like </source>
-        	<translation>PKG 版本 %1 比已安装版本更旧: </translation>
+            <translation>与已安装版本相比：%2\n您想要 </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="641"/>
-        	<source>Game is installed: </source>
+            <source>to overwrite?</source>
-        	<translation>游戏已安装: </translation>
+            <translation>覆盖吗？</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="646"/>
-        	<source>Would you like to install Patch: </source>
+            <source>Patch detected!\nGame is installed: %1\nWould you like </source>
-        	<translation>您想安装补丁吗: </translation>
+            <translation>检测到补丁！\n游戏已安装：%1\n您想要 </translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="647"/>
+            <source>to install Patch: %2?</source>
+            <translation>安装补丁：%2？</translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="659"/>
+            <source>Game already installed\n%1\nWould you like to overwrite?</source>
+            <translation>游戏已安装\n%1\n您想要覆盖吗？</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>DLC 安装</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>您想安装 DLC: %1 吗？</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC 已经安装:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>游戏已经安装</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>

src/qt_gui/translations/zh_TW.ts

@@ -566,54 +566,54 @@
             <translation>PKG 解壓縮</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="633"/>
-        	<source>Patch detected!</source>
+            <source>Patch detected!\nPKG and Game versions match!: %1\nWould you like </source>
-        	<translation>檢測到補丁！</translation>
+            <translation>偵測到修補檔！\nPKG 和遊戲版本匹配！: %1\n您是否希望 </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="646"/>
+            <location filename="../main_window.cpp" line="634"/>
-        	<source>PKG and Game versions match: </source>
+            <source>to overwrite?</source>
-        	<translation>PKG 和遊戲版本匹配: </translation>
+            <translation>覆蓋嗎？</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="647"/>
+            <location filename="../main_window.cpp" line="639"/>
-        	<source>Would you like to overwrite?</source>
+            <source>Patch detected!\nPKG Version %1 is older </source>
-        	<translation>您想要覆蓋嗎？</translation>
+            <translation>偵測到修補檔！\nPKG 版本 %1 較舊 </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="639"/>
+            <location filename="../main_window.cpp" line="640"/>
-        	<source>PKG Version %1 is older than installed version: </source>
+            <source>than installed version!: %2\nWould you like </source>
-        	<translation>PKG 版本 %1 比已安裝版本更舊: </translation>
+            <translation>比安裝的版本舊！: %2\n您是否希望 </translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="641"/>
-        	<source>Game is installed: </source>
+            <source>to overwrite?</source>
-        	<translation>遊戲已安裝: </translation>
+            <translation>覆蓋嗎？</translation>
         </message>
         <message>
-        	<location filename="../main_window.cpp" line="660"/>
+            <location filename="../main_window.cpp" line="646"/>
-        	<source>Would you like to install Patch: </source>
+            <source>Patch detected!\nGame is installed: %1\nWould you like </source>
-        	<translation>您想要安裝補丁嗎: </translation>
+            <translation>偵測到修補檔！\n遊戲已安裝: %1\n您是否希望 </translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="647"/>
+            <source>to install Patch: %2?</source>
+            <translation>安裝修補檔: %2？</translation>
+        </message>
+        <message>
+            <location filename="../main_window.cpp" line="659"/>
+            <source>Game already installed\n%1\nWould you like to overwrite?</source>
+            <translation>遊戲已經安裝\n%1\n您是否希望覆蓋？</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="673"/>
             <source>DLC Installation</source>
-            <translation>DLC 安裝</translation>
+            <translation>DLC Installation</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>
             <source>Would you like to install DLC: %1?</source>
-            <translation>您想要安裝 DLC: %1 嗎？</translation>
+            <translation>Would you like to install DLC: %1?</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="688"/>
-            <source>DLC already installed:</source>
-            <translation>DLC 已經安裝:</translation>
-        </message>
-        <message>
-            <location filename="../main_window.cpp" line="701"/>
-            <source>Game already installed</source>
-            <translation>遊戲已經安裝</translation>
         </message>
         <message>
             <location filename="../main_window.cpp" line="674"/>

src/shader_recompiler/backend/spirv/emit_spirv.cpp

@@ -187,7 +187,6 @@ void DefineEntryPoint(const IR::Program& program, EmitContext& ctx, Id main) {
     ctx.AddCapability(spv::Capability::Int64);
     if (info.has_storage_images || info.has_image_buffers) {
         ctx.AddCapability(spv::Capability::StorageImageExtendedFormats);
-        ctx.AddCapability(spv::Capability::StorageImageReadWithoutFormat);
         ctx.AddCapability(spv::Capability::StorageImageWriteWithoutFormat);
     }
     if (info.has_texel_buffers) {

src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp

@@ -266,8 +266,7 @@ Id EmitLoadBufferFormatF32(EmitContext& ctx, IR::Inst* inst, u32 handle, Id addr
     const auto& buffer = ctx.texture_buffers[handle];
     const Id tex_buffer = ctx.OpLoad(buffer.image_type, buffer.id);
     const Id coord = ctx.OpIAdd(ctx.U32[1], address, buffer.coord_offset);
-    Id texel = buffer.is_storage ? ctx.OpImageRead(buffer.result_type, tex_buffer, coord)
+    Id texel = ctx.OpImageFetch(buffer.result_type, tex_buffer, coord);
-                                 : ctx.OpImageFetch(buffer.result_type, tex_buffer, coord);
     if (buffer.is_integer) {
         texel = ctx.OpBitcast(ctx.F32[4], texel);
     }

src/shader_recompiler/backend/spirv/spirv_emit_context.cpp

@@ -406,7 +406,6 @@ void EmitContext::DefineTextureBuffers() {
             .image_type = image_type,
             .result_type = sampled_type[4],
             .is_integer = is_integer,
-            .is_storage = desc.is_written,
         });
         interfaces.push_back(id);
     }

src/shader_recompiler/backend/spirv/spirv_emit_context.h

@@ -215,7 +215,6 @@ public:
         Id image_type;
         Id result_type;
         bool is_integer;
-        bool is_storage;
     };
 
     u32& binding;

src/shader_recompiler/frontend/translate/scalar_alu.cpp

@@ -31,8 +31,6 @@ void Translator::EmitScalarAlu(const GcnInst& inst) {
             return S_OR_B64(NegateMode::Result, false, inst);
         case Opcode::S_XOR_B64:
             return S_OR_B64(NegateMode::None, true, inst);
-        case Opcode::S_XNOR_B64:
-            return S_OR_B64(NegateMode::Result, true, inst);
         case Opcode::S_ORN2_B64:
             return S_OR_B64(NegateMode::Src1, false, inst);
         case Opcode::S_AND_B64:

src/shader_recompiler/frontend/translate/translate.cpp

@@ -436,7 +436,6 @@ void Translator::EmitFlowControl(u32 pc, const GcnInst& inst) {
     case Opcode::S_CBRANCH_SCC1:
     case Opcode::S_CBRANCH_VCCNZ:
     case Opcode::S_CBRANCH_VCCZ:
-    case Opcode::S_CBRANCH_EXECNZ:
     case Opcode::S_BRANCH:
         return;
     default:

src/video_core/amdgpu/liverpool.cpp

@@ -368,36 +368,6 @@ Liverpool::Task Liverpool::ProcessGraphics(std::span<const u32> dcb, std::span<c
                 }
                 break;
             }
-            case PM4ItOpcode::DrawIndirect: {
-                const auto* draw_indirect = reinterpret_cast<const PM4CmdDrawIndirect*>(header);
-                const auto offset = draw_indirect->data_offset;
-                const auto ib_address = mapped_queues[GfxQueueId].indirect_args_addr;
-                const auto size = sizeof(PM4CmdDrawIndirect::DrawInstancedArgs);
-                if (rasterizer) {
-                    const auto cmd_address = reinterpret_cast<const void*>(header);
-                    rasterizer->ScopeMarkerBegin(fmt::format("dcb:{}:DrawIndirect", cmd_address));
-                    rasterizer->Breadcrumb(u64(cmd_address));
-                    rasterizer->DrawIndirect(false, ib_address, offset, size);
-                    rasterizer->ScopeMarkerEnd();
-                }
-                break;
-            }
-            case PM4ItOpcode::DrawIndexIndirect: {
-                const auto* draw_index_indirect =
-                    reinterpret_cast<const PM4CmdDrawIndexIndirect*>(header);
-                const auto offset = draw_index_indirect->data_offset;
-                const auto ib_address = mapped_queues[GfxQueueId].indirect_args_addr;
-                const auto size = sizeof(PM4CmdDrawIndexIndirect::DrawIndexInstancedArgs);
-                if (rasterizer) {
-                    const auto cmd_address = reinterpret_cast<const void*>(header);
-                    rasterizer->ScopeMarkerBegin(
-                        fmt::format("dcb:{}:DrawIndexIndirect", cmd_address));
-                    rasterizer->Breadcrumb(u64(cmd_address));
-                    rasterizer->DrawIndirect(true, ib_address, offset, size);
-                    rasterizer->ScopeMarkerEnd();
-                }
-                break;
-            }
             case PM4ItOpcode::DispatchDirect: {
                 const auto* dispatch_direct = reinterpret_cast<const PM4CmdDispatchDirect*>(header);
                 regs.cs_program.dim_x = dispatch_direct->dim_x;
@@ -518,7 +488,6 @@ Liverpool::Task Liverpool::ProcessGraphics(std::span<const u32> dcb, std::span<c
                 break;
             }
             case PM4ItOpcode::PfpSyncMe: {
-                rasterizer->CpSync();
                 break;
             }
             default:

src/video_core/amdgpu/pm4_cmds.h

@@ -253,6 +253,20 @@ struct PM4CmdDrawIndexAuto {
     u32 draw_initiator;
 };
 
+struct PM4CmdDrawIndirect {
+    PM4Type3Header header; ///< header
+    u32 data_offset;       ///< DWORD aligned offset
+    union {
+        u32 dw2;
+        BitField<0, 16, u32> base_vtx_loc; ///< base vertex location
+    };
+    union {
+        u32 dw3;
+        BitField<0, 16, u32> start_inst_loc; ///< start instance location
+    };
+    u32 draw_initiator; ///< Draw Initiator Register
+};
+
 enum class DataSelect : u32 {
     None = 0,
     Data32Low = 1,
@@ -726,51 +740,4 @@ struct PM4CmdDispatchIndirect {
     u32 dispatch_initiator; ///< Dispatch Initiator Register
 };
 
-struct PM4CmdDrawIndirect {
-    struct DrawInstancedArgs {
-        u32 vertex_count_per_instance;
-        u32 instance_count;
-        u32 start_vertex_location;
-        u32 start_instance_location;
-    };
-
-    PM4Type3Header header; ///< header
-    u32 data_offset;       ///< Byte aligned offset where the required data structure starts
-    union {
-        u32 dw2;
-        BitField<0, 16, u32> base_vtx_loc; ///< Offset where the CP will write the
-                                           ///< BaseVertexLocation it fetched from memory
-    };
-    union {
-        u32 dw3;
-        BitField<0, 16, u32> start_inst_loc; ///< Offset where the CP will write the
-                                             ///< StartInstanceLocation it fetched from memory
-    };
-    u32 draw_initiator; ///< Draw Initiator Register
-};
-
-struct PM4CmdDrawIndexIndirect {
-    struct DrawIndexInstancedArgs {
-        u32 index_count_per_instance;
-        u32 instance_count;
-        u32 start_index_location;
-        u32 base_vertex_location;
-        u32 start_instance_location;
-    };
-
-    PM4Type3Header header; ///< header
-    u32 data_offset;       ///< Byte aligned offset where the required data structure starts
-    union {
-        u32 dw2;
-        BitField<0, 16, u32> base_vtx_loc; ///< Offset where the CP will write the
-                                           ///< BaseVertexLocation it fetched from memory
-    };
-    union { // NOTE: this one is undocumented in AMD spec, but Gnm driver writes this field
-        u32 dw3;
-        BitField<0, 16, u32> start_inst_loc; ///< Offset where the CP will write the
-                                             ///< StartInstanceLocation it fetched from memory
-    };
-    u32 draw_initiator; ///< Draw Initiator Register
-};
-
 } // namespace AmdGpu

src/video_core/buffer_cache/buffer.cpp

@@ -119,7 +119,7 @@ vk::BufferView Buffer::View(u32 offset, u32 size, bool is_written, AmdGpu::DataF
                dfmt == view.dfmt && nfmt == view.nfmt;
     })};
     if (it != views.end()) {
-        return *it->handle;
+        return it->handle;
     }
     const vk::BufferUsageFlags2CreateInfoKHR usage_flags = {
         .usage = is_written ? vk::BufferUsageFlagBits2KHR::eStorageTexelBuffer
@@ -138,9 +138,9 @@ vk::BufferView Buffer::View(u32 offset, u32 size, bool is_written, AmdGpu::DataF
         .is_written = is_written,
         .dfmt = dfmt,
         .nfmt = nfmt,
-        .handle = instance->GetDevice().createBufferViewUnique(view_ci),
+        .handle = instance->GetDevice().createBufferView(view_ci),
     });
-    return *views.back().handle;
+    return views.back().handle;
 }
 
 constexpr u64 WATCHES_INITIAL_RESERVE = 0x4000;

src/video_core/buffer_cache/buffer.h

@@ -134,7 +134,7 @@ public:
         bool is_written;
         AmdGpu::DataFormat dfmt;
         AmdGpu::NumberFormat nfmt;
-        vk::UniqueBufferView handle;
+        vk::BufferView handle;
     };
     std::vector<BufferView> views;
 };

src/video_core/buffer_cache/buffer_cache.cpp

@@ -228,12 +228,11 @@ u32 BufferCache::BindIndexBuffer(bool& is_indexed, u32 index_offset) {
     return regs.num_indices;
 }
 
-std::pair<Buffer*, u32> BufferCache::ObtainBuffer(VAddr device_addr, u32 size, bool is_written,
+std::pair<Buffer*, u32> BufferCache::ObtainBuffer(VAddr device_addr, u32 size, bool is_written) {
-                                                  bool is_texel_buffer) {
     std::scoped_lock lk{mutex};
     static constexpr u64 StreamThreshold = CACHING_PAGESIZE;
     const bool is_gpu_dirty = memory_tracker.IsRegionGpuModified(device_addr, size);
-    if (!is_written && !is_texel_buffer && size <= StreamThreshold && !is_gpu_dirty) {
+    if (!is_written && size < StreamThreshold && !is_gpu_dirty) {
         // For small uniform buffers that have not been modified by gpu
         // use device local stream buffer to reduce renderpass breaks.
         const u64 offset = stream_buffer.Copy(device_addr, size, instance.UniformMinAlignment());

src/video_core/buffer_cache/buffer_cache.h

@@ -66,8 +66,7 @@ public:
     u32 BindIndexBuffer(bool& is_indexed, u32 index_offset);
 
     /// Obtains a buffer for the specified region.
-    [[nodiscard]] std::pair<Buffer*, u32> ObtainBuffer(VAddr gpu_addr, u32 size, bool is_written,
+    [[nodiscard]] std::pair<Buffer*, u32> ObtainBuffer(VAddr gpu_addr, u32 size, bool is_written);
-                                                       bool is_texel_buffer = false);
 
     /// Obtains a temporary buffer for usage in texture cache.
     [[nodiscard]] std::pair<const Buffer*, u32> ObtainTempBuffer(VAddr gpu_addr, u32 size);

src/video_core/renderer_vulkan/liverpool_to_vk.cpp

@@ -287,8 +287,8 @@ vk::BorderColor BorderColor(AmdGpu::BorderColor color) {
 
 std::span<const vk::Format> GetAllFormats() {
     static constexpr std::array formats{
-        vk::Format::eA2B10G10R10SnormPack32,
         vk::Format::eA2B10G10R10UnormPack32,
+        vk::Format::eA2R10G10B10SnormPack32,
         vk::Format::eA2R10G10B10UnormPack32,
         vk::Format::eB5G6R5UnormPack16,
         vk::Format::eB8G8R8A8Srgb,
@@ -424,10 +424,6 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
         num_format == AmdGpu::NumberFormat::Unorm) {
         return vk::Format::eA2B10G10R10UnormPack32;
     }
-    if (data_format == AmdGpu::DataFormat::Format2_10_10_10 &&
-        num_format == AmdGpu::NumberFormat::Snorm) {
-        return vk::Format::eA2B10G10R10SnormPack32;
-    }
     if (data_format == AmdGpu::DataFormat::FormatBc7 && num_format == AmdGpu::NumberFormat::Srgb) {
         return vk::Format::eBc7SrgbBlock;
     }
@@ -476,6 +472,14 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
         num_format == AmdGpu::NumberFormat::Snorm) {
         return vk::Format::eR16G16Snorm;
     }
+    if (data_format == AmdGpu::DataFormat::Format2_10_10_10 &&
+        num_format == AmdGpu::NumberFormat::Unorm) {
+        return vk::Format::eA2R10G10B10UnormPack32;
+    }
+    if (data_format == AmdGpu::DataFormat::Format2_10_10_10 &&
+        num_format == AmdGpu::NumberFormat::Snorm) {
+        return vk::Format::eA2R10G10B10SnormPack32;
+    }
     if (data_format == AmdGpu::DataFormat::Format10_11_11 &&
         num_format == AmdGpu::NumberFormat::Float) {
         return vk::Format::eB10G11R11UfloatPack32;

src/video_core/renderer_vulkan/vk_compute_pipeline.cpp

@@ -127,7 +127,7 @@ bool ComputePipeline::BindResources(VideoCore::BufferCache& buffer_cache,
         }
         const u32 size = vsharp.GetSize();
         if (desc.is_written) {
-            texture_cache.InvalidateMemory(address, size);
+            texture_cache.InvalidateMemory(address, size, true);
         }
         const u32 alignment =
             is_storage ? instance.StorageMinAlignment() : instance.UniformMinAlignment();
@@ -167,11 +167,11 @@ bool ComputePipeline::BindResources(VideoCore::BufferCache& buffer_cache,
                 }
             }
             if (desc.is_written) {
-                texture_cache.InvalidateMemory(address, size);
+                texture_cache.InvalidateMemory(address, size, true);
             }
             const u32 alignment = instance.TexelBufferMinAlignment();
             const auto [vk_buffer, offset] =
-                buffer_cache.ObtainBuffer(address, size, desc.is_written, true);
+                buffer_cache.ObtainBuffer(address, size, desc.is_written);
             const u32 fmt_stride = AmdGpu::NumBits(vsharp.GetDataFmt()) >> 3;
             ASSERT_MSG(fmt_stride == vsharp.GetStride(),
                        "Texel buffer stride must match format stride");

src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp

@@ -322,7 +322,7 @@ void GraphicsPipeline::BuildDescSetLayout() {
                 .descriptorType = tex_buffer.is_written ? vk::DescriptorType::eStorageTexelBuffer
                                                         : vk::DescriptorType::eUniformTexelBuffer,
                 .descriptorCount = 1,
-                .stageFlags = vk::ShaderStageFlagBits::eVertex | vk::ShaderStageFlagBits::eFragment,
+                .stageFlags = vk::ShaderStageFlagBits::eCompute,
             });
         }
         for (const auto& image : stage->images) {
@@ -412,7 +412,7 @@ void GraphicsPipeline::BindResources(const Liverpool::Regs& regs,
                 const u32 size = vsharp.GetSize();
                 const u32 alignment = instance.TexelBufferMinAlignment();
                 const auto [vk_buffer, offset] =
-                    buffer_cache.ObtainBuffer(address, size, tex_buffer.is_written, true);
+                    buffer_cache.ObtainBuffer(address, size, tex_buffer.is_written);
                 const u32 fmt_stride = AmdGpu::NumBits(vsharp.GetDataFmt()) >> 3;
                 ASSERT_MSG(fmt_stride == vsharp.GetStride(),
                            "Texel buffer stride must match format stride");
@@ -422,7 +422,7 @@ void GraphicsPipeline::BindResources(const Liverpool::Regs& regs,
                     ASSERT(adjust % fmt_stride == 0);
                     push_data.AddOffset(binding, adjust / fmt_stride);
                 }
-                buffer_view = vk_buffer->View(offset_aligned, size + adjust, tex_buffer.is_written,
+                buffer_view = vk_buffer->View(offset, size + adjust, tex_buffer.is_written,
                                               vsharp.GetDataFmt(), vsharp.GetNumberFmt());
             }
             set_writes.push_back({

src/video_core/renderer_vulkan/vk_instance.cpp

@@ -220,12 +220,12 @@ bool Instance::CreateDevice() {
     const bool maintenance5 = add_extension(VK_KHR_MAINTENANCE_5_EXTENSION_NAME);
     add_extension(VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME);
     add_extension(VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_EXTENSION_NAME);
+    const bool has_sync2 = add_extension(VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME);
 
-    if (Config::isMarkersEnabled()) {
+    if (has_sync2) {
-        const bool has_sync2 = add_extension(VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME);
+        has_nv_checkpoints = Config::isMarkersEnabled()
-        if (has_sync2) {
+                                 ? add_extension(VK_NV_DEVICE_DIAGNOSTIC_CHECKPOINTS_EXTENSION_NAME)
-            has_nv_checkpoints = add_extension(VK_NV_DEVICE_DIAGNOSTIC_CHECKPOINTS_EXTENSION_NAME);
+                                 : false;
-        }
     }
 
 #ifdef __APPLE__

src/video_core/renderer_vulkan/vk_pipeline_cache.cpp

@@ -38,9 +38,7 @@ const GraphicsPipeline* PipelineCache::GetGraphicsPipeline() {
         LOG_TRACE(Render_Vulkan, "FMask decompression pass skipped");
         return nullptr;
     }
-    if (!RefreshGraphicsKey()) {
+    RefreshGraphicsKey();
-        return nullptr;
-    }
     const auto [it, is_new] = graphics_pipelines.try_emplace(graphics_key);
     if (is_new) {
         it.value() = std::make_unique<GraphicsPipeline>(instance, scheduler, graphics_key,
@@ -51,9 +49,7 @@ const GraphicsPipeline* PipelineCache::GetGraphicsPipeline() {
 }
 
 const ComputePipeline* PipelineCache::GetComputePipeline() {
-    if (!RefreshComputeKey()) {
+    RefreshComputeKey();
-        return nullptr;
-    }
     const auto [it, is_new] = compute_pipelines.try_emplace(compute_key);
     if (is_new) {
         it.value() = std::make_unique<ComputePipeline>(instance, scheduler, *pipeline_cache,
@@ -63,16 +59,7 @@ const ComputePipeline* PipelineCache::GetComputePipeline() {
     return pipeline;
 }
 
-bool ShouldSkipShader(u64 shader_hash, const char* shader_type) {
+void PipelineCache::RefreshGraphicsKey() {
-    static constexpr std::array<u64, 0> skip_hashes = {};
-    if (std::ranges::contains(skip_hashes, shader_hash)) {
-        LOG_WARNING(Render_Vulkan, "Skipped {} shader hash {:#x}.", shader_type, shader_hash);
-        return true;
-    }
-    return false;
-}
-
-bool PipelineCache::RefreshGraphicsKey() {
     auto& regs = liverpool->regs;
     auto& key = graphics_key;
 
@@ -173,26 +160,18 @@ bool PipelineCache::RefreshGraphicsKey() {
             infos[i] = nullptr;
             continue;
         }
-        if (ShouldSkipShader(bininfo->shader_hash, "graphics")) {
-            return false;
-        }
         const auto stage = Shader::Stage{i};
         const GuestProgram guest_pgm{pgm, stage};
         std::tie(infos[i], modules[i], key.stage_hashes[i]) =
             shader_cache->GetProgram(guest_pgm, binding);
     }
-    return true;
 }
 
-bool PipelineCache::RefreshComputeKey() {
+void PipelineCache::RefreshComputeKey() {
     u32 binding{};
     const auto* cs_pgm = &liverpool->regs.cs_program;
     const GuestProgram guest_pgm{cs_pgm, Shader::Stage::Compute};
-    if (ShouldSkipShader(guest_pgm.hash, "compute")) {
-        return false;
-    }
     std::tie(infos[0], modules[0], compute_key) = shader_cache->GetProgram(guest_pgm, binding);
-    return true;
 }
 
 } // namespace Vulkan

src/video_core/renderer_vulkan/vk_pipeline_cache.h

@@ -30,8 +30,8 @@ public:
     const ComputePipeline* GetComputePipeline();
 
 private:
-    bool RefreshGraphicsKey();
+    void RefreshGraphicsKey();
-    bool RefreshComputeKey();
+    void RefreshComputeKey();
 
 private:
     const Instance& instance;

src/video_core/renderer_vulkan/vk_rasterizer.cpp

@@ -29,19 +29,6 @@ Rasterizer::Rasterizer(const Instance& instance_, Scheduler& scheduler_,
 
 Rasterizer::~Rasterizer() = default;
 
-void Rasterizer::CpSync() {
-    scheduler.EndRendering();
-    auto cmdbuf = scheduler.CommandBuffer();
-
-    const vk::MemoryBarrier ib_barrier{
-        .srcAccessMask = vk::AccessFlagBits::eShaderWrite,
-        .dstAccessMask = vk::AccessFlagBits::eIndirectCommandRead,
-    };
-    cmdbuf.pipelineBarrier(vk::PipelineStageFlagBits::eComputeShader,
-                           vk::PipelineStageFlagBits::eDrawIndirect,
-                           vk::DependencyFlagBits::eByRegion, ib_barrier, {}, {});
-}
-
 void Rasterizer::Draw(bool is_indexed, u32 index_offset) {
     RENDERER_TRACE;
 
@@ -79,45 +66,6 @@ void Rasterizer::Draw(bool is_indexed, u32 index_offset) {
     }
 }
 
-void Rasterizer::DrawIndirect(bool is_indexed, VAddr address, u32 offset, u32 size) {
-    RENDERER_TRACE;
-
-    const auto cmdbuf = scheduler.CommandBuffer();
-    const auto& regs = liverpool->regs;
-    const GraphicsPipeline* pipeline = pipeline_cache.GetGraphicsPipeline();
-    if (!pipeline) {
-        return;
-    }
-
-    ASSERT_MSG(regs.primitive_type != AmdGpu::Liverpool::PrimitiveType::RectList,
-               "Unsupported primitive type for indirect draw");
-
-    try {
-        pipeline->BindResources(regs, buffer_cache, texture_cache);
-    } catch (...) {
-        UNREACHABLE();
-    }
-
-    const auto& vs_info = pipeline->GetStage(Shader::Stage::Vertex);
-    buffer_cache.BindVertexBuffers(vs_info);
-    const u32 num_indices = buffer_cache.BindIndexBuffer(is_indexed, 0);
-
-    BeginRendering();
-    UpdateDynamicState(*pipeline);
-
-    const auto [buffer, base] = buffer_cache.ObtainBuffer(address, size, true);
-    const auto total_offset = base + offset;
-
-    // We can safely ignore both SGPR UD indices and results of fetch shader parsing, as vertex and
-    // instance offsets will be automatically applied by Vulkan from indirect args buffer.
-
-    if (is_indexed) {
-        cmdbuf.drawIndexedIndirect(buffer->Handle(), total_offset, 1, 0);
-    } else {
-        cmdbuf.drawIndirect(buffer->Handle(), total_offset, 1, 0);
-    }
-}
-
 void Rasterizer::DispatchDirect() {
     RENDERER_TRACE;
 
@@ -165,6 +113,19 @@ void Rasterizer::DispatchIndirect(VAddr address, u32 offset, u32 size) {
     cmdbuf.bindPipeline(vk::PipelineBindPoint::eCompute, pipeline->Handle());
     const auto [buffer, base] = buffer_cache.ObtainBuffer(address, size, true);
     const auto total_offset = base + offset;
+
+    // Emulate PFP-to-ME sync packet
+    const vk::BufferMemoryBarrier ib_barrier{
+        .srcAccessMask = vk::AccessFlagBits::eShaderWrite,
+        .dstAccessMask = vk::AccessFlagBits::eIndirectCommandRead,
+        .buffer = buffer->Handle(),
+        .offset = total_offset,
+        .size = size,
+    };
+    cmdbuf.pipelineBarrier(vk::PipelineStageFlagBits::eComputeShader,
+                           vk::PipelineStageFlagBits::eDrawIndirect,
+                           vk::DependencyFlagBits::eByRegion, {}, ib_barrier, {});
+
     cmdbuf.dispatchIndirect(buffer->Handle(), total_offset);
 }
 

src/video_core/renderer_vulkan/vk_rasterizer.h

@@ -32,7 +32,6 @@ public:
     }
 
     void Draw(bool is_indexed, u32 index_offset = 0);
-    void DrawIndirect(bool is_indexed, VAddr address, u32 offset, u32 size);
 
     void DispatchDirect();
     void DispatchIndirect(VAddr address, u32 offset, u32 size);
@@ -46,7 +45,6 @@ public:
     void MapMemory(VAddr addr, u64 size);
     void UnmapMemory(VAddr addr, u64 size);
 
-    void CpSync();
     u64 Flush();
 
 private:

src/video_core/renderer_vulkan/vk_shader_cache.cpp

@@ -107,7 +107,7 @@ Shader::Info MakeShaderInfo(const GuestProgram& pgm, const AmdGpu::Liverpool::Re
 ShaderCache::ShaderCache(const Instance& instance_, AmdGpu::Liverpool* liverpool_)
     : instance{instance_}, liverpool{liverpool_}, inst_pool{8192}, block_pool{512} {
     profile = Shader::Profile{
-        .supported_spirv = instance.ApiVersion() >= VK_API_VERSION_1_3 ? 0x00010600U : 0x00010500U,
+        .supported_spirv = 0x00010600U,
         .subgroup_size = instance.SubgroupSize(),
         .support_explicit_workgroup_layout = true,
     };

src/video_core/texture_cache/texture_cache.cpp

@@ -34,10 +34,10 @@ TextureCache::TextureCache(const Vulkan::Instance& instance_, Vulkan::Scheduler&
 
 TextureCache::~TextureCache() = default;
 
-void TextureCache::InvalidateMemory(VAddr address, size_t size) {
+void TextureCache::InvalidateMemory(VAddr address, size_t size, bool from_compute) {
     std::unique_lock lock{mutex};
     ForEachImageInRegion(address, size, [&](ImageId image_id, Image& image) {
-        if (!image.Overlaps(address, size)) {
+        if (from_compute && !image.Overlaps(address, size)) {
             return;
         }
         // Ensure image is reuploaded when accessed again.

src/video_core/texture_cache/texture_cache.h

@@ -38,7 +38,7 @@ public:
     ~TextureCache();
 
     /// Invalidates any image in the logical page range.
-    void InvalidateMemory(VAddr address, size_t size);
+    void InvalidateMemory(VAddr address, size_t size, bool from_compute = false);
 
     /// Evicts any images that overlap the unmapped range.
     void UnmapMemory(VAddr cpu_addr, size_t size);