Merge pull request #153 from tfoleyNV/remove-globals

Remove uses of global variables

1 files changed, 5 insertions, 27 deletions

diff --git a/source/slang/slang-stdlib.cpp b/source/slang/slang-stdlib.cpp
index 2a0d2abb2..71e8a6621 100644
--- a/source/slang/slang-stdlib.cpp
+++ b/source/slang/slang-stdlib.cpp
@@ -1,6 +1,6 @@
 // slang-stdlib.cpp
 
-#include "slang-stdlib.h"
+#include "compiler.h"
 #include "syntax.h"
 
 #define STRINGIZE(x) STRINGIZE2(x)
@@ -1042,9 +1042,7 @@ typedef Texture2D texture2D;
 
 namespace Slang
 {
-    static String stdlibPath;
-
-    String getStdlibPath()
+    String Session::getStdlibPath()
     {
         if(stdlibPath.Length() != 0)
             return stdlibPath;
@@ -1068,12 +1066,6 @@ namespace Slang
         return stdlibPath;
     }
 
-    // Cached code for the various libraries
-    String coreLibraryCode;
-    String slangLibraryCode;
-    String hlslLibraryCode;
-    String glslLibraryCode;
-
     enum
     {
         SINT_MASK   = 1 << 0,
@@ -1156,7 +1148,7 @@ namespace Slang
     };
 
 
-    String getCoreLibraryCode()
+    String Session::getCoreLibraryCode()
     {
         if (coreLibraryCode.Length() > 0)
             return coreLibraryCode;
@@ -1974,7 +1966,7 @@ namespace Slang
         return coreLibraryCode;
     }
 
-    String getHLSLLibraryCode()
+    String Session::getHLSLLibraryCode()
     {
         if (hlslLibraryCode.Length() > 0)
             return hlslLibraryCode;
@@ -2073,7 +2065,7 @@ namespace Slang
 
     // GLSL-specific library code
 
-    String getGLSLLibraryCode()
+    String Session::getGLSLLibraryCode()
     {
         if(glslLibraryCode.Length() != 0)
             return glslLibraryCode;
@@ -2283,18 +2275,4 @@ namespace Slang
         glslLibraryCode = sb.ProduceString();
         return glslLibraryCode;
     }
-
-
-
-    //
-
-    void finalizeShaderLibrary()
-    {
-        stdlibPath = String();
-
-        coreLibraryCode = String();
-        hlslLibraryCode = String();
-        glslLibraryCode = String();
-    }
-
 }