remove enum gbm_bo_format

The presence of this enum makes mistakes handling gbm formats very easy
to make. With this patch, no new code can use this enum. Any old code
that tries will see errors.

BUG=None
TEST=drm-tests
CQ-DEPEND=CL:343592

Change-Id: If3b19975a137928965f14bad26d1e895dd839810
Reviewed-on: https://chromium-review.googlesource.com/343528
Commit-Ready: Zach Reizner <zachr@chromium.org>
Tested-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Haixia Shi <hshi@chromium.org>

diff --git a/exynos.c b/exynos.c
index 4c9bfa5..e74e56d 100644 (file)
--- a/exynos.c
+++ b/exynos.c
@@ -34,8 +34,7 @@ static int gbm_exynos_bo_create(struct gbm_bo *bo,
                bo->sizes[0] = bo->strides[0] * height + 64;
                bo->sizes[1] = bo->strides[1] * chroma_height + 64;
                bo->offsets[0] = bo->offsets[1] = 0;
-       } else if (format == GBM_FORMAT_XRGB8888 || format == GBM_FORMAT_ARGB8888 ||
-                       format == GBM_BO_FORMAT_XRGB8888 || format == GBM_BO_FORMAT_ARGB8888 ) {
+       } else if (format == GBM_FORMAT_XRGB8888 || format == GBM_FORMAT_ARGB8888) {
                bo->strides[0] = gbm_stride_from_format(format, width);
                bo->sizes[0] = height * bo->strides[0];
                bo->offsets[0] = 0;

diff --git a/gbm.c b/gbm.c
index 9c31fd3..06da310 100644 (file)
--- a/gbm.c
+++ b/gbm.c
@@ -105,11 +105,6 @@ gbm_device_is_format_supported(struct gbm_device *gbm,
 {
        unsigned i;
 
-       if (format == GBM_BO_FORMAT_XRGB8888)
-               format = GBM_FORMAT_XRGB8888;
-       if (format == GBM_BO_FORMAT_ARGB8888)
-               format = GBM_FORMAT_ARGB8888;
-
        if (usage & GBM_BO_USE_CURSOR &&
                usage & GBM_BO_USE_RENDERING)
                return 0;

diff --git a/gbm.h b/gbm.h
index 91b021a..47f4a4a 100644 (file)
--- a/gbm.h
+++ b/gbm.h
@@ -68,14 +68,6 @@ union gbm_bo_handle {
    uint64_t u64;
 };
 
-/** Format of the allocated buffer */
-enum gbm_bo_format {
-   /** RGB with 8 bits per channel in a 32 bit value */
-   GBM_BO_FORMAT_XRGB8888,
-   /** ARGB with 8 bits per channel in a 32 bit value */
-   GBM_BO_FORMAT_ARGB8888
-};
-
 #define __gbm_fourcc_code(a,b,c,d) ((uint32_t)(a) | ((uint32_t)(b) << 8) | \
                              ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24))
 

diff --git a/helpers.c b/helpers.c
index bd00de9..2cb0408 100644 (file)
--- a/helpers.c
+++ b/helpers.c
@@ -17,11 +17,6 @@
 
 size_t gbm_num_planes_from_format(uint32_t format)
 {
-       if (format == GBM_BO_FORMAT_XRGB8888)
-               format = GBM_FORMAT_XRGB8888;
-       if (format == GBM_BO_FORMAT_ARGB8888)
-               format = GBM_FORMAT_ARGB8888;
-
        switch(format)
        {
                case GBM_FORMAT_C8:
@@ -82,11 +77,6 @@ size_t gbm_num_planes_from_format(uint32_t format)
 
 int gbm_bpp_from_format(uint32_t format)
 {
-       if (format == GBM_BO_FORMAT_XRGB8888)
-               format = GBM_FORMAT_XRGB8888;
-       if (format == GBM_BO_FORMAT_ARGB8888)
-               format = GBM_FORMAT_ARGB8888;
-
        switch(format)
        {
                case GBM_FORMAT_C8: