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

Commit 5b7da3d3 authored by Alex Sakhartchouk's avatar Alex Sakhartchouk Committed by Android (Google) Code Review
Browse files

Merge "Fix for the renderscript ref counting bug."

parents 30e8f982 4b013ee9

libs/rs/rsElement.cpp

+6 −6
Original line number Diff line number Diff line
@@ -263,10 +263,10 @@ void Element::incRefs(const void *ptr) const { 
    const uint8_t *p = static_cast<const uint8_t *>(ptr);

    for (uint32_t i=0; i < mFieldCount; i++) {

        if (mFields[i].e->mHasReference) {

            p = &p[mFields[i].offsetBits >> 3];

            const uint8_t *p2 = &p[mFields[i].offsetBits >> 3];

            for (uint32_t ct=0; ct < mFields[i].arraySize; ct++) {

                mFields[i].e->incRefs(p);

                p += mFields[i].e->getSizeBytes();

                mFields[i].e->incRefs(p2);

                p2 += mFields[i].e->getSizeBytes();

            }

        }

    }
@@ -285,10 +285,10 @@ void Element::decRefs(const void *ptr) const { 
    const uint8_t *p = static_cast<const uint8_t *>(ptr);

    for (uint32_t i=0; i < mFieldCount; i++) {

        if (mFields[i].e->mHasReference) {

            p = &p[mFields[i].offsetBits >> 3];

            const uint8_t *p2 = &p[mFields[i].offsetBits >> 3];

            for (uint32_t ct=0; ct < mFields[i].arraySize; ct++) {

                mFields[i].e->decRefs(p);

                p += mFields[i].e->getSizeBytes();

                mFields[i].e->decRefs(p2);

                p2 += mFields[i].e->getSizeBytes();

            }

        }

    }