| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "cc/resources/resource_provider.h" | 5 #include "cc/resources/resource_provider.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 | 9 |
| 10 #include "base/containers/hash_tables.h" | 10 #include "base/containers/hash_tables.h" |
| (...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1081 std::swap(resource_->gpu_memory_buffer, gpu_memory_buffer_); | 1081 std::swap(resource_->gpu_memory_buffer, gpu_memory_buffer_); |
| 1082 resource_->allocated = true; | 1082 resource_->allocated = true; |
| 1083 resource_->dirty_image = true; | 1083 resource_->dirty_image = true; |
| 1084 | 1084 |
| 1085 // GpuMemoryBuffer provides direct access to the memory used by the GPU. | 1085 // GpuMemoryBuffer provides direct access to the memory used by the GPU. |
| 1086 // Read lock fences are required to ensure that we're not trying to map a | 1086 // Read lock fences are required to ensure that we're not trying to map a |
| 1087 // buffer that is currently in-use by the GPU. | 1087 // buffer that is currently in-use by the GPU. |
| 1088 resource_->read_lock_fences_enabled = true; | 1088 resource_->read_lock_fences_enabled = true; |
| 1089 } | 1089 } |
| 1090 | 1090 |
| 1091 gfx::GpuMemoryBuffer* | 1091 bool ResourceProvider::ScopedWriteLockGpuMemoryBuffer::AllocateGpuMemoryBuffer( |
| 1092 ResourceProvider::ScopedWriteLockGpuMemoryBuffer::GetGpuMemoryBuffer() { | 1092 bool persistent) { |
| 1093 if (!gpu_memory_buffer_) { | 1093 DCHECK(!gpu_memory_buffer_); |
| 1094 scoped_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer = | 1094 gfx::GpuMemoryBuffer::Usage usage = persistent |
| 1095 gpu_memory_buffer_manager_->AllocateGpuMemoryBuffer( | 1095 ? gfx::GpuMemoryBuffer::PERSISTENT_MAP |
| 1096 size_, ToGpuMemoryBufferFormat(format_), gfx::GpuMemoryBuffer::MAP); | 1096 : gfx::GpuMemoryBuffer::MAP; |
| 1097 gpu_memory_buffer_ = gpu_memory_buffer.release(); | 1097 scoped_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer = |
| 1098 } | 1098 gpu_memory_buffer_manager_->AllocateGpuMemoryBuffer( |
| 1099 | 1099 size_, ToGpuMemoryBufferFormat(format_), usage); |
| 1100 return gpu_memory_buffer_; | 1100 gpu_memory_buffer_ = gpu_memory_buffer.release(); |
| 1101 return !!gpu_memory_buffer_; |
| 1101 } | 1102 } |
| 1102 | 1103 |
| 1103 ResourceProvider::ScopedWriteLockGr::ScopedWriteLockGr( | 1104 ResourceProvider::ScopedWriteLockGr::ScopedWriteLockGr( |
| 1104 ResourceProvider* resource_provider, | 1105 ResourceProvider* resource_provider, |
| 1105 ResourceId resource_id) | 1106 ResourceId resource_id) |
| 1106 : resource_provider_(resource_provider), | 1107 : resource_provider_(resource_provider), |
| 1107 resource_(resource_provider->LockForWrite(resource_id)) { | 1108 resource_(resource_provider->LockForWrite(resource_id)) { |
| 1108 DCHECK(thread_checker_.CalledOnValidThread()); | 1109 DCHECK(thread_checker_.CalledOnValidThread()); |
| 1109 resource_provider_->LazyAllocate(resource_); | 1110 resource_provider_->LazyAllocate(resource_); |
| 1110 } | 1111 } |
| (...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2052 } | 2053 } |
| 2053 | 2054 |
| 2054 class GrContext* ResourceProvider::GrContext(bool worker_context) const { | 2055 class GrContext* ResourceProvider::GrContext(bool worker_context) const { |
| 2055 ContextProvider* context_provider = | 2056 ContextProvider* context_provider = |
| 2056 worker_context ? output_surface_->worker_context_provider() | 2057 worker_context ? output_surface_->worker_context_provider() |
| 2057 : output_surface_->context_provider(); | 2058 : output_surface_->context_provider(); |
| 2058 return context_provider ? context_provider->GrContext() : NULL; | 2059 return context_provider ? context_provider->GrContext() : NULL; |
| 2059 } | 2060 } |
| 2060 | 2061 |
| 2061 } // namespace cc | 2062 } // namespace cc |
| OLD | NEW |