''

2024-08-05 01:06:40 -04:00 · 2024-08-05 01:06:40 -04:00 · d9da4a9d2b
parent c6c679ca0c cdff4af38d
commit d9da4a9d2b
158 changed files with 4404 additions and 1662 deletions
--- a/.github/shadps4.png
+++ b/.github/shadps4.png
--- a/.github/workflows/windows-qt.yml
+++ b/.github/workflows/windows-qt.yml
@ -28,8 +28,11 @@ jobs:
    - name: Setup Qt
      uses: jurplel/install-qt-action@v4
      with:
        arch: win64_msvc2019_64
        version: 6.7.2
        host: windows
        target: desktop
        arch: win64_msvc2019_64
        archives: qtbase
    - name: Configure CMake
      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
--- a/.gitignore
+++ b/.gitignore
@ -408,3 +408,4 @@ FodyWeavers.xsd
 /emulator/eboot.bin
 /out/*
 /third-party/out/*
 /src/common/scm_rev.cpp
--- a/.reuse/dep5
+++ b/.reuse/dep5
@ -14,8 +14,6 @@ Files: CMakeSettings.json
       documents/Screenshots/Sonic Mania.png
       documents/Screenshots/Undertale.png
       documents/Screenshots/We are DOOMED.png
       externals/stb_image.h
       externals/tracy/*
       scripts/ps4_names.txt
       src/images/controller_icon.png
       src/images/exit_icon.png
@ -36,9 +34,26 @@ Files: CMakeSettings.json
       src/images/refresh_icon.png
       src/images/settings_icon.png
       src/images/stop_icon.png
       src/images/shadPS4.icns
       src/images/shadps4.ico
       src/images/themes_icon.png
       src/shadps4.qrc
       src/shadps4.rc
 Copyright: shadPS4 Emulator Project
 License: GPL-2.0-or-later
 Files: externals/cmake-modules/*
 Copyright: 2009-2010 Iowa State University
 License: BSL-1.0
 Files: externals/renderdoc/*
 Copyright: 2019-2024 Baldur Karlsson
 License: MIT
 Files: externals/stb_image.h
 Copyright: 2017 Sean Barrett
 License: MIT
 Files: externals/tracy/*
 Copyright: 2017-2024 Bartosz Taudul <wolf@nereid.pl>
 License: BSD-3-Clause
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -19,12 +19,11 @@ project(shadPS4)
 option(ENABLE_QT_GUI "Enable the Qt GUI. If not selected then the emulator uses a minimal SDL-based UI instead" OFF)
-# This function should be passed a list of all files in a target. It will automatically generate
+# This function should be passed a list of all files in a target. It will automatically generate file groups
-# file groups following the directory hierarchy, so that the layout of the files in IDEs matches the
+# following the directory hierarchy, so that the layout of the files in IDEs matches the one in the filesystem.
 # one in the filesystem.
 function(create_target_directory_groups target_name)
-    # Place any files that aren't in the source list in a separate group so that they don't get in
+
-    # the way.
+    # Place any files that aren't in the source list in a separate group so that they don't get in the way.
    source_group("Other Files" REGULAR_EXPRESSION ".")
    get_target_property(target_sources "${target_name}" SOURCES)
@ -39,14 +38,6 @@ endfunction()
 # Setup a custom clang-format target (if clang-format can be found) that will run
 # against all the src files. This should be used before making a pull request.
 # =======================================================================
 set(CLANG_FORMAT_POSTFIX "-17")
 find_program(CLANG_FORMAT
    NAMES clang-format${CLANG_FORMAT_POSTFIX}
          clang-format
    PATHS ${PROJECT_BINARY_DIR}/externals)
 if (CLANG_FORMAT)
    set(SRCS ${PROJECT_SOURCE_DIR}/src)
    set(CCOMMENT "Running clang format against all the .h and .cpp files in src/")
@ -65,6 +56,15 @@ endif()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 # generate git revision information
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules/")
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REF_SPEC GIT_REV)
 git_describe(GIT_DESC --always --long --dirty)
 git_branch_name(GIT_BRANCH)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/common/scm_rev.cpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/src/common/scm_rev.cpp" @ONLY)
 find_package(Boost 1.84.0 CONFIG)
 find_package(cryptopp 8.9.0 MODULE)
 find_package(fmt 10.2.1 CONFIG)
@ -79,17 +79,22 @@ find_package(xbyak 7.07 CONFIG)
 find_package(xxHash 0.8.2 MODULE)
 find_package(zlib-ng 2.2.0 MODULE)
 find_package(Zydis 4.1.0 CONFIG)
 find_package(RenderDoc MODULE)
 if (APPLE)
    find_package(date 3.0.1 CONFIG)
 endif()
 # Note: Windows always has these functions through winpthreads
 include(CheckSymbolExists)
 check_symbol_exists(pthread_mutex_timedlock "pthread.h" HAVE_PTHREAD_MUTEX_TIMEDLOCK)
 # Windows always has the function through winpthreads
 if(HAVE_PTHREAD_MUTEX_TIMEDLOCK OR WIN32)
    add_compile_options(-DHAVE_PTHREAD_MUTEX_TIMEDLOCK)
 endif()
 check_symbol_exists(sem_timedwait "semaphore.h" HAVE_SEM_TIMEDWAIT)
 if(HAVE_SEM_TIMEDWAIT OR WIN32)
    add_compile_options(-DHAVE_SEM_TIMEDWAIT)
 endif()
 add_subdirectory(externals)
 include_directories(src)
@ -226,6 +231,10 @@ set(PLAYGO_LIB src/core/libraries/playgo/playgo.cpp
               src/core/libraries/playgo/playgo_types.h
 )
 set(RANDOM_LIB src/core/libraries/random/random.cpp
               src/core/libraries/random/random.h
 )
 set(USBD_LIB src/core/libraries/usbd/usbd.cpp
             src/core/libraries/usbd/usbd.h
 )
@ -288,6 +297,8 @@ set(COMMON src/common/logging/backend.cpp
           src/common/version.h
           src/common/ntapi.h
           src/common/ntapi.cpp
           src/common/scm_rev.cpp
           src/common/scm_rev.h
 )
 set(CORE src/core/aerolib/stubs.cpp
@ -308,6 +319,8 @@ set(CORE src/core/aerolib/stubs.cpp
         src/core/file_format/pkg_type.h
         src/core/file_format/psf.cpp
         src/core/file_format/psf.h
         src/core/file_format/playgo_chunk.cpp
         src/core/file_format/playgo_chunk.h
         src/core/file_format/trp.cpp
         src/core/file_format/trp.h
         src/core/file_format/splash.h
@ -336,6 +349,7 @@ set(CORE src/core/aerolib/stubs.cpp
         ${NP_LIBS}
         ${PNG_LIB}
         ${PLAYGO_LIB}
         ${RANDOM_LIB}
         ${USBD_LIB}
         ${MISC_LIBS}
         ${DIALOGS_LIB}
@ -482,6 +496,8 @@ set(VIDEO_CORE src/video_core/amdgpu/liverpool.cpp
               src/video_core/texture_cache/tile_manager.cpp
               src/video_core/texture_cache/tile_manager.h
               src/video_core/texture_cache/types.h
               src/video_core/renderdoc.cpp
               src/video_core/renderdoc.h
 )
 set(INPUT src/input/controller.cpp
@ -494,7 +510,7 @@ set(EMULATOR src/emulator.cpp
             src/sdl_window.cpp
 )
-# the above is shared in sdl and qt version (TODO share them all)
+# The above is shared in SDL and Qt version (TODO share them all)
 if(ENABLE_QT_GUI)
 qt_add_resources(RESOURCE_FILES src/shadps4.qrc)
@ -537,6 +553,7 @@ if (ENABLE_QT_GUI)
        ${SHADER_RECOMPILER}
        ${VIDEO_CORE}
        ${EMULATOR}
        src/images/shadPS4.icns
    )
 else()
    add_executable(shadps4
@ -557,7 +574,7 @@ endif()
 create_target_directory_groups(shadps4)
-target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient)
+target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient RenderDoc::API)
 target_link_libraries(shadps4 PRIVATE Boost::headers GPUOpen::VulkanMemoryAllocator sirit Vulkan::Headers xxHash::xxhash Zydis::Zydis glslang::SPIRV glslang::glslang SDL3::SDL3)
 if (APPLE)
@ -624,5 +641,9 @@ target_include_directories(shadps4 PRIVATE ${HOST_SHADERS_INCLUDE})
 if (ENABLE_QT_GUI)
    set_target_properties(shadps4 PROPERTIES
 #       WIN32_EXECUTABLE ON
-        MACOSX_BUNDLE ON)
+        MACOSX_BUNDLE ON
        MACOSX_BUNDLE_ICON_FILE shadPS4.icns)
    set_source_files_properties(src/images/shadPS4.icns PROPERTIES
        MACOSX_PACKAGE_LOCATION Resources)
 endif()
--- a/LICENSES/BSL-1.0.txt
+++ b/LICENSES/BSL-1.0.txt
@ -0,0 +1,7 @@
 Boost Software License - Version 1.0 - August 17th, 2003
 Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following:
 The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/README.md
+++ b/README.md
@ -34,7 +34,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
 # shadPS4
-shadPS4 is an early PS4 emulator for Windows and Linux written in C++
+shadPS4 is an early **PlayStation 4** emulator for **Windows**, **Linux** and **macOS** written in C++
 If you encounter problems or have doubts, do not hesitate to look at the [**Quickstart**](https://github.com/shadps4-emu/shadPS4/blob/main/documents/Quickstart/Quickstart.md).
@ -42,13 +42,13 @@ To verify that a game works, you can look at [**shadPS4 Game Compatibility**](ht
 To discuss shadPS4 development or suggest ideas, join the [**Discord server**](https://discord.gg/MyZRaBngxA).
-Check us on [**X (twitter)**](https://x.com/shadps4) or on our [**website**](https://shadps4.net/).
+To get the latest news, go to our [**X (twitter)**](https://x.com/shadps4) or our [**website**](https://shadps4.net/).
 # Status
 In development, small games are working like [**Sonic Mania**](https://www.youtube.com/watch?v=AAHoNzhHyCU), [**Undertale**](https://youtu.be/5zIvdy65Ro4), [**Dysmantle**](https://youtu.be/b9xzhLBdESE) and others...
-# Why?
+# Why
 The project started as a fun project. Due to limited free time, it will probably take a while before shadPS4 is able to run anything decent, but we're trying to make small, regular commits.
@ -64,20 +64,37 @@ Check the build instructions for [**Linux**](https://github.com/shadps4-emu/shad
 ## Build status
-|Windows|Build status|
+<details>
-|--------|------------|
+<summary><b>Windows</b></summary>
 | Windows | Build status |
 |--------|--------|
 |Windows SDL Build|[![Windows-sdl](https://github.com/shadps4-emu/shadPS4/actions/workflows/windows.yml/badge.svg)](https://github.com/shadps4-emu/shadPS4/actions/workflows/windows.yml)
 |Windows Qt Build|[![Windows-qt](https://github.com/shadps4-emu/shadPS4/actions/workflows/windows-qt.yml/badge.svg)](https://github.com/shadps4-emu/shadPS4/actions/workflows/windows-qt.yml)
 </details>
-|Linux|Build status|
+<details>
-|--------|------------|
+<summary><b>Linux</b></summary>
 | Linux | Build status |
 |--------|--------|
 |Linux SDL Build|[![Linux-sdl](https://github.com/shadps4-emu/shadPS4/actions/workflows/linux.yml/badge.svg)](https://github.com/shadps4-emu/shadPS4/actions/workflows/linux.yml)
 |Linux Qt Build|[![Linux-qt](https://github.com/shadps4-emu/shadPS4/actions/workflows/linux-qt.yml/badge.svg)](https://github.com/shadps4-emu/shadPS4/actions/workflows/linux-qt.yml)
 </details>
 <details>
 <summary><b>macOS</b></summary>
 | macOS | Build status |
 |--------|--------|
 |macOS SDL Build|[![macOS-sdl](https://github.com/shadps4-emu/shadPS4/actions/workflows/macos.yml/badge.svg)](https://github.com/shadps4-emu/shadPS4/actions/workflows/macos.yml)
 |macOS Qt Build|[![macOS-qt](https://github.com/shadps4-emu/shadPS4/actions/workflows/macos-qt.yml/badge.svg)](https://github.com/shadps4-emu/shadPS4/actions/workflows/macos-qt.yml)
 </details>
 # Keyboard Mapping
 | Controller button | Keyboard |
-| ------------- | ------------- |
+|-------------|-------------|
 LEFT AXIS UP | W |
 LEFT AXIS DOWN | S |
 LEFT AXIS LEFT | A |
@ -123,7 +140,7 @@ Open a PR and we'll check it :)
 # Contributors
 <a href="https://github.com/shadps4-emu/shadPS4/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=shadps4-emu/shadPS4&max=15" />
+  <img src="https://contrib.rocks/image?repo=shadps4-emu/shadPS4&max=15">
 </a>
 # Sister Projects
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@ -74,6 +74,13 @@ if (NOT TARGET GPUOpen::VulkanMemoryAllocator)
    add_subdirectory(vma)
 endif()
 # RenderDoc
 if (NOT TARGET RenderDoc::API)
    add_library(renderdoc INTERFACE)
    target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc)
    add_library(RenderDoc::API ALIAS renderdoc)
 endif()
 # glslang
 if (NOT TARGET glslang::glslang)
    set(SKIP_GLSLANG_INSTALL ON CACHE BOOL "")
--- a/externals/cmake-modules/GetGitRevisionDescription.cmake
+++ b/externals/cmake-modules/GetGitRevisionDescription.cmake
@ -0,0 +1,158 @@
 # - Returns a version string from Git
 #
 # These functions force a re-configure on each git commit so that you can
 # trust the values of the variables in your build system.
 #
 #  get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
 #
 # Returns the refspec and sha hash of the current head revision
 #
 #  git_describe(<var> [<additional arguments to git describe> ...])
 #
 # Returns the results of git describe on the source tree, and adjusting
 # the output so that it tests false if an error occurs.
 #
 #  git_get_exact_tag(<var> [<additional arguments to git describe> ...])
 #
 # Returns the results of git describe --exact-match on the source tree,
 # and adjusting the output so that it tests false if there was no exact
 # matching tag.
 #
 # Requires CMake 2.6 or newer (uses the 'function' command)
 #
 # Original Author:
 # 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
 # http://academic.cleardefinition.com
 # Iowa State University HCI Graduate Program/VRAC
 #
 # Copyright Iowa State University 2009-2010.
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 if(__get_git_revision_description)
 	return()
 endif()
 set(__get_git_revision_description YES)
 # We must run the following at "include" time, not at function call time,
 # to find the path to this module rather than the path to a calling list file
 get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
 function(get_git_head_revision _refspecvar _hashvar)
 	set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 	set(GIT_DIR "${GIT_PARENT_DIR}/.git")
 	while(NOT EXISTS "${GIT_DIR}")	# .git dir not found, search parent directories
 		set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
 		get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
 		if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
 			# We have reached the root directory, we are not in git
 			set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
 			set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
 			return()
 		endif()
 		set(GIT_DIR "${GIT_PARENT_DIR}/.git")
 	endwhile()
 	# check if this is a submodule
 	if(NOT IS_DIRECTORY ${GIT_DIR})
 		file(READ ${GIT_DIR} submodule)
 		string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
 		get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
 		get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
 	endif()
 	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
 	if(NOT EXISTS "${GIT_DATA}")
 		file(MAKE_DIRECTORY "${GIT_DATA}")
 	endif()
 	if(NOT EXISTS "${GIT_DIR}/HEAD")
 		return()
 	endif()
 	set(HEAD_FILE "${GIT_DATA}/HEAD")
 	configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
 	configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
 		"${GIT_DATA}/grabRef.cmake"
 		@ONLY)
 	include("${GIT_DATA}/grabRef.cmake")
 	set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
 	set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
 endfunction()
 function(git_branch_name _var)
 	if(NOT GIT_FOUND)
 		find_package(Git QUIET)
 	endif()
 	if(NOT GIT_FOUND)
 		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
 		return()
 	endif()
 	execute_process(COMMAND
 		"${GIT_EXECUTABLE}"
 		rev-parse --abbrev-ref HEAD
 		WORKING_DIRECTORY
 		"${CMAKE_SOURCE_DIR}"
 		RESULT_VARIABLE
 		res
 		OUTPUT_VARIABLE
 		out
 		ERROR_QUIET
 		OUTPUT_STRIP_TRAILING_WHITESPACE)
 	if(NOT res EQUAL 0)
 		set(out "${out}-${res}-NOTFOUND")
 	endif()
 	set(${_var} "${out}" PARENT_SCOPE)
 endfunction()
 function(git_describe _var)
 	if(NOT GIT_FOUND)
 		find_package(Git QUIET)
 	endif()
 	#get_git_head_revision(refspec hash)
 	if(NOT GIT_FOUND)
 		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
 		return()
 	endif()
 	#if(NOT hash)
 	#	set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
 	#	return()
 	#endif()
 	# TODO sanitize
 	#if((${ARGN}" MATCHES "&&") OR
 	#	(ARGN MATCHES "||") OR
 	#	(ARGN MATCHES "\\;"))
 	#	message("Please report the following error to the project!")
 	#	message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
 	#endif()
 	#message(STATUS "Arguments to execute_process: ${ARGN}")
 	execute_process(COMMAND
 		"${GIT_EXECUTABLE}"
 		describe
 		${hash}
 		${ARGN}
 		WORKING_DIRECTORY
 		"${CMAKE_SOURCE_DIR}"
 		RESULT_VARIABLE
 		res
 		OUTPUT_VARIABLE
 		out
 		ERROR_QUIET
 		OUTPUT_STRIP_TRAILING_WHITESPACE)
 	if(NOT res EQUAL 0)
 		set(out "${out}-${res}-NOTFOUND")
 	endif()
 	set(${_var} "${out}" PARENT_SCOPE)
 endfunction()
 function(git_get_exact_tag _var)
 	git_describe(out --exact-match ${ARGN})
 	set(${_var} "${out}" PARENT_SCOPE)
 endfunction()
--- a/externals/cmake-modules/GetGitRevisionDescription.cmake.in
+++ b/externals/cmake-modules/GetGitRevisionDescription.cmake.in
@ -0,0 +1,42 @@
 # 
 # Internal file for GetGitRevisionDescription.cmake
 #
 # Requires CMake 2.6 or newer (uses the 'function' command)
 #
 # Original Author:
 # 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
 # http://academic.cleardefinition.com
 # Iowa State University HCI Graduate Program/VRAC
 #
 # Copyright Iowa State University 2009-2010.
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 set(HEAD_HASH)
 file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
 string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
 if(HEAD_CONTENTS MATCHES "ref")
 	# named branch
 	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
 	if(EXISTS "@GIT_DIR@/${HEAD_REF}")
 		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
 	elseif(EXISTS "@GIT_DIR@/logs/${HEAD_REF}")
 		configure_file("@GIT_DIR@/logs/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
 		set(HEAD_HASH "${HEAD_REF}")
 	endif()
 else()
 	# detached HEAD
 	configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
 endif()
 if(NOT HEAD_HASH)
 	if(EXISTS "@GIT_DATA@/head-ref")
 		file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
 		string(STRIP "${HEAD_HASH}" HEAD_HASH)
 	else()
 		set(HEAD_HASH "Unknown")
 	endif()
 endif()
--- a/externals/renderdoc/renderdoc_app.h
+++ b/externals/renderdoc/renderdoc_app.h
@ -0,0 +1,741 @@
 /******************************************************************************
 * The MIT License (MIT)
 *
 * Copyright (c) 2019-2024 Baldur Karlsson
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
 #pragma once
 //////////////////////////////////////////////////////////////////////////////////////////////////
 //
 // Documentation for the API is available at https://renderdoc.org/docs/in_application_api.html
 //
 #if !defined(RENDERDOC_NO_STDINT)
 #include <stdint.h>
 #endif
 #if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
 #define RENDERDOC_CC __cdecl
 #elif defined(__linux__) || defined(__FreeBSD__)
 #define RENDERDOC_CC
 #elif defined(__APPLE__)
 #define RENDERDOC_CC
 #else
 #error "Unknown platform"
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif
 //////////////////////////////////////////////////////////////////////////////////////////////////
 // Constants not used directly in below API
 // This is a GUID/magic value used for when applications pass a path where shader debug
 // information can be found to match up with a stripped shader.
 // the define can be used like so: const GUID RENDERDOC_ShaderDebugMagicValue =
 // RENDERDOC_ShaderDebugMagicValue_value
 #define RENDERDOC_ShaderDebugMagicValue_struct                                \
  {                                                                           \
    0xeab25520, 0x6670, 0x4865, 0x84, 0x29, 0x6c, 0x8, 0x51, 0x54, 0x00, 0xff \
  }
 // as an alternative when you want a byte array (assuming x86 endianness):
 #define RENDERDOC_ShaderDebugMagicValue_bytearray                                                 \
  {                                                                                               \
    0x20, 0x55, 0xb2, 0xea, 0x70, 0x66, 0x65, 0x48, 0x84, 0x29, 0x6c, 0x8, 0x51, 0x54, 0x00, 0xff \
  }
 // truncated version when only a uint64_t is available (e.g. Vulkan tags):
 #define RENDERDOC_ShaderDebugMagicValue_truncated 0x48656670eab25520ULL
 //////////////////////////////////////////////////////////////////////////////////////////////////
 // RenderDoc capture options
 //
 typedef enum RENDERDOC_CaptureOption
 {
  // Allow the application to enable vsync
  //
  // Default - enabled
  //
  // 1 - The application can enable or disable vsync at will
  // 0 - vsync is force disabled
  eRENDERDOC_Option_AllowVSync = 0,
  // Allow the application to enable fullscreen
  //
  // Default - enabled
  //
  // 1 - The application can enable or disable fullscreen at will
  // 0 - fullscreen is force disabled
  eRENDERDOC_Option_AllowFullscreen = 1,
  // Record API debugging events and messages
  //
  // Default - disabled
  //
  // 1 - Enable built-in API debugging features and records the results into
  //     the capture, which is matched up with events on replay
  // 0 - no API debugging is forcibly enabled
  eRENDERDOC_Option_APIValidation = 2,
  eRENDERDOC_Option_DebugDeviceMode = 2,    // deprecated name of this enum
  // Capture CPU callstacks for API events
  //
  // Default - disabled
  //
  // 1 - Enables capturing of callstacks
  // 0 - no callstacks are captured
  eRENDERDOC_Option_CaptureCallstacks = 3,
  // When capturing CPU callstacks, only capture them from actions.
  // This option does nothing without the above option being enabled
  //
  // Default - disabled
  //
  // 1 - Only captures callstacks for actions.
  //     Ignored if CaptureCallstacks is disabled
  // 0 - Callstacks, if enabled, are captured for every event.
  eRENDERDOC_Option_CaptureCallstacksOnlyDraws = 4,
  eRENDERDOC_Option_CaptureCallstacksOnlyActions = 4,
  // Specify a delay in seconds to wait for a debugger to attach, after
  // creating or injecting into a process, before continuing to allow it to run.
  //
  // 0 indicates no delay, and the process will run immediately after injection
  //
  // Default - 0 seconds
  //
  eRENDERDOC_Option_DelayForDebugger = 5,
  // Verify buffer access. This includes checking the memory returned by a Map() call to
  // detect any out-of-bounds modification, as well as initialising buffers with undefined contents
  // to a marker value to catch use of uninitialised memory.
  //
  // NOTE: This option is only valid for OpenGL and D3D11. Explicit APIs such as D3D12 and Vulkan do
  // not do the same kind of interception & checking and undefined contents are really undefined.
  //
  // Default - disabled
  //
  // 1 - Verify buffer access
  // 0 - No verification is performed, and overwriting bounds may cause crashes or corruption in
  //     RenderDoc.
  eRENDERDOC_Option_VerifyBufferAccess = 6,
  // The old name for eRENDERDOC_Option_VerifyBufferAccess was eRENDERDOC_Option_VerifyMapWrites.
  // This option now controls the filling of uninitialised buffers with 0xdddddddd which was
  // previously always enabled
  eRENDERDOC_Option_VerifyMapWrites = eRENDERDOC_Option_VerifyBufferAccess,
  // Hooks any system API calls that create child processes, and injects
  // RenderDoc into them recursively with the same options.
  //
  // Default - disabled
  //
  // 1 - Hooks into spawned child processes
  // 0 - Child processes are not hooked by RenderDoc
  eRENDERDOC_Option_HookIntoChildren = 7,
  // By default RenderDoc only includes resources in the final capture necessary
  // for that frame, this allows you to override that behaviour.
  //
  // Default - disabled
  //
  // 1 - all live resources at the time of capture are included in the capture
  //     and available for inspection
  // 0 - only the resources referenced by the captured frame are included
  eRENDERDOC_Option_RefAllResources = 8,
  // **NOTE**: As of RenderDoc v1.1 this option has been deprecated. Setting or
  // getting it will be ignored, to allow compatibility with older versions.
  // In v1.1 the option acts as if it's always enabled.
  //
  // By default RenderDoc skips saving initial states for resources where the
  // previous contents don't appear to be used, assuming that writes before
  // reads indicate previous contents aren't used.
  //
  // Default - disabled
  //
  // 1 - initial contents at the start of each captured frame are saved, even if
  //     they are later overwritten or cleared before being used.
  // 0 - unless a read is detected, initial contents will not be saved and will
  //     appear as black or empty data.
  eRENDERDOC_Option_SaveAllInitials = 9,
  // In APIs that allow for the recording of command lists to be replayed later,
  // RenderDoc may choose to not capture command lists before a frame capture is
  // triggered, to reduce overheads. This means any command lists recorded once
  // and replayed many times will not be available and may cause a failure to
  // capture.
  //
  // NOTE: This is only true for APIs where multithreading is difficult or
  // discouraged. Newer APIs like Vulkan and D3D12 will ignore this option
  // and always capture all command lists since the API is heavily oriented
  // around it and the overheads have been reduced by API design.
  //
  // 1 - All command lists are captured from the start of the application
  // 0 - Command lists are only captured if their recording begins during
  //     the period when a frame capture is in progress.
  eRENDERDOC_Option_CaptureAllCmdLists = 10,
  // Mute API debugging output when the API validation mode option is enabled
  //
  // Default - enabled
  //
  // 1 - Mute any API debug messages from being displayed or passed through
  // 0 - API debugging is displayed as normal
  eRENDERDOC_Option_DebugOutputMute = 11,
  // Option to allow vendor extensions to be used even when they may be
  // incompatible with RenderDoc and cause corrupted replays or crashes.
  //
  // Default - inactive
  //
  // No values are documented, this option should only be used when absolutely
  // necessary as directed by a RenderDoc developer.
  eRENDERDOC_Option_AllowUnsupportedVendorExtensions = 12,
  // Define a soft memory limit which some APIs may aim to keep overhead under where
  // possible. Anything above this limit will where possible be saved directly to disk during
  // capture.
  // This will cause increased disk space use (which may cause a capture to fail if disk space is
  // exhausted) as well as slower capture times.
  //
  // Not all memory allocations may be deferred like this so it is not a guarantee of a memory
  // limit.
  //
  // Units are in MBs, suggested values would range from 200MB to 1000MB.
  //
  // Default - 0 Megabytes
  eRENDERDOC_Option_SoftMemoryLimit = 13,
 } RENDERDOC_CaptureOption;
 // Sets an option that controls how RenderDoc behaves on capture.
 //
 // Returns 1 if the option and value are valid
 // Returns 0 if either is invalid and the option is unchanged
 typedef int(RENDERDOC_CC *pRENDERDOC_SetCaptureOptionU32)(RENDERDOC_CaptureOption opt, uint32_t val);
 typedef int(RENDERDOC_CC *pRENDERDOC_SetCaptureOptionF32)(RENDERDOC_CaptureOption opt, float val);
 // Gets the current value of an option as a uint32_t
 //
 // If the option is invalid, 0xffffffff is returned
 typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetCaptureOptionU32)(RENDERDOC_CaptureOption opt);
 // Gets the current value of an option as a float
 //
 // If the option is invalid, -FLT_MAX is returned
 typedef float(RENDERDOC_CC *pRENDERDOC_GetCaptureOptionF32)(RENDERDOC_CaptureOption opt);
 typedef enum RENDERDOC_InputButton
 {
  // '0' - '9' matches ASCII values
  eRENDERDOC_Key_0 = 0x30,
  eRENDERDOC_Key_1 = 0x31,
  eRENDERDOC_Key_2 = 0x32,
  eRENDERDOC_Key_3 = 0x33,
  eRENDERDOC_Key_4 = 0x34,
  eRENDERDOC_Key_5 = 0x35,
  eRENDERDOC_Key_6 = 0x36,
  eRENDERDOC_Key_7 = 0x37,
  eRENDERDOC_Key_8 = 0x38,
  eRENDERDOC_Key_9 = 0x39,
  // 'A' - 'Z' matches ASCII values
  eRENDERDOC_Key_A = 0x41,
  eRENDERDOC_Key_B = 0x42,
  eRENDERDOC_Key_C = 0x43,
  eRENDERDOC_Key_D = 0x44,
  eRENDERDOC_Key_E = 0x45,
  eRENDERDOC_Key_F = 0x46,
  eRENDERDOC_Key_G = 0x47,
  eRENDERDOC_Key_H = 0x48,
  eRENDERDOC_Key_I = 0x49,
  eRENDERDOC_Key_J = 0x4A,
  eRENDERDOC_Key_K = 0x4B,
  eRENDERDOC_Key_L = 0x4C,
  eRENDERDOC_Key_M = 0x4D,
  eRENDERDOC_Key_N = 0x4E,
  eRENDERDOC_Key_O = 0x4F,
  eRENDERDOC_Key_P = 0x50,
  eRENDERDOC_Key_Q = 0x51,
  eRENDERDOC_Key_R = 0x52,
  eRENDERDOC_Key_S = 0x53,
  eRENDERDOC_Key_T = 0x54,
  eRENDERDOC_Key_U = 0x55,
  eRENDERDOC_Key_V = 0x56,
  eRENDERDOC_Key_W = 0x57,
  eRENDERDOC_Key_X = 0x58,
  eRENDERDOC_Key_Y = 0x59,
  eRENDERDOC_Key_Z = 0x5A,
  // leave the rest of the ASCII range free
  // in case we want to use it later
  eRENDERDOC_Key_NonPrintable = 0x100,
  eRENDERDOC_Key_Divide,
  eRENDERDOC_Key_Multiply,
  eRENDERDOC_Key_Subtract,
  eRENDERDOC_Key_Plus,
  eRENDERDOC_Key_F1,
  eRENDERDOC_Key_F2,
  eRENDERDOC_Key_F3,
  eRENDERDOC_Key_F4,
  eRENDERDOC_Key_F5,
  eRENDERDOC_Key_F6,
  eRENDERDOC_Key_F7,
  eRENDERDOC_Key_F8,
  eRENDERDOC_Key_F9,
  eRENDERDOC_Key_F10,
  eRENDERDOC_Key_F11,
  eRENDERDOC_Key_F12,
  eRENDERDOC_Key_Home,
  eRENDERDOC_Key_End,
  eRENDERDOC_Key_Insert,
  eRENDERDOC_Key_Delete,
  eRENDERDOC_Key_PageUp,
  eRENDERDOC_Key_PageDn,
  eRENDERDOC_Key_Backspace,
  eRENDERDOC_Key_Tab,
  eRENDERDOC_Key_PrtScrn,
  eRENDERDOC_Key_Pause,
  eRENDERDOC_Key_Max,
 } RENDERDOC_InputButton;
 // Sets which key or keys can be used to toggle focus between multiple windows
 //
 // If keys is NULL or num is 0, toggle keys will be disabled
 typedef void(RENDERDOC_CC *pRENDERDOC_SetFocusToggleKeys)(RENDERDOC_InputButton *keys, int num);
 // Sets which key or keys can be used to capture the next frame
 //
 // If keys is NULL or num is 0, captures keys will be disabled
 typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureKeys)(RENDERDOC_InputButton *keys, int num);
 typedef enum RENDERDOC_OverlayBits
 {
  // This single bit controls whether the overlay is enabled or disabled globally
  eRENDERDOC_Overlay_Enabled = 0x1,
  // Show the average framerate over several seconds as well as min/max
  eRENDERDOC_Overlay_FrameRate = 0x2,
  // Show the current frame number
  eRENDERDOC_Overlay_FrameNumber = 0x4,
  // Show a list of recent captures, and how many captures have been made
  eRENDERDOC_Overlay_CaptureList = 0x8,
  // Default values for the overlay mask
  eRENDERDOC_Overlay_Default = (eRENDERDOC_Overlay_Enabled | eRENDERDOC_Overlay_FrameRate |
                                eRENDERDOC_Overlay_FrameNumber | eRENDERDOC_Overlay_CaptureList),
  // Enable all bits
  eRENDERDOC_Overlay_All = ~0U,
  // Disable all bits
  eRENDERDOC_Overlay_None = 0,
 } RENDERDOC_OverlayBits;
 // returns the overlay bits that have been set
 typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetOverlayBits)();
 // sets the overlay bits with an and & or mask
 typedef void(RENDERDOC_CC *pRENDERDOC_MaskOverlayBits)(uint32_t And, uint32_t Or);
 // this function will attempt to remove RenderDoc's hooks in the application.
 //
 // Note: that this can only work correctly if done immediately after
 // the module is loaded, before any API work happens. RenderDoc will remove its
 // injected hooks and shut down. Behaviour is undefined if this is called
 // after any API functions have been called, and there is still no guarantee of
 // success.
 typedef void(RENDERDOC_CC *pRENDERDOC_RemoveHooks)();
 // DEPRECATED: compatibility for code compiled against pre-1.4.1 headers.
 typedef pRENDERDOC_RemoveHooks pRENDERDOC_Shutdown;
 // This function will unload RenderDoc's crash handler.
 //
 // If you use your own crash handler and don't want RenderDoc's handler to
 // intercede, you can call this function to unload it and any unhandled
 // exceptions will pass to the next handler.
 typedef void(RENDERDOC_CC *pRENDERDOC_UnloadCrashHandler)();
 // Sets the capture file path template
 //
 // pathtemplate is a UTF-8 string that gives a template for how captures will be named
 // and where they will be saved.
 //
 // Any extension is stripped off the path, and captures are saved in the directory
 // specified, and named with the filename and the frame number appended. If the
 // directory does not exist it will be created, including any parent directories.
 //
 // If pathtemplate is NULL, the template will remain unchanged
 //
 // Example:
 //
 // SetCaptureFilePathTemplate("my_captures/example");
 //
 // Capture #1 -> my_captures/example_frame123.rdc
 // Capture #2 -> my_captures/example_frame456.rdc
 typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureFilePathTemplate)(const char *pathtemplate);
 // returns the current capture path template, see SetCaptureFileTemplate above, as a UTF-8 string
 typedef const char *(RENDERDOC_CC *pRENDERDOC_GetCaptureFilePathTemplate)();
 // DEPRECATED: compatibility for code compiled against pre-1.1.2 headers.
 typedef pRENDERDOC_SetCaptureFilePathTemplate pRENDERDOC_SetLogFilePathTemplate;
 typedef pRENDERDOC_GetCaptureFilePathTemplate pRENDERDOC_GetLogFilePathTemplate;
 // returns the number of captures that have been made
 typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetNumCaptures)();
 // This function returns the details of a capture, by index. New captures are added
 // to the end of the list.
 //
 // filename will be filled with the absolute path to the capture file, as a UTF-8 string
 // pathlength will be written with the length in bytes of the filename string
 // timestamp will be written with the time of the capture, in seconds since the Unix epoch
 //
 // Any of the parameters can be NULL and they'll be skipped.
 //
 // The function will return 1 if the capture index is valid, or 0 if the index is invalid
 // If the index is invalid, the values will be unchanged
 //
 // Note: when captures are deleted in the UI they will remain in this list, so the
 // capture path may not exist anymore.
 typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetCapture)(uint32_t idx, char *filename,
                                                      uint32_t *pathlength, uint64_t *timestamp);
 // Sets the comments associated with a capture file. These comments are displayed in the
 // UI program when opening.
 //
 // filePath should be a path to the capture file to add comments to. If set to NULL or ""
 // the most recent capture file created made will be used instead.
 // comments should be a NULL-terminated UTF-8 string to add as comments.
 //
 // Any existing comments will be overwritten.
 typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureFileComments)(const char *filePath,
                                                              const char *comments);
 // returns 1 if the RenderDoc UI is connected to this application, 0 otherwise
 typedef uint32_t(RENDERDOC_CC *pRENDERDOC_IsTargetControlConnected)();
 // DEPRECATED: compatibility for code compiled against pre-1.1.1 headers.
 // This was renamed to IsTargetControlConnected in API 1.1.1, the old typedef is kept here for
 // backwards compatibility with old code, it is castable either way since it's ABI compatible
 // as the same function pointer type.
 typedef pRENDERDOC_IsTargetControlConnected pRENDERDOC_IsRemoteAccessConnected;
 // This function will launch the Replay UI associated with the RenderDoc library injected
 // into the running application.
 //
 // if connectTargetControl is 1, the Replay UI will be launched with a command line parameter
 // to connect to this application
 // cmdline is the rest of the command line, as a UTF-8 string. E.g. a captures to open
 // if cmdline is NULL, the command line will be empty.
 //
 // returns the PID of the replay UI if successful, 0 if not successful.
 typedef uint32_t(RENDERDOC_CC *pRENDERDOC_LaunchReplayUI)(uint32_t connectTargetControl,
                                                          const char *cmdline);
 // RenderDoc can return a higher version than requested if it's backwards compatible,
 // this function returns the actual version returned. If a parameter is NULL, it will be
 // ignored and the others will be filled out.
 typedef void(RENDERDOC_CC *pRENDERDOC_GetAPIVersion)(int *major, int *minor, int *patch);
 // Requests that the replay UI show itself (if hidden or not the current top window). This can be
 // used in conjunction with IsTargetControlConnected and LaunchReplayUI to intelligently handle
 // showing the UI after making a capture.
 //
 // This will return 1 if the request was successfully passed on, though it's not guaranteed that
 // the UI will be on top in all cases depending on OS rules. It will return 0 if there is no current
 // target control connection to make such a request, or if there was another error
 typedef uint32_t(RENDERDOC_CC *pRENDERDOC_ShowReplayUI)();
 //////////////////////////////////////////////////////////////////////////
 // Capturing functions
 //
 // A device pointer is a pointer to the API's root handle.
 //
 // This would be an ID3D11Device, HGLRC/GLXContext, ID3D12Device, etc
 typedef void *RENDERDOC_DevicePointer;
 // A window handle is the OS's native window handle
 //
 // This would be an HWND, GLXDrawable, etc
 typedef void *RENDERDOC_WindowHandle;
 // A helper macro for Vulkan, where the device handle cannot be used directly.
 //
 // Passing the VkInstance to this macro will return the RENDERDOC_DevicePointer to use.
 //
 // Specifically, the value needed is the dispatch table pointer, which sits as the first
 // pointer-sized object in the memory pointed to by the VkInstance. Thus we cast to a void** and
 // indirect once.
 #define RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(inst) (*((void **)(inst)))
 // This sets the RenderDoc in-app overlay in the API/window pair as 'active' and it will
 // respond to keypresses. Neither parameter can be NULL
 typedef void(RENDERDOC_CC *pRENDERDOC_SetActiveWindow)(RENDERDOC_DevicePointer device,
                                                       RENDERDOC_WindowHandle wndHandle);
 // capture the next frame on whichever window and API is currently considered active
 typedef void(RENDERDOC_CC *pRENDERDOC_TriggerCapture)();
 // capture the next N frames on whichever window and API is currently considered active
 typedef void(RENDERDOC_CC *pRENDERDOC_TriggerMultiFrameCapture)(uint32_t numFrames);
 // When choosing either a device pointer or a window handle to capture, you can pass NULL.
 // Passing NULL specifies a 'wildcard' match against anything. This allows you to specify
 // any API rendering to a specific window, or a specific API instance rendering to any window,
 // or in the simplest case of one window and one API, you can just pass NULL for both.
 //
 // In either case, if there are two or more possible matching (device,window) pairs it
 // is undefined which one will be captured.
 //
 // Note: for headless rendering you can pass NULL for the window handle and either specify
 // a device pointer or leave it NULL as above.
 // Immediately starts capturing API calls on the specified device pointer and window handle.
 //
 // If there is no matching thing to capture (e.g. no supported API has been initialised),
 // this will do nothing.
 //
 // The results are undefined (including crashes) if two captures are started overlapping,
 // even on separate devices and/oror windows.
 typedef void(RENDERDOC_CC *pRENDERDOC_StartFrameCapture)(RENDERDOC_DevicePointer device,
                                                         RENDERDOC_WindowHandle wndHandle);
 // Returns whether or not a frame capture is currently ongoing anywhere.
 //
 // This will return 1 if a capture is ongoing, and 0 if there is no capture running
 typedef uint32_t(RENDERDOC_CC *pRENDERDOC_IsFrameCapturing)();
 // Ends capturing immediately.
 //
 // This will return 1 if the capture succeeded, and 0 if there was an error capturing.
 typedef uint32_t(RENDERDOC_CC *pRENDERDOC_EndFrameCapture)(RENDERDOC_DevicePointer device,
                                                           RENDERDOC_WindowHandle wndHandle);
 // Ends capturing immediately and discard any data stored without saving to disk.
 //
 // This will return 1 if the capture was discarded, and 0 if there was an error or no capture
 // was in progress
 typedef uint32_t(RENDERDOC_CC *pRENDERDOC_DiscardFrameCapture)(RENDERDOC_DevicePointer device,
                                                               RENDERDOC_WindowHandle wndHandle);
 // Only valid to be called between a call to StartFrameCapture and EndFrameCapture. Gives a custom
 // title to the capture produced which will be displayed in the UI.
 //
 // If multiple captures are ongoing, this title will be applied to the first capture to end after
 // this call. The second capture to end will have no title, unless this function is called again.
 //
 // Calling this function has no effect if no capture is currently running, and if it is called
 // multiple times only the last title will be used.
 typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureTitle)(const char *title);
 //////////////////////////////////////////////////////////////////////////////////////////////////
 // RenderDoc API versions
 //
 // RenderDoc uses semantic versioning (http://semver.org/).
 //
 // MAJOR version is incremented when incompatible API changes happen.
 // MINOR version is incremented when functionality is added in a backwards-compatible manner.
 // PATCH version is incremented when backwards-compatible bug fixes happen.
 //
 // Note that this means the API returned can be higher than the one you might have requested.
 // e.g. if you are running against a newer RenderDoc that supports 1.0.1, it will be returned
 // instead of 1.0.0. You can check this with the GetAPIVersion entry point
 typedef enum RENDERDOC_Version
 {
  eRENDERDOC_API_Version_1_0_0 = 10000,    // RENDERDOC_API_1_0_0 = 1 00 00
  eRENDERDOC_API_Version_1_0_1 = 10001,    // RENDERDOC_API_1_0_1 = 1 00 01
  eRENDERDOC_API_Version_1_0_2 = 10002,    // RENDERDOC_API_1_0_2 = 1 00 02
  eRENDERDOC_API_Version_1_1_0 = 10100,    // RENDERDOC_API_1_1_0 = 1 01 00
  eRENDERDOC_API_Version_1_1_1 = 10101,    // RENDERDOC_API_1_1_1 = 1 01 01
  eRENDERDOC_API_Version_1_1_2 = 10102,    // RENDERDOC_API_1_1_2 = 1 01 02
  eRENDERDOC_API_Version_1_2_0 = 10200,    // RENDERDOC_API_1_2_0 = 1 02 00
  eRENDERDOC_API_Version_1_3_0 = 10300,    // RENDERDOC_API_1_3_0 = 1 03 00
  eRENDERDOC_API_Version_1_4_0 = 10400,    // RENDERDOC_API_1_4_0 = 1 04 00
  eRENDERDOC_API_Version_1_4_1 = 10401,    // RENDERDOC_API_1_4_1 = 1 04 01
  eRENDERDOC_API_Version_1_4_2 = 10402,    // RENDERDOC_API_1_4_2 = 1 04 02
  eRENDERDOC_API_Version_1_5_0 = 10500,    // RENDERDOC_API_1_5_0 = 1 05 00
  eRENDERDOC_API_Version_1_6_0 = 10600,    // RENDERDOC_API_1_6_0 = 1 06 00
 } RENDERDOC_Version;
 // API version changelog:
 //
 // 1.0.0 - initial release
 // 1.0.1 - Bugfix: IsFrameCapturing() was returning false for captures that were triggered
 //         by keypress or TriggerCapture, instead of Start/EndFrameCapture.
 // 1.0.2 - Refactor: Renamed eRENDERDOC_Option_DebugDeviceMode to eRENDERDOC_Option_APIValidation
 // 1.1.0 - Add feature: TriggerMultiFrameCapture(). Backwards compatible with 1.0.x since the new
 //         function pointer is added to the end of the struct, the original layout is identical
 // 1.1.1 - Refactor: Renamed remote access to target control (to better disambiguate from remote
 //         replay/remote server concept in replay UI)
 // 1.1.2 - Refactor: Renamed "log file" in function names to just capture, to clarify that these
 //         are captures and not debug logging files. This is the first API version in the v1.0
 //         branch.
 // 1.2.0 - Added feature: SetCaptureFileComments() to add comments to a capture file that will be
 //         displayed in the UI program on load.
 // 1.3.0 - Added feature: New capture option eRENDERDOC_Option_AllowUnsupportedVendorExtensions
 //         which allows users to opt-in to allowing unsupported vendor extensions to function.
 //         Should be used at the user's own risk.
 //         Refactor: Renamed eRENDERDOC_Option_VerifyMapWrites to
 //         eRENDERDOC_Option_VerifyBufferAccess, which now also controls initialisation to
 //         0xdddddddd of uninitialised buffer contents.
 // 1.4.0 - Added feature: DiscardFrameCapture() to discard a frame capture in progress and stop
 //         capturing without saving anything to disk.
 // 1.4.1 - Refactor: Renamed Shutdown to RemoveHooks to better clarify what is happening
 // 1.4.2 - Refactor: Renamed 'draws' to 'actions' in callstack capture option.
 // 1.5.0 - Added feature: ShowReplayUI() to request that the replay UI show itself if connected
 // 1.6.0 - Added feature: SetCaptureTitle() which can be used to set a title for a
 //         capture made with StartFrameCapture() or EndFrameCapture()
 typedef struct RENDERDOC_API_1_6_0
 {
  pRENDERDOC_GetAPIVersion GetAPIVersion;
  pRENDERDOC_SetCaptureOptionU32 SetCaptureOptionU32;
  pRENDERDOC_SetCaptureOptionF32 SetCaptureOptionF32;
  pRENDERDOC_GetCaptureOptionU32 GetCaptureOptionU32;
  pRENDERDOC_GetCaptureOptionF32 GetCaptureOptionF32;
  pRENDERDOC_SetFocusToggleKeys SetFocusToggleKeys;
  pRENDERDOC_SetCaptureKeys SetCaptureKeys;
  pRENDERDOC_GetOverlayBits GetOverlayBits;
  pRENDERDOC_MaskOverlayBits MaskOverlayBits;
  // Shutdown was renamed to RemoveHooks in 1.4.1.
  // These unions allow old code to continue compiling without changes
  union
  {
    pRENDERDOC_Shutdown Shutdown;
    pRENDERDOC_RemoveHooks RemoveHooks;
  };
  pRENDERDOC_UnloadCrashHandler UnloadCrashHandler;
  // Get/SetLogFilePathTemplate was renamed to Get/SetCaptureFilePathTemplate in 1.1.2.
  // These unions allow old code to continue compiling without changes
  union
  {
    // deprecated name
    pRENDERDOC_SetLogFilePathTemplate SetLogFilePathTemplate;
    // current name
    pRENDERDOC_SetCaptureFilePathTemplate SetCaptureFilePathTemplate;
  };
  union
  {
    // deprecated name
    pRENDERDOC_GetLogFilePathTemplate GetLogFilePathTemplate;
    // current name
    pRENDERDOC_GetCaptureFilePathTemplate GetCaptureFilePathTemplate;
  };
  pRENDERDOC_GetNumCaptures GetNumCaptures;
  pRENDERDOC_GetCapture GetCapture;
  pRENDERDOC_TriggerCapture TriggerCapture;
  // IsRemoteAccessConnected was renamed to IsTargetControlConnected in 1.1.1.
  // This union allows old code to continue compiling without changes
  union
  {
    // deprecated name
    pRENDERDOC_IsRemoteAccessConnected IsRemoteAccessConnected;
    // current name
    pRENDERDOC_IsTargetControlConnected IsTargetControlConnected;
  };
  pRENDERDOC_LaunchReplayUI LaunchReplayUI;
  pRENDERDOC_SetActiveWindow SetActiveWindow;
  pRENDERDOC_StartFrameCapture StartFrameCapture;
  pRENDERDOC_IsFrameCapturing IsFrameCapturing;
  pRENDERDOC_EndFrameCapture EndFrameCapture;
  // new function in 1.1.0
  pRENDERDOC_TriggerMultiFrameCapture TriggerMultiFrameCapture;
  // new function in 1.2.0
  pRENDERDOC_SetCaptureFileComments SetCaptureFileComments;
  // new function in 1.4.0
  pRENDERDOC_DiscardFrameCapture DiscardFrameCapture;
  // new function in 1.5.0
  pRENDERDOC_ShowReplayUI ShowReplayUI;
  // new function in 1.6.0
  pRENDERDOC_SetCaptureTitle SetCaptureTitle;
 } RENDERDOC_API_1_6_0;
 typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_0_0;
 typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_0_1;
 typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_0_2;
 typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_1_0;
 typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_1_1;
 typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_1_2;
 typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_2_0;
 typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_3_0;
 typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_4_0;
 typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_4_1;
 typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_4_2;
 typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_5_0;
 //////////////////////////////////////////////////////////////////////////////////////////////////
 // RenderDoc API entry point
 //
 // This entry point can be obtained via GetProcAddress/dlsym if RenderDoc is available.
 //
 // The name is the same as the typedef - "RENDERDOC_GetAPI"
 //
 // This function is not thread safe, and should not be called on multiple threads at once.
 // Ideally, call this once as early as possible in your application's startup, before doing
 // any API work, since some configuration functionality etc has to be done also before
 // initialising any APIs.
 //
 // Parameters:
 //   version is a single value from the RENDERDOC_Version above.
 //
 //   outAPIPointers will be filled out with a pointer to the corresponding struct of function
 //   pointers.
 //
 // Returns:
 //   1 - if the outAPIPointers has been filled with a pointer to the API struct requested
 //   0 - if the requested version is not supported or the arguments are invalid.
 //
 typedef int(RENDERDOC_CC *pRENDERDOC_GetAPI)(RENDERDOC_Version version, void **outAPIPointers);
 #ifdef __cplusplus
 }    // extern "C"
 #endif
--- a/src/audio_core/sdl_audio.cpp
+++ b/src/audio_core/sdl_audio.cpp
@ -4,8 +4,8 @@
 #include <SDL3/SDL_audio.h>
 #include <SDL3/SDL_init.h>
 #include <SDL3/SDL_timer.h>
-#include <common/assert.h>
+#include "common/assert.h"
-#include <core/libraries/error_codes.h>
+#include "core/libraries/error_codes.h"
 #include "sdl_audio.h"
 namespace Audio {
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@ -15,15 +15,17 @@ static u32 screenWidth = 1280;
 static u32 screenHeight = 720;
 static s32 gpuId = -1; // Vulkan physical device index. Set to negative for auto select
 static std::string logFilter;
-static std::string logType = "sync";
+static std::string logType = "async";
 static bool isDebugDump = false;
 static bool isLibc = true;
 static bool isShowSplash = false;
 static bool isNullGpu = false;
 static bool shouldDumpShaders = false;
 static bool shouldDumpPM4 = false;
 static u32 vblankDivider = 1;
 static bool vkValidation = false;
 static bool vkValidationSync = false;
 static bool rdocEnable = false;
 // Gui
 std::string settings_install_dir = "";
 u32 main_window_geometry_x = 400;
@ -94,6 +96,14 @@ bool dumpPM4() {
    return shouldDumpPM4;
 }
 bool isRdocEnabled() {
    return rdocEnable;
 }
 u32 vblankDiv() {
    return vblankDivider;
 }
 bool vkValidationEnabled() {
    return vkValidation;
 }
@ -220,7 +230,7 @@ void load(const std::filesystem::path& path) {
            auto general = generalResult.unwrap();
            isNeo = toml::find_or<toml::boolean>(general, "isPS4Pro", false);
-            isFullscreen = toml::find_or<toml::boolean>(general, "Fullscreen", true);
+            isFullscreen = toml::find_or<toml::boolean>(general, "Fullscreen", false);
            logFilter = toml::find_or<toml::string>(general, "logFilter", "");
            logType = toml::find_or<toml::string>(general, "logType", "sync");
            isShowSplash = toml::find_or<toml::boolean>(general, "showSplash", true);
@ -233,10 +243,10 @@ void load(const std::filesystem::path& path) {
            screenWidth = toml::find_or<toml::integer>(gpu, "screenWidth", screenWidth);
            screenHeight = toml::find_or<toml::integer>(gpu, "screenHeight", screenHeight);
            gpuId = toml::find_or<toml::integer>(gpu, "gpuId", 0);
            isNullGpu = toml::find_or<toml::boolean>(gpu, "nullGpu", false);
            shouldDumpShaders = toml::find_or<toml::boolean>(gpu, "dumpShaders", false);
            shouldDumpPM4 = toml::find_or<toml::boolean>(gpu, "dumpPM4", false);
            vblankDivider = toml::find_or<toml::integer>(gpu, "vblankDivider", 1);
        }
    }
    if (data.contains("Vulkan")) {
@ -244,8 +254,10 @@ void load(const std::filesystem::path& path) {
        if (vkResult.is_ok()) {
            auto vk = vkResult.unwrap();
            gpuId = toml::find_or<toml::integer>(vk, "gpuId", 0);
            vkValidation = toml::find_or<toml::boolean>(vk, "validation", true);
            vkValidationSync = toml::find_or<toml::boolean>(vk, "validation_sync", true);
            rdocEnable = toml::find_or<toml::boolean>(vk, "rdocEnable", false);
        }
    }
    if (data.contains("Debug")) {
@ -312,14 +324,16 @@ void save(const std::filesystem::path& path) {
    data["General"]["logFilter"] = logFilter;
    data["General"]["logType"] = logType;
    data["General"]["showSplash"] = isShowSplash;
    data["GPU"]["gpuId"] = gpuId;
    data["GPU"]["screenWidth"] = screenWidth;
    data["GPU"]["screenHeight"] = screenHeight;
    data["GPU"]["nullGpu"] = isNullGpu;
    data["GPU"]["dumpShaders"] = shouldDumpShaders;
    data["GPU"]["dumpPM4"] = shouldDumpPM4;
    data["GPU"]["vblankDivider"] = vblankDivider;
    data["Vulkan"]["gpuId"] = gpuId;
    data["Vulkan"]["validation"] = vkValidation;
    data["Vulkan"]["validation_sync"] = vkValidationSync;
    data["Vulkan"]["rdocEnable"] = rdocEnable;
    data["Debug"]["DebugDump"] = isDebugDump;
    data["LLE"]["libc"] = isLibc;
    data["GUI"]["theme"] = mw_themes;
--- a/src/common/config.h
+++ b/src/common/config.h
@ -26,6 +26,8 @@ bool showSplash();
 bool nullGpu();
 bool dumpShaders();
 bool dumpPM4();
 bool isRdocEnabled();
 u32 vblankDiv();
 bool vkValidationEnabled();
 bool vkValidationSyncEnabled();
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@ -207,9 +207,9 @@ public:
            message_queue.EmplaceWait(entry);
        } else {
            ForEachBackend([&entry](auto& backend) { backend.Write(entry); });
        }
            std::fflush(stdout);
        }
    }
 private:
    Impl(const std::filesystem::path& file_backend_filename, const Filter& filter_)
--- a/src/common/logging/types.h
+++ b/src/common/logging/types.h
@ -73,6 +73,7 @@ enum class Class : u8 {
    Lib_DiscMap,        ///< The LibSceDiscMap implementation.
    Lib_Png,            ///< The LibScePng implementation.
    Lib_PlayGo,         ///< The LibScePlayGo implementation.
    Lib_Random,         ///< The libSceRandom implementation.
    Lib_Usbd,           ///< The LibSceUsbd implementation.
    Lib_Ajm,            ///< The LibSceAjm implementation.
    Lib_ErrorDialog,    ///< The LibSceErrorDialog implementation.
--- a/src/common/path_util.cpp
+++ b/src/common/path_util.cpp
@ -72,6 +72,8 @@ static auto UserPaths = [] {
    create_path(PathType::GameDataDir, user_dir / GAMEDATA_DIR);
    create_path(PathType::TempDataDir, user_dir / TEMPDATA_DIR);
    create_path(PathType::SysModuleDir, user_dir / SYSMODULES_DIR);
    create_path(PathType::DownloadDir, user_dir / DOWNLOAD_DIR);
    create_path(PathType::CapturesDir, user_dir / CAPTURES_DIR);
    return paths;
 }();
--- a/src/common/path_util.h
+++ b/src/common/path_util.h
@ -18,6 +18,8 @@ enum class PathType {
    TempDataDir,    // Where game temp data is stored.
    GameDataDir,    // Where game data is stored.
    SysModuleDir,   // Where system modules are stored.
    DownloadDir,    // Where downloads/temp files are stored.
    CapturesDir,    // Where rdoc captures are stored.
 };
 constexpr auto PORTABLE_DIR = "user";
@ -31,6 +33,8 @@ constexpr auto SAVEDATA_DIR = "savedata";
 constexpr auto GAMEDATA_DIR = "data";
 constexpr auto TEMPDATA_DIR = "temp";
 constexpr auto SYSMODULES_DIR = "sys_modules";
 constexpr auto DOWNLOAD_DIR = "download";
 constexpr auto CAPTURES_DIR = "captures";
 // Filenames
 constexpr auto LOG_FILE = "shad_log.txt";
--- a/src/common/scm_rev.cpp.in
+++ b/src/common/scm_rev.cpp.in
@ -0,0 +1,17 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include "common/scm_rev.h"
 #define GIT_REV      "@GIT_REV@"
 #define GIT_BRANCH   "@GIT_BRANCH@"
 #define GIT_DESC     "@GIT_DESC@"
 namespace Common {
 const char g_scm_rev[]      = GIT_REV;
 const char g_scm_branch[]   = GIT_BRANCH;
 const char g_scm_desc[]     = GIT_DESC;
 } // namespace
--- a/src/common/scm_rev.h
+++ b/src/common/scm_rev.h
@ -0,0 +1,12 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 namespace Common {
 extern const char g_scm_rev[];
 extern const char g_scm_branch[];
 extern const char g_scm_desc[];
 } // namespace Common
--- a/src/common/version.h
+++ b/src/common/version.h
@ -9,5 +9,6 @@
 namespace Common {
 constexpr char VERSION[] = "0.1.1 WIP";
 constexpr bool isRelease = false;
 } // namespace Common
--- a/src/core/address_space.h
+++ b/src/core/address_space.h
@ -34,10 +34,7 @@ constexpr VAddr USER_MAX = 0xFBFFFFFFFFULL;
 static constexpr size_t SystemManagedSize = SYSTEM_MANAGED_MAX - SYSTEM_MANAGED_MIN + 1;
 static constexpr size_t SystemReservedSize = SYSTEM_RESERVED_MAX - SYSTEM_RESERVED_MIN + 1;
-// User area size is normally larger than this. However games are unlikely to map to high
+static constexpr size_t UserSize = 1ULL << 40;
 // regions of that area, so by default we allocate a smaller virtual address space (about 1/4th).
 // to save space on page tables.
 static constexpr size_t UserSize = 1ULL << 39;
 /**
 * Represents the user virtual address space backed by a dmem memory block
--- a/src/core/cpu_patches.cpp
+++ b/src/core/cpu_patches.cpp
@ -285,20 +285,24 @@ static void GenerateTcbAccess(const ZydisDecodedOperand* operands, Xbyak::CodeGe
    const auto slot = GetTcbKey();
 #if defined(_WIN32)
-    // The following logic is based on the wine implementation of TlsGetValue
+    // The following logic is based on the Kernel32.dll asm of TlsGetValue
    // https://github.com/wine-mirror/wine/blob/a27b9551/dlls/kernelbase/thread.c#L719
    static constexpr u32 TlsSlotsOffset = 0x1480;
    static constexpr u32 TlsExpansionSlotsOffset = 0x1780;
    static constexpr u32 TlsMinimumAvailable = 64;
    const u32 teb_offset = slot < TlsMinimumAvailable ? TlsSlotsOffset : TlsExpansionSlotsOffset;
    const u32 tls_index = slot < TlsMinimumAvailable ? slot : slot - TlsMinimumAvailable;
    // Load the pointer to the table of TLS slots.
    c.putSeg(gs);
-    c.mov(dst, ptr[reinterpret_cast<void*>(teb_offset)]);
+    if (slot < TlsMinimumAvailable) {
        // Load the pointer to TLS slots.
        c.mov(dst, ptr[reinterpret_cast<void*>(TlsSlotsOffset + slot * sizeof(LPVOID))]);
    } else {
        const u32 tls_index = slot - TlsMinimumAvailable;
        // Load the pointer to the table of TLS expansion slots.
        c.mov(dst, ptr[reinterpret_cast<void*>(TlsExpansionSlotsOffset)]);
        // Load the pointer to our buffer.
        c.mov(dst, qword[dst + tls_index * sizeof(LPVOID)]);
    }
 #elif defined(__APPLE__)
    // The following logic is based on the Darwin implementation of _os_tsd_get_direct, used by
    // pthread_getspecific https://github.com/apple/darwin-xnu/blob/main/libsyscall/os/tsd.h#L89-L96
--- a/src/core/file_format/playgo_chunk.cpp
+++ b/src/core/file_format/playgo_chunk.cpp
@ -0,0 +1,16 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include "common/io_file.h"
 #include "playgo_chunk.h"
 bool PlaygoChunk::Open(const std::filesystem::path& filepath) {
    Common::FS::IOFile file(filepath, Common::FS::FileAccessMode::Read);
    if (!file.IsOpen()) {
        return false;
    }
    file.Read(playgoHeader);
    return true;
 }
--- a/src/core/file_format/playgo_chunk.h
+++ b/src/core/file_format/playgo_chunk.h
@ -0,0 +1,31 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 #include <filesystem>
 #include "common/types.h"
 struct PlaygoHeader {
    u32 magic;
    u16 version_major;
    u16 version_minor;
    u16 image_count;
    u16 chunk_count;
    u16 mchunk_count;
    u16 scenario_count;
    // TODO fill the rest
 };
 class PlaygoChunk {
 public:
    PlaygoChunk() = default;
    ~PlaygoChunk() = default;
    bool Open(const std::filesystem::path& filepath);
    PlaygoHeader GetPlaygoHeader() {
        return playgoHeader;
    }
 private:
    PlaygoHeader playgoHeader;
 };
--- a/src/core/file_sys/fs.cpp
+++ b/src/core/file_sys/fs.cpp
@ -26,23 +26,27 @@ void MntPoints::UnmountAll() {
 }
 std::filesystem::path MntPoints::GetHostPath(const std::string& guest_directory) {
-    const MntPair* mount = GetMount(guest_directory);
+    // Evil games like Turok2 pass double slashes e.g /app0//game.kpf
    auto corrected_path = guest_directory;
    size_t pos = corrected_path.find("//");
    while (pos != std::string::npos) {
        corrected_path.replace(pos, 2, "/");
        pos = corrected_path.find("//", pos + 1);
    }
    const MntPair* mount = GetMount(corrected_path);
    if (!mount) {
-        return guest_directory;
+        return "";
    }
    // Nothing to do if getting the mount itself.
-    if (guest_directory == mount->mount) {
+    if (corrected_path == mount->mount) {
        return mount->host_path;
    }
    // Remove device (e.g /app0) from path to retrieve relative path.
-    u32 pos = mount->mount.size() + 1;
+    pos = mount->mount.size() + 1;
-    // Evil games like Turok2 pass double slashes e.g /app0//game.kpf
+    const auto rel_path = std::string_view(corrected_path).substr(pos);
    if (guest_directory[pos] == '/') {
        pos++;
    }
    const auto rel_path = std::string_view(guest_directory).substr(pos);
    const auto host_path = mount->host_path / rel_path;
    if (!NeedsCaseInsensiveSearch) {
        return host_path;
@ -66,7 +70,7 @@ std::filesystem::path MntPoints::GetHostPath(const std::string& guest_directory)
    // exist in filesystem but in different case.
    auto guest_path = current_path;
    while (!path_parts.empty()) {
-        const auto& part = path_parts.back();
+        const auto part = path_parts.back();
        const auto add_match = [&](const auto& host_part) {
            current_path /= host_part;
            guest_path /= part;
--- a/src/core/libraries/app_content/app_content.cpp
+++ b/src/core/libraries/app_content/app_content.cpp
@ -198,13 +198,9 @@ int PS4_SYSV_ABI sceAppContentTemporaryDataMount() {
 int PS4_SYSV_ABI sceAppContentTemporaryDataMount2(OrbisAppContentTemporaryDataOption option,
                                                  OrbisAppContentMountPoint* mountPoint) {
-    if (std::string_view(mountPoint->data).empty()) // causing issues with save_data.
+    if (mountPoint == nullptr)
        return ORBIS_APP_CONTENT_ERROR_PARAMETER;
-    auto* param_sfo = Common::Singleton<PSF>::Instance();
+    strncpy(mountPoint->data, "/temp0", 16);
    std::string id(param_sfo->GetString("CONTENT_ID"), 7, 9);
    const auto& mount_dir = Common::FS::GetUserPath(Common::FS::PathType::TempDataDir) / id;
    auto* mnt = Common::Singleton<Core::FileSys::MntPoints>::Instance();
    mnt->Mount(mount_dir, mountPoint->data);
    LOG_INFO(Lib_AppContent, "sceAppContentTemporaryDataMount2: option = {}, mountPoint = {}",
             option, mountPoint->data);
    return ORBIS_OK;
--- a/src/core/libraries/error_codes.h
+++ b/src/core/libraries/error_codes.h
@ -233,6 +233,9 @@ constexpr int SCE_KERNEL_ERROR_ESDKVERSION = 0x80020063;
 constexpr int SCE_KERNEL_ERROR_ESTART = 0x80020064;
 constexpr int SCE_KERNEL_ERROR_ESTOP = 0x80020065;
 // libSceRandom error codes
 constexpr int SCE_RANDOM_ERROR_INVALID = 0x817C0016;
 // videoOut
 constexpr int SCE_VIDEO_OUT_ERROR_INVALID_VALUE = 0x80290001;        // invalid argument
 constexpr int SCE_VIDEO_OUT_ERROR_INVALID_ADDRESS = 0x80290002;      // invalid addresses
--- a/src/core/libraries/gnmdriver/gnmdriver.cpp
+++ b/src/core/libraries/gnmdriver/gnmdriver.cpp
@ -20,13 +20,12 @@
 extern Frontend::WindowSDL* g_window;
 std::unique_ptr<Vulkan::RendererVulkan> renderer;
 std::unique_ptr<AmdGpu::Liverpool> liverpool;
 namespace Libraries::GnmDriver {
 using namespace AmdGpu;
 static std::unique_ptr<AmdGpu::Liverpool> liverpool;
 enum GnmEventIdents : u64 {
    Compute0RelMem = 0x00,
    Compute1RelMem = 0x01,
@ -958,7 +957,7 @@ int PS4_SYSV_ABI sceGnmGetGpuBlockStatus() {
 }
 int PS4_SYSV_ABI sceGnmGetGpuCoreClockFrequency() {
-    LOG_ERROR(Lib_GnmDriver, "(STUBBED) called");
+    LOG_DEBUG(Lib_GnmDriver, "(STUBBED) called");
    return ORBIS_OK;
 }
@ -2131,6 +2130,7 @@ int PS4_SYSV_ABI sceGnmSubmitDone() {
    if (!liverpool->IsGpuIdle()) {
        submission_lock = true;
    }
    liverpool->SubmitDone();
    send_init_packet = true;
    ++frames_submitted;
    return ORBIS_OK;
--- a/src/core/libraries/kernel/event_queue.cpp
+++ b/src/core/libraries/kernel/event_queue.cpp
@ -78,9 +78,7 @@ bool EqueueInternal::TriggerEvent(u64 ident, s16 filter, void* trigger_data) {
        std::scoped_lock lock{m_mutex};
        for (auto& event : m_events) {
-            ASSERT_MSG(event.event.filter == filter,
+            if ((event.event.ident == ident) && (event.event.filter == filter)) {
                       "Event to trigger doesn't match to queue events");
            if (event.event.ident == ident) {
                event.Trigger(trigger_data);
                has_found = true;
            }
--- a/src/core/libraries/kernel/file_system.cpp
+++ b/src/core/libraries/kernel/file_system.cpp
@ -53,6 +53,9 @@ int PS4_SYSV_ABI sceKernelOpen(const char* path, int flags, u16 mode) {
    if (std::string_view{path} == "/dev/stdout") {
        return 2002;
    }
    if (std::string_view{path} == "/dev/urandom") {
        return 2003;
    }
    u32 handle = h->CreateHandle();
    auto* file = h->GetFile(handle);
    if (directory) {
@ -113,6 +116,9 @@ int PS4_SYSV_ABI sceKernelClose(int d) {
    if (d < 3) { // d probably hold an error code
        return ORBIS_KERNEL_ERROR_EPERM;
    }
    if (d == 2003) { // dev/urandom case
        return SCE_OK;
    }
    auto* h = Common::Singleton<Core::FileSys::HandleTable>::Instance();
    auto* file = h->GetFile(d);
    if (file == nullptr) {
@ -223,6 +229,13 @@ s64 PS4_SYSV_ABI posix_lseek(int d, s64 offset, int whence) {
 }
 s64 PS4_SYSV_ABI sceKernelRead(int d, void* buf, size_t nbytes) {
    if (d == 2003) // dev urandom case
    {
        auto rbuf = static_cast<char*>(buf);
        for (size_t i = 0; i < nbytes; i++)
            rbuf[i] = std::rand() & 0xFF;
        return nbytes;
    }
    auto* h = Common::Singleton<Core::FileSys::HandleTable>::Instance();
    auto* file = h->GetFile(d);
    if (file == nullptr) {
@ -459,7 +472,30 @@ s64 PS4_SYSV_ABI sceKernelPwrite(int d, void* buf, size_t nbytes, s64 offset) {
    return file->f.WriteRaw<u8>(buf, nbytes);
 }
 s32 PS4_SYSV_ABI sceKernelRename(const char* from, const char* to) {
    auto* mnt = Common::Singleton<Core::FileSys::MntPoints>::Instance();
    const auto src_path = mnt->GetHostPath(from);
    if (!std::filesystem::exists(src_path)) {
        return ORBIS_KERNEL_ERROR_ENOENT;
    }
    const auto dst_path = mnt->GetHostPath(to);
    const bool src_is_dir = std::filesystem::is_directory(src_path);
    const bool dst_is_dir = std::filesystem::is_directory(dst_path);
    if (src_is_dir && !dst_is_dir) {
        return ORBIS_KERNEL_ERROR_ENOTDIR;
    }
    if (!src_is_dir && dst_is_dir) {
        return ORBIS_KERNEL_ERROR_EISDIR;
    }
    if (dst_is_dir && !std::filesystem::is_empty(dst_path)) {
        return ORBIS_KERNEL_ERROR_ENOTEMPTY;
    }
    std::filesystem::copy(src_path, dst_path, std::filesystem::copy_options::overwrite_existing);
    return ORBIS_OK;
 }
 void fileSystemSymbolsRegister(Core::Loader::SymbolsResolver* sym) {
    std::srand(std::time(nullptr));
    LIB_FUNCTION("1G3lF1Gg1k8", "libkernel", 1, "libkernel", 1, 1, sceKernelOpen);
    LIB_FUNCTION("wuCroIGjt2g", "libScePosix", 1, "libkernel", 1, 1, posix_open);
    LIB_FUNCTION("UK2Tl2DWUns", "libkernel", 1, "libkernel", 1, 1, sceKernelClose);
@ -479,6 +515,7 @@ void fileSystemSymbolsRegister(Core::Loader::SymbolsResolver* sym) {
    LIB_FUNCTION("kBwCPsYX-m4", "libkernel", 1, "libkernel", 1, 1, sceKernelFStat);
    LIB_FUNCTION("mqQMh1zPPT8", "libScePosix", 1, "libkernel", 1, 1, posix_fstat);
    LIB_FUNCTION("VW3TVZiM4-E", "libkernel", 1, "libkernel", 1, 1, sceKernelFtruncate);
    LIB_FUNCTION("52NcYU9+lEo", "libkernel", 1, "libkernel", 1, 1, sceKernelRename);
    LIB_FUNCTION("E6ao34wPw+U", "libScePosix", 1, "libkernel", 1, 1, posix_stat);
    LIB_FUNCTION("+r3rMFwItV4", "libkernel", 1, "libkernel", 1, 1, sceKernelPread);
--- a/src/core/libraries/kernel/libkernel.cpp
+++ b/src/core/libraries/kernel/libkernel.cpp
@ -7,6 +7,7 @@
 #include <boost/asio/io_context.hpp>
 #include "common/assert.h"
 #include "common/debug.h"
 #include "common/logging/log.h"
 #include "common/polyfill_thread.h"
 #include "common/singleton.h"
@ -84,6 +85,9 @@ static PS4_SYSV_ABI void stack_chk_fail() {
 int PS4_SYSV_ABI sceKernelMunmap(void* addr, size_t len) {
    LOG_INFO(Kernel_Vmm, "addr = {}, len = {:#x}", fmt::ptr(addr), len);
    if (len == 0) {
        return ORBIS_OK;
    }
    auto* memory = Core::Memory::Instance();
    memory->UnmapMemory(std::bit_cast<VAddr>(addr), len);
    return SCE_OK;
@ -407,6 +411,7 @@ void LibKernel_Register(Core::Loader::SymbolsResolver* sym) {
    LIB_FUNCTION("2SKEx6bSq-4", "libkernel", 1, "libkernel", 1, 1, sceKernelBatchMap);
    LIB_FUNCTION("kBJzF8x4SyE", "libkernel", 1, "libkernel", 1, 1, sceKernelBatchMap2);
    LIB_FUNCTION("DGMG3JshrZU", "libkernel", 1, "libkernel", 1, 1, sceKernelSetVirtualRangeName);
    // equeue
    LIB_FUNCTION("D0OdFMjp46I", "libkernel", 1, "libkernel", 1, 1, sceKernelCreateEqueue);
--- a/src/core/libraries/kernel/memory_management.cpp
+++ b/src/core/libraries/kernel/memory_management.cpp
@ -246,7 +246,8 @@ int PS4_SYSV_ABI sceKernelGetDirectMemoryType(u64 addr, int* directMemoryTypeOut
 s32 PS4_SYSV_ABI sceKernelBatchMap(OrbisKernelBatchMapEntry* entries, int numEntries,
                                   int* numEntriesOut) {
-    return sceKernelBatchMap2(entries, numEntries, numEntriesOut, 0x10); // 0x10 : Fixed / 0x410
+    return sceKernelBatchMap2(entries, numEntries, numEntriesOut,
                              MemoryFlags::SCE_KERNEL_MAP_FIXED); // 0x10, 0x410?
 }
 int PS4_SYSV_ABI sceKernelMunmap(void* addr, size_t len);
@ -261,7 +262,7 @@ s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEn
            break; // break and assign a value to numEntriesOut.
        }
-        if (entries[i].operation == 0) { // MAP_DIRECT
+        if (entries[i].operation == MemoryOpTypes::ORBIS_KERNEL_MAP_OP_MAP_DIRECT) {
            result = sceKernelMapNamedDirectMemory(&entries[i].start, entries[i].length,
                                                   entries[i].protection, flags,
                                                   static_cast<s64>(entries[i].offset), 0, "");
@ -274,13 +275,18 @@ s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEn
            if (result == 0)
                processed++;
 <<<<<<< HEAD
        } else if (entries[i].operation == 1) { // UNMAP
 =======
        } else if (entries[i].operation == MemoryOpTypes::ORBIS_KERNEL_MAP_OP_UNMAP) {
 >>>>>>> cdff4af38da1d832e35d8c057d698f38c64b2932
            result = sceKernelMunmap(entries[i].start, entries[i].length);
            LOG_INFO(Kernel_Vmm, "BatchMap: entry = {}, operation = {}, len = {:#x}, result = {}",
                     i, entries[i].operation, entries[i].length, result);
            if (result == 0)
                processed++;
 <<<<<<< HEAD
        } else if (entries[i].operation == 4) { // MPROTECT
                result =
                    sceKernelMProtect(entries[i].start, entries[i].length, entries[i].protection);
@ -296,6 +302,19 @@ s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEn
                }
            }
        else {
 =======
        } else if (entries[i].operation == MemoryOpTypes::ORBIS_KERNEL_MAP_OP_MAP_FLEXIBLE) {
            result = sceKernelMapNamedFlexibleMemory(&entries[i].start, entries[i].length,
                                                     entries[i].protection, flags, "");
            LOG_INFO(Kernel_Vmm,
                     "BatchMap: entry = {}, operation = {}, len = {:#x}, type = {}, "
                     "result = {}",
                     i, entries[i].operation, entries[i].length, (u8)entries[i].type, result);
            if (result == 0)
                processed++;
        } else {
 >>>>>>> cdff4af38da1d832e35d8c057d698f38c64b2932
            UNREACHABLE_MSG("called: Unimplemented Operation = {}", entries[i].operation);
        }
    }
@ -305,4 +324,19 @@ s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEn
    return result;
 }
 s32 PS4_SYSV_ABI sceKernelSetVirtualRangeName(const void* addr, size_t len, const char* name) {
    static constexpr size_t MaxNameSize = 32;
    if (std::strlen(name) > MaxNameSize) {
        LOG_ERROR(Kernel_Vmm, "name exceeds 32 bytes!");
        return ORBIS_KERNEL_ERROR_ENAMETOOLONG;
    }
    if (name == nullptr) {
        LOG_ERROR(Kernel_Vmm, "name is invalid!");
        return ORBIS_KERNEL_ERROR_EFAULT;
    }
    auto* memory = Core::Memory::Instance();
    memory->NameVirtualRange(std::bit_cast<VAddr>(addr), len, name);
    return ORBIS_OK;
 }
 } // namespace Libraries::Kernel
--- a/src/core/libraries/kernel/memory_management.h
+++ b/src/core/libraries/kernel/memory_management.h
@ -31,6 +31,14 @@ enum MemoryProtection : u32 {
    SCE_KERNEL_PROT_GPU_RW = 0x30     // Permit reads/writes from the GPU
 };
 enum MemoryOpTypes : u32 {
    ORBIS_KERNEL_MAP_OP_MAP_DIRECT = 0,
    ORBIS_KERNEL_MAP_OP_UNMAP = 1,
    ORBIS_KERNEL_MAP_OP_PROTECT = 2,
    ORBIS_KERNEL_MAP_OP_MAP_FLEXIBLE = 3,
    ORBIS_KERNEL_MAP_OP_TYPE_PROTECT = 4
 };
 struct OrbisQueryInfo {
    uintptr_t start;
    uintptr_t end;
@ -100,4 +108,6 @@ s32 PS4_SYSV_ABI sceKernelBatchMap(OrbisKernelBatchMapEntry* entries, int numEnt
 s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEntries,
                                    int* numEntriesOut, int flags);
 s32 PS4_SYSV_ABI sceKernelSetVirtualRangeName(const void* addr, size_t len, const char* name);
 } // namespace Libraries::Kernel
--- a/src/core/libraries/kernel/thread_management.cpp
+++ b/src/core/libraries/kernel/thread_management.cpp
@ -394,6 +394,18 @@ int PS4_SYSV_ABI scePthreadSetaffinity(ScePthread thread, const /*SceKernelCpuma
    return result;
 }
 int PS4_SYSV_ABI scePthreadGetaffinity(ScePthread thread, /*SceKernelCpumask*/ u64* mask) {
    LOG_INFO(Kernel_Pthread, "called");
    if (thread == nullptr) {
        return SCE_KERNEL_ERROR_ESRCH;
    }
    auto result = scePthreadAttrGetaffinity(&thread->attr, mask);
    return result;
 }
 ScePthreadMutex* createMutex(ScePthreadMutex* addr) {
    if (addr == nullptr || *addr != nullptr) {
        return addr;
@ -427,11 +439,7 @@ int PS4_SYSV_ABI scePthreadMutexInit(ScePthreadMutex* mutex, const ScePthreadMut
    int result = pthread_mutex_init(&(*mutex)->pth_mutex, &(*attr)->pth_mutex_attr);
    static auto mutex_loc = MUTEX_LOCATION("mutex");
    (*mutex)->tracy_lock = std::make_unique<tracy::LockableCtx>(&mutex_loc);
    if (name != nullptr) {
        (*mutex)->tracy_lock->CustomName(name, std::strlen(name));
        LOG_INFO(Kernel_Pthread, "name={}, result={}", name, result);
    }
@ -543,15 +551,11 @@ int PS4_SYSV_ABI scePthreadMutexLock(ScePthreadMutex* mutex) {
        return SCE_KERNEL_ERROR_EINVAL;
    }
    (*mutex)->tracy_lock->BeforeLock();
    int result = pthread_mutex_lock(&(*mutex)->pth_mutex);
    if (result != 0) {
        LOG_TRACE(Kernel_Pthread, "Locked name={}, result={}", (*mutex)->name, result);
    }
    (*mutex)->tracy_lock->AfterLock();
    switch (result) {
    case 0:
        return SCE_OK;
@ -577,8 +581,6 @@ int PS4_SYSV_ABI scePthreadMutexUnlock(ScePthreadMutex* mutex) {
        LOG_TRACE(Kernel_Pthread, "Unlocking name={}, result={}", (*mutex)->name, result);
    }
    (*mutex)->tracy_lock->AfterUnlock();
    switch (result) {
    case 0:
        return SCE_OK;
@ -1183,8 +1185,6 @@ int PS4_SYSV_ABI scePthreadMutexTrylock(ScePthreadMutex* mutex) {
        LOG_TRACE(Kernel_Pthread, "name={}, result={}", (*mutex)->name, result);
    }
    (*mutex)->tracy_lock->AfterTryLock(result == 0);
    switch (result) {
    case 0:
        return ORBIS_OK;
@ -1243,6 +1243,40 @@ int PS4_SYSV_ABI posix_pthread_attr_destroy(ScePthreadAttr* attr) {
    return result;
 }
 int PS4_SYSV_ABI posix_pthread_attr_setschedparam(ScePthreadAttr* attr,
                                                  const SceKernelSchedParam* param) {
    int result = scePthreadAttrSetschedparam(attr, param);
    if (result < 0) {
        int rt = result > SCE_KERNEL_ERROR_UNKNOWN && result <= SCE_KERNEL_ERROR_ESTOP
                     ? result + -SCE_KERNEL_ERROR_UNKNOWN
                     : POSIX_EOTHER;
        return rt;
    }
    return result;
 }
 int PS4_SYSV_ABI posix_pthread_attr_setinheritsched(ScePthreadAttr* attr, int inheritSched) {
    int result = scePthreadAttrSetinheritsched(attr, inheritSched);
    if (result < 0) {
        int rt = result > SCE_KERNEL_ERROR_UNKNOWN && result <= SCE_KERNEL_ERROR_ESTOP
                     ? result + -SCE_KERNEL_ERROR_UNKNOWN
                     : POSIX_EOTHER;
        return rt;
    }
    return result;
 }
 int PS4_SYSV_ABI posix_pthread_setprio(ScePthread thread, int prio) {
    int result = scePthreadSetprio(thread, prio);
    if (result < 0) {
        int rt = result > SCE_KERNEL_ERROR_UNKNOWN && result <= SCE_KERNEL_ERROR_ESTOP
                     ? result + -SCE_KERNEL_ERROR_UNKNOWN
                     : POSIX_EOTHER;
        return rt;
    }
    return result;
 }
 int PS4_SYSV_ABI posix_pthread_attr_setdetachstate(ScePthreadAttr* attr, int detachstate) {
    // LOG_INFO(Kernel_Pthread, "posix pthread_mutexattr_init redirect to scePthreadMutexattrInit");
    int result = scePthreadAttrSetdetachstate(attr, detachstate);
@ -1336,14 +1370,56 @@ int PS4_SYSV_ABI posix_sem_wait(sem_t* sem) {
    return sem_wait(sem);
 }
 #ifndef HAVE_SEM_TIMEDWAIT
 int sem_timedwait(sem_t* sem, const struct timespec* abstime) {
    int rc;
    while ((rc = sem_trywait(sem)) == EAGAIN) {
        struct timespec curr_time;
        clock_gettime(CLOCK_REALTIME, &curr_time);
        s64 remaining_ns = 0;
        remaining_ns +=
            (static_cast<s64>(abstime->tv_sec) - static_cast<s64>(curr_time.tv_sec)) * 1000000000L;
        remaining_ns += static_cast<s64>(abstime->tv_nsec) - static_cast<s64>(curr_time.tv_nsec);
        if (remaining_ns <= 0) {
            return ETIMEDOUT;
        }
        struct timespec sleep_time;
        sleep_time.tv_sec = 0;
        if (remaining_ns < 5000000L) {
            sleep_time.tv_nsec = remaining_ns;
        } else {
            sleep_time.tv_nsec = 5000000;
        }
        nanosleep(&sleep_time, nullptr);
    }
    return rc;
 }
 #endif
 int PS4_SYSV_ABI posix_sem_timedwait(sem_t* sem, const timespec* t) {
    return sem_timedwait(sem, t);
 }
 int PS4_SYSV_ABI posix_sem_post(sem_t* sem) {
    return sem_post(sem);
 }
 int PS4_SYSV_ABI posix_sem_destroy(sem_t* sem) {
    return sem_destroy(sem);
 }
 int PS4_SYSV_ABI posix_sem_getvalue(sem_t* sem, int* sval) {
    return sem_getvalue(sem, sval);
 }
 int PS4_SYSV_ABI posix_pthread_attr_getstacksize(const pthread_attr_t* attr, size_t* size) {
    return pthread_attr_getstacksize(attr, size);
 }
 int PS4_SYSV_ABI scePthreadGetschedparam(ScePthread thread, int* policy,
                                         SceKernelSchedParam* param) {
    return pthread_getschedparam(thread->pth, policy, param);
@ -1403,6 +1479,26 @@ int PS4_SYSV_ABI posix_pthread_condattr_setclock(ScePthreadCondattr* attr, clock
    return SCE_OK;
 }
 int PS4_SYSV_ABI posix_pthread_getschedparam(ScePthread thread, int* policy,
                                             SceKernelSchedParam* param) {
    return scePthreadGetschedparam(thread, policy, param);
 }
 int PS4_SYSV_ABI posix_pthread_setschedparam(ScePthread thread, int policy,
                                             const SceKernelSchedParam* param) {
    return scePthreadSetschedparam(thread, policy, param);
 }
 int PS4_SYSV_ABI posix_pthread_attr_getschedpolicy(const ScePthreadAttr* attr, int* policy) {
    return scePthreadAttrGetschedpolicy(attr, policy);
 }
 int PS4_SYSV_ABI scePthreadRename(ScePthread thread, const char* name) {
    thread->name = name;
    LOG_INFO(Kernel_Pthread, "scePthreadRename: name = {}", thread->name);
    return SCE_OK;
 }
 void pthreadSymbolsRegister(Core::Loader::SymbolsResolver* sym) {
    LIB_FUNCTION("lZzFeSxPl08", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_setcancelstate);
    LIB_FUNCTION("0TyVk4MSLt0", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_cond_init);
@ -1427,6 +1523,7 @@ void pthreadSymbolsRegister(Core::Loader::SymbolsResolver* sym) {
    LIB_FUNCTION("EI-5-jlq2dE", "libkernel", 1, "libkernel", 1, 1, scePthreadGetthreadid);
    LIB_FUNCTION("1tKyG7RlMJo", "libkernel", 1, "libkernel", 1, 1, scePthreadGetprio);
    LIB_FUNCTION("W0Hpm2X0uPE", "libkernel", 1, "libkernel", 1, 1, scePthreadSetprio);
    LIB_FUNCTION("GBUY7ywdULE", "libkernel", 1, "libkernel", 1, 1, scePthreadRename);
    LIB_FUNCTION("aI+OeCz8xrQ", "libkernel", 1, "libkernel", 1, 1, scePthreadSelf);
    LIB_FUNCTION("EotR8a3ASf4", "libkernel", 1, "libkernel", 1, 1, posix_pthread_self);
@ -1442,6 +1539,7 @@ void pthreadSymbolsRegister(Core::Loader::SymbolsResolver* sym) {
    LIB_FUNCTION("OxhIB8LB-PQ", "libkernel", 1, "libkernel", 1, 1, posix_pthread_create);
    LIB_FUNCTION("OxhIB8LB-PQ", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_create);
    LIB_FUNCTION("bt3CTBKmGyI", "libkernel", 1, "libkernel", 1, 1, scePthreadSetaffinity);
    LIB_FUNCTION("rcrVFJsQWRY", "libkernel", 1, "libkernel", 1, 1, scePthreadGetaffinity);
    LIB_FUNCTION("6UgtwV+0zb4", "libkernel", 1, "libkernel", 1, 1, scePthreadCreate);
    LIB_FUNCTION("T72hz6ffq08", "libkernel", 1, "libkernel", 1, 1, scePthreadYield);
    LIB_FUNCTION("B5GmVDKwpn0", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_yield);
@ -1498,6 +1596,8 @@ void pthreadSymbolsRegister(Core::Loader::SymbolsResolver* sym) {
    LIB_FUNCTION("EjllaAqAPZo", "libScePosix", 1, "libkernel", 1, 1,
                 posix_pthread_condattr_setclock);
    LIB_FUNCTION("Z4QosVuAsA0", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_once);
    LIB_FUNCTION("RtLRV-pBTTY", "libScePosix", 1, "libkernel", 1, 1,
                 posix_pthread_attr_getschedpolicy);
    // openorbis weird functions
    LIB_FUNCTION("7H0iTOciTLo", "libkernel", 1, "libkernel", 1, 1, posix_pthread_mutex_lock);
@ -1507,15 +1607,26 @@ void pthreadSymbolsRegister(Core::Loader::SymbolsResolver* sym) {
    LIB_FUNCTION("E+tyo3lp5Lw", "libScePosix", 1, "libkernel", 1, 1,
                 posix_pthread_attr_setdetachstate);
    LIB_FUNCTION("zHchY8ft5pk", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_attr_destroy);
    LIB_FUNCTION("euKRgm0Vn2M", "libScePosix", 1, "libkernel", 1, 1,
                 posix_pthread_attr_setschedparam);
    LIB_FUNCTION("7ZlAakEf0Qg", "libScePosix", 1, "libkernel", 1, 1,
                 posix_pthread_attr_setinheritsched);
    LIB_FUNCTION("a2P9wYGeZvc", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_setprio);
    LIB_FUNCTION("Jmi+9w9u0E4", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_create_name_np);
    LIB_FUNCTION("OxhIB8LB-PQ", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_create);
    LIB_FUNCTION("+U1R4WtXvoc", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_detach);
    LIB_FUNCTION("CBNtXOoef-E", "libScePosix", 1, "libkernel", 1, 1, posix_sched_get_priority_max);
    LIB_FUNCTION("m0iS6jNsXds", "libScePosix", 1, "libkernel", 1, 1, posix_sched_get_priority_min);
    LIB_FUNCTION("FIs3-UQT9sg", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_getschedparam);
    LIB_FUNCTION("Xs9hdiD7sAA", "libScePosix", 1, "libkernel", 1, 1, posix_pthread_setschedparam);
    LIB_FUNCTION("pDuPEf3m4fI", "libScePosix", 1, "libkernel", 1, 1, posix_sem_init);
    LIB_FUNCTION("YCV5dGGBcCo", "libScePosix", 1, "libkernel", 1, 1, posix_sem_wait);
    LIB_FUNCTION("w5IHyvahg-o", "libScePosix", 1, "libkernel", 1, 1, posix_sem_timedwait);
    LIB_FUNCTION("IKP8typ0QUk", "libScePosix", 1, "libkernel", 1, 1, posix_sem_post);
    LIB_FUNCTION("cDW233RAwWo", "libScePosix", 1, "libkernel", 1, 1, posix_sem_destroy);
    LIB_FUNCTION("Bq+LRV-N6Hk", "libScePosix", 1, "libkernel", 1, 1, posix_sem_getvalue);
    LIB_FUNCTION("0qOtCR-ZHck", "libScePosix", 1, "libkernel", 1, 1,
                 posix_pthread_attr_getstacksize);
    // libs
    RwlockSymbolsRegister(sym);
    SemaphoreSymbolsRegister(sym);
--- a/src/core/libraries/kernel/thread_management.h
+++ b/src/core/libraries/kernel/thread_management.h
@ -9,7 +9,6 @@
 #include <vector>
 #include <pthread.h>
 #include <sched.h>
 #include "common/debug.h"
 #include "common/types.h"
 namespace Core::Loader {
@ -74,7 +73,6 @@ struct PthreadMutexInternal {
    u8 reserved[256];
    std::string name;
    pthread_mutex_t pth_mutex;
    std::unique_ptr<tracy::LockableCtx> tracy_lock;
 };
 struct PthreadMutexattrInternal {
@ -169,9 +167,12 @@ ScePthread PS4_SYSV_ABI scePthreadSelf();
 int PS4_SYSV_ABI scePthreadAttrSetaffinity(ScePthreadAttr* pattr,
                                           const /*SceKernelCpumask*/ u64 mask);
 int PS4_SYSV_ABI scePthreadSetaffinity(ScePthread thread, const /*SceKernelCpumask*/ u64 mask);
 int PS4_SYSV_ABI scePthreadGetaffinity(ScePthread thread, /*SceKernelCpumask*/ u64* mask);
 int PS4_SYSV_ABI scePthreadCreate(ScePthread* thread, const ScePthreadAttr* attr,
                                  PthreadEntryFunc start_routine, void* arg, const char* name);
 int PS4_SYSV_ABI scePthreadSetprio(ScePthread thread, int prio);
 /***
 * Mutex calls
 */
--- a/src/core/libraries/kernel/threads/semaphore.cpp
+++ b/src/core/libraries/kernel/threads/semaphore.cpp
@ -41,7 +41,6 @@ public:
        AddWaiter(waiter);
        // Perform the wait.
        std::exchange(lk, std::unique_lock{waiter.mutex});
        return waiter.Wait(lk, timeout);
    }
@ -59,10 +58,9 @@ public:
                it++;
                continue;
            }
-            std::scoped_lock lk2{waiter.mutex};
+            it = wait_list.erase(it);
            token_count -= waiter.need_count;
            waiter.cv.notify_one();
            it = wait_list.erase(it);
        }
        return true;
@ -84,7 +82,6 @@ public:
 public:
    struct WaitingThread : public ListBaseHook {
        std::mutex mutex;
        std::string name;
        std::condition_variable cv;
        u32 priority;
--- a/src/core/libraries/kernel/time_management.cpp
+++ b/src/core/libraries/kernel/time_management.cpp
@ -214,6 +214,22 @@ int PS4_SYSV_ABI posix_clock_getres(u32 clock_id, OrbisKernelTimespec* res) {
    return SCE_KERNEL_ERROR_EINVAL;
 }
 int PS4_SYSV_ABI sceKernelConvertLocaltimeToUtc(time_t param_1, int64_t param_2, time_t* seconds,
                                                OrbisKernelTimezone* timezone, int* dst_seconds) {
    LOG_INFO(Kernel, "called");
    if (timezone) {
        sceKernelGettimezone(timezone);
        param_1 -= (timezone->tz_minuteswest + timezone->tz_dsttime) * 60;
        if (seconds)
            *seconds = param_1;
        if (dst_seconds)
            *dst_seconds = timezone->tz_dsttime * 60;
    } else {
        return SCE_KERNEL_ERROR_EINVAL;
    }
    return SCE_OK;
 }
 void timeSymbolsRegister(Core::Loader::SymbolsResolver* sym) {
    clock = std::make_unique<Common::NativeClock>();
    initial_ptc = clock->GetUptime();
@ -239,6 +255,7 @@ void timeSymbolsRegister(Core::Loader::SymbolsResolver* sym) {
    LIB_FUNCTION("lLMT9vJAck0", "libkernel", 1, "libkernel", 1, 1, posix_clock_gettime);
    LIB_FUNCTION("lLMT9vJAck0", "libScePosix", 1, "libkernel", 1, 1, posix_clock_gettime);
    LIB_FUNCTION("smIj7eqzZE8", "libScePosix", 1, "libkernel", 1, 1, posix_clock_getres);
    LIB_FUNCTION("0NTHN1NKONI", "libkernel", 1, "libkernel", 1, 1, sceKernelConvertLocaltimeToUtc);
 }
 } // namespace Libraries::Kernel
--- a/src/core/libraries/libs.cpp
+++ b/src/core/libraries/libs.cpp
@ -20,6 +20,7 @@
 #include "core/libraries/np_trophy/np_trophy.h"
 #include "core/libraries/pad/pad.h"
 #include "core/libraries/playgo/playgo.h"
 #include "core/libraries/random/random.h"
 #include "core/libraries/rtc/rtc.h"
 #include "core/libraries/save_data/savedata.h"
 #include "core/libraries/screenshot/screenshot.h"
@ -43,8 +44,8 @@ namespace Libraries {
 void InitHLELibs(Core::Loader::SymbolsResolver* sym) {
    LOG_INFO(Lib_Kernel, "Initializing HLE libraries");
    Libraries::Kernel::LibKernel_Register(sym);
    Libraries::VideoOut::RegisterLib(sym);
    Libraries::GnmDriver::RegisterlibSceGnmDriver(sym);
    Libraries::VideoOut::RegisterLib(sym);
    if (!Config::isLleLibc()) {
        Libraries::LibC::libcSymbolsRegister(sym);
    }
@ -71,6 +72,7 @@ void InitHLELibs(Core::Loader::SymbolsResolver* sym) {
    Libraries::AppContent::RegisterlibSceAppContent(sym);
    Libraries::PngDec::RegisterlibScePngDec(sym);
    Libraries::PlayGo::RegisterlibScePlayGo(sym);
    Libraries::Random::RegisterlibSceRandom(sym);
    Libraries::Usbd::RegisterlibSceUsbd(sym);
    Libraries::Pad::RegisterlibScePad(sym);
    Libraries::Ajm::RegisterlibSceAjm(sym);
--- a/src/core/libraries/network/net.cpp
+++ b/src/core/libraries/network/net.cpp
@ -559,7 +559,7 @@ int PS4_SYSV_ABI sceNetEpollDestroy() {
 }
 int PS4_SYSV_ABI sceNetEpollWait() {
-    LOG_ERROR(Lib_Net, "(STUBBED) called");
+    LOG_TRACE(Lib_Net, "(STUBBED) called");
    return ORBIS_OK;
 }
--- a/src/core/libraries/network/netctl.cpp
+++ b/src/core/libraries/network/netctl.cpp
@ -79,7 +79,7 @@ int PS4_SYSV_ABI sceNetCtlUnregisterCallbackV6() {
 }
 int PS4_SYSV_ABI sceNetCtlCheckCallback() {
-    LOG_ERROR(Lib_NetCtl, "(STUBBED) called");
+    LOG_TRACE(Lib_NetCtl, "(STUBBED) called");
    return ORBIS_OK;
 }
--- a/src/core/libraries/np_manager/np_manager.cpp
+++ b/src/core/libraries/np_manager/np_manager.cpp
@ -870,7 +870,7 @@ int PS4_SYSV_ABI sceNpAsmTerminate() {
 }
 int PS4_SYSV_ABI sceNpCheckCallback() {
-    LOG_ERROR(Lib_NpManager, "(STUBBED) called");
+    LOG_TRACE(Lib_NpManager, "(STUBBED) called");
    return ORBIS_OK;
 }
--- a/src/core/libraries/playgo/playgo.cpp
+++ b/src/core/libraries/playgo/playgo.cpp
@ -1,6 +1,7 @@
 // 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/libraries/error_codes.h"
@ -50,9 +51,16 @@ s32 PS4_SYSV_ABI scePlayGoGetLocus(OrbisPlayGoHandle handle, const OrbisPlayGoCh
                                   uint32_t numberOfEntries, OrbisPlayGoLocus* outLoci) {
    LOG_ERROR(Lib_PlayGo, "(STUBBED)called handle = {}, chunkIds = {}, numberOfEntries = {}",
              handle, *chunkIds, numberOfEntries);
-    // assign all now so that scePlayGoGetLocus is not called again for every single entry
+
-    std::fill(outLoci, outLoci + numberOfEntries,
+    auto* playgo = Common::Singleton<PlaygoChunk>::Instance();
-              OrbisPlayGoLocusValue::ORBIS_PLAYGO_LOCUS_LOCAL_FAST);
+
    for (uint32_t i = 0; i < numberOfEntries; i++) {
        if (chunkIds[i] <= playgo->GetPlaygoHeader().mchunk_count) {
            outLoci[i] = OrbisPlayGoLocusValue::ORBIS_PLAYGO_LOCUS_LOCAL_FAST;
        } else {
            return ORBIS_PLAYGO_ERROR_BAD_CHUNK_ID;
        }
    }
    return ORBIS_OK;
 }
@ -68,7 +76,7 @@ s32 PS4_SYSV_ABI scePlayGoGetProgress(OrbisPlayGoHandle handle, const OrbisPlayG
 s32 PS4_SYSV_ABI scePlayGoGetToDoList(OrbisPlayGoHandle handle, OrbisPlayGoToDo* outTodoList,
                                      u32 numberOfEntries, u32* outEntries) {
    LOG_ERROR(Lib_PlayGo, "(STUBBED)called");
-    if (handle != shadMagic)
+    if (handle != 1)
        return ORBIS_PLAYGO_ERROR_BAD_HANDLE;
    if (outTodoList == nullptr)
        return ORBIS_PLAYGO_ERROR_BAD_POINTER;
@ -86,7 +94,7 @@ s32 PS4_SYSV_ABI scePlayGoInitialize(OrbisPlayGoInitParams* param) {
 }
 s32 PS4_SYSV_ABI scePlayGoOpen(OrbisPlayGoHandle* outHandle, const void* param) {
-    *outHandle = shadMagic;
+    *outHandle = 1;
    LOG_INFO(Lib_PlayGo, "(STUBBED)called");
    return ORBIS_OK;
 }
--- a/src/core/libraries/random/random.cpp
+++ b/src/core/libraries/random/random.cpp
@ -0,0 +1,27 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"
 #include "random.h"
 namespace Libraries::Random {
 s32 PS4_SYSV_ABI sceRandomGetRandomNumber(u8* buf, size_t size) {
    LOG_TRACE(Lib_Random, "called");
    if (size > SCE_RANDOM_MAX_SIZE) {
        return SCE_RANDOM_ERROR_INVALID;
    }
    for (auto i = 0; i < size; ++i) {
        buf[i] = std::rand() & 0xFF;
    }
    return ORBIS_OK;
 }
 void RegisterlibSceRandom(Core::Loader::SymbolsResolver* sym) {
    LIB_FUNCTION("PI7jIZj4pcE", "libSceRandom", 1, "libSceRandom", 1, 1, sceRandomGetRandomNumber);
 };
 } // namespace Libraries::Random
--- a/src/core/libraries/random/random.h
+++ b/src/core/libraries/random/random.h
@ -0,0 +1,17 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 #include "common/types.h"
 namespace Core::Loader {
 class SymbolsResolver;
 }
 namespace Libraries::Random {
 constexpr int32_t SCE_RANDOM_MAX_SIZE = 64;
 s32 PS4_SYSV_ABI sceRandomGetRandomNumber(u8* buf, size_t size);
 void RegisterlibSceRandom(Core::Loader::SymbolsResolver* sym);
 } // namespace Libraries::Random
--- a/src/core/libraries/save_data/savedata.cpp
+++ b/src/core/libraries/save_data/savedata.cpp
@ -15,7 +15,7 @@
 #include "error_codes.h"
 namespace Libraries::SaveData {
-
+bool is_rw_mode = false;
 static constexpr std::string_view g_mount_point = "/savedata0"; // temp mount point (todo)
 std::string game_serial;
@ -180,27 +180,31 @@ int PS4_SYSV_ABI sceSaveDataDirNameSearch(const OrbisSaveDataDirNameSearchCond*
                                          OrbisSaveDataDirNameSearchResult* result) {
    if (cond == nullptr)
        return ORBIS_SAVE_DATA_ERROR_PARAMETER;
-    LOG_ERROR(Lib_SaveData, "TODO sceSaveDataDirNameSearch: Add params");
+    LOG_INFO(Lib_SaveData, "called");
    const auto& mount_dir = Common::FS::GetUserPath(Common::FS::PathType::SaveDataDir) /
                            std::to_string(cond->userId) / game_serial;
    if (!mount_dir.empty() && std::filesystem::exists(mount_dir)) {
-        if (cond->dirName == nullptr) { // look for all dirs if no dir is provided.
+        if (cond->dirName == nullptr || std::string_view(cond->dirName->data)
                                            .empty()) { // look for all dirs if no dir is provided.
            for (int i = 0; const auto& entry : std::filesystem::directory_iterator(mount_dir)) {
-                if (std::filesystem::is_directory(entry.path())) {
+                if (std::filesystem::is_directory(entry.path()) &&
-                    i++;
+                    entry.path().filename().string() != "sdmemory") {
-                    result->dirNamesNum = 0; // why is it 1024? is it max?
+                    // sceSaveDataDirNameSearch does not search for dataMemory1/2 dirs.
                    // copy dir name to be used by sceSaveDataMount in read mode.
                    strncpy(result->dirNames[i].data, entry.path().filename().string().c_str(), 32);
-                    result->hitNum = i + 1;
+                    i++;
-                    result->dirNamesNum = i + 1; // to confirm
+                    result->hitNum = i;
-                    result->setNum = i + 1;      // to confirm
+                    result->dirNamesNum = i;
                    result->setNum = i;
                }
            }
        } else { // Need a game to test.
            LOG_ERROR(Lib_SaveData, "Check Me. sceSaveDataDirNameSearch: dirName = {}",
                      cond->dirName->data);
            strncpy(result->dirNames[0].data, cond->dirName->data, 32);
            result->hitNum = 1;
-            result->dirNamesNum = 1; // to confirm
+            result->dirNamesNum = 1;
-            result->setNum = 1;      // to confirm
+            result->setNum = 1;
        }
    } else {
        result->hitNum = 0;
@ -303,8 +307,51 @@ int PS4_SYSV_ABI sceSaveDataGetMountInfo(const OrbisSaveDataMountPoint* mountPoi
    return ORBIS_OK;
 }
-int PS4_SYSV_ABI sceSaveDataGetParam() {
+int PS4_SYSV_ABI sceSaveDataGetParam(const OrbisSaveDataMountPoint* mountPoint,
-    LOG_ERROR(Lib_SaveData, "(STUBBED) called");
+                                     const OrbisSaveDataParamType paramType, void* paramBuf,
                                     const size_t paramBufSize, size_t* gotSize) {
    if (mountPoint == nullptr)
        return ORBIS_SAVE_DATA_ERROR_PARAMETER;
    auto* mnt = Common::Singleton<Core::FileSys::MntPoints>::Instance();
    const auto mount_dir = mnt->GetHostPath(mountPoint->data);
    Common::FS::IOFile file(mount_dir / "param.txt", Common::FS::FileAccessMode::Read);
    OrbisSaveDataParam params;
    file.Read(params);
    LOG_INFO(Lib_SaveData, "called");
    switch (paramType) {
    case ORBIS_SAVE_DATA_PARAM_TYPE_ALL: {
        memcpy(paramBuf, &params, sizeof(OrbisSaveDataParam));
        *gotSize = sizeof(OrbisSaveDataParam);
    } break;
    case ORBIS_SAVE_DATA_PARAM_TYPE_TITLE: {
        std::memcpy(paramBuf, &params.title, ORBIS_SAVE_DATA_TITLE_MAXSIZE);
        *gotSize = ORBIS_SAVE_DATA_TITLE_MAXSIZE;
    } break;
    case ORBIS_SAVE_DATA_PARAM_TYPE_SUB_TITLE: {
        std::memcpy(paramBuf, &params.subTitle, ORBIS_SAVE_DATA_SUBTITLE_MAXSIZE);
        *gotSize = ORBIS_SAVE_DATA_SUBTITLE_MAXSIZE;
    } break;
    case ORBIS_SAVE_DATA_PARAM_TYPE_DETAIL: {
        std::memcpy(paramBuf, &params.detail, ORBIS_SAVE_DATA_DETAIL_MAXSIZE);
        *gotSize = ORBIS_SAVE_DATA_DETAIL_MAXSIZE;
    } break;
    case ORBIS_SAVE_DATA_PARAM_TYPE_USER_PARAM: {
        std::memcpy(paramBuf, &params.userParam, sizeof(u32));
        *gotSize = sizeof(u32);
    } break;
    case ORBIS_SAVE_DATA_PARAM_TYPE_MTIME: {
        std::memcpy(paramBuf, &params.mtime, sizeof(time_t));
        *gotSize = sizeof(time_t);
    } break;
    default: {
        UNREACHABLE_MSG("Unknown Param = {}", paramType);
    } break;
    }
    return ORBIS_OK;
 }
@ -321,7 +368,7 @@ int PS4_SYSV_ABI sceSaveDataGetSaveDataCount() {
 int PS4_SYSV_ABI sceSaveDataGetSaveDataMemory(const u32 userId, void* buf, const size_t bufSize,
                                              const int64_t offset) {
    const auto& mount_dir = Common::FS::GetUserPath(Common::FS::PathType::SaveDataDir) /
-                            std::to_string(userId) / game_serial / "save_mem1.sav";
+                            std::to_string(userId) / game_serial / "sdmemory/save_mem1.sav";
    Common::FS::IOFile file(mount_dir, Common::FS::FileAccessMode::Read);
    if (!file.IsOpen()) {
@ -336,7 +383,7 @@ int PS4_SYSV_ABI sceSaveDataGetSaveDataMemory(const u32 userId, void* buf, const
 int PS4_SYSV_ABI sceSaveDataGetSaveDataMemory2(OrbisSaveDataMemoryGet2* getParam) {
    const auto& mount_dir = Common::FS::GetUserPath(Common::FS::PathType::SaveDataDir) /
-                            std::to_string(getParam->userId) / game_serial;
+                            std::to_string(getParam->userId) / game_serial / "sdmemory";
    if (getParam == nullptr)
        return ORBIS_SAVE_DATA_ERROR_PARAMETER;
    if (getParam->data != nullptr) {
@ -443,6 +490,7 @@ s32 saveDataMount(u32 user_id, char* dir_name, u32 mount_mode,
    case ORBIS_SAVE_DATA_MOUNT_MODE_RDWR:
    case ORBIS_SAVE_DATA_MOUNT_MODE_RDWR | ORBIS_SAVE_DATA_MOUNT_MODE_DESTRUCT_OFF:
    case ORBIS_SAVE_DATA_MOUNT_MODE_RDONLY | ORBIS_SAVE_DATA_MOUNT_MODE_DESTRUCT_OFF: {
        is_rw_mode = (mount_mode == ORBIS_SAVE_DATA_MOUNT_MODE_RDWR) ? true : false;
        if (!std::filesystem::exists(mount_dir)) {
            return ORBIS_SAVE_DATA_ERROR_NOT_FOUND;
        }
@ -460,10 +508,6 @@ s32 saveDataMount(u32 user_id, char* dir_name, u32 mount_mode,
    case ORBIS_SAVE_DATA_MOUNT_MODE_CREATE | ORBIS_SAVE_DATA_MOUNT_MODE_DESTRUCT_OFF |
        ORBIS_SAVE_DATA_MOUNT_MODE_COPY_ICON: {
        if (std::filesystem::exists(mount_dir)) {
            g_mount_point.copy(mount_result->mount_point.data, 16);
            mnt->Mount(mount_dir, mount_result->mount_point.data);
            mount_result->required_blocks = 0;
            mount_result->mount_status = 0;
            return ORBIS_SAVE_DATA_ERROR_EXISTS;
        }
        if (std::filesystem::create_directories(mount_dir)) {
@ -483,7 +527,7 @@ s32 saveDataMount(u32 user_id, char* dir_name, u32 mount_mode,
        mount_result->mount_status = 1;
    } break;
    default:
-        UNREACHABLE();
+        UNREACHABLE_MSG("Unknown mount mode = {}", mount_mode);
    }
    mount_result->required_blocks = 0;
@ -583,15 +627,46 @@ int PS4_SYSV_ABI sceSaveDataSetEventInfo() {
 int PS4_SYSV_ABI sceSaveDataSetParam(const OrbisSaveDataMountPoint* mountPoint,
                                     OrbisSaveDataParamType paramType, const void* paramBuf,
                                     size_t paramBufSize) {
-    auto* mnt = Common::Singleton<Core::FileSys::MntPoints>::Instance();
+    if (paramBuf == nullptr)
-    const auto mount_dir = mnt->GetHostPath(mountPoint->data);
+        return ORBIS_SAVE_DATA_ERROR_PARAMETER;
    LOG_INFO(Lib_SaveData, "called = {}, mountPoint->data = {}", mount_dir.string(),
             mountPoint->data);
-    if (paramBuf != nullptr) {
+    auto* mnt = Common::Singleton<Core::FileSys::MntPoints>::Instance();
-        Common::FS::IOFile file(mount_dir / "param.txt", Common::FS::FileAccessMode::Write);
+    const auto mount_dir = mnt->GetHostPath(mountPoint->data) / "param.txt";
-        file.WriteRaw<u8>(paramBuf, paramBufSize);
+    OrbisSaveDataParam params;
    if (std::filesystem::exists(mount_dir)) {
        Common::FS::IOFile file(mount_dir, Common::FS::FileAccessMode::Read);
        file.ReadRaw<u8>(&params, sizeof(OrbisSaveDataParam));
    }
    LOG_INFO(Lib_SaveData, "called");
    switch (paramType) {
    case ORBIS_SAVE_DATA_PARAM_TYPE_ALL: {
        memcpy(&params, paramBuf, sizeof(OrbisSaveDataParam));
    } break;
    case ORBIS_SAVE_DATA_PARAM_TYPE_TITLE: {
        strncpy(params.title, static_cast<const char*>(paramBuf), paramBufSize);
    } break;
    case ORBIS_SAVE_DATA_PARAM_TYPE_SUB_TITLE: {
        strncpy(params.subTitle, static_cast<const char*>(paramBuf), paramBufSize);
    } break;
    case ORBIS_SAVE_DATA_PARAM_TYPE_DETAIL: {
        strncpy(params.detail, static_cast<const char*>(paramBuf), paramBufSize);
    } break;
    case ORBIS_SAVE_DATA_PARAM_TYPE_USER_PARAM: {
        params.userParam = *(static_cast<const u32*>(paramBuf));
    } break;
    case ORBIS_SAVE_DATA_PARAM_TYPE_MTIME: {
        params.mtime = *(static_cast<const time_t*>(paramBuf));
    } break;
    default: {
        UNREACHABLE_MSG("Unknown Param = {}", paramType);
    }
    }
    Common::FS::IOFile file(mount_dir, Common::FS::FileAccessMode::Write);
    file.WriteRaw<u8>(&params, sizeof(OrbisSaveDataParam));
    return ORBIS_OK;
 }
@ -604,11 +679,11 @@ int PS4_SYSV_ABI sceSaveDataSetSaveDataMemory(const u32 userId, const void* buf,
                                              const size_t bufSize, const int64_t offset) {
    LOG_INFO(Lib_SaveData, "called");
    const auto& mount_dir = Common::FS::GetUserPath(Common::FS::PathType::SaveDataDir) /
-                            std::to_string(userId) / game_serial / "save_mem1.sav";
+                            std::to_string(userId) / game_serial / "sdmemory/save_mem1.sav";
    Common::FS::IOFile file(mount_dir, Common::FS::FileAccessMode::Write);
    file.Seek(offset);
-    file.WriteRaw<u8>((void*)buf, bufSize);
+    file.WriteRaw<u8>(buf, bufSize);
    return ORBIS_OK;
 }
@ -616,13 +691,13 @@ int PS4_SYSV_ABI sceSaveDataSetSaveDataMemory(const u32 userId, const void* buf,
 int PS4_SYSV_ABI sceSaveDataSetSaveDataMemory2(const OrbisSaveDataMemorySet2* setParam) {
    LOG_INFO(Lib_SaveData, "called: dataNum = {}, slotId= {}", setParam->dataNum, setParam->slotId);
    const auto& mount_dir = Common::FS::GetUserPath(Common::FS::PathType::SaveDataDir) /
-                            std::to_string(setParam->userId) / game_serial;
+                            std::to_string(setParam->userId) / game_serial / "sdmemory";
    if (setParam->data != nullptr) {
        Common::FS::IOFile file(mount_dir / "save_mem2.sav", Common::FS::FileAccessMode::Write);
        if (!file.IsOpen())
            return -1;
        file.Seek(setParam->data->offset);
-        file.WriteRaw<u8>((void*)setParam->data->buf, setParam->data->bufSize);
+        file.WriteRaw<u8>(setParam->data->buf, setParam->data->bufSize);
    }
    if (setParam->param != nullptr) {
@ -632,7 +707,7 @@ int PS4_SYSV_ABI sceSaveDataSetSaveDataMemory2(const OrbisSaveDataMemorySet2* se
    if (setParam->icon != nullptr) {
        Common::FS::IOFile file(mount_dir / "save_icon.png", Common::FS::FileAccessMode::Write);
-        file.WriteRaw<u8>((void*)setParam->icon->buf, setParam->icon->bufSize);
+        file.WriteRaw<u8>(setParam->icon->buf, setParam->icon->bufSize);
    }
    return ORBIS_OK;
@ -644,7 +719,7 @@ int PS4_SYSV_ABI sceSaveDataSetupSaveDataMemory(u32 userId, size_t memorySize,
    LOG_INFO(Lib_SaveData, "called:userId = {}, memorySize = {}", userId, memorySize);
    const auto& mount_dir = Common::FS::GetUserPath(Common::FS::PathType::SaveDataDir) /
-                            std::to_string(userId) / game_serial;
+                            std::to_string(userId) / game_serial / "sdmemory";
    if (std::filesystem::exists(mount_dir)) {
        return ORBIS_SAVE_DATA_ERROR_EXISTS;
@ -663,7 +738,7 @@ int PS4_SYSV_ABI sceSaveDataSetupSaveDataMemory2(const OrbisSaveDataMemorySetup2
    LOG_INFO(Lib_SaveData, "called");
    // if (setupParam->option == 1) { // check this later.
    const auto& mount_dir = Common::FS::GetUserPath(Common::FS::PathType::SaveDataDir) /
-                            std::to_string(setupParam->userId) / game_serial;
+                            std::to_string(setupParam->userId) / game_serial / "sdmemory";
    if (std::filesystem::exists(mount_dir) &&
        std::filesystem::exists(mount_dir / "save_mem2.sav")) {
        Common::FS::IOFile file(mount_dir / "save_mem2.sav", Common::FS::FileAccessMode::Read);
@ -717,16 +792,17 @@ int PS4_SYSV_ABI sceSaveDataTransferringMount() {
 }
 s32 PS4_SYSV_ABI sceSaveDataUmount(const OrbisSaveDataMountPoint* mountPoint) {
    LOG_INFO(Lib_SaveData, "mountPoint = {}", std::string(mountPoint->data));
    if (std::string(mountPoint->data).empty()) {
        return ORBIS_SAVE_DATA_ERROR_NOT_MOUNTED;
    }
    const auto& mount_dir = Common::FS::GetUserPath(Common::FS::PathType::SaveDataDir) /
                            std::to_string(1) / game_serial / mountPoint->data;
    auto* mnt = Common::Singleton<Core::FileSys::MntPoints>::Instance();
-
+    const auto& guest_path = mnt->GetHostPath(mountPoint->data);
    if (guest_path.empty())
        return ORBIS_SAVE_DATA_ERROR_NOT_MOUNTED;
    mnt->Unmount(mount_dir, mountPoint->data);
    LOG_INFO(Lib_SaveData, "mountPoint = {}", std::string(mountPoint->data));
    return ORBIS_OK;
 }
@ -736,23 +812,33 @@ int PS4_SYSV_ABI sceSaveDataUmountSys() {
 }
 int PS4_SYSV_ABI sceSaveDataUmountWithBackup(const OrbisSaveDataMountPoint* mountPoint) {
-    LOG_ERROR(Lib_SaveData, "called = {}", std::string(mountPoint->data));
+    LOG_INFO(Lib_SaveData, "called mount = {}, is_rw_mode = {}", std::string(mountPoint->data),
             is_rw_mode);
    auto* mnt = Common::Singleton<Core::FileSys::MntPoints>::Instance();
    const auto mount_dir = mnt->GetHostPath(mountPoint->data);
    if (!std::filesystem::exists(mount_dir)) {
        return ORBIS_SAVE_DATA_ERROR_NOT_FOUND;
    }
    // leave disabled for now. and just unmount.
-    std::filesystem::create_directories(mount_dir.parent_path() / "backup");
+    /* if (is_rw_mode) { // backup is done only when mount mode is ReadWrite.
        auto backup_path = mount_dir;
        std::string save_data_dir = (mount_dir.string() + "_backup");
        backup_path.replace_filename(save_data_dir);
        std::filesystem::create_directories(backup_path);
        for (const auto& entry : std::filesystem::recursive_directory_iterator(mount_dir)) {
            const auto& path = entry.path();
        const auto target_path = mount_dir.parent_path() / "backup";
            if (std::filesystem::is_regular_file(path)) {
-            std::filesystem::copy(path, target_path,
+                std::filesystem::copy(path, save_data_dir,
                                      std::filesystem::copy_options::overwrite_existing);
            }
        }
    }*/
    const auto& guest_path = mnt->GetHostPath(mountPoint->data);
    if (guest_path.empty())
        return ORBIS_SAVE_DATA_ERROR_NOT_MOUNTED;
    mnt->Unmount(mount_dir, mountPoint->data);
    return ORBIS_OK;
--- a/src/core/libraries/save_data/savedata.h
+++ b/src/core/libraries/save_data/savedata.h
@ -242,6 +242,13 @@ struct OrbisSaveDataMemorySync {
    u8 reserved[28];
 };
 constexpr int ORBIS_SAVE_DATA_PARAM_TYPE_ALL = 0;
 constexpr int ORBIS_SAVE_DATA_PARAM_TYPE_TITLE = 1;
 constexpr int ORBIS_SAVE_DATA_PARAM_TYPE_SUB_TITLE = 2;
 constexpr int ORBIS_SAVE_DATA_PARAM_TYPE_DETAIL = 3;
 constexpr int ORBIS_SAVE_DATA_PARAM_TYPE_USER_PARAM = 4;
 constexpr int ORBIS_SAVE_DATA_PARAM_TYPE_MTIME = 5;
 int PS4_SYSV_ABI sceSaveDataAbort();
 int PS4_SYSV_ABI sceSaveDataBackup();
 int PS4_SYSV_ABI sceSaveDataBindPsnAccount();
@ -291,7 +298,9 @@ int PS4_SYSV_ABI sceSaveDataGetFormat();
 int PS4_SYSV_ABI sceSaveDataGetMountedSaveDataCount();
 int PS4_SYSV_ABI sceSaveDataGetMountInfo(const OrbisSaveDataMountPoint* mountPoint,
                                         OrbisSaveDataMountInfo* info);
-int PS4_SYSV_ABI sceSaveDataGetParam();
+int PS4_SYSV_ABI sceSaveDataGetParam(const OrbisSaveDataMountPoint* mountPoint,
                                     const OrbisSaveDataParamType paramType, void* paramBuf,
                                     const size_t paramBufSize, size_t* gotSize);
 int PS4_SYSV_ABI sceSaveDataGetProgress();
 int PS4_SYSV_ABI sceSaveDataGetSaveDataCount();
 int PS4_SYSV_ABI sceSaveDataGetSaveDataMemory(const u32 userId, void* buf, const size_t bufSize,
--- a/src/core/libraries/videoout/driver.cpp
+++ b/src/core/libraries/videoout/driver.cpp
@ -3,14 +3,16 @@
 #include <pthread.h>
 #include "common/assert.h"
 #include "common/config.h"
 #include "common/debug.h"
 #include "common/thread.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/kernel/time_management.h"
 #include "core/libraries/videoout/driver.h"
 #include "core/platform.h"
 #include "video_core/renderer_vulkan/renderer_vulkan.h"
 extern std::unique_ptr<Vulkan::RendererVulkan> renderer;
 extern std::unique_ptr<AmdGpu::Liverpool> liverpool;
 namespace Libraries::VideoOut {
@ -41,20 +43,18 @@ VideoOutDriver::VideoOutDriver(u32 width, u32 height) {
    main_port.resolution.fullHeight = height;
    main_port.resolution.paneWidth = width;
    main_port.resolution.paneHeight = height;
    present_thread = std::jthread([&](std::stop_token token) { PresentThread(token); });
 }
 VideoOutDriver::~VideoOutDriver() = default;
 int VideoOutDriver::Open(const ServiceThreadParams* params) {
    std::scoped_lock lock{mutex};
    if (main_port.is_open) {
        return ORBIS_VIDEO_OUT_ERROR_RESOURCE_BUSY;
    }
    int handle = 1;
    main_port.is_open = true;
-    return handle;
+    liverpool->SetVoPort(&main_port);
    return 1;
 }
 void VideoOutDriver::Close(s32 handle) {
@ -158,20 +158,12 @@ int VideoOutDriver::UnregisterBuffers(VideoOutPort* port, s32 attributeIndex) {
    return ORBIS_OK;
 }
-void VideoOutDriver::Flip(std::chrono::microseconds timeout) {
+std::chrono::microseconds VideoOutDriver::Flip(const Request& req) {
-    Request req;
+    if (!req) {
-    {
+        return std::chrono::microseconds{0};
        std::unique_lock lock{mutex};
        submit_cond.wait_for(lock, timeout, [&] { return !requests.empty(); });
        if (requests.empty()) {
            renderer->ShowSplash();
            return;
    }
-        // Retrieve the request.
+    const auto start = std::chrono::high_resolution_clock::now();
        req = requests.front();
        requests.pop();
    }
    // Whatever the game is rendering show splash if it is active
    if (!renderer->ShowSplash(req.frame)) {
@ -179,10 +171,9 @@ void VideoOutDriver::Flip(std::chrono::microseconds timeout) {
        renderer->Present(req.frame);
    }
    std::scoped_lock lock{mutex};
    // Update flip status.
-    auto& flip_status = req.port->flip_status;
+    auto* port = req.port;
    auto& flip_status = port->flip_status;
    flip_status.count++;
    flip_status.processTime = Libraries::Kernel::sceKernelGetProcessTime();
    flip_status.tsc = Libraries::Kernel::sceKernelReadTsc();
@ -192,7 +183,7 @@ void VideoOutDriver::Flip(std::chrono::microseconds timeout) {
    flip_status.flipPendingNum = static_cast<int>(requests.size());
    // Trigger flip events for the port.
-    for (auto& event : req.port->flip_events) {
+    for (auto& event : port->flip_events) {
        if (event != nullptr) {
            event->TriggerEvent(SCE_VIDEO_OUT_EVENT_FLIP, Kernel::SceKernelEvent::Filter::VideoOut,
                                reinterpret_cast<void*>(req.flip_arg));
@ -201,21 +192,23 @@ void VideoOutDriver::Flip(std::chrono::microseconds timeout) {
    // Reset flip label
    if (req.index != -1) {
-        req.port->buffer_labels[req.index] = 0;
+        port->buffer_labels[req.index] = 0;
        port->SignalVoLabel();
    }
    const auto end = std::chrono::high_resolution_clock::now();
    return std::chrono::duration_cast<std::chrono::microseconds>(end - start);
 }
 bool VideoOutDriver::SubmitFlip(VideoOutPort* port, s32 index, s64 flip_arg,
                                bool is_eop /*= false*/) {
    std::scoped_lock lock{mutex};
    Vulkan::Frame* frame;
    if (index == -1) {
        frame = renderer->PrepareBlankFrame();
    } else {
        const auto& buffer = port->buffer_slots[index];
        const auto& group = port->groups[buffer.group_index];
-        frame = renderer->PrepareFrame(group, buffer.address_left);
+        frame = renderer->PrepareFrame(group, buffer.address_left, is_eop);
    }
    if (index != -1 && requests.size() >= port->NumRegisteredBuffers()) {
@ -223,6 +216,7 @@ bool VideoOutDriver::SubmitFlip(VideoOutPort* port, s32 index, s64 flip_arg,
        return false;
    }
    std::scoped_lock lock{mutex};
    requests.push({
        .frame = frame,
        .port = port,
@ -234,18 +228,46 @@ bool VideoOutDriver::SubmitFlip(VideoOutPort* port, s32 index, s64 flip_arg,
    port->flip_status.flipPendingNum = static_cast<int>(requests.size());
    port->flip_status.gcQueueNum = 0;
    submit_cond.notify_one();
    return true;
 }
-void VideoOutDriver::Vblank() {
+void VideoOutDriver::PresentThread(std::stop_token token) {
-    std::scoped_lock lock{mutex};
+    static constexpr std::chrono::milliseconds VblankPeriod{16};
    Common::SetCurrentThreadName("PresentThread");
    const auto receive_request = [this] -> Request {
        std::scoped_lock lk{mutex};
        if (!requests.empty()) {
            const auto request = requests.front();
            requests.pop();
            return request;
        }
        return {};
    };
    auto vblank_period = VblankPeriod / Config::vblankDiv();
    auto delay = std::chrono::microseconds{0};
    while (!token.stop_requested()) {
        // Sleep for most of the vblank duration.
        std::this_thread::sleep_for(vblank_period - delay);
        // Check if it's time to take a request.
        auto& vblank_status = main_port.vblank_status;
        if (vblank_status.count % (main_port.flip_rate + 1) == 0) {
            const auto request = receive_request();
            delay = Flip(request);
            FRAME_END;
        }
        {
            // Needs lock here as can be concurrently read by `sceVideoOutGetVblankStatus`
            std::unique_lock lock{main_port.vo_mutex};
            vblank_status.count++;
            vblank_status.processTime = Libraries::Kernel::sceKernelGetProcessTime();
            vblank_status.tsc = Libraries::Kernel::sceKernelReadTsc();
            main_port.vblank_cv.notify_all();
        }
        // Trigger flip events for the port.
        for (auto& event : main_port.vblank_events) {
@ -254,6 +276,7 @@ void VideoOutDriver::Vblank() {
                                    Kernel::SceKernelEvent::Filter::VideoOut, nullptr);
            }
        }
    }
 }
 } // namespace Libraries::VideoOut
--- a/src/core/libraries/videoout/driver.h
+++ b/src/core/libraries/videoout/driver.h
@ -3,10 +3,13 @@
 #pragma once
 #include "common/debug.h"
 #include "common/polyfill_thread.h"
 #include "core/libraries/videoout/video_out.h"
 #include <condition_variable>
 #include <mutex>
 #include <queue>
 #include "core/libraries/videoout/video_out.h"
 namespace Vulkan {
 struct Frame;
@ -25,6 +28,9 @@ struct VideoOutPort {
    SceVideoOutVblankStatus vblank_status;
    std::vector<Kernel::SceKernelEqueue> flip_events;
    std::vector<Kernel::SceKernelEqueue> vblank_events;
    std::mutex vo_mutex;
    std::condition_variable vo_cv;
    std::condition_variable vblank_cv;
    int flip_rate = 0;
    s32 FindFreeGroup() const {
@ -35,6 +41,22 @@ struct VideoOutPort {
        return index;
    }
    bool IsVoLabel(const u64* address) const {
        const u64* start = &buffer_labels[0];
        const u64* end = &buffer_labels[MaxDisplayBuffers - 1];
        return address >= start && address <= end;
    }
    void WaitVoLabel(auto&& pred) {
        std::unique_lock lk{vo_mutex};
        vo_cv.wait(lk, pred);
    }
    void SignalVoLabel() {
        std::scoped_lock lk{vo_mutex};
        vo_cv.notify_one();
    }
    [[nodiscard]] int NumRegisteredBuffers() const {
        return std::count_if(buffer_slots.cbegin(), buffer_slots.cend(),
                             [](auto& buffer) { return buffer.group_index != -1; });
@ -63,11 +85,8 @@ public:
                        const BufferAttribute* attribute);
    int UnregisterBuffers(VideoOutPort* port, s32 attributeIndex);
    void Flip(std::chrono::microseconds timeout);
    bool SubmitFlip(VideoOutPort* port, s32 index, s64 flip_arg, bool is_eop = false);
    void Vblank();
 private:
    struct Request {
        Vulkan::Frame* frame;
@ -76,14 +95,19 @@ private:
        s64 flip_arg;
        u64 submit_tsc;
        bool eop;
        operator bool() const noexcept {
            return frame != nullptr;
        }
    };
    std::chrono::microseconds Flip(const Request& req);
    void PresentThread(std::stop_token token);
    std::mutex mutex;
    VideoOutPort main_port{};
-    std::condition_variable_any submit_cond;
+    std::jthread present_thread;
    std::condition_variable done_cond;
    std::queue<Request> requests;
    bool is_neo{};
 };
 } // namespace Libraries::VideoOut
--- a/src/core/libraries/videoout/video_out.cpp
+++ b/src/core/libraries/videoout/video_out.cpp
@ -183,6 +183,7 @@ s32 PS4_SYSV_ABI sceVideoOutGetVblankStatus(int handle, SceVideoOutVblankStatus*
        return ORBIS_VIDEO_OUT_ERROR_INVALID_HANDLE;
    }
    std::unique_lock lock{port->vo_mutex};
    *status = port->vblank_status;
    return ORBIS_OK;
 }
@ -229,14 +230,6 @@ s32 PS4_SYSV_ABI sceVideoOutUnregisterBuffers(s32 handle, s32 attributeIndex) {
    return driver->UnregisterBuffers(port, attributeIndex);
 }
 void Flip(std::chrono::microseconds micros) {
    return driver->Flip(micros);
 }
 void Vblank() {
    return driver->Vblank();
 }
 void sceVideoOutGetBufferLabelAddress(s32 handle, uintptr_t* label_addr) {
    auto* port = driver->GetPort(handle);
    ASSERT(port);
@ -266,6 +259,18 @@ s32 PS4_SYSV_ABI sceVideoOutGetDeviceCapabilityInfo(
    return ORBIS_OK;
 }
 s32 PS4_SYSV_ABI sceVideoOutWaitVblank(s32 handle) {
    auto* port = driver->GetPort(handle);
    if (!port) {
        return ORBIS_VIDEO_OUT_ERROR_INVALID_HANDLE;
    }
    std::unique_lock lock{port->vo_mutex};
    const auto prev_counter = port->vblank_status.count;
    port->vblank_cv.wait(lock, [&]() { return prev_counter != port->vblank_status.count; });
    return ORBIS_OK;
 }
 void RegisterLib(Core::Loader::SymbolsResolver* sym) {
    driver = std::make_unique<VideoOutDriver>(Config::getScreenWidth(), Config::getScreenHeight());
@ -294,6 +299,7 @@ void RegisterLib(Core::Loader::SymbolsResolver* sym) {
                 sceVideoOutGetVblankStatus);
    LIB_FUNCTION("kGVLc3htQE8", "libSceVideoOut", 1, "libSceVideoOut", 0, 0,
                 sceVideoOutGetDeviceCapabilityInfo);
    LIB_FUNCTION("j6RaAUlaLv0", "libSceVideoOut", 1, "libSceVideoOut", 0, 0, sceVideoOutWaitVblank);
    // openOrbis appears to have libSceVideoOut_v1 module libSceVideoOut_v1.1
    LIB_FUNCTION("Up36PTk687E", "libSceVideoOut", 1, "libSceVideoOut", 1, 1, sceVideoOutOpen);
--- a/src/core/libraries/videoout/video_out.h
+++ b/src/core/libraries/videoout/video_out.h
@ -92,11 +92,12 @@ void PS4_SYSV_ABI sceVideoOutSetBufferAttribute(BufferAttribute* attribute, Pixe
                                                u32 tilingMode, u32 aspectRatio, u32 width,
                                                u32 height, u32 pitchInPixel);
 s32 PS4_SYSV_ABI sceVideoOutAddFlipEvent(Kernel::SceKernelEqueue eq, s32 handle, void* udata);
-s32 PS4_SYSV_ABI sceVideoOutAddVBlankEvent(Kernel::SceKernelEqueue eq, s32 handle, void* udata);
+s32 PS4_SYSV_ABI sceVideoOutAddVblankEvent(Kernel::SceKernelEqueue eq, s32 handle, void* udata);
 s32 PS4_SYSV_ABI sceVideoOutRegisterBuffers(s32 handle, s32 startIndex, void* const* addresses,
                                            s32 bufferNum, const BufferAttribute* attribute);
 s32 PS4_SYSV_ABI sceVideoOutSetFlipRate(s32 handle, s32 rate);
 s32 PS4_SYSV_ABI sceVideoOutIsFlipPending(s32 handle);
 s32 PS4_SYSV_ABI sceVideoOutWaitVblank(s32 handle);
 s32 PS4_SYSV_ABI sceVideoOutSubmitFlip(s32 handle, s32 bufferIndex, s32 flipMode, s64 flipArg);
 s32 PS4_SYSV_ABI sceVideoOutGetFlipStatus(s32 handle, FlipStatus* status);
 s32 PS4_SYSV_ABI sceVideoOutGetResolutionStatus(s32 handle, SceVideoOutResolutionStatus* status);
@ -104,9 +105,6 @@ s32 PS4_SYSV_ABI sceVideoOutOpen(SceUserServiceUserId userId, s32 busType, s32 i
                                 const void* param);
 s32 PS4_SYSV_ABI sceVideoOutClose(s32 handle);
 void Flip(std::chrono::microseconds micros);
 void Vblank();
 // Internal system functions
 void sceVideoOutGetBufferLabelAddress(s32 handle, uintptr_t* label_addr);
 s32 sceVideoOutSubmitEopFlip(s32 handle, u32 buf_id, u32 mode, u32 arg, void** unk);
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@ -193,7 +193,7 @@ int MemoryManager::MapFile(void** out_addr, VAddr virtual_addr, size_t size, Mem
    // Find first free area to map the file.
    if (False(flags & MemoryMapFlags::Fixed)) {
-        mapped_addr = SearchFree(mapped_addr, size_aligned);
+        mapped_addr = SearchFree(mapped_addr, size_aligned, 1);
    }
    if (True(flags & MemoryMapFlags::Fixed)) {
@ -240,6 +240,7 @@ void MemoryManager::UnmapMemory(VAddr virtual_addr, size_t size) {
    vma.prot = MemoryProt::NoAccess;
    vma.phys_base = 0;
    vma.disallow_merge = false;
    vma.name = "";
    MergeAdjacent(vma_map, new_it);
    // Unmap the memory region.
@ -334,6 +335,7 @@ int MemoryManager::VirtualQuery(VAddr addr, int flags,
    info->is_flexible.Assign(vma.type == VMAType::Flexible);
    info->is_direct.Assign(vma.type == VMAType::Direct);
    info->is_commited.Assign(vma.type != VMAType::Free);
    vma.name.copy(info->name.data(), std::min(info->name.size(), vma.name.size()));
    if (vma.type == VMAType::Direct) {
        const auto dmem_it = FindDmemArea(vma.phys_base);
        ASSERT(dmem_it != dmem_map.end());
@ -392,8 +394,23 @@ std::pair<vk::Buffer, size_t> MemoryManager::GetVulkanBuffer(VAddr addr) {
    return std::make_pair(*it->second.buffer, addr - it->first);
 }
-VAddr MemoryManager::SearchFree(VAddr virtual_addr, size_t size, u32 alignment) {
+void MemoryManager::NameVirtualRange(VAddr virtual_addr, size_t size, std::string_view name) {
    auto it = FindVMA(virtual_addr);
    ASSERT_MSG(it->second.Contains(virtual_addr, size),
               "Range provided is not fully containted in vma");
    it->second.name = name;
 }
 VAddr MemoryManager::SearchFree(VAddr virtual_addr, size_t size, u32 alignment) {
    // If the requested address is below the mapped range, start search from the lowest address
    auto min_search_address = impl.SystemManagedVirtualBase();
    if (virtual_addr < min_search_address) {
        virtual_addr = min_search_address;
    }
    auto it = FindVMA(virtual_addr);
    ASSERT_MSG(it != vma_map.end(), "Specified mapping address was not found!");
    // If the VMA is free and contains the requested mapping we are done.
    if (it->second.IsFree() && it->second.Contains(virtual_addr, size)) {
        return virtual_addr;
--- a/src/core/memory.h
+++ b/src/core/memory.h
@ -179,6 +179,8 @@ public:
    int GetDirectMemoryType(PAddr addr, int* directMemoryTypeOut, void** directMemoryStartOut,
                            void** directMemoryEndOut);
    void NameVirtualRange(VAddr virtual_addr, size_t size, std::string_view name);
 private:
    VMAHandle FindVMA(VAddr target) {
        return std::prev(vma_map.upper_bound(target));
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@ -1,29 +1,33 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include <common/logging/log.h>
 #include <core/file_format/psf.h>
 #include <core/file_format/splash.h>
 #include <core/libraries/disc_map/disc_map.h>
 #include <core/libraries/libc/libc.h>
 #include <core/libraries/libc_internal/libc_internal.h>
 #include <core/libraries/rtc/rtc.h>
 #include <core/libraries/videoout/video_out.h>
 #include <fmt/core.h>
 #include "common/config.h"
 #include "common/debug.h"
 #include "common/logging/backend.h"
 #include "common/logging/log.h"
 #include "common/ntapi.h"
 #include "common/path_util.h"
 #include "common/polyfill_thread.h"
 #include "common/singleton.h"
 #include "common/version.h"
 #include "core/file_format/playgo_chunk.h"
 #include "core/file_format/psf.h"
 #include "core/file_format/splash.h"
 #include "core/file_sys/fs.h"
 #include "core/libraries/disc_map/disc_map.h"
 #include "core/libraries/kernel/thread_management.h"
 #include "core/libraries/libc/libc.h"
 #include "core/libraries/libc_internal/libc_internal.h"
 #include "core/libraries/libs.h"
 #include "core/libraries/rtc/rtc.h"
 #include "core/libraries/videoout/video_out.h"
 #include "core/linker.h"
 #include "core/memory.h"
 #include "emulator.h"
 #include "src/common/scm_rev.h"
 #include "video_core/renderdoc.h"
 Frontend::WindowSDL* g_window = nullptr;
@ -46,14 +50,17 @@ Emulator::Emulator() {
    Common::Log::Initialize();
    Common::Log::Start();
    LOG_INFO(Loader, "Starting shadps4 emulator v{} ", Common::VERSION);
    LOG_INFO(Loader, "Revision {}", Common::g_scm_rev);
    LOG_INFO(Loader, "Branch {}", Common::g_scm_branch);
    LOG_INFO(Loader, "Description {}", Common::g_scm_desc);
    // Defer until after logging is initialized.
    memory = Core::Memory::Instance();
    controller = Common::Singleton<Input::GameController>::Instance();
    linker = Common::Singleton<Core::Linker>::Instance();
    window = std::make_unique<Frontend::WindowSDL>(WindowWidth, WindowHeight, controller);
-    g_window = window.get();
+    // Load renderdoc module.
    VideoCore::LoadRenderDoc();
 }
 Emulator::~Emulator() {
@ -68,6 +75,8 @@ void Emulator::Run(const std::filesystem::path& file) {
    // Loading param.sfo file if exists
    std::string id;
    std::string title;
    std::string app_version;
    std::filesystem::path sce_sys_folder = file.parent_path() / "sce_sys";
    if (std::filesystem::is_directory(sce_sys_folder)) {
        for (const auto& entry : std::filesystem::directory_iterator(sce_sys_folder)) {
@ -75,11 +84,14 @@ void Emulator::Run(const std::filesystem::path& file) {
                auto* param_sfo = Common::Singleton<PSF>::Instance();
                param_sfo->open(sce_sys_folder.string() + "/param.sfo", {});
                id = std::string(param_sfo->GetString("CONTENT_ID"), 7, 9);
-                std::string title(param_sfo->GetString("TITLE"));
+                title = param_sfo->GetString("TITLE");
                LOG_INFO(Loader, "Game id: {} Title: {}", id, title);
                u32 fw_version = param_sfo->GetInteger("SYSTEM_VER");
-                std::string app_version = param_sfo->GetString("APP_VER");
+                app_version = param_sfo->GetString("APP_VER");
                LOG_INFO(Loader, "Fw: {:#x} App Version: {}", fw_version, app_version);
            } else if (entry.path().filename() == "playgo-chunk.dat") {
                auto* playgo = Common::Singleton<PlaygoChunk>::Instance();
                playgo->Open(sce_sys_folder.string() + "/playgo-chunk.dat");
            } else if (entry.path().filename() == "pic0.png" ||
                       entry.path().filename() == "pic1.png") {
                auto* splash = Common::Singleton<Splash>::Instance();
@ -93,6 +105,19 @@ void Emulator::Run(const std::filesystem::path& file) {
        }
    }
    std::string game_title = fmt::format("{} - {} <{}>", id, title, app_version);
    std::string window_title = "";
    if (Common::isRelease) {
        window_title = fmt::format("shadPS4 v{} | {}", Common::VERSION, game_title);
    } else {
        window_title =
            fmt::format("shadPS4 v{} {} | {}", Common::VERSION, Common::g_scm_desc, game_title);
    }
    window =
        std::make_unique<Frontend::WindowSDL>(WindowWidth, WindowHeight, controller, window_title);
    g_window = window.get();
    const auto& mount_data_dir = Common::FS::GetUserPath(Common::FS::PathType::GameDataDir) / id;
    if (!std::filesystem::exists(mount_data_dir)) {
        std::filesystem::create_directory(mount_data_dir);
@ -104,6 +129,19 @@ void Emulator::Run(const std::filesystem::path& file) {
    }
    mnt->Mount(mount_temp_dir, "/temp0"); // called in app_content ==> stat/mkdir
    const auto& mount_download_dir =
        Common::FS::GetUserPath(Common::FS::PathType::DownloadDir) / id;
    if (!std::filesystem::exists(mount_download_dir)) {
        std::filesystem::create_directory(mount_download_dir);
    }
    mnt->Mount(mount_download_dir, "/download0");
    const auto& mount_captures_dir = Common::FS::GetUserPath(Common::FS::PathType::CapturesDir);
    if (!std::filesystem::exists(mount_captures_dir)) {
        std::filesystem::create_directory(mount_captures_dir);
    }
    VideoCore::SetOutputDir(mount_captures_dir.generic_string(), id);
    // Initialize kernel and library facilities.
    Libraries::Kernel::init_pthreads();
    Libraries::InitHLELibs(&linker->GetHLESymbols());
@ -136,14 +174,8 @@ void Emulator::Run(const std::filesystem::path& file) {
    std::jthread mainthread =
        std::jthread([this](std::stop_token stop_token) { linker->Execute(); });
    // Begin main window loop until the application exits
    static constexpr std::chrono::milliseconds FlipPeriod{16};
    while (window->isOpen()) {
        window->waitEvent();
        Libraries::VideoOut::Flip(FlipPeriod);
        Libraries::VideoOut::Vblank();
        FRAME_END;
    }
    std::exit(0);
--- a/src/emulator.h
+++ b/src/emulator.h
@ -6,7 +6,7 @@
 #include <filesystem>
 #include <thread>
-#include <common/singleton.h>
+#include "common/singleton.h"
 #include "core/linker.h"
 #include "input/controller.h"
 #include "sdl_window.h"
--- a/src/images/shadPS4.icns
+++ b/src/images/shadPS4.icns
--- a/src/images/shadps4.ico
+++ b/src/images/shadps4.ico
--- a/src/input/controller.cpp
+++ b/src/input/controller.cpp
@ -4,6 +4,7 @@
 #include "core/libraries/kernel/time_management.h"
 #include "core/libraries/pad/pad.h"
 #include "input/controller.h"
 namespace Input {
 GameController::GameController() {
--- a/src/main.cpp
+++ b/src/main.cpp
@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include <emulator.h>
 #include <fmt/core.h>
 #include "emulator.h"
 int main(int argc, char* argv[]) {
    if (argc == 1) {
--- a/src/qt_gui/elf_viewer.cpp
+++ b/src/qt_gui/elf_viewer.cpp
@ -2,7 +2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include <QHeaderView>
 #include "elf_viewer.h"
 ElfViewer::ElfViewer(QWidget* parent) : QTableWidget(parent) {
    dir_list_std = Config::getElfViewer();
    for (const auto& str : dir_list_std) {
--- a/src/qt_gui/elf_viewer.h
+++ b/src/qt_gui/elf_viewer.h
@ -14,8 +14,9 @@
 #include <QTreeView>
 #include <QVBoxLayout>
 #include <QWidget>
 #include "core/loader/elf.h"
 #include "game_list_frame.h"
 #include "src/core/loader/elf.h"
 class ElfViewer : public QTableWidget {
    Q_OBJECT
--- a/src/qt_gui/game_grid_frame.h
+++ b/src/qt_gui/game_grid_frame.h
@ -14,6 +14,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <QtConcurrent/QtConcurrent>
 #include "common/config.h"
 #include "game_info.h"
 #include "game_list_utils.h"
--- a/src/qt_gui/game_info.cpp
+++ b/src/qt_gui/game_info.cpp
@ -5,6 +5,7 @@
 #include <thread>
 #include <QProgressDialog>
 #include <QtConcurrent/QtConcurrent>
 #include "game_info.h"
 GameInfoClass::GameInfoClass() = default;
--- a/src/qt_gui/game_info.h
+++ b/src/qt_gui/game_info.h
@ -7,6 +7,7 @@
 #include <QObject>
 #include <QPixmap>
 #include <QtConcurrent/QtConcurrent>
 #include "common/config.h"
 #include "core/file_format/psf.h"
 #include "game_list_utils.h"
--- a/src/qt_gui/game_install_dialog.cpp
+++ b/src/qt_gui/game_install_dialog.cpp
@ -1,8 +1,6 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include "game_install_dialog.h"
 #include <QDialogButtonBox>
 #include <QDir>
 #include <QFileDialog>
@ -14,6 +12,8 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 #include "game_install_dialog.h"
 GameInstallDialog::GameInstallDialog() : m_gamesDirectory(nullptr) {
    auto layout = new QVBoxLayout(this);
@ -21,8 +21,8 @@ GameInstallDialog::GameInstallDialog() : m_gamesDirectory(nullptr) {
    layout->addStretch();
    layout->addWidget(SetupDialogActions());
-    setWindowTitle("Shadps4 - Choose directory");
+    setWindowTitle("shadPS4 - Choose directory");
-    setWindowIcon(QIcon(":/images/shadps4.ico"));
+    setWindowIcon(QIcon(":images/shadps4.ico"));
 }
 GameInstallDialog::~GameInstallDialog() {}
@ -47,7 +47,7 @@ QWidget* GameInstallDialog::SetupGamesDirectory() {
    layout->addWidget(m_gamesDirectory);
    // Browse button.
-    auto browse = new QPushButton("...");
+    auto browse = new QPushButton("Browse");
    connect(browse, &QPushButton::clicked, this, &GameInstallDialog::Browse);
--- a/src/qt_gui/game_install_dialog.h
+++ b/src/qt_gui/game_install_dialog.h
@ -4,6 +4,7 @@
 #pragma once
 #include <QDialog>
 #include "common/config.h"
 #include "common/path_util.h"
--- a/src/qt_gui/game_list_frame.cpp
+++ b/src/qt_gui/game_list_frame.cpp
@ -190,17 +190,17 @@ void GameListFrame::SetRegionFlag(int row, int column, QString itemStr) {
    QTableWidgetItem* item = new QTableWidgetItem();
    QImage scaledPixmap;
    if (itemStr == "Japan") {
-        scaledPixmap = QImage(":/images/flag_jp.png");
+        scaledPixmap = QImage(":images/flag_jp.png");
    } else if (itemStr == "Europe") {
-        scaledPixmap = QImage(":/images/flag_eu.png");
+        scaledPixmap = QImage(":images/flag_eu.png");
    } else if (itemStr == "USA") {
-        scaledPixmap = QImage(":/images/flag_us.png");
+        scaledPixmap = QImage(":images/flag_us.png");
    } else if (itemStr == "Asia") {
-        scaledPixmap = QImage(":/images/flag_china.png");
+        scaledPixmap = QImage(":images/flag_china.png");
    } else if (itemStr == "World") {
-        scaledPixmap = QImage(":/images/flag_world.png");
+        scaledPixmap = QImage(":images/flag_world.png");
    } else {
-        scaledPixmap = QImage(":/images/flag_unk.png");
+        scaledPixmap = QImage(":images/flag_unk.png");
    }
    QWidget* widget = new QWidget(this);
    QVBoxLayout* layout = new QVBoxLayout(widget);
--- a/src/qt_gui/game_list_frame.h
+++ b/src/qt_gui/game_list_frame.h
@ -16,6 +16,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <QtConcurrent/QtConcurrent>
 #include "game_info.h"
 #include "game_list_utils.h"
 #include "gui_context_menus.h"
--- a/src/qt_gui/gui_context_menus.h
+++ b/src/qt_gui/gui_context_menus.h
@ -165,12 +165,12 @@ public:
                    if (createShortcutLinux(linkPath, ebootPath, iconPath)) {
 #endif
                        QMessageBox::information(
-                            nullptr, "Shortcut Creation",
+                            nullptr, "Shortcut creation",
-                            QString("Shortcut created successfully:\n %1").arg(linkPath));
+                            QString("Shortcut created successfully!\n %1").arg(linkPath));
                    } else {
                        QMessageBox::critical(
                            nullptr, "Error",
-                            QString("Error creating shortcut:\n %1").arg(linkPath));
+                            QString("Error creating shortcut!\n %1").arg(linkPath));
                    }
                } else {
                    QMessageBox::critical(nullptr, "Error", "Failed to convert icon.");
@ -183,11 +183,11 @@ public:
                if (createShortcutLinux(linkPath, ebootPath, iconPath)) {
 #endif
                    QMessageBox::information(
-                        nullptr, "Shortcut Creation",
+                        nullptr, "Shortcut creation",
-                        QString("Shortcut created successfully:\n %1").arg(linkPath));
+                        QString("Shortcut created successfully!\n %1").arg(linkPath));
                } else {
                    QMessageBox::critical(nullptr, "Error",
-                                          QString("Error creating shortcut:\n %1").arg(linkPath));
+                                          QString("Error creating shortcut!\n %1").arg(linkPath));
                }
            }
        }
@ -308,7 +308,7 @@ private:
        QFile shortcutFile(linkPath);
        if (!shortcutFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
            QMessageBox::critical(nullptr, "Error",
-                                  QString("Error creating shortcut:\n %1").arg(linkPath));
+                                  QString("Error creating shortcut!\n %1").arg(linkPath));
            return false;
        }
--- a/src/qt_gui/main.cpp
+++ b/src/qt_gui/main.cpp
@ -2,15 +2,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include <QtWidgets/QApplication>
 #include <fmt/core.h>
 #include "common/config.h"
 #include "core/file_sys/fs.h"
 #include "emulator.h"
 #include "qt_gui/game_install_dialog.h"
 #include "qt_gui/main_window.h"
 #include <emulator.h>
 #include <fmt/core.h>
 // Custom message handler to ignore Qt logs
 void customMessageHandler(QtMsgType, const QMessageLogContext&, const QString&) {}
--- a/src/qt_gui/main_window.cpp
+++ b/src/qt_gui/main_window.cpp
@ -8,6 +8,7 @@
 #include <QProgressDialog>
 #include <QStatusBar>
 #include <QtConcurrent>
 #include "common/io_file.h"
 #include "common/version.h"
 #include "core/file_format/pkg.h"
--- a/src/qt_gui/main_window.h
+++ b/src/qt_gui/main_window.h
@ -9,13 +9,14 @@
 #include <QMainWindow>
 #include <QMimeData>
 #include <QScopedPointer>
 #include <emulator.h>
 #include <fmt/core.h>
 #include "common/config.h"
 #include "common/path_util.h"
 #include "core/file_format/psf.h"
 #include "core/file_sys/fs.h"
 #include "elf_viewer.h"
 #include "emulator.h"
 #include "game_grid_frame.h"
 #include "game_info.h"
 #include "game_list_frame.h"
--- a/src/qt_gui/main_window_themes.cpp
+++ b/src/qt_gui/main_window_themes.cpp
@ -7,25 +7,6 @@ void WindowThemes::SetWindowTheme(Theme theme, QLineEdit* mw_searchbar) {
    QPalette themePalette;
    switch (theme) {
    case Theme::Light:
        mw_searchbar->setStyleSheet("background-color: #ffffff; /* Light gray background */"
                                    "color: #000000;            /* Black text */"
                                    "padding: 5px;");
        themePalette.setColor(QPalette::Window, QColor(240, 240, 240));   // Light gray
        themePalette.setColor(QPalette::WindowText, Qt::black);           // Black
        themePalette.setColor(QPalette::Base, QColor(230, 230, 230, 80)); // Grayish
        themePalette.setColor(QPalette::ToolTipBase, Qt::black);          // Black
        themePalette.setColor(QPalette::ToolTipText, Qt::black);          // Black
        themePalette.setColor(QPalette::Text, Qt::black);                 // Black
        themePalette.setColor(QPalette::Button, QColor(240, 240, 240));   // Light gray
        themePalette.setColor(QPalette::ButtonText, Qt::black);           // Black
        themePalette.setColor(QPalette::BrightText, Qt::red);             // Red
        themePalette.setColor(QPalette::Link, QColor(42, 130, 218));      // Blue
        themePalette.setColor(QPalette::Highlight, QColor(42, 130, 218)); // Blue
        themePalette.setColor(QPalette::HighlightedText, Qt::white);      // White
        qApp->setPalette(themePalette);
        break;
    case Theme::Dark:
        mw_searchbar->setStyleSheet("background-color: #1e1e1e; /* Dark background */"
                                    "color: #ffffff;            /* White text */"
@ -48,6 +29,25 @@ void WindowThemes::SetWindowTheme(Theme theme, QLineEdit* mw_searchbar) {
        qApp->setPalette(themePalette);
        break;
    case Theme::Light:
        mw_searchbar->setStyleSheet("background-color: #ffffff; /* Light gray background */"
                                    "color: #000000;            /* Black text */"
                                    "padding: 5px;");
        themePalette.setColor(QPalette::Window, QColor(240, 240, 240));   // Light gray
        themePalette.setColor(QPalette::WindowText, Qt::black);           // Black
        themePalette.setColor(QPalette::Base, QColor(230, 230, 230, 80)); // Grayish
        themePalette.setColor(QPalette::ToolTipBase, Qt::black);          // Black
        themePalette.setColor(QPalette::ToolTipText, Qt::black);          // Black
        themePalette.setColor(QPalette::Text, Qt::black);                 // Black
        themePalette.setColor(QPalette::Button, QColor(240, 240, 240));   // Light gray
        themePalette.setColor(QPalette::ButtonText, Qt::black);           // Black
        themePalette.setColor(QPalette::BrightText, Qt::red);             // Red
        themePalette.setColor(QPalette::Link, QColor(42, 130, 218));      // Blue
        themePalette.setColor(QPalette::Highlight, QColor(42, 130, 218)); // Blue
        themePalette.setColor(QPalette::HighlightedText, Qt::white);      // White
        qApp->setPalette(themePalette);
        break;
    case Theme::Green:
        mw_searchbar->setStyleSheet("background-color: #354535; /* Dark green background */"
                                    "color: #ffffff;            /* White text */"
--- a/src/qt_gui/main_window_themes.h
+++ b/src/qt_gui/main_window_themes.h
@ -2,13 +2,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 #include <QApplication>
 #include <QLineEdit>
 #include <QWidget>
 enum class Theme : int {
    Light,
    Dark,
    Light,
    Green,
    Blue,
    Violet,
--- a/src/qt_gui/main_window_ui.h
+++ b/src/qt_gui/main_window_ui.h
@ -44,8 +44,8 @@ public:
    QAction* gameInstallPathAct;
    QAction* dumpGameListAct;
    QAction* pkgViewerAct;
    QAction* setThemeLight;
    QAction* setThemeDark;
    QAction* setThemeLight;
    QAction* setThemeGreen;
    QAction* setThemeBlue;
    QAction* setThemeViolet;
@ -76,7 +76,7 @@ public:
            MainWindow->setObjectName("MainWindow");
        // MainWindow->resize(1280, 720);
        QIcon icon;
-        icon.addFile(QString::fromUtf8(":/images/shadps4.ico"), QSize(), QIcon::Normal, QIcon::Off);
+        icon.addFile(QString::fromUtf8(":images/shadps4.ico"), QSize(), QIcon::Normal, QIcon::Off);
        MainWindow->setWindowIcon(icon);
        QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
        sizePolicy.setHorizontalStretch(0);
@ -136,13 +136,13 @@ public:
        pkgViewerAct->setObjectName("pkgViewer");
        pkgViewerAct->setObjectName("pkgViewer");
        pkgViewerAct->setIcon(QIcon(":images/file_icon.png"));
        setThemeLight = new QAction(MainWindow);
        setThemeLight->setObjectName("setThemeLight");
        setThemeLight->setCheckable(true);
        setThemeLight->setChecked(true);
        setThemeDark = new QAction(MainWindow);
        setThemeDark->setObjectName("setThemeDark");
        setThemeDark->setCheckable(true);
        setThemeDark->setChecked(true);
        setThemeLight = new QAction(MainWindow);
        setThemeLight->setObjectName("setThemeLight");
        setThemeLight->setCheckable(true);
        setThemeGreen = new QAction(MainWindow);
        setThemeGreen->setObjectName("setThemeGreen");
        setThemeGreen->setCheckable(true);
@ -285,7 +285,7 @@ public:
    } // setupUi
    void retranslateUi(QMainWindow* MainWindow) {
-        MainWindow->setWindowTitle(QCoreApplication::translate("MainWindow", "Shadps4", nullptr));
+        MainWindow->setWindowTitle(QCoreApplication::translate("MainWindow", "shadPS4", nullptr));
        addElfFolderAct->setText(
            QCoreApplication::translate("MainWindow", "Open/Add Elf Folder", nullptr));
        bootInstallPkgAct->setText(
@ -332,8 +332,8 @@ public:
        menuSettings->setTitle(QCoreApplication::translate("MainWindow", "Settings", nullptr));
        menuUtils->setTitle(QCoreApplication::translate("MainWindow", "Utils", nullptr));
        menuThemes->setTitle(QCoreApplication::translate("MainWindow", "Themes", nullptr));
        setThemeLight->setText(QCoreApplication::translate("MainWindow", "Light", nullptr));
        setThemeDark->setText(QCoreApplication::translate("MainWindow", "Dark", nullptr));
        setThemeLight->setText(QCoreApplication::translate("MainWindow", "Light", nullptr));
        setThemeGreen->setText(QCoreApplication::translate("MainWindow", "Green", nullptr));
        setThemeBlue->setText(QCoreApplication::translate("MainWindow", "Blue", nullptr));
        setThemeViolet->setText(QCoreApplication::translate("MainWindow", "Violet", nullptr));
--- a/src/qt_gui/pkg_viewer.cpp
+++ b/src/qt_gui/pkg_viewer.cpp
@ -3,6 +3,7 @@
 #include <QHeaderView>
 #include <QWidget>
 #include "pkg_viewer.h"
 PKGViewer::PKGViewer(std::shared_ptr<GameInfoClass> game_info_get, QWidget* parent,
--- a/src/qt_gui/pkg_viewer.h
+++ b/src/qt_gui/pkg_viewer.h
@ -15,6 +15,7 @@
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 #include <QtConcurrent/QtConcurrent>
 #include "common/io_file.h"
 #include "core/file_format/pkg.h"
 #include "core/file_format/pkg_type.h"
--- a/src/qt_gui/trophy_viewer.h
+++ b/src/qt_gui/trophy_viewer.h
@ -16,6 +16,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <QXmlStreamReader>
 #include "common/types.h"
 #include "core/file_format/trp.h"
--- a/src/sdl_window.cpp
+++ b/src/sdl_window.cpp
@ -11,6 +11,7 @@
 #include "core/libraries/pad/pad.h"
 #include "input/controller.h"
 #include "sdl_window.h"
 #include "video_core/renderdoc.h"
 #ifdef __APPLE__
 #include <SDL3/SDL_metal.h>
@ -18,16 +19,17 @@
 namespace Frontend {
-WindowSDL::WindowSDL(s32 width_, s32 height_, Input::GameController* controller_)
+WindowSDL::WindowSDL(s32 width_, s32 height_, Input::GameController* controller_,
                     std::string_view window_title)
    : width{width_}, height{height_}, controller{controller_} {
    if (SDL_Init(SDL_INIT_VIDEO) < 0) {
        UNREACHABLE_MSG("Failed to initialize SDL video subsystem: {}", SDL_GetError());
    }
    SDL_InitSubSystem(SDL_INIT_AUDIO);
    const std::string title = "shadPS4 v" + std::string(Common::VERSION);
    SDL_PropertiesID props = SDL_CreateProperties();
-    SDL_SetStringProperty(props, SDL_PROP_WINDOW_CREATE_TITLE_STRING, title.c_str());
+    SDL_SetStringProperty(props, SDL_PROP_WINDOW_CREATE_TITLE_STRING,
                          std::string(window_title).c_str());
    SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_X_NUMBER, SDL_WINDOWPOS_CENTERED);
    SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_Y_NUMBER, SDL_WINDOWPOS_CENTERED);
    SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_WIDTH_NUMBER, width);
@ -71,7 +73,7 @@ void WindowSDL::waitEvent() {
    // Called on main thread
    SDL_Event event;
-    if (!SDL_PollEvent(&event)) {
+    if (!SDL_WaitEvent(&event)) {
        return;
    }
@ -179,6 +181,11 @@ void WindowSDL::onKeyPress(const SDL_Event* event) {
        ax = Input::GetAxis(-0x80, 0x80, axisvalue);
        break;
    case SDLK_S:
        if (event->key.mod == SDL_KMOD_LCTRL) {
            // Trigger rdoc capture
            VideoCore::TriggerCapture();
            break;
        }
        axis = Input::Axis::LeftY;
        if (event->type == SDL_EVENT_KEY_DOWN) {
            axisvalue += 127;
--- a/src/sdl_window.h
+++ b/src/sdl_window.h
@ -3,6 +3,7 @@
 #pragma once
 #include <string>
 #include "common/types.h"
 struct SDL_Window;
@ -40,7 +41,8 @@ struct WindowSystemInfo {
 class WindowSDL {
 public:
-    explicit WindowSDL(s32 width, s32 height, Input::GameController* controller);
+    explicit WindowSDL(s32 width, s32 height, Input::GameController* controller,
                       std::string_view window_title);
    ~WindowSDL();
    s32 getWidth() const {
--- a/src/shader_recompiler/backend/spirv/emit_spirv.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv.cpp
@ -183,6 +183,7 @@ void DefineEntryPoint(const IR::Program& program, EmitContext& ctx, Id main) {
        ctx.AddCapability(spv::Capability::Float16);
        ctx.AddCapability(spv::Capability::Int16);
    }
    ctx.AddCapability(spv::Capability::Int64);
    if (info.has_storage_images) {
        ctx.AddCapability(spv::Capability::StorageImageExtendedFormats);
    }
@ -204,8 +205,8 @@ void DefineEntryPoint(const IR::Program& program, EmitContext& ctx, Id main) {
        } else {
            ctx.AddExecutionMode(main, spv::ExecutionMode::OriginUpperLeft);
        }
        if (info.uses_group_quad) {
        ctx.AddCapability(spv::Capability::GroupNonUniform);
        if (info.uses_group_quad) {
            ctx.AddCapability(spv::Capability::GroupNonUniformQuad);
        }
        if (info.has_discard) {
@ -217,9 +218,9 @@ void DefineEntryPoint(const IR::Program& program, EmitContext& ctx, Id main) {
        if (info.has_image_query) {
            ctx.AddCapability(spv::Capability::ImageQuery);
        }
-        // if (program.info.stores_frag_depth) {
+        if (info.stores.Get(IR::Attribute::Depth)) {
-        //     ctx.AddExecutionMode(main, spv::ExecutionMode::DepthReplacing);
+            ctx.AddExecutionMode(main, spv::ExecutionMode::DepthReplacing);
-        // }
+        }
        break;
    default:
        throw NotImplementedException("Stage {}", u32(program.info.stage));
--- a/src/shader_recompiler/backend/spirv/emit_spirv_bitwise_conversion.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_bitwise_conversion.cpp
@ -6,8 +6,8 @@
 namespace Shader::Backend::SPIRV {
-void EmitBitCastU16F16(EmitContext&) {
+Id EmitBitCastU16F16(EmitContext& ctx, Id value) {
-    UNREACHABLE_MSG("SPIR-V Instruction");
+    return ctx.OpBitcast(ctx.U16, value);
 }
 Id EmitBitCastU32F32(EmitContext& ctx, Id value) {
--- a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
@ -120,6 +120,7 @@ void EmitGetGotoVariable(EmitContext&) {
 }
 Id EmitReadConst(EmitContext& ctx) {
    return ctx.u32_zero_value;
    UNREACHABLE_MSG("Unreachable instruction");
 }
@ -149,6 +150,9 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, u32 comp) {
                // Attribute is disabled or varying component is not written
                return ctx.ConstF32(comp == 3 ? 1.0f : 0.0f);
            }
            if (param.is_default) {
                return ctx.OpCompositeExtract(param.component_type, param.id, comp);
            }
            if (param.num_components > 1) {
                const Id pointer{
@ -208,7 +212,7 @@ Id EmitGetAttributeU32(EmitContext& ctx, IR::Attribute attr, u32 comp) {
 void EmitSetAttribute(EmitContext& ctx, IR::Attribute attr, Id value, u32 element) {
    const Id pointer{OutputAttrPointer(ctx, attr, element)};
-    ctx.OpStore(pointer, value);
+    ctx.OpStore(pointer, ctx.OpBitcast(ctx.F32[1], value));
 }
 Id EmitLoadBufferU32(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address) {
--- a/src/shader_recompiler/backend/spirv/emit_spirv_convert.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_convert.cpp
@ -259,4 +259,8 @@ Id EmitConvertU16U32(EmitContext& ctx, Id value) {
    return ctx.OpUConvert(ctx.U16, value);
 }
 Id EmitConvertU32U16(EmitContext& ctx, Id value) {
    return ctx.OpUConvert(ctx.U32[1], value);
 }
 } // namespace Shader::Backend::SPIRV
--- a/src/shader_recompiler/backend/spirv/emit_spirv_floating_point.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_floating_point.cpp
@ -385,4 +385,8 @@ Id EmitFPIsInf64(EmitContext& ctx, Id value) {
    return ctx.OpIsInf(ctx.U1[1], value);
 }
 void EmitFPCmpClass32(EmitContext&) {
    UNREACHABLE();
 }
 } // namespace Shader::Backend::SPIRV
--- a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
@ -70,7 +70,6 @@ Id EmitImageGather(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, Id o
    const u32 comp = inst->Flags<IR::TextureInstInfo>().gather_comp.Value();
    ImageOperands operands;
    operands.Add(spv::ImageOperandsMask::Offset, offset);
    operands.Add(spv::ImageOperandsMask::Lod, ctx.ConstF32(0.f));
    return ctx.OpImageGather(ctx.F32[4], sampled_image, coords, ctx.ConstU32(comp), operands.mask,
                             operands.operands);
 }
@ -106,8 +105,7 @@ Id EmitImageQueryDimensions(EmitContext& ctx, IR::Inst* inst, u32 handle, Id lod
    const auto type = ctx.info.images[handle & 0xFFFF].type;
    const Id zero = ctx.u32_zero_value;
    const auto mips{[&] { return skip_mips ? zero : ctx.OpImageQueryLevels(ctx.U32[1], image); }};
-    const bool uses_lod{type != AmdGpu::ImageType::Color2DMsaa &&
+    const bool uses_lod{type != AmdGpu::ImageType::Color2DMsaa};
                        type != AmdGpu::ImageType::Buffer};
    const auto query{[&](Id type) {
        return uses_lod ? ctx.OpImageQuerySizeLod(type, image, lod)
                        : ctx.OpImageQuerySize(type, image);
--- a/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h
@ -42,6 +42,7 @@ void EmitSetVcc(EmitContext& ctx);
 void EmitSetSccLo(EmitContext& ctx);
 void EmitSetVccLo(EmitContext& ctx);
 void EmitSetVccHi(EmitContext& ctx);
 void EmitFPCmpClass32(EmitContext& ctx);
 void EmitPrologue(EmitContext& ctx);
 void EmitEpilogue(EmitContext& ctx);
 void EmitDiscard(EmitContext& ctx);
@ -148,7 +149,7 @@ Id EmitSelectU64(EmitContext& ctx, Id cond, Id true_value, Id false_value);
 Id EmitSelectF16(EmitContext& ctx, Id cond, Id true_value, Id false_value);
 Id EmitSelectF32(EmitContext& ctx, Id cond, Id true_value, Id false_value);
 Id EmitSelectF64(EmitContext& ctx, Id cond, Id true_value, Id false_value);
-void EmitBitCastU16F16(EmitContext& ctx);
+Id EmitBitCastU16F16(EmitContext& ctx, Id value);
 Id EmitBitCastU32F32(EmitContext& ctx, Id value);
 void EmitBitCastU64F64(EmitContext& ctx);
 Id EmitBitCastF16U16(EmitContext& ctx, Id value);
@ -258,6 +259,7 @@ Id EmitISub64(EmitContext& ctx, Id a, Id b);
 Id EmitSMulExt(EmitContext& ctx, Id a, Id b);
 Id EmitUMulExt(EmitContext& ctx, Id a, Id b);
 Id EmitIMul32(EmitContext& ctx, Id a, Id b);
 Id EmitIMul64(EmitContext& ctx, Id a, Id b);
 Id EmitSDiv32(EmitContext& ctx, Id a, Id b);
 Id EmitUDiv32(EmitContext& ctx, Id a, Id b);
 Id EmitINeg32(EmitContext& ctx, Id value);
@ -271,6 +273,7 @@ Id EmitShiftRightArithmetic32(EmitContext& ctx, Id base, Id shift);
 Id EmitShiftRightArithmetic64(EmitContext& ctx, Id base, Id shift);
 Id EmitBitwiseAnd32(EmitContext& ctx, IR::Inst* inst, Id a, Id b);
 Id EmitBitwiseOr32(EmitContext& ctx, IR::Inst* inst, Id a, Id b);
 Id EmitBitwiseOr64(EmitContext& ctx, IR::Inst* inst, Id a, Id b);
 Id EmitBitwiseXor32(EmitContext& ctx, IR::Inst* inst, Id a, Id b);
 Id EmitBitFieldInsert(EmitContext& ctx, Id base, Id insert, Id offset, Id count);
 Id EmitBitFieldSExtract(EmitContext& ctx, IR::Inst* inst, Id base, Id offset, Id count);
@ -280,14 +283,17 @@ Id EmitBitCount32(EmitContext& ctx, Id value);
 Id EmitBitwiseNot32(EmitContext& ctx, Id value);
 Id EmitFindSMsb32(EmitContext& ctx, Id value);
 Id EmitFindUMsb32(EmitContext& ctx, Id value);
 Id EmitFindILsb32(EmitContext& ctx, Id value);
 Id EmitSMin32(EmitContext& ctx, Id a, Id b);
 Id EmitUMin32(EmitContext& ctx, Id a, Id b);
 Id EmitSMax32(EmitContext& ctx, Id a, Id b);
 Id EmitUMax32(EmitContext& ctx, Id a, Id b);
 Id EmitSClamp32(EmitContext& ctx, IR::Inst* inst, Id value, Id min, Id max);
 Id EmitUClamp32(EmitContext& ctx, IR::Inst* inst, Id value, Id min, Id max);
-Id EmitSLessThan(EmitContext& ctx, Id lhs, Id rhs);
+Id EmitSLessThan32(EmitContext& ctx, Id lhs, Id rhs);
-Id EmitULessThan(EmitContext& ctx, Id lhs, Id rhs);
+Id EmitSLessThan64(EmitContext& ctx, Id lhs, Id rhs);
 Id EmitULessThan32(EmitContext& ctx, Id lhs, Id rhs);
 Id EmitULessThan64(EmitContext& ctx, Id lhs, Id rhs);
 Id EmitIEqual(EmitContext& ctx, Id lhs, Id rhs);
 Id EmitSLessThanEqual(EmitContext& ctx, Id lhs, Id rhs);
 Id EmitULessThanEqual(EmitContext& ctx, Id lhs, Id rhs);
@ -349,6 +355,7 @@ Id EmitConvertF64U16(EmitContext& ctx, Id value);
 Id EmitConvertF64U32(EmitContext& ctx, Id value);
 Id EmitConvertF64U64(EmitContext& ctx, Id value);
 Id EmitConvertU16U32(EmitContext& ctx, Id value);
 Id EmitConvertU32U16(EmitContext& ctx, Id value);
 Id EmitImageSampleImplicitLod(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, Id bias_lc,
                              Id offset);
@ -383,6 +390,7 @@ Id EmitImageAtomicXor32(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords,
 Id EmitImageAtomicExchange32(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, Id value);
 Id EmitLaneId(EmitContext& ctx);
 Id EmitWarpId(EmitContext& ctx);
 Id EmitQuadShuffle(EmitContext& ctx, Id value, Id index);
 } // namespace Shader::Backend::SPIRV
--- a/src/shader_recompiler/backend/spirv/emit_spirv_integer.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_integer.cpp
@ -84,6 +84,10 @@ Id EmitIMul32(EmitContext& ctx, Id a, Id b) {
    return ctx.OpIMul(ctx.U32[1], a, b);
 }
 Id EmitIMul64(EmitContext& ctx, Id a, Id b) {
    return ctx.OpIMul(ctx.U64, a, b);
 }
 Id EmitSDiv32(EmitContext& ctx, Id a, Id b) {
    return ctx.OpSDiv(ctx.U32[1], a, b);
 }
@ -142,6 +146,13 @@ Id EmitBitwiseOr32(EmitContext& ctx, IR::Inst* inst, Id a, Id b) {
    return result;
 }
 Id EmitBitwiseOr64(EmitContext& ctx, IR::Inst* inst, Id a, Id b) {
    const Id result{ctx.OpBitwiseOr(ctx.U64, a, b)};
    SetZeroFlag(ctx, inst, result);
    SetSignFlag(ctx, inst, result);
    return result;
 }
 Id EmitBitwiseXor32(EmitContext& ctx, IR::Inst* inst, Id a, Id b) {
    const Id result{ctx.OpBitwiseXor(ctx.U32[1], a, b)};
    SetZeroFlag(ctx, inst, result);
@ -187,6 +198,10 @@ Id EmitFindUMsb32(EmitContext& ctx, Id value) {
    return ctx.OpFindUMsb(ctx.U32[1], value);
 }
 Id EmitFindILsb32(EmitContext& ctx, Id value) {
    return ctx.OpFindILsb(ctx.U32[1], value);
 }
 Id EmitSMin32(EmitContext& ctx, Id a, Id b) {
    return ctx.OpSMin(ctx.U32[1], a, b);
 }
@ -231,11 +246,19 @@ Id EmitUClamp32(EmitContext& ctx, IR::Inst* inst, Id value, Id min, Id max) {
    return result;
 }
-Id EmitSLessThan(EmitContext& ctx, Id lhs, Id rhs) {
+Id EmitSLessThan32(EmitContext& ctx, Id lhs, Id rhs) {
    return ctx.OpSLessThan(ctx.U1[1], lhs, rhs);
 }
-Id EmitULessThan(EmitContext& ctx, Id lhs, Id rhs) {
+Id EmitSLessThan64(EmitContext& ctx, Id lhs, Id rhs) {
    return ctx.OpSLessThan(ctx.U1[1], lhs, rhs);
 }
 Id EmitULessThan32(EmitContext& ctx, Id lhs, Id rhs) {
    return ctx.OpULessThan(ctx.U1[1], lhs, rhs);
 }
 Id EmitULessThan64(EmitContext& ctx, Id lhs, Id rhs) {
    return ctx.OpULessThan(ctx.U1[1], lhs, rhs);
 }
--- a/src/shader_recompiler/backend/spirv/emit_spirv_warp.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_warp.cpp
@ -10,6 +10,10 @@ Id SubgroupScope(EmitContext& ctx) {
    return ctx.ConstU32(static_cast<u32>(spv::Scope::Subgroup));
 }
 Id EmitWarpId(EmitContext& ctx) {
    return ctx.OpLoad(ctx.U32[1], ctx.subgroup_id);
 }
 Id EmitLaneId(EmitContext& ctx) {
    return ctx.OpLoad(ctx.U32[1], ctx.subgroup_local_invocation_id);
 }
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
@ -49,7 +49,7 @@ EmitContext::EmitContext(const Profile& profile_, IR::Program& program, u32& bin
    DefineInterfaces(program);
    DefineBuffers(info);
    DefineImagesAndSamplers(info);
-    DefineSharedMemory(info);
+    DefineSharedMemory();
 }
 EmitContext::~EmitContext() = default;
@ -86,6 +86,7 @@ void EmitContext::DefineArithmeticTypes() {
    F32[1] = Name(TypeFloat(32), "f32_id");
    S32[1] = Name(TypeSInt(32), "i32_id");
    U32[1] = Name(TypeUInt(32), "u32_id");
    U64 = Name(TypeUInt(64), "u64_id");
    for (u32 i = 2; i <= 4; i++) {
        if (info.uses_fp16) {
@ -126,6 +127,7 @@ Id GetAttributeType(EmitContext& ctx, AmdGpu::NumberFormat fmt) {
    case AmdGpu::NumberFormat::Float:
    case AmdGpu::NumberFormat::Unorm:
    case AmdGpu::NumberFormat::Snorm:
    case AmdGpu::NumberFormat::SnormNz:
        return ctx.F32[4];
    case AmdGpu::NumberFormat::Sint:
        return ctx.S32[4];
@ -146,6 +148,7 @@ EmitContext::SpirvAttribute EmitContext::GetAttributeInfo(AmdGpu::NumberFormat f
    case AmdGpu::NumberFormat::Float:
    case AmdGpu::NumberFormat::Unorm:
    case AmdGpu::NumberFormat::Snorm:
    case AmdGpu::NumberFormat::SnormNz:
        return {id, input_f32, F32[1], 4};
    case AmdGpu::NumberFormat::Uint:
        return {id, input_u32, U32[1], 4};
@ -204,7 +207,9 @@ void EmitContext::DefineInputs(const Info& info) {
                                                                                             : 1;
                // Note that we pass index rather than Id
                input_params[input.binding] = {
-                    rate_idx, input_u32, U32[1], input.num_components, input.instance_data_buf,
+                    rate_idx, input_u32,
                    U32[1],   input.num_components,
                    false,    input.instance_data_buf,
                };
            } else {
                Id id{DefineInput(type, input.binding)};
@ -220,19 +225,18 @@ void EmitContext::DefineInputs(const Info& info) {
        break;
    }
    case Stage::Fragment:
-        if (info.uses_group_quad) {
+        subgroup_id = DefineVariable(U32[1], spv::BuiltIn::SubgroupId, spv::StorageClass::Input);
        subgroup_local_invocation_id = DefineVariable(
            U32[1], spv::BuiltIn::SubgroupLocalInvocationId, spv::StorageClass::Input);
        Decorate(subgroup_local_invocation_id, spv::Decoration::Flat);
        }
        frag_coord = DefineVariable(F32[4], spv::BuiltIn::FragCoord, spv::StorageClass::Input);
        frag_depth = DefineVariable(F32[1], spv::BuiltIn::FragDepth, spv::StorageClass::Output);
        front_facing = DefineVariable(U1[1], spv::BuiltIn::FrontFacing, spv::StorageClass::Input);
        for (const auto& input : info.ps_inputs) {
            const u32 semantic = input.param_index;
            if (input.is_default) {
-                input_params[semantic] = {MakeDefaultValue(*this, input.default_value), input_f32,
+                input_params[semantic] = {MakeDefaultValue(*this, input.default_value), F32[1],
-                                          F32[1]};
+                                          F32[1], 4, true};
                continue;
            }
            const IR::Attribute param{IR::Attribute::Param0 + input.param_index};
@ -392,7 +396,16 @@ spv::ImageFormat GetFormat(const AmdGpu::Image& image) {
        image.GetNumberFmt() == AmdGpu::NumberFormat::Uint) {
        return spv::ImageFormat::Rgba8ui;
    }
-    UNREACHABLE();
+    if (image.GetDataFmt() == AmdGpu::DataFormat::Format10_11_11 &&
        image.GetNumberFmt() == AmdGpu::NumberFormat::Float) {
        return spv::ImageFormat::R11fG11fB10f;
    }
    if (image.GetDataFmt() == AmdGpu::DataFormat::Format32_32_32_32 &&
        image.GetNumberFmt() == AmdGpu::NumberFormat::Float) {
        return spv::ImageFormat::Rgba32f;
    }
    UNREACHABLE_MSG("Unknown storage format data_format={}, num_format={}", image.GetDataFmt(),
                    image.GetNumberFmt());
 }
 Id ImageType(EmitContext& ctx, const ImageResource& desc, Id sampled_type) {
@ -412,8 +425,6 @@ Id ImageType(EmitContext& ctx, const ImageResource& desc, Id sampled_type) {
        return ctx.TypeImage(sampled_type, spv::Dim::Dim3D, false, false, false, sampled, format);
    case AmdGpu::ImageType::Cube:
        return ctx.TypeImage(sampled_type, spv::Dim::Cube, false, false, false, sampled, format);
    case AmdGpu::ImageType::Buffer:
        throw NotImplementedException("Image buffer");
    default:
        break;
    }
@ -471,10 +482,14 @@ void EmitContext::DefineImagesAndSamplers(const Info& info) {
    }
 }
-void EmitContext::DefineSharedMemory(const Info& info) {
+void EmitContext::DefineSharedMemory() {
-    if (info.shared_memory_size == 0) {
+    static constexpr size_t DefaultSharedMemSize = 16_KB;
    if (!info.uses_shared) {
        return;
    }
    if (info.shared_memory_size == 0) {
        info.shared_memory_size = DefaultSharedMemSize;
    }
    const auto make{[&](Id element_type, u32 element_size) {
        const u32 num_elements{Common::DivCeil(info.shared_memory_size, element_size)};
        const Id array_type{TypeArray(element_type, ConstU32(num_elements))};
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.h
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.h
@ -180,6 +180,7 @@ public:
    Id workgroup_id{};
    Id local_invocation_id{};
    Id subgroup_id{};
    Id subgroup_local_invocation_id{};
    Id image_u32{};
@ -219,6 +220,7 @@ public:
        Id pointer_type;
        Id component_type;
        u32 num_components;
        bool is_default{};
        s32 buffer_handle{-1};
    };
    std::array<SpirvAttribute, 32> input_params{};
@ -231,7 +233,7 @@ private:
    void DefineOutputs(const Info& info);
    void DefineBuffers(const Info& info);
    void DefineImagesAndSamplers(const Info& info);
-    void DefineSharedMemory(const Info& info);
+    void DefineSharedMemory();
    SpirvAttribute GetAttributeInfo(AmdGpu::NumberFormat fmt, Id id);
 };
--- a/src/shader_recompiler/frontend/format.cpp
+++ b/src/shader_recompiler/frontend/format.cpp
@ -1479,7 +1479,7 @@ constexpr std::array<InstFormat, 455> InstructionFormatVOP3 = {{
    {InstClass::VectorFpGraph32, InstCategory::VectorALU, 3, 1, ScalarType::Float32,
     ScalarType::Float32},
    // 337 = V_MIN3_F32
-    {InstClass::VectorIntArith32, InstCategory::VectorALU, 3, 1, ScalarType::Float32,
+    {InstClass::VectorFpArith32, InstCategory::VectorALU, 3, 1, ScalarType::Float32,
     ScalarType::Float32},
    // 338 = V_MIN3_I32
    {InstClass::VectorIntArith32, InstCategory::VectorALU, 3, 1, ScalarType::Sint32,
@ -1488,7 +1488,7 @@ constexpr std::array<InstFormat, 455> InstructionFormatVOP3 = {{
    {InstClass::VectorIntArith32, InstCategory::VectorALU, 3, 1, ScalarType::Uint32,
     ScalarType::Uint32},
    // 340 = V_MAX3_F32
-    {InstClass::VectorIntArith32, InstCategory::VectorALU, 3, 1, ScalarType::Float32,
+    {InstClass::VectorFpArith32, InstCategory::VectorALU, 3, 1, ScalarType::Float32,
     ScalarType::Float32},
    // 341 = V_MAX3_I32
    {InstClass::VectorIntArith32, InstCategory::VectorALU, 3, 1, ScalarType::Sint32,
@ -1497,7 +1497,7 @@ constexpr std::array<InstFormat, 455> InstructionFormatVOP3 = {{
    {InstClass::VectorIntArith32, InstCategory::VectorALU, 3, 1, ScalarType::Uint32,
     ScalarType::Uint32},
    // 343 = V_MED3_F32
-    {InstClass::VectorIntArith32, InstCategory::VectorALU, 3, 1, ScalarType::Float32,
+    {InstClass::VectorFpArith32, InstCategory::VectorALU, 3, 1, ScalarType::Float32,
     ScalarType::Float32},
    // 344 = V_MED3_I32
    {InstClass::VectorIntArith32, InstCategory::VectorALU, 3, 1, ScalarType::Sint32,
@ -2779,11 +2779,9 @@ constexpr std::array<InstFormat, 256> InstructionFormatDS = {{
    // 60 = DS_READ_U16
    {InstClass::DsIdxRd, InstCategory::DataShare, 3, 1, ScalarType::Uint32, ScalarType::Uint32},
    // 61 = DS_CONSUME
-    {InstClass::DsAppendCon, InstCategory::DataShare, 3, 1, ScalarType::Undefined,
+    {InstClass::DsAppendCon, InstCategory::DataShare, 3, 1, ScalarType::Uint32, ScalarType::Uint32},
     ScalarType::Undefined},
    // 62 = DS_APPEND
-    {InstClass::DsAppendCon, InstCategory::DataShare, 3, 1, ScalarType::Undefined,
+    {InstClass::DsAppendCon, InstCategory::DataShare, 3, 1, ScalarType::Uint32, ScalarType::Uint32},
     ScalarType::Undefined},
    // 63 = DS_ORDERED_COUNT
    {InstClass::GdsOrdCnt, InstCategory::DataShare, 3, 1, ScalarType::Undefined,
     ScalarType::Undefined},
--- a/src/shader_recompiler/frontend/instruction.h
+++ b/src/shader_recompiler/frontend/instruction.h
@ -76,11 +76,11 @@ struct SMRD {
 };
 struct InstControlSOPK {
-    BitField<0, 16, u32> simm;
+    s16 simm;
 };
 struct InstControlSOPP {
-    BitField<0, 16, u32> simm;
+    s16 simm;
 };
 struct InstControlVOP3 {
--- a/src/shader_recompiler/frontend/opcodes.h
+++ b/src/shader_recompiler/frontend/opcodes.h
@ -2392,10 +2392,10 @@ enum class OperandField : u32 {
    ConstFloatPos_4_0,
    ConstFloatNeg_4_0,
    VccZ = 251,
-    ExecZ,
+    ExecZ = 252,
-    Scc,
+    Scc = 253,
-    LdsDirect,
+    LdsDirect = 254,
-    LiteralConst,
+    LiteralConst = 255,
    VectorGPR,
    Undefined = 0xFFFFFFFF,
--- a/src/shader_recompiler/frontend/structured_control_flow.cpp
+++ b/src/shader_recompiler/frontend/structured_control_flow.cpp
@ -600,13 +600,13 @@ public:
    TranslatePass(ObjectPool<IR::Inst>& inst_pool_, ObjectPool<IR::Block>& block_pool_,
                  ObjectPool<Statement>& stmt_pool_, Statement& root_stmt,
                  IR::AbstractSyntaxList& syntax_list_, std::span<const GcnInst> inst_list_,
-                  Info& info_)
+                  Info& info_, const Profile& profile_)
        : stmt_pool{stmt_pool_}, inst_pool{inst_pool_}, block_pool{block_pool_},
-          syntax_list{syntax_list_}, inst_list{inst_list_}, info{info_} {
+          syntax_list{syntax_list_}, inst_list{inst_list_}, info{info_}, profile{profile_} {
        Visit(root_stmt, nullptr, nullptr);
        IR::Block& first_block{*syntax_list.front().data.block};
-        Translator{&first_block, info}.EmitPrologue();
+        Translator{&first_block, info, profile}.EmitPrologue();
    }
 private:
@ -635,7 +635,7 @@ private:
                    const u32 start = stmt.block->begin_index;
                    const u32 size = stmt.block->end_index - start + 1;
                    Translate(current_block, stmt.block->begin, inst_list.subspan(start, size),
-                              info);
+                              info, profile);
                }
                break;
            }
@ -815,16 +815,18 @@ private:
    const Block dummy_flow_block{.is_dummy = true};
    std::span<const GcnInst> inst_list;
    Info& info;
    const Profile& profile;
 };
 } // Anonymous namespace
 IR::AbstractSyntaxList BuildASL(ObjectPool<IR::Inst>& inst_pool, ObjectPool<IR::Block>& block_pool,
-                                CFG& cfg, Info& info) {
+                                CFG& cfg, Info& info, const Profile& profile) {
    ObjectPool<Statement> stmt_pool{64};
    GotoPass goto_pass{cfg, stmt_pool};
    Statement& root{goto_pass.RootStatement()};
    IR::AbstractSyntaxList syntax_list;
-    TranslatePass{inst_pool, block_pool, stmt_pool, root, syntax_list, cfg.inst_list, info};
+    TranslatePass{inst_pool,   block_pool,    stmt_pool, root,
                  syntax_list, cfg.inst_list, info,      profile};
    ASSERT_MSG(!info.translation_failed, "Shader translation has failed");
    return syntax_list;
 }
--- a/src/shader_recompiler/frontend/structured_control_flow.h
+++ b/src/shader_recompiler/frontend/structured_control_flow.h
@ -11,12 +11,13 @@
 namespace Shader {
 struct Info;
-}
+struct Profile;
 } // namespace Shader
 namespace Shader::Gcn {
 [[nodiscard]] IR::AbstractSyntaxList BuildASL(ObjectPool<IR::Inst>& inst_pool,
                                              ObjectPool<IR::Block>& block_pool, CFG& cfg,
-                                              Info& info);
+                                              Info& info, const Profile& profile);
 } // namespace Shader::Gcn
--- a/src/shader_recompiler/frontend/translate/data_share.cpp
+++ b/src/shader_recompiler/frontend/translate/data_share.cpp
@ -5,6 +5,31 @@
 namespace Shader::Gcn {
 void Translator::EmitDataShare(const GcnInst& inst) {
    switch (inst.opcode) {
    case Opcode::DS_SWIZZLE_B32:
        return DS_SWIZZLE_B32(inst);
    case Opcode::DS_READ_B32:
        return DS_READ(32, false, false, inst);
    case Opcode::DS_READ_B64:
        return DS_READ(64, false, false, inst);
    case Opcode::DS_READ2_B32:
        return DS_READ(32, false, true, inst);
    case Opcode::DS_READ2_B64:
        return DS_READ(64, false, true, inst);
    case Opcode::DS_WRITE_B32:
        return DS_WRITE(32, false, false, inst);
    case Opcode::DS_WRITE_B64:
        return DS_WRITE(64, false, false, inst);
    case Opcode::DS_WRITE2_B32:
        return DS_WRITE(32, false, true, inst);
    case Opcode::DS_WRITE2_B64:
        return DS_WRITE(64, false, true, inst);
    default:
        LogMissingOpcode(inst);
    }
 }
 void Translator::DS_SWIZZLE_B32(const GcnInst& inst) {
    const u8 offset0 = inst.control.ds.offset0;
    const u8 offset1 = inst.control.ds.offset1;
@ -20,14 +45,25 @@ void Translator::DS_SWIZZLE_B32(const GcnInst& inst) {
 void Translator::DS_READ(int bit_size, bool is_signed, bool is_pair, const GcnInst& inst) {
    const IR::U32 addr{ir.GetVectorReg(IR::VectorReg(inst.src[0].code))};
-    const IR::VectorReg dst_reg{inst.dst[0].code};
+    IR::VectorReg dst_reg{inst.dst[0].code};
    if (is_pair) {
-        // Pair loads are either 32 or 64-bit. We assume 32-bit for now.
+        // Pair loads are either 32 or 64-bit
        ASSERT(bit_size == 32);
        const IR::U32 addr0 = ir.IAdd(addr, ir.Imm32(u32(inst.control.ds.offset0)));
-        ir.SetVectorReg(dst_reg, IR::U32{ir.LoadShared(32, is_signed, addr0)});
+        const IR::Value data0 = ir.LoadShared(bit_size, is_signed, addr0);
        if (bit_size == 32) {
            ir.SetVectorReg(dst_reg++, IR::U32{data0});
        } else {
            ir.SetVectorReg(dst_reg++, IR::U32{ir.CompositeExtract(data0, 0)});
            ir.SetVectorReg(dst_reg++, IR::U32{ir.CompositeExtract(data0, 1)});
        }
        const IR::U32 addr1 = ir.IAdd(addr, ir.Imm32(u32(inst.control.ds.offset1)));
-        ir.SetVectorReg(dst_reg + 1, IR::U32{ir.LoadShared(32, is_signed, addr1)});
+        const IR::Value data1 = ir.LoadShared(bit_size, is_signed, addr1);
        if (bit_size == 32) {
            ir.SetVectorReg(dst_reg++, IR::U32{data1});
        } else {
            ir.SetVectorReg(dst_reg++, IR::U32{ir.CompositeExtract(data1, 0)});
            ir.SetVectorReg(dst_reg++, IR::U32{ir.CompositeExtract(data1, 1)});
        }
    } else if (bit_size == 64) {
        const IR::Value data = ir.LoadShared(bit_size, is_signed, addr);
        ir.SetVectorReg(dst_reg, IR::U32{ir.CompositeExtract(data, 0)});
@ -43,11 +79,22 @@ void Translator::DS_WRITE(int bit_size, bool is_signed, bool is_pair, const GcnI
    const IR::VectorReg data0{inst.src[1].code};
    const IR::VectorReg data1{inst.src[2].code};
    if (is_pair) {
        ASSERT(bit_size == 32);
        const IR::U32 addr0 = ir.IAdd(addr, ir.Imm32(u32(inst.control.ds.offset0)));
        if (bit_size == 32) {
            ir.WriteShared(32, ir.GetVectorReg(data0), addr0);
        } else {
            ir.WriteShared(
                64, ir.CompositeConstruct(ir.GetVectorReg(data0), ir.GetVectorReg(data0 + 1)),
                addr0);
        }
        const IR::U32 addr1 = ir.IAdd(addr, ir.Imm32(u32(inst.control.ds.offset1)));
        if (bit_size == 32) {
            ir.WriteShared(32, ir.GetVectorReg(data1), addr1);
        } else {
            ir.WriteShared(
                64, ir.CompositeConstruct(ir.GetVectorReg(data1), ir.GetVectorReg(data1 + 1)),
                addr1);
        }
    } else if (bit_size == 64) {
        const IR::Value data =
            ir.CompositeConstruct(ir.GetVectorReg(data0), ir.GetVectorReg(data0 + 1));
@ -62,7 +109,18 @@ void Translator::S_BARRIER() {
 }
 void Translator::V_READFIRSTLANE_B32(const GcnInst& inst) {
-    UNREACHABLE();
+    ASSERT(info.stage != Stage::Compute);
    SetDst(inst.dst[0], GetSrc(inst.src[0]));
 }
 void Translator::V_READLANE_B32(const GcnInst& inst) {
    ASSERT(info.stage != Stage::Compute);
    SetDst(inst.dst[0], GetSrc(inst.src[0]));
 }
 void Translator::V_WRITELANE_B32(const GcnInst& inst) {
    ASSERT(info.stage != Stage::Compute);
    SetDst(inst.dst[0], GetSrc(inst.src[0]));
 }
 } // namespace Shader::Gcn
--- a/src/shader_recompiler/frontend/translate/export.cpp
+++ b/src/shader_recompiler/frontend/translate/export.cpp
@ -6,7 +6,7 @@
 namespace Shader::Gcn {
-void Translator::EXP(const GcnInst& inst) {
+void Translator::EmitExport(const GcnInst& inst) {
    if (ir.block->has_multiple_predecessors && info.stage == Stage::Fragment) {
        LOG_WARNING(Render_Recompiler, "An ambiguous export appeared in translation");
        ir.Discard(ir.LogicalNot(ir.GetExec()));
--- a/src/shader_recompiler/frontend/translate/scalar_alu.cpp
+++ b/src/shader_recompiler/frontend/translate/scalar_alu.cpp
@ -5,8 +5,102 @@
 namespace Shader::Gcn {
 void Translator::EmitScalarAlu(const GcnInst& inst) {
    switch (inst.opcode) {
    case Opcode::S_MOVK_I32:
        return S_MOVK(inst);
    case Opcode::S_MOV_B32:
        return S_MOV(inst);
    case Opcode::S_MUL_I32:
        return S_MUL_I32(inst);
    case Opcode::S_AND_SAVEEXEC_B64:
        return S_AND_SAVEEXEC_B64(inst);
    case Opcode::S_MOV_B64:
        return S_MOV_B64(inst);
    case Opcode::S_CMP_LT_U32:
        return S_CMP(ConditionOp::LT, false, inst);
    case Opcode::S_CMP_LE_U32:
        return S_CMP(ConditionOp::LE, false, inst);
    case Opcode::S_CMP_LG_U32:
        return S_CMP(ConditionOp::LG, false, inst);
    case Opcode::S_CMP_LT_I32:
        return S_CMP(ConditionOp::LT, true, inst);
    case Opcode::S_CMP_LG_I32:
        return S_CMP(ConditionOp::LG, true, inst);
    case Opcode::S_CMP_GT_I32:
        return S_CMP(ConditionOp::GT, true, inst);
    case Opcode::S_CMP_GE_I32:
        return S_CMP(ConditionOp::GE, true, inst);
    case Opcode::S_CMP_EQ_I32:
        return S_CMP(ConditionOp::EQ, true, inst);
    case Opcode::S_CMP_EQ_U32:
        return S_CMP(ConditionOp::EQ, false, inst);
    case Opcode::S_CMP_GE_U32:
        return S_CMP(ConditionOp::GE, false, inst);
    case Opcode::S_CMP_GT_U32:
        return S_CMP(ConditionOp::GT, false, inst);
    case Opcode::S_OR_B64:
        return S_OR_B64(NegateMode::None, false, inst);
    case Opcode::S_NOR_B64:
        return S_OR_B64(NegateMode::Result, false, inst);
    case Opcode::S_XOR_B64:
        return S_OR_B64(NegateMode::None, true, inst);
    case Opcode::S_ORN2_B64:
        return S_OR_B64(NegateMode::Src1, false, inst);
    case Opcode::S_AND_B64:
        return S_AND_B64(NegateMode::None, inst);
    case Opcode::S_NAND_B64:
        return S_AND_B64(NegateMode::Result, inst);
    case Opcode::S_ANDN2_B64:
        return S_AND_B64(NegateMode::Src1, inst);
    case Opcode::S_NOT_B64:
        return S_NOT_B64(inst);
    case Opcode::S_ADD_I32:
        return S_ADD_I32(inst);
    case Opcode::S_AND_B32:
        return S_AND_B32(inst);
    case Opcode::S_ASHR_I32:
        return S_ASHR_I32(inst);
    case Opcode::S_OR_B32:
        return S_OR_B32(inst);
    case Opcode::S_LSHL_B32:
        return S_LSHL_B32(inst);
    case Opcode::S_LSHR_B32:
        return S_LSHR_B32(inst);
    case Opcode::S_CSELECT_B32:
        return S_CSELECT_B32(inst);
    case Opcode::S_CSELECT_B64:
        return S_CSELECT_B64(inst);
    case Opcode::S_BFE_U32:
        return S_BFE_U32(inst);
    case Opcode::S_BFM_B32:
        return S_BFM_B32(inst);
    case Opcode::S_BREV_B32:
        return S_BREV_B32(inst);
    case Opcode::S_ADD_U32:
        return S_ADD_U32(inst);
    case Opcode::S_ADDC_U32:
        return S_ADDC_U32(inst);
    case Opcode::S_ADDK_I32:
        return S_ADDK_I32(inst);
    case Opcode::S_MULK_I32:
        return S_MULK_I32(inst);
    case Opcode::S_SUB_U32:
    case Opcode::S_SUB_I32:
        return S_SUB_U32(inst);
    case Opcode::S_MIN_U32:
        return S_MIN_U32(inst);
    case Opcode::S_MAX_U32:
        return S_MAX_U32(inst);
    case Opcode::S_WQM_B64:
        break;
    default:
        LogMissingOpcode(inst);
    }
 }
 void Translator::S_MOVK(const GcnInst& inst) {
-    const auto simm16 = inst.control.sopk.simm.Value();
+    const auto simm16 = inst.control.sopk.simm;
    if (simm16 & (1 << 15)) {
        // TODO: need to verify the case of imm sign extension
        UNREACHABLE();
@ -14,6 +108,16 @@ void Translator::S_MOVK(const GcnInst& inst) {
    SetDst(inst.dst[0], ir.Imm32(simm16));
 }
 void Translator::S_ADDK_I32(const GcnInst& inst) {
    const s32 simm16 = inst.control.sopk.simm;
    SetDst(inst.dst[0], ir.IAdd(GetSrc(inst.dst[0]), ir.Imm32(simm16)));
 }
 void Translator::S_MULK_I32(const GcnInst& inst) {
    const s32 simm16 = inst.control.sopk.simm;
    SetDst(inst.dst[0], ir.IMul(GetSrc(inst.dst[0]), ir.Imm32(simm16)));
 }
 void Translator::S_MOV(const GcnInst& inst) {
    SetDst(inst.dst[0], GetSrc(inst.src[0]));
 }
@ -62,15 +166,10 @@ void Translator::S_AND_SAVEEXEC_B64(const GcnInst& inst) {
        }
    }();
    // Mark destination SPGR as an EXEC context. This means we will use 1-bit
    // IR instruction whenever it's loaded.
    switch (inst.dst[0].field) {
-    case OperandField::ScalarGPR: {
+    case OperandField::ScalarGPR:
-        const u32 reg = inst.dst[0].code;
+        ir.SetThreadBitScalarReg(IR::ScalarReg(inst.dst[0].code), exec);
        exec_contexts[reg] = true;
        ir.SetThreadBitScalarReg(IR::ScalarReg(reg), exec);
        break;
    }
    case OperandField::VccLo:
        ir.SetVcc(exec);
        break;
@ -79,27 +178,37 @@ void Translator::S_AND_SAVEEXEC_B64(const GcnInst& inst) {
    }
    // Update EXEC.
-    ir.SetExec(ir.LogicalAnd(exec, src));
+    const IR::U1 result = ir.LogicalAnd(exec, src);
    ir.SetExec(result);
    ir.SetScc(result);
 }
 void Translator::S_MOV_B64(const GcnInst& inst) {
-    // TODO: Using VCC as EXEC context.
+    const IR::U1 src = [&] {
-    if (inst.src[0].field == OperandField::VccLo || inst.dst[0].field == OperandField::VccLo) {
+        switch (inst.src[0].field) {
-        return;
+        case OperandField::VccLo:
            return ir.GetVcc();
        case OperandField::ExecLo:
            return ir.GetExec();
        case OperandField::ScalarGPR:
            return ir.GetThreadBitScalarReg(IR::ScalarReg(inst.src[0].code));
        case OperandField::ConstZero:
            return ir.Imm1(false);
        default:
            UNREACHABLE();
        }
-    if (inst.dst[0].field == OperandField::ScalarGPR && inst.src[0].field == OperandField::ExecLo) {
+    }();
-        // Exec context push
+    switch (inst.dst[0].field) {
-        exec_contexts[inst.dst[0].code] = true;
+    case OperandField::ScalarGPR:
-        ir.SetThreadBitScalarReg(IR::ScalarReg(inst.dst[0].code), ir.GetExec());
+        ir.SetThreadBitScalarReg(IR::ScalarReg(inst.dst[0].code), src);
-    } else if (inst.dst[0].field == OperandField::ExecLo &&
+        break;
-               inst.src[0].field == OperandField::ScalarGPR) {
+    case OperandField::ExecLo:
-        // Exec context pop
+        ir.SetExec(src);
-        exec_contexts[inst.src[0].code] = false;
+        break;
-        ir.SetExec(ir.GetThreadBitScalarReg(IR::ScalarReg(inst.src[0].code)));
+    case OperandField::VccLo:
-    } else if (inst.dst[0].field == OperandField::ExecLo &&
+        ir.SetVcc(src);
-               inst.src[0].field == OperandField::ConstZero) {
+        break;
-        ir.SetExec(ir.Imm1(false));
+    default:
    } else {
        UNREACHABLE();
    }
 }
@ -338,4 +447,20 @@ void Translator::S_ADDC_U32(const GcnInst& inst) {
    SetDst(inst.dst[0], ir.IAdd(ir.IAdd(src0, src1), ir.GetSccLo()));
 }
 void Translator::S_MAX_U32(const GcnInst& inst) {
    const IR::U32 src0{GetSrc(inst.src[0])};
    const IR::U32 src1{GetSrc(inst.src[1])};
    const IR::U32 result = ir.UMax(src0, src1);
    SetDst(inst.dst[0], result);
    ir.SetScc(ir.IEqual(result, src0));
 }
 void Translator::S_MIN_U32(const GcnInst& inst) {
    const IR::U32 src0{GetSrc(inst.src[0])};
    const IR::U32 src1{GetSrc(inst.src[1])};
    const IR::U32 result = ir.UMin(src0, src1);
    SetDst(inst.dst[0], result);
    ir.SetScc(ir.IEqual(result, src0));
 }
 } // namespace Shader::Gcn
--- a/src/shader_recompiler/frontend/translate/scalar_memory.cpp
+++ b/src/shader_recompiler/frontend/translate/scalar_memory.cpp
@ -7,6 +7,29 @@ namespace Shader::Gcn {
 static constexpr u32 SQ_SRC_LITERAL = 0xFF;
 void Translator::EmitScalarMemory(const GcnInst& inst) {
    switch (inst.opcode) {
    case Opcode::S_LOAD_DWORDX4:
        return S_LOAD_DWORD(4, inst);
    case Opcode::S_LOAD_DWORDX8:
        return S_LOAD_DWORD(8, inst);
    case Opcode::S_LOAD_DWORDX16:
        return S_LOAD_DWORD(16, inst);
    case Opcode::S_BUFFER_LOAD_DWORD:
        return S_BUFFER_LOAD_DWORD(1, inst);
    case Opcode::S_BUFFER_LOAD_DWORDX2:
        return S_BUFFER_LOAD_DWORD(2, inst);
    case Opcode::S_BUFFER_LOAD_DWORDX4:
        return S_BUFFER_LOAD_DWORD(4, inst);
    case Opcode::S_BUFFER_LOAD_DWORDX8:
        return S_BUFFER_LOAD_DWORD(8, inst);
    case Opcode::S_BUFFER_LOAD_DWORDX16:
        return S_BUFFER_LOAD_DWORD(16, inst);
    default:
        LogMissingOpcode(inst);
    }
 }
 void Translator::S_LOAD_DWORD(int num_dwords, const GcnInst& inst) {
    const auto& smrd = inst.control.smrd;
    const u32 dword_offset = [&] -> u32 {
--- a/Show More
+++ b/Show More