diff options
| author | Thaddeus Crews <repiteo@outlook.com> | 2024-11-27 10:46:53 -0600 |
|---|---|---|
| committer | Thaddeus Crews <repiteo@outlook.com> | 2024-11-27 10:46:53 -0600 |
| commit | 7ddc076b24d68f5ec83ecc49e39f2dcc24d94659 (patch) | |
| tree | 07b02ce364ec00ae6473d286f4455e4020b2edf8 /modules | |
| parent | ed443ccd25bc4800c76df4ed4271f27e749c4163 (diff) | |
| parent | e297506365559f2b13534b9dd5f3250db06975a5 (diff) | |
| download | redot-engine-7ddc076b24d68f5ec83ecc49e39f2dcc24d94659.tar.gz | |
Merge pull request #99600 from Spartan322/permit/non-spec-dds
Round DDS width/height to next divisor multiple for block compression
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/dds/texture_loader_dds.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/modules/dds/texture_loader_dds.cpp b/modules/dds/texture_loader_dds.cpp index 601d0e0c24..667de70d13 100644 --- a/modules/dds/texture_loader_dds.cpp +++ b/modules/dds/texture_loader_dds.cpp @@ -289,6 +289,15 @@ static Ref<Image> _dds_load_layer(Ref<FileAccess> p_file, DDSFormat p_dds_format if (info.compressed) { // BC compressed. + w += w % info.divisor; + h += h % info.divisor; + if (w != p_width) { + WARN_PRINT(vformat("%s: DDS width '%d' is not divisible by %d. This is not allowed as per the DDS specification, attempting to load anyway.", p_file->get_path(), p_width, info.divisor)); + } + if (h != p_height) { + WARN_PRINT(vformat("%s: DDS height '%d' is not divisible by %d. This is not allowed as per the DDS specification, attempting to load anyway.", p_file->get_path(), p_height, info.divisor)); + } + uint32_t size = MAX(info.divisor, w) / info.divisor * MAX(info.divisor, h) / info.divisor * info.block_size; if (p_flags & DDSD_LINEARSIZE) { |