godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-26 15:46:23 +00:00
Code Releases Wiki Activity

squish: Update to upstream 1.14

Browse Source 
Sources are untouched, tarball from https://sourceforge.net/projects/libsquish

(cherry picked from commit 249836e530)
This commit is contained in:
Rémi Verschelde
2016-10-13 21:52:16 +02:00
parent 1022705707
commit 8263fca121
25 changed files with 3912 additions and 3643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
thirdparty/README.md vendored
View File

@@ -150,9 +150,8 @@ Files extracted from upstream source:
## squish ## squish
- Upstream: https://code.google.com/archive/p/libsquish - Upstream: https://sourceforge.net/projects/libsquish
and patches from https://github.com/Cavewhere/squish - Version: 1.14
- Version: 1.11
- License: MIT - License: MIT
Files extracted from upstream source: Files extracted from upstream source:

533
thirdparty/squish/alpha.cpp vendored
View File

@@ -1,29 +1,30 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#include "alpha.h" #include "alpha.h"
#include <climits> #include <climits>
#include <algorithm> #include <algorithm>
@@ -31,319 +32,319 @@ namespace squish {
static int FloatToInt( float a, int limit ) static int FloatToInt( float a, int limit )
{ {
// use ANSI round-to-zero behaviour to get round-to-nearest // use ANSI round-to-zero behaviour to get round-to-nearest
int i = ( int )( a + 0.5f ); int i = ( int )( a + 0.5f );
// clamp to the limit // clamp to the limit
if( i < 0 ) if( i < 0 )
i = 0; i = 0;
else if( i > limit ) else if( i > limit )
i = limit; i = limit;
// done // done
return i; return i;
} }
void CompressAlphaDxt3( u8 const* rgba, int mask, void* block ) void CompressAlphaDxt3( u8 const* rgba, int mask, void* block )
{ {
u8* bytes = reinterpret_cast< u8* >( block ); u8* bytes = reinterpret_cast< u8* >( block );
// quantise and pack the alpha values pairwise // quantise and pack the alpha values pairwise
for( int i = 0; i < 8; ++i ) for( int i = 0; i < 8; ++i )
{ {
// quantise down to 4 bits // quantise down to 4 bits
float alpha1 = ( float )rgba[8*i + 3] * ( 15.0f/255.0f ); float alpha1 = ( float )rgba[8*i + 3] * ( 15.0f/255.0f );
float alpha2 = ( float )rgba[8*i + 7] * ( 15.0f/255.0f ); float alpha2 = ( float )rgba[8*i + 7] * ( 15.0f/255.0f );
int quant1 = FloatToInt( alpha1, 15 ); int quant1 = FloatToInt( alpha1, 15 );
int quant2 = FloatToInt( alpha2, 15 ); int quant2 = FloatToInt( alpha2, 15 );
// set alpha to zero where masked // set alpha to zero where masked
int bit1 = 1 << ( 2*i ); int bit1 = 1 << ( 2*i );
int bit2 = 1 << ( 2*i + 1 ); int bit2 = 1 << ( 2*i + 1 );
if( ( mask & bit1 ) == 0 ) if( ( mask & bit1 ) == 0 )
quant1 = 0; quant1 = 0;
if( ( mask & bit2 ) == 0 ) if( ( mask & bit2 ) == 0 )
quant2 = 0; quant2 = 0;
// pack into the byte // pack into the byte
bytes[i] = ( u8 )( quant1 | ( quant2 << 4 ) ); bytes[i] = ( u8 )( quant1 | ( quant2 << 4 ) );
} }
} }
void DecompressAlphaDxt3( u8* rgba, void const* block ) void DecompressAlphaDxt3( u8* rgba, void const* block )
{ {
u8 const* bytes = reinterpret_cast< u8 const* >( block ); u8 const* bytes = reinterpret_cast< u8 const* >( block );
// unpack the alpha values pairwise // unpack the alpha values pairwise
for( int i = 0; i < 8; ++i ) for( int i = 0; i < 8; ++i )
{ {
// quantise down to 4 bits // quantise down to 4 bits
u8 quant = bytes[i]; u8 quant = bytes[i];
// unpack the values // unpack the values
u8 lo = quant & 0x0f; u8 lo = quant & 0x0f;
u8 hi = quant & 0xf0; u8 hi = quant & 0xf0;
// convert back up to bytes // convert back up to bytes
rgba[8*i + 3] = lo | ( lo << 4 ); rgba[8*i + 3] = lo | ( lo << 4 );
rgba[8*i + 7] = hi | ( hi >> 4 ); rgba[8*i + 7] = hi | ( hi >> 4 );
} }
} }
static void FixRange( int& min, int& max, int steps ) static void FixRange( int& min, int& max, int steps )
{ {
if( max - min < steps ) if( max - min < steps )
max = std::min( min + steps, 255 ); max = std::min( min + steps, 255 );
if( max - min < steps ) if( max - min < steps )
min = std::max( 0, max - steps ); min = std::max( 0, max - steps );
} }
static int FitCodes( u8 const* rgba, int mask, u8 const* codes, u8* indices ) static int FitCodes( u8 const* rgba, int mask, u8 const* codes, u8* indices )
{ {
// fit each alpha value to the codebook // fit each alpha value to the codebook
int err = 0; int err = 0;
for( int i = 0; i < 16; ++i ) for( int i = 0; i < 16; ++i )
{ {
// check this pixel is valid // check this pixel is valid
int bit = 1 << i; int bit = 1 << i;
if( ( mask & bit ) == 0 ) if( ( mask & bit ) == 0 )
{ {
// use the first code // use the first code
indices[i] = 0; indices[i] = 0;
continue; continue;
} }
// find the least error and corresponding index // find the least error and corresponding index
int value = rgba[4*i + 3]; int value = rgba[4*i + 3];
int least = INT_MAX; int least = INT_MAX;
int index = 0; int index = 0;
for( int j = 0; j < 8; ++j ) for( int j = 0; j < 8; ++j )
{ {
// get the squared error from this code // get the squared error from this code
int dist = ( int )value - ( int )codes[j]; int dist = ( int )value - ( int )codes[j];
dist *= dist; dist *= dist;
// compare with the best so far // compare with the best so far
if( dist < least ) if( dist < least )
{ {
least = dist; least = dist;
index = j; index = j;
} }
} }
// save this index and accumulate the error // save this index and accumulate the error
indices[i] = ( u8 )index; indices[i] = ( u8 )index;
err += least; err += least;
} }
// return the total error // return the total error
return err; return err;
} }
static void WriteAlphaBlock( int alpha0, int alpha1, u8 const* indices, void* block ) static void WriteAlphaBlock( int alpha0, int alpha1, u8 const* indices, void* block )
{ {
u8* bytes = reinterpret_cast< u8* >( block ); u8* bytes = reinterpret_cast< u8* >( block );
// write the first two bytes // write the first two bytes
bytes[0] = ( u8 )alpha0; bytes[0] = ( u8 )alpha0;
bytes[1] = ( u8 )alpha1; bytes[1] = ( u8 )alpha1;
// pack the indices with 3 bits each // pack the indices with 3 bits each
u8* dest = bytes + 2; u8* dest = bytes + 2;
u8 const* src = indices; u8 const* src = indices;
for( int i = 0; i < 2; ++i ) for( int i = 0; i < 2; ++i )
{ {
// pack 8 3-bit values // pack 8 3-bit values
int value = 0; int value = 0;
for( int j = 0; j < 8; ++j ) for( int j = 0; j < 8; ++j )
{ {
int index = *src++; int index = *src++;
value |= ( index << 3*j ); value |= ( index << 3*j );
} }
// store in 3 bytes // store in 3 bytes
for( int j = 0; j < 3; ++j ) for( int j = 0; j < 3; ++j )
{ {
int byte = ( value >> 8*j ) & 0xff; int byte = ( value >> 8*j ) & 0xff;
*dest++ = ( u8 )byte; *dest++ = ( u8 )byte;
} }
} }
} }
static void WriteAlphaBlock5( int alpha0, int alpha1, u8 const* indices, void* block ) static void WriteAlphaBlock5( int alpha0, int alpha1, u8 const* indices, void* block )
{ {
// check the relative values of the endpoints // check the relative values of the endpoints
if( alpha0 > alpha1 ) if( alpha0 > alpha1 )
{ {
// swap the indices // swap the indices
u8 swapped[16]; u8 swapped[16];
for( int i = 0; i < 16; ++i ) for( int i = 0; i < 16; ++i )
{ {
u8 index = indices[i]; u8 index = indices[i];
if( index == 0 ) if( index == 0 )
swapped[i] = 1; swapped[i] = 1;
else if( index == 1 ) else if( index == 1 )
swapped[i] = 0; swapped[i] = 0;
else if( index <= 5 ) else if( index <= 5 )
swapped[i] = 7 - index; swapped[i] = 7 - index;
else else
swapped[i] = index; swapped[i] = index;
} }
// write the block // write the block
WriteAlphaBlock( alpha1, alpha0, swapped, block ); WriteAlphaBlock( alpha1, alpha0, swapped, block );
} }
else else
{ {
// write the block // write the block
WriteAlphaBlock( alpha0, alpha1, indices, block ); WriteAlphaBlock( alpha0, alpha1, indices, block );
} }
} }
static void WriteAlphaBlock7( int alpha0, int alpha1, u8 const* indices, void* block ) static void WriteAlphaBlock7( int alpha0, int alpha1, u8 const* indices, void* block )
{ {
// check the relative values of the endpoints // check the relative values of the endpoints
if( alpha0 < alpha1 ) if( alpha0 < alpha1 )
{ {
// swap the indices // swap the indices
u8 swapped[16]; u8 swapped[16];
for( int i = 0; i < 16; ++i ) for( int i = 0; i < 16; ++i )
{ {
u8 index = indices[i]; u8 index = indices[i];
if( index == 0 ) if( index == 0 )
swapped[i] = 1; swapped[i] = 1;
else if( index == 1 ) else if( index == 1 )
swapped[i] = 0; swapped[i] = 0;
else else
swapped[i] = 9 - index; swapped[i] = 9 - index;
} }
// write the block // write the block
WriteAlphaBlock( alpha1, alpha0, swapped, block ); WriteAlphaBlock( alpha1, alpha0, swapped, block );
} }
else else
{ {
// write the block // write the block
WriteAlphaBlock( alpha0, alpha1, indices, block ); WriteAlphaBlock( alpha0, alpha1, indices, block );
} }
} }
void CompressAlphaDxt5( u8 const* rgba, int mask, void* block ) void CompressAlphaDxt5( u8 const* rgba, int mask, void* block )
{ {
// get the range for 5-alpha and 7-alpha interpolation // get the range for 5-alpha and 7-alpha interpolation
int min5 = 255; int min5 = 255;
int max5 = 0; int max5 = 0;
int min7 = 255; int min7 = 255;
int max7 = 0; int max7 = 0;
for( int i = 0; i < 16; ++i ) for( int i = 0; i < 16; ++i )
{ {
// check this pixel is valid // check this pixel is valid
int bit = 1 << i; int bit = 1 << i;
if( ( mask & bit ) == 0 ) if( ( mask & bit ) == 0 )
continue; continue;
// incorporate into the min/max // incorporate into the min/max
int value = rgba[4*i + 3]; int value = rgba[4*i + 3];
if( value < min7 ) if( value < min7 )
min7 = value; min7 = value;
if( value > max7 ) if( value > max7 )
max7 = value; max7 = value;
if( value != 0 && value < min5 ) if( value != 0 && value < min5 )
min5 = value; min5 = value;
if( value != 255 && value > max5 ) if( value != 255 && value > max5 )
max5 = value; max5 = value;
} }
// handle the case that no valid range was found // handle the case that no valid range was found
if( min5 > max5 ) if( min5 > max5 )
min5 = max5; min5 = max5;
if( min7 > max7 ) if( min7 > max7 )
min7 = max7; min7 = max7;
// fix the range to be the minimum in each case // fix the range to be the minimum in each case
FixRange( min5, max5, 5 ); FixRange( min5, max5, 5 );
FixRange( min7, max7, 7 ); FixRange( min7, max7, 7 );
// set up the 5-alpha code book // set up the 5-alpha code book
u8 codes5[8]; u8 codes5[8];
codes5[0] = ( u8 )min5; codes5[0] = ( u8 )min5;
codes5[1] = ( u8 )max5; codes5[1] = ( u8 )max5;
for( int i = 1; i < 5; ++i ) for( int i = 1; i < 5; ++i )
codes5[1 + i] = ( u8 )( ( ( 5 - i )*min5 + i*max5 )/5 ); codes5[1 + i] = ( u8 )( ( ( 5 - i )*min5 + i*max5 )/5 );
codes5[6] = 0; codes5[6] = 0;
codes5[7] = 255; codes5[7] = 255;
// set up the 7-alpha code book // set up the 7-alpha code book
u8 codes7[8]; u8 codes7[8];
codes7[0] = ( u8 )min7; codes7[0] = ( u8 )min7;
codes7[1] = ( u8 )max7; codes7[1] = ( u8 )max7;
for( int i = 1; i < 7; ++i ) for( int i = 1; i < 7; ++i )
codes7[1 + i] = ( u8 )( ( ( 7 - i )*min7 + i*max7 )/7 ); codes7[1 + i] = ( u8 )( ( ( 7 - i )*min7 + i*max7 )/7 );
// fit the data to both code books // fit the data to both code books
u8 indices5[16]; u8 indices5[16];
u8 indices7[16]; u8 indices7[16];
int err5 = FitCodes( rgba, mask, codes5, indices5 ); int err5 = FitCodes( rgba, mask, codes5, indices5 );
int err7 = FitCodes( rgba, mask, codes7, indices7 ); int err7 = FitCodes( rgba, mask, codes7, indices7 );
// save the block with least error // save the block with least error
if( err5 <= err7 ) if( err5 <= err7 )
WriteAlphaBlock5( min5, max5, indices5, block ); WriteAlphaBlock5( min5, max5, indices5, block );
else else
WriteAlphaBlock7( min7, max7, indices7, block ); WriteAlphaBlock7( min7, max7, indices7, block );
} }
void DecompressAlphaDxt5( u8* rgba, void const* block ) void DecompressAlphaDxt5( u8* rgba, void const* block )
{ {
// get the two alpha values // get the two alpha values
u8 const* bytes = reinterpret_cast< u8 const* >( block ); u8 const* bytes = reinterpret_cast< u8 const* >( block );
int alpha0 = bytes[0]; int alpha0 = bytes[0];
int alpha1 = bytes[1]; int alpha1 = bytes[1];
// compare the values to build the codebook // compare the values to build the codebook
u8 codes[8]; u8 codes[8];
codes[0] = ( u8 )alpha0; codes[0] = ( u8 )alpha0;
codes[1] = ( u8 )alpha1; codes[1] = ( u8 )alpha1;
if( alpha0 <= alpha1 ) if( alpha0 <= alpha1 )
{ {
// use 5-alpha codebook // use 5-alpha codebook
for( int i = 1; i < 5; ++i ) for( int i = 1; i < 5; ++i )
codes[1 + i] = ( u8 )( ( ( 5 - i )*alpha0 + i*alpha1 )/5 ); codes[1 + i] = ( u8 )( ( ( 5 - i )*alpha0 + i*alpha1 )/5 );
codes[6] = 0; codes[6] = 0;
codes[7] = 255; codes[7] = 255;
} }
else else
{ {
// use 7-alpha codebook // use 7-alpha codebook
for( int i = 1; i < 7; ++i ) for( int i = 1; i < 7; ++i )
codes[1 + i] = ( u8 )( ( ( 7 - i )*alpha0 + i*alpha1 )/7 ); codes[1 + i] = ( u8 )( ( ( 7 - i )*alpha0 + i*alpha1 )/7 );
} }
// decode the indices // decode the indices
u8 indices[16]; u8 indices[16];
u8 const* src = bytes + 2; u8 const* src = bytes + 2;
u8* dest = indices; u8* dest = indices;
for( int i = 0; i < 2; ++i ) for( int i = 0; i < 2; ++i )
{ {
// grab 3 bytes // grab 3 bytes
int value = 0; int value = 0;
for( int j = 0; j < 3; ++j ) for( int j = 0; j < 3; ++j )
{ {
int byte = *src++; int byte = *src++;
value |= ( byte << 8*j ); value |= ( byte << 8*j );
} }
// unpack 8 3-bit values from it // unpack 8 3-bit values from it
for( int j = 0; j < 8; ++j ) for( int j = 0; j < 8; ++j )
{ {
int index = ( value >> 3*j ) & 0x7; int index = ( value >> 3*j ) & 0x7;
*dest++ = ( u8 )index; *dest++ = ( u8 )index;
} }
} }
// write out the indexed codebook values // write out the indexed codebook values
for( int i = 0; i < 16; ++i ) for( int i = 0; i < 16; ++i )
rgba[4*i + 3] = codes[indices[i]]; rgba[4*i + 3] = codes[indices[i]];
} }
} // namespace squish } // namespace squish

36
thirdparty/squish/alpha.h vendored
View File

