minigbm: rework flag API

[android-x86/external-minigbm.git] / gbm.c

diff --git a/gbm.c b/gbm.c
index 50110ea..89726dd 100644 (file)
--- a/gbm.c
+++ b/gbm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+ * Copyright 2014 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -34,17 +34,15 @@ PUBLIC int
 gbm_device_is_format_supported(struct gbm_device *gbm,
                               uint32_t format, uint32_t usage)
 {
-       uint32_t drv_format;
        uint64_t drv_usage;
 
        if (usage & GBM_BO_USE_CURSOR &&
                usage & GBM_BO_USE_RENDERING)
                return 0;
 
-       drv_format = gbm_convert_format(format);
        drv_usage = gbm_convert_flags(usage);
 
-       return drv_is_format_supported(gbm->drv, drv_format, drv_usage);
+       return (drv_get_combination(gbm->drv, format, drv_usage) != NULL);
 }
 
 PUBLIC struct gbm_device *gbm_create_device(int fd)
@@ -127,8 +125,7 @@ PUBLIC struct gbm_bo *gbm_bo_create(struct gbm_device *gbm, uint32_t width,
        if (!bo)
                return NULL;
 
-       bo->bo = drv_bo_create(gbm->drv, width, height,
-                              gbm_convert_format(format),
+       bo->bo = drv_bo_create(gbm->drv, width, height, format,
                               gbm_convert_flags(flags));
 
        if (!bo->bo) {
@@ -139,6 +136,32 @@ PUBLIC struct gbm_bo *gbm_bo_create(struct gbm_device *gbm, uint32_t width,
        return bo;
 }
 
+PUBLIC struct gbm_bo *gbm_bo_create_with_modifiers(struct gbm_device *gbm,
+                                                  uint32_t width,
+                                                  uint32_t height,
+                                                  uint32_t format,
+                                                  const uint64_t *modifiers,
+                                                  uint32_t count)
+{
+       struct gbm_bo *bo;
+
+       bo = gbm_bo_new(gbm, format);
+
+       if (!bo)
+               return NULL;
+
+       bo->bo = drv_bo_create_with_modifiers(gbm->drv,
+                                             width, height, format,
+                                             modifiers, count);
+
+       if (!bo->bo) {
+               free(bo);
+               return NULL;
+       }
+
+       return bo;
+}
+
 PUBLIC void gbm_bo_destroy(struct gbm_bo *bo)
 {
        if (bo->destroy_user_data) {
@@ -158,33 +181,61 @@ gbm_bo_import(struct gbm_device *gbm, uint32_t type,
        struct gbm_bo *bo;
        struct drv_import_fd_data drv_data;
        struct gbm_import_fd_data *fd_data = buffer;
+       struct gbm_import_fd_planar_data *fd_planar_data = buffer;
+       uint32_t gbm_format;
+       size_t num_planes, i;
 
-       if (type != GBM_BO_IMPORT_FD)
+       memset(&drv_data, 0, sizeof(drv_data));
+
+       switch (type) {
+       case GBM_BO_IMPORT_FD:
+               gbm_format = fd_data->format;
+               drv_data.width = fd_data->width;
+               drv_data.height = fd_data->height;
+               drv_data.format = fd_data->format;
+               drv_data.fds[0] = fd_data->fd;
+               drv_data.strides[0] = fd_data->stride;
+               drv_data.sizes[0] = fd_data->height * fd_data->stride;
+               break;
+       case GBM_BO_IMPORT_FD_PLANAR:
+               gbm_format = fd_planar_data->format;
+               drv_data.width = fd_planar_data->width;
+               drv_data.height = fd_planar_data->height;
+               drv_data.format = fd_planar_data->format;
+               num_planes = drv_num_planes_from_format(drv_data.format);
+
+               assert(num_planes);
+
+               for (i = 0; i < num_planes; i++) {
+                       drv_data.fds[i] = fd_planar_data->fds[i];
+                       drv_data.offsets[i] = fd_planar_data->offsets[i];
+                       drv_data.strides[i] = fd_planar_data->strides[i];
+                       drv_data.format_modifiers[i] =
+                               fd_planar_data->format_modifiers[i];
+
+                       drv_data.sizes[i] = drv_size_from_format(
+                                               drv_data.format,
+                                               drv_data.strides[i],
+                                               drv_data.height,
+                                               i);
+               }
+
+               for (i = num_planes; i < GBM_MAX_PLANES; i++)
+                       drv_data.fds[i] = -1;
+
+               break;
+       default:
                return NULL;
+       }
 
-       if (!gbm_device_is_format_supported(gbm, fd_data->format, usage))
+       if (!gbm_device_is_format_supported(gbm, gbm_format, usage))
                return NULL;
 
-       bo = gbm_bo_new(gbm, fd_data->format);
+       bo = gbm_bo_new(gbm, gbm_format);
 
        if (!bo)
                return NULL;
 
-       /*
-        * Minigbm only supports importing single-plane formats at moment.
-        * If multi-plane import is desired, the interface will have to be
-        * modified.
-        */
-
-       memset(&drv_data, 0, sizeof(drv_data));
-       drv_data.fds[0] = fd_data->fd;
-       drv_data.strides[0] = fd_data->stride;
-       drv_data.offsets[0] = 0;
-       drv_data.sizes[0] = fd_data->height * fd_data->stride;
-       drv_data.width = fd_data->width;
-       drv_data.height = fd_data->height;
-       drv_data.format = gbm_convert_format(fd_data->format);
-
        bo->bo = drv_bo_import(gbm->drv, &drv_data);
 
        if (!bo->bo) {