Ensure RunnableQueue is reattached when new render thread starts (#2743)

Fixes #2739
MozillaReality · Feb 6, 2020 · d2c3be6 · d2c3be6
1 parent 7195a5c
commit d2c3be6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/app/src/main/cpp/Skybox.cpp b/app/src/main/cpp/Skybox.cpp
@@ -113,6 +113,7 @@ struct Skybox::State {
       };
 
       VertexArrayPtr array = VertexArray::Create(aContext);
+      array->SetUVLength(3);
       const float kLength = 140.0f;
       for (int i = 0; i < cubeVertices.size(); i += 3) {
         array->AppendVertex(Vector(-kLength * cubeVertices[i], -kLength * cubeVertices[i + 1],

diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp
@@ -199,7 +199,7 @@ android_main(android_app *aAppState) {
   // Attach JNI thread
   JNIEnv *jniEnv;
   (*aAppState->activity->vm).AttachCurrentThread(&jniEnv, nullptr);
-  sAppContext->mQueue->InitializeJava(jniEnv);
+  sAppContext->mQueue->AttachToThread();
 
   // Create Browser context
   crow::VRBrowser::InitializeJava(jniEnv, aAppState->activity->clazz);

diff --git a/app/src/main/cpp/vrb b/app/src/main/cpp/vrb
diff --git a/app/src/picovr/cpp/native-lib.cpp b/app/src/picovr/cpp/native-lib.cpp
@@ -35,6 +35,7 @@ JNI_METHOD(void, nativeOnCreate)
 JNI_METHOD(void, nativeInitialize)
 (JNIEnv* aEnv, jobject aActivity, jint width, jint height, jobject aAssetManager, jint type, jint focusInex) {
   gDestroyed = false;
+  sQueue->AttachToThread();
   if (!sDevice) {
     sDevice = crow::DeviceDelegatePicoVR::Create(BrowserWorld::Instance().GetRenderContext());
   }
@@ -55,7 +56,7 @@ JNI_METHOD(void, nativeShutdown)
 JNI_METHOD(void, nativeDestroy)
 (JNIEnv*, jobject) {
   gDestroyed = true;
-  sQueue->ProcessRunnables();
+  sQueue->Clear();
   BrowserWorld::Instance().ShutdownJava();
   BrowserWorld::Instance().RegisterDeviceDelegate(nullptr);
   sDevice = nullptr;

diff --git a/app/src/wavevr/cpp/native-lib.cpp b/app/src/wavevr/cpp/native-lib.cpp
@@ -43,6 +43,7 @@ JNI_METHOD(void, activityResumed)
 }
 
 int main(int argc, char *argv[]) {
+  sQueue->AttachToThread();
   VRB_LOG("Call WVR_Init");
   WVR_InitError eError = WVR_Init(WVR_AppType_VRContent);
   if (eError != WVR_InitError_None) {
@@ -87,7 +88,14 @@ int main(int argc, char *argv[]) {
     VRB_GL_CHECK(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
     BrowserWorld::Instance().Draw();
   }
+  BrowserWorld::Instance().RegisterDeviceDelegate(nullptr);
+  sDevice = nullptr;
   BrowserWorld::Instance().ShutdownGL();
+  BrowserWorld::Instance().ShutdownJava();
+  sQueue->Clear();
+  sJavaInitialized = false;
+  BrowserWorld::Destroy();
+  WVR_Quit();
   return 0;
 }