yuzu-emu
/
sudachi
mirror of https://github.com/sudachi-emu/sudachi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated FFmpeg, SDL2 externals, fixed __noop and changed log level for mm:u

This commit is contained in:
Jarrod Norwell 2024-07-02 01:07:20 +08:00
parent eec52f8808
commit 128b258427
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/SDL vendored

@ -1 +1 @@
Subproject commit c60e2704c88ecb8bf55d69085b9c1bd2a68e5321 Subproject commit e1e36d213bea3a0b56d91b454c53a2c94312a5be

2
externals/ffmpeg/CMakeLists.txt vendored
View File

@ -254,7 +254,7 @@ elseif(ANDROID)
set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE) set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE)
elseif(WIN32) elseif(WIN32)
# Use sudachi FFmpeg binaries # Use sudachi FFmpeg binaries
set(FFmpeg_EXT_NAME "ffmpeg-6.0") set(FFmpeg_EXT_NAME "ffmpeg-7.0")
set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
set(FFmpeg_FOUND YES) set(FFmpeg_FOUND YES)

2
externals/ffmpeg/ffmpeg vendored

@ -1 +1 @@
Subproject commit e0db1f51d6ddf9eb2c1314c23d063a29255b607a Subproject commit cc6fb1643d7e14c6f76a48e0cffad96394cb197c

10
src/common/microprofile.h
View File

@ -5,7 +5,11 @@
// Uncomment this to disable microprofile. This will get you cleaner profiles when using // Uncomment this to disable microprofile. This will get you cleaner profiles when using
// external sampling profilers like "Very Sleepy", and will improve performance somewhat. // external sampling profilers like "Very Sleepy", and will improve performance somewhat.
#ifdef _DEBUG
#define MICROPROFILE_ENABLED 1
#else
#define MICROPROFILE_ENABLED 0 #define MICROPROFILE_ENABLED 0
#endif
// Customized Citra settings. // Customized Citra settings.
// This file wraps the MicroProfile header so that these are consistent everywhere. // This file wraps the MicroProfile header so that these are consistent everywhere.
@ -20,7 +24,11 @@ typedef void* HANDLE;
#endif #endif
#if MICROPROFILE_ENABLED == 0 #if MICROPROFILE_ENABLED == 0
#define MicroProfileOnThreadExit __noop #ifdef _WIN32
#define MicroProfileOnThreadExit() __noop
#else
#define MicroProfileOnThreadExit() 0
#endif
#endif #endif
#include <microprofile.h> #include <microprofile.h>

16
src/core/hle/service/mm/mm_u.cpp
View File

@ -30,7 +30,7 @@ public:
private: private:
void InitializeOld(HLERequestContext& ctx) { void InitializeOld(HLERequestContext& ctx) {
LOG_WARNING(Service_MM, "(STUBBED) called."); LOG_DEBUG(Service_MM, "(STUBBED) called.");
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
module = rp.PopEnum<Module>(); module = rp.PopEnum<Module>();
@ -42,7 +42,7 @@ private:
} }
void FinalizeOld(HLERequestContext& ctx) { void FinalizeOld(HLERequestContext& ctx) {
LOG_WARNING(Service_MM, "(STUBBED) called."); LOG_DEBUG(Service_MM, "(STUBBED) called.");
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
module = rp.PopEnum<Module>(); module = rp.PopEnum<Module>();
@ -52,7 +52,7 @@ private:
} }
void SetAndWaitOld(HLERequestContext& ctx) { void SetAndWaitOld(HLERequestContext& ctx) {
LOG_WARNING(Service_MM, "(STUBBED) called."); LOG_DEBUG(Service_MM, "(STUBBED) called.");
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
module = rp.PopEnum<Module>(); module = rp.PopEnum<Module>();
@ -65,7 +65,7 @@ private:
} }
void GetOld(HLERequestContext& ctx) { void GetOld(HLERequestContext& ctx) {
LOG_WARNING(Service_MM, "(STUBBED) called."); LOG_DEBUG(Service_MM, "(STUBBED) called.");
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
module = rp.PopEnum<Module>(); module = rp.PopEnum<Module>();
@ -76,7 +76,7 @@ private:
} }
void Initialize(HLERequestContext& ctx) { void Initialize(HLERequestContext& ctx) {
LOG_WARNING(Service_MM, "(STUBBED) called."); LOG_DEBUG(Service_MM, "(STUBBED) called.");
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
module = rp.PopEnum<Module>(); module = rp.PopEnum<Module>();
@ -89,7 +89,7 @@ private:
} }
void Finalize(HLERequestContext& ctx) { void Finalize(HLERequestContext& ctx) {
LOG_WARNING(Service_MM, "(STUBBED) called."); LOG_DEBUG(Service_MM, "(STUBBED) called.");
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
request_id = rp.Pop<u32>(); request_id = rp.Pop<u32>();
@ -99,7 +99,7 @@ private:
} }
void SetAndWait(HLERequestContext& ctx) { void SetAndWait(HLERequestContext& ctx) {
LOG_WARNING(Service_MM, "(STUBBED) called."); LOG_DEBUG(Service_MM, "(STUBBED) called.");
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
request_id = rp.Pop<u32>(); request_id = rp.Pop<u32>();
@ -112,7 +112,7 @@ private:
} }
void Get(HLERequestContext& ctx) { void Get(HLERequestContext& ctx) {
LOG_WARNING(Service_MM, "(STUBBED) called."); LOG_DEBUG(Service_MM, "(STUBBED) called.");
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
request_id = rp.Pop<u32>(); request_id = rp.Pop<u32>();