@@ -1,32 +1,32 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#ifndef SQUISH_ALPHA_H #ifndef SQUISH_ALPHA_H
#define SQUISH_ALPHA_H #define SQUISH_ALPHA_H
#include <squish.h> #include "squish.h"
namespace squish { namespace squish {

617
thirdparty/squish/clusterfit.cpp vendored
View File

@@ -1,26 +1,26 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Copyright (c) 2007 Ignacio Castano icastano@nvidia.com Copyright (c) 2007 Ignacio Castano icastano@nvidia.com
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
@@ -31,363 +31,362 @@
namespace squish { namespace squish {
ClusterFit::ClusterFit( ColourSet const* colours, int flags ) ClusterFit::ClusterFit( ColourSet const* colours, int flags, float* metric )
: ColourFit( colours, flags ) : ColourFit( colours, flags )
{ {
// set the iteration count // set the iteration count
m_iterationCount = ( m_flags & kColourIterativeClusterFit ) ? kMaxIterations : 1; m_iterationCount = ( m_flags & kColourIterativeClusterFit ) ? kMaxIterations : 1;
// initialise the best error // initialise the metric (old perceptual = 0.2126f, 0.7152f, 0.0722f)
m_besterror = VEC4_CONST( FLT_MAX ); if( metric )
m_metric = Vec4( metric[0], metric[1], metric[2], 1.0f );
else
m_metric = VEC4_CONST( 1.0f );
// initialise the metric // initialise the best error
bool perceptual = ( ( m_flags & kColourMetricPerceptual ) != 0 ); m_besterror = VEC4_CONST( FLT_MAX );
if( perceptual )
m_metric = Vec4( 0.2126f, 0.7152f, 0.0722f, 0.0f );
else
m_metric = VEC4_CONST( 1.0f );
// cache some values // cache some values
int const count = m_colours->GetCount(); int const count = m_colours->GetCount();
Vec3 const* values = m_colours->GetPoints(); Vec3 const* values = m_colours->GetPoints();
// get the covariance matrix // get the covariance matrix
Sym3x3 covariance = ComputeWeightedCovariance( count, values, m_colours->GetWeights() ); Sym3x3 covariance = ComputeWeightedCovariance( count, values, m_colours->GetWeights() );
// compute the principle component // compute the principle component
m_principle = ComputePrincipleComponent( covariance ); m_principle = ComputePrincipleComponent( covariance );
} }
bool ClusterFit::ConstructOrdering( Vec3 const& axis, int iteration ) bool ClusterFit::ConstructOrdering( Vec3 const& axis, int iteration )
{ {
// cache some values // cache some values
int const count = m_colours->GetCount(); int const count = m_colours->GetCount();
Vec3 const* values = m_colours->GetPoints(); Vec3 const* values = m_colours->GetPoints();
// build the list of dot products // build the list of dot products
float dps[16]; float dps[16];
u8* order = ( u8* )m_order + 16*iteration; u8* order = ( u8* )m_order + 16*iteration;
for( int i = 0; i < count; ++i ) for( int i = 0; i < count; ++i )
{ {
dps[i] = Dot( values[i], axis ); dps[i] = Dot( values[i], axis );
order[i] = ( u8 )i; order[i] = ( u8 )i;
} }
// stable sort using them // stable sort using them
for( int i = 0; i < count; ++i ) for( int i = 0; i < count; ++i )
{ {
for( int j = i; j > 0 && dps[j] < dps[j - 1]; --j ) for( int j = i; j > 0 && dps[j] < dps[j - 1]; --j )
{ {
std::swap( dps[j], dps[j - 1] ); std::swap( dps[j], dps[j - 1] );
std::swap( order[j], order[j - 1] ); std::swap( order[j], order[j - 1] );
} }
} }
// check this ordering is unique // check this ordering is unique
for( int it = 0; it < iteration; ++it ) for( int it = 0; it < iteration; ++it )
{ {
u8 const* prev = ( u8* )m_order + 16*it; u8 const* prev = ( u8* )m_order + 16*it;
bool same = true; bool same = true;
for( int i = 0; i < count; ++i ) for( int i = 0; i < count; ++i )
{ {
if( order[i] != prev[i] ) if( order[i] != prev[i] )
{ {
same = false; same = false;
break; break;
} }
} }
if( same ) if( same )
return false; return false;
} }
// copy the ordering and weight all the points // copy the ordering and weight all the points
Vec3 const* unweighted = m_colours->GetPoints(); Vec3 const* unweighted = m_colours->GetPoints();
float const* weights = m_colours->GetWeights(); float const* weights = m_colours->GetWeights();
m_xsum_wsum = VEC4_CONST( 0.0f ); m_xsum_wsum = VEC4_CONST( 0.0f );
for( int i = 0; i < count; ++i ) for( int i = 0; i < count; ++i )
{ {
int j = order[i]; int j = order[i];
Vec4 p( unweighted[j].X(), unweighted[j].Y(), unweighted[j].Z(), 1.0f ); Vec4 p( unweighted[j].X(), unweighted[j].Y(), unweighted[j].Z(), 1.0f );
Vec4 w( weights[j] ); Vec4 w( weights[j] );
Vec4 x = p*w; Vec4 x = p*w;
m_points_weights[i] = x; m_points_weights[i] = x;
m_xsum_wsum += x; m_xsum_wsum += x;
} }
return true; return true;
} }
void ClusterFit::Compress3( void* block ) void ClusterFit::Compress3( void* block )
{ {
// declare variables // declare variables
int const count = m_colours->GetCount(); int const count = m_colours->GetCount();
Vec4 const two = VEC4_CONST( 2.0 ); Vec4 const two = VEC4_CONST( 2.0 );
Vec4 const one = VEC4_CONST( 1.0f ); Vec4 const one = VEC4_CONST( 1.0f );
Vec4 const half_half2( 0.5f, 0.5f, 0.5f, 0.25f ); Vec4 const half_half2( 0.5f, 0.5f, 0.5f, 0.25f );
Vec4 const zero = VEC4_CONST( 0.0f ); Vec4 const zero = VEC4_CONST( 0.0f );
Vec4 const half = VEC4_CONST( 0.5f ); Vec4 const half = VEC4_CONST( 0.5f );
Vec4 const grid( 31.0f, 63.0f, 31.0f, 0.0f ); Vec4 const grid( 31.0f, 63.0f, 31.0f, 0.0f );
Vec4 const gridrcp( 1.0f/31.0f, 1.0f/63.0f, 1.0f/31.0f, 0.0f ); Vec4 const gridrcp( 1.0f/31.0f, 1.0f/63.0f, 1.0f/31.0f, 0.0f );
// prepare an ordering using the principle axis // prepare an ordering using the principle axis
ConstructOrdering( m_principle, 0 ); ConstructOrdering( m_principle, 0 );
// check all possible clusters and iterate on the total order // check all possible clusters and iterate on the total order
Vec4 beststart = VEC4_CONST( 0.0f ); Vec4 beststart = VEC4_CONST( 0.0f );
Vec4 bestend = VEC4_CONST( 0.0f ); Vec4 bestend = VEC4_CONST( 0.0f );
Vec4 besterror = m_besterror; Vec4 besterror = m_besterror;
u8 bestindices[16]; u8 bestindices[16];
int bestiteration = 0; int bestiteration = 0;
int besti = 0, bestj = 0; int besti = 0, bestj = 0;
// loop over iterations (we avoid the case that all points in first or last cluster) // loop over iterations (we avoid the case that all points in first or last cluster)
for( int iterationIndex = 0;; ) for( int iterationIndex = 0;; )
{ {
// first cluster [0,i) is at the start // first cluster [0,i) is at the start
Vec4 part0 = VEC4_CONST( 0.0f ); Vec4 part0 = VEC4_CONST( 0.0f );
for( int i = 0; i < count; ++i ) for( int i = 0; i < count; ++i )
{ {
// second cluster [i,j) is half along // second cluster [i,j) is half along
Vec4 part1 = ( i == 0 ) ? m_points_weights[0] : VEC4_CONST( 0.0f ); Vec4 part1 = ( i == 0 ) ? m_points_weights[0] : VEC4_CONST( 0.0f );
int jmin = ( i == 0 ) ? 1 : i; int jmin = ( i == 0 ) ? 1 : i;
for( int j = jmin;; ) for( int j = jmin;; )
{ {
// last cluster [j,count) is at the end // last cluster [j,count) is at the end
Vec4 part2 = m_xsum_wsum - part1 - part0; Vec4 part2 = m_xsum_wsum - part1 - part0;
// compute least squares terms directly // compute least squares terms directly
Vec4 alphax_sum = MultiplyAdd( part1, half_half2, part0 ); Vec4 alphax_sum = MultiplyAdd( part1, half_half2, part0 );
Vec4 alpha2_sum = alphax_sum.SplatW(); Vec4 alpha2_sum = alphax_sum.SplatW();
Vec4 betax_sum = MultiplyAdd( part1, half_half2, part2 ); Vec4 betax_sum = MultiplyAdd( part1, half_half2, part2 );
Vec4 beta2_sum = betax_sum.SplatW(); Vec4 beta2_sum = betax_sum.SplatW();
Vec4 alphabeta_sum = ( part1*half_half2 ).SplatW(); Vec4 alphabeta_sum = ( part1*half_half2 ).SplatW();
// compute the least-squares optimal points // compute the least-squares optimal points
Vec4 factor = Reciprocal( NegativeMultiplySubtract( alphabeta_sum, alphabeta_sum, alpha2_sum*beta2_sum ) ); Vec4 factor = Reciprocal( NegativeMultiplySubtract( alphabeta_sum, alphabeta_sum, alpha2_sum*beta2_sum ) );
Vec4 a = NegativeMultiplySubtract( betax_sum, alphabeta_sum, alphax_sum*beta2_sum )*factor; Vec4 a = NegativeMultiplySubtract( betax_sum, alphabeta_sum, alphax_sum*beta2_sum )*factor;
Vec4 b = NegativeMultiplySubtract( alphax_sum, alphabeta_sum, betax_sum*alpha2_sum )*factor; Vec4 b = NegativeMultiplySubtract( alphax_sum, alphabeta_sum, betax_sum*alpha2_sum )*factor;
// clamp to the grid // clamp to the grid
a = Min( one, Max( zero, a ) ); a = Min( one, Max( zero, a ) );
b = Min( one, Max( zero, b ) ); b = Min( one, Max( zero, b ) );
a = Truncate( MultiplyAdd( grid, a, half ) )*gridrcp; a = Truncate( MultiplyAdd( grid, a, half ) )*gridrcp;
b = Truncate( MultiplyAdd( grid, b, half ) )*gridrcp; b = Truncate( MultiplyAdd( grid, b, half ) )*gridrcp;
// compute the error (we skip the constant xxsum) // compute the error (we skip the constant xxsum)
Vec4 e1 = MultiplyAdd( a*a, alpha2_sum, b*b*beta2_sum ); Vec4 e1 = MultiplyAdd( a*a, alpha2_sum, b*b*beta2_sum );
Vec4 e2 = NegativeMultiplySubtract( a, alphax_sum, a*b*alphabeta_sum ); Vec4 e2 = NegativeMultiplySubtract( a, alphax_sum, a*b*alphabeta_sum );
Vec4 e3 = NegativeMultiplySubtract( b, betax_sum, e2 ); Vec4 e3 = NegativeMultiplySubtract( b, betax_sum, e2 );
Vec4 e4 = MultiplyAdd( two, e3, e1 ); Vec4 e4 = MultiplyAdd( two, e3, e1 );
// apply the metric to the error term // apply the metric to the error term
Vec4 e5 = e4*m_metric; Vec4 e5 = e4*m_metric;
Vec4 error = e5.SplatX() + e5.SplatY() + e5.SplatZ(); Vec4 error = e5.SplatX() + e5.SplatY() + e5.SplatZ();
// keep the solution if it wins // keep the solution if it wins
if( CompareAnyLessThan( error, besterror ) ) if( CompareAnyLessThan( error, besterror ) )
{ {
beststart = a; beststart = a;
bestend = b; bestend = b;
besti = i; besti = i;
bestj = j; bestj = j;
besterror = error; besterror = error;
bestiteration = iterationIndex; bestiteration = iterationIndex;
} }
// advance // advance
if( j == count ) if( j == count )
break; break;
part1 += m_points_weights[j]; part1 += m_points_weights[j];
++j; ++j;
} }
// advance // advance
part0 += m_points_weights[i]; part0 += m_points_weights[i];
} }
// stop if we didn't improve in this iteration // stop if we didn't improve in this iteration
if( bestiteration != iterationIndex ) if( bestiteration != iterationIndex )
break; break;
// advance if possible // advance if possible
++iterationIndex; ++iterationIndex;
if( iterationIndex == m_iterationCount ) if( iterationIndex == m_iterationCount )
break; break;
// stop if a new iteration is an ordering that has already been tried // stop if a new iteration is an ordering that has already been tried
Vec3 axis = ( bestend - beststart ).GetVec3(); Vec3 axis = ( bestend - beststart ).GetVec3();
if( !ConstructOrdering( axis, iterationIndex ) ) if( !ConstructOrdering( axis, iterationIndex ) )
break; break;
} }
// save the block if necessary // save the block if necessary
if( CompareAnyLessThan( besterror, m_besterror ) ) if( CompareAnyLessThan( besterror, m_besterror ) )
{ {
// remap the indices // remap the indices
u8 const* order = ( u8* )m_order + 16*bestiteration; u8 const* order = ( u8* )m_order + 16*bestiteration;
u8 unordered[16]; u8 unordered[16];
for( int m = 0; m < besti; ++m ) for( int m = 0; m < besti; ++m )
unordered[order[m]] = 0; unordered[order[m]] = 0;
for( int m = besti; m < bestj; ++m ) for( int m = besti; m < bestj; ++m )
unordered[order[m]] = 2; unordered[order[m]] = 2;
for( int m = bestj; m < count; ++m ) for( int m = bestj; m < count; ++m )
unordered[order[m]] = 1; unordered[order[m]] = 1;
m_colours->RemapIndices( unordered, bestindices ); m_colours->RemapIndices( unordered, bestindices );
// save the block // save the block
WriteColourBlock3( beststart.GetVec3(), bestend.GetVec3(), bestindices, block ); WriteColourBlock3( beststart.GetVec3(), bestend.GetVec3(), bestindices, block );
// save the error // save the error
m_besterror = besterror; m_besterror = besterror;
} }
} }
void ClusterFit::Compress4( void* block ) void ClusterFit::Compress4( void* block )
{ {
// declare variables // declare variables
int const count = m_colours->GetCount(); int const count = m_colours->GetCount();
Vec4 const two = VEC4_CONST( 2.0f ); Vec4 const two = VEC4_CONST( 2.0f );
Vec4 const one = VEC4_CONST( 1.0f ); Vec4 const one = VEC4_CONST( 1.0f );
Vec4 const onethird_onethird2( 1.0f/3.0f, 1.0f/3.0f, 1.0f/3.0f, 1.0f/9.0f ); Vec4 const onethird_onethird2( 1.0f/3.0f, 1.0f/3.0f, 1.0f/3.0f, 1.0f/9.0f );
Vec4 const twothirds_twothirds2( 2.0f/3.0f, 2.0f/3.0f, 2.0f/3.0f, 4.0f/9.0f ); Vec4 const twothirds_twothirds2( 2.0f/3.0f, 2.0f/3.0f, 2.0f/3.0f, 4.0f/9.0f );
Vec4 const twonineths = VEC4_CONST( 2.0f/9.0f ); Vec4 const twonineths = VEC4_CONST( 2.0f/9.0f );
Vec4 const zero = VEC4_CONST( 0.0f ); Vec4 const zero = VEC4_CONST( 0.0f );
Vec4 const half = VEC4_CONST( 0.5f ); Vec4 const half = VEC4_CONST( 0.5f );
Vec4 const grid( 31.0f, 63.0f, 31.0f, 0.0f ); Vec4 const grid( 31.0f, 63.0f, 31.0f, 0.0f );
Vec4 const gridrcp( 1.0f/31.0f, 1.0f/63.0f, 1.0f/31.0f, 0.0f ); Vec4 const gridrcp( 1.0f/31.0f, 1.0f/63.0f, 1.0f/31.0f, 0.0f );
// prepare an ordering using the principle axis // prepare an ordering using the principle axis
ConstructOrdering( m_principle, 0 ); ConstructOrdering( m_principle, 0 );
// check all possible clusters and iterate on the total order // check all possible clusters and iterate on the total order
Vec4 beststart = VEC4_CONST( 0.0f ); Vec4 beststart = VEC4_CONST( 0.0f );
Vec4 bestend = VEC4_CONST( 0.0f ); Vec4 bestend = VEC4_CONST( 0.0f );
Vec4 besterror = m_besterror; Vec4 besterror = m_besterror;
u8 bestindices[16]; u8 bestindices[16];
int bestiteration = 0; int bestiteration = 0;
int besti = 0, bestj = 0, bestk = 0; int besti = 0, bestj = 0, bestk = 0;
// loop over iterations (we avoid the case that all points in first or last cluster) // loop over iterations (we avoid the case that all points in first or last cluster)
for( int iterationIndex = 0;; ) for( int iterationIndex = 0;; )
{ {
// first cluster [0,i) is at the start // first cluster [0,i) is at the start
Vec4 part0 = VEC4_CONST( 0.0f ); Vec4 part0 = VEC4_CONST( 0.0f );
for( int i = 0; i < count; ++i ) for( int i = 0; i < count; ++i )
{ {
// second cluster [i,j) is one third along // second cluster [i,j) is one third along
Vec4 part1 = VEC4_CONST( 0.0f ); Vec4 part1 = VEC4_CONST( 0.0f );
for( int j = i;; ) for( int j = i;; )
{ {
// third cluster [j,k) is two thirds along // third cluster [j,k) is two thirds along
Vec4 part2 = ( j == 0 ) ? m_points_weights[0] : VEC4_CONST( 0.0f ); Vec4 part2 = ( j == 0 ) ? m_points_weights[0] : VEC4_CONST( 0.0f );
int kmin = ( j == 0 ) ? 1 : j; int kmin = ( j == 0 ) ? 1 : j;
for( int k = kmin;; ) for( int k = kmin;; )
{ {
// last cluster [k,count) is at the end // last cluster [k,count) is at the end
Vec4 part3 = m_xsum_wsum - part2 - part1 - part0; Vec4 part3 = m_xsum_wsum - part2 - part1 - part0;
// compute least squares terms directly // compute least squares terms directly
Vec4 const alphax_sum = MultiplyAdd( part2, onethird_onethird2, MultiplyAdd( part1, twothirds_twothirds2, part0 ) ); Vec4 const alphax_sum = MultiplyAdd( part2, onethird_onethird2, MultiplyAdd( part1, twothirds_twothirds2, part0 ) );
Vec4 const alpha2_sum = alphax_sum.SplatW(); Vec4 const alpha2_sum = alphax_sum.SplatW();
Vec4 const betax_sum = MultiplyAdd( part1, onethird_onethird2, MultiplyAdd( part2, twothirds_twothirds2, part3 ) ); Vec4 const betax_sum = MultiplyAdd( part1, onethird_onethird2, MultiplyAdd( part2, twothirds_twothirds2, part3 ) );
Vec4 const beta2_sum = betax_sum.SplatW(); Vec4 const beta2_sum = betax_sum.SplatW();
Vec4 const alphabeta_sum = twonineths*( part1 + part2 ).SplatW(); Vec4 const alphabeta_sum = twonineths*( part1 + part2 ).SplatW();
// compute the least-squares optimal points // compute the least-squares optimal points
Vec4 factor = Reciprocal( NegativeMultiplySubtract( alphabeta_sum, alphabeta_sum, alpha2_sum*beta2_sum ) ); Vec4 factor = Reciprocal( NegativeMultiplySubtract( alphabeta_sum, alphabeta_sum, alpha2_sum*beta2_sum ) );
Vec4 a = NegativeMultiplySubtract( betax_sum, alphabeta_sum, alphax_sum*beta2_sum )*factor; Vec4 a = NegativeMultiplySubtract( betax_sum, alphabeta_sum, alphax_sum*beta2_sum )*factor;
Vec4 b = NegativeMultiplySubtract( alphax_sum, alphabeta_sum, betax_sum*alpha2_sum )*factor; Vec4 b = NegativeMultiplySubtract( alphax_sum, alphabeta_sum, betax_sum*alpha2_sum )*factor;
// clamp to the grid // clamp to the grid
a = Min( one, Max( zero, a ) ); a = Min( one, Max( zero, a ) );
b = Min( one, Max( zero, b ) ); b = Min( one, Max( zero, b ) );
a = Truncate( MultiplyAdd( grid, a, half ) )*gridrcp; a = Truncate( MultiplyAdd( grid, a, half ) )*gridrcp;
b = Truncate( MultiplyAdd( grid, b, half ) )*gridrcp; b = Truncate( MultiplyAdd( grid, b, half ) )*gridrcp;
// compute the error (we skip the constant xxsum) // compute the error (we skip the constant xxsum)
Vec4 e1 = MultiplyAdd( a*a, alpha2_sum, b*b*beta2_sum ); Vec4 e1 = MultiplyAdd( a*a, alpha2_sum, b*b*beta2_sum );
Vec4 e2 = NegativeMultiplySubtract( a, alphax_sum, a*b*alphabeta_sum ); Vec4 e2 = NegativeMultiplySubtract( a, alphax_sum, a*b*alphabeta_sum );
Vec4 e3 = NegativeMultiplySubtract( b, betax_sum, e2 ); Vec4 e3 = NegativeMultiplySubtract( b, betax_sum, e2 );
Vec4 e4 = MultiplyAdd( two, e3, e1 ); Vec4 e4 = MultiplyAdd( two, e3, e1 );
// apply the metric to the error term // apply the metric to the error term
Vec4 e5 = e4*m_metric; Vec4 e5 = e4*m_metric;
Vec4 error = e5.SplatX() + e5.SplatY() + e5.SplatZ(); Vec4 error = e5.SplatX() + e5.SplatY() + e5.SplatZ();
// keep the solution if it wins // keep the solution if it wins
if( CompareAnyLessThan( error, besterror ) ) if( CompareAnyLessThan( error, besterror ) )
{ {
beststart = a; beststart = a;
bestend = b; bestend = b;
besterror = error; besterror = error;
besti = i; besti = i;
bestj = j; bestj = j;
bestk = k; bestk = k;
bestiteration = iterationIndex; bestiteration = iterationIndex;
} }
// advance // advance
if( k == count ) if( k == count )
break; break;
part2 += m_points_weights[k]; part2 += m_points_weights[k];
++k; ++k;
} }
// advance // advance
if( j == count ) if( j == count )
break; break;
part1 += m_points_weights[j]; part1 += m_points_weights[j];
++j; ++j;
} }
// advance // advance
part0 += m_points_weights[i]; part0 += m_points_weights[i];
} }
// stop if we didn't improve in this iteration // stop if we didn't improve in this iteration
if( bestiteration != iterationIndex ) if( bestiteration != iterationIndex )
break; break;
// advance if possible // advance if possible
++iterationIndex; ++iterationIndex;
if( iterationIndex == m_iterationCount ) if( iterationIndex == m_iterationCount )
break; break;
// stop if a new iteration is an ordering that has already been tried // stop if a new iteration is an ordering that has already been tried
Vec3 axis = ( bestend - beststart ).GetVec3(); Vec3 axis = ( bestend - beststart ).GetVec3();
if( !ConstructOrdering( axis, iterationIndex ) ) if( !ConstructOrdering( axis, iterationIndex ) )
break; break;
} }
// save the block if necessary // save the block if necessary
if( CompareAnyLessThan( besterror, m_besterror ) ) if( CompareAnyLessThan( besterror, m_besterror ) )
{ {
// remap the indices // remap the indices
u8 const* order = ( u8* )m_order + 16*bestiteration; u8 const* order = ( u8* )m_order + 16*bestiteration;
u8 unordered[16]; u8 unordered[16];
for( int m = 0; m < besti; ++m ) for( int m = 0; m < besti; ++m )
unordered[order[m]] = 0; unordered[order[m]] = 0;
for( int m = besti; m < bestj; ++m ) for( int m = besti; m < bestj; ++m )
unordered[order[m]] = 2; unordered[order[m]] = 2;
for( int m = bestj; m < bestk; ++m ) for( int m = bestj; m < bestk; ++m )
unordered[order[m]] = 3; unordered[order[m]] = 3;
for( int m = bestk; m < count; ++m ) for( int m = bestk; m < count; ++m )
unordered[order[m]] = 1; unordered[order[m]] = 1;
m_colours->RemapIndices( unordered, bestindices ); m_colours->RemapIndices( unordered, bestindices );
// save the block // save the block
WriteColourBlock4( beststart.GetVec3(), bestend.GetVec3(), bestindices, block ); WriteColourBlock4( beststart.GetVec3(), bestend.GetVec3(), bestindices, block );
// save the error // save the error
m_besterror = besterror; m_besterror = besterror;
} }
} }
} // namespace squish } // namespace squish

62
thirdparty/squish/clusterfit.h vendored
View File

@@ -1,33 +1,33 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Copyright (c) 2007 Ignacio Castano icastano@nvidia.com Copyright (c) 2007 Ignacio Castano icastano@nvidia.com
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#ifndef SQUISH_CLUSTERFIT_H #ifndef SQUISH_CLUSTERFIT_H
#define SQUISH_CLUSTERFIT_H #define SQUISH_CLUSTERFIT_H
#include <squish.h> #include "squish.h"
#include "maths.h" #include "maths.h"
#include "simd.h" #include "simd.h"
#include "colourfit.h" #include "colourfit.h"
@@ -37,23 +37,23 @@ namespace squish {
class ClusterFit : public ColourFit class ClusterFit : public ColourFit
{ {
public: public:
ClusterFit( ColourSet const* colours, int flags ); ClusterFit( ColourSet const* colours, int flags, float* metric );
private: private:
bool ConstructOrdering( Vec3 const& axis, int iteration ); bool ConstructOrdering( Vec3 const& axis, int iteration );
virtual void Compress3( void* block ); virtual void Compress3( void* block );
virtual void Compress4( void* block ); virtual void Compress4( void* block );
enum { kMaxIterations = 8 }; enum { kMaxIterations = 8 };
int m_iterationCount; int m_iterationCount;
Vec3 m_principle; Vec3 m_principle;
u8 m_order[16*kMaxIterations]; u8 m_order[16*kMaxIterations];
Vec4 m_points_weights[16]; Vec4 m_points_weights[16];
Vec4 m_xsum_wsum; Vec4 m_xsum_wsum;
Vec4 m_metric; Vec4 m_metric;
Vec4 m_besterror; Vec4 m_besterror;
}; };
} // namespace squish } // namespace squish

308
thirdparty/squish/colourblock.cpp vendored
View File

@@ -1,25 +1,25 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
@@ -29,186 +29,186 @@ namespace squish {
static int FloatToInt( float a, int limit ) static int FloatToInt( float a, int limit )
{ {
// use ANSI round-to-zero behaviour to get round-to-nearest // use ANSI round-to-zero behaviour to get round-to-nearest
int i = ( int )( a + 0.5f ); int i = ( int )( a + 0.5f );
// clamp to the limit // clamp to the limit
if( i < 0 ) if( i < 0 )
i = 0; i = 0;
else if( i > limit ) else if( i > limit )
i = limit; i = limit;
// done // done
return i; return i;
} }
static int FloatTo565( Vec3::Arg colour ) static int FloatTo565( Vec3::Arg colour )
{ {
// get the components in the correct range // get the components in the correct range
int r = FloatToInt( 31.0f*colour.X(), 31 ); int r = FloatToInt( 31.0f*colour.X(), 31 );
int g = FloatToInt( 63.0f*colour.Y(), 63 ); int g = FloatToInt( 63.0f*colour.Y(), 63 );
int b = FloatToInt( 31.0f*colour.Z(), 31 ); int b = FloatToInt( 31.0f*colour.Z(), 31 );
// pack into a single value // pack into a single value
return ( r << 11 ) | ( g << 5 ) | b; return ( r << 11 ) | ( g << 5 ) | b;
} }
static void WriteColourBlock( int a, int b, u8* indices, void* block ) static void WriteColourBlock( int a, int b, u8* indices, void* block )
{ {
// get the block as bytes // get the block as bytes
u8* bytes = ( u8* )block; u8* bytes = ( u8* )block;
// write the endpoints // write the endpoints
bytes[0] = ( u8 )( a & 0xff ); bytes[0] = ( u8 )( a & 0xff );
bytes[1] = ( u8 )( a >> 8 ); bytes[1] = ( u8 )( a >> 8 );
bytes[2] = ( u8 )( b & 0xff ); bytes[2] = ( u8 )( b & 0xff );
bytes[3] = ( u8 )( b >> 8 ); bytes[3] = ( u8 )( b >> 8 );
// write the indices // write the indices
for( int i = 0; i < 4; ++i ) for( int i = 0; i < 4; ++i )
{ {
u8 const* ind = indices + 4*i; u8 const* ind = indices + 4*i;
bytes[4 + i] = ind[0] | ( ind[1] << 2 ) | ( ind[2] << 4 ) | ( ind[3] << 6 ); bytes[4 + i] = ind[0] | ( ind[1] << 2 ) | ( ind[2] << 4 ) | ( ind[3] << 6 );
} }
} }
void WriteColourBlock3( Vec3::Arg start, Vec3::Arg end, u8 const* indices, void* block ) void WriteColourBlock3( Vec3::Arg start, Vec3::Arg end, u8 const* indices, void* block )
{ {
// get the packed values // get the packed values
int a = FloatTo565( start ); int a = FloatTo565( start );
int b = FloatTo565( end ); int b = FloatTo565( end );
// remap the indices // remap the indices
u8 remapped[16]; u8 remapped[16];
if( a <= b ) if( a <= b )
{ {
// use the indices directly // use the indices directly
for( int i = 0; i < 16; ++i ) for( int i = 0; i < 16; ++i )
remapped[i] = indices[i]; remapped[i] = indices[i];
} }
else else
{ {
// swap a and b // swap a and b
std::swap( a, b ); std::swap( a, b );
for( int i = 0; i < 16; ++i ) for( int i = 0; i < 16; ++i )
{ {
if( indices[i] == 0 ) if( indices[i] == 0 )
remapped[i] = 1; remapped[i] = 1;
else if( indices[i] == 1 ) else if( indices[i] == 1 )
remapped[i] = 0; remapped[i] = 0;
else else
remapped[i] = indices[i]; remapped[i] = indices[i];
} }
} }
// write the block // write the block
WriteColourBlock( a, b, remapped, block ); WriteColourBlock( a, b, remapped, block );
} }
void WriteColourBlock4( Vec3::Arg start, Vec3::Arg end, u8 const* indices, void* block ) void WriteColourBlock4( Vec3::Arg start, Vec3::Arg end, u8 const* indices, void* block )
{ {
// get the packed values // get the packed values
int a = FloatTo565( start ); int a = FloatTo565( start );
int b = FloatTo565( end ); int b = FloatTo565( end );
// remap the indices // remap the indices
u8 remapped[16]; u8 remapped[16];
if( a < b ) if( a < b )
{ {
// swap a and b // swap a and b
std::swap( a, b ); std::swap( a, b );
for( int i = 0; i < 16; ++i ) for( int i = 0; i < 16; ++i )
remapped[i] = ( indices[i] ^ 0x1 ) & 0x3; remapped[i] = ( indices[i] ^ 0x1 ) & 0x3;
} }
else if( a == b ) else if( a == b )
{ {
// use index 0 // use index 0
for( int i = 0; i < 16; ++i ) for( int i = 0; i < 16; ++i )
remapped[i] = 0; remapped[i] = 0;
} }
else else
{ {
// use the indices directly // use the indices directly
for( int i = 0; i < 16; ++i ) for( int i = 0; i < 16; ++i )
remapped[i] = indices[i]; remapped[i] = indices[i];
} }
// write the block // write the block
WriteColourBlock( a, b, remapped, block ); WriteColourBlock( a, b, remapped, block );
} }
static int Unpack565( u8 const* packed, u8* colour ) static int Unpack565( u8 const* packed, u8* colour )
{ {
// build the packed value // build the packed value
int value = ( int )packed[0] | ( ( int )packed[1] << 8 ); int value = ( int )packed[0] | ( ( int )packed[1] << 8 );
// get the components in the stored range // get the components in the stored range
u8 red = ( u8 )( ( value >> 11 ) & 0x1f ); u8 red = ( u8 )( ( value >> 11 ) & 0x1f );
u8 green = ( u8 )( ( value >> 5 ) & 0x3f ); u8 green = ( u8 )( ( value >> 5 ) & 0x3f );
u8 blue = ( u8 )( value & 0x1f ); u8 blue = ( u8 )( value & 0x1f );
// scale up to 8 bits // scale up to 8 bits
colour[0] = ( red << 3 ) | ( red >> 2 ); colour[0] = ( red << 3 ) | ( red >> 2 );
colour[1] = ( green << 2 ) | ( green >> 4 ); colour[1] = ( green << 2 ) | ( green >> 4 );
colour[2] = ( blue << 3 ) | ( blue >> 2 ); colour[2] = ( blue << 3 ) | ( blue >> 2 );
colour[3] = 255; colour[3] = 255;
// return the value // return the value
return value; return value;
} }
void DecompressColour( u8* rgba, void const* block, bool isDxt1 ) void DecompressColour( u8* rgba, void const* block, bool isDxt1 )
{ {
// get the block bytes // get the block bytes
u8 const* bytes = reinterpret_cast< u8 const* >( block ); u8 const* bytes = reinterpret_cast< u8 const* >( block );
// unpack the endpoints // unpack the endpoints
u8 codes[16]; u8 codes[16];
int a = Unpack565( bytes, codes ); int a = Unpack565( bytes, codes );
int b = Unpack565( bytes + 2, codes + 4 ); int b = Unpack565( bytes + 2, codes + 4 );
// generate the midpoints // generate the midpoints
for( int i = 0; i < 3; ++i ) for( int i = 0; i < 3; ++i )
{ {
int c = codes[i]; int c = codes[i];
int d = codes[4 + i]; int d = codes[4 + i];
if( isDxt1 && a <= b ) if( isDxt1 && a <= b )
{ {
codes[8 + i] = ( u8 )( ( c + d )/2 ); codes[8 + i] = ( u8 )( ( c + d )/2 );
codes[12 + i] = 0; codes[12 + i] = 0;
} }
else else
{ {
codes[8 + i] = ( u8 )( ( 2*c + d )/3 ); codes[8 + i] = ( u8 )( ( 2*c + d )/3 );
codes[12 + i] = ( u8 )( ( c + 2*d )/3 ); codes[12 + i] = ( u8 )( ( c + 2*d )/3 );
} }
} }
// fill in alpha for the intermediate values // fill in alpha for the intermediate values
codes[8 + 3] = 255; codes[8 + 3] = 255;
codes[12 + 3] = ( isDxt1 && a <= b ) ? 0 : 255; codes[12 + 3] = ( isDxt1 && a <= b ) ? 0 : 255;
// unpack the indices // unpack the indices
u8 indices[16]; u8 indices[16];
for( int i = 0; i < 4; ++i ) for( int i = 0; i < 4; ++i )
{ {
u8* ind = indices + 4*i; u8* ind = indices + 4*i;
u8 packed = bytes[4 + i]; u8 packed = bytes[4 + i];
ind[0] = packed & 0x3; ind[0] = packed & 0x3;
ind[1] = ( packed >> 2 ) & 0x3; ind[1] = ( packed >> 2 ) & 0x3;
ind[2] = ( packed >> 4 ) & 0x3; ind[2] = ( packed >> 4 ) & 0x3;
ind[3] = ( packed >> 6 ) & 0x3; ind[3] = ( packed >> 6 ) & 0x3;
} }
// store out the colours // store out the colours
for( int i = 0; i < 16; ++i ) for( int i = 0; i < 16; ++i )
{ {
u8 offset = 4*indices[i]; u8 offset = 4*indices[i];
for( int j = 0; j < 4; ++j ) for( int j = 0; j < 4; ++j )
rgba[4*i + j] = codes[offset + j]; rgba[4*i + j] = codes[offset + j];
} }
} }
} // namespace squish } // namespace squish

36
thirdparty/squish/colourblock.h vendored
View File

@@ -1,32 +1,32 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#ifndef SQUISH_COLOURBLOCK_H #ifndef SQUISH_COLOURBLOCK_H
#define SQUISH_COLOURBLOCK_H #define SQUISH_COLOURBLOCK_H
#include <squish.h> #include "squish.h"
#include "maths.h" #include "maths.h"
namespace squish { namespace squish {

58
thirdparty/squish/colourfit.cpp vendored
View File

@@ -1,25 +1,25 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
@@ -30,21 +30,25 @@ namespace squish {
ColourFit::ColourFit( ColourSet const* colours, int flags ) ColourFit::ColourFit( ColourSet const* colours, int flags )
: m_colours( colours ), : m_colours( colours ),
m_flags( flags ) m_flags( flags )
{
}
ColourFit::~ColourFit()
{ {
} }
void ColourFit::Compress( void* block ) void ColourFit::Compress( void* block )
{ {
bool isDxt1 = ( ( m_flags & kDxt1 ) != 0 ); bool isDxt1 = ( ( m_flags & kDxt1 ) != 0 );
if( isDxt1 ) if( isDxt1 )
{ {
Compress3( block ); Compress3( block );
if( !m_colours->IsTransparent() ) if( !m_colours->IsTransparent() )
Compress4( block ); Compress4( block );
} }
else else
Compress4( block ); Compress4( block );
} }
} // namespace squish } // namespace squish

51
thirdparty/squish/colourfit.h vendored
View File

@@ -1,34 +1,36 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#ifndef SQUISH_COLOURFIT_H #ifndef SQUISH_COLOURFIT_H
#define SQUISH_COLOURFIT_H #define SQUISH_COLOURFIT_H
#include <squish.h> #include "squish.h"
#include "maths.h" #include "maths.h"
#include <climits>
namespace squish { namespace squish {
class ColourSet; class ColourSet;
@@ -36,16 +38,17 @@ class ColourSet;
class ColourFit class ColourFit
{ {
public: public:
ColourFit( ColourSet const* colours, int flags ); ColourFit( ColourSet const* colours, int flags );
virtual ~ColourFit();
void Compress( void* block ); void Compress( void* block );
protected: protected:
virtual void Compress3( void* block ) = 0; virtual void Compress3( void* block ) = 0;
virtual void Compress4( void* block ) = 0; virtual void Compress4( void* block ) = 0;
ColourSet const* m_colours; ColourSet const* m_colours;
int m_flags; int m_flags;
}; };
} // namespace squish } // namespace squish

178
thirdparty/squish/colourset.cpp vendored
View File

@@ -1,25 +1,25 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
@@ -29,93 +29,93 @@ namespace squish {
ColourSet::ColourSet( u8 const* rgba, int mask, int flags ) ColourSet::ColourSet( u8 const* rgba, int mask, int flags )
: m_count( 0 ), : m_count( 0 ),
m_transparent( false ) m_transparent( false )
{ {
// check the compression mode for dxt1 // check the compression mode for dxt1
bool isDxt1 = ( ( flags & kDxt1 ) != 0 ); bool isDxt1 = ( ( flags & kDxt1 ) != 0 );
bool weightByAlpha = ( ( flags & kWeightColourByAlpha ) != 0 ); bool weightByAlpha = ( ( flags & kWeightColourByAlpha ) != 0 );
// create the minimal set // create the minimal set
for( int i = 0; i < 16; ++i ) for( int i = 0; i < 16; ++i )
{ {
// check this pixel is enabled // check this pixel is enabled
int bit = 1 << i; int bit = 1 << i;
if( ( mask & bit ) == 0 ) if( ( mask & bit ) == 0 )
{ {
m_remap[i] = -1; m_remap[i] = -1;
continue; continue;
} }
// check for transparent pixels when using dxt1 // check for transparent pixels when using dxt1
if( isDxt1 && rgba[4*i + 3] < 128 ) if( isDxt1 && rgba[4*i + 3] < 128 )
{ {
m_remap[i] = -1; m_remap[i] = -1;
m_transparent = true; m_transparent = true;
continue; continue;
} }
// loop over previous points for a match // loop over previous points for a match
for( int j = 0;; ++j ) for( int j = 0;; ++j )
{ {
// allocate a new point // allocate a new point
if( j == i ) if( j == i )
{ {
// normalise coordinates to [0,1] // normalise coordinates to [0,1]
float x = ( float )rgba[4*i] / 255.0f; float x = ( float )rgba[4*i] / 255.0f;
float y = ( float )rgba[4*i + 1] / 255.0f; float y = ( float )rgba[4*i + 1] / 255.0f;
float z = ( float )rgba[4*i + 2] / 255.0f; float z = ( float )rgba[4*i + 2] / 255.0f;
// ensure there is always non-zero weight even for zero alpha // ensure there is always non-zero weight even for zero alpha
float w = ( float )( rgba[4*i + 3] + 1 ) / 256.0f; float w = ( float )( rgba[4*i + 3] + 1 ) / 256.0f;
// add the point // add the point
m_points[m_count] = Vec3( x, y, z ); m_points[m_count] = Vec3( x, y, z );
m_weights[m_count] = ( weightByAlpha ? w : 1.0f ); m_weights[m_count] = ( weightByAlpha ? w : 1.0f );
m_remap[i] = m_count; m_remap[i] = m_count;
// advance // advance
++m_count; ++m_count;
break; break;
} }
// check for a match // check for a match
int oldbit = 1 << j; int oldbit = 1 << j;
bool match = ( ( mask & oldbit ) != 0 ) bool match = ( ( mask & oldbit ) != 0 )
&& ( rgba[4*i] == rgba[4*j] ) && ( rgba[4*i] == rgba[4*j] )
&& ( rgba[4*i + 1] == rgba[4*j + 1] ) && ( rgba[4*i + 1] == rgba[4*j + 1] )
&& ( rgba[4*i + 2] == rgba[4*j + 2] ) && ( rgba[4*i + 2] == rgba[4*j + 2] )
&& ( rgba[4*j + 3] >= 128 || !isDxt1 ); && ( rgba[4*j + 3] >= 128 || !isDxt1 );
if( match ) if( match )
{ {
// get the index of the match // get the index of the match
int index = m_remap[j]; int index = m_remap[j];
// ensure there is always non-zero weight even for zero alpha // ensure there is always non-zero weight even for zero alpha
float w = ( float )( rgba[4*i + 3] + 1 ) / 256.0f; float w = ( float )( rgba[4*i + 3] + 1 ) / 256.0f;
// map to this point and increase the weight // map to this point and increase the weight
m_weights[index] += ( weightByAlpha ? w : 1.0f ); m_weights[index] += ( weightByAlpha ? w : 1.0f );
m_remap[i] = index; m_remap[i] = index;
break; break;
} }
} }
} }
// square root the weights // square root the weights
for( int i = 0; i < m_count; ++i ) for( int i = 0; i < m_count; ++i )
m_weights[i] = std::sqrt( m_weights[i] ); m_weights[i] = std::sqrt( m_weights[i] );
} }
void ColourSet::RemapIndices( u8 const* source, u8* target ) const void ColourSet::RemapIndices( u8 const* source, u8* target ) const
{ {
for( int i = 0; i < 16; ++i ) for( int i = 0; i < 16; ++i )
{ {
int j = m_remap[i]; int j = m_remap[i];
if( j == -1 ) if( j == -1 )
target[i] = 3; target[i] = 3;
else else
target[i] = source[j]; target[i] = source[j];
} }
} }
} // namespace squish } // namespace squish

58
thirdparty/squish/colourset.h vendored
View File

@@ -1,32 +1,32 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#ifndef SQUISH_COLOURSET_H #ifndef SQUISH_COLOURSET_H
#define SQUISH_COLOURSET_H #define SQUISH_COLOURSET_H
#include <squish.h> #include "squish.h"
#include "maths.h" #include "maths.h"
namespace squish { namespace squish {
@@ -36,21 +36,21 @@ namespace squish {
class ColourSet class ColourSet
{ {
public: public:
ColourSet( u8 const* rgba, int mask, int flags ); ColourSet( u8 const* rgba, int mask, int flags );
int GetCount() const { return m_count; } int GetCount() const { return m_count; }
Vec3 const* GetPoints() const { return m_points; } Vec3 const* GetPoints() const { return m_points; }
float const* GetWeights() const { return m_weights; } float const* GetWeights() const { return m_weights; }
bool IsTransparent() const { return m_transparent; } bool IsTransparent() const { return m_transparent; }
void RemapIndices( u8 const* source, u8* target ) const; void RemapIndices( u8 const* source, u8* target ) const;
private: private:
int m_count; int m_count;
Vec3 m_points[16]; Vec3 m_points[16];
float m_weights[16]; float m_weights[16];
int m_remap[16]; int m_remap[16];
bool m_transparent; bool m_transparent;
}; };
} // namespace sqish } // namespace sqish

36
thirdparty/squish/config.h vendored
View File

@@ -1,25 +1,25 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
@@ -36,7 +36,7 @@
#define SQUISH_USE_SSE 0 #define SQUISH_USE_SSE 0
#endif #endif
// Internally et SQUISH_USE_SIMD when either Altivec or SSE is available. // Internally set SQUISH_USE_SIMD when either Altivec or SSE is available.
#if SQUISH_USE_ALTIVEC && SQUISH_USE_SSE #if SQUISH_USE_ALTIVEC && SQUISH_USE_SSE
#error "Cannot enable both Altivec and SSE!" #error "Cannot enable both Altivec and SSE!"
#endif #endif

372
thirdparty/squish/maths.cpp vendored
View File

@@ -1,227 +1,259 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
/*! @file /*! @file
The symmetric eigensystem solver algorithm is from The symmetric eigensystem solver algorithm is from
http://www.geometrictools.com/Documentation/EigenSymmetric3x3.pdf http://www.geometrictools.com/Documentation/EigenSymmetric3x3.pdf
*/ */
#include "maths.h" #include "maths.h"
#include "simd.h"
#include <cfloat> #include <cfloat>
namespace squish { namespace squish {
Sym3x3 ComputeWeightedCovariance( int n, Vec3 const* points, float const* weights ) Sym3x3 ComputeWeightedCovariance( int n, Vec3 const* points, float const* weights )
{ {
// compute the centroid // compute the centroid
float total = 0.0f; float total = 0.0f;
Vec3 centroid( 0.0f ); Vec3 centroid( 0.0f );
for( int i = 0; i < n; ++i ) for( int i = 0; i < n; ++i )
{ {
total += weights[i]; total += weights[i];
centroid += weights[i]*points[i]; centroid += weights[i]*points[i];
} }
centroid /= total; if( total > FLT_EPSILON )
centroid /= total;
// accumulate the covariance matrix // accumulate the covariance matrix
Sym3x3 covariance( 0.0f ); Sym3x3 covariance( 0.0f );
for( int i = 0; i < n; ++i ) for( int i = 0; i < n; ++i )
{ {
Vec3 a = points[i] - centroid; Vec3 a = points[i] - centroid;
Vec3 b = weights[i]*a; Vec3 b = weights[i]*a;
covariance[0] += a.X()*b.X(); covariance[0] += a.X()*b.X();
covariance[1] += a.X()*b.Y(); covariance[1] += a.X()*b.Y();
covariance[2] += a.X()*b.Z(); covariance[2] += a.X()*b.Z();
covariance[3] += a.Y()*b.Y(); covariance[3] += a.Y()*b.Y();
covariance[4] += a.Y()*b.Z(); covariance[4] += a.Y()*b.Z();
covariance[5] += a.Z()*b.Z(); covariance[5] += a.Z()*b.Z();
} }
// return it // return it
return covariance; return covariance;
} }
#if 0
static Vec3 GetMultiplicity1Evector( Sym3x3 const& matrix, float evalue ) static Vec3 GetMultiplicity1Evector( Sym3x3 const& matrix, float evalue )
{ {
// compute M // compute M
Sym3x3 m; Sym3x3 m;
m[0] = matrix[0] - evalue; m[0] = matrix[0] - evalue;
m[1] = matrix[1]; m[1] = matrix[1];
m[2] = matrix[2]; m[2] = matrix[2];
m[3] = matrix[3] - evalue; m[3] = matrix[3] - evalue;
m[4] = matrix[4]; m[4] = matrix[4];
m[5] = matrix[5] - evalue; m[5] = matrix[5] - evalue;
// compute U // compute U
Sym3x3 u; Sym3x3 u;
u[0] = m[3]*m[5] - m[4]*m[4]; u[0] = m[3]*m[5] - m[4]*m[4];
u[1] = m[2]*m[4] - m[1]*m[5]; u[1] = m[2]*m[4] - m[1]*m[5];
u[2] = m[1]*m[4] - m[2]*m[3]; u[2] = m[1]*m[4] - m[2]*m[3];
u[3] = m[0]*m[5] - m[2]*m[2]; u[3] = m[0]*m[5] - m[2]*m[2];
u[4] = m[1]*m[2] - m[4]*m[0]; u[4] = m[1]*m[2] - m[4]*m[0];
u[5] = m[0]*m[3] - m[1]*m[1]; u[5] = m[0]*m[3] - m[1]*m[1];
// find the largest component // find the largest component
float mc = std::fabs( u[0] ); float mc = std::fabs( u[0] );
int mi = 0; int mi = 0;
for( int i = 1; i < 6; ++i ) for( int i = 1; i < 6; ++i )
{ {
float c = std::fabs( u[i] ); float c = std::fabs( u[i] );
if( c > mc ) if( c > mc )
{ {
mc = c; mc = c;
mi = i; mi = i;
} }
} }
// pick the column with this component // pick the column with this component
switch( mi ) switch( mi )
{ {
case 0: case 0:
return Vec3( u[0], u[1], u[2] ); return Vec3( u[0], u[1], u[2] );
case 1: case 1:
case 3: case 3:
return Vec3( u[1], u[3], u[4] ); return Vec3( u[1], u[3], u[4] );
default: default:
return Vec3( u[2], u[4], u[5] ); return Vec3( u[2], u[4], u[5] );
} }
} }
static Vec3 GetMultiplicity2Evector( Sym3x3 const& matrix, float evalue ) static Vec3 GetMultiplicity2Evector( Sym3x3 const& matrix, float evalue )
{ {
// compute M // compute M
Sym3x3 m; Sym3x3 m;
m[0] = matrix[0] - evalue; m[0] = matrix[0] - evalue;
m[1] = matrix[1]; m[1] = matrix[1];
m[2] = matrix[2]; m[2] = matrix[2];
m[3] = matrix[3] - evalue; m[3] = matrix[3] - evalue;
m[4] = matrix[4]; m[4] = matrix[4];
m[5] = matrix[5] - evalue; m[5] = matrix[5] - evalue;
// find the largest component // find the largest component
float mc = std::fabs( m[0] ); float mc = std::fabs( m[0] );
int mi = 0; int mi = 0;
for( int i = 1; i < 6; ++i ) for( int i = 1; i < 6; ++i )
{ {
float c = std::fabs( m[i] ); float c = std::fabs( m[i] );
if( c > mc ) if( c > mc )
{ {
mc = c; mc = c;
mi = i; mi = i;
} }
} }
// pick the first eigenvector based on this index // pick the first eigenvector based on this index
switch( mi ) switch( mi )
{ {
case 0: case 0:
case 1: case 1:
return Vec3( -m[1], m[0], 0.0f ); return Vec3( -m[1], m[0], 0.0f );
case 2: case 2:
return Vec3( m[2], 0.0f, -m[0] ); return Vec3( m[2], 0.0f, -m[0] );
case 3: case 3:
case 4: case 4:
return Vec3( 0.0f, -m[4], m[3] ); return Vec3( 0.0f, -m[4], m[3] );
default: default:
return Vec3( 0.0f, -m[5], m[4] ); return Vec3( 0.0f, -m[5], m[4] );
} }
} }
Vec3 ComputePrincipleComponent( Sym3x3 const& matrix ) Vec3 ComputePrincipleComponent( Sym3x3 const& matrix )
{ {
// compute the cubic coefficients // compute the cubic coefficients
float c0 = matrix[0]*matrix[3]*matrix[5] float c0 = matrix[0]*matrix[3]*matrix[5]
+ 2.0f*matrix[1]*matrix[2]*matrix[4] + 2.0f*matrix[1]*matrix[2]*matrix[4]
- matrix[0]*matrix[4]*matrix[4] - matrix[0]*matrix[4]*matrix[4]
- matrix[3]*matrix[2]*matrix[2] - matrix[3]*matrix[2]*matrix[2]
- matrix[5]*matrix[1]*matrix[1]; - matrix[5]*matrix[1]*matrix[1];
float c1 = matrix[0]*matrix[3] + matrix[0]*matrix[5] + matrix[3]*matrix[5] float c1 = matrix[0]*matrix[3] + matrix[0]*matrix[5] + matrix[3]*matrix[5]
- matrix[1]*matrix[1] - matrix[2]*matrix[2] - matrix[4]*matrix[4]; - matrix[1]*matrix[1] - matrix[2]*matrix[2] - matrix[4]*matrix[4];
float c2 = matrix[0] + matrix[3] + matrix[5]; float c2 = matrix[0] + matrix[3] + matrix[5];
// compute the quadratic coefficients // compute the quadratic coefficients
float a = c1 - ( 1.0f/3.0f )*c2*c2; float a = c1 - ( 1.0f/3.0f )*c2*c2;
float b = ( -2.0f/27.0f )*c2*c2*c2 + ( 1.0f/3.0f )*c1*c2 - c0; float b = ( -2.0f/27.0f )*c2*c2*c2 + ( 1.0f/3.0f )*c1*c2 - c0;
// compute the root count check // compute the root count check
float Q = 0.25f*b*b + ( 1.0f/27.0f )*a*a*a; float Q = 0.25f*b*b + ( 1.0f/27.0f )*a*a*a;
// test the multiplicity // test the multiplicity
if( FLT_EPSILON < Q ) if( FLT_EPSILON < Q )
{ {
// only one root, which implies we have a multiple of the identity // only one root, which implies we have a multiple of the identity
return Vec3( 1.0f ); return Vec3( 1.0f );
} }
else if( Q < -FLT_EPSILON ) else if( Q < -FLT_EPSILON )
{ {
// three distinct roots // three distinct roots
float theta = std::atan2( std::sqrt( -Q ), -0.5f*b ); float theta = std::atan2( std::sqrt( -Q ), -0.5f*b );
float rho = std::sqrt( 0.25f*b*b - Q ); float rho = std::sqrt( 0.25f*b*b - Q );
float rt = std::pow( rho, 1.0f/3.0f ); float rt = std::pow( rho, 1.0f/3.0f );
float ct = std::cos( theta/3.0f ); float ct = std::cos( theta/3.0f );
float st = std::sin( theta/3.0f ); float st = std::sin( theta/3.0f );
float l1 = ( 1.0f/3.0f )*c2 + 2.0f*rt*ct; float l1 = ( 1.0f/3.0f )*c2 + 2.0f*rt*ct;
float l2 = ( 1.0f/3.0f )*c2 - rt*( ct + ( float )sqrt( 3.0f )*st ); float l2 = ( 1.0f/3.0f )*c2 - rt*( ct + ( float )sqrt( 3.0f )*st );
float l3 = ( 1.0f/3.0f )*c2 - rt*( ct - ( float )sqrt( 3.0f )*st ); float l3 = ( 1.0f/3.0f )*c2 - rt*( ct - ( float )sqrt( 3.0f )*st );
// pick the larger // pick the larger
if( std::fabs( l2 ) > std::fabs( l1 ) ) if( std::fabs( l2 ) > std::fabs( l1 ) )
l1 = l2; l1 = l2;
if( std::fabs( l3 ) > std::fabs( l1 ) ) if( std::fabs( l3 ) > std::fabs( l1 ) )
l1 = l3; l1 = l3;
// get the eigenvector // get the eigenvector
return GetMultiplicity1Evector( matrix, l1 ); return GetMultiplicity1Evector( matrix, l1 );
} }
else // if( -FLT_EPSILON <= Q && Q <= FLT_EPSILON ) else // if( -FLT_EPSILON <= Q && Q <= FLT_EPSILON )
{ {
// two roots // two roots
float rt; float rt;
if( b < 0.0f ) if( b < 0.0f )
rt = -std::pow( -0.5f*b, 1.0f/3.0f ); rt = -std::pow( -0.5f*b, 1.0f/3.0f );
else else
rt = std::pow( 0.5f*b, 1.0f/3.0f ); rt = std::pow( 0.5f*b, 1.0f/3.0f );
float l1 = ( 1.0f/3.0f )*c2 + rt; // repeated float l1 = ( 1.0f/3.0f )*c2 + rt; // repeated
float l2 = ( 1.0f/3.0f )*c2 - 2.0f*rt; float l2 = ( 1.0f/3.0f )*c2 - 2.0f*rt;
// get the eigenvector // get the eigenvector
if( std::fabs( l1 ) > std::fabs( l2 ) ) if( std::fabs( l1 ) > std::fabs( l2 ) )
return GetMultiplicity2Evector( matrix, l1 ); return GetMultiplicity2Evector( matrix, l1 );
else else
return GetMultiplicity1Evector( matrix, l2 ); return GetMultiplicity1Evector( matrix, l2 );
} }
} }
#else
#define POWER_ITERATION_COUNT 8
Vec3 ComputePrincipleComponent( Sym3x3 const& matrix )
{
Vec4 const row0( matrix[0], matrix[1], matrix[2], 0.0f );
Vec4 const row1( matrix[1], matrix[3], matrix[4], 0.0f );
Vec4 const row2( matrix[2], matrix[4], matrix[5], 0.0f );
Vec4 v = VEC4_CONST( 1.0f );
for( int i = 0; i < POWER_ITERATION_COUNT; ++i )
{
// matrix multiply
Vec4 w = row0*v.SplatX();
w = MultiplyAdd(row1, v.SplatY(), w);
w = MultiplyAdd(row2, v.SplatZ(), w);
// get max component from xyz in all channels
Vec4 a = Max(w.SplatX(), Max(w.SplatY(), w.SplatZ()));
// divide through and advance
v = w*Reciprocal(a);
}
return v.GetVec3();
}
#endif
} // namespace squish } // namespace squish

334
thirdparty/squish/maths.h vendored
View File

@@ -1,25 +1,25 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
@@ -35,194 +35,194 @@ namespace squish {
class Vec3 class Vec3
{ {
public: public:
typedef Vec3 const& Arg; typedef Vec3 const& Arg;
Vec3() Vec3()
{ {
} }
explicit Vec3( float s ) explicit Vec3( float s )
{ {
m_x = s; m_x = s;
m_y = s; m_y = s;
m_z = s; m_z = s;
} }
Vec3( float x, float y, float z ) Vec3( float x, float y, float z )
{ {
m_x = x; m_x = x;
m_y = y; m_y = y;
m_z = z; m_z = z;
} }
float X() const { return m_x; } float X() const { return m_x; }
float Y() const { return m_y; } float Y() const { return m_y; }
float Z() const { return m_z; } float Z() const { return m_z; }
Vec3 operator-() const Vec3 operator-() const
{ {
return Vec3( -m_x, -m_y, -m_z ); return Vec3( -m_x, -m_y, -m_z );
} }
Vec3& operator+=( Arg v ) Vec3& operator+=( Arg v )
{ {
m_x += v.m_x; m_x += v.m_x;
m_y += v.m_y; m_y += v.m_y;
m_z += v.m_z; m_z += v.m_z;
return *this; return *this;
} }
Vec3& operator-=( Arg v ) Vec3& operator-=( Arg v )
{ {
m_x -= v.m_x; m_x -= v.m_x;
m_y -= v.m_y; m_y -= v.m_y;
m_z -= v.m_z; m_z -= v.m_z;
return *this; return *this;
} }
Vec3& operator*=( Arg v ) Vec3& operator*=( Arg v )
{ {
m_x *= v.m_x; m_x *= v.m_x;
m_y *= v.m_y; m_y *= v.m_y;
m_z *= v.m_z; m_z *= v.m_z;
return *this; return *this;
} }
Vec3& operator*=( float s ) Vec3& operator*=( float s )
{ {
m_x *= s; m_x *= s;
m_y *= s; m_y *= s;
m_z *= s; m_z *= s;
return *this; return *this;
} }
Vec3& operator/=( Arg v ) Vec3& operator/=( Arg v )
{ {
m_x /= v.m_x; m_x /= v.m_x;
m_y /= v.m_y; m_y /= v.m_y;
m_z /= v.m_z; m_z /= v.m_z;
return *this; return *this;
} }
Vec3& operator/=( float s ) Vec3& operator/=( float s )
{ {
float t = 1.0f/s; float t = 1.0f/s;
m_x *= t; m_x *= t;
m_y *= t; m_y *= t;
m_z *= t; m_z *= t;
return *this; return *this;
} }
friend Vec3 operator+( Arg left, Arg right ) friend Vec3 operator+( Arg left, Arg right )
{ {
Vec3 copy( left ); Vec3 copy( left );
return copy += right; return copy += right;
} }
friend Vec3 operator-( Arg left, Arg right ) friend Vec3 operator-( Arg left, Arg right )
{ {
Vec3 copy( left ); Vec3 copy( left );
return copy -= right; return copy -= right;
} }
friend Vec3 operator*( Arg left, Arg right ) friend Vec3 operator*( Arg left, Arg right )
{ {
Vec3 copy( left ); Vec3 copy( left );
return copy *= right; return copy *= right;
} }
friend Vec3 operator*( Arg left, float right ) friend Vec3 operator*( Arg left, float right )
{ {
Vec3 copy( left ); Vec3 copy( left );
return copy *= right; return copy *= right;
} }
friend Vec3 operator*( float left, Arg right ) friend Vec3 operator*( float left, Arg right )
{ {
Vec3 copy( right ); Vec3 copy( right );
return copy *= left; return copy *= left;
} }
friend Vec3 operator/( Arg left, Arg right ) friend Vec3 operator/( Arg left, Arg right )
{ {
Vec3 copy( left ); Vec3 copy( left );
return copy /= right; return copy /= right;
} }
friend Vec3 operator/( Arg left, float right ) friend Vec3 operator/( Arg left, float right )
{ {
Vec3 copy( left ); Vec3 copy( left );
return copy /= right; return copy /= right;
} }
friend float Dot( Arg left, Arg right ) friend float Dot( Arg left, Arg right )
{ {
return left.m_x*right.m_x + left.m_y*right.m_y + left.m_z*right.m_z; return left.m_x*right.m_x + left.m_y*right.m_y + left.m_z*right.m_z;
} }
friend Vec3 Min( Arg left, Arg right ) friend Vec3 Min( Arg left, Arg right )
{ {
return Vec3( return Vec3(
std::min( left.m_x, right.m_x ), std::min( left.m_x, right.m_x ),
std::min( left.m_y, right.m_y ), std::min( left.m_y, right.m_y ),
std::min( left.m_z, right.m_z ) std::min( left.m_z, right.m_z )
); );
} }
friend Vec3 Max( Arg left, Arg right ) friend Vec3 Max( Arg left, Arg right )
{ {
return Vec3( return Vec3(
std::max( left.m_x, right.m_x ), std::max( left.m_x, right.m_x ),
std::max( left.m_y, right.m_y ), std::max( left.m_y, right.m_y ),
std::max( left.m_z, right.m_z ) std::max( left.m_z, right.m_z )
); );
} }
friend Vec3 Truncate( Arg v ) friend Vec3 Truncate( Arg v )
{ {
return Vec3( return Vec3(
v.m_x > 0.0f ? std::floor( v.m_x ) : std::ceil( v.m_x ), v.m_x > 0.0f ? std::floor( v.m_x ) : std::ceil( v.m_x ),
v.m_y > 0.0f ? std::floor( v.m_y ) : std::ceil( v.m_y ), v.m_y > 0.0f ? std::floor( v.m_y ) : std::ceil( v.m_y ),
v.m_z > 0.0f ? std::floor( v.m_z ) : std::ceil( v.m_z ) v.m_z > 0.0f ? std::floor( v.m_z ) : std::ceil( v.m_z )
); );
} }
private: private:
float m_x; float m_x;
float m_y; float m_y;
float m_z; float m_z;
}; };
inline float LengthSquared( Vec3::Arg v ) inline float LengthSquared( Vec3::Arg v )
{ {
return Dot( v, v ); return Dot( v, v );
} }
class Sym3x3 class Sym3x3
{ {
public: public:
Sym3x3() Sym3x3()
{ {
} }
Sym3x3( float s ) Sym3x3( float s )
{ {
for( int i = 0; i < 6; ++i ) for( int i = 0; i < 6; ++i )
m_x[i] = s; m_x[i] = s;
} }
float operator[]( int index ) const float operator[]( int index ) const
{ {
return m_x[index]; return m_x[index];
} }
float& operator[]( int index ) float& operator[]( int index )
{ {
return m_x[index]; return m_x[index];
} }
private: private:
float m_x[6]; float m_x[6];
}; };
Sym3x3 ComputeWeightedCovariance( int n, Vec3 const* points, float const* weights ); Sym3x3 ComputeWeightedCovariance( int n, Vec3 const* points, float const* weights );

303
thirdparty/squish/rangefit.cpp vendored
View File

@@ -1,25 +1,25 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
@@ -30,173 +30,172 @@
namespace squish { namespace squish {
RangeFit::RangeFit( ColourSet const* colours, int flags ) RangeFit::RangeFit( ColourSet const* colours, int flags, float* metric )
: ColourFit( colours, flags ) : ColourFit( colours, flags )
{ {
// initialise the metric // initialise the metric (old perceptual = 0.2126f, 0.7152f, 0.0722f)
bool perceptual = ( ( m_flags & kColourMetricPerceptual ) != 0 ); if( metric )
if( perceptual ) m_metric = Vec3( metric[0], metric[1], metric[2] );
m_metric = Vec3( 0.2126f, 0.7152f, 0.0722f ); else
else m_metric = Vec3( 1.0f );
m_metric = Vec3( 1.0f );
// initialise the best error // initialise the best error
m_besterror = FLT_MAX; m_besterror = FLT_MAX;
// cache some values // cache some values
int const count = m_colours->GetCount(); int const count = m_colours->GetCount();
Vec3 const* values = m_colours->GetPoints(); Vec3 const* values = m_colours->GetPoints();
float const* weights = m_colours->GetWeights(); float const* weights = m_colours->GetWeights();
// get the covariance matrix // get the covariance matrix
Sym3x3 covariance = ComputeWeightedCovariance( count, values, weights ); Sym3x3 covariance = ComputeWeightedCovariance( count, values, weights );
// compute the principle component // compute the principle component
Vec3 principle = ComputePrincipleComponent( covariance ); Vec3 principle = ComputePrincipleComponent( covariance );
// get the min and max range as the codebook endpoints // get the min and max range as the codebook endpoints
Vec3 start( 0.0f ); Vec3 start( 0.0f );
Vec3 end( 0.0f ); Vec3 end( 0.0f );
if( count > 0 ) if( count > 0 )
{ {
float min, max; float min, max;
// compute the range // compute the range
start = end = values[0]; start = end = values[0];
min = max = Dot( values[0], principle ); min = max = Dot( values[0], principle );
for( int i = 1; i < count; ++i ) for( int i = 1; i < count; ++i )
{ {
float val = Dot( values[i], principle ); float val = Dot( values[i], principle );
if( val < min ) if( val < min )
{ {
start = values[i]; start = values[i];
min = val; min = val;
} }
else if( val > max ) else if( val > max )
{ {
end = values[i]; end = values[i];
max = val; max = val;
} }
} }
} }
// clamp the output to [0, 1] // clamp the output to [0, 1]
Vec3 const one( 1.0f ); Vec3 const one( 1.0f );
Vec3 const zero( 0.0f ); Vec3 const zero( 0.0f );
start = Min( one, Max( zero, start ) ); start = Min( one, Max( zero, start ) );
end = Min( one, Max( zero, end ) ); end = Min( one, Max( zero, end ) );
// clamp to the grid and save // clamp to the grid and save
Vec3 const grid( 31.0f, 63.0f, 31.0f ); Vec3 const grid( 31.0f, 63.0f, 31.0f );
Vec3 const gridrcp( 1.0f/31.0f, 1.0f/63.0f, 1.0f/31.0f ); Vec3 const gridrcp( 1.0f/31.0f, 1.0f/63.0f, 1.0f/31.0f );
Vec3 const half( 0.5f ); Vec3 const half( 0.5f );
m_start = Truncate( grid*start + half )*gridrcp; m_start = Truncate( grid*start + half )*gridrcp;
m_end = Truncate( grid*end + half )*gridrcp; m_end = Truncate( grid*end + half )*gridrcp;
} }
void RangeFit::Compress3( void* block ) void RangeFit::Compress3( void* block )
{ {
// cache some values // cache some values
int const count = m_colours->GetCount(); int const count = m_colours->GetCount();
Vec3 const* values = m_colours->GetPoints(); Vec3 const* values = m_colours->GetPoints();
// create a codebook // create a codebook
Vec3 codes[3]; Vec3 codes[3];
codes[0] = m_start; codes[0] = m_start;
codes[1] = m_end; codes[1] = m_end;
codes[2] = 0.5f*m_start + 0.5f*m_end; codes[2] = 0.5f*m_start + 0.5f*m_end;
// match each point to the closest code // match each point to the closest code
u8 closest[16]; u8 closest[16];
float error = 0.0f; float error = 0.0f;
for( int i = 0; i < count; ++i ) for( int i = 0; i < count; ++i )
{ {
// find the closest code // find the closest code
float dist = FLT_MAX; float dist = FLT_MAX;
int idx = 0; int idx = 0;
for( int j = 0; j < 3; ++j ) for( int j = 0; j < 3; ++j )
{ {
float d = LengthSquared( m_metric*( values[i] - codes[j] ) ); float d = LengthSquared( m_metric*( values[i] - codes[j] ) );
if( d < dist ) if( d < dist )
{ {
dist = d; dist = d;
idx = j; idx = j;
} }
} }
// save the index // save the index
closest[i] = ( u8 )idx; closest[i] = ( u8 )idx;
// accumulate the error // accumulate the error
error += dist; error += dist;
} }
// save this scheme if it wins // save this scheme if it wins
if( error < m_besterror ) if( error < m_besterror )
{ {
// remap the indices // remap the indices
u8 indices[16]; u8 indices[16];
m_colours->RemapIndices( closest, indices ); m_colours->RemapIndices( closest, indices );
// save the block // save the block
WriteColourBlock3( m_start, m_end, indices, block ); WriteColourBlock3( m_start, m_end, indices, block );
// save the error // save the error
m_besterror = error; m_besterror = error;
} }
} }
void RangeFit::Compress4( void* block ) void RangeFit::Compress4( void* block )
{ {
// cache some values // cache some values
int const count = m_colours->GetCount(); int const count = m_colours->GetCount();
Vec3 const* values = m_colours->GetPoints(); Vec3 const* values = m_colours->GetPoints();
// create a codebook // create a codebook
Vec3 codes[4]; Vec3 codes[4];
codes[0] = m_start; codes[0] = m_start;
codes[1] = m_end; codes[1] = m_end;
codes[2] = ( 2.0f/3.0f )*m_start + ( 1.0f/3.0f )*m_end; codes[2] = ( 2.0f/3.0f )*m_start + ( 1.0f/3.0f )*m_end;
codes[3] = ( 1.0f/3.0f )*m_start + ( 2.0f/3.0f )*m_end; codes[3] = ( 1.0f/3.0f )*m_start + ( 2.0f/3.0f )*m_end;
// match each point to the closest code // match each point to the closest code
u8 closest[16]; u8 closest[16];
float error = 0.0f; float error = 0.0f;
for( int i = 0; i < count; ++i ) for( int i = 0; i < count; ++i )
{ {
// find the closest code // find the closest code
float dist = FLT_MAX; float dist = FLT_MAX;
int idx = 0; int idx = 0;
for( int j = 0; j < 4; ++j ) for( int j = 0; j < 4; ++j )
{ {
float d = LengthSquared( m_metric*( values[i] - codes[j] ) ); float d = LengthSquared( m_metric*( values[i] - codes[j] ) );
if( d < dist ) if( d < dist )
{ {
dist = d; dist = d;
idx = j; idx = j;
} }
} }
// save the index // save the index
closest[i] = ( u8 )idx; closest[i] = ( u8 )idx;
// accumulate the error // accumulate the error
error += dist; error += dist;
} }
// save this scheme if it wins // save this scheme if it wins
if( error < m_besterror ) if( error < m_besterror )
{ {
// remap the indices // remap the indices
u8 indices[16]; u8 indices[16];
m_colours->RemapIndices( closest, indices ); m_colours->RemapIndices( closest, indices );
// save the block // save the block
WriteColourBlock4( m_start, m_end, indices, block ); WriteColourBlock4( m_start, m_end, indices, block );
// save the error // save the error
m_besterror = error; m_besterror = error;
} }
} }
} // namespace squish } // namespace squish

50
thirdparty/squish/rangefit.h vendored
View File

@@ -1,32 +1,32 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#ifndef SQUISH_RANGEFIT_H #ifndef SQUISH_RANGEFIT_H
#define SQUISH_RANGEFIT_H #define SQUISH_RANGEFIT_H
#include <squish.h> #include "squish.h"
#include "colourfit.h" #include "colourfit.h"
#include "maths.h" #include "maths.h"
@@ -37,16 +37,16 @@ class ColourSet;
class RangeFit : public ColourFit class RangeFit : public ColourFit
{ {
public: public:
RangeFit( ColourSet const* colours, int flags ); RangeFit( ColourSet const* colours, int flags, float* metric );
private: private:
virtual void Compress3( void* block ); virtual void Compress3( void* block );
virtual void Compress4( void* block ); virtual void Compress4( void* block );
Vec3 m_metric; Vec3 m_metric;
Vec3 m_start; Vec3 m_start;
Vec3 m_end; Vec3 m_end;
float m_besterror; float m_besterror;
}; };
} // squish } // squish

34
thirdparty/squish/simd.h vendored
View File

@@ -1,25 +1,25 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */

274
thirdparty/squish/simd_float.h vendored
View File

@@ -1,25 +1,25 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
@@ -35,146 +35,146 @@ namespace squish {
class Vec4 class Vec4
{ {
public: public:
typedef Vec4 const& Arg; typedef Vec4 const& Arg;
Vec4() {} Vec4() {}
explicit Vec4( float s ) explicit Vec4( float s )
: m_x( s ), : m_x( s ),
m_y( s ), m_y( s ),
m_z( s ), m_z( s ),
m_w( s ) m_w( s )
{ {
} }
Vec4( float x, float y, float z, float w ) Vec4( float x, float y, float z, float w )
: m_x( x ), : m_x( x ),
m_y( y ), m_y( y ),
m_z( z ), m_z( z ),
m_w( w ) m_w( w )
{ {
} }
Vec3 GetVec3() const Vec3 GetVec3() const
{ {
return Vec3( m_x, m_y, m_z ); return Vec3( m_x, m_y, m_z );
} }
Vec4 SplatX() const { return Vec4( m_x ); } Vec4 SplatX() const { return Vec4( m_x ); }
Vec4 SplatY() const { return Vec4( m_y ); } Vec4 SplatY() const { return Vec4( m_y ); }
Vec4 SplatZ() const { return Vec4( m_z ); } Vec4 SplatZ() const { return Vec4( m_z ); }
Vec4 SplatW() const { return Vec4( m_w ); } Vec4 SplatW() const { return Vec4( m_w ); }
Vec4& operator+=( Arg v ) Vec4& operator+=( Arg v )
{ {
m_x += v.m_x; m_x += v.m_x;
m_y += v.m_y; m_y += v.m_y;
m_z += v.m_z; m_z += v.m_z;
m_w += v.m_w; m_w += v.m_w;
return *this; return *this;
} }
Vec4& operator-=( Arg v ) Vec4& operator-=( Arg v )
{ {
m_x -= v.m_x; m_x -= v.m_x;
m_y -= v.m_y; m_y -= v.m_y;
m_z -= v.m_z; m_z -= v.m_z;
m_w -= v.m_w; m_w -= v.m_w;
return *this; return *this;
} }
Vec4& operator*=( Arg v ) Vec4& operator*=( Arg v )
{ {
m_x *= v.m_x; m_x *= v.m_x;
m_y *= v.m_y; m_y *= v.m_y;
m_z *= v.m_z; m_z *= v.m_z;
m_w *= v.m_w; m_w *= v.m_w;
return *this; return *this;
} }
friend Vec4 operator+( Vec4::Arg left, Vec4::Arg right ) friend Vec4 operator+( Vec4::Arg left, Vec4::Arg right )
{ {
Vec4 copy( left ); Vec4 copy( left );
return copy += right; return copy += right;
} }
friend Vec4 operator-( Vec4::Arg left, Vec4::Arg right ) friend Vec4 operator-( Vec4::Arg left, Vec4::Arg right )
{ {
Vec4 copy( left ); Vec4 copy( left );
return copy -= right; return copy -= right;
} }
friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right ) friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right )
{ {
Vec4 copy( left ); Vec4 copy( left );
return copy *= right; return copy *= right;
} }
//! Returns a*b + c //! Returns a*b + c
friend Vec4 MultiplyAdd( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c ) friend Vec4 MultiplyAdd( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
{ {
return a*b + c; return a*b + c;
} }
//! Returns -( a*b - c ) //! Returns -( a*b - c )
friend Vec4 NegativeMultiplySubtract( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c ) friend Vec4 NegativeMultiplySubtract( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
{ {
return c - a*b; return c - a*b;
} }
friend Vec4 Reciprocal( Vec4::Arg v ) friend Vec4 Reciprocal( Vec4::Arg v )
{ {
return Vec4( return Vec4(
1.0f/v.m_x, 1.0f/v.m_x,
1.0f/v.m_y, 1.0f/v.m_y,
1.0f/v.m_z, 1.0f/v.m_z,
1.0f/v.m_w 1.0f/v.m_w
); );
} }
friend Vec4 Min( Vec4::Arg left, Vec4::Arg right ) friend Vec4 Min( Vec4::Arg left, Vec4::Arg right )
{ {
return Vec4( return Vec4(
std::min( left.m_x, right.m_x ), std::min( left.m_x, right.m_x ),
std::min( left.m_y, right.m_y ), std::min( left.m_y, right.m_y ),
std::min( left.m_z, right.m_z ), std::min( left.m_z, right.m_z ),
std::min( left.m_w, right.m_w ) std::min( left.m_w, right.m_w )
); );
} }
friend Vec4 Max( Vec4::Arg left, Vec4::Arg right ) friend Vec4 Max( Vec4::Arg left, Vec4::Arg right )
{ {
return Vec4( return Vec4(
std::max( left.m_x, right.m_x ), std::max( left.m_x, right.m_x ),
std::max( left.m_y, right.m_y ), std::max( left.m_y, right.m_y ),
std::max( left.m_z, right.m_z ), std::max( left.m_z, right.m_z ),
std::max( left.m_w, right.m_w ) std::max( left.m_w, right.m_w )
); );
} }
friend Vec4 Truncate( Vec4::Arg v ) friend Vec4 Truncate( Vec4::Arg v )
{ {
return Vec4( return Vec4(
v.m_x > 0.0f ? std::floor( v.m_x ) : std::ceil( v.m_x ), v.m_x > 0.0f ? std::floor( v.m_x ) : std::ceil( v.m_x ),
v.m_y > 0.0f ? std::floor( v.m_y ) : std::ceil( v.m_y ), v.m_y > 0.0f ? std::floor( v.m_y ) : std::ceil( v.m_y ),
v.m_z > 0.0f ? std::floor( v.m_z ) : std::ceil( v.m_z ), v.m_z > 0.0f ? std::floor( v.m_z ) : std::ceil( v.m_z ),
v.m_w > 0.0f ? std::floor( v.m_w ) : std::ceil( v.m_w ) v.m_w > 0.0f ? std::floor( v.m_w ) : std::ceil( v.m_w )
); );
} }
friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right ) friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right )
{ {
return left.m_x < right.m_x return left.m_x < right.m_x
|| left.m_y < right.m_y || left.m_y < right.m_y
|| left.m_z < right.m_z || left.m_z < right.m_z
|| left.m_w < right.m_w; || left.m_w < right.m_w;
} }
private: private:
float m_x; float m_x;
float m_y; float m_y;
float m_z; float m_z;
float m_w; float m_w;
}; };
} // namespace squish } // namespace squish

236
thirdparty/squish/simd_sse.h vendored
View File

@@ -1,25 +1,25 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
@@ -31,11 +31,11 @@
#include <emmintrin.h> #include <emmintrin.h>
#endif #endif
#define SQUISH_SSE_SPLAT( a ) \ #define SQUISH_SSE_SPLAT( a ) \
( ( a ) | ( ( a ) << 2 ) | ( ( a ) << 4 ) | ( ( a ) << 6 ) ) ( ( a ) | ( ( a ) << 2 ) | ( ( a ) << 4 ) | ( ( a ) << 6 ) )
#define SQUISH_SSE_SHUF( x, y, z, w ) \ #define SQUISH_SSE_SHUF( x, y, z, w ) \
( ( x ) | ( ( y ) << 2 ) | ( ( z ) << 4 ) | ( ( w ) << 6 ) ) ( ( x ) | ( ( y ) << 2 ) | ( ( z ) << 4 ) | ( ( w ) << 6 ) )
namespace squish { namespace squish {
@@ -44,135 +44,135 @@ namespace squish {
class Vec4 class Vec4
{ {
public: public:
typedef Vec4 const& Arg; typedef Vec4 const& Arg;
Vec4() {} Vec4() {}
explicit Vec4( __m128 v ) : m_v( v ) {} explicit Vec4( __m128 v ) : m_v( v ) {}
Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {} Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {}
Vec4& operator=( Vec4 const& arg ) Vec4& operator=( Vec4 const& arg )
{ {
m_v = arg.m_v; m_v = arg.m_v;
return *this; return *this;
} }
explicit Vec4( float s ) : m_v( _mm_set1_ps( s ) ) {} explicit Vec4( float s ) : m_v( _mm_set1_ps( s ) ) {}
Vec4( float x, float y, float z, float w ) : m_v( _mm_setr_ps( x, y, z, w ) ) {} Vec4( float x, float y, float z, float w ) : m_v( _mm_setr_ps( x, y, z, w ) ) {}
Vec3 GetVec3() const Vec3 GetVec3() const
{ {
#ifdef __GNUC__ #ifdef __GNUC__
__attribute__ ((__aligned__ (16))) float c[4]; __attribute__ ((__aligned__ (16))) float c[4];
#else #else
__declspec(align(16)) float c[4]; __declspec(align(16)) float c[4];
#endif #endif
_mm_store_ps( c, m_v ); _mm_store_ps( c, m_v );
return Vec3( c[0], c[1], c[2] ); return Vec3( c[0], c[1], c[2] );
} }
Vec4 SplatX() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 0 ) ) ); } Vec4 SplatX() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 0 ) ) ); }
Vec4 SplatY() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 1 ) ) ); } Vec4 SplatY() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 1 ) ) ); }
Vec4 SplatZ() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 2 ) ) ); } Vec4 SplatZ() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 2 ) ) ); }
Vec4 SplatW() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 3 ) ) ); } Vec4 SplatW() const { return Vec4( _mm_shuffle_ps( m_v, m_v, SQUISH_SSE_SPLAT( 3 ) ) ); }
Vec4& operator+=( Arg v ) Vec4& operator+=( Arg v )
{ {
m_v = _mm_add_ps( m_v, v.m_v ); m_v = _mm_add_ps( m_v, v.m_v );
return *this; return *this;
} }
Vec4& operator-=( Arg v ) Vec4& operator-=( Arg v )
{ {
m_v = _mm_sub_ps( m_v, v.m_v ); m_v = _mm_sub_ps( m_v, v.m_v );
return *this; return *this;
} }
Vec4& operator*=( Arg v ) Vec4& operator*=( Arg v )
{ {
m_v = _mm_mul_ps( m_v, v.m_v ); m_v = _mm_mul_ps( m_v, v.m_v );
return *this; return *this;
} }
friend Vec4 operator+( Vec4::Arg left, Vec4::Arg right ) friend Vec4 operator+( Vec4::Arg left, Vec4::Arg right )
{ {
return Vec4( _mm_add_ps( left.m_v, right.m_v ) ); return Vec4( _mm_add_ps( left.m_v, right.m_v ) );
} }
friend Vec4 operator-( Vec4::Arg left, Vec4::Arg right ) friend Vec4 operator-( Vec4::Arg left, Vec4::Arg right )
{ {
return Vec4( _mm_sub_ps( left.m_v, right.m_v ) ); return Vec4( _mm_sub_ps( left.m_v, right.m_v ) );
} }
friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right ) friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right )
{ {
return Vec4( _mm_mul_ps( left.m_v, right.m_v ) ); return Vec4( _mm_mul_ps( left.m_v, right.m_v ) );
} }
//! Returns a*b + c //! Returns a*b + c
friend Vec4 MultiplyAdd( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c ) friend Vec4 MultiplyAdd( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
{ {
return Vec4( _mm_add_ps( _mm_mul_ps( a.m_v, b.m_v ), c.m_v ) ); return Vec4( _mm_add_ps( _mm_mul_ps( a.m_v, b.m_v ), c.m_v ) );
} }
//! Returns -( a*b - c ) //! Returns -( a*b - c )
friend Vec4 NegativeMultiplySubtract( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c ) friend Vec4 NegativeMultiplySubtract( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
{ {
return Vec4( _mm_sub_ps( c.m_v, _mm_mul_ps( a.m_v, b.m_v ) ) ); return Vec4( _mm_sub_ps( c.m_v, _mm_mul_ps( a.m_v, b.m_v ) ) );
} }
friend Vec4 Reciprocal( Vec4::Arg v ) friend Vec4 Reciprocal( Vec4::Arg v )
{ {
// get the reciprocal estimate // get the reciprocal estimate
__m128 estimate = _mm_rcp_ps( v.m_v ); __m128 estimate = _mm_rcp_ps( v.m_v );
// one round of Newton-Rhaphson refinement // one round of Newton-Rhaphson refinement
__m128 diff = _mm_sub_ps( _mm_set1_ps( 1.0f ), _mm_mul_ps( estimate, v.m_v ) ); __m128 diff = _mm_sub_ps( _mm_set1_ps( 1.0f ), _mm_mul_ps( estimate, v.m_v ) );
return Vec4( _mm_add_ps( _mm_mul_ps( diff, estimate ), estimate ) ); return Vec4( _mm_add_ps( _mm_mul_ps( diff, estimate ), estimate ) );
} }
friend Vec4 Min( Vec4::Arg left, Vec4::Arg right ) friend Vec4 Min( Vec4::Arg left, Vec4::Arg right )
{ {
return Vec4( _mm_min_ps( left.m_v, right.m_v ) ); return Vec4( _mm_min_ps( left.m_v, right.m_v ) );
} }
friend Vec4 Max( Vec4::Arg left, Vec4::Arg right ) friend Vec4 Max( Vec4::Arg left, Vec4::Arg right )
{ {
return Vec4( _mm_max_ps( left.m_v, right.m_v ) ); return Vec4( _mm_max_ps( left.m_v, right.m_v ) );
} }
friend Vec4 Truncate( Vec4::Arg v ) friend Vec4 Truncate( Vec4::Arg v )
{ {
#if ( SQUISH_USE_SSE == 1 ) #if ( SQUISH_USE_SSE == 1 )
// convert to ints // convert to ints
__m128 input = v.m_v; __m128 input = v.m_v;
__m64 lo = _mm_cvttps_pi32( input ); __m64 lo = _mm_cvttps_pi32( input );
__m64 hi = _mm_cvttps_pi32( _mm_movehl_ps( input, input ) ); __m64 hi = _mm_cvttps_pi32( _mm_movehl_ps( input, input ) );
// convert to floats // convert to floats
__m128 part = _mm_movelh_ps( input, _mm_cvtpi32_ps( input, hi ) ); __m128 part = _mm_movelh_ps( input, _mm_cvtpi32_ps( input, hi ) );
__m128 truncated = _mm_cvtpi32_ps( part, lo ); __m128 truncated = _mm_cvtpi32_ps( part, lo );
// clear out the MMX multimedia state to allow FP calls later // clear out the MMX multimedia state to allow FP calls later
_mm_empty(); _mm_empty();
return Vec4( truncated ); return Vec4( truncated );
#else #else
// use SSE2 instructions // use SSE2 instructions
return Vec4( _mm_cvtepi32_ps( _mm_cvttps_epi32( v.m_v ) ) ); return Vec4( _mm_cvtepi32_ps( _mm_cvttps_epi32( v.m_v ) ) );
#endif #endif
} }
friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right ) friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right )
{ {
__m128 bits = _mm_cmplt_ps( left.m_v, right.m_v ); __m128 bits = _mm_cmplt_ps( left.m_v, right.m_v );
int value = _mm_movemask_ps( bits ); int value = _mm_movemask_ps( bits );
return value != 0; return value != 0;
} }
private: private:
__m128 m_v; __m128 m_v;
}; };
} // namespace squish } // namespace squish

