diff options
| author | Jesse Hall <jessehall@google.com> | 2014-02-25 21:43:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-25 21:43:09 +0000 |
| commit | c9bf3ba411c66dd1d977c81f1aca08109cbf8c86 (patch) | |
| tree | 6cf000bad4a5068568df7f34cb564200c34b897b | |
| parent | aaa27fd5a0bb81ac17c25c33beb2656b32100cd6 (diff) | |
| parent | 4ee5696dfbcea1078b24e7c089de74e7cf4e55ca (diff) | |
| download | native-c9bf3ba411c66dd1d977c81f1aca08109cbf8c86.tar.gz | |
Merge "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 0d0f98d899..1319debf0a 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; |