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

Commit 433517b0 authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Fix 32&24 ->16 bit bitmap uploads."

parents 7493c528 0ebd5690

libs/rs/rsAllocation.cpp

+6 −2
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ static ElementConverter_t pickConverter(const Element *dst, const Element *src) 
    if (srcGLType == GL_UNSIGNED_BYTE &&

        srcGLFmt == GL_RGB &&

        dstGLType == GL_UNSIGNED_SHORT_5_6_5 &&

        dstGLType == GL_RGB) {

        dstGLFmt == GL_RGB) {



        return elementConverter_888_to_565;

    }
@@ -567,12 +567,16 @@ static ElementConverter_t pickConverter(const Element *dst, const Element *src) 
    if (srcGLType == GL_UNSIGNED_BYTE &&

        srcGLFmt == GL_RGBA &&

        dstGLType == GL_UNSIGNED_SHORT_5_6_5 &&

        dstGLType == GL_RGB) {

        dstGLFmt == GL_RGB) {



        return elementConverter_8888_to_565;

    }



    LOGE("pickConverter, unsuported combo, src %p,  dst %p", src, dst);

    LOGE("pickConverter, srcGLType = %x,  srcGLFmt = %x", srcGLType, srcGLFmt);

    LOGE("pickConverter, dstGLType = %x,  dstGLFmt = %x", dstGLType, dstGLFmt);

    src->dumpLOGV("SRC ");

    dst->dumpLOGV("DST ");

    return 0;

}