reorder format list

1 files changed, 196 insertions, 196 deletions

diff --git a/drmtools.c b/drmtools.c
index 968eee3..aa7da60 100644
--- a/drmtools.c
+++ b/drmtools.c
@@ -42,193 +42,72 @@ const struct fbformat fmts[] = {
      * fourcc formats, little endian (DRM_IOCTL_MODE_ADDFB2)
      */
 
-    /* --- 8 bpp, rgb --- */
-    {
-        .name   = FOURCC_NAME(DRM_FORMAT_RGB332),
-        .fields = "R:G:B",
-        .bits   = "3:3:2",
-        .bpp    = 8,
-        .fourcc = DRM_FORMAT_RGB332,
-        .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = PIXMAN_r3g3b2,
-    },{
-        .name   = FOURCC_NAME(DRM_FORMAT_BGR233),
-        .fields = "B:G:R",
-        .bits   = "2:3:3",
-        .bpp    = 8,
-        .fourcc = DRM_FORMAT_BGR233,
-        .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = PIXMAN_b2g3r3,
-    },
-
-    /* -- 16 bpp, rgb --- */
+    /* --- 32 bpp, rgb --- */
     {
-        .name   = FOURCC_NAME(DRM_FORMAT_XRGB4444),
-        .fields = "x:R:G:B",
-        .bits   = "4:4:4:4",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_XRGB4444,
-        .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = LE_BE(PIXMAN_x4r4g4b4, 0),
-    },{
-        .name   = FOURCC_NAME(DRM_FORMAT_XBGR4444),
-        .fields = "x:B:G:R",
-        .bits   = "4:4:4:4",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_XBGR4444,
-        .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = LE_BE(PIXMAN_x4b4g4r4, 0),
-    },{
-        .name   = FOURCC_NAME(DRM_FORMAT_RGBX4444),
-        .fields = "R:G:B:x",
-        .bits   = "4:4:4:4",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_RGBX4444,
-        .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = 0,
-    },{
-        .name   = FOURCC_NAME(DRM_FORMAT_BGRX4444),
-        .fields = "B:G:R:x",
-        .bits   = "4:4:4:4",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_BGRX4444,
-        .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = 0,
-    },{
-        .name   = FOURCC_NAME(DRM_FORMAT_ARGB4444),
-        .fields = "A:R:G:B",
-        .bits   = "4:4:4:4",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_ARGB4444,
-        .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = LE_BE(PIXMAN_a4r4g4b4, 0),
-    },{
-        .name   = FOURCC_NAME(DRM_FORMAT_ABGR4444),
-        .fields = "A:B:G:R",
-        .bits   = "4:4:4:4",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_ABGR4444,
-        .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = LE_BE(PIXMAN_a4b4g4r4, 0),
-    },{
-        .name   = FOURCC_NAME(DRM_FORMAT_RGBA4444),
-        .fields = "R:G:B:A",
-        .bits   = "4:4:4:4",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_RGBA4444,
-        .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = 0,
-    },{
-        .name   = FOURCC_NAME(DRM_FORMAT_BGRA4444),
-        .fields = "B:G:R:A",
-        .bits   = "4:4:4:4",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_BGRA4444,
-        .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = 0,
-    },{
-        .name   = FOURCC_NAME(DRM_FORMAT_XRGB1555),
+        .name   = FOURCC_NAME(DRM_FORMAT_XRGB2101010),
         .fields = "x:R:G:B",
-        .bits   = "1:5:5:5",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_XRGB1555,
-        .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = LE_BE(PIXMAN_x1r5g5b5, 0),
+        .bits   = "2:10:10:10",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_XRGB2101010,
+        .cairo  = LE_BE(CAIRO_FORMAT_RGB30, CAIRO_FORMAT_INVALID),
+        .pixman = LE_BE(PIXMAN_x2r10g10b10, 0),
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_XBGR1555),
+        .name   = FOURCC_NAME(DRM_FORMAT_XBGR2101010),
         .fields = "x:B:G:R",
-        .bits   = "1:5:5:5",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_XBGR1555,
+        .bits   = "2:10:10:10",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_XBGR2101010,
         .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = LE_BE(PIXMAN_x1b5g5r5, 0),
+        .pixman = LE_BE(PIXMAN_x2b10g10r10, 0),
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_RGBX5551),
+        .name   = FOURCC_NAME(DRM_FORMAT_RGBX1010102),
         .fields = "R:G:B:x",
