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

Fix crash when using invalid GPUTextureDescription

Browse Source 
#2261
This commit is contained in:
Wojtek Figat
2024-02-20 11:44:49 +01:00
parent de86ec0ecc
commit 1cb88bdc63
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -339,12 +339,6 @@ int32 GPUTexture::ComputeRowPitch(int32 mipLevel, int32 rowAlign) const
bool GPUTexture::Init(const GPUTextureDescription& desc) bool GPUTexture::Init(const GPUTextureDescription& desc)
{ {
ASSERT(Math::IsInRange(desc.Width, 1, GPU_MAX_TEXTURE_SIZE)
&& Math::IsInRange(desc.Height, 1, GPU_MAX_TEXTURE_SIZE)
&& Math::IsInRange(desc.Depth, 1, GPU_MAX_TEXTURE_SIZE)
&& Math::IsInRange(desc.ArraySize, 1, GPU_MAX_TEXTURE_ARRAY_SIZE)
&& Math::IsInRange(desc.MipLevels, 1, GPU_MAX_TEXTURE_MIP_LEVELS));
// Validate description // Validate description
const auto device = GPUDevice::Instance; const auto device = GPUDevice::Instance;
if (desc.Usage == GPUResourceUsage::Dynamic) if (desc.Usage == GPUResourceUsage::Dynamic)
@@ -352,6 +346,11 @@ bool GPUTexture::Init(const GPUTextureDescription& desc)
LOG(Warning, "Cannot create texture. Dynamic textures are not supported. Description: {0}", desc.ToString()); LOG(Warning, "Cannot create texture. Dynamic textures are not supported. Description: {0}", desc.ToString());
return true; return true;
} }
if (desc.MipLevels < 0 || desc.MipLevels > GPU_MAX_TEXTURE_MIP_LEVELS)
{
LOG(Warning, "Cannot create texture. Invalid amount of mip levels. Description: {0}", desc.ToString());
return true;
}
if (desc.IsDepthStencil()) if (desc.IsDepthStencil())
{ {
if (desc.MipLevels > 1) if (desc.MipLevels > 1)
@@ -392,7 +391,8 @@ bool GPUTexture::Init(const GPUTextureDescription& desc)
LOG(Warning, "Cannot create texture. Texture cannot have per slice views. Description: {0}", desc.ToString()); LOG(Warning, "Cannot create texture. Texture cannot have per slice views. Description: {0}", desc.ToString());
return true; return true;
} }
if (desc.Width > device->Limits.MaximumTexture2DSize if (desc.Width <= 0 || desc.Height <= 0 || desc.ArraySize <= 0
|| desc.Width > device->Limits.MaximumTexture2DSize
|| desc.Height > device->Limits.MaximumTexture2DSize || desc.Height > device->Limits.MaximumTexture2DSize
|| desc.ArraySize > device->Limits.MaximumTexture2DArraySize) || desc.ArraySize > device->Limits.MaximumTexture2DArraySize)
{ {
@@ -429,7 +429,8 @@ bool GPUTexture::Init(const GPUTextureDescription& desc)
LOG(Warning, "Cannot create texture. Volume texture cannot have per slice map views if is not a render target. Description: {0}", desc.ToString()); LOG(Warning, "Cannot create texture. Volume texture cannot have per slice map views if is not a render target. Description: {0}", desc.ToString());
return true; return true;
} }
if (desc.Width > device->Limits.MaximumTexture3DSize if (desc.Width <= 0 || desc.Height <= 0 || desc.Depth <= 0
|| desc.Width > device->Limits.MaximumTexture3DSize
|| desc.Height > device->Limits.MaximumTexture3DSize || desc.Height > device->Limits.MaximumTexture3DSize
|| desc.Depth > device->Limits.MaximumTexture3DSize) || desc.Depth > device->Limits.MaximumTexture3DSize)
{ {
@@ -446,7 +447,8 @@ bool GPUTexture::Init(const GPUTextureDescription& desc)
LOG(Warning, "Cannot create texture. Cube texture cannot have per slice views. Description: {0}", desc.ToString()); LOG(Warning, "Cannot create texture. Cube texture cannot have per slice views. Description: {0}", desc.ToString());
return true; return true;
} }
if (desc.Width > device->Limits.MaximumTextureCubeSize if (desc.Width <= 0 || desc.ArraySize <= 0
|| desc.Width > device->Limits.MaximumTextureCubeSize
|| desc.Height > device->Limits.MaximumTextureCubeSize || desc.Height > device->Limits.MaximumTextureCubeSize
|| desc.ArraySize * 6 > device->Limits.MaximumTexture2DArraySize || desc.ArraySize * 6 > device->Limits.MaximumTexture2DArraySize
|| desc.Width != desc.Height) || desc.Width != desc.Height)