Commit Graph
35 Commits
Author SHA1 Message Date
Rich Geldreich c4c0db735a Merge pull request #240 from zeux/nominmax
Remove redundant definitions of min/max
2021-06-15 19:21:08 -04:00
Arseny Kapoulkine 35c42cb00b Remove redundant definitions of min/max
These aren't used and they conflict with other sources in single-source
build.
2021-06-06 22:04:31 -07:00
Arseny Kapoulkine 94d8efb875 Disable read/wrote output when status output is off
This was the only output that was being printed when m_status_output is
false; since this defaults to true in command-line builds this doesn't
affect them.
2021-06-05 22:25:30 -07:00
Arseny Kapoulkine 0eb541a118 Implement custom resampling command line args
This change implements -resample X Y command line support in addition to
-resample_factor, when a more sophisticated algorithm is needed to
compute the desired image size.

For example, these can be used to round the image to a multiple of 4 or
to a power of 2 for improved compatibility with various graphics APIs.
2021-04-14 21:13:19 -07:00
Rich Geldreich 24ba5ded22 Merge pull request #214 from zeux/trial_errors
Optimize find_optimal_selector_clusters_for_each_block
2021-04-14 23:50:22 -04:00
Rich Geldreich f3f7f750bb Updating comment 2021-04-14 23:36:10 -04:00
flashk 1cd2b7506a Apply swizzle to user supplied mipmaps 2021-04-14 10:37:16 -07:00
Rich Geldreich ee626cec19 Adding initial support for user-provided mipmaps. This isn't hooked up to the command line tool or the JS wrappers yet. 2021-04-13 22:48:01 -04:00
Rich Geldreich 48a5914a73 - Fixing ETC1S backend endpoint palette related bug that was causing a CRC check to fail on the decompressed data during compression.
- Fixing -etc1_only option so it doesn't write uncompressed image formats.
2021-04-13 14:58:28 -04:00
Rich Geldreich 5f98685bb9 Fixing gcc warning 2021-04-12 23:39:49 -04:00
Rich Geldreich 3f168577bb Fixing gcc warning 2021-04-12 23:38:01 -04:00
Rich Geldreich ed135f03a0 Re-enabling the ktx2 mipPadding alignment workaround 2021-04-12 14:52:37 -04:00
Rich Geldreich 316a8de5f1 Fixing comment 2021-04-12 14:51:57 -04:00
Rich Geldreich cb6322848b Adding some macros to disable the KTX2 mipPadding alignment bug workaround, and to not write key value fields at all. 2021-04-12 14:47:15 -04:00
Rich Geldreich 7f0a00afe1 Adding KTX2 transcoding/encoding/decompression to PNG/KTX1 support to the transcoder, encoder, JavaScript wrappers. This is also adding Zstandard to the repo, which is optional. Set BASISD_SUPPORT_KTX2_ZSTD=0 when compiling the encoder/transcoder to disable it, or from cmake set KTX2_ZSTANDARD=FALSE. 2021-04-12 13:30:45 -04:00
Rich Geldreich 041ad47c27 - Global codebook related fixes
- Minor fix to basisu_frontend::optimize_selector_codebook() so the new_selector_cluster_indices array is initialized correctly. (The backend doesn't use this array so no harm was being done.)
2021-03-31 00:01:52 -04:00
Rich Geldreich bf13257528 Merge branch 'branch' 2021-03-30 14:53:22 -04:00
Rich Geldreich 053ed374b4 In progress global codebook changes 2021-03-30 14:51:26 -04:00
Rich Geldreich 2fd9aec037 Merge pull request #220 from JCash/basisu-min-max
Replaced std::min/std::max with basisu::minimum/basisu::maximum
2021-03-30 14:06:56 -04:00
JCash 2c0c038ffe Renamed to minimum/maximum 2021-03-30 19:17:50 +02:00
JCash 03cca3778e Replaced std::min/std::max with basisu::min/basisu::max
Removed use of NOMINMAX
2021-03-30 18:44:07 +02:00
Arseny Kapoulkine aee16b4eab Add two newlines at EOF to make the CI happy 2021-03-24 09:34:22 -07:00
Arseny Kapoulkine 950e452f7d Optimize find_optimal_selector_clusters_for_each_block
In find_optimal_selector_clusters_for_each_block, a noticeable amount of
time is spent computing color distances for pixels of different clusters.

Because for each pixel we only have 4 colors to compare against, we have
to compute a grand total of 64 unique color deltas; the cluster count,
however, is typically ~200 and we computed 16 deltas for each cluster.

It's thus cheaper to precompute all 64 deltas ahead of time and just add
the right deltas up for each cluster.

This reduces the time to encode a 2Kx2K image with a mip chain in a
single thread with SSE4.1 enabled from 7.8 seconds to 7.3 seconds; the
resulting image is binary identical before/after this change.
2021-03-24 09:12:31 -07:00
Rich Geldreich f035aa4ce3 Adding remark 2021-03-16 23:51:06 -04:00
Rich Geldreich d2454fb1da - Renaming some members to be more descriptive
- Fixing find_optimal_selector_clusters_for_each_block() so if some clusters don't get assigned any blocks during refinement the selector cluster block index array is still correctly sized.
2021-03-16 22:58:01 -04:00
Rich Geldreich 7fa283edb0 Fixing VS 2015 compilation issue 2021-03-16 21:31:17 -04:00
Rich Geldreich b5334deb8a Putting miniz into its own C++ namespace to fix clashes 2021-03-13 09:52:35 -05:00
Rich Geldreich 53264b1c28 New file 2021-03-09 11:02:48 -05:00
Rich Geldreich 2d4fe933b2 Basis Universal v1.13:
- Optimized ETC1S encoder (3-4.5x faster)
- Added optional SSE 4.1 support to encoder
- Switched from std::vector to a custom vector in the encoder and transcoder
- Added CppSPMD (SSE only for now)
- UASTC RDO is now more effective, but the command line parameter controlling qualiy has changed (to "lambda")
2021-03-09 11:00:25 -05:00
Rich Geldreich 4299495f77 New files 2021-03-09 10:58:57 -05:00
Rich Geldreich 465ca44f4c New files 2021-03-09 10:58:42 -05:00
Rich Geldreich ef70ddd7c9 Fixing missing newline at end of file 2020-12-21 18:47:43 -05:00
Rich Geldreich 85fa18ec94 Adding encoder WebAssembly support, encode_test sample
Encoder is now a library in the "encoder" directory
JavaScript wrappers now expose the entire codec: encoder, transcoder, container independent transcoding, and .basis file information
2020-12-17 14:26:28 -05:00
Rich Geldreich e88073088d Missing file 2020-12-17 13:59:00 -05:00
Rich Geldreich 62539278e1 Moving encoder-related files to the "encoder" directory 2020-12-17 13:57:57 -05:00