Improve texture tables (#457)

* Improve texture tables

* More renaming and other tweaks

* Minor tweaks

1 files changed, 46 insertions, 74 deletions

diff --git a/Ryujinx.Graphics/Gal/GalImageFormat.cs b/Ryujinx.Graphics/Gal/GalImageFormat.cs
index ba555684..2712cbc2 100644
--- a/Ryujinx.Graphics/Gal/GalImageFormat.cs
+++ b/Ryujinx.Graphics/Gal/GalImageFormat.cs
@@ -5,89 +5,61 @@ namespace Ryujinx.Graphics.Gal
     [Flags]
     public enum GalImageFormat
     {
-        Snorm  = 1 << 27,
-        Unorm  = 1 << 28,
-        Sint   = 1 << 29,
-        Uint   = 1 << 30,
-        Sfloat = 1 << 31,
+        Astc2DStart,
+        Astc2D4x4,
+        Astc2D5x4,
+        Astc2D5x5,
+        Astc2D6x5,
+        Astc2D6x6,
+        Astc2D8x5,
+        Astc2D8x6,
+        Astc2D8x8,
+        Astc2D10x5,
+        Astc2D10x6,
+        Astc2D10x8,
+        Astc2D10x10,
+        Astc2D12x10,
+        Astc2D12x12,
+        Astc2DEnd,
 
-        TypeMask = Snorm | Unorm | Sint | Uint | Sfloat,
-
-        FormatMask = ~TypeMask,
-
-        ASTC_BEGIN = ASTC_4x4,
-
-        ASTC_4x4 = 1,
-        ASTC_5x4,
-        ASTC_5x5,
-        ASTC_6x5,
-        ASTC_6x6,
-        ASTC_8x5,
-        ASTC_8x6,
-        ASTC_8x8,
-        ASTC_10x5,
-        ASTC_10x6,
-        ASTC_10x8,
-        ASTC_10x10,
-        ASTC_12x10,
-        ASTC_12x12,
-
-        ASTC_END = ASTC_12x12,
-
-        R4G4,
-        R4G4B4A4,
-        B4G4R4A4,
-        A4B4G4R4,
-        R5G6B5,
-        B5G6R5,
-        R5G5B5A1,
-        B5G5R5A1,
-        A1R5G5B5,
+        RGBA4,
+        RGB565,
+        BGR5A1,
+        RGB5A1,
         R8,
-        R8G8,
-        G8R8,
-        R8G8B8,
-        B8G8R8,
-        R8G8B8A8,
-        B8G8R8A8,
-        A8B8G8R8,
-        A8B8G8R8_SRGB,
-        A2R10G10B10,
-        A2B10G10R10,
+        RG8,
+        RGBA8,
+        BGRA8,
+        RGB10A2,
         R16,
-        R16G16,
-        R16G16B16,
-        R16G16B16A16,
+        RG16,
+        RGBA16,
         R32,
-        R32G32,
-        R32G32B32,
-        R32G32B32A32,
-        R64,
-        R64G64,
-        R64G64B64,
-        R64G64B64A64,
-        B10G11R11,
-        E5B9G9R9,
+        RG32,
+        RGBA32,
+        R11G11B10,
         D16,
-        X8_D24,
         D32,
-        S8,
-        D16_S8,
-        D24_S8,
-        D32_S8,
-        BC1_RGB,
-        BC1_RGBA,
+        D24S8,
+        D32S8,
+        BC1,
         BC2,
         BC3,
         BC4,
         BC5,
-        BC6H_SF16,
-        BC6H_UF16,
-        BC7,
-        ETC2_R8G8B8,
-        ETC2_R8G8B8A1,
-        ETC2_R8G8B8A8,
-        EAC_R11,
-        EAC_R11G11,
+        BptcSfloat,
+        BptcUfloat,
+        BptcUnorm,
+
+        Snorm = 1 << 26,
+        Unorm = 1 << 27,
+        Sint  = 1 << 28,
+        Uint  = 1 << 39,
+        Float = 1 << 30,
+        Srgb  = 1 << 31,
+
+        TypeMask = Snorm | Unorm | Sint | Uint | Float | Srgb,
+
+        FormatMask = ~TypeMask
     }
 }
\ No newline at end of file