diff options
| author | clayjohn <claynjohn@gmail.com> | 2020-01-03 11:10:44 -0800 |
|---|---|---|
| committer | clayjohn <claynjohn@gmail.com> | 2020-01-03 11:10:44 -0800 |
| commit | cd212009446ac7f538b7402071940394d2685901 (patch) | |
| tree | 9e337a899395d45986901edba517f203f0ce4c6c /modules/etc | |
| parent | 7a9fc69a16d2cf29e0f5b4388869c29c4c5e8dd3 (diff) | |
Add support for Lum-alpha textures to ETC fallback
Diffstat (limited to 'modules/etc')
| -rw-r--r-- | modules/etc/image_etc.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/modules/etc/image_etc.cpp b/modules/etc/image_etc.cpp index f0b95c893d..b80138c99d 100644 --- a/modules/etc/image_etc.cpp +++ b/modules/etc/image_etc.cpp @@ -139,11 +139,16 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f return; } - if (img_format >= Image::FORMAT_RGBA8 && force_etc1_format) { - // If VRAM compression is using ETC, but image has alpha, convert to RGBA4444 + if (force_etc1_format) { + // If VRAM compression is using ETC, but image has alpha, convert to RGBA4444 or LA8 // This saves space while maintaining the alpha channel - p_img->convert(Image::FORMAT_RGBA4444); - return; + if (detected_channels == Image::DETECTED_RGBA) { + p_img->convert(Image::FORMAT_RGBA4444); + return; + } else if (detected_channels == Image::DETECTED_LA) { + p_img->convert(Image::FORMAT_LA8); + return; + } } uint32_t imgw = p_img->get_width(), imgh = p_img->get_height(); |