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

Commit 230d77c6 authored by Koushik Dutta's avatar Koushik Dutta Committed by Gerrit Code Review
Browse files

Merge "Durteh hacks to enable ElectronBeam on devices with SoftEGL. Been... 

Merge "Durteh hacks to enable ElectronBeam on devices with SoftEGL. Been running this for a while now with no impact to system. Can still be turned on/off in CMParts." into gingerbread
parents 30e78650 3630a266

services/surfaceflinger/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ endif 
ifeq ($(TARGET_BOARD_PLATFORM), s5pc110)

	LOCAL_CFLAGS += -DHAS_CONTEXT_PRIORITY

endif

ifeq ($(BOARD_HAS_LIMITED_EGL), true)

	LOCAL_CFLAGS += -DHAS_LIMITED_EGL

endif





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

services/surfaceflinger/SurfaceFlinger.cpp

+4 −1
Original line number Diff line number Diff line
@@ -1648,8 +1648,10 @@ status_t SurfaceFlinger::electronBeamOffAnimationImplLocked() 
{

    status_t result = PERMISSION_DENIED;



#ifndef HAS_LIMITED_EGL

    if (!GLExtensions::getInstance().haveFramebufferObject())

        return INVALID_OPERATION;

#endif



    // get screen geometry

    const DisplayHardware& hw(graphicPlane(0).displayHardware());
@@ -1791,9 +1793,10 @@ status_t SurfaceFlinger::electronBeamOnAnimationImplLocked() 
{

    status_t result = PERMISSION_DENIED;



#ifndef HAS_LIMITED_EGL

    if (!GLExtensions::getInstance().haveFramebufferObject())

        return INVALID_OPERATION;



#endif



    // get screen geometry

    const DisplayHardware& hw(graphicPlane(0).displayHardware());