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

Revert "Merge branch 'single-file-transcoder' of https://github.com/cwoffenden/basis_universal into single-file-transcoder"

Browse Source 
This reverts commit 41c34d1a87, reversing
changes made to 30a7c208d9.
This commit is contained in:
Carl Woffenden
2019-09-28 09:19:05 +02:00
parent f5fd92b1d2
commit 04156859e4
3 changed files with 0 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/single_file_transcoder/README.md
View File

@@ -22,8 +22,4 @@ Why?
Because all it now takes to support Basis Universal is the addition of a single file, two if using the header, with no configuration or further build steps (the out-of-the-box defaults tailor the included formats for various platforms).
<<<<<<< HEAD
The library is small, adding, for example, around 250kB to an Emscripten compiled WebAssembly project (with transcoding disabled for BC7 and ATC; disabling ASTC will remove a further 64kB, and `gzip` will approximately half the `wasm` file).
=======
The library is small, adding, for example, 249kB to an Emscripten compiled WebAssembly project (with transcoding disabled for BC7 and ATC; disabling ASTC will remove a further 64kB, and `gzip` will approximately half the `wasm` file).
>>>>>>> 0499e57499d26173b8faf2306bf3aee0bb8d3699

24
contrib/single_file_transcoder/basisutranslib-in.cpp
View File

