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

Get rid of more gcc warnings.

Browse Source
This commit is contained in:
castano 2007-11-27 08:36:42 +00:00
parent 71788cc904
commit 9816ced5b7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvtt/QuickCompressDXT.cpp
View File

@ -430,7 +430,7 @@ void QuickCompress::compressDXT1a(const ColorBlock & rgba, BlockDXT1 * dxtBlock)
} }
uint QuickCompress::compressDXT3A(const ColorBlock & rgba, AlphaBlockDXT3 * dxtBlock) void QuickCompress::compressDXT3A(const ColorBlock & rgba, AlphaBlockDXT3 * dxtBlock)
{ {
dxtBlock->alpha0 = rgba.color(0).a >> 4; dxtBlock->alpha0 = rgba.color(0).a >> 4;
dxtBlock->alpha1 = rgba.color(1).a >> 4; dxtBlock->alpha1 = rgba.color(1).a >> 4;
@ -450,18 +450,18 @@ uint QuickCompress::compressDXT3A(const ColorBlock & rgba, AlphaBlockDXT3 * dxtB
dxtBlock->alphaF = rgba.color(15).a >> 4; dxtBlock->alphaF = rgba.color(15).a >> 4;
} }
uint QuickCompress::compressDXT3(const ColorBlock & rgba, BlockDXT3 * dxtBlock) void QuickCompress::compressDXT3(const ColorBlock & rgba, BlockDXT3 * dxtBlock)
{ {
compressDXT1(rgba, &dxtBlock->color); compressDXT1(rgba, &dxtBlock->color);
compressDXT3A(rgba, &dxtBlock->alpha); compressDXT3A(rgba, &dxtBlock->alpha);
} }
uint QuickCompress::compressDXT5A(const ColorBlock & rgba, AlphaBlockDXT5 * dxtBlock) void QuickCompress::compressDXT5A(const ColorBlock & rgba, AlphaBlockDXT5 * dxtBlock)
{ {
// @@ TODO // @@ TODO
} }
uint QuickCompress::compressDXT5(const ColorBlock & rgba, BlockDXT5 * dxtBlock) void QuickCompress::compressDXT5(const ColorBlock & rgba, BlockDXT5 * dxtBlock)
{ {
compressDXT1(rgba, &dxtBlock->color); compressDXT1(rgba, &dxtBlock->color);
compressDXT5A(rgba, &dxtBlock->alpha); compressDXT5A(rgba, &dxtBlock->alpha);

8
src/nvtt/QuickCompressDXT.h
View File

@ -41,11 +41,11 @@ namespace nv
void compressDXT1(const ColorBlock & rgba, BlockDXT1 * dxtBlock); void compressDXT1(const ColorBlock & rgba, BlockDXT1 * dxtBlock);
void compressDXT1a(const ColorBlock & rgba, BlockDXT1 * dxtBlock); void compressDXT1a(const ColorBlock & rgba, BlockDXT1 * dxtBlock);
uint compressDXT3A(const ColorBlock & rgba, AlphaBlockDXT3 * dxtBlock); void compressDXT3A(const ColorBlock & rgba, AlphaBlockDXT3 * dxtBlock);
uint compressDXT3(const ColorBlock & rgba, BlockDXT3 * dxtBlock); void compressDXT3(const ColorBlock & rgba, BlockDXT3 * dxtBlock);
uint compressDXT5A(const ColorBlock & rgba, AlphaBlockDXT5 * dxtBlock); void compressDXT5A(const ColorBlock & rgba, AlphaBlockDXT5 * dxtBlock);
uint compressDXT5(const ColorBlock & rgba, BlockDXT5 * dxtBlock); void compressDXT5(const ColorBlock & rgba, BlockDXT5 * dxtBlock);
} }
} // nv namespace } // nv namespace