diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-25 17:42:23 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-25 17:42:23 +0000 |
| commit | c05960ea782363a8d9c68967309839cfcb51d424 (patch) | |
| tree | 60abdf12770a554f9c0e152904f2ce52c48eba71 /gpu/command_buffer | |
| parent | 32a93e0c1ac080239558a2ff6a499857d144571f (diff) | |
| download | chromium_src-c05960ea782363a8d9c68967309839cfcb51d424.zip chromium_src-c05960ea782363a8d9c68967309839cfcb51d424.tar.gz chromium_src-c05960ea782363a8d9c68967309839cfcb51d424.tar.bz2 | |
Destroy all Singletons and LazyInstances between each test.
This modifies base::TestSuite to add a test listener that runs the AtExitManager
between each test.
BUG=110594, 156433, 238654
TEST=*unit*tests
R=apatrick@chromium.org, gspencer@chromium.org, phajdan.jr@chromium.org, pneubeck@chromium.org, rsleevi@chromium.org
Review URL: https://codereview.chromium.org/8947021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer')
| -rw-r--r-- | gpu/command_buffer/service/shader_translator.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gpu/command_buffer/service/shader_translator.cc b/gpu/command_buffer/service/shader_translator.cc index 3bd2a97..b70821e 100644 --- a/gpu/command_buffer/service/shader_translator.cc +++ b/gpu/command_buffer/service/shader_translator.cc @@ -16,20 +16,23 @@ namespace { using gpu::gles2::ShaderTranslator; +static bool g_shader_initalized = false; + void FinalizeShaderTranslator(void* /* dummy */) { TRACE_EVENT0("gpu", "ShFinalize"); ShFinalize(); + DCHECK(g_shader_initalized); + g_shader_initalized = false; } bool InitializeShaderTranslator() { - static bool initialized = false; - if (!initialized) { + if (!g_shader_initalized) { TRACE_EVENT0("gpu", "ShInitialize"); CHECK(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 |