Fix compilation for OpenVG plugin

Adapt to changes in RHI and Qt 6 in general.

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

10 files changed, 30 insertions, 34 deletions

diff --git a/src/plugins/scenegraph/openvg/qopenvgmatrix.cpp b/src/plugins/scenegraph/openvg/qopenvgmatrix.cpp
index 83ce96578e..5f0186a9ae 100644
--- a/src/plugins/scenegraph/openvg/qopenvgmatrix.cpp
+++ b/src/plugins/scenegraph/openvg/qopenvgmatrix.cpp
@@ -344,11 +344,11 @@ QDebug operator<<(QDebug dbg, const QOpenVGMatrix &m)
 {
     QDebugStateSaver saver(dbg);
     // Output in row-major order because it is more human-readable.
-    dbg.nospace() << "QOpenVGMatrix:(" << endl
+    dbg.nospace() << "QOpenVGMatrix:(" << Qt::endl
                   << qSetFieldWidth(10)
-                  << m(0, 0) << m(0, 1) << m(0, 2) << endl
-                  << m(1, 0) << m(1, 1) << m(1, 2) << endl
-                  << m(2, 0) << m(2, 1) << m(2, 2) << endl
+                  << m(0, 0) << m(0, 1) << m(0, 2) << Qt::endl
+                  << m(1, 0) << m(1, 1) << m(1, 2) << Qt::endl
+                  << m(2, 0) << m(2, 1) << m(2, 2) << Qt::endl
                   << qSetFieldWidth(0) << ')';
     return dbg;
 }
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp b/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp
index a47a4258b0..6ca2839017 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp
+++ b/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp
@@ -88,9 +88,9 @@ void QSGOpenVGRenderContext::invalidate()
     emit invalidated();
 }
 
-void QSGOpenVGRenderContext::renderNextFrame(QSGRenderer *renderer, uint fboId)
+void QSGOpenVGRenderContext::renderNextFrame(QSGRenderer *renderer)
 {
-    renderer->renderScene(fboId);
+    renderer->renderScene();
 }
 
 QSGTexture *QSGOpenVGRenderContext::createTexture(const QImage &image, uint flags) const
@@ -137,9 +137,10 @@ QSGPainterNode *QSGOpenVGContext::createPainterNode(QQuickPaintedItem *item)
     return new QSGOpenVGPainterNode(item);
 }
 
-QSGGlyphNode *QSGOpenVGContext::createGlyphNode(QSGRenderContext *rc, bool preferNativeGlyphNode)
+QSGGlyphNode *QSGOpenVGContext::createGlyphNode(QSGRenderContext *rc, bool preferNativeGlyphNode, int renderTypeQuality)
 {
     Q_UNUSED(preferNativeGlyphNode);
+    Q_UNUSED(renderTypeQuality);
     return new QSGOpenVGGlyphNode(rc);
 }
 
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgcontext_p.h b/src/plugins/scenegraph/openvg/qsgopenvgcontext_p.h
index 5e14049175..c4b0e182f7 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgcontext_p.h
+++ b/src/plugins/scenegraph/openvg/qsgopenvgcontext_p.h
@@ -65,7 +65,7 @@ public:
 
     void initialize(const QSGRenderContext::InitParams *params) override;
     void invalidate() override;
-    void renderNextFrame(QSGRenderer *renderer, uint fboId) override;
+    void renderNextFrame(QSGRenderer *renderer) override;
     QSGTexture *createTexture(const QImage &image, uint flags) const override;
     QSGRenderer *createRenderer(QSGRendererInterface::RenderMode renderMode = QSGRendererInterface::RenderMode2D) override;
     int maxTextureSize() const override;
@@ -95,7 +95,7 @@ public:
     QSGRectangleNode *createRectangleNode() override;
     QSGImageNode *createImageNode() override;
     QSGPainterNode *createPainterNode(QQuickPaintedItem *item) override;
-    QSGGlyphNode *createGlyphNode(QSGRenderContext *rc, bool preferNativeGlyphNode) override;
+    QSGGlyphNode *createGlyphNode(QSGRenderContext *rc, bool preferNativeGlyphNode, int renderTypeQuality) override;
     QSGNinePatchNode *createNinePatchNode() override;
     QSGLayer *createLayer(QSGRenderContext *renderContext) override;
     QSurfaceFormat defaultSurfaceFormat() const override;
