diff options
| author | Ninni Pipping <over999ships@gmail.com> | 2023-04-13 09:39:03 +0200 |
|---|---|---|
| committer | Yuri Sizov <yuris@humnom.net> | 2023-04-24 16:28:30 +0200 |
| commit | 3445fa7dbcddff1aabb73e0ee156d97227dbe41b (patch) | |
| tree | b651c0856ed2ee59877d9c52c0e19c4ceff380f2 | |
| parent | ccc761dd93566cec98ee3f1608d4c4da709f308f (diff) | |
Expose more compression formats in Image and fix compress check
Check for compressing ASTC checked if the function for BPTC was present
(cherry picked from commit cf64e2fa479ce548713c589d9c3252e5ac36a6d3)
| -rw-r--r-- | core/io/image.cpp | 4 | ||||
| -rw-r--r-- | doc/classes/Image.xml | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/io/image.cpp b/core/io/image.cpp index 736a3ec82e..8111ca447c 100644 --- a/core/io/image.cpp +++ b/core/io/image.cpp @@ -2649,7 +2649,7 @@ Error Image::compress_from_channels(CompressMode p_mode, UsedChannels p_channels _image_compress_bptc_func(this, p_channels); } break; case COMPRESS_ASTC: { - ERR_FAIL_COND_V(!_image_compress_bptc_func, ERR_UNAVAILABLE); + ERR_FAIL_COND_V(!_image_compress_astc_func, ERR_UNAVAILABLE); _image_compress_astc_func(this, p_astc_format); } break; case COMPRESS_MAX: { @@ -3535,6 +3535,8 @@ void Image::_bind_methods() { BIND_ENUM_CONSTANT(COMPRESS_ETC); BIND_ENUM_CONSTANT(COMPRESS_ETC2); BIND_ENUM_CONSTANT(COMPRESS_BPTC); + BIND_ENUM_CONSTANT(COMPRESS_ASTC); + BIND_ENUM_CONSTANT(COMPRESS_MAX); BIND_ENUM_CONSTANT(USED_CHANNELS_L); BIND_ENUM_CONSTANT(USED_CHANNELS_LA); diff --git a/doc/classes/Image.xml b/doc/classes/Image.xml index 166ef7a108..09911d58a8 100644 --- a/doc/classes/Image.xml +++ b/doc/classes/Image.xml @@ -714,6 +714,12 @@ <constant name="COMPRESS_BPTC" value="3" enum="CompressMode"> Use BPTC compression. </constant> + <constant name="COMPRESS_ASTC" value="4" enum="CompressMode"> + Use ASTC compression. + </constant> + <constant name="COMPRESS_MAX" value="5" enum="CompressMode"> + Represents the size of the [enum CompressMode] enum. + </constant> <constant name="USED_CHANNELS_L" value="0" enum="UsedChannels"> </constant> <constant name="USED_CHANNELS_LA" value="1" enum="UsedChannels"> |