From a672f6ba4c9f65de0b94bcdc639f1e053d7ee5d9 Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 22 Oct 2015 09:53:26 -0700 Subject: Remove obsolete debug option Bug: 25149700 Change-Id: I9280e2414255fb01e672094cd8d173efadac1681 --- libs/hwui/Properties.cpp | 2 -- libs/hwui/Properties.h | 9 --------- libs/hwui/renderthread/EglManager.cpp | 16 ++++------------ 3 files changed, 4 insertions(+), 23 deletions(-) (limited to 'libs/hwui') diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp index 36a8dac9d0c1..c0c61db0f5d1 100644 --- a/libs/hwui/Properties.cpp +++ b/libs/hwui/Properties.cpp @@ -29,7 +29,6 @@ bool Properties::debugLayersUpdates = false; bool Properties::debugOverdraw = false; bool Properties::showDirtyRegions = false; bool Properties::skipEmptyFrames = true; -bool Properties::swapBuffersWithDamage = true; bool Properties::useBufferAge = true; bool Properties::enablePartialUpdates = true; @@ -117,7 +116,6 @@ bool Properties::load() { } 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); enablePartialUpdates = property_get_bool(PROPERTY_ENABLE_PARTIAL_UPDATES, true); diff --git a/libs/hwui/Properties.h b/libs/hwui/Properties.h index 3512c36417e1..74cd74bde176 100644 --- a/libs/hwui/Properties.h +++ b/libs/hwui/Properties.h @@ -141,13 +141,6 @@ enum DebugLevel { */ #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 * to do partial invalidates. Setting this to "false" will fall back to @@ -271,8 +264,6 @@ public: static bool showDirtyRegions; // TODO: Remove after stabilization period static bool skipEmptyFrames; - // TODO: Remove after stabilization period - static bool swapBuffersWithDamage; static bool useBufferAge; static bool enablePartialUpdates; diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp index c9b9637dd52e..c18e00d78df8 100644 --- a/libs/hwui/renderthread/EglManager.cpp +++ b/libs/hwui/renderthread/EglManager.cpp @@ -322,18 +322,10 @@ bool EglManager::swapBuffers(const Frame& frame, const SkRect& screenDirty) { } #endif -#ifdef EGL_KHR_swap_buffers_with_damage - if (CC_LIKELY(Properties::swapBuffersWithDamage)) { - EGLint rects[4]; - frame.map(screenDirty, rects); - eglSwapBuffersWithDamageKHR(mEglDisplay, frame.mSurface, rects, - screenDirty.isEmpty() ? 0 : 1); - } else { - eglSwapBuffers(mEglDisplay, frame.mSurface); - } -#else - eglSwapBuffers(mEglDisplay, frame.mSurface); -#endif + EGLint rects[4]; + frame.map(screenDirty, rects); + eglSwapBuffersWithDamageKHR(mEglDisplay, frame.mSurface, rects, + screenDirty.isEmpty() ? 0 : 1); EGLint err = eglGetError(); if (CC_LIKELY(err == EGL_SUCCESS)) { -- cgit v1.2.3-59-g8ed1b