Changeset 105109 in vbox

Timestamp:

Jul 3, 2024 9:51:56 AM (5 months ago)

Author:

vboxsync

Message:

libs/Makefile.kmk: Switch to dxvk-2.3.1 from dxvk-native-1.9.2a, bugref:10716 [build fixes]

File:

• trunk/src/libs/dxvk-2.3.1/src/util/util_env.cpp (modified) (4 diffs)

trunk/src/libs/dxvk-2.3.1/src/util/util_env.cpp

@@ -7 +7 @@
 #include <unistd.h>
 #include <limits.h>
+#endif
+
+#ifdef VBOX
+# include <iprt/process.h>
 #endif
 
@@ -72 +76 @@
 
   std::string getExePath() {
+#ifdef VBOX
+    std::array<char, PATH_MAX> exePath = {};
+    if (!RTProcGetExecutablePath(exePath.data(), exePath.size()))
+      return std::string("");
+    return std::string(exePath.begin(), exePath.begin() + strlen(exePath.begin()));
+#else
 #if defined(_WIN32)
     std::vector<WCHAR> exePath;
@@ -87 +97 @@
     return std::string(exePath.begin(), exePath.begin() + count);
 #endif
+#endif /* VBOX */
   }
   
@@ -109 +120 @@
     std::array<char, 16> posixName = {};
     dxvk::str::strlcpy(posixName.data(), name.c_str(), 16);
+# if defined(VBOX) && defined(RT_OS_DARWIN)
+    ::pthread_setname_np(posixName.data());
+# else
     ::pthread_setname_np(pthread_self(), posixName.data());
+# endif
 #endif
   }