Index: gpu/command_buffer/service/memory_program_cache.cc |
diff --git a/gpu/command_buffer/service/memory_program_cache.cc b/gpu/command_buffer/service/memory_program_cache.cc |
index 3d6876f5b412fea5c2a09d456fe7ad3bee711cb5..ced200d57e0481fdb289ae62ac9650bb02cc1c48 100644 |
--- a/gpu/command_buffer/service/memory_program_cache.cc |
+++ b/gpu/command_buffer/service/memory_program_cache.cc |
@@ -16,27 +16,10 @@ |
#include "gpu/command_buffer/service/disk_cache_proto.pb.h" |
#include "gpu/command_buffer/service/gl_utils.h" |
#include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
-#include "gpu/command_buffer/service/gpu_switches.h" |
+#include "gpu/command_buffer/service/gpu_preferences.h" |
#include "gpu/command_buffer/service/shader_manager.h" |
#include "ui/gl/gl_bindings.h" |
-namespace { |
- |
-size_t GetCacheSizeBytes() { |
- const base::CommandLine* command_line = |
- base::CommandLine::ForCurrentProcess(); |
- if (command_line->HasSwitch(switches::kGpuProgramCacheSizeKb)) { |
- size_t size; |
- if (base::StringToSizeT( |
- command_line->GetSwitchValueNative(switches::kGpuProgramCacheSizeKb), |
- &size)) |
- return size * 1024; |
- } |
- return gpu::kDefaultMaxProgramCacheMemoryBytes; |
-} |
- |
-} // anonymous namespace |
- |
namespace gpu { |
namespace gles2 { |
@@ -166,14 +149,10 @@ void RunShaderCallback(const ShaderCacheCallback& callback, |
} // namespace |
-MemoryProgramCache::MemoryProgramCache() |
- : max_size_bytes_(GetCacheSizeBytes()), |
- curr_size_bytes_(0), |
- store_(ProgramMRUCache::NO_AUTO_EVICT) { |
-} |
- |
-MemoryProgramCache::MemoryProgramCache(const size_t max_cache_size_bytes) |
+MemoryProgramCache::MemoryProgramCache(size_t max_cache_size_bytes, |
+ bool disable_gpu_shader_disk_cache) |
: max_size_bytes_(max_cache_size_bytes), |
+ disable_gpu_shader_disk_cache_(disable_gpu_shader_disk_cache), |
curr_size_bytes_(0), |
store_(ProgramMRUCache::NO_AUTO_EVICT) { |
} |
@@ -234,9 +213,7 @@ ProgramCache::ProgramLoadResult MemoryProgramCache::LoadLinkedProgram( |
shader_b->set_varying_map(value->varying_map_1()); |
shader_b->set_output_variable_list(value->output_variable_list_1()); |
- if (!shader_callback.is_null() && |
- !base::CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kDisableGpuShaderDiskCache)) { |
+ if (!shader_callback.is_null() && !disable_gpu_shader_disk_cache_) { |
scoped_ptr<GpuProgramProto> proto( |
GpuProgramProto::default_instance().New()); |
proto->set_sha(sha, kHashLength); |
@@ -305,9 +282,7 @@ void MemoryProgramCache::SaveLinkedProgram( |
store_.Erase(store_.rbegin()); |
} |
- if (!shader_callback.is_null() && |
- !base::CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kDisableGpuShaderDiskCache)) { |
+ if (!shader_callback.is_null() && !disable_gpu_shader_disk_cache_) { |
scoped_ptr<GpuProgramProto> proto( |
GpuProgramProto::default_instance().New()); |
proto->set_sha(sha, kHashLength); |