-        .bits   = "5:5:5:1",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_RGBX5551,
+        .bits   = "10:10:10:2",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_RGBX1010102,
         .cairo  = CAIRO_FORMAT_INVALID,
         .pixman = 0,
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_BGRX5551),
+        .name   = FOURCC_NAME(DRM_FORMAT_BGRX1010102),
         .fields = "B:G:R:x",
-        .bits   = "5:5:5:1",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_BGRX5551,
+        .bits   = "10:10:10:2",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_BGRX1010102,
         .cairo  = CAIRO_FORMAT_INVALID,
         .pixman = 0,
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_ARGB1555),
+        .name   = FOURCC_NAME(DRM_FORMAT_ARGB2101010),
         .fields = "A:R:G:B",
-        .bits   = "1:5:5:5",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_ARGB1555,
+        .bits   = "2:10:10:10",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_ARGB2101010,
         .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = LE_BE(PIXMAN_a1r5g5b5, 0),
+        .pixman = LE_BE(PIXMAN_a2r10g10b10, 0),
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_ABGR1555),
+        .name   = FOURCC_NAME(DRM_FORMAT_ABGR2101010),
         .fields = "A:B:G:R",
-        .bits   = "1:5:5:5",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_ABGR1555,
+        .bits   = "2:10:10:10",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_ABGR2101010,
         .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = LE_BE(PIXMAN_a1b5g5r5, 0),
+        .pixman = LE_BE(PIXMAN_a2b10g10r10, 0),
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_RGBA5551),
+        .name   = FOURCC_NAME(DRM_FORMAT_RGBA1010102),
         .fields = "R:G:B:A",
-        .bits   = "5:5:5:1",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_RGBA5551,
+        .bits   = "10:10:10:2",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_RGBA1010102,
         .cairo  = CAIRO_FORMAT_INVALID,
         .pixman = 0,
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_BGRA5551),
+        .name   = FOURCC_NAME(DRM_FORMAT_BGRA1010102),
         .fields = "B:G:R:A",
-        .bits   = "5:5:5:1",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_BGRA5551,
+        .bits   = "10:10:10:2",
+        .bpp    = 32,
+        .fourcc = DRM_FORMAT_BGRA1010102,
         .cairo  = CAIRO_FORMAT_INVALID,
         .pixman = 0,
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_RGB565),
-        .fields = "R:G:B",
-        .bits   = "5:6:5",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_RGB565,
-        .cairo  = LE_BE(CAIRO_FORMAT_RGB16_565, CAIRO_FORMAT_INVALID),
-        .pixman = LE_BE(PIXMAN_r5g6b5, 0),
-    },{
-        .name   = FOURCC_NAME(DRM_FORMAT_BGR565),
-        .fields = "B:G:R",
-        .bits   = "5:6:5",
-        .bpp    = 16,
-        .fourcc = DRM_FORMAT_BGR565,
-        .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = LE_BE(PIXMAN_b5g6r5, 0),
-    },
-
-    /* --- 24 bpp, rgb --- */
-    {
-        .name   = FOURCC_NAME(DRM_FORMAT_RGB888),
-        .fields = "R:G:B",
-        .bits   = "8:8:8",
-        .bpp    = 24,
-        .fourcc = DRM_FORMAT_RGB888,
-        .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = LE_BE(PIXMAN_r8g8b8, PIXMAN_b8g8r8),
-    },{
-        .name   = FOURCC_NAME(DRM_FORMAT_BGR888),
-        .fields = "B:G:R",
-        .bits   = "8:8:8",
-        .bpp    = 24,
-        .fourcc = DRM_FORMAT_BGR888,
-        .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = LE_BE(PIXMAN_b8g8r8, PIXMAN_r8g8b8),
-    },
-
-    /* --- 32 bpp, rgb --- */
-    {
         .name   = FOURCC_NAME(DRM_FORMAT_XRGB8888),
         .fields = "x:R:G:B",
         .bits   = "8:8:8:8",
@@ -296,70 +175,191 @@ const struct fbformat fmts[] = {
         .virtio = VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM,
         .cairo  = CAIRO_FORMAT_INVALID,
         .pixman = LE_BE(PIXMAN_b8g8r8a8, PIXMAN_a8r8g8b8),
+    },
+
+    /* --- 24 bpp, rgb --- */
+    {
+        .name   = FOURCC_NAME(DRM_FORMAT_RGB888),
+        .fields = "R:G:B",
+        .bits   = "8:8:8",
+        .bpp    = 24,
+        .fourcc = DRM_FORMAT_RGB888,
+        .cairo  = CAIRO_FORMAT_INVALID,
+        .pixman = LE_BE(PIXMAN_r8g8b8, PIXMAN_b8g8r8),
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_XRGB2101010),
+        .name   = FOURCC_NAME(DRM_FORMAT_BGR888),
+        .fields = "B:G:R",
+        .bits   = "8:8:8",
+        .bpp    = 24,
+        .fourcc = DRM_FORMAT_BGR888,
+        .cairo  = CAIRO_FORMAT_INVALID,
+        .pixman = LE_BE(PIXMAN_b8g8r8, PIXMAN_r8g8b8),
+    },
+
+    /* -- 16 bpp, rgb --- */
+    {
+        .name   = FOURCC_NAME(DRM_FORMAT_RGB565),
+        .fields = "R:G:B",
+        .bits   = "5:6:5",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_RGB565,
+        .cairo  = LE_BE(CAIRO_FORMAT_RGB16_565, CAIRO_FORMAT_INVALID),
+        .pixman = LE_BE(PIXMAN_r5g6b5, 0),
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_BGR565),
+        .fields = "B:G:R",
+        .bits   = "5:6:5",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_BGR565,
+        .cairo  = CAIRO_FORMAT_INVALID,
+        .pixman = LE_BE(PIXMAN_b5g6r5, 0),
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_XRGB1555),
         .fields = "x:R:G:B",
