From 0045dc204c954edfcc8f15751d4ea54174da7818 Mon Sep 17 00:00:00 2001 From: clayjohn Date: Tue, 29 Aug 2023 14:25:16 +0200 Subject: [PATCH] Revert "Implement loading DDS textures at run-time" This reverts commit 34ab1c8a36e61b386c210fb908b9ebfa86513149. --- core/io/image.cpp | 10 - core/io/image.h | 2 - doc/classes/Image.xml | 7 - modules/dds/image_loader_dds.cpp | 421 ----------------------------- modules/dds/image_loader_dds.h | 43 --- modules/dds/register_types.cpp | 8 - modules/dds/texture_loader_dds.cpp | 362 ++++++++++++++++++++++++- tests/core/io/test_image.h | 10 - tests/data/images/icon.dds | Bin 87536 -> 0 bytes 9 files changed, 357 insertions(+), 506 deletions(-) delete mode 100644 modules/dds/image_loader_dds.cpp delete mode 100644 modules/dds/image_loader_dds.h delete mode 100644 tests/data/images/icon.dds diff --git a/core/io/image.cpp b/core/io/image.cpp index 3ca39f98c052..ce2f47371af6 100644 --- a/core/io/image.cpp +++ b/core/io/image.cpp @@ -3017,7 +3017,6 @@ ImageMemLoadFunc Image::_webp_mem_loader_func = nullptr; ImageMemLoadFunc Image::_tga_mem_loader_func = nullptr; ImageMemLoadFunc Image::_bmp_mem_loader_func = nullptr; ScalableImageMemLoadFunc Image::_svg_scalable_mem_loader_func = nullptr; -ImageMemLoadFunc Image::_dds_mem_loader_func = nullptr; ImageMemLoadFunc Image::_ktx_mem_loader_func = nullptr; void (*Image::_image_compress_bc_func)(Image *, Image::UsedChannels) = nullptr; @@ -3490,7 +3489,6 @@ void Image::_bind_methods() { ClassDB::bind_method(D_METHOD("load_webp_from_buffer", "buffer"), &Image::load_webp_from_buffer); ClassDB::bind_method(D_METHOD("load_tga_from_buffer", "buffer"), &Image::load_tga_from_buffer); ClassDB::bind_method(D_METHOD("load_bmp_from_buffer", "buffer"), &Image::load_bmp_from_buffer); - ClassDB::bind_method(D_METHOD("load_dds_from_buffer", "buffer"), &Image::load_dds_from_buffer); ClassDB::bind_method(D_METHOD("load_ktx_from_buffer", "buffer"), &Image::load_ktx_from_buffer); ClassDB::bind_method(D_METHOD("load_svg_from_buffer", "buffer", "scale"), &Image::load_svg_from_buffer, DEFVAL(1.0)); @@ -3867,14 +3865,6 @@ Error Image::load_svg_from_string(const String &p_svg_str, float scale) { return load_svg_from_buffer(p_svg_str.to_utf8_buffer(), scale); } -Error Image::load_dds_from_buffer(const Vector &p_array) { - ERR_FAIL_NULL_V_MSG( - _dds_mem_loader_func, - ERR_UNAVAILABLE, - "The DDS module isn't enabled. Recompile the Godot editor or export template binary with the `module_dds_enabled=yes` SCons option."); - return _load_from_buffer(p_array, _dds_mem_loader_func); -} - Error Image::load_ktx_from_buffer(const Vector &p_array) { ERR_FAIL_NULL_V_MSG( _ktx_mem_loader_func, diff --git a/core/io/image.h b/core/io/image.h index cb7c6bff5296..a21d05187b5b 100644 --- a/core/io/image.h +++ b/core/io/image.h @@ -150,7 +150,6 @@ public: static ImageMemLoadFunc _tga_mem_loader_func; static ImageMemLoadFunc _bmp_mem_loader_func; static ScalableImageMemLoadFunc _svg_scalable_mem_loader_func; - static ImageMemLoadFunc _dds_mem_loader_func; static ImageMemLoadFunc _ktx_mem_loader_func; static void (*_image_compress_bc_func)(Image *, UsedChannels p_channels); @@ -404,7 +403,6 @@ public: Error load_webp_from_buffer(const Vector &p_array); Error load_tga_from_buffer(const Vector &p_array); Error load_bmp_from_buffer(const Vector &p_array); - Error load_dds_from_buffer(const Vector &p_array); Error load_ktx_from_buffer(const Vector &p_array); Error load_svg_from_buffer(const Vector &p_array, float scale = 1.0); diff --git a/doc/classes/Image.xml b/doc/classes/Image.xml index 6451062fc552..5f1f9e6c183c 100644 --- a/doc/classes/Image.xml +++ b/doc/classes/Image.xml @@ -312,13 +312,6 @@ [b]Note:[/b] Godot's BMP module doesn't support 16-bit per pixel images. Only 1-bit, 4-bit, 8-bit, 24-bit, and 32-bit per pixel images are supported. - - - - - Loads an image from the binary contents of a DDS file. - - diff --git a/modules/dds/image_loader_dds.cpp b/modules/dds/image_loader_dds.cpp deleted file mode 100644 index d661f6664a2e..000000000000 --- a/modules/dds/image_loader_dds.cpp +++ /dev/null @@ -1,421 +0,0 @@ -/**************************************************************************/ -/* image_loader_dds.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include "image_loader_dds.h" - -#include "core/os/os.h" - -#include "core/io/file_access.h" -#include "core/io/file_access_memory.h" - -#include - -#define PF_FOURCC(s) ((uint32_t)(((s)[3] << 24U) | ((s)[2] << 16U) | ((s)[1] << 8U) | ((s)[0]))) - -// Reference: https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dds-header - -enum { - DDS_MAGIC = 0x20534444, - DDSD_PITCH = 0x00000008, - DDSD_LINEARSIZE = 0x00080000, - DDSD_MIPMAPCOUNT = 0x00020000, - DDPF_FOURCC = 0x00000004, - DDPF_ALPHAPIXELS = 0x00000001, - DDPF_INDEXED = 0x00000020, - DDPF_RGB = 0x00000040, -}; - -enum DDSFormat { - DDS_DXT1, - DDS_DXT3, - DDS_DXT5, - DDS_ATI1, - DDS_ATI2, - DDS_A2XY, - DDS_BGRA8, - DDS_BGR8, - DDS_RGBA8, //flipped in dds - DDS_RGB8, //flipped in dds - DDS_BGR5A1, - DDS_BGR565, - DDS_BGR10A2, - DDS_LUMINANCE, - DDS_LUMINANCE_ALPHA, - DDS_MAX -}; - -struct DDSFormatInfo { - const char *name = nullptr; - bool compressed = false; - bool palette = false; - uint32_t divisor = 0; - uint32_t block_size = 0; - Image::Format format = Image::Format::FORMAT_BPTC_RGBA; -}; - -static const DDSFormatInfo dds_format_info[DDS_MAX] = { - { "DXT1/BC1", true, false, 4, 8, Image::FORMAT_DXT1 }, - { "DXT3/BC2", true, false, 4, 16, Image::FORMAT_DXT3 }, - { "DXT5/BC3", true, false, 4, 16, Image::FORMAT_DXT5 }, - { "ATI1/BC4", true, false, 4, 8, Image::FORMAT_RGTC_R }, - { "ATI2/3DC/BC5", true, false, 4, 16, Image::FORMAT_RGTC_RG }, - { "A2XY/DXN/BC5", true, false, 4, 16, Image::FORMAT_RGTC_RG }, - { "BGRA8", false, false, 1, 4, Image::FORMAT_RGBA8 }, - { "BGR8", false, false, 1, 3, Image::FORMAT_RGB8 }, - { "RGBA8", false, false, 1, 4, Image::FORMAT_RGBA8 }, - { "RGB8", false, false, 1, 3, Image::FORMAT_RGB8 }, - { "BGR5A1", false, false, 1, 2, Image::FORMAT_RGBA8 }, - { "BGR565", false, false, 1, 2, Image::FORMAT_RGB8 }, - { "BGR10A2", false, false, 1, 4, Image::FORMAT_RGBA8 }, - { "GRAYSCALE", false, false, 1, 1, Image::FORMAT_L8 }, - { "GRAYSCALE_ALPHA", false, false, 1, 2, Image::FORMAT_LA8 } -}; - -static Ref _dds_mem_loader_func(const uint8_t *p_buffer, int p_buffer_len) { - Ref memfile; - memfile.instantiate(); - Error open_memfile_error = memfile->open_custom(p_buffer, p_buffer_len); - ERR_FAIL_COND_V_MSG(open_memfile_error, Ref(), "Could not create memfile for DDS image buffer."); - - Ref img; - img.instantiate(); - Error load_error = ImageLoaderDDS().load_image(img, memfile, false, 1.0f); - ERR_FAIL_COND_V_MSG(load_error, Ref(), "Failed to load DDS image."); - return img; -} - -Error ImageLoaderDDS::load_image(Ref p_image, Ref f, BitField p_flags, float p_scale) { - uint32_t magic = f->get_32(); - uint32_t hsize = f->get_32(); - uint32_t flags = f->get_32(); - uint32_t height = f->get_32(); - uint32_t width = f->get_32(); - uint32_t pitch = f->get_32(); - /* uint32_t depth = */ f->get_32(); - uint32_t mipmaps = f->get_32(); - - //skip 11 - for (int i = 0; i < 11; i++) { - f->get_32(); - } - - //validate - - // We don't check DDSD_CAPS or DDSD_PIXELFORMAT, as they're mandatory when writing, - // but non-mandatory when reading (as some writers don't set them)... - if (magic != DDS_MAGIC || hsize != 124) { - ERR_FAIL_V_MSG(ERR_FILE_CORRUPT, "Invalid or unsupported DDS texture file '" + f->get_path() + "'."); - } - - /* uint32_t format_size = */ f->get_32(); - uint32_t format_flags = f->get_32(); - uint32_t format_fourcc = f->get_32(); - uint32_t format_rgb_bits = f->get_32(); - uint32_t format_red_mask = f->get_32(); - uint32_t format_green_mask = f->get_32(); - uint32_t format_blue_mask = f->get_32(); - uint32_t format_alpha_mask = f->get_32(); - - /* uint32_t caps_1 = */ f->get_32(); - /* uint32_t caps_2 = */ f->get_32(); - /* uint32_t caps_ddsx = */ f->get_32(); - - //reserved skip - f->get_32(); - f->get_32(); - - /* - print_line("DDS width: "+itos(width)); - print_line("DDS height: "+itos(height)); - print_line("DDS mipmaps: "+itos(mipmaps)); - - printf("fourcc: %x fflags: %x, rgbbits: %x, fsize: %x\n",format_fourcc,format_flags,format_rgb_bits,format_size); - printf("rmask: %x gmask: %x, bmask: %x, amask: %x\n",format_red_mask,format_green_mask,format_blue_mask,format_alpha_mask); - */ - - //must avoid this later - while (f->get_position() < 128) { - f->get_8(); - } - - DDSFormat dds_format; - - if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("DXT1")) { - dds_format = DDS_DXT1; - } else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("DXT3")) { - dds_format = DDS_DXT3; - - } else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("DXT5")) { - dds_format = DDS_DXT5; - } else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("ATI1")) { - dds_format = DDS_ATI1; - } else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("ATI2")) { - dds_format = DDS_ATI2; - } else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("A2XY")) { - dds_format = DDS_A2XY; - - } else if (format_flags & DDPF_RGB && format_flags & DDPF_ALPHAPIXELS && format_rgb_bits == 32 && format_red_mask == 0xff0000 && format_green_mask == 0xff00 && format_blue_mask == 0xff && format_alpha_mask == 0xff000000) { - dds_format = DDS_BGRA8; - } else if (format_flags & DDPF_RGB && !(format_flags & DDPF_ALPHAPIXELS) && format_rgb_bits == 24 && format_red_mask == 0xff0000 && format_green_mask == 0xff00 && format_blue_mask == 0xff) { - dds_format = DDS_BGR8; - } else if (format_flags & DDPF_RGB && format_flags & DDPF_ALPHAPIXELS && format_rgb_bits == 32 && format_red_mask == 0xff && format_green_mask == 0xff00 && format_blue_mask == 0xff0000 && format_alpha_mask == 0xff000000) { - dds_format = DDS_RGBA8; - } else if (format_flags & DDPF_RGB && !(format_flags & DDPF_ALPHAPIXELS) && format_rgb_bits == 24 && format_red_mask == 0xff && format_green_mask == 0xff00 && format_blue_mask == 0xff0000) { - dds_format = DDS_RGB8; - - } else if (format_flags & DDPF_RGB && format_flags & DDPF_ALPHAPIXELS && format_rgb_bits == 16 && format_red_mask == 0x00007c00 && format_green_mask == 0x000003e0 && format_blue_mask == 0x0000001f && format_alpha_mask == 0x00008000) { - dds_format = DDS_BGR5A1; - } else if (format_flags & DDPF_RGB && format_flags & DDPF_ALPHAPIXELS && format_rgb_bits == 32 && format_red_mask == 0x3ff00000 && format_green_mask == 0xffc00 && format_blue_mask == 0x3ff && format_alpha_mask == 0xc0000000) { - dds_format = DDS_BGR10A2; - } else if (format_flags & DDPF_RGB && !(format_flags & DDPF_ALPHAPIXELS) && format_rgb_bits == 16 && format_red_mask == 0x0000f800 && format_green_mask == 0x000007e0 && format_blue_mask == 0x0000001f) { - dds_format = DDS_BGR565; - } else if (!(format_flags & DDPF_ALPHAPIXELS) && format_rgb_bits == 8 && format_red_mask == 0xff) { - dds_format = DDS_LUMINANCE; - } else if ((format_flags & DDPF_ALPHAPIXELS) && format_rgb_bits == 16 && format_red_mask == 0xff && format_alpha_mask == 0xff00) { - dds_format = DDS_LUMINANCE_ALPHA; - } else if (format_flags & DDPF_INDEXED && format_rgb_bits == 8) { - dds_format = DDS_BGR565; - } else { - //printf("unrecognized fourcc %x format_flags: %x - rgbbits %i - red_mask %x green mask %x blue mask %x alpha mask %x\n", format_fourcc, format_flags, format_rgb_bits, format_red_mask, format_green_mask, format_blue_mask, format_alpha_mask); - ERR_FAIL_V_MSG(ERR_FILE_CORRUPT, "Unrecognized or unsupported color layout in DDS '" + f->get_path() + "'."); - } - - if (!(flags & DDSD_MIPMAPCOUNT)) { - mipmaps = 1; - } - - Vector src_data; - - const DDSFormatInfo &info = dds_format_info[dds_format]; - uint32_t w = width; - uint32_t h = height; - - if (info.compressed) { - //compressed bc - - uint32_t size = MAX(info.divisor, w) / info.divisor * MAX(info.divisor, h) / info.divisor * info.block_size; - ERR_FAIL_COND_V(size != pitch, ERR_FILE_CORRUPT); - ERR_FAIL_COND_V(!(flags & DDSD_LINEARSIZE), ERR_FILE_CORRUPT); - - for (uint32_t i = 1; i < mipmaps; i++) { - w = MAX(1u, w >> 1); - h = MAX(1u, h >> 1); - uint32_t bsize = MAX(info.divisor, w) / info.divisor * MAX(info.divisor, h) / info.divisor * info.block_size; - //printf("%i x %i - block: %i\n",w,h,bsize); - size += bsize; - } - - src_data.resize(size); - uint8_t *wb = src_data.ptrw(); - f->get_buffer(wb, size); - - } else if (info.palette) { - //indexed - ERR_FAIL_COND_V(!(flags & DDSD_PITCH), ERR_FILE_CORRUPT); - ERR_FAIL_COND_V(format_rgb_bits != 8, ERR_FILE_CORRUPT); - - uint32_t size = pitch * height; - ERR_FAIL_COND_V(size != width * height * info.block_size, ERR_FILE_CORRUPT); - - uint8_t palette[256 * 4]; - f->get_buffer(palette, 256 * 4); - - int colsize = 3; - for (int i = 0; i < 256; i++) { - if (palette[i * 4 + 3] < 255) { - colsize = 4; - } - } - - int w2 = width; - int h2 = height; - - for (uint32_t i = 1; i < mipmaps; i++) { - w2 = (w2 + 1) >> 1; - h2 = (h2 + 1) >> 1; - size += w2 * h2 * info.block_size; - } - - src_data.resize(size + 256 * colsize); - uint8_t *wb = src_data.ptrw(); - f->get_buffer(wb, size); - - for (int i = 0; i < 256; i++) { - int dst_ofs = size + i * colsize; - int src_ofs = i * 4; - wb[dst_ofs + 0] = palette[src_ofs + 2]; - wb[dst_ofs + 1] = palette[src_ofs + 1]; - wb[dst_ofs + 2] = palette[src_ofs + 0]; - if (colsize == 4) { - wb[dst_ofs + 3] = palette[src_ofs + 3]; - } - } - } else { - //uncompressed generic... - - uint32_t size = width * height * info.block_size; - - for (uint32_t i = 1; i < mipmaps; i++) { - w = (w + 1) >> 1; - h = (h + 1) >> 1; - size += w * h * info.block_size; - } - - if (dds_format == DDS_BGR565) { - size = size * 3 / 2; - } else if (dds_format == DDS_BGR5A1) { - size = size * 2; - } - - src_data.resize(size); - uint8_t *wb = src_data.ptrw(); - f->get_buffer(wb, size); - - switch (dds_format) { - case DDS_BGR5A1: { - // TO RGBA - int colcount = size / 4; - - for (int i = colcount - 1; i >= 0; i--) { - int src_ofs = i * 2; - int dst_ofs = i * 4; - - uint8_t a = wb[src_ofs + 1] & 0x80; - uint8_t b = wb[src_ofs] & 0x1F; - uint8_t g = (wb[src_ofs] >> 5) | ((wb[src_ofs + 1] & 0x3) << 3); - uint8_t r = (wb[src_ofs + 1] >> 2) & 0x1F; - wb[dst_ofs + 0] = r << 3; - wb[dst_ofs + 1] = g << 3; - wb[dst_ofs + 2] = b << 3; - wb[dst_ofs + 3] = a ? 255 : 0; - } - } break; - case DDS_BGR565: { - int colcount = size / 3; - - for (int i = colcount - 1; i >= 0; i--) { - int src_ofs = i * 2; - int dst_ofs = i * 3; - - uint8_t b = wb[src_ofs] & 0x1F; - uint8_t g = (wb[src_ofs] >> 5) | ((wb[src_ofs + 1] & 0x7) << 3); - uint8_t r = wb[src_ofs + 1] >> 3; - wb[dst_ofs + 0] = r << 3; - wb[dst_ofs + 1] = g << 2; - wb[dst_ofs + 2] = b << 3; //b<<3; - } - - } break; - case DDS_BGR10A2: { - // TO RGBA - int colcount = size / 4; - - for (int i = colcount - 1; i >= 0; i--) { - int ofs = i * 4; - - uint32_t w32 = uint32_t(wb[ofs + 0]) | (uint32_t(wb[ofs + 1]) << 8) | (uint32_t(wb[ofs + 2]) << 16) | (uint32_t(wb[ofs + 3]) << 24); - - uint8_t a = (w32 & 0xc0000000) >> 24; - uint8_t r = (w32 & 0x3ff00000) >> 22; - uint8_t g = (w32 & 0xffc00) >> 12; - uint8_t b = (w32 & 0x3ff) >> 2; - - wb[ofs + 0] = r; - wb[ofs + 1] = g; - wb[ofs + 2] = b; - wb[ofs + 3] = a == 0xc0 ? 255 : a; //0xc0 should be opaque - } - } break; - case DDS_BGRA8: { - int colcount = size / 4; - - for (int i = 0; i < colcount; i++) { - SWAP(wb[i * 4 + 0], wb[i * 4 + 2]); - } - - } break; - case DDS_BGR8: { - int colcount = size / 3; - - for (int i = 0; i < colcount; i++) { - SWAP(wb[i * 3 + 0], wb[i * 3 + 2]); - } - } break; - case DDS_RGBA8: { - /* do nothing either - int colcount = size/4; - - for(int i=0;iset_data(width, height, mipmaps - 1, info.format, src_data); - return OK; -} - -ImageLoaderDDS::ImageLoaderDDS() { - Image::_dds_mem_loader_func = _dds_mem_loader_func; -} - -void ImageLoaderDDS::get_recognized_extensions(List *p_extensions) const { - p_extensions->push_back("dds"); -} diff --git a/modules/dds/image_loader_dds.h b/modules/dds/image_loader_dds.h deleted file mode 100644 index 81cfd43551ef..000000000000 --- a/modules/dds/image_loader_dds.h +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************/ -/* image_loader_dds.h */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#ifndef IMAGE_LOADER_DDS_H -#define IMAGE_LOADER_DDS_H - -#include "core/io/image_loader.h" - -class ImageLoaderDDS : public ImageFormatLoader { -public: - virtual Error load_image(Ref p_image, Ref f, BitField p_flags, float p_scale); - virtual void get_recognized_extensions(List *p_extensions) const; - ImageLoaderDDS(); -}; - -#endif // IMAGE_LOADER_DDS_H diff --git a/modules/dds/register_types.cpp b/modules/dds/register_types.cpp index b4d406eda9db..d336269eb379 100644 --- a/modules/dds/register_types.cpp +++ b/modules/dds/register_types.cpp @@ -30,11 +30,9 @@ #include "register_types.h" -#include "image_loader_dds.h" #include "texture_loader_dds.h" static Ref resource_loader_dds; -static Ref image_loader_dds; void initialize_dds_module(ModuleInitializationLevel p_level) { if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) { @@ -43,9 +41,6 @@ void initialize_dds_module(ModuleInitializationLevel p_level) { resource_loader_dds.instantiate(); ResourceLoader::add_resource_format_loader(resource_loader_dds); - - image_loader_dds.instantiate(); - ImageLoader::add_image_format_loader(image_loader_dds); } void uninitialize_dds_module(ModuleInitializationLevel p_level) { @@ -55,7 +50,4 @@ void uninitialize_dds_module(ModuleInitializationLevel p_level) { ResourceLoader::remove_resource_format_loader(resource_loader_dds); resource_loader_dds.unref(); - - ImageLoader::remove_image_format_loader(image_loader_dds); - image_loader_dds.unref(); } diff --git a/modules/dds/texture_loader_dds.cpp b/modules/dds/texture_loader_dds.cpp index 861cf20cc2fa..8a3a36e84bb9 100644 --- a/modules/dds/texture_loader_dds.cpp +++ b/modules/dds/texture_loader_dds.cpp @@ -29,11 +29,72 @@ /**************************************************************************/ #include "texture_loader_dds.h" -#include "image_loader_dds.h" #include "core/io/file_access.h" #include "scene/resources/image_texture.h" +#define PF_FOURCC(s) ((uint32_t)(((s)[3] << 24U) | ((s)[2] << 16U) | ((s)[1] << 8U) | ((s)[0]))) + +// Reference: https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dds-header + +enum { + DDS_MAGIC = 0x20534444, + DDSD_PITCH = 0x00000008, + DDSD_LINEARSIZE = 0x00080000, + DDSD_MIPMAPCOUNT = 0x00020000, + DDPF_FOURCC = 0x00000004, + DDPF_ALPHAPIXELS = 0x00000001, + DDPF_INDEXED = 0x00000020, + DDPF_RGB = 0x00000040, +}; + +enum DDSFormat { + DDS_DXT1, + DDS_DXT3, + DDS_DXT5, + DDS_ATI1, + DDS_ATI2, + DDS_A2XY, + DDS_BGRA8, + DDS_BGR8, + DDS_RGBA8, //flipped in dds + DDS_RGB8, //flipped in dds + DDS_BGR5A1, + DDS_BGR565, + DDS_BGR10A2, + DDS_INDEXED, + DDS_LUMINANCE, + DDS_LUMINANCE_ALPHA, + DDS_MAX +}; + +struct DDSFormatInfo { + const char *name = nullptr; + bool compressed = false; + bool palette = false; + uint32_t divisor = 0; + uint32_t block_size = 0; + Image::Format format = Image::Format::FORMAT_BPTC_RGBA; +}; + +static const DDSFormatInfo dds_format_info[DDS_MAX] = { + { "DXT1/BC1", true, false, 4, 8, Image::FORMAT_DXT1 }, + { "DXT3/BC2", true, false, 4, 16, Image::FORMAT_DXT3 }, + { "DXT5/BC3", true, false, 4, 16, Image::FORMAT_DXT5 }, + { "ATI1/BC4", true, false, 4, 8, Image::FORMAT_RGTC_R }, + { "ATI2/3DC/BC5", true, false, 4, 16, Image::FORMAT_RGTC_RG }, + { "A2XY/DXN/BC5", true, false, 4, 16, Image::FORMAT_RGTC_RG }, + { "BGRA8", false, false, 1, 4, Image::FORMAT_RGBA8 }, + { "BGR8", false, false, 1, 3, Image::FORMAT_RGB8 }, + { "RGBA8", false, false, 1, 4, Image::FORMAT_RGBA8 }, + { "RGB8", false, false, 1, 3, Image::FORMAT_RGB8 }, + { "BGR5A1", false, false, 1, 2, Image::FORMAT_RGBA8 }, + { "BGR565", false, false, 1, 2, Image::FORMAT_RGB8 }, + { "BGR10A2", false, false, 1, 4, Image::FORMAT_RGBA8 }, + { "GRAYSCALE", false, false, 1, 1, Image::FORMAT_L8 }, + { "GRAYSCALE_ALPHA", false, false, 1, 2, Image::FORMAT_LA8 } +}; + Ref ResourceFormatDDS::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) { if (r_error) { *r_error = ERR_CANT_OPEN; @@ -52,12 +113,303 @@ Ref ResourceFormatDDS::load(const String &p_path, const String &p_orig ERR_FAIL_COND_V_MSG(err != OK, Ref(), "Unable to open DDS texture file '" + p_path + "'."); - Ref img = memnew(Image); - Error i_error = ImageLoaderDDS().load_image(img, f, false, 1.0); - if (r_error) { - *r_error = i_error; + uint32_t magic = f->get_32(); + uint32_t hsize = f->get_32(); + uint32_t flags = f->get_32(); + uint32_t height = f->get_32(); + uint32_t width = f->get_32(); + uint32_t pitch = f->get_32(); + /* uint32_t depth = */ f->get_32(); + uint32_t mipmaps = f->get_32(); + + //skip 11 + for (int i = 0; i < 11; i++) { + f->get_32(); } + //validate + + // We don't check DDSD_CAPS or DDSD_PIXELFORMAT, as they're mandatory when writing, + // but non-mandatory when reading (as some writers don't set them)... + if (magic != DDS_MAGIC || hsize != 124) { + ERR_FAIL_V_MSG(Ref(), "Invalid or unsupported DDS texture file '" + p_path + "'."); + } + + /* uint32_t format_size = */ f->get_32(); + uint32_t format_flags = f->get_32(); + uint32_t format_fourcc = f->get_32(); + uint32_t format_rgb_bits = f->get_32(); + uint32_t format_red_mask = f->get_32(); + uint32_t format_green_mask = f->get_32(); + uint32_t format_blue_mask = f->get_32(); + uint32_t format_alpha_mask = f->get_32(); + + /* uint32_t caps_1 = */ f->get_32(); + /* uint32_t caps_2 = */ f->get_32(); + /* uint32_t caps_ddsx = */ f->get_32(); + + //reserved skip + f->get_32(); + f->get_32(); + + /* + print_line("DDS width: "+itos(width)); + print_line("DDS height: "+itos(height)); + print_line("DDS mipmaps: "+itos(mipmaps)); + + printf("fourcc: %x fflags: %x, rgbbits: %x, fsize: %x\n",format_fourcc,format_flags,format_rgb_bits,format_size); + printf("rmask: %x gmask: %x, bmask: %x, amask: %x\n",format_red_mask,format_green_mask,format_blue_mask,format_alpha_mask); + */ + + //must avoid this later + while (f->get_position() < 128) { + f->get_8(); + } + + DDSFormat dds_format; + + if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("DXT1")) { + dds_format = DDS_DXT1; + } else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("DXT3")) { + dds_format = DDS_DXT3; + + } else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("DXT5")) { + dds_format = DDS_DXT5; + } else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("ATI1")) { + dds_format = DDS_ATI1; + } else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("ATI2")) { + dds_format = DDS_ATI2; + } else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("A2XY")) { + dds_format = DDS_A2XY; + + } else if (format_flags & DDPF_RGB && format_flags & DDPF_ALPHAPIXELS && format_rgb_bits == 32 && format_red_mask == 0xff0000 && format_green_mask == 0xff00 && format_blue_mask == 0xff && format_alpha_mask == 0xff000000) { + dds_format = DDS_BGRA8; + } else if (format_flags & DDPF_RGB && !(format_flags & DDPF_ALPHAPIXELS) && format_rgb_bits == 24 && format_red_mask == 0xff0000 && format_green_mask == 0xff00 && format_blue_mask == 0xff) { + dds_format = DDS_BGR8; + } else if (format_flags & DDPF_RGB && format_flags & DDPF_ALPHAPIXELS && format_rgb_bits == 32 && format_red_mask == 0xff && format_green_mask == 0xff00 && format_blue_mask == 0xff0000 && format_alpha_mask == 0xff000000) { + dds_format = DDS_RGBA8; + } else if (format_flags & DDPF_RGB && !(format_flags & DDPF_ALPHAPIXELS) && format_rgb_bits == 24 && format_red_mask == 0xff && format_green_mask == 0xff00 && format_blue_mask == 0xff0000) { + dds_format = DDS_RGB8; + + } else if (format_flags & DDPF_RGB && format_flags & DDPF_ALPHAPIXELS && format_rgb_bits == 16 && format_red_mask == 0x00007c00 && format_green_mask == 0x000003e0 && format_blue_mask == 0x0000001f && format_alpha_mask == 0x00008000) { + dds_format = DDS_BGR5A1; + } else if (format_flags & DDPF_RGB && format_flags & DDPF_ALPHAPIXELS && format_rgb_bits == 32 && format_red_mask == 0x3ff00000 && format_green_mask == 0xffc00 && format_blue_mask == 0x3ff && format_alpha_mask == 0xc0000000) { + dds_format = DDS_BGR10A2; + } else if (format_flags & DDPF_RGB && !(format_flags & DDPF_ALPHAPIXELS) && format_rgb_bits == 16 && format_red_mask == 0x0000f800 && format_green_mask == 0x000007e0 && format_blue_mask == 0x0000001f) { + dds_format = DDS_BGR565; + } else if (!(format_flags & DDPF_ALPHAPIXELS) && format_rgb_bits == 8 && format_red_mask == 0xff && format_green_mask == 0xff && format_blue_mask == 0xff) { + dds_format = DDS_LUMINANCE; + } else if ((format_flags & DDPF_ALPHAPIXELS) && format_rgb_bits == 16 && format_red_mask == 0xff && format_green_mask == 0xff && format_blue_mask == 0xff && format_alpha_mask == 0xff00) { + dds_format = DDS_LUMINANCE_ALPHA; + } else if (format_flags & DDPF_INDEXED && format_rgb_bits == 8) { + dds_format = DDS_BGR565; + } else { + //printf("unrecognized fourcc %x format_flags: %x - rgbbits %i - red_mask %x green mask %x blue mask %x alpha mask %x\n", format_fourcc, format_flags, format_rgb_bits, format_red_mask, format_green_mask, format_blue_mask, format_alpha_mask); + ERR_FAIL_V_MSG(Ref(), "Unrecognized or unsupported color layout in DDS '" + p_path + "'."); + } + + if (!(flags & DDSD_MIPMAPCOUNT)) { + mipmaps = 1; + } + + Vector src_data; + + const DDSFormatInfo &info = dds_format_info[dds_format]; + uint32_t w = width; + uint32_t h = height; + + if (info.compressed) { + //compressed bc + + uint32_t size = MAX(info.divisor, w) / info.divisor * MAX(info.divisor, h) / info.divisor * info.block_size; + ERR_FAIL_COND_V(size != pitch, Ref()); + ERR_FAIL_COND_V(!(flags & DDSD_LINEARSIZE), Ref()); + + for (uint32_t i = 1; i < mipmaps; i++) { + w = MAX(1u, w >> 1); + h = MAX(1u, h >> 1); + uint32_t bsize = MAX(info.divisor, w) / info.divisor * MAX(info.divisor, h) / info.divisor * info.block_size; + //printf("%i x %i - block: %i\n",w,h,bsize); + size += bsize; + } + + src_data.resize(size); + uint8_t *wb = src_data.ptrw(); + f->get_buffer(wb, size); + + } else if (info.palette) { + //indexed + ERR_FAIL_COND_V(!(flags & DDSD_PITCH), Ref()); + ERR_FAIL_COND_V(format_rgb_bits != 8, Ref()); + + uint32_t size = pitch * height; + ERR_FAIL_COND_V(size != width * height * info.block_size, Ref()); + + uint8_t palette[256 * 4]; + f->get_buffer(palette, 256 * 4); + + int colsize = 3; + for (int i = 0; i < 256; i++) { + if (palette[i * 4 + 3] < 255) { + colsize = 4; + } + } + + int w2 = width; + int h2 = height; + + for (uint32_t i = 1; i < mipmaps; i++) { + w2 = (w2 + 1) >> 1; + h2 = (h2 + 1) >> 1; + size += w2 * h2 * info.block_size; + } + + src_data.resize(size + 256 * colsize); + uint8_t *wb = src_data.ptrw(); + f->get_buffer(wb, size); + + for (int i = 0; i < 256; i++) { + int dst_ofs = size + i * colsize; + int src_ofs = i * 4; + wb[dst_ofs + 0] = palette[src_ofs + 2]; + wb[dst_ofs + 1] = palette[src_ofs + 1]; + wb[dst_ofs + 2] = palette[src_ofs + 0]; + if (colsize == 4) { + wb[dst_ofs + 3] = palette[src_ofs + 3]; + } + } + } else { + //uncompressed generic... + + uint32_t size = width * height * info.block_size; + + for (uint32_t i = 1; i < mipmaps; i++) { + w = (w + 1) >> 1; + h = (h + 1) >> 1; + size += w * h * info.block_size; + } + + if (dds_format == DDS_BGR565) { + size = size * 3 / 2; + } else if (dds_format == DDS_BGR5A1) { + size = size * 2; + } + + src_data.resize(size); + uint8_t *wb = src_data.ptrw(); + f->get_buffer(wb, size); + + switch (dds_format) { + case DDS_BGR5A1: { + // TO RGBA + int colcount = size / 4; + + for (int i = colcount - 1; i >= 0; i--) { + int src_ofs = i * 2; + int dst_ofs = i * 4; + + uint8_t a = wb[src_ofs + 1] & 0x80; + uint8_t b = wb[src_ofs] & 0x1F; + uint8_t g = (wb[src_ofs] >> 5) | ((wb[src_ofs + 1] & 0x3) << 3); + uint8_t r = (wb[src_ofs + 1] >> 2) & 0x1F; + wb[dst_ofs + 0] = r << 3; + wb[dst_ofs + 1] = g << 3; + wb[dst_ofs + 2] = b << 3; + wb[dst_ofs + 3] = a ? 255 : 0; + } + } break; + case DDS_BGR565: { + int colcount = size / 3; + + for (int i = colcount - 1; i >= 0; i--) { + int src_ofs = i * 2; + int dst_ofs = i * 3; + + uint8_t b = wb[src_ofs] & 0x1F; + uint8_t g = (wb[src_ofs] >> 5) | ((wb[src_ofs + 1] & 0x7) << 3); + uint8_t r = wb[src_ofs + 1] >> 3; + wb[dst_ofs + 0] = r << 3; + wb[dst_ofs + 1] = g << 2; + wb[dst_ofs + 2] = b << 3; //b<<3; + } + + } break; + case DDS_BGR10A2: { + // TO RGBA + int colcount = size / 4; + + for (int i = colcount - 1; i >= 0; i--) { + int ofs = i * 4; + + uint32_t w32 = uint32_t(wb[ofs + 0]) | (uint32_t(wb[ofs + 1]) << 8) | (uint32_t(wb[ofs + 2]) << 16) | (uint32_t(wb[ofs + 3]) << 24); + + uint8_t a = (w32 & 0xc0000000) >> 24; + uint8_t r = (w32 & 0x3ff00000) >> 22; + uint8_t g = (w32 & 0xffc00) >> 12; + uint8_t b = (w32 & 0x3ff) >> 2; + + wb[ofs + 0] = r; + wb[ofs + 1] = g; + wb[ofs + 2] = b; + wb[ofs + 3] = a == 0xc0 ? 255 : a; //0xc0 should be opaque + } + } break; + case DDS_BGRA8: { + int colcount = size / 4; + + for (int i = 0; i < colcount; i++) { + SWAP(wb[i * 4 + 0], wb[i * 4 + 2]); + } + + } break; + case DDS_BGR8: { + int colcount = size / 3; + + for (int i = 0; i < colcount; i++) { + SWAP(wb[i * 3 + 0], wb[i * 3 + 2]); + } + } break; + case DDS_RGBA8: { + /* do nothing either + int colcount = size/4; + + for(int i=0;i img = memnew(Image(width, height, mipmaps - 1, info.format, src_data)); Ref texture = ImageTexture::create_from_image(img); if (r_error) { diff --git a/tests/core/io/test_image.h b/tests/core/io/test_image.h index 189797111321..07c7c04e3641 100644 --- a/tests/core/io/test_image.h +++ b/tests/core/io/test_image.h @@ -115,16 +115,6 @@ TEST_CASE("[Image] Saving and loading") { image_bmp->load_bmp_from_buffer(data_bmp) == OK, "The BMP image should load successfully."); - // Load DDS - Ref image_dds = memnew(Image()); - Ref f_dds = FileAccess::open(TestUtils::get_data_path("images/icon.dds"), FileAccess::READ, &err); - PackedByteArray data_dds; - data_dds.resize(f_dds->get_length() + 1); - f_dds->get_buffer(data_dds.ptrw(), f_dds->get_length()); - CHECK_MESSAGE( - image_dds->load_dds_from_buffer(data_dds) == OK, - "The DDS image should load successfully."); - // Load JPG Ref image_jpg = memnew(Image()); Ref f_jpg = FileAccess::open(TestUtils::get_data_path("images/icon.jpg"), FileAccess::READ, &err); diff --git a/tests/data/images/icon.dds b/tests/data/images/icon.dds deleted file mode 100644 index 8a9de402cbf13d8d031586d450e0e0cb48df294d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 87536 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 u#gU`Le}64l%nvZO^E2B(`|