[automerger skipped] Adds Android.bp files back after merge. am: 1e4aff7321 -s ours

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

diff --git a/meson.c b/meson.c
index bfbf4e6..f82c57a 100644 (file)
--- a/meson.c
+++ b/meson.c
@@ -12,24 +12,13 @@
 
 static const uint32_t scanout_render_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888,
                                                   DRM_FORMAT_ABGR8888, DRM_FORMAT_XBGR8888,
-                                                  DRM_FORMAT_BGR888,   DRM_FORMAT_BGR565 };
-
-static const uint32_t texture_only_formats[] = { DRM_FORMAT_NV12, DRM_FORMAT_NV21,
-                                                DRM_FORMAT_YVU420, DRM_FORMAT_YVU420_ANDROID };
+                                                  DRM_FORMAT_BGR888, DRM_FORMAT_BGR565};
 
 static int meson_init(struct driver *drv)
 {
        drv_add_combinations(drv, scanout_render_formats, ARRAY_SIZE(scanout_render_formats),
                             &LINEAR_METADATA, BO_USE_RENDER_MASK | BO_USE_SCANOUT);
 
-       drv_add_combinations(drv, texture_only_formats, ARRAY_SIZE(texture_only_formats),
-                            &LINEAR_METADATA, BO_USE_TEXTURE_MASK);
-
-       drv_modify_combination(drv, DRM_FORMAT_NV12, &LINEAR_METADATA,
-                              BO_USE_HW_VIDEO_ENCODER | BO_USE_HW_VIDEO_DECODER |
-                                  BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE);
-       drv_modify_combination(drv, DRM_FORMAT_NV21, &LINEAR_METADATA, BO_USE_HW_VIDEO_ENCODER);
-
        return drv_modify_linear_combinations(drv);
 }