diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 17:02:40 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 17:02:40 +0200 |
| commit | 5b909c1fe56f1de48fed1031a030771087d8ab22 (patch) | |
| tree | 7fb39c2031baa17f1fdeac5e8f91b43a5a363ef3 /src/core | |
| parent | f589b8b411f1049f6f2f701478e0c38c72ad824a (diff) | |
| parent | ac41ad48cacac91e428181f7ededb0896ee64c40 (diff) | |
Merge dev into 5.8
Change-Id: I23aa7e41dfbbb7c4e4259a32868e64c58c0a1310
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/delegated_frame_node.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp index 0c2b3cdea..dd0fd877e 100644 --- a/src/core/delegated_frame_node.cpp +++ b/src/core/delegated_frame_node.cpp @@ -798,7 +798,7 @@ void DelegatedFrameNode::pullTexture(DelegatedFrameNode *frameNode, MailboxTextu if (syncToken.HasData()) mailboxManager->PullTextureUpdates(syncToken); texture->fetchTexture(mailboxManager); - if (!!gfx::GLContext::GetCurrent()) { + if (!!gfx::GLContext::GetCurrent() && gfx::GLFence::IsSupported()) { // Create a fence on the Chromium GPU-thread and context gfx::GLFence *fence = gfx::GLFence::Create(); // But transfer it to something generic since we need to read it using Qt's OpenGL. |