Merge "Enable swapBuffersWithDamage by default" into mnc-dev
This commit is contained in:
@@ -29,7 +29,7 @@ bool Properties::debugLayersUpdates = false;
|
||||
bool Properties::debugOverdraw = false;
|
||||
bool Properties::showDirtyRegions = false;
|
||||
bool Properties::skipEmptyFrames = true;
|
||||
bool Properties::swapBuffersWithDamage = false;
|
||||
bool Properties::swapBuffersWithDamage = true;
|
||||
|
||||
DebugLevel Properties::debugLevel = kDebugDisabled;
|
||||
OverdrawColorSet Properties::overdrawColorSet = OverdrawColorSet::Default;
|
||||
@@ -104,7 +104,7 @@ bool Properties::load() {
|
||||
}
|
||||
|
||||
skipEmptyFrames = property_get_bool(PROPERTY_SKIP_EMPTY_DAMAGE, true);
|
||||
swapBuffersWithDamage = property_get_bool(PROPERTY_SWAP_WITH_DAMAGE, false);
|
||||
swapBuffersWithDamage = property_get_bool(PROPERTY_SWAP_WITH_DAMAGE, true);
|
||||
|
||||
return (prevDebugLayersUpdates != debugLayersUpdates)
|
||||
|| (prevDebugOverdraw != debugOverdraw)
|
||||
|
||||
@@ -256,7 +256,7 @@ bool EglManager::swapBuffers(EGLSurface surface, const SkRect& dirty,
|
||||
#endif
|
||||
|
||||
#ifdef EGL_KHR_swap_buffers_with_damage
|
||||
if (CC_UNLIKELY(Properties::swapBuffersWithDamage)) {
|
||||
if (CC_LIKELY(Properties::swapBuffersWithDamage)) {
|
||||
SkIRect idirty;
|
||||
dirty.roundOut(&idirty);
|
||||
/*
|
||||
@@ -273,11 +273,6 @@ bool EglManager::swapBuffers(EGLSurface surface, const SkRect& dirty,
|
||||
// layout: {x, y, width, height}
|
||||
EGLint rects[4] = { idirty.x(), y, idirty.width(), idirty.height() };
|
||||
EGLint numrects = dirty.isEmpty() ? 0 : 1;
|
||||
// TODO: Remove prior to enabling this path by default
|
||||
ALOGD("Swap buffers with damage %d: %d, %d, %d, %d (src="
|
||||
RECT_STRING ")",
|
||||
dirty.isEmpty() ? 0 : 1, rects[0], rects[1], rects[2], rects[3],
|
||||
SK_RECT_ARGS(dirty));
|
||||
eglSwapBuffersWithDamageKHR(mEglDisplay, surface, rects, numrects);
|
||||
} else {
|
||||
eglSwapBuffers(mEglDisplay, surface);
|
||||
|
||||
Reference in New Issue
Block a user