vance/ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix R4G4B4A4 format on Vulkan (#3696)

Browse Source
This commit is contained in:
gdkchan 2022-09-13 02:59:38 -03:00 committed by GitHub
parent 36172ab43b
commit 2492e7e808
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ryujinx.Graphics.Vulkan/FormatCapabilities.cs
View File

@ -108,6 +108,10 @@ namespace Ryujinx.Graphics.Vulkan
{ {
format = VkFormat.D32SfloatS8Uint; format = VkFormat.D32SfloatS8Uint;
} }
else if (srcFormat == GAL.Format.R4G4B4A4Unorm)
{
format = VkFormat.R4G4B4A4UnormPack16;
}
else else
{ {
Logger.Error?.Print(LogClass.Gpu, $"Format {srcFormat} is not supported by the host."); Logger.Error?.Print(LogClass.Gpu, $"Format {srcFormat} is not supported by the host.");

10
Ryujinx.Graphics.Vulkan/FormatTable.cs
View File

@ -6,11 +6,11 @@ namespace Ryujinx.Graphics.Vulkan
{ {
static class FormatTable static class FormatTable
{ {
private static readonly VkFormat[] Table; private static readonly VkFormat[] _table;
static FormatTable() static FormatTable()
{ {
Table = new VkFormat[Enum.GetNames(typeof(Format)).Length]; _table = new VkFormat[Enum.GetNames(typeof(Format)).Length];
Add(Format.R8Unorm, VkFormat.R8Unorm); Add(Format.R8Unorm, VkFormat.R8Unorm);
Add(Format.R8Snorm, VkFormat.R8SNorm); Add(Format.R8Snorm, VkFormat.R8SNorm);
@ -68,7 +68,7 @@ namespace Ryujinx.Graphics.Vulkan
Add(Format.D32FloatS8Uint, VkFormat.D32SfloatS8Uint); Add(Format.D32FloatS8Uint, VkFormat.D32SfloatS8Uint);
Add(Format.R8G8B8A8Srgb, VkFormat.R8G8B8A8Srgb); Add(Format.R8G8B8A8Srgb, VkFormat.R8G8B8A8Srgb);
Add(Format.R4G4Unorm, VkFormat.R4G4UnormPack8); Add(Format.R4G4Unorm, VkFormat.R4G4UnormPack8);
Add(Format.R4G4B4A4Unorm, VkFormat.R4G4B4A4UnormPack16); Add(Format.R4G4B4A4Unorm, VkFormat.A4B4G4R4UnormPack16Ext);
Add(Format.R5G5B5X1Unorm, VkFormat.A1R5G5B5UnormPack16); Add(Format.R5G5B5X1Unorm, VkFormat.A1R5G5B5UnormPack16);
Add(Format.R5G5B5A1Unorm, VkFormat.A1R5G5B5UnormPack16); Add(Format.R5G5B5A1Unorm, VkFormat.A1R5G5B5UnormPack16);
Add(Format.R5G6B5Unorm, VkFormat.R5G6B5UnormPack16); Add(Format.R5G6B5Unorm, VkFormat.R5G6B5UnormPack16);
@ -161,12 +161,12 @@ namespace Ryujinx.Graphics.Vulkan
private static void Add(Format format, VkFormat vkFormat) private static void Add(Format format, VkFormat vkFormat)
{ {
Table[(int)format] = vkFormat; _table[(int)format] = vkFormat;
} }
public static VkFormat GetFormat(Format format) public static VkFormat GetFormat(Format format)
{ {
return Table[(int)format]; return _table[(int)format];
} }
} }
} }

12
Ryujinx.Graphics.Vulkan/TextureView.cs
View File

@ -74,17 +74,7 @@ namespace Ryujinx.Graphics.Vulkan
swizzleR = swizzleB; swizzleR = swizzleB;
swizzleB = temp; swizzleB = temp;
} }
else if (info.Format == GAL.Format.R4G4B4A4Unorm) else if (VkFormat == VkFormat.R4G4B4A4UnormPack16 || info.Format == GAL.Format.A1B5G5R5Unorm)
{
var tempG = swizzleG;
var tempB = swizzleB;
swizzleB = swizzleA;
swizzleG = swizzleR;
swizzleR = tempG;
swizzleA = tempB;
}
else if (info.Format == GAL.Format.A1B5G5R5Unorm)
{ {
var tempB = swizzleB; var tempB = swizzleB;
var tempA = swizzleA; var tempA = swizzleA;