diff options
author | Jesse Hall <jessehall@google.com> | 2014-03-11 17:12:15 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 17:12:15 +0000 |
commit | 7bc5aa8905d15d46e49fc6903f0d126ddaafc8fa (patch) | |
tree | 9ee8dda6e98f2ffafd9beeb202dfad6e0bef186c | |
parent | 8cf113a3e5060172337042dca3274b1642c64dc4 (diff) | |
parent | c9bf3ba411c66dd1d977c81f1aca08109cbf8c86 (diff) | |
download | frameworks_native-7bc5aa8905d15d46e49fc6903f0d126ddaafc8fa.zip frameworks_native-7bc5aa8905d15d46e49fc6903f0d126ddaafc8fa.tar.gz frameworks_native-7bc5aa8905d15d46e49fc6903f0d126ddaafc8fa.tar.bz2 |
am c9bf3ba4: Merge "Virtual Display async mode is overridden"
* commit 'c9bf3ba411c66dd1d977c81f1aca08109cbf8c86':
Virtual Display async mode is overridden
-rw-r--r-- | services/surfaceflinger/DisplayDevice.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp index 0d0f98d..1319deb 100644 --- a/services/surfaceflinger/DisplayDevice.cpp +++ b/services/surfaceflinger/DisplayDevice.cpp @@ -77,16 +77,6 @@ DisplayDevice::DisplayDevice( mNativeWindow = new Surface(producer, false); ANativeWindow* const window = mNativeWindow.get(); - // Make sure that composition can never be stalled by a virtual display - // consumer that isn't processing buffers fast enough. We have to do this - // in two places: - // * Here, in case the display is composed entirely by HWC. - // * In makeCurrent(), using eglSwapInterval. Some EGL drivers set the - // window's swap interval in eglMakeCurrent, so they'll override the - // interval we set here. - if (mType >= DisplayDevice::DISPLAY_VIRTUAL) - window->setSwapInterval(window, 0); - /* * Create our display's surface */ @@ -101,6 +91,16 @@ DisplayDevice::DisplayDevice( eglQuerySurface(display, surface, EGL_WIDTH, &mDisplayWidth); eglQuerySurface(display, surface, EGL_HEIGHT, &mDisplayHeight); + // Make sure that composition can never be stalled by a virtual display + // consumer that isn't processing buffers fast enough. We have to do this + // in two places: + // * Here, in case the display is composed entirely by HWC. + // * In makeCurrent(), using eglSwapInterval. Some EGL drivers set the + // window's swap interval in eglMakeCurrent, so they'll override the + // interval we set here. + if (mType >= DisplayDevice::DISPLAY_VIRTUAL) + window->setSwapInterval(window, 0); + mDisplay = display; mSurface = surface; mFormat = format; |