68 Commits

Author SHA1 Message Date
Richard Geldreich
5359b1ae24 fixes for contrib/single_file_transcoder so it works again 2026-01-19 15:00:24 -05:00
Aaron Franke
f3a63a3f54 Remove trailing space characters 2025-11-21 11:52:38 -08:00
Richard Geldreich
d17a1b4036 UASTC HDR merge 2024-09-10 14:46:11 -04:00
Rich Geldreich
4e3d5ba7cb Merge pull request #282 from cwoffenden/faster-amalgamate
Replace the slow single-file shell script with a faster Python equivalent
2022-02-24 17:12:32 -08:00
Richard Geldreich
deeb5acb56 v1.16 release: OpenCL support, removing global selector palette code (it was unused/dead code), ETC1S encoding optimizations, -parallel command line option 2022-01-28 08:32:54 -05:00
Richard Geldreich
fcbd0e7df1 New files 2022-01-28 08:30:40 -05:00
Carl Woffenden
b1c70e9141 Minor docs 2022-01-19 17:10:30 +01:00
Carl Woffenden
df66ddd794 Replaced the slow shell script with a faster Python equivalent 2022-01-19 17:01:35 +01:00
Carl Woffenden
150b7fb24f Tidy docs 2021-05-31 14:55:24 +02:00
Carl Woffenden
b0c447b479 Minor: fixed quotes in example 2021-05-31 14:36:55 +02:00
Carl Woffenden
51c999afba Minor tweaks to fix single-file creations 2021-05-31 14:14:59 +02:00
Aaron Franke
409d9a502e Commit files changed by the formatting script 2020-04-25 00:21:48 -04:00
Bruno George de Moraes
c8cb464fe3 Further optimize img!
/encoder_lvl_vs_perf.png -- 7.22kb -> 6.18kb (14.4%)
/webgl/texture/preview.png -- 432.41kb ->  317.87kb (26.488%)
/contrib/single_file_transcoder/examples/testcard.png -- 10.55kb ->  7.90kb (25.1%)
/contrib/single_file_transcoder/examples/testcard-rgba.png -- 14.3kb ->  11.52kb (19.44%)
/webgl/gltf/preview.png -- 490.65kb ->  458kb (6.652%)
/contrib/previewers/win/preview.png -- 652.43kb ->  624.31 (4.31%)
Total:  1,609.39‬kb  -> 1425.78kb  (11.4%)
2020-04-02 15:13:03 -03:00
Rich Geldreich
54a2db06f1 Merge pull request #116 from cwoffenden/single-file-transcoder
Single file transcoder fixes
2020-03-22 23:39:18 -04:00
Rich Geldreich
6ef114ac1e Merge pull request #117 from cwoffenden/previewers-uastc
Updated Windows previewer with UASTC support
2020-03-22 23:38:27 -04:00
ImgBotApp
3cb4515cc0 [ImgBot] Optimize images
*Total -- 1,819.93kb -> 1,593.25kb (12.46%)

/encoder_lvl_vs_perf.png -- 13.04kb -> 7.22kb (44.68%)
/webgl/texture/preview.png -- 522.49kb -> 432.41kb (17.24%)
/contrib/single_file_transcoder/examples/testcard.png -- 12.38kb -> 10.55kb (14.79%)
/webgl/gltf/preview.png -- 563.41kb -> 490.65kb (12.91%)
/contrib/previewers/win/preview.png -- 708.61kb -> 652.43kb (7.93%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
2020-03-22 08:23:08 +00:00
Carl Woffenden
56d2782b5f Minor docs 2020-03-21 16:31:39 +01:00
Carl Woffenden
a9ee154233 Fixed Emscripten demo when transcoding to uncompressed formats
(Also added editor config file)
2020-03-21 16:13:45 +01:00
Carl Woffenden
310aea5a66 Minor typo 2020-03-21 15:42:19 +01:00
Carl Woffenden
2a48aaf0cc Fixes for the UASTC changes
Tested on Windows with both ETCS and UASTC files.
2020-03-21 15:40:14 +01:00
Carl Woffenden
2a464a9cc3 Fixes to build since UASTC additions 2020-03-21 12:59:29 +01:00
Carl Woffenden
a8bbc031f1 Revert "Removed unused macro around now commented 'max_bits' vars"
This reverts commit 0a7098a231.
2020-03-21 12:04:33 +01:00
Carl Woffenden
0a7098a231 Removed unused macro around now commented 'max_bits' vars 2020-03-21 12:03:47 +01:00
Carl Woffenden
632a26ea9f Merge remote-tracking branch 'upstream/master' into single-file-transcoder 2020-01-02 20:40:01 +01:00
Carl Woffenden
267e00addb Minor performance tweak to the DIB creation loop 2019-10-05 11:47:46 +02:00
Carl Woffenden
a88ff8b9ac Removed preview pane
Simplified the PR by removing the (as yet unused) preview pane.
2019-10-05 11:38:24 +02:00
Carl Woffenden
582d8c8488 Switched to using Basis's own RGB transcode
Removed the DXT->RGB conversion now that the transcoder has an RGB option.
2019-10-03 19:26:46 +02:00
Carl Woffenden
2b08ab7248 Added a test to confirm amalgamation worked
Added 'simple.cpp' which does the bare mimimum to confirm the amalgamation worked (compiled and run after the combine step). Split the embedded .basis files from the Emscripten test so they can be shared. Fixed an error in the creation script (which caused it to always fail). Corrected the syntax for the unused functions (tested with older, less forgiving compilers).
2019-10-03 17:25:32 +02:00
Carl Woffenden
5987afa171 Added resource preview pane. Minor tweaks.
Added the work-in-progress resource pane (to hold the file details, number of mips, etc.).  The Windows project shares the transcoder with the (future) Mac previewer.
2019-10-03 16:05:05 +02:00
Carl Woffenden
36de8d65c3 Tracking enum changes
Transcoder enums changed recently, so updated these. Switched to using the 'single file' transcoder (committed) so this will always build regardless of changes.
2019-10-03 10:38:30 +02:00
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
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
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
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