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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 const char* extensions, | 67 const char* extensions, |
68 bool has_alpha, | 68 bool has_alpha, |
69 bool has_depth, | 69 bool has_depth, |
70 bool has_stencil, | 70 bool has_stencil, |
71 bool request_alpha, | 71 bool request_alpha, |
72 bool request_depth, | 72 bool request_depth, |
73 bool request_stencil, | 73 bool request_stencil, |
74 bool bind_generates_resource) { | 74 bool bind_generates_resource) { |
75 gl_.reset(new StrictMock<MockGLInterface>()); | 75 gl_.reset(new StrictMock<MockGLInterface>()); |
76 ::gfx::GLInterface::SetGLInterface(gl_.get()); | 76 ::gfx::GLInterface::SetGLInterface(gl_.get()); |
77 group_ = ContextGroup::Ref(new ContextGroup(bind_generates_resource)); | 77 group_ = ContextGroup::Ref(new ContextGroup(NULL, bind_generates_resource)); |
78 | 78 |
79 InSequence sequence; | 79 InSequence sequence; |
80 | 80 |
81 TestHelper::SetupContextGroupInitExpectations(gl_.get(), | 81 TestHelper::SetupContextGroupInitExpectations(gl_.get(), |
82 DisallowedFeatures(), extensions); | 82 DisallowedFeatures(), extensions); |
83 | 83 |
84 EXPECT_TRUE(group_->Initialize(DisallowedFeatures(), NULL)); | 84 EXPECT_TRUE(group_->Initialize(DisallowedFeatures(), NULL)); |
85 | 85 |
86 EXPECT_CALL(*gl_, EnableVertexAttribArray(0)) | 86 EXPECT_CALL(*gl_, EnableVertexAttribArray(0)) |
87 .Times(1) | 87 .Times(1) |
(...skipping 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1183 num_vertices, buffer_id, GL_NO_ERROR); | 1183 num_vertices, buffer_id, GL_NO_ERROR); |
1184 } | 1184 } |
1185 | 1185 |
1186 void GLES2DecoderWithShaderTestBase::SetUp() { | 1186 void GLES2DecoderWithShaderTestBase::SetUp() { |
1187 GLES2DecoderTestBase::SetUp(); | 1187 GLES2DecoderTestBase::SetUp(); |
1188 SetupDefaultProgram(); | 1188 SetupDefaultProgram(); |
1189 } | 1189 } |
1190 | 1190 |
1191 } // namespace gles2 | 1191 } // namespace gles2 |
1192 } // namespace gpu | 1192 } // namespace gpu |
OLD | NEW |