From 505c206eb84783eabbf9e751d7726fb8916e1623 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Tue, 30 Jun 2020 03:41:38 -0300 Subject: video_core/surface: Remove explicit values on PixelFormat's definition --- src/video_core/surface.h | 160 +++++++++++++++++++++++------------------------ 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/src/video_core/surface.h b/src/video_core/surface.h index 6da6a1b97..422c9fcb2 100644 --- a/src/video_core/surface.h +++ b/src/video_core/surface.h @@ -15,94 +15,94 @@ namespace VideoCore::Surface { enum class PixelFormat { - ABGR8U = 0, - ABGR8S = 1, - ABGR8UI = 2, - B5G6R5U = 3, - A2B10G10R10U = 4, - A1B5G5R5U = 5, - R8U = 6, - R8UI = 7, - RGBA16F = 8, - RGBA16U = 9, - RGBA16S = 10, - RGBA16UI = 11, - R11FG11FB10F = 12, - RGBA32UI = 13, - DXT1 = 14, - DXT23 = 15, - DXT45 = 16, - DXN1 = 17, // This is also known as BC4 - DXN2UNORM = 18, - DXN2SNORM = 19, - BC7U = 20, - BC6H_UF16 = 21, - BC6H_SF16 = 22, - ASTC_2D_4X4 = 23, - BGRA8 = 24, - RGBA32F = 25, - RG32F = 26, - R32F = 27, - R16F = 28, - R16U = 29, - R16S = 30, - R16UI = 31, - R16I = 32, - RG16 = 33, - RG16F = 34, - RG16UI = 35, - RG16I = 36, - RG16S = 37, - RGB32F = 38, - RGBA8_SRGB = 39, - RG8U = 40, - RG8S = 41, - RG8UI = 42, - RG32UI = 43, - RGBX16F = 44, - R32UI = 45, - R32I = 46, - ASTC_2D_8X8 = 47, - ASTC_2D_8X5 = 48, - ASTC_2D_5X4 = 49, - BGRA8_SRGB = 50, - DXT1_SRGB = 51, - DXT23_SRGB = 52, - DXT45_SRGB = 53, - BC7U_SRGB = 54, - R4G4B4A4U = 55, - ASTC_2D_4X4_SRGB = 56, - ASTC_2D_8X8_SRGB = 57, - ASTC_2D_8X5_SRGB = 58, - ASTC_2D_5X4_SRGB = 59, - ASTC_2D_5X5 = 60, - ASTC_2D_5X5_SRGB = 61, - ASTC_2D_10X8 = 62, - ASTC_2D_10X8_SRGB = 63, - ASTC_2D_6X6 = 64, - ASTC_2D_6X6_SRGB = 65, - ASTC_2D_10X10 = 66, - ASTC_2D_10X10_SRGB = 67, - ASTC_2D_12X12 = 68, - ASTC_2D_12X12_SRGB = 69, - ASTC_2D_8X6 = 70, - ASTC_2D_8X6_SRGB = 71, - ASTC_2D_6X5 = 72, - ASTC_2D_6X5_SRGB = 73, - E5B9G9R9F = 74, + ABGR8U, + ABGR8S, + ABGR8UI, + B5G6R5U, + A2B10G10R10U, + A1B5G5R5U, + R8U, + R8UI, + RGBA16F, + RGBA16U, + RGBA16S, + RGBA16UI, + R11FG11FB10F, + RGBA32UI, + DXT1, + DXT23, + DXT45, + DXN1, // This is also known as BC4 + DXN2UNORM, + DXN2SNORM, + BC7U, + BC6H_UF16, + BC6H_SF16, + ASTC_2D_4X4, + BGRA8, + RGBA32F, + RG32F, + R32F, + R16F, + R16U, + R16S, + R16UI, + R16I, + RG16, + RG16F, + RG16UI, + RG16I, + RG16S, + RGB32F, + RGBA8_SRGB, + RG8U, + RG8S, + RG8UI, + RG32UI, + RGBX16F, + R32UI, + R32I, + ASTC_2D_8X8, + ASTC_2D_8X5, + ASTC_2D_5X4, + BGRA8_SRGB, + DXT1_SRGB, + DXT23_SRGB, + DXT45_SRGB, + BC7U_SRGB, + R4G4B4A4U, + ASTC_2D_4X4_SRGB, + ASTC_2D_8X8_SRGB, + ASTC_2D_8X5_SRGB, + ASTC_2D_5X4_SRGB, + ASTC_2D_5X5, + ASTC_2D_5X5_SRGB, + ASTC_2D_10X8, + ASTC_2D_10X8_SRGB, + ASTC_2D_6X6, + ASTC_2D_6X6_SRGB, + ASTC_2D_10X10, + ASTC_2D_10X10_SRGB, + ASTC_2D_12X12, + ASTC_2D_12X12_SRGB, + ASTC_2D_8X6, + ASTC_2D_8X6_SRGB, + ASTC_2D_6X5, + ASTC_2D_6X5_SRGB, + E5B9G9R9F, MaxColorFormat, // Depth formats - Z32F = 75, - Z16 = 76, + Z32F = MaxColorFormat, + Z16, MaxDepthFormat, // DepthStencil formats - Z24S8 = 77, - S8Z24 = 78, - Z32FS8 = 79, + Z24S8 = MaxDepthFormat, + S8Z24, + Z32FS8, MaxDepthStencilFormat, -- cgit v1.2.3