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

Commit cd176cd4 authored by Saurabh Shah's avatar Saurabh Shah Committed by Steve Kondik
Browse files

frameworks/base: Use textures in LayerDim for smooth menu scrolling. 

Disable the use of DIM_WITH_TEXTURE flag which uses OpenGL textures for a specific platform.
If Display Hardware uses SLOW_CONFIG, use OpenGL textures for speedup.
This improves scrolling response in LayerDim menus.

Change-Id: Icda97eaab3e0745e5b0841a7f5c866283999356d
CRs-fixed: 253607
parent 8f2dccd0

libs/surfaceflinger/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ LOCAL_SRC_FILES:= \ 
LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\"

LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES



ifeq ($(TARGET_BOARD_PLATFORM), msm7k)

	LOCAL_CFLAGS += -DDIM_WITH_TEXTURE

endif



# need "-lrt" on Linux simulator to pick up clock_gettime

ifeq ($(TARGET_SIMULATOR),true)

	ifeq ($(HOST_OS),linux)

libs/surfaceflinger/LayerDim.cpp

+5 −10
Original line number Diff line number Diff line
@@ -55,10 +55,6 @@ void LayerDim::initDimmer(SurfaceFlinger* flinger, uint32_t w, uint32_t h) 
    sHeight = h;

    sUseTexture = false;



#if defined(DIM_WITH_TEXTURE) && defined(EGL_ANDROID_image_native_buffer)



#warning "using a texture to implement LayerDim"

    

    /* On some h/w like msm7K, it is faster to use a texture because the

     * software renderer will defer to copybit, for this to work we need to

     * use an EGLImage texture so copybit can actually make use of it.
@@ -68,7 +64,8 @@ void LayerDim::initDimmer(SurfaceFlinger* flinger, uint32_t w, uint32_t h) 
    const DisplayHardware& hw(flinger->graphicPlane(0).displayHardware());

    uint32_t flags = hw.getFlags();



    if (LIKELY(flags & DisplayHardware::DIRECT_TEXTURE)) {

    if (LIKELY((flags & DisplayHardware::DIRECT_TEXTURE) &&

        (flags & DisplayHardware::SLOW_CONFIG))) {

        sp<GraphicBuffer> buffer = new GraphicBuffer(w, h, PIXEL_FORMAT_RGB_565,

                 GraphicBuffer::USAGE_SW_WRITE_OFTEN |

                 GraphicBuffer::USAGE_HW_TEXTURE);
@@ -101,7 +98,6 @@ void LayerDim::initDimmer(SurfaceFlinger* flinger, uint32_t w, uint32_t h) 
        buffer->unlock();

        sUseTexture = true;

    }

#endif

}



LayerDim::~LayerDim()
@@ -117,13 +113,13 @@ void LayerDim::onDraw(const Region& clip) const 
        const DisplayHardware& hw(graphicPlane(0).displayHardware());

        const GGLfixed alpha = (s.alpha << 16)/255;

        const uint32_t fbHeight = hw.getHeight();

        const uint32_t flags = hw.getFlags();

        glDisable(GL_DITHER);

        glEnable(GL_BLEND);

        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);

        glColor4x(0, 0, 0, alpha);



#if defined(DIM_WITH_TEXTURE) && defined(EGL_ANDROID_image_native_buffer)

        if (sUseTexture) {

        if (sUseTexture && (flags & DisplayHardware::SLOW_CONFIG)) {

            glBindTexture(GL_TEXTURE_2D, sTexId);

            glEnable(GL_TEXTURE_2D);

            glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
@@ -138,7 +134,6 @@ void LayerDim::onDraw(const Region& clip) const 
            glEnableClientState(GL_TEXTURE_COORD_ARRAY);

            glTexCoordPointer(2, GL_SHORT, 0, texCoords);

        } else

#endif

        {

            glDisable(GL_TEXTURE_2D);

        }