diff options
author | gdkchan <gab.dark.100@gmail.com> | 2022-08-16 10:42:42 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-16 15:42:42 +0200 |
commit | 0ec933a6152ebb7724da1e3a05a5ae1c2ea07b2f (patch) | |
tree | 647c002158474de215e36dc81a19ac6e8edfc7b7 | |
parent | 2135b6a51a845c62c9c1013f00d8dfdee0505c97 (diff) |
Vulkan: Add ETC2 texture formats (#3576)1.1.218
-rw-r--r-- | Ryujinx.Graphics.GAL/Format.cs | 2 | ||||
-rw-r--r-- | Ryujinx.Graphics.OpenGL/FormatTable.cs | 4 | ||||
-rw-r--r-- | Ryujinx.Graphics.Vulkan/FormatTable.cs | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/Ryujinx.Graphics.GAL/Format.cs b/Ryujinx.Graphics.GAL/Format.cs index f6abacaf..e455048a 100644 --- a/Ryujinx.Graphics.GAL/Format.cs +++ b/Ryujinx.Graphics.GAL/Format.cs @@ -82,8 +82,10 @@ namespace Ryujinx.Graphics.GAL Bc6HUfloat, Etc2RgbUnorm, Etc2RgbaUnorm, + Etc2RgbPtaUnorm, Etc2RgbSrgb, Etc2RgbaSrgb, + Etc2RgbPtaSrgb, R8Uscaled, R8Sscaled, R16Uscaled, diff --git a/Ryujinx.Graphics.OpenGL/FormatTable.cs b/Ryujinx.Graphics.OpenGL/FormatTable.cs index 25043077..281f0004 100644 --- a/Ryujinx.Graphics.OpenGL/FormatTable.cs +++ b/Ryujinx.Graphics.OpenGL/FormatTable.cs @@ -93,8 +93,12 @@ namespace Ryujinx.Graphics.OpenGL Add(Format.Bc7Srgb, new FormatInfo(4, false, false, All.CompressedSrgbAlphaBptcUnorm)); Add(Format.Bc6HSfloat, new FormatInfo(4, false, false, All.CompressedRgbBptcSignedFloat)); Add(Format.Bc6HUfloat, new FormatInfo(4, false, false, All.CompressedRgbBptcUnsignedFloat)); + Add(Format.Etc2RgbUnorm, new FormatInfo(4, false, false, All.CompressedRgb8Etc2)); Add(Format.Etc2RgbaUnorm, new FormatInfo(4, false, false, All.CompressedRgba8Etc2Eac)); + Add(Format.Etc2RgbPtaUnorm, new FormatInfo(4, false, false, All.CompressedRgb8PunchthroughAlpha1Etc2)); + Add(Format.Etc2RgbSrgb, new FormatInfo(4, false, false, All.CompressedSrgb8Etc2)); Add(Format.Etc2RgbaSrgb, new FormatInfo(4, false, false, All.CompressedSrgb8Alpha8Etc2Eac)); + Add(Format.Etc2RgbPtaSrgb, new FormatInfo(4, false, false, All.CompressedSrgb8PunchthroughAlpha1Etc2)); 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)); diff --git a/Ryujinx.Graphics.Vulkan/FormatTable.cs b/Ryujinx.Graphics.Vulkan/FormatTable.cs index 446fea0a..b5739623 100644 --- a/Ryujinx.Graphics.Vulkan/FormatTable.cs +++ b/Ryujinx.Graphics.Vulkan/FormatTable.cs @@ -90,6 +90,12 @@ namespace Ryujinx.Graphics.Vulkan Add(Format.Bc7Srgb, VkFormat.BC7SrgbBlock); Add(Format.Bc6HSfloat, VkFormat.BC6HSfloatBlock); Add(Format.Bc6HUfloat, VkFormat.BC6HUfloatBlock); + Add(Format.Etc2RgbUnorm, VkFormat.Etc2R8G8B8UnormBlock); + Add(Format.Etc2RgbaUnorm, VkFormat.Etc2R8G8B8A8UnormBlock); + Add(Format.Etc2RgbPtaUnorm, VkFormat.Etc2R8G8B8A1UnormBlock); + Add(Format.Etc2RgbSrgb, VkFormat.Etc2R8G8B8SrgbBlock); + Add(Format.Etc2RgbaSrgb, VkFormat.Etc2R8G8B8A8SrgbBlock); + Add(Format.Etc2RgbPtaSrgb, VkFormat.Etc2R8G8B8A1SrgbBlock); Add(Format.R8Uscaled, VkFormat.R8Uscaled); Add(Format.R8Sscaled, VkFormat.R8Sscaled); Add(Format.R16Uscaled, VkFormat.R16Uscaled); |