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

Commit 32704dcf authored by Jamie Gennis's avatar Jamie Gennis
Browse files

SurfaceTexture: fix a test deadlock

This change fixes a test issue that resulted in a deadlock.

Change-Id: I4729e8dd47c8f5fea49bfeff3cea58627ead6d04
Bug: 5174876
parent 9c93db60
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -974,8 +974,6 @@ TEST_F(SurfaceTextureGLTest, TexturingFromGLFilledRGBABufferPow2) {

    eglSwapBuffers(mEglDisplay, stcEglSurface);

    eglDestroySurface(mEglDisplay, stcEglSurface);

    // Do the consumer side of things
    EXPECT_TRUE(eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface,
            mEglContext));
@@ -985,6 +983,10 @@ TEST_F(SurfaceTextureGLTest, TexturingFromGLFilledRGBABufferPow2) {

    mST->updateTexImage();

    // We must wait until updateTexImage has been called to destroy the
    // EGLSurface because we're in synchronous mode.
    eglDestroySurface(mEglDisplay, stcEglSurface);

    glClearColor(0.2, 0.2, 0.2, 0.2);
    glClear(GL_COLOR_BUFFER_BIT);