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

Fix deadlock when loading block-compressed texture that is smaller than block size

Browse Source 
#2057
This commit is contained in:
Wojtek Figat
2023-12-14 15:14:49 +01:00
parent 014c811903
commit 60202a3add
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Engine/Graphics/Textures/GPUTexture.cpp
View File

@@ -480,6 +480,16 @@ bool GPUTexture::Init(const GPUTextureDescription& desc)
break; break;
} }
} }
const bool isCompressed = PixelFormatExtensions::IsCompressed(desc.Format);
if (isCompressed)
{
const int32 blockSize = PixelFormatExtensions::ComputeBlockSize(desc.Format);
if (desc.Width < blockSize || desc.Height < blockSize)
{
LOG(Warning, "Cannot create texture. Invalid dimensions. Description: {0}", desc.ToString());
return true;
}
}
// Release previous data // Release previous data
ReleaseGPU(); ReleaseGPU();
@@ -487,7 +497,7 @@ bool GPUTexture::Init(const GPUTextureDescription& desc)
// Initialize // Initialize
_desc = desc; _desc = desc;
_sRGB = PixelFormatExtensions::IsSRGB(desc.Format); _sRGB = PixelFormatExtensions::IsSRGB(desc.Format);
_isBlockCompressed = PixelFormatExtensions::IsCompressed(desc.Format); _isBlockCompressed = isCompressed;
if (OnInit()) if (OnInit())
{ {
ReleaseGPU(); ReleaseGPU();

4
Source/Engine/Graphics/Textures/StreamingTexture.cpp
View File

@@ -114,9 +114,9 @@ bool StreamingTexture::Create(const TextureHeader& header)
{ {
// Ensure that streaming doesn't go too low because the hardware expects the texture to be min in size of compressed texture block // Ensure that streaming doesn't go too low because the hardware expects the texture to be min in size of compressed texture block
int32 lastMip = header.MipLevels - 1; int32 lastMip = header.MipLevels - 1;
while ((header.Width >> lastMip) < 4 && (header.Height >> lastMip) < 4) while ((header.Width >> lastMip) < 4 && (header.Height >> lastMip) < 4 && lastMip > 0)
lastMip--; lastMip--;
_minMipCountBlockCompressed = header.MipLevels - lastMip + 1; _minMipCountBlockCompressed = Math::Min(header.MipLevels - lastMip + 1, header.MipLevels);
} }
// Request resource streaming // Request resource streaming