diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-10 10:28:39 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-14 00:46:40 +0200 |
| commit | e608536f45fd435df092caa9fd78adf8651abdc1 (patch) | |
| tree | 202931ce3adb51b5b1323ded0e0e910d9b78e3a5 /src/core/compositor | |
| parent | 9cfde2edf4736ae9533e7e1fac495a23ad905419 (diff) | |
| parent | b3ff7eef14ed3fb48bef06abff31a272d0bc8915 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'src/core/compositor')
| -rw-r--r-- | src/core/compositor/compositor_resource_tracker.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/compositor/compositor_resource_tracker.cpp b/src/core/compositor/compositor_resource_tracker.cpp index 73242c693..741c2717c 100644 --- a/src/core/compositor/compositor_resource_tracker.cpp +++ b/src/core/compositor/compositor_resource_tracker.cpp @@ -174,7 +174,8 @@ quint32 CompositorResourceTracker::consumeMailbox(const gpu::MailboxHolder &mail DCHECK(mailboxManager); if (mailboxHolder.sync_token.HasData()) mailboxManager->PullTextureUpdates(mailboxHolder.sync_token); - return service_id(mailboxManager->ConsumeTexture(mailboxHolder.mailbox)); + gpu::TextureBase *tex = mailboxManager->ConsumeTexture(mailboxHolder.mailbox); + return tex ? service_id(tex) : 0; #else NOTREACHED(); #endif // QT_CONFIG(OPENGL) |