diff options
| author | gdk <gab.dark.100@gmail.com> | 2019-10-15 00:11:11 -0300 |
|---|---|---|
| committer | Thog <thog@protonmail.com> | 2020-01-09 02:13:00 +0100 |
| commit | 873bb4c15ac2b949594eb6267420508dce6dc2fd (patch) | |
| tree | 111d68894002ffd8c8105a995abad2eb4d626c00 | |
| parent | f90ee9b7070dfbf3d6f9713a180b0ec899a039b8 (diff) | |
Fix BC6 Signed/Unsigned float texture formats
| -rw-r--r-- | Ryujinx.Graphics.GAL/Format.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.Graphics.Gpu/Image/FormatTable.cs | 4 | ||||
| -rw-r--r-- | Ryujinx.Graphics.OpenGL/Formats/FormatTable.cs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Ryujinx.Graphics.GAL/Format.cs b/Ryujinx.Graphics.GAL/Format.cs index 9f28cdfb..0221746b 100644 --- a/Ryujinx.Graphics.GAL/Format.cs +++ b/Ryujinx.Graphics.GAL/Format.cs @@ -80,8 +80,8 @@ namespace Ryujinx.Graphics.GAL Bc5Snorm, Bc7Unorm, Bc7Srgb, - Bc6HUfloat, Bc6HSfloat, + Bc6HUfloat, R8Uscaled, R8Sscaled, R16Uscaled, diff --git a/Ryujinx.Graphics.Gpu/Image/FormatTable.cs b/Ryujinx.Graphics.Gpu/Image/FormatTable.cs index 9f5b26d4..baff2e4f 100644 --- a/Ryujinx.Graphics.Gpu/Image/FormatTable.cs +++ b/Ryujinx.Graphics.Gpu/Image/FormatTable.cs @@ -70,8 +70,8 @@ namespace Ryujinx.Graphics.Gpu.Image { 0x124a8, new FormatInfo(Format.Bc5Snorm, 4, 4, 16) }, { 0x24917, new FormatInfo(Format.Bc7Unorm, 4, 4, 16) }, { 0xa4917, new FormatInfo(Format.Bc7Srgb, 4, 4, 16) }, - { 0x7ff90, new FormatInfo(Format.Bc6HUfloat, 4, 4, 16) }, - { 0x7ff91, new FormatInfo(Format.Bc6HSfloat, 4, 4, 16) }, + { 0x7ff90, new FormatInfo(Format.Bc6HSfloat, 4, 4, 16) }, + { 0x7ff91, new FormatInfo(Format.Bc6HUfloat, 4, 4, 16) }, { 0x24940, new FormatInfo(Format.Astc4x4Unorm, 4, 4, 16) }, { 0x24950, new FormatInfo(Format.Astc5x4Unorm, 5, 4, 16) }, { 0x24941, new FormatInfo(Format.Astc5x5Unorm, 5, 5, 16) }, diff --git a/Ryujinx.Graphics.OpenGL/Formats/FormatTable.cs b/Ryujinx.Graphics.OpenGL/Formats/FormatTable.cs index 13e88c55..b67fe5c4 100644 --- a/Ryujinx.Graphics.OpenGL/Formats/FormatTable.cs +++ b/Ryujinx.Graphics.OpenGL/Formats/FormatTable.cs @@ -90,8 +90,8 @@ namespace Ryujinx.Graphics.OpenGL.Formats Add(Format.Bc5Snorm, new FormatInfo(1, true, false, All.CompressedSignedRgRgtc2)); Add(Format.Bc7Unorm, new FormatInfo(1, true, false, All.CompressedRgbaBptcUnorm)); Add(Format.Bc7Srgb, new FormatInfo(1, false, false, All.CompressedSrgbAlphaBptcUnorm)); - Add(Format.Bc6HUfloat, new FormatInfo(1, false, false, All.CompressedRgbBptcUnsignedFloat)); Add(Format.Bc6HSfloat, new FormatInfo(1, false, false, All.CompressedRgbBptcSignedFloat)); + Add(Format.Bc6HUfloat, new FormatInfo(1, false, false, All.CompressedRgbBptcUnsignedFloat)); Add(Format.R8Uscaled, new FormatInfo(1, false, true, All.R8ui, PixelFormat.RedInteger, PixelType.UnsignedByte)); Add(Format.R8Sscaled, new FormatInfo(1, false, true, All.R8i, PixelFormat.RedInteger, PixelType.Byte)); Add(Format.R16Uscaled, new FormatInfo(1, false, true, All.R16ui, PixelFormat.RedInteger, PixelType.UnsignedShort)); |