summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2019-12-03 10:37:42 +0100
committerLaszlo Agocs <laszlo.agocs@qt.io>2019-12-03 11:25:10 +0000
commitb0ffe15c308ae4991d772c445d8d66f0c5c4cebb (patch)
tree78b6774ed4bdfd59d820c89295ed98268e991f36
parent9233fc6c9e95b00c5c79129a97030b8a11ba43d1 (diff)
Get rid of QFlags warnings for assigning 0
Fixes: QTBUG-80492 Change-Id: I5b6492e34603cc3732c34eb24a6d43b17b67be74 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
-rw-r--r--src/shadertools/qshaderbaker.cpp4
-rw-r--r--src/shadertools/qspirvcompiler.cpp2
-rw-r--r--src/shadertools/qspirvshader.cpp2
-rw-r--r--tools/qsb/qsb.cpp4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/shadertools/qshaderbaker.cpp b/src/shadertools/qshaderbaker.cpp
index 700901f..a03a6c8 100644
--- a/src/shadertools/qshaderbaker.cpp
+++ b/src/shadertools/qshaderbaker.cpp
@@ -348,7 +348,7 @@ QShader QShaderBaker::bake()
}
d->compiler.setSourceString(d->source, d->stage, d->sourceFileName);
- d->compiler.setFlags(0);
+ d->compiler.setFlags({});
d->compiler.setPreamble(d->preamble);
QByteArray spirv = d->compiler.compileToSpirv();
if (spirv.isEmpty()) {
@@ -402,7 +402,7 @@ QShader QShaderBaker::bake()
break;
case QShader::GlslShader:
{
- QSpirvShader::GlslFlags flags = 0;
+ QSpirvShader::GlslFlags flags;
if (req.second.flags().testFlag(QShaderVersion::GlslEs))
flags |= QSpirvShader::GlslEs;
shader.setShader(currentSpirvShader->translateToGLSL(req.second.version(), flags));
diff --git a/src/shadertools/qspirvcompiler.cpp b/src/shadertools/qspirvcompiler.cpp
index e8f341e..00aaf4d 100644
--- a/src/shadertools/qspirvcompiler.cpp
+++ b/src/shadertools/qspirvcompiler.cpp
@@ -161,7 +161,7 @@ struct QSpirvCompilerPrivate
QByteArray source;
QByteArray batchableSource;
EShLanguage stage = EShLangVertex;
- QSpirvCompiler::Flags flags = 0;
+ QSpirvCompiler::Flags flags;
QByteArray preamble;
int batchAttrLoc = 7;
QByteArray spirv;
diff --git a/src/shadertools/qspirvshader.cpp b/src/shadertools/qspirvshader.cpp
index 0be1423..516d270 100644
--- a/src/shadertools/qspirvshader.cpp
+++ b/src/shadertools/qspirvshader.cpp
@@ -260,7 +260,7 @@ QShaderDescription::InOutVariable QSpirvShaderPrivate::inOutVar(const spvc_refle
// DecorationNonReadable/Writable in a way that it returns the real
// values (f.ex. has_decoration() on r.id or so is not functional). So
// ignore these for now and pretend the image is read/write.
- v.imageFlags = 0;
+ v.imageFlags = {};
}
return v;
diff --git a/tools/qsb/qsb.cpp b/tools/qsb/qsb.cpp
index c59070a..6d28ecb 100644
--- a/tools/qsb/qsb.cpp
+++ b/tools/qsb/qsb.cpp
@@ -228,7 +228,7 @@ static void extract(const QShader &bs, const QString &what, bool batchable, cons
else
return;
- QShaderVersion::Flags flags = 0;
+ QShaderVersion::Flags flags;
QString version = typeAndVersion[1];
if (version.endsWith(QLatin1String(" es"))) {
version = version.left(version.count() - 3);
@@ -389,7 +389,7 @@ int main(int argc, char **argv)
if (cmdLineParser.isSet(glslOption)) {
const QStringList versions = cmdLineParser.value(glslOption).trimmed().split(',');
for (QString version : versions) {
- QShaderVersion::Flags flags = 0;
+ QShaderVersion::Flags flags;
if (version.endsWith(QLatin1String(" es"))) {
version = version.left(version.count() - 3);
flags |= QShaderVersion::GlslEs;