diff options
author | ChengYou Ho <chengyouho@google.com> | 2018-10-16 16:12:50 +0800 |
---|---|---|
committer | Chengyou Ho <chengyouho@google.com> | 2018-10-16 08:48:29 +0000 |
commit | ee59bc0b26b9f281808e2398752abe06f794e130 (patch) | |
tree | 77a7f2bc536bfb6508bd55d70a634e4e4b4c5ffd /gralloc/gr_priv_handle.h | |
parent | b9c9f94fb29f1d2854b0a5e768dae7bd078d186b (diff) | |
parent | bdbe838f2355072b8f6c59766bd9feae9464cee6 (diff) | |
download | android_hardware_qcom_sdm710_display-ee59bc0b26b9f281808e2398752abe06f794e130.tar.gz android_hardware_qcom_sdm710_display-ee59bc0b26b9f281808e2398752abe06f794e130.tar.bz2 android_hardware_qcom_sdm710_display-ee59bc0b26b9f281808e2398752abe06f794e130.zip |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.08.00.00.478.098' into pi-dev
Bug: 117810284
Change-Id: I01c6d91c6a39ba09d5f4edaf42c16bc5f83cf2ab
Diffstat (limited to 'gralloc/gr_priv_handle.h')
-rw-r--r-- | gralloc/gr_priv_handle.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gralloc/gr_priv_handle.h b/gralloc/gr_priv_handle.h index 1eb03b81..d0681d78 100644 --- a/gralloc/gr_priv_handle.h +++ b/gralloc/gr_priv_handle.h @@ -33,6 +33,7 @@ typedef gralloc1_error_t (*GRALLOC1_PFN_PERFORM)(gralloc1_device_t *device, int #define PRIV_HANDLE_CONST(exp) static_cast<const private_handle_t *>(exp) +#pragma pack(push, 4) struct private_handle_t : public native_handle_t { enum { PRIV_FLAGS_FRAMEBUFFER = 0x00000001, @@ -74,15 +75,15 @@ struct private_handle_t : public native_handle_t { int format; int buffer_type; unsigned int layer_count; - uint64_t id __attribute__((aligned(8))); - uint64_t usage __attribute__((aligned(8))); + uint64_t id; + uint64_t usage; unsigned int size; unsigned int offset; unsigned int offset_metadata; - uint64_t base __attribute__((aligned(8))); - uint64_t base_metadata __attribute__((aligned(8))); - uint64_t gpuaddr __attribute__((aligned(8))); + uint64_t base; + uint64_t base_metadata; + uint64_t gpuaddr; static const int kNumFds = 2; static const int kMagic = 'gmsm'; @@ -172,5 +173,6 @@ struct private_handle_t : public native_handle_t { uint64_t GetBackingstore() const { return id; } }; +#pragma pack(pop) #endif // __GR_PRIV_HANDLE_H__ |