| Index: gpu/command_buffer/service/shader_translator.cc
|
| diff --git a/gpu/command_buffer/service/shader_translator.cc b/gpu/command_buffer/service/shader_translator.cc
|
| index 2e5541d3540652f2f20481d548ef47e41f700ea0..54da2246c57e9bc684bddda74a75b2965827779b 100644
|
| --- a/gpu/command_buffer/service/shader_translator.cc
|
| +++ b/gpu/command_buffer/service/shader_translator.cc
|
| @@ -14,17 +14,19 @@ namespace {
|
|
|
| using gpu::gles2::ShaderTranslator;
|
|
|
| +static bool g_shader_initalized_ = false;
|
| +
|
| void FinalizeShaderTranslator(void* /* dummy */) {
|
| ShFinalize();
|
| + g_shader_initalized_ = false;
|
| }
|
|
|
| bool InitializeShaderTranslator() {
|
| - static bool initialized = false;
|
| - if (!initialized && ShInitialize()) {
|
| + if (!g_shader_initalized_ && ShInitialize()) {
|
| base::AtExitManager::RegisterCallback(&FinalizeShaderTranslator, NULL);
|
| - initialized = true;
|
| + g_shader_initalized_ = true;
|
| }
|
| - return initialized;
|
| + return g_shader_initalized_;
|
| }
|
|
|
| #if !defined(ANGLE_SH_VERSION) || ANGLE_SH_VERSION < 108
|
|
|