Scarfski/basis_universal
1
0
Fork 0
mirror of https://github.com/BinomialLLC/basis_universal.git synced 2026-11-14 12:05:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
344 Commits 7 Branches 38 Tags
e2d1f6b79ec7ccfa06aaa0d035720f8846b723d8
Commit Graph
344 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Woffenden e2d1f6b79e Added combiner option to keep "#pragma once" directives 
Keeping the "#pragma once" directives in the combined headers but not in the combined source.
 2019-10-02 12:32:34 +02:00
Carl Woffenden 53e372bb56 Merge remote-tracking branch 'upstream/master' into single-file-transcoder 2019-10-02 10:55:00 +02:00
Rich Geldreich cb03a73541 Updating ASTC license stuff 2019-10-01 22:19:14 -07:00
Rich Geldreich 2a7dd1afc3 Adding ASTC license info 2019-10-01 22:03:13 -07:00
Carl Woffenden c04d24dd12 Generated file is now basisu_transcoder.cpp 
Renamed the generated file to be the same as the non-amalgamated file, updating the script (and docs) accordinly. Added an example of generated amalgamated header and source.
 2019-10-01 15:56:59 +02:00
Carl Woffenden a5c36a5291 -x included error if used 
The -x include files error if used (saying they were excluded). Changed the trancoder to surround the BC7 mode 6 include with guards.
 2019-09-30 15:15:13 +02:00
Carl Woffenden b48087bab8 Merge remote-tracking branch 'upstream/master' into single-file-transcoder 2019-09-30 11:46:21 +02:00
Richard Geldreich 1cae1d5726 Rebuilt transcoder 2019-09-29 20:02:20 -07:00
Rich Geldreich a056ee540b Update README.md 2019-09-29 19:40:26 -07:00
richgel999 4a2c0d66c2 Removed PVRTC1 wrap option 2019-09-29 19:37:54 -07:00
richgel999 01d391cc2a PVRTC1 apparently always use wrap addressing when fetching the adjacent block colors (even when clamp texture addressing is being used), so we don't need the wrap vs. clamp option anymore. It's always wrap and that's that. 2019-09-29 19:34:00 -07:00
richgel999 9be4e210ff Adding -pvrtc_clamp command line flag, so we can see what PVRTC1 textures look like when transcoded and unpacked with clamp addressing 2019-09-29 18:41:57 -07:00
Carl Woffenden 51c21d1c6b Revert "Revert "Brought up-to-date with transcoder changes"" 
This reverts commit ff531b2467.
 2019-09-28 09:26:01 +02:00
Carl Woffenden ff531b2467 Revert "Brought up-to-date with transcoder changes" 
This reverts commit 30a7c208d9.
 2019-09-28 09:19:09 +02:00
Carl Woffenden 04156859e4 Revert "Merge branch 'single-file-transcoder' of https://github.com/cwoffenden/basis_universal into single-file-transcoder" 
This reverts commit 41c34d1a87, reversing
changes made to 30a7c208d9.
 2019-09-28 09:19:05 +02:00
Carl Woffenden f5fd92b1d2 Revert "Undid the git merge mess" 
This reverts commit 6b0f37ddcc.
 2019-09-28 09:18:52 +02:00