234
thirdparty/squish/simd_ve.h vendored
View File

@@ -1,25 +1,25 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
@@ -31,134 +31,134 @@
namespace squish { namespace squish {
#define VEC4_CONST( X ) Vec4( ( vector float )( X ) ) #define VEC4_CONST( X ) Vec4( ( vector float ){ X } )
class Vec4 class Vec4
{ {
public: public:
typedef Vec4 Arg; typedef Vec4 Arg;
Vec4() {} Vec4() {}
explicit Vec4( vector float v ) : m_v( v ) {} explicit Vec4( vector float v ) : m_v( v ) {}
Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {} Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {}
Vec4& operator=( Vec4 const& arg ) Vec4& operator=( Vec4 const& arg )
{ {
m_v = arg.m_v; m_v = arg.m_v;
return *this; return *this;
} }
explicit Vec4( float s ) explicit Vec4( float s )
{ {
union { vector float v; float c[4]; } u; union { vector float v; float c[4]; } u;
u.c[0] = s; u.c[0] = s;
u.c[1] = s; u.c[1] = s;
u.c[2] = s; u.c[2] = s;
u.c[3] = s; u.c[3] = s;
m_v = u.v; m_v = u.v;
} }
Vec4( float x, float y, float z, float w ) Vec4( float x, float y, float z, float w )
{ {
union { vector float v; float c[4]; } u; union { vector float v; float c[4]; } u;
u.c[0] = x; u.c[0] = x;
u.c[1] = y; u.c[1] = y;
u.c[2] = z; u.c[2] = z;
u.c[3] = w; u.c[3] = w;
m_v = u.v; m_v = u.v;
} }
Vec3 GetVec3() const Vec3 GetVec3() const
{ {
union { vector float v; float c[4]; } u; union { vector float v; float c[4]; } u;
u.v = m_v; u.v = m_v;
return Vec3( u.c[0], u.c[1], u.c[2] ); return Vec3( u.c[0], u.c[1], u.c[2] );
} }
Vec4 SplatX() const { return Vec4( vec_splat( m_v, 0 ) ); } Vec4 SplatX() const { return Vec4( vec_splat( m_v, 0 ) ); }
Vec4 SplatY() const { return Vec4( vec_splat( m_v, 1 ) ); } Vec4 SplatY() const { return Vec4( vec_splat( m_v, 1 ) ); }
Vec4 SplatZ() const { return Vec4( vec_splat( m_v, 2 ) ); } Vec4 SplatZ() const { return Vec4( vec_splat( m_v, 2 ) ); }
Vec4 SplatW() const { return Vec4( vec_splat( m_v, 3 ) ); } Vec4 SplatW() const { return Vec4( vec_splat( m_v, 3 ) ); }
Vec4& operator+=( Arg v ) Vec4& operator+=( Arg v )
{ {
m_v = vec_add( m_v, v.m_v ); m_v = vec_add( m_v, v.m_v );
return *this; return *this;
} }
Vec4& operator-=( Arg v ) Vec4& operator-=( Arg v )
{ {
m_v = vec_sub( m_v, v.m_v ); m_v = vec_sub( m_v, v.m_v );
return *this; return *this;
} }
Vec4& operator*=( Arg v ) Vec4& operator*=( Arg v )
{ {
m_v = vec_madd( m_v, v.m_v, ( vector float )( -0.0f ) ); m_v = vec_madd( m_v, v.m_v, ( vector float ){ -0.0f } );
return *this; return *this;
} }
friend Vec4 operator+( Vec4::Arg left, Vec4::Arg right ) friend Vec4 operator+( Vec4::Arg left, Vec4::Arg right )
{ {
return Vec4( vec_add( left.m_v, right.m_v ) ); return Vec4( vec_add( left.m_v, right.m_v ) );
} }
friend Vec4 operator-( Vec4::Arg left, Vec4::Arg right ) friend Vec4 operator-( Vec4::Arg left, Vec4::Arg right )
{ {
return Vec4( vec_sub( left.m_v, right.m_v ) ); return Vec4( vec_sub( left.m_v, right.m_v ) );
} }
friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right ) friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right )
{ {
return Vec4( vec_madd( left.m_v, right.m_v, ( vector float )( -0.0f ) ) ); return Vec4( vec_madd( left.m_v, right.m_v, ( vector float ){ -0.0f } ) );
} }
//! Returns a*b + c //! Returns a*b + c
friend Vec4 MultiplyAdd( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c ) friend Vec4 MultiplyAdd( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
{ {
return Vec4( vec_madd( a.m_v, b.m_v, c.m_v ) ); return Vec4( vec_madd( a.m_v, b.m_v, c.m_v ) );
} }
//! Returns -( a*b - c ) //! Returns -( a*b - c )
friend Vec4 NegativeMultiplySubtract( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c ) friend Vec4 NegativeMultiplySubtract( Vec4::Arg a, Vec4::Arg b, Vec4::Arg c )
{ {
return Vec4( vec_nmsub( a.m_v, b.m_v, c.m_v ) ); return Vec4( vec_nmsub( a.m_v, b.m_v, c.m_v ) );
} }
friend Vec4 Reciprocal( Vec4::Arg v ) friend Vec4 Reciprocal( Vec4::Arg v )
{ {
// get the reciprocal estimate // get the reciprocal estimate
vector float estimate = vec_re( v.m_v ); vector float estimate = vec_re( v.m_v );
// one round of Newton-Rhaphson refinement // one round of Newton-Rhaphson refinement
vector float diff = vec_nmsub( estimate, v.m_v, ( vector float )( 1.0f ) ); vector float diff = vec_nmsub( estimate, v.m_v, ( vector float ){ 1.0f } );
return Vec4( vec_madd( diff, estimate, estimate ) ); return Vec4( vec_madd( diff, estimate, estimate ) );
} }
friend Vec4 Min( Vec4::Arg left, Vec4::Arg right ) friend Vec4 Min( Vec4::Arg left, Vec4::Arg right )
{ {
return Vec4( vec_min( left.m_v, right.m_v ) ); return Vec4( vec_min( left.m_v, right.m_v ) );
} }
friend Vec4 Max( Vec4::Arg left, Vec4::Arg right ) friend Vec4 Max( Vec4::Arg left, Vec4::Arg right )
{ {
return Vec4( vec_max( left.m_v, right.m_v ) ); return Vec4( vec_max( left.m_v, right.m_v ) );
} }
friend Vec4 Truncate( Vec4::Arg v ) friend Vec4 Truncate( Vec4::Arg v )
{ {
return Vec4( vec_trunc( v.m_v ) ); return Vec4( vec_trunc( v.m_v ) );
} }
friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right ) friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right )
{ {
return vec_any_lt( left.m_v, right.m_v ) != 0; return vec_any_lt( left.m_v, right.m_v ) != 0;
} }
private: private:
vector float m_v; vector float m_v;
}; };
} // namespace squish } // namespace squish

