am 5b6ebd71: Merge "libgui_test: fix a couple minor test issues" into jb-mr2-dev

* commit '5b6ebd716c2bae657898562997ebb3b7d7b8a575':
  libgui_test: fix a couple minor test issues
This commit is contained in:
Jamie Gennis 2013-04-25 12:41:28 -07:00 committed by Android Git Automerger
commit 83ad89579e

View File

@ -463,19 +463,12 @@ TEST_F(MultiTextureConsumerTest, EGLImageTargetWorks) {
glVertexPointer(2, GL_FLOAT, 0, vertices); glVertexPointer(2, GL_FLOAT, 0, vertices);
glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
ASSERT_EQ( glGetError(), GL_NO_ERROR ); ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError());
} }
ASSERT_TRUE( eglSwapBuffers(mEglDisplay, mEglSurface) );
uint32_t* pixels = new uint32_t[8*16*16];
glReadPixels(0, 0, 8*16, 16, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
for (int i=0 ; i<8 ; i++) { for (int i=0 ; i<8 ; i++) {
uint32_t p = pixels[i*16 + 8 + 8*(8*16)]; // center of each square EXPECT_TRUE(checkPixel(i*16 + 8, 8, i*16, i*16, i*16, i*16, 0));
EXPECT_EQ(p, (i&7) * 0x10101010);
} }
delete [] pixels;
} }