anv: null check for buffer before reading size

[mesa.git] / src / intel / isl / isl_format_layout.csv

diff --git a/src/intel/isl/isl_format_layout.csv b/src/intel/isl/isl_format_layout.csv
index 509971c1abf45a23255ab489450d675f06458ea8..6d801112b42c422378bc125b7fa55f72a230c3de 100644 (file)
--- a/src/intel/isl/isl_format_layout.csv
+++ b/src/intel/isl/isl_format_layout.csv
@@ -99,7 +99,7 @@ R32G32_SNORM                ,  64,  1,  1,  1, sn32, sn32,     ,     ,     ,
 R64_FLOAT                   ,  64,  1,  1,  1, sf64,     ,     ,     ,     ,     ,    ,     r, linear,
 R16G16B16X16_UNORM          ,  64,  1,  1,  1, un16, un16, un16,  x16,     ,     ,    ,  rgba, linear,
 R16G16B16X16_FLOAT          ,  64,  1,  1,  1, sf16, sf16, sf16,  x16,     ,     ,    ,  rgba, linear,
-A32X32_FLOAT                ,  64,  1,  1,  1,     ,     ,     , sf32,  x32,     ,    ,    al,  alpha,
+A32X32_FLOAT                ,  64,  1,  1,  1,     ,     ,     , sf32,  x32,     ,    ,    al, linear,
 L32X32_FLOAT                ,  64,  1,  1,  1,     ,     ,     ,  x32, sf32,     ,    ,    la, linear,
 I32X32_FLOAT                ,  64,  1,  1,  1,     ,     ,     ,  x32,     , sf32,    ,    ia, linear,
 R16G16B16A16_SSCALED        ,  64,  1,  1,  1, ss16, ss16, ss16, ss16,     ,     ,    ,  rgba, linear,
@@ -128,20 +128,21 @@ R16G16_FLOAT                ,  32,  1,  1,  1, sf16, sf16,     ,     ,     ,
 B10G10R10A2_UNORM           ,  32,  1,  1,  1, un10, un10, un10,  un2,     ,     ,    ,  bgra, linear,
 B10G10R10A2_UNORM_SRGB      ,  32,  1,  1,  1, un10, un10, un10,  un2,     ,     ,    ,  bgra,   srgb,
 R11G11B10_FLOAT             ,  32,  1,  1,  1, uf11, uf11, uf10,     ,     ,     ,    ,   rgb, linear,
+R10G10B10_FLOAT_A2_UNORM    ,  32,  1,  1,  1, uf10, uf10, uf10,  un2,     ,     ,    ,  rgba, linear,
 R32_SINT                    ,  32,  1,  1,  1, si32,     ,     ,     ,     ,     ,    ,     r, linear,
 R32_UINT                    ,  32,  1,  1,  1, ui32,     ,     ,     ,     ,     ,    ,     r, linear,
 R32_FLOAT                   ,  32,  1,  1,  1, sf32,     ,     ,     ,     ,     ,    ,     r, linear,
 R24_UNORM_X8_TYPELESS       ,  32,  1,  1,  1, un24,   x8,     ,     ,     ,     ,    ,    rg, linear,
 X24_TYPELESS_G8_UINT        ,  32,  1,  1,  1,  x24,  ui8,     ,     ,     ,     ,    ,    rg, linear,
 L32_UNORM                   ,  32,  1,  1,  1,     ,     ,     ,     , un32,     ,    ,     l, linear,
-A32_UNORM                   ,  32,  1,  1,  1,     ,     ,     , un32,     ,     ,    ,     a,  alpha,
+A32_UNORM                   ,  32,  1,  1,  1,     ,     ,     , un32,     ,     ,    ,     a, linear,
 L16A16_UNORM                ,  32,  1,  1,  1,     ,     ,     , un16, un16,     ,    ,    la, linear,
 I24X8_UNORM                 ,  32,  1,  1,  1,     ,     ,     ,   x8,     , un24,    ,    ia, linear,
 L24X8_UNORM                 ,  32,  1,  1,  1,     ,     ,     ,   x8, un24,     ,    ,    la, linear,
