Update Android.bp after merge

[android-x86/external-minigbm.git] / drv.h

diff --git a/drv.h b/drv.h
index 39fd5dd..4a47b76 100644 (file)
--- a/drv.h
+++ b/drv.h
@@ -12,6 +12,7 @@ extern "C" {
 #endif
 
 #include <drm_fourcc.h>
+#include <stdbool.h>
 #include <stdint.h>
 
 #define DRV_MAX_PLANES 4
@@ -35,7 +36,8 @@ extern "C" {
 #define BO_USE_SW_WRITE_RARELY         (1ull << 12)
 #define BO_USE_HW_VIDEO_DECODER         (1ull << 13)
 #define BO_USE_HW_VIDEO_ENCODER         (1ull << 14)
-#define BO_USE_RENDERSCRIPT            (1ull << 15)
+#define BO_USE_TEST_ALLOC              (1ull << 15)
+#define BO_USE_RENDERSCRIPT            (1ull << 16)
 
 /* Quirks for allocating a buffer. */
 #define BO_QUIRK_NONE                  0
@@ -87,6 +89,7 @@ struct drv_import_fd_data {
        uint32_t width;
        uint32_t height;
        uint32_t format;
+       uint32_t tiling;
        uint64_t use_flags;
 };
 
@@ -124,7 +127,7 @@ const char *drv_get_name(struct driver *drv);
 struct combination *drv_get_combination(struct driver *drv, uint32_t format, uint64_t use_flags);
 
 struct bo *drv_bo_new(struct driver *drv, uint32_t width, uint32_t height, uint32_t format,
-                     uint64_t use_flags);
+                     uint64_t use_flags, bool is_test_buffer);
 
 struct bo *drv_bo_create(struct driver *drv, uint32_t width, uint32_t height, uint32_t format,
                         uint64_t use_flags);
@@ -143,6 +146,8 @@ int drv_bo_unmap(struct bo *bo, struct mapping *mapping);
 
 int drv_bo_invalidate(struct bo *bo, struct mapping *mapping);
 
+int drv_bo_flush(struct bo *bo, struct mapping *mapping);
+
 int drv_bo_flush_or_unmap(struct bo *bo, struct mapping *mapping);
 
 uint32_t drv_bo_get_width(struct bo *bo);
@@ -173,8 +178,13 @@ uint32_t drv_resolve_format(struct driver *drv, uint32_t format, uint64_t use_fl
 
 size_t drv_num_planes_from_format(uint32_t format);
 
+size_t drv_num_planes_from_modifier(struct driver *drv, uint32_t format, uint64_t modifier);
+
 uint32_t drv_num_buffers_per_bo(struct bo *bo);
 
+int drv_resource_info(struct bo *bo, uint32_t strides[DRV_MAX_PLANES],
+                     uint32_t offsets[DRV_MAX_PLANES]);
+
 #define drv_log(format, ...)                                                                       \
        do {                                                                                       \
                drv_log_prefix("minigbm", __FILE__, __LINE__, format, ##__VA_ARGS__);              \