From 2d002e42a8b6e711e3c9ca5b6dd3611e9d8426ab Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 15 Sep 2022 17:08:33 +0200 Subject: Adaptations for 104-based Change-Id: Ieb44b5c98b3342adca38916d8b77c54e8ed8e1d7 Reviewed-by: Peter Varga Reviewed-by: Michal Klocek --- src/core/compositor/display_gl_output_surface.h | 113 ------------------------ 1 file changed, 113 deletions(-) delete mode 100644 src/core/compositor/display_gl_output_surface.h (limited to 'src/core/compositor/display_gl_output_surface.h') diff --git a/src/core/compositor/display_gl_output_surface.h b/src/core/compositor/display_gl_output_surface.h deleted file mode 100644 index 28625ef0e..000000000 --- a/src/core/compositor/display_gl_output_surface.h +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -#ifndef DISPLAY_GL_OUTPUT_SURFACE_H -#define DISPLAY_GL_OUTPUT_SURFACE_H - -#include "compositor_resource_fence.h" -#include "compositor.h" - -#include "components/viz/common/display/update_vsync_parameters_callback.h" -#include "components/viz/service/display/output_surface.h" -#include "components/viz/service/display_embedder/viz_process_context_provider.h" -#include "gpu/command_buffer/common/mailbox.h" -#include "gpu/command_buffer/common/sync_token.h" - -#include - -namespace QtWebEngineCore { - -class DisplayGLOutputSurface final : public viz::OutputSurface, public Compositor -{ -public: - DisplayGLOutputSurface(scoped_refptr contextProvider); - ~DisplayGLOutputSurface() override; - - // Overridden from viz::OutputSurface. - void BindToClient(viz::OutputSurfaceClient *client) override; - void EnsureBackbuffer() override; - void DiscardBackbuffer() override; - void BindFramebuffer() override; - void SetDrawRectangle(const gfx::Rect &drawRect) override; - bool IsDisplayedAsOverlayPlane() const override; - unsigned GetOverlayTextureId() const override; - void Reshape(const gfx::Size &size, - float devicePixelRatio, - const gfx::ColorSpace &colorSpace, - gfx::BufferFormat format, - bool useStencil) override; - bool HasExternalStencilTest() const override; - void ApplyExternalStencil() override; - uint32_t GetFramebufferCopyTextureFormat() override; - void SwapBuffers(viz::OutputSurfaceFrame frame) override; - unsigned UpdateGpuFence() override; - void SetUpdateVSyncParametersCallback(viz::UpdateVSyncParametersCallback callback) override; - void SetDisplayTransformHint(gfx::OverlayTransform transform) override; - gfx::OverlayTransform GetDisplayTransform() override; - void SetFrameSinkId(const viz::FrameSinkId &id) override; - - // Overridden from Compositor. - void swapFrame() override; - void waitForTexture() override; - int textureId() override; - QSize size() override; - bool hasAlphaChannel() override; - float devicePixelRatio() override; - -private: - struct Shape - { - gfx::Size sizeInPixels; - float devicePixelRatio; - gfx::ColorSpace colorSpace; - bool hasAlpha; - - bool operator==(const Shape &that) const - { - return (sizeInPixels == that.sizeInPixels && - devicePixelRatio == that.devicePixelRatio && - colorSpace == that.colorSpace && - hasAlpha == that.hasAlpha); - } - bool operator!=(const Shape &that) const { return !(*this == that); } - }; - - struct Buffer - { - DisplayGLOutputSurface *parent; - Shape shape; - uint32_t clientId = 0; - uint32_t serviceId = 0; - scoped_refptr fence; - - Buffer(DisplayGLOutputSurface *parent) : parent(parent) {} - ~Buffer() { parent->deleteBufferResources(this); } - }; - - class Texture; - - void swapBuffersOnGpuThread(unsigned int id, std::unique_ptr fence); - void swapBuffersOnVizThread(); - - std::unique_ptr makeBuffer(const Shape &shape); - void deleteBufferResources(Buffer *buffer); - void attachBuffer(); - void detachBuffer(); - - gpu::InProcessCommandBuffer *const m_commandBuffer; - gpu::gles2::GLES2Interface *const m_gl; - mutable QMutex m_mutex; - uint32_t m_fboId = 0; - viz::OutputSurfaceClient *m_client = nullptr; - Shape m_currentShape; - std::unique_ptr m_backBuffer; - std::unique_ptr m_middleBuffer; - std::unique_ptr m_frontBuffer; - bool m_readyToUpdate = false; - scoped_refptr m_taskRunner; - scoped_refptr m_vizContextProvider; -}; - -} // namespace QtWebEngineCore - -#endif // !DISPLAY_GL_OUTPUT_SURFACE_H -- cgit v1.2.3