[Mesa-dev] [PATCH 37/64] isl: Add surface formats for on-MSAA CCS surfaces

[Jason Ekstrand]

---
 src/intel/isl/isl.h                 | 16 ++++++++++++++++
 src/intel/isl/isl_format_layout.csv |  9 +++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
index 3bf7469..36038bc 100644
--- a/src/intel/isl/isl.h
+++ b/src/intel/isl/isl.h
@@ -349,6 +349,22 @@ enum isl_format {
    ISL_FORMAT_ASTC_LDR_2D_12X10_FLT16 =                        638,
    ISL_FORMAT_ASTC_LDR_2D_12X12_FLT16 =                        639,
 
+   /* The formats that follow are internal to ISL and as such don't have an
+    * explicit number.  We'll just let the C compiler assign it for us.  Any
+    * actual hardware formats *must* come before these in the list.
+    */
+
+   /* Formats for representing a non-MSAA color control surface */
+   ISL_FORMAT_NOMSRT_CCS_D_32BPP_X,
+   ISL_FORMAT_NOMSRT_CCS_D_64BPP_X,
+   ISL_FORMAT_NOMSRT_CCS_D_128BPP_X,
+   ISL_FORMAT_NOMSRT_CCS_D_32BPP_Y,
+   ISL_FORMAT_NOMSRT_CCS_D_64BPP_Y,
+   ISL_FORMAT_NOMSRT_CCS_D_128BPP_Y,
+   ISL_FORMAT_NOMSRT_CCS_E_32BPP,
+   ISL_FORMAT_NOMSRT_CCS_E_64BPP,
+   ISL_FORMAT_NOMSRT_CCS_E_128BPP,
+
    /* Hardware doesn't understand this out-of-band value */
    ISL_FORMAT_UNSUPPORTED =                             UINT16_MAX,
 };
diff --git a/src/intel/isl/isl_format_layout.csv b/src/intel/isl/isl_format_layout.csv
index f90fbe0..a39093e 100644
--- a/src/intel/isl/isl_format_layout.csv
+++ b/src/intel/isl/isl_format_layout.csv
@@ -314,3 +314,12 @@ ASTC_LDR_2D_10X8_FLT16      , 128, 10,  8,  1, sf16, sf16, sf16, sf16,     ,
 ASTC_LDR_2D_10X10_FLT16     , 128, 10, 10,  1, sf16, sf16, sf16, sf16,     ,     ,    , linear,  astc
 ASTC_LDR_2D_12X10_FLT16     , 128, 12, 10,  1, sf16, sf16, sf16, sf16,     ,     ,    , linear,  astc
 ASTC_LDR_2D_12X12_FLT16     , 128, 12, 12,  1, sf16, sf16, sf16, sf16,     ,     ,    , linear,  astc
+NOMSRT_CCS_D_32BPP_X        ,   8,  8,  4,  1,
+NOMSRT_CCS_D_64BPP_X        ,   8,  4,  4,  1,
+NOMSRT_CCS_D_128BPP_X       ,   8,  2,  4,  1,
+NOMSRT_CCS_D_32BPP_Y        ,   8, 16,  2,  1,
+NOMSRT_CCS_D_64BPP_Y        ,   8,  8,  2,  1,
+NOMSRT_CCS_D_128BPP_Y       ,   8,  4,  2,  1,
+NOMSRT_CCS_E_32BPP          ,  16, 16,  2,  1,
+NOMSRT_CCS_E_64BPP          ,  16,  8,  2,  1,
+NOMSRT_CCS_E_128BPP         ,  16,  4,  2,  1,
-- 
2.5.0.400.gff86faf