commit 5f1a0b7998132b39c41fbe28d44bcb4bbd53bcd9
author John Kessenich <cepheus@frii.com> Sat Jul 06 19:54:21 2013 +0000
committer John Kessenich <cepheus@frii.com> Sat Jul 06 19:54:21 2013 +0000
tree 3a15de2c3e5b5296c32e76c597528aa4a28adf5a
parent 73ed17a87beafc5951b76ff0b823965c040fd1f0

Eliminate flex as the GLSL lexical analyzer, going from two nested lexical analyzers down to one, leaving just the preprocessor's lexical analysis.  A new layer replaces it, to translate from the preprocessor's view of tokenization to glslang's view of tokenization.

Also:
 - change source locations from an int to TSourceLoc (shader number, line number) throughout
 - various improvements to the preprocessor


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

glslang.vcxproj

diff --git a/glslang.vcxproj b/glslang.vcxproj
index 80024de..c50b18f 100644
--- a/glslang.vcxproj
+++ b/glslang.vcxproj
@@ -150,7 +150,6 @@
   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

@@ -192,7 +191,6 @@
     <ClInclude Include="glslang\MachineIndependent\RemoveTree.h" />

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

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

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

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

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

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

@@ -206,6 +204,7 @@
     <ClInclude Include="glslang\Include\ConstantUnion.h" />

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

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

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

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

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

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

@@ -238,23 +237,6 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)%(Filename)_tab.cpp;%(Outputs)</Outputs>

     </CustomBuild>

   </ItemGroup>

-  <ItemGroup>

-    <CustomBuild Include="glslang\MachineIndependent\glslang.l">

-      <FileType>Document</FileType>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd %(RootDir)%(Directory)

-%(RootDir)%(Directory)..\..\tools\flex.exe glslang.l

-</Command>

-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Executing flex on glslang.l</Message>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)gen_glslang.cpp</Outputs>

-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)glslang_tab.cpp.h</AdditionalInputs>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd %(RootDir)%(Directory)

-%(RootDir)%(Directory)..\..\tools\flex.exe glslang.l

-</Command>

-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Executing flex on glslang.l</Message>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)gen_glslang.cpp</Outputs>

-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)glslang_tab.cpp.h</AdditionalInputs>

-    </CustomBuild>

-  </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>