Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Add additional way of loading unsupported texture formats via Texture Tool conversion

Browse Source 
This fixes loading `BC7` textures on `D3D10` backend.
This commit is contained in:
Wojciech Figat
2026-04-17 14:25:58 +02:00
parent f5b5228ddf
commit fa01d2d8a3
1 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Engine/Tools/TextureTool/TextureTool.cpp
+39 -17
View File
@@ -415,31 +415,53 @@ bool TextureTool::UpdateTexture(GPUContext* context, GPUTexture* texture, int32
if (textureFormat != dataFormat) if (textureFormat != dataFormat)
{ {
PROFILE_CPU_NAMED("ConvertTexture"); PROFILE_CPU_NAMED("ConvertTexture");
auto dataSampler = PixelFormatSampler::Get(dataFormat);
auto textureSampler = PixelFormatSampler::Get(textureFormat);
if (!dataSampler || !textureSampler)
return true;
int32 mipWidth, mipHeight, mipDepth; int32 mipWidth, mipHeight, mipDepth;
texture->GetMipSize(mipIndex, mipWidth, mipHeight, mipDepth); texture->GetMipSize(mipIndex, mipWidth, mipHeight, mipDepth);
auto tempRowPitch = mipWidth * textureSampler->PixelSize; auto dataSampler = PixelFormatSampler::Get(dataFormat);
auto tempSlicePitch = tempRowPitch * mipHeight; auto textureSampler = PixelFormatSampler::Get(textureFormat);
tempData.Resize(tempSlicePitch * mipDepth); if (dataSampler && textureSampler)
ASSERT(data.Length() / rowPitch >= (uint32)mipHeight);
for (int32 y = 0; y < mipHeight; y++)
{ {
for (int32 x = 0; x < mipWidth; x++) // Conversion with an in-built samplers
auto tempRowPitch = mipWidth * textureSampler->PixelSize;
auto tempSlicePitch = tempRowPitch * mipHeight;
tempData.Resize(tempSlicePitch * mipDepth);
ASSERT(data.Length() / rowPitch >= (uint32)mipHeight);
for (int32 y = 0; y < mipHeight; y++)
{ {
Color color = dataSampler->SamplePoint(data.Get(), x, y, rowPitch); for (int32 x = 0; x < mipWidth; x++)
textureSampler->Store(tempData.Get(), x, y, tempRowPitch, color); {
Color color = dataSampler->SamplePoint(data.Get(), x, y, rowPitch);
textureSampler->Store(tempData.Get(), x, y, tempRowPitch, color);
}
} }
data = ToSpan(tempData);
rowPitch = tempRowPitch;
slicePitch = tempSlicePitch;
}
else
{
// Conversion with external library
TextureData src, dst;
src.Width = mipWidth;
src.Height = mipHeight;
src.Depth = mipDepth;
src.Format = dataFormat;
auto& srcItem = src.Items.AddOne();
auto& srcMip = srcItem.Mips.AddOne();
srcMip.RowPitch = rowPitch;
srcMip.DepthPitch = slicePitch;
srcMip.Lines = slicePitch / rowPitch;
srcMip.Data.Link(data);
if (Convert(dst, src, textureFormat))
return true;
auto& dstMip = dst.Items[0].Mips[0];
tempData.Set(dstMip.Data.Get(), dstMip.Data.Length());
data = ToSpan(tempData);
rowPitch = dstMip.RowPitch;
slicePitch = dstMip.DepthPitch;
} }
data = ToSpan(tempData);
rowPitch = tempRowPitch;
slicePitch = tempSlicePitch;
} }
// Update texture // Update texture