Re-initialize shader translator properly after one shutdown.

Because of a local static, we could get stuck and never re-initialize the translator after calling ShFinalize. BUG=344043 Change-Id: Ib4d18da886eac28f3e1bc959a7eadf5b34d9410f Reviewed-on: https://chromium-review.googlesource.com/186975Reviewed-by: Nicolas Capens <nicolascapens@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Re-initialize shader translator properly after one shutdown.
1aa7f3c1 · Jamie Madill · 836bd217 · 1aa7f3c1
Commit 1aa7f3c1 authored Feb 18, 2014 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

ShaderLang.cpp src/compiler/translator/ShaderLang.cpp +5 -2

No files found.
--- a/src/compiler/translator/ShaderLang.cpp
+++ b/src/compiler/translator/ShaderLang.cpp
@@ -17,6 +17,8 @@
 #include "compiler/translator/TranslatorHLSL.h"
 #include "compiler/translator/VariablePacker.h"

+static bool isInitialized = false;
+
 //
 // This is the platform independent interface between an OGL driver
 // and the shading language compiler.
@@ -49,8 +51,8 @@ static bool checkMappedNameMaxLength(const ShHandle handle, size_t expectedValue
 //
 int ShInitialize()
 {
-    static const bool kInitialized = InitProcess();
-    return kInitialized ? 1 : 0;
+    isInitialized = InitProcess();
+    return isInitialized ? 1 : 0;
 }

 //
@@ -59,6 +61,7 @@ int ShInitialize()
 int ShFinalize()
 {
    DetachProcess();
+    isInitialized = false;
    return 1;
 }