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 "gpu/command_buffer/service/texture_manager.h" | 5 #include "gpu/command_buffer/service/texture_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bits.h" | 10 #include "base/bits.h" |
(...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1021 TextureRef::~TextureRef() { | 1021 TextureRef::~TextureRef() { |
1022 manager_->StopTracking(this); | 1022 manager_->StopTracking(this); |
1023 texture_->RemoveTextureRef(this, manager_->have_context_); | 1023 texture_->RemoveTextureRef(this, manager_->have_context_); |
1024 manager_ = NULL; | 1024 manager_ = NULL; |
1025 } | 1025 } |
1026 | 1026 |
1027 TextureManager::TextureManager(MemoryTracker* memory_tracker, | 1027 TextureManager::TextureManager(MemoryTracker* memory_tracker, |
1028 FeatureInfo* feature_info, | 1028 FeatureInfo* feature_info, |
1029 GLint max_texture_size, | 1029 GLint max_texture_size, |
1030 GLint max_cube_map_texture_size, | 1030 GLint max_cube_map_texture_size, |
| 1031 GLint max_rectangle_texture_size, |
1031 bool use_default_textures) | 1032 bool use_default_textures) |
1032 : memory_tracker_managed_( | 1033 : memory_tracker_managed_( |
1033 new MemoryTypeTracker(memory_tracker, MemoryTracker::kManaged)), | 1034 new MemoryTypeTracker(memory_tracker, MemoryTracker::kManaged)), |
1034 memory_tracker_unmanaged_( | 1035 memory_tracker_unmanaged_( |
1035 new MemoryTypeTracker(memory_tracker, MemoryTracker::kUnmanaged)), | 1036 new MemoryTypeTracker(memory_tracker, MemoryTracker::kUnmanaged)), |
1036 feature_info_(feature_info), | 1037 feature_info_(feature_info), |
1037 framebuffer_manager_(NULL), | 1038 framebuffer_manager_(NULL), |
1038 max_texture_size_(max_texture_size), | 1039 max_texture_size_(max_texture_size), |
1039 max_cube_map_texture_size_(max_cube_map_texture_size), | 1040 max_cube_map_texture_size_(max_cube_map_texture_size), |
| 1041 max_rectangle_texture_size_(max_rectangle_texture_size), |
1040 max_levels_(ComputeMipMapCount(GL_TEXTURE_2D, | 1042 max_levels_(ComputeMipMapCount(GL_TEXTURE_2D, |
1041 max_texture_size, | 1043 max_texture_size, |
1042 max_texture_size, | 1044 max_texture_size, |
1043 max_texture_size)), | 1045 max_texture_size)), |
1044 max_cube_map_levels_(ComputeMipMapCount(GL_TEXTURE_CUBE_MAP, | 1046 max_cube_map_levels_(ComputeMipMapCount(GL_TEXTURE_CUBE_MAP, |
1045 max_cube_map_texture_size, | 1047 max_cube_map_texture_size, |
1046 max_cube_map_texture_size, | 1048 max_cube_map_texture_size, |
1047 max_cube_map_texture_size)), | 1049 max_cube_map_texture_size)), |
1048 use_default_textures_(use_default_textures), | 1050 use_default_textures_(use_default_textures), |
1049 num_unrenderable_textures_(0), | 1051 num_unrenderable_textures_(0), |
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1720 } | 1722 } |
1721 | 1723 |
1722 ScopedTextureUploadTimer::~ScopedTextureUploadTimer() { | 1724 ScopedTextureUploadTimer::~ScopedTextureUploadTimer() { |
1723 texture_state_->texture_upload_count++; | 1725 texture_state_->texture_upload_count++; |
1724 texture_state_->total_texture_upload_time += | 1726 texture_state_->total_texture_upload_time += |
1725 base::TimeTicks::HighResNow() - begin_time_; | 1727 base::TimeTicks::HighResNow() - begin_time_; |
1726 } | 1728 } |
1727 | 1729 |
1728 } // namespace gles2 | 1730 } // namespace gles2 |
1729 } // namespace gpu | 1731 } // namespace gpu |
OLD | NEW |