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

Commit 27167493 authored by Sai Kiran Korwar's avatar Sai Kiran Korwar Committed by Geoffrey Pitsch
Browse files

BootAnimation: Use npot textures 

If non power of two textures are supported, then use
npot texture for specifying the images supplied by vendor.
This will reduce the memory footprint of the app by a considerable
amount.

Bug: 28865582
Bug: 30040263
Change-Id: I5cef98fb013318d60d8a648041c9665da68c0ff3
parent 3cc69357

cmds/bootanimation/BootAnimation.cpp

+18 −4
Original line number Diff line number Diff line
@@ -202,25 +202,25 @@ status_t BootAnimation::initTexture(const Animation::Frame& frame) 


    switch (bitmap.colorType()) {

        case kN32_SkColorType:

            if (tw != w || th != h) {

            if (!mUseNpotTextures && (tw != w || th != h)) {

                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tw, th, 0, GL_RGBA,

                        GL_UNSIGNED_BYTE, 0);

                glTexSubImage2D(GL_TEXTURE_2D, 0,

                        0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, p);

            } else {

                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tw, th, 0, GL_RGBA,

                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA,

                        GL_UNSIGNED_BYTE, p);

            }

            break;



        case kRGB_565_SkColorType:

            if (tw != w || th != h) {

            if (!mUseNpotTextures && (tw != w || th != h)) {

                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, tw, th, 0, GL_RGB,

                        GL_UNSIGNED_SHORT_5_6_5, 0);

                glTexSubImage2D(GL_TEXTURE_2D, 0,

                        0, 0, w, h, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, p);

            } else {

                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, tw, th, 0, GL_RGB,

                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, w, h, 0, GL_RGB,

                        GL_UNSIGNED_SHORT_5_6_5, p);

            }

            break;
@@ -695,6 +695,20 @@ bool BootAnimation::movie() 
        mClockEnabled = false;

    }



    // Check if npot textures are supported

    mUseNpotTextures = false;

    String8 gl_extensions;

    const char* exts = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS));

    if (!exts) {

        glGetError();

    } else {

        gl_extensions.setTo(exts);

        if ((gl_extensions.find("GL_ARB_texture_non_power_of_two") != -1) ||

            (gl_extensions.find("GL_OES_texture_npot") != -1)) {

            mUseNpotTextures = true;

        }

    }



    // Blend required to draw time on top of animation frames.

    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

    glShadeModel(GL_FLAT);

cmds/bootanimation/BootAnimation.h

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ private: 
    Texture     mClock;

    int         mWidth;

    int         mHeight;

    bool        mUseNpotTextures = false;

    EGLDisplay  mDisplay;

    EGLDisplay  mContext;

    EGLDisplay  mSurface;