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

Commit c5e0a295 authored by Lu, Shenghua's avatar Lu, Shenghua Committed by Shuo Gao
Browse files

update parameters in uploadToTexture() for GLES20 



Google optimized the uploadToTexture with GLES3.0+,
This allows us to upload a sub-rectangle of texture,
but this has compliance issue with GLES 2.0.

With OpenGL ES 2.0 we need to copy the bitmap in a
temporary buffer if the stride doesn't match the width,
and then upload entire temporary stripes.

Change-Id: I8987cd8347913c61b7fa45bd47be1189aa6bdb05
Signed-off-by: default avatarShenghua Lu <shenghua.lu@intel.com>
Signed-off-by: default avatarShuo Gao <shuo.gao@intel.com>
Signed-off-by: default avatarGuobin <Zhang&lt;guobin.zhang@intel.com>
parent 77d28ca2

libs/hwui/TextureCache.cpp

+39 −17
Original line number Diff line number Diff line
@@ -242,19 +242,19 @@ void TextureCache::generateTexture(SkBitmap* bitmap, Texture* texture, bool rege 
    switch (bitmap->getConfig()) {

    case SkBitmap::kA8_Config:

        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);

        uploadToTexture(resize, GL_ALPHA, bitmap->rowBytesAsPixels(),

        uploadToTexture(resize, GL_ALPHA, bitmap->rowBytesAsPixels(), bitmap->bytesPerPixel(),

                texture->width, texture->height, GL_UNSIGNED_BYTE, bitmap->getPixels());

        texture->blend = true;

        break;

    case SkBitmap::kRGB_565_Config:

        glPixelStorei(GL_UNPACK_ALIGNMENT, bitmap->bytesPerPixel());

        uploadToTexture(resize, GL_RGB, bitmap->rowBytesAsPixels(),

        uploadToTexture(resize, GL_RGB, bitmap->rowBytesAsPixels(), bitmap->bytesPerPixel(),

                texture->width, texture->height, GL_UNSIGNED_SHORT_5_6_5, bitmap->getPixels());

        texture->blend = false;

        break;

    case SkBitmap::kARGB_8888_Config:

        glPixelStorei(GL_UNPACK_ALIGNMENT, bitmap->bytesPerPixel());

        uploadToTexture(resize, GL_RGBA, bitmap->rowBytesAsPixels(),

        uploadToTexture(resize, GL_RGBA, bitmap->rowBytesAsPixels(), bitmap->bytesPerPixel(),

                texture->width, texture->height, GL_UNSIGNED_BYTE, bitmap->getPixels());

        // Do this after calling getPixels() to make sure Skia's deferred

        // decoding happened
@@ -294,15 +294,14 @@ void TextureCache::uploadLoFiTexture(bool resize, SkBitmap* bitmap, 
    SkCanvas canvas(rgbaBitmap);

    canvas.drawBitmap(*bitmap, 0.0f, 0.0f, NULL);



    uploadToTexture(resize, GL_RGBA, rgbaBitmap.rowBytesAsPixels(), width, height,

            GL_UNSIGNED_BYTE, rgbaBitmap.getPixels());

    uploadToTexture(resize, GL_RGBA, rgbaBitmap.rowBytesAsPixels(), rgbaBitmap.bytesPerPixel(),

            width, height, GL_UNSIGNED_BYTE, rgbaBitmap.getPixels());

}



void TextureCache::uploadToTexture(bool resize, GLenum format, GLsizei stride,

void TextureCache::uploadToTexture(bool resize, GLenum format, GLsizei stride, GLsizei bpp,

        GLsizei width, GLsizei height, GLenum type, const GLvoid * data) {

    // TODO: With OpenGL ES 2.0 we need to copy the bitmap in a temporary buffer

    //       if the stride doesn't match the width

    const bool useStride = stride != width && Extensions::getInstance().hasUnpackRowLength();

    if ((stride == width) || useStride) {

        if (useStride) {

            glPixelStorei(GL_UNPACK_ROW_LENGTH, stride);

        }
@@ -316,6 +315,29 @@ void TextureCache::uploadToTexture(bool resize, GLenum format, GLsizei stride, 
        if (useStride) {

            glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);

        }

    } else {

        //  With OpenGL ES 2.0 we need to copy the bitmap in a temporary buffer

        //  if the stride doesn't match the width



        GLvoid * temp = (GLvoid *) malloc(width * height * bpp);

        if (!temp) return;



        uint8_t * pDst = (uint8_t *)temp;

        uint8_t * pSrc = (uint8_t *)data;

        for (GLsizei i = 0; i < height; i++) {

            memcpy(pDst, pSrc, width * bpp);

            pDst += width * bpp;

            pSrc += stride * bpp;

        }



        if (resize) {

            glTexImage2D(GL_TEXTURE_2D, 0, format, width, height, 0, format, type, temp);

        } else {

            glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format, type, temp);

        }



        free(temp);

    }

}



}; // namespace uirenderer

libs/hwui/TextureCache.h

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ private: 
    void generateTexture(SkBitmap* bitmap, Texture* texture, bool regenerate = false);



    void uploadLoFiTexture(bool resize, SkBitmap* bitmap, uint32_t width, uint32_t height);

    void uploadToTexture(bool resize, GLenum format, GLsizei stride,

    void uploadToTexture(bool resize, GLenum format, GLsizei stride, GLsizei bpp,

            GLsizei width, GLsizei height, GLenum type, const GLvoid * data);



    void init();