Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SurfaceTexture: fix a test deadlock"

Browse Source
This commit is contained in:
Jamie Gennis
2011-09-05 14:51:20 -07:00
committed by Android (Google) Code Review
parent 2e6f49cc81 32704dcff7
commit 08b997c742
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/gui/tests/SurfaceTexture_test.cpp
View File

@@ -974,8 +974,6 @@ TEST_F(SurfaceTextureGLTest, TexturingFromGLFilledRGBABufferPow2) {
eglSwapBuffers(mEglDisplay, stcEglSurface); eglSwapBuffers(mEglDisplay, stcEglSurface);
eglDestroySurface(mEglDisplay, stcEglSurface);
// Do the consumer side of things // Do the consumer side of things
EXPECT_TRUE(eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface, EXPECT_TRUE(eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface,
mEglContext)); mEglContext));
@@ -985,6 +983,10 @@ TEST_F(SurfaceTextureGLTest, TexturingFromGLFilledRGBABufferPow2) {
mST->updateTexImage(); 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); glClearColor(0.2, 0.2, 0.2, 0.2);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);