Revert "Revert "minigbm: replace DRM_FORMAT_MOD_INVALID with DRM_FORMAT_MOD_LINEAR""

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

diff --git a/vgem.c b/vgem.c
index 3b6fb5a..5380b78 100644 (file)
--- a/vgem.c
+++ b/vgem.c
@@ -8,20 +8,41 @@
 #include "helpers.h"
 #include "util.h"
 
-static struct supported_combination combos[2] = {
-       {DRM_FORMAT_ABGR8888, DRM_FORMAT_MOD_NONE,
-               BO_USE_RENDERING | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
-       {DRM_FORMAT_YVU420, DRM_FORMAT_MOD_NONE,
-               BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
-};
+#define MESA_LLVMPIPE_TILE_ORDER 6
+#define MESA_LLVMPIPE_TILE_SIZE (1 << MESA_LLVMPIPE_TILE_ORDER)
+
+static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB8888,
+                                                 DRM_FORMAT_RGB565, DRM_FORMAT_XBGR8888,
+                                                 DRM_FORMAT_XRGB8888 };
+
+static const uint32_t texture_source_formats[] = { DRM_FORMAT_R8, DRM_FORMAT_YVU420,
+                                                  DRM_FORMAT_YVU420_ANDROID };
 
 static int vgem_init(struct driver *drv)
 {
-       drv_insert_combinations(drv, combos, ARRAY_SIZE(combos));
-       return 0;
+       drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
+                            &LINEAR_METADATA, BO_USE_RENDER_MASK);
+
+       drv_add_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats),
+                            &LINEAR_METADATA, BO_USE_TEXTURE_MASK);
+
+       return drv_modify_linear_combinations(drv);
+}
+
+static int vgem_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
+                         uint64_t flags)
+{
+       width = ALIGN(width, MESA_LLVMPIPE_TILE_SIZE);
+       height = ALIGN(height, MESA_LLVMPIPE_TILE_SIZE);
+
+       /* HAL_PIXEL_FORMAT_YV12 requires that the buffer's height not be aligned. */
+       if (bo->format == DRM_FORMAT_YVU420_ANDROID)
+               height = bo->height;
+
+       return drv_dumb_bo_create(bo, width, height, format, flags);
 }
 
-static uint32_t vgem_resolve_format(uint32_t format)
+static uint32_t vgem_resolve_format(uint32_t format, uint64_t flags)
 {
        switch (format) {
        case DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED:
@@ -34,13 +55,13 @@ static uint32_t vgem_resolve_format(uint32_t format)
        }
 }
 
-struct backend backend_vgem =
-{
+const struct backend backend_vgem = {
        .name = "vgem",
        .init = vgem_init,
-       .bo_create = drv_dumb_bo_create,
+       .bo_create = vgem_bo_create,
        .bo_destroy = drv_dumb_bo_destroy,
+       .bo_import = drv_prime_bo_import,
        .bo_map = drv_dumb_bo_map,
+       .bo_unmap = drv_bo_munmap,
        .resolve_format = vgem_resolve_format,
 };
-