-A24X8_UNORM                 ,  32,  1,  1,  1,     ,     ,     , un24,   x8,     ,    ,    al,  alpha,
+A24X8_UNORM                 ,  32,  1,  1,  1,     ,     ,     , un24,   x8,     ,    ,    al, linear,
 I32_FLOAT                   ,  32,  1,  1,  1,     ,     ,     ,     ,     , sf32,    ,     i, linear,
 L32_FLOAT                   ,  32,  1,  1,  1,     ,     ,     ,     , sf32,     ,    ,     l, linear,
-A32_FLOAT                   ,  32,  1,  1,  1,     ,     ,     , sf32,     ,     ,    ,     a,  alpha,
+A32_FLOAT                   ,  32,  1,  1,  1,     ,     ,     , sf32,     ,     ,    ,     a, linear,
 X8B8_UNORM_G8R8_SNORM       ,  32,  1,  1,  1,  sn8,  sn8,  un8,   x8,     ,     ,    ,  abgr, linear,
 A8X8_UNORM_G8R8_SNORM       ,  32,  1,  1,  1,  sn8,  sn8,   x8,  un8,     ,     ,    ,  abgr, linear,
 B8X8_UNORM_G8R8_SNORM       ,  32,  1,  1,  1,  sn8,  sn8,  un8,   x8,     ,     ,    ,  bagr, linear,
@@ -180,11 +181,11 @@ A8P8_UNORM_PALETTE0         ,  16,  1,  1,  1,     ,     ,     ,  un8,     ,
 A8P8_UNORM_PALETTE1         ,  16,  1,  1,  1,     ,     ,     ,  un8,     ,     , un8,    ap, linear,
 I16_UNORM                   ,  16,  1,  1,  1,     ,     ,     ,     ,     , un16,    ,     i, linear,
 L16_UNORM                   ,  16,  1,  1,  1,     ,     ,     ,     , un16,     ,    ,     l, linear,
-A16_UNORM                   ,  16,  1,  1,  1,     ,     ,     , un16,     ,     ,    ,     a,  alpha,
+A16_UNORM                   ,  16,  1,  1,  1,     ,     ,     , un16,     ,     ,    ,     a, linear,
 L8A8_UNORM                  ,  16,  1,  1,  1,     ,     ,     ,  un8,  un8,     ,    ,    la, linear,
 I16_FLOAT                   ,  16,  1,  1,  1,     ,     ,     ,     ,     , sf16,    ,     i, linear,
 L16_FLOAT                   ,  16,  1,  1,  1,     ,     ,     ,     , sf16,     ,    ,     l, linear,
-A16_FLOAT                   ,  16,  1,  1,  1,     ,     ,     , sf16,     ,     ,    ,     a,  alpha,
+A16_FLOAT                   ,  16,  1,  1,  1,     ,     ,     , sf16,     ,     ,    ,     a, linear,
 L8A8_UNORM_SRGB             ,  16,  1,  1,  1,     ,     ,     ,  un8,  un8,     ,    ,    la,   srgb,
 R5G5_SNORM_B6_UNORM         ,  16,  1,  1,  1,  sn5,  sn5,  un6,     ,     ,     ,    ,   rgb, linear,
 B5G5R5X1_UNORM              ,  16,  1,  1,  1,  un5,  un5,  un5,   x1,     ,     ,    ,  bgra, linear,
@@ -203,7 +204,7 @@ R8_UNORM                    ,   8,  1,  1,  1,  un8,     ,     ,     ,     ,
 R8_SNORM                    ,   8,  1,  1,  1,  sn8,     ,     ,     ,     ,     ,    ,     r, linear,
 R8_SINT                     ,   8,  1,  1,  1,  si8,     ,     ,     ,     ,     ,    ,     r, linear,
 R8_UINT                     ,   8,  1,  1,  1,  ui8,     ,     ,     ,     ,     ,    ,     r, linear,
