From 47dd726460e3a02ec80f14e300bb3a42884fc1e5 Mon Sep 17 00:00:00 2001 From: Jamie Gennis Date: Wed, 6 Jul 2011 14:47:47 -0700 Subject: [PATCH] SurfaceTexture: enable newly passing tests. This change enables the following four SurfaceTextures tests: UpdateTexImageBeforeFrameFinishedWorks UpdateTexImageAfterFrameFinishedWorks RepeatedUpdateTexImageBeforeFrameFinishedWorks RepeatedUpdateTexImageAfterFrameFinishedWorks Change-Id: I7632630bc97873e50d4a765ffc44a86f16ae62f1 --- libs/gui/tests/SurfaceTexture_test.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libs/gui/tests/SurfaceTexture_test.cpp b/libs/gui/tests/SurfaceTexture_test.cpp index c06400e52..88433fb0c 100644 --- a/libs/gui/tests/SurfaceTexture_test.cpp +++ b/libs/gui/tests/SurfaceTexture_test.cpp @@ -1180,8 +1180,7 @@ protected: sp mFC; }; -// XXX: This test is disabled because it causes hangs on some devices. -TEST_F(SurfaceTextureGLToGLTest, DISABLED_UpdateTexImageBeforeFrameFinishedWorks) { +TEST_F(SurfaceTextureGLToGLTest, UpdateTexImageBeforeFrameFinishedWorks) { class PT : public ProducerThread { virtual void render() { glClearColor(0.0f, 1.0f, 0.0f, 1.0f); @@ -1199,8 +1198,7 @@ TEST_F(SurfaceTextureGLToGLTest, DISABLED_UpdateTexImageBeforeFrameFinishedWorks // TODO: Add frame verification once RGB TEX_EXTERNAL_OES is supported! } -// XXX: This test is disabled because it causes hangs on some devices. -TEST_F(SurfaceTextureGLToGLTest, DISABLED_UpdateTexImageAfterFrameFinishedWorks) { +TEST_F(SurfaceTextureGLToGLTest, UpdateTexImageAfterFrameFinishedWorks) { class PT : public ProducerThread { virtual void render() { glClearColor(0.0f, 1.0f, 0.0f, 1.0f); @@ -1218,8 +1216,7 @@ TEST_F(SurfaceTextureGLToGLTest, DISABLED_UpdateTexImageAfterFrameFinishedWorks) // TODO: Add frame verification once RGB TEX_EXTERNAL_OES is supported! } -// XXX: This test is disabled because it causes hangs on some devices. -TEST_F(SurfaceTextureGLToGLTest, DISABLED_RepeatedUpdateTexImageBeforeFrameFinishedWorks) { +TEST_F(SurfaceTextureGLToGLTest, RepeatedUpdateTexImageBeforeFrameFinishedWorks) { enum { NUM_ITERATIONS = 1024 }; class PT : public ProducerThread { @@ -1247,8 +1244,7 @@ TEST_F(SurfaceTextureGLToGLTest, DISABLED_RepeatedUpdateTexImageBeforeFrameFinis } } -// XXX: This test is disabled because it causes hangs on some devices. -TEST_F(SurfaceTextureGLToGLTest, DISABLED_RepeatedUpdateTexImageAfterFrameFinishedWorks) { +TEST_F(SurfaceTextureGLToGLTest, RepeatedUpdateTexImageAfterFrameFinishedWorks) { enum { NUM_ITERATIONS = 1024 }; class PT : public ProducerThread {