summaryrefslogtreecommitdiffstats
path: root/src/gui/rhi/qshader.cpp
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2020-05-01 15:07:12 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2020-05-05 11:34:39 +0200
commita206f52acd175800688b9f4cce8e56df2632dab2 (patch)
tree97dc1a9f690d38a857560c1a3f0ea26f2a152228 /src/gui/rhi/qshader.cpp
parent616000ed7f1b2e60d8766c36eab5b86c9c8e6ee3 (diff)
Hotfix for int->qsizetype fallout in QShader
The proper solution is to use qint32 everywhere, but that is left as a separate exercise. Change-Id: Id0c06b102b56a1b3b48dd67c6c29c28da7d1f22d Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/gui/rhi/qshader.cpp')
-rw-r--r--src/gui/rhi/qshader.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/rhi/qshader.cpp b/src/gui/rhi/qshader.cpp
index b5c1aca8be..18d0fdef05 100644
--- a/src/gui/rhi/qshader.cpp
+++ b/src/gui/rhi/qshader.cpp
@@ -368,7 +368,7 @@ QByteArray QShader::serialized() const
ds << QShaderPrivate::QSB_VERSION;
ds << int(d->stage);
d->desc.serialize(&ds);
- ds << d->shaders.count();
+ ds << int(d->shaders.count());
for (auto it = d->shaders.cbegin(), itEnd = d->shaders.cend(); it != itEnd; ++it) {
const QShaderKey &k(it.key());
writeShaderKey(&ds, k);
@@ -376,12 +376,12 @@ QByteArray QShader::serialized() const
ds << shader.shader();
ds << shader.entryPoint();
}
- ds << d->bindings.count();
+ ds << int(d->bindings.count());
for (auto it = d->bindings.cbegin(), itEnd = d->bindings.cend(); it != itEnd; ++it) {
const QShaderKey &k(it.key());
writeShaderKey(&ds, k);
const NativeResourceBindingMap &map(it.value());
- ds << map.count();
+ ds << int(map.count());
for (auto mapIt = map.cbegin(), mapItEnd = map.cend(); mapIt != mapItEnd; ++mapIt) {
ds << mapIt.key();
ds << mapIt.value().first;