225
thirdparty/squish/singlecolourfit.cpp vendored
View File

@@ -1,173 +1,172 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#include "singlecolourfit.h" #include "singlecolourfit.h"
#include "colourset.h" #include "colourset.h"
#include "colourblock.h" #include "colourblock.h"
#include <climits>
namespace squish { namespace squish {
struct SourceBlock struct SourceBlock
{ {
u8 start; u8 start;
u8 end; u8 end;
u8 error; u8 error;
}; };
struct SingleColourLookup struct SingleColourLookup
{ {
SourceBlock sources[2]; SourceBlock sources[2];
}; };
#include "singlecolourlookup.inl" #include "singlecolourlookup.inl"
static int FloatToInt( float a, int limit ) static int FloatToInt( float a, int limit )
{ {
// use ANSI round-to-zero behaviour to get round-to-nearest // use ANSI round-to-zero behaviour to get round-to-nearest
int i = ( int )( a + 0.5f ); int i = ( int )( a + 0.5f );
// clamp to the limit // clamp to the limit
if( i < 0 ) if( i < 0 )
i = 0; i = 0;
else if( i > limit ) else if( i > limit )
i = limit; i = limit;
// done // done
return i; return i;
} }
SingleColourFit::SingleColourFit( ColourSet const* colours, int flags ) SingleColourFit::SingleColourFit( ColourSet const* colours, int flags )
: ColourFit( colours, flags ) : ColourFit( colours, flags )
{ {
// grab the single colour // grab the single colour
Vec3 const* values = m_colours->GetPoints(); Vec3 const* values = m_colours->GetPoints();
m_colour[0] = ( u8 )FloatToInt( 255.0f*values->X(), 255 ); m_colour[0] = ( u8 )FloatToInt( 255.0f*values->X(), 255 );
m_colour[1] = ( u8 )FloatToInt( 255.0f*values->Y(), 255 ); m_colour[1] = ( u8 )FloatToInt( 255.0f*values->Y(), 255 );
m_colour[2] = ( u8 )FloatToInt( 255.0f*values->Z(), 255 ); m_colour[2] = ( u8 )FloatToInt( 255.0f*values->Z(), 255 );
// initialise the best error // initialise the best error
m_besterror = INT_MAX; m_besterror = INT_MAX;
} }
void SingleColourFit::Compress3( void* block ) void SingleColourFit::Compress3( void* block )
{ {
// build the table of lookups // build the table of lookups
SingleColourLookup const* const lookups[] = SingleColourLookup const* const lookups[] =
{ {
lookup_5_3, lookup_5_3,
lookup_6_3, lookup_6_3,
lookup_5_3 lookup_5_3
}; };
// find the best end-points and index // find the best end-points and index
ComputeEndPoints( lookups ); ComputeEndPoints( lookups );
// build the block if we win // build the block if we win
if( m_error < m_besterror ) if( m_error < m_besterror )
{ {
// remap the indices // remap the indices
u8 indices[16]; u8 indices[16];
m_colours->RemapIndices( &m_index, indices ); m_colours->RemapIndices( &m_index, indices );
// save the block // save the block
WriteColourBlock3( m_start, m_end, indices, block ); WriteColourBlock3( m_start, m_end, indices, block );
// save the error // save the error
m_besterror = m_error; m_besterror = m_error;
} }
} }
void SingleColourFit::Compress4( void* block ) void SingleColourFit::Compress4( void* block )
{ {
// build the table of lookups // build the table of lookups
SingleColourLookup const* const lookups[] = SingleColourLookup const* const lookups[] =
{ {
lookup_5_4, lookup_5_4,
lookup_6_4, lookup_6_4,
lookup_5_4 lookup_5_4
}; };
// find the best end-points and index // find the best end-points and index
ComputeEndPoints( lookups ); ComputeEndPoints( lookups );
// build the block if we win // build the block if we win
if( m_error < m_besterror ) if( m_error < m_besterror )
{ {
// remap the indices // remap the indices
u8 indices[16]; u8 indices[16];
m_colours->RemapIndices( &m_index, indices ); m_colours->RemapIndices( &m_index, indices );
// save the block // save the block
WriteColourBlock4( m_start, m_end, indices, block ); WriteColourBlock4( m_start, m_end, indices, block );
// save the error // save the error
m_besterror = m_error; m_besterror = m_error;
} }
} }
void SingleColourFit::ComputeEndPoints( SingleColourLookup const* const* lookups ) void SingleColourFit::ComputeEndPoints( SingleColourLookup const* const* lookups )
{ {
// check each index combination (endpoint or intermediate) // check each index combination (endpoint or intermediate)
m_error = INT_MAX; m_error = INT_MAX;
for( int index = 0; index < 2; ++index ) for( int index = 0; index < 2; ++index )
{ {
// check the error for this codebook index // check the error for this codebook index
SourceBlock const* sources[3]; SourceBlock const* sources[3];
int error = 0; int error = 0;
for( int channel = 0; channel < 3; ++channel ) for( int channel = 0; channel < 3; ++channel )
{ {
// grab the lookup table and index for this channel // grab the lookup table and index for this channel
SingleColourLookup const* lookup = lookups[channel]; SingleColourLookup const* lookup = lookups[channel];
int target = m_colour[channel]; int target = m_colour[channel];
// store a pointer to the source for this channel // store a pointer to the source for this channel
sources[channel] = lookup[target].sources + index; sources[channel] = lookup[target].sources + index;
// accumulate the error // accumulate the error
int diff = sources[channel]->error; int diff = sources[channel]->error;
error += diff*diff; error += diff*diff;
} }
// keep it if the error is lower // keep it if the error is lower
if( error < m_error ) if( error < m_error )
{ {
m_start = Vec3( m_start = Vec3(
( float )sources[0]->start/31.0f, ( float )sources[0]->start/31.0f,
( float )sources[1]->start/63.0f, ( float )sources[1]->start/63.0f,
( float )sources[2]->start/31.0f ( float )sources[2]->start/31.0f
); );
m_end = Vec3( m_end = Vec3(
( float )sources[0]->end/31.0f, ( float )sources[0]->end/31.0f,
( float )sources[1]->end/63.0f, ( float )sources[1]->end/63.0f,
( float )sources[2]->end/31.0f ( float )sources[2]->end/31.0f
); );
m_index = ( u8 )( 2*index ); m_index = ( u8 )( 2*index );
m_error = error; m_error = error;
} }
} }
} }
} // namespace squish } // namespace squish

56
thirdparty/squish/singlecolourfit.h vendored
View File

@@ -1,32 +1,32 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#ifndef SQUISH_SINGLECOLOURFIT_H #ifndef SQUISH_SINGLECOLOURFIT_H
#define SQUISH_SINGLECOLOURFIT_H #define SQUISH_SINGLECOLOURFIT_H
#include <squish.h> #include "squish.h"
#include "colourfit.h" #include "colourfit.h"
namespace squish { namespace squish {
@@ -37,20 +37,20 @@ struct SingleColourLookup;
class SingleColourFit : public ColourFit class SingleColourFit : public ColourFit
{ {
public: public:
SingleColourFit( ColourSet const* colours, int flags ); SingleColourFit( ColourSet const* colours, int flags );
private: private:
virtual void Compress3( void* block ); virtual void Compress3( void* block );
virtual void Compress4( void* block ); virtual void Compress4( void* block );
void ComputeEndPoints( SingleColourLookup const* const* lookups ); void ComputeEndPoints( SingleColourLookup const* const* lookups );
u8 m_colour[3]; u8 m_colour[3];
Vec3 m_start; Vec3 m_start;
Vec3 m_end; Vec3 m_end;
u8 m_index; u8 m_index;
int m_error; int m_error;
int m_besterror; int m_besterror;
}; };
} // namespace squish } // namespace squish

2072
thirdparty/squish/singlecolourlookup.inl vendored
View File

File diff suppressed because it is too large Load Diff

508
thirdparty/squish/squish.cpp vendored
View File

@@ -1,29 +1,30 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#include <squish.h> #include <string.h>
#include "squish.h"
#include "colourset.h" #include "colourset.h"
#include "maths.h" #include "maths.h"
#include "rangefit.h" #include "rangefit.h"
@@ -36,204 +37,359 @@ namespace squish {
static int FixFlags( int flags ) static int FixFlags( int flags )
{ {
// grab the flag bits // grab the flag bits
int method = flags & ( kDxt1 | kDxt3 | kDxt5 ); int method = flags & ( kDxt1 | kDxt3 | kDxt5 | kBc4 | kBc5 );
int fit = flags & ( kColourIterativeClusterFit | kColourClusterFit | kColourRangeFit ); int fit = flags & ( kColourIterativeClusterFit | kColourClusterFit | kColourRangeFit );
int metric = flags & ( kColourMetricPerceptual | kColourMetricUniform ); int extra = flags & kWeightColourByAlpha;
int extra = flags & kWeightColourByAlpha;
// set defaults // set defaults
if( method != kDxt3 && method != kDxt5 ) if ( method != kDxt3
method = kDxt1; && method != kDxt5
if( fit != kColourRangeFit ) && method != kBc4
fit = kColourClusterFit; && method != kBc5 )
if( metric != kColourMetricUniform ) {
metric = kColourMetricPerceptual; method = kDxt1;
}
if( fit != kColourRangeFit && fit != kColourIterativeClusterFit )
fit = kColourClusterFit;
// done // done
return method | fit | metric | extra; return method | fit | extra;
} }
void Compress( u8 const* rgba, void* block, int flags ) void CompressMasked( u8 const* rgba, int mask, void* block, int flags, float* metric )
{ {
// compress with full mask // fix any bad flags
CompressMasked( rgba, 0xffff, block, flags ); flags = FixFlags( flags );
}
void CompressMasked( u8 const* rgba, int mask, void* block, int flags ) if ( ( flags & ( kBc4 | kBc5 ) ) != 0 )
{ {
// fix any bad flags u8 alpha[16*4];
flags = FixFlags( flags ); for( int i = 0; i < 16; ++i )
{
alpha[i*4 + 3] = rgba[i*4 + 0]; // copy R to A
}
// get the block locations u8* rBlock = reinterpret_cast< u8* >( block );
void* colourBlock = block; CompressAlphaDxt5( alpha, mask, rBlock );
void* alphaBock = block;
if( ( flags & ( kDxt3 | kDxt5 ) ) != 0 )
colourBlock = reinterpret_cast< u8* >( block ) + 8;
// create the minimal point set if ( ( flags & ( kBc5 ) ) != 0 )
ColourSet colours( rgba, mask, flags ); {
for( int i = 0; i < 16; ++i )
{
alpha[i*4 + 3] = rgba[i*4 + 1]; // copy G to A
}
// check the compression type and compress colour u8* gBlock = reinterpret_cast< u8* >( block ) + 8;
if( colours.GetCount() == 1 ) CompressAlphaDxt5( alpha, mask, gBlock );
{ }
// always do a single colour fit
SingleColourFit fit( &colours, flags );
fit.Compress( colourBlock );
}
else if( ( flags & kColourRangeFit ) != 0 || colours.GetCount() == 0 )
{
// do a range fit
RangeFit fit( &colours, flags );
fit.Compress( colourBlock );
}
else
{
// default to a cluster fit (could be iterative or not)
ClusterFit fit( &colours, flags );
fit.Compress( colourBlock );
}
// compress alpha separately if necessary return;
if( ( flags & kDxt3 ) != 0 ) }
CompressAlphaDxt3( rgba, mask, alphaBock );
else if( ( flags & kDxt5 ) != 0 ) // get the block locations
CompressAlphaDxt5( rgba, mask, alphaBock ); void* colourBlock = block;
void* alphaBlock = block;
if( ( flags & ( kDxt3 | kDxt5 ) ) != 0 )
colourBlock = reinterpret_cast< u8* >( block ) + 8;
// create the minimal point set
ColourSet colours( rgba, mask, flags );
// check the compression type and compress colour
if( colours.GetCount() == 1 )
{
// always do a single colour fit
SingleColourFit fit( &colours, flags );
fit.Compress( colourBlock );
}
else if( ( flags & kColourRangeFit ) != 0 || colours.GetCount() == 0 )
{
// do a range fit
RangeFit fit( &colours, flags, metric );
fit.Compress( colourBlock );
}
else
{
// default to a cluster fit (could be iterative or not)
ClusterFit fit( &colours, flags, metric );
fit.Compress( colourBlock );
}
// compress alpha separately if necessary
if( ( flags & kDxt3 ) != 0 )
CompressAlphaDxt3( rgba, mask, alphaBlock );
else if( ( flags & kDxt5 ) != 0 )
CompressAlphaDxt5( rgba, mask, alphaBlock );
} }
void Decompress( u8* rgba, void const* block, int flags ) void Decompress( u8* rgba, void const* block, int flags )
{ {
// fix any bad flags // fix any bad flags
flags = FixFlags( flags ); flags = FixFlags( flags );
// get the block locations // get the block locations
void const* colourBlock = block; void const* colourBlock = block;
void const* alphaBock = block; void const* alphaBlock = block;
if( ( flags & ( kDxt3 | kDxt5 ) ) != 0 ) if( ( flags & ( kDxt3 | kDxt5 ) ) != 0 )
colourBlock = reinterpret_cast< u8 const* >( block ) + 8; colourBlock = reinterpret_cast< u8 const* >( block ) + 8;
// decompress colour // decompress colour
DecompressColour( rgba, colourBlock, ( flags & kDxt1 ) != 0 ); DecompressColour( rgba, colourBlock, ( flags & kDxt1 ) != 0 );
// decompress alpha separately if necessary // decompress alpha separately if necessary
if( ( flags & kDxt3 ) != 0 ) if( ( flags & kDxt3 ) != 0 )
DecompressAlphaDxt3( rgba, alphaBock ); DecompressAlphaDxt3( rgba, alphaBlock );
else if( ( flags & kDxt5 ) != 0 ) else if( ( flags & kDxt5 ) != 0 )
DecompressAlphaDxt5( rgba, alphaBock ); DecompressAlphaDxt5( rgba, alphaBlock );
} }
int GetStorageRequirements( int width, int height, int flags ) int GetStorageRequirements( int width, int height, int flags )
{ {
// fix any bad flags // fix any bad flags
flags = FixFlags( flags ); flags = FixFlags( flags );
// compute the storage requirements // compute the storage requirements
int blockcount = ( ( width + 3 )/4 ) * ( ( height + 3 )/4 ); int blockcount = ( ( width + 3 )/4 ) * ( ( height + 3 )/4 );
int blocksize = ( ( flags & kDxt1 ) != 0 ) ? 8 : 16; int blocksize = ( ( flags & ( kDxt1 | kBc4 ) ) != 0 ) ? 8 : 16;
return blockcount*blocksize; return blockcount*blocksize;
} }
void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags ) void CopyRGBA( u8 const* source, u8* dest, int flags )
{ {
// fix any bad flags if (flags & kSourceBGRA)
flags = FixFlags( flags ); {
// convert from bgra to rgba
dest[0] = source[2];
dest[1] = source[1];
dest[2] = source[0];
dest[3] = source[3];
}
else
{
for( int i = 0; i < 4; ++i )
*dest++ = *source++;
}
}
// initialise the block output void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric )
u8* targetBlock = reinterpret_cast< u8* >( blocks ); {
int bytesPerBlock = ( ( flags & kDxt1 ) != 0 ) ? 8 : 16; // fix any bad flags
flags = FixFlags( flags );
// loop over blocks // initialise the block output
for( int y = 0; y < height; y += 4 ) u8* targetBlock = reinterpret_cast< u8* >( blocks );
{ int bytesPerBlock = ( ( flags & ( kDxt1 | kBc4 ) ) != 0 ) ? 8 : 16;
for( int x = 0; x < width; x += 4 )
{
// build the 4x4 block of pixels
u8 sourceRgba[16*4];
u8* targetPixel = sourceRgba;
int mask = 0;
for( int py = 0; py < 4; ++py )
{
for( int px = 0; px < 4; ++px )
{
// get the source pixel in the image
int sx = x + px;
int sy = y + py;
// enable if we're in the image // loop over blocks
if( sx < width && sy < height ) for( int y = 0; y < height; y += 4 )
{ {
// copy the rgba value for( int x = 0; x < width; x += 4 )
u8 const* sourcePixel = rgba + 4*( width*sy + sx ); {
for( int i = 0; i < 4; ++i ) // build the 4x4 block of pixels
*targetPixel++ = *sourcePixel++; u8 sourceRgba[16*4];
u8* targetPixel = sourceRgba;
int mask = 0;
for( int py = 0; py < 4; ++py )
{
for( int px = 0; px < 4; ++px )
{
// get the source pixel in the image
int sx = x + px;
int sy = y + py;
// enable this pixel // enable if we're in the image
mask |= ( 1 << ( 4*py + px ) ); if( sx < width && sy < height )
} {
else // copy the rgba value
{ u8 const* sourcePixel = rgba + pitch*sy + 4*sx;
// skip this pixel as its outside the image CopyRGBA(sourcePixel, targetPixel, flags);
targetPixel += 4; // enable this pixel
} mask |= ( 1 << ( 4*py + px ) );
} }
}
// compress it into the output // advance to the next pixel
CompressMasked( sourceRgba, mask, targetBlock, flags ); targetPixel += 4;
}
}
// advance // compress it into the output
targetBlock += bytesPerBlock; CompressMasked( sourceRgba, mask, targetBlock, flags, metric );
}
} // advance
targetBlock += bytesPerBlock;
}
}
}
void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric )
{
CompressImage(rgba, width, height, width*4, blocks, flags, metric);
}
void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags )
{
// fix any bad flags
flags = FixFlags( flags );
// initialise the block input
u8 const* sourceBlock = reinterpret_cast< u8 const* >( blocks );
int bytesPerBlock = ( ( flags & ( kDxt1 | kBc4 ) ) != 0 ) ? 8 : 16;
// loop over blocks
for( int y = 0; y < height; y += 4 )
{
for( int x = 0; x < width; x += 4 )
{
// decompress the block
u8 targetRgba[4*16];
Decompress( targetRgba, sourceBlock, flags );
// write the decompressed pixels to the correct image locations
u8 const* sourcePixel = targetRgba;
for( int py = 0; py < 4; ++py )
{
for( int px = 0; px < 4; ++px )
{
// get the target location
int sx = x + px;
int sy = y + py;
// write if we're in the image
if( sx < width && sy < height )
{
// copy the rgba value
u8* targetPixel = rgba + pitch*sy + 4*sx;
CopyRGBA(sourcePixel, targetPixel, flags);
}
// advance to the next pixel
sourcePixel += 4;
}
}
// advance
sourceBlock += bytesPerBlock;
}
}
} }
void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags ) void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags )
{ {
// fix any bad flags DecompressImage( rgba, width, height, width*4, blocks, flags );
flags = FixFlags( flags ); }
// initialise the block input static double ErrorSq(double x, double y)
u8 const* sourceBlock = reinterpret_cast< u8 const* >( blocks ); {
int bytesPerBlock = ( ( flags & kDxt1 ) != 0 ) ? 8 : 16; return (x - y) * (x - y);
}
// loop over blocks static void ComputeBlockWMSE(u8 const *original, u8 const *compressed, unsigned int w, unsigned int h, double &cmse, double &amse)
for( int y = 0; y < height; y += 4 ) {
{ // Computes the MSE for the block and weights it by the variance of the original block.
for( int x = 0; x < width; x += 4 ) // If the variance of the original block is less than 4 (i.e. a standard deviation of 1 per channel)
{ // then the block is close to being a single colour. Quantisation errors in single colour blocks
// decompress the block // are easier to see than similar errors in blocks that contain more colours, particularly when there
u8 targetRgba[4*16]; // are many such blocks in a large area (eg a blue sky background) as they cause banding. Given that
Decompress( targetRgba, sourceBlock, flags ); // banding is easier to see than small errors in "complex" blocks, we weight the errors by a factor
// of 5. This implies that images with large, single colour areas will have a higher potential WMSE
// than images with lots of detail.
// write the decompressed pixels to the correct image locations cmse = amse = 0;
u8 const* sourcePixel = targetRgba; unsigned int sum_p[4]; // per channel sum of pixels
for( int py = 0; py < 4; ++py ) unsigned int sum_p2[4]; // per channel sum of pixels squared
{ memset(sum_p, 0, sizeof(sum_p));
for( int px = 0; px < 4; ++px ) memset(sum_p2, 0, sizeof(sum_p2));
{ for( unsigned int py = 0; py < 4; ++py )
// get the target location {
int sx = x + px; for( unsigned int px = 0; px < 4; ++px )
int sy = y + py; {
if( sx < width && sy < height ) if( px < w && py < h )
{ {
u8* targetPixel = rgba + 4*( width*sy + sx ); double pixelCMSE = 0;
for( int i = 0; i < 3; ++i )
{
pixelCMSE += ErrorSq(original[i], compressed[i]);
sum_p[i] += original[i];
sum_p2[i] += (unsigned int)original[i]*original[i];
}
if( original[3] == 0 && compressed[3] == 0 )
pixelCMSE = 0; // transparent in both, so colour is inconsequential
amse += ErrorSq(original[3], compressed[3]);
cmse += pixelCMSE;
sum_p[3] += original[3];
sum_p2[3] += (unsigned int)original[3]*original[3];
}
original += 4;
compressed += 4;
}
}
unsigned int variance = 0;
for( int i = 0; i < 4; ++i )
variance += w*h*sum_p2[i] - sum_p[i]*sum_p[i];
if( variance < 4 * w * w * h * h )
{
amse *= 5;
cmse *= 5;
}
}
// copy the rgba value void ComputeMSE( u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE )
for( int i = 0; i < 4; ++i ) {
*targetPixel++ = *sourcePixel++; // fix any bad flags
} flags = FixFlags( flags );
else colourMSE = alphaMSE = 0;
{
// skip this pixel as its outside the image
sourcePixel += 4;
}
}
}
// advance // initialise the block input
sourceBlock += bytesPerBlock; squish::u8 const* sourceBlock = dxt;
} int bytesPerBlock = ( ( flags & squish::kDxt1 ) != 0 ) ? 8 : 16;
}
// loop over blocks
for( int y = 0; y < height; y += 4 )
{
for( int x = 0; x < width; x += 4 )
{
// decompress the block
u8 targetRgba[4*16];
Decompress( targetRgba, sourceBlock, flags );
u8 const* sourcePixel = targetRgba;
// copy across to a similar pixel block
u8 originalRgba[4*16];
u8* originalPixel = originalRgba;
for( int py = 0; py < 4; ++py )
{
for( int px = 0; px < 4; ++px )
{
int sx = x + px;
int sy = y + py;
if( sx < width && sy < height )
{
u8 const* targetPixel = rgba + pitch*sy + 4*sx;
CopyRGBA(targetPixel, originalPixel, flags);
}
sourcePixel += 4;
originalPixel += 4;
}
}
// compute the weighted MSE of the block
double blockCMSE, blockAMSE;
ComputeBlockWMSE(originalRgba, targetRgba, std::min(4, width - x), std::min(4, height - y), blockCMSE, blockAMSE);
colourMSE += blockCMSE;
alphaMSE += blockAMSE;
// advance
sourceBlock += bytesPerBlock;
}
}
colourMSE /= (width * height * 3);
alphaMSE /= (width * height);
}
void ComputeMSE( u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE )
{
ComputeMSE(rgba, width, height, width*4, dxt, flags, colourMSE, alphaMSE);
} }
} // namespace squish } // namespace squish

