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

Commit b440acd1 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android (Google) Code Review
Browse files

Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1 

* changes:
  SurfaceTexture: fix a couple tests
  EGL: default to swap interval 1
  SurfaceTexture: clean up some tests
parents c4411803 e3603d7d

include/gui/SurfaceTexture.h

+4 −0
Original line number Diff line number Diff line
@@ -202,6 +202,10 @@ public: 
    // getCurrentScalingMode returns the scaling mode of the current buffer

    uint32_t getCurrentScalingMode() const;



    // isSynchronousMode returns whether the SurfaceTexture is currently in

    // synchronous mode.

    bool isSynchronousMode() const;



    // abandon frees all the buffers and puts the SurfaceTexture into the

    // 'abandoned' state.  Once put in this state the SurfaceTexture can never

    // leave it.  When in the 'abandoned' state, all methods of the

libs/gui/SurfaceTexture.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1005,6 +1005,11 @@ uint32_t SurfaceTexture::getCurrentScalingMode() const { 
    return mCurrentScalingMode;

}



bool SurfaceTexture::isSynchronousMode() const {

    Mutex::Autolock lock(mMutex);

    return mSynchronousMode;

}



int SurfaceTexture::query(int what, int* outValue)

{

    Mutex::Autolock lock(mMutex);

libs/gui/tests/SurfaceTexture_test.cpp

+305 −241

File changed.

Preview size limit exceeded, changes collapsed.

opengl/libs/EGL/eglApi.cpp

+5 −0
Original line number Diff line number Diff line
@@ -370,6 +370,11 @@ EGLSurface eglCreateWindowSurface( EGLDisplay dpy, EGLConfig config, 
            }

        }



        // the EGL spec requires that a new EGLSurface default to swap interval

        // 1, so explicitly set that on the window here.

        ANativeWindow* anw = reinterpret_cast<ANativeWindow*>(window);

        anw->setSwapInterval(anw, 1);



        EGLSurface surface = cnx->egl.eglCreateWindowSurface(

                iDpy, iConfig, window, attrib_list);

        if (surface != EGL_NO_SURFACE) {