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 | 9 |
10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 const char* extensions, | 76 const char* extensions, |
77 bool has_alpha, | 77 bool has_alpha, |
78 bool has_depth, | 78 bool has_depth, |
79 bool has_stencil, | 79 bool has_stencil, |
80 bool request_alpha, | 80 bool request_alpha, |
81 bool request_depth, | 81 bool request_depth, |
82 bool request_stencil, | 82 bool request_stencil, |
83 bool bind_generates_resource) { | 83 bool bind_generates_resource) { |
84 gl_.reset(new StrictMock<MockGLInterface>()); | 84 gl_.reset(new StrictMock<MockGLInterface>()); |
85 ::gfx::GLInterface::SetGLInterface(gl_.get()); | 85 ::gfx::GLInterface::SetGLInterface(gl_.get()); |
86 group_ = ContextGroup::Ref(new ContextGroup(NULL, bind_generates_resource)); | 86 group_ = ContextGroup::Ref(new ContextGroup(NULL, |
| 87 NULL, |
| 88 bind_generates_resource)); |
87 | 89 |
88 InSequence sequence; | 90 InSequence sequence; |
89 | 91 |
90 TestHelper::SetupContextGroupInitExpectations(gl_.get(), | 92 TestHelper::SetupContextGroupInitExpectations(gl_.get(), |
91 DisallowedFeatures(), extensions); | 93 DisallowedFeatures(), extensions); |
92 | 94 |
93 EXPECT_TRUE(group_->Initialize(DisallowedFeatures(), NULL)); | 95 EXPECT_TRUE(group_->Initialize(DisallowedFeatures(), NULL)); |
94 | 96 |
95 AddExpectationsForVertexAttribManager(); | 97 AddExpectationsForVertexAttribManager(); |
96 | 98 |
(...skipping 1241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1338 num_vertices, buffer_id, GL_NO_ERROR); | 1340 num_vertices, buffer_id, GL_NO_ERROR); |
1339 } | 1341 } |
1340 | 1342 |
1341 void GLES2DecoderWithShaderTestBase::SetUp() { | 1343 void GLES2DecoderWithShaderTestBase::SetUp() { |
1342 GLES2DecoderTestBase::SetUp(); | 1344 GLES2DecoderTestBase::SetUp(); |
1343 SetupDefaultProgram(); | 1345 SetupDefaultProgram(); |
1344 } | 1346 } |
1345 | 1347 |
1346 } // namespace gles2 | 1348 } // namespace gles2 |
1347 } // namespace gpu | 1349 } // namespace gpu |
OLD | NEW |