@@ -10,18 +10,12 @@
/*
* Transcoder build options for known platforms (iOS has ETC, ASTC and PVRTC;
<<<<<<< HEAD
* Emscripten adds DXT to iOS's options; Android adds PVRTC2 to Emscripten's
* options; other platforms build all except BC7 mode 6 and FXT1).
=======
* Emscripten and Android are the same as iOS plus DXT; other platforms build
* all except BC7 mode 6).
>>>>>>> 0499e57499d26173b8faf2306bf3aee0bb8d3699
*
* See https://github.com/BinomialLLC/basis_universal#shrinking-the-transcoders-compiled-size
*/
#ifdef __APPLE__
<<<<<<< HEAD
#include <TargetConditionals.h>
#endif
#if TARGET_OS_IPHONE
@@ -38,20 +32,6 @@
#define BASISD_SUPPORT_BC7_MODE6_OPAQUE_ONLY 0
#endif
#define BASISD_SUPPORT_FXT1 0
=======
#include <TargetConditionals.h>
#endif
#if TARGET_OS_IPHONE
#define BASISD_SUPPORT_DXT1 0
#define BASISD_SUPPORT_DXT5A 0
#endif
#if TARGET_OS_IPHONE || defined(__EMSCRIPTEN__) || defined(__ANDROID__)
#define BASISD_SUPPORT_BC7 0
#define BASISD_SUPPORT_ATC 0
#else
#define BASISD_SUPPORT_BC7_MODE6_OPAQUE_ONLY 0
#endif
>>>>>>> 0499e57499d26173b8faf2306bf3aee0bb8d3699
#include "basisu_transcoder.cpp"
@@ -80,11 +60,7 @@ void _basisu_translib_dummy() {
BASISU_NOTE_UNUSED(basist::MAX_SELECTOR_HISTORY_BUF_SIZE);
#if BASISD_SUPPORT_ETC2_EAC_A8
// Unused but only when building with EAC
<<<<<<< HEAD
BASISU_NOTE_UNUSED(basist::g_eac_modifier_table);
=======
BASISU_NOTE_UNUSED(basist::g_eac_a8_modifier_table);
>>>>>>> 0499e57499d26173b8faf2306bf3aee0bb8d3699
#endif
#if BASISD_SUPPORT_PVRTC1
// Unused but only when building with PVRTC

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

@@ -5,11 +5,7 @@
* \n
* Compile using:
* \code
<<<<<<< HEAD
* export CC_FLAGS="-std=c++11 -Wall -Wextra -Werror -Os -g0 -flto --llvm-lto 3 -fno-exceptions -fno-rtti -lGL -DNDEBUG=1"
=======
* export CC_FLAGS="-Wall -Wextra -Werror -Os -g0 -flto --llvm-lto 3 -fno-exceptions -fno-rtti -lGL -DNDEBUG=1"
>>>>>>> 0499e57499d26173b8faf2306bf3aee0bb8d3699
* export EM_FLAGS="-s ENVIRONMENT=web -s WASM=1 --shell-file shell.html --closure 1"
* emcc $CC_FLAGS $EM_FLAGS -o out.html emscripten.cpp
* \endcode
@@ -1997,13 +1993,8 @@ static transcoder_texture_format supports(EMSCRIPTEN_WEBGL_CONTEXT_HANDLE const
|| GL_HAS_EXT(ctx, "WEBGL_compressed_texture_pvrtc");
if (pvr) {
return (alpha)
<<<<<<< HEAD
? transcoder_texture_format::cTFPVRTC1_4_RGBA
: transcoder_texture_format::cTFPVRTC1_4_RGB;
=======
? cTFPVRTC1_4_RGBA // 9
: cTFPVRTC1_4_RGB; // 8
>>>>>>> 0499e57499d26173b8faf2306bf3aee0bb8d3699
}
#endif
#if BASISD_SUPPORT_ASTC || !defined(BASISD_SUPPORT_ASTC)
@@ -2013,11 +2004,7 @@ static transcoder_texture_format supports(EMSCRIPTEN_WEBGL_CONTEXT_HANDLE const
*/
static bool const astc = GL_HAS_EXT(ctx, "WEBGL_compressed_texture_astc");
if (astc) {
<<<<<<< HEAD
return transcoder_texture_format::cTFASTC_4x4_RGBA;
=======
return cTFASTC_4x4; // 10
>>>>>>> 0499e57499d26173b8faf2306bf3aee0bb8d3699
}
#endif
#if BASISD_SUPPORT_DXT1 || !defined(BASISD_SUPPORT_DXT1)
@@ -2030,13 +2017,8 @@ static transcoder_texture_format supports(EMSCRIPTEN_WEBGL_CONTEXT_HANDLE const
|| GL_HAS_EXT(ctx, "WEBKIT_WEBGL_compressed_texture_s3tc");
if (dxt) {
return (alpha)
<<<<<<< HEAD
? transcoder_texture_format::cTFBC3_RGBA
: transcoder_texture_format::cTFBC1_RGB;
=======
? cTFBC3 // 3
: cTFBC1; // 2
>>>>>>> 0499e57499d26173b8faf2306bf3aee0bb8d3699
}
#endif
#if BASISD_SUPPORT_ETC2_EAC_A8 || !defined(BASISD_SUPPORT_ETC2_EAC_A8)
@@ -2046,13 +2028,8 @@ static transcoder_texture_format supports(EMSCRIPTEN_WEBGL_CONTEXT_HANDLE const
static bool const etc2 = GL_HAS_EXT(ctx, "WEBGL_compressed_texture_etc");
if (etc2) {
return (alpha)
<<<<<<< HEAD
? transcoder_texture_format::cTFETC2_RGBA
: transcoder_texture_format::cTFETC1_RGB;
=======
? cTFETC2 // 1
: cTFETC1; // 0
>>>>>>> 0499e57499d26173b8faf2306bf3aee0bb8d3699
}
#endif
/*
@@ -2062,20 +2039,12 @@ static transcoder_texture_format supports(EMSCRIPTEN_WEBGL_CONTEXT_HANDLE const
*/
static bool const etc1 = GL_HAS_EXT(ctx, "WEBGL_compressed_texture_etc1");
if (etc1 && !alpha) {
<<<<<<< HEAD
return transcoder_texture_format::cTFETC1_RGB;
=======
return cTFETC1; // 0
>>>>>>> 0499e57499d26173b8faf2306bf3aee0bb8d3699
}
/*
* We choose 8888 over 4444 and 565 (in the hope that is is never chosen).
*/
<<<<<<< HEAD
return transcoder_texture_format::cTFRGBA32;
=======
return cTFRGBA32; // 13
>>>>>>> 0499e57499d26173b8faf2306bf3aee0bb8d3699
}
/**
@@ -2089,7 +2058,6 @@ static transcoder_texture_format supports(EMSCRIPTEN_WEBGL_CONTEXT_HANDLE const
*/
static GLenum toGlType(transcoder_texture_format const type) {
switch (type) {
<<<<<<< HEAD
case transcoder_texture_format::cTFETC1_RGB:
return GL_ETC1_RGB8_OES;
case transcoder_texture_format::cTFETC2_RGBA:
@@ -2107,25 +2075,6 @@ static GLenum toGlType(transcoder_texture_format const type) {
case transcoder_texture_format::cTFRGBA32:
return GL_UNSIGNED_BYTE;
case transcoder_texture_format::cTFRGB565:
=======
case cTFETC1:
return GL_ETC1_RGB8_OES;
case cTFETC2:
return GL_COMPRESSED_RGBA8_ETC2_EAC;
case cTFBC1:
return GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
case cTFBC3:
return GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
case cTFPVRTC1_4_RGB:
return GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG;
case cTFPVRTC1_4_RGBA:
return GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG;
case cTFASTC_4x4:
return GL_COMPRESSED_RGBA_ASTC_4x4_KHR;
case cTFRGBA32:
return GL_UNSIGNED_BYTE;
case cTFRGB565:
>>>>>>> 0499e57499d26173b8faf2306bf3aee0bb8d3699
return GL_UNSIGNED_SHORT_5_6_5;
default:
return GL_UNSIGNED_SHORT_4_4_4_4;
@@ -2167,35 +2116,21 @@ bool upload(EMSCRIPTEN_WEBGL_CONTEXT_HANDLE const ctx, GLuint const name, const
success = false;
if (transcoder.get_image_level_desc(data, size, 0, level, descW, descH, blocks)) {
uint32_t decSize;
<<<<<<< HEAD
if (type == transcoder_texture_format::cTFPVRTC1_4_RGB ||
type == transcoder_texture_format::cTFPVRTC1_4_RGBA)
{
=======
if (type == cTFPVRTC1_4_RGB || type == cTFPVRTC1_4_RGBA) {
>>>>>>> 0499e57499d26173b8faf2306bf3aee0bb8d3699
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;
}
<<<<<<< HEAD
if (void* decBuf = malloc(decSize)) {
if (type >= transcoder_texture_format::cTFTotalTextureFormats) {
=======
if (void* decBuf = malloc(decSize)) {
if (type >= cTFTotalBlockTextureFormats) {
>>>>>>> 0499e57499d26173b8faf2306bf3aee0bb8d3699
// 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)) {
<<<<<<< HEAD
if (type < transcoder_texture_format::cTFTotalTextureFormats) {
=======
if (type < cTFTotalBlockTextureFormats) {
>>>>>>> 0499e57499d26173b8faf2306bf3aee0bb8d3699
glCompressedTexImage2D(GL_TEXTURE_2D, level,
toGlType(type), descW, descH, 0, decSize, decBuf);
} else {