commit 721332425986dabe66e11188a75537f2c94a21cf
author John Kessenich <cepheus@frii.com> Mon Jul 08 19:39:16 2013 +0000
committer John Kessenich <cepheus@frii.com> Mon Jul 08 19:39:16 2013 +0000
tree 57e4a3e178eaa13d8711324f8d99d81ae5fa4e84
parent 5f1a0b7998132b39c41fbe28d44bcb4bbd53bcd9

Reframe the preprocessor as a C++ class, with instances, removing all C code, removing all global variables.  Upgrade bison version to pass a parse context on through to the preprocessor.  All the basic things to make something thread safe.


git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22291 e7fa87d3-cd2b-0410-9028-fcbf551c1848

glslang.vcxproj

diff --git a/glslang.vcxproj b/glslang.vcxproj
index c50b18f..85a4900 100644
--- a/glslang.vcxproj
+++ b/glslang.vcxproj
@@ -150,9 +150,18 @@
   </ItemDefinitionGroup>

   <ItemGroup>

     <ClCompile Include="glslang\MachineIndependent\Constant.cpp" />

-    <ClCompile Include="glslang\MachineIndependent\glslang_tab.cpp" />

+    <ClCompile Include="glslang\MachineIndependent\glslang_tab.cpp">

+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4065</DisableSpecificWarnings>

+    </ClCompile>

     <ClCompile Include="glslang\MachineIndependent\InfoSink.cpp" />

     <ClCompile Include="glslang\MachineIndependent\Initialize.cpp" />

+    <ClCompile Include="glslang\MachineIndependent\preprocessor\Pp.cpp" />

+    <ClCompile Include="glslang\MachineIndependent\preprocessor\PpAtom.cpp" />

+    <ClCompile Include="glslang\MachineIndependent\preprocessor\PpMemory.cpp" />

+    <ClCompile Include="glslang\MachineIndependent\preprocessor\PpScanner.cpp" />

+    <ClCompile Include="glslang\MachineIndependent\preprocessor\PpContext.cpp" />

+    <ClCompile Include="glslang\MachineIndependent\preprocessor\PpSymbols.cpp" />

+    <ClCompile Include="glslang\MachineIndependent\preprocessor\PpTokens.cpp" />

     <ClCompile Include="glslang\MachineIndependent\Scan.cpp" />

     <ClCompile Include="glslang\MachineIndependent\Versions.cpp" />

     <ClCompile Include="OGLCompilersDLL\InitializeDll.cpp" />

@@ -166,13 +175,6 @@
     <ClCompile Include="glslang\MachineIndependent\SymbolTable.cpp" />

     <ClCompile Include="glslang\MachineIndependent\intermOut.cpp" />

     <ClCompile Include="glslang\MachineIndependent\parseConst.cpp" />

-    <ClCompile Include="glslang\MachineIndependent\preprocessor\atom.c" />

-    <ClCompile Include="glslang\MachineIndependent\preprocessor\cpp.c" />

-    <ClCompile Include="glslang\MachineIndependent\preprocessor\cppstruct.c" />

-    <ClCompile Include="glslang\MachineIndependent\preprocessor\memory.c" />

-    <ClCompile Include="glslang\MachineIndependent\preprocessor\scanner.c" />

-    <ClCompile Include="glslang\MachineIndependent\preprocessor\symbols.c" />

-    <ClCompile Include="glslang\MachineIndependent\preprocessor\tokens.c" />

     <ClCompile Include="glslang\OSDependent\Windows\main.cpp" />

     <ClCompile Include="glslang\OSDependent\Windows\ossource.cpp" />

     <ClCompile Include="glslang\OSDependent\Linux\ossource.cpp">

@@ -187,18 +189,11 @@
     <ClInclude Include="glslang\MachineIndependent\Initialize.h" />

     <ClInclude Include="glslang\MachineIndependent\MMap.h" />

     <ClInclude Include="glslang\MachineIndependent\ParseHelper.h" />

+    <ClInclude Include="glslang\MachineIndependent\preprocessor\PpContext.h" />

+    <ClInclude Include="glslang\MachineIndependent\preprocessor\PpTokens.h" />

     <ClInclude Include="glslang\MachineIndependent\QualifierAlive.h" />

     <ClInclude Include="glslang\MachineIndependent\RemoveTree.h" />

     <ClInclude Include="glslang\MachineIndependent\localintermediate.h" />

-    <ClInclude Include="glslang\MachineIndependent\preprocessor\atom.h" />

-    <ClInclude Include="glslang\MachineIndependent\preprocessor\cpp.h" />

-    <ClInclude Include="glslang\MachineIndependent\preprocessor\memory.h" />

-    <ClInclude Include="glslang\MachineIndependent\preprocessor\parser.h" />

-    <ClInclude Include="glslang\MachineIndependent\preprocessor\preprocess.h" />

-    <ClInclude Include="glslang\MachineIndependent\preprocessor\scanner.h" />

-    <ClInclude Include="glslang\MachineIndependent\preprocessor\slglobals.h" />

-    <ClInclude Include="glslang\MachineIndependent\preprocessor\symbols.h" />

-    <ClInclude Include="glslang\MachineIndependent\preprocessor\tokens.h" />

     <ClInclude Include="glslang\Include\BaseTypes.h" />

     <ClInclude Include="glslang\Include\Common.h" />

     <ClInclude Include="glslang\Include\ConstantUnion.h" />

@@ -208,7 +203,6 @@
     <ClInclude Include="glslang\MachineIndependent\Versions.h" />

     <ClInclude Include="OGLCompilersDLL\InitializeDll.h" />

     <ClInclude Include="glslang\Include\InitializeGlobals.h" />

-    <ClInclude Include="glslang\Include\InitializeParseContext.h" />

     <ClInclude Include="glslang\Include\PoolAlloc.h" />

     <ClInclude Include="glslang\Include\ResourceLimits.h" />

     <ClInclude Include="glslang\Include\ShHandle.h" />