-        .bits   = "2:10:10:10",
-        .bpp    = 32,
-        .fourcc = DRM_FORMAT_XRGB2101010,
-        .cairo  = LE_BE(CAIRO_FORMAT_RGB30, CAIRO_FORMAT_INVALID),
-        .pixman = LE_BE(PIXMAN_x2r10g10b10, 0),
+        .bits   = "1:5:5:5",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_XRGB1555,
+        .cairo  = CAIRO_FORMAT_INVALID,
+        .pixman = LE_BE(PIXMAN_x1r5g5b5, 0),
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_XBGR2101010),
+        .name   = FOURCC_NAME(DRM_FORMAT_XBGR1555),
         .fields = "x:B:G:R",
-        .bits   = "2:10:10:10",
-        .bpp    = 32,
-        .fourcc = DRM_FORMAT_XBGR2101010,
+        .bits   = "1:5:5:5",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_XBGR1555,
         .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = LE_BE(PIXMAN_x2b10g10r10, 0),
+        .pixman = LE_BE(PIXMAN_x1b5g5r5, 0),
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_RGBX1010102),
+        .name   = FOURCC_NAME(DRM_FORMAT_RGBX5551),
         .fields = "R:G:B:x",
-        .bits   = "10:10:10:2",
-        .bpp    = 32,
-        .fourcc = DRM_FORMAT_RGBX1010102,
+        .bits   = "5:5:5:1",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_RGBX5551,
         .cairo  = CAIRO_FORMAT_INVALID,
         .pixman = 0,
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_BGRX1010102),
+        .name   = FOURCC_NAME(DRM_FORMAT_BGRX5551),
         .fields = "B:G:R:x",
-        .bits   = "10:10:10:2",
-        .bpp    = 32,
-        .fourcc = DRM_FORMAT_BGRX1010102,
+        .bits   = "5:5:5:1",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_BGRX5551,
         .cairo  = CAIRO_FORMAT_INVALID,
         .pixman = 0,
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_ARGB2101010),
+        .name   = FOURCC_NAME(DRM_FORMAT_ARGB1555),
         .fields = "A:R:G:B",
-        .bits   = "2:10:10:10",
-        .bpp    = 32,
-        .fourcc = DRM_FORMAT_ARGB2101010,
+        .bits   = "1:5:5:5",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_ARGB1555,
         .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = LE_BE(PIXMAN_a2r10g10b10, 0),
