util: Make pixel format layout more meaningful.

Namelly, explicitly distinguish formats coded by arithmetic manipulation,
from formats layed out in array.
This commit is contained in:
José Fonseca
2009-07-28 08:47:13 +01:00
parent a910c7d820
commit 42b15b26fd
3 changed files with 114 additions and 109 deletions
+99 -99
View File
@@ -1,99 +1,99 @@
PIPE_FORMAT_A8R8G8B8_UNORM , rgba, 1, 1, un8 , un8 , un8 , un8 , zyxw,
PIPE_FORMAT_X8R8G8B8_UNORM , rgba, 1, 1, un8 , un8 , un8 , un8 , zyx1,
PIPE_FORMAT_B8G8R8A8_UNORM , rgba, 1, 1, un8 , un8 , un8 , un8 , xyzw,
PIPE_FORMAT_B8G8R8X8_UNORM , rgba, 1, 1, un8 , un8 , un8 , un8 , xyz1,
PIPE_FORMAT_A1R5G5B5_UNORM , rgba, 1, 1, un5 , un5 , un5 , un1 , zyxw,
PIPE_FORMAT_A4R4G4B4_UNORM , rgba, 1, 1, un4 , un4 , un4 , un4 , zyxw,
PIPE_FORMAT_R5G6B5_UNORM , rgba, 1, 1, un5 , un6 , un5 , , zyx1,
PIPE_FORMAT_A2B10G10R10_UNORM , rgba, 1, 1, un10, un10, un10, un2 , wzyx,
PIPE_FORMAT_L8_UNORM , rgba, 1, 1, un8 , , , , xxx1,
PIPE_FORMAT_A8_UNORM , rgba, 1, 1, un8 , , , , 000x,
PIPE_FORMAT_I8_UNORM , rgba, 1, 1, un8 , , , , xxxx,
PIPE_FORMAT_A8L8_UNORM , rgba, 1, 1, un8 , un8 , , , xxxy,
PIPE_FORMAT_L16_UNORM , rgba, 1, 1, un16, , , , xxx1,
PIPE_FORMAT_Z16_UNORM , zs , 1, 1, un16, , , , x0__,
PIPE_FORMAT_Z32_UNORM , zs , 1, 1, un32, , , , x0__,
PIPE_FORMAT_Z32_FLOAT , zs , 1, 1, f32 , , , , x0__,
PIPE_FORMAT_S8Z24_UNORM , zs , 1, 1, un8 , un24, , , yx__,
PIPE_FORMAT_Z24S8_UNORM , zs , 1, 1, un24, un8 , , , xy__,
PIPE_FORMAT_X8Z24_UNORM , zs , 1, 1, un8 , un24, , , y0__,
PIPE_FORMAT_Z24X8_UNORM , zs , 1, 1, un24, un8 , , , x0__,
PIPE_FORMAT_S8_UNORM , zs , 1, 1, un8 , , , , 0x__,
PIPE_FORMAT_R64_FLOAT , rgba, 1, 1, f64 , , , , x001,
PIPE_FORMAT_R64G64_FLOAT , rgba, 1, 1, f64 , f64 , , , xy01,
PIPE_FORMAT_R64G64B64_FLOAT , rgba, 1, 1, f64 , f64 , f64 , , xyz1,
PIPE_FORMAT_R64G64B64A64_FLOAT , rgba, 1, 1, f64 , f64 , f64 , f64 , xyzw,
PIPE_FORMAT_R32_FLOAT , rgba, 1, 1, f32 , , , , x001,
PIPE_FORMAT_R32G32_FLOAT , rgba, 1, 1, f32 , f32 , , , xy01,
PIPE_FORMAT_R32G32B32_FLOAT , rgba, 1, 1, f32 , f32 , f32 , , xyz1,
PIPE_FORMAT_R32G32B32A32_FLOAT , rgba, 1, 1, f32 , f32 , f32 , f32 , xyzw,
PIPE_FORMAT_R32_UNORM , rgba, 1, 1, un32, , , , x001,
PIPE_FORMAT_R32G32_UNORM , rgba, 1, 1, un32, un32, , , xy01,
PIPE_FORMAT_R32G32B32_UNORM , rgba, 1, 1, un32, un32, un32, , xyz1,
PIPE_FORMAT_R32G32B32A32_UNORM , rgba, 1, 1, un32, un32, un32, un32, xyzw,
PIPE_FORMAT_R32_USCALED , rgba, 1, 1, u32 , , , , x001,
PIPE_FORMAT_R32G32_USCALED , rgba, 1, 1, u32 , u32 , , , xy01,
PIPE_FORMAT_R32G32B32_USCALED , rgba, 1, 1, u32 , u32 , u32 , , xyz1,
PIPE_FORMAT_R32G32B32A32_USCALED , rgba, 1, 1, u32 , u32 , u32 , u32 , xyzw,
PIPE_FORMAT_R32_SNORM , rgba, 1, 1, sn32, , , , x001,
PIPE_FORMAT_R32G32_SNORM , rgba, 1, 1, sn32, sn32, , , xy01,
PIPE_FORMAT_R32G32B32_SNORM , rgba, 1, 1, sn32, sn32, sn32, , xyz1,
PIPE_FORMAT_R32G32B32A32_SNORM , rgba, 1, 1, sn32, sn32, sn32, sn32, xyzw,
PIPE_FORMAT_R32_SSCALED , rgba, 1, 1, s32 , , , , x001,
PIPE_FORMAT_R32G32_SSCALED , rgba, 1, 1, s32 , s32 , , , xy01,
PIPE_FORMAT_R32G32B32_SSCALED , rgba, 1, 1, s32 , s32 , s32 , , xyz1,
PIPE_FORMAT_R32G32B32A32_SSCALED , rgba, 1, 1, s32 , s32 , s32 , s32 , xyzw,
PIPE_FORMAT_R16_UNORM , rgba, 1, 1, un16, , , , x001,
PIPE_FORMAT_R16G16_UNORM , rgba, 1, 1, un16, un16, , , xy01,
PIPE_FORMAT_R16G16B16_UNORM , rgba, 1, 1, un16, un16, un16, , xyz1,
PIPE_FORMAT_R16G16B16A16_UNORM , rgba, 1, 1, un16, un16, un16, un16, xyzw,
PIPE_FORMAT_R16_USCALED , rgba, 1, 1, u16 , , , , x001,
PIPE_FORMAT_R16G16_USCALED , rgba, 1, 1, u16 , u16 , , , xy01,
PIPE_FORMAT_R16G16B16_USCALED , rgba, 1, 1, u16 , u16 , u16 , , xyz1,
PIPE_FORMAT_R16G16B16A16_USCALED , rgba, 1, 1, u16 , u16 , u16 , u16 , xyzw,
PIPE_FORMAT_R16_SNORM , rgba, 1, 1, sn16, , , , x001,
PIPE_FORMAT_R16G16_SNORM , rgba, 1, 1, sn16, sn16, , , xy01,
PIPE_FORMAT_R16G16B16_SNORM , rgba, 1, 1, sn16, sn16, sn16, , xyz1,
PIPE_FORMAT_R16G16B16A16_SNORM , rgba, 1, 1, sn16, sn16, sn16, sn16, xyzw,
PIPE_FORMAT_R16_SSCALED , rgba, 1, 1, s16 , , , , x001,
PIPE_FORMAT_R16G16_SSCALED , rgba, 1, 1, s16 , s16 , , , xy01,
PIPE_FORMAT_R16G16B16_SSCALED , rgba, 1, 1, s16 , s16 , s16 , , xyz1,
PIPE_FORMAT_R16G16B16A16_SSCALED , rgba, 1, 1, s16 , s16 , s16 , s16 , xyzw,
PIPE_FORMAT_R8_UNORM , rgba, 1, 1, un8 , , , , x001,
PIPE_FORMAT_R8G8_UNORM , rgba, 1, 1, un8 , un8 , , , xy01,
PIPE_FORMAT_R8G8B8_UNORM , rgba, 1, 1, un8 , un8 , un8 , , xyz1,
PIPE_FORMAT_R8G8B8A8_UNORM , rgba, 1, 1, un8 , un8 , un8 , un8 , xyzw,
PIPE_FORMAT_R8G8B8X8_UNORM , rgba, 1, 1, un8 , un8 , un8 , un8 , xyz1,
PIPE_FORMAT_R8_USCALED , rgba, 1, 1, u8 , , , , x001,
PIPE_FORMAT_R8G8_USCALED , rgba, 1, 1, u8 , u8 , , , xy01,
PIPE_FORMAT_R8G8B8_USCALED , rgba, 1, 1, u8 , u8 , u8 , , xyz1,
PIPE_FORMAT_R8G8B8A8_USCALED , rgba, 1, 1, u8 , u8 , u8 , u8 , xyzw,
PIPE_FORMAT_R8G8B8X8_USCALED , rgba, 1, 1, u8 , u8 , u8 , u8 , xyz1,
PIPE_FORMAT_R8_SNORM , rgba, 1, 1, sn8 , , , , x001,
PIPE_FORMAT_R8G8_SNORM , rgba, 1, 1, sn8 , sn8 , , , xy01,
PIPE_FORMAT_R8G8B8_SNORM , rgba, 1, 1, sn8 , sn8 , sn8 , , xyz1,
PIPE_FORMAT_R8G8B8A8_SNORM , rgba, 1, 1, sn8 , sn8 , sn8 , sn8 , xyzw,
PIPE_FORMAT_R8G8B8X8_SNORM , rgba, 1, 1, sn8 , sn8 , sn8 , sn8 , xyz1,
PIPE_FORMAT_B6G5R5_SNORM , rgba, 1, 1, sn5 , sn5 , sn6 , , zyx1,
PIPE_FORMAT_A8B8G8R8_SNORM , rgba, 1, 1, sn8 , sn8 , sn8 , sn8 , zyxw,
PIPE_FORMAT_X8B8G8R8_SNORM , rgba, 1, 1, sn8 , sn8 , sn8 , sn8 , zyx1,
PIPE_FORMAT_R8_SSCALED , rgba, 1, 1, s8 , , , , x001,
PIPE_FORMAT_R8G8_SSCALED , rgba, 1, 1, s8 , s8 , , , xy01,
PIPE_FORMAT_R8G8B8_SSCALED , rgba, 1, 1, s8 , s8 , s8 , , xyz1,
PIPE_FORMAT_R8G8B8A8_SSCALED , rgba, 1, 1, s8 , s8 , s8 , s8 , xyzw,
PIPE_FORMAT_R8G8B8X8_SSCALED , rgba, 1, 1, s8 , s8 , s8 , s8 , xyz1,
PIPE_FORMAT_R32_FIXED , rgba, 1, 1, h32 , , , , x001,
PIPE_FORMAT_R32G32_FIXED , rgba, 1, 1, h32 , h32 , , , xy01,
PIPE_FORMAT_R32G32B32_FIXED , rgba, 1, 1, h32 , h32 , h32 , , xyz1,
PIPE_FORMAT_R32G32B32A32_FIXED , rgba, 1, 1, h32 , h32 , h32 , h32 , xyzw,
PIPE_FORMAT_L8_SRGB , rgba, 1, 1, u8 , , , , xxx1, srgb
PIPE_FORMAT_A8L8_SRGB , rgba, 1, 1, u8 , u8 , , , xxxy, srgb
PIPE_FORMAT_R8G8B8_SRGB , rgba, 1, 1, u8 , u8 , u8 , , xyz1, srgb
PIPE_FORMAT_R8G8B8A8_SRGB , rgba, 1, 1, u8 , u8 , u8 , u8 , xyzw, srgb
PIPE_FORMAT_R8G8B8X8_SRGB , rgba, 1, 1, u8 , u8 , u8 , u8 , xyz1, srgb
PIPE_FORMAT_A8R8G8B8_SRGB , rgba, 1, 1, u8 , u8 , u8 , u8 , wxyz, srgb
PIPE_FORMAT_X8R8G8B8_SRGB , rgba, 1, 1, u8 , u8 , u8 , u8 , 1xyz, srgb
PIPE_FORMAT_B8G8R8A8_SRGB , rgba, 1, 1, u8 , u8 , u8 , u8 , zyxw, srgb
PIPE_FORMAT_B8G8R8X8_SRGB , rgba, 1, 1, u8 , u8 , u8 , u8 , zyx1, srgb
PIPE_FORMAT_X8UB8UG8SR8S_NORM , rgba, 1, 1, sn8 , sn8 , un8 , x8 , 1zyx,
PIPE_FORMAT_B6UG5SR5S_NORM , rgba, 1, 1, sn5 , sn5 , un6 , , xyz1,
PIPE_FORMAT_A8R8G8B8_UNORM , arith , 1, 1, un8 , un8 , un8 , un8 , zyxw, rgb
PIPE_FORMAT_X8R8G8B8_UNORM , arith , 1, 1, un8 , un8 , un8 , un8 , zyx1, rgb
PIPE_FORMAT_B8G8R8A8_UNORM , arith , 1, 1, un8 , un8 , un8 , un8 , yzwx, rgb
PIPE_FORMAT_B8G8R8X8_UNORM , arith , 1, 1, un8 , un8 , un8 , un8 , yzw1, rgb
PIPE_FORMAT_A1R5G5B5_UNORM , arith , 1, 1, un5 , un5 , un5 , un1 , zyxw, rgb
PIPE_FORMAT_A4R4G4B4_UNORM , arith , 1, 1, un4 , un4 , un4 , un4 , zyxw, rgb
PIPE_FORMAT_R5G6B5_UNORM , arith , 1, 1, un5 , un6 , un5 , , zyx1, rgb
PIPE_FORMAT_A2B10G10R10_UNORM , arith , 1, 1, un10, un10, un10, un2 , wzyx, rgb
PIPE_FORMAT_L8_UNORM , arith , 1, 1, un8 , , , , xxx1, rgb
PIPE_FORMAT_A8_UNORM , arith , 1, 1, un8 , , , , 000x, rgb
PIPE_FORMAT_I8_UNORM , arith , 1, 1, un8 , , , , xxxx, rgb
PIPE_FORMAT_A8L8_UNORM , arith , 1, 1, un8 , un8 , , , xxxy, rgb
PIPE_FORMAT_L16_UNORM , arith , 1, 1, un16, , , , xxx1, rgb
PIPE_FORMAT_Z16_UNORM , arith , 1, 1, un16, , , , x0__, zs
PIPE_FORMAT_Z32_UNORM , arith , 1, 1, un32, , , , x0__, zs
PIPE_FORMAT_Z32_FLOAT , arith , 1, 1, f32 , , , , x0__, zs
PIPE_FORMAT_S8Z24_UNORM , arith , 1, 1, un8 , un24, , , yx__, zs
PIPE_FORMAT_Z24S8_UNORM , arith , 1, 1, un24, un8 , , , xy__, zs
PIPE_FORMAT_X8Z24_UNORM , arith , 1, 1, un8 , un24, , , y0__, zs
PIPE_FORMAT_Z24X8_UNORM , arith , 1, 1, un24, un8 , , , x0__, zs
PIPE_FORMAT_S8_UNORM , arith , 1, 1, un8 , , , , 0x__, zs
PIPE_FORMAT_R64_FLOAT , array , 1, 1, f64 , , , , x001, rgb
PIPE_FORMAT_R64G64_FLOAT , array , 1, 1, f64 , f64 , , , xy01, rgb
PIPE_FORMAT_R64G64B64_FLOAT , array , 1, 1, f64 , f64 , f64 , , xyz1, rgb
PIPE_FORMAT_R64G64B64A64_FLOAT , array , 1, 1, f64 , f64 , f64 , f64 , xyzw, rgb
PIPE_FORMAT_R32_FLOAT , array , 1, 1, f32 , , , , x001, rgb
PIPE_FORMAT_R32G32_FLOAT , array , 1, 1, f32 , f32 , , , xy01, rgb
PIPE_FORMAT_R32G32B32_FLOAT , array , 1, 1, f32 , f32 , f32 , , xyz1, rgb
PIPE_FORMAT_R32G32B32A32_FLOAT , array , 1, 1, f32 , f32 , f32 , f32 , xyzw, rgb
PIPE_FORMAT_R32_UNORM , array , 1, 1, un32, , , , x001, rgb
PIPE_FORMAT_R32G32_UNORM , array , 1, 1, un32, un32, , , xy01, rgb
PIPE_FORMAT_R32G32B32_UNORM , array , 1, 1, un32, un32, un32, , xyz1, rgb
PIPE_FORMAT_R32G32B32A32_UNORM , array , 1, 1, un32, un32, un32, un32, xyzw, rgb
PIPE_FORMAT_R32_USCALED , array , 1, 1, u32 , , , , x001, rgb
PIPE_FORMAT_R32G32_USCALED , array , 1, 1, u32 , u32 , , , xy01, rgb
PIPE_FORMAT_R32G32B32_USCALED , array , 1, 1, u32 , u32 , u32 , , xyz1, rgb
PIPE_FORMAT_R32G32B32A32_USCALED , array , 1, 1, u32 , u32 , u32 , u32 , xyzw, rgb
PIPE_FORMAT_R32_SNORM , array , 1, 1, sn32, , , , x001, rgb
PIPE_FORMAT_R32G32_SNORM , array , 1, 1, sn32, sn32, , , xy01, rgb
PIPE_FORMAT_R32G32B32_SNORM , array , 1, 1, sn32, sn32, sn32, , xyz1, rgb
PIPE_FORMAT_R32G32B32A32_SNORM , array , 1, 1, sn32, sn32, sn32, sn32, xyzw, rgb
PIPE_FORMAT_R32_SSCALED , array , 1, 1, s32 , , , , x001, rgb
PIPE_FORMAT_R32G32_SSCALED , array , 1, 1, s32 , s32 , , , xy01, rgb
PIPE_FORMAT_R32G32B32_SSCALED , array , 1, 1, s32 , s32 , s32 , , xyz1, rgb
PIPE_FORMAT_R32G32B32A32_SSCALED , array , 1, 1, s32 , s32 , s32 , s32 , xyzw, rgb
PIPE_FORMAT_R16_UNORM , array , 1, 1, un16, , , , x001, rgb
PIPE_FORMAT_R16G16_UNORM , array , 1, 1, un16, un16, , , xy01, rgb
PIPE_FORMAT_R16G16B16_UNORM , array , 1, 1, un16, un16, un16, , xyz1, rgb
PIPE_FORMAT_R16G16B16A16_UNORM , array , 1, 1, un16, un16, un16, un16, xyzw, rgb
PIPE_FORMAT_R16_USCALED , array , 1, 1, u16 , , , , x001, rgb
PIPE_FORMAT_R16G16_USCALED , array , 1, 1, u16 , u16 , , , xy01, rgb
PIPE_FORMAT_R16G16B16_USCALED , array , 1, 1, u16 , u16 , u16 , , xyz1, rgb
PIPE_FORMAT_R16G16B16A16_USCALED , array , 1, 1, u16 , u16 , u16 , u16 , xyzw, rgb
PIPE_FORMAT_R16_SNORM , array , 1, 1, sn16, , , , x001, rgb
PIPE_FORMAT_R16G16_SNORM , array , 1, 1, sn16, sn16, , , xy01, rgb
PIPE_FORMAT_R16G16B16_SNORM , array , 1, 1, sn16, sn16, sn16, , xyz1, rgb
PIPE_FORMAT_R16G16B16A16_SNORM , array , 1, 1, sn16, sn16, sn16, sn16, xyzw, rgb
PIPE_FORMAT_R16_SSCALED , array , 1, 1, s16 , , , , x001, rgb
PIPE_FORMAT_R16G16_SSCALED , array , 1, 1, s16 , s16 , , , xy01, rgb
PIPE_FORMAT_R16G16B16_SSCALED , array , 1, 1, s16 , s16 , s16 , , xyz1, rgb
PIPE_FORMAT_R16G16B16A16_SSCALED , array , 1, 1, s16 , s16 , s16 , s16 , xyzw, rgb
PIPE_FORMAT_R8_UNORM , array , 1, 1, un8 , , , , x001, rgb
PIPE_FORMAT_R8G8_UNORM , array , 1, 1, un8 , un8 , , , xy01, rgb
PIPE_FORMAT_R8G8B8_UNORM , array , 1, 1, un8 , un8 , un8 , , xyz1, rgb
PIPE_FORMAT_R8G8B8A8_UNORM , array , 1, 1, un8 , un8 , un8 , un8 , xyzw, rgb
PIPE_FORMAT_R8G8B8X8_UNORM , array , 1, 1, un8 , un8 , un8 , un8 , xyz1, rgb
PIPE_FORMAT_R8_USCALED , array , 1, 1, u8 , , , , x001, rgb
PIPE_FORMAT_R8G8_USCALED , array , 1, 1, u8 , u8 , , , xy01, rgb
PIPE_FORMAT_R8G8B8_USCALED , array , 1, 1, u8 , u8 , u8 , , xyz1, rgb
PIPE_FORMAT_R8G8B8A8_USCALED , array , 1, 1, u8 , u8 , u8 , u8 , xyzw, rgb
PIPE_FORMAT_R8G8B8X8_USCALED , array , 1, 1, u8 , u8 , u8 , u8 , xyz1, rgb
PIPE_FORMAT_R8_SNORM , array , 1, 1, sn8 , , , , x001, rgb
PIPE_FORMAT_R8G8_SNORM , array , 1, 1, sn8 , sn8 , , , xy01, rgb
PIPE_FORMAT_R8G8B8_SNORM , array , 1, 1, sn8 , sn8 , sn8 , , xyz1, rgb
PIPE_FORMAT_R8G8B8A8_SNORM , array , 1, 1, sn8 , sn8 , sn8 , sn8 , xyzw, rgb
PIPE_FORMAT_R8G8B8X8_SNORM , array , 1, 1, sn8 , sn8 , sn8 , sn8 , xyz1, rgb
PIPE_FORMAT_B6G5R5_SNORM , arith , 1, 1, sn5 , sn5 , sn6 , , zyx1, rgb
PIPE_FORMAT_A8B8G8R8_SNORM , arith , 1, 1, sn8 , sn8 , sn8 , sn8 , zyxw, rgb
PIPE_FORMAT_X8B8G8R8_SNORM , arith , 1, 1, sn8 , sn8 , sn8 , sn8 , zyx1, rgb
PIPE_FORMAT_R8_SSCALED , array , 1, 1, s8 , , , , x001, rgb
PIPE_FORMAT_R8G8_SSCALED , array , 1, 1, s8 , s8 , , , xy01, rgb
PIPE_FORMAT_R8G8B8_SSCALED , array , 1, 1, s8 , s8 , s8 , , xyz1, rgb
PIPE_FORMAT_R8G8B8A8_SSCALED , array , 1, 1, s8 , s8 , s8 , s8 , xyzw, rgb
PIPE_FORMAT_R8G8B8X8_SSCALED , array , 1, 1, s8 , s8 , s8 , s8 , xyz1, rgb
PIPE_FORMAT_R32_FIXED , array , 1, 1, h32 , , , , x001, rgb
PIPE_FORMAT_R32G32_FIXED , array , 1, 1, h32 , h32 , , , xy01, rgb
PIPE_FORMAT_R32G32B32_FIXED , array , 1, 1, h32 , h32 , h32 , , xyz1, rgb
PIPE_FORMAT_R32G32B32A32_FIXED , array , 1, 1, h32 , h32 , h32 , h32 , xyzw, rgb
PIPE_FORMAT_L8_SRGB , arith , 1, 1, u8 , , , , xxx1, srgb
PIPE_FORMAT_A8L8_SRGB , arith , 1, 1, u8 , u8 , , , xxxy, srgb
PIPE_FORMAT_R8G8B8_SRGB , arith , 1, 1, u8 , u8 , u8 , , xyz1, srgb
PIPE_FORMAT_R8G8B8A8_SRGB , arith , 1, 1, u8 , u8 , u8 , u8 , xyzw, srgb
PIPE_FORMAT_R8G8B8X8_SRGB , arith , 1, 1, u8 , u8 , u8 , u8 , xyz1, srgb
PIPE_FORMAT_A8R8G8B8_SRGB , arith , 1, 1, u8 , u8 , u8 , u8 , wxyz, srgb
PIPE_FORMAT_X8R8G8B8_SRGB , arith , 1, 1, u8 , u8 , u8 , u8 , 1xyz, srgb
PIPE_FORMAT_B8G8R8A8_SRGB , arith , 1, 1, u8 , u8 , u8 , u8 , zyxw, srgb
PIPE_FORMAT_B8G8R8X8_SRGB , arith , 1, 1, u8 , u8 , u8 , u8 , zyx1, srgb
PIPE_FORMAT_X8UB8UG8SR8S_NORM , arith , 1, 1, sn8 , sn8 , un8 , x8 , 1zyx, rgb
PIPE_FORMAT_B6UG5SR5S_NORM , arith , 1, 1, sn5 , sn5 , un6 , , xyz1, rgb
1 PIPE_FORMAT_A8R8G8B8_UNORM rgba arith 1 1 un8 un8 un8 un8 zyxw rgb
2 PIPE_FORMAT_X8R8G8B8_UNORM rgba arith 1 1 un8 un8 un8 un8 zyx1 rgb
3 PIPE_FORMAT_B8G8R8A8_UNORM rgba arith 1 1 un8 un8 un8 un8 xyzw yzwx rgb
4 PIPE_FORMAT_B8G8R8X8_UNORM rgba arith 1 1 un8 un8 un8 un8 xyz1 yzw1 rgb
5 PIPE_FORMAT_A1R5G5B5_UNORM rgba arith 1 1 un5 un5 un5 un1 zyxw rgb
6 PIPE_FORMAT_A4R4G4B4_UNORM rgba arith 1 1 un4 un4 un4 un4 zyxw rgb
7 PIPE_FORMAT_R5G6B5_UNORM rgba arith 1 1 un5 un6 un5 zyx1 rgb
8 PIPE_FORMAT_A2B10G10R10_UNORM rgba arith 1 1 un10 un10 un10 un2 wzyx rgb
9 PIPE_FORMAT_L8_UNORM rgba arith 1 1 un8 xxx1 rgb
10 PIPE_FORMAT_A8_UNORM rgba arith 1 1 un8 000x rgb
11 PIPE_FORMAT_I8_UNORM rgba arith 1 1 un8 xxxx rgb
12 PIPE_FORMAT_A8L8_UNORM rgba arith 1 1 un8 un8 xxxy rgb
13 PIPE_FORMAT_L16_UNORM rgba arith 1 1 un16 xxx1 rgb
14 PIPE_FORMAT_Z16_UNORM zs arith 1 1 un16 x0__ zs
15 PIPE_FORMAT_Z32_UNORM zs arith 1 1 un32 x0__ zs
16 PIPE_FORMAT_Z32_FLOAT zs arith 1 1 f32 x0__ zs
17 PIPE_FORMAT_S8Z24_UNORM zs arith 1 1 un8 un24 yx__ zs
18 PIPE_FORMAT_Z24S8_UNORM zs arith 1 1 un24 un8 xy__ zs
19 PIPE_FORMAT_X8Z24_UNORM zs arith 1 1 un8 un24 y0__ zs
20 PIPE_FORMAT_Z24X8_UNORM zs arith 1 1 un24 un8 x0__ zs
21 PIPE_FORMAT_S8_UNORM zs arith 1 1 un8 0x__ zs
22 PIPE_FORMAT_R64_FLOAT rgba array 1 1 f64 x001 rgb
23 PIPE_FORMAT_R64G64_FLOAT rgba array 1 1 f64 f64 xy01 rgb
24 PIPE_FORMAT_R64G64B64_FLOAT rgba array 1 1 f64 f64 f64 xyz1 rgb
25 PIPE_FORMAT_R64G64B64A64_FLOAT rgba array 1 1 f64 f64 f64 f64 xyzw rgb
26 PIPE_FORMAT_R32_FLOAT rgba array 1 1 f32 x001 rgb
27 PIPE_FORMAT_R32G32_FLOAT rgba array 1 1 f32 f32 xy01 rgb
28 PIPE_FORMAT_R32G32B32_FLOAT rgba array 1 1 f32 f32 f32 xyz1 rgb
29 PIPE_FORMAT_R32G32B32A32_FLOAT rgba array 1 1 f32 f32 f32 f32 xyzw rgb
30 PIPE_FORMAT_R32_UNORM rgba array 1 1 un32 x001 rgb
31 PIPE_FORMAT_R32G32_UNORM rgba array 1 1 un32 un32 xy01 rgb
32 PIPE_FORMAT_R32G32B32_UNORM rgba array 1 1 un32 un32 un32 xyz1 rgb
33 PIPE_FORMAT_R32G32B32A32_UNORM rgba array 1 1 un32 un32 un32 un32 xyzw rgb
34 PIPE_FORMAT_R32_USCALED rgba array 1 1 u32 x001 rgb
35 PIPE_FORMAT_R32G32_USCALED rgba array 1 1 u32 u32 xy01 rgb
36 PIPE_FORMAT_R32G32B32_USCALED rgba array 1 1 u32 u32 u32 xyz1 rgb
37 PIPE_FORMAT_R32G32B32A32_USCALED rgba array 1 1 u32 u32 u32 u32 xyzw rgb
38 PIPE_FORMAT_R32_SNORM rgba array 1 1 sn32 x001 rgb
39 PIPE_FORMAT_R32G32_SNORM rgba array 1 1 sn32 sn32 xy01 rgb
40 PIPE_FORMAT_R32G32B32_SNORM rgba array 1 1 sn32 sn32 sn32 xyz1 rgb
41 PIPE_FORMAT_R32G32B32A32_SNORM rgba array 1 1 sn32 sn32 sn32 sn32 xyzw rgb
42 PIPE_FORMAT_R32_SSCALED rgba array 1 1 s32 x001 rgb
43 PIPE_FORMAT_R32G32_SSCALED rgba array 1 1 s32 s32 xy01 rgb
44 PIPE_FORMAT_R32G32B32_SSCALED rgba array 1 1 s32 s32 s32 xyz1 rgb
45 PIPE_FORMAT_R32G32B32A32_SSCALED rgba array 1 1 s32 s32 s32 s32 xyzw rgb
46 PIPE_FORMAT_R16_UNORM rgba array 1 1 un16 x001 rgb
47 PIPE_FORMAT_R16G16_UNORM rgba array 1 1 un16 un16 xy01 rgb
48 PIPE_FORMAT_R16G16B16_UNORM rgba array 1 1 un16 un16 un16 xyz1 rgb
49 PIPE_FORMAT_R16G16B16A16_UNORM rgba array 1 1 un16 un16 un16 un16 xyzw rgb
50 PIPE_FORMAT_R16_USCALED rgba array 1 1 u16 x001 rgb
51 PIPE_FORMAT_R16G16_USCALED rgba array 1 1 u16 u16 xy01 rgb
52 PIPE_FORMAT_R16G16B16_USCALED rgba array 1 1 u16 u16 u16 xyz1 rgb
53 PIPE_FORMAT_R16G16B16A16_USCALED rgba array 1 1 u16 u16 u16 u16 xyzw rgb
54 PIPE_FORMAT_R16_SNORM rgba array 1 1 sn16 x001 rgb
55 PIPE_FORMAT_R16G16_SNORM rgba array 1 1 sn16 sn16 xy01 rgb
56 PIPE_FORMAT_R16G16B16_SNORM rgba array 1 1 sn16 sn16 sn16 xyz1 rgb
57 PIPE_FORMAT_R16G16B16A16_SNORM rgba array 1 1 sn16 sn16 sn16 sn16 xyzw rgb
58 PIPE_FORMAT_R16_SSCALED rgba array 1 1 s16 x001 rgb
59 PIPE_FORMAT_R16G16_SSCALED rgba array 1 1 s16 s16 xy01 rgb
60 PIPE_FORMAT_R16G16B16_SSCALED rgba array 1 1 s16 s16 s16 xyz1 rgb
61 PIPE_FORMAT_R16G16B16A16_SSCALED rgba array 1 1 s16 s16 s16 s16 xyzw rgb
62 PIPE_FORMAT_R8_UNORM rgba array 1 1 un8 x001 rgb
63 PIPE_FORMAT_R8G8_UNORM rgba array 1 1 un8 un8 xy01 rgb
64 PIPE_FORMAT_R8G8B8_UNORM rgba array 1 1 un8 un8 un8 xyz1 rgb
65 PIPE_FORMAT_R8G8B8A8_UNORM rgba array 1 1 un8 un8 un8 un8 xyzw rgb
66 PIPE_FORMAT_R8G8B8X8_UNORM rgba array 1 1 un8 un8 un8 un8 xyz1 rgb
67 PIPE_FORMAT_R8_USCALED rgba array 1 1 u8 x001 rgb
68 PIPE_FORMAT_R8G8_USCALED rgba array 1 1 u8 u8 xy01 rgb
69 PIPE_FORMAT_R8G8B8_USCALED rgba array 1 1 u8 u8 u8 xyz1 rgb
70 PIPE_FORMAT_R8G8B8A8_USCALED rgba array 1 1 u8 u8 u8 u8 xyzw rgb
71 PIPE_FORMAT_R8G8B8X8_USCALED rgba array 1 1 u8 u8 u8 u8 xyz1 rgb
72 PIPE_FORMAT_R8_SNORM rgba array 1 1 sn8 x001 rgb
73 PIPE_FORMAT_R8G8_SNORM rgba array 1 1 sn8 sn8 xy01 rgb
74 PIPE_FORMAT_R8G8B8_SNORM rgba array 1 1 sn8 sn8 sn8 xyz1 rgb
75 PIPE_FORMAT_R8G8B8A8_SNORM rgba array 1 1 sn8 sn8 sn8 sn8 xyzw rgb
76 PIPE_FORMAT_R8G8B8X8_SNORM rgba array 1 1 sn8 sn8 sn8 sn8 xyz1 rgb
77 PIPE_FORMAT_B6G5R5_SNORM rgba arith 1 1 sn5 sn5 sn6 zyx1 rgb
78 PIPE_FORMAT_A8B8G8R8_SNORM rgba arith 1 1 sn8 sn8 sn8 sn8 zyxw rgb
79 PIPE_FORMAT_X8B8G8R8_SNORM rgba arith 1 1 sn8 sn8 sn8 sn8 zyx1 rgb
80 PIPE_FORMAT_R8_SSCALED rgba array 1 1 s8 x001 rgb
81 PIPE_FORMAT_R8G8_SSCALED rgba array 1 1 s8 s8 xy01 rgb
82 PIPE_FORMAT_R8G8B8_SSCALED rgba array 1 1 s8 s8 s8 xyz1 rgb
83 PIPE_FORMAT_R8G8B8A8_SSCALED rgba array 1 1 s8 s8 s8 s8 xyzw rgb
84 PIPE_FORMAT_R8G8B8X8_SSCALED rgba array 1 1 s8 s8 s8 s8 xyz1 rgb
85 PIPE_FORMAT_R32_FIXED rgba array 1 1 h32 x001 rgb
86 PIPE_FORMAT_R32G32_FIXED rgba array 1 1 h32 h32 xy01 rgb
87 PIPE_FORMAT_R32G32B32_FIXED rgba array 1 1 h32 h32 h32 xyz1 rgb
88 PIPE_FORMAT_R32G32B32A32_FIXED rgba array 1 1 h32 h32 h32 h32 xyzw rgb
89 PIPE_FORMAT_L8_SRGB rgba arith 1 1 u8 xxx1 srgb srgb
90 PIPE_FORMAT_A8L8_SRGB rgba arith 1 1 u8 u8 xxxy srgb srgb
91 PIPE_FORMAT_R8G8B8_SRGB rgba arith 1 1 u8 u8 u8 xyz1 srgb srgb
92 PIPE_FORMAT_R8G8B8A8_SRGB rgba arith 1 1 u8 u8 u8 u8 xyzw srgb srgb
93 PIPE_FORMAT_R8G8B8X8_SRGB rgba arith 1 1 u8 u8 u8 u8 xyz1 srgb srgb
94 PIPE_FORMAT_A8R8G8B8_SRGB rgba arith 1 1 u8 u8 u8 u8 wxyz srgb srgb
95 PIPE_FORMAT_X8R8G8B8_SRGB rgba arith 1 1 u8 u8 u8 u8 1xyz srgb srgb
96 PIPE_FORMAT_B8G8R8A8_SRGB rgba arith 1 1 u8 u8 u8 u8 zyxw srgb srgb
97 PIPE_FORMAT_B8G8R8X8_SRGB rgba arith 1 1 u8 u8 u8 u8 zyx1 srgb srgb
98 PIPE_FORMAT_X8UB8UG8SR8S_NORM rgba arith 1 1 sn8 sn8 un8 x8 1zyx rgb
99 PIPE_FORMAT_B6UG5SR5S_NORM rgba arith 1 1 sn5 sn5 un6 xyz1 rgb
+8 -5
View File
@@ -34,10 +34,11 @@
enum util_format_layout {
UTIL_FORMAT_LAYOUT_RGBA = 0,
UTIL_FORMAT_LAYOUT_ZS = 1,
UTIL_FORMAT_LAYOUT_YUV = 2,
UTIL_FORMAT_LAYOUT_DXT = 3
UTIL_FORMAT_LAYOUT_SCALAR = 0,
UTIL_FORMAT_LAYOUT_ARITH = 1,
UTIL_FORMAT_LAYOUT_ARRAY = 2,
UTIL_FORMAT_LAYOUT_YUV = 3,
UTIL_FORMAT_LAYOUT_DXT = 4
};
@@ -76,7 +77,9 @@ enum util_format_swizzle {
enum util_format_colorspace {
UTIL_FORMAT_COLORSPACE_RGB = 0,
UTIL_FORMAT_COLORSPACE_SRGB = 1
UTIL_FORMAT_COLORSPACE_SRGB = 1,
UTIL_FORMAT_COLORSPACE_YUV = 2,
UTIL_FORMAT_COLORSPACE_ZS = 3,
};
+7 -5
View File
@@ -51,9 +51,6 @@ class Type:
return s
SCALED, NORM, SRGB = 'scaled', 'norm', 'srgb'
class Format:
def __init__(self, name, layout, block_width, block_height, in_types, out_swizzle, colorspace):
@@ -111,7 +108,12 @@ def layout_map(layout):
return 'UTIL_FORMAT_LAYOUT_' + str(layout).upper()
layout_channels_map = {
def colorspace_map(colorspace):
return 'UTIL_FORMAT_COLORSPACE_' + str(colorspace).upper()
colorspace_channels_map = {
'rgb': 'rgba',
'rgba': 'rgba',
'zs': 'zs',
'yuv': ['y1', 'y2', 'u', 'v'],
@@ -186,7 +188,7 @@ def write_format_table(formats):
comment = 'ignored'
print " %s%s /* %s */" % (swizzle_map[swizzle], sep, comment)
print " },"
print " UTIL_FORMAT_COLORSPACE_RGB,"
print " %s," % (colorspace_map(format.colorspace),)
print " },"
print " {"
print " PIPE_FORMAT_NONE,"