diff options
author | Jamie Gennis <jgennis@google.com> | 2012-08-30 18:35:50 -0700 |
---|---|---|
committer | Jamie Gennis <jgennis@google.com> | 2012-08-30 18:38:11 -0700 |
commit | 4697528eac85d34b2b375ece1d4b40aebe3fa5dd (patch) | |
tree | 4c3e34bd6b8f64aa349b1041dfd6a483063832f7 /libs/gui | |
parent | d69097f936d9780957a51ce77335ae409b32aaa3 (diff) | |
download | frameworks_native-4697528eac85d34b2b375ece1d4b40aebe3fa5dd.zip frameworks_native-4697528eac85d34b2b375ece1d4b40aebe3fa5dd.tar.gz frameworks_native-4697528eac85d34b2b375ece1d4b40aebe3fa5dd.tar.bz2 |
SurfaceTexture: fix a few tests
Change-Id: Ic74fe8791361f8fe91ad7149720fafd4cc154ac1
Diffstat (limited to 'libs/gui')
-rw-r--r-- | libs/gui/tests/SurfaceTextureClient_test.cpp | 12 | ||||
-rw-r--r-- | libs/gui/tests/SurfaceTexture_test.cpp | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/libs/gui/tests/SurfaceTextureClient_test.cpp b/libs/gui/tests/SurfaceTextureClient_test.cpp index 59b9efd..ec14a0d 100644 --- a/libs/gui/tests/SurfaceTextureClient_test.cpp +++ b/libs/gui/tests/SurfaceTextureClient_test.cpp @@ -241,7 +241,7 @@ TEST_F(SurfaceTextureClientTest, BufferGeometrySizeCanBeChangedWithoutFormat) { EXPECT_EQ(1, buf->height); EXPECT_EQ(PIXEL_FORMAT_RGB_565, buf->format); ASSERT_EQ(OK, mANW->cancelBuffer(mANW.get(), buf, -1)); - EXPECT_EQ(OK, native_window_set_buffers_geometry(mANW.get(), 16, 8, 0)); + EXPECT_EQ(OK, native_window_set_buffers_dimensions(mANW.get(), 16, 8)); ASSERT_EQ(OK, native_window_dequeue_buffer_and_wait(mANW.get(), &buf)); EXPECT_EQ(16, buf->width); EXPECT_EQ(8, buf->height); @@ -597,15 +597,15 @@ TEST_F(SurfaceTextureClientTest, GetTransformMatrixSucceedsAfterFreeingBuffersWi ASSERT_EQ(OK, native_window_set_buffer_count(mANW.get(), 6)); // frees buffers mST->getTransformMatrix(mtx); - // This accounts for the 1 texel shrink for each edge that's included in the + // This accounts for the .5 texel shrink for each edge that's included in the // transform matrix to avoid texturing outside the crop region. - EXPECT_EQ(.375f, mtx[0]); + EXPECT_EQ(0.5, mtx[0]); EXPECT_EQ(0.f, mtx[1]); EXPECT_EQ(0.f, mtx[2]); EXPECT_EQ(0.f, mtx[3]); EXPECT_EQ(0.f, mtx[4]); - EXPECT_EQ(-.375f, mtx[5]); + EXPECT_EQ(-0.5, mtx[5]); EXPECT_EQ(0.f, mtx[6]); EXPECT_EQ(0.f, mtx[7]); @@ -614,8 +614,8 @@ TEST_F(SurfaceTextureClientTest, GetTransformMatrixSucceedsAfterFreeingBuffersWi EXPECT_EQ(1.f, mtx[10]); EXPECT_EQ(0.f, mtx[11]); - EXPECT_EQ(.125f, mtx[12]); - EXPECT_EQ(.5f, mtx[13]); + EXPECT_EQ(0.0625f, mtx[12]); + EXPECT_EQ(0.5625f, mtx[13]); EXPECT_EQ(0.f, mtx[14]); EXPECT_EQ(1.f, mtx[15]); } diff --git a/libs/gui/tests/SurfaceTexture_test.cpp b/libs/gui/tests/SurfaceTexture_test.cpp index da56f91..212c6a7 100644 --- a/libs/gui/tests/SurfaceTexture_test.cpp +++ b/libs/gui/tests/SurfaceTexture_test.cpp @@ -1420,6 +1420,9 @@ TEST_F(SurfaceTextureGLToGLTest, TexturingFromGLFilledRGBABufferPow2) { mST->setDefaultBufferSize(texWidth, texHeight); + // This test requires 3 buffers to complete run on a single thread. + mST->setDefaultMaxBufferCount(3); + // Do the producer side of things EXPECT_TRUE(eglMakeCurrent(mEglDisplay, mProducerEglSurface, mProducerEglSurface, mProducerEglContext)); @@ -1612,6 +1615,9 @@ TEST_F(SurfaceTextureGLToGLTest, TexturingFromUserSizedGLFilledBuffer) { enum { texWidth = 64 }; enum { texHeight = 64 }; + // This test requires 3 buffers to complete run on a single thread. + mST->setDefaultMaxBufferCount(3); + // Set the user buffer size. native_window_set_buffers_user_dimensions(mANW.get(), texWidth, texHeight); @@ -1666,6 +1672,9 @@ TEST_F(SurfaceTextureGLToGLTest, TexturingFromPreRotatedUserSizedGLFilledBuffer) enum { texWidth = 64 }; enum { texHeight = 16 }; + // This test requires 3 buffers to complete run on a single thread. + mST->setDefaultMaxBufferCount(3); + // Set the transform hint. mST->setTransformHint(NATIVE_WINDOW_TRANSFORM_ROT_90); @@ -1724,6 +1733,9 @@ TEST_F(SurfaceTextureGLToGLTest, TexturingFromPreRotatedGLFilledBuffer) { enum { texWidth = 64 }; enum { texHeight = 16 }; + // This test requires 3 buffers to complete run on a single thread. + mST->setDefaultMaxBufferCount(3); + // Set the transform hint. mST->setTransformHint(NATIVE_WINDOW_TRANSFORM_ROT_90); |