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 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
187 const char* extensions, | 187 const char* extensions, |
188 bool has_alpha, | 188 bool has_alpha, |
189 bool has_depth, | 189 bool has_depth, |
190 bool has_stencil, | 190 bool has_stencil, |
191 bool request_alpha, | 191 bool request_alpha, |
192 bool request_depth, | 192 bool request_depth, |
193 bool request_stencil, | 193 bool request_stencil, |
194 bool bind_generates_resource) { | 194 bool bind_generates_resource) { |
195 gl_.reset(new StrictMock<MockGLInterface>()); | 195 gl_.reset(new StrictMock<MockGLInterface>()); |
196 ::gfx::GLInterface::SetGLInterface(gl_.get()); | 196 ::gfx::GLInterface::SetGLInterface(gl_.get()); |
197 group_ = ContextGroup::Ref(new ContextGroup(bind_generates_resource)); | 197 group_ = ContextGroup::Ref(new ContextGroup(NULL, bind_generates_resource)); |
198 | 198 |
199 InSequence sequence; | 199 InSequence sequence; |
200 | 200 |
201 TestHelper::SetupContextGroupInitExpectations(gl_.get(), | 201 TestHelper::SetupContextGroupInitExpectations(gl_.get(), |
202 DisallowedFeatures(), extensions); | 202 DisallowedFeatures(), extensions); |
203 | 203 |
204 EXPECT_TRUE(group_->Initialize(DisallowedFeatures(), NULL)); | 204 EXPECT_TRUE(group_->Initialize(DisallowedFeatures(), NULL)); |
205 | 205 |
206 AddExpectationsForCopyTextureCHROMIUM(); | 206 AddExpectationsForCopyTextureCHROMIUM(); |
207 | 207 |
(...skipping 1256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1464 num_vertices, buffer_id, GL_NO_ERROR); | 1464 num_vertices, buffer_id, GL_NO_ERROR); |
1465 } | 1465 } |
1466 | 1466 |
1467 void GLES2DecoderWithShaderTestBase::SetUp() { | 1467 void GLES2DecoderWithShaderTestBase::SetUp() { |
1468 GLES2DecoderTestBase::SetUp(); | 1468 GLES2DecoderTestBase::SetUp(); |
1469 SetupDefaultProgram(); | 1469 SetupDefaultProgram(); |
1470 } | 1470 } |
1471 | 1471 |
1472 } // namespace gles2 | 1472 } // namespace gles2 |
1473 } // namespace gpu | 1473 } // namespace gpu |
OLD | NEW |