| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/client/gpu_memory_buffer_tracker.h" | 5 #include "gpu/command_buffer/client/gpu_memory_buffer_tracker.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "gpu/command_buffer/client/gles2_implementation.h" | 8 #include "gpu/command_buffer/client/gles2_implementation.h" |
| 9 #include "gpu/command_buffer/client/image_factory.h" | 9 #include "gpu/command_buffer/common/gpu_control.h" |
| 10 #include "ui/gfx/gpu_memory_buffer.h" | |
| 11 | 10 |
| 12 namespace gpu { | 11 namespace gpu { |
| 13 namespace gles2 { | 12 namespace gles2 { |
| 14 | 13 |
| 15 GpuMemoryBufferTracker::GpuMemoryBufferTracker(ImageFactory* factory) | 14 GpuMemoryBufferTracker::GpuMemoryBufferTracker(GpuControl* gpu_control) |
| 16 : buffers_(), | 15 : gpu_control_(gpu_control) { |
| 17 factory_(factory) { | |
| 18 } | 16 } |
| 19 | 17 |
| 20 GpuMemoryBufferTracker::~GpuMemoryBufferTracker() { | 18 GpuMemoryBufferTracker::~GpuMemoryBufferTracker() { |
| 21 while (!buffers_.empty()) { | 19 while (!buffers_.empty()) { |
| 22 RemoveBuffer(buffers_.begin()->first); | 20 RemoveBuffer(buffers_.begin()->first); |
| 23 } | 21 } |
| 24 } | 22 } |
| 25 | 23 |
| 26 GLuint GpuMemoryBufferTracker::CreateBuffer( | 24 int32 GpuMemoryBufferTracker::CreateBuffer( |
| 27 GLsizei width, GLsizei height, GLenum internalformat) { | 25 size_t width, size_t height, int32 internalformat) { |
| 28 GLuint image_id = 0; | 26 int32 image_id = 0; |
| 29 DCHECK(factory_); | 27 DCHECK(gpu_control_); |
| 30 scoped_ptr<gfx::GpuMemoryBuffer> buffer = | 28 gfx::GpuMemoryBuffer* buffer = gpu_control_->CreateGpuMemoryBuffer( |
| 31 factory_->CreateGpuMemoryBuffer(width, height, internalformat, &image_id); | 29 width, height, internalformat, &image_id); |
| 32 | 30 if (!buffer) |
| 33 if (buffer.get() == NULL) | |
| 34 return 0; | 31 return 0; |
| 35 | 32 |
| 36 std::pair<BufferMap::iterator, bool> result = | 33 std::pair<BufferMap::iterator, bool> result = |
| 37 buffers_.insert(std::make_pair(image_id, buffer.release())); | 34 buffers_.insert(std::make_pair(image_id, buffer)); |
| 38 GPU_DCHECK(result.second); | 35 GPU_DCHECK(result.second); |
| 39 | 36 |
| 40 return image_id; | 37 return image_id; |
| 41 } | 38 } |
| 42 | 39 |
| 43 gfx::GpuMemoryBuffer* GpuMemoryBufferTracker::GetBuffer(GLuint image_id) { | 40 gfx::GpuMemoryBuffer* GpuMemoryBufferTracker::GetBuffer(int32 image_id) { |
| 44 BufferMap::iterator it = buffers_.find(image_id); | 41 BufferMap::iterator it = buffers_.find(image_id); |
| 45 return (it != buffers_.end()) ? it->second : NULL; | 42 return (it != buffers_.end()) ? it->second : NULL; |
| 46 } | 43 } |
| 47 | 44 |
| 48 void GpuMemoryBufferTracker::RemoveBuffer(GLuint image_id) { | 45 void GpuMemoryBufferTracker::RemoveBuffer(int32 image_id) { |
| 49 BufferMap::iterator buffer_it = buffers_.find(image_id); | 46 BufferMap::iterator buffer_it = buffers_.find(image_id); |
| 50 if (buffer_it != buffers_.end()) { | 47 if (buffer_it != buffers_.end()) |
| 51 gfx::GpuMemoryBuffer* buffer = buffer_it->second; | |
| 52 buffers_.erase(buffer_it); | 48 buffers_.erase(buffer_it); |
| 53 delete buffer; | 49 DCHECK(gpu_control_); |
| 54 } | 50 gpu_control_->DestroyGpuMemoryBuffer(image_id); |
| 55 DCHECK(factory_); | |
| 56 factory_->DeleteGpuMemoryBuffer(image_id); | |
| 57 } | 51 } |
| 58 | 52 |
| 59 } // namespace gles2 | 53 } // namespace gles2 |
| 60 } // namespace gpu | 54 } // namespace gpu |
| OLD | NEW |