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

Fix alignment assumptions in DDS loading code. Fixes issue 132.

Browse Source 
Merge misc changes from the-witness.
This commit is contained in:
castano
2010-09-07 18:24:50 +00:00
parent 2c969b70a5
commit 276c608f26
6 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvtt/CompressorRGB.cpp
View File

@ -39,12 +39,6 @@ using namespace nvtt;
namespace
{
inline uint computePitch(uint w, uint bitsize, uint alignment)
{
return ((w * bitsize + 8 * alignment - 1) / (8 * alignment)) * alignment;
}
inline void convert_to_a8r8g8b8(const void * src, void * dst, uint w)
{
memcpy(dst, src, 4 * w);

5
src/nvtt/Context.cpp
View File

@ -89,11 +89,6 @@ namespace
return 0;
}
inline uint computePitch(uint w, uint bitsize, uint alignment)
{
return ((w * bitsize + 8 * alignment - 1) / (8 * alignment)) * alignment;
}
static int computeImageSize(uint w, uint h, uint d, uint bitCount, uint alignment, Format format)
{
if (format == Format_RGBA) {