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

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

Issue 16063002: Revert 202305 "Destroy all Singletons and LazyInstances between ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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 | « trunk/src/crypto/nss_util.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/gpu/command_buffer/service/shader_translator.cc
===================================================================
--- trunk/src/gpu/command_buffer/service/shader_translator.cc (revision 202308)
+++ trunk/src/gpu/command_buffer/service/shader_translator.cc (working copy)
@@ -16,23 +16,20 @@
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() {
- if (!g_shader_initalized) {
+ static bool initialized = false;
+ if (!initialized) {
TRACE_EVENT0("gpu", "ShInitialize");
CHECK(ShInitialize());
base::AtExitManager::RegisterCallback(&FinalizeShaderTranslator, NULL);
- g_shader_initalized = true;
+ initialized = true;
}
- return g_shader_initalized;
+ return initialized;
}
#if !defined(ANGLE_SH_VERSION) || ANGLE_SH_VERSION < 108
« no previous file with comments | « trunk/src/crypto/nss_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698