0cb1693689
* Squash development commits for PR * Fix failing build on armeabi-v7a via android NDK * Update with blendshape support * Migrate to auto-cloning and patching tinyusdz (instead of manually copying files) * Update to latest rendermesh-refactor branch commit * Remove tracked file * Update to use recent commit to "dev" branch "rendermesh-refactor" was merged to "dev" around 9 May 2024 but merge was not obvious from commit messages * Add UNUSED() macro (cherry picked from commit d89fe8f034c353cc5cc5b3ac78cd8845e006de38) * Update tinyusdz branch * Prevent per-ABI (x86, x86_64 etc) clone on android * Add verbose logging cmake option * Fix macro and patch * Address compiler warnings * Address compiler warnings * Address compiler warnings * Attempt prevent re-clone/re-patch once downloaded by any ABI build * Disable tinyusdz clone/build by default assimp github PR auto-CI checks clone/build the tinyusdz code, and reject PR due to compiler warnings in the 3rd party external tinyusdz project --------- Co-authored-by: Steve M <praktique-tellypresence@yahoo.com> |
||
|---|---|---|
| .. | ||
| README.md | ||
| tinyusdz.patch | ||
README.md
Tinyusdz patch files
Pending acceptance of proposed changes upstream, need to resort to patching to keep things moving
Tinyusdz files needing patches
tinyusdz_repo/src/external/stb_image_resize2.h
Without patch, build will fail for armeabi-v7a ABI via android NDK
Add #elif block as indicated below around line 2407
#elif defined(STBIR_WASM) || (defined(STBIR_NEON) && defined(_MSC_VER) && defined(_M_ARM)) // WASM or 32-bit ARM on MSVC/clang
...
#elif defined(STBIR_NEON) && (defined(__ANDROID__) && defined(__arm__)) // 32-bit ARM on android NDK
static stbir__inline void stbir__half_to_float_SIMD(float * output, stbir__FP16 const * input)
{
// TODO: this stub is just to allow build on armeabi-v7a via android NDK
}
static stbir__inline void stbir__float_to_half_SIMD(stbir__FP16 * output, float const * input)
{
// TODO: this stub is just to allow build on armeabi-v7a via android NDK
}
static stbir__inline float stbir__half_to_float( stbir__FP16 h )
{
// TODO: this stub is just to allow build on armeabi-v7a via android NDK
return 0;
}
static stbir__inline stbir__FP16 stbir__float_to_half( float f )
{
// TODO: this stub is just to allow build on armeabi-v7a via android NDK
return 0;
}
#elif defined(STBIR_NEON) && defined(_MSC_VER) && defined(_M_ARM64) && !defined(__clang__) // 64-bit ARM on MSVC (not clang)