ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests 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
commit 7f739ae68c
1 changed files with 4 additions and 2 deletions
Show Stats 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);
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);