Scarfski/basis_universal
1
0
Fork 0
mirror of https://github.com/BinomialLLC/basis_universal.git synced 2026-10-14 13:05:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Adding UASTC support to encoder, transcoder, .basis file format

Browse Source 
- Removing BC7 mode 6 support from transcoder (will alway use the much smaller mode 5 tables now)
- Adding BMP support
- Adding -bench mode, for development
- CMakeLists.txt file now compatible with Visual Studio 2019 (MSVC)
This commit is contained in:
Rich Geldreich
2020-03-20 02:00:34 -04:00
parent 7779f320b0
commit 5b6eb565e4
43 changed files with 11104 additions and 6881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
webgl/transcoder/basis_wrappers.cpp
View File

@@ -130,7 +130,7 @@ struct basis_file
else
{
// Compressed formats are 2D arrays of blocks.
const uint32_t bytes_per_block = basis_get_bytes_per_block(transcoder_format);
const uint32_t bytes_per_block = basis_get_bytes_per_block_or_pixel(transcoder_format);
if (transcoder_format == transcoder_texture_format::cTFPVRTC1_4_RGB || transcoder_format == transcoder_texture_format::cTFPVRTC1_4_RGBA)
{
@@ -145,6 +145,14 @@ struct basis_file
return total_blocks * bytes_per_block;
}
}
bool isUASTC() {
assert(m_magic == MAGIC);
if (m_magic != MAGIC)
return false;
return m_transcoder.get_tex_format(m_file.data(), m_file.size()) == basis_tex_format::cUASTC4x4;
}
uint32_t startTranscoding() {
assert(m_magic == MAGIC);
@@ -172,7 +180,7 @@ struct basis_file
std::vector<uint8_t> dst_data;
uint32_t flags = get_alpha_for_opaque_formats ? basisu_transcoder::cDecodeFlagsTranscodeAlphaDataToOpaqueFormats : 0;
uint32_t flags = get_alpha_for_opaque_formats ? cDecodeFlagsTranscodeAlphaDataToOpaqueFormats : 0;
uint32_t status;
@@ -195,7 +203,7 @@ struct basis_file
}
else
{
uint32_t bytes_per_block = basis_get_bytes_per_block(transcoder_format);
uint32_t bytes_per_block = basis_get_bytes_per_block_or_pixel(transcoder_format);
uint32_t required_size = total_blocks * bytes_per_block;
@@ -239,6 +247,9 @@ EMSCRIPTEN_BINDINGS(basis_transcoder) {
.function("getHasAlpha", optional_override([](basis_file& self) {
return self.getHasAlpha();
}))
.function("isUASTC", optional_override([](basis_file& self) {
return self.isUASTC();
}))
.function("getNumImages", optional_override([](basis_file& self) {
return self.getNumImages();
}))