1 files changed, 73 insertions, 75 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgabstractrenderer.cpp b/src/quick/scenegraph/coreapi/qsgabstractrenderer.cpp
index a51521eeaa..ffa5599231 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,8 +48,9 @@ QT_BEGIN_NAMESPACE
 QSGAbstractRendererPrivate::QSGAbstractRendererPrivate()
     : m_root_node(nullptr)
     , m_clear_color(Qt::transparent)
-    , m_clear_mode(QSGAbstractRenderer::ClearColorBuffer | QSGAbstractRenderer::ClearDepthBuffer)
 {
+    m_projection_matrix.resize(1);
+    m_projection_matrix_native_ndc.resize(1);
 }
 
 /*!
@@ -193,15 +181,7 @@ QRect QSGAbstractRenderer::viewportRect() const
  */
 void QSGAbstractRenderer::setProjectionMatrixToRect(const QRectF &rect)
 {
-    QMatrix4x4 matrix;
-    matrix.ortho(rect.x(),
-                 rect.x() + rect.width(),
-                 rect.y() + rect.height(),
-                 rect.y(),
-                 1,
-                 -1);
-    setProjectionMatrix(matrix);
-    setProjectionMatrixWithNativeNDC(matrix);
+    setProjectionMatrixToRect(rect, {}, false);
 }
 
 /*!
@@ -217,46 +197,77 @@ void QSGAbstractRenderer::setProjectionMatrixToRect(const QRectF &rect)
  */
 void QSGAbstractRenderer::setProjectionMatrixToRect(const QRectF &rect, MatrixTransformFlags flags)
 {
+    setProjectionMatrixToRect(rect, flags, flags.testFlag(MatrixTransformFlipY));
+}
+
+/*!
+    Convenience method that calls setProjectionMatrix() with an
+    orthographic matrix generated from \a rect.
+
+    Set MatrixTransformFlipY in \a flags when the graphics API uses Y down in
+    its normalized device coordinate system (for example, Vulkan).
+
+    Convenience method that calls setProjectionMatrixWithNativeNDC() with an
+    orthographic matrix generated from \a rect.
+
+    Set true to \a nativeNDCFlipY to flip the Y axis relative to
+    projection matrix in its normalized device coordinate system.
+
+    \sa setProjectionMatrix(), projectionMatrix()
+    \sa setProjectionMatrixWithNativeNDC(), projectionMatrixWithNativeNDC()
+
+    \since 6.7
+ */
+void QSGAbstractRenderer::setProjectionMatrixToRect(const QRectF &rect, MatrixTransformFlags flags,
+                                                    bool nativeNDCFlipY)
+{
     const bool flipY = flags.testFlag(MatrixTransformFlipY);
+
+    const float left = rect.x();
+    const float right = rect.x() + rect.width();
+    float bottom = rect.y() + rect.height();
+    float top = rect.y();
+
+    if (flipY)
+        std::swap(top, bottom);
+
     QMatrix4x4 matrix;
-    matrix.ortho(rect.x(),
-                 rect.x() + rect.width(),
-                 flipY ? rect.y() : rect.y() + rect.height(),
-                 flipY ? rect.y() + rect.height() : rect.y(),
-                 1,
-                 -1);
-    setProjectionMatrix(matrix);
-
-    if (flipY) {
+    matrix.ortho(left, right, bottom, top, 1, -1);
+    setProjectionMatrix(matrix, 0);
+
+    if (nativeNDCFlipY) {
+        std::swap(top, bottom);
+
         matrix.setToIdentity();
-        matrix.ortho(rect.x(),
-                     rect.x() + rect.width(),
-                     rect.y() + rect.height(),
-                     rect.y(),
-                     1,
-                     -1);
+        matrix.ortho(left, right, bottom, top, 1, -1);
     }
-    setProjectionMatrixWithNativeNDC(matrix);
+    setProjectionMatrixWithNativeNDC(matrix, 0);
 }
 
 /*!
     Use \a matrix to project the QSGNode coordinates onto surface pixels.
 
+    \a index specifies the view index when multiview rendering is in use.
+
     \sa projectionMatrix(), setProjectionMatrixToRect()
  */
-void QSGAbstractRenderer::setProjectionMatrix(const QMatrix4x4 &matrix)
+void QSGAbstractRenderer::setProjectionMatrix(const QMatrix4x4 &matrix, int index)
 {
     Q_D(QSGAbstractRenderer);
-    d->m_projection_matrix = matrix;
+    if (d->m_projection_matrix.count() <= index)
+        d->m_projection_matrix.resize(index + 1);
+    d->m_projection_matrix[index] = matrix;
 }
 
 /*!
     \internal
  */
-void QSGAbstractRenderer::setProjectionMatrixWithNativeNDC(const QMatrix4x4 &matrix)
+void QSGAbstractRenderer::setProjectionMatrixWithNativeNDC(const QMatrix4x4 &matrix, int index)
 {
     Q_D(QSGAbstractRenderer);
-    d->m_projection_matrix_native_ndc = matrix;
+    if (d->m_projection_matrix_native_ndc.count() <= index)
+        d->m_projection_matrix_native_ndc.resize(index + 1);
+    d->m_projection_matrix_native_ndc[index] = matrix;
 }
 
 /*!
@@ -264,67 +275,54 @@ void QSGAbstractRenderer::setProjectionMatrixWithNativeNDC(const QMatrix4x4 &mat
 
     \sa setProjectionMatrix(), setProjectionMatrixToRect()
  */
-QMatrix4x4 QSGAbstractRenderer::projectionMatrix() const
+QMatrix4x4 QSGAbstractRenderer::projectionMatrix(int index) const
 {
     Q_D(const QSGAbstractRenderer);
-    return d->m_projection_matrix;
+    return d->m_projection_matrix[index];
 }
 
-/*!
-    \internal
- */
-QMatrix4x4 QSGAbstractRenderer::projectionMatrixWithNativeNDC() const
+int QSGAbstractRenderer::projectionMatrixCount() const
 {
     Q_D(const QSGAbstractRenderer);
-    return d->m_projection_matrix_native_ndc;
+    return d->m_projection_matrix.count();
 }
 
-/*!
-    Use \a color to clear the framebuffer when clearMode() is
-    set to QSGAbstractRenderer::ClearColorBuffer.
-
-    \sa clearColor(), setClearMode()
- */
-void QSGAbstractRenderer::setClearColor(const QColor &color)
+int QSGAbstractRenderer::projectionMatrixWithNativeNDCCount() const
 {
-    Q_D(QSGAbstractRenderer);
-    d->m_clear_color = color;
+    Q_D(const QSGAbstractRenderer);
+    return d->m_projection_matrix_native_ndc.count();
 }
 
 /*!
-    Returns the color that clears the framebuffer at the beginning
-    of the rendering.
-
-    \sa setClearColor(), clearMode()
+    \internal
  */
-QColor QSGAbstractRenderer::clearColor() const
+QMatrix4x4 QSGAbstractRenderer::projectionMatrixWithNativeNDC(int index) const
 {
     Q_D(const QSGAbstractRenderer);
-    return d->m_clear_color;
+    return d->m_projection_matrix_native_ndc[index];
 }
 
 /*!
-    Defines which attachment of the framebuffer should be cleared
-    before each scene render with the \a mode flag.
+    Sets the \a color to clear the framebuffer.
 
-    \sa clearMode(), setClearColor()
+    \sa clearColor()
  */
-void QSGAbstractRenderer::setClearMode(ClearMode mode)
+void QSGAbstractRenderer::setClearColor(const QColor &color)
 {
     Q_D(QSGAbstractRenderer);
-    d->m_clear_mode = mode;
+    d->m_clear_color = color;
 }
 
 /*!
-    Flags defining which attachment of the framebuffer will be cleared
-    before each scene render.
+    Returns the color that clears the framebuffer at the beginning
+    of the rendering.
 
-    \sa setClearMode(), clearColor()
+    \sa setClearColor()
  */
-QSGAbstractRenderer::ClearMode QSGAbstractRenderer::clearMode() const
+QColor QSGAbstractRenderer::clearColor() const
 {
     Q_D(const QSGAbstractRenderer);
-    return d->m_clear_mode;
+    return d->m_clear_color;
 }
 
 /*!