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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 std::vector<std::string> list; | 169 std::vector<std::string> list; |
170 base::SplitString(normalized_init.extensions, ' ', &list); | 170 base::SplitString(normalized_init.extensions, ' ', &list); |
171 scoped_refptr<FeatureInfo> feature_info; | 171 scoped_refptr<FeatureInfo> feature_info; |
172 if (command_line) | 172 if (command_line) |
173 feature_info = new FeatureInfo(*command_line); | 173 feature_info = new FeatureInfo(*command_line); |
174 group_ = scoped_refptr<ContextGroup>( | 174 group_ = scoped_refptr<ContextGroup>( |
175 new ContextGroup(NULL, | 175 new ContextGroup(NULL, |
176 memory_tracker_, | 176 memory_tracker_, |
177 new ShaderTranslatorCache, | 177 new ShaderTranslatorCache, |
178 feature_info.get(), | 178 feature_info.get(), |
| 179 new SubscriptionRefSet, |
179 new ValueStateMap, | 180 new ValueStateMap, |
180 normalized_init.bind_generates_resource)); | 181 normalized_init.bind_generates_resource)); |
181 bool use_default_textures = normalized_init.bind_generates_resource; | 182 bool use_default_textures = normalized_init.bind_generates_resource; |
182 | 183 |
183 InSequence sequence; | 184 InSequence sequence; |
184 | 185 |
185 surface_ = new gfx::GLSurfaceStub; | 186 surface_ = new gfx::GLSurfaceStub; |
186 surface_->SetSize(gfx::Size(kBackBufferWidth, kBackBufferHeight)); | 187 surface_->SetSize(gfx::Size(kBackBufferWidth, kBackBufferHeight)); |
187 | 188 |
188 // Context needs to be created before initializing ContextGroup, which will | 189 // Context needs to be created before initializing ContextGroup, which will |
(...skipping 1505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1694 SetupDefaultProgram(); | 1695 SetupDefaultProgram(); |
1695 } | 1696 } |
1696 | 1697 |
1697 // Include the auto-generated part of this file. We split this because it means | 1698 // Include the auto-generated part of this file. We split this because it means |
1698 // we can easily edit the non-auto generated parts right here in this file | 1699 // we can easily edit the non-auto generated parts right here in this file |
1699 // instead of having to edit some template or the code generator. | 1700 // instead of having to edit some template or the code generator. |
1700 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" | 1701 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" |
1701 | 1702 |
1702 } // namespace gles2 | 1703 } // namespace gles2 |
1703 } // namespace gpu | 1704 } // namespace gpu |
OLD | NEW |