ShInitialize/ShFinalize is designed to be called once per process, or it would…

ShInitialize/ShFinalize is designed to be called once per process, or it would crash at random locations. I changed ShFinalize() to properly cleanup and reset global variables so that they can be called multiple times. I think that the compiler setup is much more complicated than it needs to be. It unnecessarily uses global variables. A custom pool allocator is overkill too. Review URL: http://codereview.appspot.com/1238045 git-svn-id: https://angleproject.googlecode.com/svn/trunk@316 736b8ea6-26fd-11df-bfd4-992fa37f6226

ShInitialize/ShFinalize is designed to be called once per process, or it would…
90033b9e · alokp@chromium.org · 866f318d · 90033b9e · 90033b9e
Commit 90033b9e authored May 24, 2010 by alokp@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 4 deletions

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

Shader.cpp src/libGLESv2/Shader.cpp +2 -0

No files found.
--- a/src/compiler/ShaderLang.cpp
+++ b/src/compiler/ShaderLang.cpp
@@ -22,7 +22,7 @@
 // set of built-ins, and we want to preserve that from
 // compile to compile.
 //
-TSymbolTable SymbolTables[EShLangCount];
+TSymbolTable* SymbolTables[EShLangCount];


 TPoolAllocator* PerProcessGPA = 0;
@@ -59,8 +59,10 @@ int ShInitialize()
        PerProcessGPA->push();
        SetGlobalPoolAllocatorPtr(PerProcessGPA);

-        SymbolTables[EShLangVertex].copyTable(symTables[EShLangVertex]);
-        SymbolTables[EShLangFragment].copyTable(symTables[EShLangFragment]);
+        SymbolTables[EShLangVertex] = new TSymbolTable;
+        SymbolTables[EShLangVertex]->copyTable(symTables[EShLangVertex]);
+        SymbolTables[EShLangFragment] = new TSymbolTable;
+        SymbolTables[EShLangFragment]->copyTable(symTables[EShLangFragment]);

        SetGlobalPoolAllocatorPtr(gPoolAllocator);

@@ -133,6 +135,11 @@ int __fastcall ShFinalize()
  if (PerProcessGPA) {
    PerProcessGPA->popAll();
    delete PerProcessGPA;
+    PerProcessGPA = 0;
+  }
+  for (int i = 0; i < EShLangCount; ++i) {
+    delete SymbolTables[i];
+    SymbolTables[i] = 0;
  }
  return 1;
 }
@@ -252,7 +259,7 @@ int ShCompile(
        return 1;

    TIntermediate intermediate(infoSink);
-    TSymbolTable symbolTable(SymbolTables[compiler->getLanguage()]);
+    TSymbolTable symbolTable(*SymbolTables[compiler->getLanguage()]);
    
    GenerateBuiltInSymbolTable(resources, infoSink, &symbolTable, compiler->getLanguage());


--- a/src/libGLESv2/Shader.cpp
+++ b/src/libGLESv2/Shader.cpp
@@ -215,6 +215,8 @@ void Shader::releaseCompiler()

    mFragmentCompiler = NULL;
    mVertexCompiler = NULL;
+
+    ShFinalize();
 }

 void Shader::parseVaryings()