Skip to content

Commit f64ccad

Browse files
BlueCube3310BlueCube3310
committed
Image: Support generating mipmaps for all formats
1 parent 1ce3101 commit f64ccad

File tree

2 files changed

+59
-34
lines changed

2 files changed

+59
-34
lines changed

‎core/io/image.cpp‎

Lines changed: 56 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1969,7 +1969,7 @@ static void _generate_po2_mipmap(const Component *p_src, Component *p_dst, uint3
19691969
average_func(dst_ptr[j], rup_ptr[j], rup_ptr[j + right_step], rdown_ptr[j], rdown_ptr[j + right_step]);
19701970
}
19711971

1972-
if (renormalize) {
1972+
if constexpr (renormalize) {
19731973
renormalize_func(dst_ptr);
19741974
}
19751975

@@ -2015,6 +2015,12 @@ void Image::_generate_mipmap_from_format(Image::Format p_format, const uint8_t *
20152015
_generate_po2_mipmap<uint8_t, 4, false, Image::average_4_uint8, Image::renormalize_uint8>(p_src, p_dst, p_width, p_height);
20162016
}
20172017
} break;
2018+
case Image::FORMAT_RGBA4444: {
2019+
_generate_po2_mipmap<uint16_t, 1, false, Image::average_4_rgba4444, nullptr>(src_u16, dst_u16, p_width, p_height);
2020+
} break;
2021+
case Image::FORMAT_RGB565: {
2022+
_generate_po2_mipmap<uint16_t, 1, false, Image::average_4_rgb565, nullptr>(src_u16, dst_u16, p_width, p_height);
2023+
} break;
20182024
case Image::FORMAT_RF:
20192025
_generate_po2_mipmap<float, 1, false, Image::average_4_float, Image::renormalize_float>(src_float, dst_float, p_width, p_height);
20202026
break;
@@ -2056,7 +2062,7 @@ void Image::_generate_mipmap_from_format(Image::Format p_format, const uint8_t *
20562062
}
20572063
} break;
20582064
case Image::FORMAT_RGBE9995:
2059-
_generate_po2_mipmap<uint32_t, 1, false, Image::average_4_rgbe9995, Image::renormalize_rgbe9995>(src_u32, dst_u32, p_width, p_height);
2065+
_generate_po2_mipmap<uint32_t, 1, false, Image::average_4_rgbe9995, nullptr>(src_u32, dst_u32, p_width, p_height);
20602066
break;
20612067
case Image::FORMAT_R16:
20622068
case Image::FORMAT_R16I:
@@ -2141,7 +2147,6 @@ void Image::normalize() {
21412147

21422148
Error Image::generate_mipmaps(bool p_renormalize) {
21432149
ERR_FAIL_COND_V_MSG(is_compressed(), ERR_UNAVAILABLE, "Cannot generate mipmaps from compressed image formats.");
2144-
ERR_FAIL_COND_V_MSG(format == FORMAT_RGBA4444, ERR_UNAVAILABLE, "Cannot generate mipmaps from RGBA4444 format.");
21452150
ERR_FAIL_COND_V_MSG(width == 0 || height == 0, ERR_UNCONFIGURED, "Cannot generate mipmaps with width or height equal to 0.");
21462151

21472152
int gen_mipmap_count;
@@ -3379,6 +3384,42 @@ void Image::_copy_internals_from(const Image &p_image) {
33793384
data = p_image.data;
33803385
}
33813386

3387+
_FORCE_INLINE_ Color color_from_rgba4444(uint16_t p_col) {
3388+
float r = ((p_col >> 12) & 0xF) / 15.0;
3389+
float g = ((p_col >> 8) & 0xF) / 15.0;
3390+
float b = ((p_col >> 4) & 0xF) / 15.0;
3391+
float a = (p_col & 0xF) / 15.0;
3392+
return Color(r, g, b, a);
3393+
}
3394+
3395+
_FORCE_INLINE_ uint16_t color_to_rgba4444(Color p_col) {
3396+
uint16_t rgba = 0;
3397+
3398+
rgba = uint16_t(CLAMP(p_col.r * 15.0, 0, 15)) << 12;
3399+
rgba |= uint16_t(CLAMP(p_col.g * 15.0, 0, 15)) << 8;
3400+
rgba |= uint16_t(CLAMP(p_col.b * 15.0, 0, 15)) << 4;
3401+
rgba |= uint16_t(CLAMP(p_col.a * 15.0, 0, 15));
3402+
3403+
return rgba;
3404+
}
3405+
3406+
_FORCE_INLINE_ Color color_from_rgb565(uint16_t p_col) {
3407+
float r = ((p_col >> 11) & 0x1F) / 31.0;
3408+
float g = ((p_col >> 5) & 0x3F) / 63.0;
3409+
float b = (p_col & 0x1F) / 31.0;
3410+
return Color(r, g, b, 1.0);
3411+
}
3412+
3413+
_FORCE_INLINE_ uint16_t color_to_rgb565(Color p_col) {
3414+
uint16_t rgba = 0;
3415+
3416+
rgba = uint16_t(CLAMP(p_col.r * 31.0, 0, 31)) << 11;
3417+
rgba |= uint16_t(CLAMP(p_col.g * 63.0, 0, 63)) << 5;
3418+
rgba |= uint16_t(CLAMP(p_col.b * 31.0, 0, 31));
3419+
3420+
return rgba;
3421+
}
3422+
33823423
Color Image::_get_color_at_ofs(const uint8_t *ptr, uint32_t ofs) const {
33833424
switch (format) {
33843425
case FORMAT_L8: {
@@ -3413,19 +3454,10 @@ Color Image::_get_color_at_ofs(const uint8_t *ptr, uint32_t ofs) const {
34133454
return Color(r, g, b, a);
34143455
}
34153456
case FORMAT_RGBA4444: {
3416-
uint16_t u = ((uint16_t *)ptr)[ofs];
3417-
float r = ((u >> 12) & 0xF) / 15.0;
3418-
float g = ((u >> 8) & 0xF) / 15.0;
3419-
float b = ((u >> 4) & 0xF) / 15.0;
3420-
float a = (u & 0xF) / 15.0;
3421-
return Color(r, g, b, a);
3457+
return color_from_rgba4444(((uint16_t *)ptr)[ofs]);
34223458
}
34233459
case FORMAT_RGB565: {
3424-
uint16_t u = ((uint16_t *)ptr)[ofs];
3425-
float r = ((u >> 11) & 0x1F) / 31.0;
3426-
float g = ((u >> 5) & 0x3F) / 63.0;
3427-
float b = (u & 0x1F) / 31.0;
3428-
return Color(r, g, b, 1.0);
3460+
return color_from_rgb565(((uint16_t *)ptr)[ofs]);
34293461
}
34303462
case FORMAT_RF: {
34313463
float r = ((float *)ptr)[ofs];
@@ -3553,23 +3585,10 @@ void Image::_set_color_at_ofs(uint8_t *ptr, uint32_t ofs, const Color &p_color)
35533585
ptr[ofs * 4 + 3] = uint8_t(CLAMP(p_color.a * 255.0, 0, 255));
35543586
} break;
35553587
case FORMAT_RGBA4444: {
3556-
uint16_t rgba = 0;
3557-
3558-
rgba = uint16_t(CLAMP(p_color.r * 15.0, 0, 15)) << 12;
3559-
rgba |= uint16_t(CLAMP(p_color.g * 15.0, 0, 15)) << 8;
3560-
rgba |= uint16_t(CLAMP(p_color.b * 15.0, 0, 15)) << 4;
3561-
rgba |= uint16_t(CLAMP(p_color.a * 15.0, 0, 15));
3562-
3563-
((uint16_t *)ptr)[ofs] = rgba;
3588+
((uint16_t *)ptr)[ofs] = color_to_rgba4444(p_color);
35643589
} break;
35653590
case FORMAT_RGB565: {
3566-
uint16_t rgba = 0;
3567-
3568-
rgba = uint16_t(CLAMP(p_color.r * 31.0, 0, 31)) << 11;
3569-
rgba |= uint16_t(CLAMP(p_color.g * 63.0, 0, 63)) << 5;
3570-
rgba |= uint16_t(CLAMP(p_color.b * 31.0, 0, 31));
3571-
3572-
((uint16_t *)ptr)[ofs] = rgba;
3591+
((uint16_t *)ptr)[ofs] = color_to_rgb565(p_color);
35733592
} break;
35743593
case FORMAT_RF: {
35753594
((float *)ptr)[ofs] = p_color.r;
@@ -4543,6 +4562,14 @@ void Image::average_4_uint16(uint16_t &p_out, const uint16_t &p_a, const uint16_
45434562
p_out = static_cast<uint16_t>((p_a + p_b + p_c + p_d + 2) >> 2);
45444563
}
45454564

4565+
void Image::average_4_rgba4444(uint16_t &p_out, const uint16_t &p_a, const uint16_t &p_b, const uint16_t &p_c, const uint16_t &p_d) {
4566+
p_out = color_to_rgba4444((color_from_rgba4444(p_a) + color_from_rgba4444(p_b) + color_from_rgba4444(p_c) + color_from_rgba4444(p_d)) * 0.25f);
4567+
}
4568+
4569+
void Image::average_4_rgb565(uint16_t &p_out, const uint16_t &p_a, const uint16_t &p_b, const uint16_t &p_c, const uint16_t &p_d) {
4570+
p_out = color_to_rgb565((color_from_rgb565(p_a) + color_from_rgb565(p_b) + color_from_rgb565(p_c) + color_from_rgb565(p_d)) * 0.25f);
4571+
}
4572+
45464573
void Image::renormalize_uint8(uint8_t *p_rgb) {
45474574
Vector3 n(p_rgb[0] / 255.0, p_rgb[1] / 255.0, p_rgb[2] / 255.0);
45484575
n *= 2.0;
@@ -4572,10 +4599,6 @@ void Image::renormalize_half(uint16_t *p_rgb) {
45724599
p_rgb[2] = Math::make_half_float(n.z);
45734600
}
45744601

4575-
void Image::renormalize_rgbe9995(uint32_t *p_rgb) {
4576-
// Never used.
4577-
}
4578-
45794602
void Image::renormalize_uint16(uint16_t *p_rgb) {
45804603
Vector3 n(p_rgb[0] / 65535.0, p_rgb[1] / 65535.0, p_rgb[2] / 65535.0);
45814604
n *= 2.0;

‎core/io/image.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,12 @@ class Image : public Resource {
291291
static void average_4_half(uint16_t &p_out, const uint16_t &p_a, const uint16_t &p_b, const uint16_t &p_c, const uint16_t &p_d);
292292
static void average_4_rgbe9995(uint32_t &p_out, const uint32_t &p_a, const uint32_t &p_b, const uint32_t &p_c, const uint32_t &p_d);
293293
static void average_4_uint16(uint16_t &p_out, const uint16_t &p_a, const uint16_t &p_b, const uint16_t &p_c, const uint16_t &p_d);
294+
static void average_4_rgba4444(uint16_t &p_out, const uint16_t &p_a, const uint16_t &p_b, const uint16_t &p_c, const uint16_t &p_d);
295+
static void average_4_rgb565(uint16_t &p_out, const uint16_t &p_a, const uint16_t &p_b, const uint16_t &p_c, const uint16_t &p_d);
296+
294297
static void renormalize_uint8(uint8_t *p_rgb);
295298
static void renormalize_float(float *p_rgb);
296299
static void renormalize_half(uint16_t *p_rgb);
297-
static void renormalize_rgbe9995(uint32_t *p_rgb);
298300
static void renormalize_uint16(uint16_t *p_rgb);
299301

300302
public:

0 commit comments

Comments
 (0)