godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #106572 from k1r4n8/dds-32bit-no-alpha

Browse Source 
Add DDS loading of 32bit aligned data without alpha
This commit is contained in:
Thaddeus Crews
2025-05-19 16:22:29 -05:00
parent b29a5b4c63 3508257bc5
commit 80d77d772a
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/dds/dds_enums.h
View File

@@ -137,8 +137,10 @@ enum DDSFormat {
DDS_RGB9E5, DDS_RGB9E5,
DDS_RGB8, DDS_RGB8,
DDS_RGBA8, DDS_RGBA8,
DDS_RGBX8,
DDS_BGR8, DDS_BGR8,
DDS_BGRA8, DDS_BGRA8,
DDS_BGRX8,
DDS_BGR5A1, DDS_BGR5A1,
DDS_BGR565, DDS_BGR565,
DDS_B2GR3, DDS_B2GR3,
@@ -188,8 +190,10 @@ static const DDSFormatInfo dds_format_info[DDS_MAX] = {
{ "RGB9E5", false, 1, 4, Image::FORMAT_RGBE9995 }, { "RGB9E5", false, 1, 4, Image::FORMAT_RGBE9995 },
{ "RGB8", false, 1, 3, Image::FORMAT_RGB8 }, { "RGB8", false, 1, 3, Image::FORMAT_RGB8 },
{ "RGBA8", false, 1, 4, Image::FORMAT_RGBA8 }, { "RGBA8", false, 1, 4, Image::FORMAT_RGBA8 },
{ "RGBX8", false, 1, 4, Image::FORMAT_RGB8 },
{ "BGR8", false, 1, 3, Image::FORMAT_RGB8 }, { "BGR8", false, 1, 3, Image::FORMAT_RGB8 },
{ "BGRA8", false, 1, 4, Image::FORMAT_RGBA8 }, { "BGRA8", false, 1, 4, Image::FORMAT_RGBA8 },
{ "BGRX8", false, 1, 4, Image::FORMAT_RGB8 },
{ "BGR5A1", false, 1, 2, Image::FORMAT_RGBA8 }, { "BGR5A1", false, 1, 2, Image::FORMAT_RGBA8 },
{ "BGR565", false, 1, 2, Image::FORMAT_RGB8 }, { "BGR565", false, 1, 2, Image::FORMAT_RGB8 },
{ "B2GR3", false, 1, 1, Image::FORMAT_RGB8 }, { "B2GR3", false, 1, 1, Image::FORMAT_RGB8 },

37
modules/dds/texture_loader_dds.cpp
View File

@@ -359,6 +359,39 @@ static Ref<Image> _dds_load_layer(Ref<FileAccess> p_file, DDSFormat p_dds_format
} break; } break;
case DDS_RGBX8: {
// To RGB8.
int colcount = size / 4;
for (int i = 0; i < colcount; i++) {
int src_ofs = i * 4;
int dst_ofs = i * 3;
wb[dst_ofs + 0] = wb[src_ofs + 0];
wb[dst_ofs + 1] = wb[src_ofs + 1];
wb[dst_ofs + 2] = wb[src_ofs + 2];
}
r_src_data.resize(size * 3 / 4);
} break;
case DDS_BGRX8: {
// To RGB8.
int colcount = size / 4;
for (int i = 0; i < colcount; i++) {
int src_ofs = i * 4;
int dst_ofs = i * 3;
wb[dst_ofs + 0] = wb[src_ofs + 2];
wb[dst_ofs + 1] = wb[src_ofs + 1];
wb[dst_ofs + 2] = wb[src_ofs + 0];
}
r_src_data.resize(size * 3 / 4);
} break;
// Grayscale. // Grayscale.
case DDS_LUMINANCE_ALPHA_4: { case DDS_LUMINANCE_ALPHA_4: {
// To LA8. // To LA8.
@@ -622,6 +655,10 @@ static Vector<Ref<Image>> _dds_load_images_from_buffer(Ref<FileAccess> p_f, DDSF
r_dds_format = DDS_BGR565; r_dds_format = DDS_BGR565;
} else if (format_rgb_bits == 8 && format_red_mask == 0xe0 && format_green_mask == 0x1c && format_blue_mask == 0x3) { } else if (format_rgb_bits == 8 && format_red_mask == 0xe0 && format_green_mask == 0x1c && format_blue_mask == 0x3) {
r_dds_format = DDS_B2GR3; r_dds_format = DDS_B2GR3;
} else if (format_rgb_bits == 32 && format_red_mask == 0xff0000 && format_green_mask == 0xff00 && format_blue_mask == 0xff) {
r_dds_format = DDS_BGRX8;
} else if (format_rgb_bits == 32 && format_red_mask == 0xff && format_green_mask == 0xff00 && format_blue_mask == 0xff0000) {
r_dds_format = DDS_RGBX8;
} }
} }