| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" | 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1256 attach_cmd.Init(program_client_id, vertex_shader_client_id); | 1256 attach_cmd.Init(program_client_id, vertex_shader_client_id); |
| 1257 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd)); | 1257 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd)); |
| 1258 | 1258 |
| 1259 attach_cmd.Init(program_client_id, fragment_shader_client_id); | 1259 attach_cmd.Init(program_client_id, fragment_shader_client_id); |
| 1260 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd)); | 1260 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd)); |
| 1261 | 1261 |
| 1262 cmds::LinkProgram link_cmd; | 1262 cmds::LinkProgram link_cmd; |
| 1263 link_cmd.Init(program_client_id); | 1263 link_cmd.Init(program_client_id); |
| 1264 | 1264 |
| 1265 EXPECT_EQ(error::kNoError, ExecuteCmd(link_cmd)); | 1265 EXPECT_EQ(error::kNoError, ExecuteCmd(link_cmd)); |
| 1266 | |
| 1267 // Assume the next command will be UseProgram. | |
| 1268 SetupExpectationsForClearingUniforms(uniforms, num_uniforms); | |
| 1269 } | 1266 } |
| 1270 | 1267 |
| 1271 void GLES2DecoderTestBase::DoEnableVertexAttribArray(GLint index) { | 1268 void GLES2DecoderTestBase::DoEnableVertexAttribArray(GLint index) { |
| 1272 EXPECT_CALL(*gl_, EnableVertexAttribArray(index)) | 1269 EXPECT_CALL(*gl_, EnableVertexAttribArray(index)) |
| 1273 .Times(1) | 1270 .Times(1) |
| 1274 .RetiresOnSaturation(); | 1271 .RetiresOnSaturation(); |
| 1275 cmds::EnableVertexAttribArray cmd; | 1272 cmds::EnableVertexAttribArray cmd; |
| 1276 cmd.Init(index); | 1273 cmd.Init(index); |
| 1277 EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); | 1274 EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); |
| 1278 } | 1275 } |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1435 SetupDefaultProgram(); | 1432 SetupDefaultProgram(); |
| 1436 } | 1433 } |
| 1437 | 1434 |
| 1438 // Include the auto-generated part of this file. We split this because it means | 1435 // Include the auto-generated part of this file. We split this because it means |
| 1439 // we can easily edit the non-auto generated parts right here in this file | 1436 // we can easily edit the non-auto generated parts right here in this file |
| 1440 // instead of having to edit some template or the code generator. | 1437 // instead of having to edit some template or the code generator. |
| 1441 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" | 1438 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" |
| 1442 | 1439 |
| 1443 } // namespace gles2 | 1440 } // namespace gles2 |
| 1444 } // namespace gpu | 1441 } // namespace gpu |
| OLD | NEW |