OSDN Git Service

minigbm: Sort case statements alphabetically.
authorGurchetan Singh <gurchetansingh@chromium.org>
Mon, 21 Nov 2016 19:36:31 +0000 (11:36 -0800)
committerchrome-bot <chrome-bot@chromium.org>
Tue, 29 Nov 2016 07:59:31 +0000 (23:59 -0800)
This makes giant case statements easier to read.

BUG=None
TEST=minigbm still builds

CQ-DEPEND=CL:405790

Change-Id: I551c411aa75b9717bad44b25e4c39d8cd7a003a0
Reviewed-on: https://chromium-review.googlesource.com/413325
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
drv.c
helpers.c

diff --git a/drv.c b/drv.c
index 9f1c771..a2afd0f 100644 (file)
--- a/drv.c
+++ b/drv.c
@@ -484,53 +484,53 @@ int drv_stride_from_format(uint32_t format, uint32_t width, size_t plane)
 size_t drv_num_planes_from_format(uint32_t format)
 {
        switch (format) {
+       case DRM_FORMAT_ABGR1555:
+       case DRM_FORMAT_ABGR2101010:
+       case DRM_FORMAT_ABGR4444:
+       case DRM_FORMAT_ABGR8888:
+       case DRM_FORMAT_ARGB1555:
+       case DRM_FORMAT_ARGB2101010:
+       case DRM_FORMAT_ARGB4444:
+       case DRM_FORMAT_ARGB8888:
+       case DRM_FORMAT_AYUV:
+       case DRM_FORMAT_BGR233:
+       case DRM_FORMAT_BGR565:
+       case DRM_FORMAT_BGR888:
+       case DRM_FORMAT_BGRA1010102:
+       case DRM_FORMAT_BGRA4444:
+       case DRM_FORMAT_BGRA5551:
+       case DRM_FORMAT_BGRA8888:
+       case DRM_FORMAT_BGRX1010102:
+       case DRM_FORMAT_BGRX4444:
+       case DRM_FORMAT_BGRX5551:
+       case DRM_FORMAT_BGRX8888:
        case DRM_FORMAT_C8:
+       case DRM_FORMAT_GR88:
        case DRM_FORMAT_R8:
        case DRM_FORMAT_RG88:
-       case DRM_FORMAT_GR88:
        case DRM_FORMAT_RGB332:
-       case DRM_FORMAT_BGR233:
-       case DRM_FORMAT_XRGB4444:
-       case DRM_FORMAT_XBGR4444:
-       case DRM_FORMAT_RGBX4444:
-       case DRM_FORMAT_BGRX4444:
-       case DRM_FORMAT_ARGB4444:
-       case DRM_FORMAT_ABGR4444:
+       case DRM_FORMAT_RGB565:
+       case DRM_FORMAT_RGB888:
+       case DRM_FORMAT_RGBA1010102:
        case DRM_FORMAT_RGBA4444:
-       case DRM_FORMAT_BGRA4444:
-       case DRM_FORMAT_XRGB1555:
-       case DRM_FORMAT_XBGR1555:
-       case DRM_FORMAT_RGBX5551:
-       case DRM_FORMAT_BGRX5551:
-       case DRM_FORMAT_ARGB1555:
-       case DRM_FORMAT_ABGR1555:
        case DRM_FORMAT_RGBA5551:
-       case DRM_FORMAT_BGRA5551:
-       case DRM_FORMAT_RGB565:
-       case DRM_FORMAT_BGR565:
-       case DRM_FORMAT_YUYV:
-       case DRM_FORMAT_YVYU:
+       case DRM_FORMAT_RGBA8888:
+       case DRM_FORMAT_RGBX1010102:
+       case DRM_FORMAT_RGBX4444:
+       case DRM_FORMAT_RGBX5551:
+       case DRM_FORMAT_RGBX8888:
        case DRM_FORMAT_UYVY:
        case DRM_FORMAT_VYUY:
-       case DRM_FORMAT_RGB888:
-       case DRM_FORMAT_BGR888:
-       case DRM_FORMAT_XRGB8888:
+       case DRM_FORMAT_XBGR1555:
+       case DRM_FORMAT_XBGR2101010:
+       case DRM_FORMAT_XBGR4444:
        case DRM_FORMAT_XBGR8888:
-       case DRM_FORMAT_RGBX8888:
-       case DRM_FORMAT_BGRX8888:
-       case DRM_FORMAT_ARGB8888:
-       case DRM_FORMAT_ABGR8888:
-       case DRM_FORMAT_RGBA8888:
-       case DRM_FORMAT_BGRA8888:
+       case DRM_FORMAT_XRGB1555:
        case DRM_FORMAT_XRGB2101010:
-       case DRM_FORMAT_XBGR2101010:
-       case DRM_FORMAT_RGBX1010102:
-       case DRM_FORMAT_BGRX1010102:
-       case DRM_FORMAT_ARGB2101010:
-       case DRM_FORMAT_ABGR2101010:
-       case DRM_FORMAT_RGBA1010102:
-       case DRM_FORMAT_BGRA1010102:
-       case DRM_FORMAT_AYUV:
+       case DRM_FORMAT_XRGB4444:
+       case DRM_FORMAT_XRGB8888:
+       case DRM_FORMAT_YUYV:
+       case DRM_FORMAT_YVYU:
                return 1;
        case DRM_FORMAT_NV12:
                return 2;
@@ -549,8 +549,8 @@ uint32_t drv_size_from_format(uint32_t format, uint32_t stride,
        uint32_t vertical_subsampling;
 
        switch (format) {
-       case DRM_FORMAT_YVU420:
        case DRM_FORMAT_NV12:
+       case DRM_FORMAT_YVU420:
                vertical_subsampling = (plane == 0) ? 1 : 2;
                break;
        default:
index 6a96113..1e35936 100644 (file)
--- a/helpers.c
+++ b/helpers.c
@@ -21,10 +21,10 @@ int drv_bpp_from_format(uint32_t format, size_t plane)
        assert(plane < drv_num_planes_from_format(format));
 
        switch (format) {
+       case DRM_FORMAT_BGR233:
        case DRM_FORMAT_C8:
        case DRM_FORMAT_R8:
        case DRM_FORMAT_RGB332:
-       case DRM_FORMAT_BGR233:
        case DRM_FORMAT_YVU420:
                return 8;
 
@@ -48,53 +48,53 @@ int drv_bpp_from_format(uint32_t format, size_t plane)
        case DRM_FORMAT_NV12:
                return (plane == 0) ? 8 : 16;
 
-       case DRM_FORMAT_RG88:
-       case DRM_FORMAT_GR88:
-       case DRM_FORMAT_XRGB4444:
-       case DRM_FORMAT_XBGR4444:
-       case DRM_FORMAT_RGBX4444:
-       case DRM_FORMAT_BGRX4444:
-       case DRM_FORMAT_ARGB4444:
+       case DRM_FORMAT_ABGR1555:
        case DRM_FORMAT_ABGR4444:
-       case DRM_FORMAT_RGBA4444:
-       case DRM_FORMAT_BGRA4444:
-       case DRM_FORMAT_XRGB1555:
-       case DRM_FORMAT_XBGR1555:
-       case DRM_FORMAT_RGBX5551:
-       case DRM_FORMAT_BGRX5551:
        case DRM_FORMAT_ARGB1555:
-       case DRM_FORMAT_ABGR1555:
-       case DRM_FORMAT_RGBA5551:
+       case DRM_FORMAT_ARGB4444:
+       case DRM_FORMAT_BGR565:
+       case DRM_FORMAT_BGRA4444:
        case DRM_FORMAT_BGRA5551:
+       case DRM_FORMAT_BGRX4444:
+       case DRM_FORMAT_BGRX5551:
+       case DRM_FORMAT_GR88:
+       case DRM_FORMAT_RG88:
        case DRM_FORMAT_RGB565:
-       case DRM_FORMAT_BGR565:
-       case DRM_FORMAT_YUYV:
-       case DRM_FORMAT_YVYU:
+       case DRM_FORMAT_RGBA4444:
+       case DRM_FORMAT_RGBA5551:
+       case DRM_FORMAT_RGBX4444:
+       case DRM_FORMAT_RGBX5551:
        case DRM_FORMAT_UYVY:
        case DRM_FORMAT_VYUY:
+       case DRM_FORMAT_XBGR1555:
+       case DRM_FORMAT_XBGR4444:
+       case DRM_FORMAT_XRGB1555:
+       case DRM_FORMAT_XRGB4444:
+       case DRM_FORMAT_YUYV:
+       case DRM_FORMAT_YVYU:
                return 16;
 
-       case DRM_FORMAT_RGB888:
        case DRM_FORMAT_BGR888:
+       case DRM_FORMAT_RGB888:
                return 24;
 
-       case DRM_FORMAT_XRGB8888:
-       case DRM_FORMAT_XBGR8888:
-       case DRM_FORMAT_RGBX8888:
-       case DRM_FORMAT_BGRX8888:
-       case DRM_FORMAT_ARGB8888:
+       case DRM_FORMAT_ABGR2101010:
        case DRM_FORMAT_ABGR8888:
-       case DRM_FORMAT_RGBA8888:
+       case DRM_FORMAT_ARGB2101010:
+       case DRM_FORMAT_ARGB8888:
+       case DRM_FORMAT_AYUV:
+       case DRM_FORMAT_BGRA1010102:
        case DRM_FORMAT_BGRA8888:
-       case DRM_FORMAT_XRGB2101010:
-       case DRM_FORMAT_XBGR2101010:
-       case DRM_FORMAT_RGBX1010102:
        case DRM_FORMAT_BGRX1010102:
-       case DRM_FORMAT_ARGB2101010:
-       case DRM_FORMAT_ABGR2101010:
+       case DRM_FORMAT_BGRX8888:
        case DRM_FORMAT_RGBA1010102:
-       case DRM_FORMAT_BGRA1010102:
-       case DRM_FORMAT_AYUV:
+       case DRM_FORMAT_RGBA8888:
+       case DRM_FORMAT_RGBX1010102:
+       case DRM_FORMAT_RGBX8888:
+       case DRM_FORMAT_XBGR2101010:
+       case DRM_FORMAT_XBGR8888:
+       case DRM_FORMAT_XRGB2101010:
+       case DRM_FORMAT_XRGB8888:
                return 32;
        }