Merge tag 'LA.QSSI.14.0.r1-14000-qssi.0' into staging/lineage-21.0_merge-LA.QSSI.14.0.r1-14000-qssi.0

LA.QSSI.14.0.r1-14000-qssi.0

* tag 'LA.QSSI.14.0.r1-14000-qssi.0':
  gralloc: Fix AOSP Clang Compiler error

 Conflicts:
	gralloc/QtiGrallocPriv.h
	gralloc/gr_priv_handle.h

Change-Id: I852a0852acf3ff5df9249c471aec457d70b1e79c
This commit is contained in:
Michael Bestas
2024-04-19 23:17:03 +03:00
2 changed files with 6 additions and 6 deletions

View File

@@ -190,12 +190,12 @@ struct private_handle_t : public native_handle_t {
#ifdef GRALLOC_HANDLE_HAS_RESERVED_SIZE
,reserved_size(0)
#endif
#ifdef GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE
,custom_content_md_reserved_size(0)
#endif
#ifdef GRALLOC_HANDLE_HAS_UBWCP_FORMAT
,linear_size(0)
,ubwcp_format(format)
#endif
#ifdef GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE
,custom_content_md_reserved_size(0)
#endif
{
version = static_cast<int>(sizeof(native_handle));

View File

@@ -140,12 +140,12 @@ struct private_handle_t {
#ifdef GRALLOC_HANDLE_HAS_RESERVED_SIZE
,reserved_size(0)
#endif
#ifdef GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE
,custom_content_md_reserved_size(0)
#endif
#ifdef GRALLOC_HANDLE_HAS_UBWCP_FORMAT
,linear_size(0)
,ubwcp_format(format)
#endif
#ifdef GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE
,custom_content_md_reserved_size(0)
#endif
{
version = static_cast<int>(sizeof(native_handle));