summaryrefslogtreecommitdiffstats
path: root/src/render/framegraph
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2019-10-04 08:53:31 +0100
committerMike Krus <mike.krus@kdab.com>2019-10-08 10:06:35 +0100
commitee7dd0b8ec9e79f80c44bb7235e5cf54f3a6666c (patch)
treeabefe0383974625d0ee97cfbd09c95f487defe68 /src/render/framegraph
parent222c7f3c57d94eec1df231e46646470ddd1e3655 (diff)
Fix compile warnings
Change-Id: Iac24c13fa77bb0c6317af77f61016ee6fbf9a916 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/framegraph')
-rw-r--r--src/render/framegraph/clearbuffers.cpp8
-rw-r--r--src/render/framegraph/qrendersurfaceselector.cpp12
2 files changed, 10 insertions, 10 deletions
diff --git a/src/render/framegraph/clearbuffers.cpp b/src/render/framegraph/clearbuffers.cpp
index eae864cc1..3f99e0e20 100644
--- a/src/render/framegraph/clearbuffers.cpp
+++ b/src/render/framegraph/clearbuffers.cpp
@@ -51,16 +51,16 @@ static QVector4D vec4dFromColor(const QColor &color)
{
if (!color.isValid())
return QVector4D(0.0f, 0.0f, 0.0f, 1.0f);
- return QVector4D(color.redF(), color.greenF(), color.blueF(), color.alphaF());
+ return QVector4D(float(color.redF()), float(color.greenF()), float(color.blueF()), float(color.alphaF()));
}
ClearBuffers::ClearBuffers()
: FrameGraphNode(FrameGraphNode::ClearBuffers)
, m_type(QClearBuffers::None)
+ , m_clearColor(vec4dFromColor(m_clearColorAsColor))
+ , m_clearColorAsColor(Qt::black)
, m_clearDepthValue(1.f)
, m_clearStencilValue(0)
- , m_clearColorAsColor(Qt::black)
- , m_clearColor(vec4dFromColor(m_clearColorAsColor))
{
}
@@ -78,7 +78,7 @@ void ClearBuffers::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
markDirty(AbstractRenderer::FrameGraphDirty);
}
- if (m_clearDepthValue != node->clearDepthValue()) {
+ if (!qFuzzyCompare(m_clearDepthValue, node->clearDepthValue())) {
m_clearDepthValue = node->clearDepthValue();
markDirty(AbstractRenderer::FrameGraphDirty);
}
diff --git a/src/render/framegraph/qrendersurfaceselector.cpp b/src/render/framegraph/qrendersurfaceselector.cpp
index 6584ff4fc..df30663cb 100644
--- a/src/render/framegraph/qrendersurfaceselector.cpp
+++ b/src/render/framegraph/qrendersurfaceselector.cpp
@@ -251,17 +251,17 @@ void QRenderSurfaceSelector::setSurface(QObject *surfaceObject)
d->m_surfaceEventFilter->setSurface(window);
if (window) {
- d->m_widthConn = QObject::connect(window, &QWindow::widthChanged, [=] (int width) {
+ d->m_widthConn = QObject::connect(window, &QWindow::widthChanged, [=] (int) {
d->update();
});
- d->m_heightConn = QObject::connect(window, &QWindow::heightChanged, [=] (int height) {
+ d->m_heightConn = QObject::connect(window, &QWindow::heightChanged, [=] (int) {
d->update();
});
d->m_screenConn = QObject::connect(window, &QWindow::screenChanged, [=] (QScreen *screen) {
- if (screen && surfacePixelRatio() != screen->devicePixelRatio())
- setSurfacePixelRatio(screen->devicePixelRatio());
+ if (screen && !qFuzzyCompare(surfacePixelRatio(), float(screen->devicePixelRatio())))
+ setSurfacePixelRatio(float(screen->devicePixelRatio()));
});
- setSurfacePixelRatio(window->devicePixelRatio());
+ setSurfacePixelRatio(float(window->devicePixelRatio()));
}
break;
@@ -291,7 +291,7 @@ QSize QRenderSurfaceSelector::externalRenderTargetSize() const
void QRenderSurfaceSelector::setSurfacePixelRatio(float ratio)
{
Q_D(QRenderSurfaceSelector);
- if (d->m_surfacePixelRatio == ratio)
+ if (qFuzzyCompare(d->m_surfacePixelRatio, ratio))
return;
d->m_surfacePixelRatio = ratio;
emit surfacePixelRatioChanged(ratio);