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

Commit a9d27063 authored by Jesse Hall's avatar Jesse Hall Committed by Android Git Automerger
Browse files

am 9d65631f: am c9bf3ba4: Merge "Virtual Display async mode is overridden" 

* commit '9d65631f':
  Virtual Display async mode is overridden
parents d6b4e78d 9d65631f

services/surfaceflinger/DisplayDevice.cpp

+10 −10
Original line number Original line Diff line number Diff line
@@ -77,16 +77,6 @@ DisplayDevice::DisplayDevice( 
    mNativeWindow = new Surface(producer, false);

    mNativeWindow = new Surface(producer, false);

    ANativeWindow* const window = mNativeWindow.get();

    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

     * Create our display's surface

     */

     */
@@ -101,6 +91,16 @@ DisplayDevice::DisplayDevice( 
    eglQuerySurface(display, surface, EGL_WIDTH,  &mDisplayWidth);

    eglQuerySurface(display, surface, EGL_WIDTH,  &mDisplayWidth);

    eglQuerySurface(display, surface, EGL_HEIGHT, &mDisplayHeight);

    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;

    mDisplay = display;

    mSurface = surface;

    mSurface = surface;

    mFormat  = format;

    mFormat  = format;