Merge changes from The Witness.

2015-03-24 12:14:49 -07:00
parent 7e2a9d1adb
commit a083337473
57 changed files with 2061 additions and 916 deletions
--- a/src/nvtt/CompressorDX10.cpp
+++ b/src/nvtt/CompressorDX10.cpp
@ -85,6 +85,7 @@ void ProductionCompressorBC5::compressBlock(ColorBlock & src, nvtt::AlphaMode al
 }


+#if 0
 void ProductionCompressorBC5_Luma::compressBlock(ColorSet & set, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
 {
    BlockATI2 * block = new(output) BlockATI2;
@ -118,3 +119,4 @@ void ProductionCompressorBC5_Luma::compressBlock(ColorSet & set, nvtt::AlphaMode
    OptimalCompress::compressDXT5A(tmp, &block->y);
   
 }
+#endif // 0