Index: content/common/gpu/gpu_channel_manager.cc |
diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc |
index f0e40e3309a5e174263ff94ed1e4adcca3bd1835..c8992dfdc9503511b0cba6eea34f3be7b3950bf8 100644 |
--- a/content/common/gpu/gpu_channel_manager.cc |
+++ b/content/common/gpu/gpu_channel_manager.cc |
@@ -23,6 +23,7 @@ |
#include "gpu/command_buffer/service/sync_point_manager.h" |
#include "ipc/message_filter.h" |
#include "ui/gl/gl_bindings.h" |
+#include "ui/gl/gl_gl_api_implementation.h" |
#include "ui/gl/gl_share_group.h" |
#if defined(USE_OZONE) |
#include "ui/ozone/public/gpu_platform_support.h" |
@@ -68,7 +69,8 @@ GpuChannelManager::~GpuChannelManager() { |
gpu::gles2::ProgramCache* GpuChannelManager::program_cache() { |
if (!program_cache_.get() && |
(gfx::g_driver_gl.ext.b_GL_ARB_get_program_binary || |
- gfx::g_driver_gl.ext.b_GL_OES_get_program_binary) && |
+ gfx::g_driver_gl.ext.b_GL_OES_get_program_binary || |
+ gfx::GetGLVersionInfo()->is_es3) && |
Zhenyao Mo
2015/07/17 23:34:04
I feel somehow this decision should be made in com
no sievers
2015/07/17 23:39:10
Yes. I think it just exists this way using the sta
|
!base::CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kDisableGpuProgramCache)) { |
program_cache_.reset(new gpu::gles2::MemoryProgramCache()); |