Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: gpu/command_buffer/service/in_process_command_buffer.cc

Issue 1421903006: ui/gl: Move GLImage into gl namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gl_unittests Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 712 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 } 723 }
724 default: { 724 default: {
725 if (!image_factory_) { 725 if (!image_factory_) {
726 LOG(ERROR) << "Image factory missing but required by buffer type."; 726 LOG(ERROR) << "Image factory missing but required by buffer type.";
727 return; 727 return;
728 } 728 }
729 729
730 // Note: this assumes that client ID is always 0. 730 // Note: this assumes that client ID is always 0.
731 const int kClientId = 0; 731 const int kClientId = 0;
732 732
733 scoped_refptr<gfx::GLImage> image = 733 scoped_refptr<gl::GLImage> image =
734 image_factory_->CreateImageForGpuMemoryBuffer( 734 image_factory_->CreateImageForGpuMemoryBuffer(
735 handle, size, format, internalformat, kClientId); 735 handle, size, format, internalformat, kClientId);
736 if (!image.get()) { 736 if (!image.get()) {
737 LOG(ERROR) << "Failed to create image for buffer."; 737 LOG(ERROR) << "Failed to create image for buffer.";
738 return; 738 return;
739 } 739 }
740 740
741 image_manager->AddImage(image.get(), id); 741 image_manager->AddImage(image.get(), id);
742 break; 742 break;
743 } 743 }
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
1092 framebuffer_completeness_cache_ = 1092 framebuffer_completeness_cache_ =
1093 new gpu::gles2::FramebufferCompletenessCache; 1093 new gpu::gles2::FramebufferCompletenessCache;
1094 return framebuffer_completeness_cache_; 1094 return framebuffer_completeness_cache_;
1095 } 1095 }
1096 1096
1097 SyncPointManager* GpuInProcessThread::sync_point_manager() { 1097 SyncPointManager* GpuInProcessThread::sync_point_manager() {
1098 return sync_point_manager_; 1098 return sync_point_manager_;
1099 } 1099 }
1100 1100
1101 } // namespace gpu 1101 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698