yuzu/FasTC
1
0
Fork 0
mirror of https://github.com/yuzu-emu/FasTC.git synced 2025-01-24 00:31:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move error metric to regular BC7Compressor so that we can use it even if we can't use SIMD.

Browse source
This commit is contained in:
Pavel Krajcevski 2012-09-13 16:57:36 -04:00
parent 47fbfa1615
commit ef2a370fc6
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
BPTCEncoder/src/BC7Compressor.cpp
View file

@ -29,6 +29,12 @@
#include <cfloat> #include <cfloat>
#include <ctime> #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 uint32 kNumShapes2 = 64;
static const uint16 kShapeMask2[kNumShapes2] = { static const uint16 kShapeMask2[kNumShapes2] = {
0xcccc, 0x8888, 0xeeee, 0xecc8, 0xc880, 0xfeec, 0xfec8, 0xec80, 0xcccc, 0x8888, 0xeeee, 0xecc8, 0xc880, 0xfeec, 0xfec8, 0xec80,
@ -1319,6 +1325,17 @@ double BC7CompressionMode::Compress(BitStream &stream, const int shapeIdx, const
namespace BC7C 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 // Function prototypes
static void ExtractBlock(const uint8* inPtr, int width, uint32* colorBlock); static void ExtractBlock(const uint8* inPtr, int width, uint32* colorBlock);
static void CompressBC7Block(const uint32 *block, uint8 *outBuf); static void CompressBC7Block(const uint32 *block, uint8 *outBuf);

11
BPTCEncoder/src/BC7CompressorSIMD.cpp
View file

@ -903,17 +903,6 @@ double BC7CompressionModeSIMD::Compress(BitStream &stream, const int shapeIdx, c
namespace BC7C 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 // Function prototypes
static void ExtractBlock(const uint8* inPtr, int width, uint32* colorBlock); static void ExtractBlock(const uint8* inPtr, int width, uint32* colorBlock);
static void CompressBC7Block(const uint32 *block, uint8 *outBuf); static void CompressBC7Block(const uint32 *block, uint8 *outBuf);