diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-07-09 13:30:03 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-08-27 18:58:20 +0200 |
| commit | 50661a9558ca3fe93bf569cc572b0fb2def5589d (patch) | |
| tree | 6cf8e3d1bbfd4867db5fc79959b0c3df1a20a97a /src/gui/rhi/qrhimetal.mm | |
| parent | f48dba06650801c5678ae89adfc14b1cc3209da9 (diff) | |
Change QByteArray to handle large arrays
Use qsizetype throughout.
Change-Id: I787af7fcfa17e1be87decb64c41c609cc24be117
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/rhi/qrhimetal.mm')
| -rw-r--r-- | src/gui/rhi/qrhimetal.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/rhi/qrhimetal.mm b/src/gui/rhi/qrhimetal.mm index d9575e949b..7d2b1982f0 100644 --- a/src/gui/rhi/qrhimetal.mm +++ b/src/gui/rhi/qrhimetal.mm @@ -1636,7 +1636,7 @@ void QRhiMetal::enqueueSubresUpload(QMetalTexture *texD, void *mp, void *blitEnc destinationOrigin: MTLOriginMake(NSUInteger(dx), NSUInteger(dy), 0) options: MTLBlitOptionNone]; - *curOfs += aligned(rawData.size(), QRhiMetalData::TEXBUF_ALIGN); + *curOfs += aligned<qsizetype>(rawData.size(), QRhiMetalData::TEXBUF_ALIGN); } else if (!rawData.isEmpty()) { const QSize subresSize = q->sizeForMipLevel(level, texD->m_pixelSize); const int subresw = subresSize.width(); @@ -1665,7 +1665,7 @@ void QRhiMetal::enqueueSubresUpload(QMetalTexture *texD, void *mp, void *blitEnc destinationOrigin: MTLOriginMake(NSUInteger(dp.x()), NSUInteger(dp.y()), 0) options: MTLBlitOptionNone]; - *curOfs += aligned(rawData.size(), QRhiMetalData::TEXBUF_ALIGN); + *curOfs += aligned<qsizetype>(rawData.size(), QRhiMetalData::TEXBUF_ALIGN); } else { qWarning("Invalid texture upload for %p layer=%d mip=%d", texD, layer, level); } |