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

Commit a8f2c2b4 authored by Jason Sams's avatar Jason Sams Committed by Android Git Automerger
Browse files

am 902051df: Merge change I0e27b5ca into eclair 

Merge commit '902051df' into eclair-mr2

* commit '902051df':
  Fix texture upload bug for narrow texture of less than 32bpp.
parents f53f86a7 902051df

libs/rs/rsAllocation.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -104,6 +104,7 @@ void Allocation::uploadToTexture(uint32_t lodOffset) 
        glGenTextures(1, &mTextureID);

        glGenTextures(1, &mTextureID);

    }

    }

    glBindTexture(GL_TEXTURE_2D, mTextureID);

    glBindTexture(GL_TEXTURE_2D, mTextureID);

    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);





    Adapter2D adapt(getContext(), this);

    Adapter2D adapt(getContext(), this);

    for(uint32_t lod = 0; (lod + lodOffset) < mType->getLODCount(); lod++) {

    for(uint32_t lod = 0; (lod + lodOffset) < mType->getLODCount(); lod++) {