diff options
Diffstat (limited to 'src/core/compositor/compositor.cpp')
-rw-r--r-- | src/core/compositor/compositor.cpp | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/src/core/compositor/compositor.cpp b/src/core/compositor/compositor.cpp index fed395cb1..4c0bd4c0d 100644 --- a/src/core/compositor/compositor.cpp +++ b/src/core/compositor/compositor.cpp @@ -7,7 +7,6 @@ #include "components/viz/common/surfaces/frame_sink_id.h" #include <QHash> -#include <QImage> #include <QMutex> #include <QQuickWindow> @@ -94,10 +93,8 @@ void Compositor::Observer::unbind() Compositor::Handle<Compositor> Compositor::Observer::compositor() { - if (!m_binding) - return nullptr; g_bindings.lock(); - if (m_binding->compositor) + if (m_binding && m_binding->compositor) return m_binding->compositor; // delay unlock g_bindings.unlock(); return nullptr; @@ -128,50 +125,34 @@ void Compositor::unbind() Compositor::Handle<Compositor::Observer> Compositor::observer() { - if (!m_binding) - return nullptr; g_bindings.lock(); - if (m_binding->observer) + if (m_binding && m_binding->observer) return m_binding->observer; // delay unlock g_bindings.unlock(); return nullptr; } -QImage Compositor::image() -{ - Q_UNREACHABLE(); - return {}; -} - void Compositor::waitForTexture() { - Q_UNREACHABLE(); } -int Compositor::textureId() +void Compositor::releaseTexture() { - Q_UNREACHABLE(); - return 0; } -#if QT_CONFIG(webengine_vulkan) -VkImage Compositor::vkImage(QQuickWindow *) +QSGTexture *Compositor::texture(QQuickWindow *, uint32_t textureOptions) { Q_UNREACHABLE(); - return {}; + return nullptr; } -VkImageLayout Compositor::vkImageLayout() +bool Compositor::textureIsFlipped() { Q_UNREACHABLE(); - return {}; + return false; } -void Compositor::releaseVulkanResources(QQuickWindow *) -{ - Q_UNREACHABLE(); -} -#endif +void Compositor::releaseResources() { } // static void Compositor::unlockBindings() |