Mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support 3D BC4 and BC5 compressed textures (#1655)

Browse source 
* Support 3D BC4 and BC5 compressed textures

* PR feedback

* Fix some typos
This commit is contained in:
gdkchan 2020-11-01 15:32:53 -03:00 • committed by GitHub
parent 6222f173f0
commit 11a7c99764
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 357 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Ryujinx.Graphics.Gpu/Image/Texture.cs
View file

@ -671,6 +671,9 @@ namespace Ryujinx.Graphics.Gpu.Image
data);
}
// Handle compressed cases not supported by the host:
// - ASTC is usually not supported on desktop cards.
// - BC4/BC5 is not supported on 3D textures.
if (!_context.Capabilities.SupportsAstcCompression && Info.FormatInfo.Format.IsAstc())
{
if (!AstcDecoder.TryDecodeToRgba8(
@ -691,6 +694,14 @@ namespace Ryujinx.Graphics.Gpu.Image
data = decoded;
}
else if (Info.Target == Target.Texture3D && Info.FormatInfo.Format.IsBc4())
{
data = BCnDecoder.DecodeBC4(data, Info.Width, Info.Height, _depth, Info.Levels, _layers, Info.FormatInfo.Format == Format.Bc4Snorm);
}
else if (Info.Target == Target.Texture3D && Info.FormatInfo.Format.IsBc5())
{
data = BCnDecoder.DecodeBC5(data, Info.Width, Info.Height, _depth, Info.Levels, _layers, Info.FormatInfo.Format == Format.Bc5Snorm);
}
return data;
}
@ -707,8 +718,7 @@ namespace Ryujinx.Graphics.Gpu.Image
public void Flush(bool tracked = true)
{
IsModified = false;
if (Info.FormatInfo.Format.IsAstc())
if (TextureCompatibility.IsFormatHostIncompatible(Info, _context.Capabilities))
{
return; // Flushing this format is not supported, as it may have been converted to another host format.
}
@ -739,10 +749,9 @@ namespace Ryujinx.Graphics.Gpu.Image
_context.Renderer.BackgroundContextAction(() =>
{
IsModified = false;
if (Info.FormatInfo.Format.IsAstc())
if (TextureCompatibility.IsFormatHostIncompatible(Info, _context.Capabilities))
{
// ASTC textures are not in their original format, so cannot be flushed.
return;
return; // Flushing this format is not supported, as it may have been converted to another host format.
}
ITexture texture = HostTexture;