+        .pixman = LE_BE(PIXMAN_a1r5g5b5, 0),
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_ABGR2101010),
+        .name   = FOURCC_NAME(DRM_FORMAT_ABGR1555),
         .fields = "A:B:G:R",
-        .bits   = "2:10:10:10",
-        .bpp    = 32,
-        .fourcc = DRM_FORMAT_ABGR2101010,
+        .bits   = "1:5:5:5",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_ABGR1555,
         .cairo  = CAIRO_FORMAT_INVALID,
-        .pixman = LE_BE(PIXMAN_a2b10g10r10, 0),
+        .pixman = LE_BE(PIXMAN_a1b5g5r5, 0),
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_RGBA1010102),
+        .name   = FOURCC_NAME(DRM_FORMAT_RGBA5551),
         .fields = "R:G:B:A",
-        .bits   = "10:10:10:2",
-        .bpp    = 32,
-        .fourcc = DRM_FORMAT_RGBA1010102,
+        .bits   = "5:5:5:1",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_RGBA5551,
         .cairo  = CAIRO_FORMAT_INVALID,
         .pixman = 0,
     },{
-        .name   = FOURCC_NAME(DRM_FORMAT_BGRA1010102),
+        .name   = FOURCC_NAME(DRM_FORMAT_BGRA5551),
         .fields = "B:G:R:A",
-        .bits   = "10:10:10:2",
-        .bpp    = 32,
-        .fourcc = DRM_FORMAT_BGRA1010102,
+        .bits   = "5:5:5:1",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_BGRA5551,
+        .cairo  = CAIRO_FORMAT_INVALID,
+        .pixman = 0,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_XRGB4444),
+        .fields = "x:R:G:B",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_XRGB4444,
+        .cairo  = CAIRO_FORMAT_INVALID,
+        .pixman = LE_BE(PIXMAN_x4r4g4b4, 0),
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_XBGR4444),
+        .fields = "x:B:G:R",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_XBGR4444,
+        .cairo  = CAIRO_FORMAT_INVALID,
+        .pixman = LE_BE(PIXMAN_x4b4g4r4, 0),
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_RGBX4444),
+        .fields = "R:G:B:x",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_RGBX4444,
+        .cairo  = CAIRO_FORMAT_INVALID,
+        .pixman = 0,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_BGRX4444),
+        .fields = "B:G:R:x",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_BGRX4444,
+        .cairo  = CAIRO_FORMAT_INVALID,
+        .pixman = 0,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_ARGB4444),
+        .fields = "A:R:G:B",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_ARGB4444,
+        .cairo  = CAIRO_FORMAT_INVALID,
+        .pixman = LE_BE(PIXMAN_a4r4g4b4, 0),
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_ABGR4444),
+        .fields = "A:B:G:R",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_ABGR4444,
+        .cairo  = CAIRO_FORMAT_INVALID,
+        .pixman = LE_BE(PIXMAN_a4b4g4r4, 0),
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_RGBA4444),
+        .fields = "R:G:B:A",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_RGBA4444,
         .cairo  = CAIRO_FORMAT_INVALID,
         .pixman = 0,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_BGRA4444),
+        .fields = "B:G:R:A",
+        .bits   = "4:4:4:4",
+        .bpp    = 16,
+        .fourcc = DRM_FORMAT_BGRA4444,
+        .cairo  = CAIRO_FORMAT_INVALID,
+        .pixman = 0,
+    },
+
+    /* --- 8 bpp, rgb --- */
+    {
+        .name   = FOURCC_NAME(DRM_FORMAT_RGB332),
+        .fields = "R:G:B",
+        .bits   = "3:3:2",
+        .bpp    = 8,
+        .fourcc = DRM_FORMAT_RGB332,
+        .cairo  = CAIRO_FORMAT_INVALID,
+        .pixman = PIXMAN_r3g3b2,
+    },{
+        .name   = FOURCC_NAME(DRM_FORMAT_BGR233),
+        .fields = "B:G:R",
+        .bits   = "2:3:3",
+        .bpp    = 8,
+        .fourcc = DRM_FORMAT_BGR233,
+        .cairo  = CAIRO_FORMAT_INVALID,
+        .pixman = PIXMAN_b2g3r3,
     },
 
     /* --- 32 bpp, yuv --- */