| 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 b24cbd7e42f74149e8d804f9ad973b165c91a95b..4ccef690d6dc10e60568dc88f889317238bbff3f 100644
|
| --- a/gpu/command_buffer/service/memory_program_cache.cc
|
| +++ b/gpu/command_buffer/service/memory_program_cache.cc
|
| @@ -18,6 +18,7 @@
|
| #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
|
| #include "gpu/command_buffer/service/gpu_preferences.h"
|
| #include "gpu/command_buffer/service/shader_manager.h"
|
| +#include "gpu/ipc/common/activity_flags.h"
|
| #include "ui/gl/gl_bindings.h"
|
|
|
| namespace gpu {
|
| @@ -263,10 +264,14 @@ ProgramCache::ProgramLoadResult MemoryProgramCache::LoadLinkedProgram(
|
| return PROGRAM_LOAD_FAILURE;
|
| }
|
| const scoped_refptr<ProgramCacheValue> value = found->second;
|
| + GpuProcessActivityFlags::GetInstance()->SetFlag(
|
| + ActivityFlagsBase::FLAG_LOADING_PROGRAM_BINARY);
|
| glProgramBinary(program,
|
| value->format(),
|
| static_cast<const GLvoid*>(value->data()),
|
| value->length());
|
| + GpuProcessActivityFlags::GetInstance()->UnsetFlag(
|
| + ActivityFlagsBase::FLAG_LOADING_PROGRAM_BINARY);
|
| GLint success = 0;
|
| glGetProgramiv(program, GL_LINK_STATUS, &success);
|
| if (success == GL_FALSE) {
|
|
|