| 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 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1454 gl_.get(), attribs, num_attribs, uniforms, num_uniforms, | 1454 gl_.get(), attribs, num_attribs, uniforms, num_uniforms, |
| 1455 program_service_id); | 1455 program_service_id); |
| 1456 } | 1456 } |
| 1457 | 1457 |
| 1458 DoCreateShader( | 1458 DoCreateShader( |
| 1459 GL_VERTEX_SHADER, vertex_shader_client_id, vertex_shader_service_id); | 1459 GL_VERTEX_SHADER, vertex_shader_client_id, vertex_shader_service_id); |
| 1460 DoCreateShader( | 1460 DoCreateShader( |
| 1461 GL_FRAGMENT_SHADER, fragment_shader_client_id, | 1461 GL_FRAGMENT_SHADER, fragment_shader_client_id, |
| 1462 fragment_shader_service_id); | 1462 fragment_shader_service_id); |
| 1463 | 1463 |
| 1464 GetShader(vertex_shader_client_id)->SetStatus(true, "", NULL); | 1464 TestHelper::SetShaderStates( |
| 1465 GetShader(fragment_shader_client_id)->SetStatus(true, "", NULL); | 1465 gl_.get(), GetShader(vertex_shader_client_id), true); |
| 1466 TestHelper::SetShaderStates( |
| 1467 gl_.get(), GetShader(fragment_shader_client_id), true); |
| 1466 | 1468 |
| 1467 cmds::AttachShader attach_cmd; | 1469 cmds::AttachShader attach_cmd; |
| 1468 attach_cmd.Init(program_client_id, vertex_shader_client_id); | 1470 attach_cmd.Init(program_client_id, vertex_shader_client_id); |
| 1469 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd)); | 1471 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd)); |
| 1470 | 1472 |
| 1471 attach_cmd.Init(program_client_id, fragment_shader_client_id); | 1473 attach_cmd.Init(program_client_id, fragment_shader_client_id); |
| 1472 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd)); | 1474 EXPECT_EQ(error::kNoError, ExecuteCmd(attach_cmd)); |
| 1473 | 1475 |
| 1474 cmds::LinkProgram link_cmd; | 1476 cmds::LinkProgram link_cmd; |
| 1475 link_cmd.Init(program_client_id); | 1477 link_cmd.Init(program_client_id); |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1668 SetupDefaultProgram(); | 1670 SetupDefaultProgram(); |
| 1669 } | 1671 } |
| 1670 | 1672 |
| 1671 // Include the auto-generated part of this file. We split this because it means | 1673 // Include the auto-generated part of this file. We split this because it means |
| 1672 // we can easily edit the non-auto generated parts right here in this file | 1674 // we can easily edit the non-auto generated parts right here in this file |
| 1673 // instead of having to edit some template or the code generator. | 1675 // instead of having to edit some template or the code generator. |
| 1674 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" | 1676 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" |
| 1675 | 1677 |
| 1676 } // namespace gles2 | 1678 } // namespace gles2 |
| 1677 } // namespace gpu | 1679 } // namespace gpu |
| OLD | NEW |