Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure RunnableQueue is reattached when new render thread starts #2743

Merged
merged 1 commit into from
Feb 6, 2020
Merged

Ensure RunnableQueue is reattached when new render thread starts #2743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/cpp/Skybox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/cpp/native-lib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/cpp/vrb
Open in desktop
Submodule vrb updated 24 files
+1 −0 include/vrb/Color.h
+6 −0 include/vrb/Forward.h
+3 −13 include/vrb/Geometry.h
+45 −0 include/vrb/GeometryDrawable.h
+10 −9 include/vrb/Matrix.h
+58 −0 include/vrb/RenderBuffer.h
+2 −1 include/vrb/RenderState.h
+2 −1 include/vrb/RunnableQueue.h
+1 −0 include/vrb/Vector.h
+4 −1 include/vrb/VertexArray.h
+4 −0 include/vrb/gl.h
+49 −0 include/vrb/private/GeometryDrawableState.h
+56 −53 src/CMakeLists.txt
+1 −0 src/ContextSynchronizer.cpp
+5 −4 src/GLExtensions.cpp
+83 −170 src/Geometry.cpp
+122 −0 src/GeometryDrawable.cpp
+23 −0 src/Math.cpp
+7 −4 src/NodeFactoryObj.cpp
+194 −0 src/RenderBuffer.cpp
+8 −0 src/RenderState.cpp
+44 −32 src/RunnableQueue.cpp
+1 −0 src/TextureCache.cpp
+31 −10 src/VertexArray.cpp
3 changes: 2 additions & 1 deletion app/src/picovr/cpp/native-lib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand All @@ -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;
Expand Down
8 changes: 8 additions & 0 deletions app/src/wavevr/cpp/native-lib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
}

Expand Down