| 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/gles2_conform_support/egl/display.h" | 5 #include "gpu/gles2_conform_support/egl/display.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
| 10 #include "gpu/command_buffer/client/gles2_implementation.h" | 10 #include "gpu/command_buffer/client/gles2_implementation.h" |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 | 162 |
| 163 if (!decoder_->Initialize(gl_surface_.get(), | 163 if (!decoder_->Initialize(gl_surface_.get(), |
| 164 gl_context_.get(), | 164 gl_context_.get(), |
| 165 gl_surface_->IsOffscreen(), | 165 gl_surface_->IsOffscreen(), |
| 166 size, | 166 size, |
| 167 gpu::gles2::DisallowedFeatures(), | 167 gpu::gles2::DisallowedFeatures(), |
| 168 attribs)) { | 168 attribs)) { |
| 169 return EGL_NO_SURFACE; | 169 return EGL_NO_SURFACE; |
| 170 } | 170 } |
| 171 | 171 |
| 172 gpu_control_service_.reset(new gpu::GpuControlService(NULL, NULL)); | |
| 173 | |
| 174 command_buffer->SetPutOffsetChangeCallback( | 172 command_buffer->SetPutOffsetChangeCallback( |
| 175 base::Bind(&gpu::GpuScheduler::PutChanged, | 173 base::Bind(&gpu::GpuScheduler::PutChanged, |
| 176 base::Unretained(gpu_scheduler_.get()))); | 174 base::Unretained(gpu_scheduler_.get()))); |
| 177 command_buffer->SetGetBufferChangeCallback( | 175 command_buffer->SetGetBufferChangeCallback( |
| 178 base::Bind(&gpu::GpuScheduler::SetGetBuffer, | 176 base::Bind(&gpu::GpuScheduler::SetGetBuffer, |
| 179 base::Unretained(gpu_scheduler_.get()))); | 177 base::Unretained(gpu_scheduler_.get()))); |
| 180 | 178 |
| 181 scoped_ptr<gpu::gles2::GLES2CmdHelper> cmd_helper( | 179 scoped_ptr<gpu::gles2::GLES2CmdHelper> cmd_helper( |
| 182 new gpu::gles2::GLES2CmdHelper(command_buffer.get())); | 180 new gpu::gles2::GLES2CmdHelper(command_buffer.get())); |
| 183 if (!cmd_helper->Initialize(kCommandBufferSize)) | 181 if (!cmd_helper->Initialize(kCommandBufferSize)) |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 void Display::Echo(const base::Closure& callback) { | 315 void Display::Echo(const base::Closure& callback) { |
| 318 NOTIMPLEMENTED(); | 316 NOTIMPLEMENTED(); |
| 319 } | 317 } |
| 320 | 318 |
| 321 uint32 Display::CreateStreamTexture(uint32 texture_id) { | 319 uint32 Display::CreateStreamTexture(uint32 texture_id) { |
| 322 NOTIMPLEMENTED(); | 320 NOTIMPLEMENTED(); |
| 323 return 0; | 321 return 0; |
| 324 } | 322 } |
| 325 | 323 |
| 326 } // namespace egl | 324 } // namespace egl |
| OLD | NEW |