Made multiple calls to ShInitialize not assert.

BUG=456 R=apatrick@chromium.org, kbr@chromium.org Review URL: https://codereview.appspot.com/11916046 Conflicts: src/common/version.h src/compiler/ShaderLang.cpp

Made multiple calls to ShInitialize not assert.
b11713fb · Alok Priyadarshi · Shannon Woods · 0fd7786d · b11713fb
Commit b11713fb authored Aug 01, 2013 by Alok Priyadarshi Committed by Shannon Woods Sep 10, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

ShaderLang.cpp src/compiler/ShaderLang.cpp +4 -6

No files found.
--- a/src/compiler/ShaderLang.cpp
+++ b/src/compiler/ShaderLang.cpp
@@ -85,15 +85,13 @@ static void getVariableInfo(ShShaderInfo varType,
 }

 //
-// Driver must call this first, once, before doing any other
-// compiler operations.
+// Driver must call this first, once, before doing any other compiler operations.
+// Subsequent calls to this function are no-op.
 //
 int ShInitialize()
 {
-    if (!InitProcess())
-        return 0;
-
-    return 1;
+    static const bool kInitialized = InitProcess();
+    return kInitialized ? 1 : 0;
 }

 //