OpenXR loader: Propagate runtime info source

Author: quic-dengkail

src/loader/loader_init_data.hpp

@@ -16,6 +16,7 @@
 #include <json/value.h>
 #include <android/asset_manager_jni.h>
 #include "android_utilities.h"
+#include "manifest_file.hpp"
 #endif  // XR_USE_PLATFORM_ANDROID
 
 #ifdef XR_KHR_LOADER_INIT_SUPPORT
@@ -84,7 +85,9 @@ class LoaderInitData {
 XrResult InitializeLoaderInitData(const XrLoaderInitInfoBaseHeaderKHR* loaderInitInfo);
 
 #ifdef XR_USE_PLATFORM_ANDROID
-XrResult GetPlatformRuntimeVirtualManifest(Json::Value& out_manifest);
+
+//! Modifies @p out_manifest and @p out_runtime_source only if returning successfully
+XrResult GetPlatformRuntimeVirtualManifest(Json::Value& out_manifest, ManifestFileSource& out_runtime_source);
 std::string GetAndroidNativeLibraryDir();
 void* Android_Get_Asset_Manager();
 #endif  // XR_USE_PLATFORM_ANDROID

src/loader/manifest_file.cpp

@@ -682,7 +682,8 @@ XrResult RuntimeManifestFile::FindManifestFiles(const std::string &openxr_comman
 
 #if defined(XR_KHR_LOADER_INIT_SUPPORT) && defined(XR_USE_PLATFORM_ANDROID)
         Json::Value virtualManifest;
-        result = GetPlatformRuntimeVirtualManifest(virtualManifest);
+        ManifestFileSource runtimeSource = ManifestFileSource::FROM_JSON_MANIFEST;
+        result = GetPlatformRuntimeVirtualManifest(virtualManifest, runtimeSource);
         if (XR_SUCCESS == result) {
             RuntimeManifestFile::CreateIfValid(virtualManifest, "", manifest_files);
             return result;

src/loader/manifest_file.hpp

@@ -28,6 +28,16 @@ enum ManifestFileType {
     MANIFEST_TYPE_EXPLICIT_API_LAYER,
 };
 
+//! Where did the data for this manifest file (may be virtual) come from?
+enum ManifestFileSource {
+    //! An actual json file on a file system
+    FROM_JSON_MANIFEST = 0,
+    //! The installable runtime broker on Android
+    FROM_INSTALLABLE_BROKER,
+    //! The system runtime broker on Android
+    FROM_SYSTEM_BROKER,
+};
+
 struct JsonVersion {
     uint32_t major;
     uint32_t minor;

src/loader/runtime_interface.cpp

@@ -35,7 +35,7 @@
 #endif  // XR_USE_PLATFORM_ANDROID
 
 #if defined(XR_KHR_LOADER_INIT_SUPPORT) && defined(XR_USE_PLATFORM_ANDROID)
-XrResult GetPlatformRuntimeVirtualManifest(Json::Value& out_manifest) {
+XrResult GetPlatformRuntimeVirtualManifest(Json::Value& out_manifest, ManifestFileSource& out_runtime_source) {
     using wrap::android::content::Context;
     auto& initData = LoaderInitData::instance();
     if (!initData.initialized()) {
@@ -50,6 +50,11 @@ XrResult GetPlatformRuntimeVirtualManifest(Json::Value& out_manifest) {
     if (0 != openxr_android::getActiveRuntimeVirtualManifest(context, virtualManifest, systemBroker)) {
         return XR_ERROR_INITIALIZATION_FAILED;
     }
+    if (systemBroker) {
+        out_runtime_source = ManifestFileSource::FROM_SYSTEM_BROKER;
+    } else {
+        out_runtime_source = ManifestFileSource::FROM_INSTALLABLE_BROKER;
+    }
     out_manifest = virtualManifest;
     return XR_SUCCESS;
 }