Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14534 from SamGondelman/vive

Browse source 
Case 20138: Fix vive crash
This commit is contained in:
John Conklin II 2018-12-06 14:28:24 -08:00 committed by GitHub
commit bbc8e4de70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/openvr/src/OpenVrDisplayPlugin.cpp
View file

@ -319,6 +319,7 @@ public:
glBindVertexArray(0);
glDeleteVertexArrays(1, &_vao);
_canvas->doneCurrent();
_canvas->moveToThread(_plugin.thread());
}
void update(const CompositeInfo& newCompositeInfo) { _queue.push(newCompositeInfo); }
@ -485,6 +486,7 @@ bool OpenVrDisplayPlugin::internalActivate() {
_submitCanvas->doneCurrent();
});
}
_submitCanvas->moveToThread(_submitThread.get());
}
return Parent::internalActivate();