Carl Woffenden 6b0f37ddcc Undid the git merge mess 2019-09-28 08:17:16 +02:00
Carl Woffenden 41c34d1a87 Merge branch 'single-file-transcoder' of https://github.com/cwoffenden/basis_universal into single-file-transcoder 2019-09-28 08:09:01 +02:00
Carl Woffenden 30a7c208d9 Brought up-to-date with transcoder changes 
Transcoder changes meant: compiling the example as C++11 (not emcc's default), and changing the enums to the new enum classes.
 2019-09-28 08:03:26 +02:00
Carl Woffenden 5c77348a8a Added exclude option, improved example 
Added -x option to the script to exclude files, then used it to exclude the large BC7 mode 6 tables. Added mipmap transcoding to the example for completeness.
 2019-09-28 07:04:29 +02:00
Carl Woffenden e51d78ade0 WIP (added sources with mipmaps) 
Mipmaps levels not yet extracted.
 2019-09-28 07:04:29 +02:00
Carl Woffenden e8507ef065 Minor docs, minor size tweaks 
Clarified this is C++ source and not header-only. Added Android build options and excluded BC7 mode 6.
 2019-09-28 07:04:29 +02:00
Carl Woffenden cd05206205 Fixed standalone compilation warnings 
Fixed -Wno-pragma-once-outside-header requirement (removing 'pragma once' in combiner script). Minor docs.
 2019-09-28 07:04:29 +02:00
Carl Woffenden e3c100578c Don't add EAC to the demo if not building with EAC 2019-09-28 07:04:29 +02:00
Carl Woffenden 9399434cfb Minor: corrected figures 2019-09-28 07:04:29 +02:00
Carl Woffenden f8b0bfe92c Minor: moved note 2019-09-28 07:04:29 +02:00
Carl Woffenden 6c4d877710 ASTC support (and improved demo) 
Exposed the ASTC transcoder. Improved the Emscripten example and tested on ASTC and ETC hardware. Workaround for usused functions and consts when disabling various transcode options.
 2019-09-28 07:04:29 +02:00
Carl Woffenden ac73849b0e Fixes more -Wunused-parameter warnings 
These unused params occur when disabling various transcode options.
 2019-09-28 07:04:29 +02:00
Carl Woffenden 80271e2cff Working demo 
Demo transcodes to various formats (tested only PVRTC, S3TC and uncompressed for now). Added docs.
 2019-09-28 07:04:29 +02:00
Carl Woffenden 9dd6068dd3 Work-in-progress 
Embedded .basis files with and without alpha. Started adding support to draw both types, as well as ETC. Fixed broken WebGL canvas.
 2019-09-28 07:04:29 +02:00
Carl Woffenden c002331b37 Added RGBA example 2019-09-28 07:04:29 +02:00
Carl Woffenden bd8feea6d9 Initial commit 
Added combine script.  Created initial Emscripten example.
 2019-09-28 07:04:29 +02:00
Carl Woffenden a6bd48a16c Minor Clang fixes 
Minor fixes so that Clang doesn't trip with `-Werror` and `-Wextra`.
 2019-09-28 07:04:29 +02:00
Rich Geldreich dad34eac9e Update README.md 2019-09-27 19:55:52 -07:00
Rich Geldreich 91ac05a0a9 Update README.md 2019-09-27 19:01:37 -07:00
Rich Geldreich 6e9f2e6604 Merge pull request #77 from akien-mga/cmake-out-of-source 
CMake: Fix stripping out-of-source build
 2019-09-27 18:59:12 -07:00
Rich Geldreich 5f804e239f Update README.md 2019-09-27 18:39:05 -07:00
Carl Woffenden 0499e57499 Added exclude option, improved example 
Added -x option to the script to exclude files, then used it to exclude the large BC7 mode 6 tables. Added mipmap transcoding to the example for completeness.
 2019-09-27 11:46:00 +02:00
Rémi Verschelde 74a724f96d CMake: Fix stripping out-of-source build 
Also add .gitignore to avoid versioning bin/ or a potential build/ directory
by mistake.
 2019-09-27 09:29:41 +02:00
Rich Geldreich 9a63bb6687 Update README.md 2019-09-26 23:59:35 -07:00
Rich Geldreich d33443a536 Update README.md 2019-09-26 23:57:21 -07:00
Rich Geldreich c349448d77 Update README.md 2019-09-26 23:56:10 -07:00
Rich Geldreich 7f8404f031 Update README.md 2019-09-26 23:53:51 -07:00
richgel999 11f46d74af New files 2019-09-26 23:36:54 -07:00
Rich Geldreich 05722dc580 Update README.md 2019-09-26 23:23:45 -07:00
richgel999 2af4f74533 Transcoder wrappers compilation fixes, rebuilt WebAssembly transcoder 2019-09-26 23:03:26 -07:00
richgel999 54304fa014 - Adding PVRTC2 RGB/RGBA and ETC2 EAC R11 and RG11 
- Renaming -no_auto_global_sel_pal to -auto_global_sel_pal, disabling global selector palette usage by default to speed up compression on small images
- Renaming texture format enums
- Fixing uninitialized memory issue in front end - it wouldn't have affected the correctness of the output, or output quality
- Bumping command line tool up to v1.10
 2019-09-26 22:35:14 -07:00
richgel999 3dbd8ecce2 Fixing rare debug assert on some images. 2019-09-26 22:03:28 -07:00
Carl Woffenden 3e6a742818 WIP (added sources with mipmaps) 
Mipmaps levels not yet extracted.
 2019-09-26 18:45:39 +02:00
Carl Woffenden fd6b7117e4 Minor docs, minor size tweaks 
Clarified this is C++ source and not header-only. Added Android build options and excluded BC7 mode 6.
 2019-09-26 03:42:01 +02:00