From f031cd9b42ac2601577e7c3c4758e85bab1a10dd Mon Sep 17 00:00:00 2001
From: Eladash <elad3356p@gmail.com>
Date: Wed, 24 May 2023 14:58:19 +0300
Subject: [PATCH] Take advantage of WIN10 Thread Name API

---
 Utilities/Thread.cpp   | 12 ++++++++++++
 rpcs3/util/dyn_lib.hpp |  1 +
 2 files changed, 13 insertions(+)

diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp
index 717e6a7809..a4cb579789 100644
--- a/Utilities/Thread.cpp
+++ b/Utilities/Thread.cpp
@@ -15,6 +15,11 @@
 #include <Psapi.h>
 #include <process.h>
 #include <sysinfoapi.h>
+
+#include "util/dyn_lib.hpp"
+
+DYNAMIC_IMPORT_RENAME("Kernel32.dll", SetThreadDescriptionImport, "SetThreadDescription", HRESULT(HANDLE hThread, PCWSTR lpThreadDescription));
+
 #else
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
@@ -2074,6 +2079,13 @@ void thread_base::initialize(void (*error_cb)())
 
 void thread_base::set_name(std::string name)
 {
+#ifdef _WIN32
+	if (SetThreadDescriptionImport)
+	{
+		SetThreadDescriptionImport(GetCurrentThread(), utf8_to_wchar(name).c_str());
+	}
+#endif
+
 #ifdef _MSC_VER
 	struct THREADNAME_INFO
 	{
diff --git a/rpcs3/util/dyn_lib.hpp b/rpcs3/util/dyn_lib.hpp
index 487a80102e..9631e63840 100644
--- a/rpcs3/util/dyn_lib.hpp
+++ b/rpcs3/util/dyn_lib.hpp
@@ -110,3 +110,4 @@ namespace utils
 }
 
 #define DYNAMIC_IMPORT(lib, name, ...) inline constinit utils::dynamic_import<__VA_ARGS__> name(lib, #name);
+#define DYNAMIC_IMPORT_RENAME(lib, declare_name, lib_func_name, ...) inline constinit utils::dynamic_import<__VA_ARGS__> declare_name(lib, lib_func_name);