Scarfski/basis_universal
1
0
Fork 0
mirror of https://github.com/BinomialLLC/basis_universal.git synced 2026-08-07 05:49:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #116 from cwoffenden/single-file-transcoder

Browse Source 
Single file transcoder fixes
This commit is contained in:
Rich Geldreich
2020-03-22 23:39:18 -04:00
committed by GitHub
parent 6ef114ac1e a9ee154233
commit 54a2db06f1
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/single_file_transcoder/.editorconfig Normal file
View File

@@ -0,0 +1,4 @@
[*]
insert_final_newline = true
indent_style = tab
indent_size = 4

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);

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

@@ -379,20 +379,25 @@ 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);
if (basis_transcoder_format_is_uncompressed(type)) {
decSize *= descW * descH;
} else {
decSize *= blocks;
}
}
if (void* decBuf = malloc(decSize)) {
if (type >= transcoder_texture_format::cTFTotalTextureFormats) {
if (basis_transcoder_format_is_uncompressed(type)) {
// note that blocks becomes total number of pixels for RGB/RGBA
blocks = descW * descH;
}
if (transcoder.transcode_image_level(data, size, 0, level, decBuf, blocks, type)) {
if (type < transcoder_texture_format::cTFTotalTextureFormats) {
glCompressedTexImage2D(GL_TEXTURE_2D, level,
toGlType(type), descW, descH, 0, decSize, decBuf);
} else {
if (basis_transcoder_format_is_uncompressed(type)) {
glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA,
descW, descH, 0, GL_RGBA, toGlType(type), decBuf);
} else {
glCompressedTexImage2D(GL_TEXTURE_2D, level,
toGlType(type), descW, descH, 0, decSize, decBuf);
}
success = true;
}