Refactor DrawTextureQuad and CheckPixels in gl_tests util

gpu/command_buffer/tests/gl_apply_screen_space_antialiasing_CHROMIUM_unittest.cc

 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
@@ skipping 102 matching lines @@
   GLint value = 0;
   glGetIntegerv(GL_FRAMEBUFFER_BINDING, &value);
   GLuint fb_id = value;
   EXPECT_EQ(framebuffer_id_, fb_id);
 
   // Check that FB is complete.
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             glCheckFramebufferStatus(GL_FRAMEBUFFER));
 
   uint8_t pixels[1 * 4] = {0u, 255u, 0u, 255u};
-  GLTestHelper::CheckPixels(0, 0, 1, 1, 0, pixels);
+  GLTestHelper::CheckPixels(0, 0, 1, 1, 0, pixels, nullptr);
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 }
 
 TEST_F(GLApplyScreenSpaceAntialiasingCHROMIUMTest, DefaultFBO) {
   if (!available_)
     return;
 
   glBindFramebuffer(GL_FRAMEBUFFER, 0);
   glApplyScreenSpaceAntialiasingCHROMIUM();
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
@@ skipping 18 matching lines @@
       continue;
 
     glClear(GL_COLOR_BUFFER_BIT);
     EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 
     glApplyScreenSpaceAntialiasingCHROMIUM();
     EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError()) << "index:"
                                                               << index;
 
     uint8_t pixels[1 * 4] = {0u, 255u, 0u, 255u};
-    GLTestHelper::CheckPixels(0, 0, 1, 1, 0, pixels);
+    GLTestHelper::CheckPixels(0, 0, 1, 1, 0, pixels, nullptr);
     EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
   }
 }
 
 TEST_F(GLApplyScreenSpaceAntialiasingCHROMIUMTest, ImmutableTexture) {
   if (!available_)
     return;
 
   if (!GLTestHelper::HasExtension("GL_EXT_texture_storage")) {
     LOG(INFO) << "GL_EXT_texture_storage not supported. Skipping test...";
     return;
   }
   GLenum internal_formats[] = {GL_RGB8_OES, GL_RGBA8_OES, GL_BGRA8_EXT};
   for (auto internal_format : internal_formats) {
     glDeleteTextures(1, &textures_);
     glDeleteFramebuffers(1, &framebuffer_id_);
     CreateAndBindDestinationTextureAndFBO(GL_TEXTURE_2D);
     glTexStorage2DEXT(GL_TEXTURE_2D, 1, internal_format, 1, 1);
     EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
     EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
               glCheckFramebufferStatus(GL_FRAMEBUFFER));
 
     glClear(GL_COLOR_BUFFER_BIT);
 
     glApplyScreenSpaceAntialiasingCHROMIUM();
     EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 
     uint8_t pixels[1 * 4] = {0u, 255u, 0u, 255u};
-    GLTestHelper::CheckPixels(0, 0, 1, 1, 0, pixels);
+    GLTestHelper::CheckPixels(0, 0, 1, 1, 0, pixels, nullptr);
     EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
   }
 }
 
 // Similar to webgl conformance test 'testAntialias(true)' in
 // context-attributes-alpha-depth-stencil-antialias.html
 TEST_F(GLApplyScreenSpaceAntialiasingCHROMIUMTest, AntiAliasing) {
   if (!available_)
     return;
 
@@ skipping 10 matching lines @@
       255u, 0u, 0u, 255u, 255u, 0u, 0u, 255u, 0u, 0u, 0u, 0u,
       255u, 0u, 0u, 255u, 0u,   0u, 0u, 0u,   0u, 0u, 0u, 0u,
       0u,   0u, 0u, 0u,   0u,   0u, 0u, 0u,   0u, 0u, 0u, 0u,
   };
   glBindTexture(GL_TEXTURE_2D, textures_);
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, length, length, 0, GL_RGBA,
                GL_UNSIGNED_BYTE, rgba_pixels);
 
   uint8_t transparent[4] = {0u, 0u, 0u, 0u};
   uint8_t red[4] = {255u, 0u, 0u, 255u};
-  GLTestHelper::CheckPixels(0, 0, 1, 1, 0, red);
-  GLTestHelper::CheckPixels(0, 1, 1, 1, 0, red);
-  GLTestHelper::CheckPixels(0, 2, 1, 1, 0, transparent);
-  GLTestHelper::CheckPixels(1, 0, 1, 1, 0, red);
-  GLTestHelper::CheckPixels(1, 1, 1, 1, 0, transparent);
+  GLTestHelper::CheckPixels(0, 0, 1, 1, 0, red, nullptr);
+  GLTestHelper::CheckPixels(0, 1, 1, 1, 0, red, nullptr);
+  GLTestHelper::CheckPixels(0, 2, 1, 1, 0, transparent, nullptr);
+  GLTestHelper::CheckPixels(1, 0, 1, 1, 0, red, nullptr);
+  GLTestHelper::CheckPixels(1, 1, 1, 1, 0, transparent, nullptr);
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 
   glApplyScreenSpaceAntialiasingCHROMIUM();
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 
-  GLTestHelper::CheckPixels(0, 0, 1, 1, 0, red);
-  GLTestHelper::CheckPixels(2, 2, 1, 1, 0, transparent);
+  GLTestHelper::CheckPixels(0, 0, 1, 1, 0, red, nullptr);
+  GLTestHelper::CheckPixels(2, 2, 1, 1, 0, transparent, nullptr);
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 
   // Check if middle pixel is anti-aliased.
   uint8_t pixels[4] = {0u};
   glReadPixels(1, 1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &pixels);
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
   EXPECT_NE(transparent, pixels);
   EXPECT_NE(red, pixels);
   EXPECT_TRUE(pixels[0] > transparent[0] && pixels[0] < red[0]);
   EXPECT_EQ(0u, pixels[1]);
@@ skipping 143 matching lines @@
 
   // test using program before
   uint8_t expected[] = {
       0, 255, 0, 255,
   };
   uint8_t zero[] = {
       0, 0, 0, 0,
   };
   glClearColor(0, 0, 0, 0);
   glClear(GL_COLOR_BUFFER_BIT);
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 0, zero));
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 0, zero, nullptr));
   glDrawArrays(GL_TRIANGLES, 0, 6);
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 0, expected));
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 0, expected, nullptr));
 
   // Call copyTextureCHROMIUM
   uint8_t pixels[1 * 4] = {255u, 0u, 0u, 255u};
   glBindTexture(GL_TEXTURE_2D, textures_);
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
                pixels);
   glBindFramebuffer(GL_FRAMEBUFFER, framebuffer_id_);
   glApplyScreenSpaceAntialiasingCHROMIUM();
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 
   // test using program after
   glClear(GL_COLOR_BUFFER_BIT);
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 0, zero));
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 0, zero, nullptr));
   glDrawArrays(GL_TRIANGLES, 0, 6);
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 0, expected));
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 0, expected, nullptr));
 
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 
   gl2.MakeCurrent();
   gl2.Destroy();
   gl_.MakeCurrent();
 }
 
 }  // namespace gpu