mirrors-yuzu-emu/FasTC
1
0
Fork 0
mirror of https://github.com/yuzu-emu/FasTC synced 2024-11-26 09:08:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Formatting

Browse source
This commit is contained in:
Pavel Krajcevski 2014-03-25 16:23:04 -04:00
parent 7af6cca4d5
commit 6012b53cdb
1 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
BPTCEncoder/src/RGBAEndpoints.cpp
View file

@ -147,27 +147,9 @@ static inline void clamp(ty &x, const ty &min, const ty &max) {
// absolute distance. It turns out the compiler does a much // absolute distance. It turns out the compiler does a much
// better job of optimizing this than we can, since we can't // better job of optimizing this than we can, since we can't
// translate the values to/from registers // translate the values to/from registers
static uint8 sad(uint8 a, uint8 b) { template <typename ty>
#if 0 static ty sad(ty a, ty b) {
__asm
{
movzx eax, a
movzx ecx, b
sub eax, ecx
jns done
neg eax
done:
}
#else
//const INT d = a - b;
//const INT mask = d >> 31;
//return (d ^ mask) - mask;
// return abs(a - b);
return (a > b)? a - b : b - a; return (a > b)? a - b : b - a;
#endif
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -211,7 +193,7 @@ uint8 QuantizeChannel(const uint8 val, const uint8 mask, const int pBit) {
lval |= lval >> prec; lval |= lval >> prec;
hval |= hval >> prec; hval |= hval >> prec;
if(sad(val, lval) < sad(val, hval)) if(sad<uint8>(val, lval) < sad<uint8>(val, hval))
return lval; return lval;
else else
return hval; return hval;
@ -264,8 +246,8 @@ double RGBACluster::QuantizedError(
qp2 = p2.ToPixel(bitMask); qp2 = p2.ToPixel(bitMask);
} }
uint8 *pqp1 = (uint8 *)&qp1; const uint8 *pqp1 = reinterpret_cast<const uint8 *>(&qp1);
uint8 *pqp2 = (uint8 *)&qp2; const uint8 *pqp2 = reinterpret_cast<const uint8 *>(&qp2);
const RGBAVector metric = errorMetricVec; const RGBAVector metric = errorMetricVec;
@ -284,8 +266,8 @@ double RGBACluster::QuantizedError(
RGBAVector errorVec (0.0f); RGBAVector errorVec (0.0f);
for(uint32 k = 0; k < kNumColorChannels; k++) { for(uint32 k = 0; k < kNumColorChannels; k++) {
const uint8 ip = (((uint32(pqp1[k]) * interp0) + (uint32(pqp2[k]) * interp1) + 32) >> 6) & 0xFF; const uint32 ip = (((pqp1[k] * interp0) + (pqp2[k] * interp1) + 32) >> 6) & 0xFF;
const uint8 dist = sad(pb[k], ip); const uint8 dist = sad<uint8>(pb[k], ip);
errorVec[k] = static_cast<float>(dist) * metric[k]; errorVec[k] = static_cast<float>(dist) * metric[k];
} }