Scarfski/basis_universal
1
0
Fork 0
mirror of https://github.com/BinomialLLC/basis_universal.git synced 2026-09-14 06:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to build since UASTC additions

Browse Source
This commit is contained in:
Carl Woffenden
2020-03-21 12:59:29 +01:00
parent ec00f06e81
commit 2a464a9cc3
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/single_file_transcoder/basisu_transcoder-in.cpp
View File

@@ -62,10 +62,7 @@ void _basisu_translib_dummy() {
// Unused but only when building with EAC
BASISU_NOTE_UNUSED(basist::g_eac_modifier_table);
#endif
#if BASISD_SUPPORT_PVRTC1
// Unused but only when building with PVRTC
BASISU_NOTE_UNUSED(basist::g_pvrtc_bilinear_weights);
#else
#if BASISD_SUPPORT_PVRTC1 == 0
// Unused only when not building with PVRTC
BASISU_NOTE_UNUSED(basist::g_etc1_inten_tables16);
BASISU_NOTE_UNUSED(basist::g_etc1_inten_tables48);

2
contrib/single_file_transcoder/examples/emscripten.cpp
View File

@@ -379,7 +379,7 @@ bool upload(EMSCRIPTEN_WEBGL_CONTEXT_HANDLE const ctx, GLuint const name, const
decSize = (std::max(8U, (descW + 3) & ~3) *
std::max(8U, (descH + 3) & ~3) * 4 + 7) / 8;
} else {
decSize = basis_get_bytes_per_block(type) * blocks;
decSize = basis_get_bytes_per_block_or_pixel(type) * blocks;
}
if (void* decBuf = malloc(decSize)) {
if (type >= transcoder_texture_format::cTFTotalTextureFormats) {