Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ce6ef77 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Validate STRIDE" into udc-dev am: f157a03a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22257394



Change-Id: I5a1cb809c4abacca1ee94023bb6e5da6163c359d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d39f9d46 f157a03a

libs/ui/Gralloc5.cpp

+6 −8
Original line number Diff line number Diff line
@@ -352,14 +352,12 @@ status_t Gralloc5Mapper::validateBufferSize(buffer_handle_t bufferHandle, uint32 
        }

    }

    {

        (void)stride;

        // TODO(b/261856851): Add StandardMetadataType::STRIDE && enable this

        //        auto value = getStandardMetadata<StandardMetadataType::STRIDE>(mMapper,

        //        bufferHandle); if (static_cast<BufferUsage>(usage) != value) {

        //            ALOGW("Layer count didn't match, expected %" PRIu64 " got %" PRId64, usage,

        //                  static_cast<int64_t>(value.value_or(BufferUsage::CPU_READ_NEVER)));

        //            return BAD_VALUE;

        //        }

        auto value = getStandardMetadata<StandardMetadataType::STRIDE>(mMapper, bufferHandle);

        if (stride != value) {

            ALOGW("Stride didn't match, expected %" PRIu32 " got %" PRId32, stride,

                  value.value_or(-1));

            return BAD_VALUE;

        }

    }

    return OK;

}