diff --git a/src/plugins/scenegraph/openvg/qsgopenvginternalimagenode.cpp b/src/plugins/scenegraph/openvg/qsgopenvginternalimagenode.cpp
index 3dd1f9133c..76901e7f79 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvginternalimagenode.cpp
+++ b/src/plugins/scenegraph/openvg/qsgopenvginternalimagenode.cpp
@@ -76,7 +76,7 @@ void QSGOpenVGInternalImageNode::render()
     vgSeti(VG_MATRIX_MODE, VG_MATRIX_IMAGE_USER_TO_SURFACE);
     vgLoadMatrix(transform().constData());
 
-    VGImage image = static_cast<VGImage>(m_texture->textureId());
+    VGImage image = static_cast<VGImage>(m_texture->comparisonKey());
     QSize textureSize = m_texture->textureSize();
 
     if (image == VG_INVALID_HANDLE || !textureSize.isValid())
diff --git a/src/plugins/scenegraph/openvg/qsgopenvglayer.cpp b/src/plugins/scenegraph/openvg/qsgopenvglayer.cpp
index 795e3f62d3..d0adb2296c 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvglayer.cpp
+++ b/src/plugins/scenegraph/openvg/qsgopenvglayer.cpp
@@ -44,7 +44,7 @@
 QT_BEGIN_NAMESPACE
 
 QSGOpenVGLayer::QSGOpenVGLayer(QSGRenderContext *renderContext)
-    : QSGLayer(*(new QSGOpenVGLayerPrivate))
+    : QSGLayer(*(new QSGTexturePrivate(this)))
     , m_item(nullptr)
     , m_renderer(nullptr)
     , m_device_pixel_ratio(1)
@@ -65,7 +65,7 @@ QSGOpenVGLayer::~QSGOpenVGLayer()
     invalidated();
 }
 
-int QSGOpenVGLayer::textureId() const
+qint64 QSGOpenVGLayer::comparisonKey() const
 {
     if (m_offscreenSurface)
         return static_cast<int>(m_offscreenSurface->image());
@@ -92,10 +92,6 @@ bool QSGOpenVGLayer::hasMipmaps() const
     return false;
 }
 
-void QSGOpenVGLayer::bind()
-{
-}
-
 bool QSGOpenVGLayer::updateTexture()
 {
     bool doGrab = (m_live || m_grab) && m_dirtyTexture;
@@ -313,9 +309,4 @@ void QSGOpenVGLayer::grab()
         markDirtyTexture(); // Continuously update if 'live' and 'recursive'.
 }
 
-qint64 QSGOpenVGLayerPrivate::comparisonKey() const
-{
-    return 0;
-}
-
 QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/openvg/qsgopenvglayer.h b/src/plugins/scenegraph/openvg/qsgopenvglayer.h
index 1d52310f5c..0cf05e61e0 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvglayer.h
+++ b/src/plugins/scenegraph/openvg/qsgopenvglayer.h
@@ -62,11 +62,10 @@ public:
 
     // QSGTexture interface
 public:
-    int textureId() const override;
     QSize textureSize() const override;
     bool hasAlphaChannel() const override;
     bool hasMipmaps() const override;
-    void bind() override;
+    qint64 comparisonKey() const override;
 
     // QSGDynamicTexture interface
 public:
@@ -112,13 +111,6 @@ private:
     QOpenVGOffscreenSurface *m_secondaryOffscreenSurface;
 };
 
-class QSGOpenVGLayerPrivate : public QSGTexturePrivate
-{
-    Q_DECLARE_PUBLIC(QSGOpenVGLayer)
-public:
-    qint64 comparisonKey() const override;
-};
-
 QT_END_NAMESPACE
 
 #endif // QSGOPENVGLAYER_H
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgpainternode.cpp b/src/plugins/scenegraph/openvg/qsgopenvgpainternode.cpp
index 74f30f8189..bf35407d31 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgpainternode.cpp
+++ b/src/plugins/scenegraph/openvg/qsgopenvgpainternode.cpp
@@ -198,7 +198,7 @@ void QSGOpenVGPainterNode::render()
     vgSeti(VG_MATRIX_MODE, VG_MATRIX_IMAGE_USER_TO_SURFACE);
     vgLoadMatrix(transform().constData());
 
