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.h" | 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
6 | 6 |
7 #include "gpu/command_buffer/common/gl_mock.h" | 7 #include "gpu/command_buffer/common/gl_mock.h" |
8 #include "gpu/command_buffer/common/gles2_cmd_format.h" | 8 #include "gpu/command_buffer/common/gles2_cmd_format.h" |
9 #include "gpu/command_buffer/common/gles2_cmd_utils.h" | 9 #include "gpu/command_buffer/common/gles2_cmd_utils.h" |
10 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" | 10 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 ProgramManager::ProgramInfo* info = GetProgramInfo(client_program_id_); | 231 ProgramManager::ProgramInfo* info = GetProgramInfo(client_program_id_); |
232 ASSERT_TRUE(info != NULL); | 232 ASSERT_TRUE(info != NULL); |
233 | 233 |
234 AttachShader attach_cmd; | 234 AttachShader attach_cmd; |
235 attach_cmd.Init(client_program_id_, kClientVertexShaderId); | 235 attach_cmd.Init(client_program_id_, kClientVertexShaderId); |
236 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd)); | 236 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd)); |
237 | 237 |
238 attach_cmd.Init(client_program_id_, kClientFragmentShaderId); | 238 attach_cmd.Init(client_program_id_, kClientFragmentShaderId); |
239 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd)); | 239 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd)); |
240 | 240 |
241 info->Link(); | 241 info->Link(NULL, NULL, NULL, NULL); |
242 }; | 242 }; |
243 | 243 |
244 template <> | 244 template <> |
245 void GLES2DecoderTestBase::SpecializedSetup<GetVertexAttribfv, 0>(bool valid) { | 245 void GLES2DecoderTestBase::SpecializedSetup<GetVertexAttribfv, 0>(bool valid) { |
246 DoBindBuffer(GL_ARRAY_BUFFER, client_buffer_id_, kServiceBufferId); | 246 DoBindBuffer(GL_ARRAY_BUFFER, client_buffer_id_, kServiceBufferId); |
247 DoVertexAttribPointer(1, 1, GL_FLOAT, 0, 0); | 247 DoVertexAttribPointer(1, 1, GL_FLOAT, 0, 0); |
248 if (valid) { | 248 if (valid) { |
249 EXPECT_CALL(*gl_, GetError()) | 249 EXPECT_CALL(*gl_, GetError()) |
250 .WillOnce(Return(GL_NO_ERROR)) | 250 .WillOnce(Return(GL_NO_ERROR)) |
251 .WillOnce(Return(GL_NO_ERROR)) | 251 .WillOnce(Return(GL_NO_ERROR)) |
252 .RetiresOnSaturation(); | 252 .RetiresOnSaturation(); |
253 } | 253 } |
254 }; | 254 }; |
255 | 255 |
256 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h" | 256 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h" |
257 | 257 |
258 } // namespace gles2 | 258 } // namespace gles2 |
259 } // namespace gpu | 259 } // namespace gpu |
260 | 260 |
OLD | NEW |