Skip to content

A
angle
Commit 206a58d1 by Jamie Madill Committed by Commit Bot
Options

Slight reformat to ANGLE format table.

Refactoring change only. BUG=angleproject:2207 Change-Id: Id05972d2084f3254745cbf55d1b7577306020466 Reviewed-on: https://chromium-review.googlesource.com/742373 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent e88ec8ee
Showing with 263 additions and 136 deletions
src/libANGLE/renderer/Format_table_autogen.cpp
...@@ -157,138 +157,266 @@ Format::ID Format::InternalFormatToID(GLenum internalFormat) ...@@ -157,138 +157,266 @@ Format::ID Format::InternalFormatToID(GLenum internalFormat)
{ {
switch (internalFormat) switch (internalFormat)
{ {
// clang-format off case GL_RGBA16_EXT:
case GL_RGBA16_EXT: return Format::ID::R16G16B16A16_UNORM; return Format::ID::R16G16B16A16_UNORM;
case GL_ETC1_RGB8_LOSSY_DECODE_ANGLE: return Format::ID::NONE; case GL_ETC1_RGB8_LOSSY_DECODE_ANGLE:
case GL_RG8I: return Format::ID::R8G8_SINT; return Format::ID::NONE;
case GL_R16F: return Format::ID::R16_FLOAT; case GL_RG8I:
case GL_RGBA8I: return Format::ID::R8G8B8A8_SINT; return Format::ID::R8G8_SINT;
case GL_RG8UI: return Format::ID::R8G8_UINT; case GL_R16F:
case GL_RGBA8_SNORM: return Format::ID::R8G8B8A8_SNORM; return Format::ID::R16_FLOAT;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR: return Format::ID::ASTC_12x10_SRGB_BLOCK; case GL_RGBA8I:
case GL_RG8_SNORM: return Format::ID::R8G8_SNORM; return Format::ID::R8G8B8A8_SINT;
case GL_BGR565_ANGLEX: return Format::ID::B5G6R5_UNORM; case GL_RG8UI:
case GL_DEPTH_COMPONENT24: return Format::ID::D24_UNORM; return Format::ID::R8G8_UINT;
case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2: return Format::ID::ETC2_R8G8B8A1_UNORM_BLOCK; case GL_RGBA8_SNORM:
case GL_COMPRESSED_RGBA_ASTC_10x10_KHR: return Format::ID::ASTC_10x10_UNORM_BLOCK; return Format::ID::R8G8B8A8_SNORM;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR: return Format::ID::ASTC_8x6_SRGB_BLOCK; case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
case GL_RGB32UI: return Format::ID::R32G32B32_UINT; return Format::ID::ASTC_12x10_SRGB_BLOCK;
case GL_COMPRESSED_RGBA_ASTC_6x5_KHR: return Format::ID::ASTC_6x5_UNORM_BLOCK; case GL_RG8_SNORM:
case GL_ALPHA32F_EXT: return Format::ID::A32_FLOAT; return Format::ID::R8G8_SNORM;
case GL_R16UI: return Format::ID::R16_UINT; case GL_BGR565_ANGLEX:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR: return Format::ID::ASTC_5x4_SRGB_BLOCK; return Format::ID::B5G6R5_UNORM;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR: return Format::ID::ASTC_5x5_SRGB_BLOCK; case GL_DEPTH_COMPONENT24:
case GL_COMPRESSED_R11_EAC: return Format::ID::EAC_R11_UNORM_BLOCK; return Format::ID::D24_UNORM;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR: return Format::ID::ASTC_10x10_SRGB_BLOCK; case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
case GL_RGBA32UI: return Format::ID::R32G32B32A32_UINT; return Format::ID::ETC2_R8G8B8A1_UNORM_BLOCK;
case GL_R8_SNORM: return Format::ID::R8_SNORM; case GL_COMPRESSED_RGBA_ASTC_10x10_KHR:
case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT: return Format::ID::BC1_RGBA_UNORM_SRGB_BLOCK; return Format::ID::ASTC_10x10_UNORM_BLOCK;
case GL_LUMINANCE32F_EXT: return Format::ID::L32_FLOAT; case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
case GL_RG16_EXT: return Format::ID::R16G16_UNORM; return Format::ID::ASTC_8x6_SRGB_BLOCK;
case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2: return Format::ID::ETC2_R8G8B8A1_SRGB_BLOCK; case GL_RGB32UI:
case GL_SRGB8: return Format::ID::R8G8B8_UNORM_SRGB; return Format::ID::R32G32B32_UINT;
case GL_LUMINANCE8_ALPHA8_EXT: return Format::ID::L8A8_UNORM; case GL_COMPRESSED_RGBA_ASTC_6x5_KHR:
case GL_BGRX8_ANGLEX: return Format::ID::B8G8R8X8_UNORM; return Format::ID::ASTC_6x5_UNORM_BLOCK;
case GL_RGB16_SNORM_EXT: return Format::ID::R16G16B16_SNORM; case GL_ALPHA32F_EXT:
case GL_RGBA8UI: return Format::ID::R8G8B8A8_UINT; return Format::ID::A32_FLOAT;
case GL_BGRA4_ANGLEX: return Format::ID::B4G4R4A4_UNORM; case GL_R16UI:
case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC: return Format::ID::ETC2_R8G8B8A8_SRGB_BLOCK; return Format::ID::R16_UINT;
case GL_LUMINANCE8_EXT: return Format::ID::L8_UNORM; case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE: return Format::ID::BC3_RGBA_UNORM_BLOCK; return Format::ID::ASTC_5x4_SRGB_BLOCK;
case GL_R16I: return Format::ID::R16_SINT; case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
case GL_RGB5_A1: return Format::ID::R5G5B5A1_UNORM; return Format::ID::ASTC_5x5_SRGB_BLOCK;
case GL_RGB16UI: return Format::ID::R16G16B16_UINT; case GL_COMPRESSED_R11_EAC:
case GL_COMPRESSED_RGBA_ASTC_4x4_KHR: return Format::ID::ASTC_4x4_UNORM_BLOCK; return Format::ID::EAC_R11_UNORM_BLOCK;
case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT: return Format::ID::BC2_RGBA_UNORM_SRGB_BLOCK; case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
case GL_R16_SNORM_EXT: return Format::ID::R16_SNORM; return Format::ID::ASTC_10x10_SRGB_BLOCK;
case GL_COMPRESSED_RGB8_ETC2: return Format::ID::ETC2_R8G8B8_UNORM_BLOCK; case GL_RGBA32UI:
case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT: return Format::ID::BC1_RGB_UNORM_SRGB_BLOCK; return Format::ID::R32G32B32A32_UINT;
case GL_RGBA32F: return Format::ID::R32G32B32A32_FLOAT; case GL_R8_SNORM:
case GL_RGBA32I: return Format::ID::R32G32B32A32_SINT; return Format::ID::R8_SNORM;
case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT: return Format::ID::BC3_RGBA_UNORM_SRGB_BLOCK; case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
case GL_COMPRESSED_RGBA_ASTC_8x5_KHR: return Format::ID::ASTC_8x5_UNORM_BLOCK; return Format::ID::BC1_RGBA_UNORM_SRGB_BLOCK;
case GL_RG8: return Format::ID::R8G8_UNORM; case GL_LUMINANCE32F_EXT:
case GL_COMPRESSED_RGBA_ASTC_8x8_KHR: return Format::ID::ASTC_8x8_UNORM_BLOCK; return Format::ID::L32_FLOAT;
case GL_RGB10_A2: return Format::ID::R10G10B10A2_UNORM; case GL_RG16_EXT:
case GL_COMPRESSED_SIGNED_RG11_EAC: return Format::ID::EAC_R11G11_SNORM_BLOCK; return Format::ID::R16G16_UNORM;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR: return Format::ID::ASTC_6x6_SRGB_BLOCK; case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
case GL_DEPTH_COMPONENT16: return Format::ID::D16_UNORM; return Format::ID::ETC2_R8G8B8A1_SRGB_BLOCK;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR: return Format::ID::ASTC_10x5_SRGB_BLOCK; case GL_SRGB8:
case GL_RGB32I: return Format::ID::R32G32B32_SINT; return Format::ID::R8G8B8_UNORM_SRGB;
case GL_R8: return Format::ID::R8_UNORM; case GL_LUMINANCE8_ALPHA8_EXT:
case GL_RGB32F: return Format::ID::R32G32B32_FLOAT; return Format::ID::L8A8_UNORM;
case GL_R16_EXT: return Format::ID::R16_UNORM; case GL_BGRX8_ANGLEX:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR: return Format::ID::ASTC_8x8_SRGB_BLOCK; return Format::ID::B8G8R8X8_UNORM;
case GL_COMPRESSED_RGBA_ASTC_10x5_KHR: return Format::ID::ASTC_10x5_UNORM_BLOCK; case GL_RGB16_SNORM_EXT:
case GL_R11F_G11F_B10F: return Format::ID::R11G11B10_FLOAT; return Format::ID::R16G16B16_SNORM;
case GL_RGB8: return Format::ID::R8G8B8_UNORM; case GL_RGBA8UI:
case GL_COMPRESSED_RGBA_ASTC_5x5_KHR: return Format::ID::ASTC_5x5_UNORM_BLOCK; return Format::ID::R8G8B8A8_UINT;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR: return Format::ID::ASTC_8x5_SRGB_BLOCK; case GL_BGRA4_ANGLEX:
case GL_RGBA16I: return Format::ID::R16G16B16A16_SINT; return Format::ID::B4G4R4A4_UNORM;
case GL_R8I: return Format::ID::R8_SINT; case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
case GL_RGB8_SNORM: return Format::ID::R8G8B8_SNORM; return Format::ID::ETC2_R8G8B8A8_SRGB_BLOCK;
case GL_RG32F: return Format::ID::R32G32_FLOAT; case GL_LUMINANCE8_EXT:
case GL_DEPTH_COMPONENT32F: return Format::ID::D32_FLOAT; return Format::ID::L8_UNORM;
case GL_RG32I: return Format::ID::R32G32_SINT; case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
case GL_ALPHA8_EXT: return Format::ID::A8_UNORM; return Format::ID::BC3_RGBA_UNORM_BLOCK;
case GL_RGB16_EXT: return Format::ID::R16G16B16_UNORM; case GL_R16I:
case GL_BGRA8_EXT: return Format::ID::B8G8R8A8_UNORM; return Format::ID::R16_SINT;
case GL_RG32UI: return Format::ID::R32G32_UINT; case GL_RGB5_A1:
case GL_RGBA16UI: return Format::ID::R16G16B16A16_UINT; return Format::ID::R5G5B5A1_UNORM;
case GL_COMPRESSED_RGBA8_ETC2_EAC: return Format::ID::ETC2_R8G8B8A8_UNORM_BLOCK; case GL_RGB16UI:
case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: return Format::ID::BC1_RGBA_UNORM_BLOCK; return Format::ID::R16G16B16_UINT;
case GL_COMPRESSED_RGBA_ASTC_10x6_KHR: return Format::ID::ASTC_10x6_UNORM_BLOCK; case GL_COMPRESSED_RGBA_ASTC_4x4_KHR:
case GL_COMPRESSED_SRGB8_ETC2: return Format::ID::ETC2_R8G8B8_SRGB_BLOCK; return Format::ID::ASTC_4x4_UNORM_BLOCK;
case GL_DEPTH32F_STENCIL8: return Format::ID::D32_FLOAT_S8X24_UINT; case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
case GL_COMPRESSED_RGBA_ASTC_6x6_KHR: return Format::ID::ASTC_6x6_UNORM_BLOCK; return Format::ID::BC2_RGBA_UNORM_SRGB_BLOCK;
case GL_R32UI: return Format::ID::R32_UINT; case GL_R16_SNORM_EXT:
case GL_BGR5_A1_ANGLEX: return Format::ID::B5G5R5A1_UNORM; return Format::ID::R16_SNORM;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR: return Format::ID::ASTC_12x12_SRGB_BLOCK; case GL_COMPRESSED_RGB8_ETC2:
case GL_COMPRESSED_RG11_EAC: return Format::ID::EAC_R11G11_UNORM_BLOCK; return Format::ID::ETC2_R8G8B8_UNORM_BLOCK;
case GL_SRGB8_ALPHA8: return Format::ID::R8G8B8A8_UNORM_SRGB; case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
case GL_LUMINANCE_ALPHA16F_EXT: return Format::ID::L16A16_FLOAT; return Format::ID::BC1_RGB_UNORM_SRGB_BLOCK;
case GL_RGBA: return Format::ID::R8G8B8A8_UNORM; case GL_RGBA32F:
case GL_ETC1_RGB8_OES: return Format::ID::NONE; return Format::ID::R32G32B32A32_FLOAT;
case GL_DEPTH24_STENCIL8: return Format::ID::D24_UNORM_S8_UINT; case GL_RGBA32I:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR: return Format::ID::ASTC_4x4_SRGB_BLOCK; return Format::ID::R32G32B32A32_SINT;
case GL_RGB16I: return Format::ID::R16G16B16_SINT; case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
case GL_R8UI: return Format::ID::R8_UINT; return Format::ID::BC3_RGBA_UNORM_SRGB_BLOCK;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR: return Format::ID::ASTC_10x6_SRGB_BLOCK; case GL_COMPRESSED_RGBA_ASTC_8x5_KHR:
case GL_RGBA16F: return Format::ID::R16G16B16A16_FLOAT; return Format::ID::ASTC_8x5_UNORM_BLOCK;
case GL_COMPRESSED_SIGNED_R11_EAC: return Format::ID::EAC_R11_SNORM_BLOCK; case GL_RG8:
case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: return Format::ID::BC1_RGB_UNORM_BLOCK; return Format::ID::R8G8_UNORM;
case GL_RGB8I: return Format::ID::R8G8B8_SINT; case GL_COMPRESSED_RGBA_ASTC_8x8_KHR:
case GL_COMPRESSED_RGBA_ASTC_8x6_KHR: return Format::ID::ASTC_8x6_UNORM_BLOCK; return Format::ID::ASTC_8x8_UNORM_BLOCK;
case GL_STENCIL_INDEX8: return Format::ID::S8_UINT; case GL_RGB10_A2:
case GL_LUMINANCE_ALPHA32F_EXT: return Format::ID::L32A32_FLOAT; return Format::ID::R10G10B10A2_UNORM;
case GL_ALPHA16F_EXT: return Format::ID::A16_FLOAT; case GL_COMPRESSED_SIGNED_RG11_EAC:
case GL_RGB8UI: return Format::ID::R8G8B8_UINT; return Format::ID::EAC_R11G11_SNORM_BLOCK;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR: return Format::ID::ASTC_10x8_SRGB_BLOCK; case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
case GL_COMPRESSED_RGBA_ASTC_12x10_KHR: return Format::ID::ASTC_12x10_UNORM_BLOCK; return Format::ID::ASTC_6x6_SRGB_BLOCK;
case GL_RGB9_E5: return Format::ID::R9G9B9E5_SHAREDEXP; case GL_DEPTH_COMPONENT16:
case GL_RGBA16_SNORM_EXT: return Format::ID::R16G16B16A16_SNORM; return Format::ID::D16_UNORM;
case GL_R32I: return Format::ID::R32_SINT; case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
case GL_DEPTH_COMPONENT32_OES: return Format::ID::D32_UNORM; return Format::ID::ASTC_10x5_SRGB_BLOCK;
case GL_R32F: return Format::ID::R32_FLOAT; case GL_RGB32I:
case GL_NONE: return Format::ID::NONE; return Format::ID::R32G32B32_SINT;
case GL_RG16F: return Format::ID::R16G16_FLOAT; case GL_R8:
case GL_RGB: return Format::ID::R8G8B8_UNORM; return Format::ID::R8_UNORM;
case GL_RGB565: return Format::ID::R5G6B5_UNORM; case GL_RGB32F:
case GL_LUMINANCE16F_EXT: return Format::ID::L16_FLOAT; return Format::ID::R32G32B32_FLOAT;
case GL_RG16UI: return Format::ID::R16G16_UINT; case GL_R16_EXT:
case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE: return Format::ID::BC2_RGBA_UNORM_BLOCK; return Format::ID::R16_UNORM;
case GL_RG16I: return Format::ID::R16G16_SINT; case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR: return Format::ID::ASTC_6x5_SRGB_BLOCK; return Format::ID::ASTC_8x8_SRGB_BLOCK;
case GL_RG16_SNORM_EXT: return Format::ID::R16G16_SNORM; case GL_COMPRESSED_RGBA_ASTC_10x5_KHR:
case GL_COMPRESSED_RGBA_ASTC_12x12_KHR: return Format::ID::ASTC_12x12_UNORM_BLOCK; return Format::ID::ASTC_10x5_UNORM_BLOCK;
case GL_COMPRESSED_RGBA_ASTC_5x4_KHR: return Format::ID::ASTC_5x4_UNORM_BLOCK; case GL_R11F_G11F_B10F:
case GL_COMPRESSED_RGBA_ASTC_10x8_KHR: return Format::ID::ASTC_10x8_UNORM_BLOCK; return Format::ID::R11G11B10_FLOAT;
case GL_RGBA4: return Format::ID::R4G4B4A4_UNORM; case GL_RGB8:
case GL_RGBA8: return Format::ID::R8G8B8A8_UNORM; return Format::ID::R8G8B8_UNORM;
case GL_RGB16F: return Format::ID::R16G16B16_FLOAT; case GL_COMPRESSED_RGBA_ASTC_5x5_KHR:
case GL_RGB10_A2UI: return Format::ID::R10G10B10A2_UINT; return Format::ID::ASTC_5x5_UNORM_BLOCK;
default: return Format::ID::NONE; case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
// clang-format on return Format::ID::ASTC_8x5_SRGB_BLOCK;
case GL_RGBA16I:
return Format::ID::R16G16B16A16_SINT;
case GL_R8I:
return Format::ID::R8_SINT;
case GL_RGB8_SNORM:
return Format::ID::R8G8B8_SNORM;
case GL_RG32F:
return Format::ID::R32G32_FLOAT;
case GL_DEPTH_COMPONENT32F:
return Format::ID::D32_FLOAT;
case GL_RG32I:
return Format::ID::R32G32_SINT;
case GL_ALPHA8_EXT:
return Format::ID::A8_UNORM;
case GL_RGB16_EXT:
return Format::ID::R16G16B16_UNORM;
case GL_BGRA8_EXT:
return Format::ID::B8G8R8A8_UNORM;
case GL_RG32UI:
return Format::ID::R32G32_UINT;
case GL_RGBA16UI:
return Format::ID::R16G16B16A16_UINT;
case GL_COMPRESSED_RGBA8_ETC2_EAC:
return Format::ID::ETC2_R8G8B8A8_UNORM_BLOCK;
case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
return Format::ID::BC1_RGBA_UNORM_BLOCK;
case GL_COMPRESSED_RGBA_ASTC_10x6_KHR:
return Format::ID::ASTC_10x6_UNORM_BLOCK;
case GL_COMPRESSED_SRGB8_ETC2:
return Format::ID::ETC2_R8G8B8_SRGB_BLOCK;
case GL_DEPTH32F_STENCIL8:
return Format::ID::D32_FLOAT_S8X24_UINT;
case GL_COMPRESSED_RGBA_ASTC_6x6_KHR:
return Format::ID::ASTC_6x6_UNORM_BLOCK;
case GL_R32UI:
return Format::ID::R32_UINT;
case GL_BGR5_A1_ANGLEX:
return Format::ID::B5G5R5A1_UNORM;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
return Format::ID::ASTC_12x12_SRGB_BLOCK;
case GL_COMPRESSED_RG11_EAC:
return Format::ID::EAC_R11G11_UNORM_BLOCK;
case GL_SRGB8_ALPHA8:
return Format::ID::R8G8B8A8_UNORM_SRGB;
case GL_LUMINANCE_ALPHA16F_EXT:
return Format::ID::L16A16_FLOAT;
case GL_RGBA:
return Format::ID::R8G8B8A8_UNORM;
case GL_ETC1_RGB8_OES:
return Format::ID::NONE;
case GL_DEPTH24_STENCIL8:
return Format::ID::D24_UNORM_S8_UINT;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
return Format::ID::ASTC_4x4_SRGB_BLOCK;
case GL_RGB16I:
return Format::ID::R16G16B16_SINT;
case GL_R8UI:
return Format::ID::R8_UINT;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
return Format::ID::ASTC_10x6_SRGB_BLOCK;
case GL_RGBA16F:
return Format::ID::R16G16B16A16_FLOAT;
case GL_COMPRESSED_SIGNED_R11_EAC:
return Format::ID::EAC_R11_SNORM_BLOCK;
case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
return Format::ID::BC1_RGB_UNORM_BLOCK;
case GL_RGB8I:
return Format::ID::R8G8B8_SINT;
case GL_COMPRESSED_RGBA_ASTC_8x6_KHR:
return Format::ID::ASTC_8x6_UNORM_BLOCK;
case GL_STENCIL_INDEX8:
return Format::ID::S8_UINT;
case GL_LUMINANCE_ALPHA32F_EXT:
return Format::ID::L32A32_FLOAT;
case GL_ALPHA16F_EXT:
return Format::ID::A16_FLOAT;
case GL_RGB8UI:
return Format::ID::R8G8B8_UINT;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
return Format::ID::ASTC_10x8_SRGB_BLOCK;
case GL_COMPRESSED_RGBA_ASTC_12x10_KHR:
return Format::ID::ASTC_12x10_UNORM_BLOCK;
case GL_RGB9_E5:
return Format::ID::R9G9B9E5_SHAREDEXP;
case GL_RGBA16_SNORM_EXT:
return Format::ID::R16G16B16A16_SNORM;
case GL_R32I:
return Format::ID::R32_SINT;
case GL_DEPTH_COMPONENT32_OES:
return Format::ID::D32_UNORM;
case GL_R32F:
return Format::ID::R32_FLOAT;
case GL_NONE:
return Format::ID::NONE;
case GL_RG16F:
return Format::ID::R16G16_FLOAT;
case GL_RGB:
return Format::ID::R8G8B8_UNORM;
case GL_RGB565:
return Format::ID::R5G6B5_UNORM;
case GL_LUMINANCE16F_EXT:
return Format::ID::L16_FLOAT;
case GL_RG16UI:
return Format::ID::R16G16_UINT;
case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
return Format::ID::BC2_RGBA_UNORM_BLOCK;
case GL_RG16I:
return Format::ID::R16G16_SINT;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
return Format::ID::ASTC_6x5_SRGB_BLOCK;
case GL_RG16_SNORM_EXT:
return Format::ID::R16G16_SNORM;
case GL_COMPRESSED_RGBA_ASTC_12x12_KHR:
return Format::ID::ASTC_12x12_UNORM_BLOCK;
case GL_COMPRESSED_RGBA_ASTC_5x4_KHR:
return Format::ID::ASTC_5x4_UNORM_BLOCK;
case GL_COMPRESSED_RGBA_ASTC_10x8_KHR:
return Format::ID::ASTC_10x8_UNORM_BLOCK;
case GL_RGBA4:
return Format::ID::R4G4B4A4_UNORM;
case GL_RGBA8:
return Format::ID::R8G8B8A8_UNORM;
case GL_RGB16F:
return Format::ID::R16G16B16_FLOAT;
case GL_RGB10_A2UI:
return Format::ID::R10G10B10A2_UINT;
default:
return Format::ID::NONE;
} }
} }
......
src/libANGLE/renderer/gen_angle_format_table.py
...@@ -70,9 +70,7 @@ Format::ID Format::InternalFormatToID(GLenum internalFormat) ...@@ -70,9 +70,7 @@ Format::ID Format::InternalFormatToID(GLenum internalFormat)
{{ {{
switch (internalFormat) switch (internalFormat)
{{ {{
// clang-format off
{angle_format_switch} {angle_format_switch}
// clang-format on
}} }}
}} }}
...@@ -231,8 +229,9 @@ def gen_map_switch_string(gl_to_angle): ...@@ -231,8 +229,9 @@ def gen_map_switch_string(gl_to_angle):
switch_data = ''; switch_data = '';
for gl_format in gl_to_angle: for gl_format in gl_to_angle:
angle_format = gl_to_angle[gl_format] angle_format = gl_to_angle[gl_format]
switch_data += " case " + gl_format + ": return Format::ID::" + angle_format + ";\n" switch_data += " case " + gl_format + ":\nreturn Format::ID::" + angle_format + ";\n"
switch_data += " default: return Format::ID::NONE;" switch_data += " default:\n"
switch_data += " return Format::ID::NONE;"
return switch_data; return switch_data;
gl_to_angle = angle_format.load_forward_table('angle_format_map.json') gl_to_angle = angle_format.load_forward_table('angle_format_map.json')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment