diff options
| author | BlueCube3310 <53150244+BlueCube3310@users.noreply.github.com> | 2024-02-05 18:53:35 +0100 |
|---|---|---|
| committer | BlueCube3310 <53150244+BlueCube3310@users.noreply.github.com> | 2024-02-05 18:53:35 +0100 |
| commit | becf5b1d2343a8f675300bfbf398140549d641f6 (patch) | |
| tree | 0a16dddf2add1f2bd92572ad41b60ba86989f29b /modules/etcpak | |
| parent | d3352813ea44447bfbf135efdec23acc4d1d3f89 (diff) | |
| download | redot-engine-becf5b1d2343a8f675300bfbf398140549d641f6.tar.gz | |
[etcpak] Sync with upstream
Diffstat (limited to 'modules/etcpak')
| -rw-r--r-- | modules/etcpak/SCsub | 1 | ||||
| -rw-r--r-- | modules/etcpak/image_compress_etcpak.cpp | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/modules/etcpak/SCsub b/modules/etcpak/SCsub index 3a4bff8e87..2d3b69be75 100644 --- a/modules/etcpak/SCsub +++ b/modules/etcpak/SCsub @@ -13,7 +13,6 @@ thirdparty_dir = "#thirdparty/etcpak/" thirdparty_sources = [ "Dither.cpp", "ProcessDxtc.cpp", - "ProcessRgtc.cpp", "ProcessRGB.cpp", "Tables.cpp", ] diff --git a/modules/etcpak/image_compress_etcpak.cpp b/modules/etcpak/image_compress_etcpak.cpp index 9c04f5b40e..087d3a9314 100644 --- a/modules/etcpak/image_compress_etcpak.cpp +++ b/modules/etcpak/image_compress_etcpak.cpp @@ -35,7 +35,6 @@ #include <ProcessDxtc.hpp> #include <ProcessRGB.hpp> -#include <ProcessRgtc.hpp> EtcpakType _determine_etc_type(Image::UsedChannels p_channels) { switch (p_channels) { @@ -246,11 +245,11 @@ void _compress_etcpak(EtcpakType p_compresstype, Image *r_img) { break; case EtcpakType::ETCPAK_TYPE_ETC2_R: - CompressEtc2R8(src_mip_read, dest_mip_write, blocks, mip_w); + CompressEacR(src_mip_read, dest_mip_write, blocks, mip_w); break; case EtcpakType::ETCPAK_TYPE_ETC2_RG: - CompressEtc2RG8(src_mip_read, dest_mip_write, blocks, mip_w); + CompressEacRg(src_mip_read, dest_mip_write, blocks, mip_w); break; case EtcpakType::ETCPAK_TYPE_DXT1: @@ -263,11 +262,11 @@ void _compress_etcpak(EtcpakType p_compresstype, Image *r_img) { break; case EtcpakType::ETCPAK_TYPE_RGTC_R: - CompressRgtcR(src_mip_read, dest_mip_write, blocks, mip_w); + CompressBc4(src_mip_read, dest_mip_write, blocks, mip_w); break; case EtcpakType::ETCPAK_TYPE_RGTC_RG: - CompressRgtcRG(src_mip_read, dest_mip_write, blocks, mip_w); + CompressBc5(src_mip_read, dest_mip_write, blocks, mip_w); break; default: |