diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-11-21 16:20:37 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-11-23 17:38:15 +0000 |
| commit | e25151a705bad0db733c2958f57ff49c252777df (patch) | |
| tree | 4a92997e77f5c79f869b5b9a2b88ce3bda3fafcb | |
| parent | 077ba406154c9f5565760ed99efee3854bb198db (diff) | |
Remove incorrect DCHECK in CompositorResourceTracker::commitResources
Fixes: QTBUG-71869
Change-Id: I3e2d39eb6c3559f2a31c6b98f5f950183f2381d3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| -rw-r--r-- | src/core/compositor/compositor_resource_tracker.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/compositor/compositor_resource_tracker.cpp b/src/core/compositor/compositor_resource_tracker.cpp index b74075c56..74c718042 100644 --- a/src/core/compositor/compositor_resource_tracker.cpp +++ b/src/core/compositor/compositor_resource_tracker.cpp @@ -103,7 +103,11 @@ void CompositorResourceTracker::submitResources(const viz::CompositorFrame &fram void CompositorResourceTracker::commitResources() { - DCHECK_CURRENTLY_ON(content::BrowserThread::UI); + // DCHECK_CURRENTLY_ON(content::BrowserThread::UI); + // + // This might be called from a Qt Quick render thread, but the UI thread + // will still be blocked for the duration of this call. + DCHECK(m_pendingResourceUpdates == 0); for (CompositorResource *resource : m_pendingImports) |