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

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: Remove override 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
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;
Paweł Hajdan Jr. 2013/05/08 16:32:25 nit: No underscore at the end for global variables
Robert Sesek 2013/05/08 16:42:11 Done.
+
void FinalizeShaderTranslator(void* /* dummy */) {
ShFinalize();
+ g_shader_initalized_ = false;
Paweł Hajdan Jr. 2013/05/08 16:32:25 Let's DCHECK before it that g_shader_initialized i
Robert Sesek 2013/05/08 16:42:11 Done.
}
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

Powered by Google App Engine
This is Rietveld 408576698