X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=gbm_priv.h;h=3dc1e5944584f17554346fa2394e1e2f54bd245d;hb=4b5d0bf2ab4da0f475f01575fb369b7eb9415d7c;hp=5c35505286055ed5b1cd6d637dc7ad32d6dccc61;hpb=96c7a3bf4c04a52d04f2b2cb8070d662ca337a7d;p=android-x86%2Fexternal-minigbm.git

diff --git a/gbm_priv.h b/gbm_priv.h
index 5c35505..3dc1e59 100644
--- a/gbm_priv.h
+++ b/gbm_priv.h
@@ -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.
  */
@@ -8,52 +8,25 @@
 #define GBM_PRIV_H
 
 #include <stdint.h>
-#include <sys/types.h>
 #include <stdlib.h>
-#include "gbm.h"
+#include <sys/types.h>
 
-#define GBM_MAX_PLANES 4
+#include "drv.h"
+#include "gbm.h"
 
-struct gbm_device
-{
-	int fd;
-	struct gbm_driver *driver;
-	void *priv;
+struct gbm_device {
+	struct driver *drv;
 };
 
-struct gbm_surface
-{
+struct gbm_surface {
 };
 
-struct gbm_bo
-{
+struct gbm_bo {
 	struct gbm_device *gbm;
-	uint32_t width;
-	uint32_t height;
-	uint32_t format;
-	uint32_t tiling;
-	size_t num_planes;
-	union gbm_bo_handle handles[GBM_MAX_PLANES];
-	uint32_t offsets[GBM_MAX_PLANES];
-	uint32_t sizes[GBM_MAX_PLANES];
-	uint32_t strides[GBM_MAX_PLANES];
-	void *priv;
+	struct bo *bo;
+	uint32_t gbm_format;
 	void *user_data;
 	void (*destroy_user_data)(struct gbm_bo *, void *);
 };
 
-struct gbm_driver
-{
-	char *name;
-	int (*init)(struct gbm_device *gbm);
-	void (*close)(struct gbm_device *gbm);
-	int (*bo_create)(struct gbm_bo *bo, uint32_t width, uint32_t height, uint32_t format, uint32_t flags);
-	int (*bo_destroy)(struct gbm_bo *bo);
-	struct format_supported {
-		uint32_t format;
-		enum gbm_bo_flags usage;
-	}
-	format_list[10];
-};
-
 #endif