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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 // Only create stream texture manager if extension is requested. | 106 // Only create stream texture manager if extension is requested. |
107 std::vector<std::string> list; | 107 std::vector<std::string> list; |
108 base::SplitString(init.extensions, ' ', &list); | 108 base::SplitString(init.extensions, ' ', &list); |
109 scoped_refptr<FeatureInfo> feature_info; | 109 scoped_refptr<FeatureInfo> feature_info; |
110 if (command_line) | 110 if (command_line) |
111 feature_info = new FeatureInfo(*command_line); | 111 feature_info = new FeatureInfo(*command_line); |
112 group_ = scoped_refptr<ContextGroup>( | 112 group_ = scoped_refptr<ContextGroup>( |
113 new ContextGroup(NULL, | 113 new ContextGroup(NULL, |
114 NULL, | 114 NULL, |
115 memory_tracker_, | 115 memory_tracker_, |
| 116 new ShaderTranslatorCache, |
116 feature_info.get(), | 117 feature_info.get(), |
117 init.bind_generates_resource)); | 118 init.bind_generates_resource)); |
118 | 119 |
119 InSequence sequence; | 120 InSequence sequence; |
120 | 121 |
121 surface_ = new gfx::GLSurfaceStub; | 122 surface_ = new gfx::GLSurfaceStub; |
122 surface_->SetSize(gfx::Size(kBackBufferWidth, kBackBufferHeight)); | 123 surface_->SetSize(gfx::Size(kBackBufferWidth, kBackBufferHeight)); |
123 | 124 |
124 // Context needs to be created before initializing ContextGroup, which will | 125 // Context needs to be created before initializing ContextGroup, which will |
125 // in turn initialize FeatureInfo, which needs a context to determine | 126 // in turn initialize FeatureInfo, which needs a context to determine |
(...skipping 1326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1452 SetupDefaultProgram(); | 1453 SetupDefaultProgram(); |
1453 } | 1454 } |
1454 | 1455 |
1455 // Include the auto-generated part of this file. We split this because it means | 1456 // Include the auto-generated part of this file. We split this because it means |
1456 // we can easily edit the non-auto generated parts right here in this file | 1457 // we can easily edit the non-auto generated parts right here in this file |
1457 // instead of having to edit some template or the code generator. | 1458 // instead of having to edit some template or the code generator. |
1458 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" | 1459 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" |
1459 | 1460 |
1460 } // namespace gles2 | 1461 } // namespace gles2 |
1461 } // namespace gpu | 1462 } // namespace gpu |
OLD | NEW |