Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: Iba540adaeffb0098fc4e1923050eb611bf47287b

10 files changed, 100 insertions, 8 deletions

diff --git a/src/quick/scenegraph/util/qsgdefaultimagenode.cpp b/src/quick/scenegraph/util/qsgdefaultimagenode.cpp
index 63773887a0..7186ee4265 100644
--- a/src/quick/scenegraph/util/qsgdefaultimagenode.cpp
+++ b/src/quick/scenegraph/util/qsgdefaultimagenode.cpp
@@ -94,6 +94,21 @@ QSGTexture::Filtering QSGDefaultImageNode::mipmapFiltering() const
     return m_material.mipmapFiltering();
 }
 
+void QSGDefaultImageNode::setAnisotropyLevel(QSGTexture::AnisotropyLevel level)
+{
+    if (m_material.anisotropyLevel() == level)
+        return;
+
+    m_material.setAnisotropyLevel(level);
+    m_opaque_material.setAnisotropyLevel(level);
+    markDirty(DirtyMaterial);
+}
+
+QSGTexture::AnisotropyLevel QSGDefaultImageNode::anisotropyLevel() const
+{
+    return m_material.anisotropyLevel();
+}
+
 void QSGDefaultImageNode::setRect(const QRectF &r)
 {
     if (m_rect == r)
diff --git a/src/quick/scenegraph/util/qsgdefaultimagenode_p.h b/src/quick/scenegraph/util/qsgdefaultimagenode_p.h
index bb9ebec885..cb23e759d3 100644
--- a/src/quick/scenegraph/util/qsgdefaultimagenode_p.h
+++ b/src/quick/scenegraph/util/qsgdefaultimagenode_p.h
@@ -85,6 +85,10 @@ public:
     void setOwnsTexture(bool owns) override;
     bool ownsTexture() const override;
 
+    // QSGImageNode now being a public class does not allow any additional virtual methods. Placing these here, non-virtual.
+    void setAnisotropyLevel(QSGTexture::AnisotropyLevel level);
+    QSGTexture::AnisotropyLevel anisotropyLevel() const;
+
 private:
     QSGGeometry m_geometry;
     QSGOpaqueTextureMaterial m_opaque_material;
diff --git a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
index 8ab7669891..a0c71b5340 100644
--- a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
+++ b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
@@ -50,13 +50,13 @@ class FlatColorMaterialShader : public QSGMaterialShader
 public:
     FlatColorMaterialShader();
 
-    virtual void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect);
-    virtual char const *const *attributeNames() const;
+    void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) override;
+    char const *const *attributeNames() const override;
 
     static QSGMaterialType type;
 
 private:
-    virtual void initialize();
+    void initialize() override;
 #if QT_CONFIG(opengl)
     int m_matrix_id;
     int m_color_id;
diff --git a/src/quick/scenegraph/util/qsgimagenode.h b/src/quick/scenegraph/util/qsgimagenode.h
index d25e732e4b..0e053c307f 100644
--- a/src/quick/scenegraph/util/qsgimagenode.h
+++ b/src/quick/scenegraph/util/qsgimagenode.h
@@ -67,6 +67,8 @@ public:
     virtual void setMipmapFiltering(QSGTexture::Filtering filtering) = 0;
     virtual QSGTexture::Filtering mipmapFiltering() const = 0;
 
