| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/in_process_command_buffer.h" | 5 #include "gpu/command_buffer/service/in_process_command_buffer.h" |
| 6 | 6 |
| 7 #include <queue> | 7 #include <queue> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 705 | 705 |
| 706 gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager(); | 706 gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager(); |
| 707 DCHECK(image_manager); | 707 DCHECK(image_manager); |
| 708 if (image_manager->LookupImage(id)) { | 708 if (image_manager->LookupImage(id)) { |
| 709 LOG(ERROR) << "Image already exists with same ID."; | 709 LOG(ERROR) << "Image already exists with same ID."; |
| 710 return; | 710 return; |
| 711 } | 711 } |
| 712 | 712 |
| 713 switch (handle.type) { | 713 switch (handle.type) { |
| 714 case gfx::SHARED_MEMORY_BUFFER: { | 714 case gfx::SHARED_MEMORY_BUFFER: { |
| 715 scoped_refptr<gfx::GLImageSharedMemory> image( | 715 scoped_refptr<gl::GLImageSharedMemory> image( |
| 716 new gfx::GLImageSharedMemory(size, internalformat)); | 716 new gl::GLImageSharedMemory(size, internalformat)); |
| 717 if (!image->Initialize(handle.handle, handle.id, format, handle.offset)) { | 717 if (!image->Initialize(handle.handle, handle.id, format, handle.offset)) { |
| 718 LOG(ERROR) << "Failed to initialize image."; | 718 LOG(ERROR) << "Failed to initialize image."; |
| 719 return; | 719 return; |
| 720 } | 720 } |
| 721 | 721 |
| 722 image_manager->AddImage(image.get(), id); | 722 image_manager->AddImage(image.get(), id); |
| 723 break; | 723 break; |
| 724 } | 724 } |
| 725 default: { | 725 default: { |
| 726 if (!image_factory_) { | 726 if (!image_factory_) { |
| 727 LOG(ERROR) << "Image factory missing but required by buffer type."; | 727 LOG(ERROR) << "Image factory missing but required by buffer type."; |
| 728 return; | 728 return; |
| 729 } | 729 } |
| 730 | 730 |
| 731 // Note: this assumes that client ID is always 0. | 731 // Note: this assumes that client ID is always 0. |
| 732 const int kClientId = 0; | 732 const int kClientId = 0; |
| 733 | 733 |
| 734 scoped_refptr<gfx::GLImage> image = | 734 scoped_refptr<gl::GLImage> image = |
| 735 image_factory_->CreateImageForGpuMemoryBuffer( | 735 image_factory_->CreateImageForGpuMemoryBuffer( |
| 736 handle, size, format, internalformat, kClientId); | 736 handle, size, format, internalformat, kClientId); |
| 737 if (!image.get()) { | 737 if (!image.get()) { |
| 738 LOG(ERROR) << "Failed to create image for buffer."; | 738 LOG(ERROR) << "Failed to create image for buffer."; |
| 739 return; | 739 return; |
| 740 } | 740 } |
| 741 | 741 |
| 742 image_manager->AddImage(image.get(), id); | 742 image_manager->AddImage(image.get(), id); |
| 743 break; | 743 break; |
| 744 } | 744 } |
| (...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1093 framebuffer_completeness_cache_ = | 1093 framebuffer_completeness_cache_ = |
| 1094 new gpu::gles2::FramebufferCompletenessCache; | 1094 new gpu::gles2::FramebufferCompletenessCache; |
| 1095 return framebuffer_completeness_cache_; | 1095 return framebuffer_completeness_cache_; |
| 1096 } | 1096 } |
| 1097 | 1097 |
| 1098 SyncPointManager* GpuInProcessThread::sync_point_manager() { | 1098 SyncPointManager* GpuInProcessThread::sync_point_manager() { |
| 1099 return sync_point_manager_; | 1099 return sync_point_manager_; |
| 1100 } | 1100 } |
| 1101 | 1101 |
| 1102 } // namespace gpu | 1102 } // namespace gpu |
| OLD | NEW |