drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

forget one file not included in vc project

Browse Source
This commit is contained in:
Sylvain Rochette 2015-08-21 21:56:36 -04:00
parent 6a465c8489
commit 01d5abbe5f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvtt/squish/fastclusterfit.cpp
View File

@ -143,11 +143,11 @@ void FastClusterFit::Compress3( void* block )
int i = 0; int i = 0;
// check all possible clusters for this total order // check all possible clusters for this total order
for( int c0 = 0; c0 <= 16; c0++) for( int c0 = 0; c0 < 16; c0++)
{ {
x1 = zero; x1 = zero;
for( int c1 = 0; c1 <= 16-c0; c1++) for( int c1 = 0; c1 < 16-c0; c1++)
{ {
Vec4 const constants = Vec4((const float *)&s_threeElement[i]); Vec4 const constants = Vec4((const float *)&s_threeElement[i]);
Vec4 const alpha2_sum = constants.SplatX(); Vec4 const alpha2_sum = constants.SplatX();
@ -256,15 +256,15 @@ void FastClusterFit::Compress4( void* block )
int i = 0; int i = 0;
// check all possible clusters for this total order // check all possible clusters for this total order
for( int c0 = 0; c0 <= 16; c0++) for( int c0 = 0; c0 < 16; c0++)
{ {
Vec4 x1 = zero; Vec4 x1 = zero;
for( int c1 = 0; c1 <= 16-c0; c1++) for( int c1 = 0; c1 < 16-c0; c1++)
{ {
Vec4 x2 = zero; Vec4 x2 = zero;
for( int c2 = 0; c2 <= 16-c0-c1; c2++) for( int c2 = 0; c2 < 16-c0-c1; c2++)
{ {
Vec4 const constants = Vec4((const float *)&s_fourElement[i]); Vec4 const constants = Vec4((const float *)&s_fourElement[i]);
Vec4 const alpha2_sum = constants.SplatX(); Vec4 const alpha2_sum = constants.SplatX();
@ -387,11 +387,11 @@ void FastClusterFit::Compress3( void* block )
int i = 0; int i = 0;
// check all possible clusters for this total order // check all possible clusters for this total order
for( int c0 = 0; c0 <= 16; c0++) for( int c0 = 0; c0 < 16; c0++)
{ {
x1 = Vec3(0); x1 = Vec3(0);
for( int c1 = 0; c1 <= 16-c0; c1++) for( int c1 = 0; c1 < 16-c0; c1++)
{ {
float const alpha2_sum = s_threeElement[i].alpha2_sum; float const alpha2_sum = s_threeElement[i].alpha2_sum;
float const beta2_sum = s_threeElement[i].beta2_sum; float const beta2_sum = s_threeElement[i].beta2_sum;
@ -494,15 +494,15 @@ void FastClusterFit::Compress4( void* block )
int i = 0; int i = 0;
// check all possible clusters for this total order // check all possible clusters for this total order
for( int c0 = 0; c0 <= 16; c0++) for( int c0 = 0; c0 < 16; c0++)
{ {
x1 = Vec3(0.0f); x1 = Vec3(0.0f);
for( int c1 = 0; c1 <= 16-c0; c1++) for( int c1 = 0; c1 < 16-c0; c1++)
{ {
x2 = Vec3(0.0f); x2 = Vec3(0.0f);
for( int c2 = 0; c2 <= 16-c0-c1; c2++) for( int c2 = 0; c2 < 16-c0-c1; c2++)
{ {
float const alpha2_sum = s_fourElement[i].alpha2_sum; float const alpha2_sum = s_fourElement[i].alpha2_sum;
float const beta2_sum = s_fourElement[i].beta2_sum; float const beta2_sum = s_fourElement[i].beta2_sum;