+    // ### Qt6: Add anisotropy support here, and possibly a virtual hook or another mean to extend this class.
+
     enum TextureCoordinatesTransformFlag {
         NoTransform        = 0x00,
         MirrorHorizontally = 0x01,
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
index d761eac62f..521c5e666f 100644
--- a/src/quick/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -83,6 +83,9 @@ static const bool qsg_leak_check = !qEnvironmentVariableIsEmpty("QML_LEAK_CHECK"
 #define GL_BGRA 0x80E1
 #endif
 
+#ifndef GL_TEXTURE_MAX_ANISOTROPY_EXT
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -97,10 +100,12 @@ inline static bool isPowerOfTwo(int x)
 QSGTexturePrivate::QSGTexturePrivate()
     : wrapChanged(false)
     , filteringChanged(false)
+    , anisotropyChanged(false)
     , horizontalWrap(QSGTexture::ClampToEdge)
     , verticalWrap(QSGTexture::ClampToEdge)
     , mipmapMode(QSGTexture::None)
     , filterMode(QSGTexture::Nearest)
+    , anisotropyLevel(QSGTexture::AnisotropyNone)
 {
 }
 
@@ -278,6 +283,23 @@ static void qt_debug_remove_texture(QSGTexture* texture)
 */
 
 /*!
+    \enum QSGTexture::AnisotropyLevel
+
+    Specifies the anisotropic filtering level to be used when
+    the texture is not screen aligned.
+
+    \value AnisotropyNone No anisotropic filtering.
+
+    \value Anisotropy2x 2x anisotropic filtering.
+
+    \value Anisotropy4x 4x anisotropic filtering.
+
+    \value Anisotropy8x 8x anisotropic filtering.
+
+    \value Anisotropy16x 16x anisotropic filtering.
+*/
+
+/*!
     \fn QSGTexture::QSGTexture(QSGTexturePrivate &dd)
     \internal
  */
@@ -476,6 +498,31 @@ QSGTexture::Filtering QSGTexture::filtering() const
     return (QSGTexture::Filtering) d_func()->filterMode;
 }
 
+/*!
+    Sets the level of anisotropic filtering to be used for the upcoming bind() call to \a level.
+    The default value is QSGTexture::AnisotropyNone, which means no anisotropic filtering is enabled.
+
+    \since 5.9
+ */
+void QSGTexture::setAnisotropyLevel(AnisotropyLevel level)
+{
+    Q_D(QSGTexture);
+    if (d->anisotropyLevel != (uint) level) {
+        d->anisotropyLevel = level;
+        d->anisotropyChanged = true;
+    }
+}
+
+/*!
+    Returns the anisotropy level in use for filtering this texture.
+
+    \since 5.9
+ */
+QSGTexture::AnisotropyLevel QSGTexture::anisotropyLevel() const
+{
+    return (QSGTexture::AnisotropyLevel) d_func()->anisotropyLevel;
+}
+
 
 
 /*!
@@ -552,6 +599,12 @@ void QSGTexture::updateBindOptions(bool force)
         d->filteringChanged = false;
     }
 
+    if (force || d->anisotropyChanged) {
+        d->anisotropyChanged = false;
+        if (QOpenGLContext::currentContext()->hasExtension(QByteArrayLiteral("GL_EXT_texture_filter_anisotropic")))
+            funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, float(1 << (d->anisotropyLevel)));
+    }
+
     if (force || d->wrapChanged) {
 #ifndef QT_NO_DEBUG
         if (d->horizontalWrap == Repeat || d->verticalWrap == Repeat
diff --git a/src/quick/scenegraph/util/qsgtexture.h b/src/quick/scenegraph/util/qsgtexture.h
index 2b29525efd..032129434e 100644
--- a/src/quick/scenegraph/util/qsgtexture.h
+++ b/src/quick/scenegraph/util/qsgtexture.h
@@ -68,6 +68,14 @@ public:
         Linear
     };
 
+    enum AnisotropyLevel {
+        AnisotropyNone,
+        Anisotropy2x,
+        Anisotropy4x,
+        Anisotropy8x,
+        Anisotropy16x
+    };
+
     virtual int textureId() const = 0;
     virtual QSize textureSize() const = 0;
     virtual bool hasAlphaChannel() const = 0;
@@ -88,6 +96,9 @@ public:
     void setFiltering(Filtering filter);
     QSGTexture::Filtering filtering() const;
 
+    void setAnisotropyLevel(AnisotropyLevel level);
+    QSGTexture::AnisotropyLevel anisotropyLevel() const;
+
     void setHorizontalWrapMode(WrapMode hwrap);
     QSGTexture::WrapMode horizontalWrapMode() const;
 
diff --git a/src/quick/scenegraph/util/qsgtexture_p.h b/src/quick/scenegraph/util/qsgtexture_p.h
index 3a10d85b4d..52dc6db2d0 100644
--- a/src/quick/scenegraph/util/qsgtexture_p.h
+++ b/src/quick/scenegraph/util/qsgtexture_p.h
@@ -69,11 +69,13 @@ public:
 
     uint wrapChanged : 1;
     uint filteringChanged : 1;
+    uint anisotropyChanged : 1;
 
     uint horizontalWrap : 2;
     uint verticalWrap : 2;
     uint mipmapMode : 2;
     uint filterMode : 2;
+    uint anisotropyLevel: 3;
 };
 
 class Q_QUICK_PRIVATE_EXPORT QSGPlainTexture : public QSGTexture
diff --git a/src/quick/scenegraph/util/qsgtexturematerial.cpp b/src/quick/scenegraph/util/qsgtexturematerial.cpp
index fcafbba6a2..fbc8f27a63 100644
--- a/src/quick/scenegraph/util/qsgtexturematerial.cpp
+++ b/src/quick/scenegraph/util/qsgtexturematerial.cpp
@@ -110,6 +110,7 @@ void QSGOpaqueTextureMaterialShader::updateState(const RenderState &state, QSGMa
     Q_UNUSED(state)
 #endif
     t->setMipmapFiltering(tx->mipmapFiltering());
+    t->setAnisotropyLevel(tx->anisotropyLevel());
 
     if (oldTx == 0 || oldTx->texture()->textureId() != t->textureId())
         t->bind();
@@ -173,6 +174,7 @@ QSGOpaqueTextureMaterial::QSGOpaqueTextureMaterial()
     , m_mipmap_filtering(QSGTexture::None)
     , m_horizontal_wrap(QSGTexture::ClampToEdge)
     , m_vertical_wrap(QSGTexture::ClampToEdge)
+    , m_anisotropy_level(QSGTexture::AnisotropyNone)
 {
 }
 
diff --git a/src/quick/scenegraph/util/qsgtexturematerial.h b/src/quick/scenegraph/util/qsgtexturematerial.h
index dc87131773..87d8e5fd49 100644
--- a/src/quick/scenegraph/util/qsgtexturematerial.h
+++ b/src/quick/scenegraph/util/qsgtexturematerial.h
@@ -69,6 +69,9 @@ public:
     void setVerticalWrapMode(QSGTexture::WrapMode mode) { m_vertical_wrap = mode; }
     QSGTexture::WrapMode verticalWrapMode() const { return QSGTexture::WrapMode(m_vertical_wrap); }
 
+    void setAnisotropyLevel(QSGTexture::AnisotropyLevel level) { m_anisotropy_level = level; }
+    QSGTexture::AnisotropyLevel anisotropyLevel() const { return QSGTexture::AnisotropyLevel(m_anisotropy_level); }
+
 protected:
     QSGTexture *m_texture;
 
@@ -76,8 +79,8 @@ protected:
     uint m_mipmap_filtering: 2;
     uint m_horizontal_wrap : 1;
     uint m_vertical_wrap: 1;
-
-    uint m_reserved : 26;
+    uint m_anisotropy_level : 3;
+    uint m_reserved : 23;
 };
 
 
diff --git a/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
index 8c305d7fd4..42c589b14a 100644
--- a/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
+++ b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
@@ -48,13 +48,13 @@ class QSGVertexColorMaterialShader : public QSGMaterialShader
 public:
     QSGVertexColorMaterialShader();
 
-    virtual void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect);
-    virtual char const *const *attributeNames() const;
+    void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) override;
+    char const *const *attributeNames() const override;
 
     static QSGMaterialType type;
 
 private:
-    virtual void initialize();
+    void initialize() override;
 #if QT_CONFIG(opengl)
     int m_matrix_id;
     int m_opacity_id;