[neon/qt6/qt6-quick3d/Neon/release] debian/patches: refresh patch
Carlos De Maine
null at kde.org
Wed Feb 11 04:57:45 GMT 2026
Git commit 165627ceab736d34905c7e1bc45eccca17fd9b52 by Carlos De Maine.
Committed on 11/02/2026 at 04:57.
Pushed by carlosdem into branch 'Neon/release'.
refresh patch
M +12 -7 debian/patches/58227ef.diff
https://invent.kde.org/neon/qt6/qt6-quick3d/-/commit/165627ceab736d34905c7e1bc45eccca17fd9b52
diff --git a/debian/patches/58227ef.diff b/debian/patches/58227ef.diff
index 2cb13dc..3bd444c 100644
--- a/debian/patches/58227ef.diff
+++ b/debian/patches/58227ef.diff
@@ -1,14 +1,16 @@
+diff --git a/src/runtimerender/resourcemanager/qssgrenderbuffermanager.cpp b/src/runtimerender/resourcemanager/qssgrenderbuffermanager.cpp
+index 05b4b9c664919f8afb48be44243ac19699c27153..cbb5f10a26c0d1d5ff02e085672f95a4433342f6 100644
--- a/src/runtimerender/resourcemanager/qssgrenderbuffermanager.cpp
+++ b/src/runtimerender/resourcemanager/qssgrenderbuffermanager.cpp
-@@ -2060,6 +2060,113 @@
+@@ -2074,6 +2074,113 @@ void QSSGBufferManager::processResourceLoader(const QSSGRenderResourceLoader *lo
commitBufferResourceUpdates();
}
-+static inline unsigned textureFormatSize(QRhiTexture::Format format)
++static inline quint32 textureFormatSize(QRhiTexture::Format format)
+{
+ switch (format) {
+ case QRhiTexture::UnknownFormat:
-+ return 1;
++ return 0;
+ case QRhiTexture::RGBA8:
+ return 4;
+ case QRhiTexture::BGRA8:
@@ -103,7 +105,7 @@
+ case QRhiTexture::ASTC_12x12:
+ return 16;
+ }
-+ return 1;
++ Q_UNREACHABLE_RETURN(0);
+}
+
+static inline bool isCompressedTextureFormat(QRhiTexture::Format format)
@@ -114,7 +116,7 @@
static inline quint64 textureMemorySize(QRhiTexture *texture)
{
quint64 s = 0;
-@@ -2071,54 +2178,12 @@
+@@ -2085,54 +2192,15 @@ static inline quint64 textureMemorySize(QRhiTexture *texture)
return 0;
s = texture->pixelSize().width() * texture->pixelSize().height();
@@ -167,10 +169,13 @@
- else
- s /= 16;
+
++ const quint32 bytesPerPixel = textureFormatSize(format);
++ QSSG_ASSERT_X(bytesPerPixel > 0, "Invalid texture format size", return 0);
++
+ if (!isCompressedTextureFormat(format)) {
-+ s *= textureFormatSize(format);
++ s *= bytesPerPixel;
+ } else {
-+ s /= textureFormatSize(format);
++ s /= bytesPerPixel;
+ }
if (texture->flags() & QRhiTexture::MipMapped)
More information about the Neon-commits
mailing list