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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 bool has_depth, | 81 bool has_depth, |
82 bool has_stencil, | 82 bool has_stencil, |
83 bool request_alpha, | 83 bool request_alpha, |
84 bool request_depth, | 84 bool request_depth, |
85 bool request_stencil, | 85 bool request_stencil, |
86 bool bind_generates_resource) { | 86 bool bind_generates_resource) { |
87 gl_.reset(new StrictMock<MockGLInterface>()); | 87 gl_.reset(new StrictMock<MockGLInterface>()); |
88 ::gfx::GLInterface::SetGLInterface(gl_.get()); | 88 ::gfx::GLInterface::SetGLInterface(gl_.get()); |
89 group_ = ContextGroup::Ref(new ContextGroup(NULL, | 89 group_ = ContextGroup::Ref(new ContextGroup(NULL, |
90 NULL, | 90 NULL, |
| 91 NULL, |
91 bind_generates_resource)); | 92 bind_generates_resource)); |
92 | 93 |
93 InSequence sequence; | 94 InSequence sequence; |
94 | 95 |
95 TestHelper::SetupContextGroupInitExpectations(gl_.get(), | 96 TestHelper::SetupContextGroupInitExpectations(gl_.get(), |
96 DisallowedFeatures(), extensions); | 97 DisallowedFeatures(), extensions); |
97 | 98 |
98 EXPECT_TRUE(group_->Initialize(DisallowedFeatures(), NULL)); | 99 EXPECT_TRUE(group_->Initialize(DisallowedFeatures(), NULL)); |
99 | 100 |
100 AddExpectationsForVertexAttribManager(); | 101 AddExpectationsForVertexAttribManager(); |
(...skipping 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1441 return 0; | 1442 return 0; |
1442 } | 1443 } |
1443 | 1444 |
1444 void GLES2DecoderWithShaderTestBase::SetUp() { | 1445 void GLES2DecoderWithShaderTestBase::SetUp() { |
1445 GLES2DecoderTestBase::SetUp(); | 1446 GLES2DecoderTestBase::SetUp(); |
1446 SetupDefaultProgram(); | 1447 SetupDefaultProgram(); |
1447 } | 1448 } |
1448 | 1449 |
1449 } // namespace gles2 | 1450 } // namespace gles2 |
1450 } // namespace gpu | 1451 } // namespace gpu |
OLD | NEW |