GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add option to automatically generate mips for textures created from code

Browse Source
This commit is contained in:
Wojciech Figat
2021-11-09 16:26:28 +01:00
parent 4c4c6e8f03
commit e34d3285c2
3 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Engine/Graphics/Textures/TextureBase.cpp
View File

@@ -11,6 +11,7 @@
#include "Engine/Debug/Exceptions/InvalidOperationException.h"
#include "Engine/Profiler/ProfilerCPU.h"
#include "Engine/Content/Factories/BinaryAssetFactory.h"
#include "Engine/Threading/Threading.h"
TextureMipData::TextureMipData()
: RowPitch(0)
@@ -151,11 +152,13 @@ BytesContainer TextureBase::GetMipData(int32 mipIndex, int32& rowPitch, int32& s
bool TextureBase::GetTextureData(TextureData& result, bool copyData)
{
PROFILE_CPU_NAMED("Texture.GetTextureData");
if (!IsVirtual() && WaitForLoaded())
{
LOG(Error, "Asset load failed.");
return true;
}
auto dataLock = LockData();
// Setup description
result.Width = _texture.TotalWidth();
@@ -202,7 +205,7 @@ bool TextureBase::Init(InitData* initData)
// Validate state
if (!IsVirtual())
{
Log::InvalidOperationException();
LOG(Error, "Texture must be virtual.");
return true;
}
if (initData->Format == PixelFormat::Unknown ||
@@ -214,6 +217,7 @@ bool TextureBase::Init(InitData* initData)
Log::ArgumentOutOfRangeException();
return true;
}
ScopeLock lock(Locker);
// Release texture
_texture.UnloadTexture();
@@ -243,6 +247,7 @@ bool TextureBase::Init(InitData* initData)
bool TextureBase::Init(void* ptr)
{
PROFILE_CPU_NAMED("Texture.Init");
struct InternalInitData
{
PixelFormat Format;
@@ -250,6 +255,7 @@ bool TextureBase::Init(void* ptr)
int32 Height;
int32 ArraySize;
int32 MipLevels;
int32 GenerateMips;
int32 DataRowPitch[14];
int32 DataSlicePitch[14];
byte* Data[14];
@@ -261,8 +267,9 @@ bool TextureBase::Init(void* ptr)
initData->Width = initDataObj->Width;
initData->Height = initDataObj->Height;
initData->ArraySize = initDataObj->ArraySize;
initData->Mips.Resize(initDataObj->MipLevels);
initData->Mips.Resize(initDataObj->GenerateMips ? MipLevelsCount(initDataObj->Width, initDataObj->Height) : initDataObj->MipLevels);
// Copy source mips data
for (int32 mipIndex = 0; mipIndex < initDataObj->MipLevels; mipIndex++)
{
auto& mip = initData->Mips[mipIndex];
@@ -271,6 +278,12 @@ bool TextureBase::Init(void* ptr)
mip.Data.Copy(initDataObj->Data[mipIndex], mip.SlicePitch * initData->ArraySize);
}
// Generate mips
for (int32 mipIndex = initDataObj->MipLevels; mipIndex < initData->Mips.Count(); mipIndex++)
{
initData->GenerateMip(mipIndex, initDataObj->GenerateMips & 2);
}
return Init(initData);
}
@@ -462,7 +475,7 @@ bool TextureBase::InitData::GenerateMip(int32 mipIndex, bool linear)
break;
}
default:
LOG(Error, "Unsupported texture data format {0} for mip map generation.", (int32)Format);
LOG(Error, "Unsupported texture data format {0}.", (int32)Format);
return true;
}
}