Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-24 16:43:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7596 from jherico/texture_transfer_fix

Browse source 
Move the texture transfer context back to the main thread for shutdown
This commit is contained in:
Brad Hefta-Gaub 2016-04-07 09:31:42 -07:00
commit 50a081db00
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/gpu/src/gpu/GLBackendTextureTransfer.cpp
View file

@ -77,6 +77,12 @@ void GLTextureTransferHelper::setup() {
#endif
}
void GLTextureTransferHelper::shutdown() {
_canvas->doneCurrent();
_canvas->moveToThreadWithContext(qApp->thread());
}
bool GLTextureTransferHelper::processQueueItems(const Queue& messages) {
for (auto package : messages) {
glWaitSync(package.fence, 0, GL_TIMEOUT_IGNORED);

1
libraries/gpu/src/gpu/GLBackendTextureTransfer.h
View file

@ -28,6 +28,7 @@ public:
protected:
void setup() override;
void shutdown() override;
bool processQueueItems(const Queue& messages) override;
void transferTextureSynchronous(const gpu::Texture& texture);