From ef2a370fc647d3c8bc9f7d2793751387f38573ac Mon Sep 17 00:00:00 2001
From: Pavel Krajcevski <pavel@cs.unc.edu>
Date: Thu, 13 Sep 2012 16:57:36 -0400
Subject: [PATCH] Move error metric to regular BC7Compressor so that we can use
 it even if we can't use SIMD.

---
 BPTCEncoder/src/BC7Compressor.cpp     | 17 +++++++++++++++++
 BPTCEncoder/src/BC7CompressorSIMD.cpp | 11 -----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/BPTCEncoder/src/BC7Compressor.cpp b/BPTCEncoder/src/BC7Compressor.cpp
index f85b8ea..453bfb3 100755
--- a/BPTCEncoder/src/BC7Compressor.cpp
+++ b/BPTCEncoder/src/BC7Compressor.cpp
@@ -29,6 +29,12 @@
 #include <cfloat>
 #include <ctime>
 
+#ifdef _MSC_VER
+#define ALIGN_SSE __declspec( align(16) )
+#else
+#define ALIGN_SSE __attribute__((aligned(16)))
+#endif
+
 static const uint32 kNumShapes2 = 64;
 static const uint16 kShapeMask2[kNumShapes2] = {
 	0xcccc, 0x8888, 0xeeee, 0xecc8, 0xc880, 0xfeec, 0xfec8, 0xec80,
@@ -1319,6 +1325,17 @@ double BC7CompressionMode::Compress(BitStream &stream, const int shapeIdx, const
 
 namespace BC7C
 {
+	static ErrorMetric gErrorMetric = eErrorMetric_Uniform;
+	void SetErrorMetric(ErrorMetric e) { gErrorMetric = e; }
+
+	ALIGN_SSE const float kErrorMetrics[kNumErrorMetrics][kNumColorChannels] = {
+		{ 1.0f, 1.0f, 1.0f, 1.0f },
+		{ sqrtf(0.3f), sqrtf(0.56f), sqrtf(0.11f), 1.0f }
+	};
+
+	const float *GetErrorMetric() { return kErrorMetrics[GetErrorMetricEnum()]; }
+	ErrorMetric GetErrorMetricEnum() { return gErrorMetric; }
+
 	// Function prototypes
 	static void ExtractBlock(const uint8* inPtr, int width, uint32* colorBlock);
 	static void CompressBC7Block(const uint32 *block, uint8 *outBuf);
diff --git a/BPTCEncoder/src/BC7CompressorSIMD.cpp b/BPTCEncoder/src/BC7CompressorSIMD.cpp
index 4b1ea0c..a060fa2 100755
--- a/BPTCEncoder/src/BC7CompressorSIMD.cpp
+++ b/BPTCEncoder/src/BC7CompressorSIMD.cpp
@@ -903,17 +903,6 @@ double BC7CompressionModeSIMD::Compress(BitStream &stream, const int shapeIdx, c
 
 namespace BC7C
 {
-	static ErrorMetric gErrorMetric = eErrorMetric_Uniform;
-	void SetErrorMetric(ErrorMetric e) { gErrorMetric = e; }
-
-	ALIGN_SSE const float kErrorMetrics[kNumErrorMetrics][kNumColorChannels] = {
-		{ 1.0f, 1.0f, 1.0f, 1.0f },
-		{ sqrtf(0.3f), sqrtf(0.56f), sqrtf(0.11f), 1.0f }
-	};
-
-	const float *GetErrorMetric() { return kErrorMetrics[GetErrorMetricEnum()]; }
-	ErrorMetric GetErrorMetricEnum() { return gErrorMetric; }
-
 	// Function prototypes
 	static void ExtractBlock(const uint8* inPtr, int width, uint32* colorBlock);
 	static void CompressBC7Block(const uint32 *block, uint8 *outBuf);