| Révision | 9b65142921951368fa53e48508b388cadeb55854 (tree) |
|---|---|
| l'heure | 2015-11-14 01:18:41 |
| Auteur | Mauro Rossi <issor.oruam@gmai...> |
| Commiter | Chih-Wei Huang |
fix GRALLOC_DRM_HANDLE_NUM_INTS definition for 64-bit
As highlighted by pstglia current definition of GRALLOC_DRM_HANDLE_NUM_INTS
causes issues with 64-bit, because a pointer is accounted as having size of
an integer, which is not applicable to 64-bit pointer
The same definition adopted in AOSP hardware/drm_gralloc master branch has
been used, without changing the structure of gralloc_drm_handle_t.
gralloc_drm_handle.h (diff)| @@ -36,9 +36,6 @@ struct gralloc_drm_bo_t; | ||
| 36 | 36 | struct gralloc_drm_handle_t { |
| 37 | 37 | native_handle_t base; |
| 38 | 38 | |
| 39 | -#define GRALLOC_DRM_HANDLE_MAGIC 0x12345678 | |
| 40 | -#define GRALLOC_DRM_HANDLE_NUM_INTS 10 | |
| 41 | -#define GRALLOC_DRM_HANDLE_NUM_FDS 0 | |
| 42 | 39 | int magic; |
| 43 | 40 | |
| 44 | 41 | int width; |
| @@ -55,6 +52,12 @@ struct gralloc_drm_handle_t { | ||
| 55 | 52 | struct gralloc_drm_bo_t *data; /* pointer to struct gralloc_drm_bo_t */ |
| 56 | 53 | }; |
| 57 | 54 | |
| 55 | +#define GRALLOC_DRM_HANDLE_MAGIC 0x12345678 | |
| 56 | +#define GRALLOC_DRM_HANDLE_NUM_FDS 0 | |
| 57 | +#define GRALLOC_DRM_HANDLE_NUM_INTS ( \ | |
| 58 | + ((sizeof(struct gralloc_drm_handle_t) - sizeof(native_handle_t))/sizeof(int)) \ | |
| 59 | + - GRALLOC_DRM_HANDLE_NUM_FDS) | |
| 60 | + | |
| 58 | 61 | static inline struct gralloc_drm_handle_t *gralloc_drm_handle(buffer_handle_t _handle) |
| 59 | 62 | { |
| 60 | 63 | struct gralloc_drm_handle_t *handle = |
Android-x86
Fork