Update XGL_FORMAT.
diff --git a/icd/common/icd-format.c b/icd/common/icd-format.c
index 688ab4f..4119de1 100644
--- a/icd/common/icd-format.c
+++ b/icd/common/icd-format.c
@@ -32,50 +32,445 @@
static const struct icd_format_info {
XGL_SIZE size;
XGL_UINT channel_count;
-} icd_format_table[XGL_MAX_CH_FMT + 1] = {
- [XGL_CH_FMT_UNDEFINED] = { 0, 0 },
- [XGL_CH_FMT_R4G4] = { 1, 2 },
- [XGL_CH_FMT_R4G4B4A4] = { 2, 4 },
- [XGL_CH_FMT_R5G6B5] = { 2, 3 },
- [XGL_CH_FMT_B5G6R5] = { 2, 3 },
- [XGL_CH_FMT_R5G5B5A1] = { 2, 4 },
- [XGL_CH_FMT_R8] = { 1, 1 },
- [XGL_CH_FMT_R8G8] = { 2, 2 },
- [XGL_CH_FMT_R8G8B8A8] = { 4, 4 },
- [XGL_CH_FMT_B8G8R8A8] = { 4, 4 },
- [XGL_CH_FMT_R10G11B11] = { 4, 3 },
- [XGL_CH_FMT_R11G11B10] = { 4, 3 },
- [XGL_CH_FMT_R10G10B10A2] = { 4, 4 },
- [XGL_CH_FMT_R16] = { 2, 1 },
- [XGL_CH_FMT_R16G16] = { 4, 2 },
- [XGL_CH_FMT_R16G16B16A16] = { 8, 4 },
- [XGL_CH_FMT_R32] = { 4, 1 },
- [XGL_CH_FMT_R32G32] = { 8, 2 },
- [XGL_CH_FMT_R32G32B32] = { 12, 3 },
- [XGL_CH_FMT_R32G32B32A32] = { 16, 4 },
- [XGL_CH_FMT_R16G8] = { 3, 2 },
- [XGL_CH_FMT_R32G8] = { 5, 2 },
- [XGL_CH_FMT_R9G9B9E5] = { 4, 3 },
- [XGL_CH_FMT_BC1] = { 8, 4 },
- [XGL_CH_FMT_BC2] = { 16, 4 },
- [XGL_CH_FMT_BC3] = { 16, 4 },
- [XGL_CH_FMT_BC4] = { 8, 4 },
- [XGL_CH_FMT_BC5] = { 16, 4 },
- [XGL_CH_FMT_BC6U] = { 16, 4 },
- [XGL_CH_FMT_BC6S] = { 16, 4 },
- [XGL_CH_FMT_BC7] = { 16, 4 },
- [XGL_CH_FMT_R8G8B8] = { 3, 3 },
- [XGL_CH_FMT_R16G16B16] = { 6, 3 },
- [XGL_CH_FMT_B10G10R10A2] = { 4, 4 },
- [XGL_CH_FMT_R64] = { 8, 1 },
- [XGL_CH_FMT_R64G64] = { 16, 2 },
- [XGL_CH_FMT_R64G64B64] = { 24, 3 },
- [XGL_CH_FMT_R64G64B64A64] = { 32, 4 },
+} icd_format_table[XGL_NUM_FMT] = {
+ [XGL_FMT_UNDEFINED] = { 0, 0 },
+ [XGL_FMT_R4G4_UNORM] = { 1, 2 },
+ [XGL_FMT_R4G4_USCALED] = { 1, 2 },
+ [XGL_FMT_R4G4B4A4_UNORM] = { 2, 4 },
+ [XGL_FMT_R4G4B4A4_USCALED] = { 2, 4 },
+ [XGL_FMT_R5G6B5_UNORM] = { 2, 3 },
+ [XGL_FMT_R5G6B5_USCALED] = { 2, 3 },
+ [XGL_FMT_R5G5B5A1_UNORM] = { 2, 4 },
+ [XGL_FMT_R5G5B5A1_USCALED] = { 2, 4 },
+ [XGL_FMT_R8_UNORM] = { 1, 1 },
+ [XGL_FMT_R8_SNORM] = { 1, 1 },
+ [XGL_FMT_R8_USCALED] = { 1, 1 },
+ [XGL_FMT_R8_SSCALED] = { 1, 1 },
+ [XGL_FMT_R8_UINT] = { 1, 1 },
+ [XGL_FMT_R8_SINT] = { 1, 1 },
+ [XGL_FMT_R8_SRGB] = { 1, 1 },
+ [XGL_FMT_R8G8_UNORM] = { 2, 2 },
+ [XGL_FMT_R8G8_SNORM] = { 2, 2 },
+ [XGL_FMT_R8G8_USCALED] = { 2, 2 },
+ [XGL_FMT_R8G8_SSCALED] = { 2, 2 },
+ [XGL_FMT_R8G8_UINT] = { 2, 2 },
+ [XGL_FMT_R8G8_SINT] = { 2, 2 },
+ [XGL_FMT_R8G8_SRGB] = { 2, 2 },
+ [XGL_FMT_R8G8B8_UNORM] = { 3, 3 },
+ [XGL_FMT_R8G8B8_SNORM] = { 3, 3 },
+ [XGL_FMT_R8G8B8_USCALED] = { 3, 3 },
+ [XGL_FMT_R8G8B8_SSCALED] = { 3, 3 },
+ [XGL_FMT_R8G8B8_UINT] = { 3, 3 },
+ [XGL_FMT_R8G8B8_SINT] = { 3, 3 },
+ [XGL_FMT_R8G8B8_SRGB] = { 3, 3 },
+ [XGL_FMT_R8G8B8A8_UNORM] = { 4, 4 },
+ [XGL_FMT_R8G8B8A8_SNORM] = { 4, 4 },
+ [XGL_FMT_R8G8B8A8_USCALED] = { 4, 4 },
+ [XGL_FMT_R8G8B8A8_SSCALED] = { 4, 4 },
+ [XGL_FMT_R8G8B8A8_UINT] = { 4, 4 },
+ [XGL_FMT_R8G8B8A8_SINT] = { 4, 4 },
+ [XGL_FMT_R8G8B8A8_SRGB] = { 4, 4 },
+ [XGL_FMT_R10G10B10A2_UNORM] = { 4, 4 },
+ [XGL_FMT_R10G10B10A2_SNORM] = { 4, 4 },
+ [XGL_FMT_R10G10B10A2_USCALED] = { 4, 4 },
+ [XGL_FMT_R10G10B10A2_SSCALED] = { 4, 4 },
+ [XGL_FMT_R10G10B10A2_UINT] = { 4, 4 },
+ [XGL_FMT_R10G10B10A2_SINT] = { 4, 4 },
+ [XGL_FMT_R16_UNORM] = { 2, 1 },
+ [XGL_FMT_R16_SNORM] = { 2, 1 },
+ [XGL_FMT_R16_USCALED] = { 2, 1 },
+ [XGL_FMT_R16_SSCALED] = { 2, 1 },
+ [XGL_FMT_R16_UINT] = { 2, 1 },
+ [XGL_FMT_R16_SINT] = { 2, 1 },
+ [XGL_FMT_R16_SFLOAT] = { 2, 1 },
+ [XGL_FMT_R16G16_UNORM] = { 4, 2 },
+ [XGL_FMT_R16G16_SNORM] = { 4, 2 },
+ [XGL_FMT_R16G16_USCALED] = { 4, 2 },
+ [XGL_FMT_R16G16_SSCALED] = { 4, 2 },
+ [XGL_FMT_R16G16_UINT] = { 4, 2 },
+ [XGL_FMT_R16G16_SINT] = { 4, 2 },
+ [XGL_FMT_R16G16_SFLOAT] = { 4, 2 },
+ [XGL_FMT_R16G16B16_UNORM] = { 6, 3 },
+ [XGL_FMT_R16G16B16_SNORM] = { 6, 3 },
+ [XGL_FMT_R16G16B16_USCALED] = { 6, 3 },
+ [XGL_FMT_R16G16B16_SSCALED] = { 6, 3 },
+ [XGL_FMT_R16G16B16_UINT] = { 6, 3 },
+ [XGL_FMT_R16G16B16_SINT] = { 6, 3 },
+ [XGL_FMT_R16G16B16_SFLOAT] = { 6, 3 },
+ [XGL_FMT_R16G16B16A16_UNORM] = { 8, 4 },
+ [XGL_FMT_R16G16B16A16_SNORM] = { 8, 4 },
+ [XGL_FMT_R16G16B16A16_USCALED] = { 8, 4 },
+ [XGL_FMT_R16G16B16A16_SSCALED] = { 8, 4 },
+ [XGL_FMT_R16G16B16A16_UINT] = { 8, 4 },
+ [XGL_FMT_R16G16B16A16_SINT] = { 8, 4 },
+ [XGL_FMT_R16G16B16A16_SFLOAT] = { 8, 4 },
+ [XGL_FMT_R32_UINT] = { 4, 1 },
+ [XGL_FMT_R32_SINT] = { 4, 1 },
+ [XGL_FMT_R32_SFLOAT] = { 4, 1 },
+ [XGL_FMT_R32G32_UINT] = { 8, 2 },
+ [XGL_FMT_R32G32_SINT] = { 8, 2 },
+ [XGL_FMT_R32G32_SFLOAT] = { 8, 2 },
+ [XGL_FMT_R32G32B32_UINT] = { 12, 3 },
+ [XGL_FMT_R32G32B32_SINT] = { 12, 3 },
+ [XGL_FMT_R32G32B32_SFLOAT] = { 12, 3 },
+ [XGL_FMT_R32G32B32A32_UINT] = { 16, 4 },
+ [XGL_FMT_R32G32B32A32_SINT] = { 16, 4 },
+ [XGL_FMT_R32G32B32A32_SFLOAT] = { 16, 4 },
+ [XGL_FMT_R64_SFLOAT] = { 8, 1 },
+ [XGL_FMT_R64G64_SFLOAT] = { 16, 2 },
+ [XGL_FMT_R64G64B64_SFLOAT] = { 24, 3 },
+ [XGL_FMT_R64G64B64A64_SFLOAT] = { 32, 4 },
+ [XGL_FMT_R11G11B10_UFLOAT] = { 4, 3 },
+ [XGL_FMT_R9G9B9E5_UFLOAT] = { 4, 3 },
+ [XGL_FMT_D16_UNORM] = { 2, 1 },
+ [XGL_FMT_D24_UNORM] = { 3, 1 },
+ [XGL_FMT_D32_SFLOAT] = { 4, 1 },
+ [XGL_FMT_S8_UINT] = { 1, 1 },
+ [XGL_FMT_D16_UNORM_S8_UINT] = { 3, 2 },
+ [XGL_FMT_D24_UNORM_S8_UINT] = { 4, 2 },
+ [XGL_FMT_D32_SFLOAT_S8_UINT] = { 4, 2 },
+ [XGL_FMT_BC1_UNORM] = { 8, 4 },
+ [XGL_FMT_BC1_SRGB] = { 8, 4 },
+ [XGL_FMT_BC2_UNORM] = { 16, 4 },
+ [XGL_FMT_BC2_SRGB] = { 16, 4 },
+ [XGL_FMT_BC3_UNORM] = { 16, 4 },
+ [XGL_FMT_BC3_SRGB] = { 16, 4 },
+ [XGL_FMT_BC4_UNORM] = { 8, 4 },
+ [XGL_FMT_BC4_SNORM] = { 8, 4 },
+ [XGL_FMT_BC5_UNORM] = { 16, 4 },
+ [XGL_FMT_BC5_SNORM] = { 16, 4 },
+ [XGL_FMT_BC6H_UFLOAT] = { 16, 4 },
+ [XGL_FMT_BC6H_SFLOAT] = { 16, 4 },
+ [XGL_FMT_BC7_UNORM] = { 16, 4 },
+ [XGL_FMT_BC7_SRGB] = { 16, 4 },
+ /* TODO: Initialize remaining compressed formats. */
+ [XGL_FMT_ETC2_R8G8B8_UNORM] = { 0, 0 },
+ [XGL_FMT_ETC2_R8G8B8A1_UNORM] = { 0, 0 },
+ [XGL_FMT_ETC2_R8G8B8A8_UNORM] = { 0, 0 },
+ [XGL_FMT_EAC_R11_UNORM] = { 0, 0 },
+ [XGL_FMT_EAC_R11_SNORM] = { 0, 0 },
+ [XGL_FMT_EAC_R11G11_UNORM] = { 0, 0 },
+ [XGL_FMT_EAC_R11G11_SNORM] = { 0, 0 },
+ [XGL_FMT_ASTC_4x4_UNORM] = { 0, 0 },
+ [XGL_FMT_ASTC_4x4_SRGB] = { 0, 0 },
+ [XGL_FMT_ASTC_4x5_UNORM] = { 0, 0 },
+ [XGL_FMT_ASTC_4x5_SRGB] = { 0, 0 },
+ [XGL_FMT_ASTC_5x5_UNORM] = { 0, 0 },
+ [XGL_FMT_ASTC_5x5_SRGB] = { 0, 0 },
+ [XGL_FMT_ASTC_6x5_UNORM] = { 0, 0 },
+ [XGL_FMT_ASTC_6x5_SRGB] = { 0, 0 },
+ [XGL_FMT_ASTC_6x6_UNORM] = { 0, 0 },
+ [XGL_FMT_ASTC_6x6_SRGB] = { 0, 0 },
+ [XGL_FMT_ASTC_8x5_UNORM] = { 0, 0 },
+ [XGL_FMT_ASTC_8x5_SRGB] = { 0, 0 },
+ [XGL_FMT_ASTC_8x6_UNORM] = { 0, 0 },
+ [XGL_FMT_ASTC_8x6_SRGB] = { 0, 0 },
+ [XGL_FMT_ASTC_8x8_UNORM] = { 0, 0 },
+ [XGL_FMT_ASTC_8x8_SRGB] = { 0, 0 },
+ [XGL_FMT_ASTC_10x5_UNORM] = { 0, 0 },
+ [XGL_FMT_ASTC_10x5_SRGB] = { 0, 0 },
+ [XGL_FMT_ASTC_10x6_UNORM] = { 0, 0 },
+ [XGL_FMT_ASTC_10x6_SRGB] = { 0, 0 },
+ [XGL_FMT_ASTC_10x8_UNORM] = { 0, 0 },
+ [XGL_FMT_ASTC_10x8_SRGB] = { 0, 0 },
+ [XGL_FMT_ASTC_10x10_UNORM] = { 0, 0 },
+ [XGL_FMT_ASTC_10x10_SRGB] = { 0, 0 },
+ [XGL_FMT_ASTC_12x10_UNORM] = { 0, 0 },
+ [XGL_FMT_ASTC_12x10_SRGB] = { 0, 0 },
+ [XGL_FMT_ASTC_12x12_UNORM] = { 0, 0 },
+ [XGL_FMT_ASTC_12x12_SRGB] = { 0, 0 },
+ [XGL_FMT_B5G6R5_UNORM] = { 2, 3 },
+ [XGL_FMT_B5G6R5_USCALED] = { 2, 3 },
+ [XGL_FMT_B8G8R8_UNORM] = { 3, 3 },
+ [XGL_FMT_B8G8R8_SNORM] = { 3, 3 },
+ [XGL_FMT_B8G8R8_USCALED] = { 3, 3 },
+ [XGL_FMT_B8G8R8_SSCALED] = { 3, 3 },
+ [XGL_FMT_B8G8R8_UINT] = { 3, 3 },
+ [XGL_FMT_B8G8R8_SINT] = { 3, 3 },
+ [XGL_FMT_B8G8R8_SRGB] = { 3, 3 },
+ [XGL_FMT_B8G8R8A8_UNORM] = { 4, 4 },
+ [XGL_FMT_B8G8R8A8_SNORM] = { 4, 4 },
+ [XGL_FMT_B8G8R8A8_USCALED] = { 4, 4 },
+ [XGL_FMT_B8G8R8A8_SSCALED] = { 4, 4 },
+ [XGL_FMT_B8G8R8A8_UINT] = { 4, 4 },
+ [XGL_FMT_B8G8R8A8_SINT] = { 4, 4 },
+ [XGL_FMT_B8G8R8A8_SRGB] = { 4, 4 },
+ [XGL_FMT_B10G10R10A2_UNORM] = { 4, 4 },
+ [XGL_FMT_B10G10R10A2_SNORM] = { 4, 4 },
+ [XGL_FMT_B10G10R10A2_USCALED] = { 4, 4 },
+ [XGL_FMT_B10G10R10A2_SSCALED] = { 4, 4 },
+ [XGL_FMT_B10G10R10A2_UINT] = { 4, 4 },
+ [XGL_FMT_B10G10R10A2_SINT] = { 4, 4 },
};
+bool icd_format_is_ds(XGL_FORMAT format)
+{
+ bool is_ds = false;
+
+ switch (format) {
+ case XGL_FMT_D16_UNORM:
+ case XGL_FMT_D24_UNORM:
+ case XGL_FMT_D32_SFLOAT:
+ case XGL_FMT_S8_UINT:
+ case XGL_FMT_D16_UNORM_S8_UINT:
+ case XGL_FMT_D24_UNORM_S8_UINT:
+ case XGL_FMT_D32_SFLOAT_S8_UINT:
+ is_ds = true;
+ break;
+ default:
+ break;
+ }
+
+ return is_ds;
+}
+
+bool icd_format_is_norm(XGL_FORMAT format)
+{
+ bool is_norm = false;
+
+ switch (format) {
+ case XGL_FMT_R4G4_UNORM:
+ case XGL_FMT_R4G4B4A4_UNORM:
+ case XGL_FMT_R5G6B5_UNORM:
+ case XGL_FMT_R5G5B5A1_UNORM:
+ case XGL_FMT_R8_UNORM:
+ case XGL_FMT_R8_SNORM:
+ case XGL_FMT_R8G8_UNORM:
+ case XGL_FMT_R8G8_SNORM:
+ case XGL_FMT_R8G8B8_UNORM:
+ case XGL_FMT_R8G8B8_SNORM:
+ case XGL_FMT_R8G8B8A8_UNORM:
+ case XGL_FMT_R8G8B8A8_SNORM:
+ case XGL_FMT_R10G10B10A2_UNORM:
+ case XGL_FMT_R10G10B10A2_SNORM:
+ case XGL_FMT_R16_UNORM:
+ case XGL_FMT_R16_SNORM:
+ case XGL_FMT_R16G16_UNORM:
+ case XGL_FMT_R16G16_SNORM:
+ case XGL_FMT_R16G16B16_UNORM:
+ case XGL_FMT_R16G16B16_SNORM:
+ case XGL_FMT_R16G16B16A16_UNORM:
+ case XGL_FMT_R16G16B16A16_SNORM:
+ case XGL_FMT_BC1_UNORM:
+ case XGL_FMT_BC2_UNORM:
+ case XGL_FMT_BC3_UNORM:
+ case XGL_FMT_BC4_UNORM:
+ case XGL_FMT_BC4_SNORM:
+ case XGL_FMT_BC5_UNORM:
+ case XGL_FMT_BC5_SNORM:
+ case XGL_FMT_BC7_UNORM:
+ case XGL_FMT_ETC2_R8G8B8_UNORM:
+ case XGL_FMT_ETC2_R8G8B8A1_UNORM:
+ case XGL_FMT_ETC2_R8G8B8A8_UNORM:
+ case XGL_FMT_EAC_R11_UNORM:
+ case XGL_FMT_EAC_R11_SNORM:
+ case XGL_FMT_EAC_R11G11_UNORM:
+ case XGL_FMT_EAC_R11G11_SNORM:
+ case XGL_FMT_ASTC_4x4_UNORM:
+ case XGL_FMT_ASTC_4x5_UNORM:
+ case XGL_FMT_ASTC_5x5_UNORM:
+ case XGL_FMT_ASTC_6x5_UNORM:
+ case XGL_FMT_ASTC_6x6_UNORM:
+ case XGL_FMT_ASTC_8x5_UNORM:
+ case XGL_FMT_ASTC_8x6_UNORM:
+ case XGL_FMT_ASTC_8x8_UNORM:
+ case XGL_FMT_ASTC_10x5_UNORM:
+ case XGL_FMT_ASTC_10x6_UNORM:
+ case XGL_FMT_ASTC_10x8_UNORM:
+ case XGL_FMT_ASTC_10x10_UNORM:
+ case XGL_FMT_ASTC_12x10_UNORM:
+ case XGL_FMT_ASTC_12x12_UNORM:
+ case XGL_FMT_B5G6R5_UNORM:
+ case XGL_FMT_B8G8R8_UNORM:
+ case XGL_FMT_B8G8R8_SNORM:
+ case XGL_FMT_B8G8R8A8_UNORM:
+ case XGL_FMT_B8G8R8A8_SNORM:
+ case XGL_FMT_B10G10R10A2_UNORM:
+ case XGL_FMT_B10G10R10A2_SNORM:
+ is_norm = true;
+ break;
+ default:
+ break;
+ }
+
+ return is_norm;
+};
+
+bool icd_format_is_int(XGL_FORMAT format)
+{
+ bool is_int = false;
+
+ switch (format) {
+ case XGL_FMT_R8_UINT:
+ case XGL_FMT_R8_SINT:
+ case XGL_FMT_R8G8_UINT:
+ case XGL_FMT_R8G8_SINT:
+ case XGL_FMT_R8G8B8_UINT:
+ case XGL_FMT_R8G8B8_SINT:
+ case XGL_FMT_R8G8B8A8_UINT:
+ case XGL_FMT_R8G8B8A8_SINT:
+ case XGL_FMT_R10G10B10A2_UINT:
+ case XGL_FMT_R10G10B10A2_SINT:
+ case XGL_FMT_R16_UINT:
+ case XGL_FMT_R16_SINT:
+ case XGL_FMT_R16G16_UINT:
+ case XGL_FMT_R16G16_SINT:
+ case XGL_FMT_R16G16B16_UINT:
+ case XGL_FMT_R16G16B16_SINT:
+ case XGL_FMT_R16G16B16A16_UINT:
+ case XGL_FMT_R16G16B16A16_SINT:
+ case XGL_FMT_R32_UINT:
+ case XGL_FMT_R32_SINT:
+ case XGL_FMT_R32G32_UINT:
+ case XGL_FMT_R32G32_SINT:
+ case XGL_FMT_R32G32B32_UINT:
+ case XGL_FMT_R32G32B32_SINT:
+ case XGL_FMT_R32G32B32A32_UINT:
+ case XGL_FMT_R32G32B32A32_SINT:
+ case XGL_FMT_B8G8R8_UINT:
+ case XGL_FMT_B8G8R8_SINT:
+ case XGL_FMT_B8G8R8A8_UINT:
+ case XGL_FMT_B8G8R8A8_SINT:
+ case XGL_FMT_B10G10R10A2_UINT:
+ case XGL_FMT_B10G10R10A2_SINT:
+ is_int = true;
+ break;
+ default:
+ break;
+ }
+
+ return is_int;
+}
+
+bool icd_format_is_float(XGL_FORMAT format)
+{
+ bool is_float = false;
+
+ switch (format) {
+ case XGL_FMT_R16_SFLOAT:
+ case XGL_FMT_R16G16_SFLOAT:
+ case XGL_FMT_R16G16B16_SFLOAT:
+ case XGL_FMT_R16G16B16A16_SFLOAT:
+ case XGL_FMT_R32_SFLOAT:
+ case XGL_FMT_R32G32_SFLOAT:
+ case XGL_FMT_R32G32B32_SFLOAT:
+ case XGL_FMT_R32G32B32A32_SFLOAT:
+ case XGL_FMT_R64_SFLOAT:
+ case XGL_FMT_R64G64_SFLOAT:
+ case XGL_FMT_R64G64B64_SFLOAT:
+ case XGL_FMT_R64G64B64A64_SFLOAT:
+ case XGL_FMT_R11G11B10_UFLOAT:
+ case XGL_FMT_R9G9B9E5_UFLOAT:
+ case XGL_FMT_BC6H_UFLOAT:
+ case XGL_FMT_BC6H_SFLOAT:
+ is_float = true;
+ break;
+ default:
+ break;
+ }
+
+ return is_float;
+}
+
+bool icd_format_is_srgb(XGL_FORMAT format)
+{
+ bool is_srgb = false;
+
+ switch (format) {
+ case XGL_FMT_R8_SRGB:
+ case XGL_FMT_R8G8_SRGB:
+ case XGL_FMT_R8G8B8_SRGB:
+ case XGL_FMT_R8G8B8A8_SRGB:
+ case XGL_FMT_BC1_SRGB:
+ case XGL_FMT_BC2_SRGB:
+ case XGL_FMT_BC3_SRGB:
+ case XGL_FMT_BC7_SRGB:
+ case XGL_FMT_ASTC_4x4_SRGB:
+ case XGL_FMT_ASTC_4x5_SRGB:
+ case XGL_FMT_ASTC_5x5_SRGB:
+ case XGL_FMT_ASTC_6x5_SRGB:
+ case XGL_FMT_ASTC_6x6_SRGB:
+ case XGL_FMT_ASTC_8x5_SRGB:
+ case XGL_FMT_ASTC_8x6_SRGB:
+ case XGL_FMT_ASTC_8x8_SRGB:
+ case XGL_FMT_ASTC_10x5_SRGB:
+ case XGL_FMT_ASTC_10x6_SRGB:
+ case XGL_FMT_ASTC_10x8_SRGB:
+ case XGL_FMT_ASTC_10x10_SRGB:
+ case XGL_FMT_ASTC_12x10_SRGB:
+ case XGL_FMT_ASTC_12x12_SRGB:
+ case XGL_FMT_B8G8R8_SRGB:
+ case XGL_FMT_B8G8R8A8_SRGB:
+ is_srgb = true;
+ break;
+ default:
+ break;
+ }
+
+ return is_srgb;
+}
+
+bool icd_format_is_compressed(XGL_FORMAT format)
+{
+ switch (format) {
+ case XGL_FMT_BC1_UNORM:
+ case XGL_FMT_BC1_SRGB:
+ case XGL_FMT_BC2_UNORM:
+ case XGL_FMT_BC2_SRGB:
+ case XGL_FMT_BC3_UNORM:
+ case XGL_FMT_BC3_SRGB:
+ case XGL_FMT_BC4_UNORM:
+ case XGL_FMT_BC4_SNORM:
+ case XGL_FMT_BC5_UNORM:
+ case XGL_FMT_BC5_SNORM:
+ case XGL_FMT_BC6H_UFLOAT:
+ case XGL_FMT_BC6H_SFLOAT:
+ case XGL_FMT_BC7_UNORM:
+ case XGL_FMT_BC7_SRGB:
+ case XGL_FMT_ETC2_R8G8B8_UNORM:
+ case XGL_FMT_ETC2_R8G8B8A1_UNORM:
+ case XGL_FMT_ETC2_R8G8B8A8_UNORM:
+ case XGL_FMT_EAC_R11_UNORM:
+ case XGL_FMT_EAC_R11_SNORM:
+ case XGL_FMT_EAC_R11G11_UNORM:
+ case XGL_FMT_EAC_R11G11_SNORM:
+ case XGL_FMT_ASTC_4x4_UNORM:
+ case XGL_FMT_ASTC_4x4_SRGB:
+ case XGL_FMT_ASTC_4x5_UNORM:
+ case XGL_FMT_ASTC_4x5_SRGB:
+ case XGL_FMT_ASTC_5x5_UNORM:
+ case XGL_FMT_ASTC_5x5_SRGB:
+ case XGL_FMT_ASTC_6x5_UNORM:
+ case XGL_FMT_ASTC_6x5_SRGB:
+ case XGL_FMT_ASTC_6x6_UNORM:
+ case XGL_FMT_ASTC_6x6_SRGB:
+ case XGL_FMT_ASTC_8x5_UNORM:
+ case XGL_FMT_ASTC_8x5_SRGB:
+ case XGL_FMT_ASTC_8x6_UNORM:
+ case XGL_FMT_ASTC_8x6_SRGB:
+ case XGL_FMT_ASTC_8x8_UNORM:
+ case XGL_FMT_ASTC_8x8_SRGB:
+ case XGL_FMT_ASTC_10x5_UNORM:
+ case XGL_FMT_ASTC_10x5_SRGB:
+ case XGL_FMT_ASTC_10x6_UNORM:
+ case XGL_FMT_ASTC_10x6_SRGB:
+ case XGL_FMT_ASTC_10x8_UNORM:
+ case XGL_FMT_ASTC_10x8_SRGB:
+ case XGL_FMT_ASTC_10x10_UNORM:
+ case XGL_FMT_ASTC_10x10_SRGB:
+ case XGL_FMT_ASTC_12x10_UNORM:
+ case XGL_FMT_ASTC_12x10_SRGB:
+ case XGL_FMT_ASTC_12x12_UNORM:
+ case XGL_FMT_ASTC_12x12_SRGB:
+ return true;
+ default:
+ return false;
+ }
+}
+
size_t icd_format_get_size(XGL_FORMAT format)
{
- return icd_format_table[format.channelFormat].size;
+ return icd_format_table[format].size;
}
XGL_IMAGE_FORMAT_CLASS icd_format_get_class(XGL_FORMAT format)
@@ -146,7 +541,7 @@
unsigned int icd_format_get_channel_count(XGL_FORMAT format)
{
- return icd_format_table[format.channelFormat].channel_count;
+ return icd_format_table[format].channel_count;
}
/**
@@ -158,157 +553,229 @@
void *value)
{
/* assume little-endian */
- switch (format.channelFormat) {
- case XGL_CH_FMT_UNDEFINED:
+ switch (format) {
+ case XGL_FMT_UNDEFINED:
break;
- case XGL_CH_FMT_R4G4:
+ case XGL_FMT_R4G4_UNORM:
+ case XGL_FMT_R4G4_USCALED:
((uint8_t *) value)[0] = (color[0] & 0xf) << 0 |
(color[1] & 0xf) << 4;
break;
- case XGL_CH_FMT_R4G4B4A4:
+ case XGL_FMT_R4G4B4A4_UNORM:
+ case XGL_FMT_R4G4B4A4_USCALED:
((uint16_t *) value)[0] = (color[0] & 0xf) << 0 |
(color[1] & 0xf) << 4 |
(color[2] & 0xf) << 8 |
(color[3] & 0xf) << 12;
break;
- case XGL_CH_FMT_R5G6B5:
+ case XGL_FMT_R5G6B5_UNORM:
+ case XGL_FMT_R5G6B5_USCALED:
((uint16_t *) value)[0] = (color[0] & 0x1f) << 0 |
(color[1] & 0x3f) << 5 |
(color[2] & 0x1f) << 11;
break;
- case XGL_CH_FMT_B5G6R5:
+ case XGL_FMT_B5G6R5_UNORM:
((uint16_t *) value)[0] = (color[2] & 0x1f) << 0 |
(color[1] & 0x3f) << 5 |
(color[0] & 0x1f) << 11;
break;
- case XGL_CH_FMT_R5G5B5A1:
+ case XGL_FMT_R5G5B5A1_UNORM:
+ case XGL_FMT_R5G5B5A1_USCALED:
((uint16_t *) value)[0] = (color[0] & 0x1f) << 0 |
(color[1] & 0x1f) << 5 |
(color[2] & 0x1f) << 10 |
(color[3] & 0x1) << 15;
break;
- case XGL_CH_FMT_R8:
+ case XGL_FMT_R8_UNORM:
+ case XGL_FMT_R8_SNORM:
+ case XGL_FMT_R8_USCALED:
+ case XGL_FMT_R8_SSCALED:
+ case XGL_FMT_R8_UINT:
+ case XGL_FMT_R8_SINT:
+ case XGL_FMT_R8_SRGB:
((uint8_t *) value)[0] = (uint8_t) color[0];
break;
- case XGL_CH_FMT_R8G8:
+ case XGL_FMT_R8G8_UNORM:
+ case XGL_FMT_R8G8_SNORM:
+ case XGL_FMT_R8G8_USCALED:
+ case XGL_FMT_R8G8_SSCALED:
+ case XGL_FMT_R8G8_UINT:
+ case XGL_FMT_R8G8_SINT:
+ case XGL_FMT_R8G8_SRGB:
((uint8_t *) value)[0] = (uint8_t) color[0];
((uint8_t *) value)[1] = (uint8_t) color[1];
break;
- case XGL_CH_FMT_R8G8B8A8:
+ case XGL_FMT_R8G8B8A8_UNORM:
+ case XGL_FMT_R8G8B8A8_SNORM:
+ case XGL_FMT_R8G8B8A8_USCALED:
+ case XGL_FMT_R8G8B8A8_SSCALED:
+ case XGL_FMT_R8G8B8A8_UINT:
+ case XGL_FMT_R8G8B8A8_SINT:
+ case XGL_FMT_R8G8B8A8_SRGB:
((uint8_t *) value)[0] = (uint8_t) color[0];
((uint8_t *) value)[1] = (uint8_t) color[1];
((uint8_t *) value)[2] = (uint8_t) color[2];
((uint8_t *) value)[3] = (uint8_t) color[3];
break;
- case XGL_CH_FMT_B8G8R8A8:
+ case XGL_FMT_B8G8R8A8_UNORM:
+ case XGL_FMT_B8G8R8A8_SRGB:
((uint8_t *) value)[0] = (uint8_t) color[2];
((uint8_t *) value)[1] = (uint8_t) color[1];
((uint8_t *) value)[2] = (uint8_t) color[0];
((uint8_t *) value)[3] = (uint8_t) color[3];
break;
- case XGL_CH_FMT_R10G11B11:
- ((uint32_t *) value)[0] = (color[0] & 0x3ff) << 0 |
- (color[1] & 0x7ff) << 10 |
- (color[2] & 0x7ff) << 21;
- break;
- case XGL_CH_FMT_R11G11B10:
+ case XGL_FMT_R11G11B10_UFLOAT:
((uint32_t *) value)[0] = (color[0] & 0x7ff) << 0 |
(color[1] & 0x7ff) << 11 |
(color[2] & 0x3ff) << 22;
break;
- case XGL_CH_FMT_R10G10B10A2:
+ case XGL_FMT_R10G10B10A2_UNORM:
+ case XGL_FMT_R10G10B10A2_SNORM:
+ case XGL_FMT_R10G10B10A2_USCALED:
+ case XGL_FMT_R10G10B10A2_SSCALED:
+ case XGL_FMT_R10G10B10A2_UINT:
+ case XGL_FMT_R10G10B10A2_SINT:
((uint32_t *) value)[0] = (color[0] & 0x3ff) << 0 |
(color[1] & 0x3ff) << 10 |
(color[2] & 0x3ff) << 20 |
(color[3] & 0x3) << 30;
break;
- case XGL_CH_FMT_R16:
+ case XGL_FMT_R16_UNORM:
+ case XGL_FMT_R16_SNORM:
+ case XGL_FMT_R16_USCALED:
+ case XGL_FMT_R16_SSCALED:
+ case XGL_FMT_R16_UINT:
+ case XGL_FMT_R16_SINT:
+ case XGL_FMT_R16_SFLOAT:
((uint16_t *) value)[0] = (uint16_t) color[0];
break;
- case XGL_CH_FMT_R16G16:
+ case XGL_FMT_R16G16_UNORM:
+ case XGL_FMT_R16G16_SNORM:
+ case XGL_FMT_R16G16_USCALED:
+ case XGL_FMT_R16G16_SSCALED:
+ case XGL_FMT_R16G16_UINT:
+ case XGL_FMT_R16G16_SINT:
+ case XGL_FMT_R16G16_SFLOAT:
((uint16_t *) value)[0] = (uint16_t) color[0];
((uint16_t *) value)[1] = (uint16_t) color[1];
break;
- case XGL_CH_FMT_R16G16B16A16:
+ case XGL_FMT_R16G16B16A16_UNORM:
+ case XGL_FMT_R16G16B16A16_SNORM:
+ case XGL_FMT_R16G16B16A16_USCALED:
+ case XGL_FMT_R16G16B16A16_SSCALED:
+ case XGL_FMT_R16G16B16A16_UINT:
+ case XGL_FMT_R16G16B16A16_SINT:
+ case XGL_FMT_R16G16B16A16_SFLOAT:
((uint16_t *) value)[0] = (uint16_t) color[0];
((uint16_t *) value)[1] = (uint16_t) color[1];
((uint16_t *) value)[2] = (uint16_t) color[2];
((uint16_t *) value)[3] = (uint16_t) color[3];
break;
- case XGL_CH_FMT_R32:
+ case XGL_FMT_R32_UINT:
+ case XGL_FMT_R32_SINT:
+ case XGL_FMT_R32_SFLOAT:
((uint32_t *) value)[0] = color[0];
break;
- case XGL_CH_FMT_R32G32:
+ case XGL_FMT_R32G32_UINT:
+ case XGL_FMT_R32G32_SINT:
+ case XGL_FMT_R32G32_SFLOAT:
((uint32_t *) value)[0] = color[0];
((uint32_t *) value)[1] = color[1];
break;
- case XGL_CH_FMT_R32G32B32:
+ case XGL_FMT_R32G32B32_UINT:
+ case XGL_FMT_R32G32B32_SINT:
+ case XGL_FMT_R32G32B32_SFLOAT:
((uint32_t *) value)[0] = color[0];
((uint32_t *) value)[1] = color[1];
((uint32_t *) value)[2] = color[2];
break;
- case XGL_CH_FMT_R32G32B32A32:
+ case XGL_FMT_R32G32B32A32_UINT:
+ case XGL_FMT_R32G32B32A32_SINT:
+ case XGL_FMT_R32G32B32A32_SFLOAT:
((uint32_t *) value)[0] = color[0];
((uint32_t *) value)[1] = color[1];
((uint32_t *) value)[2] = color[2];
((uint32_t *) value)[3] = color[3];
break;
- case XGL_CH_FMT_R16G8:
+ case XGL_FMT_D16_UNORM_S8_UINT:
((uint16_t *) value)[0] = (uint16_t) color[0];
((char *) value)[2] = (uint8_t) color[1];
break;
- case XGL_CH_FMT_R32G8:
+ case XGL_FMT_D32_SFLOAT_S8_UINT:
((uint32_t *) value)[0] = (uint32_t) color[0];
((char *) value)[4] = (uint8_t) color[1];
break;
- case XGL_CH_FMT_R9G9B9E5:
+ case XGL_FMT_R9G9B9E5_UFLOAT:
((uint32_t *) value)[0] = (color[0] & 0x1ff) << 0 |
(color[1] & 0x1ff) << 9 |
(color[2] & 0x1ff) << 18 |
(color[3] & 0x1f) << 27;
break;
- case XGL_CH_FMT_BC1:
- case XGL_CH_FMT_BC4:
+ case XGL_FMT_BC1_UNORM:
+ case XGL_FMT_BC1_SRGB:
+ case XGL_FMT_BC4_UNORM:
+ case XGL_FMT_BC4_SNORM:
memcpy(value, color, 8);
break;
- case XGL_CH_FMT_BC2:
- case XGL_CH_FMT_BC3:
- case XGL_CH_FMT_BC5:
- case XGL_CH_FMT_BC6U:
- case XGL_CH_FMT_BC6S:
- case XGL_CH_FMT_BC7:
+ case XGL_FMT_BC2_UNORM:
+ case XGL_FMT_BC2_SRGB:
+ case XGL_FMT_BC3_UNORM:
+ case XGL_FMT_BC3_SRGB:
+ case XGL_FMT_BC5_UNORM:
+ case XGL_FMT_BC5_SNORM:
+ case XGL_FMT_BC6H_UFLOAT:
+ case XGL_FMT_BC6H_SFLOAT:
+ case XGL_FMT_BC7_UNORM:
+ case XGL_FMT_BC7_SRGB:
memcpy(value, color, 16);
break;
- case XGL_CH_FMT_R8G8B8:
+ case XGL_FMT_R8G8B8_UNORM:
+ case XGL_FMT_R8G8B8_SNORM:
+ case XGL_FMT_R8G8B8_USCALED:
+ case XGL_FMT_R8G8B8_SSCALED:
+ case XGL_FMT_R8G8B8_UINT:
+ case XGL_FMT_R8G8B8_SINT:
+ case XGL_FMT_R8G8B8_SRGB:
((uint8_t *) value)[0] = (uint8_t) color[0];
((uint8_t *) value)[1] = (uint8_t) color[1];
((uint8_t *) value)[2] = (uint8_t) color[2];
break;
- case XGL_CH_FMT_R16G16B16:
+ case XGL_FMT_R16G16B16_UNORM:
+ case XGL_FMT_R16G16B16_SNORM:
+ case XGL_FMT_R16G16B16_USCALED:
+ case XGL_FMT_R16G16B16_SSCALED:
+ case XGL_FMT_R16G16B16_UINT:
+ case XGL_FMT_R16G16B16_SINT:
+ case XGL_FMT_R16G16B16_SFLOAT:
((uint16_t *) value)[0] = (uint16_t) color[0];
((uint16_t *) value)[1] = (uint16_t) color[1];
((uint16_t *) value)[2] = (uint16_t) color[2];
break;
- case XGL_CH_FMT_B10G10R10A2:
+ case XGL_FMT_B10G10R10A2_UNORM:
+ case XGL_FMT_B10G10R10A2_SNORM:
+ case XGL_FMT_B10G10R10A2_USCALED:
+ case XGL_FMT_B10G10R10A2_SSCALED:
+ case XGL_FMT_B10G10R10A2_UINT:
+ case XGL_FMT_B10G10R10A2_SINT:
((uint32_t *) value)[0] = (color[2] & 0x3ff) << 0 |
(color[1] & 0x3ff) << 10 |
(color[0] & 0x3ff) << 20 |
(color[3] & 0x3) << 30;
break;
- case XGL_CH_FMT_R64:
+ case XGL_FMT_R64_SFLOAT:
/* higher 32 bits always 0 */
((uint64_t *) value)[0] = color[0];
break;
- case XGL_CH_FMT_R64G64:
+ case XGL_FMT_R64G64_SFLOAT:
((uint64_t *) value)[0] = color[0];
((uint64_t *) value)[1] = color[1];
break;
- case XGL_CH_FMT_R64G64B64:
+ case XGL_FMT_R64G64B64_SFLOAT:
((uint64_t *) value)[0] = color[0];
((uint64_t *) value)[1] = color[1];
((uint64_t *) value)[2] = color[2];
break;
- case XGL_CH_FMT_R64G64B64A64:
+ case XGL_FMT_R64G64B64A64_SFLOAT:
((uint64_t *) value)[0] = color[0];
((uint64_t *) value)[1] = color[1];
((uint64_t *) value)[2] = color[2];