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