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