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

Commit c6e7167a authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Remove obsolete debug option"

parents 5c1b9613 a672f6ba

libs/hwui/Properties.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ bool Properties::debugLayersUpdates = false; 
bool Properties::debugOverdraw = false;

bool Properties::debugOverdraw = false;

bool Properties::showDirtyRegions = false;

bool Properties::showDirtyRegions = false;

bool Properties::skipEmptyFrames = true;

bool Properties::skipEmptyFrames = true;

bool Properties::swapBuffersWithDamage = true;

bool Properties::useBufferAge = true;

bool Properties::useBufferAge = true;

bool Properties::enablePartialUpdates = true;

bool Properties::enablePartialUpdates = true;
@@ -117,7 +116,6 @@ bool Properties::load() { 
    }

    }





    skipEmptyFrames = property_get_bool(PROPERTY_SKIP_EMPTY_DAMAGE, true);

    skipEmptyFrames = property_get_bool(PROPERTY_SKIP_EMPTY_DAMAGE, true);

    swapBuffersWithDamage = property_get_bool(PROPERTY_SWAP_WITH_DAMAGE, true);

    useBufferAge = property_get_bool(PROPERTY_USE_BUFFER_AGE, true);

    useBufferAge = property_get_bool(PROPERTY_USE_BUFFER_AGE, true);

    enablePartialUpdates = property_get_bool(PROPERTY_ENABLE_PARTIAL_UPDATES, true);

    enablePartialUpdates = property_get_bool(PROPERTY_ENABLE_PARTIAL_UPDATES, true);

libs/hwui/Properties.h

+0 −9
Original line number Original line Diff line number Diff line
@@ -141,13 +141,6 @@ enum DebugLevel { 
 */

 */

#define PROPERTY_SKIP_EMPTY_DAMAGE "debug.hwui.skip_empty_damage"

#define PROPERTY_SKIP_EMPTY_DAMAGE "debug.hwui.skip_empty_damage"





/**

 * Setting this property will enable or disable usage of EGL_KHR_swap_buffers_with_damage

 * See: https://www.khronos.org/registry/egl/extensions/KHR/EGL_KHR_swap_buffers_with_damage.txt

 * Default is "true"

 */

#define PROPERTY_SWAP_WITH_DAMAGE "debug.hwui.swap_with_damage"



/**

/**

 * Controls whether or not HWUI will use the EGL_EXT_buffer_age extension

 * Controls whether or not HWUI will use the EGL_EXT_buffer_age extension

 * to do partial invalidates. Setting this to "false" will fall back to

 * to do partial invalidates. Setting this to "false" will fall back to
@@ -271,8 +264,6 @@ public: 
    static bool showDirtyRegions;

    static bool showDirtyRegions;

    // TODO: Remove after stabilization period

    // TODO: Remove after stabilization period

    static bool skipEmptyFrames;

    static bool skipEmptyFrames;

    // TODO: Remove after stabilization period

    static bool swapBuffersWithDamage;

    static bool useBufferAge;

    static bool useBufferAge;

    static bool enablePartialUpdates;

    static bool enablePartialUpdates;

libs/hwui/renderthread/EglManager.cpp

+4 −12
Original line number Original line Diff line number Diff line
@@ -322,18 +322,10 @@ bool EglManager::swapBuffers(const Frame& frame, const SkRect& screenDirty) { 
    }

    }

#endif

#endif





#ifdef EGL_KHR_swap_buffers_with_damage

    if (CC_LIKELY(Properties::swapBuffersWithDamage)) {

    EGLint rects[4];

    EGLint rects[4];

    frame.map(screenDirty, rects);

    frame.map(screenDirty, rects);

    eglSwapBuffersWithDamageKHR(mEglDisplay, frame.mSurface, rects,

    eglSwapBuffersWithDamageKHR(mEglDisplay, frame.mSurface, rects,

            screenDirty.isEmpty() ? 0 : 1);

            screenDirty.isEmpty() ? 0 : 1);

    } else {

        eglSwapBuffers(mEglDisplay, frame.mSurface);

    }

#else

    eglSwapBuffers(mEglDisplay, frame.mSurface);

#endif





    EGLint err = eglGetError();

    EGLint err = eglGetError();

    if (CC_LIKELY(err == EGL_SUCCESS)) {

    if (CC_LIKELY(err == EGL_SUCCESS)) {