sg: Remove unused clearMode code

This is not used since Qt 6.0. The clearMode value stored
in the renderer base class is effectively the same always
and is not used for anything.

Change-Id: I472a79ff363a7bcdcb8bd1d4ec5973b2a0483273
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

4 files changed, 3 insertions, 63 deletions

diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 0ee809e7f4..2420bb5eae 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -574,13 +574,7 @@ void QQuickWindowPrivate::syncSceneGraph()
 
     animationController->afterNodeSync();
 
-    // Copy the current state of clearing from window into renderer.
     renderer->setClearColor(clearColor);
-    // Cannot skip clearing the color buffer in Qt 6 anymore.
-    const QSGAbstractRenderer::ClearMode mode = QSGAbstractRenderer::ClearColorBuffer
-                                                | QSGAbstractRenderer::ClearStencilBuffer
-                                                | QSGAbstractRenderer::ClearDepthBuffer;
-    renderer->setClearMode(mode);
 
     renderer->setVisualizationMode(visualizationMode);
 
diff --git a/src/quick/scenegraph/coreapi/qsgabstractrenderer.cpp b/src/quick/scenegraph/coreapi/qsgabstractrenderer.cpp
index bb374f8aaa..3ea6cc8dfc 100644
--- a/src/quick/scenegraph/coreapi/qsgabstractrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgabstractrenderer.cpp
@@ -14,19 +14,6 @@ QT_BEGIN_NAMESPACE
  */
 
 /*!
-    \enum QSGAbstractRenderer::ClearModeBit
-
-    Used with setClearMode() to indicate which buffer should
-    be cleared before the scene render.
-
-    \value ClearColorBuffer Clear the color buffer using clearColor().
-    \value ClearDepthBuffer Clear the depth buffer.
-    \value ClearStencilBuffer Clear the stencil buffer.
-
-    \sa setClearMode(), setClearColor()
- */
-
-/*!
     \enum QSGAbstractRenderer::MatrixTransformFlag
 
     Used with setProjectionMatrixToRect() to indicate the expectations towards
@@ -61,7 +48,6 @@ QT_BEGIN_NAMESPACE
 QSGAbstractRendererPrivate::QSGAbstractRendererPrivate()
     : m_root_node(nullptr)
     , m_clear_color(Qt::transparent)
-    , m_clear_mode(QSGAbstractRenderer::ClearColorBuffer | QSGAbstractRenderer::ClearDepthBuffer)
 {
 }
 
@@ -297,10 +283,9 @@ QMatrix4x4 QSGAbstractRenderer::projectionMatrixWithNativeNDC() const
 }
 
 /*!
-    Use \a color to clear the framebuffer when clearMode() is
-    set to QSGAbstractRenderer::ClearColorBuffer.
+    Sets the \a color to clear the framebuffer.
 
-    \sa clearColor(), setClearMode()
+    \sa clearColor()
  */
 void QSGAbstractRenderer::setClearColor(const QColor &color)
 {
@@ -312,7 +297,7 @@ void QSGAbstractRenderer::setClearColor(const QColor &color)
     Returns the color that clears the framebuffer at the beginning
     of the rendering.
 
-    \sa setClearColor(), clearMode()
+    \sa setClearColor()
  */
 QColor QSGAbstractRenderer::clearColor() const
 {
@@ -321,30 +306,6 @@ QColor QSGAbstractRenderer::clearColor() const
 }
 
 /*!
-    Defines which attachment of the framebuffer should be cleared
-    before each scene render with the \a mode flag.
-
-    \sa clearMode(), setClearColor()
- */
-void QSGAbstractRenderer::setClearMode(ClearMode mode)
-{
-    Q_D(QSGAbstractRenderer);
-    d->m_clear_mode = mode;
-}
-
-/*!
-    Flags defining which attachment of the framebuffer will be cleared
-    before each scene render.
-
-    \sa setClearMode(), clearColor()
- */
-QSGAbstractRenderer::ClearMode QSGAbstractRenderer::clearMode() const
-{
-    Q_D(const QSGAbstractRenderer);
-    return d->m_clear_mode;
-}
-
-/*!
     \fn void QSGAbstractRenderer::nodeChanged(QSGNode *node, QSGNode::DirtyState state)
     \internal
  */
diff --git a/src/quick/scenegraph/coreapi/qsgabstractrenderer_p.h b/src/quick/scenegraph/coreapi/qsgabstractrenderer_p.h
index 81263111cb..3459ee1e82 100644
--- a/src/quick/scenegraph/coreapi/qsgabstractrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgabstractrenderer_p.h
@@ -31,15 +31,6 @@ class Q_QUICK_PRIVATE_EXPORT QSGAbstractRenderer : public QObject
 {
     Q_OBJECT
 public:
-    enum ClearModeBit
-    {
-        ClearColorBuffer    = 0x0001,
-        ClearDepthBuffer    = 0x0002,
-        ClearStencilBuffer  = 0x0004
-    };
-    Q_DECLARE_FLAGS(ClearMode, ClearModeBit)
-    Q_FLAG(ClearMode)
-
     enum MatrixTransformFlag
     {
         MatrixTransformFlipY = 0x01
@@ -71,9 +62,6 @@ public:
     void setClearColor(const QColor &color);
     QColor clearColor() const;
 
-    void setClearMode(ClearMode mode);
-    ClearMode clearMode() const;
-
     virtual void renderScene() = 0;
 
     virtual void prepareSceneInline();
@@ -91,8 +79,6 @@ private:
     friend class QSGRootNode;
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSGAbstractRenderer::ClearMode)
-
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/quick/scenegraph/coreapi/qsgabstractrenderer_p_p.h b/src/quick/scenegraph/coreapi/qsgabstractrenderer_p_p.h
index afac489a6a..92ec284878 100644
--- a/src/quick/scenegraph/coreapi/qsgabstractrenderer_p_p.h
+++ b/src/quick/scenegraph/coreapi/qsgabstractrenderer_p_p.h
@@ -36,7 +36,6 @@ public:
 
     QSGRootNode *m_root_node;
     QColor m_clear_color;
-    QSGAbstractRenderer::ClearMode m_clear_mode;
 
     QRect m_device_rect;
     QRect m_viewport_rect;