Index: gpu/ipc/service/gpu_channel_manager.cc |
diff --git a/gpu/ipc/service/gpu_channel_manager.cc b/gpu/ipc/service/gpu_channel_manager.cc |
index 3eee28432c225deb4b401363f40287b5a3a64ae5..398e4aea763d266a711d7a6f2e5367c2ad6a8c4a 100644 |
--- a/gpu/ipc/service/gpu_channel_manager.cc |
+++ b/gpu/ipc/service/gpu_channel_manager.cc |
@@ -87,9 +87,11 @@ gles2::ProgramCache* GpuChannelManager::program_cache() { |
(gl::g_driver_gl.ext.b_GL_ARB_get_program_binary || |
gl::g_driver_gl.ext.b_GL_OES_get_program_binary) && |
!gpu_preferences_.disable_gpu_program_cache) { |
+ bool disable_disk_cache = |
+ gpu_preferences_.disable_gpu_shader_disk_cache || |
+ gpu_driver_bug_workarounds_.disable_program_disk_cache; |
program_cache_.reset(new gles2::MemoryProgramCache( |
- gpu_preferences_.gpu_program_cache_size, |
- gpu_preferences_.disable_gpu_shader_disk_cache)); |
+ gpu_preferences_.gpu_program_cache_size, disable_disk_cache)); |
} |
return program_cache_.get(); |
} |