From 57b0d96b64981c93e1a7decd010d30c0b4883900 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 24 Aug 2020 21:42:17 +0200 Subject: Fix a bunch of compiler warnings Taks-number: QTBUG-86234 Change-Id: I4c945edecdbe55bc5587c18599d49dfb82ade1eb Reviewed-by: Fabian Kosmale --- src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp | 2 -- src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | 2 ++ src/quick/scenegraph/util/qsgdefaultpainternode.cpp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/quick/scenegraph') diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp index f65530dd1e..8aa7139940 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp @@ -80,8 +80,6 @@ DECLARE_DEBUG_VAR(noopaque) DECLARE_DEBUG_VAR(noclip) #undef DECLARE_DEBUG_VAR -static QElapsedTimer qsg_renderer_timer; - #define QSGNODE_TRAVERSE(NODE) for (QSGNode *child = NODE->firstChild(); child; child = child->nextSibling()) #define SHADOWNODE_TRAVERSE(NODE) for (Node *child = NODE->firstChild(); child; child = child->sibling()) diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp index 475dbea393..b422eea123 100644 --- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp +++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp @@ -67,6 +67,7 @@ static inline QVector4D qsg_premultiply(const QVector4D &c, float globalOpacity) return QVector4D(c.x() * o, c.y() * o, c.z() * o, o); } +#if 0 static inline qreal qt_sRGB_to_linear_RGB(qreal f) { return f > 0.04045 ? qPow((f + 0.055) / 1.055, 2.4) : f / 12.92; @@ -85,6 +86,7 @@ static inline qreal fontSmoothingGamma() static qreal fontSmoothingGamma = QGuiApplicationPrivate::platformIntegration()->styleHint(QPlatformIntegration::FontSmoothingGamma).toReal(); return fontSmoothingGamma; } +#endif class QSGTextMaskRhiShader : public QSGMaterialShader { diff --git a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp index 844247521e..d97d48c78d 100644 --- a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp +++ b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp @@ -85,6 +85,7 @@ QSGDefaultPainterNode::QSGDefaultPainterNode(QQuickPaintedItem *item) , m_dirtyRenderTarget(false) , m_dirtyTexture(false) { + Q_UNUSED(m_multisamplingSupported); m_context = static_cast(static_cast(QObjectPrivate::get(item))->sceneGraphRenderContext()); setMaterial(&m_materialO); -- cgit v1.2.3