From b9b4507faa7bbe48407ed2e9238dc94d2445de2f Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Fri, 24 May 2024 15:26:51 +0200 Subject: [PATCH] mesa/main: clean up switch statement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This groups the enums by return-value, and makes the table more compact and easier to scan through. Reviewed-by: Marek Olšák Part-of: --- src/mesa/main/formats.c | 350 +++++++++++----------------------------- 1 file changed, 98 insertions(+), 252 deletions(-) diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c index 19e6361d7ba..740df87bb9a 100644 --- a/src/mesa/main/formats.c +++ b/src/mesa/main/formats.c @@ -898,10 +898,36 @@ _mesa_uncompressed_format_to_type(mesa_format format) case MESA_FORMAT_R8G8B8A8_UINT: case MESA_FORMAT_B8G8R8A8_UINT: case MESA_FORMAT_A8R8G8B8_UINT: - return GL_UNSIGNED_BYTE; - case MESA_FORMAT_BGR_UNORM8: case MESA_FORMAT_RGB_UNORM8: + case MESA_FORMAT_LA_UNORM8: + case MESA_FORMAT_RG_UNORM8: + case MESA_FORMAT_A_UNORM8: + case MESA_FORMAT_L_UNORM8: + case MESA_FORMAT_I_UNORM8: + case MESA_FORMAT_R_UNORM8: + case MESA_FORMAT_S_UINT8: + case MESA_FORMAT_BGR_SRGB8: + case MESA_FORMAT_A8B8G8R8_SRGB: + case MESA_FORMAT_B8G8R8A8_SRGB: + case MESA_FORMAT_A8R8G8B8_SRGB: + case MESA_FORMAT_R8G8B8A8_SRGB: + case MESA_FORMAT_L_SRGB8: + case MESA_FORMAT_R_SRGB8: + case MESA_FORMAT_LA_SRGB8: + case MESA_FORMAT_RG_SRGB8: + case MESA_FORMAT_A_UINT8: + case MESA_FORMAT_L_UINT8: + case MESA_FORMAT_I_UINT8: + case MESA_FORMAT_LA_UINT8: + case MESA_FORMAT_R_UINT8: + case MESA_FORMAT_RG_UINT8: + case MESA_FORMAT_RGB_UINT8: + case MESA_FORMAT_R8G8B8X8_SRGB: + case MESA_FORMAT_X8B8G8R8_SRGB: + case MESA_FORMAT_RGBX_UINT8: + case MESA_FORMAT_B8G8R8X8_SRGB: + case MESA_FORMAT_X8R8G8B8_SRGB: return GL_UNSIGNED_BYTE; case MESA_FORMAT_B5G6R5_UNORM: @@ -915,6 +941,10 @@ _mesa_uncompressed_format_to_type(mesa_format format) case MESA_FORMAT_B4G4R4X4_UNORM: case MESA_FORMAT_B4G4R4A4_UINT: case MESA_FORMAT_A4R4G4B4_UINT: + case MESA_FORMAT_A4B4G4R4_UNORM: + case MESA_FORMAT_A4B4G4R4_UINT: + case MESA_FORMAT_R4G4B4A4_UNORM: + case MESA_FORMAT_R4G4B4A4_UINT: return GL_UNSIGNED_SHORT_4_4_4_4; case MESA_FORMAT_B5G5R5A1_UNORM: @@ -922,9 +952,16 @@ _mesa_uncompressed_format_to_type(mesa_format format) case MESA_FORMAT_B5G5R5X1_UNORM: case MESA_FORMAT_B5G5R5A1_UINT: case MESA_FORMAT_A1R5G5B5_UINT: + case MESA_FORMAT_R5G5B5A1_UNORM: + case MESA_FORMAT_R5G5B5A1_UINT: return GL_UNSIGNED_SHORT_1_5_5_5_REV; case MESA_FORMAT_B10G10R10A2_UNORM: + case MESA_FORMAT_B10G10R10A2_UINT: + case MESA_FORMAT_R10G10B10A2_UINT: + case MESA_FORMAT_B10G10R10X2_UNORM: + case MESA_FORMAT_R10G10B10X2_UNORM: + case MESA_FORMAT_R10G10B10A2_UNORM: return GL_UNSIGNED_INT_2_10_10_10_REV; case MESA_FORMAT_A1B5G5R5_UNORM: @@ -935,40 +972,38 @@ _mesa_uncompressed_format_to_type(mesa_format format) case MESA_FORMAT_L4A4_UNORM: return MESA_UNSIGNED_BYTE_4_4; - case MESA_FORMAT_LA_UNORM8: - case MESA_FORMAT_RG_UNORM8: - return GL_UNSIGNED_BYTE; - case MESA_FORMAT_LA_UNORM16: case MESA_FORMAT_RG_UNORM16: - return GL_UNSIGNED_SHORT; - case MESA_FORMAT_R_UNORM16: case MESA_FORMAT_A_UNORM16: case MESA_FORMAT_L_UNORM16: case MESA_FORMAT_I_UNORM16: + case MESA_FORMAT_YCBCR: + case MESA_FORMAT_YCBCR_REV: + case MESA_FORMAT_RG_RB_UNORM8: + case MESA_FORMAT_RB_RG_UNORM8: + case MESA_FORMAT_GR_BR_UNORM8: + case MESA_FORMAT_BR_GR_UNORM8: + case MESA_FORMAT_Z_UNORM16: + case MESA_FORMAT_RGBA_UNORM16: + case MESA_FORMAT_A_UINT16: + case MESA_FORMAT_L_UINT16: + case MESA_FORMAT_I_UINT16: + case MESA_FORMAT_LA_UINT16: + case MESA_FORMAT_R_UINT16: + case MESA_FORMAT_RG_UINT16: + case MESA_FORMAT_RGB_UINT16: + case MESA_FORMAT_RGBA_UINT16: + case MESA_FORMAT_RGBX_UNORM16: + case MESA_FORMAT_RGBX_UINT16: return GL_UNSIGNED_SHORT; case MESA_FORMAT_R3G3B2_UNORM: case MESA_FORMAT_R3G3B2_UINT: return GL_UNSIGNED_BYTE_2_3_3_REV; - case MESA_FORMAT_A4B4G4R4_UNORM: - case MESA_FORMAT_A4B4G4R4_UINT: - return GL_UNSIGNED_SHORT_4_4_4_4; - - case MESA_FORMAT_R4G4B4A4_UNORM: - case MESA_FORMAT_R4G4B4A4_UINT: - return GL_UNSIGNED_SHORT_4_4_4_4; - - case MESA_FORMAT_R5G5B5A1_UNORM: - case MESA_FORMAT_R5G5B5A1_UINT: - return GL_UNSIGNED_SHORT_1_5_5_5_REV; - case MESA_FORMAT_A2B10G10R10_UNORM: case MESA_FORMAT_A2B10G10R10_UINT: - return GL_UNSIGNED_INT_10_10_10_2; - case MESA_FORMAT_A2R10G10B10_UNORM: case MESA_FORMAT_A2R10G10B10_UINT: return GL_UNSIGNED_INT_10_10_10_2; @@ -977,40 +1012,36 @@ _mesa_uncompressed_format_to_type(mesa_format format) case MESA_FORMAT_B2G3R3_UINT: return GL_UNSIGNED_BYTE_3_3_2; - case MESA_FORMAT_A_UNORM8: - case MESA_FORMAT_L_UNORM8: - case MESA_FORMAT_I_UNORM8: - case MESA_FORMAT_R_UNORM8: - case MESA_FORMAT_S_UINT8: - return GL_UNSIGNED_BYTE; - - case MESA_FORMAT_YCBCR: - case MESA_FORMAT_YCBCR_REV: - case MESA_FORMAT_RG_RB_UNORM8: - case MESA_FORMAT_RB_RG_UNORM8: - case MESA_FORMAT_GR_BR_UNORM8: - case MESA_FORMAT_BR_GR_UNORM8: - return GL_UNSIGNED_SHORT; - case MESA_FORMAT_S8_UINT_Z24_UNORM: return GL_UNSIGNED_INT_24_8_MESA; case MESA_FORMAT_Z24_UNORM_S8_UINT: return GL_UNSIGNED_INT_8_24_REV_MESA; - case MESA_FORMAT_Z_UNORM16: - return GL_UNSIGNED_SHORT; - case MESA_FORMAT_Z24_UNORM_X8_UINT: - return GL_UNSIGNED_INT; - case MESA_FORMAT_X8_UINT_Z24_UNORM: - return GL_UNSIGNED_INT; - case MESA_FORMAT_Z_UNORM32: + case MESA_FORMAT_A_UINT32: + case MESA_FORMAT_L_UINT32: + case MESA_FORMAT_I_UINT32: + case MESA_FORMAT_LA_UINT32: + case MESA_FORMAT_R_UINT32: + case MESA_FORMAT_RG_UINT32: + case MESA_FORMAT_RGB_UINT32: + case MESA_FORMAT_RGBA_UINT32: + case MESA_FORMAT_RGBX_UINT32: return GL_UNSIGNED_INT; case MESA_FORMAT_Z_FLOAT32: + case MESA_FORMAT_RGBA_FLOAT32: + case MESA_FORMAT_RGB_FLOAT32: + case MESA_FORMAT_LA_FLOAT32: + case MESA_FORMAT_RG_FLOAT32: + case MESA_FORMAT_A_FLOAT32: + case MESA_FORMAT_L_FLOAT32: + case MESA_FORMAT_I_FLOAT32: + case MESA_FORMAT_R_FLOAT32: + case MESA_FORMAT_RGBX_FLOAT32: return GL_FLOAT; case MESA_FORMAT_Z32_FLOAT_S8X24_UINT: @@ -1020,257 +1051,72 @@ _mesa_uncompressed_format_to_type(mesa_format format) case MESA_FORMAT_A_SNORM8: case MESA_FORMAT_L_SNORM8: case MESA_FORMAT_I_SNORM8: - return GL_BYTE; - case MESA_FORMAT_RG_SNORM8: case MESA_FORMAT_LA_SNORM8: - return GL_BYTE; - case MESA_FORMAT_A8B8G8R8_SNORM: case MESA_FORMAT_R8G8B8A8_SNORM: case MESA_FORMAT_X8B8G8R8_SNORM: + case MESA_FORMAT_A_SINT8: + case MESA_FORMAT_L_SINT8: + case MESA_FORMAT_I_SINT8: + case MESA_FORMAT_LA_SINT8: + case MESA_FORMAT_R_SINT8: + case MESA_FORMAT_RG_SINT8: + case MESA_FORMAT_RGB_SINT8: + case MESA_FORMAT_RGBA_SINT8: + case MESA_FORMAT_R8G8B8X8_SNORM: + case MESA_FORMAT_RGBX_SINT8: return GL_BYTE; - case MESA_FORMAT_RGBA_UNORM16: - return GL_UNSIGNED_SHORT; - case MESA_FORMAT_R_SNORM16: case MESA_FORMAT_A_SNORM16: case MESA_FORMAT_L_SNORM16: case MESA_FORMAT_I_SNORM16: - return GL_SHORT; - case MESA_FORMAT_RG_SNORM16: case MESA_FORMAT_LA_SNORM16: - return GL_SHORT; - case MESA_FORMAT_RGB_SNORM16: - return GL_SHORT; - case MESA_FORMAT_RGBA_SNORM16: + case MESA_FORMAT_A_SINT16: + case MESA_FORMAT_L_SINT16: + case MESA_FORMAT_I_SINT16: + case MESA_FORMAT_LA_SINT16: + case MESA_FORMAT_R_SINT16: + case MESA_FORMAT_RG_SINT16: + case MESA_FORMAT_RGB_SINT16: + case MESA_FORMAT_RGBA_SINT16: + case MESA_FORMAT_RGBX_SNORM16: + case MESA_FORMAT_RGBX_SINT16: return GL_SHORT; - case MESA_FORMAT_BGR_SRGB8: - return GL_UNSIGNED_BYTE; - - case MESA_FORMAT_A8B8G8R8_SRGB: - case MESA_FORMAT_B8G8R8A8_SRGB: - case MESA_FORMAT_A8R8G8B8_SRGB: - case MESA_FORMAT_R8G8B8A8_SRGB: - return GL_UNSIGNED_BYTE; - - case MESA_FORMAT_L_SRGB8: - case MESA_FORMAT_R_SRGB8: - return GL_UNSIGNED_BYTE; - - case MESA_FORMAT_LA_SRGB8: - case MESA_FORMAT_RG_SRGB8: - return GL_UNSIGNED_BYTE; - - case MESA_FORMAT_RGBA_FLOAT32: - return GL_FLOAT; case MESA_FORMAT_RGBA_FLOAT16: - return GL_HALF_FLOAT_ARB; - - case MESA_FORMAT_RGB_FLOAT32: - return GL_FLOAT; - case MESA_FORMAT_RGB_FLOAT16: - return GL_HALF_FLOAT_ARB; - - case MESA_FORMAT_LA_FLOAT32: - case MESA_FORMAT_RG_FLOAT32: - return GL_FLOAT; - case MESA_FORMAT_LA_FLOAT16: case MESA_FORMAT_RG_FLOAT16: - return GL_HALF_FLOAT_ARB; - - case MESA_FORMAT_A_FLOAT32: - case MESA_FORMAT_L_FLOAT32: - case MESA_FORMAT_I_FLOAT32: - case MESA_FORMAT_R_FLOAT32: - return GL_FLOAT; - case MESA_FORMAT_A_FLOAT16: case MESA_FORMAT_L_FLOAT16: case MESA_FORMAT_I_FLOAT16: case MESA_FORMAT_R_FLOAT16: - return GL_HALF_FLOAT_ARB; - - case MESA_FORMAT_A_UINT8: - case MESA_FORMAT_L_UINT8: - case MESA_FORMAT_I_UINT8: - return GL_UNSIGNED_BYTE; - - case MESA_FORMAT_LA_UINT8: - return GL_UNSIGNED_BYTE; - - case MESA_FORMAT_A_UINT16: - case MESA_FORMAT_L_UINT16: - case MESA_FORMAT_I_UINT16: - return GL_UNSIGNED_SHORT; - - case MESA_FORMAT_LA_UINT16: - return GL_UNSIGNED_SHORT; - - case MESA_FORMAT_A_UINT32: - case MESA_FORMAT_L_UINT32: - case MESA_FORMAT_I_UINT32: - return GL_UNSIGNED_INT; - - case MESA_FORMAT_LA_UINT32: - return GL_UNSIGNED_INT; - - case MESA_FORMAT_A_SINT8: - case MESA_FORMAT_L_SINT8: - case MESA_FORMAT_I_SINT8: - return GL_BYTE; - - case MESA_FORMAT_LA_SINT8: - return GL_BYTE; - - case MESA_FORMAT_A_SINT16: - case MESA_FORMAT_L_SINT16: - case MESA_FORMAT_I_SINT16: - return GL_SHORT; - - case MESA_FORMAT_LA_SINT16: - return GL_SHORT; + case MESA_FORMAT_RGBX_FLOAT16: + return GL_HALF_FLOAT; case MESA_FORMAT_A_SINT32: case MESA_FORMAT_L_SINT32: case MESA_FORMAT_I_SINT32: - return GL_INT; - case MESA_FORMAT_LA_SINT32: - return GL_INT; - - case MESA_FORMAT_R_SINT8: - return GL_BYTE; - - case MESA_FORMAT_RG_SINT8: - return GL_BYTE; - - case MESA_FORMAT_RGB_SINT8: - return GL_BYTE; - - case MESA_FORMAT_RGBA_SINT8: - return GL_BYTE; - - case MESA_FORMAT_R_SINT16: - return GL_SHORT; - - case MESA_FORMAT_RG_SINT16: - return GL_SHORT; - - case MESA_FORMAT_RGB_SINT16: - return GL_SHORT; - - case MESA_FORMAT_RGBA_SINT16: - return GL_SHORT; - case MESA_FORMAT_R_SINT32: - return GL_INT; - case MESA_FORMAT_RG_SINT32: - return GL_INT; - case MESA_FORMAT_RGB_SINT32: - return GL_INT; - case MESA_FORMAT_RGBA_SINT32: + case MESA_FORMAT_RGBX_SINT32: return GL_INT; - - /** - * \name Non-normalized unsigned integer formats. - */ - case MESA_FORMAT_R_UINT8: - return GL_UNSIGNED_BYTE; - - case MESA_FORMAT_RG_UINT8: - return GL_UNSIGNED_BYTE; - - case MESA_FORMAT_RGB_UINT8: - return GL_UNSIGNED_BYTE; - - case MESA_FORMAT_R_UINT16: - return GL_UNSIGNED_SHORT; - - case MESA_FORMAT_RG_UINT16: - return GL_UNSIGNED_SHORT; - - case MESA_FORMAT_RGB_UINT16: - return GL_UNSIGNED_SHORT; - - case MESA_FORMAT_RGBA_UINT16: - return GL_UNSIGNED_SHORT; - - case MESA_FORMAT_R_UINT32: - return GL_UNSIGNED_INT; - - case MESA_FORMAT_RG_UINT32: - return GL_UNSIGNED_INT; - - case MESA_FORMAT_RGB_UINT32: - return GL_UNSIGNED_INT; - - case MESA_FORMAT_RGBA_UINT32: - return GL_UNSIGNED_INT; - case MESA_FORMAT_R9G9B9E5_FLOAT: return GL_UNSIGNED_INT_5_9_9_9_REV; case MESA_FORMAT_R11G11B10_FLOAT: return GL_UNSIGNED_INT_10F_11F_11F_REV; - case MESA_FORMAT_B10G10R10A2_UINT: - case MESA_FORMAT_R10G10B10A2_UINT: - return GL_UNSIGNED_INT_2_10_10_10_REV; - - case MESA_FORMAT_R8G8B8X8_SRGB: - case MESA_FORMAT_X8B8G8R8_SRGB: - case MESA_FORMAT_RGBX_UINT8: - return GL_UNSIGNED_BYTE; - - case MESA_FORMAT_R8G8B8X8_SNORM: - case MESA_FORMAT_RGBX_SINT8: - return GL_BYTE; - - case MESA_FORMAT_B10G10R10X2_UNORM: - case MESA_FORMAT_R10G10B10X2_UNORM: - return GL_UNSIGNED_INT_2_10_10_10_REV; - - case MESA_FORMAT_RGBX_UNORM16: - case MESA_FORMAT_RGBX_UINT16: - return GL_UNSIGNED_SHORT; - - case MESA_FORMAT_RGBX_SNORM16: - case MESA_FORMAT_RGBX_SINT16: - return GL_SHORT; - - case MESA_FORMAT_RGBX_FLOAT16: - return GL_HALF_FLOAT; - - case MESA_FORMAT_RGBX_FLOAT32: - return GL_FLOAT; - - case MESA_FORMAT_RGBX_UINT32: - return GL_UNSIGNED_INT; - - case MESA_FORMAT_RGBX_SINT32: - return GL_INT; - - case MESA_FORMAT_R10G10B10A2_UNORM: - return GL_UNSIGNED_INT_2_10_10_10_REV; - - case MESA_FORMAT_B8G8R8X8_SRGB: - case MESA_FORMAT_X8R8G8B8_SRGB: - return GL_UNSIGNED_BYTE; - - case MESA_FORMAT_COUNT: assert(0); return GL_NONE;