Commit Graph

409 Commits

Author SHA1 Message Date
Carl Woffenden
ec00f06e81 Removed unused macro around now commented 'max_bits' vars 2020-03-21 12:05:38 +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
5b2d795617 Merge branch 'master' into single-file-transcoder 2020-03-21 11:48:33 +01:00
Rich Geldreich
72ddd446f9 Merge pull request #115 from aaronfranke/file-formatting
Make file formatting comply with POSIX standards
2020-03-21 03:06:53 -04:00
Aaron Franke
2a58642381 Make file formatting comply with POSIX and Unix standards
UTF-8, LF, no BOM, and newlines at end of files
2020-03-21 02:44:10 -04:00
Rich Geldreich
721daccfb7 Update README.md v1.12 2020-03-20 20:39:24 -04:00
Rich Geldreich
f46b9231db Updating help text for BMP support 2020-03-20 20:16:18 -04:00
Rich Geldreich
412206a5bc Update README.md 2020-03-20 15:36:42 -04:00
Carl Woffenden
3953f6099a Merge branch 'master' into single-file-transcoder 2020-03-20 19:40:30 +01:00
Rich Geldreich
fc92177a50 Update README.md 2020-03-20 12:21:41 -04:00
Rich Geldreich
0dc11968c3 Updating readme 2020-03-20 11:18:17 -04:00
Rich Geldreich
078f6cd3ac Adding null pointer check here for safety 2020-03-20 02:27:33 -04:00
Rich Geldreich
34eeeac2e3 Fixing min/max windows.h problem 2020-03-20 02:20:53 -04:00
Rich Geldreich
1635b96e99 Undefined behavior fix 2020-03-20 02:03:37 -04:00
Rich Geldreich
5b6eb565e4 - Adding UASTC support to encoder, transcoder, .basis file format
- 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)
2020-03-20 02:00:34 -04:00
Rich Geldreich
7779f320b0 new files 2020-03-20 01:59:13 -04:00
Rich Geldreich
fe8755019c new files 2020-03-20 01:59:07 -04:00
Rich Geldreich
a00677ab12 new files 2020-03-20 01:59:01 -04:00
Rich Geldreich
02036ae0b2 new files 2020-03-20 01:57:46 -04:00
Rich Geldreich
93fc3a8fc6 new files 2020-03-20 01:57:23 -04:00
Rich Geldreich
9829034505 new files 2020-03-20 01:57:19 -04:00
Rich Geldreich
d0ee14e1fb new files 2020-03-20 01:57:12 -04:00
Rich Geldreich
c0ac65d89b Update README.md 2020-03-18 05:11:52 -04:00
Rich Geldreich
e5a4f1b920 Update README.md 2020-03-18 05:09:50 -04:00
Rich Geldreich
a22c35ab8b Merge pull request #107 from ondys/patch-1
Fixing undefined behavior in basisu_etc.cpp
2020-02-13 16:48:17 -08:00
Ondrej Stava
deb071cc2c Fixing undefined behavior in basisu_etc.cpp
The value inside the static cast can be negative. Casting a negative floating point value to an unsigned integer is an undefined behavior and we were running into issues when executing the code with an address sanitizer turned on.

Not sure if this is the proper way to fix this but it seems to work ok. Either way, the undefined behavior should be fixed.
2020-02-13 14:21:24 -08:00
Carl Woffenden
0cc6736a3e Merge remote-tracking branch 'upstream/master' into single-file-transcoder 2020-01-05 13:16:03 +01:00
Rich Geldreich
895ee8ee7e Update README.md
Fixing misspellings
2020-01-03 21:39:03 -08:00
richgel999
765706364d Fixing spelling in -separate_rg_to_color_alpha 2020-01-03 21:37:45 -08:00
Rich Geldreich
3f91ed881b Update README.md 2020-01-03 21:14:36 -08:00
Rich Geldreich
54103998dc Update README.md
Adding some usage notes
2020-01-03 21:13:50 -08:00
richgel999
82eee2eda7 Fixing BASISD_SUPPORT_ATC so if it's set to 0 we check to make sure PVRTC2 is also set to 0 2020-01-03 20:50:43 -08:00
Rich Geldreich
765f9510ac Update README.md
Changing -level to -comp_level
2020-01-03 20:41:02 -08:00
Carl Woffenden
632a26ea9f Merge remote-tracking branch 'upstream/master' into single-file-transcoder 2020-01-02 20:40:01 +01:00
Rich Geldreich
8565af680d Merge pull request #76 from akien-mga/fix-win32-mingw
Win32: Fix build with GCC (MinGW)
2020-01-02 09:54:10 -08:00
Rich Geldreich
6072276c76 Merge pull request #80 from cwoffenden/previewers-enum-changes
Windows previewer updated with transcoder changes
2020-01-02 09:49:36 -08:00
Rich Geldreich
24fde47ea0 Merge pull request #87 from MarkCallow/update-kdfs-links
Update KDFS links to v1.3.
2020-01-02 09:48:01 -08:00
Rich Geldreich
0545c43ae7 Merge pull request #91 from mosra/bc7m6-tables-optional
Don't require the huge BC7m6 tables if this format is disabled
2020-01-02 09:47:12 -08:00
Rich Geldreich
0dd71079ea Merge pull request #95 from zeux/fix-extension
Don't append .basis extension in basisu_comp.cpp
2020-01-02 09:43:49 -08:00
Rich Geldreich
44ed0e9e33 Merge pull request #97 from zeux/version
Add -version argument/mode
2020-01-02 09:41:15 -08:00
Arseny Kapoulkine
9a605b4f4d Add -version argument/mode
This allows external programs to confirm the existence of basisu
executable by running `basisu -version`.
2019-11-27 17:27:29 +01:00
Arseny Kapoulkine
1cb03f8be5 Don't append .basis extension in basisu_comp.cpp
This is normally redundant - basisu_tool.cpp already computes the output
filename with .basis extension. However, this makes it so that if you
use -output_file command with filename without extension (for example,
one generated by mkstemp), it writes the specified filename instead of
the file with .basis appended.
2019-11-25 00:37:44 +05:30
Vladimír Vondruš
176df98c3e Don't require the huge BC7m6 tables if this format is disabled.
The 1.3 MB file might be considered excessive when bundling the
transcoder sources in another project, don't require it to be present
when not needed.
2019-11-01 17:26:41 +01:00
MarkCallow
bb5897fd01 Update KDFS links to v1.3. 2019-10-18 16:51:40 +09: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