diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-16 22:07:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 22:07:33 +0200 |
| commit | ac41ad48cacac91e428181f7ededb0896ee64c40 (patch) | |
| tree | 44b4afb881fd0b7aa29b0a9da22dddf8e91a4be2 /src/core/delegated_frame_node.cpp | |
| parent | 6534b09073791398bad99863821740e986915bff (diff) | |
| parent | 6e4d1a0cf21ee18d6584042cd9bea3a7d1d24a56 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Id5f97771be23a4393e8d3be98903c321377ae809
Diffstat (limited to 'src/core/delegated_frame_node.cpp')
| -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. |