Refactor DrawTextureQuad and CheckPixels in gl_tests util

gpu/command_buffer/tests/gl_virtual_contexts_unittest.cc

 // Copyright 2014 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.
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 #include <stdint.h>
 
 #include "gpu/command_buffer/tests/gl_manager.h"
@@ skipping 123 matching lines @@
       color[2] / 255.0f,
       color[3] / 255.0f);
 }
 
 void TestDraw(int size) {
   uint8_t expected_clear[] = {
       127, 0, 255, 0,
   };
   glClearColor(0.5f, 0.0f, 1.0f, 0.0f);
   glClear(GL_COLOR_BUFFER_BIT);
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, size, size, 1, expected_clear));
+  EXPECT_TRUE(
+      GLTestHelper::CheckPixels(0, 0, size, size, 1, expected_clear, nullptr));
   glDrawArrays(GL_TRIANGLES, 0, 6);
 }
 
 }  // anonymous namespace
 
 // http://crbug.com/281565
 TEST_F(GLVirtualContextsTest, Basic) {
   struct TestInfo {
     int size;
     uint8_t color[4];
@@ skipping 17 matching lines @@
     const TestInfo& test = tests[ii];
     GLManager* gl_manager = test.manager;
     gl_manager->MakeCurrent();
     TestDraw(test.size);
   }
 
   for (int ii = 0; ii < kNumTests; ++ii) {
     const TestInfo& test = tests[ii];
     GLManager* gl_manager = test.manager;
     gl_manager->MakeCurrent();
-    EXPECT_TRUE(GLTestHelper::CheckPixels(
-        0, 0, test.size, test.size, 0, test.color));
+    EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, test.size, test.size, 0,
+                                          test.color, nullptr));
   }
 
   for (int ii = 0; ii < kNumTests; ++ii) {
     const TestInfo& test = tests[ii];
     GLManager* gl_manager = test.manager;
     gl_manager->MakeCurrent();
     GLTestHelper::CheckGLError("no errors", __LINE__);
   }
 }
 
@@ skipping 11 matching lines @@
   gl2_.MakeCurrent();
   // Set up green quad in vao2.
   glGenVertexArraysOES(1, &vao2);
   glBindVertexArrayOES(vao2);
   SetUpColoredUnitQuad(kFloatGreen);
   glFinish();
 
   gl1_.MakeCurrent();
   // Test to ensure that vao1 is still the active VAO for this context.
   glDrawArrays(GL_TRIANGLES, 0, 6);
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize1, kSize1, 0, kExpectedRed));
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize1, kSize1, 0, kExpectedRed,
+                                        nullptr));
   glFinish();
   GLTestHelper::CheckGLError("no errors", __LINE__);
 
   gl2_.MakeCurrent();
   // Test to ensure that vao2 is still the active VAO for this context.
   glDrawArrays(GL_TRIANGLES, 0, 6);
-  EXPECT_TRUE(
-      GLTestHelper::CheckPixels(0, 0, kSize2, kSize2, 0, kExpectedGreen));
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize2, kSize2, 0, kExpectedGreen,
+                                        nullptr));
   glFinish();
   GLTestHelper::CheckGLError("no errors", __LINE__);
 }
 
 // http://crbug.com/363407
 TEST_F(GLVirtualContextsTest, VertexArrayObjectRestoreRebind) {
   GLuint vao1 = 0, vao2 = 0;
 
   gl1_.MakeCurrent();
   // Set up red quad in vao1.
   glGenVertexArraysOES(1, &vao1);
   glBindVertexArrayOES(vao1);
   SetUpColoredUnitQuad(kFloatRed);
   glFinish();
 
   gl2_.MakeCurrent();
   // Set up green quad in new vao2.
   glGenVertexArraysOES(1, &vao2);
   glBindVertexArrayOES(vao2);
   SetUpColoredUnitQuad(kFloatGreen);
   glFinish();
 
   gl1_.MakeCurrent();
   // Test to ensure that vao1 hasn't been corrupted after rebinding.
   // Bind 0 is required so that bind vao1 is not optimized away in the service.
   glBindVertexArrayOES(0);
   glBindVertexArrayOES(vao1);
   glDrawArrays(GL_TRIANGLES, 0, 6);
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize1, kSize1, 0, kExpectedRed));
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize1, kSize1, 0, kExpectedRed,
+                                        nullptr));
   glFinish();
   GLTestHelper::CheckGLError("no errors", __LINE__);
 
   gl2_.MakeCurrent();
   // Test to ensure that vao1 hasn't been corrupted after rebinding.
   // Bind 0 is required so that bind vao2 is not optimized away in the service.
   glBindVertexArrayOES(0);
   glBindVertexArrayOES(vao2);
   glDrawArrays(GL_TRIANGLES, 0, 6);
-  EXPECT_TRUE(
-      GLTestHelper::CheckPixels(0, 0, kSize2, kSize2, 0, kExpectedGreen));
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize2, kSize2, 0, kExpectedGreen,
+                                        nullptr));
   glFinish();
 
   GLTestHelper::CheckGLError("no errors", __LINE__);
 }
 
 // http://crbug.com/363407
 TEST_F(GLVirtualContextsTest, VertexArrayObjectRestoreDefault) {
   gl1_.MakeCurrent();
   // Set up red quad in default VAO.
   SetUpColoredUnitQuad(kFloatRed);
   glFinish();
 
   gl2_.MakeCurrent();
   // Set up green quad in default VAO.
   SetUpColoredUnitQuad(kFloatGreen);
   glFinish();
 
   // Gen & bind a non-default VAO.
   GLuint vao;
   glGenVertexArraysOES(1, &vao);
   glBindVertexArrayOES(vao);
   glFinish();
 
   gl1_.MakeCurrent();
   // Test to ensure that default VAO on gl1_ is still valid.
   glDrawArrays(GL_TRIANGLES, 0, 6);
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize1, kSize1, 0, kExpectedRed));
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize1, kSize1, 0, kExpectedRed,
+                                        nullptr));
   glFinish();
 
   gl2_.MakeCurrent();
   // Test to ensure that default VAO on gl2_ is still valid.
   // This tests that a default VAO is restored even when it's not currently
   // bound during the context switch.
   glBindVertexArrayOES(0);
   glDrawArrays(GL_TRIANGLES, 0, 6);
-  EXPECT_TRUE(
-      GLTestHelper::CheckPixels(0, 0, kSize2, kSize2, 0, kExpectedGreen));
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize2, kSize2, 0, kExpectedGreen,
+                                        nullptr));
   glFinish();
 
   GLTestHelper::CheckGLError("no errors", __LINE__);
 }
 
 TEST_F(GLVirtualContextsTest, VirtualQueries) {
   const GLenum query_targets[] = {
     GL_ANY_SAMPLES_PASSED_EXT,
     GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT,
     GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM,
@@ skipping 45 matching lines @@
                            &query2_available);
     EXPECT_TRUE(query2_available);
 
     glDeleteQueriesEXT(1, &query2);
     GLTestHelper::CheckGLError("no errors", __LINE__);
   }
 }
 
 }  // namespace gpu