| Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
|
| ===================================================================
|
| --- gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc (revision 132190)
|
| +++ gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc (working copy)
|
| @@ -3525,7 +3525,9 @@
|
| false, // depth enabled
|
| 0, // front stencil mask
|
| 0, // back stencil mask
|
| - false); // stencil enabled
|
| + false, // stencil enabled
|
| + false, // cull_face_enabled
|
| + false); // scissor_test_enabled
|
|
|
| EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
|
| .Times(1)
|
| @@ -3579,7 +3581,9 @@
|
| false, // depth enabled
|
| 0, // front stencil mask
|
| 0, // back stencil mask
|
| - false); // stencil enabled
|
| + false, // stencil enabled
|
| + false, // cull_face_enabled
|
| + false); // scissor_test_enabled
|
|
|
| EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
|
| .Times(1)
|
| @@ -3631,7 +3635,10 @@
|
| false, // depth enabled
|
| 0, // front stencil mask
|
| 0, // back stencil mask
|
| - false); // stencil enabled
|
| + false, // stencil enabled
|
| + false, // cull_face_enabled
|
| + false); // scissor_test_enabled
|
| +
|
| EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
|
| .Times(1)
|
| .RetiresOnSaturation();
|
| @@ -3683,7 +3690,9 @@
|
| false, // depth enabled
|
| 0, // front stencil mask
|
| 0, // back stencil mask
|
| - false); // stencil enabled
|
| + false, // stencil enabled
|
| + false, // cull_face_enabled
|
| + false); // scissor_test_enabled
|
|
|
| EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
|
| .Times(1)
|
| @@ -3729,7 +3738,10 @@
|
| false, // depth enabled
|
| 0, // front stencil mask
|
| 0, // back stencil mask
|
| - false); // stencil enabled
|
| + false, // stencil enabled
|
| + false, // cull_face_enabled
|
| + false); // scissor_test_enabled
|
| +
|
| EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
|
| .Times(1)
|
| .RetiresOnSaturation();
|
| @@ -3755,7 +3767,9 @@
|
| false, // depth enabled
|
| 0, // front stencil mask
|
| 0, // back stencil mask
|
| - false); // stencil enabled
|
| + false, // stencil enabled
|
| + false, // cull_face_enabled
|
| + false); // scissor_test_enabled
|
|
|
| EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
|
| .Times(1)
|
| @@ -3978,7 +3992,10 @@
|
| true, // depth enabled
|
| 0, // front stencil mask
|
| 0, // back stencil mask
|
| - false); // stencil enabled
|
| + false, // stencil enabled
|
| + false, // cull_face_enabled
|
| + false); // scissor_test_enabled
|
| +
|
| EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
|
| .Times(1)
|
| .RetiresOnSaturation();
|
| @@ -4035,7 +4052,10 @@
|
| false, // depth enabled
|
| 0, // front stencil mask
|
| 0, // back stencil mask
|
| - false); // stencil enabled
|
| + false, // stencil enabled
|
| + false, // cull_face_enabled
|
| + false); // scissor_test_enabled
|
| +
|
| EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
|
| .Times(1)
|
| .RetiresOnSaturation();
|
| @@ -4092,7 +4112,10 @@
|
| false, // depth enabled
|
| -1, // front stencil mask
|
| -1, // back stencil mask
|
| - true); // stencil enabled
|
| + true, // stencil enabled
|
| + false, // cull_face_enabled
|
| + false); // scissor_test_enabled
|
| +
|
| EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
|
| .Times(1)
|
| .RetiresOnSaturation();
|
| @@ -4149,7 +4172,10 @@
|
| false, // depth enabled
|
| 0, // front stencil mask
|
| 0, // back stencil mask
|
| - false); // stencil enabled
|
| + false, // stencil enabled
|
| + false, // cull_face_enabled
|
| + false); // scissor_test_enabled
|
| +
|
| EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
|
| .Times(1)
|
| .RetiresOnSaturation();
|
| @@ -5901,7 +5927,10 @@
|
| false, // depth enabled
|
| 0, // front stencil mask
|
| 0, // back stencil mask
|
| - false); // stencil enabled
|
| + false, // stencil enabled
|
| + false, // cull_face_enabled
|
| + false); // scissor_test_enabled
|
| +
|
| EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
|
| .Times(1)
|
| .RetiresOnSaturation();
|
| @@ -6063,7 +6092,10 @@
|
| false, // depth enabled
|
| 0, // front stencil mask
|
| 0, // back stencil mask
|
| - false); // stencil enabled
|
| + false, // stencil enabled
|
| + false, // cull_face_enabled
|
| + false); // scissor_test_enabled
|
| +
|
| EXPECT_CALL(*gl_, Clear(GL_COLOR_BUFFER_BIT))
|
| .Times(1)
|
| .RetiresOnSaturation();
|
| @@ -6216,7 +6248,10 @@
|
| false, // depth enabled
|
| 0, // front stencil mask
|
| 0, // back stencil mask
|
| - false); // stencil enabled
|
| + false, // stencil enabled
|
| + false, // cull_face_enabled
|
| + false); // scissor_test_enabled
|
| +
|
| EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
|
| .Times(1)
|
| .RetiresOnSaturation();
|
| @@ -6328,7 +6363,10 @@
|
| false, // depth enabled
|
| 0, // front stencil mask
|
| 0, // back stencil mask
|
| - false); // stencil enabled
|
| + false, // stencil enabled
|
| + false, // cull_face_enabled
|
| + false); // scissor_test_enabled
|
| +
|
| EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
|
| .Times(1)
|
| .RetiresOnSaturation();
|
| @@ -6545,7 +6583,10 @@
|
| false, // depth enabled
|
| 0, // front stencil mask
|
| 0, // back stencil mask
|
| - false); // stencil enabled
|
| + false, // stencil enabled
|
| + false, // cull_face_enabled
|
| + false); // scissor_test_enabled
|
| +
|
| EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
|
| .Times(1)
|
| .RetiresOnSaturation();
|
|
|