341
thirdparty/squish/squish.h vendored
View File

@@ -1,25 +1,25 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Copyright (c) 2006 Simon Brown si@sjbrown.co.uk Copyright (c) 2006 Simon Brown si@sjbrown.co.uk
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to permit persons to whom the Software is furnished to do so, subject to
the following conditions: the following conditions:
The above copyright notice and this permission notice shall be included The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software. in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
@@ -38,124 +38,143 @@ typedef unsigned char u8;
enum enum
{ {
//! Use DXT1 compression. //! Use DXT1 compression.
kDxt1 = ( 1 << 0 ), kDxt1 = ( 1 << 0 ),
//! Use DXT3 compression. //! Use DXT3 compression.
kDxt3 = ( 1 << 1 ), kDxt3 = ( 1 << 1 ),
//! Use DXT5 compression. //! Use DXT5 compression.
kDxt5 = ( 1 << 2 ), kDxt5 = ( 1 << 2 ),
//! Use a very slow but very high quality colour compressor. //! Use BC4 compression.
kColourIterativeClusterFit = ( 1 << 8 ), kBc4 = ( 1 << 3 ),
//! Use a slow but high quality colour compressor (the default). //! Use BC5 compression.
kColourClusterFit = ( 1 << 3 ), kBc5 = ( 1 << 4 ),
//! Use a fast but low quality colour compressor. //! Use a slow but high quality colour compressor (the default).
kColourRangeFit = ( 1 << 4 ), kColourClusterFit = ( 1 << 5 ),
//! Use a perceptual metric for colour error (the default). //! Use a fast but low quality colour compressor.
kColourMetricPerceptual = ( 1 << 5 ), kColourRangeFit = ( 1 << 6 ),
//! Use a uniform metric for colour error. //! Weight the colour by alpha during cluster fit (disabled by default).
kColourMetricUniform = ( 1 << 6 ), kWeightColourByAlpha = ( 1 << 7 ),
//! Weight the colour by alpha during cluster fit (disabled by default). //! Use a very slow but very high quality colour compressor.
kWeightColourByAlpha = ( 1 << 7 ) kColourIterativeClusterFit = ( 1 << 8 ),
//! Source is BGRA rather than RGBA
kSourceBGRA = ( 1 << 9 )
}; };
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
/*! @brief Compresses a 4x4 block of pixels. /*! @brief Compresses a 4x4 block of pixels.
@param rgba The rgba values of the 16 source pixels. @param rgba The rgba values of the 16 source pixels.
@param block Storage for the compressed DXT block. @param mask The valid pixel mask.
@param flags Compression flags. @param block Storage for the compressed DXT block.
@param flags Compression flags.
@param metric An optional perceptual metric.
The source pixels should be presented as a contiguous array of 16 rgba The source pixels should be presented as a contiguous array of 16 rgba
values, with each component as 1 byte each. In memory this should be: values, with each component as 1 byte each. In memory this should be:
{ r1, g1, b1, a1, .... , r16, g16, b16, a16 } { r1, g1, b1, a1, .... , r16, g16, b16, a16 }
The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, The mask parameter enables only certain pixels within the block. The lowest
however, DXT1 will be used by default if none is specified. When using DXT1 bit enables the first pixel and so on up to the 16th bit. Bits beyond the
compression, 8 bytes of storage are required for the compressed DXT block. 16th bit are ignored. Pixels that are not enabled are allowed to take
DXT3 and DXT5 compression require 16 bytes of storage per block. arbitrary colours in the output block. An example of how this can be used
is in the CompressImage function to disable pixels outside the bounds of
the image when the width or height is not divisible by 4.
The flags parameter can also specify a preferred colour compressor and The flags parameter should specify kDxt1, kDxt3, kDxt5, kBc4, or kBc5 compression,
colour error metric to use when fitting the RGB components of the data. however, DXT1 will be used by default if none is specified. When using DXT1
Possible colour compressors are: kColourClusterFit (the default), compression, 8 bytes of storage are required for the compressed DXT block.
kColourRangeFit or kColourIterativeClusterFit. Possible colour error metrics DXT3 and DXT5 compression require 16 bytes of storage per block.
are: kColourMetricPerceptual (the default) or kColourMetricUniform. If no
flags are specified in any particular category then the default will be
used. Unknown flags are ignored.
When using kColourClusterFit, an additional flag can be specified to The flags parameter can also specify a preferred colour compressor to use
weight the colour of each pixel by its alpha value. For images that are when fitting the RGB components of the data. Possible colour compressors
rendered using alpha blending, this can significantly increase the are: kColourClusterFit (the default), kColourRangeFit (very fast, low
perceived quality. quality) or kColourIterativeClusterFit (slowest, best quality).
When using kColourClusterFit or kColourIterativeClusterFit, an additional
flag can be specified to weight the importance of each pixel by its alpha
value. For images that are rendered using alpha blending, this can
significantly increase the perceived quality.
The metric parameter can be used to weight the relative importance of each
colour channel, or pass NULL to use the default uniform weight of
{ 1.0f, 1.0f, 1.0f }. This replaces the previous flag-based control that
allowed either uniform or "perceptual" weights with the fixed values
{ 0.2126f, 0.7152f, 0.0722f }. If non-NULL, the metric should point to a
contiguous array of 3 floats.
*/ */
void Compress( u8 const* rgba, void* block, int flags ); void CompressMasked( u8 const* rgba, int mask, void* block, int flags, float* metric = 0 );
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
/*! @brief Compresses a 4x4 block of pixels. /*! @brief Compresses a 4x4 block of pixels.
@param rgba The rgba values of the 16 source pixels. @param rgba The rgba values of the 16 source pixels.
@param mask The valid pixel mask. @param block Storage for the compressed DXT block.
@param block Storage for the compressed DXT block. @param flags Compression flags.
@param flags Compression flags. @param metric An optional perceptual metric.
The source pixels should be presented as a contiguous array of 16 rgba The source pixels should be presented as a contiguous array of 16 rgba
values, with each component as 1 byte each. In memory this should be: values, with each component as 1 byte each. In memory this should be:
{ r1, g1, b1, a1, .... , r16, g16, b16, a16 } { r1, g1, b1, a1, .... , r16, g16, b16, a16 }
The mask parameter enables only certain pixels within the block. The lowest The flags parameter should specify kDxt1, kDxt3, kDxt5, kBc4, or kBc5 compression,
bit enables the first pixel and so on up to the 16th bit. Bits beyond the however, DXT1 will be used by default if none is specified. When using DXT1
16th bit are ignored. Pixels that are not enabled are allowed to take compression, 8 bytes of storage are required for the compressed DXT block.
arbitrary colours in the output block. An example of how this can be used DXT3 and DXT5 compression require 16 bytes of storage per block.
is in the CompressImage function to disable pixels outside the bounds of
the image when the width or height is not divisible by 4.
The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, The flags parameter can also specify a preferred colour compressor to use
however, DXT1 will be used by default if none is specified. When using DXT1 when fitting the RGB components of the data. Possible colour compressors
compression, 8 bytes of storage are required for the compressed DXT block. are: kColourClusterFit (the default), kColourRangeFit (very fast, low
DXT3 and DXT5 compression require 16 bytes of storage per block. quality) or kColourIterativeClusterFit (slowest, best quality).
The flags parameter can also specify a preferred colour compressor and When using kColourClusterFit or kColourIterativeClusterFit, an additional
colour error metric to use when fitting the RGB components of the data. flag can be specified to weight the importance of each pixel by its alpha
Possible colour compressors are: kColourClusterFit (the default), value. For images that are rendered using alpha blending, this can
kColourRangeFit or kColourIterativeClusterFit. Possible colour error metrics significantly increase the perceived quality.
are: kColourMetricPerceptual (the default) or kColourMetricUniform. If no
flags are specified in any particular category then the default will be
used. Unknown flags are ignored.
When using kColourClusterFit, an additional flag can be specified to The metric parameter can be used to weight the relative importance of each
weight the colour of each pixel by its alpha value. For images that are colour channel, or pass NULL to use the default uniform weight of
rendered using alpha blending, this can significantly increase the { 1.0f, 1.0f, 1.0f }. This replaces the previous flag-based control that
perceived quality. allowed either uniform or "perceptual" weights with the fixed values
{ 0.2126f, 0.7152f, 0.0722f }. If non-NULL, the metric should point to a
contiguous array of 3 floats.
This method is an inline that calls CompressMasked with a mask of 0xffff,
provided for compatibility with older versions of squish.
*/ */
void CompressMasked( u8 const* rgba, int mask, void* block, int flags ); inline void Compress( u8 const* rgba, void* block, int flags, float* metric = 0 )
{
CompressMasked( rgba, 0xffff, block, flags, metric );
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
/*! @brief Decompresses a 4x4 block of pixels. /*! @brief Decompresses a 4x4 block of pixels.
@param rgba Storage for the 16 decompressed pixels. @param rgba Storage for the 16 decompressed pixels.
@param block The compressed DXT block. @param block The compressed DXT block.
@param flags Compression flags. @param flags Compression flags.
The decompressed pixels will be written as a contiguous array of 16 rgba The decompressed pixels will be written as a contiguous array of 16 rgba
values, with each component as 1 byte each. In memory this is: values, with each component as 1 byte each. In memory this is:
{ r1, g1, b1, a1, .... , r16, g16, b16, a16 } { r1, g1, b1, a1, .... , r16, g16, b16, a16 }
The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, The flags parameter should specify kDxt1, kDxt3, kDxt5, kBc4, or kBc5 compression,
however, DXT1 will be used by default if none is specified. All other flags however, DXT1 will be used by default if none is specified. All other flags
are ignored. are ignored.
*/ */
void Decompress( u8* rgba, void const* block, int flags ); void Decompress( u8* rgba, void const* block, int flags );
@@ -163,17 +182,17 @@ void Decompress( u8* rgba, void const* block, int flags );
/*! @brief Computes the amount of compressed storage required. /*! @brief Computes the amount of compressed storage required.
@param width The width of the image. @param width The width of the image.
@param height The height of the image. @param height The height of the image.
@param flags Compression flags. @param flags Compression flags.
The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, The flags parameter should specify kDxt1, kDxt3, kDxt5, kBc4, or kBc5 compression,
however, DXT1 will be used by default if none is specified. All other flags however, DXT1 will be used by default if none is specified. All other flags
are ignored. are ignored.
Most DXT images will be a multiple of 4 in each dimension, but this Most DXT images will be a multiple of 4 in each dimension, but this
function supports arbitrary size images by allowing the outer blocks to function supports arbitrary size images by allowing the outer blocks to
be only partially used. be only partially used.
*/ */
int GetStorageRequirements( int width, int height, int flags ); int GetStorageRequirements( int width, int height, int flags );
@@ -181,67 +200,101 @@ int GetStorageRequirements( int width, int height, int flags );
/*! @brief Compresses an image in memory. /*! @brief Compresses an image in memory.
@param rgba The pixels of the source. @param rgba The pixels of the source.
@param width The width of the source image. @param width The width of the source image.
@param height The height of the source image. @param height The height of the source image.
@param blocks Storage for the compressed output. @param pitch The pitch of the source image.
@param flags Compression flags. @param blocks Storage for the compressed output.
@param flags Compression flags.
@param metric An optional perceptual metric.
The source pixels should be presented as a contiguous array of width*height The source pixels should be presented as a contiguous array of width*height
rgba values, with each component as 1 byte each. In memory this should be: rgba values, with each component as 1 byte each. In memory this should be:
{ r1, g1, b1, a1, .... , rn, gn, bn, an } for n = width*height { r1, g1, b1, a1, .... , rn, gn, bn, an } for n = width*height
The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, The flags parameter should specify kDxt1, kDxt3, kDxt5, kBc4, or kBc5 compression,
however, DXT1 will be used by default if none is specified. When using DXT1 however, DXT1 will be used by default if none is specified. When using DXT1
compression, 8 bytes of storage are required for each compressed DXT block. compression, 8 bytes of storage are required for each compressed DXT block.
DXT3 and DXT5 compression require 16 bytes of storage per block. DXT3 and DXT5 compression require 16 bytes of storage per block.
The flags parameter can also specify a preferred colour compressor and The flags parameter can also specify a preferred colour compressor to use
colour error metric to use when fitting the RGB components of the data. when fitting the RGB components of the data. Possible colour compressors
Possible colour compressors are: kColourClusterFit (the default), are: kColourClusterFit (the default), kColourRangeFit (very fast, low
kColourRangeFit or kColourIterativeClusterFit. Possible colour error metrics quality) or kColourIterativeClusterFit (slowest, best quality).
are: kColourMetricPerceptual (the default) or kColourMetricUniform. If no
flags are specified in any particular category then the default will be
used. Unknown flags are ignored.
When using kColourClusterFit, an additional flag can be specified to When using kColourClusterFit or kColourIterativeClusterFit, an additional
weight the colour of each pixel by its alpha value. For images that are flag can be specified to weight the importance of each pixel by its alpha
rendered using alpha blending, this can significantly increase the value. For images that are rendered using alpha blending, this can
perceived quality. significantly increase the perceived quality.
Internally this function calls squish::Compress for each block. To see how The metric parameter can be used to weight the relative importance of each
much memory is required in the compressed image, use colour channel, or pass NULL to use the default uniform weight of
squish::GetStorageRequirements. { 1.0f, 1.0f, 1.0f }. This replaces the previous flag-based control that
allowed either uniform or "perceptual" weights with the fixed values
{ 0.2126f, 0.7152f, 0.0722f }. If non-NULL, the metric should point to a
contiguous array of 3 floats.
Internally this function calls squish::CompressMasked for each block, which
allows for pixels outside the image to take arbitrary values. The function
squish::GetStorageRequirements can be called to compute the amount of memory
to allocate for the compressed output.
*/ */
void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags ); void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric = 0 );
void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric = 0 );
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
/*! @brief Decompresses an image in memory. /*! @brief Decompresses an image in memory.
@param rgba Storage for the decompressed pixels. @param rgba Storage for the decompressed pixels.
@param width The width of the source image. @param width The width of the source image.
@param height The height of the source image. @param height The height of the source image.
@param blocks The compressed DXT blocks. @param pitch The pitch of the decompressed pixels.
@param flags Compression flags. @param blocks The compressed DXT blocks.
@param flags Compression flags.
The decompressed pixels will be written as a contiguous array of width*height The decompressed pixels will be written as a contiguous array of width*height
16 rgba values, with each component as 1 byte each. In memory this is: 16 rgba values, with each component as 1 byte each. In memory this is:
{ r1, g1, b1, a1, .... , rn, gn, bn, an } for n = width*height { r1, g1, b1, a1, .... , rn, gn, bn, an } for n = width*height
The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, The flags parameter should specify kDxt1, kDxt3, kDxt5, kBc4, or kBc5 compression,
however, DXT1 will be used by default if none is specified. All other flags however, DXT1 will be used by default if none is specified. All other flags
are ignored. are ignored.
Internally this function calls squish::Decompress for each block. Internally this function calls squish::Decompress for each block.
*/ */
void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags );
void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags ); void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags );
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
/*! @brief Computes MSE of an compressed image in memory.
@param rgba The original image pixels.
@param width The width of the source image.
@param height The height of the source image.
@param pitch The pitch of the source image.
@param dxt The compressed dxt blocks
@param flags Compression flags.
@param colourMSE The MSE of the colour values.
@param alphaMSE The MSE of the alpha values.
The colour MSE and alpha MSE are computed across all pixels. The colour MSE is
averaged across all rgb values (i.e. colourMSE = sum sum_k ||dxt.k - rgba.k||/3)
The flags parameter should specify kDxt1, kDxt3, kDxt5, kBc4, or kBc5 compression,
however, DXT1 will be used by default if none is specified. All other flags
are ignored.
Internally this function calls squish::Decompress for each block.
*/
void ComputeMSE(u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE);
void ComputeMSE(u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE);
// -----------------------------------------------------------------------------
} // namespace squish } // namespace squish
#endif // ndef SQUISH_H #endif // ndef SQUISH_H