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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 bool has_depth, | 80 bool has_depth, |
81 bool has_stencil, | 81 bool has_stencil, |
82 bool request_alpha, | 82 bool request_alpha, |
83 bool request_depth, | 83 bool request_depth, |
84 bool request_stencil, | 84 bool request_stencil, |
85 bool bind_generates_resource) { | 85 bool bind_generates_resource) { |
86 gl_.reset(new StrictMock<MockGLInterface>()); | 86 gl_.reset(new StrictMock<MockGLInterface>()); |
87 ::gfx::GLInterface::SetGLInterface(gl_.get()); | 87 ::gfx::GLInterface::SetGLInterface(gl_.get()); |
88 group_ = ContextGroup::Ref(new ContextGroup(NULL, | 88 group_ = ContextGroup::Ref(new ContextGroup(NULL, |
89 NULL, | 89 NULL, |
| 90 NULL, |
90 bind_generates_resource)); | 91 bind_generates_resource)); |
91 | 92 |
92 InSequence sequence; | 93 InSequence sequence; |
93 | 94 |
94 TestHelper::SetupContextGroupInitExpectations(gl_.get(), | 95 TestHelper::SetupContextGroupInitExpectations(gl_.get(), |
95 DisallowedFeatures(), extensions); | 96 DisallowedFeatures(), extensions); |
96 | 97 |
97 EXPECT_TRUE(group_->Initialize(DisallowedFeatures(), NULL)); | 98 EXPECT_TRUE(group_->Initialize(DisallowedFeatures(), NULL)); |
98 | 99 |
99 AddExpectationsForVertexAttribManager(); | 100 AddExpectationsForVertexAttribManager(); |
(...skipping 1281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1381 return 0; | 1382 return 0; |
1382 } | 1383 } |
1383 | 1384 |
1384 void GLES2DecoderWithShaderTestBase::SetUp() { | 1385 void GLES2DecoderWithShaderTestBase::SetUp() { |
1385 GLES2DecoderTestBase::SetUp(); | 1386 GLES2DecoderTestBase::SetUp(); |
1386 SetupDefaultProgram(); | 1387 SetupDefaultProgram(); |
1387 } | 1388 } |
1388 | 1389 |
1389 } // namespace gles2 | 1390 } // namespace gles2 |
1390 } // namespace gpu | 1391 } // namespace gpu |
OLD | NEW |