From 873bb4c15ac2b949594eb6267420508dce6dc2fd Mon Sep 17 00:00:00 2001 From: gdk Date: Tue, 15 Oct 2019 00:11:11 -0300 Subject: [PATCH] Fix BC6 Signed/Unsigned float texture formats --- Ryujinx.Graphics.GAL/Format.cs | 2 +- Ryujinx.Graphics.Gpu/Image/FormatTable.cs | 4 ++-- 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 9f28cdfb8..0221746b3 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 9f5b26d4b..baff2e4fc 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 13e88c556..b67fe5c4a 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));