panfrost: XMLify MSAA writeout mode

[mesa.git] / src / panfrost / include / panfrost-job.h

diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h
index 09ff583ab447b95ce3099001e25f441f55885399..c4481de51015ed4e9af83f4b0a86ccdb8921133d 100644 (file)
--- a/src/panfrost/include/panfrost-job.h
+++ b/src/panfrost/include/panfrost-job.h
@@ -159,13 +159,6 @@ enum mali_channel {
        MALI_CHANNEL_RESERVED_1 = 7,
 };
 
-struct mali_channel_swizzle {
-       enum mali_channel r : 3;
-       enum mali_channel g : 3;
-       enum mali_channel b : 3;
-       enum mali_channel a : 3;
-} __attribute__((packed));
-
 /* Compressed per-pixel formats. Each of these formats expands to one to four
  * floating-point or integer numbers, as defined by the OpenGL specification.
  * There are various places in OpenGL where the user can specify a compressed
@@ -1274,13 +1267,6 @@ struct midgard_tiler_descriptor {
         u32 weights[8];
 };
 
-enum mali_block_format {
-        MALI_BLOCK_TILED   = 0x0,
-        MALI_BLOCK_UNKNOWN = 0x1,
-        MALI_BLOCK_LINEAR  = 0x2,
-        MALI_BLOCK_AFBC    = 0x3,
-};
-
 struct mali_sfbd_format {
         /* 0x1 */
         unsigned unk1 : 6;
@@ -1405,20 +1391,6 @@ struct mali_single_framebuffer {
 } __attribute__((packed));
 
 
-/* SINGLE to disable multisampling, AVERAGE for
- * EXT_multisampled_render_to_texture operation where multiple tilebuffer
- * samples are implicitly resolved before writeout, MULTIPLE to write multiple
- * samples inline, and LAYERED for ES3-style multisampling with each sample in
- * a different buffer.
- */
-
-enum mali_msaa_mode {
-        MALI_MSAA_SINGLE = 0,
-        MALI_MSAA_AVERAGE = 1,
-        MALI_MSAA_MULTIPLE = 2,
-        MALI_MSAA_LAYERED = 3,
-};
-
 #define MALI_MFBD_FORMAT_SRGB    (1 << 0)
 
 struct mali_rt_format {
@@ -1430,7 +1402,7 @@ struct mali_rt_format {
         unsigned unk3 : 4;
         unsigned unk4 : 1;
         enum mali_block_format block : 2;
-        enum mali_msaa_mode msaa : 2;
+        enum mali_msaa msaa : 2;
         unsigned flags : 2;
 
         unsigned swizzle : 12;