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

clean up destroy logic to avoid error due to deleting the wrong handle

Browse source
This commit is contained in:
amwatson 2024-01-30 18:23:39 -06:00
parent d13c6e57bf
commit a8d5894d30
3 changed files with 47 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/android/app/src/main/java/org/citra/citra_emu/vr/VrActivity.kt
View file

@ -17,6 +17,7 @@ import org.citra.citra_emu.features.settings.ui.SettingsActivity
import org.citra.citra_emu.features.settings.utils.SettingsFile
import org.citra.citra_emu.ui.main.MainActivity
import org.citra.citra_emu.utils.Log
import kotlin.system.exitProcess
class VrActivity : EmulationActivity() {
@ -56,8 +57,10 @@ class VrActivity : EmulationActivity() {
currentActivity = null
if (mHandle != 0L) {
nativeOnDestroy(mHandle)
mHandle = 0L
}
super.onDestroy()
exitProcess(0)
}
public override fun onStart() {

21
src/android/app/src/main/jni/vr/XrController.cpp
View file

@ -171,27 +171,42 @@ InputStateStatic::InputStateStatic(const XrInstance& instance, const XrSession&
}
InputStateStatic::~InputStateStatic() {
if (mActionSet != XR_NULL_HANDLE) {
OXR(xrDestroyActionSet(mActionSet));
}
OXR(xrDestroyAction(mLeftHandIndexTriggerAction));
mLeftHandIndexTriggerAction = XR_NULL_HANDLE;
OXR(xrDestroyAction(mRightHandIndexTriggerAction));
mRightHandIndexTriggerAction = XR_NULL_HANDLE;
OXR(xrDestroyAction(mLeftMenuButtonAction));
mLeftMenuButtonAction = XR_NULL_HANDLE;
OXR(xrDestroyAction(mAButtonAction));
mAButtonAction = XR_NULL_HANDLE;
OXR(xrDestroyAction(mBButtonAction));
mBButtonAction = XR_NULL_HANDLE;
OXR(xrDestroyAction(mXButtonAction));
mXButtonAction = XR_NULL_HANDLE;
OXR(xrDestroyAction(mYButtonAction));
mYButtonAction = XR_NULL_HANDLE;
OXR(xrDestroyAction(mHandPoseAction));
mHandPoseAction = XR_NULL_HANDLE;
OXR(xrDestroyAction(mThumbStickAction));
mThumbStickAction = XR_NULL_HANDLE;
OXR(xrDestroyAction(mThumbClickAction));
mThumbClickAction = XR_NULL_HANDLE;
OXR(xrDestroyAction(mThumbRestTouchAction));
mThumbRestTouchAction = XR_NULL_HANDLE;
OXR(xrDestroyAction(mSqueezeTriggerAction));
mSqueezeTriggerAction = XR_NULL_HANDLE;
if (mLeftHandSpace != XR_NULL_HANDLE) {
OXR(xrDestroySpace(mLeftHandSpace));
mLeftHandSpace = XR_NULL_HANDLE;
}
if (mRightHandSpace != XR_NULL_HANDLE) {
OXR(xrDestroySpace(mRightHandSpace));
mRightHandSpace = XR_NULL_HANDLE;
}
if (mActionSet != XR_NULL_HANDLE) {
OXR(xrDestroyActionSet(mActionSet));
mActionSet = XR_NULL_HANDLE;
}
}

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

@ -151,8 +151,14 @@ public:
~VRApp() {
assert(mVm != nullptr);
mIsStopRequested = false;
mThread.join();
// Note: this is in most cases already going to be true by the time the
// destructor is called, because it is set to true in onStop()
mIsStopRequested = true;
ALOGI("Waiting for VRApp thread to join");
if (mThread.joinable()) {
mThread.join();
}
ALOGI("VRApp thread joined");
JNIEnv* jni;
if (mVm->AttachCurrentThread(&jni, nullptr) != JNI_OK) {
// on most of the android systems, calling exit() isn't like the end
@ -210,9 +216,10 @@ public:
// aren't resetting their default settings to get higher res. min
// resolution factor for immersive is 3x.
const uint32_t immersiveModeOffset = (VRSettings::values.vr_immersive_mode > 0) ? 2 : 0;
const uint32_t resolutionFactor = (resolutionFactorFromPreferences > 0
? resolutionFactorFromPreferences
: defaultResolutionFactor) + immersiveModeOffset;
const uint32_t resolutionFactor =
(resolutionFactorFromPreferences > 0 ? resolutionFactorFromPreferences
: defaultResolutionFactor) +
immersiveModeOffset;
if (resolutionFactor != defaultResolutionFactor) {
ALOGI("Using resolution factor of {}x instead of HMD default {}x", resolutionFactor,
@ -275,6 +282,8 @@ public:
Frame(jni);
}
ALOGI("::MainLoop() exiting");
mVm->DetachCurrentThread();
}
@ -333,11 +342,10 @@ private:
mInputStateFrame.mThumbrestTouchState[InputStateFrame::LEFT_CONTROLLER];
const auto& rightThumbrestTouchState =
mInputStateFrame.mThumbrestTouchState[InputStateFrame::RIGHT_CONTROLLER];
const int dpadHand = leftThumbrestTouchState.currentState
? InputStateFrame::RIGHT_CONTROLLER
: rightThumbrestTouchState.currentState
? InputStateFrame::LEFT_CONTROLLER
: InputStateFrame::NUM_CONTROLLERS;
const int dpadHand =
leftThumbrestTouchState.currentState ? InputStateFrame::RIGHT_CONTROLLER
: rightThumbrestTouchState.currentState ? InputStateFrame::LEFT_CONTROLLER
: InputStateFrame::NUM_CONTROLLERS;
{
static constexpr float kThumbStickDirectionThreshold = 0.5f;
@ -879,17 +887,19 @@ Java_org_citra_citra_1emu_vr_VrActivity_nativeOnCreate(JNIEnv* env, jobject thiz
JavaVM* jvm;
env->GetJavaVM(&jvm);
return VRAppHandle(new VRApp(jvm, env->NewGlobalRef(thiz))).l;
auto ret = VRAppHandle(new VRApp(jvm, env->NewGlobalRef(thiz))).l;
ALOGI("amwatson nativeOnCreate {}", ret);
return ret;
}
extern "C" JNIEXPORT void JNICALL
Java_org_citra_citra_1emu_vr_VrActivity_nativeOnDestroy(JNIEnv* env, jlong handle) {
Java_org_citra_citra_1emu_vr_VrActivity_nativeOnDestroy(JNIEnv* env, jobject thiz, jlong handle) {
ALOGI("nativeOnDestroy");
exit(0);
ALOGI("nativeOnDestroy {}", static_cast<long>(handle));
if (handle != 0) {
delete VRAppHandle(handle).p;
}
// Even though OpenXR is created on a different thread, this
// should be ok because thread exit is a fence, and the delete waits to join.
if (gOpenXr != nullptr) {
@ -902,8 +912,8 @@ extern "C" JNIEXPORT void JNICALL Java_org_citra_citra_1emu_vr_ErrorMessageLayer
gShouldShowErrorMessage = should_show_error;
}
extern "C" JNIEXPORT jint JNICALL Java_org_citra_citra_1emu_vr_utils_VRUtils_getHMDType(JNIEnv* env,
jclass clazz) {
extern "C" JNIEXPORT jint JNICALL
Java_org_citra_citra_1emu_vr_utils_VRUtils_getHMDType(JNIEnv* env, jclass clazz) {
return static_cast<jint>(VRSettings::HmdTypeFromStr(VRSettings::GetHMDTypeStr()));
}
extern "C" JNIEXPORT jint JNICALL