diff options
| author | clayjohn <claynjohn@gmail.com> | 2023-08-29 14:25:16 +0200 |
|---|---|---|
| committer | clayjohn <claynjohn@gmail.com> | 2023-08-29 14:25:16 +0200 |
| commit | 0045dc204c954edfcc8f15751d4ea54174da7818 (patch) | |
| tree | 4901e8c0d5c9f05dc902b109dd3861f30a3f2945 /core | |
| parent | 247c3548d810136ffe9c1694cd76db3236efaa90 (diff) | |
| download | redot-engine-0045dc204c954edfcc8f15751d4ea54174da7818.tar.gz | |
Revert "Implement loading DDS textures at run-time"
This reverts commit 34ab1c8a36e61b386c210fb908b9ebfa86513149.
Diffstat (limited to 'core')
| -rw-r--r-- | core/io/image.cpp | 10 | ||||
| -rw-r--r-- | core/io/image.h | 2 |
2 files changed, 0 insertions, 12 deletions
diff --git a/core/io/image.cpp b/core/io/image.cpp index 3ca39f98c0..ce2f47371a 100644 --- a/core/io/image.cpp +++ b/core/io/image.cpp @@ -3017,7 +3017,6 @@ ImageMemLoadFunc Image::_webp_mem_loader_func = nullptr; ImageMemLoadFunc Image::_tga_mem_loader_func = nullptr; ImageMemLoadFunc Image::_bmp_mem_loader_func = nullptr; ScalableImageMemLoadFunc Image::_svg_scalable_mem_loader_func = nullptr; -ImageMemLoadFunc Image::_dds_mem_loader_func = nullptr; ImageMemLoadFunc Image::_ktx_mem_loader_func = nullptr; void (*Image::_image_compress_bc_func)(Image *, Image::UsedChannels) = nullptr; @@ -3490,7 +3489,6 @@ void Image::_bind_methods() { ClassDB::bind_method(D_METHOD("load_webp_from_buffer", "buffer"), &Image::load_webp_from_buffer); ClassDB::bind_method(D_METHOD("load_tga_from_buffer", "buffer"), &Image::load_tga_from_buffer); ClassDB::bind_method(D_METHOD("load_bmp_from_buffer", "buffer"), &Image::load_bmp_from_buffer); - ClassDB::bind_method(D_METHOD("load_dds_from_buffer", "buffer"), &Image::load_dds_from_buffer); ClassDB::bind_method(D_METHOD("load_ktx_from_buffer", "buffer"), &Image::load_ktx_from_buffer); ClassDB::bind_method(D_METHOD("load_svg_from_buffer", "buffer", "scale"), &Image::load_svg_from_buffer, DEFVAL(1.0)); @@ -3867,14 +3865,6 @@ Error Image::load_svg_from_string(const String &p_svg_str, float scale) { return load_svg_from_buffer(p_svg_str.to_utf8_buffer(), scale); } -Error Image::load_dds_from_buffer(const Vector<uint8_t> &p_array) { - ERR_FAIL_NULL_V_MSG( - _dds_mem_loader_func, - ERR_UNAVAILABLE, - "The DDS module isn't enabled. Recompile the Godot editor or export template binary with the `module_dds_enabled=yes` SCons option."); - return _load_from_buffer(p_array, _dds_mem_loader_func); -} - Error Image::load_ktx_from_buffer(const Vector<uint8_t> &p_array) { ERR_FAIL_NULL_V_MSG( _ktx_mem_loader_func, diff --git a/core/io/image.h b/core/io/image.h index cb7c6bff52..a21d05187b 100644 --- a/core/io/image.h +++ b/core/io/image.h @@ -150,7 +150,6 @@ public: static ImageMemLoadFunc _tga_mem_loader_func; static ImageMemLoadFunc _bmp_mem_loader_func; static ScalableImageMemLoadFunc _svg_scalable_mem_loader_func; - static ImageMemLoadFunc _dds_mem_loader_func; static ImageMemLoadFunc _ktx_mem_loader_func; static void (*_image_compress_bc_func)(Image *, UsedChannels p_channels); @@ -404,7 +403,6 @@ public: Error load_webp_from_buffer(const Vector<uint8_t> &p_array); Error load_tga_from_buffer(const Vector<uint8_t> &p_array); Error load_bmp_from_buffer(const Vector<uint8_t> &p_array); - Error load_dds_from_buffer(const Vector<uint8_t> &p_array); Error load_ktx_from_buffer(const Vector<uint8_t> &p_array); Error load_svg_from_buffer(const Vector<uint8_t> &p_array, float scale = 1.0); |