Fix errors in DDS loading code.
This commit is contained in:
@ -687,7 +687,7 @@ uint DirectDrawSurface::mipmapCount() const
|
|||||||
{
|
{
|
||||||
nvDebugCheck(isValid());
|
nvDebugCheck(isValid());
|
||||||
if (header.flags & DDSD_MIPMAPCOUNT) return header.mipmapcount;
|
if (header.flags & DDSD_MIPMAPCOUNT) return header.mipmapcount;
|
||||||
else return 0;
|
else return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -991,7 +991,12 @@ uint DirectDrawSurface::faceSize() const
|
|||||||
|
|
||||||
uint DirectDrawSurface::offset(const uint face, const uint mipmap)
|
uint DirectDrawSurface::offset(const uint face, const uint mipmap)
|
||||||
{
|
{
|
||||||
uint size = 128; //sizeof(DDSHeader);
|
uint size = 128; // sizeof(DDSHeader);
|
||||||
|
|
||||||
|
if (header.hasDX10Header())
|
||||||
|
{
|
||||||
|
size += 20; // sizeof(DDSHeader10);
|
||||||
|
}
|
||||||
|
|
||||||
if (face != 0)
|
if (face != 0)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user