Merge changes from The Witness.

src/bc6h/CMakeLists.txt

@@ -14,6 +14,7 @@ SET(BC6H_SRCS
 	zohtwo.cpp)
 
 ADD_LIBRARY(bc6h STATIC ${BC6H_SRCS})
+TARGET_LINK_LIBRARIES(bc6h nvcore nvmath)
 
 IF(NOT WIN32)
     IF(CMAKE_COMPILER_IS_GNUCXX)

src/bc6h/zoh_utils.cpp

@@ -37,7 +37,7 @@ int Utils::lerp(int a, int b, int i, int denom)
 	case 3:		denom *= 5; i *= 5;	// fall through to case 15
 	case 15:	weights = denom15_weights_64; break;
 	case 7:		weights = denom7_weights_64; break;
-	default:	nvDebugCheck(0);
+	default:	nvUnreachable();
 	}
 
 	return (a*weights[denom-i] +b*weights[i] + round) >> shift;

src/bc6h/zohone.cpp

@@ -584,7 +584,7 @@ static void optimize_endpts(const Tile &tile, int shapeindex, const float orig_e
 {
     Vector3 pixels[Tile::TILE_TOTAL];
     float importance[Tile::TILE_TOTAL];
-    float err = 0;
+    //float err = 0;
 
     for (int region=0; region<NREGIONS_ONE; ++region)
     {

src/bc6h/zohtwo.cpp

@@ -672,7 +672,7 @@ static void optimize_endpts(const Tile &tile, int shapeindex, const float orig_e
 {
     Vector3 pixels[Tile::TILE_TOTAL];
     float importance[Tile::TILE_TOTAL];
-    float err = 0;
+    //float err = 0;
 
     for (int region=0; region<NREGIONS_TWO; ++region)
     {