-A8_UNORM                    ,   8,  1,  1,  1,     ,     ,     ,  un8,     ,     ,    ,     a,  alpha,
+A8_UNORM                    ,   8,  1,  1,  1,     ,     ,     ,  un8,     ,     ,    ,     a, linear,
 I8_UNORM                    ,   8,  1,  1,  1,     ,     ,     ,     ,     ,  un8,    ,     i, linear,
 L8_UNORM                    ,   8,  1,  1,  1,     ,     ,     ,     ,  un8,     ,    ,     l, linear,
 P4A4_UNORM_PALETTE0         ,   8,  1,  1,  1,     ,     ,     ,  un4,     ,     , un4,    pa, linear,
@@ -211,11 +212,11 @@ A4P4_UNORM_PALETTE0         ,   8,  1,  1,  1,     ,     ,     ,  un4,     ,
 R8_SSCALED                  ,   8,  1,  1,  1,  ss8,     ,     ,     ,     ,     ,    ,     r, linear,
 R8_USCALED                  ,   8,  1,  1,  1,  us8,     ,     ,     ,     ,     ,    ,     r, linear,
 P8_UNORM_PALETTE0           ,   8,  1,  1,  1,     ,     ,     ,     ,     ,     , un8,     p, linear,
-L8_UNORM_SRGB               ,   8,  1,  1,  1,     ,     ,     ,     ,  un8,     ,    ,     l, linear,
+L8_UNORM_SRGB               ,   8,  1,  1,  1,     ,     ,     ,     ,  un8,     ,    ,     l,   srgb,
 P8_UNORM_PALETTE1           ,   8,  1,  1,  1,     ,     ,     ,     ,     ,     , un8,     p, linear,
 P4A4_UNORM_PALETTE1         ,   8,  1,  1,  1,     ,     ,     ,  un4,     ,     , un4,    pa, linear,
 A4P4_UNORM_PALETTE1         ,   8,  1,  1,  1,     ,     ,     ,  un4,     ,     , un4,    ap, linear,
-Y8_UNORM                    ,   0,  0,  0,  0,     ,     ,     ,     ,     ,     ,    ,      ,    yuv,
+Y8_UNORM                    ,   8,  1,  1,  1,     ,  un8,     ,     ,     ,     ,    ,      ,    yuv,
 L8_UINT                     ,   8,  1,  1,  1,     ,     ,     ,     ,  ui8,     ,    ,     l, linear,
 L8_SINT                     ,   8,  1,  1,  1,     ,     ,     ,     ,  si8,     ,    ,     l, linear,
 I8_UINT                     ,   8,  1,  1,  1,     ,     ,     ,     ,     ,  ui8,    ,     i, linear,
@@ -342,3 +343,8 @@ GEN7_CCS_128BPP_Y           ,   1,  2,  4,  1,     ,     ,     ,     ,     ,
 GEN9_CCS_32BPP              ,   2,  8,  4,  1,     ,     ,     ,     ,     ,     ,    ,      ,       ,   ccs
 GEN9_CCS_64BPP              ,   2,  4,  4,  1,     ,     ,     ,     ,     ,     ,    ,      ,       ,   ccs
 GEN9_CCS_128BPP             ,   2,  2,  4,  1,     ,     ,     ,     ,     ,     ,    ,      ,       ,   ccs
+GEN12_CCS_8BPP_Y0           ,   4, 32,  4,  1,     ,     ,     ,     ,     ,     ,    ,      ,       ,   ccs
+GEN12_CCS_16BPP_Y0          ,   4, 16,  4,  1,     ,     ,     ,     ,     ,     ,    ,      ,       ,   ccs
+GEN12_CCS_32BPP_Y0          ,   4,  8,  4,  1,     ,     ,     ,     ,     ,     ,    ,      ,       ,   ccs
+GEN12_CCS_64BPP_Y0          ,   4,  4,  4,  1,     ,     ,     ,     ,     ,     ,    ,      ,       ,   ccs
+GEN12_CCS_128BPP_Y0         ,   4,  2,  4,  1,     ,     ,     ,     ,     ,     ,    ,      ,       ,   ccs