Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #87984 from BlueCube3310/etcpak-update

Browse source 
etcpak: Sync with upstream
This commit is contained in:
Rémi Verschelde 2024-02-07 11:03:15 +01:00
commit f3a5c615e2
No known key found for this signature in database
GPG key ID: C3336907360768E1
12 changed files with 185 additions and 494 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/etcpak/SCsub
View file

@ -13,7 +13,6 @@ thirdparty_dir = "#thirdparty/etcpak/"
thirdparty_sources = [
"Dither.cpp",
"ProcessDxtc.cpp",
"ProcessRgtc.cpp",
"ProcessRGB.cpp",
"Tables.cpp",
]

9
modules/etcpak/image_compress_etcpak.cpp
View file

@ -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: