Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(876)

Unified Diff: gpu/command_buffer/service/shader_translator.cc

Issue 8947021: Destroy all Singletons and LazyInstances between each test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resurrect() Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/network/onc/onc_certificate_importer_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5129bfce73433168f7f9fe2488bf01e8d7ac41fe..32af1aa816d5abf177d9018c1c9d38e93b327e3f 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
« no previous file with comments | « chromeos/network/onc/onc_certificate_importer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698