summaryrefslogtreecommitdiffstats
path: root/modules/dds/image_loader_dds.cpp
diff options
context:
space:
mode:
authorBlueCube3310 <53150244+BlueCube3310@users.noreply.github.com>2023-08-21 22:21:17 +0200
committerGitHub <noreply@github.com>2023-08-21 22:21:17 +0200
commit1d51c559e7191f2ca2e580db90c70b1f1b7ee989 (patch)
tree09e8e4d9d89830cc12033bec063952c9a48c64e5 /modules/dds/image_loader_dds.cpp
parent8e0346badefcd69656e1ae3ba12d6eaafd7a4fae (diff)
downloadredot-engine-1d51c559e7191f2ca2e580db90c70b1f1b7ee989.tar.gz
Make DDS loading code only check for R channel mask when loading grayscale images.
Diffstat (limited to 'modules/dds/image_loader_dds.cpp')
-rw-r--r--modules/dds/image_loader_dds.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/dds/image_loader_dds.cpp b/modules/dds/image_loader_dds.cpp
index 13ca1e6bff..d661f6664a 100644
--- a/modules/dds/image_loader_dds.cpp
+++ b/modules/dds/image_loader_dds.cpp
@@ -196,9 +196,9 @@ Error ImageLoaderDDS::load_image(Ref<Image> p_image, Ref<FileAccess> f, BitField
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;