OpenXR - Version info refactor

hrydgard · Jul 26, 2022 · b2509ad · b2509ad
1 parent 19ebbb6
commit b2509ad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/VR/VRBase.cpp b/VR/VRBase.cpp
@@ -36,10 +36,10 @@ void VR_Init( ovrJava java ) {
 	// Create the OpenXR instance.
 	XrApplicationInfo appInfo;
 	memset(&appInfo, 0, sizeof(appInfo));
-	strcpy(appInfo.applicationName, "PPSSPP");
-	appInfo.applicationVersion = 0;
-	strcpy(appInfo.engineName, "PPSSPP");
-	appInfo.engineVersion = 0;
+	strcpy(appInfo.applicationName, java.AppName);
+	strcpy(appInfo.engineName, java.AppName);
+	appInfo.applicationVersion = java.AppVersion;
+	appInfo.engineVersion = java.AppVersion;
 	appInfo.apiVersion = XR_CURRENT_API_VERSION;
 
 	XrInstanceCreateInfo instanceCreateInfo;

diff --git a/VR/VRFramebuffer.h b/VR/VRFramebuffer.h
@@ -30,6 +30,8 @@ typedef struct {
 	JavaVM* Vm;
 	jobject ActivityObject;
 	JNIEnv* Env;
+	char AppName[64];
+	int AppVersion;
 } ovrJava;
 
 typedef struct {

diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp
@@ -811,9 +811,12 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeApp_init
 	}
 
 #ifdef OPENXR
+	Version gitVer(PPSSPP_GIT_VERSION);
 	ovrJava java;
 	java.Vm = gJvm;
 	java.ActivityObject = nativeActivity;
+	java.AppVersion = gitVer.ToInteger();
+	strcpy(java.AppName, "PPSSPP");
 	VR_Init(java);
 #endif
 }