alexx009/jinx
Archived
1
0
Fork 0
forked from Mirror/Ryujinx
Code Pull requests Activity

Add support for the R4G4 texture format (#2956)

Browse source
This commit is contained in:
gdkchan 2021-12-30 13:10:54 -03:00 committed by GitHub
parent 1485780d90
commit c05c8e09d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 72 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Ryujinx.Graphics.GAL/Capabilities.cs
View file

@ -6,6 +6,7 @@ namespace Ryujinx.Graphics.GAL
public bool HasVectorIndexingBug { get; } public bool HasVectorIndexingBug { get; }
public bool SupportsAstcCompression { get; } public bool SupportsAstcCompression { get; }
public bool SupportsR4G4Format { get; }
public bool SupportsFragmentShaderInterlock { get; } public bool SupportsFragmentShaderInterlock { get; }
public bool SupportsFragmentShaderOrderingIntel { get; } public bool SupportsFragmentShaderOrderingIntel { get; }
public bool SupportsImageLoadFormatted { get; } public bool SupportsImageLoadFormatted { get; }
@ -24,6 +25,7 @@ namespace Ryujinx.Graphics.GAL
bool hasFrontFacingBug, bool hasFrontFacingBug,
bool hasVectorIndexingBug, bool hasVectorIndexingBug,
bool supportsAstcCompression, bool supportsAstcCompression,
bool supportsR4G4Format,
bool supportsFragmentShaderInterlock, bool supportsFragmentShaderInterlock,
bool supportsFragmentShaderOrderingIntel, bool supportsFragmentShaderOrderingIntel,
bool supportsImageLoadFormatted, bool supportsImageLoadFormatted,
@ -40,6 +42,7 @@ namespace Ryujinx.Graphics.GAL
HasFrontFacingBug = hasFrontFacingBug; HasFrontFacingBug = hasFrontFacingBug;
HasVectorIndexingBug = hasVectorIndexingBug; HasVectorIndexingBug = hasVectorIndexingBug;
SupportsAstcCompression = supportsAstcCompression; SupportsAstcCompression = supportsAstcCompression;
SupportsR4G4Format = supportsR4G4Format;
SupportsFragmentShaderInterlock = supportsFragmentShaderInterlock; SupportsFragmentShaderInterlock = supportsFragmentShaderInterlock;
SupportsFragmentShaderOrderingIntel = supportsFragmentShaderOrderingIntel; SupportsFragmentShaderOrderingIntel = supportsFragmentShaderOrderingIntel;
SupportsImageLoadFormatted = supportsImageLoadFormatted; SupportsImageLoadFormatted = supportsImageLoadFormatted;

1
Ryujinx.Graphics.GAL/Format.cs
View file

@ -58,6 +58,7 @@ namespace Ryujinx.Graphics.GAL
D32FloatS8Uint, D32FloatS8Uint,
R8G8B8X8Srgb, R8G8B8X8Srgb,
R8G8B8A8Srgb, R8G8B8A8Srgb,
R4G4Unorm,
R4G4B4A4Unorm, R4G4B4A4Unorm,
R5G5B5X1Unorm, R5G5B5X1Unorm,
R5G5B5A1Unorm, R5G5B5A1Unorm,

1
Ryujinx.Graphics.Gpu/Image/FormatTable.cs
View file

@ -58,6 +58,7 @@ namespace Ryujinx.Graphics.Gpu.Image
{ 0x25385, new FormatInfo(Format.D32FloatS8Uint, 1, 1, 8, 2) }, { 0x25385, new FormatInfo(Format.D32FloatS8Uint, 1, 1, 8, 2) },
{ 0x253b0, new FormatInfo(Format.D32FloatS8Uint, 1, 1, 8, 2) }, { 0x253b0, new FormatInfo(Format.D32FloatS8Uint, 1, 1, 8, 2) },
{ 0xa4908, new FormatInfo(Format.R8G8B8A8Srgb, 1, 1, 4, 4) }, { 0xa4908, new FormatInfo(Format.R8G8B8A8Srgb, 1, 1, 4, 4) },
{ 0x2491e, new FormatInfo(Format.R4G4Unorm, 1, 1, 1, 2) },
{ 0x24912, new FormatInfo(Format.R4G4B4A4Unorm, 1, 1, 2, 4) }, { 0x24912, new FormatInfo(Format.R4G4B4A4Unorm, 1, 1, 2, 4) },
{ 0x24914, new FormatInfo(Format.R5G5B5A1Unorm, 1, 1, 2, 4) }, { 0x24914, new FormatInfo(Format.R5G5B5A1Unorm, 1, 1, 2, 4) },
{ 0x24915, new FormatInfo(Format.R5G6B5Unorm, 1, 1, 2, 3) }, { 0x24915, new FormatInfo(Format.R5G6B5Unorm, 1, 1, 2, 3) },

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

@ -785,7 +785,7 @@ namespace Ryujinx.Graphics.Gpu.Image
// Handle compressed cases not supported by the host: // Handle compressed cases not supported by the host:
// - ASTC is usually not supported on desktop cards. // - ASTC is usually not supported on desktop cards.
// - BC4/BC5 is not supported on 3D textures. // - BC4/BC5 is not supported on 3D textures.
if (!_context.Capabilities.SupportsAstcCompression && Info.FormatInfo.Format.IsAstc()) if (!_context.Capabilities.SupportsAstcCompression && Format.IsAstc())
{ {
if (!AstcDecoder.TryDecodeToRgba8P( if (!AstcDecoder.TryDecodeToRgba8P(
data.ToArray(), data.ToArray(),
@ -805,11 +805,15 @@ namespace Ryujinx.Graphics.Gpu.Image
data = decoded; data = decoded;
} }
else if (Target == Target.Texture3D && Info.FormatInfo.Format.IsBc4()) else if (!_context.Capabilities.SupportsR4G4Format && Format == Format.R4G4Unorm)
{
data = PixelConverter.ConvertR4G4ToR4G4B4A4(data);
}
else if (Target == Target.Texture3D && Format.IsBc4())
{ {
data = BCnDecoder.DecodeBC4(data, width, height, depth, levels, layers, Info.FormatInfo.Format == Format.Bc4Snorm); data = BCnDecoder.DecodeBC4(data, width, height, depth, levels, layers, Info.FormatInfo.Format == Format.Bc4Snorm);
} }
else if (Target == Target.Texture3D && Info.FormatInfo.Format.IsBc5()) else if (Target == Target.Texture3D && Format.IsBc5())
{ {
data = BCnDecoder.DecodeBC5(data, width, height, depth, levels, layers, Info.FormatInfo.Format == Format.Bc5Snorm); data = BCnDecoder.DecodeBC5(data, width, height, depth, levels, layers, Info.FormatInfo.Format == Format.Bc5Snorm);
} }

5
Ryujinx.Graphics.Gpu/Image/TextureCompatibility.cs
View file

@ -66,6 +66,11 @@ namespace Ryujinx.Graphics.Gpu.Image
} }
} }
if (!caps.SupportsR4G4Format && info.FormatInfo.Format == Format.R4G4Unorm)
{
return new FormatInfo(Format.R4G4B4A4Unorm, 1, 1, 2, 4);
}
if (info.Target == Target.Texture3D) if (info.Target == Target.Texture3D)
{ {
// The host API does not support 3D BC4/BC5 compressed formats. // The host API does not support 3D BC4/BC5 compressed formats.

31
Ryujinx.Graphics.OpenGL/Renderer.cs
View file

@ -101,21 +101,22 @@ namespace Ryujinx.Graphics.OpenGL
public Capabilities GetCapabilities() public Capabilities GetCapabilities()
{ {
return new Capabilities( return new Capabilities(
HwCapabilities.Vendor == HwCapabilities.GpuVendor.IntelWindows, hasFrontFacingBug: HwCapabilities.Vendor == HwCapabilities.GpuVendor.IntelWindows,
HwCapabilities.Vendor == HwCapabilities.GpuVendor.AmdWindows, hasVectorIndexingBug: HwCapabilities.Vendor == HwCapabilities.GpuVendor.AmdWindows,
HwCapabilities.SupportsAstcCompression, supportsAstcCompression: HwCapabilities.SupportsAstcCompression,
HwCapabilities.SupportsFragmentShaderInterlock, supportsR4G4Format: false,
HwCapabilities.SupportsFragmentShaderOrdering, supportsFragmentShaderInterlock: HwCapabilities.SupportsFragmentShaderInterlock,
HwCapabilities.SupportsImageLoadFormatted, supportsFragmentShaderOrderingIntel: HwCapabilities.SupportsFragmentShaderOrdering,
HwCapabilities.SupportsMismatchingViewFormat, supportsImageLoadFormatted: HwCapabilities.SupportsImageLoadFormatted,
HwCapabilities.SupportsNonConstantTextureOffset, supportsMismatchingViewFormat: HwCapabilities.SupportsMismatchingViewFormat,
HwCapabilities.SupportsShaderBallot, supportsNonConstantTextureOffset: HwCapabilities.SupportsNonConstantTextureOffset,
HwCapabilities.SupportsTextureShadowLod, supportsShaderBallot: HwCapabilities.SupportsShaderBallot,
HwCapabilities.SupportsViewportSwizzle, supportsTextureShadowLod: HwCapabilities.SupportsTextureShadowLod,
HwCapabilities.SupportsIndirectParameters, supportsViewportSwizzle: HwCapabilities.SupportsViewportSwizzle,
HwCapabilities.MaximumComputeSharedMemorySize, supportsIndirectParameters: HwCapabilities.SupportsIndirectParameters,
HwCapabilities.MaximumSupportedAnisotropy, maximumComputeSharedMemorySize: HwCapabilities.MaximumComputeSharedMemorySize,
HwCapabilities.StorageBufferOffsetAlignment); maximumSupportedAnisotropy: HwCapabilities.MaximumSupportedAnisotropy,
storageBufferOffsetAlignment: HwCapabilities.StorageBufferOffsetAlignment);
} }
public void SetBufferData(BufferHandle buffer, int offset, ReadOnlySpan<byte> data) public void SetBufferData(BufferHandle buffer, int offset, ReadOnlySpan<byte> data)

39
Ryujinx.Graphics.Texture/PixelConverter.cs Normal file
View file

@ -0,0 +1,39 @@
using System;
using System.Runtime.InteropServices;
using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.X86;
namespace Ryujinx.Graphics.Texture
{
public static class PixelConverter
{
public unsafe static byte[] ConvertR4G4ToR4G4B4A4(ReadOnlySpan<byte> data)
{
byte[] output = new byte[data.Length * 2];
int start = 0;
if (Sse41.IsSupported)
{
int sizeTrunc = data.Length & ~7;
start = sizeTrunc;
fixed (byte* inputPtr = data, outputPtr = output)
{
for (ulong offset = 0; offset < (ulong)sizeTrunc; offset += 8)
{
Sse2.Store(outputPtr + offset * 2, Sse41.ConvertToVector128Int16(inputPtr + offset).AsByte());
}
}
}
Span<ushort> outputSpan = MemoryMarshal.Cast<byte, ushort>(output);
for (int i = start; i < data.Length; i++)
{
outputSpan[i] = (ushort)data[i];
}
return output;
}
}
}