1 files changed, 34 insertions, 11 deletions

diff --git a/src/gui/painting/qbackingstoredefaultcompositor_p.h b/src/gui/painting/qbackingstoredefaultcompositor_p.h
index 5086638d2f..c5a8ffd328 100644
--- a/src/gui/painting/qbackingstoredefaultcompositor_p.h
+++ b/src/gui/painting/qbackingstoredefaultcompositor_p.h
@@ -16,7 +16,7 @@
 //
 
 #include <qpa/qplatformbackingstore.h>
-#include <QtGui/private/qrhi_p.h>
+#include <rhi/qrhi.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -37,13 +37,24 @@ public:
                                              QRhi *rhi,
                                              QRhiSwapChain *swapchain,
                                              QWindow *window,
+                                             qreal sourceDevicePixelRatio,
                                              const QRegion &region,
                                              const QPoint &offset,
                                              QPlatformTextureList *textures,
                                              bool translucentBackground);
 
 private:
-    void ensureResources(QRhiSwapChain *swapchain, QRhiResourceUpdateBatch *resourceUpdates);
+    enum UpdateUniformOption {
+        NeedsRedBlueSwap = 1 << 0,
+        NeedsAlphaRotate = 1 << 1
+    };
+    Q_DECLARE_FLAGS(UpdateUniformOptions, UpdateUniformOption)
+    enum UpdateQuadDataOption {
+        NeedsLinearFiltering = 1 << 0
+    };
+    Q_DECLARE_FLAGS(UpdateQuadDataOptions, UpdateQuadDataOption)
+
+    void ensureResources(QRhiResourceUpdateBatch *resourceUpdates, QRhiRenderPassDescriptor *rpDesc);
     QRhiTexture *toTexture(const QImage &image,
                            QRhi *rhi,
                            QRhiResourceUpdateBatch *resourceUpdates,
@@ -51,35 +62,47 @@ private:
                            QPlatformBackingStore::TextureFlags *flags) const;
 
     mutable QRhi *m_rhi = nullptr;
-    mutable QRhiTexture *m_texture = nullptr;
+    mutable std::unique_ptr<QRhiTexture> m_texture;
 
-    QRhiBuffer *m_vbuf = nullptr;
-    QRhiSampler *m_sampler = nullptr;
-    QRhiGraphicsPipeline *m_psNoBlend = nullptr;
-    QRhiGraphicsPipeline *m_psBlend = nullptr;
-    QRhiGraphicsPipeline *m_psPremulBlend = nullptr;
+    std::unique_ptr<QRhiBuffer> m_vbuf;
+    std::unique_ptr<QRhiSampler> m_samplerNearest;
+    std::unique_ptr<QRhiSampler> m_samplerLinear;
+    std::unique_ptr<QRhiGraphicsPipeline> m_psNoBlend;
+    std::unique_ptr<QRhiGraphicsPipeline> m_psBlend;
+    std::unique_ptr<QRhiGraphicsPipeline> m_psPremulBlend;
 
     struct PerQuadData {
         QRhiBuffer *ubuf = nullptr;
         // All srbs are layout-compatible.
         QRhiShaderResourceBindings *srb = nullptr;
+        QRhiShaderResourceBindings *srbExtra = nullptr; // may be null (used for stereo)
         QRhiTexture *lastUsedTexture = nullptr;
+        QRhiTexture *lastUsedTextureExtra = nullptr;    // may be null (used for stereo)
+        QRhiSampler::Filter lastUsedFilter = QRhiSampler::None;
         bool isValid() const { return ubuf && srb; }
         void reset() {
             delete ubuf;
             ubuf = nullptr;
             delete srb;
             srb = nullptr;
+            if (srbExtra) {
+                delete srbExtra;
+                srbExtra = nullptr;
+            }
             lastUsedTexture = nullptr;
+            lastUsedTextureExtra = nullptr;
+            lastUsedFilter = QRhiSampler::None;
         }
     };
     PerQuadData m_widgetQuadData;
     QVarLengthArray<PerQuadData, 8> m_textureQuadData;
 
-    PerQuadData createPerQuadData(QRhiTexture *texture);
-    void updatePerQuadData(PerQuadData *d, QRhiTexture *texture);
+    PerQuadData createPerQuadData(QRhiTexture *texture, QRhiTexture *textureExtra = nullptr);
+    void updatePerQuadData(PerQuadData *d, QRhiTexture *texture, QRhiTexture *textureExtra = nullptr,
+                           UpdateQuadDataOptions options = {});
     void updateUniforms(PerQuadData *d, QRhiResourceUpdateBatch *resourceUpdates,
-                        const QMatrix4x4 &target, const QMatrix3x3 &source, bool needsRedBlueSwap);
+                        const QMatrix4x4 &target, const QMatrix3x3 &source,
+                        UpdateUniformOptions options = {});
 };
 
 QT_END_NAMESPACE