concurrency experiments.

src/nvtt/CMakeLists.txt

@@ -1,41 +1,28 @@
 PROJECT(nvtt)
 
 ADD_SUBDIRECTORY(squish)
-ADD_SUBDIRECTORY(bc6h)
+#ADD_SUBDIRECTORY(bc6h)
 #ADD_SUBDIRECTORY(bc7)
 
 SET(NVTT_SRCS
-    nvtt.h
-    nvtt.cpp
-    Context.h
-    Context.cpp
-    nvtt_wrapper.h
-    nvtt_wrapper.cpp
+    nvtt.h nvtt.cpp
+    nvtt_wrapper.h nvtt_wrapper.cpp
+    ClusterFit.h ClusterFit.cpp
     Compressor.h
-    CompressorDXT.h
-    CompressorDXT.cpp
-    CompressorDX9.h
-    CompressorDX9.cpp
-    CompressorDX10.h
-    CompressorDX10.cpp
-    CompressorDX11.h
-    CompressorDX11.cpp
-    CompressorRGB.h
-    CompressorRGB.cpp
-    CompressorRGBE.h
-    CompressorRGBE.cpp
-    QuickCompressDXT.h
-    QuickCompressDXT.cpp
-    OptimalCompressDXT.h
-    OptimalCompressDXT.cpp
-    SingleColorLookup.h
-    SingleColorLookup.cpp
-    CompressionOptions.h
-    CompressionOptions.cpp
-    InputOptions.h
-    InputOptions.cpp
-    OutputOptions.h
-    OutputOptions.cpp
+    CompressorDXT.h CompressorDXT.cpp
+    CompressorDX9.h CompressorDX9.cpp
+    CompressorDX10.h CompressorDX10.cpp
+#    CompressorDX11.h CompressorDX11.cpp
+    CompressorRGB.h CompressorRGB.cpp
+    CompressorRGBE.h CompressorRGBE.cpp
+    Context.h Context.cpp
+    QuickCompressDXT.h QuickCompressDXT.cpp
+    OptimalCompressDXT.h OptimalCompressDXT.cpp
+    SingleColorLookup.h SingleColorLookup.cpp
+    CompressionOptions.h CompressionOptions.cpp
+    InputOptions.h InputOptions.cpp
+    OutputOptions.h OutputOptions.cpp
+    TaskDispatcher.h TaskDispatcher.cpp
     TexImage.h TexImage.cpp
     cuda/CudaUtils.h
     cuda/CudaUtils.cpp
@@ -62,7 +49,7 @@ ELSE(NVTT_SHARED)
     ADD_LIBRARY(nvtt ${NVTT_SRCS})
 ENDIF(NVTT_SHARED)
 
-TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvmath nvimage squish bc6h)
+TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvmath nvimage squish)
 
 INSTALL(TARGETS nvtt 
     RUNTIME DESTINATION bin