Commit Graph

498 Commits

Author SHA1 Message Date
castano
5f8cd22cdb Merge changes from the-witness. 2011-01-08 04:54:06 +00:00
castano
a2f0e566c7 Use task dispatcher provided by user. 2010-12-10 10:29:04 +00:00
castano
a607aadf32 Reenable openmp task dispatcher. 2010-12-10 02:14:56 +00:00
castano
8d99f2c6c4 Add tbb code. 2010-12-09 20:57:41 +00:00
castano
f4cf5dd32c Experiments with microsoft concurrency runtime. 2010-12-09 00:37:34 +00:00
castano
f99761c813 Disable new experimental compressor. 2010-12-08 20:11:11 +00:00
castano
3ee2c39be4 Generate mipmaps until both extents are 1. Fixes issue 156. 2010-12-08 19:53:59 +00:00
castano
b2f59ea0d7 Fix memory overrun. 2010-12-06 19:28:44 +00:00
castano
96b757130d Fix build on powerpc/mac. 2010-11-26 07:20:23 +00:00
castano
c51f25f38d concurrency experiments. 2010-11-22 07:34:05 +00:00
castano
0bb3011f7f Add cluster fit implementation based on squish. 2010-11-12 03:35:28 +00:00
castano
23b140416a Work in progress. Experiment with lightmap compression. 2010-11-12 03:32:46 +00:00
castano
4cbf43165c Undo changes. 2010-11-11 19:53:45 +00:00
castano
d6f6c1f1d4 Undo changes. 2010-11-11 19:52:00 +00:00
castano
5cf219a22e Add perceptual color distance function. 2010-11-10 03:28:44 +00:00
castano
49482d1441 Work in progress.
Merging squish into nvtt. 
Using squish only to find endpoints, do discrete refinement afterwards.
2010-11-09 03:38:03 +00:00
castano
1d4a2ea710 Testsuite outputs graphs using google api. 2010-11-08 19:03:20 +00:00
castano
5f845513ee Fix msvc warnings and errors.
Test TexImage stuff more througly.
Test YCoCg and RGBM.
2010-11-06 02:34:34 +00:00
castano
c1204bfb66 Fix errors in new implementation of InputOptions.
Output cube map faces in DDS order. Fixes issue 147.
2010-11-05 00:36:50 +00:00
castano
5225f4810f Add stubs for quantization methods. 2010-11-03 18:53:51 +00:00
castano
1e2567e4a3 More work toward 2.1: Implement InputOptions using TexImage. 2010-11-03 18:31:16 +00:00
castano
188d5043d8 Use tabs. 2010-10-22 05:12:35 +00:00
castano
09e46ead48 Fix some messages. Add support for range scaling in TexImage. 2010-10-22 00:28:46 +00:00
castano
bd74a9ffc6 Merge changes from the-witness. 2010-10-21 18:44:10 +00:00
castano
5d498d6824 Fix cuda compressor. Start work on new UI. 2010-10-18 08:47:50 +00:00
castano
df13c904b2 Stop using custom memory allocators.
Fix aliasing errors. Fixes issue 139 in trunk.
Fix build errors under OSX.
2010-10-06 02:56:35 +00:00
castano
765a89951d tabs -> spaces 2010-09-20 06:59:24 +00:00
castano
276c608f26 Fix alignment assumptions in DDS loading code. Fixes issue 132.
Merge misc changes from the-witness.
2010-09-07 18:24:50 +00:00
castano
e8dc679874 Merge recent changes from the witness. 2010-08-31 01:39:08 +00:00
castano
47e8f23e9f Merge fix for issue 134 into trunk. 2010-08-26 16:46:03 +00:00
castano
9e881f28d1 Merge changes from the-witness.
Fix DXT5n compressor.
2010-07-22 10:25:14 +00:00
castano
ac7c017c35 DXT1a single color compressor. Fixes issue 131.
Init single color tables at startup.
2010-07-22 09:23:17 +00:00
castano
9094756997 Merge changes from the witness. 2010-07-13 03:08:45 +00:00
castano
50d80e3b81 Add simple dds file viewer. 2010-07-01 00:26:37 +00:00
castano
1e0dea0738 Fix build. Minor cleanups. 2010-06-24 07:45:39 +00:00
castano
cfdc731634 Write BC6/BC7 headers in TexImage path. 2010-06-24 07:32:17 +00:00
castano
528b93ab14 Replace tabs with spaces. 2010-06-24 07:17:36 +00:00
castano
39c291e2a6 Fix build. 2010-06-24 07:10:34 +00:00
castano
5c60989043 BC6/7 progress. Work in progress. 2010-06-21 22:23:28 +00:00
castano
f9753b649a Fix mingw warning. 2010-06-10 02:30:38 +00:00
castano
11411bae2b Do not compile ui. 2010-06-10 02:30:25 +00:00
castano
42a641f0a5 Fix errors when cuda is not enabled. 2010-06-10 02:30:01 +00:00
castano
b19cd63558 Fix mingw error. 2010-06-10 02:29:04 +00:00
castano
5bb6a54f61 Fix mingw errors/warnings. 2010-06-10 02:28:49 +00:00
castano
322dcd72c1 Some bug fixes and more progress toward BC6-7 support. 2010-06-03 07:58:03 +00:00
castano
68cbe543b0 Add missing files for previous change.
Some cleanup.
2010-06-03 07:07:37 +00:00
castano
f08e2c4f64 Add alpha map processor. 2010-06-03 05:49:04 +00:00
castano
e5ffd618f7 Replace tabs with spaces. 2010-06-03 00:32:49 +00:00
castano
f233188963 Fix format. 2010-06-01 19:25:49 +00:00
castano
c3bc24b165 Merge changes from 2.0. 2010-06-01 19:23:37 +00:00
castano
da503d2b3e Imperative api is sort of working now. Fixed various bugs. 2010-06-01 02:04:33 +00:00
castano
4b08c20b0e More cleanup. 2010-05-31 08:13:23 +00:00
castano
c8bf853ba4 More cleanup. 2010-05-31 07:41:01 +00:00
castano
8e074b2e28 Remove executable properties. Add cmake file. 2010-05-30 05:43:14 +00:00
castano
757e372726 Integrate bc6 compressor into nvtt. 2010-05-30 05:40:29 +00:00
castano
cf2b20dd43 Fix build error on OSX. 2010-05-29 05:33:28 +00:00
castano
fd6b8449bf Add bc6 and bc7 compressors from nvidia. 2010-05-29 02:47:57 +00:00
castano
035231a928 Minor changes. 2010-05-28 23:16:06 +00:00
castano
1454cbac14 Fix build. 2010-05-28 07:45:11 +00:00
castano
8cbd2c9ec6 Add mipmap scaling according to alphatest coverage. 2010-05-27 00:37:15 +00:00
castano
77bfabca3b Remove experimental callback mechanism. 2010-05-20 05:25:50 +00:00
castano
27f84c5caa Start work on a simple dds viewer. 2010-05-20 05:25:15 +00:00
castano
a32d780347 Experiment with output callbacks instead of handlers. 2010-05-18 17:13:30 +00:00
castano
d38b89edc7 fix comment. 2010-05-18 17:12:36 +00:00
castano
0322f1b54a Add comment. 2010-05-18 17:12:01 +00:00
castano
639f11d0b9 Use the same defaults as nvtt 2.0 2010-05-11 17:18:08 +00:00
castano
85db14f213 Add vertical flip. 2010-05-05 00:24:31 +00:00
castano
ac5f849e91 Better estimation of principle component. Fixes issue 120. 2010-04-19 18:41:42 +00:00
castano
4783d5621e Add missing files to cmake build as reported by amorilia. 2010-03-21 18:38:26 +00:00
castano
f436a71479 Add support for RGBE. 2010-03-17 07:55:03 +00:00
castano
78b55e1e37 Finish pixel format converter. 2010-03-17 02:25:06 +00:00
castano
3b0e0c3402 Fix errors after merge. Update cmake files. 2010-03-16 22:46:09 +00:00
castano
a19e25228f reorg. 2010-03-16 22:37:25 +00:00
castano
d8ed531e4c minor optimization. 2010-03-16 22:36:14 +00:00
castano
1fafffd8af Detect OpenMP properly. 2010-03-16 22:31:27 +00:00
castano
0e5a1877a8 Some progress on the CUDA compressors. 2009-11-05 09:27:03 +00:00
castano
dfe081d32a Update messages. 2009-11-03 23:27:24 +00:00
castano
bcf0df2b49 use default pixel format, add comment to indicate where to change default 2009-10-30 01:05:31 +00:00
castano
8c7f54056c Add more todo items.
Delete images more efficiently?
2009-10-21 19:20:30 +00:00
castano
34cd266d8c Add todo item to perform color transforms before compression. 2009-10-21 19:19:09 +00:00
castano
8820c43175 Large refactoring of compressor codes:
- Define compressor interface.
- Implement compressor interface for different compressors.
- Add parallel compressor using OpenMP. Experimental.
- Add generic GPU compressor, so far only DXT1 enabled.
2009-10-21 07:48:27 +00:00
castano
18a3abf794 Enable alpha dithering when using DXT3.
Update timing message.
2009-10-21 07:43:24 +00:00
castano
384f74ba39 Use minimal set by default. 2009-10-21 07:42:33 +00:00
castano
7d75840398 Add todo messages.
Use DXT3 nvidia decoder if requested.
2009-10-21 07:42:08 +00:00
castano
ea7dabc6b1 Add comment. 2009-10-19 05:42:27 +00:00
castano
0878c0e967 Add expand and pack normal methods.
Set normal map flag.
2009-10-18 20:04:39 +00:00
castano
c1f9c4df42 Create default output handle on setFileName to avoid modifying const argument.
Fix ref counting errors in TexImage.
Format TODO messages.
2009-10-18 08:09:20 +00:00
castano
18474cdb33 Some more progress towards 2.1:
- Add raw input methods in context.
- Implement some of the TexImage input methods in context.
- Add output header context method for TexImage.
2009-10-12 07:56:02 +00:00
castano
9de3298d6b Fix cmake build. 2009-10-11 23:51:22 +00:00
castano
568f34d838 Fix color weighted compression for single color blocks. Fixes issue 96. 2009-09-21 18:46:48 +00:00
castano
e38e584db2 Rename texture to teximage. 2009-09-14 22:43:53 +00:00
castano
8655259379 Fix comment. 2009-08-26 01:27:50 +00:00
castano
cb62c3c461 Add support for R16 in DDS headers.
Cleanup DDS header output code.
Temporary testing code added to nvcompress.
2009-07-28 08:05:23 +00:00
castano
126816ef72 Experimental quality improvements and speed optimizations. 2009-07-06 09:08:09 +00:00
castano
b839b873e1 Remove commented out code. 2009-07-06 09:06:17 +00:00
castano
ab473f4ec5 Add DXT5 tests.
Use timer class.
2009-07-06 09:05:54 +00:00
castano
f1ebbd4da6 Add more third-party compressors. 2009-07-06 09:04:29 +00:00
castano
ac79935c88 Init default values. 2009-07-06 09:03:12 +00:00
castano
2aca4673ab Some progress implementing new api. 2009-07-06 09:02:20 +00:00
castano
60022acaa7 Add dxt5 tests to testsuite. 2009-07-04 19:34:42 +00:00
castano
a5faf51738 Add simd power solver. 2009-07-04 19:33:55 +00:00
castano
2d38f4fb2c Update cmake scripts to use new FindCUDA package. 2009-06-26 06:34:19 +00:00
castano
71f29a27f3 Fix error in zero padding. 2009-06-13 14:18:31 +00:00
castano
720be412fa Return correct error codes. Fix issue 92. 2009-06-13 14:17:46 +00:00
castano
782a127071 Add alpha flag to DXT1a files. 2009-04-16 20:06:08 +00:00
castano
53265596a3 Update nvtt wrapper. 2009-04-03 21:37:50 +00:00
castano
ae24cb163d Remove msvc warnings. 2009-04-01 07:17:25 +00:00
castano
5ac76b68c9 Add option to select decompression algorithm to test suite. 2009-03-24 17:35:40 +00:00
castano
0a8de141a6 Fix errors on win32. Define function pointers properly. 2009-03-21 07:43:15 +00:00
castano
974cacda5f Update single color compression tables. 2009-03-19 10:00:43 +00:00
castano
953a63d7b5 Add farbrausch images to testsuite. 2009-03-19 10:00:26 +00:00
castano
35ff0e5aa6 Remove verbose error checking. 2009-03-18 05:51:15 +00:00
castano
8529dcf755 Fix memory leaks.
Shutdown CUDA properly when nvtt context is destroyed.
Fixes issue 83.
2009-03-18 05:46:53 +00:00
castano
56543e1a92 Merge changes from 2.0 2009-03-18 04:05:39 +00:00
castano
be12367910 fix blend, add setborder and fill methods. 2009-03-16 09:05:32 +00:00
castano
c59a2e0a4b Implement alpha premultiplication and color blending. 2009-03-16 08:54:43 +00:00
castano
0abec17ab4 Implement toGreyScale.
Skip undefined images.
2009-03-16 08:47:20 +00:00
castano
6b67f4a0d7 More progress with imperative api.
Rename Texture to TexImage.
Implement image initialization.
Add stubs for all methods.
2009-03-16 08:37:07 +00:00
castano
50b8b67185 Hide file format especific savers. Add generic image saver.
Misc fixes under OSX.
2009-03-15 10:18:54 +00:00
castano
ab73c790e1 Testsuite cleanups and improvements.
Add ctest support.
Add FileSystem::changeDirectory method.
2009-03-14 07:27:25 +00:00
castano
d99cf11e2e Update version checking code. 2009-03-14 03:30:20 +00:00
castano
d9832ed22c Eliminate some warnings with MSVC. 2009-03-14 03:29:43 +00:00
castano
a02649faa9 Fallback to CPU compressor only on smaller images. 2009-03-14 03:29:14 +00:00
castano
a28ebb4ccf Some more progress in the imperative API. 2009-03-07 07:14:00 +00:00
castano
0f5a5e5d24 Some more progress in the imperative API. 2009-03-05 05:34:28 +00:00
castano
5943e8f42f Fix errors on ibook G4. 2009-03-04 07:04:32 +00:00
castano
e48f56a15e Includer project headers first. 2009-03-02 09:21:48 +00:00
castano
25e32c8ff2 Fix msvc warnings. 2009-03-02 09:21:30 +00:00
castano
db63ba7fa4 Fix build in win64. 2009-03-02 09:21:07 +00:00
castano
3df66be089 Do not use CUDA to compress small mipmaps. 2009-03-02 09:09:05 +00:00
castano
3a52923697 Add alpha command line option. 2009-03-02 09:07:07 +00:00
castano
9953883d26 Cleanup cmake files. 2009-03-02 07:32:00 +00:00
castano
88fc5ca18e Merge changes from private tree.
Eliminate files that are not needed for NVTT.
2009-03-01 00:18:47 +00:00
castano
9d5242594b Add gnome thumbnailer by Frank Richter. Fixes issue 82. 2009-02-03 09:29:25 +00:00
castano
17790a34df Add support for PNG in nvdecompress. Patch by Frank Richter. Fixes issue 80. 2009-02-03 09:08:39 +00:00
castano
8fa870bf0c Fix typo. Fixes issue 82. 2009-02-03 08:02:20 +00:00
castano
242aa4254e Use alpha-aware resize when alpha is used for transparency and it's not premultiplied. 2009-01-28 10:58:57 +00:00
castano
f92a2191f2 Print message when cuda acceleration enabled. 2009-01-20 10:43:56 +00:00
castano
49409e9d92 Cleanup color rounding and expansion. 2009-01-19 10:42:31 +00:00
castano
2ad15489bb Try to optimize color rounding and expansion.
Detect CUDA 2.1 properly.
2009-01-19 09:54:43 +00:00
castano
94357626f7 Merge fixes from 2.0 branch. 2009-01-10 01:31:02 +00:00
castano
19342d8adf Use timer class instead of clock.
Check that file exists before opening.
2009-01-09 05:46:24 +00:00
castano
508f9fbdc2 Start implementing experimental interface. 2009-01-05 10:17:06 +00:00
castano
e965b0e4a9 Include correct headers. 2009-01-04 07:29:35 +00:00
castano
1975883bed Update after changes in nvcore. 2008-12-29 11:29:45 +00:00
castano
a03411e451 Check version properly. 2008-12-16 20:25:12 +00:00
castano
931580edc5 Include cuda runtime properly. 2008-12-09 11:26:08 +00:00
castano
fd2f5465f8 Do not use kahansum, that was stupid.
Include cuda runtime properly.
2008-12-09 11:25:46 +00:00
castano
127052f404 Use KahanSum to compute RMSE.
Fix typos.
2008-12-07 23:15:06 +00:00
castano
1ec115c7ec Cleanup 4 means compressor. 2008-11-24 10:35:07 +00:00
castano
a4f56b65b8 Add support for alpha modes in the CPU compressors. Fixes issue 30. 2008-11-24 10:34:16 +00:00
castano
4bbf5e96f4 Add squish external compressor.
Rename our squish version to nvsquish.
2008-11-23 08:59:56 +00:00
castano
f34b7ce84f Merge optimizations from squish. 2008-11-22 22:10:51 +00:00
castano
010905edd3 Fix tabs. 2008-11-22 22:10:11 +00:00
castano
7bb2d55d35 Create output directory. 2008-11-22 22:08:31 +00:00
castano
c05c4e155b Merge optimizations from official squish release. 2008-11-22 11:36:06 +00:00
castano
fd73484bfc Merge optimizations from official squish relese. 2008-11-22 11:35:13 +00:00
castano
f29d7dd938 Try using 4 means clustering. 2008-11-22 11:34:29 +00:00
castano
3a5dc4783a Add support for regressions. 2008-11-22 11:33:31 +00:00
castano
41f6e0ba73 Try 4-means. 2008-11-22 08:37:14 +00:00
castano
11073171a1 Rename stress to testsuite. Install target. 2008-11-22 08:36:55 +00:00
castano
0805832b44 Remove squish build and project files. 2008-11-22 08:36:17 +00:00
castano
e1916d43c8 Do not mix tabs and spaces. 2008-11-22 00:14:05 +00:00
castano
321f320bfb Do not print stupid messages. 2008-11-22 00:13:14 +00:00
castano
df32fedc7c Add command line options.
Reformat output for easier parsing.
2008-11-21 09:09:57 +00:00
castano
d9ca49cc5e Fix bug in dxt decompression.
Output files as TGA.
2008-11-21 08:06:25 +00:00
castano
56849b78ad Output compressed files. 2008-11-21 07:58:49 +00:00
castano
7486201a7e Fix bug in testsuite. 2008-11-21 07:45:09 +00:00
castano
1813624992 Modify stress test to compress a list of real images. 2008-11-21 07:38:12 +00:00
castano
5fa27adfcd Add custom error code and message for the case when container format does not support a certain output format. 2008-11-19 08:10:54 +00:00
castano
7df0885c4f Fix CUDA detection code on linux. 2008-11-14 01:15:36 +00:00
castano
1c5da0e341 Do not use cuda API when CUDA not found.
Fix end of lines.
2008-11-10 21:54:03 +00:00
castano
36ba75b598 Select fastest device. 2008-10-30 04:50:41 +00:00
castano
6d8a75462a Build nvtt as a shared library. 2008-10-16 22:22:45 +00:00
castano
cf18077eda Prevent missmatches between incompatible versions of the CUDA runtime and the CUDA driver. 2008-10-16 22:21:21 +00:00
castano
d01a5c1661 Workaround bug in CUDA runtime. When using CUDA 2.0, it's required to use a driver that supports CUDA 2.0. 2008-10-16 08:39:58 +00:00
castano
5234060618 Integrate branch 2.0 to trunk. 2008-10-15 07:16:57 +00:00
castano
cd59058fc2 Fix linux includes. 2008-10-05 19:17:59 +00:00
castano
db14e048e1 Fix errors in Green and Alpha optimal compressors. 2008-10-02 07:33:05 +00:00
castano
68be24bf00 Set correct DXT5n swizzle code.
Select swizzle codes in nvtt instead of nvimage.
2008-10-01 22:28:57 +00:00
castano
b284669993 Try some optimizations. 2008-10-01 22:28:01 +00:00
castano
2f6e885ced Add DXT1 compressor that uses texture to avoid CPU swizzling.
Fix errors under emulation.
Experiment with DXT5 compressor.
2008-10-01 22:24:53 +00:00
castano
13e2d2e447 Fix float support. 2008-08-20 22:32:54 +00:00
castano
16adf94635 Add support for floating point output formats.
Images are currently output in linear space, some color transforms not applied.
2008-07-31 09:55:22 +00:00
castano
e9002a7d86 Adding support for floating point input/output. Work in progress. 2008-07-31 02:04:44 +00:00
castano
bb5b02df0e Adding support for floating point images as input. 2008-07-29 08:56:40 +00:00
castano
02c3abb394 Fix color transforms. 2008-07-29 06:05:11 +00:00
castano
86ef67bbfa Fix error in input image transformation. 2008-07-29 05:45:35 +00:00
castano
c2508d9eeb Add option to use dds10 headers. 2008-07-29 02:31:57 +00:00
castano
96655b3e7c Work in progress:
- better support for DDS10 file format.
- support for RGBA pixel formats with more than 32 bits.
- support for pixel types other than UNORM.
2008-07-26 10:03:12 +00:00
castano
529c0075e1 do not compile mpeg tests. 2008-07-26 09:01:00 +00:00
castano
7394644719 Move ui to separate folder. 2008-07-05 09:10:00 +00:00
castano
756f12c994 Fix errors in color transforms.
Add support for color offsets.
Add support for special swizzles that select default const values.
2008-06-30 10:59:57 +00:00
castano
206bfcf0f3 reorg included files 2008-06-28 08:40:32 +00:00
castano
c08acc8a71 Add single color compressor to optimal green compressor.
Improve quality of DXT1 green compressor increasing search range.
2008-06-28 02:50:09 +00:00
castano
f412ec8efb Fix assertion. 2008-06-26 07:23:31 +00:00
castano
a1a34f546f Do not compile nvmpegenc. 2008-06-26 07:23:09 +00:00
castano
82bed4ac9a Eliminate warning. 2008-06-19 10:01:56 +00:00
castano
b8a9395117 Fix end of lines. 2008-06-19 09:53:09 +00:00
castano
6befe3505c Enable Qt ui with win32/msvc. 2008-06-19 00:35:47 +00:00