Merge changes from the witness.

2014-11-04 17:49:29 +00:00
parent 4cb60cc5ba
commit d019cd7080
86 changed files with 3534 additions and 882 deletions
--- a/src/nvtt/CompressorDX10.h
+++ b/src/nvtt/CompressorDX10.h
@ -58,6 +58,13 @@ namespace nv
 		virtual uint blockSize() const { return 16; }
 	};

+    struct ProductionCompressorBC5_Luma : public ColorSetCompressor
+	{
+		virtual void compressBlock(ColorSet & set, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output);
+		virtual uint blockSize() const { return 16; }
+	};
+
+
 } // nv namespace