thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Assert improvements

Browse source
This commit is contained in:
Henrik Rydgård 2023-09-11 17:45:54 +02:00
parent 95c914ac14
commit be65cf0fc2
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Common/MemoryUtil.cpp
View file

@ -26,6 +26,7 @@
#include "Common/MemoryUtil.h"
#include "Common/StringUtils.h"
#include "Common/SysError.h"
#include "Common/Data/Text/Parsers.h"
#ifdef _WIN32
#include "Common/CommonWindows.h"
@ -257,8 +258,9 @@ void *AllocateAlignedMemory(size_t size, size_t alignment) {
}
#endif
#endif
_assert_msg_(ptr != nullptr, "Failed to allocate aligned memory of size %llu", (unsigned long long)size);
char temp[32];
NiceSizeFormat(size, temp, sizeof(temp));
_assert_msg_(ptr != nullptr, "Failed to allocate aligned memory of size %s (%llu)", temp, (unsigned long long)size);
return ptr;
}

1
GPU/Common/ReplacedTexture.cpp
View file

@ -672,6 +672,7 @@ ReplacedTexture::LoadLevelResult ReplacedTexture::LoadLevelData(VFSFileReference
png.format = PNG_FORMAT_RGBA;
std::vector<uint8_t> &out = data_[mipLevel];
// TODO: Should probably try to handle out-of-memory gracefully here.
out.resize(level.w * level.h * 4);
if (!png_image_finish_read(&png, nullptr, &out[0], level.w * 4, nullptr)) {
ERROR_LOG(G3D, "Could not load texture replacement: %s - %s", filename.c_str(), png.message);