diff options
Diffstat (limited to 'gralloc960/gralloc_priv.h')
| -rw-r--r-- | gralloc960/gralloc_priv.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gralloc960/gralloc_priv.h b/gralloc960/gralloc_priv.h index a9453549..55feb67e 100644 --- a/gralloc960/gralloc_priv.h +++ b/gralloc960/gralloc_priv.h @@ -162,7 +162,7 @@ struct private_handle_t int share_fd; int share_attr_fd; - ion_user_handle_t ion_hnd; + ion_user_handle_t ion_hnd_UNUSED; // ints int magic; @@ -183,7 +183,7 @@ struct private_handle_t }; int lockState; int writeOwner; - int pid; + int pid_UNUSED; // locally mapped shared attribute area union { @@ -194,7 +194,7 @@ struct private_handle_t mali_gralloc_yuv_info yuv_info; // Following members is for framebuffer only - int fd; + int shallow_fbdev_fd; // shallow copy, not dup'ed union { off_t offset; uint64_t padding4; @@ -209,7 +209,8 @@ struct private_handle_t #ifdef __cplusplus /* * We track the number of integers in the structure. There are 16 unconditional - * integers (magic - pid, yuv_info, fd and offset). Note that the fd element is + * integers (magic - pid, yuv_info, shallow_fbdev_fd and offset). + * Note that the shallow_fbdev_fd element is * considered an int not an fd because it is not intended to be used outside the * surface flinger process. The GRALLOC_ARM_NUM_INTS variable is used to track the * number of integers that are conditionally included. Similar considerations apply @@ -221,7 +222,7 @@ struct private_handle_t private_handle_t(int _flags, int _usage, int _size, void *_base, int lock_state, int fb_file, off_t fb_offset): share_fd(-1), share_attr_fd(-1), - ion_hnd(-1), + ion_hnd_UNUSED(-1), magic(sMagic), flags(_flags), usage(_usage), @@ -232,10 +233,10 @@ struct private_handle_t base(_base), lockState(lock_state), writeOwner(0), - pid(getpid()), + pid_UNUSED(-1), attr_base(MAP_FAILED), yuv_info(MALI_YUV_NO_INFO), - fd(fb_file), + shallow_fbdev_fd(fb_file), offset(fb_offset) { version = sizeof(native_handle); |