aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-10-06 10:53:45 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-10-06 10:31:01 +0000
commitff5c83087e94f340a8c5695998f2ea81e29da8ea (patch)
tree257414475b3ed660f1bdeeab3226ddb2606208c7 /src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp
parentd6358abf1719f920a7cadc85734c1ba520a52c25 (diff)
D3D12: Fix some compiler warnings emitted by clang-cl
qsgd3d12renderer.cpp(72,7): warning: field 'm_renderList' will be initialized after field 'm_vboData' [-Wreorder] qsgd3d12renderer.cpp(450,11): warning: 'scissorRect' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] qsgd3d12renderer.cpp(451,10): warning: 'scissorEnabled' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] ^ qsgd3d12renderer.cpp(452,9): warning: 'stencilValue' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] qsgd3d12renderer.cpp(453,10): warning: 'stencilEnabled' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] qsgd3d12builtinmaterials.cpp(463,7): warning: field 'm_font' will be initialized after field 'm_rc' [-Wreorder] qsgd3d12shadereffectnode.cpp(174,32): warning: comparison of two values with different enumeration types ('QVariant::Type' and 'QMetaType::Type') [-Wenum-compare] qsgd3d12engine.cpp(347,5): warning: delete called on non-final 'QSGD3D12EnginePrivate' that has virtual functions but non-virtual destructor [-Wdelete-non-virtual-dtor] qsgd3d12engine.cpp(2097,9): warning: variable 'topology' is used uninitialized whenever switch default is taken [-Wsometimes-uninitialized] Change-Id: Id4179ccbe6f13c3068b445c2ae2a093a67851158 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp')
-rw-r--r--src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp
index 62771eb8f9..b4fb721a8b 100644
--- a/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp
+++ b/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp
@@ -171,7 +171,7 @@ void QSGD3D12ShaderLinker::linkTextureSubRects()
// texture bind point.
for (Constant &c : constants) {
if (c.specialType == QSGShaderEffectNode::VariableData::SubRect) {
- if (c.value.type() == QMetaType::QByteArray) {
+ if (c.value.type() == QVariant::ByteArray) {
const QByteArray name = c.value.toByteArray();
if (!textureNameMap.contains(name))
qWarning("ShaderEffect: qt_SubRect_%s refers to unknown source texture", qPrintable(name));