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/tests/gl_manager.h" | 5 #include "gpu/command_buffer/tests/gl_manager.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/at_exit.h" | 9 #include "base/at_exit.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 attribs.push_back(8); | 92 attribs.push_back(8); |
93 attribs.push_back(EGL_ALPHA_SIZE); | 93 attribs.push_back(EGL_ALPHA_SIZE); |
94 attribs.push_back(8); | 94 attribs.push_back(8); |
95 attribs.push_back(EGL_DEPTH_SIZE); | 95 attribs.push_back(EGL_DEPTH_SIZE); |
96 attribs.push_back(16); | 96 attribs.push_back(16); |
97 attribs.push_back(EGL_NONE); | 97 attribs.push_back(EGL_NONE); |
98 | 98 |
99 if (!context_group) { | 99 if (!context_group) { |
100 context_group = new gles2::ContextGroup(mailbox_manager_.get(), | 100 context_group = new gles2::ContextGroup(mailbox_manager_.get(), |
101 NULL, | 101 NULL, |
| 102 NULL, |
102 kBindGeneratesResource); | 103 kBindGeneratesResource); |
103 } | 104 } |
104 | 105 |
105 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group)); | 106 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group)); |
106 | 107 |
107 command_buffer_.reset(new CommandBufferService( | 108 command_buffer_.reset(new CommandBufferService( |
108 decoder_->GetContextGroup()->transfer_buffer_manager())); | 109 decoder_->GetContextGroup()->transfer_buffer_manager())); |
109 ASSERT_TRUE(command_buffer_->Initialize()) | 110 ASSERT_TRUE(command_buffer_->Initialize()) |
110 << "could not create command buffer service"; | 111 << "could not create command buffer service"; |
111 | 112 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
188 ::gpu::CommandBuffer::State state = command_buffer_->GetState(); | 189 ::gpu::CommandBuffer::State state = command_buffer_->GetState(); |
189 ASSERT_EQ(::gpu::error::kNoError, state.error); | 190 ASSERT_EQ(::gpu::error::kNoError, state.error); |
190 } | 191 } |
191 | 192 |
192 bool GLManager::GetBufferChanged(int32 transfer_buffer_id) { | 193 bool GLManager::GetBufferChanged(int32 transfer_buffer_id) { |
193 return gpu_scheduler_->SetGetBuffer(transfer_buffer_id); | 194 return gpu_scheduler_->SetGetBuffer(transfer_buffer_id); |
194 } | 195 } |
195 | 196 |
196 } // namespace gpu | 197 } // namespace gpu |
197 | 198 |
OLD | NEW |