Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/tests/gl_map_buffer_range_unittest.cc

Issue 2602563002: Refactor DrawTextureQuad and CheckPixels in gl_tests util (Closed)
Patch Set: rebase only Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/tests/gl_lose_context_chromium_unittest.cc ('k') | gpu/command_buffer/tests/gl_pointcoord_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/tests/gl_map_buffer_range_unittest.cc
diff --git a/gpu/command_buffer/tests/gl_map_buffer_range_unittest.cc b/gpu/command_buffer/tests/gl_map_buffer_range_unittest.cc
index bd32e457c331b5c3a14e68ca21972fb76204978e..873597081c3c30da0ee79051d94acd7aafb2f285 100644
--- a/gpu/command_buffer/tests/gl_map_buffer_range_unittest.cc
+++ b/gpu/command_buffer/tests/gl_map_buffer_range_unittest.cc
@@ -114,14 +114,14 @@ TEST_F(ES3MapBufferRangeTest, DrawArraysAndInstanced) {
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDrawArrays(GL_TRIANGLES, 0, 6);
GLTestHelper::CheckGLError("no errors", __LINE__);
- EXPECT_TRUE(
- GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1, kRedColor));
+ EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
+ kRedColor, nullptr));
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDrawArraysInstancedANGLE(GL_TRIANGLES, 0, 6, kPrimCount);
GLTestHelper::CheckGLError("no errors", __LINE__);
- EXPECT_TRUE(
- GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1, kRedColor));
+ EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
+ kRedColor, nullptr));
glMapBufferRange(GL_ARRAY_BUFFER, 0, 6, GL_MAP_READ_BIT);
GLTestHelper::CheckGLError("no errors", __LINE__);
@@ -130,13 +130,13 @@ TEST_F(ES3MapBufferRangeTest, DrawArraysAndInstanced) {
glDrawArrays(GL_TRIANGLES, 0, 6);
EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
- kBlackColor));
+ kBlackColor, nullptr));
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDrawArraysInstancedANGLE(GL_TRIANGLES, 0, 6, kPrimCount);
EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
- kBlackColor));
+ kBlackColor, nullptr));
// The following test is necessary to make sure draw calls do not just check
// bound buffers, but actual buffers that are attached to the enabled vertex
@@ -147,13 +147,13 @@ TEST_F(ES3MapBufferRangeTest, DrawArraysAndInstanced) {
glDrawArrays(GL_TRIANGLES, 0, 6);
EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
- kBlackColor));
+ kBlackColor, nullptr));
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDrawArraysInstancedANGLE(GL_TRIANGLES, 0, 6, kPrimCount);
EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
- kBlackColor));
+ kBlackColor, nullptr));
glBindBuffer(GL_ARRAY_BUFFER, buffer);
glUnmapBuffer(GL_ARRAY_BUFFER);
@@ -162,14 +162,14 @@ TEST_F(ES3MapBufferRangeTest, DrawArraysAndInstanced) {
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDrawArrays(GL_TRIANGLES, 0, 6);
GLTestHelper::CheckGLError("no errors", __LINE__);
- EXPECT_TRUE(
- GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1, kRedColor));
+ EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
+ kRedColor, nullptr));
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDrawArraysInstancedANGLE(GL_TRIANGLES, 0, 6, kPrimCount);
GLTestHelper::CheckGLError("no errors", __LINE__);
- EXPECT_TRUE(
- GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1, kRedColor));
+ EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
+ kRedColor, nullptr));
}
TEST_F(ES3MapBufferRangeTest, DrawElementsAndInstanced) {
@@ -195,15 +195,15 @@ TEST_F(ES3MapBufferRangeTest, DrawElementsAndInstanced) {
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0);
GLTestHelper::CheckGLError("no errors", __LINE__);
- EXPECT_TRUE(
- GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1, kRedColor));
+ EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
+ kRedColor, nullptr));
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDrawElementsInstancedANGLE(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0,
kPrimCount);
GLTestHelper::CheckGLError("no errors", __LINE__);
- EXPECT_TRUE(
- GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1, kRedColor));
+ EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
+ kRedColor, nullptr));
glMapBufferRange(GL_ARRAY_BUFFER, 0, 6, GL_MAP_READ_BIT);
GLTestHelper::CheckGLError("no errors", __LINE__);
@@ -212,14 +212,14 @@ TEST_F(ES3MapBufferRangeTest, DrawElementsAndInstanced) {
glDrawArrays(GL_TRIANGLES, 0, 6);
EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
- kBlackColor));
+ kBlackColor, nullptr));
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDrawElementsInstancedANGLE(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0,
kPrimCount);
EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
- kBlackColor));
+ kBlackColor, nullptr));
// The following test is necessary to make sure draw calls do not just check
// bound buffers, but actual buffers that are attached to the enabled vertex
@@ -230,14 +230,14 @@ TEST_F(ES3MapBufferRangeTest, DrawElementsAndInstanced) {
glDrawArrays(GL_TRIANGLES, 0, 6);
EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
- kBlackColor));
+ kBlackColor, nullptr));
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDrawElementsInstancedANGLE(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0,
kPrimCount);
EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
- kBlackColor));
+ kBlackColor, nullptr));
glBindBuffer(GL_ARRAY_BUFFER, buffers[0]);
@@ -247,15 +247,15 @@ TEST_F(ES3MapBufferRangeTest, DrawElementsAndInstanced) {
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0);
GLTestHelper::CheckGLError("no errors", __LINE__);
- EXPECT_TRUE(
- GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1, kRedColor));
+ EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
+ kRedColor, nullptr));
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDrawElementsInstancedANGLE(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0,
kPrimCount);
GLTestHelper::CheckGLError("no errors", __LINE__);
- EXPECT_TRUE(
- GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1, kRedColor));
+ EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
+ kRedColor, nullptr));
glMapBufferRange(GL_ELEMENT_ARRAY_BUFFER, 0, 6, GL_MAP_READ_BIT);
GLTestHelper::CheckGLError("no errors", __LINE__);
@@ -264,14 +264,14 @@ TEST_F(ES3MapBufferRangeTest, DrawElementsAndInstanced) {
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0);
EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
- kBlackColor));
+ kBlackColor, nullptr));
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDrawElementsInstancedANGLE(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0,
kPrimCount);
EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
- kBlackColor));
+ kBlackColor, nullptr));
glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER);
GLTestHelper::CheckGLError("no errors", __LINE__);
@@ -279,15 +279,15 @@ TEST_F(ES3MapBufferRangeTest, DrawElementsAndInstanced) {
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0);
GLTestHelper::CheckGLError("no errors", __LINE__);
- EXPECT_TRUE(
- GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1, kRedColor));
+ EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
+ kRedColor, nullptr));
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glDrawElementsInstancedANGLE(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0,
kPrimCount);
GLTestHelper::CheckGLError("no errors", __LINE__);
- EXPECT_TRUE(
- GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1, kRedColor));
+ EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kCanvasSize, kCanvasSize, 1,
+ kRedColor, nullptr));
}
TEST_F(ES3MapBufferRangeTest, ReadPixels) {
« no previous file with comments | « gpu/command_buffer/tests/gl_lose_context_chromium_unittest.cc ('k') | gpu/command_buffer/tests/gl_pointcoord_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698