| 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 |
| (...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 if (!command_buffer_->Initialize()) { | 407 if (!command_buffer_->Initialize()) { |
| 408 LOG(ERROR) << "Could not initialize command buffer."; | 408 LOG(ERROR) << "Could not initialize command buffer."; |
| 409 Destroy(); | 409 Destroy(); |
| 410 return false; | 410 return false; |
| 411 } | 411 } |
| 412 | 412 |
| 413 // TODO(gman): This needs to be true if this is Pepper. | 413 // TODO(gman): This needs to be true if this is Pepper. |
| 414 bool bind_generates_resource = false; | 414 bool bind_generates_resource = false; |
| 415 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group ? | 415 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group ? |
| 416 context_group->decoder_->GetContextGroup() : | 416 context_group->decoder_->GetContextGroup() : |
| 417 new ::gpu::gles2::ContextGroup(NULL, bind_generates_resource))); | 417 new ::gpu::gles2::ContextGroup(NULL, NULL, bind_generates_resource))); |
| 418 | 418 |
| 419 gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(), | 419 gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(), |
| 420 decoder_.get(), | 420 decoder_.get(), |
| 421 decoder_.get())); | 421 decoder_.get())); |
| 422 | 422 |
| 423 decoder_->set_engine(gpu_scheduler_.get()); | 423 decoder_->set_engine(gpu_scheduler_.get()); |
| 424 | 424 |
| 425 surface_ = gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1)); | 425 surface_ = gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1)); |
| 426 | 426 |
| 427 if (!surface_.get()) { | 427 if (!surface_.get()) { |
| (...skipping 1210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1638 } | 1638 } |
| 1639 } | 1639 } |
| 1640 | 1640 |
| 1641 DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM, | 1641 DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM, |
| 1642 WebGLId, WGC3Dint, const WGC3Dchar*) | 1642 WebGLId, WGC3Dint, const WGC3Dchar*) |
| 1643 | 1643 |
| 1644 DELEGATE_TO_GL(shallowFlushCHROMIUM, ShallowFlushCHROMIUM) | 1644 DELEGATE_TO_GL(shallowFlushCHROMIUM, ShallowFlushCHROMIUM) |
| 1645 | 1645 |
| 1646 } // namespace gpu | 1646 } // namespace gpu |
| 1647 } // namespace webkit | 1647 } // namespace webkit |
| OLD | NEW |