godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-30 16:26:50 +00:00
Code Releases Wiki Activity

openxr: Sync with upstream 1.0.31, don't build obsolete dispatch table

Browse Source
This commit is contained in:
Rémi Verschelde
2023-10-26 09:25:05 +02:00
parent 2564026bcc
commit f0b6677906
20 changed files with 708 additions and 1062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
thirdparty/openxr/src/loader/manifest_file.cpp vendored
View File

@@ -274,16 +274,45 @@ static std::string GetXDGEnvAbsolute(const char *name, const char *fallback_path
return fallback_paths;
}
/// @param rt_dir_prefix Directory prefix with a trailing slash
static bool FindEitherActiveRuntimeFilename(const char *prefix_desc, const std::string &rt_dir_prefix, uint16_t major_version,
std::string &out) {
{
std::ostringstream oss;
oss << "Looking for active_runtime." XR_ARCH_ABI ".json or active_runtime.json in ";
oss << prefix_desc;
oss << ": ";
oss << rt_dir_prefix;
LoaderLogger::LogInfoMessage("", oss.str());
}
{
auto decorated_path = rt_dir_prefix + std::to_string(major_version) + "/active_runtime." XR_ARCH_ABI ".json";
if (FileSysUtilsPathExists(decorated_path)) {
out = decorated_path;
return true;
}
}
{
auto undecorated_path = rt_dir_prefix + std::to_string(major_version) + "/active_runtime.json";
if (FileSysUtilsPathExists(undecorated_path)) {
out = undecorated_path;
return true;
}
}
return false;
}
// Return the first instance of relative_path occurring in an XDG config dir according to standard
// precedence order.
static bool FindXDGConfigFile(const std::string &relative_path, std::string &out) {
out = GetXDGEnvHome("XDG_CONFIG_HOME", ".config");
if (!out.empty()) {
out += "/";
out += relative_path;
LoaderLogger::LogInfoMessage("", "Looking for " + relative_path + " in XDG_CONFIG_HOME: " + out);
if (FileSysUtilsPathExists(out)) {
static bool FindXDGConfigFile(const char *relative_dir, uint16_t major_version, std::string &out) {
const std::string message{"Looking for active_runtime." XR_ARCH_ABI ".json or active_runtime.json"};
std::string dir_prefix = GetXDGEnvHome("XDG_CONFIG_HOME", ".config");
if (!dir_prefix.empty()) {
dir_prefix += "/";
dir_prefix += relative_dir;
if (FindEitherActiveRuntimeFilename("XDG_CONFIG_HOME", dir_prefix, major_version, out)) {
return true;
}
}
@@ -294,29 +323,26 @@ static bool FindXDGConfigFile(const std::string &relative_path, std::string &out
if (path.empty()) {
continue;
}
out = path;
out += "/";
out += relative_path;
LoaderLogger::LogInfoMessage("", "Looking for " + relative_path + " in an entry of XDG_CONFIG_DIRS: " + out);
if (FileSysUtilsPathExists(out)) {
dir_prefix = std::move(path);
dir_prefix += "/";
dir_prefix += relative_dir;
if (FindEitherActiveRuntimeFilename("an entry of XDG_CONFIG_DIRS", dir_prefix, major_version, out)) {
return true;
}
}
out = SYSCONFDIR;
out += "/";
out += relative_path;
LoaderLogger::LogInfoMessage("", "Looking for " + relative_path + " in compiled-in SYSCONFDIR: " + out);
if (FileSysUtilsPathExists(out)) {
dir_prefix = SYSCONFDIR;
dir_prefix += "/";
dir_prefix += relative_dir;
if (FindEitherActiveRuntimeFilename("compiled-in SYSCONFDIR", dir_prefix, major_version, out)) {
return true;
}
#if defined(EXTRASYSCONFDIR)
out = EXTRASYSCONFDIR;
out += "/";
out += relative_path;
LoaderLogger::LogInfoMessage("", "Looking for " + relative_path + " in compiled-in EXTRASYSCONFDIR: " + out);
if (FileSysUtilsPathExists(out)) {
dir_prefix = EXTRASYSCONFDIR;
dir_prefix += "/";
dir_prefix += relative_dir;
if (FindEitherActiveRuntimeFilename("compiled-in EXTRASYSCONFDIR", dir_prefix, major_version, out)) {
return true;
}
#endif
@@ -632,9 +658,8 @@ XrResult RuntimeManifestFile::FindManifestFiles(std::vector<std::unique_ptr<Runt
LoaderLogger::LogInfoMessage("",
"RuntimeManifestFile::FindManifestFiles - using registry-specified runtime file " + filename);
#elif defined(XR_OS_LINUX)
const std::string relative_path =
"openxr/" + std::to_string(XR_VERSION_MAJOR(XR_CURRENT_API_VERSION)) + "/active_runtime.json";
if (!FindXDGConfigFile(relative_path, filename)) {
if (!FindXDGConfigFile("openxr/", XR_VERSION_MAJOR(XR_CURRENT_API_VERSION), filename)) {
LoaderLogger::LogErrorMessage(
"", "RuntimeManifestFile::FindManifestFiles - failed to determine active runtime file path for this environment");
return XR_ERROR_RUNTIME_UNAVAILABLE;