summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBlueCube3310 <53150244+BlueCube3310@users.noreply.github.com>2023-08-29 19:24:22 +0200
committerGitHub <noreply@github.com>2023-08-29 19:24:22 +0200
commitcbbcaa31d578085eba5c5f44eda6f35d8f1f54a6 (patch)
treec64b1dff4a272db0e645b911b06b79ec2c469660
parentcfe9cd5cae57a1b8c2a98a7ef68d78d7e54263b4 (diff)
downloadredot-engine-cbbcaa31d578085eba5c5f44eda6f35d8f1f54a6.tar.gz
Fix grayscale dds loading
-rw-r--r--modules/dds/texture_loader_dds.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/dds/texture_loader_dds.cpp b/modules/dds/texture_loader_dds.cpp
index 8a3a36e84b..481bb46c24 100644
--- a/modules/dds/texture_loader_dds.cpp
+++ b/modules/dds/texture_loader_dds.cpp
@@ -62,7 +62,6 @@ enum DDSFormat {
DDS_BGR5A1,
DDS_BGR565,
DDS_BGR10A2,
- DDS_INDEXED,
DDS_LUMINANCE,
DDS_LUMINANCE_ALPHA,
DDS_MAX
@@ -197,9 +196,9 @@ Ref<Resource> ResourceFormatDDS::load(const String &p_path, const String &p_orig
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) {
+ } 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_green_mask == 0xff && format_blue_mask == 0xff && format_alpha_mask == 0xff00) {
+ } 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;