Merge pull request #105193 from Monstrofil/fix-dds-mipmap-size-uncompressed-dds

Repiteo · Repiteo · commit 4636d0abc96f · 2025-04-09T18:12:01.000-05:00
Fix incorrect mipmap size calculation for uncompressed DDS textures
diff --git a/modules/dds/texture_loader_dds.cpp b/modules/dds/texture_loader_dds.cpp
@@ -165,8 +165,8 @@ static Ref<Image> _dds_load_layer(Ref<FileAccess> p_file, DDSFormat p_dds_format
 		uint32_t size = p_width * p_height * info.block_size;
 
 		for (uint32_t i = 1; i < p_mipmaps; i++) {
-			w = (w + 1) >> 1;
-			h = (h + 1) >> 1;
+			w = MAX(1u, w >> 1);
+			h = MAX(1u, h >> 1);
 			size += w * h * info.block_size;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -165,8 +165,8 @@ static Ref<Image> _dds_load_layer(Ref<FileAccess> p_file, DDSFormat p_dds_format`
`165`	`165`	`uint32_t size = p_width * p_height * info.block_size;`
`166`	`166`
`167`	`167`	`for (uint32_t i = 1; i < p_mipmaps; i++) {`
`168`		`- w = (w + 1) >> 1;`
`169`		`- h = (h + 1) >> 1;`
	`168`	`+ w = MAX(1u, w >> 1);`
	`169`	`+ h = MAX(1u, h >> 1);`
`170`	`170`	`size += w * h * info.block_size;`
`171`	`171`	`}`
`172`	`172`