Merge pull request #407 from zeux/basis

gltfpack: Update to Basis 1.16
zeux · Jan 30, 2022 · f8a03cc · f8a03cc
2 parents ac0e123 + e72edf7
commit f8a03cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/gltf/basisenc.cpp b/gltf/basisenc.cpp
@@ -30,8 +30,6 @@ bool encodeBasisInternal(const char* input, const char* output, bool yflip, bool
 {
 	using namespace basisu;
 
-	basist::etc1_global_selector_codebook sel_codebook(basist::g_global_selector_cb_size, basist::g_global_selector_cb);
-
 	basis_compressor_params params;
 
 	params.m_multithreading = gJobPool->get_total_threads() > 1;
@@ -82,7 +80,6 @@ bool encodeBasisInternal(const char* input, const char* output, bool yflip, bool
 
 	params.m_read_source_images = true;
 	params.m_write_output_basis_files = true;
-	params.m_pSel_codebook = &sel_codebook;
 
 	params.m_source_filenames.resize(1);
 	params.m_source_filenames[0] = input;

diff --git a/gltf/basislib.cpp b/gltf/basislib.cpp
@@ -34,25 +34,23 @@
 #define BASISU_SUPPORT_SSE 1
 #endif
 
-#include "encoder/apg_bmp.c"
-#include "encoder/basisu_astc_decomp.cpp"
 #include "encoder/basisu_etc.cpp"
 #include "encoder/basisu_resample_filters.cpp"
 #include "encoder/basisu_backend.cpp"
 #include "encoder/basisu_frontend.cpp"
 #include "encoder/basisu_resampler.cpp"
 #include "encoder/basisu_basis_file.cpp"
 #include "encoder/basisu_bc7enc.cpp"
-#include "encoder/basisu_global_selector_palette_helpers.cpp"
 #include "encoder/basisu_ssim.cpp"
 #include "encoder/basisu_gpu_texture.cpp"
 #include "encoder/basisu_uastc_enc.cpp"
 #include "encoder/basisu_comp.cpp"
 #include "encoder/basisu_kernels_sse.cpp"
+#include "encoder/basisu_opencl.cpp"
 #include "encoder/jpgd.cpp"
+#include "encoder/pvpngreader.cpp"
 #include "encoder/basisu_enc.cpp"
 #include "encoder/basisu_pvrtc1_4.cpp"
-#include "encoder/lodepng.cpp"
 #include "transcoder/basisu_transcoder.cpp"
 
 #undef CLAMP