Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 20:26:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of https://github.com/highfidelity/hifi into preventDragDrop

Browse source
This commit is contained in:
David Back 2018-12-06 15:18:35 -08:00
commit cee34e7770
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); glBindVertexArray(0);
glDeleteVertexArrays(1, &_vao); glDeleteVertexArrays(1, &_vao);
_canvas->doneCurrent(); _canvas->doneCurrent();
_canvas->moveToThread(_plugin.thread());
} }
void update(const CompositeInfo& newCompositeInfo) { _queue.push(newCompositeInfo); } void update(const CompositeInfo& newCompositeInfo) { _queue.push(newCompositeInfo); }
@ -485,6 +486,7 @@ bool OpenVrDisplayPlugin::internalActivate() {
_submitCanvas->doneCurrent(); _submitCanvas->doneCurrent();
}); });
} }
_submitCanvas->moveToThread(_submitThread.get());
} }
return Parent::internalActivate(); return Parent::internalActivate();