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/program_manager.h" | 5 #include "gpu/command_buffer/service/program_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
11 #include "base/string_util.h" | 11 #include "base/strings/string_util.h" |
12 #include "gpu/command_buffer/common/gles2_cmd_format.h" | 12 #include "gpu/command_buffer/common/gles2_cmd_format.h" |
13 #include "gpu/command_buffer/common/gles2_cmd_utils.h" | 13 #include "gpu/command_buffer/common/gles2_cmd_utils.h" |
14 #include "gpu/command_buffer/service/common_decoder.h" | 14 #include "gpu/command_buffer/service/common_decoder.h" |
15 #include "gpu/command_buffer/service/feature_info.h" | 15 #include "gpu/command_buffer/service/feature_info.h" |
16 #include "gpu/command_buffer/service/mocks.h" | 16 #include "gpu/command_buffer/service/mocks.h" |
17 #include "gpu/command_buffer/service/shader_manager.h" | 17 #include "gpu/command_buffer/service/shader_manager.h" |
18 #include "gpu/command_buffer/service/test_helper.h" | 18 #include "gpu/command_buffer/service/test_helper.h" |
19 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
20 #include "ui/gl/gl_mock.h" | 20 #include "ui/gl/gl_mock.h" |
21 | 21 |
(...skipping 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1539 new_vertex_shader, | 1539 new_vertex_shader, |
1540 fragment_shader_); | 1540 fragment_shader_); |
1541 SetExpectationsForProgramLink(kNewProgramServiceId); | 1541 SetExpectationsForProgramLink(kNewProgramServiceId); |
1542 | 1542 |
1543 EXPECT_TRUE(program->Link(&shader_manager_, NULL, NULL, | 1543 EXPECT_TRUE(program->Link(&shader_manager_, NULL, NULL, |
1544 info.get(), base::Bind(&ShaderCacheCb))); | 1544 info.get(), base::Bind(&ShaderCacheCb))); |
1545 } | 1545 } |
1546 | 1546 |
1547 } // namespace gles2 | 1547 } // namespace gles2 |
1548 } // namespace gpu | 1548 } // namespace gpu |
OLD | NEW |