OSDN Git Service
(root)
/
android-x86
/
external-drm_gralloc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'x86/lollipop-x86' into marshmallow-x86
[android-x86/external-drm_gralloc.git]
/
gralloc_drm_handle.h
diff --git
a/gralloc_drm_handle.h
b/gralloc_drm_handle.h
index
968f11e
..
f9cc626
100644
(file)
--- a/
gralloc_drm_handle.h
+++ b/
gralloc_drm_handle.h
@@
-36,9
+36,6
@@
struct gralloc_drm_bo_t;
struct gralloc_drm_handle_t {
native_handle_t base;
struct gralloc_drm_handle_t {
native_handle_t base;
-#define GRALLOC_DRM_HANDLE_MAGIC 0x12345678
-#define GRALLOC_DRM_HANDLE_NUM_INTS 10
-#define GRALLOC_DRM_HANDLE_NUM_FDS 0
int magic;
int width;
int magic;
int width;
@@
-55,6
+52,12
@@
struct gralloc_drm_handle_t {
struct gralloc_drm_bo_t *data; /* pointer to struct gralloc_drm_bo_t */
};
struct gralloc_drm_bo_t *data; /* pointer to struct gralloc_drm_bo_t */
};
+#define GRALLOC_DRM_HANDLE_MAGIC 0x12345678
+#define GRALLOC_DRM_HANDLE_NUM_FDS 0
+#define GRALLOC_DRM_HANDLE_NUM_INTS ( \
+ ((sizeof(struct gralloc_drm_handle_t) - sizeof(native_handle_t))/sizeof(int)) \
+ - GRALLOC_DRM_HANDLE_NUM_FDS)
+
static inline struct gralloc_drm_handle_t *gralloc_drm_handle(buffer_handle_t _handle)
{
struct gralloc_drm_handle_t *handle =
static inline struct gralloc_drm_handle_t *gralloc_drm_handle(buffer_handle_t _handle)
{
struct gralloc_drm_handle_t *handle =