From a2a360d4bbdcd023c72b5bdcb1c941b958832f51 Mon Sep 17 00:00:00 2001 From: amwatson Date: Fri, 16 Feb 2024 19:06:15 -0600 Subject: [PATCH] Add explicit de-init to mSwapchain and add string labeling to init log in UILayer --- src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp | 2 ++ src/android/app/src/main/jni/vr/layers/UILayer.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp b/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp index fb1491a5c..05b3f1363 100644 --- a/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp +++ b/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp @@ -467,6 +467,8 @@ int32_t GameSurfaceLayer::Init(const XrSession& session, const jobject activityO void GameSurfaceLayer::Shutdown() { xrDestroySwapchain(mSwapchain.mHandle); mSwapchain.mHandle = XR_NULL_HANDLE; + mSwapchain.mWidth = 0; + mSwapchain.mHeight = 0; mEnv->DeleteGlobalRef(mVrGameSurfaceClass); } diff --git a/src/android/app/src/main/jni/vr/layers/UILayer.cpp b/src/android/app/src/main/jni/vr/layers/UILayer.cpp index 8688b6541..8bfa712e5 100644 --- a/src/android/app/src/main/jni/vr/layers/UILayer.cpp +++ b/src/android/app/src/main/jni/vr/layers/UILayer.cpp @@ -167,7 +167,7 @@ UILayer::UILayer(const std::string& className, const XrVector3f&& position, , mEnv(env) { const int32_t initializationStatus = Init(className, activityObject, position, session); if (initializationStatus < 0) { - FAIL("Could not initialize UILayer -- error '%d'", initializationStatus); + FAIL("Could not initialize UILayer(%s) -- error '%d'", className.c_str(), initializationStatus); } }