godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34772 from clayjohn/ETC-support-alpha 

Fallback to RGBA4444 for textures with alpha set to ETC compression
This commit is contained in:
Rémi Verschelde 2020-01-03 14:29:19 +01:00 committed by GitHub
parent fa82664419 7a9fc69a16
commit 136846a6ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/image.cpp
View File

@ -2432,19 +2432,19 @@ Color Image::get_pixel(int p_x, int p_y) const {
} }
case FORMAT_RGBA4444: { case FORMAT_RGBA4444: {
uint16_t u = ((uint16_t *)ptr)[ofs]; uint16_t u = ((uint16_t *)ptr)[ofs];
float r = (u & 0xF) / 15.0; float r = ((u >> 12) & 0xF) / 15.0;
float g = ((u >> 4) & 0xF) / 15.0; float g = ((u >> 8) & 0xF) / 15.0;
float b = ((u >> 8) & 0xF) / 15.0; float b = ((u >> 4) & 0xF) / 15.0;
float a = ((u >> 12) & 0xF) / 15.0; float a = (u & 0xF) / 15.0;
return Color(r, g, b, a); return Color(r, g, b, a);
} }
case FORMAT_RGBA5551: { case FORMAT_RGBA5551: {
uint16_t u = ((uint16_t *)ptr)[ofs]; uint16_t u = ((uint16_t *)ptr)[ofs];
float r = (u & 0x1F) / 15.0; float r = ((u >> 11) & 0x1F) / 15.0;
float g = ((u >> 5) & 0x1F) / 15.0; float g = ((u >> 6) & 0x1F) / 15.0;
float b = ((u >> 10) & 0x1F) / 15.0; float b = ((u >> 1) & 0x1F) / 15.0;
float a = ((u >> 15) & 0x1) / 1.0; float a = (u & 0x1) / 1.0;
return Color(r, g, b, a); return Color(r, g, b, a);
} }
case FORMAT_RF: { case FORMAT_RF: {
@ -2558,10 +2558,10 @@ void Image::set_pixel(int p_x, int p_y, const Color &p_color) {
uint16_t rgba = 0; uint16_t rgba = 0;
rgba = uint16_t(CLAMP(p_color.r * 15.0, 0, 15)); rgba = uint16_t(CLAMP(p_color.r * 15.0, 0, 15)) << 12;
rgba |= uint16_t(CLAMP(p_color.g * 15.0, 0, 15)) << 4; rgba |= uint16_t(CLAMP(p_color.g * 15.0, 0, 15)) << 8;
rgba |= uint16_t(CLAMP(p_color.b * 15.0, 0, 15)) << 8; rgba |= uint16_t(CLAMP(p_color.b * 15.0, 0, 15)) << 4;
rgba |= uint16_t(CLAMP(p_color.a * 15.0, 0, 15)) << 12; rgba |= uint16_t(CLAMP(p_color.a * 15.0, 0, 15));
((uint16_t *)ptr)[ofs] = rgba; ((uint16_t *)ptr)[ofs] = rgba;
@ -2570,10 +2570,10 @@ void Image::set_pixel(int p_x, int p_y, const Color &p_color) {
uint16_t rgba = 0; uint16_t rgba = 0;
rgba = uint16_t(CLAMP(p_color.r * 31.0, 0, 31)); rgba = uint16_t(CLAMP(p_color.r * 31.0, 0, 31)) << 11;
rgba |= uint16_t(CLAMP(p_color.g * 31.0, 0, 31)) << 5; rgba |= uint16_t(CLAMP(p_color.g * 31.0, 0, 31)) << 6;
rgba |= uint16_t(CLAMP(p_color.b * 31.0, 0, 31)) << 10; rgba |= uint16_t(CLAMP(p_color.b * 31.0, 0, 31)) << 1;
rgba |= uint16_t(p_color.a > 0.5 ? 1 : 0) << 15; rgba |= uint16_t(p_color.a > 0.5 ? 1 : 0);
((uint16_t *)ptr)[ofs] = rgba; ((uint16_t *)ptr)[ofs] = rgba;

7
modules/etc/image_etc.cpp
View File

@ -139,6 +139,13 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f
return; return;
} }
if (img_format >= Image::FORMAT_RGBA8 && force_etc1_format) {
// If VRAM compression is using ETC, but image has alpha, convert to RGBA4444
// This saves space while maintaining the alpha channel
p_img->convert(Image::FORMAT_RGBA4444);
return;
}
uint32_t imgw = p_img->get_width(), imgh = p_img->get_height(); uint32_t imgw = p_img->get_width(), imgh = p_img->get_height();
Image::Format etc_format = force_etc1_format ? Image::FORMAT_ETC : _get_etc2_mode(detected_channels); Image::Format etc_format = force_etc1_format ? Image::FORMAT_ETC : _get_etc2_mode(detected_channels);