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

Commit 22c66639 authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge "Fixes for 64bit in libhwui"

parents 05cebdc2 73fc558e

libs/hwui/DisplayListOp.h

+1 −1
Original line number Diff line number Diff line
@@ -1444,7 +1444,7 @@ public: 
                DeferredDisplayList::kOpBatch_Text :

                DeferredDisplayList::kOpBatch_ColorText;



        deferInfo.mergeId = (mergeid_t)mPaint->getColor();

        deferInfo.mergeId = reinterpret_cast<mergeid_t>(mPaint->getColor());



        // don't merge decorated text - the decorations won't draw in order

        bool noDecorations = !(mPaint->getFlags() & (SkPaint::kUnderlineText_Flag |

libs/hwui/PixelBuffer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ void GpuPixelBuffer::upload(uint32_t x, uint32_t y, uint32_t width, uint32_t hei 
    mCaches.bindPixelBuffer(mBuffer);

    unmap();

    glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, mFormat,

            GL_UNSIGNED_BYTE, (void*) offset);

            GL_UNSIGNED_BYTE, reinterpret_cast<void*>(offset));

}



///////////////////////////////////////////////////////////////////////////////