| 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 "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" | 5 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" |
| 6 | 6 |
| 7 #include <GLES2/gl2.h> | 7 #include <GLES2/gl2.h> |
| 8 #ifndef GL_GLEXT_PROTOTYPES | 8 #ifndef GL_GLEXT_PROTOTYPES |
| 9 #define GL_GLEXT_PROTOTYPES 1 | 9 #define GL_GLEXT_PROTOTYPES 1 |
| 10 #endif | 10 #endif |
| 11 #include <GLES2/gl2ext.h> | 11 #include <GLES2/gl2ext.h> |
| 12 | 12 |
| 13 #include <algorithm> | 13 #include <algorithm> |
| 14 #include <set> | 14 #include <set> |
| 15 #include <string> |
| 15 | 16 |
| 16 #include "base/bind.h" | 17 #include "base/bind.h" |
| 17 #include "base/bind_helpers.h" | 18 #include "base/bind_helpers.h" |
| 18 #include "base/callback.h" | 19 #include "base/callback.h" |
| 19 #include "base/command_line.h" | 20 #include "base/command_line.h" |
| 20 #include "base/lazy_instance.h" | 21 #include "base/lazy_instance.h" |
| 21 #include "base/logging.h" | 22 #include "base/logging.h" |
| 22 #include "base/memory/singleton.h" | 23 #include "base/memory/singleton.h" |
| 23 #include "base/message_loop.h" | 24 #include "base/message_loop.h" |
| 24 #include "base/metrics/histogram.h" | 25 #include "base/metrics/histogram.h" |
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 406 if (!command_buffer_->Initialize()) { | 407 if (!command_buffer_->Initialize()) { |
| 407 LOG(ERROR) << "Could not initialize command buffer."; | 408 LOG(ERROR) << "Could not initialize command buffer."; |
| 408 Destroy(); | 409 Destroy(); |
| 409 return false; | 410 return false; |
| 410 } | 411 } |
| 411 | 412 |
| 412 // TODO(gman): This needs to be true if this is Pepper. | 413 // TODO(gman): This needs to be true if this is Pepper. |
| 413 bool bind_generates_resource = false; | 414 bool bind_generates_resource = false; |
| 414 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group ? | 415 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group ? |
| 415 context_group->decoder_->GetContextGroup() : | 416 context_group->decoder_->GetContextGroup() : |
| 416 new ::gpu::gles2::ContextGroup(NULL, bind_generates_resource))); | 417 new ::gpu::gles2::ContextGroup(NULL, |
| 418 bind_generates_resource, |
| 419 NULL))); |
| 417 | 420 |
| 418 gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(), | 421 gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(), |
| 419 decoder_.get(), | 422 decoder_.get(), |
| 420 decoder_.get())); | 423 decoder_.get())); |
| 421 | 424 |
| 422 decoder_->set_engine(gpu_scheduler_.get()); | 425 decoder_->set_engine(gpu_scheduler_.get()); |
| 423 | 426 |
| 424 surface_ = gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1)); | 427 surface_ = gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1)); |
| 425 | 428 |
| 426 if (!surface_.get()) { | 429 if (!surface_.get()) { |
| (...skipping 1208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1635 if (context_lost_callback_) { | 1638 if (context_lost_callback_) { |
| 1636 context_lost_callback_->onContextLost(); | 1639 context_lost_callback_->onContextLost(); |
| 1637 } | 1640 } |
| 1638 } | 1641 } |
| 1639 | 1642 |
| 1640 DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM, | 1643 DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM, |
| 1641 WebGLId, WGC3Dint, const WGC3Dchar*) | 1644 WebGLId, WGC3Dint, const WGC3Dchar*) |
| 1642 | 1645 |
| 1643 } // namespace gpu | 1646 } // namespace gpu |
| 1644 } // namespace webkit | 1647 } // namespace webkit |
| OLD | NEW |