ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MIPS compilation

Browse Source
This commit is contained in:
Benau 2021-10-07 16:30:32 +08:00
parent 164c51cb2e
commit 1cce43b2fa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/graphics/sp/sp_texture.cpp
View File

@ -797,27 +797,27 @@ std::vector<std::pair<core::dimension2du, unsigned> >
assert(c->getReferenceCount() == 1); assert(c->getReferenceCount() == 1);
std::shared_ptr<video::IImage> compressed(c); std::shared_ptr<video::IImage> compressed(c);
uint8_t* mips = new uint8_t[image->getDimension().getArea() * 4](); uint8_t* mipmaps = new uint8_t[image->getDimension().getArea() * 4]();
uint8_t* mips_loc = mips; uint8_t* mipmaps_loc = mipmaps;
uint8_t* compressed_loc = (uint8_t*)compressed->lock(); uint8_t* compressed_loc = (uint8_t*)compressed->lock();
squishCompressImage((uint8_t*)image->lock(), squishCompressImage((uint8_t*)image->lock(),
mipmap_sizes[0].first.Width, mipmap_sizes[0].first.Height, mipmap_sizes[0].first.Width, mipmap_sizes[0].first.Height,
mipmap_sizes[0].first.Width * 4, compressed->lock(), tc_flag); mipmap_sizes[0].first.Width * 4, compressed->lock(), tc_flag);
// Now compress mipmap // Now compress mipmap
generateHQMipmap(image->lock(), mipmap_sizes, mips); generateHQMipmap(image->lock(), mipmap_sizes, mipmaps);
compressed_loc += mipmap_sizes[0].second; compressed_loc += mipmap_sizes[0].second;
for (unsigned mip = 1; mip < mipmap_sizes.size(); mip++) for (unsigned mip = 1; mip < mipmap_sizes.size(); mip++)
{ {
squishCompressImage(mips_loc, squishCompressImage(mipmaps_loc,
mipmap_sizes[mip].first.Width, mipmap_sizes[mip].first.Height, mipmap_sizes[mip].first.Width, mipmap_sizes[mip].first.Height,
mipmap_sizes[mip].first.Width * 4, compressed_loc, tc_flag); mipmap_sizes[mip].first.Width * 4, compressed_loc, tc_flag);
mips_loc += mipmap_sizes[mip].first.Width * mipmaps_loc += mipmap_sizes[mip].first.Width *
mipmap_sizes[mip].first.Height * 4; mipmap_sizes[mip].first.Height * 4;
compressed_loc += mipmap_sizes[mip].second; compressed_loc += mipmap_sizes[mip].second;
} }
delete [] mips; delete [] mipmaps;
image.swap(compressed); image.swap(compressed);
#endif #endif
return mipmap_sizes; return mipmap_sizes;