Commit b11713fb by Alok Priyadarshi Committed by Shannon Woods

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
parent 0fd7786d
...@@ -85,15 +85,13 @@ static void getVariableInfo(ShShaderInfo varType, ...@@ -85,15 +85,13 @@ static void getVariableInfo(ShShaderInfo varType,
} }
// //
// Driver must call this first, once, before doing any other // Driver must call this first, once, before doing any other compiler operations.
// compiler operations. // Subsequent calls to this function are no-op.
// //
int ShInitialize() int ShInitialize()
{ {
if (!InitProcess()) static const bool kInitialized = InitProcess();
return 0; return kInitialized ? 1 : 0;
return 1;
} }
// //
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment