sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-06-04 18:02:28 +02:00
parent 8fe11711a3
commit 4b3b595a99
15 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Nazara/Utility/PixelFormat.cpp
View File

@@ -1307,19 +1307,11 @@ namespace Nz
bool PixelFormatInfo::Flip(PixelFlipping flipping, PixelFormat format, unsigned int width, unsigned int height, unsigned int depth, const void* src, void* dst)
{
#if NAZARA_UTILITY_SAFE
if (!IsValid(format))
{
NazaraError("Invalid pixel format");
return false;
}
#endif
NazaraAssert(IsValid(format), "invalid pixel format");
std::size_t flippingIndex = UnderlyingCast(flipping);
auto it = s_flipFunctions[flippingIndex].find(format);
if (it != s_flipFunctions[flippingIndex].end())
it->second(width, height, depth, reinterpret_cast<const UInt8*>(src), reinterpret_cast<UInt8*>(dst));
auto& flipFunction = s_flipFunctions[UnderlyingCast(format)][UnderlyingCast(flipping)];
if (flipFunction)
flipFunction(width, height, depth, reinterpret_cast<const UInt8*>(src), reinterpret_cast<UInt8*>(dst));
else
{
// Flipping générique
@@ -1496,9 +1488,6 @@ namespace Nz
NazaraWarning("Pixel format 0x" + NumberToString(i, 16) + " (" + GetName(static_cast<Nz::PixelFormat>(i)) + ") failed validation tests");
}
// Reset functions
std::memset(s_convertFunctions, 0, (PixelFormatCount)*(PixelFormatCount)*sizeof(PixelFormatInfo::ConvertFunction));
/***********************************A8************************************/
RegisterConverter<PixelFormat::A8, PixelFormat::BGRA8>();
RegisterConverter<PixelFormat::A8, PixelFormat::LA8>();
@@ -1725,16 +1714,18 @@ namespace Nz
void PixelFormatInfo::Uninitialize()
{
for (unsigned int i = 0; i < PixelFormatCount; ++i)
for (std::size_t i = 0; i < PixelFormatCount; ++i)
{
s_pixelFormatInfos[i].Clear();
for (std::size_t j = 0; j < PixelFormatCount; ++j)
s_convertFunctions[i][j] = nullptr;
std::memset(s_convertFunctions, 0, (PixelFormatCount)*(PixelFormatCount)*sizeof(PixelFormatInfo::ConvertFunction));
for (unsigned int i = 0; i < PixelFlippingCount; ++i)
s_flipFunctions[i].clear();
for (std::size_t j = 0; j < PixelFlippingCount; ++j)
s_flipFunctions[i][j] = nullptr;
}
}
PixelFormatDescription PixelFormatInfo::s_pixelFormatInfos[PixelFormatCount];
PixelFormatInfo::ConvertFunction PixelFormatInfo::s_convertFunctions[PixelFormatCount][PixelFormatCount];
std::map<PixelFormat, PixelFormatInfo::FlipFunction> PixelFormatInfo::s_flipFunctions[PixelFlippingCount];
std::array<std::array<PixelFormatInfo::ConvertFunction, PixelFormatCount>, PixelFormatCount> PixelFormatInfo::s_convertFunctions;
std::array<std::array<PixelFormatInfo::FlipFunction, PixelFlippingCount>, PixelFormatCount> PixelFormatInfo::s_flipFunctions;
std::array<PixelFormatDescription, PixelFormatCount> PixelFormatInfo::s_pixelFormatInfos;
}