-    vgDrawImage(static_cast<VGImage>(m_texture->textureId()));
+    vgDrawImage(static_cast<VGImage>(m_texture->comparisonKey()));
 }
 
 void QSGOpenVGPainterNode::paint()
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgpublicnodes.cpp b/src/plugins/scenegraph/openvg/qsgopenvgpublicnodes.cpp
index b5f6b39c60..413400a966 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgpublicnodes.cpp
+++ b/src/plugins/scenegraph/openvg/qsgopenvgpublicnodes.cpp
@@ -242,6 +242,15 @@ QSGTexture::Filtering QSGOpenVGImageNode::mipmapFiltering() const
     return QSGTexture::None;
 }
 
+void QSGOpenVGImageNode::setAnisotropyLevel(QSGTexture::AnisotropyLevel)
+{
+}
+
+QSGTexture::AnisotropyLevel QSGOpenVGImageNode::anisotropyLevel() const
+{
+    return QSGTexture::AnisotropyNone;
+}
+
 void QSGOpenVGImageNode::setTextureCoordinatesTransform(QSGImageNode::TextureCoordinatesTransformMode transformNode)
 {
     if (m_transformMode == transformNode)
@@ -284,7 +293,7 @@ void QSGOpenVGImageNode::render()
     vgSeti(VG_MATRIX_MODE, VG_MATRIX_IMAGE_USER_TO_SURFACE);
     vgLoadMatrix(transform().constData());
 
-    VGImage image = static_cast<VGImage>(m_texture->textureId());
+    VGImage image = static_cast<VGImage>(m_texture->comparisonKey());
 
     //Apply the TextureCoordinateTransform Flag
     if (m_transformMode != QSGImageNode::NoTransform) {
@@ -390,7 +399,7 @@ void QSGOpenVGNinePatchNode::render()
     vgSeti(VG_MATRIX_MODE, VG_MATRIX_IMAGE_USER_TO_SURFACE);
     vgLoadMatrix(transform().constData());
 
-    VGImage image = static_cast<VGImage>(m_texture->textureId());
+    VGImage image = static_cast<VGImage>(m_texture->comparisonKey());
 
     //Draw borderImage
     QSGOpenVGHelpers::qDrawBorderImage(image, m_texture->textureSize(), m_bounds, m_bounds.marginsRemoved(m_margins), QRectF(0, 0, 1, 1));
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgpublicnodes.h b/src/plugins/scenegraph/openvg/qsgopenvgpublicnodes.h
index e1cd3063a1..0de01a41df 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgpublicnodes.h
+++ b/src/plugins/scenegraph/openvg/qsgopenvgpublicnodes.h
@@ -100,6 +100,9 @@ public:
     void setTextureCoordinatesTransform(TextureCoordinatesTransformMode transformNode) override;
     TextureCoordinatesTransformMode textureCoordinatesTransform() const override;
 
+    void setAnisotropyLevel(QSGTexture::AnisotropyLevel level) override;
+    QSGTexture::AnisotropyLevel anisotropyLevel() const override;
+
     void setOwnsTexture(bool owns) override;
     bool ownsTexture() const override;
 
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgspritenode.cpp b/src/plugins/scenegraph/openvg/qsgopenvgspritenode.cpp
index 1b75d450aa..dcf10a0c34 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgspritenode.cpp
+++ b/src/plugins/scenegraph/openvg/qsgopenvgspritenode.cpp
@@ -122,7 +122,7 @@ void QSGOpenVGSpriteNode::render()
     if (!m_texture)
         return;
 
-    VGImage image = static_cast<VGImage>(m_texture->textureId());
+    VGImage image = static_cast<VGImage>(m_texture->comparisonKey());
 
     QRectF sourceRect(m_sourceA, m_spriteSize);
     QRectF targetRect(0, 0, m_size.width(), m_size.height());