Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Loader fixes #284

Merged
merged 6 commits into from
Dec 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changes/sdk/pr.284.gh.OpenXR-SDK-Source.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Loader: Fixed incorrect return value when no broker is present on Android but runtime defined via active_runtime.json.
- Loader: Added /system to the search path on Android as per documentation.
- Docs: Fixed typo in docs.
2 changes: 1 addition & 1 deletion specification/loader/runtime.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ tag above.
If no runtime is found this way, as a fall-back, a similar process as on
Linux takes place, searching for `active_runtime.json` files in:

* `/odm/etc/openxr/1`
* `/oem/etc/openxr/1`
* `/vendor/etc/openxr/1`
* `/system/etc/openxr/1`

Expand Down
2 changes: 1 addition & 1 deletion src/common/platform_utils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ static inline bool PlatformUtilsSetEnv(const char* /* name */, const char* /* va
// Intended to be only used as a fallback on Android, with a more open, "native" technique used in most cases
static inline bool PlatformGetGlobalRuntimeFileName(uint16_t major_version, std::string& file_name) {
// Prefix for the runtime JSON file name
static const char* rt_dir_prefixes[] = {"/oem", "/vendor"};
static const char* rt_dir_prefixes[] = {"/oem", "/vendor", "/system"};
static const std::string rt_filename = "/active_runtime.json";
static const std::string subdir = "/etc/openxr/";
for (const auto prefix : rt_dir_prefixes) {
Expand Down
1 change: 1 addition & 0 deletions src/loader/manifest_file.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,7 @@ XrResult RuntimeManifestFile::FindManifestFiles(std::vector<std::unique_ptr<Runt
"", "RuntimeManifestFile::FindManifestFiles - failed to determine active runtime file path for this environment");
return XR_ERROR_RUNTIME_UNAVAILABLE;
}
result = XR_SUCCESS;
LoaderLogger::LogInfoMessage("", "RuntimeManifestFile::FindManifestFiles - using global runtime file " + filename);
#endif
}
Expand Down