archive/CitraVR
1
0
Fork 0
mirror of https://github.com/amwatson/CitraVR.git synced 2024-09-20 03:11:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect deletion of VrUiLayerObject to remove memory error

Browse source
This commit is contained in:
amwatson 2024-02-16 18:42:58 -06:00
parent c68b499ad9
commit 52fd1e1809
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/android/app/src/main/jni/vr/layers/UILayer.cpp
View file

@ -249,8 +249,10 @@ void UILayer::Shutdown() {
mSwapchain.mHeight = 0; mSwapchain.mHeight = 0;
mEnv->DeleteGlobalRef(mVrUILayerClass); mEnv->DeleteGlobalRef(mVrUILayerClass);
mVrUILayerClass = nullptr; mVrUILayerClass = nullptr;
mEnv->DeleteGlobalRef(mVrUILayerObject); // These steps are not strictly necessary for app shutdown, as references are cleaned up when
mVrUILayerClass = nullptr; // the JVM is destroyed, but memory-saving if this class is destroyed/re-initialized at runtime.
mEnv->DeleteLocalRef(mVrUILayerObject);
mVrUILayerObject = nullptr;
} }
int UILayer::CreateSwapchain() { int UILayer::CreateSwapchain() {

26
src/android/app/src/main/jni/vr/vr_main.cpp
View file

@ -1052,7 +1052,7 @@ public:
, mActivityObjectGlobalRef(jni->NewGlobalRef(activityObject)) { , mActivityObjectGlobalRef(jni->NewGlobalRef(activityObject)) {
assert(jvm != nullptr); assert(jvm != nullptr);
assert(activityObject != nullptr); assert(activityObject != nullptr);
mThread = std::thread([this]() {ThreadFn();}); mThread = std::thread([this]() { ThreadFn(); });
} }
~VRAppThread() { ~VRAppThread() {
@ -1066,20 +1066,20 @@ public:
private: private:
void ThreadFn() { void ThreadFn() {
assert(mVm != nullptr); assert(mVm != nullptr);
ALOGI("VRAppThread: starting"); ALOGI("VRAppThread: starting");
JNIEnv* jni = nullptr; JNIEnv* jni = nullptr;
if (mVm->AttachCurrentThread(&jni, nullptr) != JNI_OK) { if (mVm->AttachCurrentThread(&jni, nullptr) != JNI_OK) {
FAIL("%s(): Could not attach to mVm", __FUNCTION__); FAIL("%s(): Could not attach to mVm", __FUNCTION__);
} }
// Gotta set this after the JNIEnv is attached, or else it'll be // Gotta set this after the JNIEnv is attached, or else it'll be
// overwritten // overwritten
prctl(PR_SET_NAME, (long)"CVR::Main", 0, 0, 0); prctl(PR_SET_NAME, (long)"CVR::Main", 0, 0, 0);
ThreadFnJNI(jni); ThreadFnJNI(jni);
mVm->DetachCurrentThread(); mVm->DetachCurrentThread();
ALOGI("VRAppThread: exited"); ALOGI("VRAppThread: exited");
} }
// All operations assume that the JNIEnv is attached // All operations assume that the JNIEnv is attached